From owner-p4-projects Mon Mar 18 15: 2:36 2002 Delivered-To: p4-projects@freebsd.org Received: from daintree.yahoo.com (daintree.yahoo.com [216.145.52.172]) by hub.freebsd.org (Postfix) with ESMTP id DDE2D37B400 for ; Mon, 18 Mar 2002 15:02:26 -0800 (PST) Received: by daintree.yahoo.com (Postfix, from userid 2154) id EE7F620C6; Mon, 18 Mar 2002 15:02:25 -0800 (PST) To: p4-projects@freebsd.org Subject: test Message-Id: <20020318230225.EE7F620C6@daintree.yahoo.com> Date: Mon, 18 Mar 2002 15:02:25 -0800 (PST) From: peter@yahoo-inc.com (Peter Wemm) Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG test To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 18 15:39:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3ED8037B405; Mon, 18 Mar 2002 15:39:30 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38]) by hub.freebsd.org (Postfix) with ESMTP id EA54737B404 for ; Mon, 18 Mar 2002 15:39:28 -0800 (PST) Received: from peter3.wemm.org ([12.232.27.13]) by rwcrmhc51.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020318233928.MBD2626.rwcrmhc51.attbi.com@peter3.wemm.org> for ; Mon, 18 Mar 2002 23:39:28 +0000 Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by peter3.wemm.org (8.11.0/8.11.0) with ESMTP id g2INdSs61592 for ; Mon, 18 Mar 2002 15:39:28 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 589B83810 for ; Mon, 18 Mar 2002 15:39:28 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Perforce Change Reviews Subject: Re: PERFORCE change 7887 for review In-Reply-To: <200203182315.g2INFoB63827@freefall.freebsd.org> Date: Mon, 18 Mar 2002 15:39:28 -0800 From: Peter Wemm Message-Id: <20020318233928.589B83810@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Peter Wemm wrote: > Change 7887 by peter@peter_daintree on 2002/03/18 15:15:35 > > IFC Testing.. to see if I really broke it or not. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 18 18:38:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A996B37B404; Mon, 18 Mar 2002 18:38:07 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1EB4D37B400 for ; Mon, 18 Mar 2002 18:38:06 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J2c6972903 for perforce@freebsd.org; Mon, 18 Mar 2002 18:38:06 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 18 Mar 2002 18:38:06 -0800 (PST) Message-Id: <200203190238.g2J2c6972903@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7899 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7899 Change 7899 by peter@peter_daintree on 2002/03/18 18:37:19 IFC Affected files ... ... //depot/projects/ia64/contrib/smbfs/lib/smb/ctx.c#3 integrate ... //depot/projects/ia64/gnu/usr.bin/send-pr/categories#2 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#13 integrate ... //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#5 integrate ... //depot/projects/ia64/sys/dev/md/md.c#5 integrate ... //depot/projects/ia64/sys/dev/mlx/mlx.c#4 integrate ... //depot/projects/ia64/usr.bin/uudecode/uudecode.c#4 integrate ... //depot/projects/ia64/usr.bin/xinstall/xinstall.c#4 integrate Differences ... ==== //depot/projects/ia64/contrib/smbfs/lib/smb/ctx.c#3 (text+ko) ==== @@ -30,6 +30,7 @@ * SUCH DAMAGE. * * $Id: ctx.c,v 1.22 2001/12/26 04:10:52 bp Exp $ + * $FreeBSD: src/contrib/smbfs/lib/smb/ctx.c,v 1.2 2002/03/18 22:40:33 alfred Exp $ */ #include #include @@ -64,7 +65,9 @@ int minlevel, int maxlevel, int sharetype) { int opt, error = 0; + uid_t euid; const char *arg, *cp; + struct passwd *pwd; bzero(ctx,sizeof(*ctx)); error = nb_ctx_create(&ctx->ct_nb); @@ -92,8 +95,14 @@ ctx->ct_sh.ioc_group = SMBM_ANY_GROUP; nb_ctx_setscope(ctx->ct_nb, ""); - smb_ctx_setuser(ctx, getpwuid(geteuid())->pw_name); - endpwent(); + euid = geteuid(); + if ((pwd = getpwuid(euid)) != NULL) { + smb_ctx_setuser(ctx, pwd->pw_name); + endpwent(); + } else if (euid == 0) + smb_ctx_setuser(ctx, "root"); + else + return 0; if (argv == NULL) return 0; for (opt = 1; opt < argc; opt++) { ==== //depot/projects/ia64/gnu/usr.bin/send-pr/categories#2 (text+ko) ==== @@ -1,3 +1,4 @@ +# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.12 2002/03/19 00:39:55 des Exp $ advocacy alpha bin @@ -5,7 +6,10 @@ docs gnu i386 +ia64 kern misc ports -sparc +powerpc +sparc64 +standards ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#13 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.302 2002/03/18 20:26:04 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.303 2002/03/19 00:19:53 bmah Exp $ 2000 @@ -1640,6 +1640,17 @@ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:13.openssh.asc">FreeBSD-SA-02:13.) &merged; + A programming error in zlib could + result in attempts to free memory multiple times. The + &man.malloc.3;/&man.free.3; routines used in &os; are not + vulnerable to this error, but applications receiving + specially-crafted blocks of invalid compressed data could + be made to function incorrectly or abort. This + zlib bug has been fixed. For a + workaround and solutions, see security advisory FreeBSD-SA-02:18. + &merged; + Userland Changes ==== //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#5 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -11,7 +11,7 @@ FreeBSD ¥×¥í¥¸¥§¥¯¥È - $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.52 2002/03/17 16:02:56 kuriyama Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.53 2002/03/19 00:41:57 kuriyama Exp $ 2000 @@ -1457,7 +1457,7 @@ ¤Ë¿·¤·¤¯Âбþ¤·¤Þ¤·¤¿. ACPI ¤Îµ¡Ç½¤Ï Intel ACPI Component Architecture ¥×¥í¥¸¥§¥¯¥È¤«¤éÄ󶡤µ¤ì¤Æ¤¤¤ë¤â¤Î¤Ç, - ACPI CA 20020214 ¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Ë¹¹¿·¤µ¤ì¤Æ¤¤¤Þ¤¹. + ACPI CA 20020308 ¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Ë¹¹¿·¤µ¤ì¤Æ¤¤¤Þ¤¹. µìÍè¤Î APM ɸ½à¤òÍѤ¤¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¸þ¤±¤Î¸åÊý¸ß´¹À­ ¤âÄ󶡤µ¤ì¤Þ¤·¤¿. @@ -1889,7 +1889,8 @@ ´Þ¤Þ¤ì¤ë °ì¤Ä°ã¤¤ ¥Ð¥°¤¬½¤Àµ¤µ¤ì¤Þ¤·¤¿. ¤³¤Î¥Ð¥°¤Ë¤è¤ê, ǧ¾Ú¤µ¤ì¤¿¥ê¥â¡¼¥È¥æ¡¼¥¶¤¬ &man.sshd.8; ¤Ë¥¹¡¼¥Ñ¥æ¡¼¥¶¸¢¸Â¤ÇǤ°Õ¤Î¥³¡¼¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤¹. - ¤Þ¤¿, Àܳ¤·¤Æ¤¤¤ë SSH ¥¯¥é¥¤¥¢¥ó¥È¤Ë¤½¤Î¥¯¥é¥¤¥¢¥ó¥È¥æ¡¼¥¶¤Î¸¢¸Â¤Ç + ¤Þ¤¿, °­°Õ¤Î¤¢¤ë SSH ¥µ¡¼¥Ð¤¬¤½¤Î¥¯¥é¥¤¥¢¥ó¥È¥·¥¹¥Æ¥à¤Î + ¥¯¥é¥¤¥¢¥ó¥È¥æ¡¼¥¶¤Î¸¢¸Â¤Ç Ǥ°Õ¤Î¥³¡¼¥É¤ò¼Â¹Ô¤µ¤»¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹. (¥»¥­¥å¥ê¥Æ¥£´«¹ð FreeBSD-SA-02:13 @@ -3141,7 +3142,8 @@ Bell Labs ¤Î awk ( BWK awk ¤ä The One True AWK - ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤¹ ) ¤¬¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤Þ¤·¤¿. + ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤¹ ) ¤Î 2002/02/10 ÈÇ¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È + ¤¬¥¤¥ó¥Ý¡¼¥È¤µ¤ì¤Þ¤·¤¿. sparc64 ¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¤Ï awk ¤È¤·¤Æ, ¤½¤ì°Ê³°¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï nawk ¤È¤·¤Æ¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹. @@ -3277,7 +3279,7 @@ 4.1.0 ¤Ë¹¹¿·¤µ¤ì¤Þ¤·¤¿. &merged; OpenPAM - (Celandine ¥ê¥ê¡¼¥¹) ¤¬ + (Centaury ¥ê¥ê¡¼¥¹) ¤¬ Linux-PAM ¤ËÂå¤ï¤Ã¤Æ import ¤µ¤ì¤Þ¤·¤¿. @@ -3288,7 +3290,7 @@ ¤Îµ¡Ç½¤ò´°Á´¤ËÃÖ¤­´¹¤¨¤ë¤â¤Î¤Ç¤¹. Perl ¤¬¥Ð¡¼¥¸¥ç¥ó - 5.6.0 ¤Ë¹¹¿·¤µ¤ì¤Þ¤·¤¿. + 5.6.1 ¤Ë¹¹¿·¤µ¤ì¤Þ¤·¤¿. &man.routed.8; ¤¬¥Ð¡¼¥¸¥ç¥ó 2.22 ¤Ë¹¹¿·¤µ¤ì¤Þ¤·¤¿. &merged; ==== //depot/projects/ia64/sys/dev/md/md.c#5 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.54 2002/03/15 18:49:43 mckusick Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.55 2002/03/19 01:45:04 gallatin Exp $ * */ @@ -384,7 +384,8 @@ if (md_debug > 1) printf("mdstrategy(%p) %s %x, %lld, %ld, %p)\n", - bp, devtoname(bp->bio_dev), bp->bio_flags, bp->bio_blkno, + bp, devtoname(bp->bio_dev), bp->bio_flags, + (long long)bp->bio_blkno, bp->bio_bcount / DEV_BSIZE, bp->bio_data); sc = bp->bio_dev->si_drv1; ==== //depot/projects/ia64/sys/dev/mlx/mlx.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mlx/mlx.c,v 1.32 2002/03/18 20:50:04 imp Exp $ + * $FreeBSD: src/sys/dev/mlx/mlx.c,v 1.33 2002/03/18 23:38:16 bde Exp $ */ /* @@ -1777,8 +1777,10 @@ blkcount = (MLX_BIO_LENGTH(bp) + MLX_BLKSIZE - 1) / MLX_BLKSIZE; if ((MLX_BIO_LBA(bp) + blkcount) > sc->mlx_sysdrive[driveno].ms_size) - device_printf(sc->mlx_dev, "I/O beyond end of unit (%llu,%d > %u)\n", - MLX_BIO_LBA(bp), blkcount, sc->mlx_sysdrive[driveno].ms_size); + device_printf(sc->mlx_dev, + "I/O beyond end of unit (%lld,%d > %lu)\n", + (long long)MLX_BIO_LBA(bp), blkcount, + (u_long)sc->mlx_sysdrive[driveno].ms_size); /* * Build the I/O command. Note that the SG list type bits are set to zero, ==== //depot/projects/ia64/usr.bin/uudecode/uudecode.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)uudecode.c 8.2 (Berkeley) 4/2/94"; #endif static const char rcsid[] = - "$FreeBSD: src/usr.bin/uudecode/uudecode.c,v 1.19 2002/03/05 03:27:47 jmallett Exp $"; + "$FreeBSD: src/usr.bin/uudecode/uudecode.c,v 1.20 2002/03/19 00:44:07 jmallett Exp $"; #endif /* not lint */ /* @@ -159,9 +159,11 @@ struct passwd *pw; register int n; register char ch, *p; - int base64, ignore, mode, n1; - char buf[MAXPATHLEN]; - char buffn[MAXPATHLEN]; /* file name buffer */ + int base64, ignore, n1; + char buf[MAXPATHLEN+1]; + char buffn[MAXPATHLEN+1]; /* file name buffer */ + char *mode, *s; + void *mode_handle; base64 = ignore = 0; /* search for header line */ @@ -178,52 +180,56 @@ if (strncmp(buf, "begin-base64", 12) == 0) base64 = 1; - if (oflag) { - if (base64) - (void)sscanf(buf, "begin-base64 %o ", &mode); - else - (void)sscanf(buf, "begin %o ", &mode); - if (strlcpy(buf, outfile, sizeof(buf)) >= sizeof(buf)) { - warnx("%s: filename too long", outfile); - return (1); - } - } else { - if (base64) - (void)sscanf(buf, "begin-base64 %o %[^\n\r]", &mode, buf); - else - (void)sscanf(buf, "begin %o %[^\n\r]", &mode, buf); + /* Parse the header: begin{,-base64} mode outfile. */ + s = strtok(buf, " "); + if (s == NULL) + errx(1, "no mode or filename in input file"); + s = strtok(NULL, " "); + if (s == NULL) + errx(1, "no mode in input file"); + else { + mode = strdup(s); + if (mode == NULL) + err(1, "strdup()"); + } + if (!oflag) { + outfile = strtok(NULL, " \r\n"); + if (outfile == NULL) + errx(1, "no filename in input file"); } + if (strlcpy(buf, outfile, sizeof(buf)) >= sizeof(buf)) + errx(1, "%s: filename too long", outfile); if (!sflag && !pflag) { - strncpy(buffn, buf, sizeof(buffn)); + strlcpy(buffn, buf, sizeof(buffn)); if (strrchr(buffn, '/') != NULL) strncpy(buf, strrchr(buffn, '/') + 1, sizeof(buf)); if (buf[0] == '\0') { warnx("%s: illegal filename", buffn); return(1); } - } - /* handle ~user/file format */ - if (buf[0] == '~') { - if (!(p = index(buf, '/'))) { - warnx("%s: illegal ~user", filename); - return(1); - } - *p++ = '\0'; - if (!(pw = getpwnam(buf + 1))) { - warnx("%s: no user %s", filename, buf); - return(1); - } - n = strlen(pw->pw_dir); - n1 = strlen(p); - if (n + n1 + 2 > MAXPATHLEN) { - warnx("%s: path too long", filename); - return(1); + /* handle ~user/file format */ + if (buf[0] == '~') { + if (!(p = index(buf, '/'))) { + warnx("%s: illegal ~user", filename); + return(1); + } + *p++ = '\0'; + if (!(pw = getpwnam(buf + 1))) { + warnx("%s: no user %s", filename, buf); + return(1); + } + n = strlen(pw->pw_dir); + n1 = strlen(p); + if (n + n1 + 2 > MAXPATHLEN) { + warnx("%s: path too long", filename); + return(1); + } + bcopy(p, buf + n + 1, n1 + 1); + bcopy(pw->pw_dir, buf, n); + buf[n] = '/'; } - bcopy(p, buf + n + 1, n1 + 1); - bcopy(pw->pw_dir, buf, n); - buf[n] = '/'; } /* create output file, set mode */ @@ -231,14 +237,19 @@ ; /* print to stdout */ else { + mode_handle = setmode(mode); + if (mode_handle == NULL) + err(1, "setmode()"); if (iflag && !access(buf, F_OK)) { (void)fprintf(stderr, "not overwritten: %s\n", buf); ignore++; } else if (!freopen(buf, "w", stdout) || - fchmod(fileno(stdout), mode&0666)) { + fchmod(fileno(stdout), getmode(mode_handle, 0) & 0666)) { warn("%s: %s", buf, filename); return(1); } + free(mode_handle); + free(mode); } strcpy(buffn, buf); /* store file name from header line */ ==== //depot/projects/ia64/usr.bin/xinstall/xinstall.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ #include #ifdef __FBSDID -__FBSDID("$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.47 2001/12/19 06:05:42 imp Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.48 2002/03/18 23:26:13 des Exp $"); #endif #ifndef lint @@ -74,6 +74,8 @@ #define MAP_FAILED ((void *)-1) /* from */ #endif +#define MAX_CMP_SIZE (16 * 1024 * 1024) + #define DIRECTORY 0x01 /* Tell install it's a directory. */ #define SETFLAGS 0x02 /* Tell install to set flags. */ #define NOCHANGEBITS (UF_IMMUTABLE | UF_APPEND | SF_IMMUTABLE | SF_APPEND) @@ -528,7 +530,7 @@ if (from_len != to_len) return 1; - if (from_len <= 8 * 1024 * 1024) { + if (from_len <= MAX_CMP_SIZE) { done_compare = 0; if (trymmap(from_fd) && trymmap(to_fd)) { p = mmap(NULL, from_len, PROT_READ, MAP_SHARED, from_fd, (off_t)0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 18 18:42:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE22A37B404; Mon, 18 Mar 2002 18:42:12 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DFD1137B402 for ; Mon, 18 Mar 2002 18:42:11 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J2gBl76687 for perforce@freebsd.org; Mon, 18 Mar 2002 18:42:11 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 18 Mar 2002 18:42:11 -0800 (PST) Message-Id: <200203190242.g2J2gBl76687@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7900 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7900 Change 7900 by peter@peter_daintree on 2002/03/18 18:41:37 Revert to vendor for this, Intel fixed it elsewhere. Affected files ... ... //depot/projects/ia64/sys/contrib/dev/acpica/acgcc.h#7 edit ... //depot/projects/ia64/sys/contrib/dev/acpica/actypes.h#7 edit ... //depot/projects/ia64/sys/contrib/dev/acpica/rsaddr.c#6 edit ... //depot/projects/ia64/sys/contrib/dev/acpica/rscalc.c#5 edit ... //depot/projects/ia64/sys/contrib/dev/acpica/rsirq.c#5 edit ... //depot/projects/ia64/sys/contrib/dev/acpica/rsmisc.c#5 edit Differences ... ==== //depot/projects/ia64/sys/contrib/dev/acpica/acgcc.h#7 (text+ko) ==== @@ -121,7 +121,6 @@ #ifdef __ia64__ #define _IA64 -#define COMPILER_DEPENDENT_INT64 long #define COMPILER_DEPENDENT_UINT64 unsigned long /* @@ -199,7 +198,6 @@ #else /* DO IA32 */ -#define COMPILER_DEPENDENT_INT64 long long #define COMPILER_DEPENDENT_UINT64 unsigned long long /* ==== //depot/projects/ia64/sys/contrib/dev/acpica/actypes.h#7 (text+ko) ==== @@ -148,7 +148,6 @@ typedef unsigned short UINT16; typedef int INT32; typedef unsigned int UINT32; -typedef COMPILER_DEPENDENT_INT64 INT64; typedef COMPILER_DEPENDENT_UINT64 UINT64; typedef UINT64 NATIVE_UINT; @@ -1207,7 +1206,7 @@ #define ACPI_RESOURCE_LENGTH 12 #define ACPI_RESOURCE_LENGTH_NO_DATA 8 /* Id + Length fields */ -#define ACPI_SIZEOF_RESOURCE(Type) ACPI_ROUND_UP_TO_NATIVE_WORD (ACPI_RESOURCE_LENGTH_NO_DATA + sizeof (Type)) +#define ACPI_SIZEOF_RESOURCE(Type) (ACPI_RESOURCE_LENGTH_NO_DATA + sizeof (Type)) #define ACPI_NEXT_RESOURCE(Res) (ACPI_RESOURCE *)((UINT8 *) Res + Res->length) ==== //depot/projects/ia64/sys/contrib/dev/acpica/rsaddr.c#6 (text+ko) ==== @@ -326,7 +326,7 @@ * StructSize to the next 32-bit boundary. */ Temp8 = (UINT8) (Index + 1); - StructSize += ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + StructSize += ACPI_ROUND_UP_TO_32BITS (Temp8); } else { @@ -723,7 +723,7 @@ * StructSize to the next 32-bit boundary. */ Temp8 = (UINT8) (Index + 1); - StructSize += ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + StructSize += ACPI_ROUND_UP_TO_32BITS (Temp8); } else { @@ -1122,7 +1122,7 @@ * StructSize to the next 32-bit boundary. */ Temp8 = (UINT8) (Index + 1); - StructSize += ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + StructSize += ACPI_ROUND_UP_TO_32BITS (Temp8); } else { ==== //depot/projects/ia64/sys/contrib/dev/acpica/rscalc.c#5 (text+ko) ==== @@ -439,7 +439,7 @@ /* * Ensure a 32-bit boundary for the structure */ - Temp16 = (UINT16) ACPI_ROUND_UP_TO_NATIVE_WORD (Temp16); + Temp16 = (UINT16) ACPI_ROUND_UP_TO_32BITS (Temp16); StructureSize = ACPI_SIZEOF_RESOURCE (ACPI_RESOURCE_VENDOR) + (Temp16 * sizeof (UINT8)); @@ -540,7 +540,7 @@ /* * Ensure a 32-bit boundary for the structure */ - Temp8 = (UINT8) ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + Temp8 = (UINT8) ACPI_ROUND_UP_TO_32BITS (Temp8); StructureSize = ACPI_SIZEOF_RESOURCE (ACPI_RESOURCE_ADDRESS32) + (Temp8 * sizeof (UINT8)); @@ -580,7 +580,7 @@ /* * Ensure a 32-bit boundary for the structure */ - Temp8 = (UINT8) ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + Temp8 = (UINT8) ACPI_ROUND_UP_TO_32BITS (Temp8); StructureSize = ACPI_SIZEOF_RESOURCE (ACPI_RESOURCE_ADDRESS16) + (Temp8 * sizeof (UINT8)); @@ -634,7 +634,7 @@ /* * Ensure a 32-bit boundary for the structure */ - Temp8 = (UINT8) ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + Temp8 = (UINT8) ACPI_ROUND_UP_TO_32BITS (Temp8); StructureSize = ACPI_SIZEOF_RESOURCE (ACPI_RESOURCE_EXT_IRQ) + (AdditionalBytes * sizeof (UINT8)) + @@ -777,7 +777,7 @@ /* * Ensure a 32-bit boundary for the structure */ - Temp8 = (UINT8) ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + Temp8 = (UINT8) ACPI_ROUND_UP_TO_32BITS (Temp8); StructureSize = ACPI_SIZEOF_RESOURCE (ACPI_RESOURCE_VENDOR) + (Temp8 * sizeof (UINT8)); break; ==== //depot/projects/ia64/sys/contrib/dev/acpica/rsirq.c#5 (text+ko) ==== @@ -517,7 +517,7 @@ * StructSize to the next 32-bit boundary. */ Temp8 = (UINT8) (Index + 1); - StructSize += ACPI_ROUND_UP_TO_NATIVE_WORD (Temp8); + StructSize += ACPI_ROUND_UP_TO_32BITS (Temp8); } else { ==== //depot/projects/ia64/sys/contrib/dev/acpica/rsmisc.c#5 (text+ko) ==== @@ -326,7 +326,7 @@ * calculate the length of the vendor string and expand the * StructSize to the next 32-bit boundary. */ - StructSize += ACPI_ROUND_UP_TO_NATIVE_WORD (Temp16); + StructSize += ACPI_ROUND_UP_TO_32BITS (Temp16); /* * Set the Length parameter To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 18 23: 9:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 645FE37B405; Mon, 18 Mar 2002 23:09:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3D9D637B402 for ; Mon, 18 Mar 2002 23:09:51 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J79p446553 for perforce@freebsd.org; Mon, 18 Mar 2002 23:09:51 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 18 Mar 2002 23:09:51 -0800 (PST) Message-Id: <200203190709.g2J79p446553@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7912 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7912 Change 7912 by peter@peter_overcee on 2002/03/18 23:09:42 -Wunused Affected files ... ... //depot/projects/ia64/sys/ia64/isa/isa_dma.c#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/isa/isa_dma.c#2 (text+ko) ==== @@ -228,7 +228,9 @@ static void isa_dmastart_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) { +#if 0 caddr_t addr = ((struct isa_dmastart_arg *) arg)->addr; +#endif int chan = ((struct isa_dmastart_arg *) arg)->chan; int flags = ((struct isa_dmastart_arg *) arg)->flags; bus_addr_t phys = segs->ds_addr; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 18 23:11: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 292A937B41C; Mon, 18 Mar 2002 23:10:55 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C9DF937B404 for ; Mon, 18 Mar 2002 23:10:52 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J7Aqw46802 for perforce@freebsd.org; Mon, 18 Mar 2002 23:10:52 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 18 Mar 2002 23:10:52 -0800 (PST) Message-Id: <200203190710.g2J7Aqw46802@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7913 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7913 Change 7913 by peter@peter_overcee on 2002/03/18 23:10:23 fix more __func__ concatenation Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#8 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#8 (text+ko) ==== @@ -106,7 +106,7 @@ mtx_lock_spin(&sched_lock); cpu_throw(); - panic(__func__ ": cpu_throw() returned"); + panic("ia64_ap_startup: cpu_throw() returned"); } int @@ -140,13 +140,13 @@ } KASSERT((all_cpus & (1UL << acpiid)) == 0, - (__func__ ": cpu%d already in CPU map", acpiid)); + ("%s: cpu%d already in CPU map", __func__, acpiid)); lid = LID_SAPIC_SET(apicid, apiceid); if ((ia64_get_lid() & LID_SAPIC_MASK) == lid) { KASSERT(acpiid == 0, - (__func__ ": the BSP must be cpu0")); + ("%s: the BSP must be cpu0", __func__)); } if (acpiid != 0) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 18 23:11: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E936B37B400; Mon, 18 Mar 2002 23:10:56 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0C21F37B405 for ; Mon, 18 Mar 2002 23:10:53 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J7Aqw46807 for perforce@freebsd.org; Mon, 18 Mar 2002 23:10:52 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 18 Mar 2002 23:10:52 -0800 (PST) Message-Id: <200203190710.g2J7Aqw46807@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7914 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7914 Change 7914 by peter@peter_overcee on 2002/03/18 23:10:49 include fixes Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/nexus.c#2 edit ... //depot/projects/ia64/sys/ia64/ia64/sapic.c#4 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/nexus.c#2 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include ==== //depot/projects/ia64/sys/ia64/ia64/sapic.c#4 (text+ko) ==== @@ -34,6 +34,8 @@ #include #include #include +#include +#include static MALLOC_DEFINE(M_SAPIC, "sapic", "I/O SAPIC devices"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 18 23:16: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 588F737B404; Mon, 18 Mar 2002 23:16:00 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 89C9437B402 for ; Mon, 18 Mar 2002 23:15:59 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J7FxY47707 for perforce@freebsd.org; Mon, 18 Mar 2002 23:15:59 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 18 Mar 2002 23:15:59 -0800 (PST) Message-Id: <200203190715.g2J7FxY47707@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7915 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7915 Change 7915 by peter@peter_overcee on 2002/03/18 23:15:35 disable usb, which times out for me at the moment Affected files ... ... //depot/projects/ia64/sys/ia64/conf/SMALL#6 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/SMALL#6 (text+ko) ==== @@ -135,15 +135,15 @@ device bpf #Berkeley packet filter # USB support -device uhci # UHCI PCI->USB interface -device ohci # OHCI PCI->USB interface -device usb # USB Bus (required) -device ugen # Generic +#device uhci # UHCI PCI->USB interface +#device ohci # OHCI PCI->USB interface +#device usb # USB Bus (required) +#device ugen # Generic #device uhid # "Human Interface Devices" -device ukbd # Keyboard +#device ukbd # Keyboard #device ulpt # Printer #device umass # Disks/Mass storage - Requires scbus and da0 -device ums # Mouse +#device ums # Mouse # USB Ethernet #device aue # ADMtek USB ethernet #device cue # CATC USB ethernet To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 18 23:17: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1190437B404; Mon, 18 Mar 2002 23:17:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1A2B137B402 for ; Mon, 18 Mar 2002 23:17:01 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J7H0847916 for perforce@freebsd.org; Mon, 18 Mar 2002 23:17:00 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 18 Mar 2002 23:17:00 -0800 (PST) Message-Id: <200203190717.g2J7H0847916@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7916 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7916 Change 7916 by peter@peter_overcee on 2002/03/18 23:16:24 dump in some debug printfs before I lose them. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/interrupt.c#5 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#5 (text+ko) ==== @@ -91,6 +91,7 @@ { struct thread *td; volatile struct ia64_interrupt_block *ib = IA64_INTERRUPT_BLOCK; + static int clk; td = curthread; atomic_add_int(&td->td_intr_nesting_level, 1); @@ -120,6 +121,11 @@ /* divide hz (1024) by 8 to get stathz (128) */ if((++schedclk2 & 0x7) == 0) statclock((struct clockframe *)framep); + clk++; + if (clk >= 10000) { + printf("\nCLOCK %d\n", clk); + clk = 0; + } critical_exit(); #ifdef SMP } else if (vector == mp_ipi_vector[IPI_AST]) { @@ -146,8 +152,10 @@ CTR1(KTR_SMP, "IPI_TEST, cpuid=%d", PCPU_GET(cpuid)); mp_ipi_test++; #endif - } else + } else { + printf("INT %d\n", vector); ia64_dispatch_intr(framep, vector); + } out: atomic_subtract_int(&td->td_intr_nesting_level, 1); @@ -241,6 +249,8 @@ int errcode; int vector = irq + IA64_HARDWARE_IRQ_BASE; +printf("ia64_setup_intr: %s irq %d\n", name, irq); + /* * XXX - Can we have more than one device on a vector? If so, we have * a race condition here that needs to be worked around similar to @@ -299,8 +309,10 @@ * Find the interrupt thread for this vector. */ i = ia64_intrs[vector]; - if (i == NULL) + if (i == NULL) { +printf("STRAY INTR %ld\n", vector); return; /* no ithread for this vector */ + } ithd = i->ithd; KASSERT(ithd != NULL, ("interrupt vector without a thread")); @@ -309,8 +321,10 @@ * As an optimization, if an ithread has no handlers, don't * schedule it to run. */ - if (TAILQ_EMPTY(&ithd->it_handlers)) + if (TAILQ_EMPTY(&ithd->it_handlers)) { +printf("NO HANDLERS\n"); return; + } if (i->cntp) atomic_add_long(i->cntp, 1); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 18 23:31: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1253437B402; Mon, 18 Mar 2002 23:30:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9040B37B400 for ; Mon, 18 Mar 2002 23:30:17 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J7UH249744 for perforce@freebsd.org; Mon, 18 Mar 2002 23:30:17 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 18 Mar 2002 23:30:17 -0800 (PST) Message-Id: <200203190730.g2J7UH249744@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7917 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7917 Change 7917 by peter@peter_overcee on 2002/03/18 23:29:17 IFC Affected files ... ... //depot/projects/ia64/Makefile.upgrade#2 integrate ... //depot/projects/ia64/etc/rc.network#11 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#4 integrate ... //depot/projects/ia64/share/mk/bsd.dep.mk#3 integrate ... //depot/projects/ia64/share/mk/bsd.info.mk#2 integrate ... //depot/projects/ia64/sys/conf/kern.post.mk#5 integrate ... //depot/projects/ia64/sys/dev/md/md.c#6 integrate ... //depot/projects/ia64/sys/dev/txp/if_txp.c#3 integrate ... //depot/projects/ia64/sys/i386/i386/perfmon.c#3 integrate ... //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#7 integrate ... //depot/projects/ia64/sys/kern/vfs_bio.c#9 integrate ... //depot/projects/ia64/sys/kern/vfs_syscalls.c#5 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#6 integrate ... //depot/projects/ia64/usr.bin/uudecode/uudecode.c#5 integrate Differences ... ==== //depot/projects/ia64/Makefile.upgrade#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.upgrade,v 1.17 1999/08/28 01:35:58 peter Exp $ +# $FreeBSD: src/Makefile.upgrade,v 1.18 2002/03/19 05:58:36 bde Exp $ # # This makefile contains rules for preforming upgrades that are outside # the scope of the normal build world process. @@ -57,7 +57,7 @@ # front-load all the information we're going to need. /var/db/update.cfg: @if [ -f ${.CURDIR}/tools/tools/upgrade/doupgrade.sh ]; then \ - env MACHINE=${MACHINE} CURDIR=${.CURDIR} sh ${.CURDIR}/tools/tools/upgrade/doupgrade.sh 1 /var/db/update.cfg; \ + MACHINE=${MACHINE} CURDIR=${.CURDIR} sh ${.CURDIR}/tools/tools/upgrade/doupgrade.sh 1 /var/db/update.cfg; \ else \ echo "Your source tree must not be fully populated; unable to find upgrade script"; echo "in ${.CURDIR}/tools/tools/upgrade/doupgrade.sh."; exit 1; \ fi @@ -187,7 +187,7 @@ # ${MAKEOBJDIRPREFIX}/do_elf_kernel : @if [ -f /var/db/update.cfg -a -f ${.CURDIR}/tools/tools/upgrade/doupgrade.sh ]; then \ - env MACHINE=${MACHINE} CURDIR=${.CURDIR} sh ${.CURDIR}/tools/tools/upgrade/doupgrade.sh 2 /var/db/update.cfg; \ + MACHINE=${MACHINE} CURDIR=${.CURDIR} sh ${.CURDIR}/tools/tools/upgrade/doupgrade.sh 2 /var/db/update.cfg; \ fi @touch ${MAKEOBJDIRPREFIX}/do_elf_kernel @rm -f /var/db/update.cfg ==== //depot/projects/ia64/etc/rc.network#11 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.network,v 1.129 2002/03/17 07:35:51 dougb Exp $ +# $FreeBSD: src/etc/rc.network,v 1.131 2002/03/19 03:45:02 des Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -85,6 +85,7 @@ else echo 'Warning: IP-filter module failed to load.' # avoid further errors + ipfilter_active="NO" ipmon_enable="NO" ipfilter_enable="NO" ipnat_enable="NO" @@ -298,11 +299,12 @@ # Re-Sync ipfilter so it picks up any new network interfaces # - case ${ipfilter_enable} in + case ${ipfilter_active} in [Yy][Ee][Ss]) ${ipfilter_program:-/sbin/ipf} -y ${ipfilter_flags} >/dev/null ;; esac + unset ipfilter_active # Initialize IP filtering using ipfw # @@ -845,13 +847,17 @@ case ${sshd_enable} in [Yy][Ee][Ss]) - if [ ! -f /etc/ssh/ssh_host_key ]; then - echo ' creating ssh RSA host key'; - /usr/bin/ssh-keygen -N "" -f /etc/ssh/ssh_host_key - fi - if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then - echo ' creating ssh DSA host key'; - /usr/bin/ssh-keygen -d -N "" -f /etc/ssh/ssh_host_dsa_key + if [ -x /usr/bin/ssh-keygen ]; then + if [ ! -f /etc/ssh/ssh_host_key ]; then + echo ' creating ssh RSA host key'; + /usr/bin/ssh-keygen -trsa1 -N "" \ + -f /etc/ssh/ssh_host_key + fi + if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then + echo ' creating ssh DSA host key'; + /usr/bin/ssh-keygen -tdsa -N "" \ + -f /etc/ssh/ssh_host_dsa_key + fi fi ;; esac ==== //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#4 (text+ko) ==== @@ -1,13 +1,13 @@ &os;/&arch; &release.current; Release Notes The FreeBSD Project - $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml,v 1.3 2002/03/18 19:41:51 ue Exp $ + $FreeBSD: src/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml,v 1.4 2002/03/19 05:26:14 ue Exp $ 2000 @@ -1839,6 +1839,17 @@ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:13.openssh.asc">FreeBSD-SA-02:13). &merged; + Durch einen Fehler in zlib war es + möglich, daß Speicher doppelt freigegeben wurde. Die + &man.malloc.3;/&man.free.3; Routinen von &os; sind von diesem + Fehler nicht betroffen, einzelne Anwendungen könnten aber + durch entsprechend konstruierte Pakete mit komprimierten Daten + beeinträchtigt oder zum Absturz gebracht werden. Der + Fehler in zlib wurde mittlerweile + beseitigt. Informationen, wie Sie dieses Problem umgehen bzw. + beseitigen können, finden Sie in FreeBSD-SA-02:18. + &merged; ==== //depot/projects/ia64/share/mk/bsd.dep.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.28 2002/03/15 18:43:59 obrien Exp $ +# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.29 2002/03/19 06:11:43 bde Exp $ # # The include file handles Makefile dependencies. # @@ -28,7 +28,7 @@ # If HTML is defined, htags is also run after gtags. -MKDEPCMD?= env CC=${CC} mkdep +MKDEPCMD?= CC=${CC} mkdep DEPENDFILE?= .depend .if defined(SRCS) ==== //depot/projects/ia64/share/mk/bsd.info.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.info.mk,v 1.59 2001/03/27 08:43:28 ru Exp $ +# $FreeBSD: src/share/mk/bsd.info.mk,v 1.60 2002/03/19 06:11:43 bde Exp $ # # The include file handles installing GNU (tech)info files. # Texinfo is a documentation system that uses a single source @@ -109,18 +109,18 @@ -o ${.TARGET} .texi.dvi .texinfo.dvi: - env TEXINPUTS=${.CURDIR}:${SRCDIR}:$$TEXINPUTS \ + TEXINPUTS=${.CURDIR}:${SRCDIR}:$$TEXINPUTS \ ${TEX} ${.IMPSRC} > ${.IMPSRC:T:R}-la.texi - env TEXINPUTS=${.CURDIR}:${SRCDIR}:$$TEXINPUTS \ + TEXINPUTS=${.CURDIR}:${SRCDIR}:$$TEXINPUTS \ ${TEX} ${.IMPSRC:T:R}-la.texi ${.TARGET}.new ==== //depot/projects/ia64/sys/conf/kern.post.mk#5 (text+ko) ==== @@ -8,7 +8,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.12 2002/03/18 09:35:45 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.13 2002/03/19 06:30:24 bde Exp $ # .PHONY: all modules @@ -98,10 +98,12 @@ ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/} if [ -f .olddep ]; then mv .olddep .depend; fi rm -f .newdep - ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | xargs \ - env MKDEP_CPP="${CC} -E" CC="${CC}" mkdep -a -f .newdep ${CFLAGS} - ${MAKE} -V SFILES -V SYSTEM_SFILES | xargs \ - env MKDEP_CPP="${CC} -E" mkdep -a -f .newdep ${ASM_CFLAGS} + MKDEP_CPP="${CC} -E" CC="${CC}" \ + ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | xargs \ + mkdep -a -f .newdep ${CFLAGS} + MKDEP_CPP="${CC} -E" \ + ${MAKE} -V SFILES -V SYSTEM_SFILES | xargs \ + mkdep -a -f .newdep ${ASM_CFLAGS} rm -f .depend mv .newdep .depend @@ -178,34 +180,34 @@ modules: @mkdir -p ${.OBJDIR}/modules - cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \ - env ${MKMODULESENV} ${MAKE} all + cd $S/modules ; ${MKMODULESENV} ${MAKE} obj ; \ + ${MKMODULESENV} ${MAKE} all modules-depend: @mkdir -p ${.OBJDIR}/modules - cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \ - env ${MKMODULESENV} ${MAKE} depend + cd $S/modules ; ${MKMODULESENV} ${MAKE} obj ; \ + ${MKMODULESENV} ${MAKE} depend modules-clean: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} clean + cd $S/modules ; ${MKMODULESENV} ${MAKE} clean modules-cleandepend: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandepend + cd $S/modules ; ${MKMODULESENV} ${MAKE} cleandepend modules-clobber: modules-clean rm -rf ${MKMODULESENV} modules-cleandir: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandir + cd $S/modules ; ${MKMODULESENV} ${MAKE} cleandir modules-tags: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags + cd $S/modules ; ${MKMODULESENV} ${MAKE} tags modules-install modules-reinstall: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} install + cd $S/modules ; ${MKMODULESENV} ${MAKE} install modules-install.debug modules-reinstall.debug: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} install.debug + cd $S/modules ; ${MKMODULESENV} ${MAKE} install.debug config.o: ${NORMAL_C} ==== //depot/projects/ia64/sys/dev/md/md.c#6 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.55 2002/03/19 01:45:04 gallatin Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.56 2002/03/19 04:07:29 bde Exp $ * */ @@ -384,9 +384,9 @@ if (md_debug > 1) printf("mdstrategy(%p) %s %x, %lld, %ld, %p)\n", - bp, devtoname(bp->bio_dev), bp->bio_flags, - (long long)bp->bio_blkno, - bp->bio_bcount / DEV_BSIZE, bp->bio_data); + (void *)bp, devtoname(bp->bio_dev), bp->bio_flags, + (long long)bp->bio_blkno, bp->bio_bcount / DEV_BSIZE, + (void *)bp->bio_data); sc = bp->bio_dev->si_drv1; ==== //depot/projects/ia64/sys/dev/txp/if_txp.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $ */ -/* $FreeBSD: src/sys/dev/txp/if_txp.c,v 1.8 2001/12/03 17:28:27 brooks Exp $ */ +/* $FreeBSD: src/sys/dev/txp/if_txp.c,v 1.9 2002/03/19 05:14:23 jeff Exp $ */ /* * Copyright (c) 2001 @@ -88,7 +88,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.8 2001/12/03 17:28:27 brooks Exp $"; + "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.9 2002/03/19 05:14:23 jeff Exp $"; #endif /* @@ -486,6 +486,7 @@ u_int32_t r; int i; + r = 0; WRITE_REG(sc, TXP_SRR, TXP_SRR_ALL); DELAY(1000); WRITE_REG(sc, TXP_SRR, 0); @@ -515,6 +516,7 @@ int sect; u_int32_t r, i, ier, imr; + r = 0; ier = READ_REG(sc, TXP_IER); WRITE_REG(sc, TXP_IER, ier | TXP_INT_A2H_0); @@ -586,6 +588,7 @@ { u_int32_t i, r; + r = 0; for (i = 0; i < 10000; i++) { r = READ_REG(sc, TXP_ISR); if (r & TXP_INT_A2H_0) @@ -960,6 +963,7 @@ u_int32_t r; int i; + r = 0; ld = sc->sc_ldata; boot = &ld->txp_boot; ==== //depot/projects/ia64/sys/i386/i386/perfmon.c#3 (text+ko) ==== @@ -26,13 +26,14 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/perfmon.c,v 1.26 2001/12/18 00:27:15 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/perfmon.c,v 1.28 2002/03/19 06:45:25 alc Exp $ */ #include #include #include #include +#include #ifndef SMP #include @@ -58,6 +59,16 @@ static d_open_t perfmon_open; static d_ioctl_t perfmon_ioctl; +/* + * XXX perfmon_init_dev(void *) is a split from the perfmon_init() funtion. + * This solves a problem for DEVFS users. It loads the "perfmon" driver after + * the DEVFS subsystem has been kicked into action. The SI_ORDER_ANY is to + * assure that it is the most lowest priority task which, guarantees the + * above. + */ +static void perfmon_init_dev __P((void *)); +SYSINIT(cpu, SI_SUB_DRIVERS, SI_ORDER_ANY, perfmon_init_dev, NULL); + #define CDEV_MAJOR 2 /* We're really a minor of mem.c */ static struct cdevsw perfmon_cdevsw = { /* open */ perfmon_open, @@ -105,6 +116,12 @@ break; } #endif /* SMP */ +} + +static void +perfmon_init_dev(dummy) + void *dummy; +{ make_dev(&perfmon_cdevsw, 32, UID_ROOT, GID_KMEM, 0640, "perfmon"); } ==== //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#4 (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. * - * $FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.95 2002/02/07 20:58:44 julian Exp $ + * $FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.96 2002/03/19 04:54:30 alc Exp $ */ /* XXX we use functions that might not exist. */ @@ -285,32 +285,6 @@ PROC_UNLOCK(p); /* - * grow() will return FALSE if the fp will not fit inside the stack - * and the stack can not be grown. useracc will return FALSE - * if access is denied. - */ - if ((grow_stack (p, (int)fp) == FALSE) || - !useracc((caddr_t)fp, sizeof (struct l_rt_sigframe), - VM_PROT_WRITE)) { - /* - * Process has trashed its stack; give it an illegal - * instruction to halt it in its tracks. - */ - PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); -#ifdef DEBUG - if (ldebug(rt_sendsig)) - printf(LMSG("rt_sendsig: bad stack %p, oonstack=%x"), - fp, oonstack); -#endif - psignal(p, SIGILL); - return; - } - - /* * Build the argument list for the signal handler. */ if (p->p_sysent->sv_sigtbl) @@ -374,9 +348,13 @@ * Process has trashed its stack; give it an illegal * instruction to halt it in its tracks. */ +#ifdef DEBUG + if (ldebug(rt_sendsig)) + printf(LMSG("rt_sendsig: bad stack %p, oonstack=%x"), + fp, oonstack); +#endif PROC_LOCK(p); sigexit(td, SIGILL); - /* NOTREACHED */ } /* @@ -444,27 +422,6 @@ PROC_UNLOCK(p); /* - * grow() will return FALSE if the fp will not fit inside the stack - * and the stack can not be grown. useracc will return FALSE - * if access is denied. - */ - if ((grow_stack (p, (int)fp) == FALSE) || - !useracc((caddr_t)fp, sizeof (struct l_sigframe), - VM_PROT_WRITE)) { - /* - * Process has trashed its stack; give it an illegal - * instruction to halt it in its tracks. - */ - PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); - return; - } - - /* * Build the argument list for the signal handler. */ if (p->p_sysent->sv_sigtbl) @@ -511,7 +468,6 @@ */ PROC_LOCK(p); sigexit(td, SIGILL); - /* NOTREACHED */ } /* ==== //depot/projects/ia64/sys/kern/kern_descrip.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.128 2002/03/15 08:03:46 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.129 2002/03/19 04:30:04 alfred Exp $ */ #include "opt_compat.h" @@ -1321,10 +1321,11 @@ fdfree(td) struct thread *td; { - register struct filedesc *fdp = td->td_proc->p_fd; + register struct filedesc *fdp; struct file **fpp; register int i; + fdp = td->td_proc->p_fd; /* Certain daemons might not have file descriptors. */ if (fdp == NULL) return; @@ -1344,6 +1345,11 @@ if (*fpp) (void) closef(*fpp, td); } + + PROC_LOCK(td->td_proc); + td->td_proc->p_fd = NULL; + PROC_UNLOCK(td->td_proc); + if (fdp->fd_nfiles > NDFILE) FREE(fdp->fd_ofiles, M_FILEDESC); if (fdp->fd_cdir) ==== //depot/projects/ia64/sys/kern/vfs_bio.c#9 (text+ko) ==== @@ -11,7 +11,7 @@ * 2. Absolutely no warranty of function or purpose is made by the author * John S. Dyson. * - * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.305 2002/03/17 00:56:40 jake Exp $ + * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.306 2002/03/19 04:09:20 bde Exp $ */ /* @@ -3349,8 +3349,10 @@ p = bp->b_pages[index]; if (p && (index < bp->b_npages)) { if (p->busy) { - printf("vm_hold_free_pages: blkno: %lld, lblkno: %lld\n", - bp->b_blkno, bp->b_lblkno); + printf( + "vm_hold_free_pages: blkno: %lld, lblkno: %lld\n", + (long long)bp->b_blkno, + (long long)bp->b_lblkno); } bp->b_pages[index] = NULL; pmap_qremove(pg, 1); @@ -3379,12 +3381,12 @@ } db_printf("b_flags = 0x%b\n", (u_int)bp->b_flags, PRINT_BUF_FLAGS); - db_printf("b_error = %d, b_bufsize = %ld, b_bcount = %ld, " - "b_resid = %ld\nb_dev = (%d,%d), b_data = %p, " - "b_blkno = %lld, b_pblkno = %lld\n", - bp->b_error, bp->b_bufsize, bp->b_bcount, bp->b_resid, - major(bp->b_dev), minor(bp->b_dev), - bp->b_data, bp->b_blkno, bp->b_pblkno); + db_printf( + "b_error = %d, b_bufsize = %ld, b_bcount = %ld, b_resid = %ld\n" + "b_dev = (%d,%d), b_data = %p, b_blkno = %lld, b_pblkno = %lld\n", + bp->b_error, bp->b_bufsize, bp->b_bcount, bp->b_resid, + major(bp->b_dev), minor(bp->b_dev), bp->b_data, + (long long)bp->b_blkno, (long long)bp->b_pblkno); if (bp->b_npages) { int i; db_printf("b_npages = %d, pages(OBJ, IDX, PA): ", bp->b_npages); ==== //depot/projects/ia64/sys/kern/vfs_syscalls.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.231 2002/03/12 04:00:10 jeff Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.232 2002/03/19 04:30:04 alfred Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -446,29 +446,34 @@ { struct filedesc *fdp; struct proc *p; + int nrele; if (olddp->v_usecount == 1) return; sx_slock(&allproc_lock); LIST_FOREACH(p, &allproc, p_list) { + PROC_LOCK(p); fdp = p->p_fd; - if (fdp == NULL) + if (fdp == NULL) { + PROC_UNLOCK(p); continue; + } + nrele = 0; FILEDESC_LOCK(fdp); if (fdp->fd_cdir == olddp) { VREF(newdp); fdp->fd_cdir = newdp; - FILEDESC_UNLOCK(fdp); - vrele(olddp); - FILEDESC_LOCK(fdp); + nrele++; } if (fdp->fd_rdir == olddp) { VREF(newdp); fdp->fd_rdir = newdp; - FILEDESC_UNLOCK(fdp); + nrele++; + } + FILEDESC_UNLOCK(fdp); + PROC_UNLOCK(p); + while (nrele--) vrele(olddp); - } else - FILEDESC_UNLOCK(fdp); } sx_sunlock(&allproc_lock); if (rootvnode == olddp) { ==== //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_snapshot.c 8.11 (McKusick) 7/23/00 - * $FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.32 2002/03/17 01:25:46 mckusick Exp $ + * $FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.33 2002/03/19 04:09:21 bde Exp $ */ #include @@ -1102,9 +1102,10 @@ } #ifdef DEBUG if (snapdebug) - printf("%s%d lbn %d for inum %d size %ld to blkno %lld\n", - "Copyonremove: snapino ", ip->i_number, lbn, - inum, size, cbp->b_blkno); + printf( +"Copyonremove: snapino %lu lbn %ld for inum %lu size %ld to blkno %lld\n", + (unsigned long)ip->i_number, (long)lbn, + (unsigned long)inum, size, (long long)cbp->b_blkno); #endif /* * If we have already read the old block contents, then @@ -1320,8 +1321,8 @@ printf("fs metadata"); else printf("inum %d", VTOI(bp->b_vp)->i_number); - printf(" lblkno %lld to blkno %lld\n", bp->b_lblkno, - cbp->b_blkno); + printf(" lblkno %lld to blkno %lld\n", + (long long)bp->b_lblkno, (long long)cbp->b_blkno); } #endif /* ==== //depot/projects/ia64/usr.bin/uudecode/uudecode.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)uudecode.c 8.2 (Berkeley) 4/2/94"; #endif static const char rcsid[] = - "$FreeBSD: src/usr.bin/uudecode/uudecode.c,v 1.20 2002/03/19 00:44:07 jmallett Exp $"; + "$FreeBSD: src/usr.bin/uudecode/uudecode.c,v 1.21 2002/03/19 02:05:27 jmallett Exp $"; #endif /* not lint */ /* @@ -193,7 +193,7 @@ err(1, "strdup()"); } if (!oflag) { - outfile = strtok(NULL, " \r\n"); + outfile = strtok(NULL, "\r\n"); if (outfile == NULL) errx(1, "no filename in input file"); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 18 23:51:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC9A337B404; Mon, 18 Mar 2002 23:50:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 063C537B426 for ; Mon, 18 Mar 2002 23:50:45 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J7oi454838 for perforce@freebsd.org; Mon, 18 Mar 2002 23:50:44 -0800 (PST) (envelope-from peter@freebsd.org) Date: Mon, 18 Mar 2002 23:50:44 -0800 (PST) Message-Id: <200203190750.g2J7oi454838@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7918 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7918 Change 7918 by peter@peter_overcee on 2002/03/18 23:50:30 Revert bde's 'make depend' breakage. Affected files ... ... //depot/projects/ia64/sys/conf/kern.post.mk#6 edit Differences ... ==== //depot/projects/ia64/sys/conf/kern.post.mk#6 (text+ko) ==== @@ -98,12 +98,10 @@ ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/} if [ -f .olddep ]; then mv .olddep .depend; fi rm -f .newdep - MKDEP_CPP="${CC} -E" CC="${CC}" \ - ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | xargs \ - mkdep -a -f .newdep ${CFLAGS} - MKDEP_CPP="${CC} -E" \ - ${MAKE} -V SFILES -V SYSTEM_SFILES | xargs \ - mkdep -a -f .newdep ${ASM_CFLAGS} + ${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | xargs \ + env MKDEP_CPP="${CC} -E" CC="${CC}" mkdep -a -f .newdep ${CFLAGS} + ${MAKE} -V SFILES -V SYSTEM_SFILES | xargs \ + env MKDEP_CPP="${CC} -E" mkdep -a -f .newdep ${ASM_CFLAGS} rm -f .depend mv .newdep .depend To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:20:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A0BE37B402; Tue, 19 Mar 2002 01:20:44 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9AFF037B41B for ; Tue, 19 Mar 2002 01:20:34 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9KYU77406 for perforce@freebsd.org; Tue, 19 Mar 2002 01:20:34 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:20:34 -0800 (PST) Message-Id: <200203190920.g2J9KYU77406@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7921 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7921 Change 7921 by peter@peter_overcee on 2002/03/19 01:19:49 add #ifdef SMP stuff to fix warnings Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/sal.c#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/sal.c#3 (text+ko) ==== @@ -90,9 +90,11 @@ } case 5: { struct sal_ap_wakeup_descriptor *dp; +#ifdef SMP struct ia64_sal_result sal; struct ia64_fdesc *fptr = (void*)os_boot_rendez; int ipi; +#endif dp = (struct sal_ap_wakeup_descriptor*)p; KASSERT(dp->sale_mechanism == 0, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:24:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC62B37B404; Tue, 19 Mar 2002 01:23:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C4DFE37B417 for ; Tue, 19 Mar 2002 01:23:38 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Nc878750 for perforce@freebsd.org; Tue, 19 Mar 2002 01:23:38 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:23:38 -0800 (PST) Message-Id: <200203190923.g2J9Nc878750@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7922 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7922 Change 7922 by peter@peter_overcee on 2002/03/19 01:22:47 -Wunused Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/autoconf.c#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/autoconf.c#2 (text+ko) ==== @@ -101,7 +101,10 @@ void cpu_rootconf() { +#if defined(NFSCLIENT) && defined(NFS_ROOT) int order = 0; +#endif + #ifdef BOOTP if (!ia64_running_in_simulator()) bootpc_init(); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:24:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 537DF37B405; Tue, 19 Mar 2002 01:23:41 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 160BE37B419 for ; Tue, 19 Mar 2002 01:23:39 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Ncg78755 for perforce@freebsd.org; Tue, 19 Mar 2002 01:23:38 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:23:38 -0800 (PST) Message-Id: <200203190923.g2J9Ncg78755@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7923 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7923 Change 7923 by peter@peter_overcee on 2002/03/19 01:23:00 no clock calibration yet Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/clock.c#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/clock.c#2 (text+ko) ==== @@ -119,7 +119,9 @@ static u_int32_t max_cycles_per_tick; static u_int32_t last_time; +#if 0 /* not used yet */ static u_int32_t calibrate_clocks(u_int32_t firmware_freq); +#endif void clockattach(kobj_t dev) @@ -194,6 +196,7 @@ stathz = 128; } +#if 0 /* not used yet */ static u_int32_t calibrate_clocks(u_int32_t firmware_freq) { @@ -247,6 +250,7 @@ firmware_freq); return (firmware_freq); } +#endif void handleclock(void* arg) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:24:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C5A437B400; Tue, 19 Mar 2002 01:24:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A848337B402 for ; Tue, 19 Mar 2002 01:24:40 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Oeg79020 for perforce@freebsd.org; Tue, 19 Mar 2002 01:24:40 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:24:40 -0800 (PST) Message-Id: <200203190924.g2J9Oeg79020@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7924 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7924 Change 7924 by peter@peter_overcee on 2002/03/19 01:24:35 "fix" a warning (with a sledge hammer). warning: left shift >= sizeof type I think this is a bogus warning, but I'm not sure. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/db_disasm.c#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/db_disasm.c#2 (text+ko) ==== @@ -737,11 +737,14 @@ ia64_print_I24(const char *name, u_int64_t ins, db_addr_t loc) { union ia64_instruction u; + u_int64_t i; u.ins = ins; + i = u.I24.s; + i = i << 43; + i |= u.I24.imm27a << 16; db_printf("%s pr.rot=%lx", name, - sign_extend(((u_int64_t) u.I24.s << 43) - | (u.I24.imm27a << 16), 44)); + sign_extend(i, 44)); } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:25:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4A3B37B402; Tue, 19 Mar 2002 01:25:44 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3850C37B400 for ; Tue, 19 Mar 2002 01:25:42 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Pga79269 for perforce@freebsd.org; Tue, 19 Mar 2002 01:25:42 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:25:42 -0800 (PST) Message-Id: <200203190925.g2J9Pga79269@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7925 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7925 Change 7925 by peter@peter_overcee on 2002/03/19 01:24:55 matching #if 0 for -Wunused ddbprinttrap() Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/db_interface.c#6 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/db_interface.c#6 (text+ko) ==== @@ -270,6 +270,7 @@ return 0; } +#if 0 /* * Print trap reason. */ @@ -281,6 +282,7 @@ printf("ddbprinttrap(%d)\n", vector); } +#endif #define CPUSTOP_ON_DDBBREAK #define VERBOSE_CPUSTOP_ON_DDBBREAK To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:25:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D9E037B417; Tue, 19 Mar 2002 01:25:45 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6FF2837B404 for ; Tue, 19 Mar 2002 01:25:42 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Pge79275 for perforce@freebsd.org; Tue, 19 Mar 2002 01:25:42 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:25:42 -0800 (PST) Message-Id: <200203190925.g2J9Pge79275@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7926 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7926 Change 7926 by peter@peter_overcee on 2002/03/19 01:25:17 Fix pointer/integer comparison Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/db_trace.c#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/db_trace.c#3 (text+ko) ==== @@ -88,7 +88,7 @@ nargs = sof - sol; if (nargs > 8) nargs = 8; - if (bsp >= IA64_RR_BASE(5)) { + if (bsp >= (u_int64_t *)IA64_RR_BASE(5)) { for (i = 0; i < nargs; i++) { p = ia64_rse_register_address(bsp, 32 + i); db_read_bytes((vm_offset_t) p, sizeof(reg), To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:26: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4231837B404; Tue, 19 Mar 2002 01:25:47 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A57A037B405 for ; Tue, 19 Mar 2002 01:25:42 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Pgd79280 for perforce@freebsd.org; Tue, 19 Mar 2002 01:25:42 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:25:42 -0800 (PST) Message-Id: <200203190925.g2J9Pgd79280@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7927 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7927 Change 7927 by peter@peter_overcee on 2002/03/19 01:25:28 -Wunused Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/elf_machdep.c#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/elf_machdep.c#2 (text+ko) ==== @@ -42,7 +42,6 @@ { Elf_Addr relocbase = (Elf_Addr) lf->address; Elf_Addr *where; - Elf_Addr addr; Elf_Addr addend; Elf_Word rtype; const Elf_Rel *rel; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:26:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6742537B417; Tue, 19 Mar 2002 01:26:45 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 50E5537B402 for ; Tue, 19 Mar 2002 01:26:44 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Qi079571 for perforce@freebsd.org; Tue, 19 Mar 2002 01:26:44 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:26:44 -0800 (PST) Message-Id: <200203190926.g2J9Qi079571@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7928 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7928 Change 7928 by peter@peter_overcee on 2002/03/19 01:26:04 #if 0 around the rest of the file, since the body of the stub function that calls this crud is also #if 0. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/ia64-gdbstub.c#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/ia64-gdbstub.c#2 (text+ko) ==== @@ -111,6 +111,7 @@ void gdb_handle_exception (db_regs_t *, int); +#if 0 extern jmp_buf db_jmpbuf; /************************************************************************/ @@ -396,6 +397,8 @@ #define VFP 65 #define NUM_REGS 66 +#endif + /* * This function does all command procesing for interfacing to gdb. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:27: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D20C037B419; Tue, 19 Mar 2002 01:26:45 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8E65937B405 for ; Tue, 19 Mar 2002 01:26:44 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Qil79584 for perforce@freebsd.org; Tue, 19 Mar 2002 01:26:44 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:26:44 -0800 (PST) Message-Id: <200203190926.g2J9Qil79584@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7929 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7929 Change 7929 by peter@peter_overcee on 2002/03/19 01:26:37 'options SKI' stops real hardware working. DOH! Affected files ... ... //depot/projects/ia64/sys/ia64/conf/SMALL#7 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/SMALL#7 (text+ko) ==== @@ -11,7 +11,7 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions NO_CPU_COPTFLAGS=true #Ignore any x86 CPUTYPE -options SKI #Support for HP simulator +#options SKI #Support for HP simulator options INET #InterNETworking #options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:28: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 237B637B404; Tue, 19 Mar 2002 01:27:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 36EB037B41A for ; Tue, 19 Mar 2002 01:27:46 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Rjl79759 for perforce@freebsd.org; Tue, 19 Mar 2002 01:27:45 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:27:45 -0800 (PST) Message-Id: <200203190927.g2J9Rjl79759@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7930 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7930 Change 7930 by peter@peter_overcee on 2002/03/19 01:27:21 collect some function prototypes together in an include file rather than [incompletely] scattering them around. Affected files ... ... //depot/projects/ia64/sys/ia64/acpica/madt.c#5 edit ... //depot/projects/ia64/sys/ia64/ia64/efi.c#2 edit ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#16 edit ... //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#9 edit ... //depot/projects/ia64/sys/ia64/include/cpu.h#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/acpica/madt.c#5 (text+ko) ==== @@ -28,7 +28,6 @@ #include "acpi.h" -void cpu_mp_add(uint, uint, uint); struct sapic *sapic_create(int, int, u_int64_t); #pragma pack(1) ==== //depot/projects/ia64/sys/ia64/ia64/efi.c#2 (text+ko) ==== ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#16 (text+ko) ==== @@ -82,9 +82,6 @@ #include #include -void ia64_probe_sapics(void); -void map_pal_code(void); - #ifdef SKI extern void ia64_ski_init(void); #endif ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#9 (text+ko) ==== @@ -52,10 +52,7 @@ #include #include -void cpu_mp_add(uint, uint, uint); void ia64_ap_startup(void); -void map_pal_code(void); -int ia64_count_aps(void); extern vm_offset_t vhpt_base, vhpt_size; ==== //depot/projects/ia64/sys/ia64/include/cpu.h#2 (text+ko) ==== @@ -135,6 +135,11 @@ void fork_trampoline __P((void)); /* MAGIC */ void syscall __P((int, u_int64_t *, struct trapframe *)); void trap __P((int vector, int imm, struct trapframe *framep)); +void ia64_probe_sapics(void); +int ia64_count_aps(void); +void map_pal_code(void); +void cpu_mp_add(uint, uint, uint); + /* * Return contents of in-cpu fast counter as a sort of "bogo-time" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:29: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CCD837B404; Tue, 19 Mar 2002 01:28:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0DA4537B404 for ; Tue, 19 Mar 2002 01:28:48 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Sl880116 for perforce@freebsd.org; Tue, 19 Mar 2002 01:28:47 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:28:47 -0800 (PST) Message-Id: <200203190928.g2J9Sl880116@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7932 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7932 Change 7932 by peter@peter_overcee on 2002/03/19 01:28:29 evil nasty hack to deal with abuse of __func__ in dev/acpica/* Affected files ... ... //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h#4 edit Differences ... ==== //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h#4 (text+ko) ==== @@ -472,7 +472,8 @@ #define ACPI_FUNCTION_NAME(a) ACPI_DEBUG_PRINT_INFO _Dbg; \ _Dbg.ComponentId = _COMPONENT; \ - _Dbg.ProcName = a; \ + _Dbg.ProcName = \ + (NATIVE_CHAR *)(uintptr_t)a; \ _Dbg.ModuleName = _THIS_MODULE; #define ACPI_FUNCTION_TRACE(a) ACPI_FUNCTION_NAME(a)\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:29: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E01E237B405; Tue, 19 Mar 2002 01:28:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BED7E37B402 for ; Tue, 19 Mar 2002 01:28:47 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Slq80111 for perforce@freebsd.org; Tue, 19 Mar 2002 01:28:47 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:28:47 -0800 (PST) Message-Id: <200203190928.g2J9Slq80111@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7931 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7931 Change 7931 by peter@peter_overcee on 2002/03/19 01:27:52 add { } to keep gcc-3.1 happy Affected files ... ... //depot/projects/ia64/sys/boot/efi/include/efiapi.h#4 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/include/efiapi.h#4 (text+ko) ==== @@ -664,19 +664,19 @@ // #define MPS_TABLE_GUID \ - { 0xeb9d2d2f, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } + { 0xeb9d2d2f, 0x2d88, 0x11d3, { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } } #define ACPI_TABLE_GUID \ - { 0xeb9d2d30, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } + { 0xeb9d2d30, 0x2d88, 0x11d3, { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } } #define ACPI_20_TABLE_GUID \ - { 0x8868e871, 0xe4f1, 0x11d3, 0xbc, 0x22, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } + { 0x8868e871, 0xe4f1, 0x11d3, { 0xbc, 0x22, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } } #define SMBIOS_TABLE_GUID \ - { 0xeb9d2d31, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } + { 0xeb9d2d31, 0x2d88, 0x11d3, { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } } #define SAL_SYSTEM_TABLE_GUID \ - { 0xeb9d2d32, 0x2d88, 0x11d3, 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } + { 0xeb9d2d32, 0x2d88, 0x11d3, { 0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } } typedef struct _EFI_CONFIGURATION_TABLE { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:29:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87ABA37B402; Tue, 19 Mar 2002 01:29:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9F7A937B400 for ; Tue, 19 Mar 2002 01:29:49 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9TnB80357 for perforce@freebsd.org; Tue, 19 Mar 2002 01:29:49 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:29:49 -0800 (PST) Message-Id: <200203190929.g2J9TnB80357@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7933 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7933 Change 7933 by peter@peter_overcee on 2002/03/19 01:29:12 add the ia64 IO tag, and add a #error to catch this in future. Affected files ... ... //depot/projects/ia64/sys/dev/kbd/atkbdc.c#2 edit Differences ... ==== //depot/projects/ia64/sys/dev/kbd/atkbdc.c#2 (text+ko) ==== @@ -159,6 +159,10 @@ tag = I386_BUS_SPACE_IO; #elif defined(__alpha__) tag = busspace_isa_io; +#elif defined(__ia64__) + tag = IA64_BUS_SPACE_IO; +#else +#error "define tag!" #endif #if notyet To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:30:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3201337B404; Tue, 19 Mar 2002 01:30:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3122037B400 for ; Tue, 19 Mar 2002 01:30:51 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Uoo80972 for perforce@freebsd.org; Tue, 19 Mar 2002 01:30:50 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:30:50 -0800 (PST) Message-Id: <200203190930.g2J9Uoo80972@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7934 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7934 Change 7934 by peter@peter_overcee on 2002/03/19 01:29:55 add const to deal with __func__ being const and resulting warnings.. Affected files ... ... //depot/projects/ia64/sys/kern/subr_sbuf.c#4 edit Differences ... ==== //depot/projects/ia64/sys/kern/subr_sbuf.c#4 (text+ko) ==== @@ -84,7 +84,7 @@ */ #if defined(_KERNEL) && defined(INVARIANTS) static void -_assert_sbuf_integrity(char *fun, struct sbuf *s) +_assert_sbuf_integrity(const char *fun, struct sbuf *s) { KASSERT(s != NULL, ("%s called with a NULL sbuf pointer", fun)); @@ -95,7 +95,7 @@ } static void -_assert_sbuf_state(char *fun, struct sbuf *s, int state) +_assert_sbuf_state(const char *fun, struct sbuf *s, int state) { KASSERT((s->s_flags & SBUF_FINISHED) == state, ("%s called with %sfinished or corrupt sbuf", fun, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:31: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B061937B405; Tue, 19 Mar 2002 01:30:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A2E2D37B402 for ; Tue, 19 Mar 2002 01:30:51 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9UpJ80977 for perforce@freebsd.org; Tue, 19 Mar 2002 01:30:51 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:30:51 -0800 (PST) Message-Id: <200203190930.g2J9UpJ80977@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7935 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7935 Change 7935 by peter@peter_overcee on 2002/03/19 01:30:17 make gcc happy. -Wuninitialized bandaids. Affected files ... ... //depot/projects/ia64/sys/kern/sysv_sem.c#3 edit Differences ... ==== //depot/projects/ia64/sys/kern/sysv_sem.c#3 (text+ko) ==== @@ -815,8 +815,8 @@ u_int nsops = uap->nsops; struct sembuf *sops = NULL; register struct semid_ds *semaptr; - register struct sembuf *sopptr; - register struct sem *semptr; + register struct sembuf *sopptr = 0; + register struct sem *semptr = 0; struct sem_undo *suptr; int i, j, error; int do_wakeup, do_undos; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:31:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E54737B400; Tue, 19 Mar 2002 01:31:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from anchor-post-30.mail.demon.net (anchor-post-30.mail.demon.net [194.217.242.88]) by hub.freebsd.org (Postfix) with ESMTP id 1910B37B404; Tue, 19 Mar 2002 01:31:41 -0800 (PST) Received: from mailgate.nlsystems.com ([62.49.251.130] helo=herring.nlsystems.com) by anchor-post-30.mail.demon.net with esmtp (Exim 3.35 #1) id 16nFxz-000L2I-0U; Tue, 19 Mar 2002 09:31:39 +0000 Received: from salmon.nlsystems.com (salmon [10.0.0.3]) by herring.nlsystems.com (8.11.2/8.11.2) with ESMTP id g2J9UO907246; Tue, 19 Mar 2002 09:30:24 GMT (envelope-from dfr@nlsystems.com) Date: Tue, 19 Mar 2002 09:27:05 +0000 (GMT) From: Doug Rabson To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 7927 for review In-Reply-To: <200203190925.g2J9Pgd79280@freefall.freebsd.org> Message-ID: <20020319092510.V504-100000@salmon.nlsystems.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, 19 Mar 2002, Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7927 > > Change 7927 by peter@peter_overcee on 2002/03/19 01:25:28 > > -Wunused As far as I'm concerned, most of this stuff can go right into CVS. In fact, for most kernel work, I don't think there is a strong case for using P4 for the ia64 stuff. -- Doug Rabson Mail: dfr@nlsystems.com Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:32: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E50D037B404; Tue, 19 Mar 2002 01:31:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EFD5A37B400 for ; Tue, 19 Mar 2002 01:31:52 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Vqk81189 for perforce@freebsd.org; Tue, 19 Mar 2002 01:31:52 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:31:52 -0800 (PST) Message-Id: <200203190931.g2J9Vqk81189@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7936 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7936 Change 7936 by peter@peter_overcee on 2002/03/19 01:30:55 make gcc happy. "warning: deprecated use of label at end of compound statement". Affected files ... ... //depot/projects/ia64/sys/dev/acpica/Osd/OsdHardware.c#3 edit ... //depot/projects/ia64/sys/dev/acpica/Osd/OsdMemory.c#6 edit ... //depot/projects/ia64/sys/kern/kern_synch.c#3 edit ... //depot/projects/ia64/sys/vm/vm_glue.c#6 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/Osd/OsdHardware.c#3 (text+ko) ==== @@ -75,6 +75,7 @@ break; default: /* debug trap goes here */ + break; } return(AE_OK); @@ -98,6 +99,7 @@ break; default: /* debug trap goes here */ + break; } return(AE_OK); @@ -129,6 +131,7 @@ break; default: /* debug trap goes here */ + break; } ==== //depot/projects/ia64/sys/dev/acpica/Osd/OsdMemory.c#6 (text+ko) ==== @@ -118,6 +118,7 @@ break; default: /* debug trap goes here */ + break; } AcpiOsUnmapMemory(LogicalAddress, Width / 8); @@ -152,6 +153,7 @@ break; default: /* debug trap goes here */ + break; } AcpiOsUnmapMemory(LogicalAddress, Width / 8); ==== //depot/projects/ia64/sys/kern/kern_synch.c#3 (text+ko) ==== @@ -878,6 +878,7 @@ nrun++; } nextproc: + continue; } } sx_sunlock(&allproc_lock); ==== //depot/projects/ia64/sys/vm/vm_glue.c#6 (text+ko) ==== @@ -585,6 +585,7 @@ vmspace_free(vm); } nextproc: + continue; } sx_sunlock(&allproc_lock); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:35:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F259D37B405; Tue, 19 Mar 2002 01:34:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 217AE37B404 for ; Tue, 19 Mar 2002 01:34:57 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2J9Yuj81955 for perforce@freebsd.org; Tue, 19 Mar 2002 01:34:56 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 01:34:56 -0800 (PST) Message-Id: <200203190934.g2J9Yuj81955@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7937 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7937 Change 7937 by peter@peter_overcee on 2002/03/19 01:34:32 no longer need interrupt printf's Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/interrupt.c#6 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#6 (text+ko) ==== @@ -91,7 +91,6 @@ { struct thread *td; volatile struct ia64_interrupt_block *ib = IA64_INTERRUPT_BLOCK; - static int clk; td = curthread; atomic_add_int(&td->td_intr_nesting_level, 1); @@ -121,11 +120,6 @@ /* divide hz (1024) by 8 to get stathz (128) */ if((++schedclk2 & 0x7) == 0) statclock((struct clockframe *)framep); - clk++; - if (clk >= 10000) { - printf("\nCLOCK %d\n", clk); - clk = 0; - } critical_exit(); #ifdef SMP } else if (vector == mp_ipi_vector[IPI_AST]) { @@ -152,10 +146,8 @@ CTR1(KTR_SMP, "IPI_TEST, cpuid=%d", PCPU_GET(cpuid)); mp_ipi_test++; #endif - } else { - printf("INT %d\n", vector); + } else ia64_dispatch_intr(framep, vector); - } out: atomic_subtract_int(&td->td_intr_nesting_level, 1); @@ -249,8 +241,6 @@ int errcode; int vector = irq + IA64_HARDWARE_IRQ_BASE; -printf("ia64_setup_intr: %s irq %d\n", name, irq); - /* * XXX - Can we have more than one device on a vector? If so, we have * a race condition here that needs to be worked around similar to @@ -309,10 +299,8 @@ * Find the interrupt thread for this vector. */ i = ia64_intrs[vector]; - if (i == NULL) { -printf("STRAY INTR %ld\n", vector); + if (i == NULL) return; /* no ithread for this vector */ - } ithd = i->ithd; KASSERT(ithd != NULL, ("interrupt vector without a thread")); @@ -321,10 +309,8 @@ * As an optimization, if an ithread has no handlers, don't * schedule it to run. */ - if (TAILQ_EMPTY(&ithd->it_handlers)) { -printf("NO HANDLERS\n"); + if (TAILQ_EMPTY(&ithd->it_handlers)) return; - } if (i->cntp) atomic_add_long(i->cntp, 1); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 1:57:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D363837B404; Tue, 19 Mar 2002 01:57:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from rwcrmhc54.attbi.com (rwcrmhc54.attbi.com [216.148.227.87]) by hub.freebsd.org (Postfix) with ESMTP id B746F37B400 for ; Tue, 19 Mar 2002 01:57:12 -0800 (PST) Received: from peter3.wemm.org ([12.232.27.13]) by rwcrmhc54.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020319095712.TAMH1214.rwcrmhc54.attbi.com@peter3.wemm.org> for ; Tue, 19 Mar 2002 09:57:12 +0000 Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by peter3.wemm.org (8.11.0/8.11.0) with ESMTP id g2J9vCs63951 for ; Tue, 19 Mar 2002 01:57:12 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id E6F0B3810; Tue, 19 Mar 2002 01:57:11 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Doug Rabson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 7927 for review In-Reply-To: <20020319092510.V504-100000@salmon.nlsystems.com> Date: Tue, 19 Mar 2002 01:57:11 -0800 From: Peter Wemm Message-Id: <20020319095711.E6F0B3810@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Doug Rabson wrote: > On Tue, 19 Mar 2002, Peter Wemm wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7927 > > > > Change 7927 by peter@peter_overcee on 2002/03/19 01:25:28 > > > > -Wunused > > As far as I'm concerned, most of this stuff can go right into CVS. In > fact, for most kernel work, I don't think there is a strong case for using > P4 for the ia64 stuff. It wasn't going to stay for more than a few hours. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 2:39:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6931B37B419; Tue, 19 Mar 2002 02:39:24 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from anchor-post-31.mail.demon.net (anchor-post-31.mail.demon.net [194.217.242.89]) by hub.freebsd.org (Postfix) with ESMTP id 3C4BC37B416 for ; Tue, 19 Mar 2002 02:39:23 -0800 (PST) Received: from mailgate.nlsystems.com ([62.49.251.130] helo=herring.nlsystems.com) by anchor-post-31.mail.demon.net with esmtp (Exim 3.35 #1) id 16nH1W-000MnB-0V; Tue, 19 Mar 2002 10:39:22 +0000 Received: from herring (herring [10.0.0.2]) by herring.nlsystems.com (8.11.2/8.11.2) with ESMTP id g2JAc3907681; Tue, 19 Mar 2002 10:38:03 GMT (envelope-from dfr@nlsystems.com) Date: Tue, 19 Mar 2002 10:38:03 +0000 (GMT) From: Doug Rabson To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 7927 for review In-Reply-To: <20020319095711.E6F0B3810@overcee.wemm.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, 19 Mar 2002, Peter Wemm wrote: > Doug Rabson wrote: > > On Tue, 19 Mar 2002, Peter Wemm wrote: > > > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7927 > > > > > > Change 7927 by peter@peter_overcee on 2002/03/19 01:25:28 > > > > > > -Wunused > > > > As far as I'm concerned, most of this stuff can go right into CVS. In > > fact, for most kernel work, I don't think there is a strong case for using > > P4 for the ia64 stuff. > > It wasn't going to stay for more than a few hours. Oh, OK :-). -- Doug Rabson Mail: dfr@nlsystems.com Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 2:42:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B2B137B41E; Tue, 19 Mar 2002 02:42:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 762A437B41A for ; Tue, 19 Mar 2002 02:42:18 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2JAgIB21504 for perforce@freebsd.org; Tue, 19 Mar 2002 02:42:18 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 02:42:18 -0800 (PST) Message-Id: <200203191042.g2JAgIB21504@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7939 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7939 Change 7939 by peter@peter_overcee on 2002/03/19 02:42:08 Turn off ITC when in SMP mode. It isn't sync'ed, we'll use the ACPI timer instead. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/clock.c#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/clock.c#3 (text+ko) ==== @@ -82,6 +82,7 @@ extern u_int64_t itc_frequency; +#ifndef SMP static timecounter_get_t ia64_get_timecount; static struct timecounter ia64_timecounter = { @@ -94,6 +95,7 @@ SYSCTL_OPAQUE(_debug, OID_AUTO, ia64_timecounter, CTLFLAG_RD, &ia64_timecounter, sizeof(ia64_timecounter), "S,timecounter", ""); +#endif /* Values for timerX_state: */ #define RELEASED 0 @@ -187,8 +189,10 @@ scaled_ticks_per_cycle = ((u_int64_t)hz << FIX_SHIFT) / freq; max_cycles_per_tick = 2*freq / hz; +#ifndef SMP ia64_timecounter.tc_frequency = freq; tc_init(&ia64_timecounter); +#endif ia64_set_itm(ia64_get_itc() + (itc_frequency + hz/2) / hz); ia64_set_itv(255); /* highest priority class */ @@ -418,11 +422,13 @@ CLOCK_SET(clockdev, &ct); } +#ifndef SMP static unsigned ia64_get_timecount(struct timecounter* tc) { return ia64_get_itc(); } +#endif int acquire_timer2(int mode) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 3:30: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFB2037B402; Tue, 19 Mar 2002 03:29:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39]) by hub.freebsd.org (Postfix) with ESMTP id 3DE4B37B400 for ; Tue, 19 Mar 2002 03:29:49 -0800 (PST) Received: from peter3.wemm.org ([12.232.27.13]) by rwcrmhc53.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020319112948.JQGN2951.rwcrmhc53.attbi.com@peter3.wemm.org> for ; Tue, 19 Mar 2002 11:29:48 +0000 Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by peter3.wemm.org (8.11.0/8.11.0) with ESMTP id g2JBTms64745 for ; Tue, 19 Mar 2002 03:29:48 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 857FB3810; Tue, 19 Mar 2002 03:29:48 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Doug Rabson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 7927 for review In-Reply-To: Date: Tue, 19 Mar 2002 03:29:48 -0800 From: Peter Wemm Message-Id: <20020319112948.857FB3810@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Doug Rabson wrote: > On Tue, 19 Mar 2002, Peter Wemm wrote: > > > Doug Rabson wrote: > > > On Tue, 19 Mar 2002, Peter Wemm wrote: > > > > > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7927 > > > > > > > > Change 7927 by peter@peter_overcee on 2002/03/19 01:25:28 > > > > > > > > -Wunused > > > > > > As far as I'm concerned, most of this stuff can go right into CVS. In > > > fact, for most kernel work, I don't think there is a strong case for usin g > > > P4 for the ia64 stuff. > > > > It wasn't going to stay for more than a few hours. > > Oh, OK :-). I dont like committing something unless I've been able to make it work in some form. :-) There are still a few loose ends that I dont think can be committed as-is, eg: +++ //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h 2002/03/19 01:28:29 @@ -472,7 +472,8 @@ #define ACPI_FUNCTION_NAME(a) ACPI_DEBUG_PRINT_INFO _Dbg; \ _Dbg.ComponentId = _COMPONENT; \ - _Dbg.ProcName = a; \ + _Dbg.ProcName = \ + (NATIVE_CHAR *)(uintptr_t)a; \ _Dbg.ModuleName = _THIS_MODULE; #define ACPI_FUNCTION_TRACE(a) ACPI_FUNCTION_NAME(a)\ This is unhappy with gcc-3.1, where the [ab]use of __func__ in dev/acpica/* is causing a lot of compiler spewage. I can either change the ACPI_FUNCTION_TRACE(__func__); lines to ACPI_FUNCTION_TRACE("acpi_function"); like they probably should have been to start with. Touching the macro is easier, but takes the file off the vendor branch. Same here: +++ //depot/projects/ia64/sys/contrib/dev/acpica/nsxfobj.c 2002/03/11 01:37:50 @@ -309,7 +309,7 @@ */ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Needed buffer size %X, %s\n", - BufferSpaceNeeded, AcpiFormatException (Status))); + (int)BufferSpaceNeeded, AcpiFormatException (Status))); } else { and about another 20 of these.. I added ended up adding -Wno-format to my CFLAGS :-) These can probably go. I do regularly check the diff to make sure that I'm not sitting on something that should be in the tree. It only takes 4.5 seconds to diff the entire tree (45000 files) relative to the last integrate point. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 3:52: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABEA137B416; Tue, 19 Mar 2002 03:51:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BA1B437B404 for ; Tue, 19 Mar 2002 03:51:56 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2JBpuH56297 for perforce@freebsd.org; Tue, 19 Mar 2002 03:51:56 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 03:51:56 -0800 (PST) Message-Id: <200203191151.g2JBpuH56297@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7951 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7951 Change 7951 by peter@peter_overcee on 2002/03/19 03:50:58 try my luck again, turn stuff back on. Affected files ... ... //depot/projects/ia64/sys/ia64/conf/SMALL#8 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/SMALL#8 (text+ko) ==== @@ -11,7 +11,7 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions NO_CPU_COPTFLAGS=true #Ignore any x86 CPUTYPE -#options SKI #Support for HP simulator +#options SKI #Support for HP simulator options INET #InterNETworking #options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem @@ -33,7 +33,7 @@ options P1003_1B #Posix P1003_1B real-time extentions options _KPOSIX_PRIORITY_SCHEDULING options CONSPEED=115200 -#options SMP +options SMP # Debugging for use in -current options DDB @@ -52,14 +52,14 @@ #device fdc # ATA and ATAPI devices -#device ata -#device atadisk # ATA disk drives -#device atapicd # ATAPI CDROM drives -#device atapifd # ATAPI floppy drives +device ata +device atadisk # ATA disk drives +device atapicd # ATAPI CDROM drives +device atapifd # ATAPI floppy drives #device atapist # ATAPI tape drives # SCSI Controllers -#device ahc # AHA2940 and onboard AIC7xxx devices +device ahc # AHA2940 and onboard AIC7xxx devices #device esp # 53C94 & friends, not CAM-ified device isp # Qlogic family #device ncr # NCR/Symbios Logic @@ -135,12 +135,12 @@ device bpf #Berkeley packet filter # USB support -#device uhci # UHCI PCI->USB interface -#device ohci # OHCI PCI->USB interface -#device usb # USB Bus (required) -#device ugen # Generic -#device uhid # "Human Interface Devices" -#device ukbd # Keyboard +device uhci # UHCI PCI->USB interface +device ohci # OHCI PCI->USB interface +device usb # USB Bus (required) +device ugen # Generic +device uhid # "Human Interface Devices" +device ukbd # Keyboard #device ulpt # Printer #device umass # Disks/Mass storage - Requires scbus and da0 #device ums # Mouse To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 3:57:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BDFC37B400; Tue, 19 Mar 2002 03:56:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8579037B405 for ; Tue, 19 Mar 2002 03:56:03 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2JBu1k56849 for perforce@freebsd.org; Tue, 19 Mar 2002 03:56:01 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 03:56:01 -0800 (PST) Message-Id: <200203191156.g2JBu1k56849@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7952 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7952 Change 7952 by peter@peter_overcee on 2002/03/19 03:55:31 IFC @7951 Affected files ... ... //depot/projects/ia64/sys/alpha/alpha/pmap.c#5 integrate ... //depot/projects/ia64/sys/boot/efi/Makefile.inc#3 integrate ... //depot/projects/ia64/sys/boot/efi/include/efiapi.h#5 integrate ... //depot/projects/ia64/sys/boot/efi/loader/conf.c#3 integrate ... //depot/projects/ia64/sys/boot/ia64/libski/Makefile#3 integrate ... //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#3 integrate ... //depot/projects/ia64/sys/conf/Makefile.ia64#8 integrate ... //depot/projects/ia64/sys/conf/files#10 integrate ... //depot/projects/ia64/sys/conf/kern.post.mk#7 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/fil.c#3 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_fil.c#3 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#1 branch ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#1 branch ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ipl.h#2 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate ... //depot/projects/ia64/sys/dev/acpica/Osd/OsdHardware.c#4 integrate ... //depot/projects/ia64/sys/dev/acpica/Osd/OsdMemory.c#7 integrate ... //depot/projects/ia64/sys/dev/kbd/atkbdc.c#3 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs#7 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs.h#6 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#6 integrate ... //depot/projects/ia64/sys/i386/i386/pmap.c#6 integrate ... //depot/projects/ia64/sys/ia64/acpica/madt.c#6 integrate ... //depot/projects/ia64/sys/ia64/conf/GENERIC#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/autoconf.c#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/clock.c#4 integrate ... //depot/projects/ia64/sys/ia64/ia64/db_disasm.c#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/db_interface.c#7 integrate ... //depot/projects/ia64/sys/ia64/ia64/db_trace.c#4 integrate ... //depot/projects/ia64/sys/ia64/ia64/elf_machdep.c#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/ia64-gdbstub.c#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#17 integrate ... //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#10 integrate ... //depot/projects/ia64/sys/ia64/ia64/nexus.c#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#9 integrate ... //depot/projects/ia64/sys/ia64/ia64/sal.c#4 integrate ... //depot/projects/ia64/sys/ia64/ia64/sapic.c#5 integrate ... //depot/projects/ia64/sys/ia64/include/cpu.h#3 integrate ... //depot/projects/ia64/sys/ia64/include/vmparam.h#3 integrate ... //depot/projects/ia64/sys/ia64/isa/isa_dma.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_acl.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_malloc.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_synch.c#4 integrate ... //depot/projects/ia64/sys/kern/subr_sbuf.c#5 integrate ... //depot/projects/ia64/sys/kern/sys_pipe.c#6 integrate ... //depot/projects/ia64/sys/kern/sysv_sem.c#4 integrate ... //depot/projects/ia64/sys/kern/uipc_socket.c#5 integrate ... //depot/projects/ia64/sys/kern/uipc_usrreq.c#6 integrate ... //depot/projects/ia64/sys/kern/vfs_lookup.c#3 integrate ... //depot/projects/ia64/sys/netinet/in_pcb.h#4 integrate ... //depot/projects/ia64/sys/netinet/tcp_syncache.c#6 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#5 integrate ... //depot/projects/ia64/sys/sparc64/include/pv.h#3 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#4 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/pv.c#3 integrate ... //depot/projects/ia64/sys/sys/malloc.h#3 integrate ... //depot/projects/ia64/sys/sys/proc.h#6 integrate ... //depot/projects/ia64/sys/sys/socketvar.h#5 integrate ... //depot/projects/ia64/sys/sys/vnode.h#5 integrate ... //depot/projects/ia64/sys/vm/device_pager.c#2 integrate ... //depot/projects/ia64/sys/vm/swap_pager.c#4 integrate ... //depot/projects/ia64/sys/vm/uma.h#1 branch ... //depot/projects/ia64/sys/vm/uma_core.c#1 branch ... //depot/projects/ia64/sys/vm/uma_int.h#1 branch ... //depot/projects/ia64/sys/vm/vm_glue.c#7 integrate ... //depot/projects/ia64/sys/vm/vm_init.c#3 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#6 integrate ... //depot/projects/ia64/sys/vm/vm_map.h#6 integrate ... //depot/projects/ia64/sys/vm/vm_object.c#5 integrate ... //depot/projects/ia64/sys/vm/vm_page.c#5 integrate ... //depot/projects/ia64/sys/vm/vm_pageout.c#6 integrate ... //depot/projects/ia64/sys/vm/vm_zone.h#2 integrate ... //depot/projects/ia64/usr.bin/vmstat/vmstat.c#3 integrate Differences ... ==== //depot/projects/ia64/sys/alpha/alpha/pmap.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.85 2002/02/28 07:40:55 silby Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.86 2002/03/19 09:11:46 jeff Exp $ */ /* @@ -322,11 +322,9 @@ * Data for the pv entry allocation mechanism */ static vm_zone_t pvzone; -static struct vm_zone pvzone_store; static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; static int pmap_pagedaemon_waken = 0; -static struct pv_entry *pvinit; static PMAP_INLINE void free_pv_entry __P((pv_entry_t pv)); static pv_entry_t get_pv_entry __P((void)); @@ -349,6 +347,7 @@ static vm_page_t _pmap_allocpte __P((pmap_t pmap, unsigned ptepindex)); static vm_page_t pmap_page_lookup __P((vm_object_t object, vm_pindex_t pindex)); static int pmap_unuse_pt __P((pmap_t, vm_offset_t, vm_page_t)); +static void *pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); #ifdef SMP static void pmap_invalidate_page_action __P((void *arg)); static void pmap_invalidate_all_action __P((void *arg)); @@ -575,6 +574,13 @@ return 0; } +static void * +pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) +{ + *flags = UMA_SLAB_PRIV; + return (void *)kmem_alloc(kernel_map, bytes); +} + /* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap @@ -609,11 +615,16 @@ initial_pvs = vm_page_array_size; if (initial_pvs < MINPV) initial_pvs = MINPV; +#if 0 pvzone = &pvzone_store; pvinit = (struct pv_entry *) kmem_alloc(kernel_map, initial_pvs * sizeof (struct pv_entry)); zbootinit(pvzone, "PV ENTRY", sizeof (struct pv_entry), pvinit, vm_page_array_size); +#endif + pvzone = zinit("PV ENTRY", sizeof (struct pv_entry), 0, 0, 0); + uma_zone_set_allocf(pvzone, pmap_allocf); + uma_prealloc(pvzone, initial_pvs); /* * object for kernel page table pages */ @@ -638,7 +649,10 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_page_array_size; pv_entry_high_water = 9 * (pv_entry_max / 10); +#if 0 zinitna(pvzone, &pvzone_obj, NULL, 0, pv_entry_max, ZONE_INTERRUPT, 1); +#endif + uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); } ==== //depot/projects/ia64/sys/boot/efi/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.2 2001/06/16 05:59:45 obrien Exp $ +# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.3 2002/03/19 10:51:57 peter Exp $ # Options used when building app-specific efi components ==== //depot/projects/ia64/sys/boot/efi/include/efiapi.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.2 2001/11/19 06:58:14 peter Exp $ */ +/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.3 2002/03/19 10:50:09 peter Exp $ */ #ifndef _EFI_API_H #define _EFI_API_H ==== //depot/projects/ia64/sys/boot/efi/loader/conf.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.5 2001/09/22 19:12:30 dfr Exp $"; + "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.6 2002/03/19 10:50:41 peter Exp $"; #endif /* not lint */ #include ==== //depot/projects/ia64/sys/boot/ia64/libski/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.2 2001/09/15 09:53:55 dfr Exp $ +# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.3 2002/03/19 10:51:57 peter Exp $ LIB= ski NOPIC= true ==== //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.2 2001/09/26 00:13:08 peter Exp $ +# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.3 2002/03/19 10:51:57 peter Exp $ .PATH: ${.CURDIR}/../common ==== //depot/projects/ia64/sys/conf/Makefile.ia64#8 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.46 2002/02/20 23:35:51 peter Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.47 2002/03/19 10:52:44 peter Exp $ # # Makefile for FreeBSD # ==== //depot/projects/ia64/sys/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.612 2002/03/18 18:23:42 joe Exp $ +# $FreeBSD: src/sys/conf/files,v 1.613 2002/03/19 09:11:46 jeff Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1339,5 +1339,5 @@ vm/vm_pager.c standard vm/vm_swap.c standard vm/vm_unix.c standard -vm/vm_zone.c standard +vm/uma_core.c standard vm/vnode_pager.c standard ==== //depot/projects/ia64/sys/conf/kern.post.mk#7 (text+ko) ==== @@ -8,7 +8,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.13 2002/03/19 06:30:24 bde Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.14 2002/03/19 08:20:44 bde Exp $ # .PHONY: all modules ==== //depot/projects/ia64/sys/contrib/ipfilter/netinet/fil.c#3 (text+ko) ==== @@ -3,6 +3,9 @@ * * See the IPFILTER.LICENCE file for details on licencing. */ +#ifdef __sgi +# include +#endif #include #include #include @@ -34,7 +37,6 @@ # include # include #endif -#include #if !defined(__SVR4) && !defined(__svr4__) # ifndef linux # include @@ -77,10 +79,10 @@ #endif #include #include "netinet/ip_fil.h" -#include "netinet/ip_proxy.h" #include "netinet/ip_nat.h" #include "netinet/ip_frag.h" #include "netinet/ip_state.h" +#include "netinet/ip_proxy.h" #include "netinet/ip_auth.h" # if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) # include @@ -97,8 +99,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -/* static const char rcsid[] = "@(#)$Id: fil.c,v 2.35.2.39 2001/07/18 13:30:32 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.27 2002/01/14 09:07:15 alfred Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.28 2002/03/19 11:44:16 darrenr Exp $"; #endif #ifndef _KERNEL @@ -108,7 +109,7 @@ # define FR_VERBOSE(verb_pr) verbose verb_pr # define FR_DEBUG(verb_pr) debug verb_pr -# define IPLLOG(a, c, d, e) ipllog() +# define IPLLOG(a, c, d, e) ipflog(a, c, d, e) #else /* #ifndef _KERNEL */ # define FR_VERBOSE(verb_pr) # define FR_DEBUG(verb_pr) @@ -263,7 +264,7 @@ fin->fin_off = off; fin->fin_plen = plen; - fin->fin_dp = (void *)tcp; + fin->fin_dp = (char *)tcp; off <<= 3; switch (p) @@ -283,7 +284,7 @@ { case ICMP6_ECHO_REPLY : case ICMP6_ECHO_REQUEST : - minicmpsz = ICMP6ERR_MINPKTLEN; + minicmpsz = ICMP6_MINLEN; break; case ICMP6_DST_UNREACH : case ICMP6_PACKET_TOO_BIG : @@ -383,6 +384,19 @@ fin->fin_data[1] = ntohs(tcp->th_dport); } break; + case IPPROTO_ESP : +#ifdef USE_INET6 + if (v == 6) { + if (plen < 8) + fi->fi_fl |= FI_SHORT; + } else +#endif + if (v == 4) { + if (((ip->ip_len < hlen + 8) && !off) || + (off && off < 8)) + fi->fi_fl |= FI_SHORT; + } + break; default : break; } @@ -548,8 +562,8 @@ * Could be per interface, but this gets real nasty when you don't have * kernel sauce. */ -int fr_scanlist(pass, ip, fin, m) -u_32_t pass; +int fr_scanlist(passin, ip, fin, m) +u_32_t passin; ip_t *ip; register fr_info_t *fin; void *m; @@ -557,20 +571,21 @@ register struct frentry *fr; register fr_ip_t *fi = &fin->fin_fi; int rulen, portcmp = 0, off, skip = 0, logged = 0; - u_32_t passt; + u_32_t pass, passt, passl; + frentry_t *frl; + frl = NULL; + pass = passin; fr = fin->fin_fr; fin->fin_fr = NULL; - fin->fin_rule = 0; - fin->fin_group = 0; off = fin->fin_off; - pass |= (fi->fi_fl << 24); if ((fi->fi_fl & FI_TCPUDP) && (fin->fin_dlen > 3) && !off) portcmp = 1; for (rulen = 0; fr; fr = fr->fr_next, rulen++) { if (skip) { + FR_VERBOSE(("%d (%#x)\n", skip, fr->fr_flags)); skip--; continue; } @@ -581,25 +596,28 @@ * check that we are working for the right interface */ #ifdef _KERNEL -# if BSD >= 199306 +# if (BSD >= 199306) if (fin->fin_out != 0) { if ((fr->fr_oifa && - fr->fr_oifa != ((mb_t *)m)->m_pkthdr.rcvif) || - (fr->fr_ifa && fr->fr_ifa != fin->fin_ifp)) + (fr->fr_oifa != ((mb_t *)m)->m_pkthdr.rcvif))) continue; - } else + } # endif - if (fr->fr_ifa && fr->fr_ifa != fin->fin_ifp) - continue; #else if (opts & (OPT_VERBOSE|OPT_DEBUG)) printf("\n"); - FR_VERBOSE(("%c", (pass & FR_PASS) ? 'p' : - (pass & FR_AUTH) ? 'a' : 'b')); +#endif + + FR_VERBOSE(("%c", fr->fr_skip ? 's' : + (pass & FR_PASS) ? 'p' : + (pass & FR_AUTH) ? 'a' : + (pass & FR_ACCOUNT) ? 'A' : + (pass & FR_NOMATCH) ? 'n' : 'b')); + if (fr->fr_ifa && fr->fr_ifa != fin->fin_ifp) continue; + FR_VERBOSE((":i")); -#endif { register u_32_t *ld, *lm, *lip; register int i; @@ -621,22 +639,19 @@ /* * Unrolled loops (4 each, for 32 bits). */ - i |= ((*lip & *lm) != *ld) << 19; FR_DEBUG(("1a. %#08x & %#08x != %#08x\n", *lip, *lm, *ld)); + i |= ((*lip++ & *lm++) != *ld++) << 5; if (fi->fi_v == 6) { - lip++, lm++, ld++; - i |= ((*lip & *lm) != *ld) << 19; FR_DEBUG(("1b. %#08x & %#08x != %#08x\n", *lip, *lm, *ld)); - lip++, lm++, ld++; - i |= ((*lip & *lm) != *ld) << 19; + i |= ((*lip++ & *lm++) != *ld++) << 5; FR_DEBUG(("1c. %#08x & %#08x != %#08x\n", *lip, *lm, *ld)); - lip++, lm++, ld++; - i |= ((*lip & *lm) != *ld) << 19; + i |= ((*lip++ & *lm++) != *ld++) << 5; FR_DEBUG(("1d. %#08x & %#08x != %#08x\n", *lip, *lm, *ld)); + i |= ((*lip++ & *lm++) != *ld++) << 5; } else { lip += 3; lm += 3; @@ -645,23 +660,19 @@ i ^= (fr->fr_flags & FR_NOTSRCIP); if (i) continue; - lip++, lm++, ld++; - i |= ((*lip & *lm) != *ld) << 20; FR_DEBUG(("2a. %#08x & %#08x != %#08x\n", *lip, *lm, *ld)); + i |= ((*lip++ & *lm++) != *ld++) << 6; if (fi->fi_v == 6) { - lip++, lm++, ld++; - i |= ((*lip & *lm) != *ld) << 20; FR_DEBUG(("2b. %#08x & %#08x != %#08x\n", *lip, *lm, *ld)); - lip++, lm++, ld++; - i |= ((*lip & *lm) != *ld) << 20; + i |= ((*lip++ & *lm++) != *ld++) << 6; FR_DEBUG(("2c. %#08x & %#08x != %#08x\n", *lip, *lm, *ld)); - lip++, lm++, ld++; - i |= ((*lip & *lm) != *ld) << 20; + i |= ((*lip++ & *lm++) != *ld++) << 6; FR_DEBUG(("2d. %#08x & %#08x != %#08x\n", *lip, *lm, *ld)); + i |= ((*lip++ & *lm++) != *ld++) << 6; } else { lip += 3; lm += 3; @@ -670,14 +681,12 @@ i ^= (fr->fr_flags & FR_NOTDSTIP); if (i) continue; - lip++, lm++, ld++; - i |= ((*lip & *lm) != *ld); FR_DEBUG(("3. %#08x & %#08x != %#08x\n", *lip, *lm, *ld)); - lip++, lm++, ld++; - i |= ((*lip & *lm) != *ld); + i |= ((*lip++ & *lm++) != *ld++); FR_DEBUG(("4. %#08x & %#08x != %#08x\n", *lip, *lm, *ld)); + i |= ((*lip & *lm) != *ld); if (i) continue; } @@ -704,17 +713,30 @@ } } FR_VERBOSE(("*")); - /* - * Just log this packet... - */ + + if (fr->fr_flags & FR_NOMATCH) { + passt = passl; + passl = passin; + fin->fin_fr = frl; + frl = NULL; + if (fr->fr_flags & FR_QUICK) + break; + continue; + } + + passl = passt; passt = fr->fr_flags; + frl = fin->fin_fr; + fin->fin_fr = fr; #if (BSD >= 199306) && (defined(_KERNEL) || defined(KERNEL)) if (securelevel <= 0) #endif if ((passt & FR_CALLNOW) && fr->fr_func) passt = (*fr->fr_func)(passt, ip, fin); - fin->fin_fr = fr; #ifdef IPFILTER_LOG + /* + * Just log this packet... + */ if ((passt & FR_LOGMASK) == FR_LOG) { if (!IPLLOG(passt, ip, fin, m)) { if (passt & FR_LOGORBLOCK) @@ -725,32 +747,33 @@ logged = 1; } #endif /* IPFILTER_LOG */ - if (!(skip = fr->fr_skip) && (passt & FR_LOGMASK) != FR_LOG) - pass = passt; - FR_DEBUG(("pass %#x\n", pass)); ATOMIC_INCL(fr->fr_hits); - if (pass & FR_ACCOUNT) + if (passt & FR_ACCOUNT) fr->fr_bytes += (U_QUAD_T)ip->ip_len; else fin->fin_icode = fr->fr_icode; fin->fin_rule = rulen; fin->fin_group = fr->fr_group; - if (fr->fr_grp) { + if (fr->fr_grp != NULL) { fin->fin_fr = fr->fr_grp; - pass = fr_scanlist(pass, ip, fin, m); + passt = fr_scanlist(passt, ip, fin, m); if (fin->fin_fr == NULL) { fin->fin_rule = rulen; fin->fin_group = fr->fr_group; fin->fin_fr = fr; } - if (pass & FR_DONTCACHE) + if (passt & FR_DONTCACHE) logged = 1; } - if (pass & FR_QUICK) + if (!(skip = fr->fr_skip) && (passt & FR_LOGMASK) != FR_LOG) + pass = passt; + FR_DEBUG(("pass %#x\n", pass)); + if (passt & FR_QUICK) break; } if (logged) pass |= FR_DONTCACHE; + pass |= (fi->fi_fl << 24); return pass; } @@ -806,7 +829,7 @@ /* * disable delayed checksums. */ - if (out && (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA)) { + if ((out != 0) && (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA)) { in_delayed_cksum(m); m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; } @@ -847,6 +870,9 @@ case IPPROTO_ICMP: plen = ICMPERR_MAXPKTLEN - sizeof(ip_t); break; + case IPPROTO_ESP: + plen = 8; + break; # ifdef USE_INET6 case IPPROTO_ICMPV6 : /* @@ -918,20 +944,26 @@ ATOMIC_INCL(frstats[0].fr_ipv6[out]); if (((ip6_t *)ip)->ip6_hlim < fr_minttl) { ATOMIC_INCL(frstats[0].fr_badttl); - if (fr_minttllog) - logit = -2; + if (fr_minttllog & 1) + logit = -3; + if (fr_minttllog & 2) + drop = 1; } } else # endif if (!out) { if (fr_chksrc && !fr_verifysrc(ip->ip_src, ifp)) { ATOMIC_INCL(frstats[0].fr_badsrc); - if (fr_chksrc == 2) + if (fr_chksrc & 1) + drop = 1; + if (fr_chksrc & 2) logit = -2; } else if (ip->ip_ttl < fr_minttl) { ATOMIC_INCL(frstats[0].fr_badttl); - if (fr_minttllog) + if (fr_minttllog & 1) logit = -3; + if (fr_minttllog & 2) + drop = 1; } } if (drop) { @@ -1022,6 +1054,7 @@ FI_COPYSIZE); if (pass & FR_NOMATCH) { ATOMIC_INCL(frstats[out].fr_nom); + fin->fin_fr = NULL; } } } else @@ -1035,11 +1068,7 @@ */ if ((pass & FR_AUTH)) { if (fr_newauth((mb_t *)m, fin, ip) != 0) { -#ifdef _KERNEL m = *mp = NULL; -#else - ; -#endif error = 0; } else error = ENOSPC; @@ -1069,7 +1098,7 @@ } } if (pass & FR_KEEPSTATE) { - if (fr_addstate(ip, fin, 0) == NULL) { + if (fr_addstate(ip, fin, NULL, 0) == NULL) { ATOMIC_INCL(frstats[out].fr_bads); } else { ATOMIC_INCL(frstats[out].fr_ads); @@ -1098,11 +1127,19 @@ else #endif list = ipacct[1][fr_active]; - if ((fin->fin_fr = list) && - (fr_scanlist(FR_NOMATCH, ip, fin, m) & FR_ACCOUNT)) { - ATOMIC_INCL(frstats[1].fr_acct); + if (list != NULL) { + u_32_t sg, sr; + + fin->fin_fr = list; + sg = fin->fin_group; + sr = fin->fin_rule; + if (fr_scanlist(FR_NOMATCH, ip, fin, m) & FR_ACCOUNT) { + ATOMIC_INCL(frstats[1].fr_acct); + } + fin->fin_group = sg; + fin->fin_rule = sr; + fin->fin_fr = fr; } - fin->fin_fr = fr; changed = ip_natout(ip, fin); } else fin->fin_fr = fr; @@ -1151,10 +1188,10 @@ # if SOLARIS mc = dupmsg(m); # else -# ifndef linux +# if defined(__OpenBSD__) && (OpenBSD >= 199905) + mc = m_copym2(m, 0, M_COPYALL, M_DONTWAIT); +# else mc = m_copy(m, 0, M_COPYALL); -# else - ; # endif # endif #endif @@ -1171,7 +1208,6 @@ * some operating systems. */ if (!out) { -#ifdef _KERNEL if (pass & FR_RETICMP) { int dst; @@ -1187,19 +1223,6 @@ ATOMIC_INCL(frstats[1].fr_ret); } } -#else - if ((pass & FR_RETMASK) == FR_RETICMP) { - verbose("- ICMP unreachable sent\n"); - ATOMIC_INCL(frstats[0].fr_ret); - } else if ((pass & FR_RETMASK) == FR_FAKEICMP) { - verbose("- forged ICMP unreachable sent\n"); - ATOMIC_INCL(frstats[0].fr_ret); - } else if (((pass & FR_RETMASK) == FR_RETRST) && - !(fin->fin_fl & FI_SHORT)) { - verbose("- TCP RST sent\n"); - ATOMIC_INCL(frstats[1].fr_ret); - } -#endif } else { if (pass & FR_RETRST) error = ECONNRESET; @@ -1224,8 +1247,10 @@ frdest_t *fdp = &fr->fr_tif; if (((pass & FR_FASTROUTE) && !out) || - (fdp->fd_ifp && fdp->fd_ifp != (struct ifnet *)-1)) + (fdp->fd_ifp && fdp->fd_ifp != (struct ifnet *)-1)) { (void) ipfr_fastroute(m, mp, fin, fdp); + m = *mp; + } if (mc != NULL) (void) ipfr_fastroute(mc, &mc, fin, &fr->fr_dif); @@ -1260,6 +1285,12 @@ return 0; if (pass & FR_AUTH) return -2; + if ((pass & FR_RETMASK) == FR_RETRST) + return -3; + if ((pass & FR_RETMASK) == FR_RETICMP) + return -4; + if ((pass & FR_RETMASK) == FR_FAKEICMP) + return -5; return -1; #endif /* _KERNEL */ } @@ -1481,7 +1512,7 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $Id: fil.c,v 2.35.2.39 2001/07/18 13:30:32 darrenr Exp $ + * $Id: fil.c,v 2.35.2.58 2002/03/13 02:23:13 darrenr Exp $ */ /* * Copy data from an mbuf chain starting "off" bytes from the beginning, ==== //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_auth.c#3 (text+ko) ==== @@ -3,6 +3,9 @@ * * See the IPFILTER.LICENCE file for details on licencing. */ +#ifdef __sgi +# include +#endif #include #include #include @@ -19,7 +22,6 @@ #else # include #endif -#include #ifndef linux # include #endif @@ -103,7 +105,7 @@ #if !defined(lint) /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.11.2.12 2001/07/18 14:57:08 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.26 2002/02/28 09:56:31 mike Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.27 2002/03/19 11:44:16 darrenr Exp $"; #endif @@ -311,7 +313,7 @@ int fr_auth_ioctl(data, mode, cmd, fr, frptr) caddr_t data; int mode; -#if defined(__NetBSD__) || defined(__OpenBSD__) || (FreeBSD_version >= 300003) +#if defined(__NetBSD__) || defined(__OpenBSD__) || (__FreeBSD_version >= 300003) u_long cmd; #else int cmd; @@ -382,9 +384,7 @@ error = EINVAL; break; case SIOCATHST: - READ_ENTER(&ipf_auth); fr_authstats.fas_faelist = fae_list; - RWLOCK_EXIT(&ipf_auth); error = IWCOPYPTR((char *)&fr_authstats, data, sizeof(fr_authstats)); break; @@ -458,7 +458,7 @@ bzero((char *)&ro, sizeof(ro)); # if ((_BSDI_VERSION >= 199802) && (_BSDI_VERSION < 200005)) || \ - defined(__OpenBSD__) + defined(__OpenBSD__) || (defined(IRIX) && (IRIX >= 605)) error = ip_output(m, NULL, &ro, IP_FORWARDING, NULL, NULL); # else @@ -526,7 +526,6 @@ } -#ifdef _KERNEL /* * Free all network buffer memory used to keep saved packets. */ @@ -587,7 +586,7 @@ register frauthent_t *fae, **faep; register frentry_t *fr, **frp; mb_t *m; -#if !SOLARIS +#if !SOLARIS && defined(_KERNEL) int s; #endif @@ -626,4 +625,3 @@ RWLOCK_EXIT(&ipf_auth); SPL_X(s); } -#endif ==== //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_auth.h#2 (text+ko) ==== @@ -3,7 +3,7 @@ * * See the IPFILTER.LICENCE file for details on licencing. * - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.h,v 1.11 2001/07/28 11:58:25 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.h,v 1.12 2002/03/19 11:44:16 darrenr Exp $ * */ #ifndef __IP_AUTH_H__ @@ -52,7 +52,8 @@ extern void fr_authunload __P((void)); extern mb_t *fr_authpkts[]; extern int fr_newauth __P((mb_t *, fr_info_t *, ip_t *)); -#if defined(__NetBSD__) || defined(__OpenBSD__) +#if defined(__NetBSD__) || defined(__OpenBSD__) || \ + (__FreeBSD_version >= 300003) extern int fr_auth_ioctl __P((caddr_t, int, u_long, frentry_t *, frentry_t **)); #else extern int fr_auth_ioctl __P((caddr_t, int, int, frentry_t *, frentry_t **)); ==== //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_compat.h#2 (text+ko) ==== @@ -5,7 +5,7 @@ * * @(#)ip_compat.h 1.8 1/14/96 * $Id: ip_compat.h,v 2.26.2.9 2001/01/14 14:58:01 darrenr Exp $ - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.14 2001/07/28 11:58:25 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.15 2002/03/19 11:44:16 darrenr Exp $ */ #ifndef __IP_COMPAT_H__ @@ -26,13 +26,20 @@ #ifndef SOLARIS #define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) #endif -#if SOLARIS && !defined(SOLARIS2) -# define SOLARIS2 4 /* Pick an old version */ +#if SOLARIS +# if !defined(SOLARIS2) +# define SOLARIS2 3 /* Pick an old version */ +# endif +# if SOLARIS2 >= 8 +# ifndef USE_INET6 +# define USE_INET6 +# endif +# else +# undef USE_INET6 +# endif #endif -#if SOLARIS2 >= 8 -# ifndef USE_INET6 -# define USE_INET6 -# endif +#if defined(sun) && !(defined(__svr4__) || defined(__SVR4)) +# undef USE_INET6 #endif #if defined(_KERNEL) || defined(KERNEL) || defined(__KERNEL__) @@ -63,6 +70,18 @@ }; #endif +#ifndef LIFNAMSIZ +# ifdef IF_NAMESIZE +# define LIFNAMSIZ IF_NAMESIZE +# else +# ifdef IFNAMSIZ +# define LIFNAMSIZ IFNAMSIZ +# else +# define LIFNAMSIZ 16 +# endif +# endif +#endif + #if defined(__sgi) && !defined(IPFILTER_LKM) # ifdef __STDC__ # define IPL_EXTERN(ep) ipfilter##ep @@ -77,12 +96,37 @@ # endif #endif +#ifdef __sgi +# include +#endif + #ifdef linux # include #endif + + +/* + * This is a workaround for troubles on FreeBSD and OpenBSD. + */ +#ifndef _KERNEL +# define ADD_KERNEL +# define _KERNEL +# define KERNEL +#endif +#ifdef __OpenBSD__ +struct file; +#endif +#include +#ifdef ADD_KERNEL +# undef _KERNEL +# undef KERNEL +#endif + #if SOLARIS # define MTYPE(m) ((m)->b_datap->db_type) -# include +# if SOLARIS2 >= 4 +# include +# endif # include # include # include @@ -138,12 +182,14 @@ queue_t *qf_q; /* fr_qin and fr_qout to the packet processing. */ size_t qf_off; size_t qf_len; /* this field is used for in ipfr_fastroute */ - char qf_name[8]; + char qf_name[LIFNAMSIZ]; /* * in case the ILL has disappeared... */ size_t qf_hl; /* header length */ int qf_sap; + size_t qf_incnt; + size_t qf_outcnt; } qif_t; #else /* SOLARIS */ # if !defined(__sgi) @@ -211,6 +257,7 @@ # endif typedef struct ip6_hdr ip6_t; # endif +# include union i6addr { u_32_t i6[4]; struct in_addr in4; @@ -226,6 +273,14 @@ #define IP6CMP(a,b) bcmp((char *)&(a), (char *)&(b), sizeof(a)) #define IP6EQ(a,b) (bcmp((char *)&(a), (char *)&(b), sizeof(a)) == 0) #define IP6NEQ(a,b) (bcmp((char *)&(a), (char *)&(b), sizeof(a)) != 0) +#define IP6_ISZERO(a) ((((union i6addr *)(a))->i6[0] | \ + ((union i6addr *)(a))->i6[1] | \ + ((union i6addr *)(a))->i6[2] | \ + ((union i6addr *)(a))->i6[3]) == 0) +#define IP6_NOTZERO(a) ((((union i6addr *)(a))->i6[0] | \ + ((union i6addr *)(a))->i6[1] | \ + ((union i6addr *)(a))->i6[2] | \ + ((union i6addr *)(a))->i6[3]) != 0) #ifndef MAX #define MAX(a,b) (((a) > (b)) ? (a) : (b)) @@ -326,6 +381,21 @@ * Build some macros and #defines to enable the same code to compile anywhere * Well, that's the idea, anyway :-) */ +#if SOLARIS +typedef mblk_t mb_t; +# if SOLARIS2 >= 7 +# ifdef lint +# define ALIGN32(ptr) (ptr ? 0L : 0L) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 4: 0:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7106337B404; Tue, 19 Mar 2002 04:00:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4A30337B402 for ; Tue, 19 Mar 2002 04:00:13 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2JC08F58165 for perforce@freebsd.org; Tue, 19 Mar 2002 04:00:08 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 04:00:08 -0800 (PST) Message-Id: <200203191200.g2JC08F58165@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7953 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7953 Change 7953 by peter@peter_overcee on 2002/03/19 03:59:50 revert to vendor. I added -Wno-format to CFLAGS to "solve" this stuff instead. Affected files ... ... //depot/projects/ia64/sys/contrib/dev/acpica/nsxfobj.c#5 edit ... //depot/projects/ia64/sys/contrib/dev/acpica/rscreate.c#5 edit Differences ... ==== //depot/projects/ia64/sys/contrib/dev/acpica/nsxfobj.c#5 (text+ko) ==== @@ -309,7 +309,7 @@ */ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Needed buffer size %X, %s\n", - (int)BufferSpaceNeeded, AcpiFormatException (Status))); + BufferSpaceNeeded, AcpiFormatException (Status))); } else { ==== //depot/projects/ia64/sys/contrib/dev/acpica/rscreate.c#5 (text+ko) ==== @@ -176,7 +176,7 @@ &ListSizeNeeded); ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Status=%X ListSizeNeeded=%X\n", - Status, (int)ListSizeNeeded)); + Status, ListSizeNeeded)); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); @@ -200,7 +200,7 @@ } ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "OutputBuffer %p Length %X\n", - OutputBuffer->Pointer, (int)OutputBuffer->Length)); + OutputBuffer->Pointer, OutputBuffer->Length)); return_ACPI_STATUS (AE_OK); } @@ -260,7 +260,7 @@ return_ACPI_STATUS (Status); } - ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "BufferSizeNeeded = %X\n", (int)BufferSizeNeeded)); + ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "BufferSizeNeeded = %X\n", BufferSizeNeeded)); /* Validate/Allocate/Clear caller buffer */ @@ -423,7 +423,7 @@ } ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "OutputBuffer %p Length %X\n", - OutputBuffer->Pointer, (int)OutputBuffer->Length)); + OutputBuffer->Pointer, OutputBuffer->Length)); return_ACPI_STATUS (AE_OK); } @@ -470,7 +470,7 @@ &ByteStreamSizeNeeded); ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "ByteStreamSizeNeeded=%X, %s\n", - (int)ByteStreamSizeNeeded, AcpiFormatException (Status))); + ByteStreamSizeNeeded, AcpiFormatException (Status))); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); @@ -494,7 +494,7 @@ } ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "OutputBuffer %p Length %X\n", - OutputBuffer->Pointer, (int)OutputBuffer->Length)); + OutputBuffer->Pointer, OutputBuffer->Length)); return_ACPI_STATUS (AE_OK); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 4: 9:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F64F37B404; Tue, 19 Mar 2002 04:09:25 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B9AAC37B400 for ; Tue, 19 Mar 2002 04:09:24 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2JC9Oh70065 for perforce@freebsd.org; Tue, 19 Mar 2002 04:09:24 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 04:09:24 -0800 (PST) Message-Id: <200203191209.g2JC9Oh70065@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7954 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7954 Change 7954 by peter@peter_overcee on 2002/03/19 04:08:45 this is even less likely to work than sparc64, revert to vendor for now. (disconnected in sbin/Makefile) Affected files ... ... //depot/projects/ia64/sbin/savecore/savecore.c#4 edit Differences ... ==== //depot/projects/ia64/sbin/savecore/savecore.c#4 (text+ko) ==== @@ -70,8 +70,6 @@ #define ok(number) ((number) - kernbase) #elif defined(__alpha__) #define ok(number) ALPHA_K0SEG_TO_PHYS(number) -#elif defined(__ia64__) -#define ok(number) (number) #else #error savecore has not been ported to this platform yet. #endif @@ -128,8 +126,8 @@ u_long kernbase; /* offset of kvm to core file */ #endif -static int clear, compress, force, verbose; /* flags */ -static int keep; /* keep dump on device */ +int clear, compress, force, verbose; /* flags */ +int keep; /* keep dump on device */ void check_kmem __P((void)); int check_space __P((void)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 4:18:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DB3037B404; Tue, 19 Mar 2002 04:18:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5BE6037B402 for ; Tue, 19 Mar 2002 04:18:39 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2JCIdD71729 for perforce@freebsd.org; Tue, 19 Mar 2002 04:18:39 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 04:18:39 -0800 (PST) Message-Id: <200203191218.g2JCIdD71729@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7956 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7956 Change 7956 by peter@peter_overcee on 2002/03/19 04:18:10 IFC (warning fixes) Affected files ... ... //depot/projects/ia64/sys/dev/ata/ata-all.c#8 integrate ... //depot/projects/ia64/sys/dev/ata/ata-raid.c#6 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#10 integrate Differences ... ==== //depot/projects/ia64/sys/dev/ata/ata-all.c#8 (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. * - * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.138 2002/03/14 21:35:55 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.139 2002/03/19 12:14:13 peter Exp $ */ #include "opt_ata.h" @@ -407,6 +407,7 @@ } #endif default: + break; } return ENOTTY; } @@ -584,6 +585,7 @@ intr_count, ch->active, ch->status); } #endif + break; } ch->active &= ATA_CONTROL; if (ch->active & ATA_CONTROL) ==== //depot/projects/ia64/sys/dev/ata/ata-raid.c#6 (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. * - * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.38 2002/03/16 15:55:20 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.39 2002/03/19 12:14:14 peter Exp $ */ #include "opt_ata.h" @@ -96,6 +96,7 @@ case 0x4d33105a: case 0x4d38105a: case 0x4d30105a: case 0x0d30105a: case 0x4d68105a: case 0x6268105a: case 0x00041103: case 0x00051103: case 0x00081103: + break; } if (ar_table) { for (array = 0; array < MAX_ARRAYS; array++) { @@ -148,6 +149,7 @@ case 0x4d33105a: case 0x4d38105a: case 0x4d30105a: case 0x0d30105a: case 0x4d68105a: case 0x6268105a: case 0x00041103: case 0x00051103: case 0x00081103: + break; } if (ar_table) { for (array = 0; array < MAX_ARRAYS; array++) { ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#10 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.47 2002/03/19 09:11:47 jeff Exp $ + * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.48 2002/03/19 12:15:29 peter Exp $ */ /* @@ -229,7 +229,9 @@ static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; static int pmap_pagedaemon_waken = 0; +#if 0 static struct pv_entry *pvinit; +#endif static struct pv_entry *pvbootentries; static int pvbootnext, pvbootmax; @@ -238,7 +240,9 @@ */ static vm_zone_t ptezone; static struct vm_object ptezone_obj; +#if 0 static struct ia64_lpte *pteinit; +#endif /* * VHPT instrumentation. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 7: 5:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A5D337B416; Tue, 19 Mar 2002 07:05:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4F57E37B404 for ; Tue, 19 Mar 2002 07:05:03 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2JF53O21650 for perforce@freebsd.org; Tue, 19 Mar 2002 07:05:03 -0800 (PST) (envelope-from phk@freebsd.org) Date: Tue, 19 Mar 2002 07:05:03 -0800 (PST) Message-Id: <200203191505.g2JF53O21650@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to phk@freebsd.org using -f From: Poul-Henning Kamp Subject: PERFORCE change 7960 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7960 Change 7960 by phk@phk_flat on 2002/03/19 07:04:26 Get the new ioctls over. Affected files ... ... //depot/projects/sparc64/sys/geom/geom_dev.c#3 integrate ... //depot/projects/sparc64/sys/sys/disklabel.h#10 integrate Differences ... ==== //depot/projects/sparc64/sys/geom/geom_dev.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_dev.c,v 1.4 2002/03/17 07:42:54 phk Exp $ + * $FreeBSD: src/sys/geom/geom_dev.c,v 1.5 2002/03/19 13:54:15 phk Exp $ */ #include @@ -248,17 +248,37 @@ error = 0; DROP_GIANT(); - gio = g_malloc(sizeof *gio, M_WAITOK); - gio->cmd = cmd; - gio->data = data; - gio->fflag = fflag; - gio->td = td; - i = sizeof *gio; - if (cmd & IOC_IN) - error = g_io_setattr("GEOM::ioctl", cp, i, gio, td); - else - error = g_io_getattr("GEOM::ioctl", cp, &i, gio, td); - g_free(gio); + i = IOCPARM_LEN(cmd); + switch (cmd) { + case DIOCGSECTORSIZE: + error = g_io_getattr("GEOM::sectorsize", cp, &i, data, td); + break; + case DIOCGMEDIASIZE: + error = g_io_getattr("GEOM::mediasize", cp, &i, data, td); + break; + case DIOCGFWSECTORS: + error = g_io_getattr("GEOM::fwsectors", cp, &i, data, td); + break; + case DIOCGFWHEADS: + error = g_io_getattr("GEOM::fwheads", cp, &i, data, td); + break; + case DIOCGFWCYLINDERS: + error = g_io_getattr("GEOM::fwcylinders", cp, &i, data, td); + break; + default: + gio = g_malloc(sizeof *gio, M_WAITOK); + gio->cmd = cmd; + gio->data = data; + gio->fflag = fflag; + gio->td = td; + i = sizeof *gio; + if (cmd & IOC_IN) + error = g_io_setattr("GEOM::ioctl", cp, i, gio, td); + else + error = g_io_getattr("GEOM::ioctl", cp, &i, gio, td); + g_free(gio); + break; + } if (error != 0 && cmd == DIOCGDVIRGIN) { g_topology_lock(); ==== //depot/projects/sparc64/sys/sys/disklabel.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)disklabel.h 8.2 (Berkeley) 7/10/94 - * $FreeBSD: src/sys/sys/disklabel.h,v 1.67 2002/03/13 03:17:29 jake Exp $ + * $FreeBSD: src/sys/sys/disklabel.h,v 1.68 2002/03/19 13:54:13 phk Exp $ */ #ifndef _SYS_DISKLABEL_H_ @@ -418,6 +418,12 @@ #define DIOCWLABEL _IOW('d', 109, int) /* write en/disable label */ +#define DIOCGSECTORSIZE _IOR('d', 128, u_int) /* Get sector size in bytes */ +#define DIOCGMEDIASIZE _IOR('d', 129, off_t) /* Get media size in bytes */ +#define DIOCGFWSECTORS _IOR('d', 130, u_int) /* Get firmware sectorcount */ +#define DIOCGFWHEADS _IOR('d', 131, u_int) /* Get firmware headcount */ +#define DIOCGFWCYLINDERS _IOR('d', 132, u_int) /* Get firmware cyl'scount */ + #ifdef _KERNEL /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 8:31: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C11C37B41A; Tue, 19 Mar 2002 08:30:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7B55437B416 for ; Tue, 19 Mar 2002 08:30:48 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2JGUm445851 for perforce@freebsd.org; Tue, 19 Mar 2002 08:30:48 -0800 (PST) (envelope-from green@freebsd.org) Date: Tue, 19 Mar 2002 08:30:48 -0800 (PST) Message-Id: <200203191630.g2JGUm445851@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 7966 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7966 Change 7966 by green@green_laptop_2 on 2002/03/19 08:30:21 Next target: make "subjects" (ucred) carefully-managed like mbufs are. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/init_main.c#14 edit ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#113 edit ... //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#12 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#85 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_main.c#14 (text+ko) ==== @@ -348,7 +348,7 @@ p->p_ucred->cr_ngroups = 1; /* group 0 */ #ifdef MAC - mac_init_proc0(p->p_ucred); + mac_create_proc0(p->p_ucred); #endif p->p_ucred->cr_uidinfo = uifind(0); @@ -654,7 +654,7 @@ mtx_unlock_spin(&sched_lock); cpu_set_fork_handler(FIRST_THREAD_IN_PROC(initproc), start_init, NULL); #ifdef MAC - mac_init_proc1(initproc->p_ucred); + mac_create_proc1(initproc->p_ucred); #endif } SYSINIT(init, SI_SUB_CREATE_INIT, SI_ORDER_FIRST, create_init, NULL) ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#113 (text+ko) ==== @@ -422,9 +422,11 @@ SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, "TrustedBSD MAC debug info"); -static unsigned int nmacmbufs; +static unsigned int nmacmbufs, nmacsubjects; SYSCTL_UINT(_security_mac_debug, OID_AUTO, mbufs, CTLFLAG_RD, &nmacmbufs, 0, "number of mbufs in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, subjects, CTLFLAG_RD, + &nmacsubjects, 0, "number of ucreds in use"); int mac_init_mbuf(struct mbuf *m, int how) @@ -443,6 +445,21 @@ atomic_subtract_int(&nmacmbufs, 1); } +void +mac_init_subject(struct ucred *cr) +{ + + mac_init_label(&cr->cr_label); + atomic_add_int(&nmacsubjects, 1); +} + +void +mac_destroy_subject(struct ucred *cr) +{ + + atomic_subtract_int(&nmacsubjects, 1); +} + static int mac_label_valid(struct mac *label) { @@ -480,10 +497,9 @@ * kernel processes and threads are spawned. */ void -mac_init_proc0(struct ucred *cred) +mac_create_proc0(struct ucred *cred) { - mac_init_label(&cred->cr_label); MAC_PERFORM(create_proc0, cred); } @@ -492,10 +508,9 @@ * userland processes and threads are spawned. */ void -mac_init_proc1(struct ucred *cred) +mac_create_proc1(struct ucred *cred) { - mac_init_label(&cred->cr_label); MAC_PERFORM(create_proc1, cred); } @@ -508,7 +523,6 @@ mac_create_subject(struct ucred *parent_cred, struct ucred *child_cred) { - mac_init_label(&child_cred->cr_label); MAC_PERFORM(create_subject, parent_cred, child_cred); } ==== //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#12 (text+ko) ==== @@ -1687,6 +1687,9 @@ MALLOC(cr, struct ucred *, sizeof(*cr), M_CRED, M_WAITOK | M_ZERO); cr->cr_ref = 1; cr->cr_mtxp = mtx_pool_find(cr); +#ifdef MAC + mac_init_subject(cr); +#endif /* MAC */ return (cr); } @@ -1732,6 +1735,9 @@ */ if (jailed(cr)) prison_free(cr->cr_prison); +#ifdef MAC + mac_destroy_subject(cr); +#endif /* MAC */ FREE((caddr_t)cr, M_CRED); } else { mtx_unlock(mtxp); @@ -1765,6 +1771,9 @@ bcopy(&src->cr_startcopy, &dest->cr_startcopy, (unsigned)((caddr_t)&src->cr_endcopy - (caddr_t)&src->cr_startcopy)); +#ifdef MAC + mac_create_subject(src, dest); +#endif /* MAC */ uihold(dest->cr_uidinfo); uihold(dest->cr_ruidinfo); if (jailed(dest)) ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#85 (text+ko) ==== @@ -274,16 +274,21 @@ void mac_copy_label(struct mac *labelfrom, struct mac *labelto); void mac_print_label(struct mac *); int mac_validate_label(struct mac *); +void mac_init_bpfdesc(struct bpf_d *); +void mac_destroy_bpfdesc(struct bpf_d *); int mac_init_mbuf(struct mbuf *, int how); void mac_destroy_mbuf(struct mbuf *); +void mac_init_ifnet(struct ifnet *); +void mac_destroy_ifnet(struct ifnet *); +void mac_init_socket(struct socket *); +void mac_destroy_socket(struct socket *); +void mac_init_subject(struct ucred *); +void mac_destroy_subject(struct ucred *); /* Non-authorizational event hooks. */ void mac_execve_transition(struct ucred *old, struct ucred *new, struct mac *filelabel); int mac_execve_will_transition(struct ucred *old, struct mac *filelabel); -void mac_init_ifnet(struct ifnet *ifnet); -void mac_init_proc0(struct ucred *cred); -void mac_init_proc1(struct ucred *cred); void mac_mountfs(struct ucred *cred, struct mount *mp); void mac_mountrootfs(struct ucred *cred, struct mount *mp); void mac_relabel_subject(struct ucred *oldcred, struct mac *newlabel); @@ -344,6 +349,8 @@ struct ifnet *ifnet, struct mbuf *newmbuf); void mac_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf); +void mac_create_proc0(struct ucred *cred); +void mac_create_proc1(struct ucred *cred); void mac_create_socket(struct ucred *cred, struct socket *socket); void mac_create_subject(struct ucred *cred_parent, struct ucred *cred_child); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 10:11:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AF0D37B404; Tue, 19 Mar 2002 10:11:44 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mail11.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by hub.freebsd.org (Postfix) with ESMTP id C379537B402 for ; Tue, 19 Mar 2002 10:11:42 -0800 (PST) Received: (qmail 32241 invoked from network); 19 Mar 2002 18:11:41 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 19 Mar 2002 18:11:41 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g2JIC8v58161; Tue, 19 Mar 2002 13:12:08 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200203190929.g2J9TnB80357@freefall.freebsd.org> Date: Tue, 19 Mar 2002 13:11:41 -0500 (EST) From: John Baldwin To: Peter Wemm Subject: RE: PERFORCE change 7933 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 19-Mar-2002 Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7933 > > Change 7933 by peter@peter_overcee on 2002/03/19 01:29:12 > > add the ia64 IO tag, and add a #error to catch this in future. > > Affected files ... > > ... //depot/projects/ia64/sys/dev/kbd/atkbdc.c#2 edit > > Differences ... > > ==== //depot/projects/ia64/sys/dev/kbd/atkbdc.c#2 (text+ko) ==== > > @@ -159,6 +159,10 @@ > tag = I386_BUS_SPACE_IO; > #elif defined(__alpha__) > tag = busspace_isa_io; > +#elif defined(__ia64__) > + tag = IA64_BUS_SPACE_IO; > +#else > +#error "define tag!" > #endif > > #if notyet Maybe there should be a MD macro to define what the appropriate bus tag is? -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 11:47:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 645AC37B416; Tue, 19 Mar 2002 11:46:59 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38]) by hub.freebsd.org (Postfix) with ESMTP id B4A8A37B429; Tue, 19 Mar 2002 11:46:09 -0800 (PST) Received: from peter3.wemm.org ([12.232.27.13]) by rwcrmhc51.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020319194601.DZDV2626.rwcrmhc51.attbi.com@peter3.wemm.org>; Tue, 19 Mar 2002 19:46:01 +0000 Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by peter3.wemm.org (8.11.0/8.11.0) with ESMTP id g2JJk1s66382; Tue, 19 Mar 2002 11:46:01 -0800 (PST) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id B2BB33810; Tue, 19 Mar 2002 11:46:00 -0800 (PST) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 7933 for review In-Reply-To: Date: Tue, 19 Mar 2002 11:46:00 -0800 From: Peter Wemm Message-Id: <20020319194600.B2BB33810@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin wrote: > > On 19-Mar-2002 Peter Wemm wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7933 > > > > Change 7933 by peter@peter_overcee on 2002/03/19 01:29:12 > > > > add the ia64 IO tag, and add a #error to catch this in future. > > > > Affected files ... > > > > ... //depot/projects/ia64/sys/dev/kbd/atkbdc.c#2 edit > > > > Differences ... > > > > ==== //depot/projects/ia64/sys/dev/kbd/atkbdc.c#2 (text+ko) ==== > > > > @@ -159,6 +159,10 @@ > > tag = I386_BUS_SPACE_IO; > > #elif defined(__alpha__) > > tag = busspace_isa_io; > > +#elif defined(__ia64__) > > + tag = IA64_BUS_SPACE_IO; > > +#else > > +#error "define tag!" > > #endif > > > > #if notyet > > Maybe there should be a MD macro to define what the appropriate bus tag is? Actually, this should use the proper API's instead of hacking around like this. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 12: 1:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B0C837B404; Tue, 19 Mar 2002 11:57:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8367B37B405 for ; Tue, 19 Mar 2002 11:57:19 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2JJv8o94799 for perforce@freebsd.org; Tue, 19 Mar 2002 11:57:08 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 19 Mar 2002 11:57:08 -0800 (PST) Message-Id: <200203191957.g2JJv8o94799@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 7975 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7975 Change 7975 by jhb@jhb_laptop on 2002/03/19 11:56:55 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/interrupt.c#13 integrate ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#30 integrate ... //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#11 integrate ... //depot/projects/smpng/sys/alpha/alpha/pmap.c#24 integrate ... //depot/projects/smpng/sys/alpha/alpha/trap.c#27 integrate ... //depot/projects/smpng/sys/alpha/include/endian.h#6 integrate ... //depot/projects/smpng/sys/alpha/include/ptrace.h#5 integrate ... //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#13 integrate ... //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#9 integrate ... //depot/projects/smpng/sys/boot/common/bootstrap.h#5 integrate ... //depot/projects/smpng/sys/boot/common/loader.8#11 integrate ... //depot/projects/smpng/sys/boot/efi/Makefile.inc#2 integrate ... //depot/projects/smpng/sys/boot/efi/include/efiapi.h#3 integrate ... //depot/projects/smpng/sys/boot/efi/loader/conf.c#5 integrate ... //depot/projects/smpng/sys/boot/forth/loader.conf#7 integrate ... //depot/projects/smpng/sys/boot/forth/loader.conf.5#3 integrate ... //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#6 integrate ... //depot/projects/smpng/sys/boot/i386/loader/conf.c#4 integrate ... //depot/projects/smpng/sys/boot/ia64/libski/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#1 branch ... //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#1 branch ... //depot/projects/smpng/sys/boot/sparc64/bootblock/bootblock.c#3 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/main.c#5 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_all.c#6 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_da.c#19 integrate ... //depot/projects/smpng/sys/coda/coda_vnops.c#6 integrate ... //depot/projects/smpng/sys/conf/Makefile.ia64#15 integrate ... //depot/projects/smpng/sys/conf/Makefile.sparc64#13 integrate ... //depot/projects/smpng/sys/conf/files#28 integrate ... //depot/projects/smpng/sys/conf/files.alpha#10 integrate ... //depot/projects/smpng/sys/conf/files.i386#19 integrate ... //depot/projects/smpng/sys/conf/files.ia64#10 integrate ... //depot/projects/smpng/sys/conf/files.pc98#19 integrate ... //depot/projects/smpng/sys/conf/files.powerpc#3 integrate ... //depot/projects/smpng/sys/conf/files.sparc64#11 integrate ... //depot/projects/smpng/sys/conf/kern.post.mk#6 integrate ... //depot/projects/smpng/sys/conf/kern.pre.mk#8 integrate ... //depot/projects/smpng/sys/conf/kmod.mk#7 integrate ... //depot/projects/smpng/sys/conf/majors#6 integrate ... //depot/projects/smpng/sys/conf/options#13 integrate ... //depot/projects/smpng/sys/conf/options.sparc64#4 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#9 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#6 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/acdos16.h#1 branch ... //depot/projects/smpng/sys/contrib/dev/acpica/acefi.h#3 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#5 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#5 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/acgcc.h#7 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#6 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#9 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#9 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#6 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#7 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#8 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#8 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#8 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#9 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/evsci.c#5 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#8 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#9 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#7 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#8 integrate ... //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#9 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#5 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.h#3 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.c#6 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.h#4 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.c#4 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.h#3 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#1 branch ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#6 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#1 branch ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.h#3 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#3 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ipl.h#3 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate ... //depot/projects/smpng/sys/crypto/blowfish/arch/i386/bf_enc.S#1 branch ... //depot/projects/smpng/sys/crypto/blowfish/arch/i386/bf_enc_586.S#1 branch ... //depot/projects/smpng/sys/crypto/blowfish/arch/i386/bf_enc_686.S#1 branch ... //depot/projects/smpng/sys/crypto/blowfish/bf_enc.c#2 integrate ... //depot/projects/smpng/sys/crypto/blowfish/bf_locl.h#2 integrate ... //depot/projects/smpng/sys/crypto/blowfish/bf_pi.h#2 integrate ... //depot/projects/smpng/sys/crypto/blowfish/bf_skey.c#2 integrate ... //depot/projects/smpng/sys/crypto/blowfish/blowfish.h#2 integrate ... //depot/projects/smpng/sys/crypto/des/arch/i386/des_enc.S#1 branch ... //depot/projects/smpng/sys/crypto/des/des.h#2 integrate ... //depot/projects/smpng/sys/crypto/des/des_ecb.c#2 integrate ... //depot/projects/smpng/sys/crypto/des/des_enc.c#1 branch ... //depot/projects/smpng/sys/crypto/des/des_locl.h#2 integrate ... //depot/projects/smpng/sys/crypto/des/des_setkey.c#2 integrate ... //depot/projects/smpng/sys/crypto/des/spr.h#2 integrate ... //depot/projects/smpng/sys/ddb/db_lex.c#2 integrate ... //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#5 integrate ... //depot/projects/smpng/sys/dev/acpica/Osd/OsdMemory.c#5 integrate ... //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#12 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#7 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#8 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#10 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_powerprofile.c#4 delete ... //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#12 integrate ... //depot/projects/smpng/sys/dev/acpica/acpica_support.c#4 integrate ... //depot/projects/smpng/sys/dev/acpica/acpivar.h#14 integrate ... //depot/projects/smpng/sys/dev/aic/aic.c#3 integrate ... //depot/projects/smpng/sys/dev/aic/aic6360reg.h#2 integrate ... //depot/projects/smpng/sys/dev/aic/aicvar.h#2 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#2 integrate ... //depot/projects/smpng/sys/dev/amr/amr.c#7 integrate ... //depot/projects/smpng/sys/dev/an/if_an.c#13 integrate ... //depot/projects/smpng/sys/dev/ata/ata-all.c#13 integrate ... //depot/projects/smpng/sys/dev/ata/ata-all.h#7 integrate ... //depot/projects/smpng/sys/dev/ata/ata-disk.c#14 integrate ... //depot/projects/smpng/sys/dev/ata/ata-disk.h#7 integrate ... //depot/projects/smpng/sys/dev/ata/ata-dma.c#13 integrate ... //depot/projects/smpng/sys/dev/ata/ata-pci.c#14 integrate ... //depot/projects/smpng/sys/dev/ata/ata-raid.c#8 integrate ... //depot/projects/smpng/sys/dev/ata/ata-raid.h#6 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-all.c#9 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#14 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-cd.h#5 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-fd.c#5 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-tape.c#8 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_core.c#3 integrate ... //depot/projects/smpng/sys/dev/cardbus/cardbus.c#6 integrate ... //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#4 integrate ... //depot/projects/smpng/sys/dev/ccd/ccd.c#9 integrate ... //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#2 integrate ... //depot/projects/smpng/sys/dev/hme/if_hme.c#2 integrate ... //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#2 integrate ... //depot/projects/smpng/sys/dev/isp/isp.c#15 integrate ... //depot/projects/smpng/sys/dev/kbd/atkbdc.c#2 integrate ... //depot/projects/smpng/sys/dev/kbd/kbd.c#4 integrate ... //depot/projects/smpng/sys/dev/md/md.c#17 integrate ... //depot/projects/smpng/sys/dev/mlx/mlx.c#5 integrate ... //depot/projects/smpng/sys/dev/pccard/pccard.c#8 integrate ... //depot/projects/smpng/sys/dev/pccard/pccard_cis.c#7 integrate ... //depot/projects/smpng/sys/dev/pccard/pccarddevs#11 integrate ... //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#11 integrate ... //depot/projects/smpng/sys/dev/pci/pci.c#9 integrate ... //depot/projects/smpng/sys/dev/pci/pci_private.h#2 integrate ... //depot/projects/smpng/sys/dev/puc/puc.c#2 integrate ... //depot/projects/smpng/sys/dev/puc/pucdata.c#2 integrate ... //depot/projects/smpng/sys/dev/random/harvest.c#3 integrate ... //depot/projects/smpng/sys/dev/random/hash.c#2 integrate ... //depot/projects/smpng/sys/dev/random/hash.h#2 integrate ... //depot/projects/smpng/sys/dev/random/randomdev.c#6 integrate ... //depot/projects/smpng/sys/dev/random/randomdev.h#3 integrate ... //depot/projects/smpng/sys/dev/random/yarrow.c#3 integrate ... //depot/projects/smpng/sys/dev/sio/sio.c#9 integrate ... //depot/projects/smpng/sys/dev/sio/sio_isa.c#6 integrate ... //depot/projects/smpng/sys/dev/sio/sio_pci.c#4 integrate ... //depot/projects/smpng/sys/dev/sio/sio_puc.c#2 integrate ... //depot/projects/smpng/sys/dev/snp/snp.c#6 integrate ... //depot/projects/smpng/sys/dev/sound/midi/midibuf.c#3 integrate ... //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/pci/neomagic.c#3 integrate ... //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#7 integrate ... //depot/projects/smpng/sys/dev/sound/pci/via82c686.h#2 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/channel.c#13 integrate ... //depot/projects/smpng/sys/dev/syscons/scvgarndr.c#3 integrate ... //depot/projects/smpng/sys/dev/syscons/syscons.c#13 integrate ... //depot/projects/smpng/sys/dev/twe/twe.c#3 integrate ... //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#5 integrate ... //depot/projects/smpng/sys/dev/twe/twe_tables.h#2 integrate ... //depot/projects/smpng/sys/dev/twe/twereg.h#2 integrate ... //depot/projects/smpng/sys/dev/twe/twevar.h#3 integrate ... //depot/projects/smpng/sys/dev/txp/if_txp.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/FILES#3 integrate ... //depot/projects/smpng/sys/dev/usb/dsbr100io.h#1 branch ... //depot/projects/smpng/sys/dev/usb/ohci.c#10 integrate ... //depot/projects/smpng/sys/dev/usb/ohcivar.h#3 integrate ... //depot/projects/smpng/sys/dev/usb/ucom.c#1 branch ... //depot/projects/smpng/sys/dev/usb/ucomvar.h#1 branch ... //depot/projects/smpng/sys/dev/usb/ufm.c#1 branch ... //depot/projects/smpng/sys/dev/usb/ugen.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/uhci.c#10 integrate ... //depot/projects/smpng/sys/dev/usb/uhcivar.h#3 integrate ... //depot/projects/smpng/sys/dev/usb/uhid.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/ulpt.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/umodem.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/ums.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/uplcom.c#1 branch ... //depot/projects/smpng/sys/dev/usb/urio.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/usb.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/usb_port.h#6 integrate ... //depot/projects/smpng/sys/dev/usb/usb_subr.c#5 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs#15 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs.h#15 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#15 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.c#4 integrate ... //depot/projects/smpng/sys/dev/usb/usbdivar.h#4 integrate ... //depot/projects/smpng/sys/dev/usb/uscanner.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/uvscom.c#1 branch ... //depot/projects/smpng/sys/dev/vinum/vinumdaemon.c#2 integrate ... //depot/projects/smpng/sys/dev/vinum/vinuminterrupt.c#2 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#4 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumrevive.c#3 integrate ... //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#2 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#18 integrate ... //depot/projects/smpng/sys/dev/wi/if_wireg.h#6 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#8 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs.h#4 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_hash.c#4 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_subr.c#2 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#7 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#5 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_fat.c#2 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#6 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#9 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#5 integrate ... //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#3 integrate ... //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#3 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#7 integrate ... //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#10 integrate ... //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#4 integrate ... //depot/projects/smpng/sys/geom/geom.h#1 branch ... //depot/projects/smpng/sys/geom/geom_bsd.c#1 branch ... //depot/projects/smpng/sys/geom/geom_dev.c#1 branch ... //depot/projects/smpng/sys/geom/geom_disk.c#1 branch ... //depot/projects/smpng/sys/geom/geom_dump.c#1 branch ... //depot/projects/smpng/sys/geom/geom_event.c#1 branch ... //depot/projects/smpng/sys/geom/geom_io.c#1 branch ... //depot/projects/smpng/sys/geom/geom_kern.c#1 branch ... //depot/projects/smpng/sys/geom/geom_mbr.c#1 branch ... //depot/projects/smpng/sys/geom/geom_mbrext.c#1 branch ... //depot/projects/smpng/sys/geom/geom_slice.c#1 branch ... //depot/projects/smpng/sys/geom/geom_slice.h#1 branch ... //depot/projects/smpng/sys/geom/geom_subr.c#1 branch ... //depot/projects/smpng/sys/geom/geom_sunlabel.c#1 branch ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_alloc.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#3 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#7 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#3 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/fpu_aux.c#3 integrate ... //depot/projects/smpng/sys/i386/apm/apm.c#4 integrate ... //depot/projects/smpng/sys/i386/conf/GENERIC#16 integrate ... //depot/projects/smpng/sys/i386/conf/NEWCARD#10 integrate ... //depot/projects/smpng/sys/i386/conf/NOTES#28 integrate ... //depot/projects/smpng/sys/i386/i386/autoconf.c#7 integrate ... //depot/projects/smpng/sys/i386/i386/identcpu.c#7 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#23 integrate ... //depot/projects/smpng/sys/i386/i386/mp_machdep.c#17 integrate ... //depot/projects/smpng/sys/i386/i386/perfmon.c#6 integrate ... //depot/projects/smpng/sys/i386/i386/pmap.c#17 integrate ... //depot/projects/smpng/sys/i386/i386/trap.c#32 integrate ... //depot/projects/smpng/sys/i386/include/endian.h#7 integrate ... //depot/projects/smpng/sys/i386/include/i4b_cause.h#2 integrate ... //depot/projects/smpng/sys/i386/include/i4b_debug.h#3 integrate ... //depot/projects/smpng/sys/i386/include/i4b_ioctl.h#7 integrate ... //depot/projects/smpng/sys/i386/include/i4b_isppp.h#3 delete ... //depot/projects/smpng/sys/i386/include/i4b_rbch_ioctl.h#2 integrate ... //depot/projects/smpng/sys/i386/include/i4b_tel_ioctl.h#3 integrate ... //depot/projects/smpng/sys/i386/include/i4b_trace.h#2 integrate ... //depot/projects/smpng/sys/i386/include/ptrace.h#3 integrate ... //depot/projects/smpng/sys/i386/isa/asc.c#4 integrate ... //depot/projects/smpng/sys/i386/isa/pcaudio.c#6 integrate ... //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#6 integrate ... //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#14 integrate ... //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#7 integrate ... //depot/projects/smpng/sys/i4b/capi/capi_l4if.c#3 integrate ... //depot/projects/smpng/sys/i4b/capi/iavc/iavc_isa.c#3 integrate ... //depot/projects/smpng/sys/i4b/capi/iavc/iavc_lli.c#3 integrate ... //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#3 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_bsdi_ibc.c#2 delete ... //depot/projects/smpng/sys/i4b/driver/i4b_ctl.c#3 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ing.c#3 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#4 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_isppp.c#3 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ispppsubr.c#4 delete ... //depot/projects/smpng/sys/i4b/driver/i4b_rbch.c#4 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_tel.c#4 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#4 integrate ... //depot/projects/smpng/sys/i4b/include/i4b_global.h#2 integrate ... //depot/projects/smpng/sys/i4b/include/i4b_isdnq931.h#2 integrate ... //depot/projects/smpng/sys/i4b/include/i4b_l1l2.h#2 integrate ... //depot/projects/smpng/sys/i4b/include/i4b_l2l3.h#2 integrate ... //depot/projects/smpng/sys/i4b/include/i4b_l3l4.h#3 integrate ... //depot/projects/smpng/sys/i4b/include/i4b_mbuf.h#2 integrate ... //depot/projects/smpng/sys/i4b/layer1/isic/i4b_bchan.c#3 integrate ... //depot/projects/smpng/sys/i4b/layer1/isic/i4b_hscx.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_iframe.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_l2.c#3 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_l2.h#2 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_l2fsm.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_l2fsm.h#2 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_l2timer.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_lme.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_mbuf.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_sframe.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_tei.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_uframe.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_util.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer3/i4b_l3fsm.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer3/i4b_l3fsm.h#2 integrate ... //depot/projects/smpng/sys/i4b/layer3/i4b_l3timer.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer3/i4b_l4if.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer3/i4b_q931.c#4 integrate ... //depot/projects/smpng/sys/i4b/layer3/i4b_q932fac.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer3/i4b_q932fac.h#2 integrate ... //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#6 integrate ... //depot/projects/smpng/sys/i4b/layer4/i4b_l4.c#3 integrate ... //depot/projects/smpng/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer4/i4b_l4timer.c#2 integrate ... //depot/projects/smpng/sys/ia64/acpica/madt.c#4 integrate ... //depot/projects/smpng/sys/ia64/conf/GENERIC#12 integrate ... //depot/projects/smpng/sys/ia64/conf/SKI#2 integrate ... //depot/projects/smpng/sys/ia64/ia64/autoconf.c#5 integrate ... //depot/projects/smpng/sys/ia64/ia64/clock.c#5 integrate ... //depot/projects/smpng/sys/ia64/ia64/db_disasm.c#6 integrate ... //depot/projects/smpng/sys/ia64/ia64/db_interface.c#13 integrate ... //depot/projects/smpng/sys/ia64/ia64/db_trace.c#6 integrate ... //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#2 integrate ... //depot/projects/smpng/sys/ia64/ia64/exception.s#16 integrate ... //depot/projects/smpng/sys/ia64/ia64/genassym.c#15 integrate ... //depot/projects/smpng/sys/ia64/ia64/ia64-gdbstub.c#2 integrate ... //depot/projects/smpng/sys/ia64/ia64/interrupt.c#8 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#26 integrate ... //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#11 integrate ... //depot/projects/smpng/sys/ia64/ia64/nexus.c#3 integrate ... //depot/projects/smpng/sys/ia64/ia64/pal_stub.s#2 integrate ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#21 integrate ... //depot/projects/smpng/sys/ia64/ia64/sal.c#5 integrate ... //depot/projects/smpng/sys/ia64/ia64/sapic.c#5 integrate ... //depot/projects/smpng/sys/ia64/ia64/swtch.s#7 integrate ... //depot/projects/smpng/sys/ia64/ia64/trap.c#24 integrate ... //depot/projects/smpng/sys/ia64/ia64/unwind.c#3 integrate ... //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#9 integrate ... //depot/projects/smpng/sys/ia64/include/cpu.h#6 integrate ... //depot/projects/smpng/sys/ia64/include/db_machdep.h#5 integrate ... //depot/projects/smpng/sys/ia64/include/endian.h#6 integrate ... //depot/projects/smpng/sys/ia64/include/ia64_cpu.h#6 integrate ... //depot/projects/smpng/sys/ia64/include/pcb.h#2 integrate ... //depot/projects/smpng/sys/ia64/include/ptrace.h#3 integrate ... //depot/projects/smpng/sys/ia64/include/sapicvar.h#2 integrate ... //depot/projects/smpng/sys/ia64/include/vmparam.h#2 integrate ... //depot/projects/smpng/sys/ia64/isa/isa_dma.c#2 integrate ... //depot/projects/smpng/sys/isa/psm.c#8 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_lookup.c#4 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.c#3 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.h#2 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#6 integrate ... //depot/projects/smpng/sys/isofs/cd9660/iso.h#2 integrate ... //depot/projects/smpng/sys/kern/init_main.c#13 integrate ... //depot/projects/smpng/sys/kern/init_sysent.c#10 integrate ... //depot/projects/smpng/sys/kern/kern_acl.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_conf.c#10 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#17 integrate ... //depot/projects/smpng/sys/kern/kern_exec.c#27 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#26 integrate ... //depot/projects/smpng/sys/kern/kern_intr.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_ktr.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_ktrace.c#15 integrate ... //depot/projects/smpng/sys/kern/kern_linker.c#12 integrate ... //depot/projects/smpng/sys/kern/kern_lock.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_malloc.c#5 integrate ... //depot/projects/smpng/sys/kern/kern_module.c#7 integrate ... //depot/projects/smpng/sys/kern/kern_mtxpool.c#3 integrate ... //depot/projects/smpng/sys/kern/kern_poll.c#4 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#45 integrate ... //depot/projects/smpng/sys/kern/kern_shutdown.c#15 integrate ... //depot/projects/smpng/sys/kern/kern_switch.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_synch.c#22 integrate ... //depot/projects/smpng/sys/kern/kern_syscalls.c#3 integrate ... //depot/projects/smpng/sys/kern/subr_bus.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_disk.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_diskslice.c#4 integrate ... //depot/projects/smpng/sys/kern/subr_mbuf.c#11 integrate ... //depot/projects/smpng/sys/kern/subr_param.c#8 integrate ... //depot/projects/smpng/sys/kern/subr_power.c#2 integrate ... //depot/projects/smpng/sys/kern/subr_prf.c#9 integrate ... //depot/projects/smpng/sys/kern/subr_sbuf.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_smp.c#8 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#33 integrate ... //depot/projects/smpng/sys/kern/sys_generic.c#9 integrate ... //depot/projects/smpng/sys/kern/sys_pipe.c#9 integrate ... //depot/projects/smpng/sys/kern/sys_process.c#10 integrate ... //depot/projects/smpng/sys/kern/sys_socket.c#6 integrate ... //depot/projects/smpng/sys/kern/syscalls.c#10 integrate ... //depot/projects/smpng/sys/kern/syscalls.master#9 integrate ... //depot/projects/smpng/sys/kern/sysv_sem.c#12 integrate ... //depot/projects/smpng/sys/kern/tty.c#10 integrate ... //depot/projects/smpng/sys/kern/tty_pty.c#9 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#15 integrate ... //depot/projects/smpng/sys/kern/uipc_usrreq.c#15 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#13 integrate ... //depot/projects/smpng/sys/kern/vfs_bio.c#16 integrate ... //depot/projects/smpng/sys/kern/vfs_cache.c#8 integrate ... //depot/projects/smpng/sys/kern/vfs_cluster.c#7 integrate ... //depot/projects/smpng/sys/kern/vfs_conf.c#4 integrate ... //depot/projects/smpng/sys/kern/vfs_default.c#4 integrate ... //depot/projects/smpng/sys/kern/vfs_export.c#3 integrate ... //depot/projects/smpng/sys/kern/vfs_init.c#2 integrate ... //depot/projects/smpng/sys/kern/vfs_lookup.c#8 integrate ... //depot/projects/smpng/sys/kern/vfs_subr.c#18 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#21 integrate ... //depot/projects/smpng/sys/kern/vfs_vnops.c#16 integrate ... //depot/projects/smpng/sys/kern/vnode_if.src#5 integrate ... //depot/projects/smpng/sys/libkern/strvalid.c#2 integrate ... //depot/projects/smpng/sys/modules/Makefile#23 integrate ... //depot/projects/smpng/sys/modules/acpi/Makefile#7 integrate ... //depot/projects/smpng/sys/modules/smbfs/Makefile#4 integrate ... //depot/projects/smpng/sys/modules/ucom/Makefile#1 branch ... //depot/projects/smpng/sys/modules/ufm/Makefile#1 branch ... //depot/projects/smpng/sys/modules/uplcom/Makefile#1 branch ... //depot/projects/smpng/sys/modules/uvscom/Makefile#1 branch ... //depot/projects/smpng/sys/net/bpf.c#9 integrate ... //depot/projects/smpng/sys/net/bridge.c#9 integrate ... //depot/projects/smpng/sys/net/if.c#14 integrate ... //depot/projects/smpng/sys/net/if.h#7 integrate ... //depot/projects/smpng/sys/net/if_faith.c#7 integrate ... //depot/projects/smpng/sys/net/if_gif.c#6 integrate ... //depot/projects/smpng/sys/net/if_gif.h#3 integrate ... //depot/projects/smpng/sys/net/if_loop.c#7 integrate ... //depot/projects/smpng/sys/net/if_ppp.c#6 integrate ... //depot/projects/smpng/sys/net/if_stf.c#10 integrate ... //depot/projects/smpng/sys/net/if_vlan.c#8 integrate ... //depot/projects/smpng/sys/net/if_vlan_var.h#4 integrate ... //depot/projects/smpng/sys/netgraph/netgraph.h#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_base.c#5 integrate ... //depot/projects/smpng/sys/netgraph/ng_ppp.c#4 integrate ... //depot/projects/smpng/sys/netinet/in.h#6 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.h#6 integrate ... //depot/projects/smpng/sys/netinet/tcp_syncache.c#8 integrate ... //depot/projects/smpng/sys/netinet6/esp_core.c#4 integrate ... //depot/projects/smpng/sys/netinet6/in6.h#3 integrate ... //depot/projects/smpng/sys/netinet6/ip6protosw.h#3 integrate ... //depot/projects/smpng/sys/netkey/key.c#10 integrate ... //depot/projects/smpng/sys/netsmb/smb_trantcp.c#6 integrate ... //depot/projects/smpng/sys/nfsclient/bootp_subr.c#8 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#12 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_serv.c#12 integrate ... //depot/projects/smpng/sys/pc98/apm/apm.c#4 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#18 integrate ... //depot/projects/smpng/sys/pc98/pc98/pcaudio.c#5 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio.c#10 integrate ... //depot/projects/smpng/sys/pccard/pcic_pci.c#20 integrate ... //depot/projects/smpng/sys/pci/cy_pci.c#3 integrate ... //depot/projects/smpng/sys/powerpc/include/endian.h#5 integrate ... //depot/projects/smpng/sys/powerpc/include/ptrace.h#3 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#17 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#12 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#13 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_interface.c#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_interface.h#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_lkm.c#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_log.c#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_log.h#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_mediate.c#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_mediate.h#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_mmap.c#5 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_monitor.c#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_monitor.h#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_pipe.c#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_pipe.h#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_plm.c#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_plm.h#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_socket.c#8 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_socket.h#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_util.c#5 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_util.h#2 integrate ... //depot/projects/smpng/sys/security/lomac/lomac.h#2 integrate ... //depot/projects/smpng/sys/security/lomac/lomacfs.h#2 integrate ... //depot/projects/smpng/sys/security/lomac/lomacfs_subr.c#2 integrate ... //depot/projects/smpng/sys/security/lomac/lomacfs_vfsops.c#2 integrate ... //depot/projects/smpng/sys/security/lomac/lomacfs_vnops.c#4 integrate ... //depot/projects/smpng/sys/security/lomac/lomacio.h#2 integrate ... //depot/projects/smpng/sys/security/lomac/policy_plm.h#2 integrate ... //depot/projects/smpng/sys/security/lomac/syscall_gate.c#2 integrate ... //depot/projects/smpng/sys/security/lomac/syscall_gate.h#2 integrate ... //depot/projects/smpng/sys/sparc64/ebus/ebus.c#3 integrate ... //depot/projects/smpng/sys/sparc64/include/asmacros.h#9 integrate ... //depot/projects/smpng/sys/sparc64/include/endian.h#6 integrate ... //depot/projects/smpng/sys/sparc64/include/fsr.h#2 integrate ... //depot/projects/smpng/sys/sparc64/include/instr.h#3 integrate ... //depot/projects/smpng/sys/sparc64/include/ofw_machdep.h#2 integrate ... //depot/projects/smpng/sys/sparc64/include/pcpu.h#4 integrate ... //depot/projects/smpng/sys/sparc64/include/pmap.h#10 integrate ... //depot/projects/smpng/sys/sparc64/include/ptrace.h#5 integrate ... //depot/projects/smpng/sys/sparc64/include/pv.h#5 integrate ... //depot/projects/smpng/sys/sparc64/include/smp.h#6 integrate ... //depot/projects/smpng/sys/sparc64/include/tick.h#2 integrate ... //depot/projects/smpng/sys/sparc64/include/tlb.h#8 integrate ... //depot/projects/smpng/sys/sparc64/include/upa.h#3 integrate ... //depot/projects/smpng/sys/sparc64/include/vmparam.h#8 integrate ... //depot/projects/smpng/sys/sparc64/isa/ofw_isa.c#2 integrate ... //depot/projects/smpng/sys/sparc64/pci/psycho.c#4 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#4 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/db_interface.c#9 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/exception.s#15 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#16 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#12 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/locore.s#13 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#19 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/mem.c#1 branch ... //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.s#2 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/mp_locore.s#2 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#3 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#17 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pv.c#9 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/swtch.s#13 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/tick.c#5 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/trap.c#28 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#10 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#17 integrate ... //depot/projects/smpng/sys/sys/ata.h#6 integrate ... //depot/projects/smpng/sys/sys/bio.h#3 integrate ... //depot/projects/smpng/sys/sys/buf.h#8 integrate ... //depot/projects/smpng/sys/sys/cdrio.h#5 integrate ... //depot/projects/smpng/sys/sys/conf.h#10 integrate ... //depot/projects/smpng/sys/sys/consio.h#4 integrate ... //depot/projects/smpng/sys/sys/disk.h#2 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#6 integrate ... //depot/projects/smpng/sys/sys/dvdio.h#3 integrate ... //depot/projects/smpng/sys/sys/errno.h#4 integrate ... //depot/projects/smpng/sys/sys/kernel.h#11 integrate ... //depot/projects/smpng/sys/sys/lockmgr.h#4 integrate ... //depot/projects/smpng/sys/sys/malloc.h#3 integrate ... //depot/projects/smpng/sys/sys/module.h#4 integrate ... //depot/projects/smpng/sys/sys/mount.h#6 integrate ... //depot/projects/smpng/sys/sys/mutex.h#19 integrate ... //depot/projects/smpng/sys/sys/namei.h#5 integrate ... //depot/projects/smpng/sys/sys/param.h#16 integrate ... //depot/projects/smpng/sys/sys/power.h#2 integrate ... //depot/projects/smpng/sys/sys/proc.h#38 integrate ... //depot/projects/smpng/sys/sys/ptrace.h#8 integrate ... //depot/projects/smpng/sys/sys/random.h#2 integrate ... //depot/projects/smpng/sys/sys/selinfo.h#4 integrate ... //depot/projects/smpng/sys/sys/smp.h#5 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#12 integrate ... //depot/projects/smpng/sys/sys/syscall.h#10 integrate ... //depot/projects/smpng/sys/sys/syscall.mk#10 integrate ... //depot/projects/smpng/sys/sys/sysctl.h#6 integrate ... //depot/projects/smpng/sys/sys/sysent.h#4 integrate ... //depot/projects/smpng/sys/sys/sysproto.h#11 integrate ... //depot/projects/smpng/sys/sys/systm.h#21 integrate ... //depot/projects/smpng/sys/sys/types.h#8 integrate ... //depot/projects/smpng/sys/sys/user.h#8 integrate ... //depot/projects/smpng/sys/sys/vnode.h#13 integrate ... //depot/projects/smpng/sys/tools/vnode_if.awk#1 branch ... //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#7 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#4 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#10 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#9 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#13 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#3 integrate ... //depot/projects/smpng/sys/ufs/ffs/softdep.h#2 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_lookup.c#3 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_vfsops.c#4 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#7 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#2 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#8 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#10 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#3 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_ihash.c#3 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#8 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_readwrite.c#5 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#6 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#10 integrate ... //depot/projects/smpng/sys/vm/default_pager.c#2 integrate ... //depot/projects/smpng/sys/vm/device_pager.c#2 integrate ... //depot/projects/smpng/sys/vm/pmap.h#4 integrate ... //depot/projects/smpng/sys/vm/swap_pager.c#11 integrate ... //depot/projects/smpng/sys/vm/swap_pager.h#2 integrate ... //depot/projects/smpng/sys/vm/uma.h#1 branch ... //depot/projects/smpng/sys/vm/uma_core.c#1 branch ... //depot/projects/smpng/sys/vm/uma_int.h#1 branch ... //depot/projects/smpng/sys/vm/vm.h#4 integrate ... //depot/projects/smpng/sys/vm/vm_contig.c#4 integrate ... //depot/projects/smpng/sys/vm/vm_extern.h#7 integrate ... //depot/projects/smpng/sys/vm/vm_fault.c#6 integrate ... //depot/projects/smpng/sys/vm/vm_glue.c#10 integrate ... //depot/projects/smpng/sys/vm/vm_init.c#3 integrate ... //depot/projects/smpng/sys/vm/vm_kern.c#4 integrate ... //depot/projects/smpng/sys/vm/vm_map.c#8 integrate ... //depot/projects/smpng/sys/vm/vm_map.h#5 integrate ... //depot/projects/smpng/sys/vm/vm_mmap.c#11 integrate ... //depot/projects/smpng/sys/vm/vm_object.c#6 integrate ... //depot/projects/smpng/sys/vm/vm_page.c#10 integrate ... //depot/projects/smpng/sys/vm/vm_page.h#6 integrate ... //depot/projects/smpng/sys/vm/vm_pageout.c#9 integrate ... //depot/projects/smpng/sys/vm/vm_pageout.h#4 integrate ... //depot/projects/smpng/sys/vm/vm_pageq.c#3 integrate ... //depot/projects/smpng/sys/vm/vm_pager.c#4 integrate ... //depot/projects/smpng/sys/vm/vm_pager.h#2 integrate ... //depot/projects/smpng/sys/vm/vm_swap.c#7 integrate ... //depot/projects/smpng/sys/vm/vm_zone.c#5 integrate ... //depot/projects/smpng/sys/vm/vm_zone.h#3 integrate ... //depot/projects/smpng/sys/vm/vnode_pager.c#11 integrate ... //depot/projects/smpng/sys/vm/vnode_pager.h#2 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.61 2002/02/08 18:23:46 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.64 2002/03/11 19:58:53 jhb Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /* @@ -60,6 +60,7 @@ #include #include #include +#include #ifdef EVCNT_COUNTERS struct evcnt clock_intr_evcnt; /* event counter for clock intrs. */ @@ -422,7 +423,7 @@ KASSERT(ithd != NULL, ("interrupt vector without a thread")); /* - * As an optomization, if an ithread has no handlers, don't + * As an optimization, if an ithread has no handlers, don't * schedule it to run. */ if (TAILQ_EMPTY(&ithd->it_handlers)) @@ -448,7 +449,7 @@ "alpha_dispatch_intr: disabling vector 0x%x", i->vector); ithd->it_disable(ithd->it_vector); } - error = ithread_schedule(ithd, !cold); + error = ithread_schedule(ithd, 0 /* !cold */); KASSERT(error == 0, ("got an impossible stray interrupt")); } ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#30 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.164 2002/02/17 17:40:21 deischen Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.167 2002/03/13 19:16:41 des Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1510,7 +1510,8 @@ const struct __ucontext *sigcntxp; } */ *uap) { - ucontext_t uc, *ucp; + ucontext_t uc; + const ucontext_t *ucp; struct pcb *pcb; unsigned long val; struct proc *p; @@ -1530,7 +1531,7 @@ * so even if copyin() faults, we may have actually gotten a complete * struct osigcontext. */ - if (copyin((caddr_t)ucp, (caddr_t)&uc, sizeof(ucontext_t))) { + if (copyin(ucp, &uc, sizeof(ucontext_t))) { #ifdef COMPAT_43 if (((struct osigcontext*)&uc)->sc_regs[R_ZERO] == 0xACEDBADE) return osigreturn(td, (struct osigreturn_args *)uap); ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#11 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.33 2002/02/22 13:31:52 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.35 2002/03/07 04:43:50 jake Exp $ */ #include @@ -50,6 +50,7 @@ #include #include #include +#include /* Set to 1 once we're ready to let the APs out of the pen. */ static volatile int aps_ready = 0; @@ -307,6 +308,7 @@ all_cpus = 1 << boot_cpu_id; mp_ncpus = 1; + mp_maxid = 0; /* Make sure we have at least one secondary CPU. */ cpus = 0; @@ -332,6 +334,7 @@ if (i > MAXCPU) { continue; } + mp_maxid = i; cpus++; } return (cpus); ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#24 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.85 2002/02/28 07:40:55 silby Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.86 2002/03/19 09:11:46 jeff Exp $ */ /* @@ -322,11 +322,9 @@ * Data for the pv entry allocation mechanism */ static vm_zone_t pvzone; -static struct vm_zone pvzone_store; static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; static int pmap_pagedaemon_waken = 0; -static struct pv_entry *pvinit; static PMAP_INLINE void free_pv_entry __P((pv_entry_t pv)); static pv_entry_t get_pv_entry __P((void)); @@ -349,6 +347,7 @@ static vm_page_t _pmap_allocpte __P((pmap_t pmap, unsigned ptepindex)); static vm_page_t pmap_page_lookup __P((vm_object_t object, vm_pindex_t pindex)); static int pmap_unuse_pt __P((pmap_t, vm_offset_t, vm_page_t)); +static void *pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); #ifdef SMP static void pmap_invalidate_page_action __P((void *arg)); static void pmap_invalidate_all_action __P((void *arg)); @@ -575,6 +574,13 @@ return 0; } +static void * +pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) +{ + *flags = UMA_SLAB_PRIV; + return (void *)kmem_alloc(kernel_map, bytes); +} + /* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap @@ -609,11 +615,16 @@ initial_pvs = vm_page_array_size; if (initial_pvs < MINPV) initial_pvs = MINPV; +#if 0 pvzone = &pvzone_store; pvinit = (struct pv_entry *) kmem_alloc(kernel_map, initial_pvs * sizeof (struct pv_entry)); zbootinit(pvzone, "PV ENTRY", sizeof (struct pv_entry), pvinit, vm_page_array_size); +#endif + pvzone = zinit("PV ENTRY", sizeof (struct pv_entry), 0, 0, 0); + uma_zone_set_allocf(pvzone, pmap_allocf); + uma_prealloc(pvzone, initial_pvs); /* * object for kernel page table pages */ @@ -638,7 +649,10 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_page_array_size; pv_entry_high_water = 9 * (pv_entry_max / 10); +#if 0 zinitna(pvzone, &pvzone_obj, NULL, 0, pv_entry_max, ZONE_INTERRUPT, 1); +#endif + uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); } ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#27 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.85 2002/02/28 08:28:14 arr Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.86 2002/02/28 21:52:07 arr Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* ==== //depot/projects/smpng/sys/alpha/include/endian.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/alpha/include/endian.h,v 1.8 2002/02/28 18:21:51 gallatin Exp $ + * $FreeBSD: src/sys/alpha/include/endian.h,v 1.9 2002/03/09 21:02:11 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -46,11 +46,11 @@ #define _QUAD_HIGHWORD 1 #define _QUAD_LOWWORD 0 +#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ -#ifndef _POSIX_SOURCE #define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ #define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ #define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ @@ -58,10 +58,18 @@ #define BYTE_ORDER LITTLE_ENDIAN #endif /* !_POSIX_SOURCE */ -#ifdef _KERNEL #ifdef __GNUC__ -#define _BSWAP32_DEFINED +static __inline __uint64_t +__bswap64(__uint64_t _x) +{ + + return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) | + ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) | + ((_x << 24) & ((__uint64_t)0xff << 40)) | + ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56))); +} + static __inline __uint32_t __bswap32(__uint32_t __x) { @@ -81,7 +89,6 @@ return (__r); } -#define _BSWAP16_DEFINED static __inline __uint16_t __bswap16(__uint16_t __x) { @@ -95,8 +102,11 @@ return (__r); } -#endif /* _KERNEL */ +#endif /* __GNUC__ */ -#endif /* __GNUC__ */ +#define __htonl(x) __bswap32(x) +#define __htons(x) __bswap16(x) +#define __ntohl(x) __bswap32(x) +#define __ntohs(x) __bswap16(x) #endif /* !_MACHINE_ENDIAN_H_ */ ==== //depot/projects/smpng/sys/alpha/include/ptrace.h#5 (text+ko) ==== @@ -31,23 +31,14 @@ * SUCH DAMAGE. * * @(#)ptrace.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/alpha/include/ptrace.h,v 1.9 2001/09/12 08:36:55 julian Exp $ + * $FreeBSD: src/sys/alpha/include/ptrace.h,v 1.10 2002/03/16 00:25:50 des Exp $ */ #ifndef _MACHINE_PTRACE_H_ #define _MACHINE_PTRACE_H_ -/* - * Machine dependent trace commands. - */ -#define PT_GETREGS (PT_FIRSTMACH + 1) -#define PT_SETREGS (PT_FIRSTMACH + 2) -#define PT_GETFPREGS (PT_FIRSTMACH + 3) -#define PT_SETFPREGS (PT_FIRSTMACH + 4) - +#ifdef _KERNEL #define FIX_SSTEP(p) ptrace_clear_single_step(p) - -#ifdef _KERNEL int ptrace_clear_single_step(struct thread *_p); #endif ==== //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.21 2001/12/20 23:48:29 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.22 2002/03/01 23:10:19 mjacob Exp $ */ /* * Copyright (c) 2000 Matthew Jacob * All rights reserved. @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -742,7 +743,7 @@ DEVMETHOD(bus_read_ivar, mcpcia_read_ivar), DEVMETHOD(bus_setup_intr, mcpcia_setup_intr), DEVMETHOD(bus_teardown_intr, mcpcia_teardown_intr), - DEVMETHOD(bus_alloc_resource, pci_alloc_resource), + DEVMETHOD(bus_alloc_resource, alpha_pci_alloc_resource), DEVMETHOD(bus_release_resource, pci_release_resource), DEVMETHOD(bus_activate_resource, pci_activate_resource), DEVMETHOD(bus_deactivate_resource, pci_deactivate_resource), ==== //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.21 2001/12/20 23:48:29 jhb Exp $ + * $FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.22 2002/03/01 23:15:45 mjacob Exp $ */ /* @@ -844,7 +844,7 @@ DEVMETHOD(bus_read_ivar, dwlpx_read_ivar), DEVMETHOD(bus_setup_intr, dwlpx_setup_intr), DEVMETHOD(bus_teardown_intr, dwlpx_teardown_intr), - DEVMETHOD(bus_alloc_resource, pci_alloc_resource), + DEVMETHOD(bus_alloc_resource, alpha_pci_alloc_resource), DEVMETHOD(bus_release_resource, pci_release_resource), DEVMETHOD(bus_activate_resource, pci_activate_resource), DEVMETHOD(bus_deactivate_resource, pci_deactivate_resource), ==== //depot/projects/smpng/sys/boot/common/bootstrap.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.35 2002/02/25 04:31:25 bde Exp $ + * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.36 2002/03/10 22:33:04 sobomax Exp $ */ #include @@ -219,7 +219,6 @@ extern struct preloaded_file *preloaded_files; int mod_load(char *name, struct mod_depend *verinfo, int argc, char *argv[]); -int mod_loadobj(char *type, char *name); int mod_loadkld(const char *name, int argc, char *argv[]); struct preloaded_file *file_alloc(void); ==== //depot/projects/smpng/sys/boot/common/loader.8#11 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.40 2002/02/21 05:15:51 davidc Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.41 2002/03/15 15:12:10 ru Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -405,8 +405,12 @@ The following tunables are available: .Bl -tag -width Va .It Va hw.physmem -Limit the amount of phyiscal memory the system will use. -By default the size is in bytes, but the k, K, m, M, g and G suffixes +Limit the amount of physical memory the system will use. +By default the size is in bytes, but the +.Cm k , K , m , M , g +and +.Cm G +suffixes are also accepted and indicate kilobytes, megabytes and gigabytes respectively. An invalid suffix will result in the variable being ignored by the ==== //depot/projects/smpng/sys/boot/efi/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.2 2001/06/16 05:59:45 obrien Exp $ +# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.3 2002/03/19 10:51:57 peter Exp $ # Options used when building app-specific efi components @@ -6,3 +6,4 @@ LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand LIBSTAND= -lstand LIBEFI= ${.OBJDIR}/../libefi/libefi.a +CFLAGS+= -ffreestanding ==== //depot/projects/smpng/sys/boot/efi/include/efiapi.h#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 12: 1:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A69C837B405; Tue, 19 Mar 2002 12:00:39 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mail12.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by hub.freebsd.org (Postfix) with ESMTP id 7BC4837B41A for ; Tue, 19 Mar 2002 12:00:22 -0800 (PST) Received: (qmail 24699 invoked from network); 19 Mar 2002 20:00:21 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 19 Mar 2002 20:00:21 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g2JK0pv58685; Tue, 19 Mar 2002 15:00:51 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20020319194600.B2BB33810@overcee.wemm.org> Date: Tue, 19 Mar 2002 15:00:24 -0500 (EST) From: John Baldwin To: Peter Wemm Subject: Re: PERFORCE change 7933 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 19-Mar-2002 Peter Wemm wrote: > John Baldwin wrote: >> >> On 19-Mar-2002 Peter Wemm wrote: >> > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7933 >> > >> > Change 7933 by peter@peter_overcee on 2002/03/19 01:29:12 >> > >> > add the ia64 IO tag, and add a #error to catch this in future. >> > >> > Affected files ... >> > >> > ... //depot/projects/ia64/sys/dev/kbd/atkbdc.c#2 edit >> > >> > Differences ... >> > >> > ==== //depot/projects/ia64/sys/dev/kbd/atkbdc.c#2 (text+ko) ==== >> > >> > @@ -159,6 +159,10 @@ >> > tag = I386_BUS_SPACE_IO; >> > #elif defined(__alpha__) >> > tag = busspace_isa_io; >> > +#elif defined(__ia64__) >> > + tag = IA64_BUS_SPACE_IO; >> > +#else >> > +#error "define tag!" >> > #endif >> > >> > #if notyet >> >> Maybe there should be a MD macro to define what the appropriate bus tag is? > > Actually, this should use the proper API's instead of hacking around like > this. Fair enough, wasn't sure if it could be using bus_alloc_resource() like a Good Little Device Driver or not. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 12:59:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20C6537B402; Tue, 19 Mar 2002 12:59:41 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 100A537B400 for ; Tue, 19 Mar 2002 12:59:40 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2JKxdk10170 for perforce@freebsd.org; Tue, 19 Mar 2002 12:59:39 -0800 (PST) (envelope-from jake@freebsd.org) Date: Tue, 19 Mar 2002 12:59:39 -0800 (PST) Message-Id: <200203192059.g2JKxdk10170@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 7981 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7981 Change 7981 by jake@jake_sparc64 on 2002/03/19 12:59:07 Build crtbegin and crtend. Affected files ... ... //depot/projects/sparc64/lib/csu/sparc64/Makefile#3 edit Differences ... ==== //depot/projects/sparc64/lib/csu/sparc64/Makefile#3 (text+ko) ==== @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../common -SRCS= crt1.c crti.S crtn.S +SRCS= crt1.c crti.S crtn.S crtbegin.c crtend.c OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o CFLAGS+= -I${.CURDIR}/../common To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 13:32: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA8AE37B419; Tue, 19 Mar 2002 13:31:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from dragon.nuxi.com (trang.nuxi.com [66.92.13.169]) by hub.freebsd.org (Postfix) with ESMTP id 4A24537B404; Tue, 19 Mar 2002 13:30:54 -0800 (PST) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.12.2/8.12.2) with ESMTP id g2JLUslv094064; Tue, 19 Mar 2002 13:30:54 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.2/8.12.2/Submit) id g2JLTd00094027; Tue, 19 Mar 2002 13:29:39 -0800 (PST) Date: Tue, 19 Mar 2002 13:29:39 -0800 From: "David O'Brien" To: Jake Burkholder Cc: Perforce Change Reviews Subject: Re: PERFORCE change 7981 for review Message-ID: <20020319132939.A94007@dragon.nuxi.com> Reply-To: obrien@FreeBSD.org References: <200203192059.g2JKxdk10170@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200203192059.g2JKxdk10170@freefall.freebsd.org>; from jake@FreeBSD.org on Tue, Mar 19, 2002 at 12:59:39PM -0800 X-Operating-System: FreeBSD 5.0-CURRENT Organization: The NUXI BSD group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, Mar 19, 2002 at 12:59:39PM -0800, Jake Burkholder wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7981 > > Change 7981 by jake@jake_sparc64 on 2002/03/19 12:59:07 > > Build crtbegin and crtend. I asked you work with me on this in IRC. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 14:34: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76B8237B404; Tue, 19 Mar 2002 14:32:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C1EEF37B402 for ; Tue, 19 Mar 2002 14:31:57 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2JMVtK38294 for perforce@freebsd.org; Tue, 19 Mar 2002 14:31:55 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 14:31:55 -0800 (PST) Message-Id: <200203192231.g2JMVtK38294@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 7996 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7996 Change 7996 by peter@peter_daintree on 2002/03/19 14:31:39 IFC @7995 Affected files ... ... //depot/projects/ia64/contrib/ipfilter/BNF#2 integrate ... //depot/projects/ia64/contrib/ipfilter/BSD/Makefile#2 integrate ... //depot/projects/ia64/contrib/ipfilter/BSD/kupgrade#2 integrate ... //depot/projects/ia64/contrib/ipfilter/FreeBSD-2.2/kinstall#2 integrate ... //depot/projects/ia64/contrib/ipfilter/FreeBSD-3/kinstall#2 integrate ... //depot/projects/ia64/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4#1 branch ... //depot/projects/ia64/contrib/ipfilter/FreeBSD-4.0/kinstall#2 integrate ... //depot/projects/ia64/contrib/ipfilter/FreeBSD/kinstall#2 integrate ... //depot/projects/ia64/contrib/ipfilter/HISTORY#2 integrate ... //depot/projects/ia64/contrib/ipfilter/INSTALL.FreeBSD#2 integrate ... //depot/projects/ia64/contrib/ipfilter/IPFILTER.LICENCE#2 integrate ... //depot/projects/ia64/contrib/ipfilter/Makefile#2 integrate ... //depot/projects/ia64/contrib/ipfilter/common.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/etc/protocols#2 integrate ... //depot/projects/ia64/contrib/ipfilter/fils.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/inet_addr.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ip_ipsec_pxy.c#1 branch ... //depot/projects/ia64/contrib/ipfilter/ip_lfil.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ip_netbios_pxy.c#1 branch ... //depot/projects/ia64/contrib/ipfilter/ip_sfil.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipf.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipf.h#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipfs.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipft_ef.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipft_hx.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipft_pc.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipft_sn.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipft_td.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipft_tx.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/iplang/iplang_y.y#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipmon.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipnat.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/44arp.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/arp.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/ip.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/ipresend.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/ipsend.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/ipsopt.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/iptest.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/iptests.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/lsock.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/resend.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/sbpf.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/sirix.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/sock.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/ipt.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/kmem.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/kmem.h#2 integrate ... //depot/projects/ia64/contrib/ipfilter/man/Makefile#2 integrate ... //depot/projects/ia64/contrib/ipfilter/man/ipf.4#2 integrate ... //depot/projects/ia64/contrib/ipfilter/man/ipfilter.5#2 integrate ... //depot/projects/ia64/contrib/ipfilter/man/ipfs.8#2 integrate ... //depot/projects/ia64/contrib/ipfilter/man/ipl.4#2 integrate ... //depot/projects/ia64/contrib/ipfilter/man/ipmon.8#2 integrate ... //depot/projects/ia64/contrib/ipfilter/man/ipnat.5#2 integrate ... //depot/projects/ia64/contrib/ipfilter/man/ipnat.8#1 branch ... //depot/projects/ia64/contrib/ipfilter/misc.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/mlf_ipl.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/mli_ipl.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/mln_ipl.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/natparse.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/opt.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/parse.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/printnat.c#1 branch ... //depot/projects/ia64/contrib/ipfilter/printstate.c#1 branch ... //depot/projects/ia64/contrib/ipfilter/samples/Makefile#2 integrate ... //depot/projects/ia64/contrib/ipfilter/samples/proxy.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/solaris.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/test/Makefile#2 integrate ... //depot/projects/ia64/contrib/ipfilter/test/expected/f15#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/f16#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/l1#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/l1.b#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/ni1#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/ni2#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/input/f15#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/input/f16#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/input/ipf6-1#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/input/l1#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/input/ni1#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/input/ni2#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/logtest#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/mtest#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/natipftest#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/f15#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/f16#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/ipf6-1#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/l1#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/ni1.ipf#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/ni1.nat#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/ni2.ipf#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/ni2.nat#1 branch ... //depot/projects/ia64/contrib/ipfilter/todo#2 integrate ... //depot/projects/ia64/crypto/openssh/servconf.c#3 integrate ... //depot/projects/ia64/lib/libstand/Makefile#5 integrate ... //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#6 integrate ... //depot/projects/ia64/sbin/Makefile#4 integrate ... //depot/projects/ia64/sbin/disklabel/disklabel.5#2 integrate ... //depot/projects/ia64/sbin/disklabel/disklabel.c#5 integrate ... //depot/projects/ia64/sbin/dmesg/dmesg.c#2 integrate ... //depot/projects/ia64/sbin/ipfstat/Makefile#3 integrate ... //depot/projects/ia64/sbin/ipnat/Makefile#3 integrate ... //depot/projects/ia64/sbin/newfs/Makefile#4 integrate ... //depot/projects/ia64/sbin/newfs/mkfs.c#4 integrate ... //depot/projects/ia64/sbin/newfs/newfs.c#5 integrate ... //depot/projects/ia64/sbin/newfs/newfs.h#1 branch ... //depot/projects/ia64/sbin/newfs/ref.test#1 branch ... //depot/projects/ia64/sbin/newfs/runtest00.sh#1 branch ... //depot/projects/ia64/sbin/newfs/runtest01.sh#1 branch ... //depot/projects/ia64/sys/contrib/dev/fla/fla.c#2 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate ... //depot/projects/ia64/sys/dev/ccd/ccd.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/uhci.c#4 integrate ... //depot/projects/ia64/sys/fs/deadfs/dead_vnops.c#2 integrate ... //depot/projects/ia64/sys/fs/devfs/devfs_vfsops.c#2 integrate ... //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#5 integrate ... //depot/projects/ia64/sys/fs/fdescfs/fdesc.h#2 integrate ... //depot/projects/ia64/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate ... //depot/projects/ia64/sys/fs/fdescfs/fdesc_vnops.c#3 integrate ... //depot/projects/ia64/sys/fs/fifofs/fifo.h#2 integrate ... //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#5 integrate ... //depot/projects/ia64/sys/fs/hpfs/hpfs.h#4 integrate ... //depot/projects/ia64/sys/fs/hpfs/hpfs_vfsops.c#5 integrate ... //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#6 integrate ... //depot/projects/ia64/sys/fs/msdosfs/denode.h#2 integrate ... //depot/projects/ia64/sys/fs/msdosfs/direntry.h#2 integrate ... //depot/projects/ia64/sys/fs/msdosfs/fat.h#3 integrate ... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_conv.c#2 integrate ... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_denode.c#3 integrate ... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_fat.c#3 integrate ... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate ... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#4 integrate ... //depot/projects/ia64/sys/fs/msdosfs/msdosfsmount.h#3 integrate ... //depot/projects/ia64/sys/fs/ntfs/ntfs_ihash.h#2 integrate ... //depot/projects/ia64/sys/fs/ntfs/ntfs_subr.c#5 integrate ... //depot/projects/ia64/sys/fs/ntfs/ntfs_subr.h#2 integrate ... //depot/projects/ia64/sys/fs/ntfs/ntfs_vfsops.c#5 integrate ... //depot/projects/ia64/sys/fs/ntfs/ntfs_vnops.c#4 integrate ... //depot/projects/ia64/sys/fs/portalfs/portal_vfsops.c#4 integrate ... //depot/projects/ia64/sys/fs/portalfs/portal_vnops.c#3 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_ctl.c#4 integrate ... //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#3 integrate ... //depot/projects/ia64/sys/fs/umapfs/umap.h#2 integrate ... //depot/projects/ia64/sys/fs/umapfs/umap_subr.c#2 integrate ... //depot/projects/ia64/sys/fs/umapfs/umap_vfsops.c#3 integrate ... //depot/projects/ia64/sys/fs/umapfs/umap_vnops.c#2 integrate ... //depot/projects/ia64/sys/fs/unionfs/union.h#2 integrate ... //depot/projects/ia64/sys/fs/unionfs/union_subr.c#3 integrate ... //depot/projects/ia64/sys/fs/unionfs/union_vfsops.c#3 integrate ... //depot/projects/ia64/sys/fs/unionfs/union_vnops.c#3 integrate ... //depot/projects/ia64/sys/geom/geom_dev.c#3 integrate ... //depot/projects/ia64/sys/kern/imgact_aout.c#3 integrate ... //depot/projects/ia64/sys/kern/imgact_elf.c#3 integrate ... //depot/projects/ia64/sys/kern/imgact_gzip.c#2 integrate ... //depot/projects/ia64/sys/kern/inflate.c#2 integrate ... //depot/projects/ia64/sys/kern/kern_acct.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_clock.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#9 integrate ... //depot/projects/ia64/sys/kern/kern_exec.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_exit.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_intr.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_ktrace.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_linker.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_lockf.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_malloc.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_mutex.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_resource.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_sig.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_synch.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_tc.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_time.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_timeout.c#2 integrate ... //depot/projects/ia64/sys/kern/makesyscalls.sh#3 integrate ... //depot/projects/ia64/sys/kern/subr_autoconf.c#2 integrate ... //depot/projects/ia64/sys/kern/subr_diskmbr.c#4 integrate ... //depot/projects/ia64/sys/kern/subr_diskslice.c#4 integrate ... //depot/projects/ia64/sys/kern/subr_prf.c#6 integrate ... //depot/projects/ia64/sys/kern/subr_prof.c#3 integrate ... //depot/projects/ia64/sys/kern/subr_smp.c#4 integrate ... //depot/projects/ia64/sys/kern/sys_generic.c#7 integrate ... //depot/projects/ia64/sys/kern/sysv_msg.c#3 integrate ... //depot/projects/ia64/sys/kern/sysv_sem.c#5 integrate ... //depot/projects/ia64/sys/kern/sysv_shm.c#3 integrate ... //depot/projects/ia64/sys/kern/tty.c#6 integrate ... //depot/projects/ia64/sys/kern/tty_compat.c#2 integrate ... //depot/projects/ia64/sys/kern/tty_pty.c#3 integrate ... //depot/projects/ia64/sys/kern/tty_subr.c#2 integrate ... //depot/projects/ia64/sys/kern/tty_tty.c#3 integrate ... //depot/projects/ia64/sys/kern/uipc_domain.c#3 integrate ... //depot/projects/ia64/sys/kern/uipc_mbuf2.c#2 integrate ... //depot/projects/ia64/sys/kern/uipc_syscalls.c#5 integrate ... //depot/projects/ia64/sys/kern/uipc_usrreq.c#7 integrate ... //depot/projects/ia64/sys/kern/vfs_bio.c#10 integrate ... //depot/projects/ia64/sys/kern/vfs_cache.c#4 integrate ... //depot/projects/ia64/sys/kern/vfs_cluster.c#5 integrate ... //depot/projects/ia64/sys/kern/vfs_default.c#4 integrate ... //depot/projects/ia64/sys/kern/vfs_export.c#3 integrate ... //depot/projects/ia64/sys/kern/vfs_subr.c#5 integrate ... //depot/projects/ia64/sys/kern/vfs_syscalls.c#6 integrate ... //depot/projects/ia64/sys/kern/vfs_vnops.c#7 integrate ... //depot/projects/ia64/sys/net/bpf.c#5 integrate ... //depot/projects/ia64/sys/net/bpf.h#2 integrate ... //depot/projects/ia64/sys/net/bpf_filter.c#3 integrate ... //depot/projects/ia64/sys/net/bsd_comp.c#2 integrate ... //depot/projects/ia64/sys/net/ethernet.h#3 integrate ... //depot/projects/ia64/sys/net/fddi.h#2 integrate ... //depot/projects/ia64/sys/net/if.c#4 integrate ... //depot/projects/ia64/sys/net/if.h#5 integrate ... //depot/projects/ia64/sys/net/if_arc.h#3 integrate ... //depot/projects/ia64/sys/net/if_arcsubr.c#2 integrate ... //depot/projects/ia64/sys/net/if_atm.h#2 integrate ... //depot/projects/ia64/sys/net/if_dl.h#2 integrate ... //depot/projects/ia64/sys/net/if_ethersubr.c#6 integrate ... //depot/projects/ia64/sys/net/if_faith.c#4 integrate ... //depot/projects/ia64/sys/net/if_fddisubr.c#2 integrate ... //depot/projects/ia64/sys/net/if_gif.c#4 integrate ... //depot/projects/ia64/sys/net/if_gif.h#3 integrate ... //depot/projects/ia64/sys/net/if_media.c#2 integrate ... //depot/projects/ia64/sys/net/if_media.h#2 integrate ... //depot/projects/ia64/sys/net/if_ppp.c#3 integrate ... //depot/projects/ia64/sys/net/if_pppvar.h#3 integrate ... //depot/projects/ia64/sys/net/if_sl.c#3 integrate ... //depot/projects/ia64/sys/net/if_stf.c#5 integrate ... //depot/projects/ia64/sys/net/if_stf.h#2 integrate ... //depot/projects/ia64/sys/net/if_tap.c#4 integrate ... //depot/projects/ia64/sys/net/if_var.h#5 integrate ... //depot/projects/ia64/sys/net/intrq.h#3 integrate ... //depot/projects/ia64/sys/net/net_osdep.h#2 integrate ... //depot/projects/ia64/sys/net/netisr.h#3 integrate ... //depot/projects/ia64/sys/net/pfil.c#2 integrate ... //depot/projects/ia64/sys/net/pfil.h#2 integrate ... //depot/projects/ia64/sys/net/ppp_comp.h#2 integrate ... //depot/projects/ia64/sys/net/ppp_deflate.c#2 integrate ... //depot/projects/ia64/sys/net/ppp_tty.c#3 integrate ... //depot/projects/ia64/sys/net/radix.c#2 integrate ... //depot/projects/ia64/sys/net/radix.h#2 integrate ... //depot/projects/ia64/sys/net/raw_cb.h#2 integrate ... //depot/projects/ia64/sys/net/route.c#3 integrate ... //depot/projects/ia64/sys/net/route.h#4 integrate ... //depot/projects/ia64/sys/net/rtsock.c#3 integrate ... //depot/projects/ia64/sys/net/slcompress.h#2 integrate ... //depot/projects/ia64/sys/netinet/icmp6.h#2 integrate ... //depot/projects/ia64/sys/netinet/icmp_var.h#4 integrate ... //depot/projects/ia64/sys/netinet/if_atm.h#2 integrate ... //depot/projects/ia64/sys/netinet/if_ether.c#4 integrate ... //depot/projects/ia64/sys/netinet/if_ether.h#2 integrate ... //depot/projects/ia64/sys/netinet/if_fddi.h#2 integrate ... //depot/projects/ia64/sys/netinet/igmp.c#2 integrate ... //depot/projects/ia64/sys/netinet/igmp_var.h#2 integrate ... //depot/projects/ia64/sys/netinet/in.c#3 integrate ... //depot/projects/ia64/sys/netinet/in.h#5 integrate ... //depot/projects/ia64/sys/netinet/in_gif.h#3 integrate ... //depot/projects/ia64/sys/netinet/in_pcb.c#8 integrate ... //depot/projects/ia64/sys/netinet/in_pcb.h#5 integrate ... //depot/projects/ia64/sys/netinet/in_proto.c#2 integrate ... //depot/projects/ia64/sys/netinet/in_rmx.c#2 integrate ... //depot/projects/ia64/sys/netinet/in_systm.h#2 integrate ... //depot/projects/ia64/sys/netinet/in_var.h#2 integrate ... //depot/projects/ia64/sys/netinet/ip_ecn.h#2 integrate ... //depot/projects/ia64/sys/netinet/ip_encap.c#2 integrate ... //depot/projects/ia64/sys/netinet/ip_encap.h#2 integrate ... //depot/projects/ia64/sys/netinet/ip_fw.h#4 integrate ... //depot/projects/ia64/sys/netinet/ip_icmp.c#5 integrate ... //depot/projects/ia64/sys/netinet/ip_icmp.h#2 integrate ... //depot/projects/ia64/sys/netinet/ip_id.c#2 integrate ... //depot/projects/ia64/sys/netinet/ip_input.c#6 integrate ... //depot/projects/ia64/sys/netinet/ip_mroute.c#4 integrate ... //depot/projects/ia64/sys/netinet/ip_mroute.h#2 integrate ... //depot/projects/ia64/sys/netinet/ip_output.c#6 integrate ... //depot/projects/ia64/sys/netinet/ip_var.h#3 integrate ... //depot/projects/ia64/sys/netinet/tcp_input.c#6 integrate ... //depot/projects/ia64/sys/netinet/tcp_subr.c#5 integrate ... //depot/projects/ia64/sys/netinet/tcp_timer.h#2 integrate ... //depot/projects/ia64/sys/netinet/tcp_usrreq.c#4 integrate ... //depot/projects/ia64/sys/netinet/tcp_var.h#4 integrate ... //depot/projects/ia64/sys/netinet/udp_usrreq.c#4 integrate ... //depot/projects/ia64/sys/netinet/udp_var.h#2 integrate ... //depot/projects/ia64/sys/netinet6/icmp6.c#2 integrate ... //depot/projects/ia64/sys/netinet6/in6.h#3 integrate ... //depot/projects/ia64/sys/netinet6/ip6_forward.c#3 integrate ... //depot/projects/ia64/sys/netinet6/ip6_input.c#3 integrate ... //depot/projects/ia64/sys/netinet6/ip6_output.c#3 integrate ... //depot/projects/ia64/sys/netinet6/ip6protosw.h#2 integrate ... //depot/projects/ia64/sys/posix4/aio.h#2 integrate ... //depot/projects/ia64/sys/posix4/mqueue.h#2 integrate ... //depot/projects/ia64/sys/posix4/posix4.h#2 integrate ... //depot/projects/ia64/sys/posix4/sched.h#2 integrate ... //depot/projects/ia64/sys/posix4/semaphore.h#2 integrate ... //depot/projects/ia64/sys/sys/acct.h#2 integrate ... //depot/projects/ia64/sys/sys/acl.h#3 integrate ... //depot/projects/ia64/sys/sys/bio.h#5 integrate ... //depot/projects/ia64/sys/sys/buf.h#6 integrate ... //depot/projects/ia64/sys/sys/callout.h#2 integrate ... //depot/projects/ia64/sys/sys/conf.h#6 integrate ... //depot/projects/ia64/sys/sys/cons.h#3 integrate ... //depot/projects/ia64/sys/sys/disk.h#3 integrate ... //depot/projects/ia64/sys/sys/disklabel.h#6 integrate ... //depot/projects/ia64/sys/sys/diskslice.h#2 integrate ... //depot/projects/ia64/sys/sys/domain.h#2 integrate ... //depot/projects/ia64/sys/sys/errno.h#3 integrate ... //depot/projects/ia64/sys/sys/event.h#3 integrate ... //depot/projects/ia64/sys/sys/eventhandler.h#2 integrate ... //depot/projects/ia64/sys/sys/exec.h#2 integrate ... //depot/projects/ia64/sys/sys/fcntl.h#3 integrate ... //depot/projects/ia64/sys/sys/file.h#5 integrate ... //depot/projects/ia64/sys/sys/filedesc.h#3 integrate ... //depot/projects/ia64/sys/sys/imgact.h#3 integrate ... //depot/projects/ia64/sys/sys/imgact_aout.h#3 integrate ... //depot/projects/ia64/sys/sys/imgact_elf.h#2 integrate ... //depot/projects/ia64/sys/sys/inflate.h#2 integrate ... //depot/projects/ia64/sys/sys/interrupt.h#3 integrate ... //depot/projects/ia64/sys/sys/ioccom.h#2 integrate ... //depot/projects/ia64/sys/sys/ipc.h#3 integrate ... //depot/projects/ia64/sys/sys/jail.h#4 integrate ... //depot/projects/ia64/sys/sys/kernel.h#5 integrate ... //depot/projects/ia64/sys/sys/kthread.h#2 integrate ... //depot/projects/ia64/sys/sys/ktrace.h#2 integrate ... //depot/projects/ia64/sys/sys/libkern.h#3 integrate ... //depot/projects/ia64/sys/sys/lockf.h#2 integrate ... //depot/projects/ia64/sys/sys/lockmgr.h#3 integrate ... //depot/projects/ia64/sys/sys/malloc.h#4 integrate ... //depot/projects/ia64/sys/sys/md5.h#2 integrate ... //depot/projects/ia64/sys/sys/mman.h#2 integrate ... //depot/projects/ia64/sys/sys/mount.h#5 integrate ... //depot/projects/ia64/sys/sys/msg.h#2 integrate ... //depot/projects/ia64/sys/sys/msgbuf.h#2 integrate ... //depot/projects/ia64/sys/sys/namei.h#3 integrate ... //depot/projects/ia64/sys/sys/param.h#6 integrate ... //depot/projects/ia64/sys/sys/poll.h#3 integrate ... //depot/projects/ia64/sys/sys/proc.h#7 integrate ... //depot/projects/ia64/sys/sys/protosw.h#2 integrate ... //depot/projects/ia64/sys/sys/queue.h#3 integrate ... //depot/projects/ia64/sys/sys/regression.h#2 integrate ... //depot/projects/ia64/sys/sys/resource.h#2 integrate ... //depot/projects/ia64/sys/sys/resourcevar.h#3 integrate ... //depot/projects/ia64/sys/sys/rtprio.h#3 integrate ... //depot/projects/ia64/sys/sys/selinfo.h#4 integrate ... //depot/projects/ia64/sys/sys/sem.h#2 integrate ... //depot/projects/ia64/sys/sys/shm.h#2 integrate ... //depot/projects/ia64/sys/sys/signal.h#4 integrate ... //depot/projects/ia64/sys/sys/signalvar.h#3 integrate ... //depot/projects/ia64/sys/sys/socket.h#3 integrate ... //depot/projects/ia64/sys/sys/socketvar.h#6 integrate ... //depot/projects/ia64/sys/sys/soundcard.h#2 integrate ... //depot/projects/ia64/sys/sys/stat.h#3 integrate ... //depot/projects/ia64/sys/sys/sysctl.h#4 integrate ... //depot/projects/ia64/sys/sys/sysent.h#4 integrate ... //depot/projects/ia64/sys/sys/syslog.h#2 integrate ... //depot/projects/ia64/sys/sys/sysproto.h#4 integrate ... //depot/projects/ia64/sys/sys/systm.h#6 integrate ... //depot/projects/ia64/sys/sys/termios.h#2 integrate ... //depot/projects/ia64/sys/sys/time.h#3 integrate ... //depot/projects/ia64/sys/sys/timeb.h#3 integrate ... //depot/projects/ia64/sys/sys/timepps.h#2 integrate ... //depot/projects/ia64/sys/sys/times.h#2 integrate ... //depot/projects/ia64/sys/sys/timetc.h#3 integrate ... //depot/projects/ia64/sys/sys/timex.h#2 integrate ... //depot/projects/ia64/sys/sys/tty.h#2 integrate ... //depot/projects/ia64/sys/sys/types.h#6 integrate ... //depot/projects/ia64/sys/sys/uio.h#2 integrate ... //depot/projects/ia64/sys/sys/un.h#2 integrate ... //depot/projects/ia64/sys/sys/user.h#3 integrate ... //depot/projects/ia64/sys/sys/vnode.h#6 integrate ... //depot/projects/ia64/sys/sys/wait.h#2 integrate ... //depot/projects/ia64/sys/vm/default_pager.c#3 integrate ... //depot/projects/ia64/sys/vm/device_pager.c#3 integrate ... //depot/projects/ia64/sys/vm/pmap.h#4 integrate ... //depot/projects/ia64/sys/vm/swap_pager.c#5 integrate ... //depot/projects/ia64/sys/vm/swap_pager.h#3 integrate ... //depot/projects/ia64/sys/vm/vm_extern.h#4 integrate ... //depot/projects/ia64/sys/vm/vm_fault.c#7 integrate ... //depot/projects/ia64/sys/vm/vm_glue.c#8 integrate ... //depot/projects/ia64/sys/vm/vm_init.c#4 integrate ... //depot/projects/ia64/sys/vm/vm_mmap.c#4 integrate ... //depot/projects/ia64/sys/vm/vm_pageout.c#7 integrate ... //depot/projects/ia64/sys/vm/vm_pageout.h#4 integrate ... //depot/projects/ia64/sys/vm/vm_pager.c#5 integrate ... //depot/projects/ia64/sys/vm/vm_pager.h#3 integrate ... //depot/projects/ia64/sys/vm/vm_swap.c#4 integrate ... //depot/projects/ia64/sys/vm/vnode_pager.c#7 integrate ... //depot/projects/ia64/sys/vm/vnode_pager.h#3 integrate Differences ... ==== //depot/projects/ia64/contrib/ipfilter/BNF#2 (text+ko) ==== @@ -2,27 +2,29 @@ [ proto ] [ ip ] [ group ]. insert = "@" decnumber . -action = block | "pass" | log | "count" | skip | auth | call . +action = block | "no-match" | "pass" | log | "count" | skip | auth | call . in-out = "in" | "out" . -options = [ log ] [ "quick" ] [ "on" interface-name [ dup ] [ froute ] ] . +options = [ log ] [ "quick" ] [ "on" interface-name [ dup ] [ froute ] + [ via ] ] . tos = "tos" decnumber | "tos" hexnumber . ttl = "ttl" decnumber . proto = "proto" protocol . ip = srcdst [ flags ] [ with withopt ] [ icmp ] [ keep ] . group = [ "head" decnumber ] [ "group" decnumber ] . -block = "block" [ reutrn-icmp[return-code] | "return-rst" ] . +block = "block" [ return-icmp[return-code] | "return-rst" ] . auth = "auth" | "preauth" . log = "log" [ "body" ] [ "first" ] [ "or-block" ] [ "level" loglevel ] . call = "call" [ "now" ] function-name . skip = "skip" decnumber . dup = "dup-to" interface-name[":"ipaddr] . +via = "in-via" interface-name | "out-via" interface-name . froute = "fastroute" | "to" interface-name [ ":" ipaddr ] . protocol = "tcp/udp" | "udp" | "tcp" | "icmp" | decnumber . srcdst = "all" | fromto . fromto = "from" object "to" object . -reutrn-icmp = "return-icmp" | "return-icmp-as-dest" . +return-icmp = "return-icmp" | "return-icmp-as-dest" . loglevel = facility"."priority | priority . object = addr [ port-comp | port-range ] . addr = "any" | nummask | host-name [ "mask" ipaddr | "mask" hexnumber ] . @@ -32,7 +34,8 @@ with = "with" | "and" . icmp = "icmp-type" icmp-type [ "code" decnumber ] . return-code = "("icmp-code")" . -keep = "keep" "state" | "keep" "frags" . +keep = "keep" "state" | "keep" "frags" | "keep" "state-age" state-age . +state-age = decnmber [ "/" decnumber ] . nummask = host-name [ "/" decnumber ] . host-name = ipaddr | hostname | "any" . ==== //depot/projects/ia64/contrib/ipfilter/BSD/Makefile#2 (text+ko) ==== @@ -8,7 +8,7 @@ BINDEST=/usr/sbin SBINDEST=/sbin MANDIR=/usr/share/man -CC=cc -Wall -Wuninitialized -Wstrict-prototypes -Werror -O +CC=cc -Wall -Wstrict-prototypes -Wuninitialized -O CFLAGS=-g -I$(TOP) # # For NetBSD/FreeBSD @@ -39,22 +39,23 @@ # MODOBJS=ip_fil.o fil_k.o ml_ipl.o ip_nat.o ip_frag.o ip_state.o ip_proxy.o \ ip_auth.o ip_log.o -DFLAGS=$(IPFLKM) $(IPFLOG) $(DEF) $(DLKM) +DFLAGS=$(IPFLKM) $(DEF) $(DLKM) IPF=ipf.o parse.o common.o opt.o facpri.o IPT=ipt.o parse.o common.o fil.o ipft_sn.o ipft_ef.o ipft_td.o ipft_pc.o \ opt.o ipft_tx.o misc.o ip_frag_u.o ip_state_u.o ip_nat_u.o ip_proxy_u.o \ - ip_auth_u.o ipft_hx.o ip_fil_u.o natparse.o facpri.o -IPNAT=ipnat.o kmem.o natparse.o common.o -FILS=fils.o parse.o kmem.o opt.o facpri.o common.o + ip_auth_u.o ipft_hx.o ip_fil_u.o ip_log_u.o natparse.o facpri.o \ + printnat.o printstate.o +IPNAT=ipnat.o kmem.o natparse.o common.o printnat.o +FILS=fils.o parse.o kmem.o opt.o facpri.o common.o printstate.o build all: ipf ipfs ipfstat ipftest ipmon ipnat $(LKM) ipfstat: $(FILS) - $(CC) $(DEBUG) $(CFLAGS) $(STATETOP_CFLAGS) $(STATETOP_INC) $(FILS) \ - -o $@ $(LIBS) $(STATETOP_LIB) + $(CC) -static $(DEBUG) $(CFLAGS) $(STATETOP_CFLAGS) $(STATETOP_INC) \ + $(FILS) -o $@ $(LIBS) $(STATETOP_LIB) -lkvm ipf: $(IPF) - $(CC) $(DEBUG) $(CFLAGS) $(IPF) -o $@ $(LIBS) + $(CC) -static $(DEBUG) $(CFLAGS) $(IPF) -o $@ $(LIBS) /bin/rm -f $(TOP)/ipf ln -s `pwd`/ipf $(TOP) @@ -64,10 +65,10 @@ ln -s `pwd`/ipftest $(TOP) ipnat: $(IPNAT) - $(CC) $(DEBUG) $(CFLAGS) $(IPNAT) -o $@ $(LIBS) + $(CC) -static $(DEBUG) $(CFLAGS) $(IPNAT) -o $@ $(LIBS) -lkvm ipfs: ipfs.o - $(CC) $(DEBUG) $(CFLAGS) ipfs.o -o $@ $(LIBS) + $(CC) -static $(DEBUG) $(CFLAGS) ipfs.o -o $@ $(LIBS) tests: (cd test; make ) @@ -107,6 +108,14 @@ $(TOP)/ip_compat.h $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/natparse.c -o $@ +printnat.o: $(TOP)/printnat.c $(TOP)/ip_fil.h $(TOP)/ipf.h $(TOP)/ip_nat.h \ + $(TOP)/ip_compat.h $(TOP)/ip_proxy.h + $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/printnat.c -o $@ + +printstate.o: $(TOP)/printstate.c $(TOP)/ip_fil.h $(TOP)/ipf.h \ + $(TOP)/ip_state.h $(TOP)/ip_compat.h + $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/printstate.c -o $@ + ipft_sn.o: $(TOP)/ipft_sn.c $(TOP)/ipt.h $(TOP)/ipf.h $(TOP)/ip_fil.h \ $(TOP)/snoop.h $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ipft_sn.c -o $@ @@ -130,7 +139,8 @@ $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ip_nat.c -o $@ ip_proxy_u.o: $(TOP)/ip_proxy.c $(TOP)/ip_proxy.h $(TOP)/ip_compat.h \ - $(TOP)/ip_fil.h $(TOP)/ip_ftp_pxy.c $(TOP)/ip_nat.h + $(TOP)/ip_fil.h $(TOP)/ip_ftp_pxy.c $(TOP)/ip_rcmd_pxy.c \ + $(TOP)/ip_raudio_pxy.c $(TOP)/ip_ipsec_pxy.c $(TOP)/ip_nat.h $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ip_proxy.c -o $@ ip_frag_u.o: $(TOP)/ip_frag.c $(TOP)/ip_frag.h $(TOP)/ip_compat.h \ @@ -148,6 +158,9 @@ ip_fil_u.o: $(TOP)/$(IPFILC) $(TOP)/ip_fil.h $(TOP)/ip_compat.h $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/$(IPFILC) -o $@ +ip_log_u.o: $(TOP)/ip_log.c $(TOP)/ip_fil.h $(TOP)/ip_compat.h + $(CC) $(DEBUG) $(CFLAGS) -c $(TOP)/ip_log.c -o $@ + if_ipl.o: $(MODOBJS) ld -r $(MODOBJS) -o $(LKM) ${RM} -f if_ipl @@ -170,7 +183,7 @@ ip_proxy.o: $(TOP)/ip_proxy.c $(TOP)/ip_proxy.h $(TOP)/ip_compat.h \ $(TOP)/ip_fil.h $(TOP)/ip_ftp_pxy.c $(TOP)/ip_raudio_pxy.c \ - $(TOP)/ip_nat.h + $(TOP)/ip_rcmd_pxy.c $(TOP)/ip_ipsec_pxy.c $(TOP)/ip_nat.h $(CC) $(DEBUG) $(CFLAGS) $(DFLAGS) -c $(TOP)/ip_proxy.c -o $@ ip_auth.o: $(TOP)/ip_auth.c $(TOP)/ip_auth.h $(TOP)/ip_compat.h \ @@ -207,6 +220,8 @@ ipmon: $(TOP)/ipmon.c $(CC) $(DEBUG) $(CFLAGS) $(LOGFAC) $(TOP)/ipmon.c -o $@ $(LIBS) + /bin/rm -f $(TOP)/ipmon + ln -s `pwd`/ipmon $(TOP) clean: ${RM} -f *.core *.o ipt fils ipf ipfstat ipftest ipmon if_ipl ipnat \ @@ -231,10 +246,20 @@ -if [ -d /modules -a -f ipf.ko ] ; then \ cp ipf.ko /modules; \ fi - -$(INSTALL) -cs -g wheel -m 755 -o root ipf $(SBINDEST) - -$(INSTALL) -cs -g wheel -m 755 -o root ipfs $(SBINDEST) - -$(INSTALL) -cs -g wheel -m 755 -o root ipnat $(SBINDEST) - -$(INSTALL) -cs -g wheel -m 755 -o root ipfstat $(SBINDEST) - -$(INSTALL) -cs -g wheel -m 755 -o root ipmon $(BINDEST) - -$(INSTALL) -cs -g wheel -m 755 -o root ipftest $(BINDEST) + @for i in ipf:$(SBINDEST) ipfs:$(SBINDEST) ipnat:$(SBINDEST) \ + ipfstat:$(SBINDEST) ipftest:$(SBINDEST) ipmon:$(BINDEST); do \ + def="`expr $$i : '[^:]*:\(.*\)'`"; \ + p="`expr $$i : '\([^:]*\):.*'`"; \ + for d in $(BINDEST) $(SBINDEST); do \ + if [ -f $$d/$$i ] ; then \ + echo "$(INSTALL) -cs -g wheel -m 755 -o root $$p $$d"; \ + $(INSTALL) -cs -g wheel -m 755 -o root $$p $$d; \ + dd=$$d; \ + fi; \ + done; \ + if [ -z "$$dd" ] ; then \ + echo $(INSTALL) -cs -g wheel -m 755 -o root $$p $$def; \ + $(INSTALL) -cs -g wheel -m 755 -o root $$p $$def; \ + fi \ + done (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) ==== //depot/projects/ia64/contrib/ipfilter/BSD/kupgrade#2 (text+ko) ==== @@ -9,13 +9,17 @@ dir=`pwd` karch=`uname -m` archdir="/sys/arch/$karch" +ipfdir=/sys/netinet +if [ -d /sys/contrib/ipfilter ] ; then + ipfdir=/sys/contrib/ipfilter/netinet +fi confdir="$archdir/conf" echo -n "Installing " -for i in ip_fil.[ch] fil.c ip_nat.[ch] ip_frag.[ch] ip_state.[ch] ip_proxy.[ch] ip_auth.[ch] ip_log.c ip_compat.h ipl.h ip_ftp_pxy.c ip_rcmd_pxy.c ip_raudio_pxy.c ; do +for i in ip_fil.[ch] fil.c ip_nat.[ch] ip_frag.[ch] ip_state.[ch] ip_proxy.[ch] ip_auth.[ch] ip_log.c ip_compat.h ipl.h ip_*_pxy.c ; do echo -n "$i " - cp $i /sys/netinet/ - chmod 644 /sys/netinet/$i + cp $i $ipfdir + chmod 644 $ipfdir/$i done echo "" if [ -f /sys/netinet/ip_fil_compat.h ] ; then ==== //depot/projects/ia64/contrib/ipfilter/FreeBSD-2.2/kinstall#2 (text+ko) ==== @@ -9,11 +9,17 @@ if ( $dir =~ */FreeBSD* ) cd .. echo -n "Installing " foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \ - ip_proxy.[ch] ip_{ftp,rcmd}_pxy.c mlf_ipl.c ipl.h ip_compat.h \ + ip_proxy.[ch] ip_*_pxy.c mlf_ipl.c ipl.h ip_compat.h \ ip_auth.[ch] ip_log.c) echo -n "$i "; cp $i /sys/netinet chmod 644 /sys/netinet/$i + switch ( $i ) + case *.h: + /bin/cp $i /usr/include/netinet/$i + chmod 644 /usr/include/netinet/$i + breaksw + endsw end echo "" echo "Copying /usr/include/osreldate.h to /sys/sys" ==== //depot/projects/ia64/contrib/ipfilter/FreeBSD-3/kinstall#2 (text+ko) ==== @@ -9,11 +9,17 @@ if ( $dir =~ */FreeBSD* ) cd .. echo -n "Installing " foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \ - ip_proxy.[ch] ip_{ftp,rcmd,raudio}_pxy.c mlf_ipl.c ipl.h \ + ip_proxy.[ch] ip_*_pxy.c mlf_ipl.c ipl.h \ ip_compat.h ip_auth.[ch] ip_log.c) echo -n "$i "; cp $i /sys/netinet chmod 644 /sys/netinet/$i + switch ( $i ) + case *.h: + /bin/cp $i /usr/include/netinet/$i + chmod 644 /usr/include/netinet/$i + breaksw + endsw end echo "" echo "Linking /usr/include/osreldate.h to /sys/sys/osreldate.h" ==== //depot/projects/ia64/contrib/ipfilter/FreeBSD-4.0/kinstall#2 (text+ko) ==== @@ -2,27 +2,38 @@ # set dir=`pwd` set karch=`uname -m` +set ipfdir=/sys/netinet set krev=`uname -r|sed -e 's/\([0-9\.]*\)-.*/\1/'` if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch" if ( -d /sys/$karch ) set archdir="/sys/$karch" +if ( -d /sys/contrib/ipfilter ) set ipfdir=/sys/contrib/ipfilter/netinet set confdir="$archdir/conf" if ( $dir =~ */FreeBSD* ) cd .. echo -n "Installing " foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \ - ip_proxy.[ch] ip_{ftp,rcmd,raudio}_pxy.c mlf_ipl.c mlfk_ipl.c \ + ip_proxy.[ch] ip_*_pxy.c mlf_ipl.c mlfk_ipl.c \ ipl.h ip_compat.h ip_auth.[ch] ip_log.c) echo -n "$i "; - cp $i /sys/netinet - chmod 644 /sys/netinet/$i + cp $i $ipfdir + chmod 644 $ipfdir/$i + switch ( $i ) + case *.h: + /bin/cp $i /usr/include/netinet/$i + chmod 644 /usr/include/netinet/$i + breaksw + endsw end echo "" echo "Linking /usr/include/osreldate.h to /sys/sys/osreldate.h" ln -s /usr/include/osreldate.h /sys/sys/osreldate.h -echo "" -echo "Patching ip6_input.c and ip6_output.c" -cat FreeBSD-4.0/ipv6-patch-$krev | (cd /sys/netinet6; patch) +patchfile=FreeBSd-4.0/ipv6-patch-$krev +if ( -f $patchfile ) then + echo "" + echo "Patching ip6_input.c and ip6_output.c" + cat $patchfile | (cd /sys/netinet6; patch) +endif set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1` echo -n "Kernel configuration to update [$config] " ==== //depot/projects/ia64/contrib/ipfilter/FreeBSD/kinstall#2 (text+ko) ==== @@ -9,10 +9,16 @@ if ( $dir =~ */FreeBSD ) cd .. echo -n "Installing " foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \ - ip_proxy.[ch] ip_auth.[ch] ip_{ftp,rcmd}_pxy.c ip_compat.h ip_log.c) + ip_proxy.[ch] ip_auth.[ch] ip_*_pxy.c ip_compat.h ip_log.c) echo -n "$i "; cp $i /sys/netinet chmod 644 /sys/netinet/$i + switch ( $i ) + case *.h: + /bin/cp $i /usr/include/netinet/$i + chmod 644 /usr/include/netinet/$i + breaksw + endsw end echo "" grep iplopen $archdir/$karch/conf.c >& /dev/null ==== //depot/projects/ia64/contrib/ipfilter/HISTORY#2 (text+ko) ==== @@ -22,6 +22,219 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +3.4.25 13/03/2002 - Released + +retain rule # in state information + +log the direction of a packet so ipmon gets it right rather than incorrectly +deriving it from the rule flags + +add #ifdef for IPFILTER_LOGSIZE (put options IPFILTER_LOGSIZE=16384 in BSD +kernel config files to increase that buffer size) + +recognise return-* rules differently to block in ipftest + +fix bug in ipmon output for solaris + +add regression testing for skip rules, logging and using head/group + +fix output of ipmon: was displaying large unsigned ints rather than -1 +when no rules matched. + +make logging code compile into ipftest and add -l command line option to +dump binary log file (read with ipmon -f) when it finishes. + +protect rule # and group # from interference when checking accounting rules + +add regression testing for log output (text) from ipmon. + +document -b command line option for ipmon + +fix double-quick in Solaris startup script + +3.4.24 01/03/2002 - Released + +fix how files are installed on SunOS5 + +fix some minor problems in SunOS5 ipfboot script + +by default, compile all OpenBSD tools in 3.0 for IPv6 + +fix NULL-pointer dereference in NAT code + +make a better attempt at replacing the appropriate binaries on BSD systems + +always print IPv6 icmp-types as a number + +impose some rules about what "skip" can be used with + +fix parsing problems with "keep state" and "keep state-age" + +Try to read as much data as is in the log device in ipmon + +remove some redundant checks when searching for rdr/nat rules + +fix bug in handling of ACCT with FTP proxy + +increase array size for interface names, using LIFNAMSIZ + +include H.323 proxy from QNX + +3.4.23 16/01/2002 - Released + +Include patches to install IPFilter into OpenBSD 3.0, both for just kernel +compiles and complete system builds. + +Fix bug in automatic flushing of state table which would cause it to hang +in an infinite loop bug introduced in 3.4.20. + +Modify the sample proxy (samples/proxy.c) so that it ads a NAT mapping for +the outgoing connection to make it look like it comes from the real source. + +Only support ICMPv6 with IPv6. + +Move ipnat.1 to ipnat.8 + +Enhance ipmon to print textual ICMP[v6] types and subtypes where possible. + +Make it possible to do IPv6 regression testing with ipftest. + +Use kvm library for kmem access, rather than trying to do it manually with +open/lseek/read. + +Fix diffs for ip_input.c on BSDOS so it doesn't crash with fastroute. + +Remove Berkeley advertising licence clause. Reference: +ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change + +Add more regression tests: ICMPv6 neighbour discovery, ICMP time exceeded +and fragmentation required. + +Fix ipfboot script on Solaris to deal with no nameservers or no route to +them in a clean manner. + +Support per-rule set timeouts for non-TCP NAT and state + +Add netbios proxy + +Add ICMPv6 stateful checking, including handling multicast destination +addresses for neighbour discovery. + +Fix problems with internals of ICMP messages for MTU discovery and +unreachables not being correctly adjust on little endian boxes. + +Add "in-via" and "out-via" to filtering rules grammar. It is now possible +to bind a rule to both incoming and outgoing interfaces, in both forward +and reverse directions (4 directions in total). allows for asymetric flows +through a firewall. + +Fix ipfstat and ipnat for working on crash dumps. + +Don't let USE_INET6 stay defined for SunOS4 + +Count things we see for each interface on solaris. + +Include when compiling with USE_INET6 defined and +also include a whole bunch of #define's to make sure the symbols expected +can be used. + +Fix up fastroute on BSD systems. + +Make fastrouting work for IPv6 just a bit better. doesn't split up big +packets into fragments like the IPv4 one does. You can now do a +"to :" + +Remove some of the differences between user-space and kernel-space code +that is internal to ipfilter. + +Call ipfr_slowtimer() after each packet is processed in ipftest to artificially +create the illusion of passing time and include the expire functions in the +code compiled for user-space. + +Fix issues with the IPSec proxy not working or leading to a system crash. + +Junk all processing of SPIs and special handling for ESP. + +Add "no-match" as a filter rule action (resets _LAST_ match) + +Add hack to workaround problems with Cassini interface cards on +Solaris and VLANs + +Add some protocols to etc/protocols + +3.4.22 03/12/2001 - Released + +various openbsd changes + +sorting based on IP numbers for ipfstat top output + +fix various IPv6 code & compile problems + +modify ip_fil.c to be more netbsd friendly + +fix fastroute bug where it modified a packet post-sending + +fix get_unit() - don't understand why it was broken. + +add FI_IGNOREPKT and don't count so marked packets when doing stats or +state/nat. + +extend the interface name saved to log output + +make proxies capable of extending the matching done on a packet with a +particular nat session + +change interfaces inside NAT & state code to accomodate redesign to allow +IPsec proxy to work. + +fix bug when free'ing loaded rules that results in a memory leak +(only an issue with "ipf -rf -", not flush) + +make ipftest capable of loading > 1 file or rules, making it now possible +to load both NAT & filter rules + +fix hex input for ipftest to allow interface name & direction to work + +show ipsec proxy details in ipnat output + +if OPT_HEX is set in opts, print a packet out as hex + +don't modify b_next or preseve it or preserve b_prev for solaris + +fix up kinstall scripts to install all the files everywhere they need to + +fix overflowing of bits in ip_off inside iptest + +make userauth and proxy in samples directory compile + +fix minimum size when doing a pullup for ESP & ICMPv6 + +3.4.21 24/10/2001 - Released + +include ipsec proxy + +make state work for non-tcp/udp/icmp in a very simple way + +include diffs for ipv6 firewall on openbsd-2.9 + +add compatibility filter wrapper for NetBSD-current + +fix command line option problems with ipfs + +if we fill the state table and a automated flush doesn't purge any +expiring entries, remove all entries idle for more than half a day + +fix bug with sending resets/icmp errors where the pointer to the data +section of the packet was not being set (BSD only) + +split out validating ftp commands and responses into different halves, +one for each of server & client. + +do not compile in STATETOP support for specific architectures + +fix INSTALL.FreeBSD to no longer provide directions and properly direct +people to the right file for the right version of FreeBSD. + 3.4.20 24/07/2001 - Released adjust NAT hashing to give a better spread across the table ==== //depot/projects/ia64/contrib/ipfilter/INSTALL.FreeBSD#2 (text+ko) ==== @@ -1,51 +1,7 @@ -*** IF you are using FreeBSD 2.2.x, see the file "INST.FreeBSD-2.2" *** -*** IF you are using FreeBSD 3 or later, see the file "INST.FreeBSD-3" *** -*** in the "FreeBSD-3" directory *** - - -To build a kernel for use with the loadable kernel module, follow these -steps: - 1. do "make freebsd" - - 2. do "make install-bsd" - (probably has to be done as root) - - 3. run "FreeBSD/minstall" as root - - 4. build a new kernel - - 5. install and reboot with the new kernel - - 6. use modload(8) to load the packet filter with: - modload if_ipl.o - - 7. do "modstat" to confirm that it has been loaded successfully. - -There is no need to use mknod to create the device in /dev; -- upon loading the module, it will create itself with the correct values, - under the name (IPL_NAME) from the Makefile. It will also remove itself - from /dev when it is modunload'd. - -To build a kernel with the IP filter, follow these steps: - - 1. do "make freebsd" - - 2. do "make install-bsd" - (probably has to be done as root) - - 3. run "FreeBSD/kinstall" as root - - 4. build a new kernel - - 5. create devices for IP Filter as follows (assuming it was - installed into the device table as char dev 20): - mknod /dev/ipl c 20 0 - mknod /dev/ipnat c 20 1 - mknod /dev/ipstate c 20 2 - mknod /dev/ipauth c 20 3 - - 6. install and reboot with the new kernel +*** IF you are using FreeBSD 2.2.x, see the file "INST.FreeBSD-2.2" *** +*** IF you are using FreeBSD 3.x, see the file "FreeBSD-3/INST.FreeBSD-3" *** +*** IF you are using FreeBSD 4.x, see the file "FreeBSD-4.0/INST.FreeBSD-4" *** Darren Reed darrenr@pobox.com ==== //depot/projects/ia64/contrib/ipfilter/IPFILTER.LICENCE#2 (text+ko) ==== @@ -1,4 +1,4 @@ -Copyright (C) 1993-2001 by Darren Reed. +Copyright (C) 1993-2002 by Darren Reed. The author accepts no responsibility for the use of this software and provides it on an ``as is'' basis without express or implied warranty. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 17: 3:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A7BC37B42C; Tue, 19 Mar 2002 17:03:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (unknown [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 377C937B42A for ; Tue, 19 Mar 2002 17:03:52 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2K12Vd75102 for perforce@freebsd.org; Tue, 19 Mar 2002 17:02:31 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Tue, 19 Mar 2002 17:02:31 -0800 (PST) Message-Id: <200203200102.g2K12Vd75102@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 8004 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8004 Change 8004 by tmm@tmm_forge on 2002/03/19 17:00:50 Remove -N from ldflags; it breaks with the current boot1 code, which assumes separate text/rodata and data/bss are in separate ELF segments. Affected files ... ... //depot/projects/sparc64/sys/boot/sparc64/loader/Makefile#18 edit Differences ... ==== //depot/projects/sparc64/sys/boot/sparc64/loader/Makefile#18 (text+ko) ==== @@ -46,7 +46,7 @@ CLEANFILES+= ${PROG}.help CFLAGS+= -W -Wall -ffreestanding -LDFLAGS= -nostdlib -static -N +LDFLAGS= -nostdlib -static LDADD= ${LIBSTAND} ${LIBOFW} # where to get libstand from To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 18:43: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED4AA37B430; Tue, 19 Mar 2002 18:40:23 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B510C37B41D for ; Tue, 19 Mar 2002 18:39:31 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2K2dVN60219 for perforce@freebsd.org; Tue, 19 Mar 2002 18:39:31 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Tue, 19 Mar 2002 18:39:31 -0800 (PST) Message-Id: <200203200239.g2K2dVN60219@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 8009 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8009 Change 8009 by tmm@tmm_sparc64 on 2002/03/19 18:39:04 Integ. with sparc64-tmm: - hme fixes and cleanups. - the big fearsome ofw interrupt code rework. Affected files ... ... //depot/projects/sparc64/sys/dev/hme/if_hme.c#16 integrate ... //depot/projects/sparc64/sys/dev/hme/if_hme_pci.c#11 integrate ... //depot/projects/sparc64/sys/dev/hme/if_hme_sbus.c#5 integrate ... //depot/projects/sparc64/sys/dev/hme/if_hmevar.h#9 integrate ... //depot/projects/sparc64/sys/sparc64/ebus/ebus.c#9 integrate ... //depot/projects/sparc64/sys/sparc64/ebus/ebusvar.h#4 integrate ... //depot/projects/sparc64/sys/sparc64/include/ofw_bus.h#5 integrate ... //depot/projects/sparc64/sys/sparc64/isa/isa.c#8 integrate ... //depot/projects/sparc64/sys/sparc64/isa/ofw_isa.c#7 integrate ... //depot/projects/sparc64/sys/sparc64/pci/apb.c#8 integrate ... //depot/projects/sparc64/sys/sparc64/pci/ofw_pci.c#7 integrate ... //depot/projects/sparc64/sys/sparc64/pci/ofw_pci.h#4 integrate ... //depot/projects/sparc64/sys/sparc64/pci/psycho.c#24 integrate ... //depot/projects/sparc64/sys/sparc64/pci/psychovar.h#9 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/iommu.c#17 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/ofw_bus.c#5 integrate Differences ... ==== //depot/projects/sparc64/sys/dev/hme/if_hme.c#16 (text+ko) ==== @@ -1310,13 +1310,6 @@ HME_MAC_WRITE_4(sc, HME_MACI_TXCFG, v); if (!hme_mac_bitflip(sc, HME_MACI_TXCFG, v, 0, HME_MAC_TXCFG_ENABLE)) return; - - /* If an external transceiver is selected, enable its MII drivers */ - v = HME_MAC_READ_4(sc, HME_MACI_XIF); - v &= ~HME_MAC_XIF_MIIENABLE; - if (phy == HME_PHYAD_EXTERNAL) - v |= HME_MAC_XIF_MIIENABLE; - HME_MAC_WRITE_4(sc, HME_MACI_XIF, v); } static int ==== //depot/projects/sparc64/sys/dev/hme/if_hme_pci.c#11 (text+ko) ==== @@ -151,7 +151,7 @@ } hsc->hsc_irid = 0; hsc->hsc_ires = bus_alloc_resource(dev, SYS_RES_IRQ, &hsc->hsc_irid, 0, - ~0, 1, RF_ACTIVE); + ~0, 1, RF_SHAREABLE | RF_ACTIVE); if (hsc->hsc_ires == NULL) { device_printf(dev, "could not allocate interrupt\n"); error = ENXIO; ==== //depot/projects/sparc64/sys/dev/hme/if_hme_sbus.c#5 (text+ko) ==== @@ -222,7 +222,7 @@ hsc->hsc_irid = 0; hsc->hsc_ires = bus_alloc_resource(dev, SYS_RES_IRQ, &hsc->hsc_irid, 0, - ~0, 1, RF_ACTIVE); + ~0, 1, RF_SHAREABLE | RF_ACTIVE); if (hsc->hsc_ires == NULL) { device_printf(dev, "could not allocate interrupt\n"); error = ENXIO; ==== //depot/projects/sparc64/sys/dev/hme/if_hmevar.h#9 (text+ko) ==== @@ -50,7 +50,7 @@ * memory is sizeof(struct hme_txdesc)). * Both must be a multiple of 16, and <= 128. */ -#define HME_NRXDESC 32 +#define HME_NRXDESC 64 #define HME_NTXDESC 64 /* Maximum size of a mapped RX buffer. */ ==== //depot/projects/sparc64/sys/sparc64/ebus/ebus.c#9 (text+ko) ==== @@ -54,13 +54,13 @@ #include #include +#include +#include + #include #include #include -#include -#include - #include #include @@ -99,18 +99,7 @@ struct isa_ranges *sc_range; - struct ofw_pci_register *sc_reg; - - int sc_imap_type; - - struct isa_imap *sc_ebus_imap; - struct isa_imap_msk sc_ebus_imapmsk; - - struct ofw_pci_imap *sc_pci_imap; - struct ofw_pci_imap_msk sc_pci_imapmsk; - int sc_nrange; - int sc_nreg; int sc_nimap; }; @@ -127,7 +116,6 @@ phandle_t, char *); static void ebus_destroy_dinfo(struct ebus_devinfo *); static int ebus_print_res(struct ebus_devinfo *); -static int ebus_map_intr(struct ebus_softc *, int, struct isa_regs *, int); static device_method_t ebus_methods[] = { /* Device interface */ @@ -199,42 +187,10 @@ sc = device_get_softc(dev); sc->sc_node = node; - /* - * Fill in our softc with information from the prom. - * There are two possible cases how interrupt mapping needs to be - * handled: - * - if the ebus node has an interrupt-map properties, the interrut - * numbers in child nodes can be mapped using lookups in this map, - * using the registers of the child node in question to find the - * map entry - * - if it does not have such a properties, the interrupts are mapped - * in the next higher interrupt map (PCI in our case), using the - * interrupt number of the child, but the registers of the ebus - * node, to find the mapping. - */ - sc->sc_imap_type = EBUS_IT_EBUS; - sc->sc_nimap = OF_getprop_alloc(node, "interrupt-map", - sizeof(*sc->sc_ebus_imap), (void **)&sc->sc_ebus_imap); - if (sc->sc_nimap == -1) { - sc->sc_nimap = ofw_pci_find_imap(node, &sc->sc_pci_imap, - &sc->sc_pci_imapmsk); - if (sc->sc_nimap == -1) - panic("ebus_probe: no interrupt map found"); - sc->sc_imap_type = EBUS_IT_PCI; - } else { - if (OF_getprop(node, "interrupt-map-mask", - &sc->sc_ebus_imapmsk, sizeof(sc->sc_ebus_imapmsk)) == -1) { - panic("ebus_probe: could not get ebus " - "interrupt-map-mask"); - } - } - sc->sc_nrange = OF_getprop_alloc(node, "ranges", sizeof(*sc->sc_range), (void **)&sc->sc_range); - sc->sc_nreg = OF_getprop_alloc(node, "reg", - sizeof(*sc->sc_reg), (void **)&sc->sc_reg); - if (sc->sc_nrange == -1 || sc->sc_nreg == -1) - panic("ebus_attach: could not get ranges/reg property"); + if (sc->sc_nrange == -1) + panic("ebus_attach: could not get ranges property"); /* * now attach all our children @@ -411,9 +367,9 @@ { struct ebus_devinfo *edi; struct isa_regs *reg; - u_int32_t *intrs; + u_int32_t *intrs, intr; u_int64_t start; - int nreg, nintr, i, intr; + int nreg, nintr, i; edi = malloc(sizeof(*edi), M_DEVBUF, M_ZERO | M_WAITOK); if (edi == NULL) @@ -442,10 +398,11 @@ nintr = OF_getprop_alloc(node, "interrupts", sizeof(*intrs), (void **)&intrs); for (i = 0; i < nintr; i++) { - intr = ebus_map_intr(sc, intrs[i], reg, nreg); - if (intr == -1) + intr = ofw_bus_route_intr(node, intrs[i]); + if (intr == ORIR_NOTFOUND) { panic("ebus_setup_dinfo: could not map ebus " "interrupt %d", intrs[i]); + } resource_list_add(&edi->edi_rl, SYS_RES_IRQ, i, intr, intr, 1); } @@ -479,20 +436,3 @@ "%ld"); return (retval); } - -static int -ebus_map_intr(struct ebus_softc *sc, int intr, struct isa_regs *regs, - int nregs) -{ - int rv; - - if (sc->sc_imap_type == EBUS_IT_PCI) { - rv = ofw_pci_route_intr2(intr, sc->sc_reg, sc->sc_pci_imap, - sc->sc_nimap, &sc->sc_pci_imapmsk); - if (rv == 255) - return (-1); - return (rv); - } - return (ofw_isa_map_intr(sc->sc_ebus_imap, sc->sc_nimap, - &sc->sc_ebus_imapmsk, intr, regs, nregs)); -} ==== //depot/projects/sparc64/sys/sparc64/ebus/ebusvar.h#4 (text+ko) ==== @@ -35,17 +35,6 @@ #ifndef _SPARC64_EBUS_EBUSVAR_H_ #define _SPARC64_EBUS_EBUSVAR_H_ -/* - * Interrupt map type (for the sc_imap_type softc member): - * If the ebus node has an interrupt map, this is set to EBUS_IT_EBUS (and the - * relevant sotfc members are initialized with the EBUS types), otherwise, - * it is EBUS_IT_PCI, in which case the standard PCI functions are used to - * map the interrupt (this is needed because the the maps and masks are - * different). - */ -#define EBUS_IT_EBUS 1 -#define EBUS_IT_PCI 2 - enum ebus_device_ivars { EBUS_IVAR_COMPAT, EBUS_IVAR_NAME, ==== //depot/projects/sparc64/sys/sparc64/include/ofw_bus.h#5 (text+ko) ==== @@ -28,7 +28,9 @@ #ifndef _MACHINE_OFW_BUS_H_ #define _MACHINE_OFW_BUS_H_ -u_int32_t ofw_bus_route_intr(int intr, void *regs, int regsz, int physz, - int nregs, void *imap, int nimap, void *imapmsk, char *regm); +#define ORIP_NOINT -1 +#define ORIR_NOTFOUND 0xffffffff + +u_int32_t ofw_bus_route_intr(phandle_t, int); #endif /* !_MACHINE_OFW_BUS_H_ */ ==== //depot/projects/sparc64/sys/sparc64/isa/isa.c#8 (text+ko) ==== @@ -51,6 +51,7 @@ #include #include +#include #include #include @@ -71,11 +72,8 @@ device_t isa_bus_device; -static struct ofw_pci_register isab_reg; -static struct ofw_pci_imap *isab_imap; -static int isab_nimap; -static struct ofw_pci_imap_msk isab_imap_msk; static phandle_t isab_node; +static u_int32_t isa_ino[8]; /* * XXX: This is really partly partly PCI-specific, but unfortunately is @@ -92,8 +90,6 @@ static int isa_route_intr_res(device_t, u_long, u_long); -static int isa_ino[8]; - intrmask_t isa_irq_pending(void) { @@ -103,7 +99,7 @@ /* XXX: Is this correct? */ for (i = 7, pending = 0; i >= 0; i--) { pending <<= 1; - if (isa_ino[i] != 255) { + if (isa_ino[i] != ORIR_NOTFOUND) { pending |= (SPARCBUS_INTR_PENDING(isa_bus_device, isa_ino[i]) == 0) ? 0 : 1; } @@ -116,28 +112,30 @@ { device_t bridge; phandle_t node; + u_int32_t ino; struct isa_ranges *br; int nbr, i; /* The parent of the bus must be a PCI-ISA bridge. */ bridge = device_get_parent(dev); - isab_node = ofw_pci_find_node(pci_get_bus(bridge), pci_get_slot(bridge), - pci_get_function(bridge)); - if (OF_getprop(isab_node, "reg", &isab_reg, sizeof(isab_reg)) < 0) - panic("isa_init: cannot get bridge reg property"); + isab_node = ofw_pci_node(bridge); nbr = OF_getprop_alloc(isab_node, "ranges", sizeof(*br), (void **)&br); if (nbr <= 0) panic("isa_init: cannot get bridge range property"); - node = isab_node; - isab_nimap = ofw_pci_find_imap(node, &isab_imap, &isab_imap_msk); - if (isab_nimap == -1) - panic("isa_init: could not find interrupt-map"); - for (i = 0; i < 8; i++) { - isa_ino[i] = ofw_pci_route_intr2(i, &isab_reg, isab_imap, - isab_nimap, &isab_imap_msk); + /* + * This is really a bad kluge; however, it is needed to provide + * isa_irq_pending(). + */ + for (i = 0; i < 8; i++) + isa_ino[i] = ORIR_NOTFOUND; + for (node = OF_child(isab_node); node != 0; node = OF_peer(node)) { + if (OF_getprop(node, "interrupts", &ino, sizeof(ino)) == -1) + continue; + if (ino > 7) + panic("isa_init: XXX: ino too large"); + isa_ino[ino] = ofw_bus_route_intr(node, ino); } - for (nbr -= 1; nbr >= 0; nbr--) { switch(ISAB_RANGE_SPACE(br + nbr)) { case ISAR_SPACE_IO: @@ -168,8 +166,9 @@ panic("isa_route_intr_res: allocation of interrupt range not " "supported (0x%lx - 0x%lx)", start, end); } - res = ofw_pci_route_intr2(start, &isab_reg, isab_imap, isab_nimap, - &isab_imap_msk); + if (start > 7) + panic("isa_route_intr_res: start out of isa range"); + res = isa_ino[start]; if (res == 255) device_printf(bus, "could not map interrupt %d\n", res); return (res); ==== //depot/projects/sparc64/sys/sparc64/isa/ofw_isa.c#7 (text+ko) ==== @@ -48,19 +48,6 @@ #include #include -/* - * This applies only for an ISA/EBus with an own interrupt-map property. - */ -int -ofw_isa_map_intr(struct isa_imap *imap, int nimap, struct isa_imap_msk *imapmsk, - int intr, struct isa_regs *regs, int nregs) -{ - char regm[8]; - - return (ofw_bus_route_intr(intr, regs, sizeof(*regs), 8, nregs, - imap, nimap, imapmsk, regm)); -} - /* XXX: this only supports PCI as parent bus right now. */ int ofw_isa_map_iorange(struct isa_ranges *range, int nrange, u_long *start, ==== //depot/projects/sparc64/sys/sparc64/pci/apb.c#8 (text+ko) ==== @@ -46,8 +46,13 @@ #include #include +#include +#include + #include +#include + #include #include @@ -343,12 +348,27 @@ } /* - * Route an interrupt across a PCI bridge - the APB does not route interrupts, - * and routing of interrupts that are not preinitialized is not supported yet. + * Route an interrupt across a PCI bridge - we need to rely on the firmware + * here. */ static int apb_route_interrupt(device_t pcib, device_t dev, int pin) { - panic("apb_route_interrupt"); + /* + * XXX: ugly loathsome hack: + * We can't use ofw_pci_route_intr() here; the device passed may be + * the one of a bridge, so the original device can't be recovered. + * + * We need to use the firmware to route interrupts, however it has + * no interface which could be used to interpret intpins; instead, + * all assignments are done by device. + * + * The MI pci code will try to reroute interrupts of 0, although they + * are correct; all other interrupts are preinitialized, so if we + * get here, the intline is either 0 (so return 0), or we hit a + * device which was not preinitialized (e.g. hotplugged stuff), in + * which case we are lost. + */ + return (0); } ==== //depot/projects/sparc64/sys/sparc64/pci/ofw_pci.c#7 (text+ko) ==== @@ -50,66 +50,15 @@ #include "pcib_if.h" -/* - * Find the interrupt-map properties for a node. This might not be a property - * of the parent, because there may be bridges in between, so go up through the - * tree to find it. - * This seems to be only needed for PCI systems, so it has not been moved to - * ofw_bus.c - */ -int -ofw_pci_find_imap(phandle_t node, struct ofw_pci_imap **imap, - struct ofw_pci_imap_msk *imapmsk) +u_int32_t +ofw_pci_route_intr(phandle_t node) { - int nimap; + u_int32_t rv; - nimap = -1; - while ((node = OF_parent(node)) != 0) { - if ((nimap = OF_getprop_alloc(node, "interrupt-map", - sizeof(**imap), (void **)imap)) == -1 || - OF_getprop(node, "interrupt-map-mask", - imapmsk, sizeof(*imapmsk)) == -1) { - if (*imap != NULL) { - free(*imap, M_OFWPROP); - *imap = NULL; - } - nimap = -1; - } else - break; - } - return (nimap); -} - -/* - * Route an interrupt using the firmware nodes. Returns 255 for interrupts - * that cannot be routed (suitable for the PCI code). - */ -int -ofw_pci_route_intr2(int intr, struct ofw_pci_register *pcir, - struct ofw_pci_imap *imap, int nimap, struct ofw_pci_imap_msk *imapmsk) -{ - char regm[12]; - int cintr; - - cintr = ofw_bus_route_intr(intr, pcir, sizeof(*pcir), 12, 1, imap, - nimap, imapmsk, regm); - if (cintr == -1) + rv = ofw_bus_route_intr(node, ORIP_NOINT); + if (rv == ORIR_NOTFOUND) return (255); - else - return (cintr); -} - -int -ofw_pci_route_intr(phandle_t node, struct ofw_pci_register *pcir, - struct ofw_pci_imap *intrmap, int nintrmap, - struct ofw_pci_imap_msk *intrmapmsk) -{ - int intr; - - if (OF_getprop(node, "interrupts", &intr, sizeof(intr)) == -1) - return (255); - - return (ofw_pci_route_intr2(intr, pcir, intrmap, nintrmap, intrmapmsk)); + return (rv); } #define OFW_PCI_PCIBUS "pci" @@ -119,10 +68,8 @@ * of attached devices using firmware information. */ void -ofw_pci_init_intr(device_t dev, phandle_t bus, struct ofw_pci_imap *intrmap, - int nintrmap, struct ofw_pci_imap_msk *intrmapmsk) +ofw_pci_init_intr(device_t dev, phandle_t bus) { - struct ofw_pci_imap_msk lintrmapmsk; struct ofw_pci_register pcir; phandle_t node; char type[32]; @@ -146,40 +93,19 @@ * deep, so recursion is feasible. */ #ifdef OFW_PCI_DEBUG - device_printf(dev, __func__": descending to " - "subordinate PCI bus\n"); + device_printf(dev, "%s: descending to " + "subordinate PCI bus\n", __func__); #endif - ofw_pci_init_intr(dev, node, NULL, 0, NULL); + ofw_pci_init_intr(dev, node); } else { if (OF_getprop(node, "reg", &pcir, sizeof(pcir)) == -1) panic("ofw_pci_route_intr: OF_getprop failed"); - /* - * If we didn't get interrupt map properties passed, - * try to find them now. On some systems, buses that - * have no non-bridge children have no such properties, - * so only try to find them at need. - */ - if (intrmap == NULL) { - nintrmap = OF_getprop_alloc(bus, - "interrupt-map", sizeof(*intrmap), - (void **)&intrmap); - if (nintrmap == -1 || - OF_getprop(bus, "interrupt-map-mask", - &lintrmapmsk, sizeof(lintrmapmsk)) == -1) { - printf("ofw_pci_init_intr: could not get " - "interrupt map properties\n"); - if (nintrmap != -1) - free(intrmap, M_OFWPROP); - return; - } - intrmapmsk = &lintrmapmsk; - freemap = 1; - } - if ((intr = ofw_pci_route_intr(node, &pcir, intrmap, - nintrmap, intrmapmsk)) != 255) { + + if ((intr = ofw_pci_route_intr(node)) != 255) { #ifdef OFW_PCI_DEBUG - device_printf(dev, __func__": mapping intr for " + device_printf(dev, "%s: mapping intr for " "%d/%d/%d to %d (preset was %d)\n", + __func__, OFW_PCI_PHYS_HI_BUS(pcir.phys_hi), OFW_PCI_PHYS_HI_DEVICE(pcir.phys_hi), OFW_PCI_PHYS_HI_FUNCTION(pcir.phys_hi), @@ -189,7 +115,6 @@ OFW_PCI_PHYS_HI_DEVICE(pcir.phys_hi), OFW_PCI_PHYS_HI_FUNCTION(pcir.phys_hi), PCIR_INTLINE, 1)); - #endif /* OFW_PCI_DEBUG */ PCIB_WRITE_CONFIG(dev, OFW_PCI_PHYS_HI_BUS(pcir.phys_hi), @@ -198,8 +123,9 @@ PCIR_INTLINE, intr, 1); } else { #ifdef OFW_PCI_DEBUG - device_printf(dev, __func__": no interrupt " + device_printf(dev, "%s: no interrupt " "mapping found for %d/%d/%d (preset %d)\n", + __func__, OFW_PCI_PHYS_HI_BUS(pcir.phys_hi), OFW_PCI_PHYS_HI_DEVICE(pcir.phys_hi), OFW_PCI_PHYS_HI_FUNCTION(pcir.phys_hi), @@ -218,8 +144,6 @@ } } } while ((node = OF_peer(node)) != 0); - if (freemap) - free(intrmap, M_OFWPROP); } phandle_t @@ -268,3 +192,11 @@ } return (0); } + +phandle_t +ofw_pci_node(device_t dev) +{ + + return (ofw_pci_find_node(pci_get_bus(dev), pci_get_slot(dev), + pci_get_function(dev))); +} ==== //depot/projects/sparc64/sys/sparc64/pci/ofw_pci.h#4 (text+ko) ==== @@ -56,18 +56,9 @@ u_int32_t intr; }; -int ofw_pci_find_imap(phandle_t, struct ofw_pci_imap **, - struct ofw_pci_imap_msk *); -int ofw_pci_route_intr2(int, struct ofw_pci_register *, - struct ofw_pci_imap *, int, struct ofw_pci_imap_msk *); -int ofw_pci_route_intr(phandle_t, struct ofw_pci_register *, - struct ofw_pci_imap *, int, struct ofw_pci_imap_msk *); -void ofw_pci_init_intr(device_t, phandle_t, struct ofw_pci_imap *, int, - struct ofw_pci_imap_msk *); +u_int32_t ofw_pci_route_intr(phandle_t); +void ofw_pci_init_intr(device_t, phandle_t); phandle_t ofw_pci_find_node(int, int, int); -int ofw_pci_dev_iterate_node(device_t, phandle_t, uintptr_t *, int, int *, - int *, uintptr_t *, uintptr_t *); -int ofw_pci_dev_iterate(device_t, uintptr_t *, int, int *, int *, uintptr_t *, - uintptr_t *); +phandle_t ofw_pci_node(device_t); #endif /* ! _SPARC64_PCI_OFW_PCI_H_ */ ==== //depot/projects/sparc64/sys/sparc64/pci/psycho.c#24 (text+ko) ==== @@ -478,16 +478,6 @@ /* XXX: register as root dma tag (kluge). */ sparc64_root_dma_tag = sc->sc_dmat; - if ((sc->sc_nintrmap = OF_getprop_alloc(sc->sc_node, "interrupt-map", - sizeof(*sc->sc_intrmap), (void **)&sc->sc_intrmap)) == -1 || - OF_getprop(sc->sc_node, "interrupt-map-mask", &sc->sc_intrmapmsk, - sizeof(sc->sc_intrmapmsk)) == -1) { - if (sc->sc_intrmap != NULL) { - free(sc->sc_intrmap, M_OFWPROP); - sc->sc_intrmap = NULL; - } - } - /* Register the softc, this is needed for paired psychos. */ if (psycho_ndevs < sizeof(psycho_softcs) / sizeof(psycho_softcs[0])) psycho_softcs[psycho_ndevs] = sc; @@ -617,8 +607,7 @@ * at least on some models, and we probably shouldn't trust that * the firmware uses the same model as this driver if it does. */ - ofw_pci_init_intr(dev, sc->sc_node, sc->sc_intrmap, sc->sc_nintrmap, - &sc->sc_intrmapmsk); + ofw_pci_init_intr(dev, sc->sc_node); device_add_child(dev, "pci", device_get_unit(dev)); return (bus_generic_attach(dev)); @@ -969,18 +958,21 @@ int intline; /* - * Since we preinitialize all interrupt line registers, this should not - * happen for any built-in device, except it the intline is 0. - * For now, just ignore this case - 0 is a valid intline on sparc64, - * but due to quirky BIOSes the PCI code attempts to route anyway. - * If it is 255, we are lost for now. - * Devices on bridges that route interrupts cannot work now - the - * interrupt pin mappings cannot be obtained from the firmware... + * XXX: ugly loathsome hack: + * We can't use ofw_pci_route_intr() here; the device passed may be + * the one of a bridge, so the original device can't be recovered. + * + * We need to use the firmware to route interrupts, however it has + * no interface which could be used to interpret intpins; instead, + * all assignments are done by device. + * + * The MI pci code will try to reroute interrupts of 0, although they + * are correct; all other interrupts are preinitialized, so if we + * get here, the intline is either 0 (so return 0), or we hit a + * device which was not preinitialized (e.g. hotplugged stuff), in + * which case we are lost. */ - intline = pci_read_config(dev, PCIR_INTLINE, 1); - if (intline == 255) - panic("psycho_route_interrupt: can't get interrupt"); - return (intline); + return (0); } static int ==== //depot/projects/sparc64/sys/sparc64/pci/psychovar.h#9 (text+ko) ==== @@ -74,9 +74,6 @@ */ struct upa_ranges *sc_range; int sc_nrange; - struct ofw_pci_imap *sc_intrmap; - int sc_nintrmap; - struct ofw_pci_imap_msk sc_intrmapmsk; /* our tags */ bus_space_tag_t sc_cfgt; ==== //depot/projects/sparc64/sys/sparc64/sparc64/iommu.c#17 (text+ko) ==== @@ -246,7 +246,7 @@ * Now all the hardware's working we need to setup dvma resource * management. */ - printf("DVMA map: %lx to %lx\n", + printf("DVMA map: %#lx to %#lx\n", is->is_dvmabase, is->is_dvmabase + (size << (IO_PAGE_SHIFT - IOTTE_SHIFT)) - 1); ==== //depot/projects/sparc64/sys/sparc64/sparc64/ofw_bus.c#5 (text+ko) ==== @@ -1,3 +1,33 @@ +/* + * Copyright (C) 1996 Wolfgang Solfrank. + * Copyright (C) 1996 TooLs GmbH. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by TooLs GmbH. + * 4. The name of TooLs GmbH may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, 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. + */ /*- * Copyright (c) 2001 by Thomas Moestl . * All rights reserved. @@ -22,6 +52,8 @@ * 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. * + * from: $NetBSD: ofw_machdep.c,v 1.16 2001/07/20 00:07:14 eeh Exp $ + * * $FreeBSD: src/sys/sparc64/sparc64/ofw_bus.c,v 1.1 2001/11/09 20:10:55 tmm Exp $ */ @@ -40,51 +72,169 @@ #include +/* + * Other than in OpenFirmware calls, the size of a bus cell seems to be always + * the same. + */ +typedef u_int32_t pcell_t; + +static int +ofw_bus_searchprop(phandle_t node, char *propname, void *buf, int buflen) +{ + int rv; + + for (; node != 0; node = OF_parent(node)) { + if ((rv = OF_getprop(node, propname, buf, buflen)) != -1) + return (rv); + } + return (-1); +} + /* - * Route an interrupt using the firmware. This takes an interrupt map and mask, - * as retrieved from the firmware (this must be done by the caller, since it - * is not bus-independent). - * regs points to a "reg" property as returned by the firmware. regsz ist the - * the size of one reg element, physz is the size of the physical address member - * at the start of each reg (this is matched against the interrupt map). - * The interrupt map has entries of the size (physsz + 12), the 12 being the - * size of two u_int32_t that hold the interrupt number to compare against, the - * node the map belongs to and the interrupt that the child interrupt is mapped - * to (if the map entry matches). - * The first nregs registers are checked against the map; in some cases (e.g. - * PCI), only the first must be checked. - * The mask consists of a mask wich must be and-ed to the checked physical - * address part of the ofw reg and to the interrupt number before checking - * against the map. - * regm should point to a buffer of physsz size (this is not malloc'ed because - * malloc cannot be called in all situations). + * Map an interrupt using the firmware reg, interrupt-map and + * interrupt-map-mask properties. + * The interrupt is returned in *result, which is malloc()'ed. The size of + * the interrupt specifiaction is returned. */ -u_int32_t -ofw_bus_route_intr(int intr, void *regs, int regsz, int physsz, int nregs, - void *imap, int nimap, void *imapmsk, char *regm) +static int +ofw_bus_find_intr(u_int8_t *intr, int intrsz, u_int8_t *regs, int physsz, + u_int8_t *imap, int imapsz, u_int8_t *imapmsk, u_int8_t **result) { + phandle_t parent; + char *ref; u_int8_t *mptr; - u_int32_t mintr, cintr; - int r, i; + pcell_t pintrsz; + int i, rsz, tsz; - cintr = -1; - bcopy((u_int8_t *)imapmsk + physsz, &mintr, sizeof(mintr)); - mintr &= intr; - for (r = 0; r < nregs; r++) { - for (i = 0; i < physsz; i++) { - regm[i] = ((u_int8_t *)regs)[r * regsz + i] & - ((u_int8_t *)imapmsk)[i]; + rsz = -1; + ref = malloc(physsz + intrsz, M_TEMP, M_WAITOK); + if (imapmsk != NULL) { + for (i = 0; i < physsz; i++) + ref[i] = regs[i] & imapmsk[i]; + for (i = 0; i < intrsz; i++) + ref[physsz + i] = intr[i] & imapmsk[physsz + i]; + } else { + bcopy(regs, ref, physsz); + bcopy(intr, ref + physsz, intrsz); + } + mptr = imap; + i = imapsz; + while (i > 0) { + KASSERT(i >= physsz + sizeof(parent), + ("ofw_bus_find_intr: truncated map")); + bcopy(mptr + physsz + intrsz, &parent, sizeof(parent)); + if (ofw_bus_searchprop(parent, "#interrupt-cells", + &pintrsz, sizeof(pintrsz)) == -1) + pintrsz = 1; /* default */ + pintrsz *= sizeof(pcell_t); + KASSERT(i >= physsz + intrsz + sizeof(parent) + + pintrsz, ("ofw_bus_find_intr: truncated map")); + if (bcmp(ref, mptr, physsz + intrsz) == 0) { + *result = malloc(pintrsz, M_OFWPROP, M_WAITOK); + bcopy(mptr + physsz + intrsz + sizeof(parent), + *result, pintrsz); + rsz = pintrsz; + break; } - for (i = 0; i < nimap; i++) { - mptr = (u_int8_t *)imap + i * (physsz + 12); - if (bcmp(regm, mptr, physsz) == 0 && - bcmp(&mintr, mptr + physsz, sizeof(mintr)) == 0) { - bcopy(mptr + physsz + 8, &cintr, - sizeof(cintr)); - break; - } + tsz = physsz + intrsz + sizeof(phandle_t) + pintrsz; + mptr += tsz; + i -= tsz; + } + free(ref, M_TEMP); + return (rsz); +} + +/* + * Apply the OpenFirmware algorithm for mapping an interrupt. First, the + * 'interrupts' and 'reg' properties are retrieved; those are matched against + * the interrupt map of the next higher node. If there is no match or no such + * propery, we go to the next higher node, using the 'reg' property of the node + * that was just processed unusccessfully. + * When a match occurs, we continue to search, using the new interrupt + * specification that was just found. + * When the root node is reached with at least one successful mapping performed, + * and the format is right, the interrupt number is returned. + * + * This should work for all bus systems. + */ +u_int32_t +ofw_bus_route_intr(phandle_t node, int intrp) +{ + u_int8_t *reg, *intr, *tintr, *imap, *imapmsk; + phandle_t parent; + pcell_t addrc, ic; + u_int32_t rv; + int regsz, tisz, isz, imapsz, found; + + found = 0; + reg = imap = imapmsk = NULL; + if (intrp == ORIP_NOINT) { + isz = OF_getprop_alloc(node, "interrupts", 1, (void **)&intr); + if (isz < 0) + return (ORIR_NOTFOUND); + } else { + ic = intrp; + isz = sizeof(ic); + intr = malloc(isz, M_OFWPROP, M_WAITOK); + bcopy(&ic, intr, isz); + } + /* + * Note that apparently, remapping at multiple levels is allowed; + * however, this causes problems with EBus at least, and seems to never + * be needed, so we disable it for now (*sigh*). + */ + for (parent = OF_parent(node); parent != 0 && !found; + parent = OF_parent(node = parent)) { + if (reg != NULL) + free(reg, M_OFWPROP); + regsz = OF_getprop_alloc(node, "reg", 1, (void **)®); + if (regsz < 0) + panic("ofw_bus_route_intr: could not get reg property"); + imapsz = OF_getprop_alloc(parent, "interrupt-map", 1, + (void **)&imap); + if (imapsz == -1) + continue; + if (OF_getprop(parent, "#address-cells", &addrc, + sizeof(addrc)) == -1) + addrc = 2; + addrc *= sizeof(pcell_t); + /* + * Failures to get the mask are ignored; a full mask is assumed + * in this case. + */ + OF_getprop_alloc(parent, "interrupt-map-mask", 1, + (void **)&imapmsk); + tisz = ofw_bus_find_intr(intr, isz, reg, addrc, imap, imapsz, + imapmsk, &tintr); + if (tisz != -1) { + found = 1; + isz = tisz; + free(intr, M_OFWPROP); + intr = tintr; } + free(imap, M_OFWPROP); + if (imapmsk != NULL) + free(imapmsk, M_OFWPROP); + } + if (reg != NULL) + free(reg, M_OFWPROP); +#if 0 + /* + * Obviously there are some boxes that don't require mapping at all, + * for example the U30, which has no interrupt maps for children of + * the root PCI bus. + */ + if (!found) { + if (intrp != ORIP_NOINT) + return (ORIR_NOTFOUND); + panic("ofw_bus_route_intr: 'interrupts' property, but no " + "mapping found"); } - return (cintr); +#endif + KASSERT(isz == sizeof(u_int32_t), + ("ofw_bus_route_intr: bad interrupt spec size %d", isz)); + bcopy(intr, &rv, sizeof(rv)); + free(intr, M_OFWPROP); + return (rv); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 21: 0:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8116937B405; Tue, 19 Mar 2002 20:58:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F39E637B419 for ; Tue, 19 Mar 2002 20:58:24 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2K4wNx34404 for perforce@freebsd.org; Tue, 19 Mar 2002 20:58:23 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 19 Mar 2002 20:58:23 -0800 (PST) Message-Id: <200203200458.g2K4wNx34404@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8016 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8016 Change 8016 by peter@peter_daintree on 2002/03/19 20:57:59 IFC Affected files ... ... //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#4 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_create.c#3 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_exit.c#3 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_fork.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#3 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_spec.c#2 integrate ... //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#6 integrate ... //depot/projects/ia64/sbin/Makefile#5 integrate ... //depot/projects/ia64/sbin/badsect/badsect.c#3 integrate ... //depot/projects/ia64/sbin/clri/clri.c#2 integrate ... //depot/projects/ia64/sbin/ffsinfo/ffsinfo.8#2 integrate ... //depot/projects/ia64/sbin/growfs/debug.c#2 integrate ... //depot/projects/ia64/sbin/ipfstat/Makefile#4 integrate ... //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#4 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/efifs.c#2 integrate ... //depot/projects/ia64/sys/dev/acpica/acpivar.h#6 integrate ... //depot/projects/ia64/sys/dev/aic/aic.c#4 integrate ... //depot/projects/ia64/sys/dev/aic/aic_cbus.c#2 integrate ... //depot/projects/ia64/sys/dev/aic/aic_isa.c#2 integrate ... //depot/projects/ia64/sys/dev/aic/aicvar.h#3 integrate ... //depot/projects/ia64/sys/dev/an/if_an.c#6 integrate ... //depot/projects/ia64/sys/dev/an/if_an_isa.c#2 integrate ... //depot/projects/ia64/sys/dev/an/if_an_pci.c#2 integrate ... //depot/projects/ia64/sys/dev/an/if_anreg.h#3 integrate ... //depot/projects/ia64/sys/dev/asr/asr.c#4 integrate ... //depot/projects/ia64/sys/dev/awi/am79c930.c#2 integrate ... //depot/projects/ia64/sys/dev/awi/am79c930var.h#2 integrate ... //depot/projects/ia64/sys/dev/awi/awi.c#2 integrate ... //depot/projects/ia64/sys/dev/awi/awi_wep.c#2 integrate ... //depot/projects/ia64/sys/dev/awi/awi_wicfg.c#2 integrate ... //depot/projects/ia64/sys/dev/awi/awivar.h#2 integrate ... //depot/projects/ia64/sys/dev/bge/if_bge.c#5 integrate ... //depot/projects/ia64/sys/dev/bktr/bktr_os.c#3 integrate ... //depot/projects/ia64/sys/dev/cm/if_cm_isa.c#2 integrate ... //depot/projects/ia64/sys/dev/cm/smc90cx6.c#2 integrate ... //depot/projects/ia64/sys/dev/cm/smc90cx6var.h#2 integrate ... //depot/projects/ia64/sys/dev/cnw/if_cnw.c#3 integrate ... //depot/projects/ia64/sys/dev/ct/bshw_machdep.c#2 integrate ... //depot/projects/ia64/sys/dev/ct/bshwvar.h#2 integrate ... //depot/projects/ia64/sys/dev/ct/ct.c#2 integrate ... //depot/projects/ia64/sys/dev/ct/ct_isa.c#2 integrate ... //depot/projects/ia64/sys/dev/ct/ct_machdep.h#2 integrate ... //depot/projects/ia64/sys/dev/ct/ctvar.h#2 integrate ... //depot/projects/ia64/sys/dev/dgb/dgb.c#4 integrate ... //depot/projects/ia64/sys/dev/ed/if_ed.c#4 integrate ... //depot/projects/ia64/sys/dev/ed/if_ed_cbus.c#2 integrate ... //depot/projects/ia64/sys/dev/ed/if_ed_isa.c#2 integrate ... //depot/projects/ia64/sys/dev/ed/if_ed_pci.c#2 integrate ... //depot/projects/ia64/sys/dev/ed/if_edvar.h#2 integrate ... //depot/projects/ia64/sys/dev/eisa/eisaconf.h#2 integrate ... //depot/projects/ia64/sys/dev/em/if_em.c#3 integrate ... //depot/projects/ia64/sys/dev/en/midway.c#2 integrate ... //depot/projects/ia64/sys/dev/en/midwayvar.h#2 integrate ... //depot/projects/ia64/sys/dev/ep/if_ep.c#3 integrate ... //depot/projects/ia64/sys/dev/ep/if_ep_eisa.c#2 integrate ... //depot/projects/ia64/sys/dev/ex/if_ex.c#2 integrate ... //depot/projects/ia64/sys/dev/ex/if_ex_isa.c#2 integrate ... //depot/projects/ia64/sys/dev/ex/if_ex_pccard.c#2 integrate ... //depot/projects/ia64/sys/dev/gem/if_gem.c#2 integrate ... //depot/projects/ia64/sys/dev/gem/if_gem_pci.c#4 integrate ... //depot/projects/ia64/sys/dev/gem/if_gemvar.h#2 integrate ... //depot/projects/ia64/sys/dev/hea/eni.c#2 integrate ... //depot/projects/ia64/sys/dev/hea/eni_buffer.c#3 integrate ... //depot/projects/ia64/sys/dev/hea/eni_if.c#2 integrate ... //depot/projects/ia64/sys/dev/hea/eni_intr.c#2 integrate ... //depot/projects/ia64/sys/dev/hea/eni_receive.c#2 integrate ... //depot/projects/ia64/sys/dev/hea/eni_var.h#2 integrate ... //depot/projects/ia64/sys/dev/hfa/fore_buffer.c#2 integrate ... //depot/projects/ia64/sys/dev/hfa/fore_include.h#2 integrate ... //depot/projects/ia64/sys/dev/hfa/fore_init.c#2 integrate ... //depot/projects/ia64/sys/dev/hfa/fore_load.c#2 integrate ... //depot/projects/ia64/sys/dev/hfa/fore_output.c#2 integrate ... //depot/projects/ia64/sys/dev/hfa/fore_receive.c#2 integrate ... //depot/projects/ia64/sys/dev/iir/iir.h#2 integrate ... //depot/projects/ia64/sys/dev/iir/iir_pci.c#2 integrate ... //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#4 integrate ... //depot/projects/ia64/sys/dev/ispfw/ispfw.c#2 integrate ... //depot/projects/ia64/sys/dev/lge/if_lge.c#2 integrate ... //depot/projects/ia64/sys/dev/lnc/if_lnc.c#3 integrate ... //depot/projects/ia64/sys/dev/lnc/if_lncvar.h#2 integrate ... //depot/projects/ia64/sys/dev/mii/acphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/amphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/brgphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/dcphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/exphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/lxtphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/mii.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/mii_physubr.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/miivar.h#2 integrate ... //depot/projects/ia64/sys/dev/mii/mlphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/nsgphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/nsphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/pnaphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/pnphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/qsphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/rlphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/tdkphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/tlphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/ukphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/xmphy.c#2 integrate ... //depot/projects/ia64/sys/dev/ncv/ncr53c500.c#4 integrate ... //depot/projects/ia64/sys/dev/ncv/ncr53c500_pccard.c#4 integrate ... //depot/projects/ia64/sys/dev/ncv/ncr53c500var.h#3 integrate ... //depot/projects/ia64/sys/dev/nge/if_nge.c#4 integrate ... //depot/projects/ia64/sys/dev/nsp/nsp.c#3 integrate ... //depot/projects/ia64/sys/dev/nsp/nsp_pccard.c#4 integrate ... //depot/projects/ia64/sys/dev/nsp/nspvar.h#3 integrate ... //depot/projects/ia64/sys/dev/pdq/if_fea.c#2 integrate ... //depot/projects/ia64/sys/dev/ppbus/ppb_msq.c#3 integrate ... //depot/projects/ia64/sys/dev/puc/puc.c#2 integrate ... //depot/projects/ia64/sys/dev/rp/rp.c#4 integrate ... //depot/projects/ia64/sys/dev/sio/sio.c#5 integrate ... //depot/projects/ia64/sys/dev/sio/sio_isa.c#5 integrate ... //depot/projects/ia64/sys/dev/sio/sio_pccard.c#4 integrate ... //depot/projects/ia64/sys/dev/sio/sio_pci.c#5 integrate ... //depot/projects/ia64/sys/dev/sio/sio_puc.c#2 integrate ... //depot/projects/ia64/sys/dev/sio/siovar.h#4 integrate ... //depot/projects/ia64/sys/dev/snc/dp83932.c#2 integrate ... //depot/projects/ia64/sys/dev/snc/dp83932subr.c#2 integrate ... //depot/projects/ia64/sys/dev/snc/dp83932subr.h#2 integrate ... //depot/projects/ia64/sys/dev/snc/dp83932var.h#2 integrate ... //depot/projects/ia64/sys/dev/snc/if_snc_cbus.c#2 integrate ... //depot/projects/ia64/sys/dev/snc/if_sncvar.h#2 integrate ... //depot/projects/ia64/sys/dev/snp/snp.c#6 integrate ... //depot/projects/ia64/sys/dev/stg/tmc18c30.c#4 integrate ... //depot/projects/ia64/sys/dev/stg/tmc18c30_isa.c#2 integrate ... //depot/projects/ia64/sys/dev/stg/tmc18c30_pccard.c#4 integrate ... //depot/projects/ia64/sys/dev/stg/tmc18c30var.h#3 integrate ... //depot/projects/ia64/sys/dev/streams/streams.c#3 integrate ... //depot/projects/ia64/sys/dev/sym/sym_hipd.c#5 integrate ... //depot/projects/ia64/sys/dev/txp/if_txp.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/if_aue.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/if_cue.c#2 integrate ... //depot/projects/ia64/sys/dev/usb/if_kue.c#2 integrate ... //depot/projects/ia64/sys/dev/usb/umass.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/usb_ethersubr.c#2 integrate ... //depot/projects/ia64/sys/dev/usb/usb_ethersubr.h#2 integrate ... //depot/projects/ia64/sys/dev/usb/usbdivar.h#4 integrate ... //depot/projects/ia64/sys/dev/vx/if_vx.c#3 integrate ... //depot/projects/ia64/sys/dev/vx/if_vx_eisa.c#2 integrate ... //depot/projects/ia64/sys/dev/vx/if_vxreg.h#2 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_alloc.c#3 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_extern.h#2 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_inode.c#2 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_lookup.c#3 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_subr.c#3 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_vfsops.c#6 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_vnops.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#10 integrate ... //depot/projects/ia64/sys/kern/kern_event.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_exit.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_fork.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#5 integrate ... //depot/projects/ia64/sys/kern/sys_pipe.c#7 integrate ... //depot/projects/ia64/sys/kern/uipc_domain.c#4 integrate ... //depot/projects/ia64/sys/kern/uipc_socket.c#6 integrate ... //depot/projects/ia64/sys/kern/uipc_socket2.c#5 integrate ... //depot/projects/ia64/sys/kern/uipc_usrreq.c#8 integrate ... //depot/projects/ia64/sys/kern/vfs_aio.c#5 integrate ... //depot/projects/ia64/sys/kern/vfs_default.c#5 integrate ... //depot/projects/ia64/sys/kern/vfs_init.c#3 integrate ... //depot/projects/ia64/sys/kern/vfs_lookup.c#4 integrate ... //depot/projects/ia64/sys/kern/vfs_subr.c#6 integrate ... //depot/projects/ia64/sys/kern/vfs_syscalls.c#7 integrate ... //depot/projects/ia64/sys/libkern/bsearch.c#2 integrate ... //depot/projects/ia64/sys/libkern/mcount.c#2 integrate ... //depot/projects/ia64/sys/libkern/qsort.c#2 integrate ... //depot/projects/ia64/sys/libkern/quad.h#2 integrate ... //depot/projects/ia64/sys/net/zlib.c#3 integrate ... //depot/projects/ia64/sys/netatalk/at_extern.h#2 integrate ... //depot/projects/ia64/sys/netatm/atm_aal5.c#2 integrate ... //depot/projects/ia64/sys/netatm/atm_cm.c#2 integrate ... //depot/projects/ia64/sys/netatm/atm_cm.h#2 integrate ... //depot/projects/ia64/sys/netatm/atm_if.c#2 integrate ... //depot/projects/ia64/sys/netatm/atm_if.h#2 integrate ... //depot/projects/ia64/sys/netatm/atm_sigmgr.h#2 integrate ... //depot/projects/ia64/sys/netatm/atm_signal.c#2 integrate ... //depot/projects/ia64/sys/netatm/atm_stack.h#2 integrate ... //depot/projects/ia64/sys/netatm/atm_subr.c#3 integrate ... //depot/projects/ia64/sys/netatm/atm_sys.h#2 integrate ... //depot/projects/ia64/sys/netatm/atm_usrreq.c#2 integrate ... //depot/projects/ia64/sys/netatm/atm_var.h#3 integrate ... //depot/projects/ia64/sys/netinet6/nd6_nbr.c#2 integrate ... //depot/projects/ia64/sys/netipx/ipx.h#3 integrate ... //depot/projects/ia64/sys/netipx/ipx_if.h#2 integrate ... //depot/projects/ia64/sys/netipx/ipx_ip.h#2 integrate ... //depot/projects/ia64/sys/netipx/ipx_pcb.h#2 integrate ... //depot/projects/ia64/sys/netipx/ipx_var.h#2 integrate ... //depot/projects/ia64/sys/netipx/spx.h#2 integrate ... //depot/projects/ia64/sys/netipx/spx_debug.h#2 integrate ... //depot/projects/ia64/sys/netkey/key.c#5 integrate ... //depot/projects/ia64/sys/netkey/key.h#2 integrate ... //depot/projects/ia64/sys/netkey/key_debug.c#3 integrate ... //depot/projects/ia64/sys/netkey/key_debug.h#3 integrate ... //depot/projects/ia64/sys/netkey/keydb.c#2 integrate ... //depot/projects/ia64/sys/netkey/keydb.h#2 integrate ... //depot/projects/ia64/sys/netkey/keysock.c#4 integrate ... //depot/projects/ia64/sys/netkey/keysock.h#2 integrate ... //depot/projects/ia64/sys/netnatm/natm.c#4 integrate ... //depot/projects/ia64/sys/netnatm/natm.h#2 integrate ... //depot/projects/ia64/sys/netnatm/natm_pcb.c#2 integrate ... //depot/projects/ia64/sys/netnatm/natm_proto.c#3 integrate ... //depot/projects/ia64/sys/netns/ns.h#3 integrate ... //depot/projects/ia64/sys/netns/ns_if.h#2 integrate ... //depot/projects/ia64/sys/nfs/nfsnode.h#2 integrate ... //depot/projects/ia64/sys/pci/cy_pci.c#4 integrate ... //depot/projects/ia64/sys/pci/if_dc.c#7 integrate ... //depot/projects/ia64/sys/pci/if_en_pci.c#2 integrate ... //depot/projects/ia64/sys/pci/if_pcn.c#3 integrate ... //depot/projects/ia64/sys/pci/if_rl.c#5 integrate ... //depot/projects/ia64/sys/pci/if_sf.c#3 integrate ... //depot/projects/ia64/sys/pci/if_sis.c#6 integrate ... //depot/projects/ia64/sys/pci/if_sk.c#3 integrate ... //depot/projects/ia64/sys/pci/if_ste.c#3 integrate ... //depot/projects/ia64/sys/pci/if_ti.c#5 integrate ... //depot/projects/ia64/sys/pci/if_tl.c#3 integrate ... //depot/projects/ia64/sys/pci/if_tx.c#3 integrate ... //depot/projects/ia64/sys/pci/if_vr.c#3 integrate ... //depot/projects/ia64/sys/pci/if_wb.c#3 integrate ... //depot/projects/ia64/sys/pci/if_xl.c#5 integrate ... //depot/projects/ia64/sys/pci/intpm.c#3 integrate ... //depot/projects/ia64/sys/pci/meteor.c#3 integrate ... //depot/projects/ia64/sys/pci/simos.c#2 integrate ... //depot/projects/ia64/sys/sys/proc.h#8 integrate ... //depot/projects/ia64/sys/sys/socketvar.h#7 integrate ... //depot/projects/ia64/sys/sys/vnode.h#7 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#5 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_extern.h#4 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_inode.c#4 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#7 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#6 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_subr.c#2 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#7 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#3 integrate ... //depot/projects/ia64/sys/ufs/ufs/acl.h#3 integrate ... //depot/projects/ia64/sys/ufs/ufs/quota.h#2 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_extern.h#3 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_quota.c#3 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#6 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufsmount.h#2 integrate ... //depot/projects/ia64/sys/vm/default_pager.c#4 integrate ... //depot/projects/ia64/sys/vm/device_pager.c#4 integrate ... //depot/projects/ia64/sys/vm/phys_pager.c#2 integrate ... //depot/projects/ia64/sys/vm/swap_pager.c#6 integrate ... //depot/projects/ia64/sys/vm/swap_pager.h#4 integrate ... //depot/projects/ia64/sys/vm/vm_init.c#5 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#7 integrate ... //depot/projects/ia64/sys/vm/vm_object.c#6 integrate ... //depot/projects/ia64/sys/vm/vm_pageout.c#8 integrate ... //depot/projects/ia64/sys/vm/vm_swap.c#5 integrate ... //depot/projects/ia64/usr.sbin/Makefile#6 integrate ... //depot/projects/ia64/usr.sbin/arp/arp.c#3 integrate Differences ... ==== //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.67 2002/02/17 17:21:27 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.68 2002/03/19 22:58:56 deischen Exp $ */ #ifndef _PTHREAD_PRIVATE_H @@ -481,13 +481,6 @@ } while (tv.tv_sec != _sched_tod.tv_sec) -struct pthread_key { - spinlock_t lock; - volatile int allocated; - volatile int count; - void (*destructor) (); -}; - struct pthread_rwlockattr { int pshared; }; @@ -631,6 +624,11 @@ siginfo_t siginfo; }; +struct pthread_specific_elem { + const void *data; + int seqno; +}; + /* * Thread structure. */ @@ -842,9 +840,9 @@ */ TAILQ_HEAD(, pthread_mutex) mutexq; - void *ret; - const void **specific_data; - int specific_data_count; + void *ret; + struct pthread_specific_elem *specific; + int specific_data_count; /* Cleanup handlers Link List */ struct pthread_cleanup *cleanup; ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_create.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.32 2002/02/09 19:58:41 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.33 2002/03/19 22:58:56 deischen Exp $ */ #include #include @@ -179,7 +179,7 @@ TAILQ_INIT(&new_thread->mutexq); /* Initialise hooks in the thread structure: */ - new_thread->specific_data = NULL; + new_thread->specific = NULL; new_thread->cleanup = NULL; new_thread->flags = 0; new_thread->poll_data.nfds = 0; ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_exit.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_exit.c,v 1.24 2001/11/17 14:28:39 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_exit.c,v 1.25 2002/03/19 22:58:56 deischen Exp $ */ #include #include @@ -158,7 +158,7 @@ curthread->attr.cleanup_attr(curthread->attr.arg_attr); } /* Check if there is thread specific data: */ - if (curthread->specific_data != NULL) { + if (curthread->specific != NULL) { /* Run the thread-specific data destructors: */ _thread_cleanupspecific(); } ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_fork.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.26 2001/07/20 04:23:11 jasone Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_fork.c,v 1.27 2002/03/19 22:58:56 deischen Exp $ */ #include #include @@ -233,8 +233,8 @@ thread->attr.guardsize_attr); } - if (thread->specific_data != NULL) - free(thread->specific_data); + if (thread->specific != NULL) + free(thread->specific); if (thread->poll_data.fds != NULL) free(thread->poll_data.fds); ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.37 2002/02/09 19:58:41 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_init.c,v 1.38 2002/03/19 22:58:56 deischen Exp $ */ /* Allocate space for global thread variables here: */ @@ -340,7 +340,7 @@ _thread_initial->poll_data.fds = NULL; _thread_initial->sig_defer_count = 0; _thread_initial->yield_on_sig_undefer = 0; - _thread_initial->specific_data = NULL; + _thread_initial->specific = NULL; _thread_initial->cleanup = NULL; _thread_initial->flags = 0; _thread_initial->error = 0; ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_spec.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_spec.c,v 1.16 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_spec.c,v 1.17 2002/03/19 22:58:56 deischen Exp $ */ #include #include @@ -38,6 +38,14 @@ #include #include "pthread_private.h" +struct pthread_key { + spinlock_t lock; + volatile int allocated; + volatile int count; + int seqno; + void (*destructor) (); +}; + /* Static variables: */ static struct pthread_key key_table[PTHREAD_KEYS_MAX]; @@ -57,6 +65,7 @@ if (key_table[(*key)].allocated == 0) { key_table[(*key)].allocated = 1; key_table[(*key)].destructor = destructor; + key_table[(*key)].seqno++; /* Unlock the key table entry: */ _SPINUNLOCK(&key_table[*key].lock); @@ -101,18 +110,20 @@ for (itr = 0; itr < PTHREAD_DESTRUCTOR_ITERATIONS; itr++) { for (key = 0; key < PTHREAD_KEYS_MAX; key++) { - if (curthread->specific_data_count) { + if (curthread->specific_data_count > 0) { /* Lock the key table entry: */ _SPINLOCK(&key_table[key].lock); destructor = NULL; - if (key_table[key].allocated) { - if (curthread->specific_data[key]) { - data = (void *) curthread->specific_data[key]; - curthread->specific_data[key] = NULL; - curthread->specific_data_count--; + if (key_table[key].allocated && + (curthread->specific[key].data != NULL)) { + if (curthread->specific[key].seqno == + key_table[key].seqno) { + data = (void *) curthread->specific[key].data; destructor = key_table[key].destructor; } + curthread->specific[key].data = NULL; + curthread->specific_data_count--; } /* Unlock the key table entry: */ @@ -125,22 +136,28 @@ if (destructor) destructor(data); } else { - free(curthread->specific_data); - curthread->specific_data = NULL; + free(curthread->specific); + curthread->specific = NULL; return; } } } - free(curthread->specific_data); - curthread->specific_data = NULL; + if (curthread->specific != NULL) { + free(curthread->specific); + curthread->specific = NULL; + } } -static inline const void ** +static inline struct pthread_specific_elem * pthread_key_allocate_data(void) { - const void **new_data; - if ((new_data = (const void **) malloc(sizeof(void *) * PTHREAD_KEYS_MAX)) != NULL) { - memset((void *) new_data, 0, sizeof(void *) * PTHREAD_KEYS_MAX); + struct pthread_specific_elem *new_data; + + new_data = (struct pthread_specific_elem *) + malloc(sizeof(struct pthread_specific_elem) * PTHREAD_KEYS_MAX); + if (new_data != NULL) { + memset((void *) new_data, 0, + sizeof(struct pthread_specific_elem) * PTHREAD_KEYS_MAX); } return (new_data); } @@ -154,18 +171,20 @@ /* Point to the running thread: */ pthread = _get_curthread(); - if ((pthread->specific_data) || - (pthread->specific_data = pthread_key_allocate_data())) { + if ((pthread->specific) || + (pthread->specific = pthread_key_allocate_data())) { if (key < PTHREAD_KEYS_MAX) { if (key_table[key].allocated) { - if (pthread->specific_data[key] == NULL) { + if (pthread->specific[key].data == NULL) { if (value != NULL) pthread->specific_data_count++; } else { if (value == NULL) pthread->specific_data_count--; } - pthread->specific_data[key] = value; + pthread->specific[key].data = value; + pthread->specific[key].seqno = + key_table[key].seqno; ret = 0; } else ret = EINVAL; @@ -186,11 +205,12 @@ pthread = _get_curthread(); /* Check if there is specific data: */ - if (pthread->specific_data != NULL && key < PTHREAD_KEYS_MAX) { + if (pthread->specific != NULL && key < PTHREAD_KEYS_MAX) { /* Check if this key has been used before: */ - if (key_table[key].allocated) { + if (key_table[key].allocated && + (pthread->specific[key].seqno == key_table[key].seqno)) { /* Return the value: */ - data = (void *) pthread->specific_data[key]; + data = (void *) pthread->specific[key].data; } else { /* * This key has not been used before, so return NULL ==== //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#6 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -11,7 +11,7 @@ FreeBSD ¥×¥í¥¸¥§¥¯¥È - $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.53 2002/03/19 00:41:57 kuriyama Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/relnotes/common/new.sgml,v 1.54 2002/03/20 02:01:26 kuriyama Exp $ 2000 @@ -1896,6 +1896,17 @@ FreeBSD-SA-02:13 »²¾È). &merged; + zlib ¤Î¥×¥í¥°¥é¥à¥¨¥é¡¼¤Ë¤è¤ê + ¥á¥â¥ê¤Î²òÊü¤¬Ê£¿ô²ó¹Ô¤Ê¤ï¤ì¤Æ¤¤¤Þ¤·¤¿. + &os; ¤Ç»È¤ï¤ì¤Æ¤¤¤ë &man.malloc.3;/&man.free.3; ¥ë¡¼¥Á¥ó¤Ï + ¤³¤Î¥¨¥é¡¼¤Ë¤è¤Ã¤ÆÀȼå¤È¤Ê¤ë¤³¤È¤Ï¤¢¤ê¤Þ¤»¤ó¤¬, + ÉÔÀµ¤Ë°µ½Ì¤µ¤ì¤¿¥Ç¡¼¥¿¤ÎÆüì¥Ö¥í¥Ã¥¯¤ò¼õ¤±¼è¤Ã¤¿¥¢¥×¥ê¥±¡¼¥·¥ç¥ó + ¤Ï´Ö°ã¤Ã¤ÆÆ°ºî¤¹¤ë¤«ÃæÃǤ·¤Æ¤·¤Þ¤¦¤«¤âÃΤì¤Þ¤»¤ó. + ¤³¤Î zlib ¤Î¥Ð¥°¤Ï½¤Àµ¤µ¤ì¤Þ¤·¤¿. + Âкö¤È²òË¡¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð + FreeBSD-SA-02:18 + ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤. &merged; + ==== //depot/projects/ia64/sbin/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.98 2002/03/19 12:07:27 peter Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.99 2002/03/20 02:09:50 obrien Exp $ # XXX MISSING: icheck ncheck @@ -34,7 +34,6 @@ ipfstat \ ipfw \ ipmon \ - ipnat \ kldconfig \ kldload \ kldstat \ ==== //depot/projects/ia64/sbin/badsect/badsect.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ static const char sccsid[] = "@(#)badsect.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/badsect/badsect.c,v 1.10 2002/03/18 04:57:08 imp Exp $"; + "$FreeBSD: src/sbin/badsect/badsect.c,v 1.11 2002/03/20 04:33:16 imp Exp $"; #endif /* not lint */ /* @@ -103,7 +103,7 @@ daddr_t diskbn; daddr_t number; struct stat stbuf, devstat; - register struct dirent *dp; + struct dirent *dp; DIR *dirp; char name[2 * MAXPATHLEN]; char *name_dir_end; ==== //depot/projects/ia64/sbin/clri/clri.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)clri.c 8.2 (Berkeley) 9/23/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/clri/clri.c,v 1.4 1999/08/28 00:12:32 peter Exp $"; + "$FreeBSD: src/sbin/clri/clri.c,v 1.5 2002/03/20 04:33:25 imp Exp $"; #endif /* not lint */ #include @@ -72,9 +72,9 @@ int argc; char *argv[]; { - register struct fs *sbp; - register struct dinode *ip; - register int fd; + struct fs *sbp; + struct dinode *ip; + int fd; struct dinode ibuf[MAXBSIZE / sizeof (struct dinode)]; long generation, bsize; off_t offset; ==== //depot/projects/ia64/sbin/ffsinfo/ffsinfo.8#2 (text+ko) ==== @@ -35,7 +35,7 @@ .\" SUCH DAMAGE. .\" .\" $TSHeader: src/sbin/ffsinfo/ffsinfo.8,v 1.3 2000/12/12 19:30:55 tomsoft Exp $ -.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.7 2001/08/01 12:15:19 sheldonh Exp $ +.\" $FreeBSD: src/sbin/ffsinfo/ffsinfo.8,v 1.8 2002/03/20 02:35:14 rwatson Exp $ .\" .Dd September 8, 2000 .Dt FSINFO 8 @@ -114,6 +114,7 @@ This allows to change the output filename where the dump is written to. The current default is .Pa /var/tmp/ffsinfo . +If - is provided, output will be sent to stdout. .El .Sh EXAMPLES .Dl ffsinfo -l 1023 /dev/vinum/testvol ==== //depot/projects/ia64/sbin/growfs/debug.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/growfs/debug.c,v 1.4 2001/08/13 14:06:29 ru Exp $"; + "$FreeBSD: src/sbin/growfs/debug.c,v 1.5 2002/03/20 02:34:01 rwatson Exp $"; #endif /* not lint */ /* ********************************************************** INCLUDES ***** */ @@ -71,7 +71,10 @@ dbg_open(const char *fn) { - dbg_log=fopen(fn, "a"); + if (strcmp(fn, "-") == 0) + dbg_log=fopen("/dev/stdout", "a"); + else + dbg_log=fopen(fn, "a"); return; } ==== //depot/projects/ia64/sbin/ipfstat/Makefile#4 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/sbin/ipfstat/Makefile,v 1.16 2002/03/19 15:07:30 darrenr Exp $ +# $FreeBSD: src/sbin/ipfstat/Makefile,v 1.17 2002/03/19 22:51:53 alfred Exp $ .PATH: ${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man PROG= ipfstat MAN= ipfstat.8 -SRCS= fils.c parse.c opt.c kmem.c facpri.c common.c +SRCS= fils.c parse.c opt.c kmem.c facpri.c common.c printstate.c CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DSTATETOP CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter ==== //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.35 2002/03/07 04:43:50 jake Exp $ + * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.36 2002/03/20 02:27:55 jeff Exp $ */ #include @@ -535,6 +535,9 @@ if (bootverbose) printf("%s: releasing secondary CPUs\n", __func__); atomic_store_rel_int(&aps_ready, 1); + + while (smp_started == 0) + ; /* nothing */ } SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL); ==== //depot/projects/ia64/sys/boot/efi/libefi/efifs.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.3 2001/10/11 13:47:20 dfr Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.4 2002/03/19 23:05:33 peter Exp $ */ #include @@ -129,7 +129,35 @@ size -= sz; bufp += sz; } - *resid = size; + if (resid) + *resid = size; + return 0; +} + +static int +efifs_write(struct open_file *f, void *buf, size_t size, size_t *resid) +{ + EFI_FILE *file = f->f_fsdata; + EFI_STATUS status; + UINTN sz = size; + char *bufp; + + bufp = buf; + while (size > 0) { + sz = size; + if (sz > 8192) + sz = 8192; + status = file->Write(file, &sz, bufp); + twiddle(); + if (EFI_ERROR(status)) + return EIO; + if (sz == 0) + break; + size -= sz; + bufp += sz; + } + if (resid) + *resid = size; return 0; } @@ -246,7 +274,7 @@ efifs_open, efifs_close, efifs_read, - null_write, + efifs_write, efifs_seek, efifs_stat, efifs_readdir ==== //depot/projects/ia64/sys/dev/acpica/acpivar.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.30 2002/03/04 18:45:46 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.31 2002/03/20 02:02:34 alfred Exp $ */ #include "bus_if.h" @@ -297,7 +297,7 @@ #define ACPI_EVENT_PRI_DEFAULT 10000 #define ACPI_EVENT_PRI_LAST 20000 -typedef void (*acpi_event_handler_t) __P((void *, int)); +typedef void (*acpi_event_handler_t)(void *, int); EVENTHANDLER_DECLARE(acpi_sleep_event, acpi_event_handler_t); EVENTHANDLER_DECLARE(acpi_wakeup_event, acpi_event_handler_t); ==== //depot/projects/ia64/sys/dev/aic/aic.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aic/aic.c,v 1.16 2002/03/15 21:30:41 luoqi Exp $ + * $FreeBSD: src/sys/dev/aic/aic.c,v 1.17 2002/03/20 02:02:34 alfred Exp $ */ #include @@ -45,26 +45,26 @@ #include #include -static void aic_action __P((struct cam_sim *sim, union ccb *ccb)); -static void aic_execute_scb __P((void *arg, bus_dma_segment_t *dm_segs, - int nseg, int error)); -static void aic_start __P((struct aic_softc *aic)); -static void aic_select __P((struct aic_softc *aic)); -static void aic_selected __P((struct aic_softc *aic)); -static void aic_reselected __P((struct aic_softc *aic)); -static void aic_reconnect __P((struct aic_softc *aic, int tag)); -static void aic_cmd __P((struct aic_softc *aic)); -static void aic_msgin __P((struct aic_softc *aic)); -static void aic_handle_msgin __P((struct aic_softc *aic)); -static void aic_msgout __P((struct aic_softc *aic)); -static void aic_datain __P((struct aic_softc *aic)); -static void aic_dataout __P((struct aic_softc *aic)); -static void aic_done __P((struct aic_softc *aic, struct aic_scb *scb)); -static void aic_poll __P((struct cam_sim *sim)); -static void aic_timeout __P((void *arg)); -static void aic_scsi_reset __P((struct aic_softc *aic)); -static void aic_chip_reset __P((struct aic_softc *aic)); -static void aic_reset __P((struct aic_softc *aic, int initiate_reset)); +static void aic_action(struct cam_sim *sim, union ccb *ccb); +static void aic_execute_scb(void *arg, bus_dma_segment_t *dm_segs, + int nseg, int error); +static void aic_start(struct aic_softc *aic); +static void aic_select(struct aic_softc *aic); +static void aic_selected(struct aic_softc *aic); +static void aic_reselected(struct aic_softc *aic); +static void aic_reconnect(struct aic_softc *aic, int tag); +static void aic_cmd(struct aic_softc *aic); +static void aic_msgin(struct aic_softc *aic); +static void aic_handle_msgin(struct aic_softc *aic); +static void aic_msgout(struct aic_softc *aic); +static void aic_datain(struct aic_softc *aic); +static void aic_dataout(struct aic_softc *aic); +static void aic_done(struct aic_softc *aic, struct aic_scb *scb); +static void aic_poll(struct cam_sim *sim); +static void aic_timeout(void *arg); +static void aic_scsi_reset(struct aic_softc *aic); +static void aic_chip_reset(struct aic_softc *aic); +static void aic_reset(struct aic_softc *aic, int initiate_reset); devclass_t aic_devclass; ==== //depot/projects/ia64/sys/dev/aic/aic_cbus.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aic/aic_cbus.c,v 1.7 2001/06/26 11:35:46 nyan Exp $ + * $FreeBSD: src/sys/dev/aic/aic_cbus.c,v 1.8 2002/03/20 02:02:34 alfred Exp $ */ #include @@ -48,10 +48,10 @@ void *sc_ih; }; -static int aic_isa_alloc_resources __P((device_t)); -static void aic_isa_release_resources __P((device_t)); -static int aic_isa_probe __P((device_t)); -static int aic_isa_attach __P((device_t)); +static int aic_isa_alloc_resources(device_t); +static void aic_isa_release_resources(device_t); +static int aic_isa_probe(device_t); +static int aic_isa_attach(device_t); #ifdef PC98 static u_int aic_isa_ports[] = { 0x1840 }; ==== //depot/projects/ia64/sys/dev/aic/aic_isa.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aic/aic_isa.c,v 1.8 2001/06/06 22:32:29 imp Exp $ + * $FreeBSD: src/sys/dev/aic/aic_isa.c,v 1.9 2002/03/20 02:02:34 alfred Exp $ */ #include @@ -48,10 +48,10 @@ void *sc_ih; }; -static int aic_isa_alloc_resources __P((device_t)); -static void aic_isa_release_resources __P((device_t)); -static int aic_isa_probe __P((device_t)); -static int aic_isa_attach __P((device_t)); +static int aic_isa_alloc_resources(device_t); +static void aic_isa_release_resources(device_t); +static int aic_isa_probe(device_t); +static int aic_isa_attach(device_t); static u_int aic_isa_ports[] = { 0x340, 0x140 }; #define AIC_ISA_NUMPORTS (sizeof(aic_isa_ports) / sizeof(aic_isa_ports[0])) ==== //depot/projects/ia64/sys/dev/aic/aicvar.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aic/aicvar.h,v 1.7 2002/03/15 21:30:41 luoqi Exp $ + * $FreeBSD: src/sys/dev/aic/aicvar.h,v 1.8 2002/03/20 02:02:34 alfred Exp $ */ struct aic_transinfo { @@ -153,7 +153,7 @@ bus_space_write_multi_4((aic)->tag, (aic)->bsh, (port), \ (u_int32_t *)(addr), (count)) -extern int aic_probe __P((struct aic_softc *)); -extern int aic_attach __P((struct aic_softc *)); -extern int aic_detach __P((struct aic_softc *)); -extern void aic_intr __P((void *)); +extern int aic_probe(struct aic_softc *); +extern int aic_attach(struct aic_softc *); +extern int aic_detach(struct aic_softc *); +extern void aic_intr(void *); ==== //depot/projects/ia64/sys/dev/an/if_an.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/an/if_an.c,v 1.32 2002/03/14 20:56:41 ambrisko Exp $ + * $FreeBSD: src/sys/dev/an/if_an.c,v 1.33 2002/03/20 02:02:34 alfred Exp $ */ /* @@ -132,58 +132,56 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an.c,v 1.32 2002/03/14 20:56:41 ambrisko Exp $"; + "$FreeBSD: src/sys/dev/an/if_an.c,v 1.33 2002/03/20 02:02:34 alfred Exp $"; #endif /* These are global because we need them in sys/pci/if_an_p.c. */ -static void an_reset __P((struct an_softc *)); -static int an_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void an_init __P((void *)); -static int an_init_tx_ring __P((struct an_softc *)); -static void an_start __P((struct ifnet *)); -static void an_watchdog __P((struct ifnet *)); -static void an_rxeof __P((struct an_softc *)); -static void an_txeof __P((struct an_softc *, int)); +static void an_reset (struct an_softc *); +static int an_ioctl (struct ifnet *, u_long, caddr_t); +static void an_init (void *); +static int an_init_tx_ring (struct an_softc *); +static void an_start (struct ifnet *); +static void an_watchdog (struct ifnet *); +static void an_rxeof (struct an_softc *); +static void an_txeof (struct an_softc *, int); -static void an_promisc __P((struct an_softc *, int)); -static int an_cmd __P((struct an_softc *, int, int)); -static int an_read_record __P((struct an_softc *, struct an_ltv_gen *)); -static int an_write_record __P((struct an_softc *, struct an_ltv_gen *)); -static int an_read_data __P((struct an_softc *, int, - int, caddr_t, int)); -static int an_write_data __P((struct an_softc *, int, - int, caddr_t, int)); -static int an_seek __P((struct an_softc *, int, int, int)); -static int an_alloc_nicmem __P((struct an_softc *, int, int *)); -static void an_stats_update __P((void *)); -static void an_setdef __P((struct an_softc *, struct an_req *)); +static void an_promisc (struct an_softc *, int); +static int an_cmd (struct an_softc *, int, int); +static int an_read_record (struct an_softc *, struct an_ltv_gen *); +static int an_write_record (struct an_softc *, struct an_ltv_gen *); +static int an_read_data (struct an_softc *, int, int, caddr_t, int); +static int an_write_data (struct an_softc *, int, int, caddr_t, int); +static int an_seek (struct an_softc *, int, int, int); +static int an_alloc_nicmem (struct an_softc *, int, int *); +static void an_stats_update (void *); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 19 22:29:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B01D37B405; Tue, 19 Mar 2002 22:28:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 30CF037B400 for ; Tue, 19 Mar 2002 22:28:01 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2K6RLK03878 for perforce@freebsd.org; Tue, 19 Mar 2002 22:27:21 -0800 (PST) (envelope-from jake@freebsd.org) Date: Tue, 19 Mar 2002 22:27:21 -0800 (PST) Message-Id: <200203200627.g2K6RLK03878@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8023 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8023 Change 8023 by jake@jake_sparc64 on 2002/03/19 22:26:27 Integ. This gets rid of greenvm, but instead we get uma and the __P fiasco, so its a bit of a trade off. Affected files ... ... //depot/projects/sparc64/Makefile.inc1#2 integrate ... //depot/projects/sparc64/Makefile.upgrade#2 integrate ... //depot/projects/sparc64/UPDATING#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/BNF#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/BSD/Makefile#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/BSD/kupgrade#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/FreeBSD-2.2/kinstall#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/FreeBSD-3/kinstall#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4#1 branch ... //depot/projects/sparc64/contrib/ipfilter/FreeBSD-4.0/kinstall#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/FreeBSD/kinstall#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/HISTORY#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/INSTALL.FreeBSD#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/IPFILTER.LICENCE#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/Makefile#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/common.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/etc/protocols#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/fils.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/inet_addr.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ip_ipsec_pxy.c#1 branch ... //depot/projects/sparc64/contrib/ipfilter/ip_lfil.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ip_netbios_pxy.c#1 branch ... //depot/projects/sparc64/contrib/ipfilter/ip_sfil.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipf.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipf.h#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipfs.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipft_ef.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipft_hx.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipft_pc.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipft_sn.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipft_td.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipft_tx.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/iplang/iplang_y.y#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipmon.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipnat.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/44arp.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/arp.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/ip.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/ipresend.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/ipsend.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/ipsopt.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/iptest.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/iptests.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/lsock.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/resend.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/sbpf.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/sirix.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/sock.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipt.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/kmem.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/kmem.h#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/man/Makefile#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/man/ipf.4#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/man/ipfilter.5#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/man/ipfs.8#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/man/ipl.4#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/man/ipmon.8#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/man/ipnat.5#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/man/ipnat.8#1 branch ... //depot/projects/sparc64/contrib/ipfilter/misc.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/mlf_ipl.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/mli_ipl.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/mln_ipl.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/natparse.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/opt.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/parse.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/printnat.c#1 branch ... //depot/projects/sparc64/contrib/ipfilter/printstate.c#1 branch ... //depot/projects/sparc64/contrib/ipfilter/samples/Makefile#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/samples/proxy.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/solaris.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/test/Makefile#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/test/expected/f15#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/expected/f16#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/expected/l1#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/expected/l1.b#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/expected/ni1#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/expected/ni2#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/input/f15#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/input/f16#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/input/ipf6-1#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/input/l1#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/input/ni1#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/input/ni2#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/logtest#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/mtest#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/natipftest#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/f15#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/f16#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/ipf6-1#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/l1#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/ni1.ipf#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/ni1.nat#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/ni2.ipf#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/ni2.nat#1 branch ... //depot/projects/sparc64/contrib/ipfilter/todo#2 integrate ... //depot/projects/sparc64/contrib/one-true-awk/README#2 integrate ... //depot/projects/sparc64/contrib/one-true-awk/main.c#2 integrate ... //depot/projects/sparc64/contrib/one-true-awk/makefile#1 branch ... //depot/projects/sparc64/contrib/perl5/AUTHORS#2 integrate ... //depot/projects/sparc64/contrib/perl5/Changes#2 integrate ... //depot/projects/sparc64/contrib/perl5/Changes5.004#2 integrate ... //depot/projects/sparc64/contrib/perl5/Configure#2 integrate ... //depot/projects/sparc64/contrib/perl5/EXTERN.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/INSTALL#2 integrate ... //depot/projects/sparc64/contrib/perl5/INTERN.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/MAINTAIN#2 delete ... //depot/projects/sparc64/contrib/perl5/MANIFEST#2 integrate ... //depot/projects/sparc64/contrib/perl5/Makefile.SH#2 integrate ... //depot/projects/sparc64/contrib/perl5/Policy_sh.SH#2 integrate ... //depot/projects/sparc64/contrib/perl5/Porting/Contract#2 integrate ... //depot/projects/sparc64/contrib/perl5/Porting/Glossary#2 integrate ... //depot/projects/sparc64/contrib/perl5/Porting/config.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/Porting/config_H#2 integrate ... //depot/projects/sparc64/contrib/perl5/Porting/genlog#2 integrate ... //depot/projects/sparc64/contrib/perl5/Porting/makerel#2 integrate ... //depot/projects/sparc64/contrib/perl5/Porting/p4desc#2 integrate ... //depot/projects/sparc64/contrib/perl5/Porting/patching.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/Porting/pumpkin.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/Porting/repository.pod#1 branch ... //depot/projects/sparc64/contrib/perl5/README#2 integrate ... //depot/projects/sparc64/contrib/perl5/README.Y2K#2 integrate ... //depot/projects/sparc64/contrib/perl5/README.posix-bc#2 delete ... //depot/projects/sparc64/contrib/perl5/Todo#2 integrate ... //depot/projects/sparc64/contrib/perl5/Todo-5.005#2 delete ... //depot/projects/sparc64/contrib/perl5/Todo-5.6#2 integrate ... //depot/projects/sparc64/contrib/perl5/XSlock.h#2 delete ... //depot/projects/sparc64/contrib/perl5/av.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/av.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/bytecode.h#2 delete ... //depot/projects/sparc64/contrib/perl5/bytecode.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/byterun.c#2 delete ... //depot/projects/sparc64/contrib/perl5/byterun.h#2 delete ... //depot/projects/sparc64/contrib/perl5/cflags.SH#2 integrate ... //depot/projects/sparc64/contrib/perl5/config_h.SH#2 integrate ... //depot/projects/sparc64/contrib/perl5/configpm#2 integrate ... //depot/projects/sparc64/contrib/perl5/configure.com#2 integrate ... //depot/projects/sparc64/contrib/perl5/configure.gnu#2 integrate ... //depot/projects/sparc64/contrib/perl5/cop.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/cv.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/deb.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/doio.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/doop.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/dosish.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/dump.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/ebcdic.c#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/dna.small.gif.uu#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/wilogo.gif.uu#2 delete ... //depot/projects/sparc64/contrib/perl5/embed.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/embed.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/embedvar.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Asmdata.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Assembler.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Bytecode.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B/C.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B/CC.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Concise.pm#1 branch ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Debug.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Deparse.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Disassembler.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Lint.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Showlex.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Stash.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Terse.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/Makefile.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/O.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/byteperl.c#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/defsubs_h.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/B/ramblings/flip-flop#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/ByteLoader/ByteLoader.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/ByteLoader/ByteLoader.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/ByteLoader/bytecode.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/ByteLoader/byterun.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/ByteLoader/byterun.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/Changes#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/DB_File.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/DB_File.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/Makefile.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/dbinfo#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/typemap#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/version.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Data/Dumper/Dumper.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Data/Dumper/Dumper.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Devel/DProf/DProf.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Devel/Peek/Makefile.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Devel/Peek/Peek.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Devel/Peek/Peek.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/DynaLoader_pm.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/XSLoader_pm.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_aix.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_cygwin32.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_dllload.xs#1 branch ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_dlopen.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_mac.xs#1 branch ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/hints/aix.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/hints/netbsd.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/ext/Errno/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Errno/Errno_pm.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Fcntl/Fcntl.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/File/Glob/Changes#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/File/Glob/Glob.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/File/Glob/Glob.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/File/Glob/bsd_glob.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/File/Glob/bsd_glob.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/GDBM_File/GDBM_File.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/GDBM_File/GDBM_File.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/GDBM_File/typemap#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/IO/IO.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Handle.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Poll.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Seekable.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Select.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Socket.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Socket/INET.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Socket/UNIX.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/Makefile.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/SysV.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/Makefile.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/NDBM_File.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/NDBM_File.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/typemap#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/ODBM_File.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/ODBM_File.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/typemap#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Opcode/Opcode.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Opcode/Opcode.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/Makefile.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/POSIX.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/POSIX.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/POSIX.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/hints/svr4.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/typemap#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/SDBM_File.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/SDBM_File.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/dbm.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/dbm.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/sdbm.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/typemap#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Socket/Socket.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Socket/Socket.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Sys/Syslog/Syslog.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Sys/Syslog/Syslog.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Thread/Thread.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/Thread/Thread.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/re/Makefile.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/ext/re/hints/aix.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/ext/re/re.xs#2 integrate ... //depot/projects/sparc64/contrib/perl5/form.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/global.sym#2 integrate ... //depot/projects/sparc64/contrib/perl5/globals.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/gv.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/gv.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/handy.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/README.hints#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/aix.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/bsdos.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/cygwin.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/cygwin32.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/darwin.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/dec_osf.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/dos_djgpp.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/freebsd.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/hpux.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/irix_6.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/linux.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/machten.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/mint.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/mpeix.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/nonstopux.sh#1 branch ... //depot/projects/sparc64/contrib/perl5/hints/openbsd.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/os2.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/os390.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/posix-bc.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/powerux.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/solaris_2.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/svr4.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/titanos.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/unicos.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/uts.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hints/vmesa.sh#2 integrate ... //depot/projects/sparc64/contrib/perl5/hv.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/hv.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/installhtml#2 integrate ... //depot/projects/sparc64/contrib/perl5/installman#2 integrate ... //depot/projects/sparc64/contrib/perl5/installperl#2 integrate ... //depot/projects/sparc64/contrib/perl5/interp.sym#2 delete ... //depot/projects/sparc64/contrib/perl5/intrpvar.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/iperlsys.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/AutoLoader.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/AutoSplit.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Benchmark.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/CGI.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/CGI/Apache.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/CGI/Carp.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/CGI/Cookie.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/CGI/Fast.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/CGI/Pretty.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/CGI/Push.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/CGI/Switch.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/CPAN.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/CPAN/FirstTime.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Carp/Heavy.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Class/Struct.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Cwd.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/English.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Command.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Embed.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Install.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Liblist.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/MM_Cygwin.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/MM_OS2.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/MM_Unix.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/MM_VMS.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/MM_Win32.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/MakeMaker.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Manifest.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Mksymlists.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/typemap#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/xsubpp#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/File/Basename.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/File/Copy.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/File/Find.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/File/Path.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/Epoc.pm#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/Functions.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/Mac.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/OS2.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/Unix.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/VMS.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/Win32.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/File/Temp.pm#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/FileHandle.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Getopt/Long.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/IPC/Open3.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Math/BigFloat.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Math/BigInt.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Math/Complex.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Math/Trig.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Net/Ping.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Net/protoent.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Checker.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Find.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Functions.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Html.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Pod/InputObjects.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Pod/LaTeX.pm#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Man.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Pod/ParseUtils.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Parser.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Select.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Text.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Text/Color.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Text/Overstrike.pm#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Text/Termcap.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Usage.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/SelfLoader.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Shell.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Symbol.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Sys/Hostname.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Sys/Syslog.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Term/ANSIColor.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Term/ReadLine.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Test.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Test/Harness.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Text/ParseWords.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Text/Soundex.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Text/Tabs.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Text/Wrap.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Tie/Array.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Tie/Handle.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Tie/Hash.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Tie/RefHash.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Tie/Scalar.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Tie/SubstrHash.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/Win32.pod#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/base.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/bigint.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/bytes.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/charnames.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/diagnostics.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/fields.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/ftp.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/getopts.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/integer.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/lib.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/overload.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/perl5db.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/strict.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/syslog.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/termcap.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/ArabLink.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/ArabLnkGrp.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/ArabShap.txt#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/BidiMirr.txt#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Bidirectional.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Block.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/CaseFold.txt#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Category.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/CombiningClass.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/CompExcl.txt#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Decomposition.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/AlphabeticPresentationForms.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Arabic.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/ArabicPresentationForms-A.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/ArabicPresentationForms-B.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Armenian.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Arrows.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/BasicLatin.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Bengali.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/BlockElements.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Bopomofo.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/BopomofoExtended.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/BoxDrawing.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/BraillePatterns.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKCompatibility.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKCompatibilityForms.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKCompatibilityIdeographs.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKRadicalsSupplement.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKSymbolsandPunctuation.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKUnifiedIdeographs.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKUnifiedIdeographsExtensionA.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Cherokee.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CombiningDiacriticalMarks.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CombiningHalfMarks.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CombiningMarksforSymbols.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/ControlPictures.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CurrencySymbols.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Cyrillic.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Devanagari.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Dingbats.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/EnclosedAlphanumerics.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/EnclosedCJKLettersandMonths.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Ethiopic.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/GeneralPunctuation.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/GeometricShapes.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Georgian.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Greek.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/GreekExtended.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Gujarati.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Gurmukhi.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/HalfwidthandFullwidthForms.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/HangulCompatibilityJamo.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/HangulJamo.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/HangulSyllables.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Hebrew.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/HighPrivateUseSurrogates.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/HighSurrogates.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Hiragana.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/IPAExtensions.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/IdeographicDescriptionCharacters.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Kanbun.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/KangxiRadicals.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Kannada.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Katakana.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Khmer.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Lao.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Latin-1Supplement.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/LatinExtended-A.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/LatinExtended-B.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/LatinExtendedAdditional.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/LetterlikeSymbols.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/LowSurrogates.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Malayalam.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/MathematicalOperators.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/MiscellaneousSymbols.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/MiscellaneousTechnical.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Mongolian.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Myanmar.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/NumberForms.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Ogham.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/OpticalCharacterRecognition.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Oriya.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/PrivateUse.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Runic.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Sinhala.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/SmallFormVariants.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/SpacingModifierLetters.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Specials.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/SuperscriptsandSubscripts.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Syriac.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Tamil.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Telugu.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Thaana.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Thai.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Tibetan.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/UnifiedCanadianAboriginalSyllabics.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/YiRadicals.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/YiSyllables.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/ASCII.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Alnum.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Alpha.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiAL.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiAN.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiB.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiBN.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiCS.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiEN.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiES.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiET.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiL.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiLRE.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiLRO.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiNSM.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiON.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiPDF.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiR.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiRLE.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiRLO.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiS.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiWS.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Blank.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/C.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Cc.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Cf.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Cn.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Cntrl.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Co.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Cs.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCcircle.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCcompat.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCfinal.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCfont.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCfraction.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCinital.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCinitial.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCisolated.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCmedial.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCnarrow.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCnoBreak.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCsmall.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCsquare.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCsub.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCsuper.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCvertical.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCwide.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DecoCanon.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DecoCompat.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Digit.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Graph.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/L.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkAI.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkAL.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkB2.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkBA.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkBB.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkBK.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkCB.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkCL.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkCM.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkCR.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkEX.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkGL.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkHY.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkID.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkIN.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkIS.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkLF.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkNS.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkNU.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkOP.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkPO.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkPR.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkQU.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkSA.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkSG.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkSP.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkSY.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkXX.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkZW.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Ll.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Lm.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Lo.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Lower.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Lt.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Lu.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/M.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Mc.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Me.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Mirrored.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Mn.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/N.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Nd.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Nl.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/No.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/P.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Pc.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Pd.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Pe.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Pf.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Pi.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Po.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Print.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Ps.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Punct.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/S.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Sc.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Sk.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Sm.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/So.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Space.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SpacePerl.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylA.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylAA.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylAAI.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylAI.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylC.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylE.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylEE.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylI.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylII.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylN.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylO.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylOO.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylU.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylV.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylWA.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylWAA.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylWC.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylWE.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylWEE.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylWI.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylWII.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylWO.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylWOO.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylWU.pl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylWV.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Upper.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Word.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/XDigit.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Z.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Zl.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Zp.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Zs.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Jamo.txt#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/JamoShort.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Makefile#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Name.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Number.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/PropList.txt#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Props.txt#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/README.perl#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/ReadMe.txt#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/SpecCase.txt#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/To/Digit.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/To/Lower.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/To/Title.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/To/Upper.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/UCD300.html#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/UCD301.html#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/UCDFF301.html#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Unicode.300#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Unicode.301#1 branch ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Unicode3.html#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/mktables.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/unicode/syllables.txt#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/utf8.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/vars.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/warnings.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/lib/warnings/register.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/makedef.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/makedepend.SH#2 integrate ... //depot/projects/sparc64/contrib/perl5/malloc.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/mg.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/mg.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/minimod.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/myconfig#2 delete ... //depot/projects/sparc64/contrib/perl5/myconfig.SH#2 integrate ... //depot/projects/sparc64/contrib/perl5/objXSUB.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/objpp.h#2 delete ... //depot/projects/sparc64/contrib/perl5/op.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/op.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/opcode.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/opcode.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/opnames.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/patchlevel.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/perl.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/perl.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/perl_exp.SH#2 delete ... //depot/projects/sparc64/contrib/perl5/perlapi.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/perlapi.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/perlio.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/perlsdio.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/perlsfio.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/perly.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/perly.y#2 integrate ... //depot/projects/sparc64/contrib/perl5/perly_c.diff#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/Makefile#2 delete ... //depot/projects/sparc64/contrib/perl5/pod/Makefile.SH#1 branch ... //depot/projects/sparc64/contrib/perl5/pod/Win32.pod#2 delete ... //depot/projects/sparc64/contrib/perl5/pod/buildtoc#2 delete ... //depot/projects/sparc64/contrib/perl5/pod/buildtoc.PL#1 branch ... //depot/projects/sparc64/contrib/perl5/pod/perl.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perl5004delta.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perl5005delta.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlapi.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlbook.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlboot.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlcall.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlclib.pod#1 branch ... //depot/projects/sparc64/contrib/perl5/pod/perlcompile.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perldata.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perldbmfilter.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perldebguts.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perldebtut.pod#1 branch ... //depot/projects/sparc64/contrib/perl5/pod/perldebug.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perldelta.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perldiag.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlebcdic.pod#1 branch ... //depot/projects/sparc64/contrib/perl5/pod/perlembed.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlfaq.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlfaq1.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlfaq2.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlfaq3.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlfaq4.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlfaq5.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlfaq6.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlfaq7.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlfaq8.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlfaq9.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlfilter.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlfork.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlfunc.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlguts.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlhack.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlhist.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlintern.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlipc.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perllexwarn.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perllocale.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perllol.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlmod.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlmodinstall.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlmodlib.PL#1 branch ... //depot/projects/sparc64/contrib/perl5/pod/perlmodlib.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlnewmod.pod#1 branch ... //depot/projects/sparc64/contrib/perl5/pod/perlnumber.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlobj.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlop.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlopentut.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlpod.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlport.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlre.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlreftut.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlrequick.pod#1 branch ... //depot/projects/sparc64/contrib/perl5/pod/perlretut.pod#1 branch ... //depot/projects/sparc64/contrib/perl5/pod/perlrun.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlsec.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlsub.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlsyn.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlthrtut.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perltie.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perltoc.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perltodo.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perltoot.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perltootc.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perltrap.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlunicode.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlutil.pod#1 branch ... //depot/projects/sparc64/contrib/perl5/pod/perlvar.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlxs.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/perlxstut.pod#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/pod2latex.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/pod2man.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/pod2text.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/pod2usage.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/podchecker.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/podselect.PL#2 integrate ... //depot/projects/sparc64/contrib/perl5/pod/roffitall#2 integrate ... //depot/projects/sparc64/contrib/perl5/pp.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/pp.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/pp.sym#2 integrate ... //depot/projects/sparc64/contrib/perl5/pp_ctl.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/pp_hot.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/pp_proto.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/pp_sys.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/proto.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/regcomp.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/regcomp.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/regcomp.pl#2 integrate ... //depot/projects/sparc64/contrib/perl5/regexec.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/regexp.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/regnodes.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/run.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/scope.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/scope.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/sv.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/sv.h#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/README#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/TEST#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/UTEST#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/base/lex.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/base/rs.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/base/term.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/comp/bproto.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/comp/colon.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/comp/cpp.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/comp/proto.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/comp/require.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/comp/use.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/harness#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/io/argv.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/io/fs.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/io/open.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/io/openpid.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/io/pipe.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/io/tell.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/abbrev.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/ansicolor.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/anydbm.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/attrs.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/autoloader.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/b.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/basename.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/bigfltpm.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/bigint.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/bigintpm.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/cgi-esc.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/cgi-form.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/cgi-function.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/cgi-html.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/cgi-pretty.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/cgi-request.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/charnames.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/checktree.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/class-struct.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/complex.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/db-btree.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/db-hash.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/db-recno.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/dirhand.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/dosglob.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/dprof.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/dprof/V.pm#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/dumper-ovl.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/dumper.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/english.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/env-array.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/env.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/errno.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/fatal.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/fields.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/filecache.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/filecopy.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/filefind.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/filefunc.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/filehand.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/filepath.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/filespec.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/findbin.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/ftmp-mktemp.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/ftmp-posix.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/ftmp-security.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/ftmp-tempfile.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/gdbm.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/getopt.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/glob-basic.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/glob-case.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/glob-global.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/glob-taint.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/gol-basic.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/gol-compat.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/gol-linkage.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/gol-oo.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/h2ph.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/hostname.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_const.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_dir.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_dup.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_linenum.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_multihomed.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_pipe.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_poll.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_sel.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_sock.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_taint.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_tell.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_udp.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_unix.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/io_xs.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/ipc_sysv.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/ndbm.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/odbm.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/opcode.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/open2.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/open3.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/ops.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/parsewords.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/peek.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/ph.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/posix.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/safe1.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/safe2.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/sdbm.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/searchdict.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/selectsaver.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/selfloader.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/socket.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/soundex.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/symbol.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/syslfs.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/syslog.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/textfill.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/texttabs.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/textwrap.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/thr5005.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/thread.t#2 delete ... //depot/projects/sparc64/contrib/perl5/t/lib/tie-push.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/tie-refhash.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/tie-splice.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/tie-stdarray.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/tie-stdhandle.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/tie-stdpush.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/tie-substrhash.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/lib/timelocal.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/lib/trig.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/64bitint.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/anonsub.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/op/append.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/args.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/arith.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/array.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/assignwarn.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/attrs.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/avhv.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/bop.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/chop.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/closure.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/concat.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/op/defins.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/die_exit.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/exists_sub.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/filetest.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/flip.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/fork.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/glob.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/goto_xs.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/grent.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/groups.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/gv.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/hashwarn.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/int.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/join.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/length.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/op/lex_assign.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/lfs.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/local.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/lop.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/magic.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/method.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/misc.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/mkdir.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/my.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/my_stash.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/op/nothr5005.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/nothread.t#2 delete ... //depot/projects/sparc64/contrib/perl5/t/op/numconvert.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/oct.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/pack.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/pat.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/pos.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/pwent.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/quotemeta.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/rand.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/re_tests#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/readdir.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/regexp.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/regmesg.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/op/reverse.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/op/runlevel.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/sort.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/split.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/sprintf.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/stat.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/subst.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/subst_amp.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/substr.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/taint.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/tie.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/tiearray.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/tiehandle.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/tr.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/undef.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/universal.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/utf8decode.t#1 branch ... //depot/projects/sparc64/contrib/perl5/t/op/vec.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/ver.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/wantarray.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/op/write.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/pod/emptycmd.t#2 integrate ... //depot/projects/sparc64/contrib/perl5/t/pod/find.t#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 1:23:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CBA537B404; Wed, 20 Mar 2002 01:23:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from finch-post-11.mail.demon.net (finch-post-11.mail.demon.net [194.217.242.39]) by hub.freebsd.org (Postfix) with ESMTP id B19EB37B400; Wed, 20 Mar 2002 01:23:40 -0800 (PST) Received: from mailgate.nlsystems.com ([62.49.251.130] helo=herring.nlsystems.com) by finch-post-11.mail.demon.net with esmtp (Exim 3.35 #1) id 16ncJm-000Ou7-0B; Wed, 20 Mar 2002 09:23:39 +0000 Received: from salmon.nlsystems.com (salmon [10.0.0.3]) by herring.nlsystems.com (8.11.2/8.11.2) with ESMTP id g2K9MN912494; Wed, 20 Mar 2002 09:22:23 GMT (envelope-from dfr@nlsystems.com) Date: Wed, 20 Mar 2002 09:19:02 +0000 (GMT) From: Doug Rabson To: John Baldwin Cc: Peter Wemm , Perforce Change Reviews Subject: Re: PERFORCE change 7933 for review In-Reply-To: Message-ID: <20020320091812.F99274-100000@salmon.nlsystems.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, 19 Mar 2002, John Baldwin wrote: > > On 19-Mar-2002 Peter Wemm wrote: > > > > Actually, this should use the proper API's instead of hacking around like > > this. > > Fair enough, wasn't sure if it could be using bus_alloc_resource() like a Good > Little Device Driver or not. I think this might be part of the 'early console' part of the driver. The normal device driver support framework isn't available yet. -- Doug Rabson Mail: dfr@nlsystems.com Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 7:26:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3494937B405; Wed, 20 Mar 2002 07:26:25 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7553B37B404 for ; Wed, 20 Mar 2002 07:26:24 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2KFQOq82526 for perforce@freebsd.org; Wed, 20 Mar 2002 07:26:24 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Mar 2002 07:26:24 -0800 (PST) Message-Id: <200203201526.g2KFQOq82526@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8052 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8052 Change 8052 by rwatson@rwatson_tislabs on 2002/03/20 07:26:18 Rewrite the abstract to make use of stronger language, and to more effectively lay out the strategy of the document. Affected files ... ... //depot/projects/smpng/sys/design/article.sgml#15 edit Differences ... ==== //depot/projects/smpng/sys/design/article.sgml#15 (text+ko) ==== @@ -23,7 +23,7 @@ - $SMPng: //depot/projects/smpng/sys/design/article.sgml#14 $ + $SMPng: //depot/projects/smpng/sys/design/article.sgml#15 $ 2002 @@ -31,12 +31,16 @@ - This document attempts to present the design of SMPng thus - far. It will most likely be a loose collection of ideas for - the time being. I am by no means authoritative, this is just - my view of where SMPng is going and needs to go. It also - includes a few other random notes which aren't directly - related to SMPng. + This document presents the current design and implementation of + the SMPng Architecture. First, the basic primitives and tools are + introduced. Next, a general architecture for the FreeBSD kernel's + synchronization and execution model is laid out. Then, locking + strategies for specific subsystems are discussed, documenting the + approaches taken to introduce fine-grained synchronization and + parallelism for each subsystem. Finally, detailed implementation + notes are provided to motivate design choices, and make the reader + aware of important implications involving the use of specific + primitives. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 7:31:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCCAA37B400; Wed, 20 Mar 2002 07:31:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DD6EB37B404 for ; Wed, 20 Mar 2002 07:31:30 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2KFVUT83636 for perforce@freebsd.org; Wed, 20 Mar 2002 07:31:30 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Mar 2002 07:31:30 -0800 (PST) Message-Id: <200203201531.g2KFVUT83636@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8053 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8053 Change 8053 by rwatson@rwatson_tislabs on 2002/03/20 07:30:43 Strengthen language in the introduction, and re-order things a little. Refer to the document as a WIP rather than a brain dump, since some more editing and contributions have come since its inception as a brain dump. Appeal to the reader for submissions. Affected files ... ... //depot/projects/smpng/sys/design/article.sgml#16 edit Differences ... ==== //depot/projects/smpng/sys/design/article.sgml#16 (text+ko) ==== @@ -23,7 +23,7 @@ - $SMPng: //depot/projects/smpng/sys/design/article.sgml#15 $ + $SMPng: //depot/projects/smpng/sys/design/article.sgml#16 $ 2002 @@ -47,15 +47,20 @@ Introduction - This is basically a partial brain dump. It certainly won't - be but so organized in the early versions. To avoid confusion, - you might want to glance over the . + This document is a work-in-progress, and will be updated to + reflect on-going design and implementation activities associated + with the SMPng Project. Many sections currently exist only in + outline form, but will be fleshed out as work proceeds. Updates or + suggestions regarding the document may be directed to the document + editors. The goal of SMPng is to allow concurrency in the kernel. The kernel is basically one rather large and complex program. To make the kernel multithreaded we use some of the same tools used to make other programs multithreaded. These include mutexes, - reader/writer locks, semaphores, and condition variables. + reader/writer locks, semaphores, and condition variables. For + definitions of many of the terms, please see + . To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 7:40:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E22937B404; Wed, 20 Mar 2002 07:40:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3EA1037B405 for ; Wed, 20 Mar 2002 07:40:42 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2KFegE85239 for perforce@freebsd.org; Wed, 20 Mar 2002 07:40:42 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Mar 2002 07:40:42 -0800 (PST) Message-Id: <200203201540.g2KFegE85239@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8054 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8054 Change 8054 by rwatson@rwatson_tislabs on 2002/03/20 07:40:05 Replace my first pass at taskqueue description with a detailed one provided by arr. Affected files ... ... //depot/projects/smpng/sys/design/article.sgml#17 edit Differences ... ==== //depot/projects/smpng/sys/design/article.sgml#17 (text+ko) ==== @@ -23,7 +23,7 @@ - $SMPng: //depot/projects/smpng/sys/design/article.sgml#16 $ + $SMPng: //depot/projects/smpng/sys/design/article.sgml#17 $ 2002 @@ -546,14 +546,18 @@ Taskqueue - The taskqueue's locking strategy is simple. There is a mutex, - taskqueue_queues_mutex, that covers the - taskqueue_queues TAILQ. Also there is mutex in - the struct taskqueue data structure, which - is used to protect the elements of the structure. - - - Need to add mutex name, talk about shared vs. exclusive - access and use of the mutex. Is it a leaf mutex? + The taskqueue's interface has two basic locks associated + with it in order to protect the related shared data. The + taskqueue_queues_mutex is meant to serve as a + lock to protect the taskqueue_queues TAILQ. + The other mutex lock associated with this system is the one in the + struct taskqueue data structure. The + use of the synchronization primitive here is to protect the + integrity of the data in the struct + taskqueue. It should be noted that there are no + separate macros to assist the user in locking down his/her own work + since these locks are most likely not going to be used outside of + subr_taskqueue.c. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 7:45:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9133D37B417; Wed, 20 Mar 2002 07:45:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C71F137B416 for ; Wed, 20 Mar 2002 07:45:48 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2KFjm186010 for perforce@freebsd.org; Wed, 20 Mar 2002 07:45:48 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Mar 2002 07:45:48 -0800 (PST) Message-Id: <200203201545.g2KFjm186010@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8055 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8055 Change 8055 by rwatson@rwatson_tislabs on 2002/03/20 07:45:41 Add a description of the kernel module locking. Submitted by: arr Affected files ... ... //depot/projects/smpng/sys/design/article.sgml#18 edit Differences ... ==== //depot/projects/smpng/sys/design/article.sgml#18 (text+ko) ==== @@ -23,7 +23,7 @@ - $SMPng: //depot/projects/smpng/sys/design/article.sgml#17 $ + $SMPng: //depot/projects/smpng/sys/design/article.sgml#18 $ 2002 @@ -486,6 +486,23 @@ + Modules + + For the module subsystem there exists a single lock that is + used to protect the shared data. This lock is a shared/exclusive + (SX) lock and has a good chance of needing to be acquired (shared + or exclusively), there fore there are a few macros that have been + added to make access to the lock more easy. These macros can be + located in sys/module.h and are quite basic + in terms of usage. The main structures protected under this lock + are the module_t structures (when shared) + and the global modulelist_t structure, + modules. One should review the related source code in + kern/kern_module.c to further understand the + locking strategy. + + + Newbus Device Tree The newbus system will have one sx lock. Readers will To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 7:46:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 439A137B400; Wed, 20 Mar 2002 07:46:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7F1E637B417 for ; Wed, 20 Mar 2002 07:46:50 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2KFkoX86235 for perforce@freebsd.org; Wed, 20 Mar 2002 07:46:50 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Mar 2002 07:46:50 -0800 (PST) Message-Id: <200203201546.g2KFkoX86235@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8056 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8056 Change 8056 by rwatson@rwatson_tislabs on 2002/03/20 07:46:16 Universally name kernel files with parths relative to src/sys/. Affected files ... ... //depot/projects/smpng/sys/design/article.sgml#19 edit Differences ... ==== //depot/projects/smpng/sys/design/article.sgml#19 (text+ko) ==== @@ -23,7 +23,7 @@ - $SMPng: //depot/projects/smpng/sys/design/article.sgml#18 $ + $SMPng: //depot/projects/smpng/sys/design/article.sgml#19 $ 2002 @@ -574,7 +574,7 @@ taskqueue. It should be noted that there are no separate macros to assist the user in locking down his/her own work since these locks are most likely not going to be used outside of - subr_taskqueue.c. + kern/subr_taskqueue.c. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 7:49:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48F4F37B419; Wed, 20 Mar 2002 07:49:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7BDD837B400 for ; Wed, 20 Mar 2002 07:49:03 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2KFn3X86699 for perforce@freebsd.org; Wed, 20 Mar 2002 07:49:03 -0800 (PST) (envelope-from green@freebsd.org) Date: Wed, 20 Mar 2002 07:49:03 -0800 (PST) Message-Id: <200203201549.g2KFn3X86699@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8058 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8058 Change 8058 by green@green_laptop_2 on 2002/03/20 07:48:34 Hrm, forgot to commit the modification of cr_endcopy. Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/ucred.h#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/ucred.h#7 (text+ko) ==== @@ -61,8 +61,8 @@ struct uidinfo *cr_uidinfo; /* per euid resource consumption */ struct uidinfo *cr_ruidinfo; /* per ruid resource consumption */ struct prison *cr_prison; /* jail(4) */ +#define cr_endcopy cr_label struct mac cr_label; /* mandatory access control label */ -#define cr_endcopy cr_mtxp struct mtx *cr_mtxp; /* protect refcount */ }; #define cr_gid cr_groups[0] To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 7:49:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D587137B404; Wed, 20 Mar 2002 07:48:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D0FD237B405 for ; Wed, 20 Mar 2002 07:48:01 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2KFlqE86423 for perforce@freebsd.org; Wed, 20 Mar 2002 07:47:52 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 20 Mar 2002 07:47:52 -0800 (PST) Message-Id: <200203201547.g2KFlqE86423@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8057 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8057 Change 8057 by jhb@jhb_laptop on 2002/03/20 07:47:09 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#12 integrate ... //depot/projects/smpng/sys/alpha/alpha/pmap.c#25 integrate ... //depot/projects/smpng/sys/alpha/alpha/promcons.c#6 integrate ... //depot/projects/smpng/sys/boot/common/isapnp.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/efifs.c#4 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_low.c#5 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_low.h#2 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_low_pisa.h#2 integrate ... //depot/projects/smpng/sys/coda/coda_fbsd.c#2 integrate ... //depot/projects/smpng/sys/coda/coda_vfsops.c#7 integrate ... //depot/projects/smpng/sys/coda/coda_vnops.h#4 integrate ... //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#11 integrate ... //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#6 integrate ... //depot/projects/smpng/sys/compat/linux/linux_ipc.h#4 integrate ... //depot/projects/smpng/sys/compat/linux/linux_mib.h#3 integrate ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#15 integrate ... //depot/projects/smpng/sys/compat/linux/linux_signal.h#4 integrate ... //depot/projects/smpng/sys/compat/linux/linux_util.h#6 integrate ... //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#7 integrate ... //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#4 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_exec.h#3 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#7 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#5 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.h#3 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#2 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#9 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#3 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_resource.c#5 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_signal.c#4 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_signal.h#2 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_socket.h#3 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_sockio.c#3 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#5 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#6 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_stropts.h#2 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_termios.c#4 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_ttold.c#3 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_util.h#3 integrate ... //depot/projects/smpng/sys/contrib/dev/fla/fla.c#3 integrate ... //depot/projects/smpng/sys/crypto/blowfish/blowfish.h#3 integrate ... //depot/projects/smpng/sys/crypto/cast128/cast128.h#3 integrate ... //depot/projects/smpng/sys/crypto/des/des.h#3 integrate ... //depot/projects/smpng/sys/crypto/md5.c#2 integrate ... //depot/projects/smpng/sys/crypto/md5.h#2 integrate ... //depot/projects/smpng/sys/crypto/sha1.c#2 integrate ... //depot/projects/smpng/sys/crypto/sha1.h#2 integrate ... //depot/projects/smpng/sys/crypto/sha2/sha2.h#2 integrate ... //depot/projects/smpng/sys/ddb/db_access.h#2 integrate ... //depot/projects/smpng/sys/ddb/db_break.c#3 integrate ... //depot/projects/smpng/sys/ddb/db_break.h#3 integrate ... //depot/projects/smpng/sys/ddb/db_command.c#6 integrate ... //depot/projects/smpng/sys/ddb/db_command.h#2 integrate ... //depot/projects/smpng/sys/ddb/db_examine.c#2 integrate ... //depot/projects/smpng/sys/ddb/db_expr.c#2 integrate ... //depot/projects/smpng/sys/ddb/db_input.c#3 integrate ... //depot/projects/smpng/sys/ddb/db_lex.c#3 integrate ... //depot/projects/smpng/sys/ddb/db_lex.h#2 integrate ... //depot/projects/smpng/sys/ddb/db_output.c#2 integrate ... //depot/projects/smpng/sys/ddb/db_output.h#2 integrate ... //depot/projects/smpng/sys/ddb/db_run.c#4 integrate ... //depot/projects/smpng/sys/ddb/db_sym.c#2 integrate ... //depot/projects/smpng/sys/ddb/db_sym.h#2 integrate ... //depot/projects/smpng/sys/ddb/db_variables.c#2 integrate ... //depot/projects/smpng/sys/ddb/db_variables.h#2 integrate ... //depot/projects/smpng/sys/ddb/db_watch.c#2 integrate ... //depot/projects/smpng/sys/ddb/ddb.h#2 integrate ... //depot/projects/smpng/sys/dev/acpica/acpivar.h#15 integrate ... //depot/projects/smpng/sys/dev/aic/aic.c#4 integrate ... //depot/projects/smpng/sys/dev/aic/aic_cbus.c#2 integrate ... //depot/projects/smpng/sys/dev/aic/aic_isa.c#2 integrate ... //depot/projects/smpng/sys/dev/aic/aicvar.h#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate ... //depot/projects/smpng/sys/dev/an/if_an.c#14 integrate ... //depot/projects/smpng/sys/dev/an/if_an_isa.c#3 integrate ... //depot/projects/smpng/sys/dev/an/if_an_pci.c#6 integrate ... //depot/projects/smpng/sys/dev/an/if_anreg.h#5 integrate ... //depot/projects/smpng/sys/dev/asr/asr.c#7 integrate ... //depot/projects/smpng/sys/dev/awi/am79c930.c#2 integrate ... //depot/projects/smpng/sys/dev/awi/am79c930var.h#2 integrate ... //depot/projects/smpng/sys/dev/awi/awi.c#3 integrate ... //depot/projects/smpng/sys/dev/awi/awi_wep.c#3 integrate ... //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#3 integrate ... //depot/projects/smpng/sys/dev/awi/awivar.h#2 integrate ... //depot/projects/smpng/sys/dev/bge/if_bge.c#8 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_os.c#4 integrate ... //depot/projects/smpng/sys/dev/ccd/ccd.c#10 integrate ... //depot/projects/smpng/sys/dev/cm/if_cm_isa.c#2 integrate ... //depot/projects/smpng/sys/dev/cm/smc90cx6.c#2 integrate ... //depot/projects/smpng/sys/dev/cm/smc90cx6var.h#2 integrate ... //depot/projects/smpng/sys/dev/cnw/if_cnw.c#3 integrate ... //depot/projects/smpng/sys/dev/ct/bshw_machdep.c#2 integrate ... //depot/projects/smpng/sys/dev/ct/bshwvar.h#2 integrate ... //depot/projects/smpng/sys/dev/ct/ct.c#2 integrate ... //depot/projects/smpng/sys/dev/ct/ct_isa.c#3 integrate ... //depot/projects/smpng/sys/dev/ct/ct_machdep.h#2 integrate ... //depot/projects/smpng/sys/dev/ct/ctvar.h#2 integrate ... //depot/projects/smpng/sys/dev/dgb/dgb.c#5 integrate ... //depot/projects/smpng/sys/dev/ed/if_ed.c#6 integrate ... //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#2 integrate ... //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#2 integrate ... //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#2 integrate ... //depot/projects/smpng/sys/dev/ed/if_edvar.h#3 integrate ... //depot/projects/smpng/sys/dev/eisa/eisaconf.h#2 integrate ... //depot/projects/smpng/sys/dev/em/if_em.c#4 integrate ... //depot/projects/smpng/sys/dev/en/midway.c#2 integrate ... //depot/projects/smpng/sys/dev/en/midwayvar.h#2 integrate ... //depot/projects/smpng/sys/dev/ep/if_ep.c#3 integrate ... //depot/projects/smpng/sys/dev/ep/if_ep_eisa.c#2 integrate ... //depot/projects/smpng/sys/dev/ex/if_ex.c#2 integrate ... //depot/projects/smpng/sys/dev/ex/if_ex_isa.c#2 integrate ... //depot/projects/smpng/sys/dev/ex/if_ex_pccard.c#2 integrate ... //depot/projects/smpng/sys/dev/gem/if_gem.c#2 integrate ... //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#3 integrate ... //depot/projects/smpng/sys/dev/gem/if_gemvar.h#2 integrate ... //depot/projects/smpng/sys/dev/hea/eni.c#2 integrate ... //depot/projects/smpng/sys/dev/hea/eni_buffer.c#3 integrate ... //depot/projects/smpng/sys/dev/hea/eni_if.c#2 integrate ... //depot/projects/smpng/sys/dev/hea/eni_intr.c#2 integrate ... //depot/projects/smpng/sys/dev/hea/eni_receive.c#2 integrate ... //depot/projects/smpng/sys/dev/hea/eni_var.h#2 integrate ... //depot/projects/smpng/sys/dev/hfa/fore_buffer.c#2 integrate ... //depot/projects/smpng/sys/dev/hfa/fore_include.h#2 integrate ... //depot/projects/smpng/sys/dev/hfa/fore_init.c#2 integrate ... //depot/projects/smpng/sys/dev/hfa/fore_load.c#2 integrate ... //depot/projects/smpng/sys/dev/hfa/fore_output.c#2 integrate ... //depot/projects/smpng/sys/dev/hfa/fore_receive.c#2 integrate ... //depot/projects/smpng/sys/dev/iir/iir.h#3 integrate ... //depot/projects/smpng/sys/dev/iir/iir_pci.c#2 integrate ... //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#8 integrate ... //depot/projects/smpng/sys/dev/ispfw/ispfw.c#3 integrate ... //depot/projects/smpng/sys/dev/lge/if_lge.c#4 integrate ... //depot/projects/smpng/sys/dev/lnc/if_lnc.c#3 integrate ... //depot/projects/smpng/sys/dev/lnc/if_lncvar.h#2 integrate ... //depot/projects/smpng/sys/dev/md/md.c#18 integrate ... //depot/projects/smpng/sys/dev/mii/acphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/amphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/brgphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/dcphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/exphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/lxtphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/mii.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/mii_physubr.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/miivar.h#3 integrate ... //depot/projects/smpng/sys/dev/mii/mlphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/nsgphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/nsphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/pnaphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/pnphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/qsphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/rlphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/tdkphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/tlphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/ukphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/xmphy.c#3 integrate ... //depot/projects/smpng/sys/dev/ncv/ncr53c500.c#4 integrate ... //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#5 integrate ... //depot/projects/smpng/sys/dev/ncv/ncr53c500var.h#3 integrate ... //depot/projects/smpng/sys/dev/nge/if_nge.c#8 integrate ... //depot/projects/smpng/sys/dev/nsp/nsp.c#4 integrate ... //depot/projects/smpng/sys/dev/nsp/nsp_pccard.c#5 integrate ... //depot/projects/smpng/sys/dev/nsp/nspvar.h#3 integrate ... //depot/projects/smpng/sys/dev/pdq/if_fea.c#2 integrate ... //depot/projects/smpng/sys/dev/ppbus/ppb_msq.c#3 integrate ... //depot/projects/smpng/sys/dev/puc/puc.c#3 integrate ... //depot/projects/smpng/sys/dev/rp/rp.c#5 integrate ... //depot/projects/smpng/sys/dev/sio/sio.c#10 integrate ... //depot/projects/smpng/sys/dev/sio/sio_isa.c#7 integrate ... //depot/projects/smpng/sys/dev/sio/sio_pccard.c#4 integrate ... //depot/projects/smpng/sys/dev/sio/sio_pci.c#5 integrate ... //depot/projects/smpng/sys/dev/sio/sio_puc.c#3 integrate ... //depot/projects/smpng/sys/dev/sio/siovar.h#4 integrate ... //depot/projects/smpng/sys/dev/snc/dp83932.c#2 integrate ... //depot/projects/smpng/sys/dev/snc/dp83932subr.c#2 integrate ... //depot/projects/smpng/sys/dev/snc/dp83932subr.h#2 integrate ... //depot/projects/smpng/sys/dev/snc/dp83932var.h#2 integrate ... //depot/projects/smpng/sys/dev/snc/if_snc_cbus.c#2 integrate ... //depot/projects/smpng/sys/dev/snc/if_sncvar.h#2 integrate ... //depot/projects/smpng/sys/dev/snp/snp.c#7 integrate ... //depot/projects/smpng/sys/dev/stg/tmc18c30.c#4 integrate ... //depot/projects/smpng/sys/dev/stg/tmc18c30_isa.c#3 integrate ... //depot/projects/smpng/sys/dev/stg/tmc18c30_pccard.c#5 integrate ... //depot/projects/smpng/sys/dev/stg/tmc18c30var.h#3 integrate ... //depot/projects/smpng/sys/dev/streams/streams.c#9 integrate ... //depot/projects/smpng/sys/dev/sym/sym_hipd.c#6 integrate ... //depot/projects/smpng/sys/dev/syscons/apm/apm_saver.c#2 integrate ... //depot/projects/smpng/sys/dev/txp/if_txp.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/if_aue.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/if_cue.c#3 integrate ... //depot/projects/smpng/sys/dev/usb/if_kue.c#3 integrate ... //depot/projects/smpng/sys/dev/usb/uhci.c#11 integrate ... //depot/projects/smpng/sys/dev/usb/umass.c#10 integrate ... //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#2 integrate ... //depot/projects/smpng/sys/dev/usb/usb_ethersubr.h#2 integrate ... //depot/projects/smpng/sys/dev/usb/usbdivar.h#5 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumio.c#4 integrate ... //depot/projects/smpng/sys/dev/vx/if_vx.c#4 integrate ... //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#2 integrate ... //depot/projects/smpng/sys/dev/vx/if_vxreg.h#2 integrate ... //depot/projects/smpng/sys/fs/deadfs/dead_vnops.c#2 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#4 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#9 integrate ... //depot/projects/smpng/sys/fs/fdescfs/fdesc.h#3 integrate ... //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#5 integrate ... //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#5 integrate ... //depot/projects/smpng/sys/fs/fifofs/fifo.h#2 integrate ... //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#9 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs.h#5 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#8 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#6 integrate ... //depot/projects/smpng/sys/fs/msdosfs/denode.h#3 integrate ... //depot/projects/smpng/sys/fs/msdosfs/direntry.h#2 integrate ... //depot/projects/smpng/sys/fs/msdosfs/fat.h#3 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#2 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#4 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_fat.c#3 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#8 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfsmount.h#3 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_ihash.h#2 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#7 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.h#3 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#10 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#6 integrate ... //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#5 integrate ... //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#7 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#8 integrate ... //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#11 integrate ... //depot/projects/smpng/sys/fs/umapfs/umap.h#2 integrate ... //depot/projects/smpng/sys/fs/umapfs/umap_subr.c#5 integrate ... //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#5 integrate ... //depot/projects/smpng/sys/fs/umapfs/umap_vnops.c#3 integrate ... //depot/projects/smpng/sys/fs/unionfs/union.h#3 integrate ... //depot/projects/smpng/sys/fs/unionfs/union_subr.c#7 integrate ... //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#9 integrate ... //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#4 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_alloc.c#3 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_extern.h#3 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#3 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#4 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#3 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#8 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#4 integrate ... //depot/projects/smpng/sys/i386/apm/apm.c#5 integrate ... //depot/projects/smpng/sys/i386/i386/autoconf.c#8 integrate ... //depot/projects/smpng/sys/i386/i386/db_disasm.c#3 integrate ... //depot/projects/smpng/sys/i386/i386/db_interface.c#10 integrate ... //depot/projects/smpng/sys/i386/i386/db_trace.c#5 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#24 integrate ... //depot/projects/smpng/sys/i386/i386/mp_machdep.c#18 integrate ... //depot/projects/smpng/sys/i386/i386/mpapic.c#7 integrate ... //depot/projects/smpng/sys/i386/i386/perfmon.c#7 integrate ... //depot/projects/smpng/sys/i386/i386/pmap.c#18 integrate ... //depot/projects/smpng/sys/i386/i386/sys_machdep.c#14 integrate ... //depot/projects/smpng/sys/i386/i386/trap.c#33 integrate ... //depot/projects/smpng/sys/i386/i386/vm_machdep.c#17 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_fcntl.c#4 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ioctl.c#8 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ipc.c#3 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_proto.h#3 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_signal.c#3 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_signal.h#2 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.h#3 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_stat.c#6 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_util.h#3 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.h#3 integrate ... //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#7 integrate ... //depot/projects/smpng/sys/i386/include/apm_bios.h#2 integrate ... //depot/projects/smpng/sys/i386/include/bus_pc98.h#4 integrate ... //depot/projects/smpng/sys/i386/include/clock.h#3 integrate ... //depot/projects/smpng/sys/i386/include/cpu.h#6 integrate ... //depot/projects/smpng/sys/i386/include/cpufunc.h#9 integrate ... //depot/projects/smpng/sys/i386/include/dvcfg.h#2 integrate ... //depot/projects/smpng/sys/i386/include/frame.h#2 integrate ... //depot/projects/smpng/sys/i386/include/in_cksum.h#3 integrate ... //depot/projects/smpng/sys/i386/include/md_var.h#8 integrate ... //depot/projects/smpng/sys/i386/include/npx.h#4 integrate ... //depot/projects/smpng/sys/i386/include/pcb.h#5 integrate ... //depot/projects/smpng/sys/i386/include/pcb_ext.h#4 integrate ... //depot/projects/smpng/sys/i386/include/perfmon.h#2 integrate ... //depot/projects/smpng/sys/i386/include/physio_proc.h#3 integrate ... //depot/projects/smpng/sys/i386/include/pmap.h#6 integrate ... //depot/projects/smpng/sys/i386/include/proc.h#5 integrate ... //depot/projects/smpng/sys/i386/include/profile.h#4 integrate ... //depot/projects/smpng/sys/i386/include/reg.h#4 integrate ... //depot/projects/smpng/sys/i386/include/segments.h#3 integrate ... //depot/projects/smpng/sys/i386/include/smp.h#4 integrate ... //depot/projects/smpng/sys/i386/include/sysarch.h#3 integrate ... //depot/projects/smpng/sys/i386/include/types.h#3 integrate ... //depot/projects/smpng/sys/i386/include/vm86.h#4 integrate ... //depot/projects/smpng/sys/i386/isa/bs/bs.c#2 integrate ... //depot/projects/smpng/sys/i386/isa/bs/bsfunc.c#2 integrate ... //depot/projects/smpng/sys/i386/isa/bs/bsfunc.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/bs/bshw.c#2 integrate ... //depot/projects/smpng/sys/i386/isa/bs/bshw.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/bs/bshw_dma.c#2 integrate ... //depot/projects/smpng/sys/i386/isa/bs/bshw_pdma.c#2 integrate ... //depot/projects/smpng/sys/i386/isa/bs/bsif.c#2 integrate ... //depot/projects/smpng/sys/i386/isa/bs/bsif.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/bs/bsvar.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/ccbque.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/clock.c#13 integrate ... //depot/projects/smpng/sys/i386/isa/ctx.c#4 integrate ... //depot/projects/smpng/sys/i386/isa/cy.c#11 integrate ... //depot/projects/smpng/sys/i386/isa/elink.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/icu.h#3 integrate ... //depot/projects/smpng/sys/i386/isa/if_cx.c#2 integrate ... //depot/projects/smpng/sys/i386/isa/if_le.c#4 integrate ... //depot/projects/smpng/sys/i386/isa/if_rdp.c#2 integrate ... //depot/projects/smpng/sys/i386/isa/intr_machdep.h#7 integrate ... //depot/projects/smpng/sys/i386/isa/isa_dma.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/isa_dma.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/mse.c#4 integrate ... //depot/projects/smpng/sys/i386/isa/npx.c#21 integrate ... //depot/projects/smpng/sys/i386/isa/pcaudio.c#7 integrate ... //depot/projects/smpng/sys/i386/isa/rc.c#5 integrate ... //depot/projects/smpng/sys/i386/isa/spkr.c#5 integrate ... //depot/projects/smpng/sys/i386/linux/imgact_linux.c#3 integrate ... //depot/projects/smpng/sys/i386/linux/linux_proto.h#7 integrate ... //depot/projects/smpng/sys/i386/linux/linux_syscall.h#6 integrate ... //depot/projects/smpng/sys/i386/linux/linux_sysent.c#6 integrate ... //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#15 integrate ... //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#7 integrate ... //depot/projects/smpng/sys/i386/svr4/svr4_machdep.h#3 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_l2fsm.c#3 integrate ... //depot/projects/smpng/sys/ia64/ia64/db_interface.c#14 integrate ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#22 integrate ... //depot/projects/smpng/sys/ia64/ia64/sapic.c#6 integrate ... //depot/projects/smpng/sys/ia64/include/cpufunc.h#9 integrate ... //depot/projects/smpng/sys/isa/isavar.h#3 integrate ... //depot/projects/smpng/sys/isa/psm.c#9 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.c#4 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.h#3 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_rrip.c#2 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#7 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#3 integrate ... //depot/projects/smpng/sys/isofs/cd9660/iso.h#3 integrate ... //depot/projects/smpng/sys/isofs/cd9660/iso_rrip.h#2 integrate ... //depot/projects/smpng/sys/kern/imgact_aout.c#9 integrate ... //depot/projects/smpng/sys/kern/imgact_elf.c#12 integrate ... //depot/projects/smpng/sys/kern/imgact_gzip.c#3 integrate ... //depot/projects/smpng/sys/kern/inflate.c#2 integrate ... //depot/projects/smpng/sys/kern/kern_acct.c#8 integrate ... //depot/projects/smpng/sys/kern/kern_clock.c#15 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_event.c#10 integrate ... //depot/projects/smpng/sys/kern/kern_exec.c#28 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#27 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#27 integrate ... //depot/projects/smpng/sys/kern/kern_intr.c#12 integrate ... //depot/projects/smpng/sys/kern/kern_ktrace.c#16 integrate ... //depot/projects/smpng/sys/kern/kern_lockf.c#7 integrate ... //depot/projects/smpng/sys/kern/kern_malloc.c#6 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#20 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#16 integrate ... //depot/projects/smpng/sys/kern/kern_resource.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#25 integrate ... //depot/projects/smpng/sys/kern/kern_synch.c#23 integrate ... //depot/projects/smpng/sys/kern/kern_tc.c#6 integrate ... //depot/projects/smpng/sys/kern/kern_time.c#6 integrate ... //depot/projects/smpng/sys/kern/kern_timeout.c#6 integrate ... //depot/projects/smpng/sys/kern/makesyscalls.sh#9 integrate ... //depot/projects/smpng/sys/kern/subr_autoconf.c#2 integrate ... //depot/projects/smpng/sys/kern/subr_diskmbr.c#4 integrate ... //depot/projects/smpng/sys/kern/subr_diskslice.c#5 integrate ... //depot/projects/smpng/sys/kern/subr_prf.c#10 integrate ... //depot/projects/smpng/sys/kern/subr_prof.c#13 integrate ... //depot/projects/smpng/sys/kern/subr_smp.c#9 integrate ... //depot/projects/smpng/sys/kern/sys_generic.c#10 integrate ... //depot/projects/smpng/sys/kern/sys_pipe.c#10 integrate ... //depot/projects/smpng/sys/kern/sysv_msg.c#9 integrate ... //depot/projects/smpng/sys/kern/sysv_sem.c#13 integrate ... //depot/projects/smpng/sys/kern/sysv_shm.c#10 integrate ... //depot/projects/smpng/sys/kern/tty.c#11 integrate ... //depot/projects/smpng/sys/kern/tty_compat.c#2 integrate ... //depot/projects/smpng/sys/kern/tty_pty.c#10 integrate ... //depot/projects/smpng/sys/kern/tty_subr.c#2 integrate ... //depot/projects/smpng/sys/kern/tty_tty.c#6 integrate ... //depot/projects/smpng/sys/kern/uipc_domain.c#3 integrate ... //depot/projects/smpng/sys/kern/uipc_mbuf2.c#2 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#16 integrate ... //depot/projects/smpng/sys/kern/uipc_socket2.c#11 integrate ... //depot/projects/smpng/sys/kern/uipc_syscalls.c#13 integrate ... //depot/projects/smpng/sys/kern/uipc_usrreq.c#16 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#14 integrate ... //depot/projects/smpng/sys/kern/vfs_bio.c#17 integrate ... //depot/projects/smpng/sys/kern/vfs_cache.c#9 integrate ... //depot/projects/smpng/sys/kern/vfs_cluster.c#8 integrate ... //depot/projects/smpng/sys/kern/vfs_default.c#5 integrate ... //depot/projects/smpng/sys/kern/vfs_export.c#4 integrate ... //depot/projects/smpng/sys/kern/vfs_init.c#3 integrate ... //depot/projects/smpng/sys/kern/vfs_lookup.c#9 integrate ... //depot/projects/smpng/sys/kern/vfs_subr.c#19 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#22 integrate ... //depot/projects/smpng/sys/kern/vfs_vnops.c#17 integrate ... //depot/projects/smpng/sys/libkern/bsearch.c#3 integrate ... //depot/projects/smpng/sys/libkern/mcount.c#3 integrate ... //depot/projects/smpng/sys/libkern/qsort.c#2 integrate ... //depot/projects/smpng/sys/libkern/quad.h#2 integrate ... //depot/projects/smpng/sys/net/bpf.c#10 integrate ... //depot/projects/smpng/sys/net/bpf.h#3 integrate ... //depot/projects/smpng/sys/net/bpf_filter.c#4 integrate ... //depot/projects/smpng/sys/net/bsd_comp.c#2 integrate ... //depot/projects/smpng/sys/net/ethernet.h#4 integrate ... //depot/projects/smpng/sys/net/fddi.h#2 integrate ... //depot/projects/smpng/sys/net/if.c#15 integrate ... //depot/projects/smpng/sys/net/if.h#8 integrate ... //depot/projects/smpng/sys/net/if_arc.h#3 integrate ... //depot/projects/smpng/sys/net/if_arcsubr.c#2 integrate ... //depot/projects/smpng/sys/net/if_atm.h#2 integrate ... //depot/projects/smpng/sys/net/if_dl.h#2 integrate ... //depot/projects/smpng/sys/net/if_ethersubr.c#13 integrate ... //depot/projects/smpng/sys/net/if_faith.c#8 integrate ... //depot/projects/smpng/sys/net/if_fddisubr.c#4 integrate ... //depot/projects/smpng/sys/net/if_gif.c#7 integrate ... //depot/projects/smpng/sys/net/if_gif.h#4 integrate ... //depot/projects/smpng/sys/net/if_media.c#2 integrate ... //depot/projects/smpng/sys/net/if_media.h#2 integrate ... //depot/projects/smpng/sys/net/if_ppp.c#7 integrate ... //depot/projects/smpng/sys/net/if_pppvar.h#4 integrate ... //depot/projects/smpng/sys/net/if_sl.c#7 integrate ... //depot/projects/smpng/sys/net/if_stf.c#11 integrate ... //depot/projects/smpng/sys/net/if_stf.h#3 integrate ... //depot/projects/smpng/sys/net/if_tap.c#7 integrate ... //depot/projects/smpng/sys/net/if_var.h#10 integrate ... //depot/projects/smpng/sys/net/intrq.h#3 integrate ... //depot/projects/smpng/sys/net/net_osdep.h#2 integrate ... //depot/projects/smpng/sys/net/netisr.h#3 integrate ... //depot/projects/smpng/sys/net/pfil.c#2 integrate ... //depot/projects/smpng/sys/net/pfil.h#3 integrate ... //depot/projects/smpng/sys/net/ppp_comp.h#2 integrate ... //depot/projects/smpng/sys/net/ppp_deflate.c#2 integrate ... //depot/projects/smpng/sys/net/ppp_tty.c#4 integrate ... //depot/projects/smpng/sys/net/radix.c#2 integrate ... //depot/projects/smpng/sys/net/radix.h#2 integrate ... //depot/projects/smpng/sys/net/raw_cb.h#3 integrate ... //depot/projects/smpng/sys/net/route.c#5 integrate ... //depot/projects/smpng/sys/net/route.h#7 integrate ... //depot/projects/smpng/sys/net/rtsock.c#12 integrate ... //depot/projects/smpng/sys/net/slcompress.h#2 integrate ... //depot/projects/smpng/sys/net/zlib.c#3 integrate ... //depot/projects/smpng/sys/netatalk/at_extern.h#3 integrate ... //depot/projects/smpng/sys/netatm/atm_aal5.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_cm.c#2 integrate ... //depot/projects/smpng/sys/netatm/atm_cm.h#2 integrate ... //depot/projects/smpng/sys/netatm/atm_if.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_if.h#2 integrate ... //depot/projects/smpng/sys/netatm/atm_sigmgr.h#2 integrate ... //depot/projects/smpng/sys/netatm/atm_signal.c#2 integrate ... //depot/projects/smpng/sys/netatm/atm_stack.h#2 integrate ... //depot/projects/smpng/sys/netatm/atm_subr.c#4 integrate ... //depot/projects/smpng/sys/netatm/atm_sys.h#2 integrate ... //depot/projects/smpng/sys/netatm/atm_usrreq.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_var.h#4 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_if.c#2 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_load.c#2 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_serv.h#2 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_var.h#2 integrate ... //depot/projects/smpng/sys/netatm/sigpvc/sigpvc_if.c#2 integrate ... //depot/projects/smpng/sys/netatm/sigpvc/sigpvc_var.h#2 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_arp.c#2 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_cls.c#2 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_if.c#2 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_kxdr.c#2 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_msg.c#2 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_print.c#2 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_proto.c#2 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_var.h#2 integrate ... //depot/projects/smpng/sys/netatm/uni/q2110_sigaa.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/q2110_sigcpcs.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/qsaal1_sigaa.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/qsaal1_sigcpcs.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/sscf_uni.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/sscf_uni_var.h#2 integrate ... //depot/projects/smpng/sys/netatm/uni/sscop.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/sscop_lower.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/sscop_pdu.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/sscop_subr.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/sscop_timer.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/sscop_upper.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/sscop_var.h#2 integrate ... //depot/projects/smpng/sys/netatm/uni/uni_load.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/uniarp.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/uniarp_input.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/uniarp_timer.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/uniip.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/uniip_var.h#2 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_decode.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_decode.h#2 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_encode.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_if.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_msg.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_print.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_sigmgr_state.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_var.h#2 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_vc_state.c#2 integrate ... //depot/projects/smpng/sys/netinet/icmp6.h#2 integrate ... //depot/projects/smpng/sys/netinet/icmp_var.h#4 integrate ... //depot/projects/smpng/sys/netinet/if_atm.h#3 integrate ... //depot/projects/smpng/sys/netinet/if_ether.c#9 integrate ... //depot/projects/smpng/sys/netinet/if_ether.h#3 integrate ... //depot/projects/smpng/sys/netinet/if_fddi.h#2 integrate ... //depot/projects/smpng/sys/netinet/igmp.c#3 integrate ... //depot/projects/smpng/sys/netinet/igmp_var.h#3 integrate ... //depot/projects/smpng/sys/netinet/in.c#8 integrate ... //depot/projects/smpng/sys/netinet/in.h#7 integrate ... //depot/projects/smpng/sys/netinet/in_gif.h#4 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.c#16 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.h#7 integrate ... //depot/projects/smpng/sys/netinet/in_proto.c#3 integrate ... //depot/projects/smpng/sys/netinet/in_rmx.c#3 integrate ... //depot/projects/smpng/sys/netinet/in_systm.h#2 integrate ... //depot/projects/smpng/sys/netinet/in_var.h#4 integrate ... //depot/projects/smpng/sys/netinet/ip_divert.c#8 integrate ... //depot/projects/smpng/sys/netinet/ip_ecn.h#2 integrate ... //depot/projects/smpng/sys/netinet/ip_encap.c#5 integrate ... //depot/projects/smpng/sys/netinet/ip_encap.h#3 integrate ... //depot/projects/smpng/sys/netinet/ip_fw.h#6 integrate ... //depot/projects/smpng/sys/netinet/ip_icmp.c#11 integrate ... //depot/projects/smpng/sys/netinet/ip_icmp.h#3 integrate ... //depot/projects/smpng/sys/netinet/ip_id.c#2 integrate ... //depot/projects/smpng/sys/netinet/ip_input.c#15 integrate ... //depot/projects/smpng/sys/netinet/ip_mroute.c#8 integrate ... //depot/projects/smpng/sys/netinet/ip_mroute.h#3 integrate ... //depot/projects/smpng/sys/netinet/ip_output.c#17 integrate ... //depot/projects/smpng/sys/netinet/ip_var.h#4 integrate ... //depot/projects/smpng/sys/netinet/raw_ip.c#12 integrate ... //depot/projects/smpng/sys/netinet/tcp_input.c#13 integrate ... //depot/projects/smpng/sys/netinet/tcp_subr.c#13 integrate ... //depot/projects/smpng/sys/netinet/tcp_syncache.c#9 integrate ... //depot/projects/smpng/sys/netinet/tcp_timer.h#2 integrate ... //depot/projects/smpng/sys/netinet/tcp_usrreq.c#9 integrate ... //depot/projects/smpng/sys/netinet/tcp_var.h#7 integrate ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#13 integrate ... //depot/projects/smpng/sys/netinet/udp_var.h#3 integrate ... //depot/projects/smpng/sys/netinet6/icmp6.c#3 integrate ... //depot/projects/smpng/sys/netinet6/in6_pcb.c#9 integrate ... //depot/projects/smpng/sys/netinet6/ip6_forward.c#4 integrate ... //depot/projects/smpng/sys/netinet6/ip6_input.c#5 integrate ... //depot/projects/smpng/sys/netinet6/ip6_output.c#5 integrate ... //depot/projects/smpng/sys/netinet6/nd6_nbr.c#2 integrate ... //depot/projects/smpng/sys/netipx/ipx.h#3 integrate ... //depot/projects/smpng/sys/netipx/ipx_if.h#2 integrate ... //depot/projects/smpng/sys/netipx/ipx_ip.h#2 integrate ... //depot/projects/smpng/sys/netipx/ipx_pcb.h#3 integrate ... //depot/projects/smpng/sys/netipx/ipx_var.h#3 integrate ... //depot/projects/smpng/sys/netipx/spx.h#2 integrate ... //depot/projects/smpng/sys/netipx/spx_debug.h#2 integrate ... //depot/projects/smpng/sys/netkey/key.c#11 integrate ... //depot/projects/smpng/sys/netkey/key.h#2 integrate ... //depot/projects/smpng/sys/netkey/key_debug.c#4 integrate ... //depot/projects/smpng/sys/netkey/key_debug.h#3 integrate ... //depot/projects/smpng/sys/netkey/keydb.c#2 integrate ... //depot/projects/smpng/sys/netkey/keydb.h#2 integrate ... //depot/projects/smpng/sys/netkey/keysock.c#5 integrate ... //depot/projects/smpng/sys/netkey/keysock.h#2 integrate ... //depot/projects/smpng/sys/netnatm/natm.c#4 integrate ... //depot/projects/smpng/sys/netnatm/natm.h#2 integrate ... //depot/projects/smpng/sys/netnatm/natm_pcb.c#2 integrate ... //depot/projects/smpng/sys/netnatm/natm_proto.c#3 integrate ... //depot/projects/smpng/sys/netns/ns.h#3 integrate ... //depot/projects/smpng/sys/netns/ns_if.h#2 integrate ... //depot/projects/smpng/sys/nfs/nfs_common.c#7 integrate ... //depot/projects/smpng/sys/nfs/nfsnode.h#3 integrate ... //depot/projects/smpng/sys/nfsclient/nfs.h#7 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_node.c#5 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_subs.c#6 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#11 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#9 integrate ... //depot/projects/smpng/sys/pc98/apm/apm.c#5 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#19 integrate ... //depot/projects/smpng/sys/pc98/pc98/clock.c#6 integrate ... //depot/projects/smpng/sys/pc98/pc98/diskslice_machdep.c#3 integrate ... //depot/projects/smpng/sys/pc98/pc98/isa_dma.c#3 integrate ... //depot/projects/smpng/sys/pc98/pc98/mse.c#3 integrate ... //depot/projects/smpng/sys/pc98/pc98/pc98_machdep.h#2 integrate ... //depot/projects/smpng/sys/pc98/pc98/pcaudio.c#6 integrate ... //depot/projects/smpng/sys/pc98/pc98/pmc.c#3 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio.c#11 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio_cbus.c#3 integrate ... //depot/projects/smpng/sys/pc98/pc98/spkr.c#4 integrate ... //depot/projects/smpng/sys/pc98/pc98/wdreg.h#2 integrate ... //depot/projects/smpng/sys/pci/cy_pci.c#4 integrate ... //depot/projects/smpng/sys/pci/if_dc.c#12 integrate ... //depot/projects/smpng/sys/pci/if_en_pci.c#2 integrate ... //depot/projects/smpng/sys/pci/if_pcn.c#4 integrate ... //depot/projects/smpng/sys/pci/if_rl.c#6 integrate ... //depot/projects/smpng/sys/pci/if_sf.c#5 integrate ... //depot/projects/smpng/sys/pci/if_sis.c#10 integrate ... //depot/projects/smpng/sys/pci/if_sk.c#4 integrate ... //depot/projects/smpng/sys/pci/if_ste.c#5 integrate ... //depot/projects/smpng/sys/pci/if_ti.c#8 integrate ... //depot/projects/smpng/sys/pci/if_tl.c#3 integrate ... //depot/projects/smpng/sys/pci/if_tx.c#5 integrate ... //depot/projects/smpng/sys/pci/if_vr.c#3 integrate ... //depot/projects/smpng/sys/pci/if_wb.c#3 integrate ... //depot/projects/smpng/sys/pci/if_xl.c#8 integrate ... //depot/projects/smpng/sys/pci/intpm.c#3 integrate ... //depot/projects/smpng/sys/pci/meteor.c#4 integrate ... //depot/projects/smpng/sys/pci/simos.c#2 integrate ... //depot/projects/smpng/sys/posix4/aio.h#2 integrate ... //depot/projects/smpng/sys/posix4/mqueue.h#2 integrate ... //depot/projects/smpng/sys/posix4/posix4.h#3 integrate ... //depot/projects/smpng/sys/posix4/sched.h#2 integrate ... //depot/projects/smpng/sys/posix4/semaphore.h#2 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#13 integrate ... //depot/projects/smpng/sys/sys/acct.h#4 integrate ... //depot/projects/smpng/sys/sys/acl.h#5 integrate ... //depot/projects/smpng/sys/sys/bio.h#4 integrate ... //depot/projects/smpng/sys/sys/buf.h#9 integrate ... //depot/projects/smpng/sys/sys/callout.h#6 integrate ... //depot/projects/smpng/sys/sys/conf.h#11 integrate ... //depot/projects/smpng/sys/sys/cons.h#4 integrate ... //depot/projects/smpng/sys/sys/disk.h#3 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#7 integrate ... //depot/projects/smpng/sys/sys/diskslice.h#3 integrate ... //depot/projects/smpng/sys/sys/domain.h#4 integrate ... //depot/projects/smpng/sys/sys/errno.h#5 integrate ... //depot/projects/smpng/sys/sys/event.h#6 integrate ... //depot/projects/smpng/sys/sys/eventhandler.h#3 integrate ... //depot/projects/smpng/sys/sys/exec.h#2 integrate ... //depot/projects/smpng/sys/sys/fcntl.h#3 integrate ... //depot/projects/smpng/sys/sys/file.h#7 integrate ... //depot/projects/smpng/sys/sys/filedesc.h#7 integrate ... //depot/projects/smpng/sys/sys/imgact.h#3 integrate ... //depot/projects/smpng/sys/sys/imgact_aout.h#5 integrate ... //depot/projects/smpng/sys/sys/imgact_elf.h#3 integrate ... //depot/projects/smpng/sys/sys/inflate.h#2 integrate ... //depot/projects/smpng/sys/sys/interrupt.h#6 integrate ... //depot/projects/smpng/sys/sys/ioccom.h#2 integrate ... //depot/projects/smpng/sys/sys/ipc.h#5 integrate ... //depot/projects/smpng/sys/sys/jail.h#5 integrate ... //depot/projects/smpng/sys/sys/kernel.h#12 integrate ... //depot/projects/smpng/sys/sys/kthread.h#3 integrate ... //depot/projects/smpng/sys/sys/ktrace.h#5 integrate ... //depot/projects/smpng/sys/sys/libkern.h#4 integrate ... //depot/projects/smpng/sys/sys/lockf.h#2 integrate ... //depot/projects/smpng/sys/sys/lockmgr.h#5 integrate ... //depot/projects/smpng/sys/sys/malloc.h#4 integrate ... //depot/projects/smpng/sys/sys/md5.h#2 integrate ... //depot/projects/smpng/sys/sys/mman.h#3 integrate ... //depot/projects/smpng/sys/sys/mount.h#7 integrate ... //depot/projects/smpng/sys/sys/msg.h#2 integrate ... //depot/projects/smpng/sys/sys/msgbuf.h#3 integrate ... //depot/projects/smpng/sys/sys/namei.h#6 integrate ... //depot/projects/smpng/sys/sys/param.h#17 integrate ... //depot/projects/smpng/sys/sys/poll.h#3 integrate ... //depot/projects/smpng/sys/sys/proc.h#39 integrate ... //depot/projects/smpng/sys/sys/protosw.h#5 integrate ... //depot/projects/smpng/sys/sys/queue.h#4 integrate ... //depot/projects/smpng/sys/sys/regression.h#2 integrate ... //depot/projects/smpng/sys/sys/resource.h#5 integrate ... //depot/projects/smpng/sys/sys/resourcevar.h#7 integrate ... //depot/projects/smpng/sys/sys/rtprio.h#3 integrate ... //depot/projects/smpng/sys/sys/selinfo.h#5 integrate ... //depot/projects/smpng/sys/sys/sem.h#4 integrate ... //depot/projects/smpng/sys/sys/shm.h#4 integrate ... //depot/projects/smpng/sys/sys/signal.h#5 integrate ... //depot/projects/smpng/sys/sys/signalvar.h#6 integrate ... //depot/projects/smpng/sys/sys/socket.h#4 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#13 integrate ... //depot/projects/smpng/sys/sys/soundcard.h#3 integrate ... //depot/projects/smpng/sys/sys/stat.h#3 integrate ... //depot/projects/smpng/sys/sys/sysctl.h#7 integrate ... //depot/projects/smpng/sys/sys/sysent.h#5 integrate ... //depot/projects/smpng/sys/sys/syslog.h#2 integrate ... //depot/projects/smpng/sys/sys/sysproto.h#12 integrate ... //depot/projects/smpng/sys/sys/systm.h#22 integrate ... //depot/projects/smpng/sys/sys/termios.h#2 integrate ... //depot/projects/smpng/sys/sys/time.h#4 integrate ... //depot/projects/smpng/sys/sys/timeb.h#3 integrate ... //depot/projects/smpng/sys/sys/timepps.h#2 integrate ... //depot/projects/smpng/sys/sys/times.h#2 integrate ... //depot/projects/smpng/sys/sys/timetc.h#5 integrate ... //depot/projects/smpng/sys/sys/timex.h#2 integrate ... //depot/projects/smpng/sys/sys/tty.h#5 integrate ... //depot/projects/smpng/sys/sys/types.h#9 integrate ... //depot/projects/smpng/sys/sys/uio.h#5 integrate ... //depot/projects/smpng/sys/sys/un.h#5 integrate ... //depot/projects/smpng/sys/sys/user.h#9 integrate ... //depot/projects/smpng/sys/sys/vnode.h#14 integrate ... //depot/projects/smpng/sys/sys/wait.h#2 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#8 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#5 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#5 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#11 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#10 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_subr.c#2 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#14 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#4 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_subr.c#2 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_vnops.c#2 integrate ... //depot/projects/smpng/sys/ufs/ufs/acl.h#4 integrate ... //depot/projects/smpng/sys/ufs/ufs/quota.h#3 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#9 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#11 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#4 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#9 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#11 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#3 integrate ... //depot/projects/smpng/sys/vm/default_pager.c#3 integrate ... //depot/projects/smpng/sys/vm/device_pager.c#3 integrate ... //depot/projects/smpng/sys/vm/phys_pager.c#2 integrate ... //depot/projects/smpng/sys/vm/pmap.h#5 integrate ... //depot/projects/smpng/sys/vm/swap_pager.c#12 integrate ... //depot/projects/smpng/sys/vm/swap_pager.h#3 integrate ... //depot/projects/smpng/sys/vm/uma.h#2 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#2 integrate ... //depot/projects/smpng/sys/vm/vm_extern.h#8 integrate ... //depot/projects/smpng/sys/vm/vm_fault.c#7 integrate ... //depot/projects/smpng/sys/vm/vm_glue.c#11 integrate ... //depot/projects/smpng/sys/vm/vm_init.c#4 integrate ... //depot/projects/smpng/sys/vm/vm_map.c#9 integrate ... //depot/projects/smpng/sys/vm/vm_mmap.c#12 integrate ... //depot/projects/smpng/sys/vm/vm_object.c#7 integrate ... //depot/projects/smpng/sys/vm/vm_pageout.c#10 integrate ... //depot/projects/smpng/sys/vm/vm_pageout.h#5 integrate ... //depot/projects/smpng/sys/vm/vm_pager.c#5 integrate ... //depot/projects/smpng/sys/vm/vm_pager.h#3 integrate ... //depot/projects/smpng/sys/vm/vm_swap.c#8 integrate ... //depot/projects/smpng/sys/vm/vnode_pager.c#12 integrate ... //depot/projects/smpng/sys/vm/vnode_pager.h#3 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.35 2002/03/07 04:43:50 jake Exp $ + * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.36 2002/03/20 02:27:55 jeff Exp $ */ #include @@ -535,6 +535,9 @@ if (bootverbose) printf("%s: releasing secondary CPUs\n", __func__); atomic_store_rel_int(&aps_ready, 1); + + while (smp_started == 0) + ; /* nothing */ } SYSINIT(start_aps, SI_SUB_SMP, SI_ORDER_FIRST, release_aps, NULL); ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#25 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.86 2002/03/19 09:11:46 jeff Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.87 2002/03/20 10:35:22 jeff Exp $ */ /* @@ -169,7 +169,7 @@ #include #include #include -#include +#include #include @@ -321,7 +321,7 @@ /* * Data for the pv entry allocation mechanism */ -static vm_zone_t pvzone; +static uma_zone_t pvzone; static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; static int pmap_pagedaemon_waken = 0; @@ -615,14 +615,8 @@ initial_pvs = vm_page_array_size; if (initial_pvs < MINPV) initial_pvs = MINPV; -#if 0 - pvzone = &pvzone_store; - pvinit = (struct pv_entry *) kmem_alloc(kernel_map, - initial_pvs * sizeof (struct pv_entry)); - zbootinit(pvzone, "PV ENTRY", sizeof (struct pv_entry), pvinit, - vm_page_array_size); -#endif - pvzone = zinit("PV ENTRY", sizeof (struct pv_entry), 0, 0, 0); + pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, + NULL, NULL, UMA_ALIGN_PTR, 0); uma_zone_set_allocf(pvzone, pmap_allocf); uma_prealloc(pvzone, initial_pvs); /* @@ -649,9 +643,6 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_page_array_size; pv_entry_high_water = 9 * (pv_entry_max / 10); -#if 0 - zinitna(pvzone, &pvzone_obj, NULL, 0, pv_entry_max, ZONE_INTERRUPT, 1); -#endif uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); } @@ -1827,7 +1818,7 @@ free_pv_entry(pv_entry_t pv) { pv_entry_count--; - zfree(pvzone, pv); + uma_zfree(pvzone, pv); } /* @@ -1846,7 +1837,7 @@ pmap_pagedaemon_waken = 1; wakeup (&vm_pages_needed); } - return zalloc(pvzone); + return uma_zalloc(pvzone, M_NOWAIT); } /* ==== //depot/projects/smpng/sys/alpha/alpha/promcons.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.23 2001/11/03 17:05:12 phk Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.24 2002/03/20 09:46:04 jeff Exp $ */ /* $NetBSD: promcons.c,v 1.13 1998/03/21 22:52:59 mycroft Exp $ */ /* @@ -49,7 +49,6 @@ #include #include #include -#include #include ==== //depot/projects/smpng/sys/boot/common/isapnp.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/isapnp.h,v 1.6 2001/06/14 01:23:57 peter Exp $ + * $FreeBSD: src/sys/boot/common/isapnp.h,v 1.7 2002/03/20 07:59:37 alfred Exp $ */ #ifndef _I386_ISA_PNP_H_ @@ -306,7 +306,7 @@ /* * used by autoconfigure to actually probe and attach drivers */ -void pnp_configure __P((void)); +void pnp_configure(void); #endif /* _KERNEL */ ==== //depot/projects/smpng/sys/boot/efi/libefi/efifs.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.3 2001/10/11 13:47:20 dfr Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.4 2002/03/19 23:05:33 peter Exp $ */ #include @@ -129,7 +129,35 @@ size -= sz; bufp += sz; } - *resid = size; + if (resid) + *resid = size; + return 0; +} + +static int +efifs_write(struct open_file *f, void *buf, size_t size, size_t *resid) +{ + EFI_FILE *file = f->f_fsdata; + EFI_STATUS status; + UINTN sz = size; + char *bufp; + + bufp = buf; + while (size > 0) { + sz = size; + if (sz > 8192) + sz = 8192; + status = file->Write(file, &sz, bufp); + twiddle(); + if (EFI_ERROR(status)) + return EIO; + if (sz == 0) + break; + size -= sz; + bufp += sz; + } + if (resid) + *resid = size; return 0; } @@ -246,7 +274,7 @@ efifs_open, efifs_close, efifs_read, - null_write, + efifs_write, efifs_seek, efifs_stat, efifs_readdir ==== //depot/projects/smpng/sys/cam/scsi/scsi_low.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.13 2002/01/09 03:37:16 msmith Exp $ */ +/* $FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.14 2002/03/20 08:55:21 alfred Exp $ */ /* $NecBSD: scsi_low.c,v 1.24.10.8 2001/06/26 07:39:44 honda Exp $ */ /* $NetBSD$ */ @@ -145,37 +145,37 @@ /************************************************************** * Declarations **************************************************************/ -/* static */ void scsi_low_info __P((struct scsi_low_softc *, struct targ_info *, u_char *)); -static void scsi_low_engage __P((void *)); -static struct slccb *scsi_low_establish_ccb __P((struct targ_info *, struct lun_info *, scsi_low_tag_t)); -static int scsi_low_done __P((struct scsi_low_softc *, struct slccb *)); -static int scsi_low_setup_done __P((struct scsi_low_softc *, struct slccb *)); -static void scsi_low_bus_release __P((struct scsi_low_softc *, struct targ_info *)); -static void scsi_low_twiddle_wait __P((void)); -static struct lun_info *scsi_low_alloc_li __P((struct targ_info *, int, int)); -static struct targ_info *scsi_low_alloc_ti __P((struct scsi_low_softc *, int)); -static void scsi_low_calcf_lun __P((struct lun_info *)); -static void scsi_low_calcf_target __P((struct targ_info *)); -static void scsi_low_calcf_show __P((struct lun_info *)); -static void scsi_low_reset_nexus __P((struct scsi_low_softc *, int)); -static void scsi_low_reset_nexus_target __P((struct scsi_low_softc *, struct targ_info *, int)); -static void scsi_low_reset_nexus_lun __P((struct scsi_low_softc *, struct lun_info *, int)); -static int scsi_low_init __P((struct scsi_low_softc *, u_int)); -static void scsi_low_start __P((struct scsi_low_softc *)); -static void scsi_low_free_ti __P((struct scsi_low_softc *)); +/* static */ void scsi_low_info(struct scsi_low_softc *, struct targ_info *, u_char *); +static void scsi_low_engage(void *); +static struct slccb *scsi_low_establish_ccb(struct targ_info *, struct lun_info *, scsi_low_tag_t); +static int scsi_low_done(struct scsi_low_softc *, struct slccb *); +static int scsi_low_setup_done(struct scsi_low_softc *, struct slccb *); +static void scsi_low_bus_release(struct scsi_low_softc *, struct targ_info *); +static void scsi_low_twiddle_wait(void); +static struct lun_info *scsi_low_alloc_li(struct targ_info *, int, int); +static struct targ_info *scsi_low_alloc_ti(struct scsi_low_softc *, int); +static void scsi_low_calcf_lun(struct lun_info *); +static void scsi_low_calcf_target(struct targ_info *); +static void scsi_low_calcf_show(struct lun_info *); +static void scsi_low_reset_nexus(struct scsi_low_softc *, int); +static void scsi_low_reset_nexus_target(struct scsi_low_softc *, struct targ_info *, int); +static void scsi_low_reset_nexus_lun(struct scsi_low_softc *, struct lun_info *, int); +static int scsi_low_init(struct scsi_low_softc *, u_int); +static void scsi_low_start(struct scsi_low_softc *); +static void scsi_low_free_ti(struct scsi_low_softc *); -static int scsi_low_alloc_qtag __P((struct slccb *)); -static int scsi_low_dealloc_qtag __P((struct slccb *)); -static int scsi_low_enqueue __P((struct scsi_low_softc *, struct targ_info *, struct lun_info *, struct slccb *, u_int, u_int)); -static int scsi_low_message_enqueue __P((struct scsi_low_softc *, struct targ_info *, struct lun_info *, u_int)); -static void scsi_low_unit_ready_cmd __P((struct slccb *)); -static void scsi_low_timeout __P((void *)); -static int scsi_low_timeout_check __P((struct scsi_low_softc *)); +static int scsi_low_alloc_qtag(struct slccb *); +static int scsi_low_dealloc_qtag(struct slccb *); +static int scsi_low_enqueue(struct scsi_low_softc *, struct targ_info *, struct lun_info *, struct slccb *, u_int, u_int); +static int scsi_low_message_enqueue(struct scsi_low_softc *, struct targ_info *, struct lun_info *, u_int); +static void scsi_low_unit_ready_cmd(struct slccb *); +static void scsi_low_timeout(void *); +static int scsi_low_timeout_check(struct scsi_low_softc *); #ifdef SCSI_LOW_START_UP_CHECK -static int scsi_low_start_up __P((struct scsi_low_softc *)); +static int scsi_low_start_up(struct scsi_low_softc *); #endif /* SCSI_LOW_START_UP_CHECK */ -static int scsi_low_abort_ccb __P((struct scsi_low_softc *, struct slccb *)); -static struct slccb *scsi_low_revoke_ccb __P((struct scsi_low_softc *, struct slccb *, int)); +static int scsi_low_abort_ccb(struct scsi_low_softc *, struct slccb *); +static struct slccb *scsi_low_revoke_ccb(struct scsi_low_softc *, struct slccb *, int); int scsi_low_version_major = 2; int scsi_low_version_minor = 17; @@ -217,9 +217,9 @@ int scsi_low_test = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 7:51:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F148537B400; Wed, 20 Mar 2002 07:51:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 88E3037B404 for ; Wed, 20 Mar 2002 07:51:06 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2KFp6C87310 for perforce@freebsd.org; Wed, 20 Mar 2002 07:51:06 -0800 (PST) (envelope-from green@freebsd.org) Date: Wed, 20 Mar 2002 07:51:06 -0800 (PST) Message-Id: <200203201551.g2KFp6C87310@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8059 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8059 Change 8059 by green@green_laptop_2 on 2002/03/20 07:50:35 Make vn_fullpath() more reliable by adding a "directory" argument, and store the executable's directory vnode in proc.p_textdvp. The code for this is partially from LOMAC code, and is a bit scary, but does seem to be at least on the surface doing what I expect it to :) Affected files ... ... //depot/projects/trustedbsd/mac/sys/compat/linprocfs/linprocfs.c#5 edit ... //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.c#5 edit ... //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#14 edit ... //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#8 edit ... //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#6 edit ... //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#5 edit ... //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#9 edit ... //depot/projects/trustedbsd/mac/sys/kern/vfs_cache.c#6 edit ... //depot/projects/trustedbsd/mac/sys/net/if.c#13 edit ... //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#3 edit ... //depot/projects/trustedbsd/mac/sys/sys/proc.h#9 edit ... //depot/projects/trustedbsd/mac/sys/sys/vnode.h#16 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/compat/linprocfs/linprocfs.c#5 (text+ko) ==== @@ -345,12 +345,18 @@ int error; /* resolve symlinks etc. in the emulation tree prefix */ - NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, linux_emul_path, td); + NDINIT(&nd, LOOKUP, FOLLOW | SAVESTART, UIO_SYSSPACE, linux_emul_path, + td); flep = NULL; - if (namei(&nd) != 0 || vn_fullpath(td, nd.ni_vp, &dlep, &flep) == -1) + if (namei(&nd) == 0) { + if (vn_fullpath(td, nd.ni_dvp, nd.ni_vp, &dlep, &flep) == 0) + lep = dlep; + else + lep = linux_emul_path; + NDFREE(&nd, 0); + } else { lep = linux_emul_path; - else - lep = dlep; + } lep_len = strlen(lep); mtx_lock(&mountlist_mtx); ==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.c#5 (text+ko) ==== @@ -70,7 +70,7 @@ char *fullpath = "unknown"; char *freepath = NULL; - vn_fullpath(td, p->p_textvp, &fullpath, &freepath); + vn_fullpath(td, p->p_textdvp, p->p_textvp, &fullpath, &freepath); sbuf_printf(sb, "%s", fullpath); if (freepath) free(freepath, M_TEMP); ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#14 (text+ko) ==== @@ -189,7 +189,7 @@ * in ni_vp amoung other things. */ ndp = &nd; - NDINIT(ndp, LOOKUP, LOCKLEAF | FOLLOW | SAVENAME, + NDINIT(ndp, LOOKUP, LOCKLEAF | FOLLOW | SAVENAME | SAVESTART, UIO_USERSPACE, uap->fname, td); interpret: @@ -258,8 +258,9 @@ /* free name buffer and old vnode */ NDFREE(ndp, NDF_ONLY_PNBUF); vrele(ndp->ni_vp); + vrele(ndp->ni_dvp); /* set new name to that of the interpreter */ - NDINIT(ndp, LOOKUP, LOCKLEAF | FOLLOW | SAVENAME, + NDINIT(ndp, LOOKUP, LOCKLEAF | FOLLOW | SAVENAME | SAVESTART, UIO_SYSSPACE, imgp->interpreter_name, td); goto interpret; } @@ -442,8 +443,12 @@ */ if (p->p_textvp) /* release old reference */ vrele(p->p_textvp); + if (p->p_textdvp) /* release old reference */ + vrele(p->p_textdvp); VREF(ndp->ni_vp); + VREF(ndp->ni_dvp); p->p_textvp = ndp->ni_vp; + p->p_textdvp = ndp->ni_dvp; /* * Notify others that we exec'd, and clear the P_INEXEC flag @@ -504,6 +509,7 @@ if (imgp->vp) { NDFREE(ndp, NDF_ONLY_PNBUF); vrele(imgp->vp); + vrele(ndp->ni_dvp); } if (error == 0) ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#8 (text+ko) ==== @@ -306,6 +306,10 @@ p->p_textvp = NULL; vrele(vtmp); } + if ((vtmp = p->p_textdvp) != NULL) { + p->p_textdvp = NULL; + vrele(vtmp); + } /* * Remove proc from allproc queue and pidhash chain. ==== //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#6 (text+ko) ==== @@ -528,10 +528,13 @@ /* bump references to the text vnode (for procfs) */ p2->p_textvp = p1->p_textvp; + p2->p_textdvp = p1->p_textdvp; PROC_UNLOCK(p1); PROC_UNLOCK(p2); if (p2->p_textvp) VREF(p2->p_textvp); + if (p2->p_textdvp) + VREF(p2->p_textdvp); if (flags & RFCFDG) fd = fdinit(td); ==== //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#5 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#9 (text+ko) ==== @@ -784,6 +784,10 @@ vrele(mycp->p_textvp); mycp->p_textvp = NULL; } + if (mycp->p_textdvp) { + vrele(mycp->p_textdvp); + mycp->p_textdvp = NULL; + } /* * Allocate and ready the aio control info. There is one aiop structure ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_cache.c#6 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -797,106 +798,202 @@ * Thus begins the fullpath magic. */ -#undef STATNODE -#define STATNODE(name) \ - static u_int name; \ - SYSCTL_UINT(_vfs_cache, OID_AUTO, name, CTLFLAG_RD, &name, 0, "") - static int disablefullpath; SYSCTL_INT(_debug, OID_AUTO, disablefullpath, CTLFLAG_RW, &disablefullpath, 0, "Disable the vn_fullpath function"); -STATNODE(numfullpathcalls); -STATNODE(numfullpathfail1); -STATNODE(numfullpathfail2); -STATNODE(numfullpathfail3); -STATNODE(numfullpathfail4); -STATNODE(numfullpathfound); +static int +vn_fullpath_dirents_searchbyid(struct thread *td, struct vnode *dvp, + struct dirent *dp, struct dirent *enddp, const struct vattr *vap, + struct dirent **retdp) +{ + struct vattr pvattr; + struct componentname cnp; + struct vnode *vp; + struct ucred *ucred = td->td_ucred; + int error; + + *retdp = NULL; + for (; dp != enddp; dp = (struct dirent *)((char *)dp + dp->d_reclen)) { + if (dp->d_name[0] == '.' && (dp->d_namlen == 1 || + (dp->d_namlen == 2 && dp->d_name[1] == '.'))) + continue; + cnp.cn_nameiop = LOOKUP; + cnp.cn_flags = LOCKPARENT | ISLASTCN | NOFOLLOW; + cnp.cn_thread = td; + cnp.cn_cred = ucred; + cnp.cn_nameptr = dp->d_name; + cnp.cn_namelen = dp->d_namlen; + error = VOP_LOOKUP(dvp, &vp, &cnp); + if (error) + return (error); + error = VOP_GETATTR(vp, &pvattr, ucred, td); + if (vp != dvp) + (void)vput(vp); + else + vrele(vp); /* if looking up "." */ + if (error) + return (error); + if (pvattr.va_fsid == vap->va_fsid && + pvattr.va_fileid == vap->va_fileid) { + *retdp = dp; + break; + } + } + return (0); +} -/* - * Retrieve the full filesystem path that correspond to a vnode from the name - * cache (if available) - */ int -vn_fullpath(struct thread *td, struct vnode *vn, char **retbuf, char **freebuf) -{ - char *bp, *buf; - int i, slash_prefixed; - struct filedesc *fdp; - struct namecache *ncp; - struct vnode *vp; +vn_fullpath(struct thread *td, struct vnode *startdvp, struct vnode *startvp, + char **buf, char **freebuf) { + struct vattr cvattr; + struct vnode *vp, *dvp, *fd_rdir; + char *bp, *allocedmem, *direntmem; + const int direntmem_size = (32 << 10) - MAXPATHLEN; + int error, i, slash_prefixed; - numfullpathcalls++; if (disablefullpath) - return (ENODEV); - if (vn == NULL) - return (EINVAL); - buf = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - bp = buf + MAXPATHLEN - 1; + return (EPERM); + FILEDESC_LOCK(td->td_proc->p_fd); + fd_rdir = td->td_proc->p_fd->fd_rdir; + vref(fd_rdir); + FILEDESC_UNLOCK(td->td_proc->p_fd); + allocedmem = malloc(MAXPATHLEN + direntmem_size, M_TEMP, M_WAITOK); + bp = allocedmem; + bp += MAXPATHLEN - 1; *bp = '\0'; - fdp = td->td_proc->p_fd; + direntmem = allocedmem + MAXPATHLEN; slash_prefixed = 0; - FILEDESC_LOCK(fdp); - for (vp = vn; vp != fdp->fd_rdir && vp != rootvnode;) { + vref(startvp); + for (vp = startvp;; vrele(vp), vp = dvp) { + struct iovec diov = { + direntmem, + direntmem_size + }; + struct uio duio = { + &diov, + 1, + 0, + direntmem_size, + UIO_SYSSPACE, + UIO_READ, + td + }; + struct dirent *dp; + int direof; + + if (vp == rootvnode || vp == fd_rdir) + break; if (vp->v_flag & VROOT) { if (vp->v_mount == NULL) { /* forced unmount */ - FILEDESC_UNLOCK(fdp); - free(buf, M_TEMP); - return (EBADF); + error = EBADF; + goto out; } - vp = vp->v_mount->mnt_vnodecovered; + dvp = vp->v_mount->mnt_vnodecovered; + vref(dvp); continue; } - if (vp != vn && vp->v_dd->v_id != vp->v_ddid) { - FILEDESC_UNLOCK(fdp); - numfullpathfail1++; - free(buf, M_TEMP); - return (ENOTDIR); + if (startdvp != NULL) { + dvp = startdvp; + vref(dvp); + startdvp = NULL; + } else { + if (vp->v_ddid == vp->v_dd->v_id) { + dvp = vp->v_dd; + vref(dvp); + } else { + struct componentname cnp; + + if (vp->v_type != VDIR) { + error = EBADF; + goto out; + } + cnp.cn_nameiop = LOOKUP; + cnp.cn_flags = 0; + cnp.cn_thread = td; + cnp.cn_cred = td->td_ucred; + cnp.cn_nameptr = ".."; + cnp.cn_namelen = 2; + vn_lock(vp, LK_EXCLUSIVE, td); + error = VOP_LOOKUP(vp, &dvp, &cnp); + if (error) { + VOP_UNLOCK(vp, 0, td); + goto out; + } + VOP_UNLOCK(dvp, 0, td); + } } - ncp = TAILQ_FIRST(&vp->v_cache_dst); - if (!ncp) { - FILEDESC_UNLOCK(fdp); - numfullpathfail2++; - free(buf, M_TEMP); - return (ENOENT); + if (vp == dvp) + break; + /* + * Utilize POSIX requirement of files having same + * st_dev and st_ino to be the same file, in our + * case with vattr.va_fsid and vattr.va_fileid. + */ + vn_lock(vp, LK_EXCLUSIVE, td); + error = VOP_GETATTR(vp, &cvattr, curthread->td_ucred, + curthread); + VOP_UNLOCK(vp, 0, td); + if (error) { + vrele(dvp); + goto out; } - if (vp != vn && ncp->nc_dvp != vp->v_dd) { - FILEDESC_UNLOCK(fdp); - numfullpathfail3++; - free(buf, M_TEMP); - return (EBADF); - } - for (i = ncp->nc_nlen - 1; i >= 0; i--) { - if (bp == buf) { - FILEDESC_UNLOCK(fdp); - numfullpathfail4++; - free(buf, M_TEMP); - return (ENOMEM); + vn_lock(dvp, LK_EXCLUSIVE, td); + for (direof = 0; !direof;) { + error = VOP_READDIR(dvp, &duio, td->td_ucred, &direof, + NULL, NULL); + if (error) + break; + error = vn_fullpath_dirents_searchbyid(td, dvp, + (struct dirent *)direntmem, + (struct dirent *)(direntmem + + direntmem_size - duio.uio_resid), + &cvattr, &dp); + if (error) + break; + if (dp != NULL) { + for (i = dp->d_namlen - 1; i >= 0; i--) { + if (bp == allocedmem) { + error = ENOMEM; + vput(dvp); + goto out; + } + *--bp = dp->d_name[i]; + } + goto nextcomp; } - *--bp = ncp->nc_name[i]; + diov.iov_base = direntmem; + diov.iov_len = direntmem_size; + duio.uio_resid = direntmem_size; } - if (bp == buf) { - FILEDESC_UNLOCK(fdp); - numfullpathfail4++; - free(buf, M_TEMP); - return (ENOMEM); + vput(dvp); + if (direof) + error = ENOENT; + goto out; +nextcomp: + if (bp == allocedmem) { + error = ENOMEM; + vput(dvp); + goto out; } *--bp = '/'; slash_prefixed = 1; - vp = ncp->nc_dvp; + VOP_UNLOCK(dvp, 0, td); } if (!slash_prefixed) { - if (bp == buf) { - FILEDESC_UNLOCK(fdp); - numfullpathfail4++; - free(buf, M_TEMP); - return (ENOMEM); + if (bp == allocedmem) { + error = ENOMEM; + goto out; } *--bp = '/'; } - FILEDESC_UNLOCK(fdp); - numfullpathfound++; - *retbuf = bp; - *freebuf = buf; - return (0); + error = 0; + *buf = bp; + *freebuf = allocedmem; +out: + vrele(vp); + vrele(fd_rdir); + if (error) + free(allocedmem, M_TEMP); + return (error); } ==== //depot/projects/trustedbsd/mac/sys/net/if.c#13 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#3 (text+ko) ==== @@ -79,10 +79,10 @@ char *freepath1 = NULL, *freepath2 = NULL; if (vp1 != NULL) { - vn_fullpath(curthread, vp1, &fullpath1, &freepath1); + vn_fullpath(curthread, NULL, vp1, &fullpath1, &freepath1); } if (vp2 != NULL) { - vn_fullpath(curthread, vp2, &fullpath2, &freepath2); + vn_fullpath(curthread, NULL, vp2, &fullpath2, &freepath2); } if (vp1 == NULL && vp2 == NULL) { ==== //depot/projects/trustedbsd/mac/sys/sys/proc.h#9 (text+ko) ==== @@ -418,6 +418,7 @@ struct vnode *p_tracep; /* (j?) Trace to vnode. */ sigset_t p_siglist; /* (c) Sigs arrived, not delivered. */ struct vnode *p_textvp; /* (b) Vnode of executable. */ + struct vnode *p_textdvp; /* (b) Dir vnode of executable. */ struct mtx p_mtx; /* (k) Lock for this struct. */ char p_lock; /* (c) Proclock (prevent swap) count. */ struct klist p_klist; /* (c) Knotes attached to this proc. */ ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#16 (text+ko) ==== @@ -586,10 +586,11 @@ int lease_check __P((struct vop_lease_args *ap)); int spec_vnoperate __P((struct vop_generic_args *)); int speedup_syncer __P((void)); -#define textvp_fullpath(p, rb, rfb) \ - vn_fullpath(FIRST_THREAD_IN_PROC(p), (p)->p_textvp, rb, rfb) -int vn_fullpath __P((struct thread *td, struct vnode *vn, - char **retbuf, char **freebuf)); +#define textvp_fullpath(p, rb, rfb) \ + vn_fullpath(FIRST_THREAD_IN_PROC(p), (p)->p_textdvp, \ + (p)->p_textvp, rb, rfb) +int vn_fullpath __P((struct thread *td, struct vnode *optional_dvp, + struct vnode *vp, char **retbuf, char **freebuf)); int vnaccess __P((struct vnode *vp, mode_t file_mode, uid_t uid, gid_t gid, mode_t acc_mode, struct ucred *cred, int *privused)); int vaccess_acl_posix1e __P((enum vtype type, uid_t file_uid, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 8: 0:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F66C37B404; Wed, 20 Mar 2002 08:00:23 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5DC6037B41C for ; Wed, 20 Mar 2002 08:00:18 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2KG0HA89125 for perforce@freebsd.org; Wed, 20 Mar 2002 08:00:17 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 20 Mar 2002 08:00:17 -0800 (PST) Message-Id: <200203201600.g2KG0HA89125@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8060 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8060 Change 8060 by rwatson@rwatson_tislabs on 2002/03/20 07:59:18 At some point, the "Process Credentials" section became named "Credentials". Re-alphabetize. Affected files ... ... //depot/projects/smpng/sys/design/article.sgml#20 edit Differences ... ==== //depot/projects/smpng/sys/design/article.sgml#20 (text+ko) ==== @@ -23,7 +23,7 @@ - $SMPng: //depot/projects/smpng/sys/design/article.sgml#19 $ + $SMPng: //depot/projects/smpng/sys/design/article.sgml#20 $ 2002 @@ -462,6 +462,39 @@ Specific Locking Strategies + Credentials + + struct ucred is the system + internal credential structure, and is generally used as the + basis for process-driven access control. BSD-derived systems + use a "copy-on-write" model for credential data: multiple + references may exist for a credential structure, and when a + change needs to be made, the structure is duplicated, + modified, and then the reference replaced. Due to wide-spread + caching of the credential to implement access control on open, + this results in substantial memory savings. With a move to + fine-grained SMP, this model also saves substantially on + locking operations by requiring that modification only occur + on an unshared credential, avoiding the need for explicit + synchronization when consuming a known-shared + credential. + + Credential structures with a single reference are + considered mutable; shared credential structures must not be + modified or a race condition is risked. A mutex, + cr_mtxp protects the reference + count of the struct ucred so as to + maintain consistency. Any use of the structure requires a + valid reference for the duration of the use, or the structure + may be released out from under the illegitimate + consumer. + + The struct ucred mutex is a leaf + mutex, and for performance reasons, is implemented via a mutex + pool. + + + File Descriptors and File Descriptor Tables ... @@ -576,39 +609,6 @@ since these locks are most likely not going to be used outside of kern/subr_taskqueue.c. - - - Credentials - - struct ucred is the system - internal credential structure, and is generally used as the - basis for process-driven access control. BSD-derived systems - use a "copy-on-write" model for credential data: multiple - references may exist for a credential structure, and when a - change needs to be made, the structure is duplicated, - modified, and then the reference replaced. Due to wide-spread - caching of the credential to implement access control on open, - this results in substantial memory savings. With a move to - fine-grained SMP, this model also saves substantially on - locking operations by requiring that modification only occur - on an unshared credential, avoiding the need for explicit - synchronization when consuming a known-shared - credential. - - Credential structures with a single reference are - considered mutable; shared credential structures must not be - modified or a race condition is risked. A mutex, - cr_mtxp protects the reference - count of the struct ucred so as to - maintain consistency. Any use of the structure requires a - valid reference for the duration of the use, or the structure - may be released out from under the illegitimate - consumer. - - The struct ucred mutex is a leaf - mutex, and for performance reasons, is implemented via a mutex - pool. - To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 10:44:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5600537B417; Wed, 20 Mar 2002 10:44:23 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7F0EB37B405 for ; Wed, 20 Mar 2002 10:44:22 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2KIiMa47658 for perforce@freebsd.org; Wed, 20 Mar 2002 10:44:22 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 20 Mar 2002 10:44:22 -0800 (PST) Message-Id: <200203201844.g2KIiMa47658@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8076 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8076 Change 8076 by jhb@jhb_laptop on 2002/03/20 10:43:39 Turn off ACPI since it doesn't work. Affected files ... ... //depot/projects/smpng/sys/i386/conf/X86SMP#2 edit ... //depot/projects/smpng/sys/i386/conf/X86UP#2 edit Differences ... ==== //depot/projects/smpng/sys/i386/conf/X86SMP#2 (text+ko) ==== @@ -48,8 +48,8 @@ options KTR_ENTRIES=16384 # ACPI -device acpica -device pmtimer +#device acpica +#device pmtimer device isa device pci ==== //depot/projects/smpng/sys/i386/conf/X86UP#2 (text+ko) ==== @@ -44,8 +44,8 @@ options KTR_ENTRIES=16384 # ACPI -device acpica -device pmtimer +#device acpica +#device pmtimer device isa device pci To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 13: 0:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 531E737B400; Wed, 20 Mar 2002 13:00:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4A16A37B404 for ; Wed, 20 Mar 2002 13:00:12 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2KL0Bb84418 for perforce@freebsd.org; Wed, 20 Mar 2002 13:00:11 -0800 (PST) (envelope-from green@freebsd.org) Date: Wed, 20 Mar 2002 13:00:11 -0800 (PST) Message-Id: <200203202100.g2KL0Bb84418@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8083 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8083 Change 8083 by green@green_laptop_2 on 2002/03/20 12:59:18 Convert the structs socket, bpf_d, and ifnet to also using mac_init_type(), mac_create_type*(), and mac_destroy_type(). Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#114 edit ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#14 edit ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#11 edit ... //depot/projects/trustedbsd/mac/sys/net/bpf.c#9 edit ... //depot/projects/trustedbsd/mac/sys/net/if.c#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#114 (text+ko) ==== @@ -420,13 +420,29 @@ label->m_macflags = MAC_FLAG_INITIALIZED; } +static void +mac_destroy_label(struct mac *label) +{ + + KASSERT(label->m_macflags & MAC_FLAG_INITIALIZED, + ("destroying uninitialized label")); + label->m_macflags &= ~MAC_FLAG_INITIALIZED; +} + SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, "TrustedBSD MAC debug info"); -static unsigned int nmacmbufs, nmacsubjects; +static unsigned int nmacmbufs, nmacsubjects, nmacifnets, nmacbpfdescs, + nmacsockets; SYSCTL_UINT(_security_mac_debug, OID_AUTO, mbufs, CTLFLAG_RD, &nmacmbufs, 0, "number of mbufs in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, subjects, CTLFLAG_RD, &nmacsubjects, 0, "number of ucreds in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, ifnets, CTLFLAG_RD, + &nmacifnets, 0, "number of ifnets in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, bpfdescs, CTLFLAG_RD, + &nmacbpfdescs, 0, "number of bpfdescs in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, sockets, CTLFLAG_RD, + &nmacsockets, 0, "number of sockets in use"); int mac_init_mbuf(struct mbuf *m, int how) @@ -442,6 +458,7 @@ mac_destroy_mbuf(struct mbuf *m) { + mac_destroy_label(&m->m_pkthdr.label); atomic_subtract_int(&nmacmbufs, 1); } @@ -457,9 +474,58 @@ mac_destroy_subject(struct ucred *cr) { + mac_destroy_label(&cr->cr_label); atomic_subtract_int(&nmacsubjects, 1); } +void +mac_init_ifnet(struct ifnet *ifp) +{ + + mac_init_label(&ifp->if_label); + atomic_add_int(&nmacifnets, 1); +} + +void +mac_destroy_ifnet(struct ifnet *ifp) +{ + + mac_destroy_label(&ifp->if_label); + atomic_subtract_int(&nmacifnets, 1); +} + +void +mac_init_socket(struct socket *socket) +{ + + mac_init_label(&socket->so_label); + atomic_add_int(&nmacsockets, 1); +} + +void +mac_destroy_socket(struct socket *socket) +{ + + mac_destroy_label(&socket->so_label); + atomic_subtract_int(&nmacsockets, 1); +} + +void +mac_init_bpfdesc(struct bpf_d *bpf_d) +{ + + mac_init_label(&bpf_d->bd_label); + atomic_add_int(&nmacbpfdescs, 1); +} + +void +mac_destroy_bpfdesc(struct bpf_d *bpf_d) +{ + + mac_destroy_label(&bpf_d->bd_label); + atomic_subtract_int(&nmacbpfdescs, 1); +} + static int mac_label_valid(struct mac *label) { @@ -762,10 +828,9 @@ } void -mac_init_ifnet(struct ifnet *ifnet) +mac_create_ifnet(struct ifnet *ifnet) { - mac_init_label(&ifnet->if_label); MAC_PERFORM(create_ifnet, ifnet); } @@ -773,7 +838,6 @@ mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d) { - mac_init_label(&bpf_d->bd_label); MAC_PERFORM(create_bpfdesc, cred, bpf_d); } @@ -781,7 +845,6 @@ mac_create_socket(struct ucred *cred, struct socket *socket) { - mac_init_label(&socket->so_label); MAC_PERFORM(create_socket, cred, socket); } @@ -790,7 +853,6 @@ struct mac *newlabel) { - mac_init_label(&socket->so_label); MAC_PERFORM(relabel_socket, cred, socket, newlabel); } ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#14 (text+ko) ==== @@ -130,6 +130,9 @@ /* sx_init(&so->so_sxlock, "socket sxlock"); */ TAILQ_INIT(&so->so_aiojobq); ++numopensockets; +#ifdef MAC + mac_init_socket(so); +#endif /* MAC */ } return so; } @@ -230,6 +233,9 @@ FREE(so->so_accf, M_ACCF); } #endif +#ifdef MAC + mac_destroy_socket(so); +#endif /* MAC */ crfree(so->so_cred); /* sx_destroy(&so->so_sxlock); */ zfree(so->so_zone, so); ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#11 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/net/bpf.c#9 (text+ko) ==== @@ -346,6 +346,7 @@ d->bd_sig = SIGIO; d->bd_seesent = 1; #ifdef MAC + mac_init_bpfdesc(d); mac_create_bpfdesc(td->td_proc->p_ucred, d); #endif mtx_init(&d->bd_mtx, devtoname(dev), MTX_DEF); @@ -378,6 +379,9 @@ if (d->bd_bif) bpf_detachd(d); mtx_unlock(&bpf_mtx); +#ifdef MAC + mac_destroy_bpfdesc(d); +#endif /* MAC */ bpf_freed(d); dev->si_drv1 = 0; FREE(d, M_BPF); ==== //depot/projects/trustedbsd/mac/sys/net/if.c#14 (text+ko) ==== @@ -390,6 +390,7 @@ #ifdef MAC mac_init_ifnet(ifp); + mac_create_ifnet(ifp); #endif ifp->if_index = if_findindex(ifp); @@ -528,6 +529,9 @@ /* Announce that the interface is gone. */ rt_ifannouncemsg(ifp, IFAN_DEPARTURE); +#ifdef MAC + mac_destroy_ifnet(ifp); +#endif /* MAC */ KNOTE(&ifp->if_klist, NOTE_EXIT); TAILQ_REMOVE(&ifnet, ifp, if_link); mtx_destroy(&ifp->if_snd.ifq_mtx); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 17:30:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B524C37B41B; Wed, 20 Mar 2002 17:29:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2C52E37B404 for ; Wed, 20 Mar 2002 17:29:13 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L1TC745592 for perforce@freebsd.org; Wed, 20 Mar 2002 17:29:12 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Wed, 20 Mar 2002 17:29:12 -0800 (PST) Message-Id: <200203210129.g2L1TC745592@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 8104 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8104 Change 8104 by tmm@tmm_sparc64 on 2002/03/20 17:28:50 Integ. style stuff and warning fixes from sparc64-tmm. Affected files ... ... //depot/projects/sparc64/sys/dev/gem/if_gem.c#11 integrate ... //depot/projects/sparc64/sys/sparc64/include/bus.h#10 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/db_disasm.c#9 integrate Differences ... ==== //depot/projects/sparc64/sys/dev/gem/if_gem.c#11 (text+ko) ==== @@ -90,6 +90,7 @@ struct mbuf *gem_get(struct gem_softc *, int, int); static void gem_eint(struct gem_softc *, u_int); static void gem_rint(struct gem_softc *); +static void gem_rint_timeout(void *); static void gem_tint(struct gem_softc *); #ifdef notyet static void gem_power(int, void *); ==== //depot/projects/sparc64/sys/sparc64/include/bus.h#10 (text+ko) ==== @@ -129,55 +129,34 @@ bus_space_tag_t parent; int type; - void (*bus_barrier) __P(( - bus_space_tag_t, - bus_space_handle_t, - bus_size_t, /*offset*/ - bus_size_t, /*size*/ - int)); /*flags*/ + void (*bus_barrier)(bus_space_tag_t, bus_space_handle_t, + bus_size_t, bus_size_t, int); }; /* * Helpers */ -int sparc64_bus_mem_map __P(( - bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - int, /*flags*/ - vm_offset_t, /*preferred vaddr*/ - void **)); -int sparc64_bus_mem_unmap __P(( - void *, - bus_size_t)); -bus_space_handle_t sparc64_fake_bustag __P(( - int, - bus_addr_t, - struct bus_space_tag *)); +int sparc64_bus_mem_map(bus_space_tag_t, bus_space_handle_t, bus_size_t, + int, vm_offset_t, void **); +int sparc64_bus_mem_unmap(void *, bus_size_t); +bus_space_handle_t sparc64_fake_bustag(int, bus_addr_t, + struct bus_space_tag *); /* * Bus space function prototypes. */ -static void bus_space_barrier __P(( - bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - bus_size_t, - int)); +static void bus_space_barrier(bus_space_tag_t, bus_space_handle_t, bus_size_t, + bus_size_t, int); /* This macro finds the first "upstream" implementation of method `f' */ -#define _BS_CALL(t,f) \ - while (t->f == NULL) \ - t = t->parent; \ +#define _BS_CALL(t,f) \ + while (t->f == NULL) \ + t = t->parent; \ return (*(t)->f) -__inline__ void -bus_space_barrier(t, h, o, s, f) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o; - bus_size_t s; - int f; +static __inline void +bus_space_barrier(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, + bus_size_t s, int f) { _BS_CALL(t, bus_barrier)(t, h, o, s, f); } @@ -211,13 +190,6 @@ #define __BUS_DEBUG_ACCESS(h, o, desc, sz) #endif -/* - * u_intN_t bus_space_read_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset)); - * - * Read a 1, 2, 4, or 8 byte quantity from bus space - * described by tag/handle/offset. - */ #define bus_space_read_1(t, h, o) ({ \ __BUS_DEBUG_ACCESS((h), (o), "read", 1); \ lduba_nc((caddr_t)((h) + (o)), bus_type_asi[(t)->type]); \ @@ -238,14 +210,6 @@ ldxa_nc((caddr_t)(h) + (o), bus_type_asi[(t)->type]); \ }) -/* - * void bus_space_read_multi_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); - * - * Read `count' 1, 2, 4, or 8 byte quantities from bus space - * described by tag/handle/offset and copy into buffer provided. - */ #define bus_space_read_multi_1(t, h, o, a, c) do { \ int i = c; \ u_int8_t *p = (u_int8_t *)a; \ @@ -274,14 +238,6 @@ *p++ = bus_space_read_8(t, h, o); \ } while (0) -/* - * void bus_space_write_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t value)); - * - * Write the 1, 2, 4, or 8 byte value `value' to bus space - * described by tag/handle/offset. - */ #define bus_space_write_1(t, h, o, v) do { \ __BUS_DEBUG_ACCESS((h), (o), "write", 1); \ stba_nc((caddr_t)((h) + (o)), bus_type_asi[(t)->type], (v)); \ @@ -302,14 +258,6 @@ stxa_nc((caddr_t)((h) + (o)), bus_type_asi[(t)->type], (v)); \ } while (0) -/* - * void bus_space_write_multi_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); - * - * Write `count' 1, 2, 4, or 8 byte quantities from the buffer - * provided to bus space described by tag/handle/offset. - */ #define bus_space_write_multi_1(t, h, o, a, c) do { \ int i = c; \ u_int8_t *p = (u_int8_t *)a; \ @@ -338,14 +286,6 @@ bus_space_write_8(t, h, o, *p++); \ } while (0) -/* - * void bus_space_set_multi_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); - * - * Write the 1, 2, 4, or 8 byte value `val' to bus space described - * by tag/handle/offset `count' times. - */ #define bus_space_set_multi_1(t, h, o, v, c) do { \ int i = c; \ while (i-- > 0) \ @@ -370,304 +310,134 @@ bus_space_write_8(t, h, o, v); \ } while (0) -/* - * void bus_space_read_region_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t off, - * u_intN_t *addr, bus_size_t count)); - * - */ -static void bus_space_read_region_1 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - u_int8_t *, - bus_size_t)); -static void bus_space_read_region_2 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - u_int16_t *, - bus_size_t)); -static void bus_space_read_region_4 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - u_int32_t *, - bus_size_t)); -static void bus_space_read_region_8 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - u_int64_t *, - bus_size_t)); - -static __inline__ void -bus_space_read_region_1(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - u_int8_t *a; +static __inline void +bus_space_read_region_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, + u_int8_t *a, bus_size_t c) { for (; c; a++, c--, o++) *a = bus_space_read_1(t, h, o); } -static __inline__ void -bus_space_read_region_2(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - u_int16_t *a; +static __inline void +bus_space_read_region_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, + u_int16_t *a, bus_size_t c) { for (; c; a++, c--, o+=2) *a = bus_space_read_2(t, h, o); } -static __inline__ void -bus_space_read_region_4(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - u_int32_t *a; +static __inline void +bus_space_read_region_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, + u_int32_t *a, bus_size_t c) { for (; c; a++, c--, o+=4) *a = bus_space_read_4(t, h, o); } -static __inline__ void -bus_space_read_region_8(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - u_int64_t *a; +static __inline void +bus_space_read_region_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, + u_int64_t *a, bus_size_t c) { for (; c; a++, c--, o+=8) *a = bus_space_read_8(t, h, o); } -/* - * void bus_space_write_region_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t off, - * u_intN_t *addr, bus_size_t count)); - * - */ -static void bus_space_write_region_1 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int8_t *, - bus_size_t)); -static void bus_space_write_region_2 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int16_t *, - bus_size_t)); -static void bus_space_write_region_4 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int32_t *, - bus_size_t)); -static void bus_space_write_region_8 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int64_t *, - bus_size_t)); - -static __inline__ void -bus_space_write_region_1(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int8_t *a; +static __inline void +bus_space_write_region_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, + const u_int8_t *a, bus_size_t c) { for (; c; a++, c--, o++) bus_space_write_1(t, h, o, *a); } -static __inline__ void -bus_space_write_region_2(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int16_t *a; +static __inline void +bus_space_write_region_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, + const u_int16_t *a, bus_size_t c) { for (; c; a++, c--, o+=2) bus_space_write_2(t, h, o, *a); } -static __inline__ void -bus_space_write_region_4(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int32_t *a; +static __inline void +bus_space_write_region_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, + const u_int32_t *a, bus_size_t c) { for (; c; a++, c--, o+=4) bus_space_write_4(t, h, o, *a); } -static __inline__ void -bus_space_write_region_8(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int64_t *a; +static __inline void +bus_space_write_region_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, + const u_int64_t *a, bus_size_t c) { for (; c; a++, c--, o+=8) bus_space_write_8(t, h, o, *a); } -/* - * void bus_space_set_region_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t off, - * u_intN_t *addr, bus_size_t count)); - * - */ -static void bus_space_set_region_1 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int8_t, - bus_size_t)); -static void bus_space_set_region_2 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int16_t, - bus_size_t)); -static void bus_space_set_region_4 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int32_t, - bus_size_t)); -static void bus_space_set_region_8 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int64_t, - bus_size_t)); - -static __inline__ void -bus_space_set_region_1(t, h, o, v, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int8_t v; +static __inline void +bus_space_set_region_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, + const u_int8_t v, bus_size_t c) { for (; c; c--, o++) bus_space_write_1(t, h, o, v); } -static __inline__ void -bus_space_set_region_2(t, h, o, v, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int16_t v; +static __inline void +bus_space_set_region_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, + const u_int16_t v, bus_size_t c) { for (; c; c--, o+=2) bus_space_write_2(t, h, o, v); } -static __inline__ void -bus_space_set_region_4(t, h, o, v, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int32_t v; +static __inline void +bus_space_set_region_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, + const u_int32_t v, bus_size_t c) { for (; c; c--, o+=4) bus_space_write_4(t, h, o, v); } -static __inline__ void -bus_space_set_region_8(t, h, o, v, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int64_t v; +static __inline void +bus_space_set_region_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, + const u_int64_t v, bus_size_t c) { for (; c; c--, o+=8) bus_space_write_8(t, h, o, v); } -/* - * void bus_space_copy_region_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh1, bus_size_t off1, - * bus_space_handle_t bsh2, bus_size_t off2, - * bus_size_t count)); - * - * Copy `count' 1, 2, 4, or 8 byte values from bus space starting - * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2. - */ -static void bus_space_copy_region_1 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - bus_space_handle_t, - bus_size_t, - bus_size_t)); -static void bus_space_copy_region_2 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - bus_space_handle_t, - bus_size_t, - bus_size_t)); -static void bus_space_copy_region_4 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - bus_space_handle_t, - bus_size_t, - bus_size_t)); -static void bus_space_copy_region_8 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - bus_space_handle_t, - bus_size_t, - bus_size_t)); - -static __inline__ void -bus_space_copy_region_1(t, h1, o1, h2, o2, c) - bus_space_tag_t t; - bus_space_handle_t h1, h2; - bus_size_t o1, o2; - bus_size_t c; +static __inline void +bus_space_copy_region_1(bus_space_tag_t t, bus_space_handle_t h1, + bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { for (; c; c--, o1++, o2++) bus_space_write_1(t, h1, o1, bus_space_read_1(t, h2, o2)); } -static __inline__ void -bus_space_copy_region_2(t, h1, o1, h2, o2, c) - bus_space_tag_t t; - bus_space_handle_t h1, h2; - bus_size_t o1, o2; - bus_size_t c; +static __inline void +bus_space_copy_region_2(bus_space_tag_t t, bus_space_handle_t h1, + bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { for (; c; c--, o1+=2, o2+=2) bus_space_write_2(t, h1, o1, bus_space_read_2(t, h2, o2)); } -static __inline__ void -bus_space_copy_region_4(t, h1, o1, h2, o2, c) - bus_space_tag_t t; - bus_space_handle_t h1, h2; - bus_size_t o1, o2; - bus_size_t c; +static __inline void +bus_space_copy_region_4(bus_space_tag_t t, bus_space_handle_t h1, + bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { for (; c; c--, o1+=4, o2+=4) bus_space_write_4(t, h1, o1, bus_space_read_4(t, h2, o2)); } -static __inline__ void -bus_space_copy_region_8(t, h1, o1, h2, o2, c) - bus_space_tag_t t; - bus_space_handle_t h1, h2; - bus_size_t o1, o2; - bus_size_t c; +static __inline void +bus_space_copy_region_8(bus_space_tag_t t, bus_space_handle_t h1, + bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { for (; c; c--, o1+=8, o2+=8) bus_space_write_8(t, h1, o1, bus_space_read_8(t, h2, o2)); } -/* - * u_intN_t bus_space_read_stream_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset)); - * - * Read a 1, 2, 4, or 8 byte quantity from bus space - * described by tag/handle/offset. - */ #define bus_space_read_stream_1(t, h, o) ({ \ __BUS_DEBUG_ACCESS((h), (o), "read stream", 1); \ lduba_nc((caddr_t)((h) + (o)), bus_stream_asi[(t)->type]); \ @@ -688,14 +458,6 @@ ldxa_nc((caddr_t)((h) + (o)), bus_stream_asi[(t)->type]); \ }) -/* - * void bus_space_read_multi_stream_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t *addr, size_t count)); - * - * Read `count' 1, 2, 4, or 8 byte quantities from bus space - * described by tag/handle/offset and copy into buffer provided. - */ #define bus_space_read_multi_stream_1(t, h, o, a, c) do { \ int i = c; \ u_int8_t *p = (u_int8_t *)a; \ @@ -724,14 +486,6 @@ *p++ = bus_space_read_stream_8(t, h, o); \ } while (0) -/* - * void bus_space_write_stream_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, - * u_intN_t value)); - * - * Write the 1, 2, 4, or 8 byte value `value' to bus space - * described by tag/handle/offset. - */ #define bus_space_write_stream_1(t, h, o, v) do { \ __BUS_DEBUG_ACCESS((h), (o), "write stream", 1); \ stba_nc((caddr_t)((h) + (o)), bus_stream_asi[(t)->type], (v)); \ @@ -752,14 +506,6 @@ stxa_nc((caddr_t)((h) + (o)), bus_stream_asi[(t)->type], (v)); \ } while (0) -/* - * void bus_space_write_multi_stream_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, - * const u_intN_t *addr, size_t count)); - * - * Write `count' 1, 2, 4, or 8 byte quantities from the buffer - * provided to bus space described by tag/handle/offset. - */ #define bus_space_write_multi_stream_1(t, h, o, a, c) do { \ int i = c; \ u_int8_t *p = (u_int8_t *)a; \ @@ -788,14 +534,6 @@ bus_space_write_stream_8(t, h, o, *p++); \ } while (0) -/* - * void bus_space_set_multi_stream_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val, - * size_t count)); - * - * Write the 1, 2, 4, or 8 byte value `val' to bus space described - * by tag/handle/offset `count' times. - */ #define bus_space_set_multi_stream_1(t, h, o, v, c) do { \ int i = c; \ while (i-- > 0) \ @@ -820,296 +558,132 @@ bus_space_write_stream_8(t, h, o, v); \ } while (0) -/* - * void bus_space_read_region_stream_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t off, - * u_intN_t *addr, bus_size_t count)); - * - */ -static void bus_space_read_region_stream_1 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - u_int8_t *, - bus_size_t)); -static void bus_space_read_region_stream_2 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - u_int16_t *, - bus_size_t)); -static void bus_space_read_region_stream_4 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - u_int32_t *, - bus_size_t)); -static void bus_space_read_region_stream_8 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - u_int64_t *, - bus_size_t)); - -static __inline__ void -bus_space_read_region_stream_1(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - u_int8_t *a; +static __inline void +bus_space_read_region_stream_1(bus_space_tag_t t, bus_space_handle_t h, + bus_size_t o, u_int8_t *a, bus_size_t c) { for (; c; a++, c--, o++) *a = bus_space_read_stream_1(t, h, o); } -static __inline__ void -bus_space_read_region_stream_2(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - u_int16_t *a; +static __inline void +bus_space_read_region_stream_2(bus_space_tag_t t, bus_space_handle_t h, + bus_size_t o, u_int16_t *a, bus_size_t c) { for (; c; a++, c--, o+=2) *a = bus_space_read_stream_2(t, h, o); } -static __inline__ void -bus_space_read_region_stream_4(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - u_int32_t *a; +static __inline void +bus_space_read_region_stream_4(bus_space_tag_t t, bus_space_handle_t h, + bus_size_t o, u_int32_t *a, bus_size_t c) { for (; c; a++, c--, o+=4) *a = bus_space_read_stream_4(t, h, o); } -static __inline__ void -bus_space_read_region_stream_8(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - u_int64_t *a; +static __inline void +bus_space_read_region_stream_8(bus_space_tag_t t, bus_space_handle_t h, + bus_size_t o, u_int64_t *a, bus_size_t c) { for (; c; a++, c--, o+=8) *a = bus_space_read_stream_8(t, h, o); } -/* - * void bus_space_write_region_stream_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t off, - * u_intN_t *addr, bus_size_t count)); - * - */ -static void bus_space_write_region_stream_1 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int8_t *, - bus_size_t)); -static void bus_space_write_region_stream_2 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int16_t *, - bus_size_t)); -static void bus_space_write_region_stream_4 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int32_t *, - bus_size_t)); -static void bus_space_write_region_stream_8 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int64_t *, - bus_size_t)); - -static __inline__ void -bus_space_write_region_stream_1(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int8_t *a; +static __inline void +bus_space_write_region_stream_1(bus_space_tag_t t, bus_space_handle_t h, + bus_size_t o, const u_int8_t *a, bus_size_t c) { for (; c; a++, c--, o++) bus_space_write_stream_1(t, h, o, *a); } -static __inline__ void -bus_space_write_region_stream_2(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int16_t *a; +static __inline void +bus_space_write_region_stream_2(bus_space_tag_t t, bus_space_handle_t h, + bus_size_t o, const u_int16_t *a, bus_size_t c) { for (; c; a++, c--, o+=2) bus_space_write_stream_2(t, h, o, *a); } -static __inline__ void -bus_space_write_region_stream_4(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int32_t *a; +static __inline void +bus_space_write_region_stream_4(bus_space_tag_t t, bus_space_handle_t h, + bus_size_t o, const u_int32_t *a, bus_size_t c) { for (; c; a++, c--, o+=4) bus_space_write_stream_4(t, h, o, *a); } -static __inline__ void -bus_space_write_region_stream_8(t, h, o, a, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int64_t *a; +static __inline void +bus_space_write_region_stream_8(bus_space_tag_t t, bus_space_handle_t h, + bus_size_t o, const u_int64_t *a, bus_size_t c) { for (; c; a++, c--, o+=8) bus_space_write_stream_8(t, h, o, *a); } -/* - * void bus_space_set_region_stream_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh, bus_size_t off, - * u_intN_t *addr, bus_size_t count)); - * - */ -static void bus_space_set_region_stream_1 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int8_t, - bus_size_t)); -static void bus_space_set_region_stream_2 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int16_t, - bus_size_t)); -static void bus_space_set_region_stream_4 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int32_t, - bus_size_t)); -static void bus_space_set_region_stream_8 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - const u_int64_t, - bus_size_t)); - -static __inline__ void -bus_space_set_region_stream_1(t, h, o, v, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int8_t v; +static __inline void +bus_space_set_region_stream_1(bus_space_tag_t t, bus_space_handle_t h, + bus_size_t o, const u_int8_t v, bus_size_t c) { for (; c; c--, o++) bus_space_write_stream_1(t, h, o, v); } -static __inline__ void -bus_space_set_region_stream_2(t, h, o, v, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int16_t v; +static __inline void +bus_space_set_region_stream_2(bus_space_tag_t t, bus_space_handle_t h, + bus_size_t o, const u_int16_t v, bus_size_t c) { for (; c; c--, o+=2) bus_space_write_stream_2(t, h, o, v); } -static __inline__ void -bus_space_set_region_stream_4(t, h, o, v, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int32_t v; +static __inline void +bus_space_set_region_stream_4(bus_space_tag_t t, bus_space_handle_t h, + bus_size_t o, const u_int32_t v, bus_size_t c) { for (; c; c--, o+=4) bus_space_write_stream_4(t, h, o, v); } -static __inline__ void -bus_space_set_region_stream_8(t, h, o, v, c) - bus_space_tag_t t; - bus_space_handle_t h; - bus_size_t o, c; - const u_int64_t v; +static __inline void +bus_space_set_region_stream_8(bus_space_tag_t t, bus_space_handle_t h, + bus_size_t o, const u_int64_t v, bus_size_t c) { for (; c; c--, o+=8) bus_space_write_stream_8(t, h, o, v); } -/* - * void bus_space_copy_region_stream_N __P((bus_space_tag_t tag, - * bus_space_handle_t bsh1, bus_size_t off1, - * bus_space_handle_t bsh2, bus_size_t off2, - * bus_size_t count)); - * - * Copy `count' 1, 2, 4, or 8 byte values from bus space starting - * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2. - */ -static void bus_space_copy_region_stream_1 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - bus_space_handle_t, - bus_size_t, - bus_size_t)); -static void bus_space_copy_region_stream_2 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - bus_space_handle_t, - bus_size_t, - bus_size_t)); -static void bus_space_copy_region_stream_4 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - bus_space_handle_t, - bus_size_t, - bus_size_t)); -static void bus_space_copy_region_stream_8 __P((bus_space_tag_t, - bus_space_handle_t, - bus_size_t, - bus_space_handle_t, - bus_size_t, - bus_size_t)); - - -static __inline__ void -bus_space_copy_region_stream_1(t, h1, o1, h2, o2, c) - bus_space_tag_t t; - bus_space_handle_t h1, h2; - bus_size_t o1, o2; - bus_size_t c; +static __inline void +bus_space_copy_region_stream_1(bus_space_tag_t t, bus_space_handle_t h1, + bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { for (; c; c--, o1++, o2++) bus_space_write_stream_1(t, h1, o1, bus_space_read_stream_1(t, h2, o2)); } -static __inline__ void -bus_space_copy_region_stream_2(t, h1, o1, h2, o2, c) - bus_space_tag_t t; - bus_space_handle_t h1, h2; - bus_size_t o1, o2; - bus_size_t c; +static __inline void +bus_space_copy_region_stream_2(bus_space_tag_t t, bus_space_handle_t h1, + bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { for (; c; c--, o1+=2, o2+=2) bus_space_write_stream_2(t, h1, o1, bus_space_read_stream_2(t, h2, o2)); } -static __inline__ void -bus_space_copy_region_stream_4(t, h1, o1, h2, o2, c) - bus_space_tag_t t; - bus_space_handle_t h1, h2; - bus_size_t o1, o2; - bus_size_t c; +static __inline void +bus_space_copy_region_stream_4(bus_space_tag_t t, bus_space_handle_t h1, + bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { for (; c; c--, o1+=4, o2+=4) bus_space_write_stream_4(t, h1, o1, bus_space_read_stream_4(t, h2, o2)); } -static __inline__ void -bus_space_copy_region_stream_8(t, h1, o1, h2, o2, c) - bus_space_tag_t t; - bus_space_handle_t h1, h2; - bus_size_t o1, o2; - bus_size_t c; +static __inline void +bus_space_copy_region_stream_8(bus_space_tag_t t, bus_space_handle_t h1, + bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c) { for (; c; c--, o1+=8, o2+=8) bus_space_write_stream_8(t, h1, o1, bus_space_read_8(t, h2, o2)); @@ -1200,11 +774,6 @@ struct mbuf; struct uio; -/* - * bus_dmasync_op_t - * - * Operations performed by bus_dmamap_sync(). - */ typedef enum { BUS_DMASYNC_PREREAD, BUS_DMASYNC_POSTREAD, @@ -1221,12 +790,6 @@ typedef struct bus_dma_tag *bus_dma_tag_t; typedef struct bus_dmamap *bus_dmamap_t; -/* - * bus_dma_segment_t - * - * Describes a single contiguous DMA transaction. Values - * are suitable for programming into DMA registers. - */ struct bus_dma_segment { bus_addr_t ds_addr; /* DVMA address */ bus_size_t ds_len; /* length of transfer */ @@ -1264,20 +827,19 @@ /* * DMA mapping methods. */ - int (*dmamap_create) __P((bus_dma_tag_t, int, bus_dmamap_t *)); - int (*dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t)); - int (*dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, bus_dmamap_callback_t *, void *, int)); - void (*dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t)); - void (*dmamap_sync) __P((bus_dma_tag_t, bus_dmamap_t, - bus_dmasync_op_t)); + int (*dmamap_create)(bus_dma_tag_t, int, bus_dmamap_t *); + int (*dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t); + int (*dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, bus_dmamap_callback_t *, void *, int); + void (*dmamap_unload)(bus_dma_tag_t, bus_dmamap_t); + void (*dmamap_sync)(bus_dma_tag_t, bus_dmamap_t, + bus_dmasync_op_t); /* * DMA memory utility functions. */ - int (*dmamem_alloc) __P((bus_dma_tag_t, void **, int, - bus_dmamap_t *)); - void (*dmamem_free) __P((bus_dma_tag_t, void *, bus_dmamap_t)); + int (*dmamem_alloc)(bus_dma_tag_t, void **, int, bus_dmamap_t *); + void (*dmamem_free)(bus_dma_tag_t, void *, bus_dmamap_t); }; /* @@ -1289,8 +851,8 @@ extern bus_dma_tag_t sparc64_root_dma_tag; int bus_dma_tag_create(bus_dma_tag_t, bus_size_t, bus_size_t, bus_addr_t, - bus_addr_t, bus_dma_filter_t *, void *, bus_size_t, int, bus_size_t, - int, bus_dma_tag_t *); + bus_addr_t, bus_dma_filter_t *, void *, bus_size_t, int, bus_size_t, + int, bus_dma_tag_t *); int bus_dma_tag_destroy(bus_dma_tag_t); @@ -1314,11 +876,6 @@ #define bus_dmamem_free(t, v, m) \ (*(t)->dmamem_free)((t), (v), (m)) -/* - * bus_dmamap_t >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 18: 1:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9E3437B41C; Wed, 20 Mar 2002 18:00:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D56BD37B419 for ; Wed, 20 Mar 2002 18:00:00 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L1xpe54592 for perforce@freebsd.org; Wed, 20 Mar 2002 17:59:51 -0800 (PST) (envelope-from jake@freebsd.org) Date: Wed, 20 Mar 2002 17:59:51 -0800 (PST) Message-Id: <200203210159.g2L1xpe54592@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8106 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8106 Change 8106 by jake@jake_sparc64 on 2002/03/20 17:58:54 Integ. Affected files ... ... //depot/projects/sparc64/Makefile.inc1#3 integrate ... //depot/projects/sparc64/contrib/binutils/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/coff-rs6000.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/coff64-rs6000.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/configure#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/configure.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/cpu-i386.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/doc/archures.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/doc/bfdt.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/doc/coffcode.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/doc/core.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/doc/format.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/doc/libbfd.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/doc/opncls.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/doc/reloc.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/doc/section.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/doc/syms.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/doc/targets.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf64-ppc.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf64-x86-64.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elflink.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/NEWS#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/README#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/addr2line.1#2 delete ... //depot/projects/sparc64/contrib/binutils/binutils/ar.1#2 delete ... //depot/projects/sparc64/contrib/binutils/binutils/defparse.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/defparse.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/doc/addr2line.1#1 branch ... //depot/projects/sparc64/contrib/binutils/binutils/doc/ar.1#1 branch ... //depot/projects/sparc64/contrib/binutils/binutils/doc/binutils.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/doc/cxxfilt.man#1 branch ... //depot/projects/sparc64/contrib/binutils/binutils/doc/dlltool.1#1 branch ... //depot/projects/sparc64/contrib/binutils/binutils/doc/nm.1#1 branch ... //depot/projects/sparc64/contrib/binutils/binutils/doc/objcopy.1#1 branch ... //depot/projects/sparc64/contrib/binutils/binutils/doc/objdump.1#1 branch ... //depot/projects/sparc64/contrib/binutils/binutils/doc/ranlib.1#1 branch ... //depot/projects/sparc64/contrib/binutils/binutils/doc/readelf.1#1 branch ... //depot/projects/sparc64/contrib/binutils/binutils/doc/size.1#1 branch ... //depot/projects/sparc64/contrib/binutils/binutils/doc/strings.1#1 branch ... //depot/projects/sparc64/contrib/binutils/binutils/doc/strip.1#1 branch ... //depot/projects/sparc64/contrib/binutils/binutils/nm.1#2 delete ... //depot/projects/sparc64/contrib/binutils/binutils/objcopy.1#2 delete ... //depot/projects/sparc64/contrib/binutils/binutils/objdump.1#2 delete ... //depot/projects/sparc64/contrib/binutils/binutils/ranlib.1#2 delete ... //depot/projects/sparc64/contrib/binutils/binutils/rclex.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/rcparse.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/rcparse.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/readelf.1#2 delete ... //depot/projects/sparc64/contrib/binutils/binutils/size.1#2 delete ... //depot/projects/sparc64/contrib/binutils/binutils/strings.1#2 delete ... //depot/projects/sparc64/contrib/binutils/binutils/strip.1#2 delete ... //depot/projects/sparc64/contrib/binutils/config.guess#2 integrate ... //depot/projects/sparc64/contrib/binutils/config.sub#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/NEWS#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/tc-alpha.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/tc-ia64.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/tc-ppc.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/configure#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/configure.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/doc/as.1#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/doc/as.texinfo#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/doc/c-ppc.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/include/opcode/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/binutils/include/opcode/ppc.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/NEWS#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/configure.tgt#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emulparams/elf_x86_64.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emultempl/elf32.em#3 integrate ... //depot/projects/sparc64/contrib/binutils/ld/ld.1#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/ld.texinfo#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/configure#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/configure.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/i386-dis.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/ppc-dis.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/ppc-opc.c#2 integrate ... //depot/projects/sparc64/crypto/openssh/LICENCE#3 integrate ... //depot/projects/sparc64/crypto/openssh/auth-skey.c#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/Makefile.inc0#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/addr2line/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/ar/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/as/Makefile.inc0#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/as/alpha-freebsd/config.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/as/i386-freebsd/config.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/ld/config.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/libbfd/alpha/bfd.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/libbfd/config.h.fbsd#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/libbfd/i386/bfd.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/libbfd/ia64/bfd.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/libbfd/sparc64/bfd.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/libbinutils/config.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/libopcodes/config.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/nm/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/objcopy/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/objdump/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/ranlib/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/readelf/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/size/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/strings/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/strip/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/send-pr/categories#3 integrate ... //depot/projects/sparc64/lib/csu/sparc64/Makefile#4 integrate ... //depot/projects/sparc64/lib/libc/sys/ptrace.2#5 integrate ... //depot/projects/sparc64/libexec/rtld-elf/sparc64/Makefile.inc#4 integrate ... //depot/projects/sparc64/libexec/rtld-elf/sparc64/lockdflt.c#5 integrate ... //depot/projects/sparc64/libexec/rtld-elf/sparc64/reloc.c#14 integrate ... //depot/projects/sparc64/libexec/rtld-elf/sparc64/rtld_machdep.h#8 integrate ... //depot/projects/sparc64/libexec/rtld-elf/sparc64/rtld_start.S#6 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 integrate ... //depot/projects/sparc64/sbin/camcontrol/camcontrol.c#2 integrate ... //depot/projects/sparc64/sbin/camcontrol/modeedit.c#2 integrate ... //depot/projects/sparc64/sbin/dump/dump.h#2 integrate ... //depot/projects/sparc64/sbin/dump/dumprmt.c#2 integrate ... //depot/projects/sparc64/sbin/dump/itime.c#2 integrate ... //depot/projects/sparc64/sbin/dump/main.c#2 integrate ... //depot/projects/sparc64/sbin/dump/optr.c#2 integrate ... //depot/projects/sparc64/sbin/dump/tape.c#2 integrate ... //depot/projects/sparc64/sbin/dump/traverse.c#2 integrate ... //depot/projects/sparc64/sbin/dump/unctime.c#2 integrate ... //depot/projects/sparc64/sbin/dumpfs/dumpfs.c#2 integrate ... //depot/projects/sparc64/sbin/fsck/fsck.c#2 integrate ... //depot/projects/sparc64/sbin/fsck/fsutil.c#2 integrate ... //depot/projects/sparc64/sbin/fsck/fsutil.h#2 integrate ... //depot/projects/sparc64/sbin/fsck/preen.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/dir.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/fsck.h#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/fsutil.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/inode.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/main.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/pass1.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/pass1b.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/pass2.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/pass3.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/pass4.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/pass5.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/preen.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/setup.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/utilities.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/dir.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/fsck.h#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/fsutil.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/inode.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/main.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/pass1.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/pass1b.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/pass2.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/pass3.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/pass4.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/pass5.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/preen.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/setup.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/utilities.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_msdosfs/dir.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_msdosfs/ext.h#2 integrate ... //depot/projects/sparc64/sbin/fsck_msdosfs/fat.c#2 integrate ... //depot/projects/sparc64/sbin/fsck_msdosfs/main.c#2 integrate ... //depot/projects/sparc64/sbin/fsdb/fsdb.c#2 integrate ... //depot/projects/sparc64/sbin/growfs/growfs.c#2 integrate ... //depot/projects/sparc64/sbin/ifconfig/ifconfig.c#2 integrate ... //depot/projects/sparc64/sbin/init/init.c#2 integrate ... //depot/projects/sparc64/sbin/ipf/Makefile#2 integrate ... //depot/projects/sparc64/sbin/ipmon/Makefile#2 integrate ... //depot/projects/sparc64/sbin/ipnat/Makefile#3 integrate ... //depot/projects/sparc64/sbin/ldconfig/ldconfig.c#2 integrate ... //depot/projects/sparc64/sbin/mount_nfs/mount_nfs.c#2 integrate ... //depot/projects/sparc64/sbin/mountd/mountd.c#2 integrate ... //depot/projects/sparc64/sbin/newfs/mkfs.c#3 integrate ... //depot/projects/sparc64/sbin/newfs/newfs.8#2 integrate ... //depot/projects/sparc64/sbin/newfs/newfs.c#3 integrate ... //depot/projects/sparc64/sbin/newfs/newfs.h#2 integrate ... //depot/projects/sparc64/sbin/ping/ping.c#2 integrate ... //depot/projects/sparc64/sbin/ping6/ping6.c#2 integrate ... //depot/projects/sparc64/sbin/restore/dirs.c#2 integrate ... //depot/projects/sparc64/sbin/restore/extern.h#2 integrate ... //depot/projects/sparc64/sbin/restore/interactive.c#2 integrate ... //depot/projects/sparc64/sbin/restore/main.c#2 integrate ... //depot/projects/sparc64/sbin/restore/restore.c#2 integrate ... //depot/projects/sparc64/sbin/restore/symtab.c#2 integrate ... //depot/projects/sparc64/sbin/restore/tape.c#2 integrate ... //depot/projects/sparc64/sbin/restore/utilities.c#2 integrate ... //depot/projects/sparc64/sbin/route/route.c#2 integrate ... //depot/projects/sparc64/sbin/savecore/savecore.c#2 integrate ... //depot/projects/sparc64/sbin/startslip/startslip.c#2 integrate ... //depot/projects/sparc64/sbin/swapon/swapon.c#2 integrate ... //depot/projects/sparc64/share/man/man4/ng_mppc.4#3 integrate ... //depot/projects/sparc64/share/man/man7/build.7#3 integrate ... //depot/projects/sparc64/share/man/man7/release.7#3 integrate ... //depot/projects/sparc64/share/man/man8/rc.8#3 integrate ... //depot/projects/sparc64/share/me/Makefile#2 integrate ... //depot/projects/sparc64/share/me/me.7#2 delete ... //depot/projects/sparc64/share/me/orig_me.7#1 branch ... //depot/projects/sparc64/share/mk/sys.mk#3 integrate ... //depot/projects/sparc64/sys/alpha/alpha/api_up1000.c#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/autoconf.c#5 integrate ... //depot/projects/sparc64/sys/alpha/alpha/clock.c#3 integrate ... //depot/projects/sparc64/sys/alpha/alpha/cpuconf.c#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/db_disasm.c#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/db_interface.c#5 integrate ... //depot/projects/sparc64/sys/alpha/alpha/db_trace.c#4 integrate ... //depot/projects/sparc64/sys/alpha/alpha/dec_1000a.c#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/dec_2100_a50.c#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/dec_2100_a500.c#3 integrate ... //depot/projects/sparc64/sys/alpha/alpha/dec_axppci_33.c#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/dec_eb164.c#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/dec_eb64plus.c#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/dec_kn20aa.c#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/dec_kn300.c#3 integrate ... //depot/projects/sparc64/sys/alpha/alpha/dec_st550.c#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/dec_st6600.c#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/interrupt.c#11 integrate ... //depot/projects/sparc64/sys/alpha/alpha/machdep.c#21 integrate ... //depot/projects/sparc64/sys/alpha/alpha/pmap.c#13 integrate ... //depot/projects/sparc64/sys/alpha/alpha/prom.c#6 integrate ... //depot/projects/sparc64/sys/alpha/alpha/promcons.c#6 integrate ... //depot/projects/sparc64/sys/alpha/alpha/trap.c#15 integrate ... //depot/projects/sparc64/sys/alpha/alpha/vm_machdep.c#8 integrate ... //depot/projects/sparc64/sys/alpha/include/bootinfo.h#2 integrate ... //depot/projects/sparc64/sys/alpha/include/clock.h#2 integrate ... //depot/projects/sparc64/sys/alpha/include/cpu.h#4 integrate ... //depot/projects/sparc64/sys/alpha/include/cpuconf.h#2 integrate ... //depot/projects/sparc64/sys/alpha/include/db_machdep.h#3 integrate ... //depot/projects/sparc64/sys/alpha/include/float.h#2 integrate ... //depot/projects/sparc64/sys/alpha/include/md_var.h#5 integrate ... //depot/projects/sparc64/sys/alpha/include/pmap.h#5 integrate ... //depot/projects/sparc64/sys/alpha/include/profile.h#2 integrate ... //depot/projects/sparc64/sys/alpha/include/prom.h#3 integrate ... //depot/projects/sparc64/sys/alpha/include/reg.h#4 integrate ... //depot/projects/sparc64/sys/alpha/include/sysarch.h#2 integrate ... //depot/projects/sparc64/sys/alpha/linux/linux_proto.h#7 integrate ... //depot/projects/sparc64/sys/alpha/linux/linux_sysvec.c#5 integrate ... //depot/projects/sparc64/sys/alpha/osf1/osf1_ioctl.c#5 integrate ... //depot/projects/sparc64/sys/alpha/osf1/osf1_misc.c#10 integrate ... //depot/projects/sparc64/sys/alpha/osf1/osf1_mount.c#4 integrate ... //depot/projects/sparc64/sys/alpha/osf1/osf1_proto.h#3 integrate ... //depot/projects/sparc64/sys/alpha/osf1/osf1_signal.c#5 integrate ... //depot/projects/sparc64/sys/alpha/osf1/osf1_signal.h#2 integrate ... //depot/projects/sparc64/sys/alpha/osf1/osf1_sysvec.c#2 integrate ... //depot/projects/sparc64/sys/alpha/osf1/osf1_util.h#3 integrate ... //depot/projects/sparc64/sys/alpha/pci/tsunami.c#4 integrate ... //depot/projects/sparc64/sys/alpha/tc/am7990.c#3 integrate ... //depot/projects/sparc64/sys/alpha/tc/am7990var.h#2 integrate ... //depot/projects/sparc64/sys/alpha/tc/ascvar.h#2 integrate ... //depot/projects/sparc64/sys/alpha/tc/esp.c#2 integrate ... //depot/projects/sparc64/sys/alpha/tc/if_le_dec.c#2 integrate ... //depot/projects/sparc64/sys/alpha/tc/if_le_ioasic.c#2 integrate ... //depot/projects/sparc64/sys/alpha/tc/if_levar.h#2 integrate ... //depot/projects/sparc64/sys/alpha/tc/ioasic.c#2 integrate ... //depot/projects/sparc64/sys/alpha/tc/ioasicvar.h#2 integrate ... //depot/projects/sparc64/sys/alpha/tc/sticvar.h#2 integrate ... //depot/projects/sparc64/sys/alpha/tc/tc.c#2 integrate ... //depot/projects/sparc64/sys/alpha/tc/tcds.c#2 integrate ... //depot/projects/sparc64/sys/alpha/tc/tcdsreg.h#2 integrate ... //depot/projects/sparc64/sys/alpha/tc/tcdsvar.h#2 integrate ... //depot/projects/sparc64/sys/alpha/tc/tcvar.h#2 integrate ... //depot/projects/sparc64/sys/alpha/tlsb/zs_tlsb.c#6 integrate ... //depot/projects/sparc64/sys/arm/include/types.h#2 integrate ... //depot/projects/sparc64/sys/boot/common/isapnp.h#2 integrate ... //depot/projects/sparc64/sys/cam/scsi/scsi_low.c#5 integrate ... //depot/projects/sparc64/sys/cam/scsi/scsi_low.h#2 integrate ... //depot/projects/sparc64/sys/cam/scsi/scsi_low_pisa.h#2 integrate ... //depot/projects/sparc64/sys/coda/coda_fbsd.c#2 integrate ... //depot/projects/sparc64/sys/coda/coda_vfsops.c#7 integrate ... //depot/projects/sparc64/sys/coda/coda_vnops.h#4 integrate ... //depot/projects/sparc64/sys/compat/linprocfs/linprocfs.c#13 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_getcwd.c#5 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_ipc.h#4 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_mib.h#3 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_misc.c#12 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_signal.h#4 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_util.h#6 integrate ... //depot/projects/sparc64/sys/compat/pecoff/imgact_pecoff.c#5 integrate ... //depot/projects/sparc64/sys/compat/svr4/imgact_svr4.c#3 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_exec.h#3 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_fcntl.c#5 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_ioctl.c#4 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_ioctl.h#3 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_ipc.c#2 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_misc.c#7 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_proto.h#3 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_resource.c#4 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_signal.c#3 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_signal.h#2 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_socket.h#3 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_sockio.c#3 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_stat.c#4 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_stream.c#5 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_stropts.h#2 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_termios.c#3 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_ttold.c#3 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_util.h#3 integrate ... //depot/projects/sparc64/sys/conf/kern.post.mk#11 integrate ... //depot/projects/sparc64/sys/crypto/blowfish/blowfish.h#3 integrate ... //depot/projects/sparc64/sys/crypto/cast128/cast128.h#3 integrate ... //depot/projects/sparc64/sys/crypto/des/des.h#3 integrate ... //depot/projects/sparc64/sys/crypto/md5.c#2 integrate ... //depot/projects/sparc64/sys/crypto/md5.h#2 integrate ... //depot/projects/sparc64/sys/crypto/sha1.c#2 integrate ... //depot/projects/sparc64/sys/crypto/sha1.h#2 integrate ... //depot/projects/sparc64/sys/crypto/sha2/sha2.h#2 integrate ... //depot/projects/sparc64/sys/ddb/db_access.h#2 integrate ... //depot/projects/sparc64/sys/ddb/db_break.c#3 integrate ... //depot/projects/sparc64/sys/ddb/db_break.h#3 integrate ... //depot/projects/sparc64/sys/ddb/db_command.c#6 integrate ... //depot/projects/sparc64/sys/ddb/db_command.h#2 integrate ... //depot/projects/sparc64/sys/ddb/db_examine.c#3 integrate ... //depot/projects/sparc64/sys/ddb/db_expr.c#3 integrate ... //depot/projects/sparc64/sys/ddb/db_input.c#3 integrate ... //depot/projects/sparc64/sys/ddb/db_lex.c#3 integrate ... //depot/projects/sparc64/sys/ddb/db_lex.h#2 integrate ... //depot/projects/sparc64/sys/ddb/db_output.c#2 integrate ... //depot/projects/sparc64/sys/ddb/db_output.h#2 integrate ... //depot/projects/sparc64/sys/ddb/db_run.c#4 integrate ... //depot/projects/sparc64/sys/ddb/db_sym.c#2 integrate ... //depot/projects/sparc64/sys/ddb/db_sym.h#2 integrate ... //depot/projects/sparc64/sys/ddb/db_variables.c#2 integrate ... //depot/projects/sparc64/sys/ddb/db_variables.h#2 integrate ... //depot/projects/sparc64/sys/ddb/db_watch.c#2 integrate ... //depot/projects/sparc64/sys/ddb/ddb.h#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate ... //depot/projects/sparc64/sys/dev/ida/ida.c#2 integrate ... //depot/projects/sparc64/sys/dev/ida/ida_disk.c#4 integrate ... //depot/projects/sparc64/sys/dev/md/md.c#15 integrate ... //depot/projects/sparc64/sys/dev/sio/sio_pci.c#5 integrate ... //depot/projects/sparc64/sys/dev/syscons/apm/apm_saver.c#2 integrate ... //depot/projects/sparc64/sys/dev/usb/umass.c#11 integrate ... //depot/projects/sparc64/sys/dev/vinum/vinumio.c#3 integrate ... //depot/projects/sparc64/sys/i386/apm/apm.c#5 integrate ... //depot/projects/sparc64/sys/i386/i386/autoconf.c#8 integrate ... //depot/projects/sparc64/sys/i386/i386/db_disasm.c#2 integrate ... //depot/projects/sparc64/sys/i386/i386/db_interface.c#6 integrate ... //depot/projects/sparc64/sys/i386/i386/db_trace.c#5 integrate ... //depot/projects/sparc64/sys/i386/i386/machdep.c#24 integrate ... //depot/projects/sparc64/sys/i386/i386/mp_machdep.c#17 integrate ... //depot/projects/sparc64/sys/i386/i386/mpapic.c#8 integrate ... //depot/projects/sparc64/sys/i386/i386/perfmon.c#5 integrate ... //depot/projects/sparc64/sys/i386/i386/pmap.c#21 integrate ... //depot/projects/sparc64/sys/i386/i386/sys_machdep.c#10 integrate ... //depot/projects/sparc64/sys/i386/i386/trap.c#19 integrate ... //depot/projects/sparc64/sys/i386/i386/vm_machdep.c#14 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_fcntl.c#4 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_ioctl.c#7 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_ipc.c#3 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_proto.h#3 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_signal.c#3 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_signal.h#2 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_socksys.c#4 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_socksys.h#3 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_stat.c#5 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_util.h#3 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_xenix.h#3 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/imgact_coff.c#6 integrate ... //depot/projects/sparc64/sys/i386/include/apm_bios.h#2 integrate ... //depot/projects/sparc64/sys/i386/include/bus_pc98.h#4 integrate ... //depot/projects/sparc64/sys/i386/include/clock.h#3 integrate ... //depot/projects/sparc64/sys/i386/include/cpu.h#5 integrate ... //depot/projects/sparc64/sys/i386/include/cpufunc.h#9 integrate ... //depot/projects/sparc64/sys/i386/include/dvcfg.h#2 integrate ... //depot/projects/sparc64/sys/i386/include/frame.h#2 integrate ... //depot/projects/sparc64/sys/i386/include/in_cksum.h#3 integrate ... //depot/projects/sparc64/sys/i386/include/md_var.h#8 integrate ... //depot/projects/sparc64/sys/i386/include/npx.h#4 integrate ... //depot/projects/sparc64/sys/i386/include/pcb.h#5 integrate ... //depot/projects/sparc64/sys/i386/include/pcb_ext.h#4 integrate ... //depot/projects/sparc64/sys/i386/include/perfmon.h#2 integrate ... //depot/projects/sparc64/sys/i386/include/physio_proc.h#3 integrate ... //depot/projects/sparc64/sys/i386/include/pmap.h#8 integrate ... //depot/projects/sparc64/sys/i386/include/proc.h#5 integrate ... //depot/projects/sparc64/sys/i386/include/profile.h#4 integrate ... //depot/projects/sparc64/sys/i386/include/reg.h#4 integrate ... //depot/projects/sparc64/sys/i386/include/segments.h#3 integrate ... //depot/projects/sparc64/sys/i386/include/smp.h#5 integrate ... //depot/projects/sparc64/sys/i386/include/sysarch.h#3 integrate ... //depot/projects/sparc64/sys/i386/include/types.h#3 integrate ... //depot/projects/sparc64/sys/i386/include/vm86.h#4 integrate ... //depot/projects/sparc64/sys/i386/isa/bs/bs.c#2 integrate ... //depot/projects/sparc64/sys/i386/isa/bs/bsfunc.c#2 integrate ... //depot/projects/sparc64/sys/i386/isa/bs/bsfunc.h#2 integrate ... //depot/projects/sparc64/sys/i386/isa/bs/bshw.c#2 integrate ... //depot/projects/sparc64/sys/i386/isa/bs/bshw.h#2 integrate ... //depot/projects/sparc64/sys/i386/isa/bs/bshw_dma.c#2 integrate ... //depot/projects/sparc64/sys/i386/isa/bs/bshw_pdma.c#2 integrate ... //depot/projects/sparc64/sys/i386/isa/bs/bsif.c#2 integrate ... //depot/projects/sparc64/sys/i386/isa/bs/bsif.h#2 integrate ... //depot/projects/sparc64/sys/i386/isa/bs/bsvar.h#2 integrate ... //depot/projects/sparc64/sys/i386/isa/ccbque.h#2 integrate ... //depot/projects/sparc64/sys/i386/isa/clock.c#9 integrate ... //depot/projects/sparc64/sys/i386/isa/ctx.c#5 integrate ... //depot/projects/sparc64/sys/i386/isa/cy.c#9 integrate ... //depot/projects/sparc64/sys/i386/isa/elink.h#2 integrate ... //depot/projects/sparc64/sys/i386/isa/icu.h#3 integrate ... //depot/projects/sparc64/sys/i386/isa/if_cx.c#2 integrate ... //depot/projects/sparc64/sys/i386/isa/if_le.c#4 integrate ... //depot/projects/sparc64/sys/i386/isa/if_rdp.c#2 integrate ... //depot/projects/sparc64/sys/i386/isa/intr_machdep.h#6 integrate ... //depot/projects/sparc64/sys/i386/isa/isa_dma.c#3 integrate ... //depot/projects/sparc64/sys/i386/isa/isa_dma.h#2 integrate ... //depot/projects/sparc64/sys/i386/isa/mse.c#5 integrate ... //depot/projects/sparc64/sys/i386/isa/npx.c#15 integrate ... //depot/projects/sparc64/sys/i386/isa/pcaudio.c#7 integrate ... //depot/projects/sparc64/sys/i386/isa/rc.c#4 integrate ... //depot/projects/sparc64/sys/i386/isa/spkr.c#5 integrate ... //depot/projects/sparc64/sys/i386/linux/imgact_linux.c#3 integrate ... //depot/projects/sparc64/sys/i386/linux/linux_proto.h#6 integrate ... //depot/projects/sparc64/sys/i386/linux/linux_syscall.h#5 integrate ... //depot/projects/sparc64/sys/i386/linux/linux_sysent.c#5 integrate ... //depot/projects/sparc64/sys/i386/linux/linux_sysvec.c#12 integrate ... //depot/projects/sparc64/sys/i386/svr4/svr4_machdep.c#6 integrate ... //depot/projects/sparc64/sys/i386/svr4/svr4_machdep.h#3 integrate ... //depot/projects/sparc64/sys/i4b/layer2/i4b_l2fsm.c#3 integrate ... //depot/projects/sparc64/sys/ia64/ia64/autoconf.c#6 integrate ... //depot/projects/sparc64/sys/ia64/ia64/db_interface.c#13 integrate ... //depot/projects/sparc64/sys/ia64/ia64/db_trace.c#8 integrate ... //depot/projects/sparc64/sys/ia64/ia64/machdep.c#31 integrate ... //depot/projects/sparc64/sys/ia64/ia64/pmap.c#21 integrate ... //depot/projects/sparc64/sys/ia64/ia64/sapic.c#5 integrate ... //depot/projects/sparc64/sys/ia64/ia64/trap.c#19 integrate ... //depot/projects/sparc64/sys/ia64/ia64/vm_machdep.c#12 integrate ... //depot/projects/sparc64/sys/ia64/include/clock.h#2 integrate ... //depot/projects/sparc64/sys/ia64/include/cpu.h#6 integrate ... //depot/projects/sparc64/sys/ia64/include/cpufunc.h#7 integrate ... //depot/projects/sparc64/sys/ia64/include/md_var.h#6 integrate ... //depot/projects/sparc64/sys/ia64/include/pmap.h#5 integrate ... //depot/projects/sparc64/sys/ia64/include/profile.h#4 integrate ... //depot/projects/sparc64/sys/ia64/include/reg.h#4 integrate ... //depot/projects/sparc64/sys/isa/isavar.h#4 integrate ... //depot/projects/sparc64/sys/isa/psm.c#11 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/cd9660_node.c#4 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/cd9660_node.h#3 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/cd9660_rrip.c#2 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/cd9660_vfsops.c#6 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/cd9660_vnops.c#3 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/iso.h#3 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/iso_rrip.h#2 integrate ... //depot/projects/sparc64/sys/kern/kern_linker.c#13 integrate ... //depot/projects/sparc64/sys/kern/kern_prot.c#23 integrate ... //depot/projects/sparc64/sys/kern/subr_smp.c#14 integrate ... //depot/projects/sparc64/sys/kern/subr_trap.c#18 integrate ... //depot/projects/sparc64/sys/kern/uipc_domain.c#4 integrate ... //depot/projects/sparc64/sys/kern/uipc_socket.c#15 integrate ... //depot/projects/sparc64/sys/kern/uipc_usrreq.c#17 integrate ... //depot/projects/sparc64/sys/kern/vfs_syscalls.c#21 integrate ... //depot/projects/sparc64/sys/netatm/ipatm/ipatm_if.c#2 integrate ... //depot/projects/sparc64/sys/netatm/ipatm/ipatm_load.c#2 integrate ... //depot/projects/sparc64/sys/netatm/ipatm/ipatm_serv.h#2 integrate ... //depot/projects/sparc64/sys/netatm/ipatm/ipatm_var.h#2 integrate ... //depot/projects/sparc64/sys/netatm/sigpvc/sigpvc_if.c#2 integrate ... //depot/projects/sparc64/sys/netatm/sigpvc/sigpvc_var.h#2 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_arp.c#2 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_cls.c#2 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_if.c#2 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_kxdr.c#2 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_msg.c#2 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_print.c#2 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_proto.c#2 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_var.h#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/q2110_sigaa.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/q2110_sigcpcs.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/qsaal1_sigaa.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/qsaal1_sigcpcs.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/sscf_uni.c#3 integrate ... //depot/projects/sparc64/sys/netatm/uni/sscf_uni_var.h#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/sscop.c#3 integrate ... //depot/projects/sparc64/sys/netatm/uni/sscop_lower.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/sscop_pdu.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/sscop_subr.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/sscop_timer.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/sscop_upper.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/sscop_var.h#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/uni_load.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/uniarp.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/uniarp_input.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/uniarp_timer.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/uniip.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/uniip_var.h#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_decode.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_decode.h#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_encode.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_if.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_msg.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_print.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_sigmgr_state.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_var.h#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_vc_state.c#2 integrate ... //depot/projects/sparc64/sys/netinet/if_ether.c#11 integrate ... //depot/projects/sparc64/sys/netinet/in_pcb.c#14 integrate ... //depot/projects/sparc64/sys/netinet/in_pcb.h#8 integrate ... //depot/projects/sparc64/sys/netinet/ip_divert.c#7 integrate ... //depot/projects/sparc64/sys/netinet/raw_ip.c#10 integrate ... //depot/projects/sparc64/sys/netinet/tcp_subr.c#12 integrate ... //depot/projects/sparc64/sys/netinet/tcp_syncache.c#12 integrate ... //depot/projects/sparc64/sys/netinet/udp_usrreq.c#12 integrate ... //depot/projects/sparc64/sys/netinet6/in6_pcb.c#9 integrate ... //depot/projects/sparc64/sys/nfs/nfs_common.c#6 integrate ... //depot/projects/sparc64/sys/nfsclient/nfs.h#7 integrate ... //depot/projects/sparc64/sys/nfsclient/nfs_node.c#4 integrate ... //depot/projects/sparc64/sys/nfsclient/nfs_subs.c#6 integrate ... //depot/projects/sparc64/sys/nfsclient/nfs_vfsops.c#11 integrate ... //depot/projects/sparc64/sys/nfsserver/nfs_srvsubs.c#7 integrate ... //depot/projects/sparc64/sys/pc98/apm/apm.c#5 integrate ... //depot/projects/sparc64/sys/pc98/i386/machdep.c#20 integrate ... //depot/projects/sparc64/sys/pc98/pc98/clock.c#6 integrate ... //depot/projects/sparc64/sys/pc98/pc98/diskslice_machdep.c#3 integrate ... //depot/projects/sparc64/sys/pc98/pc98/isa_dma.c#3 integrate ... //depot/projects/sparc64/sys/pc98/pc98/mse.c#4 integrate ... //depot/projects/sparc64/sys/pc98/pc98/pc98_machdep.h#2 integrate ... //depot/projects/sparc64/sys/pc98/pc98/pcaudio.c#6 integrate ... //depot/projects/sparc64/sys/pc98/pc98/pmc.c#3 integrate ... //depot/projects/sparc64/sys/pc98/pc98/sio.c#10 integrate ... //depot/projects/sparc64/sys/pc98/pc98/sio_cbus.c#3 integrate ... //depot/projects/sparc64/sys/pc98/pc98/spkr.c#5 integrate ... //depot/projects/sparc64/sys/pc98/pc98/wdreg.h#2 integrate ... //depot/projects/sparc64/sys/pccard/pccard.c#9 integrate ... //depot/projects/sparc64/sys/pccard/pcic.c#13 integrate ... //depot/projects/sparc64/sys/pccard/pcic_pci.h#6 integrate ... //depot/projects/sparc64/sys/powerpc/include/bootinfo.h#2 integrate ... //depot/projects/sparc64/sys/powerpc/include/bus.h#2 integrate ... //depot/projects/sparc64/sys/powerpc/include/clock.h#2 integrate ... //depot/projects/sparc64/sys/powerpc/include/cpu.h#7 integrate ... //depot/projects/sparc64/sys/powerpc/include/db_machdep.h#3 integrate ... //depot/projects/sparc64/sys/powerpc/include/intr.h#2 integrate ... //depot/projects/sparc64/sys/powerpc/include/md_var.h#5 integrate ... //depot/projects/sparc64/sys/powerpc/include/powerpc.h#2 integrate ... //depot/projects/sparc64/sys/powerpc/include/pte.h#3 integrate ... //depot/projects/sparc64/sys/powerpc/include/reg.h#4 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/autoconf.c#4 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/clock.c#4 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/extintr.c#4 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/pmap.c#15 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/syncicache.c#2 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/trap.c#10 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/vm_machdep.c#11 integrate ... //depot/projects/sparc64/sys/sparc64/include/cache.h#11 integrate ... //depot/projects/sparc64/sys/sparc64/include/float.h#4 integrate ... //depot/projects/sparc64/sys/sparc64/include/iommuvar.h#11 integrate ... //depot/projects/sparc64/sys/sparc64/include/reg.h#11 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/db_hwwatch.c#7 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/trap.c#66 integrate ... //depot/projects/sparc64/sys/sys/pcpu.h#6 integrate ... //depot/projects/sparc64/sys/sys/proc.h#28 integrate ... //depot/projects/sparc64/sys/sys/time.h#5 integrate ... //depot/projects/sparc64/sys/sys/ucred.h#6 integrate ... //depot/projects/sparc64/sys/ufs/ifs/ifs_subr.c#2 integrate ... //depot/projects/sparc64/sys/ufs/ifs/ifs_vnops.c#2 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_dirhash.c#7 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_extattr.c#9 integrate ... //depot/projects/sparc64/sys/vm/uma.h#2 integrate ... //depot/projects/sparc64/sys/vm/uma_core.c#2 integrate ... //depot/projects/sparc64/usr.bin/find/extern.h#2 integrate ... //depot/projects/sparc64/usr.bin/find/find.c#2 integrate ... //depot/projects/sparc64/usr.bin/find/find.h#2 integrate ... //depot/projects/sparc64/usr.bin/find/function.c#2 integrate ... //depot/projects/sparc64/usr.bin/find/ls.c#2 integrate ... //depot/projects/sparc64/usr.bin/find/main.c#2 integrate ... //depot/projects/sparc64/usr.bin/find/operator.c#2 integrate ... //depot/projects/sparc64/usr.bin/find/option.c#2 integrate ... //depot/projects/sparc64/usr.bin/mt/mt.c#2 integrate ... //depot/projects/sparc64/usr.bin/paste/paste.c#2 integrate ... //depot/projects/sparc64/usr.bin/xlint/Makefile#3 integrate ... //depot/projects/sparc64/usr.bin/xlint/Makefile.inc#2 integrate ... //depot/projects/sparc64/usr.bin/xlint/lint1/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/xlint/llib/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/xlint/xlint/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/xlint/xlint/pathnames.h#2 integrate ... //depot/projects/sparc64/usr.sbin/ipftest/Makefile#2 integrate ... //depot/projects/sparc64/usr.sbin/vidcontrol/vidcontrol.1#3 integrate Differences ... ==== //depot/projects/sparc64/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.243 2002/03/16 21:41:09 markm Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.245 2002/03/20 18:25:48 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -582,7 +582,7 @@ _fortran= gnu/usr.bin/cc/f771 .endif -.if !defined(NOPERL) || defined(NO_PERL) +.if !defined(NOPERL) && !defined(NO_PERL) _perl= gnu/usr.bin/perl/miniperl .endif @@ -615,9 +615,11 @@ _btxld= usr.sbin/btxld .endif +_xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint + cross-tools: .for _tool in ${_btxld} ${_elf2exe} \ - gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc + gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc ${_xlint} cd ${.CURDIR}/${_tool}; \ ${MAKE} obj; \ ${MAKE} depend; \ @@ -768,7 +770,7 @@ _libkeycap= usr.sbin/pcvt/keycap .endif -.if !defined(NOPERL) || defined(NO_PERL) +.if !defined(NOPERL) && !defined(NO_PERL) _libperl= gnu/usr.bin/perl/libperl .endif ==== //depot/projects/sparc64/contrib/binutils/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,8 @@ +2002-02-23 Daniel Jacobowitz + + * config.guess: Import from master sources, rev 1.232. + * config.sub: Import from master sources, rev 1.246. + 2002-02-09 Alexandre Oliva Contribute sh64-elf. ==== //depot/projects/sparc64/contrib/binutils/bfd/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,58 @@ +2002-03-20 Tom Rix + + * coff-rs6000.c (_bfd_xcoff_stat_arch_elt): Renamed from + _bfd_xcoff_generic_stat_arch_elt. Fix format check. + * coff64-rs6000.c : Use _bfd_xcoff_stat_arch_elt. + +Mon Mar 18 18:06:54 CET 2002 Jan Hubicka + + * cpu-i386.c (bfd_x86_64_arch): Rename to "i386:x86-64" + +2002-03-07 Daniel Jacobowitz + + * configure.in: Set is_release=y for 2.12 release. + * configure: Likewise. + +2002-03-07 Daniel Jacobowitz + + * configure.in: Bump version to 2.12. + * configure: Likewise. + +2002-03-05 Alan Modra + + * configure.in (WIN32LIBADD): Don't eval PICFLAG assignment. + * configure: Regenerate. + +2002-02-26 Andrew Macleod + + * elflink.h (elf_bfd_final_link): Don't crash on SHN_UNDEF local + dynsyms. + +2002-02-25 Alan Modra + + * elf64-ppc.c (ppc64_elf_check_relocs): Warning fix. + (ppc64_elf_relocate_section): Don't generate power4 style branch + hints for *_BRTAKEN and *_BRNTAKEN relocs. + + * elf64-ppc.c (STFD_FR0_0R1, LFD_FR0_0R1, BLR): Define. + (struct ppc_link_hash_table): Add sfpr. + (ppc64_elf_link_hash_table_create): Init it. + (ppc64_elf_create_dynamic_sections): Split creation of .stub and + .glink out to.. + (create_linkage_sections): ..here. Make .sfpr too. + (ppc64_elf_check_relocs): Call create_linkage_sections, and set + dynobj early. + (MIN_SAVE_FPR, MAX_SAVE_FPR): Define. + (ppc64_elf_func_desc_adjust): Look for missing ._savef* and + ._restf* functions, and create as needed. + (func_desc_adjust): Only force_local for shared libs. + +2002-02-22 Jakub Jelinek + + * elf64-sh64.c (sh_elf64_relocate_section): Fix a typo from my + last patch. + * elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise. + 2002-02-20 Peter Schauer * osf-core.c (osf_core_vec): OSF/1 (Digital Unix) core files are @@ -527,6 +582,7 @@ sym check if we find one. * elf64-s390.c (elf_s390_size_dynamic_sections): Likewise. * elf32-hppa.c (elf32_hppa_size_dynamic_sections): Likewise. + * elf32-i386.c (elf_i386_size_dynamic_sections): Likewise. * elf32-s390.c (elf_s390_size_dynamic_sections): Likewise. (elf_s390_grok_prstatus): Add missing prototype. ==== //depot/projects/sparc64/contrib/binutils/bfd/coff-rs6000.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ extern const bfd_target *_bfd_xcoff_archive_p PARAMS ((bfd *)); extern PTR _bfd_xcoff_read_ar_hdr PARAMS ((bfd *)); extern bfd *_bfd_xcoff_openr_next_archived_file PARAMS ((bfd *, bfd *)); -extern int _bfd_xcoff_generic_stat_arch_elt PARAMS ((bfd *, struct stat *)); +extern int _bfd_xcoff_stat_arch_elt PARAMS ((bfd *, struct stat *)); extern boolean _bfd_xcoff_write_armap PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int)); extern boolean _bfd_xcoff_write_archive_contents PARAMS ((bfd *)); @@ -1389,7 +1389,7 @@ /* Stat an element in an XCOFF archive. */ int -_bfd_xcoff_generic_stat_arch_elt (abfd, s) +_bfd_xcoff_stat_arch_elt (abfd, s) bfd *abfd; struct stat *s; { @@ -1399,7 +1399,7 @@ return -1; } - if (! xcoff_big_format_p (abfd)) + if (! xcoff_big_format_p (abfd->my_archive)) { struct xcoff_ar_hdr *hdrp = arch_xhdr (abfd); @@ -3536,7 +3536,7 @@ _bfd_xcoff_read_ar_hdr, /* _read_ar_hdr */ _bfd_xcoff_openr_next_archived_file, /* _openr_next_archived_file */ _bfd_generic_get_elt_at_index, /* _get_elt_at_index */ - _bfd_xcoff_generic_stat_arch_elt, /* _generic_dtat_arch_elt */ + _bfd_xcoff_stat_arch_elt, /* _generic_stat_arch_elt */ /* XCOFF archives do not have a timestamp. */ bfd_true, /* _update_armap_timestamp */ @@ -3797,7 +3797,7 @@ _bfd_xcoff_read_ar_hdr, /* _read_ar_hdr */ _bfd_xcoff_openr_next_archived_file, /* _openr_next_archived_file */ _bfd_generic_get_elt_at_index, /* _get_elt_at_index */ - _bfd_xcoff_generic_stat_arch_elt, /* _generic_dtat_arch_elt */ + _bfd_xcoff_stat_arch_elt, /* _generic_stat_arch_elt */ /* XCOFF archives do not have a timestamp. */ bfd_true, /* _update_armap_timestamp */ ==== //depot/projects/sparc64/contrib/binutils/bfd/coff64-rs6000.c#2 (text+ko) ==== @@ -103,7 +103,7 @@ extern boolean _bfd_xcoff_slurp_armap PARAMS ((bfd *)); extern PTR _bfd_xcoff_read_ar_hdr PARAMS ((bfd *)); extern bfd *_bfd_xcoff_openr_next_archived_file PARAMS ((bfd *, bfd *)); -extern int _bfd_xcoff_generic_stat_arch_elt PARAMS ((bfd *, struct stat *)); +extern int _bfd_xcoff_stat_arch_elt PARAMS ((bfd *, struct stat *)); extern boolean _bfd_xcoff_write_armap PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int)); extern boolean _bfd_xcoff_write_archive_contents PARAMS ((bfd *)); @@ -2577,9 +2577,9 @@ bfd_dont_truncate_arname, /* _truncate_arname */ _bfd_xcoff_write_armap, /* _write_armap */ _bfd_xcoff_read_ar_hdr, /* _read_ar_hdr */ - xcoff64_openr_next_archived_file, /* _openr_next_archived_file */ + xcoff64_openr_next_archived_file, /* _openr_next_archived_file */ _bfd_generic_get_elt_at_index, /* _get_elt_at_index */ - _bfd_xcoff_generic_stat_arch_elt, /* _generic_dtat_arch_elt */ + _bfd_xcoff_stat_arch_elt, /* _generic_stat_arch_elt */ /* XCOFF archives do not have a timestamp. */ bfd_true, /* _update_armap_timestamp */ ==== //depot/projects/sparc64/contrib/binutils/bfd/configure#2 (text+ko) ==== @@ -57,7 +57,6 @@ program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -172,7 +171,6 @@ --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -343,11 +341,6 @@ -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -513,16 +506,12 @@ srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -561,12 +550,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:565: checking for Cygwin environment" >&5 +echo "configure:554: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -594,19 +583,19 @@ CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:598: checking for mingw32 environment" >&5 +echo "configure:587: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -671,7 +660,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:675: checking host system type" >&5 +echo "configure:664: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -692,7 +681,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:696: checking target system type" >&5 +echo "configure:685: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -710,7 +699,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:714: checking build system type" >&5 +echo "configure:703: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -735,7 +724,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:739: checking for $ac_word" >&5 +echo "configure:728: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -765,7 +754,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:769: checking for $ac_word" >&5 +echo "configure:758: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -816,7 +805,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:820: checking for $ac_word" >&5 +echo "configure:809: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -848,7 +837,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:852: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:841: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -859,12 +848,12 @@ cat > conftest.$ac_ext << EOF -#line 863 "configure" +#line 852 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -890,12 +879,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:894: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:883: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:899: checking whether we are using GNU C" >&5 +echo "configure:888: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -904,7 +893,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -923,7 +912,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:927: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:916: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -955,7 +944,7 @@ fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:959: checking for POSIXized ISC" >&5 +echo "configure:948: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -988,7 +977,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 18: 5:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AED737B41A; Wed, 20 Mar 2002 18:05:09 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6648037B404 for ; Wed, 20 Mar 2002 18:05:08 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L258M58868 for perforce@freebsd.org; Wed, 20 Mar 2002 18:05:08 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Wed, 20 Mar 2002 18:05:08 -0800 (PST) Message-Id: <200203210205.g2L258M58868@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 8108 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8108 Change 8108 by tmm@tmm_sparc64 on 2002/03/20 18:04:13 Integ. de-K&R from sparc64-tmm. Affected files ... ... //depot/projects/sparc64/sys/sparc64/sparc64/prof_machdep.c#2 integrate Differences ... ==== //depot/projects/sparc64/sys/sparc64/sparc64/prof_machdep.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ * though. */ int -cputime() +cputime(void) { u_long count; int delta; @@ -65,8 +65,7 @@ * before calling them. They are here for convenience. */ void -startguprof(gp) - struct gmonparam *gp; +startguprof(struct gmonparam *gp) { gp->profrate = tick_freq; @@ -75,8 +74,7 @@ } void -stopguprof(gp) - struct gmonparam *gp; +stopguprof(struct gmonparam *gp) { /* Nothing to do. */ } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 18: 9:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C134537B404; Wed, 20 Mar 2002 18:07:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8F6C337B421 for ; Wed, 20 Mar 2002 18:07:12 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L27BE62790 for perforce@freebsd.org; Wed, 20 Mar 2002 18:07:11 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Wed, 20 Mar 2002 18:07:11 -0800 (PST) Message-Id: <200203210207.g2L27BE62790@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 8110 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8110 Change 8110 by tmm@tmm_sparc64 on 2002/03/20 18:06:36 Integ VM optimizations and cacheing fixes from sparc64-tmm. Affected files ... ... //depot/projects/sparc64/sys/fs/nwfs/nwfs_io.c#5 integrate ... //depot/projects/sparc64/sys/fs/smbfs/smbfs_io.c#4 integrate ... //depot/projects/sparc64/sys/fs/specfs/spec_vnops.c#10 integrate ... //depot/projects/sparc64/sys/kern/imgact_elf.c#17 integrate ... //depot/projects/sparc64/sys/kern/init_main.c#17 integrate ... //depot/projects/sparc64/sys/kern/kern_exec.c#18 integrate ... //depot/projects/sparc64/sys/kern/kern_resource.c#14 integrate ... //depot/projects/sparc64/sys/kern/sys_pipe.c#13 integrate ... //depot/projects/sparc64/sys/kern/sys_process.c#15 integrate ... //depot/projects/sparc64/sys/kern/vfs_bio.c#20 integrate ... //depot/projects/sparc64/sys/kern/vfs_cluster.c#9 integrate ... //depot/projects/sparc64/sys/nfsclient/nfs_bio.c#8 integrate ... //depot/projects/sparc64/sys/nfsclient/nfs_vnops.c#10 integrate ... //depot/projects/sparc64/sys/sparc64/include/param.h#22 integrate ... //depot/projects/sparc64/sys/sparc64/include/pmap.h#28 integrate ... //depot/projects/sparc64/sys/sparc64/include/vmparam.h#16 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/pmap.c#78 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#46 integrate ... //depot/projects/sparc64/sys/sys/buf.h#12 integrate ... //depot/projects/sparc64/sys/sys/pipe.h#3 integrate ... //depot/projects/sparc64/sys/vm/pmap.h#7 integrate ... //depot/projects/sparc64/sys/vm/swap_pager.c#9 integrate ... //depot/projects/sparc64/sys/vm/vm.h#5 integrate ... //depot/projects/sparc64/sys/vm/vm_contig.c#6 integrate ... //depot/projects/sparc64/sys/vm/vm_extern.h#7 integrate ... //depot/projects/sparc64/sys/vm/vm_fault.c#9 integrate ... //depot/projects/sparc64/sys/vm/vm_init.c#5 integrate ... //depot/projects/sparc64/sys/vm/vm_kern.c#6 integrate ... //depot/projects/sparc64/sys/vm/vm_kern.h#2 integrate ... //depot/projects/sparc64/sys/vm/vm_map.c#12 integrate ... //depot/projects/sparc64/sys/vm/vm_mmap.c#13 integrate ... //depot/projects/sparc64/sys/vm/vm_object.c#8 integrate ... //depot/projects/sparc64/sys/vm/vm_page.c#12 integrate ... //depot/projects/sparc64/sys/vm/vm_page.h#7 integrate ... //depot/projects/sparc64/sys/vm/vm_pager.c#10 integrate ... //depot/projects/sparc64/sys/vm/vm_pager.h#4 integrate ... //depot/projects/sparc64/sys/vm/vm_unix.c#5 integrate ... //depot/projects/sparc64/sys/vm/vnode_pager.c#11 integrate Differences ... ==== //depot/projects/sparc64/sys/fs/nwfs/nwfs_io.c#5 (text+ko) ==== @@ -421,8 +421,9 @@ bp = getpbuf(&nwfs_pbuf_freecnt); npages = btoc(count); + mappbuf(bp, vp->v_object, IDX_TP_OFF(pages[0]->pindex), pages, + npages, BIO_READ); kva = (vm_offset_t) bp->b_data; - pmap_qenter(kva, pages, npages); iov.iov_base = (caddr_t) kva; iov.iov_len = count; @@ -435,7 +436,7 @@ uio.uio_td = td; error = ncp_read(NWFSTOCONN(nmp), &np->n_fh, &uio,cred); - pmap_qremove(kva, npages); + unmappbuf(bp, pages, 0, npages, BIO_READ); relpbuf(bp, &nwfs_pbuf_freecnt); @@ -458,6 +459,7 @@ m->flags &= ~PG_ZERO; if (nextoff <= size) { + pmap_page_validated(m); m->valid = VM_PAGE_BITS_ALL; m->dirty = 0; } else { @@ -548,8 +550,9 @@ } bp = getpbuf(&nwfs_pbuf_freecnt); + mappbuf(bp, vp->v_object, IDX_TP_OFF(pages[0]->pindex), pages, + npages, BIO_WRITE); kva = (vm_offset_t) bp->b_data; - pmap_qenter(kva, pages, npages); iov.iov_base = (caddr_t) kva; iov.iov_len = count; @@ -566,7 +569,7 @@ /* VOP_CLOSE(vp, FWRITE, cred, td);*/ NCPVNDEBUG("paged write done: %d\n", error); - pmap_qremove(kva, npages); + unmappbuf(bp, pages, 0, npages, BIO_WRITE); relpbuf(bp, &nwfs_pbuf_freecnt); if (!error) { ==== //depot/projects/sparc64/sys/fs/smbfs/smbfs_io.c#4 (text+ko) ==== @@ -447,8 +447,9 @@ bp = getpbuf(); #endif npages = btoc(count); + mappbuf(bp, vp->v_object, IDX_TO_OFF(pages[0]->pindex), pages, + npages, BIO_READ); kva = (vm_offset_t) bp->b_data; - pmap_qenter(kva, pages, npages); cnt.v_vnodein++; cnt.v_vnodepgsin += count; @@ -463,7 +464,7 @@ uio.uio_td = td; error = smb_read(smp->sm_share, np->n_fid, &uio, &scred); - pmap_qremove(kva, npages); + unmappbuf(bp, pages, 0, npages, BIO_READ); #if __FreeBSD_version >= 400000 relpbuf(bp, &smbfs_pbuf_freecnt); @@ -490,6 +491,7 @@ m->flags &= ~PG_ZERO; if (nextoff <= size) { + pmap_page_validated(m); m->valid = VM_PAGE_BITS_ALL; vm_page_undirty(m); } else { @@ -585,8 +587,9 @@ #else bp = getpbuf(); #endif + mappbuf(bp, vp->v_object, IDX_TO_OFF(pages[0]->pindex), pages, + npages, BIO_WRITE); kva = (vm_offset_t) bp->b_data; - pmap_qenter(kva, pages, npages); cnt.v_vnodeout++; cnt.v_vnodepgsout += count; @@ -606,7 +609,7 @@ /* VOP_CLOSE(vp, FWRITE, cred, td);*/ SMBVDEBUG("paged write done: %d\n", error); - pmap_qremove(kva, npages); + unmappbuf(bp, pages, 0, npages, BIO_WRITE); #if __FreeBSD_version >= 400000 relpbuf(bp, &smbfs_pbuf_freecnt); #else ==== //depot/projects/sparc64/sys/fs/specfs/spec_vnops.c#10 (text+ko) ==== @@ -668,6 +668,7 @@ daddr_t blkno; struct buf *bp; vm_page_t m; + vm_object_t obj; vm_ooffset_t offset; int toff, nextoff, nread; struct vnode *vp = ap->a_vp; @@ -718,12 +719,14 @@ size = (ap->a_count + blksiz - 1) & ~(blksiz - 1); bp = getpbuf(NULL); - kva = (vm_offset_t)bp->b_data; /* - * Map the pages to be read into the kva. + * Map the pages to be read into the kva. The object may be NULL. */ - pmap_qenter(kva, ap->a_m, pcount); + VOP_GETVOBJECT(vp, &obj); + mappbuf(bp, obj, IDX_TO_OFF(ap->a_m[0]->pindex), ap->a_m, + pcount, BIO_READ); + kva = (vm_offset_t)bp->b_data; /* Build a minimal buffer header. */ bp->b_iocmd = BIO_READ; @@ -770,7 +773,7 @@ bzero((caddr_t)kva + nread, ap->a_count - nread); } - pmap_qremove(kva, pcount); + unmappbuf(bp, ap->a_m, pcount, BIO_READ); gotreqpage = 0; @@ -781,6 +784,7 @@ m->flags &= ~PG_ZERO; if (nextoff <= nread) { + pmap_page_validated(m); m->valid = VM_PAGE_BITS_ALL; vm_page_undirty(m); } else if (toff < nread) { ==== //depot/projects/sparc64/sys/kern/imgact_elf.c#17 (text+ko) ==== @@ -194,6 +194,8 @@ size_t copy_len; vm_offset_t file_addr; vm_offset_t data_buf = 0; + vm_offset_t color; + vm_size_t modulus; GIANT_REQUIRED; error = 0; @@ -213,6 +215,20 @@ return (ENOEXEC); } +#ifdef VM_EOE + /* + * XXX: this is a bit h0h0: if the segment we are mapping is writable + * and executable, use VM_PROT_LAZY_EXECUTE. Since it is writable, it + * is likely to contain non-executable data too, so that is + * advantageous. In practice, this is the case for data/bss segments of + * dynamic executables, which are usually executable because they + * contain PLTs. + */ + if ((prot & (VM_PROT_WRITE | VM_PROT_EXECUTE)) == + (VM_PROT_WRITE | VM_PROT_EXECUTE)) + prot = (prot & ~VM_PROT_EXECUTE) | VM_PROT_LAZY_EXECUTE; +#endif + map_addr = trunc_page((vm_offset_t)vmaddr); file_addr = trunc_page(offset); @@ -228,6 +244,12 @@ map_len = round_page(offset+filsz) - file_addr; if (map_len != 0) { + /* + * Notify that we are going to map this section. Since the + * address is fixed, the color and modulus that are returned + * must be ignored. + */ + pmap_addr_color(object, map_addr, file_addr, &modulus); vm_object_reference(object); vm_map_lock(&vmspace->vm_map); rv = vm_map_insert(&vmspace->vm_map, @@ -266,7 +288,8 @@ vm_map_lock(&vmspace->vm_map); rv = vm_map_insert(&vmspace->vm_map, NULL, 0, map_addr, map_addr + map_len, - VM_PROT_ALL, VM_PROT_ALL, 0); + VM_PROT_READ | VM_PROT_WRITE, + VM_PROT_ALL, 0); vm_map_unlock(&vmspace->vm_map); if (rv != KERN_SUCCESS) { return EINVAL; @@ -274,16 +297,24 @@ } if (copy_len != 0) { + /* + * The virtual address of this is a bit bogus, but it does not + * really matter in this case, since the correct virtual address + * got passed in above, if not before. + */ + color = pmap_addr_color(object, trunc_page(offset + filsz), + trunc_page(offset + filsz), &modulus); vm_object_reference(object); - rv = vm_map_find(exec_map, - object, - trunc_page(offset + filsz), - &data_buf, - PAGE_SIZE, - TRUE, - VM_PROT_READ, - VM_PROT_ALL, - MAP_COPY_ON_WRITE | MAP_PREFAULT_PARTIAL); + rv = vm_map_find_color(exec_map, + object, + trunc_page(offset + filsz), + &data_buf, + PAGE_SIZE, + TRUE, + VM_PROT_READ, + VM_PROT_ALL, + MAP_COPY_ON_WRITE | MAP_PREFAULT_PARTIAL, + color, modulus); if (rv != KERN_SUCCESS) { vm_object_deallocate(object); return EINVAL; @@ -355,14 +386,7 @@ imgp->uap = NULL; imgp->attr = attr; imgp->firstpage = NULL; - imgp->image_header = (char *)kmem_alloc_wait(exec_map, PAGE_SIZE); - if (imgp->image_header == NULL) { - nd->ni_vp = NULL; - error = ENOMEM; - goto fail; - } - /* XXXKSE */ NDINIT(nd, LOOKUP, LOCKLEAF|FOLLOW, UIO_SYSSPACE, file, curthread); @@ -462,9 +486,6 @@ fail: if (imgp->firstpage) exec_unmap_first_page(imgp); - if (imgp->image_header) - kmem_free_wakeup(exec_map, (vm_offset_t)imgp->image_header, - PAGE_SIZE); if (nd->ni_vp) vrele(nd->ni_vp); ==== //depot/projects/sparc64/sys/kern/init_main.c#17 (text+ko) ==== @@ -521,7 +521,7 @@ */ addr = trunc_page(USRSTACK - PAGE_SIZE); if (vm_map_find(&p->p_vmspace->vm_map, NULL, 0, &addr, PAGE_SIZE, - FALSE, VM_PROT_ALL, VM_PROT_ALL, 0) != 0) + FALSE, VM_PROT_STACK, VM_PROT_ALL, 0) != 0) panic("init: couldn't allocate argument space"); p->p_vmspace->vm_maxsaddr = (caddr_t)addr; p->p_vmspace->vm_ssize = 1; ==== //depot/projects/sparc64/sys/kern/kern_exec.c#18 (text+ko) ==== @@ -171,14 +171,13 @@ * Allocate temporary demand zeroed space for argument and * environment strings */ - imgp->stringbase = (char *)kmem_alloc_wait(exec_map, ARG_MAX + PAGE_SIZE); + imgp->stringbase = (char *)kmem_alloc_wait(exec_map, ARG_MAX); if (imgp->stringbase == NULL) { error = ENOMEM; goto exec_fail; } imgp->stringp = imgp->stringbase; imgp->stringspace = ARG_MAX; - imgp->image_header = imgp->stringbase + ARG_MAX; /* * Translate the file name. namei() returns a vnode pointer @@ -193,7 +192,7 @@ error = namei(ndp); if (error) { kmem_free_wakeup(exec_map, (vm_offset_t)imgp->stringbase, - ARG_MAX + PAGE_SIZE); + ARG_MAX); goto exec_fail; } @@ -471,7 +470,7 @@ if (imgp->stringbase != NULL) kmem_free_wakeup(exec_map, (vm_offset_t)imgp->stringbase, - ARG_MAX + PAGE_SIZE); + ARG_MAX); if (imgp->vp) { NDFREE(ndp, NDF_ONLY_PNBUF); @@ -502,7 +501,7 @@ exec_map_first_page(imgp) struct image_params *imgp; { - int rv, i; + int rv, i, col; int initial_pagein; vm_page_t ma[VM_INITIAL_PAGEIN]; vm_object_t object; @@ -548,10 +547,20 @@ } } + col = vm_mdpg_pref_vcol(object, 0, ma, 1); + imgp->image_header = (char *)VM_MDPG_KMEM_ALLOC(exec_map, PAGE_SIZE, + col); + if (imgp->image_header == NULL) { + vm_page_wakeup(ma[0]); + return ENOMEM; + } + pmap_qenter((vm_offset_t)imgp->image_header, ma, 1); + /* Reading from the page has the same semantics as a write operation. */ + vm_mdpg_start_io((vm_offset_t)imgp->image_header, ma, 1, VM_MDPG_READ); + vm_page_wire(ma[0]); vm_page_wakeup(ma[0]); - pmap_qenter((vm_offset_t)imgp->image_header, ma, 1); imgp->firstpage = ma[0]; return 0; @@ -564,9 +573,13 @@ GIANT_REQUIRED; if (imgp->firstpage) { + vm_mdpg_done_io((vm_offset_t)imgp->image_header, + &imgp->firstpage, 0, 1, VM_MDPG_READ); pmap_qremove((vm_offset_t)imgp->image_header, 1); vm_page_unwire(imgp->firstpage, 1); imgp->firstpage = NULL; + kmem_free_wakeup(exec_map, (vm_offset_t)imgp->image_header, + PAGE_SIZE); } } @@ -613,7 +626,7 @@ /* Allocate a new stack */ error = vm_map_stack(&vmspace->vm_map, stack_addr, (vm_size_t)maxssiz, - VM_PROT_ALL, VM_PROT_ALL, 0); + VM_PROT_STACK, VM_PROT_ALL, 0); if (error) return (error); ==== //depot/projects/sparc64/sys/kern/kern_resource.c#14 (text+ko) ==== @@ -564,7 +564,7 @@ vm_prot_t prot; if (limp->rlim_cur > alimp->rlim_cur) { - prot = VM_PROT_ALL; + prot = VM_PROT_STACK; size = limp->rlim_cur - alimp->rlim_cur; addr = USRSTACK - limp->rlim_cur; } else { ==== //depot/projects/sparc64/sys/kern/sys_pipe.c#13 (text+ko) ==== @@ -307,7 +307,7 @@ */ error = vm_map_find(kernel_map, object, 0, (vm_offset_t *) &buffer, size, 1, - VM_PROT_ALL, VM_PROT_ALL, 0); + VM_PROT_READ | VM_PROT_WRITE, VM_PROT_ALL, 0); if (error != KERN_SUCCESS) { vm_object_deallocate(object); @@ -345,7 +345,7 @@ /* so pipespace()->pipe_free_kmem() doesn't follow junk pointer */ cpipe->pipe_buffer.object = NULL; #ifndef PIPE_NODIRECT - cpipe->pipe_map.kva = NULL; + cpipe->pipe_map.bkva = cpipe->pipe_map.kva = NULL; #endif /* * protect so pipeclose() doesn't follow a junk pointer @@ -361,7 +361,7 @@ * pipe data structure initializations to support direct pipe I/O */ cpipe->pipe_map.cnt = 0; - cpipe->pipe_map.kva = 0; + cpipe->pipe_map.bkva = cpipe->pipe_map.kva = 0; cpipe->pipe_map.pos = 0; cpipe->pipe_map.npages = 0; /* cpipe->pipe_map.ms[] = invalid */ @@ -607,8 +607,8 @@ vm_page_t m; boolean_t wired; u_int size; - int i; - vm_offset_t addr, endaddr; + int i, col; + vm_offset_t addr, endaddr, kva; GIANT_REQUIRED; PIPE_LOCK_ASSERT(wpipe, MA_NOTOWNED); @@ -648,18 +648,32 @@ /* * and map the buffer + * The range may span multiple objects, so don't bother to find out which object + * to pass to vm_mdpg_pref_vcol(); let it decide based on page colors. */ - if (wpipe->pipe_map.kva == 0) { + if (wpipe->pipe_map.bkva == 0) { /* * We need to allocate space for an extra page because the * address range might (will) span pages at times. */ - wpipe->pipe_map.kva = kmem_alloc_pageable(kernel_map, - wpipe->pipe_buffer.size + PAGE_SIZE); + wpipe->pipe_map.bkva = kmem_alloc_pageable(kernel_map, + wpipe->pipe_buffer.size + PAGE_SIZE + VCOLPAD); amountpipekva += wpipe->pipe_buffer.size + PAGE_SIZE; } - pmap_qenter(wpipe->pipe_map.kva, wpipe->pipe_map.ms, - wpipe->pipe_map.npages); + col = vm_mdpg_pref_vcol(NULL, 0, wpipe->pipe_map.ms, + wpipe->pipe_map.npages); + if (col != -1) { + kva = vm_roundcolor2(wpipe->pipe_map.bkva, col << PAGE_SHIFT, + VCOLBOUND); + } else + kva = wpipe->pipe_map.bkva; + + /* XXX */ + for (i = 0; i < wpipe->pipe_map.npages; i++) { + pmap_enter(kernel_pmap, kva + (vm_offset_t)i * PAGE_SIZE, + wpipe->pipe_map.ms[i], VM_PROT_READ, 1); + } + wpipe->pipe_map.kva = kva; /* * and update the uio data @@ -687,11 +701,13 @@ PIPE_LOCK_ASSERT(wpipe, MA_NOTOWNED); if (wpipe->pipe_map.kva) { - pmap_qremove(wpipe->pipe_map.kva, wpipe->pipe_map.npages); + pmap_remove(kernel_pmap, wpipe->pipe_map.kva, + wpipe->pipe_map.kva + (vm_offset_t)wpipe->pipe_map.npages * + PAGE_SIZE); if (amountpipekva > MAXPIPEKVA) { - vm_offset_t kva = wpipe->pipe_map.kva; - wpipe->pipe_map.kva = 0; + vm_offset_t kva = wpipe->pipe_map.bkva; + wpipe->pipe_map.bkva = wpipe->pipe_map.kva = 0; kmem_free(kernel_map, kva, wpipe->pipe_buffer.size + PAGE_SIZE); amountpipekva -= wpipe->pipe_buffer.size + PAGE_SIZE; @@ -912,7 +928,7 @@ */ if ((uio->uio_iov->iov_len >= PIPE_MINDIRECT) && (fp->f_flag & FNONBLOCK) == 0 && - (wpipe->pipe_map.kva || (amountpipekva < LIMITPIPEKVA)) && + (wpipe->pipe_map.bkva || (amountpipekva < LIMITPIPEKVA)) && (uio->uio_iov->iov_len >= PIPE_MINDIRECT)) { error = pipe_direct_write( wpipe, uio); if (error) @@ -1278,13 +1294,13 @@ cpipe->pipe_buffer.buffer = NULL; } #ifndef PIPE_NODIRECT - if (cpipe->pipe_map.kva != NULL) { + if (cpipe->pipe_map.bkva != NULL) { amountpipekva -= cpipe->pipe_buffer.size + PAGE_SIZE; kmem_free(kernel_map, - cpipe->pipe_map.kva, + cpipe->pipe_map.bkva, cpipe->pipe_buffer.size + PAGE_SIZE); cpipe->pipe_map.cnt = 0; - cpipe->pipe_map.kva = 0; + cpipe->pipe_map.bkva = cpipe->pipe_map.kva = 0; cpipe->pipe_map.pos = 0; cpipe->pipe_map.npages = 0; } ==== //depot/projects/sparc64/sys/kern/sys_process.c#15 (text+ko) ==== @@ -151,8 +151,9 @@ vm_object_t object = NULL; vm_offset_t pageno = 0; /* page number */ vm_prot_t reqprot; + vm_offset_t bkva; vm_offset_t kva; - int error, writing; + int error, writing, col; GIANT_REQUIRED; @@ -176,7 +177,7 @@ reqprot = writing ? (VM_PROT_WRITE | VM_PROT_OVERRIDE_WRITE) : VM_PROT_READ; - kva = kmem_alloc_pageable(kernel_map, PAGE_SIZE); + bkva = kmem_alloc_pageable(kernel_map, PAGE_SIZE + VCOLPAD); /* * Only map in one page at a time. We don't have to, but it @@ -278,14 +279,19 @@ vm_object_reference(object); vm_map_lookup_done(tmap, out_entry); - pmap_qenter(kva, &m, 1); + col = vm_mdpg_pref_vcol(object, IDX_TO_OFF(m->pindex), &m, 1); + if (col != -1) + kva = vm_roundcolor2(bkva, col << PAGE_SHIFT, VCOLBOUND); + else + kva = bkva; + pmap_enter(kernel_pmap, kva, m, VM_PROT_READ | VM_PROT_WRITE, 1); /* * Now do the i/o move. */ error = uiomove((caddr_t)(kva + page_offset), len, uio); - pmap_qremove(kva, 1); + pmap_remove(kernel_pmap, kva, kva + PAGE_SIZE); /* * release the page and the object @@ -300,7 +306,7 @@ if (object) vm_object_deallocate(object); - kmem_free(kernel_map, kva, PAGE_SIZE); + kmem_free(kernel_map, bkva, PAGE_SIZE + VCOLPAD); vmspace_free(vm); return (error); } ==== //depot/projects/sparc64/sys/kern/vfs_bio.c#20 (text+ko) ==== @@ -232,6 +232,9 @@ #define VFS_BIO_NEED_FREE 0x04 /* wait for free bufs, hi hysteresis */ #define VFS_BIO_NEED_BUFSPACE 0x08 /* wait for buf space, lo hysteresis */ +/* Last used buffer map index. */ +static int buf_map_idx; + /* * Buffer hash table code. Note that the logical block scans linearly, which * gives us some L1 cache locality. @@ -588,12 +591,15 @@ static void bfreekva(struct buf * bp) { + int col; + GIANT_REQUIRED; if (bp->b_kvasize) { ++buffreekvacnt; bufspace -= bp->b_kvasize; - vm_map_delete(buffer_map, + col = ((vm_offset_t) bp->b_kvabase >> PAGE_SHIFT) % NVCOLORS; + vm_map_delete(buffer_map[col], (vm_offset_t) bp->b_kvabase, (vm_offset_t) bp->b_kvabase + bp->b_kvasize ); @@ -676,6 +682,8 @@ *bpp = bp = getblk(vp, blkno, size, 0, 0); + if (bp->b_flags & B_VMIO) + vmiobufstart(bp, bp->b_pages, bp->b_npages, BIO_READ); /* if not found in cache, do some I/O */ if ((bp->b_flags & B_CACHE) == 0) { if (curthread != PCPU_GET(idlethread)) @@ -686,8 +694,14 @@ if (bp->b_rcred == NOCRED && cred != NOCRED) bp->b_rcred = crhold(cred); vfs_busy_pages(bp, 0); + if (bp->b_flags & B_VMIO) + vmiobufstart(bp, bp->b_pages, bp->b_npages, BIO_READ); VOP_STRATEGY(vp, bp); ++readwait; + } else if (bp->b_flags & B_VMIO) { + /* No i/o needed, but cache flushing needs to be done anyway. */ + vmiobufstart(bp, bp->b_pages, bp->b_npages, BIO_READ); + vmiobufdone(bp, bp->b_pages, 0, bp->b_npages, BIO_READ); } for (i = 0; i < cnt; i++, rablkno++, rabsize++) { @@ -705,6 +719,10 @@ if (rabp->b_rcred == NOCRED && cred != NOCRED) rabp->b_rcred = crhold(cred); vfs_busy_pages(rabp, 0); + if (bp->b_flags & B_VMIO) { + vmiobufstart(bp, bp->b_pages, bp->b_npages, + BIO_READ); + } BUF_KERNPROC(rabp); VOP_STRATEGY(vp, rabp); } else { @@ -821,6 +839,8 @@ bp->b_vp->v_numoutput++; vfs_busy_pages(bp, 1); + if (bp->b_flags & B_VMIO) + vmiobufstart(bp, bp->b_pages, bp->b_npages, BIO_WRITE); /* * Normal bwrites pipeline writes @@ -1629,12 +1649,13 @@ */ static struct buf * -getnewbuf(int slpflag, int slptimeo, int size, int maxsize) +getnewbuf(int slpflag, int slptimeo, int size, int maxsize, int prefcol) { struct buf *bp; struct buf *nbp; int defrag = 0; int nqindex; + int col, scol, rv; static int flushingbufs; GIANT_REQUIRED; @@ -1881,8 +1902,27 @@ bfreekva(bp); - if (vm_map_findspace(buffer_map, - vm_map_min(buffer_map), maxsize, &addr)) { + /* + * Try to use the preferred color, but if the map + * is full, cycle through all maps to find space. If + * no color is specified, use the maps in a round-robin + * fashion. + */ + if (prefcol == -1) { + scol = buf_map_idx; + buf_map_idx = (buf_map_idx + 1) % NVCOLORS; + } else + scol = prefcol; + col = scol; + do { + rv = vm_map_findspace_color(buffer_map[col], + vm_map_min(buffer_map[col]), maxsize, &addr, + (vm_offset_t)col << PAGE_SHIFT, VCOLBOUND); + if (rv == KERN_SUCCESS) + break; + col = (col + 1) % NVCOLORS; + } while (col != scol); + if (rv != KERN_SUCCESS) { /* * Uh oh. Buffer map is to fragmented. We * must defragment the map. @@ -1894,7 +1934,7 @@ goto restart; } if (addr) { - vm_map_insert(buffer_map, NULL, 0, + vm_map_insert(buffer_map[col], NULL, 0, addr, addr + maxsize, VM_PROT_ALL, VM_PROT_ALL, MAP_NOFAULT); @@ -2030,6 +2070,17 @@ bp = TAILQ_FIRST(&bufqueues[QUEUE_DIRTY]); continue; } + /* + * Turn off background writing. This can lead to a + * deadlock when bwrite() is trying to allocate a buffer + * to execute a background write in a buffer shortage, + * which is fatal if we haven't reached hidirtybuffers + * yet, but there are no usable buffers on the queues + * anyway (due to buffers not being on any queue, and + * not reaching lodirtybuffers when that buffers get + * requeued). + */ + bp->b_xflags &= ~BX_BKGRDWRITE; vfs_bio_awrite(bp); ++r; break; @@ -2359,7 +2410,8 @@ * returned by getnewbuf() is locked. Note that the returned * buffer is also considered valid (not marked B_INVAL). */ - int bsize, maxsize, vmio; + int bsize, maxsize, vmio, col; + vm_object_t obj; off_t offset; if (vn_isdisk(vp, NULL)) @@ -2372,11 +2424,16 @@ bsize = size; offset = (off_t)blkno * bsize; - vmio = (VOP_GETVOBJECT(vp, NULL) == 0) && (vp->v_flag & VOBJBUF); + vmio = (VOP_GETVOBJECT(vp, &obj) == 0) && (vp->v_flag & VOBJBUF); maxsize = vmio ? size + (offset & PAGE_MASK) : size; maxsize = imax(maxsize, bsize); - if ((bp = getnewbuf(slpflag, slptimeo, size, maxsize)) == NULL) { + if (vmio) { + col = vm_mdpg_pref_vcol(obj, offset, NULL, + (maxsize + PAGE_MASK) >> PAGE_SHIFT); + } else + col = -1; + if ((bp = getnewbuf(slpflag, slptimeo, size, maxsize, col)) == NULL) { if (slpflag || slptimeo) { splx(s); return NULL; @@ -2451,7 +2508,7 @@ maxsize = (size + BKVAMASK) & ~BKVAMASK; s = splbio(); - while ((bp = getnewbuf(0, 0, size, maxsize)) == 0); + while ((bp = getnewbuf(0, 0, size, maxsize, -1)) == 0); splx(s); allocbuf(bp, size); bp->b_flags |= B_INVAL; /* b_dep cleared by getnewbuf() */ @@ -2752,7 +2809,7 @@ bp->b_pages, bp->b_npages ); - + bp->b_data = (caddr_t)((vm_offset_t)bp->b_data | (vm_offset_t)(bp->b_offset & PAGE_MASK)); } @@ -2827,7 +2884,7 @@ void bufdone(struct buf *bp) { - int s, error; + int s, error, resid; void (*biodone)(struct buf *); GIANT_REQUIRED; @@ -2899,22 +2956,8 @@ } #endif - /* - * Set B_CACHE if the op was a normal read and no error - * occured. B_CACHE is set for writes in the b*write() - * routines. - */ iosize = bp->b_bcount - bp->b_resid; - if (bp->b_iocmd == BIO_READ && - !(bp->b_flags & (B_INVAL|B_NOCACHE)) && - !(bp->b_ioflags & BIO_ERROR)) { - bp->b_flags |= B_CACHE; - } - for (i = 0; i < bp->b_npages; i++) { - int bogusflag = 0; - int resid; - resid = ((foff + PAGE_SIZE) & ~(off_t)PAGE_MASK) - foff; if (resid > iosize) resid = iosize; @@ -2924,13 +2967,43 @@ */ m = bp->b_pages[i]; if (m == bogus_page) { - bogusflag = 1; m = vm_page_lookup(obj, OFF_TO_IDX(foff)); if (m == NULL) panic("biodone: page disappeared!"); bp->b_pages[i] = m; pmap_qenter(trunc_page((vm_offset_t)bp->b_data), bp->b_pages, bp->b_npages); + } else { + /* + * In the write case, the valid and clean bits + * are already changed correctly( see + * bdwrite() ), so we only need to do this here + * in the read case. + */ + if ((bp->b_iocmd == BIO_READ) && resid > 0) + vfs_page_set_valid(bp, foff, i, m); } + vm_page_flag_clear(m, PG_ZERO); + foff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK; + } + vmiobufdone(bp, bp->b_pages, 0, bp->b_npages, bp->b_iocmd); + /* + * Set B_CACHE if the op was a normal read and no error + * occured. B_CACHE is set for writes in the b*write() + * routines. + */ + if (bp->b_iocmd == BIO_READ && + !(bp->b_flags & (B_INVAL|B_NOCACHE)) && + !(bp->b_ioflags & BIO_ERROR)) { + bp->b_flags |= B_CACHE; + } + + foff = bp->b_offset; + for (i = 0; i < bp->b_npages; i++) { + resid = ((foff + PAGE_SIZE) & ~(off_t)PAGE_MASK) - foff; + if (resid > iosize) + resid = iosize; + m = bp->b_pages[i]; + #if defined(VFS_BIO_DEBUG) if (OFF_TO_IDX(foff) != m->pindex) { printf( @@ -2940,16 +3013,6 @@ #endif /* - * In the write case, the valid and clean bits are - * already changed correctly ( see bdwrite() ), so we - * only need to do this here in the read case. - */ - if ((bp->b_iocmd == BIO_READ) && !bogusflag && resid > 0) { - vfs_page_set_valid(bp, foff, i, m); - } - vm_page_flag_clear(m, PG_ZERO); - - /* * when debugging new filesystems or buffer I/O methods, this * is the most common error that pops up. if you see this, you * have not set the page busy flag correctly!!! @@ -3364,6 +3427,30 @@ bp->b_npages = newnpages; } +/* + * Map a buffer into kva. This may change the buffer virtual address by at + * most VCOLPAD bytes to achieve the preferred color. + * This can e.g. be used with pbufs. + */ +void +vmiomapbuf(struct buf *bp, struct vm_object *obj, vm_ooffset_t offs, + vm_page_t *m, int count, int remap) +{ + vm_offset_t kva; + int color; + + kva = trunc_page((vm_offset_t)bp->b_data); + color = vm_mdpg_pref_vcol(obj, offs, m, count); + if (color != -1) { + kva = vm_roundcolor2(kva, (vm_offset_t)color << PAGE_SHIFT, + VCOLBOUND); + } + if (remap) + pmap_qremove((vm_offset_t)bp->b_data, count); + pmap_qenter(kva, m, count); + bp->b_data = (caddr_t)kva; +} + #include "opt_ddb.h" #ifdef DDB ==== //depot/projects/sparc64/sys/kern/vfs_cluster.c#9 (text+ko) ==== @@ -135,6 +135,10 @@ * back-off on prospective read-aheads. */ if (bp->b_flags & B_CACHE) { + if (bp->b_flags & B_VMIO) { + vmiobufstart(bp, bp->b_pages, bp->b_npages, BIO_READ); + vmiobufdone(bp, bp->b_pages, 0, bp->b_npages, BIO_READ); + } if (!seqcount) { return 0; } else if ((bp->b_flags & B_RAM) == 0) { @@ -258,6 +262,8 @@ if ((bp->b_flags & B_CLUSTER) == 0) { vfs_busy_pages(bp, 0); } + if (bp->b_flags & B_VMIO) + vmiobufstart(bp, bp->b_pages, bp->b_npages, BIO_READ); bp->b_flags &= ~B_INVAL; bp->b_ioflags &= ~BIO_ERROR; if ((bp->b_flags & B_ASYNC) || bp->b_iodone != NULL) @@ -295,6 +301,10 @@ if ((rbp->b_flags & B_CLUSTER) == 0) { vfs_busy_pages(rbp, 0); } + if (rbp->b_flags & B_VMIO) { + vmiobufstart(rbp, rbp->b_pages, rbp->b_npages, + BIO_READ); + } rbp->b_flags &= ~B_INVAL; rbp->b_ioflags &= ~BIO_ERROR; if ((rbp->b_flags & B_ASYNC) || rbp->b_iodone != NULL) @@ -325,6 +335,7 @@ struct buf *fbp; { struct buf *bp, *tbp; + vm_object_t obj; daddr_t bn; int i, inc, j; @@ -497,6 +508,8 @@ printf("warning: tbp->b_bcount wrong %ld vs %ld\n", tbp->b_bcount, size); if (tbp->b_bufsize != size) printf("warning: tbp->b_bufsize wrong %ld vs %ld\n", tbp->b_bufsize, size); + /* XXX: vmiobufstart() can be avoided in the read-ahead case. */ + vmiobufstart(tbp, tbp->b_pages, tbp->b_npages, BIO_READ); bp->b_bcount += size; bp->b_bufsize += size; } @@ -516,8 +529,9 @@ bp->b_bufsize, bp->b_kvasize); bp->b_kvasize = bp->b_bufsize; - pmap_qenter(trunc_page((vm_offset_t) bp->b_data), - (vm_page_t *)bp->b_pages, bp->b_npages); + VOP_GETVOBJECT(vp, &obj); + vmiomapbuf(bp, obj, bp->b_offset, bp->b_pages, + bp->b_npages, BIO_READ); return (bp); } @@ -542,7 +556,8 @@ if (bp->b_ioflags & BIO_ERROR) error = bp->b_error; - pmap_qremove(trunc_page((vm_offset_t) bp->b_data), bp->b_npages); + KASSERT((bp->b_flags & B_VMIO) != NULL, ("cluster_callback: non-VMIO")); + unmappbuf(bp, bp->b_pages, bp->b_npages, bp->b_iocmd); /* * Move memory from the large cluster buffer into the component * buffers and mark IO as done on these. @@ -949,6 +964,14 @@ tbp->b_ioflags &= ~BIO_ERROR; tbp->b_flags |= B_ASYNC; tbp->b_iocmd = BIO_WRITE; + /* + * XXX: vmiobufstart() can be ommitted, since the write + * perform from the cluster buffer; hoever, this + * requires another flag to tell bufdone() not to call + * vmiobufdone(). >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 19:24: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C21937B417; Wed, 20 Mar 2002 19:23:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 39CB937B404 for ; Wed, 20 Mar 2002 19:23:48 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L3NmR78074 for perforce@freebsd.org; Wed, 20 Mar 2002 19:23:48 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 19:23:48 -0800 (PST) Message-Id: <200203210323.g2L3NmR78074@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8115 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8115 Change 8115 by peter@peter_daintree on 2002/03/20 19:23:30 revert to vendor (get rid of my debug printfs and hacks) Affected files ... ... //depot/projects/ia64/sys/kern/vfs_conf.c#5 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#8 integrate Differences ... ==== //depot/projects/ia64/sys/kern/vfs_conf.c#5 (text+ko) ==== @@ -198,12 +198,8 @@ path = malloc(MNAMELEN, M_MOUNT, M_WAITOK); vfsname[0] = path[0] = 0; sprintf(patt, "%%%d[a-z0-9]:%%%ds", MFSNAMELEN, MNAMELEN); - if ((s = sscanf(mountfrom, patt, vfsname, path)) < 1) { - printf("sscanf failed (%d). mountfrom=%s, patt=%s, vfsname=%s, path=%s\n", s, mountfrom, patt, vfsname, path); - strcpy(vfsname, "ufs"); - strcpy(path, "da1s2a"); - } - printf("mountfrom=%s, patt=%s, vfsname=%s, path=%s\n", mountfrom, patt, vfsname, path); + if (sscanf(mountfrom, patt, vfsname, path) < 1) + goto done; /* allocate a root mount */ error = vfs_rootmountalloc(vfsname, path[0] != 0 ? path : ROOTNAME, @@ -233,7 +229,6 @@ strncpy(mp->mnt_stat.f_mntonname, "/", MNAMELEN); error = VFS_MOUNT(mp, NULL, NULL, NULL, curthread); - printf("VFS_MOUNT: returns %d\n", error); done: if (vfsname != NULL) ==== //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#8 (text+ko) ==== @@ -156,11 +156,8 @@ return (error); } - if ((error = ffs_mountfs(rootvp, mp, td, M_FFSNODE)) != 0) { - printf("ffs_mountfs returns %d\n", error); + if ((error = ffs_mountfs(rootvp, mp, td, M_FFSNODE)) != 0) return (error); - } - (void)VFS_STATFS(mp, &mp->mnt_stat, td); return (0); } @@ -566,10 +563,8 @@ * Flush out any old buffers remaining from a previous use. */ error = vfs_mountedon(devvp); - if (error) { - printf("mountedon\n"); + if (error) return (error); - } ncount = vcount(devvp); if (ncount > 1 && devvp != rootvp) @@ -606,7 +601,6 @@ error = VOP_OPEN(devvp, FREAD|FWRITE, FSCRED, td); #endif VOP_UNLOCK(devvp, 0, td); - printf("VOP_OPEN: %d\n", error); if (error) return (error); if (devvp->v_rdev->si_iosize_max > mp->mnt_iosize_max) @@ -621,17 +615,11 @@ bp = NULL; ump = NULL; - if ((error = bread(devvp, SBLOCK, SBSIZE, cred, &bp)) != 0) { - printf("bread %d\n", error); + if ((error = bread(devvp, SBLOCK, SBSIZE, cred, &bp)) != 0) goto out; - } fs = (struct fs *)bp->b_data; if (fs->fs_magic != FS_MAGIC || fs->fs_bsize > MAXBSIZE || fs->fs_bsize < sizeof(struct fs)) { - printf("bad magic\n"); - printf("fs_magic: %x != %x\n", fs->fs_magic, FS_MAGIC); - printf("fs_bsize: %x > %x\n", fs->fs_bsize, MAXBSIZE); - printf("fs_bsize: %x < %x\n", fs->fs_bsize, sizeof(struct fs)); error = EINVAL; /* XXX needs translation */ goto out; } @@ -659,7 +647,6 @@ fs->fs_pendinginodes = 0; } } -printf("stage 1\n"); if (fs->fs_pendingblocks != 0 || fs->fs_pendinginodes != 0) { printf("%s: mount pending error: blocks %d files %d\n", fs->fs_fsmnt, fs->fs_pendingblocks, fs->fs_pendinginodes); @@ -786,7 +773,6 @@ fs->fs_clean = 0; (void) ffs_sbupdate(ump, MNT_WAIT); } - printf("almost done\n"); #ifdef UFS_EXTATTR #ifdef UFS_EXTATTR_AUTOSTART /* @@ -804,7 +790,6 @@ #endif /* !UFS_EXTATTR */ return (0); out: -printf("out: %d\n", error); devvp->v_rdev->si_mountpoint = NULL; if (bp) brelse(bp); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 19:28:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D45BD37B400; Wed, 20 Mar 2002 19:27:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D3B4437B404 for ; Wed, 20 Mar 2002 19:27:02 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L3Qqh78729 for perforce@freebsd.org; Wed, 20 Mar 2002 19:26:52 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 19:26:52 -0800 (PST) Message-Id: <200203210326.g2L3Qqh78729@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8116 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8116 Change 8116 by peter@peter_daintree on 2002/03/20 19:26:31 IFC of doom Affected files ... ... //depot/projects/ia64/Makefile.inc1#9 integrate ... //depot/projects/ia64/contrib/binutils/ChangeLog#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/ChangeLog#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/coff-rs6000.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/coff64-rs6000.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/configure#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/configure.in#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/cpu-i386.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/doc/archures.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/doc/bfdt.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/doc/coffcode.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/doc/core.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/doc/format.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/doc/libbfd.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/doc/opncls.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/doc/reloc.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/doc/section.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/doc/syms.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/doc/targets.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf64-ppc.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf64-x86-64.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elflink.h#3 integrate ... //depot/projects/ia64/contrib/binutils/binutils/ChangeLog#3 integrate ... //depot/projects/ia64/contrib/binutils/binutils/NEWS#3 integrate ... //depot/projects/ia64/contrib/binutils/binutils/README#3 integrate ... //depot/projects/ia64/contrib/binutils/binutils/defparse.c#2 integrate ... //depot/projects/ia64/contrib/binutils/binutils/defparse.h#2 integrate ... //depot/projects/ia64/contrib/binutils/binutils/doc/addr2line.1#1 branch ... //depot/projects/ia64/contrib/binutils/binutils/doc/ar.1#1 branch ... //depot/projects/ia64/contrib/binutils/binutils/doc/binutils.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/binutils/doc/cxxfilt.man#1 branch ... //depot/projects/ia64/contrib/binutils/binutils/doc/dlltool.1#1 branch ... //depot/projects/ia64/contrib/binutils/binutils/doc/nm.1#1 branch ... //depot/projects/ia64/contrib/binutils/binutils/doc/objcopy.1#1 branch ... //depot/projects/ia64/contrib/binutils/binutils/doc/objdump.1#1 branch ... //depot/projects/ia64/contrib/binutils/binutils/doc/ranlib.1#1 branch ... //depot/projects/ia64/contrib/binutils/binutils/doc/readelf.1#1 branch ... //depot/projects/ia64/contrib/binutils/binutils/doc/size.1#1 branch ... //depot/projects/ia64/contrib/binutils/binutils/doc/strings.1#1 branch ... //depot/projects/ia64/contrib/binutils/binutils/doc/strip.1#1 branch ... //depot/projects/ia64/contrib/binutils/binutils/rclex.c#2 integrate ... //depot/projects/ia64/contrib/binutils/binutils/rcparse.c#2 integrate ... //depot/projects/ia64/contrib/binutils/binutils/rcparse.h#2 integrate ... //depot/projects/ia64/contrib/binutils/config.guess#3 integrate ... //depot/projects/ia64/contrib/binutils/config.sub#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/ChangeLog#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/NEWS#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/tc-alpha.c#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/tc-ia64.c#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/tc-ppc.c#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/configure#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/configure.in#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/doc/as.1#2 integrate ... //depot/projects/ia64/contrib/binutils/gas/doc/as.texinfo#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/doc/c-ppc.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/include/opcode/ChangeLog#3 integrate ... //depot/projects/ia64/contrib/binutils/include/opcode/ppc.h#3 integrate ... //depot/projects/ia64/contrib/binutils/ld/ChangeLog#3 integrate ... //depot/projects/ia64/contrib/binutils/ld/NEWS#3 integrate ... //depot/projects/ia64/contrib/binutils/ld/configure.tgt#3 integrate ... //depot/projects/ia64/contrib/binutils/ld/emulparams/elf_x86_64.sh#3 integrate ... //depot/projects/ia64/contrib/binutils/ld/emultempl/elf32.em#3 integrate ... //depot/projects/ia64/contrib/binutils/ld/ld.1#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/ld.texinfo#3 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/ChangeLog#3 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/configure#3 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/configure.in#3 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/i386-dis.c#3 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/ppc-dis.c#3 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/ppc-opc.c#3 integrate ... //depot/projects/ia64/contrib/gcc.295/ChangeLog#2 integrate ... //depot/projects/ia64/contrib/gcc.295/NEWS#2 integrate ... //depot/projects/ia64/contrib/gcc.295/c-common.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/c-lex.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/c-parse.in#2 integrate ... //depot/projects/ia64/contrib/gcc.295/cccp.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/combine.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/config/i386/linux.h#2 integrate ... //depot/projects/ia64/contrib/gcc.295/config/mips/mips.md#2 integrate ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sparc.md#2 integrate ... //depot/projects/ia64/contrib/gcc.295/crtstuff.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/cse.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/except.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/expr.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/f/version.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/final.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/flow.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/function.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/gcc.1#2 integrate ... //depot/projects/ia64/contrib/gcc.295/gcc.c#3 integrate ... //depot/projects/ia64/contrib/gcc.295/install.texi#2 integrate ... //depot/projects/ia64/contrib/gcc.295/invoke.texi#2 integrate ... //depot/projects/ia64/contrib/gcc.295/jump.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/just-fixinc#2 integrate ... //depot/projects/ia64/contrib/gcc.295/loop.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/regmove.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/reload1.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/rtl.h#2 integrate ... //depot/projects/ia64/contrib/gcc.295/tm.texi#2 integrate ... //depot/projects/ia64/contrib/gcc.295/toplev.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/varasm.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/version.c#2 integrate ... //depot/projects/ia64/crypto/openssh/LICENCE#3 integrate ... //depot/projects/ia64/crypto/openssh/auth-skey.c#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/Makefile.inc0#4 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/addr2line/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/ar/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/as/Makefile.inc0#4 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/as/alpha-freebsd/config.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/as/i386-freebsd/config.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/as/ia64-freebsd/config.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/as/powerpc-freebsd/config.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/as/sparc64-freebsd/config.h#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/ld/config.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/alpha/bfd.h#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/config.h.fbsd#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/i386/bfd.h#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/ia64/bfd.h#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/sparc64/bfd.h#4 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/libbinutils/config.h#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/libopcodes/config.h#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/nm/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/objcopy/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/objdump/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/ranlib/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/readelf/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/size/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/strings/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/strip/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile.inc#2 integrate ... //depot/projects/ia64/gnu/usr.bin/send-pr/categories#3 integrate ... //depot/projects/ia64/lib/libc/sys/ptrace.2#4 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#3 integrate ... //depot/projects/ia64/sbin/camcontrol/camcontrol.c#4 integrate ... //depot/projects/ia64/sbin/camcontrol/modeedit.c#2 integrate ... //depot/projects/ia64/sbin/dump/dump.h#4 integrate ... //depot/projects/ia64/sbin/dump/dumprmt.c#3 integrate ... //depot/projects/ia64/sbin/dump/itime.c#4 integrate ... //depot/projects/ia64/sbin/dump/main.c#5 integrate ... //depot/projects/ia64/sbin/dump/optr.c#4 integrate ... //depot/projects/ia64/sbin/dump/tape.c#4 integrate ... //depot/projects/ia64/sbin/dump/traverse.c#4 integrate ... //depot/projects/ia64/sbin/dump/unctime.c#2 integrate ... //depot/projects/ia64/sbin/dumpfs/dumpfs.c#2 integrate ... //depot/projects/ia64/sbin/fsck/fsck.c#2 integrate ... //depot/projects/ia64/sbin/fsck/fsutil.c#2 integrate ... //depot/projects/ia64/sbin/fsck/fsutil.h#2 integrate ... //depot/projects/ia64/sbin/fsck/preen.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ffs/dir.c#3 integrate ... //depot/projects/ia64/sbin/fsck_ffs/fsck.h#3 integrate ... //depot/projects/ia64/sbin/fsck_ffs/fsutil.c#3 integrate ... //depot/projects/ia64/sbin/fsck_ffs/inode.c#4 integrate ... //depot/projects/ia64/sbin/fsck_ffs/main.c#3 integrate ... //depot/projects/ia64/sbin/fsck_ffs/pass1.c#3 integrate ... //depot/projects/ia64/sbin/fsck_ffs/pass1b.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ffs/pass2.c#3 integrate ... //depot/projects/ia64/sbin/fsck_ffs/pass3.c#3 integrate ... //depot/projects/ia64/sbin/fsck_ffs/pass4.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ffs/pass5.c#3 integrate ... //depot/projects/ia64/sbin/fsck_ffs/preen.c#3 integrate ... //depot/projects/ia64/sbin/fsck_ffs/setup.c#4 integrate ... //depot/projects/ia64/sbin/fsck_ffs/utilities.c#3 integrate ... //depot/projects/ia64/sbin/fsck_ifs/dir.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ifs/fsck.h#2 integrate ... //depot/projects/ia64/sbin/fsck_ifs/fsutil.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ifs/inode.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ifs/main.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ifs/pass1.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ifs/pass1b.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ifs/pass2.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ifs/pass3.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ifs/pass4.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ifs/pass5.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ifs/preen.c#3 integrate ... //depot/projects/ia64/sbin/fsck_ifs/setup.c#2 integrate ... //depot/projects/ia64/sbin/fsck_ifs/utilities.c#2 integrate ... //depot/projects/ia64/sbin/fsck_msdosfs/dir.c#2 integrate ... //depot/projects/ia64/sbin/fsck_msdosfs/ext.h#2 integrate ... //depot/projects/ia64/sbin/fsck_msdosfs/fat.c#2 integrate ... //depot/projects/ia64/sbin/fsck_msdosfs/main.c#2 integrate ... //depot/projects/ia64/sbin/fsdb/fsdb.c#4 integrate ... //depot/projects/ia64/sbin/growfs/growfs.c#2 integrate ... //depot/projects/ia64/sbin/ifconfig/ifconfig.c#3 integrate ... //depot/projects/ia64/sbin/init/init.c#2 integrate ... //depot/projects/ia64/sbin/ipf/Makefile#3 integrate ... //depot/projects/ia64/sbin/ipmon/Makefile#3 integrate ... //depot/projects/ia64/sbin/ipnat/Makefile#4 integrate ... //depot/projects/ia64/sbin/ldconfig/ldconfig.c#2 integrate ... //depot/projects/ia64/sbin/mount_nfs/mount_nfs.c#3 integrate ... //depot/projects/ia64/sbin/mountd/mountd.c#3 integrate ... //depot/projects/ia64/sbin/newfs/mkfs.c#5 integrate ... //depot/projects/ia64/sbin/newfs/newfs.8#5 integrate ... //depot/projects/ia64/sbin/newfs/newfs.c#6 integrate ... //depot/projects/ia64/sbin/newfs/newfs.h#2 integrate ... //depot/projects/ia64/sbin/ping/ping.c#3 integrate ... //depot/projects/ia64/sbin/ping6/ping6.c#4 integrate ... //depot/projects/ia64/sbin/restore/dirs.c#2 integrate ... //depot/projects/ia64/sbin/restore/extern.h#2 integrate ... //depot/projects/ia64/sbin/restore/interactive.c#2 integrate ... //depot/projects/ia64/sbin/restore/main.c#2 integrate ... //depot/projects/ia64/sbin/restore/restore.c#3 integrate ... //depot/projects/ia64/sbin/restore/symtab.c#2 integrate ... //depot/projects/ia64/sbin/restore/tape.c#3 integrate ... //depot/projects/ia64/sbin/restore/utilities.c#2 integrate ... //depot/projects/ia64/sbin/route/route.c#3 integrate ... //depot/projects/ia64/sbin/savecore/savecore.c#5 integrate ... //depot/projects/ia64/sbin/startslip/startslip.c#2 integrate ... //depot/projects/ia64/sbin/swapon/swapon.c#2 integrate ... //depot/projects/ia64/share/man/man4/ng_mppc.4#3 integrate ... //depot/projects/ia64/share/man/man7/build.7#6 integrate ... //depot/projects/ia64/share/man/man7/release.7#5 integrate ... //depot/projects/ia64/share/man/man8/rc.8#3 integrate ... //depot/projects/ia64/share/me/Makefile#3 integrate ... //depot/projects/ia64/share/me/orig_me.7#1 branch ... //depot/projects/ia64/share/mk/sys.mk#3 integrate ... //depot/projects/ia64/sys/alpha/alpha/api_up1000.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/autoconf.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/clock.c#3 integrate ... //depot/projects/ia64/sys/alpha/alpha/cpuconf.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/db_disasm.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/db_interface.c#4 integrate ... //depot/projects/ia64/sys/alpha/alpha/db_trace.c#3 integrate ... //depot/projects/ia64/sys/alpha/alpha/dec_1000a.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/dec_2100_a50.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/dec_2100_a500.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/dec_axppci_33.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/dec_eb164.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/dec_eb64plus.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/dec_kn20aa.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/dec_kn300.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/dec_st550.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/dec_st6600.c#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/interrupt.c#5 integrate ... //depot/projects/ia64/sys/alpha/alpha/machdep.c#6 integrate ... //depot/projects/ia64/sys/alpha/alpha/pmap.c#6 integrate ... //depot/projects/ia64/sys/alpha/alpha/prom.c#3 integrate ... //depot/projects/ia64/sys/alpha/alpha/promcons.c#3 integrate ... //depot/projects/ia64/sys/alpha/alpha/trap.c#5 integrate ... //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#3 integrate ... //depot/projects/ia64/sys/alpha/include/bootinfo.h#2 integrate ... //depot/projects/ia64/sys/alpha/include/clock.h#2 integrate ... //depot/projects/ia64/sys/alpha/include/cpu.h#2 integrate ... //depot/projects/ia64/sys/alpha/include/cpuconf.h#2 integrate ... //depot/projects/ia64/sys/alpha/include/db_machdep.h#3 integrate ... //depot/projects/ia64/sys/alpha/include/float.h#2 integrate ... //depot/projects/ia64/sys/alpha/include/md_var.h#2 integrate ... //depot/projects/ia64/sys/alpha/include/pmap.h#3 integrate ... //depot/projects/ia64/sys/alpha/include/profile.h#2 integrate ... //depot/projects/ia64/sys/alpha/include/prom.h#2 integrate ... //depot/projects/ia64/sys/alpha/include/reg.h#2 integrate ... //depot/projects/ia64/sys/alpha/include/sysarch.h#2 integrate ... //depot/projects/ia64/sys/alpha/linux/linux_proto.h#3 integrate ... //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#3 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_ioctl.c#2 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#4 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_mount.c#3 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_proto.h#2 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#3 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_signal.h#2 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_sysvec.c#2 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_util.h#2 integrate ... //depot/projects/ia64/sys/alpha/pci/tsunami.c#3 integrate ... //depot/projects/ia64/sys/alpha/tc/am7990.c#3 integrate ... //depot/projects/ia64/sys/alpha/tc/am7990var.h#2 integrate ... //depot/projects/ia64/sys/alpha/tc/ascvar.h#2 integrate ... //depot/projects/ia64/sys/alpha/tc/esp.c#2 integrate ... //depot/projects/ia64/sys/alpha/tc/if_le_dec.c#2 integrate ... //depot/projects/ia64/sys/alpha/tc/if_le_ioasic.c#2 integrate ... //depot/projects/ia64/sys/alpha/tc/if_levar.h#2 integrate ... //depot/projects/ia64/sys/alpha/tc/ioasic.c#2 integrate ... //depot/projects/ia64/sys/alpha/tc/ioasicvar.h#2 integrate ... //depot/projects/ia64/sys/alpha/tc/sticvar.h#2 integrate ... //depot/projects/ia64/sys/alpha/tc/tc.c#2 integrate ... //depot/projects/ia64/sys/alpha/tc/tcds.c#2 integrate ... //depot/projects/ia64/sys/alpha/tc/tcdsreg.h#2 integrate ... //depot/projects/ia64/sys/alpha/tc/tcdsvar.h#2 integrate ... //depot/projects/ia64/sys/alpha/tc/tcvar.h#2 integrate ... //depot/projects/ia64/sys/alpha/tlsb/zs_tlsb.c#3 integrate ... //depot/projects/ia64/sys/arm/include/types.h#2 integrate ... //depot/projects/ia64/sys/boot/common/isapnp.h#2 integrate ... //depot/projects/ia64/sys/cam/scsi/scsi_low.c#5 integrate ... //depot/projects/ia64/sys/cam/scsi/scsi_low.h#2 integrate ... //depot/projects/ia64/sys/cam/scsi/scsi_low_pisa.h#2 integrate ... //depot/projects/ia64/sys/coda/coda_fbsd.c#2 integrate ... //depot/projects/ia64/sys/coda/coda_vfsops.c#4 integrate ... //depot/projects/ia64/sys/coda/coda_vnops.h#3 integrate ... //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#4 integrate ... //depot/projects/ia64/sys/compat/linux/linux_getcwd.c#4 integrate ... //depot/projects/ia64/sys/compat/linux/linux_ipc.h#2 integrate ... //depot/projects/ia64/sys/compat/linux/linux_mib.h#3 integrate ... //depot/projects/ia64/sys/compat/linux/linux_misc.c#5 integrate ... //depot/projects/ia64/sys/compat/linux/linux_signal.h#2 integrate ... //depot/projects/ia64/sys/compat/linux/linux_util.h#3 integrate ... //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#3 integrate ... //depot/projects/ia64/sys/compat/svr4/imgact_svr4.c#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_exec.h#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#3 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_ioctl.c#3 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_ioctl.h#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_ipc.c#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#3 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_proto.h#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_resource.c#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_signal.c#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_signal.h#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_socket.h#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_sockio.c#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_stat.c#3 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_stream.c#4 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_stropts.h#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_termios.c#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_ttold.c#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_util.h#2 integrate ... //depot/projects/ia64/sys/conf/kern.post.mk#8 integrate ... //depot/projects/ia64/sys/crypto/blowfish/blowfish.h#3 integrate ... //depot/projects/ia64/sys/crypto/cast128/cast128.h#3 integrate ... //depot/projects/ia64/sys/crypto/des/des.h#3 integrate ... //depot/projects/ia64/sys/crypto/md5.c#2 integrate ... //depot/projects/ia64/sys/crypto/md5.h#2 integrate ... //depot/projects/ia64/sys/crypto/sha1.c#2 integrate ... //depot/projects/ia64/sys/crypto/sha1.h#2 integrate ... //depot/projects/ia64/sys/crypto/sha2/sha2.h#2 integrate ... //depot/projects/ia64/sys/ddb/db_access.h#2 integrate ... //depot/projects/ia64/sys/ddb/db_break.c#2 integrate ... //depot/projects/ia64/sys/ddb/db_break.h#2 integrate ... //depot/projects/ia64/sys/ddb/db_command.c#6 integrate ... //depot/projects/ia64/sys/ddb/db_command.h#2 integrate ... //depot/projects/ia64/sys/ddb/db_examine.c#2 integrate ... //depot/projects/ia64/sys/ddb/db_expr.c#2 integrate ... //depot/projects/ia64/sys/ddb/db_input.c#3 integrate ... //depot/projects/ia64/sys/ddb/db_lex.c#3 integrate ... //depot/projects/ia64/sys/ddb/db_lex.h#2 integrate ... //depot/projects/ia64/sys/ddb/db_output.c#2 integrate ... //depot/projects/ia64/sys/ddb/db_output.h#2 integrate ... //depot/projects/ia64/sys/ddb/db_run.c#2 integrate ... //depot/projects/ia64/sys/ddb/db_sym.c#2 integrate ... //depot/projects/ia64/sys/ddb/db_sym.h#2 integrate ... //depot/projects/ia64/sys/ddb/db_variables.c#2 integrate ... //depot/projects/ia64/sys/ddb/db_variables.h#2 integrate ... //depot/projects/ia64/sys/ddb/db_watch.c#2 integrate ... //depot/projects/ia64/sys/ddb/ddb.h#2 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#3 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate ... //depot/projects/ia64/sys/dev/ida/ida.c#2 integrate ... //depot/projects/ia64/sys/dev/ida/ida_disk.c#3 integrate ... //depot/projects/ia64/sys/dev/md/md.c#7 integrate ... //depot/projects/ia64/sys/dev/sio/sio_pci.c#6 integrate ... //depot/projects/ia64/sys/dev/syscons/apm/apm_saver.c#2 integrate ... //depot/projects/ia64/sys/dev/usb/umass.c#6 integrate ... //depot/projects/ia64/sys/dev/vinum/vinumio.c#2 integrate ... //depot/projects/ia64/sys/i386/apm/apm.c#3 integrate ... //depot/projects/ia64/sys/i386/i386/autoconf.c#5 integrate ... //depot/projects/ia64/sys/i386/i386/db_disasm.c#2 integrate ... //depot/projects/ia64/sys/i386/i386/db_interface.c#4 integrate ... //depot/projects/ia64/sys/i386/i386/db_trace.c#3 integrate ... //depot/projects/ia64/sys/i386/i386/machdep.c#8 integrate ... //depot/projects/ia64/sys/i386/i386/mp_machdep.c#4 integrate ... //depot/projects/ia64/sys/i386/i386/mpapic.c#4 integrate ... //depot/projects/ia64/sys/i386/i386/perfmon.c#4 integrate ... //depot/projects/ia64/sys/i386/i386/pmap.c#7 integrate ... //depot/projects/ia64/sys/i386/i386/sys_machdep.c#3 integrate ... //depot/projects/ia64/sys/i386/i386/trap.c#6 integrate ... //depot/projects/ia64/sys/i386/i386/vm_machdep.c#4 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_fcntl.c#3 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_ioctl.c#4 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_proto.h#2 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_signal.c#2 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_signal.h#2 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_socksys.c#3 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_socksys.h#2 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_stat.c#3 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_util.h#2 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate ... //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#4 integrate ... //depot/projects/ia64/sys/i386/include/apm_bios.h#2 integrate ... //depot/projects/ia64/sys/i386/include/bus_pc98.h#3 integrate ... //depot/projects/ia64/sys/i386/include/clock.h#2 integrate ... //depot/projects/ia64/sys/i386/include/cpu.h#3 integrate ... //depot/projects/ia64/sys/i386/include/cpufunc.h#3 integrate ... //depot/projects/ia64/sys/i386/include/dvcfg.h#2 integrate ... //depot/projects/ia64/sys/i386/include/frame.h#2 integrate ... //depot/projects/ia64/sys/i386/include/in_cksum.h#3 integrate ... //depot/projects/ia64/sys/i386/include/md_var.h#3 integrate ... //depot/projects/ia64/sys/i386/include/npx.h#2 integrate ... //depot/projects/ia64/sys/i386/include/pcb.h#3 integrate ... //depot/projects/ia64/sys/i386/include/pcb_ext.h#2 integrate ... //depot/projects/ia64/sys/i386/include/perfmon.h#2 integrate ... //depot/projects/ia64/sys/i386/include/physio_proc.h#3 integrate ... //depot/projects/ia64/sys/i386/include/pmap.h#4 integrate ... //depot/projects/ia64/sys/i386/include/proc.h#3 integrate ... //depot/projects/ia64/sys/i386/include/profile.h#3 integrate ... //depot/projects/ia64/sys/i386/include/reg.h#2 integrate ... //depot/projects/ia64/sys/i386/include/segments.h#3 integrate ... //depot/projects/ia64/sys/i386/include/smp.h#3 integrate ... //depot/projects/ia64/sys/i386/include/sysarch.h#3 integrate ... //depot/projects/ia64/sys/i386/include/types.h#3 integrate ... //depot/projects/ia64/sys/i386/include/vm86.h#2 integrate ... //depot/projects/ia64/sys/i386/isa/bs/bs.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/bs/bsfunc.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/bs/bsfunc.h#2 integrate ... //depot/projects/ia64/sys/i386/isa/bs/bshw.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/bs/bshw.h#2 integrate ... //depot/projects/ia64/sys/i386/isa/bs/bshw_dma.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/bs/bshw_pdma.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/bs/bsif.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/bs/bsif.h#2 integrate ... //depot/projects/ia64/sys/i386/isa/bs/bsvar.h#2 integrate ... //depot/projects/ia64/sys/i386/isa/ccbque.h#2 integrate ... //depot/projects/ia64/sys/i386/isa/clock.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/ctx.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/cy.c#4 integrate ... //depot/projects/ia64/sys/i386/isa/elink.h#2 integrate ... //depot/projects/ia64/sys/i386/isa/icu.h#2 integrate ... //depot/projects/ia64/sys/i386/isa/if_cx.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/if_le.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/if_rdp.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/intr_machdep.h#3 integrate ... //depot/projects/ia64/sys/i386/isa/isa_dma.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/isa_dma.h#2 integrate ... //depot/projects/ia64/sys/i386/isa/mse.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/npx.c#4 integrate ... //depot/projects/ia64/sys/i386/isa/pcaudio.c#4 integrate ... //depot/projects/ia64/sys/i386/isa/rc.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/spkr.c#3 integrate ... //depot/projects/ia64/sys/i386/linux/imgact_linux.c#2 integrate ... //depot/projects/ia64/sys/i386/linux/linux_proto.h#2 integrate ... //depot/projects/ia64/sys/i386/linux/linux_syscall.h#2 integrate ... //depot/projects/ia64/sys/i386/linux/linux_sysent.c#2 integrate ... //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#5 integrate ... //depot/projects/ia64/sys/i386/svr4/svr4_machdep.c#3 integrate ... //depot/projects/ia64/sys/i386/svr4/svr4_machdep.h#2 integrate ... //depot/projects/ia64/sys/i4b/layer2/i4b_l2fsm.c#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/autoconf.c#4 integrate ... //depot/projects/ia64/sys/ia64/ia64/db_interface.c#8 integrate ... //depot/projects/ia64/sys/ia64/ia64/db_trace.c#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#18 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#11 integrate ... //depot/projects/ia64/sys/ia64/ia64/sapic.c#6 integrate ... //depot/projects/ia64/sys/ia64/ia64/ssc.c#2 integrate ... //depot/projects/ia64/sys/ia64/ia64/trap.c#16 integrate ... //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#5 integrate ... //depot/projects/ia64/sys/ia64/include/clock.h#2 integrate ... //depot/projects/ia64/sys/ia64/include/cpu.h#4 integrate ... //depot/projects/ia64/sys/ia64/include/cpufunc.h#3 integrate ... //depot/projects/ia64/sys/ia64/include/md_var.h#2 integrate ... //depot/projects/ia64/sys/ia64/include/pmap.h#3 integrate ... //depot/projects/ia64/sys/ia64/include/profile.h#3 integrate ... //depot/projects/ia64/sys/ia64/include/reg.h#2 integrate ... //depot/projects/ia64/sys/isa/isavar.h#2 integrate ... //depot/projects/ia64/sys/isa/psm.c#5 integrate ... //depot/projects/ia64/sys/isofs/cd9660/cd9660_node.c#3 integrate ... //depot/projects/ia64/sys/isofs/cd9660/cd9660_node.h#3 integrate ... //depot/projects/ia64/sys/isofs/cd9660/cd9660_rrip.c#2 integrate ... //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#5 integrate ... //depot/projects/ia64/sys/isofs/cd9660/cd9660_vnops.c#2 integrate ... //depot/projects/ia64/sys/isofs/cd9660/iso.h#3 integrate ... //depot/projects/ia64/sys/isofs/cd9660/iso_rrip.h#2 integrate ... //depot/projects/ia64/sys/kern/kern_fork.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_linker.c#9 integrate ... //depot/projects/ia64/sys/kern/kern_prot.c#8 integrate ... //depot/projects/ia64/sys/kern/subr_smp.c#5 integrate ... //depot/projects/ia64/sys/kern/subr_trap.c#3 integrate ... //depot/projects/ia64/sys/kern/uipc_domain.c#5 integrate ... //depot/projects/ia64/sys/kern/uipc_socket.c#7 integrate ... //depot/projects/ia64/sys/kern/uipc_usrreq.c#9 integrate ... //depot/projects/ia64/sys/kern/vfs_syscalls.c#8 integrate ... //depot/projects/ia64/sys/netatm/ipatm/ipatm_if.c#2 integrate ... //depot/projects/ia64/sys/netatm/ipatm/ipatm_load.c#2 integrate ... //depot/projects/ia64/sys/netatm/ipatm/ipatm_serv.h#2 integrate ... //depot/projects/ia64/sys/netatm/ipatm/ipatm_var.h#2 integrate ... //depot/projects/ia64/sys/netatm/sigpvc/sigpvc_if.c#2 integrate ... //depot/projects/ia64/sys/netatm/sigpvc/sigpvc_var.h#2 integrate ... //depot/projects/ia64/sys/netatm/spans/spans_arp.c#2 integrate ... //depot/projects/ia64/sys/netatm/spans/spans_cls.c#2 integrate ... //depot/projects/ia64/sys/netatm/spans/spans_if.c#2 integrate ... //depot/projects/ia64/sys/netatm/spans/spans_kxdr.c#2 integrate ... //depot/projects/ia64/sys/netatm/spans/spans_msg.c#2 integrate ... //depot/projects/ia64/sys/netatm/spans/spans_print.c#2 integrate ... //depot/projects/ia64/sys/netatm/spans/spans_proto.c#2 integrate ... //depot/projects/ia64/sys/netatm/spans/spans_var.h#2 integrate ... //depot/projects/ia64/sys/netatm/uni/q2110_sigaa.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/q2110_sigcpcs.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/qsaal1_sigaa.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/qsaal1_sigcpcs.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/sscf_uni.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/sscf_uni_var.h#2 integrate ... //depot/projects/ia64/sys/netatm/uni/sscop.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/sscop_lower.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/sscop_pdu.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/sscop_subr.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/sscop_timer.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/sscop_upper.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/sscop_var.h#2 integrate ... //depot/projects/ia64/sys/netatm/uni/uni_load.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/uniarp.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/uniarp_input.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/uniarp_timer.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/uniip.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/uniip_var.h#2 integrate ... //depot/projects/ia64/sys/netatm/uni/unisig_decode.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/unisig_decode.h#2 integrate ... //depot/projects/ia64/sys/netatm/uni/unisig_encode.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/unisig_if.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/unisig_msg.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/unisig_print.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/unisig_sigmgr_state.c#2 integrate ... //depot/projects/ia64/sys/netatm/uni/unisig_var.h#2 integrate ... //depot/projects/ia64/sys/netatm/uni/unisig_vc_state.c#2 integrate ... //depot/projects/ia64/sys/netinet/if_ether.c#5 integrate ... //depot/projects/ia64/sys/netinet/in_pcb.c#9 integrate ... //depot/projects/ia64/sys/netinet/in_pcb.h#6 integrate ... //depot/projects/ia64/sys/netinet/ip_divert.c#5 integrate ... //depot/projects/ia64/sys/netinet/raw_ip.c#6 integrate ... //depot/projects/ia64/sys/netinet/tcp_subr.c#6 integrate ... //depot/projects/ia64/sys/netinet/tcp_syncache.c#7 integrate ... //depot/projects/ia64/sys/netinet/udp_usrreq.c#5 integrate ... //depot/projects/ia64/sys/netinet6/in6_pcb.c#4 integrate ... //depot/projects/ia64/sys/nfs/nfs_common.c#3 integrate ... //depot/projects/ia64/sys/nfsclient/nfs.h#4 integrate ... //depot/projects/ia64/sys/nfsclient/nfs_node.c#3 integrate ... //depot/projects/ia64/sys/nfsclient/nfs_subs.c#3 integrate ... //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#4 integrate ... //depot/projects/ia64/sys/nfsserver/nfs_srvsubs.c#3 integrate ... //depot/projects/ia64/sys/pc98/apm/apm.c#3 integrate ... //depot/projects/ia64/sys/pc98/i386/machdep.c#8 integrate ... //depot/projects/ia64/sys/pc98/pc98/clock.c#3 integrate ... //depot/projects/ia64/sys/pc98/pc98/diskslice_machdep.c#2 integrate ... //depot/projects/ia64/sys/pc98/pc98/isa_dma.c#2 integrate ... //depot/projects/ia64/sys/pc98/pc98/mse.c#2 integrate ... //depot/projects/ia64/sys/pc98/pc98/pc98_machdep.h#2 integrate ... //depot/projects/ia64/sys/pc98/pc98/pcaudio.c#4 integrate ... //depot/projects/ia64/sys/pc98/pc98/pmc.c#2 integrate ... //depot/projects/ia64/sys/pc98/pc98/sio.c#5 integrate ... //depot/projects/ia64/sys/pc98/pc98/sio_cbus.c#3 integrate ... //depot/projects/ia64/sys/pc98/pc98/spkr.c#3 integrate ... //depot/projects/ia64/sys/pc98/pc98/wdreg.h#2 integrate ... //depot/projects/ia64/sys/pccard/pccard.c#5 integrate ... //depot/projects/ia64/sys/pccard/pcic.c#5 integrate ... //depot/projects/ia64/sys/pccard/pcic_pci.h#2 integrate ... //depot/projects/ia64/sys/powerpc/include/bootinfo.h#2 integrate ... //depot/projects/ia64/sys/powerpc/include/bus.h#2 integrate ... //depot/projects/ia64/sys/powerpc/include/clock.h#2 integrate ... //depot/projects/ia64/sys/powerpc/include/cpu.h#4 integrate ... //depot/projects/ia64/sys/powerpc/include/db_machdep.h#3 integrate ... //depot/projects/ia64/sys/powerpc/include/intr.h#2 integrate ... //depot/projects/ia64/sys/powerpc/include/md_var.h#3 integrate ... //depot/projects/ia64/sys/powerpc/include/powerpc.h#2 integrate ... //depot/projects/ia64/sys/powerpc/include/pte.h#3 integrate ... //depot/projects/ia64/sys/powerpc/include/reg.h#2 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/autoconf.c#2 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/clock.c#3 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/extintr.c#2 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#6 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/syncicache.c#2 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/trap.c#5 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#3 integrate ... //depot/projects/ia64/sys/sparc64/include/cache.h#3 integrate ... //depot/projects/ia64/sys/sparc64/include/float.h#2 integrate ... //depot/projects/ia64/sys/sparc64/include/iommuvar.h#3 integrate ... //depot/projects/ia64/sys/sparc64/include/pv.h#4 integrate ... //depot/projects/ia64/sys/sparc64/include/reg.h#3 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/db_hwwatch.c#3 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#6 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#5 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/pv.c#4 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/trap.c#5 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/tsb.c#3 integrate ... //depot/projects/ia64/sys/sys/pcpu.h#4 integrate ... //depot/projects/ia64/sys/sys/proc.h#9 integrate ... //depot/projects/ia64/sys/sys/time.h#4 integrate ... //depot/projects/ia64/sys/sys/ucred.h#3 integrate ... //depot/projects/ia64/sys/ufs/ifs/ifs_subr.c#2 integrate ... //depot/projects/ia64/sys/ufs/ifs/ifs_vnops.c#2 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_dirhash.c#4 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#3 integrate ... //depot/projects/ia64/sys/vm/uma.h#2 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#2 integrate ... //depot/projects/ia64/usr.bin/find/extern.h#3 integrate ... //depot/projects/ia64/usr.bin/find/find.c#3 integrate ... //depot/projects/ia64/usr.bin/find/find.h#3 integrate ... //depot/projects/ia64/usr.bin/find/function.c#3 integrate ... //depot/projects/ia64/usr.bin/find/ls.c#3 integrate ... //depot/projects/ia64/usr.bin/find/main.c#3 integrate ... //depot/projects/ia64/usr.bin/find/operator.c#3 integrate ... //depot/projects/ia64/usr.bin/find/option.c#3 integrate ... //depot/projects/ia64/usr.bin/mt/mt.c#2 integrate ... //depot/projects/ia64/usr.bin/paste/paste.c#2 integrate ... //depot/projects/ia64/usr.bin/xlint/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/xlint/Makefile.inc#2 integrate ... //depot/projects/ia64/usr.bin/xlint/lint1/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/xlint/llib/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/xlint/xlint/Makefile#2 integrate ... //depot/projects/ia64/usr.bin/xlint/xlint/pathnames.h#3 integrate ... //depot/projects/ia64/usr.sbin/ipftest/Makefile#2 integrate ... //depot/projects/ia64/usr.sbin/vidcontrol/vidcontrol.1#3 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.243 2002/03/16 21:41:09 markm Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.245 2002/03/20 18:25:48 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -582,7 +582,7 @@ _fortran= gnu/usr.bin/cc/f771 .endif -.if !defined(NOPERL) || defined(NO_PERL) +.if !defined(NOPERL) && !defined(NO_PERL) _perl= gnu/usr.bin/perl/miniperl .endif @@ -615,9 +615,11 @@ _btxld= usr.sbin/btxld .endif +_xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint + cross-tools: .for _tool in ${_btxld} ${_elf2exe} \ - gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc + gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc ${_xlint} cd ${.CURDIR}/${_tool}; \ ${MAKE} obj; \ ${MAKE} depend; \ @@ -768,7 +770,7 @@ _libkeycap= usr.sbin/pcvt/keycap .endif -.if !defined(NOPERL) || defined(NO_PERL) +.if !defined(NOPERL) && !defined(NO_PERL) _libperl= gnu/usr.bin/perl/libperl .endif ==== //depot/projects/ia64/contrib/binutils/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,8 @@ +2002-02-23 Daniel Jacobowitz + + * config.guess: Import from master sources, rev 1.232. + * config.sub: Import from master sources, rev 1.246. + 2002-02-09 Alexandre Oliva Contribute sh64-elf. ==== //depot/projects/ia64/contrib/binutils/bfd/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,58 @@ +2002-03-20 Tom Rix + + * coff-rs6000.c (_bfd_xcoff_stat_arch_elt): Renamed from + _bfd_xcoff_generic_stat_arch_elt. Fix format check. + * coff64-rs6000.c : Use _bfd_xcoff_stat_arch_elt. + +Mon Mar 18 18:06:54 CET 2002 Jan Hubicka + + * cpu-i386.c (bfd_x86_64_arch): Rename to "i386:x86-64" + +2002-03-07 Daniel Jacobowitz + + * configure.in: Set is_release=y for 2.12 release. + * configure: Likewise. + +2002-03-07 Daniel Jacobowitz + + * configure.in: Bump version to 2.12. + * configure: Likewise. + +2002-03-05 Alan Modra + + * configure.in (WIN32LIBADD): Don't eval PICFLAG assignment. + * configure: Regenerate. + +2002-02-26 Andrew Macleod + + * elflink.h (elf_bfd_final_link): Don't crash on SHN_UNDEF local + dynsyms. + +2002-02-25 Alan Modra + + * elf64-ppc.c (ppc64_elf_check_relocs): Warning fix. + (ppc64_elf_relocate_section): Don't generate power4 style branch + hints for *_BRTAKEN and *_BRNTAKEN relocs. + + * elf64-ppc.c (STFD_FR0_0R1, LFD_FR0_0R1, BLR): Define. + (struct ppc_link_hash_table): Add sfpr. + (ppc64_elf_link_hash_table_create): Init it. + (ppc64_elf_create_dynamic_sections): Split creation of .stub and + .glink out to.. + (create_linkage_sections): ..here. Make .sfpr too. + (ppc64_elf_check_relocs): Call create_linkage_sections, and set + dynobj early. + (MIN_SAVE_FPR, MAX_SAVE_FPR): Define. + (ppc64_elf_func_desc_adjust): Look for missing ._savef* and + ._restf* functions, and create as needed. + (func_desc_adjust): Only force_local for shared libs. + +2002-02-22 Jakub Jelinek + + * elf64-sh64.c (sh_elf64_relocate_section): Fix a typo from my + last patch. + * elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise. + 2002-02-20 Peter Schauer * osf-core.c (osf_core_vec): OSF/1 (Digital Unix) core files are @@ -527,6 +582,7 @@ sym check if we find one. * elf64-s390.c (elf_s390_size_dynamic_sections): Likewise. * elf32-hppa.c (elf32_hppa_size_dynamic_sections): Likewise. + * elf32-i386.c (elf_i386_size_dynamic_sections): Likewise. * elf32-s390.c (elf_s390_size_dynamic_sections): Likewise. (elf_s390_grok_prstatus): Add missing prototype. ==== //depot/projects/ia64/contrib/binutils/bfd/coff-rs6000.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ extern const bfd_target *_bfd_xcoff_archive_p PARAMS ((bfd *)); extern PTR _bfd_xcoff_read_ar_hdr PARAMS ((bfd *)); extern bfd *_bfd_xcoff_openr_next_archived_file PARAMS ((bfd *, bfd *)); -extern int _bfd_xcoff_generic_stat_arch_elt PARAMS ((bfd *, struct stat *)); +extern int _bfd_xcoff_stat_arch_elt PARAMS ((bfd *, struct stat *)); extern boolean _bfd_xcoff_write_armap PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int)); extern boolean _bfd_xcoff_write_archive_contents PARAMS ((bfd *)); @@ -1389,7 +1389,7 @@ /* Stat an element in an XCOFF archive. */ int -_bfd_xcoff_generic_stat_arch_elt (abfd, s) +_bfd_xcoff_stat_arch_elt (abfd, s) bfd *abfd; struct stat *s; { @@ -1399,7 +1399,7 @@ return -1; } - if (! xcoff_big_format_p (abfd)) + if (! xcoff_big_format_p (abfd->my_archive)) { struct xcoff_ar_hdr *hdrp = arch_xhdr (abfd); @@ -3536,7 +3536,7 @@ _bfd_xcoff_read_ar_hdr, /* _read_ar_hdr */ _bfd_xcoff_openr_next_archived_file, /* _openr_next_archived_file */ _bfd_generic_get_elt_at_index, /* _get_elt_at_index */ - _bfd_xcoff_generic_stat_arch_elt, /* _generic_dtat_arch_elt */ + _bfd_xcoff_stat_arch_elt, /* _generic_stat_arch_elt */ /* XCOFF archives do not have a timestamp. */ bfd_true, /* _update_armap_timestamp */ @@ -3797,7 +3797,7 @@ _bfd_xcoff_read_ar_hdr, /* _read_ar_hdr */ _bfd_xcoff_openr_next_archived_file, /* _openr_next_archived_file */ _bfd_generic_get_elt_at_index, /* _get_elt_at_index */ - _bfd_xcoff_generic_stat_arch_elt, /* _generic_dtat_arch_elt */ + _bfd_xcoff_stat_arch_elt, /* _generic_stat_arch_elt */ /* XCOFF archives do not have a timestamp. */ bfd_true, /* _update_armap_timestamp */ ==== //depot/projects/ia64/contrib/binutils/bfd/coff64-rs6000.c#2 (text+ko) ==== @@ -103,7 +103,7 @@ extern boolean _bfd_xcoff_slurp_armap PARAMS ((bfd *)); extern PTR _bfd_xcoff_read_ar_hdr PARAMS ((bfd *)); extern bfd *_bfd_xcoff_openr_next_archived_file PARAMS ((bfd *, bfd *)); -extern int _bfd_xcoff_generic_stat_arch_elt PARAMS ((bfd *, struct stat *)); +extern int _bfd_xcoff_stat_arch_elt PARAMS ((bfd *, struct stat *)); extern boolean _bfd_xcoff_write_armap PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int)); extern boolean _bfd_xcoff_write_archive_contents PARAMS ((bfd *)); @@ -2577,9 +2577,9 @@ bfd_dont_truncate_arname, /* _truncate_arname */ _bfd_xcoff_write_armap, /* _write_armap */ _bfd_xcoff_read_ar_hdr, /* _read_ar_hdr */ - xcoff64_openr_next_archived_file, /* _openr_next_archived_file */ + xcoff64_openr_next_archived_file, /* _openr_next_archived_file */ _bfd_generic_get_elt_at_index, /* _get_elt_at_index */ - _bfd_xcoff_generic_stat_arch_elt, /* _generic_dtat_arch_elt */ + _bfd_xcoff_stat_arch_elt, /* _generic_stat_arch_elt */ /* XCOFF archives do not have a timestamp. */ bfd_true, /* _update_armap_timestamp */ ==== //depot/projects/ia64/contrib/binutils/bfd/configure#3 (text+ko) ==== @@ -57,7 +57,6 @@ program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -172,7 +171,6 @@ --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -343,11 +341,6 @@ -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -513,16 +506,12 @@ srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -561,12 +550,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:565: checking for Cygwin environment" >&5 +echo "configure:554: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -594,19 +583,19 @@ CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:598: checking for mingw32 environment" >&5 +echo "configure:587: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -671,7 +660,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:675: checking host system type" >&5 +echo "configure:664: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -692,7 +681,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:696: checking target system type" >&5 +echo "configure:685: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -710,7 +699,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:714: checking build system type" >&5 +echo "configure:703: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -735,7 +724,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:739: checking for $ac_word" >&5 +echo "configure:728: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -765,7 +754,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:769: checking for $ac_word" >&5 +echo "configure:758: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -816,7 +805,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:820: checking for $ac_word" >&5 +echo "configure:809: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -848,7 +837,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:852: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:841: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -859,12 +848,12 @@ cat > conftest.$ac_ext << EOF -#line 863 "configure" +#line 852 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -890,12 +879,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:894: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:883: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:899: checking whether we are using GNU C" >&5 +echo "configure:888: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -904,7 +893,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 20:33:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23AC537B41C; Wed, 20 Mar 2002 20:33:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BD8B037B41C for ; Wed, 20 Mar 2002 20:33:23 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L4XNb95153 for perforce@freebsd.org; Wed, 20 Mar 2002 20:33:23 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 20:33:23 -0800 (PST) Message-Id: <200203210433.g2L4XNb95153@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8118 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8118 Change 8118 by peter@peter_daintree on 2002/03/20 20:32:45 revert local build hack Affected files ... ... //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#4 edit Differences ... ==== //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#4 (text+ko) ==== @@ -43,7 +43,7 @@ CFLAGS+= -DLOADER CFLAGS+= -ffreestanding -LDFLAGS= -nostdlib -T ${.CURDIR}/ldscript.ia64 -L/usr/local/ia64-unknown-linux/lib +LDFLAGS= -nostdlib -T ${.CURDIR}/ldscript.ia64 CLEANFILES+= vers.c vers.o ${PROG}.list CLEANFILES+= loader.help To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 20:34:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E67F37B417; Wed, 20 Mar 2002 20:34:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 707C837B404 for ; Wed, 20 Mar 2002 20:34:25 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L4YPb95359 for perforce@freebsd.org; Wed, 20 Mar 2002 20:34:25 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 20:34:25 -0800 (PST) Message-Id: <200203210434.g2L4YPb95359@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8119 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8119 Change 8119 by peter@peter_daintree on 2002/03/20 20:33:35 remove local hack that should never have made it here. Affected files ... ... //depot/projects/ia64/sys/kern/kern_conf.c#5 edit Differences ... ==== //depot/projects/ia64/sys/kern/kern_conf.c#5 (text+ko) ==== @@ -302,7 +302,7 @@ if (dev->si_flags & SI_NAMED) { printf( "WARNING: Driver mistake: repeat make_dev(\"%s\")\n", dev->si_name); - panic("don't do that, mail phk@freebsd.org for help"); + panic("don't do that"); return (dev); } va_start(ap, fmt); @@ -383,7 +383,7 @@ if (!(dev->si_flags & SI_NAMED)) { printf( "WARNING: Driver mistake: destroy_dev on %d/%d\n", major(dev), minor(dev)); - panic("don't do that, mail phk@freebsd.org for help"); + panic("don't do that"); return; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 20:49:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC57237B419; Wed, 20 Mar 2002 20:49:45 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EDBC837B417 for ; Wed, 20 Mar 2002 20:49:44 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L4niK96881 for perforce@freebsd.org; Wed, 20 Mar 2002 20:49:44 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 20:49:44 -0800 (PST) Message-Id: <200203210449.g2L4niK96881@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8120 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8120 Change 8120 by peter@peter_overcee on 2002/03/20 20:49:35 update for a fresh attempt at self hosting Affected files ... ... //depot/projects/ia64/doinc.sh#3 edit Differences ... ==== //depot/projects/ia64/doinc.sh#3 (text+kox) ==== @@ -1,7 +1,7 @@ #! /bin/sh -rm -rf /usr/local/ia64-unknown-linux/usr/include.old -mv /usr/local/ia64-unknown-linux/usr/include /usr/local/ia64-unknown-linux/usr/include.old -mkdir -p /usr/local/ia64-unknown-linux/usr/include -mtree -deU -f /home/src/etc/mtree/BSD.include.dist -p /usr/local/ia64-unknown-linux/usr/include +rm -rf /usr/local/ia64/usr/include.old +mv /usr/local/ia64/usr/include /usr/local/ia64/usr/include.old +mkdir -p /usr/local/ia64/usr/include +mtree -deU -f /home/src/etc/mtree/BSD.include.dist -p /usr/local/ia64/include (cd include; ia64-make obj) -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOMAN= NOINFO= NODOC= NOHTML= STRIP= includes +ia64-make DESTDIR=/usr/local/ia64 NOMAN= NOINFO= NODOC= NOHTML= STRIP= includes To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 21:54:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D20337B417; Wed, 20 Mar 2002 21:54:03 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5F06037B404 for ; Wed, 20 Mar 2002 21:54:02 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L5s2o08167 for perforce@freebsd.org; Wed, 20 Mar 2002 21:54:02 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 21:54:02 -0800 (PST) Message-Id: <200203210554.g2L5s2o08167@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8121 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8121 Change 8121 by peter@peter_overcee on 2002/03/20 21:53:43 checkpoint. I just built a new lib etc with this. Affected files ... ... //depot/projects/ia64/dolibs.sh#3 edit Differences ... ==== //depot/projects/ia64/dolibs.sh#3 (text+kox) ==== @@ -1,45 +1,50 @@ #! /bin/sh +chflags -R noschg /usr/local/ia64/usr/lib.old set -e -chflags -R noschg /usr/local/ia64-unknown-linux/usr/lib.old -rm -rf /usr/local/ia64-unknown-linux/usr/lib.old -mv /usr/local/ia64-unknown-linux/usr/lib /usr/local/ia64-unknown-linux/usr/lib.old -mtree -deU -f /home/src/etc/mtree/BSD.usr.dist -p /usr/local/ia64-unknown-linux/usr +rm -rf /usr/local/ia64/usr/lib.old +mv /usr/local/ia64/usr/lib /usr/local/ia64/usr/lib.old +mtree -deU -f /home/src/etc/mtree/BSD.usr.dist -p /usr/local/ia64/usr cd lib -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= obj +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= obj (cd libncurses; make build-tools) cd ../secure/lib -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= obj -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= depend +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= obj +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= depend cd ../../lib -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= depend -PATH=/usr/local/ia64-unknown-linux/bin:$PATH +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= depend +PATH=/usr/local/ia64/bin:$PATH export PATH cd csu/ia64 -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= install +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= install cd ../.. -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= NOPIC= NOSHARED= -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= NOPIC= NOSHARED= install +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= NOPIC= NOSHARED= +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= NOPIC= NOSHARED= install cd ../secure/lib -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= NOPIC= NOSHARED= -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= NOPIC= NOSHARED= install +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= NOPIC= NOSHARED= +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= NOPIC= NOSHARED= install cd ../../lib cd libncurses -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= install +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= install cd .. cd ../secure/lib cd libcrypto -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= install +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= install cd .. cd libssh -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= install +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= install cd .. cd ../../lib -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= install +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= install cd ../secure/lib -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= -ia64-make DESTDIR=/usr/local/ia64-unknown-linux NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= install +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= install +cd ../../gnu/lib +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= NO_GCC= obj +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= NO_GCC= depend +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= NO_GCC= +ia64-make DESTDIR=/usr/local/ia64 NOLIBC_R= NOMAN= NOINFO= NODOC= NOHTML= STRIP= NO_GCC= install To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 22:27:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 650F737B419; Wed, 20 Mar 2002 22:27:45 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A985E37B417 for ; Wed, 20 Mar 2002 22:27:44 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L6RiY16638 for perforce@freebsd.org; Wed, 20 Mar 2002 22:27:44 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 22:27:44 -0800 (PST) Message-Id: <200203210627.g2L6RiY16638@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8125 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8125 Change 8125 by peter@peter_overcee on 2002/03/20 22:27:19 solve the swapcontext problem with a sledge hammer Affected files ... ... //depot/projects/ia64/lib/libc/alpha/gen/Makefile.inc#3 edit ... //depot/projects/ia64/lib/libc/gen/Makefile.inc#5 edit ... //depot/projects/ia64/lib/libc/i386/gen/Makefile.inc#3 edit Differences ... ==== //depot/projects/ia64/lib/libc/alpha/gen/Makefile.inc#3 (text+ko) ==== @@ -8,7 +8,7 @@ SRCS+= __divqu.S __divq.S __divlu.S __divl.S SRCS+= __remqu.S __remq.S __remlu.S __reml.S SRCS+= rfork_thread.S -SRCS+= _ctx_start.S getcontext.S makecontext.c +SRCS+= _ctx_start.S getcontext.S makecontext.c swapcontext.c CLEANFILES+= __divqu.S __divq.S __divlu.S __divl.S CLEANFILES+= __remqu.S __remq.S __remlu.S __reml.S ==== //depot/projects/ia64/lib/libc/gen/Makefile.inc#5 (text+ko) ==== @@ -27,7 +27,7 @@ setproctitle.c setprogname.c \ shmat.c shmctl.c shmdt.c shmget.c siginterrupt.c siglist.c signal.c \ sigsetops.c sleep.c srand48.c stringlist.c strtofflags.c \ - swapcontext.c sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \ + sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \ syslog.c telldir.c termios.c time.c times.c timezone.c ttyname.c \ ttyslot.c ualarm.c uname.c unvis.c usleep.c utime.c valloc.c vis.c \ wait.c wait3.c waitpid.c ==== //depot/projects/ia64/lib/libc/i386/gen/Makefile.inc#3 (text+ko) ==== @@ -3,4 +3,4 @@ SRCS+= _ctx_start.S _setjmp.S alloca.S getcontext.S fabs.S frexp.c \ infinity.c isinf.c ldexp.c makecontext.c modf.S \ - rfork_thread.S setjmp.S sigsetjmp.S + rfork_thread.S setjmp.S sigsetjmp.S swapcontext.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 22:40:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 261A937B41A; Wed, 20 Mar 2002 22:40:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4EC6937B41F for ; Wed, 20 Mar 2002 22:40:02 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L6e2M18372 for perforce@freebsd.org; Wed, 20 Mar 2002 22:40:02 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 22:40:02 -0800 (PST) Message-Id: <200203210640.g2L6e2M18372@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8126 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8126 Change 8126 by peter@peter_overcee on 2002/03/20 22:39:30 do not build cc_tools when NO_GCC is specified Affected files ... ... //depot/projects/ia64/Makefile.inc1#10 edit Differences ... ==== //depot/projects/ia64/Makefile.inc1#10 (text+ko) ==== @@ -597,8 +597,12 @@ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif +.if !defined(NO_GCC) +_cc_tools= gnu/usr.bin/cc/cc_tools +.endif + build-tools: -.for _tool in bin/csh bin/sh ${_games} gnu/usr.bin/cc/cc_tools ${_fortran} \ +.for _tool in bin/csh bin/sh ${_games} ${_cc_tools} ${_fortran} \ ${_perl} ${_libroken4} ${_libkrb5} lib/libncurses ${_share} \ usr.bin/awk usr.bin/file usr.sbin/sysinstall cd ${.CURDIR}/${_tool}; ${MAKE} build-tools To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 22:41: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B88737B400; Wed, 20 Mar 2002 22:41:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C920337B41A for ; Wed, 20 Mar 2002 22:41:03 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L6f3O18581 for perforce@freebsd.org; Wed, 20 Mar 2002 22:41:03 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 22:41:03 -0800 (PST) Message-Id: <200203210641.g2L6f3O18581@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8127 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8127 Change 8127 by peter@peter_overcee on 2002/03/20 22:40:51 turn pam_opie off for now due to build complications. It probably works ok in the real world, but it is causing me pain outside of the 'make world' environment when it tries to link the non-pic libopie.a into pam_opie.so Affected files ... ... //depot/projects/ia64/lib/libpam/modules/modules.inc#2 edit Differences ... ==== //depot/projects/ia64/lib/libpam/modules/modules.inc#2 (text+ko) ==== @@ -12,8 +12,8 @@ MODULES += pam_lastlog MODULES += pam_login_access MODULES += pam_nologin -MODULES += pam_opie -MODULES += pam_opieaccess +#MODULES += pam_opie +#MODULES += pam_opieaccess MODULES += pam_permit MODULES += pam_radius MODULES += pam_rootok To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 23: 8:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1D9537B41B; Wed, 20 Mar 2002 23:08:38 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D72F037B41D for ; Wed, 20 Mar 2002 23:08:37 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L78bN25986 for perforce@freebsd.org; Wed, 20 Mar 2002 23:08:37 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 23:08:37 -0800 (PST) Message-Id: <200203210708.g2L78bN25986@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8129 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8129 Change 8129 by peter@peter_overcee on 2002/03/20 23:07:57 turn off NOSHARED override Affected files ... ... //depot/projects/ia64/usr.bin/login/Makefile#5 edit Differences ... ==== //depot/projects/ia64/usr.bin/login/Makefile#5 (text+ko) ==== @@ -1,7 +1,6 @@ # From: @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD: src/usr.bin/login/Makefile,v 1.41 2002/02/08 23:07:34 markm Exp $ -NOSHARED= xx PROG= login SRCS= login.c login_fbtab.c MAN= login.1 login.access.5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 23: 9:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86D3137B41C; Wed, 20 Mar 2002 23:09:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BAF4537B41A for ; Wed, 20 Mar 2002 23:09:39 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L79df26145 for perforce@freebsd.org; Wed, 20 Mar 2002 23:09:39 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 23:09:39 -0800 (PST) Message-Id: <200203210709.g2L79df26145@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8130 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8130 Change 8130 by peter@peter_overcee on 2002/03/20 23:09:15 turn off NOSHARED, it causes library breakage due to "debug" being defined in too many places Affected files ... ... //depot/projects/ia64/contrib/lukemftpd/src/extern.h#3 edit ... //depot/projects/ia64/contrib/opie/libopie/writerec.c#2 edit ... //depot/projects/ia64/libexec/Makefile#3 edit ... //depot/projects/ia64/libexec/lukemftpd/Makefile#2 edit ... //depot/projects/ia64/secure/libexec/telnetd/Makefile#5 edit ... //depot/projects/ia64/share/mk/bsd.sys.mk#3 edit ... //depot/projects/ia64/sys/ia64/conf/GENERIC#6 edit ... //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#2 edit ... //depot/projects/ia64/sys/ia64/conf/SMALL#9 edit Differences ... ==== //depot/projects/ia64/contrib/lukemftpd/src/extern.h#3 (text+ko) ==== @@ -100,6 +100,9 @@ * SUCH DAMAGE. */ +#include +#include + #ifdef NO_LONG_LONG # define LLF "%ld" # define LLFP(x) "%" x "ld" ==== //depot/projects/ia64/contrib/opie/libopie/writerec.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ #endif /* HAVE_STDLIB_H */ #include "opie.h" -char *__opienone = "****************"; +static char *__opienone = "****************"; int __opiewriterec FUNCTION((opie), struct opie *opie) { ==== //depot/projects/ia64/libexec/Makefile#3 (text+ko) ==== @@ -9,7 +9,6 @@ ftpd \ getNAME \ getty \ - lukemftpd \ makekey \ mknetid \ pppoed \ ==== //depot/projects/ia64/libexec/lukemftpd/Makefile#2 (text+ko) ==== @@ -11,7 +11,7 @@ SRCS= cmds.c conf.c ftpd.c ftpcmd.y popen.c WFORMAT= 0 -CFLAGS+= -I${.CURDIR} -I${LUKEMFTPD} #-I${LUKEMFTPD}/src +CFLAGS+= -I${.CURDIR} -I${LUKEMFTPD} -I${LUKEMFTPD}/src YFLAGS= LDADD= -lmd -lcrypt -lutil ==== //depot/projects/ia64/secure/libexec/telnetd/Makefile#5 (text+ko) ==== @@ -3,7 +3,6 @@ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. -NOSHARED= xx PROG= telnetd MAN= telnetd.8 ==== //depot/projects/ia64/share/mk/bsd.sys.mk#3 (text+ko) ==== ==== //depot/projects/ia64/sys/ia64/conf/GENERIC#6 (text+ko) ==== @@ -27,7 +27,7 @@ maxusers 0 #To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" +hints "GENERIC.hints" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions NO_CPU_COPTFLAGS=true #Ignore any x86 CPUTYPE @@ -59,6 +59,7 @@ # SMP options SMP + # Debugging for use in -current options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking @@ -69,6 +70,10 @@ device isa device pci +# IA64 uses acpica +device acpica +options ACPI_DEBUG + # Floppy drives device fdc ==== //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#2 (text+ko) ==== @@ -11,8 +11,8 @@ hint.atkbd.0.irq="1" hint.psm.0.at="atkbdc" hint.psm.0.irq="12" -hint.vga.0.at="isa" -hint.sc.0.at="isa" +#hint.vga.0.at="isa" +#hint.sc.0.at="isa" hint.mcclock.0.at="isa" hint.mcclock.0.port="0x70" hint.sio.0.at="isa" ==== //depot/projects/ia64/sys/ia64/conf/SMALL#9 (text+ko) ==== @@ -135,12 +135,12 @@ device bpf #Berkeley packet filter # USB support -device uhci # UHCI PCI->USB interface -device ohci # OHCI PCI->USB interface -device usb # USB Bus (required) -device ugen # Generic -device uhid # "Human Interface Devices" -device ukbd # Keyboard +#device uhci # UHCI PCI->USB interface +#device ohci # OHCI PCI->USB interface +#device usb # USB Bus (required) +#device ugen # Generic +#device uhid # "Human Interface Devices" +#device ukbd # Keyboard #device ulpt # Printer #device umass # Disks/Mass storage - Requires scbus and da0 #device ums # Mouse To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 23:12:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1DE637B417; Wed, 20 Mar 2002 23:12:44 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E7AAA37B404 for ; Wed, 20 Mar 2002 23:12:43 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L7Chg26960 for perforce@freebsd.org; Wed, 20 Mar 2002 23:12:43 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 23:12:43 -0800 (PST) Message-Id: <200203210712.g2L7Chg26960@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8131 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8131 Change 8131 by peter@peter_overcee on 2002/03/20 23:12:37 add libz explicitly here for cross compiling help. Otherwise ld tries to resolve the dependency as /usr/lib/libz.so.2 which doesn't mix well with ia64 code when compiling on i386 Affected files ... ... //depot/projects/ia64/secure/libexec/sftp-server/Makefile#3 edit Differences ... ==== //depot/projects/ia64/secure/libexec/sftp-server/Makefile#3 (text+ko) ==== @@ -5,8 +5,8 @@ SRCS= sftp-server.c sftp-common.c MAN= sftp-server.8 -LDADD+= -lssh -lcrypto -DPADD+= ${LIBSSH} ${LIBCRYPTO} +LDADD+= -lssh -lcrypto -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 23:17:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 650F537B41A; Wed, 20 Mar 2002 23:17:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7575337B417 for ; Wed, 20 Mar 2002 23:17:50 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L7HoK27823 for perforce@freebsd.org; Wed, 20 Mar 2002 23:17:50 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 23:17:50 -0800 (PST) Message-Id: <200203210717.g2L7HoK27823@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8132 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8132 Change 8132 by peter@peter_overcee on 2002/03/20 23:17:31 turn off NOSTATIC due to pam breakage (login_access defined twice) Affected files ... ... //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#5 edit Differences ... ==== //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#5 (text+ko) ==== @@ -1,8 +1,6 @@ # $FreeBSD: src/secure/usr.sbin/sshd/Makefile,v 1.21 2002/03/18 16:17:57 des Exp $ # -NOSHARED=xx - LOGINSRC= ${.CURDIR}/../../../usr.bin/login PROG= sshd To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 23:19: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED85837B404; Wed, 20 Mar 2002 23:18:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2615037B400 for ; Wed, 20 Mar 2002 23:18:52 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L7Ip228021 for perforce@freebsd.org; Wed, 20 Mar 2002 23:18:51 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 23:18:51 -0800 (PST) Message-Id: <200203210718.g2L7Ip228021@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8133 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8133 Change 8133 by peter@peter_overcee on 2002/03/20 23:18:20 Add a bunch of -lz / -lcrypto for temporary cross build happiness Affected files ... ... //depot/projects/ia64/secure/usr.bin/scp/Makefile#4 edit ... //depot/projects/ia64/secure/usr.bin/sftp/Makefile#4 edit ... //depot/projects/ia64/secure/usr.bin/ssh-add/Makefile#3 edit ... //depot/projects/ia64/secure/usr.bin/ssh-agent/Makefile#3 edit ... //depot/projects/ia64/secure/usr.bin/ssh-keygen/Makefile#3 edit ... //depot/projects/ia64/secure/usr.bin/ssh-keyscan/Makefile#3 edit Differences ... ==== //depot/projects/ia64/secure/usr.bin/scp/Makefile#4 (text+ko) ==== @@ -4,8 +4,8 @@ PROG= scp SRCS= scp.c -DPADD= ${LIBSSH} -LDADD= -lssh +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto -lz .include ==== //depot/projects/ia64/secure/usr.bin/sftp/Makefile#4 (text+ko) ==== @@ -4,8 +4,8 @@ PROG= sftp SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c -LDADD= -lssh -lcrypto -DPADD= ${LIBSSH} ${LIBCRYPTO} +LDADD= -lssh -lcrypto -lz +DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} .include ==== //depot/projects/ia64/secure/usr.bin/ssh-add/Makefile#3 (text+ko) ==== @@ -4,8 +4,8 @@ PROG= ssh-add SRCS= ssh-add.c -LDADD+= -lssh -lcrypto -DPADD+= ${LIBSSH} ${LIBCRYPTO} +LDADD+= -lssh -lcrypto -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} .include ==== //depot/projects/ia64/secure/usr.bin/ssh-agent/Makefile#3 (text+ko) ==== @@ -4,8 +4,8 @@ PROG= ssh-agent SRCS= ssh-agent.c -LDADD+= -lssh -lcrypto -DPADD+= ${LIBSSH} ${LIBCRYPTO} +LDADD+= -lssh -lcrypto -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} .include ==== //depot/projects/ia64/secure/usr.bin/ssh-keygen/Makefile#3 (text+ko) ==== @@ -4,8 +4,8 @@ PROG= ssh-keygen SRCS= ssh-keygen.c -LDADD+= -lssh -lcrypto -DPADD+= ${LIBSSH} ${LIBCRYPTO} +LDADD+= -lssh -lcrypto -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPTO} .include ==== //depot/projects/ia64/secure/usr.bin/ssh-keyscan/Makefile#3 (text+ko) ==== @@ -4,8 +4,8 @@ PROG= ssh-keyscan SRCS= ssh-keyscan.c -LDADD+= -lssh -lcrypto -DPADD+= ${LIBSSH} ${LIBCRYPTO} +LDADD+= -lssh -lcrypto -lz +DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 20 23:20:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB98337B417; Wed, 20 Mar 2002 23:20:55 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 07A6C37B404 for ; Wed, 20 Mar 2002 23:20:55 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L7Ksn28474 for perforce@freebsd.org; Wed, 20 Mar 2002 23:20:54 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 20 Mar 2002 23:20:54 -0800 (PST) Message-Id: <200203210720.g2L7Ksn28474@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8134 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8134 Change 8134 by peter@peter_overcee on 2002/03/20 23:20:34 temporary -DNOSYS to keep the build away from sys/boot Affected files ... ... //depot/projects/ia64/Makefile.inc1#11 edit Differences ... ==== //depot/projects/ia64/Makefile.inc1#11 (text+ko) ==== @@ -83,7 +83,7 @@ .if exists(${.CURDIR}/share) && !defined(NOSHARE) SUBDIR+= share .endif -.if exists(${.CURDIR}/sys) +.if exists(${.CURDIR}/sys) && !defined(NOSYS) SUBDIR+= sys .endif .if exists(${.CURDIR}/usr.bin) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 0:20:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34C6537B419; Thu, 21 Mar 2002 00:20:09 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 643A537B400 for ; Thu, 21 Mar 2002 00:20:07 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L8K7X43763 for perforce@freebsd.org; Thu, 21 Mar 2002 00:20:07 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 21 Mar 2002 00:20:07 -0800 (PST) Message-Id: <200203210820.g2L8K7X43763@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8137 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8137 Change 8137 by peter@peter_overcee on 2002/03/21 00:19:26 corresponding change as in -current. initialize pc->current_pmap Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#19 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#19 (text+ko) ==== @@ -665,6 +665,7 @@ */ pcpup = (struct pcpu *) pmap_steal_memory(PAGE_SIZE); pcpu_init(pcpup, 0, PAGE_SIZE); + pcpup->pc_current_pmap = kernel_pmap; ia64_set_k4((u_int64_t) pcpup); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 0:20:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 858A337B417; Thu, 21 Mar 2002 00:20:09 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C908A37B417 for ; Thu, 21 Mar 2002 00:20:07 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L8K7P43770 for perforce@freebsd.org; Thu, 21 Mar 2002 00:20:07 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 21 Mar 2002 00:20:07 -0800 (PST) Message-Id: <200203210820.g2L8K7P43770@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8138 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8138 Change 8138 by peter@peter_overcee on 2002/03/21 00:19:53 add -DNO_LINT block out sysinstall for ia64 - no boot blocks to embed. Affected files ... ... //depot/projects/ia64/usr.bin/Makefile#9 edit ... //depot/projects/ia64/usr.sbin/Makefile#7 edit Differences ... ==== //depot/projects/ia64/usr.bin/Makefile#9 (text+ko) ==== @@ -185,7 +185,6 @@ write \ xargs \ xinstall \ - xlint \ xstr \ yacc \ yes \ @@ -193,6 +192,10 @@ ypmatch \ ypwhich +.if !defined(NO_LINT) +SUBDIR+=xlint +.endif + .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../kerberosIV) && !exists(${.CURDIR}/../secure)) || \ defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4)) ==== //depot/projects/ia64/usr.sbin/Makefile#7 (text+ko) ==== @@ -101,7 +101,6 @@ sliplogin \ slstat \ spray \ - sysinstall \ syslogd \ tcpdchk \ tcpdmatch \ @@ -127,6 +126,10 @@ ypset \ zic +.if ${MACHINE_ARCH} != "ia64" +SUBDIR+=sysinstall +.endif + .if !defined(NOLIBC_R) && ${MACHINE_ARCH} != "ia64" SUBDIR+=pppctl .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 1:32:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCB3337B417; Thu, 21 Mar 2002 01:32:35 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 15F0637B404 for ; Thu, 21 Mar 2002 01:32:35 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2L9WYQ58796 for perforce@freebsd.org; Thu, 21 Mar 2002 01:32:34 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 21 Mar 2002 01:32:34 -0800 (PST) Message-Id: <200203210932.g2L9WYQ58796@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8140 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8140 Change 8140 by peter@peter_overcee on 2002/03/21 01:31:42 work around a brain-dead bug in gcc's crtbeginS.o (see config/ia64/crtbegin.asm - it looks like they test to see if the location of a fptr is null vs. testing to see if the actual code it points to is null. Affected files ... ... //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#3 edit ... //depot/projects/ia64/lib/libc/ia64/gen/cxa.c#1 add Differences ... ==== //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#3 (text+ko) ==== @@ -5,3 +5,4 @@ SRCS+= __divdi3.S __divsi3.S __moddi3.S __modsi3.S SRCS+= __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S SRCS+= __divdf3.S __divsf3.S +SRCS+= cxa.c # remove when gcc is fixed To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 4:59:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BCD237B43B; Thu, 21 Mar 2002 04:58:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 76A0137B429 for ; Thu, 21 Mar 2002 04:58:37 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2LCwan07634 for perforce@freebsd.org; Thu, 21 Mar 2002 04:58:36 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 21 Mar 2002 04:58:36 -0800 (PST) Message-Id: <200203211258.g2LCwan07634@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8151 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8151 Change 8151 by peter@peter_overcee on 2002/03/21 04:58:01 32K of register stack is *not* enough to self-compile gcc. This isn't right either, but at least it stops gcc's self hosting explosions. Note to self: kick dfr in the shins for this. :-) Affected files ... ... //depot/projects/ia64/sys/kern/kern_exec.c#7 edit Differences ... ==== //depot/projects/ia64/sys/kern/kern_exec.c#7 (text+ko) ==== @@ -627,7 +627,7 @@ vm_offset_t bsaddr; bsaddr = USRSTACK - 2*maxssiz; error = vm_map_find(&vmspace->vm_map, 0, 0, &bsaddr, - 4*PAGE_SIZE, 0, + 64 * PAGE_SIZE, 0, VM_PROT_ALL, VM_PROT_ALL, 0); FIRST_THREAD_IN_PROC(imgp->proc)->td_md.md_bspstore = bsaddr; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 5:15:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 790B937B419; Thu, 21 Mar 2002 05:15:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8B73337B41E for ; Thu, 21 Mar 2002 05:14:57 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2LDEve14697 for perforce@freebsd.org; Thu, 21 Mar 2002 05:14:57 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 21 Mar 2002 05:14:57 -0800 (PST) Message-Id: <200203211314.g2LDEve14697@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8153 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8153 Change 8153 by peter@peter_overcee on 2002/03/21 05:14:51 I spoke too soon. 64 pages (512K) was not enough for gcc/expr.c either, so go for 256 (2MB) and make it a sysctl so I dont have to keep recompiling. :-] Affected files ... ... //depot/projects/ia64/sys/kern/kern_exec.c#8 edit Differences ... ==== //depot/projects/ia64/sys/kern/kern_exec.c#8 (text+ko) ==== @@ -95,6 +95,12 @@ int ps_argsopen = 1; SYSCTL_INT(_kern, OID_AUTO, ps_argsopen, CTLFLAG_RW, &ps_argsopen, 0, ""); +#ifdef __ia64__ +/* XXX HACK */ +static int regstkpages = 256; +SYSCTL_INT(_machdep, OID_AUTO, regstkpages, CTLFLAG_RW, ®stkpages, 0, ""); +#endif + /* * Each of the items is a pointer to a `const struct execsw', hence the * double pointer here. @@ -627,7 +633,7 @@ vm_offset_t bsaddr; bsaddr = USRSTACK - 2*maxssiz; error = vm_map_find(&vmspace->vm_map, 0, 0, &bsaddr, - 64 * PAGE_SIZE, 0, + regstkpages * PAGE_SIZE, 0, VM_PROT_ALL, VM_PROT_ALL, 0); FIRST_THREAD_IN_PROC(imgp->proc)->td_md.md_bspstore = bsaddr; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 5:25:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06A3C37B417; Thu, 21 Mar 2002 05:25:24 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from rover.village.org (rover.bsdimp.com [204.144.255.66]) by hub.freebsd.org (Postfix) with ESMTP id 31F1837B419; Thu, 21 Mar 2002 05:25:21 -0800 (PST) Received: from harmony.village.org (harmony.village.org [10.0.0.6]) by rover.village.org (8.11.3/8.11.3) with ESMTP id g2LDPJi81369; Thu, 21 Mar 2002 06:25:20 -0700 (MST) (envelope-from imp@village.org) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.11.6/8.11.6) with ESMTP id g2LDPJL16998; Thu, 21 Mar 2002 06:25:19 -0700 (MST) (envelope-from imp@village.org) Date: Thu, 21 Mar 2002 06:25:04 -0700 (MST) Message-Id: <20020321.062504.18991423.imp@village.org> To: jhb@freebsd.org Cc: peter@freebsd.org, perforce@freebsd.org Subject: Re: PERFORCE change 7933 for review From: "M. Warner Losh" In-Reply-To: References: <200203190929.g2J9TnB80357@freefall.freebsd.org> X-Mailer: Mew version 2.1 on Emacs 21.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: John Baldwin writes: : : On 19-Mar-2002 Peter Wemm wrote: : > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=7933 : > : > Change 7933 by peter@peter_overcee on 2002/03/19 01:29:12 : > : > add the ia64 IO tag, and add a #error to catch this in future. : > : > Affected files ... : > : > ... //depot/projects/ia64/sys/dev/kbd/atkbdc.c#2 edit : > : > Differences ... : > : > ==== //depot/projects/ia64/sys/dev/kbd/atkbdc.c#2 (text+ko) ==== : > : > @@ -159,6 +159,10 @@ : > tag = I386_BUS_SPACE_IO; : > #elif defined(__alpha__) : > tag = busspace_isa_io; : > +#elif defined(__ia64__) : > + tag = IA64_BUS_SPACE_IO; : > +#else : > +#error "define tag!" : > #endif : > : > #if notyet : : Maybe there should be a MD macro to define what the appropriate bus tag is? No. atkbdc should be fixed to properly use the bus tag that the kernel gives it rather than guessing. It needs to do this anyway if we are ever to support some some PC Cards that have keyboard/mouse ports on them. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 5:40:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A94E37B417; Thu, 21 Mar 2002 05:40:17 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from rover.village.org (rover.bsdimp.com [204.144.255.66]) by hub.freebsd.org (Postfix) with ESMTP id F404E37B400; Thu, 21 Mar 2002 05:40:12 -0800 (PST) Received: from harmony.village.org (harmony.village.org [10.0.0.6]) by rover.village.org (8.11.3/8.11.3) with ESMTP id g2LDeAi81482; Thu, 21 Mar 2002 06:40:10 -0700 (MST) (envelope-from imp@village.org) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.11.6/8.11.6) with ESMTP id g2LDe4L17101; Thu, 21 Mar 2002 06:40:04 -0700 (MST) (envelope-from imp@village.org) Date: Thu, 21 Mar 2002 06:39:51 -0700 (MST) Message-Id: <20020321.063951.126763718.imp@village.org> To: dfr@nlsystems.com Cc: jhb@freebsd.org, peter@wemm.org, perforce@freebsd.org Subject: Re: PERFORCE change 7933 for review From: "M. Warner Losh" In-Reply-To: <20020320091812.F99274-100000@salmon.nlsystems.com> References: <20020320091812.F99274-100000@salmon.nlsystems.com> X-Mailer: Mew version 2.1 on Emacs 21.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: <20020320091812.F99274-100000@salmon.nlsystems.com> Doug Rabson writes: : On Tue, 19 Mar 2002, John Baldwin wrote: : : > : > On 19-Mar-2002 Peter Wemm wrote: : > > : > > Actually, this should use the proper API's instead of hacking around like : > > this. : > : > Fair enough, wasn't sure if it could be using bus_alloc_resource() like a Good : > Little Device Driver or not. : : I think this might be part of the 'early console' part of the driver. The : normal device driver support framework isn't available yet. That is correct. I looked at fixing it just now, and it looks ugly to fix right. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 7:10:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0842637B417; Thu, 21 Mar 2002 07:10:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1BC9E37B404 for ; Thu, 21 Mar 2002 07:10:20 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2LFAJ451886 for perforce@freebsd.org; Thu, 21 Mar 2002 07:10:19 -0800 (PST) (envelope-from green@freebsd.org) Date: Thu, 21 Mar 2002 07:10:19 -0800 (PST) Message-Id: <200203211510.g2LFAJ451886@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8156 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8156 Change 8156 by green@green_laptop_2 on 2002/03/21 07:10:08 * Fixup mac.h a bit. * Treat mount objects like the other MAC-containing objects. * Rename mac_mountfs() and mac_mountrootfs() to the more-correct mac_create_mount() and mac_create_root_mount(). * Move the root-mounted hook until after rootvnode has been set so the system has at least some sort of filesystem state :) Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/init_main.c#15 edit ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#115 edit ... //depot/projects/trustedbsd/mac/sys/kern/vfs_conf.c#5 edit ... //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#18 edit ... //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#36 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#86 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#49 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_main.c#15 (text+ko) ==== @@ -506,6 +506,9 @@ VREF(p->p_fd->fd_rdir); FILEDESC_UNLOCK(p->p_fd); VOP_UNLOCK(rootvnode, 0, td); +#ifdef MAC + mac_create_root_mount(td->td_ucred, TAILQ_FIRST(&mountlist)); +#endif /* MAC */ if (devfs_present) { /* ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#115 (text+ko) ==== @@ -432,7 +432,7 @@ SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, "TrustedBSD MAC debug info"); static unsigned int nmacmbufs, nmacsubjects, nmacifnets, nmacbpfdescs, - nmacsockets; + nmacsockets, nmacmounts; SYSCTL_UINT(_security_mac_debug, OID_AUTO, mbufs, CTLFLAG_RD, &nmacmbufs, 0, "number of mbufs in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, subjects, CTLFLAG_RD, @@ -443,6 +443,8 @@ &nmacbpfdescs, 0, "number of bpfdescs in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, sockets, CTLFLAG_RD, &nmacsockets, 0, "number of sockets in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, mounts, CTLFLAG_RD, + &nmacmounts, 0, "number of mounts in use"); int mac_init_mbuf(struct mbuf *m, int how) @@ -526,6 +528,22 @@ atomic_subtract_int(&nmacbpfdescs, 1); } +void +mac_init_mount(struct mount *mp) +{ + + mac_init_label(&mp->mnt_label); + atomic_add_int(&nmacmounts, 1); +} + +void +mac_destroy_mount(struct mount *mp) +{ + + mac_destroy_label(&mp->mnt_label); + atomic_subtract_int(&nmacmounts, 1); +} + static int mac_label_valid(struct mac *label) { @@ -969,19 +987,17 @@ } void -mac_mountfs(struct ucred *cred, struct mount *mount) +mac_create_mount(struct ucred *cred, struct mount *mount) { - mac_init_label(&mount->mnt_label); - MAC_PERFORM(mountfs, cred, mount); + MAC_PERFORM(create_mount, cred, mount); } void -mac_mountrootfs(struct ucred *cred, struct mount *mount) +mac_create_root_mount(struct ucred *cred, struct mount *mount) { - mac_init_label(&mount->mnt_label); - MAC_PERFORM(mountrootfs, cred, mount); + MAC_PERFORM(create_root_mount, cred, mount); } int ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_conf.c#5 (text+ko) ==== @@ -227,6 +227,9 @@ * (which is `path'.) */ strncpy(mp->mnt_stat.f_mntonname, "/", MNAMELEN); +#ifdef MAC + mac_init_mount(mp); +#endif /* MAC */ error = VFS_MOUNT(mp, NULL, NULL, NULL, curthread); @@ -237,6 +240,9 @@ free(path, M_MOUNT); if (error != 0) { if (mp != NULL) { +#ifdef MAC + mac_destroy_mount(mp); +#endif /* MAC */ vfs_unbusy(mp, curthread); free(mp, M_MOUNT); } ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#18 (text+ko) ==== @@ -376,9 +376,6 @@ mp->mnt_stat.f_mntonname[0] = '/'; mp->mnt_stat.f_mntonname[1] = 0; (void) copystr(devname, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, 0); -#ifdef MAC - mac_mountrootfs(td->td_ucred, mp); -#endif *mpp = mp; return (0); } ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#36 (text+ko) ==== @@ -359,7 +359,7 @@ mp->mnt_stat.f_mntonname[MNAMELEN - 1] = '\0'; mp->mnt_iosize_max = DFLTPHYS; #ifdef MAC - mac_mountfs(td->td_ucred, mp); + mac_init_mount(mp); #endif VOP_UNLOCK(vp, 0, td); update: @@ -403,6 +403,10 @@ vrele(vp); return (error); } +#ifdef MAC + if (error == 0) + mac_create_mount(td->td_ucred, mp); +#endif /* MAC */ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); /* * Put the new filesystem on the mount list after root. @@ -433,6 +437,9 @@ vp->v_flag &= ~VMOUNT; mtx_unlock(&vp->v_interlock); mp->mnt_vfc->vfc_refcount--; +#ifdef MAC + mac_destroy_mount(mp); +#endif vfs_unbusy(mp, td); free((caddr_t)mp, M_MOUNT); vput(vp); @@ -633,6 +640,9 @@ vrele(coveredvp); if (mp->mnt_kern_flag & MNTK_MWAIT) wakeup((caddr_t)mp); +#ifdef MAC + mac_destroy_mount(mp); +#endif /* MAC */ free((caddr_t)mp, M_MOUNT); return (0); } ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#86 (text+ko) ==== @@ -284,13 +284,13 @@ void mac_destroy_socket(struct socket *); void mac_init_subject(struct ucred *); void mac_destroy_subject(struct ucred *); +void mac_init_mount(struct mount *); +void mac_destroy_mount(struct mount *); /* Non-authorizational event hooks. */ void mac_execve_transition(struct ucred *old, struct ucred *new, struct mac *filelabel); int mac_execve_will_transition(struct ucred *old, struct mac *filelabel); -void mac_mountfs(struct ucred *cred, struct mount *mp); -void mac_mountrootfs(struct ucred *cred, struct mount *mp); void mac_relabel_subject(struct ucred *oldcred, struct mac *newlabel); /* Authorizational event hooks. */ @@ -333,6 +333,7 @@ void mac_create_devfs_device(dev_t dev, struct mac *devicelabel); void mac_create_devfs_directory(char *dirname, int dirnamelen, struct mac *dirlabel); +void mac_create_ifnet(struct ifnet *ifp); void mac_create_mbuf_datagram_from_mbuf_fragmentqueue( struct mbuf *fragmentqueue, struct mbuf *datagram); void mac_create_mbuf_fragment_from_mbuf(struct mbuf *mbuf, @@ -349,8 +350,10 @@ struct ifnet *ifnet, struct mbuf *newmbuf); void mac_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf); +void mac_create_mount(struct ucred *cred, struct mount *mp); void mac_create_proc0(struct ucred *cred); void mac_create_proc1(struct ucred *cred); +void mac_create_root_mount(struct ucred *cred, struct mount *mp); void mac_create_socket(struct ucred *cred, struct socket *socket); void mac_create_subject(struct ucred *cred_parent, struct ucred *cred_child); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#49 (text+ko) ==== @@ -81,8 +81,8 @@ void (*mpo_create_vnode_from_vnode)(struct ucred *cred, struct vnode *parent, struct mac *parentlabel, struct vnode *child, struct mac *childlabel); - void (*mpo_mountfs)(struct ucred *cred, struct mount *mp); - void (*mpo_mountrootfs)(struct ucred *cred, struct mount *mp); + void (*mpo_create_mount)(struct ucred *cred, struct mount *mp); + void (*mpo_create_root_mount)(struct ucred *cred, struct mount *mp); /* * Labeling event operations: IPC objects. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 7:34:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9830A37B417; Thu, 21 Mar 2002 07:34:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D3E4C37B404 for ; Thu, 21 Mar 2002 07:34:52 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2LFYqr56156 for perforce@freebsd.org; Thu, 21 Mar 2002 07:34:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 21 Mar 2002 07:34:52 -0800 (PST) Message-Id: <200203211534.g2LFYqr56156@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8158 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8158 Change 8158 by rwatson@rwatson_tislabs on 2002/03/21 07:34:00 Fix grammatical error in submitted module text. Submitted by: billf Affected files ... ... //depot/projects/smpng/sys/design/article.sgml#21 edit Differences ... ==== //depot/projects/smpng/sys/design/article.sgml#21 (text+ko) ==== @@ -23,7 +23,7 @@ - $SMPng: //depot/projects/smpng/sys/design/article.sgml#20 $ + $SMPng: //depot/projects/smpng/sys/design/article.sgml#21 $ 2002 @@ -524,7 +524,7 @@ For the module subsystem there exists a single lock that is used to protect the shared data. This lock is a shared/exclusive (SX) lock and has a good chance of needing to be acquired (shared - or exclusively), there fore there are a few macros that have been + or exclusively), therefore there are a few macros that have been added to make access to the lock more easy. These macros can be located in sys/module.h and are quite basic in terms of usage. The main structures protected under this lock To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 8: 9:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 297A537B417; Thu, 21 Mar 2002 08:09:36 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 575A837B404 for ; Thu, 21 Mar 2002 08:09:35 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2LG9ZC65482 for perforce@freebsd.org; Thu, 21 Mar 2002 08:09:35 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 21 Mar 2002 08:09:35 -0800 (PST) Message-Id: <200203211609.g2LG9ZC65482@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8159 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8159 Change 8159 by peter@peter_overcee on 2002/03/21 08:09:04 +NFSSERVER Affected files ... ... //depot/projects/ia64/sys/ia64/conf/SMALL#10 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/SMALL#10 (text+ko) ==== @@ -18,6 +18,7 @@ options SOFTUPDATES #Enable FFS soft updates support options MD_ROOT #MD is a potential root device options NFSCLIENT #Network Filesystem +options NFSSERVER #options NFS_ROOT #NFS usable as root device options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 8:41:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2815737B447; Thu, 21 Mar 2002 08:41:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9D21C37B400 for ; Thu, 21 Mar 2002 08:41:13 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2LGfDM72159 for perforce@freebsd.org; Thu, 21 Mar 2002 08:41:13 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 21 Mar 2002 08:41:13 -0800 (PST) Message-Id: <200203211641.g2LGfDM72159@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8160 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8160 Change 8160 by peter@peter_thunder on 2002/03/21 08:40:56 add some more NO_GCC hooks Affected files ... ... //depot/projects/ia64/Makefile.inc1#12 edit Differences ... ==== //depot/projects/ia64/Makefile.inc1#12 (text+ko) ==== @@ -683,7 +683,9 @@ .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}) cd ${.CURDIR}/lib/csu/${MACHINE_ARCH}; ${MAKE} beforeinstall .endif +.if !defined(NO_GCC) cd ${.CURDIR}/gnu/lib/csu; ${MAKE} beforeinstall +.endif cd ${.CURDIR}/lib/libalias; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libatm; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libdevstat; ${MAKE} beforeinstall @@ -755,6 +757,11 @@ _csu= lib/csu/${MACHINE_ARCH} .endif +.if !defined(NO_GCC) +_gnu_csu= gnu/lib/csu +_libgcc= gnu/lib/libgcc +.endif + .if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) _secure_lib= secure/lib .if exists(${.CURDIR}/secure/lib/libcrypto) @@ -779,7 +786,7 @@ .endif libraries: -.for _lib in ${_csu} gnu/lib/csu gnu/lib/libgcc lib/libmd lib/libcrypt \ +.for _lib in ${_csu} ${_gnu_csu} ${_libgcc} lib/libmd lib/libcrypt \ lib/libz ${_libcrypto} ${_secure_lib} ${_kerberosIV_lib} \ ${_kerberos5_lib} lib/libcom_err lib/libkvm lib/msun lib/libncurses \ lib/libopie lib/libradius lib/librpcsvc lib/libsbuf lib/libtacplus \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 9:44: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FF3F37B417; Thu, 21 Mar 2002 09:42:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 845B437B400 for ; Thu, 21 Mar 2002 09:42:29 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2LHgSX89318 for perforce@freebsd.org; Thu, 21 Mar 2002 09:42:28 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 21 Mar 2002 09:42:28 -0800 (PST) Message-Id: <200203211742.g2LHgSX89318@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8163 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8163 Change 8163 by jhb@jhb_laptop on 2002/03/21 09:41:36 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/api_up1000.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/autoconf.c#5 integrate ... //depot/projects/smpng/sys/alpha/alpha/clock.c#4 integrate ... //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/db_interface.c#7 integrate ... //depot/projects/smpng/sys/alpha/alpha/db_trace.c#4 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_1000a.c#5 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_2100_a500.c#3 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_eb164.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#5 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#3 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_st550.c#5 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_st6600.c#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/interrupt.c#14 integrate ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#31 integrate ... //depot/projects/smpng/sys/alpha/alpha/pmap.c#26 integrate ... //depot/projects/smpng/sys/alpha/alpha/prom.c#8 integrate ... //depot/projects/smpng/sys/alpha/alpha/promcons.c#7 integrate ... //depot/projects/smpng/sys/alpha/alpha/trap.c#28 integrate ... //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#9 integrate ... //depot/projects/smpng/sys/alpha/include/bootinfo.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/clock.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/cpu.h#5 integrate ... //depot/projects/smpng/sys/alpha/include/cpuconf.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/cpufunc.h#5 integrate ... //depot/projects/smpng/sys/alpha/include/db_machdep.h#3 integrate ... //depot/projects/smpng/sys/alpha/include/float.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/md_var.h#5 integrate ... //depot/projects/smpng/sys/alpha/include/pmap.h#8 integrate ... //depot/projects/smpng/sys/alpha/include/profile.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/prom.h#3 integrate ... //depot/projects/smpng/sys/alpha/include/reg.h#4 integrate ... //depot/projects/smpng/sys/alpha/include/sysarch.h#2 integrate ... //depot/projects/smpng/sys/alpha/linux/linux_proto.h#6 integrate ... //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#5 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_ioctl.c#5 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#10 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#4 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_proto.h#3 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#6 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_signal.h#2 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_sysvec.c#2 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_util.h#3 integrate ... //depot/projects/smpng/sys/alpha/pci/cia.c#13 integrate ... //depot/projects/smpng/sys/alpha/pci/t2.c#14 integrate ... //depot/projects/smpng/sys/alpha/pci/t2_pci.c#7 integrate ... //depot/projects/smpng/sys/alpha/pci/tsunami.c#11 integrate ... //depot/projects/smpng/sys/alpha/tc/am7990.c#3 integrate ... //depot/projects/smpng/sys/alpha/tc/am7990var.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/ascvar.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/esp.c#2 integrate ... //depot/projects/smpng/sys/alpha/tc/if_le_dec.c#2 integrate ... //depot/projects/smpng/sys/alpha/tc/if_le_ioasic.c#2 integrate ... //depot/projects/smpng/sys/alpha/tc/if_levar.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/ioasic.c#2 integrate ... //depot/projects/smpng/sys/alpha/tc/ioasicvar.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/sticvar.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/tc.c#2 integrate ... //depot/projects/smpng/sys/alpha/tc/tcds.c#2 integrate ... //depot/projects/smpng/sys/alpha/tc/tcdsreg.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/tcdsvar.h#2 integrate ... //depot/projects/smpng/sys/alpha/tc/tcvar.h#2 integrate ... //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#5 integrate ... //depot/projects/smpng/sys/arm/include/types.h#2 integrate ... //depot/projects/smpng/sys/conf/kern.post.mk#7 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#8 integrate ... //depot/projects/smpng/sys/dev/ida/ida.c#2 integrate ... //depot/projects/smpng/sys/dev/ida/ida_disk.c#4 integrate ... //depot/projects/smpng/sys/dev/sio/sio_pci.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/umass.c#11 integrate ... //depot/projects/smpng/sys/i386/i386/initcpu.c#9 integrate ... //depot/projects/smpng/sys/i386/i386/perfmon.c#8 integrate ... //depot/projects/smpng/sys/i386/i386/pmap.c#19 integrate ... //depot/projects/smpng/sys/i386/i386/sys_machdep.c#15 integrate ... //depot/projects/smpng/sys/i386/i386/trap.c#34 integrate ... //depot/projects/smpng/sys/i386/i386/vm_machdep.c#18 integrate ... //depot/projects/smpng/sys/i386/include/cpufunc.h#10 integrate ... //depot/projects/smpng/sys/i386/isa/npx.c#22 integrate ... //depot/projects/smpng/sys/ia64/ia64/autoconf.c#6 integrate ... //depot/projects/smpng/sys/ia64/ia64/db_interface.c#15 integrate ... //depot/projects/smpng/sys/ia64/ia64/db_trace.c#7 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#27 integrate ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#23 integrate ... //depot/projects/smpng/sys/ia64/ia64/sapic.c#7 integrate ... //depot/projects/smpng/sys/ia64/ia64/ssc.c#4 integrate ... //depot/projects/smpng/sys/ia64/ia64/trap.c#25 integrate ... //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#10 integrate ... //depot/projects/smpng/sys/ia64/include/clock.h#2 integrate ... //depot/projects/smpng/sys/ia64/include/cpu.h#7 integrate ... //depot/projects/smpng/sys/ia64/include/cpufunc.h#10 integrate ... //depot/projects/smpng/sys/ia64/include/md_var.h#6 integrate ... //depot/projects/smpng/sys/ia64/include/pmap.h#6 integrate ... //depot/projects/smpng/sys/ia64/include/profile.h#6 integrate ... //depot/projects/smpng/sys/ia64/include/reg.h#4 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#28 edit ... //depot/projects/smpng/sys/kern/kern_linker.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#46 integrate ... //depot/projects/smpng/sys/kern/subr_trap.c#30 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#34 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#17 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#23 integrate ... //depot/projects/smpng/sys/modules/Makefile#24 integrate ... //depot/projects/smpng/sys/netinet/if_ether.c#10 integrate ... //depot/projects/smpng/sys/pccard/pccard.c#9 integrate ... //depot/projects/smpng/sys/pccard/pcic.c#14 integrate ... //depot/projects/smpng/sys/pccard/pcic_pci.h#8 integrate ... //depot/projects/smpng/sys/powerpc/include/bootinfo.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/bus.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/clock.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/cpu.h#8 integrate ... //depot/projects/smpng/sys/powerpc/include/cpufunc.h#9 integrate ... //depot/projects/smpng/sys/powerpc/include/db_machdep.h#3 integrate ... //depot/projects/smpng/sys/powerpc/include/intr.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/md_var.h#5 integrate ... //depot/projects/smpng/sys/powerpc/include/powerpc.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/pte.h#3 integrate ... //depot/projects/smpng/sys/powerpc/include/reg.h#4 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/autoconf.c#4 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/clock.c#4 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/extintr.c#4 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#14 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/syncicache.c#2 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#14 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#11 integrate ... //depot/projects/smpng/sys/sparc64/include/cache.h#4 integrate ... //depot/projects/smpng/sys/sparc64/include/cpufunc.h#13 integrate ... //depot/projects/smpng/sys/sparc64/include/float.h#2 integrate ... //depot/projects/smpng/sys/sparc64/include/iommuvar.h#3 integrate ... //depot/projects/smpng/sys/sparc64/include/pv.h#6 integrate ... //depot/projects/smpng/sys/sparc64/include/reg.h#8 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/db_hwwatch.c#3 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#17 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#18 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pv.c#10 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/trap.c#29 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#11 integrate ... //depot/projects/smpng/sys/sys/pcpu.h#6 integrate ... //depot/projects/smpng/sys/sys/proc.h#40 integrate ... //depot/projects/smpng/sys/sys/ucred.h#12 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#10 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/api_up1000.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.4 2001/02/02 01:48:40 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.5 2002/03/20 18:58:44 obrien Exp $ */ #include "opt_ddb.h" @@ -52,12 +52,12 @@ #endif static int comcnrate = CONSPEED; -void api_up1000_init __P((void)); -static void api_up1000_cons_init __P((void)); +void api_up1000_init(void); +static void api_up1000_cons_init(void); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void api_up1000_init() ==== //depot/projects/smpng/sys/alpha/alpha/autoconf.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.49 2001/10/24 17:42:01 jlemon Exp $ + * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.50 2002/03/20 18:58:44 obrien Exp $ */ #include "opt_bootp.h" @@ -58,11 +58,11 @@ #include #include -static void configure __P((void *)); +static void configure(void *); SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL) -static void configure_finish __P((void)); -static void configure_start __P((void)); +static void configure_finish(void); +static void configure_start(void); #ifdef DEV_ISA #include ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.27 2001/11/03 17:22:50 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.28 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* @@ -286,7 +286,7 @@ } stathz = hz / 8; - platform.clockintr = (void (*) __P((void *))) handleclock; + platform.clockintr = (void (*)(void *)) handleclock; /* * Get the clock started. ==== //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.12 2000/12/08 22:11:07 msmith Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.13 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: cpuconf.c,v 1.10 1998/03/20 21:48:21 thorpej Exp $ */ /* @@ -40,91 +40,91 @@ #include "opt_cpu.h" #ifdef DEC_3000_500 -extern void dec_3000_500_init __P((int)); +extern void dec_3000_500_init(int); #else #define dec_3000_500_init platform_not_configured #endif #ifdef DEC_3000_300 -extern void dec_3000_300_init __P((int)); +extern void dec_3000_300_init(int); #else #define dec_3000_300_init platform_not_configured #endif #ifdef DEC_AXPPCI_33 -extern void dec_axppci_33_init __P((int)); +extern void dec_axppci_33_init(int); #else #define dec_axppci_33_init platform_not_configured #endif #ifdef DEC_KN8AE -extern void dec_kn8ae_init __P((int)); +extern void dec_kn8ae_init(int); #else #define dec_kn8ae_init platform_not_configured #endif #ifdef DEC_2100_A50 -extern void dec_2100_a50_init __P((int)); +extern void dec_2100_a50_init(int); #else #define dec_2100_a50_init platform_not_configured #endif #ifdef DEC_KN20AA -extern void dec_kn20aa_init __P((int)); +extern void dec_kn20aa_init(int); #else #define dec_kn20aa_init platform_not_configured #endif #ifdef DEC_EB64PLUS -extern void dec_eb64plus_init __P((int)); +extern void dec_eb64plus_init(int); #else #define dec_eb64plus_init platform_not_configured #endif #ifdef DEC_EB164 -extern void dec_eb164_init __P((int)); +extern void dec_eb164_init(int); #else #define dec_eb164_init platform_not_configured #endif #ifdef DEC_KN300 -extern void dec_kn300_init __P((int)); +extern void dec_kn300_init(int); #else #define dec_kn300_init platform_not_configured #endif #ifdef AVALON_A12 -extern void avalon_a12_init __P((int)); +extern void avalon_a12_init(int); #else #define avalon_a12_init platform_not_configured #endif #ifdef DEC_ST550 -extern void st550_init __P((int)); +extern void st550_init(int); #else #define st550_init platform_not_configured #endif #ifdef DEC_ST6600 -extern void st6600_init __P((int)); +extern void st6600_init(int); #else #define st6600_init platform_not_configured #endif #ifdef DEC_1000A -extern void dec_1000a_init __P((int)); +extern void dec_1000a_init(int); #else #define dec_1000a_init platform_not_configured #endif #ifdef DEC_2100_A500 -extern void dec_2100_a500_init __P((int)); +extern void dec_2100_a500_init(int); #else #define dec_2100_a500_init platform_not_configured #endif #ifdef API_UP1000 -extern void api_up1000_init __P((int)); +extern void api_up1000_init(int); #else #define api_up1000_init platform_not_configured #endif ==== //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.5 2000/09/11 05:28:52 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.6 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $ */ /* @@ -188,7 +188,7 @@ { NULL, -1 }, }; -static const char *pal_opname __P((int)); +static const char *pal_opname(int); static const char * pal_opname(op) @@ -244,7 +244,7 @@ arit_c0, arit_c2, 0, 0, arit_c9, arit_cB, arit_cD, arit_cF }; -static __inline const char *arit_name __P((int)); +static __inline const char *arit_name(int); static __inline const char * arit_name(op) int op; @@ -285,7 +285,7 @@ "andnot", "ornot", "xornot", 0 }; -static __inline const char *logical_name __P((int)); +static __inline const char *logical_name(int); static __inline const char * logical_name(op) int op; @@ -334,7 +334,7 @@ /* 7 */ { 0, "inswh", "inslh", "insqh" }, }; -static __inline const char *bitop_name __P((int)); +static __inline const char *bitop_name(int); static __inline const char * bitop_name(op) int op; @@ -364,7 +364,7 @@ "mull", "mulq", "mull/v", "mulq/v" }; -static __inline const char *mul_name __P((int)); +static __inline const char *mul_name(int); static __inline const char * mul_name(op) int op; @@ -389,7 +389,7 @@ "drain_t", 0, "mb", 0, "fetch", "fetch_m", "rpcc", "rc" }; -static __inline const char *special_name __P((int)); +static __inline const char *special_name(int); static __inline const char * special_name(op) int op; @@ -424,7 +424,7 @@ "maxuw4", "maxsb8", "maxsw4", }; -static __inline const char *intmisc_name __P((int)); +static __inline const char *intmisc_name(int); static __inline const char * intmisc_name(op) int op; @@ -445,7 +445,7 @@ return (unk); } -static const char *float_name __P((const struct tbl[], int, const char *type)); +static const char *float_name(const struct tbl[], int, const char *type); static const char * float_name(tbl, op, type) @@ -795,7 +795,7 @@ static int regcount; /* how many regs used in this inst */ static int regnum[3]; /* which regs used in this inst */ -static const char *register_name __P((int)); +static const char *register_name(int); static const char * register_name (ireg) @@ -816,7 +816,7 @@ * (optional) alternate format. Return address of start of * next instruction. */ -int alpha_print_instruction __P((db_addr_t, alpha_instruction, boolean_t)); +int alpha_print_instruction(db_addr_t, alpha_instruction, boolean_t); db_addr_t db_disasm(loc, altfmt) ==== //depot/projects/smpng/sys/alpha/alpha/db_interface.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: db_interface.c,v 1.2 1997/09/16 19:07:19 thorpej Exp $ */ -/* $FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.24 2001/12/18 00:27:14 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.26 2002/03/21 06:14:57 imp Exp $ */ /* * Mach Operating System @@ -81,7 +81,7 @@ static jmp_buf *db_nofault = 0; extern jmp_buf db_jmpbuf; -extern void gdb_handle_exception __P((db_regs_t *, int, int)); +extern void gdb_handle_exception(db_regs_t *, int, int); #if 0 extern char *trap_type[]; @@ -90,8 +90,8 @@ int db_active; -void ddbprinttrap __P((unsigned long, unsigned long, unsigned long, - unsigned long)); +void ddbprinttrap(unsigned long, unsigned long, unsigned long, + unsigned long); struct db_variable db_regs[] = { { "v0", &ddb_regs.tf_regs[FRAME_V0], FCN_NULL }, @@ -155,7 +155,7 @@ db_regs_t *regs; { int ddb_mode = !(boothowto & RB_GDB); - critical_t s; + register_t s; /* * Don't bother checking for usermode, since a benign entry @@ -192,7 +192,7 @@ ddb_regs = *regs; - s = cpu_critical_enter(); + s = intr_disable(); #ifdef SMP #ifdef DIAGNOSTIC @@ -219,7 +219,7 @@ restart_cpus(stopped_cpus); #endif - cpu_critical_exit(s); + intr_restore(s); *regs = ddb_regs; ==== //depot/projects/smpng/sys/alpha/alpha/db_trace.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.11 2002/02/07 20:58:42 julian Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.12 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -97,9 +97,9 @@ }; -int db_md_set_watchpoint __P((db_expr_t addr, db_expr_t size)); -int db_md_clr_watchpoint __P((db_expr_t addr, db_expr_t size)); -void db_md_list_watchpoints __P((void)); +int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); +int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); +void db_md_list_watchpoints(void); /* ==== //depot/projects/smpng/sys/alpha/alpha/dec_1000a.c#5 (text+ko) ==== @@ -70,7 +70,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin * - * $FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.11 2001/06/01 17:38:57 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.12 2002/03/20 18:58:44 obrien Exp $ */ #include "opt_ddb.h" @@ -99,23 +99,23 @@ #endif static int comcnrate = CONSPEED; -void dec_1000a_init __P((int)); -static void dec_1000a_cons_init __P((void)); +void dec_1000a_init(int); +static void dec_1000a_cons_init(void); -static void dec_1000_intr_map __P((void *)); -static void dec_1000_intr_disable __P((int)); -static void dec_1000_intr_enable __P((int)); -static void dec_1000_intr_init __P((void)); +static void dec_1000_intr_map(void *); +static void dec_1000_intr_disable(int); +static void dec_1000_intr_enable(int); +static void dec_1000_intr_init(void); -static void dec_1000a_intr_map __P((void *)); -static void dec_1000a_intr_disable __P((int)); -static void dec_1000a_intr_enable __P((int)); -static void dec_1000a_intr_init __P((void)); +static void dec_1000a_intr_map(void *); +static void dec_1000a_intr_disable(int); +static void dec_1000a_intr_enable(int); +static void dec_1000a_intr_init(void); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); static const struct alpha_variation_table dec_1000_variations[] = { ==== //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: dec_2100_a50.c,v 1.39 1998/04/17 02:45:19 mjacob Exp $ */ -/* $FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.11 2001/06/01 17:38:57 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.12 2002/03/20 18:58:44 obrien Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -56,16 +56,16 @@ #endif static int comcnrate = CONSPEED; -void dec_2100_a50_init __P((void)); -static void dec_2100_a50_cons_init __P((void)); -static void dec_2100_a50_intr_map __P((void *)); -void sio_intr_establish __P((int)); -void sio_intr_disestablish __P((int)); -void sio_intr_setup __P((void)); +void dec_2100_a50_init(void); +static void dec_2100_a50_cons_init(void); +static void dec_2100_a50_intr_map(void *); +void sio_intr_establish(int); +void sio_intr_disestablish(int); +void sio_intr_setup(void); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); const struct alpha_variation_table dec_2100_a50_variations[] = { { SV_ST_AVANTI, "AlphaStation 400 4/233 (\"Avanti\")" }, ==== //depot/projects/smpng/sys/alpha/alpha/dec_2100_a500.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.10 2001/10/20 01:27:23 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.11 2002/03/20 18:58:44 obrien Exp $ */ #include "opt_ddb.h" @@ -49,13 +49,13 @@ #endif static int comcnrate = CONSPEED; -void dec_2100_a500_init __P((int)); -static void dec_2100_a500_cons_init __P((void)); -static void dec_2100_a500_intr_init __P((void )); +void dec_2100_a500_init(int); +static void dec_2100_a500_cons_init(void); +static void dec_2100_a500_intr_init(void ); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void dec_2100_a500_init(cputype) ==== //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.12 2001/06/01 17:38:57 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.13 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */ /* @@ -53,13 +53,13 @@ #endif static int comcnrate = CONSPEED; -void dec_axppci_33_init __P((void)); -static void dec_axppci_33_cons_init __P((void)); -static void dec_axppci_33_intr_map __P((void *)); +void dec_axppci_33_init(void); +static void dec_axppci_33_cons_init(void); +static void dec_axppci_33_intr_map(void *); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); const struct alpha_variation_table dec_axppci_33_variations[] = { { 0, "Alpha PC AXPpci33 (\"NoName\")" }, ==== //depot/projects/smpng/sys/alpha/alpha/dec_eb164.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.14 2001/06/01 17:38:57 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.15 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: dec_eb164.c,v 1.26 1998/04/17 02:45:19 mjacob Exp $ */ /* @@ -52,17 +52,17 @@ #endif static int comcnrate = CONSPEED; -void dec_eb164_init __P((void)); -static void dec_eb164_cons_init __P((void)); +void dec_eb164_init(void); +static void dec_eb164_cons_init(void); static void eb164_intr_init(void); extern void eb164_intr_enable(int irq); extern void eb164_intr_disable(int irq); extern void eb164_intr_enable_icsr(int irq); extern void eb164_intr_disable_icsr(int irq); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void dec_eb164_init() ==== //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.9 2001/06/01 17:38:57 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.10 2002/03/20 18:58:44 obrien Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -73,9 +73,9 @@ #endif static int comcnrate = CONSPEED; -void dec_eb64plus_init __P((void)); -static void dec_eb64plus_cons_init __P((void)); -static void dec_eb64plus_intr_init __P((void)); +void dec_eb64plus_init(void); +static void dec_eb64plus_cons_init(void); +static void dec_eb64plus_intr_init(void); extern void eb64plus_intr_enable(int irq); /* ../pci/pci_eb64plus_intr.s */ extern void eb64plus_intr_disable(int irq); /* ../pci/pci_eb64plus_intr.s */ @@ -83,8 +83,8 @@ extern const char * bootdev_protocol(void); extern int bootdev_boot_dev_type(void); -extern int siocnattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int sccnattach(void); const struct alpha_variation_table dec_eb64plus_variations[] = { { 0, "DEC EB64-plus" }, ==== //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: dec_kn20aa.c,v 1.38 1998/04/17 02:45:19 mjacob Exp $ */ -/* $FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.12 2001/06/01 17:38:58 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.13 2002/03/20 18:58:44 obrien Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -54,19 +54,19 @@ #endif static int comcnrate = CONSPEED; -void dec_kn20aa_init __P((void)); -static void dec_kn20aa_cons_init __P((void)); -static void dec_kn20aa_intr_init __P((void)); -static void dec_kn20aa_intr_map __P((void *)); -static void dec_kn20aa_intr_disable __P((int)); -static void dec_kn20aa_intr_enable __P((int)); +void dec_kn20aa_init(void); +static void dec_kn20aa_cons_init(void); +static void dec_kn20aa_intr_init(void); +static void dec_kn20aa_intr_map(void *); +static void dec_kn20aa_intr_disable(int); +static void dec_kn20aa_intr_enable(int); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); #if 0 -static void dec_kn20aa_device_register __P((struct device *, void *)); +static void dec_kn20aa_device_register(struct device *, void *); #endif const struct alpha_variation_table dec_kn20aa_variations[] = { ==== //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.6 2001/10/11 21:48:02 mjacob Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.7 2002/03/20 18:58:44 obrien Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob @@ -62,8 +62,8 @@ #endif static int comcnrate = CONSPEED; -void dec_kn300_init __P((void)); -void dec_kn300_cons_init __P((void)); +void dec_kn300_init(void); +void dec_kn300_cons_init(void); #define ALPHASERVER_4100 "AlphaServer 4100" @@ -73,9 +73,9 @@ }; -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void dec_kn300_init() ==== //depot/projects/smpng/sys/alpha/alpha/dec_st550.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.10 2001/06/01 17:38:58 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.11 2002/03/20 18:58:44 obrien Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. * All rights reserved. @@ -59,20 +59,20 @@ #endif static int comcnrate = CONSPEED; -void st550_init __P((void)); -static void st550_cons_init __P((void)); -static void st550_intr_init __P((void)); -static void pyxis_intr_enable __P((int)); -static void pyxis_intr_disable __P((int)); -static void st550_intr_enable __P((int)); -static void st550_intr_disable __P((int)); -static void st550_intr_map __P((void *)); +void st550_init(void); +static void st550_cons_init(void); +static void st550_intr_init(void); +static void pyxis_intr_enable(int); +static void pyxis_intr_disable(int); +static void st550_intr_enable(int); +static void st550_intr_disable(int); +static void st550_intr_map(void *); #define ST550_PCI_IRQ_BEGIN 8 #define ST550_PCI_MAX_IRQ 47 -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void st550_init() ==== //depot/projects/smpng/sys/alpha/alpha/dec_st6600.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.11 2001/06/01 17:38:58 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.12 2002/03/20 18:58:44 obrien Exp $ */ #include "opt_ddb.h" @@ -51,16 +51,16 @@ #endif static int comcnrate = CONSPEED; -void st6600_init __P((void)); -static void st6600_cons_init __P((void)); -static void st6600_intr_init __P((void)); +void st6600_init(void); +static void st6600_cons_init(void); +static void st6600_intr_init(void); #define ST6600_PCI_IRQ_BEGIN 8 #define ST6600_PCI_MAX_IRQ 63 -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void st6600_init() ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.64 2002/03/11 19:58:53 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.66 2002/03/21 06:14:57 imp Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /* @@ -93,20 +93,20 @@ { struct thread *td; #ifdef SMP - critical_t s; + register_t s; #endif /* * Find our per-cpu globals. */ #ifdef SMP - s = cpu_critical_enter(); + s = intr_disable(); #endif pcpup = (struct pcpu *) alpha_pal_rdval(); td = curthread; #ifdef SMP td->td_md.md_kernnest++; - cpu_critical_exit(s); + intr_restore(s); #endif atomic_add_int(&td->td_intr_nesting_level, 1); #ifndef KSTACK_GUARD @@ -169,7 +169,7 @@ void set_iointr(niointr) - void (*niointr) __P((void *, unsigned long)); + void (*niointr)(void *, unsigned long); { if (platform.iointr) panic("set iointr twice"); ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#31 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.167 2002/03/13 19:16:41 des Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.169 2002/03/21 06:14:57 imp Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -186,7 +186,7 @@ SYSCTL_INT(_machdep, CPU_UNALIGNED_SIGBUS, unaligned_sigbus, CTLFLAG_RW, &alpha_unaligned_sigbus, 0, ""); -static void cpu_startup __P((void *)); +static void cpu_startup(void *); SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) struct msgbuf *msgbufp=0; @@ -233,7 +233,7 @@ void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); #endif -static void identifycpu __P((void)); +static void identifycpu(void); struct kva_md_info kmi; @@ -2020,13 +2020,13 @@ * For SMP, we should check the fpcurthread of each cpu. */ #ifndef SMP - critical_t s; + register_t s; - s = cpu_critical_enter(); + s = intr_disable(); if (td->td_pcb->pcb_hw.apcb_flags & ALPHA_PCB_FLAGS_FEN) if (td != PCPU_GET(fpcurthread)) panic("alpha_check_fpcurthread: bogus"); - cpu_critical_exit(s); + intr_restore(s); #endif } @@ -2046,9 +2046,9 @@ void alpha_fpstate_save(struct thread *td, int write) { - critical_t s; + register_t s; - s = cpu_critical_enter(); + s = intr_disable(); if (td != NULL && td == PCPU_GET(fpcurthread)) { /* * If curthread != fpcurthread, then we need to enable FEN @@ -2083,7 +2083,7 @@ alpha_pal_wrfen(0); } } - cpu_critical_exit(s); + intr_restore(s); } /* @@ -2094,9 +2094,9 @@ void alpha_fpstate_drop(struct thread *td) { - critical_t s; + register_t s; - s = cpu_critical_enter(); + s = intr_disable(); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 9:48:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B469837B400; Thu, 21 Mar 2002 09:48:38 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5824937B404 for ; Thu, 21 Mar 2002 09:48:37 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2LHmbG90341 for perforce@freebsd.org; Thu, 21 Mar 2002 09:48:37 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 21 Mar 2002 09:48:37 -0800 (PST) Message-Id: <200203211748.g2LHmbG90341@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8164 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8164 Change 8164 by peter@peter_thunder on 2002/03/21 09:47:46 remove NOSHARED, revert to freebsd Affected files ... ... //depot/projects/ia64/usr.bin/kdump/Makefile#3 edit ... //depot/projects/ia64/usr.bin/ktrace/Makefile#3 edit ... //depot/projects/ia64/usr.bin/su/Makefile#4 edit Differences ... ==== //depot/projects/ia64/usr.bin/kdump/Makefile#3 (text+ko) ==== @@ -1,7 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD: src/usr.bin/kdump/Makefile,v 1.7 2000/09/14 18:52:48 jkh Exp $ -NOSHARED=yes PROG= kdump CFLAGS+=-I${.CURDIR}/../ktrace -I${.CURDIR}/../.. SRCS= kdump.c ioctl.c subr.c ==== //depot/projects/ia64/usr.bin/ktrace/Makefile#3 (text+ko) ==== @@ -1,7 +1,6 @@ # @(#)Makefile 1.1 (Berkeley) 6/6/93 # $FreeBSD: src/usr.bin/ktrace/Makefile,v 1.6 1999/08/28 01:02:32 peter Exp $ -NOSHARED= yes PROG= ktrace SRCS= ktrace.c subr.c MLINKS= ktrace.1 trace.1 ==== //depot/projects/ia64/usr.bin/su/Makefile#4 (text+ko) ==== @@ -1,7 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD: src/usr.bin/su/Makefile,v 1.38 2001/12/12 23:29:13 markm Exp $ -NOSHARED= xx PROG= su DPADD+= ${LIBUTIL} ${LIBPAM} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 9:48:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35E0937B404; Thu, 21 Mar 2002 09:48:38 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9603D37B417 for ; Thu, 21 Mar 2002 09:48:37 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2LHmbK90346 for perforce@freebsd.org; Thu, 21 Mar 2002 09:48:37 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 21 Mar 2002 09:48:37 -0800 (PST) Message-Id: <200203211748.g2LHmbK90346@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8165 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8165 Change 8165 by peter@peter_thunder on 2002/03/21 09:48:16 getconf cannot be built without gperf which needs c++.. Affected files ... ... //depot/projects/ia64/usr.bin/Makefile#10 edit Differences ... ==== //depot/projects/ia64/usr.bin/Makefile#10 (text+ko) ==== @@ -53,7 +53,6 @@ fsync \ ftp \ gencat \ - getconf \ getopt \ gprof \ head \ @@ -196,6 +195,10 @@ SUBDIR+=xlint .endif +.if !defined(NO_GXX) +SUBDIR+=getconf +.endif + .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../kerberosIV) && !exists(${.CURDIR}/../secure)) || \ defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4)) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 13:14:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83F8C37B41C; Thu, 21 Mar 2002 13:14:09 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0223837B400 for ; Thu, 21 Mar 2002 13:14:08 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2LLE7n41536 for perforce@freebsd.org; Thu, 21 Mar 2002 13:14:07 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 21 Mar 2002 13:14:07 -0800 (PST) Message-Id: <200203212114.g2LLE7n41536@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8182 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8182 Change 8182 by rwatson@rwatson_tislabs on 2002/03/21 13:13:13 Remember to #include "opt_mac.h" so that mac_init_mount() is called on the root file system structure. Otherwise, the system can panic at shutdown. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/vfs_conf.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_conf.c#6 (text+ko) ==== @@ -42,6 +42,7 @@ * */ +#include "opt_mac.h" #include "opt_rootdevname.h" #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 14: 8: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C31E337B419; Thu, 21 Mar 2002 14:06:00 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0298F37B41B for ; Thu, 21 Mar 2002 14:05:39 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2LM3tJ48725 for perforce@freebsd.org; Thu, 21 Mar 2002 14:03:55 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 21 Mar 2002 14:03:55 -0800 (PST) Message-Id: <200203212203.g2LM3tJ48725@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8184 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8184 Change 8184 by rwatson@rwatson_tislabs on 2002/03/21 14:02:18 Integrate the TrustedBSD base tree from the FreeBSD vendor tree. Much evil, including __P, UMA, ... Affected files ... ... //depot/projects/trustedbsd/base/Makefile.inc1#11 integrate ... //depot/projects/trustedbsd/base/Makefile.upgrade#2 integrate ... //depot/projects/trustedbsd/base/UPDATING#10 integrate ... //depot/projects/trustedbsd/base/bin/ls/lomac.c#4 integrate ... //depot/projects/trustedbsd/base/bin/ls/lomac.h#2 integrate ... //depot/projects/trustedbsd/base/bin/ps/lomac.c#4 integrate ... //depot/projects/trustedbsd/base/bin/ps/lomac.h#3 integrate ... //depot/projects/trustedbsd/base/bin/pwd/pwd.1#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ChangeLog#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/FREEBSD-upgrade#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/ChangeLog#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-rs6000.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff64-rs6000.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/configure#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/configure.in#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-i386.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/archures.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/bfdt.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/coffcode.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/core.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/format.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/libbfd.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/opncls.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/reloc.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/section.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/syms.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/targets.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-ppc.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-x86-64.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elflink.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/ChangeLog#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/NEWS#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/README#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/addr2line.1#2 delete ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/ar.1#2 delete ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/defparse.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/defparse.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/addr2line.1#1 branch ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/ar.1#1 branch ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/binutils.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/cxxfilt.man#1 branch ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/dlltool.1#1 branch ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/nm.1#1 branch ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/objcopy.1#1 branch ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/objdump.1#1 branch ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/ranlib.1#1 branch ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/readelf.1#1 branch ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/size.1#1 branch ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/strings.1#1 branch ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/strip.1#1 branch ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/nm.1#2 delete ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/objcopy.1#2 delete ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/objdump.1#2 delete ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/ranlib.1#2 delete ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/rclex.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/rcparse.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/rcparse.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/readelf.1#2 delete ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/size.1#2 delete ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/strings.1#2 delete ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/strip.1#2 delete ... //depot/projects/trustedbsd/base/contrib/binutils/config.guess#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/config.sub#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/ChangeLog#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/NEWS#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-alpha.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-ia64.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-ppc.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/configure#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/configure.in#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/as.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/as.texinfo#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/c-ppc.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/ChangeLog#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/ppc.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/ChangeLog#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/NEWS#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/configure.tgt#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf_x86_64.sh#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/elf32.em#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/ld.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/ld.texinfo#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ChangeLog#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/configure#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/configure.in#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/i386-dis.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ppc-dis.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ppc-opc.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/ChangeLog#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/NEWS#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/c-common.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/c-lex.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/c-parse.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/cccp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/combine.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/linux.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/mips.md#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sparc.md#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/crtstuff.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/cse.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/except.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/expr.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/f/version.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/final.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/flow.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/function.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/gcc.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/gcc.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/install.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/invoke.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/jump.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/just-fixinc#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/loop.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/regmove.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/reload1.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/rtl.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/tm.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/toplev.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/varasm.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/version.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/BNF#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/kupgrade#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-2.2/kinstall#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-3/kinstall#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-4.0/kinstall#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD/kinstall#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/HISTORY#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/INSTALL.FreeBSD#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/IPFILTER.LICENCE#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/common.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/etc/protocols#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/fils.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/inet_addr.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ip_ipsec_pxy.c#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/ip_lfil.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ip_netbios_pxy.c#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/ip_sfil.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipf.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipfs.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_ef.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_hx.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_pc.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_sn.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_td.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_tx.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/iplang/iplang_y.y#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipmon.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipnat.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/44arp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/arp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ip.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipresend.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsend.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsopt.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/iptest.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/iptests.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/lsock.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/resend.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sbpf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sirix.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sock.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipt.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/kmem.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/kmem.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/man/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipf.4#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipfilter.5#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipfs.8#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipl.4#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipmon.8#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipnat.5#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipnat.8#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/misc.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/mlf_ipl.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/mli_ipl.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/mln_ipl.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/natparse.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/opt.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/parse.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/printnat.c#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/printstate.c#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/samples/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/samples/proxy.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/solaris.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f15#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f16#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/l1#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/l1.b#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni1#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni2#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f15#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f16#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ipf6-1#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/l1#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni1#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni2#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/logtest#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/mtest#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/natipftest#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/f15#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/f16#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ipf6-1#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/l1#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni1.ipf#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni1.nat#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni2.ipf#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni2.nat#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/todo#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/ChangeLog#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/INSTALL#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/NEWS#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/README#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/THANKS#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/configure#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/configure.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/lukemftpd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/src/cmds.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/src/conf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/src/extern.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/src/ftpcmd.y#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/src/ftpd.8#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/src/ftpd.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/src/ftpd.conf.5#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/src/ftpusers.5#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/src/popen.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/src/version.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftpd/todo#2 integrate ... //depot/projects/trustedbsd/base/contrib/one-true-awk/README#3 integrate ... //depot/projects/trustedbsd/base/contrib/one-true-awk/main.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/one-true-awk/makefile#3 branch ... //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/INSTALL#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/LICENSE#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/README#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/bin/su/su.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_appl.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_constants.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_modules.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dispatch.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_findenv.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_get_option.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_set_option.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_static.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_acct_mgmt.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate_secondary.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_chauthtok.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_close_session.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_end.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_error.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_authtok.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_data.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_item.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_authtok.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_username.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_user.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenv.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenvlist.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_info.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_open_session.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_prompt.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_putenv.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_data.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_item.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_authtok.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_username.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setcred.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setenv.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_acct_mgmt.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate_secondary.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_chauthtok.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_close_session.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_username.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_open_session.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_username.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_setcred.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_start.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_strerror.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_verror.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vinfo.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vprompt.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/misc/gendoc.pl#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/pam_deny.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_dummy/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_dummy/pam_dummy.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/pam_permit.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/AUTHORS#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Changes#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Changes5.004#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Configure#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/EXTERN.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/INSTALL#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/INTERN.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/MAINTAIN#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/MANIFEST#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Makefile.SH#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Policy_sh.SH#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Porting/Contract#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Porting/Glossary#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Porting/config.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Porting/config_H#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Porting/genlog#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Porting/makerel#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Porting/p4desc#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Porting/patching.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Porting/pumpkin.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Porting/repository.pod#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/README#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/README.Y2K#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/README.posix-bc#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/Todo#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/Todo-5.005#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/Todo-5.6#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/XSlock.h#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/av.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/av.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/bytecode.h#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/bytecode.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/byterun.c#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/byterun.h#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/cflags.SH#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/config_h.SH#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/configpm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/configure.com#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/configure.gnu#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/cop.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/cv.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/deb.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/doio.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/doop.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/dosish.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/dump.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ebcdic.c#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/eg/cgi/dna.small.gif.uu#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/eg/cgi/wilogo.gif.uu#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/embed.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/embed.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/embedvar.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B/Asmdata.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B/Assembler.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B/Bytecode.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B/C.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B/CC.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B/Concise.pm#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B/Debug.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B/Deparse.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B/Disassembler.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B/Lint.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B/Showlex.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B/Stash.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/B/Terse.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/O.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/byteperl.c#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/defsubs_h.PL#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/B/ramblings/flip-flop#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/ByteLoader/ByteLoader.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/ByteLoader/ByteLoader.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/ByteLoader/bytecode.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/ByteLoader/byterun.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/ByteLoader/byterun.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DB_File/Changes#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DB_File/DB_File.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DB_File/DB_File.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DB_File/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DB_File/dbinfo#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DB_File/typemap#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DB_File/version.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Data/Dumper/Dumper.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Data/Dumper/Dumper.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Devel/DProf/DProf.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Devel/Peek/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Devel/Peek/Peek.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Devel/Peek/Peek.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DynaLoader/DynaLoader_pm.PL#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DynaLoader/XSLoader_pm.PL#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DynaLoader/dl_aix.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DynaLoader/dl_cygwin32.xs#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DynaLoader/dl_dllload.xs#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DynaLoader/dl_dlopen.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DynaLoader/dl_mac.xs#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DynaLoader/hints/aix.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/DynaLoader/hints/netbsd.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Errno/ChangeLog#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Errno/Errno_pm.PL#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Fcntl/Fcntl.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/File/Glob/Changes#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/File/Glob/Glob.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/File/Glob/Glob.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/File/Glob/bsd_glob.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/File/Glob/bsd_glob.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/GDBM_File/GDBM_File.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/GDBM_File/GDBM_File.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/GDBM_File/typemap#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/IO/IO.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/IO/lib/IO/Handle.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/IO/lib/IO/Poll.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/IO/lib/IO/Seekable.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/IO/lib/IO/Select.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/IO/lib/IO/Socket.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/IO/lib/IO/Socket/INET.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/IO/lib/IO/Socket/UNIX.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/IPC/SysV/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/IPC/SysV/SysV.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/NDBM_File/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/NDBM_File/NDBM_File.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/NDBM_File/NDBM_File.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/NDBM_File/typemap#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/ODBM_File/ODBM_File.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/ODBM_File/ODBM_File.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/ODBM_File/typemap#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Opcode/Opcode.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Opcode/Opcode.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/POSIX/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/POSIX/POSIX.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/POSIX/POSIX.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/POSIX/POSIX.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/POSIX/hints/svr4.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/ext/POSIX/typemap#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/SDBM_File/SDBM_File.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/SDBM_File/SDBM_File.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/SDBM_File/sdbm/dbm.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/SDBM_File/sdbm/dbm.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/SDBM_File/sdbm/sdbm.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/SDBM_File/typemap#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Socket/Socket.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Socket/Socket.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Sys/Syslog/Syslog.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Sys/Syslog/Syslog.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Thread/Thread.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/Thread/Thread.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/re/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/ext/re/hints/aix.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/ext/re/re.xs#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/form.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/global.sym#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/globals.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/gv.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/gv.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/handy.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/README.hints#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/aix.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/bsdos.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/cygwin.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/cygwin32.sh#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/hints/darwin.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/dec_osf.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/dos_djgpp.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/freebsd.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/hpux.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/irix_6.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/linux.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/machten.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/mint.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/mpeix.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/nonstopux.sh#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/hints/openbsd.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/os2.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/os390.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/posix-bc.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/powerux.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/solaris_2.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/svr4.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/titanos.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/unicos.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/uts.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hints/vmesa.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hv.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/hv.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/installhtml#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/installman#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/installperl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/interp.sym#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/intrpvar.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/iperlsys.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/AutoLoader.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/AutoSplit.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Benchmark.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/CGI.pm#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/CGI/Apache.pm#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/CGI/Carp.pm#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/CGI/Cookie.pm#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/CGI/Fast.pm#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/CGI/Pretty.pm#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/CGI/Push.pm#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/CGI/Switch.pm#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/CPAN.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/CPAN/FirstTime.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Carp/Heavy.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Class/Struct.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Cwd.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/English.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/Command.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/Embed.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/Install.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/Liblist.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/MM_Cygwin.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/MM_OS2.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/MM_Unix.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/MM_VMS.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/MM_Win32.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/MakeMaker.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/Manifest.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/Mksymlists.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/typemap#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ExtUtils/xsubpp#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/File/Basename.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/File/Copy.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/File/Find.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/File/Path.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/File/Spec.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/File/Spec/Epoc.pm#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/File/Spec/Functions.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/File/Spec/Mac.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/File/Spec/OS2.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/File/Spec/Unix.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/File/Spec/VMS.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/File/Spec/Win32.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/File/Temp.pm#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/FileHandle.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Getopt/Long.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/IPC/Open3.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Math/BigFloat.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Math/BigInt.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Math/Complex.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Math/Trig.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Net/Ping.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Net/protoent.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/Checker.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/Find.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/Functions.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/Html.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/InputObjects.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/LaTeX.pm#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/Man.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/ParseUtils.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/Parser.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/Select.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/Text.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/Text/Color.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/Text/Overstrike.pm#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/Text/Termcap.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Pod/Usage.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/SelfLoader.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Shell.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Symbol.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Sys/Hostname.pm#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Sys/Syslog.pm#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Term/ANSIColor.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Term/ReadLine.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Test.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Test/Harness.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Text/ParseWords.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Text/Soundex.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Text/Tabs.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Text/Wrap.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Tie/Array.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Tie/Handle.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Tie/Hash.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Tie/RefHash.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Tie/Scalar.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Tie/SubstrHash.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/Win32.pod#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/base.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/bigint.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/bytes.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/charnames.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/diagnostics.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/fields.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/ftp.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/getopts.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/integer.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/lib.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/overload.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/perl5db.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/strict.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/syslog.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/termcap.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/ArabLink.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/ArabLnkGrp.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/ArabShap.txt#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/BidiMirr.txt#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Bidirectional.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Block.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/CaseFold.txt#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Category.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/CombiningClass.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/CompExcl.txt#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Decomposition.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/AlphabeticPresentationForms.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Arabic.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/ArabicPresentationForms-A.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/ArabicPresentationForms-B.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Armenian.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Arrows.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/BasicLatin.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Bengali.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/BlockElements.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Bopomofo.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/BopomofoExtended.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/BoxDrawing.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/BraillePatterns.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/CJKCompatibility.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/CJKCompatibilityForms.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/CJKCompatibilityIdeographs.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/CJKRadicalsSupplement.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/CJKSymbolsandPunctuation.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/CJKUnifiedIdeographs.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/CJKUnifiedIdeographsExtensionA.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Cherokee.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/CombiningDiacriticalMarks.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/CombiningHalfMarks.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/CombiningMarksforSymbols.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/ControlPictures.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/CurrencySymbols.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Cyrillic.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Devanagari.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Dingbats.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/EnclosedAlphanumerics.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/EnclosedCJKLettersandMonths.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Ethiopic.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/GeneralPunctuation.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/GeometricShapes.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Georgian.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Greek.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/GreekExtended.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Gujarati.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Gurmukhi.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/HalfwidthandFullwidthForms.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/HangulCompatibilityJamo.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/HangulJamo.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/HangulSyllables.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Hebrew.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/HighPrivateUseSurrogates.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/HighSurrogates.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Hiragana.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/IPAExtensions.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/IdeographicDescriptionCharacters.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Kanbun.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/KangxiRadicals.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Kannada.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Katakana.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Khmer.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Lao.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Latin-1Supplement.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/LatinExtended-A.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/LatinExtended-B.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/LatinExtendedAdditional.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/LetterlikeSymbols.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/LowSurrogates.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Malayalam.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/MathematicalOperators.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/MiscellaneousSymbols.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/MiscellaneousTechnical.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Mongolian.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Myanmar.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/NumberForms.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Ogham.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/OpticalCharacterRecognition.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Oriya.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/PrivateUse.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Runic.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Sinhala.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/SmallFormVariants.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/SpacingModifierLetters.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Specials.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/SuperscriptsandSubscripts.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Syriac.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Tamil.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Telugu.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Thaana.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Thai.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/Tibetan.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/UnifiedCanadianAboriginalSyllabics.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/YiRadicals.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/In/YiSyllables.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/ASCII.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Alnum.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Alpha.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiAL.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiAN.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiB.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiBN.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiCS.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiEN.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiES.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiET.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiL.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiLRE.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiLRO.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiNSM.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiON.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiPDF.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiR.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiRLE.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiRLO.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiS.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/BidiWS.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Blank.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/C.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Cc.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Cf.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Cn.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Cntrl.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Co.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Cs.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCcircle.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCcompat.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCfinal.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCfont.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCfraction.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCinital.pl#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCinitial.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCisolated.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCmedial.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCnarrow.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCnoBreak.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCsmall.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCsquare.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCsub.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCsuper.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCvertical.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DCwide.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DecoCanon.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/DecoCompat.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Digit.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Graph.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/L.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkAI.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkAL.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkB2.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkBA.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkBB.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkBK.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkCB.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkCL.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkCM.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkCR.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkEX.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkGL.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkHY.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkID.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkIN.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkIS.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkLF.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkNS.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkNU.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkOP.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkPO.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkPR.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkQU.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkSA.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkSG.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkSP.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkSY.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkXX.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/LbrkZW.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Ll.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Lm.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Lo.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Lower.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Lt.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Lu.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/M.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Mc.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Me.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Mirrored.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Mn.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/N.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Nd.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Nl.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/No.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/P.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Pc.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Pd.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Pe.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Pf.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Pi.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Po.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Print.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Ps.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Punct.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/S.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Sc.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Sk.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Sm.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/So.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Space.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SpacePerl.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylA.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylAA.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylAAI.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylAI.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylC.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylE.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylEE.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylI.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylII.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylN.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylO.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylOO.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylU.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylV.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylWA.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylWAA.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylWC.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylWE.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylWEE.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylWI.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylWII.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylWO.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylWOO.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylWU.pl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/SylWV.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Upper.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Word.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/XDigit.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Z.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Zl.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Zp.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Is/Zs.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Jamo.txt#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/JamoShort.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Name.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Number.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/PropList.txt#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Props.txt#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/README.perl#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/ReadMe.txt#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/SpecCase.txt#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/To/Digit.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/To/Lower.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/To/Title.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/To/Upper.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/UCD300.html#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/UCD301.html#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/UCDFF301.html#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Unicode.300#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Unicode.301#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/Unicode3.html#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/mktables.PL#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/unicode/syllables.txt#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/utf8.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/vars.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/warnings.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/lib/warnings/register.pm#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/makedef.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/makedepend.SH#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/malloc.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/mg.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/mg.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/minimod.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/myconfig#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/myconfig.SH#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/objXSUB.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/objpp.h#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/op.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/op.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/opcode.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/opcode.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/opnames.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/patchlevel.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/perl.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/perl.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/perl_exp.SH#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/perlapi.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/perlapi.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/perlio.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/perlsdio.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/perlsfio.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/perly.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/perly.y#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/perly_c.diff#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/Makefile#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/pod/Makefile.SH#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/pod/Win32.pod#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/pod/buildtoc#2 delete ... //depot/projects/trustedbsd/base/contrib/perl5/pod/buildtoc.PL#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perl.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perl5004delta.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perl5005delta.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlapi.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlbook.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlboot.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlcall.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlclib.pod#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlcompile.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perldata.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perldbmfilter.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perldebguts.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perldebtut.pod#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perldebug.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perldelta.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perldiag.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlebcdic.pod#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlembed.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlfaq.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlfaq1.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlfaq2.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlfaq3.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlfaq4.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlfaq5.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlfaq6.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlfaq7.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlfaq8.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlfaq9.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlfilter.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlfork.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlfunc.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlguts.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlhack.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlhist.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlintern.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlipc.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perllexwarn.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perllocale.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perllol.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlmod.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlmodinstall.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlmodlib.PL#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlmodlib.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlnewmod.pod#1 branch ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlnumber.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlobj.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlop.pod#2 integrate ... //depot/projects/trustedbsd/base/contrib/perl5/pod/perlopentut.pod#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 15:16:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFC6737B41D; Thu, 21 Mar 2002 15:16:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 56B0637B41C for ; Thu, 21 Mar 2002 15:16:14 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2LNGEo99462 for perforce@freebsd.org; Thu, 21 Mar 2002 15:16:14 -0800 (PST) (envelope-from jake@freebsd.org) Date: Thu, 21 Mar 2002 15:16:14 -0800 (PST) Message-Id: <200203212316.g2LNGEo99462@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8186 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8186 Change 8186 by jake@jake_sparc64 on 2002/03/21 15:15:40 Remove invalid assertions. Affected files ... ... //depot/projects/sparc64/sys/sparc64/sparc64/pmap.c#79 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/sparc64/pmap.c#79 (text+ko) ==== @@ -1411,9 +1411,6 @@ CTR4(KTR_PMAP, "pmap_protect: ctx=%#lx sva=%#lx eva=%#lx prot=%#lx", pm->pm_context[PCPU_GET(cpuid)], sva, eva, prot); - KASSERT(pm == &curproc->p_vmspace->vm_pmap || pm == kernel_pmap, - ("pmap_protect: non current pmap")); - if ((prot & VM_PROT_READ) == VM_PROT_NONE) { pmap_remove(pm, sva, eva); return; @@ -1601,16 +1598,12 @@ pmap_object_init_pt(pmap_t pm, vm_offset_t addr, vm_object_t object, vm_pindex_t pindex, vm_size_t size, int limit) { - KASSERT(pm == &curproc->p_vmspace->vm_pmap || pm == kernel_pmap, - ("pmap_object_init_pt: non current pmap")); /* XXX */ } void pmap_prefault(pmap_t pm, vm_offset_t va, vm_map_entry_t entry) { - KASSERT(pm == &curproc->p_vmspace->vm_pmap || pm == kernel_pmap, - ("pmap_prefault: non current pmap")); /* XXX */ } @@ -1833,8 +1826,6 @@ pv_entry_t pv; vm_page_t m; - KASSERT(pm == &curproc->p_vmspace->vm_pmap || pm == kernel_pmap, - ("pmap_remove_pages: non current pmap")); npv = NULL; for (pv = TAILQ_FIRST(&pm->pm_pvlist); pv != NULL; pv = npv) { npv = TAILQ_NEXT(pv, pv_plist); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 18:45:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85D1637B400; Thu, 21 Mar 2002 18:45:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D50D937B41A for ; Thu, 21 Mar 2002 18:45:13 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2M2jD995096 for perforce@freebsd.org; Thu, 21 Mar 2002 18:45:13 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 21 Mar 2002 18:45:13 -0800 (PST) Message-Id: <200203220245.g2M2jD995096@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8189 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8189 Change 8189 by rwatson@rwatson_paprika on 2002/03/21 18:44:28 mac_seeotheruids, a kernel module that provides the ability to prevent users from seeing processes (and related objects) owned by other uids except under specific policy-driven circumstances. This is a superset of the base system security.bsd.see_other_uids policy, and may eventually just replace it. Build and kldload for entertainment. Note that currently this works for sockets due to some odd base system use of credentials. Eventually, this may change, and probably should change. Affected files ... ... //depot/projects/trustedbsd/mac/sys/modules/Makefile#11 edit ... //depot/projects/trustedbsd/mac/sys/modules/mac_seeotheruids/Makefile#1 add ... //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#1 add Differences ... ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#11 (text+ko) ==== @@ -55,6 +55,7 @@ lomac \ lpt \ mac_bsdextended \ + mac_seeotheruids \ md \ mii \ mlx \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 19: 2:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD46237B404; Thu, 21 Mar 2002 19:02:35 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2D51437B400 for ; Thu, 21 Mar 2002 19:02:35 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2M32Zf96756 for perforce@freebsd.org; Thu, 21 Mar 2002 19:02:35 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 21 Mar 2002 19:02:35 -0800 (PST) Message-Id: <200203220302.g2M32Zf96756@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8190 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8190 Change 8190 by rwatson@rwatson_paprika on 2002/03/21 19:02:02 When matching a specific gid for the 'specificgid' exception, match with any gid of the subject group set as well as its real gid, not just the real gid. This way, if you set the magic gid to be an 'admins' group, it doesn't have to be their primary group. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 (text+ko) ==== @@ -91,7 +91,7 @@ static int specificgid_enabled = 0; SYSCTL_INT(_security_mac_seeotheruids, OID_AUTO, specificgid_enabled, CTLFLAG_RW, &specificgid_enabled, 0, "Make an exception for credentials " - "with a specific gid as their real primary group id"); + "with a specific gid as their real primary group id or group set"); static gid_t specificgid = 0; SYSCTL_INT(_security_mac_seeotheruids, OID_AUTO, specificgid, CTLFLAG_RW, @@ -110,7 +110,7 @@ } if (specificgid_enabled) { - if (u1->cr_rgid == specificgid) + if (u1->cr_rgid == specificgid || groupmember(specificgid, u1)) return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 20: 3:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3035837B41A; Thu, 21 Mar 2002 20:03:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5F8A537B41B for ; Thu, 21 Mar 2002 20:03:51 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2M43pe08952 for perforce@freebsd.org; Thu, 21 Mar 2002 20:03:51 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 21 Mar 2002 20:03:51 -0800 (PST) Message-Id: <200203220403.g2M43pe08952@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8191 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8191 Change 8191 by peter@peter_thunder on 2002/03/21 20:03:05 hack to work around gcc's knowledge of the internals of ld.so on glibc and aix (ugh!) to do unwinding. Simply cheat for now and say "no unwind records found" and let the damn thing explode. Affected files ... ... //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#4 edit ... //depot/projects/ia64/lib/libc/ia64/gen/unwind.c#1 add Differences ... ==== //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#4 (text+ko) ==== @@ -5,4 +5,4 @@ SRCS+= __divdi3.S __divsi3.S __moddi3.S __modsi3.S SRCS+= __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S SRCS+= __divdf3.S __divsf3.S -SRCS+= cxa.c # remove when gcc is fixed +SRCS+= cxa.c unwind.c # remove when gcc is fixed To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 20: 4: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7F3C37B404; Thu, 21 Mar 2002 20:03:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 979C637B41C for ; Thu, 21 Mar 2002 20:03:51 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2M43p408957 for perforce@freebsd.org; Thu, 21 Mar 2002 20:03:51 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 21 Mar 2002 20:03:51 -0800 (PST) Message-Id: <200203220403.g2M43p408957@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8192 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8192 Change 8192 by peter@peter_thunder on 2002/03/21 20:03:50 this appears to be unnecessary if I use the 'make libraries' target to get the ordering right. Or maybe it was just a cross compile problem. Affected files ... ... //depot/projects/ia64/lib/libpam/modules/modules.inc#3 edit Differences ... ==== //depot/projects/ia64/lib/libpam/modules/modules.inc#3 (text+ko) ==== @@ -12,8 +12,8 @@ MODULES += pam_lastlog MODULES += pam_login_access MODULES += pam_nologin -#MODULES += pam_opie -#MODULES += pam_opieaccess +MODULES += pam_opie +MODULES += pam_opieaccess MODULES += pam_permit MODULES += pam_radius MODULES += pam_rootok To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 20:44:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 474B637B400; Thu, 21 Mar 2002 20:43:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C28D437B417 for ; Thu, 21 Mar 2002 20:43:40 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2M4he116543 for perforce@freebsd.org; Thu, 21 Mar 2002 20:43:40 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Thu, 21 Mar 2002 20:43:40 -0800 (PST) Message-Id: <200203220443.g2M4he116543@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 8195 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8195 Change 8195 by tmm@tmm_sparc64 on 2002/03/21 20:42:53 Integ with sparc64-tmm: - allow overcommitting DVMA memory - clean up busdma code - bug fixes for error paths - cleanups Affected files ... ... //depot/projects/sparc64/sys/sparc64/include/bus.h#11 integrate ... //depot/projects/sparc64/sys/sparc64/include/bus_private.h#1 branch ... //depot/projects/sparc64/sys/sparc64/include/iommuvar.h#12 integrate ... //depot/projects/sparc64/sys/sparc64/pci/psycho.c#25 integrate ... //depot/projects/sparc64/sys/sparc64/sbus/sbus.c#5 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/bus_machdep.c#14 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/cache.c#15 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/iommu.c#18 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/pv.c#27 integrate Differences ... ==== //depot/projects/sparc64/sys/sparc64/include/bus.h#11 (text+ko) ==== @@ -827,19 +827,22 @@ /* * DMA mapping methods. */ - int (*dmamap_create)(bus_dma_tag_t, int, bus_dmamap_t *); - int (*dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t); - int (*dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, bus_dmamap_callback_t *, void *, int); - void (*dmamap_unload)(bus_dma_tag_t, bus_dmamap_t); - void (*dmamap_sync)(bus_dma_tag_t, bus_dmamap_t, + int (*dmamap_create)(bus_dma_tag_t, bus_dma_tag_t, int, + bus_dmamap_t *); + int (*dmamap_destroy)(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t); + int (*dmamap_load)(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, + void *, bus_size_t, bus_dmamap_callback_t *, void *, int); + void (*dmamap_unload)(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t); + void (*dmamap_sync)(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); /* * DMA memory utility functions. */ - int (*dmamem_alloc)(bus_dma_tag_t, void **, int, bus_dmamap_t *); - void (*dmamem_free)(bus_dma_tag_t, void *, bus_dmamap_t); + int (*dmamem_alloc)(bus_dma_tag_t, bus_dma_tag_t, void **, int, + bus_dmamap_t *); + void (*dmamem_free)(bus_dma_tag_t, bus_dma_tag_t, void *, + bus_dmamap_t); }; /* @@ -859,29 +862,93 @@ int sparc64_dmamem_alloc_map(bus_dma_tag_t dmat, bus_dmamap_t *mapp); void sparc64_dmamem_free_map(bus_dma_tag_t dmat, bus_dmamap_t map); +static __inline int +sparc64_dmamap_create(bus_dma_tag_t pt, bus_dma_tag_t dt, int f, + bus_dmamap_t *p) +{ + bus_dma_tag_t lt; + + for (lt = pt; lt->dmamap_create == NULL; lt = lt->parent) + ; + return ((*lt->dmamap_create)(lt, dt, f, p)); +} #define bus_dmamap_create(t, f, p) \ - (*(t)->dmamap_create)((t), (f), (p)) + sparc64_dmamap_create((t), (t), (f), (p)) + +static __inline int +sparc64_dmamap_destroy(bus_dma_tag_t pt, bus_dma_tag_t dt, bus_dmamap_t p) +{ + bus_dma_tag_t lt; + + for (lt = pt; lt->dmamap_destroy == NULL; lt = lt->parent) + ; + return ((*lt->dmamap_destroy)(lt, dt, p)); +} #define bus_dmamap_destroy(t, p) \ - (*(t)->dmamap_destroy)((t), (p)) + sparc64_dmamap_destroy((t), (t), (p)) + +static __inline int +sparc64_dmamap_load(bus_dma_tag_t pt, bus_dma_tag_t dt, bus_dmamap_t m, + void *p, bus_size_t s, bus_dmamap_callback_t *cb, void *cba, int f) +{ + bus_dma_tag_t lt; + + for (lt = pt; lt->dmamap_load == NULL; lt = lt->parent) + ; + return ((*lt->dmamap_load)(lt, dt, m, p, s, cb, cba, f)); +} #define bus_dmamap_load(t, m, p, s, cb, cba, f) \ - (*(t)->dmamap_load)((t), (m), (p), (s), (cb), (cba), (f)) + sparc64_dmamap_load((t), (t), (m), (p), (s), (cb), (cba), (f)) + +static __inline void +sparc64_dmamap_unload(bus_dma_tag_t pt, bus_dma_tag_t dt, bus_dmamap_t p) +{ + bus_dma_tag_t lt; + + for (lt = pt; lt->dmamap_unload == NULL; lt = lt->parent) + ; + (*lt->dmamap_unload)(lt, dt, p); +} #define bus_dmamap_unload(t, p) \ - (*(t)->dmamap_unload)((t), (p)) + sparc64_dmamap_unload((t), (t), (p)) + +static __inline void +sparc64_dmamap_sync(bus_dma_tag_t pt, bus_dma_tag_t dt, bus_dmamap_t m, + bus_dmasync_op_t op) +{ + bus_dma_tag_t lt; + + for (lt = pt; lt->dmamap_sync == NULL; lt = lt->parent) + ; + (*lt->dmamap_sync)(lt, dt, m, op); +} #define bus_dmamap_sync(t, m, op) \ - (void)((t)->dmamap_sync ? \ - (*(t)->dmamap_sync)((t), (m), (op)) : (void)0) + sparc64_dmamap_sync((t), (t), (m), (op)) + +static __inline int +sparc64_dmamem_alloc(bus_dma_tag_t pt, bus_dma_tag_t dt, void **v, int f, + bus_dmamap_t *m) +{ + bus_dma_tag_t lt; + for (lt = pt; lt->dmamem_alloc == NULL; lt = lt->parent) + ; + return ((*lt->dmamem_alloc)(lt, dt, v, f, m)); +} #define bus_dmamem_alloc(t, v, f, m) \ - (*(t)->dmamem_alloc)((t), (v), (f), (m)) + sparc64_dmamem_alloc((t), (t), (v), (f), (m)) + +static __inline void +sparc64_dmamem_free(bus_dma_tag_t pt, bus_dma_tag_t dt, void *v, + bus_dmamap_t m) +{ + bus_dma_tag_t lt; + + for (lt = pt; lt->dmamem_free == NULL; lt = lt->parent) + ; + (*lt->dmamem_free)(lt, dt, v, m); +} #define bus_dmamem_free(t, v, m) \ - (*(t)->dmamem_free)((t), (v), (m)) - -struct bus_dmamap { - bus_dma_tag_t dmat; - void *buf; /* unmapped buffer pointer */ - bus_size_t buflen; /* unmapped buffer length */ - bus_addr_t start; /* start of mapped region */ - struct resource *res; /* associated resource */ -}; + sparc64_dmamem_free((t), (t), (v), (m)) #endif /* !_MACHINE_BUS_H_ */ ==== //depot/projects/sparc64/sys/sparc64/include/iommuvar.h#12 (text+ko) ==== @@ -82,19 +82,19 @@ void iommu_remove(struct iommu_state *, vm_offset_t, size_t); void iommu_decode_fault(struct iommu_state *, vm_offset_t); -int iommu_dvmamap_create(bus_dma_tag_t, struct iommu_state *, int, - bus_dmamap_t *); -int iommu_dvmamap_destroy(bus_dma_tag_t, struct iommu_state *, +int iommu_dvmamap_create(bus_dma_tag_t, bus_dma_tag_t, struct iommu_state *, + int, bus_dmamap_t *); +int iommu_dvmamap_destroy(bus_dma_tag_t, bus_dma_tag_t, struct iommu_state *, bus_dmamap_t); -int iommu_dvmamap_load(bus_dma_tag_t, struct iommu_state *, bus_dmamap_t, - void *, bus_size_t, bus_dmamap_callback_t *, void *, int); -void iommu_dvmamap_unload(bus_dma_tag_t, struct iommu_state *, +int iommu_dvmamap_load(bus_dma_tag_t, bus_dma_tag_t, struct iommu_state *, + bus_dmamap_t, void *, bus_size_t, bus_dmamap_callback_t *, void *, int); +void iommu_dvmamap_unload(bus_dma_tag_t, bus_dma_tag_t, struct iommu_state *, bus_dmamap_t); -void iommu_dvmamap_sync(bus_dma_tag_t, struct iommu_state *, bus_dmamap_t, - bus_dmasync_op_t); -int iommu_dvmamem_alloc(bus_dma_tag_t, struct iommu_state *, void **, int, - bus_dmamap_t *); -void iommu_dvmamem_free(bus_dma_tag_t, struct iommu_state *, void *, - bus_dmamap_t); +void iommu_dvmamap_sync(bus_dma_tag_t, bus_dma_tag_t, struct iommu_state *, + bus_dmamap_t, bus_dmasync_op_t); +int iommu_dvmamem_alloc(bus_dma_tag_t, bus_dma_tag_t, struct iommu_state *, + void **, int, bus_dmamap_t *); +void iommu_dvmamem_free(bus_dma_tag_t, bus_dma_tag_t, struct iommu_state *, + void *, bus_dmamap_t); #endif /* !_MACHINE_IOMMUVAR_H_ */ ==== //depot/projects/sparc64/sys/sparc64/pci/psycho.c#25 (text+ko) ==== @@ -99,14 +99,18 @@ * bus space and bus dma support for UltraSPARC `psycho'. note that most * of the bus dma support is provided by the iommu dvma controller. */ -static int psycho_dmamap_create(bus_dma_tag_t, int, bus_dmamap_t *); -static int psycho_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t); -static int psycho_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, bus_size_t, - bus_dmamap_callback_t *, void *, int); -static void psycho_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); -static void psycho_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); -static int psycho_dmamem_alloc(bus_dma_tag_t, void **, int, bus_dmamap_t *); -static void psycho_dmamem_free(bus_dma_tag_t, void *, bus_dmamap_t); +static int psycho_dmamap_create(bus_dma_tag_t, bus_dma_tag_t, int, + bus_dmamap_t *); +static int psycho_dmamap_destroy(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t); +static int psycho_dmamap_load(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, + void *, bus_size_t, bus_dmamap_callback_t *, void *, int); +static void psycho_dmamap_unload(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t); +static void psycho_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, + bus_dmasync_op_t); +static int psycho_dmamem_alloc(bus_dma_tag_t, bus_dma_tag_t, void **, int, + bus_dmamap_t *); +static void psycho_dmamem_free(bus_dma_tag_t, bus_dma_tag_t, void *, + bus_dmamap_t); /* * autoconfiguration @@ -1195,7 +1199,7 @@ if (type == SYS_RES_IRQ) return (bus_deactivate_resource(bus, type, rid, r)); if (type == SYS_RES_MEMORY) { - sparc64_bus_mem_unmap(rman_get_bustag(r), rman_get_size(r)); + sparc64_bus_mem_unmap(rman_get_virtual(r), rman_get_size(r)); rman_set_virtual(r, NULL); } return (rman_deactivate_resource(r)); @@ -1274,69 +1278,74 @@ * hooks into the iommu dvma calls. */ static int -psycho_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int flags, bus_dmamap_t *mapp) +psycho_dmamem_alloc(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr, + int flags, bus_dmamap_t *mapp) { struct psycho_softc *sc; - sc = (struct psycho_softc *)dmat->cookie; - return (iommu_dvmamem_alloc(dmat, sc->sc_is, vaddr, flags, mapp)); + sc = (struct psycho_softc *)pdmat->cookie; + return (iommu_dvmamem_alloc(pdmat, ddmat, sc->sc_is, vaddr, flags, + mapp)); } static void -psycho_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) +psycho_dmamem_free(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void *vaddr, + bus_dmamap_t map) { struct psycho_softc *sc; - sc = (struct psycho_softc *)dmat->cookie; - iommu_dvmamem_free(dmat, sc->sc_is, vaddr, map); + sc = (struct psycho_softc *)pdmat->cookie; + iommu_dvmamem_free(pdmat, ddmat, sc->sc_is, vaddr, map); } static int -psycho_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp) +psycho_dmamap_create(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, int flags, + bus_dmamap_t *mapp) { struct psycho_softc *sc; - sc = (struct psycho_softc *)dmat->cookie; - return (iommu_dvmamap_create(dmat, sc->sc_is, flags, mapp)); + sc = (struct psycho_softc *)pdmat->cookie; + return (iommu_dvmamap_create(pdmat, ddmat, sc->sc_is, flags, mapp)); } static int -psycho_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map) +psycho_dmamap_destroy(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, + bus_dmamap_t map) { struct psycho_softc *sc; - sc = (struct psycho_softc *)dmat->cookie; - return (iommu_dvmamap_destroy(dmat, sc->sc_is, map)); + sc = (struct psycho_softc *)pdmat->cookie; + return (iommu_dvmamap_destroy(pdmat, ddmat, sc->sc_is, map)); } static int -psycho_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, - bus_size_t buflen, bus_dmamap_callback_t *callback, void *callback_arg, - int flags) +psycho_dmamap_load(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map, + void *buf, bus_size_t buflen, bus_dmamap_callback_t *callback, + void *callback_arg, int flags) { struct psycho_softc *sc; - sc = (struct psycho_softc *)dmat->cookie; - return (iommu_dvmamap_load(dmat, sc->sc_is, map, buf, buflen, callback, - callback_arg, flags)); + sc = (struct psycho_softc *)pdmat->cookie; + return (iommu_dvmamap_load(pdmat, ddmat, sc->sc_is, map, buf, buflen, + callback, callback_arg, flags)); } static void -psycho_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map) +psycho_dmamap_unload(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map) { struct psycho_softc *sc; - sc = (struct psycho_softc *)dmat->cookie; - iommu_dvmamap_unload(dmat, sc->sc_is, map); + sc = (struct psycho_softc *)pdmat->cookie; + iommu_dvmamap_unload(pdmat, ddmat, sc->sc_is, map); } static void -psycho_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, +psycho_dmamap_sync(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map, bus_dmasync_op_t op) { struct psycho_softc *sc; - sc = (struct psycho_softc *)dmat->cookie; - iommu_dvmamap_sync(dmat, sc->sc_is, map, op); + sc = (struct psycho_softc *)pdmat->cookie; + iommu_dvmamap_sync(pdmat, ddmat, sc->sc_is, map, op); } ==== //depot/projects/sparc64/sys/sparc64/sbus/sbus.c#5 (text+ko) ==== @@ -231,14 +231,18 @@ /* * DVMA routines */ -static int sbus_dmamap_create(bus_dma_tag_t, int, bus_dmamap_t *); -static int sbus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t); -static int sbus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, bus_size_t, - bus_dmamap_callback_t *, void *, int); -static void sbus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); -static void sbus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); -static int sbus_dmamem_alloc(bus_dma_tag_t, void **, int, bus_dmamap_t *); -static void sbus_dmamem_free(bus_dma_tag_t, void *, bus_dmamap_t); +static int sbus_dmamap_create(bus_dma_tag_t, bus_dma_tag_t, int, + bus_dmamap_t *); +static int sbus_dmamap_destroy(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t); +static int sbus_dmamap_load(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, bus_dmamap_callback_t *, void *, int); +static void sbus_dmamap_unload(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t); +static void sbus_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, + bus_dmasync_op_t); +static int sbus_dmamem_alloc(bus_dma_tag_t, bus_dma_tag_t, void **, int, + bus_dmamap_t *); +static void sbus_dmamem_free(bus_dma_tag_t, bus_dma_tag_t, void *, + bus_dmamap_t); static device_method_t sbus_methods[] = { /* Device interface */ @@ -909,62 +913,66 @@ } static int -sbus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp) +sbus_dmamap_create(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, int flags, + bus_dmamap_t *mapp) { - struct sbus_softc *sc = (struct sbus_softc *)dmat->cookie; + struct sbus_softc *sc = (struct sbus_softc *)pdmat->cookie; - return (iommu_dvmamap_create(dmat, &sc->sc_is, flags, mapp)); + return (iommu_dvmamap_create(pdmat, ddmat, &sc->sc_is, flags, mapp)); } static int -sbus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map) +sbus_dmamap_destroy(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map) { - struct sbus_softc *sc = (struct sbus_softc *)dmat->cookie; + struct sbus_softc *sc = (struct sbus_softc *)pdmat->cookie; - return (iommu_dvmamap_destroy(dmat, &sc->sc_is, map)); + return (iommu_dvmamap_destroy(pdmat, ddmat, &sc->sc_is, map)); } static int -sbus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, - bus_size_t buflen, bus_dmamap_callback_t *callback, void *callback_arg, - int flags) +sbus_dmamap_load(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map, + void *buf, bus_size_t buflen, bus_dmamap_callback_t *callback, + void *callback_arg, int flags) { - struct sbus_softc *sc = (struct sbus_softc *)dmat->cookie; + struct sbus_softc *sc = (struct sbus_softc *)pdmat->cookie; - return (iommu_dvmamap_load(dmat, &sc->sc_is, map, buf, buflen, callback, - callback_arg, flags)); + return (iommu_dvmamap_load(pdmat, ddmat, &sc->sc_is, map, buf, buflen, + callback, callback_arg, flags)); } static void -sbus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map) +sbus_dmamap_unload(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map) { - struct sbus_softc *sc = (struct sbus_softc *)dmat->cookie; + struct sbus_softc *sc = (struct sbus_softc *)pdmat->cookie; - iommu_dvmamap_unload(dmat, &sc->sc_is, map); + iommu_dvmamap_unload(pdmat, ddmat, &sc->sc_is, map); } static void -sbus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, +sbus_dmamap_sync(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map, bus_dmasync_op_t op) { - struct sbus_softc *sc = (struct sbus_softc *)dmat->cookie; + struct sbus_softc *sc = (struct sbus_softc *)pdmat->cookie; - iommu_dvmamap_sync(dmat, &sc->sc_is, map, op); + iommu_dvmamap_sync(pdmat, ddmat, &sc->sc_is, map, op); } static int -sbus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int flags, bus_dmamap_t *mapp) +sbus_dmamem_alloc(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr, + int flags, bus_dmamap_t *mapp) { - struct sbus_softc *sc = (struct sbus_softc *)dmat->cookie; + struct sbus_softc *sc = (struct sbus_softc *)pdmat->cookie; - return (iommu_dvmamem_alloc(dmat, &sc->sc_is, vaddr, flags, mapp)); + return (iommu_dvmamem_alloc(pdmat, ddmat, &sc->sc_is, vaddr, flags, + mapp)); } static void -sbus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) +sbus_dmamem_free(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void *vaddr, + bus_dmamap_t map) { - struct sbus_softc *sc = (struct sbus_softc *)dmat->cookie; + struct sbus_softc *sc = (struct sbus_softc *)pdmat->cookie; - iommu_dvmamem_free(dmat, &sc->sc_is, vaddr, map); + iommu_dvmamem_free(pdmat, ddmat, &sc->sc_is, vaddr, map); } ==== //depot/projects/sparc64/sys/sparc64/sparc64/bus_machdep.c#14 (text+ko) ==== @@ -124,6 +124,7 @@ #include #include +#include #include #include #include @@ -153,16 +154,25 @@ * Note: there is no support for bounce buffers yet. */ -static int nexus_dmamap_create(bus_dma_tag_t, int, bus_dmamap_t *); -static int nexus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t); -static int nexus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, bus_size_t, - bus_dmamap_callback_t *, void *, int); -static void nexus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); -static void nexus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t); -static int nexus_dmamem_alloc(bus_dma_tag_t, void **, int, bus_dmamap_t *); -static void nexus_dmamem_free(bus_dma_tag_t, void *, bus_dmamap_t); +static int nexus_dmamap_create(bus_dma_tag_t, bus_dma_tag_t, int, + bus_dmamap_t *); +static int nexus_dmamap_destroy(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t); +static int nexus_dmamap_load(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, + void *, bus_size_t, bus_dmamap_callback_t *, void *, int); +static void nexus_dmamap_unload(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t); +static void nexus_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, + bus_dmasync_op_t); +static int nexus_dmamem_alloc(bus_dma_tag_t, bus_dma_tag_t, void **, int, + bus_dmamap_t *); +static void nexus_dmamem_free(bus_dma_tag_t, bus_dma_tag_t, void *, + bus_dmamap_t); - +/* + * Since there is now way for a device to obtain a dma tag from its parent + * we use this kluge to handle different the different supported bus systems. + * The sparc64_root_dma_tag is used as parent for tags that have none, so that + * the correct methods will be used. + */ bus_dma_tag_t sparc64_root_dma_tag; /* @@ -175,7 +185,7 @@ int nsegments, bus_size_t maxsegsz, int flags, bus_dma_tag_t *dmat) { - bus_dma_tag_t newtag, eparent; + bus_dma_tag_t newtag; /* Return a NULL tag on failure */ *dmat = NULL; @@ -184,11 +194,7 @@ if (newtag == NULL) return (ENOMEM); - /* Ugh... */ - eparent = parent != NULL ? parent : sparc64_root_dma_tag; - memcpy(newtag, eparent, sizeof(*newtag)); - if (parent != NULL) - newtag->parent = parent; + newtag->parent = parent != NULL ? parent : sparc64_root_dma_tag; newtag->alignment = alignment; newtag->boundary = boundary; newtag->lowaddr = trunc_page((vm_offset_t)lowaddr) + (PAGE_SIZE - 1); @@ -199,9 +205,17 @@ newtag->nsegments = nsegments; newtag->maxsegsz = maxsegsz; newtag->flags = flags; - newtag->ref_count = 1; /* Count ourself */ + newtag->ref_count = 1; /* Count ourselves */ newtag->map_count = 0; - + + newtag->dmamap_create = NULL; + newtag->dmamap_destroy = NULL; + newtag->dmamap_load = NULL; + newtag->dmamap_unload = NULL; + newtag->dmamap_sync = NULL; + newtag->dmamem_alloc = NULL; + newtag->dmamem_free = NULL; + /* Take into account any restrictions imposed by our parent tag */ if (parent != NULL) { newtag->lowaddr = ulmin(parent->lowaddr, newtag->lowaddr); @@ -211,10 +225,9 @@ * all the way up the inheritence chain. */ newtag->boundary = ulmax(parent->boundary, newtag->boundary); - if (parent != NULL) - parent->ref_count++; } - + newtag->parent->ref_count++; + *dmat = newtag; return (0); } @@ -222,16 +235,15 @@ int bus_dma_tag_destroy(bus_dma_tag_t dmat) { + bus_dma_tag_t parent; if (dmat != NULL) { if (dmat->map_count != 0) return (EBUSY); - while (dmat != NULL) { - bus_dma_tag_t parent; - parent = dmat->parent; dmat->ref_count--; + printf("tag_destroy\n"); if (dmat->ref_count == 0) { free(dmat, M_DEVBUF); /* @@ -252,12 +264,13 @@ * DMA map creation functions. */ static int -nexus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp) +nexus_dmamap_create(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, int flags, + bus_dmamap_t *mapp) { /* Not much to do...? */ *mapp = malloc(sizeof(**mapp), M_DEVBUF, M_WAITOK | M_ZERO); - dmat->map_count++; + ddmat->map_count++; return (0); } @@ -266,11 +279,11 @@ * DMA map destruction functions. */ static int -nexus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map) +nexus_dmamap_destroy(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map) { free(map, M_DEVBUF); - dmat->map_count--; + ddmat->map_count--; return (0); } @@ -287,14 +300,14 @@ * bypass DVMA. */ static int -nexus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf, - bus_size_t buflen, bus_dmamap_callback_t *callback, void *callback_arg, - int flags) +nexus_dmamap_load(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map, + void *buf, bus_size_t buflen, bus_dmamap_callback_t *callback, + void *callback_arg, int flags) { vm_offset_t vaddr; vm_offset_t paddr; #ifdef __GNUC__ - bus_dma_segment_t dm_segments[dmat->nsegments]; + bus_dma_segment_t dm_segments[ddmat->nsegments]; #else bus_dma_segment_t dm_segments[BUS_DMAMAP_NSEGS]; #endif @@ -331,7 +344,7 @@ /* Go to the next segment */ sg++; seg++; - if (seg > dmat->nsegments) + if (seg > ddmat->nsegments) break; sg->ds_addr = paddr; sg->ds_len = size; @@ -357,7 +370,7 @@ * bus-specific DMA map unload functions. */ static void -nexus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map) +nexus_dmamap_unload(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map) { /* Nothing to do...? */ @@ -368,7 +381,8 @@ * by bus-specific DMA map synchronization functions. */ static void -nexus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op) +nexus_dmamap_sync(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map, + bus_dmasync_op_t op) { /* @@ -412,7 +426,7 @@ *mapp = malloc(sizeof(**mapp), M_DEVBUF, M_WAITOK | M_ZERO); if (*mapp == NULL) return (ENOMEM); - + dmat->map_count++; return (0); } @@ -430,12 +444,12 @@ * by bus-specific DMA memory allocation functions. */ static int -nexus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int flags, - bus_dmamap_t *mapp) +nexus_dmamem_alloc(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr, + int flags, bus_dmamap_t *mapp) { - - if ((dmat->maxsize <= PAGE_SIZE)) { - *vaddr = malloc(dmat->maxsize, M_DEVBUF, + + if ((ddmat->maxsize <= PAGE_SIZE)) { + *vaddr = malloc(ddmat->maxsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK); } else { /* @@ -443,10 +457,11 @@ * and handles multi-seg allocations. Nobody is doing multi-seg * allocations yet though. */ - *vaddr = contigmalloc(dmat->maxsize, M_DEVBUF, + *vaddr = contigmalloc(ddmat->maxsize, M_DEVBUF, (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK, - 0ul, dmat->lowaddr, dmat->alignment ? dmat->alignment : 1UL, - dmat->boundary); + 0ul, ddmat->lowaddr, + ddmat->alignment ? ddmat->alignment : 1UL, + ddmat->boundary); } if (*vaddr == NULL) { free(*mapp, M_DEVBUF); @@ -460,14 +475,15 @@ * bus-specific DMA memory free functions. */ static void -nexus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map) +nexus_dmamem_free(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void *vaddr, + bus_dmamap_t map) { - sparc64_dmamem_free_map(dmat, map); - if ((dmat->maxsize <= PAGE_SIZE)) + sparc64_dmamem_free_map(ddmat, map); + if ((ddmat->maxsize <= PAGE_SIZE)) free(vaddr, M_DEVBUF); else - contigfree(vaddr, dmat->maxsize, M_DEVBUF); + contigfree(vaddr, ddmat->maxsize, M_DEVBUF); } struct bus_dma_tag nexus_dmatag = { @@ -567,7 +583,7 @@ for (va = sva; va < endva; va += PAGE_SIZE) pmap_kremove(va); tlb_range_demap(kernel_pmap, sva, sva + size - 1); - kmem_free(kernel_map, va, size); + kmem_free(kernel_map, sva, size); return (0); } ==== //depot/projects/sparc64/sys/sparc64/sparc64/cache.c#15 (text+ko) ==== @@ -395,7 +395,6 @@ ecache_inval_phys(vm_offset_t start, vm_offset_t end) { vm_offset_t addr, eca; - critical_t c; u_long tag, j; if (!cache.c_enabled) @@ -407,7 +406,6 @@ /* XXX: guesswork... */ eca = (addr & (cache.ec_size - 1)) | (j << (cache.ec_l2set)); - c = critical_enter(); /* * Retrieve the tag: * A read from the appropriate VA in ASI_ECACHE_R ==== //depot/projects/sparc64/sys/sparc64/sparc64/iommu.c#18 (text+ko) ==== @@ -123,6 +123,7 @@ #include #include +#include #include #include #include @@ -158,12 +159,44 @@ bus_space_write_8((is)->is_bustag, (is)->is_bushandle, \ (is)->reg + (off), (v)) +/* + * Always overallocate one page; this is needed to handle alignment of the + * buffer, so it makes sense using a lazy allocation scheme. + */ +#define IOMMU_SIZE_ROUNDUP(sz) \ + (round_io_page(sz) + IO_PAGE_SIZE) + static int iommu_strbuf_flush_done(struct iommu_state *); #ifdef IOMMU_DIAG static void iommu_diag(struct iommu_state *, vm_offset_t va); #endif /* + * LRU queue handling for lazy resource allocation. + */ +static STAILQ_HEAD(, bus_dmamap) iommu_maplruq = + STAILQ_HEAD_INITIALIZER(iommu_maplruq); + +static __inline void +iommu_map_insq(bus_dmamap_t map) +{ + + if (!map->onq && map->dvmaresv != 0) { + STAILQ_INSERT_TAIL(&iommu_maplruq, map, maplruq); + map->onq = 1; + } +} + +static __inline void +iommu_map_remq(bus_dmamap_t map) +{ + + if (map->onq) + STAILQ_REMOVE(&iommu_maplruq, map, bus_dmamap, maplruq); + map->onq = 0; +} + +/* * initialise the UltraSPARC IOMMU (SBUS or PCI): * - allocate and setup the iotsb. * - enable the IOMMU @@ -457,55 +490,50 @@ /* Allocate DVMA virtual memory for a map. */ static int -iommu_dvma_valloc(bus_dma_tag_t t, struct iommu_state *is, bus_dmamap_t map) +iommu_dvma_valloc(bus_dma_tag_t t, struct iommu_state *is, bus_dmamap_t map, + bus_size_t size) { - bus_size_t align, bound, sgsize, maxsize; + bus_size_t align, bound, sgsize; /* - * Choose a maximum length. If a boundary is specified, a map cannot - * be larger than it. - * XXX: we end up overallocating quite a lot here, since we only know - * an upper bound for the tag, but not for the map, so we need to - * allocate the maximum size to each map. Usually, plenty of DVMA - * virtual memory is available (the minimum is 8MB), so this should - * not be much of a poblem right now. + * If a boundary is specified, a map cannot be larger than it; however + * we do not clip currently, as that does not play well with the lazy + * allocation code. + * Alignment to a page boundary is always enforced. */ - if (t->boundary != 0) - maxsize = ulmin(t->maxsize, t->boundary); - else - maxsize = t->maxsize; - /* Alignment to a page boundary is always enforced. */ align = (t->alignment + IO_PAGE_MASK) >> IO_PAGE_SHIFT; - sgsize = round_io_page(maxsize) >> IO_PAGE_SHIFT; + sgsize = round_io_page(size) >> IO_PAGE_SHIFT; if (t->boundary > 0 && t->boundary < IO_PAGE_SIZE) panic("iommu_dvmamap_load: illegal boundary specified"); bound = ulmax(t->boundary >> IO_PAGE_SHIFT, 1); + map->dvmaresv = 0; map->res = rman_reserve_resource_bound(&is->is_dvma_rman, 0L, t->lowaddr, sgsize, bound >> IO_PAGE_SHIFT, RF_ACTIVE | rman_make_alignment_flags(align), NULL); - if (map->res == NULL) { - printf("DVMA allocation failed!\n"); /* XXX */ + if (map->res == NULL) return (ENOMEM); - } map->start = rman_get_start(map->res) * IO_PAGE_SIZE; + map->dvmaresv = size; + iommu_map_insq(map); return (0); } /* Free DVMA virtual memory for a map. */ static void -iommu_dvma_vfree(bus_dma_tag_t t, bus_dmamap_t map) +iommu_dvma_vfree(bus_dmamap_t map) { - if (rman_release_resource(map->res) != 0) { + iommu_map_remq(map); + if (map->res != NULL && rman_release_resource(map->res) != 0) printf("warning: DVMA space lost\n"); - } map->res = NULL; + map->dvmaresv = 0; } int -iommu_dvmamem_alloc(bus_dma_tag_t t, struct iommu_state *is, void **vaddr, - int flags, bus_dmamap_t *mapp) +iommu_dvmamem_alloc(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is, + void **vaddr, int flags, bus_dmamap_t *mapp) { int error; @@ -513,62 +541,63 @@ * XXX: This will break for 32 bit transfers on machines with more than * 16G (2 << 34 bytes) of memory. */ - if ((error = sparc64_dmamem_alloc_map(t, mapp)) != 0) + if ((error = sparc64_dmamem_alloc_map(dt, mapp)) != 0) return (error); - if ((*vaddr = malloc(t->maxsize, M_IOMMU, + if ((*vaddr = malloc(dt->maxsize, M_IOMMU, (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL) { error = ENOMEM; goto failm; } - if ((error = iommu_dvma_valloc(t, is, *mapp)) != 0) - goto failv; + /* + * Try to preallocate DVMA memory. If this fails, it is retried at load + * time. + */ + iommu_dvma_valloc(dt, is, *mapp, IOMMU_SIZE_ROUNDUP(dt->maxsize)); return (0); -failv: - free(*vaddr, M_IOMMU); failm: - sparc64_dmamem_free_map(t, *mapp); + sparc64_dmamem_free_map(dt, *mapp); return (error); } void -iommu_dvmamem_free(bus_dma_tag_t t, struct iommu_state *is, void *vaddr, - bus_dmamap_t map) +iommu_dvmamem_free(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is, + void *vaddr, bus_dmamap_t map) { - iommu_dvma_vfree(t, map); - sparc64_dmamem_free_map(t, map); + iommu_dvma_vfree(map); + sparc64_dmamem_free_map(dt, map); free(vaddr, M_IOMMU); } int -iommu_dvmamap_create(bus_dma_tag_t t, struct iommu_state *is, int flags, - bus_dmamap_t *mapp) +iommu_dvmamap_create(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is, + int flags, bus_dmamap_t *mapp) { int error; - if ((error = bus_dmamap_create(t->parent, flags, mapp)) != 0) + if ((error = sparc64_dmamap_create(pt->parent, dt, flags, mapp)) != 0) return (error); + KASSERT((*mapp)->res == NULL, + ("iommu_dvmamap_create: hierarchy botched")); /* - * XXX: If already allocated, skip (this can happen in tag hierarchies - * where the parent is an iommu tag, too). + * Preallocate DMVA memory; if this fails now, it is retried at load + * time. + * Clamp preallocation to BUS_SPACE_MAXSIZE. In some situations we can + * handle more; that case is handled by reallocating at map load time. */ - if ((*mapp)->res == NULL && - (error = iommu_dvma_valloc(t, is, *mapp)) != 0) { - bus_dmamap_destroy(t->parent, *mapp); - return (error); - } + iommu_dvma_valloc(dt, is, *mapp, + ulmin(IOMMU_SIZE_ROUNDUP(dt->maxsize), BUS_SPACE_MAXSIZE)); return (0); } int -iommu_dvmamap_destroy(bus_dma_tag_t t, struct iommu_state *is, bus_dmamap_t map) +iommu_dvmamap_destroy(bus_dma_tag_t pt, bus_dma_tag_t dt, + struct iommu_state *is, bus_dmamap_t map) { - /* XXX: if already freed, skip. */ - if (map->res != NULL) - iommu_dvma_vfree(t, map); - return (bus_dmamap_destroy(t->parent, map)); + iommu_dvma_vfree(map); + return (sparc64_dmamap_destroy(pt->parent, dt, map)); } #define BUS_DMAMAP_NSEGS ((BUS_SPACE_MAXSIZE / PAGE_SIZE) + 1) @@ -577,16 +606,17 @@ * IOMMU DVMA operations, common to SBUS and PCI. */ int -iommu_dvmamap_load(bus_dma_tag_t t, struct iommu_state *is, bus_dmamap_t map, - void *buf, bus_size_t buflen, bus_dmamap_callback_t *cb, void *cba, - int flags) +iommu_dvmamap_load(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is, + bus_dmamap_t map, void *buf, bus_size_t buflen, bus_dmamap_callback_t *cb, + void *cba, int flags) { #ifdef __GNUC__ - bus_dma_segment_t sgs[t->nsegments]; + bus_dma_segment_t sgs[dt->nsegments]; #else bus_dma_segment_t sgs[BUS_DMAMAP_NSEGS]; #endif - bus_size_t sgsize; + bus_dmamap_t tm; + bus_size_t sgsize, fsize, maxsize; vm_offset_t curaddr; u_long dvmaddr; vm_offset_t vaddr; @@ -597,15 +627,52 @@ #ifdef DIAGNOSTIC printf("iommu_dvmamap_load: map still in use\n"); #endif - bus_dmamap_unload(t, map); + bus_dmamap_unload(dt, map); } - if (buflen > t->maxsize) { + if (buflen > dt->maxsize) { DPRINTF(IDB_BUSDMA, ("iommu_dvmamap_load(): error %d > %d -- " >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 20:50:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D176837B41A; Thu, 21 Mar 2002 20:50:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B9AA037B419 for ; Thu, 21 Mar 2002 20:50:49 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2M4onx17500 for perforce@freebsd.org; Thu, 21 Mar 2002 20:50:49 -0800 (PST) (envelope-from jake@freebsd.org) Date: Thu, 21 Mar 2002 20:50:49 -0800 (PST) Message-Id: <200203220450.g2M4onx17500@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8196 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8196 Change 8196 by jake@jake_sparc64 on 2002/03/21 20:50:05 Set mp_maxid so that uma works with smp. Affected files ... ... //depot/projects/sparc64/sys/sparc64/sparc64/mp_machdep.c#11 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/sparc64/mp_machdep.c#11 (text+ko) ==== @@ -150,6 +150,7 @@ strcmp(buf, "cpu") == 0) cpus++; } + mp_maxid = cpus; return (cpus > 1); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 23: 8:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D80E337B417; Thu, 21 Mar 2002 23:08:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DE8FB37B404 for ; Thu, 21 Mar 2002 23:08:39 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2M78dc46724 for perforce@freebsd.org; Thu, 21 Mar 2002 23:08:39 -0800 (PST) (envelope-from jake@freebsd.org) Date: Thu, 21 Mar 2002 23:08:39 -0800 (PST) Message-Id: <200203220708.g2M78dc46724@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8199 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8199 Change 8199 by jake@jake_sparc64 on 2002/03/21 23:07:47 Add more bloat. INET6, UFS_DIRHASH, MD_ROOT, COMPAT_43, sl, ppp, tun, gif, faith, bpf, OFW_PCI_DEBUG. Affected files ... ... //depot/projects/sparc64/sys/sparc64/conf/GENERIC#16 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/conf/GENERIC#16 (text+ko) ==== @@ -35,11 +35,11 @@ # At this time all platforms are supported, as-is. options INET #InterNETworking -#options INET6 #IPv6 communications protocols +options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support -#options UFS_DIRHASH #Improve performance on big directories -#options MD_ROOT #MD is a potential root device +options UFS_DIRHASH #Improve performance on big directories +options MD_ROOT #MD is a potential root device options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server #options NFS_ROOT #NFS usable as root device @@ -47,7 +47,7 @@ options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework -#options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] +options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] #options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI #options UCONSOLE #Allow users to grab the console options KTRACE #ktrace(1) syscall trace support @@ -121,9 +121,6 @@ # the most basic console driver is the OpenBoot firmware device ofw_console -# real time clock -#device mcclock - # Builtin hardware device genclock # generic clock interface device eeprom # eeprom (really an ebus driver for the mk48txx) @@ -166,17 +163,17 @@ device random # Entropy device device loop # Network loopback device ether # Ethernet support -#device sl # Kernel SLIP -#device ppp 1 # Kernel PPP -#device tun # Packet tunnel. +device sl # Kernel SLIP +device ppp 1 # Kernel PPP +device tun # Packet tunnel. device pty # Pseudo-ttys (telnet etc) device md # Memory "disks" -#device gif # IPv6 and IPv4 tunneling -#device faith # IPv6-to-IPv4 relaying/(translation) +device gif # IPv6 and IPv4 tunneling +device faith # IPv6-to-IPv4 relaying/(translation) # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! -#device bpf #Berkeley packet filter +device bpf #Berkeley packet filter # USB support #device uhci # UHCI PCI->USB interface @@ -207,7 +204,7 @@ options KTR_ENTRIES=8192 options KTR_MASK=0 -#options OFW_PCI_DEBUG +options OFW_PCI_DEBUG #options BOOTP #options BOOTP_NFSROOT To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 21 23:10:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75A9737B41B; Thu, 21 Mar 2002 23:10:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BE99937B41A for ; Thu, 21 Mar 2002 23:10:42 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2M7AgI47557 for perforce@freebsd.org; Thu, 21 Mar 2002 23:10:42 -0800 (PST) (envelope-from jake@freebsd.org) Date: Thu, 21 Mar 2002 23:10:42 -0800 (PST) Message-Id: <200203220710.g2M7AgI47557@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8200 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8200 Change 8200 by jake@jake_sparc64 on 2002/03/21 23:10:10 machine needs to be non-static for compat43 to compile. Affected files ... ... //depot/projects/sparc64/sys/sparc64/sparc64/identcpu.c#16 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/sparc64/identcpu.c#16 (text+ko) ==== @@ -17,7 +17,7 @@ #include #include -static char machine[] = "sparc64"; +char machine[] = "sparc64"; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "Machine class"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 6:53:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 185E337B419; Fri, 22 Mar 2002 06:53:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1AD4737B404 for ; Fri, 22 Mar 2002 06:53:25 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MErOB88903 for perforce@freebsd.org; Fri, 22 Mar 2002 06:53:24 -0800 (PST) (envelope-from green@freebsd.org) Date: Fri, 22 Mar 2002 06:53:24 -0800 (PST) Message-Id: <200203221453.g2MErOB88903@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8204 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8204 Change 8204 by green@green_laptop_2 on 2002/03/22 06:53:02 Start allocating "slots" for being able to have dynamic per-policy MAC structure allocation. Affected files ... ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#13 edit ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_sebsd.c#1 add ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#21 edit ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#116 edit ... //depot/projects/trustedbsd/mac/sys/kern/vfs_conf.c#7 edit ... //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#4 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#22 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#22 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#18 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#16 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#17 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#87 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#50 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#13 (text+ko) ==== @@ -40,6 +40,7 @@ mac_is_present_np.c \ mac_get.c \ mac_mls.c \ + mac_sebsd.c \ mac_set.c \ mac_te.c \ mac_text.c ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#21 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#116 (text+ko) ==== @@ -84,6 +84,20 @@ TUNABLE_INT("security.mac.debug_label_fallback", &mac_debug_label_fallback); +#ifndef MAC_MAX_POLICIES +#define MAC_MAX_POLICIES 8 +#endif +#if MAC_MAX_POLICIES > 32 +#error "MAC_MAX_POLICIES too large" +#endif +static const unsigned int mac_max_policies = MAC_MAX_POLICIES; +static const unsigned int mac_policies_free = (1 << MAC_MAX_POLICIES) - 1; +SYSCTL_INT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD, + &mac_max_policies, 0, ""); +struct maclabels { + void *labels[MAC_MAX_POLICIES]; +}; + static int mac_enforce_fs = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_fs, CTLFLAG_RW, &mac_enforce_fs, 0, "Enforce MAC policy on file system objects"); @@ -211,13 +225,14 @@ default: } - return (0); + return (error); } static int mac_policy_register(struct mac_policy_conf *mpc) { struct mac_policy_conf *tmpc; + int slot; sx_xlock(&mac_policy_list_lock); LIST_FOREACH(tmpc, &mac_policy_list, mpc_list) { @@ -226,6 +241,17 @@ return (EEXIST); } } + if (mpc->mpc_field_off) { + slot = ffs(mac_policies_free); + if (slot == 0) { + sx_xunlock(&mac_policy_list_lock); + return (EEXIST); + } + slot--; + mac_policies_free &= ~(1 << slot); + mpc->mpc_field_off = slot; + } else + mpc->mpc_field_off = -1; LIST_INSERT_HEAD(&mac_policy_list, mpc, mpc_list); printf("Security policy: %s (%s)\n", mpc->mpc_fullname, mpc->mpc_name); @@ -241,6 +267,11 @@ mac_policy_unregister(struct mac_policy_conf *mpc) { + /* + * Don't allow unloading modules with private data. + */ + if (mpc->mpc_field_off == -1) + return (EBUSY); sx_xlock(&mac_policy_list_lock); if (mpc->mpc_ops->mpo_destroy != NULL) (*(mpc->mpc_ops->mpo_destroy))(mpc); ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_conf.c#7 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#4 (text+ko) ==== @@ -287,4 +287,5 @@ NULL /* babyaudit_socket_check_receive_mbuf */ }; -MAC_POLICY_SET(babyaudit_ops, trustedbsd_babyaudit, "TrustedBSD MAC/babyaudit"); +MAC_POLICY_SET(babyaudit_ops, trustedbsd_babyaudit, "TrustedBSD MAC/babyaudit", + 0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#22 (text+ko) ==== @@ -1051,5 +1051,5 @@ mac_biba_socket_check_receive_mbuf }; -MAC_POLICY_SET(mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba"); +MAC_POLICY_SET(mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba", 1); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#22 (text+ko) ==== @@ -645,5 +645,5 @@ }; MAC_POLICY_SET(mac_bsdextended_ops, trustedbsd_mac_bsdextended, - "TrustedBSD MAC/BSD Extended"); + "TrustedBSD MAC/BSD Extended", 0); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#18 (text+ko) ==== @@ -1020,5 +1020,5 @@ mac_mls_socket_check_receive_mbuf }; -MAC_POLICY_SET(mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS"); +MAC_POLICY_SET(mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS", 1); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#16 (text+ko) ==== @@ -644,6 +644,6 @@ mac_none_socket_check_receive_mbuf }; -MAC_POLICY_SET(mac_none_ops, trustedbsd_mac_none, "TrustedBSD MAC/None"); +MAC_POLICY_SET(mac_none_ops, trustedbsd_mac_none, "TrustedBSD MAC/None", 0); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#17 (text+ko) ==== @@ -1097,6 +1097,6 @@ mac_te_socket_check_receive_mbuf }; -MAC_POLICY_SET(mac_te_ops, trustedbsd_mac_te, "TrustedBSD MAC/TE"); +MAC_POLICY_SET(mac_te_ops, trustedbsd_mac_te, "TrustedBSD MAC/TE", 1); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#87 (text+ko) ==== @@ -180,6 +180,10 @@ #define MAC_TE_CLASS_BPF 6 #define MAC_TE_OPERATION_BPF_RECEIVE 1 +struct mac_sebsd { + uint32_t ms_psid; /* persistent sid storage */ +}; + /* * Composite structures and constants which combine the various policy * elements into common structures to be associated with subjects and @@ -190,6 +194,7 @@ struct mac_biba m_biba; struct mac_mls m_mls; struct mac_te m_te; + struct mac_sebsd m_sebsd; }; typedef struct mac *mac_t; ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#50 (text+ko) ==== @@ -206,13 +206,16 @@ char *mpc_fullname; /* policy full name */ struct mac_policy_ops *mpc_ops; /* policy operations */ LIST_ENTRY(mac_policy_conf) mpc_list; /* global list */ + int mpc_field_off; /* security field */ }; -#define MAC_POLICY_SET(mpops, mpname, mpfullname) \ +#define MAC_POLICY_SET(mpops, mpname, mpfullname, privdata_wanted) \ static struct mac_policy_conf mpname ## _mac_policy_conf = { \ #mpname, \ mpfullname, \ &mpops, \ + NULL, \ + privdata_wanted \ }; \ static moduledata_t mpname ## _mod = { \ #mpname, \ @@ -223,5 +226,6 @@ SI_ORDER_MIDDLE) int mac_policy_modevent(module_t mod, int type, void *data); + #endif /* !_SYS_MAC_POLICY_H */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 6:54:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D8DA37B417; Fri, 22 Mar 2002 06:54:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5125137B400 for ; Fri, 22 Mar 2002 06:54:26 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MEsQP89237 for perforce@freebsd.org; Fri, 22 Mar 2002 06:54:26 -0800 (PST) (envelope-from green@freebsd.org) Date: Fri, 22 Mar 2002 06:54:26 -0800 (PST) Message-Id: <200203221454.g2MEsQP89237@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8205 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8205 Change 8205 by green@green_laptop_2 on 2002/03/22 06:54:00 Synch MAC_POLICY_SET() here with the last change. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 (text+ko) ==== @@ -216,4 +216,4 @@ }; MAC_POLICY_SET(mac_seeotheruids_ops, trustedbsd_mac_seeotheruids, - "TrustedBSD MAC/seeotheruids"); + "TrustedBSD MAC/seeotheruids", 0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 8:45:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 622B137B41A; Fri, 22 Mar 2002 08:45:41 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9708A37B419 for ; Fri, 22 Mar 2002 08:45:40 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MGjeh41078 for perforce@freebsd.org; Fri, 22 Mar 2002 08:45:40 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Mar 2002 08:45:40 -0800 (PST) Message-Id: <200203221645.g2MGjeh41078@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8206 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8206 Change 8206 by rwatson@rwatson_paprika on 2002/03/22 08:45:10 Remove now unneeded mac_private.h. Requested by: green Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/mac_private.h#33 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 10: 3:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E97C37B41C; Fri, 22 Mar 2002 10:03:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3D50037B41A for ; Fri, 22 Mar 2002 10:03:14 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MI3EJ54681 for perforce@freebsd.org; Fri, 22 Mar 2002 10:03:14 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Mar 2002 10:03:14 -0800 (PST) Message-Id: <200203221803.g2MI3EJ54681@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8208 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8208 Change 8208 by rwatson@rwatson_curry on 2002/03/22 10:03:08 Un-const mac_policies_free, since it gets updated. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#117 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#117 (text+ko) ==== @@ -91,7 +91,7 @@ #error "MAC_MAX_POLICIES too large" #endif static const unsigned int mac_max_policies = MAC_MAX_POLICIES; -static const unsigned int mac_policies_free = (1 << MAC_MAX_POLICIES) - 1; +static unsigned int mac_policies_free = (1 << MAC_MAX_POLICIES) - 1; SYSCTL_INT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD, &mac_max_policies, 0, ""); struct maclabels { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 10: 3:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF93437B41A; Fri, 22 Mar 2002 10:03:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 15AE937B41B for ; Fri, 22 Mar 2002 10:03:14 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MI3D454676 for perforce@freebsd.org; Fri, 22 Mar 2002 10:03:13 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Mar 2002 10:03:13 -0800 (PST) Message-Id: <200203221803.g2MI3D454676@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8207 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8207 Change 8207 by rwatson@rwatson_curry on 2002/03/22 10:02:23 Move the network code from using cr_cansee() to check whether a socket is visible to a requesting credential to using a new function, cr_canseesocket(), which accepts a subject credential and object socket. Implement cr_canseesocket() so that it does a prison check, a uid check, and add a comment where shortly a MAC hook will go. This will allow MAC policies to seperately instrument the visibility of sockets from the visibility of processes. Once recent recent changes to the main tree are MFC'd, the uid-related checks can be centralized. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#13 edit ... //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#8 edit ... //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#10 edit ... //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#7 edit ... //depot/projects/trustedbsd/mac/sys/sys/systm.h#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#13 (text+ko) ==== @@ -61,6 +61,8 @@ #include #include #include +#include +#include #include static MALLOC_DEFINE(M_CRED, "cred", "credentials"); @@ -1676,6 +1678,33 @@ return (0); } +/*- + * Determine whether the subject represented by cred can "see" the passed + * socket. + * Returns: 0 for permitted, ENOENT otherwise. + * Locks: Sufficient locks to protect various components of cred and so + * must be held. + * References: cred and so must be valid for the lifetime of the call + */ +int +cr_canseesocket(struct ucred *cred, struct socket *so) +{ + int error; + + error = prison_check(cred, so->so_cred); + if (error) + return (ENOENT); + + if (!see_other_uids && cred->cr_ruid != so->so_cred->cr_ruid) + return (ENOENT); + +#ifdef MAC + /* XXX: error = mac_cred_check_seesocket() here. */ +#endif + + return (0); +} + /* * Allocate a zeroed cred structure. */ ==== //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#8 (text+ko) ==== @@ -653,8 +653,8 @@ for (inp = LIST_FIRST(ripcbinfo.listhead), i = 0; inp && i < n; inp = LIST_NEXT(inp, inp_list)) { if (inp->inp_gencnt <= gencnt) { - if (cr_cansee(req->td->td_ucred, - inp->inp_socket->so_cred)) + if (cr_canseesocket(req->td->td_ucred, + inp->inp_socket)) continue; inp_list[i++] = inp; } ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#10 (text+ko) ==== @@ -866,8 +866,8 @@ for (inp = LIST_FIRST(tcbinfo.listhead), i = 0; inp && i < n; inp = LIST_NEXT(inp, inp_list)) { if (inp->inp_gencnt <= gencnt) { - if (cr_cansee(req->td->td_ucred, - inp->inp_socket->so_cred)) + if (cr_canseesocket(req->td->td_ucred, + inp->inp_socket)) continue; inp_list[i++] = inp; } @@ -937,7 +937,7 @@ error = ENOENT; goto out; } - error = cr_cansee(req->td->td_ucred, inp->inp_socket->so_cred); + error = cr_canseesocket(req->td->td_ucred, inp->inp_socket); if (error) goto out; cru2x(inp->inp_socket->so_cred, &xuc); @@ -989,7 +989,7 @@ error = ENOENT; goto out; } - error = cr_cansee(req->td->td_ucred, inp->inp_socket->so_cred); + error = cr_canseesocket(req->td->td_ucred, inp->inp_socket); if (error) goto out; cru2x(inp->inp_socket->so_cred, &xuc); ==== //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#7 (text+ko) ==== @@ -609,8 +609,8 @@ for (inp = LIST_FIRST(udbinfo.listhead), i = 0; inp && i < n; inp = LIST_NEXT(inp, inp_list)) { if (inp->inp_gencnt <= gencnt) { - if (cr_cansee(req->td->td_ucred, - inp->inp_socket->so_cred)) + if (cr_canseesocket(req->td->td_ucred, + inp->inp_socket)) continue; inp_list[i++] = inp; } @@ -674,7 +674,7 @@ error = ENOENT; goto out; } - error = cr_cansee(req->td->td_ucred, inp->inp_socket->so_cred); + error = cr_canseesocket(req->td->td_ucred, inp->inp_socket); if (error) goto out; cru2x(inp->inp_socket->so_cred, &xuc); ==== //depot/projects/trustedbsd/mac/sys/sys/systm.h#7 (text+ko) ==== @@ -101,6 +101,7 @@ struct mtx; struct proc; struct kse; +struct socket; struct thread; struct tty; struct ucred; @@ -197,6 +198,7 @@ int suser_xxx __P((struct ucred *cred, struct proc *proc, int flag)); int suser_xxx_td __P((struct ucred *cred, struct thread *thread, int flag)); int cr_cansee __P((struct ucred *u1, struct ucred *u2)); +int cr_canseesocket __P((struct ucred *u1, struct socket *so)); char *getenv __P((const char *name)); int getenv_int __P((const char *name, int *data)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 10:57:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E0CB37B400; Fri, 22 Mar 2002 10:57:23 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3011837B41C for ; Fri, 22 Mar 2002 10:57:19 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MIvJ765793 for perforce@freebsd.org; Fri, 22 Mar 2002 10:57:19 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Mar 2002 10:57:19 -0800 (PST) Message-Id: <200203221857.g2MIvJ765793@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8209 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8209 Change 8209 by rwatson@rwatson_paprika on 2002/03/22 10:57:02 The string 'Type Enforcement' slipped through when I created mac_none. Change it to something more innocuous. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#17 (text+ko) ==== @@ -71,7 +71,7 @@ SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, none, CTLFLAG_RW, 0, - "TrustedBSD Type Enforcement policy controls"); + "TrustedBSD mac_none policy controls"); static int mac_none_enabled = 0; SYSCTL_INT(_security_mac_none, OID_AUTO, enabled, CTLFLAG_RW, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 11:24:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA64037B417; Fri, 22 Mar 2002 11:24:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E601B37B400 for ; Fri, 22 Mar 2002 11:24:52 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MJOqR73506 for perforce@freebsd.org; Fri, 22 Mar 2002 11:24:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Mar 2002 11:24:52 -0800 (PST) Message-Id: <200203221924.g2MJOqR73506@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8210 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8210 Change 8210 by rwatson@rwatson_paprika on 2002/03/22 11:23:55 Fix inverted "private data" check, so that modules without label dependencies can be unloaded again. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#118 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#118 (text+ko) ==== @@ -270,7 +270,7 @@ /* * Don't allow unloading modules with private data. */ - if (mpc->mpc_field_off == -1) + if (mpc->mpc_field_off != -1) return (EBUSY); sx_xlock(&mac_policy_list_lock); if (mpc->mpc_ops->mpo_destroy != NULL) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 13:29: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6C7B37B404; Fri, 22 Mar 2002 13:27:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5CAD737B41C for ; Fri, 22 Mar 2002 13:27:34 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MLQNC01512 for perforce@freebsd.org; Fri, 22 Mar 2002 13:26:23 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Mar 2002 13:26:23 -0800 (PST) Message-Id: <200203222126.g2MLQNC01512@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8213 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8213 Change 8213 by rwatson@rwatson_curry on 2002/03/22 13:25:48 IFC from TrustedBSD base branch to TrustedBSD MAC branch. Integ of suffering: __P removal, various other things including cr_canseesocket() merge. Affected files ... ... //depot/projects/trustedbsd/mac/Makefile.inc1#9 integrate ... //depot/projects/trustedbsd/mac/Makefile.upgrade#2 integrate ... //depot/projects/trustedbsd/mac/UPDATING#8 integrate ... //depot/projects/trustedbsd/mac/bin/ls/lomac.c#4 integrate ... //depot/projects/trustedbsd/mac/bin/ls/lomac.h#2 integrate ... //depot/projects/trustedbsd/mac/bin/ps/lomac.c#4 integrate ... //depot/projects/trustedbsd/mac/bin/ps/lomac.h#3 integrate ... //depot/projects/trustedbsd/mac/bin/pwd/pwd.1#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ChangeLog#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/FREEBSD-upgrade#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/ChangeLog#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/coff-rs6000.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/coff64-rs6000.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/configure#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/configure.in#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/cpu-i386.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/archures.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/bfdt.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/coffcode.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/core.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/format.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/libbfd.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/opncls.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/reloc.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/section.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/syms.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/targets.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-ppc.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-x86-64.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elflink.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/ChangeLog#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/NEWS#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/README#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/addr2line.1#2 delete ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/ar.1#2 delete ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/defparse.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/defparse.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/addr2line.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/ar.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/binutils.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/cxxfilt.man#1 branch ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/dlltool.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/nm.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/objcopy.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/objdump.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/ranlib.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/readelf.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/size.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/strings.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/strip.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/nm.1#2 delete ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/objcopy.1#2 delete ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/objdump.1#2 delete ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/ranlib.1#2 delete ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/rclex.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/rcparse.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/rcparse.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/readelf.1#2 delete ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/size.1#2 delete ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/strings.1#2 delete ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/strip.1#2 delete ... //depot/projects/trustedbsd/mac/contrib/binutils/config.guess#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/config.sub#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/ChangeLog#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/NEWS#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-alpha.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-ia64.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-ppc.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/configure#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/configure.in#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/doc/as.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/doc/as.texinfo#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/doc/c-ppc.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/include/opcode/ChangeLog#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/include/opcode/ppc.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/ChangeLog#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/NEWS#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/configure.tgt#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf_x86_64.sh#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emultempl/elf32.em#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/ld.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/ld.texinfo#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/ChangeLog#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/configure#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/configure.in#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/i386-dis.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/ppc-dis.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/ppc-opc.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/ChangeLog#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/NEWS#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/c-common.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/c-lex.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/c-parse.in#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/cccp.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/combine.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/linux.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/mips.md#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sparc.md#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/crtstuff.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/cse.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/except.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/expr.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/f/version.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/final.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/flow.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/function.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/gcc.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/gcc.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/install.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/invoke.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/jump.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/just-fixinc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/loop.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/regmove.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/reload1.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/rtl.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/tm.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/toplev.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/varasm.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/version.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/BNF#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/kupgrade#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-2.2/kinstall#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-3/kinstall#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-4.0/kinstall#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD/kinstall#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/HISTORY#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/INSTALL.FreeBSD#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/IPFILTER.LICENCE#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/common.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/etc/protocols#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/fils.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/inet_addr.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_ipsec_pxy.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_lfil.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_netbios_pxy.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_sfil.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipf.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipfs.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_ef.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_hx.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_pc.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_sn.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_td.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_tx.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/iplang/iplang_y.y#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipmon.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipnat.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/44arp.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/arp.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ip.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipresend.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipsend.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipsopt.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/iptest.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/iptests.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/lsock.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/resend.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sbpf.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sirix.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/sock.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipt.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/kmem.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/kmem.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/man/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipf.4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipfilter.5#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipfs.8#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipl.4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipmon.8#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipnat.5#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipnat.8#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/misc.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/mlf_ipl.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/mli_ipl.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/mln_ipl.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/natparse.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/opt.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/parse.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/printnat.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/printstate.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/samples/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/samples/proxy.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/solaris.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f15#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f16#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/l1#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/l1.b#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni1#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni2#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f15#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f16#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ipf6-1#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/l1#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni1#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni2#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/logtest#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/mtest#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/natipftest#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/f15#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/f16#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ipf6-1#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/l1#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni1.ipf#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni1.nat#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni2.ipf#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni2.nat#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/todo#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/ChangeLog#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/INSTALL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/NEWS#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/README#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/THANKS#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/configure#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/configure.in#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/lukemftpd.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/cmds.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/conf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/extern.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/ftpcmd.y#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/ftpd.8#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/ftpd.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/ftpd.conf.5#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/ftpusers.5#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/popen.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/src/version.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftpd/todo#2 integrate ... //depot/projects/trustedbsd/mac/contrib/one-true-awk/README#3 integrate ... //depot/projects/trustedbsd/mac/contrib/one-true-awk/main.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/one-true-awk/makefile#3 branch ... //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/INSTALL#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/LICENSE#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/MANIFEST#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/README#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/bin/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/su.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_appl.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_constants.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_modules.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_types.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dispatch.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dynamic.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_findenv.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_get_option.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_impl.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_load.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_log.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_set_option.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_static.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_acct_mgmt.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate_secondary.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_chauthtok.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_close_session.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_end.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_error.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_authtok.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_data.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_item.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_mapped_authtok.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_mapped_username.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_user.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_getenv.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_getenvlist.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_info.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_open_session.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_prompt.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_putenv.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_data.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_item.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_mapped_authtok.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_mapped_username.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_setcred.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_setenv.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_acct_mgmt.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_authenticate.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_authenticate_secondary.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_chauthtok.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_close_session.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_get_mapped_username.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_open_session.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_set_mapped_username.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_setcred.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_start.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_strerror.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_verror.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vinfo.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vprompt.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/misc/gendoc.pl#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/pam_deny.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_dummy/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_dummy/pam_dummy.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/pam_permit.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/AUTHORS#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Changes#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Changes5.004#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Configure#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/EXTERN.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/INSTALL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/INTERN.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/MAINTAIN#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/MANIFEST#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Makefile.SH#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Policy_sh.SH#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Porting/Contract#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Porting/Glossary#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Porting/config.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Porting/config_H#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Porting/genlog#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Porting/makerel#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Porting/p4desc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Porting/patching.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Porting/pumpkin.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Porting/repository.pod#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/README#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/README.Y2K#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/README.posix-bc#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/Todo#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/Todo-5.005#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/Todo-5.6#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/XSlock.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/av.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/av.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/bytecode.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/bytecode.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/byterun.c#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/byterun.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/cflags.SH#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/config_h.SH#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/configpm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/configure.com#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/configure.gnu#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/cop.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/cv.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/deb.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/doio.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/doop.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/dosish.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/dump.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ebcdic.c#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/eg/cgi/dna.small.gif.uu#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/eg/cgi/wilogo.gif.uu#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/embed.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/embed.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/embedvar.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B/Asmdata.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B/Assembler.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B/Bytecode.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B/C.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B/CC.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B/Concise.pm#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B/Debug.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B/Deparse.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B/Disassembler.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B/Lint.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B/Showlex.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B/Stash.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/B/Terse.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/O.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/byteperl.c#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/defsubs_h.PL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/B/ramblings/flip-flop#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/ByteLoader/ByteLoader.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/ByteLoader/ByteLoader.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/ByteLoader/bytecode.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/ByteLoader/byterun.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/ByteLoader/byterun.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DB_File/Changes#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DB_File/DB_File.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DB_File/DB_File.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DB_File/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DB_File/dbinfo#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DB_File/typemap#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DB_File/version.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Data/Dumper/Dumper.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Data/Dumper/Dumper.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Devel/DProf/DProf.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Devel/Peek/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Devel/Peek/Peek.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Devel/Peek/Peek.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DynaLoader/DynaLoader_pm.PL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DynaLoader/XSLoader_pm.PL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DynaLoader/dl_aix.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DynaLoader/dl_cygwin32.xs#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DynaLoader/dl_dllload.xs#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DynaLoader/dl_dlopen.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DynaLoader/dl_mac.xs#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DynaLoader/hints/aix.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/DynaLoader/hints/netbsd.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Errno/ChangeLog#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Errno/Errno_pm.PL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Fcntl/Fcntl.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/File/Glob/Changes#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/File/Glob/Glob.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/File/Glob/Glob.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/File/Glob/bsd_glob.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/File/Glob/bsd_glob.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/GDBM_File/GDBM_File.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/GDBM_File/GDBM_File.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/GDBM_File/typemap#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/IO/IO.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/IO/lib/IO/Handle.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/IO/lib/IO/Poll.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/IO/lib/IO/Seekable.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/IO/lib/IO/Select.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/IO/lib/IO/Socket.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/IO/lib/IO/Socket/INET.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/IO/lib/IO/Socket/UNIX.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/IPC/SysV/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/IPC/SysV/SysV.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/NDBM_File/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/NDBM_File/NDBM_File.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/NDBM_File/NDBM_File.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/NDBM_File/typemap#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/ODBM_File/ODBM_File.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/ODBM_File/ODBM_File.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/ODBM_File/typemap#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Opcode/Opcode.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Opcode/Opcode.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/POSIX/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/POSIX/POSIX.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/POSIX/POSIX.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/POSIX/POSIX.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/POSIX/hints/svr4.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/POSIX/typemap#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/SDBM_File/SDBM_File.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/SDBM_File/SDBM_File.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/SDBM_File/sdbm/dbm.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/SDBM_File/sdbm/dbm.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/SDBM_File/sdbm/sdbm.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/SDBM_File/typemap#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Socket/Socket.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Socket/Socket.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Sys/Syslog/Syslog.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Sys/Syslog/Syslog.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Thread/Thread.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/Thread/Thread.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/re/Makefile.PL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/re/hints/aix.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/ext/re/re.xs#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/form.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/global.sym#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/globals.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/gv.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/gv.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/handy.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/README.hints#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/aix.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/bsdos.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/cygwin.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/cygwin32.sh#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/darwin.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/dec_osf.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/dos_djgpp.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/freebsd.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/hpux.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/irix_6.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/linux.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/machten.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/mint.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/mpeix.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/nonstopux.sh#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/openbsd.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/os2.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/os390.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/posix-bc.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/powerux.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/solaris_2.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/svr4.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/titanos.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/unicos.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/uts.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hints/vmesa.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hv.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/hv.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/installhtml#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/installman#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/installperl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/interp.sym#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/intrpvar.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/iperlsys.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/AutoLoader.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/AutoSplit.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Benchmark.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/CGI.pm#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/CGI/Apache.pm#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/CGI/Carp.pm#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/CGI/Cookie.pm#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/CGI/Fast.pm#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/CGI/Pretty.pm#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/CGI/Push.pm#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/CGI/Switch.pm#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/CPAN.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/CPAN/FirstTime.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Carp/Heavy.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Class/Struct.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Cwd.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/English.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/Command.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/Embed.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/Install.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/Liblist.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/MM_Cygwin.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/MM_OS2.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/MM_Unix.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/MM_VMS.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/MM_Win32.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/MakeMaker.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/Manifest.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/Mksymlists.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/typemap#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ExtUtils/xsubpp#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/File/Basename.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/File/Copy.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/File/Find.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/File/Path.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/File/Spec.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/File/Spec/Epoc.pm#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/File/Spec/Functions.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/File/Spec/Mac.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/File/Spec/OS2.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/File/Spec/Unix.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/File/Spec/VMS.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/File/Spec/Win32.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/File/Temp.pm#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/FileHandle.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Getopt/Long.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/IPC/Open3.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Math/BigFloat.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Math/BigInt.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Math/Complex.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Math/Trig.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Net/Ping.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Net/protoent.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/Checker.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/Find.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/Functions.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/Html.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/InputObjects.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/LaTeX.pm#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/Man.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/ParseUtils.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/Parser.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/Select.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/Text.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/Text/Color.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/Text/Overstrike.pm#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/Text/Termcap.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Pod/Usage.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/SelfLoader.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Shell.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Symbol.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Sys/Hostname.pm#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Sys/Syslog.pm#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Term/ANSIColor.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Term/ReadLine.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Test.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Test/Harness.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Text/ParseWords.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Text/Soundex.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Text/Tabs.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Text/Wrap.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Tie/Array.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Tie/Handle.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Tie/Hash.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Tie/RefHash.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Tie/Scalar.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Tie/SubstrHash.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/Win32.pod#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/base.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/bigint.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/bytes.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/charnames.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/diagnostics.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/fields.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/ftp.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/getopts.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/integer.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/lib.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/overload.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/perl5db.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/strict.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/syslog.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/termcap.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/ArabLink.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/ArabLnkGrp.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/ArabShap.txt#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/BidiMirr.txt#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Bidirectional.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Block.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/CaseFold.txt#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Category.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/CombiningClass.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/CompExcl.txt#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Decomposition.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/AlphabeticPresentationForms.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Arabic.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/ArabicPresentationForms-A.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/ArabicPresentationForms-B.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Armenian.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Arrows.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/BasicLatin.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Bengali.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/BlockElements.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Bopomofo.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/BopomofoExtended.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/BoxDrawing.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/BraillePatterns.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/CJKCompatibility.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/CJKCompatibilityForms.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/CJKCompatibilityIdeographs.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/CJKRadicalsSupplement.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/CJKSymbolsandPunctuation.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/CJKUnifiedIdeographs.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/CJKUnifiedIdeographsExtensionA.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Cherokee.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/CombiningDiacriticalMarks.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/CombiningHalfMarks.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/CombiningMarksforSymbols.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/ControlPictures.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/CurrencySymbols.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Cyrillic.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Devanagari.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Dingbats.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/EnclosedAlphanumerics.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/EnclosedCJKLettersandMonths.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Ethiopic.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/GeneralPunctuation.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/GeometricShapes.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Georgian.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Greek.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/GreekExtended.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Gujarati.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Gurmukhi.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/HalfwidthandFullwidthForms.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/HangulCompatibilityJamo.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/HangulJamo.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/HangulSyllables.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Hebrew.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/HighPrivateUseSurrogates.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/HighSurrogates.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Hiragana.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/IPAExtensions.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/IdeographicDescriptionCharacters.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Kanbun.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/KangxiRadicals.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Kannada.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Katakana.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Khmer.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Lao.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Latin-1Supplement.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/LatinExtended-A.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/LatinExtended-B.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/LatinExtendedAdditional.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/LetterlikeSymbols.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/LowSurrogates.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Malayalam.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/MathematicalOperators.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/MiscellaneousSymbols.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/MiscellaneousTechnical.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Mongolian.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Myanmar.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/NumberForms.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Ogham.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/OpticalCharacterRecognition.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Oriya.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/PrivateUse.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Runic.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Sinhala.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/SmallFormVariants.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/SpacingModifierLetters.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Specials.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/SuperscriptsandSubscripts.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Syriac.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Tamil.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Telugu.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Thaana.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Thai.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/Tibetan.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/UnifiedCanadianAboriginalSyllabics.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/YiRadicals.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/In/YiSyllables.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/ASCII.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Alnum.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Alpha.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiAL.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiAN.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiB.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiBN.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiCS.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiEN.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiES.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiET.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiL.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiLRE.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiLRO.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiNSM.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiON.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiPDF.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiR.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiRLE.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiRLO.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiS.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/BidiWS.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Blank.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/C.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Cc.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Cf.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Cn.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Cntrl.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Co.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Cs.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCcircle.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCcompat.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCfinal.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCfont.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCfraction.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCinital.pl#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCinitial.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCisolated.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCmedial.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCnarrow.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCnoBreak.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCsmall.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCsquare.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCsub.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCsuper.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCvertical.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DCwide.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DecoCanon.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/DecoCompat.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Digit.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Graph.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/L.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkAI.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkAL.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkB2.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkBA.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkBB.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkBK.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkCB.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkCL.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkCM.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkCR.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkEX.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkGL.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkHY.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkID.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkIN.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkIS.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkLF.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkNS.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkNU.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkOP.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkPO.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkPR.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkQU.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkSA.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkSG.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkSP.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkSY.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkXX.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/LbrkZW.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Ll.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Lm.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Lo.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Lower.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Lt.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Lu.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/M.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Mc.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Me.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Mirrored.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Mn.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/N.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Nd.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Nl.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/No.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/P.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Pc.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Pd.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Pe.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Pf.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Pi.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Po.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Print.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Ps.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Punct.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/S.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Sc.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Sk.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Sm.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/So.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Space.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SpacePerl.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylA.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylAA.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylAAI.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylAI.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylC.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylE.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylEE.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylI.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylII.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylN.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylO.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylOO.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylU.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylV.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylWA.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylWAA.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylWC.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylWE.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylWEE.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylWI.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylWII.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylWO.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylWOO.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylWU.pl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/SylWV.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Upper.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Word.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/XDigit.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Z.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Zl.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Zp.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Is/Zs.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Jamo.txt#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/JamoShort.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Name.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Number.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/PropList.txt#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Props.txt#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/README.perl#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/ReadMe.txt#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/SpecCase.txt#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/To/Digit.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/To/Lower.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/To/Title.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/To/Upper.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/UCD300.html#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/UCD301.html#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/UCDFF301.html#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Unicode.300#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Unicode.301#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/Unicode3.html#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/mktables.PL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/unicode/syllables.txt#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/utf8.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/vars.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/warnings.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/lib/warnings/register.pm#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/makedef.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/makedepend.SH#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/malloc.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/mg.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/mg.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/minimod.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/myconfig#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/myconfig.SH#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/objXSUB.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/objpp.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/op.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/op.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/opcode.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/opcode.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/opnames.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/patchlevel.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/perl.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/perl.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/perl_exp.SH#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/perlapi.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/perlapi.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/perlio.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/perlsdio.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/perlsfio.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/perly.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/perly.y#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/perly_c.diff#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/Makefile#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/Makefile.SH#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/Win32.pod#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/buildtoc#2 delete ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/buildtoc.PL#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perl.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perl5004delta.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perl5005delta.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlapi.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlbook.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlboot.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlcall.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlclib.pod#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlcompile.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perldata.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perldbmfilter.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perldebguts.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perldebtut.pod#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perldebug.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perldelta.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perldiag.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlebcdic.pod#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlembed.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlfaq.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlfaq1.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlfaq2.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlfaq3.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlfaq4.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlfaq5.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlfaq6.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlfaq7.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlfaq8.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlfaq9.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlfilter.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlfork.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlfunc.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlguts.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlhack.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlhist.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlintern.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlipc.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perllexwarn.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perllocale.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perllol.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlmod.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlmodinstall.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlmodlib.PL#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlmodlib.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlnewmod.pod#1 branch ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlnumber.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlobj.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlop.pod#2 integrate ... //depot/projects/trustedbsd/mac/contrib/perl5/pod/perlopentut.pod#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 14:13:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40D1D37B404; Fri, 22 Mar 2002 14:13:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 38DB337B41D for ; Fri, 22 Mar 2002 14:13:31 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MMDVw34831 for perforce@freebsd.org; Fri, 22 Mar 2002 14:13:31 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Mar 2002 14:13:31 -0800 (PST) Message-Id: <200203222213.g2MMDVw34831@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8215 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8215 Change 8215 by rwatson@rwatson_curry on 2002/03/22 14:13:21 Move policy field offset above LIST_ENTRY() in mpc so that we don't have to explicitly initialize the list entry. In the current code, this actually generated an error because the structure was being set to NULL rather than the elements of the list. Since we don't want to see inside opaque LIST_ENTRY, leave it at the end so it's implicitly initialized to 0's. Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#51 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#51 (text+ko) ==== @@ -205,8 +205,8 @@ char *mpc_name; /* policy name */ char *mpc_fullname; /* policy full name */ struct mac_policy_ops *mpc_ops; /* policy operations */ + int mpc_field_off; /* security field */ LIST_ENTRY(mac_policy_conf) mpc_list; /* global list */ - int mpc_field_off; /* security field */ }; #define MAC_POLICY_SET(mpops, mpname, mpfullname, privdata_wanted) \ @@ -214,7 +214,6 @@ #mpname, \ mpfullname, \ &mpops, \ - NULL, \ privdata_wanted \ }; \ static moduledata_t mpname ## _mod = { \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 14:21:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4456737B41C; Fri, 22 Mar 2002 14:21:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 72D0537B404 for ; Fri, 22 Mar 2002 14:21:41 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MMLfQ35939 for perforce@freebsd.org; Fri, 22 Mar 2002 14:21:41 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Mar 2002 14:21:41 -0800 (PST) Message-Id: <200203222221.g2MMLfQ35939@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8216 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8216 Change 8216 by rwatson@rwatson_curry on 2002/03/22 14:21:04 Use UMA zone interface, not old zone allocator. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#10 (text+ko) ==== @@ -279,7 +279,7 @@ error = 0; } if (error) { - zfree(namei_zone, cnp->cn_pnbuf); + uma_zfree(namei_zone, cnp->cn_pnbuf); if (ndp->ni_vp != NULL) { if (ndp->ni_vp != ndp->ni_dvp) vput(ndp->ni_vp); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 14:35:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96D9037B417; Fri, 22 Mar 2002 14:34:58 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C0F9B37B404 for ; Fri, 22 Mar 2002 14:34:57 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MMYva37602 for perforce@freebsd.org; Fri, 22 Mar 2002 14:34:57 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Mar 2002 14:34:57 -0800 (PST) Message-Id: <200203222234.g2MMYva37602@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8217 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8217 Change 8217 by rwatson@rwatson_paprika on 2002/03/22 14:34:02 Teach the MAC framework to seperately authorize the visibility of sockets using various socket listing management interfaces. Previously, it was clumped in with the ability to see other processes with management interfaces. Introduce MAC ACPI mac_cred_canseesocket() and place a reference to it in cr_canseesocket(). Implement it using a callout to the per-policy mpo_cred_check_see_socket() MAC Policy API. Key disabling enforcement to mac_enforce_socket, since it's a socket-related interface. Implement mpo_cred_check_see_socket() for various policies: babyaudit: ignore this entry point mac_biba: socket label must dominate subject label mac_bsdextended: always succeed mac_mls: subject label must dominate socket label mac_none: always succeed mac_seeotheruids: socket credential uid must be visible to subject uid mac_te: Introduce MAC_TE_CLASS_SOCKET and MAC_TE_OPERATION_SOCKET_SEE, and authorize the entry point using that class/operation pair. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#119 edit ... //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#15 edit ... //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#5 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#23 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#23 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#19 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#18 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#18 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#88 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#52 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#119 (text+ko) ==== @@ -333,6 +333,19 @@ } int +mac_cred_canseesocket(struct ucred *cred, struct socket *socket) +{ + int error; + + if (!mac_enforce_socket) + return (0); + + MAC_CHECK(cred_check_see_socket, cred, socket); + + return (error); +} + +int mac_cred_cansignal(struct ucred *cred, struct proc *proc, int signum) { int error; ==== //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#15 (text+ko) ==== @@ -1699,7 +1699,9 @@ return (ENOENT); #ifdef MAC - /* XXX: error = mac_cred_check_seesocket() here. */ + error = mac_cred_canseesocket(cred, so); + if (error) + return (error); #endif return (0); ==== //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#5 (text+ko) ==== @@ -261,6 +261,7 @@ NULL /* babyaudit_relabel_subject */, NULL /* babyaudit_bpfdesc_check_receive_from_ifnet */, NULL /* babyaudit_cred_check_see_cred */, + NULL /* babyaudit_cred_check_see_socket */, NULL /* babyaudit_cred_check_relabel_ifnet */, NULL /* babyaudit_cred_check_relabel_socket */, NULL /* babyaudit_cred_check_relabel_subject */, ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#23 (text+ko) ==== @@ -748,6 +748,17 @@ } static int +mac_biba_cred_check_see_socket(struct ucred *cred, struct socket *socket) +{ + + if (!mac_biba_enabled) + return (0); + if (!mac_biba_single_dominate(&socket->so_label, &cred->cr_label)) + return (ENOENT); + return (0); +} + +static int mac_biba_cred_cantouch(struct ucred *cred, struct proc *proc) { int error; @@ -1024,6 +1035,7 @@ mac_biba_relabel_subject, mac_biba_bpfdesc_check_receive_from_ifnet, mac_biba_cred_check_see_cred, + mac_biba_cred_check_see_socket, mac_biba_cred_check_relabel_ifnet, mac_biba_cred_check_relabel_socket, mac_biba_cred_check_relabel_subject, ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#23 (text+ko) ==== @@ -547,6 +547,17 @@ } static int +mac_bsdextended_cred_check_see_socket(struct ucred *cred, + struct socket *socket) +{ + + if (!mac_bsdextended_enabled) + return (0); + + return (0); +} + +static int mac_bsdextended_cred_cantouch(struct ucred *cred, struct proc *proc) { @@ -617,6 +628,7 @@ NULL, /* relabel subject */ NULL, /* bpfdesc check ifnet */ mac_bsdextended_cred_check_see_cred, + mac_bsdextended_cred_check_see_socket, NULL, /* check relabel ifnet */ NULL, /* check relabel socket */ NULL, /* check relabel subject */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#19 (text+ko) ==== @@ -717,6 +717,17 @@ } static int +mac_mls_cred_check_see_socket(struct ucred *cred, struct socket *socket) +{ + + if (!mac_mls_enabled) + return (0); + if (!mac_mls_single_dominate(&cred->cr_label, &socket->so_label)) + return (ENOENT); + return (0); +} + +static int mac_mls_cred_cantouch(struct ucred *cred, struct proc *proc) { int error; @@ -993,6 +1004,7 @@ mac_mls_relabel_subject, mac_mls_bpfdesc_check_receive_from_ifnet, mac_mls_cred_check_see_cred, + mac_mls_cred_check_see_socket, mac_mls_cred_check_relabel_ifnet, mac_mls_cred_check_relabel_socket, mac_mls_cred_check_relabel_subject, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#18 (text+ko) ==== @@ -405,6 +405,14 @@ } static int +mac_none_cred_check_see_socket(struct ucred *cred, struct socket *socket) +{ + + /* Perform access controlc heck here. */ + return (0); +} + +static int mac_none_cred_check_signal_proc(struct ucred *cred, struct proc *proc, int signum) { @@ -617,6 +625,7 @@ mac_none_relabel_subject, mac_none_bpfdesc_check_receive_from_ifnet, mac_none_cred_check_see_cred, + mac_none_cred_check_see_socket, mac_none_cred_check_relabel_ifnet, mac_none_cred_check_relabel_socket, mac_none_cred_check_relabel_subject, ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 (text+ko) ==== @@ -128,6 +128,14 @@ } static int +mac_seeotheruids_cred_check_see_socket(struct ucred *cred, + struct socket *socket) +{ + + return (mac_seeotheruids_check(cred, socket->so_cred)); +} + +static int mac_seeotheruids_cred_check_signal_proc(struct ucred *cred, struct proc *proc, int signum) { @@ -188,6 +196,7 @@ NULL, NULL, mac_seeotheruids_cred_check_see_cred, + mac_seeotheruids_cred_check_see_socket, NULL, NULL, NULL, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#18 (text+ko) ==== @@ -767,6 +767,14 @@ } static int +mac_te_cred_check_see_socket(struct ucred *cred, struct socket *socket) +{ + + return (mac_te_check(&cred->cr_label, &socket->so_label, + MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_SEE)); +} + +static int mac_te_cred_check_signal_proc(struct ucred *cred, struct proc *proc, int signum) { @@ -1070,6 +1078,7 @@ mac_te_relabel_subject, mac_te_bpfdesc_check_receive_from_ifnet, mac_te_cred_check_see_cred, + mac_te_cred_check_see_socket, mac_te_cred_check_relabel_ifnet, mac_te_cred_check_relabel_socket, mac_te_cred_check_relabel_subject, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#88 (text+ko) ==== @@ -180,6 +180,9 @@ #define MAC_TE_CLASS_BPF 6 #define MAC_TE_OPERATION_BPF_RECEIVE 1 +#define MAC_TE_CLASS_SOCKET 7 +#define MAC_TE_OPERATION_SOCKET_SEE 1 + struct mac_sebsd { uint32_t ms_psid; /* persistent sid storage */ }; @@ -378,6 +381,7 @@ int mac_cred_canexec(struct ucred *cred, struct mac *label); int mac_cred_cansched(struct ucred *cred, struct proc *proc); int mac_cred_cansee(struct ucred *u1, struct ucred *u2); +int mac_cred_canseesocket(struct ucred *cred, struct socket *socket); int mac_cred_cansignal(struct ucred *cred, struct proc *proc, int signum); #endif /* _KERNEL */ ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#52 (text+ko) ==== @@ -145,6 +145,8 @@ int (*mpo_bpfdesc_check_receive_from_ifnet)(struct bpf_d *bpf_d, struct ifnet *ifnet); int (*mpo_cred_check_see_cred)(struct ucred *u1, struct ucred *u2); + int (*mpo_cred_check_see_socket)(struct ucred *cred, + struct socket *socket); int (*mpo_cred_check_relabel_ifnet)(struct ucred *cred, struct ifnet *ifnet, struct mac *newlabel); int (*mpo_cred_check_relabel_socket)(struct ucred *cred, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 14:44:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E388637B419; Fri, 22 Mar 2002 14:44:09 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 34EE137B417 for ; Fri, 22 Mar 2002 14:44:09 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MMi9W38799 for perforce@freebsd.org; Fri, 22 Mar 2002 14:44:09 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Mar 2002 14:44:09 -0800 (PST) Message-Id: <200203222244.g2MMi9W38799@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8218 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8218 Change 8218 by rwatson@rwatson_paprika on 2002/03/22 14:43:29 Correct mis-merge in IFC. vnccess() should be vnaccess(). Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/vnode.h#18 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#18 (text+ko) ==== @@ -592,7 +592,7 @@ (p)->p_textvp, rb, rfb) int vn_fullpath(struct thread *td, struct vnode *optional_dvp, struct vnode *vn, char **retbuf, char **freebuf); -int vnccess(struct vnode *vp, mode_t file_mode, uid_t uid, gid_t gid, +int vnaccess(struct vnode *vp, mode_t file_mode, uid_t uid, gid_t gid, mode_t acc_mode, struct ucred *cred, int *privused); int vaccess_acl_posix1e(enum vtype type, uid_t file_uid, gid_t file_gid, struct acl *acl, mode_t acc_mode, struct ucred *cred, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 15:17:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADA9E37B417; Fri, 22 Mar 2002 15:17:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F305A37B419 for ; Fri, 22 Mar 2002 15:17:49 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MNHnP48231 for perforce@freebsd.org; Fri, 22 Mar 2002 15:17:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Mar 2002 15:17:49 -0800 (PST) Message-Id: <200203222317.g2MNHnP48231@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8219 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8219 Change 8219 by rwatson@rwatson_curry on 2002/03/22 15:17:17 Copyright date updates. Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#89 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_constant.h#6 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#53 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#89 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1999-2001 Robert N. M. Watson - * Copyright (c) 2001 Networks Associates Technology, Inc. + * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson + * Copyright (c) 2001, 2002 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. ==== //depot/projects/trustedbsd/mac/sys/sys/mac_constant.h#6 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1999-2001 Robert N. M. Watson - * Copyright (c) 2001 Networks Associates Technology, Inc. + * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson + * Copyright (c) 2001, 2002 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#53 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1999-2001 Robert N. M. Watson - * Copyright (c) 2001 Networks Associates Technology, Inc. + * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson + * Copyright (c) 2001, 2002 Networks Associates Technology, Inc. * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 15:31:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4068D37B419; Fri, 22 Mar 2002 15:31:07 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4BC3837B404 for ; Fri, 22 Mar 2002 15:31:06 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MNV6V53129 for perforce@freebsd.org; Fri, 22 Mar 2002 15:31:06 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 22 Mar 2002 15:31:06 -0800 (PST) Message-Id: <200203222331.g2MNV6V53129@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8220 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8220 Change 8220 by rwatson@rwatson_paprika on 2002/03/22 15:31:00 Introduce a run-time flags field into the struct mac_policy_conf, which will include a new flag, MPC_FLAG_REGISTERED, indicating whether the policy is actually registered. This assists in handling loadable kernel modules containing a policy already present and compiled into the kernel. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#120 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#54 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#120 (text+ko) ==== @@ -220,7 +220,11 @@ error = mac_policy_register(mpc); break; case MOD_UNLOAD: - error = mac_policy_unregister(mpc); + /* Don't unregister the module if it was never registered. */ + if ((mpc->mpc_runtime_flags & MPC_FLAG_REGISTERED) != 0) + error = mac_policy_unregister(mpc); + else + error = 0; break; default: } @@ -236,7 +240,7 @@ sx_xlock(&mac_policy_list_lock); LIST_FOREACH(tmpc, &mac_policy_list, mpc_list) { - if (!strcmp(tmpc->mpc_name, mpc->mpc_name)) { + if (strcmp(tmpc->mpc_name, mpc->mpc_name) == 0) { sx_xunlock(&mac_policy_list_lock); return (EEXIST); } @@ -252,6 +256,7 @@ mpc->mpc_field_off = slot; } else mpc->mpc_field_off = -1; + mpc->mpc_runtime_flags |= MPC_FLAG_REGISTERED; LIST_INSERT_HEAD(&mac_policy_list, mpc, mpc_list); printf("Security policy: %s (%s)\n", mpc->mpc_fullname, mpc->mpc_name); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#54 (text+ko) ==== @@ -208,15 +208,20 @@ char *mpc_fullname; /* policy full name */ struct mac_policy_ops *mpc_ops; /* policy operations */ int mpc_field_off; /* security field */ + int mpc_runtime_flags; /* flags */ LIST_ENTRY(mac_policy_conf) mpc_list; /* global list */ }; +/* Flags for the mpc_runtime_flags field. */ +#define MPC_FLAG_REGISTERED 0x00000001 + #define MAC_POLICY_SET(mpops, mpname, mpfullname, privdata_wanted) \ static struct mac_policy_conf mpname ## _mac_policy_conf = { \ #mpname, \ mpfullname, \ &mpops, \ - privdata_wanted \ + privdata_wanted, \ + 0 \ }; \ static moduledata_t mpname ## _mod = { \ #mpname, \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 16: 0: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1695637B404; Fri, 22 Mar 2002 15:58:51 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E54D737B417 for ; Fri, 22 Mar 2002 15:58:43 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2MNwh960224 for perforce@freebsd.org; Fri, 22 Mar 2002 15:58:43 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 22 Mar 2002 15:58:43 -0800 (PST) Message-Id: <200203222358.g2MNwh960224@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8223 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8223 Change 8223 by jhb@jhb_zion on 2002/03/22 15:58:06 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/interrupt.c#15 integrate ... //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#13 integrate ... //depot/projects/smpng/sys/alpha/pci/t2.c#15 integrate ... //depot/projects/smpng/sys/conf/files.powerpc#4 integrate ... //depot/projects/smpng/sys/dev/bge/if_bge.c#9 integrate ... //depot/projects/smpng/sys/dev/bge/if_bgereg.h#3 integrate ... //depot/projects/smpng/sys/dev/isp/isp.c#16 integrate ... //depot/projects/smpng/sys/dev/isp/isp_target.h#5 integrate ... //depot/projects/smpng/sys/dev/isp/ispvar.h#11 integrate ... //depot/projects/smpng/sys/dev/mii/brgphy.c#6 integrate ... //depot/projects/smpng/sys/dev/mii/miidevs#4 integrate ... //depot/projects/smpng/sys/dev/mii/miidevs.h#4 integrate ... //depot/projects/smpng/sys/i386/i386/trap.c#35 integrate ... //depot/projects/smpng/sys/i386/i386/vm_machdep.c#19 integrate ... //depot/projects/smpng/sys/kern/kern_linker.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#47 integrate ... //depot/projects/smpng/sys/kern/kern_sysctl.c#12 integrate ... //depot/projects/smpng/sys/kern/sys_pipe.c#11 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#24 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.c#17 integrate ... //depot/projects/smpng/sys/netinet/ip_icmp.c#12 integrate ... //depot/projects/smpng/sys/netinet/ip_mroute.c#9 integrate ... //depot/projects/smpng/sys/netinet/ip_output.c#18 integrate ... //depot/projects/smpng/sys/netinet/raw_ip.c#13 integrate ... //depot/projects/smpng/sys/netinet/tcp_subr.c#14 integrate ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#14 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#1 branch ... //depot/projects/smpng/sys/powerpc/powerpc/copyinstr.c#2 delete ... //depot/projects/smpng/sys/powerpc/powerpc/fubyte.c#2 delete ... //depot/projects/smpng/sys/powerpc/powerpc/fuword.c#2 delete ... //depot/projects/smpng/sys/powerpc/powerpc/subyte.c#2 delete ... //depot/projects/smpng/sys/powerpc/powerpc/suword.c#2 delete ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#15 integrate ... //depot/projects/smpng/sys/sys/ioccom.h#3 integrate ... //depot/projects/smpng/sys/sys/systm.h#23 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.66 2002/03/21 06:14:57 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.67 2002/03/22 15:55:56 gallatin Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /* @@ -300,7 +300,7 @@ /* disallow further machine checks */ mc_expected = 0; - if (rptr) { + if (rptr && mc_received == 0) { switch (size) { case sizeof (u_int8_t): *(volatile u_int8_t *)rptr = rcpt; ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.36 2002/03/20 02:27:55 jeff Exp $ + * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.37 2002/03/22 15:54:31 gallatin Exp $ */ #include @@ -536,7 +536,7 @@ printf("%s: releasing secondary CPUs\n", __func__); atomic_store_rel_int(&aps_ready, 1); - while (smp_started == 0) + while (mp_ncpus > 1 && smp_started == 0) ; /* nothing */ } ==== //depot/projects/smpng/sys/alpha/pci/t2.c#15 (text+ko) ==== @@ -45,7 +45,7 @@ * * * * ***************************************************************** * - * $FreeBSD: src/sys/alpha/pci/t2.c,v 1.15 2002/03/21 06:14:58 imp Exp $ + * $FreeBSD: src/sys/alpha/pci/t2.c,v 1.16 2002/03/21 18:48:00 gallatin Exp $ */ /* @@ -337,7 +337,7 @@ device_printf(dev, "using interrupt type %d on pci bus 0\n", pci_int_type[0]); - if (!badaddr((void *)&t2_csr[1]->tlbbr, sizeof(long))) { + if (!badaddr(__DEVOLATILE(void *, &t2_csr[1]->tlbbr), sizeof(long))) { pci_int_type[1] = 1; /* PCI1 always uses the new scheme */ /* Clear any errors that the BADADDR probe may have caused */ t2_csr[1]->cerr1 |= t2_csr[1]->cerr1; ==== //depot/projects/smpng/sys/conf/files.powerpc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.5 2002/03/05 09:19:01 ume Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.6 2002/03/21 23:45:49 benno Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -14,20 +14,17 @@ powerpc/powerpc/autoconf.c standard powerpc/powerpc/bcopy.c standard powerpc/powerpc/clock.c standard -powerpc/powerpc/copyinstr.c standard +powerpc/powerpc/copyinout.c standard powerpc/powerpc/copystr.c standard powerpc/powerpc/elf_machdep.c standard powerpc/powerpc/extintr.c standard -powerpc/powerpc/fubyte.c standard powerpc/powerpc/fuswintr.c standard -powerpc/powerpc/fuword.c standard powerpc/powerpc/machdep.c standard +powerpc/powerpc/nexus.c standard powerpc/powerpc/ofwmagic.s standard powerpc/powerpc/ofw_machdep.c standard powerpc/powerpc/pmap.c standard -powerpc/powerpc/subyte.c standard powerpc/powerpc/suswintr.c standard -powerpc/powerpc/suword.c standard powerpc/powerpc/syncicache.c standard powerpc/powerpc/sys_machdep.c standard powerpc/powerpc/swtch.s standard ==== //depot/projects/smpng/sys/dev/bge/if_bge.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.9 2002/03/20 02:03:28 alfred Exp $ + * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.10 2002/03/22 06:45:40 wpaul Exp $ */ /* @@ -57,7 +57,7 @@ * function in a 32-bit/64-bit 33/66Mhz bus, or a 64-bit/133Mhz bus. * * The BCM5701 is a single-chip solution incorporating both the BCM5700 - * MAC and a BCM5401 10/100/1000 PHY. Unlike the BCM5700, the BCM5700 + * MAC and a BCM5401 10/100/1000 PHY. Unlike the BCM5700, the BCM5701 * does not support external SSRAM. * * Broadcom also produces a variation of the BCM5700 under the "Altima" @@ -122,7 +122,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.9 2002/03/20 02:03:28 alfred Exp $"; + "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.10 2002/03/22 06:45:40 wpaul Exp $"; #endif /* @@ -479,6 +479,9 @@ sc = device_get_softc(dev); ifp = &sc->arpcom.ac_if; + if (sc->bge_asicrev == BGE_ASICREV_BCM5701_B5 && phy != 1) + return(0); + if (ifp->if_flags & IFF_RUNNING) BGE_CLRBIT(sc, BGE_MI_MODE, BGE_MIMODE_AUTOPOLL); @@ -1623,6 +1626,12 @@ ifp->if_capabilities = IFCAP_HWCSUM; ifp->if_capenable = ifp->if_capabilities; + /* Save ASIC rev. */ + + sc->bge_asicrev = + pci_read_config(dev, BGE_PCI_MISC_CTL, 4) & + BGE_PCIMISCCTL_ASICREV; + /* The SysKonnect SK-9D41 is a 1000baseSX card. */ if ((pci_read_config(dev, BGE_PCI_SUBSYS, 4) >> 16) == SK_SUBSYSID_9D41) sc->bge_tbi = 1; @@ -1981,9 +1990,11 @@ /* Process link state changes. */ if (sc->bge_rdata->bge_status_block.bge_status & BGE_STATFLAG_LINKSTATE_CHANGED) { - sc->bge_link = 0; - untimeout(bge_tick, sc, sc->bge_stat_ch); - bge_tick(sc); + if (sc->bge_asicrev != BGE_ASICREV_BCM5701_B5) { + sc->bge_link = 0; + untimeout(bge_tick, sc, sc->bge_stat_ch); + bge_tick(sc); + } /* ack the event to clear/reset it */ CSR_WRITE_4(sc, BGE_MAC_STS, BGE_MACSTAT_SYNC_CHANGED| BGE_MACSTAT_CFG_CHANGED); ==== //depot/projects/smpng/sys/dev/bge/if_bgereg.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.2 2002/01/27 01:00:16 jdp Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.3 2002/03/22 06:45:40 wpaul Exp $ */ /* @@ -217,6 +217,10 @@ #define BGE_ASICREV_BCM5700_B2 0x71030000 #define BGE_ASICREV_BCM5700_ALTIMA 0x71040000 #define BGE_ASICREV_BCM5700_C0 0x72000000 +#define BGE_ASICREV_BCM5701_A0 0x00000000 /* grrrr */ +#define BGE_ASICREV_BCM5701_B0 0x01000000 +#define BGE_ASICREV_BCM5701_B2 0x01020000 +#define BGE_ASICREV_BCM5701_B5 0x01050000 /* PCI DMA Read/Write Control register */ #define BGE_PCIDMARWCTL_MINDMA 0x000000FF @@ -2109,6 +2113,7 @@ u_int8_t bge_unit; /* interface number */ u_int8_t bge_extram; /* has external SSRAM */ u_int8_t bge_tbi; + u_int32_t bge_asicrev; struct bge_ring_data *bge_rdata; /* rings */ struct bge_chain_data bge_cdata; /* mbufs */ u_int16_t bge_tx_saved_considx; ==== //depot/projects/smpng/sys/dev/isp/isp.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.89 2002/03/07 17:32:45 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.90 2002/03/21 21:10:16 mjacob Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -2298,6 +2298,9 @@ return (0); } +#ifndef HICAP_MAX +#define HICAP_MAX 256 +#endif static int isp_scan_fabric(struct ispsoftc *isp) { @@ -2320,7 +2323,7 @@ first_portid = portid = fcp->isp_portid; fcp->isp_loopstate = LOOP_SCANNING_FABRIC; - for (first_portid_seen = hicap = 0; hicap < 65535; hicap++) { + for (first_portid_seen = hicap = 0; hicap < HICAP_MAX; hicap++) { mbreg_t mbs; sns_screq_t *rq; sns_ganrsp_t *rs0, *rs1; @@ -3133,6 +3136,7 @@ } else { iptr = READ_RESPONSE_QUEUE_IN_POINTER(isp); } + isp->isp_resodx = iptr; if (optr == iptr && sema == 0) { @@ -3167,9 +3171,15 @@ isr, junk, iptr, optr); } } + isp->isp_resodx = iptr; ISP_WRITE(isp, HCCR, HCCR_CMD_CLEAR_RISC_INT); ISP_WRITE(isp, BIU_SEMA, 0); + if (isp->isp_rspbsy) { + return; + } + isp->isp_rspbsy = 1; + while (optr != iptr) { ispstatusreq_t local, *sp = &local; isphdr_t *hp; @@ -3198,19 +3208,17 @@ } if (isp->isp_fpcchiwater < rio.req_header.rqs_seqno) isp->isp_fpcchiwater = rio.req_header.rqs_seqno; + MEMZERO(hp, QENTRY_LEN); /* PERF */ continue; } else { /* * Somebody reachable via isp_handle_other_response * may have updated the response queue pointers for - * us. + * us, so we reload our goal index. */ - oop = optr; - if (!isp_handle_other_response(isp, type, hp, &optr)) { + if (isp_handle_other_response(isp, type, hp, &optr)) { + iptr = isp->isp_resodx; MEMZERO(hp, QENTRY_LEN); /* PERF */ - if (oop != optr) { - goto out; - } continue; } @@ -3438,7 +3446,7 @@ } isp->isp_residx = optr; -out: + isp->isp_rspbsy = 0; for (i = 0; i < ndone; i++) { xs = complist[i]; if (xs) { @@ -3788,7 +3796,7 @@ switch (type) { case RQSTYPE_STATUS_CONT: isp_prt(isp, ISP_LOGINFO, "Ignored Continuation Response"); - return (0); + return (1); case RQSTYPE_ATIO: case RQSTYPE_CTIO: case RQSTYPE_ENABLE_LUN: @@ -3801,7 +3809,9 @@ case RQSTYPE_CTIO3: isp->isp_rsltccmplt++; /* count as a response completion */ #ifdef ISP_TARGET_MODE - return (isp_target_notify(isp, (ispstatusreq_t *) hp, optrp)); + if (isp_target_notify(isp, (ispstatusreq_t *) hp, optrp)) { + return (1); + } #else optrp = optrp; /* FALLTHROUGH */ @@ -3809,11 +3819,11 @@ case RQSTYPE_REQUEST: default: if (isp_async(isp, ISPASYNC_UNHANDLED_RESPONSE, hp)) { - return (0); + return (1); } isp_prt(isp, ISP_LOGWARN, "Unhandled Response Type 0x%x", isp_get_response_type(isp, hp)); - return (-1); + return (0); } } @@ -4117,18 +4127,16 @@ /* * No such port on the loop. Moral equivalent of SELTIMEO */ - isp_prt(isp, ISP_LOGINFO, - "Port Unavailable for target %d", XS_TGT(xs)); - if (XS_NOERR(xs)) { - XS_SETERR(xs, HBA_SELTIMEOUT); - } - return; case RQCS_PORT_LOGGED_OUT: /* * It was there (maybe)- treat as a selection timeout. */ - isp_prt(isp, ISP_LOGINFO, - "port logout for target %d", XS_TGT(xs)); + if ((sp->req_completion_status & 0xff) == RQCS_PORT_UNAVAILABLE) + isp_prt(isp, ISP_LOGINFO, + "Port Unavailable for target %d", XS_TGT(xs)); + else + isp_prt(isp, ISP_LOGINFO, + "port logout for target %d", XS_TGT(xs)); /* * If we're on a local loop, force a LIP (which is overkill) * to force a re-login of this unit. ==== //depot/projects/smpng/sys/dev/isp/isp_target.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_target.h,v 1.18 2002/02/04 21:04:25 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_target.h,v 1.19 2002/03/21 21:10:16 mjacob Exp $ */ /* * Qlogic Target Mode Structure and Flag Definitions * @@ -409,9 +409,9 @@ isphdr_t ct_header; u_int16_t ct_reserved; u_int16_t ct_fwhandle; /* just to match CTIO */ - u_int8_t ct_lun; /* lun */ - u_int8_t ct_iid; /* initiator id */ - u_int16_t ct_rxid; /* response ID */ + u_int8_t ct_lun; /* lun */ + u_int8_t ct_iid; /* initiator id */ + u_int16_t ct_rxid; /* response ID */ u_int16_t ct_flags; u_int16_t ct_status; /* isp status */ u_int16_t ct_timeout; ==== //depot/projects/smpng/sys/dev/isp/ispvar.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.54 2002/02/17 06:32:58 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.55 2002/03/21 21:10:16 mjacob Exp $ */ /* * Soft Definitions for for Qlogic ISP SCSI adapters. * @@ -73,7 +73,7 @@ void (*dv_reset0) (struct ispsoftc *); void (*dv_reset1) (struct ispsoftc *); void (*dv_dregs) (struct ispsoftc *, const char *); - const u_int16_t *dv_ispfw; /* ptr to f/w */ + u_int16_t *dv_ispfw; /* ptr to f/w */ u_int16_t dv_conf1; u_int16_t dv_clock; /* clock frequency */ }; @@ -396,6 +396,8 @@ volatile u_int16_t isp_reqodx; /* index of last ISP pickup */ volatile u_int16_t isp_reqidx; /* index of next request */ volatile u_int16_t isp_residx; /* index of next result */ + volatile u_int16_t isp_resodx; /* index of next result */ + volatile u_int16_t isp_rspbsy; volatile u_int16_t isp_lasthdls; /* last handle seed */ volatile u_int16_t isp_mboxtmp[MAX_MAILBOX]; volatile u_int16_t isp_lastmbxcmd; /* last mbox command sent */ ==== //depot/projects/smpng/sys/dev/mii/brgphy.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mii/brgphy.c,v 1.7 2002/03/20 02:07:29 alfred Exp $ + * $FreeBSD: src/sys/dev/mii/brgphy.c,v 1.8 2002/03/22 06:38:52 wpaul Exp $ */ /* @@ -59,7 +59,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.7 2002/03/20 02:07:29 alfred Exp $"; + "$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.8 2002/03/22 06:38:52 wpaul Exp $"; #endif static int brgphy_probe (device_t); @@ -115,6 +115,12 @@ return(0); } + if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxBROADCOM && + MII_MODEL(ma->mii_id2) == MII_MODEL_xxBROADCOM_BCM5701) { + device_set_desc(dev, MII_STR_xxBROADCOM_BCM5701); + return(0); + } + return(ENXIO); } ==== //depot/projects/smpng/sys/dev/mii/miidevs#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/mii/miidevs,v 1.16 2001/09/29 19:18:52 jlemon Exp $ +$FreeBSD: src/sys/dev/mii/miidevs,v 1.17 2002/03/22 06:38:52 wpaul Exp $ /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/ /*- @@ -108,6 +108,7 @@ model xxBROADCOM BCM5400 0x0004 Broadcom 1000baseTX PHY model xxBROADCOM BCM5401 0x0005 BCM5401 10/100/1000baseTX PHY model xxBROADCOM BCM5411 0x0007 BCM5411 10/100/1000baseTX PHY +model xxBROADCOM BCM5701 0x0011 BCM5701 10/100/1000baseTX PHY /* Davicom Semiconductor PHYs */ model xxDAVICOM DM9101 0x0000 DM9101 10/100 media interface ==== //depot/projects/smpng/sys/dev/mii/miidevs.h#4 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/mii/miidevs.h,v 1.15 2001/09/29 19:18:52 jlemon Exp $ */ +/* $FreeBSD: src/sys/dev/mii/miidevs.h,v 1.16 2002/03/22 06:39:13 wpaul Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/mii/miidevs,v 1.15 2001/09/04 22:00:33 wpaul Exp + * FreeBSD: src/sys/dev/mii/miidevs,v 1.17 2002/03/22 06:38:52 wpaul Exp */ /*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/ @@ -123,6 +123,8 @@ #define MII_STR_xxBROADCOM_BCM5401 "BCM5401 10/100/1000baseTX PHY" #define MII_MODEL_xxBROADCOM_BCM5411 0x0007 #define MII_STR_xxBROADCOM_BCM5411 "BCM5411 10/100/1000baseTX PHY" +#define MII_MODEL_xxBROADCOM_BCM5701 0x0011 +#define MII_STR_xxBROADCOM_BCM5701 "BCM5701 10/100/1000baseTX PHY" /* Davicom Semiconductor PHYs */ #define MII_MODEL_xxDAVICOM_DM9101 0x0000 ==== //depot/projects/smpng/sys/i386/i386/trap.c#35 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.219 2002/03/20 21:09:08 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.220 2002/03/21 19:27:15 alc Exp $ */ /* @@ -716,13 +716,13 @@ /* * Grow the stack if necessary */ - /* grow_stack returns false only if va falls into + /* vm_map_growstack fails only if va falls into * a growable stack region and the stack growth - * fails. It returns true if va was not within + * fails. It succeeds if va was not within * a growable stack region, or if the stack * growth succeeded. */ - if (!grow_stack (p, va)) + if (vm_map_growstack(p, va) != KERN_SUCCESS) rv = KERN_FAILURE; else /* Fault in the user page: */ @@ -901,7 +901,7 @@ ++p->p_lock; PROC_UNLOCK(p); - if (!grow_stack (p, va)) + if (vm_map_growstack(p, va) != KERN_SUCCESS) rv = KERN_FAILURE; else /* ==== //depot/projects/smpng/sys/i386/i386/vm_machdep.c#19 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.185 2002/03/21 06:19:07 imp Exp $ + * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.186 2002/03/21 19:27:15 alc Exp $ */ #include "opt_npx.h" @@ -514,20 +514,6 @@ while(1); } -int -grow_stack(p, sp) - struct proc *p; - u_int sp; -{ - int rv; - - rv = vm_map_growstack (p, sp); - if (rv != KERN_SUCCESS) - return (0); - - return (1); -} - /* * Software interrupt handler for queued VM system processing. */ ==== //depot/projects/smpng/sys/kern/kern_linker.c#14 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_linker.c,v 1.83 2002/03/21 15:27:39 arr Exp $ + * $FreeBSD: src/sys/kern/kern_linker.c,v 1.84 2002/03/22 04:56:09 arr Exp $ */ #include "opt_ddb.h" @@ -698,11 +698,11 @@ td->td_retval[0] = -1; + if (securelevel > 0) /* redundant, but that's OK */ + return (EPERM); + mtx_lock(&Giant); - if ((error = securelevel_gt(td->td_ucred, 0)) != 0) - goto out; - if ((error = suser_xxx(td->td_ucred, NULL, 0)) != 0) goto out; @@ -745,11 +745,11 @@ linker_file_t lf; int error = 0; + if (securelevel > 0) /* redundant, but that's OK */ + return (EPERM); + mtx_lock(&Giant); - if ((error = securelevel_gt(td->td_ucred, 0)) != 0) - goto out; - if ((error = suser_xxx(td->td_ucred, NULL, 0)) != 0) goto out; ==== //depot/projects/smpng/sys/kern/kern_prot.c#47 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_prot.c,v 1.141 2002/03/20 21:00:50 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_prot.c,v 1.146 2002/03/22 22:32:04 jhb Exp $ */ /* @@ -59,6 +59,8 @@ #include #include #include +#include +#include #include static MALLOC_DEFINE(M_CRED, "cred", "credentials"); @@ -163,9 +165,9 @@ { struct proc *p = td->td_proc; struct proc *pt; - int error, s; + int error; - s = mtx_lock_giant(kern_giant_proc); + mtx_lock(&Giant); error = 0; if (uap->pid == 0) { PROC_LOCK(p); @@ -179,7 +181,7 @@ td->td_retval[0] = pt->p_pgrp->pg_id; PROC_UNLOCK(pt); } - mtx_unlock_giant(s); + mtx_unlock(&Giant); return (error); } @@ -202,9 +204,8 @@ struct proc *p = td->td_proc; struct proc *pt; int error; - int s; - s = mtx_lock_giant(kern_giant_proc); + mtx_lock(&Giant); error = 0; if (uap->pid == 0) { PROC_LOCK(p); @@ -218,7 +219,7 @@ td->td_retval[0] = pt->p_session->s_sid; PROC_UNLOCK(pt); } - mtx_unlock_giant(s); + mtx_unlock(&Giant); return (error); } @@ -1337,7 +1338,7 @@ active_securelevel = securelevel; if (cr == NULL) - printf("securelevel_gt: cr is NULL\n"); + panic("securelevel_gt: cr is NULL\n"); if (cr->cr_prison != NULL) { mtx_lock(&cr->cr_prison->pr_mtx); active_securelevel = imax(cr->cr_prison->pr_securelevel, @@ -1354,7 +1355,7 @@ active_securelevel = securelevel; if (cr == NULL) - printf("securelevel_gt: cr is NULL\n"); + panic("securelevel_gt: cr is NULL\n"); if (cr->cr_prison != NULL) { mtx_lock(&cr->cr_prison->pr_mtx); active_securelevel = imax(cr->cr_prison->pr_securelevel, @@ -1376,6 +1377,25 @@ "Unprivileged processes may see subjects/objects with different real uid"); /*- + * Determine if u1 "can see" the subject specified by u2, according to the + * 'see_other_uids' policy. + * Returns: 0 for permitted, ESRCH otherwise + * Locks: none + * References: *u1 and *u2 must not change during the call + * u1 may equal u2, in which case only one reference is required + */ +static int +cr_seeotheruids(struct ucred *u1, struct ucred *u2) +{ + + if (!see_other_uids && u1->cr_ruid != u2->cr_ruid) { + if (suser_xxx(u1, NULL, PRISON_ROOT) != 0) + return (ESRCH); + } + return (0); +} + +/*- * Determine if u1 "can see" the subject specified by u2. * Returns: 0 for permitted, an errno value otherwise * Locks: none @@ -1389,10 +1409,8 @@ if ((error = prison_check(u1, u2))) return (error); - if (!see_other_uids && u1->cr_ruid != u2->cr_ruid) { - if (suser_xxx(u1, NULL, PRISON_ROOT) != 0) - return (ESRCH); - } + if ((error = cr_seeotheruids(u1, u2))) + return (error); return (0); } @@ -1430,6 +1448,9 @@ error = prison_check(cred, proc->p_ucred); if (error) return (error); + error = cr_seeotheruids(cred, proc->p_ucred); + if (error) + return (error); /* * UNIX signal semantics depend on the status of the P_SUGID @@ -1523,6 +1544,8 @@ return (0); if ((error = prison_check(p1->p_ucred, p2->p_ucred))) return (error); + if ((error = cr_seeotheruids(p1->p_ucred, p2->p_ucred))) + return (error); if (p1->p_ucred->cr_ruid == p2->p_ucred->cr_ruid) return (0); if (p1->p_ucred->cr_uid == p2->p_ucred->cr_ruid) @@ -1576,6 +1599,8 @@ return (0); if ((error = prison_check(p1->p_ucred, p2->p_ucred))) return (error); + if ((error = cr_seeotheruids(p1->p_ucred, p2->p_ucred))) + return (error); /* * Is p2's group set a subset of p1's effective group set? This @@ -1636,6 +1661,27 @@ return (0); } +/*- + * Determine whether the subject represented by cred can "see" a socket. + * Returns: 0 for permitted, ENOENT otherwise. + */ +int +cr_canseesocket(struct ucred *cred, struct socket *so) +{ + int error; + + error = prison_check(cred, so->so_cred); + if (error) + return (ENOENT); + if (cr_seeotheruids(cred, so->so_cred)) + return (ENOENT); +#ifdef MAC + /* XXX: error = mac_cred_check_seesocket() here. */ +#endif + + return (0); +} + /* * Allocate a zeroed cred structure. */ ==== //depot/projects/smpng/sys/kern/kern_sysctl.c#12 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_sysctl.c 8.4 (Berkeley) 4/14/94 - * $FreeBSD: src/sys/kern/kern_sysctl.c,v 1.121 2002/02/27 18:32:12 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_sysctl.c,v 1.122 2002/03/22 14:58:27 rwatson Exp $ */ #include "opt_compat.h" @@ -1067,32 +1067,26 @@ if (req->newptr && !(oid->oid_kind & CTLFLAG_WR)) return (EPERM); + KASSERT(req->td != NULL, ("sysctl_root(): req->td == NULL")); + /* Is this sysctl sensitive to securelevels? */ if (req->newptr && (oid->oid_kind & CTLFLAG_SECURE)) { - if (req->td == NULL) { - error = securelevel_gt(NULL, 0); /* XXX */ - if (error) - return (error); - } else { - error = securelevel_gt(req->td->td_ucred, 0); - if (error) - return (error); - } + error = securelevel_gt(req->td->td_ucred, 0); + if (error) + return (error); } /* Is this sysctl writable by only privileged users? */ if (req->newptr && !(oid->oid_kind & CTLFLAG_ANYBODY)) { - if (req->td != NULL) { - int flags; + int flags; - if (oid->oid_kind & CTLFLAG_PRISON) - flags = PRISON_ROOT; - else - flags = 0; - error = suser_xxx(NULL, req->td->td_proc, flags); - if (error) - return (error); - } + if (oid->oid_kind & CTLFLAG_PRISON) + flags = PRISON_ROOT; + else + flags = 0; + error = suser_xxx(NULL, req->td->td_proc, flags); + if (error) + return (error); } if (!oid->oid_handler) ==== //depot/projects/smpng/sys/kern/sys_pipe.c#11 (text+ko) ==== @@ -16,7 +16,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.98 2002/03/20 04:09:58 jeff Exp $ + * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.99 2002/03/22 16:09:22 alfred Exp $ */ /* @@ -708,8 +708,6 @@ PIPE_LOCK_ASSERT(wpipe, MA_OWNED); size = wpipe->pipe_map.cnt; pos = wpipe->pipe_map.pos; - bcopy((caddr_t) wpipe->pipe_map.kva + pos, - (caddr_t) wpipe->pipe_buffer.buffer, size); wpipe->pipe_buffer.in = size; wpipe->pipe_buffer.out = 0; @@ -717,6 +715,8 @@ wpipe->pipe_state &= ~PIPE_DIRECTW; PIPE_GET_GIANT(wpipe); + bcopy((caddr_t) wpipe->pipe_map.kva + pos, + (caddr_t) wpipe->pipe_buffer.buffer, size); pipe_destroy_write_buffer(wpipe); PIPE_DROP_GIANT(wpipe); } ==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#24 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.236 2002/03/21 15:27:39 arr Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.237 2002/03/22 04:56:09 arr Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -307,11 +307,6 @@ vput(vp); return error; } - error = securelevel_gt(td->td_ucred, 0); - if (error != 0) { - vput(vp); - return (EPERM); - } error = linker_load_file(fstype, &lf); if (error || lf == NULL) { vput(vp); ==== //depot/projects/smpng/sys/netinet/in_pcb.c#17 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.100 2002/03/20 05:48:55 jeff Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.101 2002/03/22 03:28:11 silby Exp $ */ #include "opt_ipsec.h" @@ -80,8 +80,8 @@ */ int ipport_lowfirstauto = IPPORT_RESERVED - 1; /* 1023 */ int ipport_lowlastauto = IPPORT_RESERVEDSTART; /* 600 */ -int ipport_firstauto = IPPORT_RESERVED; /* 1024 */ -int ipport_lastauto = IPPORT_USERRESERVED; /* 5000 */ +int ipport_firstauto = IPPORT_HIFIRSTAUTO; /* 49152 */ +int ipport_lastauto = IPPORT_HILASTAUTO; /* 65535 */ int ipport_hifirstauto = IPPORT_HIFIRSTAUTO; /* 49152 */ int ipport_hilastauto = IPPORT_HILASTAUTO; /* 65535 */ ==== //depot/projects/smpng/sys/netinet/ip_icmp.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.68 2002/03/19 21:25:46 alfred Exp $ + * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.69 2002/03/22 16:45:54 ru Exp $ */ #include "opt_ipsec.h" @@ -600,6 +600,8 @@ } t = ip->ip_dst; ip->ip_dst = ip->ip_src; + ro = &rt; + bzero(ro, sizeof(*ro)); /* * If the incoming packet was addressed directly to us, * use dst as the src for the reply. Otherwise (broadcast @@ -620,8 +622,6 @@ goto match; } } - ro = &rt; - bzero(ro, sizeof(*ro)); ia = ip_rtaddr(ip->ip_dst, ro); /* We need a route to do anything useful. */ if (ia == NULL) { ==== //depot/projects/smpng/sys/netinet/ip_mroute.c#9 (text+ko) ==== @@ -9,7 +9,7 @@ * Modified by Bill Fenner, PARC, April 1995 * * MROUTING Revision: 3.5 - * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.71 2002/03/19 21:25:46 alfred Exp $ + * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.72 2002/03/22 16:45:54 ru Exp $ */ #include "opt_mrouting.h" @@ -1867,6 +1867,7 @@ { struct ip_moptions imo; int error; + static struct route ro; int s = splnet(); if (vifp->v_flags & VIFF_TUNNEL) { @@ -1885,7 +1886,7 @@ * should get rejected because they appear to come from * the loopback interface, thus preventing looping. */ - error = ip_output(m, (struct mbuf *)0, NULL, + error = ip_output(m, (struct mbuf *)0, &ro, IP_FORWARDING, &imo); if (mrtdebug & DEBUG_XMIT) ==== //depot/projects/smpng/sys/netinet/ip_output.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/netinet/ip_output.c,v 1.152 2002/03/19 21:25:46 alfred Exp $ + * $FreeBSD: src/sys/netinet/ip_output.c,v 1.153 2002/03/22 16:45:54 ru Exp $ */ #define _IP_VHL >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 19: 1:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 936C837B41A; Fri, 22 Mar 2002 19:00:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F2B1637B419 for ; Fri, 22 Mar 2002 19:00:45 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2N30Qi07110 for perforce@freebsd.org; Fri, 22 Mar 2002 19:00:26 -0800 (PST) (envelope-from jake@freebsd.org) Date: Fri, 22 Mar 2002 19:00:26 -0800 (PST) Message-Id: <200203230300.g2N30Qi07110@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8230 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8230 Change 8230 by jake@jake_sparc64 on 2002/03/22 19:00:04 Integ low quality __P removals. Affected files ... ... //depot/projects/sparc64/bin/expr/Makefile#2 integrate ... //depot/projects/sparc64/bin/expr/expr.1#2 integrate ... //depot/projects/sparc64/bin/expr/expr.y#2 integrate ... //depot/projects/sparc64/bin/mv/mv.1#2 integrate ... //depot/projects/sparc64/bin/mv/mv.c#2 integrate ... //depot/projects/sparc64/bin/pax/sel_subs.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/NEWS#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/c-common.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/c-lex.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/c-parse.in#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/cccp.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/combine.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/config/i386/linux.h#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/config/mips/mips.md#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/config/sparc/sparc.md#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/crtstuff.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/cse.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/except.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/expr.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/f/version.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/final.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/flow.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/function.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/gcc.1#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/gcc.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/install.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/invoke.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/jump.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/just-fixinc#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/loop.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/regmove.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/reload1.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/rtl.h#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/tm.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/toplev.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/varasm.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/version.c#2 integrate ... //depot/projects/sparc64/contrib/openpam/HISTORY#3 integrate ... //depot/projects/sparc64/contrib/openpam/INSTALL#3 integrate ... //depot/projects/sparc64/contrib/openpam/LICENSE#3 integrate ... //depot/projects/sparc64/contrib/openpam/MANIFEST#3 integrate ... //depot/projects/sparc64/contrib/openpam/Makefile#3 integrate ... //depot/projects/sparc64/contrib/openpam/README#3 integrate ... //depot/projects/sparc64/contrib/openpam/RELNOTES#3 integrate ... //depot/projects/sparc64/contrib/openpam/bin/Makefile#3 integrate ... //depot/projects/sparc64/contrib/openpam/bin/su/Makefile#3 integrate ... //depot/projects/sparc64/contrib/openpam/bin/su/su.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/Makefile#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setenv.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_strerror.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_verror.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vinfo.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vprompt.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#3 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_appl.h#3 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_constants.h#3 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_modules.h#3 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_types.h#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/Makefile#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_dispatch.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_dynamic.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_findenv.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_get_option.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_impl.h#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_load.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_log.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_set_option.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_static.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_ttyconv.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_acct_mgmt.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate_secondary.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_chauthtok.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_close_session.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_end.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_error.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_data.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_item.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_mapped_authtok.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_mapped_username.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_user.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_getenv.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_getenvlist.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_info.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_open_session.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_prompt.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_putenv.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_data.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_item.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_mapped_authtok.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_mapped_username.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_setcred.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_setenv.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_acct_mgmt.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_authenticate.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_chauthtok.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_close_session.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_get_mapped_username.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_open_session.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_set_mapped_username.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_setcred.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_start.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_strerror.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_verror.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_vinfo.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_vprompt.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/misc/gendoc.pl#3 integrate ... //depot/projects/sparc64/contrib/openpam/modules/Makefile#3 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_deny/Makefile#3 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_deny/pam_deny.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_dummy/Makefile#3 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_dummy/pam_dummy.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_permit/Makefile#3 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_permit/pam_permit.c#3 integrate ... //depot/projects/sparc64/contrib/opie/BUG-REPORT#2 integrate ... //depot/projects/sparc64/contrib/opie/INSTALL#2 integrate ... //depot/projects/sparc64/contrib/opie/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/opie/README#2 integrate ... //depot/projects/sparc64/contrib/opie/acconfig.h#2 integrate ... //depot/projects/sparc64/contrib/opie/config.h.in#2 integrate ... //depot/projects/sparc64/contrib/opie/configure#2 integrate ... //depot/projects/sparc64/contrib/opie/configure.in#2 integrate ... //depot/projects/sparc64/contrib/opie/ftpcmd.y#2 integrate ... //depot/projects/sparc64/contrib/opie/glob.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libmissing/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/opie/libmissing/endutent.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libmissing/getutline.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libmissing/pututline.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libmissing/setutent.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/accessfile.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/atob8.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/btoa8.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/btoe.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/btoh.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/challenge.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/generator.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/getsequence.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/getutmpentry.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/hash.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/hashlen.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/insecure.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/keycrunch.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/lock.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/login.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/logwtmp.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/lookup.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/md4c.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/md5c.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/newseed.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/open.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/parsechallenge.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/passcheck.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/passwd.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/randomchallenge.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/readpass.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/readrec.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/unlock.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/verify.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/version.c#2 integrate ... //depot/projects/sparc64/contrib/opie/libopie/writerec.c#2 integrate ... //depot/projects/sparc64/contrib/opie/opie.4#2 integrate ... //depot/projects/sparc64/contrib/opie/opie.h#2 integrate ... //depot/projects/sparc64/contrib/opie/opie_cfg.h#2 integrate ... //depot/projects/sparc64/contrib/opie/opieaccess.5#2 integrate ... //depot/projects/sparc64/contrib/opie/opieauto.c#1 branch ... //depot/projects/sparc64/contrib/opie/opieftpd.8#2 integrate ... //depot/projects/sparc64/contrib/opie/opieftpd.c#2 integrate ... //depot/projects/sparc64/contrib/opie/opiegen.1#2 integrate ... //depot/projects/sparc64/contrib/opie/opiegen.c#2 integrate ... //depot/projects/sparc64/contrib/opie/opieinfo.1#2 integrate ... //depot/projects/sparc64/contrib/opie/opieinfo.c#2 integrate ... //depot/projects/sparc64/contrib/opie/opiekey.1#2 integrate ... //depot/projects/sparc64/contrib/opie/opiekey.c#2 integrate ... //depot/projects/sparc64/contrib/opie/opielogin.1#2 integrate ... //depot/projects/sparc64/contrib/opie/opielogin.c#2 integrate ... //depot/projects/sparc64/contrib/opie/opiepasswd.1#2 integrate ... //depot/projects/sparc64/contrib/opie/opiepasswd.c#2 integrate ... //depot/projects/sparc64/contrib/opie/opieserv.1#2 integrate ... //depot/projects/sparc64/contrib/opie/opieserv.c#2 integrate ... //depot/projects/sparc64/contrib/opie/opiesu.1#2 integrate ... //depot/projects/sparc64/contrib/opie/opiesu.c#2 integrate ... //depot/projects/sparc64/contrib/opie/opietest.c#2 integrate ... //depot/projects/sparc64/contrib/opie/permsfile.c#2 integrate ... //depot/projects/sparc64/contrib/opie/popen.c#2 integrate ... //depot/projects/sparc64/crypto/openssh/auth-pam.c#3 integrate ... //depot/projects/sparc64/crypto/openssh/auth1.c#3 integrate ... //depot/projects/sparc64/crypto/openssh/auth2-chall.c#3 integrate ... //depot/projects/sparc64/crypto/openssh/auth2-pam.c#1 branch ... //depot/projects/sparc64/etc/Makefile#3 integrate ... //depot/projects/sparc64/etc/mail/README#2 integrate ... //depot/projects/sparc64/etc/moduli#1 branch ... //depot/projects/sparc64/etc/primes#2 delete ... //depot/projects/sparc64/etc/rc#3 integrate ... //depot/projects/sparc64/etc/sendmail/freebsd.mc#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/Makefile.inc#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/man/makewhatis/makewhatis.perl#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/man/manpath/manpath.config#2 integrate ... //depot/projects/sparc64/include/Makefile#2 integrate ... //depot/projects/sparc64/include/grp.h#2 integrate ... //depot/projects/sparc64/include/pwd.h#2 integrate ... //depot/projects/sparc64/include/rpc/rpc.h#2 integrate ... //depot/projects/sparc64/include/rpcsvc/sm_inter.x#2 integrate ... //depot/projects/sparc64/include/stdlib.h#2 integrate ... //depot/projects/sparc64/lib/csu/powerpc/crt1.c#3 integrate ... //depot/projects/sparc64/lib/libatm/ip_checksum.c#2 integrate ... //depot/projects/sparc64/lib/libatm/libatm.h#2 integrate ... //depot/projects/sparc64/lib/libbind/Makefile#2 integrate ... //depot/projects/sparc64/lib/libc/alpha/SYS.h#2 integrate ... //depot/projects/sparc64/lib/libc/alpha/gen/Makefile.inc#3 integrate ... //depot/projects/sparc64/lib/libc/alpha/gen/isinf.c#3 integrate ... //depot/projects/sparc64/lib/libc/alpha/gen/ldexp.c#3 integrate ... //depot/projects/sparc64/lib/libc/compat-43/creat.c#2 integrate ... //depot/projects/sparc64/lib/libc/compat-43/gethostid.c#2 integrate ... //depot/projects/sparc64/lib/libc/compat-43/getwd.c#2 integrate ... //depot/projects/sparc64/lib/libc/compat-43/killpg.c#2 integrate ... //depot/projects/sparc64/lib/libc/compat-43/sethostid.c#2 integrate ... //depot/projects/sparc64/lib/libc/compat-43/setpgrp.c#2 integrate ... //depot/projects/sparc64/lib/libc/compat-43/setrgid.c#2 integrate ... //depot/projects/sparc64/lib/libc/compat-43/setruid.c#2 integrate ... //depot/projects/sparc64/lib/libc/compat-43/sigcompat.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_close.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_conv.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_debug.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_delete.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_get.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_open.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_overflow.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_page.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_put.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_search.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_seq.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_split.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_utils.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/btree.h#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/extern.h#2 integrate ... //depot/projects/sparc64/lib/libc/db/db/db.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/hash/extern.h#2 integrate ... //depot/projects/sparc64/lib/libc/db/hash/hash.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/hash/hash.h#2 integrate ... //depot/projects/sparc64/lib/libc/db/hash/hash_bigkey.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/hash/hash_buf.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/hash/hash_func.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/hash/hash_log2.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/hash/hash_page.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/hash/ndbm.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/hash/page.h#2 integrate ... //depot/projects/sparc64/lib/libc/db/mpool/mpool.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/recno/extern.h#2 integrate ... //depot/projects/sparc64/lib/libc/db/recno/rec_close.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/recno/rec_delete.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/recno/rec_get.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/recno/rec_open.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/recno/rec_put.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/recno/rec_search.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/recno/rec_seq.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/recno/rec_utils.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/recno/recno.h#2 integrate ... //depot/projects/sparc64/lib/libc/db/test/btree.tests/main.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/test/dbtest.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/test/hash.tests/driver2.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/test/hash.tests/tcreat3.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/test/hash.tests/tdel.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/test/hash.tests/thash4.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/test/hash.tests/tread2.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/test/hash.tests/tseq.c#2 integrate ... //depot/projects/sparc64/lib/libc/db/test/hash.tests/tverify.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/Makefile.inc#7 integrate ... //depot/projects/sparc64/lib/libc/gen/_rand48.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/arc4random.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/clock.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/confstr.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/ctermid.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/drand48.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/erand48.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/err.c#4 integrate ... //depot/projects/sparc64/lib/libc/gen/errlst.c#3 integrate ... //depot/projects/sparc64/lib/libc/gen/getbsize.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/getcap.c#3 integrate ... //depot/projects/sparc64/lib/libc/gen/getgrouplist.c#3 integrate ... //depot/projects/sparc64/lib/libc/gen/gethostname.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/getloadavg.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/jrand48.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/lcong48.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/lrand48.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/mrand48.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/msgctl.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/msgget.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/msgrcv.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/msgsnd.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/nice.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/nrand48.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/pw_scan.h#2 integrate ... //depot/projects/sparc64/lib/libc/gen/pwcache.3#4 integrate ... //depot/projects/sparc64/lib/libc/gen/pwcache.c#5 integrate ... //depot/projects/sparc64/lib/libc/gen/raise.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/seed48.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/semconfig.c#3 integrate ... //depot/projects/sparc64/lib/libc/gen/semctl.c#3 integrate ... //depot/projects/sparc64/lib/libc/gen/semget.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/semop.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/sethostname.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/siglist.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/sysctl.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/time.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/utime.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/valloc.c#2 integrate ... //depot/projects/sparc64/lib/libc/i386/SYS.h#4 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/Makefile.inc#3 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/frexp.c#2 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/infinity.c#2 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/isinf.c#2 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/ldexp.c#2 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/i386_clr_watch.c#2 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/i386_get_ioperm.c#2 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/i386_get_ldt.c#2 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/i386_set_ioperm.c#2 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/i386_set_ldt.c#2 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/i386_set_watch.c#2 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/i386_vm86.c#2 integrate ... //depot/projects/sparc64/lib/libc/ia64/SYS.h#2 integrate ... //depot/projects/sparc64/lib/libc/ia64/gen/fpgetmask.c#2 integrate ... //depot/projects/sparc64/lib/libc/ia64/gen/fpsetmask.c#2 integrate ... //depot/projects/sparc64/lib/libc/ia64/gen/frexp.c#2 integrate ... //depot/projects/sparc64/lib/libc/ia64/gen/infinity.c#2 integrate ... //depot/projects/sparc64/lib/libc/ia64/gen/isinf.c#2 integrate ... //depot/projects/sparc64/lib/libc/ia64/gen/ldexp.c#2 integrate ... //depot/projects/sparc64/lib/libc/ia64/gen/modf.c#2 integrate ... //depot/projects/sparc64/lib/libc/include/namespace.h#4 integrate ... //depot/projects/sparc64/lib/libc/include/spinlock.h#2 integrate ... //depot/projects/sparc64/lib/libc/locale/ansi.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/big5.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/collate.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/collate.h#3 integrate ... //depot/projects/sparc64/lib/libc/locale/collcmp.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/euc.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/fix_grouping.c#4 integrate ... //depot/projects/sparc64/lib/libc/locale/frune.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/isctype.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/ldpart.c#4 integrate ... //depot/projects/sparc64/lib/libc/locale/lmessages.c#5 integrate ... //depot/projects/sparc64/lib/libc/locale/lmonetary.c#4 integrate ... //depot/projects/sparc64/lib/libc/locale/lnumeric.c#3 integrate ... //depot/projects/sparc64/lib/libc/locale/localeconv.c#4 integrate ... //depot/projects/sparc64/lib/libc/locale/mbrune.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/mskanji.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/nl_langinfo.c#3 integrate ... //depot/projects/sparc64/lib/libc/locale/nomacros.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/none.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/rune.c#3 integrate ... //depot/projects/sparc64/lib/libc/locale/runetype.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/setinvalidrune.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/setlocale.c#3 integrate ... //depot/projects/sparc64/lib/libc/locale/setrunelocale.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/table.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/tolower.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/toupper.c#2 integrate ... //depot/projects/sparc64/lib/libc/locale/utf2.c#2 integrate ... //depot/projects/sparc64/lib/libc/mips/SYS.h#2 integrate ... //depot/projects/sparc64/lib/libc/mips/gen/flt_rounds.c#2 integrate ... //depot/projects/sparc64/lib/libc/mips/gen/fpgetmask.c#2 integrate ... //depot/projects/sparc64/lib/libc/mips/gen/fpgetround.c#2 integrate ... //depot/projects/sparc64/lib/libc/mips/gen/fpgetsticky.c#2 integrate ... //depot/projects/sparc64/lib/libc/mips/gen/fpsetmask.c#2 integrate ... //depot/projects/sparc64/lib/libc/mips/gen/fpsetround.c#2 integrate ... //depot/projects/sparc64/lib/libc/mipseb/SYS.h#2 integrate ... //depot/projects/sparc64/lib/libc/net/addr2ascii.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/ascii2addr.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/base64.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/getaddrinfo.c#4 integrate ... //depot/projects/sparc64/lib/libc/net/gethostbydns.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/gethostbyht.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/gethostbynis.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/gethostnamadr.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/getifaddrs.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/getnameinfo.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/getnetbydns.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/getnetbyht.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/getnetbynis.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/getnetnamadr.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/getproto.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/getprotoent.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/getprotoname.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/getservbyname.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/getservbyport.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/getservent.c#4 integrate ... //depot/projects/sparc64/lib/libc/net/herror.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/hesiod.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/ifname.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/inet_addr.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/inet_lnaof.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/inet_makeaddr.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/inet_net_ntop.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/inet_net_pton.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/inet_neta.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/inet_netof.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/inet_network.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/inet_ntoa.c#4 integrate ... //depot/projects/sparc64/lib/libc/net/inet_ntop.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/inet_pton.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/ip6opt.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/iso_addr.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/linkaddr.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/map_v4v6.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/name6.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/ns_addr.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/ns_name.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/ns_netint.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/ns_ntoa.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/ns_parse.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/ns_print.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/ns_ttl.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/nsap_addr.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/nsdispatch.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/nsparser.y#3 integrate ... //depot/projects/sparc64/lib/libc/net/rcmd.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/recv.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/res_comp.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/res_config.h#2 integrate ... //depot/projects/sparc64/lib/libc/net/res_data.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/res_debug.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/res_init.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/res_mkquery.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/res_mkupdate.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/res_query.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/res_send.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/res_update.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/rthdr.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/send.c#2 integrate ... //depot/projects/sparc64/lib/libc/net/vars.c#2 integrate ... //depot/projects/sparc64/lib/libc/nls/msgcat.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_calc_mask.c#3 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_copy.c#3 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_delete.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_delete_entry.c#3 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_entry.c#3 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_free.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_from_text.c#3 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_get.c#3 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_init.c#3 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_perm.c#3 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_set.c#3 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_size.c#3 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_support.c#3 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_to_text.c#4 integrate ... //depot/projects/sparc64/lib/libc/posix1e/acl_valid.c#3 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_clear.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_cmp.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_copy.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_dup.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_free.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_get_fd.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_get_file.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_get_flag.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_get_proc.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_init.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_set_fd.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_set_file.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_set_flag.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_set_proc.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/cap_text.c#2 integrate ... //depot/projects/sparc64/lib/libc/posix1e/extattr.c#3 integrate ... //depot/projects/sparc64/lib/libc/quad/TESTS/divrem.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/TESTS/mul.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/adddi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/anddi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/ashldi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/ashrdi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/cmpdi2.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/divdi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/fixdfdi.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/fixsfdi.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/fixunsdfdi.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/fixunssfdi.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/floatdidf.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/floatdisf.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/floatunsdidf.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/iordi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/lshldi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/lshrdi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/moddi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/muldi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/negdi2.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/notdi2.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/qdivrem.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/quad.h#2 integrate ... //depot/projects/sparc64/lib/libc/quad/subdi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/ucmpdi2.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/udivdi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/umoddi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/quad/xordi3.c#2 integrate ... //depot/projects/sparc64/lib/libc/regex/cclass.h#2 integrate ... //depot/projects/sparc64/lib/libc/regex/cname.h#2 integrate ... //depot/projects/sparc64/lib/libc/regex/engine.c#2 integrate ... //depot/projects/sparc64/lib/libc/regex/grot/debug.c#2 integrate ... //depot/projects/sparc64/lib/libc/regex/grot/limits.h#2 integrate ... //depot/projects/sparc64/lib/libc/regex/grot/main.c#2 integrate ... //depot/projects/sparc64/lib/libc/regex/grot/mkh#2 integrate ... //depot/projects/sparc64/lib/libc/regex/grot/split.c#2 integrate ... //depot/projects/sparc64/lib/libc/regex/grot/stdlib.h#2 integrate ... //depot/projects/sparc64/lib/libc/regex/regcomp.c#3 integrate ... //depot/projects/sparc64/lib/libc/regex/regerror.c#2 integrate ... //depot/projects/sparc64/lib/libc/regex/regex2.h#2 integrate ... //depot/projects/sparc64/lib/libc/regex/regexec.c#2 integrate ... //depot/projects/sparc64/lib/libc/regex/regfree.c#2 integrate ... //depot/projects/sparc64/lib/libc/regex/utils.h#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/auth_des.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/auth_none.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/auth_time.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/auth_unix.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/authdes_prot.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/authunix_prot.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/bindresvport.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/clnt_bcast.c#4 integrate ... //depot/projects/sparc64/lib/libc/rpc/clnt_dg.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/clnt_generic.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/clnt_perror.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/clnt_raw.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/clnt_simple.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/clnt_vc.c#4 integrate ... //depot/projects/sparc64/lib/libc/rpc/crypt_client.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/des_crypt.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/des_soft.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/getnetconfig.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/getnetpath.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/getpublickey.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/getrpcent.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/getrpcport.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/key_call.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/key_prot_xdr.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/mt_misc.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/netname.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/netnamer.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/pmap_clnt.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/pmap_getmaps.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/pmap_getport.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/pmap_prot.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/pmap_prot2.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/pmap_rmt.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/rpc_callmsg.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/rpc_com.h#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/rpc_commondata.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/rpc_dtablesize.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/rpc_generic.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/rpc_prot.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/rpc_soc.c#4 integrate ... //depot/projects/sparc64/lib/libc/rpc/rpcb_clnt.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/rpcb_prot.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/rpcb_st_xdr.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/rpcdname.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/rtime.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc_auth.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc_auth_des.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc_auth_unix.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc_dg.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc_generic.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc_raw.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc_run.c#2 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc_simple.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc_vc.c#4 integrate ... //depot/projects/sparc64/lib/libc/sparc64/SYS.h#13 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#7 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_add.c#4 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_arith.h#4 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_compare.c#6 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_div.c#4 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_emu.h#6 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_explode.c#4 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_extern.h#6 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_implode.c#5 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_mul.c#4 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_sqrt.c#4 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_subr.c#4 integrate ... //depot/projects/sparc64/lib/libc/sparc64/gen/infinity.c#7 integrate ... //depot/projects/sparc64/lib/libc/sparc64/gen/isinf.c#5 integrate ... //depot/projects/sparc64/lib/libc/sparc64/gen/ldexp.c#5 integrate ... //depot/projects/sparc64/lib/libc/stdio/_flock_stub.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/asprintf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/clrerr.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fclose.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fdopen.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/feof.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/ferror.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fflush.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fgetc.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fgetln.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fgetpos.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fgets.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fileno.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/findfp.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/flags.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/floatio.h#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fopen.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fprintf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fpurge.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fputc.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fputs.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fread.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/freopen.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fscanf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fseek.c#4 integrate ... //depot/projects/sparc64/lib/libc/stdio/fsetpos.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/ftell.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/funopen.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fvwrite.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fvwrite.h#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fwalk.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/fwrite.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/getc.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/getchar.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/gets.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/getw.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/glue.h#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/local.h#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/makebuf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/mktemp.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/perror.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/printf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/putc.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/putchar.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/puts.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/putw.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/refill.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/remove.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/rewind.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/rget.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/scanf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/setbuf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/setbuffer.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/setvbuf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/snprintf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/sprintf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/sscanf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/stdio.c#3 integrate ... //depot/projects/sparc64/lib/libc/stdio/tempnam.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/tmpfile.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/tmpnam.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/ungetc.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/vasprintf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/vfprintf.c#6 integrate ... //depot/projects/sparc64/lib/libc/stdio/vfscanf.c#4 integrate ... //depot/projects/sparc64/lib/libc/stdio/vprintf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/vscanf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/vsnprintf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/vsprintf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/vsscanf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/wbuf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdio/wsetup.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/abort.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/abs.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/atexit.c#3 integrate ... //depot/projects/sparc64/lib/libc/stdlib/atexit.h#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/atof.c#4 integrate ... //depot/projects/sparc64/lib/libc/stdlib/atoi.c#4 integrate ... //depot/projects/sparc64/lib/libc/stdlib/atol.c#4 integrate ... //depot/projects/sparc64/lib/libc/stdlib/atoll.c#4 integrate ... //depot/projects/sparc64/lib/libc/stdlib/bsearch.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/calloc.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/div.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/exit.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/getenv.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/getopt.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/getsubopt.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/hcreate.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/heapsort.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/labs.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/ldiv.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/malloc.c#6 integrate ... //depot/projects/sparc64/lib/libc/stdlib/merge.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/putenv.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/qsort.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/radixsort.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/rand.c#3 integrate ... //depot/projects/sparc64/lib/libc/stdlib/random.c#3 integrate ... //depot/projects/sparc64/lib/libc/stdlib/reallocf.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/realpath.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/setenv.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/strfmon.c#3 integrate ... //depot/projects/sparc64/lib/libc/stdlib/strhash.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/strtod.c#9 integrate ... //depot/projects/sparc64/lib/libc/stdlib/strtoimax.c#3 integrate ... //depot/projects/sparc64/lib/libc/stdlib/strtol.c#4 integrate ... //depot/projects/sparc64/lib/libc/stdlib/strtoll.c#4 integrate ... //depot/projects/sparc64/lib/libc/stdlib/strtoq.c#3 integrate ... //depot/projects/sparc64/lib/libc/stdlib/strtoul.c#4 integrate ... //depot/projects/sparc64/lib/libc/stdlib/strtoull.c#4 integrate ... //depot/projects/sparc64/lib/libc/stdlib/strtoumax.c#3 integrate ... //depot/projects/sparc64/lib/libc/stdlib/strtouq.c#3 integrate ... //depot/projects/sparc64/lib/libc/stdlib/system.c#3 integrate ... //depot/projects/sparc64/lib/libc/stdlib/tdelete.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/tfind.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/tsearch.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdlib/twalk.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdtime/asctime.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdtime/difftime.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdtime/localtime.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdtime/private.h#2 integrate ... //depot/projects/sparc64/lib/libc/stdtime/strftime.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdtime/strptime.c#2 integrate ... //depot/projects/sparc64/lib/libc/stdtime/time32.c#3 integrate ... //depot/projects/sparc64/lib/libc/stdtime/timelocal.c#4 integrate ... //depot/projects/sparc64/lib/libc/stdtime/tzfile.h#2 integrate ... //depot/projects/sparc64/lib/libc/string/bcmp.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/bcopy.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/bzero.c#2 integrate ... //depot/projects/sparc64/lib/libc/string/ffs.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/index.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/memccpy.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/memchr.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/memcmp.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/memcpy.c#2 integrate ... //depot/projects/sparc64/lib/libc/string/memmove.c#2 integrate ... //depot/projects/sparc64/lib/libc/string/memset.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/rindex.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strcasecmp.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strcasestr.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strcat.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strchr.c#2 integrate ... //depot/projects/sparc64/lib/libc/string/strcmp.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strcpy.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strcspn.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strlcat.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strlcpy.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strlen.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strmode.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strncat.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strncmp.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strncpy.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strpbrk.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strrchr.c#2 integrate ... //depot/projects/sparc64/lib/libc/string/strsep.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strsignal.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strspn.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strstr.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/strtok.c#4 integrate ... //depot/projects/sparc64/lib/libc/string/swab.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcscat.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcschr.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcscmp.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcscpy.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcscspn.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcslcat.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcslcpy.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcslen.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcsncat.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcsncmp.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcsncpy.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcspbrk.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcsrchr.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcsspn.c#4 integrate ... //depot/projects/sparc64/lib/libc/string/wcsstr.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wcswidth.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wmemchr.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wmemcmp.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wmemcpy.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wmemmove.c#3 integrate ... //depot/projects/sparc64/lib/libc/string/wmemset.c#3 integrate ... //depot/projects/sparc64/lib/libc/sys/__error.c#2 integrate ... //depot/projects/sparc64/lib/libc/sys/ftruncate.c#2 integrate ... //depot/projects/sparc64/lib/libc/sys/lseek.c#2 integrate ... //depot/projects/sparc64/lib/libc/sys/mmap.c#2 integrate ... //depot/projects/sparc64/lib/libc/sys/pread.c#2 integrate ... //depot/projects/sparc64/lib/libc/sys/pwrite.c#2 integrate ... //depot/projects/sparc64/lib/libc/sys/sigaction.2#3 integrate ... //depot/projects/sparc64/lib/libc/sys/truncate.c#2 integrate ... //depot/projects/sparc64/lib/libc/xdr/xdr.c#2 integrate ... //depot/projects/sparc64/lib/libc/xdr/xdr_array.c#2 integrate ... //depot/projects/sparc64/lib/libc/xdr/xdr_float.c#4 integrate ... //depot/projects/sparc64/lib/libc/xdr/xdr_mem.c#2 integrate ... //depot/projects/sparc64/lib/libc/xdr/xdr_rec.c#2 integrate ... //depot/projects/sparc64/lib/libc/xdr/xdr_reference.c#2 integrate ... //depot/projects/sparc64/lib/libc/xdr/xdr_sizeof.c#2 integrate ... //depot/projects/sparc64/lib/libc/xdr/xdr_stdio.c#3 integrate ... //depot/projects/sparc64/lib/libc/yp/xdryp.c#3 integrate ... //depot/projects/sparc64/lib/libc/yp/yplib.c#5 integrate ... //depot/projects/sparc64/lib/libcompat/4.3/insque.c#2 integrate ... //depot/projects/sparc64/lib/libcompat/4.3/lsearch.c#2 integrate ... //depot/projects/sparc64/lib/libcompat/4.3/remque.c#2 integrate ... //depot/projects/sparc64/lib/libcompat/4.4/cuserid.c#2 integrate ... //depot/projects/sparc64/lib/libcompat/regexp/regexp.c#2 integrate ... //depot/projects/sparc64/lib/libcompat/regexp/regsub.c#2 integrate ... //depot/projects/sparc64/lib/libdevstat/devstat.c#4 integrate ... //depot/projects/sparc64/lib/libedit/chared.h#2 integrate ... //depot/projects/sparc64/lib/libipsec/ipsec_dump_policy.c#2 integrate ... //depot/projects/sparc64/lib/libipsec/ipsec_strerror.h#2 integrate ... //depot/projects/sparc64/lib/libipsec/libpfkey.h#2 integrate ... //depot/projects/sparc64/lib/libipsec/pfkey.c#2 integrate ... //depot/projects/sparc64/lib/libipsec/pfkey_dump.c#2 integrate ... //depot/projects/sparc64/lib/libipsec/policy_parse.y#2 integrate ... //depot/projects/sparc64/lib/libipsec/policy_token.l#2 integrate ... //depot/projects/sparc64/lib/libipsec/test-policy.c#2 integrate ... //depot/projects/sparc64/lib/libipx/ipx_addr.c#2 integrate ... //depot/projects/sparc64/lib/libipx/ipx_ntoa.c#2 integrate ... //depot/projects/sparc64/lib/libkvm/kvm.c#3 integrate ... //depot/projects/sparc64/lib/libkvm/kvm.h#2 integrate ... //depot/projects/sparc64/lib/libkvm/kvm_file.c#2 integrate ... //depot/projects/sparc64/lib/libkvm/kvm_private.h#2 integrate ... //depot/projects/sparc64/lib/libkvm/kvm_proc.c#4 integrate ... //depot/projects/sparc64/lib/libkvm/kvm_sparc.c#2 integrate ... //depot/projects/sparc64/lib/libmd/md5c.c#2 integrate ... //depot/projects/sparc64/lib/libmd/rmd160c.c#2 integrate ... //depot/projects/sparc64/lib/libmd/sha0c.c#2 integrate ... //depot/projects/sparc64/lib/libmd/sha1c.c#2 integrate ... //depot/projects/sparc64/lib/libncp/ipx.c#2 integrate ... //depot/projects/sparc64/lib/libncurses/termcap.c#2 integrate ... //depot/projects/sparc64/lib/libopie/opieextra.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#2 integrate ... //depot/projects/sparc64/lib/librpcsvc/secretkey.c#2 integrate ... //depot/projects/sparc64/lib/librpcsvc/xcrypt.c#2 integrate ... //depot/projects/sparc64/lib/libstand/arp.c#2 integrate ... //depot/projects/sparc64/lib/libstand/bootp.c#2 integrate ... //depot/projects/sparc64/lib/libstand/ether.c#2 integrate ... //depot/projects/sparc64/lib/libstand/fstat.c#2 integrate ... //depot/projects/sparc64/lib/libstand/gets.c#2 integrate ... //depot/projects/sparc64/lib/libstand/in_cksum.c#2 integrate ... //depot/projects/sparc64/lib/libstand/ioctl.c#2 integrate ... //depot/projects/sparc64/lib/libstand/net.c#3 integrate ... //depot/projects/sparc64/lib/libstand/netif.c#3 integrate ... //depot/projects/sparc64/lib/libstand/nfs.c#2 integrate ... //depot/projects/sparc64/lib/libstand/printf.c#2 integrate ... //depot/projects/sparc64/lib/libstand/qdivrem.c#2 integrate ... //depot/projects/sparc64/lib/libstand/quad.h#2 integrate ... //depot/projects/sparc64/lib/libstand/random.c#2 integrate ... //depot/projects/sparc64/lib/libstand/rarp.c#2 integrate ... //depot/projects/sparc64/lib/libstand/rpc.c#2 integrate ... //depot/projects/sparc64/lib/libstand/splitfs.c#2 integrate ... //depot/projects/sparc64/lib/libstand/strcasecmp.c#2 integrate ... //depot/projects/sparc64/lib/libstand/strtol.c#2 integrate ... //depot/projects/sparc64/lib/libstand/tftp.c#2 integrate ... //depot/projects/sparc64/lib/libstand/udp.c#2 integrate ... //depot/projects/sparc64/lib/libstand/ufs.c#3 integrate ... //depot/projects/sparc64/lib/libstand/write.c#3 integrate ... //depot/projects/sparc64/lib/libusb/libusb.h#2 integrate ... //depot/projects/sparc64/lib/libutil/fparseln.c#2 integrate ... //depot/projects/sparc64/lib/libutil/libutil.h#2 integrate ... //depot/projects/sparc64/lib/libutil/login.c#2 integrate ... //depot/projects/sparc64/lib/libutil/login_cap.h#2 integrate ... //depot/projects/sparc64/lib/libutil/pty.c#2 integrate ... //depot/projects/sparc64/lib/msun/bsdsrc/b_exp.c#1 branch ... //depot/projects/sparc64/lib/msun/bsdsrc/b_log.c#1 branch ... //depot/projects/sparc64/lib/msun/bsdsrc/b_tgamma.c#1 branch ... //depot/projects/sparc64/lib/msun/bsdsrc/mathimpl.h#1 branch ... //depot/projects/sparc64/lib/msun/src/get_hw_float.c#2 integrate ... //depot/projects/sparc64/lib/msun/src/math.h#3 integrate ... //depot/projects/sparc64/lib/msun/src/math_private.h#5 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml#2 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate ... //depot/projects/sparc64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#3 integrate ... //depot/projects/sparc64/release/doc/share/sgml/release.dsl#2 integrate ... //depot/projects/sparc64/release/picobsd/build/picobsd#2 integrate ... //depot/projects/sparc64/sbin/Makefile#8 integrate ... //depot/projects/sparc64/sbin/fsdb/fsdb.c#3 integrate ... //depot/projects/sparc64/sbin/fsdb/fsdb.h#2 integrate ... //depot/projects/sparc64/sbin/fsdb/fsdbutil.c#2 integrate ... //depot/projects/sparc64/sbin/fsirand/fsirand.c#2 integrate ... //depot/projects/sparc64/sbin/ldconfig/ldconfig.c#3 integrate ... //depot/projects/sparc64/sbin/ldconfig/ldconfig.h#2 integrate ... //depot/projects/sparc64/sbin/mdconfig/mdconfig.c#2 integrate ... //depot/projects/sparc64/sbin/mount/extern.h#2 integrate ... //depot/projects/sparc64/sbin/mount/mntopts.h#2 integrate ... //depot/projects/sparc64/sbin/mount/mount.c#2 integrate ... //depot/projects/sparc64/sbin/mount/mount_ufs.c#2 integrate ... //depot/projects/sparc64/sbin/mount_ext2fs/mount_ext2fs.c#2 integrate ... //depot/projects/sparc64/sbin/mount_hpfs/mount_hpfs.c#2 integrate ... //depot/projects/sparc64/sbin/mount_ifs/extern.h#2 integrate ... //depot/projects/sparc64/sbin/mount_ifs/mount.c#2 integrate ... //depot/projects/sparc64/sbin/mount_ifs/mount_ufs.c#2 integrate ... //depot/projects/sparc64/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate ... //depot/projects/sparc64/sbin/mount_nfs/mount_nfs.c#3 integrate ... //depot/projects/sparc64/sbin/mount_ntfs/mount_ntfs.c#2 integrate ... //depot/projects/sparc64/sbin/mount_nullfs/mount_nullfs.c#2 integrate ... //depot/projects/sparc64/sbin/mount_portalfs/mount_portalfs.c#2 integrate ... //depot/projects/sparc64/sbin/mount_portalfs/portald.h#2 integrate ... //depot/projects/sparc64/sbin/mount_std/mount_std.c#2 integrate ... //depot/projects/sparc64/sbin/mount_umapfs/mount_umapfs.c#2 integrate ... //depot/projects/sparc64/sbin/mount_unionfs/mount_unionfs.c#2 integrate ... //depot/projects/sparc64/sbin/mountd/mountd.c#3 integrate ... //depot/projects/sparc64/sbin/nfsiod/nfsiod.c#2 integrate ... //depot/projects/sparc64/sbin/nos-tun/nos-tun.c#2 integrate ... //depot/projects/sparc64/sbin/ping6/ping6.c#3 integrate ... //depot/projects/sparc64/sbin/quotacheck/quotacheck.c#2 integrate ... //depot/projects/sparc64/sbin/route/route.c#3 integrate ... //depot/projects/sparc64/sbin/routed/radix.h#2 integrate ... //depot/projects/sparc64/sbin/savecore/savecore.c#3 integrate ... //depot/projects/sparc64/sbin/shutdown/shutdown.c#2 integrate ... //depot/projects/sparc64/sbin/slattach/slattach.c#2 integrate ... //depot/projects/sparc64/sbin/startslip/startslip.c#3 integrate ... //depot/projects/sparc64/sbin/swapon/swapon.c#3 integrate ... //depot/projects/sparc64/sbin/sysctl/pathconf.c#2 integrate ... //depot/projects/sparc64/sbin/tunefs/tunefs.c#2 integrate ... //depot/projects/sparc64/secure/usr.sbin/sshd/Makefile#3 integrate ... //depot/projects/sparc64/share/examples/Makefile#2 integrate ... //depot/projects/sparc64/share/examples/etc/make.conf#3 integrate ... //depot/projects/sparc64/share/examples/smbfs/Makefile#2 integrate ... //depot/projects/sparc64/share/man/man5/Makefile#2 integrate ... //depot/projects/sparc64/share/man/man5/make.conf.5#3 integrate ... //depot/projects/sparc64/share/man/man5/moduli.5#1 branch ... //depot/projects/sparc64/share/man/man8/picobsd.8#3 integrate ... //depot/projects/sparc64/share/misc/pci_vendors#2 integrate ... //depot/projects/sparc64/share/mk/bsd.lib.mk#8 integrate ... //depot/projects/sparc64/sys/alpha/alpha/db_interface.c#6 integrate ... //depot/projects/sparc64/sys/alpha/alpha/interrupt.c#12 integrate ... //depot/projects/sparc64/sys/alpha/alpha/machdep.c#22 integrate ... //depot/projects/sparc64/sys/alpha/alpha/mp_machdep.c#13 integrate ... //depot/projects/sparc64/sys/alpha/alpha/prom.c#7 integrate ... //depot/projects/sparc64/sys/alpha/alpha/trap.c#16 integrate ... //depot/projects/sparc64/sys/alpha/include/cpufunc.h#3 integrate ... //depot/projects/sparc64/sys/alpha/pci/cia.c#5 integrate ... //depot/projects/sparc64/sys/alpha/pci/t2.c#6 integrate ... //depot/projects/sparc64/sys/alpha/pci/t2_pci.c#5 integrate ... //depot/projects/sparc64/sys/conf/files.powerpc#4 integrate ... //depot/projects/sparc64/sys/dev/acpica/acpi_pcib.c#6 integrate ... //depot/projects/sparc64/sys/dev/bge/if_bge.c#8 integrate ... //depot/projects/sparc64/sys/dev/bge/if_bgereg.h#3 integrate ... //depot/projects/sparc64/sys/dev/isp/isp.c#15 integrate ... //depot/projects/sparc64/sys/dev/isp/isp_target.h#5 integrate ... //depot/projects/sparc64/sys/dev/isp/ispvar.h#9 integrate ... //depot/projects/sparc64/sys/dev/mii/brgphy.c#6 integrate ... //depot/projects/sparc64/sys/dev/mii/miidevs#4 integrate ... //depot/projects/sparc64/sys/dev/mii/miidevs.h#4 integrate ... //depot/projects/sparc64/sys/i386/i386/initcpu.c#7 integrate ... //depot/projects/sparc64/sys/i386/i386/perfmon.c#6 integrate ... //depot/projects/sparc64/sys/i386/i386/pmap.c#22 integrate ... //depot/projects/sparc64/sys/i386/i386/sys_machdep.c#11 integrate ... //depot/projects/sparc64/sys/i386/i386/trap.c#20 integrate ... //depot/projects/sparc64/sys/i386/i386/vm_machdep.c#15 integrate ... //depot/projects/sparc64/sys/i386/include/cpufunc.h#10 integrate ... //depot/projects/sparc64/sys/i386/isa/npx.c#16 integrate ... //depot/projects/sparc64/sys/ia64/ia64/db_interface.c#14 integrate ... //depot/projects/sparc64/sys/ia64/ia64/machdep.c#32 integrate ... //depot/projects/sparc64/sys/ia64/ia64/pmap.c#22 integrate ... //depot/projects/sparc64/sys/ia64/ia64/sapic.c#6 integrate ... //depot/projects/sparc64/sys/ia64/ia64/ssc.c#5 integrate ... //depot/projects/sparc64/sys/ia64/include/cpufunc.h#8 integrate ... //depot/projects/sparc64/sys/ia64/include/profile.h#5 integrate ... //depot/projects/sparc64/sys/kern/kern_fork.c#23 integrate ... //depot/projects/sparc64/sys/kern/kern_linker.c#14 integrate ... //depot/projects/sparc64/sys/kern/kern_prot.c#24 integrate ... //depot/projects/sparc64/sys/kern/kern_sysctl.c#11 integrate ... //depot/projects/sparc64/sys/kern/subr_trap.c#19 integrate ... //depot/projects/sparc64/sys/kern/subr_witness.c#18 integrate ... //depot/projects/sparc64/sys/kern/sys_pipe.c#14 integrate ... //depot/projects/sparc64/sys/kern/vfs_syscalls.c#22 integrate ... //depot/projects/sparc64/sys/modules/Makefile#27 integrate ... //depot/projects/sparc64/sys/netinet/in_pcb.c#15 integrate ... //depot/projects/sparc64/sys/netinet/ip_icmp.c#11 integrate ... //depot/projects/sparc64/sys/netinet/ip_mroute.c#9 integrate ... //depot/projects/sparc64/sys/netinet/ip_output.c#16 integrate ... //depot/projects/sparc64/sys/netinet/raw_ip.c#11 integrate ... //depot/projects/sparc64/sys/netinet/tcp_subr.c#13 integrate ... //depot/projects/sparc64/sys/netinet/udp_usrreq.c#13 integrate ... //depot/projects/sparc64/sys/powerpc/include/cpufunc.h#7 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/copyinout.c#1 branch ... //depot/projects/sparc64/sys/powerpc/powerpc/copyinstr.c#2 delete ... //depot/projects/sparc64/sys/powerpc/powerpc/fubyte.c#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 19: 8:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 061F437B41B; Fri, 22 Mar 2002 19:07:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B47C137B41A for ; Fri, 22 Mar 2002 19:07:01 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2N36rF14773 for perforce@freebsd.org; Fri, 22 Mar 2002 19:06:53 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 22 Mar 2002 19:06:53 -0800 (PST) Message-Id: <200203230306.g2N36rF14773@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8232 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8232 Change 8232 by peter@peter_thunder on 2002/03/22 19:06:28 IFC @8228 Affected files ... ... //depot/projects/ia64/bin/expr/Makefile#3 integrate ... //depot/projects/ia64/bin/expr/expr.1#2 integrate ... //depot/projects/ia64/bin/expr/expr.y#3 integrate ... //depot/projects/ia64/bin/mv/mv.1#2 integrate ... //depot/projects/ia64/bin/mv/mv.c#3 integrate ... //depot/projects/ia64/bin/pax/sel_subs.c#3 integrate ... //depot/projects/ia64/contrib/binutils/binutils/addr2line.1#2 delete ... //depot/projects/ia64/contrib/binutils/binutils/ar.1#2 delete ... //depot/projects/ia64/contrib/binutils/binutils/nm.1#2 delete ... //depot/projects/ia64/contrib/binutils/binutils/objcopy.1#2 delete ... //depot/projects/ia64/contrib/binutils/binutils/objdump.1#2 delete ... //depot/projects/ia64/contrib/binutils/binutils/ranlib.1#2 delete ... //depot/projects/ia64/contrib/binutils/binutils/readelf.1#2 delete ... //depot/projects/ia64/contrib/binutils/binutils/size.1#2 delete ... //depot/projects/ia64/contrib/binutils/binutils/strings.1#2 delete ... //depot/projects/ia64/contrib/binutils/binutils/strip.1#2 delete ... //depot/projects/ia64/contrib/openpam/HISTORY#3 integrate ... //depot/projects/ia64/contrib/openpam/INSTALL#3 integrate ... //depot/projects/ia64/contrib/openpam/LICENSE#3 integrate ... //depot/projects/ia64/contrib/openpam/MANIFEST#3 integrate ... //depot/projects/ia64/contrib/openpam/Makefile#3 integrate ... //depot/projects/ia64/contrib/openpam/README#3 integrate ... //depot/projects/ia64/contrib/openpam/RELNOTES#3 integrate ... //depot/projects/ia64/contrib/openpam/bin/Makefile#3 integrate ... //depot/projects/ia64/contrib/openpam/bin/su/Makefile#3 integrate ... //depot/projects/ia64/contrib/openpam/bin/su/su.c#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/Makefile#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/Makefile#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#3 integrate ... //depot/projects/ia64/contrib/openpam/include/security/openpam.h#3 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_appl.h#3 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_constants.h#3 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_modules.h#3 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_types.h#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/Makefile#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_dispatch.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_findenv.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_get_option.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_load.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_set_option.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_static.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_acct_mgmt.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_authenticate.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_authenticate_secondary.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_chauthtok.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_close_session.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_end.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_error.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_data.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_item.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_authtok.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_username.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_user.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_getenv.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_getenvlist.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_info.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_open_session.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_prompt.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_putenv.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_set_data.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_set_item.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_authtok.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_username.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_setcred.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_setenv.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_acct_mgmt.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_chauthtok.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_close_session.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_username.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_open_session.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_username.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_setcred.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_start.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_strerror.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_verror.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_vinfo.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_vprompt.c#3 integrate ... //depot/projects/ia64/contrib/openpam/misc/gendoc.pl#3 integrate ... //depot/projects/ia64/contrib/openpam/modules/Makefile#3 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_deny/Makefile#3 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_deny/pam_deny.c#3 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_dummy/Makefile#3 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_dummy/pam_dummy.c#3 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_permit/Makefile#3 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_permit/pam_permit.c#3 integrate ... //depot/projects/ia64/contrib/opie/BUG-REPORT#2 integrate ... //depot/projects/ia64/contrib/opie/INSTALL#2 integrate ... //depot/projects/ia64/contrib/opie/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/opie/README#2 integrate ... //depot/projects/ia64/contrib/opie/acconfig.h#2 integrate ... //depot/projects/ia64/contrib/opie/config.h.in#2 integrate ... //depot/projects/ia64/contrib/opie/configure#2 integrate ... //depot/projects/ia64/contrib/opie/configure.in#2 integrate ... //depot/projects/ia64/contrib/opie/ftpcmd.y#2 integrate ... //depot/projects/ia64/contrib/opie/glob.c#2 integrate ... //depot/projects/ia64/contrib/opie/libmissing/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/opie/libmissing/endutent.c#2 integrate ... //depot/projects/ia64/contrib/opie/libmissing/getutline.c#2 integrate ... //depot/projects/ia64/contrib/opie/libmissing/pututline.c#2 integrate ... //depot/projects/ia64/contrib/opie/libmissing/setutent.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/accessfile.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/atob8.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/btoa8.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/btoe.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/btoh.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/challenge.c#3 integrate ... //depot/projects/ia64/contrib/opie/libopie/generator.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/getsequence.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/getutmpentry.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/hash.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/hashlen.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/insecure.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/keycrunch.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/lock.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/login.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/logwtmp.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/lookup.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/md4c.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/md5c.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/newseed.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/open.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/parsechallenge.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/passcheck.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/passwd.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/randomchallenge.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/readpass.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/readrec.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/unlock.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/verify.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/version.c#2 integrate ... //depot/projects/ia64/contrib/opie/libopie/writerec.c#3 integrate ... //depot/projects/ia64/contrib/opie/opie.4#2 integrate ... //depot/projects/ia64/contrib/opie/opie.h#2 integrate ... //depot/projects/ia64/contrib/opie/opie_cfg.h#2 integrate ... //depot/projects/ia64/contrib/opie/opieaccess.5#2 integrate ... //depot/projects/ia64/contrib/opie/opieauto.c#1 branch ... //depot/projects/ia64/contrib/opie/opieftpd.8#2 integrate ... //depot/projects/ia64/contrib/opie/opieftpd.c#2 integrate ... //depot/projects/ia64/contrib/opie/opiegen.1#2 integrate ... //depot/projects/ia64/contrib/opie/opiegen.c#2 integrate ... //depot/projects/ia64/contrib/opie/opieinfo.1#2 integrate ... //depot/projects/ia64/contrib/opie/opieinfo.c#2 integrate ... //depot/projects/ia64/contrib/opie/opiekey.1#2 integrate ... //depot/projects/ia64/contrib/opie/opiekey.c#3 integrate ... //depot/projects/ia64/contrib/opie/opielogin.1#2 integrate ... //depot/projects/ia64/contrib/opie/opielogin.c#2 integrate ... //depot/projects/ia64/contrib/opie/opiepasswd.1#2 integrate ... //depot/projects/ia64/contrib/opie/opiepasswd.c#2 integrate ... //depot/projects/ia64/contrib/opie/opieserv.1#2 integrate ... //depot/projects/ia64/contrib/opie/opieserv.c#2 integrate ... //depot/projects/ia64/contrib/opie/opiesu.1#2 integrate ... //depot/projects/ia64/contrib/opie/opiesu.c#2 integrate ... //depot/projects/ia64/contrib/opie/opietest.c#2 integrate ... //depot/projects/ia64/contrib/opie/permsfile.c#2 integrate ... //depot/projects/ia64/contrib/opie/popen.c#2 integrate ... //depot/projects/ia64/crypto/openssh/auth-pam.c#3 integrate ... //depot/projects/ia64/crypto/openssh/auth1.c#3 integrate ... //depot/projects/ia64/crypto/openssh/auth2-chall.c#3 integrate ... //depot/projects/ia64/crypto/openssh/auth2-pam.c#1 branch ... //depot/projects/ia64/etc/Makefile#7 integrate ... //depot/projects/ia64/etc/mail/README#3 integrate ... //depot/projects/ia64/etc/moduli#1 branch ... //depot/projects/ia64/etc/primes#2 delete ... //depot/projects/ia64/etc/rc#7 integrate ... //depot/projects/ia64/etc/sendmail/freebsd.mc#4 integrate ... //depot/projects/ia64/gnu/usr.bin/man/makewhatis/makewhatis.perl#2 integrate ... //depot/projects/ia64/gnu/usr.bin/man/manpath/manpath.config#2 integrate ... //depot/projects/ia64/include/Makefile#7 integrate ... //depot/projects/ia64/include/grp.h#3 integrate ... //depot/projects/ia64/include/pwd.h#3 integrate ... //depot/projects/ia64/include/rpc/rpc.h#2 integrate ... //depot/projects/ia64/include/rpcsvc/sm_inter.x#2 integrate ... //depot/projects/ia64/include/stdlib.h#5 integrate ... //depot/projects/ia64/lib/csu/powerpc/crt1.c#3 integrate ... //depot/projects/ia64/lib/libatm/ip_checksum.c#2 integrate ... //depot/projects/ia64/lib/libatm/libatm.h#2 integrate ... //depot/projects/ia64/lib/libbind/Makefile#2 integrate ... //depot/projects/ia64/lib/libc/alpha/SYS.h#2 integrate ... //depot/projects/ia64/lib/libc/alpha/gen/Makefile.inc#4 integrate ... //depot/projects/ia64/lib/libc/alpha/gen/isinf.c#3 integrate ... //depot/projects/ia64/lib/libc/alpha/gen/ldexp.c#3 integrate ... //depot/projects/ia64/lib/libc/compat-43/creat.c#2 integrate ... //depot/projects/ia64/lib/libc/compat-43/gethostid.c#2 integrate ... //depot/projects/ia64/lib/libc/compat-43/getwd.c#2 integrate ... //depot/projects/ia64/lib/libc/compat-43/killpg.c#2 integrate ... //depot/projects/ia64/lib/libc/compat-43/sethostid.c#2 integrate ... //depot/projects/ia64/lib/libc/compat-43/setpgrp.c#2 integrate ... //depot/projects/ia64/lib/libc/compat-43/setrgid.c#2 integrate ... //depot/projects/ia64/lib/libc/compat-43/setruid.c#2 integrate ... //depot/projects/ia64/lib/libc/compat-43/sigcompat.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_close.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_conv.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_debug.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_delete.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_get.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_open.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_overflow.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_page.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_put.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_search.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_seq.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_split.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_utils.c#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/btree.h#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/extern.h#2 integrate ... //depot/projects/ia64/lib/libc/db/db/db.c#2 integrate ... //depot/projects/ia64/lib/libc/db/hash/extern.h#2 integrate ... //depot/projects/ia64/lib/libc/db/hash/hash.c#2 integrate ... //depot/projects/ia64/lib/libc/db/hash/hash.h#2 integrate ... //depot/projects/ia64/lib/libc/db/hash/hash_bigkey.c#2 integrate ... //depot/projects/ia64/lib/libc/db/hash/hash_buf.c#2 integrate ... //depot/projects/ia64/lib/libc/db/hash/hash_func.c#2 integrate ... //depot/projects/ia64/lib/libc/db/hash/hash_log2.c#2 integrate ... //depot/projects/ia64/lib/libc/db/hash/hash_page.c#2 integrate ... //depot/projects/ia64/lib/libc/db/hash/ndbm.c#2 integrate ... //depot/projects/ia64/lib/libc/db/hash/page.h#2 integrate ... //depot/projects/ia64/lib/libc/db/mpool/mpool.c#2 integrate ... //depot/projects/ia64/lib/libc/db/recno/extern.h#2 integrate ... //depot/projects/ia64/lib/libc/db/recno/rec_close.c#2 integrate ... //depot/projects/ia64/lib/libc/db/recno/rec_delete.c#2 integrate ... //depot/projects/ia64/lib/libc/db/recno/rec_get.c#2 integrate ... //depot/projects/ia64/lib/libc/db/recno/rec_open.c#2 integrate ... //depot/projects/ia64/lib/libc/db/recno/rec_put.c#2 integrate ... //depot/projects/ia64/lib/libc/db/recno/rec_search.c#2 integrate ... //depot/projects/ia64/lib/libc/db/recno/rec_seq.c#2 integrate ... //depot/projects/ia64/lib/libc/db/recno/rec_utils.c#2 integrate ... //depot/projects/ia64/lib/libc/db/recno/recno.h#2 integrate ... //depot/projects/ia64/lib/libc/db/test/btree.tests/main.c#2 integrate ... //depot/projects/ia64/lib/libc/db/test/dbtest.c#2 integrate ... //depot/projects/ia64/lib/libc/db/test/hash.tests/driver2.c#2 integrate ... //depot/projects/ia64/lib/libc/db/test/hash.tests/tcreat3.c#2 integrate ... //depot/projects/ia64/lib/libc/db/test/hash.tests/tdel.c#2 integrate ... //depot/projects/ia64/lib/libc/db/test/hash.tests/thash4.c#2 integrate ... //depot/projects/ia64/lib/libc/db/test/hash.tests/tread2.c#2 integrate ... //depot/projects/ia64/lib/libc/db/test/hash.tests/tseq.c#2 integrate ... //depot/projects/ia64/lib/libc/db/test/hash.tests/tverify.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/Makefile.inc#6 integrate ... //depot/projects/ia64/lib/libc/gen/_rand48.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/arc4random.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/clock.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/confstr.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/ctermid.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/drand48.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/erand48.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/err.c#4 integrate ... //depot/projects/ia64/lib/libc/gen/errlst.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/getbsize.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/getcap.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/getgrouplist.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/gethostname.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/getloadavg.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/jrand48.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/lcong48.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/lrand48.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/mrand48.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/msgctl.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/msgget.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/msgrcv.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/msgsnd.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/nice.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/nrand48.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/pw_scan.h#2 integrate ... //depot/projects/ia64/lib/libc/gen/pwcache.3#3 integrate ... //depot/projects/ia64/lib/libc/gen/pwcache.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/raise.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/seed48.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/semconfig.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/semctl.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/semget.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/semop.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/sethostname.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/siglist.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/sysctl.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/time.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/utime.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/valloc.c#2 integrate ... //depot/projects/ia64/lib/libc/i386/SYS.h#3 integrate ... //depot/projects/ia64/lib/libc/i386/gen/Makefile.inc#4 integrate ... //depot/projects/ia64/lib/libc/i386/gen/frexp.c#2 integrate ... //depot/projects/ia64/lib/libc/i386/gen/infinity.c#2 integrate ... //depot/projects/ia64/lib/libc/i386/gen/isinf.c#2 integrate ... //depot/projects/ia64/lib/libc/i386/gen/ldexp.c#2 integrate ... //depot/projects/ia64/lib/libc/i386/sys/i386_clr_watch.c#2 integrate ... //depot/projects/ia64/lib/libc/i386/sys/i386_get_ioperm.c#2 integrate ... //depot/projects/ia64/lib/libc/i386/sys/i386_get_ldt.c#2 integrate ... //depot/projects/ia64/lib/libc/i386/sys/i386_set_ioperm.c#2 integrate ... //depot/projects/ia64/lib/libc/i386/sys/i386_set_ldt.c#2 integrate ... //depot/projects/ia64/lib/libc/i386/sys/i386_set_watch.c#2 integrate ... //depot/projects/ia64/lib/libc/i386/sys/i386_vm86.c#2 integrate ... //depot/projects/ia64/lib/libc/ia64/SYS.h#2 integrate ... //depot/projects/ia64/lib/libc/ia64/gen/fpgetmask.c#2 integrate ... //depot/projects/ia64/lib/libc/ia64/gen/fpsetmask.c#2 integrate ... //depot/projects/ia64/lib/libc/ia64/gen/frexp.c#2 integrate ... //depot/projects/ia64/lib/libc/ia64/gen/infinity.c#2 integrate ... //depot/projects/ia64/lib/libc/ia64/gen/isinf.c#2 integrate ... //depot/projects/ia64/lib/libc/ia64/gen/ldexp.c#2 integrate ... //depot/projects/ia64/lib/libc/ia64/gen/modf.c#2 integrate ... //depot/projects/ia64/lib/libc/include/namespace.h#3 integrate ... //depot/projects/ia64/lib/libc/include/spinlock.h#2 integrate ... //depot/projects/ia64/lib/libc/locale/ansi.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/big5.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/collate.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/collate.h#3 integrate ... //depot/projects/ia64/lib/libc/locale/collcmp.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/euc.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/fix_grouping.c#4 integrate ... //depot/projects/ia64/lib/libc/locale/frune.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/isctype.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/ldpart.c#4 integrate ... //depot/projects/ia64/lib/libc/locale/lmessages.c#4 integrate ... //depot/projects/ia64/lib/libc/locale/lmonetary.c#4 integrate ... //depot/projects/ia64/lib/libc/locale/lnumeric.c#3 integrate ... //depot/projects/ia64/lib/libc/locale/localeconv.c#3 integrate ... //depot/projects/ia64/lib/libc/locale/mbrune.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/mskanji.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/nl_langinfo.c#3 integrate ... //depot/projects/ia64/lib/libc/locale/nomacros.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/none.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/rune.c#3 integrate ... //depot/projects/ia64/lib/libc/locale/runetype.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/setinvalidrune.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/setlocale.c#3 integrate ... //depot/projects/ia64/lib/libc/locale/setrunelocale.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/table.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/tolower.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/toupper.c#2 integrate ... //depot/projects/ia64/lib/libc/locale/utf2.c#2 integrate ... //depot/projects/ia64/lib/libc/mips/SYS.h#2 integrate ... //depot/projects/ia64/lib/libc/mips/gen/flt_rounds.c#2 integrate ... //depot/projects/ia64/lib/libc/mips/gen/fpgetmask.c#2 integrate ... //depot/projects/ia64/lib/libc/mips/gen/fpgetround.c#2 integrate ... //depot/projects/ia64/lib/libc/mips/gen/fpgetsticky.c#2 integrate ... //depot/projects/ia64/lib/libc/mips/gen/fpsetmask.c#2 integrate ... //depot/projects/ia64/lib/libc/mips/gen/fpsetround.c#2 integrate ... //depot/projects/ia64/lib/libc/mipseb/SYS.h#2 integrate ... //depot/projects/ia64/lib/libc/net/addr2ascii.c#2 integrate ... //depot/projects/ia64/lib/libc/net/ascii2addr.c#2 integrate ... //depot/projects/ia64/lib/libc/net/base64.c#2 integrate ... //depot/projects/ia64/lib/libc/net/getaddrinfo.c#3 integrate ... //depot/projects/ia64/lib/libc/net/gethostbydns.c#2 integrate ... //depot/projects/ia64/lib/libc/net/gethostbyht.c#2 integrate ... //depot/projects/ia64/lib/libc/net/gethostbynis.c#2 integrate ... //depot/projects/ia64/lib/libc/net/gethostnamadr.c#2 integrate ... //depot/projects/ia64/lib/libc/net/getifaddrs.c#2 integrate ... //depot/projects/ia64/lib/libc/net/getnameinfo.c#2 integrate ... //depot/projects/ia64/lib/libc/net/getnetbydns.c#2 integrate ... //depot/projects/ia64/lib/libc/net/getnetbyht.c#2 integrate ... //depot/projects/ia64/lib/libc/net/getnetbynis.c#2 integrate ... //depot/projects/ia64/lib/libc/net/getnetnamadr.c#2 integrate ... //depot/projects/ia64/lib/libc/net/getproto.c#2 integrate ... //depot/projects/ia64/lib/libc/net/getprotoent.c#2 integrate ... //depot/projects/ia64/lib/libc/net/getprotoname.c#2 integrate ... //depot/projects/ia64/lib/libc/net/getservbyname.c#2 integrate ... //depot/projects/ia64/lib/libc/net/getservbyport.c#2 integrate ... //depot/projects/ia64/lib/libc/net/getservent.c#4 integrate ... //depot/projects/ia64/lib/libc/net/herror.c#2 integrate ... //depot/projects/ia64/lib/libc/net/hesiod.c#2 integrate ... //depot/projects/ia64/lib/libc/net/ifname.c#2 integrate ... //depot/projects/ia64/lib/libc/net/inet_addr.c#2 integrate ... //depot/projects/ia64/lib/libc/net/inet_lnaof.c#2 integrate ... //depot/projects/ia64/lib/libc/net/inet_makeaddr.c#2 integrate ... //depot/projects/ia64/lib/libc/net/inet_net_ntop.c#2 integrate ... //depot/projects/ia64/lib/libc/net/inet_net_pton.c#2 integrate ... //depot/projects/ia64/lib/libc/net/inet_neta.c#2 integrate ... //depot/projects/ia64/lib/libc/net/inet_netof.c#2 integrate ... //depot/projects/ia64/lib/libc/net/inet_network.c#2 integrate ... //depot/projects/ia64/lib/libc/net/inet_ntoa.c#2 integrate ... //depot/projects/ia64/lib/libc/net/inet_ntop.c#3 integrate ... //depot/projects/ia64/lib/libc/net/inet_pton.c#2 integrate ... //depot/projects/ia64/lib/libc/net/ip6opt.c#2 integrate ... //depot/projects/ia64/lib/libc/net/iso_addr.c#2 integrate ... //depot/projects/ia64/lib/libc/net/linkaddr.c#2 integrate ... //depot/projects/ia64/lib/libc/net/map_v4v6.c#2 integrate ... //depot/projects/ia64/lib/libc/net/name6.c#2 integrate ... //depot/projects/ia64/lib/libc/net/ns_addr.c#3 integrate ... //depot/projects/ia64/lib/libc/net/ns_name.c#2 integrate ... //depot/projects/ia64/lib/libc/net/ns_netint.c#2 integrate ... //depot/projects/ia64/lib/libc/net/ns_ntoa.c#3 integrate ... //depot/projects/ia64/lib/libc/net/ns_parse.c#2 integrate ... //depot/projects/ia64/lib/libc/net/ns_print.c#2 integrate ... //depot/projects/ia64/lib/libc/net/ns_ttl.c#2 integrate ... //depot/projects/ia64/lib/libc/net/nsap_addr.c#2 integrate ... //depot/projects/ia64/lib/libc/net/nsdispatch.c#3 integrate ... //depot/projects/ia64/lib/libc/net/nsparser.y#3 integrate ... //depot/projects/ia64/lib/libc/net/rcmd.c#2 integrate ... //depot/projects/ia64/lib/libc/net/recv.c#2 integrate ... //depot/projects/ia64/lib/libc/net/res_comp.c#2 integrate ... //depot/projects/ia64/lib/libc/net/res_config.h#2 integrate ... //depot/projects/ia64/lib/libc/net/res_data.c#2 integrate ... //depot/projects/ia64/lib/libc/net/res_debug.c#2 integrate ... //depot/projects/ia64/lib/libc/net/res_init.c#3 integrate ... //depot/projects/ia64/lib/libc/net/res_mkquery.c#2 integrate ... //depot/projects/ia64/lib/libc/net/res_mkupdate.c#2 integrate ... //depot/projects/ia64/lib/libc/net/res_query.c#2 integrate ... //depot/projects/ia64/lib/libc/net/res_send.c#3 integrate ... //depot/projects/ia64/lib/libc/net/res_update.c#2 integrate ... //depot/projects/ia64/lib/libc/net/rthdr.c#2 integrate ... //depot/projects/ia64/lib/libc/net/send.c#2 integrate ... //depot/projects/ia64/lib/libc/net/vars.c#2 integrate ... //depot/projects/ia64/lib/libc/nls/msgcat.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_calc_mask.c#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_copy.c#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_delete.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_delete_entry.c#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_entry.c#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_free.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_from_text.c#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_get.c#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_init.c#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_perm.c#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_set.c#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_size.c#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_support.c#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_to_text.c#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/acl_valid.c#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_clear.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_cmp.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_copy.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_dup.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_free.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_get_fd.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_get_file.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_get_flag.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_get_proc.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_init.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_set_fd.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_set_file.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_set_flag.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_set_proc.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap_text.c#2 integrate ... //depot/projects/ia64/lib/libc/posix1e/extattr.c#3 integrate ... //depot/projects/ia64/lib/libc/quad/TESTS/divrem.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/TESTS/mul.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/adddi3.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/anddi3.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/ashldi3.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/ashrdi3.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/cmpdi2.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/divdi3.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/fixdfdi.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/fixsfdi.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/fixunsdfdi.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/fixunssfdi.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/floatdidf.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/floatdisf.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/floatunsdidf.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/iordi3.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/lshldi3.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/lshrdi3.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/moddi3.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/muldi3.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/negdi2.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/notdi2.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/qdivrem.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/quad.h#2 integrate ... //depot/projects/ia64/lib/libc/quad/subdi3.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/ucmpdi2.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/udivdi3.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/umoddi3.c#2 integrate ... //depot/projects/ia64/lib/libc/quad/xordi3.c#2 integrate ... //depot/projects/ia64/lib/libc/regex/cclass.h#2 integrate ... //depot/projects/ia64/lib/libc/regex/cname.h#2 integrate ... //depot/projects/ia64/lib/libc/regex/engine.c#2 integrate ... //depot/projects/ia64/lib/libc/regex/grot/debug.c#2 integrate ... //depot/projects/ia64/lib/libc/regex/grot/limits.h#2 integrate ... //depot/projects/ia64/lib/libc/regex/grot/main.c#2 integrate ... //depot/projects/ia64/lib/libc/regex/grot/mkh#2 integrate ... //depot/projects/ia64/lib/libc/regex/grot/split.c#2 integrate ... //depot/projects/ia64/lib/libc/regex/grot/stdlib.h#2 integrate ... //depot/projects/ia64/lib/libc/regex/regcomp.c#3 integrate ... //depot/projects/ia64/lib/libc/regex/regerror.c#2 integrate ... //depot/projects/ia64/lib/libc/regex/regex2.h#2 integrate ... //depot/projects/ia64/lib/libc/regex/regexec.c#2 integrate ... //depot/projects/ia64/lib/libc/regex/regfree.c#2 integrate ... //depot/projects/ia64/lib/libc/regex/utils.h#2 integrate ... //depot/projects/ia64/lib/libc/rpc/auth_des.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/auth_none.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/auth_time.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/auth_unix.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/authdes_prot.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/authunix_prot.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/bindresvport.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/clnt_bcast.c#4 integrate ... //depot/projects/ia64/lib/libc/rpc/clnt_dg.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/clnt_generic.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/clnt_perror.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/clnt_raw.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/clnt_simple.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/clnt_vc.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/crypt_client.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/des_crypt.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/des_soft.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/getnetconfig.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/getnetpath.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/getpublickey.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/getrpcent.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/getrpcport.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/key_call.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/key_prot_xdr.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/mt_misc.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/netname.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/netnamer.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/pmap_clnt.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/pmap_getmaps.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/pmap_getport.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/pmap_prot.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/pmap_prot2.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/pmap_rmt.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/rpc_callmsg.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/rpc_com.h#2 integrate ... //depot/projects/ia64/lib/libc/rpc/rpc_commondata.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/rpc_dtablesize.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/rpc_generic.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/rpc_prot.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/rpc_soc.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/rpcb_clnt.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/rpcb_prot.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/rpcb_st_xdr.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/rpcdname.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/rtime.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/svc.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/svc_auth.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/svc_auth_des.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/svc_auth_unix.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/svc_dg.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/svc_generic.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/svc_raw.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/svc_run.c#2 integrate ... //depot/projects/ia64/lib/libc/rpc/svc_simple.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/svc_vc.c#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/SYS.h#4 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu.c#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_add.c#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_arith.h#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_compare.c#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_div.c#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_emu.h#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_explode.c#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_extern.h#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_implode.c#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_mul.c#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_sqrt.c#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_subr.c#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/gen/infinity.c#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/gen/isinf.c#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/gen/ldexp.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/_flock_stub.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/asprintf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/clrerr.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fclose.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fdopen.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/feof.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/ferror.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fflush.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fgetc.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fgetln.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fgetpos.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fgets.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fileno.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/findfp.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/flags.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/floatio.h#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fopen.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fprintf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fpurge.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fputc.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fputs.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fread.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/freopen.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fscanf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fseek.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fsetpos.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/ftell.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/funopen.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fvwrite.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fvwrite.h#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fwalk.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/fwrite.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/getc.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/getchar.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/gets.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/getw.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/glue.h#2 integrate ... //depot/projects/ia64/lib/libc/stdio/local.h#2 integrate ... //depot/projects/ia64/lib/libc/stdio/makebuf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/mktemp.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/perror.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/printf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/putc.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/putchar.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/puts.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/putw.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/refill.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/remove.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/rewind.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/rget.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/scanf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/setbuf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/setbuffer.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/setvbuf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/snprintf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/sprintf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/sscanf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/stdio.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/tempnam.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/tmpfile.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/tmpnam.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/ungetc.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/vasprintf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/vfprintf.c#6 integrate ... //depot/projects/ia64/lib/libc/stdio/vfscanf.c#3 integrate ... //depot/projects/ia64/lib/libc/stdio/vprintf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/vscanf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/vsnprintf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/vsprintf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/vsscanf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/wbuf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/wsetup.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/abort.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/abs.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/atexit.c#3 integrate ... //depot/projects/ia64/lib/libc/stdlib/atexit.h#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/atof.c#3 integrate ... //depot/projects/ia64/lib/libc/stdlib/atoi.c#3 integrate ... //depot/projects/ia64/lib/libc/stdlib/atol.c#3 integrate ... //depot/projects/ia64/lib/libc/stdlib/atoll.c#3 integrate ... //depot/projects/ia64/lib/libc/stdlib/bsearch.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/calloc.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/div.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/exit.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/getenv.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/getopt.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/getsubopt.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/hcreate.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/heapsort.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/labs.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/ldiv.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/malloc.c#6 integrate ... //depot/projects/ia64/lib/libc/stdlib/merge.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/putenv.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/qsort.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/radixsort.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/rand.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/random.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/reallocf.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/realpath.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/setenv.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/strfmon.c#3 integrate ... //depot/projects/ia64/lib/libc/stdlib/strhash.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/strtod.c#7 integrate ... //depot/projects/ia64/lib/libc/stdlib/strtoimax.c#3 integrate ... //depot/projects/ia64/lib/libc/stdlib/strtol.c#4 integrate ... //depot/projects/ia64/lib/libc/stdlib/strtoll.c#4 integrate ... //depot/projects/ia64/lib/libc/stdlib/strtoq.c#3 integrate ... //depot/projects/ia64/lib/libc/stdlib/strtoul.c#4 integrate ... //depot/projects/ia64/lib/libc/stdlib/strtoull.c#4 integrate ... //depot/projects/ia64/lib/libc/stdlib/strtoumax.c#3 integrate ... //depot/projects/ia64/lib/libc/stdlib/strtouq.c#3 integrate ... //depot/projects/ia64/lib/libc/stdlib/system.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/tdelete.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/tfind.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/tsearch.c#2 integrate ... //depot/projects/ia64/lib/libc/stdlib/twalk.c#2 integrate ... //depot/projects/ia64/lib/libc/stdtime/asctime.c#2 integrate ... //depot/projects/ia64/lib/libc/stdtime/difftime.c#2 integrate ... //depot/projects/ia64/lib/libc/stdtime/localtime.c#2 integrate ... //depot/projects/ia64/lib/libc/stdtime/private.h#2 integrate ... //depot/projects/ia64/lib/libc/stdtime/strftime.c#2 integrate ... //depot/projects/ia64/lib/libc/stdtime/strptime.c#2 integrate ... //depot/projects/ia64/lib/libc/stdtime/time32.c#3 integrate ... //depot/projects/ia64/lib/libc/stdtime/timelocal.c#4 integrate ... //depot/projects/ia64/lib/libc/stdtime/tzfile.h#2 integrate ... //depot/projects/ia64/lib/libc/string/bcmp.c#3 integrate ... //depot/projects/ia64/lib/libc/string/bcopy.c#3 integrate ... //depot/projects/ia64/lib/libc/string/bzero.c#2 integrate ... //depot/projects/ia64/lib/libc/string/ffs.c#3 integrate ... //depot/projects/ia64/lib/libc/string/index.c#3 integrate ... //depot/projects/ia64/lib/libc/string/memccpy.c#3 integrate ... //depot/projects/ia64/lib/libc/string/memchr.c#3 integrate ... //depot/projects/ia64/lib/libc/string/memcmp.c#3 integrate ... //depot/projects/ia64/lib/libc/string/memcpy.c#2 integrate ... //depot/projects/ia64/lib/libc/string/memmove.c#2 integrate ... //depot/projects/ia64/lib/libc/string/memset.c#3 integrate ... //depot/projects/ia64/lib/libc/string/rindex.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strcasecmp.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strcasestr.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strcat.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strchr.c#2 integrate ... //depot/projects/ia64/lib/libc/string/strcmp.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strcpy.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strcspn.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strlcat.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strlcpy.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strlen.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strmode.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strncat.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strncmp.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strncpy.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strpbrk.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strrchr.c#2 integrate ... //depot/projects/ia64/lib/libc/string/strsep.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strsignal.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strspn.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strstr.c#3 integrate ... //depot/projects/ia64/lib/libc/string/strtok.c#4 integrate ... //depot/projects/ia64/lib/libc/string/swab.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcscat.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcschr.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcscmp.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcscpy.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcscspn.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcslcat.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcslcpy.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcslen.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcsncat.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcsncmp.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcsncpy.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcspbrk.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcsrchr.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcsspn.c#4 integrate ... //depot/projects/ia64/lib/libc/string/wcsstr.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wcswidth.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wmemchr.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wmemcmp.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wmemcpy.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wmemmove.c#3 integrate ... //depot/projects/ia64/lib/libc/string/wmemset.c#3 integrate ... //depot/projects/ia64/lib/libc/sys/__error.c#2 integrate ... //depot/projects/ia64/lib/libc/sys/ftruncate.c#2 integrate ... //depot/projects/ia64/lib/libc/sys/lseek.c#2 integrate ... //depot/projects/ia64/lib/libc/sys/mmap.c#2 integrate ... //depot/projects/ia64/lib/libc/sys/pread.c#2 integrate ... //depot/projects/ia64/lib/libc/sys/pwrite.c#2 integrate ... //depot/projects/ia64/lib/libc/sys/sigaction.2#2 integrate ... //depot/projects/ia64/lib/libc/sys/truncate.c#2 integrate ... //depot/projects/ia64/lib/libc/xdr/xdr.c#2 integrate ... //depot/projects/ia64/lib/libc/xdr/xdr_array.c#2 integrate ... //depot/projects/ia64/lib/libc/xdr/xdr_float.c#3 integrate ... //depot/projects/ia64/lib/libc/xdr/xdr_mem.c#2 integrate ... //depot/projects/ia64/lib/libc/xdr/xdr_rec.c#2 integrate ... //depot/projects/ia64/lib/libc/xdr/xdr_reference.c#2 integrate ... //depot/projects/ia64/lib/libc/xdr/xdr_sizeof.c#2 integrate ... //depot/projects/ia64/lib/libc/xdr/xdr_stdio.c#3 integrate ... //depot/projects/ia64/lib/libc/yp/xdryp.c#3 integrate ... //depot/projects/ia64/lib/libc/yp/yplib.c#3 integrate ... //depot/projects/ia64/lib/libcompat/4.3/insque.c#2 integrate ... //depot/projects/ia64/lib/libcompat/4.3/lsearch.c#2 integrate ... //depot/projects/ia64/lib/libcompat/4.3/remque.c#2 integrate ... //depot/projects/ia64/lib/libcompat/4.4/cuserid.c#2 integrate ... //depot/projects/ia64/lib/libcompat/regexp/regexp.c#2 integrate ... //depot/projects/ia64/lib/libcompat/regexp/regsub.c#2 integrate ... //depot/projects/ia64/lib/libdevstat/devstat.c#2 integrate ... //depot/projects/ia64/lib/libedit/chared.h#2 integrate ... //depot/projects/ia64/lib/libipsec/ipsec_dump_policy.c#2 integrate ... //depot/projects/ia64/lib/libipsec/ipsec_strerror.h#2 integrate ... //depot/projects/ia64/lib/libipsec/libpfkey.h#2 integrate ... //depot/projects/ia64/lib/libipsec/pfkey.c#2 integrate ... //depot/projects/ia64/lib/libipsec/pfkey_dump.c#2 integrate ... //depot/projects/ia64/lib/libipsec/policy_parse.y#2 integrate ... //depot/projects/ia64/lib/libipsec/policy_token.l#2 integrate ... //depot/projects/ia64/lib/libipsec/test-policy.c#2 integrate ... //depot/projects/ia64/lib/libipx/ipx_addr.c#3 integrate ... //depot/projects/ia64/lib/libipx/ipx_ntoa.c#3 integrate ... //depot/projects/ia64/lib/libkvm/kvm.c#3 integrate ... //depot/projects/ia64/lib/libkvm/kvm.h#2 integrate ... //depot/projects/ia64/lib/libkvm/kvm_file.c#2 integrate ... //depot/projects/ia64/lib/libkvm/kvm_private.h#2 integrate ... //depot/projects/ia64/lib/libkvm/kvm_proc.c#4 integrate ... //depot/projects/ia64/lib/libkvm/kvm_sparc.c#2 integrate ... //depot/projects/ia64/lib/libm/Makefile#2 delete ... //depot/projects/ia64/lib/libm/README#2 delete ... //depot/projects/ia64/lib/libm/README-FREEBSD#2 delete ... //depot/projects/ia64/lib/libm/common/atan2.c#2 delete ... //depot/projects/ia64/lib/libm/common/sincos.c#2 delete ... //depot/projects/ia64/lib/libm/common/tan.c#2 delete ... //depot/projects/ia64/lib/libm/common/trig.h#2 delete ... //depot/projects/ia64/lib/libm/common_source/acosh.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/asincos.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/asinh.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/atan.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/atanh.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/cosh.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/erf.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/exp.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/exp__E.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/expm1.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/floor.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/fmod.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/gamma.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/infnan.3#2 delete ... //depot/projects/ia64/lib/libm/common_source/j0.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/j1.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/jn.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/lgamma.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/log.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/log10.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/log1p.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/log__L.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/mathimpl.h#2 delete ... //depot/projects/ia64/lib/libm/common_source/pow.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/sinh.c#2 delete ... //depot/projects/ia64/lib/libm/common_source/tanh.c#2 delete ... //depot/projects/ia64/lib/libm/ieee/cabs.c#2 delete ... //depot/projects/ia64/lib/libm/ieee/cbrt.c#2 delete ... //depot/projects/ia64/lib/libm/ieee/support.c#2 delete ... //depot/projects/ia64/lib/libmd/md5c.c#2 integrate ... //depot/projects/ia64/lib/libmd/rmd160c.c#2 integrate ... //depot/projects/ia64/lib/libmd/sha0c.c#2 integrate ... //depot/projects/ia64/lib/libmd/sha1c.c#2 integrate ... //depot/projects/ia64/lib/libncp/ipx.c#3 integrate ... //depot/projects/ia64/lib/libncurses/termcap.c#2 integrate ... //depot/projects/ia64/lib/libopie/opieextra.c#2 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#3 integrate ... //depot/projects/ia64/lib/librpcsvc/secretkey.c#2 integrate ... //depot/projects/ia64/lib/librpcsvc/xcrypt.c#2 integrate ... //depot/projects/ia64/lib/libstand/arp.c#2 integrate ... //depot/projects/ia64/lib/libstand/bootp.c#2 integrate ... //depot/projects/ia64/lib/libstand/ether.c#2 integrate ... //depot/projects/ia64/lib/libstand/fstat.c#2 integrate ... //depot/projects/ia64/lib/libstand/gets.c#2 integrate ... //depot/projects/ia64/lib/libstand/in_cksum.c#2 integrate ... //depot/projects/ia64/lib/libstand/ioctl.c#2 integrate ... //depot/projects/ia64/lib/libstand/net.c#3 integrate ... //depot/projects/ia64/lib/libstand/netif.c#2 integrate ... //depot/projects/ia64/lib/libstand/nfs.c#2 integrate ... //depot/projects/ia64/lib/libstand/printf.c#2 integrate ... //depot/projects/ia64/lib/libstand/qdivrem.c#2 integrate ... //depot/projects/ia64/lib/libstand/quad.h#2 integrate ... //depot/projects/ia64/lib/libstand/random.c#2 integrate ... //depot/projects/ia64/lib/libstand/rarp.c#2 integrate ... //depot/projects/ia64/lib/libstand/rpc.c#2 integrate ... //depot/projects/ia64/lib/libstand/splitfs.c#2 integrate ... //depot/projects/ia64/lib/libstand/strcasecmp.c#2 integrate ... //depot/projects/ia64/lib/libstand/strtol.c#2 integrate ... //depot/projects/ia64/lib/libstand/tftp.c#2 integrate ... //depot/projects/ia64/lib/libstand/udp.c#2 integrate ... //depot/projects/ia64/lib/libstand/ufs.c#3 integrate ... //depot/projects/ia64/lib/libstand/write.c#3 integrate ... //depot/projects/ia64/lib/libusb/libusb.h#2 integrate ... //depot/projects/ia64/lib/libutil/fparseln.c#2 integrate ... //depot/projects/ia64/lib/libutil/libutil.h#2 integrate ... //depot/projects/ia64/lib/libutil/login.c#2 integrate ... //depot/projects/ia64/lib/libutil/login_cap.h#2 integrate ... //depot/projects/ia64/lib/libutil/pty.c#2 integrate ... //depot/projects/ia64/lib/msun/bsdsrc/b_exp.c#1 branch ... //depot/projects/ia64/lib/msun/bsdsrc/b_log.c#1 branch ... //depot/projects/ia64/lib/msun/bsdsrc/b_tgamma.c#1 branch ... //depot/projects/ia64/lib/msun/bsdsrc/mathimpl.h#1 branch ... //depot/projects/ia64/lib/msun/src/get_hw_float.c#2 integrate ... //depot/projects/ia64/lib/msun/src/math.h#3 integrate ... //depot/projects/ia64/lib/msun/src/math_private.h#4 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#2 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml#4 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 integrate ... //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#7 integrate ... //depot/projects/ia64/release/doc/share/sgml/release.dsl#3 integrate ... //depot/projects/ia64/release/picobsd/build/picobsd#5 integrate ... //depot/projects/ia64/sbin/Makefile#6 integrate ... //depot/projects/ia64/sbin/fsdb/fsdb.c#5 integrate ... //depot/projects/ia64/sbin/fsdb/fsdb.h#3 integrate ... //depot/projects/ia64/sbin/fsdb/fsdbutil.c#3 integrate ... //depot/projects/ia64/sbin/fsirand/fsirand.c#2 integrate ... //depot/projects/ia64/sbin/ldconfig/ldconfig.c#3 integrate ... //depot/projects/ia64/sbin/ldconfig/ldconfig.h#2 integrate ... //depot/projects/ia64/sbin/mdconfig/mdconfig.c#3 integrate ... //depot/projects/ia64/sbin/mount/extern.h#2 integrate ... //depot/projects/ia64/sbin/mount/mntopts.h#2 integrate ... //depot/projects/ia64/sbin/mount/mount.c#2 integrate ... //depot/projects/ia64/sbin/mount/mount_ufs.c#2 integrate ... //depot/projects/ia64/sbin/mount_ext2fs/mount_ext2fs.c#2 integrate ... //depot/projects/ia64/sbin/mount_hpfs/mount_hpfs.c#2 integrate ... //depot/projects/ia64/sbin/mount_ifs/extern.h#2 integrate ... //depot/projects/ia64/sbin/mount_ifs/mount.c#2 integrate ... //depot/projects/ia64/sbin/mount_ifs/mount_ufs.c#2 integrate ... //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.c#2 integrate ... //depot/projects/ia64/sbin/mount_nfs/mount_nfs.c#4 integrate ... //depot/projects/ia64/sbin/mount_ntfs/mount_ntfs.c#2 integrate ... //depot/projects/ia64/sbin/mount_nullfs/mount_nullfs.c#2 integrate ... //depot/projects/ia64/sbin/mount_portalfs/mount_portalfs.c#2 integrate ... //depot/projects/ia64/sbin/mount_portalfs/portald.h#2 integrate ... //depot/projects/ia64/sbin/mount_std/mount_std.c#2 integrate ... //depot/projects/ia64/sbin/mount_umapfs/mount_umapfs.c#2 integrate ... //depot/projects/ia64/sbin/mount_unionfs/mount_unionfs.c#2 integrate ... //depot/projects/ia64/sbin/mountd/mountd.c#4 integrate ... //depot/projects/ia64/sbin/nfsiod/nfsiod.c#2 integrate ... //depot/projects/ia64/sbin/nos-tun/nos-tun.c#3 integrate ... //depot/projects/ia64/sbin/ping6/ping6.c#5 integrate ... //depot/projects/ia64/sbin/quotacheck/quotacheck.c#3 integrate ... //depot/projects/ia64/sbin/route/route.c#4 integrate ... //depot/projects/ia64/sbin/routed/radix.h#2 integrate ... //depot/projects/ia64/sbin/savecore/savecore.c#6 integrate ... //depot/projects/ia64/sbin/shutdown/shutdown.c#2 integrate ... //depot/projects/ia64/sbin/slattach/slattach.c#2 integrate ... //depot/projects/ia64/sbin/startslip/startslip.c#3 integrate ... //depot/projects/ia64/sbin/swapon/swapon.c#3 integrate ... //depot/projects/ia64/sbin/sysctl/pathconf.c#2 integrate ... //depot/projects/ia64/sbin/tunefs/tunefs.c#2 integrate ... //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#6 integrate ... //depot/projects/ia64/share/examples/Makefile#3 integrate ... //depot/projects/ia64/share/examples/etc/make.conf#4 integrate ... //depot/projects/ia64/share/examples/smbfs/Makefile#2 integrate ... //depot/projects/ia64/share/man/man5/Makefile#2 integrate ... //depot/projects/ia64/share/man/man5/make.conf.5#4 integrate ... //depot/projects/ia64/share/man/man5/moduli.5#1 branch ... //depot/projects/ia64/share/man/man8/picobsd.8#6 integrate ... //depot/projects/ia64/share/me/me.7#2 delete ... //depot/projects/ia64/share/misc/pci_vendors#6 integrate ... //depot/projects/ia64/share/mk/bsd.lib.mk#6 integrate ... //depot/projects/ia64/sys/alpha/alpha/db_interface.c#5 integrate ... //depot/projects/ia64/sys/alpha/alpha/interrupt.c#6 integrate ... //depot/projects/ia64/sys/alpha/alpha/machdep.c#7 integrate ... //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#5 integrate ... //depot/projects/ia64/sys/alpha/alpha/prom.c#4 integrate ... //depot/projects/ia64/sys/alpha/alpha/trap.c#6 integrate ... //depot/projects/ia64/sys/alpha/include/asm.h#3 integrate ... //depot/projects/ia64/sys/alpha/include/cpufunc.h#3 integrate ... //depot/projects/ia64/sys/alpha/pci/cia.c#3 integrate ... //depot/projects/ia64/sys/alpha/pci/t2.c#3 integrate ... //depot/projects/ia64/sys/alpha/pci/t2_pci.c#3 integrate ... //depot/projects/ia64/sys/conf/files.powerpc#3 integrate ... //depot/projects/ia64/sys/dev/bge/if_bge.c#6 integrate ... //depot/projects/ia64/sys/dev/bge/if_bgereg.h#3 integrate ... //depot/projects/ia64/sys/dev/isp/isp.c#4 integrate ... //depot/projects/ia64/sys/dev/isp/isp_target.h#4 integrate ... //depot/projects/ia64/sys/dev/isp/ispvar.h#4 integrate ... //depot/projects/ia64/sys/dev/mii/brgphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/miidevs#2 integrate ... //depot/projects/ia64/sys/dev/mii/miidevs.h#2 integrate ... //depot/projects/ia64/sys/i386/i386/initcpu.c#3 integrate ... //depot/projects/ia64/sys/i386/i386/perfmon.c#5 integrate ... //depot/projects/ia64/sys/i386/i386/sys_machdep.c#4 integrate ... //depot/projects/ia64/sys/i386/i386/trap.c#7 integrate ... //depot/projects/ia64/sys/i386/i386/vm_machdep.c#5 integrate ... //depot/projects/ia64/sys/i386/include/asm.h#2 integrate ... //depot/projects/ia64/sys/i386/include/cpufunc.h#4 integrate ... //depot/projects/ia64/sys/i386/isa/npx.c#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/db_interface.c#9 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#20 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#12 integrate ... //depot/projects/ia64/sys/ia64/ia64/sapic.c#7 integrate ... //depot/projects/ia64/sys/ia64/include/asm.h#2 integrate ... //depot/projects/ia64/sys/ia64/include/cpufunc.h#4 integrate ... //depot/projects/ia64/sys/ia64/include/profile.h#4 integrate ... //depot/projects/ia64/sys/kern/kern_linker.c#10 integrate ... //depot/projects/ia64/sys/kern/kern_prot.c#9 integrate ... //depot/projects/ia64/sys/kern/kern_sysctl.c#5 integrate ... //depot/projects/ia64/sys/kern/subr_trap.c#4 integrate ... //depot/projects/ia64/sys/kern/subr_witness.c#5 integrate ... //depot/projects/ia64/sys/kern/sys_pipe.c#8 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 22 21: 0:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 364A437B41A; Fri, 22 Mar 2002 21:00:25 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6427837B404 for ; Fri, 22 Mar 2002 21:00:24 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2N50Om45089 for perforce@freebsd.org; Fri, 22 Mar 2002 21:00:24 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 22 Mar 2002 21:00:24 -0800 (PST) Message-Id: <200203230500.g2N50Om45089@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8239 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8239 Change 8239 by peter@peter_thunder on 2002/03/22 21:00:11 Oops! Looks like the loader is behind the times for the 32 bit hash table entries even in elf64 files. :-/ Affected files ... ... //depot/projects/ia64/sys/boot/common/load_elf.c#2 edit Differences ... ==== //depot/projects/ia64/sys/boot/common/load_elf.c#2 (text+ko) ==== @@ -49,10 +49,10 @@ Elf_Ehdr *ehdr; Elf_Sym *symtab; Elf_Off *hashtab; - Elf_Off nbuckets; - Elf_Off nchains; - Elf_Off* buckets; - Elf_Off* chains; + Elf_Hashelt nbuckets; + Elf_Hashelt nchains; + Elf_Hashelt* buckets; + Elf_Hashelt* chains; char *strtab; size_t strsz; int fd; @@ -481,7 +481,7 @@ break; switch (dp[i].d_tag) { case DT_HASH: - ef->hashtab = (Elf_Off*)(dp[i].d_un.d_ptr + off); + ef->hashtab = (Elf_Hashelt*)(dp[i].d_un.d_ptr + off); break; case DT_STRTAB: ef->strtab = (char *)(dp[i].d_un.d_ptr + off); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 23 6:38: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8179337B41B; Sat, 23 Mar 2002 06:37:56 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A8BE037B41A for ; Sat, 23 Mar 2002 06:37:55 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2NEbt955279 for perforce@freebsd.org; Sat, 23 Mar 2002 06:37:55 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Mar 2002 06:37:55 -0800 (PST) Message-Id: <200203231437.g2NEbt955279@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8257 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8257 Change 8257 by rwatson@rwatson_paprika on 2002/03/23 06:37:13 Teach IPv6 link layer neighbor discovery how to label out-going packets. There are two interface arguments present and I think I have the right one. Affected files ... ... //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#4 (text+ko) ==== @@ -40,6 +40,7 @@ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_mac.h" #include #include @@ -2019,6 +2020,9 @@ sendpkt: +#ifdef MAC + mac_create_mbuf_linklayer_for_ifnet(ifp, m); +#endif if ((ifp->if_flags & IFF_LOOPBACK) != 0) { return((*ifp->if_output)(origifp, m, (struct sockaddr *)dst, rt)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 23 7:41:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DBBD37B417; Sat, 23 Mar 2002 07:41:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id 6575937B404 for ; Sat, 23 Mar 2002 07:41:03 -0800 (PST) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.11.6/8.11.6) with SMTP id g2NFb8k58998 for ; Sat, 23 Mar 2002 10:37:09 -0500 (EST) (envelope-from robert@fledge.watson.org) Date: Sat, 23 Mar 2002 10:37:08 -0500 (EST) From: Robert Watson X-Sender: robert@fledge.watson.org To: Perforce Change Reviews Subject: Re: PERFORCE change 8257 for review In-Reply-To: <200203231437.g2NEbt955279@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG This lets MAC boxes actually boot successfully with IPv6 enabled, although no doubt there are remaining issues relating to labeling packets and properly handling labeling on sockets. In particular, IPv6 fragmentation/reassembly isn't dealt with, and IPsec doesn't properly preserve labels as they pass up the stack. Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services On Sat, 23 Mar 2002, Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8257 > > Change 8257 by rwatson@rwatson_paprika on 2002/03/23 06:37:13 > > Teach IPv6 link layer neighbor discovery how to label out-going > packets. There are two interface arguments present and I think > I have the right one. > > Affected files ... > > ... //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#4 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#4 (text+ko) ==== > > @@ -40,6 +40,7 @@ > > #include "opt_inet.h" > #include "opt_inet6.h" > +#include "opt_mac.h" > > #include > #include > @@ -2019,6 +2020,9 @@ > > sendpkt: > > +#ifdef MAC > + mac_create_mbuf_linklayer_for_ifnet(ifp, m); > +#endif > if ((ifp->if_flags & IFF_LOOPBACK) != 0) { > return((*ifp->if_output)(origifp, m, (struct sockaddr *)dst, > rt)); > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 23 8: 0:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58AD737B419; Sat, 23 Mar 2002 08:00:39 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4217737B417 for ; Sat, 23 Mar 2002 08:00:38 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2NG0bp72377 for perforce@freebsd.org; Sat, 23 Mar 2002 08:00:37 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Sat, 23 Mar 2002 08:00:37 -0800 (PST) Message-Id: <200203231600.g2NG0bp72377@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 8263 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8263 Change 8263 by tmm@tmm_sparc64 on 2002/03/23 07:59:53 Integ. minor stuff from sparc64-tmm: remove debugging printf, bump hme rx descriptors again. Affected files ... ... //depot/projects/sparc64/sys/dev/hme/if_hmevar.h#10 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/bus_machdep.c#15 integrate Differences ... ==== //depot/projects/sparc64/sys/dev/hme/if_hmevar.h#10 (text+ko) ==== @@ -48,9 +48,8 @@ * TX descriptors have less static cost (a dma map is allocated which could * cause bounce buffers to be reserved; other that that, the only required * memory is sizeof(struct hme_txdesc)). - * Both must be a multiple of 16, and <= 128. */ -#define HME_NRXDESC 64 +#define HME_NRXDESC 128 #define HME_NTXDESC 64 /* Maximum size of a mapped RX buffer. */ ==== //depot/projects/sparc64/sys/sparc64/sparc64/bus_machdep.c#15 (text+ko) ==== @@ -243,7 +243,6 @@ while (dmat != NULL) { parent = dmat->parent; dmat->ref_count--; - printf("tag_destroy\n"); if (dmat->ref_count == 0) { free(dmat, M_DEVBUF); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 23 8:13:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A917F37B41C; Sat, 23 Mar 2002 08:12:55 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8873D37B41D for ; Sat, 23 Mar 2002 08:12:54 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2NGCsR77706 for perforce@freebsd.org; Sat, 23 Mar 2002 08:12:54 -0800 (PST) (envelope-from phk@freebsd.org) Date: Sat, 23 Mar 2002 08:12:54 -0800 (PST) Message-Id: <200203231612.g2NGCsR77706@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to phk@freebsd.org using -f From: Poul-Henning Kamp Subject: PERFORCE change 8266 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8266 Change 8266 by phk@phk_flat on 2002/03/23 08:12:49 Integrate style changes Affected files ... ... //depot/projects/sparc64/sys/sys/conf.h#11 integrate ... //depot/projects/sparc64/sys/sys/disklabel.h#12 integrate ... //depot/projects/sparc64/sys/sys/diskslice.h#4 integrate ... //depot/projects/sparc64/sys/sys/event.h#6 integrate ... //depot/projects/sparc64/sys/sys/file.h#10 integrate ... //depot/projects/sparc64/sys/sys/libkern.h#5 integrate ... //depot/projects/sparc64/sys/sys/malloc.h#5 integrate ... //depot/projects/sparc64/sys/sys/mount.h#8 integrate Differences ... ==== //depot/projects/sparc64/sys/sys/conf.h#11 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * @(#)conf.h 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/conf.h,v 1.142 2002/03/19 20:18:36 alfred Exp $ + * $FreeBSD: src/sys/sys/conf.h,v 1.143 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_CONF_H_ @@ -138,7 +138,7 @@ typedef int d_close_t(dev_t dev, int fflag, int devtype, struct thread *td); typedef void d_strategy_t(struct bio *bp); typedef int d_ioctl_t(dev_t dev, u_long cmd, caddr_t data, - int fflag, struct thread *td); + int fflag, struct thread *td); typedef int d_dump_t(dev_t dev); typedef int d_psize_t(dev_t dev); @@ -153,7 +153,7 @@ typedef int l_read_t(struct tty *tp, struct uio *uio, int flag); typedef int l_write_t(struct tty *tp, struct uio *uio, int flag); typedef int l_ioctl_t(struct tty *tp, u_long cmd, caddr_t data, - int flag, struct thread *td); + int flag, struct thread *td); typedef int l_rint_t(int c, struct tty *tp); typedef int l_start_t(struct tty *tp); typedef int l_modem_t(struct tty *tp, int flag); ==== //depot/projects/sparc64/sys/sys/disklabel.h#12 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)disklabel.h 8.2 (Berkeley) 7/10/94 - * $FreeBSD: src/sys/sys/disklabel.h,v 1.68 2002/03/19 13:54:13 phk Exp $ + * $FreeBSD: src/sys/sys/disklabel.h,v 1.70 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_DISKLABEL_H_ @@ -460,16 +460,15 @@ struct bio_queue_head; int bounds_check_with_label(struct bio *bp, struct disklabel *lp, - int wlabel); -void diskerr(struct bio *bp, char *what, int blkdone, - struct disklabel *lp); + int wlabel); +void diskerr(struct bio *bp, char *what, int blkdone, struct disklabel *lp); dev_t dkmodpart(dev_t dev, int part); dev_t dkmodslice(dev_t dev, int slice); u_int dkunit(dev_t dev); char *readdisklabel(dev_t dev, struct disklabel *lp); void bioqdisksort(struct bio_queue_head *ap, struct bio *bp); int setdisklabel(struct disklabel *olp, struct disklabel *nlp, - u_long openmask); + u_long openmask); int writedisklabel(dev_t dev, struct disklabel *lp); #ifdef __alpha__ struct buf; ==== //depot/projects/sparc64/sys/sys/diskslice.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/diskslice.h,v 1.42 2002/03/19 20:18:36 alfred Exp $ + * $FreeBSD: src/sys/sys/diskslice.h,v 1.43 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_DISKSLICE_H_ @@ -81,16 +81,14 @@ int dscheck(struct bio *bp, struct diskslices *ssp); void dsclose(dev_t dev, int mode, struct diskslices *ssp); void dsgone(struct diskslices **sspp); -int dsinit(dev_t dev, struct disklabel *lp, - struct diskslices **sspp); -int dsioctl(dev_t dev, u_long cmd, caddr_t data, - int flags, struct diskslices **sspp); +int dsinit(dev_t dev, struct disklabel *lp, struct diskslices **sspp); +int dsioctl(dev_t dev, u_long cmd, caddr_t data, int flags, + struct diskslices **sspp); int dsisopen(struct diskslices *ssp); struct diskslices *dsmakeslicestruct(int nslices, struct disklabel *lp); -char *dsname(dev_t dev, int unit, int slice, int part, - char *partname); -int dsopen(dev_t dev, int mode, u_int flags, - struct diskslices **sspp, struct disklabel *lp); +char *dsname(dev_t dev, int unit, int slice, int part, char *partname); +int dsopen(dev_t dev, int mode, u_int flags, struct diskslices **sspp, + struct disklabel *lp); int dssize(dev_t dev, struct diskslices **sspp); #endif /* _KERNEL */ ==== //depot/projects/sparc64/sys/sys/event.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/event.h,v 1.18 2002/03/19 20:18:36 alfred Exp $ + * $FreeBSD: src/sys/sys/event.h,v 1.19 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_EVENT_H_ @@ -136,9 +136,9 @@ struct filterops { int f_isfd; /* true if ident == filedescriptor */ - int (*f_attach) (struct knote *kn); - void (*f_detach) (struct knote *kn); - int (*f_event) (struct knote *kn, long hint); + int (*f_attach)(struct knote *kn); + void (*f_detach)(struct knote *kn); + int (*f_event)(struct knote *kn, long hint); }; struct knote { @@ -188,8 +188,8 @@ __BEGIN_DECLS int kqueue(void); int kevent(int kq, const struct kevent *changelist, int nchanges, - struct kevent *eventlist, int nevents, - const struct timespec *timeout); + struct kevent *eventlist, int nevents, + const struct timespec *timeout); __END_DECLS #endif /* !_KERNEL */ ==== //depot/projects/sparc64/sys/sys/file.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)file.h 8.3 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/file.h,v 1.42 2002/03/19 20:18:36 alfred Exp $ + * $FreeBSD: src/sys/sys/file.h,v 1.43 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_FILE_H_ @@ -79,22 +79,19 @@ int f_msgcount; /* (f) references from message queue */ struct ucred *f_cred; /* credentials associated with descriptor */ struct fileops { - int (*fo_read) (struct file *fp, struct uio *uio, - struct ucred *cred, int flags, - struct thread *td); - int (*fo_write) (struct file *fp, struct uio *uio, - struct ucred *cred, int flags, - struct thread *td); + int (*fo_read)(struct file *fp, struct uio *uio, + struct ucred *cred, int flags, struct thread *td); + int (*fo_write)(struct file *fp, struct uio *uio, + struct ucred *cred, int flags, struct thread *td); #define FOF_OFFSET 1 - int (*fo_ioctl) (struct file *fp, u_long com, - caddr_t data, struct thread *td); - int (*fo_poll) (struct file *fp, int events, - struct ucred *cred, - struct thread *td); - int (*fo_kqfilter) (struct file *fp, struct knote *kn); - int (*fo_stat) (struct file *fp, struct stat *sb, - struct thread *td); - int (*fo_close) (struct file *fp, struct thread *td); + int (*fo_ioctl)(struct file *fp, u_long com, caddr_t data, + struct thread *td); + int (*fo_poll)(struct file *fp, int events, + struct ucred *cred, struct thread *td); + int (*fo_kqfilter)(struct file *fp, struct knote *kn); + int (*fo_stat)(struct file *fp, struct stat *sb, + struct thread *td); + int (*fo_close)(struct file *fp, struct thread *td); } *f_ops; int f_seqcount; /* * count of sequential accesses -- cleared ==== //depot/projects/sparc64/sys/sys/libkern.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)libkern.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/sys/libkern.h,v 1.29 2002/03/19 20:18:39 alfred Exp $ + * $FreeBSD: src/sys/sys/libkern.h,v 1.30 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_LIBKERN_H_ @@ -76,7 +76,7 @@ #endif int locc(int, char *, u_int); void qsort(void *base, size_t nmemb, size_t size, - int (*compar)(const void *, const void *)); + int (*compar)(const void *, const void *)); u_long random(void); char *index(const char *, int); char *rindex(const char *, int); ==== //depot/projects/sparc64/sys/sys/malloc.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)malloc.h 8.5 (Berkeley) 5/3/95 - * $FreeBSD: src/sys/sys/malloc.h,v 1.57 2002/03/19 20:18:40 alfred Exp $ + * $FreeBSD: src/sys/sys/malloc.h,v 1.58 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_MALLOC_H_ @@ -100,19 +100,18 @@ MALLOC_DECLARE(M_IOV); /* XXX struct malloc_type is unused for contig*(). */ -void contigfree(void *addr, unsigned long size, - struct malloc_type *type); -void *contigmalloc(unsigned long size, struct malloc_type *type, - int flags, unsigned long low, unsigned long high, - unsigned long alignment, unsigned long boundary); +void contigfree(void *addr, unsigned long size, struct malloc_type *type); +void *contigmalloc(unsigned long size, struct malloc_type *type, int flags, + unsigned long low, unsigned long high, unsigned long alignment, + unsigned long boundary); void free(void *addr, struct malloc_type *type); void *malloc(unsigned long size, struct malloc_type *type, int flags); void malloc_init(void *); void malloc_uninit(void *); -void *realloc(void *addr, unsigned long size, - struct malloc_type *type, int flags); -void *reallocf(void *addr, unsigned long size, - struct malloc_type *type, int flags); +void *realloc(void *addr, unsigned long size, struct malloc_type *type, + int flags); +void *reallocf(void *addr, unsigned long size, struct malloc_type *type, + int flags); #endif /* _KERNEL */ #endif /* !_SYS_MALLOC_H_ */ ==== //depot/projects/sparc64/sys/sys/mount.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mount.h 8.21 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/sys/mount.h,v 1.120 2002/03/19 20:18:40 alfred Exp $ + * $FreeBSD: src/sys/sys/mount.h,v 1.121 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_MOUNT_H_ @@ -345,32 +345,30 @@ #endif struct vfsops { - int (*vfs_mount) (struct mount *mp, char *path, caddr_t data, - struct nameidata *ndp, struct thread *td); - int (*vfs_start) (struct mount *mp, int flags, - struct thread *td); - int (*vfs_unmount) (struct mount *mp, int mntflags, - struct thread *td); - int (*vfs_root) (struct mount *mp, struct vnode **vpp); - int (*vfs_quotactl) (struct mount *mp, int cmds, uid_t uid, - caddr_t arg, struct thread *td); - int (*vfs_statfs) (struct mount *mp, struct statfs *sbp, - struct thread *td); - int (*vfs_sync) (struct mount *mp, int waitfor, - struct ucred *cred, struct thread *td); - int (*vfs_vget) (struct mount *mp, ino_t ino, int flags, - struct vnode **vpp); - int (*vfs_fhtovp) (struct mount *mp, struct fid *fhp, - struct vnode **vpp); + int (*vfs_mount)(struct mount *mp, char *path, caddr_t data, + struct nameidata *ndp, struct thread *td); + int (*vfs_start)(struct mount *mp, int flags, struct thread *td); + int (*vfs_unmount)(struct mount *mp, int mntflags, + struct thread *td); + int (*vfs_root)(struct mount *mp, struct vnode **vpp); + int (*vfs_quotactl)(struct mount *mp, int cmds, uid_t uid, + caddr_t arg, struct thread *td); + int (*vfs_statfs)(struct mount *mp, struct statfs *sbp, + struct thread *td); + int (*vfs_sync)(struct mount *mp, int waitfor, struct ucred *cred, + struct thread *td); + int (*vfs_vget)(struct mount *mp, ino_t ino, int flags, + struct vnode **vpp); + int (*vfs_fhtovp)(struct mount *mp, struct fid *fhp, + struct vnode **vpp); int (*vfs_checkexp)(struct mount *mp, struct sockaddr *nam, - int *extflagsp, struct ucred **credanonp); - int (*vfs_vptofh) (struct vnode *vp, struct fid *fhp); - int (*vfs_init) (struct vfsconf *); - int (*vfs_uninit) (struct vfsconf *); + int *extflagsp, struct ucred **credanonp); + int (*vfs_vptofh)(struct vnode *vp, struct fid *fhp); + int (*vfs_init)(struct vfsconf *); + int (*vfs_uninit)(struct vfsconf *); int (*vfs_extattrctl)(struct mount *mp, int cmd, - struct vnode *filename_vp, - int attrnamespace, const char *attrname, - struct thread *td); + struct vnode *filename_vp, int attrnamespace, + const char *attrname, struct thread *td); }; #define VFS_MOUNT(MP, PATH, DATA, NDP, P) \ @@ -414,18 +412,18 @@ * exported vnode operations */ int dounmount(struct mount *, int, struct thread *td); -int vfs_mount (struct thread *td, const char *type, char *path, +int vfs_mount(struct thread *td, const char *type, char *path, int flags, void *data); int vfs_setpublicfs /* set publicly exported fs */ - (struct mount *, struct netexport *, struct export_args *); + (struct mount *, struct netexport *, struct export_args *); int vfs_lock(struct mount *); /* lock a vfs */ void vfs_msync(struct mount *, int); void vfs_unlock(struct mount *); /* unlock a vfs */ int vfs_busy(struct mount *, int, struct mtx *, struct thread *td); int vfs_export /* process mount export info */ - (struct mount *, struct export_args *); + (struct mount *, struct export_args *); struct netcred *vfs_export_lookup /* lookup host in fs export list */ - (struct mount *, struct sockaddr *); + (struct mount *, struct sockaddr *); int vfs_allocate_syncvnode(struct mount *); void vfs_getnewfsid(struct mount *); dev_t vfs_getrootfsid(struct mount *); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 23 8:25:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BDC237B41B; Sat, 23 Mar 2002 08:25:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 852EA37B41A for ; Sat, 23 Mar 2002 08:25:09 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2NGP9x79085 for perforce@freebsd.org; Sat, 23 Mar 2002 08:25:09 -0800 (PST) (envelope-from phk@freebsd.org) Date: Sat, 23 Mar 2002 08:25:09 -0800 (PST) Message-Id: <200203231625.g2NGP9x79085@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to phk@freebsd.org using -f From: Poul-Henning Kamp Subject: PERFORCE change 8267 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8267 Change 8267 by phk@phk_flat on 2002/03/23 08:24:38 Various style changes from current Affected files ... ... //depot/projects/sparc64/sys/sys/bio.h#6 integrate ... //depot/projects/sparc64/sys/sys/filedesc.h#8 integrate ... //depot/projects/sparc64/sys/sys/msgbuf.h#4 integrate ... //depot/projects/sparc64/sys/sys/protosw.h#6 integrate ... //depot/projects/sparc64/sys/sys/socketvar.h#14 integrate ... //depot/projects/sparc64/sys/sys/sysent.h#5 integrate ... //depot/projects/sparc64/sys/sys/systm.h#19 integrate Differences ... ==== //depot/projects/sparc64/sys/sys/bio.h#6 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)buf.h 8.9 (Berkeley) 3/30/95 - * $FreeBSD: src/sys/sys/bio.h,v 1.111 2002/03/19 20:18:36 alfred Exp $ + * $FreeBSD: src/sys/sys/bio.h,v 1.112 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_BIO_H_ @@ -144,9 +144,9 @@ static __inline void bioq_init(struct bio_queue_head *head); static __inline void bioq_insert_tail(struct bio_queue_head *head, - struct bio *bp); + struct bio *bp); static __inline void bioq_remove(struct bio_queue_head *head, - struct bio *bp); + struct bio *bp); static __inline struct bio *bioq_first(struct bio_queue_head *head); static __inline void ==== //depot/projects/sparc64/sys/sys/filedesc.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)filedesc.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/filedesc.h,v 1.38 2002/03/19 20:18:36 alfred Exp $ + * $FreeBSD: src/sys/sys/filedesc.h,v 1.39 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_FILEDESC_H_ @@ -139,8 +139,8 @@ #define FILEDESC_LOCK_ASSERT(fd, type) mtx_assert(&(fd)->fd_mtx, (type)) int closef(struct file *fp, struct thread *p); -int dupfdopen(struct thread *td, struct filedesc *fdp, int indx, - int dfd, int mode, int error); +int dupfdopen(struct thread *td, struct filedesc *fdp, int indx, int dfd, + int mode, int error); int falloc(struct thread *p, struct file **resultfp, int *resultfd); int fdalloc(struct thread *p, int want, int *result); int fdavail(struct thread *td, int n); ==== //depot/projects/sparc64/sys/sys/msgbuf.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)msgbuf.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/msgbuf.h,v 1.17 2002/03/19 20:18:40 alfred Exp $ + * $FreeBSD: src/sys/sys/msgbuf.h,v 1.18 2002/03/23 08:46:52 bde Exp $ */ #ifndef _SYS_MSGBUF_H_ @@ -49,7 +49,7 @@ #ifdef _KERNEL extern int msgbuftrigger; extern struct msgbuf *msgbufp; -void msgbufinit (void *ptr, size_t size); +void msgbufinit(void *ptr, size_t size); #if !defined(MSGBUF_SIZE) #define MSGBUF_SIZE 32768 ==== //depot/projects/sparc64/sys/sys/protosw.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)protosw.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/protosw.h,v 1.37 2002/03/19 20:18:41 alfred Exp $ + * $FreeBSD: src/sys/sys/protosw.h,v 1.38 2002/03/23 08:46:52 bde Exp $ */ #ifndef _SYS_PROTOSW_H_ @@ -200,12 +200,12 @@ int (*pru_accept)(struct socket *so, struct sockaddr **nam); int (*pru_attach)(struct socket *so, int proto, struct thread *td); int (*pru_bind)(struct socket *so, struct sockaddr *nam, - struct thread *td); + struct thread *td); int (*pru_connect)(struct socket *so, struct sockaddr *nam, - struct thread *td); + struct thread *td); int (*pru_connect2)(struct socket *so1, struct socket *so2); int (*pru_control)(struct socket *so, u_long cmd, caddr_t data, - struct ifnet *ifp, struct thread *td); + struct ifnet *ifp, struct thread *td); int (*pru_detach)(struct socket *so); int (*pru_disconnect)(struct socket *so); int (*pru_listen)(struct socket *so, struct thread *td); @@ -213,8 +213,8 @@ int (*pru_rcvd)(struct socket *so, int flags); int (*pru_rcvoob)(struct socket *so, struct mbuf *m, int flags); int (*pru_send)(struct socket *so, int flags, struct mbuf *m, - struct sockaddr *addr, struct mbuf *control, - struct thread *td); + struct sockaddr *addr, struct mbuf *control, + struct thread *td); #define PRUS_OOB 0x1 #define PRUS_EOF 0x2 #define PRUS_MORETOCOME 0x4 @@ -231,23 +231,21 @@ * the generic code, these just point to those routines. */ int (*pru_sosend)(struct socket *so, struct sockaddr *addr, - struct uio *uio, struct mbuf *top, - struct mbuf *control, int flags, - struct thread *td); - int (*pru_soreceive)(struct socket *so, - struct sockaddr **paddr, - struct uio *uio, struct mbuf **mp0, - struct mbuf **controlp, int *flagsp); + struct uio *uio, struct mbuf *top, struct mbuf *control, + int flags, struct thread *td); + int (*pru_soreceive)(struct socket *so, struct sockaddr **paddr, + struct uio *uio, struct mbuf **mp0, struct mbuf **controlp, + int *flagsp); int (*pru_sopoll)(struct socket *so, int events, - struct ucred *cred, struct thread *td); + struct ucred *cred, struct thread *td); }; int pru_accept_notsupp(struct socket *so, struct sockaddr **nam); int pru_connect_notsupp(struct socket *so, struct sockaddr *nam, - struct thread *td); + struct thread *td); int pru_connect2_notsupp(struct socket *so1, struct socket *so2); int pru_control_notsupp(struct socket *so, u_long cmd, caddr_t data, - struct ifnet *ifp, struct thread *td); + struct ifnet *ifp, struct thread *td); int pru_listen_notsupp(struct socket *so, struct thread *td); int pru_rcvd_notsupp(struct socket *so, int flags); int pru_rcvoob_notsupp(struct socket *so, struct mbuf *m, int flags); ==== //depot/projects/sparc64/sys/sys/socketvar.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.72 2002/03/20 04:39:32 jeff Exp $ + * $FreeBSD: src/sys/sys/socketvar.h,v 1.73 2002/03/23 08:46:52 bde Exp $ */ #ifndef _SYS_SOCKETVAR_H_ @@ -369,7 +369,7 @@ void sbinsertoob(struct sockbuf *sb, struct mbuf *m0); void sbrelease(struct sockbuf *sb, struct socket *so); int sbreserve(struct sockbuf *sb, u_long cc, struct socket *so, - struct thread *td); + struct thread *td); void sbtoxsockbuf(struct sockbuf *sb, struct xsockbuf *xsb); int sbwait(struct sockbuf *sb); int sb_lock(struct sockbuf *sb); @@ -397,8 +397,7 @@ sodropablereq(struct socket *head); struct socket * sonewconn(struct socket *head, int connstatus); -int sooptcopyin(struct sockopt *sopt, void *buf, size_t len, - size_t minlen); +int sooptcopyin(struct sockopt *sopt, void *buf, size_t len, size_t minlen); int sooptcopyout(struct sockopt *sopt, void *buf, size_t len); /* XXX; prepare mbuf for (__FreeBSD__ < 3) routines. */ @@ -407,15 +406,14 @@ int soopt_mcopyout(struct sockopt *sopt, struct mbuf *m); int sopoll(struct socket *so, int events, struct ucred *cred, - struct thread *td); -int soreceive(struct socket *so, struct sockaddr **paddr, - struct uio *uio, struct mbuf **mp0, - struct mbuf **controlp, int *flagsp); + struct thread *td); +int soreceive(struct socket *so, struct sockaddr **paddr, struct uio *uio, + struct mbuf **mp0, struct mbuf **controlp, int *flagsp); int soreserve(struct socket *so, u_long sndcc, u_long rcvcc); void sorflush(struct socket *so); int sosend(struct socket *so, struct sockaddr *addr, struct uio *uio, - struct mbuf *top, struct mbuf *control, int flags, - struct thread *td); + struct mbuf *top, struct mbuf *control, int flags, + struct thread *td); int sosetopt(struct socket *so, struct sockopt *sopt); int soshutdown(struct socket *so, int how); void sotoxsocket(struct socket *so, struct xsocket *xso); ==== //depot/projects/sparc64/sys/sys/sysent.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/sysent.h,v 1.36 2002/03/19 20:18:41 alfred Exp $ + * $FreeBSD: src/sys/sys/sysent.h,v 1.37 2002/03/23 08:46:52 bde Exp $ */ #ifndef _SYS_SYSENT_H_ @@ -68,16 +68,14 @@ /* translate trap-to-signal mapping */ int (*sv_fixup)(register_t **, struct image_params *); /* stack fixup function */ - void (*sv_sendsig)(void (*)(int), int, - struct __sigset *, u_long); - /* send signal */ + void (*sv_sendsig)(void (*)(int), int, struct __sigset *, + u_long); /* send signal */ char *sv_sigcode; /* start of sigtramp code */ int *sv_szsigcode; /* size of sigtramp code */ - void (*sv_prepsyscall)(struct trapframe *, int *, - u_int *, caddr_t *); + void (*sv_prepsyscall)(struct trapframe *, int *, u_int *, + caddr_t *); char *sv_name; /* name of binary type */ - int (*sv_coredump)(struct thread *, struct vnode *, - off_t); + int (*sv_coredump)(struct thread *, struct vnode *, off_t); /* function to dump core, or NULL */ int (*sv_imgact_try)(struct image_params *); int sv_minsigstksz; /* minimum signal stack size */ @@ -124,7 +122,7 @@ NULL, NULL); int syscall_register(int *offset, struct sysent *new_sysent, - struct sysent *old_sysent); + struct sysent *old_sysent); int syscall_deregister(int *offset, struct sysent *old_sysent); int syscall_module_handler(struct module *mod, int what, void *arg); ==== //depot/projects/sparc64/sys/sys/systm.h#19 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.165 2002/03/22 19:57:41 rwatson Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.166 2002/03/23 08:46:52 bde Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -135,7 +135,7 @@ void init_param2(int physpages); void tablefull(const char *); int kvprintf(char const *, void (*)(int, void*), void *, int, - _BSD_VA_LIST_) __printflike(1, 0); + _BSD_VA_LIST_) __printflike(1, 0); void log(int, const char *, ...) __printflike(2, 3); void log_console(struct uio *); int printf(const char *, ...) __printflike(1, 2); @@ -166,9 +166,9 @@ void *memcpy(void *to, const void *from, size_t len); int copystr(const void *kfaddr, void *kdaddr, size_t len, - size_t *lencopied); + size_t *lencopied); int copyinstr(const void *udaddr, void *kaddr, size_t len, - size_t *lencopied); + size_t *lencopied); int copyin(const void *udaddr, void *kaddr, size_t len); int copyout(const void *kaddr, void *udaddr, size_t len); @@ -269,8 +269,7 @@ int rm_at_exit(exitlist_fn function); /* Fork callout list declarations. */ -typedef void (*forklist_fn)(struct proc *parent, struct proc *child, - int flags); +typedef void (*forklist_fn)(struct proc *parent, struct proc *child, int flags); int at_fork(forklist_fn function); int rm_at_fork(forklist_fn function); @@ -297,7 +296,7 @@ * less often. */ int msleep(void *chan, struct mtx *mtx, int pri, const char *wmesg, - int timo); + int timo); #define tsleep(chan, pri, wmesg, timo) msleep(chan, NULL, pri, wmesg, timo) void wakeup(void *chan); void wakeup_one(void *chan); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 23 8:37:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D8AC37B417; Sat, 23 Mar 2002 08:36:30 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 620C637B404 for ; Sat, 23 Mar 2002 08:36:28 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2NGaPg80842 for perforce@freebsd.org; Sat, 23 Mar 2002 08:36:25 -0800 (PST) (envelope-from jake@freebsd.org) Date: Sat, 23 Mar 2002 08:36:25 -0800 (PST) Message-Id: <200203231636.g2NGaPg80842@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8268 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8268 Change 8268 by jake@jake_sparc64 on 2002/03/23 08:35:25 IFC@8264 Affected files ... ... //depot/projects/sparc64/gnu/usr.bin/binutils/gdb/Makefile#3 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/_ctx_start.S#2 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/_setjmp.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/alloca.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/fabs.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/frexp.c#3 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/getcontext.S#2 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/isinf.c#3 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/ldexp.c#3 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/modf.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/rfork_thread.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/setjmp.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/gen/sigsetjmp.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/net/htonl.S#4 integrate ... //depot/projects/sparc64/lib/libc/i386/net/htons.S#4 integrate ... //depot/projects/sparc64/lib/libc/i386/net/ntohl.S#4 integrate ... //depot/projects/sparc64/lib/libc/i386/net/ntohs.S#4 integrate ... //depot/projects/sparc64/lib/libc/i386/stdlib/abs.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/stdlib/div.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/stdlib/labs.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/stdlib/ldiv.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/string/bcmp.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/string/bcopy.S#2 integrate ... //depot/projects/sparc64/lib/libc/i386/string/bzero.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/string/ffs.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/string/index.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/string/memchr.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/string/memcmp.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/string/memcpy.S#2 integrate ... //depot/projects/sparc64/lib/libc/i386/string/memmove.S#2 integrate ... //depot/projects/sparc64/lib/libc/i386/string/memset.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/string/rindex.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/string/strcat.S#4 integrate ... //depot/projects/sparc64/lib/libc/i386/string/strchr.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/string/strcmp.S#4 integrate ... //depot/projects/sparc64/lib/libc/i386/string/strcpy.S#4 integrate ... //depot/projects/sparc64/lib/libc/i386/string/strlen.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/string/strncmp.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/string/strrchr.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/string/swab.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/Ovfork.S#5 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/brk.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/cerror.S#2 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/exect.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/pipe.S#2 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/ptrace.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/reboot.S#2 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/sbrk.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/setlogin.S#2 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/sigreturn.S#3 integrate ... //depot/projects/sparc64/lib/libc/i386/sys/syscall.S#2 integrate ... //depot/projects/sparc64/sys/alpha/include/asm.h#3 integrate ... //depot/projects/sparc64/sys/conf/files#44 integrate ... //depot/projects/sparc64/sys/conf/options#19 integrate ... //depot/projects/sparc64/sys/ddb/db_command.c#7 integrate ... //depot/projects/sparc64/sys/ddb/db_sym.h#3 integrate ... //depot/projects/sparc64/sys/ddb/ddb.h#3 integrate ... //depot/projects/sparc64/sys/dev/bktr/bktr_i2c.c#2 integrate ... //depot/projects/sparc64/sys/dev/bktr/bktr_i2c.h#2 integrate ... //depot/projects/sparc64/sys/dev/bktr/bktr_os.c#6 integrate ... //depot/projects/sparc64/sys/dev/bktr/bktr_reg.h#2 integrate ... //depot/projects/sparc64/sys/dev/iicbus/if_ic.c#3 integrate ... //depot/projects/sparc64/sys/dev/iicbus/iic.c#4 integrate ... //depot/projects/sparc64/sys/dev/iicbus/iicbb.c#2 integrate ... //depot/projects/sparc64/sys/dev/iicbus/iicbb_if.m#2 integrate ... //depot/projects/sparc64/sys/dev/iicbus/iicbus.c#3 integrate ... //depot/projects/sparc64/sys/dev/iicbus/iiconf.c#2 integrate ... //depot/projects/sparc64/sys/dev/iicbus/iiconf.h#2 integrate ... //depot/projects/sparc64/sys/dev/iicbus/iicsmb.c#3 integrate ... //depot/projects/sparc64/sys/dev/ppbus/lpbb.c#2 integrate ... //depot/projects/sparc64/sys/dev/sio/sio.c#14 integrate ... //depot/projects/sparc64/sys/dev/sio/sio_isa.c#8 integrate ... //depot/projects/sparc64/sys/dev/smbus/smb.c#3 integrate ... //depot/projects/sparc64/sys/dev/smbus/smbconf.c#2 integrate ... //depot/projects/sparc64/sys/dev/smbus/smbconf.h#2 integrate ... //depot/projects/sparc64/sys/dev/smbus/smbus.c#3 integrate ... //depot/projects/sparc64/sys/dev/syscons/dragon/dragon_saver.c#1 branch ... //depot/projects/sparc64/sys/dev/syscons/fire/fire_saver.c#2 integrate ... //depot/projects/sparc64/sys/dev/syscons/logo/logo_saver.c#3 integrate ... //depot/projects/sparc64/sys/dev/syscons/rain/rain_saver.c#3 integrate ... //depot/projects/sparc64/sys/dev/syscons/warp/warp_saver.c#3 integrate ... //depot/projects/sparc64/sys/fs/msdosfs/msdosfs_fat.c#4 integrate ... //depot/projects/sparc64/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate ... //depot/projects/sparc64/sys/gnu/ext2fs/ext2_alloc.c#3 integrate ... //depot/projects/sparc64/sys/gnu/ext2fs/ext2_extern.h#4 integrate ... //depot/projects/sparc64/sys/gnu/ext2fs/ext2_inode.c#4 integrate ... //depot/projects/sparc64/sys/gnu/ext2fs/ext2_lookup.c#4 integrate ... //depot/projects/sparc64/sys/gnu/ext2fs/ext2_subr.c#4 integrate ... //depot/projects/sparc64/sys/gnu/ext2fs/ext2_vfsops.c#8 integrate ... //depot/projects/sparc64/sys/gnu/ext2fs/ext2_vnops.c#4 integrate ... //depot/projects/sparc64/sys/i386/conf/NOTES#35 integrate ... //depot/projects/sparc64/sys/i386/i386/bios.c#8 integrate ... //depot/projects/sparc64/sys/i386/i386/db_disasm.c#3 integrate ... //depot/projects/sparc64/sys/i386/i386/db_trace.c#6 integrate ... //depot/projects/sparc64/sys/i386/i386/mp_machdep.c#18 integrate ... //depot/projects/sparc64/sys/i386/i386/sys_machdep.c#12 integrate ... //depot/projects/sparc64/sys/i386/include/asm.h#2 integrate ... //depot/projects/sparc64/sys/i386/include/cpufunc.h#11 integrate ... //depot/projects/sparc64/sys/i386/include/md_var.h#9 integrate ... //depot/projects/sparc64/sys/i386/include/segments.h#4 integrate ... //depot/projects/sparc64/sys/i386/include/smp.h#6 integrate ... //depot/projects/sparc64/sys/i386/isa/cy.c#10 integrate ... //depot/projects/sparc64/sys/i386/isa/icu.h#4 integrate ... //depot/projects/sparc64/sys/i386/isa/if_rdp.c#3 integrate ... //depot/projects/sparc64/sys/i386/isa/mse.c#6 integrate ... //depot/projects/sparc64/sys/i386/isa/npx.c#17 integrate ... //depot/projects/sparc64/sys/i386/isa/rc.c#5 integrate ... //depot/projects/sparc64/sys/i386/pci/pci_bus.c#4 integrate ... //depot/projects/sparc64/sys/ia64/include/asm.h#3 integrate ... //depot/projects/sparc64/sys/isa/ppc.c#4 integrate ... //depot/projects/sparc64/sys/modules/bktr/bktr/Makefile#2 integrate ... //depot/projects/sparc64/sys/modules/i2c/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/controllers/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/controllers/alpm/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/controllers/amdpm/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/controllers/intpm/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/controllers/lpbb/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/controllers/pcf/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/controllers/viapm/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/if_ic/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/iic/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/iicbb/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/iicbus/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/iicsmb/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/smb/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/i2c/smbus/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/syscons/Makefile#2 integrate ... //depot/projects/sparc64/sys/modules/syscons/dragon/Makefile#1 branch ... //depot/projects/sparc64/sys/net/zlib.c#4 integrate ... //depot/projects/sparc64/sys/pci/alpm.c#3 integrate ... //depot/projects/sparc64/sys/pci/intpm.c#4 integrate ... //depot/projects/sparc64/sys/pci/viapm.c#1 branch ... //depot/projects/sparc64/sys/powerpc/include/asm.h#2 integrate ... //depot/projects/sparc64/sys/sparc64/include/asm.h#9 integrate ... //depot/projects/sparc64/sys/sparc64/include/tlb.h#32 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/exception.s#70 integrate ... //depot/projects/sparc64/sys/sys/disklabel.h#13 integrate ... //depot/projects/sparc64/usr.bin/awk/Makefile#2 integrate Differences ... ==== //depot/projects/sparc64/gnu/usr.bin/binutils/gdb/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.52 2002/03/16 19:33:22 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.53 2002/03/23 04:52:01 obrien Exp $ .include "../Makefile.inc0" @@ -67,7 +67,7 @@ YFLAGS= CLEANFILES= init.c init.c-tmp wait.h -CLEANFILES= findvar%UAfix.c +CLEANFILES+= findvar%UAfix.c # We do this by grepping through sources. If that turns out to be too slow, # maybe we could just require every .o file to have an initialization routine ==== //depot/projects/sparc64/lib/libc/i386/gen/_ctx_start.S#2 (text+ko) ==== @@ -24,11 +24,8 @@ * SUCH DAMAGE. */ -/* - * $FreeBSD: src/lib/libc/i386/gen/_ctx_start.S,v 1.1 2002/01/10 02:40:59 deischen Exp $ - */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_ctx_start.S,v 1.2 2002/03/23 02:44:18 obrien Exp $"); /* * _ctx_start((void *func)(int arg1, ..., argn), ==== //depot/projects/sparc64/lib/libc/i386/gen/_setjmp.S#3 (text+ko) ==== @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/gen/_setjmp.S,v 1.15 2001/10/24 20:29:10 peter Exp $" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)_setjmp.s 5.1 (Berkeley) 4/23/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_setjmp.S,v 1.16 2002/03/23 02:05:17 obrien Exp $"); /* * C library -- _setjmp, _longjmp @@ -49,8 +50,6 @@ * The previous signal state is NOT restored. */ -#include - ENTRY(_setjmp) movl 4(%esp),%eax movl 0(%esp),%edx ==== //depot/projects/sparc64/lib/libc/i386/gen/alloca.S#3 (text+ko) ==== @@ -34,15 +34,15 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/gen/alloca.S,v 1.8 2001/10/24 20:29:10 peter Exp $" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)alloca.s 5.2 (Berkeley) 5/14/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/alloca.S,v 1.10 2002/03/23 02:44:18 obrien Exp $"); + /* like alloc, but automatic automatic free in return */ -#include - ENTRY(alloca) popl %edx /* pop return addr */ popl %eax /* pop amount to allocate */ ==== //depot/projects/sparc64/lib/libc/i386/gen/fabs.S#3 (text+ko) ==== @@ -34,12 +34,11 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/gen/fabs.S,v 1.7 2001/10/24 20:29:10 peter Exp $" -#endif /* LIBC_RCS and not lint */ - +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)fabs.s 5.2 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ #include +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/fabs.S,v 1.9 2002/03/23 02:44:18 obrien Exp $"); ENTRY(fabs) fldl 4(%esp) ==== //depot/projects/sparc64/lib/libc/i386/gen/frexp.c#3 (text+ko) ==== @@ -31,8 +31,11 @@ * SUCH DAMAGE. */ +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)frexp.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/frexp.c,v 1.7 2002/03/22 21:52:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/frexp.c,v 1.8 2002/03/23 02:05:17 obrien Exp $"); #include #include ==== //depot/projects/sparc64/lib/libc/i386/gen/getcontext.S#2 (text+ko) ==== @@ -24,11 +24,8 @@ * SUCH DAMAGE. */ -/* - * $FreeBSD: src/lib/libc/i386/gen/getcontext.S,v 1.1 2002/01/10 02:40:59 deischen Exp $ - */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/getcontext.S,v 1.2 2002/03/23 02:44:18 obrien Exp $"); /* * Where do we define these? ==== //depot/projects/sparc64/lib/libc/i386/gen/isinf.c#3 (text+ko) ==== @@ -31,8 +31,11 @@ * SUCH DAMAGE. */ +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)isinf.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/isinf.c,v 1.8 2002/03/22 21:52:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/isinf.c,v 1.9 2002/03/23 02:05:17 obrien Exp $"); #include ==== //depot/projects/sparc64/lib/libc/i386/gen/ldexp.c#3 (text+ko) ==== @@ -34,8 +34,11 @@ * SUCH DAMAGE. */ +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)ldexp.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/ldexp.c,v 1.8 2002/03/22 21:52:10 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/ldexp.c,v 1.9 2002/03/23 02:05:17 obrien Exp $"); /* * ldexp(value, exp): return value * (2 ** exp). ==== //depot/projects/sparc64/lib/libc/i386/gen/modf.S#3 (text+ko) ==== @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/gen/modf.S,v 1.8 2001/10/24 20:29:10 peter Exp $" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)modf.s 5.5 (Berkeley) 3/18/91" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/modf.S,v 1.9 2002/03/23 02:05:17 obrien Exp $"); /* * modf(value, iptr): return fractional part of value, and stores the @@ -49,8 +50,6 @@ /* With CHOP mode on, frndint behaves as TRUNC does. Useful. */ -#include - ENTRY(modf) pushl %ebp movl %esp,%ebp ==== //depot/projects/sparc64/lib/libc/i386/gen/rfork_thread.S#3 (text+ko) ==== @@ -22,10 +22,11 @@ * 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. - * - * $FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.3 2001/11/27 20:51:26 jhb Exp $ */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.4 2002/03/23 02:44:18 obrien Exp $"); + /* * With thanks to John Dyson for the original version of this. */ ==== //depot/projects/sparc64/lib/libc/i386/gen/setjmp.S#3 (text+ko) ==== @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/gen/setjmp.S,v 1.21 2001/10/24 20:29:10 peter Exp $" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/setjmp.S,v 1.22 2002/03/23 02:05:17 obrien Exp $"); /* * C library -- _setjmp, _longjmp ==== //depot/projects/sparc64/lib/libc/i386/gen/sigsetjmp.S#3 (text+ko) ==== @@ -32,12 +32,16 @@ * 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. + * + * @(#)setjmp.s 5.1 (Berkeley) 4/23/90" */ -#if defined(LIBC_RCS) && !defined(lint) +#if defined(LIBC_SCCS) && !defined(lint) .text - .asciz "$FreeBSD: src/lib/libc/i386/gen/sigsetjmp.S,v 1.23 2001/10/24 20:29:10 peter Exp $" -#endif /* LIBC_RCS and not lint */ + .asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/sigsetjmp.S,v 1.24 2002/03/23 02:05:19 obrien Exp $"); #include "SYS.h" ==== //depot/projects/sparc64/lib/libc/i386/net/htonl.S#4 (text+ko) ==== @@ -34,15 +34,14 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/net/htonl.S,v 1.8 2002/02/18 20:35:16 mike Exp $" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)htonl.s 5.3 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/net/htonl.S,v 1.9 2002/03/23 02:06:08 obrien Exp $"); /* netorder = htonl(hostorder) */ -#include - .weak CNAME(htonl) .set CNAME(htonl),CNAME(__htonl) ENTRY(__htonl) ==== //depot/projects/sparc64/lib/libc/i386/net/htons.S#4 (text+ko) ==== @@ -34,15 +34,14 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/net/htons.S,v 1.8 2002/02/18 20:35:16 mike Exp $" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)htons.s 5.2 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/net/htons.S,v 1.9 2002/03/23 02:06:08 obrien Exp $"); /* netorder = htons(hostorder) */ -#include - .weak CNAME(htons) .set CNAME(htons),CNAME(__htons) ENTRY(__htons) ==== //depot/projects/sparc64/lib/libc/i386/net/ntohl.S#4 (text+ko) ==== @@ -34,15 +34,14 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/net/ntohl.S,v 1.8 2002/02/18 20:35:16 mike Exp $" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)ntohl.s 5.2 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/net/ntohl.S,v 1.9 2002/03/23 02:06:08 obrien Exp $"); /* hostorder = ntohl(netorder) */ -#include - .weak CNAME(ntohl) .set CNAME(ntohl),CNAME(__ntohl) ENTRY(__ntohl) ==== //depot/projects/sparc64/lib/libc/i386/net/ntohs.S#4 (text+ko) ==== @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/net/ntohs.S,v 1.8 2002/02/18 20:35:16 mike Exp $" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)ntohs.s 5.2 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/net/ntohs.S,v 1.9 2002/03/23 02:06:08 obrien Exp $"); /* hostorder = ntohs(netorder) */ ==== //depot/projects/sparc64/lib/libc/i386/stdlib/abs.S#3 (text+ko) ==== @@ -34,12 +34,13 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/stdlib/abs.S,v 1.8 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ +#if defined(LIBC_SCCS) && !defined(lint) + .text + .asciz "@(#)abs.s 5.2 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/abs.S,v 1.9 2002/03/23 02:07:11 obrien Exp $"); -#include ENTRY(abs) movl 4(%esp),%eax ==== //depot/projects/sparc64/lib/libc/i386/stdlib/div.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/stdlib/div.S,v 1.6 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/div.S,v 1.7 2002/03/23 02:44:19 obrien Exp $"); ENTRY(div) movl 4(%esp),%eax ==== //depot/projects/sparc64/lib/libc/i386/stdlib/labs.S#3 (text+ko) ==== @@ -34,12 +34,13 @@ * SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) +#if defined(LIBC_SCCS) && !defined(lint) .text - .asciz "$FreeBSD: src/lib/libc/i386/stdlib/labs.S,v 1.8 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ + .asciz "@(#)abs.s 5.2 (Berkeley) 12/17/90" +#endif /* LIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/labs.S,v 1.9 2002/03/23 02:07:11 obrien Exp $"); -#include ENTRY(labs) movl 4(%esp),%eax ==== //depot/projects/sparc64/lib/libc/i386/stdlib/ldiv.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/stdlib/ldiv.S,v 1.6 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/ldiv.S,v 1.7 2002/03/23 02:44:19 obrien Exp $"); ENTRY(ldiv) movl 4(%esp),%eax ==== //depot/projects/sparc64/lib/libc/i386/string/bcmp.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/bcmp.S,v 1.7 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/bcmp.S,v 1.8 2002/03/23 02:44:19 obrien Exp $"); /* * bcmp (void *b1, void *b2, size_t len) ==== //depot/projects/sparc64/lib/libc/i386/string/bcopy.S#2 (text+ko) ==== @@ -34,8 +34,11 @@ */ #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/bcopy.S,v 1.7 2002/03/23 02:44:19 obrien Exp $"); +#if 0 RCSID("$NetBSD: bcopy.S,v 1.6 1996/11/12 00:50:06 jtc Exp $") +#endif /* * (ov)bcopy (src,dst,cnt) ==== //depot/projects/sparc64/lib/libc/i386/string/bzero.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/bzero.S,v 1.7 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/bzero.S,v 1.8 2002/03/23 02:44:19 obrien Exp $"); /* * bzero (void *b, size_t len) ==== //depot/projects/sparc64/lib/libc/i386/string/ffs.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/ffs.S,v 1.7 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/ffs.S,v 1.8 2002/03/23 02:44:19 obrien Exp $"); /* * ffs(value) ==== //depot/projects/sparc64/lib/libc/i386/string/index.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/index.S,v 1.7 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/index.S,v 1.8 2002/03/23 02:44:19 obrien Exp $"); /* * index(s, c) ==== //depot/projects/sparc64/lib/libc/i386/string/memchr.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/memchr.S,v 1.10 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/memchr.S,v 1.11 2002/03/23 02:44:19 obrien Exp $"); /* * memchr (b, c, len) ==== //depot/projects/sparc64/lib/libc/i386/string/memcmp.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/memcmp.S,v 1.7 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/memcmp.S,v 1.8 2002/03/23 02:44:19 obrien Exp $"); /* * memcmp (void *b1, void *b2, size_t len) ==== //depot/projects/sparc64/lib/libc/i386/string/memcpy.S#2 (text+ko) ==== @@ -1,2 +1,5 @@ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/memcpy.S,v 1.2 2002/03/23 02:44:19 obrien Exp $"); + #define MEMCOPY #include "bcopy.S" ==== //depot/projects/sparc64/lib/libc/i386/string/memmove.S#2 (text+ko) ==== @@ -1,2 +1,5 @@ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/memmove.S,v 1.7 2002/03/23 02:44:19 obrien Exp $"); + #define MEMMOVE #include "bcopy.S" ==== //depot/projects/sparc64/lib/libc/i386/string/memset.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/memset.S,v 1.7 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/memset.S,v 1.8 2002/03/23 02:44:19 obrien Exp $"); /* * memset(void *b, int c, size_t len) ==== //depot/projects/sparc64/lib/libc/i386/string/rindex.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/rindex.S,v 1.7 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/rindex.S,v 1.8 2002/03/23 02:44:19 obrien Exp $"); /* * rindex(s, c) ==== //depot/projects/sparc64/lib/libc/i386/string/strcat.S#4 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/strcat.S,v 1.8 2002/03/10 12:08:28 billf Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/strcat.S,v 1.9 2002/03/23 02:44:19 obrien Exp $"); /* * strcat(s, append) ==== //depot/projects/sparc64/lib/libc/i386/string/strchr.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/strchr.S,v 1.7 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/strchr.S,v 1.8 2002/03/23 02:44:19 obrien Exp $"); /* * strchr(s, c) ==== //depot/projects/sparc64/lib/libc/i386/string/strcmp.S#4 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/strcmp.S,v 1.8 2002/03/10 12:08:28 billf Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/strcmp.S,v 1.9 2002/03/23 02:44:19 obrien Exp $"); /* * strcmp(s1, s2) ==== //depot/projects/sparc64/lib/libc/i386/string/strcpy.S#4 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/strcpy.S,v 1.8 2002/03/10 12:08:28 billf Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/strcpy.S,v 1.9 2002/03/23 02:44:19 obrien Exp $"); /* * strcpy (dst, src) ==== //depot/projects/sparc64/lib/libc/i386/string/strlen.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/strlen.S,v 1.7 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/strlen.S,v 1.8 2002/03/23 02:44:19 obrien Exp $"); /* * strlen (s) ==== //depot/projects/sparc64/lib/libc/i386/string/strncmp.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/strncmp.S,v 1.8 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/strncmp.S,v 1.9 2002/03/23 02:44:19 obrien Exp $"); /* * strncmp(s1, s2, n) ==== //depot/projects/sparc64/lib/libc/i386/string/strrchr.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/strrchr.S,v 1.7 2001/10/24 20:29:11 peter Exp $" -#endif /* LIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/strrchr.S,v 1.8 2002/03/23 02:44:19 obrien Exp $"); /* * strrchr(s, c) ==== //depot/projects/sparc64/lib/libc/i386/string/swab.S#3 (text+ko) ==== @@ -28,12 +28,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#if defined(LIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/string/swab.S,v 1.7 2001/10/24 20:29:11 peter Exp $" -#endif - #include +__FBSDID("$FreeBSD: src/lib/libc/i386/string/swab.S,v 1.8 2002/03/23 02:44:19 obrien Exp $"); /* * void ==== //depot/projects/sparc64/lib/libc/i386/sys/Ovfork.S#5 (text+ko) ==== @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/sys/Ovfork.S,v 1.18 2001/11/27 20:51:26 jhb Exp $" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)Ovfork.s 5.1 (Berkeley) 4/23/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/sys/Ovfork.S,v 1.19 2002/03/23 02:10:28 obrien Exp $"); #include "SYS.h" ==== //depot/projects/sparc64/lib/libc/i386/sys/brk.S#3 (text+ko) ==== @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/sys/brk.S,v 1.9 2001/11/27 20:51:26 jhb Exp $" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)brk.s 5.2 (Berkeley) 12/17/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/sys/brk.S,v 1.10 2002/03/23 02:10:28 obrien Exp $"); #include "SYS.h" ==== //depot/projects/sparc64/lib/libc/i386/sys/cerror.S#2 (text+ko) ==== @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/sys/cerror.S,v 1.11 2001/08/13 14:06:24 ru Exp $" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)cerror.s 5.1 (Berkeley) 4/23/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/sys/cerror.S,v 1.12 2002/03/23 02:10:28 obrien Exp $"); #include "SYS.h" ==== //depot/projects/sparc64/lib/libc/i386/sys/exect.S#3 (text+ko) ==== @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/sys/exect.S,v 1.8 2001/11/27 20:51:26 jhb Exp $" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)exect.s 5.1 (Berkeley) 4/23/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/sys/exect.S,v 1.9 2002/03/23 02:10:28 obrien Exp $"); #include "SYS.h" #include ==== //depot/projects/sparc64/lib/libc/i386/sys/pipe.S#2 (text+ko) ==== @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/sys/pipe.S,v 1.10 2001/08/13 14:06:24 ru Exp $" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)pipe.s 5.1 (Berkeley) 4/23/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/sys/pipe.S,v 1.11 2002/03/23 02:10:28 obrien Exp $"); #include "SYS.h" ==== //depot/projects/sparc64/lib/libc/i386/sys/ptrace.S#3 (text+ko) ==== @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/i386/sys/ptrace.S,v 1.8 2001/11/27 20:51:26 jhb Exp $" -#endif /* SYSLIBC_RCS and not lint */ +#if defined(SYSLIBC_SCCS) && !defined(lint) + .asciz "@(#)ptrace.s 5.1 (Berkeley) 4/23/90" +#endif /* SYSLIBC_SCCS and not lint */ +#include +__FBSDID("$FreeBSD: src/lib/libc/i386/sys/ptrace.S,v 1.9 2002/03/23 02:10:28 obrien Exp $"); #include "SYS.h" ==== //depot/projects/sparc64/lib/libc/i386/sys/reboot.S#2 (text+ko) ==== @@ -34,10 +34,11 @@ * SUCH DAMAGE. */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 23 9: 0: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C51AE37B417; Sat, 23 Mar 2002 08:59:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 309D137B404 for ; Sat, 23 Mar 2002 08:59:57 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2NGxvm84872 for perforce@freebsd.org; Sat, 23 Mar 2002 08:59:57 -0800 (PST) (envelope-from jake@freebsd.org) Date: Sat, 23 Mar 2002 08:59:57 -0800 (PST) Message-Id: <200203231659.g2NGxvm84872@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8270 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8270 Change 8270 by jake@jake_sparc64 on 2002/03/23 08:59:02 utrace -> db_utrace. Affected files ... ... //depot/projects/sparc64/sys/sparc64/sparc64/db_trace.c#25 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/sparc64/db_trace.c#25 (text+ko) ==== @@ -48,7 +48,7 @@ #include static int db_print_trap(struct thread *td, struct trapframe *); -static void utrace(struct thread *td, struct trapframe *tf); +static void db_utrace(struct thread *td, struct trapframe *tf); #define INKERNEL(va) \ ((va) >= VM_MIN_KERNEL_ADDRESS && (va) <= VM_MAX_KERNEL_ADDRESS) @@ -260,7 +260,7 @@ db_printf("userland() at "); db_printsym(tpc, DB_STGY_PROC); db_printf("\n"); - utrace(td, tf); + db_utrace(td, tf); } return (user); } @@ -269,7 +269,7 @@ * User stack trace (debugging aid). */ static void -utrace(struct thread *td, struct trapframe *tf) +db_utrace(struct thread *td, struct trapframe *tf) { struct pcb *pcb; db_addr_t sp, rsp, o7, pc; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 23 11:17:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22B4937B417; Sat, 23 Mar 2002 11:17:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1E2B337B404 for ; Sat, 23 Mar 2002 11:17:48 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2NJHli57841 for perforce@freebsd.org; Sat, 23 Mar 2002 11:17:47 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Sat, 23 Mar 2002 11:17:47 -0800 (PST) Message-Id: <200203231917.g2NJHli57841@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 8281 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8281 Change 8281 by tmm@tmm_sparc64 on 2002/03/23 11:17:07 Remove outdated information from a comment. Affected files ... ... //depot/projects/sparc64/sys/sparc64/sparc64/cache.c#16 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/sparc64/cache.c#16 (text+ko) ==== @@ -127,7 +127,6 @@ * flush is required after to-be-executed data has been fetched this way. * icache_inval_phys(): has roughly same effect as icache_flush() since there * are no writes to I$. - * This function causes problems on UltraSPARC-IIe CPUs. * * dcache_flush(): required when a page mapping is changed from cacheable to * noncacheable, or to resolve illegal aliases. Both cases should happen To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 24 1:49:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E69337B404; Sun, 24 Mar 2002 01:49:48 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2C8EA37B400 for ; Sun, 24 Mar 2002 01:49:47 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2O9nk075716 for perforce@freebsd.org; Sun, 24 Mar 2002 01:49:46 -0800 (PST) (envelope-from phk@freebsd.org) Date: Sun, 24 Mar 2002 01:49:46 -0800 (PST) Message-Id: <200203240949.g2O9nk075716@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to phk@freebsd.org using -f From: Poul-Henning Kamp Subject: PERFORCE change 8315 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8315 Change 8315 by phk@phk_flat on 2002/03/24 01:49:17 get $-FreeBSD into sync Affected files ... ... //depot/projects/sparc64/sys/dev/gem/if_gem.c#12 integrate ... //depot/projects/sparc64/sys/dev/gem/if_gemvar.h#7 integrate Differences ... ==== //depot/projects/sparc64/sys/dev/gem/if_gem.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ * * from: NetBSD: gem.c,v 1.9 2001/10/21 20:45:15 thorpej Exp * - * $FreeBSD: src/sys/dev/gem/if_gem.c,v 1.2 2002/03/20 02:07:21 alfred Exp $ + * $FreeBSD: src/sys/dev/gem/if_gem.c,v 1.3 2002/03/23 19:43:15 tmm Exp $ */ /* ==== //depot/projects/sparc64/sys/dev/gem/if_gemvar.h#7 (text+ko) ==== @@ -25,7 +25,7 @@ * * from: NetBSD: gemvar.h,v 1.5 2001/10/18 15:19:22 thorpej Exp * - * $FreeBSD: src/sys/dev/gem/if_gemvar.h,v 1.2 2002/03/20 02:07:21 alfred Exp $ + * $FreeBSD: src/sys/dev/gem/if_gemvar.h,v 1.3 2002/03/23 19:43:15 tmm Exp $ */ #ifndef _IF_GEMVAR_H To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 24 1:50:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88E4C37B41A; Sun, 24 Mar 2002 01:50:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C7C2E37B419 for ; Sun, 24 Mar 2002 01:50:48 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2O9omS75847 for perforce@freebsd.org; Sun, 24 Mar 2002 01:50:48 -0800 (PST) (envelope-from phk@freebsd.org) Date: Sun, 24 Mar 2002 01:50:48 -0800 (PST) Message-Id: <200203240950.g2O9omS75847@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to phk@freebsd.org using -f From: Poul-Henning Kamp Subject: PERFORCE change 8316 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8316 Change 8316 by phk@phk_flat on 2002/03/24 01:50:28 get $-FreeBSD into sync Affected files ... ... //depot/projects/sparc64/sys/dev/hme/if_hme.c#17 integrate ... //depot/projects/sparc64/sys/dev/hme/if_hme_pci.c#12 integrate ... //depot/projects/sparc64/sys/dev/hme/if_hme_sbus.c#6 integrate ... //depot/projects/sparc64/sys/dev/hme/if_hmevar.h#11 integrate Differences ... ==== //depot/projects/sparc64/sys/dev/hme/if_hme.c#17 (text+ko) ==== @@ -36,7 +36,7 @@ * * from: NetBSD: hme.c,v 1.20 2000/12/14 06:27:25 thorpej Exp * - * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.2 2002/03/09 21:50:25 tmm Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.3 2002/03/23 19:37:11 tmm Exp $ */ /* ==== //depot/projects/sparc64/sys/dev/hme/if_hme_pci.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ * * from: NetBSD: if_hme_pci.c,v 1.4 2001/08/27 22:18:49 augustss Exp * - * $FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.2 2002/03/11 02:37:19 tmm Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme_pci.c,v 1.3 2002/03/23 19:37:11 tmm Exp $ */ /* ==== //depot/projects/sparc64/sys/dev/hme/if_hme_sbus.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ * * from: NetBSD: if_hme_sbus.c,v 1.9 2001/11/13 06:58:17 lukem Exp * - * $FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.1 2002/02/27 17:35:48 tmm Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme_sbus.c,v 1.2 2002/03/23 19:37:11 tmm Exp $ */ /* ==== //depot/projects/sparc64/sys/dev/hme/if_hmevar.h#11 (text+ko) ==== @@ -35,7 +35,7 @@ * * from: NetBSD: hmevar.h,v 1.5 2000/06/25 01:10:04 eeh Exp * - * $FreeBSD: src/sys/dev/hme/if_hmevar.h,v 1.1 2002/02/27 17:35:48 tmm Exp $ + * $FreeBSD: src/sys/dev/hme/if_hmevar.h,v 1.2 2002/03/23 19:37:11 tmm Exp $ */ #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 24 1:53: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A63037B419; Sun, 24 Mar 2002 01:52:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C395837B41A for ; Sun, 24 Mar 2002 01:52:51 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2O9qpf76199 for perforce@freebsd.org; Sun, 24 Mar 2002 01:52:51 -0800 (PST) (envelope-from phk@freebsd.org) Date: Sun, 24 Mar 2002 01:52:51 -0800 (PST) Message-Id: <200203240952.g2O9qpf76199@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to phk@freebsd.org using -f From: Poul-Henning Kamp Subject: PERFORCE change 8317 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8317 Change 8317 by phk@phk_flat on 2002/03/24 01:51:57 Style stuff from -current Affected files ... ... //depot/projects/sparc64/sys/isofs/cd9660/cd9660_rrip.c#3 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/cd9660_vfsops.c#7 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/iso.h#4 integrate Differences ... ==== //depot/projects/sparc64/sys/isofs/cd9660/cd9660_rrip.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 - * $FreeBSD: src/sys/isofs/cd9660/cd9660_rrip.c,v 1.21 2002/03/20 07:51:46 alfred Exp $ + * $FreeBSD: src/sys/isofs/cd9660/cd9660_rrip.c,v 1.22 2002/03/24 04:35:23 bde Exp $ */ #include @@ -65,17 +65,16 @@ static int cd9660_rrip_attr(ISO_RRIP_ATTR *p, ISO_RRIP_ANALYZE *ana); static int cd9660_rrip_cont(ISO_RRIP_CONT *p, ISO_RRIP_ANALYZE *ana); static void cd9660_rrip_defattr(struct iso_directory_record *isodir, - ISO_RRIP_ANALYZE *ana); + ISO_RRIP_ANALYZE *ana); static void cd9660_rrip_defname(struct iso_directory_record *isodir, - ISO_RRIP_ANALYZE *ana); + ISO_RRIP_ANALYZE *ana); static void cd9660_rrip_deftstamp(struct iso_directory_record *isodir, - ISO_RRIP_ANALYZE *ana); + ISO_RRIP_ANALYZE *ana); static int cd9660_rrip_device(ISO_RRIP_DEVICE *p, ISO_RRIP_ANALYZE *ana); static int cd9660_rrip_extref(ISO_RRIP_EXTREF *p, ISO_RRIP_ANALYZE *ana); static int cd9660_rrip_idflag(ISO_RRIP_IDFLAG *p, ISO_RRIP_ANALYZE *ana); static int cd9660_rrip_loop(struct iso_directory_record *isodir, - ISO_RRIP_ANALYZE *ana, - RRIP_TABLE *table); + ISO_RRIP_ANALYZE *ana, RRIP_TABLE *table); static int cd9660_rrip_pclink(ISO_RRIP_CLINK *p, ISO_RRIP_ANALYZE *ana); static int cd9660_rrip_reldir(ISO_RRIP_RELDIR *p, ISO_RRIP_ANALYZE *ana); static int cd9660_rrip_slink(ISO_RRIP_SLINK *p, ISO_RRIP_ANALYZE *ana); ==== //depot/projects/sparc64/sys/isofs/cd9660/cd9660_vfsops.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 - * $FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.96 2002/03/20 07:51:46 alfred Exp $ + * $FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.97 2002/03/24 04:35:23 bde Exp $ */ #include @@ -99,7 +99,7 @@ static int iso_get_ssector(dev_t dev, struct thread *td); static int iso_mountfs(struct vnode *devvp, struct mount *mp, - struct thread *td, struct iso_args *argp); + struct thread *td, struct iso_args *argp); /* * Try to find the start of the last data track on this CD-ROM. This ==== //depot/projects/sparc64/sys/isofs/cd9660/iso.h#4 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)iso.h 8.6 (Berkeley) 5/10/95 - * $FreeBSD: src/sys/isofs/cd9660/iso.h,v 1.23 2002/03/20 07:51:46 alfred Exp $ + * $FreeBSD: src/sys/isofs/cd9660/iso.h,v 1.24 2002/03/24 04:35:23 bde Exp $ */ #define ISODCL(from, to) (to - from + 1) @@ -255,11 +255,11 @@ #define blksize(imp, ip, lbn) ((imp)->logical_block_size) int cd9660_vget_internal(struct mount *, ino_t, int, struct vnode **, int, - struct iso_directory_record *); + struct iso_directory_record *); int cd9660_init(struct vfsconf *); int cd9660_uninit(struct vfsconf *); #define cd9660_sysctl ((int (*)(int *, u_int, void *, size_t *, void *, \ - size_t, struct proc *))eopnotsupp) + size_t, struct proc *))eopnotsupp) extern vop_t **cd9660_vnodeop_p; extern vop_t **cd9660_specop_p; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 24 1:57:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1766F37B419; Sun, 24 Mar 2002 01:56:58 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3883637B417 for ; Sun, 24 Mar 2002 01:56:57 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2O9uup76605 for perforce@freebsd.org; Sun, 24 Mar 2002 01:56:56 -0800 (PST) (envelope-from phk@freebsd.org) Date: Sun, 24 Mar 2002 01:56:56 -0800 (PST) Message-Id: <200203240956.g2O9uup76605@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to phk@freebsd.org using -f From: Poul-Henning Kamp Subject: PERFORCE change 8318 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8318 Change 8318 by phk@phk_flat on 2002/03/24 01:56:40 Style changes from current Affected files ... ... //depot/projects/sparc64/sys/kern/kern_proc.c#12 integrate ... //depot/projects/sparc64/sys/kern/kern_sig.c#22 integrate ... //depot/projects/sparc64/sys/kern/tty_compat.c#3 integrate ... //depot/projects/sparc64/sys/kern/uipc_syscalls.c#11 integrate ... //depot/projects/sparc64/sys/kern/uipc_usrreq.c#18 integrate ... //depot/projects/sparc64/sys/kern/vfs_export.c#5 integrate Differences ... ==== //depot/projects/sparc64/sys/kern/kern_proc.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $FreeBSD: src/sys/kern/kern_proc.c,v 1.117 2002/03/20 04:09:58 jeff Exp $ + * $FreeBSD: src/sys/kern/kern_proc.c,v 1.118 2002/03/24 05:09:11 bde Exp $ */ #include @@ -60,13 +60,13 @@ static MALLOC_DEFINE(M_PROC, "proc", "Proc structures"); MALLOC_DEFINE(M_SUBPROC, "subproc", "Proc sub-structures"); -static struct proc *dopfind (register pid_t); +static struct proc *dopfind(register pid_t); -static void doenterpgrp (struct proc *, struct pgrp *); +static void doenterpgrp(struct proc *, struct pgrp *); -static void pgdelete (struct pgrp *); +static void pgdelete(struct pgrp *); -static void orphanpg (struct pgrp *pg); +static void orphanpg(struct pgrp *pg); /* * Other process lists ==== //depot/projects/sparc64/sys/kern/kern_sig.c#22 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.151 2002/03/19 21:24:06 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.152 2002/03/24 05:09:11 bde Exp $ */ #include "opt_compat.h" @@ -74,16 +74,16 @@ #define ONSIG 32 /* NSIG for osig* syscalls. XXX. */ -static int coredump (struct thread *); +static int coredump(struct thread *); static int do_sigaction(struct proc *p, int sig, struct sigaction *act, - struct sigaction *oact, int old); + struct sigaction *oact, int old); static int do_sigprocmask(struct proc *p, int how, sigset_t *set, - sigset_t *oset, int old); + sigset_t *oset, int old); static char *expand_name(const char *, uid_t, pid_t); -static int killpg1 (struct proc *cp, int sig, int pgid, int all); -static int sig_ffs (sigset_t *set); -static int sigprop (int sig); -static void stop (struct proc *); +static int killpg1(struct proc *cp, int sig, int pgid, int all); +static int sig_ffs(sigset_t *set); +static int sigprop(int sig); +static void stop(struct proc *); static int filt_sigattach(struct knote *kn); static void filt_sigdetach(struct knote *kn); ==== //depot/projects/sparc64/sys/kern/tty_compat.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_compat.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/kern/tty_compat.c,v 1.30 2002/03/19 21:24:06 alfred Exp $ + * $FreeBSD: src/sys/kern/tty_compat.c,v 1.31 2002/03/24 05:09:11 bde Exp $ */ #include "opt_compat.h" @@ -48,10 +48,10 @@ #include #include -static int ttcompatgetflags (struct tty *tp); -static void ttcompatsetflags (struct tty *tp, struct termios *t); -static void ttcompatsetlflags (struct tty *tp, struct termios *t); -static int ttcompatspeedtab (int speed, struct speedtab *table); +static int ttcompatgetflags(struct tty *tp); +static void ttcompatsetflags(struct tty *tp, struct termios *t); +static void ttcompatsetlflags(struct tty *tp, struct termios *t); +static int ttcompatspeedtab(int speed, struct speedtab *table); static int ttydebug = 0; SYSCTL_INT(_debug, OID_AUTO, ttydebug, CTLFLAG_RW, &ttydebug, 0, ""); ==== //depot/projects/sparc64/sys/kern/uipc_syscalls.c#11 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.106 2002/03/19 21:24:06 alfred Exp $ + * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.107 2002/03/24 05:09:11 bde Exp $ */ #include "opt_compat.h" @@ -79,13 +79,13 @@ static int sendit(struct thread *td, int s, struct msghdr *mp, int flags); static int recvit(struct thread *td, int s, struct msghdr *mp, - caddr_t namelenp); + caddr_t namelenp); static int accept1(struct thread *td, struct accept_args *uap, int compat); static int getsockname1(struct thread *td, struct getsockname_args *uap, - int compat); + int compat); static int getpeername1(struct thread *td, struct getpeername_args *uap, - int compat); + int compat); /* * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the ==== //depot/projects/sparc64/sys/kern/uipc_usrreq.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.88 2002/03/20 05:30:58 jeff Exp $ + * $FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.89 2002/03/24 05:09:11 bde Exp $ */ #include @@ -82,8 +82,7 @@ static int unp_attach(struct socket *); static void unp_detach(struct unpcb *); static int unp_bind(struct unpcb *,struct sockaddr *, struct thread *); -static int unp_connect(struct socket *,struct sockaddr *, - struct thread *); +static int unp_connect(struct socket *,struct sockaddr *, struct thread *); static void unp_disconnect(struct unpcb *); static void unp_shutdown(struct unpcb *); static void unp_drop(struct unpcb *, int); ==== //depot/projects/sparc64/sys/kern/vfs_export.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_export.c,v 1.314 2002/03/19 21:24:07 alfred Exp $ + * $FreeBSD: src/sys/kern/vfs_export.c,v 1.315 2002/03/24 05:09:11 bde Exp $ */ #include @@ -56,7 +56,7 @@ static void vfs_free_addrlist(struct netexport *nep); static int vfs_free_netcred(struct radix_node *rn, void *w); static int vfs_hang_addrlist(struct mount *mp, struct netexport *nep, - struct export_args *argp); + struct export_args *argp); /* * Network address lookup element To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 24 2: 0: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF72937B41C; Sun, 24 Mar 2002 02:00:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 51D7E37B41B for ; Sun, 24 Mar 2002 02:00:01 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2OA01Y76920 for perforce@freebsd.org; Sun, 24 Mar 2002 02:00:01 -0800 (PST) (envelope-from phk@freebsd.org) Date: Sun, 24 Mar 2002 02:00:01 -0800 (PST) Message-Id: <200203241000.g2OA01Y76920@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to phk@freebsd.org using -f From: Poul-Henning Kamp Subject: PERFORCE change 8319 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8319 Change 8319 by phk@phk_flat on 2002/03/24 01:59:46 Integrate from -current Affected files ... ... //depot/projects/sparc64/sys/sys/mouse.h#2 integrate Differences ... ==== //depot/projects/sparc64/sys/sys/mouse.h#2 (text+ko) ==== @@ -20,7 +20,7 @@ * 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/sys/mouse.h,v 1.18 2001/07/05 08:52:40 dd Exp $ + * $FreeBSD: src/sys/sys/mouse.h,v 1.19 2002/03/24 03:07:07 will Exp $ */ #ifndef _SYS_MOUSE_H_ @@ -158,6 +158,7 @@ #define MOUSE_PROTO_X10MOUSEREM 13 /* X10 MouseRemote, 3 bytes */ #define MOUSE_PROTO_KIDSPAD 14 /* Genius Kidspad */ #define MOUSE_PROTO_VERSAPAD 15 /* Interlink VersaPad, 6 bytes */ +#define MOUSE_PROTO_JOGDIAL 16 /* Vaio's JogDial */ #define MOUSE_RES_UNKNOWN (-1) #define MOUSE_RES_DEFAULT 0 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 24 4:20:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3871437B400; Sun, 24 Mar 2002 04:19:07 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9BA5F37B404 for ; Sun, 24 Mar 2002 04:19:05 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2OCJ5J10154 for perforce@freebsd.org; Sun, 24 Mar 2002 04:19:05 -0800 (PST) (envelope-from phk@freebsd.org) Date: Sun, 24 Mar 2002 04:19:05 -0800 (PST) Message-Id: <200203241219.g2OCJ5J10154@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to phk@freebsd.org using -f From: Poul-Henning Kamp Subject: PERFORCE change 8328 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8328 Change 8328 by phk@phk_flat on 2002/03/24 04:18:48 IFC Affected files ... ... //depot/projects/sparc64/sys/conf/files#45 integrate ... //depot/projects/sparc64/sys/geom/geom.h#3 integrate ... //depot/projects/sparc64/sys/geom/geom_enc.c#1 branch ... //depot/projects/sparc64/sys/geom/geom_mbr.c#2 integrate ... //depot/projects/sparc64/sys/geom/geom_mbrext.c#2 delete ... //depot/projects/sparc64/sys/geom/geom_sunlabel.c#2 integrate Differences ... ==== //depot/projects/sparc64/sys/conf/files#45 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.614 2002/03/23 15:46:53 nsouch Exp $ +# $FreeBSD: src/sys/conf/files,v 1.615 2002/03/24 11:21:33 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -691,11 +691,11 @@ geom/geom_dev.c optional geom geom/geom_disk.c optional geom geom/geom_dump.c optional geom +geom/geom_enc.c optional geom geom/geom_event.c optional geom geom/geom_io.c optional geom geom/geom_kern.c optional geom geom/geom_mbr.c optional geom -geom/geom_mbrext.c optional geom geom/geom_slice.c optional geom geom/geom_subr.c optional geom geom/geom_sunlabel.c optional geom ==== //depot/projects/sparc64/sys/geom/geom.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom.h,v 1.3 2002/03/17 19:15:28 phk Exp $ + * $FreeBSD: src/sys/geom/geom.h,v 1.4 2002/03/24 11:21:40 phk Exp $ */ #include @@ -198,6 +198,13 @@ # define G_T_BIO 2 # define G_T_ACCESS 4 +/* geom_enc.c */ +uint32_t g_dec_be2(u_char *p); +uint32_t g_dec_be4(u_char *p); +uint32_t g_dec_le2(u_char *p); +uint32_t g_dec_le4(u_char *p); +void g_enc_le4(u_char *p, uint32_t u); + /* geom_event.c */ void g_event_init(void); void g_orphan_provider(struct g_provider *pp, int error); ==== //depot/projects/sparc64/sys/geom/geom_mbr.c#2 (text+ko) ==== @@ -32,10 +32,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_mbr.c,v 1.1 2002/03/11 21:42:35 phk Exp $ + * $FreeBSD: src/sys/geom/geom_mbr.c,v 1.2 2002/03/24 11:21:41 phk Exp $ */ - #include #ifndef _KERNEL #include @@ -60,7 +59,42 @@ #include #define MBR_METHOD_NAME "MBR-method" +#define MBREXT_METHOD_NAME "MBREXT-method" + +static void +g_dec_dos_partition(u_char *ptr, struct dos_partition *d) +{ + + d->dp_flag = ptr[0]; + d->dp_shd = ptr[1]; + d->dp_ssect = ptr[2]; + d->dp_scyl = ptr[3]; + d->dp_typ = ptr[4]; + d->dp_ehd = ptr[5]; + d->dp_esect = ptr[6]; + d->dp_ecyl = ptr[7]; + d->dp_start = g_dec_le4(ptr + 8); + d->dp_size = g_dec_le4(ptr + 12); +} +#if 0 +static void +g_enc_dos_partition(u_char *ptr, struct dos_partition *d) +{ + + ptr[0] = d->dp_flag; + ptr[1] = d->dp_shd; + ptr[2] = d->dp_ssect; + ptr[3] = d->dp_scyl; + ptr[4] = d->dp_typ; + ptr[5] = d->dp_ehd; + ptr[6] = d->dp_esect; + ptr[7] = d->dp_ecyl; + g_enc_le4(ptr + 8, d->dp_start); + g_enc_le4(ptr + 12, d->dp_size); +} +#endif + struct g_mbr_softc { int type [NDOSPART]; struct dos_partition dospart[NDOSPART]; @@ -140,6 +174,11 @@ struct g_mbr_softc *ms; u_char *buf; + if (sizeof(struct dos_partition) != 16) { + printf("WARNING: struct dos_partition compiles to %d bytes, should be 16.\n", + sizeof(struct dos_partition)); + return (NULL); + } g_trace(G_T_TOPOLOGY, "mbr_taste(%s,%s)", mp->name, pp->name); g_topology_assert(); gp = g_slice_new(mp, NDOSPART, pp, &cp, &ms, sizeof *ms, g_mbr_start); @@ -163,7 +202,10 @@ g_free(buf); break; } - bcopy(buf + DOSPARTOFF, dp, sizeof(dp)); + for (i = 0; i < NDOSPART; i++) + g_dec_dos_partition( + buf + DOSPARTOFF + i * sizeof(struct dos_partition), + dp + i); g_free(buf); if (bcmp(dp, historical_bogus_partition_table, sizeof historical_bogus_partition_table) == 0) @@ -209,3 +251,141 @@ }; DECLARE_GEOM_METHOD(g_mbr_method, g_mbr); + +#define NDOSEXTPART 32 +struct g_mbrext_softc { + int type [NDOSEXTPART]; +}; + +static int +g_mbrext_start(struct bio *bp) +{ + struct g_provider *pp; + struct g_geom *gp; + struct g_mbrext_softc *mp; + struct g_slicer *gsp; + int index; + + pp = bp->bio_to; + index = pp->index; + gp = pp->geom; + gsp = gp->softc; + mp = gsp->softc; + if (bp->bio_cmd == BIO_GETATTR) { + if (g_haveattr_int(bp, "MBR::type", mp->type[index])) + return (1); + } + return (0); +} + +static void +g_mbrext_dumpconf(struct sbuf *sb, char *indent, struct g_geom *gp, struct g_consumer *cp __unused, struct g_provider *pp) +{ + struct g_mbrext_softc *mp; + struct g_slicer *gsp; + + g_slice_dumpconf(sb, indent, gp, cp, pp); + gsp = gp->softc; + mp = gsp->softc; + if (pp != NULL) { + sbuf_printf(sb, "%s%d\n", + indent, mp->type[pp->index]); + } +} + +static void +g_mbrext_print(int i, struct dos_partition *dp) +{ + g_hexdump(dp, sizeof(dp[0])); + printf("[%d] f:%02x typ:%d", i, dp->dp_flag, dp->dp_typ); + printf(" s(CHS):%d/%d/%d", dp->dp_scyl, dp->dp_shd, dp->dp_ssect); + printf(" e(CHS):%d/%d/%d", dp->dp_ecyl, dp->dp_ehd, dp->dp_esect); + printf(" s:%d l:%d\n", dp->dp_start, dp->dp_size); +} + +static struct g_geom * +g_mbrext_taste(struct g_method *mp, struct g_provider *pp, struct thread *tp __unused, int insist __unused) +{ + struct g_geom *gp; + struct g_consumer *cp; + struct g_provider *pp2; + int error, i, j, slice; + struct g_mbrext_softc *ms; + off_t off; + u_char *buf; + struct dos_partition dp[4]; + + g_trace(G_T_TOPOLOGY, "g_mbrext_taste(%s,%s)", mp->name, pp->name); + g_topology_assert(); + if (strcmp(pp->geom->method->name, MBR_METHOD_NAME)) + return (NULL); + gp = g_slice_new(mp, NDOSEXTPART, pp, &cp, &ms, sizeof *ms, g_mbrext_start); + if (gp == NULL) + return (NULL); + g_topology_unlock(); + gp->dumpconf = g_mbrext_dumpconf; + off = 0; + slice = 0; + while (1) { /* a trick to allow us to use break */ + j = sizeof i; + error = g_io_getattr("MBR::type", cp, &j, &i, tp); + if (error || i != DOSPTYP_EXT) + break; + for (;;) { + buf = g_read_data(cp, off, DEV_BSIZE, &error); + if (buf == NULL || error != 0) + break; + if (buf[0x1fe] != 0x55 && buf[0x1ff] != 0xaa) + break; + for (i = 0; i < NDOSPART; i++) + g_dec_dos_partition( + buf + DOSPARTOFF + i * sizeof(struct dos_partition), + dp + i); + g_free(buf); + g_mbrext_print(0, dp); + g_mbrext_print(1, dp + 1); + if (dp[0].dp_flag == 0 && dp[0].dp_size != 0) { + pp2 = g_slice_addslice(gp, slice, + (((off_t)dp[0].dp_start) << 9ULL) + off, + ((off_t)dp[0].dp_size) << 9ULL, + "%*.*s%d", + strlen(gp->name) - 1, + strlen(gp->name) - 1, + gp->name, + slice + 5); + ms->type[slice] = dp[0].dp_typ; + slice++; + g_error_provider(pp2, 0); + } + if (dp[1].dp_flag != 0) + break; + if (dp[1].dp_typ != DOSPTYP_EXT) + break; + if (dp[1].dp_size == 0) + break; + off = ((off_t)dp[1].dp_start) << 9ULL; + } + break; + } + g_topology_lock(); + error = g_access_rel(cp, -1, 0, 0); + if (slice > 0) + return (gp); + + g_topology_assert(); + g_std_spoiled(cp); + g_topology_assert(); + return (NULL); +} + + +static struct g_method g_mbrext_method = { + MBREXT_METHOD_NAME, + g_mbrext_taste, + g_slice_access, + g_slice_orphan, + NULL, + G_METHOD_INITSTUFF +}; + +DECLARE_GEOM_METHOD(g_mbrext_method, g_mbrext); ==== //depot/projects/sparc64/sys/geom/geom_sunlabel.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_sunlabel.c,v 1.1 2002/03/15 21:44:08 phk Exp $ + * $FreeBSD: src/sys/geom/geom_sunlabel.c,v 1.2 2002/03/24 11:21:41 phk Exp $ */ @@ -59,19 +59,6 @@ #define BSD_METHOD_NAME "SUNLABEL-method" -static u_int -g_u16be(u_char *p) -{ - return ((p[0] << 8) | p[1]); -} - -static u_int -g_u32be(u_char *p) -{ - return ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]); -} - - struct g_sunlabel_softc { int foo; }; @@ -141,43 +128,43 @@ break; /* The second last short is a magic number */ - if (g_u16be(buf + 508) != 0xdabe) + if (g_dec_be2(buf + 508) != 0xdabe) break; /* The shortword parity of the entire thing must be even */ u = 0; for (i = 0; i < 512; i += 2) - u ^= g_u16be(buf + i); + u ^= g_dec_be2(buf + i); if (u != 0) break; if (bootverbose) { g_hexdump(buf, 128); for (i = 0; i < 8; i++) { printf("part %d %u %u\n", i, - g_u32be(buf + 444 + i * 8), - g_u32be(buf + 448 + i * 8)); + g_dec_be4(buf + 444 + i * 8), + g_dec_be4(buf + 448 + i * 8)); } - printf("v_version = %d\n", g_u32be(buf + 128)); - printf("v_nparts = %d\n", g_u16be(buf + 140)); + printf("v_version = %d\n", g_dec_be4(buf + 128)); + printf("v_nparts = %d\n", g_dec_be2(buf + 140)); for (i = 0; i < 8; i++) { printf("v_part[%d] = %d %d\n", - i, g_u16be(buf + 142 + i * 4), - g_u16be(buf + 144 + i * 4)); + i, g_dec_be2(buf + 142 + i * 4), + g_dec_be2(buf + 144 + i * 4)); } - printf("v_sanity %x\n", g_u32be(buf + 186)); - printf("v_version = %d\n", g_u32be(buf + 128)); - printf("v_rpm %d\n", g_u16be(buf + 420)); - printf("v_totalcyl %d\n", g_u16be(buf + 422)); - printf("v_cyl %d\n", g_u16be(buf + 432)); - printf("v_alt %d\n", g_u16be(buf + 434)); - printf("v_head %d\n", g_u16be(buf + 436)); - printf("v_sec %d\n", g_u16be(buf + 438)); + printf("v_sanity %x\n", g_dec_be4(buf + 186)); + printf("v_version = %d\n", g_dec_be4(buf + 128)); + printf("v_rpm %d\n", g_dec_be2(buf + 420)); + printf("v_totalcyl %d\n", g_dec_be2(buf + 422)); + printf("v_cyl %d\n", g_dec_be2(buf + 432)); + printf("v_alt %d\n", g_dec_be2(buf + 434)); + printf("v_head %d\n", g_dec_be2(buf + 436)); + printf("v_sec %d\n", g_dec_be2(buf + 438)); } - csize = g_u16be(buf + 436) * g_u16be(buf + 438); + csize = g_dec_be2(buf + 436) * g_dec_be2(buf + 438); for (i = 0; i < 8; i++) { - v = g_u32be(buf + 444 + i * 8); - u = g_u32be(buf + 448 + i * 8); + v = g_dec_be4(buf + 444 + i * 8); + u = g_dec_be4(buf + 448 + i * 8); if (u == 0) continue; npart++; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 24 7: 8: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92FF637B400; Sun, 24 Mar 2002 07:07:35 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7FD9F37B417 for ; Sun, 24 Mar 2002 07:07:33 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2OF7X755460 for perforce@freebsd.org; Sun, 24 Mar 2002 07:07:33 -0800 (PST) (envelope-from phk@freebsd.org) Date: Sun, 24 Mar 2002 07:07:33 -0800 (PST) Message-Id: <200203241507.g2OF7X755460@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to phk@freebsd.org using -f From: Poul-Henning Kamp Subject: PERFORCE change 8333 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8333 Change 8333 by phk@phk_flat on 2002/03/24 07:07:08 IFC Affected files ... ... //depot/projects/sparc64/sys/conf/Makefile.sparc64#33 edit ... //depot/projects/sparc64/sys/geom/geom_bsd.c#3 integrate Differences ... ==== //depot/projects/sparc64/sys/conf/Makefile.sparc64#33 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.17 2002/03/15 08:21:41 obrien Exp $ +# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.15 2002/02/20 23:35:51 peter Exp $ # # Makefile for FreeBSD # @@ -16,8 +16,23 @@ # after which config should be rerun for all machines. # + +.if ${MACHINE_ARCH} == i386 +TOOLPATH= /arch/sparc64/uberbaum/bin +TOOLPREFIX= sparc64-deo-freebsd5- +AR= ${TOOLPATH}/${TOOLPREFIX}ar +CC= ${TOOLPATH}/${TOOLPREFIX}gcc +LD= ${TOOLPATH}/${TOOLPREFIX}ld +NM= ${TOOLPATH}/${TOOLPREFIX}nm +OBJCOPY= ${TOOLPATH}/${TOOLPREFIX}objcopy +OBJDUMP= ${TOOLPATH}/${TOOLPREFIX}objdump +RANLIB= ${TOOLPATH}/${TOOLPREFIX}ranlib +SIZE= ${TOOLPATH}/${TOOLPREFIX}size + +COPT+= -B${TOOLPATH}/ +.endif + MACHINE_ARCH= sparc64 - NO_CPU_COPTFLAGS=true CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ ==== //depot/projects/sparc64/sys/geom/geom_bsd.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_bsd.c,v 1.3 2002/03/17 18:57:49 phk Exp $ + * $FreeBSD: src/sys/geom/geom_bsd.c,v 1.4 2002/03/24 14:27:31 phk Exp $ */ @@ -65,6 +65,129 @@ }; static void +g_bsd_ledec_partition(u_char *ptr, struct partition *d) +{ + d->p_size = g_dec_le4(ptr + 0); + d->p_offset = g_dec_le4(ptr + 4); + d->p_fsize = g_dec_le4(ptr + 8); + d->p_fstype = ptr[12]; + d->p_frag = ptr[13]; + d->p_cpg = g_dec_le2(ptr + 14); +} + +static void +g_bsd_ledec_disklabel(u_char *ptr, struct disklabel *d) +{ + d->d_magic = g_dec_le4(ptr + 0); + d->d_type = g_dec_le2(ptr + 4); + d->d_subtype = g_dec_le2(ptr + 6); + bcopy(ptr + 8, d->d_typename, 16); + bcopy(d->d_packname, ptr + 24, 16); + d->d_secsize = g_dec_le4(ptr + 40); + d->d_nsectors = g_dec_le4(ptr + 44); + d->d_ntracks = g_dec_le4(ptr + 48); + d->d_ncylinders = g_dec_le4(ptr + 52); + d->d_secpercyl = g_dec_le4(ptr + 56); + d->d_secperunit = g_dec_le4(ptr + 60); + d->d_sparespertrack = g_dec_le2(ptr + 64); + d->d_sparespercyl = g_dec_le2(ptr + 66); + d->d_acylinders = g_dec_le4(ptr + 68); + d->d_rpm = g_dec_le2(ptr + 72); + d->d_interleave = g_dec_le2(ptr + 74); + d->d_trackskew = g_dec_le2(ptr + 76); + d->d_cylskew = g_dec_le2(ptr + 78); + d->d_headswitch = g_dec_le4(ptr + 80); + d->d_trkseek = g_dec_le4(ptr + 84); + d->d_flags = g_dec_le4(ptr + 88); + d->d_drivedata[0] = g_dec_le4(ptr + 92); + d->d_drivedata[1] = g_dec_le4(ptr + 96); + d->d_drivedata[2] = g_dec_le4(ptr + 100); + d->d_drivedata[3] = g_dec_le4(ptr + 104); + d->d_drivedata[4] = g_dec_le4(ptr + 108); + d->d_spare[0] = g_dec_le4(ptr + 112); + d->d_spare[1] = g_dec_le4(ptr + 116); + d->d_spare[2] = g_dec_le4(ptr + 120); + d->d_spare[3] = g_dec_le4(ptr + 124); + d->d_spare[4] = g_dec_le4(ptr + 128); + d->d_magic2 = g_dec_le4(ptr + 132); + d->d_checksum = g_dec_le2(ptr + 136); + d->d_npartitions = g_dec_le2(ptr + 138); + d->d_bbsize = g_dec_le4(ptr + 140); + d->d_sbsize = g_dec_le4(ptr + 144); + g_bsd_ledec_partition(ptr + 148, &d->d_partitions[0]); + g_bsd_ledec_partition(ptr + 164, &d->d_partitions[1]); + g_bsd_ledec_partition(ptr + 180, &d->d_partitions[2]); + g_bsd_ledec_partition(ptr + 196, &d->d_partitions[3]); + g_bsd_ledec_partition(ptr + 212, &d->d_partitions[4]); + g_bsd_ledec_partition(ptr + 228, &d->d_partitions[5]); + g_bsd_ledec_partition(ptr + 244, &d->d_partitions[6]); + g_bsd_ledec_partition(ptr + 260, &d->d_partitions[7]); +} + +#if 0 +static void +g_bsd_leenc_partition(u_char *ptr, struct partition *d) +{ + g_enc_le4(ptr + 0, d->p_size); + g_enc_le4(ptr + 4, d->p_offset); + g_enc_le4(ptr + 8, d->p_fsize); + ptr[12] = d->p_fstype; + ptr[13] = d->p_frag; + g_enc_le2(ptr + 14, d->p_cpg); +} + +static void +g_bsd_leenc_disklabel(u_char *ptr, struct disklabel *d) +{ + g_enc_le4(ptr + 0, d->d_magic); + g_enc_le2(ptr + 4, d->d_type); + g_enc_le2(ptr + 6, d->d_subtype); + bcopy(d->d_typename, ptr + 8, 16); + bcopy(d->d_packname, ptr + 24, 16); + g_enc_le4(ptr + 40, d->d_secsize); + g_enc_le4(ptr + 44, d->d_nsectors); + g_enc_le4(ptr + 48, d->d_ntracks); + g_enc_le4(ptr + 52, d->d_ncylinders); + g_enc_le4(ptr + 56, d->d_secpercyl); + g_enc_le4(ptr + 60, d->d_secperunit); + g_enc_le2(ptr + 64, d->d_sparespertrack); + g_enc_le2(ptr + 66, d->d_sparespercyl); + g_enc_le4(ptr + 68, d->d_acylinders); + g_enc_le2(ptr + 72, d->d_rpm); + g_enc_le2(ptr + 74, d->d_interleave); + g_enc_le2(ptr + 76, d->d_trackskew); + g_enc_le2(ptr + 78, d->d_cylskew); + g_enc_le4(ptr + 80, d->d_headswitch); + g_enc_le4(ptr + 84, d->d_trkseek); + g_enc_le4(ptr + 88, d->d_flags); + g_enc_le4(ptr + 92, d->d_drivedata[0]); + g_enc_le4(ptr + 96, d->d_drivedata[1]); + g_enc_le4(ptr + 100, d->d_drivedata[2]); + g_enc_le4(ptr + 104, d->d_drivedata[3]); + g_enc_le4(ptr + 108, d->d_drivedata[4]); + g_enc_le4(ptr + 112, d->d_spare[0]); + g_enc_le4(ptr + 116, d->d_spare[1]); + g_enc_le4(ptr + 120, d->d_spare[2]); + g_enc_le4(ptr + 124, d->d_spare[3]); + g_enc_le4(ptr + 128, d->d_spare[4]); + g_enc_le4(ptr + 132, d->d_magic2); + g_enc_le2(ptr + 136, d->d_checksum); + g_enc_le2(ptr + 138, d->d_npartitions); + g_enc_le4(ptr + 140, d->d_bbsize); + g_enc_le4(ptr + 144, d->d_sbsize); + g_bsd_leenc_partition(ptr + 148, &d->d_partitions[0]); + g_bsd_leenc_partition(ptr + 164, &d->d_partitions[1]); + g_bsd_leenc_partition(ptr + 180, &d->d_partitions[2]); + g_bsd_leenc_partition(ptr + 196, &d->d_partitions[3]); + g_bsd_leenc_partition(ptr + 212, &d->d_partitions[4]); + g_bsd_leenc_partition(ptr + 228, &d->d_partitions[5]); + g_bsd_leenc_partition(ptr + 244, &d->d_partitions[6]); + g_bsd_leenc_partition(ptr + 260, &d->d_partitions[7]); +} + +#endif + +static void ondisk2inram(struct g_bsd_softc *sc) { struct partition *ppp; @@ -82,6 +205,66 @@ sc->inram.d_checksum = dkcksum(&sc->inram); } +/* + * It is rather fortunate that this checksum only covers up to the + * actual end of actual data, otherwise the pointer-screwup in + * alpha architectures would have been much harder to handle. + */ +static int +g_bsd_lesum(struct disklabel *dl, u_char *p) +{ + u_char *pe; + uint16_t sum; + + pe = p + 148 + 16 * dl->d_npartitions; + sum = 0; + while (p < pe) { + sum ^= g_dec_le2(p); + p += 2; + } + return (sum); +} + +static int +g_bsd_i386(struct g_consumer *cp, int secsize, struct disklabel *dl) +{ + int error; + u_char *buf; + + buf = g_read_data(cp, secsize * 1, secsize, &error); + if (buf == NULL || error != 0) + return(ENOENT); + g_bsd_ledec_disklabel(buf, dl); + if (dl->d_magic == DISKMAGIC && + dl->d_magic2 == DISKMAGIC && + g_bsd_lesum(dl, buf) == 0) + error = 0; + else + error = ENOENT; + g_free(buf); + return(error); +} + +static int +g_bsd_alpha(struct g_consumer *cp, int secsize, struct disklabel *dl) +{ + int error; + u_char *buf; + + buf = g_read_data(cp, 0, secsize, &error); + if (buf == NULL || error != 0) + return(ENOENT); + g_bsd_ledec_disklabel(buf + 64, dl); + if (dl->d_magic == DISKMAGIC && + dl->d_magic2 == DISKMAGIC && + g_bsd_lesum(dl, buf) == 0) + error = 0; + else + error = ENOENT; + g_free(buf); + return(error); +} + static int g_bsd_start(struct bio *bp) { @@ -142,7 +325,6 @@ struct g_consumer *cp; struct g_provider *pp2; int error, i, j, npart; - u_char *buf; struct g_bsd_softc *ms; struct disklabel *dl; u_int secsize; @@ -180,18 +362,12 @@ printf("g_error %d Mediasize is %lld bytes\n", error, mediasize); } - buf = g_read_data(cp, secsize * LABELSECTOR, secsize, &error); - if (buf == NULL || error != 0) + error = g_bsd_i386(cp, secsize, &ms->ondisk); + if (error) + error = g_bsd_alpha(cp, secsize, &ms->ondisk); + if (error) break; - bcopy(buf, &ms->ondisk, sizeof(ms->ondisk)); dl = &ms->ondisk; - g_free(buf); - if (dl->d_magic != DISKMAGIC) - break; - if (dl->d_magic2 != DISKMAGIC) - break; - if (dkcksum(dl) != 0) - break; if (bootverbose) g_hexdump(dl, sizeof(*dl)); if (dl->d_secsize < secsize) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 24 12:46:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E18737B419; Sun, 24 Mar 2002 12:46:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6AEA737B404 for ; Sun, 24 Mar 2002 12:46:27 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2OKkR324546 for perforce@freebsd.org; Sun, 24 Mar 2002 12:46:27 -0800 (PST) (envelope-from jake@freebsd.org) Date: Sun, 24 Mar 2002 12:46:27 -0800 (PST) Message-Id: <200203242046.g2OKkR324546@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8344 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8344 Change 8344 by jake@jake_k7 on 2002/03/24 12:45:27 Use a 64 bit status word for the runq bits. Affected files ... ... //depot/projects/sparc64/sys/sys/runq.h#4 edit ... //depot/user/jake/sparc64-jake/sys/sparc64/include/runq.h#1 add Differences ... ==== //depot/projects/sparc64/sys/sys/runq.h#4 (text+ko) ==== @@ -29,6 +29,8 @@ #ifndef _RUNQ_H_ #define _RUNQ_H_ +#include + struct kse; /* @@ -38,19 +40,6 @@ #define RQ_NQS (64) /* Number of run queues. */ #define RQ_PPQ (4) /* Priorities per queue. */ -#define RQB_LEN (2) /* Number of priority status words. */ -#define RQB_L2BPW (5) /* Log2(sizeof(rqb_word_t) * NBBY)). */ -#define RQB_BPW (1<> RQB_L2BPW) -#define RQB_FFS(word) (ffs(word)) - -/* - * Type of run queue status word. - */ -typedef u_int32_t rqb_word_t; - /* * Head of run queues. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 6:40:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 038C837B417; Mon, 25 Mar 2002 06:40:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 20A6C37B405 for ; Mon, 25 Mar 2002 06:40:41 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PEeeK03431 for perforce@freebsd.org; Mon, 25 Mar 2002 06:40:40 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Mon, 25 Mar 2002 06:40:40 -0800 (PST) Message-Id: <200203251440.g2PEeeK03431@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 8371 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8371 Change 8371 by tmm@tmm_sparc64 on 2002/03/25 06:40:39 Integ. misc fixes and cleanups from sparc64-tmm. Affected files ... ... //depot/projects/sparc64/sys/conf/files.sparc64#31 integrate ... //depot/projects/sparc64/sys/sparc64/include/iommureg.h#8 integrate ... //depot/projects/sparc64/sys/sparc64/isa/isa.c#9 integrate ... //depot/projects/sparc64/sys/sparc64/pci/psycho.c#26 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/iommu.c#19 integrate Differences ... ==== //depot/projects/sparc64/sys/conf/files.sparc64#31 (text+ko) ==== @@ -33,8 +33,8 @@ sparc64/fpu/fpu_subr.c standard sparc64/fpu/fpu_sqrt.c standard sparc64/isa/isa.c optional isa -# The following is needed for both ISA and EBus. -sparc64/isa/ofw_isa.c standard +sparc64/isa/ofw_isa.c optional ebus +sparc64/isa/ofw_isa.c optional isa sparc64/pci/apb.c optional apb sparc64/pci/ofw_pci.c optional pci sparc64/pci/psycho.c optional pci ==== //depot/projects/sparc64/sys/sparc64/include/iommureg.h#8 (text+ko) ==== @@ -162,7 +162,7 @@ (((pa) & IOTTE_PAMASK) | ((w) ? IOTTE_W : 0) | \ ((c) ? IOTTE_C : 0) | ((s) ? IOTTE_STREAM : 0) | \ (IOTTE_V | IOTTE_8K)) -#define IOTSBSLOT(va,sz) \ +#define IOTSBSLOT(va) \ ((u_int)(((vm_offset_t)(va)) - (is->is_dvmabase)) >> IO_PAGE_SHIFT) #endif /* !_MACHINE_IOMMUREG_H_ */ ==== //depot/projects/sparc64/sys/sparc64/isa/isa.c#9 (text+ko) ==== @@ -283,11 +283,8 @@ start += base; end += base; if (!INRANGE(start, base, limit) || - !INRANGE(end, base, limit)) { - panic("isa_alloc_resource: resource list entry " - "out of bus range (0x%lx - 0x%lx not in " - "0x%lx - 0x%lx)", start, end, base, limit); - } + !INRANGE(end, base, limit)) + return (NULL); break; case SYS_RES_IRQ: start = end = isa_route_intr_res(bus, start, end); ==== //depot/projects/sparc64/sys/sparc64/pci/psycho.c#26 (text+ko) ==== @@ -507,23 +507,25 @@ psycho_set_intr(sc, 1, dev, PSR_CE_INT_MAP, 0, psycho_ce); psycho_set_intr(sc, 2, dev, PSR_PCIAERR_INT_MAP, INTR_FAST, psycho_bus_a); - psycho_set_intr(sc, 3, dev, PSR_PCIBERR_INT_MAP, INTR_FAST, - psycho_bus_b); psycho_set_intr(sc, 4, dev, PSR_POWER_INT_MAP, INTR_FAST, psycho_powerfail); + /* Psycho-specific initialization. */ + if (sc->sc_mode == PSYCHO_MODE_PSYCHO) { + /* + * Sabres do not have the following two interrupts. + */ + psycho_set_intr(sc, 3, dev, PSR_PCIBERR_INT_MAP, + INTR_FAST, psycho_bus_b); #ifdef PSYCHO_MAP_WAKEUP - /* - * On some models, this is mapped to the same interrupt as - * pciberr by default, so leave it alone for now since - * psycho_wakeup() doesn't do anything useful anyway. - */ - psycho_set_intr(sc, 5, dev, PSR_PWRMGT_INT_MAP, 0, - psycho_wakeup); + /* + * psycho_wakeup() doesn't do anything useful right + * now. + */ + psycho_set_intr(sc, 5, dev, PSR_PWRMGT_INT_MAP, 0, + psycho_wakeup); #endif /* PSYCHO_MAP_WAKEUP */ - - /* Initialize the counter-timer if we handle a psycho. */ - if (sc->sc_mode == PSYCHO_MODE_PSYCHO) { + /* Initialize the counter-timer. */ sparc64_counter_init(sc->sc_bustag, sc->sc_bushandle, PSR_TC0); } ==== //depot/projects/sparc64/sys/sparc64/sparc64/iommu.c#19 (text+ko) ==== @@ -341,12 +341,12 @@ iommu_strbuf_flush_done(is); } DPRINTF(IDB_IOMMU, ("Clearing TSB slot %d for va %p\n", - (int)IOTSBSLOT(va, is->is_tsbsize), (void *)(u_long)va)); - is->is_tsb[IOTSBSLOT(va, is->is_tsbsize)] = tte; + (int)IOTSBSLOT(va), (void *)(u_long)va)); + is->is_tsb[IOTSBSLOT(va)] = tte; IOMMU_WRITE8(is, is_iommu, IMR_FLUSH, va); DPRINTF(IDB_IOMMU, ("iommu_enter: va %lx pa %lx TSB[%lx]@%p=%lx\n", - va, (long)pa, (u_long)IOTSBSLOT(va, is->is_tsbsize), - (void *)(u_long)&is->is_tsb[IOTSBSLOT(va, is->is_tsbsize)], + va, (long)pa, (u_long)IOTSBSLOT(va), + (void *)(u_long)&is->is_tsb[IOTSBSLOT(va)], (u_long)tte)); #ifdef IOMMU_DIAG iommu_diag(is, va); @@ -379,20 +379,20 @@ va = trunc_io_page(va); DPRINTF(IDB_IOMMU, ("iommu_remove: va %lx TSB[%lx]@%p\n", - va, (u_long)IOTSBSLOT(va, is->is_tsbsize), - &is->is_tsb[IOTSBSLOT(va, is->is_tsbsize)])); + va, (u_long)IOTSBSLOT(va), + &is->is_tsb[IOTSBSLOT(va)])); while (len > 0) { DPRINTF(IDB_IOMMU, ("iommu_remove: clearing TSB slot %d for va " - "%p size %lx\n", (int)IOTSBSLOT(va, is->is_tsbsize), + "%p size %lx\n", (int)IOTSBSLOT(va), (void *)(u_long)va, (u_long)len)); if (is->is_sb[0] != 0 || is->is_sb[1] != 0) { DPRINTF(IDB_IOMMU, ("iommu_remove: flushing va %p " "TSB[%lx]@%p=%lx, %lu bytes left\n", (void *)(u_long)va, - (long)IOTSBSLOT(va, is->is_tsbsize), + (long)IOTSBSLOT(va), (void *)(u_long)&is->is_tsb[ - IOTSBSLOT(va, is->is_tsbsize)], - (long)(is->is_tsb[IOTSBSLOT(va, is->is_tsbsize)]), + IOTSBSLOT(va)], + (long)(is->is_tsb[IOTSBSLOT(va)]), (u_long)len)); iommu_strbuf_flush(is, va); if (len <= IO_PAGE_SIZE) @@ -400,10 +400,10 @@ DPRINTF(IDB_IOMMU, ("iommu_remove: flushed va %p " "TSB[%lx]@%p=%lx, %lu bytes left\n", (void *)(u_long)va, - (long)IOTSBSLOT(va, is->is_tsbsize), + (long)IOTSBSLOT(va), (void *)(u_long)&is->is_tsb[ - IOTSBSLOT(va,is->is_tsbsize)], - (long)(is->is_tsb[IOTSBSLOT(va, is->is_tsbsize)]), + IOTSBSLOT(va)], + (long)(is->is_tsb[IOTSBSLOT(va)]), (u_long)len)); } @@ -412,7 +412,7 @@ else len -= IO_PAGE_SIZE; - is->is_tsb[IOTSBSLOT(va, is->is_tsbsize)] = 0; + is->is_tsb[IOTSBSLOT(va)] = 0; IOMMU_WRITE8(is, is_iommu, IMR_FLUSH, va); va += IO_PAGE_SIZE; } @@ -844,7 +844,7 @@ IOMMU_WRITE8(is, is_dva, 0, trunc_io_page(va)); membar(StoreStore | StoreLoad); printf("iommu_diag: tte entry %#lx", - is->is_tsb[IOTSBSLOT(va, is->is_tsbsize)]); + is->is_tsb[IOTSBSLOT(va)]); if (is->is_dtcmp != 0) { printf(", tag compare register is %#lx\n" IOMMU_READ8(is, is_dtcmp, 0)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 8: 7:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09CD137B419; Mon, 25 Mar 2002 08:07:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5601737B417 for ; Mon, 25 Mar 2002 08:07:27 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PG7RO34040 for perforce@freebsd.org; Mon, 25 Mar 2002 08:07:27 -0800 (PST) (envelope-from jake@freebsd.org) Date: Mon, 25 Mar 2002 08:07:27 -0800 (PST) Message-Id: <200203251607.g2PG7RO34040@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8373 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8373 Change 8373 by jake@jake_sparc64 on 2002/03/25 08:06:45 Revert last. Should have stayed in my branch. Affected files ... ... //depot/projects/sparc64/sys/sys/runq.h#5 edit Differences ... ==== //depot/projects/sparc64/sys/sys/runq.h#5 (text+ko) ==== @@ -29,8 +29,6 @@ #ifndef _RUNQ_H_ #define _RUNQ_H_ -#include - struct kse; /* @@ -40,6 +38,19 @@ #define RQ_NQS (64) /* Number of run queues. */ #define RQ_PPQ (4) /* Priorities per queue. */ +#define RQB_LEN (2) /* Number of priority status words. */ +#define RQB_L2BPW (5) /* Log2(sizeof(rqb_word_t) * NBBY)). */ +#define RQB_BPW (1<> RQB_L2BPW) +#define RQB_FFS(word) (ffs(word)) + +/* + * Type of run queue status word. + */ +typedef u_int32_t rqb_word_t; + /* * Head of run queues. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 8:57:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1365637B41A; Mon, 25 Mar 2002 08:56:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4610837B405 for ; Mon, 25 Mar 2002 08:56:30 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PGuQS42624 for perforce@freebsd.org; Mon, 25 Mar 2002 08:56:26 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 08:56:26 -0800 (PST) Message-Id: <200203251656.g2PGuQS42624@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8376 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8376 Change 8376 by jhb@jhb_laptop on 2002/03/25 08:56:13 IFC whitespace changes of death. Affected files ... ... //depot/projects/smpng/sys/alpha/conf/GENERIC#13 integrate ... //depot/projects/smpng/sys/alpha/include/ansi.h#10 integrate ... //depot/projects/smpng/sys/alpha/include/asm.h#3 integrate ... //depot/projects/smpng/sys/arm/include/ansi.h#8 integrate ... //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#7 integrate ... //depot/projects/smpng/sys/cam/cam_xpt.c#7 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_da.c#20 integrate ... //depot/projects/smpng/sys/compat/linux/linux_mib.h#4 integrate ... //depot/projects/smpng/sys/conf/Makefile.ia64#16 integrate ... //depot/projects/smpng/sys/conf/Makefile.powerpc#14 integrate ... //depot/projects/smpng/sys/conf/Makefile.sparc64#14 integrate ... //depot/projects/smpng/sys/conf/files#29 integrate ... //depot/projects/smpng/sys/conf/files.i386#20 integrate ... //depot/projects/smpng/sys/conf/files.pc98#20 integrate ... //depot/projects/smpng/sys/conf/files.sparc64#12 integrate ... //depot/projects/smpng/sys/conf/kern.pre.mk#9 integrate ... //depot/projects/smpng/sys/conf/options#14 integrate ... //depot/projects/smpng/sys/ddb/db_command.c#7 integrate ... //depot/projects/smpng/sys/ddb/db_sym.h#3 integrate ... //depot/projects/smpng/sys/ddb/ddb.h#3 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#6 integrate ... //depot/projects/smpng/sys/dev/ata/ata-dma.c#14 integrate ... //depot/projects/smpng/sys/dev/ata/ata-pci.c#15 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#2 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_i2c.h#2 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_os.c#5 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_reg.h#2 integrate ... //depot/projects/smpng/sys/dev/gem/if_gem.c#3 integrate ... //depot/projects/smpng/sys/dev/gem/if_gemvar.h#3 integrate ... //depot/projects/smpng/sys/dev/hme/if_hme.c#3 integrate ... //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#3 integrate ... //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#2 integrate ... //depot/projects/smpng/sys/dev/hme/if_hmevar.h#2 integrate ... //depot/projects/smpng/sys/dev/iicbus/if_ic.c#3 integrate ... //depot/projects/smpng/sys/dev/iicbus/iic.c#4 integrate ... //depot/projects/smpng/sys/dev/iicbus/iicbb.c#2 integrate ... //depot/projects/smpng/sys/dev/iicbus/iicbb_if.m#2 integrate ... //depot/projects/smpng/sys/dev/iicbus/iicbus.c#3 integrate ... //depot/projects/smpng/sys/dev/iicbus/iiconf.c#2 integrate ... //depot/projects/smpng/sys/dev/iicbus/iiconf.h#2 integrate ... //depot/projects/smpng/sys/dev/iicbus/iicsmb.c#3 integrate ... //depot/projects/smpng/sys/dev/ppbus/lpbb.c#2 integrate ... //depot/projects/smpng/sys/dev/sio/sio.c#11 integrate ... //depot/projects/smpng/sys/dev/sio/sio_isa.c#8 integrate ... //depot/projects/smpng/sys/dev/smbus/smb.c#3 integrate ... //depot/projects/smpng/sys/dev/smbus/smbconf.c#2 integrate ... //depot/projects/smpng/sys/dev/smbus/smbconf.h#2 integrate ... //depot/projects/smpng/sys/dev/smbus/smbus.c#3 integrate ... //depot/projects/smpng/sys/dev/sound/midi/midi.h#4 integrate ... //depot/projects/smpng/sys/dev/syscons/dragon/dragon_saver.c#1 branch ... //depot/projects/smpng/sys/dev/syscons/fire/fire_saver.c#2 integrate ... //depot/projects/smpng/sys/dev/syscons/logo/logo_saver.c#3 integrate ... //depot/projects/smpng/sys/dev/syscons/rain/rain_saver.c#3 integrate ... //depot/projects/smpng/sys/dev/syscons/warp/warp_saver.c#3 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_fat.c#4 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate ... //depot/projects/smpng/sys/geom/geom.h#2 integrate ... //depot/projects/smpng/sys/geom/geom_bsd.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_enc.c#1 branch ... //depot/projects/smpng/sys/geom/geom_mbr.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_mbrext.c#2 delete ... //depot/projects/smpng/sys/geom/geom_sunlabel.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_alloc.c#4 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_extern.h#4 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#4 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#5 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#4 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#9 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#5 integrate ... //depot/projects/smpng/sys/i386/conf/NOTES#29 integrate ... //depot/projects/smpng/sys/i386/i386/bios.c#7 integrate ... //depot/projects/smpng/sys/i386/i386/db_disasm.c#4 integrate ... //depot/projects/smpng/sys/i386/i386/db_trace.c#6 integrate ... //depot/projects/smpng/sys/i386/i386/mp_machdep.c#19 integrate ... //depot/projects/smpng/sys/i386/i386/sys_machdep.c#16 integrate ... //depot/projects/smpng/sys/i386/include/ansi.h#10 integrate ... //depot/projects/smpng/sys/i386/include/asm.h#2 integrate ... //depot/projects/smpng/sys/i386/include/cpufunc.h#11 integrate ... //depot/projects/smpng/sys/i386/include/md_var.h#9 integrate ... //depot/projects/smpng/sys/i386/include/segments.h#4 integrate ... //depot/projects/smpng/sys/i386/include/smp.h#5 integrate ... //depot/projects/smpng/sys/i386/isa/cy.c#12 integrate ... //depot/projects/smpng/sys/i386/isa/icu.h#4 integrate ... //depot/projects/smpng/sys/i386/isa/if_rdp.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/mse.c#5 integrate ... //depot/projects/smpng/sys/i386/isa/npx.c#23 integrate ... //depot/projects/smpng/sys/i386/isa/rc.c#6 integrate ... //depot/projects/smpng/sys/i386/isa/spic.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/spicreg.h#2 integrate ... //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#16 integrate ... //depot/projects/smpng/sys/i386/pci/pci_bus.c#4 integrate ... //depot/projects/smpng/sys/ia64/include/ansi.h#9 integrate ... //depot/projects/smpng/sys/ia64/include/asm.h#3 integrate ... //depot/projects/smpng/sys/isa/ppc.c#4 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_rrip.c#3 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#8 integrate ... //depot/projects/smpng/sys/isofs/cd9660/iso.h#4 integrate ... //depot/projects/smpng/sys/kern/imgact_gzip.c#4 integrate ... //depot/projects/smpng/sys/kern/inflate.c#3 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#17 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#26 integrate ... //depot/projects/smpng/sys/kern/tty_compat.c#3 integrate ... //depot/projects/smpng/sys/kern/uipc_syscalls.c#14 integrate ... //depot/projects/smpng/sys/kern/uipc_usrreq.c#17 integrate ... //depot/projects/smpng/sys/kern/vfs_export.c#5 integrate ... //depot/projects/smpng/sys/modules/bktr/bktr/Makefile#2 integrate ... //depot/projects/smpng/sys/modules/i2c/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/alpm/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/amdpm/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/intpm/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/lpbb/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/pcf/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/viapm/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/if_ic/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/iic/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/iicbb/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/iicbus/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/iicsmb/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/smb/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/smbus/Makefile#1 branch ... //depot/projects/smpng/sys/modules/syscons/Makefile#2 integrate ... //depot/projects/smpng/sys/modules/syscons/dragon/Makefile#1 branch ... //depot/projects/smpng/sys/net/bsd_comp.c#3 integrate ... //depot/projects/smpng/sys/net/if_ethersubr.c#14 integrate ... //depot/projects/smpng/sys/net/if_fddisubr.c#5 integrate ... //depot/projects/smpng/sys/net/if_gif.h#5 integrate ... //depot/projects/smpng/sys/net/if_pppvar.h#5 integrate ... //depot/projects/smpng/sys/net/if_tap.c#8 integrate ... //depot/projects/smpng/sys/net/pfil.h#4 integrate ... //depot/projects/smpng/sys/net/ppp_comp.h#3 integrate ... //depot/projects/smpng/sys/net/ppp_deflate.c#3 integrate ... //depot/projects/smpng/sys/net/radix.c#3 integrate ... //depot/projects/smpng/sys/net/route.h#8 integrate ... //depot/projects/smpng/sys/net/zlib.c#4 integrate ... //depot/projects/smpng/sys/netinet/if_ether.h#4 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.h#8 integrate ... //depot/projects/smpng/sys/netinet/in_var.h#5 integrate ... //depot/projects/smpng/sys/netinet/ip_mroute.c#10 integrate ... //depot/projects/smpng/sys/netinet/tcp_input.c#14 integrate ... //depot/projects/smpng/sys/netinet/tcp_usrreq.c#10 integrate ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#15 integrate ... //depot/projects/smpng/sys/netinet6/ah_input.c#5 integrate ... //depot/projects/smpng/sys/netinet6/esp_input.c#5 integrate ... //depot/projects/smpng/sys/netinet6/scope6.c#2 integrate ... //depot/projects/smpng/sys/pc98/conf/GENERIC#16 integrate ... //depot/projects/smpng/sys/pc98/pc98/mse.c#4 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio.c#12 integrate ... //depot/projects/smpng/sys/pc98/pc98/syscons.c#10 integrate ... //depot/projects/smpng/sys/pci/alpm.c#3 integrate ... //depot/projects/smpng/sys/pci/amdpm.c#4 integrate ... //depot/projects/smpng/sys/pci/intpm.c#4 integrate ... //depot/projects/smpng/sys/pci/viapm.c#1 branch ... //depot/projects/smpng/sys/powerpc/include/ansi.h#10 integrate ... //depot/projects/smpng/sys/powerpc/include/asm.h#2 integrate ... //depot/projects/smpng/sys/sparc64/conf/GENERIC#7 integrate ... //depot/projects/smpng/sys/sparc64/ebus/ebus.c#4 integrate ... //depot/projects/smpng/sys/sparc64/ebus/ebusvar.h#2 integrate ... //depot/projects/smpng/sys/sparc64/include/ansi.h#11 integrate ... //depot/projects/smpng/sys/sparc64/include/asm.h#3 integrate ... //depot/projects/smpng/sys/sparc64/include/bus.h#5 integrate ... //depot/projects/smpng/sys/sparc64/include/bus_private.h#1 branch ... //depot/projects/smpng/sys/sparc64/include/clock.h#3 integrate ... //depot/projects/smpng/sys/sparc64/include/iommuvar.h#4 integrate ... //depot/projects/smpng/sys/sparc64/include/ofw_bus.h#2 integrate ... //depot/projects/smpng/sys/sparc64/include/tlb.h#9 integrate ... //depot/projects/smpng/sys/sparc64/isa/isa.c#3 integrate ... //depot/projects/smpng/sys/sparc64/isa/ofw_isa.c#3 integrate ... //depot/projects/smpng/sys/sparc64/pci/apb.c#3 integrate ... //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#3 integrate ... //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#2 integrate ... //depot/projects/smpng/sys/sparc64/pci/psycho.c#5 integrate ... //depot/projects/smpng/sys/sparc64/pci/psychoreg.h#3 integrate ... //depot/projects/smpng/sys/sparc64/pci/psychovar.h#4 integrate ... //depot/projects/smpng/sys/sparc64/sbus/sbus.c#2 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#5 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/cache.c#5 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/db_disasm.c#4 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#9 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/exception.s#16 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#7 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#4 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/ofw_bus.c#2 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pv.c#11 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/trap.c#30 integrate ... //depot/projects/smpng/sys/sys/bio.h#5 integrate ... //depot/projects/smpng/sys/sys/conf.h#12 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#8 integrate ... //depot/projects/smpng/sys/sys/diskslice.h#4 integrate ... //depot/projects/smpng/sys/sys/event.h#7 integrate ... //depot/projects/smpng/sys/sys/file.h#8 integrate ... //depot/projects/smpng/sys/sys/filedesc.h#8 integrate ... //depot/projects/smpng/sys/sys/libkern.h#5 integrate ... //depot/projects/smpng/sys/sys/malloc.h#5 integrate ... //depot/projects/smpng/sys/sys/mount.h#8 integrate ... //depot/projects/smpng/sys/sys/mouse.h#2 integrate ... //depot/projects/smpng/sys/sys/msgbuf.h#4 integrate ... //depot/projects/smpng/sys/sys/protosw.h#6 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#14 integrate ... //depot/projects/smpng/sys/sys/sysent.h#6 integrate ... //depot/projects/smpng/sys/sys/systm.h#24 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#3 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#13 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.132 2002/02/13 07:44:59 rwatson Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.133 2002/03/24 14:35:20 wilko Exp $ machine alpha cpu EV4 @@ -137,7 +137,7 @@ device ppc device ppbus # Parallel port bus (required) device lpt # Printer -device plip # TCP/IP over parallel +#device plip # TCP/IP over parallel device ppi # Parallel port interface device #device vpo # Requires scbus and da ==== //depot/projects/smpng/sys/alpha/include/ansi.h#10 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.25 2002/02/15 22:15:34 wollman Exp $ + * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.26 2002/03/24 11:25:44 obrien Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -81,7 +81,8 @@ } __va_list; #define _BSD_VA_LIST_ __va_list /* va_list */ #endif /* post GCC 2.95 */ -#ifdef __GNUC__ +#if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) +#define __GNUC_VA_LIST typedef _BSD_VA_LIST_ __gnuc_va_list; /* compatibility w/GNU headers*/ #endif ==== //depot/projects/smpng/sys/alpha/include/asm.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * From: NetBSD: asm.h,v 1.18 1997/11/03 04:22:06 ross Exp - * $FreeBSD: src/sys/alpha/include/asm.h,v 1.12 2001/12/11 23:33:39 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/asm.h,v 1.13 2002/03/23 02:01:27 obrien Exp $ */ /* @@ -648,3 +648,9 @@ #endif #endif /* _KERNEL */ + +#if !defined(lint) && !defined(STRIP_FBSDID) +#define __FBSDID(s) .ident s +#else +#define __FBSDID(s) /* nothing */ +#endif /* not lint and not STRIP_FBSDID */ ==== //depot/projects/smpng/sys/arm/include/ansi.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/ansi.h,v 1.15 2001/12/09 19:38:21 obrien Exp $ + * $FreeBSD: src/sys/arm/include/ansi.h,v 1.16 2002/03/24 11:25:45 obrien Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -74,7 +74,8 @@ #else #define _BSD_VA_LIST_ char * /* va_list */ #endif /* post GCC 2.95 */ -#ifdef __GNUC__ +#if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) +#define __GNUC_VA_LIST typedef _BSD_VA_LIST_ __gnuc_va_list; /* compatibility w/GNU headers*/ #endif ==== //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#7 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.37 2002/03/13 11:03:36 ru Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.38 2002/03/23 19:40:27 pb Exp $ */ #include @@ -50,6 +50,7 @@ #define RBX_PAUSE 0x12 /* -p */ #define RBX_DUAL 0x1d /* -D */ #define RBX_PROBEKBD 0x1e /* -P */ +#define RBX_NOINTR 0x1f /* -n */ #define RBX_MASK 0x2005ffff @@ -58,7 +59,7 @@ #define PATH_KERNEL "/kernel" #define ARGS 0x900 -#define NOPT 13 +#define NOPT 14 #define NDEV 5 #define MEM_BASE 0x12 #define MEM_EXT 0x15 @@ -100,7 +101,7 @@ extern uint32_t _end; -static const char optstr[NOPT] = "DhaCcdgmPprsv"; +static const char optstr[NOPT] = "DhaCcdgmnPprsv"; static const unsigned char flags[NOPT] = { RBX_DUAL, RBX_SERIAL, @@ -110,6 +111,7 @@ RBX_KDB, RBX_GDB, RBX_MUTE, + RBX_NOINTR, RBX_PROBEKBD, RBX_PAUSE, RBX_DFLTROOT, @@ -775,6 +777,8 @@ { uint32_t t0, t1; + if (opts & 1 << RBX_NOINTR) + return 0; t0 = 0; for (;;) { if (xgetc(1)) @@ -800,6 +804,8 @@ static int xgetc(int fn) { + if (opts & 1 << RBX_NOINTR) + return 0; for (;;) { if (ioctrl & 0x1 && getc(1)) return fn ? 1 : getc(0); ==== //depot/projects/smpng/sys/cam/cam_xpt.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.122 2002/01/09 03:38:58 msmith Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.123 2002/03/24 00:17:39 simokawa Exp $ */ #include #include @@ -482,6 +482,17 @@ }, { /* + * Maxtor Personal Storage 3000XT (Firewire) + * hangs upon serial number probing. + */ + { + T_DIRECT, SIP_MEDIA_FIXED, "Maxtor", + "1394 storage", "*" + }, + CAM_QUIRK_NOSERIAL, /*mintags*/0, /*maxtags*/0 + }, + { + /* * Would repond to all LUNs if asked for. */ { ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.100 2002/03/11 08:04:59 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.101 2002/03/23 18:18:02 simokawa Exp $ */ #ifdef _KERNEL @@ -416,6 +416,7 @@ static int da_retry_count = DA_DEFAULT_RETRY; static int da_default_timeout = DA_DEFAULT_TIMEOUT; +static int da_no_6_byte = 0; SYSCTL_NODE(_kern_cam, OID_AUTO, da, CTLFLAG_RD, 0, "CAM Direct Access Disk driver"); @@ -423,6 +424,8 @@ &da_retry_count, 0, "Normal I/O retry count"); SYSCTL_INT(_kern_cam_da, OID_AUTO, default_timeout, CTLFLAG_RW, &da_default_timeout, 0, "Normal I/O timeout (in seconds)"); +SYSCTL_INT(_kern_cam_da, OID_AUTO, no_6_byte, CTLFLAG_RW, + &da_no_6_byte, 0, "No 6 bytes commands"); /* * DA_ORDEREDTAG_INTERVAL determines how often, relative @@ -1249,6 +1252,8 @@ } else { tag_code = MSG_SIMPLE_Q_TAG; } + if (da_no_6_byte && softc->minimum_cmd_size == 6) + softc->minimum_cmd_size = 10; scsi_read_write(&start_ccb->csio, /*retries*/da_retry_count, dadone, @@ -1321,6 +1326,48 @@ } } +static int +cmd6workaround(union ccb *ccb) +{ + struct scsi_rw_6 cmd6; + struct scsi_rw_10 *cmd10; + struct da_softc *softc; + struct ccb_scsiio *csio; + u_int8_t opcode; + + csio = &ccb->csio; + opcode = ((struct scsi_rw_6 *)csio->cdb_io.cdb_bytes)->opcode; + + if (opcode != READ_6 && opcode != WRITE_6) + return 0; + + xpt_print_path(ccb->ccb_h.path); + printf("READ(6)/WRITE(6) failed, " + "minimum_cmd_size is increased to 10.\n"); + softc = (struct da_softc *)xpt_path_periph(ccb->ccb_h.path)->softc; + softc->minimum_cmd_size = 10; + + bcopy(&csio->cdb_io.cdb_bytes, &cmd6, sizeof(struct scsi_rw_6)); + cmd10 = (struct scsi_rw_10 *) &csio->cdb_io.cdb_bytes; + cmd10->opcode = (cmd6.opcode == READ_6) ? READ_10 : WRITE_10; + cmd10->byte2 = 0; + scsi_ulto4b(scsi_3btoul(cmd6.addr), cmd10->addr); + cmd10->reserved = 0; + scsi_ulto2b(cmd6.length, cmd10->length); + cmd10->control = cmd6.control; + csio->cdb_len = sizeof(*cmd10); + + /* requeue */ + ccb->ccb_h.status = CAM_REQUEUE_REQ; + xpt_action(ccb); + if ((ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) + cam_release_devq(ccb->ccb_h.path, + /*relsim_flags*/0, + /*reduction*/0, + /*timeout*/0, + /*getcount_only*/0); + return (ERESTART); +} static void dadone(struct cam_periph *periph, union ccb *done_ccb) @@ -1393,6 +1440,11 @@ bp->bio_error = 0; if (bp->bio_resid != 0) { /* Short transfer ??? */ +#if 0 + if (cmd6workaround(done_ccb) + == ERESTART) + return; +#endif bp->bio_flags |= BIO_ERROR; } } @@ -1406,8 +1458,14 @@ if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) panic("REQ_CMP with QFRZN"); bp->bio_resid = csio->resid; - if (csio->resid > 0) + if (csio->resid > 0) { + /* Short transfer ??? */ +#if 0 /* XXX most of the broken umass devices need this ad-hoc work around */ + if (cmd6workaround(done_ccb) == ERESTART) + return; +#endif bp->bio_flags |= BIO_ERROR; + } } /* @@ -1574,10 +1632,26 @@ { struct da_softc *softc; struct cam_periph *periph; + int error, sense_key, error_code, asc, ascq; periph = xpt_path_periph(ccb->ccb_h.path); softc = (struct da_softc *)periph->softc; + /* + * Automatically detect devices that do not support + * READ(6)/WRITE(6) and upgrade to using 10 byte cdbs. + */ + error = 0; + if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_SCSI_STATUS_ERROR + && ccb->csio.scsi_status == SCSI_STATUS_CHECK_COND) { + scsi_extract_sense(&ccb->csio.sense_data, + &error_code, &sense_key, &asc, &ascq); + if (sense_key == SSD_KEY_ILLEGAL_REQUEST) + error = cmd6workaround(ccb); + } + if (error == ERESTART) + return ERESTART; + /* * XXX * Until we have a better way of doing pack validation, ==== //depot/projects/smpng/sys/compat/linux/linux_mib.h#4 (text+ko) ==== @@ -25,19 +25,19 @@ * (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/compat/linux/linux_mib.h,v 1.5 2002/03/20 05:42:02 alfred Exp $ + * $FreeBSD: src/sys/compat/linux/linux_mib.h,v 1.6 2002/03/24 04:04:50 bde Exp $ */ #ifndef _LINUX_MIB_H_ #define _LINUX_MIB_H_ -void linux_get_osname (struct proc *p, char *dst); -int linux_set_osname (struct proc *p, char *osname); +void linux_get_osname(struct proc *p, char *dst); +int linux_set_osname(struct proc *p, char *osname); -void linux_get_osrelease (struct proc *p, char *dst); -int linux_set_osrelease (struct proc *p, char *osrelease); +void linux_get_osrelease(struct proc *p, char *dst); +int linux_set_osrelease(struct proc *p, char *osrelease); -int linux_get_oss_version (struct proc *p); -int linux_set_oss_version (struct proc *p, int oss_version); +int linux_get_oss_version(struct proc *p); +int linux_set_oss_version(struct proc *p, int oss_version); #endif /* _LINUX_MIB_H_ */ ==== //depot/projects/smpng/sys/conf/Makefile.ia64#16 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.47 2002/03/19 10:52:44 peter Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.48 2002/03/24 17:45:46 obrien Exp $ # # Makefile for FreeBSD # @@ -27,7 +27,6 @@ OBJCOPY= ia64-unknown-freebsd5.0-objcopy OBJDUMP= ia64-unknown-freebsd5.0-objdump MACHINE_ARCH= ia64 -FMT= # Needs to be blank for cross tools. # Which version of config(8) is required. %VERSREQ= 500010 ==== //depot/projects/smpng/sys/conf/Makefile.powerpc#14 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.260 2002/02/20 23:35:51 peter Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.261 2002/03/24 17:45:46 obrien Exp $ # # Makefile for FreeBSD # @@ -21,7 +21,6 @@ # Temporary stuff while we're still embryonic NO_MODULES?= yes -FMT= STD8X16FONT?= iso ==== //depot/projects/smpng/sys/conf/Makefile.sparc64#14 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.17 2002/03/15 08:21:41 obrien Exp $ +# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.18 2002/03/24 17:42:06 obrien Exp $ # # Makefile for FreeBSD # @@ -16,16 +16,31 @@ # after which config should be rerun for all machines. # +THIS_ARCH!= uname -m +.if ${THIS_ARCH} != "sparc64" + +TOOLPATH= /arch/sparc64/uberbaum/bin +TOOLPREFIX= sparc64-deo-freebsd5- +AR= ${TOOLPATH}/${TOOLPREFIX}ar +CC= ${TOOLPATH}/${TOOLPREFIX}gcc +LD= ${TOOLPATH}/${TOOLPREFIX}ld +NM= ${TOOLPATH}/${TOOLPREFIX}nm +OBJCOPY= ${TOOLPATH}/${TOOLPREFIX}objcopy +OBJDUMP= ${TOOLPATH}/${TOOLPREFIX}objdump +RANLIB= ${TOOLPATH}/${TOOLPREFIX}ranlib +SIZE= ${TOOLPATH}/${TOOLPREFIX}size + +COPT+= -B${TOOLPATH}/ +NO_CPU_COPTFLAGS=true + MACHINE_ARCH= sparc64 -NO_CPU_COPTFLAGS=true +.endif # cross compiling CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -ansi -FMT= - # Which version of config(8) is required. %VERSREQ= 500010 ==== //depot/projects/smpng/sys/conf/files#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.613 2002/03/19 09:11:46 jeff Exp $ +# $FreeBSD: src/sys/conf/files,v 1.615 2002/03/24 11:21:33 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -690,11 +690,11 @@ geom/geom_dev.c optional geom geom/geom_disk.c optional geom geom/geom_dump.c optional geom +geom/geom_enc.c optional geom geom/geom_event.c optional geom geom/geom_io.c optional geom geom/geom_kern.c optional geom geom/geom_mbr.c optional geom -geom/geom_mbrext.c optional geom geom/geom_slice.c optional geom geom/geom_subr.c optional geom geom/geom_sunlabel.c optional geom @@ -1260,6 +1260,7 @@ pci/ohci_pci.c optional ohci pci/simos.c optional simos pci/uhci_pci.c optional uhci +pci/viapm.c optional viapm pci/xrpu.c optional xrpu posix4/ksched.c optional _kposix_priority_scheduling posix4/p1003_1b.c standard ==== //depot/projects/smpng/sys/conf/files.i386#20 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.395 2002/03/05 09:19:01 ume Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.396 2002/03/25 03:27:09 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -52,8 +52,8 @@ no-implicit-rule # trlld.o optional oltr \ - dependency "$S/contrib/dev/oltr/i386${FMT}.trlld.o.uu" \ - compile-with "uudecode < $S/contrib/dev/oltr/i386${FMT}.trlld.o.uu" \ + dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ + compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ no-implicit-rule # compat/linux/linux_file.c optional compat_linux ==== //depot/projects/smpng/sys/conf/files.pc98#20 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.226 2002/03/05 09:19:01 ume Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.227 2002/03/25 13:03:14 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -49,8 +49,8 @@ no-implicit-rule # trlld.o optional oltr \ - dependency "$S/contrib/dev/oltr/i386${FMT}.trlld.o.uu" \ - compile-with "uudecode < $S/contrib/dev/oltr/i386${FMT}.trlld.o.uu" \ + dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ + compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ no-implicit-rule # compat/linux/linux_file.c optional compat_linux ==== //depot/projects/smpng/sys/conf/files.sparc64#12 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.14 2002/03/09 22:33:14 tmm Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.15 2002/03/25 05:01:05 tmm Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -14,6 +14,7 @@ dev/ofw/openfirm.c standard libkern/ffs.c standard kern/subr_diskmbr.c standard +kern/syscalls.c optional ktr sparc64/ebus/ebus.c count ebus sparc64/isa/isa.c optional isa # The following is needed for both ISA and EBus. ==== //depot/projects/smpng/sys/conf/kern.pre.mk#9 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kenrels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.9 2002/03/01 01:21:29 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.10 2002/03/24 17:45:46 obrien Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -47,7 +47,6 @@ # Select the correct set of tools. Can't set OBJFORMAT here because it # doesn't get exported into the environment, and if it were exported # then it might break building of utilities. -FMT?= -elf CFLAGS+= ${FMT} DEFINED_PROF= ${PROF} ==== //depot/projects/smpng/sys/conf/options#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.304 2002/03/12 04:00:11 jeff Exp $ +# $FreeBSD: src/sys/conf/options,v 1.305 2002/03/23 15:46:54 nsouch Exp $ # # On the handling of kernel options # @@ -441,6 +441,7 @@ BKTR_NO_MSP_RESET opt_bktr.h BKTR_430_FX_MODE opt_bktr.h BKTR_SIS_VIA_MODE opt_bktr.h +BKTR_USE_FREEBSD_SMBUS opt_bktr.h # meteor opt_meteor.h METEOR_ALLOC_PAGES opt_meteor.h ==== //depot/projects/smpng/sys/ddb/db_command.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/ddb/db_command.c,v 1.43 2002/03/20 05:14:27 alfred Exp $ + * $FreeBSD: src/sys/ddb/db_command.c,v 1.44 2002/03/23 11:53:03 bde Exp $ */ /* @@ -101,17 +101,14 @@ #define CMD_AMBIGUOUS 3 #define CMD_HELP 4 -static void db_cmd_list(struct command *table, - struct command **aux_tablep, - struct command **aux_tablep_end); +static void db_cmd_list(struct command *table, struct command **aux_tablep, + struct command **aux_tablep_end); static int db_cmd_search(char *name, struct command *table, - struct command **aux_tablep, - struct command **aux_tablep_end, - struct command **cmdp); + struct command **aux_tablep, + struct command **aux_tablep_end, struct command **cmdp); static void db_command(struct command **last_cmdp, - struct command *cmd_table, - struct command **aux_cmd_tablep, - struct command **aux_cmd_tablep_end); + struct command *cmd_table, struct command **aux_cmd_tablep, + struct command **aux_cmd_tablep_end); /* * Search for command prefix. @@ -504,9 +501,8 @@ int nargs = 0; db_expr_t retval; typedef db_expr_t fcn_10args_t(db_expr_t, db_expr_t, db_expr_t, - db_expr_t, db_expr_t, db_expr_t, - db_expr_t, db_expr_t, db_expr_t, - db_expr_t); + db_expr_t, db_expr_t, db_expr_t, db_expr_t, + db_expr_t, db_expr_t, db_expr_t); fcn_10args_t *func; int t; ==== //depot/projects/smpng/sys/ddb/db_sym.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/ddb/db_sym.h,v 1.20 2002/03/20 05:14:28 alfred Exp $ + * $FreeBSD: src/sys/ddb/db_sym.h,v 1.21 2002/03/23 11:53:03 bde Exp $ */ #ifndef _DDB_DB_SYM_H_ @@ -95,16 +95,12 @@ int db_sym_numargs(c_db_sym_t, int *, char **); boolean_t X_db_line_at_pc(db_symtab_t *symtab, c_db_sym_t cursym, - char **filename, int *linenum, - db_expr_t off); + char **filename, int *linenum, db_expr_t off); c_db_sym_t X_db_lookup(db_symtab_t *stab, const char *symstr); c_db_sym_t X_db_search_symbol(db_symtab_t *symtab, db_addr_t off, - db_strategy_t strategy, - db_expr_t *diffp); -int X_db_sym_numargs(db_symtab_t *, c_db_sym_t, int *, - char **); -void X_db_symbol_values(db_symtab_t *symtab, - c_db_sym_t sym, const char **namep, - db_expr_t *valuep); + db_strategy_t strategy, db_expr_t *diffp); +int X_db_sym_numargs(db_symtab_t *, c_db_sym_t, int *, char **); +void X_db_symbol_values(db_symtab_t *symtab, c_db_sym_t sym, + const char **namep, db_expr_t *valuep); #endif /* !_DDB_DB_SYM_H_ */ ==== //depot/projects/smpng/sys/ddb/ddb.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/ddb.h,v 1.26 2002/03/20 05:14:28 alfred Exp $ + * $FreeBSD: src/sys/ddb/ddb.h,v 1.27 2002/03/23 11:53:03 bde Exp $ */ /* @@ -39,8 +39,8 @@ #include /* type definitions */ -typedef void db_cmdfcn_t(db_expr_t addr, boolean_t have_addr, - db_expr_t count, char *modif); +typedef void db_cmdfcn_t(db_expr_t addr, boolean_t have_addr, db_expr_t count, + char *modif); #define DB_COMMAND(cmd_name, func_name) \ DB_SET(cmd_name, func_name, db_cmd_set) ==== //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.14 2002/02/25 09:51:17 phk Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.15 2002/03/24 11:33:52 phk Exp $ */ #include "opt_acpi.h" #include @@ -131,9 +131,10 @@ n = 0; else n = 1; - printf("ACPI timer looks %s min = %d, max = %d, width = %d\n", - n ? "GOOD" : "BAD ", - min, max, max - min + 1); + if (bootverbose) + printf("ACPI timer looks %s min = %d, max = %d, width = %d\n", + n ? "GOOD" : "BAD ", + min, max, max - min + 1); return (n); } ==== //depot/projects/smpng/sys/dev/ata/ata-dma.c#14 (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. * - * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.89 2002/03/18 12:13:13 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.90 2002/03/24 12:44:23 sos Exp $ */ #include @@ -371,6 +371,7 @@ /* we could set PIO mode timings, but we assume the BIOS did that */ break; + case 0x74411022: /* AMD 768 */ case 0x74111022: /* AMD 766 */ if (udmamode >= 5) { error = ata_command(atadev, ATA_C_SETFEATURES, 0, ==== //depot/projects/smpng/sys/dev/ata/ata-pci.c#15 (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. * - * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.34 2002/03/18 13:56:44 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.35 2002/03/24 12:44:23 sos Exp $ */ #include @@ -224,6 +224,9 @@ case 0x74111022: return "AMD 766 ATA100 controller"; + case 0x74411022: + return "AMD 768 ATA100 controller"; + case 0x02111166: return "ServerWorks ROSB4 ATA33 controller"; @@ -446,6 +449,7 @@ case 0x74091022: /* AMD 756 default setup */ case 0x74111022: /* AMD 766 default setup */ + case 0x74411022: /* AMD 768 default setup */ /* set prefetch, postwrite */ pci_write_config(dev, 0x41, pci_read_config(dev, 0x41, 1) | 0xf0, 1); ==== //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 Nicolas Souchu + * Copyright (c) 1998, 2001 Nicolas Souchu * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.19 2001/01/20 02:24:01 wollman Exp $ + * $FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.20 2002/03/23 15:47:08 nsouch Exp $ * */ @@ -33,10 +33,13 @@ * From brooktree848.c */ +#include "opt_bktr.h" + #include "bktr.h" #include #include +#include #include #include #include @@ -62,196 +65,91 @@ #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 10:25:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6992537B417; Mon, 25 Mar 2002 10:25:23 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9FAF537B405 for ; Mon, 25 Mar 2002 10:25:21 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PIPLH68130 for perforce@freebsd.org; Mon, 25 Mar 2002 10:25:21 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 10:25:21 -0800 (PST) Message-Id: <200203251825.g2PIPLH68130@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8383 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8383 Change 8383 by jhb@jhb_laptop on 2002/03/25 10:24:57 Integ the new suser() API from jhb_proc. Affected files ... ... //depot/projects/smpng/sys/kern/kern_prot.c#48 integrate ... //depot/projects/smpng/sys/sys/systm.h#25 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_prot.c#48 (text+ko) ==== @@ -1266,58 +1266,35 @@ /* * Test whether the specified credentials imply "super-user" privilege. - * Return 0 or EPERM. + * Return 0 or EPERM. The flag argument is currently used only to + * specify jail interaction. */ int -suser(p) - struct proc *p; +suser_cred(cred, flag) + struct ucred *cred; + int flag; { - return (suser_xxx(0, p, 0)); + if (!suser_enabled) + return (EPERM); + if (cred->cr_uid != 0) + return (EPERM); + if (jailed(cred) && !(flag & PRISON_ROOT)) + return (EPERM); + return (0); } /* - * version for when the thread pointer is available and not the proc. - * (saves having to include proc.h into every file that needs to do the change.) + * Shortcut to hide contents of struct td and struct proc from the + * caller, promoting binary compatibility. */ int -suser_td(td) +suser(td, flag) struct thread *td; -{ - return (suser_xxx(0, td->td_proc, 0)); -} - -/* - * wrapper to use if you have the thread on hand but not the proc. - */ -int -suser_xxx_td(cred, td, flag) - struct ucred *cred; - struct thread *td; int flag; { - return(suser_xxx(cred, td->td_proc, flag)); -} -int -suser_xxx(cred, proc, flag) - struct ucred *cred; - struct proc *proc; - int flag; -{ - if (!suser_enabled) - return (EPERM); - if (!cred && !proc) { - printf("suser_xxx(): THINK!\n"); - return (EPERM); - } - if (cred == NULL) - cred = proc->p_ucred; - if (cred->cr_uid != 0) - return (EPERM); - if (jailed(cred) && !(flag & PRISON_ROOT)) - return (EPERM); - return (0); + return (suser_cred(td->td_ucred, flag)); } /* ==== //depot/projects/smpng/sys/sys/systm.h#25 (text+ko) ==== @@ -47,7 +47,7 @@ #include extern int securelevel; /* system security level (see init(8)) */ -extern int suser_enabled; /* suser_xxx() is permitted to return 0 */ +extern int suser_enabled; /* suser() is permitted to return 0 */ extern int cold; /* nonzero if we are doing a cold boot */ extern const char *panicstr; /* panic message */ @@ -192,13 +192,11 @@ void stopprofclock(struct proc *); void setstatclockrate(int hzrate); -/* flags for suser_xxx() */ +/* flags for suser() and suser_cred() */ #define PRISON_ROOT 1 -int suser(struct proc *); -int suser_td(struct thread *); -int suser_xxx(struct ucred *cred, struct proc *proc, int flag); -int suser_xxx_td(struct ucred *cred, struct thread *thread, int flag); +int suser(struct thread *td, int flag); +int suser_cred(struct ucred *cred, int flag); int cr_cansee(struct ucred *u1, struct ucred *u2); int cr_canseesocket(struct ucred *cred, struct socket *so); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 10:41:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D25A937B417; Mon, 25 Mar 2002 10:40:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A228837B400 for ; Mon, 25 Mar 2002 10:40:41 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PIee770355 for perforce@freebsd.org; Mon, 25 Mar 2002 10:40:40 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 10:40:40 -0800 (PST) Message-Id: <200203251840.g2PIee770355@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8385 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8385 Change 8385 by jhb@jhb_laptop on 2002/03/25 10:39:57 Integ of first round of suser() API changes. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/promcons.c#8 integrate ... //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#7 integrate ... //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#6 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#6 integrate ... //depot/projects/smpng/sys/dev/an/if_an.c#15 integrate ... //depot/projects/smpng/sys/dev/asr/asr.c#8 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#15 integrate ... //depot/projects/smpng/sys/dev/awi/awi.c#4 integrate ... //depot/projects/smpng/sys/dev/awi/awi_wep.c#4 integrate ... //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#4 integrate ... //depot/projects/smpng/sys/dev/cnw/if_cnw.c#4 integrate ... //depot/projects/smpng/sys/dev/random/randomdev.c#7 integrate ... //depot/projects/smpng/sys/dev/sbni/if_sbni.c#3 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#19 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#10 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#4 integrate ... //depot/projects/smpng/sys/i386/i386/vm86.c#5 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#5 integrate ... //depot/projects/smpng/sys/ia64/ia64/ssc.c#5 integrate ... //depot/projects/smpng/sys/kern/kern_sysctl.c#13 integrate ... //depot/projects/smpng/sys/net/if_ppp.c#8 integrate ... //depot/projects/smpng/sys/net/rtsock.c#13 integrate ... //depot/projects/smpng/sys/netinet6/ip6_input.c#6 integrate ... //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#8 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_lock.c#15 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_mmap.c#6 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/promcons.c#8 (text+ko) ==== @@ -123,7 +123,7 @@ ttsetwater(tp); setuptimeout = 1; - } else if ((tp->t_state & TS_XCLUDE) && suser(td->td_proc)) { + } else if ((tp->t_state & TS_XCLUDE) && suser(td, 0)) { splx(s); return EBUSY; } ==== //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#7 (text+ko) ==== @@ -118,7 +118,7 @@ if (error) return (error); - error = suser(td->td_proc); + error = suser(td, 0); if (error) return (error); ==== //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#6 (text+ko) ==== @@ -290,7 +290,7 @@ tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; ttsetwater(tp); setuptimeout = 1; - } else if ((tp->t_state & TS_XCLUDE) && suser(td->td_proc)) { + } else if ((tp->t_state & TS_XCLUDE) && suser(td, 0)) { splx(s); return EBUSY; } ==== //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#6 (text+ko) ==== @@ -559,13 +559,13 @@ break; #if defined(WHY_DOES_AN_EMULATOR_WANT_TO_SET_HOSTNAMES) case SVR4_SI_SET_HOSTNAME: - if ((error = suser(p)) != 0) + if ((error = suser(td, 0)) != 0) return error; name = KERN_HOSTNAME; return kern_sysctl(&name, 1, 0, 0, SCARG(uap, buf), rlen, td); case SVR4_SI_SET_SRPC_DOMAIN: - if ((error = suser(p)) != 0) + if ((error = suser(td, 0)) != 0) return error; name = KERN_NISDOMAINNAME; return kern_sysctl(&name, 1, 0, 0, SCARG(uap, buf), rlen, td); ==== //depot/projects/smpng/sys/dev/an/if_an.c#15 (text+ko) ==== @@ -1266,7 +1266,8 @@ int i; struct an_softc *sc; struct ifreq *ifr; - struct proc *p = curproc; + struct thread *td = curthread; + struct proc *p = td->td_proc; struct ieee80211req *ireq; u_int8_t tmpstr[IEEE80211_NWID_LEN*2]; u_int8_t *tmpptr; @@ -1353,7 +1354,7 @@ error = copyout(&sc->areq, ifr->ifr_data, sizeof(sc->areq)); break; case SIOCSAIRONET: - if ((error = suser(p))) + if ((error = suser(td, 0))) goto out; error = copyin(ifr->ifr_data, &sc->areq, sizeof(sc->areq)); if (error != 0) @@ -1614,7 +1615,7 @@ } break; case SIOCS80211: - if ((error = suser(p))) + if ((error = suser(td, 0))) goto out; sc->areq.an_len = sizeof(sc->areq); /* ==== //depot/projects/smpng/sys/dev/asr/asr.c#8 (text+ko) ==== @@ -3880,7 +3880,7 @@ s = splcam (); if (ASR_ctlr_held) { error = EBUSY; - } else if ((error = suser(td->td_proc)) == 0) { + } else if ((error = suser(td, 0)) == 0) { ++ASR_ctlr_held; } splx(s); ==== //depot/projects/smpng/sys/dev/ata/atapi-cd.c#15 (text+ko) ==== @@ -576,7 +576,7 @@ break; case CDIOCRESET: - error = suser(td->td_proc); + error = suser(td, 0); if (error) break; error = atapi_test_ready(cdp->device); ==== //depot/projects/smpng/sys/dev/awi/awi.c#4 (text+ko) ==== @@ -521,7 +521,11 @@ break; case SIOCS80211NWID: #ifdef __FreeBSD__ +#if __FreeBSD__ >= 5 + error = suser(curthread, 0); +#else error = suser(curproc); +#endif if (error) break; #endif @@ -555,7 +559,11 @@ break; case SIOCS80211NWKEY: #ifdef __FreeBSD__ +#if __FreeBSD__ >= 5 + error = suser(curthread, 0); +#else error = suser(curproc); +#endif if (error) break; #endif @@ -613,7 +621,11 @@ error = awi_wep_getkey(sc, ireq->i_val, tmpstr, &len); if(error) break; +#if __FreeBSD__ >= 5 + if(!suser(curthread, 0)) +#else if(!suser(curproc)) +#endif bzero(tmpstr, len); ireq->i_len = len; error = copyout(tmpstr, ireq->i_data, len); @@ -650,7 +662,11 @@ } break; case SIOCS80211: +#if __FreeBSD__ >= 5 + error = suser(curthread, 0); +#else error = suser(curproc); +#endif if(error) break; switch(ireq->i_type) { ==== //depot/projects/smpng/sys/dev/awi/awi_wep.c#4 (text+ko) ==== @@ -189,7 +189,11 @@ nwkey->i_defkid = sc->sc_wep_defkid + 1; /* do not show any keys to non-root user */ #ifdef __FreeBSD__ +#if __FreeBSD__ >= 5 + suerr = suser(curthread, 0); +#else suerr = suser(curproc); +#endif #else suerr = suser(curproc->p_ucred, &curproc->p_acflag); #endif ==== //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#4 (text+ko) ==== @@ -108,7 +108,11 @@ break; case SIOCSWAVELAN: #ifdef __FreeBSD__ +#if __FreeBSD__ >= 5 + error = suser(curthread, 0); +#else error = suser(curproc); +#endif #else error = suser(curproc->p_ucred, &curproc->p_acflag); #endif @@ -272,7 +276,11 @@ keys = (struct wi_ltv_keys *)&wreq; /* do not show keys to non-root user */ #ifdef __FreeBSD__ +#if __FreeBSD__ >= 5 + error = suser(curthread, 0); +#else error = suser(curproc); +#endif #else error = suser(curproc->p_ucred, &curproc->p_acflag); #endif ==== //depot/projects/smpng/sys/dev/cnw/if_cnw.c#4 (text+ko) ==== @@ -1239,7 +1239,12 @@ #endif struct ifreq *ifr = (struct ifreq *)data; int s, error = 0; +#if defined(__FreeBSD__) && __FreeBSD__ >= 5 + struct thread *td = curthread; /* XXX */ + struct proc *p = td->td_proc; +#else struct proc *p = curproc; /*XXX*/ +#endif s = splnet(); @@ -1331,8 +1336,12 @@ #if !defined(__FreeBSD__) error = suser(p->p_ucred, &p->p_acflag); #else +#if __FreeBSD__ >= 5 + error = suser(td, 0); +#else error = suser(p); #endif +#endif if (error) break; error = cnw_setdomain(sc, ifr->ifr_domain); @@ -1342,8 +1351,12 @@ #if !defined(__FreeBSD__) error = suser(p->p_ucred, &p->p_acflag); #else +#if __FreeBSD__ >= 5 + error = suser(td, 0); +#else error = suser(p); #endif +#endif if (error) break; error = cnw_setkey(sc, (int)ifr->ifr_key); @@ -1353,8 +1366,12 @@ #if !defined(__FreeBSD__) error = suser(p->p_ucred, &p->p_acflag); #else +#if __FreeBSD__ >= 5 + error = suser(td, 0); +#else error = suser(p); #endif +#endif if (error) break; if ((ifp->if_flags & IFF_RUNNING) == 0) ==== //depot/projects/smpng/sys/dev/random/randomdev.c#7 (text+ko) ==== @@ -147,7 +147,7 @@ int error; if (flags & FWRITE) { - error = suser(td->td_proc); + error = suser(td, 0); if (error) return (error); error = securelevel_gt(td->td_ucred, 0); @@ -162,7 +162,7 @@ random_close(dev_t dev __unused, int flags, int fmt __unused, struct thread *td) { if (flags & FWRITE) { - if (!(suser(td->td_proc) || + if (!(suser(td, 0) || securelevel_gt(td->td_ucred, 0))) random_reseed(); } ==== //depot/projects/smpng/sys/dev/sbni/if_sbni.c#3 (text+ko) ==== @@ -1042,6 +1042,7 @@ { struct sbni_softc *sc; struct ifreq *ifr; + struct thread *td; struct proc *p; struct sbni_in_stats *in_stats; struct sbni_flags flags; @@ -1049,7 +1050,8 @@ sc = ifp->if_softc; ifr = (struct ifreq *)data; - p = curproc; + td = curthread; + p = td->td_proc; error = 0; s = splimp(); @@ -1114,7 +1116,7 @@ case SIOCSHWFLAGS: /* set flags */ /* root only */ - error = suser(p); + error = suser(td, 0); if (error) break; flags = *(struct sbni_flags*)&ifr->ifr_data; @@ -1136,7 +1138,7 @@ break; case SIOCRINSTATS: - if (!(error = suser(p))) /* root only */ + if (!(error = suser(td, 0))) /* root only */ bzero(&sc->in_stats, sizeof(struct sbni_in_stats)); break; ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#19 (text+ko) ==== @@ -1540,7 +1540,8 @@ struct wi_req wreq; struct ifreq *ifr; struct ieee80211req *ireq; - struct proc *p = curproc; + struct thread *td = curthread; + struct proc *p = td->td_proc; sc = ifp->if_softc; WI_LOCK(sc); @@ -1592,7 +1593,7 @@ if (error) break; /* Don't show WEP keys to non-root users. */ - if (wreq.wi_type == WI_RID_DEFLT_CRYPT_KEYS && suser(p)) + if (wreq.wi_type == WI_RID_DEFLT_CRYPT_KEYS && suser(td, 0)) break; if (wreq.wi_type == WI_RID_IFACE_STATS) { bcopy((char *)&sc->wi_stats, (char *)&wreq.wi_val, @@ -1626,7 +1627,7 @@ error = copyout(&wreq, ifr->ifr_data, sizeof(wreq)); break; case SIOCSWAVELAN: - if ((error = suser(p))) + if ((error = suser(td, 0))) goto out; error = copyin(ifr->ifr_data, &wreq, sizeof(wreq)); if (error) @@ -1685,7 +1686,7 @@ break; } len = sc->wi_keys.wi_keys[ireq->i_val].wi_keylen; - if (suser(p)) + if (suser(td, 0)) bcopy(sc->wi_keys.wi_keys[ireq->i_val].wi_keydat, tmpkey, len); else @@ -1738,7 +1739,7 @@ } break; case SIOCS80211: - if ((error = suser(p))) + if ((error = suser(td, 0))) goto out; switch(ireq->i_type) { case IEEE80211_IOC_SSID: ==== //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#10 (text+ko) ==== @@ -718,8 +718,7 @@ if (uid != de->de_uid || gid != de->de_gid) { if (((ap->a_cred->cr_uid != de->de_uid) || uid != de->de_uid || (gid != de->de_gid && !groupmember(gid, ap->a_cred))) && - (error = suser_xxx(NULL, ap->a_td->td_proc, - PRISON_ROOT)) != 0) + (error = suser(ap->a_td, PRISON_ROOT)) != 0) return (error); de->de_uid = uid; de->de_gid = gid; @@ -736,21 +735,21 @@ if (vap->va_mode != (mode_t)VNOVAL) { if ((ap->a_cred->cr_uid != de->de_uid) && - (error = suser_xxx(NULL, ap->a_td->td_proc, PRISON_ROOT))) + (error = suser(ap->a_td, PRISON_ROOT))) return (error); de->de_mode = vap->va_mode; c = 1; } if (vap->va_atime.tv_sec != VNOVAL) { if ((ap->a_cred->cr_uid != de->de_uid) && - (error = suser_xxx(NULL, ap->a_td->td_proc, PRISON_ROOT))) + (error = suser(ap->a_td, PRISON_ROOT))) return (error); de->de_atime = vap->va_atime; c = 1; } if (vap->va_mtime.tv_sec != VNOVAL) { if ((ap->a_cred->cr_uid != de->de_uid) && - (error = suser_xxx(NULL, ap->a_td->td_proc, PRISON_ROOT))) + (error = suser(ap->a_td, PRISON_ROOT))) return (error); de->de_mtime = vap->va_mtime; c = 1; @@ -776,7 +775,7 @@ struct devfs_dirent *de; struct devfs_mount *dmp; - error = suser(ap->a_cnp->cn_thread->td_proc); + error = suser(ap->a_cnp->cn_thread, 0); if (error) return(error); dmp = VFSTODEVFS(ap->a_dvp->v_mount); ==== //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#4 (text+ko) ==== @@ -59,7 +59,7 @@ break; case PIOCSFL: flags = *(unsigned int *)data; - if (flags & PF_ISUGID && (error = suser(td->td_proc)) != 0) + if (flags & PF_ISUGID && (error = suser(td, 0)) != 0) break; p->p_pfsflags = flags; break; ==== //depot/projects/smpng/sys/i386/i386/vm86.c#5 (text+ko) ==== @@ -716,7 +716,7 @@ case VM86_INTCALL: { struct vm86_intcall_args sa; - if ((error = suser(p))) + if ((error = suser(td, 0))) return (error); if ((error = copyin(ua.sub_args, &sa, sizeof(sa)))) return (error); ==== //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#5 (text+ko) ==== @@ -481,9 +481,9 @@ #ifdef IPR_VJ case IPRIOCSMAXCID: { - struct proc *p = curproc; /* XXX */ + struct thread *td = curthread; /* XXX */ - if((error = suser(p)) != 0) + if((error = suser(td, 0))) return (error); sl_compress_setup(sc->sc_compr, *(int *)data); } ==== //depot/projects/smpng/sys/ia64/ia64/ssc.c#5 (text+ko) ==== @@ -164,7 +164,7 @@ ttsetwater(tp); setuptimeout = 1; - } else if ((tp->t_state & TS_XCLUDE) && suser(td->td_proc)) { + } else if ((tp->t_state & TS_XCLUDE) && suser(td, 0)) { splx(s); return EBUSY; } ==== //depot/projects/smpng/sys/kern/kern_sysctl.c#13 (text+ko) ==== @@ -463,7 +463,7 @@ { int error; - error = suser(req->td->td_proc); + error = suser(req->td, 0); if (error) return error; sysctl_sysctl_debug_dump_node(&sysctl__children, 0); ==== //depot/projects/smpng/sys/net/if_ppp.c#8 (text+ko) ==== @@ -376,7 +376,7 @@ break; case PPPIOCSFLAGS: - if ((error = suser(p)) != 0) + if ((error = suser(td, 0)) != 0) break; flags = *(int *)data & SC_MASK; s = splsoftnet(); @@ -390,7 +390,7 @@ break; case PPPIOCSMRU: - if ((error = suser(p)) != 0) + if ((error = suser(td, 0)) != 0) return (error); mru = *(int *)data; if (mru >= PPP_MRU && mru <= PPP_MAXMRU) @@ -403,7 +403,7 @@ #ifdef VJC case PPPIOCSMAXCID: - if ((error = suser(p)) != 0) + if ((error = suser(td, 0)) != 0) break; if (sc->sc_comp) { s = splsoftnet(); @@ -414,14 +414,14 @@ #endif case PPPIOCXFERUNIT: - if ((error = suser(p)) != 0) + if ((error = suser(td, 0)) != 0) break; sc->sc_xfer = p->p_pid; break; #ifdef PPP_COMPRESS case PPPIOCSCOMPRESS: - if ((error = suser(p)) != 0) + if ((error = suser(td, 0)) != 0) break; odp = (struct ppp_option_data *) data; nb = odp->length; @@ -497,7 +497,7 @@ if (cmd == PPPIOCGNPMODE) { npi->mode = sc->sc_npmode[npx]; } else { - if ((error = suser(p)) != 0) + if ((error = suser(td, 0)) != 0) break; if (npi->mode != sc->sc_npmode[npx]) { s = splsoftnet(); @@ -623,7 +623,7 @@ break; case SIOCSIFMTU: - if ((error = suser(p)) != 0) + if ((error = suser(td, 0)) != 0) break; if (ifr->ifr_mtu > PPP_MAXMTU) error = EINVAL; ==== //depot/projects/smpng/sys/net/rtsock.c#13 (text+ko) ==== @@ -332,7 +332,7 @@ * Verify that the caller has the appropriate privilege; RTM_GET * is the only operation the non-superuser is allowed. */ - if (rtm->rtm_type != RTM_GET && (error = suser(curproc)) != 0) + if (rtm->rtm_type != RTM_GET && (error = suser(curthread, 0)) != 0) senderr(error); switch (rtm->rtm_type) { ==== //depot/projects/smpng/sys/netinet6/ip6_input.c#6 (text+ko) ==== @@ -1134,12 +1134,21 @@ struct ip6_hdr *ip6; struct mbuf *m; { +#if __FreeBSD__ >= 5 + struct thread *td = curthread; /* XXX */ + struct proc *p = td->td_proc; +#else struct proc *p = curproc; /* XXX */ +#endif int privileged = 0; int rthdr_exist = 0; +#if __FreeBSD__ >= 5 + if (!suser(td, 0)) +#else if (p && !suser(p)) +#endif privileged++; #ifdef SO_TIMESTAMP ==== //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#8 (text+ko) ==== @@ -466,7 +466,7 @@ struct inpcb *inp; int error, s; - error = suser(req->td->td_proc); + error = suser(req->td, 0); if (error) return (error); ==== //depot/projects/smpng/sys/nfsclient/nfs_lock.c#15 (text+ko) ==== @@ -241,7 +241,7 @@ * * XXX This authorization check is probably not right. */ - if ((error = suser(td->td_proc)) != 0 && + if ((error = suser(td, 0)) != 0 && td->td_ucred->cr_svuid != 0) return (error); ==== //depot/projects/smpng/sys/security/lomac/kernel_mmap.c#6 (text+ko) ==== @@ -307,7 +307,7 @@ if (securelevel >= 1) disablexworkaround = 1; else - disablexworkaround = suser(p); + disablexworkaround = suser(td, 0); if (vp->v_type == VCHR && disablexworkaround && (flags & (MAP_PRIVATE|MAP_COPY))) { error = EINVAL; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 11: 8: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C155E37B417; Mon, 25 Mar 2002 11:07:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8495237B416 for ; Mon, 25 Mar 2002 11:07:14 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PJ7EQ79331 for perforce@freebsd.org; Mon, 25 Mar 2002 11:07:14 -0800 (PST) (envelope-from green@freebsd.org) Date: Mon, 25 Mar 2002 11:07:14 -0800 (PST) Message-Id: <200203251907.g2PJ7EQ79331@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8388 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8388 Change 8388 by green@green_laptop_2 on 2002/03/25 11:07:01 Fix whitespace. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#121 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#24 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#24 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.h#4 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#20 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#19 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#19 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#90 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_constant.h#7 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#55 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#121 (text+ko) ==== @@ -636,7 +636,7 @@ MAC_PERFORM(create_proc0, cred); } -/* +/* * Initialize MAC label for the first userland process, from which other * userland processes and threads are spawned. */ @@ -927,7 +927,7 @@ mac_create_mbuf_datagram_from_mbuf_fragmentqueue(struct mbuf *fragmentqueue, struct mbuf *datagram) { - + MAC_PERFORM(create_mbuf_datagram_from_mbuf_fragmentqueue, fragmentqueue, datagram); } @@ -1147,7 +1147,7 @@ void mac_create_devfs_device(dev_t dev, struct mac *devicelabel) { - + mac_init_label(devicelabel); MAC_PERFORM(create_devfs_device, dev, devicelabel); } @@ -1182,7 +1182,7 @@ } mac_init_label(childlabel); MAC_PERFORM(create_vnode_from_vnode, cred, parent, &parentlabel, child, - childlabel); + childlabel); } int ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#24 (text+ko) ==== @@ -1062,6 +1062,6 @@ mac_biba_ifnet_check_send_mbuf, mac_biba_socket_check_receive_mbuf }; - + MAC_POLICY_SET(mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba", 1); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#24 (text+ko) ==== @@ -237,7 +237,7 @@ if (rule->mbr_object.mbi_flags & MBI_UID_DEFINED) { match = (rule->mbr_object.mbi_uid == object_uid); - if (rule->mbr_object.mbi_flags & MBI_NEGATED) + if (rule->mbr_object.mbi_flags & MBI_NEGATED) match = !match; if (!match) @@ -655,7 +655,7 @@ NULL, /* ifnet check send mbuf */ NULL, /* socket check receive mbuf */ }; - + MAC_POLICY_SET(mac_bsdextended_ops, trustedbsd_mac_bsdextended, "TrustedBSD MAC/BSD Extended", 0); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#20 (text+ko) ==== @@ -631,7 +631,7 @@ { printf("MLS label: "); - + if (label->m_mls.mm_flags & MAC_MLS_FLAG_SINGLE) printf("single: %u,%u ", label->m_mls.mm_single.mme_type, label->m_mls.mm_single.mme_level); @@ -641,7 +641,7 @@ label->m_mls.mm_rangelow.mme_level, label->m_mls.mm_rangehigh.mme_type, label->m_mls.mm_rangehigh.mme_level); - printf("\n"); + printf("\n"); } static int @@ -1031,6 +1031,6 @@ mac_mls_ifnet_check_send_mbuf, mac_mls_socket_check_receive_mbuf }; - + MAC_POLICY_SET(mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS", 1); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#19 (text+ko) ==== @@ -230,7 +230,7 @@ mac_none_create_mbuf_datagram_from_mbuf_fragmentqueue( struct mbuf *fragmentqueue, struct mbuf *datagram) { - + /* Initialize datagram here. */ } @@ -287,7 +287,7 @@ /* Initialize newmbuf here. */ } -static int +static int mac_none_mbuf_fragment_matches_mbuf_fragmentqueue(struct mbuf *fragment, struct mbuf *fragmentqueue) { @@ -297,7 +297,7 @@ } static void -mac_none_create_mbuf_from_socket(struct socket *so, struct mbuf *m) +mac_none_create_mbuf_from_socket(struct socket *so, struct mbuf *m) { /* Initialize mbuf here. */ @@ -344,7 +344,7 @@ static void mac_none_mountrootfs(struct ucred *cred, struct mount *mp) -{ +{ /* Initialize mp here. */ } @@ -652,7 +652,7 @@ mac_none_ifnet_check_send_mbuf, mac_none_socket_check_receive_mbuf }; - + MAC_POLICY_SET(mac_none_ops, trustedbsd_mac_none, "TrustedBSD MAC/None", 0); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#5 (text+ko) ==== @@ -223,6 +223,6 @@ NULL, NULL, }; - + MAC_POLICY_SET(mac_seeotheruids_ops, trustedbsd_mac_seeotheruids, "TrustedBSD MAC/seeotheruids", 0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#19 (text+ko) ==== @@ -305,7 +305,7 @@ subject->m_te.mt_type, mac_te_classop_to_string(object_class, operation), object->m_te.mt_type); - + return (0); } } @@ -570,7 +570,7 @@ mac_te_copy_label(&oldmbuf->m_pkthdr.label, &newmbuf->m_pkthdr.label); } -static int +static int mac_te_mbuf_fragment_matches_mbuf_fragmentqueue(struct mbuf *fragment, struct mbuf *fragmentqueue) { @@ -580,7 +580,7 @@ } static void -mac_te_create_mbuf_from_socket(struct socket *so, struct mbuf *m) +mac_te_create_mbuf_from_socket(struct socket *so, struct mbuf *m) { mac_te_copy_label(&so->so_label, &m->m_pkthdr.label); @@ -635,7 +635,7 @@ static void mac_te_mountrootfs(struct ucred *cred, struct mount *mp) -{ +{ mac_te_init_label_as(&mp->mnt_label, MAC_TE_TYPE_ROOTFS); } @@ -678,7 +678,7 @@ struct mac *dirlabel) { - mac_te_init_label_as(dirlabel, MAC_TE_TYPE_FS); + mac_te_init_label_as(dirlabel, MAC_TE_TYPE_FS); } static void @@ -794,7 +794,7 @@ mac_te_cred_check_debug_proc(struct ucred *cred, struct proc *proc) { - return (mac_te_check(&cred->cr_label, &proc->p_ucred->cr_label, + return (mac_te_check(&cred->cr_label, &proc->p_ucred->cr_label, MAC_TE_CLASS_PROC, MAC_TE_OPERATION_PROC_DEBUG)); } @@ -1105,7 +1105,7 @@ mac_te_ifnet_check_send_mbuf, mac_te_socket_check_receive_mbuf }; - + MAC_POLICY_SET(mac_te_ops, trustedbsd_mac_te, "TrustedBSD MAC/TE", 1); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#90 (text+ko) ==== @@ -41,7 +41,7 @@ * * The POSIX.1e implementation page may be reached at: * http://www.trustedbsd.org/ - */ + */ #ifndef _SYS_MAC_H #define _SYS_MAC_H ==== //depot/projects/trustedbsd/mac/sys/sys/mac_constant.h#7 (text+ko) ==== @@ -40,7 +40,7 @@ * Constant labels available in userland from MAC code in libc. This * will eventually go away and be replaced with some other way of * finding these labels. - */ + */ #ifndef _SYS_MAC_CONSTANT_H #define _SYS_MAC_CONSTANT_H ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#55 (text+ko) ==== @@ -38,7 +38,7 @@ */ /* * Kernel interface for MAC policy modules. - */ + */ #ifndef _SYS_MAC_POLICY_H #define _SYS_MAC_POLICY_H @@ -233,5 +233,5 @@ int mac_policy_modevent(module_t mod, int type, void *data); - + #endif /* !_SYS_MAC_POLICY_H */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 11:10:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FC5D37B423; Mon, 25 Mar 2002 11:07:59 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2910937B405 for ; Mon, 25 Mar 2002 11:07:14 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PJ7Dj79325 for perforce@freebsd.org; Mon, 25 Mar 2002 11:07:13 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 11:07:13 -0800 (PST) Message-Id: <200203251907.g2PJ7Dj79325@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8387 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8387 Change 8387 by jhb@jhb_laptop on 2002/03/25 11:06:24 Integ more suser() API changes. Affected files ... ... //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#11 integrate ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#16 integrate ... //depot/projects/smpng/sys/compat/linux/linux_uid16.c#8 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#7 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#6 integrate ... //depot/projects/smpng/sys/kern/kern_acct.c#9 integrate ... //depot/projects/smpng/sys/kern/kern_acl.c#12 integrate ... //depot/projects/smpng/sys/kern/kern_exec.c#29 integrate ... //depot/projects/smpng/sys/kern/kern_jail.c#16 integrate ... //depot/projects/smpng/sys/kern/kern_linker.c#15 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#49 integrate ... //depot/projects/smpng/sys/kern/kern_resource.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_sysctl.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_xxx.c#4 integrate ... //depot/projects/smpng/sys/kern/tty.c#12 integrate ... //depot/projects/smpng/sys/kern/tty_pty.c#11 integrate ... //depot/projects/smpng/sys/kern/vfs_subr.c#20 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#25 integrate ... //depot/projects/smpng/sys/kern/vfs_vnops.c#18 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.c#18 integrate ... //depot/projects/smpng/sys/netinet/tcp_subr.c#15 integrate ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#16 integrate ... //depot/projects/smpng/sys/netinet6/in6_pcb.c#10 integrate ... //depot/projects/smpng/sys/netncp/ncp_subr.h#3 integrate ... //depot/projects/smpng/sys/netsmb/smb_subr.h#5 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_serv.c#13 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#9 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_vnops.c#3 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#12 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#10 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_readwrite.c#6 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#7 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#12 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#11 (text+ko) ==== @@ -1062,7 +1062,7 @@ uid = SCARG(uap, uid); oldcred = p->p_ucred; - if ((error = suser_xxx(p->p_ucred, NULL, PRISON_ROOT)) != 0 && + if ((error = suser_cred(p->p_ucred, PRISON_ROOT)) != 0 && uid != oldcred->cr_ruid && uid != oldcred->cr_svuid) return (error); @@ -1108,7 +1108,7 @@ gid = SCARG(uap, gid); oldcred = p->p_ucred; - if (((error = suser_xxx(p->p_ucred, NULL, PRISON_ROOT)) != 0 ) && + if (((error = suser_cred(p->p_ucred, PRISON_ROOT)) != 0 ) && gid != oldcred->cr_rgid && gid != oldcred->cr_svgid) return (error); ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#16 (text+ko) ==== @@ -980,7 +980,7 @@ * Keep cr_groups[0] unchanged to prevent that. */ - if ((error = suser_xxx(oldcred, NULL, PRISON_ROOT)) != 0) + if ((error = suser_cred(oldcred, PRISON_ROOT)) != 0) return (error); if (ngrp >= NGROUPS) ==== //depot/projects/smpng/sys/compat/linux/linux_uid16.c#8 (text+ko) ==== @@ -108,7 +108,7 @@ * Keep cr_groups[0] unchanged to prevent that. */ - if ((error = suser_xxx(oldcred, NULL, PRISON_ROOT)) != 0) + if ((error = suser_cred(oldcred, PRISON_ROOT)) != 0) return (error); if (ngrp >= NGROUPS) ==== //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#7 (text+ko) ==== @@ -529,7 +529,7 @@ if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); if (cred->cr_uid != hp->h_uid && - (error = suser_xxx(cred, td->td_proc, PRISON_ROOT)) && + (error = suser_cred(cred, PRISON_ROOT)) && ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || (error = VOP_ACCESS(vp, VWRITE, cred, td)))) return (error); ==== //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#7 (text+ko) ==== @@ -376,7 +376,7 @@ if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); if (cred->cr_uid != pmp->pm_uid && - (error = suser_xxx(cred, ap->a_td->td_proc, PRISON_ROOT))) + (error = suser_cred(cred, PRISON_ROOT))) return (error); /* * We are very inconsistent about handling unsupported @@ -390,7 +390,7 @@ * set ATTR_ARCHIVE for directories `cp -pr' from a more * sensible file system attempts it a lot. */ - if (suser_xxx(cred, ap->a_td->td_proc, PRISON_ROOT)) { + if (suser_cred(cred, PRISON_ROOT)) { if (vap->va_flags & SF_SETTABLE) return EPERM; } @@ -417,7 +417,7 @@ gid = pmp->pm_gid; if ((cred->cr_uid != pmp->pm_uid || uid != pmp->pm_uid || (gid != pmp->pm_gid && !groupmember(gid, cred))) && - (error = suser_xxx(cred, ap->a_td->td_proc, PRISON_ROOT))) + (error = suser_cred(cred, PRISON_ROOT))) return error; if (uid != pmp->pm_uid || gid != pmp->pm_gid) return EINVAL; @@ -449,7 +449,7 @@ if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); if (cred->cr_uid != pmp->pm_uid && - (error = suser_xxx(cred, ap->a_td->td_proc, PRISON_ROOT)) && + (error = suser_cred(cred, PRISON_ROOT)) && ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || (error = VOP_ACCESS(ap->a_vp, VWRITE, cred, ap->a_td)))) return (error); @@ -472,7 +472,7 @@ if (vp->v_mount->mnt_flag & MNT_RDONLY) return (EROFS); if (cred->cr_uid != pmp->pm_uid && - (error = suser_xxx(cred, ap->a_td->td_proc, PRISON_ROOT))) + (error = suser_cred(cred, PRISON_ROOT))) return (error); if (vp->v_type != VDIR) { /* We ignore the read and execute bits. */ ==== //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#6 (text+ko) ==== @@ -1153,7 +1153,7 @@ tvp->v_type = IFTOVT(mode); /* Rest init'd in getnewvnode(). */ ip->i_nlink = 1; if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, cnp->cn_cred) && - suser_xxx(cnp->cn_cred, 0, PRISON_ROOT)) + suser_cred(cnp->cn_cred, PRISON_ROOT)) ip->i_mode &= ~ISGID; if (cnp->cn_flags & ISWHITEOUT) ==== //depot/projects/smpng/sys/kern/kern_acct.c#9 (text+ko) ==== @@ -123,7 +123,7 @@ if (td != curthread) panic("acct"); /* XXXKSE DIAGNOSTIC */ /* Make sure that the caller is root. */ - error = suser_xxx(td->td_proc->p_ucred, NULL, 0); + error = suser(td, 0); if (error) goto done2; ==== //depot/projects/smpng/sys/kern/kern_acl.c#12 (text+ko) ==== @@ -89,7 +89,7 @@ * a DAC entry that matches but has failed to allow access. */ #ifndef CAPABILITIES - if (suser_xxx(cred, NULL, PRISON_ROOT) == 0) + if (suser_cred(cred, PRISON_ROOT) == 0) cap_granted = (VEXEC | VREAD | VWRITE | VADMIN); else cap_granted = 0; ==== //depot/projects/smpng/sys/kern/kern_exec.c#29 (text+ko) ==== @@ -353,7 +353,7 @@ * we do not regain any tracing during a possible block. */ setsugid(p); - if (p->p_tracep && suser_xxx(oldcred, NULL, PRISON_ROOT)) { + if (p->p_tracep && suser_cred(oldcred, PRISON_ROOT)) { struct vnode *vtmp; if ((vtmp = p->p_tracep) != NULL) { ==== //depot/projects/smpng/sys/kern/kern_jail.c#16 (text+ko) ==== @@ -87,7 +87,7 @@ pr->pr_ip = j.ip_number; PROC_LOCK(p); /* Implicitly fail if already in jail. */ - error = suser_xxx(p->p_ucred, NULL, 0); + error = suser_cred(p->p_ucred, 0); if (error) goto badcred; oldcred = p->p_ucred; ==== //depot/projects/smpng/sys/kern/kern_linker.c#15 (text+ko) ==== @@ -703,7 +703,7 @@ mtx_lock(&Giant); - if ((error = suser_xxx(td->td_ucred, NULL, 0)) != 0) + if ((error = suser(td, 0)) != 0) goto out; pathname = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); @@ -750,7 +750,7 @@ mtx_lock(&Giant); - if ((error = suser_xxx(td->td_ucred, NULL, 0)) != 0) + if ((error = suser(td, 0)) != 0) goto out; lf = linker_find_file_by_id(SCARG(uap, fileid)); ==== //depot/projects/smpng/sys/kern/kern_prot.c#49 (text+ko) ==== @@ -582,7 +582,7 @@ #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_xxx(oldcred, NULL, PRISON_ROOT)) != 0) + (error = suser_cred(oldcred, PRISON_ROOT)) != 0) goto done2; newcred = crdup(oldcred); @@ -595,7 +595,7 @@ #ifdef POSIX_APPENDIX_B_4_2_2 /* Use the clause from B.4.2.2 */ uid == oldcred->cr_uid || #endif - suser_xxx(oldcred, NULL, PRISON_ROOT) == 0) /* we are using privs */ + suser_cred(oldcred, PRISON_ROOT) == 0) /* we are using privs */ #endif { /* @@ -658,7 +658,7 @@ oldcred = p->p_ucred; if (euid != oldcred->cr_ruid && /* allow seteuid(getuid()) */ euid != oldcred->cr_svuid && /* allow seteuid(saved uid) */ - (error = suser_xxx(oldcred, NULL, PRISON_ROOT)) != 0) + (error = suser_cred(oldcred, PRISON_ROOT)) != 0) goto done2; /* * Everything's okay, do it. Copy credentials so other references do @@ -718,7 +718,7 @@ #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_xxx(oldcred, NULL, PRISON_ROOT)) != 0) + (error = suser_cred(oldcred, PRISON_ROOT)) != 0) goto done2; newcred = crdup(oldcred); @@ -731,7 +731,7 @@ #ifdef POSIX_APPENDIX_B_4_2_2 /* use the clause from B.4.2.2 */ gid == oldcred->cr_groups[0] || #endif - suser_xxx(oldcred, NULL, PRISON_ROOT) == 0) /* we are using privs */ + suser_cred(oldcred, PRISON_ROOT) == 0) /* we are using privs */ #endif { /* @@ -793,7 +793,7 @@ oldcred = p->p_ucred; if (egid != oldcred->cr_rgid && /* allow setegid(getgid()) */ egid != oldcred->cr_svgid && /* allow setegid(saved gid) */ - (error = suser_xxx(oldcred, NULL, PRISON_ROOT)) != 0) + (error = suser_cred(oldcred, PRISON_ROOT)) != 0) goto done2; newcred = crdup(oldcred); if (oldcred->cr_groups[0] != egid) { @@ -830,7 +830,7 @@ ngrp = uap->gidsetsize; mtx_lock(&Giant); oldcred = p->p_ucred; - if ((error = suser_xxx(oldcred, NULL, PRISON_ROOT)) != 0) + if ((error = suser_cred(oldcred, PRISON_ROOT)) != 0) goto done2; if (ngrp > NGROUPS) { error = EINVAL; @@ -894,7 +894,7 @@ ruid != oldcred->cr_svuid) || (euid != (uid_t)-1 && euid != oldcred->cr_uid && euid != oldcred->cr_ruid && euid != oldcred->cr_svuid)) && - (error = suser_xxx(oldcred, NULL, PRISON_ROOT)) != 0) + (error = suser_cred(oldcred, PRISON_ROOT)) != 0) goto done2; newcred = crdup(oldcred); if (euid != (uid_t)-1 && oldcred->cr_uid != euid) { @@ -946,7 +946,7 @@ rgid != oldcred->cr_svgid) || (egid != (gid_t)-1 && egid != oldcred->cr_groups[0] && egid != oldcred->cr_rgid && egid != oldcred->cr_svgid)) && - (error = suser_xxx(oldcred, NULL, PRISON_ROOT)) != 0) + (error = suser_cred(oldcred, PRISON_ROOT)) != 0) goto done2; newcred = crdup(oldcred); if (egid != (gid_t)-1 && oldcred->cr_groups[0] != egid) { @@ -1009,7 +1009,7 @@ (suid != (uid_t)-1 && suid != oldcred->cr_ruid && suid != oldcred->cr_svuid && suid != oldcred->cr_uid)) && - (error = suser_xxx(oldcred, NULL, PRISON_ROOT)) != 0) + (error = suser_cred(oldcred, PRISON_ROOT)) != 0) goto done2; newcred = crdup(oldcred); if (euid != (uid_t)-1 && oldcred->cr_uid != euid) { @@ -1072,7 +1072,7 @@ (sgid != (gid_t)-1 && sgid != oldcred->cr_rgid && sgid != oldcred->cr_svgid && sgid != oldcred->cr_groups[0])) && - (error = suser_xxx(oldcred, NULL, PRISON_ROOT)) != 0) + (error = suser_cred(oldcred, PRISON_ROOT)) != 0) goto done2; newcred = crdup(oldcred); if (egid != (gid_t)-1 && oldcred->cr_groups[0] != egid) { @@ -1366,7 +1366,7 @@ { if (!see_other_uids && u1->cr_ruid != u2->cr_ruid) { - if (suser_xxx(u1, NULL, PRISON_ROOT) != 0) + if (suser_cred(u1, PRISON_ROOT) != 0) return (ESRCH); } return (0); @@ -1454,7 +1454,7 @@ break; default: /* Not permitted without privilege. */ - error = suser_xxx(cred, NULL, PRISON_ROOT); + error = suser_cred(cred, PRISON_ROOT); if (error) return (error); } @@ -1469,7 +1469,7 @@ cred->cr_uid != proc->p_ucred->cr_ruid && cred->cr_uid != proc->p_ucred->cr_svuid) { /* Not permitted without privilege. */ - error = suser_xxx(cred, NULL, PRISON_ROOT); + error = suser_cred(cred, PRISON_ROOT); if (error) return (error); } @@ -1527,7 +1527,7 @@ return (0); if (p1->p_ucred->cr_uid == p2->p_ucred->cr_ruid) return (0); - if (suser_xxx(0, p1, PRISON_ROOT) == 0) + if (suser_cred(p1->p_ucred, PRISON_ROOT) == 0) return (0); #ifdef CAPABILITIES @@ -1568,7 +1568,7 @@ int credentialchanged, error, grpsubset, i, uidsubset; if (!unprivileged_proc_debug) { - error = suser_xxx(NULL, p1, PRISON_ROOT); + error = suser_cred(p1->p_ucred, PRISON_ROOT); if (error) return (error); } @@ -1614,7 +1614,7 @@ * require CAP_SYS_PTRACE. */ if (!grpsubset || !uidsubset || credentialchanged) { - error = suser_xxx(NULL, p1, PRISON_ROOT); + error = suser_cred(p1->p_ucred, PRISON_ROOT); if (error) return (error); } @@ -1877,7 +1877,7 @@ char logintmp[MAXLOGNAME]; mtx_lock(&Giant); - if ((error = suser_xxx(0, p, PRISON_ROOT)) != 0) + if ((error = suser(td, PRISON_ROOT)) != 0) goto done2; error = copyinstr((caddr_t) uap->namebuf, (caddr_t) logintmp, sizeof(logintmp), (size_t *)0); ==== //depot/projects/smpng/sys/kern/kern_resource.c#14 (text+ko) ==== @@ -258,7 +258,7 @@ if (n < PRIO_MIN) n = PRIO_MIN; if (n < chgp->p_ksegrp.kg_nice /* XXXKSE */ && - suser_xxx(curp->p_ucred, NULL, 0)) + suser(td, 0)) return (EACCES); chgp->p_ksegrp.kg_nice /* XXXKSE */ = n; (void)resetpriority(&chgp->p_ksegrp); /* XXXKSE */ @@ -320,7 +320,7 @@ (error = copyin(uap->rtp, &rtp, sizeof(struct rtprio)))) break; /* disallow setting rtprio in most cases if not superuser */ - if (suser_xxx(curp->p_ucred, NULL, 0) != 0) { + if (suser(td, 0) != 0) { /* can't set someone else's */ if (uap->pid) { error = EPERM; @@ -521,7 +521,7 @@ if (limp->rlim_cur > alimp->rlim_max || limp->rlim_max > alimp->rlim_max) - if ((error = suser_xxx(0, p, PRISON_ROOT))) + if ((error = suser(td, PRISON_ROOT))) return (error); if (limp->rlim_cur > limp->rlim_max) limp->rlim_cur = limp->rlim_max; ==== //depot/projects/smpng/sys/kern/kern_sysctl.c#14 (text+ko) ==== @@ -1084,7 +1084,7 @@ flags = PRISON_ROOT; else flags = 0; - error = suser_xxx(NULL, req->td->td_proc, flags); + error = suser(req->td, flags); if (error) return (error); } ==== //depot/projects/smpng/sys/kern/kern_xxx.c#4 (text+ko) ==== @@ -97,7 +97,7 @@ name[0] = CTL_KERN; name[1] = KERN_HOSTNAME; mtx_lock(&Giant); - if ((error = suser_xxx(0, td->td_proc, PRISON_ROOT)) == 0) { + if ((error = suser(td, PRISON_ROOT)) == 0) { error = userland_sysctl(td, name, 2, 0, 0, 0, uap->hostname, uap->len, 0); } ==== //depot/projects/smpng/sys/kern/tty.c#12 (text+ko) ==== @@ -851,7 +851,7 @@ ISSET(constty->t_state, TS_CONNECTED)) return (EBUSY); #ifndef UCONSOLE - if ((error = suser_xxx(p->p_ucred, NULL, 0)) != 0) + if ((error = suser(td, 0)) != 0) return (error); #endif constty = tp; @@ -1023,9 +1023,9 @@ splx(s); break; case TIOCSTI: /* simulate terminal input */ - if ((flag & FREAD) == 0 && suser_xxx(p->p_ucred, NULL, 0)) + if ((flag & FREAD) == 0 && suser(td, 0)) return (EPERM); - if (!isctty(p, tp) && suser_xxx(p->p_ucred, NULL, 0)) + if (!isctty(p, tp) && suser(td, 0)) return (EACCES); s = spltty(); (*linesw[tp->t_line].l_rint)(*(u_char *)data, tp); @@ -1099,7 +1099,7 @@ } break; case TIOCSDRAINWAIT: - error = suser_xxx(p->p_ucred, NULL, 0); + error = suser(td, 0); if (error) return (error); tp->t_timeout = *(int *)data * hz; ==== //depot/projects/smpng/sys/kern/tty_pty.c#11 (text+ko) ==== @@ -187,7 +187,7 @@ tp->t_lflag = TTYDEF_LFLAG; tp->t_cflag = TTYDEF_CFLAG; tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; - } else if (tp->t_state & TS_XCLUDE && suser_xxx(td->td_ucred, NULL, 0)) { + } else if (tp->t_state & TS_XCLUDE && suser_cred(td->td_ucred, 0)) { return (EBUSY); } else if (pti->pt_prison != td->td_ucred->cr_prison) { return (EBUSY); ==== //depot/projects/smpng/sys/kern/vfs_subr.c#20 (text+ko) ==== @@ -3140,7 +3140,7 @@ return (0); privcheck: - if (!suser_xxx(cred, NULL, PRISON_ROOT)) { + if (!suser_cred(cred, PRISON_ROOT)) { /* XXX audit: privilege used */ if (privused != NULL) *privused = 1; ==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#25 (text+ko) ==== @@ -213,7 +213,7 @@ /* * Silently enforce MNT_NOSUID and MNT_NODEV for non-root users */ - if (suser_xxx(td->td_ucred, 0, 0)) + if (suser(td, 0)) fsflags |= MNT_NOSUID | MNT_NODEV; /* * Get vnode to be covered @@ -777,7 +777,7 @@ if (error) return (error); sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK; - if (suser_xxx(td->td_ucred, 0, 0)) { + if (suser(td, 0)) { bcopy((caddr_t)sp, (caddr_t)&sb, sizeof(sb)); sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0; sp = &sb; @@ -820,7 +820,7 @@ if (error) return (error); sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK; - if (suser_xxx(td->td_ucred, 0, 0)) { + if (suser(td, 0)) { bcopy((caddr_t)sp, (caddr_t)&sb, sizeof(sb)); sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0; sp = &sb; @@ -1049,7 +1049,7 @@ struct nameidata nd; struct vnode *vp; - error = suser_xxx(0, td->td_proc, PRISON_ROOT); + error = suser(td, PRISON_ROOT); if (error) return (error); FILEDESC_LOCK(fdp); @@ -1335,7 +1335,7 @@ error = suser_td(td); break; default: - error = suser_xxx(0, td->td_proc, PRISON_ROOT); + error = suser(td, PRISON_ROOT); break; } if (error) @@ -2295,7 +2295,7 @@ * chown can't fail when done as root. */ if (vp->v_type == VCHR || vp->v_type == VBLK) { - error = suser_xxx(td->td_ucred, td->td_proc, PRISON_ROOT); + error = suser(td, PRISON_ROOT); if (error) return (error); } @@ -3553,7 +3553,7 @@ } VOP_UNLOCK(vp, 0, td); if (td->td_ucred->cr_uid != vattr.va_uid) { - error = suser_xxx(0, td->td_proc, PRISON_ROOT); + error = suser(td, PRISON_ROOT); if (error) goto out; } @@ -3918,7 +3918,7 @@ if ((error = VFS_STATFS(mp, sp, td)) != 0) return (error); sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK; - if (suser_xxx(td->td_ucred, 0, 0)) { + if (suser(td, 0)) { bcopy((caddr_t)sp, (caddr_t)&sb, sizeof(sb)); sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0; sp = &sb; ==== //depot/projects/smpng/sys/kern/vfs_vnops.c#18 (text+ko) ==== @@ -637,7 +637,7 @@ } sb->st_flags = vap->va_flags; - if (suser_xxx(td->td_ucred, 0, 0)) + if (suser(td, 0)) sb->st_gen = 0; else sb->st_gen = vap->va_gen; ==== //depot/projects/smpng/sys/netinet/in_pcb.c#18 (text+ko) ==== @@ -228,8 +228,8 @@ if (lport) { struct inpcb *t; /* GROSS */ - if (ntohs(lport) < IPPORT_RESERVED && p && - suser_xxx(0, p, PRISON_ROOT)) + if (ntohs(lport) < IPPORT_RESERVED && td && + suser(td, PRISON_ROOT)) return (EACCES); if (td && jailed(td->td_ucred)) prison = 1; @@ -292,7 +292,7 @@ last = ipport_hilastauto; lastport = &pcbinfo->lasthi; } else if (inp->inp_flags & INP_LOWPORT) { - if (p && (error = suser_xxx(0, p, PRISON_ROOT))) { + if (td && (error = suser(td, PRISON_ROOT))) { inp->inp_laddr.s_addr = INADDR_ANY; return error; } ==== //depot/projects/smpng/sys/netinet/tcp_subr.c#15 (text+ko) ==== @@ -907,7 +907,7 @@ struct inpcb *inp; int error, s; - error = suser_xxx(0, req->td->td_proc, PRISON_ROOT); + error = suser(req->td, PRISON_ROOT); if (error) return (error); error = SYSCTL_IN(req, addrs, sizeof(addrs)); @@ -943,7 +943,7 @@ struct inpcb *inp; int error, s, mapped = 0; - error = suser_xxx(0, req->td->td_proc, PRISON_ROOT); + error = suser(req->td, PRISON_ROOT); if (error) return (error); error = SYSCTL_IN(req, addrs, sizeof(addrs)); ==== //depot/projects/smpng/sys/netinet/udp_usrreq.c#16 (text+ko) ==== @@ -636,7 +636,7 @@ struct inpcb *inp; int error, s; - error = suser_xxx(0, req->td->td_proc, PRISON_ROOT); + error = suser(req->td, PRISON_ROOT); if (error) return (error); error = SYSCTL_IN(req, addrs, sizeof(addrs)); ==== //depot/projects/smpng/sys/netinet6/in6_pcb.c#10 (text+ko) ==== @@ -183,7 +183,7 @@ /* GROSS */ if (ntohs(lport) < IPV6PORT_RESERVED && td && - suser_xxx(0, td->td_proc, PRISON_ROOT)) + suser(td, PRISON_ROOT)) return(EACCES); if (so->so_cred->cr_uid != 0 && !IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) { ==== //depot/projects/smpng/sys/netncp/ncp_subr.h#3 (text+ko) ==== @@ -84,7 +84,7 @@ #define checkbad(fn) {error=(fn);if(error) goto bad;} -#define ncp_suser(cred) suser_xxx(cred, NULL, 0) +#define ncp_suser(cred) suser_cred(cred, 0) #define ncp_isowner(conn,cred) ((cred)->cr_uid == (conn)->nc_owner->cr_uid) ==== //depot/projects/smpng/sys/netsmb/smb_subr.h#5 (text+ko) ==== @@ -70,7 +70,7 @@ SIGISMEMBER(set, SIGHUP) || SIGISMEMBER(set, SIGKILL) || \ SIGISMEMBER(set, SIGQUIT)) -#define smb_suser(cred) suser_xxx(cred, NULL, 0) +#define smb_suser(cred) suser_cred(cred, 0) /* * Compatibility wrappers for simple locks ==== //depot/projects/smpng/sys/nfsserver/nfs_serv.c#13 (text+ko) ==== @@ -1742,8 +1742,8 @@ if (vap->va_type == VCHR && rdev == 0xffffffff) vap->va_type = VFIFO; if (vap->va_type != VFIFO && - (error = suser_xxx(cred, 0, 0))) { - goto ereply; + (error = suser_cred(cred, 0))) { + goto nfsmreply0; } vap->va_rdev = rdev; error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap); @@ -1947,7 +1947,7 @@ if (error) NDFREE(&nd, NDF_ONLY_PNBUF); } else { - if (vtyp != VFIFO && (error = suser_xxx(cred, 0, 0))) + if (vtyp != VFIFO && (error = suser_cred(cred, 0))) goto out; error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap); if (error) { ==== //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#9 (text+ko) ==== @@ -126,7 +126,7 @@ retry: if (size == fs->fs_bsize && fs->fs_cstotal.cs_nbfree == 0) goto nospace; - if (suser_xxx(cred, NULL, PRISON_ROOT) && + if (suser_cred(cred, PRISON_ROOT) && freespace(fs, fs->fs_minfree) - numfrags(fs, size) < 0) goto nospace; #ifdef QUOTA @@ -207,7 +207,7 @@ #endif /* DIAGNOSTIC */ reclaimed = 0; retry: - if (suser_xxx(cred, NULL, PRISON_ROOT) && + if (suser_cred(cred, PRISON_ROOT) && freespace(fs, fs->fs_minfree) - numfrags(fs, nsize - osize) < 0) goto nospace; if ((bprev = ip->i_db[lbprev]) == 0) { ==== //depot/projects/smpng/sys/ufs/ifs/ifs_vnops.c#3 (text+ko) ==== @@ -269,7 +269,7 @@ if (DOINGSOFTDEP(tvp)) softdep_change_linkcnt(ip); if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, cnp->cn_cred) && - suser_xxx(cnp->cn_cred, 0, 0)) + suser_cred(cnp->cn_cred, 0)) ip->i_mode &= ~ISGID; if (cnp->cn_flags & ISWHITEOUT) ==== //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#12 (text+ko) ==== @@ -714,7 +714,7 @@ * Processes with privilege, but in jail, are not allowed to * configure extended attributes. */ - if ((error = suser_xxx(td->td_ucred, td->td_proc, 0))) { + if ((error = suser(td, 0))) { if (filename_vp != NULL) VOP_UNLOCK(filename_vp, 0, td); return (error); @@ -811,7 +811,7 @@ switch (uele->uele_attrnamespace) { case EXTATTR_NAMESPACE_SYSTEM: /* Potentially should be: return (EPERM); */ - return (suser_xxx(cred, td->td_proc, 0)); + return (suser_cred(cred, 0)); case EXTATTR_NAMESPACE_USER: return (VOP_ACCESS(vp, access, cred, td)); default: ==== //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#10 (text+ko) ==== @@ -150,7 +150,7 @@ } return (0); } - if ((flags & FORCE) == 0 && suser_xxx(cred, NULL, 0)) { + if ((flags & FORCE) == 0 && suser_cred(cred, 0)) { for (i = 0; i < MAXQUOTAS; i++) { if ((dq = ip->i_dquot[i]) == NODQUOT) continue; @@ -271,7 +271,7 @@ } return (0); } - if ((flags & FORCE) == 0 && suser_xxx(cred, NULL, 0)) { + if ((flags & FORCE) == 0 && suser_cred(cred, 0)) { for (i = 0; i < MAXQUOTAS; i++) { if ((dq = ip->i_dquot[i]) == NODQUOT) continue; ==== //depot/projects/smpng/sys/ufs/ufs/ufs_readwrite.c#6 (text+ko) ==== @@ -566,7 +566,7 @@ * tampering. */ if (resid > uio->uio_resid && ap->a_cred && - suser_xxx(ap->a_cred, NULL, PRISON_ROOT)) + suser_cred(ap->a_cred, PRISON_ROOT)) ip->i_mode &= ~(ISUID | ISGID); if (resid > uio->uio_resid) VN_KNOTE(vp, NOTE_WRITE | (extended ? NOTE_EXTEND : 0)); ==== //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#7 (text+ko) ==== @@ -119,7 +119,7 @@ break; /* fall through */ default: - if ((error = suser_xxx(0, td->td_proc, PRISON_ROOT)) != 0) + if ((error = suser(td, PRISON_ROOT)) != 0) return (error); } ==== //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#12 (text+ko) ==== @@ -484,7 +484,7 @@ * Privileged non-jail processes may not modify system flags * if securelevel > 0 and any existing system flags are set. */ - if (!suser_xxx(cred, NULL, PRISON_ROOT)) { + if (!suser_cred(cred, PRISON_ROOT)) { if (ip->i_flags & (SF_NOUNLINK | SF_IMMUTABLE | SF_APPEND)) { error = securelevel_gt(cred, 0); @@ -616,7 +616,7 @@ * as well as set the setgid bit on a file with a group that the * process is not a member of. */ - if (suser_xxx(cred, NULL, PRISON_ROOT)) { + if (suser_cred(cred, PRISON_ROOT)) { if (vp->v_type != VDIR && (mode & S_ISTXT)) return (EFTYPE); if (!groupmember(ip->i_gid, cred) && (mode & ISGID)) @@ -666,7 +666,7 @@ */ if ((uid != ip->i_uid || (gid != ip->i_gid && !groupmember(gid, cred))) && - (error = suser_xxx(cred, td->td_proc, PRISON_ROOT))) + (error = suser_cred(cred, PRISON_ROOT))) return (error); ogid = ip->i_gid; ouid = ip->i_uid; @@ -733,7 +733,7 @@ panic("ufs_chown: lost quota"); #endif /* QUOTA */ ip->i_flag |= IN_CHANGE; - if (suser_xxx(cred, NULL, PRISON_ROOT) && (ouid != uid || ogid != gid)) + if (suser_cred(cred, PRISON_ROOT) && (ouid != uid || ogid != gid)) ip->i_mode &= ~(ISUID | ISGID); return (0); } @@ -2370,7 +2370,7 @@ if (DOINGSOFTDEP(tvp)) softdep_change_linkcnt(ip); if ((ip->i_mode & ISGID) && !groupmember(ip->i_gid, cnp->cn_cred) && - suser_xxx(cnp->cn_cred, NULL, PRISON_ROOT)) + suser_cred(cnp->cn_cred, PRISON_ROOT)) ip->i_mode &= ~ISGID; if (cnp->cn_flags & ISWHITEOUT) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 11:12: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B94E37B4A5; Mon, 25 Mar 2002 11:10:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5978437B42B for ; Mon, 25 Mar 2002 11:08:16 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PJ8Gh79737 for perforce@freebsd.org; Mon, 25 Mar 2002 11:08:16 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 11:08:16 -0800 (PST) Message-Id: <200203251908.g2PJ8Gh79737@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8389 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8389 Change 8389 by jhb@jhb_laptop on 2002/03/25 11:07:48 Bah, use suser() instead of suser_cred(). Affected files ... ... //depot/projects/smpng/sys/kern/tty_pty.c#12 edit Differences ... ==== //depot/projects/smpng/sys/kern/tty_pty.c#12 (text+ko) ==== @@ -187,7 +187,7 @@ tp->t_lflag = TTYDEF_LFLAG; tp->t_cflag = TTYDEF_CFLAG; tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; - } else if (tp->t_state & TS_XCLUDE && suser_cred(td->td_ucred, 0)) { + } else if (tp->t_state & TS_XCLUDE && suser(td, 0)) { return (EBUSY); } else if (pti->pt_prison != td->td_ucred->cr_prison) { return (EBUSY); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 11:26:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4911337B41A; Mon, 25 Mar 2002 11:26:41 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BDEF437B405 for ; Mon, 25 Mar 2002 11:26:38 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PJQc082724 for perforce@freebsd.org; Mon, 25 Mar 2002 11:26:38 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 11:26:38 -0800 (PST) Message-Id: <200203251926.g2PJQc082724@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8390 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8390 Change 8390 by jhb@jhb_laptop on 2002/03/25 11:25:52 Fix a mis-merge. Affected files ... ... //depot/projects/smpng/sys/nfsserver/nfs_serv.c#14 edit Differences ... ==== //depot/projects/smpng/sys/nfsserver/nfs_serv.c#14 (text+ko) ==== @@ -1743,7 +1743,7 @@ vap->va_type = VFIFO; if (vap->va_type != VFIFO && (error = suser_cred(cred, 0))) { - goto nfsmreply0; + goto ereply; } vap->va_rdev = rdev; error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, vap); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 11:43: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B04E37B404; Mon, 25 Mar 2002 11:41:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D9F2F37B419 for ; Mon, 25 Mar 2002 11:40:58 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PJeuf86686 for perforce@freebsd.org; Mon, 25 Mar 2002 11:40:56 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 11:40:56 -0800 (PST) Message-Id: <200203251940.g2PJeuf86686@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8392 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8392 Change 8392 by jhb@jhb_laptop on 2002/03/25 11:39:56 Integ another round of suser() API changes. Affected files ... ... //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#8 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#10 integrate ... //depot/projects/smpng/sys/dev/dgb/dgb.c#6 integrate ... //depot/projects/smpng/sys/dev/digi/digi.c#9 integrate ... //depot/projects/smpng/sys/dev/nmdm/nmdm.c#8 integrate ... //depot/projects/smpng/sys/dev/ofw/ofw_console.c#6 integrate ... //depot/projects/smpng/sys/dev/rp/rp.c#6 integrate ... //depot/projects/smpng/sys/dev/si/si.c#3 integrate ... //depot/projects/smpng/sys/dev/sio/sio.c#12 integrate ... //depot/projects/smpng/sys/dev/syscons/syscons.c#14 integrate ... //depot/projects/smpng/sys/dev/syscons/sysmouse.c#3 integrate ... //depot/projects/smpng/sys/dev/usb/umodem.c#7 integrate ... //depot/projects/smpng/sys/dev/vinum/vinum.c#4 integrate ... //depot/projects/smpng/sys/dev/wl/if_wl.c#4 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate ... //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#6 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#10 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#25 integrate ... //depot/projects/smpng/sys/i386/i386/mem.c#6 integrate ... //depot/projects/smpng/sys/i386/i386/sys_machdep.c#17 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#4 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#6 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/cx.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/cy.c#13 integrate ... //depot/projects/smpng/sys/i386/isa/istallion.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#7 integrate ... //depot/projects/smpng/sys/i386/isa/rc.c#7 integrate ... //depot/projects/smpng/sys/i386/isa/spigot.c#7 integrate ... //depot/projects/smpng/sys/i386/isa/stallion.c#3 integrate ... //depot/projects/smpng/sys/i386/linux/linux_machdep.c#11 integrate ... //depot/projects/smpng/sys/isa/fd.c#7 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#9 integrate ... //depot/projects/smpng/sys/kern/kern_ntptime.c#5 integrate ... //depot/projects/smpng/sys/kern/kern_shutdown.c#16 integrate ... //depot/projects/smpng/sys/kern/kern_time.c#7 integrate ... //depot/projects/smpng/sys/kern/kern_xxx.c#5 integrate ... //depot/projects/smpng/sys/kern/subr_prf.c#11 integrate ... //depot/projects/smpng/sys/kern/sysv_ipc.c#7 integrate ... //depot/projects/smpng/sys/kern/sysv_msg.c#10 integrate ... //depot/projects/smpng/sys/kern/tty_cons.c#11 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#26 integrate ... //depot/projects/smpng/sys/net/if.c#16 integrate ... //depot/projects/smpng/sys/net/if_sl.c#8 integrate ... //depot/projects/smpng/sys/net/if_tap.c#9 integrate ... //depot/projects/smpng/sys/net/if_tun.c#8 integrate ... //depot/projects/smpng/sys/net/net_osdep.h#3 integrate ... //depot/projects/smpng/sys/net/ppp_tty.c#5 integrate ... //depot/projects/smpng/sys/net/raw_usrreq.c#4 integrate ... //depot/projects/smpng/sys/netatalk/at_control.c#3 integrate ... //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#5 integrate ... //depot/projects/smpng/sys/netatm/atm_usrreq.c#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_socket.c#8 integrate ... //depot/projects/smpng/sys/netgraph/ng_tty.c#5 integrate ... //depot/projects/smpng/sys/netinet/in.c#9 integrate ... //depot/projects/smpng/sys/netinet/ip_divert.c#9 integrate ... //depot/projects/smpng/sys/netinet/ip_output.c#19 integrate ... //depot/projects/smpng/sys/netinet/raw_ip.c#14 integrate ... //depot/projects/smpng/sys/netinet6/in6.c#7 integrate ... //depot/projects/smpng/sys/netinet6/in6_src.c#5 integrate ... //depot/projects/smpng/sys/netinet6/ip6_output.c#6 integrate ... //depot/projects/smpng/sys/netinet6/raw_ip6.c#7 integrate ... //depot/projects/smpng/sys/netinet6/udp6_output.c#5 integrate ... //depot/projects/smpng/sys/netipx/ipx.c#3 integrate ... //depot/projects/smpng/sys/netipx/ipx_pcb.c#4 integrate ... //depot/projects/smpng/sys/netipx/ipx_usrreq.c#4 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#7 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#20 integrate ... //depot/projects/smpng/sys/pc98/pc98/fd.c#6 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio.c#13 integrate ... //depot/projects/smpng/sys/pc98/pc98/syscons.c#11 integrate ... //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#5 integrate ... //depot/projects/smpng/sys/pccard/pccard.c#10 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_util.c#6 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#15 integrate ... //depot/projects/smpng/sys/vm/vm_mmap.c#13 integrate ... //depot/projects/smpng/sys/vm/vm_swap.c#9 integrate Differences ... ==== //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#8 (text+ko) ==== @@ -264,7 +264,7 @@ goto out; if (td->td_ucred->cr_uid != vattr.va_uid && - (error = suser_td(td)) != 0) + (error = suser(td, 0)) != 0) goto out; if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#10 (text+ko) ==== @@ -607,7 +607,7 @@ struct file *fp; int error; - if ((error = suser_td(td)) != 0) + if ((error = suser(td, 0)) != 0) return error; if ((error = getvnode(fdp, SCARG(uap, fd), &fp)) != 0) return error; ==== //depot/projects/smpng/sys/dev/dgb/dgb.c#6 (text+ko) ==== @@ -1050,7 +1050,7 @@ } } if (tp->t_state & TS_XCLUDE && - suser_td(td)) { + suser(td, 0)) { error = EBUSY; goto out; } @@ -1548,7 +1548,7 @@ } switch (cmd) { case TIOCSETA: - error = suser_td(td); + error = suser(td, 0); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1770,7 +1770,7 @@ break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser_td(td); + error = suser(td, 0); if (error != 0) { splx(s); return (error); ==== //depot/projects/smpng/sys/dev/digi/digi.c#9 (text+ko) ==== @@ -783,7 +783,7 @@ } goto open_top; } - if (tp->t_state & TS_XCLUDE && td->td_proc->p_ucred->cr_uid != 0) { + if (tp->t_state & TS_XCLUDE && suser(td, 0) != 0) { error = EBUSY; goto out; } @@ -1146,7 +1146,7 @@ switch (cmd) { case TIOCSETA: - error = suser_td(td); + error = suser(td, 0); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1317,7 +1317,7 @@ *(int *)data = digimctl(port, 0, DMGET); break; case TIOCMSDTRWAIT: - error = suser_td(td); + error = suser(td, 0); if (error != 0) { splx(s); return (error); ==== //depot/projects/smpng/sys/dev/nmdm/nmdm.c#8 (text+ko) ==== @@ -209,7 +209,7 @@ tp->t_lflag = TTYDEF_LFLAG; tp->t_cflag = TTYDEF_CFLAG; tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; - } else if (tp->t_state & TS_XCLUDE && suser_td(td)) { + } else if (tp->t_state & TS_XCLUDE && suser(td, 0)) { return (EBUSY); } else if (pti->pt_prison != td->td_ucred->cr_prison) { return (EBUSY); ==== //depot/projects/smpng/sys/dev/ofw/ofw_console.c#6 (text+ko) ==== @@ -123,7 +123,7 @@ ttsetwater(tp); setuptimeout = 1; - } else if ((tp->t_state & TS_XCLUDE) && suser_td(td)) { + } else if ((tp->t_state & TS_XCLUDE) && suser(td, 0)) { return (EBUSY); } ==== //depot/projects/smpng/sys/dev/rp/rp.c#6 (text+ko) ==== @@ -1010,7 +1010,7 @@ goto open_top; } } - if(tp->t_state & TS_XCLUDE && suser_td(td) != 0) { + if(tp->t_state & TS_XCLUDE && suser(td, 0) != 0) { splx(oldspl); error = EBUSY; goto out2; @@ -1271,7 +1271,7 @@ } switch (cmd) { case TIOCSETA: - error = suser_td(td); + error = suser(td, 0); if(error != 0) return(error); *ct = *(struct termios *)data; @@ -1416,7 +1416,7 @@ *(int *)data = result; break; case TIOCMSDTRWAIT: - error = suser_td(td); + error = suser(td, 0); if(error != 0) { splx(oldspl); return(error); ==== //depot/projects/smpng/sys/dev/si/si.c#3 (text+ko) ==== @@ -607,7 +607,7 @@ /* quickly let in /dev/si_control */ if (IS_CONTROLDEV(mynor)) { - if ((error = suser_td(td))) + if ((error = suser(td, 0))) return(error); return(0); } @@ -686,7 +686,7 @@ } } if (tp->t_state & TS_XCLUDE && - suser_td(td)) { + suser(td, 0)) { DPRINT((pp, DBG_OPEN|DBG_FAIL, "already open and EXCLUSIVE set\n")); error = EBUSY; @@ -951,7 +951,7 @@ } switch (cmd) { case TIOCSETA: - error = suser_td(td); + error = suser(td, 0); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1064,7 +1064,7 @@ break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser_td(td); + error = suser(td, 0); if (error == 0) pp->sp_dtr_wait = *(int *)data * hz / 100; break; @@ -1117,7 +1117,7 @@ ip = (int *)data; -#define SUCHECK if ((error = suser_td(td))) goto out +#define SUCHECK if ((error = suser(td, 0))) goto out switch (cmd) { case TCSIPORTS: ==== //depot/projects/smpng/sys/dev/sio/sio.c#12 (text+ko) ==== @@ -1201,7 +1201,7 @@ } } if (tp->t_state & TS_XCLUDE && - suser_td(td)) { + suser(td, 0)) { error = EBUSY; goto out; } @@ -1937,7 +1937,7 @@ } switch (cmd) { case TIOCSETA: - error = suser_td(td); + error = suser(td, 0); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -2028,7 +2028,7 @@ break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser_td(td); + error = suser(td, 0); if (error != 0) { splx(s); return (error); ==== //depot/projects/smpng/sys/dev/syscons/syscons.c#14 (text+ko) ==== @@ -479,7 +479,7 @@ (*linesw[tp->t_line].l_modem)(tp, 1); } else - if (tp->t_state & TS_XCLUDE && suser_td(td)) + if (tp->t_state & TS_XCLUDE && suser(td, 0)) return(EBUSY); error = (*linesw[tp->t_line].l_open)(dev, tp); @@ -976,7 +976,7 @@ return 0; case KDENABIO: /* allow io operations */ - error = suser_td(td); + error = suser(td, 0); if (error != 0) return error; error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/smpng/sys/dev/syscons/sysmouse.c#3 (text+ko) ==== @@ -99,7 +99,7 @@ tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; smparam(tp, &tp->t_termios); (*linesw[tp->t_line].l_modem)(tp, 1); - } else if (tp->t_state & TS_XCLUDE && suser_td(td)) { + } else if (tp->t_state & TS_XCLUDE && suser(td, 0)) { return EBUSY; } ==== //depot/projects/smpng/sys/dev/usb/umodem.c#7 (text+ko) ==== @@ -602,7 +602,7 @@ if (ISSET(tp->t_state, TS_ISOPEN) && ISSET(tp->t_state, TS_XCLUDE) && - suser_td(p)) + suser(p, 0)) return (EBUSY); /* ==== //depot/projects/smpng/sys/dev/vinum/vinum.c#4 (text+ko) ==== @@ -375,7 +375,7 @@ } case VINUM_SUPERDEV_TYPE: - error = suser_td(td); /* are we root? */ + error = suser(td, 0); /* are we root? */ if (error == 0) { /* yes, can do */ if (devminor == VINUM_DAEMON_DEV) /* daemon device */ vinum_conf.flags |= VF_DAEMONOPEN; /* we're open */ ==== //depot/projects/smpng/sys/dev/wl/if_wl.c#4 (text+ko) ==== @@ -1214,7 +1214,7 @@ /* pointer to buffer in user space */ up = (void *)ifr->ifr_data; /* work out if they're root */ - isroot = (suser_td(td) == 0); + isroot = (suser(td, 0) == 0); for (i = 0; i < 0x40; i++) { /* don't hand the DES key out to non-root users */ @@ -1229,7 +1229,7 @@ /* copy the PSA in from the caller; we only copy _some_ values */ case SIOCSWLPSA: /* root only */ - if ((error = suser_td(td))) + if ((error = suser(td, 0))) break; error = EINVAL; /* assume the worst */ /* pointer to buffer in user space containing data */ @@ -1283,7 +1283,7 @@ */ case SIOCSWLCNWID: /* root only */ - if ((error = suser_td(td))) + if ((error = suser(td, 0))) break; if (!(ifp->if_flags & IFF_UP)) { error = EIO; /* only allowed while up */ @@ -1301,7 +1301,7 @@ /* copy the EEPROM in 2.4 Gz WaveMODEM out to the caller */ case SIOCGWLEEPROM: /* root only */ - if ((error = suser_td(td))) + if ((error = suser(td, 0))) break; /* pointer to buffer in user space */ up = (void *)ifr->ifr_data; @@ -1324,7 +1324,7 @@ /* zero (Delete) the wl cache */ case SIOCDWLCACHE: /* root only */ - if ((error = suser_td(td))) + if ((error = suser(td, 0))) break; wl_cache_zero(unit); break; ==== //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#10 (text+ko) ==== @@ -194,7 +194,7 @@ * If upgrade to read-write by non-root, then verify * that user has necessary permissions on the device. */ - if (suser_td(td)) { + if (suser(td, 0)) { devvp = pmp->pm_devvp; vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); error = VOP_ACCESS(devvp, VREAD | VWRITE, @@ -241,7 +241,7 @@ * If mount by non-root, then verify that user has necessary * permissions on the device. */ - if (suser_td(td)) { + if (suser(td, 0)) { accessmode = VREAD; if ((mp->mnt_flag & MNT_RDONLY) == 0) accessmode |= VWRITE; ==== //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#6 (text+ko) ==== @@ -105,7 +105,7 @@ /* * Only for root */ - if ((error = suser_td(td)) != 0) + if ((error = suser(td, 0)) != 0) return (error); #ifdef DEBUG ==== //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#10 (text+ko) ==== @@ -233,7 +233,7 @@ * If upgrade to read-write by non-root, then verify * that user has necessary permissions on the device. */ - if (suser_td(td)) { + if (suser(td, 0)) { vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); if ((error = VOP_ACCESS(devvp, VREAD | VWRITE, td->td_ucred, td)) != 0) { @@ -286,7 +286,7 @@ * If mount by non-root, then verify that user has necessary * permissions on the device. */ - if (suser_td(td)) { + if (suser(td, 0)) { accessmode = VREAD; if ((mp->mnt_flag & MNT_RDONLY) == 0) accessmode |= VWRITE; ==== //depot/projects/smpng/sys/i386/i386/machdep.c#25 (text+ko) ==== @@ -2127,7 +2127,7 @@ * from within kernel mode? */ - if (suser_td(td) != 0) { + if (suser(td, 0) != 0) { if (dbregs->dr7 & 0x3) { /* dr0 is enabled */ if (dbregs->dr0 >= VM_MAXUSER_ADDRESS) ==== //depot/projects/smpng/sys/i386/i386/mem.c#6 (text+ko) ==== @@ -122,7 +122,7 @@ } break; case 14: - error = suser_td(td); + error = suser(td, 0); if (error != 0) return (error); error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/smpng/sys/i386/i386/sys_machdep.c#17 (text+ko) ==== @@ -183,7 +183,7 @@ if ((error = copyin(args, &ua, sizeof(struct i386_ioperm_args))) != 0) return (error); - if ((error = suser_td(td)) != 0) + if ((error = suser(td, 0)) != 0) return (error); if ((error = securelevel_gt(td->td_ucred, 0)) != 0) return (error); ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#4 (text+ko) ==== @@ -1013,7 +1013,7 @@ #define IBCS2_DATALOCK 4 - if ((error = suser_td(td)) != 0) + if ((error = suser(td, 0)) != 0) return EPERM; switch(SCARG(uap, cmd)) { case IBCS2_UNLOCK: @@ -1048,7 +1048,7 @@ #define SCO_AD_GETBMAJ 0 #define SCO_AD_GETCMAJ 1 - if (suser_td(td)) + if (suser(td, 0)) return EPERM; switch(SCARG(uap, cmd)) { ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#6 (text+ko) ==== @@ -173,7 +173,7 @@ char hname[MAXHOSTNAMELEN], *ptr; int error, sctl[2], hlen; - if ((error = suser_td(td))) + if ((error = suser(td, 0))) return (error); /* W/out a hostname a domain-name is nonsense */ ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#3 (text+ko) ==== @@ -73,7 +73,7 @@ int name[2]; int error; - if ((error = suser_td(td))) + if ((error = suser(td, 0))) return (error); name[0] = CTL_KERN; name[1] = KERN_HOSTNAME; ==== //depot/projects/smpng/sys/i386/isa/cx.c#3 (text+ko) ==== @@ -162,7 +162,7 @@ tp = c->ttyp; tp->t_dev = dev; if ((tp->t_state & TS_ISOPEN) && (tp->t_state & TS_XCLUDE) && - suser_td(td)) + suser(td, 0)) return (EBUSY); if (! (tp->t_state & TS_ISOPEN)) { ttychars (tp); ==== //depot/projects/smpng/sys/i386/isa/cy.c#13 (text+ko) ==== @@ -718,7 +718,7 @@ } } if (tp->t_state & TS_XCLUDE && - suser_td(td)) { + suser(td, 0)) { error = EBUSY; goto out; } @@ -1637,7 +1637,7 @@ } switch (cmd) { case TIOCSETA: - error = suser_td(td); + error = suser(td, 0); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1736,7 +1736,7 @@ break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser_td(td); + error = suser(td, 0); if (error != 0) { splx(s); return (error); ==== //depot/projects/smpng/sys/i386/isa/istallion.c#3 (text+ko) ==== @@ -1010,7 +1010,7 @@ } } if ((tp->t_state & TS_XCLUDE) && - suser_td(td)) { + suser(td, 0)) { error = EBUSY; goto stliopen_end; } @@ -1182,7 +1182,7 @@ switch (cmd) { case TIOCSETA: - if ((error = suser_td(td)) == 0) + if ((error = suser(td, 0)) == 0) *localtios = *((struct termios *) data); break; case TIOCGETA: @@ -1318,7 +1318,7 @@ *((int *) data) = (portp->sigs | TIOCM_LE); break; case TIOCMSDTRWAIT: - if ((error = suser_td(td)) == 0) + if ((error = suser(td, 0)) == 0) portp->dtrwait = *((int *) data) * hz / 100; break; case TIOCMGDTRWAIT: ==== //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#3 (text+ko) ==== @@ -316,7 +316,7 @@ (*linesw[tp->t_line].l_modem)(tp, 1); /* fake connection */ winsz = 1; /* set winsize later */ } - else if (tp->t_state & TS_XCLUDE && suser_td(td)) + else if (tp->t_state & TS_XCLUDE && suser(td, 0)) { return (EBUSY); } ==== //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#7 (text+ko) ==== @@ -2619,7 +2619,7 @@ { struct trapframe *fp = td->td_frame; - error = suser_td(td); + error = suser(td, 0); if (error != 0) return (error); error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/smpng/sys/i386/isa/rc.c#7 (text+ko) ==== @@ -764,7 +764,7 @@ } } if (tp->t_state & TS_XCLUDE && - suser_td(td)) { + suser(td, 0)) { error = EBUSY; goto out; } @@ -1118,7 +1118,7 @@ break; case TIOCMSDTRWAIT: - error = suser_td(td); + error = suser(td, 0); if (error != 0) { splx(s); return (error); ==== //depot/projects/smpng/sys/i386/isa/spigot.c#7 (text+ko) ==== @@ -175,7 +175,7 @@ * require sufficient privilege soon and nothing much can be done * without them. */ - error = suser_td(td); + error = suser(td, 0); if (error != 0) return error; error = securelevel_gt(td->td_ucred, 0); @@ -232,7 +232,7 @@ break; case SPIGOT_IOPL_ON: /* allow access to the IO PAGE */ #if !defined(SPIGOT_UNSECURE) - error = suser_td(td); + error = suser(td, 0); if (error != 0) return error; error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/smpng/sys/i386/isa/stallion.c#3 (text+ko) ==== @@ -832,7 +832,7 @@ } } if ((tp->t_state & TS_XCLUDE) && - suser_td(td)) { + suser(td, 0)) { error = EBUSY; goto stlopen_end; } @@ -970,7 +970,7 @@ switch (cmd) { case TIOCSETA: - if ((error = suser_td(td)) == 0) + if ((error = suser(td, 0)) == 0) *localtios = *((struct termios *) data); break; case TIOCGETA: @@ -1088,7 +1088,7 @@ *((int *) data) = (stl_getsignals(portp) | TIOCM_LE); break; case TIOCMSDTRWAIT: - if ((error = suser_td(td)) == 0) + if ((error = suser(td, 0)) == 0) portp->dtrwait = *((int *) data) * hz / 100; break; case TIOCMGDTRWAIT: ==== //depot/projects/smpng/sys/i386/linux/linux_machdep.c#11 (text+ko) ==== @@ -559,7 +559,7 @@ if (args->level < 0 || args->level > 3) return (EINVAL); - if ((error = suser_td(td)) != 0) + if ((error = suser(td, 0)) != 0) return (error); if ((error = securelevel_gt(td->td_ucred, 0)) != 0) return (error); ==== //depot/projects/smpng/sys/isa/fd.c#7 (text+ko) ==== @@ -2642,7 +2642,7 @@ * Set density definition permanently. Only * allow for superuser. */ - if (suser_td(td) != 0) + if (suser(td, 0) != 0) return (EPERM); fd->fts[type] = *(struct fd_type *)addr; } @@ -2667,7 +2667,7 @@ #endif case FD_CLRERR: - if (suser_td(td) != 0) + if (suser(td, 0) != 0) return (EPERM); fd->fdc->fdc_errs = 0; return (0); @@ -2749,7 +2749,7 @@ case FD_STYPE: /* set drive type */ /* this is considered harmful; only allow for superuser */ - if (suser_td(td) != 0) + if (suser(td, 0) != 0) return (EPERM); *fd->ft = *(struct fd_type *)addr; break; @@ -2773,7 +2773,7 @@ #endif case FD_CLRERR: - if (suser_td(td) != 0) + if (suser(td, 0) != 0) return (EPERM); fd->fdc->fdc_errs = 0; break; ==== //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#9 (text+ko) ==== @@ -238,7 +238,7 @@ vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); error = VOP_ACCESS(devvp, accessmode, td->td_ucred, td); if (error) - error = suser_td(td); + error = suser(td, 0); if (error) { vput(devvp); return (error); ==== //depot/projects/smpng/sys/kern/kern_ntptime.c#5 (text+ko) ==== @@ -300,7 +300,7 @@ mtx_lock(&Giant); modes = ntv.modes; if (modes) - error = suser_td(td); + error = suser(td, 0); if (error) goto done2; s = splclock(); ==== //depot/projects/smpng/sys/kern/kern_shutdown.c#16 (text+ko) ==== @@ -149,7 +149,7 @@ int error; mtx_lock(&Giant); - if ((error = suser_td(td)) == 0) + if ((error = suser(td, 0)) == 0) boot(uap->opt); mtx_unlock(&Giant); return (error); ==== //depot/projects/smpng/sys/kern/kern_time.c#7 (text+ko) ==== @@ -187,7 +187,7 @@ int error; mtx_lock(&Giant); - if ((error = suser_td(td)) != 0) + if ((error = suser(td, 0)) != 0) goto done2; if (SCARG(uap, clock_id) != CLOCK_REALTIME) { error = EINVAL; @@ -370,7 +370,7 @@ mtx_lock(&Giant); - if ((error = suser_td(td))) + if ((error = suser(td, 0))) goto done2; /* Verify all parameters before changing time. */ if (uap->tv) { @@ -421,7 +421,7 @@ mtx_lock(&Giant); - if ((error = suser_td(td))) + if ((error = suser(td, 0))) goto done2; error = copyin((caddr_t)uap->delta, (caddr_t)&atv, sizeof(struct timeval)); ==== //depot/projects/smpng/sys/kern/kern_xxx.c#5 (text+ko) ==== @@ -143,7 +143,7 @@ int error; mtx_lock(&Giant); - if ((error = suser_td(td))) + if ((error = suser(td, 0))) hostid = uap->hostid; mtx_unlock(&Giant); return (error); @@ -298,7 +298,7 @@ int error, domainnamelen; mtx_lock(&Giant); - if ((error = suser_td(td))) + if ((error = suser(td, 0))) goto done2; if ((u_int)uap->len > sizeof (domainname) - 1) { error = EINVAL; ==== //depot/projects/smpng/sys/kern/subr_prf.c#11 (text+ko) ==== @@ -861,7 +861,7 @@ int error; if (!unprivileged_read_msgbuf) { - error = suser_td(req->td); + error = suser(req->td, 0); if (error) return (error); } ==== //depot/projects/smpng/sys/kern/sysv_ipc.c#7 (text+ko) ==== @@ -81,7 +81,7 @@ /* Check for user match. */ if (cred->cr_uid != perm->cuid && cred->cr_uid != perm->uid) { if (mode & IPC_M) - return (suser_td(td) == 0 ? 0 : EPERM); + return (suser(td, 0) == 0 ? 0 : EPERM); /* Check for group match. */ mode >>= 3; if (!groupmember(perm->gid, cred) && @@ -93,5 +93,5 @@ if (mode & IPC_M) return (0); return ((mode & perm->mode) == mode || - suser_td(td) == 0 ? 0 : EACCES); + suser(td, 0) == 0 ? 0 : EACCES); } ==== //depot/projects/smpng/sys/kern/sysv_msg.c#10 (text+ko) ==== @@ -421,7 +421,7 @@ if ((error = copyin(user_msqptr, &msqbuf, sizeof(msqbuf))) != 0) goto done2; if (msqbuf.msg_qbytes > msqptr->msg_qbytes) { - error = suser_td(td); + error = suser(td, 0); if (error) goto done2; } ==== //depot/projects/smpng/sys/kern/tty_cons.c#11 (text+ko) ==== @@ -456,7 +456,7 @@ * output from the "virtual" console. */ if (cmd == TIOCCONS && constty) { - error = suser_td(td); + error = suser(td, 0); if (error) return (error); constty = NULL; ==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#26 (text+ko) ==== @@ -198,7 +198,7 @@ return (ENAMETOOLONG); if (usermount == 0) { - error = suser_td(td); + error = suser(td, 0); if (error) return (error); } @@ -206,7 +206,7 @@ * Do not allow NFS export by non-root users. */ if (fsflags & MNT_EXPORTED) { - error = suser_td(td); + error = suser(td, 0); if (error) return (error); } @@ -245,7 +245,7 @@ * permitted to update it. */ if (mp->mnt_stat.f_owner != td->td_ucred->cr_uid) { - error = suser_td(td); + error = suser(td, 0); if (error) { vput(vp); return (error); @@ -280,7 +280,7 @@ return (error); } if (va.va_uid != td->td_ucred->cr_uid) { - error = suser_td(td); + error = suser(td, 0); if (error) { vput(vp); return (error); @@ -302,7 +302,7 @@ linker_file_t lf; /* Only load modules for root (very important!) */ - error = suser_td(td); + error = suser(td, 0); if (error) { vput(vp); return error; @@ -522,7 +522,7 @@ * permitted to unmount this filesystem. */ if (mp->mnt_stat.f_owner != td->td_ucred->cr_uid) { - error = suser_td(td); + error = suser(td, 0); if (error) { vput(vp); return (error); @@ -1332,7 +1332,7 @@ switch (SCARG(uap, mode) & S_IFMT) { case S_IFCHR: case S_IFBLK: - error = suser_td(td); + error = suser(td, 0); break; default: error = suser(td, PRISON_ROOT); @@ -3622,7 +3622,7 @@ /* * Must be super user */ - error = suser_td(td); + error = suser(td, 0); if (error) return (error); NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, uap->fname, td); @@ -3678,7 +3678,7 @@ /* * Must be super user */ - error = suser_td(td); + error = suser(td, 0); if (error) return (error); @@ -3854,7 +3854,7 @@ /* * Must be super user */ - error = suser_td(td); + error = suser(td, 0); if (error) return (error); @@ -3901,7 +3901,7 @@ /* * Must be super user */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 11:57:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98FA337B41A; Mon, 25 Mar 2002 11:57:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D04A137B419 for ; Mon, 25 Mar 2002 11:57:19 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PJvJU89422 for perforce@freebsd.org; Mon, 25 Mar 2002 11:57:19 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 11:57:19 -0800 (PST) Message-Id: <200203251957.g2PJvJU89422@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8395 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8395 Change 8395 by jhb@jhb_laptop on 2002/03/25 11:57:11 Manually fixup a suser_xxx() as a temporary hack for now. Affected files ... ... //depot/projects/smpng/sys/kern/kern_ktrace.c#17 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_ktrace.c#17 (text+ko) ==== @@ -594,7 +594,7 @@ { if (targetp->p_traceflag & KTRFAC_ROOT && - suser_xxx(NULL, callp, PRISON_ROOT)) + suser_cred(callp->p_ucred, PRISON_ROOT)) return (0); if (p_candebug(callp, targetp) != 0) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 12: 0:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 852BB37B41A; Mon, 25 Mar 2002 12:00:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 61D5137B405 for ; Mon, 25 Mar 2002 12:00:24 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PK0OW89982 for perforce@freebsd.org; Mon, 25 Mar 2002 12:00:24 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 12:00:24 -0800 (PST) Message-Id: <200203252000.g2PK0OW89982@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8397 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8397 Change 8397 by jhb@jhb_laptop on 2002/03/25 12:00:19 Integ a comment fixup for the new suser() API. Affected files ... ... //depot/projects/smpng/sys/sys/ucred.h#13 integrate Differences ... ==== //depot/projects/smpng/sys/sys/ucred.h#13 (text+ko) ==== @@ -45,7 +45,7 @@ * Credentials. * * Please do not inspect cr_uid directly to determine superuserness. - * Only the suser()/suser_xxx() function should be used for this. + * Only the suser() or suser_cred() function should be used for this. */ struct ucred { u_int cr_ref; /* reference count */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 12: 5:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2FFE37B41A; Mon, 25 Mar 2002 12:05:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E85B537B419 for ; Mon, 25 Mar 2002 12:05:30 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PK5Uf94325 for perforce@freebsd.org; Mon, 25 Mar 2002 12:05:30 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 12:05:30 -0800 (PST) Message-Id: <200203252005.g2PK5Uf94325@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8398 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8398 Change 8398 by jhb@jhb_laptop on 2002/03/25 12:04:58 Fixup a new suser() invocation since the changes in jhb_proc. Affected files ... ... //depot/projects/smpng/sys/dev/usb/ucom.c#2 edit Differences ... ==== //depot/projects/smpng/sys/dev/usb/ucom.c#2 (text+ko) ==== @@ -257,7 +257,7 @@ if (ISSET(tp->t_state, TS_ISOPEN) && ISSET(tp->t_state, TS_XCLUDE) && - suser_td(p)) + suser(p, 0)) return (EBUSY); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 12:12:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92B8737B41B; Mon, 25 Mar 2002 12:11:41 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1FD4237B41E for ; Mon, 25 Mar 2002 12:11:39 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PKBd795278 for perforce@freebsd.org; Mon, 25 Mar 2002 12:11:39 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 12:11:39 -0800 (PST) Message-Id: <200203252011.g2PKBd795278@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8400 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8400 Change 8400 by jhb@jhb_laptop on 2002/03/25 12:11:38 More new suser()'s. Affected files ... ... //depot/projects/smpng/sys/dev/an/if_an.c#16 edit Differences ... ==== //depot/projects/smpng/sys/dev/an/if_an.c#16 (text+ko) ==== @@ -1362,7 +1362,7 @@ an_setdef(sc, &sc->areq); break; case SIOCGPRIVATE_0: /* used by Cisco client utility */ - if ((error = suser(p))) + if ((error = suser(td, 0))) goto out; copyin(ifr->ifr_data, &l_ioctl, sizeof(l_ioctl)); mode = l_ioctl.command; @@ -1382,7 +1382,7 @@ break; case SIOCGPRIVATE_1: /* used by Cisco client utility */ - if ((error = suser(p))) + if ((error = suser(td, 0))) goto out; copyin(ifr->ifr_data, &l_ioctl, sizeof(l_ioctl)); l_ioctl.command = 0; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 12:40:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADB8A37B41C; Mon, 25 Mar 2002 12:40:09 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39]) by hub.freebsd.org (Postfix) with ESMTP id CA57C37B41B; Mon, 25 Mar 2002 12:40:08 -0800 (PST) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc53.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020325204008.JZKM2951.rwcrmhc53.attbi.com@InterJet.elischer.org>; Mon, 25 Mar 2002 20:40:08 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id MAA37653; Mon, 25 Mar 2002 12:24:09 -0800 (PST) Date: Mon, 25 Mar 2002 12:24:08 -0800 (PST) From: Julian Elischer To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 8398 for review In-Reply-To: <200203252005.g2PK5Uf94325@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG ummmm... On Mon, 25 Mar 2002, John Baldwin wrote: > - suser_td(p)) > + suser(p, 0)) is 'p' a thread pointer? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 12:53:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61E0D37B417; Mon, 25 Mar 2002 12:53:42 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id BFA4737B400; Mon, 25 Mar 2002 12:53:40 -0800 (PST) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.11.6/8.11.6) with SMTP id g2PKrTk98682; Mon, 25 Mar 2002 15:53:29 -0500 (EST) (envelope-from robert@fledge.watson.org) Date: Mon, 25 Mar 2002 15:53:29 -0500 (EST) From: Robert Watson X-Sender: robert@fledge.watson.org To: Julian Elischer Cc: John Baldwin , Perforce Change Reviews Subject: Re: PERFORCE change 8398 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, 25 Mar 2002, Julian Elischer wrote: > ummmm... > > On Mon, 25 Mar 2002, John Baldwin wrote: > > - suser_td(p)) > > + suser(p, 0)) > > is 'p' a thread pointer? There is some evil driver compatibility typdef'ing to hide the difference between thread and proc in device APIs using the same variable names, this could be some of it. That said, not enough context to tell. Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 13:10:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 252E537B41A; Mon, 25 Mar 2002 13:10:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5715537B419 for ; Mon, 25 Mar 2002 13:10:51 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PLApq09436 for perforce@freebsd.org; Mon, 25 Mar 2002 13:10:51 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Mar 2002 13:10:51 -0800 (PST) Message-Id: <200203252110.g2PLApq09436@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8403 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8403 Change 8403 by rwatson@rwatson_tislabs on 2002/03/25 13:10:36 Build mac_bsdextended only as a kernel module, not as a kernel compile option. Since it doesn't require space in the MAC label or need early initialization, there's no reason to compile it in. Affected files ... ... //depot/projects/trustedbsd/mac/sys/conf/files#21 edit ... //depot/projects/trustedbsd/mac/sys/conf/options#12 edit ... //depot/projects/trustedbsd/mac/sys/modules/mac_bsdextended/Makefile#2 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#25 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/files#21 (text+ko) ==== @@ -1267,7 +1267,6 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard security/mac_biba/mac_biba.c optional mac_biba -security/mac_bsdextended/mac_bsdextended.c optional mac_bsdextended security/mac_mls/mac_mls.c optional mac_mls security/mac_none/mac_none.c optional mac_none security/mac_te/mac_te.c optional mac_te ==== //depot/projects/trustedbsd/mac/sys/conf/options#12 (text+ko) ==== @@ -109,7 +109,6 @@ CAPABILITIES opt_cap.h MAC opt_mac.h MAC_BIBA opt_mac.h -MAC_BSDEXTENDED opt_mac.h MAC_MLS opt_mac.h MAC_NONE opt_mac.h MAC_TE opt_mac.h ==== //depot/projects/trustedbsd/mac/sys/modules/mac_bsdextended/Makefile#2 (text+ko) ==== @@ -4,7 +4,6 @@ KMOD= mac_bsdextended SRCS= vnode_if.h \ - opt_mac.h \ mac_bsdextended.c .include ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#25 (text+ko) ==== @@ -44,8 +44,6 @@ * XXX: Much locking support required here. */ -#include "opt_mac.h" - #include #include #include @@ -71,8 +69,6 @@ #include -#ifdef MAC - SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, bsdextended, CTLFLAG_RW, 0, @@ -658,4 +654,3 @@ MAC_POLICY_SET(mac_bsdextended_ops, trustedbsd_mac_bsdextended, "TrustedBSD MAC/BSD Extended", 0); -#endif /* !MAC */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 13:11:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9BC737B404; Mon, 25 Mar 2002 13:11:53 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0CE7037B400 for ; Mon, 25 Mar 2002 13:11:53 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PLBq109573 for perforce@freebsd.org; Mon, 25 Mar 2002 13:11:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Mar 2002 13:11:52 -0800 (PST) Message-Id: <200203252111.g2PLBq109573@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8404 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8404 Change 8404 by rwatson@rwatson_tislabs on 2002/03/25 13:11:23 Trim MAC_BSDEXTENDED option from configuration files. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#17 edit ... //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#17 (text+ko) ==== @@ -33,7 +33,6 @@ options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART options MAC_BIBA -options MAC_BSDEXTENDED options MAC_MLS options MAC_NONE options MAC_TE ==== //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#13 (text+ko) ==== @@ -2990,7 +2990,6 @@ # Support for Mandatory Access Control (MAC) options MAC options MAC_BIBA -options MAC_BSDEXTENDED options MAC_MLS options MAC_NONE options MAC_TE To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 13:15: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3217337B400; Mon, 25 Mar 2002 13:15:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7871337B425 for ; Mon, 25 Mar 2002 13:14:57 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PLEub10057 for perforce@freebsd.org; Mon, 25 Mar 2002 13:14:56 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 25 Mar 2002 13:14:56 -0800 (PST) Message-Id: <200203252114.g2PLEub10057@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 8405 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8405 Change 8405 by rwatson@rwatson_tislabs on 2002/03/25 13:14:54 Also build mac_none as a module, so that it demonstrates how to properly construct a trustedbsd_mac policy provider so that it's linked into the kernel, and available as a module. Affected files ... ... //depot/projects/trustedbsd/mac/sys/modules/Makefile#13 edit ... //depot/projects/trustedbsd/mac/sys/modules/mac_none/Makefile#1 add Differences ... ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#13 (text+ko) ==== @@ -54,6 +54,7 @@ lomac \ lpt \ mac_bsdextended \ + mac_none \ mac_seeotheruids \ md \ mii \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 13:21:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9171737B416; Mon, 25 Mar 2002 13:21:35 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mail14.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by hub.freebsd.org (Postfix) with ESMTP id 163B537B404 for ; Mon, 25 Mar 2002 13:21:30 -0800 (PST) Received: (qmail 23257 invoked from network); 25 Mar 2002 21:21:27 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail14.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 25 Mar 2002 21:21:27 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g2PLM8v83670; Mon, 25 Mar 2002 16:22:08 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Mon, 25 Mar 2002 16:21:29 -0500 (EST) From: John Baldwin To: Julian Elischer Subject: Re: PERFORCE change 8398 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 25-Mar-2002 Julian Elischer wrote: > ummmm... > > > On Mon, 25 Mar 2002, John Baldwin wrote: >> - suser_td(p)) >> + suser(p, 0)) > > is 'p' a thread pointer? Yes. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 13:54:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBB6F37B404; Mon, 25 Mar 2002 13:54:47 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8590637B419 for ; Mon, 25 Mar 2002 13:54:46 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PLskQ19832 for perforce@freebsd.org; Mon, 25 Mar 2002 13:54:46 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 13:54:46 -0800 (PST) Message-Id: <200203252154.g2PLskQ19832@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8409 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8409 Change 8409 by jhb@jhb_laptop on 2002/03/25 13:54:12 Warning fixes. Affected files ... ... //depot/projects/smpng/sys/dev/an/if_an.c#17 edit ... //depot/projects/smpng/sys/dev/wi/if_wi.c#20 edit Differences ... ==== //depot/projects/smpng/sys/dev/an/if_an.c#17 (text+ko) ==== @@ -1267,7 +1267,6 @@ struct an_softc *sc; struct ifreq *ifr; struct thread *td = curthread; - struct proc *p = td->td_proc; struct ieee80211req *ireq; u_int8_t tmpstr[IEEE80211_NWID_LEN*2]; u_int8_t *tmpptr; ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#20 (text+ko) ==== @@ -1541,7 +1541,6 @@ struct ifreq *ifr; struct ieee80211req *ireq; struct thread *td = curthread; - struct proc *p = td->td_proc; sc = ifp->if_softc; WI_LOCK(sc); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 13:58: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA6D337B419; Mon, 25 Mar 2002 13:57:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1288237B416 for ; Mon, 25 Mar 2002 13:57:51 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PLvo420487 for perforce@freebsd.org; Mon, 25 Mar 2002 13:57:50 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 13:57:50 -0800 (PST) Message-Id: <200203252157.g2PLvo420487@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8411 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8411 Change 8411 by jhb@jhb_laptop on 2002/03/25 13:57:40 Compile fixes. Affected files ... ... //depot/projects/smpng/sys/kern/kern_resource.c#15 edit ... //depot/projects/smpng/sys/kern/tty.c#13 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_resource.c#15 (text+ko) ==== @@ -258,7 +258,7 @@ if (n < PRIO_MIN) n = PRIO_MIN; if (n < chgp->p_ksegrp.kg_nice /* XXXKSE */ && - suser(td, 0)) + suser_cred(curp->p_ucred, 0)) return (EACCES); chgp->p_ksegrp.kg_nice /* XXXKSE */ = n; (void)resetpriority(&chgp->p_ksegrp); /* XXXKSE */ ==== //depot/projects/smpng/sys/kern/tty.c#13 (text+ko) ==== @@ -730,9 +730,11 @@ void *data; { register struct proc *p; + struct thread *td; int s, error; - p = curproc; /* XXX */ + td = curthread; /* XXX */ + p = td->td_proc; /* If the ioctl involves modification, hang if in the background. */ switch (cmd) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 14: 8:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 919B137B400; Mon, 25 Mar 2002 14:08:28 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 92AB837B429 for ; Mon, 25 Mar 2002 14:08:04 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PM84i25573 for perforce@freebsd.org; Mon, 25 Mar 2002 14:08:04 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 14:08:04 -0800 (PST) Message-Id: <200203252208.g2PM84i25573@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8413 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8413 Change 8413 by jhb@jhb_laptop on 2002/03/25 14:07:09 More warning fixes. Affected files ... ... //depot/projects/smpng/sys/i386/i386/vm86.c#6 edit ... //depot/projects/smpng/sys/netinet/in_pcb.c#19 edit ... //depot/projects/smpng/sys/netinet6/ip6_input.c#7 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/vm86.c#6 (text+ko) ==== @@ -659,7 +659,6 @@ struct thread *td; char *args; { - struct proc *p = td->td_proc; int error = 0; struct i386_vm86_args ua; struct vm86_kernel *vm86; ==== //depot/projects/smpng/sys/netinet/in_pcb.c#19 (text+ko) ==== @@ -178,7 +178,6 @@ struct sockaddr *nam; struct thread *td; { - struct proc *p = td->td_proc; register struct socket *so = inp->inp_socket; unsigned short *lastport; struct sockaddr_in *sin; ==== //depot/projects/smpng/sys/netinet6/ip6_input.c#7 (text+ko) ==== @@ -1136,7 +1136,6 @@ { #if __FreeBSD__ >= 5 struct thread *td = curthread; /* XXX */ - struct proc *p = td->td_proc; #else struct proc *p = curproc; /* XXX */ #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 14:22:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E9A837B41B; Mon, 25 Mar 2002 14:21:24 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2002D37B405 for ; Mon, 25 Mar 2002 14:21:22 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PMLLE28194 for perforce@freebsd.org; Mon, 25 Mar 2002 14:21:21 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 14:21:21 -0800 (PST) Message-Id: <200203252221.g2PMLLE28194@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8415 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8415 Change 8415 by jhb@jhb_laptop on 2002/03/25 14:21:08 YA compile fix. Affected files ... ... //depot/projects/smpng/sys/net/if_ppp.c#9 edit Differences ... ==== //depot/projects/smpng/sys/net/if_ppp.c#9 (text+ko) ==== @@ -573,7 +573,7 @@ u_long cmd; caddr_t data; { - struct proc *p = curproc; /* XXX */ + struct thread *td = curthread; /* XXX */ register struct ppp_softc *sc = &ppp_softc[ifp->if_unit]; register struct ifaddr *ifa = (struct ifaddr *)data; register struct ifreq *ifr = (struct ifreq *)data; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 14:43: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6A6037BA51; Mon, 25 Mar 2002 14:42:22 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7AD1337B648 for ; Mon, 25 Mar 2002 14:40:56 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2PMejw31286 for perforce@freebsd.org; Mon, 25 Mar 2002 14:40:45 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 25 Mar 2002 14:40:45 -0800 (PST) Message-Id: <200203252240.g2PMejw31286@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8416 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8416 Change 8416 by jhb@jhb_laptop on 2002/03/25 14:40:09 YA warning fix. Affected files ... ... //depot/projects/smpng/sys/dev/cnw/if_cnw.c#5 edit Differences ... ==== //depot/projects/smpng/sys/dev/cnw/if_cnw.c#5 (text+ko) ==== @@ -1241,7 +1241,6 @@ int s, error = 0; #if defined(__FreeBSD__) && __FreeBSD__ >= 5 struct thread *td = curthread; /* XXX */ - struct proc *p = td->td_proc; #else struct proc *p = curproc; /*XXX*/ #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Mar 25 18: 3: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79F5837B419; Mon, 25 Mar 2002 18:03:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id 7260F37B400; Mon, 25 Mar 2002 18:02:59 -0800 (PST) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.11.6/8.11.6) with SMTP id g2Q22uw02711; Mon, 25 Mar 2002 21:02:56 -0500 (EST) (envelope-from robert@fledge.watson.org) Date: Mon, 25 Mar 2002 21:02:56 -0500 (EST) From: Robert Watson X-Sender: robert@fledge.watson.org To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 8416 for review In-Reply-To: <200203252240.g2PMejw31286@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Do you have a timeline for this commit, btw? These are some cleanups that will facilitate bringing the capability/mac code forward also. Also, since these are wide-ranging, the sooner we get them in the less merge-work later :-). Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services On Mon, 25 Mar 2002, John Baldwin wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8416 > > Change 8416 by jhb@jhb_laptop on 2002/03/25 14:40:09 > > YA warning fix. > > Affected files ... > > ... //depot/projects/smpng/sys/dev/cnw/if_cnw.c#5 edit > > Differences ... > > ==== //depot/projects/smpng/sys/dev/cnw/if_cnw.c#5 (text+ko) ==== > > @@ -1241,7 +1241,6 @@ > int s, error = 0; > #if defined(__FreeBSD__) && __FreeBSD__ >= 5 > struct thread *td = curthread; /* XXX */ > - struct proc *p = td->td_proc; > #else > struct proc *p = curproc; /*XXX*/ > #endif > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 26 8:29: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE87237B419; Tue, 26 Mar 2002 08:28:56 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mail11.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by hub.freebsd.org (Postfix) with ESMTP id B128F37B41B for ; Tue, 26 Mar 2002 08:28:55 -0800 (PST) Received: (qmail 18706 invoked from network); 26 Mar 2002 16:28:54 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 26 Mar 2002 16:28:54 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g2QGTZv86716; Tue, 26 Mar 2002 11:29:35 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Tue, 26 Mar 2002 11:28:56 -0500 (EST) From: John Baldwin To: Robert Watson Subject: Re: PERFORCE change 8416 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 26-Mar-2002 Robert Watson wrote: > Do you have a timeline for this commit, btw? These are some cleanups that > will facilitate bringing the capability/mac code forward also. Also, > since these are wide-ranging, the sooner we get them in the less > merge-work later :-). Probably 2 days or so as I mentioned on irc. > Robert N M Watson FreeBSD Core Team, TrustedBSD Project > robert@fledge.watson.org NAI Labs, Safeport Network Services > > On Mon, 25 Mar 2002, John Baldwin wrote: > >> http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8416 >> >> Change 8416 by jhb@jhb_laptop on 2002/03/25 14:40:09 >> >> YA warning fix. >> >> Affected files ... >> >> ... //depot/projects/smpng/sys/dev/cnw/if_cnw.c#5 edit >> >> Differences ... >> >> ==== //depot/projects/smpng/sys/dev/cnw/if_cnw.c#5 (text+ko) ==== >> >> @@ -1241,7 +1241,6 @@ >> int s, error = 0; >> #if defined(__FreeBSD__) && __FreeBSD__ >= 5 >> struct thread *td = curthread; /* XXX */ >> - struct proc *p = td->td_proc; >> #else >> struct proc *p = curproc; /*XXX*/ >> #endif >> > -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 26 10:31:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0A4A37B41A; Tue, 26 Mar 2002 10:31:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F0A3D37B416 for ; Tue, 26 Mar 2002 10:31:25 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2QIVP834168 for perforce@freebsd.org; Tue, 26 Mar 2002 10:31:25 -0800 (PST) (envelope-from green@freebsd.org) Date: Tue, 26 Mar 2002 10:31:25 -0800 (PST) Message-Id: <200203261831.g2QIVP834168@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8446 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8446 Change 8446 by green@green_laptop_2 on 2002/03/26 10:31:13 For the root mount case, call the create_mount hook and then the create_mount_root hook. If a module wishes to do no initialization at all of the root mount in create_mount, it may special-case and ignore it. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/init_main.c#16 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_main.c#16 (text+ko) ==== @@ -507,6 +507,7 @@ FILEDESC_UNLOCK(p->p_fd); VOP_UNLOCK(rootvnode, 0, td); #ifdef MAC + mac_create_mount(td->td_ucred, TAILQ_FIRST(&mountlist)); mac_create_root_mount(td->td_ucred, TAILQ_FIRST(&mountlist)); #endif /* MAC */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 26 10:45: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44BA137B41F; Tue, 26 Mar 2002 10:44:47 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7192337B421 for ; Tue, 26 Mar 2002 10:44:42 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2QIigs36322 for perforce@freebsd.org; Tue, 26 Mar 2002 10:44:42 -0800 (PST) (envelope-from cvance@tislabs.com) Date: Tue, 26 Mar 2002 10:44:42 -0800 (PST) Message-Id: <200203261844.g2QIigs36322@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 8447 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8447 Change 8447 by cvance@cvance_laptop on 2002/03/26 10:44:13 Initial import of SEBSD sources. The security server will boot and initialize properly - assuming you have a valid policy located at /ss_policy, otherwise it will cause a panic at boot time. Affected files ... ... //depot/projects/trustedbsd/mac/sys/conf/files#22 edit ... //depot/projects/trustedbsd/mac/sys/conf/options#13 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/av_inherit.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/av_perm_to_string.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/av_permissions.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc-selinux.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc_ss.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/class_to_string.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/common_perm_to_string.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/flask.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/flask_types.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/linux-compat.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/avtab.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/avtab.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/constraint.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/context.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/ebitmap.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/ebitmap.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/fileutils.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/fileutils.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/hashtab.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/hashtab.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/init.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/initial_sid_to_string.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/mls.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/mls.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/mls_types.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/policydb.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/policydb.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/queue.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/queue.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/security.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services_private.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/symtab.c#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/symtab.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/syscalls.c#1 add Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/files#22 (text+ko) ==== @@ -1270,6 +1270,20 @@ security/mac_mls/mac_mls.c optional mac_mls security/mac_none/mac_none.c optional mac_none security/mac_te/mac_te.c optional mac_te + +security/sebsd/sebsd.c optional sebsd +security/sebsd/avc/avc.c optional sebsd +security/sebsd/ss/avtab.c optional sebsd +security/sebsd/ss/ebitmap.c optional sebsd +security/sebsd/ss/hashtab.c optional sebsd +security/sebsd/ss/init.c optional sebsd +security/sebsd/ss/policydb.c optional sebsd +security/sebsd/ss/queue.c optional sebsd +security/sebsd/ss/services.c optional sebsd +security/sebsd/ss/sidtab.c optional sebsd +security/sebsd/ss/symtab.c optional sebsd +security/sebsd/ss/fileutils.c optional sebsd + ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_alloc.c optional ifs ufs/ffs/ffs_balloc.c optional ffs ==== //depot/projects/trustedbsd/mac/sys/conf/options#13 (text+ko) ==== @@ -112,6 +112,7 @@ MAC_MLS opt_mac.h MAC_NONE opt_mac.h MAC_TE opt_mac.h +SEBSD opt_mac.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 26 11: 6:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C639C37B417; Tue, 26 Mar 2002 11:05:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1798337B400 for ; Tue, 26 Mar 2002 11:05:09 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2QJ58R40469 for perforce@freebsd.org; Tue, 26 Mar 2002 11:05:08 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 26 Mar 2002 11:05:08 -0800 (PST) Message-Id: <200203261905.g2QJ58R40469@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8449 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8449 Change 8449 by jhb@jhb_laptop on 2002/03/26 11:05:07 IFC. Affected files ... ... //depot/projects/smpng/sys/conf/kmod_syms.awk#2 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.c#5 integrate ... //depot/projects/smpng/sys/dev/ata/ata-all.c#14 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-all.c#10 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#16 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-fd.c#6 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-tape.c#9 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#3 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_os.c#6 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_reg.h#3 integrate ... //depot/projects/smpng/sys/dev/digi/digi.c#10 integrate ... //depot/projects/smpng/sys/i386/include/i4b_ioctl.h#8 integrate ... //depot/projects/smpng/sys/i386/isa/pcf.c#3 integrate ... //depot/projects/smpng/sys/i4b/include/i4b_l3l4.h#4 integrate ... //depot/projects/smpng/sys/i4b/layer3/i4b_l2if.c#3 integrate ... //depot/projects/smpng/sys/i4b/layer3/i4b_q931.c#5 integrate ... //depot/projects/smpng/sys/i4b/layer3/i4b_q931.h#3 integrate ... //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#7 integrate ... //depot/projects/smpng/sys/i4b/layer4/i4b_l4.c#4 integrate ... //depot/projects/smpng/sys/ia64/include/ansi.h#10 integrate ... //depot/projects/smpng/sys/kern/kern_linker.c#16 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#15 integrate ... //depot/projects/smpng/sys/kern/vfs_init.c#4 integrate ... //depot/projects/smpng/sys/kern/vfs_subr.c#21 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#27 integrate ... //depot/projects/smpng/sys/kern/vfs_vnops.c#19 integrate ... //depot/projects/smpng/sys/sys/file.h#9 integrate ... //depot/projects/smpng/sys/sys/inflate.h#3 integrate ... //depot/projects/smpng/sys/sys/mount.h#9 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#15 integrate ... //depot/projects/smpng/sys/vm/vm_extern.h#9 integrate Differences ... ==== //depot/projects/smpng/sys/conf/kmod_syms.awk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kmod_syms.awk,v 1.1 2002/01/10 03:52:01 msmith Exp $ +# $FreeBSD: src/sys/conf/kmod_syms.awk,v 1.2 2002/03/25 20:32:24 obrien Exp $ # Read global symbols from object file. BEGIN { @@ -10,7 +10,7 @@ } # De-list symbols from the export list. -// { +{ if (ARGIND == 1) nextfile delete syms[$0] ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.c#5 (text+ko) ==== @@ -77,7 +77,7 @@ #if !defined(lint) /* static const char rcsid[] = "@(#)$Id: ip_proxy.c,v 2.9.2.6 2001/07/15 22:06:15 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.c,v 1.16 2002/03/19 15:14:18 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.c,v 1.17 2002/03/26 13:42:09 ru Exp $"; #endif #if defined(_KERNEL) && (SOLARIS || defined(__sgi)) @@ -98,8 +98,8 @@ #include "netinet/ip_rcmd_pxy.c" #include "netinet/ip_raudio_pxy.c" #include "netinet/ip_netbios_pxy.c" +#include "netinet/ip_ipsec_pxy.c" #endif -#include "netinet/ip_ipsec_pxy.c" ap_session_t *ap_sess_tab[AP_SESS_SIZE]; ap_session_t *ap_sess_list = NULL; ==== //depot/projects/smpng/sys/dev/ata/ata-all.c#14 (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. * - * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.139 2002/03/19 12:14:13 peter Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.140 2002/03/26 09:31:22 sos Exp $ */ #include "opt_ata.h" @@ -418,31 +418,27 @@ struct ata_params *ata_parm; int retry = 0; + if (!(ata_parm = malloc(sizeof(struct ata_params), M_ATA, M_NOWAIT))) { + ata_prtdev(atadev, "malloc for identify data failed\n"); + return -1; + } + /* apparently some devices needs this repeated */ do { if (ata_command(atadev, command, 0, 0, 0, ATA_WAIT_INTR)) { ata_prtdev(atadev, "%s identify failed\n", command == ATA_C_ATAPI_IDENTIFY ? "ATAPI" : "ATA"); + free(ata_parm, M_ATA); return -1; } if (retry++ > 4) { ata_prtdev(atadev, "%s identify retries exceeded\n", command == ATA_C_ATAPI_IDENTIFY ? "ATAPI" : "ATA"); + free(ata_parm, M_ATA); return -1; } } while (ata_wait(atadev, ((command == ATA_C_ATAPI_IDENTIFY) ? ATA_S_DRQ : (ATA_S_READY|ATA_S_DSC|ATA_S_DRQ)))); - - ata_parm = malloc(sizeof(struct ata_params), M_ATA, M_NOWAIT); - if (!ata_parm) { - int i; - - for (i = 0; i < sizeof(struct ata_params)/sizeof(int16_t); i++) - ATA_INW(atadev->channel->r_io, ATA_DATA); - ata_prtdev(atadev, "malloc for identify data failed\n"); - return -1; - } - ATA_INSW(atadev->channel->r_io, ATA_DATA, (int16_t *)ata_parm, sizeof(struct ata_params)/sizeof(int16_t)); ==== //depot/projects/smpng/sys/dev/ata/atapi-all.c#10 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-all.c,v 1.86 2002/03/11 21:04:32 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-all.c,v 1.87 2002/03/26 09:31:22 sos Exp $ */ #include "opt_ata.h" @@ -95,29 +95,27 @@ #ifdef DEV_ATAPICD case ATAPI_TYPE_CDROM: if (acdattach(atadev)) - goto notfound; + return; break; #endif #ifdef DEV_ATAPIFD case ATAPI_TYPE_DIRECT: if (afdattach(atadev)) - goto notfound; - break; + return; + break; #endif #ifdef DEV_ATAPIST case ATAPI_TYPE_TAPE: if (astattach(atadev)) - goto notfound; - break; + return; + break; #endif -notfound: - default: - ata_prtdev(atadev, "<%.40s/%.8s> %s device - NO DRIVER!\n", - atadev->param->model, atadev->param->revision, - atapi_type(atadev->param->type)); - free(atadev->result, M_ATAPI); - atadev->driver = NULL; } + ata_prtdev(atadev, "<%.40s/%.8s> %s device - NO DRIVER!\n", + atadev->param->model, atadev->param->revision, + atapi_type(atadev->param->type)); + free(atadev->result, M_ATAPI); + atadev->driver = NULL; } void ==== //depot/projects/smpng/sys/dev/ata/atapi-cd.c#16 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.112 2002/03/16 15:56:54 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.113 2002/03/26 09:31:22 sos Exp $ */ #include "opt_ata.h" @@ -113,7 +113,7 @@ if ((cdp = acd_init_lun(atadev, NULL)) == NULL) { ata_prtdev(atadev, "acd: out of memory\n"); - return -1; + return 0; } ata_set_name(atadev, "acd", cdp->lun); @@ -129,7 +129,7 @@ if (chp == NULL) { ata_prtdev(atadev, "out of memory\n"); free(cdp, M_ACD); - return -1; + return 0; } if (!atapi_queue_cmd(cdp->device, ccb, (caddr_t)chp, sizeof(struct changer), @@ -145,7 +145,7 @@ ata_prtdev(atadev, "out of memory\n"); free(chp, M_ACD); free(cdp, M_ACD); - return -1; + return 0; } for (count = 0; count < chp->slots; count++) { if (count > 0) { @@ -181,7 +181,7 @@ } acd_describe(cdp); atadev->driver = cdp; - return 0; + return 1; } void ==== //depot/projects/smpng/sys/dev/ata/atapi-fd.c#6 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.69 2002/03/11 21:04:32 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.70 2002/03/26 09:31:22 sos Exp $ */ #include @@ -87,7 +87,7 @@ fdp = malloc(sizeof(struct afd_softc), M_AFD, M_NOWAIT | M_ZERO); if (!fdp) { ata_prtdev(atadev, "out of memory\n"); - return -1; + return 0; } fdp->device = atadev; @@ -97,7 +97,7 @@ if (afd_sense(fdp)) { free(fdp, M_AFD); - return -1; + return 0; } if (!strncmp(atadev->param->model, "IOMEGA ZIP", 10)) @@ -114,7 +114,7 @@ afd_describe(fdp); atadev->flags |= ATA_D_MEDIA_CHANGED; atadev->driver = fdp; - return 0; + return 1; } void ==== //depot/projects/smpng/sys/dev/ata/atapi-tape.c#9 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.65 2002/03/11 21:04:32 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.66 2002/03/26 09:31:22 sos Exp $ */ #include "opt_ata.h" @@ -95,7 +95,7 @@ stp = malloc(sizeof(struct ast_softc), M_AST, M_NOWAIT | M_ZERO); if (!stp) { ata_prtdev(atadev, "out of memory\n"); - return -1; + return 0; } stp->device = atadev; @@ -105,7 +105,7 @@ if (ast_sense(stp)) { free(stp, M_AST); - return -1; + return 0; } if (!strcmp(atadev->param->model, "OnStream DI-30")) { @@ -141,7 +141,7 @@ stp->device->flags |= ATA_D_MEDIA_CHANGED; ast_describe(stp); atadev->driver = stp; - return 0; + return 1; } void ==== //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.20 2002/03/23 15:47:08 nsouch Exp $ + * $FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.21 2002/03/25 21:22:33 nsouch Exp $ * */ @@ -74,6 +74,12 @@ #define I2C_DELAY 40 +/* Compilation is void if BKTR_USE_FREEBSD_SMBUS is not + * defined. This allows bktr owners to have smbus active for there + * motherboard and still use their bktr without smbus. + */ +#if defined(BKTR_USE_FREEBSD_SMBUS) + #define BTI2C_DEBUG(x) if (bti2c_debug) (x) static int bti2c_debug = 0; @@ -86,9 +92,6 @@ struct bktr_softc *bktr_sc = (struct bktr_softc *)device_get_softc(dev); struct bktr_i2c_softc *sc = &bktr_sc->i2c_sc; - device_t *list; - int count; - sc->smbus = device_add_child(dev, "smbus", -1); sc->iicbb = device_add_child(dev, "iicbb", -1); @@ -97,13 +100,6 @@ bus_generic_attach(dev); - /* the iicbus is the first child of device iicbb */ - device_get_children(sc->iicbb, &list, &count); - if (count) { - sc->iicbus = list[0]; - free(list, M_TEMP); - } - return (0); }; @@ -344,3 +340,5 @@ return (0); } + +#endif /* defined(BKTR_USE_FREEBSD_SMBUS) */ ==== //depot/projects/smpng/sys/dev/bktr/bktr_os.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.26 2002/03/23 15:47:08 nsouch Exp $ */ +/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.27 2002/03/25 21:22:33 nsouch Exp $ */ /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -986,11 +986,6 @@ #endif pci_conf_write(tag, 0x40, fun); -#if defined(BKTR_USE_FREEBSD_SMBUS) - if (bt848_i2c_attach(dev)) - printf("bktr%d: i2c_attach: can't attach\n", unit); -#endif - /* * PCI latency timer. 32 is a good value for 4 bus mastering slots, if * you have more than four, then 16 would probably be a better value. ==== //depot/projects/smpng/sys/dev/bktr/bktr_reg.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.43 2002/03/23 15:47:08 nsouch Exp $ + * $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.44 2002/03/25 21:22:33 nsouch Exp $ * * Copyright (c) 1999 Roger Hardiman * Copyright (c) 1998 Amancio Hasty @@ -449,7 +449,6 @@ int bus_owned; device_t iicbb; - device_t iicbus; device_t smbus; }; #endif ==== //depot/projects/smpng/sys/dev/digi/digi.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi.c,v 1.19 2002/02/27 23:47:45 peter Exp $ + * $FreeBSD: src/sys/dev/digi/digi.c,v 1.20 2002/03/26 18:01:38 jhb Exp $ */ /*- ==== //depot/projects/smpng/sys/i386/include/i4b_ioctl.h#8 (text+ko) ==== @@ -27,29 +27,21 @@ * i4b_ioctl.h - messages kernel <--> userland * ------------------------------------------- * - * $FreeBSD: src/sys/i386/include/i4b_ioctl.h,v 1.18 2002/03/17 09:33:13 hm Exp $ + * $FreeBSD: src/sys/i386/include/i4b_ioctl.h,v 1.19 2002/03/26 15:12:27 hm Exp $ * - * last edit-date: [Sun Mar 17 10:09:55 2002] + * last edit-date: [Tue Mar 26 14:44:15 2002] * *---------------------------------------------------------------------------*/ #ifndef _I4B_IOCTL_H_ #define _I4B_IOCTL_H_ -#if 0 -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 -#ifndef _MACHINE_TYPES_H_ -#include -#endif /* _MACHINE_TYPES_H_ */ -#endif /* __FreeBSD__ */ -#endif - /*---------------------------------------------------------------------------* * version and release number for isdn4bsd package *---------------------------------------------------------------------------*/ #define VERSION 1 /* version number */ -#define REL 1 /* release number */ -#define STEP 1 /* release step */ +#define REL 2 /* release number */ +#define STEP 0 /* release step */ /*---------------------------------------------------------------------------* * date/time format in i4b log messages @@ -172,6 +164,7 @@ * max length of some strings *---------------------------------------------------------------------------*/ #define TELNO_MAX 41 /* max length of a telephone number (+ '\0') */ +#define SUBADDR_MAX 21 /* max length of a subaddress (+ '\0') */ #define DISPLAY_MAX 91 /* max length of display information (+ '\0') */ #define DATETIME_MAX 21 /* max length of datetime information (+ '\0')*/ #define KEYPAD_MAX 35 /* max length of a keypad string (+ '\0') */ @@ -341,7 +334,9 @@ #define CHAN_NO (-2) /* call waiting (CW) for incoming */ int bprot; /* b channel protocot, see BPROT_XXX */ char dst_telno[TELNO_MAX]; /* destination telno */ + char dst_subaddr[SUBADDR_MAX]; /* dest subaddr */ char src_telno[TELNO_MAX]; /* source telno */ + char src_subaddr[SUBADDR_MAX]; /* src subaddr */ int scr_ind;/* screening indicator */ #define SCR_NONE 0 /* no screening indicator transmitted */ #define SCR_USR_NOSC 1 /* screening user provided, not screened*/ @@ -412,7 +407,9 @@ int driver; /* driver type */ int driver_unit; /* driver unit number */ int cmdlen; /* length of string */ + int subaddrlen; /* length of subaddr */ char cmd[TELNO_MAX]; /* the number to dial */ + char subaddr[SUBADDR_MAX]; /* dest subaddr */ } msg_dialoutnumber_ind_t; /*---------------------------------------------------------------------------* @@ -572,7 +569,9 @@ #define ULEN_METHOD_STATIC 0 /* use unitlen_time value (see above) */ #define ULEN_METHOD_DYNAMIC 1 /* use AOCD */ char dst_telno[TELNO_MAX]; /* destination telephone no */ + char dst_subaddr[SUBADDR_MAX]; /* dest subaddr */ char src_telno[TELNO_MAX]; /* source telephone number */ + char src_subaddr[SUBADDR_MAX]; /* source subaddr */ char keypad[KEYPAD_MAX]; /* keypad string */ } msg_connect_req_t; ==== //depot/projects/smpng/sys/i386/isa/pcf.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/isa/pcf.c,v 1.17 2001/12/10 08:09:46 obrien Exp $ + * $FreeBSD: src/sys/i386/isa/pcf.c,v 1.18 2002/03/25 21:22:35 nsouch Exp $ * */ #include @@ -197,10 +197,10 @@ return (error); } - pcf->iicbus = iicbus_alloc_bus(pcfdev); + pcf->iicbus = device_add_child(pcfdev, "iicbus", -1); /* probe and attach the iicbus */ - device_probe_and_attach(pcf->iicbus); + bus_generic_attach(pcfdev); return (0); } ==== //depot/projects/smpng/sys/i4b/include/i4b_l3l4.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * i4b_l3l4.h - layer 3 / layer 4 interface * ------------------------------------------ * - * $FreeBSD: src/sys/i4b/include/i4b_l3l4.h,v 1.10 2002/03/17 09:33:14 hm Exp $ + * $FreeBSD: src/sys/i4b/include/i4b_l3l4.h,v 1.11 2002/03/26 15:13:52 hm Exp $ * * last edit-date: [Sat Mar 9 15:57:44 2002] * @@ -147,7 +147,9 @@ int call_state; /* from incoming SETUP */ u_char dst_telno[TELNO_MAX]; /* destination number */ + u_char dst_subaddr[SUBADDR_MAX]; /* destination subaddr */ u_char src_telno[TELNO_MAX]; /* source number */ + u_char src_subaddr[SUBADDR_MAX]; /* source subaddr */ int scr_ind; /* screening ind for incoming call */ int prs_ind; /* presentation ind for incoming call */ ==== //depot/projects/smpng/sys/i4b/layer3/i4b_l2if.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2001 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b_l2if.c - Layer 3 interface to Layer 2 * ------------------------------------------- * - * $FreeBSD: src/sys/i4b/layer3/i4b_l2if.c,v 1.11 2001/10/18 11:53:49 hm Exp $ + * $FreeBSD: src/sys/i4b/layer3/i4b_l2if.c,v 1.12 2002/03/26 15:13:53 hm Exp $ * - * last edit-date: [Thu Oct 18 13:29:19 2001] + * last edit-date: [Tue Mar 26 15:03:59 2002] * *---------------------------------------------------------------------------*/ @@ -422,7 +422,9 @@ u_char *ptr; int len; int slen = strlen(cd->src_telno); + int sslen = strlen(cd->src_subaddr); int dlen = strlen(cd->dst_telno); + int dslen = strlen(cd->dst_subaddr); int klen = strlen(cd->keypad); /* @@ -437,7 +439,9 @@ len = I_FRAME_HDRLEN + MSG_SETUP_LEN + (slen ? (3+slen) : 0) + + (sslen ? (3+sslen) : 0) + (dlen ? (3+dlen) : 0) + + (dslen ? (3+dslen) : 0) + (klen ? (2+klen) : 0) + (cd->bprot == BPROT_NONE ? 1 : 0); @@ -521,6 +525,15 @@ ptr += slen; } + if(sslen) + { + *ptr++ = IEI_CALLINGPS; /* calling subaddr */ + *ptr++ = IEI_CALLINGPS_LEN+sslen; /* calling subaddr len */ + *ptr++ = SUBADDR_TYPE_NSAP; /* type = NSAP */ + strncpy(ptr, cd->src_subaddr, sslen); + ptr += sslen; + } + if(dlen) { *ptr++ = IEI_CALLEDPN; /* called party no */ @@ -529,6 +542,15 @@ strncpy(ptr, cd->dst_telno, dlen); ptr += dlen; } + + if(dslen) + { + *ptr++ = IEI_CALLEDPS; /* calling party subaddr */ + *ptr++ = IEI_CALLEDPS_LEN+dslen;/* calling party subaddr len */ + *ptr++ = SUBADDR_TYPE_NSAP; /* type = NSAP */ + strncpy(ptr, cd->dst_subaddr, dslen); + ptr += dslen; + } DL_Data_Req(ctrl_desc[cd->controller].unit, m); } ==== //depot/projects/smpng/sys/i4b/layer3/i4b_q931.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ * i4b_q931.c - Q931 received messages handling * -------------------------------------------- * - * $FreeBSD: src/sys/i4b/layer3/i4b_q931.c,v 1.13 2002/03/17 09:33:15 hm Exp $ + * $FreeBSD: src/sys/i4b/layer3/i4b_q931.c,v 1.14 2002/03/26 15:13:53 hm Exp $ * * last edit-date: [Sat Mar 9 19:36:45 2002] * @@ -431,17 +431,21 @@ break; case IEI_CALLINGPS: /* calling party subaddress */ - NDBGL3(L3_P_MSG, "IEI_CALLINGPS"); + memcpy(cd->src_subaddr, &msg_ptr[3], min(SUBADDR_MAX, msg_ptr[1]-1)); + cd->src_subaddr[min(SUBADDR_MAX, msg_ptr[1] - 1)] = '\0'; + NDBGL3(L3_P_MSG, "IEI_CALLINGPS = %s", cd->src_subaddr); break; case IEI_CALLEDPN: /* called party number */ memcpy(cd->dst_telno, &msg_ptr[3], min(TELNO_MAX, msg_ptr[1]-1)); - cd->dst_telno[min(TELNO_MAX, msg_ptr [1] - 1)] = '\0'; + cd->dst_telno[min(TELNO_MAX, msg_ptr[1] - 1)] = '\0'; NDBGL3(L3_P_MSG, "IEI_CALLED = %s", cd->dst_telno); break; case IEI_CALLEDPS: /* called party subaddress */ - NDBGL3(L3_P_MSG, "IEI_CALLEDPS"); + memcpy(cd->dst_subaddr, &msg_ptr[3], min(SUBADDR_MAX, msg_ptr[1]-1)); + cd->dst_subaddr[min(SUBADDR_MAX, msg_ptr[1] - 1)] = '\0'; + NDBGL3(L3_P_MSG, "IEI_CALLEDPS = %s", cd->dst_subaddr); break; case IEI_REDIRNO: /* redirecting number */ ==== //depot/projects/smpng/sys/i4b/layer3/i4b_q931.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2001 Hellmuth Michaelis. All rights reserved. + * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,9 +27,9 @@ * i4b_q931.h - Q931 handling header file * -------------------------------------- * - * $FreeBSD: src/sys/i4b/layer3/i4b_q931.h,v 1.8 2001/10/18 11:53:49 hm Exp $ + * $FreeBSD: src/sys/i4b/layer3/i4b_q931.h,v 1.9 2002/03/26 15:13:54 hm Exp $ * - * last edit-date: [Thu Oct 18 13:29:01 2001] + * last edit-date: [Tue Mar 26 15:04:33 2002] * *---------------------------------------------------------------------------*/ @@ -79,12 +79,12 @@ #define IT_CAP_SPEECH 0x80 /* BC: information xfer capability */ #define IT_CAP_UNR_DIG_INFO 0x88 /* BC: information xfer capability */ -#define IT_RATE_64K 0x90 /* BC: information xfer rate */ -#define IT_UL1_G711A 0xa3 /* layer1 proto G.711 A-law */ +#define IT_RATE_64K 0x90 /* BC: information xfer rate */ +#define IT_UL1_G711A 0xa3 /* layer1 proto G.711 A-law */ #define IEI_CHANNELID_LEN 0x01 /* length of channel id */ -#define CHANNELID_B1 0x81 /* channel = B1 (outgoing) */ -#define CHANNELID_B2 0x82 /* channel = B2 (outgoing) */ +#define CHANNELID_B1 0x81 /* channel = B1 (outgoing) */ +#define CHANNELID_B2 0x82 /* channel = B2 (outgoing) */ #define CHANNELID_ANY 0x83 /* channel = any channel (outgoing) */ #define IE_CHAN_ID_NO 0x00 /* no channel (incoming) */ @@ -94,9 +94,13 @@ #define NUMBER_TYPEPLAN 0x81 /* type of number/numbering plan */ -#define IEI_CALLINGPN_LEN 1 /* without number string ! */ +#define IEI_CALLINGPN_LEN 1 /* without number string ! */ +#define IEI_CALLEDPN_LEN 1 /* without number string ! */ + +#define IEI_CALLINGPS_LEN 1 +#define IEI_CALLEDPS_LEN 1 -#define IEI_CALLEDPN_LEN 1 /* without number string ! */ +#define SUBADDR_TYPE_NSAP 0x80 /* subaddr: type=NSAP */ /* CONNECT_ACK */ ==== //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ * i4b_i4bdrv.c - i4b userland interface driver * -------------------------------------------- * - * $FreeBSD: src/sys/i4b/layer4/i4b_i4bdrv.c,v 1.25 2002/03/17 09:33:15 hm Exp $ + * $FreeBSD: src/sys/i4b/layer4/i4b_i4bdrv.c,v 1.26 2002/03/26 15:13:54 hm Exp $ * * last edit-date: [Sun Mar 17 09:54:22 2002] * @@ -292,6 +292,9 @@ strcpy(cd->dst_telno, mcr->dst_telno); strcpy(cd->src_telno, mcr->src_telno); + strcpy(cd->dst_subaddr, mcr->dst_subaddr); + strcpy(cd->src_subaddr, mcr->src_subaddr); + if(mcr->keypad[0] != '\0') strcpy(cd->keypad, mcr->keypad); else ==== //depot/projects/smpng/sys/i4b/layer4/i4b_l4.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ * i4b_l4.c - kernel interface to userland * ----------------------------------------- * - * $FreeBSD: src/sys/i4b/layer4/i4b_l4.c,v 1.12 2002/03/17 09:33:15 hm Exp $ + * $FreeBSD: src/sys/i4b/layer4/i4b_l4.c,v 1.13 2002/03/26 15:13:54 hm Exp $ * * last edit-date: [Sat Mar 9 19:46:26 2002] * @@ -204,6 +204,7 @@ if((m = i4b_Dgetmbuf(sizeof(msg_dialoutnumber_ind_t))) != NULL) { msg_dialoutnumber_ind_t *md = (msg_dialoutnumber_ind_t *)m->m_data; + int i; md->header.type = MSG_DIALOUTNUMBER_IND; md->header.cdid = -1; @@ -211,11 +212,20 @@ md->driver = driver; md->driver_unit = driver_unit; - if(cmdlen > TELNO_MAX) - cmdlen = TELNO_MAX; + for (i = 0; i < cmdlen; i++) + if (cmd[i] == '*') + break; + + /* XXX: TELNO_MAX is _with_ tailing '\0', so max is actually TELNO_MAX - 1 */ + md->cmdlen = (i < TELNO_MAX - 1 ? i : TELNO_MAX - 1); + /* skip the (first) '*' */ + md->subaddrlen = (cmdlen - i - 1 < SUBADDR_MAX - 1 ? cmdlen - i - 1 : SUBADDR_MAX - 1); + + bcopy(cmd, md->cmd, md->cmdlen); + if (md->subaddrlen != -1) + bcopy(cmd+i+1, md->subaddr, md->subaddrlen); - md->cmdlen = cmdlen; - bcopy(cmd, md->cmd, cmdlen); + NDBGL4(L4_TIMO, "cmd[%d]=%s, subaddr[%d]=%s", md->cmdlen, md->cmd, md->subaddrlen, md->subaddr); i4bputqueue(m); } } @@ -365,11 +375,21 @@ else strcpy(mp->dst_telno, TELNO_EMPTY); + if(strlen(cd->dst_subaddr) > 0) + strcpy(mp->dst_subaddr, cd->dst_subaddr); + else + strcpy(mp->dst_subaddr, TELNO_EMPTY); + if(strlen(cd->src_telno) > 0) strcpy(mp->src_telno, cd->src_telno); else strcpy(mp->src_telno, TELNO_EMPTY); + if(strlen(cd->src_subaddr) > 0) + strcpy(mp->src_subaddr, cd->src_subaddr); + else + strcpy(mp->src_subaddr, TELNO_EMPTY); + strcpy(mp->display, cd->display); mp->scr_ind = cd->scr_ind; ==== //depot/projects/smpng/sys/ia64/include/ansi.h#10 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/ia64/include/ansi.h,v 1.18 2002/03/24 11:25:45 obrien Exp $ + * $FreeBSD: src/sys/ia64/include/ansi.h,v 1.19 2002/03/26 02:59:00 obrien Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -73,14 +73,13 @@ #ifdef __GNUC__ #define _BSD_VA_LIST_ __builtin_va_list /* internally known to gcc */ -typedef _BSD_VA_LIST_ __gnuc_va_list; /* compatibility w/GNU headers*/ +#if !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) +#define __GNUC_VA_LIST +typedef _BSD_VA_LIST_ __gnuc_va_list; /* compatibility w/GNU headers*/ +#endif #else #error Must add va_list support for this non-GCC compiler. #endif /*__GNUC__*/ -#if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) -#define __GNUC_VA_LIST -typedef _BSD_VA_LIST_ __gnuc_va_list; /* compatibility w/GNU headers*/ -#endif /* * The rune type above is declared to be an ``int'' instead of the more natural ==== //depot/projects/smpng/sys/kern/kern_linker.c#16 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_linker.c,v 1.84 2002/03/22 04:56:09 arr Exp $ + * $FreeBSD: src/sys/kern/kern_linker.c,v 1.85 2002/03/25 18:26:34 arr Exp $ */ #include "opt_ddb.h" @@ -698,10 +698,10 @@ td->td_retval[0] = -1; - if (securelevel > 0) /* redundant, but that's OK */ - return (EPERM); + mtx_lock(&Giant); - mtx_lock(&Giant); + if ((error = securelevel_gt(td->td_ucred, 0)) != 0) + goto out; if ((error = suser(td, 0)) != 0) goto out; @@ -745,10 +745,10 @@ linker_file_t lf; int error = 0; - if (securelevel > 0) /* redundant, but that's OK */ - return (EPERM); + mtx_lock(&Giant); - mtx_lock(&Giant); + if ((error = securelevel_gt(td->td_ucred, 0)) != 0) + goto out; if ((error = suser(td, 0)) != 0) goto out; ==== //depot/projects/smpng/sys/kern/vfs_aio.c#15 (text+ko) ==== @@ -13,7 +13,7 @@ * bad that happens because of using this software isn't the responsibility * of the author. This software is distributed AS-IS. * - * $FreeBSD: src/sys/kern/vfs_aio.c,v 1.118 2002/03/20 04:09:58 jeff Exp $ + * $FreeBSD: src/sys/kern/vfs_aio.c,v 1.119 2002/03/25 21:52:04 bde Exp $ */ /* @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/smpng/sys/kern/vfs_init.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_init.c 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/kern/vfs_init.c,v 1.57 2002/03/20 04:09:58 jeff Exp $ + * $FreeBSD: src/sys/kern/vfs_init.c,v 1.58 2002/03/25 21:30:50 obrien Exp $ */ @@ -129,8 +129,10 @@ for (i = 0; i < vnodeopv_num; i++) { opv = vnodeopv_descs[i]; opv_desc_vector_p = opv->opv_desc_vector_p; +#ifdef WANT_BAD_JUJU if (*opv_desc_vector_p) FREE(*opv_desc_vector_p, M_VNODE); +#endif MALLOC(*opv_desc_vector_p, vop_t **, vfs_opv_numops * sizeof(vop_t *), M_VNODE, M_WAITOK | M_ZERO); ==== //depot/projects/smpng/sys/kern/vfs_subr.c#21 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.349 2002/03/20 04:09:58 jeff Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.350 2002/03/26 15:33:43 mux Exp $ */ /* @@ -507,6 +507,83 @@ } /* + * Get a mount option by its name. + * + * Return 0 if the option was found. + * Return ENOENT if the option wasn't found. + * If len is a non-NULL pointer and *len + * a integer different from 0, then the size + * of the option will be compared with *len and + * if they doesn't match, EINVAL is returned. + * If len is non-NULL and *len == 0, it will + * be filled with the length of the option. + * Finally, if buf is non-NULL, it will be + * filled with the address of the option. + */ +int +vfs_getopt(opts, name, buf, len) + struct vfsoptlist *opts; + const char *name; + void **buf; + int *len; +{ + struct vfsopt *opt; + int i; + + i = 0; + opt = opts->opt; + while (i++ < opts->optcnt) { + if (strcmp(name, opt->name) == 0) { + if (len != NULL) { + if ((*len != 0) && (*len != opt->len)) + return (EINVAL); + *len = opt->len; + } + if (buf != NULL) + *buf = opt->value; + return (0); + } + opt++; + } + return (ENOENT); +} + +/* + * Find and copy a mount option. + * The size of the buffer has to be specified + * in len, if it is not big enough, EINVAL is + * returned. Returns ENOENT if the option is + * not found. Otherwise, the number of bytes + * actually copied are put in done if it's + * non-NULL and 0 is returned. + */ +int +vfs_copyopt(opts, name, dest, len, done) + struct vfsoptlist *opts; + const char *name; + void *dest; + int len, *done; +{ + struct vfsopt *opt; + int i; + + i = 0; + opt = opts->opt; + while (i++ < opts->optcnt) { + if (strcmp(name, opt->name) == 0) { + if (len < opt->len) + return (EINVAL); + bcopy(dest, opt->value, opt->len); + if (done != NULL) + *done = opt->len; + return (0); + } + opt++; + } + return (ENOENT); +} + +/* * Set vnode attributes to VNOVAL */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 26 11:25:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E56837B416; Tue, 26 Mar 2002 11:25:37 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 683C037B405 for ; Tue, 26 Mar 2002 11:25:36 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2QJPat47625 for perforce@freebsd.org; Tue, 26 Mar 2002 11:25:36 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 26 Mar 2002 11:25:36 -0800 (PST) Message-Id: <200203261925.g2QJPat47625@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8452 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8452 Change 8452 by jhb@jhb_laptop on 2002/03/26 11:24:50 Simplify a __FreeBSD__ check. Affected files ... ... //depot/projects/smpng/sys/dev/cnw/if_cnw.c#6 edit Differences ... ==== //depot/projects/smpng/sys/dev/cnw/if_cnw.c#6 (text+ko) ==== @@ -1239,7 +1239,7 @@ #endif struct ifreq *ifr = (struct ifreq *)data; int s, error = 0; -#if defined(__FreeBSD__) && __FreeBSD__ >= 5 +#if __FreeBSD__ >= 5 struct thread *td = curthread; /* XXX */ #else struct proc *p = curproc; /*XXX*/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 26 16:37:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2009D37B400; Tue, 26 Mar 2002 16:36:24 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8A78337B417 for ; Tue, 26 Mar 2002 16:36:21 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2R0aC317007 for perforce@freebsd.org; Tue, 26 Mar 2002 16:36:12 -0800 (PST) (envelope-from jake@freebsd.org) Date: Tue, 26 Mar 2002 16:36:12 -0800 (PST) Message-Id: <200203270036.g2R0aC317007@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8463 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8463 Change 8463 by jake@jake_sparc64 on 2002/03/26 16:35:58 Integ. Affected files ... ... //depot/projects/sparc64/Makefile.inc1#4 integrate ... //depot/projects/sparc64/README#2 integrate ... //depot/projects/sparc64/bin/chio/chio.c#2 integrate ... //depot/projects/sparc64/bin/df/df.c#2 integrate ... //depot/projects/sparc64/bin/ls/lomac.c#2 integrate ... //depot/projects/sparc64/bin/ps/lomac.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/ip_ipsec_pxy.c#2 delete ... //depot/projects/sparc64/contrib/ipfilter/ip_netbios_pxy.c#2 delete ... //depot/projects/sparc64/contrib/texinfo/COPYING#2 integrate ... //depot/projects/sparc64/contrib/texinfo/COPYING.DOC#1 branch ... //depot/projects/sparc64/contrib/texinfo/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/texinfo/FREEBSD-Xlist#2 integrate ... //depot/projects/sparc64/contrib/texinfo/FREEBSD-upgrade#2 integrate ... //depot/projects/sparc64/contrib/texinfo/INSTALL#2 integrate ... //depot/projects/sparc64/contrib/texinfo/INTRODUCTION#2 integrate ... //depot/projects/sparc64/contrib/texinfo/NEWS#2 integrate ... //depot/projects/sparc64/contrib/texinfo/README#2 integrate ... //depot/projects/sparc64/contrib/texinfo/TODO#2 integrate ... //depot/projects/sparc64/contrib/texinfo/config.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/config.h.in#2 integrate ... //depot/projects/sparc64/contrib/texinfo/doc/README#2 integrate ... //depot/projects/sparc64/contrib/texinfo/doc/help2man#2 integrate ... //depot/projects/sparc64/contrib/texinfo/doc/info-stnd.texi#2 integrate ... //depot/projects/sparc64/contrib/texinfo/doc/info.1#2 integrate ... //depot/projects/sparc64/contrib/texinfo/doc/info.texi#2 integrate ... //depot/projects/sparc64/contrib/texinfo/doc/install-info.1#2 integrate ... //depot/projects/sparc64/contrib/texinfo/doc/makeinfo.1#2 integrate ... //depot/projects/sparc64/contrib/texinfo/doc/texindex.1#2 integrate ... //depot/projects/sparc64/contrib/texinfo/doc/texinfo.txi#2 integrate ... //depot/projects/sparc64/contrib/texinfo/doc/version-stnd.texi#1 branch ... //depot/projects/sparc64/contrib/texinfo/doc/version.texi#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/doc.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/doc.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/echo-area.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/filesys.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/funs.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/info.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/info.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/infodoc.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/infokey.c#1 branch ... //depot/projects/sparc64/contrib/texinfo/info/infokey.h#1 branch ... //depot/projects/sparc64/contrib/texinfo/info/infomap.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/infomap.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/key.c#1 branch ... //depot/projects/sparc64/contrib/texinfo/info/key.h#1 branch ... //depot/projects/sparc64/contrib/texinfo/info/m-x.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/man.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/nodes.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/session.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/session.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/termdep.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/terminal.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/terminal.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/variables.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/info/window.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/lib/getopt.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/lib/getopt.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/lib/getopt1.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/lib/gettext.h#1 branch ... //depot/projects/sparc64/contrib/texinfo/lib/system.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/lib/xstrdup.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/README#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/cmds.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/defun.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/docbook.c#1 branch ... //depot/projects/sparc64/contrib/texinfo/makeinfo/docbook.h#1 branch ... //depot/projects/sparc64/contrib/texinfo/makeinfo/files.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/files.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/footnote.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/html.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/html.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/index.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/insertion.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/insertion.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/lang.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/lang.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/macro.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/makeinfo.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/makeinfo.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/multi.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/node.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/node.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/sectioning.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/texinfo.dtd#1 branch ... //depot/projects/sparc64/contrib/texinfo/makeinfo/texinfo.xsl#1 branch ... //depot/projects/sparc64/contrib/texinfo/makeinfo/toc.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/toc.h#2 integrate ... //depot/projects/sparc64/contrib/texinfo/makeinfo/xml.c#1 branch ... //depot/projects/sparc64/contrib/texinfo/makeinfo/xml.h#1 branch ... //depot/projects/sparc64/contrib/texinfo/util/install-info.c#2 integrate ... //depot/projects/sparc64/contrib/texinfo/util/texindex.c#2 integrate ... //depot/projects/sparc64/crypto/openssh/auth1.c#4 integrate ... //depot/projects/sparc64/crypto/openssh/auth2.c#3 integrate ... //depot/projects/sparc64/crypto/openssh/servconf.c#3 integrate ... //depot/projects/sparc64/crypto/openssh/sshd.8#3 integrate ... //depot/projects/sparc64/etc/inetd.conf#2 integrate ... //depot/projects/sparc64/etc/mtree/BSD.include.dist#2 integrate ... //depot/projects/sparc64/etc/pam.d/sshd#2 integrate ... //depot/projects/sparc64/etc/rc#4 integrate ... //depot/projects/sparc64/etc/sendmail/freebsd.mc#4 integrate ... //depot/projects/sparc64/etc/sendmail/freefall.mc#2 integrate ... //depot/projects/sparc64/games/backgammon/common_source/fancy.c#2 integrate ... //depot/projects/sparc64/games/canfield/canfield/canfield.c#2 integrate ... //depot/projects/sparc64/games/canfield/cfscores/cfscores.c#2 integrate ... //depot/projects/sparc64/games/fortune/datfiles/fortunes2-o#2 integrate ... //depot/projects/sparc64/games/fortune/fortune/fortune.c#2 integrate ... //depot/projects/sparc64/games/fortune/strfile/strfile.c#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/Makefile#8 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/gdb/Makefile#4 integrate ... //depot/projects/sparc64/gnu/usr.bin/texinfo/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/texinfo/infokey/Makefile#1 branch ... //depot/projects/sparc64/gnu/usr.bin/texinfo/makeinfo/Makefile#2 integrate ... //depot/projects/sparc64/include/Makefile#3 integrate ... //depot/projects/sparc64/include/arpa/inet.h#2 integrate ... //depot/projects/sparc64/include/arpa/nameser.h#2 integrate ... //depot/projects/sparc64/include/assert.h#2 integrate ... //depot/projects/sparc64/include/complex.h#2 integrate ... //depot/projects/sparc64/include/ctype.h#2 integrate ... //depot/projects/sparc64/include/db.h#2 integrate ... //depot/projects/sparc64/include/dirent.h#2 integrate ... //depot/projects/sparc64/include/dlfcn.h#2 integrate ... //depot/projects/sparc64/include/err.h#2 integrate ... //depot/projects/sparc64/include/fnmatch.h#2 integrate ... //depot/projects/sparc64/include/fstab.h#2 integrate ... //depot/projects/sparc64/include/fts.h#2 integrate ... //depot/projects/sparc64/include/glob.h#2 integrate ... //depot/projects/sparc64/include/grp.h#3 integrate ... //depot/projects/sparc64/include/hesiod.h#2 integrate ... //depot/projects/sparc64/include/ieeefp.h#2 integrate ... //depot/projects/sparc64/include/ifaddrs.h#2 integrate ... //depot/projects/sparc64/include/langinfo.h#2 integrate ... //depot/projects/sparc64/include/libgen.h#2 integrate ... //depot/projects/sparc64/include/link.h#2 integrate ... //depot/projects/sparc64/include/locale.h#2 integrate ... //depot/projects/sparc64/include/math.h#2 integrate ... //depot/projects/sparc64/include/mpool.h#2 integrate ... //depot/projects/sparc64/include/ndbm.h#2 integrate ... //depot/projects/sparc64/include/netconfig.h#2 integrate ... //depot/projects/sparc64/include/netdb.h#2 integrate ... //depot/projects/sparc64/include/nl_types.h#2 integrate ... //depot/projects/sparc64/include/nlist.h#2 integrate ... //depot/projects/sparc64/include/nsswitch.h#2 integrate ... //depot/projects/sparc64/include/paths.h#2 integrate ... //depot/projects/sparc64/include/pthread.h#2 integrate ... //depot/projects/sparc64/include/pthread_np.h#2 integrate ... //depot/projects/sparc64/include/pwd.h#3 integrate ... //depot/projects/sparc64/include/regex.h#2 integrate ... //depot/projects/sparc64/include/regexp.h#2 integrate ... //depot/projects/sparc64/include/resolv.h#2 integrate ... //depot/projects/sparc64/include/rpc/auth.h#2 integrate ... //depot/projects/sparc64/include/rpc/auth_des.h#2 integrate ... //depot/projects/sparc64/include/rpc/auth_unix.h#2 integrate ... //depot/projects/sparc64/include/rpc/clnt.h#2 integrate ... //depot/projects/sparc64/include/rpc/clnt_soc.h#2 integrate ... //depot/projects/sparc64/include/rpc/des.h#2 integrate ... //depot/projects/sparc64/include/rpc/des_crypt.h#2 integrate ... //depot/projects/sparc64/include/rpc/nettype.h#2 integrate ... //depot/projects/sparc64/include/rpc/pmap_clnt.h#2 integrate ... //depot/projects/sparc64/include/rpc/pmap_prot.h#2 integrate ... //depot/projects/sparc64/include/rpc/pmap_rmt.h#2 integrate ... //depot/projects/sparc64/include/rpc/rpc.h#3 integrate ... //depot/projects/sparc64/include/rpc/rpc_com.h#2 integrate ... //depot/projects/sparc64/include/rpc/rpc_msg.h#2 integrate ... //depot/projects/sparc64/include/rpc/rpcb_clnt.h#2 integrate ... //depot/projects/sparc64/include/rpc/rpcent.h#2 integrate ... //depot/projects/sparc64/include/rpc/svc.h#2 integrate ... //depot/projects/sparc64/include/rpc/svc_auth.h#2 integrate ... //depot/projects/sparc64/include/rpc/svc_soc.h#2 integrate ... //depot/projects/sparc64/include/rpc/xdr.h#2 integrate ... //depot/projects/sparc64/include/rpcsvc/nis_db.h#2 integrate ... //depot/projects/sparc64/include/rpcsvc/nislib.h#2 integrate ... //depot/projects/sparc64/include/rpcsvc/ypclnt.h#2 integrate ... //depot/projects/sparc64/include/rpcsvc/yppasswd.x#2 integrate ... //depot/projects/sparc64/include/rune.h#2 integrate ... //depot/projects/sparc64/include/runetype.h#2 integrate ... //depot/projects/sparc64/include/search.h#2 integrate ... //depot/projects/sparc64/include/setjmp.h#2 integrate ... //depot/projects/sparc64/include/signal.h#2 integrate ... //depot/projects/sparc64/include/stdio.h#2 integrate ... //depot/projects/sparc64/include/stdlib.h#3 integrate ... //depot/projects/sparc64/include/string.h#2 integrate ... //depot/projects/sparc64/include/stringlist.h#2 integrate ... //depot/projects/sparc64/include/time.h#2 integrate ... //depot/projects/sparc64/include/ttyent.h#2 integrate ... //depot/projects/sparc64/include/unistd.h#2 integrate ... //depot/projects/sparc64/include/utime.h#2 integrate ... //depot/projects/sparc64/include/vis.h#2 integrate ... //depot/projects/sparc64/include/wchar.h#2 integrate ... //depot/projects/sparc64/include/wctype.h#2 integrate ... //depot/projects/sparc64/lib/csu/ia64/crt1.c#4 integrate ... //depot/projects/sparc64/lib/csu/powerpc/crt1.c#4 integrate ... //depot/projects/sparc64/lib/libc/Makefile#2 integrate ... //depot/projects/sparc64/lib/libc/db/btree/bt_split.c#3 integrate ... //depot/projects/sparc64/lib/libc/gen/sysconf.c#4 integrate ... //depot/projects/sparc64/lib/libc/gen/sysctl.3#5 integrate ... //depot/projects/sparc64/lib/libc/mips/:errfix#2 delete ... //depot/projects/sparc64/lib/libc/mips/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mips/SYS.h#3 delete ... //depot/projects/sparc64/lib/libc/mips/gen/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mips/gen/_setjmp.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/gen/fabs.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/gen/flt_rounds.c#3 delete ... //depot/projects/sparc64/lib/libc/mips/gen/fpgetmask.c#3 delete ... //depot/projects/sparc64/lib/libc/mips/gen/fpgetround.c#3 delete ... //depot/projects/sparc64/lib/libc/mips/gen/fpgetsticky.c#3 delete ... //depot/projects/sparc64/lib/libc/mips/gen/fpsetmask.c#3 delete ... //depot/projects/sparc64/lib/libc/mips/gen/fpsetround.c#3 delete ... //depot/projects/sparc64/lib/libc/mips/gen/fpsetsticky.c#2 delete ... //depot/projects/sparc64/lib/libc/mips/gen/frexp.c#2 delete ... //depot/projects/sparc64/lib/libc/mips/gen/infinity.c#2 delete ... //depot/projects/sparc64/lib/libc/mips/gen/isinf.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/gen/ldexp.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/gen/modf.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/gen/setjmp.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/gen/sigsetjmp.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/net/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mips/net/htonl.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/net/htons.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/stdlib/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mips/string/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mips/string/bcmp.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/string/bcopy.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/string/bzero.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/string/ffs.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/string/index.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/string/rindex.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/string/strcmp.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/string/strlen.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/Ovfork.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/brk.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/cerror.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/exect.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/fork.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/pipe.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/ptrace.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/sbrk.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/setlogin.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/sigpending.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/sigprocmask.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/sigreturn.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/sigsuspend.S#2 delete ... //depot/projects/sparc64/lib/libc/mips/sys/syscall.S#2 delete ... //depot/projects/sparc64/lib/libc/mipseb/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mipseb/SYS.h#3 delete ... //depot/projects/sparc64/lib/libc/mipseb/gen/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mipseb/net/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mipseb/stdlib/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mipseb/string/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mipseb/sys/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mipsel/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mipsel/SYS.h#2 delete ... //depot/projects/sparc64/lib/libc/mipsel/gen/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mipsel/net/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mipsel/stdlib/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mipsel/string/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libc/mipsel/sys/Makefile.inc#2 delete ... //depot/projects/sparc64/lib/libcrypt/crypt-md5.c#2 integrate ... //depot/projects/sparc64/lib/libdisk/blocks.c#2 integrate ... //depot/projects/sparc64/lib/libdisk/change.c#2 integrate ... //depot/projects/sparc64/lib/libdisk/chunk.c#2 integrate ... //depot/projects/sparc64/lib/libdisk/create_chunk.c#2 integrate ... //depot/projects/sparc64/lib/libdisk/disk.c#2 integrate ... //depot/projects/sparc64/lib/libdisk/disklabel.c#2 integrate ... //depot/projects/sparc64/lib/libdisk/libdisk.h#2 integrate ... //depot/projects/sparc64/lib/libdisk/rules.c#2 integrate ... //depot/projects/sparc64/lib/libdisk/tst01.c#2 integrate ... //depot/projects/sparc64/lib/libdisk/write_disk.c#2 integrate ... //depot/projects/sparc64/lib/libfetch/ftp.c#2 integrate ... //depot/projects/sparc64/lib/libftpio/ftpio.c#2 integrate ... //depot/projects/sparc64/lib/libftpio/ftpio.h#2 integrate ... //depot/projects/sparc64/lib/libmd/mdX.3#2 integrate ... //depot/projects/sparc64/lib/libmd/mdXhl.c#2 integrate ... //depot/projects/sparc64/lib/libmd/ripemd.3#2 integrate ... //depot/projects/sparc64/lib/libmd/sha.3#2 integrate ... //depot/projects/sparc64/lib/msun/Makefile#4 integrate ... //depot/projects/sparc64/lib/msun/bsdsrc/b_exp.c#2 integrate ... //depot/projects/sparc64/lib/msun/bsdsrc/b_log.c#2 integrate ... //depot/projects/sparc64/lib/msun/bsdsrc/b_tgamma.c#2 integrate ... //depot/projects/sparc64/lib/msun/man/lgamma.3#3 integrate ... //depot/projects/sparc64/lib/msun/src/math.h#4 integrate ... //depot/projects/sparc64/release/Makefile#3 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/readme/article.sgml#3 integrate ... //depot/projects/sparc64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#4 integrate ... //depot/projects/sparc64/release/picobsd/build/write_mfs_in_kernel.c#2 integrate ... //depot/projects/sparc64/release/picobsd/mfs_tree/etc/protocols#2 integrate ... //depot/projects/sparc64/release/write_mfs_in_kernel.c#2 delete ... //depot/projects/sparc64/sbin/fsck/fsck.c#3 integrate ... //depot/projects/sparc64/sbin/fsck/fsutil.c#3 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/main.c#3 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/main.c#3 integrate ... //depot/projects/sparc64/sbin/ipfs/Makefile#2 integrate ... //depot/projects/sparc64/sbin/nfsd/nfsd.c#2 integrate ... //depot/projects/sparc64/sbin/ping/ping.c#3 integrate ... //depot/projects/sparc64/sbin/reboot/boot_i386.8#2 integrate ... //depot/projects/sparc64/secure/lib/libcrypto/Makefile#3 integrate ... //depot/projects/sparc64/secure/lib/libcrypto/Makefile.inc#3 integrate ... //depot/projects/sparc64/secure/lib/libssl/Makefile#2 integrate ... //depot/projects/sparc64/secure/usr.sbin/sshd/Makefile#4 integrate ... //depot/projects/sparc64/share/dict/Makefile#2 integrate ... //depot/projects/sparc64/share/dict/README#2 integrate ... //depot/projects/sparc64/share/dict/tech#1 branch ... //depot/projects/sparc64/share/doc/papers/malloc/abs.ms#2 integrate ... //depot/projects/sparc64/share/doc/papers/malloc/alternatives.ms#2 integrate ... //depot/projects/sparc64/share/doc/papers/malloc/conclusion.ms#2 integrate ... //depot/projects/sparc64/share/doc/papers/malloc/implementation.ms#2 integrate ... //depot/projects/sparc64/share/doc/papers/malloc/intro.ms#2 integrate ... //depot/projects/sparc64/share/doc/papers/malloc/kernel.ms#2 integrate ... //depot/projects/sparc64/share/doc/papers/malloc/malloc.ms#2 integrate ... //depot/projects/sparc64/share/doc/papers/malloc/performance.ms#2 integrate ... //depot/projects/sparc64/share/doc/papers/malloc/problems.ms#2 integrate ... //depot/projects/sparc64/share/examples/isdn/README#2 integrate ... //depot/projects/sparc64/share/examples/isdn/ReleaseNotes#2 integrate ... //depot/projects/sparc64/share/examples/isdn/Resources#2 integrate ... //depot/projects/sparc64/share/examples/isdn/ThankYou#2 integrate ... //depot/projects/sparc64/share/man/man4/joy.4#2 integrate ... //depot/projects/sparc64/share/man/man4/man4.i386/Makefile#2 integrate ... //depot/projects/sparc64/share/man/man4/man4.i386/alpm.4#2 integrate ... //depot/projects/sparc64/share/man/man4/man4.i386/viapm.4#1 branch ... //depot/projects/sparc64/share/man/man5/drivers.conf.5#1 branch ... //depot/projects/sparc64/share/man/man7/ffs.7#2 integrate ... //depot/projects/sparc64/share/man/man7/release.7#4 integrate ... //depot/projects/sparc64/share/man/man9/lock.9#2 integrate ... //depot/projects/sparc64/share/man/man9/style.9#3 integrate ... //depot/projects/sparc64/sys/alpha/alpha/dec_kn300.c#4 integrate ... //depot/projects/sparc64/sys/alpha/conf/GENERIC#13 integrate ... //depot/projects/sparc64/sys/alpha/include/ansi.h#10 integrate ... //depot/projects/sparc64/sys/alpha/mcbus/mcbus.c#2 integrate ... //depot/projects/sparc64/sys/alpha/mcbus/mcbusvar.h#2 integrate ... //depot/projects/sparc64/sys/alpha/mcbus/mcpcia.c#7 integrate ... //depot/projects/sparc64/sys/alpha/mcbus/mcpciavar.h#2 integrate ... //depot/projects/sparc64/sys/arm/include/ansi.h#7 integrate ... //depot/projects/sparc64/sys/boot/i386/boot2/boot2.c#6 integrate ... //depot/projects/sparc64/sys/cam/cam_xpt.c#7 integrate ... //depot/projects/sparc64/sys/cam/scsi/scsi_da.c#22 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_mib.h#4 integrate ... //depot/projects/sparc64/sys/conf/Makefile.ia64#17 integrate ... //depot/projects/sparc64/sys/conf/Makefile.powerpc#15 integrate ... //depot/projects/sparc64/sys/conf/Makefile.sparc64#34 integrate ... //depot/projects/sparc64/sys/conf/files.i386#22 integrate ... //depot/projects/sparc64/sys/conf/files.pc98#18 integrate ... //depot/projects/sparc64/sys/conf/files.sparc64#32 integrate ... //depot/projects/sparc64/sys/conf/kern.pre.mk#10 integrate ... //depot/projects/sparc64/sys/conf/kmod_syms.awk#2 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate ... //depot/projects/sparc64/sys/dev/acpica/acpi_timer.c#8 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-all.c#21 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-dma.c#25 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-pci.c#25 integrate ... //depot/projects/sparc64/sys/dev/ata/atapi-all.c#15 integrate ... //depot/projects/sparc64/sys/dev/ata/atapi-cd.c#17 integrate ... //depot/projects/sparc64/sys/dev/ata/atapi-fd.c#6 integrate ... //depot/projects/sparc64/sys/dev/ata/atapi-tape.c#10 integrate ... //depot/projects/sparc64/sys/dev/bktr/bktr_i2c.c#3 integrate ... //depot/projects/sparc64/sys/dev/bktr/bktr_os.c#7 integrate ... //depot/projects/sparc64/sys/dev/bktr/bktr_reg.h#3 integrate ... //depot/projects/sparc64/sys/dev/digi/digi.c#10 integrate ... //depot/projects/sparc64/sys/dev/sio/sio.c#15 integrate ... //depot/projects/sparc64/sys/dev/sound/midi/midi.h#5 integrate ... //depot/projects/sparc64/sys/dev/syscons/rain/rain_saver.c#4 integrate ... //depot/projects/sparc64/sys/geom/geom.h#4 integrate ... //depot/projects/sparc64/sys/geom/geom_bsd.c#4 integrate ... //depot/projects/sparc64/sys/geom/geom_dev.c#4 integrate ... //depot/projects/sparc64/sys/geom/geom_disk.c#3 integrate ... //depot/projects/sparc64/sys/geom/geom_dump.c#2 integrate ... //depot/projects/sparc64/sys/geom/geom_enc.c#2 integrate ... //depot/projects/sparc64/sys/geom/geom_event.c#2 integrate ... //depot/projects/sparc64/sys/geom/geom_int.h#1 branch ... //depot/projects/sparc64/sys/geom/geom_io.c#2 integrate ... //depot/projects/sparc64/sys/geom/geom_kern.c#2 integrate ... //depot/projects/sparc64/sys/geom/geom_mbr.c#3 integrate ... //depot/projects/sparc64/sys/geom/geom_slice.c#4 integrate ... //depot/projects/sparc64/sys/geom/geom_slice.h#2 integrate ... //depot/projects/sparc64/sys/geom/geom_subr.c#2 integrate ... //depot/projects/sparc64/sys/geom/geom_sunlabel.c#3 integrate ... //depot/projects/sparc64/sys/i386/conf/NOTES#36 integrate ... //depot/projects/sparc64/sys/i386/include/ansi.h#10 integrate ... //depot/projects/sparc64/sys/i386/include/i4b_ioctl.h#7 integrate ... //depot/projects/sparc64/sys/i386/isa/pcf.c#3 integrate ... //depot/projects/sparc64/sys/i386/isa/spic.c#3 integrate ... //depot/projects/sparc64/sys/i386/isa/spicreg.h#2 integrate ... //depot/projects/sparc64/sys/i386/linux/linux_sysvec.c#13 integrate ... //depot/projects/sparc64/sys/i4b/include/i4b_l3l4.h#4 integrate ... //depot/projects/sparc64/sys/i4b/layer3/i4b_l2if.c#3 integrate ... //depot/projects/sparc64/sys/i4b/layer3/i4b_q931.c#5 integrate ... //depot/projects/sparc64/sys/i4b/layer3/i4b_q931.h#3 integrate ... //depot/projects/sparc64/sys/i4b/layer4/i4b_i4bdrv.c#6 integrate ... //depot/projects/sparc64/sys/i4b/layer4/i4b_l4.c#4 integrate ... //depot/projects/sparc64/sys/ia64/include/ansi.h#9 integrate ... //depot/projects/sparc64/sys/ia64/include/asm.h#4 integrate ... //depot/projects/sparc64/sys/isa/fd.c#8 integrate ... //depot/projects/sparc64/sys/kern/imgact_gzip.c#4 integrate ... //depot/projects/sparc64/sys/kern/inflate.c#3 integrate ... //depot/projects/sparc64/sys/kern/kern_exec.c#19 integrate ... //depot/projects/sparc64/sys/kern/kern_linker.c#15 integrate ... //depot/projects/sparc64/sys/kern/vfs_aio.c#15 integrate ... //depot/projects/sparc64/sys/kern/vfs_init.c#4 integrate ... //depot/projects/sparc64/sys/kern/vfs_subr.c#21 integrate ... //depot/projects/sparc64/sys/kern/vfs_syscalls.c#23 integrate ... //depot/projects/sparc64/sys/kern/vfs_vnops.c#18 integrate ... //depot/projects/sparc64/sys/modules/bktr/bktr/Makefile#3 integrate ... //depot/projects/sparc64/sys/net/bsd_comp.c#3 integrate ... //depot/projects/sparc64/sys/net/if_ethersubr.c#13 integrate ... //depot/projects/sparc64/sys/net/if_fddisubr.c#5 integrate ... //depot/projects/sparc64/sys/net/if_gif.h#5 integrate ... //depot/projects/sparc64/sys/net/if_pppvar.h#5 integrate ... //depot/projects/sparc64/sys/net/if_tap.c#8 integrate ... //depot/projects/sparc64/sys/net/pfil.h#4 integrate ... //depot/projects/sparc64/sys/net/ppp_comp.h#3 integrate ... //depot/projects/sparc64/sys/net/ppp_deflate.c#3 integrate ... //depot/projects/sparc64/sys/net/radix.c#3 integrate ... //depot/projects/sparc64/sys/net/route.h#7 integrate ... //depot/projects/sparc64/sys/netinet/if_ether.h#4 integrate ... //depot/projects/sparc64/sys/netinet/in_pcb.h#9 integrate ... //depot/projects/sparc64/sys/netinet/in_var.h#5 integrate ... //depot/projects/sparc64/sys/netinet/ip_mroute.c#10 integrate ... //depot/projects/sparc64/sys/netinet/tcp_input.c#14 integrate ... //depot/projects/sparc64/sys/netinet/tcp_usrreq.c#8 integrate ... //depot/projects/sparc64/sys/netinet/udp_usrreq.c#14 integrate ... //depot/projects/sparc64/sys/netinet6/ah_input.c#4 integrate ... //depot/projects/sparc64/sys/netinet6/esp_input.c#4 integrate ... //depot/projects/sparc64/sys/netinet6/scope6.c#2 integrate ... //depot/projects/sparc64/sys/pc98/conf/GENERIC#13 integrate ... //depot/projects/sparc64/sys/pc98/pc98/fd.c#6 integrate ... //depot/projects/sparc64/sys/pc98/pc98/mse.c#5 integrate ... //depot/projects/sparc64/sys/pc98/pc98/sio.c#11 integrate ... //depot/projects/sparc64/sys/pc98/pc98/syscons.c#8 integrate ... //depot/projects/sparc64/sys/pci/amdpm.c#4 integrate ... //depot/projects/sparc64/sys/powerpc/include/ansi.h#10 integrate ... //depot/projects/sparc64/sys/sparc64/conf/GENERIC#17 integrate ... //depot/projects/sparc64/sys/sparc64/ebus/ebus.c#10 integrate ... //depot/projects/sparc64/sys/sparc64/ebus/ebusvar.h#5 integrate ... //depot/projects/sparc64/sys/sparc64/include/ansi.h#11 integrate ... //depot/projects/sparc64/sys/sparc64/include/bus.h#12 integrate ... //depot/projects/sparc64/sys/sparc64/include/clock.h#7 integrate ... //depot/projects/sparc64/sys/sparc64/include/iommuvar.h#13 integrate ... //depot/projects/sparc64/sys/sparc64/include/ofw_bus.h#6 integrate ... //depot/projects/sparc64/sys/sparc64/isa/isa.c#10 integrate ... //depot/projects/sparc64/sys/sparc64/isa/ofw_isa.c#8 integrate ... //depot/projects/sparc64/sys/sparc64/pci/apb.c#9 integrate ... //depot/projects/sparc64/sys/sparc64/pci/ofw_pci.c#8 integrate ... //depot/projects/sparc64/sys/sparc64/pci/ofw_pci.h#5 integrate ... //depot/projects/sparc64/sys/sparc64/pci/psycho.c#27 integrate ... //depot/projects/sparc64/sys/sparc64/pci/psychoreg.h#9 integrate ... //depot/projects/sparc64/sys/sparc64/pci/psychovar.h#10 integrate ... //depot/projects/sparc64/sys/sparc64/sbus/sbus.c#6 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/bus_machdep.c#16 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/cache.c#17 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/db_disasm.c#10 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/db_trace.c#26 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/identcpu.c#17 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/iommu.c#20 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/ofw_bus.c#6 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/pv.c#29 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/trap.c#68 integrate ... //depot/projects/sparc64/sys/sys/bio.h#7 integrate ... //depot/projects/sparc64/sys/sys/disklabel.h#14 integrate ... //depot/projects/sparc64/sys/sys/file.h#11 integrate ... //depot/projects/sparc64/sys/sys/inflate.h#3 integrate ... //depot/projects/sparc64/sys/sys/mount.h#9 integrate ... //depot/projects/sparc64/sys/sys/socketvar.h#15 integrate ... //depot/projects/sparc64/sys/vm/uma_core.c#3 integrate ... //depot/projects/sparc64/sys/vm/vm_extern.h#8 integrate ... //depot/projects/sparc64/tools/diag/localeck/Makefile#2 integrate ... //depot/projects/sparc64/tools/diag/localeck/localeck.c#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Data/disk.beast.da0.xml#1 branch ... //depot/projects/sparc64/tools/regression/geom/GLib/Makefile#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/Makefile#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T000/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T001/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T002/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T003/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T004/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T005/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T006/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T007/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T008/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T009/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T010/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T010/testprg.c#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T011/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T011/testprg.c#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T012/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T013/Makefile#1 branch ... //depot/projects/sparc64/tools/regression/geom/Test/T013/ref.conf#1 branch ... //depot/projects/sparc64/tools/regression/geom/Test/T013/testprg.c#1 branch ... //depot/projects/sparc64/tools/regression/geom/geom.c#2 integrate ... //depot/projects/sparc64/tools/regression/geom/geom_kernsim.c#2 integrate ... //depot/projects/sparc64/tools/regression/geom/geom_sim.h#2 integrate ... //depot/projects/sparc64/tools/regression/geom/geom_simdev.c#2 integrate ... //depot/projects/sparc64/tools/regression/geom/geom_simdisk.c#2 integrate ... //depot/projects/sparc64/tools/regression/geom/geom_simdisk.h#2 integrate ... //depot/projects/sparc64/tools/regression/geom/geom_simdisk_xml.c#2 integrate ... //depot/projects/sparc64/tools/tools/kernxref/kernxref.sh#2 integrate ... //depot/projects/sparc64/usr.bin/Makefile#13 integrate ... //depot/projects/sparc64/usr.bin/apply/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/calendar/calendars/calendar.freebsd#3 integrate ... //depot/projects/sparc64/usr.bin/chpass/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/chpass/chpass.c#4 integrate ... //depot/projects/sparc64/usr.bin/chpass/chpass.h#3 integrate ... //depot/projects/sparc64/usr.bin/chpass/edit.c#2 integrate ... //depot/projects/sparc64/usr.bin/chpass/field.c#2 integrate ... //depot/projects/sparc64/usr.bin/chpass/pw_copy.c#3 integrate ... //depot/projects/sparc64/usr.bin/chpass/pw_copy.h#4 integrate ... //depot/projects/sparc64/usr.bin/chpass/pw_yp.c#2 integrate ... //depot/projects/sparc64/usr.bin/chpass/table.c#2 integrate ... //depot/projects/sparc64/usr.bin/chpass/util.c#3 integrate ... //depot/projects/sparc64/usr.bin/compress/compress.c#3 integrate ... //depot/projects/sparc64/usr.bin/fetch/fetch.c#2 integrate ... //depot/projects/sparc64/usr.bin/file2c/file2c.c#2 integrate ... //depot/projects/sparc64/usr.bin/find/function.c#4 integrate ... //depot/projects/sparc64/usr.bin/find/operator.c#3 integrate ... //depot/projects/sparc64/usr.bin/from/from.1#2 integrate ... //depot/projects/sparc64/usr.bin/gcore/elfcore.c#2 integrate ... //depot/projects/sparc64/usr.bin/gencat/gencat.c#2 integrate ... //depot/projects/sparc64/usr.bin/gencat/gencat.h#2 integrate ... //depot/projects/sparc64/usr.bin/gencat/genlib.c#2 integrate ... //depot/projects/sparc64/usr.bin/gprof/gprof.c#2 integrate ... //depot/projects/sparc64/usr.bin/join/join.1#2 integrate ... //depot/projects/sparc64/usr.bin/join/join.c#3 integrate ... //depot/projects/sparc64/usr.bin/kdump/mkioctls#2 integrate ... //depot/projects/sparc64/usr.bin/make/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/make/lst.h#3 integrate ... //depot/projects/sparc64/usr.bin/make/main.c#3 integrate ... //depot/projects/sparc64/usr.bin/make/parse.c#3 integrate ... //depot/projects/sparc64/usr.bin/make/targ.c#3 integrate ... //depot/projects/sparc64/usr.bin/make/util.c#2 delete ... //depot/projects/sparc64/usr.bin/rlogin/rlogin.c#3 integrate ... //depot/projects/sparc64/usr.bin/rsh/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/rsh/rsh.c#3 integrate ... //depot/projects/sparc64/usr.bin/sort/append.c#2 integrate ... //depot/projects/sparc64/usr.bin/sort/extern.h#2 integrate ... //depot/projects/sparc64/usr.bin/sort/fields.c#2 integrate ... //depot/projects/sparc64/usr.bin/sort/files.c#2 integrate ... //depot/projects/sparc64/usr.bin/sort/fsort.c#2 integrate ... //depot/projects/sparc64/usr.bin/sort/init.c#2 integrate ... //depot/projects/sparc64/usr.bin/sort/msort.c#2 integrate ... //depot/projects/sparc64/usr.bin/sort/sort.1#2 integrate ... //depot/projects/sparc64/usr.bin/sort/sort.c#2 integrate ... //depot/projects/sparc64/usr.bin/sort/tmp.c#2 integrate ... //depot/projects/sparc64/usr.bin/systat/main.c#2 integrate ... //depot/projects/sparc64/usr.bin/tcopy/tcopy.c#3 integrate ... //depot/projects/sparc64/usr.sbin/cron/cron/cron.8#2 integrate ... //depot/projects/sparc64/usr.sbin/cron/crontab/crontab.5#2 integrate ... //depot/projects/sparc64/usr.sbin/ctm/README#2 integrate ... //depot/projects/sparc64/usr.sbin/ctm/ctm/Makefile#2 integrate ... //depot/projects/sparc64/usr.sbin/ctm/ctm/ctm.1#2 integrate ... //depot/projects/sparc64/usr.sbin/ctm/ctm/ctm.5#2 integrate ... //depot/projects/sparc64/usr.sbin/ctm/ctm/ctm.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ctm/ctm/ctm.h#2 integrate ... //depot/projects/sparc64/usr.sbin/ctm/ctm/ctm_ed.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ctm/ctm/ctm_input.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ctm/ctm/ctm_pass1.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ctm/ctm/ctm_pass2.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ctm/ctm/ctm_pass3.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ctm/ctm/ctm_syntax.c#2 integrate ... //depot/projects/sparc64/usr.sbin/fdwrite/Makefile#2 integrate ... //depot/projects/sparc64/usr.sbin/fdwrite/fdwrite.1#2 integrate ... //depot/projects/sparc64/usr.sbin/fdwrite/fdwrite.c#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnd/curses.c#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnd/dial.c#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnd/exec.c#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnd/fsm.c#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnd/isdnd.h#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnd/isdnd.rc.5#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnd/monitor.c#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnd/msghdl.c#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnd/rc_config.c#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnd/rc_parse.y#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnd/rc_scan.l#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnd/support.c#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnd/timer.c#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdndecode/layer3.c#2 integrate ... //depot/projects/sparc64/usr.sbin/i4b/isdnphone/main.c#2 integrate ... //depot/projects/sparc64/usr.sbin/moused/moused.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pccard/pccardd/pccard.conf.5#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/ppp.8.m4#2 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/dev2c.sh#2 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/wizard.c#2 integrate ... //depot/projects/sparc64/usr.sbin/syslogd/syslogd.c#2 integrate Differences ... ==== //depot/projects/sparc64/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.245 2002/03/20 18:25:48 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.246 2002/03/26 16:05:09 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -281,7 +281,7 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 4: populating ${WORLDTMP}/usr/include" @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${WMAKE} SHARED=copies includes + cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: building libraries" ==== //depot/projects/sparc64/README#2 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: src/README,v 1.19 2000/08/31 17:59:01 markm Exp $ +$FreeBSD: src/README,v 1.20 2002/03/26 12:35:49 ru Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -19,13 +19,13 @@ Building a kernel is a somewhat more involved process, documentation for which can be found at: - http://www.freebsd.org/handbook/kernelconfig.html + http://www.FreeBSD.org/handbook/kernelconfig.html And in the config(8) man page. Note: If you want to build and install the kernel with the -``buildkernel'' and ``installkernel'' targets, you have to build +``buildkernel'' and ``installkernel'' targets, you might need to build world before. More information is available in the handbook. -The sample kernel configuration files reside in the sys/i386/conf +The sample kernel configuration files reside in the sys//conf sub-directory (assuming that you've installed the kernel sources), the file named GENERIC being the one used to build your initial installation kernel. The file NOTES contains entries and documentation for all possible @@ -36,13 +36,13 @@ Source Roadmap: --------------- -bin System/User commands. +bin System/user commands. contrib Packages contributed by 3rd parties. crypto Cryptography stuff (see crypto/README). -etc Template files for /etc +etc Template files for /etc. games Amusements. @@ -51,7 +51,9 @@ include System include files. -kerberosIV Kerberos package. +kerberos5 Kerberos5 (Heimdal) package. + +kerberosIV KerberosIV (eBones) package. lib System libraries. @@ -77,4 +79,4 @@ For information on synchronizing your source tree with one or more of the FreeBSD Project's development branches, please see: - http://www.freebsd.org/handbook/synching.html + http://www.FreeBSD.org/handbook/synching.html ==== //depot/projects/sparc64/bin/chio/chio.c#2 (text+ko) ==== @@ -38,10 +38,11 @@ #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1996 Jason R. Thorpe. All rights reserved."; -static const char rcsid[] = - "$FreeBSD: src/bin/chio/chio.c,v 1.22 2002/03/05 05:28:49 imp Exp $"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.23 2002/03/24 14:56:55 markm Exp $"); + #include #include #include @@ -55,8 +56,6 @@ #include "defs.h" #include "pathnames.h" -extern char *__progname; /* from crt0.o */ - static void usage(void); static void cleanup(void); static u_int16_t parse_element_type(char *); @@ -248,7 +247,7 @@ usage: (void) fprintf(stderr, "usage: %s %s " - " [inv]\n", __progname, cname); + " [inv]\n", getprogname(), cname); return (1); } @@ -357,7 +356,7 @@ (void) fprintf(stderr, "usage: %s %s \n" " [ ] [inv1] [inv2]\n", - __progname, cname); + getprogname(), cname); return (1); } @@ -417,7 +416,7 @@ usage: (void) fprintf(stderr, "usage: %s %s [inv]\n", - __progname, cname); + getprogname(), cname); return (1); } @@ -460,7 +459,7 @@ return (0); usage: - (void) fprintf(stderr, "usage: %s %s\n", __progname, cname); + (void) fprintf(stderr, "usage: %s %s\n", getprogname(), cname); return (1); } @@ -488,7 +487,7 @@ return (0); usage: - (void) fprintf(stderr, "usage: %s %s\n", __progname, cname); + (void) fprintf(stderr, "usage: %s %s\n", getprogname(), cname); return (1); } @@ -516,7 +515,7 @@ return (0); usage: - (void) fprintf(stderr, "usage: %s %s \n", __progname, cname); + (void) fprintf(stderr, "usage: %s %s \n", getprogname(), cname); return (1); } @@ -733,7 +732,7 @@ usage: (void) fprintf(stderr, "usage: %s %s [-vVsSbaA] [ [ [] ] ]\n", - __progname, cname); + getprogname(), cname); return (1); } @@ -756,7 +755,7 @@ usage: (void) fprintf(stderr, "usage: %s %s []\n", - __progname, cname); + getprogname(), cname); return (1); } @@ -841,7 +840,7 @@ usage: (void) fprintf(stderr, "usage: %s %s [-fca] [ [] ]\n", - __progname, cname); + getprogname(), cname); return 1; } @@ -991,7 +990,7 @@ usage: (void) fprintf(stderr, "usage: %s %s " - " \n", __progname, cname); + " \n", getprogname(), cname); return(1); } @@ -1170,6 +1169,6 @@ usage(void) { (void)fprintf(stderr, "usage: %s [-f changer] command [-] " - "arg1 arg2 [arg3 [...]]\n", __progname); + "arg1 arg2 [arg3 [...]]\n", getprogname()); exit(1); } ==== //depot/projects/sparc64/bin/df/df.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)df.c 8.9 (Berkeley) 5/8/95"; #else static const char rcsid[] = - "$FreeBSD: src/bin/df/df.c,v 1.36 2002/02/22 20:57:53 markm Exp $"; + "$FreeBSD: src/bin/df/df.c,v 1.37 2002/03/26 20:32:37 iedowse Exp $"; #endif #endif /* not lint */ @@ -91,6 +91,16 @@ #define TERA_SI_SZ (TERA_SZ(1000ULL)) #define PETA_SI_SZ (PETA_SZ(1000ULL)) +/* Maximum widths of various fields. */ +struct maxwidths { + int mntfrom; + int total; + int used; + int avail; + int iused; + int ifree; +}; + unsigned long long vals_si [] = {1, KILO_SI_SZ, MEGA_SI_SZ, GIGA_SI_SZ, TERA_SI_SZ, PETA_SI_SZ}; unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ}; unsigned long long *valp; @@ -102,28 +112,36 @@ int bread(off_t, void *, int); int checkvfsname(const char *, char **); char *getmntpt(char *); +int longwidth(long); char *makenetvfslist(void); char **makevfslist(char *); void prthuman(struct statfs *, long); void prthumanval(double); -void prtstat(struct statfs *, int); +void prtstat(struct statfs *, struct maxwidths *); long regetmntinfo(struct statfs **, long, char **); -int ufs_df(char *, int); +int ufs_df(char *, struct maxwidths *); unit_t unit_adjust(double *); +void update_maxwidths(struct maxwidths *, struct statfs *); void usage(void); int aflag = 0, hflag, iflag, nflag; struct ufs_args mdev; +static __inline int imax(int a, int b) +{ + return (a > b ? a : b); +} + int main(int argc, char *argv[]) { struct stat stbuf; struct statfs statfsbuf, *mntbuf; + struct maxwidths maxwidths; const char *fstype; char *mntpath, *mntpt, **vfslist; long mntsize; - int ch, i, maxwidth, rv, width; + int ch, i, rv; fstype = "ufs"; @@ -184,27 +202,21 @@ argv += optind; mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); - maxwidth = 0; - for (i = 0; i < mntsize; i++) { - width = strlen(mntbuf[i].f_mntfromname); - if (width > maxwidth) - maxwidth = width; - } + bzero(&maxwidths, sizeof(maxwidths)); + for (i = 0; i < mntsize; i++) + update_maxwidths(&maxwidths, &mntbuf[i]); rv = 0; if (!*argv) { mntsize = regetmntinfo(&mntbuf, mntsize, vfslist); if (vfslist != NULL) { - maxwidth = 0; - for (i = 0; i < mntsize; i++) { - width = strlen(mntbuf[i].f_mntfromname); - if (width > maxwidth) - maxwidth = width; - } + bzero(&maxwidths, sizeof(maxwidths)); + for (i = 0; i < mntsize; i++) + update_maxwidths(&maxwidths, &mntbuf[i]); } for (i = 0; i < mntsize; i++) { if (aflag || (mntbuf[i].f_flags & MNT_IGNORE) == 0) - prtstat(&mntbuf[i], maxwidth); + prtstat(&mntbuf[i], &maxwidths); } exit(rv); } @@ -234,13 +246,13 @@ } if (mount(fstype, mntpt, MNT_RDONLY, &mdev) != 0) { - rv = ufs_df(*argv, maxwidth) || rv; + rv = ufs_df(*argv, &maxwidths) || rv; (void)rmdir(mntpt); free(mntpath); continue; } else if (statfs(mntpt, &statfsbuf) == 0) { statfsbuf.f_mntonname[0] = '\0'; - prtstat(&statfsbuf, maxwidth); + prtstat(&statfsbuf, &maxwidths); } else { warn("%s", *argv); rv = 1; @@ -261,9 +273,11 @@ rv = 1; continue; } - if (argc == 1) - maxwidth = strlen(statfsbuf.f_mntfromname) + 1; - prtstat(&statfsbuf, maxwidth); + if (argc == 1) { + bzero(&maxwidths, sizeof(maxwidths)); + update_maxwidths(&maxwidths, &statfsbuf); + } + prtstat(&statfsbuf, &maxwidths); } return (rv); } @@ -372,54 +386,107 @@ * Print out status about a filesystem. */ void -prtstat(struct statfs *sfsp, int maxwidth) +prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; static int headerlen, timesthrough; static const char *header; long used, availblks, inodes; - if (maxwidth < 11) - maxwidth = 11; if (++timesthrough == 1) { + mwp->mntfrom = imax(mwp->mntfrom, strlen("Filesystem")); if (hflag) { header = " Size"; - headerlen = strlen(header); - (void)printf("%-*.*s %-s Used Avail Capacity", - maxwidth, maxwidth, "Filesystem", header); + mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - (void)printf("%-*.*s %-s Used Avail Capacity", - maxwidth, maxwidth, "Filesystem", header); + mwp->total = imax(mwp->total, headerlen); + } + mwp->used = imax(mwp->used, strlen("Used")); + mwp->avail = imax(mwp->avail, strlen("Avail")); + + (void)printf("%-*s %-*s %*s %*s Capacity", mwp->mntfrom, + "Filesystem", mwp->total, header, mwp->used, "Used", + mwp->avail, "Avail"); + if (iflag) { + mwp->iused = imax(mwp->iused, strlen(" iused")); + mwp->ifree = imax(mwp->ifree, strlen("ifree")); + (void)printf(" %*s %*s %%iused", mwp->iused - 2, + "iused", mwp->ifree, "ifree"); } - if (iflag) - (void)printf(" iused ifree %%iused"); (void)printf(" Mounted on\n"); } - (void)printf("%-*.*s", maxwidth, maxwidth, sfsp->f_mntfromname); + (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); used = sfsp->f_blocks - sfsp->f_bfree; availblks = sfsp->f_bavail + used; if (hflag) { prthuman(sfsp, used); } else { - (void)printf(" %*ld %8ld %8ld", headerlen, + (void)printf(" %*ld %*ld %*ld", mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), - fsbtoblk(used, sfsp->f_bsize, blocksize), - fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); + mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), + mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, + blocksize)); } (void)printf(" %5.0f%%", availblks == 0 ? 100.0 : (double)used / (double)availblks * 100.0); if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; - (void)printf(" %7ld %7ld %5.0f%% ", used, sfsp->f_ffree, - inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0); + (void)printf(" %*ld %*ld %4.0f%% ", mwp->iused, used, + mwp->ifree, sfsp->f_ffree, inodes == 0 ? 100.0 : + (double)used / (double)inodes * 100.0); } else (void)printf(" "); (void)printf(" %s\n", sfsp->f_mntonname); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 26 17:13: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6348D37B404; Tue, 26 Mar 2002 17:12:47 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id D9DE937B400; Tue, 26 Mar 2002 17:12:43 -0800 (PST) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.11.6/8.11.6) with SMTP id g2R1Cdw22942; Tue, 26 Mar 2002 20:12:40 -0500 (EST) (envelope-from robert@fledge.watson.org) Date: Tue, 26 Mar 2002 20:12:39 -0500 (EST) From: Robert Watson X-Sender: robert@fledge.watson.org To: Chris Vance Cc: Perforce Change Reviews Subject: Re: PERFORCE change 8447 for review In-Reply-To: <200203261844.g2QIigs36322@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Great! I'll have to update my MAC tree and prepare for a whole new brand of suffering. Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services On Tue, 26 Mar 2002, Chris Vance wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8447 > > Change 8447 by cvance@cvance_laptop on 2002/03/26 10:44:13 > > Initial import of SEBSD sources. The security server will boot and > initialize properly - assuming you have a valid policy located at > /ss_policy, otherwise it will cause a panic at boot time. > > Affected files ... > > ... //depot/projects/trustedbsd/mac/sys/conf/files#22 edit > ... //depot/projects/trustedbsd/mac/sys/conf/options#13 edit > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/av_inherit.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/av_perm_to_string.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/av_permissions.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc-selinux.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc_ss.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/class_to_string.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/common_perm_to_string.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/flask.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/flask_types.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/linux-compat.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/avtab.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/avtab.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/constraint.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/context.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/ebitmap.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/ebitmap.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/fileutils.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/fileutils.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/hashtab.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/hashtab.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/init.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/initial_sid_to_string.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/mls.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/mls.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/mls_types.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/policydb.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/policydb.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/queue.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/queue.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/security.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services_private.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/symtab.c#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/symtab.h#1 add > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/syscalls.c#1 add > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/conf/files#22 (text+ko) ==== > > @@ -1270,6 +1270,20 @@ > security/mac_mls/mac_mls.c optional mac_mls > security/mac_none/mac_none.c optional mac_none > security/mac_te/mac_te.c optional mac_te > + > +security/sebsd/sebsd.c optional sebsd > +security/sebsd/avc/avc.c optional sebsd > +security/sebsd/ss/avtab.c optional sebsd > +security/sebsd/ss/ebitmap.c optional sebsd > +security/sebsd/ss/hashtab.c optional sebsd > +security/sebsd/ss/init.c optional sebsd > +security/sebsd/ss/policydb.c optional sebsd > +security/sebsd/ss/queue.c optional sebsd > +security/sebsd/ss/services.c optional sebsd > +security/sebsd/ss/sidtab.c optional sebsd > +security/sebsd/ss/symtab.c optional sebsd > +security/sebsd/ss/fileutils.c optional sebsd > + > ufs/ffs/ffs_alloc.c optional ffs > ufs/ffs/ffs_alloc.c optional ifs > ufs/ffs/ffs_balloc.c optional ffs > > ==== //depot/projects/trustedbsd/mac/sys/conf/options#13 (text+ko) ==== > > @@ -112,6 +112,7 @@ > MAC_MLS opt_mac.h > MAC_NONE opt_mac.h > MAC_TE opt_mac.h > +SEBSD opt_mac.h > > # Do we want the config file compiled into the kernel? > INCLUDE_CONFIG_FILE opt_config.h > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Mar 26 21:29: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9D1137B405; Tue, 26 Mar 2002 21:27:34 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2B72237B41C for ; Tue, 26 Mar 2002 21:27:32 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2R5RNB89063 for perforce@freebsd.org; Tue, 26 Mar 2002 21:27:23 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 26 Mar 2002 21:27:23 -0800 (PST) Message-Id: <200203270527.g2R5RNB89063@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8477 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8477 Change 8477 by peter@peter_daintree on 2002/03/26 21:26:48 IFC @8476 Affected files ... ... //depot/projects/ia64/Makefile.inc1#13 integrate ... //depot/projects/ia64/README#2 integrate ... //depot/projects/ia64/bin/chio/chio.c#3 integrate ... //depot/projects/ia64/bin/df/df.c#4 integrate ... //depot/projects/ia64/bin/ls/lomac.c#4 integrate ... //depot/projects/ia64/bin/ps/lomac.c#4 integrate ... //depot/projects/ia64/contrib/ipfilter/ip_ipsec_pxy.c#2 delete ... //depot/projects/ia64/contrib/ipfilter/ip_netbios_pxy.c#2 delete ... //depot/projects/ia64/contrib/texinfo/COPYING#2 integrate ... //depot/projects/ia64/contrib/texinfo/COPYING.DOC#1 branch ... //depot/projects/ia64/contrib/texinfo/ChangeLog#2 integrate ... //depot/projects/ia64/contrib/texinfo/FREEBSD-Xlist#2 integrate ... //depot/projects/ia64/contrib/texinfo/FREEBSD-upgrade#2 integrate ... //depot/projects/ia64/contrib/texinfo/INSTALL#2 integrate ... //depot/projects/ia64/contrib/texinfo/INTRODUCTION#2 integrate ... //depot/projects/ia64/contrib/texinfo/NEWS#2 integrate ... //depot/projects/ia64/contrib/texinfo/README#2 integrate ... //depot/projects/ia64/contrib/texinfo/TODO#2 integrate ... //depot/projects/ia64/contrib/texinfo/config.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/config.h.in#2 integrate ... //depot/projects/ia64/contrib/texinfo/doc/README#2 integrate ... //depot/projects/ia64/contrib/texinfo/doc/help2man#2 integrate ... //depot/projects/ia64/contrib/texinfo/doc/info-stnd.texi#2 integrate ... //depot/projects/ia64/contrib/texinfo/doc/info.1#2 integrate ... //depot/projects/ia64/contrib/texinfo/doc/info.texi#2 integrate ... //depot/projects/ia64/contrib/texinfo/doc/install-info.1#2 integrate ... //depot/projects/ia64/contrib/texinfo/doc/makeinfo.1#2 integrate ... //depot/projects/ia64/contrib/texinfo/doc/texindex.1#2 integrate ... //depot/projects/ia64/contrib/texinfo/doc/texinfo.txi#2 integrate ... //depot/projects/ia64/contrib/texinfo/doc/version-stnd.texi#1 branch ... //depot/projects/ia64/contrib/texinfo/doc/version.texi#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/doc.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/doc.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/echo-area.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/filesys.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/funs.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/info.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/info.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/infodoc.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/infokey.c#1 branch ... //depot/projects/ia64/contrib/texinfo/info/infokey.h#1 branch ... //depot/projects/ia64/contrib/texinfo/info/infomap.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/infomap.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/key.c#1 branch ... //depot/projects/ia64/contrib/texinfo/info/key.h#1 branch ... //depot/projects/ia64/contrib/texinfo/info/m-x.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/man.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/nodes.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/session.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/session.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/termdep.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/terminal.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/terminal.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/variables.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/info/window.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/lib/getopt.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/lib/getopt.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/lib/getopt1.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/lib/gettext.h#1 branch ... //depot/projects/ia64/contrib/texinfo/lib/system.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/lib/xstrdup.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/README#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/cmds.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/defun.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/docbook.c#1 branch ... //depot/projects/ia64/contrib/texinfo/makeinfo/docbook.h#1 branch ... //depot/projects/ia64/contrib/texinfo/makeinfo/files.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/files.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/footnote.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/html.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/html.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/index.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/insertion.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/insertion.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/lang.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/lang.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/macro.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/makeinfo.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/makeinfo.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/multi.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/node.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/node.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/sectioning.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/texinfo.dtd#1 branch ... //depot/projects/ia64/contrib/texinfo/makeinfo/texinfo.xsl#1 branch ... //depot/projects/ia64/contrib/texinfo/makeinfo/toc.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/toc.h#2 integrate ... //depot/projects/ia64/contrib/texinfo/makeinfo/xml.c#1 branch ... //depot/projects/ia64/contrib/texinfo/makeinfo/xml.h#1 branch ... //depot/projects/ia64/contrib/texinfo/util/install-info.c#2 integrate ... //depot/projects/ia64/contrib/texinfo/util/texindex.c#2 integrate ... //depot/projects/ia64/crypto/openssh/auth1.c#4 integrate ... //depot/projects/ia64/crypto/openssh/auth2.c#3 integrate ... //depot/projects/ia64/crypto/openssh/servconf.c#4 integrate ... //depot/projects/ia64/crypto/openssh/sshd.8#3 integrate ... //depot/projects/ia64/etc/inetd.conf#4 integrate ... //depot/projects/ia64/etc/mtree/BSD.include.dist#3 integrate ... //depot/projects/ia64/etc/pam.d/sshd#2 integrate ... //depot/projects/ia64/etc/rc#8 integrate ... //depot/projects/ia64/etc/sendmail/freebsd.mc#5 integrate ... //depot/projects/ia64/etc/sendmail/freefall.mc#3 integrate ... //depot/projects/ia64/games/backgammon/common_source/fancy.c#2 integrate ... //depot/projects/ia64/games/canfield/canfield/canfield.c#2 integrate ... //depot/projects/ia64/games/canfield/cfscores/cfscores.c#2 integrate ... //depot/projects/ia64/games/fortune/datfiles/fortunes2-o#2 integrate ... //depot/projects/ia64/games/fortune/fortune/fortune.c#3 integrate ... //depot/projects/ia64/games/fortune/strfile/strfile.c#3 integrate ... //depot/projects/ia64/gnu/usr.bin/Makefile#5 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/texinfo/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/texinfo/infokey/Makefile#1 branch ... //depot/projects/ia64/gnu/usr.bin/texinfo/makeinfo/Makefile#2 integrate ... //depot/projects/ia64/include/Makefile#8 integrate ... //depot/projects/ia64/include/arpa/inet.h#5 integrate ... //depot/projects/ia64/include/arpa/nameser.h#2 integrate ... //depot/projects/ia64/include/assert.h#2 integrate ... //depot/projects/ia64/include/complex.h#2 integrate ... //depot/projects/ia64/include/ctype.h#3 integrate ... //depot/projects/ia64/include/db.h#2 integrate ... //depot/projects/ia64/include/dirent.h#2 integrate ... //depot/projects/ia64/include/dlfcn.h#3 integrate ... //depot/projects/ia64/include/err.h#2 integrate ... //depot/projects/ia64/include/fnmatch.h#2 integrate ... //depot/projects/ia64/include/fstab.h#2 integrate ... //depot/projects/ia64/include/fts.h#2 integrate ... //depot/projects/ia64/include/glob.h#2 integrate ... //depot/projects/ia64/include/grp.h#4 integrate ... //depot/projects/ia64/include/hesiod.h#2 integrate ... //depot/projects/ia64/include/ieeefp.h#2 integrate ... //depot/projects/ia64/include/ifaddrs.h#2 integrate ... //depot/projects/ia64/include/langinfo.h#3 integrate ... //depot/projects/ia64/include/libgen.h#2 integrate ... //depot/projects/ia64/include/link.h#2 integrate ... //depot/projects/ia64/include/locale.h#2 integrate ... //depot/projects/ia64/include/math.h#3 integrate ... //depot/projects/ia64/include/mpool.h#2 integrate ... //depot/projects/ia64/include/ndbm.h#2 integrate ... //depot/projects/ia64/include/netconfig.h#2 integrate ... //depot/projects/ia64/include/netdb.h#2 integrate ... //depot/projects/ia64/include/nl_types.h#2 integrate ... //depot/projects/ia64/include/nlist.h#2 integrate ... //depot/projects/ia64/include/nsswitch.h#2 integrate ... //depot/projects/ia64/include/paths.h#3 integrate ... //depot/projects/ia64/include/pthread.h#2 integrate ... //depot/projects/ia64/include/pthread_np.h#2 integrate ... //depot/projects/ia64/include/pwd.h#4 integrate ... //depot/projects/ia64/include/regex.h#2 integrate ... //depot/projects/ia64/include/regexp.h#2 integrate ... //depot/projects/ia64/include/resolv.h#2 integrate ... //depot/projects/ia64/include/rpc/auth.h#3 integrate ... //depot/projects/ia64/include/rpc/auth_des.h#2 integrate ... //depot/projects/ia64/include/rpc/auth_unix.h#2 integrate ... //depot/projects/ia64/include/rpc/clnt.h#2 integrate ... //depot/projects/ia64/include/rpc/clnt_soc.h#2 integrate ... //depot/projects/ia64/include/rpc/des.h#2 integrate ... //depot/projects/ia64/include/rpc/des_crypt.h#2 integrate ... //depot/projects/ia64/include/rpc/nettype.h#2 integrate ... //depot/projects/ia64/include/rpc/pmap_clnt.h#2 integrate ... //depot/projects/ia64/include/rpc/pmap_prot.h#2 integrate ... //depot/projects/ia64/include/rpc/pmap_rmt.h#2 integrate ... //depot/projects/ia64/include/rpc/rpc.h#3 integrate ... //depot/projects/ia64/include/rpc/rpc_com.h#3 integrate ... //depot/projects/ia64/include/rpc/rpc_msg.h#2 integrate ... //depot/projects/ia64/include/rpc/rpcb_clnt.h#2 integrate ... //depot/projects/ia64/include/rpc/rpcent.h#2 integrate ... //depot/projects/ia64/include/rpc/svc.h#3 integrate ... //depot/projects/ia64/include/rpc/svc_auth.h#2 integrate ... //depot/projects/ia64/include/rpc/svc_soc.h#2 integrate ... //depot/projects/ia64/include/rpc/xdr.h#3 integrate ... //depot/projects/ia64/include/rpcsvc/nis_db.h#2 integrate ... //depot/projects/ia64/include/rpcsvc/nislib.h#2 integrate ... //depot/projects/ia64/include/rpcsvc/ypclnt.h#3 integrate ... //depot/projects/ia64/include/rpcsvc/yppasswd.x#2 integrate ... //depot/projects/ia64/include/rune.h#2 integrate ... //depot/projects/ia64/include/runetype.h#2 integrate ... //depot/projects/ia64/include/search.h#2 integrate ... //depot/projects/ia64/include/setjmp.h#2 integrate ... //depot/projects/ia64/include/signal.h#3 integrate ... //depot/projects/ia64/include/stdio.h#3 integrate ... //depot/projects/ia64/include/stdlib.h#6 integrate ... //depot/projects/ia64/include/string.h#3 integrate ... //depot/projects/ia64/include/stringlist.h#2 integrate ... //depot/projects/ia64/include/time.h#3 integrate ... //depot/projects/ia64/include/ttyent.h#2 integrate ... //depot/projects/ia64/include/unistd.h#5 integrate ... //depot/projects/ia64/include/utime.h#2 integrate ... //depot/projects/ia64/include/vis.h#2 integrate ... //depot/projects/ia64/include/wchar.h#2 integrate ... //depot/projects/ia64/include/wctype.h#2 integrate ... //depot/projects/ia64/lib/csu/ia64/crt1.c#2 integrate ... //depot/projects/ia64/lib/csu/powerpc/crt1.c#4 integrate ... //depot/projects/ia64/lib/libc/Makefile#2 integrate ... //depot/projects/ia64/lib/libc/db/btree/bt_split.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/sysconf.c#4 integrate ... //depot/projects/ia64/lib/libc/gen/sysctl.3#4 integrate ... //depot/projects/ia64/lib/libc/i386/gen/_ctx_start.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/gen/_setjmp.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/gen/alloca.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/gen/fabs.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/gen/frexp.c#3 integrate ... //depot/projects/ia64/lib/libc/i386/gen/getcontext.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/gen/isinf.c#3 integrate ... //depot/projects/ia64/lib/libc/i386/gen/ldexp.c#3 integrate ... //depot/projects/ia64/lib/libc/i386/gen/modf.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/gen/rfork_thread.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/gen/setjmp.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/gen/sigsetjmp.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/net/htonl.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/net/htons.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/net/ntohl.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/net/ntohs.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/stdlib/abs.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/stdlib/div.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/stdlib/labs.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/stdlib/ldiv.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/bcmp.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/bcopy.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/bzero.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/ffs.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/index.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/memchr.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/memcmp.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/memcpy.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/memmove.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/memset.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/rindex.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/strcat.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/string/strchr.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/strcmp.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/string/strcpy.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/string/strlen.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/strncmp.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/strrchr.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/string/swab.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/sys/Ovfork.S#4 integrate ... //depot/projects/ia64/lib/libc/i386/sys/brk.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/sys/cerror.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/sys/exect.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/sys/pipe.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/sys/ptrace.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/sys/reboot.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/sys/sbrk.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/sys/setlogin.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/sys/sigreturn.S#2 integrate ... //depot/projects/ia64/lib/libc/i386/sys/syscall.S#2 integrate ... //depot/projects/ia64/lib/libc/mips/:errfix#2 delete ... //depot/projects/ia64/lib/libc/mips/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mips/SYS.h#3 delete ... //depot/projects/ia64/lib/libc/mips/gen/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mips/gen/_setjmp.S#2 delete ... //depot/projects/ia64/lib/libc/mips/gen/fabs.S#2 delete ... //depot/projects/ia64/lib/libc/mips/gen/flt_rounds.c#3 delete ... //depot/projects/ia64/lib/libc/mips/gen/fpgetmask.c#3 delete ... //depot/projects/ia64/lib/libc/mips/gen/fpgetround.c#3 delete ... //depot/projects/ia64/lib/libc/mips/gen/fpgetsticky.c#3 delete ... //depot/projects/ia64/lib/libc/mips/gen/fpsetmask.c#3 delete ... //depot/projects/ia64/lib/libc/mips/gen/fpsetround.c#3 delete ... //depot/projects/ia64/lib/libc/mips/gen/fpsetsticky.c#2 delete ... //depot/projects/ia64/lib/libc/mips/gen/frexp.c#2 delete ... //depot/projects/ia64/lib/libc/mips/gen/infinity.c#2 delete ... //depot/projects/ia64/lib/libc/mips/gen/isinf.S#2 delete ... //depot/projects/ia64/lib/libc/mips/gen/ldexp.S#2 delete ... //depot/projects/ia64/lib/libc/mips/gen/modf.S#2 delete ... //depot/projects/ia64/lib/libc/mips/gen/setjmp.S#2 delete ... //depot/projects/ia64/lib/libc/mips/gen/sigsetjmp.S#2 delete ... //depot/projects/ia64/lib/libc/mips/net/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mips/net/htonl.S#2 delete ... //depot/projects/ia64/lib/libc/mips/net/htons.S#2 delete ... //depot/projects/ia64/lib/libc/mips/stdlib/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mips/string/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mips/string/bcmp.S#2 delete ... //depot/projects/ia64/lib/libc/mips/string/bcopy.S#2 delete ... //depot/projects/ia64/lib/libc/mips/string/bzero.S#2 delete ... //depot/projects/ia64/lib/libc/mips/string/ffs.S#2 delete ... //depot/projects/ia64/lib/libc/mips/string/index.S#2 delete ... //depot/projects/ia64/lib/libc/mips/string/rindex.S#2 delete ... //depot/projects/ia64/lib/libc/mips/string/strcmp.S#2 delete ... //depot/projects/ia64/lib/libc/mips/string/strlen.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/Ovfork.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/brk.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/cerror.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/exect.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/fork.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/pipe.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/ptrace.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/sbrk.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/setlogin.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/sigpending.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/sigprocmask.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/sigreturn.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/sigsuspend.S#2 delete ... //depot/projects/ia64/lib/libc/mips/sys/syscall.S#2 delete ... //depot/projects/ia64/lib/libc/mipseb/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mipseb/SYS.h#3 delete ... //depot/projects/ia64/lib/libc/mipseb/gen/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mipseb/net/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mipseb/stdlib/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mipseb/string/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mipseb/sys/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mipsel/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mipsel/SYS.h#2 delete ... //depot/projects/ia64/lib/libc/mipsel/gen/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mipsel/net/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mipsel/stdlib/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mipsel/string/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libc/mipsel/sys/Makefile.inc#2 delete ... //depot/projects/ia64/lib/libcrypt/crypt-md5.c#3 integrate ... //depot/projects/ia64/lib/libdisk/blocks.c#2 integrate ... //depot/projects/ia64/lib/libdisk/change.c#2 integrate ... //depot/projects/ia64/lib/libdisk/chunk.c#4 integrate ... //depot/projects/ia64/lib/libdisk/create_chunk.c#3 integrate ... //depot/projects/ia64/lib/libdisk/disk.c#3 integrate ... //depot/projects/ia64/lib/libdisk/disklabel.c#2 integrate ... //depot/projects/ia64/lib/libdisk/libdisk.h#4 integrate ... //depot/projects/ia64/lib/libdisk/rules.c#2 integrate ... //depot/projects/ia64/lib/libdisk/tst01.c#2 integrate ... //depot/projects/ia64/lib/libdisk/write_disk.c#2 integrate ... //depot/projects/ia64/lib/libfetch/ftp.c#4 integrate ... //depot/projects/ia64/lib/libftpio/ftpio.c#2 integrate ... //depot/projects/ia64/lib/libftpio/ftpio.h#2 integrate ... //depot/projects/ia64/lib/libmd/mdX.3#2 integrate ... //depot/projects/ia64/lib/libmd/mdXhl.c#2 integrate ... //depot/projects/ia64/lib/libmd/ripemd.3#2 integrate ... //depot/projects/ia64/lib/libmd/sha.3#2 integrate ... //depot/projects/ia64/lib/msun/Makefile#4 integrate ... //depot/projects/ia64/lib/msun/bsdsrc/b_exp.c#2 integrate ... //depot/projects/ia64/lib/msun/bsdsrc/b_log.c#2 integrate ... //depot/projects/ia64/lib/msun/bsdsrc/b_tgamma.c#2 integrate ... //depot/projects/ia64/lib/msun/man/lgamma.3#4 integrate ... //depot/projects/ia64/lib/msun/src/math.h#4 integrate ... //depot/projects/ia64/release/Makefile#6 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/readme/article.sgml#5 integrate ... //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#8 integrate ... //depot/projects/ia64/release/picobsd/build/write_mfs_in_kernel.c#2 integrate ... //depot/projects/ia64/release/picobsd/mfs_tree/etc/protocols#2 integrate ... //depot/projects/ia64/release/write_mfs_in_kernel.c#2 delete ... //depot/projects/ia64/sbin/fsck/fsck.c#3 integrate ... //depot/projects/ia64/sbin/fsck/fsutil.c#3 integrate ... //depot/projects/ia64/sbin/fsck_ffs/main.c#4 integrate ... //depot/projects/ia64/sbin/fsck_ifs/main.c#3 integrate ... //depot/projects/ia64/sbin/ipfs/Makefile#3 integrate ... //depot/projects/ia64/sbin/nfsd/nfsd.c#2 integrate ... //depot/projects/ia64/sbin/ping/ping.c#4 integrate ... //depot/projects/ia64/sbin/reboot/boot_i386.8#4 integrate ... //depot/projects/ia64/secure/lib/libcrypto/Makefile#4 integrate ... //depot/projects/ia64/secure/lib/libcrypto/Makefile.inc#3 integrate ... //depot/projects/ia64/secure/lib/libssl/Makefile#2 integrate ... //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#7 integrate ... //depot/projects/ia64/share/dict/Makefile#3 integrate ... //depot/projects/ia64/share/dict/README#2 integrate ... //depot/projects/ia64/share/dict/tech#1 branch ... //depot/projects/ia64/share/doc/papers/malloc/abs.ms#2 integrate ... //depot/projects/ia64/share/doc/papers/malloc/alternatives.ms#2 integrate ... //depot/projects/ia64/share/doc/papers/malloc/conclusion.ms#2 integrate ... //depot/projects/ia64/share/doc/papers/malloc/implementation.ms#2 integrate ... //depot/projects/ia64/share/doc/papers/malloc/intro.ms#2 integrate ... //depot/projects/ia64/share/doc/papers/malloc/kernel.ms#2 integrate ... //depot/projects/ia64/share/doc/papers/malloc/malloc.ms#2 integrate ... //depot/projects/ia64/share/doc/papers/malloc/performance.ms#2 integrate ... //depot/projects/ia64/share/doc/papers/malloc/problems.ms#2 integrate ... //depot/projects/ia64/share/examples/isdn/README#2 integrate ... //depot/projects/ia64/share/examples/isdn/ReleaseNotes#2 integrate ... //depot/projects/ia64/share/examples/isdn/Resources#2 integrate ... //depot/projects/ia64/share/examples/isdn/ThankYou#3 integrate ... //depot/projects/ia64/share/man/man4/joy.4#2 integrate ... //depot/projects/ia64/share/man/man4/man4.i386/Makefile#4 integrate ... //depot/projects/ia64/share/man/man4/man4.i386/alpm.4#2 integrate ... //depot/projects/ia64/share/man/man4/man4.i386/viapm.4#1 branch ... //depot/projects/ia64/share/man/man5/drivers.conf.5#1 branch ... //depot/projects/ia64/share/man/man7/ffs.7#3 integrate ... //depot/projects/ia64/share/man/man7/release.7#6 integrate ... //depot/projects/ia64/share/man/man9/lock.9#3 integrate ... //depot/projects/ia64/share/man/man9/style.9#7 integrate ... //depot/projects/ia64/sys/alpha/alpha/dec_kn300.c#3 integrate ... //depot/projects/ia64/sys/alpha/conf/GENERIC#5 integrate ... //depot/projects/ia64/sys/alpha/include/ansi.h#5 integrate ... //depot/projects/ia64/sys/alpha/mcbus/mcbus.c#2 integrate ... //depot/projects/ia64/sys/alpha/mcbus/mcbusvar.h#2 integrate ... //depot/projects/ia64/sys/alpha/mcbus/mcpcia.c#4 integrate ... //depot/projects/ia64/sys/alpha/mcbus/mcpciavar.h#2 integrate ... //depot/projects/ia64/sys/arm/include/ansi.h#4 integrate ... //depot/projects/ia64/sys/boot/i386/boot2/boot2.c#4 integrate ... //depot/projects/ia64/sys/cam/cam_xpt.c#5 integrate ... //depot/projects/ia64/sys/cam/scsi/scsi_da.c#11 integrate ... //depot/projects/ia64/sys/compat/linux/linux_mib.h#4 integrate ... //depot/projects/ia64/sys/conf/Makefile.ia64#9 integrate ... //depot/projects/ia64/sys/conf/Makefile.powerpc#7 integrate ... //depot/projects/ia64/sys/conf/Makefile.sparc64#9 integrate ... //depot/projects/ia64/sys/conf/files#11 integrate ... //depot/projects/ia64/sys/conf/files.i386#7 integrate ... //depot/projects/ia64/sys/conf/files.pc98#5 integrate ... //depot/projects/ia64/sys/conf/files.sparc64#6 integrate ... //depot/projects/ia64/sys/conf/kern.pre.mk#5 integrate ... //depot/projects/ia64/sys/conf/kmod_syms.awk#2 integrate ... //depot/projects/ia64/sys/conf/options#6 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_proxy.c#5 integrate ... //depot/projects/ia64/sys/ddb/db_command.c#7 integrate ... //depot/projects/ia64/sys/ddb/db_sym.h#3 integrate ... //depot/projects/ia64/sys/ddb/ddb.h#3 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#3 integrate ... //depot/projects/ia64/sys/dev/ata/ata-all.c#9 integrate ... //depot/projects/ia64/sys/dev/ata/ata-dma.c#7 integrate ... //depot/projects/ia64/sys/dev/ata/ata-pci.c#7 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-all.c#4 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-cd.c#7 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-fd.c#4 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-tape.c#5 integrate ... //depot/projects/ia64/sys/dev/bktr/bktr_i2c.c#2 integrate ... //depot/projects/ia64/sys/dev/bktr/bktr_i2c.h#2 integrate ... //depot/projects/ia64/sys/dev/bktr/bktr_os.c#4 integrate ... //depot/projects/ia64/sys/dev/bktr/bktr_reg.h#2 integrate ... //depot/projects/ia64/sys/dev/digi/digi.c#5 integrate ... //depot/projects/ia64/sys/dev/gem/if_gem.c#3 integrate ... //depot/projects/ia64/sys/dev/gem/if_gemvar.h#3 integrate ... //depot/projects/ia64/sys/dev/hme/if_hme.c#3 integrate ... //depot/projects/ia64/sys/dev/hme/if_hme_pci.c#3 integrate ... //depot/projects/ia64/sys/dev/hme/if_hme_sbus.c#2 integrate ... //depot/projects/ia64/sys/dev/hme/if_hmevar.h#2 integrate ... //depot/projects/ia64/sys/dev/iicbus/if_ic.c#3 integrate ... //depot/projects/ia64/sys/dev/iicbus/iic.c#3 integrate ... //depot/projects/ia64/sys/dev/iicbus/iicbb.c#2 integrate ... //depot/projects/ia64/sys/dev/iicbus/iicbb_if.m#2 integrate ... //depot/projects/ia64/sys/dev/iicbus/iicbus.c#3 integrate ... //depot/projects/ia64/sys/dev/iicbus/iiconf.c#2 integrate ... //depot/projects/ia64/sys/dev/iicbus/iiconf.h#2 integrate ... //depot/projects/ia64/sys/dev/iicbus/iicsmb.c#3 integrate ... //depot/projects/ia64/sys/dev/ppbus/lpbb.c#2 integrate ... //depot/projects/ia64/sys/dev/sio/sio.c#6 integrate ... //depot/projects/ia64/sys/dev/sio/sio_isa.c#6 integrate ... //depot/projects/ia64/sys/dev/smbus/smb.c#2 integrate ... //depot/projects/ia64/sys/dev/smbus/smbconf.c#2 integrate ... //depot/projects/ia64/sys/dev/smbus/smbconf.h#2 integrate ... //depot/projects/ia64/sys/dev/smbus/smbus.c#2 integrate ... //depot/projects/ia64/sys/dev/sound/midi/midi.h#4 integrate ... //depot/projects/ia64/sys/dev/syscons/dragon/dragon_saver.c#1 branch ... //depot/projects/ia64/sys/dev/syscons/fire/fire_saver.c#2 integrate ... //depot/projects/ia64/sys/dev/syscons/logo/logo_saver.c#3 integrate ... //depot/projects/ia64/sys/dev/syscons/rain/rain_saver.c#3 integrate ... //depot/projects/ia64/sys/dev/syscons/warp/warp_saver.c#3 integrate ... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_fat.c#4 integrate ... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate ... //depot/projects/ia64/sys/geom/geom.h#3 integrate ... //depot/projects/ia64/sys/geom/geom_bsd.c#3 integrate ... //depot/projects/ia64/sys/geom/geom_dev.c#4 integrate ... //depot/projects/ia64/sys/geom/geom_disk.c#3 integrate ... //depot/projects/ia64/sys/geom/geom_dump.c#2 integrate ... //depot/projects/ia64/sys/geom/geom_enc.c#1 branch ... //depot/projects/ia64/sys/geom/geom_event.c#2 integrate ... //depot/projects/ia64/sys/geom/geom_int.h#1 branch ... //depot/projects/ia64/sys/geom/geom_io.c#2 integrate ... //depot/projects/ia64/sys/geom/geom_kern.c#2 integrate ... //depot/projects/ia64/sys/geom/geom_mbr.c#2 integrate ... //depot/projects/ia64/sys/geom/geom_mbrext.c#2 delete ... //depot/projects/ia64/sys/geom/geom_slice.c#4 integrate ... //depot/projects/ia64/sys/geom/geom_slice.h#2 integrate ... //depot/projects/ia64/sys/geom/geom_subr.c#2 integrate ... //depot/projects/ia64/sys/geom/geom_sunlabel.c#2 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_alloc.c#4 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_extern.h#3 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_inode.c#3 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_lookup.c#4 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_subr.c#4 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_vfsops.c#7 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_vnops.c#4 integrate ... //depot/projects/ia64/sys/i386/conf/NOTES#11 integrate ... //depot/projects/ia64/sys/i386/i386/bios.c#4 integrate ... //depot/projects/ia64/sys/i386/i386/db_disasm.c#3 integrate ... //depot/projects/ia64/sys/i386/i386/db_trace.c#4 integrate ... //depot/projects/ia64/sys/i386/i386/mp_machdep.c#5 integrate ... //depot/projects/ia64/sys/i386/i386/sys_machdep.c#5 integrate ... //depot/projects/ia64/sys/i386/include/ansi.h#5 integrate ... //depot/projects/ia64/sys/i386/include/cpufunc.h#5 integrate ... //depot/projects/ia64/sys/i386/include/i4b_ioctl.h#4 integrate ... //depot/projects/ia64/sys/i386/include/md_var.h#4 integrate ... //depot/projects/ia64/sys/i386/include/segments.h#4 integrate ... //depot/projects/ia64/sys/i386/include/smp.h#4 integrate ... //depot/projects/ia64/sys/i386/isa/cy.c#5 integrate ... //depot/projects/ia64/sys/i386/isa/icu.h#3 integrate ... //depot/projects/ia64/sys/i386/isa/if_rdp.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/mse.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/npx.c#6 integrate ... //depot/projects/ia64/sys/i386/isa/pcf.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/rc.c#4 integrate ... //depot/projects/ia64/sys/i386/isa/spic.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/spicreg.h#2 integrate ... //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#6 integrate ... //depot/projects/ia64/sys/i386/pci/pci_bus.c#3 integrate ... //depot/projects/ia64/sys/i4b/include/i4b_l3l4.h#3 integrate ... //depot/projects/ia64/sys/i4b/layer3/i4b_l2if.c#2 integrate ... //depot/projects/ia64/sys/i4b/layer3/i4b_q931.c#4 integrate ... //depot/projects/ia64/sys/i4b/layer3/i4b_q931.h#2 integrate ... //depot/projects/ia64/sys/i4b/layer4/i4b_i4bdrv.c#4 integrate ... //depot/projects/ia64/sys/i4b/layer4/i4b_l4.c#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/locore.s#5 integrate ... //depot/projects/ia64/sys/ia64/include/ansi.h#5 integrate ... //depot/projects/ia64/sys/ia64/include/asm.h#3 integrate ... //depot/projects/ia64/sys/isa/fd.c#3 integrate ... //depot/projects/ia64/sys/isa/ppc.c#3 integrate ... //depot/projects/ia64/sys/isofs/cd9660/cd9660_rrip.c#3 integrate ... //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#6 integrate ... //depot/projects/ia64/sys/isofs/cd9660/iso.h#4 integrate ... //depot/projects/ia64/sys/kern/bus_if.m#2 integrate ... //depot/projects/ia64/sys/kern/imgact_gzip.c#3 integrate ... //depot/projects/ia64/sys/kern/inflate.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_exec.c#9 integrate ... //depot/projects/ia64/sys/kern/kern_linker.c#11 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_sig.c#6 integrate ... //depot/projects/ia64/sys/kern/tty_compat.c#3 integrate ... //depot/projects/ia64/sys/kern/uipc_syscalls.c#6 integrate ... //depot/projects/ia64/sys/kern/uipc_usrreq.c#10 integrate ... //depot/projects/ia64/sys/kern/vfs_aio.c#6 integrate ... //depot/projects/ia64/sys/kern/vfs_export.c#4 integrate ... //depot/projects/ia64/sys/kern/vfs_init.c#4 integrate ... //depot/projects/ia64/sys/kern/vfs_subr.c#7 integrate ... //depot/projects/ia64/sys/kern/vfs_syscalls.c#10 integrate ... //depot/projects/ia64/sys/kern/vfs_vnops.c#8 integrate ... //depot/projects/ia64/sys/modules/bktr/bktr/Makefile#2 integrate ... //depot/projects/ia64/sys/modules/i2c/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/controllers/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/controllers/alpm/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/controllers/amdpm/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/controllers/intpm/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/controllers/lpbb/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/controllers/pcf/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/controllers/viapm/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/if_ic/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/iic/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/iicbb/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/iicbus/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/iicsmb/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/smb/Makefile#1 branch ... //depot/projects/ia64/sys/modules/i2c/smbus/Makefile#1 branch ... //depot/projects/ia64/sys/modules/syscons/Makefile#2 integrate ... //depot/projects/ia64/sys/modules/syscons/dragon/Makefile#1 branch ... //depot/projects/ia64/sys/net/bsd_comp.c#3 integrate ... //depot/projects/ia64/sys/net/if_ethersubr.c#7 integrate ... //depot/projects/ia64/sys/net/if_fddisubr.c#3 integrate ... //depot/projects/ia64/sys/net/if_gif.h#4 integrate ... //depot/projects/ia64/sys/net/if_pppvar.h#4 integrate ... //depot/projects/ia64/sys/net/if_tap.c#5 integrate ... //depot/projects/ia64/sys/net/pfil.h#3 integrate ... //depot/projects/ia64/sys/net/ppp_comp.h#3 integrate ... //depot/projects/ia64/sys/net/ppp_deflate.c#3 integrate ... //depot/projects/ia64/sys/net/radix.c#3 integrate ... //depot/projects/ia64/sys/net/route.h#5 integrate ... //depot/projects/ia64/sys/net/zlib.c#4 integrate ... //depot/projects/ia64/sys/netinet/if_ether.h#3 integrate ... //depot/projects/ia64/sys/netinet/in_pcb.h#7 integrate ... //depot/projects/ia64/sys/netinet/in_var.h#3 integrate ... //depot/projects/ia64/sys/netinet/ip_mroute.c#6 integrate ... //depot/projects/ia64/sys/netinet/tcp_input.c#7 integrate ... //depot/projects/ia64/sys/netinet/tcp_usrreq.c#5 integrate ... //depot/projects/ia64/sys/netinet/udp_usrreq.c#7 integrate ... //depot/projects/ia64/sys/netinet6/ah_input.c#3 integrate ... //depot/projects/ia64/sys/netinet6/esp_input.c#3 integrate ... //depot/projects/ia64/sys/netinet6/scope6.c#2 integrate ... //depot/projects/ia64/sys/pc98/conf/GENERIC#6 integrate ... //depot/projects/ia64/sys/pc98/pc98/fd.c#3 integrate ... //depot/projects/ia64/sys/pc98/pc98/mse.c#3 integrate ... //depot/projects/ia64/sys/pc98/pc98/sio.c#6 integrate ... //depot/projects/ia64/sys/pc98/pc98/syscons.c#3 integrate ... //depot/projects/ia64/sys/pci/alpm.c#3 integrate ... //depot/projects/ia64/sys/pci/amdpm.c#4 integrate ... //depot/projects/ia64/sys/pci/intpm.c#4 integrate ... //depot/projects/ia64/sys/pci/viapm.c#1 branch ... //depot/projects/ia64/sys/powerpc/include/ansi.h#5 integrate ... //depot/projects/ia64/sys/sparc64/conf/GENERIC#4 integrate ... //depot/projects/ia64/sys/sparc64/ebus/ebus.c#4 integrate ... //depot/projects/ia64/sys/sparc64/ebus/ebusvar.h#2 integrate ... //depot/projects/ia64/sys/sparc64/include/ansi.h#5 integrate ... //depot/projects/ia64/sys/sparc64/include/bus.h#4 integrate ... //depot/projects/ia64/sys/sparc64/include/bus_private.h#1 branch ... //depot/projects/ia64/sys/sparc64/include/clock.h#2 integrate ... //depot/projects/ia64/sys/sparc64/include/iommuvar.h#4 integrate ... //depot/projects/ia64/sys/sparc64/include/ofw_bus.h#2 integrate ... //depot/projects/ia64/sys/sparc64/include/tlb.h#3 integrate ... //depot/projects/ia64/sys/sparc64/isa/isa.c#3 integrate ... //depot/projects/ia64/sys/sparc64/isa/ofw_isa.c#3 integrate ... //depot/projects/ia64/sys/sparc64/pci/apb.c#3 integrate ... //depot/projects/ia64/sys/sparc64/pci/ofw_pci.c#3 integrate ... //depot/projects/ia64/sys/sparc64/pci/ofw_pci.h#2 integrate ... //depot/projects/ia64/sys/sparc64/pci/psycho.c#4 integrate ... //depot/projects/ia64/sys/sparc64/pci/psychoreg.h#3 integrate ... //depot/projects/ia64/sys/sparc64/pci/psychovar.h#3 integrate ... //depot/projects/ia64/sys/sparc64/sbus/sbus.c#2 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/bus_machdep.c#3 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/cache.c#4 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/db_disasm.c#4 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/db_trace.c#4 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/exception.s#6 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/identcpu.c#4 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/iommu.c#3 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/ofw_bus.c#2 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/pv.c#5 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/trap.c#6 integrate ... //depot/projects/ia64/sys/sys/bio.h#6 integrate ... //depot/projects/ia64/sys/sys/conf.h#7 integrate ... //depot/projects/ia64/sys/sys/disklabel.h#7 integrate ... //depot/projects/ia64/sys/sys/diskslice.h#3 integrate ... //depot/projects/ia64/sys/sys/event.h#4 integrate ... //depot/projects/ia64/sys/sys/file.h#6 integrate ... //depot/projects/ia64/sys/sys/filedesc.h#4 integrate ... //depot/projects/ia64/sys/sys/inflate.h#3 integrate ... //depot/projects/ia64/sys/sys/libkern.h#4 integrate ... //depot/projects/ia64/sys/sys/malloc.h#5 integrate ... //depot/projects/ia64/sys/sys/mount.h#6 integrate ... //depot/projects/ia64/sys/sys/mouse.h#2 integrate ... //depot/projects/ia64/sys/sys/msgbuf.h#3 integrate ... //depot/projects/ia64/sys/sys/protosw.h#3 integrate ... //depot/projects/ia64/sys/sys/socketvar.h#8 integrate ... //depot/projects/ia64/sys/sys/sysent.h#5 integrate ... //depot/projects/ia64/sys/sys/systm.h#8 integrate ... //depot/projects/ia64/sys/sys/tty.h#3 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#3 integrate ... //depot/projects/ia64/sys/vm/vm_extern.h#5 integrate ... //depot/projects/ia64/tools/diag/localeck/Makefile#2 integrate ... //depot/projects/ia64/tools/diag/localeck/localeck.c#2 integrate ... //depot/projects/ia64/tools/regression/geom/Data/disk.beast.da0.xml#1 branch ... //depot/projects/ia64/tools/regression/geom/GLib/Makefile#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/Makefile#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T000/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T001/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T002/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T003/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T004/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T005/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T006/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T007/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T008/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T009/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T010/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T010/testprg.c#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T011/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T011/testprg.c#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T012/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T013/Makefile#1 branch ... //depot/projects/ia64/tools/regression/geom/Test/T013/ref.conf#1 branch ... //depot/projects/ia64/tools/regression/geom/Test/T013/testprg.c#1 branch ... //depot/projects/ia64/tools/regression/geom/geom.c#2 integrate ... //depot/projects/ia64/tools/regression/geom/geom_kernsim.c#2 integrate ... //depot/projects/ia64/tools/regression/geom/geom_sim.h#2 integrate ... //depot/projects/ia64/tools/regression/geom/geom_simdev.c#2 integrate ... //depot/projects/ia64/tools/regression/geom/geom_simdisk.c#2 integrate ... //depot/projects/ia64/tools/regression/geom/geom_simdisk.h#2 integrate ... //depot/projects/ia64/tools/regression/geom/geom_simdisk_xml.c#2 integrate ... //depot/projects/ia64/tools/tools/kernxref/kernxref.sh#2 integrate ... //depot/projects/ia64/usr.bin/Makefile#11 integrate ... //depot/projects/ia64/usr.bin/apply/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/awk/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#8 integrate ... //depot/projects/ia64/usr.bin/chpass/Makefile#2 integrate ... //depot/projects/ia64/usr.bin/chpass/chpass.c#4 integrate ... //depot/projects/ia64/usr.bin/chpass/chpass.h#3 integrate ... //depot/projects/ia64/usr.bin/chpass/edit.c#2 integrate ... //depot/projects/ia64/usr.bin/chpass/field.c#2 integrate ... //depot/projects/ia64/usr.bin/chpass/pw_copy.c#3 integrate ... //depot/projects/ia64/usr.bin/chpass/pw_copy.h#4 integrate ... //depot/projects/ia64/usr.bin/chpass/pw_yp.c#3 integrate ... //depot/projects/ia64/usr.bin/chpass/table.c#2 integrate ... //depot/projects/ia64/usr.bin/chpass/util.c#3 integrate ... //depot/projects/ia64/usr.bin/compress/compress.c#5 integrate ... //depot/projects/ia64/usr.bin/fetch/fetch.c#6 integrate ... //depot/projects/ia64/usr.bin/file2c/file2c.c#2 integrate ... //depot/projects/ia64/usr.bin/find/function.c#5 integrate ... //depot/projects/ia64/usr.bin/find/operator.c#4 integrate ... //depot/projects/ia64/usr.bin/from/from.1#3 integrate ... //depot/projects/ia64/usr.bin/gcore/elfcore.c#2 integrate ... //depot/projects/ia64/usr.bin/gencat/gencat.c#2 integrate ... //depot/projects/ia64/usr.bin/gencat/gencat.h#2 integrate ... //depot/projects/ia64/usr.bin/gencat/genlib.c#3 integrate ... //depot/projects/ia64/usr.bin/gprof/gprof.c#3 integrate ... //depot/projects/ia64/usr.bin/join/join.1#2 integrate ... //depot/projects/ia64/usr.bin/join/join.c#3 integrate ... //depot/projects/ia64/usr.bin/kdump/mkioctls#2 integrate ... //depot/projects/ia64/usr.bin/make/Makefile#2 integrate ... //depot/projects/ia64/usr.bin/make/lst.h#3 integrate ... //depot/projects/ia64/usr.bin/make/main.c#3 integrate ... //depot/projects/ia64/usr.bin/make/parse.c#3 integrate ... //depot/projects/ia64/usr.bin/make/targ.c#3 integrate ... //depot/projects/ia64/usr.bin/make/util.c#2 delete ... //depot/projects/ia64/usr.bin/rlogin/rlogin.c#4 integrate ... //depot/projects/ia64/usr.bin/rsh/Makefile#2 integrate ... //depot/projects/ia64/usr.bin/rsh/rsh.c#3 integrate ... //depot/projects/ia64/usr.bin/sort/append.c#2 integrate ... //depot/projects/ia64/usr.bin/sort/extern.h#2 integrate ... //depot/projects/ia64/usr.bin/sort/fields.c#2 integrate ... //depot/projects/ia64/usr.bin/sort/files.c#2 integrate ... //depot/projects/ia64/usr.bin/sort/fsort.c#2 integrate ... //depot/projects/ia64/usr.bin/sort/init.c#2 integrate ... //depot/projects/ia64/usr.bin/sort/msort.c#2 integrate ... //depot/projects/ia64/usr.bin/sort/sort.1#2 integrate ... //depot/projects/ia64/usr.bin/sort/sort.c#2 integrate ... //depot/projects/ia64/usr.bin/sort/tmp.c#2 integrate ... //depot/projects/ia64/usr.bin/systat/main.c#3 integrate ... //depot/projects/ia64/usr.bin/tcopy/tcopy.c#4 integrate ... //depot/projects/ia64/usr.sbin/cron/cron/cron.8#3 integrate ... //depot/projects/ia64/usr.sbin/cron/crontab/crontab.5#2 integrate ... //depot/projects/ia64/usr.sbin/ctm/README#2 integrate ... //depot/projects/ia64/usr.sbin/ctm/ctm/Makefile#2 integrate ... //depot/projects/ia64/usr.sbin/ctm/ctm/ctm.1#2 integrate ... //depot/projects/ia64/usr.sbin/ctm/ctm/ctm.5#2 integrate ... //depot/projects/ia64/usr.sbin/ctm/ctm/ctm.c#2 integrate ... //depot/projects/ia64/usr.sbin/ctm/ctm/ctm.h#2 integrate ... //depot/projects/ia64/usr.sbin/ctm/ctm/ctm_ed.c#2 integrate ... //depot/projects/ia64/usr.sbin/ctm/ctm/ctm_input.c#2 integrate ... //depot/projects/ia64/usr.sbin/ctm/ctm/ctm_pass1.c#2 integrate ... //depot/projects/ia64/usr.sbin/ctm/ctm/ctm_pass2.c#2 integrate ... //depot/projects/ia64/usr.sbin/ctm/ctm/ctm_pass3.c#2 integrate ... //depot/projects/ia64/usr.sbin/ctm/ctm/ctm_syntax.c#2 integrate ... //depot/projects/ia64/usr.sbin/fdwrite/Makefile#2 integrate ... //depot/projects/ia64/usr.sbin/fdwrite/fdwrite.1#2 integrate ... //depot/projects/ia64/usr.sbin/fdwrite/fdwrite.c#2 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnd/curses.c#2 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnd/dial.c#2 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnd/exec.c#3 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnd/fsm.c#2 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnd/isdnd.h#3 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnd/isdnd.rc.5#2 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnd/monitor.c#2 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnd/msghdl.c#2 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnd/rc_config.c#3 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnd/rc_parse.y#2 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnd/rc_scan.l#2 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnd/support.c#2 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnd/timer.c#2 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdndecode/layer3.c#2 integrate ... //depot/projects/ia64/usr.sbin/i4b/isdnphone/main.c#2 integrate ... //depot/projects/ia64/usr.sbin/moused/moused.c#2 integrate ... //depot/projects/ia64/usr.sbin/pccard/pccardd/pccard.conf.5#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/ppp.8.m4#6 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/dev2c.sh#2 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/wizard.c#2 integrate ... //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#5 integrate ... //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.c#2 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.245 2002/03/20 18:25:48 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.246 2002/03/26 16:05:09 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -281,7 +281,7 @@ @echo "--------------------------------------------------------------" @echo ">>> stage 4: populating ${WORLDTMP}/usr/include" @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${WMAKE} SHARED=copies includes + cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: building libraries" ==== //depot/projects/ia64/README#2 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: src/README,v 1.19 2000/08/31 17:59:01 markm Exp $ +$FreeBSD: src/README,v 1.20 2002/03/26 12:35:49 ru Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -19,13 +19,13 @@ Building a kernel is a somewhat more involved process, documentation for which can be found at: - http://www.freebsd.org/handbook/kernelconfig.html + http://www.FreeBSD.org/handbook/kernelconfig.html And in the config(8) man page. Note: If you want to build and install the kernel with the -``buildkernel'' and ``installkernel'' targets, you have to build +``buildkernel'' and ``installkernel'' targets, you might need to build world before. More information is available in the handbook. -The sample kernel configuration files reside in the sys/i386/conf +The sample kernel configuration files reside in the sys//conf sub-directory (assuming that you've installed the kernel sources), the file named GENERIC being the one used to build your initial installation kernel. The file NOTES contains entries and documentation for all possible @@ -36,13 +36,13 @@ Source Roadmap: --------------- -bin System/User commands. +bin System/user commands. contrib Packages contributed by 3rd parties. crypto Cryptography stuff (see crypto/README). -etc Template files for /etc +etc Template files for /etc. games Amusements. @@ -51,7 +51,9 @@ include System include files. -kerberosIV Kerberos package. +kerberos5 Kerberos5 (Heimdal) package. + +kerberosIV KerberosIV (eBones) package. lib System libraries. @@ -77,4 +79,4 @@ For information on synchronizing your source tree with one or more of the FreeBSD Project's development branches, please see: - http://www.freebsd.org/handbook/synching.html + http://www.FreeBSD.org/handbook/synching.html ==== //depot/projects/ia64/bin/chio/chio.c#3 (text+ko) ==== @@ -38,10 +38,11 @@ #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1996 Jason R. Thorpe. All rights reserved."; -static const char rcsid[] = - "$FreeBSD: src/bin/chio/chio.c,v 1.22 2002/03/05 05:28:49 imp Exp $"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/bin/chio/chio.c,v 1.23 2002/03/24 14:56:55 markm Exp $"); + #include #include #include @@ -55,8 +56,6 @@ #include "defs.h" #include "pathnames.h" -extern char *__progname; /* from crt0.o */ - static void usage(void); static void cleanup(void); static u_int16_t parse_element_type(char *); @@ -248,7 +247,7 @@ usage: (void) fprintf(stderr, "usage: %s %s " - " [inv]\n", __progname, cname); + " [inv]\n", getprogname(), cname); return (1); } @@ -357,7 +356,7 @@ (void) fprintf(stderr, "usage: %s %s \n" " [ ] [inv1] [inv2]\n", - __progname, cname); + getprogname(), cname); return (1); } @@ -417,7 +416,7 @@ usage: (void) fprintf(stderr, "usage: %s %s [inv]\n", - __progname, cname); + getprogname(), cname); return (1); } @@ -460,7 +459,7 @@ return (0); usage: - (void) fprintf(stderr, "usage: %s %s\n", __progname, cname); + (void) fprintf(stderr, "usage: %s %s\n", getprogname(), cname); return (1); } @@ -488,7 +487,7 @@ return (0); usage: - (void) fprintf(stderr, "usage: %s %s\n", __progname, cname); + (void) fprintf(stderr, "usage: %s %s\n", getprogname(), cname); return (1); } @@ -516,7 +515,7 @@ return (0); usage: - (void) fprintf(stderr, "usage: %s %s \n", __progname, cname); + (void) fprintf(stderr, "usage: %s %s \n", getprogname(), cname); return (1); } @@ -733,7 +732,7 @@ usage: (void) fprintf(stderr, "usage: %s %s [-vVsSbaA] [ [ [] ] ]\n", - __progname, cname); + getprogname(), cname); return (1); } @@ -756,7 +755,7 @@ usage: (void) fprintf(stderr, "usage: %s %s []\n", - __progname, cname); + getprogname(), cname); return (1); } @@ -841,7 +840,7 @@ usage: (void) fprintf(stderr, "usage: %s %s [-fca] [ [] ]\n", - __progname, cname); + getprogname(), cname); return 1; } @@ -991,7 +990,7 @@ usage: (void) fprintf(stderr, "usage: %s %s " - " \n", __progname, cname); + " \n", getprogname(), cname); return(1); } @@ -1170,6 +1169,6 @@ usage(void) { (void)fprintf(stderr, "usage: %s [-f changer] command [-] " - "arg1 arg2 [arg3 [...]]\n", __progname); + "arg1 arg2 [arg3 [...]]\n", getprogname()); exit(1); } ==== //depot/projects/ia64/bin/df/df.c#4 (text+ko) ==== @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)df.c 8.9 (Berkeley) 5/8/95"; #else static const char rcsid[] = - "$FreeBSD: src/bin/df/df.c,v 1.36 2002/02/22 20:57:53 markm Exp $"; + "$FreeBSD: src/bin/df/df.c,v 1.37 2002/03/26 20:32:37 iedowse Exp $"; #endif #endif /* not lint */ @@ -91,6 +91,16 @@ #define TERA_SI_SZ (TERA_SZ(1000ULL)) #define PETA_SI_SZ (PETA_SZ(1000ULL)) +/* Maximum widths of various fields. */ +struct maxwidths { + int mntfrom; + int total; + int used; + int avail; + int iused; + int ifree; +}; + unsigned long long vals_si [] = {1, KILO_SI_SZ, MEGA_SI_SZ, GIGA_SI_SZ, TERA_SI_SZ, PETA_SI_SZ}; unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ}; unsigned long long *valp; @@ -102,28 +112,36 @@ int bread(off_t, void *, int); int checkvfsname(const char *, char **); char *getmntpt(char *); +int longwidth(long); char *makenetvfslist(void); char **makevfslist(char *); void prthuman(struct statfs *, long); void prthumanval(double); -void prtstat(struct statfs *, int); +void prtstat(struct statfs *, struct maxwidths *); long regetmntinfo(struct statfs **, long, char **); -int ufs_df(char *, int); +int ufs_df(char *, struct maxwidths *); unit_t unit_adjust(double *); +void update_maxwidths(struct maxwidths *, struct statfs *); void usage(void); int aflag = 0, hflag, iflag, nflag; struct ufs_args mdev; +static __inline int imax(int a, int b) +{ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 27 8:50:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F49037B42C; Wed, 27 Mar 2002 08:50:00 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A36EA37B431 for ; Wed, 27 Mar 2002 08:49:44 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2RGnie75403 for perforce@freebsd.org; Wed, 27 Mar 2002 08:49:44 -0800 (PST) (envelope-from cvance@tislabs.com) Date: Wed, 27 Mar 2002 08:49:44 -0800 (PST) Message-Id: <200203271649.g2RGnie75403@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 8505 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8505 Change 8505 by cvance@cvance_laptop on 2002/03/27 08:49:14 Added a brief description of SEBSD/SELinux/FLASK and a STATUS file to keep track of where we are. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#18 edit ... //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#14 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/README#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/STATUS#1 add Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#18 (text+ko) ==== @@ -36,6 +36,7 @@ options MAC_MLS options MAC_NONE options MAC_TE +#options SEBSD #Warning, won't boot without a policy options INET #InterNETworking #options INET6 ==== //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#14 (text+ko) ==== @@ -2993,6 +2993,7 @@ options MAC_MLS options MAC_NONE options MAC_TE +options SEBSD #Warning, won't boot without a policy ##################################################################### To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 27 12:56:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0F7A37B416; Wed, 27 Mar 2002 12:56:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 13A5A37B400 for ; Wed, 27 Mar 2002 12:56:50 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2RKunk33000 for perforce@freebsd.org; Wed, 27 Mar 2002 12:56:49 -0800 (PST) (envelope-from green@freebsd.org) Date: Wed, 27 Mar 2002 12:56:49 -0800 (PST) Message-Id: <200203272056.g2RKunk33000@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8516 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8516 Change 8516 by green@green_laptop_2 on 2002/03/27 12:55:52 Fix an inconsistency Adam Migus found between #ifdef MAC and #else code which resulted in panics due to M_PKTHDR not being set on mbufs it should have been. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#9 (text+ko) ==== @@ -926,6 +926,8 @@ mb_free(mb_list, m, type); return (NULL); #else + if (m != NULL) + m->m_flags = M_PKTHDR; return (m); #endif } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 27 16:27:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43D0D37B416; Wed, 27 Mar 2002 16:27:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C643437B404 for ; Wed, 27 Mar 2002 16:27:12 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2S0RCJ79830 for perforce@freebsd.org; Wed, 27 Mar 2002 16:27:12 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Wed, 27 Mar 2002 16:27:12 -0800 (PST) Message-Id: <200203280027.g2S0RCJ79830@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 8524 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8524 Change 8524 by tmm@tmm_sparc64 on 2002/03/27 16:26:22 It seems that this file should be kept in sync with aic7xxx_freebsd.h, so do this, and consitently use the original style (space after define) in both. Affected files ... ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx_osm.h#3 edit Differences ... ==== //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx_osm.h#3 (text+ko) ==== @@ -183,19 +183,19 @@ }; /********************************* Byte Order *********************************/ -#define ahc_htobe16(x) htobe16(x) -#define ahc_htobe32(x) htobe32(x) -#define ahc_htobe64(x) htobe64(x) -#define ahc_htole16(x) htole16(x) -#define ahc_htole32(x) htole32(x) -#define ahc_htole64(x) htole64(x) +#define ahc_htobe16(x) htobe16(x) +#define ahc_htobe32(x) htobe32(x) +#define ahc_htobe64(x) htobe64(x) +#define ahc_htole16(x) htole16(x) +#define ahc_htole32(x) htole32(x) +#define ahc_htole64(x) htole64(x) -#define ahc_be16toh(x) be16toh(x) -#define ahc_be32toh(x) be32toh(x) -#define ahc_be64toh(x) be64toh(x) -#define ahc_le16toh(x) le16toh(x) -#define ahc_le32toh(x) le32toh(x) -#define ahc_le64toh(x) le64toh(x) +#define ahc_be16toh(x) be16toh(x) +#define ahc_be32toh(x) be32toh(x) +#define ahc_be64toh(x) be64toh(x) +#define ahc_le16toh(x) le16toh(x) +#define ahc_le32toh(x) le32toh(x) +#define ahc_le64toh(x) le64toh(x) /***************************** Core Includes **********************************/ #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 27 18:49:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C30E37B41B; Wed, 27 Mar 2002 18:49:16 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A6DCE37B41A for ; Wed, 27 Mar 2002 18:49:15 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2S2nF312954 for perforce@freebsd.org; Wed, 27 Mar 2002 18:49:15 -0800 (PST) (envelope-from obrien@freebsd.org) Date: Wed, 27 Mar 2002 18:49:15 -0800 (PST) Message-Id: <200203280249.g2S2nF312954@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" Subject: PERFORCE change 8531 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8531 Change 8531 by obrien@obrien_trang on 2002/03/27 18:48:55 .OBJDIR, not .CURDIR (tested with and w/o `make obj' first) Affected files ... ... //depot/projects/sparc64/sys/boot/sparc64/loader/Makefile#19 edit Differences ... ==== //depot/projects/sparc64/sys/boot/sparc64/loader/Makefile#19 (text+ko) ==== @@ -58,7 +58,7 @@ LIBSTAND= -lstand .endif .endif -LIBOFW= ${.CURDIR}/../../ofw/libofw/libofw.a +LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ CFLAGS+= -I${.CURDIR}/../../ofw/libofw/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 27 20:20:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 980E037B417; Wed, 27 Mar 2002 20:20:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 275AA37B41B for ; Wed, 27 Mar 2002 20:20:07 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2S4K6G33829 for perforce@freebsd.org; Wed, 27 Mar 2002 20:20:06 -0800 (PST) (envelope-from obrien@freebsd.org) Date: Wed, 27 Mar 2002 20:20:06 -0800 (PST) Message-Id: <200203280420.g2S4K6G33829@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" Subject: PERFORCE change 8537 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8537 Change 8537 by obrien@obrien_trang on 2002/03/27 20:19:42 Add sysbeep() for the msmith RAID drivers. Affected files ... ... //depot/projects/sparc64/sys/sparc64/sparc64/clock.c#9 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/sparc64/clock.c#9 (text+ko) ==== @@ -28,11 +28,17 @@ #include #include +#include +#include +#include u_long tick_increment; u_long tick_freq; u_long tick_MHz; +struct mtx clock_lock; +static int beeping = 0; + void cpu_initclocks(void) { @@ -56,3 +62,24 @@ { TODO; } + +static void +sysbeepstop(void *chan) +{ +#warning sysbeepstop() needs filling in. + beeping = 0; +} + +int +sysbeep(int pitch, int period) +{ + /* + * XXX: function exists to enable RAID drivers to compile at the moment. + */ +#warning sysbeep() needs filling in. + mtx_lock_spin(&clock_lock); + timeout(sysbeepstop, (void *)NULL, period); + mtx_unlock_spin(&clock_lock); + + return (0); +} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Mar 27 20:33:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D2B137B416; Wed, 27 Mar 2002 20:33:24 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DDE8437B404 for ; Wed, 27 Mar 2002 20:33:23 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2S4XN335772 for perforce@freebsd.org; Wed, 27 Mar 2002 20:33:23 -0800 (PST) (envelope-from obrien@freebsd.org) Date: Wed, 27 Mar 2002 20:33:23 -0800 (PST) Message-Id: <200203280433.g2S4XN335772@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" Subject: PERFORCE change 8539 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8539 Change 8539 by obrien@obrien_trang on 2002/03/27 20:32:23 Don't be too fancy with null'ed out functions. Affected files ... ... //depot/projects/sparc64/sys/sparc64/sparc64/clock.c#10 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/sparc64/clock.c#10 (text+ko) ==== @@ -28,17 +28,12 @@ #include #include -#include -#include #include u_long tick_increment; u_long tick_freq; u_long tick_MHz; -struct mtx clock_lock; -static int beeping = 0; - void cpu_initclocks(void) { @@ -63,23 +58,11 @@ TODO; } -static void -sysbeepstop(void *chan) -{ -#warning sysbeepstop() needs filling in. - beeping = 0; -} - int sysbeep(int pitch, int period) { /* * XXX: function exists to enable RAID drivers to compile at the moment. */ -#warning sysbeep() needs filling in. - mtx_lock_spin(&clock_lock); - timeout(sysbeepstop, (void *)NULL, period); - mtx_unlock_spin(&clock_lock); - return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 28 1:53:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 170BF37B405; Thu, 28 Mar 2002 01:53:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6098337B400 for ; Thu, 28 Mar 2002 01:53:51 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2S9rpd05122 for perforce@freebsd.org; Thu, 28 Mar 2002 01:53:51 -0800 (PST) (envelope-from phk@freebsd.org) Date: Thu, 28 Mar 2002 01:53:51 -0800 (PST) Message-Id: <200203280953.g2S9rpd05122@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to phk@freebsd.org using -f From: Poul-Henning Kamp Subject: PERFORCE change 8548 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8548 Change 8548 by phk@phk_flat on 2002/03/28 01:53:42 IFC Affected files ... ... //depot/projects/sparc64/sys/geom/geom_bsd.c#5 integrate Differences ... ==== //depot/projects/sparc64/sys/geom/geom_bsd.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_bsd.c,v 1.6 2002/03/26 22:07:38 phk Exp $ + * $FreeBSD: src/sys/geom/geom_bsd.c,v 1.7 2002/03/27 21:16:49 phk Exp $ */ @@ -257,7 +257,7 @@ g_bsd_ledec_disklabel(buf + 64, dl); if (dl->d_magic == DISKMAGIC && dl->d_magic2 == DISKMAGIC && - g_bsd_lesum(dl, buf) == 0) + g_bsd_lesum(dl, buf + 64) == 0) error = 0; else error = ENOENT; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 28 6:59:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E63437B41C; Thu, 28 Mar 2002 06:58:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7564737B41B for ; Thu, 28 Mar 2002 06:58:41 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2SEwek03263 for perforce@freebsd.org; Thu, 28 Mar 2002 06:58:40 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 28 Mar 2002 06:58:40 -0800 (PST) Message-Id: <200203281458.g2SEwek03263@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8563 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8563 Change 8563 by jhb@jhb_laptop on 2002/03/28 06:58:04 Fix a suser_xxx() that snuck in with nmount(). Spotted by: rwatson Affected files ... ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#28 edit Differences ... ==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#28 (text+ko) ==== @@ -389,7 +389,7 @@ /* * Silently enforce MNT_NOSUID and MNT_NODEV for non-root users */ - if (suser_xxx(td->td_proc->p_ucred, 0, 0)) + if (suser(td, 0)) fsflags |= MNT_NOSUID | MNT_NODEV; /* * Get vnode to be covered To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 28 8: 4:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2863137B419; Thu, 28 Mar 2002 08:04:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 697EA37B416 for ; Thu, 28 Mar 2002 08:04:14 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2SG4Eu19291 for perforce@freebsd.org; Thu, 28 Mar 2002 08:04:14 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 28 Mar 2002 08:04:14 -0800 (PST) Message-Id: <200203281604.g2SG4Eu19291@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8567 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8567 Change 8567 by jhb@jhb_laptop on 2002/03/28 08:03:13 Fix more instances of suser_td(). Affected files ... ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#29 edit Differences ... ==== //depot/projects/smpng/sys/kern/vfs_syscalls.c#29 (text+ko) ==== @@ -374,7 +374,7 @@ } if (usermount == 0) { - error = suser_td(td); + error = suser(td, 0); if (error) goto bad; } @@ -382,7 +382,7 @@ * Do not allow NFS export by non-root users. */ if (fsflags & MNT_EXPORTED) { - error = suser_td(td); + error = suser(td, 0); if (error) goto bad; } @@ -423,7 +423,7 @@ * permitted to update it. */ if (mp->mnt_stat.f_owner != td->td_proc->p_ucred->cr_uid) { - error = suser_td(td); + error = suser(td, 0); if (error) { vput(vp); goto bad; @@ -461,7 +461,7 @@ goto bad; } if (va.va_uid != td->td_proc->p_ucred->cr_uid) { - error = suser_td(td); + error = suser(td, 0); if (error) { vput(vp); goto bad; @@ -484,7 +484,7 @@ linker_file_t lf; /* Only load modules for root (very important!) */ - error = suser_td(td); + error = suser(td, 0); if (error) { vput(vp); goto bad; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 28 9: 2:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F4B437B404; Thu, 28 Mar 2002 09:02:34 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8C64337B405 for ; Thu, 28 Mar 2002 09:02:33 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2SH2Xh33714 for perforce@freebsd.org; Thu, 28 Mar 2002 09:02:33 -0800 (PST) (envelope-from green@freebsd.org) Date: Thu, 28 Mar 2002 09:02:33 -0800 (PST) Message-Id: <200203281702.g2SH2Xh33714@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8572 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8572 Change 8572 by green@green_laptop_2 on 2002/03/28 09:02:01 Re-add 0xdeadc0de-filling support to free(9). Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#4 (text+ko) ==== @@ -116,6 +116,13 @@ {0, NULL}, }; +/* + * The WEIRD_ADDR is used as known text to copy into free objects so + * that modifications after frees can be detected. + */ +#define WEIRD_ADDR 0xdeadc0de +#define MAX_COPY 64 + static struct mtx malloc_mtx; u_int vm_kmem_size; @@ -198,6 +205,24 @@ } /* + * Copy in known text to make the memory look free. + */ +static __inline void +trash_mem(void *addr, size_t size) +{ +#ifdef INVARIANTS + uint32_t *ip; + + ip = (uint32_t *)addr; + size = size >= MAX_COPY ? MAX_COPY : size & ~sizeof(uint32_t); + while (size != 0) { + *ip++ = WEIRD_ADDR; + size -= sizeof(uint32_t); + } +#endif +} + +/* * free: * * Free a block of memory allocated by malloc. @@ -230,9 +255,11 @@ if (!(slab->us_flags & UMA_SLAB_MALLOC)) { size = slab->us_zone->uz_size; + trash_mem(addr, size); uma_zfree_arg(slab->us_zone, addr, slab); } else { size = slab->us_size; + trash_mem(addr, size); uma_large_free(slab); } /* mtx_lock(&malloc_mtx); XXX */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 28 9:11:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E40C37B417; Thu, 28 Mar 2002 09:10:12 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 35A6D37B400 for ; Thu, 28 Mar 2002 09:09:43 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2SH9g038754 for perforce@freebsd.org; Thu, 28 Mar 2002 09:09:42 -0800 (PST) (envelope-from green@freebsd.org) Date: Thu, 28 Mar 2002 09:09:42 -0800 (PST) Message-Id: <200203281709.g2SH9g038754@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8574 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8574 Change 8574 by green@green_laptop_2 on 2002/03/28 09:09:26 Turn struct vnode {}'s v_op field from a vop_t ** to a vop_t ***. Previously, it pointed to the actual vfs_init.c-generated operation vector being used. However, this vector could be redone at runtime via introduction of new vnode operations and removal of old ones; this would result in the old vnode operation vector being freed from underneath. This didn't show up before since the old kernel malloc(9) coincidentally kept the old vop_t ** in the vnodes valid. Jeff Roberson's UMA commit made this bug apparent due to differently-sized chunks of memory actually being likely to be allocated in different spots than previously allocated at even if the size was grown just by a few bytes. The new vop_t *** actually points to the operation vector pointer the kernel uses and modifies on-the-fly so that old vnodes, and new ones created with getnewvnode(), both call the correct operations. Getnewvnode()'s vop_t **vops argument changes to a vop_t *** to reflect this. Affected files ... ... //depot/projects/trustedbsd/mac/sys/coda/coda_vnops.c#5 edit ... //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#12 edit ... //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#4 edit ... //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#6 edit ... //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_denode.c#4 edit ... //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#6 edit ... //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_subr.c#2 edit ... //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vfsops.c#4 edit ... //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#3 edit ... //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_node.c#4 edit ... //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vfsops.c#5 edit ... //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vnops.c#6 edit ... //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vncache.c#5 edit ... //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_node.c#5 edit ... //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_subr.c#3 edit ... //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_vnops.c#3 edit ... //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_subr.c#6 edit ... //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vfsops.c#5 edit ... //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#4 edit ... //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vfsops.c#5 edit ... //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#5 edit ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#122 edit ... //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#20 edit ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_node.c#4 edit ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_subs.c#5 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs.h#3 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs_subr.c#3 edit ... //depot/projects/trustedbsd/mac/sys/sys/vnode.h#19 edit ... //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#9 edit ... //depot/projects/trustedbsd/mac/sys/ufs/ifs/ifs_vfsops.c#4 edit ... //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#30 edit ... //depot/projects/trustedbsd/mac/sys/vm/vm_swap.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/coda/coda_vnops.c#5 (text+ko) ==== @@ -578,7 +578,7 @@ * Make sure this is a coda style cnode, but it may be a * different vfsp */ - if (tvp->v_op != coda_vnodeop_p) { + if (tvp->v_op != &coda_vnodeop_p) { vrele(tvp); NDFREE(&ndp, NDF_ONLY_PNBUF); MARK_INT_FAIL(CODA_IOCTL_STATS); @@ -1959,7 +1959,7 @@ lockinit(&cp->c_lock, PINOD, "cnode", 0, 0); cp->c_fid = *fid; - err = getnewvnode(VT_CODA, vfsp, coda_vnodeop_p, &vp); + err = getnewvnode(VT_CODA, vfsp, &coda_vnodeop_p, &vp); if (err) { panic("coda: getnewvnode returned error %d\n", err); } ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#12 (text+ko) ==== @@ -143,7 +143,7 @@ } else { dev = NODEV; } - error = getnewvnode(VT_DEVFS, mp, devfs_vnodeop_p, &vp); + error = getnewvnode(VT_DEVFS, mp, &devfs_vnodeop_p, &vp); if (error != 0) { printf("devfs_allocv: failed to allocate new vnode\n"); return (error); @@ -152,7 +152,7 @@ if (de->de_dirent->d_type == DT_CHR) { vp->v_type = VCHR; vp = addaliasu(vp, dev->si_udev); - vp->v_op = devfs_specop_p; + vp->v_op = &devfs_specop_p; } else if (de->de_dirent->d_type == DT_DIR) { vp->v_type = VDIR; } else if (de->de_dirent->d_type == DT_LNK) { ==== //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#4 (text+ko) ==== @@ -135,7 +135,7 @@ */ MALLOC(fd, struct fdescnode *, sizeof(struct fdescnode), M_TEMP, M_WAITOK); - error = getnewvnode(VT_FDESC, mp, fdesc_vnodeop_p, vpp); + error = getnewvnode(VT_FDESC, mp, &fdesc_vnodeop_p, vpp); if (error) { FREE(fd, M_TEMP); goto out; ==== //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#6 (text+ko) ==== @@ -496,7 +496,7 @@ MALLOC(hp, struct hpfsnode *, sizeof(struct hpfsnode), M_HPFSNO, M_WAITOK); - error = getnewvnode(VT_HPFS, hpmp->hpm_mp, hpfs_vnodeop_p, &vp); + error = getnewvnode(VT_HPFS, hpmp->hpm_mp, &hpfs_vnodeop_p, &vp); if (error) { printf("hpfs_vget: can't get new vnode\n"); FREE(hp, M_HPFSNO); ==== //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_denode.c#4 (text+ko) ==== @@ -253,7 +253,7 @@ * copy it from the passed disk buffer. */ /* getnewvnode() does a VREF() on the vnode */ - error = getnewvnode(VT_MSDOSFS, mntp, msdosfs_vnodeop_p, &nvp); + error = getnewvnode(VT_MSDOSFS, mntp, &msdosfs_vnodeop_p, &nvp); if (error) { *depp = NULL; FREE(ldep, M_MSDOSFSNODE); ==== //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#6 (text+ko) ==== @@ -732,7 +732,7 @@ return (0); } - error = getnewvnode(VT_NTFS, ntmp->ntm_mountp, ntfs_vnodeop_p, &vp); + error = getnewvnode(VT_NTFS, ntmp->ntm_mountp, &ntfs_vnodeop_p, &vp); if(error) { ntfs_frele(fp); ntfs_ntput(ip); ==== //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_subr.c#2 (text+ko) ==== @@ -176,7 +176,7 @@ MALLOC(xp, struct null_node *, sizeof(struct null_node), M_NULLFSNODE, M_WAITOK); - error = getnewvnode(VT_NULL, mp, null_vnodeop_p, vpp); + error = getnewvnode(VT_NULL, mp, &null_vnodeop_p, vpp); if (error) { FREE(xp, M_NULLFSNODE); return (error); @@ -307,7 +307,7 @@ * Can't do this check because vop_reclaim runs * with a funny vop vector. */ - if (vp->v_op != null_vnodeop_p) { + if (vp->v_op != &null_vnodeop_p) { printf ("null_checkvp: on non-null-node\n"); while (null_checkvp_barrier) /*WAIT*/ ; panic("null_checkvp"); ==== //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vfsops.c#4 (text+ko) ==== @@ -121,7 +121,7 @@ * Unlock lower node to avoid deadlock. * (XXX) VOP_ISLOCKED is needed? */ - if ((mp->mnt_vnodecovered->v_op == null_vnodeop_p) && + if ((mp->mnt_vnodecovered->v_op == &null_vnodeop_p) && VOP_ISLOCKED(mp->mnt_vnodecovered, NULL)) { VOP_UNLOCK(mp->mnt_vnodecovered, 0, td); isvnunlocked = 1; ==== //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#3 (text+ko) ==== @@ -280,7 +280,7 @@ * that aren't. (We must always map first vp or vclean fails.) */ if (i && (*this_vp_p == NULLVP || - (*this_vp_p)->v_op != null_vnodeop_p)) { + (*this_vp_p)->v_op != &null_vnodeop_p)) { old_vps[i] = NULLVP; } else { old_vps[i] = *this_vp_p; ==== //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_node.c#4 (text+ko) ==== @@ -170,7 +170,7 @@ * elsewhere if MALLOC should block. */ MALLOC(np, struct nwnode *, sizeof *np, M_NWNODE, M_WAITOK | M_ZERO); - error = getnewvnode(VT_NWFS, mp, nwfs_vnodeop_p, &vp); + error = getnewvnode(VT_NWFS, mp, &nwfs_vnodeop_p, &vp); if (error) { *vpp = NULL; FREE(np, M_NWNODE); ==== //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vfsops.c#5 (text+ko) ==== @@ -118,7 +118,7 @@ MALLOC(fmp, struct portalmount *, sizeof(struct portalmount), M_PORTALFSMNT, M_WAITOK); /* XXX */ - error = getnewvnode(VT_PORTAL, mp, portal_vnodeop_p, &rvp); /* XXX */ + error = getnewvnode(VT_PORTAL, mp, &portal_vnodeop_p, &rvp); /* XXX */ if (error) { FREE(fmp, M_PORTALFSMNT); FREE(pn, M_TEMP); ==== //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vnops.c#6 (text+ko) ==== @@ -135,7 +135,7 @@ MALLOC(pt, struct portalnode *, sizeof(struct portalnode), M_TEMP, M_WAITOK); - error = getnewvnode(VT_PORTAL, dvp->v_mount, portal_vnodeop_p, &fvp); + error = getnewvnode(VT_PORTAL, dvp->v_mount, &portal_vnodeop_p, &fvp); if (error) { FREE(pt, M_TEMP); goto bad; ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vncache.c#5 (text+ko) ==== @@ -132,7 +132,7 @@ MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, M_WAITOK); if (++pfs_vncache_entries > pfs_vncache_maxentries) pfs_vncache_maxentries = pfs_vncache_entries; - error = getnewvnode(VT_PSEUDOFS, mp, pfs_vnodeop_p, vpp); + error = getnewvnode(VT_PSEUDOFS, mp, &pfs_vnodeop_p, vpp); if (error) return (error); pvd->pvd_pn = pn; ==== //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_node.c#5 (text+ko) ==== @@ -220,7 +220,7 @@ return ENOENT; MALLOC(np, struct smbnode *, sizeof *np, M_SMBNODE, M_WAITOK); - error = getnewvnode(VT_SMBFS, mp, smbfs_vnodeop_p, &vp); + error = getnewvnode(VT_SMBFS, mp, &smbfs_vnodeop_p, &vp); if (error) { FREE(np, M_SMBNODE); return error; ==== //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_subr.c#3 (text+ko) ==== @@ -212,7 +212,7 @@ MALLOC(xp, struct umap_node *, sizeof(struct umap_node), M_TEMP, M_WAITOK); - error = getnewvnode(VT_UMAP, mp, umap_vnodeop_p, vpp); + error = getnewvnode(VT_UMAP, mp, &umap_vnodeop_p, vpp); if (error) { FREE(xp, M_TEMP); return (error); @@ -311,7 +311,7 @@ * Can't do this check because vop_reclaim runs * with funny vop vector. */ - if (vp->v_op != umap_vnodeop_p) { + if (vp->v_op != &umap_vnodeop_p) { printf ("umap_checkvp: on non-umap-node\n"); while (umap_checkvp_barrier) /*WAIT*/ ; panic("umap_checkvp"); ==== //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_vnops.c#3 (text+ko) ==== @@ -125,7 +125,7 @@ * that aren't. (Must map first vp or vclean fails.) */ - if (i && (*this_vp_p)->v_op != umap_vnodeop_p) { + if (i && (*this_vp_p)->v_op != &umap_vnodeop_p) { old_vps[i] = NULL; } else { old_vps[i] = *this_vp_p; ==== //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_subr.c#6 (text+ko) ==== @@ -545,7 +545,7 @@ * Create new node rather then replace old node */ - error = getnewvnode(VT_UNION, mp, union_vnodeop_p, vpp); + error = getnewvnode(VT_UNION, mp, &union_vnodeop_p, vpp); if (error) { /* * If an error occurs clear out vnodes. @@ -1216,7 +1216,7 @@ { struct union_node *un; - if (vp->v_op != union_vnodeop_p) { + if (vp->v_op != &union_vnodeop_p) { if (vppp) { VREF(vp); *(*vppp)++ = vp; @@ -1299,7 +1299,7 @@ { int error = 0; - if ((*vp)->v_op == union_vnodeop_p) { + if ((*vp)->v_op == &union_vnodeop_p) { struct vnode *lvp; lvp = union_dircache(*vp, td); ==== //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vfsops.c#5 (text+ko) ==== @@ -126,7 +126,7 @@ /* * Unlock lower node to avoid deadlock. */ - if (lowerrootvp->v_op == union_vnodeop_p) + if (lowerrootvp->v_op == &union_vnodeop_p) VOP_UNLOCK(lowerrootvp, 0, td); #endif @@ -140,7 +140,7 @@ error = namei(ndp); #if 0 - if (lowerrootvp->v_op == union_vnodeop_p) + if (lowerrootvp->v_op == &union_vnodeop_p) vn_lock(lowerrootvp, LK_EXCLUSIVE | LK_RETRY, td); #endif if (error) ==== //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#4 (text+ko) ==== @@ -1319,7 +1319,7 @@ * replace the fdvp, release the original one and ref the new one. */ - if (fdvp->v_op == union_vnodeop_p) { /* always true */ + if (fdvp->v_op == &union_vnodeop_p) { /* always true */ struct union_node *un = VTOUNION(fdvp); if (un->un_uppervp == NULLVP) { /* @@ -1341,7 +1341,7 @@ * replace the fvp, release the original one and ref the new one. */ - if (fvp->v_op == union_vnodeop_p) { /* always true */ + if (fvp->v_op == &union_vnodeop_p) { /* always true */ struct union_node *un = VTOUNION(fvp); #if 0 struct union_mount *um = MOUNTTOUNIONMOUNT(fvp->v_mount); @@ -1399,7 +1399,7 @@ * reference. */ - if (tdvp->v_op == union_vnodeop_p) { + if (tdvp->v_op == &union_vnodeop_p) { struct union_node *un = VTOUNION(tdvp); if (un->un_uppervp == NULLVP) { @@ -1429,7 +1429,7 @@ * file and change tvp to NULL. */ - if (tvp != NULLVP && tvp->v_op == union_vnodeop_p) { + if (tvp != NULLVP && tvp->v_op == &union_vnodeop_p) { struct union_node *un = VTOUNION(tvp); tvp = union_lock_upper(un, ap->a_tcnp->cn_thread); ==== //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vfsops.c#5 (text+ko) ==== @@ -1029,7 +1029,7 @@ MALLOC(ip, struct inode *, sizeof(struct inode), M_EXT2NODE, M_WAITOK); /* Allocate a new vnode/inode. */ - if ((error = getnewvnode(VT_UFS, mp, ext2_vnodeop_p, &vp)) != 0) { + if ((error = getnewvnode(VT_UFS, mp, &ext2_vnodeop_p, &vp)) != 0) { if (ext2fs_inode_hash_lock < 0) wakeup(&ext2fs_inode_hash_lock); ext2fs_inode_hash_lock = 0; ==== //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#5 (text+ko) ==== @@ -705,7 +705,7 @@ return (0); /* Allocate a new vnode/iso_node. */ - if ((error = getnewvnode(VT_ISOFS, mp, cd9660_vnodeop_p, &vp)) != 0) { + if ((error = getnewvnode(VT_ISOFS, mp, &cd9660_vnodeop_p, &vp)) != 0) { *vpp = NULLVP; return (error); } @@ -852,11 +852,11 @@ */ switch (vp->v_type = IFTOVT(ip->inode.iso_mode)) { case VFIFO: - vp->v_op = cd9660_fifoop_p; + vp->v_op = &cd9660_fifoop_p; break; case VCHR: case VBLK: - vp->v_op = cd9660_specop_p; + vp->v_op = &cd9660_specop_p; vp = addaliasu(vp, ip->inode.iso_rdev); ip->i_vnode = vp; break; ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#122 (text+ko) ==== @@ -90,9 +90,9 @@ #if MAC_MAX_POLICIES > 32 #error "MAC_MAX_POLICIES too large" #endif -static const unsigned int mac_max_policies = MAC_MAX_POLICIES; -static unsigned int mac_policies_free = (1 << MAC_MAX_POLICIES) - 1; -SYSCTL_INT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD, +static unsigned int mac_max_policies = MAC_MAX_POLICIES; +static unsigned int mac_policies_free = (1 << MAC_MAX_POLICIES) - 1; +SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD, &mac_max_policies, 0, ""); struct maclabels { void *labels[MAC_MAX_POLICIES]; @@ -149,9 +149,9 @@ error = 0; \ sx_slock(&mac_policy_list_lock); \ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ - if (mpc->mpc_ops->mpo_ ## check != NULL) \ + if (mpc->mpc_ops.mpo_ ## check != NULL) \ error = error_select( \ - mpc->mpc_ops->mpo_ ## check (## args), \ + mpc->mpc_ops.mpo_ ## check (## args), \ error); \ } \ sx_sunlock(&mac_policy_list_lock); \ @@ -170,9 +170,9 @@ \ sx_slock(&mac_policy_list_lock); \ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ - if (mpc->mpc_ops->mpo_ ## operation != NULL) \ + if (mpc->mpc_ops.mpo_ ## operation != NULL) \ result = result composition \ - mpc->mpc_ops->mpo_ ## operation ( ## args); \ + mpc->mpc_ops.mpo_ ## operation ( ## args); \ } \ sx_sunlock(&mac_policy_list_lock); \ } while (0) @@ -186,8 +186,8 @@ \ sx_slock(&mac_policy_list_lock); \ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ - if (mpc->mpc_ops->mpo_ ## operation != NULL) \ - mpc->mpc_ops->mpo_ ## operation (## args); \ + if (mpc->mpc_ops.mpo_ ## operation != NULL) \ + mpc->mpc_ops.mpo_ ## operation (## args); \ } \ sx_sunlock(&mac_policy_list_lock); \ } while (0) @@ -236,8 +236,250 @@ mac_policy_register(struct mac_policy_conf *mpc) { struct mac_policy_conf *tmpc; + struct mac_policy_op_entry *mpe; int slot; + for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) { + switch (mpe->mpe_constant) { + case MAC_DESTROY: + mpc->mpc_ops.mpo_destroy = mpe->mpe_function; + break; + case MAC_INIT: + mpc->mpc_ops.mpo_init = mpe->mpe_function; + break; + case MAC_COPY_LABEL: + mpc->mpc_ops.mpo_copy_label = mpe->mpe_function; + break; + case MAC_DOMINATE: + mpc->mpc_ops.mpo_dominate = mpe->mpe_function; + break; + case MAC_EQUAL: + mpc->mpc_ops.mpo_equal = mpe->mpe_function; + break; + case MAC_PRINT_LABEL: + mpc->mpc_ops.mpo_print_label = mpe->mpe_function; + break; + case MAC_VALIDATE_LABEL: + mpc->mpc_ops.mpo_validate_label = mpe->mpe_function; + break; + case MAC_CREATE_DEVFS_DEVICE: + mpc->mpc_ops.mpo_create_devfs_device = + mpe->mpe_function; + break; + case MAC_CREATE_DEVFS_DIRECTORY: + mpc->mpc_ops.mpo_create_devfs_directory = + mpe->mpe_function; + break; + case MAC_CREATE_VNODE_FROM_VNODE: + mpc->mpc_ops.mpo_create_vnode_from_vnode = + mpe->mpe_function; + break; + case MAC_CREATE_MOUNT: + mpc->mpc_ops.mpo_create_mount = mpe->mpe_function; + break; + case MAC_CREATE_ROOT_MOUNT: + mpc->mpc_ops.mpo_create_root_mount = mpe->mpe_function; + break; + case MAC_CREATE_MBUF_FROM_SOCKET: + mpc->mpc_ops.mpo_create_mbuf_from_socket = + mpe->mpe_function; + break; + case MAC_CREATE_SOCKET: + mpc->mpc_ops.mpo_create_socket = mpe->mpe_function; + break; + case MAC_RELABEL_SOCKET: + mpc->mpc_ops.mpo_relabel_socket = mpe->mpe_function; + break; + case MAC_CREATE_BPFDESC: + mpc->mpc_ops.mpo_create_bpfdesc = mpe->mpe_function; + break; + case MAC_CREATE_IFNET: + mpc->mpc_ops.mpo_create_ifnet = mpe->mpe_function; + break; + case MAC_CREATE_MBUF_DATAGRAM_FROM_MBUF_FRAGMENTQUEUE: + mpc->mpc_ops.mpo_create_mbuf_datagram_from_mbuf_fragmentqueue = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_FRAGMENT_FROM_MBUF: + mpc->mpc_ops.mpo_create_mbuf_fragment_from_mbuf = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT: + mpc->mpc_ops.mpo_create_mbuf_fragmentqueue_from_mbuf_fragment = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_FROM_MBUF: + mpc->mpc_ops.mpo_create_mbuf_from_mbuf = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET: + mpc->mpc_ops.mpo_create_mbuf_linklayer_for_ifnet = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_FROM_BPFDESC: + mpc->mpc_ops.mpo_create_mbuf_from_bpfdesc = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_FROM_IFNET: + mpc->mpc_ops.mpo_create_mbuf_from_ifnet = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF: + mpc->mpc_ops.mpo_create_mbuf_multicast_encap_from_mbuf = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_NETLAYER_FROM_MBUF: + mpc->mpc_ops.mpo_create_mbuf_netlayer_from_mbuf = + mpe->mpe_function; + break; + case MAC_MBUF_FRAGMENT_MATCHES_MBUF_FRAGMENTQUEUE: + mpc->mpc_ops.mpo_mbuf_fragment_matches_mbuf_fragmentqueue = + mpe->mpe_function; + break; + case MAC_RELABEL_IFNET: + mpc->mpc_ops.mpo_relabel_ifnet = mpe->mpe_function; + break; + case MAC_UPDATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT: + mpc->mpc_ops.mpo_update_mbuf_fragmentqueue_from_mbuf_fragment = + mpe->mpe_function; + break; + case MAC_CREATE_SUBJECT: + mpc->mpc_ops.mpo_create_subject = mpe->mpe_function; + break; + case MAC_EXECVE_TRANSITION: + mpc->mpc_ops.mpo_execve_transition = mpe->mpe_function; + break; + case MAC_EXECVE_WILL_TRANSITION: + mpc->mpc_ops.mpo_execve_will_transition = + mpe->mpe_function; + break; + case MAC_CREATE_PROC0: + mpc->mpc_ops.mpo_create_proc0 = mpe->mpe_function; + break; + case MAC_CREATE_PROC1: + mpc->mpc_ops.mpo_create_proc1 = mpe->mpe_function; + break; + case MAC_RELABEL_SUBJECT: + mpc->mpc_ops.mpo_relabel_subject = + mpe->mpe_function; + break; + case MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET: + mpc->mpc_ops.mpo_bpfdesc_check_receive_from_ifnet = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_SEE_CRED: + mpc->mpc_ops.mpo_cred_check_see_cred = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_SEE_SOCKET: + mpc->mpc_ops.mpo_cred_check_see_socket = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_RELABEL_IFNET: + mpc->mpc_ops.mpo_cred_check_relabel_ifnet = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_RELABEL_SOCKET: + mpc->mpc_ops.mpo_cred_check_relabel_socket = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_RELABEL_SUBJECT: + mpc->mpc_ops.mpo_cred_check_relabel_subject = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_RELABEL_VNODE: + mpc->mpc_ops.mpo_cred_check_relabel_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_STATFS: + mpc->mpc_ops.mpo_cred_check_statfs = mpe->mpe_function; + break; + case MAC_CRED_CHECK_DEBUG_PROC: + mpc->mpc_ops.mpo_cred_check_debug_proc = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_EXEC_FILE: + mpc->mpc_ops.mpo_cred_check_exec_file = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_CHDIR_VNODE: + mpc->mpc_ops.mpo_cred_check_chdir_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_CREATE_VNODE: + mpc->mpc_ops.mpo_cred_check_create_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_DELETE_VNODE: + mpc->mpc_ops.mpo_cred_check_delete_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_EXEC_VNODE: + mpc->mpc_ops.mpo_cred_check_exec_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_OPEN_VNODE: + mpc->mpc_ops.mpo_cred_check_open_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_RENAME_FROM_VNODE: + mpc->mpc_ops.mpo_cred_check_rename_from_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_RENAME_TO_VNODE: + mpc->mpc_ops.mpo_cred_check_rename_to_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_REVOKE_VNODE: + mpc->mpc_ops.mpo_cred_check_revoke_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_SEARCH_VNODE: + mpc->mpc_ops.mpo_cred_check_search_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_SETFLAGS_VNODE: + mpc->mpc_ops.mpo_cred_check_setflags_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_SETMODE_VNODE: + mpc->mpc_ops.mpo_cred_check_setmode_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_SETOWNER_VNODE: + mpc->mpc_ops.mpo_cred_check_setowner_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_SETUTIMES_VNODE: + mpc->mpc_ops.mpo_cred_check_setutimes_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_SCHED_PROC: + mpc->mpc_ops.mpo_cred_check_sched_proc = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_SIGNAL_PROC: + mpc->mpc_ops.mpo_cred_check_signal_proc = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_STAT_VNODE: + mpc->mpc_ops.mpo_cred_check_stat_vnode = + mpe->mpe_function; + break; + case MAC_IFNET_CHECK_SEND_MBUF: + mpc->mpc_ops.mpo_ifnet_check_send_mbuf = + mpe->mpe_function; + break; + case MAC_SOCKET_CHECK_RECEIVE_MBUF: + mpc->mpc_ops.mpo_socket_check_receive_mbuf = + mpe->mpe_function; + break; + default: + printf("MAC policy `%s': unknown operation %d\n", + mpc->mpc_name, mpe->mpe_constant); + return (EINVAL); + } + } sx_xlock(&mac_policy_list_lock); LIST_FOREACH(tmpc, &mac_policy_list, mpc_list) { if (strcmp(tmpc->mpc_name, mpc->mpc_name) == 0) { @@ -249,7 +491,7 @@ slot = ffs(mac_policies_free); if (slot == 0) { sx_xunlock(&mac_policy_list_lock); - return (EEXIST); + return (ENOMEM); } slot--; mac_policies_free &= ~(1 << slot); @@ -261,8 +503,8 @@ printf("Security policy: %s (%s)\n", mpc->mpc_fullname, mpc->mpc_name); /* Per-policy initialization. */ - if (mpc->mpc_ops->mpo_init != NULL) - (*(mpc->mpc_ops->mpo_init))(mpc); + if (mpc->mpc_ops.mpo_init != NULL) + (*(mpc->mpc_ops.mpo_init))(mpc); sx_xunlock(&mac_policy_list_lock); return (0); @@ -278,8 +520,8 @@ if (mpc->mpc_field_off != -1) return (EBUSY); sx_xlock(&mac_policy_list_lock); - if (mpc->mpc_ops->mpo_destroy != NULL) - (*(mpc->mpc_ops->mpo_destroy))(mpc); + if (mpc->mpc_ops.mpo_destroy != NULL) + (*(mpc->mpc_ops.mpo_destroy))(mpc); LIST_REMOVE(mpc, mpc_list); sx_xunlock(&mac_policy_list_lock); ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#20 (text+ko) ==== @@ -677,7 +677,7 @@ getnewvnode(tag, mp, vops, vpp) enum vtagtype tag; struct mount *mp; - vop_t **vops; + vop_t ***vops; struct vnode **vpp; { int s; @@ -1552,7 +1552,7 @@ } if (vfinddev(dev, VCHR, vpp)) return (0); - error = getnewvnode(VT_NON, (struct mount *)0, spec_vnodeop_p, &nvp); + error = getnewvnode(VT_NON, (struct mount *)0, &spec_vnodeop_p, &nvp); if (error) { *vpp = NULLVP; return (error); @@ -1578,7 +1578,7 @@ udev_t nvp_rdev; { struct vnode *ovp; - vop_t **ops; + vop_t ***ops; dev_t dev; if (nvp->v_type == VBLK) @@ -1952,7 +1952,7 @@ vgonel(vp, td); } else { vclean(vp, 0, td); - vp->v_op = spec_vnodeop_p; + vp->v_op = &spec_vnodeop_p; insmntque(vp, (struct mount *) 0); } mtx_lock(&mntvnode_mtx); @@ -2108,7 +2108,7 @@ /* * Done with purge, notify sleepers of the grim news. */ - vp->v_op = dead_vnodeop_p; + vp->v_op = &dead_vnodeop_p; if (vp->v_pollinfo != NULL) vn_pollgone(vp); vp->v_tag = VT_NON; @@ -2847,7 +2847,7 @@ int error; /* Allocate a new vnode */ - if ((error = getnewvnode(VT_VFS, mp, sync_vnodeop_p, &vp)) != 0) { + if ((error = getnewvnode(VT_VFS, mp, &sync_vnodeop_p, &vp)) != 0) { mp->mnt_syncer = NULL; return (error); } ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_node.c#4 (text+ko) ==== @@ -223,7 +223,7 @@ */ np = uma_zalloc(nfsnode_zone, M_WAITOK); - error = getnewvnode(VT_NFS, mntp, nfsv2_vnodeop_p, &nvp); + error = getnewvnode(VT_NFS, mntp, &nfsv2_vnodeop_p, &nvp); if (error) { if (nfs_node_hash_lock < 0) wakeup(&nfs_node_hash_lock); ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_subs.c#5 (text+ko) ==== @@ -527,10 +527,10 @@ if (vp->v_type != vtyp) { vp->v_type = vtyp; if (vp->v_type == VFIFO) { - vp->v_op = fifo_nfsv2nodeop_p; + vp->v_op = &fifo_nfsv2nodeop_p; } if (vp->v_type == VCHR || vp->v_type == VBLK) { - vp->v_op = spec_nfsv2nodeop_p; + vp->v_op = &spec_nfsv2nodeop_p; vp = addaliasu(vp, rdev); np->n_vnode = vp; } ==== //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs.h#3 (text+ko) ==== @@ -103,7 +103,7 @@ #define VTOLOMAC(vp) ((struct lomac_node *)(vp)->v_data) #define VTOLVP(vp) VTOLOMAC(vp)->ln_lowervp #define VFSTOLOMAC(mp) ((struct lomac_mount *)mp->mnt_data) -#define VISLOMAC(vp) (vp->v_op == lomacfs_vnodeop_p) +#define VISLOMAC(vp) (vp->v_op == &lomacfs_vnodeop_p) int lomacfs_node_alloc(struct mount *mp, struct componentname *cnp, struct vnode *dvp, struct vnode *lowervp, struct vnode **vpp); ==== //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs_subr.c#3 (text+ko) ==== @@ -73,7 +73,7 @@ return (EEXIST); } } - error = getnewvnode(VT_NULL, mp, lomacfs_vnodeop_p, vpp); + error = getnewvnode(VT_NULL, mp, &lomacfs_vnodeop_p, vpp); if (error) { vput(lowervp); free(lp, M_LOMACFS); ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#19 (text+ko) ==== @@ -105,7 +105,7 @@ int v_holdcnt; /* page & buffer references */ u_long v_id; /* capability identifier */ struct mount *v_mount; /* ptr to vfs we are in */ - vop_t **v_op; /* vnode operations vector */ + vop_t ***v_op; /* vnode operations vector */ TAILQ_ENTRY(vnode) v_freelist; /* vnode freelist */ TAILQ_ENTRY(vnode) v_nmntvnodes; /* vnodes for mount point */ struct buflists v_cleanblkhd; /* clean blocklist head */ @@ -527,7 +527,7 @@ /* * This call works for vnodes in the kernel. */ -#define VCALL(VP,OFF,AP) VOCALL((VP)->v_op,(OFF),(AP)) +#define VCALL(VP,OFF,AP) VOCALL(*(VP)->v_op,(OFF),(AP)) #define VDESC(OP) (& __CONCAT(OP,_desc)) #define VOFFSET(OP) (VDESC(OP)->vdesc_offset) @@ -583,7 +583,7 @@ void cvtstat(struct stat *st, struct ostat *ost); void cvtnstat(struct stat *sb, struct nstat *nsb); int getnewvnode(enum vtagtype tag, - struct mount *mp, vop_t **vops, struct vnode **vpp); + struct mount *mp, vop_t ***vops, struct vnode **vpp); int lease_check(struct vop_lease_args *ap); int spec_vnoperate(struct vop_generic_args *); int speedup_syncer(void); ==== //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#9 (text+ko) ==== @@ -1192,7 +1192,7 @@ ump->um_malloctype, M_WAITOK); /* Allocate a new vnode/inode. */ - error = getnewvnode(VT_UFS, mp, ffs_vnodeop_p, &vp); + error = getnewvnode(VT_UFS, mp, &ffs_vnodeop_p, &vp); if (error) { /* * Do not wake up processes while holding the mutex, ==== //depot/projects/trustedbsd/mac/sys/ufs/ifs/ifs_vfsops.c#4 (text+ko) ==== @@ -201,7 +201,7 @@ ump->um_malloctype, M_WAITOK); /* Allocate a new vnode/inode. */ - error = getnewvnode(VT_UFS, mp, ifs_vnodeop_p, &vp); + error = getnewvnode(VT_UFS, mp, &ifs_vnodeop_p, &vp); if (error) { /* * Do not wake up processes while holding the mutex, ==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#30 (text+ko) ==== @@ -2208,12 +2208,12 @@ switch(vp->v_type = IFTOVT(ip->i_mode)) { case VCHR: case VBLK: - vp->v_op = specops; + vp->v_op = &specops; vp = addaliasu(vp, ip->i_rdev); ip->i_vnode = vp; break; case VFIFO: - vp->v_op = fifoops; + vp->v_op = &fifoops; break; default: break; ==== //depot/projects/trustedbsd/mac/sys/vm/vm_swap.c#5 (text+ko) ==== @@ -263,7 +263,7 @@ u_long aligned_nblks; if (!swapdev_vp) { - error = getnewvnode(VT_NON, NULL, swapdev_vnodeop_p, + error = getnewvnode(VT_NON, NULL, &swapdev_vnodeop_p, &swapdev_vp); if (error) panic("Cannot get vnode for swapdev"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 28 9:14:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F001937B41A; Thu, 28 Mar 2002 09:13:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A525F37B417 for ; Thu, 28 Mar 2002 09:13:48 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2SHDm939906 for perforce@freebsd.org; Thu, 28 Mar 2002 09:13:48 -0800 (PST) (envelope-from green@freebsd.org) Date: Thu, 28 Mar 2002 09:13:48 -0800 (PST) Message-Id: <200203281713.g2SHDm939906@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8575 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8575 Change 8575 by green@green_laptop_2 on 2002/03/28 09:13:36 Change the way that MAC policies' operation vectors are declared from a hard-to-maintain struct which enforced strong type-checking in the declarations in the module and strict ordering requirements, to an easily-modifiable array which will not have to be changed necessarily for each addition of a new MAC operation. The downside of this is that the MAC policy authors will have to manually make certain to match arguments of their function declarations with what they pass in via the operation vector, since C cannot help by providing strong type checking here. (I accidentally already submitted kern_mac.c last.) Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#6 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#25 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#26 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.h#5 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#21 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#20 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#20 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#91 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#56 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#6 (text+ko) ==== @@ -222,70 +222,35 @@ return (0); } -static struct mac_policy_ops babyaudit_ops = +static struct mac_policy_op_entry babyaudit_ops[] = { - NULL /* babyaudit_destroy */, - NULL /* babyaudit_init */, - NULL /* babyaudit_copy_label */, - NULL /* babyaudit_dominate */, - NULL /* babyaudit_equal */, - NULL /* babyaudit_print_label */, - NULL /* babyaudit_validate_label */, - NULL /* babyaudit_create_devfs_device */, - NULL /* babyaudit_create_devfs_directory */, - NULL /* babyaudit_create_vnode_from_vnode */, - NULL /* babyaudit_mountfs */, - NULL /* babyaudit_mountrootfs */, - NULL /* babyaudit_create_mbuf_from_socket */, - NULL /* babyaudit_create_socket */, - NULL /* babyaudit_relabel_socket */, - NULL /* babyaudit_create_bpfdesc */, - NULL /* babyaudit_create_ifnet */, - NULL /* babyaudit_create_mbuf_datagram_from_mbuf_fragmentqueue */, - NULL /* babyaudit_create_mbuf_fragment_from_mbuf */, - NULL /* babyaudit_create_mbuf_fragmentqueue_from_mbuf_fragment */, - NULL /* babyaudit_create_mbuf_from_mbuf */, - NULL /* babyaudit_create_mbuf_linklayer_for_ifnet */, - NULL /* babyaudit_create_mbuf_from_bpfdesc */, - NULL /* babyaudit_create_mbuf_from_ifnet */, - NULL /* babyaudit_create_mbuf_multicast_encap_from_mbuf */, - NULL /* babyaudit_create_mbuf_netlayer_from_mbuf */, - NULL /* babyaudit_mbuf_fragment_matches_mbuf_fragmentqueue */, - NULL /* babyaudit_relabel_ifnet */, - NULL /* babyaudit_update_mbuf_fragmentqueue_from_mbuf_fragment */, - NULL /* babyaudit_create_subject */, - NULL /* babyaudit_execve_transition */, - NULL /* babyaudit_execve_will_transition */, - NULL /* babyaudit_create_proc0 */, - NULL /* babyaudit_create_proc1 */, - NULL /* babyaudit_relabel_subject */, - NULL /* babyaudit_bpfdesc_check_receive_from_ifnet */, - NULL /* babyaudit_cred_check_see_cred */, - NULL /* babyaudit_cred_check_see_socket */, - NULL /* babyaudit_cred_check_relabel_ifnet */, - NULL /* babyaudit_cred_check_relabel_socket */, - NULL /* babyaudit_cred_check_relabel_subject */, - NULL /* babyaudit_cred_check_relabel_vnode */, - NULL /* babyaudit_cred_check_statfs */, - NULL /* babyaudit_cred_check_debug_proc */, - NULL /* babyaudit_cred_check_exec_file */, - babyaudit_cred_check_chdir_vnode, - babyaudit_cred_check_create_vnode, - babyaudit_cred_check_delete_vnode, - babyaudit_cred_check_exec_vnode, - babyaudit_cred_check_open_vnode, - babyaudit_cred_check_rename_from_vnode, - babyaudit_cred_check_rename_to_vnode, - babyaudit_cred_check_revoke_vnode, - babyaudit_cred_check_search_vnode, - babyaudit_cred_check_setflags_vnode, - babyaudit_cred_check_setmode_vnode, - babyaudit_cred_check_setowner_vnode, - babyaudit_cred_check_setutimes_vnode, - NULL /* babyaudit_cred_check_sched_proc */, - NULL /* babyaudit_cred_check_signal_proc */, - NULL /* babyaudit_ifnet_check_send_mbuf */, - NULL /* babyaudit_socket_check_receive_mbuf */ + { MAC_CRED_CHECK_CHDIR_VNODE, + (macop_t)babyaudit_cred_check_chdir_vnode }, + { MAC_CRED_CHECK_CREATE_VNODE, + (macop_t)babyaudit_cred_check_create_vnode }, + { MAC_CRED_CHECK_DELETE_VNODE, + (macop_t)babyaudit_cred_check_delete_vnode }, + { MAC_CRED_CHECK_EXEC_VNODE, + (macop_t)babyaudit_cred_check_exec_vnode }, + { MAC_CRED_CHECK_OPEN_VNODE, + (macop_t)babyaudit_cred_check_open_vnode }, + { MAC_CRED_CHECK_RENAME_FROM_VNODE, + (macop_t)babyaudit_cred_check_rename_from_vnode }, + { MAC_CRED_CHECK_RENAME_TO_VNODE, + (macop_t)babyaudit_cred_check_rename_to_vnode }, + { MAC_CRED_CHECK_REVOKE_VNODE, + (macop_t)babyaudit_cred_check_revoke_vnode }, + { MAC_CRED_CHECK_SEARCH_VNODE, + (macop_t)babyaudit_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETFLAGS_VNODE, + (macop_t)babyaudit_cred_check_setflags_vnode }, + { MAC_CRED_CHECK_SETMODE_VNODE, + (macop_t)babyaudit_cred_check_setmode_vnode }, + { MAC_CRED_CHECK_SETOWNER_VNODE, + (macop_t)babyaudit_cred_check_setowner_vnode }, + { MAC_CRED_CHECK_SETUTIMES_VNODE, + (macop_t)babyaudit_cred_check_setutimes_vnode }, + { MAC_OP_LAST, NULL } }; MAC_POLICY_SET(babyaudit_ops, trustedbsd_babyaudit, "TrustedBSD MAC/babyaudit", ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#25 (text+ko) ==== @@ -996,71 +996,129 @@ return (0); } -static struct mac_policy_ops mac_biba_ops = +static struct mac_policy_op_entry mac_biba_ops[] = { - NULL, - NULL, - mac_biba_copy_label, - mac_biba_single_dominate, - mac_biba_equal, /* XXX */ - mac_biba_print_label, - mac_biba_validate_label, - mac_biba_create_devfs_device, - mac_biba_create_devfs_directory, - mac_biba_create_vnode_from_vnode, - mac_biba_mountfs, - mac_biba_mountrootfs, - mac_biba_create_mbuf_from_socket, - mac_biba_create_socket, - mac_biba_relabel_socket, - mac_biba_create_bpfdesc, - mac_biba_create_ifnet, - mac_biba_create_mbuf_datagram_from_mbuf_fragmentqueue, - mac_biba_create_mbuf_fragment_from_mbuf, - mac_biba_create_mbuf_fragmentqueue_from_mbuf_fragment, - mac_biba_create_mbuf_from_mbuf, - mac_biba_create_mbuf_linklayer_for_ifnet, - mac_biba_create_mbuf_from_bpfdesc, - mac_biba_create_mbuf_from_ifnet, - mac_biba_create_mbuf_multicast_encap_from_mbuf, - mac_biba_create_mbuf_netlayer_from_mbuf, - mac_biba_mbuf_fragment_matches_mbuf_fragmentqueue, - mac_biba_relabel_ifnet, - NULL, /* update fragq */ - mac_biba_create_subject, - mac_biba_execve_transition, - mac_biba_execve_will_transition, - mac_biba_create_proc0, - mac_biba_create_proc1, - mac_biba_relabel_subject, - mac_biba_bpfdesc_check_receive_from_ifnet, - mac_biba_cred_check_see_cred, - mac_biba_cred_check_see_socket, - mac_biba_cred_check_relabel_ifnet, - mac_biba_cred_check_relabel_socket, - mac_biba_cred_check_relabel_subject, - mac_biba_cred_check_relabel_vnode, - mac_biba_cred_check_statfs, - mac_biba_cred_check_debug_proc, - mac_biba_cred_check_exec_file, - mac_biba_cred_check_chdir_vnode, - mac_biba_cred_check_create_vnode, - mac_biba_cred_check_delete_vnode, - mac_biba_cred_check_exec_vnode, - mac_biba_cred_check_open_vnode, - mac_biba_cred_check_rename_from_vnode, - mac_biba_cred_check_rename_to_vnode, - mac_biba_cred_check_revoke_vnode, - mac_biba_cred_check_search_vnode, - mac_biba_cred_check_setflags_vnode, - mac_biba_cred_check_setmode_vnode, - mac_biba_cred_check_setowner_vnode, - mac_biba_cred_check_setutimes_vnode, - mac_biba_cred_check_sched_proc, - mac_biba_cred_check_signal_proc, - mac_biba_cred_check_stat_vnode, - mac_biba_ifnet_check_send_mbuf, - mac_biba_socket_check_receive_mbuf + { MAC_COPY_LABEL, + (macop_t)mac_biba_copy_label }, + { MAC_DOMINATE, + (macop_t)mac_biba_single_dominate }, + { MAC_EQUAL, + (macop_t)mac_biba_equal }, /* XXX */ + { MAC_PRINT_LABEL, + (macop_t)mac_biba_print_label }, + { MAC_VALIDATE_LABEL, + (macop_t)mac_biba_validate_label }, + { MAC_CREATE_DEVFS_DEVICE, + (macop_t)mac_biba_create_devfs_device }, + { MAC_CREATE_DEVFS_DIRECTORY, + (macop_t)mac_biba_create_devfs_directory }, + { MAC_CREATE_VNODE_FROM_VNODE, + (macop_t)mac_biba_create_vnode_from_vnode }, + { MAC_CREATE_MOUNT, + (macop_t)mac_biba_mountfs }, + { MAC_CREATE_ROOT_MOUNT, + (macop_t)mac_biba_mountrootfs }, + { MAC_CREATE_MBUF_FROM_SOCKET, + (macop_t)mac_biba_create_mbuf_from_socket }, + { MAC_CREATE_SOCKET, + (macop_t)mac_biba_create_socket }, + { MAC_RELABEL_SOCKET, + (macop_t)mac_biba_relabel_socket }, + { MAC_CREATE_BPFDESC, + (macop_t)mac_biba_create_bpfdesc }, + { MAC_CREATE_IFNET, + (macop_t)mac_biba_create_ifnet }, + { MAC_CREATE_MBUF_DATAGRAM_FROM_MBUF_FRAGMENTQUEUE, + (macop_t)mac_biba_create_mbuf_datagram_from_mbuf_fragmentqueue }, + { MAC_CREATE_MBUF_FRAGMENT_FROM_MBUF, + (macop_t)mac_biba_create_mbuf_fragment_from_mbuf }, + { MAC_CREATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT, + (macop_t)mac_biba_create_mbuf_fragmentqueue_from_mbuf_fragment }, + { MAC_CREATE_MBUF_FROM_MBUF, + (macop_t)mac_biba_create_mbuf_from_mbuf }, + { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, + (macop_t)mac_biba_create_mbuf_linklayer_for_ifnet }, + { MAC_CREATE_MBUF_FROM_BPFDESC, + (macop_t)mac_biba_create_mbuf_from_bpfdesc }, + { MAC_CREATE_MBUF_FROM_IFNET, + (macop_t)mac_biba_create_mbuf_from_ifnet }, + { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, + (macop_t)mac_biba_create_mbuf_multicast_encap_from_mbuf }, + { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, + (macop_t)mac_biba_create_mbuf_netlayer_from_mbuf }, + { MAC_MBUF_FRAGMENT_MATCHES_MBUF_FRAGMENTQUEUE, + (macop_t)mac_biba_mbuf_fragment_matches_mbuf_fragmentqueue }, + { MAC_RELABEL_IFNET, + (macop_t)mac_biba_relabel_ifnet }, + { MAC_CREATE_SUBJECT, + (macop_t)mac_biba_create_subject }, + { MAC_EXECVE_TRANSITION, + (macop_t)mac_biba_execve_transition }, + { MAC_EXECVE_WILL_TRANSITION, + (macop_t)mac_biba_execve_will_transition }, + { MAC_CREATE_PROC0, + (macop_t)mac_biba_create_proc0 }, + { MAC_CREATE_PROC1, + (macop_t)mac_biba_create_proc1 }, + { MAC_RELABEL_SUBJECT, + (macop_t)mac_biba_relabel_subject }, + { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, + (macop_t)mac_biba_bpfdesc_check_receive_from_ifnet }, + { MAC_CRED_CHECK_SEE_CRED, + (macop_t)mac_biba_cred_check_see_cred }, + { MAC_CRED_CHECK_SEE_SOCKET, + (macop_t)mac_biba_cred_check_see_socket }, + { MAC_CRED_CHECK_RELABEL_IFNET, + (macop_t)mac_biba_cred_check_relabel_ifnet }, + { MAC_CRED_CHECK_RELABEL_SOCKET, + (macop_t)mac_biba_cred_check_relabel_socket }, + { MAC_CRED_CHECK_RELABEL_SUBJECT, + (macop_t)mac_biba_cred_check_relabel_subject }, + { MAC_CRED_CHECK_RELABEL_VNODE, + (macop_t)mac_biba_cred_check_relabel_vnode }, + { MAC_CRED_CHECK_STATFS, + (macop_t)mac_biba_cred_check_statfs }, + { MAC_CRED_CHECK_DEBUG_PROC, + (macop_t)mac_biba_cred_check_debug_proc }, + { MAC_CRED_CHECK_EXEC_FILE, + (macop_t)mac_biba_cred_check_exec_file }, + { MAC_CRED_CHECK_CHDIR_VNODE, + (macop_t)mac_biba_cred_check_chdir_vnode }, + { MAC_CRED_CHECK_CREATE_VNODE, + (macop_t)mac_biba_cred_check_create_vnode }, + { MAC_CRED_CHECK_DELETE_VNODE, + (macop_t)mac_biba_cred_check_delete_vnode }, + { MAC_CRED_CHECK_EXEC_VNODE, + (macop_t)mac_biba_cred_check_exec_vnode }, + { MAC_CRED_CHECK_OPEN_VNODE, + (macop_t)mac_biba_cred_check_open_vnode }, + { MAC_CRED_CHECK_RENAME_FROM_VNODE, + (macop_t)mac_biba_cred_check_rename_from_vnode }, + { MAC_CRED_CHECK_RENAME_TO_VNODE, + (macop_t)mac_biba_cred_check_rename_to_vnode }, + { MAC_CRED_CHECK_REVOKE_VNODE, + (macop_t)mac_biba_cred_check_revoke_vnode }, + { MAC_CRED_CHECK_SEARCH_VNODE, + (macop_t)mac_biba_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETFLAGS_VNODE, + (macop_t)mac_biba_cred_check_setflags_vnode }, + { MAC_CRED_CHECK_SETMODE_VNODE, + (macop_t)mac_biba_cred_check_setmode_vnode }, + { MAC_CRED_CHECK_SETOWNER_VNODE, + (macop_t)mac_biba_cred_check_setowner_vnode }, + { MAC_CRED_CHECK_SETUTIMES_VNODE, + (macop_t)mac_biba_cred_check_setutimes_vnode }, + { MAC_CRED_CHECK_SCHED_PROC, + (macop_t)mac_biba_cred_check_sched_proc }, + { MAC_CRED_CHECK_SIGNAL_PROC, + (macop_t)mac_biba_cred_check_signal_proc }, + { MAC_CRED_CHECK_STAT_VNODE, + (macop_t)mac_biba_cred_check_stat_vnode }, + { MAC_IFNET_CHECK_SEND_MBUF, + (macop_t)mac_biba_ifnet_check_send_mbuf }, + { MAC_SOCKET_CHECK_RECEIVE_MBUF, + (macop_t)mac_biba_socket_check_receive_mbuf }, + { MAC_OP_LAST, NULL } }; MAC_POLICY_SET(mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba", 1); ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#26 (text+ko) ==== @@ -585,71 +585,51 @@ return (mac_bsdextended_cred_cantouch(cred, proc)); } -static struct mac_policy_ops mac_bsdextended_ops = +static struct mac_policy_op_entry mac_bsdextended_ops[] = { - mac_bsdextended_init, - mac_bsdextended_destroy, - NULL, /* copy label */ - NULL, /* dominate */ - NULL, /* equal label */ - NULL, /* print label */ - NULL, /* validate label */ - NULL, /* create devfs dev */ - NULL, /* create devfs dir */ - NULL, /* create vnode */ - NULL, /* mount fs */ - NULL, /* mount rootfs */ - NULL, /* mbuf from socket */ - NULL, /* create socket */ - NULL, /* relabel socket */ - NULL, /* create bpf */ - NULL, /* create ifnet */ - NULL, /* mbuf datagram from fragq */ - NULL, /* mbuf fragment */ - NULL, /* mbuf fragment queue */ - NULL, /* mbuf from mbuf */ - NULL, /* mbuf linklayer */ - NULL, /* mbuf from bpf */ - NULL, /* mbuf from ifnet */ - NULL, /* mbuf multicast encap */ - NULL, /* mbuf netlayer */ - NULL, /* fragment queue match */ - NULL, /* relabel ifnet */ - NULL, /* update fragment queue */ - NULL, /* create subject */ - NULL, /* transition */ - NULL, /* will transition */ - NULL, /* proc0 */ - NULL, /* proc1 */ - NULL, /* relabel subject */ - NULL, /* bpfdesc check ifnet */ - mac_bsdextended_cred_check_see_cred, - mac_bsdextended_cred_check_see_socket, - NULL, /* check relabel ifnet */ - NULL, /* check relabel socket */ - NULL, /* check relabel subject */ - NULL, /* check relabel vnode */ - NULL, /* check statfs */ - mac_bsdextended_cred_check_debug_proc, - NULL, /* exec file */ - mac_bsdextended_cred_check_chdir_vnode, - mac_bsdextended_cred_check_create_vnode, - mac_bsdextended_cred_check_delete_vnode, - mac_bsdextended_cred_check_exec_vnode, - mac_bsdextended_cred_check_open_vnode, - mac_bsdextended_cred_check_rename_from_vnode, - mac_bsdextended_cred_check_rename_to_vnode, - mac_bsdextended_cred_check_revoke_vnode, - mac_bsdextended_cred_check_search_vnode, - mac_bsdextended_cred_check_setflags_vnode, - mac_bsdextended_cred_check_setmode_vnode, - mac_bsdextended_cred_check_setowner_vnode, - mac_bsdextended_cred_check_setutimes_vnode, - mac_bsdextended_cred_check_sched_proc, - mac_bsdextended_cred_check_signal_proc, - mac_bsdextended_cred_check_stat_vnode, - NULL, /* ifnet check send mbuf */ - NULL, /* socket check receive mbuf */ + { MAC_DESTROY, + (macop_t)mac_bsdextended_destroy }, + { MAC_INIT, + (macop_t)mac_bsdextended_init }, + { MAC_CRED_CHECK_SEE_CRED, + (macop_t)mac_bsdextended_cred_check_see_cred }, + { MAC_CRED_CHECK_SEE_SOCKET, + (macop_t)mac_bsdextended_cred_check_see_socket }, + { MAC_CRED_CHECK_DEBUG_PROC, + (macop_t)mac_bsdextended_cred_check_debug_proc }, + { MAC_CRED_CHECK_CHDIR_VNODE, + (macop_t)mac_bsdextended_cred_check_chdir_vnode }, + { MAC_CRED_CHECK_CREATE_VNODE, + (macop_t)mac_bsdextended_cred_check_create_vnode }, + { MAC_CRED_CHECK_DELETE_VNODE, + (macop_t)mac_bsdextended_cred_check_delete_vnode }, + { MAC_CRED_CHECK_EXEC_VNODE, + (macop_t)mac_bsdextended_cred_check_exec_vnode }, + { MAC_CRED_CHECK_OPEN_VNODE, + (macop_t)mac_bsdextended_cred_check_open_vnode }, + { MAC_CRED_CHECK_RENAME_FROM_VNODE, + (macop_t)mac_bsdextended_cred_check_rename_from_vnode }, + { MAC_CRED_CHECK_RENAME_TO_VNODE, + (macop_t)mac_bsdextended_cred_check_rename_to_vnode }, + { MAC_CRED_CHECK_REVOKE_VNODE, + (macop_t)mac_bsdextended_cred_check_revoke_vnode }, + { MAC_CRED_CHECK_SEARCH_VNODE, + (macop_t)mac_bsdextended_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETFLAGS_VNODE, + (macop_t)mac_bsdextended_cred_check_setflags_vnode }, + { MAC_CRED_CHECK_SETMODE_VNODE, + (macop_t)mac_bsdextended_cred_check_setmode_vnode }, + { MAC_CRED_CHECK_SETOWNER_VNODE, + (macop_t)mac_bsdextended_cred_check_setowner_vnode }, + { MAC_CRED_CHECK_SETUTIMES_VNODE, + (macop_t)mac_bsdextended_cred_check_setutimes_vnode }, + { MAC_CRED_CHECK_SCHED_PROC, + (macop_t)mac_bsdextended_cred_check_sched_proc }, + { MAC_CRED_CHECK_SIGNAL_PROC, + (macop_t)mac_bsdextended_cred_check_signal_proc }, + { MAC_CRED_CHECK_STAT_VNODE, + (macop_t)mac_bsdextended_cred_check_stat_vnode }, + { MAC_OP_LAST, NULL } }; MAC_POLICY_SET(mac_bsdextended_ops, trustedbsd_mac_bsdextended, ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.h#5 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#21 (text+ko) ==== @@ -965,71 +965,129 @@ return (0); } -static struct mac_policy_ops mac_mls_ops = +static struct mac_policy_op_entry mac_mls_ops[] = { - NULL, - NULL, - mac_mls_copy_label, - mac_mls_single_dominate, - mac_mls_equal, /* XXX */ - mac_mls_print_label, - mac_mls_validate_label, - mac_mls_create_devfs_device, - mac_mls_create_devfs_directory, - mac_mls_create_vnode_from_vnode, - mac_mls_mountfs, - mac_mls_mountrootfs, - mac_mls_create_mbuf_from_socket, - mac_mls_create_socket, - mac_mls_relabel_socket, - mac_mls_create_bpfdesc, - mac_mls_create_ifnet, - mac_mls_create_mbuf_datagram_from_mbuf_fragmentqueue, - mac_mls_create_mbuf_fragment_from_mbuf, - mac_mls_create_mbuf_fragmentqueue_from_mbuf_fragment, - mac_mls_create_mbuf_from_mbuf, - mac_mls_create_mbuf_linklayer_for_ifnet, - mac_mls_create_mbuf_from_bpfdesc, - mac_mls_create_mbuf_from_ifnet, - mac_mls_create_mbuf_multicast_encap_from_mbuf, - mac_mls_create_mbuf_netlayer_from_mbuf, - mac_mls_mbuf_fragment_matches_mbuf_fragmentqueue, - mac_mls_relabel_ifnet, - NULL, /* update fragq */ - mac_mls_create_subject, - mac_mls_execve_transition, - mac_mls_execve_will_transition, - mac_mls_create_proc0, - mac_mls_create_proc1, - mac_mls_relabel_subject, - mac_mls_bpfdesc_check_receive_from_ifnet, - mac_mls_cred_check_see_cred, - mac_mls_cred_check_see_socket, - mac_mls_cred_check_relabel_ifnet, - mac_mls_cred_check_relabel_socket, - mac_mls_cred_check_relabel_subject, - mac_mls_cred_check_relabel_vnode, - mac_mls_cred_check_statfs, - mac_mls_cred_check_debug_proc, - mac_mls_cred_check_exec_file, - mac_mls_cred_check_chdir_vnode, - mac_mls_cred_check_create_vnode, - mac_mls_cred_check_delete_vnode, - mac_mls_cred_check_exec_vnode, - mac_mls_cred_check_open_vnode, - mac_mls_cred_check_rename_from_vnode, - mac_mls_cred_check_rename_to_vnode, - mac_mls_cred_check_revoke_vnode, - mac_mls_cred_check_search_vnode, - mac_mls_cred_check_setflags_vnode, - mac_mls_cred_check_setmode_vnode, - mac_mls_cred_check_setowner_vnode, - mac_mls_cred_check_setutimes_vnode, - mac_mls_cred_check_sched_proc, - mac_mls_cred_check_signal_proc, - mac_mls_cred_check_stat_vnode, - mac_mls_ifnet_check_send_mbuf, - mac_mls_socket_check_receive_mbuf + { MAC_COPY_LABEL, + (macop_t)mac_mls_copy_label }, + { MAC_DOMINATE, + (macop_t)mac_mls_single_dominate }, + { MAC_EQUAL, + (macop_t)mac_mls_equal }, /* XXX */ + { MAC_PRINT_LABEL, + (macop_t)mac_mls_print_label }, + { MAC_VALIDATE_LABEL, + (macop_t)mac_mls_validate_label }, + { MAC_CREATE_DEVFS_DEVICE, + (macop_t)mac_mls_create_devfs_device }, + { MAC_CREATE_DEVFS_DIRECTORY, + (macop_t)mac_mls_create_devfs_directory }, + { MAC_CREATE_VNODE_FROM_VNODE, + (macop_t)mac_mls_create_vnode_from_vnode }, + { MAC_CREATE_MOUNT, + (macop_t)mac_mls_mountfs }, + { MAC_CREATE_ROOT_MOUNT, + (macop_t)mac_mls_mountrootfs }, + { MAC_CREATE_MBUF_FROM_SOCKET, + (macop_t)mac_mls_create_mbuf_from_socket }, + { MAC_CREATE_SOCKET, + (macop_t)mac_mls_create_socket }, + { MAC_RELABEL_SOCKET, + (macop_t)mac_mls_relabel_socket }, + { MAC_CREATE_BPFDESC, + (macop_t)mac_mls_create_bpfdesc }, + { MAC_CREATE_IFNET, + (macop_t)mac_mls_create_ifnet }, + { MAC_CREATE_MBUF_DATAGRAM_FROM_MBUF_FRAGMENTQUEUE, + (macop_t)mac_mls_create_mbuf_datagram_from_mbuf_fragmentqueue }, + { MAC_CREATE_MBUF_FRAGMENT_FROM_MBUF, + (macop_t)mac_mls_create_mbuf_fragment_from_mbuf }, + { MAC_CREATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT, + (macop_t)mac_mls_create_mbuf_fragmentqueue_from_mbuf_fragment }, + { MAC_CREATE_MBUF_FROM_MBUF, + (macop_t)mac_mls_create_mbuf_from_mbuf }, + { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, + (macop_t)mac_mls_create_mbuf_linklayer_for_ifnet }, + { MAC_CREATE_MBUF_FROM_BPFDESC, + (macop_t)mac_mls_create_mbuf_from_bpfdesc }, + { MAC_CREATE_MBUF_FROM_IFNET, + (macop_t)mac_mls_create_mbuf_from_ifnet }, + { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, + (macop_t)mac_mls_create_mbuf_multicast_encap_from_mbuf }, + { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, + (macop_t)mac_mls_create_mbuf_netlayer_from_mbuf }, + { MAC_MBUF_FRAGMENT_MATCHES_MBUF_FRAGMENTQUEUE, + (macop_t)mac_mls_mbuf_fragment_matches_mbuf_fragmentqueue }, + { MAC_RELABEL_IFNET, + (macop_t)mac_mls_relabel_ifnet }, + { MAC_CREATE_SUBJECT, + (macop_t)mac_mls_create_subject }, + { MAC_EXECVE_TRANSITION, + (macop_t)mac_mls_execve_transition }, + { MAC_EXECVE_WILL_TRANSITION, + (macop_t)mac_mls_execve_will_transition }, + { MAC_CREATE_PROC0, + (macop_t)mac_mls_create_proc0 }, + { MAC_CREATE_PROC1, + (macop_t)mac_mls_create_proc1 }, + { MAC_RELABEL_SUBJECT, + (macop_t)mac_mls_relabel_subject }, + { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, + (macop_t)mac_mls_bpfdesc_check_receive_from_ifnet }, + { MAC_CRED_CHECK_SEE_CRED, + (macop_t)mac_mls_cred_check_see_cred }, + { MAC_CRED_CHECK_SEE_SOCKET, + (macop_t)mac_mls_cred_check_see_socket }, + { MAC_CRED_CHECK_RELABEL_IFNET, + (macop_t)mac_mls_cred_check_relabel_ifnet }, + { MAC_CRED_CHECK_RELABEL_SOCKET, + (macop_t)mac_mls_cred_check_relabel_socket }, + { MAC_CRED_CHECK_RELABEL_SUBJECT, + (macop_t)mac_mls_cred_check_relabel_subject }, + { MAC_CRED_CHECK_RELABEL_VNODE, + (macop_t)mac_mls_cred_check_relabel_vnode }, + { MAC_CRED_CHECK_STATFS, + (macop_t)mac_mls_cred_check_statfs }, + { MAC_CRED_CHECK_DEBUG_PROC, + (macop_t)mac_mls_cred_check_debug_proc }, + { MAC_CRED_CHECK_EXEC_FILE, + (macop_t)mac_mls_cred_check_exec_file }, + { MAC_CRED_CHECK_CHDIR_VNODE, + (macop_t)mac_mls_cred_check_chdir_vnode }, + { MAC_CRED_CHECK_CREATE_VNODE, + (macop_t)mac_mls_cred_check_create_vnode }, + { MAC_CRED_CHECK_DELETE_VNODE, + (macop_t)mac_mls_cred_check_delete_vnode }, + { MAC_CRED_CHECK_EXEC_VNODE, + (macop_t)mac_mls_cred_check_exec_vnode }, + { MAC_CRED_CHECK_OPEN_VNODE, + (macop_t)mac_mls_cred_check_open_vnode }, + { MAC_CRED_CHECK_RENAME_FROM_VNODE, + (macop_t)mac_mls_cred_check_rename_from_vnode }, + { MAC_CRED_CHECK_RENAME_TO_VNODE, + (macop_t)mac_mls_cred_check_rename_to_vnode }, + { MAC_CRED_CHECK_REVOKE_VNODE, + (macop_t)mac_mls_cred_check_revoke_vnode }, + { MAC_CRED_CHECK_SEARCH_VNODE, + (macop_t)mac_mls_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETFLAGS_VNODE, + (macop_t)mac_mls_cred_check_setflags_vnode }, + { MAC_CRED_CHECK_SETMODE_VNODE, + (macop_t)mac_mls_cred_check_setmode_vnode }, + { MAC_CRED_CHECK_SETOWNER_VNODE, + (macop_t)mac_mls_cred_check_setowner_vnode }, + { MAC_CRED_CHECK_SETUTIMES_VNODE, + (macop_t)mac_mls_cred_check_setutimes_vnode }, + { MAC_CRED_CHECK_SCHED_PROC, + (macop_t)mac_mls_cred_check_sched_proc }, + { MAC_CRED_CHECK_SIGNAL_PROC, + (macop_t)mac_mls_cred_check_signal_proc }, + { MAC_CRED_CHECK_STAT_VNODE, + (macop_t)mac_mls_cred_check_stat_vnode }, + { MAC_IFNET_CHECK_SEND_MBUF, + (macop_t)mac_mls_ifnet_check_send_mbuf }, + { MAC_SOCKET_CHECK_RECEIVE_MBUF, + (macop_t)mac_mls_socket_check_receive_mbuf }, + { MAC_OP_LAST, NULL } }; MAC_POLICY_SET(mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS", 1); ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#20 (text+ko) ==== @@ -586,71 +586,135 @@ return (0); } -static struct mac_policy_ops mac_none_ops = +static struct mac_policy_op_entry mac_none_ops[] = { - mac_none_destroy, - mac_none_init, - mac_none_copy_label, - mac_none_dominate, - mac_none_equal, - mac_none_print_label, - mac_none_validate_label, - mac_none_create_devfs_device, - mac_none_create_devfs_directory, - mac_none_create_vnode_from_vnode, - mac_none_mountfs, - mac_none_mountrootfs, - mac_none_create_mbuf_from_socket, - mac_none_create_socket, - mac_none_relabel_socket, - mac_none_create_bpfdesc, - mac_none_create_ifnet, - mac_none_create_mbuf_datagram_from_mbuf_fragmentqueue, - mac_none_create_mbuf_fragment_from_mbuf, - mac_none_create_mbuf_fragmentqueue_from_mbuf_fragment, - mac_none_create_mbuf_from_mbuf, - mac_none_create_mbuf_linklayer_for_ifnet, - mac_none_create_mbuf_from_bpfdesc, - mac_none_create_mbuf_from_ifnet, - mac_none_create_mbuf_multicast_encap_from_mbuf, - mac_none_create_mbuf_netlayer_from_mbuf, - mac_none_mbuf_fragment_matches_mbuf_fragmentqueue, - mac_none_relabel_ifnet, - mac_none_update_mbuf_fragmentqueue_from_mbuf_fragment, - mac_none_create_subject, - mac_none_execve_transition, - mac_none_execve_will_transition, - mac_none_create_proc0, - mac_none_create_proc1, - mac_none_relabel_subject, - mac_none_bpfdesc_check_receive_from_ifnet, - mac_none_cred_check_see_cred, - mac_none_cred_check_see_socket, - mac_none_cred_check_relabel_ifnet, - mac_none_cred_check_relabel_socket, - mac_none_cred_check_relabel_subject, - mac_none_cred_check_relabel_vnode, - mac_none_cred_check_statfs, - mac_none_cred_check_debug_proc, - mac_none_cred_check_exec_file, - mac_none_cred_check_chdir_vnode, - mac_none_cred_check_create_vnode, - mac_none_cred_check_delete_vnode, - mac_none_cred_check_exec_vnode, - mac_none_cred_check_open_vnode, - mac_none_cred_check_rename_from_vnode, - mac_none_cred_check_rename_to_vnode, - mac_none_cred_check_revoke_vnode, - mac_none_cred_check_search_vnode, - mac_none_cred_check_setflags_vnode, - mac_none_cred_check_setmode_vnode, - mac_none_cred_check_setowner_vnode, - mac_none_cred_check_setutimes_vnode, - mac_none_cred_check_sched_proc, - mac_none_cred_check_signal_proc, - mac_none_cred_check_stat_vnode, - mac_none_ifnet_check_send_mbuf, - mac_none_socket_check_receive_mbuf + { MAC_DESTROY, + (macop_t)mac_none_destroy }, + { MAC_INIT, + (macop_t)mac_none_init }, + { MAC_COPY_LABEL, + (macop_t)mac_none_copy_label }, + { MAC_DOMINATE, + (macop_t)mac_none_dominate }, + { MAC_EQUAL, + (macop_t)mac_none_equal }, + { MAC_PRINT_LABEL, + (macop_t)mac_none_print_label }, + { MAC_VALIDATE_LABEL, + (macop_t)mac_none_validate_label }, + { MAC_CREATE_DEVFS_DEVICE, + (macop_t)mac_none_create_devfs_device }, + { MAC_CREATE_DEVFS_DIRECTORY, + (macop_t)mac_none_create_devfs_directory }, + { MAC_CREATE_VNODE_FROM_VNODE, + (macop_t)mac_none_create_vnode_from_vnode }, + { MAC_CREATE_MOUNT, + (macop_t)mac_none_mountfs }, + { MAC_CREATE_ROOT_MOUNT, + (macop_t)mac_none_mountrootfs }, + { MAC_CREATE_MBUF_FROM_SOCKET, + (macop_t)mac_none_create_mbuf_from_socket }, + { MAC_CREATE_SOCKET, + (macop_t)mac_none_create_socket }, + { MAC_RELABEL_SOCKET, + (macop_t)mac_none_relabel_socket }, + { MAC_CREATE_BPFDESC, + (macop_t)mac_none_create_bpfdesc }, + { MAC_CREATE_IFNET, + (macop_t)mac_none_create_ifnet }, + { MAC_CREATE_MBUF_DATAGRAM_FROM_MBUF_FRAGMENTQUEUE, + (macop_t)mac_none_create_mbuf_datagram_from_mbuf_fragmentqueue }, + { MAC_CREATE_MBUF_FRAGMENT_FROM_MBUF, + (macop_t)mac_none_create_mbuf_fragment_from_mbuf }, + { MAC_CREATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT, + (macop_t)mac_none_create_mbuf_fragmentqueue_from_mbuf_fragment }, + { MAC_CREATE_MBUF_FROM_MBUF, + (macop_t)mac_none_create_mbuf_from_mbuf }, + { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, + (macop_t)mac_none_create_mbuf_linklayer_for_ifnet }, + { MAC_CREATE_MBUF_FROM_BPFDESC, + (macop_t)mac_none_create_mbuf_from_bpfdesc }, + { MAC_CREATE_MBUF_FROM_IFNET, + (macop_t)mac_none_create_mbuf_from_ifnet }, + { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, + (macop_t)mac_none_create_mbuf_multicast_encap_from_mbuf }, + { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, + (macop_t)mac_none_create_mbuf_netlayer_from_mbuf }, + { MAC_MBUF_FRAGMENT_MATCHES_MBUF_FRAGMENTQUEUE, + (macop_t)mac_none_mbuf_fragment_matches_mbuf_fragmentqueue }, + { MAC_RELABEL_IFNET, + (macop_t)mac_none_relabel_ifnet }, + { MAC_UPDATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT, + (macop_t)mac_none_update_mbuf_fragmentqueue_from_mbuf_fragment }, + { MAC_CREATE_SUBJECT, + (macop_t)mac_none_create_subject }, + { MAC_EXECVE_TRANSITION, + (macop_t)mac_none_execve_transition }, + { MAC_EXECVE_WILL_TRANSITION, + (macop_t)mac_none_execve_will_transition }, + { MAC_CREATE_PROC0, + (macop_t)mac_none_create_proc0 }, + { MAC_CREATE_PROC1, + (macop_t)mac_none_create_proc1 }, + { MAC_RELABEL_SUBJECT, + (macop_t)mac_none_relabel_subject }, + { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, + (macop_t)mac_none_bpfdesc_check_receive_from_ifnet }, + { MAC_CRED_CHECK_SEE_CRED, + (macop_t)mac_none_cred_check_see_cred }, + { MAC_CRED_CHECK_SEE_SOCKET, + (macop_t)mac_none_cred_check_see_socket }, + { MAC_CRED_CHECK_RELABEL_IFNET, + (macop_t)mac_none_cred_check_relabel_ifnet }, + { MAC_CRED_CHECK_RELABEL_SOCKET, + (macop_t)mac_none_cred_check_relabel_socket }, + { MAC_CRED_CHECK_RELABEL_SUBJECT, + (macop_t)mac_none_cred_check_relabel_subject }, + { MAC_CRED_CHECK_RELABEL_VNODE, + (macop_t)mac_none_cred_check_relabel_vnode }, + { MAC_CRED_CHECK_STATFS, + (macop_t)mac_none_cred_check_statfs }, + { MAC_CRED_CHECK_DEBUG_PROC, + (macop_t)mac_none_cred_check_debug_proc }, + { MAC_CRED_CHECK_EXEC_FILE, + (macop_t)mac_none_cred_check_exec_file }, + { MAC_CRED_CHECK_CHDIR_VNODE, + (macop_t)mac_none_cred_check_chdir_vnode }, + { MAC_CRED_CHECK_CREATE_VNODE, + (macop_t)mac_none_cred_check_create_vnode }, + { MAC_CRED_CHECK_DELETE_VNODE, + (macop_t)mac_none_cred_check_delete_vnode }, + { MAC_CRED_CHECK_EXEC_VNODE, + (macop_t)mac_none_cred_check_exec_vnode }, + { MAC_CRED_CHECK_OPEN_VNODE, + (macop_t)mac_none_cred_check_open_vnode }, + { MAC_CRED_CHECK_RENAME_FROM_VNODE, + (macop_t)mac_none_cred_check_rename_from_vnode }, + { MAC_CRED_CHECK_RENAME_TO_VNODE, + (macop_t)mac_none_cred_check_rename_to_vnode }, + { MAC_CRED_CHECK_REVOKE_VNODE, + (macop_t)mac_none_cred_check_revoke_vnode }, + { MAC_CRED_CHECK_SEARCH_VNODE, + (macop_t)mac_none_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETFLAGS_VNODE, + (macop_t)mac_none_cred_check_setflags_vnode }, + { MAC_CRED_CHECK_SETMODE_VNODE, + (macop_t)mac_none_cred_check_setmode_vnode }, + { MAC_CRED_CHECK_SETOWNER_VNODE, + (macop_t)mac_none_cred_check_setowner_vnode }, + { MAC_CRED_CHECK_SETUTIMES_VNODE, + (macop_t)mac_none_cred_check_setutimes_vnode }, + { MAC_CRED_CHECK_SCHED_PROC, + (macop_t)mac_none_cred_check_sched_proc }, + { MAC_CRED_CHECK_SIGNAL_PROC, + (macop_t)mac_none_cred_check_signal_proc }, + { MAC_CRED_CHECK_STAT_VNODE, + (macop_t)mac_none_cred_check_stat_vnode }, + { MAC_IFNET_CHECK_SEND_MBUF, + (macop_t)mac_none_ifnet_check_send_mbuf }, + { MAC_SOCKET_CHECK_RECEIVE_MBUF, + (macop_t)mac_none_socket_check_receive_mbuf }, + { MAC_OP_LAST, NULL } }; MAC_POLICY_SET(mac_none_ops, trustedbsd_mac_none, "TrustedBSD MAC/None", 0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 (text+ko) ==== @@ -157,71 +157,19 @@ return (mac_seeotheruids_check(cred, proc->p_ucred)); } -static struct mac_policy_ops mac_seeotheruids_ops = +static struct mac_policy_op_entry mac_seeotheruids_ops[] = { - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - mac_seeotheruids_cred_check_see_cred, - mac_seeotheruids_cred_check_see_socket, - NULL, - NULL, - NULL, - NULL, - NULL, - mac_seeotheruids_cred_check_debug_proc, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - mac_seeotheruids_cred_check_sched_proc, - mac_seeotheruids_cred_check_signal_proc, - NULL, - NULL, - NULL, + { MAC_CRED_CHECK_SEE_CRED, + (macop_t)mac_seeotheruids_cred_check_see_cred }, + { MAC_CRED_CHECK_SEE_SOCKET, + (macop_t)mac_seeotheruids_cred_check_see_socket }, + { MAC_CRED_CHECK_DEBUG_PROC, + (macop_t)mac_seeotheruids_cred_check_debug_proc }, + { MAC_CRED_CHECK_SCHED_PROC, + (macop_t)mac_seeotheruids_cred_check_sched_proc }, + { MAC_CRED_CHECK_SIGNAL_PROC, + (macop_t)mac_seeotheruids_cred_check_signal_proc }, + { MAC_OP_LAST, NULL } }; MAC_POLICY_SET(mac_seeotheruids_ops, trustedbsd_mac_seeotheruids, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#20 (text+ko) ==== @@ -1039,71 +1039,127 @@ return (error); } -static struct mac_policy_ops mac_te_ops = +static struct mac_policy_op_entry mac_te_ops[] = { - NULL, - NULL, - mac_te_copy_label, - NULL, - mac_te_equal, - mac_te_print_label, - mac_te_validate_label, - mac_te_create_devfs_device, - mac_te_create_devfs_directory, - mac_te_create_vnode_from_vnode, - mac_te_mountfs, - mac_te_mountrootfs, - mac_te_create_mbuf_from_socket, - mac_te_create_socket, - mac_te_relabel_socket, - mac_te_create_bpfdesc, - mac_te_create_ifnet, - mac_te_create_mbuf_datagram_from_mbuf_fragmentqueue, - mac_te_create_mbuf_fragment_from_mbuf, - mac_te_create_mbuf_fragmentqueue_from_mbuf_fragment, - mac_te_create_mbuf_from_mbuf, - mac_te_create_mbuf_linklayer_for_ifnet, - mac_te_create_mbuf_from_bpfdesc, - mac_te_create_mbuf_from_ifnet, - mac_te_create_mbuf_multicast_encap_from_mbuf, - mac_te_create_mbuf_netlayer_from_mbuf, - mac_te_mbuf_fragment_matches_mbuf_fragmentqueue, - mac_te_relabel_ifnet, - NULL, /* update fragq */ - mac_te_create_subject, - mac_te_execve_transition, - mac_te_execve_will_transition, - mac_te_create_proc0, - mac_te_create_proc1, - mac_te_relabel_subject, - mac_te_bpfdesc_check_receive_from_ifnet, - mac_te_cred_check_see_cred, - mac_te_cred_check_see_socket, - mac_te_cred_check_relabel_ifnet, - mac_te_cred_check_relabel_socket, - mac_te_cred_check_relabel_subject, - mac_te_cred_check_relabel_vnode, - mac_te_cred_check_statfs, - mac_te_cred_check_debug_proc, - mac_te_cred_check_exec_file, - mac_te_cred_check_chdir_vnode, - mac_te_cred_check_create_vnode, - mac_te_cred_check_delete_vnode, - mac_te_cred_check_exec_vnode, - mac_te_cred_check_open_vnode, - mac_te_cred_check_rename_from_vnode, >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 28 13:22:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72E5437B405; Thu, 28 Mar 2002 13:22:07 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 98CD037B416 for ; Thu, 28 Mar 2002 13:22:06 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2SLM6098294 for perforce@freebsd.org; Thu, 28 Mar 2002 13:22:06 -0800 (PST) (envelope-from green@freebsd.org) Date: Thu, 28 Mar 2002 13:22:06 -0800 (PST) Message-Id: <200203282122.g2SLM6098294@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 8590 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8590 Change 8590 by green@green_laptop_2 on 2002/03/28 13:21:48 Synch SEBSD with the MAC operation vector declaration change. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#2 (text+ko) ==== @@ -112,71 +112,11 @@ } } -static struct mac_policy_ops sebsd_ops = -{ - sebsd_init, - sebsd_destroy, - NULL, /* copy label */ - NULL, /* dominate */ - NULL, /* equal label */ - NULL, /* print label */ - NULL, /* validate label */ - NULL, /* create devfs dev */ - NULL, /* create devfs dir */ - NULL, /* create vnode */ - NULL, /* mount fs */ - sebsd_create_root_mount, /* mount rootfs */ - NULL, /* mbuf from socket */ - NULL, /* create socket */ - NULL, /* relabel socket */ - NULL, /* create bpf */ - NULL, /* create ifnet */ - NULL, /* mbuf datagram from fragq */ - NULL, /* mbuf fragment */ - NULL, /* mbuf fragment queue */ - NULL, /* mbuf from mbuf */ - NULL, /* mbuf linklayer */ - NULL, /* mbuf from bpf */ - NULL, /* mbuf from ifnet */ - NULL, /* mbuf multicast encap */ - NULL, /* mbuf netlayer */ - NULL, /* fragment queue match */ - NULL, /* relabel ifnet */ - NULL, /* update fragment queue */ - NULL, /* create subject */ - NULL, /* transition */ - NULL, /* will transition */ - NULL, /* proc0 */ - NULL, /* proc1 */ - NULL, /* relabel subject */ - NULL, /* bpfdesc check ifnet */ - NULL, - NULL, - NULL, /* check relabel ifnet */ - NULL, /* check relabel socket */ - NULL, /* check relabel subject */ - NULL, /* check relabel vnode */ - NULL, /* check statfs */ - NULL, - NULL, /* exec file */ - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, /* ifnet check send mbuf */ - NULL, /* socket check receive mbuf */ +static struct mac_policy_op_entry sebsd_ops[] = { + { MAC_INIT, (macop_t)sebsd_init }, + { MAC_DESTROY, (macop_t)sebsd_destroy }, + { MAC_CREATE_ROOT_MOUNT, (macop_t)sebsd_create_root_mount }, + { MAC_OP_LAST, NULL } }; MAC_POLICY_SET(sebsd_ops, trustedbsd_sebsd, "Security Enhanced BSD", 1); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 28 19:34:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B151137B400; Thu, 28 Mar 2002 19:34:38 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E447937B419 for ; Thu, 28 Mar 2002 19:34:37 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2T3YbN85927 for perforce@freebsd.org; Thu, 28 Mar 2002 19:34:37 -0800 (PST) (envelope-from jake@freebsd.org) Date: Thu, 28 Mar 2002 19:34:37 -0800 (PST) Message-Id: <200203290334.g2T3YbN85927@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8599 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8599 Change 8599 by jake@jake_sparc64 on 2002/03/28 19:34:08 Beginnings of an se driver. Affected files ... ... //depot/projects/sparc64/sys/conf/files#46 edit ... //depot/projects/sparc64/sys/dev/se/se.c#1 add ... //depot/projects/sparc64/sys/dev/se/se_ebus.c#1 add ... //depot/projects/sparc64/sys/dev/se/sevar.h#1 add Differences ... ==== //depot/projects/sparc64/sys/conf/files#46 (text+ko) ==== @@ -479,6 +479,8 @@ dev/rp/rp.c optional rp dev/rp/rp_isa.c optional rp isa dev/rp/rp_pci.c optional rp pci +dev/se/se.c optional se +dev/se/se_ebus.c optional se ebus dev/si/si.c optional si dev/si/si2_z280.c optional si dev/si/si3_t225.c optional si To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 28 20: 4:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A680F37B423; Thu, 28 Mar 2002 20:04:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3EB8B37B417 for ; Thu, 28 Mar 2002 20:04:14 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2T44Es90621 for perforce@freebsd.org; Thu, 28 Mar 2002 20:04:14 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 28 Mar 2002 20:04:14 -0800 (PST) Message-Id: <200203290404.g2T44Es90621@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8601 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8601 Change 8601 by peter@peter_thunder on 2002/03/28 20:03:31 Use the correct type for hash table lookup. Affected files ... ... //depot/projects/ia64/sys/boot/common/load_elf.c#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/common/load_elf.c#3 (text+ko) ==== @@ -48,11 +48,11 @@ Elf_Phdr *ph; Elf_Ehdr *ehdr; Elf_Sym *symtab; - Elf_Off *hashtab; + Elf_Hashelt *hashtab; Elf_Hashelt nbuckets; Elf_Hashelt nchains; - Elf_Hashelt* buckets; - Elf_Hashelt* chains; + Elf_Hashelt *buckets; + Elf_Hashelt *chains; char *strtab; size_t strsz; int fd; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Mar 28 20: 4:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D6C337B41A; Thu, 28 Mar 2002 20:04:16 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8197637B41A for ; Thu, 28 Mar 2002 20:04:14 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2T44EG90626 for perforce@freebsd.org; Thu, 28 Mar 2002 20:04:14 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 28 Mar 2002 20:04:14 -0800 (PST) Message-Id: <200203290404.g2T44EG90626@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 8602 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8602 Change 8602 by peter@peter_thunder on 2002/03/28 20:03:55 update for native builds and other hacks Affected files ... ... //depot/projects/ia64/sys/boot/efi/loader/Makefile#3 edit ... //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#5 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/loader/Makefile#3 (text+ko) ==== @@ -10,7 +10,7 @@ SRCS+= main.c conf.c dev_net.c # Enable BootForth -BOOT_FORTH= yes +#BOOT_FORTH= yes CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH} .if BOOT_FORTH CFLAGS+= -DBOOT_FORTH @@ -37,7 +37,8 @@ CFLAGS+= -DLOADER LDSCRIPT= ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH} -LDFLAGS= -nostdlib -T ${LDSCRIPT} -shared -Bsymbolic -L/usr/local/ia64-unknown-linux/lib +LDFLAGS= -nostdlib -T ${LDSCRIPT} -shared -Bsymbolic -L/usr/lib +OBJCOPY?= objcopy CLEANFILES+= setdef0.c setdef0.o setdef1.c setdef1.o setdefs.h start.o \ vers.c vers.o ${BASE}.efi ${BASE}.sym ${BASE}.list @@ -54,6 +55,7 @@ ${BASE}.efi: ${BASE}.sym ${OBJCOPY} -j .text \ + -j set_Xcommand_set \ -j .hash \ -j .data \ -j .sdata \ @@ -61,8 +63,6 @@ -j .rela \ -j .reloc \ -j .dynsym \ - -j .dynstr \ - -j set_Xcommand_set \ --target=efi-app-${MACHINE_ARCH} \ ${BASE}.sym ${BASE}.efi ==== //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#5 (text+ko) ==== @@ -43,7 +43,7 @@ CFLAGS+= -DLOADER CFLAGS+= -ffreestanding -LDFLAGS= -nostdlib -T ${.CURDIR}/ldscript.ia64 +LDFLAGS= -L/usr/lib -T ${.CURDIR}/ldscript.ia64 CLEANFILES+= vers.c vers.o ${PROG}.list CLEANFILES+= loader.help To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 29 14:10:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E1D037B41C; Fri, 29 Mar 2002 14:10:45 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2F2B937B419 for ; Fri, 29 Mar 2002 14:10:44 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2TMAhN43413 for perforce@freebsd.org; Fri, 29 Mar 2002 14:10:43 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Fri, 29 Mar 2002 14:10:43 -0800 (PST) Message-Id: <200203292210.g2TMAhN43413@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 8640 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8640 Change 8640 by tmm@tmm_forge on 2002/03/29 14:10:23 Do not use semi-fixed TLB slots any more; the [di]tlb_store arrays are now allocated from start to end, the indices to not inidcate the TLB slots any more. Affected files ... ... //depot/projects/sparc64/sys/boot/sparc64/loader/locore.S#2 edit ... //depot/projects/sparc64/sys/boot/sparc64/loader/main.c#20 edit ... //depot/projects/sparc64/sys/boot/sparc64/loader/metadata.c#7 edit Differences ... ==== //depot/projects/sparc64/sys/boot/sparc64/loader/locore.S#2 (text+ko) ==== @@ -86,18 +86,16 @@ not %o0 /* - * %o0 = slot number - * %o1 = vpn - * %o2 = tte data + * %o0 = vpn + * %o1 = tte data */ ENTRY(itlb_enter) rdpr %pstate, %o4 wrpr %o4, PSTATE_IE, %pstate - sllx %o0, 3, %o0 - sllx %o1, PAGE_SHIFT, %o1 + sllx %o0, PAGE_SHIFT, %o0 mov AA_IMMU_TAR, %o3 - stxa %o1, [%o3] ASI_IMMU - stxa %o2, [%o0] ASI_ITLB_DATA_ACCESS_REG + stxa %o0, [%o3] ASI_IMMU + stxa %o1, [%g0] ASI_ITLB_DATA_IN_REG membar #Sync retl wrpr %o4, 0, %pstate @@ -105,11 +103,10 @@ ENTRY(dtlb_enter) rdpr %pstate, %o4 wrpr %o4, PSTATE_IE, %pstate - sllx %o0, 3, %o0 - sllx %o1, PAGE_SHIFT, %o1 + sllx %o0, PAGE_SHIFT, %o0 mov AA_DMMU_TAR, %o3 - stxa %o1, [%o3] ASI_DMMU - stxa %o2, [%o0] ASI_DTLB_DATA_ACCESS_REG + stxa %o0, [%o3] ASI_DMMU + stxa %o1, [%g0] ASI_DTLB_DATA_IN_REG membar #Sync retl wrpr %o4, 0, %pstate ==== //depot/projects/sparc64/sys/boot/sparc64/loader/main.c#20 (text+ko) ==== @@ -57,8 +57,8 @@ typedef void kernel_entry_t(vm_offset_t mdp, u_long o1, u_long o2, u_long o3, void *openfirmware); -extern void itlb_enter(int slot, u_long vpn, u_long data); -extern void dtlb_enter(int slot, u_long vpn, u_long data); +extern void itlb_enter(u_long vpn, u_long data); +extern void dtlb_enter(u_long vpn, u_long data); extern vm_offset_t itlb_va_to_pa(vm_offset_t); extern vm_offset_t dtlb_va_to_pa(vm_offset_t); extern vm_offset_t md_load(char *, vm_offset_t *); @@ -255,10 +255,6 @@ vm_offset_t pa, mva; struct tte tte; - if (dtlb_slot < 0) - panic("mmu_mapin: out of dtlb_slots"); - if (itlb_slot < 0) - panic("mmu_mapin: out of itlb_slots"); if (va + len > curkva) curkva = va + len; @@ -284,13 +280,21 @@ /* The mappings may have changed, be paranoid. */ continue; } + /* + * Actually, we can only allocate two pages less at + * most (depending on the kernel TSB size). + */ + if (dtlb_slot >= dtlb_slot_max) + panic("mmu_mapin: out of dtlb_slots"); + if (itlb_slot >= itlb_slot_max) + panic("mmu_mapin: out of itlb_slots"); tte.tte_vpn = TV_VPN(va); tte.tte_data = TD_V | TD_4M | TD_PA(pa) | TD_L | TD_CP | TD_CV | TD_P | TD_W; - dtlb_store[--dtlb_slot] = tte; - itlb_store[--itlb_slot] = tte; - dtlb_enter(dtlb_slot, tte.tte_vpn, tte.tte_data); - itlb_enter(itlb_slot, tte.tte_vpn, tte.tte_data); + dtlb_store[dtlb_slot++] = tte; + itlb_store[itlb_slot++] = tte; + dtlb_enter(tte.tte_vpn, tte.tte_data); + itlb_enter(tte.tte_vpn, tte.tte_data); pa = (vm_offset_t)-1; } len -= len > PAGE_SIZE_4M ? PAGE_SIZE_4M : len; @@ -349,8 +353,6 @@ itlb_store = malloc(itlb_slot_max * sizeof(*itlb_store)); if (dtlb_store == NULL || itlb_store == NULL) panic("init_tlb: malloc"); - dtlb_slot = dtlb_slot_max; - itlb_slot = itlb_slot_max; } int ==== //depot/projects/sparc64/sys/boot/sparc64/loader/metadata.c#7 (text+ko) ==== @@ -319,9 +319,9 @@ file_addmetadata(kfp, MODINFOMD_DTLB_SLOTS, sizeof dtlb_slots, &dtlb_slots); file_addmetadata(kfp, MODINFOMD_ITLB_SLOTS, sizeof itlb_slots, &itlb_slots); file_addmetadata(kfp, MODINFOMD_DTLB, dtlb_slots * sizeof(struct tte), - &dtlb_store[dtlb_slot]); + dtlb_store); file_addmetadata(kfp, MODINFOMD_ITLB, itlb_slots * sizeof(struct tte), - &itlb_store[itlb_slot]); + itlb_store); *modulep = addr; size = md_copymodules(0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 29 21:25:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EAE737B400; Fri, 29 Mar 2002 21:24:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id DE24D37B417; Fri, 29 Mar 2002 21:24:10 -0800 (PST) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.11.6/8.11.6) with SMTP id g2U5O6w74735; Sat, 30 Mar 2002 00:24:06 -0500 (EST) (envelope-from robert@fledge.watson.org) Date: Sat, 30 Mar 2002 00:24:06 -0500 (EST) From: Robert Watson X-Sender: robert@fledge.watson.org To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 8574 for review In-Reply-To: <200203281709.g2SH9g038754@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG So there's a lot of other stuff in that commit too. Could you make sure you describe all the changes in your commit messages? Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services On Thu, 28 Mar 2002, Brian Feldman wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8574 > > Change 8574 by green@green_laptop_2 on 2002/03/28 09:09:26 > > Turn struct vnode {}'s v_op field from a vop_t ** to a vop_t ***. > Previously, it pointed to the actual vfs_init.c-generated > operation vector being used. However, this vector could be redone > at runtime via introduction of new vnode operations and removal > of old ones; this would result in the old vnode operation vector > being freed from underneath. This didn't show up before since > the old kernel malloc(9) coincidentally kept the old vop_t ** > in the vnodes valid. Jeff Roberson's UMA commit made this bug > apparent due to differently-sized chunks of memory actually being > likely to be allocated in different spots than previously allocated > at even if the size was grown just by a few bytes. > > The new vop_t *** actually points to the operation vector pointer > the kernel uses and modifies on-the-fly so that old vnodes, > and new ones created with getnewvnode(), both call the correct > operations. Getnewvnode()'s vop_t **vops argument changes to a > vop_t *** to reflect this. > > Affected files ... > > ... //depot/projects/trustedbsd/mac/sys/coda/coda_vnops.c#5 edit > ... //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#12 edit > ... //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#4 edit > ... //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#6 edit > ... //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_denode.c#4 edit > ... //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#6 edit > ... //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_subr.c#2 edit > ... //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vfsops.c#4 edit > ... //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#3 edit > ... //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_node.c#4 edit > ... //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vfsops.c#5 edit > ... //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vnops.c#6 edit > ... //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vncache.c#5 edit > ... //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_node.c#5 edit > ... //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_subr.c#3 edit > ... //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_vnops.c#3 edit > ... //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_subr.c#6 edit > ... //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vfsops.c#5 edit > ... //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#4 edit > ... //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vfsops.c#5 edit > ... //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#5 edit > ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#122 edit > ... //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#20 edit > ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_node.c#4 edit > ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_subs.c#5 edit > ... //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs.h#3 edit > ... //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs_subr.c#3 edit > ... //depot/projects/trustedbsd/mac/sys/sys/vnode.h#19 edit > ... //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#9 edit > ... //depot/projects/trustedbsd/mac/sys/ufs/ifs/ifs_vfsops.c#4 edit > ... //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#30 edit > ... //depot/projects/trustedbsd/mac/sys/vm/vm_swap.c#5 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/coda/coda_vnops.c#5 (text+ko) ==== > > @@ -578,7 +578,7 @@ > * Make sure this is a coda style cnode, but it may be a > * different vfsp > */ > - if (tvp->v_op != coda_vnodeop_p) { > + if (tvp->v_op != &coda_vnodeop_p) { > vrele(tvp); > NDFREE(&ndp, NDF_ONLY_PNBUF); > MARK_INT_FAIL(CODA_IOCTL_STATS); > @@ -1959,7 +1959,7 @@ > lockinit(&cp->c_lock, PINOD, "cnode", 0, 0); > cp->c_fid = *fid; > > - err = getnewvnode(VT_CODA, vfsp, coda_vnodeop_p, &vp); > + err = getnewvnode(VT_CODA, vfsp, &coda_vnodeop_p, &vp); > if (err) { > panic("coda: getnewvnode returned error %d\n", err); > } > > ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#12 (text+ko) ==== > > @@ -143,7 +143,7 @@ > } else { > dev = NODEV; > } > - error = getnewvnode(VT_DEVFS, mp, devfs_vnodeop_p, &vp); > + error = getnewvnode(VT_DEVFS, mp, &devfs_vnodeop_p, &vp); > if (error != 0) { > printf("devfs_allocv: failed to allocate new vnode\n"); > return (error); > @@ -152,7 +152,7 @@ > if (de->de_dirent->d_type == DT_CHR) { > vp->v_type = VCHR; > vp = addaliasu(vp, dev->si_udev); > - vp->v_op = devfs_specop_p; > + vp->v_op = &devfs_specop_p; > } else if (de->de_dirent->d_type == DT_DIR) { > vp->v_type = VDIR; > } else if (de->de_dirent->d_type == DT_LNK) { > > ==== //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#4 (text+ko) ==== > > @@ -135,7 +135,7 @@ > */ > MALLOC(fd, struct fdescnode *, sizeof(struct fdescnode), M_TEMP, M_WAITOK); > > - error = getnewvnode(VT_FDESC, mp, fdesc_vnodeop_p, vpp); > + error = getnewvnode(VT_FDESC, mp, &fdesc_vnodeop_p, vpp); > if (error) { > FREE(fd, M_TEMP); > goto out; > > ==== //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#6 (text+ko) ==== > > @@ -496,7 +496,7 @@ > MALLOC(hp, struct hpfsnode *, sizeof(struct hpfsnode), > M_HPFSNO, M_WAITOK); > > - error = getnewvnode(VT_HPFS, hpmp->hpm_mp, hpfs_vnodeop_p, &vp); > + error = getnewvnode(VT_HPFS, hpmp->hpm_mp, &hpfs_vnodeop_p, &vp); > if (error) { > printf("hpfs_vget: can't get new vnode\n"); > FREE(hp, M_HPFSNO); > > ==== //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_denode.c#4 (text+ko) ==== > > @@ -253,7 +253,7 @@ > * copy it from the passed disk buffer. > */ > /* getnewvnode() does a VREF() on the vnode */ > - error = getnewvnode(VT_MSDOSFS, mntp, msdosfs_vnodeop_p, &nvp); > + error = getnewvnode(VT_MSDOSFS, mntp, &msdosfs_vnodeop_p, &nvp); > if (error) { > *depp = NULL; > FREE(ldep, M_MSDOSFSNODE); > > ==== //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#6 (text+ko) ==== > > @@ -732,7 +732,7 @@ > return (0); > } > > - error = getnewvnode(VT_NTFS, ntmp->ntm_mountp, ntfs_vnodeop_p, &vp); > + error = getnewvnode(VT_NTFS, ntmp->ntm_mountp, &ntfs_vnodeop_p, &vp); > if(error) { > ntfs_frele(fp); > ntfs_ntput(ip); > > ==== //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_subr.c#2 (text+ko) ==== > > @@ -176,7 +176,7 @@ > MALLOC(xp, struct null_node *, sizeof(struct null_node), > M_NULLFSNODE, M_WAITOK); > > - error = getnewvnode(VT_NULL, mp, null_vnodeop_p, vpp); > + error = getnewvnode(VT_NULL, mp, &null_vnodeop_p, vpp); > if (error) { > FREE(xp, M_NULLFSNODE); > return (error); > @@ -307,7 +307,7 @@ > * Can't do this check because vop_reclaim runs > * with a funny vop vector. > */ > - if (vp->v_op != null_vnodeop_p) { > + if (vp->v_op != &null_vnodeop_p) { > printf ("null_checkvp: on non-null-node\n"); > while (null_checkvp_barrier) /*WAIT*/ ; > panic("null_checkvp"); > > ==== //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vfsops.c#4 (text+ko) ==== > > @@ -121,7 +121,7 @@ > * Unlock lower node to avoid deadlock. > * (XXX) VOP_ISLOCKED is needed? > */ > - if ((mp->mnt_vnodecovered->v_op == null_vnodeop_p) && > + if ((mp->mnt_vnodecovered->v_op == &null_vnodeop_p) && > VOP_ISLOCKED(mp->mnt_vnodecovered, NULL)) { > VOP_UNLOCK(mp->mnt_vnodecovered, 0, td); > isvnunlocked = 1; > > ==== //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#3 (text+ko) ==== > > @@ -280,7 +280,7 @@ > * that aren't. (We must always map first vp or vclean fails.) > */ > if (i && (*this_vp_p == NULLVP || > - (*this_vp_p)->v_op != null_vnodeop_p)) { > + (*this_vp_p)->v_op != &null_vnodeop_p)) { > old_vps[i] = NULLVP; > } else { > old_vps[i] = *this_vp_p; > > ==== //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_node.c#4 (text+ko) ==== > > @@ -170,7 +170,7 @@ > * elsewhere if MALLOC should block. > */ > MALLOC(np, struct nwnode *, sizeof *np, M_NWNODE, M_WAITOK | M_ZERO); > - error = getnewvnode(VT_NWFS, mp, nwfs_vnodeop_p, &vp); > + error = getnewvnode(VT_NWFS, mp, &nwfs_vnodeop_p, &vp); > if (error) { > *vpp = NULL; > FREE(np, M_NWNODE); > > ==== //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vfsops.c#5 (text+ko) ==== > > @@ -118,7 +118,7 @@ > MALLOC(fmp, struct portalmount *, sizeof(struct portalmount), > M_PORTALFSMNT, M_WAITOK); /* XXX */ > > - error = getnewvnode(VT_PORTAL, mp, portal_vnodeop_p, &rvp); /* XXX */ > + error = getnewvnode(VT_PORTAL, mp, &portal_vnodeop_p, &rvp); /* XXX */ > if (error) { > FREE(fmp, M_PORTALFSMNT); > FREE(pn, M_TEMP); > > ==== //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vnops.c#6 (text+ko) ==== > > @@ -135,7 +135,7 @@ > MALLOC(pt, struct portalnode *, sizeof(struct portalnode), > M_TEMP, M_WAITOK); > > - error = getnewvnode(VT_PORTAL, dvp->v_mount, portal_vnodeop_p, &fvp); > + error = getnewvnode(VT_PORTAL, dvp->v_mount, &portal_vnodeop_p, &fvp); > if (error) { > FREE(pt, M_TEMP); > goto bad; > > ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vncache.c#5 (text+ko) ==== > > @@ -132,7 +132,7 @@ > MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, M_WAITOK); > if (++pfs_vncache_entries > pfs_vncache_maxentries) > pfs_vncache_maxentries = pfs_vncache_entries; > - error = getnewvnode(VT_PSEUDOFS, mp, pfs_vnodeop_p, vpp); > + error = getnewvnode(VT_PSEUDOFS, mp, &pfs_vnodeop_p, vpp); > if (error) > return (error); > pvd->pvd_pn = pn; > > ==== //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_node.c#5 (text+ko) ==== > > @@ -220,7 +220,7 @@ > return ENOENT; > > MALLOC(np, struct smbnode *, sizeof *np, M_SMBNODE, M_WAITOK); > - error = getnewvnode(VT_SMBFS, mp, smbfs_vnodeop_p, &vp); > + error = getnewvnode(VT_SMBFS, mp, &smbfs_vnodeop_p, &vp); > if (error) { > FREE(np, M_SMBNODE); > return error; > > ==== //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_subr.c#3 (text+ko) ==== > > @@ -212,7 +212,7 @@ > MALLOC(xp, struct umap_node *, sizeof(struct umap_node), > M_TEMP, M_WAITOK); > > - error = getnewvnode(VT_UMAP, mp, umap_vnodeop_p, vpp); > + error = getnewvnode(VT_UMAP, mp, &umap_vnodeop_p, vpp); > if (error) { > FREE(xp, M_TEMP); > return (error); > @@ -311,7 +311,7 @@ > * Can't do this check because vop_reclaim runs > * with funny vop vector. > */ > - if (vp->v_op != umap_vnodeop_p) { > + if (vp->v_op != &umap_vnodeop_p) { > printf ("umap_checkvp: on non-umap-node\n"); > while (umap_checkvp_barrier) /*WAIT*/ ; > panic("umap_checkvp"); > > ==== //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_vnops.c#3 (text+ko) ==== > > @@ -125,7 +125,7 @@ > * that aren't. (Must map first vp or vclean fails.) > */ > > - if (i && (*this_vp_p)->v_op != umap_vnodeop_p) { > + if (i && (*this_vp_p)->v_op != &umap_vnodeop_p) { > old_vps[i] = NULL; > } else { > old_vps[i] = *this_vp_p; > > ==== //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_subr.c#6 (text+ko) ==== > > @@ -545,7 +545,7 @@ > * Create new node rather then replace old node > */ > > - error = getnewvnode(VT_UNION, mp, union_vnodeop_p, vpp); > + error = getnewvnode(VT_UNION, mp, &union_vnodeop_p, vpp); > if (error) { > /* > * If an error occurs clear out vnodes. > @@ -1216,7 +1216,7 @@ > { > struct union_node *un; > > - if (vp->v_op != union_vnodeop_p) { > + if (vp->v_op != &union_vnodeop_p) { > if (vppp) { > VREF(vp); > *(*vppp)++ = vp; > @@ -1299,7 +1299,7 @@ > { > int error = 0; > > - if ((*vp)->v_op == union_vnodeop_p) { > + if ((*vp)->v_op == &union_vnodeop_p) { > struct vnode *lvp; > > lvp = union_dircache(*vp, td); > > ==== //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vfsops.c#5 (text+ko) ==== > > @@ -126,7 +126,7 @@ > /* > * Unlock lower node to avoid deadlock. > */ > - if (lowerrootvp->v_op == union_vnodeop_p) > + if (lowerrootvp->v_op == &union_vnodeop_p) > VOP_UNLOCK(lowerrootvp, 0, td); > #endif > > @@ -140,7 +140,7 @@ > error = namei(ndp); > > #if 0 > - if (lowerrootvp->v_op == union_vnodeop_p) > + if (lowerrootvp->v_op == &union_vnodeop_p) > vn_lock(lowerrootvp, LK_EXCLUSIVE | LK_RETRY, td); > #endif > if (error) > > ==== //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#4 (text+ko) ==== > > @@ -1319,7 +1319,7 @@ > * replace the fdvp, release the original one and ref the new one. > */ > > - if (fdvp->v_op == union_vnodeop_p) { /* always true */ > + if (fdvp->v_op == &union_vnodeop_p) { /* always true */ > struct union_node *un = VTOUNION(fdvp); > if (un->un_uppervp == NULLVP) { > /* > @@ -1341,7 +1341,7 @@ > * replace the fvp, release the original one and ref the new one. > */ > > - if (fvp->v_op == union_vnodeop_p) { /* always true */ > + if (fvp->v_op == &union_vnodeop_p) { /* always true */ > struct union_node *un = VTOUNION(fvp); > #if 0 > struct union_mount *um = MOUNTTOUNIONMOUNT(fvp->v_mount); > @@ -1399,7 +1399,7 @@ > * reference. > */ > > - if (tdvp->v_op == union_vnodeop_p) { > + if (tdvp->v_op == &union_vnodeop_p) { > struct union_node *un = VTOUNION(tdvp); > > if (un->un_uppervp == NULLVP) { > @@ -1429,7 +1429,7 @@ > * file and change tvp to NULL. > */ > > - if (tvp != NULLVP && tvp->v_op == union_vnodeop_p) { > + if (tvp != NULLVP && tvp->v_op == &union_vnodeop_p) { > struct union_node *un = VTOUNION(tvp); > > tvp = union_lock_upper(un, ap->a_tcnp->cn_thread); > > ==== //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vfsops.c#5 (text+ko) ==== > > @@ -1029,7 +1029,7 @@ > MALLOC(ip, struct inode *, sizeof(struct inode), M_EXT2NODE, M_WAITOK); > > /* Allocate a new vnode/inode. */ > - if ((error = getnewvnode(VT_UFS, mp, ext2_vnodeop_p, &vp)) != 0) { > + if ((error = getnewvnode(VT_UFS, mp, &ext2_vnodeop_p, &vp)) != 0) { > if (ext2fs_inode_hash_lock < 0) > wakeup(&ext2fs_inode_hash_lock); > ext2fs_inode_hash_lock = 0; > > ==== //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#5 (text+ko) ==== > > @@ -705,7 +705,7 @@ > return (0); > > /* Allocate a new vnode/iso_node. */ > - if ((error = getnewvnode(VT_ISOFS, mp, cd9660_vnodeop_p, &vp)) != 0) { > + if ((error = getnewvnode(VT_ISOFS, mp, &cd9660_vnodeop_p, &vp)) != 0) { > *vpp = NULLVP; > return (error); > } > @@ -852,11 +852,11 @@ > */ > switch (vp->v_type = IFTOVT(ip->inode.iso_mode)) { > case VFIFO: > - vp->v_op = cd9660_fifoop_p; > + vp->v_op = &cd9660_fifoop_p; > break; > case VCHR: > case VBLK: > - vp->v_op = cd9660_specop_p; > + vp->v_op = &cd9660_specop_p; > vp = addaliasu(vp, ip->inode.iso_rdev); > ip->i_vnode = vp; > break; > > ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#122 (text+ko) ==== > > @@ -90,9 +90,9 @@ > #if MAC_MAX_POLICIES > 32 > #error "MAC_MAX_POLICIES too large" > #endif > -static const unsigned int mac_max_policies = MAC_MAX_POLICIES; > -static unsigned int mac_policies_free = (1 << MAC_MAX_POLICIES) - 1; > -SYSCTL_INT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD, > +static unsigned int mac_max_policies = MAC_MAX_POLICIES; > +static unsigned int mac_policies_free = (1 << MAC_MAX_POLICIES) - 1; > +SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD, > &mac_max_policies, 0, ""); > struct maclabels { > void *labels[MAC_MAX_POLICIES]; > @@ -149,9 +149,9 @@ > error = 0; \ > sx_slock(&mac_policy_list_lock); \ > LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ > - if (mpc->mpc_ops->mpo_ ## check != NULL) \ > + if (mpc->mpc_ops.mpo_ ## check != NULL) \ > error = error_select( \ > - mpc->mpc_ops->mpo_ ## check (## args), \ > + mpc->mpc_ops.mpo_ ## check (## args), \ > error); \ > } \ > sx_sunlock(&mac_policy_list_lock); \ > @@ -170,9 +170,9 @@ > \ > sx_slock(&mac_policy_list_lock); \ > LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ > - if (mpc->mpc_ops->mpo_ ## operation != NULL) \ > + if (mpc->mpc_ops.mpo_ ## operation != NULL) \ > result = result composition \ > - mpc->mpc_ops->mpo_ ## operation ( ## args); \ > + mpc->mpc_ops.mpo_ ## operation ( ## args); \ > } \ > sx_sunlock(&mac_policy_list_lock); \ > } while (0) > @@ -186,8 +186,8 @@ > \ > sx_slock(&mac_policy_list_lock); \ > LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ > - if (mpc->mpc_ops->mpo_ ## operation != NULL) \ > - mpc->mpc_ops->mpo_ ## operation (## args); \ > + if (mpc->mpc_ops.mpo_ ## operation != NULL) \ > + mpc->mpc_ops.mpo_ ## operation (## args); \ > } \ > sx_sunlock(&mac_policy_list_lock); \ > } while (0) > @@ -236,8 +236,250 @@ > mac_policy_register(struct mac_policy_conf *mpc) > { > struct mac_policy_conf *tmpc; > + struct mac_policy_op_entry *mpe; > int slot; > > + for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) { > + switch (mpe->mpe_constant) { > + case MAC_DESTROY: > + mpc->mpc_ops.mpo_destroy = mpe->mpe_function; > + break; > + case MAC_INIT: > + mpc->mpc_ops.mpo_init = mpe->mpe_function; > + break; > + case MAC_COPY_LABEL: > + mpc->mpc_ops.mpo_copy_label = mpe->mpe_function; > + break; > + case MAC_DOMINATE: > + mpc->mpc_ops.mpo_dominate = mpe->mpe_function; > + break; > + case MAC_EQUAL: > + mpc->mpc_ops.mpo_equal = mpe->mpe_function; > + break; > + case MAC_PRINT_LABEL: > + mpc->mpc_ops.mpo_print_label = mpe->mpe_function; > + break; > + case MAC_VALIDATE_LABEL: > + mpc->mpc_ops.mpo_validate_label = mpe->mpe_function; > + break; > + case MAC_CREATE_DEVFS_DEVICE: > + mpc->mpc_ops.mpo_create_devfs_device = > + mpe->mpe_function; > + break; > + case MAC_CREATE_DEVFS_DIRECTORY: > + mpc->mpc_ops.mpo_create_devfs_directory = > + mpe->mpe_function; > + break; > + case MAC_CREATE_VNODE_FROM_VNODE: > + mpc->mpc_ops.mpo_create_vnode_from_vnode = > + mpe->mpe_function; > + break; > + case MAC_CREATE_MOUNT: > + mpc->mpc_ops.mpo_create_mount = mpe->mpe_function; > + break; > + case MAC_CREATE_ROOT_MOUNT: > + mpc->mpc_ops.mpo_create_root_mount = mpe->mpe_function; > + break; > + case MAC_CREATE_MBUF_FROM_SOCKET: > + mpc->mpc_ops.mpo_create_mbuf_from_socket = > + mpe->mpe_function; > + break; > + case MAC_CREATE_SOCKET: > + mpc->mpc_ops.mpo_create_socket = mpe->mpe_function; > + break; > + case MAC_RELABEL_SOCKET: > + mpc->mpc_ops.mpo_relabel_socket = mpe->mpe_function; > + break; > + case MAC_CREATE_BPFDESC: > + mpc->mpc_ops.mpo_create_bpfdesc = mpe->mpe_function; > + break; > + case MAC_CREATE_IFNET: > + mpc->mpc_ops.mpo_create_ifnet = mpe->mpe_function; > + break; > + case MAC_CREATE_MBUF_DATAGRAM_FROM_MBUF_FRAGMENTQUEUE: > + mpc->mpc_ops.mpo_create_mbuf_datagram_from_mbuf_fragmentqueue = > + mpe->mpe_function; > + break; > + case MAC_CREATE_MBUF_FRAGMENT_FROM_MBUF: > + mpc->mpc_ops.mpo_create_mbuf_fragment_from_mbuf = > + mpe->mpe_function; > + break; > + case MAC_CREATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT: > + mpc->mpc_ops.mpo_create_mbuf_fragmentqueue_from_mbuf_fragment = > + mpe->mpe_function; > + break; > + case MAC_CREATE_MBUF_FROM_MBUF: > + mpc->mpc_ops.mpo_create_mbuf_from_mbuf = > + mpe->mpe_function; > + break; > + case MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET: > + mpc->mpc_ops.mpo_create_mbuf_linklayer_for_ifnet = > + mpe->mpe_function; > + break; > + case MAC_CREATE_MBUF_FROM_BPFDESC: > + mpc->mpc_ops.mpo_create_mbuf_from_bpfdesc = > + mpe->mpe_function; > + break; > + case MAC_CREATE_MBUF_FROM_IFNET: > + mpc->mpc_ops.mpo_create_mbuf_from_ifnet = > + mpe->mpe_function; > + break; > + case MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF: > + mpc->mpc_ops.mpo_create_mbuf_multicast_encap_from_mbuf = > + mpe->mpe_function; > + break; > + case MAC_CREATE_MBUF_NETLAYER_FROM_MBUF: > + mpc->mpc_ops.mpo_create_mbuf_netlayer_from_mbuf = > + mpe->mpe_function; > + break; > + case MAC_MBUF_FRAGMENT_MATCHES_MBUF_FRAGMENTQUEUE: > + mpc->mpc_ops.mpo_mbuf_fragment_matches_mbuf_fragmentqueue = > + mpe->mpe_function; > + break; > + case MAC_RELABEL_IFNET: > + mpc->mpc_ops.mpo_relabel_ifnet = mpe->mpe_function; > + break; > + case MAC_UPDATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT: > + mpc->mpc_ops.mpo_update_mbuf_fragmentqueue_from_mbuf_fragment = > + mpe->mpe_function; > + break; > + case MAC_CREATE_SUBJECT: > + mpc->mpc_ops.mpo_create_subject = mpe->mpe_function; > + break; > + case MAC_EXECVE_TRANSITION: > + mpc->mpc_ops.mpo_execve_transition = mpe->mpe_function; > + break; > + case MAC_EXECVE_WILL_TRANSITION: > + mpc->mpc_ops.mpo_execve_will_transition = > + mpe->mpe_function; > + break; > + case MAC_CREATE_PROC0: > + mpc->mpc_ops.mpo_create_proc0 = mpe->mpe_function; > + break; > + case MAC_CREATE_PROC1: > + mpc->mpc_ops.mpo_create_proc1 = mpe->mpe_function; > + break; > + case MAC_RELABEL_SUBJECT: > + mpc->mpc_ops.mpo_relabel_subject = > + mpe->mpe_function; > + break; > + case MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET: > + mpc->mpc_ops.mpo_bpfdesc_check_receive_from_ifnet = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_SEE_CRED: > + mpc->mpc_ops.mpo_cred_check_see_cred = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_SEE_SOCKET: > + mpc->mpc_ops.mpo_cred_check_see_socket = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_RELABEL_IFNET: > + mpc->mpc_ops.mpo_cred_check_relabel_ifnet = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_RELABEL_SOCKET: > + mpc->mpc_ops.mpo_cred_check_relabel_socket = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_RELABEL_SUBJECT: > + mpc->mpc_ops.mpo_cred_check_relabel_subject = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_RELABEL_VNODE: > + mpc->mpc_ops.mpo_cred_check_relabel_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_STATFS: > + mpc->mpc_ops.mpo_cred_check_statfs = mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_DEBUG_PROC: > + mpc->mpc_ops.mpo_cred_check_debug_proc = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_EXEC_FILE: > + mpc->mpc_ops.mpo_cred_check_exec_file = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_CHDIR_VNODE: > + mpc->mpc_ops.mpo_cred_check_chdir_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_CREATE_VNODE: > + mpc->mpc_ops.mpo_cred_check_create_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_DELETE_VNODE: > + mpc->mpc_ops.mpo_cred_check_delete_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_EXEC_VNODE: > + mpc->mpc_ops.mpo_cred_check_exec_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_OPEN_VNODE: > + mpc->mpc_ops.mpo_cred_check_open_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_RENAME_FROM_VNODE: > + mpc->mpc_ops.mpo_cred_check_rename_from_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_RENAME_TO_VNODE: > + mpc->mpc_ops.mpo_cred_check_rename_to_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_REVOKE_VNODE: > + mpc->mpc_ops.mpo_cred_check_revoke_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_SEARCH_VNODE: > + mpc->mpc_ops.mpo_cred_check_search_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_SETFLAGS_VNODE: > + mpc->mpc_ops.mpo_cred_check_setflags_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_SETMODE_VNODE: > + mpc->mpc_ops.mpo_cred_check_setmode_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_SETOWNER_VNODE: > + mpc->mpc_ops.mpo_cred_check_setowner_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_SETUTIMES_VNODE: > + mpc->mpc_ops.mpo_cred_check_setutimes_vnode = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_SCHED_PROC: > + mpc->mpc_ops.mpo_cred_check_sched_proc = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_SIGNAL_PROC: > + mpc->mpc_ops.mpo_cred_check_signal_proc = > + mpe->mpe_function; > + break; > + case MAC_CRED_CHECK_STAT_VNODE: > + mpc->mpc_ops.mpo_cred_check_stat_vnode = > + mpe->mpe_function; > + break; > + case MAC_IFNET_CHECK_SEND_MBUF: > + mpc->mpc_ops.mpo_ifnet_check_send_mbuf = > + mpe->mpe_function; > + break; > + case MAC_SOCKET_CHECK_RECEIVE_MBUF: > + mpc->mpc_ops.mpo_socket_check_receive_mbuf = > + mpe->mpe_function; > + break; > + default: > + printf("MAC policy `%s': unknown operation %d\n", > + mpc->mpc_name, mpe->mpe_constant); > + return (EINVAL); > + } > + } > sx_xlock(&mac_policy_list_lock); > LIST_FOREACH(tmpc, &mac_policy_list, mpc_list) { > if (strcmp(tmpc->mpc_name, mpc->mpc_name) == 0) { > @@ -249,7 +491,7 @@ > slot = ffs(mac_policies_free); > if (slot == 0) { > sx_xunlock(&mac_policy_list_lock); > - return (EEXIST); > + return (ENOMEM); > } > slot--; > mac_policies_free &= ~(1 << slot); > @@ -261,8 +503,8 @@ > printf("Security policy: %s (%s)\n", mpc->mpc_fullname, mpc->mpc_name); > > /* Per-policy initialization. */ > - if (mpc->mpc_ops->mpo_init != NULL) > - (*(mpc->mpc_ops->mpo_init))(mpc); > + if (mpc->mpc_ops.mpo_init != NULL) > + (*(mpc->mpc_ops.mpo_init))(mpc); > sx_xunlock(&mac_policy_list_lock); > > return (0); > @@ -278,8 +520,8 @@ > if (mpc->mpc_field_off != -1) > return (EBUSY); > sx_xlock(&mac_policy_list_lock); > - if (mpc->mpc_ops->mpo_destroy != NULL) > - (*(mpc->mpc_ops->mpo_destroy))(mpc); > + if (mpc->mpc_ops.mpo_destroy != NULL) > + (*(mpc->mpc_ops.mpo_destroy))(mpc); > > LIST_REMOVE(mpc, mpc_list); > sx_xunlock(&mac_policy_list_lock); > > ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#20 (text+ko) ==== > > @@ -677,7 +677,7 @@ > getnewvnode(tag, mp, vops, vpp) > enum vtagtype tag; > struct mount *mp; > - vop_t **vops; > + vop_t ***vops; > struct vnode **vpp; > { > int s; > @@ -1552,7 +1552,7 @@ > } > if (vfinddev(dev, VCHR, vpp)) > return (0); > - error = getnewvnode(VT_NON, (struct mount *)0, spec_vnodeop_p, &nvp); > + error = getnewvnode(VT_NON, (struct mount *)0, &spec_vnodeop_p, &nvp); > if (error) { > *vpp = NULLVP; > return (error); > @@ -1578,7 +1578,7 @@ > udev_t nvp_rdev; > { > struct vnode *ovp; > - vop_t **ops; > + vop_t ***ops; > dev_t dev; > > if (nvp->v_type == VBLK) > @@ -1952,7 +1952,7 @@ > vgonel(vp, td); > } else { > vclean(vp, 0, td); > - vp->v_op = spec_vnodeop_p; > + vp->v_op = &spec_vnodeop_p; > insmntque(vp, (struct mount *) 0); > } > mtx_lock(&mntvnode_mtx); > @@ -2108,7 +2108,7 @@ > /* > * Done with purge, notify sleepers of the grim news. > */ > - vp->v_op = dead_vnodeop_p; > + vp->v_op = &dead_vnodeop_p; > if (vp->v_pollinfo != NULL) > vn_pollgone(vp); > vp->v_tag = VT_NON; > @@ -2847,7 +2847,7 @@ > int error; > > /* Allocate a new vnode */ > - if ((error = getnewvnode(VT_VFS, mp, sync_vnodeop_p, &vp)) != 0) { > + if ((error = getnewvnode(VT_VFS, mp, &sync_vnodeop_p, &vp)) != 0) { > mp->mnt_syncer = NULL; > return (error); > } > > ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_node.c#4 (text+ko) ==== > > @@ -223,7 +223,7 @@ > */ > np = uma_zalloc(nfsnode_zone, M_WAITOK); > > - error = getnewvnode(VT_NFS, mntp, nfsv2_vnodeop_p, &nvp); > + error = getnewvnode(VT_NFS, mntp, &nfsv2_vnodeop_p, &nvp); > if (error) { > if (nfs_node_hash_lock < 0) > wakeup(&nfs_node_hash_lock); > > ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_subs.c#5 (text+ko) ==== > > @@ -527,10 +527,10 @@ > if (vp->v_type != vtyp) { > vp->v_type = vtyp; > if (vp->v_type == VFIFO) { > - vp->v_op = fifo_nfsv2nodeop_p; > + vp->v_op = &fifo_nfsv2nodeop_p; > } > if (vp->v_type == VCHR || vp->v_type == VBLK) { > - vp->v_op = spec_nfsv2nodeop_p; > + vp->v_op = &spec_nfsv2nodeop_p; > vp = addaliasu(vp, rdev); > np->n_vnode = vp; > } > > ==== //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs.h#3 (text+ko) ==== > > @@ -103,7 +103,7 @@ > #define VTOLOMAC(vp) ((struct lomac_node *)(vp)->v_data) > #define VTOLVP(vp) VTOLOMAC(vp)->ln_lowervp > #define VFSTOLOMAC(mp) ((struct lomac_mount *)mp->mnt_data) > -#define VISLOMAC(vp) (vp->v_op == lomacfs_vnodeop_p) > +#define VISLOMAC(vp) (vp->v_op == &lomacfs_vnodeop_p) > > int lomacfs_node_alloc(struct mount *mp, struct componentname *cnp, > struct vnode *dvp, struct vnode *lowervp, struct vnode **vpp); > > ==== //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs_subr.c#3 (text+ko) ==== > > @@ -73,7 +73,7 @@ > return (EEXIST); > } > } > - error = getnewvnode(VT_NULL, mp, lomacfs_vnodeop_p, vpp); > + error = getnewvnode(VT_NULL, mp, &lomacfs_vnodeop_p, vpp); > if (error) { > vput(lowervp); > free(lp, M_LOMACFS); > > ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#19 (text+ko) ==== > > @@ -105,7 +105,7 @@ > int v_holdcnt; /* page & buffer references */ > u_long v_id; /* capability identifier */ > struct mount *v_mount; /* ptr to vfs we are in */ > - vop_t **v_op; /* vnode operations vector */ > + vop_t ***v_op; /* vnode operations vector */ > TAILQ_ENTRY(vnode) v_freelist; /* vnode freelist */ > TAILQ_ENTRY(vnode) v_nmntvnodes; /* vnodes for mount point */ > struct buflists v_cleanblkhd; /* clean blocklist head */ > @@ -527,7 +527,7 @@ > /* > * This call works for vnodes in the kernel. > */ > -#define VCALL(VP,OFF,AP) VOCALL((VP)->v_op,(OFF),(AP)) > +#define VCALL(VP,OFF,AP) VOCALL(*(VP)->v_op,(OFF),(AP)) > #define VDESC(OP) (& __CONCAT(OP,_desc)) > #define VOFFSET(OP) (VDESC(OP)->vdesc_offset) > > @@ -583,7 +583,7 @@ > void cvtstat(struct stat *st, struct ostat *ost); > void cvtnstat(struct stat *sb, struct nstat *nsb); > int getnewvnode(enum vtagtype tag, > - struct mount *mp, vop_t **vops, struct vnode **vpp); > + struct mount *mp, vop_t ***vops, struct vnode **vpp); > int lease_check(struct vop_lease_args *ap); > int spec_vnoperate(struct vop_generic_args *); > int speedup_syncer(void); > > ==== //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#9 (text+ko) ==== > > @@ -1192,7 +1192,7 @@ > ump->um_malloctype, M_WAITOK); > > /* Allocate a new vnode/inode. */ > - error = getnewvnode(VT_UFS, mp, ffs_vnodeop_p, &vp); > + error = getnewvnode(VT_UFS, mp, &ffs_vnodeop_p, &vp); > if (error) { > /* > * Do not wake up processes while holding the mutex, > > ==== //depot/projects/trustedbsd/mac/sys/ufs/ifs/ifs_vfsops.c#4 (text+ko) ==== > > @@ -201,7 +201,7 @@ > ump->um_malloctype, M_WAITOK); > > /* Allocate a new vnode/inode. */ > - error = getnewvnode(VT_UFS, mp, ifs_vnodeop_p, &vp); > + error = getnewvnode(VT_UFS, mp, &ifs_vnodeop_p, &vp); > if (error) { > /* > * Do not wake up processes while holding the mutex, > > ==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#30 (text+ko) ==== > > @@ -2208,12 +2208,12 @@ > switch(vp->v_type = IFTOVT(ip->i_mode)) { > case VCHR: > case VBLK: > - vp->v_op = specops; > + vp->v_op = &specops; > vp = addaliasu(vp, ip->i_rdev); > ip->i_vnode = vp; > break; > case VFIFO: > - vp->v_op = fifoops; > + vp->v_op = &fifoops; > break; > default: > break; > > ==== //depot/projects/trustedbsd/mac/sys/vm/vm_swap.c#5 (text+ko) ==== > > @@ -263,7 +263,7 @@ > u_long aligned_nblks; > > if (!swapdev_vp) { > - error = getnewvnode(VT_NON, NULL, swapdev_vnodeop_p, > + error = getnewvnode(VT_NON, NULL, &swapdev_vnodeop_p, > &swapdev_vp); > if (error) > panic("Cannot get vnode for swapdev"); > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 29 21:26:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5F9637B417; Fri, 29 Mar 2002 21:25:38 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id 82EAD37B416; Fri, 29 Mar 2002 21:25:36 -0800 (PST) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.11.6/8.11.6) with SMTP id g2U5PWw74752; Sat, 30 Mar 2002 00:25:32 -0500 (EST) (envelope-from robert@fledge.watson.org) Date: Sat, 30 Mar 2002 00:25:32 -0500 (EST) From: Robert Watson X-Sender: robert@fledge.watson.org To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 8575 for review In-Reply-To: <200203281713.g2SHDm939906@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Ah, ok. BTW, I can't help but wonder if the VFS change shouldn't have gone into another branch and/or the main tree rather than the MAC tree directly. Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services On Thu, 28 Mar 2002, Brian Feldman wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8575 > > Change 8575 by green@green_laptop_2 on 2002/03/28 09:13:36 > > Change the way that MAC policies' operation vectors are > declared from a hard-to-maintain struct which enforced > strong type-checking in the declarations in the module > and strict ordering requirements, to an easily-modifiable > array which will not have to be changed necessarily for > each addition of a new MAC operation. > > The downside of this is that the MAC policy authors will > have to manually make certain to match arguments of their > function declarations with what they pass in via the > operation vector, since C cannot help by providing strong > type checking here. > > (I accidentally already submitted kern_mac.c last.) > > Affected files ... > > ... //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#6 edit > ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#25 edit > ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#26 edit > ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.h#5 edit > ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#21 edit > ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#20 edit > ... //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 edit > ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#20 edit > ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#91 edit > ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#56 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#6 (text+ko) ==== > > @@ -222,70 +222,35 @@ > return (0); > } > > -static struct mac_policy_ops babyaudit_ops = > +static struct mac_policy_op_entry babyaudit_ops[] = > { > - NULL /* babyaudit_destroy */, > - NULL /* babyaudit_init */, > - NULL /* babyaudit_copy_label */, > - NULL /* babyaudit_dominate */, > - NULL /* babyaudit_equal */, > - NULL /* babyaudit_print_label */, > - NULL /* babyaudit_validate_label */, > - NULL /* babyaudit_create_devfs_device */, > - NULL /* babyaudit_create_devfs_directory */, > - NULL /* babyaudit_create_vnode_from_vnode */, > - NULL /* babyaudit_mountfs */, > - NULL /* babyaudit_mountrootfs */, > - NULL /* babyaudit_create_mbuf_from_socket */, > - NULL /* babyaudit_create_socket */, > - NULL /* babyaudit_relabel_socket */, > - NULL /* babyaudit_create_bpfdesc */, > - NULL /* babyaudit_create_ifnet */, > - NULL /* babyaudit_create_mbuf_datagram_from_mbuf_fragmentqueue */, > - NULL /* babyaudit_create_mbuf_fragment_from_mbuf */, > - NULL /* babyaudit_create_mbuf_fragmentqueue_from_mbuf_fragment */, > - NULL /* babyaudit_create_mbuf_from_mbuf */, > - NULL /* babyaudit_create_mbuf_linklayer_for_ifnet */, > - NULL /* babyaudit_create_mbuf_from_bpfdesc */, > - NULL /* babyaudit_create_mbuf_from_ifnet */, > - NULL /* babyaudit_create_mbuf_multicast_encap_from_mbuf */, > - NULL /* babyaudit_create_mbuf_netlayer_from_mbuf */, > - NULL /* babyaudit_mbuf_fragment_matches_mbuf_fragmentqueue */, > - NULL /* babyaudit_relabel_ifnet */, > - NULL /* babyaudit_update_mbuf_fragmentqueue_from_mbuf_fragment */, > - NULL /* babyaudit_create_subject */, > - NULL /* babyaudit_execve_transition */, > - NULL /* babyaudit_execve_will_transition */, > - NULL /* babyaudit_create_proc0 */, > - NULL /* babyaudit_create_proc1 */, > - NULL /* babyaudit_relabel_subject */, > - NULL /* babyaudit_bpfdesc_check_receive_from_ifnet */, > - NULL /* babyaudit_cred_check_see_cred */, > - NULL /* babyaudit_cred_check_see_socket */, > - NULL /* babyaudit_cred_check_relabel_ifnet */, > - NULL /* babyaudit_cred_check_relabel_socket */, > - NULL /* babyaudit_cred_check_relabel_subject */, > - NULL /* babyaudit_cred_check_relabel_vnode */, > - NULL /* babyaudit_cred_check_statfs */, > - NULL /* babyaudit_cred_check_debug_proc */, > - NULL /* babyaudit_cred_check_exec_file */, > - babyaudit_cred_check_chdir_vnode, > - babyaudit_cred_check_create_vnode, > - babyaudit_cred_check_delete_vnode, > - babyaudit_cred_check_exec_vnode, > - babyaudit_cred_check_open_vnode, > - babyaudit_cred_check_rename_from_vnode, > - babyaudit_cred_check_rename_to_vnode, > - babyaudit_cred_check_revoke_vnode, > - babyaudit_cred_check_search_vnode, > - babyaudit_cred_check_setflags_vnode, > - babyaudit_cred_check_setmode_vnode, > - babyaudit_cred_check_setowner_vnode, > - babyaudit_cred_check_setutimes_vnode, > - NULL /* babyaudit_cred_check_sched_proc */, > - NULL /* babyaudit_cred_check_signal_proc */, > - NULL /* babyaudit_ifnet_check_send_mbuf */, > - NULL /* babyaudit_socket_check_receive_mbuf */ > + { MAC_CRED_CHECK_CHDIR_VNODE, > + (macop_t)babyaudit_cred_check_chdir_vnode }, > + { MAC_CRED_CHECK_CREATE_VNODE, > + (macop_t)babyaudit_cred_check_create_vnode }, > + { MAC_CRED_CHECK_DELETE_VNODE, > + (macop_t)babyaudit_cred_check_delete_vnode }, > + { MAC_CRED_CHECK_EXEC_VNODE, > + (macop_t)babyaudit_cred_check_exec_vnode }, > + { MAC_CRED_CHECK_OPEN_VNODE, > + (macop_t)babyaudit_cred_check_open_vnode }, > + { MAC_CRED_CHECK_RENAME_FROM_VNODE, > + (macop_t)babyaudit_cred_check_rename_from_vnode }, > + { MAC_CRED_CHECK_RENAME_TO_VNODE, > + (macop_t)babyaudit_cred_check_rename_to_vnode }, > + { MAC_CRED_CHECK_REVOKE_VNODE, > + (macop_t)babyaudit_cred_check_revoke_vnode }, > + { MAC_CRED_CHECK_SEARCH_VNODE, > + (macop_t)babyaudit_cred_check_search_vnode }, > + { MAC_CRED_CHECK_SETFLAGS_VNODE, > + (macop_t)babyaudit_cred_check_setflags_vnode }, > + { MAC_CRED_CHECK_SETMODE_VNODE, > + (macop_t)babyaudit_cred_check_setmode_vnode }, > + { MAC_CRED_CHECK_SETOWNER_VNODE, > + (macop_t)babyaudit_cred_check_setowner_vnode }, > + { MAC_CRED_CHECK_SETUTIMES_VNODE, > + (macop_t)babyaudit_cred_check_setutimes_vnode }, > + { MAC_OP_LAST, NULL } > }; > > MAC_POLICY_SET(babyaudit_ops, trustedbsd_babyaudit, "TrustedBSD MAC/babyaudit", > > ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#25 (text+ko) ==== > > @@ -996,71 +996,129 @@ > return (0); > } > > -static struct mac_policy_ops mac_biba_ops = > +static struct mac_policy_op_entry mac_biba_ops[] = > { > - NULL, > - NULL, > - mac_biba_copy_label, > - mac_biba_single_dominate, > - mac_biba_equal, /* XXX */ > - mac_biba_print_label, > - mac_biba_validate_label, > - mac_biba_create_devfs_device, > - mac_biba_create_devfs_directory, > - mac_biba_create_vnode_from_vnode, > - mac_biba_mountfs, > - mac_biba_mountrootfs, > - mac_biba_create_mbuf_from_socket, > - mac_biba_create_socket, > - mac_biba_relabel_socket, > - mac_biba_create_bpfdesc, > - mac_biba_create_ifnet, > - mac_biba_create_mbuf_datagram_from_mbuf_fragmentqueue, > - mac_biba_create_mbuf_fragment_from_mbuf, > - mac_biba_create_mbuf_fragmentqueue_from_mbuf_fragment, > - mac_biba_create_mbuf_from_mbuf, > - mac_biba_create_mbuf_linklayer_for_ifnet, > - mac_biba_create_mbuf_from_bpfdesc, > - mac_biba_create_mbuf_from_ifnet, > - mac_biba_create_mbuf_multicast_encap_from_mbuf, > - mac_biba_create_mbuf_netlayer_from_mbuf, > - mac_biba_mbuf_fragment_matches_mbuf_fragmentqueue, > - mac_biba_relabel_ifnet, > - NULL, /* update fragq */ > - mac_biba_create_subject, > - mac_biba_execve_transition, > - mac_biba_execve_will_transition, > - mac_biba_create_proc0, > - mac_biba_create_proc1, > - mac_biba_relabel_subject, > - mac_biba_bpfdesc_check_receive_from_ifnet, > - mac_biba_cred_check_see_cred, > - mac_biba_cred_check_see_socket, > - mac_biba_cred_check_relabel_ifnet, > - mac_biba_cred_check_relabel_socket, > - mac_biba_cred_check_relabel_subject, > - mac_biba_cred_check_relabel_vnode, > - mac_biba_cred_check_statfs, > - mac_biba_cred_check_debug_proc, > - mac_biba_cred_check_exec_file, > - mac_biba_cred_check_chdir_vnode, > - mac_biba_cred_check_create_vnode, > - mac_biba_cred_check_delete_vnode, > - mac_biba_cred_check_exec_vnode, > - mac_biba_cred_check_open_vnode, > - mac_biba_cred_check_rename_from_vnode, > - mac_biba_cred_check_rename_to_vnode, > - mac_biba_cred_check_revoke_vnode, > - mac_biba_cred_check_search_vnode, > - mac_biba_cred_check_setflags_vnode, > - mac_biba_cred_check_setmode_vnode, > - mac_biba_cred_check_setowner_vnode, > - mac_biba_cred_check_setutimes_vnode, > - mac_biba_cred_check_sched_proc, > - mac_biba_cred_check_signal_proc, > - mac_biba_cred_check_stat_vnode, > - mac_biba_ifnet_check_send_mbuf, > - mac_biba_socket_check_receive_mbuf > + { MAC_COPY_LABEL, > + (macop_t)mac_biba_copy_label }, > + { MAC_DOMINATE, > + (macop_t)mac_biba_single_dominate }, > + { MAC_EQUAL, > + (macop_t)mac_biba_equal }, /* XXX */ > + { MAC_PRINT_LABEL, > + (macop_t)mac_biba_print_label }, > + { MAC_VALIDATE_LABEL, > + (macop_t)mac_biba_validate_label }, > + { MAC_CREATE_DEVFS_DEVICE, > + (macop_t)mac_biba_create_devfs_device }, > + { MAC_CREATE_DEVFS_DIRECTORY, > + (macop_t)mac_biba_create_devfs_directory }, > + { MAC_CREATE_VNODE_FROM_VNODE, > + (macop_t)mac_biba_create_vnode_from_vnode }, > + { MAC_CREATE_MOUNT, > + (macop_t)mac_biba_mountfs }, > + { MAC_CREATE_ROOT_MOUNT, > + (macop_t)mac_biba_mountrootfs }, > + { MAC_CREATE_MBUF_FROM_SOCKET, > + (macop_t)mac_biba_create_mbuf_from_socket }, > + { MAC_CREATE_SOCKET, > + (macop_t)mac_biba_create_socket }, > + { MAC_RELABEL_SOCKET, > + (macop_t)mac_biba_relabel_socket }, > + { MAC_CREATE_BPFDESC, > + (macop_t)mac_biba_create_bpfdesc }, > + { MAC_CREATE_IFNET, > + (macop_t)mac_biba_create_ifnet }, > + { MAC_CREATE_MBUF_DATAGRAM_FROM_MBUF_FRAGMENTQUEUE, > + (macop_t)mac_biba_create_mbuf_datagram_from_mbuf_fragmentqueue }, > + { MAC_CREATE_MBUF_FRAGMENT_FROM_MBUF, > + (macop_t)mac_biba_create_mbuf_fragment_from_mbuf }, > + { MAC_CREATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT, > + (macop_t)mac_biba_create_mbuf_fragmentqueue_from_mbuf_fragment }, > + { MAC_CREATE_MBUF_FROM_MBUF, > + (macop_t)mac_biba_create_mbuf_from_mbuf }, > + { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, > + (macop_t)mac_biba_create_mbuf_linklayer_for_ifnet }, > + { MAC_CREATE_MBUF_FROM_BPFDESC, > + (macop_t)mac_biba_create_mbuf_from_bpfdesc }, > + { MAC_CREATE_MBUF_FROM_IFNET, > + (macop_t)mac_biba_create_mbuf_from_ifnet }, > + { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, > + (macop_t)mac_biba_create_mbuf_multicast_encap_from_mbuf }, > + { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, > + (macop_t)mac_biba_create_mbuf_netlayer_from_mbuf }, > + { MAC_MBUF_FRAGMENT_MATCHES_MBUF_FRAGMENTQUEUE, > + (macop_t)mac_biba_mbuf_fragment_matches_mbuf_fragmentqueue }, > + { MAC_RELABEL_IFNET, > + (macop_t)mac_biba_relabel_ifnet }, > + { MAC_CREATE_SUBJECT, > + (macop_t)mac_biba_create_subject }, > + { MAC_EXECVE_TRANSITION, > + (macop_t)mac_biba_execve_transition }, > + { MAC_EXECVE_WILL_TRANSITION, > + (macop_t)mac_biba_execve_will_transition }, > + { MAC_CREATE_PROC0, > + (macop_t)mac_biba_create_proc0 }, > + { MAC_CREATE_PROC1, > + (macop_t)mac_biba_create_proc1 }, > + { MAC_RELABEL_SUBJECT, > + (macop_t)mac_biba_relabel_subject }, > + { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, > + (macop_t)mac_biba_bpfdesc_check_receive_from_ifnet }, > + { MAC_CRED_CHECK_SEE_CRED, > + (macop_t)mac_biba_cred_check_see_cred }, > + { MAC_CRED_CHECK_SEE_SOCKET, > + (macop_t)mac_biba_cred_check_see_socket }, > + { MAC_CRED_CHECK_RELABEL_IFNET, > + (macop_t)mac_biba_cred_check_relabel_ifnet }, > + { MAC_CRED_CHECK_RELABEL_SOCKET, > + (macop_t)mac_biba_cred_check_relabel_socket }, > + { MAC_CRED_CHECK_RELABEL_SUBJECT, > + (macop_t)mac_biba_cred_check_relabel_subject }, > + { MAC_CRED_CHECK_RELABEL_VNODE, > + (macop_t)mac_biba_cred_check_relabel_vnode }, > + { MAC_CRED_CHECK_STATFS, > + (macop_t)mac_biba_cred_check_statfs }, > + { MAC_CRED_CHECK_DEBUG_PROC, > + (macop_t)mac_biba_cred_check_debug_proc }, > + { MAC_CRED_CHECK_EXEC_FILE, > + (macop_t)mac_biba_cred_check_exec_file }, > + { MAC_CRED_CHECK_CHDIR_VNODE, > + (macop_t)mac_biba_cred_check_chdir_vnode }, > + { MAC_CRED_CHECK_CREATE_VNODE, > + (macop_t)mac_biba_cred_check_create_vnode }, > + { MAC_CRED_CHECK_DELETE_VNODE, > + (macop_t)mac_biba_cred_check_delete_vnode }, > + { MAC_CRED_CHECK_EXEC_VNODE, > + (macop_t)mac_biba_cred_check_exec_vnode }, > + { MAC_CRED_CHECK_OPEN_VNODE, > + (macop_t)mac_biba_cred_check_open_vnode }, > + { MAC_CRED_CHECK_RENAME_FROM_VNODE, > + (macop_t)mac_biba_cred_check_rename_from_vnode }, > + { MAC_CRED_CHECK_RENAME_TO_VNODE, > + (macop_t)mac_biba_cred_check_rename_to_vnode }, > + { MAC_CRED_CHECK_REVOKE_VNODE, > + (macop_t)mac_biba_cred_check_revoke_vnode }, > + { MAC_CRED_CHECK_SEARCH_VNODE, > + (macop_t)mac_biba_cred_check_search_vnode }, > + { MAC_CRED_CHECK_SETFLAGS_VNODE, > + (macop_t)mac_biba_cred_check_setflags_vnode }, > + { MAC_CRED_CHECK_SETMODE_VNODE, > + (macop_t)mac_biba_cred_check_setmode_vnode }, > + { MAC_CRED_CHECK_SETOWNER_VNODE, > + (macop_t)mac_biba_cred_check_setowner_vnode }, > + { MAC_CRED_CHECK_SETUTIMES_VNODE, > + (macop_t)mac_biba_cred_check_setutimes_vnode }, > + { MAC_CRED_CHECK_SCHED_PROC, > + (macop_t)mac_biba_cred_check_sched_proc }, > + { MAC_CRED_CHECK_SIGNAL_PROC, > + (macop_t)mac_biba_cred_check_signal_proc }, > + { MAC_CRED_CHECK_STAT_VNODE, > + (macop_t)mac_biba_cred_check_stat_vnode }, > + { MAC_IFNET_CHECK_SEND_MBUF, > + (macop_t)mac_biba_ifnet_check_send_mbuf }, > + { MAC_SOCKET_CHECK_RECEIVE_MBUF, > + (macop_t)mac_biba_socket_check_receive_mbuf }, > + { MAC_OP_LAST, NULL } > }; > > MAC_POLICY_SET(mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba", 1); > > ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#26 (text+ko) ==== > > @@ -585,71 +585,51 @@ > return (mac_bsdextended_cred_cantouch(cred, proc)); > } > > -static struct mac_policy_ops mac_bsdextended_ops = > +static struct mac_policy_op_entry mac_bsdextended_ops[] = > { > - mac_bsdextended_init, > - mac_bsdextended_destroy, > - NULL, /* copy label */ > - NULL, /* dominate */ > - NULL, /* equal label */ > - NULL, /* print label */ > - NULL, /* validate label */ > - NULL, /* create devfs dev */ > - NULL, /* create devfs dir */ > - NULL, /* create vnode */ > - NULL, /* mount fs */ > - NULL, /* mount rootfs */ > - NULL, /* mbuf from socket */ > - NULL, /* create socket */ > - NULL, /* relabel socket */ > - NULL, /* create bpf */ > - NULL, /* create ifnet */ > - NULL, /* mbuf datagram from fragq */ > - NULL, /* mbuf fragment */ > - NULL, /* mbuf fragment queue */ > - NULL, /* mbuf from mbuf */ > - NULL, /* mbuf linklayer */ > - NULL, /* mbuf from bpf */ > - NULL, /* mbuf from ifnet */ > - NULL, /* mbuf multicast encap */ > - NULL, /* mbuf netlayer */ > - NULL, /* fragment queue match */ > - NULL, /* relabel ifnet */ > - NULL, /* update fragment queue */ > - NULL, /* create subject */ > - NULL, /* transition */ > - NULL, /* will transition */ > - NULL, /* proc0 */ > - NULL, /* proc1 */ > - NULL, /* relabel subject */ > - NULL, /* bpfdesc check ifnet */ > - mac_bsdextended_cred_check_see_cred, > - mac_bsdextended_cred_check_see_socket, > - NULL, /* check relabel ifnet */ > - NULL, /* check relabel socket */ > - NULL, /* check relabel subject */ > - NULL, /* check relabel vnode */ > - NULL, /* check statfs */ > - mac_bsdextended_cred_check_debug_proc, > - NULL, /* exec file */ > - mac_bsdextended_cred_check_chdir_vnode, > - mac_bsdextended_cred_check_create_vnode, > - mac_bsdextended_cred_check_delete_vnode, > - mac_bsdextended_cred_check_exec_vnode, > - mac_bsdextended_cred_check_open_vnode, > - mac_bsdextended_cred_check_rename_from_vnode, > - mac_bsdextended_cred_check_rename_to_vnode, > - mac_bsdextended_cred_check_revoke_vnode, > - mac_bsdextended_cred_check_search_vnode, > - mac_bsdextended_cred_check_setflags_vnode, > - mac_bsdextended_cred_check_setmode_vnode, > - mac_bsdextended_cred_check_setowner_vnode, > - mac_bsdextended_cred_check_setutimes_vnode, > - mac_bsdextended_cred_check_sched_proc, > - mac_bsdextended_cred_check_signal_proc, > - mac_bsdextended_cred_check_stat_vnode, > - NULL, /* ifnet check send mbuf */ > - NULL, /* socket check receive mbuf */ > + { MAC_DESTROY, > + (macop_t)mac_bsdextended_destroy }, > + { MAC_INIT, > + (macop_t)mac_bsdextended_init }, > + { MAC_CRED_CHECK_SEE_CRED, > + (macop_t)mac_bsdextended_cred_check_see_cred }, > + { MAC_CRED_CHECK_SEE_SOCKET, > + (macop_t)mac_bsdextended_cred_check_see_socket }, > + { MAC_CRED_CHECK_DEBUG_PROC, > + (macop_t)mac_bsdextended_cred_check_debug_proc }, > + { MAC_CRED_CHECK_CHDIR_VNODE, > + (macop_t)mac_bsdextended_cred_check_chdir_vnode }, > + { MAC_CRED_CHECK_CREATE_VNODE, > + (macop_t)mac_bsdextended_cred_check_create_vnode }, > + { MAC_CRED_CHECK_DELETE_VNODE, > + (macop_t)mac_bsdextended_cred_check_delete_vnode }, > + { MAC_CRED_CHECK_EXEC_VNODE, > + (macop_t)mac_bsdextended_cred_check_exec_vnode }, > + { MAC_CRED_CHECK_OPEN_VNODE, > + (macop_t)mac_bsdextended_cred_check_open_vnode }, > + { MAC_CRED_CHECK_RENAME_FROM_VNODE, > + (macop_t)mac_bsdextended_cred_check_rename_from_vnode }, > + { MAC_CRED_CHECK_RENAME_TO_VNODE, > + (macop_t)mac_bsdextended_cred_check_rename_to_vnode }, > + { MAC_CRED_CHECK_REVOKE_VNODE, > + (macop_t)mac_bsdextended_cred_check_revoke_vnode }, > + { MAC_CRED_CHECK_SEARCH_VNODE, > + (macop_t)mac_bsdextended_cred_check_search_vnode }, > + { MAC_CRED_CHECK_SETFLAGS_VNODE, > + (macop_t)mac_bsdextended_cred_check_setflags_vnode }, > + { MAC_CRED_CHECK_SETMODE_VNODE, > + (macop_t)mac_bsdextended_cred_check_setmode_vnode }, > + { MAC_CRED_CHECK_SETOWNER_VNODE, > + (macop_t)mac_bsdextended_cred_check_setowner_vnode }, > + { MAC_CRED_CHECK_SETUTIMES_VNODE, > + (macop_t)mac_bsdextended_cred_check_setutimes_vnode }, > + { MAC_CRED_CHECK_SCHED_PROC, > + (macop_t)mac_bsdextended_cred_check_sched_proc }, > + { MAC_CRED_CHECK_SIGNAL_PROC, > + (macop_t)mac_bsdextended_cred_check_signal_proc }, > + { MAC_CRED_CHECK_STAT_VNODE, > + (macop_t)mac_bsdextended_cred_check_stat_vnode }, > + { MAC_OP_LAST, NULL } > }; > > MAC_POLICY_SET(mac_bsdextended_ops, trustedbsd_mac_bsdextended, > > ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.h#5 (text+ko) ==== > > > ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#21 (text+ko) ==== > > @@ -965,71 +965,129 @@ > return (0); > } > > -static struct mac_policy_ops mac_mls_ops = > +static struct mac_policy_op_entry mac_mls_ops[] = > { > - NULL, > - NULL, > - mac_mls_copy_label, > - mac_mls_single_dominate, > - mac_mls_equal, /* XXX */ > - mac_mls_print_label, > - mac_mls_validate_label, > - mac_mls_create_devfs_device, > - mac_mls_create_devfs_directory, > - mac_mls_create_vnode_from_vnode, > - mac_mls_mountfs, > - mac_mls_mountrootfs, > - mac_mls_create_mbuf_from_socket, > - mac_mls_create_socket, > - mac_mls_relabel_socket, > - mac_mls_create_bpfdesc, > - mac_mls_create_ifnet, > - mac_mls_create_mbuf_datagram_from_mbuf_fragmentqueue, > - mac_mls_create_mbuf_fragment_from_mbuf, > - mac_mls_create_mbuf_fragmentqueue_from_mbuf_fragment, > - mac_mls_create_mbuf_from_mbuf, > - mac_mls_create_mbuf_linklayer_for_ifnet, > - mac_mls_create_mbuf_from_bpfdesc, > - mac_mls_create_mbuf_from_ifnet, > - mac_mls_create_mbuf_multicast_encap_from_mbuf, > - mac_mls_create_mbuf_netlayer_from_mbuf, > - mac_mls_mbuf_fragment_matches_mbuf_fragmentqueue, > - mac_mls_relabel_ifnet, > - NULL, /* update fragq */ > - mac_mls_create_subject, > - mac_mls_execve_transition, > - mac_mls_execve_will_transition, > - mac_mls_create_proc0, > - mac_mls_create_proc1, > - mac_mls_relabel_subject, > - mac_mls_bpfdesc_check_receive_from_ifnet, > - mac_mls_cred_check_see_cred, > - mac_mls_cred_check_see_socket, > - mac_mls_cred_check_relabel_ifnet, > - mac_mls_cred_check_relabel_socket, > - mac_mls_cred_check_relabel_subject, > - mac_mls_cred_check_relabel_vnode, > - mac_mls_cred_check_statfs, > - mac_mls_cred_check_debug_proc, > - mac_mls_cred_check_exec_file, > - mac_mls_cred_check_chdir_vnode, > - mac_mls_cred_check_create_vnode, > - mac_mls_cred_check_delete_vnode, > - mac_mls_cred_check_exec_vnode, > - mac_mls_cred_check_open_vnode, > - mac_mls_cred_check_rename_from_vnode, > - mac_mls_cred_check_rename_to_vnode, > - mac_mls_cred_check_revoke_vnode, > - mac_mls_cred_check_search_vnode, > - mac_mls_cred_check_setflags_vnode, > - mac_mls_cred_check_setmode_vnode, > - mac_mls_cred_check_setowner_vnode, > - mac_mls_cred_check_setutimes_vnode, > - mac_mls_cred_check_sched_proc, > - mac_mls_cred_check_signal_proc, > - mac_mls_cred_check_stat_vnode, > - mac_mls_ifnet_check_send_mbuf, > - mac_mls_socket_check_receive_mbuf > + { MAC_COPY_LABEL, > + (macop_t)mac_mls_copy_label }, > + { MAC_DOMINATE, > + (macop_t)mac_mls_single_dominate }, > + { MAC_EQUAL, > + (macop_t)mac_mls_equal }, /* XXX */ > + { MAC_PRINT_LABEL, > + (macop_t)mac_mls_print_label }, > + { MAC_VALIDATE_LABEL, > + (macop_t)mac_mls_validate_label }, > + { MAC_CREATE_DEVFS_DEVICE, > + (macop_t)mac_mls_create_devfs_device }, > + { MAC_CREATE_DEVFS_DIRECTORY, > + (macop_t)mac_mls_create_devfs_directory }, > + { MAC_CREATE_VNODE_FROM_VNODE, > + (macop_t)mac_mls_create_vnode_from_vnode }, > + { MAC_CREATE_MOUNT, > + (macop_t)mac_mls_mountfs }, > + { MAC_CREATE_ROOT_MOUNT, > + (macop_t)mac_mls_mountrootfs }, > + { MAC_CREATE_MBUF_FROM_SOCKET, > + (macop_t)mac_mls_create_mbuf_from_socket }, > + { MAC_CREATE_SOCKET, > + (macop_t)mac_mls_create_socket }, > + { MAC_RELABEL_SOCKET, > + (macop_t)mac_mls_relabel_socket }, > + { MAC_CREATE_BPFDESC, > + (macop_t)mac_mls_create_bpfdesc }, > + { MAC_CREATE_IFNET, > + (macop_t)mac_mls_create_ifnet }, > + { MAC_CREATE_MBUF_DATAGRAM_FROM_MBUF_FRAGMENTQUEUE, > + (macop_t)mac_mls_create_mbuf_datagram_from_mbuf_fragmentqueue }, > + { MAC_CREATE_MBUF_FRAGMENT_FROM_MBUF, > + (macop_t)mac_mls_create_mbuf_fragment_from_mbuf }, > + { MAC_CREATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT, > + (macop_t)mac_mls_create_mbuf_fragmentqueue_from_mbuf_fragment }, > + { MAC_CREATE_MBUF_FROM_MBUF, > + (macop_t)mac_mls_create_mbuf_from_mbuf }, > + { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, > + (macop_t)mac_mls_create_mbuf_linklayer_for_ifnet }, > + { MAC_CREATE_MBUF_FROM_BPFDESC, > + (macop_t)mac_mls_create_mbuf_from_bpfdesc }, > + { MAC_CREATE_MBUF_FROM_IFNET, > + (macop_t)mac_mls_create_mbuf_from_ifnet }, > + { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, > + (macop_t)mac_mls_create_mbuf_multicast_encap_from_mbuf }, > + { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, > + (macop_t)mac_mls_create_mbuf_netlayer_from_mbuf }, > + { MAC_MBUF_FRAGMENT_MATCHES_MBUF_FRAGMENTQUEUE, > + (macop_t)mac_mls_mbuf_fragment_matches_mbuf_fragmentqueue }, > + { MAC_RELABEL_IFNET, > + (macop_t)mac_mls_relabel_ifnet }, > + { MAC_CREATE_SUBJECT, > + (macop_t)mac_mls_create_subject }, > + { MAC_EXECVE_TRANSITION, > + (macop_t)mac_mls_execve_transition }, > + { MAC_EXECVE_WILL_TRANSITION, > + (macop_t)mac_mls_execve_will_transition }, > + { MAC_CREATE_PROC0, > + (macop_t)mac_mls_create_proc0 }, > + { MAC_CREATE_PROC1, > + (macop_t)mac_mls_create_proc1 }, > + { MAC_RELABEL_SUBJECT, > + (macop_t)mac_mls_relabel_subject }, > + { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, > + (macop_t)mac_mls_bpfdesc_check_receive_from_ifnet }, > + { MAC_CRED_CHECK_SEE_CRED, > + (macop_t)mac_mls_cred_check_see_cred }, > + { MAC_CRED_CHECK_SEE_SOCKET, > + (macop_t)mac_mls_cred_check_see_socket }, > + { MAC_CRED_CHECK_RELABEL_IFNET, > + (macop_t)mac_mls_cred_check_relabel_ifnet }, > + { MAC_CRED_CHECK_RELABEL_SOCKET, > + (macop_t)mac_mls_cred_check_relabel_socket }, > + { MAC_CRED_CHECK_RELABEL_SUBJECT, > + (macop_t)mac_mls_cred_check_relabel_subject }, > + { MAC_CRED_CHECK_RELABEL_VNODE, > + (macop_t)mac_mls_cred_check_relabel_vnode }, > + { MAC_CRED_CHECK_STATFS, > + (macop_t)mac_mls_cred_check_statfs }, > + { MAC_CRED_CHECK_DEBUG_PROC, > + (macop_t)mac_mls_cred_check_debug_proc }, > + { MAC_CRED_CHECK_EXEC_FILE, > + (macop_t)mac_mls_cred_check_exec_file }, > + { MAC_CRED_CHECK_CHDIR_VNODE, > + (macop_t)mac_mls_cred_check_chdir_vnode }, > + { MAC_CRED_CHECK_CREATE_VNODE, > + (macop_t)mac_mls_cred_check_create_vnode }, > + { MAC_CRED_CHECK_DELETE_VNODE, > + (macop_t)mac_mls_cred_check_delete_vnode }, > + { MAC_CRED_CHECK_EXEC_VNODE, > + (macop_t)mac_mls_cred_check_exec_vnode }, > + { MAC_CRED_CHECK_OPEN_VNODE, > + (macop_t)mac_mls_cred_check_open_vnode }, > + { MAC_CRED_CHECK_RENAME_FROM_VNODE, > + (macop_t)mac_mls_cred_check_rename_from_vnode }, > + { MAC_CRED_CHECK_RENAME_TO_VNODE, > + (macop_t)mac_mls_cred_check_rename_to_vnode }, > + { MAC_CRED_CHECK_REVOKE_VNODE, > + (macop_t)mac_mls_cred_check_revoke_vnode }, > + { MAC_CRED_CHECK_SEARCH_VNODE, > + (macop_t)mac_mls_cred_check_search_vnode }, > + { MAC_CRED_CHECK_SETFLAGS_VNODE, > + (macop_t)mac_mls_cred_check_setflags_vnode }, > + { MAC_CRED_CHECK_SETMODE_VNODE, > + (macop_t)mac_mls_cred_check_setmode_vnode }, > + { MAC_CRED_CHECK_SETOWNER_VNODE, > + (macop_t)mac_mls_cred_check_setowner_vnode }, > + { MAC_CRED_CHECK_SETUTIMES_VNODE, > + (macop_t)mac_mls_cred_check_setutimes_vnode }, > + { MAC_CRED_CHECK_SCHED_PROC, > + (macop_t)mac_mls_cred_check_sched_proc }, > + { MAC_CRED_CHECK_SIGNAL_PROC, > + (macop_t)mac_mls_cred_check_signal_proc }, > + { MAC_CRED_CHECK_STAT_VNODE, > + (macop_t)mac_mls_cred_check_stat_vnode }, > + { MAC_IFNET_CHECK_SEND_MBUF, > + (macop_t)mac_mls_ifnet_check_send_mbuf }, > + { MAC_SOCKET_CHECK_RECEIVE_MBUF, > + (macop_t)mac_mls_socket_check_receive_mbuf }, > + { MAC_OP_LAST, NULL } > }; > > MAC_POLICY_SET(mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS", 1); > > ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#20 (text+ko) ==== > > @@ -586,71 +586,135 @@ > return (0); > } > > -static struct mac_policy_ops mac_none_ops = > +static struct mac_policy_op_entry mac_none_ops[] = > { > - mac_none_destroy, > - mac_none_init, > - mac_none_copy_label, > - mac_none_dominate, > - mac_none_equal, > - mac_none_print_label, > - mac_none_validate_label, > - mac_none_create_devfs_device, > - mac_none_create_devfs_directory, > - mac_none_create_vnode_from_vnode, > - mac_none_mountfs, > - mac_none_mountrootfs, > - mac_none_create_mbuf_from_socket, > - mac_none_create_socket, > - mac_none_relabel_socket, > - mac_none_create_bpfdesc, > - mac_none_create_ifnet, > - mac_none_create_mbuf_datagram_from_mbuf_fragmentqueue, > - mac_none_create_mbuf_fragment_from_mbuf, > - mac_none_create_mbuf_fragmentqueue_from_mbuf_fragment, > - mac_none_create_mbuf_from_mbuf, > - mac_none_create_mbuf_linklayer_for_ifnet, > - mac_none_create_mbuf_from_bpfdesc, > - mac_none_create_mbuf_from_ifnet, > - mac_none_create_mbuf_multicast_encap_from_mbuf, > - mac_none_create_mbuf_netlayer_from_mbuf, > - mac_none_mbuf_fragment_matches_mbuf_fragmentqueue, > - mac_none_relabel_ifnet, > - mac_none_update_mbuf_fragmentqueue_from_mbuf_fragment, > - mac_none_create_subject, > - mac_none_execve_transition, > - mac_none_execve_will_transition, > - mac_none_create_proc0, > - mac_none_create_proc1, > - mac_none_relabel_subject, > - mac_none_bpfdesc_check_receive_from_ifnet, > - mac_none_cred_check_see_cred, > - mac_none_cred_check_see_socket, > - mac_none_cred_check_relabel_ifnet, > - mac_none_cred_check_relabel_socket, > - mac_none_cred_check_relabel_subject, > - mac_none_cred_check_relabel_vnode, > - mac_none_cred_check_statfs, > - mac_none_cred_check_debug_proc, > - mac_none_cred_check_exec_file, > - mac_none_cred_check_chdir_vnode, > - mac_none_cred_check_create_vnode, > - mac_none_cred_check_delete_vnode, > - mac_none_cred_check_exec_vnode, > - mac_none_cred_check_open_vnode, > - mac_none_cred_check_rename_from_vnode, > - mac_none_cred_check_rename_to_vnode, > - mac_none_cred_check_revoke_vnode, > - mac_none_cred_check_search_vnode, > - mac_none_cred_check_setflags_vnode, > - mac_none_cred_check_setmode_vnode, > - mac_none_cred_check_setowner_vnode, > - mac_none_cred_check_setutimes_vnode, > - mac_none_cred_check_sched_proc, > - mac_none_cred_check_signal_proc, > - mac_none_cred_check_stat_vnode, > - mac_none_ifnet_check_send_mbuf, > - mac_none_socket_check_receive_mbuf > + { MAC_DESTROY, > + (macop_t)mac_none_destroy }, > + { MAC_INIT, > + (macop_t)mac_none_init }, > + { MAC_COPY_LABEL, > + (macop_t)mac_none_copy_label }, > + { MAC_DOMINATE, > + (macop_t)mac_none_dominate }, > + { MAC_EQUAL, > + (macop_t)mac_none_equal }, > + { MAC_PRINT_LABEL, > + (macop_t)mac_none_print_label }, > + { MAC_VALIDATE_LABEL, > + (macop_t)mac_none_validate_label }, > + { MAC_CREATE_DEVFS_DEVICE, > + (macop_t)mac_none_create_devfs_device }, > + { MAC_CREATE_DEVFS_DIRECTORY, > + (macop_t)mac_none_create_devfs_directory }, > + { MAC_CREATE_VNODE_FROM_VNODE, > + (macop_t)mac_none_create_vnode_from_vnode }, > + { MAC_CREATE_MOUNT, > + (macop_t)mac_none_mountfs }, > + { MAC_CREATE_ROOT_MOUNT, > + (macop_t)mac_none_mountrootfs }, > + { MAC_CREATE_MBUF_FROM_SOCKET, > + (macop_t)mac_none_create_mbuf_from_socket }, > + { MAC_CREATE_SOCKET, > + (macop_t)mac_none_create_socket }, > + { MAC_RELABEL_SOCKET, > + (macop_t)mac_none_relabel_socket }, > + { MAC_CREATE_BPFDESC, > + (macop_t)mac_none_create_bpfdesc }, > + { MAC_CREATE_IFNET, > + (macop_t)mac_none_create_ifnet }, > + { MAC_CREATE_MBUF_DATAGRAM_FROM_MBUF_FRAGMENTQUEUE, > + (macop_t)mac_none_create_mbuf_datagram_from_mbuf_fragmentqueue }, > + { MAC_CREATE_MBUF_FRAGMENT_FROM_MBUF, > + (macop_t)mac_none_create_mbuf_fragment_from_mbuf }, > + { MAC_CREATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT, > + (macop_t)mac_none_create_mbuf_fragmentqueue_from_mbuf_fragment }, > + { MAC_CREATE_MBUF_FROM_MBUF, > + (macop_t)mac_none_create_mbuf_from_mbuf }, > + { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, > + (macop_t)mac_none_create_mbuf_linklayer_for_ifnet }, > + { MAC_CREATE_MBUF_FROM_BPFDESC, > + (macop_t)mac_none_create_mbuf_from_bpfdesc }, > + { MAC_CREATE_MBUF_FROM_IFNET, > + (macop_t)mac_none_create_mbuf_from_ifnet }, > + { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, > + (macop_t)mac_none_create_mbuf_multicast_encap_from_mbuf }, > + { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, > + (macop_t)mac_none_create_mbuf_netlayer_from_mbuf }, > + { MAC_MBUF_FRAGMENT_MATCHES_MBUF_FRAGMENTQUEUE, > + (macop_t)mac_none_mbuf_fragment_matches_mbuf_fragmentqueue }, > + { MAC_RELABEL_IFNET, > + (macop_t)mac_none_relabel_ifnet }, > + { MAC_UPDATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT, > + (macop_t)mac_none_update_mbuf_fragmentqueue_from_mbuf_fragment }, > + { MAC_CREATE_SUBJECT, > + (macop_t)mac_none_create_subject }, > + { MAC_EXECVE_TRANSITION, > + (macop_t)mac_none_execve_transition }, > + { MAC_EXECVE_WILL_TRANSITION, > + (macop_t)mac_none_execve_will_transition }, > + { MAC_CREATE_PROC0, > + (macop_t)mac_none_create_proc0 }, > + { MAC_CREATE_PROC1, > + (macop_t)mac_none_create_proc1 }, > + { MAC_RELABEL_SUBJECT, > + (macop_t)mac_none_relabel_subject }, > + { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, > + (macop_t)mac_none_bpfdesc_check_receive_from_ifnet }, > + { MAC_CRED_CHECK_SEE_CRED, > + (macop_t)mac_none_cred_check_see_cred }, > + { MAC_CRED_CHECK_SEE_SOCKET, > + (macop_t)mac_none_cred_check_see_socket }, > + { MAC_CRED_CHECK_RELABEL_IFNET, > + (macop_t)mac_none_cred_check_relabel_ifnet }, > + { MAC_CRED_CHECK_RELABEL_SOCKET, > + (macop_t)mac_none_cred_check_relabel_socket }, > + { MAC_CRED_CHECK_RELABEL_SUBJECT, > + (macop_t)mac_none_cred_check_relabel_subject }, > + { MAC_CRED_CHECK_RELABEL_VNODE, > + (macop_t)mac_none_cred_check_relabel_vnode }, > + { MAC_CRED_CHECK_STATFS, > + (macop_t)mac_none_cred_check_statfs }, > + { MAC_CRED_CHECK_DEBUG_PROC, > + (macop_t)mac_none_cred_check_debug_proc }, > + { MAC_CRED_CHECK_EXEC_FILE, > + (macop_t)mac_none_cred_check_exec_file }, > + { MAC_CRED_CHECK_CHDIR_VNODE, > + (macop_t)mac_none_cred_check_chdir_vnode }, > + { MAC_CRED_CHECK_CREATE_VNODE, > + (macop_t)mac_none_cred_check_create_vnode }, > + { MAC_CRED_CHECK_DELETE_VNODE, > + (macop_t)mac_none_cred_check_delete_vnode }, > + { MAC_CRED_CHECK_EXEC_VNODE, > + (macop_t)mac_none_cred_check_exec_vnode }, > + { MAC_CRED_CHECK_OPEN_VNODE, > + (macop_t)mac_none_cred_check_open_vnode }, > + { MAC_CRED_CHECK_RENAME_FROM_VNODE, > + (macop_t)mac_none_cred_check_rename_from_vnode }, > + { MAC_CRED_CHECK_RENAME_TO_VNODE, > + (macop_t)mac_none_cred_check_rename_to_vnode }, > + { MAC_CRED_CHECK_REVOKE_VNODE, > + (macop_t)mac_none_cred_check_revoke_vnode }, > + { MAC_CRED_CHECK_SEARCH_VNODE, > + (macop_t)mac_none_cred_check_search_vnode }, > + { MAC_CRED_CHECK_SETFLAGS_VNODE, > + (macop_t)mac_none_cred_check_setflags_vnode }, > + { MAC_CRED_CHECK_SETMODE_VNODE, > + (macop_t)mac_none_cred_check_setmode_vnode }, > + { MAC_CRED_CHECK_SETOWNER_VNODE, > + (macop_t)mac_none_cred_check_setowner_vnode }, > + { MAC_CRED_CHECK_SETUTIMES_VNODE, > + (macop_t)mac_none_cred_check_setutimes_vnode }, > + { MAC_CRED_CHECK_SCHED_PROC, > + (macop_t)mac_none_cred_check_sched_proc }, > + { MAC_CRED_CHECK_SIGNAL_PROC, > + (macop_t)mac_none_cred_check_signal_proc }, > + { MAC_CRED_CHECK_STAT_VNODE, > + (macop_t)mac_none_cred_check_stat_vnode }, > + { MAC_IFNET_CHECK_SEND_MBUF, > + (macop_t)mac_none_ifnet_check_send_mbuf }, > + { MAC_SOCKET_CHECK_RECEIVE_MBUF, > + (macop_t)mac_none_socket_check_receive_mbuf }, > + { MAC_OP_LAST, NULL } > }; > > MAC_POLICY_SET(mac_none_ops, trustedbsd_mac_none, "TrustedBSD MAC/None", 0); > > ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 (text+ko) ==== > > @@ -157,71 +157,19 @@ > return (mac_seeotheruids_check(cred, proc->p_ucred)); > } > > -static struct mac_policy_ops mac_seeotheruids_ops = > +static struct mac_policy_op_entry mac_seeotheruids_ops[] = > { > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - mac_seeotheruids_cred_check_see_cred, > - mac_seeotheruids_cred_check_see_socket, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - mac_seeotheruids_cred_check_debug_proc, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - NULL, > - mac_seeotheruids_cred_check_sched_proc, > - mac_seeotheruids_cred_check_signal_proc, > - NULL, > - NULL, > - NULL, > + { MAC_CRED_CHECK_SEE_CRED, > + (macop_t)mac_seeotheruids_cred_check_see_cred }, > + { MAC_CRED_CHECK_SEE_SOCKET, > + (macop_t)mac_seeotheruids_cred_check_see_socket }, > + { MAC_CRED_CHECK_DEBUG_PROC, > + (macop_t)mac_seeotheruids_cred_check_debug_proc }, > + { MAC_CRED_CHECK_SCHED_PROC, > + (macop_t)mac_seeotheruids_cred_check_sched_proc }, > + { MAC_CRED_CHECK_SIGNAL_PROC, > + (macop_t)mac_seeotheruids_cred_check_signal_proc }, > + { MAC_OP_LAST, NULL } > }; > > MAC_POLICY_SET(mac_seeotheruids_ops, trustedbsd_mac_seeotheruids, > > ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#20 (text+ko) ==== > > @@ -1039,71 +1039,127 @@ > return (error); > } > > -static struct mac_policy_ops mac_te_ops = > +static struct mac_policy_op_entry mac_te_ops[] = > { > - NULL, > - NULL, > - mac_te_copy_label, > - NULL, > - mac_te_equal, > - mac_te_print_label, > - mac_te_validate_label, > - mac_te_create_devfs_device, > - mac_te_create_devfs_directory, > - mac_te_create_vnode_from_vnode, > - mac_te_mountfs, > - mac_te_mountrootfs, > - mac_te_create_mbuf_from_socket, > - mac_te_create_socket, > - mac_te_relabel_socket, > - mac_te_create_bpfdesc, > - mac_te_create_ifnet, > - mac_te_create_mbuf_datagram_from_mbuf_fragmentqueue, > - mac_te_create_mbuf_fragment_from_mbuf, > - mac_te_create_mbuf_fragmentqueue_from_mbuf_fragment, > - mac_te_create_mbuf_from_mbuf, > - mac_te_create_mbuf_linklayer_for_ifnet, > - mac_te_create_mbuf_from_bpfdesc, > - mac_te_create_mbuf_from_ifnet, > - mac_te_create_mbuf_multicast_encap_from_mbuf, > - mac_te_create_mbuf_netlayer_from_mbuf, > - mac_te_mbuf_fragment_matches_mbuf_fragmentqueue, > - mac_te_relabel_ifnet, > - NULL, /* update fragq */ > - mac_te_create_subject, > - mac_te_execve_transition, > - mac_te_execve_will_transition, > - mac_te_create_proc0, > - mac_te_create_proc1, > - mac_te_relabel_subject, > - mac_te_bpfdesc_check_receive_from_ifnet, > - mac_te_cred_check_see_cred, > - mac_te_cred_check_see_socket, > - mac_te_cred_check_relabel_ifnet, > - mac_te_cred_check_relabel_socket, > - mac_te_cred_check_relabel_subject, > - mac_te_cred_check_relabel_vnode, > - mac_te_cred_check_statfs, > - mac_te_cred_check_debug_proc, > - mac_te_cred_check_exec_file, > - mac_te_cred_check_chdir_vnode, > - mac_te_cred_check_create_vnode, > - mac_te_cred_check_delete_vnode, > - mac_te_cred_check_exec_vnode, > - mac_te_cred_check_open_vnode, > - mac_te_cred_check_rename_from_vnode, > > >>> TRUNCATED FOR MAIL (1000 lines) <<< > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Mar 29 21:43: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCED537B404; Fri, 29 Mar 2002 21:42:56 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (unknown [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1806837B400 for ; Fri, 29 Mar 2002 21:42:56 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2U5gtK32753 for perforce@freebsd.org; Fri, 29 Mar 2002 21:42:55 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 29 Mar 2002 21:42:55 -0800 (PST) Message-Id: <200203300542.g2U5gtK32753@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8655 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8655 Change 8655 by jhb@jhb_zion on 2002/03/29 21:41:57 Vinum has a nasty habit of including kernel headers in userland at least one of which is sys/buf.h which includes vm/vm_page.h which wants a opt_vmpage.h. gcc 2.95.x didn't complain about the missing header it seems, but 3.1 is more honest. Just turn vinum off for now until a better fix is found. Approved by: jake Affected files ... ... //depot/projects/sparc64/sbin/Makefile#9 edit Differences ... ==== //depot/projects/sparc64/sbin/Makefile#9 (text+ko) ==== @@ -72,8 +72,7 @@ swapon \ sysctl \ tunefs \ - umount \ - vinum + umount .if !defined(NO_IPFILTER) SUBDIR+=ipf \ @@ -107,7 +106,7 @@ # Nogo on sparc64 .if ${MACHINE_ARCH} != "sparc64" -SUBDIR+=atacontrol +SUBDIR+=atacontrol vinum .endif .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 30 15:31:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD77537B4D5; Sat, 30 Mar 2002 15:29:38 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 082F437B4AD for ; Sat, 30 Mar 2002 15:27:41 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2UNReQ91440 for perforce@freebsd.org; Sat, 30 Mar 2002 15:27:40 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Sat, 30 Mar 2002 15:27:40 -0800 (PST) Message-Id: <200203302327.g2UNReQ91440@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 8690 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8690 Change 8690 by tmm@tmm_sparc64 on 2002/03/30 15:27:24 Integ. from sparc64-tmm: fix crashes in the case of more than one 4M kernel page being used, adjust UPA_MEMSTART. Affected files ... ... //depot/projects/sparc64/sys/sparc64/include/tlb.h#33 integrate ... //depot/projects/sparc64/sys/sparc64/include/upa.h#7 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/pmap.c#81 integrate Differences ... ==== //depot/projects/sparc64/sys/sparc64/include/tlb.h#33 (text+ko) ==== @@ -29,11 +29,6 @@ #ifndef _MACHINE_TLB_H_ #define _MACHINE_TLB_H_ -#define TLB_SLOT_COUNT 64 /* XXX */ - -#define TLB_SLOT_TSB_KERNEL_MIN 62 /* XXX */ -#define TLB_SLOT_KERNEL 63 /* XXX */ - #define TLB_DAR_SLOT_SHIFT (3) #define TLB_DAR_SLOT(slot) ((slot) << TLB_DAR_SLOT_SHIFT) ==== //depot/projects/sparc64/sys/sparc64/include/upa.h#7 (text+ko) ==== @@ -28,7 +28,7 @@ #ifndef _MACHINE_UPA_H_ #define _MACHINE_UPA_H_ -#define UPA_MEMSTART 0x1fc00000000UL +#define UPA_MEMSTART 0x1c000000000UL #define UPA_MEMEND 0x1ffffffffffUL #define UPA_CR_MID_SHIFT (17) ==== //depot/projects/sparc64/sys/sparc64/sparc64/pmap.c#81 (text+ko) ==== @@ -147,12 +147,6 @@ vm_offset_t kernel_vm_end; /* - * The locked kernel page the kernel binary was loaded into. This will need - * to become a list later. - */ -vm_offset_t kernel_page; - -/* * Kernel pmap. */ struct pmap kernel_pmap_store; @@ -302,10 +296,6 @@ virtual_avail = roundup2(ekva, PAGE_SIZE_4M); virtual_end = VM_MAX_KERNEL_ADDRESS; - /* Look up the page the kernel binary was loaded into. */ - kernel_page = TD_GET_PA(ldxa(TLB_DAR_SLOT(TLB_SLOT_KERNEL), - ASI_DTLB_DATA_ACCESS_REG)); - /* * Find out what physical memory is available from the prom and * initialize the phys_avail array. This must be done before @@ -348,6 +338,17 @@ bzero(tsb_kernel, KVA_PAGES * PAGE_SIZE_4M); /* + * Enter fake 8k pages for the 4MB kernel pages, so that + * pmap_kextract() will work for them. + */ + for (i = 0; i < kernel_tlb_slots; i++) { + va = TV_GET_VA(kernel_ttes[i].tte_vpn); + pa = TD_GET_PA(kernel_ttes[i].tte_data); + for (off = 0; off < PAGE_SIZE_4M; off += PAGE_SIZE) + pmap_kenter(va + off, pa + off); + } + + /* * Allocate a kernel stack with guard page for thread0 and map it into * the kernel tsb. */ @@ -435,7 +436,6 @@ vm_offset_t va; vm_offset_t pa; u_long data; - u_int slot; u_long s; int i; @@ -444,15 +444,14 @@ /* * Map the 4mb tsb pages. */ - slot = TLB_SLOT_TSB_KERNEL_MIN; - for (i = 0; i < KVA_PAGES; i++, slot++) { + for (i = 0; i < KVA_PAGES; i++) { va = (vm_offset_t)tsb_kernel + i * PAGE_SIZE_4M; pa = tsb_kernel_phys + i * PAGE_SIZE_4M; data = TD_V | TD_4M | TD_PA(pa) | TD_L | TD_CP | TD_CV | TD_P | TD_W; stxa(AA_DMMU_TAR, ASI_DMMU, TLB_TAR_VA(va) | TLB_TAR_CTX(TLB_CTX_KERNEL)); - stxa(TLB_DAR_SLOT(slot), ASI_DTLB_DATA_ACCESS_REG, data); + stxa(0, ASI_DTLB_DATA_IN_REG, data); membar(Sync); } @@ -619,8 +618,6 @@ struct tte *tp; u_long d; - if (va >= KERNBASE && va < KERNBASE + PAGE_SIZE_4M) - return (kernel_page + (va & PAGE_MASK_4M)); tp = tsb_kvtotte(va); d = tp->tte_data; if ((d & TD_V) == 0) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 30 16:21:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8043037B417; Sat, 30 Mar 2002 16:19:58 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9A7BF37B400 for ; Sat, 30 Mar 2002 16:19:54 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2V0Jkl06375 for perforce@freebsd.org; Sat, 30 Mar 2002 16:19:46 -0800 (PST) (envelope-from jake@freebsd.org) Date: Sat, 30 Mar 2002 16:19:46 -0800 (PST) Message-Id: <200203310019.g2V0Jkl06375@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8695 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8695 Change 8695 by jake@jake_sparc64 on 2002/03/30 16:19:35 Integ@8964 Affected files ... ... //depot/projects/sparc64/bin/test/test.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/config/i386/freebsd.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/crtbegin.asm#2 delete ... //depot/projects/sparc64/contrib/gcc/config/alpha/crtend.asm#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/freebsd.h#2 integrate ... //depot/projects/sparc64/etc/defaults/rc.conf#2 integrate ... //depot/projects/sparc64/etc/mail/Makefile#2 integrate ... //depot/projects/sparc64/etc/rc#5 integrate ... //depot/projects/sparc64/games/fortune/datfiles/fortunes#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/gdb/i386/tm.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/ld/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/ld/Makefile.alpha#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/ld/Makefile.i386#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/ld/Makefile.ia64#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/ld/Makefile.powerpc#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/ld/Makefile.sparc64#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cvs/cvsbug/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cvs/lib/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/sort/COPYING#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/Makefile#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/config.h#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/error.c#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/error.h#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/getopt.c#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/getopt.h#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/getopt1.c#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/long-options.c#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/long-options.h#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/sort.1#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/sort.c#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/system.h#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/version.c#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/version.h#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/xstrtod.c#2 delete ... //depot/projects/sparc64/gnu/usr.bin/sort/xstrtod.h#2 delete ... //depot/projects/sparc64/lib/Makefile#2 integrate ... //depot/projects/sparc64/lib/csu/alpha/Makefile#3 integrate ... //depot/projects/sparc64/lib/csu/alpha/crt1.c#3 integrate ... //depot/projects/sparc64/lib/csu/i386-elf/Makefile#3 integrate ... //depot/projects/sparc64/lib/csu/i386-elf/crt1.c#3 integrate ... //depot/projects/sparc64/lib/csu/i386/Makefile#2 integrate ... //depot/projects/sparc64/lib/csu/i386/crt0.c#2 integrate ... //depot/projects/sparc64/lib/csu/ia64/Makefile#3 integrate ... //depot/projects/sparc64/lib/csu/ia64/crt1.c#5 integrate ... //depot/projects/sparc64/lib/csu/powerpc/Makefile#3 integrate ... //depot/projects/sparc64/lib/csu/powerpc/crt1.c#5 integrate ... //depot/projects/sparc64/lib/csu/sparc64/Makefile#5 integrate ... //depot/projects/sparc64/lib/csu/sparc64/crt1.c#7 integrate ... //depot/projects/sparc64/lib/libc/gen/err.c#5 integrate ... //depot/projects/sparc64/lib/libc/gen/getlogin.c#3 integrate ... //depot/projects/sparc64/lib/libc/gen/getprogname.c#3 integrate ... //depot/projects/sparc64/lib/libc/gen/setproctitle.c#3 integrate ... //depot/projects/sparc64/lib/libc/gen/setprogname.c#3 integrate ... //depot/projects/sparc64/lib/libc/gen/syslog.c#4 integrate ... //depot/projects/sparc64/lib/libc/gmon/gmon.c#6 integrate ... //depot/projects/sparc64/lib/libc/include/libc_private.h#2 integrate ... //depot/projects/sparc64/lib/libc/include/namespace.h#5 integrate ... //depot/projects/sparc64/lib/libc/include/un-namespace.h#4 integrate ... //depot/projects/sparc64/lib/libc/locale/collate.c#3 integrate ... //depot/projects/sparc64/lib/libc/stdlib/getopt.c#3 integrate ... //depot/projects/sparc64/lib/libc/stdlib/malloc.c#7 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_spinlock.c#2 integrate ... //depot/projects/sparc64/lib/libfetch/http.c#2 integrate ... //depot/projects/sparc64/lib/libncp/ncpl_subr.c#2 integrate ... //depot/projects/sparc64/lib/libusb/Makefile#2 delete ... //depot/projects/sparc64/lib/libusb/data.c#2 delete ... //depot/projects/sparc64/lib/libusb/descr.c#2 delete ... //depot/projects/sparc64/lib/libusb/libusb.h#3 delete ... //depot/projects/sparc64/lib/libusb/parse.c#2 delete ... //depot/projects/sparc64/lib/libusb/usage.c#2 delete ... //depot/projects/sparc64/lib/libusb/usb.3#2 delete ... //depot/projects/sparc64/lib/libusb/usbvar.h#2 delete ... //depot/projects/sparc64/lib/libusbhid/Makefile#1 branch ... //depot/projects/sparc64/lib/libusbhid/data.c#1 branch ... //depot/projects/sparc64/lib/libusbhid/descr.c#1 branch ... //depot/projects/sparc64/lib/libusbhid/libusbhid.h#1 branch ... //depot/projects/sparc64/lib/libusbhid/parse.c#1 branch ... //depot/projects/sparc64/lib/libusbhid/usage.c#1 branch ... //depot/projects/sparc64/lib/libusbhid/usbhid.3#1 branch ... //depot/projects/sparc64/lib/libusbhid/usbvar.h#1 branch ... //depot/projects/sparc64/release/Makefile#4 integrate ... //depot/projects/sparc64/release/alpha/drivers.conf#1 branch ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#2 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/readme/article.sgml#4 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#4 integrate ... //depot/projects/sparc64/release/picobsd/tinyware/ns/ns.c#2 integrate ... //depot/projects/sparc64/release/scripts/print-cdrom-packages.sh#3 integrate ... //depot/projects/sparc64/sbin/atacontrol/atacontrol.8#2 integrate ... //depot/projects/sparc64/sbin/atacontrol/atacontrol.c#2 integrate ... //depot/projects/sparc64/sbin/fdisk/Makefile#2 integrate ... //depot/projects/sparc64/sbin/fdisk/fdisk.c#2 integrate ... //depot/projects/sparc64/sbin/fdisk_pc98/fdisk.c#2 integrate ... //depot/projects/sparc64/sbin/ifconfig/ifconfig.8#2 integrate ... //depot/projects/sparc64/sbin/ifconfig/ifconfig.c#3 integrate ... //depot/projects/sparc64/share/examples/etc/make.conf#4 integrate ... //depot/projects/sparc64/share/man/man4/Makefile#2 integrate ... //depot/projects/sparc64/share/man/man4/bktr.4#3 integrate ... //depot/projects/sparc64/share/man/man4/bpf.4#3 integrate ... //depot/projects/sparc64/share/man/man4/geom.4#1 branch ... //depot/projects/sparc64/share/man/man4/ng_ether.4#2 integrate ... //depot/projects/sparc64/share/man/man5/Makefile#3 integrate ... //depot/projects/sparc64/share/man/man5/drivers.conf.5#2 integrate ... //depot/projects/sparc64/share/man/man5/rc.conf.5#3 integrate ... //depot/projects/sparc64/share/man/man7/sec-doc.7#2 integrate ... //depot/projects/sparc64/share/man/man9/Makefile#2 integrate ... //depot/projects/sparc64/share/man/man9/VOP_ACCESS.9#2 integrate ... //depot/projects/sparc64/share/man/man9/VOP_ATTRIB.9#2 integrate ... //depot/projects/sparc64/share/man/man9/VOP_FSYNC.9#2 integrate ... //depot/projects/sparc64/share/man/man9/VOP_GETACL.9#2 integrate ... //depot/projects/sparc64/share/man/man9/VOP_IOCTL.9#2 integrate ... //depot/projects/sparc64/share/man/man9/condvar.9#2 integrate ... //depot/projects/sparc64/share/man/man9/mtx_pool.9#1 branch ... //depot/projects/sparc64/share/man/man9/mutex.9#2 integrate ... //depot/projects/sparc64/share/man/man9/sema.9#2 integrate ... //depot/projects/sparc64/share/man/man9/sx.9#2 integrate ... //depot/projects/sparc64/share/mk/bsd.libnames.mk#5 integrate ... //depot/projects/sparc64/share/mklocale/bg_BG.CP1251.src#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/critical.c#1 branch ... //depot/projects/sparc64/sys/alpha/alpha/dec_eb64plus.c#3 integrate ... //depot/projects/sparc64/sys/alpha/alpha/exception.s#4 integrate ... //depot/projects/sparc64/sys/alpha/alpha/genassym.c#8 integrate ... //depot/projects/sparc64/sys/alpha/alpha/machdep.c#23 integrate ... //depot/projects/sparc64/sys/alpha/alpha/trap.c#17 integrate ... //depot/projects/sparc64/sys/alpha/conf/GENERIC#14 integrate ... //depot/projects/sparc64/sys/alpha/include/cpufunc.h#4 integrate ... //depot/projects/sparc64/sys/alpha/include/proc.h#4 integrate ... //depot/projects/sparc64/sys/boot/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/common/Makefile.inc#3 integrate ... //depot/projects/sparc64/sys/boot/efi/libefi/arch/ia64/start.S#3 integrate ... //depot/projects/sparc64/sys/boot/efi/libefi/efifs.c#5 integrate ... //depot/projects/sparc64/sys/boot/efi/libefi/efinet.c#2 integrate ... //depot/projects/sparc64/sys/boot/efi/libefi/elf_freebsd.c#5 integrate ... //depot/projects/sparc64/sys/boot/efi/loader/Makefile#5 integrate ... //depot/projects/sparc64/sys/boot/efi/loader/main.c#4 integrate ... //depot/projects/sparc64/sys/boot/efi/loader/version#2 integrate ... //depot/projects/sparc64/sys/boot/i386/loader/Makefile#5 integrate ... //depot/projects/sparc64/sys/boot/ia64/libski/elf_freebsd.c#5 integrate ... //depot/projects/sparc64/sys/boot/ia64/skiload/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/ia64/skiload/version#2 integrate ... //depot/projects/sparc64/sys/boot/pc98/loader/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/sparc64/boot1/_start.S#2 integrate ... //depot/projects/sparc64/sys/compat/linprocfs/linprocfs.c#14 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_misc.c#8 integrate ... //depot/projects/sparc64/sys/conf/files#47 integrate ... //depot/projects/sparc64/sys/conf/files.alpha#11 integrate ... //depot/projects/sparc64/sys/conf/files.i386#23 integrate ... //depot/projects/sparc64/sys/conf/files.ia64#12 integrate ... //depot/projects/sparc64/sys/conf/files.pc98#19 integrate ... //depot/projects/sparc64/sys/conf/files.powerpc#5 integrate ... //depot/projects/sparc64/sys/conf/files.sparc64#33 integrate ... //depot/projects/sparc64/sys/conf/options#20 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-all.c#22 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-raid.c#16 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-raid.h#10 integrate ... //depot/projects/sparc64/sys/dev/ata/atapi-cd.c#18 integrate ... //depot/projects/sparc64/sys/dev/ccd/ccd.c#9 integrate ... //depot/projects/sparc64/sys/dev/kbd/atkbdc.c#3 integrate ... //depot/projects/sparc64/sys/dev/pccard/pccard_cis.c#8 integrate ... //depot/projects/sparc64/sys/dev/pdq/if_fea.c#3 integrate ... //depot/projects/sparc64/sys/dev/pdq/if_fpa.c#2 integrate ... //depot/projects/sparc64/sys/dev/pdq/pdq.c#2 integrate ... //depot/projects/sparc64/sys/dev/pdq/pdq_freebsd.h#1 branch ... //depot/projects/sparc64/sys/dev/pdq/pdq_ifsubr.c#3 integrate ... //depot/projects/sparc64/sys/dev/pdq/pdqreg.h#2 integrate ... //depot/projects/sparc64/sys/dev/pdq/pdqvar.h#2 integrate ... //depot/projects/sparc64/sys/dev/puc/pucdata.c#4 integrate ... //depot/projects/sparc64/sys/dev/usb/uvscom.c#2 integrate ... //depot/projects/sparc64/sys/dev/vinum/vinum.c#5 integrate ... //depot/projects/sparc64/sys/dev/vinum/vinumext.h#3 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wavelan_ieee.h#3 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wi.c#21 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wireg.h#8 integrate ... //depot/projects/sparc64/sys/fs/procfs/procfs_status.c#9 integrate ... //depot/projects/sparc64/sys/geom/geom_bsd.c#6 integrate ... //depot/projects/sparc64/sys/geom/geom_dev.c#5 integrate ... //depot/projects/sparc64/sys/geom/geom_dump.c#3 integrate ... //depot/projects/sparc64/sys/geom/geom_mbr.c#4 integrate ... //depot/projects/sparc64/sys/geom/geom_pc98.c#1 branch ... //depot/projects/sparc64/sys/geom/geom_slice.c#5 integrate ... //depot/projects/sparc64/sys/geom/geom_subr.c#3 integrate ... //depot/projects/sparc64/sys/geom/geom_sunlabel.c#4 integrate ... //depot/projects/sparc64/sys/gnu/ext2fs/ext2_vfsops.c#9 integrate ... //depot/projects/sparc64/sys/i386/i386/bios.c#9 integrate ... //depot/projects/sparc64/sys/i386/i386/critical.c#1 branch ... //depot/projects/sparc64/sys/i386/i386/exception.s#6 integrate ... //depot/projects/sparc64/sys/i386/i386/genassym.c#11 integrate ... //depot/projects/sparc64/sys/i386/i386/machdep.c#25 integrate ... //depot/projects/sparc64/sys/i386/i386/mp_machdep.c#19 integrate ... //depot/projects/sparc64/sys/i386/i386/mpapic.c#9 integrate ... //depot/projects/sparc64/sys/i386/i386/swtch.s#10 integrate ... //depot/projects/sparc64/sys/i386/i386/vm_machdep.c#16 integrate ... //depot/projects/sparc64/sys/i386/include/cpufunc.h#12 integrate ... //depot/projects/sparc64/sys/i386/include/mutex.h#5 integrate ... //depot/projects/sparc64/sys/i386/include/pcb.h#6 integrate ... //depot/projects/sparc64/sys/i386/include/pcpu.h#3 integrate ... //depot/projects/sparc64/sys/i386/include/proc.h#6 integrate ... //depot/projects/sparc64/sys/i386/isa/apic_vector.s#9 integrate ... //depot/projects/sparc64/sys/i386/isa/clock.c#10 integrate ... //depot/projects/sparc64/sys/i386/isa/icu_vector.s#6 integrate ... //depot/projects/sparc64/sys/i386/isa/intr_machdep.c#12 integrate ... //depot/projects/sparc64/sys/i386/isa/intr_machdep.h#7 integrate ... //depot/projects/sparc64/sys/i386/isa/ipl.s#5 integrate ... //depot/projects/sparc64/sys/i386/isa/npx.c#18 integrate ... //depot/projects/sparc64/sys/ia64/ia64/critical.c#1 branch ... //depot/projects/sparc64/sys/ia64/ia64/exception.s#14 integrate ... //depot/projects/sparc64/sys/ia64/ia64/genassym.c#13 integrate ... //depot/projects/sparc64/sys/ia64/ia64/locore.s#12 integrate ... //depot/projects/sparc64/sys/ia64/ia64/machdep.c#33 integrate ... //depot/projects/sparc64/sys/ia64/include/asm.h#5 integrate ... //depot/projects/sparc64/sys/ia64/include/cpufunc.h#9 integrate ... //depot/projects/sparc64/sys/ia64/include/proc.h#5 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/cd9660_vfsops.c#8 integrate ... //depot/projects/sparc64/sys/kern/bus_if.m#2 integrate ... //depot/projects/sparc64/sys/kern/init_main.c#18 integrate ... //depot/projects/sparc64/sys/kern/kern_condvar.c#8 integrate ... //depot/projects/sparc64/sys/kern/kern_descrip.c#18 integrate ... //depot/projects/sparc64/sys/kern/kern_exec.c#20 integrate ... //depot/projects/sparc64/sys/kern/kern_exit.c#19 integrate ... //depot/projects/sparc64/sys/kern/kern_fork.c#24 integrate ... //depot/projects/sparc64/sys/kern/kern_mutex.c#15 integrate ... //depot/projects/sparc64/sys/kern/kern_proc.c#13 integrate ... //depot/projects/sparc64/sys/kern/kern_prot.c#25 integrate ... //depot/projects/sparc64/sys/kern/kern_switch.c#8 integrate ... //depot/projects/sparc64/sys/kern/kern_tc.c#8 integrate ... //depot/projects/sparc64/sys/kern/subr_bus.c#12 integrate ... //depot/projects/sparc64/sys/kern/subr_disklabel.c#6 integrate ... //depot/projects/sparc64/sys/kern/subr_trap.c#20 integrate ... //depot/projects/sparc64/sys/kern/subr_witness.c#19 integrate ... //depot/projects/sparc64/sys/kern/sys_pipe.c#15 integrate ... //depot/projects/sparc64/sys/kern/vfs_syscalls.c#24 integrate ... //depot/projects/sparc64/sys/net/fddi.h#3 integrate ... //depot/projects/sparc64/sys/net/if_fddisubr.c#6 integrate ... //depot/projects/sparc64/sys/net/if_llc.h#2 integrate ... //depot/projects/sparc64/sys/netinet6/ip6_mroute.c#4 integrate ... //depot/projects/sparc64/sys/netinet6/ip6_output.c#6 integrate ... //depot/projects/sparc64/sys/pc98/i386/machdep.c#21 integrate ... //depot/projects/sparc64/sys/pc98/pc98/clock.c#7 integrate ... //depot/projects/sparc64/sys/powerpc/include/cpufunc.h#8 integrate ... //depot/projects/sparc64/sys/powerpc/include/proc.h#5 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/critical.c#1 branch ... //depot/projects/sparc64/sys/powerpc/powerpc/machdep.c#19 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/trap.c#12 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/vm_machdep.c#12 integrate ... //depot/projects/sparc64/sys/sparc64/include/bus_private.h#2 integrate ... //depot/projects/sparc64/sys/sparc64/include/cpufunc.h#19 integrate ... //depot/projects/sparc64/sys/sparc64/include/proc.h#9 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/clock.c#11 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/critical.c#1 branch ... //depot/projects/sparc64/sys/sparc64/sparc64/exception.s#71 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/machdep.c#71 integrate ... //depot/projects/sparc64/sys/sys/ata.h#10 integrate ... //depot/projects/sparc64/sys/sys/bus.h#5 integrate ... //depot/projects/sparc64/sys/sys/conf.h#12 integrate ... //depot/projects/sparc64/sys/sys/disklabel.h#15 integrate ... //depot/projects/sparc64/sys/sys/filedesc.h#9 integrate ... //depot/projects/sparc64/sys/sys/lock.h#11 integrate ... //depot/projects/sparc64/sys/sys/mutex.h#14 integrate ... //depot/projects/sparc64/sys/sys/proc.h#29 integrate ... //depot/projects/sparc64/sys/sys/systm.h#20 integrate ... //depot/projects/sparc64/sys/sys/tty.h#5 integrate ... //depot/projects/sparc64/sys/ufs/ffs/ffs_vfsops.c#14 integrate ... //depot/projects/sparc64/sys/vm/uma_int.h#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Data/disk.alpha.da0.xml#1 branch ... //depot/projects/sparc64/tools/regression/geom/Data/disk.alpha2.da0.xml#1 branch ... //depot/projects/sparc64/tools/regression/geom/Data/disk.pc98.wdc0.xml#1 branch ... //depot/projects/sparc64/tools/regression/geom/GLib/Makefile#3 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/Makefile#3 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T013/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T013/testprg.c#2 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T014/Makefile#1 branch ... //depot/projects/sparc64/tools/regression/geom/Test/T014/ref.conf#1 branch ... //depot/projects/sparc64/tools/regression/geom/Test/T014/testprg.c#1 branch ... //depot/projects/sparc64/tools/regression/geom/geom_sim.h#3 integrate ... //depot/projects/sparc64/tools/regression/geom/geom_simdisk_xml.c#3 integrate ... //depot/projects/sparc64/usr.bin/chpass/chpass.c#5 integrate ... //depot/projects/sparc64/usr.bin/chpass/edit.c#3 integrate ... //depot/projects/sparc64/usr.bin/chpass/field.c#3 integrate ... //depot/projects/sparc64/usr.bin/chpass/pw_yp.c#3 integrate ... //depot/projects/sparc64/usr.bin/doscmd/int.c#2 integrate ... //depot/projects/sparc64/usr.bin/doscmd/int14.c#2 integrate ... //depot/projects/sparc64/usr.bin/doscmd/tty.c#2 integrate ... //depot/projects/sparc64/usr.bin/elf2aout/elf2aout.1#2 delete ... //depot/projects/sparc64/usr.bin/elf2aout/elf2aout.c#3 integrate ... //depot/projects/sparc64/usr.bin/fetch/fetch.c#3 integrate ... //depot/projects/sparc64/usr.bin/find/parsedate.y#2 integrate ... //depot/projects/sparc64/usr.bin/fstat/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/fstat/fstat.1#2 integrate ... //depot/projects/sparc64/usr.bin/fstat/fstat.c#3 integrate ... //depot/projects/sparc64/usr.bin/fstat/fstat.h#3 integrate ... //depot/projects/sparc64/usr.bin/gcore/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/head/head.c#3 integrate ... //depot/projects/sparc64/usr.bin/indent/args.c#2 integrate ... //depot/projects/sparc64/usr.bin/indent/indent.c#2 integrate ... //depot/projects/sparc64/usr.bin/indent/indent.h#2 integrate ... //depot/projects/sparc64/usr.bin/indent/indent_globs.h#2 integrate ... //depot/projects/sparc64/usr.bin/indent/io.c#2 integrate ... //depot/projects/sparc64/usr.bin/indent/lexi.c#2 integrate ... //depot/projects/sparc64/usr.bin/ipcs/ipcs.c#3 integrate ... //depot/projects/sparc64/usr.bin/killall/killall.c#2 integrate ... //depot/projects/sparc64/usr.bin/lex/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/rsh/rsh.c#4 integrate ... //depot/projects/sparc64/usr.bin/sort/sort.c#3 integrate ... //depot/projects/sparc64/usr.bin/su/su.1#2 integrate ... //depot/projects/sparc64/usr.bin/tftp/tftp.c#3 integrate ... //depot/projects/sparc64/usr.bin/usbhidctl/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/usbhidctl/usbhid.c#2 integrate ... //depot/projects/sparc64/usr.sbin/burncd/burncd.8#2 integrate ... //depot/projects/sparc64/usr.sbin/crunch/crunchgen/crunchgen.1#2 integrate ... //depot/projects/sparc64/usr.sbin/crunch/crunchgen/crunchgen.c#2 integrate ... //depot/projects/sparc64/usr.sbin/kgmon/kgmon.8#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/Makefile#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/async.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/async.h#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/atm.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/bundle.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/ccp.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/ccp.h#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/chap.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/chap.h#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/chat.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/command.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/datalink.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/datalink.h#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/defs.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/defs.h#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/ether.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/exec.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/fsm.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/i4b.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/lcp.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/lcp.h#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/main.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/mppe.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/netgraph.c#1 branch ... //depot/projects/sparc64/usr.sbin/ppp/netgraph.h#1 branch ... //depot/projects/sparc64/usr.sbin/ppp/physical.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/physical.h#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/route.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/tcp.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/tty.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/udp.c#2 integrate ... //depot/projects/sparc64/usr.sbin/rtsold/rtsold.c#2 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/Makefile#3 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/devices.c#3 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/disks.c#2 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/main.c#2 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/menus.c#4 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/sysinstall.h#2 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/tcpip.c#2 integrate ... //depot/projects/sparc64/usr.sbin/wicontrol/wicontrol.c#2 integrate Differences ... ==== //depot/projects/sparc64/bin/test/test.c#2 (text+ko) ==== @@ -12,7 +12,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/bin/test/test.c,v 1.43 2002/03/06 11:20:13 maxim Exp $"; + "$FreeBSD: src/bin/test/test.c,v 1.44 2002/03/28 16:30:42 ache Exp $"; #endif /* not lint */ #include @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -170,7 +171,7 @@ static int equalf(const char *, const char *); static int filstat(char *, enum token); static int getn(const char *); -static long long getq(const char *); +static intmax_t getq(const char *); static int intcmp(const char *, const char *); static int isoperand(void); static int newerf(const char *, const char *); @@ -474,14 +475,14 @@ } /* atoi with error detection and 64 bit range */ -static long long +static intmax_t getq(const char *s) { char *p; - long long r; + intmax_t r; errno = 0; - r = strtoll(s, &p, 10); + r = strtoimax(s, &p, 10); if (s == p) error("%s: bad number", s); @@ -502,7 +503,7 @@ static int intcmp (const char *s1, const char *s2) { - long long q1, q2; + intmax_t q1, q2; q1 = getq(s1); ==== //depot/projects/sparc64/contrib/gcc.295/config/i386/freebsd.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.41 2002/02/24 21:26:07 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.42 2002/03/27 05:19:51 obrien Exp $ */ #undef CPP_PREDEFINES #define CPP_PREDEFINES \ @@ -755,7 +755,8 @@ (n) + 4) #undef DBX_REGISTER_NUMBER -#define DBX_REGISTER_NUMBER(n) ((write_symbols == DWARF_DEBUG) \ +#define DBX_REGISTER_NUMBER(n) ((write_symbols == DWARF_DEBUG \ + || write_symbols == DWARF2_DEBUG) \ ? DWARF_DBX_REGISTER_NUMBER(n) \ : STABS_DBX_REGISTER_NUMBER(n)) ==== //depot/projects/sparc64/contrib/gcc/config/i386/freebsd.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.41 2002/02/25 04:49:17 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.42 2002/03/27 05:22:35 obrien Exp $ */ #undef CPP_PREDEFINES #define CPP_PREDEFINES \ @@ -755,7 +755,8 @@ (n) + 4) #undef DBX_REGISTER_NUMBER -#define DBX_REGISTER_NUMBER(n) ((write_symbols == DWARF_DEBUG) \ +#define DBX_REGISTER_NUMBER(n) ((write_symbols == DWARF2_DEBUG \ + || write_symbols == DWARF_DEBUG) \ ? DWARF_DBX_REGISTER_NUMBER(n) \ : STABS_DBX_REGISTER_NUMBER(n)) ==== //depot/projects/sparc64/etc/defaults/rc.conf#2 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.140 2002/03/12 21:47:31 rwatson Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.141 2002/03/28 03:29:20 gshapiro Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -335,16 +335,17 @@ lpd_flags="" # Flags to lpd (if enabled). usbd_enable="NO" # Run the usbd daemon. usbd_flags="" # Flags to usbd (if enabled). -sendmail_enable="NO" # Run the sendmail inbound daemon (YES/NO). +sendmail_enable="NO" # Run the sendmail inbound daemon (YES/NO/NONE). + # If NONE, don't start any sendmail processes. sendmail_flags="-L sm-mta -bd -q30m" # Flags to sendmail (as a server) +sendmail_submit_enable="YES" # Start a localhost-only MTA for mail submission +sendmail_submit_flags="-L sm-mta -bd -q30m -ODaemonPortOptions=Addr=localhost" + # Flags for localhost-only MTA sendmail_outbound_enable="YES" # Dequeue stuck mail (YES/NO). sendmail_outbound_flags="-L sm-queue -q30m" # Flags to sendmail (outbound only) sendmail_msp_queue_enable="YES" # Dequeue stuck clientmqueue mail (YES/NO). sendmail_msp_queue_flags="-L sm-msp-queue -Ac -q30m" - # Dequeue stuck clientmqueue mail (YES/NO). -sendmail_submit_enable="YES" # Start a localhost-only MTA for mail submission -sendmail_submit_flags="-L sm-mta-submit -bd -q30m -ODaemonPortOptions=Addr=localhost" - # Flags for localhost-only MTA + # Flags for sendmail_msp_queue daemon. dumpdev="NO" # Device name to crashdump to (or NO). dumpdir="/var/crash" # Directory where crash dumps are to be stored savecore_flags="" # Used if dumpdev is enabled above, and present. ==== //depot/projects/sparc64/etc/mail/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/mail/Makefile,v 1.23 2002/02/17 22:12:57 gshapiro Exp $ +# $FreeBSD: src/etc/mail/Makefile,v 1.24 2002/03/28 03:30:27 gshapiro Exp $ # # This Makefile provides an easy way to generate the configuration # file and database maps for the sendmail(8) daemon. @@ -11,11 +11,19 @@ # maps - Build the feature maps # aliases - Build the sendmail aliases # install - Install the .cf file as /etc/mail/sendmail.cf +# +# For the MTA daemon: # start - Start the sendmail daemon with the flags defined in # /etc/defaults/rc.conf or /etc/rc.conf # stop - Stop the sendmail daemon # restart - Restart the sendmail daemon # +# For the MSP queue running daemon: +# start-mspq - Start the sendmail MSP queue running daemon with the +# flags defined in /etc/defaults/rc.conf or /etc/rc.conf +# stop-mspq - Stop the sendmail MSP queue running daemon +# restart-mspq - Restart the sendmail MSP queue running daemon +# # Calling `make' will generate the updated versions when either the # aliases or one of the map files were changed. # @@ -65,6 +73,7 @@ # The pid is used to stop and restart the running daemon. # SENDMAIL_PIDFILE?= /var/run/sendmail.pid +SENDMAIL_MSPQ_PIDFILE?= /var/spool/clientmqueue/sm-client.pid # # Some useful programs we need. @@ -164,15 +173,28 @@ .endif start: - (. /etc/defaults/rc.conf; source_rc_confs; \ + @(. /etc/defaults/rc.conf; source_rc_confs; \ case "$${sendmail_enable}" in \ + [Nn][Oo][Nn][Ee]) \ + echo "ERROR: sendmail_enable is set to $${sendmail_enable}" \ + ;; \ [Yy][Ee][Ss]) \ - /usr/sbin/sendmail $${sendmail_flags} \ + ${SENDMAIL} $${sendmail_flags}; \ + echo "${SENDMAIL} $${sendmail_flags}" \ ;; \ *) \ - case "$${sendmail_outbound_enable}" in \ + case "$${sendmail_submit_enable}" in \ [Yy][Ee][Ss]) \ - /usr/sbin/sendmail $${sendmail_outbound_flags} \ + ${SENDMAIL} $${sendmail_submit_flags}; \ + echo "${SENDMAIL} $${sendmail_submit_flags}" \ + ;; \ + *) \ + case "$${sendmail_outbound_enable}" in \ + [Yy][Ee][Ss]) \ + ${SENDMAIL} $${sendmail_outbound_flags}; \ + echo "${SENDMAIL} $${sendmail_outbound_flags}" \ + ;; \ + esac \ ;; \ esac \ ;; \ @@ -185,6 +207,31 @@ restart: ${KILL} -HUP `head -1 ${SENDMAIL_PIDFILE}` +start-mspq: + @(. /etc/defaults/rc.conf; source_rc_confs; \ + case "$${sendmail_enable}" in \ + [Nn][Oo][Nn][Ee]) \ + echo "ERROR: sendmail_enable is set to $${sendmail_enable}" \ + ;; \ + *) \ + if [ -r /etc/mail/submit.cf ]; then \ + case "$${sendmail_msp_queue_enable}" in \ + [Yy][Ee][Ss]) \ + ${SENDMAIL} $${sendmail_msp_queue_flags}; \ + echo "${SENDMAIL} $${sendmail_msp_queue_flags}" \ + ;; \ + esac \ + fi \ + ;; \ + esac \ + ) + +stop-mspq: + ${KILL} -TERM `head -1 ${SENDMAIL_MSPQ_PIDFILE}` + +restart-mspq: + ${KILL} -HUP `head -1 ${SENDMAIL_MSPQ_PIDFILE}` + # User defined targets .if exists(Makefile.local) .include "Makefile.local" ==== //depot/projects/sparc64/etc/rc#5 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.306 2002/03/26 02:38:08 obrien Exp $ +# $FreeBSD: src/etc/rc,v 1.307 2002/03/28 03:29:18 gshapiro Exp $ # # System startup script run by init on autoboot @@ -702,35 +702,47 @@ ;; esac +# Note: Please keep the sendmail startup code here in sync with the code +# in src/etc/mail/Makefile. case ${sendmail_enable} in +[Nn][Oo][Nn][Ee]) + ;; [Yy][Ee][Ss]) echo -n ' sendmail' /usr/sbin/sendmail ${sendmail_flags} ;; *) - case ${sendmail_outbound_enable} in - [Yy][Ee][Ss]) - echo -n ' sendmail-outbound' - /usr/sbin/sendmail ${sendmail_outbound_flags} - ;; - esac case ${sendmail_submit_enable} in [Yy][Ee][Ss]) echo -n ' sendmail-submit' /usr/sbin/sendmail ${sendmail_submit_flags} ;; + *) + case ${sendmail_outbound_enable} in + [Yy][Ee][Ss]) + echo -n ' sendmail-outbound' + /usr/sbin/sendmail ${sendmail_outbound_flags} + ;; + esac + ;; esac ;; esac -if [ -r /etc/mail/submit.cf ]; then - case ${sendmail_msp_queue_enable} in - [Yy][Ee][Ss]) - echo -n ' sendmail-clientmqueue' - /usr/sbin/sendmail ${sendmail_msp_queue_flags} - ;; - esac -fi +case ${sendmail_enable} in +[Nn][Oo][Nn][Ee]) + ;; +*) + if [ -r /etc/mail/submit.cf ]; then + case ${sendmail_msp_queue_enable} in + [Yy][Ee][Ss]) + echo -n ' sendmail-clientmqueue' + /usr/sbin/sendmail ${sendmail_msp_queue_flags} + ;; + esac + fi + ;; +esac echo '.' ==== //depot/projects/sparc64/games/fortune/datfiles/fortunes#2 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.76 2002/03/09 04:38:24 dd Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.77 2002/03/29 21:32:08 jhb Exp $ % !07/11 PDP a ni deppart m'I !pleH % @@ -7815,6 +7815,8 @@ It's a very *__UN*lucky week in which to be took dead. -- Churchy La Femme % +It's always a long day; 86400 doesn't fit into a short. +% It's always darkest just before it gets pitch black. % "It's bad luck to be superstitious." ==== //depot/projects/sparc64/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c,v 1.29 2001/10/10 17:48:42 bde Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c,v 1.30 2002/03/27 04:55:43 obrien Exp $ */ /* Native-dependent code for BSD Unix running on i386's, for GDB. Copyright 1988, 1989, 1991, 1992, 1994, 1996 Free Software Foundation, Inc. @@ -663,3 +663,48 @@ } #endif /* PT_GETDBREGS */ + +CORE_ADDR +fbsd_sigtramp_saved_pc (frame) + struct frame_info *frame; +{ + CORE_ADDR sigcontext_addr; + CORE_ADDR sigcode_addr; + char buf[TARGET_PTR_BIT / TARGET_CHAR_BIT]; + int ptrbytes = TARGET_PTR_BIT / TARGET_CHAR_BIT; + int sigcontext_offs = (2 * TARGET_INT_BIT) / TARGET_CHAR_BIT; + int sigcode_offs = (-1 * TARGET_INT_BIT) / TARGET_CHAR_BIT; + + /* Get sigcontext address, it is the third parameter on the stack. */ + if (frame->next) + sigcontext_addr = read_memory_integer (FRAME_ARGS_ADDRESS (frame->next) + + FRAME_ARGS_SKIP + + sigcontext_offs, + ptrbytes); + else + sigcontext_addr = read_memory_integer (read_register (SP_REGNUM) + + sigcontext_offs, + ptrbytes); + +#ifdef OSIGCODE_MAGIC_OFFSET + if (frame->next) + sigcode_addr = read_memory_integer (FRAME_ARGS_ADDRESS (frame->next) + + FRAME_ARGS_SKIP + + sigcode_offs, + ptrbytes); + else + sigcode_addr = read_memory_integer (read_register (SP_REGNUM) + + sigcode_offs, + ptrbytes); + target_read_memory (sigcode_addr + OSIGCODE_MAGIC_OFFSET, + buf, ptrbytes); + if (extract_unsigned_integer(buf, ptrbytes) == 0x01d516) { + target_read_memory (sigcontext_addr + OSIGCONTEXT_PC_OFFSET, + buf, ptrbytes); + } else +#endif + /* Don't cause a memory_error when accessing sigcontext in case the stack + layout has changed or the stack is corrupt. */ + target_read_memory (sigcontext_addr + NSIGCONTEXT_PC_OFFSET, buf, ptrbytes); + return extract_unsigned_integer (buf, ptrbytes); +} ==== //depot/projects/sparc64/gnu/usr.bin/binutils/gdb/i386/tm.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/i386/tm.h,v 1.13 2000/04/29 09:03:49 dfr Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/i386/tm.h,v 1.14 2002/03/27 04:55:43 obrien Exp $ */ /* Target macro definitions for i386 running FreeBSD Copyright (C) 1997 Free Software Foundation, Inc. @@ -43,18 +43,22 @@ #define FRAME_SAVED_PC(FRAME) \ (kernel_debugging ? fbsd_kern_frame_saved_pc(FRAME) : \ (((FRAME)->signal_handler_caller \ - ? sigtramp_saved_pc (FRAME) \ + ? fbsd_sigtramp_saved_pc (FRAME) \ : read_memory_integer ((FRAME)->frame + 4, 4)) \ )) -/* On FreeBSD, sigtramp has size 0x18 and is immediately below the +/* On FreeBSD, sigtramp has size 0x48 and is immediately below the ps_strings struct which has size 0x10 and is at the top of the user stack. */ #undef SIGTRAMP_START #undef SIGTRAMP_END -#define SIGTRAMP_START(pc) 0xbfbfdfd8 -#define SIGTRAMP_END(pc) 0xbfbfdff0 +#define SIGTRAMP_START(pc) 0xbfbfffa8 +#define SIGTRAMP_END(pc) 0xbfbffff0 +#undef SIGCONTEXT_PC_OFFSET +#define OSIGCONTEXT_PC_OFFSET 20 +#define NSIGCONTEXT_PC_OFFSET 76 +#define OSIGCODE_MAGIC_OFFSET 20 struct objfile; void freebsd_uthread_new_objfile PARAMS ((struct objfile *objfile)); ==== //depot/projects/sparc64/gnu/usr.bin/binutils/ld/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.21 2002/03/13 05:14:29 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.22 2002/03/29 00:41:01 obrien Exp $ .include "../Makefile.inc0" @@ -40,8 +40,8 @@ EMXFR= EMLST= .for _e in ${EMS} -EMXFR+= extern ld_emulation_xfer_type ${_e}; -EMLST+= &${_e}, +EMXFR+= extern ld_emulation_xfer_type ld_${_e}_emulation; +EMLST+= &ld_${_e}_emulation, .endfor ldemul-list.h: ==== //depot/projects/sparc64/gnu/usr.bin/binutils/ld/Makefile.alpha#2 (text+ko) ==== @@ -1,30 +1,31 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.alpha,v 1.15 2002/03/13 18:26:59 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.alpha,v 1.16 2002/03/29 00:41:01 obrien Exp $ TARGET_TUPLE?= alpha-unknown-freebsd .if ${TARGET_ARCH} == "alpha" +NATIVE_EMULATION= elf64alpha HOST= ${TARGET_TUPLE} -CFLAGS+= -DDEFAULT_EMULATION=\"elf64alpha\" +CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\" CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\" _alpha_path= \"${TOOLS_PREFIX}/usr/lib\" .else _alpha_path= \"/usr/cross/alpha-freebsd/usr/lib\" .endif -EMS+= ld_elf64alpha_emulation -LDSCRIPTS+= elf64alpha.x elf64alpha.xbn elf64alpha.xn elf64alpha.xr \ - elf64alpha.xs elf64alpha.xu alpha.x alpha.xbn \ - alpha.xn alpha.xr alpha.xu elf64alpha.xc elf64alpha.xsc -SRCS+= eelf64alpha.c ealpha.c -CLEANFILES+= eelf64alpha.c ealpha.c +EMS+= ${NATIVE_EMULATION} +LDSCRIPTS+= ${NATIVE_EMULATION}.x ${NATIVE_EMULATION}.xbn ${NATIVE_EMULATION}.xn ${NATIVE_EMULATION}.xr \ + ${NATIVE_EMULATION}.xs ${NATIVE_EMULATION}.xu alpha.x alpha.xbn \ + alpha.xn alpha.xr alpha.xu ${NATIVE_EMULATION}.xc ${NATIVE_EMULATION}.xsc +SRCS+= e${NATIVE_EMULATION}.c ealpha.c +CLEANFILES+= e${NATIVE_EMULATION}.c ealpha.c -eelf64alpha.c: emulparams/elf64alpha.sh emultempl/elf32.em \ +e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \ scripttempl/elf.sc genscripts.sh stringify.sed sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_alpha_path} \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - elf64alpha "" elf64alpha ${TARGET_TUPLE} + ${NATIVE_EMULATION} "" ${NATIVE_EMULATION} ${TARGET_TUPLE} -ealpha.c: emulparams/elf64alpha.sh emultempl/elf32.em scripttempl/elf.sc \ +ealpha.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em scripttempl/elf.sc \ genscripts.sh stringify.sed sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_alpha_path} \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - elf64alpha "" alpha ${TARGET_TUPLE} + ${NATIVE_EMULATION} "" alpha ${TARGET_TUPLE} ==== //depot/projects/sparc64/gnu/usr.bin/binutils/ld/Makefile.i386#2 (text+ko) ==== @@ -1,29 +1,30 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.i386,v 1.16 2002/03/13 18:26:59 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.i386,v 1.17 2002/03/29 00:41:01 obrien Exp $ TARGET_TUPLE?= i386-unknown-freebsd .if ${TARGET_ARCH} == "i386" +NATIVE_EMULATION= elf_i386 HOST= ${TARGET_TUPLE} -CFLAGS+= -DDEFAULT_EMULATION=\"elf_i386\" +CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\" CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\" _i386_path= \"${TOOLS_PREFIX}/usr/lib\" .else _i386_path= \"/usr/cross/i386-freebsd/usr/lib\" .endif -EMS+= ld_elf_i386_emulation -LDSCRIPTS+= elf_i386.x elf_i386.xbn elf_i386.xn elf_i386.xr \ - elf_i386.xs elf_i386.xu elf_i386.xc elf_i386.xsc -SRCS+= eelf_i386.c -CLEANFILES+= eelf_i386.c +EMS+= ${NATIVE_EMULATION} +LDSCRIPTS+= ${NATIVE_EMULATION}.x ${NATIVE_EMULATION}.xbn ${NATIVE_EMULATION}.xn ${NATIVE_EMULATION}.xr \ + ${NATIVE_EMULATION}.xs ${NATIVE_EMULATION}.xu ${NATIVE_EMULATION}.xc ${NATIVE_EMULATION}.xsc +SRCS+= e${NATIVE_EMULATION}.c +CLEANFILES+= e${NATIVE_EMULATION}.c -eelf_i386.c: emulparams/elf_i386.sh emultempl/elf32.em scripttempl/elf.sc \ +e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em scripttempl/elf.sc \ genscripts.sh stringify.sed sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_i386_path} \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - elf_i386 "" elf_i386 ${TARGET_TUPLE} + "${NATIVE_EMULATION}" "" ${NATIVE_EMULATION} "${TARGET_TUPLE}" .if defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR}) -EMS+= ld_i386pe_emulation +EMS+= i386pe LDSCRIPTS+= i386pe.x \ i386pe.xbn \ i386pe.xn \ ==== //depot/projects/sparc64/gnu/usr.bin/binutils/ld/Makefile.ia64#2 (text+ko) ==== @@ -1,24 +1,25 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.ia64,v 1.3 2002/03/13 18:26:59 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.ia64,v 1.4 2002/03/29 00:41:01 obrien Exp $ TARGET_TUPLE?= ia64-unknown-freebsd .if ${TARGET_ARCH} == "ia64" +NATIVE_EMULATION= elf64_ia64 HOST= ${TARGET_TUPLE} # do what?? how does this work for a cross-build?? -CFLAGS+= -DDEFAULT_EMULATION=\"elf64_ia64\" +CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\" CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\" _ia64_path= \"${TOOLS_PREFIX}/usr/lib\" .else _ia64_path= \"/usr/cross/ia64-freebsd/usr/lib\" .endif -EMS+= ld_elf64_ia64_emulation -LDSCRIPTS+= elf64_ia64.x elf64_ia64.xbn elf64_ia64.xn elf64_ia64.xr \ - elf64_ia64.xs elf64_ia64.xu elf64_ia64.xc elf64_ia64.xsc -SRCS+= eelf64_ia64.c -CLEANFILES+= eelf64_ia64.c +EMS+= ${NATIVE_EMULATION} +LDSCRIPTS+= ${NATIVE_EMULATION}.x ${NATIVE_EMULATION}.xbn ${NATIVE_EMULATION}.xn ${NATIVE_EMULATION}.xr \ + ${NATIVE_EMULATION}.xs ${NATIVE_EMULATION}.xu ${NATIVE_EMULATION}.xc ${NATIVE_EMULATION}.xsc +SRCS+= e${NATIVE_EMULATION}.c +CLEANFILES+= e${NATIVE_EMULATION}.c -eelf64_ia64.c: emulparams/elf64_ia64.sh emultempl/elf32.em scripttempl/elf.sc \ +e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em scripttempl/elf.sc \ genscripts.sh stringify.sed sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_ia64_path} \ ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ - "elf64_ia64" "" elf64_ia64 "${TARGET_TUPLE}" + "${NATIVE_EMULATION}" "" ${NATIVE_EMULATION} "${TARGET_TUPLE}" ==== //depot/projects/sparc64/gnu/usr.bin/binutils/ld/Makefile.powerpc#2 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.powerpc,v 1.9 2002/03/13 18:26:59 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.powerpc,v 1.10 2002/03/29 00:41:01 obrien Exp $ TARGET_TUPLE?= powerpc-unknown-freebsd .if ${TARGET_ARCH} == "powerpc" +NATIVE_EMULATION= elf32ppc HOST= ${TARGET_TUPLE} CFLAGS+= -DDEFAULT_EMULATION=\"elf_powerpc\" CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\" @@ -10,20 +11,20 @@ .else _powerpc_path= \"/usr/cross/powerpc-freebsd/usr/lib\" .endif -EMS+= ld_elf32ppc_emulation \ - ld_ppcmacos_emulation \ - ld_ppcnw_emulation \ - ld_ppcpe_emulation \ - ld_aixrs6_emulation \ - ld_rs6000lynx_emulation -LDSCRIPTS+= elf32ppc.x \ - elf32ppc.xbn \ - elf32ppc.xn \ - elf32ppc.xr \ - elf32ppc.xs \ - elf32ppc.xu \ - elf32ppc.xc \ - elf32ppc.xsc \ +EMS+= ${NATIVE_EMULATION} \ + ppcmacos \ + ppcnw \ + ppcpe \ + aixrs6 \ + rs6000lynx +LDSCRIPTS+= ${NATIVE_EMULATION}.x \ + ${NATIVE_EMULATION}.xbn \ + ${NATIVE_EMULATION}.xn \ + ${NATIVE_EMULATION}.xr \ + ${NATIVE_EMULATION}.xs \ + ${NATIVE_EMULATION}.xu \ + ${NATIVE_EMULATION}.xc \ + ${NATIVE_EMULATION}.xsc \ ppcmacos.x \ ppcmacos.xbn \ ppcmacos.xn \ @@ -59,24 +60,24 @@ rs6000lynx.xu \ rs6000lynx.xc \ rs6000lynx.xsc -SRCS+= eelf32ppc.c \ +SRCS+= e${NATIVE_EMULATION}.c \ eppcmacos.c \ eppcnw.c \ eppcpe.c \ eaixrs6.c \ ers6000lynx.c -CLEANFILES+= eelf32ppc.c \ +CLEANFILES+= e${NATIVE_EMULATION}.c \ eppcmacos.c \ eppcnw.c \ eppcpe.c \ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 30 18:20:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F5D537B41A; Sat, 30 Mar 2002 18:19:24 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EC89737B419 for ; Sat, 30 Mar 2002 18:19:22 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2V2JMu45259 for perforce@freebsd.org; Sat, 30 Mar 2002 18:19:22 -0800 (PST) (envelope-from jake@freebsd.org) Date: Sat, 30 Mar 2002 18:19:22 -0800 (PST) Message-Id: <200203310219.g2V2JMu45259@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8703 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8703 Change 8703 by jake@jake_sparc64 on 2002/03/30 18:18:38 ktr changes to make a userland dump tool feasible. - add a version number - remove KTR_EXTEND - use an array for the arguments - remove recursion detection if KTR_VERBOSE is not defined Affected files ... ... //depot/projects/sparc64/sys/conf/options#21 edit ... //depot/projects/sparc64/sys/kern/kern_ktr.c#13 edit ... //depot/projects/sparc64/sys/sparc64/include/ktr.h#9 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/genassym.c#65 edit ... //depot/projects/sparc64/sys/sys/ktr.h#9 edit Differences ... ==== //depot/projects/sparc64/sys/conf/options#21 (text+ko) ==== @@ -498,7 +498,6 @@ KTR_CPUMASK opt_ktr.h KTR_COMPILE opt_global.h KTR_ENTRIES opt_global.h -KTR_EXTEND opt_global.h KTR_VERBOSE opt_ktr.h MUTEX_DEBUG opt_global.h WITNESS opt_global.h ==== //depot/projects/sparc64/sys/kern/kern_ktr.c#13 (text+ko) ==== @@ -46,9 +46,9 @@ #include #include #include + #include #include -#include #include @@ -64,20 +64,12 @@ #define KTR_CPUMASK (~0) #endif -#ifndef KTR_CPU -#define KTR_CPU PCPU_GET(cpuid) +#ifndef KTR_TIME +#define KTR_TIME get_cyclecount() #endif -#ifdef KTR_EXTEND -#define KTR_EXTEND_DEFAULT 1 -#else -#define KTR_EXTEND_DEFAULT 0 -#endif - -#ifdef KTR_VERBOSE -#define KTR_VERBOSE_DEFAULT 1 -#else -#define KTR_VERBOSE_DEFAULT 0 +#ifndef KTR_CPU +#define KTR_CPU PCPU_GET(cpuid) #endif SYSCTL_NODE(_debug, OID_AUTO, ktr, CTLFLAG_RD, 0, "KTR options"); @@ -86,9 +78,6 @@ * This variable is used only by gdb to work out what fields are in * ktr_entry. */ -int ktr_extend = KTR_EXTEND_DEFAULT; -SYSCTL_INT(_debug_ktr, OID_AUTO, extend, CTLFLAG_RD, &ktr_extend, 0, ""); - int ktr_cpumask = KTR_CPUMASK; TUNABLE_INT("debug.ktr.cpumask", &ktr_cpumask); SYSCTL_INT(_debug_ktr, OID_AUTO, cpumask, CTLFLAG_RW, &ktr_cpumask, 0, ""); @@ -100,68 +89,74 @@ int ktr_entries = KTR_ENTRIES; SYSCTL_INT(_debug_ktr, OID_AUTO, entries, CTLFLAG_RD, &ktr_entries, 0, ""); +int ktr_version = KTR_VERSION; +SYSCTL_INT(_debug_ktr, OID_AUTO, version, CTLFLAG_RD, &ktr_version, 0, ""); + volatile int ktr_idx = 0; struct ktr_entry ktr_buf[KTR_ENTRIES]; -int ktr_verbose = KTR_VERBOSE_DEFAULT; +#ifdef KTR_VERBOSE +int ktr_verbose = KTR_VERBOSE; TUNABLE_INT("debug.ktr.verbose", &ktr_verbose); SYSCTL_INT(_debug_ktr, OID_AUTO, verbose, CTLFLAG_RW, &ktr_verbose, 0, ""); +#endif -#ifdef KTR -#ifdef KTR_EXTEND void -ktr_tracepoint(u_int mask, const char *filename, u_int line, - const char *format, ...) -#else -void -ktr_tracepoint(u_int mask, const char *format, u_long arg1, u_long arg2, - u_long arg3, u_long arg4, u_long arg5, u_long arg6) -#endif +ktr_tracepoint(u_int mask, const char *file, int line, const char *format, + u_long arg1, u_long arg2, u_long arg3, u_long arg4, u_long arg5, + u_long arg6) { struct ktr_entry *entry; int newindex, saveindex; -#ifdef KTR_EXTEND - va_list ap; +#ifdef KTR_VERBOSE + struct thread *td; #endif + int cpu; if (panicstr) return; if ((ktr_mask & mask) == 0) return; - if (((1 << KTR_CPU) & ktr_cpumask) == 0) + cpu = KTR_CPU; + if (((1 << cpu) & ktr_cpumask) == 0) + return; +#ifdef KTR_VERBOSE + td = curthread; + if (td->td_inktr) return; + td->td_inktr++; +#endif do { saveindex = ktr_idx; newindex = (saveindex + 1) & (KTR_ENTRIES - 1); } while (atomic_cmpset_rel_int(&ktr_idx, saveindex, newindex) == 0); entry = &ktr_buf[saveindex]; - entry->ktr_cpu = KTR_CPU; - entry->ktr_timestamp = get_cyclecount(); -#ifdef KTR_EXTEND - entry->ktr_filename = filename; + entry->ktr_timestamp = KTR_TIME; + entry->ktr_cpu = cpu; + entry->ktr_file = file; entry->ktr_line = line; - va_start(ap, format); - vsnprintf(entry->ktr_desc, KTRDESCSIZE, format, ap); - va_end(ap); +#ifdef KTR_VERBOSE if (ktr_verbose) { #ifdef SMP - printf("cpu%d ", entry->ktr_cpu); + printf("cpu%d ", cpu); #endif - if (ktr_verbose > 1) - printf("%s.%d\t", entry->ktr_filename, entry->ktr_line); - va_start(ap, format); - vprintf(format, ap); + if (ktr_verbose > 1) { + printf("%s.%d\t", entry->ktr_file, + entry->ktr_line); + } + printf(format, arg1, arg2, arg3, arg4, arg5, arg6); printf("\n"); - va_end(ap); } -#else +#endif entry->ktr_desc = format; - entry->ktr_parm1 = arg1; - entry->ktr_parm2 = arg2; - entry->ktr_parm3 = arg3; - entry->ktr_parm4 = arg4; - entry->ktr_parm5 = arg5; - entry->ktr_parm6 = arg6; + entry->ktr_parms[0] = arg1; + entry->ktr_parms[1] = arg2; + entry->ktr_parms[2] = arg3; + entry->ktr_parms[3] = arg4; + entry->ktr_parms[4] = arg5; + entry->ktr_parms[5] = arg6; +#ifdef KTR_VERBOSE + td->td_inktr--; #endif } @@ -179,22 +174,17 @@ DB_SHOW_COMMAND(ktr, db_ktr_all) { - int all, c, lines; + int c, lines; - all = 0; - db_ktr_verbose = 0; lines = NUM_LINES_PER_PAGE; tstate.cur = (ktr_idx - 1) & (KTR_ENTRIES - 1); tstate.first = -1; if (strcmp(modif, "v") == 0) db_ktr_verbose = 1; - else if (strcmp(modif, "a") == 0) - all = 1; + else + db_ktr_verbose = 0; while (db_mach_vtrace()) - if (all) { - if (cncheckc() != -1) - return; - } else if (--lines == 0) { + if (--lines == 0) { db_printf("--More--"); c = cngetc(); db_printf("\r"); @@ -221,35 +211,29 @@ db_printf("--- End of trace buffer ---\n"); return (0); } - if (tstate.first == -1) - tstate.first = tstate.cur; kp = &ktr_buf[tstate.cur]; /* Skip over unused entries. */ -#ifdef KTR_EXTEND - if (kp->ktr_desc[0] == '\0') { -#else if (kp->ktr_desc == NULL) { -#endif db_printf("--- End of trace buffer ---\n"); return (0); } - db_printf("%d: %d %10.10ld ", tstate.cur, kp->ktr_cpu, - ktr_buf[(tstate.cur + 1) & (KTR_ENTRIES - 1)].ktr_timestamp - - kp->ktr_timestamp); -#ifdef KTR_EXTEND + db_printf("%d: ", tstate.cur); #ifdef SMP db_printf("cpu%d ", kp->ktr_cpu); #endif - if (db_ktr_verbose) - db_printf("%s.%d\t", kp->ktr_filename, kp->ktr_line); - db_printf("%s", kp->ktr_desc); -#else - db_printf(kp->ktr_desc, kp->ktr_parm1, kp->ktr_parm2, kp->ktr_parm3, - kp->ktr_parm4, kp->ktr_parm5, kp->ktr_parm6); -#endif + if (db_ktr_verbose) { + db_printf("%10.10lld %s.%d\t", (long long)kp->ktr_timestamp, + kp->ktr_file, kp->ktr_line); + } + db_printf(kp->ktr_desc, kp->ktr_parms[0], kp->ktr_parms[1], + kp->ktr_parms[2], kp->ktr_parms[3], kp->ktr_parms[4], + kp->ktr_parms[5]); db_printf("\n"); + if (tstate.first == -1) + tstate.first = tstate.cur; + if (--tstate.cur < 0) tstate.cur = KTR_ENTRIES - 1; @@ -257,4 +241,3 @@ } #endif /* DDB */ -#endif /* KTR */ ==== //depot/projects/sparc64/sys/sparc64/include/ktr.h#9 (text+ko) ==== @@ -70,10 +70,12 @@ SET(ktr_buf, r3, r1) ; \ mulx r2, KTR_SIZEOF, r2 ; \ add r1, r2, r1 ; \ + rd %tick, r2 ; \ + stx r2, [r1 + KTR_TIMESTAMP] ; \ UPA_GET_MID(r2) ; \ stw r2, [r1 + KTR_CPU] ; \ - rd %tick, r2 ; \ - stx r2, [r1 + KTR_TIMESTAMP] ; \ + stw %g0, [r1 + KTR_LINE] ; \ + stx %g0, [r1 + KTR_FILE] ; \ SET(l1 ## b, r3, r2) ; \ stx r2, [r1 + KTR_DESC] ==== //depot/projects/sparc64/sys/sparc64/sparc64/genassym.c#65 (text+ko) ==== @@ -135,15 +135,17 @@ ASSYM(KTR_CT8, KTR_CT8); ASSYM(KTR_SIZEOF, sizeof(struct ktr_entry)); +ASSYM(KTR_TIMESTAMP, offsetof(struct ktr_entry, ktr_timestamp)); +ASSYM(KTR_CPU, offsetof(struct ktr_entry, ktr_cpu)); +ASSYM(KTR_LINE, offsetof(struct ktr_entry, ktr_line)); +ASSYM(KTR_FILE, offsetof(struct ktr_entry, ktr_file)); ASSYM(KTR_DESC, offsetof(struct ktr_entry, ktr_desc)); -ASSYM(KTR_CPU, offsetof(struct ktr_entry, ktr_cpu)); -ASSYM(KTR_TIMESTAMP, offsetof(struct ktr_entry, ktr_timestamp)); -ASSYM(KTR_PARM1, offsetof(struct ktr_entry, ktr_parm1)); -ASSYM(KTR_PARM2, offsetof(struct ktr_entry, ktr_parm2)); -ASSYM(KTR_PARM3, offsetof(struct ktr_entry, ktr_parm3)); -ASSYM(KTR_PARM4, offsetof(struct ktr_entry, ktr_parm4)); -ASSYM(KTR_PARM5, offsetof(struct ktr_entry, ktr_parm5)); -ASSYM(KTR_PARM6, offsetof(struct ktr_entry, ktr_parm6)); +ASSYM(KTR_PARM1, offsetof(struct ktr_entry, ktr_parms[0])); +ASSYM(KTR_PARM2, offsetof(struct ktr_entry, ktr_parms[1])); +ASSYM(KTR_PARM3, offsetof(struct ktr_entry, ktr_parms[2])); +ASSYM(KTR_PARM4, offsetof(struct ktr_entry, ktr_parms[3])); +ASSYM(KTR_PARM5, offsetof(struct ktr_entry, ktr_parms[4])); +ASSYM(KTR_PARM6, offsetof(struct ktr_entry, ktr_parms[5])); ASSYM(TTE_VPN, offsetof(struct tte, tte_vpn)); ASSYM(TTE_DATA, offsetof(struct tte, tte_data)); ==== //depot/projects/sparc64/sys/sys/ktr.h#9 (text+ko) ==== @@ -36,11 +36,6 @@ #ifndef _SYS_KTR_H_ #define _SYS_KTR_H_ -/* Requires sys/types.h, sys/time.h, machine/atomic.h, and machine/cpufunc.h */ - -#include -#include - /* * Hack around due to egcs-1.1.2 not knowing what __func__ is. */ @@ -96,35 +91,25 @@ #define KTR_COMPILE (KTR_GEN) #endif -#ifndef LOCORE +/* + * Version number for ktr_entry struct. Increment this when you break binary + * compatibility. + */ +#define KTR_VERSION 1 -#include +#define KTR_PARMS 6 -#ifndef KTRDESCSIZE -#define KTRDESCSIZE 80 -#endif +#ifndef LOCORE struct ktr_entry { u_int64_t ktr_timestamp; int ktr_cpu; -#ifdef KTR_EXTEND - char ktr_desc[KTRDESCSIZE]; - const char *ktr_filename; int ktr_line; -#else + const char *ktr_file; const char *ktr_desc; - u_long ktr_parm1; - u_long ktr_parm2; - u_long ktr_parm3; - u_long ktr_parm4; - u_long ktr_parm5; - u_long ktr_parm6; -#endif + u_long ktr_parms[KTR_PARMS]; }; -/* These variables are used by gdb to analyse the output */ -extern int ktr_extend; - extern int ktr_cpumask; extern int ktr_mask; extern int ktr_entries; @@ -136,34 +121,15 @@ #endif /* !LOCORE */ #ifdef KTR -#ifdef KTR_EXTEND -void ktr_tracepoint(u_int mask, const char *filename, u_int line, - const char *format, ...) __printflike(4, 5); -#else -void ktr_tracepoint(u_int mask, const char *format, u_long arg1, u_long arg2, - u_long arg3, u_long arg4, u_long arg5, u_long arg6); -#endif - -#ifdef KTR_EXTEND -#define CTR(m, format, args...) do { \ - if (KTR_COMPILE & (m)) \ - ktr_tracepoint((m), __FILE__, __LINE__, format , ##args); \ - } while(0) +void ktr_tracepoint(u_int mask, const char *file, int line, + const char *format, u_long arg1, u_long arg2, u_long arg3, + u_long arg4, u_long arg5, u_long arg6); -#define CTR0(m, format) CTR(m, format) -#define CTR1(m, format, p1) CTR(m, format, p1) -#define CTR2(m, format, p1, p2) CTR(m, format, p1, p2) -#define CTR3(m, format, p1, p2, p3) CTR(m, format, p1, p2, p3) -#define CTR4(m, format, p1, p2, p3, p4) CTR(m, format, p1, p2, p3, p4) -#define CTR5(m, format, p1, p2, p3, p4, p5) \ - CTR(m, format, p1, p2, p3, p4, p5) -#define CTR6(m, format, p1, p2, p3, p4, p5, p6) \ - CTR(m, format, p1, p2, p3, p4, p5, p6) -#else /* not extended */ #define CTR6(m, format, p1, p2, p3, p4, p5, p6) do { \ if (KTR_COMPILE & (m)) \ - ktr_tracepoint((m), format, (u_long)p1, (u_long)p2, \ - (u_long)p3, (u_long)p4, (u_long)p5, (u_long)p6); \ + ktr_tracepoint((m), __FILE__, __LINE__, format, \ + (u_long)p1, (u_long)p2, (u_long)p3, (u_long)p4, \ + (u_long)p5, (u_long)p6); \ } while(0) #define CTR0(m, format) CTR6(m, format, 0, 0, 0, 0, 0, 0) #define CTR1(m, format, p1) CTR6(m, format, p1, 0, 0, 0, 0, 0) @@ -171,7 +137,6 @@ #define CTR3(m, format, p1, p2, p3) CTR6(m, format, p1, p2, p3, 0, 0, 0) #define CTR4(m, format, p1, p2, p3, p4) CTR6(m, format, p1, p2, p3, p4, 0, 0) #define CTR5(m, format, p1, p2, p3, p4, p5) CTR6(m, format, p1, p2, p3, p4, p5, 0) -#endif /* KTR_EXTEND */ #else /* KTR */ #undef KTR_COMPILE #define KTR_COMPILE 0 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 30 18:21:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E95FE37B41D; Sat, 30 Mar 2002 18:21:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CC7A337B419 for ; Sat, 30 Mar 2002 18:21:25 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2V2LPm45535 for perforce@freebsd.org; Sat, 30 Mar 2002 18:21:25 -0800 (PST) (envelope-from jake@freebsd.org) Date: Sat, 30 Mar 2002 18:21:25 -0800 (PST) Message-Id: <200203310221.g2V2LPm45535@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8704 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8704 Change 8704 by jake@jake_sparc64 on 2002/03/30 18:20:43 Add a userland tool to dump the ktr buffer. You need to do a make includes before trying to build this. Affected files ... ... //depot/projects/sparc64/usr.bin/tdump/Makefile#1 add ... //depot/projects/sparc64/usr.bin/tdump/tdump.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Mar 30 18:21:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7473D37B419; Sat, 30 Mar 2002 18:21:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1796937B41C for ; Sat, 30 Mar 2002 18:21:26 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2V2LPU45540 for perforce@freebsd.org; Sat, 30 Mar 2002 18:21:25 -0800 (PST) (envelope-from jake@freebsd.org) Date: Sat, 30 Mar 2002 18:21:25 -0800 (PST) Message-Id: <200203310221.g2V2LPU45540@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8705 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8705 Change 8705 by jake@jake_sparc64 on 2002/03/30 18:21:15 Add tdump. Affected files ... ... //depot/projects/sparc64/usr.bin/Makefile#14 edit Differences ... ==== //depot/projects/sparc64/usr.bin/Makefile#14 (text+ko) ==== @@ -144,6 +144,7 @@ tail \ talk \ tcopy \ + tdump \ tee \ tftp \ time \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 31 22:15:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E80E37B41B; Sun, 31 Mar 2002 22:15:23 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2DD4337B416 for ; Sun, 31 Mar 2002 22:15:22 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g316FMA32087 for perforce@freebsd.org; Sun, 31 Mar 2002 22:15:22 -0800 (PST) (envelope-from jake@freebsd.org) Date: Sun, 31 Mar 2002 22:15:22 -0800 (PST) Message-Id: <200204010615.g316FMA32087@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8750 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8750 Change 8750 by jake@jake_sparc64 on 2002/03/31 22:15:10 Integ ktr changes. Affected files ... ... //depot/projects/sparc64/sys/conf/options#22 integrate ... //depot/projects/sparc64/sys/kern/kern_ktr.c#14 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/genassym.c#66 integrate ... //depot/projects/sparc64/sys/sys/ktr.h#10 integrate ... //depot/projects/sparc64/usr.bin/ktrdump/Makefile#1 branch ... //depot/projects/sparc64/usr.bin/ktrdump/ktrdump.c#1 branch Differences ... ==== //depot/projects/sparc64/sys/conf/options#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.306 2002/03/30 03:52:52 dan Exp $ +# $FreeBSD: src/sys/conf/options,v 1.307 2002/04/01 05:35:23 jake Exp $ # # On the handling of kernel options # ==== //depot/projects/sparc64/sys/kern/kern_ktr.c#14 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_ktr.c,v 1.28 2002/03/08 18:55:59 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_ktr.c,v 1.29 2002/04/01 05:35:25 jake Exp $ */ /* ==== //depot/projects/sparc64/sys/sparc64/sparc64/genassym.c#66 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.29 2002/03/21 02:30:27 jeff Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.30 2002/04/01 05:35:26 jake Exp $ */ #include @@ -135,11 +135,11 @@ ASSYM(KTR_CT8, KTR_CT8); ASSYM(KTR_SIZEOF, sizeof(struct ktr_entry)); -ASSYM(KTR_TIMESTAMP, offsetof(struct ktr_entry, ktr_timestamp)); -ASSYM(KTR_CPU, offsetof(struct ktr_entry, ktr_cpu)); ASSYM(KTR_LINE, offsetof(struct ktr_entry, ktr_line)); ASSYM(KTR_FILE, offsetof(struct ktr_entry, ktr_file)); ASSYM(KTR_DESC, offsetof(struct ktr_entry, ktr_desc)); +ASSYM(KTR_CPU, offsetof(struct ktr_entry, ktr_cpu)); +ASSYM(KTR_TIMESTAMP, offsetof(struct ktr_entry, ktr_timestamp)); ASSYM(KTR_PARM1, offsetof(struct ktr_entry, ktr_parms[0])); ASSYM(KTR_PARM2, offsetof(struct ktr_entry, ktr_parms[1])); ASSYM(KTR_PARM3, offsetof(struct ktr_entry, ktr_parms[2])); ==== //depot/projects/sparc64/sys/sys/ktr.h#10 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: ktr.h,v 1.10.2.7 2000/03/16 21:44:42 cp Exp $ - * $FreeBSD: src/sys/sys/ktr.h,v 1.15 2001/12/14 22:28:58 jhb Exp $ + * $FreeBSD: src/sys/sys/ktr.h,v 1.16 2002/04/01 05:35:26 jake Exp $ */ /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Mar 31 22:16:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9803237B419; Sun, 31 Mar 2002 22:16:24 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CBB9037B400 for ; Sun, 31 Mar 2002 22:16:23 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g316GNX32309 for perforce@freebsd.org; Sun, 31 Mar 2002 22:16:23 -0800 (PST) (envelope-from jake@freebsd.org) Date: Sun, 31 Mar 2002 22:16:23 -0800 (PST) Message-Id: <200204010616.g316GNX32309@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8751 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8751 Change 8751 by jake@jake_sparc64 on 2002/03/31 22:15:48 Name changed to ktrdump. Affected files ... ... //depot/projects/sparc64/usr.bin/tdump/Makefile#2 delete ... //depot/projects/sparc64/usr.bin/tdump/tdump.c#2 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 4:14: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0AFA37B417; Mon, 1 Apr 2002 04:13:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 018C337B416 for ; Mon, 1 Apr 2002 04:13:57 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31CDu214052 for perforce@freebsd.org; Mon, 1 Apr 2002 04:13:56 -0800 (PST) (envelope-from des@freebsd.org) Date: Mon, 1 Apr 2002 04:13:56 -0800 (PST) Message-Id: <200204011213.g31CDu214052@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 8760 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8760 Change 8760 by des@des.at.des.thinksec.com on 2002/04/01 04:13:56 Fix braino that arose from confusion between data and dp. This unbreaks the pam_ldap module. Based on a patch by Joe Marcus Clarke . Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/lib/pam_set_data.c#9 edit Differences ... ==== //depot/projects/openpam/lib/pam_set_data.c#9 (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_set_data.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_set_data.c#9 $ */ #include @@ -74,11 +74,13 @@ if ((dp = malloc(sizeof *dp)) == NULL) return (PAM_BUF_ERR); if ((dp->name = strdup(module_data_name)) == NULL) { - free(data); + free(dp); return (PAM_BUF_ERR); } + dp->data = data; + dp->cleanup = cleanup; dp->next = pamh->module_data; - pamh->module_data = data; + pamh->module_data = dp; return (PAM_SUCCESS); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 7:49:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F208F37B405; Mon, 1 Apr 2002 07:49:39 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 589D937B41A for ; Mon, 1 Apr 2002 07:49:39 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31Fnd870852 for perforce@freebsd.org; Mon, 1 Apr 2002 07:49:39 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 07:49:39 -0800 (PST) Message-Id: <200204011549.g31Fnd870852@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8774 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8774 Change 8774 by jhb@jhb_laptop on 2002/04/01 07:48:40 Axe flag from suser(). *sigh* Affected files ... ... //depot/projects/smpng/sys/kern/kern_prot.c#50 edit ... //depot/projects/smpng/sys/sys/systm.h#26 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_prot.c#50 (text+ko) ==== @@ -1289,12 +1289,12 @@ * caller, promoting binary compatibility. */ int -suser(td, flag) +suser(td) struct thread *td; int flag; { - return (suser_cred(td->td_ucred, flag)); + return (suser_cred(td->td_ucred, 0)); } /* ==== //depot/projects/smpng/sys/sys/systm.h#26 (text+ko) ==== @@ -195,7 +195,7 @@ /* flags for suser() and suser_cred() */ #define PRISON_ROOT 1 -int suser(struct thread *td, int flag); +int suser(struct thread *td); int suser_cred(struct ucred *cred, int flag); int cr_cansee(struct ucred *u1, struct ucred *u2); int cr_canseesocket(struct ucred *cred, struct socket *so); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 8:23:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A65D937B405; Mon, 1 Apr 2002 08:23:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 581DF37B417 for ; Mon, 1 Apr 2002 08:23:22 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31GNMj79269 for perforce@freebsd.org; Mon, 1 Apr 2002 08:23:22 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 08:23:22 -0800 (PST) Message-Id: <200204011623.g31GNMj79269@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8777 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8777 Change 8777 by jhb@jhb_zion on 2002/04/01 08:23:13 Catch up to tdump -> ktrdump rename. Affected files ... ... //depot/projects/sparc64/usr.bin/Makefile#15 edit Differences ... ==== //depot/projects/sparc64/usr.bin/Makefile#15 (text+ko) ==== @@ -89,6 +89,7 @@ look \ lorder \ lsvfs \ + ktrdump \ m4 \ mail \ make \ @@ -144,7 +145,6 @@ tail \ talk \ tcopy \ - tdump \ tee \ tftp \ time \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 8:25:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B40237B41B; Mon, 1 Apr 2002 08:25:27 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5F34237B41A for ; Mon, 1 Apr 2002 08:25:26 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31GPQZ79742 for perforce@freebsd.org; Mon, 1 Apr 2002 08:25:26 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 08:25:26 -0800 (PST) Message-Id: <200204011625.g31GPQZ79742@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8779 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8779 Change 8779 by jhb@jhb_zion on 2002/04/01 08:25:24 k comes before l, doh. Affected files ... ... //depot/projects/sparc64/usr.bin/Makefile#16 edit Differences ... ==== //depot/projects/sparc64/usr.bin/Makefile#16 (text+ko) ==== @@ -70,6 +70,7 @@ keylogout \ killall \ ktrace \ + ktrdump \ lam \ last \ lastcomm \ @@ -89,7 +90,6 @@ look \ lorder \ lsvfs \ - ktrdump \ m4 \ mail \ make \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 8:25:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE24937B417; Mon, 1 Apr 2002 08:24:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C7B0737B419 for ; Mon, 1 Apr 2002 08:24:24 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31GONS79452 for perforce@freebsd.org; Mon, 1 Apr 2002 08:24:23 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 08:24:23 -0800 (PST) Message-Id: <200204011624.g31GONS79452@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8778 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8778 Change 8778 by jhb@jhb_laptop on 2002/04/01 08:23:45 Catch up to suser() losing its flag. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/promcons.c#9 edit ... //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#8 edit ... //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#7 edit ... //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#9 edit ... //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#11 edit ... //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#7 edit ... //depot/projects/smpng/sys/dev/an/if_an.c#18 edit ... //depot/projects/smpng/sys/dev/asr/asr.c#9 edit ... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#17 edit ... //depot/projects/smpng/sys/dev/awi/awi.c#5 edit ... //depot/projects/smpng/sys/dev/awi/awi_wep.c#5 edit ... //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#5 edit ... //depot/projects/smpng/sys/dev/cnw/if_cnw.c#7 edit ... //depot/projects/smpng/sys/dev/dgb/dgb.c#7 edit ... //depot/projects/smpng/sys/dev/digi/digi.c#11 edit ... //depot/projects/smpng/sys/dev/nmdm/nmdm.c#9 edit ... //depot/projects/smpng/sys/dev/ofw/ofw_console.c#7 edit ... //depot/projects/smpng/sys/dev/random/randomdev.c#8 edit ... //depot/projects/smpng/sys/dev/rp/rp.c#7 edit ... //depot/projects/smpng/sys/dev/sbni/if_sbni.c#4 edit ... //depot/projects/smpng/sys/dev/si/si.c#4 edit ... //depot/projects/smpng/sys/dev/sio/sio.c#13 edit ... //depot/projects/smpng/sys/dev/syscons/syscons.c#15 edit ... //depot/projects/smpng/sys/dev/syscons/sysmouse.c#4 edit ... //depot/projects/smpng/sys/dev/usb/ucom.c#3 edit ... //depot/projects/smpng/sys/dev/usb/umodem.c#8 edit ... //depot/projects/smpng/sys/dev/vinum/vinum.c#5 edit ... //depot/projects/smpng/sys/dev/wi/if_wi.c#21 edit ... //depot/projects/smpng/sys/dev/wl/if_wl.c#5 edit ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#11 edit ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#11 edit ... //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#5 edit ... //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#7 edit ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#11 edit ... //depot/projects/smpng/sys/i386/i386/machdep.c#26 edit ... //depot/projects/smpng/sys/i386/i386/mem.c#7 edit ... //depot/projects/smpng/sys/i386/i386/sys_machdep.c#18 edit ... //depot/projects/smpng/sys/i386/i386/vm86.c#7 edit ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#5 edit ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#7 edit ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#4 edit ... //depot/projects/smpng/sys/i386/isa/cx.c#4 edit ... //depot/projects/smpng/sys/i386/isa/cy.c#14 edit ... //depot/projects/smpng/sys/i386/isa/istallion.c#4 edit ... //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#4 edit ... //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#8 edit ... //depot/projects/smpng/sys/i386/isa/rc.c#8 edit ... //depot/projects/smpng/sys/i386/isa/spigot.c#8 edit ... //depot/projects/smpng/sys/i386/isa/stallion.c#4 edit ... //depot/projects/smpng/sys/i386/linux/linux_machdep.c#12 edit ... //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#6 edit ... //depot/projects/smpng/sys/ia64/ia64/ssc.c#6 edit ... //depot/projects/smpng/sys/isa/fd.c#8 edit ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#10 edit ... //depot/projects/smpng/sys/kern/kern_acct.c#10 edit ... //depot/projects/smpng/sys/kern/kern_linker.c#17 edit ... //depot/projects/smpng/sys/kern/kern_ntptime.c#6 edit ... //depot/projects/smpng/sys/kern/kern_prot.c#51 edit ... //depot/projects/smpng/sys/kern/kern_resource.c#16 edit ... //depot/projects/smpng/sys/kern/kern_shutdown.c#17 edit ... //depot/projects/smpng/sys/kern/kern_sysctl.c#15 edit ... //depot/projects/smpng/sys/kern/kern_time.c#8 edit ... //depot/projects/smpng/sys/kern/kern_xxx.c#6 edit ... //depot/projects/smpng/sys/kern/subr_prf.c#12 edit ... //depot/projects/smpng/sys/kern/sysv_ipc.c#8 edit ... //depot/projects/smpng/sys/kern/sysv_msg.c#11 edit ... //depot/projects/smpng/sys/kern/tty.c#14 edit ... //depot/projects/smpng/sys/kern/tty_cons.c#12 edit ... //depot/projects/smpng/sys/kern/tty_pty.c#13 edit ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#30 edit ... //depot/projects/smpng/sys/kern/vfs_vnops.c#20 edit ... //depot/projects/smpng/sys/net/if.c#17 edit ... //depot/projects/smpng/sys/net/if_ppp.c#10 edit ... //depot/projects/smpng/sys/net/if_sl.c#9 edit ... //depot/projects/smpng/sys/net/if_tap.c#10 edit ... //depot/projects/smpng/sys/net/if_tun.c#9 edit ... //depot/projects/smpng/sys/net/net_osdep.h#4 edit ... //depot/projects/smpng/sys/net/ppp_tty.c#6 edit ... //depot/projects/smpng/sys/net/raw_usrreq.c#5 edit ... //depot/projects/smpng/sys/net/rtsock.c#14 edit ... //depot/projects/smpng/sys/netatalk/at_control.c#4 edit ... //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#6 edit ... //depot/projects/smpng/sys/netatm/atm_usrreq.c#5 edit ... //depot/projects/smpng/sys/netgraph/ng_socket.c#9 edit ... //depot/projects/smpng/sys/netgraph/ng_tty.c#6 edit ... //depot/projects/smpng/sys/netinet/in.c#10 edit ... //depot/projects/smpng/sys/netinet/in_pcb.c#20 edit ... //depot/projects/smpng/sys/netinet/ip_divert.c#10 edit ... //depot/projects/smpng/sys/netinet/ip_output.c#20 edit ... //depot/projects/smpng/sys/netinet/raw_ip.c#15 edit ... //depot/projects/smpng/sys/netinet/tcp_subr.c#16 edit ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#17 edit ... //depot/projects/smpng/sys/netinet6/in6.c#8 edit ... //depot/projects/smpng/sys/netinet6/in6_pcb.c#11 edit ... //depot/projects/smpng/sys/netinet6/in6_src.c#6 edit ... //depot/projects/smpng/sys/netinet6/ip6_input.c#8 edit ... //depot/projects/smpng/sys/netinet6/ip6_output.c#7 edit ... //depot/projects/smpng/sys/netinet6/raw_ip6.c#8 edit ... //depot/projects/smpng/sys/netinet6/udp6_output.c#6 edit ... //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#9 edit ... //depot/projects/smpng/sys/netipx/ipx.c#4 edit ... //depot/projects/smpng/sys/netipx/ipx_pcb.c#5 edit ... //depot/projects/smpng/sys/netipx/ipx_usrreq.c#5 edit ... //depot/projects/smpng/sys/nfsclient/nfs_lock.c#16 edit ... //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#8 edit ... //depot/projects/smpng/sys/pc98/i386/machdep.c#21 edit ... //depot/projects/smpng/sys/pc98/pc98/fd.c#7 edit ... //depot/projects/smpng/sys/pc98/pc98/sio.c#14 edit ... //depot/projects/smpng/sys/pc98/pc98/syscons.c#12 edit ... //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#6 edit ... //depot/projects/smpng/sys/pccard/pccard.c#11 edit ... //depot/projects/smpng/sys/security/lomac/kernel_mmap.c#7 edit ... //depot/projects/smpng/sys/security/lomac/kernel_util.c#7 edit ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#16 edit ... //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#13 edit ... //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#8 edit ... //depot/projects/smpng/sys/vm/vm_mmap.c#14 edit ... //depot/projects/smpng/sys/vm/vm_swap.c#10 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/promcons.c#9 (text+ko) ==== @@ -123,7 +123,7 @@ ttsetwater(tp); setuptimeout = 1; - } else if ((tp->t_state & TS_XCLUDE) && suser(td, 0)) { + } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { splx(s); return EBUSY; } ==== //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#8 (text+ko) ==== @@ -118,7 +118,7 @@ if (error) return (error); - error = suser(td, 0); + error = suser(td); if (error) return (error); ==== //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#7 (text+ko) ==== @@ -290,7 +290,7 @@ tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; ttsetwater(tp); setuptimeout = 1; - } else if ((tp->t_state & TS_XCLUDE) && suser(td, 0)) { + } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { splx(s); return EBUSY; } ==== //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#9 (text+ko) ==== @@ -264,7 +264,7 @@ goto out; if (td->td_ucred->cr_uid != vattr.va_uid && - (error = suser(td, 0)) != 0) + (error = suser(td)) != 0) goto out; if ((error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#11 (text+ko) ==== @@ -607,7 +607,7 @@ struct file *fp; int error; - if ((error = suser(td, 0)) != 0) + if ((error = suser(td)) != 0) return error; if ((error = getvnode(fdp, SCARG(uap, fd), &fp)) != 0) return error; ==== //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#7 (text+ko) ==== @@ -559,13 +559,13 @@ break; #if defined(WHY_DOES_AN_EMULATOR_WANT_TO_SET_HOSTNAMES) case SVR4_SI_SET_HOSTNAME: - if ((error = suser(td, 0)) != 0) + if ((error = suser(td)) != 0) return error; name = KERN_HOSTNAME; return kern_sysctl(&name, 1, 0, 0, SCARG(uap, buf), rlen, td); case SVR4_SI_SET_SRPC_DOMAIN: - if ((error = suser(td, 0)) != 0) + if ((error = suser(td)) != 0) return error; name = KERN_NISDOMAINNAME; return kern_sysctl(&name, 1, 0, 0, SCARG(uap, buf), rlen, td); ==== //depot/projects/smpng/sys/dev/an/if_an.c#18 (text+ko) ==== @@ -1353,7 +1353,7 @@ error = copyout(&sc->areq, ifr->ifr_data, sizeof(sc->areq)); break; case SIOCSAIRONET: - if ((error = suser(td, 0))) + if ((error = suser(td))) goto out; error = copyin(ifr->ifr_data, &sc->areq, sizeof(sc->areq)); if (error != 0) @@ -1361,7 +1361,7 @@ an_setdef(sc, &sc->areq); break; case SIOCGPRIVATE_0: /* used by Cisco client utility */ - if ((error = suser(td, 0))) + if ((error = suser(td))) goto out; copyin(ifr->ifr_data, &l_ioctl, sizeof(l_ioctl)); mode = l_ioctl.command; @@ -1381,7 +1381,7 @@ break; case SIOCGPRIVATE_1: /* used by Cisco client utility */ - if ((error = suser(td, 0))) + if ((error = suser(td))) goto out; copyin(ifr->ifr_data, &l_ioctl, sizeof(l_ioctl)); l_ioctl.command = 0; @@ -1614,7 +1614,7 @@ } break; case SIOCS80211: - if ((error = suser(td, 0))) + if ((error = suser(td))) goto out; sc->areq.an_len = sizeof(sc->areq); /* ==== //depot/projects/smpng/sys/dev/asr/asr.c#9 (text+ko) ==== @@ -3880,7 +3880,7 @@ s = splcam (); if (ASR_ctlr_held) { error = EBUSY; - } else if ((error = suser(td, 0)) == 0) { + } else if ((error = suser(td)) == 0) { ++ASR_ctlr_held; } splx(s); ==== //depot/projects/smpng/sys/dev/ata/atapi-cd.c#17 (text+ko) ==== @@ -576,7 +576,7 @@ break; case CDIOCRESET: - error = suser(td, 0); + error = suser(td); if (error) break; error = atapi_test_ready(cdp->device); ==== //depot/projects/smpng/sys/dev/awi/awi.c#5 (text+ko) ==== @@ -522,7 +522,7 @@ case SIOCS80211NWID: #ifdef __FreeBSD__ #if __FreeBSD__ >= 5 - error = suser(curthread, 0); + error = suser(curthread); #else error = suser(curproc); #endif @@ -560,7 +560,7 @@ case SIOCS80211NWKEY: #ifdef __FreeBSD__ #if __FreeBSD__ >= 5 - error = suser(curthread, 0); + error = suser(curthread); #else error = suser(curproc); #endif @@ -622,7 +622,7 @@ if(error) break; #if __FreeBSD__ >= 5 - if(!suser(curthread, 0)) + if(!suser(curthread)) #else if(!suser(curproc)) #endif @@ -663,7 +663,7 @@ break; case SIOCS80211: #if __FreeBSD__ >= 5 - error = suser(curthread, 0); + error = suser(curthread); #else error = suser(curproc); #endif ==== //depot/projects/smpng/sys/dev/awi/awi_wep.c#5 (text+ko) ==== @@ -190,7 +190,7 @@ /* do not show any keys to non-root user */ #ifdef __FreeBSD__ #if __FreeBSD__ >= 5 - suerr = suser(curthread, 0); + suerr = suser(curthread); #else suerr = suser(curproc); #endif ==== //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#5 (text+ko) ==== @@ -109,7 +109,7 @@ case SIOCSWAVELAN: #ifdef __FreeBSD__ #if __FreeBSD__ >= 5 - error = suser(curthread, 0); + error = suser(curthread); #else error = suser(curproc); #endif @@ -277,7 +277,7 @@ /* do not show keys to non-root user */ #ifdef __FreeBSD__ #if __FreeBSD__ >= 5 - error = suser(curthread, 0); + error = suser(curthread); #else error = suser(curproc); #endif ==== //depot/projects/smpng/sys/dev/cnw/if_cnw.c#7 (text+ko) ==== @@ -1336,7 +1336,7 @@ error = suser(p->p_ucred, &p->p_acflag); #else #if __FreeBSD__ >= 5 - error = suser(td, 0); + error = suser(td); #else error = suser(p); #endif @@ -1351,7 +1351,7 @@ error = suser(p->p_ucred, &p->p_acflag); #else #if __FreeBSD__ >= 5 - error = suser(td, 0); + error = suser(td); #else error = suser(p); #endif @@ -1366,7 +1366,7 @@ error = suser(p->p_ucred, &p->p_acflag); #else #if __FreeBSD__ >= 5 - error = suser(td, 0); + error = suser(td); #else error = suser(p); #endif ==== //depot/projects/smpng/sys/dev/dgb/dgb.c#7 (text+ko) ==== @@ -1050,7 +1050,7 @@ } } if (tp->t_state & TS_XCLUDE && - suser(td, 0)) { + suser(td)) { error = EBUSY; goto out; } @@ -1548,7 +1548,7 @@ } switch (cmd) { case TIOCSETA: - error = suser(td, 0); + error = suser(td); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1770,7 +1770,7 @@ break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser(td, 0); + error = suser(td); if (error != 0) { splx(s); return (error); ==== //depot/projects/smpng/sys/dev/digi/digi.c#11 (text+ko) ==== @@ -783,7 +783,7 @@ } goto open_top; } - if (tp->t_state & TS_XCLUDE && suser(td, 0) != 0) { + if (tp->t_state & TS_XCLUDE && suser(td) != 0) { error = EBUSY; goto out; } @@ -1146,7 +1146,7 @@ switch (cmd) { case TIOCSETA: - error = suser(td, 0); + error = suser(td); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1317,7 +1317,7 @@ *(int *)data = digimctl(port, 0, DMGET); break; case TIOCMSDTRWAIT: - error = suser(td, 0); + error = suser(td); if (error != 0) { splx(s); return (error); ==== //depot/projects/smpng/sys/dev/nmdm/nmdm.c#9 (text+ko) ==== @@ -209,7 +209,7 @@ tp->t_lflag = TTYDEF_LFLAG; tp->t_cflag = TTYDEF_CFLAG; tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; - } else if (tp->t_state & TS_XCLUDE && suser(td, 0)) { + } else if (tp->t_state & TS_XCLUDE && suser(td)) { return (EBUSY); } else if (pti->pt_prison != td->td_ucred->cr_prison) { return (EBUSY); ==== //depot/projects/smpng/sys/dev/ofw/ofw_console.c#7 (text+ko) ==== @@ -123,7 +123,7 @@ ttsetwater(tp); setuptimeout = 1; - } else if ((tp->t_state & TS_XCLUDE) && suser(td, 0)) { + } else if ((tp->t_state & TS_XCLUDE) && suser(td)) { return (EBUSY); } ==== //depot/projects/smpng/sys/dev/random/randomdev.c#8 (text+ko) ==== @@ -147,7 +147,7 @@ int error; if (flags & FWRITE) { - error = suser(td, 0); + error = suser(td); if (error) return (error); error = securelevel_gt(td->td_ucred, 0); @@ -162,7 +162,7 @@ random_close(dev_t dev __unused, int flags, int fmt __unused, struct thread *td) { if (flags & FWRITE) { - if (!(suser(td, 0) || + if (!(suser(td) || securelevel_gt(td->td_ucred, 0))) random_reseed(); } ==== //depot/projects/smpng/sys/dev/rp/rp.c#7 (text+ko) ==== @@ -1010,7 +1010,7 @@ goto open_top; } } - if(tp->t_state & TS_XCLUDE && suser(td, 0) != 0) { + if(tp->t_state & TS_XCLUDE && suser(td) != 0) { splx(oldspl); error = EBUSY; goto out2; @@ -1271,7 +1271,7 @@ } switch (cmd) { case TIOCSETA: - error = suser(td, 0); + error = suser(td); if(error != 0) return(error); *ct = *(struct termios *)data; @@ -1416,7 +1416,7 @@ *(int *)data = result; break; case TIOCMSDTRWAIT: - error = suser(td, 0); + error = suser(td); if(error != 0) { splx(oldspl); return(error); ==== //depot/projects/smpng/sys/dev/sbni/if_sbni.c#4 (text+ko) ==== @@ -1116,7 +1116,7 @@ case SIOCSHWFLAGS: /* set flags */ /* root only */ - error = suser(td, 0); + error = suser(td); if (error) break; flags = *(struct sbni_flags*)&ifr->ifr_data; @@ -1138,7 +1138,7 @@ break; case SIOCRINSTATS: - if (!(error = suser(td, 0))) /* root only */ + if (!(error = suser(td))) /* root only */ bzero(&sc->in_stats, sizeof(struct sbni_in_stats)); break; ==== //depot/projects/smpng/sys/dev/si/si.c#4 (text+ko) ==== @@ -607,7 +607,7 @@ /* quickly let in /dev/si_control */ if (IS_CONTROLDEV(mynor)) { - if ((error = suser(td, 0))) + if ((error = suser(td))) return(error); return(0); } @@ -686,7 +686,7 @@ } } if (tp->t_state & TS_XCLUDE && - suser(td, 0)) { + suser(td)) { DPRINT((pp, DBG_OPEN|DBG_FAIL, "already open and EXCLUSIVE set\n")); error = EBUSY; @@ -951,7 +951,7 @@ } switch (cmd) { case TIOCSETA: - error = suser(td, 0); + error = suser(td); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1064,7 +1064,7 @@ break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser(td, 0); + error = suser(td); if (error == 0) pp->sp_dtr_wait = *(int *)data * hz / 100; break; @@ -1117,7 +1117,7 @@ ip = (int *)data; -#define SUCHECK if ((error = suser(td, 0))) goto out +#define SUCHECK if ((error = suser(td))) goto out switch (cmd) { case TCSIPORTS: ==== //depot/projects/smpng/sys/dev/sio/sio.c#13 (text+ko) ==== @@ -1201,7 +1201,7 @@ } } if (tp->t_state & TS_XCLUDE && - suser(td, 0)) { + suser(td)) { error = EBUSY; goto out; } @@ -1937,7 +1937,7 @@ } switch (cmd) { case TIOCSETA: - error = suser(td, 0); + error = suser(td); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -2028,7 +2028,7 @@ break; case TIOCMSDTRWAIT: /* must be root since the wait applies to following logins */ - error = suser(td, 0); + error = suser(td); if (error != 0) { splx(s); return (error); ==== //depot/projects/smpng/sys/dev/syscons/syscons.c#15 (text+ko) ==== @@ -479,7 +479,7 @@ (*linesw[tp->t_line].l_modem)(tp, 1); } else - if (tp->t_state & TS_XCLUDE && suser(td, 0)) + if (tp->t_state & TS_XCLUDE && suser(td)) return(EBUSY); error = (*linesw[tp->t_line].l_open)(dev, tp); @@ -976,7 +976,7 @@ return 0; case KDENABIO: /* allow io operations */ - error = suser(td, 0); + error = suser(td); if (error != 0) return error; error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/smpng/sys/dev/syscons/sysmouse.c#4 (text+ko) ==== @@ -99,7 +99,7 @@ tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED; smparam(tp, &tp->t_termios); (*linesw[tp->t_line].l_modem)(tp, 1); - } else if (tp->t_state & TS_XCLUDE && suser(td, 0)) { + } else if (tp->t_state & TS_XCLUDE && suser(td)) { return EBUSY; } ==== //depot/projects/smpng/sys/dev/usb/ucom.c#3 (text+ko) ==== @@ -257,7 +257,7 @@ if (ISSET(tp->t_state, TS_ISOPEN) && ISSET(tp->t_state, TS_XCLUDE) && - suser(p, 0)) + suser(p)) return (EBUSY); /* ==== //depot/projects/smpng/sys/dev/usb/umodem.c#8 (text+ko) ==== @@ -602,7 +602,7 @@ if (ISSET(tp->t_state, TS_ISOPEN) && ISSET(tp->t_state, TS_XCLUDE) && - suser(p, 0)) + suser(p)) return (EBUSY); /* ==== //depot/projects/smpng/sys/dev/vinum/vinum.c#5 (text+ko) ==== @@ -375,7 +375,7 @@ } case VINUM_SUPERDEV_TYPE: - error = suser(td, 0); /* are we root? */ + error = suser(td); /* are we root? */ if (error == 0) { /* yes, can do */ if (devminor == VINUM_DAEMON_DEV) /* daemon device */ vinum_conf.flags |= VF_DAEMONOPEN; /* we're open */ ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#21 (text+ko) ==== @@ -1592,7 +1592,7 @@ if (error) break; /* Don't show WEP keys to non-root users. */ - if (wreq.wi_type == WI_RID_DEFLT_CRYPT_KEYS && suser(td, 0)) + if (wreq.wi_type == WI_RID_DEFLT_CRYPT_KEYS && suser(td)) break; if (wreq.wi_type == WI_RID_IFACE_STATS) { bcopy((char *)&sc->wi_stats, (char *)&wreq.wi_val, @@ -1626,7 +1626,7 @@ error = copyout(&wreq, ifr->ifr_data, sizeof(wreq)); break; case SIOCSWAVELAN: - if ((error = suser(td, 0))) + if ((error = suser(td))) goto out; error = copyin(ifr->ifr_data, &wreq, sizeof(wreq)); if (error) @@ -1685,7 +1685,7 @@ break; } len = sc->wi_keys.wi_keys[ireq->i_val].wi_keylen; - if (suser(td, 0)) + if (suser(td)) bcopy(sc->wi_keys.wi_keys[ireq->i_val].wi_keydat, tmpkey, len); else @@ -1738,7 +1738,7 @@ } break; case SIOCS80211: - if ((error = suser(td, 0))) + if ((error = suser(td))) goto out; switch(ireq->i_type) { case IEEE80211_IOC_SSID: ==== //depot/projects/smpng/sys/dev/wl/if_wl.c#5 (text+ko) ==== @@ -1214,7 +1214,7 @@ /* pointer to buffer in user space */ up = (void *)ifr->ifr_data; /* work out if they're root */ - isroot = (suser(td, 0) == 0); + isroot = (suser(td) == 0); for (i = 0; i < 0x40; i++) { /* don't hand the DES key out to non-root users */ @@ -1229,7 +1229,7 @@ /* copy the PSA in from the caller; we only copy _some_ values */ case SIOCSWLPSA: /* root only */ - if ((error = suser(td, 0))) + if ((error = suser(td))) break; error = EINVAL; /* assume the worst */ /* pointer to buffer in user space containing data */ @@ -1283,7 +1283,7 @@ */ case SIOCSWLCNWID: /* root only */ - if ((error = suser(td, 0))) + if ((error = suser(td))) break; if (!(ifp->if_flags & IFF_UP)) { error = EIO; /* only allowed while up */ @@ -1301,7 +1301,7 @@ /* copy the EEPROM in 2.4 Gz WaveMODEM out to the caller */ case SIOCGWLEEPROM: /* root only */ - if ((error = suser(td, 0))) + if ((error = suser(td))) break; /* pointer to buffer in user space */ up = (void *)ifr->ifr_data; @@ -1324,7 +1324,7 @@ /* zero (Delete) the wl cache */ case SIOCDWLCACHE: /* root only */ - if ((error = suser(td, 0))) + if ((error = suser(td))) break; wl_cache_zero(unit); break; ==== //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#11 (text+ko) ==== @@ -718,7 +718,7 @@ if (uid != de->de_uid || gid != de->de_gid) { if (((ap->a_cred->cr_uid != de->de_uid) || uid != de->de_uid || (gid != de->de_gid && !groupmember(gid, ap->a_cred))) && - (error = suser(ap->a_td, PRISON_ROOT)) != 0) + (error = suser_cred(ap->a_td->td_ucred, PRISON_ROOT)) != 0) return (error); de->de_uid = uid; de->de_gid = gid; @@ -735,21 +735,21 @@ if (vap->va_mode != (mode_t)VNOVAL) { if ((ap->a_cred->cr_uid != de->de_uid) && - (error = suser(ap->a_td, PRISON_ROOT))) + (error = suser_cred(ap->a_td->td_ucred, PRISON_ROOT))) return (error); de->de_mode = vap->va_mode; c = 1; } if (vap->va_atime.tv_sec != VNOVAL) { if ((ap->a_cred->cr_uid != de->de_uid) && - (error = suser(ap->a_td, PRISON_ROOT))) + (error = suser_cred(ap->a_td->td_ucred, PRISON_ROOT))) return (error); de->de_atime = vap->va_atime; c = 1; } if (vap->va_mtime.tv_sec != VNOVAL) { if ((ap->a_cred->cr_uid != de->de_uid) && - (error = suser(ap->a_td, PRISON_ROOT))) + (error = suser_cred(ap->a_td->td_ucred, PRISON_ROOT))) return (error); de->de_mtime = vap->va_mtime; c = 1; @@ -775,7 +775,7 @@ struct devfs_dirent *de; struct devfs_mount *dmp; - error = suser(ap->a_cnp->cn_thread, 0); + error = suser(ap->a_cnp->cn_thread); if (error) return(error); dmp = VFSTODEVFS(ap->a_dvp->v_mount); ==== //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#11 (text+ko) ==== @@ -194,7 +194,7 @@ * If upgrade to read-write by non-root, then verify * that user has necessary permissions on the device. */ - if (suser(td, 0)) { + if (suser(td)) { devvp = pmp->pm_devvp; vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); error = VOP_ACCESS(devvp, VREAD | VWRITE, @@ -241,7 +241,7 @@ * If mount by non-root, then verify that user has necessary * permissions on the device. */ - if (suser(td, 0)) { + if (suser(td)) { accessmode = VREAD; if ((mp->mnt_flag & MNT_RDONLY) == 0) accessmode |= VWRITE; ==== //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#5 (text+ko) ==== @@ -59,7 +59,7 @@ break; case PIOCSFL: flags = *(unsigned int *)data; - if (flags & PF_ISUGID && (error = suser(td, 0)) != 0) + if (flags & PF_ISUGID && (error = suser(td)) != 0) break; p->p_pfsflags = flags; break; ==== //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#7 (text+ko) ==== @@ -105,7 +105,7 @@ /* * Only for root */ - if ((error = suser(td, 0)) != 0) + if ((error = suser(td)) != 0) return (error); #ifdef DEBUG ==== //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#11 (text+ko) ==== @@ -233,7 +233,7 @@ * If upgrade to read-write by non-root, then verify * that user has necessary permissions on the device. */ - if (suser(td, 0)) { + if (suser(td)) { vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, td); if ((error = VOP_ACCESS(devvp, VREAD | VWRITE, td->td_ucred, td)) != 0) { @@ -286,7 +286,7 @@ * If mount by non-root, then verify that user has necessary * permissions on the device. */ - if (suser(td, 0)) { + if (suser(td)) { accessmode = VREAD; if ((mp->mnt_flag & MNT_RDONLY) == 0) accessmode |= VWRITE; ==== //depot/projects/smpng/sys/i386/i386/machdep.c#26 (text+ko) ==== @@ -2127,7 +2127,7 @@ * from within kernel mode? */ - if (suser(td, 0) != 0) { + if (suser(td) != 0) { if (dbregs->dr7 & 0x3) { /* dr0 is enabled */ if (dbregs->dr0 >= VM_MAXUSER_ADDRESS) ==== //depot/projects/smpng/sys/i386/i386/mem.c#7 (text+ko) ==== @@ -122,7 +122,7 @@ } break; case 14: - error = suser(td, 0); + error = suser(td); if (error != 0) return (error); error = securelevel_gt(td->td_ucred, 0); ==== //depot/projects/smpng/sys/i386/i386/sys_machdep.c#18 (text+ko) ==== @@ -183,7 +183,7 @@ if ((error = copyin(args, &ua, sizeof(struct i386_ioperm_args))) != 0) return (error); - if ((error = suser(td, 0)) != 0) + if ((error = suser(td)) != 0) return (error); if ((error = securelevel_gt(td->td_ucred, 0)) != 0) return (error); ==== //depot/projects/smpng/sys/i386/i386/vm86.c#7 (text+ko) ==== @@ -715,7 +715,7 @@ case VM86_INTCALL: { struct vm86_intcall_args sa; - if ((error = suser(td, 0))) + if ((error = suser(td))) return (error); if ((error = copyin(ua.sub_args, &sa, sizeof(sa)))) return (error); ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#5 (text+ko) ==== @@ -1013,7 +1013,7 @@ #define IBCS2_DATALOCK 4 - if ((error = suser(td, 0)) != 0) + if ((error = suser(td)) != 0) return EPERM; switch(SCARG(uap, cmd)) { case IBCS2_UNLOCK: @@ -1048,7 +1048,7 @@ #define SCO_AD_GETBMAJ 0 #define SCO_AD_GETCMAJ 1 - if (suser(td, 0)) + if (suser(td)) return EPERM; switch(SCARG(uap, cmd)) { ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#7 (text+ko) ==== @@ -173,7 +173,7 @@ char hname[MAXHOSTNAMELEN], *ptr; int error, sctl[2], hlen; - if ((error = suser(td, 0))) + if ((error = suser(td))) return (error); /* W/out a hostname a domain-name is nonsense */ ==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#4 (text+ko) ==== @@ -73,7 +73,7 @@ int name[2]; int error; - if ((error = suser(td, 0))) + if ((error = suser(td))) return (error); name[0] = CTL_KERN; name[1] = KERN_HOSTNAME; ==== //depot/projects/smpng/sys/i386/isa/cx.c#4 (text+ko) ==== @@ -162,7 +162,7 @@ tp = c->ttyp; tp->t_dev = dev; if ((tp->t_state & TS_ISOPEN) && (tp->t_state & TS_XCLUDE) && - suser(td, 0)) + suser(td)) return (EBUSY); if (! (tp->t_state & TS_ISOPEN)) { ttychars (tp); ==== //depot/projects/smpng/sys/i386/isa/cy.c#14 (text+ko) ==== @@ -718,7 +718,7 @@ } } if (tp->t_state & TS_XCLUDE && - suser(td, 0)) { + suser(td)) { error = EBUSY; goto out; } @@ -1637,7 +1637,7 @@ } switch (cmd) { case TIOCSETA: - error = suser(td, 0); + error = suser(td); if (error != 0) return (error); *ct = *(struct termios *)data; @@ -1736,7 +1736,7 @@ break; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 8:51: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13A3D37B41C; Mon, 1 Apr 2002 08:51:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4FD3937B41A for ; Mon, 1 Apr 2002 08:51:01 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31Gp1I83717 for perforce@freebsd.org; Mon, 1 Apr 2002 08:51:01 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 08:51:01 -0800 (PST) Message-Id: <200204011651.g31Gp1I83717@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8783 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8783 Change 8783 by jhb@jhb_laptop on 2002/04/01 08:50:38 Minor cleanups to reduce diffs against current a bit in code shared with other BSD's. Affected files ... ... //depot/projects/smpng/sys/dev/cnw/if_cnw.c#8 edit ... //depot/projects/smpng/sys/netinet6/ip6_input.c#9 edit Differences ... ==== //depot/projects/smpng/sys/dev/cnw/if_cnw.c#8 (text+ko) ==== @@ -1242,7 +1242,7 @@ #if __FreeBSD__ >= 5 struct thread *td = curthread; /* XXX */ #else - struct proc *p = curproc; /*XXX*/ + struct proc *td = curproc; /*XXX*/ #endif s = splnet(); @@ -1335,11 +1335,7 @@ #if !defined(__FreeBSD__) error = suser(p->p_ucred, &p->p_acflag); #else -#if __FreeBSD__ >= 5 error = suser(td); -#else - error = suser(p); -#endif #endif if (error) break; @@ -1350,12 +1346,8 @@ #if !defined(__FreeBSD__) error = suser(p->p_ucred, &p->p_acflag); #else -#if __FreeBSD__ >= 5 error = suser(td); -#else - error = suser(p); #endif -#endif if (error) break; error = cnw_setkey(sc, (int)ifr->ifr_key); @@ -1365,11 +1357,7 @@ #if !defined(__FreeBSD__) error = suser(p->p_ucred, &p->p_acflag); #else -#if __FreeBSD__ >= 5 error = suser(td); -#else - error = suser(p); -#endif #endif if (error) break; ==== //depot/projects/smpng/sys/netinet6/ip6_input.c#9 (text+ko) ==== @@ -1135,7 +1135,7 @@ struct mbuf *m; { #if __FreeBSD__ >= 5 - struct thread *td = curthread; /* XXX */ + struct thread *p = curthread; /* XXX */ #else struct proc *p = curproc; /* XXX */ #endif @@ -1143,11 +1143,7 @@ int rthdr_exist = 0; -#if __FreeBSD__ >= 5 - if (!suser(td)) -#else if (p && !suser(p)) -#endif privileged++; #ifdef SO_TIMESTAMP To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 9:59:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4609537B41F; Mon, 1 Apr 2002 09:58:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5FBCE37B400 for ; Mon, 1 Apr 2002 09:58:31 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31HwT500191 for perforce@freebsd.org; Mon, 1 Apr 2002 09:58:29 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 09:58:29 -0800 (PST) Message-Id: <200204011758.g31HwT500191@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8793 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8793 Change 8793 by jhb@jhb_laptop on 2002/04/01 09:58:24 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/autoconf.c#6 integrate ... //depot/projects/smpng/sys/alpha/alpha/critical.c#1 branch ... //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#3 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#4 integrate ... //depot/projects/smpng/sys/alpha/alpha/exception.s#5 integrate ... //depot/projects/smpng/sys/alpha/alpha/genassym.c#10 integrate ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#32 integrate ... //depot/projects/smpng/sys/alpha/alpha/trap.c#29 integrate ... //depot/projects/smpng/sys/alpha/conf/GENERIC#14 integrate ... //depot/projects/smpng/sys/alpha/include/cpufunc.h#6 integrate ... //depot/projects/smpng/sys/alpha/include/proc.h#4 integrate ... //depot/projects/smpng/sys/alpha/mcbus/mcbus.c#2 integrate ... //depot/projects/smpng/sys/alpha/mcbus/mcbusvar.h#2 integrate ... //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#14 integrate ... //depot/projects/smpng/sys/alpha/mcbus/mcpciavar.h#2 integrate ... //depot/projects/smpng/sys/boot/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/common/Makefile.inc#2 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/start.S#3 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/efifs.c#5 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/efinet.c#2 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/elf_freebsd.c#5 integrate ... //depot/projects/smpng/sys/boot/efi/loader/Makefile#5 integrate ... //depot/projects/smpng/sys/boot/efi/loader/main.c#4 integrate ... //depot/projects/smpng/sys/boot/efi/loader/version#2 integrate ... //depot/projects/smpng/sys/boot/i386/loader/Makefile#5 integrate ... //depot/projects/smpng/sys/boot/ia64/libski/elf_freebsd.c#3 integrate ... //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/ia64/skiload/version#2 integrate ... //depot/projects/smpng/sys/boot/pc98/loader/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/sparc64/Makefile#1 branch ... //depot/projects/smpng/sys/boot/sparc64/boot1/_start.S#1 branch ... //depot/projects/smpng/sys/boot/sparc64/bootblock/Makefile#2 delete ... //depot/projects/smpng/sys/boot/sparc64/bootblock/bootblock.c#4 delete ... //depot/projects/smpng/sys/cam/scsi/scsi_all.c#7 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_da.c#21 integrate ... //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#12 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#12 integrate ... //depot/projects/smpng/sys/conf/files#30 integrate ... //depot/projects/smpng/sys/conf/files.alpha#11 integrate ... //depot/projects/smpng/sys/conf/files.i386#21 integrate ... //depot/projects/smpng/sys/conf/files.ia64#11 integrate ... //depot/projects/smpng/sys/conf/files.pc98#21 integrate ... //depot/projects/smpng/sys/conf/files.powerpc#5 integrate ... //depot/projects/smpng/sys/conf/files.sparc64#13 integrate ... //depot/projects/smpng/sys/conf/options#15 integrate ... //depot/projects/smpng/sys/dev/aac/aac_disk.c#9 integrate ... //depot/projects/smpng/sys/dev/asr/asr.c#10 integrate ... //depot/projects/smpng/sys/dev/ata/ata-all.c#15 integrate ... //depot/projects/smpng/sys/dev/ata/ata-disk.c#15 integrate ... //depot/projects/smpng/sys/dev/ata/ata-dma.c#15 integrate ... //depot/projects/smpng/sys/dev/ata/ata-raid.c#9 integrate ... //depot/projects/smpng/sys/dev/ata/ata-raid.h#7 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#18 integrate ... //depot/projects/smpng/sys/dev/ccd/ccd.c#11 integrate ... //depot/projects/smpng/sys/dev/ida/ida_disk.c#5 integrate ... //depot/projects/smpng/sys/dev/kbd/atkbdc.c#3 integrate ... //depot/projects/smpng/sys/dev/null/null.c#2 integrate ... //depot/projects/smpng/sys/dev/pccard/pccard_cis.c#8 integrate ... //depot/projects/smpng/sys/dev/pdq/if_fea.c#3 integrate ... //depot/projects/smpng/sys/dev/pdq/if_fpa.c#2 integrate ... //depot/projects/smpng/sys/dev/pdq/pdq.c#2 integrate ... //depot/projects/smpng/sys/dev/pdq/pdq_freebsd.h#1 branch ... //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#3 integrate ... //depot/projects/smpng/sys/dev/pdq/pdqreg.h#2 integrate ... //depot/projects/smpng/sys/dev/pdq/pdqvar.h#2 integrate ... //depot/projects/smpng/sys/dev/puc/pucdata.c#3 integrate ... //depot/projects/smpng/sys/dev/sio/sio.c#14 integrate ... //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/if_aue.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/ohci.c#11 integrate ... //depot/projects/smpng/sys/dev/usb/ohcireg.h#3 integrate ... //depot/projects/smpng/sys/dev/usb/ohcivar.h#4 integrate ... //depot/projects/smpng/sys/dev/usb/uhci.c#12 integrate ... //depot/projects/smpng/sys/dev/usb/usb.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/usb_port.h#7 integrate ... //depot/projects/smpng/sys/dev/usb/usb_subr.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs#16 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs.h#16 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#16 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.c#5 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi_util.c#2 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi_util.h#2 integrate ... //depot/projects/smpng/sys/dev/usb/uvscom.c#2 integrate ... //depot/projects/smpng/sys/dev/vinum/vinum.c#6 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumext.h#4 integrate ... //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#3 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#22 integrate ... //depot/projects/smpng/sys/dev/wi/if_wireg.h#7 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_status.c#9 integrate ... //depot/projects/smpng/sys/geom/geom.h#3 integrate ... //depot/projects/smpng/sys/geom/geom_bsd.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_dev.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_disk.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_dump.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_enc.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_event.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_int.h#1 branch ... //depot/projects/smpng/sys/geom/geom_io.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_kern.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_mbr.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_pc98.c#1 branch ... //depot/projects/smpng/sys/geom/geom_slice.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_slice.h#2 integrate ... //depot/projects/smpng/sys/geom/geom_subr.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_sunlabel.c#3 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#12 integrate ... //depot/projects/smpng/sys/i386/conf/NOTES#30 integrate ... //depot/projects/smpng/sys/i386/i386/autoconf.c#9 integrate ... //depot/projects/smpng/sys/i386/i386/bios.c#8 integrate ... //depot/projects/smpng/sys/i386/i386/critical.c#1 branch ... //depot/projects/smpng/sys/i386/i386/exception.s#7 integrate ... //depot/projects/smpng/sys/i386/i386/genassym.c#14 integrate ... //depot/projects/smpng/sys/i386/i386/i386dump.c#1 branch ... //depot/projects/smpng/sys/i386/i386/machdep.c#27 integrate ... //depot/projects/smpng/sys/i386/i386/mp_machdep.c#20 integrate ... //depot/projects/smpng/sys/i386/i386/mpapic.c#8 integrate ... //depot/projects/smpng/sys/i386/i386/swtch.s#12 integrate ... //depot/projects/smpng/sys/i386/i386/vm_machdep.c#20 integrate ... //depot/projects/smpng/sys/i386/include/cpufunc.h#12 integrate ... //depot/projects/smpng/sys/i386/include/mutex.h#9 integrate ... //depot/projects/smpng/sys/i386/include/pcb.h#6 integrate ... //depot/projects/smpng/sys/i386/include/pcpu.h#3 integrate ... //depot/projects/smpng/sys/i386/include/proc.h#6 integrate ... //depot/projects/smpng/sys/i386/isa/apic_vector.s#10 integrate ... //depot/projects/smpng/sys/i386/isa/clock.c#14 integrate ... //depot/projects/smpng/sys/i386/isa/icu_vector.s#9 integrate ... //depot/projects/smpng/sys/i386/isa/intr_machdep.c#13 integrate ... //depot/projects/smpng/sys/i386/isa/intr_machdep.h#8 integrate ... //depot/projects/smpng/sys/i386/isa/ipl.s#6 integrate ... //depot/projects/smpng/sys/i386/isa/npx.c#24 integrate ... //depot/projects/smpng/sys/ia64/ia64/autoconf.c#7 integrate ... //depot/projects/smpng/sys/ia64/ia64/critical.c#1 branch ... //depot/projects/smpng/sys/ia64/ia64/exception.s#17 integrate ... //depot/projects/smpng/sys/ia64/ia64/genassym.c#16 integrate ... //depot/projects/smpng/sys/ia64/ia64/locore.s#11 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#28 integrate ... //depot/projects/smpng/sys/ia64/include/asm.h#4 integrate ... //depot/projects/smpng/sys/ia64/include/cpufunc.h#11 integrate ... //depot/projects/smpng/sys/ia64/include/proc.h#5 integrate ... //depot/projects/smpng/sys/isa/fd.c#9 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#11 integrate ... //depot/projects/smpng/sys/kern/bus_if.m#2 integrate ... //depot/projects/smpng/sys/kern/init_main.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_condvar.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#19 integrate ... //depot/projects/smpng/sys/kern/kern_exec.c#30 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#28 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#29 integrate ... //depot/projects/smpng/sys/kern/kern_ktr.c#12 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#21 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#52 integrate ... //depot/projects/smpng/sys/kern/kern_shutdown.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_switch.c#12 integrate ... //depot/projects/smpng/sys/kern/kern_tc.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_bus.c#8 integrate ... //depot/projects/smpng/sys/kern/subr_disk.c#8 integrate ... //depot/projects/smpng/sys/kern/subr_disklabel.c#6 integrate ... //depot/projects/smpng/sys/kern/subr_diskslice.c#6 integrate ... //depot/projects/smpng/sys/kern/subr_trap.c#31 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#35 integrate ... //depot/projects/smpng/sys/kern/subr_xxx.c#4 integrate ... //depot/projects/smpng/sys/kern/sys_pipe.c#12 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#16 integrate ... //depot/projects/smpng/sys/kern/vfs_conf.c#5 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#31 integrate ... //depot/projects/smpng/sys/net/fddi.h#3 integrate ... //depot/projects/smpng/sys/net/if.c#18 integrate ... //depot/projects/smpng/sys/net/if_fddisubr.c#6 integrate ... //depot/projects/smpng/sys/net/if_llc.h#2 integrate ... //depot/projects/smpng/sys/netinet/in.h#8 integrate ... //depot/projects/smpng/sys/netinet6/ip6_mroute.c#4 integrate ... //depot/projects/smpng/sys/netinet6/ip6_output.c#8 integrate ... //depot/projects/smpng/sys/netinet6/nd6.c#5 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#22 integrate ... //depot/projects/smpng/sys/pc98/pc98/clock.c#7 integrate ... //depot/projects/smpng/sys/pc98/pc98/fd.c#8 integrate ... //depot/projects/smpng/sys/powerpc/include/cpufunc.h#10 integrate ... //depot/projects/smpng/sys/powerpc/include/proc.h#5 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/autoconf.c#5 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/critical.c#1 branch ... //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#18 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#16 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#12 integrate ... //depot/projects/smpng/sys/sparc64/include/cpufunc.h#14 integrate ... //depot/projects/smpng/sys/sparc64/include/proc.h#7 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/autoconf.c#6 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/clock.c#4 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/critical.c#1 branch ... //depot/projects/smpng/sys/sparc64/sparc64/exception.s#17 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#18 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#20 integrate ... //depot/projects/smpng/sys/sys/_types.h#1 branch ... //depot/projects/smpng/sys/sys/ata.h#7 integrate ... //depot/projects/smpng/sys/sys/bio.h#6 integrate ... //depot/projects/smpng/sys/sys/bus.h#4 integrate ... //depot/projects/smpng/sys/sys/cdefs.h#9 integrate ... //depot/projects/smpng/sys/sys/condvar.h#3 integrate ... //depot/projects/smpng/sys/sys/conf.h#13 integrate ... //depot/projects/smpng/sys/sys/disk.h#4 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#9 integrate ... //depot/projects/smpng/sys/sys/filedesc.h#9 integrate ... //depot/projects/smpng/sys/sys/kerneldump.h#1 branch ... //depot/projects/smpng/sys/sys/ktr.h#7 integrate ... //depot/projects/smpng/sys/sys/lock.h#14 integrate ... //depot/projects/smpng/sys/sys/mutex.h#20 integrate ... //depot/projects/smpng/sys/sys/proc.h#41 integrate ... //depot/projects/smpng/sys/sys/stdint.h#2 integrate ... //depot/projects/smpng/sys/sys/sysctl.h#8 integrate ... //depot/projects/smpng/sys/sys/systm.h#27 integrate ... //depot/projects/smpng/sys/sys/tty.h#6 integrate ... //depot/projects/smpng/sys/sys/types.h#10 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#17 integrate ... //depot/projects/smpng/sys/vm/uma_int.h#2 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/autoconf.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.50 2002/03/20 18:58:44 obrien Exp $ + * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.51 2002/03/31 07:15:24 phk Exp $ */ #include "opt_bootp.h" @@ -71,9 +71,6 @@ extern int nfs_diskless_valid; /* XXX use include file */ -dev_t rootdev = NODEV; -dev_t dumpdev = NODEV; - static void configure_start() { ==== //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.10 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.11 2002/03/29 23:05:05 wilko Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -31,21 +31,20 @@ */ /* - * Port to based on NetBSD/axp by Wilko Bulte * FreeBSD version based on: * NetBSD: dec_eb64plus.c,v 1.15 1998/11/19 02:20:07 ross Exp * - * Some info on the Aspen Alpine as this might be hard to come by: + * Some info on the Aspen Alpine which might be hard to come by: * - Hardware is close enough to the DEC EB64+ design to allow it to run - * the EB64+ SRM console f/w - * - 3 PCI slots, closest to the SIMMs: Alpine calls this slot C - * the middle one Alpine calls this slot B - * the 3rd one is Alpine calls this slot A - * (A, B, C is silkscreened on the PCB) + * the EB64+ SRM console firmware + * - 3 PCI slots, closest to the SIMMs: Alpine calls this one slot C + * the middle one Alpine calls slot B + * the 3rd one Alpine calls slot A + * (A, B, C are silkscreened on the PCB) * - embedded NCR810, located at PCI slot 5 * - 3 ISA slots, hanging off an Intel 82378IB PCI-ISA bridge at PCI slot 8 - * - embedded floppy, PC keyboard interface, PS/2 mouse interface, 2x serial - * ports and a parallel port. All of this hiding after the ISA bridge + * - embedded floppy, PC keyboard interface, PS/2 mouse interface, 2 serial + * ports and a parallel port. All of this hanging off the ISA bridge */ #include "opt_ddb.h" ==== //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.7 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.8 2002/03/26 19:46:40 dfr Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob @@ -92,6 +92,7 @@ } platform.iobus = "mcbus"; + platform.cons_init = dec_kn300_cons_init; } extern int comconsole; @@ -101,6 +102,7 @@ { struct ctb *ctb; + mcbus_init(); #ifdef DDB siogdbattach(0x2f8, 57600); #endif ==== //depot/projects/smpng/sys/alpha/alpha/exception.s#5 (text+ko) ==== @@ -24,7 +24,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ - * $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.14 2001/12/11 23:33:38 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.15 2002/03/29 16:35:25 jake Exp $ */ #include @@ -130,16 +130,26 @@ CALL(syscall) /* Handle any AST's. */ +2: ldiq a0, ALPHA_PSL_IPL_HIGH /* disable all interrupts */ + call_pal PAL_OSF1_swpipl + ldq s0, PC_CURTHREAD(pcpup) /* checking for pending asts */ + ldq s1, TD_KSE(s0) /* atomically with returning */ + ldl s1, KE_FLAGS(s1) + ldiq s2, KEF_ASTPENDING | KEF_NEEDRESCHED + and s1, s2 + beq s1, 3f + ldiq a0, ALPHA_PSL_IPL_0 /* reenable interrupts */ + call_pal PAL_OSF1_swpipl mov sp, a0 /* only arg is frame */ CALL(ast) + jmp zero, 2b /* see if we need a full exception_return */ - ldq t1, (FRAME_FLAGS*8)(sp) +3: ldq t1, (FRAME_FLAGS*8)(sp) and t1, FRAME_FLAGS_SYSCALL beq t1, exception_return /* set the hae register if this process has specified a value */ - ldq s0, PC_CURTHREAD(pcpup) ldq t1, TD_MD_FLAGS(s0) and t1, MDP_HAEUSED beq t1, 3f @@ -266,8 +276,19 @@ beq t0, Lkernelret /* no: kernel return */ /* Handle any AST's or resched's. */ +1: ldiq a0, ALPHA_PSL_IPL_HIGH /* disable all interrupts */ + call_pal PAL_OSF1_swpipl + ldq s2, TD_KSE(s0) /* checking for pending asts */ + ldl s2, KE_FLAGS(s2) /* atomically with returning */ + ldiq s3, KEF_ASTPENDING | KEF_NEEDRESCHED + and s2, s3 + beq s2, 2f + ldiq a0, ALPHA_PSL_IPL_0 /* reenable interrupts */ + call_pal PAL_OSF1_swpipl mov sp, a0 /* only arg is frame */ CALL(ast) + jmp zero, 1b +2: #ifdef SMP br Lrestoreregs #endif ==== //depot/projects/smpng/sys/alpha/alpha/genassym.c#10 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.36 2002/02/07 10:27:56 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.37 2002/03/29 16:35:25 jake Exp $ */ #include @@ -81,6 +81,11 @@ ASSYM(TD_KSE, offsetof(struct thread, td_kse)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); +ASSYM(KE_FLAGS, offsetof(struct kse, ke_flags)); + +ASSYM(KEF_ASTPENDING, KEF_ASTPENDING); +ASSYM(KEF_NEEDRESCHED, KEF_NEEDRESCHED); + ASSYM(TD_MD_FLAGS, offsetof(struct thread, td_md.md_flags)); ASSYM(TD_MD_PCBPADDR, offsetof(struct thread, td_md.md_pcbpaddr)); ASSYM(TD_MD_HAE, offsetof(struct thread, td_md.md_hae)); ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#32 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.169 2002/03/21 06:14:57 imp Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.170 2002/03/27 09:23:37 jeff Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -955,7 +955,7 @@ */ mtx_init(&Giant, "Giant", MTX_DEF | MTX_RECURSE); mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); - mtx_init(&proc0.p_mtx, "process lock", MTX_DEF); + mtx_init(&proc0.p_mtx, "process lock", MTX_DEF|MTX_DUPOK); mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); mtx_init(&icu_lock, "icu", MTX_SPIN); mtx_lock(&Giant); ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#29 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.89 2002/03/21 06:14:57 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.90 2002/03/29 18:55:07 alc Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -534,13 +534,13 @@ /* * Grow the stack if necessary */ - /* grow_stack returns false only if va falls into + /* vm_map_growstack fails only if va falls into * a growable stack region and the stack growth - * fails. It returns true if va was not within + * fails. It succeeds if va was not within * a growable stack region, or if the stack * growth succeeded. */ - if (!grow_stack (p, va)) + if (vm_map_growstack(p, va) != KERN_SUCCESS) rv = KERN_FAILURE; else /* Fault in the user page: */ ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#14 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.133 2002/03/24 14:35:20 wilko Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.134 2002/03/27 21:10:38 wilko Exp $ machine alpha cpu EV4 @@ -137,7 +137,6 @@ device ppc device ppbus # Parallel port bus (required) device lpt # Printer -#device plip # TCP/IP over parallel device ppi # Parallel port interface device #device vpo # Requires scbus and da ==== //depot/projects/smpng/sys/alpha/include/cpufunc.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/cpufunc.h,v 1.13 2002/03/21 06:14:57 imp Exp $ + * $FreeBSD: src/sys/alpha/include/cpufunc.h,v 1.14 2002/03/27 05:39:16 dillon Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -35,7 +35,7 @@ #include #include -#define CRITICAL_FORK (ALPHA_PSL_IPL_0) +struct thread; #ifdef __GNUC__ @@ -47,18 +47,6 @@ #endif -static __inline critical_t -cpu_critical_enter(void) -{ - return (alpha_pal_swpipl(ALPHA_PSL_IPL_MCES)); -} - -static __inline void -cpu_critical_exit(critical_t ipl) -{ - alpha_pal_swpipl(ipl); -} - static __inline register_t intr_disable(void) { @@ -71,6 +59,10 @@ alpha_pal_swpipl(ipl); } +void cpu_critical_enter(void); +void cpu_critical_exit(void); +void cpu_critical_fork_exit(void); +void cpu_thread_link(struct thread *td); #endif /* _KERNEL */ ==== //depot/projects/smpng/sys/alpha/include/proc.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/proc.h,v 1.13 2001/12/11 23:33:39 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/include/proc.h,v 1.14 2002/03/27 05:39:16 dillon Exp $ */ /* From: NetBSD: proc.h,v 1.3 1997/04/06 08:47:36 cgd Exp */ /* @@ -47,6 +47,7 @@ u_int64_t md_hae; /* user HAE register value */ void *osf_sigtramp; /* user-level signal trampoline */ u_int md_kernnest; /* nesting level in the kernel */ + register_t md_savecrit; /* save PSL for critical section */ }; #define MDP_FPUSED 0x0001 /* Process used the FPU */ ==== //depot/projects/smpng/sys/alpha/mcbus/mcbus.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/mcbus/mcbus.c,v 1.2 2000/08/28 21:48:02 dfr Exp $ */ +/* $FreeBSD: src/sys/alpha/mcbus/mcbus.c,v 1.3 2002/03/26 19:46:40 dfr Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -43,6 +43,7 @@ #include #include +#include struct mcbus_device *mcbus_primary_cpu = NULL; @@ -106,6 +107,34 @@ static const int mcbus_mcpcia_probe_order[] = { 5, 4, 7, 6 }; /* + * Early console support requires us to partially probe the bus to + * find the ISA bus resources. + */ +void +mcbus_init(void) +{ + static int initted = 0; + int i, mid, gid; + + if (initted) return; + initted = 1; + + /* + * We only look at the first two mids because at this point, + * badaddr() doesn't work so we can't call NO_MCPCIA_AT(). + */ + gid = MCBUS_GID_FROM_INSTANCE(0); + for (i = 0; i < 2; ++i) { + mid = mcbus_mcpcia_probe_order[i]; + + if (NO_MCPCIA_AT(mid, gid)) { + continue; + } + mcpcia_init(gid, mid); + } +} + +/* * At 'probe' time, we add all the devices which we know about to the * bus. The generic attach routine will probe and attach them if they * are alive. ==== //depot/projects/smpng/sys/alpha/mcbus/mcbusvar.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/mcbus/mcbusvar.h,v 1.1 2000/05/07 04:53:04 mjacob Exp $ */ +/* $FreeBSD: src/sys/alpha/mcbus/mcbusvar.h,v 1.2 2002/03/26 19:46:40 dfr Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -71,3 +71,5 @@ #define MCBUS_TYPE_PCI 4 #define DEVTOMCBUS(dev) ((struct mcbus_device *) device_get_ivars(dev)) + +extern void mcbus_init(void); ==== //depot/projects/smpng/sys/alpha/mcbus/mcpcia.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.22 2002/03/01 23:10:19 mjacob Exp $ */ +/* $FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.23 2002/03/26 19:46:40 dfr Exp $ */ /* * Copyright (c) 2000 Matthew Jacob * All rights reserved. @@ -120,6 +120,40 @@ static struct mcpcia_softc *mcpcia_root; +/* + * Early console support requires us to partially probe the bus to + * find the ISA bus resources. + */ +void +mcpcia_init(int gid, int mid) +{ + static struct swiz_space io_space; + static struct swiz_space mem_space; + u_int64_t sysbase; + vm_offset_t regs, io_base, smem_base; + + sysbase = MCBUS_IOSPACE | + (((u_int64_t) gid) << MCBUS_GID_SHIFT) | + (((u_int64_t) mid) << MCBUS_MID_SHIFT); + + if (EISA_PRESENT(REGVAL(sysbase + | MCPCIA_PCI_BRIDGE + | _MCPCIA_PCI_REV))) { + /* + * Define temporary spaces for bootstrap i/o. + */ + regs = (vm_offset_t) KV(sysbase); + io_base = regs + MCPCIA_PCI_IOSPACE; + smem_base = regs + MCPCIA_PCI_SPARSE; + + swiz_init_space(&io_space, io_base); + swiz_init_space(&mem_space, smem_base); + + busspace_isa_io = (struct alpha_busspace *) &io_space; + busspace_isa_mem = (struct alpha_busspace *) &mem_space; + } +} + static int mcpcia_probe(device_t dev) { @@ -233,10 +267,6 @@ &sc->io_space; busspace_isa_mem = (struct alpha_busspace *) &sc->mem_space; - printf("Attaching Real Console\n"); - mcpcia_enable_intr(sc, 16); - dec_kn300_cons_init(); - promcndetach(); /* * Enable EISA interrupts. */ ==== //depot/projects/smpng/sys/alpha/mcbus/mcpciavar.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/mcbus/mcpciavar.h,v 1.2 2001/02/13 22:46:30 mjacob Exp $ */ +/* $FreeBSD: src/sys/alpha/mcbus/mcpciavar.h,v 1.3 2002/03/26 19:46:40 dfr Exp $ */ /* * Copyright (c) 1998, 2000 by Matthew Jacob @@ -61,3 +61,5 @@ */ #define MCPCIA_I2C_CVEC 0xA90 #define MCPCIA_I2C_BVEC 0xAA0 + +extern void mcpcia_init(int, int); ==== //depot/projects/smpng/sys/boot/Makefile#4 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.11 2001/10/25 09:05:47 ru Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.12 2002/03/28 01:37:10 obrien Exp $ # Build the add-in FORTH interpreter SUBDIR+= ficl -# Build OpenFirmware library on PowerPC -.if ${MACHINE_ARCH} == "powerpc" +# Build OpenFirmware library +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" SUBDIR+= ofw .endif ==== //depot/projects/smpng/sys/boot/common/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,13 @@ -# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.12 2001/03/27 11:59:21 ru Exp $ +# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.13 2002/03/28 01:28:21 obrien Exp $ SRCS+= bcache.c boot.c commands.c console.c devopen.c interp.c -SRCS+= interp_backslash.c interp_parse.c load_aout.c load_elf.c ls.c misc.c +SRCS+= interp_backslash.c interp_parse.c load_elf.c ls.c misc.c SRCS+= module.c panic.c +.if defined(LOADER_AOUT_SUPPORT) +SRCS+= load_aout.c +.endif + .if defined(LOADER_NET_SUPPORT) SRCS+= dev_net.c .endif ==== //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/start.S#3 (text+ko) ==== @@ -23,12 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/start.S,v 1.3 2001/10/24 20:14:49 dfr Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/start.S,v 1.4 2002/03/28 07:07:45 marcel Exp $ */ .text -#include #include #define EFI_SUCCESS 0 ==== //depot/projects/smpng/sys/boot/efi/libefi/efifs.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.4 2002/03/19 23:05:33 peter Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.5 2002/03/30 01:36:03 marcel Exp $ */ #include @@ -48,7 +48,12 @@ CHAR16 *cp; CHAR16 *path; - if (!dev->d_handle) + /* + * We cannot blindly assume that f->f_devdata points to a + * efi_devdesc structure. Before we dereference 'dev', make + * sure that the underlying device is ours. + */ + if (f->f_dev != &efifs_dev || dev->d_handle == NULL) return ENOENT; status = BS->HandleProtocol(dev->d_handle, &sfsid, (VOID **)&sfs); ==== //depot/projects/smpng/sys/boot/efi/libefi/efinet.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/efinet.c,v 1.1 2001/09/22 19:10:56 dfr Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/efinet.c,v 1.3 2002/03/30 04:50:52 marcel Exp $ */ #include @@ -39,6 +39,40 @@ extern struct netif_driver efi_net; +#ifdef EFINET_DEBUG +static void +dump_mode(EFI_SIMPLE_NETWORK_MODE *mode) +{ + int i; + + printf("State = %x\n", mode->State); + printf("HwAddressSize = %u\n", mode->HwAddressSize); + printf("MediaHeaderSize = %u\n", mode->MediaHeaderSize); + printf("MaxPacketSize = %u\n", mode->MaxPacketSize); + printf("NvRamSize = %u\n", mode->NvRamSize); + printf("NvRamAccessSize = %u\n", mode->NvRamAccessSize); + printf("ReceiveFilterMask = %x\n", mode->ReceiveFilterMask); + printf("ReceiveFilterSetting = %u\n", mode->ReceiveFilterSetting); + printf("MaxMCastFilterCount = %u\n", mode->MaxMCastFilterCount); + printf("MCastFilterCount = %u\n", mode->MCastFilterCount); + printf("MCastFilter = {"); + for (i = 0; i < mode->MCastFilterCount; i++) + printf(" %s", ether_sprintf(mode->MCastFilter[i].Addr)); + printf(" }\n"); + printf("CurrentAddress = %s\n", + ether_sprintf(mode->CurrentAddress.Addr)); + printf("BroadcastAddress = %s\n", + ether_sprintf(mode->BroadcastAddress.Addr)); + printf("PermanentAddress = %s\n", + ether_sprintf(mode->PermanentAddress.Addr)); + printf("IfType = %u\n", mode->IfType); + printf("MacAddressChangeable = %d\n", mode->MacAddressChangeable); + printf("MultipleTxSupported = %d\n", mode->MultipleTxSupported); + printf("MediaPresentSupported = %d\n", mode->MediaPresentSupported); + printf("MediaPresent = %d\n", mode->MediaPresent); +} +#endif + int efinet_match(struct netif *nif, void *machdep_hint) { @@ -56,26 +90,39 @@ int efinet_put(struct iodesc *desc, void *pkt, size_t len) { - EFI_SIMPLE_NETWORK *net = desc->io_netif->nif_devdata; + struct netif *nif = desc->io_netif; + EFI_SIMPLE_NETWORK *net; EFI_STATUS status; - int i; + void *buf; + + net = nif->nif_devdata; status = net->Transmit(net, 0, len, pkt, 0, 0, 0); - if (!EFI_ERROR(status)) - return len; - else + if (status != EFI_SUCCESS) return -1; + + /* Wait for the buffer to be transmitted */ + buf = 0; /* XXX Is this needed? */ + do { + status = net->GetStatus(net, 0, &buf); + } while (status == EFI_SUCCESS && buf != pkt); + + /* XXX How do we deal with status != EFI_SUCCESS now? */ + return (status == EFI_SUCCESS) ? len : -1; } int efinet_get(struct iodesc *desc, void *pkt, size_t len, time_t timeout) { - EFI_SIMPLE_NETWORK *net = desc->io_netif->nif_devdata; + struct netif *nif = desc->io_netif; + EFI_SIMPLE_NETWORK *net; EFI_STATUS status; UINTN bufsz; time_t t; + net = nif->nif_devdata; + t = time(0); while ((time(0) - t) < timeout) { bufsz = len; @@ -92,16 +139,46 @@ void efinet_init(struct iodesc *desc, void *machdep_hint) { - struct netif *nif; - EFI_SIMPLE_NETWORK *net; - int i; + struct netif *nif = desc->io_netif; + EFI_SIMPLE_NETWORK *net; + EFI_STATUS status; - nif = desc->io_netif; net = nif->nif_driver->netif_ifs[nif->nif_unit].dif_private; - desc->io_netif->nif_devdata = net; + nif->nif_devdata = net; + + if (net->Mode->State == EfiSimpleNetworkStopped) { + status = net->Start(net); + if (status != EFI_SUCCESS) { + printf("net%d: cannot start interface (status=%d)\n", + nif->nif_unit, status); + return; + } + } + + if (net->Mode->State != EfiSimpleNetworkInitialized) { + status = net->Initialize(net, 0, 0); + if (status != EFI_SUCCESS) { + printf("net%d: cannot init. interface (status=%d)\n", + nif->nif_unit, status); + return; + } + } + + if (net->Mode->ReceiveFilterSetting == 0) { + UINT32 mask = EFI_SIMPLE_NETWORK_RECEIVE_UNICAST | + EFI_SIMPLE_NETWORK_RECEIVE_BROADCAST; + + status = net->ReceiveFilters(net, mask, 0, FALSE, 0, 0); + if (status != EFI_SUCCESS) { + printf("net%d: cannot set rx. filters (status=%d)\n", + nif->nif_unit, status); + return; + } + } - net->Start(net); - net->Initialize(net, 0, 0); +#ifdef EFINET_DEBUG + dump_mode(net->Mode); +#endif bcopy(net->Mode->CurrentAddress.Addr, desc->myea, 6); desc->xid = 1; @@ -145,7 +222,6 @@ dif->dif_unit = i; dif->dif_nsel = 1; dif->dif_stats = &stats[i]; - dif->dif_private = handles[i]; BS->HandleProtocol(handles[i], &netid, (VOID**) &dif->dif_private); ==== //depot/projects/smpng/sys/boot/efi/libefi/elf_freebsd.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/libefi/elf_freebsd.c,v 1.5 2001/10/25 08:53:39 dfr Exp $ */ +/* $FreeBSD: src/sys/boot/efi/libefi/elf_freebsd.c,v 1.6 2002/03/30 23:00:04 marcel Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -129,7 +129,7 @@ __asm __volatile("mov cr.iip=%0" :: "r"(start)); __asm __volatile("mov cr.ifs=r0;;"); __asm __volatile("mov ar.rsc=0;; flushrs;;"); - + __asm __volatile("mov r8=%0" :: "r" (bi)); __asm __volatile("rfi;;"); } ==== //depot/projects/smpng/sys/boot/efi/loader/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.8 2001/10/08 01:41:45 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.10 2002/03/31 20:48:13 marcel Exp $ .PATH: ${.CURDIR}/../common @@ -62,6 +62,7 @@ -j .rela \ -j .reloc \ -j .dynsym \ + -j .dynstr \ --target=efi-app-${MACHINE_ARCH} \ ${BASE}.sym ${BASE}.efi @@ -70,12 +71,9 @@ > ${.TARGET} beforeinstall: -.if exists(${.OBJDIR}/loader.help) +.if exists(${.OBJDIR}/${BASE}.help) ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot -.else - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${BASE}.help ${DESTDIR}/boot .endif # Other fragments still to be brought in from ../Makfile.booters? @@ -87,10 +85,9 @@ .include -${BASE}.sym: ${OBJS} ${LIBSTAND} ${LIBEFI} ${CRT} vers.o - ${LD} ${LDFLAGS} -o ${BASE}.sym -M \ - ${CRT} ${OBJS} vers.o \ - ${LIBFICL} ${LIBSTAND} ${LIBEFI} ${LIBSTAND} \ +${BASE}.sym: ${OBJS} ${LIBEFI} ${CRT} vers.o + ${LD} ${LDFLAGS} -o ${BASE}.sym -M ${CRT} ${OBJS} vers.o \ + ${LIBFICL} ${LIBEFI} -L${DESTDIR}${LIBDIR} ${LIBSTAND} \ > ${.OBJDIR}/${BASE}.list beforedepend ${OBJS}: machine ==== //depot/projects/smpng/sys/boot/efi/loader/main.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.9 2001/09/25 19:44:19 dfr Exp $"; + "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.10 2002/03/30 07:32:08 marcel Exp $"; #endif /* not lint */ #include @@ -98,10 +98,15 @@ EFI_STATUS efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table) { - int i; + static EFI_GUID imgid = LOADED_IMAGE_PROTOCOL; + static EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL; EFI_PHYSICAL_ADDRESS mem; + EFI_LOADED_IMAGE *img; + EFI_SIMPLE_NETWORK *net; + EFI_STATUS status; struct ia64_pal_result res; char buf[32]; + int i; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 10:38:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 699AD37B419; Mon, 1 Apr 2002 10:38:22 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B3C5037B417 for ; Mon, 1 Apr 2002 10:38:21 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31IcLI10843 for perforce@freebsd.org; Mon, 1 Apr 2002 10:38:21 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 10:38:21 -0800 (PST) Message-Id: <200204011838.g31IcLI10843@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8799 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8799 Change 8799 by jhb@jhb_laptop on 2002/04/01 10:37:50 The rest of the IPv6 code has been polluted to use td so use that rather than p. Affected files ... ... //depot/projects/smpng/sys/netinet6/ip6_input.c#10 edit Differences ... ==== //depot/projects/smpng/sys/netinet6/ip6_input.c#10 (text+ko) ==== @@ -1135,15 +1135,15 @@ struct mbuf *m; { #if __FreeBSD__ >= 5 - struct thread *p = curthread; /* XXX */ + struct thread *td = curthread; /* XXX */ #else - struct proc *p = curproc; /* XXX */ + struct proc *td = curproc; /* XXX */ #endif int privileged = 0; int rthdr_exist = 0; - if (p && !suser(p)) + if (td && !suser(td)) privileged++; #ifdef SO_TIMESTAMP To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 10:59:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D927937B41B; Mon, 1 Apr 2002 10:59:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 302AD37B405 for ; Mon, 1 Apr 2002 10:59:49 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31IxmP15376 for perforce@freebsd.org; Mon, 1 Apr 2002 10:59:48 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 10:59:48 -0800 (PST) Message-Id: <200204011859.g31IxmP15376@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8802 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8802 Change 8802 by jhb@jhb_zion on 2002/04/01 10:59:34 Axe KTR_EXTEND. Affected files ... ... //depot/projects/smpng/sys/alpha/conf/ALPHA#2 edit ... //depot/projects/smpng/sys/i386/conf/X86SMP#3 edit ... //depot/projects/smpng/sys/i386/conf/X86UP#3 edit Differences ... ==== //depot/projects/smpng/sys/alpha/conf/ALPHA#2 (text+ko) ==== @@ -45,7 +45,6 @@ # KTR options KTR -options KTR_EXTEND options KTR_COMPILE=KTR_ALL options KTR_ENTRIES=16384 ==== //depot/projects/smpng/sys/i386/conf/X86SMP#3 (text+ko) ==== @@ -43,7 +43,6 @@ # KTR options KTR -options KTR_EXTEND options KTR_COMPILE=KTR_ALL options KTR_ENTRIES=16384 ==== //depot/projects/smpng/sys/i386/conf/X86UP#3 (text+ko) ==== @@ -39,7 +39,6 @@ # KTR options KTR -options KTR_EXTEND options KTR_COMPILE=KTR_ALL options KTR_ENTRIES=16384 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 11: 3:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7CE237B417; Mon, 1 Apr 2002 11:03:20 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 40D5837B4AE for ; Mon, 1 Apr 2002 11:02:53 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31J2rU16386 for perforce@freebsd.org; Mon, 1 Apr 2002 11:02:53 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 11:02:53 -0800 (PST) Message-Id: <200204011902.g31J2rU16386@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8803 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8803 Change 8803 by jhb@jhb_laptop on 2002/04/01 11:02:34 Rename the X86 kernel configs to match the scheme I normally use. Affected files ... ... //depot/projects/smpng/sys/i386/conf/X86#1 branch ... //depot/projects/smpng/sys/i386/conf/X86-up#1 branch ... //depot/projects/smpng/sys/i386/conf/X86SMP#4 delete ... //depot/projects/smpng/sys/i386/conf/X86UP#4 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 11: 8:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8913F37B400; Mon, 1 Apr 2002 11:08:06 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2D65E37B417 for ; Mon, 1 Apr 2002 11:08:05 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31J84E21753 for perforce@freebsd.org; Mon, 1 Apr 2002 11:08:04 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 11:08:04 -0800 (PST) Message-Id: <200204011908.g31J84E21753@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8806 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8806 Change 8806 by jhb@jhb_laptop on 2002/04/01 11:07:43 Sigh, fix a new suser_td() instance. Affected files ... ... //depot/projects/smpng/sys/dev/null/null.c#3 edit Differences ... ==== //depot/projects/smpng/sys/dev/null/null.c#3 (text+ko) ==== @@ -99,7 +99,7 @@ if (cmd != DIOCGKERNELDUMP) return (noioctl(dev, cmd, data, fflag, td)); - error = suser_td(td); + error = suser(td); if (error) return (error); return (set_dumper(NULL)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 11:12:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 657D237B41A; Mon, 1 Apr 2002 11:12:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9BFE437B41F for ; Mon, 1 Apr 2002 11:12:12 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31JCAA22362 for perforce@freebsd.org; Mon, 1 Apr 2002 11:12:10 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 11:12:10 -0800 (PST) Message-Id: <200204011912.g31JCAA22362@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8807 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8807 Change 8807 by jhb@jhb_laptop on 2002/04/01 11:11:59 Bah, K&R function declarations suck. :) I missed removing the flag argument the second time. Bite the bullet and just use ANSI declarations for suser() and suser_cred(). Affected files ... ... //depot/projects/smpng/sys/kern/kern_prot.c#53 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_prot.c#53 (text+ko) ==== @@ -1265,9 +1265,7 @@ * specify jail interaction. */ int -suser_cred(cred, flag) - struct ucred *cred; - int flag; +suser_cred(struct ucred *cred, int flag) { if (!suser_enabled) @@ -1284,9 +1282,7 @@ * caller, promoting binary compatibility. */ int -suser(td) - struct thread *td; - int flag; +suser(struct thread *td) { return (suser_cred(td->td_ucred, 0)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 11:18:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E5BA37B41C; Mon, 1 Apr 2002 11:18:23 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 61FFE37B41B for ; Mon, 1 Apr 2002 11:18:22 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31JIM523442 for perforce@freebsd.org; Mon, 1 Apr 2002 11:18:22 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 11:18:22 -0800 (PST) Message-Id: <200204011918.g31JIM523442@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8808 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8808 Change 8808 by jhb@jhb_zion on 2002/04/01 11:18:11 Add Alpha UP kernel config. Affected files ... ... //depot/projects/smpng/sys/alpha/conf/ALPHA-up#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 11:20:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE11237B417; Mon, 1 Apr 2002 11:20:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from rwcrmhc54.attbi.com (rwcrmhc54.attbi.com [216.148.227.87]) by hub.freebsd.org (Postfix) with ESMTP id C8C7937B438; Mon, 1 Apr 2002 11:20:18 -0800 (PST) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc54.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020401192018.ODHE1214.rwcrmhc54.attbi.com@InterJet.elischer.org>; Mon, 1 Apr 2002 19:20:18 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id LAA15855; Mon, 1 Apr 2002 11:16:10 -0800 (PST) Date: Mon, 1 Apr 2002 11:16:10 -0800 (PST) From: Julian Elischer To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 8807 for review In-Reply-To: <200204011912.g31JCAA22362@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I ansify every declaration I come across.... On Mon, 1 Apr 2002, John Baldwin wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8807 > > Change 8807 by jhb@jhb_laptop on 2002/04/01 11:11:59 > > Bah, K&R function declarations suck. :) I missed removing the flag > argument the second time. Bite the bullet and just use ANSI > declarations for suser() and suser_cred(). > > Affected files ... > > ... //depot/projects/smpng/sys/kern/kern_prot.c#53 edit > > Differences ... > > ==== //depot/projects/smpng/sys/kern/kern_prot.c#53 (text+ko) ==== > > @@ -1265,9 +1265,7 @@ > * specify jail interaction. > */ > int > -suser_cred(cred, flag) > - struct ucred *cred; > - int flag; > +suser_cred(struct ucred *cred, int flag) > { > > if (!suser_enabled) > @@ -1284,9 +1282,7 @@ > * caller, promoting binary compatibility. > */ > int > -suser(td) > - struct thread *td; > - int flag; > +suser(struct thread *td) > { > > return (suser_cred(td->td_ucred, 0)); > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 11:45:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0936337B417; Mon, 1 Apr 2002 11:45:37 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mail12.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by hub.freebsd.org (Postfix) with ESMTP id EB51537B400 for ; Mon, 1 Apr 2002 11:45:35 -0800 (PST) Received: (qmail 6966 invoked from network); 1 Apr 2002 19:45:35 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 1 Apr 2002 19:45:35 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g31JkIv15385; Mon, 1 Apr 2002 14:46:18 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Mon, 01 Apr 2002 14:45:35 -0500 (EST) From: John Baldwin To: Julian Elischer Subject: Re: PERFORCE change 8807 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 01-Apr-2002 Julian Elischer wrote: > I ansify every declaration I come across.... Well, to be honest, those should be done separate from code commits. :) Also, most of this file still uses K&R. I probably should do a sweep of the file prior to committing to fixup all the declarations, but doing so would probably trigger some flamewar or another over it. :) > On Mon, 1 Apr 2002, John Baldwin wrote: > >> http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8807 >> >> Change 8807 by jhb@jhb_laptop on 2002/04/01 11:11:59 >> >> Bah, K&R function declarations suck. :) I missed removing the flag >> argument the second time. Bite the bullet and just use ANSI >> declarations for suser() and suser_cred(). >> >> Affected files ... >> >> ... //depot/projects/smpng/sys/kern/kern_prot.c#53 edit >> >> Differences ... >> >> ==== //depot/projects/smpng/sys/kern/kern_prot.c#53 (text+ko) ==== >> >> @@ -1265,9 +1265,7 @@ >> * specify jail interaction. >> */ >> int >> -suser_cred(cred, flag) >> - struct ucred *cred; >> - int flag; >> +suser_cred(struct ucred *cred, int flag) >> { >> >> if (!suser_enabled) >> @@ -1284,9 +1282,7 @@ >> * caller, promoting binary compatibility. >> */ >> int >> -suser(td) >> - struct thread *td; >> - int flag; >> +suser(struct thread *td) >> { >> >> return (suser_cred(td->td_ucred, 0)); >> > -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 12:17:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16BE037B41E; Mon, 1 Apr 2002 12:17:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 63A0B37B41D for ; Mon, 1 Apr 2002 12:17:39 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31KHdD39267 for perforce@freebsd.org; Mon, 1 Apr 2002 12:17:39 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 12:17:39 -0800 (PST) Message-Id: <200204012017.g31KHdD39267@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8816 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8816 Change 8816 by jhb@jhb_laptop on 2002/04/01 12:17:22 Bah, fix another new suser(). Affected files ... ... //depot/projects/smpng/sys/dev/wi/if_wi.c#23 edit Differences ... ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#23 (text+ko) ==== @@ -1801,7 +1801,7 @@ error = copyout(&wreq, ifr->ifr_data, sizeof(wreq)); break; case SIOCSPRISM2DEBUG: - if ((error = suser(p))) + if ((error = suser(td))) goto out; error = copyin(ifr->ifr_data, &wreq, sizeof(wreq)); if (error) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 12:58:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AA6637B405; Mon, 1 Apr 2002 12:57:36 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0FFF637B41B for ; Mon, 1 Apr 2002 12:57:30 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31KvTf46197 for perforce@freebsd.org; Mon, 1 Apr 2002 12:57:29 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 12:57:29 -0800 (PST) Message-Id: <200204012057.g31KvTf46197@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8822 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8822 Change 8822 by jhb@jhb_laptop on 2002/04/01 12:57:23 IFC. Affected files ... ... //depot/projects/smpng/sys/dev/usb/devlist2h.awk#2 integrate ... //depot/projects/smpng/sys/dev/usb/hid.h#2 integrate ... //depot/projects/smpng/sys/dev/usb/ohci.c#12 integrate ... //depot/projects/smpng/sys/dev/usb/ohcivar.h#5 integrate ... //depot/projects/smpng/sys/dev/usb/uhci.c#13 integrate ... //depot/projects/smpng/sys/dev/usb/uhcivar.h#4 integrate ... //depot/projects/smpng/sys/dev/usb/uhid.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/umodem.c#9 integrate ... //depot/projects/smpng/sys/dev/usb/urio.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/usb.c#9 integrate ... //depot/projects/smpng/sys/dev/usb/usb_subr.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs.h#17 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#17 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.h#4 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi_util.c#3 integrate ... //depot/projects/smpng/sys/dev/usb/usbdivar.h#6 integrate ... //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#4 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#24 integrate ... //depot/projects/smpng/sys/dev/wi/if_wireg.h#8 integrate ... //depot/projects/smpng/sys/i386/conf/NOTES#31 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#54 integrate ... //depot/projects/smpng/sys/kern/kern_shutdown.c#19 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#10 integrate ... //depot/projects/smpng/sys/sys/ktr.h#8 integrate Differences ... ==== //depot/projects/smpng/sys/dev/usb/devlist2h.awk#2 (text+ko) ==== @@ -1,6 +1,6 @@ #! /usr/bin/awk -f -# $NetBSD: devlist2h.awk,v 1.6 1999/08/17 16:06:20 augustss Exp $ -# $FreeBSD: src/sys/dev/usb/devlist2h.awk,v 1.1 1999/11/18 18:02:44 n_hibma Exp $ +# $NetBSD: usb/devlist2h.awk,v 1.9 2001/01/18 20:28:22 jdolecek Exp $ +# $FreeBSD: src/sys/dev/usb/devlist2h.awk,v 1.2 2002/04/01 19:22:04 joe Exp $ # # Copyright (c) 1995, 1996 Christopher G. Demetriou # All rights reserved. @@ -175,7 +175,7 @@ printf("\n") > dfile - printf("struct usb_knowndev usb_knowndevs[] = {\n") > dfile + printf("const struct usb_knowndev usb_knowndevs[] = {\n") > dfile for (i = 1; i <= nproducts; i++) { printf("\t{\n") > dfile printf("\t USB_VENDOR_%s, USB_PRODUCT_%s_%s,\n", ==== //depot/projects/smpng/sys/dev/usb/hid.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: hid.h,v 1.5 2000/04/27 15:26:46 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/hid.h,v 1.10 2000/07/17 18:41:18 n_hibma Exp $ */ +/* $NetBSD: hid.h,v 1.6 2000/06/01 14:28:57 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/hid.h,v 1.11 2002/04/01 19:01:08 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/dev/usb/ohci.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: ohci.c,v 1.90 2000/05/08 18:28:46 thorpej Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.73 2002/04/01 13:28:49 joe Exp $ */ +/* $NetBSD: ohci.c,v 1.94 2000/11/10 14:11:49 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.76 2002/04/01 20:01:41 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -91,6 +91,9 @@ #define DPRINTF(x) if (ohcidebug) logprintf x #define DPRINTFN(n,x) if (ohcidebug>(n)) logprintf x int ohcidebug = 1; +#ifndef __NetBSD__ +#define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f)) +#endif #else #define DPRINTF(x) #define DPRINTFN(n,x) @@ -1315,6 +1318,7 @@ (struct ohci_pipe *)xfer->pipe; if (sitd->flags & OHCI_CALL_DONE) { opipe->u.iso.inuse -= xfer->nframes; + /* XXX update frlengths with actual length */ /* XXX xfer->actlen = actlen; */ xfer->status = USBD_NORMAL_COMPLETION; usb_transfer_complete(xfer); @@ -1779,11 +1783,15 @@ void ohci_dump_td(ohci_soft_td_t *std) { - DPRINTF(("TD(%p) at %08lx: %b delay=%d ec=%d cc=%d\ncbp=0x%08lx " + char sbuf[128]; + + bitmask_snprintf((int)le32toh(std->td.td_flags), + "\20\23R\24OUT\25IN\31TOG1\32SETTOGGLE", + sbuf, sizeof(sbuf)); + + DPRINTF(("TD(%p) at %08lx: %s delay=%d ec=%d cc=%d\ncbp=0x%08lx " "nexttd=0x%08lx be=0x%08lx\n", - std, (u_long)std->physaddr, - (int)le32toh(std->td.td_flags), - "\20\23R\24OUT\25IN\31TOG1\32SETTOGGLE", + std, (u_long)std->physaddr, sbuf, OHCI_TD_GET_DI(le32toh(std->td.td_flags)), OHCI_TD_GET_EC(le32toh(std->td.td_flags)), OHCI_TD_GET_CC(le32toh(std->td.td_flags)), @@ -1823,17 +1831,22 @@ void ohci_dump_ed(ohci_soft_ed_t *sed) { - DPRINTF(("ED(%p) at 0x%08lx: addr=%d endpt=%d maxp=%d %b\ntailp=0x%08lx " - "headflags=%b headp=0x%08lx nexted=0x%08lx\n", + char sbuf[128], sbuf2[128]; + + bitmask_snprintf((int)le32toh(sed->ed.ed_flags), + "\20\14OUT\15IN\16LOWSPEED\17SKIP\20ISO", + sbuf, sizeof(sbuf)); + bitmask_snprintf((u_long)le32toh(sed->ed.ed_headp), + "\20\1HALT\2CARRY", sbuf2, sizeof(sbuf2)); + + DPRINTF(("ED(%p) at 0x%08lx: addr=%d endpt=%d maxp=%d %s\ntailp=0x%08lx " + "headflags=%s headp=0x%08lx nexted=0x%08lx\n", + sed, (u_long)sed->physaddr, OHCI_ED_GET_FA(le32toh(sed->ed.ed_flags)), OHCI_ED_GET_EN(le32toh(sed->ed.ed_flags)), - OHCI_ED_GET_MAXP(le32toh(sed->ed.ed_flags)), - (int)le32toh(sed->ed.ed_flags), - "\20\14OUT\15IN\16LOWSPEED\17SKIP\20ISO", - (u_long)(uintptr_t)le32toh(sed->ed.ed_tailp), - (int)(uintptr_t)le32toh(sed->ed.ed_headp), - "\20\1HALT\2CARRY", + OHCI_ED_GET_MAXP(le32toh(sed->ed.ed_flags)), sbuf, + (u_long)le32toh(sed->ed.ed_tailp), sbuf2, (u_long)le32toh(sed->ed.ed_headp), (u_long)le32toh(sed->ed.ed_nexted))); } ==== //depot/projects/smpng/sys/dev/usb/ohcivar.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: ohcivar.h,v 1.21 2000/03/29 01:46:27 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.25 2002/04/01 13:18:11 joe Exp $ */ +/* $NetBSD: ohcivar.h,v 1.22 2000/04/25 09:20:55 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.26 2002/04/01 19:01:08 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/dev/usb/uhci.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: uhci.c,v 1.118 2000/05/30 16:56:54 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.90 2002/04/01 13:36:09 joe Exp $ */ +/* $NetBSD: uhci.c,v 1.130 2000/12/18 15:55:30 tsutsui Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.96 2002/04/01 20:18:21 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -763,6 +763,8 @@ void uhci_dump_td(uhci_soft_td_t *p) { + char sbuf[128], sbuf2[128]; + DPRINTFN(-1,("TD(%p) at %08lx = link=0x%08lx status=0x%08lx " "token=0x%08lx buffer=0x%08lx\n", p, (long)p->physaddr, @@ -770,13 +772,16 @@ (long)le32toh(p->td.td_status), (long)le32toh(p->td.td_token), (long)le32toh(p->td.td_buffer))); - DPRINTFN(-1,(" %b %b,errcnt=%d,actlen=%d pid=%02x,addr=%d,endpt=%d," - "D=%d,maxlen=%d\n", - (int)le32toh(p->td.td_link), - "\20\1T\2Q\3VF", - (int)le32toh(p->td.td_status), - "\20\22BITSTUFF\23CRCTO\24NAK\25BABBLE\26DBUFFER\27" - "STALLED\30ACTIVE\31IOC\32ISO\33LS\36SPD", + + bitmask_snprintf((int)le32toh(p->td.td_link), "\20\1T\2Q\3VF", + sbuf, sizeof(sbuf)); + bitmask_snprintf((int)le32toh(p->td.td_status), + "\20\22BITSTUFF\23CRCTO\24NAK\25BABBLE\26DBUFFER\27" + "STALLED\30ACTIVE\31IOC\32ISO\33LS\36SPD", + sbuf2, sizeof(sbuf2)); + + DPRINTFN(-1,(" %s %s,errcnt=%d,actlen=%d pid=%02x,addr=%d,endpt=%d," + "D=%d,maxlen=%d\n", sbuf, sbuf2, UHCI_TD_GET_ERRCNT(le32toh(p->td.td_status)), UHCI_TD_GET_ACTLEN(le32toh(p->td.td_status)), UHCI_TD_GET_PID(le32toh(p->td.td_token)), @@ -1167,6 +1172,9 @@ uhci_dumpregs(sc); } #endif + status = UREAD2(sc, UHCI_STS); + if (status == 0) /* The interrupt was not for us. */ + return (0); if (sc->sc_suspend != PWR_RESUME) { printf("%s: interrupt while not operating ignored\n", @@ -1174,10 +1182,6 @@ return (0); } - status = UREAD2(sc, UHCI_STS); - if (status == 0) /* The interrupt was not for us. */ - return (0); - #if defined(DIAGNOSTIC) && defined(__NetBSD__) if (sc->sc_suspend != PWR_RESUME) printf("uhci_intr: suspended sts=0x%x\n", status); @@ -1205,8 +1209,9 @@ } if (status & UHCI_STS_HCH) { /* no acknowledge needed */ - printf("%s: host controller halted\n", - USBDEVNAME(sc->sc_bus.bdev)); + if (!sc->sc_dying) + printf("%s: host controller halted\n", + USBDEVNAME(sc->sc_bus.bdev)); sc->sc_dying = 1; } @@ -1345,7 +1350,7 @@ if (xfer->nframes != 0) { /* Isoc transfer, do things differently. */ uhci_soft_td_t **stds = upipe->u.iso.stds; - int i, n, nframes; + int i, n, nframes, len; DPRINTFN(5,("uhci_idone: ii=%p isoc ready\n", ii)); @@ -1363,7 +1368,9 @@ if (++n >= UHCI_VFRAMELIST_COUNT) n = 0; status = le32toh(std->td.td_status); - actlen += UHCI_TD_GET_ACTLEN(status); + len = UHCI_TD_GET_ACTLEN(status); + xfer->frlengths[i] = len; + actlen += len; } upipe->u.iso.inuse -= nframes; xfer->actlen = actlen; @@ -2373,7 +2380,7 @@ for (i = 0; i < nframes; i++) { std = stds[n]; std->td.td_status &= htole32(~(UHCI_TD_ACTIVE | UHCI_TD_IOC)); - len = UHCI_TD_GET_MAXLEN(std->td.td_token); + len = UHCI_TD_GET_MAXLEN(le32toh(std->td.td_token)); if (len > maxlen) maxlen = len; if (++n >= UHCI_VFRAMELIST_COUNT) ==== //depot/projects/smpng/sys/dev/usb/uhcivar.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: uhcivar.h,v 1.29 2000/04/25 09:20:55 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.30 2002/03/16 12:44:21 joe Exp $ */ +/* $NetBSD: uhcivar.h,v 1.31 2000/06/01 14:28:59 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.31 2002/04/01 19:01:08 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/dev/usb/uhid.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: uhid.c,v 1.38 2000/04/27 15:26:48 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhid.c,v 1.44 2002/03/11 16:22:15 joe Exp $ */ +/* $NetBSD: uhid.c,v 1.40 2000/10/10 12:37:01 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhid.c,v 1.46 2002/04/01 20:32:50 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -228,7 +228,7 @@ sc->sc_ep_addr = ed->bEndpointAddress; - desc = 0; + desc = NULL; err = usbd_alloc_report_desc(uaa->iface, &desc, &size, M_USBDEV); if (err) { printf("%s: no report descriptor\n", USBDEVNAME(sc->sc_dev)); @@ -256,9 +256,7 @@ #if defined(__NetBSD__) || defined(__OpenBSD__) int -uhid_activate(self, act) - device_ptr_t self; - enum devact act; +uhid_activate(device_ptr_t self, enum devact act) { struct uhid_softc *sc = (struct uhid_softc *)self; @@ -323,16 +321,14 @@ destroy_dev(sc->dev); #endif - free(sc->sc_repdesc, M_USBDEV); + if (sc->sc_repdesc) + free(sc->sc_repdesc, M_USBDEV); return (0); } void -uhid_intr(xfer, addr, status) - usbd_xfer_handle xfer; - usbd_private_handle addr; - usbd_status status; +uhid_intr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status) { struct uhid_softc *sc = addr; @@ -376,11 +372,7 @@ } int -uhidopen(dev, flag, mode, p) - dev_t dev; - int flag; - int mode; - usb_proc_ptr p; +uhidopen(dev_t dev, int flag, int mode, usb_proc_ptr p) { struct uhid_softc *sc; usbd_status err; @@ -425,11 +417,7 @@ } int -uhidclose(dev, flag, mode, p) - dev_t dev; - int flag; - int mode; - usb_proc_ptr p; +uhidclose(dev_t dev, int flag, int mode, usb_proc_ptr p) { struct uhid_softc *sc; @@ -456,10 +444,7 @@ } int -uhid_do_read(sc, uio, flag) - struct uhid_softc *sc; - struct uio *uio; - int flag; +uhid_do_read(struct uhid_softc *sc, struct uio *uio, int flag) { int s; int error = 0; @@ -521,10 +506,7 @@ } int -uhidread(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; +uhidread(dev_t dev, struct uio *uio, int flag) { struct uhid_softc *sc; int error; @@ -539,10 +521,7 @@ } int -uhid_do_write(sc, uio, flag) - struct uhid_softc *sc; - struct uio *uio; - int flag; +uhid_do_write(struct uhid_softc *sc, struct uio *uio, int flag) { int error; int size; @@ -573,10 +552,7 @@ } int -uhidwrite(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; +uhidwrite(dev_t dev, struct uio *uio, int flag) { struct uhid_softc *sc; int error; @@ -591,12 +567,8 @@ } int -uhid_do_ioctl(sc, cmd, addr, flag, p) - struct uhid_softc *sc; - u_long cmd; - caddr_t addr; - int flag; - usb_proc_ptr p; +uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr, int flag, + usb_proc_ptr p) { struct usb_ctl_report_desc *rd; struct usb_ctl_report *re; @@ -706,12 +678,7 @@ } int -uhidioctl(dev, cmd, addr, flag, p) - dev_t dev; - u_long cmd; - caddr_t addr; - int flag; - usb_proc_ptr p; +uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p) { struct uhid_softc *sc; int error; @@ -726,10 +693,7 @@ } int -uhidpoll(dev, events, p) - dev_t dev; - int events; - usb_proc_ptr p; +uhidpoll(dev_t dev, int events, usb_proc_ptr p) { struct uhid_softc *sc; int revents = 0; ==== //depot/projects/smpng/sys/dev/usb/umodem.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: umodem.c,v 1.5 1999/01/08 11:58:25 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/umodem.c,v 1.35 2002/03/11 16:22:15 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/umodem.c,v 1.36 2002/04/01 19:01:09 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -361,9 +361,7 @@ } void -umodem_get_caps(dev, cm, acm) - usbd_device_handle dev; - int *cm, *acm; +umodem_get_caps(usbd_device_handle dev, int *cm, int *acm) { usb_cdc_cm_descriptor_t *cmd; usb_cdc_acm_descriptor_t *cad; @@ -386,8 +384,7 @@ } void -umodemstart(tp) - struct tty *tp; +umodemstart(struct tty *tp) { struct umodem_softc *sc; struct cblock *cbp; @@ -465,10 +462,8 @@ } void -umodemwritecb(xfer, priv, status) - usbd_xfer_handle xfer; - usbd_private_handle priv; - usbd_status status; +umodemwritecb(usbd_xfer_handle xfer, usbd_private_handle priv, + usbd_status status) { struct umodem_softc *sc = (struct umodem_softc *)priv; struct tty *tp = sc->sc_tty; @@ -502,9 +497,7 @@ } int -umodemparam(tp, t) - struct tty *tp; - struct termios *t; +umodemparam(struct tty *tp, struct termios *t) { struct umodem_softc *sc; usb_cdc_line_state_t ls; @@ -574,10 +567,7 @@ } int -umodemopen(dev, flag, mode, p) - dev_t dev; - int flag, mode; - usb_proc_ptr p; +umodemopen(dev_t dev, int flag, int mode, usb_proc_ptr p) { int unit = UMODEMUNIT(dev); struct umodem_softc *sc; @@ -720,8 +710,7 @@ } usbd_status -umodemstartread(sc) - struct umodem_softc *sc; +umodemstartread(struct umodem_softc *sc) { usbd_status err; @@ -739,10 +728,7 @@ } void -umodemreadcb(xfer, p, status) - usbd_xfer_handle xfer; - usbd_private_handle p; - usbd_status status; +umodemreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status) { struct umodem_softc *sc = (struct umodem_softc *)p; struct tty *tp = sc->sc_tty; @@ -784,10 +770,7 @@ } int -umodemclose(dev, flag, mode, p) - dev_t dev; - int flag, mode; - usb_proc_ptr p; +umodemclose(dev_t dev, int flag, int mode, usb_proc_ptr p) { struct umodem_softc *sc; struct tty *tp; @@ -836,8 +819,7 @@ } void -umodem_cleanup(sc) - struct umodem_softc *sc; +umodem_cleanup(struct umodem_softc *sc) { umodem_shutdown(sc); @@ -854,10 +836,7 @@ } int -umodemread(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; +umodemread(dev_t dev, uio *uio, int flag) { struct umodem_softc *sc; struct tty *tp; @@ -873,10 +852,7 @@ } int -umodemwrite(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; +umodemwrite(dev_t dev, struct uio *uio, int flag) { struct umodem_softc *sc; struct tty *tp; @@ -892,9 +868,7 @@ } void -umodemstop(tp, flag) - struct tty *tp; - int flag; +umodemstop(struct tty *tp, int flag) { struct umodem_softc *sc; int s; @@ -913,8 +887,7 @@ } struct tty * -umodemtty(dev) - dev_t dev; +umodemtty(dev_t dev) { struct umodem_softc *sc; struct tty *tp; @@ -927,12 +900,7 @@ } int -umodemioctl(dev, cmd, data, flag, p) - dev_t dev; - u_long cmd; - caddr_t data; - int flag; - usb_proc_ptr p; +umodemioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p) { struct umodem_softc *sc; struct tty *tp; @@ -1013,8 +981,7 @@ } void -umodem_shutdown(sc) - struct umodem_softc *sc; +umodem_shutdown(struct umodem_softc *sc) { struct tty *tp = sc->sc_tty; @@ -1034,9 +1001,7 @@ } void -umodem_modem(sc, onoff) - struct umodem_softc *sc; - int onoff; +umodem_modem(struct umodem_softc *sc, int onoff) { usb_device_request_t req; @@ -1057,9 +1022,7 @@ } void -umodem_break(sc, onoff) - struct umodem_softc *sc; - int onoff; +umodem_break(struct umodem_softc *sc, int onoff) { usb_device_request_t req; @@ -1078,10 +1041,7 @@ } void * -umodem_get_desc(dev, type, subtype) - usbd_device_handle dev; - int type; - int subtype; +umodem_get_desc(usbd_device_handle dev, int type, int subtype) { usb_descriptor_t *desc; usb_config_descriptor_t *cd = usbd_get_config_descriptor(dev); @@ -1100,10 +1060,7 @@ } usbd_status -umodem_set_comm_feature(sc, feature, state) - struct umodem_softc *sc; - int feature; - int state; +umodem_set_comm_feature(struct umodem_softc *sc, int feature, int state) { usb_device_request_t req; usbd_status err; @@ -1127,9 +1084,7 @@ } usbd_status -umodem_set_line_coding(sc, state) - struct umodem_softc *sc; - usb_cdc_line_state_t *state; +umodem_set_line_coding(struct umodem_softc *sc, usb_cdc_line_state_t state) { usb_device_request_t req; usbd_status err; @@ -1164,9 +1119,7 @@ #if defined(__NetBSD__) || defined(__OpenBSD__) int -umodem_activate(self, act) - device_ptr_t self; - enum devact act; +umodem_activate(device_ptr_t self, enum devact act) { struct umodem_softc *sc = (struct umodem_softc *)self; ==== //depot/projects/smpng/sys/dev/usb/urio.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ * its contributors. */ -/* $FreeBSD: src/sys/dev/usb/urio.c,v 1.14 2002/03/11 16:22:15 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/urio.c,v 1.15 2002/04/01 19:01:09 joe Exp $ */ /* * 2000/3/24 added NetBSD/OpenBSD support (from Alex Nemirovsky) @@ -292,11 +292,7 @@ int -urioopen(dev, flag, mode, p) - dev_t dev; - int flag; - int mode; - usb_proc_ptr p; +urioopen(dev_t dev, int flag, int mode, usb_proc_ptr p) { #if (USBDI >= 1) struct urio_softc * sc; @@ -336,11 +332,7 @@ } int -urioclose(dev, flag, mode, p) - dev_t dev; - int flag; - int mode; - usb_proc_ptr p; +urioclose(dev_t dev, int flag, int mode, usb_proc_ptr p) { #if (USBDI >= 1) struct urio_softc * sc; @@ -363,10 +355,7 @@ } int -urioread(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; +urioread(dev_t dev, struct uio *uio, int flag) { #if (USBDI >= 1) struct urio_softc * sc; @@ -440,10 +429,7 @@ } int -uriowrite(dev, uio, flag) - dev_t dev; - struct uio *uio; - int flag; +uriowrite(dev_t dev, struct uio *uio, int flag) { #if (USBDI >= 1) struct urio_softc * sc; @@ -510,12 +496,7 @@ int -urioioctl(dev, cmd, addr, flag, p) - dev_t dev; - u_long cmd; - caddr_t addr; - int flag; - usb_proc_ptr p; +urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p) { #if (USBDI >= 1) struct urio_softc * sc; @@ -616,9 +597,7 @@ #if defined(__NetBSD__) || defined(__OpenBSD__) int -urio_activate(self, act) - device_ptr_t self; - enum devact act; +urio_activate(device_ptr_t self, enum devact act) { struct urio_softc *sc = (struct urio_softc *)self; ==== //depot/projects/smpng/sys/dev/usb/usb.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: usb.c,v 1.43 2000/03/29 18:24:53 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usb.c,v 1.60 2002/04/01 16:53:29 joe Exp $ */ +/* $NetBSD: usb.c,v 1.48 2000/12/13 04:05:14 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb.c,v 1.62 2002/04/01 17:54:07 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -170,11 +170,6 @@ Static int usb_get_next_event(struct usb_event *); -#if defined(__NetBSD__) || defined(__OpenBSD__) -/* Flag to see if we are in the cold boot process. */ -extern int cold; -#endif - Static const char *usbrev_str[] = USBREV_STR; USB_DECLARE_DRIVER_INIT(usb, ==== //depot/projects/smpng/sys/dev/usb/usb_subr.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: usb_subr.c,v 1.71 2000/03/29 18:24:53 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.36 2002/04/01 16:53:29 joe Exp $ */ +/* $NetBSD: usb_subr.c,v 1.86 2001/05/16 04:50:11 lukem Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.41 2002/04/01 19:26:36 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -463,7 +463,6 @@ for (endpt = 0; endpt < nendpt; endpt++) { DPRINTFN(10,("usbd_fill_iface_data: endpt=%d\n", endpt)); for (; p < end; p += ed->bLength) { - ed = (usb_endpoint_descriptor_t *)p; DPRINTFN(10,("usbd_fill_iface_data: p=%p end=%p " "len=%d type=%d\n", p, end, ed->bLength, ed->bDescriptorType)); @@ -600,18 +599,43 @@ /* May be self powered. */ if (cdp->bmAttributes & UC_BUS_POWERED) { /* Must ask device. */ - err = usbd_get_device_status(dev, &ds); - if (!err && (UGETW(ds.wStatus) & UDS_SELF_POWERED)) - selfpowered = 1; - DPRINTF(("usbd_set_config_index: status=0x%04x, " - "error=%s\n", - UGETW(ds.wStatus), usbd_errstr(err))); + if (dev->quirks->uq_flags & UQ_POWER_CLAIM) { + /* + * Hub claims to be self powered, but isn't. + * It seems that the power status can be + * determined by the hub characteristics. + */ + usb_hub_descriptor_t hd; + usb_device_request_t req; + req.bmRequestType = UT_READ_CLASS_DEVICE; + req.bRequest = UR_GET_DESCRIPTOR; + USETW(req.wValue, 0); + USETW(req.wIndex, 0); + USETW(req.wLength, USB_HUB_DESCRIPTOR_SIZE); + err = usbd_do_request(dev, &req, &hd); + if (!err && + (UGETW(hd.wHubCharacteristics) & + UHD_PWR_INDIVIDUAL)) + selfpowered = 1; + DPRINTF(("usbd_set_config_index: charac=0x%04x" + ", error=%s\n", + UGETW(hd.wHubCharacteristics), + usbd_errstr(err))); + } else { + err = usbd_get_device_status(dev, &ds); + if (!err && + (UGETW(ds.wStatus) & UDS_SELF_POWERED)) + selfpowered = 1; + DPRINTF(("usbd_set_config_index: status=0x%04x" + ", error=%s\n", + UGETW(ds.wStatus), usbd_errstr(err))); + } } else selfpowered = 1; } - DPRINTF(("usbd_set_config_index: (addr %d) attr=0x%02x, " - "selfpowered=%d, power=%d\n", - dev->address, cdp->bmAttributes, + DPRINTF(("usbd_set_config_index: (addr %d) cno=%d attr=0x%02x, " + "selfpowered=%d, power=%d\n", + cdp->bConfigurationValue, dev->address, cdp->bmAttributes, selfpowered, cdp->bMaxPower * 2)); /* Check if we have enough power. */ @@ -623,7 +647,6 @@ #endif power = cdp->bMaxPower * 2; if (power > dev->powersrc->power) { - DPRINTF(("power exceeded %d %d\n", power,dev->powersrc->power)); /* XXX print nicer message. */ if (msg) printf("%s: device addr %d (config %d) exceeds power " @@ -873,9 +896,6 @@ uaa.usegeneric = 1; uaa.configno = UHUB_UNK_CONFIGURATION; uaa.ifaceno = UHUB_UNK_INTERFACE; - uaa.vendor = UHUB_UNK_VENDOR; - uaa.product = UHUB_UNK_PRODUCT; - uaa.release = UHUB_UNK_RELEASE; dv = USB_DO_ATTACH(dev, bdev, parent, &uaa, usbd_print, usbd_submatch); if (dv != NULL) { dev->subdevs = malloc(2 * sizeof dv, M_USB, M_NOWAIT); ==== //depot/projects/smpng/sys/dev/usb/usbdevs.h#17 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.94 2002/03/31 21:38:38 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.95 2002/04/01 19:22:04 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ==== //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#17 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.94 2002/03/31 21:38:38 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.95 2002/04/01 19:22:04 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. @@ -44,7 +44,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -struct usb_knowndev usb_knowndevs[] = { +const struct usb_knowndev usb_knowndevs[] = { { USB_VENDOR_3COM, USB_PRODUCT_3COM_HOMECONN, 0, ==== //depot/projects/smpng/sys/dev/usb/usbdi.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: usbdi.c,v 1.73 2000/05/31 16:14:42 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.51 2002/04/01 13:43:02 joe Exp $ */ +/* $NetBSD: usbdi.c,v 1.77 2000/09/23 21:02:04 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.54 2002/04/01 17:30:24 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -77,10 +77,10 @@ Static usbd_status usbd_ar_pipe(usbd_pipe_handle pipe); Static void usbd_do_request_async_cb - (usbd_xfer_handle, usbd_private_handle, usbd_status); + (usbd_xfer_handle, usbd_private_handle, usbd_status); Static void usbd_start_next(usbd_pipe_handle pipe); Static usbd_status usbd_open_pipe_ival - (usbd_interface_handle, u_int8_t, u_int8_t, usbd_pipe_handle *, int); + (usbd_interface_handle, u_int8_t, u_int8_t, usbd_pipe_handle *, int); Static int usbd_nbuses = 0; @@ -96,10 +96,9 @@ --usbd_nbuses; } -Static __inline int usbd_xfer_isread(usbd_xfer_handle xfer); -Static __inline int -usbd_xfer_isread(xfer) - usbd_xfer_handle xfer; +static __inline int usbd_xfer_isread(usbd_xfer_handle xfer); +static __inline int +usbd_xfer_isread(usbd_xfer_handle xfer) { if (xfer->rqflags & URQ_REQUEST) return (xfer->request.bmRequestType & UT_READ); @@ -110,10 +109,8 @@ #ifdef USB_DEBUG void usbd_dump_queue(usbd_pipe_handle); - void -usbd_dump_queue(pipe) - usbd_pipe_handle pipe; +usbd_dump_queue(usbd_pipe_handle pipe) { usbd_xfer_handle xfer; @@ -127,23 +124,16 @@ #endif usbd_status -usbd_open_pipe(iface, address, flags, pipe) - usbd_interface_handle iface; - u_int8_t address; - u_int8_t flags; - usbd_pipe_handle *pipe; +usbd_open_pipe(usbd_interface_handle iface, u_int8_t address, + u_int8_t flags, usbd_pipe_handle *pipe) { return (usbd_open_pipe_ival(iface, address, flags, pipe, USBD_DEFAULT_INTERVAL)); } usbd_status -usbd_open_pipe_ival(iface, address, flags, pipe, ival) - usbd_interface_handle iface; - u_int8_t address; - u_int8_t flags; - usbd_pipe_handle *pipe; - int ival; +usbd_open_pipe_ival(usbd_interface_handle iface, u_int8_t address, + u_int8_t flags, usbd_pipe_handle *pipe, int ival) { usbd_pipe_handle p; struct usbd_endpoint *ep; @@ -173,16 +163,10 @@ } usbd_status -usbd_open_pipe_intr(iface, address, flags, pipe, priv, buffer, len, cb, ival) - usbd_interface_handle iface; - u_int8_t address; - u_int8_t flags; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 13:54: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 180DC37B41A; Mon, 1 Apr 2002 13:53:44 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F173337B417 for ; Mon, 1 Apr 2002 13:53:42 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31LrgT60059 for perforce@freebsd.org; Mon, 1 Apr 2002 13:53:42 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 13:53:42 -0800 (PST) Message-Id: <200204012153.g31LrgT60059@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8827 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8827 Change 8827 by jhb@jhb_zion on 2002/04/01 13:53:05 Add a Makefile for this directory that builds the boot1 and loader subdirectories. Affected files ... ... //depot/projects/sparc64/sys/boot/sparc64/Makefile#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 14: 7:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E2E937B41B; Mon, 1 Apr 2002 14:06:06 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B5F6A37B405 for ; Mon, 1 Apr 2002 14:06:00 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31M5wv65551 for perforce@freebsd.org; Mon, 1 Apr 2002 14:05:58 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Mon, 1 Apr 2002 14:05:58 -0800 (PST) Message-Id: <200204012205.g31M5wv65551@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8830 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8830 Change 8830 by jhb@jhb_laptop on 2002/04/01 14:05:07 IFC suser(). Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/promcons.c#10 integrate ... //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#9 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#12 integrate ... //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#8 integrate ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#17 integrate ... //depot/projects/smpng/sys/compat/linux/linux_uid16.c#9 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#10 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#13 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#8 integrate ... //depot/projects/smpng/sys/dev/an/if_an.c#19 integrate ... //depot/projects/smpng/sys/dev/asr/asr.c#11 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#19 integrate ... //depot/projects/smpng/sys/dev/awi/awi.c#6 integrate ... //depot/projects/smpng/sys/dev/awi/awi_wep.c#6 integrate ... //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#6 integrate ... //depot/projects/smpng/sys/dev/cnw/if_cnw.c#9 integrate ... //depot/projects/smpng/sys/dev/dgb/dgb.c#8 integrate ... //depot/projects/smpng/sys/dev/digi/digi.c#12 integrate ... //depot/projects/smpng/sys/dev/nmdm/nmdm.c#10 integrate ... //depot/projects/smpng/sys/dev/null/null.c#4 integrate ... //depot/projects/smpng/sys/dev/ofw/ofw_console.c#8 integrate ... //depot/projects/smpng/sys/dev/random/randomdev.c#9 integrate ... //depot/projects/smpng/sys/dev/rp/rp.c#8 integrate ... //depot/projects/smpng/sys/dev/sbni/if_sbni.c#5 integrate ... //depot/projects/smpng/sys/dev/si/si.c#5 integrate ... //depot/projects/smpng/sys/dev/sio/sio.c#15 integrate ... //depot/projects/smpng/sys/dev/syscons/syscons.c#16 integrate ... //depot/projects/smpng/sys/dev/syscons/sysmouse.c#5 integrate ... //depot/projects/smpng/sys/dev/usb/ohci.c#13 integrate ... //depot/projects/smpng/sys/dev/usb/ucom.c#4 integrate ... //depot/projects/smpng/sys/dev/usb/uhci.c#14 integrate ... //depot/projects/smpng/sys/dev/usb/uhcivar.h#5 integrate ... //depot/projects/smpng/sys/dev/usb/ukbd.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/umass.c#12 integrate ... //depot/projects/smpng/sys/dev/usb/umodem.c#10 integrate ... //depot/projects/smpng/sys/dev/usb/ums.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/usb.c#10 integrate ... //depot/projects/smpng/sys/dev/usb/usb_port.h#8 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.h#5 integrate ... //depot/projects/smpng/sys/dev/usb/usbdivar.h#7 integrate ... //depot/projects/smpng/sys/dev/vinum/vinum.c#7 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#25 integrate ... //depot/projects/smpng/sys/dev/wl/if_wl.c#6 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#12 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#8 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#6 integrate ... //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#8 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#13 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#7 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#28 integrate ... //depot/projects/smpng/sys/i386/i386/mem.c#8 integrate ... //depot/projects/smpng/sys/i386/i386/sys_machdep.c#19 integrate ... //depot/projects/smpng/sys/i386/i386/vm86.c#8 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#6 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#8 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#5 integrate ... //depot/projects/smpng/sys/i386/isa/cx.c#5 integrate ... //depot/projects/smpng/sys/i386/isa/cy.c#15 integrate ... //depot/projects/smpng/sys/i386/isa/istallion.c#5 integrate ... //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#5 integrate ... //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_ext.c#9 integrate ... //depot/projects/smpng/sys/i386/isa/rc.c#9 integrate ... //depot/projects/smpng/sys/i386/isa/spigot.c#9 integrate ... //depot/projects/smpng/sys/i386/isa/stallion.c#5 integrate ... //depot/projects/smpng/sys/i386/linux/linux_machdep.c#13 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#7 integrate ... //depot/projects/smpng/sys/ia64/ia64/ssc.c#7 integrate ... //depot/projects/smpng/sys/isa/fd.c#10 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#12 integrate ... //depot/projects/smpng/sys/kern/kern_acct.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_acl.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_exec.c#31 integrate ... //depot/projects/smpng/sys/kern/kern_jail.c#17 integrate ... //depot/projects/smpng/sys/kern/kern_ktrace.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_linker.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_ntptime.c#7 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#55 integrate ... //depot/projects/smpng/sys/kern/kern_resource.c#17 integrate ... //depot/projects/smpng/sys/kern/kern_shutdown.c#20 integrate ... //depot/projects/smpng/sys/kern/kern_sysctl.c#16 integrate ... //depot/projects/smpng/sys/kern/kern_time.c#9 integrate ... //depot/projects/smpng/sys/kern/kern_xxx.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_prf.c#13 integrate ... //depot/projects/smpng/sys/kern/sysv_ipc.c#9 integrate ... //depot/projects/smpng/sys/kern/sysv_msg.c#12 integrate ... //depot/projects/smpng/sys/kern/tty.c#15 integrate ... //depot/projects/smpng/sys/kern/tty_cons.c#13 integrate ... //depot/projects/smpng/sys/kern/tty_pty.c#14 integrate ... //depot/projects/smpng/sys/kern/vfs_subr.c#22 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#32 integrate ... //depot/projects/smpng/sys/kern/vfs_vnops.c#21 integrate ... //depot/projects/smpng/sys/net/if.c#19 integrate ... //depot/projects/smpng/sys/net/if_ppp.c#11 integrate ... //depot/projects/smpng/sys/net/if_sl.c#10 integrate ... //depot/projects/smpng/sys/net/if_tap.c#11 integrate ... //depot/projects/smpng/sys/net/if_tun.c#10 integrate ... //depot/projects/smpng/sys/net/net_osdep.h#5 integrate ... //depot/projects/smpng/sys/net/ppp_tty.c#7 integrate ... //depot/projects/smpng/sys/net/raw_usrreq.c#6 integrate ... //depot/projects/smpng/sys/net/rtsock.c#15 integrate ... //depot/projects/smpng/sys/netatalk/at_control.c#5 integrate ... //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#7 integrate ... //depot/projects/smpng/sys/netatm/atm_usrreq.c#6 integrate ... //depot/projects/smpng/sys/netgraph/ng_socket.c#10 integrate ... //depot/projects/smpng/sys/netgraph/ng_tty.c#7 integrate ... //depot/projects/smpng/sys/netinet/in.c#11 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.c#21 integrate ... //depot/projects/smpng/sys/netinet/ip_divert.c#11 integrate ... //depot/projects/smpng/sys/netinet/ip_output.c#21 integrate ... //depot/projects/smpng/sys/netinet/raw_ip.c#16 integrate ... //depot/projects/smpng/sys/netinet/tcp_subr.c#17 integrate ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#18 integrate ... //depot/projects/smpng/sys/netinet6/in6.c#9 integrate ... //depot/projects/smpng/sys/netinet6/in6_pcb.c#12 integrate ... //depot/projects/smpng/sys/netinet6/in6_src.c#7 integrate ... //depot/projects/smpng/sys/netinet6/ip6_input.c#11 integrate ... //depot/projects/smpng/sys/netinet6/ip6_output.c#9 integrate ... //depot/projects/smpng/sys/netinet6/raw_ip6.c#9 integrate ... //depot/projects/smpng/sys/netinet6/udp6_output.c#7 integrate ... //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#10 integrate ... //depot/projects/smpng/sys/netipx/ipx.c#5 integrate ... //depot/projects/smpng/sys/netipx/ipx_pcb.c#6 integrate ... //depot/projects/smpng/sys/netipx/ipx_usrreq.c#6 integrate ... //depot/projects/smpng/sys/netncp/ncp_subr.h#4 integrate ... //depot/projects/smpng/sys/netsmb/smb_subr.h#6 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_lock.c#17 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_serv.c#15 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#9 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#23 integrate ... //depot/projects/smpng/sys/pc98/pc98/fd.c#9 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio.c#15 integrate ... //depot/projects/smpng/sys/pc98/pc98/syscons.c#13 integrate ... //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#7 integrate ... //depot/projects/smpng/sys/pccard/pccard.c#12 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_mmap.c#8 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_util.c#8 integrate ... //depot/projects/smpng/sys/sparc64/include/param.h#9 integrate ... //depot/projects/smpng/sys/sys/systm.h#28 integrate ... //depot/projects/smpng/sys/sys/ucred.h#14 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#10 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#18 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_vnops.c#4 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#14 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#11 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_readwrite.c#7 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#9 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#13 integrate ... //depot/projects/smpng/sys/vm/vm_mmap.c#15 integrate ... //depot/projects/smpng/sys/vm/vm_swap.c#11 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/promcons.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.25 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.26 2002/04/01 21:30:29 jhb Exp $ */ /* $NetBSD: promcons.c,v 1.13 1998/03/21 22:52:59 mycroft Exp $ */ /* ==== //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.16 2002/02/27 18:31:35 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.17 2002/04/01 21:30:29 jhb Exp $ * */ ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#12 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.27 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.28 2002/04/01 21:30:29 jhb Exp $ */ ==== //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.32 2002/03/20 18:58:47 obrien Exp $ + * $FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.33 2002/04/01 21:30:29 jhb Exp $ */ /* * This driver is a somewhat hack. A real driver might use the zs driver ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#17 (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. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.116 2002/03/20 10:32:00 jeff Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.117 2002/04/01 21:30:29 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/linux/linux_uid16.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.5 2002/02/27 18:31:41 jhb Exp $ + * $FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.6 2002/04/01 21:30:29 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#10 (text+ko) ==== @@ -28,7 +28,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/compat/svr4/svr4_fcntl.c,v 1.22 2002/03/20 05:41:37 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.23 2002/04/01 21:30:30 jhb Exp $ */ #include #include ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#13 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.43 2002/03/27 21:36:18 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.44 2002/04/01 21:30:30 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#8 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.11 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.12 2002/04/01 21:30:30 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/dev/an/if_an.c#19 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/an/if_an.c,v 1.33 2002/03/20 02:02:34 alfred Exp $ + * $FreeBSD: src/sys/dev/an/if_an.c,v 1.34 2002/04/01 21:30:30 jhb Exp $ */ /* @@ -132,7 +132,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an.c,v 1.33 2002/03/20 02:02:34 alfred Exp $"; + "$FreeBSD: src/sys/dev/an/if_an.c,v 1.34 2002/04/01 21:30:30 jhb Exp $"; #endif /* These are global because we need them in sys/pci/if_an_p.c. */ ==== //depot/projects/smpng/sys/dev/asr/asr.c#11 (text+ko) ==== @@ -103,7 +103,7 @@ * use proprietary packet creation instead of scsi_inquire * CAM layer sends synchronize commands. * - * $FreeBSD: src/sys/dev/asr/asr.c,v 1.19 2002/04/01 06:09:17 alfred Exp $ + * $FreeBSD: src/sys/dev/asr/asr.c,v 1.20 2002/04/01 21:30:30 jhb Exp $ */ #define ASR_VERSION 1 ==== //depot/projects/smpng/sys/dev/ata/atapi-cd.c#19 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.114 2002/03/27 19:47:52 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.115 2002/04/01 21:30:31 jhb Exp $ */ #include "opt_ata.h" ==== //depot/projects/smpng/sys/dev/awi/awi.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awi.c,v 1.17 2002/03/20 02:02:35 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awi.c,v 1.18 2002/04/01 21:30:31 jhb Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/dev/awi/awi_wep.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awi_wep.c,v 1.4 2000/08/14 11:28:03 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.6 2002/03/20 02:02:35 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.7 2002/04/01 21:30:31 jhb Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awi_wicfg.c,v 1.3 2000/07/06 17:22:25 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awi_wicfg.c,v 1.6 2002/03/20 02:02:35 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awi_wicfg.c,v 1.7 2002/04/01 21:30:31 jhb Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/dev/cnw/if_cnw.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_cnw.c,v 1.15 2000/10/16 10:26:41 itojun Exp $ */ -/* $FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.5 2002/03/20 02:04:09 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/cnw/if_cnw.c,v 1.6 2002/04/01 21:30:31 jhb Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/dev/dgb/dgb.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * dgb.c $FreeBSD: src/sys/dev/dgb/dgb.c,v 1.69 2002/03/20 02:07:16 alfred Exp $ + * dgb.c $FreeBSD: src/sys/dev/dgb/dgb.c,v 1.70 2002/04/01 21:30:32 jhb Exp $ * * Digiboard driver. * ==== //depot/projects/smpng/sys/dev/digi/digi.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi.c,v 1.20 2002/03/26 18:01:38 jhb Exp $ + * $FreeBSD: src/sys/dev/digi/digi.c,v 1.21 2002/04/01 21:30:32 jhb Exp $ */ /*- ==== //depot/projects/smpng/sys/dev/nmdm/nmdm.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.9 2002/02/27 18:31:47 jhb Exp $ + * $FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.10 2002/04/01 21:30:32 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/null/null.c#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/sys/dev/null/null.c,v 1.7 2002/03/31 22:36:40 phk Exp $ + * $FreeBSD: src/sys/dev/null/null.c,v 1.8 2002/04/01 21:30:33 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/dev/ofw/ofw_console.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.5 2002/01/09 04:03:55 jake Exp $"; + "$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.6 2002/04/01 21:30:33 jhb Exp $"; #endif /* not lint */ #include ==== //depot/projects/smpng/sys/dev/random/randomdev.c#9 (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/sys/dev/random/randomdev.c,v 1.34 2002/03/03 20:09:41 markm Exp $ + * $FreeBSD: src/sys/dev/random/randomdev.c,v 1.35 2002/04/01 21:30:33 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/dev/rp/rp.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/rp/rp.c,v 1.44 2002/03/20 02:07:38 alfred Exp $ + * $FreeBSD: src/sys/dev/rp/rp.c,v 1.45 2002/04/01 21:30:34 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/sbni/if_sbni.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.2 2002/01/08 19:36:54 msmith Exp $ + * $FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.3 2002/04/01 21:30:34 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/si/si.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $FreeBSD: src/sys/dev/si/si.c,v 1.109 2001/09/12 08:37:10 julian Exp $ + * $FreeBSD: src/sys/dev/si/si.c,v 1.110 2002/04/01 21:30:34 jhb Exp $ */ #ifndef lint ==== //depot/projects/smpng/sys/dev/sio/sio.c#15 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sio/sio.c,v 1.371 2002/03/31 09:15:43 bde Exp $ + * $FreeBSD: src/sys/dev/sio/sio.c,v 1.372 2002/04/01 21:30:35 jhb Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ ==== //depot/projects/smpng/sys/dev/syscons/syscons.c#16 (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. * - * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.379 2002/03/16 23:31:15 sobomax Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.380 2002/04/01 21:30:35 jhb Exp $ */ #include "opt_syscons.h" ==== //depot/projects/smpng/sys/dev/syscons/sysmouse.c#5 (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/sys/dev/syscons/sysmouse.c,v 1.12 2001/09/12 08:37:14 julian Exp $ + * $FreeBSD: src/sys/dev/syscons/sysmouse.c,v 1.13 2002/04/01 21:30:35 jhb Exp $ */ #include "opt_syscons.h" ==== //depot/projects/smpng/sys/dev/usb/ohci.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: ohci.c,v 1.94 2000/11/10 14:11:49 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.76 2002/04/01 20:01:41 joe Exp $ */ +/* $NetBSD: ohci.c,v 1.99 2001/01/21 02:39:52 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.78 2002/04/01 21:34:01 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -41,8 +41,8 @@ /* * USB Open Host Controller driver. * - * OHCI spec: ftp://ftp.compaq.com/pub/supportinformation/papers/hcir1_0a.exe - * USB spec: http://www.usb.org/developers/data/usb11.pdf + * OHCI spec: http://www.compaq.com/productinfo/development/openhci.html + * USB spec: http://www.usb.org/developers/data/usbspec.zip */ #include @@ -124,7 +124,7 @@ #endif Static usbd_status ohci_open(usbd_pipe_handle); Static void ohci_poll(struct usbd_bus *); -Static void ohci_softintr (struct usbd_bus *); +Static void ohci_softintr (void *); Static void ohci_waitintr(ohci_softc_t *, usbd_xfer_handle); Static void ohci_add_done(ohci_softc_t *, ohci_physaddr_t); Static void ohci_rhsc(ohci_softc_t *, usbd_xfer_handle); @@ -1181,9 +1181,9 @@ } void -ohci_softintr(struct usbd_bus *bus) +ohci_softintr(void *v) { - ohci_softc_t *sc = (ohci_softc_t *)bus; + ohci_softc_t *sc = v; ohci_soft_itd_t *sitd, *sidone, *sitdnext; ohci_soft_td_t *std, *sdone, *stdnext; usbd_xfer_handle xfer; ==== //depot/projects/smpng/sys/dev/usb/ucom.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ucom.c,v 1.39 2001/08/16 22:31:24 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.15 2002/03/18 18:23:39 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.16 2002/04/01 21:30:36 jhb Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . ==== //depot/projects/smpng/sys/dev/usb/uhci.c#14 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: uhci.c,v 1.130 2000/12/18 15:55:30 tsutsui Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.96 2002/04/01 20:18:21 joe Exp $ */ +/* $NetBSD: uhci.c,v 1.138 2001/10/02 17:59:38 pooka Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.103 2002/04/01 21:56:42 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -237,7 +237,7 @@ Static usbd_status uhci_open(usbd_pipe_handle); Static void uhci_poll(struct usbd_bus *); -Static void uhci_softintr(struct usbd_bus *); +Static void uhci_softintr(void *); Static usbd_status uhci_device_request(usbd_xfer_handle xfer); @@ -629,11 +629,9 @@ UXFER(xfer)->iinfo.sc = sc; #ifdef DIAGNOSTIC UXFER(xfer)->iinfo.isdone = 1; + xfer->busy_free = XFER_BUSY; #endif } -#ifdef DIAGNOSTIC - xfer->busy_free = XFER_BUSY; -#endif return (xfer); } @@ -683,7 +681,7 @@ int cmd; int s; - s = splusb(); + s = splhardusb(); cmd = UREAD2(sc, UHCI_CMD); DPRINTF(("uhci_power: sc=%p, why=%d (was %d), cmd=0x%x\n", @@ -704,6 +702,8 @@ sc->sc_saved_frnum = UREAD2(sc, UHCI_FRNUM); sc->sc_saved_sof = UREAD1(sc, UHCI_SOF); + UWRITE2(sc, UHCI_INTR, 0); /* disable intrs */ + UHCICMD(sc, cmd | UHCI_CMD_EGSM); /* enter global suspend */ usb_delay_ms(&sc->sc_bus, USB_RESUME_WAIT); sc->sc_suspend = why; @@ -1176,17 +1176,18 @@ if (status == 0) /* The interrupt was not for us. */ return (0); +#if defined(DIAGNOSTIC) && defined(__NetBSD__) + if (sc->sc_suspend != PWR_RESUME) + printf("uhci_intr: suspended sts=0x%x\n", status); +#endif + if (sc->sc_suspend != PWR_RESUME) { printf("%s: interrupt while not operating ignored\n", USBDEVNAME(sc->sc_bus.bdev)); + UWRITE2(sc, UHCI_STS, status); /* acknowledge the ints */ return (0); } -#if defined(DIAGNOSTIC) && defined(__NetBSD__) - if (sc->sc_suspend != PWR_RESUME) - printf("uhci_intr: suspended sts=0x%x\n", status); -#endif - ack = 0; if (status & UHCI_STS_USBINT) ack |= UHCI_STS_USBINT; @@ -1209,19 +1210,19 @@ } if (status & UHCI_STS_HCH) { /* no acknowledge needed */ - if (!sc->sc_dying) - printf("%s: host controller halted\n", + if (!sc->sc_dying) { + printf("%s: host controller halted\n", USBDEVNAME(sc->sc_bus.bdev)); +#ifdef UHCI_DEBUG + uhci_dump_all(sc); +#endif + } sc->sc_dying = 1; } - if (ack) { /* acknowledge the ints */ - UWRITE2(sc, UHCI_STS, ack); - } else { /* nothing to acknowledge */ - printf("%s: UHCI interrupt, STS = 0x%04x, but ack == 0\n", - USBDEVNAME(sc->sc_bus.bdev), status); - return (0); - } + if (!ack) + return (0); /* nothing to acknowledge */ + UWRITE2(sc, UHCI_STS, ack); /* acknowledge the ints */ sc->sc_bus.no_intrs++; usb_schedsoftintr(&sc->sc_bus); @@ -1232,9 +1233,9 @@ } void -uhci_softintr(struct usbd_bus *bus) +uhci_softintr(void *v) { - uhci_softc_t *sc = (uhci_softc_t *)bus; + uhci_softc_t *sc = v; uhci_intr_info_t *ii; DPRINTFN(10,("%s: uhci_softintr\n", USBDEVNAME(sc->sc_bus.bdev))); @@ -1525,7 +1526,7 @@ u_int16_t cmd; run = run != 0; - s = splusb(); + s = splhardusb(); DPRINTF(("uhci_run: setting run=%d\n", run)); cmd = UREAD2(sc, UHCI_CMD); if (run) ==== //depot/projects/smpng/sys/dev/usb/uhcivar.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: uhcivar.h,v 1.31 2000/06/01 14:28:59 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.31 2002/04/01 19:01:08 joe Exp $ */ +/* $NetBSD: uhcivar.h,v 1.32 2000/08/13 16:18:09 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.32 2002/04/01 21:13:21 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/dev/usb/ukbd.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/ukbd.c,v 1.35 2002/01/02 18:28:45 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ukbd.c,v 1.36 2002/04/01 21:13:21 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ /* - * HID spec: http://www.usb.org/developers/data/usbhid10.pdf + * HID spec: http://www.usb.org/developers/data/devclass/hid1_1.pdf */ #include "opt_kbd.h" ==== //depot/projects/smpng/sys/dev/usb/umass.c#12 (text+ko) ==== @@ -24,17 +24,21 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.56 2002/03/20 18:04:11 obrien Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.57 2002/04/01 21:13:21 joe Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ /* - * Ported to NetBSD by Lennart Augustsson . - * Parts of the code written my Jason R. Thorpe . + * Universal Serial Bus Mass Storage Class specs: + * http://www.usb.org/developers/data/devclass/usbmassover_11.pdf + * http://www.usb.org/developers/data/devclass/usbmassbulk_10.pdf + * http://www.usb.org/developers/data/devclass/usbmass-cbi10.pdf + * http://www.usb.org/developers/data/devclass/usbmass-ufi10.pdf */ /* - * The PDF documentation can be found at http://www.usb.org/developers/ + * Ported to NetBSD by Lennart Augustsson . + * Parts of the code written my Jason R. Thorpe . */ /* ==== //depot/projects/smpng/sys/dev/usb/umodem.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: umodem.c,v 1.5 1999/01/08 11:58:25 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/umodem.c,v 1.36 2002/04/01 19:01:09 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/umodem.c,v 1.38 2002/04/01 21:30:36 jhb Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -39,7 +39,8 @@ */ /* - * Comm Class spec: http://www.usb.org/developers/data/usbcdc11.pdf + * Comm Class spec: http://www.usb.org/developers/data/devclass/usbcdc10.pdf + * http://www.usb.org/developers/data/devclass/usbcdc11.pdf */ /* ==== //depot/projects/smpng/sys/dev/usb/ums.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/ums.c,v 1.51 2002/03/16 12:06:01 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ums.c,v 1.52 2002/04/01 21:13:21 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ */ /* - * HID spec: http://www.usb.org/developers/data/usbhid10.pdf + * HID spec: http://www.usb.org/developers/data/devclass/hid1_1.pdf */ #include ==== //depot/projects/smpng/sys/dev/usb/usb.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: usb.c,v 1.48 2000/12/13 04:05:14 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usb.c,v 1.62 2002/04/01 17:54:07 joe Exp $ */ +/* $NetBSD: usb.c,v 1.49 2001/01/21 02:39:53 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb.c,v 1.63 2002/04/01 21:34:01 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -229,6 +229,20 @@ ue.u.ue_ctrlr.ue_bus = USBDEVUNIT(sc->sc_dev); usb_add_event(USB_EVENT_CTRLR_ATTACH, &ue); +#ifdef USB_USE_SOFTINTR +#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS + /* XXX we should have our own level */ + sc->sc_bus->soft = softintr_establish(IPL_SOFTNET, + sc->sc_bus->methods->soft_intr, sc->sc_bus); + if (sc->sc_bus->soft == NULL) { + printf("%s: can't register softintr\n", USBDEVNAME(sc->sc_dev)); + sc->sc_dying = 1; + } +#else + callout_init(&sc->sc_bus->softi); +#endif +#endif + err = usbd_new_device(USBDEV(sc->sc_dev), sc->sc_bus, 0, 0, 0, &sc->sc_port); if (!err) { @@ -703,9 +717,23 @@ } void -usb_schedsoftintr(struct usbd_bus *bus) +usb_schedsoftintr(usbd_bus_handle bus) { +#ifdef USB_USE_SOFTINTR + if (bus->use_polling) { + bus->methods->soft_intr(bus); + } else { +#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS + softintr_schedule(bus->soft); +#else + if (!callout_pending(&bus->softi)) + callout_reset(&bus->softi, 0, bus->methods->soft_intr, + bus); +#endif /* __HAVE_GENERIC_SOFT_INTERRUPTS */ + } +#else bus->methods->soft_intr(bus); +#endif } #if defined(__NetBSD__) || defined(__OpenBSD__) @@ -757,6 +785,17 @@ usbd_finish(); +#ifdef USB_USE_SOFTINTR +#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS + if (sc->sc_bus->soft != NULL) { + softintr_disestablish(sc->sc_bus->soft); + sc->sc_bus->soft = NULL; + } +#else + callout_stop(&sc->sc_bus->softi); +#endif +#endif + ue.u.ue_ctrlr.ue_bus = USBDEVUNIT(sc->sc_dev); usb_add_event(USB_EVENT_CTRLR_DETACH, &ue); ==== //depot/projects/smpng/sys/dev/usb/usb_port.h#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: usb_port.h,v 1.23 2000/03/24 22:03:32 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.44 2002/04/01 16:53:29 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.45 2002/04/01 21:34:01 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -52,6 +52,8 @@ #include "opt_usbverbose.h" +/*#define USB_USE_SOFTINTR */ + #ifdef USB_DEBUG #define UHID_DEBUG 1 #define OHCI_DEBUG 1 ==== //depot/projects/smpng/sys/dev/usb/usbdi.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: usbdi.c,v 1.77 2000/09/23 21:02:04 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.54 2002/04/01 17:30:24 joe Exp $ */ +/* $NetBSD: usbdi.c,v 1.79 2001/01/21 02:39:53 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.56 2002/04/01 21:34:01 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -299,12 +299,16 @@ int i; usbd_bus_handle bus = pipe->device->bus; int to = xfer->timeout * 1000; + DPRINTFN(2,("usbd_transfer: polling\n")); for (i = 0; i < to; i += 10) { delay(10); bus->methods->do_poll(bus); if (xfer->done) break; } + DPRINTFN(2,("usbd_transfer: polling done =\n", + xfer->done)); + /* XXX Is this right, what about the HC timeout? */ if (!xfer->done) { pipe->methods->abort(xfer); xfer->status = USBD_TIMEOUT; ==== //depot/projects/smpng/sys/dev/usb/usbdi.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: usbdi.h,v 1.46 2001/01/18 20:28:23 jdolecek Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.31 2002/04/01 19:22:04 joe Exp $ */ +/* $NetBSD: usbdi.h,v 1.47 2001/01/21 02:39:53 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.32 2002/04/01 21:34:01 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -249,14 +249,11 @@ int usbd_driver_load(module_t mod, int what, void *arg); #endif -/* - * XXX - * splusb MUST be the lowest level interrupt so that within USB callbacks - * the level can be raised the appropriate level. - * XXX Should probably use a softsplusb. - */ -/* XXX */ +/* XXX Perhaps USB should have its own levels? */ +#ifdef USB_USE_SOFTINTR +#define splusb splsoftnet +#else #define splusb splbio +#endif #define splhardusb splbio #define IPL_USB IPL_BIO -/* XXX */ ==== //depot/projects/smpng/sys/dev/usb/usbdivar.h#7 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: usbdivar.h,v 1.60 2000/12/28 10:40:36 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.27 2002/04/01 20:26:38 joe Exp $ */ +/* $NetBSD: usbdivar.h,v 1.62 2001/01/21 02:39:53 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.29 2002/04/01 21:34:01 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -53,7 +53,7 @@ struct usbd_bus_methods { usbd_status (*open_pipe)(struct usbd_pipe *pipe); - void (*soft_intr)(struct usbd_bus *); + void (*soft_intr)(void *); void (*do_poll)(struct usbd_bus *); usbd_status (*allocm)(struct usbd_bus *, usb_dma_t *, u_int32_t bufsize); @@ -113,7 +113,15 @@ #define USBREV_1_0 2 #define USBREV_1_1 3 #define USBREV_2_0 4 -#define USBREV_STR { "unknown", "pre 1.0", "1.0", "1.1" } +#define USBREV_STR { "unknown", "pre 1.0", "1.0", "1.1", "2.0" } + +#ifdef USB_USE_SOFTINTR +#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS + void *soft; /* soft interrupt cookie */ +#else + struct callout softi; +#endif +#endif #if defined(__NetBSD__) || defined(__OpenBSD__) bus_dma_tag_t dmatag; /* DMA tag */ ==== //depot/projects/smpng/sys/dev/vinum/vinum.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ * advised of the possibility of such damage. * * $Id: vinum.c,v 1.34 2001/05/22 04:07:22 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinum.c,v 1.48 2002/03/29 21:14:34 phk Exp $ + * $FreeBSD: src/sys/dev/vinum/vinum.c,v 1.49 2002/04/01 21:30:36 jhb Exp $ */ #define STATIC static /* nothing while we're testing XXX */ ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#25 (text+ko) ==== @@ -117,7 +117,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.86 2002/04/01 18:52:53 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.87 2002/04/01 21:30:37 jhb Exp $"; #endif #ifdef foo ==== //depot/projects/smpng/sys/dev/wl/if_wl.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/wl/if_wl.c,v 1.40 2002/02/27 23:34:02 imp Exp $ */ +/* $FreeBSD: src/sys/dev/wl/if_wl.c,v 1.41 2002/04/01 21:30:37 jhb Exp $ */ /* * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions ==== //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.35 2002/03/19 22:19:57 alfred Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.36 2002/04/01 21:30:38 jhb Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 15:24:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6293537B41E; Mon, 1 Apr 2002 15:24:11 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0D53737B435 for ; Mon, 1 Apr 2002 15:23:53 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g31NNqY83534 for perforce@freebsd.org; Mon, 1 Apr 2002 15:23:52 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Mon, 1 Apr 2002 15:23:52 -0800 (PST) Message-Id: <200204012323.g31NNqY83534@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 8837 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8837 Change 8837 by tmm@tmm_sparc64 on 2002/04/01 15:23:30 Fix a comment. Affected files ... ... //depot/projects/sparc64/sys/boot/sparc64/loader/main.c#21 edit Differences ... ==== //depot/projects/sparc64/sys/boot/sparc64/loader/main.c#21 (text+ko) ==== @@ -407,14 +407,15 @@ case DEVT_DISK: bootdev.d_dev = &ofwdisk; /* - * When booting from a cdrom, a disk label is placed before the - * cd9660 data, with it being in the first slice, while the - * other slices contain pseudo disk labels with embedded boot - * blocks, which are prepended by UFS file systems. - * The firmware will set the boot path to the slice it boots - * from (f in the sun4u case), but we want the kernel to be - * loaded from the cd9660 fs ('a'), so the boot path needs to - * be changed. + * Sun compatible bootable CD-ROMs have a disk label placed + * before the cd9660 data, with the actual file system being + * in the first partition, while the other partitions contain + * pseudo disk labels with embedded boot blocks for different + * architectures, which may be followed by UFS file systems. + * The firmware will set the boot path to the partition it + * boots from ('f' in the sun4u case), but we want the kernel + * to be loaded from the cd9660 fs ('a'), so the boot path + * needs to be altered. */ if (strstr(bootpath, "cdrom") != NULL && bootpath[strlen(bootpath) - 2] == ':') { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 1 18:13:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA67437B41A; Mon, 1 Apr 2002 18:12:35 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A2CBA37B419 for ; Mon, 1 Apr 2002 18:12:34 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g322CYc28955 for perforce@freebsd.org; Mon, 1 Apr 2002 18:12:34 -0800 (PST) (envelope-from jake@freebsd.org) Date: Mon, 1 Apr 2002 18:12:34 -0800 (PST) Message-Id: <200204020212.g322CYc28955@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8847 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8847 Change 8847 by jake@jake_sparc64 on 2002/04/01 18:11:53 Make isp work (supposedly). Submitted by: mjacob Affected files ... ... //depot/projects/sparc64/sys/dev/isp/isp_freebsd.h#8 edit ... //depot/projects/sparc64/sys/dev/isp/isp_pci.c#7 edit Differences ... ==== //depot/projects/sparc64/sys/dev/isp/isp_freebsd.h#8 (text+ko) ==== @@ -63,7 +63,7 @@ /* * Efficiency- get rid of SBus code && tests unless we need them. */ -#if defined(__sparcv9__ ) || defined(__sparc__) +#if _MACHINE_ARCH == sparc64 #define ISP_SBUS_SUPPORTED 1 #else #define ISP_SBUS_SUPPORTED 0 @@ -117,6 +117,10 @@ struct mtx lock; struct cv kthread_cv; struct proc *kproc; + bus_dma_tag_t cdmat; + bus_dmamap_t cdmap; +#define isp_cdmat isp_osinfo.cdmat +#define isp_cdmap isp_osinfo.cdmap #ifdef ISP_TARGET_MODE #define TM_WANTED 0x80 #define TM_BUSY 0x40 @@ -173,14 +177,21 @@ #define MAXISPREQUEST(isp) 256 -#if defined(__alpha__) -#define MEMORYBARRIER(isp, type, offset, size) alpha_mb() -#elif defined(__ia64__) -#define MEMORYBARRIER(isp, type, offset, size) \ - do { ia64_mf(); ia64_mf_a(); } while (0) -#else -#define MEMORYBARRIER(isp, type, offset, size) -#endif +#define MEMORYBARRIER(isp, type, offset, size) \ +switch (type) { \ +case SYNC_SFORDEV: \ +case SYNC_REQUEST: \ + bus_dmamap_sync(isp->isp_cdmat, isp->isp_cdmap, \ + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); \ + break; \ +case SYNC_SFORCPU: \ +case SYNC_RESULT: \ + bus_dmamap_sync(isp->isp_cdmat, isp->isp_cdmap, \ + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); \ + break; \ +default: \ + break; \ +} #define MBOX_ACQUIRE(isp) #define MBOX_WAIT_COMPLETE isp_mbox_wait_complete ==== //depot/projects/sparc64/sys/dev/isp/isp_pci.c#7 (text+ko) ==== @@ -241,6 +241,16 @@ ((PCI_PRODUCT_QLOGIC_ISP2312 << 16) | PCI_VENDOR_QLOGIC) /* + * I/O Mapping Stuff + */ +#if _MACHINE_ARCH == SPARC64 +/* An IOMMU means that we only will ever need one descriptor. */ +#define ISP_NSEG 2 +#else +#define ISP_NSEG ((MAXPHYS/PAGE_SIZE) + 1) +#endif + +/* * Odd case for some AMI raid cards... We need to *not* attach to this. */ #define AMI_RAID_SUBVENDOR_ID 0x101e @@ -254,6 +264,7 @@ static int isp_pci_probe (device_t); static int isp_pci_attach (device_t); + struct isp_pcisoftc { struct ispsoftc pci_isp; device_t pci_dev; @@ -262,9 +273,7 @@ bus_space_handle_t pci_sh; void * ih; int16_t pci_poff[_NREG_BLKS]; - bus_dma_tag_t parent_dmat; - bus_dma_tag_t cntrol_dmat; - bus_dmamap_t cntrol_dmap; + bus_dma_tag_t dmat; bus_dmamap_t *dmaps; }; ispfwfunc *isp_get_firmware_p = NULL; @@ -343,7 +352,6 @@ struct isp_pcisoftc *pcs; struct ispsoftc *isp = NULL; struct ispmdvec *mdvp; - bus_size_t lim; const char *sptr; int locksetup = 0; @@ -438,12 +446,10 @@ mdvp = &mdvec; basetype = ISP_HA_SCSI_UNKNOWN; psize = sizeof (sdparam); - lim = BUS_SPACE_MAXSIZE_32BIT; if (pci_get_devid(dev) == PCI_QLOGIC_ISP1020) { mdvp = &mdvec; basetype = ISP_HA_SCSI_UNKNOWN; psize = sizeof (sdparam); - lim = BUS_SPACE_MAXSIZE_24BIT; } if (pci_get_devid(dev) == PCI_QLOGIC_ISP1080) { mdvp = &mdvec_1080; @@ -573,16 +579,6 @@ data &= ~1; pci_write_config(dev, PCIR_ROMADDR, data, 4); - - if (bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, lim + 1, - 255, lim, 0, &pcs->parent_dmat) != 0) { - device_printf(dev, "could not create master dma tag\n"); - free(isp->isp_param, M_DEVBUF); - free(pcs, M_DEVBUF); - return (ENXIO); - } - iqd = 0; irq = bus_alloc_resource(dev, SYS_RES_IRQ, &iqd, 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); @@ -1007,60 +1003,46 @@ } } -static void isp_map_rquest(void *, bus_dma_segment_t *, int, int); -static void isp_map_result(void *, bus_dma_segment_t *, int, int); -static void isp_map_fcscrt(void *, bus_dma_segment_t *, int, int); struct imush { struct ispsoftc *isp; int error; }; +static void imc(void *, bus_dma_segment_t *, int, int); + static void -isp_map_rquest(void *arg, bus_dma_segment_t *segs, int nseg, int error) +imc(void *arg, bus_dma_segment_t *segs, int nseg, int error) { struct imush *imushp = (struct imush *) arg; if (error) { imushp->error = error; } else { - imushp->isp->isp_rquest_dma = segs->ds_addr; - } -} + struct ispsoftc *isp =imushp->isp; + bus_addr_t addr = segs->ds_addr; -static void -isp_map_result(void *arg, bus_dma_segment_t *segs, int nseg, int error) -{ - struct imush *imushp = (struct imush *) arg; - if (error) { - imushp->error = error; - } else { - imushp->isp->isp_result_dma = segs->ds_addr; + isp->isp_rquest_dma = addr; + addr += ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp)); + isp->isp_result_dma = addr; + if (IS_FC(isp)) { + addr += ISP_QUEUE_SIZE(RESULT_QUEUE_LEN(isp)); + FCPARAM(isp)->isp_scdma = addr; + } } } -static void -isp_map_fcscrt(void *arg, bus_dma_segment_t *segs, int nseg, int error) -{ - struct imush *imushp = (struct imush *) arg; - if (error) { - imushp->error = error; - } else { - fcparam *fcp = imushp->isp->isp_param; - fcp->isp_scdma = segs->ds_addr; - } -} +#define ISP_NSEGS ((BUS_SPACE_MAXSIZE / PAGE_SIZE) + 1) static int isp_pci_mbxdma(struct ispsoftc *isp) { - struct isp_pcisoftc *pci = (struct isp_pcisoftc *)isp; + struct isp_pcisoftc *pcs = (struct isp_pcisoftc *)isp; caddr_t base; u_int32_t len; - int i, error; - bus_size_t lim; + int i, error, ns; + bus_size_t bl; struct imush im; - /* * Already been here? If so, leave... */ @@ -1068,6 +1050,20 @@ return (0); } + if (IS_ULTRA2(isp) || IS_FC(isp) || IS_1240(isp)) { + bl = BUS_SPACE_UNRESTRICTED; + } else { + bl = BUS_SPACE_MAXADDR_24BIT; + } + + if (bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR, + BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, + ISP_NSEGS, bl, 0, &pcs->dmat)) { + isp_prt(isp, ISP_LOGERR, "could not create master dma tag"); + return(1); + } + + len = sizeof (XS_T **) * isp->isp_maxcmds; isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_WAITOK | M_ZERO); if (isp->isp_xflist == NULL) { @@ -1075,18 +1071,13 @@ return (1); } len = sizeof (bus_dmamap_t) * isp->isp_maxcmds; - pci->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF, M_WAITOK); - if (pci->dmaps == NULL) { - isp_prt(isp, ISP_LOGERR, "can't alloc dma maps"); + pcs->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF, M_WAITOK); + if (pcs->dmaps == NULL) { + isp_prt(isp, ISP_LOGERR, "can't alloc dma map storage"); free(isp->isp_xflist, M_DEVBUF); return (1); } - if (IS_FC(isp) || IS_ULTRA2(isp)) - lim = BUS_SPACE_MAXADDR + 1; - else - lim = BUS_SPACE_MAXADDR_24BIT + 1; - /* * Allocate and map the request, result queues, plus FC scratch area. */ @@ -1095,80 +1086,64 @@ if (IS_FC(isp)) { len += ISP2100_SCRLEN; } - if (bus_dma_tag_create(pci->parent_dmat, PAGE_SIZE, lim, - BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, len, 1, - BUS_SPACE_MAXSIZE_32BIT, 0, &pci->cntrol_dmat) != 0) { + + ns = (len / PAGE_SIZE) + 1; + if (bus_dma_tag_create(pcs->dmat, QENTRY_LEN, 0, BUS_SPACE_MAXADDR, + BUS_SPACE_MAXADDR, NULL, NULL, len, ns, bl, 0, &isp->isp_cdmat)) { isp_prt(isp, ISP_LOGERR, "cannot create a dma tag for control spaces"); + free(pcs->dmaps, M_DEVBUF); free(isp->isp_xflist, M_DEVBUF); - free(pci->dmaps, M_DEVBUF); return (1); } - if (bus_dmamem_alloc(pci->cntrol_dmat, (void **)&base, - BUS_DMA_NOWAIT, &pci->cntrol_dmap) != 0) { + + if (bus_dmamem_alloc(isp->isp_cdmat, (void **)&base, BUS_DMA_NOWAIT, + &isp->isp_cdmap) != 0) { isp_prt(isp, ISP_LOGERR, "cannot allocate %d bytes of CCB memory", len); + bus_dma_tag_destroy(isp->isp_cdmat); free(isp->isp_xflist, M_DEVBUF); - free(pci->dmaps, M_DEVBUF); + free(pcs->dmaps, M_DEVBUF); return (1); } - isp->isp_rquest = base; - im.isp = isp; - im.error = 0; - bus_dmamap_load(pci->cntrol_dmat, pci->cntrol_dmap, isp->isp_rquest, - ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp)), isp_map_rquest, &im, 0); - if (im.error) { - isp_prt(isp, ISP_LOGERR, - "error %d loading dma map for DMA request queue", im.error); - free(isp->isp_xflist, M_DEVBUF); - free(pci->dmaps, M_DEVBUF); - isp->isp_rquest = NULL; - return (1); - } - isp->isp_result = base + ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp)); - im.error = 0; - bus_dmamap_load(pci->cntrol_dmat, pci->cntrol_dmap, isp->isp_result, - ISP_QUEUE_SIZE(RESULT_QUEUE_LEN(isp)), isp_map_result, &im, 0); - if (im.error) { - isp_prt(isp, ISP_LOGERR, - "error %d loading dma map for DMA result queue", im.error); - free(isp->isp_xflist, M_DEVBUF); - free(pci->dmaps, M_DEVBUF); - isp->isp_rquest = NULL; - return (1); - } - for (i = 0; i < isp->isp_maxcmds; i++) { - error = bus_dmamap_create(pci->parent_dmat, 0, &pci->dmaps[i]); + error = bus_dmamap_create(pcs->dmat, 0, &pcs->dmaps[i]); if (error) { isp_prt(isp, ISP_LOGERR, "error %d creating per-cmd DMA maps", error); - free(isp->isp_xflist, M_DEVBUF); - free(pci->dmaps, M_DEVBUF); - isp->isp_rquest = NULL; - return (1); + while (--i >= 0) { + bus_dmamap_destroy(pcs->dmat, pcs->dmaps[i]); + } + goto bad; } } + im.isp = isp; + im.error = 0; + bus_dmamap_load(isp->isp_cdmat, isp->isp_cdmap, base, len, imc, &im, 0); + if (im.error) { + isp_prt(isp, ISP_LOGERR, + "error %d loading dma map for control areas", im.error); + goto bad; + } + + isp->isp_rquest = base; + base += ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp)); + isp->isp_result = base; if (IS_FC(isp)) { - fcparam *fcp = (fcparam *) isp->isp_param; - fcp->isp_scratch = base + - ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp)) + - ISP_QUEUE_SIZE(RESULT_QUEUE_LEN(isp)); - im.error = 0; - bus_dmamap_load(pci->cntrol_dmat, pci->cntrol_dmap, - fcp->isp_scratch, ISP2100_SCRLEN, isp_map_fcscrt, &im, 0); - if (im.error) { - isp_prt(isp, ISP_LOGERR, - "error %d loading FC scratch area", im.error); - free(isp->isp_xflist, M_DEVBUF); - free(pci->dmaps, M_DEVBUF); - isp->isp_rquest = NULL; - return (1); - } + base += ISP_QUEUE_SIZE(RESULT_QUEUE_LEN(isp)); + FCPARAM(isp)->isp_scratch = base; } return (0); + +bad: + bus_dmamem_free(isp->isp_cdmat, base, isp->isp_cdmap); + bus_dma_tag_destroy(isp->isp_cdmat); + free(isp->isp_xflist, M_DEVBUF); + free(pcs->dmaps, M_DEVBUF); + isp->isp_rquest = NULL; + return (1); } typedef struct { @@ -1210,7 +1185,7 @@ mush_t *mp; struct ccb_scsiio *csio; struct ispsoftc *isp; - struct isp_pcisoftc *pci; + struct isp_pcisoftc *pcs; bus_dmamap_t *dp; ct_entry_t *cto, *qe; u_int8_t scsi_status; @@ -1291,12 +1266,12 @@ cto->ct_resid = 0; cto->ct_scsi_status = 0; - pci = (struct isp_pcisoftc *)isp; - dp = &pci->dmaps[isp_handle_index(handle)]; + pcs = (struct isp_pcisoftc *)isp; + dp = &pcs->dmaps[isp_handle_index(handle)]; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREREAD); } else { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREWRITE); } nxti = *mp->nxtip; @@ -1448,7 +1423,7 @@ u_int8_t sense[QLTM_SENSELEN]; struct ccb_scsiio *csio; struct ispsoftc *isp; - struct isp_pcisoftc *pci; + struct isp_pcisoftc *pcs; bus_dmamap_t *dp; ct2_entry_t *cto, *qe; u_int16_t scsi_status, send_status, send_sense, handle; @@ -1565,12 +1540,12 @@ cto->rsp.m0.ct_scsi_status = 0; MEMZERO(&cto->rsp, sizeof (cto->rsp)); - pci = (struct isp_pcisoftc *)isp; - dp = &pci->dmaps[isp_handle_index(handle)]; + pcs = (struct isp_pcisoftc *)isp; + dp = &pcs->dmaps[isp_handle_index(handle)]; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREREAD); } else { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREWRITE); } nxti = *mp->nxtip; @@ -1755,7 +1730,7 @@ mush_t *mp; struct ispsoftc *isp; struct ccb_scsiio *csio; - struct isp_pcisoftc *pci; + struct isp_pcisoftc *pcs; bus_dmamap_t *dp; bus_dma_segment_t *eseg; ispreq_t *rq; @@ -1776,14 +1751,14 @@ csio = mp->cmd_token; isp = mp->isp; rq = mp->rq; - pci = (struct isp_pcisoftc *)mp->isp; - dp = &pci->dmaps[isp_handle_index(rq->req_handle)]; + pcs = (struct isp_pcisoftc *)mp->isp; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREREAD); } else { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREWRITE); } datalen = XS_XFRLEN(csio); @@ -1877,7 +1852,7 @@ isp_pci_dmasetup(struct ispsoftc *isp, struct ccb_scsiio *csio, ispreq_t *rq, u_int16_t *nxtip, u_int16_t optr) { - struct isp_pcisoftc *pci = (struct isp_pcisoftc *)isp; + struct isp_pcisoftc *pcs = (struct isp_pcisoftc *)isp; ispreq_t *qep; bus_dmamap_t *dp = NULL; mush_t mush, *mp; @@ -1929,12 +1904,12 @@ if ((csio->ccb_h.flags & CAM_SCATTER_VALID) == 0) { if ((csio->ccb_h.flags & CAM_DATA_PHYS) == 0) { int error, s; - dp = &pci->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; s = splsoftvm(); - error = bus_dmamap_load(pci->parent_dmat, *dp, + error = bus_dmamap_load(pcs->dmat, *dp, csio->data_ptr, csio->dxfer_len, eptr, mp, 0); if (error == EINPROGRESS) { - bus_dmamap_unload(pci->parent_dmat, *dp); + bus_dmamap_unload(pcs->dmat, *dp); mp->error = EINVAL; isp_prt(isp, ISP_LOGERR, "deferred dma allocation not supported"); @@ -2002,14 +1977,14 @@ static void isp_pci_dmateardown(struct ispsoftc *isp, XS_T *xs, u_int16_t handle) { - struct isp_pcisoftc *pci = (struct isp_pcisoftc *)isp; - bus_dmamap_t *dp = &pci->dmaps[isp_handle_index(handle)]; + struct isp_pcisoftc *pcs = (struct isp_pcisoftc *)isp; + bus_dmamap_t *dp = &pcs->dmaps[isp_handle_index(handle)]; if ((xs->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_POSTREAD); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_POSTREAD); } else { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_POSTWRITE); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_POSTWRITE); } - bus_dmamap_unload(pci->parent_dmat, *dp); + bus_dmamap_unload(pcs->dmat, *dp); } @@ -2025,7 +2000,7 @@ static void isp_pci_dumpregs(struct ispsoftc *isp, const char *msg) { - struct isp_pcisoftc *pci = (struct isp_pcisoftc *)isp; + struct isp_pcisoftc *pcs = (struct isp_pcisoftc *)isp; if (msg) printf("%s: %s\n", device_get_nameunit(isp->isp_dev), msg); else @@ -2058,5 +2033,5 @@ ISP_READ(isp, OUTMAILBOX2), ISP_READ(isp, OUTMAILBOX3), ISP_READ(isp, OUTMAILBOX4)); printf(" PCI Status Command/Status=%x\n", - pci_read_config(pci->pci_dev, PCIR_COMMAND, 1)); + pci_read_config(pcs->pci_dev, PCIR_COMMAND, 1)); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 2 8:35:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88C0337B41F; Tue, 2 Apr 2002 08:35:25 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D981A37B405 for ; Tue, 2 Apr 2002 08:35:24 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g32GZOi51248 for perforce@freebsd.org; Tue, 2 Apr 2002 08:35:24 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 2 Apr 2002 08:35:24 -0800 (PST) Message-Id: <200204021635.g32GZOi51248@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8891 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8891 Change 8891 by jhb@jhb_laptop on 2002/04/02 08:35:07 Integrate a few fixes from jhb_lock. Affected files ... ... //depot/projects/smpng/sys/kern/subr_witness.c#36 integrate Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#36 (text+ko) ==== @@ -477,6 +477,11 @@ td = curthread; if (class->lc_flags & LC_SLEEPLOCK) { + /* + * Since spin locks include a critical section, this check + * impliclty enforces a lock order of all sleep locks before + * all spin locks. + */ if (td->td_critnest != 0 && (flags & LOP_TRYLOCK) == 0) panic("blockable sleep lock (%s) %s @ %s:%d", class->lc_name, lock->lo_name, file, line); @@ -593,7 +598,18 @@ if ((lock1->li_flags & LI_SLEPT) != 0 && lock == &Giant.mtx_object) continue; - if (!isitmydescendant(w, w1)) + /* + * If we are locking a sleepable lock and this lock + * isn't sleepable and isn't Giant, we want to treat + * it as a lock order violation to enfore a general + * lock order of sleepable locks before non-sleepable + * locks. Thus, we only bother checking the lock + * order hierarchy if we pass the initial test. + */ + if (!((lock->lo_flags & LO_SLEEPABLE) != 0 && + ((lock1->li_lock->lo_flags & LO_SLEEPABLE) == 0 && + lock1->li_lock != &Giant.mtx_object)) && + !isitmydescendant(w, w1)) continue; /* * We have a lock order violation, check to see if it @@ -827,10 +843,10 @@ td->td_proc->p_pid, instance->li_lock->lo_name, (*lock_list)->ll_count - 1); - (*lock_list)->ll_count--; - for (j = i; j < (*lock_list)->ll_count; j++) + for (j = i; j < (*lock_list)->ll_count - 1; j++) (*lock_list)->ll_children[j] = (*lock_list)->ll_children[j + 1]; + (*lock_list)->ll_count--; intr_restore(s); if ((*lock_list)->ll_count == 0) { lle = *lock_list; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 2 11:30:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 186C137B41C; Tue, 2 Apr 2002 11:30:03 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E78A937B422 for ; Tue, 2 Apr 2002 11:30:01 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g32JU1M94379 for perforce@freebsd.org; Tue, 2 Apr 2002 11:30:01 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 2 Apr 2002 11:30:01 -0800 (PST) Message-Id: <200204021930.g32JU1M94379@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8906 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8906 Change 8906 by jhb@jhb_laptop on 2002/04/02 11:29:42 Remove extra debugging traces in witness for now. I haven't been able to trigger the corrupt alllocks list bug with these in, so they haven't been useful yet, but they do slow things down and obfuscate diffs. Affected files ... ... //depot/projects/smpng/sys/kern/subr_witness.c#37 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#37 (text+ko) ==== @@ -348,7 +348,6 @@ class->lc_name, lock->lo_name); mtx_lock(&all_mtx); - TR3("INSERT: lock %p (%s) %s", lock, class->lc_name, lock->lo_name); STAILQ_INSERT_TAIL(&all_locks, lock, lo_list); lock->lo_flags |= LO_INITIALIZED; lock_cur_cnt++; @@ -390,8 +389,6 @@ } mtx_lock(&all_mtx); - TR3("REMOVE: lock %p (%s) %s", lock, lock->lo_class->lc_name, - lock->lo_name); lock_cur_cnt--; STAILQ_REMOVE(&all_locks, lock, lock_object, lo_list); lock->lo_flags &= ~LO_INITIALIZED; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 2 12: 1:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16D4537B41B; Tue, 2 Apr 2002 11:59:41 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8ACF337B405 for ; Tue, 2 Apr 2002 11:59:38 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g32JxbZ01794 for perforce@freebsd.org; Tue, 2 Apr 2002 11:59:37 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 2 Apr 2002 11:59:37 -0800 (PST) Message-Id: <200204021959.g32JxbZ01794@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8908 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8908 Change 8908 by jhb@jhb_laptop on 2002/04/02 11:59:19 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/critical.c#2 integrate ... //depot/projects/smpng/sys/alpha/include/cpufunc.h#7 integrate ... //depot/projects/smpng/sys/alpha/include/critical.h#1 branch ... //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#5 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/help.sparc64#1 branch ... //depot/projects/smpng/sys/boot/sparc64/loader/locore.S#1 branch ... //depot/projects/smpng/sys/boot/sparc64/loader/locore.s#5 delete ... //depot/projects/smpng/sys/boot/sparc64/loader/main.c#6 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#4 integrate ... //depot/projects/smpng/sys/conf/NOTES#1 branch ... //depot/projects/smpng/sys/conf/files#31 integrate ... //depot/projects/smpng/sys/conf/options#16 integrate ... //depot/projects/smpng/sys/dev/ata/ata-all.c#16 integrate ... //depot/projects/smpng/sys/dev/ata/ata-dma.c#16 integrate ... //depot/projects/smpng/sys/dev/ata/ata-pci.c#16 integrate ... //depot/projects/smpng/sys/dev/ata/ata-raid.c#10 integrate ... //depot/projects/smpng/sys/dev/ata/ata-raid.h#8 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#20 integrate ... //depot/projects/smpng/sys/dev/ccd/ccd.c#12 integrate ... //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#8 integrate ... //depot/projects/smpng/sys/dev/pccard/pccarddevs#12 integrate ... //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#12 integrate ... //depot/projects/smpng/sys/dev/usb/if_aue.c#9 integrate ... //depot/projects/smpng/sys/dev/usb/if_cue.c#4 integrate ... //depot/projects/smpng/sys/dev/usb/if_kue.c#4 integrate ... //depot/projects/smpng/sys/dev/usb/uhci.c#15 integrate ... //depot/projects/smpng/sys/dev/usb/uhub.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/umodem.c#11 integrate ... //depot/projects/smpng/sys/dev/usb/usb.c#11 integrate ... //depot/projects/smpng/sys/dev/usb/usb_port.h#9 integrate ... //depot/projects/smpng/sys/dev/usb/usb_subr.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.h#6 integrate ... //depot/projects/smpng/sys/dev/usb/usbdivar.h#8 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumio.c#5 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#5 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumobj.h#2 integrate ... //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#5 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#26 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#1 branch ... //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#1 branch ... //depot/projects/smpng/sys/dev/wi/if_wireg.h#9 integrate ... //depot/projects/smpng/sys/dev/wi/if_wivar.h#1 branch ... //depot/projects/smpng/sys/geom/geom_bsd.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_disk.c#3 integrate ... //depot/projects/smpng/sys/i386/i386/critical.c#2 integrate ... //depot/projects/smpng/sys/i386/include/cpufunc.h#13 integrate ... //depot/projects/smpng/sys/i386/include/critical.h#1 branch ... //depot/projects/smpng/sys/i386/isa/apic_vector.s#11 integrate ... //depot/projects/smpng/sys/i386/isa/icu_vector.s#10 integrate ... //depot/projects/smpng/sys/i386/isa/matcd/matcd.c#4 integrate ... //depot/projects/smpng/sys/i386/isa/mcd.c#4 integrate ... //depot/projects/smpng/sys/i386/isa/scd.c#4 integrate ... //depot/projects/smpng/sys/ia64/ia64/critical.c#2 integrate ... //depot/projects/smpng/sys/ia64/ia64/ia64dump.c#1 branch ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#29 integrate ... //depot/projects/smpng/sys/ia64/include/cpufunc.h#12 integrate ... //depot/projects/smpng/sys/ia64/include/critical.h#1 branch ... //depot/projects/smpng/sys/isa/fd.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#30 integrate ... //depot/projects/smpng/sys/kern/kern_mib.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#22 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#19 integrate ... //depot/projects/smpng/sys/kern/kern_shutdown.c#21 integrate ... //depot/projects/smpng/sys/kern/kern_switch.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_sx.c#15 integrate ... //depot/projects/smpng/sys/kern/kern_sysctl.c#17 integrate ... //depot/projects/smpng/sys/kern/subr_diskslice.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_eventhandler.c#4 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#38 integrate ... //depot/projects/smpng/sys/kern/tty.c#16 integrate ... //depot/projects/smpng/sys/modules/wi/Makefile#4 integrate ... //depot/projects/smpng/sys/powerpc/include/cpufunc.h#11 integrate ... //depot/projects/smpng/sys/powerpc/include/critical.h#1 branch ... //depot/projects/smpng/sys/powerpc/powerpc/critical.c#2 integrate ... //depot/projects/smpng/sys/sparc64/include/cpufunc.h#15 integrate ... //depot/projects/smpng/sys/sparc64/include/critical.h#1 branch ... //depot/projects/smpng/sys/sparc64/include/iommureg.h#3 integrate ... //depot/projects/smpng/sys/sparc64/include/tlb.h#10 integrate ... //depot/projects/smpng/sys/sparc64/include/upa.h#4 integrate ... //depot/projects/smpng/sys/sparc64/isa/isa.c#4 integrate ... //depot/projects/smpng/sys/sparc64/pci/psycho.c#6 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/critical.c#2 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#5 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#4 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#19 integrate ... //depot/projects/smpng/sys/sys/_mutex.h#7 integrate ... //depot/projects/smpng/sys/sys/ata.h#8 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#11 integrate ... //depot/projects/smpng/sys/sys/eventhandler.h#4 integrate ... //depot/projects/smpng/sys/sys/kerneldump.h#2 integrate ... //depot/projects/smpng/sys/sys/mutex.h#21 integrate ... //depot/projects/smpng/sys/sys/sx.h#11 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#19 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/critical.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 2001 Matthew Dillon. This code is distributed under * the BSD copyright, /usr/src/COPYRIGHT. * - * $FreeBSD: src/sys/alpha/alpha/critical.c,v 1.2 2002/03/28 02:54:44 obrien Exp $ + * $FreeBSD: src/sys/alpha/alpha/critical.c,v 1.3 2002/04/01 23:51:21 dillon Exp $ */ #include @@ -18,24 +18,7 @@ #include #include #include - -void -cpu_critical_enter(void) -{ - struct thread *td; - - td = curthread; - td->td_md.md_savecrit = intr_disable(); -} - -void -cpu_critical_exit(void) -{ - struct thread *td; - - td = curthread; - intr_restore(td->td_md.md_savecrit); -} +#include /* * cpu_critical_fork_exit() - cleanup after fork ==== //depot/projects/smpng/sys/alpha/include/cpufunc.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/cpufunc.h,v 1.14 2002/03/27 05:39:16 dillon Exp $ + * $FreeBSD: src/sys/alpha/include/cpufunc.h,v 1.15 2002/04/01 23:51:22 dillon Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -59,11 +59,6 @@ alpha_pal_swpipl(ipl); } -void cpu_critical_enter(void); -void cpu_critical_exit(void); -void cpu_critical_fork_exit(void); -void cpu_thread_link(struct thread *td); - #endif /* _KERNEL */ #endif /* !_MACHINE_CPUFUNC_H_ */ ==== //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#2 (text+ko) ==== @@ -1,19 +1,29 @@ -# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.2 2002/03/05 16:39:36 robert Exp $ +# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.3 2002/04/01 22:57:51 tmm Exp $ + +PROG= boot1 +SRCS= _start.S boot1.c +NOMAN= +STRIP= +BINDIR?= /boot +BINMODE= 444 BOOTBLOCKBASE= 0x4000 -CFLAGS= -W -Wall -I../../ -I../../common/ -Os \ - -DBOOTBLOCKBASE=${BOOTBLOCKBASE} \ - -ffreestanding -mno-app-regs -mcmodel=medlow -OBJ= boot1.o +CFLAGS= -W -Wall -I../../ -I../../common/ -Os -ffreestanding -mno-app-regs \ + -mcmodel=medlow + +boot1.elf: _start.o boot1.o + ${LD} -N -Ttext ${BOOTBLOCKBASE} -o ${.TARGET} _start.o boot1.o + +boot1.aout: boot1.elf + /usr/local/bin/elftoaout -o ${.TARGET} boot1.elf -all: boot1 +# Construct boot1. disklabel expects it to contain zeroed-out space for the +# label, and to be of the correct size. +boot1: boot1.aout + dd if=/dev/zero of=${.TARGET} bs=512 count=16 + dd if=boot1.aout of=${.TARGET} bs=512 oseek=1 conv=notrunc -boot1.o: boot1.c - ${CC} ${CFLAGS} -c -o ${.TARGET} ${.ALLSRC} +CLEANFILES+= boot1.elf boot1.aout -boot1: ${OBJ} - ${LD} -N -Ttext ${BOOTBLOCKBASE} -e main -o boot1 ${OBJ} - /usr/local/bin/elftoaout boot1 -clean: - rm -f *.o boot1 +.include ==== //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#5 (text+ko) ==== @@ -1,19 +1,29 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.4 2002/02/23 04:35:28 jake Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.6 2002/04/02 17:08:37 tmm Exp $ BASE= loader PROG= ${BASE} NEWVERSWHAT= "bootstrap loader" sparc64 +BINDIR?= /boot +INSTALLFLAGS= -b CFLAGS= -mno-app-regs -LOADER_DISK_SUPPORT?= no -LOADER_NET_SUPPORT?= yes -LOADER_NFS_SUPPORT?= yes -LOADER_TFTP_SUPPORT?= yes +LOADER_DISK_SUPPORT?= yes +LOADER_UFS_SUPPORT?= yes +LOADER_CD9660_SUPPORT?= no +LOADER_NET_SUPPORT?= no +LOADER_NFS_SUPPORT?= no +LOADER_TFTP_SUPPORT?= no .if ${LOADER_DISK_SUPPORT} == "yes" CFLAGS+= -DLOADER_DISK_SUPPORT .endif +.if ${LOADER_UFS_SUPPORT} == "yes" +CFLAGS+= -DLOADER_UFS_SUPPORT +.endif +.if ${LOADER_CD9660_SUPPORT} == "yes" +CFLAGS+= -DLOADER_CD9660_SUPPORT +.endif .if ${LOADER_NET_SUPPORT} == "yes" CFLAGS+= -DLOADER_NET_SUPPORT .endif @@ -25,7 +35,7 @@ .endif # Architecture-specific loader code -SRCS= locore.s main.c metadata.c +SRCS= locore.S main.c metadata.c # Always add MI sources .PATH: ${.CURDIR}/../../common @@ -33,10 +43,11 @@ CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I${.CURDIR}/../../.. -I. -CLEANFILES+= ${PROG} +CLEANFILES+= ${PROG}.help CFLAGS+= -W -Wall -ffreestanding -LDFLAGS= -X -static +LDFLAGS= -nostdlib -static +LDADD= ${LIBSTAND} ${LIBOFW} # where to get libstand from #XXX need a better way to do this @@ -47,33 +58,25 @@ LIBSTAND= -lstand .endif .endif -LIBOFW= ${.CURDIR}/../../ofw/libofw/libofw.a +LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ CFLAGS+= -I${.CURDIR}/../../ofw/libofw/ -# Debug me! -#CFLAGS+= -g -#LDFLAGS+= -g +${BASE}.help: help.common help.sparc64 + cat ${.ALLSRC} | \ + awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} -${PROG}: ${OBJS} - ${LD} -o ${.TARGET} ${OBJS} ${LIBOFW} ${LIBSTAND} ${LDFLAGS} - -locore.o: locore.s - ${CC} ${CFLAGS} -D_LOCORE -xassembler-with-cpp -c locore.s -o locore.o -main.o: main.c - ${CC} ${CFLAGS} -c main.c -o main.o - -beforeinstall: +beforeinstall: ${PROG}.help .if exists(${DESTDIR}/boot/loader) mv ${DESTDIR}/boot/loader ${DESTDIR}/boot/loader.old .endif -.if exists(${.OBJDIR}/loader.help) +#.if exists(${.OBJDIR}/loader.help) ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot -.else - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${BASE}.help ${DESTDIR}/boot -.endif +#.else +# ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ +# ${.CURDIR}/${BASE}.help ${DESTDIR}/boot +#.endif .if !exists(${DESTDIR}/boot/loader.rc) ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot ==== //depot/projects/smpng/sys/boot/sparc64/loader/main.c#6 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.6 2002/03/01 06:17:28 jake Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.8 2002/04/02 17:10:15 tmm Exp $ */ /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -52,8 +52,8 @@ typedef void kernel_entry_t(vm_offset_t mdp, u_long o1, u_long o2, u_long o3, void *openfirmware); -extern void itlb_enter(int slot, u_long vpn, u_long data); -extern void dtlb_enter(int slot, u_long vpn, u_long data); +extern void itlb_enter(u_long vpn, u_long data); +extern void dtlb_enter(u_long vpn, u_long data); extern vm_offset_t itlb_va_to_pa(vm_offset_t); extern vm_offset_t dtlb_va_to_pa(vm_offset_t); extern vm_offset_t md_load(char *, vm_offset_t *); @@ -105,6 +105,9 @@ #ifdef LOADER_UFS_SUPPORT &ufs_fsops, #endif +#ifdef LOADER_CD9660_SUPPORT + &cd9660_fsops, +#endif #ifdef LOADER_NET_SUPPORT &nfs_fsops, #endif @@ -239,10 +242,6 @@ vm_offset_t pa, mva; struct tte tte; - if (dtlb_slot < 0) - panic("mmu_mapin: out of dtlb_slots"); - if (itlb_slot < 0) - panic("mmu_mapin: out of itlb_slots"); if (va + len > curkva) curkva = va + len; @@ -268,13 +267,21 @@ /* The mappings may have changed, be paranoid. */ continue; } + /* + * Actually, we can only allocate two pages less at + * most (depending on the kernel TSB size). + */ + if (dtlb_slot >= dtlb_slot_max) + panic("mmu_mapin: out of dtlb_slots"); + if (itlb_slot >= itlb_slot_max) + panic("mmu_mapin: out of itlb_slots"); tte.tte_vpn = TV_VPN(va); tte.tte_data = TD_V | TD_4M | TD_PA(pa) | TD_L | TD_CP | TD_CV | TD_P | TD_W; - dtlb_store[--dtlb_slot] = tte; - itlb_store[--itlb_slot] = tte; - dtlb_enter(dtlb_slot, tte.tte_vpn, tte.tte_data); - itlb_enter(itlb_slot, tte.tte_vpn, tte.tte_data); + dtlb_store[dtlb_slot++] = tte; + itlb_store[itlb_slot++] = tte; + dtlb_enter(tte.tte_vpn, tte.tte_data); + itlb_enter(tte.tte_vpn, tte.tte_data); pa = (vm_offset_t)-1; } len -= len > PAGE_SIZE_4M ? PAGE_SIZE_4M : len; @@ -333,8 +340,6 @@ itlb_store = malloc(itlb_slot_max * sizeof(*itlb_store)); if (dtlb_store == NULL || itlb_store == NULL) panic("init_tlb: malloc"); - dtlb_slot = dtlb_slot_max; - itlb_slot = itlb_slot_max; } int @@ -388,6 +393,22 @@ switch (bootdev.d_type) { case DEVT_DISK: bootdev.d_dev = &ofwdisk; + /* + * Sun compatible bootable CD-ROMs have a disk label placed + * before the cd9660 data, with the actual file system being + * in the first partition, while the other partitions contain + * pseudo disk labels with embedded boot blocks for different + * architectures, which may be followed by UFS file systems. + * The firmware will set the boot path to the partition it + * boots from ('f' in the sun4u case), but we want the kernel + * to be loaded from the cd9660 fs ('a'), so the boot path + * needs to be altered. + */ + if (strstr(bootpath, "cdrom") != NULL && + bootpath[strlen(bootpath) - 2] == ':') { + bootpath[strlen(bootpath) - 1] = 'a'; + printf("Boot path set to %s\n", bootpath); + } strncpy(bootdev.d_kind.ofwdisk.path, bootpath, 64); ofw_parseofwdev(&bootdev, bootpath); break; ==== //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.29 - * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.3 2002/02/23 11:06:37 jake Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.4 2002/04/02 17:10:15 tmm Exp $ */ #include @@ -319,9 +319,9 @@ file_addmetadata(kfp, MODINFOMD_DTLB_SLOTS, sizeof dtlb_slots, &dtlb_slots); file_addmetadata(kfp, MODINFOMD_ITLB_SLOTS, sizeof itlb_slots, &itlb_slots); file_addmetadata(kfp, MODINFOMD_DTLB, dtlb_slots * sizeof(struct tte), - &dtlb_store[dtlb_slot]); + dtlb_store); file_addmetadata(kfp, MODINFOMD_ITLB, itlb_slots * sizeof(struct tte), - &itlb_store[itlb_slot]); + itlb_store); *modulep = addr; size = md_copymodules(0); ==== //depot/projects/smpng/sys/conf/files#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.617 2002/03/30 17:41:23 mdodd Exp $ +# $FreeBSD: src/sys/conf/files,v 1.618 2002/04/02 02:50:48 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -623,7 +623,9 @@ #dev/wlp/if_wlp.c optional wlp card dev/wds/wd7000.c optional wds isa dev/wi/if_wi.c optional wi -dev/wi/if_wi.c optional wi pccard +dev/wi/if_wi_pccard.c optional wi pccard +dev/wi/if_wi_pccard.c optional wi card +dev/wi/if_wi_pci.c optional wi pci dev/wl/if_wl.c optional wl isa dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe card ==== //depot/projects/smpng/sys/conf/options#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.307 2002/04/01 05:35:23 jake Exp $ +# $FreeBSD: src/sys/conf/options,v 1.308 2002/04/02 00:01:47 des Exp $ # # On the handling of kernel options # @@ -519,3 +519,6 @@ # Polling device handling DEVICE_POLLING opt_global.h + +# Mutex profiling +MUTEX_PROFILING opt_global.h ==== //depot/projects/smpng/sys/dev/ata/ata-all.c#16 (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. * - * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.143 2002/03/30 16:51:47 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.144 2002/04/02 13:47:23 sos Exp $ */ #include "opt_ata.h" @@ -415,6 +415,9 @@ case ATARAIDDELETE: return ata_raid_delete(iocmd->channel); + + case ATARAIDSTATUS: + return ata_raid_status(iocmd->channel, &iocmd->u.raid_status); #endif #if defined(DEV_ATAPICD) || defined(DEV_ATAPIFD) || defined(DEV_ATAPIST) case ATAPICMD: { ==== //depot/projects/smpng/sys/dev/ata/ata-dma.c#16 (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. * - * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.91 2002/03/31 13:33:55 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.92 2002/04/02 16:45:06 sos Exp $ */ #include @@ -411,7 +411,7 @@ { 0x00, 0x00, 0xf6, 0x00, 0xf2, 0xf1, 0xf0 }}; /* ATA133 */ int *reg_val = NULL; - if (ata_find_dev(parent, 0x31471106, 0x40)) { /* 8233a */ + if (ata_find_dev(parent, 0x31471106, 0)) { /* 8233a */ udmamode = imin(udmamode, 6); reg_val = via_modes[3]; } @@ -427,7 +427,7 @@ udmamode = imin(udmamode, 4); reg_val = via_modes[1]; } - else if (ata_find_dev(parent, 0x06861106, 0x0)) { /* 82C686 */ + else if (ata_find_dev(parent, 0x06861106, 0)) { /* 82C686 */ udmamode = imin(udmamode, 2); reg_val = via_modes[1]; } @@ -509,17 +509,17 @@ case 0x55131039: /* SiS 5591 */ if (ata_find_dev(parent, 0x06301039, 0x30) || /* SiS 630 */ - ata_find_dev(parent, 0x06331039, 0x00) || /* SiS 633 */ - ata_find_dev(parent, 0x06351039, 0x00) || /* SiS 635 */ - ata_find_dev(parent, 0x06401039, 0x00) || /* SiS 640 */ - ata_find_dev(parent, 0x06451039, 0x00) || /* SiS 645 */ - ata_find_dev(parent, 0x06501039, 0x00) || /* SiS 650 */ - ata_find_dev(parent, 0x07301039, 0x00) || /* SiS 730 */ - ata_find_dev(parent, 0x07331039, 0x00) || /* SiS 733 */ - ata_find_dev(parent, 0x07351039, 0x00) || /* SiS 735 */ - ata_find_dev(parent, 0x07401039, 0x00) || /* SiS 740 */ - ata_find_dev(parent, 0x07451039, 0x00) || /* SiS 745 */ - ata_find_dev(parent, 0x07501039, 0x00)) { /* SiS 750 */ + ata_find_dev(parent, 0x06331039, 0) || /* SiS 633 */ + ata_find_dev(parent, 0x06351039, 0) || /* SiS 635 */ + ata_find_dev(parent, 0x06401039, 0) || /* SiS 640 */ + ata_find_dev(parent, 0x06451039, 0) || /* SiS 645 */ + ata_find_dev(parent, 0x06501039, 0) || /* SiS 650 */ + ata_find_dev(parent, 0x07301039, 0) || /* SiS 730 */ + ata_find_dev(parent, 0x07331039, 0) || /* SiS 733 */ + ata_find_dev(parent, 0x07351039, 0) || /* SiS 735 */ + ata_find_dev(parent, 0x07401039, 0) || /* SiS 740 */ + ata_find_dev(parent, 0x07451039, 0) || /* SiS 745 */ + ata_find_dev(parent, 0x07501039, 0)) { /* SiS 750 */ int8_t reg = 0x40 + (devno << 1); int16_t val = pci_read_config(parent, reg, 2) & 0x0fff; ==== //depot/projects/smpng/sys/dev/ata/ata-pci.c#16 (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. * - * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.35 2002/03/24 12:44:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.36 2002/04/02 16:45:06 sos Exp $ */ #include @@ -181,22 +181,22 @@ case 0x55131039: if (ata_find_dev(dev, 0x06301039, 0x30) || - ata_find_dev(dev, 0x06331039, 0x00) || - ata_find_dev(dev, 0x06351039, 0x00) || - ata_find_dev(dev, 0x06401039, 0x00) || - ata_find_dev(dev, 0x06451039, 0x00) || - ata_find_dev(dev, 0x06501039, 0x00) || - ata_find_dev(dev, 0x07301039, 0x00) || - ata_find_dev(dev, 0x07331039, 0x00) || - ata_find_dev(dev, 0x07351039, 0x00) || - ata_find_dev(dev, 0x07401039, 0x00) || - ata_find_dev(dev, 0x07451039, 0x00) || - ata_find_dev(dev, 0x07501039, 0x00)) + ata_find_dev(dev, 0x06331039, 0) || + ata_find_dev(dev, 0x06351039, 0) || + ata_find_dev(dev, 0x06401039, 0) || + ata_find_dev(dev, 0x06451039, 0) || + ata_find_dev(dev, 0x06501039, 0) || + ata_find_dev(dev, 0x07301039, 0) || + ata_find_dev(dev, 0x07331039, 0) || + ata_find_dev(dev, 0x07351039, 0) || + ata_find_dev(dev, 0x07401039, 0) || + ata_find_dev(dev, 0x07451039, 0) || + ata_find_dev(dev, 0x07501039, 0)) return "SiS 5591 ATA100 controller"; - else if (ata_find_dev(dev, 0x05301039, 0x00) || - ata_find_dev(dev, 0x05401039, 0x00) || - ata_find_dev(dev, 0x06201039, 0x00) || - ata_find_dev(dev, 0x06301039, 0x00)) + else if (ata_find_dev(dev, 0x05301039, 0) || + ata_find_dev(dev, 0x05401039, 0) || + ata_find_dev(dev, 0x06201039, 0) || + ata_find_dev(dev, 0x06301039, 0)) return "SiS 5591 ATA66 controller"; else return "SiS 5591 ATA33 controller"; ==== //depot/projects/smpng/sys/dev/ata/ata-raid.c#10 (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. * - * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.43 2002/03/30 11:15:46 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.44 2002/04/02 13:47:23 sos Exp $ */ #include "opt_ata.h" @@ -404,7 +404,50 @@ ar_table[array] = NULL; return 0; } - + +int +ata_raid_status(int array, struct raid_status *status) +{ + struct ar_softc *rdp; + int i; + + if (!ar_table || !(rdp = ar_table[array])) + return ENXIO; + + switch (rdp->flags & (AR_F_RAID0 | AR_F_RAID1 | AR_F_SPAN)) { + case AR_F_RAID0: + status->type = AR_RAID0; + break; + case AR_F_RAID1: + status->type = AR_RAID1; + break; + case AR_F_RAID0 | AR_F_RAID1: + status->type = AR_RAID0 | AR_RAID1; + break; + case AR_F_SPAN: + status->type = AR_SPAN; + break; + } + status->total_disks = rdp->total_disks; + for (i = 0; i < rdp->total_disks; i++ ) { + if ((rdp->disks[i].flags & AR_DF_PRESENT) && rdp->disks[i].device) + status->disks[i] = AD_SOFTC(rdp->disks[i])->lun; + else + status->disks[i] = -1; + } + status->interleave = rdp->interleave; + status->status = 0; + if (rdp->flags & AR_F_READY) + status->status |= AR_READY; + if (rdp->flags & AR_F_DEGRADED) + status->status |= AR_DEGRADED; + if (rdp->flags & AR_F_REBUILDING) { + status->status |= AR_REBUILDING; + status->progress = 100*rdp->lock_start/(rdp->total_sectors/rdp->width); + } + return 0; +} + int ata_raid_rebuild(int array) { ==== //depot/projects/smpng/sys/dev/ata/ata-raid.h#8 (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. * - * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.16 2002/03/27 10:58:59 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.17 2002/04/02 13:47:23 sos Exp $ */ /* misc defines */ @@ -228,4 +228,5 @@ void ata_raid_attach(void); int ata_raid_create(struct raid_setup *); int ata_raid_delete(int); +int ata_raid_status(int array, struct raid_status *); int ata_raid_rebuild(int); ==== //depot/projects/smpng/sys/dev/ata/atapi-cd.c#20 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.115 2002/04/01 21:30:31 jhb Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.116 2002/04/02 11:52:06 phk Exp $ */ #include "opt_ata.h" @@ -1038,11 +1038,6 @@ error = EBADF; break; - case DIOCGPART: - ((struct partinfo *)addr)->disklab = &cdp->disklabel; - ((struct partinfo *)addr)->part = &cdp->disklabel.d_partitions[0]; - break; - default: error = ENOTTY; } ==== //depot/projects/smpng/sys/dev/ccd/ccd.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.100 2002/03/29 21:12:11 phk Exp $ */ +/* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.102 2002/04/02 11:52:08 phk Exp $ */ /* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */ @@ -391,10 +391,11 @@ struct vnode *vp; size_t minsize; int maxsecsize; - struct partinfo dpart; struct ccdgeom *ccg = &cs->sc_geom; char *tmppath = NULL; int error = 0; + off_t mediasize; + u_int sectorsize; #ifdef DEBUG if (ccddebug & (CCDB_FOLLOW|CCDB_INIT)) @@ -439,8 +440,9 @@ /* * Get partition information for the component. */ - if ((error = VOP_IOCTL(vp, DIOCGPART, (caddr_t)&dpart, - FREAD, td->td_ucred, td)) != 0) { + error = VOP_IOCTL(vp, DIOCGMEDIASIZE, (caddr_t)&mediasize, + FREAD, td->td_ucred, td); + if (error != 0) { #ifdef DEBUG if (ccddebug & (CCDB_FOLLOW|CCDB_INIT)) printf("ccd%d: %s: ioctl failed, error = %d\n", @@ -448,20 +450,22 @@ #endif goto fail; } - if (dpart.part->p_fstype == FS_BSDFFS) { - maxsecsize = - ((dpart.disklab->d_secsize > maxsecsize) ? - dpart.disklab->d_secsize : maxsecsize); - size = dpart.part->p_size - CCD_OFFSET; - } else { + /* + * Get partition information for the component. + */ + error = VOP_IOCTL(vp, DIOCGSECTORSIZE, (caddr_t)§orsize, + FREAD, td->td_ucred, td); + if (error != 0) { #ifdef DEBUG if (ccddebug & (CCDB_FOLLOW|CCDB_INIT)) - printf("ccd%d: %s: incorrect partition type\n", - cs->sc_unit, ci->ci_path); + printf("ccd%d: %s: ioctl failed, error = %d\n", + cs->sc_unit, ci->ci_path, error); #endif - error = EFTYPE; goto fail; } + if (sectorsize > maxsecsize) + maxsecsize = sectorsize; + size = mediasize / DEV_BSIZE - CCD_OFFSET; /* * Calculate the size, truncating to an interleave @@ -1501,15 +1505,6 @@ *(struct disklabel *)data = cs->sc_label; break; - case DIOCGPART: - if (!IS_INITED(cs)) - return (ENXIO); - - ((struct partinfo *)data)->disklab = &cs->sc_label; - ((struct partinfo *)data)->part = - &cs->sc_label.d_partitions[ccdpart(dev)]; - break; - case DIOCWDINFO: case DIOCSDINFO: if (!IS_INITED(cs)) ==== //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.37 2002/01/29 07:08:56 imp Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.38 2002/04/02 05:52:52 imp Exp $ */ #include "opt_ed.h" @@ -159,6 +159,8 @@ * PCMCIA_VENDOR_INVALID and/or PCMCIA_PRODUCT_INVALID * in front of this comment. */ + { PCMCIA_CARD(LANTECH, FASTNETTX, 0), + -1, { 0x00, 0x04, 0x1c}, NE2000DVF_AX88190 }, { PCMCIA_CARD(IBM, INFOMOVER, 0), 0x0ff0, { 0x08, 0x00, 0x5a } }, { PCMCIA_CARD(IBM, INFOMOVER, 0), @@ -169,14 +171,20 @@ -1, { 0, 0, 0 }, 0 }, /* XXX */ { PCMCIA_CARD(LINKSYS, ECARD_1, 0), -1, { 0x00, 0x80, 0xc8 } }, + { PCMCIA_CARD(LINKSYS, PCM100, 0), + -1, { 0x00, 0x04, 0x5a } }, #ifdef BOGUS + /* + * The next three should be detected as linksys, but might fail + * the mac sanity check. + */ { PCMCIA_CARD(PLANEX, FNW3600T, 0), -1, { 0x00, 0x90, 0xcc }, NE2000DVF_DL10019 }, { PCMCIA_CARD(PLANEX, FNW3700T, 0), -1, { 0x00, 0x90, 0xcc }, NE2000DVF_DL10019 }, -#endif { PCMCIA_CARD(SVEC, PN650TX, 0), -1, { 0x00, 0xe0, 0x98 }, NE2000DVF_DL10019 }, +#endif /* * This entry should be here so that above two cards doesn't @@ -289,6 +297,11 @@ 0x00b8, { 0x08, 0x00, 0x42 } }, { PCMCIA_CARD(ALLIEDTELESIS, LA_PCM, 0), 0x0ff0, { 0x00, 0x00, 0xf4 } }, + { PCMCIA_CARD(NETGEAR, FA410TXC, 0), + -1, { 0x00, 0x48, 0x54 } }, + { PCMCIA_CARD(NETGEAR, FA411, 0), + -1, { 0x00, 0x40, 0xf4 } }, + #if 0 /* the rest of these are stolen from the linux pcnet pcmcia device driver. Since I don't know the manfid or cis info strings for ==== //depot/projects/smpng/sys/dev/pccard/pccarddevs#12 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.28 2002/03/17 05:05:42 imp Exp $ -/* $NetBSD: pcmciadevs,v 1.159 2002/01/28 09:25:33 aymeric Exp $ */ -/* $OpenBSD: pcmciadevs,v 1.71 2001/10/28 19:21:37 mickey Exp $ */ +$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.30 2002/04/02 05:46:10 imp Exp $ +/* $NetBSD: pcmciadevs,v 1.163 2002/03/04 16:41:50 martin Exp $ */ +/* $OpenBSD: pcmciadevs,v 1.85 2002/03/29 18:54:07 millert Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -87,6 +87,7 @@ vendor BUFFALO 0x026f BUFFALO (Melco Corporation) vendor LINKSYS2 0x0274 The Linksys Group vendor IODATA2 0x028a I-O DATA +vendor NWN 0x0602 No Wires Needed vendor BREEZECOM 0x0a02 BreezeCOM vendor NEWMEDIA2 0x10cd NewMedia vendor LASAT 0x3401 Lasat Communications A/S @@ -241,6 +242,7 @@ product LINKSYS ECARD_1 0x0265 Linksys EthernetCard or D-Link DE-650 product LINKSYS COMBO_ECARD 0xc1ab Linksys Combo EthernetCard product LINKSYS2 IWN 0x1612 Instant Wireless Network PC Card +product LINKSYS2 IWN2 0x1613 Instant Wireless Network PC Card /* Lucent WaveLAN/IEEE */ product LUCENT WAVELAN_IEEE 0x0002 WaveLAN/IEEE @@ -275,6 +277,7 @@ /* Netgear */ product NETGEAR FA410TXC 0x4530 Netgear FA410TXC +product NETGEAR FA411 0x0411 Netgear FA411 /* National Instruments */ product NI PCMCIA_GPIB 0x4882 National Instruments PCMCIA-GPIB @@ -282,6 +285,10 @@ /* Nokia Products */ product NOKIA C020_WLAN 0x20c0 Nokia C020 WLAN Card +/* No Wires Needed */ +product NWN WLAN_550 0x0002 NWN 550 WLAN +product NWN WLAN_1148 0x0003 NWN 1148 WLAN + /* Olicom Products */ product OLICOM TR 0x2132 GoCard Token Ring 16/4 @@ -294,6 +301,7 @@ /* Proxim */ product PROXIM ROAMABOUT_2400FH 0x1058 Digital RoamAbout 2400FH product PROXIM RANGELAN2_7401 0x1158 Proxim RangeLAN2 7401 +product PROXIM RANGELANDS_8430 0x8000 Proxim RangeLAN-DS 8430 /* Psion */ product PSION GOLDCARD 0x0020 Psion Gold Card @@ -341,6 +349,7 @@ product TDK LAK_CD021BX 0x0200 TDK LAK-CD021BX Ethernet product TDK LAK_CF010 0x0900 TDK LAC-CF010 product TDK DFL9610 0x0d0a TDK DFL9610 Ethernet & Digital Cellular +product TDK C6500012 0x410a TDK ELSA MicroLink MC all /* Telecom Device */ product TELECOMDEVICE TCD_HPC100 0x0202 Telecom Device TCD-HPC100 @@ -370,6 +379,7 @@ */ vendor AMBICOM -1 AmbiCom Inc vendor ACCTON -1 ACCTON +vendor ADDTRON -1 Addtron vendor AMD -1 AMD vendor BILLIONTON -1 Billionton Systems Inc. vendor CNET -1 CNet @@ -381,6 +391,7 @@ vendor GEMTEK -1 Gem Tek vendor ICOM -1 ICOM Inc vendor INTERSIL -1 Intersil +vendor LANTECH -1 Lantech Computer Company vendor NAKAGAWAMETAL -1 NAKAGAWA METAL vendor NDC -1 NDC vendor PLANET -1 Planet @@ -394,6 +405,7 @@ vendor ZOOM -1 ZOOM product ACCTON EN2212 { "ACCTON", "EN2212", NULL, NULL } Accton EN2212 +product ADDTRON AWP100 { "Addtron", "AWP-100&spWireless&spPCMCIA", "Version&sp01.02", NULL } product AMBICOM AMB8002T { "AmbiCom&spInc", "AMB8002T", NULL, NULL } AmbiCom AMB8002T product AMD AM79C930 { "AMD", "Am79C930", NULL, NULL } AMD Am79C930 product BILLIONTON LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } Billionton Systems Inc. LNT-10TN NE2000 Compatible Card @@ -419,12 +431,18 @@ product EIGERLABS EPX_AA2000 { "Eiger&splabs,Inc.", "EPX-AA2000&spPC&spSound&spCard", NULL, NULL } EPX-AA2000 PC Sound Card product EPSON EEN10B { "Seiko&spEpson&spCorp.", "Ethernet", "P/N:&spEEN10B&spRev.&sp00", NULL } Epson EEN10B product EXP EXPMULTIMEDIA { "EXP&sp&sp&sp", "PnPIDE", "F1", NULL } EXP IDE/ATAPI DVD Card +product FUJITSU FMV_J181 { "PCMCIA&spMBH10302", "01", NULL, NULL } FUJITSU FMV-J181 PCMCIA Card +product FUJITSU FMV_J182 { "FUJITSU", "LAN&spCard(FMV-J182)", "Ver.01", NULL } FUJITSU FMV-J182 PCMCIA Card +product FUJITSU FMV_J182A { "FUJITSU", "LAN&spCard(FMV-J182)", "Ver.02", NULL } FUJITSU FMV-J182A PCMCIA Card +product FUJITSU ITCFJ182A { "FUJITSU", "LAN&spCard(ITCFJ182)", "Ver.01", NULL } FUJITSU ITCFJ182A CompactCard product GEMTEK WLAN { "Intersil", "PRISM&sp2_5&spPCMCIA&spADAPTER", "ISL37300P", "Eval-RevA" } GEMTEK Prism2_5 WaveLAN Card product ICOM SL200 { "Icom", "SL-200", NULL, NULL } Icom SL-200 product INTERSIL PRISM2 { "INTERSIL", "HFA384x/IEEE", "Version&sp01.02", NULL } Intersil Prism II product IODATA CBIDE2 { "IO&spDATA", "CBIDE2&sp&sp&sp&sp&sp&sp", NULL, NULL } IO-DATA CBIDE2/16-bit mode product IODATA PCLAT { "I-O&spDATA", "PCLA", "ETHERNET", NULL } IO-DATA PCLA/T +product LANTECH FASTNETTX { "ASIX", "AX88190", NULL, NULL } Lantech Fastnet/TX product LINKSYS ECARD_2 { "LINKSYS", "E-CARD", NULL, NULL } Linksys E-Card +product LINKSYS PCM100 { "Linksys", "EtherFast&sp10/100&spIntegrated&spPC&spCard&sp(PCM100)", "Ver&sp1.0", NULL } product MEGAHERTZ XJ2288 { "MEGAHERTZ", "MODEM&spXJ2288", NULL, NULL } Megahertz XJ2288 Modem product MELCO LPC2_TX { "MELCO", "LPC2-TX", NULL, NULL } Melco LPC2-TX product NAKAGAWAMETAL LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } NAKAGAWA METAL LNT-10TN NE2000 Compatible Card @@ -456,7 +474,3 @@ product XIRCOM CFE_10 { "Xircom", "CompactCard&spEthernet", "CFE-10", "1.00" } Xircom CompactCard CFE-10 product YEDATA EXTERNAL_FDD { "Y-E&spDATA", "External&spFDD", NULL, NULL } Y-E DATA External FDD product ZOOM AIR_4000 { "Zoom", "Air-4000", NULL, NULL } Zoom Air-4000 -product FUJITSU FMV_J181 { "PCMCIA&spMBH10302", "01", NULL, NULL } FUJITSU FMV-J181 PCMCIA Card -product FUJITSU FMV_J182 { "FUJITSU", "LAN&spCard(FMV-J182)", "Ver.01", NULL } FUJITSU FMV-J182 PCMCIA Card -product FUJITSU FMV_J182A { "FUJITSU", "LAN&spCard(FMV-J182)", "Ver.02", NULL } FUJITSU FMV-J182A PCMCIA Card -product FUJITSU ITCFJ182A { "FUJITSU", "LAN&spCard(ITCFJ182)", "Ver.01", NULL } FUJITSU ITCFJ182A CompactCard ==== //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#12 (text+ko) ==== @@ -1,13 +1,13 @@ -/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.28 2002/03/17 05:06:37 imp Exp $ */ +/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.30 2002/04/02 05:47:08 imp Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.28 2002/03/17 05:05:42 imp Exp + * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.30 2002/04/02 05:46:10 imp Exp */ -/* $NetBSD: pcmciadevs,v 1.159 2002/01/28 09:25:33 aymeric Exp $ */ -/* $OpenBSD: pcmciadevs,v 1.71 2001/10/28 19:21:37 mickey Exp $ */ +/* $NetBSD: pcmciadevs,v 1.163 2002/03/04 16:41:50 martin Exp $ */ +/* $OpenBSD: pcmciadevs,v 1.85 2002/03/29 18:54:07 millert Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -94,6 +94,7 @@ #define PCMCIA_VENDOR_BUFFALO 0x026f /* BUFFALO (Melco Corporation) */ #define PCMCIA_VENDOR_LINKSYS2 0x0274 /* The Linksys Group */ #define PCMCIA_VENDOR_IODATA2 0x028a /* I-O DATA */ +#define PCMCIA_VENDOR_NWN 0x0602 /* No Wires Needed */ #define PCMCIA_VENDOR_BREEZECOM 0x0a02 /* BreezeCOM */ #define PCMCIA_VENDOR_NEWMEDIA2 0x10cd /* NewMedia */ #define PCMCIA_VENDOR_LASAT 0x3401 /* Lasat Communications A/S */ @@ -386,6 +387,9 @@ #define PCMCIA_CIS_LINKSYS2_IWN { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_LINKSYS2_IWN 0x1612 #define PCMCIA_STR_LINKSYS2_IWN "Instant Wireless Network PC Card" >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 2 12:38:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E184737B417; Tue, 2 Apr 2002 12:35:41 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 842C137B420 for ; Tue, 2 Apr 2002 12:35:25 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g32KZPJ12224 for perforce@freebsd.org; Tue, 2 Apr 2002 12:35:25 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 2 Apr 2002 12:35:25 -0800 (PST) Message-Id: <200204022035.g32KZPJ12224@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8913 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8913 Change 8913 by jhb@jhb_laptop on 2002/04/02 12:35:11 Integ from jhb_lock: MI mutex_init() function for early mutex initialization. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#33 edit ... //depot/projects/smpng/sys/i386/i386/machdep.c#29 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#30 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#23 edit ... //depot/projects/smpng/sys/pc98/i386/machdep.c#24 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#19 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#21 integrate ... //depot/projects/smpng/sys/sys/mutex.h#22 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#33 (text+ko) ==== @@ -154,8 +154,6 @@ alpha_chipset_t chipset; struct bootinfo_kernel bootinfo; -struct mtx sched_lock; -struct mtx Giant; struct mtx icu_lock; struct user *proc0uarea; @@ -916,6 +914,7 @@ pcpu_init(pcpup, alpha_pal_whami(), sz); alpha_pal_wrval((u_int64_t) pcpup); PCPU_GET(next_asn) = 1; /* 0 used for proc0 pmap */ + PCPU_SET(curthread, &thread0); #ifdef SMP thread0.td_md.md_kernnest = 1; #endif @@ -945,20 +944,9 @@ thread0.td_frame = (struct trapframe *)thread0.td_pcb - 1; thread0.td_pcb->pcb_hw.apcb_ksp = (u_int64_t)thread0.td_frame; - /* Setup curthread so that mutexes work */ - PCPU_SET(curthread, &thread0); - - LIST_INIT(&thread0.td_contested); - - /* - * Initialise mutexes. - */ - mtx_init(&Giant, "Giant", MTX_DEF | MTX_RECURSE); - mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); - mtx_init(&proc0.p_mtx, "process lock", MTX_DEF|MTX_DUPOK); + mutex_init(); mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); mtx_init(&icu_lock, "icu", MTX_SPIN); - mtx_lock(&Giant); /* * Look at arguments passed to us and compute boothowto. ==== //depot/projects/smpng/sys/i386/i386/machdep.c#29 (text+ko) ==== @@ -210,8 +210,6 @@ static struct pcpu __pcpu; #endif -struct mtx sched_lock; -struct mtx Giant; struct mtx icu_lock; static void @@ -1693,12 +1691,8 @@ pcpu_init(pc, 0, sizeof(struct pcpu)); PCPU_SET(prvspace, pc); - - /* setup curproc so that mutexes work */ PCPU_SET(curthread, &thread0); - LIST_INIT(&thread0.td_contested); - /* * Initialize mutexes. * @@ -1707,12 +1701,9 @@ * must be able to get the icu lock, so it can't be * under witness. */ - mtx_init(&Giant, "Giant", MTX_DEF | MTX_RECURSE); - mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); - mtx_init(&proc0.p_mtx, "process lock", MTX_DEF|MTX_DUPOK); + mutex_init(); mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); mtx_init(&icu_lock, "icu", MTX_SPIN | MTX_NOWITNESS); - mtx_lock(&Giant); /* make ldt memory segments */ /* ==== //depot/projects/smpng/sys/ia64/ia64/machdep.c#30 (text+ko) ==== @@ -96,9 +96,6 @@ struct bootinfo bootinfo; int bootinfo_error; /* XXX temporary ad-hoc error mask to help debugging */ -struct mtx sched_lock; -struct mtx Giant; - extern char kstack[]; struct user *proc0uarea; vm_offset_t proc0kstack; @@ -688,6 +685,7 @@ pcpu_init(pcpup, 0, PAGE_SIZE); pcpup->pc_current_pmap = kernel_pmap; ia64_set_k4((u_int64_t) pcpup); + PCPU_SET(curthread, &thread0); /* * Initialize the rest of proc 0's PCB. @@ -702,21 +700,7 @@ thread0.td_pcb->pcb_sp = (u_int64_t)thread0.td_frame - 16; thread0.td_pcb->pcb_bspstore = (u_int64_t)proc0kstack; - /* Setup curproc so that mutexes work */ - PCPU_SET(curthread, &thread0); - - /* We pretend to own FP state so that ia64_fpstate_check() works */ - PCPU_SET(fpcurthread, &thread0); - - LIST_INIT(&thread0.td_contested); - - /* - * Initialise mutexes. - */ - mtx_init(&Giant, "Giant", MTX_DEF | MTX_RECURSE); - mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); - mtx_init(&proc0.p_mtx, "process lock", MTX_DEF|MTX_DUPOK); - mtx_lock(&Giant); + mutex_init(); /* * Initialize the virtual memory system. ==== //depot/projects/smpng/sys/kern/kern_mutex.c#23 (text+ko) ==== @@ -81,6 +81,12 @@ }; /* + * System-wide mutexes + */ +struct mtx sched_lock; +struct mtx Giant; + +/* * Prototypes for non-exported routines. */ static void propagate_priority(struct thread *); @@ -863,6 +869,27 @@ } /* + * Intialize the mutex code and system mutexes. This is called from the MD + * startup code prior to mi_startup(). The per-CPU data space needs to be + * setup before this is called. + */ +void +mutex_init(void) +{ + + /* Setup thread0 so that mutexes work. */ + LIST_INIT(&thread0.td_contested); + + /* + * Initialize mutexes. + */ + mtx_init(&Giant, "Giant", MTX_DEF | MTX_RECURSE); + mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); + mtx_init(&proc0.p_mtx, "process lock", MTX_DEF | MTX_DUPOK); + mtx_lock(&Giant); +} + +/* * Encapsulated Giant mutex routines. These routines provide encapsulation * control for the Giant mutex, allowing sysctls to be used to turn on and * off Giant around certain subsystems. The default value for the sysctls ==== //depot/projects/smpng/sys/pc98/i386/machdep.c#24 (text+ko) ==== @@ -1771,12 +1771,9 @@ * must be able to get the icu lock, so it can't be * under witness. */ - mtx_init(&Giant, "Giant", MTX_DEF | MTX_RECURSE); - mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); - mtx_init(&proc0.p_mtx, "process lock", MTX_DEF|MTX_DUPOK); + mutex_init(); mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); mtx_init(&icu_lock, "icu", MTX_SPIN | MTX_NOWITNESS); - mtx_lock(&Giant); /* make ldt memory segments */ /* ==== //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#19 (text+ko) ==== @@ -114,9 +114,6 @@ int physmem = 0; int cold = 1; -struct mtx sched_lock; -struct mtx Giant; - char pcpu0[PAGE_SIZE]; char uarea0[UAREA_PAGES * PAGE_SIZE]; struct trapframe frame0; @@ -373,7 +370,6 @@ proc0.p_uarea = (struct user *)uarea0; proc0.p_stats = &proc0.p_uarea->u_stats; thread0.td_frame = &frame0; - LIST_INIT(&thread0.td_contested); /* * Set up per-cpu data. @@ -387,13 +383,7 @@ __asm __volatile("mtsprg 0, %0" :: "r"(pc)); - /* - * Initialize mutexes. - */ - mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); - mtx_init(&Giant, "Giant", MTX_DEF | MTX_RECURSE); - mtx_init(&proc0.p_mtx, "process lock", MTX_DEF|MTX_DUPOK); - mtx_lock(&Giant); + mutex_init(); /* * Initialise virtual memory. @@ -514,24 +504,14 @@ init_param1(); init_param2(physmem); - /* setup curproc so the mutexes work */ - PCPU_SET(curthread, &thread0); - LIST_INIT(&thread0.td_contested); - /* XXX: NetBSDism I _think_. Not sure yet. */ #if 0 curpm = PCPU_GET(curpcb)->pcb_pmreal = PCPU_GET(curpcb)->pcb_pm = kernel_pmap; #endif - - /* - * Initialise some mutexes. - */ - mtx_init(&Giant, "Giant", MTX_DEF | MTX_RECURSE); - mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); - mtx_init(&proc0.p_mtx, "process lock", MTX_DEF); - mtx_lock(&Giant); + + mutex_init(); /* * Initialise console. ==== //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#21 (text+ko) ==== @@ -115,9 +115,6 @@ long dumplo; int Maxmem; -struct mtx Giant; -struct mtx sched_lock; - char pcpu0[PCPU_PAGES * PAGE_SIZE]; char uarea0[UAREA_PAGES * PAGE_SIZE]; struct trapframe frame0; @@ -294,7 +291,6 @@ (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; frame0.tf_tstate = TSTATE_IE | TSTATE_PEF; thread0.td_frame = &frame0; - LIST_INIT(&thread0.td_contested); /* * Prime our per-cpu data page for use. Note, we are using it for our @@ -323,15 +319,8 @@ pmap_kenter((vm_offset_t)msgbufp + off, msgbuf_phys + off); msgbufinit(msgbufp, MSGBUF_SIZE); - /* - * Initialize mutexes. - */ - mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); - mtx_init(&Giant, "Giant", MTX_DEF | MTX_RECURSE); - mtx_init(&proc0.p_mtx, "process lock", MTX_DEF|MTX_DUPOK); + mutex_init(); intr_init2(); - - mtx_lock(&Giant); } void ==== //depot/projects/smpng/sys/sys/mutex.h#22 (text+ko) ==== @@ -97,9 +97,10 @@ * [See below for descriptions] * */ -void mtx_sysinit(void *arg); void mtx_init(struct mtx *m, const char *description, int opts); void mtx_destroy(struct mtx *m); +void mtx_sysinit(void *arg); +void mutex_init(void); void _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line); void _mtx_unlock_sleep(struct mtx *m, int opts, const char *file, int line); void _mtx_lock_spin(struct mtx *m, int opts, const char *file, int line); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 2 12:42:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 450D437B41B; Tue, 2 Apr 2002 12:42:44 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3308337B444 for ; Tue, 2 Apr 2002 12:42:34 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g32KgYL13367 for perforce@freebsd.org; Tue, 2 Apr 2002 12:42:34 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 2 Apr 2002 12:42:34 -0800 (PST) Message-Id: <200204022042.g32KgYL13367@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8914 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8914 Change 8914 by jhb@jhb_laptop on 2002/04/02 12:42:02 Fix a merge-o. Affected files ... ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#31 integrate Differences ... ==== //depot/projects/smpng/sys/ia64/ia64/machdep.c#31 (text+ko) ==== @@ -687,6 +687,9 @@ ia64_set_k4((u_int64_t) pcpup); PCPU_SET(curthread, &thread0); + /* We pretend to own FP state so that ia64_fpstate_check() works */ + PCPU_SET(fpcurthread, &thread0); + /* * Initialize the rest of proc 0's PCB. * To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 2 12:48: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25A9A37B419; Tue, 2 Apr 2002 12:47:50 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 098B137B439 for ; Tue, 2 Apr 2002 12:47:42 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g32KlfK14950 for perforce@freebsd.org; Tue, 2 Apr 2002 12:47:41 -0800 (PST) (envelope-from des@freebsd.org) Date: Tue, 2 Apr 2002 12:47:41 -0800 (PST) Message-Id: <200204022047.g32KlfK14950@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 8918 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8918 Change 8918 by des@des.at.des.thinksec.com on 2002/04/02 12:47:12 Allocate the correct amount of memory for the environment list (forgot to multiply by sizeof(char *)). Submitted by: Takanori Saneto Affected files ... ... //depot/projects/openpam/lib/pam_putenv.c#7 edit Differences ... ==== //depot/projects/openpam/lib/pam_putenv.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/pam_putenv.c#6 $ + * $P4: //depot/projects/openpam/lib/pam_putenv.c#7 $ */ #include @@ -73,7 +73,8 @@ /* grow the environment list if necessary */ if (pamh->env_count == pamh->env_size) { - env = realloc(pamh->env, pamh->env_size * 2 + 1); + env = realloc(pamh->env, + sizeof(char *) * (pamh->env_size * 2 + 1)); if (env == NULL) return (PAM_BUF_ERR); pamh->env = env; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 2 12:48: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA47A37B427; Tue, 2 Apr 2002 12:47:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CF14237B435 for ; Tue, 2 Apr 2002 12:47:41 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g32KlfU14945 for perforce@freebsd.org; Tue, 2 Apr 2002 12:47:41 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Tue, 2 Apr 2002 12:47:41 -0800 (PST) Message-Id: <200204022047.g32KlfU14945@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8917 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8917 Change 8917 by jhb@jhb_laptop on 2002/04/02 12:46:48 Missed integrating a revision. Affected files ... ... //depot/projects/smpng/sys/pc98/i386/machdep.c#25 integrate Differences ... ==== //depot/projects/smpng/sys/pc98/i386/machdep.c#25 (text+ko) ==== @@ -223,8 +223,6 @@ static struct pcpu __pcpu; #endif -struct mtx sched_lock; -struct mtx Giant; struct mtx icu_lock; static void @@ -1757,12 +1755,8 @@ pcpu_init(pc, 0, sizeof(struct pcpu)); PCPU_SET(prvspace, pc); - - /* setup curproc so that mutexes work */ PCPU_SET(curthread, &thread0); - LIST_INIT(&thread0.td_contested); - /* * Initialize mutexes. * To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 2 16:33:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70D1537B41F; Tue, 2 Apr 2002 16:33:06 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AAE3537B41C for ; Tue, 2 Apr 2002 16:33:05 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g330X5D66867 for perforce@freebsd.org; Tue, 2 Apr 2002 16:33:05 -0800 (PST) (envelope-from jake@freebsd.org) Date: Tue, 2 Apr 2002 16:33:05 -0800 (PST) Message-Id: <200204030033.g330X5D66867@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 8938 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8938 Change 8938 by jake@jake_sparc64 on 2002/04/02 16:32:42 Integ this. Affected files ... ... //depot/projects/sparc64/sys/dev/isp/isp_freebsd.h#9 integrate ... //depot/projects/sparc64/sys/dev/isp/isp_pci.c#8 integrate ... //depot/projects/sparc64/sys/dev/isp/ispvar.h#10 integrate Differences ... ==== //depot/projects/sparc64/sys/dev/isp/isp_freebsd.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.59 2002/03/20 02:07:25 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.60 2002/04/02 23:36:14 mjacob Exp $ */ /* * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * Copyright (c) 1997, 1998, 1999, 2000, 2001 by Matthew Jacob ==== //depot/projects/sparc64/sys/dev/isp/isp_pci.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.78 2002/02/18 00:00:34 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.79 2002/04/02 23:36:14 mjacob Exp $ */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. * FreeBSD Version. ==== //depot/projects/sparc64/sys/dev/isp/ispvar.h#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.55 2002/03/21 21:10:16 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.56 2002/04/02 23:36:14 mjacob Exp $ */ /* * Soft Definitions for for Qlogic ISP SCSI adapters. * @@ -149,8 +149,12 @@ #define QENTRY_LEN 64 /* Both request and result queue length must be a power of two */ #define RQUEST_QUEUE_LEN(x) MAXISPREQUEST(x) +#ifdef ISP_TARGET_MODE +#define RESULT_QUEUE_LEN(x) MAXISPREQUEST(x) +#else #define RESULT_QUEUE_LEN(x) \ (((MAXISPREQUEST(x) >> 2) < 64)? 64 : MAXISPREQUEST(x) >> 2) +#endif #define ISP_QUEUE_ENTRY(q, idx) ((q) + ((idx) * QENTRY_LEN)) #define ISP_QUEUE_SIZE(n) ((n) * QENTRY_LEN) #define ISP_NXT_QENTRY(idx, qlen) (((idx) + 1) & ((qlen)-1)) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 2 21:19:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0522D37B405; Tue, 2 Apr 2002 21:18:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6C19F37B419 for ; Tue, 2 Apr 2002 21:18:28 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g335Hw030021 for perforce@freebsd.org; Tue, 2 Apr 2002 21:17:58 -0800 (PST) (envelope-from julian@freebsd.org) Date: Tue, 2 Apr 2002 21:17:58 -0800 (PST) Message-Id: <200204030517.g335Hw030021@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 8945 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8945 Change 8945 by julian@julian_ref on 2002/04/02 21:17:39 MFC Affected files ... ... //depot/projects/kse/bin/ps/lomac.c#4 integrate ... //depot/projects/kse/bin/ps/lomac.h#3 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#3 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.alpha#2 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.i386#2 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c#5 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/i386/tm.h#2 integrate ... //depot/projects/kse/lib/libkvm/kvm.c#5 integrate ... //depot/projects/kse/lib/libkvm/kvm.h#2 integrate ... //depot/projects/kse/lib/libkvm/kvm_file.c#4 integrate ... //depot/projects/kse/lib/libkvm/kvm_private.h#2 integrate ... //depot/projects/kse/lib/libkvm/kvm_proc.c#9 integrate ... //depot/projects/kse/lib/libkvm/kvm_sparc.c#3 integrate ... //depot/projects/kse/sys/alpha/alpha/api_up1000.c#2 integrate ... //depot/projects/kse/sys/alpha/alpha/autoconf.c#5 integrate ... //depot/projects/kse/sys/alpha/alpha/clock.c#3 integrate ... //depot/projects/kse/sys/alpha/alpha/cpuconf.c#2 integrate ... //depot/projects/kse/sys/alpha/alpha/critical.c#1 branch ... //depot/projects/kse/sys/alpha/alpha/db_disasm.c#2 integrate ... //depot/projects/kse/sys/alpha/alpha/db_interface.c#6 integrate ... //depot/projects/kse/sys/alpha/alpha/db_trace.c#5 integrate ... //depot/projects/kse/sys/alpha/alpha/dec_1000a.c#2 integrate ... //depot/projects/kse/sys/alpha/alpha/dec_2100_a50.c#2 integrate ... //depot/projects/kse/sys/alpha/alpha/dec_2100_a500.c#3 integrate ... //depot/projects/kse/sys/alpha/alpha/dec_axppci_33.c#2 integrate ... //depot/projects/kse/sys/alpha/alpha/dec_eb164.c#2 integrate ... //depot/projects/kse/sys/alpha/alpha/dec_eb64plus.c#2 integrate ... //depot/projects/kse/sys/alpha/alpha/dec_kn20aa.c#2 integrate ... //depot/projects/kse/sys/alpha/alpha/dec_kn300.c#3 integrate ... //depot/projects/kse/sys/alpha/alpha/dec_st550.c#2 integrate ... //depot/projects/kse/sys/alpha/alpha/dec_st6600.c#2 integrate ... //depot/projects/kse/sys/alpha/alpha/exception.s#6 integrate ... //depot/projects/kse/sys/alpha/alpha/genassym.c#14 integrate ... //depot/projects/kse/sys/alpha/alpha/interrupt.c#13 integrate ... //depot/projects/kse/sys/alpha/alpha/machdep.c#35 integrate ... //depot/projects/kse/sys/alpha/alpha/mp_machdep.c#13 integrate ... //depot/projects/kse/sys/alpha/alpha/pmap.c#25 integrate ... //depot/projects/kse/sys/alpha/alpha/prom.c#9 integrate ... //depot/projects/kse/sys/alpha/alpha/promcons.c#6 integrate ... //depot/projects/kse/sys/alpha/alpha/sys_machdep.c#10 integrate ... //depot/projects/kse/sys/alpha/alpha/trap.c#20 integrate ... //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#20 integrate ... //depot/projects/kse/sys/alpha/conf/GENERIC#9 integrate ... //depot/projects/kse/sys/alpha/include/ansi.h#8 integrate ... //depot/projects/kse/sys/alpha/include/asm.h#3 integrate ... //depot/projects/kse/sys/alpha/include/bootinfo.h#2 integrate ... //depot/projects/kse/sys/alpha/include/clock.h#2 integrate ... //depot/projects/kse/sys/alpha/include/cpu.h#6 integrate ... //depot/projects/kse/sys/alpha/include/cpuconf.h#2 integrate ... //depot/projects/kse/sys/alpha/include/cpufunc.h#3 integrate ... //depot/projects/kse/sys/alpha/include/critical.h#1 branch ... //depot/projects/kse/sys/alpha/include/db_machdep.h#3 integrate ... //depot/projects/kse/sys/alpha/include/float.h#2 integrate ... //depot/projects/kse/sys/alpha/include/md_var.h#6 integrate ... //depot/projects/kse/sys/alpha/include/pmap.h#10 integrate ... //depot/projects/kse/sys/alpha/include/proc.h#5 integrate ... //depot/projects/kse/sys/alpha/include/profile.h#2 integrate ... //depot/projects/kse/sys/alpha/include/prom.h#3 integrate ... //depot/projects/kse/sys/alpha/include/ptrace.h#8 integrate ... //depot/projects/kse/sys/alpha/include/reg.h#5 integrate ... //depot/projects/kse/sys/alpha/include/sysarch.h#2 integrate ... //depot/projects/kse/sys/alpha/linux/linux_proto.h#8 integrate ... //depot/projects/kse/sys/alpha/linux/linux_sysvec.c#5 integrate ... //depot/projects/kse/sys/alpha/mcbus/mcbus.c#2 integrate ... //depot/projects/kse/sys/alpha/mcbus/mcbusvar.h#2 integrate ... //depot/projects/kse/sys/alpha/mcbus/mcpcia.c#6 integrate ... //depot/projects/kse/sys/alpha/mcbus/mcpciavar.h#2 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_ioctl.c#5 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_misc.c#9 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_mount.c#4 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_proto.h#3 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_signal.c#5 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_signal.h#2 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_sysvec.c#2 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_util.h#3 integrate ... //depot/projects/kse/sys/alpha/pci/cia.c#5 integrate ... //depot/projects/kse/sys/alpha/pci/t2.c#5 integrate ... //depot/projects/kse/sys/alpha/pci/t2_pci.c#5 integrate ... //depot/projects/kse/sys/alpha/pci/tsunami.c#4 integrate ... //depot/projects/kse/sys/alpha/tc/am7990.c#3 integrate ... //depot/projects/kse/sys/alpha/tc/am7990var.h#2 integrate ... //depot/projects/kse/sys/alpha/tc/ascvar.h#2 integrate ... //depot/projects/kse/sys/alpha/tc/esp.c#2 integrate ... //depot/projects/kse/sys/alpha/tc/if_le_dec.c#2 integrate ... //depot/projects/kse/sys/alpha/tc/if_le_ioasic.c#2 integrate ... //depot/projects/kse/sys/alpha/tc/if_levar.h#2 integrate ... //depot/projects/kse/sys/alpha/tc/ioasic.c#2 integrate ... //depot/projects/kse/sys/alpha/tc/ioasicvar.h#2 integrate ... //depot/projects/kse/sys/alpha/tc/sticvar.h#2 integrate ... //depot/projects/kse/sys/alpha/tc/tc.c#2 integrate ... //depot/projects/kse/sys/alpha/tc/tcds.c#2 integrate ... //depot/projects/kse/sys/alpha/tc/tcdsreg.h#2 integrate ... //depot/projects/kse/sys/alpha/tc/tcdsvar.h#2 integrate ... //depot/projects/kse/sys/alpha/tc/tcvar.h#2 integrate ... //depot/projects/kse/sys/alpha/tlsb/zs_tlsb.c#6 integrate ... //depot/projects/kse/sys/arm/include/ansi.h#6 integrate ... //depot/projects/kse/sys/arm/include/types.h#2 integrate ... //depot/projects/kse/sys/boot/Makefile#4 integrate ... //depot/projects/kse/sys/boot/common/Makefile.inc#2 integrate ... //depot/projects/kse/sys/boot/common/isapnp.h#2 integrate ... //depot/projects/kse/sys/boot/common/loader.8#10 integrate ... //depot/projects/kse/sys/boot/efi/Makefile.inc#2 integrate ... //depot/projects/kse/sys/boot/efi/include/efiapi.h#3 integrate ... //depot/projects/kse/sys/boot/efi/libefi/arch/ia64/start.S#3 integrate ... //depot/projects/kse/sys/boot/efi/libefi/efifs.c#4 integrate ... //depot/projects/kse/sys/boot/efi/libefi/efinet.c#2 integrate ... //depot/projects/kse/sys/boot/efi/libefi/elf_freebsd.c#5 integrate ... //depot/projects/kse/sys/boot/efi/loader/Makefile#5 integrate ... //depot/projects/kse/sys/boot/efi/loader/conf.c#5 integrate ... //depot/projects/kse/sys/boot/efi/loader/main.c#5 integrate ... //depot/projects/kse/sys/boot/efi/loader/version#2 integrate ... //depot/projects/kse/sys/boot/i386/boot2/boot2.c#7 integrate ... //depot/projects/kse/sys/boot/i386/loader/Makefile#6 integrate ... //depot/projects/kse/sys/boot/i386/loader/conf.c#4 integrate ... //depot/projects/kse/sys/boot/ia64/libski/Makefile#3 integrate ... //depot/projects/kse/sys/boot/ia64/libski/elf_freebsd.c#5 integrate ... //depot/projects/kse/sys/boot/ia64/skiload/Makefile#3 integrate ... //depot/projects/kse/sys/boot/ia64/skiload/version#2 integrate ... //depot/projects/kse/sys/boot/pc98/loader/Makefile#4 integrate ... //depot/projects/kse/sys/boot/sparc64/Makefile#1 branch ... //depot/projects/kse/sys/boot/sparc64/boot1/Makefile#2 integrate ... //depot/projects/kse/sys/boot/sparc64/boot1/_start.S#1 branch ... //depot/projects/kse/sys/boot/sparc64/bootblock/Makefile#2 delete ... //depot/projects/kse/sys/boot/sparc64/bootblock/bootblock.c#4 delete ... //depot/projects/kse/sys/boot/sparc64/loader/Makefile#5 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/help.sparc64#1 branch ... //depot/projects/kse/sys/boot/sparc64/loader/locore.S#1 branch ... //depot/projects/kse/sys/boot/sparc64/loader/locore.s#4 delete ... //depot/projects/kse/sys/boot/sparc64/loader/main.c#5 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/metadata.c#3 integrate ... //depot/projects/kse/sys/cam/cam_xpt.c#7 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_all.c#7 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_da.c#18 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_low.c#5 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_low.h#2 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_low_pisa.h#2 integrate ... //depot/projects/kse/sys/coda/coda_fbsd.c#3 integrate ... //depot/projects/kse/sys/coda/coda_vfsops.c#8 integrate ... //depot/projects/kse/sys/coda/coda_vnops.c#8 integrate ... //depot/projects/kse/sys/coda/coda_vnops.h#5 integrate ... //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#13 integrate ... //depot/projects/kse/sys/compat/linux/linux_getcwd.c#6 integrate ... //depot/projects/kse/sys/compat/linux/linux_ipc.h#5 integrate ... //depot/projects/kse/sys/compat/linux/linux_mib.h#4 integrate ... //depot/projects/kse/sys/compat/linux/linux_misc.c#14 integrate ... //depot/projects/kse/sys/compat/linux/linux_signal.h#5 integrate ... //depot/projects/kse/sys/compat/linux/linux_uid16.c#6 integrate ... //depot/projects/kse/sys/compat/linux/linux_util.h#7 integrate ... //depot/projects/kse/sys/compat/pecoff/imgact_pecoff.c#9 integrate ... //depot/projects/kse/sys/compat/svr4/imgact_svr4.c#4 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_exec.h#4 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_fcntl.c#8 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_ioctl.c#5 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_ioctl.h#4 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_ipc.c#3 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_misc.c#11 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_proto.h#5 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_resource.c#5 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_signal.c#4 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_signal.h#3 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_socket.h#4 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_sockio.c#4 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_stat.c#5 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_stream.c#8 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_stropts.h#3 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_termios.c#4 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_ttold.c#4 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_util.h#4 integrate ... //depot/projects/kse/sys/conf/Makefile.ia64#13 integrate ... //depot/projects/kse/sys/conf/Makefile.powerpc#11 integrate ... //depot/projects/kse/sys/conf/Makefile.sparc64#13 integrate ... //depot/projects/kse/sys/conf/NOTES#1 branch ... //depot/projects/kse/sys/conf/files#29 integrate ... //depot/projects/kse/sys/conf/files.alpha#12 integrate ... //depot/projects/kse/sys/conf/files.i386#20 integrate ... //depot/projects/kse/sys/conf/files.ia64#10 integrate ... //depot/projects/kse/sys/conf/files.pc98#21 integrate ... //depot/projects/kse/sys/conf/files.powerpc#4 integrate ... //depot/projects/kse/sys/conf/files.sparc64#13 integrate ... //depot/projects/kse/sys/conf/kern.post.mk#7 integrate ... //depot/projects/kse/sys/conf/kern.pre.mk#9 integrate ... //depot/projects/kse/sys/conf/kmod.mk#8 integrate ... //depot/projects/kse/sys/conf/kmod_syms.awk#2 integrate ... //depot/projects/kse/sys/conf/options#12 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/acconfig.h#8 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/acdebug.h#6 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/acdos16.h#1 branch ... //depot/projects/kse/sys/contrib/dev/acpica/acefi.h#3 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/acenv.h#4 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/acevents.h#5 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/acgcc.h#7 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/acpiosxf.h#5 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/actypes.h#8 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/acutils.h#8 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/dbexec.c#5 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/dbinput.c#6 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/dswload.c#8 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/evevent.c#8 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/evmisc.c#8 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/evrgnini.c#8 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/evsci.c#4 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/exprep.c#7 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/exregion.c#8 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/exresnte.c#7 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/nssearch.c#7 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/utdebug.c#8 integrate ... //depot/projects/kse/sys/contrib/dev/fla/fla.c#4 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/fil.c#4 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_fil.c#6 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_fil.h#4 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#1 branch ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_nat.c#5 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#1 branch ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ipl.h#2 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate ... //depot/projects/kse/sys/crypto/blowfish/blowfish.h#3 integrate ... //depot/projects/kse/sys/crypto/cast128/cast128.h#3 integrate ... //depot/projects/kse/sys/crypto/des/des.h#3 integrate ... //depot/projects/kse/sys/crypto/md5.c#2 integrate ... //depot/projects/kse/sys/crypto/md5.h#2 integrate ... //depot/projects/kse/sys/crypto/sha1.c#2 integrate ... //depot/projects/kse/sys/crypto/sha1.h#2 integrate ... //depot/projects/kse/sys/crypto/sha2/sha2.h#2 integrate ... //depot/projects/kse/sys/ddb/db_access.h#2 integrate ... //depot/projects/kse/sys/ddb/db_break.c#3 integrate ... //depot/projects/kse/sys/ddb/db_break.h#3 integrate ... //depot/projects/kse/sys/ddb/db_command.c#5 integrate ... //depot/projects/kse/sys/ddb/db_command.h#2 integrate ... //depot/projects/kse/sys/ddb/db_examine.c#2 integrate ... //depot/projects/kse/sys/ddb/db_expr.c#2 integrate ... //depot/projects/kse/sys/ddb/db_input.c#4 integrate ... //depot/projects/kse/sys/ddb/db_lex.c#3 integrate ... //depot/projects/kse/sys/ddb/db_lex.h#2 integrate ... //depot/projects/kse/sys/ddb/db_output.c#2 integrate ... //depot/projects/kse/sys/ddb/db_output.h#2 integrate ... //depot/projects/kse/sys/ddb/db_run.c#4 integrate ... //depot/projects/kse/sys/ddb/db_sym.c#2 integrate ... //depot/projects/kse/sys/ddb/db_sym.h#2 integrate ... //depot/projects/kse/sys/ddb/db_variables.c#2 integrate ... //depot/projects/kse/sys/ddb/db_variables.h#2 integrate ... //depot/projects/kse/sys/ddb/db_watch.c#2 integrate ... //depot/projects/kse/sys/ddb/ddb.h#2 integrate ... //depot/projects/kse/sys/dev/aac/aac_disk.c#12 integrate ... //depot/projects/kse/sys/dev/aac/aac_pci.c#11 integrate ... //depot/projects/kse/sys/dev/acpica/Osd/OsdHardware.c#4 integrate ... //depot/projects/kse/sys/dev/acpica/Osd/OsdMemory.c#5 integrate ... //depot/projects/kse/sys/dev/acpica/acpi_pcib.c#7 integrate ... //depot/projects/kse/sys/dev/acpica/acpi_timer.c#6 integrate ... //depot/projects/kse/sys/dev/acpica/acpivar.h#13 integrate ... //depot/projects/kse/sys/dev/aic/aic.c#3 integrate ... //depot/projects/kse/sys/dev/aic/aic6360reg.h#2 integrate ... //depot/projects/kse/sys/dev/aic/aic_cbus.c#2 integrate ... //depot/projects/kse/sys/dev/aic/aic_isa.c#2 integrate ... //depot/projects/kse/sys/dev/aic/aicvar.h#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate ... //depot/projects/kse/sys/dev/amr/amr.c#6 integrate ... //depot/projects/kse/sys/dev/an/if_an.c#12 integrate ... //depot/projects/kse/sys/dev/an/if_an_isa.c#3 integrate ... //depot/projects/kse/sys/dev/an/if_an_pci.c#5 integrate ... //depot/projects/kse/sys/dev/an/if_anreg.h#4 integrate ... //depot/projects/kse/sys/dev/asr/asr.c#8 integrate ... //depot/projects/kse/sys/dev/ata/ata-all.c#16 integrate ... //depot/projects/kse/sys/dev/ata/ata-disk.c#17 integrate ... //depot/projects/kse/sys/dev/ata/ata-dma.c#18 integrate ... //depot/projects/kse/sys/dev/ata/ata-pci.c#19 integrate ... //depot/projects/kse/sys/dev/ata/ata-raid.c#12 integrate ... //depot/projects/kse/sys/dev/ata/ata-raid.h#7 integrate ... //depot/projects/kse/sys/dev/ata/atapi-all.c#9 integrate ... //depot/projects/kse/sys/dev/ata/atapi-cd.c#14 integrate ... //depot/projects/kse/sys/dev/ata/atapi-cd.h#5 integrate ... //depot/projects/kse/sys/dev/ata/atapi-fd.c#7 integrate ... //depot/projects/kse/sys/dev/ata/atapi-tape.c#10 integrate ... //depot/projects/kse/sys/dev/awi/am79c930.c#2 integrate ... //depot/projects/kse/sys/dev/awi/am79c930var.h#2 integrate ... //depot/projects/kse/sys/dev/awi/awi.c#4 integrate ... //depot/projects/kse/sys/dev/awi/awi_wep.c#4 integrate ... //depot/projects/kse/sys/dev/awi/awi_wicfg.c#4 integrate ... //depot/projects/kse/sys/dev/awi/awivar.h#2 integrate ... //depot/projects/kse/sys/dev/bge/if_bge.c#7 integrate ... //depot/projects/kse/sys/dev/bge/if_bgereg.h#3 integrate ... //depot/projects/kse/sys/dev/bktr/bktr_core.c#4 integrate ... //depot/projects/kse/sys/dev/bktr/bktr_i2c.c#2 integrate ... //depot/projects/kse/sys/dev/bktr/bktr_i2c.h#2 integrate ... //depot/projects/kse/sys/dev/bktr/bktr_os.c#6 integrate ... //depot/projects/kse/sys/dev/bktr/bktr_reg.h#2 integrate ... //depot/projects/kse/sys/dev/cardbus/cardbus.c#7 integrate ... //depot/projects/kse/sys/dev/cardbus/cardbus_cis.c#5 integrate ... //depot/projects/kse/sys/dev/ccd/ccd.c#10 integrate ... //depot/projects/kse/sys/dev/cm/if_cm_isa.c#2 integrate ... //depot/projects/kse/sys/dev/cm/smc90cx6.c#2 integrate ... //depot/projects/kse/sys/dev/cm/smc90cx6var.h#2 integrate ... //depot/projects/kse/sys/dev/cnw/if_cnw.c#3 integrate ... //depot/projects/kse/sys/dev/ct/bshw_machdep.c#2 integrate ... //depot/projects/kse/sys/dev/ct/bshwvar.h#2 integrate ... //depot/projects/kse/sys/dev/ct/ct.c#2 integrate ... //depot/projects/kse/sys/dev/ct/ct_isa.c#3 integrate ... //depot/projects/kse/sys/dev/ct/ct_machdep.h#2 integrate ... //depot/projects/kse/sys/dev/ct/ctvar.h#2 integrate ... //depot/projects/kse/sys/dev/dgb/dgb.c#6 integrate ... //depot/projects/kse/sys/dev/digi/digi.c#10 integrate ... //depot/projects/kse/sys/dev/ed/if_ed.c#5 integrate ... //depot/projects/kse/sys/dev/ed/if_ed_cbus.c#2 integrate ... //depot/projects/kse/sys/dev/ed/if_ed_isa.c#2 integrate ... //depot/projects/kse/sys/dev/ed/if_ed_pccard.c#5 integrate ... //depot/projects/kse/sys/dev/ed/if_ed_pci.c#2 integrate ... //depot/projects/kse/sys/dev/ed/if_edvar.h#3 integrate ... //depot/projects/kse/sys/dev/eisa/eisaconf.h#2 integrate ... //depot/projects/kse/sys/dev/em/if_em.c#3 integrate ... //depot/projects/kse/sys/dev/en/midway.c#2 integrate ... //depot/projects/kse/sys/dev/en/midwayvar.h#2 integrate ... //depot/projects/kse/sys/dev/ep/if_ep.c#3 integrate ... //depot/projects/kse/sys/dev/ep/if_ep_eisa.c#2 integrate ... //depot/projects/kse/sys/dev/ex/if_ex.c#2 integrate ... //depot/projects/kse/sys/dev/ex/if_ex_isa.c#2 integrate ... //depot/projects/kse/sys/dev/ex/if_ex_pccard.c#2 integrate ... //depot/projects/kse/sys/dev/gem/if_gem.c#2 integrate ... //depot/projects/kse/sys/dev/gem/if_gem_pci.c#3 integrate ... //depot/projects/kse/sys/dev/gem/if_gemvar.h#2 integrate ... //depot/projects/kse/sys/dev/hea/eni.c#3 integrate ... //depot/projects/kse/sys/dev/hea/eni_buffer.c#3 integrate ... //depot/projects/kse/sys/dev/hea/eni_if.c#2 integrate ... //depot/projects/kse/sys/dev/hea/eni_intr.c#2 integrate ... //depot/projects/kse/sys/dev/hea/eni_receive.c#2 integrate ... //depot/projects/kse/sys/dev/hea/eni_var.h#2 integrate ... //depot/projects/kse/sys/dev/hfa/fore_buffer.c#2 integrate ... //depot/projects/kse/sys/dev/hfa/fore_include.h#2 integrate ... //depot/projects/kse/sys/dev/hfa/fore_init.c#2 integrate ... //depot/projects/kse/sys/dev/hfa/fore_load.c#3 integrate ... //depot/projects/kse/sys/dev/hfa/fore_output.c#2 integrate ... //depot/projects/kse/sys/dev/hfa/fore_receive.c#2 integrate ... //depot/projects/kse/sys/dev/hme/if_hme.c#3 integrate ... //depot/projects/kse/sys/dev/hme/if_hme_pci.c#3 integrate ... //depot/projects/kse/sys/dev/hme/if_hme_sbus.c#2 integrate ... //depot/projects/kse/sys/dev/hme/if_hmevar.h#2 integrate ... //depot/projects/kse/sys/dev/ida/ida.c#2 integrate ... //depot/projects/kse/sys/dev/ida/ida_disk.c#5 integrate ... //depot/projects/kse/sys/dev/iicbus/if_ic.c#3 integrate ... //depot/projects/kse/sys/dev/iicbus/iic.c#5 integrate ... //depot/projects/kse/sys/dev/iicbus/iicbb.c#2 integrate ... //depot/projects/kse/sys/dev/iicbus/iicbb_if.m#2 integrate ... //depot/projects/kse/sys/dev/iicbus/iicbus.c#3 integrate ... //depot/projects/kse/sys/dev/iicbus/iiconf.c#2 integrate ... //depot/projects/kse/sys/dev/iicbus/iiconf.h#2 integrate ... //depot/projects/kse/sys/dev/iicbus/iicsmb.c#3 integrate ... //depot/projects/kse/sys/dev/iir/iir.h#3 integrate ... //depot/projects/kse/sys/dev/iir/iir_pci.c#2 integrate ... //depot/projects/kse/sys/dev/isp/isp.c#17 integrate ... //depot/projects/kse/sys/dev/isp/isp_freebsd.h#8 integrate ... //depot/projects/kse/sys/dev/isp/isp_pci.c#9 integrate ... //depot/projects/kse/sys/dev/isp/isp_target.h#5 integrate ... //depot/projects/kse/sys/dev/isp/ispvar.h#10 integrate ... //depot/projects/kse/sys/dev/ispfw/ispfw.c#3 integrate ... //depot/projects/kse/sys/dev/kbd/atkbdc.c#2 integrate ... //depot/projects/kse/sys/dev/kbd/kbd.c#4 integrate ... //depot/projects/kse/sys/dev/lge/if_lge.c#3 integrate ... //depot/projects/kse/sys/dev/lnc/if_lnc.c#3 integrate ... //depot/projects/kse/sys/dev/lnc/if_lncvar.h#2 integrate ... //depot/projects/kse/sys/dev/md/md.c#16 integrate ... //depot/projects/kse/sys/dev/mii/acphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/amphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/brgphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/dcphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/exphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/lxtphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/mii.c#4 integrate ... //depot/projects/kse/sys/dev/mii/mii_physubr.c#3 integrate ... //depot/projects/kse/sys/dev/mii/miidevs#4 integrate ... //depot/projects/kse/sys/dev/mii/miidevs.h#4 integrate ... //depot/projects/kse/sys/dev/mii/miivar.h#3 integrate ... //depot/projects/kse/sys/dev/mii/mlphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/nsgphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/nsphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/pnaphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/pnphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/qsphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/rlphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/tdkphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/tlphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/ukphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/xmphy.c#3 integrate ... //depot/projects/kse/sys/dev/mlx/mlx.c#6 integrate ... //depot/projects/kse/sys/dev/ncv/ncr53c500.c#4 integrate ... //depot/projects/kse/sys/dev/ncv/ncr53c500_pccard.c#5 integrate ... //depot/projects/kse/sys/dev/ncv/ncr53c500var.h#3 integrate ... //depot/projects/kse/sys/dev/nge/if_nge.c#6 integrate ... //depot/projects/kse/sys/dev/nmdm/nmdm.c#8 integrate ... //depot/projects/kse/sys/dev/nsp/nsp.c#4 integrate ... //depot/projects/kse/sys/dev/nsp/nsp_pccard.c#6 integrate ... //depot/projects/kse/sys/dev/nsp/nspvar.h#3 integrate ... //depot/projects/kse/sys/dev/null/null.c#2 integrate ... //depot/projects/kse/sys/dev/ofw/ofw_console.c#7 integrate ... //depot/projects/kse/sys/dev/pccard/pccard_cis.c#8 integrate ... //depot/projects/kse/sys/dev/pccard/pccarddevs#9 integrate ... //depot/projects/kse/sys/dev/pccard/pccarddevs.h#9 integrate ... //depot/projects/kse/sys/dev/pdq/if_fea.c#2 integrate ... //depot/projects/kse/sys/dev/pdq/if_fpa.c#2 integrate ... //depot/projects/kse/sys/dev/pdq/pdq.c#2 integrate ... //depot/projects/kse/sys/dev/pdq/pdq_freebsd.h#1 branch ... //depot/projects/kse/sys/dev/pdq/pdq_ifsubr.c#4 integrate ... //depot/projects/kse/sys/dev/pdq/pdqreg.h#2 integrate ... //depot/projects/kse/sys/dev/pdq/pdqvar.h#2 integrate ... //depot/projects/kse/sys/dev/ppbus/lpbb.c#2 integrate ... //depot/projects/kse/sys/dev/ppbus/ppb_msq.c#3 integrate ... //depot/projects/kse/sys/dev/puc/puc.c#4 integrate ... //depot/projects/kse/sys/dev/puc/pucdata.c#3 integrate ... //depot/projects/kse/sys/dev/random/randomdev.c#7 integrate ... //depot/projects/kse/sys/dev/rp/rp.c#6 integrate ... //depot/projects/kse/sys/dev/sbni/if_sbni.c#3 integrate ... //depot/projects/kse/sys/dev/si/si.c#4 integrate ... //depot/projects/kse/sys/dev/sio/sio.c#12 integrate ... //depot/projects/kse/sys/dev/sio/sio_isa.c#7 integrate ... //depot/projects/kse/sys/dev/sio/sio_pccard.c#4 integrate ... //depot/projects/kse/sys/dev/sio/sio_pci.c#5 integrate ... //depot/projects/kse/sys/dev/sio/sio_puc.c#3 integrate ... //depot/projects/kse/sys/dev/sio/siovar.h#4 integrate ... //depot/projects/kse/sys/dev/smbus/smb.c#4 integrate ... //depot/projects/kse/sys/dev/smbus/smbconf.c#2 integrate ... //depot/projects/kse/sys/dev/smbus/smbconf.h#2 integrate ... //depot/projects/kse/sys/dev/smbus/smbus.c#3 integrate ... //depot/projects/kse/sys/dev/snc/dp83932.c#2 integrate ... //depot/projects/kse/sys/dev/snc/dp83932subr.c#2 integrate ... //depot/projects/kse/sys/dev/snc/dp83932subr.h#2 integrate ... //depot/projects/kse/sys/dev/snc/dp83932var.h#2 integrate ... //depot/projects/kse/sys/dev/snc/if_snc_cbus.c#2 integrate ... //depot/projects/kse/sys/dev/snc/if_sncvar.h#2 integrate ... //depot/projects/kse/sys/dev/snp/snp.c#7 integrate ... //depot/projects/kse/sys/dev/sound/midi/midi.h#5 integrate ... //depot/projects/kse/sys/dev/sound/midi/midibuf.c#4 integrate ... //depot/projects/kse/sys/dev/sound/pcm/channel.c#16 integrate ... //depot/projects/kse/sys/dev/stg/tmc18c30.c#4 integrate ... //depot/projects/kse/sys/dev/stg/tmc18c30_isa.c#3 integrate ... //depot/projects/kse/sys/dev/stg/tmc18c30_pccard.c#6 integrate ... //depot/projects/kse/sys/dev/stg/tmc18c30var.h#3 integrate ... //depot/projects/kse/sys/dev/streams/streams.c#11 integrate ... //depot/projects/kse/sys/dev/sym/sym_hipd.c#4 integrate ... //depot/projects/kse/sys/dev/syscons/apm/apm_saver.c#2 integrate ... //depot/projects/kse/sys/dev/syscons/dragon/dragon_saver.c#1 branch ... //depot/projects/kse/sys/dev/syscons/fire/fire_saver.c#2 integrate ... //depot/projects/kse/sys/dev/syscons/logo/logo_saver.c#3 integrate ... //depot/projects/kse/sys/dev/syscons/rain/rain_saver.c#3 integrate ... //depot/projects/kse/sys/dev/syscons/syscons.c#11 integrate ... //depot/projects/kse/sys/dev/syscons/sysmouse.c#4 integrate ... //depot/projects/kse/sys/dev/syscons/warp/warp_saver.c#3 integrate ... //depot/projects/kse/sys/dev/twe/twe_freebsd.c#6 integrate ... //depot/projects/kse/sys/dev/txp/if_txp.c#5 integrate ... //depot/projects/kse/sys/dev/usb/devlist2h.awk#2 integrate ... //depot/projects/kse/sys/dev/usb/hid.h#2 integrate ... //depot/projects/kse/sys/dev/usb/if_aue.c#8 integrate ... //depot/projects/kse/sys/dev/usb/if_cue.c#3 integrate ... //depot/projects/kse/sys/dev/usb/if_kue.c#3 integrate ... //depot/projects/kse/sys/dev/usb/ohci.c#13 integrate ... //depot/projects/kse/sys/dev/usb/ohcireg.h#3 integrate ... //depot/projects/kse/sys/dev/usb/ohcivar.h#3 integrate ... //depot/projects/kse/sys/dev/usb/ucom.c#1 branch ... //depot/projects/kse/sys/dev/usb/ucomvar.h#1 branch ... //depot/projects/kse/sys/dev/usb/uhci.c#15 integrate ... //depot/projects/kse/sys/dev/usb/uhcivar.h#4 integrate ... //depot/projects/kse/sys/dev/usb/uhid.c#10 integrate ... //depot/projects/kse/sys/dev/usb/uhub.c#8 integrate ... //depot/projects/kse/sys/dev/usb/ukbd.c#5 integrate ... //depot/projects/kse/sys/dev/usb/umass.c#10 integrate ... //depot/projects/kse/sys/dev/usb/umodem.c#8 integrate ... //depot/projects/kse/sys/dev/usb/ums.c#8 integrate ... //depot/projects/kse/sys/dev/usb/uplcom.c#1 branch ... //depot/projects/kse/sys/dev/usb/urio.c#9 integrate ... //depot/projects/kse/sys/dev/usb/usb.c#13 integrate ... //depot/projects/kse/sys/dev/usb/usb_ethersubr.c#2 integrate ... //depot/projects/kse/sys/dev/usb/usb_ethersubr.h#2 integrate ... //depot/projects/kse/sys/dev/usb/usb_port.h#8 integrate ... //depot/projects/kse/sys/dev/usb/usb_subr.c#6 integrate ... //depot/projects/kse/sys/dev/usb/usbdevs#15 integrate ... //depot/projects/kse/sys/dev/usb/usbdevs.h#15 integrate ... //depot/projects/kse/sys/dev/usb/usbdevs_data.h#15 integrate ... //depot/projects/kse/sys/dev/usb/usbdi.c#6 integrate ... //depot/projects/kse/sys/dev/usb/usbdi.h#4 integrate ... //depot/projects/kse/sys/dev/usb/usbdi_util.c#2 integrate ... //depot/projects/kse/sys/dev/usb/usbdi_util.h#2 integrate ... //depot/projects/kse/sys/dev/usb/usbdivar.h#4 integrate ... //depot/projects/kse/sys/dev/usb/uvscom.c#1 branch ... //depot/projects/kse/sys/dev/vinum/vinum.c#5 integrate ... //depot/projects/kse/sys/dev/vinum/vinumdaemon.c#2 integrate ... //depot/projects/kse/sys/dev/vinum/vinumext.h#4 integrate ... //depot/projects/kse/sys/dev/vinum/vinuminterrupt.c#2 integrate ... //depot/projects/kse/sys/dev/vinum/vinumio.c#4 integrate ... //depot/projects/kse/sys/dev/vinum/vinumioctl.c#7 integrate ... //depot/projects/kse/sys/dev/vinum/vinumobj.h#2 integrate ... //depot/projects/kse/sys/dev/vinum/vinumrequest.c#4 integrate ... //depot/projects/kse/sys/dev/vinum/vinumrevive.c#3 integrate ... //depot/projects/kse/sys/dev/vx/if_vx.c#3 integrate ... //depot/projects/kse/sys/dev/vx/if_vx_eisa.c#2 integrate ... //depot/projects/kse/sys/dev/vx/if_vxreg.h#2 integrate ... //depot/projects/kse/sys/dev/wi/if_wavelan_ieee.h#2 integrate ... //depot/projects/kse/sys/dev/wi/if_wi.c#19 integrate ... //depot/projects/kse/sys/dev/wi/if_wi_pccard.c#1 branch ... //depot/projects/kse/sys/dev/wi/if_wi_pci.c#1 branch ... //depot/projects/kse/sys/dev/wi/if_wireg.h#7 integrate ... //depot/projects/kse/sys/dev/wi/if_wivar.h#1 branch ... //depot/projects/kse/sys/dev/wl/if_wl.c#5 integrate ... //depot/projects/kse/sys/fs/deadfs/dead_vnops.c#2 integrate ... //depot/projects/kse/sys/fs/devfs/devfs_vfsops.c#5 integrate ... //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#9 integrate ... //depot/projects/kse/sys/fs/fdescfs/fdesc.h#4 integrate ... //depot/projects/kse/sys/fs/fdescfs/fdesc_vfsops.c#6 integrate ... //depot/projects/kse/sys/fs/fdescfs/fdesc_vnops.c#7 integrate ... //depot/projects/kse/sys/fs/fifofs/fifo.h#2 integrate ... //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#9 integrate ... //depot/projects/kse/sys/fs/hpfs/hpfs.h#6 integrate ... //depot/projects/kse/sys/fs/hpfs/hpfs_hash.c#6 integrate ... //depot/projects/kse/sys/fs/hpfs/hpfs_subr.c#2 integrate ... //depot/projects/kse/sys/fs/hpfs/hpfs_vfsops.c#8 integrate ... //depot/projects/kse/sys/fs/hpfs/hpfs_vnops.c#7 integrate ... //depot/projects/kse/sys/fs/msdosfs/denode.h#5 integrate ... //depot/projects/kse/sys/fs/msdosfs/direntry.h#2 integrate ... //depot/projects/kse/sys/fs/msdosfs/fat.h#3 integrate ... //depot/projects/kse/sys/fs/msdosfs/msdosfs_conv.c#2 integrate ... //depot/projects/kse/sys/fs/msdosfs/msdosfs_denode.c#6 integrate ... //depot/projects/kse/sys/fs/msdosfs/msdosfs_fat.c#2 integrate ... //depot/projects/kse/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate ... //depot/projects/kse/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate ... //depot/projects/kse/sys/fs/msdosfs/msdosfsmount.h#3 integrate ... //depot/projects/kse/sys/fs/ntfs/ntfs_ihash.h#2 integrate ... //depot/projects/kse/sys/fs/ntfs/ntfs_subr.c#8 integrate ... //depot/projects/kse/sys/fs/ntfs/ntfs_subr.h#3 integrate ... //depot/projects/kse/sys/fs/ntfs/ntfs_vfsops.c#10 integrate ... //depot/projects/kse/sys/fs/ntfs/ntfs_vnops.c#7 integrate ... //depot/projects/kse/sys/fs/nullfs/null_vfsops.c#4 integrate ... //depot/projects/kse/sys/fs/nullfs/null_vnops.c#5 integrate ... //depot/projects/kse/sys/fs/portalfs/portal_vfsops.c#6 integrate ... //depot/projects/kse/sys/fs/portalfs/portal_vnops.c#8 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_ctl.c#19 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#4 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_status.c#12 integrate ... //depot/projects/kse/sys/fs/smbfs/smbfs_vfsops.c#6 integrate ... //depot/projects/kse/sys/fs/specfs/spec_vnops.c#11 integrate ... //depot/projects/kse/sys/fs/umapfs/umap.h#2 integrate ... //depot/projects/kse/sys/fs/umapfs/umap_subr.c#5 integrate ... //depot/projects/kse/sys/fs/umapfs/umap_vfsops.c#5 integrate ... //depot/projects/kse/sys/fs/umapfs/umap_vnops.c#4 integrate ... //depot/projects/kse/sys/fs/unionfs/union.h#4 integrate ... //depot/projects/kse/sys/fs/unionfs/union_subr.c#7 integrate ... //depot/projects/kse/sys/fs/unionfs/union_vfsops.c#8 integrate ... //depot/projects/kse/sys/fs/unionfs/union_vnops.c#5 integrate ... //depot/projects/kse/sys/geom/geom.h#2 integrate ... //depot/projects/kse/sys/geom/geom_bsd.c#2 integrate ... //depot/projects/kse/sys/geom/geom_dev.c#2 integrate ... //depot/projects/kse/sys/geom/geom_disk.c#2 integrate ... //depot/projects/kse/sys/geom/geom_dump.c#2 integrate ... //depot/projects/kse/sys/geom/geom_enc.c#1 branch ... //depot/projects/kse/sys/geom/geom_event.c#2 integrate ... //depot/projects/kse/sys/geom/geom_int.h#1 branch ... //depot/projects/kse/sys/geom/geom_io.c#2 integrate ... //depot/projects/kse/sys/geom/geom_kern.c#2 integrate ... //depot/projects/kse/sys/geom/geom_mbr.c#2 integrate ... //depot/projects/kse/sys/geom/geom_mbrext.c#2 delete ... //depot/projects/kse/sys/geom/geom_pc98.c#1 branch ... //depot/projects/kse/sys/geom/geom_slice.c#2 integrate ... //depot/projects/kse/sys/geom/geom_slice.h#2 integrate ... //depot/projects/kse/sys/geom/geom_subr.c#2 integrate ... //depot/projects/kse/sys/geom/geom_sunlabel.c#1 branch ... //depot/projects/kse/sys/gnu/ext2fs/ext2_alloc.c#2 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_extern.h#4 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_inode.c#4 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_lookup.c#4 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_subr.c#2 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_vfsops.c#8 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_vnops.c#4 integrate ... //depot/projects/kse/sys/i386/apm/apm.c#6 integrate ... //depot/projects/kse/sys/i386/conf/GENERIC#13 integrate ... //depot/projects/kse/sys/i386/conf/NOTES#30 integrate ... //depot/projects/kse/sys/i386/i386/autoconf.c#8 integrate ... //depot/projects/kse/sys/i386/i386/bios.c#8 integrate ... //depot/projects/kse/sys/i386/i386/critical.c#1 branch ... //depot/projects/kse/sys/i386/i386/db_disasm.c#2 integrate ... //depot/projects/kse/sys/i386/i386/db_interface.c#10 integrate ... //depot/projects/kse/sys/i386/i386/db_trace.c#7 integrate ... //depot/projects/kse/sys/i386/i386/exception.s#13 integrate ... //depot/projects/kse/sys/i386/i386/genassym.c#28 integrate ... //depot/projects/kse/sys/i386/i386/i386dump.c#1 branch ... //depot/projects/kse/sys/i386/i386/initcpu.c#7 integrate ... //depot/projects/kse/sys/i386/i386/machdep.c#44 integrate ... //depot/projects/kse/sys/i386/i386/mem.c#6 integrate ... //depot/projects/kse/sys/i386/i386/mp_machdep.c#20 integrate ... //depot/projects/kse/sys/i386/i386/mpapic.c#8 integrate ... //depot/projects/kse/sys/i386/i386/perfmon.c#5 integrate ... //depot/projects/kse/sys/i386/i386/pmap.c#31 integrate ... //depot/projects/kse/sys/i386/i386/swtch.s#32 integrate ... //depot/projects/kse/sys/i386/i386/sys_machdep.c#14 integrate ... //depot/projects/kse/sys/i386/i386/trap.c#35 integrate ... //depot/projects/kse/sys/i386/i386/vm86.c#7 integrate ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#40 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_fcntl.c#5 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_ioctl.c#8 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_ipc.c#4 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_misc.c#5 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_proto.h#4 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_signal.c#4 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_signal.h#3 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_socksys.c#6 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_socksys.h#5 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_stat.c#6 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_sysi86.c#5 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_util.h#6 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_xenix.h#4 integrate ... //depot/projects/kse/sys/i386/ibcs2/imgact_coff.c#10 integrate ... //depot/projects/kse/sys/i386/include/ansi.h#8 integrate ... //depot/projects/kse/sys/i386/include/apm_bios.h#2 integrate ... //depot/projects/kse/sys/i386/include/asm.h#2 integrate ... //depot/projects/kse/sys/i386/include/bus_pc98.h#5 integrate ... //depot/projects/kse/sys/i386/include/clock.h#3 integrate ... //depot/projects/kse/sys/i386/include/cpu.h#10 integrate ... //depot/projects/kse/sys/i386/include/cpufunc.h#8 integrate ... //depot/projects/kse/sys/i386/include/critical.h#1 branch ... //depot/projects/kse/sys/i386/include/dvcfg.h#2 integrate ... //depot/projects/kse/sys/i386/include/frame.h#2 integrate ... //depot/projects/kse/sys/i386/include/i4b_cause.h#2 integrate ... //depot/projects/kse/sys/i386/include/i4b_debug.h#3 integrate ... //depot/projects/kse/sys/i386/include/i4b_ioctl.h#5 integrate ... //depot/projects/kse/sys/i386/include/i4b_rbch_ioctl.h#2 integrate ... //depot/projects/kse/sys/i386/include/i4b_tel_ioctl.h#3 integrate ... //depot/projects/kse/sys/i386/include/i4b_trace.h#2 integrate ... //depot/projects/kse/sys/i386/include/in_cksum.h#3 integrate ... //depot/projects/kse/sys/i386/include/md_var.h#9 integrate ... //depot/projects/kse/sys/i386/include/mutex.h#6 integrate ... //depot/projects/kse/sys/i386/include/npx.h#5 integrate ... //depot/projects/kse/sys/i386/include/pcb.h#6 integrate ... //depot/projects/kse/sys/i386/include/pcb_ext.h#6 integrate ... //depot/projects/kse/sys/i386/include/pcpu.h#3 integrate ... //depot/projects/kse/sys/i386/include/perfmon.h#2 integrate ... //depot/projects/kse/sys/i386/include/physio_proc.h#3 integrate ... //depot/projects/kse/sys/i386/include/pmap.h#7 integrate ... //depot/projects/kse/sys/i386/include/proc.h#6 integrate ... //depot/projects/kse/sys/i386/include/profile.h#4 integrate ... //depot/projects/kse/sys/i386/include/ptrace.h#4 integrate ... //depot/projects/kse/sys/i386/include/reg.h#5 integrate ... //depot/projects/kse/sys/i386/include/segments.h#3 integrate ... //depot/projects/kse/sys/i386/include/smp.h#5 integrate ... //depot/projects/kse/sys/i386/include/sysarch.h#3 integrate ... //depot/projects/kse/sys/i386/include/types.h#3 integrate ... //depot/projects/kse/sys/i386/include/vm86.h#5 integrate ... //depot/projects/kse/sys/i386/isa/apic_vector.s#11 integrate ... //depot/projects/kse/sys/i386/isa/asc.c#5 integrate ... //depot/projects/kse/sys/i386/isa/bs/bs.c#2 integrate ... //depot/projects/kse/sys/i386/isa/bs/bsfunc.c#2 integrate ... //depot/projects/kse/sys/i386/isa/bs/bsfunc.h#2 integrate ... //depot/projects/kse/sys/i386/isa/bs/bshw.c#2 integrate ... //depot/projects/kse/sys/i386/isa/bs/bshw.h#2 integrate ... //depot/projects/kse/sys/i386/isa/bs/bshw_dma.c#2 integrate ... //depot/projects/kse/sys/i386/isa/bs/bshw_pdma.c#2 integrate ... //depot/projects/kse/sys/i386/isa/bs/bsif.c#2 integrate ... //depot/projects/kse/sys/i386/isa/bs/bsif.h#2 integrate ... //depot/projects/kse/sys/i386/isa/bs/bsvar.h#2 integrate ... //depot/projects/kse/sys/i386/isa/ccbque.h#2 integrate ... //depot/projects/kse/sys/i386/isa/clock.c#10 integrate ... //depot/projects/kse/sys/i386/isa/ctx.c#5 integrate ... //depot/projects/kse/sys/i386/isa/cx.c#4 integrate ... //depot/projects/kse/sys/i386/isa/cy.c#9 integrate ... //depot/projects/kse/sys/i386/isa/elink.h#2 integrate ... //depot/projects/kse/sys/i386/isa/icu.h#3 integrate ... //depot/projects/kse/sys/i386/isa/icu_vector.s#9 integrate ... //depot/projects/kse/sys/i386/isa/if_cx.c#2 integrate ... //depot/projects/kse/sys/i386/isa/if_le.c#4 integrate ... //depot/projects/kse/sys/i386/isa/if_rdp.c#2 integrate ... //depot/projects/kse/sys/i386/isa/intr_machdep.c#12 integrate ... //depot/projects/kse/sys/i386/isa/intr_machdep.h#7 integrate ... //depot/projects/kse/sys/i386/isa/ipl.s#6 integrate ... //depot/projects/kse/sys/i386/isa/isa_dma.c#3 integrate ... //depot/projects/kse/sys/i386/isa/isa_dma.h#2 integrate ... //depot/projects/kse/sys/i386/isa/istallion.c#4 integrate ... //depot/projects/kse/sys/i386/isa/matcd/matcd.c#5 integrate ... //depot/projects/kse/sys/i386/isa/mcd.c#5 integrate ... //depot/projects/kse/sys/i386/isa/mse.c#5 integrate ... //depot/projects/kse/sys/i386/isa/npx.c#18 integrate ... //depot/projects/kse/sys/i386/isa/pcaudio.c#7 integrate ... //depot/projects/kse/sys/i386/isa/pcf.c#3 integrate ... //depot/projects/kse/sys/i386/isa/pcvt/pcvt_drv.c#4 integrate ... //depot/projects/kse/sys/i386/isa/pcvt/pcvt_ext.c#7 integrate ... //depot/projects/kse/sys/i386/isa/rc.c#5 integrate ... //depot/projects/kse/sys/i386/isa/scd.c#5 integrate ... //depot/projects/kse/sys/i386/isa/spic.c#4 integrate ... //depot/projects/kse/sys/i386/isa/spicreg.h#2 integrate ... //depot/projects/kse/sys/i386/isa/spigot.c#7 integrate ... //depot/projects/kse/sys/i386/isa/spkr.c#6 integrate ... //depot/projects/kse/sys/i386/isa/stallion.c#5 integrate ... //depot/projects/kse/sys/i386/linux/imgact_linux.c#4 integrate ... //depot/projects/kse/sys/i386/linux/linux_machdep.c#14 integrate ... //depot/projects/kse/sys/i386/linux/linux_proto.h#8 integrate ... //depot/projects/kse/sys/i386/linux/linux_syscall.h#6 integrate ... //depot/projects/kse/sys/i386/linux/linux_sysent.c#6 integrate ... //depot/projects/kse/sys/i386/linux/linux_sysvec.c#15 integrate ... //depot/projects/kse/sys/i386/pci/pci_bus.c#4 integrate ... //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#7 integrate ... //depot/projects/kse/sys/i386/svr4/svr4_machdep.c#8 integrate ... //depot/projects/kse/sys/i386/svr4/svr4_machdep.h#5 integrate ... //depot/projects/kse/sys/i4b/capi/capi_l4if.c#3 integrate ... //depot/projects/kse/sys/i4b/capi/iavc/iavc_isa.c#3 integrate ... //depot/projects/kse/sys/i4b/capi/iavc/iavc_lli.c#2 integrate ... //depot/projects/kse/sys/i4b/capi/iavc/iavc_pci.c#3 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_ctl.c#4 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_ing.c#3 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_ipr.c#4 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_isppp.c#3 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_rbch.c#5 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_tel.c#5 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_trace.c#5 integrate ... //depot/projects/kse/sys/i4b/include/i4b_global.h#2 integrate ... //depot/projects/kse/sys/i4b/include/i4b_isdnq931.h#2 integrate ... //depot/projects/kse/sys/i4b/include/i4b_l1l2.h#2 integrate ... //depot/projects/kse/sys/i4b/include/i4b_l2l3.h#2 integrate ... //depot/projects/kse/sys/i4b/include/i4b_l3l4.h#3 integrate ... //depot/projects/kse/sys/i4b/include/i4b_mbuf.h#2 integrate ... //depot/projects/kse/sys/i4b/layer1/isic/i4b_bchan.c#3 integrate ... //depot/projects/kse/sys/i4b/layer1/isic/i4b_hscx.c#2 integrate ... //depot/projects/kse/sys/i4b/layer2/i4b_iframe.c#2 integrate ... //depot/projects/kse/sys/i4b/layer2/i4b_l2.c#3 integrate ... //depot/projects/kse/sys/i4b/layer2/i4b_l2.h#2 integrate ... //depot/projects/kse/sys/i4b/layer2/i4b_l2fsm.c#2 integrate ... //depot/projects/kse/sys/i4b/layer2/i4b_l2fsm.h#2 integrate ... //depot/projects/kse/sys/i4b/layer2/i4b_l2timer.c#2 integrate ... //depot/projects/kse/sys/i4b/layer2/i4b_lme.c#2 integrate ... //depot/projects/kse/sys/i4b/layer2/i4b_mbuf.c#2 integrate ... //depot/projects/kse/sys/i4b/layer2/i4b_sframe.c#2 integrate ... //depot/projects/kse/sys/i4b/layer2/i4b_tei.c#2 integrate ... //depot/projects/kse/sys/i4b/layer2/i4b_uframe.c#2 integrate ... //depot/projects/kse/sys/i4b/layer2/i4b_util.c#2 integrate ... //depot/projects/kse/sys/i4b/layer3/i4b_l2if.c#3 integrate ... //depot/projects/kse/sys/i4b/layer3/i4b_l3fsm.c#2 integrate ... //depot/projects/kse/sys/i4b/layer3/i4b_l3fsm.h#2 integrate ... //depot/projects/kse/sys/i4b/layer3/i4b_l3timer.c#2 integrate ... //depot/projects/kse/sys/i4b/layer3/i4b_l4if.c#2 integrate ... //depot/projects/kse/sys/i4b/layer3/i4b_q931.c#4 integrate ... //depot/projects/kse/sys/i4b/layer3/i4b_q931.h#3 integrate ... //depot/projects/kse/sys/i4b/layer3/i4b_q932fac.c#2 integrate ... //depot/projects/kse/sys/i4b/layer3/i4b_q932fac.h#2 integrate ... //depot/projects/kse/sys/i4b/layer4/i4b_i4bdrv.c#7 integrate ... //depot/projects/kse/sys/i4b/layer4/i4b_l4.c#3 integrate ... //depot/projects/kse/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate ... //depot/projects/kse/sys/i4b/layer4/i4b_l4timer.c#2 integrate ... //depot/projects/kse/sys/ia64/acpica/madt.c#4 integrate ... //depot/projects/kse/sys/ia64/conf/GENERIC#9 integrate ... //depot/projects/kse/sys/ia64/ia64/autoconf.c#5 integrate ... //depot/projects/kse/sys/ia64/ia64/clock.c#6 integrate ... //depot/projects/kse/sys/ia64/ia64/critical.c#1 branch ... //depot/projects/kse/sys/ia64/ia64/db_disasm.c#6 integrate ... //depot/projects/kse/sys/ia64/ia64/db_interface.c#10 integrate ... //depot/projects/kse/sys/ia64/ia64/db_trace.c#6 integrate ... //depot/projects/kse/sys/ia64/ia64/elf_machdep.c#2 integrate ... //depot/projects/kse/sys/ia64/ia64/exception.s#11 integrate ... //depot/projects/kse/sys/ia64/ia64/genassym.c#20 integrate ... //depot/projects/kse/sys/ia64/ia64/ia64-gdbstub.c#2 integrate ... //depot/projects/kse/sys/ia64/ia64/ia64dump.c#1 branch ... //depot/projects/kse/sys/ia64/ia64/interrupt.c#9 integrate ... //depot/projects/kse/sys/ia64/ia64/locore.s#16 integrate ... //depot/projects/kse/sys/ia64/ia64/machdep.c#28 integrate ... //depot/projects/kse/sys/ia64/ia64/mp_machdep.c#10 integrate ... //depot/projects/kse/sys/ia64/ia64/nexus.c#3 integrate ... //depot/projects/kse/sys/ia64/ia64/pmap.c#20 integrate ... //depot/projects/kse/sys/ia64/ia64/sal.c#5 integrate ... //depot/projects/kse/sys/ia64/ia64/sapic.c#3 integrate ... //depot/projects/kse/sys/ia64/ia64/ssc.c#6 integrate ... //depot/projects/kse/sys/ia64/ia64/swtch.s#15 integrate ... //depot/projects/kse/sys/ia64/ia64/trap.c#16 integrate ... //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#15 integrate ... //depot/projects/kse/sys/ia64/include/ansi.h#8 integrate ... //depot/projects/kse/sys/ia64/include/asm.h#3 integrate ... //depot/projects/kse/sys/ia64/include/clock.h#2 integrate ... //depot/projects/kse/sys/ia64/include/cpu.h#6 integrate ... //depot/projects/kse/sys/ia64/include/cpufunc.h#7 integrate ... //depot/projects/kse/sys/ia64/include/critical.h#1 branch ... //depot/projects/kse/sys/ia64/include/ia64_cpu.h#6 integrate ... //depot/projects/kse/sys/ia64/include/md_var.h#7 integrate ... //depot/projects/kse/sys/ia64/include/pcb.h#2 integrate ... //depot/projects/kse/sys/ia64/include/pmap.h#5 integrate ... //depot/projects/kse/sys/ia64/include/proc.h#6 integrate ... //depot/projects/kse/sys/ia64/include/profile.h#4 integrate ... //depot/projects/kse/sys/ia64/include/ptrace.h#3 integrate ... //depot/projects/kse/sys/ia64/include/reg.h#5 integrate ... //depot/projects/kse/sys/ia64/include/sapicvar.h#2 integrate ... //depot/projects/kse/sys/ia64/include/vmparam.h#2 integrate ... //depot/projects/kse/sys/ia64/isa/isa_dma.c#2 integrate ... //depot/projects/kse/sys/isa/fd.c#8 integrate ... //depot/projects/kse/sys/isa/isavar.h#4 integrate ... //depot/projects/kse/sys/isa/ppc.c#4 integrate ... //depot/projects/kse/sys/isa/psm.c#10 integrate ... //depot/projects/kse/sys/isofs/cd9660/cd9660_lookup.c#5 integrate ... //depot/projects/kse/sys/isofs/cd9660/cd9660_node.c#4 integrate ... //depot/projects/kse/sys/isofs/cd9660/cd9660_node.h#2 integrate ... //depot/projects/kse/sys/isofs/cd9660/cd9660_rrip.c#2 integrate ... //depot/projects/kse/sys/isofs/cd9660/cd9660_vfsops.c#7 integrate ... //depot/projects/kse/sys/isofs/cd9660/cd9660_vnops.c#4 integrate ... //depot/projects/kse/sys/isofs/cd9660/iso.h#2 integrate ... //depot/projects/kse/sys/isofs/cd9660/iso_rrip.h#2 integrate ... //depot/projects/kse/sys/kern/bus_if.m#2 integrate ... //depot/projects/kse/sys/kern/imgact_aout.c#11 integrate ... //depot/projects/kse/sys/kern/imgact_elf.c#17 integrate ... //depot/projects/kse/sys/kern/imgact_gzip.c#3 integrate ... //depot/projects/kse/sys/kern/inflate.c#2 integrate ... //depot/projects/kse/sys/kern/init_main.c#36 integrate ... //depot/projects/kse/sys/kern/kern_acct.c#11 integrate ... //depot/projects/kse/sys/kern/kern_acl.c#13 integrate ... //depot/projects/kse/sys/kern/kern_clock.c#17 integrate ... //depot/projects/kse/sys/kern/kern_condvar.c#30 integrate ... //depot/projects/kse/sys/kern/kern_descrip.c#25 integrate ... //depot/projects/kse/sys/kern/kern_event.c#10 integrate ... //depot/projects/kse/sys/kern/kern_exec.c#22 integrate ... //depot/projects/kse/sys/kern/kern_exit.c#39 integrate ... //depot/projects/kse/sys/kern/kern_fork.c#58 integrate ... //depot/projects/kse/sys/kern/kern_intr.c#20 integrate ... //depot/projects/kse/sys/kern/kern_jail.c#13 integrate ... //depot/projects/kse/sys/kern/kern_ktr.c#7 integrate ... //depot/projects/kse/sys/kern/kern_ktrace.c#9 integrate ... //depot/projects/kse/sys/kern/kern_linker.c#14 integrate ... //depot/projects/kse/sys/kern/kern_lockf.c#9 integrate ... //depot/projects/kse/sys/kern/kern_malloc.c#7 integrate ... //depot/projects/kse/sys/kern/kern_mib.c#10 integrate ... //depot/projects/kse/sys/kern/kern_module.c#8 integrate ... //depot/projects/kse/sys/kern/kern_mtxpool.c#2 integrate ... //depot/projects/kse/sys/kern/kern_mutex.c#24 integrate ... //depot/projects/kse/sys/kern/kern_ntptime.c#6 integrate ... //depot/projects/kse/sys/kern/kern_proc.c#55 integrate ... //depot/projects/kse/sys/kern/kern_prot.c#22 integrate ... //depot/projects/kse/sys/kern/kern_resource.c#17 integrate ... //depot/projects/kse/sys/kern/kern_shutdown.c#26 integrate ... //depot/projects/kse/sys/kern/kern_sig.c#43 integrate ... //depot/projects/kse/sys/kern/kern_switch.c#42 integrate ... //depot/projects/kse/sys/kern/kern_sx.c#12 integrate ... //depot/projects/kse/sys/kern/kern_synch.c#57 integrate ... //depot/projects/kse/sys/kern/kern_syscalls.c#4 integrate ... //depot/projects/kse/sys/kern/kern_sysctl.c#13 integrate ... //depot/projects/kse/sys/kern/kern_tc.c#6 integrate ... //depot/projects/kse/sys/kern/kern_time.c#8 integrate ... //depot/projects/kse/sys/kern/kern_timeout.c#5 integrate ... //depot/projects/kse/sys/kern/kern_xxx.c#5 integrate ... //depot/projects/kse/sys/kern/makesyscalls.sh#10 integrate ... //depot/projects/kse/sys/kern/subr_autoconf.c#2 integrate ... //depot/projects/kse/sys/kern/subr_bus.c#9 integrate ... //depot/projects/kse/sys/kern/subr_disk.c#9 integrate ... //depot/projects/kse/sys/kern/subr_disklabel.c#6 integrate ... //depot/projects/kse/sys/kern/subr_diskmbr.c#4 integrate ... //depot/projects/kse/sys/kern/subr_diskslice.c#6 integrate ... //depot/projects/kse/sys/kern/subr_eventhandler.c#4 integrate ... //depot/projects/kse/sys/kern/subr_prf.c#12 integrate ... //depot/projects/kse/sys/kern/subr_prof.c#9 integrate ... //depot/projects/kse/sys/kern/subr_sbuf.c#7 integrate ... //depot/projects/kse/sys/kern/subr_smp.c#10 integrate ... //depot/projects/kse/sys/kern/subr_trap.c#49 integrate ... //depot/projects/kse/sys/kern/subr_witness.c#20 integrate ... //depot/projects/kse/sys/kern/subr_xxx.c#5 integrate ... //depot/projects/kse/sys/kern/sys_generic.c#20 integrate ... //depot/projects/kse/sys/kern/sys_pipe.c#9 integrate ... //depot/projects/kse/sys/kern/sys_process.c#22 integrate ... //depot/projects/kse/sys/kern/sys_socket.c#6 integrate ... //depot/projects/kse/sys/kern/sysv_ipc.c#7 integrate ... //depot/projects/kse/sys/kern/sysv_msg.c#8 integrate ... //depot/projects/kse/sys/kern/sysv_sem.c#14 integrate ... //depot/projects/kse/sys/kern/sysv_shm.c#11 integrate ... //depot/projects/kse/sys/kern/tty.c#20 integrate ... //depot/projects/kse/sys/kern/tty_compat.c#2 integrate ... //depot/projects/kse/sys/kern/tty_cons.c#8 integrate ... //depot/projects/kse/sys/kern/tty_pty.c#10 integrate ... //depot/projects/kse/sys/kern/tty_subr.c#2 integrate ... //depot/projects/kse/sys/kern/tty_tty.c#6 integrate ... //depot/projects/kse/sys/kern/uipc_domain.c#3 integrate ... //depot/projects/kse/sys/kern/uipc_mbuf2.c#2 integrate ... //depot/projects/kse/sys/kern/uipc_socket.c#12 integrate ... //depot/projects/kse/sys/kern/uipc_socket2.c#12 integrate ... //depot/projects/kse/sys/kern/uipc_syscalls.c#11 integrate ... //depot/projects/kse/sys/kern/uipc_usrreq.c#16 integrate ... //depot/projects/kse/sys/kern/vfs_aio.c#22 integrate ... //depot/projects/kse/sys/kern/vfs_bio.c#15 integrate ... //depot/projects/kse/sys/kern/vfs_cache.c#11 integrate ... //depot/projects/kse/sys/kern/vfs_cluster.c#6 integrate ... //depot/projects/kse/sys/kern/vfs_conf.c#6 integrate ... //depot/projects/kse/sys/kern/vfs_default.c#6 integrate ... //depot/projects/kse/sys/kern/vfs_export.c#4 integrate ... //depot/projects/kse/sys/kern/vfs_init.c#3 integrate ... //depot/projects/kse/sys/kern/vfs_lookup.c#7 integrate ... //depot/projects/kse/sys/kern/vfs_subr.c#29 integrate ... //depot/projects/kse/sys/kern/vfs_syscalls.c#23 integrate ... //depot/projects/kse/sys/kern/vfs_vnops.c#22 integrate ... //depot/projects/kse/sys/kern/vnode_if.src#6 integrate ... //depot/projects/kse/sys/libkern/bsearch.c#3 integrate ... //depot/projects/kse/sys/libkern/mcount.c#3 integrate ... //depot/projects/kse/sys/libkern/qsort.c#2 integrate ... //depot/projects/kse/sys/libkern/quad.h#2 integrate ... //depot/projects/kse/sys/modules/Makefile#24 integrate ... //depot/projects/kse/sys/modules/bktr/bktr/Makefile#2 integrate ... //depot/projects/kse/sys/modules/i2c/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/controllers/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/controllers/alpm/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/controllers/amdpm/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/controllers/intpm/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/controllers/lpbb/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/controllers/pcf/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/controllers/viapm/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/if_ic/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/iic/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/iicbb/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/iicbus/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/iicsmb/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/smb/Makefile#1 branch ... //depot/projects/kse/sys/modules/i2c/smbus/Makefile#1 branch ... //depot/projects/kse/sys/modules/smbfs/Makefile#4 integrate ... //depot/projects/kse/sys/modules/syscons/Makefile#2 integrate ... //depot/projects/kse/sys/modules/syscons/dragon/Makefile#1 branch ... //depot/projects/kse/sys/modules/ucom/Makefile#1 branch ... //depot/projects/kse/sys/modules/uplcom/Makefile#1 branch ... //depot/projects/kse/sys/modules/uvscom/Makefile#1 branch ... //depot/projects/kse/sys/modules/wi/Makefile#4 integrate ... //depot/projects/kse/sys/net/bpf.c#9 integrate ... //depot/projects/kse/sys/net/bpf.h#3 integrate ... //depot/projects/kse/sys/net/bpf_filter.c#4 integrate ... //depot/projects/kse/sys/net/bridge.c#8 integrate ... //depot/projects/kse/sys/net/bsd_comp.c#2 integrate ... //depot/projects/kse/sys/net/ethernet.h#5 integrate ... //depot/projects/kse/sys/net/fddi.h#2 integrate ... //depot/projects/kse/sys/net/if.c#14 integrate ... //depot/projects/kse/sys/net/if.h#9 integrate ... //depot/projects/kse/sys/net/if_arc.h#3 integrate ... //depot/projects/kse/sys/net/if_arcsubr.c#2 integrate ... //depot/projects/kse/sys/net/if_atm.h#3 integrate ... //depot/projects/kse/sys/net/if_dl.h#3 integrate ... //depot/projects/kse/sys/net/if_ethersubr.c#11 integrate ... //depot/projects/kse/sys/net/if_faith.c#8 integrate ... //depot/projects/kse/sys/net/if_fddisubr.c#4 integrate ... //depot/projects/kse/sys/net/if_gif.c#9 integrate ... //depot/projects/kse/sys/net/if_gif.h#5 integrate ... //depot/projects/kse/sys/net/if_llc.h#3 integrate ... //depot/projects/kse/sys/net/if_media.c#2 integrate ... //depot/projects/kse/sys/net/if_media.h#3 integrate ... //depot/projects/kse/sys/net/if_ppp.c#8 integrate ... //depot/projects/kse/sys/net/if_pppvar.h#6 integrate ... //depot/projects/kse/sys/net/if_sl.c#10 integrate ... //depot/projects/kse/sys/net/if_stf.c#10 integrate ... //depot/projects/kse/sys/net/if_stf.h#4 integrate ... //depot/projects/kse/sys/net/if_tap.c#9 integrate ... //depot/projects/kse/sys/net/if_tun.c#9 integrate ... //depot/projects/kse/sys/net/if_var.h#11 integrate ... //depot/projects/kse/sys/net/intrq.h#4 integrate ... //depot/projects/kse/sys/net/net_osdep.h#4 integrate ... //depot/projects/kse/sys/net/netisr.h#4 integrate ... //depot/projects/kse/sys/net/pfil.c#2 integrate ... //depot/projects/kse/sys/net/pfil.h#4 integrate ... //depot/projects/kse/sys/net/ppp_comp.h#3 integrate ... //depot/projects/kse/sys/net/ppp_deflate.c#2 integrate ... //depot/projects/kse/sys/net/ppp_tty.c#5 integrate ... //depot/projects/kse/sys/net/radix.c#2 integrate ... //depot/projects/kse/sys/net/radix.h#3 integrate ... //depot/projects/kse/sys/net/raw_cb.h#5 integrate ... //depot/projects/kse/sys/net/raw_usrreq.c#5 integrate ... //depot/projects/kse/sys/net/route.c#4 integrate ... //depot/projects/kse/sys/net/route.h#8 integrate ... //depot/projects/kse/sys/net/rtsock.c#13 integrate ... //depot/projects/kse/sys/net/slcompress.h#3 integrate ... //depot/projects/kse/sys/net/zlib.c#3 integrate ... //depot/projects/kse/sys/netatalk/at_control.c#4 integrate ... //depot/projects/kse/sys/netatalk/at_extern.h#5 integrate ... //depot/projects/kse/sys/netatalk/ddp_usrreq.c#6 integrate ... //depot/projects/kse/sys/netatm/atm_aal5.c#4 integrate ... //depot/projects/kse/sys/netatm/atm_cm.c#2 integrate ... //depot/projects/kse/sys/netatm/atm_cm.h#2 integrate ... //depot/projects/kse/sys/netatm/atm_if.c#3 integrate ... //depot/projects/kse/sys/netatm/atm_if.h#2 integrate ... //depot/projects/kse/sys/netatm/atm_sigmgr.h#2 integrate ... //depot/projects/kse/sys/netatm/atm_signal.c#2 integrate ... //depot/projects/kse/sys/netatm/atm_stack.h#2 integrate ... //depot/projects/kse/sys/netatm/atm_subr.c#4 integrate ... //depot/projects/kse/sys/netatm/atm_sys.h#2 integrate ... //depot/projects/kse/sys/netatm/atm_usrreq.c#4 integrate ... //depot/projects/kse/sys/netatm/atm_var.h#5 integrate ... //depot/projects/kse/sys/netatm/ipatm/ipatm_if.c#2 integrate ... //depot/projects/kse/sys/netatm/ipatm/ipatm_load.c#2 integrate ... //depot/projects/kse/sys/netatm/ipatm/ipatm_serv.h#2 integrate ... //depot/projects/kse/sys/netatm/ipatm/ipatm_var.h#2 integrate ... //depot/projects/kse/sys/netatm/sigpvc/sigpvc_if.c#2 integrate ... //depot/projects/kse/sys/netatm/sigpvc/sigpvc_var.h#2 integrate ... //depot/projects/kse/sys/netatm/spans/spans_arp.c#2 integrate ... //depot/projects/kse/sys/netatm/spans/spans_cls.c#2 integrate ... //depot/projects/kse/sys/netatm/spans/spans_if.c#2 integrate ... //depot/projects/kse/sys/netatm/spans/spans_kxdr.c#2 integrate ... //depot/projects/kse/sys/netatm/spans/spans_msg.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 2 23:26:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C27337B417; Tue, 2 Apr 2002 23:26:13 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8C79137B41A for ; Tue, 2 Apr 2002 23:26:11 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g337QBm65145 for perforce@freebsd.org; Tue, 2 Apr 2002 23:26:11 -0800 (PST) (envelope-from julian@freebsd.org) Date: Tue, 2 Apr 2002 23:26:11 -0800 (PST) Message-Id: <200204030726.g337QBm65145@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 8952 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8952 Change 8952 by julian@julian_ref on 2002/04/02 23:26:06 Catch a few mis-merges I don't know if the critnest fix is correct but it matches changes elsewhere in -current. Affected files ... ... //depot/projects/kse/sys/kern/kern_fork.c#59 edit ... //depot/projects/kse/sys/kern/kern_thread.c#40 edit ... //depot/projects/kse/sys/kern/sys_generic.c#21 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_fork.c#59 (text+ko) ==== @@ -348,7 +348,7 @@ } td2 = thread_get(); if (td2 == NULL) { - zfree(proc_zone, p2); + uma_zfree(proc_zone, p2); nprocs--; if (p1->p_flag & P_KSES) thread_single_end(); ==== //depot/projects/kse/sys/kern/kern_thread.c#40 (text+ko) ==== @@ -240,7 +240,6 @@ kg->kg_numthreads++; if (p->p_numthreads > 4) Debugger("OIKS"); td->td_critnest = 0; - td->td_savecrit = 0; td->td_kse = NULL; } ==== //depot/projects/kse/sys/kern/sys_generic.c#21 (text+ko) ==== @@ -1188,7 +1188,7 @@ sip->si_thread = NULL; mtx_lock_spin(&sched_lock); if (td->td_wchan == (caddr_t)&selwait) { - if (td->td_proc->p_stat == SSLEEP) + if (td->td_state == TDS_SLP) setrunnable(td); else cv_waitq_remove(td); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 3 7:52:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF16D37B400; Wed, 3 Apr 2002 07:50:52 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EA00A37B405 for ; Wed, 3 Apr 2002 07:50:50 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g33FooH05472 for perforce@freebsd.org; Wed, 3 Apr 2002 07:50:50 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Wed, 3 Apr 2002 07:50:50 -0800 (PST) Message-Id: <200204031550.g33FooH05472@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 8971 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8971 Change 8971 by jhb@jhb_laptop on 2002/04/03 07:49:54 IFC @8970. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#34 integrate ... //depot/projects/smpng/sys/alpha/conf/GENERIC#15 integrate ... //depot/projects/smpng/sys/alpha/conf/SIMOS#4 integrate ... //depot/projects/smpng/sys/conf/NOTES#2 integrate ... //depot/projects/smpng/sys/conf/files.ia64#12 integrate ... //depot/projects/smpng/sys/conf/options#17 integrate ... //depot/projects/smpng/sys/dev/aac/aac_pci.c#11 integrate ... //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#9 integrate ... //depot/projects/smpng/sys/dev/isp/isp_pci.c#8 integrate ... //depot/projects/smpng/sys/dev/isp/ispvar.h#12 integrate ... //depot/projects/smpng/sys/i386/conf/GENERIC#17 integrate ... //depot/projects/smpng/sys/i386/conf/NEWCARD#11 integrate ... //depot/projects/smpng/sys/i386/conf/NOTES#32 integrate ... //depot/projects/smpng/sys/i386/i386/i386dump.c#2 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#30 integrate ... //depot/projects/smpng/sys/ia64/conf/GENERIC#13 integrate ... //depot/projects/smpng/sys/ia64/conf/SKI#3 integrate ... //depot/projects/smpng/sys/ia64/ia64/ia64dump.c#2 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#32 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#24 integrate ... //depot/projects/smpng/sys/kern/tty.c#17 integrate ... //depot/projects/smpng/sys/kern/vfs_bio.c#18 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#33 integrate ... //depot/projects/smpng/sys/pc98/conf/GENERIC#17 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#26 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#20 integrate ... //depot/projects/smpng/sys/sparc64/conf/GENERIC#8 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#22 integrate ... //depot/projects/smpng/sys/sys/cdefs.h#10 integrate ... //depot/projects/smpng/sys/sys/kerneldump.h#3 integrate ... //depot/projects/smpng/sys/sys/mutex.h#23 integrate ... //depot/projects/smpng/sys/sys/param.h#18 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#4 integrate ... //depot/projects/smpng/sys/vm/vm_page.c#11 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#34 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.170 2002/03/27 09:23:37 jeff Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.171 2002/04/02 22:19:14 jhb Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#15 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.134 2002/03/27 21:10:38 wilko Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.135 2002/04/03 10:56:54 ru Exp $ machine alpha cpu EV4 @@ -63,7 +63,6 @@ options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI -options UCONSOLE #Allow users to grab the console options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/smpng/sys/alpha/conf/SIMOS#4 (text+ko) ==== @@ -11,7 +11,7 @@ # device lines is present in the ./NOTES file. If you are in doubt as # to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.18 2001/12/04 11:16:41 des Exp $ +# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.19 2002/04/03 10:56:54 ru Exp $ machine "alpha" cpu "EV5" @@ -31,7 +31,6 @@ options PSEUDOFS #Pseudo-filesystem framework options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=100 #Be pessimistic about Joe SCSI device -options UCONSOLE #Allow users to grab the console config kernel ==== //depot/projects/smpng/sys/conf/NOTES#2 (text+ko) ==== @@ -11,7 +11,7 @@ # Please use ``make LINT'' to create an old-style LINT file if you want to # do kernel test-builds. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1014 2002/04/01 19:25:22 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1015 2002/04/03 10:56:53 ru Exp $ # # @@ -427,10 +427,6 @@ options COMPILING_LINT -# XXX - this doesn't belong here. -# Allow ordinary users to take the console - this is useful for X. -options UCONSOLE - # XXX - this doesn't belong here either #options USERCONFIG #boot -c editor #options INTRO_USERCONFIG #imply -c and show intro screen ==== //depot/projects/smpng/sys/conf/files.ia64#12 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.28 2002/03/27 05:39:16 dillon Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.29 2002/04/03 04:42:14 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -23,6 +23,7 @@ ia64/acpica/OsdEnvironment.c optional acpica ia64/acpica/madt.c optional acpica ia64/ia64/ia64-gdbstub.c optional ddb +ia64/ia64/ia64dump.c standard ia64/ia64/autoconf.c standard ia64/ia64/busdma_machdep.c standard ia64/ia64/clock.c standard ==== //depot/projects/smpng/sys/conf/options#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.308 2002/04/02 00:01:47 des Exp $ +# $FreeBSD: src/sys/conf/options,v 1.309 2002/04/03 10:56:53 ru Exp $ # # On the handling of kernel options # @@ -97,7 +97,6 @@ MSGSEG opt_sysvipc.h MSGSSZ opt_sysvipc.h MSGTQL opt_sysvipc.h -UCONSOLE VFS_AIO # POSIX kernel options ==== //depot/projects/smpng/sys/dev/aac/aac_pci.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.18 2002/02/13 07:44:43 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.19 2002/04/02 21:49:26 scottl Exp $ */ /* @@ -100,6 +100,7 @@ {0x1028, 0x0002, 0x1028, 0x00d9, AAC_HWIF_I960RX, "Dell PERC 3/Di"}, {0x1028, 0x0008, 0x1028, 0x00cf, AAC_HWIF_I960RX, "Dell PERC 3/Di"}, {0x1028, 0x000a, 0x1028, 0x0106, AAC_HWIF_I960RX, "Dell PERC 3/Di"}, + {0x1028, 0x000a, 0x1028, 0x011b, AAC_HWIF_I960RX, "Dell PERC 3/Di"}, {0x1011, 0x0046, 0x9005, 0x0364, AAC_HWIF_STRONGARM, "Adaptec AAC-364"}, {0x1011, 0x0046, 0x9005, 0x0365, AAC_HWIF_STRONGARM, "Adaptec SCSI RAID 5400S"}, ==== //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.59 2002/03/20 02:07:25 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.60 2002/04/02 23:36:14 mjacob Exp $ */ /* * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * Copyright (c) 1997, 1998, 1999, 2000, 2001 by Matthew Jacob @@ -63,7 +63,7 @@ /* * Efficiency- get rid of SBus code && tests unless we need them. */ -#if defined(__sparcv9__ ) || defined(__sparc__) +#if _MACHINE_ARCH == sparc64 #define ISP_SBUS_SUPPORTED 1 #else #define ISP_SBUS_SUPPORTED 0 @@ -117,6 +117,10 @@ struct mtx lock; struct cv kthread_cv; struct proc *kproc; + bus_dma_tag_t cdmat; + bus_dmamap_t cdmap; +#define isp_cdmat isp_osinfo.cdmat +#define isp_cdmap isp_osinfo.cdmap #ifdef ISP_TARGET_MODE #define TM_WANTED 0x80 #define TM_BUSY 0x40 @@ -173,14 +177,21 @@ #define MAXISPREQUEST(isp) 256 -#if defined(__alpha__) -#define MEMORYBARRIER(isp, type, offset, size) alpha_mb() -#elif defined(__ia64__) -#define MEMORYBARRIER(isp, type, offset, size) \ - do { ia64_mf(); ia64_mf_a(); } while (0) -#else -#define MEMORYBARRIER(isp, type, offset, size) -#endif +#define MEMORYBARRIER(isp, type, offset, size) \ +switch (type) { \ +case SYNC_SFORDEV: \ +case SYNC_REQUEST: \ + bus_dmamap_sync(isp->isp_cdmat, isp->isp_cdmap, \ + BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); \ + break; \ +case SYNC_SFORCPU: \ +case SYNC_RESULT: \ + bus_dmamap_sync(isp->isp_cdmat, isp->isp_cdmap, \ + BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); \ + break; \ +default: \ + break; \ +} #define MBOX_ACQUIRE(isp) #define MBOX_WAIT_COMPLETE isp_mbox_wait_complete ==== //depot/projects/smpng/sys/dev/isp/isp_pci.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.78 2002/02/18 00:00:34 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.79 2002/04/02 23:36:14 mjacob Exp $ */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. * FreeBSD Version. @@ -241,6 +241,16 @@ ((PCI_PRODUCT_QLOGIC_ISP2312 << 16) | PCI_VENDOR_QLOGIC) /* + * I/O Mapping Stuff + */ +#if _MACHINE_ARCH == SPARC64 +/* An IOMMU means that we only will ever need one descriptor. */ +#define ISP_NSEG 2 +#else +#define ISP_NSEG ((MAXPHYS/PAGE_SIZE) + 1) +#endif + +/* * Odd case for some AMI raid cards... We need to *not* attach to this. */ #define AMI_RAID_SUBVENDOR_ID 0x101e @@ -254,6 +264,7 @@ static int isp_pci_probe (device_t); static int isp_pci_attach (device_t); + struct isp_pcisoftc { struct ispsoftc pci_isp; device_t pci_dev; @@ -262,9 +273,7 @@ bus_space_handle_t pci_sh; void * ih; int16_t pci_poff[_NREG_BLKS]; - bus_dma_tag_t parent_dmat; - bus_dma_tag_t cntrol_dmat; - bus_dmamap_t cntrol_dmap; + bus_dma_tag_t dmat; bus_dmamap_t *dmaps; }; ispfwfunc *isp_get_firmware_p = NULL; @@ -343,7 +352,6 @@ struct isp_pcisoftc *pcs; struct ispsoftc *isp = NULL; struct ispmdvec *mdvp; - bus_size_t lim; const char *sptr; int locksetup = 0; @@ -438,12 +446,10 @@ mdvp = &mdvec; basetype = ISP_HA_SCSI_UNKNOWN; psize = sizeof (sdparam); - lim = BUS_SPACE_MAXSIZE_32BIT; if (pci_get_devid(dev) == PCI_QLOGIC_ISP1020) { mdvp = &mdvec; basetype = ISP_HA_SCSI_UNKNOWN; psize = sizeof (sdparam); - lim = BUS_SPACE_MAXSIZE_24BIT; } if (pci_get_devid(dev) == PCI_QLOGIC_ISP1080) { mdvp = &mdvec_1080; @@ -573,16 +579,6 @@ data &= ~1; pci_write_config(dev, PCIR_ROMADDR, data, 4); - - if (bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, - BUS_SPACE_MAXADDR, NULL, NULL, lim + 1, - 255, lim, 0, &pcs->parent_dmat) != 0) { - device_printf(dev, "could not create master dma tag\n"); - free(isp->isp_param, M_DEVBUF); - free(pcs, M_DEVBUF); - return (ENXIO); - } - iqd = 0; irq = bus_alloc_resource(dev, SYS_RES_IRQ, &iqd, 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); @@ -1007,60 +1003,46 @@ } } -static void isp_map_rquest(void *, bus_dma_segment_t *, int, int); -static void isp_map_result(void *, bus_dma_segment_t *, int, int); -static void isp_map_fcscrt(void *, bus_dma_segment_t *, int, int); struct imush { struct ispsoftc *isp; int error; }; +static void imc(void *, bus_dma_segment_t *, int, int); + static void -isp_map_rquest(void *arg, bus_dma_segment_t *segs, int nseg, int error) +imc(void *arg, bus_dma_segment_t *segs, int nseg, int error) { struct imush *imushp = (struct imush *) arg; if (error) { imushp->error = error; } else { - imushp->isp->isp_rquest_dma = segs->ds_addr; - } -} + struct ispsoftc *isp =imushp->isp; + bus_addr_t addr = segs->ds_addr; -static void -isp_map_result(void *arg, bus_dma_segment_t *segs, int nseg, int error) -{ - struct imush *imushp = (struct imush *) arg; - if (error) { - imushp->error = error; - } else { - imushp->isp->isp_result_dma = segs->ds_addr; + isp->isp_rquest_dma = addr; + addr += ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp)); + isp->isp_result_dma = addr; + if (IS_FC(isp)) { + addr += ISP_QUEUE_SIZE(RESULT_QUEUE_LEN(isp)); + FCPARAM(isp)->isp_scdma = addr; + } } } -static void -isp_map_fcscrt(void *arg, bus_dma_segment_t *segs, int nseg, int error) -{ - struct imush *imushp = (struct imush *) arg; - if (error) { - imushp->error = error; - } else { - fcparam *fcp = imushp->isp->isp_param; - fcp->isp_scdma = segs->ds_addr; - } -} +#define ISP_NSEGS ((BUS_SPACE_MAXSIZE / PAGE_SIZE) + 1) static int isp_pci_mbxdma(struct ispsoftc *isp) { - struct isp_pcisoftc *pci = (struct isp_pcisoftc *)isp; + struct isp_pcisoftc *pcs = (struct isp_pcisoftc *)isp; caddr_t base; u_int32_t len; - int i, error; - bus_size_t lim; + int i, error, ns; + bus_size_t bl; struct imush im; - /* * Already been here? If so, leave... */ @@ -1068,6 +1050,20 @@ return (0); } + if (IS_ULTRA2(isp) || IS_FC(isp) || IS_1240(isp)) { + bl = BUS_SPACE_UNRESTRICTED; + } else { + bl = BUS_SPACE_MAXADDR_24BIT; + } + + if (bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR, + BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, + ISP_NSEGS, bl, 0, &pcs->dmat)) { + isp_prt(isp, ISP_LOGERR, "could not create master dma tag"); + return(1); + } + + len = sizeof (XS_T **) * isp->isp_maxcmds; isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_WAITOK | M_ZERO); if (isp->isp_xflist == NULL) { @@ -1075,18 +1071,13 @@ return (1); } len = sizeof (bus_dmamap_t) * isp->isp_maxcmds; - pci->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF, M_WAITOK); - if (pci->dmaps == NULL) { - isp_prt(isp, ISP_LOGERR, "can't alloc dma maps"); + pcs->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF, M_WAITOK); + if (pcs->dmaps == NULL) { + isp_prt(isp, ISP_LOGERR, "can't alloc dma map storage"); free(isp->isp_xflist, M_DEVBUF); return (1); } - if (IS_FC(isp) || IS_ULTRA2(isp)) - lim = BUS_SPACE_MAXADDR + 1; - else - lim = BUS_SPACE_MAXADDR_24BIT + 1; - /* * Allocate and map the request, result queues, plus FC scratch area. */ @@ -1095,80 +1086,64 @@ if (IS_FC(isp)) { len += ISP2100_SCRLEN; } - if (bus_dma_tag_create(pci->parent_dmat, PAGE_SIZE, lim, - BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, len, 1, - BUS_SPACE_MAXSIZE_32BIT, 0, &pci->cntrol_dmat) != 0) { + + ns = (len / PAGE_SIZE) + 1; + if (bus_dma_tag_create(pcs->dmat, QENTRY_LEN, 0, BUS_SPACE_MAXADDR, + BUS_SPACE_MAXADDR, NULL, NULL, len, ns, bl, 0, &isp->isp_cdmat)) { isp_prt(isp, ISP_LOGERR, "cannot create a dma tag for control spaces"); + free(pcs->dmaps, M_DEVBUF); free(isp->isp_xflist, M_DEVBUF); - free(pci->dmaps, M_DEVBUF); return (1); } - if (bus_dmamem_alloc(pci->cntrol_dmat, (void **)&base, - BUS_DMA_NOWAIT, &pci->cntrol_dmap) != 0) { + + if (bus_dmamem_alloc(isp->isp_cdmat, (void **)&base, BUS_DMA_NOWAIT, + &isp->isp_cdmap) != 0) { isp_prt(isp, ISP_LOGERR, "cannot allocate %d bytes of CCB memory", len); + bus_dma_tag_destroy(isp->isp_cdmat); free(isp->isp_xflist, M_DEVBUF); - free(pci->dmaps, M_DEVBUF); + free(pcs->dmaps, M_DEVBUF); return (1); } - isp->isp_rquest = base; - im.isp = isp; - im.error = 0; - bus_dmamap_load(pci->cntrol_dmat, pci->cntrol_dmap, isp->isp_rquest, - ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp)), isp_map_rquest, &im, 0); - if (im.error) { - isp_prt(isp, ISP_LOGERR, - "error %d loading dma map for DMA request queue", im.error); - free(isp->isp_xflist, M_DEVBUF); - free(pci->dmaps, M_DEVBUF); - isp->isp_rquest = NULL; - return (1); - } - isp->isp_result = base + ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp)); - im.error = 0; - bus_dmamap_load(pci->cntrol_dmat, pci->cntrol_dmap, isp->isp_result, - ISP_QUEUE_SIZE(RESULT_QUEUE_LEN(isp)), isp_map_result, &im, 0); - if (im.error) { - isp_prt(isp, ISP_LOGERR, - "error %d loading dma map for DMA result queue", im.error); - free(isp->isp_xflist, M_DEVBUF); - free(pci->dmaps, M_DEVBUF); - isp->isp_rquest = NULL; - return (1); - } - for (i = 0; i < isp->isp_maxcmds; i++) { - error = bus_dmamap_create(pci->parent_dmat, 0, &pci->dmaps[i]); + error = bus_dmamap_create(pcs->dmat, 0, &pcs->dmaps[i]); if (error) { isp_prt(isp, ISP_LOGERR, "error %d creating per-cmd DMA maps", error); - free(isp->isp_xflist, M_DEVBUF); - free(pci->dmaps, M_DEVBUF); - isp->isp_rquest = NULL; - return (1); + while (--i >= 0) { + bus_dmamap_destroy(pcs->dmat, pcs->dmaps[i]); + } + goto bad; } } + im.isp = isp; + im.error = 0; + bus_dmamap_load(isp->isp_cdmat, isp->isp_cdmap, base, len, imc, &im, 0); + if (im.error) { + isp_prt(isp, ISP_LOGERR, + "error %d loading dma map for control areas", im.error); + goto bad; + } + + isp->isp_rquest = base; + base += ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp)); + isp->isp_result = base; if (IS_FC(isp)) { - fcparam *fcp = (fcparam *) isp->isp_param; - fcp->isp_scratch = base + - ISP_QUEUE_SIZE(RQUEST_QUEUE_LEN(isp)) + - ISP_QUEUE_SIZE(RESULT_QUEUE_LEN(isp)); - im.error = 0; - bus_dmamap_load(pci->cntrol_dmat, pci->cntrol_dmap, - fcp->isp_scratch, ISP2100_SCRLEN, isp_map_fcscrt, &im, 0); - if (im.error) { - isp_prt(isp, ISP_LOGERR, - "error %d loading FC scratch area", im.error); - free(isp->isp_xflist, M_DEVBUF); - free(pci->dmaps, M_DEVBUF); - isp->isp_rquest = NULL; - return (1); - } + base += ISP_QUEUE_SIZE(RESULT_QUEUE_LEN(isp)); + FCPARAM(isp)->isp_scratch = base; } return (0); + +bad: + bus_dmamem_free(isp->isp_cdmat, base, isp->isp_cdmap); + bus_dma_tag_destroy(isp->isp_cdmat); + free(isp->isp_xflist, M_DEVBUF); + free(pcs->dmaps, M_DEVBUF); + isp->isp_rquest = NULL; + return (1); } typedef struct { @@ -1210,7 +1185,7 @@ mush_t *mp; struct ccb_scsiio *csio; struct ispsoftc *isp; - struct isp_pcisoftc *pci; + struct isp_pcisoftc *pcs; bus_dmamap_t *dp; ct_entry_t *cto, *qe; u_int8_t scsi_status; @@ -1291,12 +1266,12 @@ cto->ct_resid = 0; cto->ct_scsi_status = 0; - pci = (struct isp_pcisoftc *)isp; - dp = &pci->dmaps[isp_handle_index(handle)]; + pcs = (struct isp_pcisoftc *)isp; + dp = &pcs->dmaps[isp_handle_index(handle)]; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREREAD); } else { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREWRITE); } nxti = *mp->nxtip; @@ -1448,7 +1423,7 @@ u_int8_t sense[QLTM_SENSELEN]; struct ccb_scsiio *csio; struct ispsoftc *isp; - struct isp_pcisoftc *pci; + struct isp_pcisoftc *pcs; bus_dmamap_t *dp; ct2_entry_t *cto, *qe; u_int16_t scsi_status, send_status, send_sense, handle; @@ -1565,12 +1540,12 @@ cto->rsp.m0.ct_scsi_status = 0; MEMZERO(&cto->rsp, sizeof (cto->rsp)); - pci = (struct isp_pcisoftc *)isp; - dp = &pci->dmaps[isp_handle_index(handle)]; + pcs = (struct isp_pcisoftc *)isp; + dp = &pcs->dmaps[isp_handle_index(handle)]; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREREAD); } else { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREWRITE); } nxti = *mp->nxtip; @@ -1755,7 +1730,7 @@ mush_t *mp; struct ispsoftc *isp; struct ccb_scsiio *csio; - struct isp_pcisoftc *pci; + struct isp_pcisoftc *pcs; bus_dmamap_t *dp; bus_dma_segment_t *eseg; ispreq_t *rq; @@ -1776,14 +1751,14 @@ csio = mp->cmd_token; isp = mp->isp; rq = mp->rq; - pci = (struct isp_pcisoftc *)mp->isp; - dp = &pci->dmaps[isp_handle_index(rq->req_handle)]; + pcs = (struct isp_pcisoftc *)mp->isp; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; nxti = *mp->nxtip; if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREREAD); } else { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_PREWRITE); } datalen = XS_XFRLEN(csio); @@ -1877,7 +1852,7 @@ isp_pci_dmasetup(struct ispsoftc *isp, struct ccb_scsiio *csio, ispreq_t *rq, u_int16_t *nxtip, u_int16_t optr) { - struct isp_pcisoftc *pci = (struct isp_pcisoftc *)isp; + struct isp_pcisoftc *pcs = (struct isp_pcisoftc *)isp; ispreq_t *qep; bus_dmamap_t *dp = NULL; mush_t mush, *mp; @@ -1929,12 +1904,12 @@ if ((csio->ccb_h.flags & CAM_SCATTER_VALID) == 0) { if ((csio->ccb_h.flags & CAM_DATA_PHYS) == 0) { int error, s; - dp = &pci->dmaps[isp_handle_index(rq->req_handle)]; + dp = &pcs->dmaps[isp_handle_index(rq->req_handle)]; s = splsoftvm(); - error = bus_dmamap_load(pci->parent_dmat, *dp, + error = bus_dmamap_load(pcs->dmat, *dp, csio->data_ptr, csio->dxfer_len, eptr, mp, 0); if (error == EINPROGRESS) { - bus_dmamap_unload(pci->parent_dmat, *dp); + bus_dmamap_unload(pcs->dmat, *dp); mp->error = EINVAL; isp_prt(isp, ISP_LOGERR, "deferred dma allocation not supported"); @@ -2002,14 +1977,14 @@ static void isp_pci_dmateardown(struct ispsoftc *isp, XS_T *xs, u_int16_t handle) { - struct isp_pcisoftc *pci = (struct isp_pcisoftc *)isp; - bus_dmamap_t *dp = &pci->dmaps[isp_handle_index(handle)]; + struct isp_pcisoftc *pcs = (struct isp_pcisoftc *)isp; + bus_dmamap_t *dp = &pcs->dmaps[isp_handle_index(handle)]; if ((xs->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_POSTREAD); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_POSTREAD); } else { - bus_dmamap_sync(pci->parent_dmat, *dp, BUS_DMASYNC_POSTWRITE); + bus_dmamap_sync(pcs->dmat, *dp, BUS_DMASYNC_POSTWRITE); } - bus_dmamap_unload(pci->parent_dmat, *dp); + bus_dmamap_unload(pcs->dmat, *dp); } @@ -2025,7 +2000,7 @@ static void isp_pci_dumpregs(struct ispsoftc *isp, const char *msg) { - struct isp_pcisoftc *pci = (struct isp_pcisoftc *)isp; + struct isp_pcisoftc *pcs = (struct isp_pcisoftc *)isp; if (msg) printf("%s: %s\n", device_get_nameunit(isp->isp_dev), msg); else @@ -2058,5 +2033,5 @@ ISP_READ(isp, OUTMAILBOX2), ISP_READ(isp, OUTMAILBOX3), ISP_READ(isp, OUTMAILBOX4)); printf(" PCI Status Command/Status=%x\n", - pci_read_config(pci->pci_dev, PCIR_COMMAND, 1)); + pci_read_config(pcs->pci_dev, PCIR_COMMAND, 1)); } ==== //depot/projects/smpng/sys/dev/isp/ispvar.h#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.55 2002/03/21 21:10:16 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.56 2002/04/02 23:36:14 mjacob Exp $ */ /* * Soft Definitions for for Qlogic ISP SCSI adapters. * @@ -149,8 +149,12 @@ #define QENTRY_LEN 64 /* Both request and result queue length must be a power of two */ #define RQUEST_QUEUE_LEN(x) MAXISPREQUEST(x) +#ifdef ISP_TARGET_MODE +#define RESULT_QUEUE_LEN(x) MAXISPREQUEST(x) +#else #define RESULT_QUEUE_LEN(x) \ (((MAXISPREQUEST(x) >> 2) < 64)? 64 : MAXISPREQUEST(x) >> 2) +#endif #define ISP_QUEUE_ENTRY(q, idx) ((q) + ((idx) * QENTRY_LEN)) #define ISP_QUEUE_SIZE(n) ((n) * QENTRY_LEN) #define ISP_NXT_QENTRY(idx, qlen) (((idx) + 1) & ((qlen)-1)) ==== //depot/projects/smpng/sys/i386/conf/GENERIC#17 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.336 2002/03/17 23:48:24 des Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.337 2002/04/03 10:56:54 ru Exp $ machine i386 cpu I486_CPU @@ -44,7 +44,6 @@ options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI -options UCONSOLE #Allow users to grab the console #options USERCONFIG #boot -c editor #options VISUAL_USERCONFIG #visual boot -c editor options KTRACE #ktrace(1) support ==== //depot/projects/smpng/sys/i386/conf/NEWCARD#11 (text+ko) ==== @@ -19,7 +19,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.60 2002/03/06 19:44:08 cjc Exp $ +# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.61 2002/04/03 10:56:55 ru Exp $ machine i386 cpu I486_CPU @@ -48,7 +48,6 @@ options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI -options UCONSOLE #Allow users to grab the console #options USERCONFIG #boot -c editor #options VISUAL_USERCONFIG #visual boot -c editor options KTRACE #ktrace(1) support ==== //depot/projects/smpng/sys/i386/conf/NOTES#32 (text+ko) ==== @@ -11,7 +11,7 @@ # Please use ``make LINT'' to create an old-style LINT file if you want to # do kernel test-builds. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1014 2002/04/01 19:25:22 jhb Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1015 2002/04/03 10:56:56 ru Exp $ # # @@ -427,10 +427,6 @@ options COMPILING_LINT -# XXX - this doesn't belong here. -# Allow ordinary users to take the console - this is useful for X. -options UCONSOLE - # XXX - this doesn't belong here either #options USERCONFIG #boot -c editor #options INTRO_USERCONFIG #imply -c and show intro screen ==== //depot/projects/smpng/sys/i386/i386/i386dump.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/i386dump.c,v 1.1 2002/03/31 22:36:44 phk Exp $ + * $FreeBSD: src/sys/i386/i386/i386dump.c,v 1.2 2002/04/03 07:24:07 marcel Exp $ */ #include @@ -44,6 +44,8 @@ #include #include +CTASSERT(sizeof(struct kerneldumpheader) == 512); + static struct kerneldumpheader kdh; void @@ -57,21 +59,14 @@ printf("Dumping %u MB\n", Maxmem / (1024*1024 / PAGE_SIZE)); - if (sizeof kdh != 512) { - printf( - "Compiled struct kerneldumpheader is %d, not %d bytes\n", - sizeof kdh, 512); - return; - } - /* Fill in the kernel dump header */ strcpy(kdh.magic, KERNELDUMPMAGIC); strcpy(kdh.architecture, "i386"); - kdh.version = KERNELDUMPVERSION; - kdh.architectureversion = KERNELDUMP_I386_VERSION; - kdh.dumplength = Maxmem * (off_t)PAGE_SIZE; - kdh.blocksize = di->blocksize; - kdh.dumptime = time_second; + kdh.version = htod32(KERNELDUMPVERSION); + kdh.architectureversion = htod32(KERNELDUMP_I386_VERSION); + kdh.dumplength = htod64(Maxmem * (off_t)PAGE_SIZE); + kdh.dumptime = htod64(time_second); + kdh.blocksize = htod32(di->blocksize); strncpy(kdh.hostname, hostname, sizeof kdh.hostname); strncpy(kdh.versionstring, version, sizeof kdh.versionstring); if (panicstr != NULL) ==== //depot/projects/smpng/sys/i386/i386/machdep.c#30 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.509 2002/04/01 21:30:41 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.510 2002/04/02 22:19:14 jhb Exp $ */ #include "opt_atalk.h" ==== //depot/projects/smpng/sys/ia64/conf/GENERIC#13 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.26 2002/03/19 11:21:12 peter Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.27 2002/04/03 10:56:57 ru Exp $ machine ia64 cpu ITANIUM @@ -48,7 +48,6 @@ options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI -options UCONSOLE #Allow users to grab the console options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/smpng/sys/ia64/conf/SKI#3 (text+ko) ==== @@ -20,7 +20,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/ia64/conf/SKI,v 1.2 2002/03/04 18:01:56 dfr Exp $ +# $FreeBSD: src/sys/ia64/conf/SKI,v 1.3 2002/04/03 10:56:57 ru Exp $ machine ia64 cpu ITANIUM @@ -47,7 +47,6 @@ options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=2000 #Delay (in ms) before probing SCSI -options UCONSOLE #Allow users to grab the console options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/smpng/sys/ia64/ia64/ia64dump.c#2 (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/sys/ia64/ia64/ia64dump.c,v 1.1 2002/04/02 10:51:32 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/ia64dump.c,v 1.3 2002/04/03 07:24:10 marcel Exp $ */ #include @@ -38,6 +38,8 @@ #include #include +CTASSERT(sizeof(struct kerneldumpheader) == 512); + #define MD_ALIGN(x) (((off_t)(x) + EFI_PAGE_MASK) & ~EFI_PAGE_MASK) typedef int callback_t(EFI_MEMORY_DESCRIPTOR*, int, void*); @@ -55,21 +57,14 @@ uint32_t blksz) { - if (sizeof(*kdh) != DEV_BSIZE) { - printf( - "Compiled struct kerneldumpheader is %d, not %d bytes\n", - sizeof(*kdh), DEV_BSIZE); - return; - } - bzero(kdh, sizeof(*kdh)); strncpy(kdh->magic, KERNELDUMPMAGIC, sizeof(kdh->magic)); strncpy(kdh->architecture, MACHINE_ARCH, sizeof(kdh->architecture)); - kdh->version = KERNELDUMPVERSION; - kdh->architectureversion = archver; - kdh->dumplength = dumplen; - kdh->blocksize = blksz; - kdh->dumptime = time_second; + kdh->version = htod32(KERNELDUMPVERSION); + kdh->architectureversion = htod32(archver); + kdh->dumplength = htod64(dumplen); + kdh->dumptime = htod64(time_second); + kdh->blocksize = htod32(blksz); strncpy(kdh->hostname, hostname, sizeof(kdh->hostname)); strncpy(kdh->versionstring, version, sizeof(kdh->versionstring)); if (panicstr != NULL) @@ -124,17 +119,19 @@ vm_offset_t pa; uint64_t pgs; size_t sz; - int error; + int error, twiddle; - printf(" region %d:", seqnr); - error = 0; /* catch case in which mdp->NumberOfPages is 0 */ + twiddle = 0; pgs = mdp->NumberOfPages; pa = IA64_PHYS_TO_RR7(mdp->PhysicalStart); + + printf(" region %d: %ld pages ", seqnr, (long)pgs); + while (pgs) { sz = (pgs > (DFLTPHYS >> EFI_PAGE_SHIFT)) ? DFLTPHYS : pgs << EFI_PAGE_SHIFT; - printf(" %lld", pgs); + printf("%c\b", "|/-\\"[twiddle++ & 3]); error = di->dumper(di->priv, (void*)pa, NULL, dumplo, sz); if (error) break; @@ -142,7 +139,7 @@ pgs -= sz >> EFI_PAGE_SHIFT; pa += sz; } - printf("\n"); + printf("... %s\n", (error) ? "fail" : "ok"); return (error); } @@ -215,7 +212,11 @@ ehdr.e_ident[EI_MAG2] = ELFMAG2; ehdr.e_ident[EI_MAG3] = ELFMAG3; ehdr.e_ident[EI_CLASS] = ELFCLASS64; +#if BYTE_ORDER == LITTLE_ENDIAN ehdr.e_ident[EI_DATA] = ELFDATA2LSB; +#else + ehdr.e_ident[EI_DATA] = ELFDATA2MSB; +#endif ehdr.e_ident[EI_VERSION] = EV_CURRENT; ehdr.e_ident[EI_OSABI] = ELFOSABI_STANDALONE; /* XXX big picture? */ ehdr.e_type = ET_CORE; ==== //depot/projects/smpng/sys/ia64/ia64/machdep.c#32 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.86 2002/04/02 07:20:42 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.88 2002/04/03 05:16:09 marcel Exp $ */ #include "opt_compat.h" @@ -109,7 +109,7 @@ u_int64_t ia64_pal_base; u_int64_t ia64_port_base; -char machine[] = "ia64"; +char machine[] = MACHINE; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, ""); static char cpu_model[128]; @@ -139,9 +139,7 @@ struct msgbuf *msgbufp=0; int Maxmem = 0; -long dumplo; - >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 3 19:54:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E0D137B41D; Wed, 3 Apr 2002 19:53:19 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AE30537B41C for ; Wed, 3 Apr 2002 19:53:16 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g343rCa78736 for perforce@freebsd.org; Wed, 3 Apr 2002 19:53:12 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Apr 2002 19:53:12 -0800 (PST) Message-Id: <200204040353.g343rCa78736@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9005 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9005 Change 9005 by peter@peter_daintree on 2002/04/03 19:52:29 IFC @9004 Affected files ... ... //depot/projects/ia64/Makefile.inc1#14 integrate ... //depot/projects/ia64/bin/dd/dd.1#2 integrate ... //depot/projects/ia64/bin/test/test.c#6 integrate ... //depot/projects/ia64/contrib/gcc.295/config/i386/freebsd.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/crtbegin.asm#3 delete ... //depot/projects/ia64/contrib/gcc/config/alpha/crtend.asm#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#5 integrate ... //depot/projects/ia64/contrib/isc-dhcp/FREEBSD-upgrade#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/Makefile.conf#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/README#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/RELNOTES#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/client/clparse.c#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.c#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/client/dhclient.conf.5#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/common/conflex.c#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/common/dns.c#2 integrate ... //depot/projects/ia64/contrib/isc-dhcp/common/options.c#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/common/print.c#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/common/tables.c#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/configure#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/includes/dhcpd.h#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/includes/dhctoken.h#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/includes/minires/minires.h#2 integrate ... //depot/projects/ia64/contrib/isc-dhcp/includes/site.h#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/includes/version.h#3 integrate ... //depot/projects/ia64/contrib/isc-dhcp/minires/ns_parse.c#2 integrate ... //depot/projects/ia64/contrib/isc-dhcp/minires/ns_verify.c#2 integrate ... //depot/projects/ia64/contrib/openpam/HISTORY#4 integrate ... //depot/projects/ia64/contrib/openpam/INSTALL#4 integrate ... //depot/projects/ia64/contrib/openpam/LICENSE#4 integrate ... //depot/projects/ia64/contrib/openpam/MANIFEST#4 integrate ... //depot/projects/ia64/contrib/openpam/Makefile#4 integrate ... //depot/projects/ia64/contrib/openpam/README#4 integrate ... //depot/projects/ia64/contrib/openpam/RELNOTES#4 integrate ... //depot/projects/ia64/contrib/openpam/bin/Makefile#4 integrate ... //depot/projects/ia64/contrib/openpam/bin/su/Makefile#4 integrate ... //depot/projects/ia64/contrib/openpam/bin/su/su.c#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/Makefile#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/Makefile#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#4 integrate ... //depot/projects/ia64/contrib/openpam/include/security/openpam.h#4 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_appl.h#4 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_constants.h#4 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_modules.h#4 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_types.h#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/Makefile#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_dispatch.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_findenv.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_get_option.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_load.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_set_option.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_static.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_acct_mgmt.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_authenticate.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_authenticate_secondary.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_chauthtok.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_close_session.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_end.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_error.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_data.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_item.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_authtok.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_username.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_user.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_getenv.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_getenvlist.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_info.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_open_session.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_prompt.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_putenv.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_set_data.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_set_item.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_authtok.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_username.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_setcred.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_setenv.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_acct_mgmt.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_chauthtok.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_close_session.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_username.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_open_session.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_username.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_setcred.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_start.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_strerror.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_verror.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_vinfo.c#4 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_vprompt.c#4 integrate ... //depot/projects/ia64/contrib/openpam/misc/gendoc.pl#4 integrate ... //depot/projects/ia64/contrib/openpam/modules/Makefile#4 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_deny/Makefile#4 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_deny/pam_deny.c#4 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_dummy/Makefile#4 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_dummy/pam_dummy.c#4 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_permit/Makefile#4 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_permit/pam_permit.c#4 integrate ... //depot/projects/ia64/crypto/openssh/readconf.c#3 integrate ... //depot/projects/ia64/crypto/openssh/ssh_config#3 integrate ... //depot/projects/ia64/crypto/openssh/sshconnect2.c#3 integrate ... //depot/projects/ia64/crypto/openssh/sshd_config#3 integrate ... //depot/projects/ia64/crypto/openssh/version.h#5 integrate ... //depot/projects/ia64/etc/MAKEDEV#8 integrate ... //depot/projects/ia64/etc/defaults/rc.conf#6 integrate ... //depot/projects/ia64/etc/mail/Makefile#4 integrate ... //depot/projects/ia64/etc/rc#9 integrate ... //depot/projects/ia64/etc/rc.network#12 integrate ... //depot/projects/ia64/games/fortune/datfiles/fortunes#10 integrate ... //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#4 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/gdb/i386/tm.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile.alpha#4 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile.i386#4 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile.ia64#4 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile.powerpc#4 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile.sparc64#5 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile.inc#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1obj/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1plus/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_int/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cvs/cvsbug/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cvs/lib/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#5 integrate ... //depot/projects/ia64/gnu/usr.bin/sort/COPYING#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/Makefile#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/config.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/error.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/error.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/getopt.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/getopt.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/getopt1.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/long-options.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/long-options.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/sort.1#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/sort.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/system.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/version.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/version.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/xstrtod.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/sort/xstrtod.h#2 delete ... //depot/projects/ia64/include/Makefile#9 integrate ... //depot/projects/ia64/include/arpa/inet.h#6 integrate ... //depot/projects/ia64/include/disktab.h#2 delete ... //depot/projects/ia64/include/grp.h#5 integrate ... //depot/projects/ia64/include/unistd.h#6 integrate ... //depot/projects/ia64/lib/Makefile#7 integrate ... //depot/projects/ia64/lib/csu/alpha/Makefile#2 integrate ... //depot/projects/ia64/lib/csu/alpha/crt1.c#2 integrate ... //depot/projects/ia64/lib/csu/i386-elf/Makefile#2 integrate ... //depot/projects/ia64/lib/csu/i386-elf/crt1.c#3 integrate ... //depot/projects/ia64/lib/csu/i386/Makefile#2 integrate ... //depot/projects/ia64/lib/csu/i386/crt0.c#2 integrate ... //depot/projects/ia64/lib/csu/ia64/Makefile#2 integrate ... //depot/projects/ia64/lib/csu/ia64/crt1.c#3 integrate ... //depot/projects/ia64/lib/csu/powerpc/Makefile#2 integrate ... //depot/projects/ia64/lib/csu/powerpc/crt1.c#5 integrate ... //depot/projects/ia64/lib/csu/sparc64/Makefile#3 integrate ... //depot/projects/ia64/lib/csu/sparc64/crt1.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/disklabel.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/err.c#5 integrate ... //depot/projects/ia64/lib/libc/gen/getlogin.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/getprogname.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/setproctitle.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/setprogname.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/syslog.c#4 integrate ... //depot/projects/ia64/lib/libc/gmon/gmon.c#3 integrate ... //depot/projects/ia64/lib/libc/include/libc_private.h#2 integrate ... //depot/projects/ia64/lib/libc/include/namespace.h#4 integrate ... //depot/projects/ia64/lib/libc/include/un-namespace.h#3 integrate ... //depot/projects/ia64/lib/libc/locale/collate.c#3 integrate ... //depot/projects/ia64/lib/libc/net/res_send.c#4 integrate ... //depot/projects/ia64/lib/libc/stdlib/getopt.c#3 integrate ... //depot/projects/ia64/lib/libc/stdlib/malloc.c#7 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_spinlock.c#2 integrate ... //depot/projects/ia64/lib/libfetch/http.c#4 integrate ... //depot/projects/ia64/lib/libncp/ncpl_subr.c#2 integrate ... //depot/projects/ia64/lib/libusb/Makefile#2 delete ... //depot/projects/ia64/lib/libusb/data.c#2 delete ... //depot/projects/ia64/lib/libusb/descr.c#3 delete ... //depot/projects/ia64/lib/libusb/libusb.h#3 delete ... //depot/projects/ia64/lib/libusb/parse.c#2 delete ... //depot/projects/ia64/lib/libusb/usage.c#2 delete ... //depot/projects/ia64/lib/libusb/usb.3#2 delete ... //depot/projects/ia64/lib/libusb/usbvar.h#2 delete ... //depot/projects/ia64/lib/libusbhid/Makefile#1 branch ... //depot/projects/ia64/lib/libusbhid/data.c#1 branch ... //depot/projects/ia64/lib/libusbhid/descr.c#1 branch ... //depot/projects/ia64/lib/libusbhid/libusbhid.h#1 branch ... //depot/projects/ia64/lib/libusbhid/parse.c#1 branch ... //depot/projects/ia64/lib/libusbhid/usage.c#1 branch ... //depot/projects/ia64/lib/libusbhid/usbhid.3#1 branch ... //depot/projects/ia64/lib/libusbhid/usbvar.h#1 branch ... //depot/projects/ia64/lib/libz/infcodes.c#3 integrate ... //depot/projects/ia64/libexec/revnetgroup/parse_netgroup.c#3 integrate ... //depot/projects/ia64/libexec/rtld-elf/rtld.c#3 integrate ... //depot/projects/ia64/release/Makefile#7 integrate ... //depot/projects/ia64/release/alpha/drivers.conf#1 branch ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml#3 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#7 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#4 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/readme/article.sgml#6 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#15 integrate ... //depot/projects/ia64/release/picobsd/tinyware/ns/ns.c#3 integrate ... //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#7 integrate ... //depot/projects/ia64/sbin/Makefile#7 integrate ... //depot/projects/ia64/sbin/atacontrol/atacontrol.8#5 integrate ... //depot/projects/ia64/sbin/atacontrol/atacontrol.c#4 integrate ... //depot/projects/ia64/sbin/camcontrol/camcontrol.c#5 integrate ... //depot/projects/ia64/sbin/disklabel/disklabel.c#6 integrate ... //depot/projects/ia64/sbin/dumpon/Makefile#3 integrate ... //depot/projects/ia64/sbin/dumpon/dumpon.c#3 integrate ... //depot/projects/ia64/sbin/fdisk/Makefile#3 integrate ... //depot/projects/ia64/sbin/fdisk/fdisk.c#3 integrate ... //depot/projects/ia64/sbin/fdisk_pc98/fdisk.c#2 integrate ... //depot/projects/ia64/sbin/ifconfig/ifconfig.8#5 integrate ... //depot/projects/ia64/sbin/ifconfig/ifconfig.c#4 integrate ... //depot/projects/ia64/sbin/newfs/mkfs.c#6 integrate ... //depot/projects/ia64/sbin/newfs/newfs.c#7 integrate ... //depot/projects/ia64/sbin/ping/ping.c#5 integrate ... //depot/projects/ia64/sbin/savecore/Makefile#3 integrate ... //depot/projects/ia64/sbin/savecore/savecore.c#7 integrate ... //depot/projects/ia64/share/dict/Makefile#4 integrate ... //depot/projects/ia64/share/dict/README#3 integrate ... //depot/projects/ia64/share/dict/freebsd#1 branch ... //depot/projects/ia64/share/dict/tech#2 delete ... //depot/projects/ia64/share/examples/etc/make.conf#5 integrate ... //depot/projects/ia64/share/examples/smbfs/Makefile#3 integrate ... //depot/projects/ia64/share/examples/smbfs/print/Makefile#2 integrate ... //depot/projects/ia64/share/man/man4/Makefile#6 integrate ... //depot/projects/ia64/share/man/man4/bktr.4#3 integrate ... //depot/projects/ia64/share/man/man4/bpf.4#4 integrate ... //depot/projects/ia64/share/man/man4/geom.4#1 branch ... //depot/projects/ia64/share/man/man4/ng_ether.4#2 integrate ... //depot/projects/ia64/share/man/man5/Makefile#3 integrate ... //depot/projects/ia64/share/man/man5/disktab.5#2 integrate ... //depot/projects/ia64/share/man/man5/drivers.conf.5#2 integrate ... //depot/projects/ia64/share/man/man5/rc.conf.5#11 integrate ... //depot/projects/ia64/share/man/man7/hier.7#5 integrate ... //depot/projects/ia64/share/man/man7/sec-doc.7#2 integrate ... //depot/projects/ia64/share/man/man9/Makefile#6 integrate ... //depot/projects/ia64/share/man/man9/VOP_ACCESS.9#4 integrate ... //depot/projects/ia64/share/man/man9/VOP_ATTRIB.9#4 integrate ... //depot/projects/ia64/share/man/man9/VOP_FSYNC.9#3 integrate ... //depot/projects/ia64/share/man/man9/VOP_GETACL.9#3 integrate ... //depot/projects/ia64/share/man/man9/VOP_IOCTL.9#3 integrate ... //depot/projects/ia64/share/man/man9/condvar.9#3 integrate ... //depot/projects/ia64/share/man/man9/mtx_pool.9#1 branch ... //depot/projects/ia64/share/man/man9/mutex.9#3 integrate ... //depot/projects/ia64/share/man/man9/sema.9#3 integrate ... //depot/projects/ia64/share/man/man9/suser.9#3 integrate ... //depot/projects/ia64/share/man/man9/sx.9#3 integrate ... //depot/projects/ia64/share/misc/pci_vendors#7 integrate ... //depot/projects/ia64/share/mk/bsd.libnames.mk#3 integrate ... //depot/projects/ia64/share/mklocale/bg_BG.CP1251.src#3 integrate ... //depot/projects/ia64/sys/alpha/alpha/autoconf.c#3 integrate ... //depot/projects/ia64/sys/alpha/alpha/critical.c#1 branch ... //depot/projects/ia64/sys/alpha/alpha/dec_eb64plus.c#3 integrate ... //depot/projects/ia64/sys/alpha/alpha/exception.s#3 integrate ... //depot/projects/ia64/sys/alpha/alpha/genassym.c#4 integrate ... //depot/projects/ia64/sys/alpha/alpha/machdep.c#8 integrate ... //depot/projects/ia64/sys/alpha/alpha/promcons.c#4 integrate ... //depot/projects/ia64/sys/alpha/alpha/sys_machdep.c#3 integrate ... //depot/projects/ia64/sys/alpha/alpha/trap.c#7 integrate ... //depot/projects/ia64/sys/alpha/conf/GENERIC#6 integrate ... //depot/projects/ia64/sys/alpha/conf/SIMOS#3 integrate ... //depot/projects/ia64/sys/alpha/include/cpufunc.h#4 integrate ... //depot/projects/ia64/sys/alpha/include/critical.h#1 branch ... //depot/projects/ia64/sys/alpha/include/proc.h#3 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#5 integrate ... //depot/projects/ia64/sys/alpha/tlsb/zs_tlsb.c#4 integrate ... //depot/projects/ia64/sys/boot/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/common/Makefile.inc#2 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/arch/ia64/start.S#2 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/efifs.c#3 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#2 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/elf_freebsd.c#2 integrate ... //depot/projects/ia64/sys/boot/efi/loader/Makefile#4 integrate ... //depot/projects/ia64/sys/boot/efi/loader/main.c#2 integrate ... //depot/projects/ia64/sys/boot/efi/loader/version#2 integrate ... //depot/projects/ia64/sys/boot/i386/loader/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/ia64/libski/elf_freebsd.c#4 integrate ... //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#6 integrate ... //depot/projects/ia64/sys/boot/ia64/skiload/version#2 integrate ... //depot/projects/ia64/sys/boot/pc98/loader/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/sparc64/Makefile#1 branch ... //depot/projects/ia64/sys/boot/sparc64/boot1/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/sparc64/boot1/_start.S#1 branch ... //depot/projects/ia64/sys/boot/sparc64/bootblock/Makefile#2 delete ... //depot/projects/ia64/sys/boot/sparc64/bootblock/bootblock.c#2 delete ... //depot/projects/ia64/sys/boot/sparc64/loader/Makefile#3 integrate ... //depot/projects/ia64/sys/boot/sparc64/loader/help.sparc64#1 branch ... //depot/projects/ia64/sys/boot/sparc64/loader/locore.S#1 branch ... //depot/projects/ia64/sys/boot/sparc64/loader/locore.s#3 delete ... //depot/projects/ia64/sys/boot/sparc64/loader/main.c#3 integrate ... //depot/projects/ia64/sys/boot/sparc64/loader/metadata.c#3 integrate ... //depot/projects/ia64/sys/cam/scsi/scsi_all.c#5 integrate ... //depot/projects/ia64/sys/cam/scsi/scsi_da.c#12 integrate ... //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#5 integrate ... //depot/projects/ia64/sys/compat/linux/linux_misc.c#6 integrate ... //depot/projects/ia64/sys/compat/linux/linux_uid16.c#3 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#4 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#4 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_stat.c#4 integrate ... //depot/projects/ia64/sys/conf/NOTES#1 branch ... //depot/projects/ia64/sys/conf/files#12 integrate ... //depot/projects/ia64/sys/conf/files.alpha#4 integrate ... //depot/projects/ia64/sys/conf/files.i386#8 integrate ... //depot/projects/ia64/sys/conf/files.ia64#3 integrate ... //depot/projects/ia64/sys/conf/files.pc98#6 integrate ... //depot/projects/ia64/sys/conf/files.powerpc#4 integrate ... //depot/projects/ia64/sys/conf/files.sparc64#7 integrate ... //depot/projects/ia64/sys/conf/options#7 integrate ... //depot/projects/ia64/sys/dev/aac/aac_disk.c#5 integrate ... //depot/projects/ia64/sys/dev/aac/aac_pci.c#4 integrate ... //depot/projects/ia64/sys/dev/an/if_an.c#7 integrate ... //depot/projects/ia64/sys/dev/asr/asr.c#5 integrate ... //depot/projects/ia64/sys/dev/ata/ata-all.c#10 integrate ... //depot/projects/ia64/sys/dev/ata/ata-disk.c#6 integrate ... //depot/projects/ia64/sys/dev/ata/ata-dma.c#8 integrate ... //depot/projects/ia64/sys/dev/ata/ata-pci.c#8 integrate ... //depot/projects/ia64/sys/dev/ata/ata-raid.c#7 integrate ... //depot/projects/ia64/sys/dev/ata/ata-raid.h#5 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-cd.c#8 integrate ... //depot/projects/ia64/sys/dev/awi/awi.c#3 integrate ... //depot/projects/ia64/sys/dev/awi/awi_wep.c#3 integrate ... //depot/projects/ia64/sys/dev/awi/awi_wicfg.c#3 integrate ... //depot/projects/ia64/sys/dev/ccd/ccd.c#6 integrate ... //depot/projects/ia64/sys/dev/cnw/if_cnw.c#4 integrate ... //depot/projects/ia64/sys/dev/dgb/dgb.c#5 integrate ... //depot/projects/ia64/sys/dev/digi/digi.c#6 integrate ... //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#6 integrate ... //depot/projects/ia64/sys/dev/ida/ida_disk.c#4 integrate ... //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#5 integrate ... //depot/projects/ia64/sys/dev/isp/isp_pci.c#4 integrate ... //depot/projects/ia64/sys/dev/isp/ispvar.h#5 integrate ... //depot/projects/ia64/sys/dev/kbd/atkbdc.c#4 integrate ... //depot/projects/ia64/sys/dev/nmdm/nmdm.c#4 integrate ... //depot/projects/ia64/sys/dev/null/null.c#2 integrate ... //depot/projects/ia64/sys/dev/ofw/ofw_console.c#3 integrate ... //depot/projects/ia64/sys/dev/pccard/pccard_cis.c#5 integrate ... //depot/projects/ia64/sys/dev/pccard/pccarddevs#9 integrate ... //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#9 integrate ... //depot/projects/ia64/sys/dev/pdq/if_fea.c#3 integrate ... //depot/projects/ia64/sys/dev/pdq/if_fpa.c#2 integrate ... //depot/projects/ia64/sys/dev/pdq/pdq.c#2 integrate ... //depot/projects/ia64/sys/dev/pdq/pdq_freebsd.h#1 branch ... //depot/projects/ia64/sys/dev/pdq/pdq_ifsubr.c#3 integrate ... //depot/projects/ia64/sys/dev/pdq/pdqreg.h#2 integrate ... //depot/projects/ia64/sys/dev/pdq/pdqvar.h#2 integrate ... //depot/projects/ia64/sys/dev/puc/pucdata.c#2 integrate ... //depot/projects/ia64/sys/dev/random/randomdev.c#3 integrate ... //depot/projects/ia64/sys/dev/rp/rp.c#5 integrate ... //depot/projects/ia64/sys/dev/sbni/if_sbni.c#3 integrate ... //depot/projects/ia64/sys/dev/si/si.c#2 integrate ... //depot/projects/ia64/sys/dev/sio/sio.c#7 integrate ... //depot/projects/ia64/sys/dev/syscons/syscons.c#4 integrate ... //depot/projects/ia64/sys/dev/syscons/sysmouse.c#2 integrate ... //depot/projects/ia64/sys/dev/twe/twe_freebsd.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/devlist2h.awk#2 integrate ... //depot/projects/ia64/sys/dev/usb/hid.h#2 integrate ... //depot/projects/ia64/sys/dev/usb/if_aue.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/if_cue.c#3 integrate ... //depot/projects/ia64/sys/dev/usb/if_kue.c#3 integrate ... //depot/projects/ia64/sys/dev/usb/ohci.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/ohcireg.h#3 integrate ... //depot/projects/ia64/sys/dev/usb/ohcivar.h#4 integrate ... //depot/projects/ia64/sys/dev/usb/ucom.c#2 integrate ... //depot/projects/ia64/sys/dev/usb/uhci.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/uhcivar.h#4 integrate ... //depot/projects/ia64/sys/dev/usb/uhid.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/uhub.c#3 integrate ... //depot/projects/ia64/sys/dev/usb/ukbd.c#3 integrate ... //depot/projects/ia64/sys/dev/usb/umass.c#7 integrate ... //depot/projects/ia64/sys/dev/usb/umodem.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/ums.c#6 integrate ... //depot/projects/ia64/sys/dev/usb/urio.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/usb.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/usb_port.h#4 integrate ... //depot/projects/ia64/sys/dev/usb/usb_subr.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs#8 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs.h#7 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#7 integrate ... //depot/projects/ia64/sys/dev/usb/usbdi.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/usbdi.h#3 integrate ... //depot/projects/ia64/sys/dev/usb/usbdi_util.c#2 integrate ... //depot/projects/ia64/sys/dev/usb/usbdi_util.h#2 integrate ... //depot/projects/ia64/sys/dev/usb/usbdivar.h#5 integrate ... //depot/projects/ia64/sys/dev/usb/uvscom.c#2 integrate ... //depot/projects/ia64/sys/dev/vinum/vinum.c#3 integrate ... //depot/projects/ia64/sys/dev/vinum/vinumext.h#2 integrate ... //depot/projects/ia64/sys/dev/vinum/vinumio.c#3 integrate ... //depot/projects/ia64/sys/dev/vinum/vinumioctl.c#3 integrate ... //depot/projects/ia64/sys/dev/vinum/vinumobj.h#2 integrate ... //depot/projects/ia64/sys/dev/wi/if_wavelan_ieee.h#3 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi.c#11 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#1 branch ... //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#1 branch ... //depot/projects/ia64/sys/dev/wi/if_wireg.h#5 integrate ... //depot/projects/ia64/sys/dev/wi/if_wivar.h#1 branch ... //depot/projects/ia64/sys/dev/wl/if_wl.c#3 integrate ... //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#6 integrate ... //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#7 integrate ... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate ... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_ioctl.c#3 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_status.c#5 integrate ... //depot/projects/ia64/sys/fs/umapfs/umap_vfsops.c#4 integrate ... //depot/projects/ia64/sys/geom/geom_bsd.c#4 integrate ... //depot/projects/ia64/sys/geom/geom_dev.c#5 integrate ... //depot/projects/ia64/sys/geom/geom_disk.c#4 integrate ... //depot/projects/ia64/sys/geom/geom_dump.c#3 integrate ... //depot/projects/ia64/sys/geom/geom_mbr.c#3 integrate ... //depot/projects/ia64/sys/geom/geom_pc98.c#1 branch ... //depot/projects/ia64/sys/geom/geom_slice.c#5 integrate ... //depot/projects/ia64/sys/geom/geom_subr.c#3 integrate ... //depot/projects/ia64/sys/geom/geom_sunlabel.c#3 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_vfsops.c#8 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_vnops.c#5 integrate ... //depot/projects/ia64/sys/i386/conf/GENERIC#7 integrate ... //depot/projects/ia64/sys/i386/conf/Makefile#2 integrate ... //depot/projects/ia64/sys/i386/conf/NEWCARD#4 integrate ... //depot/projects/ia64/sys/i386/conf/NOTES#12 integrate ... //depot/projects/ia64/sys/i386/i386/autoconf.c#6 integrate ... //depot/projects/ia64/sys/i386/i386/bios.c#5 integrate ... //depot/projects/ia64/sys/i386/i386/critical.c#1 branch ... //depot/projects/ia64/sys/i386/i386/exception.s#3 integrate ... //depot/projects/ia64/sys/i386/i386/genassym.c#4 integrate ... //depot/projects/ia64/sys/i386/i386/i386dump.c#1 branch ... //depot/projects/ia64/sys/i386/i386/machdep.c#9 integrate ... //depot/projects/ia64/sys/i386/i386/mem.c#3 integrate ... //depot/projects/ia64/sys/i386/i386/mp_machdep.c#6 integrate ... //depot/projects/ia64/sys/i386/i386/mpapic.c#5 integrate ... //depot/projects/ia64/sys/i386/i386/swtch.s#4 integrate ... //depot/projects/ia64/sys/i386/i386/sys_machdep.c#6 integrate ... //depot/projects/ia64/sys/i386/i386/vm86.c#3 integrate ... //depot/projects/ia64/sys/i386/i386/vm_machdep.c#6 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_misc.c#3 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_socksys.c#4 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate ... //depot/projects/ia64/sys/i386/include/cpufunc.h#6 integrate ... //depot/projects/ia64/sys/i386/include/critical.h#1 branch ... //depot/projects/ia64/sys/i386/include/mutex.h#3 integrate ... //depot/projects/ia64/sys/i386/include/pcb.h#4 integrate ... //depot/projects/ia64/sys/i386/include/pcpu.h#3 integrate ... //depot/projects/ia64/sys/i386/include/proc.h#4 integrate ... //depot/projects/ia64/sys/i386/isa/apic_vector.s#3 integrate ... //depot/projects/ia64/sys/i386/isa/clock.c#4 integrate ... //depot/projects/ia64/sys/i386/isa/cx.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/cy.c#6 integrate ... //depot/projects/ia64/sys/i386/isa/icu_vector.s#3 integrate ... //depot/projects/ia64/sys/i386/isa/intr_machdep.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/intr_machdep.h#4 integrate ... //depot/projects/ia64/sys/i386/isa/ipl.s#2 integrate ... //depot/projects/ia64/sys/i386/isa/istallion.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/matcd/matcd.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/mcd.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/npx.c#7 integrate ... //depot/projects/ia64/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/pcvt/pcvt_ext.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/rc.c#5 integrate ... //depot/projects/ia64/sys/i386/isa/scd.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/spigot.c#4 integrate ... //depot/projects/ia64/sys/i386/isa/stallion.c#2 integrate ... //depot/projects/ia64/sys/i386/linux/linux_machdep.c#3 integrate ... //depot/projects/ia64/sys/i4b/driver/i4b_ipr.c#4 integrate ... //depot/projects/ia64/sys/ia64/conf/GENERIC#7 integrate ... //depot/projects/ia64/sys/ia64/conf/SKI#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/autoconf.c#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/critical.c#1 branch ... //depot/projects/ia64/sys/ia64/ia64/exception.s#9 integrate ... //depot/projects/ia64/sys/ia64/ia64/genassym.c#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/ia64dump.c#1 branch ... //depot/projects/ia64/sys/ia64/ia64/locore.s#6 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#21 integrate ... //depot/projects/ia64/sys/ia64/ia64/ssc.c#3 integrate ... //depot/projects/ia64/sys/ia64/include/cpufunc.h#5 integrate ... //depot/projects/ia64/sys/ia64/include/critical.h#1 branch ... //depot/projects/ia64/sys/ia64/include/proc.h#4 integrate ... //depot/projects/ia64/sys/isa/fd.c#4 integrate ... //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#7 integrate ... //depot/projects/ia64/sys/kern/init_main.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_acct.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_acl.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_condvar.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#11 integrate ... //depot/projects/ia64/sys/kern/kern_exec.c#10 integrate ... //depot/projects/ia64/sys/kern/kern_exit.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_fork.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_jail.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_ktr.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_ktrace.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_linker.c#12 integrate ... //depot/projects/ia64/sys/kern/kern_mib.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_mutex.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_ntptime.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_prot.c#10 integrate ... //depot/projects/ia64/sys/kern/kern_resource.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_shutdown.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_switch.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_sx.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_sysctl.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_tc.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_time.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_xxx.c#2 integrate ... //depot/projects/ia64/sys/kern/subr_bus.c#5 integrate ... //depot/projects/ia64/sys/kern/subr_disk.c#5 integrate ... //depot/projects/ia64/sys/kern/subr_disklabel.c#5 integrate ... //depot/projects/ia64/sys/kern/subr_diskslice.c#5 integrate ... //depot/projects/ia64/sys/kern/subr_eventhandler.c#2 integrate ... //depot/projects/ia64/sys/kern/subr_prf.c#7 integrate ... //depot/projects/ia64/sys/kern/subr_trap.c#5 integrate ... //depot/projects/ia64/sys/kern/subr_witness.c#6 integrate ... //depot/projects/ia64/sys/kern/subr_xxx.c#3 integrate ... //depot/projects/ia64/sys/kern/sys_pipe.c#9 integrate ... //depot/projects/ia64/sys/kern/sysv_ipc.c#4 integrate ... //depot/projects/ia64/sys/kern/sysv_msg.c#4 integrate ... //depot/projects/ia64/sys/kern/tty.c#7 integrate ... //depot/projects/ia64/sys/kern/tty_cons.c#5 integrate ... //depot/projects/ia64/sys/kern/tty_pty.c#4 integrate ... //depot/projects/ia64/sys/kern/vfs_aio.c#7 integrate ... //depot/projects/ia64/sys/kern/vfs_bio.c#11 integrate ... //depot/projects/ia64/sys/kern/vfs_conf.c#6 integrate ... //depot/projects/ia64/sys/kern/vfs_subr.c#8 integrate ... //depot/projects/ia64/sys/kern/vfs_syscalls.c#11 integrate ... //depot/projects/ia64/sys/kern/vfs_vnops.c#9 integrate ... //depot/projects/ia64/sys/modules/wi/Makefile#3 integrate ... //depot/projects/ia64/sys/net/fddi.h#3 integrate ... //depot/projects/ia64/sys/net/if.c#5 integrate ... //depot/projects/ia64/sys/net/if_fddisubr.c#4 integrate ... //depot/projects/ia64/sys/net/if_llc.h#2 integrate ... //depot/projects/ia64/sys/net/if_ppp.c#4 integrate ... //depot/projects/ia64/sys/net/if_sl.c#4 integrate ... //depot/projects/ia64/sys/net/if_tap.c#6 integrate ... //depot/projects/ia64/sys/net/if_tun.c#3 integrate ... //depot/projects/ia64/sys/net/net_osdep.h#3 integrate ... //depot/projects/ia64/sys/net/ppp_tty.c#4 integrate ... //depot/projects/ia64/sys/net/raw_usrreq.c#3 integrate ... //depot/projects/ia64/sys/net/rtsock.c#4 integrate ... //depot/projects/ia64/sys/netatalk/at_control.c#2 integrate ... //depot/projects/ia64/sys/netatalk/ddp_usrreq.c#4 integrate ... //depot/projects/ia64/sys/netatm/atm_usrreq.c#3 integrate ... //depot/projects/ia64/sys/netgraph/ng_socket.c#4 integrate ... //depot/projects/ia64/sys/netgraph/ng_tty.c#4 integrate ... //depot/projects/ia64/sys/netinet/in.c#4 integrate ... //depot/projects/ia64/sys/netinet/in.h#6 integrate ... //depot/projects/ia64/sys/netinet/in_pcb.c#11 integrate ... //depot/projects/ia64/sys/netinet/ip_divert.c#6 integrate ... //depot/projects/ia64/sys/netinet/ip_output.c#8 integrate ... //depot/projects/ia64/sys/netinet/raw_ip.c#8 integrate ... //depot/projects/ia64/sys/netinet/tcp_subr.c#8 integrate ... //depot/projects/ia64/sys/netinet/udp_usrreq.c#8 integrate ... //depot/projects/ia64/sys/netinet6/in6.c#3 integrate ... //depot/projects/ia64/sys/netinet6/in6_pcb.c#5 integrate ... //depot/projects/ia64/sys/netinet6/in6_src.c#3 integrate ... //depot/projects/ia64/sys/netinet6/ip6_input.c#4 integrate ... //depot/projects/ia64/sys/netinet6/ip6_mroute.c#2 integrate ... //depot/projects/ia64/sys/netinet6/ip6_output.c#4 integrate ... //depot/projects/ia64/sys/netinet6/nd6.c#3 integrate ... //depot/projects/ia64/sys/netinet6/raw_ip6.c#3 integrate ... //depot/projects/ia64/sys/netinet6/udp6_output.c#2 integrate ... //depot/projects/ia64/sys/netinet6/udp6_usrreq.c#4 integrate ... //depot/projects/ia64/sys/netipx/ipx.c#2 integrate ... //depot/projects/ia64/sys/netipx/ipx_pcb.c#3 integrate ... //depot/projects/ia64/sys/netipx/ipx_usrreq.c#3 integrate ... //depot/projects/ia64/sys/netncp/ncp_subr.h#3 integrate ... //depot/projects/ia64/sys/netsmb/smb_subr.h#4 integrate ... //depot/projects/ia64/sys/nfsclient/nfs_lock.c#5 integrate ... //depot/projects/ia64/sys/nfsserver/nfs_serv.c#5 integrate ... //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#4 integrate ... //depot/projects/ia64/sys/pc98/conf/GENERIC#7 integrate ... //depot/projects/ia64/sys/pc98/i386/machdep.c#9 integrate ... //depot/projects/ia64/sys/pc98/pc98/clock.c#4 integrate ... //depot/projects/ia64/sys/pc98/pc98/fd.c#4 integrate ... //depot/projects/ia64/sys/pc98/pc98/sio.c#7 integrate ... //depot/projects/ia64/sys/pc98/pc98/syscons.c#4 integrate ... //depot/projects/ia64/sys/pc98/pc98/wd_cd.c#4 integrate ... //depot/projects/ia64/sys/pccard/pccard.c#6 integrate ... //depot/projects/ia64/sys/powerpc/include/cpufunc.h#5 integrate ... //depot/projects/ia64/sys/powerpc/include/critical.h#1 branch ... //depot/projects/ia64/sys/powerpc/include/proc.h#4 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/autoconf.c#3 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/critical.c#1 branch ... //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#7 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/trap.c#7 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#4 integrate ... //depot/projects/ia64/sys/security/lomac/kernel_mmap.c#5 integrate ... //depot/projects/ia64/sys/security/lomac/kernel_util.c#4 integrate ... //depot/projects/ia64/sys/sparc64/conf/GENERIC#5 integrate ... //depot/projects/ia64/sys/sparc64/include/cpufunc.h#6 integrate ... //depot/projects/ia64/sys/sparc64/include/critical.h#1 branch ... //depot/projects/ia64/sys/sparc64/include/iommureg.h#3 integrate ... //depot/projects/ia64/sys/sparc64/include/param.h#4 integrate ... //depot/projects/ia64/sys/sparc64/include/proc.h#4 integrate ... //depot/projects/ia64/sys/sparc64/include/tlb.h#4 integrate ... //depot/projects/ia64/sys/sparc64/include/upa.h#2 integrate ... //depot/projects/ia64/sys/sparc64/isa/isa.c#4 integrate ... //depot/projects/ia64/sys/sparc64/pci/psycho.c#5 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/autoconf.c#4 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/clock.c#2 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/critical.c#1 branch ... //depot/projects/ia64/sys/sparc64/sparc64/exception.s#7 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#7 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/iommu.c#4 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#8 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/mp_machdep.c#3 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#6 integrate ... //depot/projects/ia64/sys/sys/_mutex.h#3 integrate ... //depot/projects/ia64/sys/sys/_types.h#1 branch ... //depot/projects/ia64/sys/sys/ata.h#4 integrate ... //depot/projects/ia64/sys/sys/bus.h#3 integrate ... //depot/projects/ia64/sys/sys/cdefs.h#5 integrate ... //depot/projects/ia64/sys/sys/condvar.h#2 integrate ... //depot/projects/ia64/sys/sys/conf.h#8 integrate ... //depot/projects/ia64/sys/sys/disk.h#4 integrate ... //depot/projects/ia64/sys/sys/disklabel.h#8 integrate ... //depot/projects/ia64/sys/sys/eventhandler.h#3 integrate ... //depot/projects/ia64/sys/sys/filedesc.h#5 integrate ... //depot/projects/ia64/sys/sys/kerneldump.h#1 branch ... //depot/projects/ia64/sys/sys/ktr.h#3 integrate ... //depot/projects/ia64/sys/sys/lock.h#3 integrate ... //depot/projects/ia64/sys/sys/mutex.h#6 integrate ... //depot/projects/ia64/sys/sys/param.h#7 integrate ... //depot/projects/ia64/sys/sys/proc.h#10 integrate ... //depot/projects/ia64/sys/sys/stdint.h#2 integrate ... //depot/projects/ia64/sys/sys/sx.h#3 integrate ... //depot/projects/ia64/sys/sys/sysctl.h#5 integrate ... //depot/projects/ia64/sys/sys/systm.h#9 integrate ... //depot/projects/ia64/sys/sys/types.h#7 integrate ... //depot/projects/ia64/sys/sys/ucred.h#4 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#6 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_tables.c#2 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#9 integrate ... //depot/projects/ia64/sys/ufs/ffs/fs.h#4 integrate ... //depot/projects/ia64/sys/ufs/ifs/ifs_vnops.c#3 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#4 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_quota.c#4 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_readwrite.c#4 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_vfsops.c#4 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#7 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#4 integrate ... //depot/projects/ia64/sys/vm/uma_int.h#2 integrate ... //depot/projects/ia64/sys/vm/vm_mmap.c#5 integrate ... //depot/projects/ia64/sys/vm/vm_page.c#6 integrate ... //depot/projects/ia64/sys/vm/vm_swap.c#6 integrate ... //depot/projects/ia64/tools/regression/geom/Data/disk.alpha.da0.xml#1 branch ... //depot/projects/ia64/tools/regression/geom/Data/disk.alpha2.da0.xml#1 branch ... //depot/projects/ia64/tools/regression/geom/Data/disk.pc98.wdc0.xml#1 branch ... //depot/projects/ia64/tools/regression/geom/GLib/Makefile#3 integrate ... //depot/projects/ia64/tools/regression/geom/Test/Makefile#3 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T013/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T013/testprg.c#2 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T014/Makefile#1 branch ... //depot/projects/ia64/tools/regression/geom/Test/T014/ref.conf#1 branch ... //depot/projects/ia64/tools/regression/geom/Test/T014/testprg.c#1 branch ... //depot/projects/ia64/tools/regression/geom/geom_sim.h#3 integrate ... //depot/projects/ia64/tools/regression/geom/geom_simdisk_xml.c#3 integrate ... //depot/projects/ia64/tools/tools/commitsdb/query_commit_db#2 integrate ... //depot/projects/ia64/usr.bin/Makefile#12 integrate ... //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#9 integrate ... //depot/projects/ia64/usr.bin/chpass/chpass.c#5 integrate ... //depot/projects/ia64/usr.bin/chpass/edit.c#3 integrate ... //depot/projects/ia64/usr.bin/chpass/field.c#3 integrate ... //depot/projects/ia64/usr.bin/chpass/pw_yp.c#4 integrate ... //depot/projects/ia64/usr.bin/doscmd/int.c#3 integrate ... //depot/projects/ia64/usr.bin/doscmd/int14.c#3 integrate ... //depot/projects/ia64/usr.bin/doscmd/tty.c#4 integrate ... //depot/projects/ia64/usr.bin/elf2aout/elf2aout.1#2 delete ... //depot/projects/ia64/usr.bin/elf2aout/elf2aout.c#3 integrate ... //depot/projects/ia64/usr.bin/find/Makefile#5 integrate ... //depot/projects/ia64/usr.bin/find/extern.h#5 integrate ... //depot/projects/ia64/usr.bin/find/find.1#3 integrate ... //depot/projects/ia64/usr.bin/find/find.c#4 integrate ... //depot/projects/ia64/usr.bin/find/function.c#6 integrate ... //depot/projects/ia64/usr.bin/find/ls.c#4 integrate ... //depot/projects/ia64/usr.bin/find/main.c#4 integrate ... //depot/projects/ia64/usr.bin/find/misc.c#3 integrate ... //depot/projects/ia64/usr.bin/find/operator.c#5 integrate ... //depot/projects/ia64/usr.bin/find/option.c#4 integrate ... //depot/projects/ia64/usr.bin/find/parsedate.y#2 integrate ... //depot/projects/ia64/usr.bin/fstat/Makefile#2 integrate ... //depot/projects/ia64/usr.bin/fstat/fstat.1#2 integrate ... //depot/projects/ia64/usr.bin/fstat/fstat.c#5 integrate ... //depot/projects/ia64/usr.bin/fstat/fstat.h#3 integrate ... //depot/projects/ia64/usr.bin/gcore/Makefile#2 integrate ... //depot/projects/ia64/usr.bin/head/head.c#5 integrate ... //depot/projects/ia64/usr.bin/indent/args.c#2 integrate ... //depot/projects/ia64/usr.bin/indent/indent.c#2 integrate ... //depot/projects/ia64/usr.bin/indent/indent.h#2 integrate ... //depot/projects/ia64/usr.bin/indent/indent_globs.h#2 integrate ... //depot/projects/ia64/usr.bin/indent/io.c#2 integrate ... //depot/projects/ia64/usr.bin/indent/lexi.c#2 integrate ... //depot/projects/ia64/usr.bin/ipcs/ipcs.c#4 integrate ... //depot/projects/ia64/usr.bin/kdump/mkioctls#3 integrate ... //depot/projects/ia64/usr.bin/killall/killall.c#2 integrate ... //depot/projects/ia64/usr.bin/ktrace/ktrace.c#3 integrate ... //depot/projects/ia64/usr.bin/ktrace/ktrace.h#2 integrate ... //depot/projects/ia64/usr.bin/ktrace/subr.c#2 integrate ... //depot/projects/ia64/usr.bin/ktrdump/Makefile#1 branch ... //depot/projects/ia64/usr.bin/ktrdump/ktrdump.8#1 branch ... //depot/projects/ia64/usr.bin/ktrdump/ktrdump.c#1 branch ... //depot/projects/ia64/usr.bin/lex/Makefile#2 integrate ... //depot/projects/ia64/usr.bin/limits/Makefile#2 integrate ... //depot/projects/ia64/usr.bin/logger/logger.c#4 integrate ... //depot/projects/ia64/usr.bin/pr/pr.1#2 integrate ... //depot/projects/ia64/usr.bin/pr/pr.c#3 integrate ... //depot/projects/ia64/usr.bin/rsh/rsh.c#4 integrate ... //depot/projects/ia64/usr.bin/sort/init.c#3 integrate ... //depot/projects/ia64/usr.bin/sort/sort.1#3 integrate ... //depot/projects/ia64/usr.bin/sort/sort.c#3 integrate ... //depot/projects/ia64/usr.bin/su/su.1#2 integrate ... //depot/projects/ia64/usr.bin/tftp/tftp.c#4 integrate ... //depot/projects/ia64/usr.bin/usbhidctl/Makefile#2 integrate ... //depot/projects/ia64/usr.bin/usbhidctl/usbhid.c#3 integrate ... //depot/projects/ia64/usr.sbin/Makefile#9 integrate ... //depot/projects/ia64/usr.sbin/arp/arp.c#4 integrate ... //depot/projects/ia64/usr.sbin/burncd/burncd.8#4 integrate ... //depot/projects/ia64/usr.sbin/crunch/crunchgen/crunchgen.1#2 integrate ... //depot/projects/ia64/usr.sbin/crunch/crunchgen/crunchgen.c#2 integrate ... //depot/projects/ia64/usr.sbin/diskpart/Makefile#2 delete ... //depot/projects/ia64/usr.sbin/diskpart/diskpart.8#3 delete ... //depot/projects/ia64/usr.sbin/diskpart/diskpart.c#3 delete ... //depot/projects/ia64/usr.sbin/fdformat/fdformat.c#3 integrate ... //depot/projects/ia64/usr.sbin/kgmon/kgmon.8#2 integrate ... //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#4 integrate ... //depot/projects/ia64/usr.sbin/ntp/doc/ntp.conf.5#2 integrate ... //depot/projects/ia64/usr.sbin/ntp/doc/ntp.keys.5#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/add/extract.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/add/futil.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/add/main.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/add/perform.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/create/main.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/create/perform.c#3 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/create/pl.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/delete/main.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/delete/perform.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/main.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/perform.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/show.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/deps.c#3 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/exec.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/file.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/global.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/match.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/msg.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/pen.c#4 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/plist.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/str.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/version.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/sign/check.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/sign/common.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/sign/gzip.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/sign/main.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/sign/pgp_check.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/sign/pgp_sign.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/sign/sha1.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/sign/sign.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/sign/stand.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/sign/x509.c#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/Makefile#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/async.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/async.h#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/atm.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/bundle.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/ccp.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/ccp.h#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/chap.c#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/chap.h#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/chat.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/command.c#4 integrate ... //depot/projects/ia64/usr.sbin/ppp/datalink.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/datalink.h#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/defs.c#4 integrate ... //depot/projects/ia64/usr.sbin/ppp/defs.h#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/ether.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/exec.c#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/fsm.c#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/i4b.c#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/lcp.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/lcp.h#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/main.c#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/mppe.c#4 integrate ... //depot/projects/ia64/usr.sbin/ppp/netgraph.c#1 branch ... //depot/projects/ia64/usr.sbin/ppp/netgraph.h#1 branch ... //depot/projects/ia64/usr.sbin/ppp/physical.c#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/physical.h#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/route.c#4 integrate ... //depot/projects/ia64/usr.sbin/ppp/tcp.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/tty.c#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/udp.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/vjcomp.c#2 integrate ... //depot/projects/ia64/usr.sbin/rtsold/rtsold.c#2 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/Makefile#5 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/devices.c#3 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/disks.c#2 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/dispatch.c#2 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/dist.c#5 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/install.c#5 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/installUpgrade.c#3 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/main.c#2 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/media.c#3 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/menus.c#7 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/package.c#3 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.8#2 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#4 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/tcpip.c#3 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.246 2002/03/26 16:05:09 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.248 2002/04/01 20:47:27 joe Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -712,6 +712,7 @@ cd ${.CURDIR}/lib/libstand; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libtacplus; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcom_err; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libusbhid; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libutil; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libvgl; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libwrap; ${MAKE} beforeinstall ==== //depot/projects/ia64/bin/dd/dd.1#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.18 2001/08/15 09:09:34 ru Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.19 2002/03/31 20:49:37 keramida Exp $ .\" .Dd January 13, 1994 .Dt DD 1 @@ -43,7 +43,7 @@ .Nd convert and copy a file .Sh SYNOPSIS .Nm -.Op operands ... +.Op Ar operands ... .Sh DESCRIPTION The .Nm @@ -57,10 +57,11 @@ and truncated input records to the standard error output. .Pp The following operands are available: +.\" XXX .Bl -tag -width of=file -.It Cm bs= Ns Ar n +.It Cm bs Ns = Ns Ar n Set both input and output block size to -.Va n +.Ar n bytes, superseding the .Cm ibs and @@ -73,40 +74,40 @@ .Cm sync are specified, then each input block is copied to the output as a single block without any aggregation of short blocks. -.It Cm cbs= Ns Ar n +.It Cm cbs Ns = Ns Ar n Set the conversion record size to -.Va n +.Ar n bytes. The conversion record size is required by the record oriented conversion values. -.It Cm count= Ns Ar n +.It Cm count Ns = Ns Ar n Copy only -.Va n +.Ar n input blocks. -.It Cm files= Ns Ar n +.It Cm files Ns = Ns Ar n Copy -.Va n +.Ar n input files before terminating. This operand is only applicable when the input device is a tape. -.It Cm ibs= Ns Ar n +.It Cm ibs Ns = Ns Ar n Set the input block size to -.Va n +.Ar n bytes instead of the default 512. -.It Cm if= Ns Ar file +.It Cm if Ns = Ns Ar file Read input from .Ar file instead of the standard input. -.It Cm iseek= Ns Ar n +.It Cm iseek Ns = Ns Ar n Seek on the input file -.Va n +.Ar n blocks. This is synonymous with -.Cm skip= Ns Ar n . -.It Cm obs= Ns Ar n +.Cm skip Ns = Ns Ar n . +.It Cm obs Ns = Ns Ar n Set the output block size to -.Va n +.Ar n bytes instead of the default 512. -.It Cm of= Ns Ar file +.It Cm of Ns = Ns Ar file Write output to .Ar file instead of the standard output. @@ -117,15 +118,15 @@ .Cm oseek operand), the output file is truncated at that point. -.It Cm oseek= Ns Ar n +.It Cm oseek Ns = Ns Ar n Seek on the output file -.Va n +.Ar n blocks. This is synonymous with -.Cm seek= Ns Ar n . -.It Cm seek= Ns Ar n +.Cm seek Ns = Ns Ar n . +.It Cm seek Ns = Ns Ar n Seek -.Va n +.Ar n blocks from the beginning of the output before copying. On non-tape devices, an .Xr lseek 2 @@ -137,11 +138,11 @@ function calls. If the seek operation is past the end of file, space from the current end of file to the specified offset is filled with blocks of -.Tn NUL +.Dv NUL bytes. -.It Cm skip= Ns Ar n +.It Cm skip Ns = Ns Ar n Skip >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 3 22: 4: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55A9237B41C; Wed, 3 Apr 2002 22:03:59 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 81CB637B416 for ; Wed, 3 Apr 2002 22:03:58 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3463wo11707 for perforce@freebsd.org; Wed, 3 Apr 2002 22:03:58 -0800 (PST) (envelope-from peter@freebsd.org) Date: Wed, 3 Apr 2002 22:03:58 -0800 (PST) Message-Id: <200204040603.g3463wo11707@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9008 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9008 Change 9008 by peter@peter_thunder on 2002/04/03 22:02:57 correct the path to the libstand includes Affected files ... ... //depot/projects/ia64/sys/boot/efi/loader/Makefile#5 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/loader/Makefile#5 (text+ko) ==== @@ -10,7 +10,7 @@ SRCS+= main.c conf.c dev_net.c # Enable BootForth -#BOOT_FORTH= yes +BOOT_FORTH= yes CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE_ARCH} .if BOOT_FORTH CFLAGS+= -DBOOT_FORTH @@ -33,7 +33,7 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../../.. -I. CFLAGS+= -I${.CURDIR}/../libefi -CFLAGS+= -I/usr/src/lib/libstand +CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ CFLAGS+= -DLOADER LDSCRIPT= ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 7:14:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8425737B416; Thu, 4 Apr 2002 07:14:29 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7838837B405 for ; Thu, 4 Apr 2002 07:14:28 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g34FESj64004 for perforce@freebsd.org; Thu, 4 Apr 2002 07:14:28 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 4 Apr 2002 07:14:28 -0800 (PST) Message-Id: <200204041514.g34FESj64004@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9024 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9024 Change 9024 by jhb@jhb_zion on 2002/04/04 07:13:51 Add a kernel config for sparc64. Affected files ... ... //depot/projects/smpng/sys/sparc64/conf/SPARC64#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 7:29:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3B6437B417; Thu, 4 Apr 2002 07:29:49 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B697C37B421 for ; Thu, 4 Apr 2002 07:29:48 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g34FTmF67062 for perforce@freebsd.org; Thu, 4 Apr 2002 07:29:48 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 4 Apr 2002 07:29:48 -0800 (PST) Message-Id: <200204041529.g34FTmF67062@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9028 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9028 Change 9028 by jhb@jhb_zion on 2002/04/04 07:29:03 Bah, we don't have ATA_ENABLE_BUSMASTER in CVS. I wonder if a CVS kernel will run. :-P Affected files ... ... //depot/projects/smpng/sys/sparc64/conf/SPARC64#2 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/conf/SPARC64#2 (text+ko) ==== @@ -61,7 +61,7 @@ makeoptions NO_MODULES=true options PCI_ENABLE_IO_MODES -options ATA_ENABLE_BUSMASTER +#options ATA_ENABLE_BUSMASTER options DEBUGGER_ON_POWERFAIL options KTR To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 7:39:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A377F37B41A; Thu, 4 Apr 2002 07:39:01 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E78D637B405 for ; Thu, 4 Apr 2002 07:39:00 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g34Fd0E69115 for perforce@freebsd.org; Thu, 4 Apr 2002 07:39:00 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 4 Apr 2002 07:39:00 -0800 (PST) Message-Id: <200204041539.g34Fd0E69115@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9030 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9030 Change 9030 by jhb@jhb_zion on 2002/04/04 07:38:58 Turn off drivers not present in CVS. Affected files ... ... //depot/projects/smpng/sys/sparc64/conf/SPARC64#3 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/conf/SPARC64#3 (text+ko) ==== @@ -42,9 +42,9 @@ device ofw_console -device genclock -device eeprom -device "mk48txx" +#device genclock +#device eeprom +#device "mk48txx" device miibus device hme To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 7:43:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BD5437B41C; Thu, 4 Apr 2002 07:43:07 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E97D537B41B for ; Thu, 4 Apr 2002 07:43:06 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g34Fh6j70023 for perforce@freebsd.org; Thu, 4 Apr 2002 07:43:06 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 4 Apr 2002 07:43:06 -0800 (PST) Message-Id: <200204041543.g34Fh6j70023@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9032 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9032 Change 9032 by jhb@jhb_zion on 2002/04/04 07:42:37 Bah, axe UCONSOLE. Affected files ... ... //depot/projects/smpng/sys/alpha/conf/ALPHA#3 edit Differences ... ==== //depot/projects/smpng/sys/alpha/conf/ALPHA#3 (text+ko) ==== @@ -23,7 +23,6 @@ options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI -options UCONSOLE #Allow users to grab the console options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 8: 4:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90BD537B41D; Thu, 4 Apr 2002 08:04:34 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 965CC37B416 for ; Thu, 4 Apr 2002 08:04:33 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g34G4X774216 for perforce@freebsd.org; Thu, 4 Apr 2002 08:04:33 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 4 Apr 2002 08:04:33 -0800 (PST) Message-Id: <200204041604.g34G4X774216@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9034 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9034 Change 9034 by jhb@jhb_laptop on 2002/04/04 08:03:44 Axe UCONSOLE. Affected files ... ... //depot/projects/smpng/sys/i386/conf/X86#2 edit ... //depot/projects/smpng/sys/i386/conf/X86-up#2 edit Differences ... ==== //depot/projects/smpng/sys/i386/conf/X86#2 (text+ko) ==== @@ -18,7 +18,6 @@ options PROCFS #Process filesystem options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options UCONSOLE #Allow users to grab the console options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/smpng/sys/i386/conf/X86-up#2 (text+ko) ==== @@ -18,7 +18,6 @@ options PROCFS #Process filesystem options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options UCONSOLE #Allow users to grab the console options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 11: 7:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FE4637B421; Thu, 4 Apr 2002 11:07:29 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3288137B41F for ; Thu, 4 Apr 2002 11:07:28 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g34J7RJ22362 for perforce@freebsd.org; Thu, 4 Apr 2002 11:07:27 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 4 Apr 2002 11:07:27 -0800 (PST) Message-Id: <200204041907.g34J7RJ22362@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9041 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9041 Change 9041 by jhb@jhb_laptop on 2002/04/04 11:06:53 Integ from jhb_lock: - Change witness to use lock->lo_type instead of lock->lo_name for its lookups. - Fixup mutex and sx code accordingly. Affected files ... ... //depot/projects/smpng/sys/kern/kern_mutex.c#25 integrate ... //depot/projects/smpng/sys/kern/kern_sx.c#16 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#39 integrate ... //depot/projects/smpng/sys/sys/_lock.h#6 integrate ... //depot/projects/smpng/sys/sys/mutex.h#24 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#25 (text+ko) ==== @@ -794,10 +794,12 @@ /* * Mutex initialization routine; initialize lock `m' of type contained in - * `opts' with options contained in `opts' and description `description.' + * `opts' with options contained in `opts' and name `name.' The optional + * lock type `type' is used as a general lock category name for use with + * witness. */ void -mtx_init(struct mtx *m, const char *description, int opts) +mtx_init(struct mtx *m, const char *name, const char *type, int opts) { struct lock_object *lock; @@ -817,7 +819,8 @@ lock->lo_class = &lock_class_mtx_spin; else lock->lo_class = &lock_class_mtx_sleep; - lock->lo_name = description; + lock->lo_name = name; + lock->lo_type = type != NULL ? type : name; if (opts & MTX_QUIET) lock->lo_flags = LO_QUIET; if (opts & MTX_RECURSE) ==== //depot/projects/smpng/sys/kern/kern_sx.c#16 (text+ko) ==== @@ -70,7 +70,7 @@ ("sx lock %s %p already initialized", description, sx)); bzero(sx, sizeof(*sx)); lock->lo_class = &lock_class_sx; - lock->lo_name = description; + lock->lo_type = lock->lo_name = description; lock->lo_flags = LO_WITNESS | LO_RECURSABLE | LO_SLEEPABLE | LO_UPGRADABLE; sx->sx_lock = mtx_pool_find(sx); ==== //depot/projects/smpng/sys/kern/subr_witness.c#39 (text+ko) ==== @@ -311,7 +311,7 @@ mtx_lock(&all_mtx); STAILQ_FOREACH(lock, &all_locks, lo_list) { if (lock->lo_flags & LO_WITNESS) - lock->lo_witness = enroll(lock->lo_name, + lock->lo_witness = enroll(lock->lo_type, lock->lo_class); else lock->lo_witness = NULL; @@ -356,7 +356,7 @@ mtx_unlock(&all_mtx); if (!witness_cold && !witness_dead && panicstr == NULL && (lock->lo_flags & LO_WITNESS) != 0) - lock->lo_witness = enroll(lock->lo_name, class); + lock->lo_witness = enroll(lock->lo_type, class); else lock->lo_witness = NULL; } ==== //depot/projects/smpng/sys/sys/_lock.h#6 (text+ko) ==== @@ -33,7 +33,8 @@ struct lock_object { struct lock_class *lo_class; - const char *lo_name; + const char *lo_name; /* Individual lock name. */ + const char *lo_type; /* General lock type. */ u_int lo_flags; STAILQ_ENTRY(lock_object) lo_list; /* List of all locks in system. */ struct witness *lo_witness; ==== //depot/projects/smpng/sys/sys/mutex.h#24 (text+ko) ==== @@ -97,7 +97,7 @@ * [See below for descriptions] * */ -void mtx_init(struct mtx *m, const char *description, int opts); +void mtx_init(struct mtx *m, const char *name, const char *type, int opts); void mtx_destroy(struct mtx *m); void mtx_sysinit(void *arg); void mutex_init(void); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 11:26:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D798D37B420; Thu, 4 Apr 2002 11:23:37 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 473A937B482 for ; Thu, 4 Apr 2002 11:22:50 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g34JMkN24556 for perforce@freebsd.org; Thu, 4 Apr 2002 11:22:46 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 4 Apr 2002 11:22:46 -0800 (PST) Message-Id: <200204041922.g34JMkN24556@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9042 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9042 Change 9042 by jhb@jhb_laptop on 2002/04/04 11:22:13 Integ mtx_init() changes. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#5 integrate ... //depot/projects/smpng/sys/alpha/alpha/interrupt.c#16 integrate ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#35 integrate ... //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#14 integrate ... //depot/projects/smpng/sys/alpha/alpha/pmap.c#27 integrate ... //depot/projects/smpng/sys/dev/aac/aacvar.h#9 integrate ... //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#13 integrate ... //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#5 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi.c#22 integrate ... //depot/projects/smpng/sys/dev/an/if_an.c#20 integrate ... //depot/projects/smpng/sys/dev/ar/if_ar.c#2 integrate ... //depot/projects/smpng/sys/dev/fxp/if_fxp.c#12 integrate ... //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#4 integrate ... //depot/projects/smpng/sys/dev/gx/if_gx.c#4 integrate ... //depot/projects/smpng/sys/dev/gx/if_gxvar.h#2 integrate ... //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#3 integrate ... //depot/projects/smpng/sys/dev/isp/isp_pci.c#9 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmc.c#2 integrate ... //depot/projects/smpng/sys/dev/nge/if_nge.c#9 integrate ... //depot/projects/smpng/sys/dev/pccbb/pccbb.c#10 integrate ... //depot/projects/smpng/sys/dev/random/yarrow.c#4 integrate ... //depot/projects/smpng/sys/dev/sio/sio.c#16 integrate ... //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/isa/emu8000.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/isa/gusmidi.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/isa/mpu.c#8 integrate ... //depot/projects/smpng/sys/dev/sound/isa/mss.c#7 integrate ... //depot/projects/smpng/sys/dev/sound/isa/opl.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/isa/sbc.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/isa/uartsio.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/midi/midi.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/midi/timer.c#2 integrate ... //depot/projects/smpng/sys/dev/sound/pci/cmi.c#8 integrate ... //depot/projects/smpng/sys/dev/sound/pci/csamidi.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/pci/ds1.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#7 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#6 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/channel.c#14 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/sound.c#8 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/sound.h#7 integrate ... //depot/projects/smpng/sys/dev/sr/if_sr.c#2 integrate ... //depot/projects/smpng/sys/dev/txp/if_txp.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/if_aue.c#10 integrate ... //depot/projects/smpng/sys/dev/usb/if_cue.c#5 integrate ... //depot/projects/smpng/sys/dev/usb/if_kue.c#5 integrate ... //depot/projects/smpng/sys/dev/usb/udbp.c#2 integrate ... //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#3 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#4 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#27 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_hash.c#5 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#9 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#5 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_ihash.c#3 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#8 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#11 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_fileno.c#3 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#7 integrate ... //depot/projects/smpng/sys/geom/geom_event.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_io.c#3 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#31 integrate ... //depot/projects/smpng/sys/i386/i386/mp_machdep.c#21 integrate ... //depot/projects/smpng/sys/i386/i386/vm86.c#9 integrate ... //depot/projects/smpng/sys/i386/isa/if_el.c#2 integrate ... //depot/projects/smpng/sys/i386/isa/intr_machdep.c#14 integrate ... //depot/projects/smpng/sys/i4b/capi/capi_l4if.c#4 integrate ... //depot/projects/smpng/sys/i4b/capi/iavc/iavc_isa.c#4 integrate ... //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#4 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ing.c#4 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#8 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_rbch.c#5 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#5 integrate ... //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate ... //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate ... //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate ... //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#3 integrate ... //depot/projects/smpng/sys/i4b/layer1/isic/i4b_bchan.c#4 integrate ... //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#3 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_l2.c#4 integrate ... //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#8 integrate ... //depot/projects/smpng/sys/ia64/ia64/interrupt.c#9 integrate ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#24 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.c#5 integrate ... //depot/projects/smpng/sys/kern/init_main.c#15 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#20 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#31 integrate ... //depot/projects/smpng/sys/kern/kern_intr.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_jail.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_lock.c#12 integrate ... //depot/projects/smpng/sys/kern/kern_malloc.c#7 integrate ... //depot/projects/smpng/sys/kern/kern_mtxpool.c#4 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#26 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#20 integrate ... //depot/projects/smpng/sys/kern/kern_resource.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_sema.c#3 integrate ... //depot/projects/smpng/sys/kern/kern_timeout.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_disklabel.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_eventhandler.c#5 integrate ... //depot/projects/smpng/sys/kern/subr_mbuf.c#12 integrate ... //depot/projects/smpng/sys/kern/subr_rman.c#6 integrate ... //depot/projects/smpng/sys/kern/subr_smp.c#10 integrate ... //depot/projects/smpng/sys/kern/subr_taskqueue.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#40 integrate ... //depot/projects/smpng/sys/kern/sys_generic.c#11 integrate ... //depot/projects/smpng/sys/kern/sys_pipe.c#13 integrate ... //depot/projects/smpng/sys/kern/uipc_syscalls.c#15 integrate ... //depot/projects/smpng/sys/kern/vfs_bio.c#19 integrate ... //depot/projects/smpng/sys/kern/vfs_subr.c#23 integrate ... //depot/projects/smpng/sys/net/bpf.c#11 integrate ... //depot/projects/smpng/sys/net/if.c#20 integrate ... //depot/projects/smpng/sys/net/if_ppp.c#12 integrate ... //depot/projects/smpng/sys/net/if_sl.c#11 integrate ... //depot/projects/smpng/sys/net/if_spppsubr.c#5 integrate ... //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#8 integrate ... //depot/projects/smpng/sys/netatm/atm_subr.c#5 integrate ... //depot/projects/smpng/sys/netgraph/ng_base.c#6 integrate ... //depot/projects/smpng/sys/netinet/if_ether.c#11 integrate ... //depot/projects/smpng/sys/netinet/ip_input.c#16 integrate ... //depot/projects/smpng/sys/netinet6/ip6_input.c#12 integrate ... //depot/projects/smpng/sys/netipx/ipx_input.c#3 integrate ... //depot/projects/smpng/sys/netnatm/natm_proto.c#4 integrate ... //depot/projects/smpng/sys/netns/ns_input.c#3 integrate ... //depot/projects/smpng/sys/netsmb/smb_subr.h#7 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#27 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio.c#16 integrate ... //depot/projects/smpng/sys/pci/if_dc.c#13 integrate ... //depot/projects/smpng/sys/pci/if_pcn.c#5 integrate ... //depot/projects/smpng/sys/pci/if_rl.c#7 integrate ... //depot/projects/smpng/sys/pci/if_sf.c#6 integrate ... //depot/projects/smpng/sys/pci/if_sis.c#11 integrate ... //depot/projects/smpng/sys/pci/if_sk.c#5 integrate ... //depot/projects/smpng/sys/pci/if_ste.c#6 integrate ... //depot/projects/smpng/sys/pci/if_ti.c#9 integrate ... //depot/projects/smpng/sys/pci/if_tl.c#4 integrate ... //depot/projects/smpng/sys/pci/if_vr.c#4 integrate ... //depot/projects/smpng/sys/pci/if_wb.c#4 integrate ... //depot/projects/smpng/sys/pci/if_xl.c#9 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#13 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#5 integrate ... //depot/projects/smpng/sys/sys/mutex.h#25 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#20 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_vfsops.c#5 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#11 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_ihash.c#4 integrate ... //depot/projects/smpng/sys/vm/device_pager.c#4 integrate ... //depot/projects/smpng/sys/vm/phys_pager.c#3 integrate ... //depot/projects/smpng/sys/vm/swap_pager.c#13 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#5 integrate ... //depot/projects/smpng/sys/vm/uma_int.h#3 integrate ... //depot/projects/smpng/sys/vm/vm_object.c#8 integrate ... //depot/projects/smpng/sys/vm/vm_page.c#12 integrate ... //depot/projects/smpng/sys/vm/vm_pageq.c#4 integrate ... //depot/projects/smpng/sys/vm/vm_pager.c#6 integrate ... //depot/projects/smpng/sys/vm/vm_zone.c#6 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#5 (text+ko) ==== @@ -600,7 +600,7 @@ count = 0; if (total_bpages == 0) { - mtx_init(&bounce_lock, "BouncePage", MTX_DEF); + mtx_init(&bounce_lock, "BouncePage", NULL, MTX_DEF); STAILQ_INIT(&bounce_page_list); STAILQ_INIT(&bounce_map_waitinglist); STAILQ_INIT(&bounce_map_callbacklist); ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#16 (text+ko) ==== @@ -343,7 +343,7 @@ ithds_init(void *dummy) { - mtx_init(&alpha_intr_hash_lock, "ithread table lock", MTX_SPIN); + mtx_init(&alpha_intr_hash_lock, "ithread table lock", NULL, MTX_SPIN); } SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL); ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#35 (text+ko) ==== @@ -945,8 +945,8 @@ thread0.td_pcb->pcb_hw.apcb_ksp = (u_int64_t)thread0.td_frame; mutex_init(); - mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); - mtx_init(&icu_lock, "icu", MTX_SPIN); + mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_RECURSE); + mtx_init(&icu_lock, "icu", NULL, MTX_SPIN); /* * Look at arguments passed to us and compute boothowto. ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#14 (text+ko) ==== @@ -345,7 +345,7 @@ { int i; - mtx_init(&ap_boot_mtx, "ap boot", MTX_SPIN); + mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { int dv; ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#27 (text+ko) ==== @@ -1365,7 +1365,7 @@ } TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); - mtx_init(&allpmaps_lock, "allpmaps", MTX_SPIN | MTX_QUIET); + mtx_init(&allpmaps_lock, "allpmaps", NULL, MTX_SPIN | MTX_QUIET); LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); } ==== //depot/projects/smpng/sys/dev/aac/aacvar.h#9 (text+ko) ==== @@ -254,7 +254,7 @@ #include #include typedef struct mtx aac_lock_t; -#define AAC_LOCK_INIT(l, s) mtx_init(l, s, MTX_DEF) +#define AAC_LOCK_INIT(l, s) mtx_init(l, s, NULL, MTX_DEF) #define AAC_LOCK_ACQUIRE(l) mtx_lock(l) #define AAC_LOCK_RELEASE(l) mtx_unlock(l) #else ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#13 (text+ko) ==== @@ -144,7 +144,7 @@ err = 0; STAILQ_INIT(&acpi_task_queue); - mtx_init(&acpi_task_mtx, "ACPI task", MTX_DEF); + mtx_init(&acpi_task_mtx, "ACPI task", NULL, MTX_DEF); for (i = 0; i < ACPI_MAX_THREADS; i++) { err = kthread_create(acpi_task_thread, NULL, &acpi_kthread_proc, ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#5 (text+ko) ==== @@ -85,7 +85,7 @@ return_ACPI_STATUS(AE_NO_MEMORY); bzero(as, sizeof(*as)); - mtx_init(&as->as_mtx, "ACPI semaphore", MTX_DEF); + mtx_init(&as->as_mtx, "ACPI semaphore", NULL, MTX_DEF); as->as_units = InitialUnits; as->as_maxunits = MaxUnits; as->as_pendings = as->as_resetting = as->as_timeouts = 0; ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#22 (text+ko) ==== @@ -234,7 +234,7 @@ return_VOID; /* initialise the ACPI mutex */ - mtx_init(&acpi_mutex, "ACPI global lock", MTX_DEF); + mtx_init(&acpi_mutex, "ACPI global lock", NULL, MTX_DEF); /* * Start up the ACPI CA subsystem. ==== //depot/projects/smpng/sys/dev/an/if_an.c#20 (text+ko) ==== @@ -377,8 +377,8 @@ { struct ifnet *ifp = &sc->arpcom.ac_if; - mtx_init(&sc->an_mtx, device_get_nameunit(sc->an_dev), MTX_DEF | - MTX_RECURSE); + mtx_init(&sc->an_mtx, device_get_nameunit(sc->an_dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); AN_LOCK(sc); sc->an_gone = 0; ==== //depot/projects/smpng/sys/dev/ar/if_ar.c#2 (text+ko) ==== @@ -336,8 +336,9 @@ callout_handle_init(&sc->handle); sc->xmitq.ifq_maxlen = IFQ_MAXLEN; sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN; - mtx_init(&sc->xmitq.ifq_mtx, "ar_xmitq", MTX_DEF); - mtx_init(&sc->xmitq_hipri.ifq_mtx, "ar_xmitq_hipri", MTX_DEF); + mtx_init(&sc->xmitq.ifq_mtx, "ar_xmitq", NULL, MTX_DEF); + mtx_init(&sc->xmitq_hipri.ifq_mtx, "ar_xmitq_hipri", NULL, + MTX_DEF); sc->running = 0; #endif /* NETGRAPH */ } ==== //depot/projects/smpng/sys/dev/fxp/if_fxp.c#12 (text+ko) ==== @@ -360,7 +360,8 @@ sc->dev = dev; callout_handle_init(&sc->stat_ch); sysctl_ctx_init(&sc->sysctl_ctx); - mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); + mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); s = splimp(); ==== //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#4 (text+ko) ==== @@ -91,7 +91,7 @@ #if __FreeBSD_version < 500000 #define FXP_LOCK(_sc) #define FXP_UNLOCK(_sc) -#define mtx_init(a, b, c) +#define mtx_init(a, b, c, d) #define mtx_destroy(a) struct mtx { int dummy; }; #else ==== //depot/projects/smpng/sys/dev/gx/if_gx.c#4 (text+ko) ==== @@ -245,7 +245,8 @@ gx->gx_vflags = gx_dev->version_flags; gx->gx_ipg = gx_dev->version_ipg; - mtx_init(&gx->gx_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); + mtx_init(&gx->gx_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); GX_LOCK(gx); ==== //depot/projects/smpng/sys/dev/gx/if_gxvar.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ #if __FreeBSD_version < 500000 #define GX_LOCK(gx) #define GX_UNLOCK(gx) -#define mtx_init(a, b, c) +#define mtx_init(a, b, c, d) #define mtx_destroy(a) struct mtx { int filler; }; #else ==== //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#3 (text+ko) ==== @@ -129,7 +129,7 @@ } /* Create mutex */ - mtx_init(&sc->mutex, device_get_nameunit(dev), MTX_DEF); + mtx_init(&sc->mutex, device_get_nameunit(dev), "ichsmb", MTX_DEF); return (0); } ==== //depot/projects/smpng/sys/dev/isp/isp_pci.c#9 (text+ko) ==== @@ -683,7 +683,7 @@ "debug", &isp_debug); /* Make sure the lock is set up. */ - mtx_init(&isp->isp_osinfo.lock, "isp", MTX_DEF); + mtx_init(&isp->isp_osinfo.lock, "isp", NULL, MTX_DEF); locksetup++; #ifdef ISP_SMPLOCK ==== //depot/projects/smpng/sys/dev/lmc/if_lmc.c#2 (text+ko) ==== @@ -1148,8 +1148,8 @@ callout_handle_init(&sc->lmc_handle); sc->lmc_xmitq.ifq_maxlen = IFQ_MAXLEN; sc->lmc_xmitq_hipri.ifq_maxlen = IFQ_MAXLEN; - mtx_init(&sc->lmc_xmitq.ifq_mtx, "lmc_xmitq", MTX_DEF); - mtx_init(&sc->lmc_xmitq_hipri.ifq_mtx, "lmc_xmitq_hipri", MTX_DEF); + mtx_init(&sc->lmc_xmitq.ifq_mtx, "lmc_xmitq", NULL, MTX_DEF); + mtx_init(&sc->lmc_xmitq_hipri.ifq_mtx, "lmc_xmitq_hipri", NULL, MTX_DEF); sc->lmc_running = 0; /* ==== //depot/projects/smpng/sys/dev/nge/if_nge.c#9 (text+ko) ==== @@ -797,7 +797,8 @@ unit = device_get_unit(dev); bzero(sc, sizeof(struct nge_softc)); - mtx_init(&sc->nge_mtx, device_get_nameunit(dev), MTX_DEF|MTX_RECURSE); + mtx_init(&sc->nge_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); /* * Handle power management nonsense. ==== //depot/projects/smpng/sys/dev/pccbb/pccbb.c#10 (text+ko) ==== @@ -527,7 +527,7 @@ int rid; uint32_t sockbase; - mtx_init(&sc->mtx, device_get_nameunit(brdev), MTX_DEF); + mtx_init(&sc->mtx, device_get_nameunit(brdev), "pccbb", MTX_DEF); sc->chipset = pccbb_chipset(pci_get_devid(brdev), NULL); sc->dev = brdev; sc->cbdev = NULL; ==== //depot/projects/smpng/sys/dev/random/yarrow.c#4 (text+ko) ==== @@ -139,7 +139,7 @@ random_state.counter[i] = 0; /* Set up a lock for the reseed process */ - mtx_init(&random_reseed_mtx, "random reseed", MTX_DEF); + mtx_init(&random_reseed_mtx, "random reseed", NULL, MTX_DEF); } void ==== //depot/projects/smpng/sys/dev/sio/sio.c#16 (text+ko) ==== @@ -513,7 +513,8 @@ while (sio_inited != 2) if (atomic_cmpset_int(&sio_inited, 0, 1)) { - mtx_init(&sio_lock, sio_driver_name, (comconsole != -1) ? + mtx_init(&sio_lock, sio_driver_name, NULL, + (comconsole != -1) ? MTX_SPIN | MTX_QUIET : MTX_SPIN); atomic_store_rel_int(&sio_inited, 2); } ==== //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#4 (text+ko) ==== @@ -587,7 +587,7 @@ ad1816 = (struct ad1816_info *)malloc(sizeof *ad1816, M_DEVBUF, M_NOWAIT | M_ZERO); if (!ad1816) return ENXIO; - ad1816->lock = snd_mtxcreate(device_get_nameunit(dev)); + ad1816->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc"); ad1816->io_rid = 2; ad1816->irq_rid = 0; ad1816->drq1_rid = 0; ==== //depot/projects/smpng/sys/dev/sound/isa/emu8000.c#5 (text+ko) ==== @@ -720,7 +720,7 @@ /* Fill the softc for this unit. */ bcopy(&emu_synthinfo, &scp->synthinfo, sizeof(emu_synthinfo)); - mtx_init(&scp->mtx, "emumid", MTX_DEF); + mtx_init(&scp->mtx, "emumid", NULL, MTX_DEF); scp->devinfo = devinfo = create_mididev_info_unit(MDT_SYNTH, &emu_op_desc, &midisynth_op_desc); /* Fill the midi info. */ ==== //depot/projects/smpng/sys/dev/sound/isa/gusmidi.c#4 (text+ko) ==== @@ -194,7 +194,7 @@ /* Fill the softc. */ scp->dev = dev; - mtx_init(&scp->mtx, "gusmid", MTX_DEF); + mtx_init(&scp->mtx, "gusmid", NULL, MTX_DEF); scp->devinfo = devinfo = create_mididev_info_unit(MDT_MIDI, &gusmidi_op_desc, &midisynth_op_desc); /* Fill the midi info. */ ==== //depot/projects/smpng/sys/dev/sound/isa/mpu.c#8 (text+ko) ==== @@ -358,7 +358,7 @@ MIDI_DEBUG(printf("mpu: attaching.\n")); - mtx_init(&scp->mtx, "mpumid", MTX_DEF); + mtx_init(&scp->mtx, "mpumid", NULL, MTX_DEF); /* Allocate the resources, switch to uart mode. */ if (mpu_allocres(scp, dev) || mpu_uartmode(scp)) { ==== //depot/projects/smpng/sys/dev/sound/isa/mss.c#7 (text+ko) ==== @@ -1665,7 +1665,7 @@ int pdma, rdma, flags = device_get_flags(dev); char status[SND_STATUSLEN], status2[SND_STATUSLEN]; - mss->lock = snd_mtxcreate(device_get_nameunit(dev)); + mss->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc"); mss->bufsize = pcm_getbuffersize(dev, 4096, MSS_DEFAULT_BUFSZ, 65536); if (!mss_alloc_resources(mss, dev)) goto no; mss_init(mss, dev); ==== //depot/projects/smpng/sys/dev/sound/isa/opl.c#4 (text+ko) ==== @@ -717,7 +717,7 @@ /* Fill the softc. */ bcopy(&opl_synthinfo, &scp->synthinfo, sizeof(opl_synthinfo)); snprintf(scp->synthinfo.name, 64, "Yamaha OPL%d FM", scp->model); - mtx_init(&scp->mtx, "oplmid", MTX_DEF); + mtx_init(&scp->mtx, "oplmid", NULL, MTX_DEF); bcopy(pv_map, scp->pv_map, sizeof(pv_map)); if (scp->model < MODEL_OPL3) { /* OPL2. */ scp->synthinfo.nr_voices = 9; ==== //depot/projects/smpng/sys/dev/sound/isa/sbc.c#4 (text+ko) ==== @@ -114,7 +114,7 @@ static void sbc_lockinit(struct sbc_softc *scp) { - scp->lock = snd_mtxcreate(device_get_nameunit(scp->dev)); + scp->lock = snd_mtxcreate(device_get_nameunit(scp->dev), "sound softc"); } static void ==== //depot/projects/smpng/sys/dev/sound/isa/uartsio.c#5 (text+ko) ==== @@ -243,7 +243,7 @@ /* Fill the softc. */ scp->dev = dev; - mtx_init(&scp->mtx, "siomid", MTX_DEF); + mtx_init(&scp->mtx, "siomid", NULL, MTX_DEF); scp->devinfo = devinfo = create_mididev_info_unit(MDT_MIDI, &uartsio_op_desc, &midisynth_op_desc); /* Fill the midi info. */ ==== //depot/projects/smpng/sys/dev/sound/midi/midi.c#4 (text+ko) ==== @@ -200,7 +200,7 @@ /* XXX */ if (!midiinfo_mtx_init) { midiinfo_mtx_init = 1; - mtx_init(&midiinfo_mtx, "midinf", MTX_DEF); + mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF); TAILQ_INIT(&midi_info); } @@ -226,7 +226,7 @@ /* XXX */ if (!midiinfo_mtx_init) { midiinfo_mtx_init = 1; - mtx_init(&midiinfo_mtx, "midinf", MTX_DEF); + mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF); TAILQ_INIT(&midi_info); } @@ -252,7 +252,7 @@ /* XXX */ if (!midiinfo_mtx_init) { midiinfo_mtx_init = 1; - mtx_init(&midiinfo_mtx, "midinf", MTX_DEF); + mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF); TAILQ_INIT(&midi_info); } @@ -277,7 +277,7 @@ /* XXX */ if (!midiinfo_mtx_init) { midiinfo_mtx_init = 1; - mtx_init(&midiinfo_mtx, "midinf", MTX_DEF); + mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF); TAILQ_INIT(&midi_info); } @@ -290,9 +290,9 @@ midibuf_init(&mdnew->midi_dbuf_in); midibuf_init(&mdnew->midi_dbuf_out); midibuf_init(&mdnew->midi_dbuf_passthru); - mtx_init(&mdnew->flagqueue_mtx, "midflq", MTX_DEF); - mtx_init(&mdnew->synth.vc_mtx, "synsvc", MTX_DEF); - mtx_init(&mdnew->synth.status_mtx, "synsst", MTX_DEF); + mtx_init(&mdnew->flagqueue_mtx, "midflq", NULL, MTX_DEF); + mtx_init(&mdnew->synth.vc_mtx, "synsvc", NULL, MTX_DEF); + mtx_init(&mdnew->synth.status_mtx, "synsst", NULL, MTX_DEF); mtx_lock(&midiinfo_mtx); ==== //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#5 (text+ko) ==== @@ -303,7 +303,7 @@ { SEQ_DEBUG(printf("seq: initing.\n")); - mtx_init(&seqinfo_mtx, "seqinf", MTX_DEF); + mtx_init(&seqinfo_mtx, "seqinf", NULL, MTX_DEF); TAILQ_INIT(&seq_info); seq_initunit(0); @@ -2371,7 +2371,7 @@ sdnew->unit = unit; midibuf_init(&sdnew->midi_dbuf_in); midibuf_init(&sdnew->midi_dbuf_out); - mtx_init(&sdnew->flagqueue_mtx, "seqflq", MTX_DEF); + mtx_init(&sdnew->flagqueue_mtx, "seqflq", NULL, MTX_DEF); cv_init(&sdnew->insync_cv, "seqins"); mtx_lock(&seqinfo_mtx); ==== //depot/projects/smpng/sys/dev/sound/midi/timer.c#2 (text+ko) ==== @@ -141,7 +141,7 @@ /* XXX */ if (!timerinfo_mtx_init) { timerinfo_mtx_init = 1; - mtx_init(&timerinfo_mtx, "tmrinf", MTX_DEF); + mtx_init(&timerinfo_mtx, "tmrinf", NULL, MTX_DEF); TAILQ_INIT(&timer_info); } @@ -150,7 +150,7 @@ if (tmdnew == NULL) return NULL; bcopy(tmdinf, tmdnew, sizeof(timerdev_info)); - mtx_init(&tmdnew->mtx, "tmrmtx", MTX_DEF); + mtx_init(&tmdnew->mtx, "tmrmtx", NULL, MTX_DEF); mtx_lock(&timerinfo_mtx); @@ -195,7 +195,7 @@ /* XXX */ if (!timerinfo_mtx_init) { timerinfo_mtx_init = 1; - mtx_init(&timerinfo_mtx, "tmrinf", MTX_DEF); + mtx_init(&timerinfo_mtx, "tmrinf", NULL, MTX_DEF); TAILQ_INIT(&timer_info); } @@ -224,7 +224,7 @@ /* XXX */ if (!timerinfo_mtx_init) { timerinfo_mtx_init = 1; - mtx_init(&timerinfo_mtx, "tmrinf", MTX_DEF); + mtx_init(&timerinfo_mtx, "tmrinf", NULL, MTX_DEF); TAILQ_INIT(&timer_info); } ==== //depot/projects/smpng/sys/dev/sound/pci/cmi.c#8 (text+ko) ==== @@ -842,7 +842,7 @@ return ENXIO; } - sc->lock = snd_mtxcreate(device_get_nameunit(dev)); + sc->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc"); data = pci_read_config(dev, PCIR_COMMAND, 2); data |= (PCIM_CMD_PORTEN|PCIM_CMD_BUSMASTEREN); pci_write_config(dev, PCIR_COMMAND, data, 2); ==== //depot/projects/smpng/sys/dev/sound/pci/csamidi.c#4 (text+ko) ==== @@ -192,7 +192,7 @@ /* Fill the softc. */ scp->dev = dev; - mtx_init(&scp->mtx, "csamid", MTX_DEF); + mtx_init(&scp->mtx, "csamid", NULL, MTX_DEF); scp->devinfo = devinfo = create_mididev_info_unit(MDT_MIDI, &csamidi_op_desc, &midisynth_op_desc); /* Fill the midi info. */ ==== //depot/projects/smpng/sys/dev/sound/pci/ds1.c#4 (text+ko) ==== @@ -939,7 +939,7 @@ return ENXIO; } - sc->lock = snd_mtxcreate(device_get_nameunit(dev)); + sc->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc"); sc->dev = dev; subdev = (pci_get_subdevice(dev) << 16) | pci_get_subvendor(dev); sc->type = ds_finddev(pci_get_devid(dev), subdev); ==== //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#4 (text+ko) ==== @@ -1460,7 +1460,7 @@ return ENXIO; } - sc->lock = snd_mtxcreate(device_get_nameunit(dev)); + sc->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc"); sc->dev = dev; sc->type = pci_get_devid(dev); sc->rev = pci_get_revid(dev); ==== //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#7 (text+ko) ==== @@ -765,7 +765,7 @@ } tr->type = pci_get_devid(dev); - tr->lock = snd_mtxcreate(device_get_nameunit(dev)); + tr->lock = snd_mtxcreate(device_get_nameunit(dev), "sound softc"); data = pci_read_config(dev, PCIR_COMMAND, 2); data |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN); ==== //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#6 (text+ko) ==== @@ -498,7 +498,7 @@ return NULL; snprintf(codec->name, AC97_NAMELEN, "%s:ac97", device_get_nameunit(dev)); - codec->lock = snd_mtxcreate(codec->name); + codec->lock = snd_mtxcreate(codec->name, "ac97 codec"); codec->methods = kobj_create(cls, M_AC97, M_WAITOK); if (codec->methods == NULL) { snd_mtxlock(codec->lock); ==== //depot/projects/smpng/sys/dev/sound/pcm/channel.c#14 (text+ko) ==== @@ -70,7 +70,7 @@ static void chn_lockinit(struct pcm_channel *c) { - c->lock = snd_mtxcreate(c->name); + c->lock = snd_mtxcreate(c->name, "pcm channel"); } static void ==== //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#4 (text+ko) ==== @@ -202,7 +202,7 @@ m = (struct snd_mixer *)kobj_create(cls, M_MIXER, M_WAITOK | M_ZERO); snprintf(m->name, MIXER_NAMELEN, "%s:mixer", device_get_nameunit(dev)); - m->lock = snd_mtxcreate(m->name); + m->lock = snd_mtxcreate(m->name, "pcm mixer"); m->type = cls->name; m->devinfo = devinfo; m->busy = 0; ==== //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#4 (text+ko) ==== @@ -343,7 +343,7 @@ static int sndstat_init(void) { - mtx_init(&sndstat_lock, "sndstat", 0); + mtx_init(&sndstat_lock, "sndstat", NULL, 0); sndstat_dev = make_dev(&sndstat_cdevsw, SND_DEV_STATUS, UID_ROOT, GID_WHEEL, 0444, "sndstat"); return (sndstat_dev != 0)? 0 : ENXIO; ==== //depot/projects/smpng/sys/dev/sound/pcm/sound.c#8 (text+ko) ==== @@ -86,7 +86,7 @@ } void * -snd_mtxcreate(const char *desc) +snd_mtxcreate(const char *desc, const char *type) { #ifdef USING_MUTEX struct mtx *m; @@ -94,7 +94,7 @@ m = malloc(sizeof(*m), M_DEVBUF, M_WAITOK | M_ZERO); if (m == NULL) return NULL; - mtx_init(m, desc, MTX_RECURSE); + mtx_init(m, desc, type, MTX_RECURSE); return m; #else return (void *)0xcafebabe; @@ -607,7 +607,7 @@ return EINVAL; } - d->lock = snd_mtxcreate(device_get_nameunit(dev)); + d->lock = snd_mtxcreate(device_get_nameunit(dev), "sound cdev"); snd_mtxlock(d->lock); d->flags = 0; ==== //depot/projects/smpng/sys/dev/sound/pcm/sound.h#7 (text+ko) ==== @@ -244,7 +244,7 @@ int snd_setup_intr(device_t dev, struct resource *res, int flags, driver_intr_t hand, void *param, void **cookiep); -void *snd_mtxcreate(const char *desc); +void *snd_mtxcreate(const char *desc, const char *type); void snd_mtxfree(void *m); void snd_mtxassert(void *m); void snd_mtxlock(void *m); ==== //depot/projects/smpng/sys/dev/sr/if_sr.c#2 (text+ko) ==== @@ -449,8 +449,9 @@ callout_handle_init(&sc->handle); sc->xmitq.ifq_maxlen = IFQ_MAXLEN; sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN; - mtx_init(&sc->xmitq.ifq_mtx, "sr_xmitq", MTX_DEF); - mtx_init(&sc->xmitq_hipri.ifq_mtx, "sr_xmitq_hipri", MTX_DEF); + mtx_init(&sc->xmitq.ifq_mtx, "sr_xmitq", NULL, MTX_DEF); + mtx_init(&sc->xmitq_hipri.ifq_mtx, "sr_xmitq_hipri", NULL, + MTX_DEF); sc->running = 0; #endif /* NETGRAPH */ } ==== //depot/projects/smpng/sys/dev/txp/if_txp.c#8 (text+ko) ==== @@ -218,7 +218,8 @@ sc->sc_dev = dev; sc->sc_cold = 1; - mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_DEF|MTX_RECURSE); + mtx_init(&sc->sc_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); /* * Handle power management nonsense. ==== //depot/projects/smpng/sys/dev/usb/if_aue.c#10 (text+ko) ==== @@ -706,8 +706,8 @@ } } - mtx_init(&sc->aue_mtx, device_get_nameunit(self), MTX_DEF | - MTX_RECURSE); + mtx_init(&sc->aue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); AUE_LOCK(sc); /* Reset the adapter. */ ==== //depot/projects/smpng/sys/dev/usb/if_cue.c#5 (text+ko) ==== @@ -491,8 +491,8 @@ } } - mtx_init(&sc->cue_mtx, device_get_nameunit(self), MTX_DEF | - MTX_RECURSE); + mtx_init(&sc->cue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); CUE_LOCK(sc); #ifdef notdef ==== //depot/projects/smpng/sys/dev/usb/if_kue.c#5 (text+ko) ==== @@ -441,8 +441,8 @@ } } - mtx_init(&sc->kue_mtx, device_get_nameunit(self), MTX_DEF | - MTX_RECURSE); + mtx_init(&sc->kue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); KUE_LOCK(sc); /* Load the firmware into the NIC. */ ==== //depot/projects/smpng/sys/dev/usb/udbp.c#2 (text+ko) ==== @@ -368,9 +368,10 @@ NG_NODE_SET_PRIVATE(sc->node, sc); sc->xmitq.ifq_maxlen = IFQ_MAXLEN; sc->xmitq_hipri.ifq_maxlen = IFQ_MAXLEN; - mtx_init(&sc->xmitq.ifq_mtx, "usb_xmitq", MTX_DEF); + mtx_init(&sc->xmitq.ifq_mtx, "usb_xmitq", NULL, + MTX_DEF); mtx_init(&sc->xmitq_hipri.ifq_mtx, - "usb_xmitq_hipri", MTX_DEF); + "usb_xmitq_hipri", NULL, MTX_DEF); } } sc->flags = NETGRAPH_INITIALISED; ==== //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#3 (text+ko) ==== @@ -122,8 +122,8 @@ if (mtx_inited) return; register_netisr(NETISR_USB, usbintr); - mtx_init(&usbq_tx.ifq_mtx, "usbq_tx_mtx", MTX_DEF); - mtx_init(&usbq_rx.ifq_mtx, "usbq_rx_mtx", MTX_DEF); + mtx_init(&usbq_tx.ifq_mtx, "usbq_tx_mtx", NULL, MTX_DEF); + mtx_init(&usbq_rx.ifq_mtx, "usbq_rx_mtx", NULL, MTX_DEF); mtx_inited++; return; } ==== //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#4 (text+ko) ==== @@ -1415,7 +1415,7 @@ Malloc(PLEX_LOCKS * sizeof(struct rangelock)); CHECKALLOC(plex->lock, "vinum: Can't allocate lock table\n"); bzero((char *) plex->lock, PLEX_LOCKS * sizeof(struct rangelock)); - mtx_init(&plex->lockmtx, plex->name, MTX_DEF); + mtx_init(&plex->lockmtx, plex->name, "plex", MTX_DEF); } /* Note the last plex we configured */ current_plex = plexno; ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#27 (text+ko) ==== @@ -196,7 +196,8 @@ return (error); } - mtx_init(&sc->wi_mtx, device_get_nameunit(dev), MTX_DEF | MTX_RECURSE); + mtx_init(&sc->wi_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); WI_LOCK(sc); /* Reset the NIC. */ ==== //depot/projects/smpng/sys/fs/hpfs/hpfs_hash.c#5 (text+ko) ==== @@ -66,7 +66,7 @@ lockinit (&hpfs_hphash_lock, PINOD, "hpfs_hphashlock", 0, 0); hpfs_hphashtbl = hashinit(desiredvnodes, M_HPFSHASH, &hpfs_hphash); - mtx_init(&hpfs_hphash_mtx, "hpfs hphash", MTX_DEF); + mtx_init(&hpfs_hphash_mtx, "hpfs hphash", NULL, MTX_DEF); } /* ==== //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#9 (text+ko) ==== @@ -511,7 +511,7 @@ vp->v_flag |= VROOT; - mtx_init(&hp->h_interlock, "hpfsnode interlock", MTX_DEF); + mtx_init(&hp->h_interlock, "hpfsnode interlock", NULL, MTX_DEF); lockinit(&hp->h_lock, PINOD, "hpnode", VLKTIMEOUT, 0); hp->h_flag = H_INVAL; ==== //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#5 (text+ko) ==== @@ -103,7 +103,7 @@ struct vfsconf *vfsp; { dehashtbl = hashinit(desiredvnodes/2, M_MSDOSFSMNT, &dehash); - mtx_init(&dehash_mtx, "msdosfs dehash", MTX_DEF); + mtx_init(&dehash_mtx, "msdosfs dehash", NULL, MTX_DEF); return (0); } ==== //depot/projects/smpng/sys/fs/ntfs/ntfs_ihash.c#3 (text+ko) ==== @@ -68,7 +68,7 @@ { lockinit(&ntfs_hashlock, PINOD, "ntfs_nthashlock", 0, 0); ntfs_nthashtbl = hashinit(desiredvnodes, M_NTFSNTHASH, &ntfs_nthash); - mtx_init(&ntfs_nthash_mtx, "ntfs nthash", MTX_DEF); + mtx_init(&ntfs_nthash_mtx, "ntfs nthash", NULL, MTX_DEF); } /* ==== //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#8 (text+ko) ==== @@ -404,7 +404,7 @@ /* init lock and lock the newborn ntnode */ lockinit(&ip->i_lock, PINOD, "ntnode", 0, LK_EXCLUSIVE); - mtx_init(&ip->i_interlock, "ntnode interlock", MTX_DEF); + mtx_init(&ip->i_interlock, "ntnode interlock", NULL, MTX_DEF); ntfs_ntget(ip); ntfs_nthashins(ip); ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#11 (text+ko) ==== @@ -313,7 +313,7 @@ struct pfs_node *root; int error; - mtx_init(&pi->pi_mutex, "pseudofs", MTX_DEF); + mtx_init(&pi->pi_mutex, "pseudofs", NULL, MTX_DEF); /* set up the root diretory */ MALLOC(root, struct pfs_node *, sizeof *root, ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs_fileno.c#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 11:37:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D48337B416; Thu, 4 Apr 2002 11:37:09 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 91D4637B41A for ; Thu, 4 Apr 2002 11:37:08 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g34Jb8R28384 for perforce@freebsd.org; Thu, 4 Apr 2002 11:37:08 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 4 Apr 2002 11:37:08 -0800 (PST) Message-Id: <200204041937.g34Jb8R28384@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9044 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9044 Change 9044 by jhb@jhb_laptop on 2002/04/04 11:36:52 Integ a few more mtx_init() fixups. Affected files ... ... //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#4 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#27 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#21 integrate Differences ... ==== //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#4 (text+ko) ==== @@ -426,7 +426,8 @@ { struct ifnet *ifp = &sc->sc_if; - mtx_init(&sc->mtx, device_get_nameunit(sc->dev), MTX_DEF | MTX_RECURSE); + mtx_init(&sc->mtx, device_get_nameunit(sc->dev), MTX_NETWORK_LOCK, + MTX_DEF | MTX_RECURSE); ifp->if_softc = sc; ifp->if_init = (if_init_f_t *)pdq_ifinit; ==== //depot/projects/smpng/sys/kern/kern_mutex.c#27 (text+ko) ==== @@ -789,7 +789,7 @@ { struct mtx_args *margs = arg; - mtx_init(margs->ma_mtx, margs->ma_desc, margs->ma_opts); + mtx_init(margs->ma_mtx, margs->ma_desc, NULL, margs->ma_opts); } /* ==== //depot/projects/smpng/sys/kern/kern_proc.c#21 (text+ko) ==== @@ -96,7 +96,7 @@ sx_init(&allproc_lock, "allproc"); sx_init(&proctree_lock, "proctree"); sx_init(&pgrpsess_lock, "pgrpsess"); - mtx_init(&pargs_ref_lock, "struct pargs.ref", MTX_DEF); + mtx_init(&pargs_ref_lock, "struct pargs.ref", NULL, MTX_DEF); LIST_INIT(&allproc); LIST_INIT(&zombproc); pidhashtbl = hashinit(maxproc / 4, M_PROC, &pidhash); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 11:46:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B69A37B41D; Thu, 4 Apr 2002 11:46:21 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 921A337B41C for ; Thu, 4 Apr 2002 11:46:20 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g34JkKj30049 for perforce@freebsd.org; Thu, 4 Apr 2002 11:46:20 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Thu, 4 Apr 2002 11:46:20 -0800 (PST) Message-Id: <200204041946.g34JkKj30049@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 9046 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9046 Change 9046 by tmm@tmm_sparc64 on 2002/04/04 11:45:23 Fix a bit of inverted logic, and a stylo. Affected files ... ... //depot/projects/sparc64/sys/kern/subr_clock.c#3 edit Differences ... ==== //depot/projects/sparc64/sys/kern/subr_clock.c#3 (text+ko) ==== @@ -223,13 +223,13 @@ "time-of-day clock: clock %s has higher " "resolution\n", device_get_name(clock_dev)); } + return; } else { if (bootverbose) { device_printf(clock_dev, "removed as " "time-of-day clock: clock %s has higher " "resolution\n", device_get_name(dev)); } - return; } } clock_dev = dev; @@ -277,7 +277,7 @@ printf("Invalid time in real time clock.\n"); printf("Check and reset the date immediately!\n"); } - + ts.tv_sec += tz.tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 11:57:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7761537B405; Thu, 4 Apr 2002 11:57:37 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A088937B417 for ; Thu, 4 Apr 2002 11:57:35 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g34JvZ231968 for perforce@freebsd.org; Thu, 4 Apr 2002 11:57:35 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Thu, 4 Apr 2002 11:57:35 -0800 (PST) Message-Id: <200204041957.g34JvZ231968@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 9047 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9047 Change 9047 by tmm@tmm_sparc64 on 2002/04/04 11:57:09 Adjust multiple inclusion protection to changed header name, de-__P(). Affected files ... ... //depot/projects/sparc64/sys/sys/clock.h#2 edit Differences ... ==== //depot/projects/sparc64/sys/sys/clock.h#2 (text+ko) ==== @@ -33,13 +33,13 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * from: NetBSD: clock_subr.h,v 1.7 2000/10/03 13:41:07 tsutsui Exp + * $NetBSD: clock_subr.h,v 1.7 2000/10/03 13:41:07 tsutsui Exp $ * * $FreeBSD$ */ -#ifndef _SYS_CLOCK_SUBR_H_ -#define _SYS_CLOCK_SUBR_H_ +#ifndef _SYS_CLOCK_H_ +#define _SYS_CLOCK_H_ /* * Structure to hold the values typically reported by time-of-day clocks. @@ -57,8 +57,8 @@ long nsec; /* nano seconds */ }; -int clock_ct_to_ts __P((struct clocktime *, struct timespec *)); -void clock_ts_to_ct __P((struct timespec *, struct clocktime *)); +int clock_ct_to_ts(struct clocktime *, struct timespec *); +void clock_ts_to_ct(struct timespec *, struct clocktime *); void clock_register(device_t, long); /* @@ -74,4 +74,4 @@ /* Traditional POSIX base year */ #define POSIX_BASE_YEAR 1970 -#endif /* !_SYS_CLOCK_SUBR_H_ */ +#endif /* !_SYS_CLOCK_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 12:14:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD80837B405; Thu, 4 Apr 2002 12:12:57 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D89F537B419 for ; Thu, 4 Apr 2002 12:12:55 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g34KCtg37849 for perforce@freebsd.org; Thu, 4 Apr 2002 12:12:55 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 4 Apr 2002 12:12:55 -0800 (PST) Message-Id: <200204042012.g34KCtg37849@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9049 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9049 Change 9049 by jhb@jhb_laptop on 2002/04/04 12:12:37 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#36 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#7 integrate ... //depot/projects/smpng/sys/boot/efi/loader/Makefile#6 integrate ... //depot/projects/smpng/sys/coda/coda_psdev.c#6 integrate ... //depot/projects/smpng/sys/compat/linux/linux_signal.c#4 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_signal.c#5 integrate ... //depot/projects/smpng/sys/conf/NOTES#3 integrate ... //depot/projects/smpng/sys/conf/majors#7 integrate ... //depot/projects/smpng/sys/dev/bge/if_bge.c#10 integrate ... //depot/projects/smpng/sys/dev/bge/if_bgereg.h#4 integrate ... //depot/projects/smpng/sys/dev/my/if_my.c#1 branch ... //depot/projects/smpng/sys/dev/my/if_myreg.h#1 branch ... //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#6 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#28 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#2 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#2 integrate ... //depot/projects/smpng/sys/dev/wi/if_wireg.h#10 integrate ... //depot/projects/smpng/sys/dev/wi/if_wivar.h#2 integrate ... //depot/projects/smpng/sys/geom/geom.h#4 integrate ... //depot/projects/smpng/sys/geom/geom_bsd.c#5 integrate ... //depot/projects/smpng/sys/geom/geom_dev.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_disk.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_dump.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_event.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_int.h#2 integrate ... //depot/projects/smpng/sys/geom/geom_io.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_mbr.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_pc98.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_slice.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_slice.h#3 integrate ... //depot/projects/smpng/sys/geom/geom_subr.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_sunlabel.c#4 integrate ... //depot/projects/smpng/sys/i386/conf/Makefile#2 integrate ... //depot/projects/smpng/sys/i386/conf/NOTES#33 integrate ... //depot/projects/smpng/sys/i386/i386/autoconf.c#10 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#32 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_signal.c#4 integrate ... //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#17 integrate ... //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#8 integrate ... //depot/projects/smpng/sys/ia64/ia64/autoconf.c#8 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#33 integrate ... //depot/projects/smpng/sys/ia64/ia64/trap.c#26 integrate ... //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#11 integrate ... //depot/projects/smpng/sys/ia64/include/elf.h#5 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#56 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#27 integrate ... //depot/projects/smpng/sys/kern/subr_eventhandler.c#6 integrate ... //depot/projects/smpng/sys/kern/subr_trap.c#32 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#17 integrate ... //depot/projects/smpng/sys/net/bpf.c#12 integrate ... //depot/projects/smpng/sys/net/bsd_comp.c#4 integrate ... //depot/projects/smpng/sys/net/ethernet.h#5 integrate ... //depot/projects/smpng/sys/net/if_arcsubr.c#3 integrate ... //depot/projects/smpng/sys/net/if_ethersubr.c#15 integrate ... //depot/projects/smpng/sys/net/if_loop.c#8 integrate ... //depot/projects/smpng/sys/net/if_ppp.c#13 integrate ... //depot/projects/smpng/sys/net/if_sl.c#12 integrate ... //depot/projects/smpng/sys/net/if_tap.c#12 integrate ... //depot/projects/smpng/sys/net/if_tun.c#11 integrate ... //depot/projects/smpng/sys/net/if_vlan.c#9 integrate ... //depot/projects/smpng/sys/net/ppp_deflate.c#4 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#28 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#23 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#12 integrate ... //depot/projects/smpng/sys/sys/param.h#19 integrate ... //depot/projects/smpng/sys/sys/proc.h#42 integrate ... //depot/projects/smpng/sys/sys/signalvar.h#7 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_tables.c#2 integrate ... //depot/projects/smpng/sys/ufs/ffs/fs.h#5 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#36 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.171 2002/04/02 22:19:14 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.172 2002/04/04 17:49:44 bde Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1471,6 +1471,7 @@ */ SIGSETOLD(p->p_sigmask, ksc.sc_mask); SIG_CANTMASK(p->p_sigmask); + signotify(p); PROC_UNLOCK(p); set_regs(td, (struct reg *)ksc.sc_regs); @@ -1553,6 +1554,7 @@ p->p_sigmask = uc.uc_sigmask; SIG_CANTMASK(p->p_sigmask); + signotify(p); PROC_UNLOCK(p); /* XXX ksc.sc_ownedfp ? */ ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#7 (text+ko) ==== @@ -30,7 +30,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/alpha/osf1/osf1_signal.c,v 1.15 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.16 2002/04/04 17:49:44 bde Exp $ */ #include @@ -491,11 +491,13 @@ case OSF1_SIG_UNBLOCK: SIGSETNAND(p->p_sigmask, bss); + signotify(p); break; case OSF1_SIG_SETMASK: p->p_sigmask = bss; SIG_CANTMASK(p->p_sigmask); + signotify(p); break; default: @@ -729,6 +731,7 @@ */ osf1_to_bsd_sigset(&ksc.sc_mask, &p->p_sigmask); SIG_CANTMASK(p->p_sigmask); + signotify(p); PROC_UNLOCK(p); set_regs(td, (struct reg *)ksc.sc_regs); ==== //depot/projects/smpng/sys/boot/efi/loader/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.10 2002/03/31 20:48:13 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.11 2002/04/04 06:04:38 peter Exp $ .PATH: ${.CURDIR}/../common @@ -33,7 +33,7 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../../.. -I. CFLAGS+= -I${.CURDIR}/../libefi -CFLAGS+= -I/usr/src/lib/libstand +CFLAGS+= -I${.CURDIR}/../../../../lib/libstand CFLAGS+= -DLOADER LDSCRIPT= ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH} ==== //depot/projects/smpng/sys/coda/coda_psdev.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_psdev.c,v 1.21 2001/12/10 08:09:40 obrien Exp $ + * $FreeBSD: src/sys/coda/coda_psdev.c,v 1.22 2002/04/04 17:49:44 bde Exp $ * */ @@ -602,6 +602,7 @@ } } while (error && i++ < 128 && VC_OPEN(vcp)); p->p_sigmask = psig_omask; + signotify(p); PROC_UNLOCK(p); #else (void) tsleep(&vmp->vm_sleep, coda_call_sleep, "coda_call", 0); ==== //depot/projects/smpng/sys/compat/linux/linux_signal.c#4 (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. * - * $FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.32 2001/09/12 08:36:57 julian Exp $ + * $FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.33 2002/04/04 17:49:45 bde Exp $ */ #include @@ -256,10 +256,12 @@ break; case LINUX_SIG_UNBLOCK: SIGSETNAND(p->p_sigmask, mask); + signotify(p); break; case LINUX_SIG_SETMASK: p->p_sigmask = mask; SIG_CANTMASK(p->p_sigmask); + signotify(p); break; default: error = EINVAL; @@ -377,6 +379,7 @@ linux_to_bsd_sigset(&lset, &bset); p->p_sigmask = bset; SIG_CANTMASK(p->p_sigmask); + signotify(p); PROC_UNLOCK(p); return (0); } ==== //depot/projects/smpng/sys/compat/svr4/svr4_signal.c#5 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_signal.c,v 1.17 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_signal.c,v 1.18 2002/04/04 17:49:45 bde Exp $ */ #include @@ -531,11 +531,13 @@ case SVR4_SIG_UNBLOCK: SIGSETNAND(td->td_proc->p_sigmask, bss); + signotify(td->td_proc); break; case SVR4_SIG_SETMASK: td->td_proc->p_sigmask = bss; SIG_CANTMASK(td->td_proc->p_sigmask); + signotify(td->td_proc); break; default: ==== //depot/projects/smpng/sys/conf/NOTES#3 (text+ko) ==== @@ -11,15 +11,11 @@ # Please use ``make LINT'' to create an old-style LINT file if you want to # do kernel test-builds. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1015 2002/04/03 10:56:53 ru Exp $ +# This file contains machine independent kernel configuration notes. For +# machine dependent notes, look in /sys//conf/NOTES. # - +# $FreeBSD: src/sys/conf/NOTES,v 1.1017 2002/04/04 18:01:55 brian Exp $ # -# This directive is mandatory; it defines the architecture to be -# configured for; in this case, the 386 family based IBM-PC and -# compatibles. -# -machine i386 # # This is the ``identification'' of the kernel. Usually this should @@ -90,7 +86,7 @@ # Options for the VM subsystem options PQ_CACHESIZE=512 # color for 512k/16k cache -options KSTACK_PAGES=3 # number of 4k stack pages per process +options KSTACK_PAGES=3 # number of stack pages per process # Deprecated options supported for backwards compatibility #options PQ_NOOPT # No coloring #options PQ_LARGECACHE # color for 512k/16k cache @@ -120,32 +116,10 @@ # SMP OPTIONS: # # SMP enables building of a Symmetric MultiProcessor Kernel. -# APIC_IO enables the use of the IO APIC for Symmetric I/O. -# -# Notes: -# -# An SMP kernel will ONLY run on an Intel MP spec. qualified motherboard. -# -# Be sure to disable 'cpu I386_CPU' && 'cpu I486_CPU' for SMP kernels. -# -# Check the 'Rogue SMP hardware' section to see if additional options -# are required by your hardware. -# # Mandatory: options SMP # Symmetric MultiProcessor Kernel -options APIC_IO # Symmetric (APIC) I/O -# -# Rogue SMP hardware: -# - -# Bridged PCI cards: -# -# The MP tables of most of the current generation MP motherboards -# do NOT properly support bridged PCI cards. To use one of these -# cards you should refer to ??? - # SMP Debugging Options: # # MUTEX_DEBUG enables various extra assertions in the mutex code. @@ -162,140 +136,6 @@ ##################################################################### -# CPU OPTIONS - -# -# You must specify at least one CPU (the one you intend to run on); -# deleting the specification for CPUs you don't need to use may make -# parts of the system run faster. -# I386_CPU is mutually exclusive with the other CPU types. -# -#cpu I386_CPU -cpu I486_CPU -cpu I586_CPU # aka Pentium(tm) -cpu I686_CPU # aka Pentium Pro(tm) - -# -# Options for CPU features. -# -# CPU_ATHLON_SSE_HACK tries to enable SSE instructions when the BIOS has -# forgotten to enable them. -# -# CPU_BLUELIGHTNING_FPU_OP_CACHE enables FPU operand cache on IBM -# BlueLightning CPU. It works only with Cyrix FPU, and this option -# should not be used with Intel FPU. -# -# CPU_BLUELIGHTNING_3X enables triple-clock mode on IBM Blue Lightning -# CPU if CPU supports it. The default is double-clock mode on -# BlueLightning CPU box. -# -# CPU_BTB_EN enables branch target buffer on Cyrix 5x86 (NOTE 1). -# -# CPU_DIRECT_MAPPED_CACHE sets L1 cache of Cyrix 486DLC CPU in direct -# mapped mode. Default is 2-way set associative mode. -# -# CPU_CYRIX_NO_LOCK enables weak locking for the entire address space -# of Cyrix 6x86 and 6x86MX CPUs by setting the NO_LOCK bit of CCR1. -# Otherwise, the NO_LOCK bit of CCR1 is cleared. (NOTE 3) -# -# CPU_DISABLE_5X86_LSSER disables load store serialize (i.e. enables -# reorder). This option should not be used if you use memory mapped -# I/O device(s). -# -# CPU_ENABLE_SSE enables SSE/MMX2 instructions support. -# -# CPU_FASTER_5X86_FPU enables faster FPU exception handler. -# -# CPU_I486_ON_386 enables CPU cache on i486 based CPU upgrade products -# for i386 machines. -# -# CPU_IORT defines I/O clock delay time (NOTE 1). Default values of -# I/O clock delay time on Cyrix 5x86 and 6x86 are 0 and 7,respectively -# (no clock delay). -# -# CPU_L2_LATENCY specifed the L2 cache latency value. This option is used -# only when CPU_PPRO2CELERON is defined and Mendocino Celeron is detected. -# The default value is 5. -# -# CPU_LOOP_EN prevents flushing the prefetch buffer if the destination -# of a jump is already present in the prefetch buffer on Cyrix 5x86(NOTE -# 1). -# -# CPU_PPRO2CELERON enables L2 cache of Mendocino Celeron CPUs. This option -# is useful when you use Socket 8 to Socket 370 converter, because most Pentium -# Pro BIOSs do not enable L2 cache of Mendocino Celeron CPUs. -# -# CPU_RSTK_EN enables return stack on Cyrix 5x86 (NOTE 1). -# -# CPU_SUSP_HLT enables suspend on HALT. If this option is set, CPU -# enters suspend mode following execution of HALT instruction. -# -# CPU_UPGRADE_HW_CACHE eliminates unneeded cache flush instruction(s). -# -# CPU_WT_ALLOC enables write allocation on Cyrix 6x86/6x86MX and AMD -# K5/K6/K6-2 cpus. -# -# CYRIX_CACHE_WORKS enables CPU cache on Cyrix 486 CPUs with cache -# flush at hold state. -# -# CYRIX_CACHE_REALLY_WORKS enables (1) CPU cache on Cyrix 486 CPUs -# without cache flush at hold state, and (2) write-back CPU cache on -# Cyrix 6x86 whose revision < 2.7 (NOTE 2). -# -# NO_F00F_HACK disables the hack that prevents Pentiums (and ONLY -# Pentiums) from locking up when a LOCK CMPXCHG8B instruction is -# executed. This option is only needed if I586_CPU is also defined, -# and should be included for any non-Pentium CPU that defines it. -# -# NO_MEMORY_HOLE is an optimisation for systems with AMD K6 processors -# which indicates that the 15-16MB range is *definitely* not being -# occupied by an ISA memory hole. -# -# NOTE 1: The options, CPU_BTB_EN, CPU_LOOP_EN, CPU_IORT, -# CPU_LOOP_EN and CPU_RSTK_EN should not be used because of CPU bugs. -# These options may crash your system. -# -# NOTE 2: If CYRIX_CACHE_REALLY_WORKS is not set, CPU cache is enabled -# in write-through mode when revision < 2.7. If revision of Cyrix -# 6x86 >= 2.7, CPU cache is always enabled in write-back mode. -# -# NOTE 3: This option may cause failures for software that requires -# locked cycles in order to operate correctly. -# -options CPU_ATHLON_SSE_HACK -options CPU_BLUELIGHTNING_FPU_OP_CACHE -options CPU_BLUELIGHTNING_3X -options CPU_BTB_EN -options CPU_DIRECT_MAPPED_CACHE -options CPU_DISABLE_5X86_LSSER -options CPU_ENABLE_SSE -options CPU_FASTER_5X86_FPU -options CPU_I486_ON_386 -options CPU_IORT -options CPU_L2_LATENCY=5 -options CPU_LOOP_EN -options CPU_PPRO2CELERON -options CPU_RSTK_EN -options CPU_SUSP_HLT -options CPU_UPGRADE_HW_CACHE -options CPU_WT_ALLOC -options CYRIX_CACHE_WORKS -options CYRIX_CACHE_REALLY_WORKS -#options NO_F00F_HACK - -# -# A math emulator is mandatory if you wish to run on hardware which -# does not have a floating-point processor. Pick either the original, -# bogus (but freely-distributable) math emulator, or a much more -# fully-featured but GPL-licensed emulator taken from Linux. -# -options MATH_EMULATE #Support for x87 emulation -# Don't enable both of these in a real config. -options GPL_MATH_EMULATE #Support for x87 emulation via - #new math emulator - - -##################################################################### # COMPATIBILITY OPTIONS # @@ -412,13 +252,6 @@ #options RESTARTABLE_PANICS # -# PERFMON causes the driver for Pentium/Pentium Pro performance counters -# to be compiled. See perfmon(4) for more information. -# -options PERFMON - - -# # This option let some drivers co-exist that can't co-exist in a running # system. This is used to be able to compile all kernel code in one go for # quality assurance purposes (like this file, which the option takes it name @@ -693,25 +526,6 @@ device hea #Efficient ENI-155p ATM PCI device hfa #FORE PCA-200E ATM PCI -# -# DEVICE_POLLING adds support for mixed interrupt-polling handling -# of network device drivers, which has significant benefits in terms -# of robustness to overloads and responsivity, as well as permitting -# accurate scheduling of the CPU time between kernel network processing -# and other activities. The drawback is a moderate (up to 1/HZ seconds) -# potential increase in response times. -# It is strongly recommended to use HZ=1000 or 2000 with DEVICE_POLLING -# to achieve smoother behaviour. -# Additionally, you can enable/disable polling at runtime with the -# sysctl variable kern.polling.enable (defaults off), and select -# the CPU fraction reserved to userland with the sysctl variable -# kern.polling.user_frac (default 50, range 0..100). -# -# Only the "dc" "fxp" and "sis" devices support this mode of operation at -# the time of this writing. - -options DEVICE_POLLING - ##################################################################### # FILESYSTEM OPTIONS @@ -879,20 +693,6 @@ options HZ=100 -# The following options are used for debugging clock behavior only, and -# should not be used for production systems. -# -# CLK_CALIBRATION_LOOP will run the clock calibration loop at startup -# until the user presses a key. - -options CLK_CALIBRATION_LOOP - -# The following two options measure the frequency of the corresponding -# clock relative to the RTC (onboard mc146818a). - -options CLK_USE_I8254_CALIBRATION -options CLK_USE_TSC_CALIBRATION - ##################################################################### # SCSI DEVICES @@ -1060,8 +860,6 @@ device pty #Pseudo ttys device nmdm #back-to-back tty devices -device speaker #Play IBM BASIC-style noises out your speaker -device gzip #Exec gzipped a.out's device md #Memory/malloc disk device snp #Snoop device - to look at pty/vty/etc.. device ccd #Concatenated disk driver @@ -1090,46 +888,11 @@ ##################################################################### # HARDWARE BUS CONFIGURATION -# ISA, EISA, MCA and PCI bus: - # -# Mandatory ISA devices: isa, npx +# ISA bus # device isa -# -# Options for `isa': -# -# AUTO_EOI_1 enables the `automatic EOI' feature for the master 8259A -# interrupt controller. This saves about 0.7-1.25 usec for each interrupt. -# This option breaks suspend/resume on some portables. -# -# AUTO_EOI_2 enables the `automatic EOI' feature for the slave 8259A -# interrupt controller. This saves about 0.7-1.25 usec for each interrupt. -# Automatic EOI is documented not to work for for the slave with the -# original i8259A, but it works for some clones and some integrated -# versions. -# -# MAXMEM specifies the amount of RAM on the machine; if this is not -# specified, FreeBSD will first read the amount of memory from the CMOS -# RAM, so the amount of memory will initially be limited to 64MB or 16MB -# depending on the BIOS. If the BIOS reports 64MB, a memory probe will -# then attempt to detect the installed amount of RAM. If this probe -# fails to detect >64MB RAM you will have to use the MAXMEM option. -# The amount is in kilobytes, so for a machine with 128MB of RAM, it would -# be 131072 (128 * 1024). -# -# BROKEN_KEYBOARD_RESET disables the use of the keyboard controller to -# reset the CPU for reboot. This is needed on some systems with broken -# keyboard controllers. - -options COMPAT_OLDISA #Use ISA shims and glue for old drivers -options AUTO_EOI_1 -#options AUTO_EOI_2 - -options MAXMEM="(128*1024)" -#options BROKEN_KEYBOARD_RESET - # Enable support for the kernel PLL to use an external PPS signal, # under supervision of [x]ntpd(8) # More info in ntpd documentation: http://www.eecis.udel.edu/~ntp @@ -1141,35 +904,9 @@ # for too long. You can make the system more resistant to this by # choosing a high value for NTIMECOUNTER. The default is 5, there # is no upper limit but more than a couple of hundred are not productive. -# A better strategy may be to sysctl -w kern.timecounter.method=1 options NTIMECOUNTER=20 -# -# EISA bus -# -# The EISA bus device is `eisa'. It provides auto-detection and -# configuration support for all devices on the EISA bus. - -device eisa - -# By default, only 10 EISA slots are probed, since the slot numbers -# above clash with the configuration address space of the PCI subsystem, -# and the EISA probe is not very smart about this. This is sufficient -# for most machines, but in particular the HP NetServer LC series comes -# with an onboard AIC7770 dual-channel SCSI controller on EISA slot #11, -# thus you need to bump this figure to 12 for them. -options EISA_SLOTS=12 - -# -# MCA bus: -# -# The MCA bus device is `mca'. It provides auto-detection and -# configuration support for all devices on the MCA bus. -# No hints are required for MCA. - -device mca - # # PCI bus & PCI options: # @@ -1179,21 +916,10 @@ device pci -# -# AGP GART support -device agp - -# PCI options -# -#Enable pci resources left off by a "lazy" BIOS: -options PCI_ENABLE_IO_MODES - ##################################################################### # HARDWARE DEVICE CONFIGURATION -# EISA support is available for some device, so they can be auto-probed. -# MicroChannel (MCA) support is available for some devices. # For ISA the required hints are listed. # EISA, MCA, PCI and pccard are self identifying buses, so no hints # are needed. @@ -1202,101 +928,6 @@ # Mandatory devices: # -# The keyboard controller; it controls the keyboard and the PS/2 mouse. -device atkbdc 1 -hint.atkbdc.0.at="isa" -hint.atkbdc.0.port="0x060" - -# The AT keyboard -device atkbd -hint.atkbd.0.at="atkbdc" -hint.atkbd.0.irq="1" - -# Options for atkbd: -options ATKBD_DFLT_KEYMAP # specify the built-in keymap -makeoptions ATKBD_DFLT_KEYMAP="jp.106" - -# These options are valid for other keyboard drivers as well. -options KBD_DISABLE_KEYMAP_LOAD # refuse to load a keymap -options KBD_INSTALL_CDEV # install a CDEV entry in /dev - -# `flags' for atkbd: -# 0x01 Force detection of keyboard, else we always assume a keyboard -# 0x02 Don't reset keyboard, useful for some newer ThinkPads -# 0x03 Force detection and avoid reset, might help with certain -# dockingstations -# 0x04 Old-style (XT) keyboard support, useful for older ThinkPads - -# PS/2 mouse -device psm -hint.psm.0.at="atkbdc" -hint.psm.0.irq="12" - -# Options for psm: -options PSM_HOOKRESUME #hook the system resume event, useful - #for some laptops -options PSM_RESETAFTERSUSPEND #reset the device at the resume event - -# The video card driver. -device vga -hint.vga.0.at="isa" - -# Options for vga: -# Try the following option if the mouse pointer is not drawn correctly -# or font does not seem to be loaded properly. May cause flicker on -# some systems. -options VGA_ALT_SEQACCESS - -# If you can dispense with some vga driver features, you may want to -# use the following options to save some memory. -#options VGA_NO_FONT_LOADING # don't save/load font -#options VGA_NO_MODE_CHANGE # don't change video modes - -# Older video cards may require this option for proper operation. -options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs - -# The following option probably won't work with the LCD displays. -options VGA_WIDTH90 # support 90 column modes - -# To include support for VESA video modes -options VESA - -options FB_DEBUG # Frame buffer debugging -options FB_INSTALL_CDEV # install a CDEV entry in /dev - -# Splash screen at start up! Screen savers require this too. -device splash - -# Various screen savers. -device apm_saver # Requires APM -device blank_saver -device daemon_saver -device fade_saver -device fire_saver -device green_saver -device logo_saver -device rain_saver -device star_saver -device warp_saver - -# The pcvt console driver (vt220 compatible). -device vt -hint.vt.0.at="isa" -options XSERVER # support for running an X server on vt -options FAT_CURSOR # start with block cursor -# This PCVT option is for keyboards such as those used on really old ThinkPads -options PCVT_SCANSET=2 -# Other PCVT options are documented in pcvt(4). -options PCVT_24LINESDEF -options PCVT_CTRL_ALT_DEL -options PCVT_META_ESC -options PCVT_NSCREENS=9 -options PCVT_PRETTYSCRNS -options PCVT_SCREENSAVER -options PCVT_USEKBDSEC -options PCVT_VT220KEYB -options PCVT_GREENSAVER - # The syscons console driver (sco color console compatible). device sc 1 hint.sc.0.at="isa" @@ -1336,65 +967,6 @@ # 0x80 Put the video card in the VESA 800x600 dots, 16 color mode # 0x100 Probe for a keyboard device periodically if one is not present -# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create -# the /dev/3dfx0 device to work with glide implementations. This should get -# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as -# the tdfx DRI module from XFree86 and is completely unrelated. -# -# To enable Linuxulator support, one must also include COMPAT_LINUX in the -# config as well, or you will not have the dependencies. The other option -# is to load both as modules. - -device tdfx # Enable 3Dfx Voodoo support -options TDFX_LINUX # Enable Linuxulator support - -# -# The Numeric Processing eXtension driver. In addition to this, you -# may configure a math emulator (see above). If your machine has a -# hardware FPU and the kernel configuration includes the npx device -# *and* a math emulator compiled into the kernel, the hardware FPU -# will be used, unless it is found to be broken or unless "flags" to -# npx0 includes "0x08", which requests preference for the emulator. -device npx -hint.npx.0.at="nexus" -hint.npx.0.port="0x0F0" -hint.npx.0.flags="0x0" -hint.npx.0.irq="13" - -# -# `flags' for npx0: -# 0x01 don't use the npx registers to optimize bcopy. -# 0x02 don't use the npx registers to optimize bzero. -# 0x04 don't use the npx registers to optimize copyin or copyout. -# 0x08 use emulator even if hardware FPU is available. -# The npx registers are normally used to optimize copying and zeroing when -# all of the following conditions are satisfied: -# I586_CPU is an option -# the cpu is an i586 (perhaps not a Pentium) -# the probe for npx0 succeeds -# INT 16 exception handling works. -# Then copying and zeroing using the npx registers is normally 30-100% faster. -# The flags can be used to control cases where it doesn't work or is slower. -# Setting them at boot time using userconfig works right (the optimizations -# are not used until later in the bootstrap when npx0 is attached). -# Flag 0x08 automatically disables the i586 optimized routines. -# - -# -# ACPI support using the Intel ACPI Component Architecture reference -# implementation. -# -# ACPI_DEBUG enables the use of the debug.acpi.level and debug.acpi.layer -# kernel environment variables to select initial debugging levels for the -# Intel ACPICA code. (Note that the Intel code must also have USE_DEBUGGER -# defined when it is built). -# -# Note that building ACPI into the kernel is deprecated; the module is -# normally loaded automatically by the loader. -# -device acpica -options ACPI_DEBUG - # # Optional devices: # @@ -1402,17 +974,11 @@ # # SCSI host adapters: # -# adv: All Narrow SCSI bus AdvanSys controllers. # adw: Second Generation AdvanSys controllers including the ADV940UW. -# aha: Adaptec 154x/1535/1640 -# ahb: Adaptec 174x EISA controllers # ahc: Adaptec 274x/284x/2910/293x/294x/394x/3950x/3960x/398X/4944/ # 19160x/29160x, aic7770/aic78xx -# aic: Adaptec 6260/6360, APA-1460 (PC Card), NEC PC9801-100 (C-BUS) # amd: Support for the AMD 53C974 SCSI host adapter chip as found on devices # such as the Tekram DC-390(T). -# bt: Most Buslogic controllers: including BT-445, BT-54x, BT-64x, BT-74x, -# BT-75x, BT-946, BT-948, BT-956, BT-958, SDC3211B, SDC3211F, SDC3222F # isp: Qlogic ISP 1020, 1040 and 1040B PCI SCSI host adapters, # ISP 1240 Dual Ultra SCSI, ISP 1080 and 1280 (Dual) Ultra2, # ISP 12160 Ultra3 SCSI, @@ -1426,24 +992,8 @@ # 53C810, 53C810A, 53C815, 53C825, 53C825A, 53C860, 53C875, # 53C876, 53C885, 53C895, 53C895A, 53C896, 53C897, 53C1510D, # 53C1010-33, 53C1010-66. -# stg: TMC 18C30, 18C50 based SCSI host adapters. -# wds: WD7000 -# -# Note that the order is important in order for Buslogic ISA/EISA cards to be -# probed correctly. -# -device bt -hint.bt.0.at="isa" -hint.bt.0.port="0x330" -device adv -hint.adv.0.at="isa" device adw -device aha -hint.aha.0.at="isa" -device aic -hint.aic.0.at="isa" -device ahb device ahc device amd device isp @@ -1467,15 +1017,6 @@ device ncv device nsp device sym -device stg -hint.stg.0.at="isa" -hint.stg.0.port="0x140" -hint.stg.0.port="11" -device wds -hint.wds.0.at="isa" -hint.wds.0.port="0x350" -hint.wds.0.irq="11" -hint.wds.0.drq="6" # The aic7xxx driver will attempt to use memory mapped I/O for all PCI # controllers that have it configured only if this option is set. Unfortunately, @@ -1656,22 +1197,10 @@ hint.fd.1.at="fdc0" hint.fd.1.drive="1" -# M-systems DiskOnchip products see src/sys/contrib/dev/fla/README -device fla -hint.fla.0.at="isa" - -# -# Other standard PC hardware: # -# mse: Logitech and ATI InPort bus mouse ports # sio: serial ports (see sio(4)), including support for various # PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf) -device mse -hint.mse.0.at="isa" -hint.mse.0.port="0x23c" -hint.mse.0.irq="5" - device sio hint.sio.0.at="isa" hint.sio.0.port="0x3F8" @@ -1740,21 +1269,10 @@ # individual driver. device miibus -# an: Aironet 4500/4800 802.11 wireless adapters. Supports the PCMCIA, -# PCI and ISA varieties. -# ar: Arnet SYNC/570i hdlc sync 2/4 port V.35/X.21 serial driver -# (requires sppp) -# awi: Support for IEEE 802.11 PC Card devices using the AMD Am79C930 and -# Harris (Intersil) Chipset with PCnetMobile firmware by AMD. # bge: Support for gigabit ethernet adapters based on the Broadcom # BCM570x family of controllers, including the 3Com 3c996-T, # the Netgear GA302T, the SysKonnect SK-9D21 and SK-9D41, and # the embedded gigE NICs on Dell PowerEdge 2550 servers. -# cnw: Xircom CNW/Netware Airsurfer PC Card adapter -# cm: Arcnet SMC COM90c26 / SMC COM90c56 -# (and SMC COM90c66 in '56 compatibility mode) adapters. -# cs: IBM Etherjet and other Crystal Semi CS89x0-based adapters -# cx: Cronyx/Sigma multiport sync/async (with Cisco or PPP framing) # dc: Support for PCI fast ethernet adapters based on the DEC/Intel 21143 # and various workalikes including: # the ADMtek AL981 Comet and AN985 Centaur, the ASIX Electronics @@ -1767,27 +1285,11 @@ # LinkSys LNE100TX, LNE100TX V2.0, Jaton XpressNet, Alfa Inc GFC2204, # KNE110TX. # de: Digital Equipment DC21040 -# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 -# HP PC Lan+, various PC Card devices (refer to etc/defauls/pccard.conf) -# (requires miibus) -# el: 3Com 3C501 (slow!) # em: Intel Pro/1000 Gigabit Ethernet 82542, 82543, 82544 based adapters. -# ep: 3Com 3C509, 3C529, 3C556, 3C562D, 3C563D, 3C572, 3C574X, 3C579, 3C589 -# and PC Card devices using these chipsets. -# ex: Intel EtherExpress Pro/10 and other i82595-based adapters, -# Olicom Ethernet PC Card devices. -# fe: Fujitsu MB86960A/MB86965A Ethernet -# fea: DEC DEFEA EISA FDDI adapter # fpa: Support for the Digital DEFPA PCI FDDI. `device fddi' is also needed. # fxp: Intel EtherExpress Pro/100B # (hint of prefer_iomap can be done to prefer I/O instead of Mem mapping) # gx: Intel Pro/1000 Gigabit Ethernet (82542, 82543-F, 82543-T) -# ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; -# Intel EtherExpress -# le: Digital Equipment EtherWorks 2 and EtherWorks 3 (DEPCA, DE100, -# DE101, DE200, DE201, DE202, DE203, DE204, DE205, DE422) -# lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and -# Am79C960) # lge: Support for PCI gigabit ethernet adapters based on the Level 1 # LXT1001 NetCellerator chipset. This includes the D-Link DGE-500SX, # SMC TigerCard 1000 (SMC9462SX), and some Addtron cards. @@ -1796,12 +1298,6 @@ # SMC EZ Card 1000 (SMC9462TX), D-Link DGE-500T, Asante FriendlyNet # GigaNIX 1000TA and 1000TPC, the Addtron AEG320T, the LinkSys # EG1032 and EG1064, the Surecom EP-320G-TX and the Netgear GA622T. -# oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133 -# (no hints needed). -# Olicom PCI token-ring adapters OC-3136, OC-3137, OC-3139, OC-3140, -# OC-3141, OC-3540, OC-3250 -# rdp: RealTek RTL 8002-based pocket ethernet adapters -# sbni: Granch SBNI12-xx ISA and PCI adapters # pcn: Support for PCI fast ethernet adapters based on the AMD Am79c97x # chipsets, including the PCnet/FAST, PCnet/FAST+, PCnet/PRO and # PCnet/Home. These were previously handled by the lnc driver (and @@ -1827,9 +1323,6 @@ # (also single mode and multimode). # The driver will autodetect the number of ports on the card and # attach each one as a separate network interface. -# sn: Support for ISA and PC Card Ethernet devices using the -# SMC91C90/92/94/95 chips. -# sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) # ste: Sundance Technologies ST201 PCI fast ethernet controller, includes # the D-Link DFE-550TX. # ti: Support for PCI gigabit ethernet NICs based on the Alteon Networks @@ -1851,13 +1344,6 @@ # wb: Support for fast ethernet adapters based on the Winbond W89C840F chip. # Note: this is not the same as the Winbond W89C940F, which is a # NE2000 clone. -# wl: Lucent Wavelan (ISA card only). -# wi: Lucent WaveLAN/IEEE 802.11 PCMCIA adapters. Note: this supports both -# the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA -# bridge with a PCMCIA adapter plugged into it. -# xe: Xircom/Intel EtherExpress Pro100/16 PC Card ethernet controller, -# Accton Fast EtherCard-16, Compaq Netelligent 10/100 PC Card, -# Toshiba 10/100 Ethernet PC Card, Xircom 16-bit Ethernet + Modem 56 # xl: Support for the 3Com 3c900, 3c905, 3c905B and 3c905C (Fast) # Etherlink XL cards and integrated controllers. This includes the # integrated 3c905B-TX chips in certain Dell Optiplex and Dell @@ -1865,94 +1351,6 @@ # in Dell Latitude laptop docking stations. # Also supported: 3Com 3c980(C)-TX, 3Com 3cSOHO100-TX, 3Com 3c450-TX -# Order for ISA/EISA devices is important here - -device ar 1 -hint.ar.0.at="isa" -hint.ar.0.port="0x300" -hint.ar.0.irq="10" -hint.ar.0.maddr="0xd0000" -device cm -hint.cm.0.at="isa" -hint.cm.0.port="0x2e0" -hint.cm.0.irq="9" -hint.cm.0.maddr="0xdc000" -device cs -hint.cs.0.at="isa" -hint.cs.0.port="0x300" -device cx 1 -hint.cx.0.at="isa" -hint.cx.0.port="0x240" -hint.cx.0.irq="15" -hint.cx.0.drq="7" -device ed -#options ED_NO_MIIBUS # Disable ed miibus support -hint.ed.0.at="isa" -hint.ed.0.port="0x280" -hint.ed.0.irq="5" -hint.ed.0.maddr="0xd8000" -device el 1 -hint.el.0.at="isa" -hint.el.0.port="0x300" -hint.el.0.irq="9" -device ep -device ex -device fe 1 -hint.fe.0.at="isa" -hint.fe.0.port="0x300" -device fea -device ie 2 -hint.ie.0.at="isa" -hint.ie.0.port="0x300" -hint.ie.0.irq="5" -hint.ie.0.maddr="0xd0000" -hint.ie.1.at="isa" >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 12:19:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AF9D37B416; Thu, 4 Apr 2002 12:19:04 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A05FB37B419 for ; Thu, 4 Apr 2002 12:19:03 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g34KJ3j38922 for perforce@freebsd.org; Thu, 4 Apr 2002 12:19:03 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Thu, 4 Apr 2002 12:19:03 -0800 (PST) Message-Id: <200204042019.g34KJ3j38922@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 9050 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9050 Change 9050 by tmm@tmm_sparc64 on 2002/04/04 12:18:51 Change NetBSD id style. Affected files ... ... //depot/projects/sparc64/sys/dev/mk48txx/mk48txx.c#2 edit ... //depot/projects/sparc64/sys/dev/mk48txx/mk48txxreg.h#2 edit Differences ... ==== //depot/projects/sparc64/sys/dev/mk48txx/mk48txx.c#2 (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 DAMAGE. * - * from: NetBSD: mk48txx.c,v 1.7 2001/04/08 17:05:10 tsutsui Exp + * $NetBSD: mk48txx.c,v 1.7 2001/04/08 17:05:10 tsutsui Exp $ * * $FreeBSD$ */ ==== //depot/projects/sparc64/sys/dev/mk48txx/mk48txxreg.h#2 (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 DAMAGE. * - * from: NetBSD: mk48txxreg.h,v 1.4 2000/11/11 11:59:42 pk Exp + * $NetBSD: mk48txxreg.h,v 1.4 2000/11/11 11:59:42 pk Exp $ * * $FreeBSD$ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 13:23:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B76837B41B; Thu, 4 Apr 2002 13:22:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 407C537B419 for ; Thu, 4 Apr 2002 13:22:29 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g34LMS356047 for perforce@freebsd.org; Thu, 4 Apr 2002 13:22:28 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Thu, 4 Apr 2002 13:22:28 -0800 (PST) Message-Id: <200204042122.g34LMS356047@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9059 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9059 Change 9059 by jhb@jhb_laptop on 2002/04/04 13:21:37 IFC - mtx_init() and lock->lo_type. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#6 integrate ... //depot/projects/smpng/sys/alpha/alpha/interrupt.c#17 integrate ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#37 integrate ... //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#15 integrate ... //depot/projects/smpng/sys/alpha/alpha/pmap.c#28 integrate ... //depot/projects/smpng/sys/dev/aac/aacvar.h#10 integrate ... //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#14 integrate ... //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#6 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi.c#23 integrate ... //depot/projects/smpng/sys/dev/an/if_an.c#21 integrate ... //depot/projects/smpng/sys/dev/ar/if_ar.c#3 integrate ... //depot/projects/smpng/sys/dev/fxp/if_fxp.c#13 integrate ... //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#5 integrate ... //depot/projects/smpng/sys/dev/gx/if_gx.c#5 integrate ... //depot/projects/smpng/sys/dev/gx/if_gxvar.h#3 integrate ... //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#4 integrate ... //depot/projects/smpng/sys/dev/isp/isp_pci.c#10 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmc.c#3 integrate ... //depot/projects/smpng/sys/dev/nge/if_nge.c#10 integrate ... //depot/projects/smpng/sys/dev/pccbb/pccbb.c#11 integrate ... //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#5 integrate ... //depot/projects/smpng/sys/dev/random/yarrow.c#5 integrate ... //depot/projects/smpng/sys/dev/sio/sio.c#17 integrate ... //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/isa/emu8000.c#6 integrate ... //depot/projects/smpng/sys/dev/sound/isa/gusmidi.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/isa/mpu.c#9 integrate ... //depot/projects/smpng/sys/dev/sound/isa/mss.c#8 integrate ... //depot/projects/smpng/sys/dev/sound/isa/opl.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/isa/sbc.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/isa/uartsio.c#6 integrate ... //depot/projects/smpng/sys/dev/sound/midi/midi.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#6 integrate ... //depot/projects/smpng/sys/dev/sound/midi/timer.c#3 integrate ... //depot/projects/smpng/sys/dev/sound/pci/cmi.c#9 integrate ... //depot/projects/smpng/sys/dev/sound/pci/csamidi.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/pci/ds1.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#8 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#7 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/channel.c#15 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/sound.c#9 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/sound.h#8 integrate ... //depot/projects/smpng/sys/dev/sr/if_sr.c#3 integrate ... //depot/projects/smpng/sys/dev/txp/if_txp.c#9 integrate ... //depot/projects/smpng/sys/dev/usb/if_aue.c#11 integrate ... //depot/projects/smpng/sys/dev/usb/if_cue.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/if_kue.c#6 integrate ... //depot/projects/smpng/sys/dev/usb/udbp.c#3 integrate ... //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#4 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#5 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#29 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_hash.c#6 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#10 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#6 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_ihash.c#4 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#9 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#12 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_fileno.c#4 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#8 integrate ... //depot/projects/smpng/sys/geom/geom_event.c#5 integrate ... //depot/projects/smpng/sys/geom/geom_io.c#5 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#33 integrate ... //depot/projects/smpng/sys/i386/i386/mp_machdep.c#22 integrate ... //depot/projects/smpng/sys/i386/i386/vm86.c#10 integrate ... //depot/projects/smpng/sys/i386/isa/if_el.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/intr_machdep.c#15 integrate ... //depot/projects/smpng/sys/i4b/capi/capi_l4if.c#5 integrate ... //depot/projects/smpng/sys/i4b/capi/iavc/iavc_isa.c#5 integrate ... //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#5 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ing.c#5 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#9 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_rbch.c#6 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#6 integrate ... //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#4 integrate ... //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate ... //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#4 integrate ... //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#4 integrate ... //depot/projects/smpng/sys/i4b/layer1/isic/i4b_bchan.c#5 integrate ... //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#4 integrate ... //depot/projects/smpng/sys/i4b/layer2/i4b_l2.c#5 integrate ... //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#9 integrate ... //depot/projects/smpng/sys/ia64/ia64/interrupt.c#10 integrate ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#25 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_node.c#6 integrate ... //depot/projects/smpng/sys/kern/init_main.c#16 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#21 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#32 integrate ... //depot/projects/smpng/sys/kern/kern_intr.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_jail.c#19 integrate ... //depot/projects/smpng/sys/kern/kern_lock.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_malloc.c#8 integrate ... //depot/projects/smpng/sys/kern/kern_mtxpool.c#5 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#28 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#22 integrate ... //depot/projects/smpng/sys/kern/kern_resource.c#19 integrate ... //depot/projects/smpng/sys/kern/kern_sema.c#4 integrate ... //depot/projects/smpng/sys/kern/kern_sx.c#17 integrate ... //depot/projects/smpng/sys/kern/kern_timeout.c#8 integrate ... //depot/projects/smpng/sys/kern/subr_disklabel.c#8 integrate ... //depot/projects/smpng/sys/kern/subr_eventhandler.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_mbuf.c#13 integrate ... //depot/projects/smpng/sys/kern/subr_rman.c#7 integrate ... //depot/projects/smpng/sys/kern/subr_smp.c#11 integrate ... //depot/projects/smpng/sys/kern/subr_taskqueue.c#8 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#41 integrate ... //depot/projects/smpng/sys/kern/sys_generic.c#12 integrate ... //depot/projects/smpng/sys/kern/sys_pipe.c#14 integrate ... //depot/projects/smpng/sys/kern/uipc_syscalls.c#16 integrate ... //depot/projects/smpng/sys/kern/vfs_bio.c#20 integrate ... //depot/projects/smpng/sys/kern/vfs_subr.c#24 integrate ... //depot/projects/smpng/sys/net/bpf.c#13 integrate ... //depot/projects/smpng/sys/net/if.c#21 integrate ... //depot/projects/smpng/sys/net/if_ppp.c#14 integrate ... //depot/projects/smpng/sys/net/if_sl.c#13 integrate ... //depot/projects/smpng/sys/net/if_spppsubr.c#6 integrate ... //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#9 integrate ... //depot/projects/smpng/sys/netatm/atm_subr.c#6 integrate ... //depot/projects/smpng/sys/netgraph/ng_base.c#7 integrate ... //depot/projects/smpng/sys/netinet/if_ether.c#12 integrate ... //depot/projects/smpng/sys/netinet/ip_input.c#17 integrate ... //depot/projects/smpng/sys/netinet6/ip6_input.c#13 integrate ... //depot/projects/smpng/sys/netipx/ipx_input.c#4 integrate ... //depot/projects/smpng/sys/netnatm/natm_proto.c#5 integrate ... //depot/projects/smpng/sys/netns/ns_input.c#4 integrate ... //depot/projects/smpng/sys/netsmb/smb_subr.h#8 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#29 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio.c#17 integrate ... //depot/projects/smpng/sys/pci/if_dc.c#14 integrate ... //depot/projects/smpng/sys/pci/if_pcn.c#6 integrate ... //depot/projects/smpng/sys/pci/if_rl.c#8 integrate ... //depot/projects/smpng/sys/pci/if_sf.c#7 integrate ... //depot/projects/smpng/sys/pci/if_sis.c#12 integrate ... //depot/projects/smpng/sys/pci/if_sk.c#6 integrate ... //depot/projects/smpng/sys/pci/if_ste.c#7 integrate ... //depot/projects/smpng/sys/pci/if_ti.c#10 integrate ... //depot/projects/smpng/sys/pci/if_tl.c#5 integrate ... //depot/projects/smpng/sys/pci/if_vr.c#5 integrate ... //depot/projects/smpng/sys/pci/if_wb.c#5 integrate ... //depot/projects/smpng/sys/pci/if_xl.c#10 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#14 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#6 integrate ... //depot/projects/smpng/sys/sys/_lock.h#7 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#13 integrate ... //depot/projects/smpng/sys/sys/mutex.h#26 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#21 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_vfsops.c#6 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#12 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_ihash.c#5 integrate ... //depot/projects/smpng/sys/vm/device_pager.c#5 integrate ... //depot/projects/smpng/sys/vm/phys_pager.c#4 integrate ... //depot/projects/smpng/sys/vm/swap_pager.c#14 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#6 integrate ... //depot/projects/smpng/sys/vm/uma_int.h#4 integrate ... //depot/projects/smpng/sys/vm/vm_object.c#9 integrate ... //depot/projects/smpng/sys/vm/vm_page.c#13 integrate ... //depot/projects/smpng/sys/vm/vm_pageq.c#5 integrate ... //depot/projects/smpng/sys/vm/vm_pager.c#7 integrate ... //depot/projects/smpng/sys/vm/vm_zone.c#7 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/busdma_machdep.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.22 2002/01/05 08:47:09 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.23 2002/04/04 21:03:13 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/alpha/alpha/interrupt.c#17 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.67 2002/03/22 15:55:56 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.68 2002/04/04 21:03:13 jhb Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /* ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#37 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.172 2002/04/04 17:49:44 bde Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.173 2002/04/04 21:03:13 jhb Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#15 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.37 2002/03/22 15:54:31 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.38 2002/04/04 21:03:13 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#28 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.88 2002/03/20 18:58:44 obrien Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.89 2002/04/04 21:03:13 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/aac/aacvar.h#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aacvar.h,v 1.16 2002/02/06 01:34:09 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aacvar.h,v 1.17 2002/04/04 21:03:13 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#14 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.18 2002/03/12 00:12:59 peter Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.19 2002/04/04 21:03:13 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.11 2002/02/23 05:31:38 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.12 2002/04/04 21:03:14 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#23 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.56 2002/02/23 05:21:56 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.57 2002/04/04 21:03:13 jhb Exp $ */ #include "opt_acpi.h" ==== //depot/projects/smpng/sys/dev/an/if_an.c#21 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/an/if_an.c,v 1.34 2002/04/01 21:30:30 jhb Exp $ + * $FreeBSD: src/sys/dev/an/if_an.c,v 1.35 2002/04/04 21:03:14 jhb Exp $ */ /* @@ -132,7 +132,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an.c,v 1.34 2002/04/01 21:30:30 jhb Exp $"; + "$FreeBSD: src/sys/dev/an/if_an.c,v 1.35 2002/04/04 21:03:14 jhb Exp $"; #endif /* These are global because we need them in sys/pci/if_an_p.c. */ ==== //depot/projects/smpng/sys/dev/ar/if_ar.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ar/if_ar.c,v 1.50 2001/04/16 13:20:21 jhay Exp $ + * $FreeBSD: src/sys/dev/ar/if_ar.c,v 1.51 2002/04/04 21:03:14 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/fxp/if_fxp.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.128 2002/02/04 03:15:27 silby Exp $ + * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.129 2002/04/04 21:03:14 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fxp/if_fxpvar.h,v 1.20 2001/12/14 17:56:12 luigi Exp $ + * $FreeBSD: src/sys/dev/fxp/if_fxpvar.h,v 1.21 2002/04/04 21:03:14 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/gx/if_gx.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/gx/if_gx.c,v 1.3 2001/12/03 17:28:27 brooks Exp $ + * $FreeBSD: src/sys/dev/gx/if_gx.c,v 1.4 2002/04/04 21:03:14 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/dev/gx/if_gxvar.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/gx/if_gxvar.h,v 1.1 2001/10/19 02:17:32 jlemon Exp $ + * $FreeBSD: src/sys/dev/gx/if_gxvar.h,v 1.2 2002/04/04 21:03:14 jhb Exp $ */ #if __FreeBSD_version < 500000 ==== //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Archie Cobbs * - * $FreeBSD: src/sys/dev/ichsmb/ichsmb.c,v 1.6 2001/12/10 08:09:41 obrien Exp $ + * $FreeBSD: src/sys/dev/ichsmb/ichsmb.c,v 1.7 2002/04/04 21:03:14 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/isp/isp_pci.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.79 2002/04/02 23:36:14 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.80 2002/04/04 21:03:15 jhb Exp $ */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. * FreeBSD Version. ==== //depot/projects/smpng/sys/dev/lmc/if_lmc.c#3 (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/sys/dev/lmc/if_lmc.c,v 1.13 2001/01/17 01:08:50 peter Exp $ + * $FreeBSD: src/sys/dev/lmc/if_lmc.c,v 1.14 2002/04/04 21:03:15 jhb Exp $ * From NetBSD: if_de.c,v 1.56.2.1 1997/10/27 02:13:25 thorpej Exp * $Id: if_lmc.c,v 1.9 1999/02/19 15:08:42 explorer Exp $ */ ==== //depot/projects/smpng/sys/dev/nge/if_nge.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.26 2002/03/20 02:07:32 alfred Exp $ + * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.27 2002/04/04 21:03:15 jhb Exp $ */ /* @@ -132,7 +132,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.26 2002/03/20 02:07:32 alfred Exp $"; + "$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.27 2002/04/04 21:03:15 jhb Exp $"; #endif #define NGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) ==== //depot/projects/smpng/sys/dev/pccbb/pccbb.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.41 2002/02/20 16:20:27 imp Exp $ + * $FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.42 2002/04/04 21:03:15 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: pdq_ifsubr.c,v 1.12 1997/06/05 01:56:35 thomas Exp$ - * $FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.17 2002/03/29 11:22:19 mdodd Exp $ + * $FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.18 2002/04/04 21:03:15 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/random/yarrow.c#5 (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/sys/dev/random/yarrow.c,v 1.37 2002/03/03 19:44:22 markm Exp $ + * $FreeBSD: src/sys/dev/random/yarrow.c,v 1.38 2002/04/04 21:03:15 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/dev/sio/sio.c#17 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sio/sio.c,v 1.372 2002/04/01 21:30:35 jhb Exp $ + * $FreeBSD: src/sys/dev/sio/sio.c,v 1.373 2002/04/04 21:03:16 jhb Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ ==== //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.22 2001/09/29 07:57:07 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/ad1816.c,v 1.23 2002/04/04 20:56:45 jhb Exp $"); struct ad1816_info; ==== //depot/projects/smpng/sys/dev/sound/isa/emu8000.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ * 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/dev/sound/isa/emu8000.c,v 1.9 2002/02/05 06:52:56 tanimura Exp $ + * $FreeBSD: src/sys/dev/sound/isa/emu8000.c,v 1.10 2002/04/04 21:03:16 jhb Exp $ * */ ==== //depot/projects/smpng/sys/dev/sound/isa/gusmidi.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * Ported to the new Audio Driver by Luigi Rizzo: * (C) 1999 Seigo Tanimura * - * $FreeBSD: src/sys/dev/sound/isa/gusmidi.c,v 1.8 2002/01/04 01:13:46 tanimura Exp $ + * $FreeBSD: src/sys/dev/sound/isa/gusmidi.c,v 1.9 2002/04/04 21:03:16 jhb Exp $ * */ ==== //depot/projects/smpng/sys/dev/sound/isa/mpu.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ * This handles io against /dev/midi, the midi {in, out}put event queues * and the event/message transmittion to/from an MPU401 interface. * - * $FreeBSD: src/sys/dev/sound/isa/mpu.c,v 1.15 2002/01/04 01:13:46 tanimura Exp $ + * $FreeBSD: src/sys/dev/sound/isa/mpu.c,v 1.16 2002/04/04 21:03:16 jhb Exp $ * */ ==== //depot/projects/smpng/sys/dev/sound/isa/mss.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.77 2002/02/05 12:09:23 tg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.78 2002/04/04 20:56:45 jhb Exp $"); /* board-specific include files */ #include ==== //depot/projects/smpng/sys/dev/sound/isa/opl.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ * This handles io against /dev/midi, the midi {in, out}put event queues * and the event/message operation to the OPL chip. * - * $FreeBSD: src/sys/dev/sound/isa/opl.c,v 1.8 2002/01/04 01:13:46 tanimura Exp $ + * $FreeBSD: src/sys/dev/sound/isa/opl.c,v 1.9 2002/04/04 21:03:16 jhb Exp $ * */ ==== //depot/projects/smpng/sys/dev/sound/isa/sbc.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.34 2001/09/29 12:38:58 greid Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/sbc.c,v 1.35 2002/04/04 20:56:45 jhb Exp $"); #define IO_MAX 3 #define IRQ_MAX 1 ==== //depot/projects/smpng/sys/dev/sound/isa/uartsio.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ * This handles io against /dev/midi, the midi {in, out}put event queues * and the event/message transmittion to/from a serial port interface. * - * $FreeBSD: src/sys/dev/sound/isa/uartsio.c,v 1.11 2002/01/04 01:13:46 tanimura Exp $ + * $FreeBSD: src/sys/dev/sound/isa/uartsio.c,v 1.12 2002/04/04 21:03:16 jhb Exp $ * */ ==== //depot/projects/smpng/sys/dev/sound/midi/midi.c#5 (text+ko) ==== @@ -46,7 +46,7 @@ * device parameters, then call the board-specific routines if * available, or try to perform the task using the default code. * - * $FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.9 2002/01/04 01:13:47 tanimura Exp $ + * $FreeBSD: src/sys/dev/sound/midi/midi.c,v 1.10 2002/04/04 21:03:16 jhb Exp $ * */ ==== //depot/projects/smpng/sys/dev/sound/midi/sequencer.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.11 2002/03/10 16:56:38 tanimura Exp $ + * $FreeBSD: src/sys/dev/sound/midi/sequencer.c,v 1.12 2002/04/04 21:03:16 jhb Exp $ * */ ==== //depot/projects/smpng/sys/dev/sound/midi/timer.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * 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/dev/sound/midi/timer.c,v 1.1 2002/01/04 01:16:18 tanimura Exp $ + * $FreeBSD: src/sys/dev/sound/midi/timer.c,v 1.2 2002/04/04 21:03:16 jhb Exp $ * */ ==== //depot/projects/smpng/sys/dev/sound/pci/cmi.c#9 (text+ko) ==== @@ -51,7 +51,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.15 2001/12/17 01:39:36 orion Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.16 2002/04/04 20:56:46 jhb Exp $"); /* Supported chip ID's */ #define CMI8338A_PCI_ID 0x010013f6 ==== //depot/projects/smpng/sys/dev/sound/pci/csamidi.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/csamidi.c,v 1.10 2002/01/04 01:13:49 tanimura Exp $ + * $FreeBSD: src/sys/dev/sound/pci/csamidi.c,v 1.11 2002/04/04 21:03:17 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/dev/sound/pci/ds1.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.26 2001/10/08 06:01:13 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.27 2002/04/04 20:56:46 jhb Exp $"); /* -------------------------------------------------------------------- */ ==== //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.25 2001/10/08 06:10:39 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.26 2002/04/04 20:56:46 jhb Exp $"); /* -------------------------------------------------------------------- */ ==== //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.31 2001/11/24 18:00:33 iwasaki Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.32 2002/04/04 20:56:46 jhb Exp $"); /* -------------------------------------------------------------------- */ ==== //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.24 2001/12/10 20:27:18 guido Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/ac97.c,v 1.25 2002/04/04 20:56:46 jhb Exp $"); MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); ==== //depot/projects/smpng/sys/dev/sound/pcm/channel.c#15 (text+ko) ==== @@ -29,7 +29,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/channel.c,v 1.82 2002/03/14 01:32:25 alfred Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/channel.c,v 1.83 2002/04/04 20:56:46 jhb Exp $"); #define MIN_CHUNK_SIZE 256 /* for uiomove etc. */ #define DMA_ALIGN_THRESHOLD 4 ==== //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.24 2001/09/12 08:37:13 julian Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/mixer.c,v 1.25 2002/04/04 20:56:47 jhb Exp $"); MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); ==== //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sndstat.c,v 1.7 2001/09/14 20:26:03 greid Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sndstat.c,v 1.8 2002/04/04 21:03:17 jhb Exp $"); #define SS_TYPE_MODULE 0 #define SS_TYPE_FIRST 1 ==== //depot/projects/smpng/sys/dev/sound/pcm/sound.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.70 2002/01/26 22:13:24 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.71 2002/04/04 20:54:27 jhb Exp $"); struct snddev_channel { SLIST_ENTRY(snddev_channel) link; ==== //depot/projects/smpng/sys/dev/sound/pcm/sound.h#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.45 2002/01/26 22:13:24 cg Exp $ + * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.46 2002/04/04 20:54:27 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/sr/if_sr.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sr/if_sr.c,v 1.47 2001/02/26 16:30:02 jhay Exp $ + * $FreeBSD: src/sys/dev/sr/if_sr.c,v 1.48 2002/04/04 21:03:17 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/dev/txp/if_txp.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $ */ -/* $FreeBSD: src/sys/dev/txp/if_txp.c,v 1.10 2002/03/20 02:07:44 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/txp/if_txp.c,v 1.11 2002/04/04 21:03:17 jhb Exp $ */ /* * Copyright (c) 2001 @@ -88,7 +88,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.10 2002/03/20 02:07:44 alfred Exp $"; + "$FreeBSD: src/sys/dev/txp/if_txp.c,v 1.11 2002/04/04 21:03:17 jhb Exp $"; #endif /* ==== //depot/projects/smpng/sys/dev/usb/if_aue.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.49 2002/04/02 13:26:40 joe Exp $ + * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.50 2002/04/04 21:03:17 jhb Exp $ */ /* @@ -99,7 +99,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.49 2002/04/02 13:26:40 joe Exp $"; + "$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.50 2002/04/04 21:03:17 jhb Exp $"; #endif /* ==== //depot/projects/smpng/sys/dev/usb/if_cue.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_cue.c,v 1.21 2002/04/02 11:54:28 joe Exp $ + * $FreeBSD: src/sys/dev/usb/if_cue.c,v 1.22 2002/04/04 21:03:17 jhb Exp $ */ /* @@ -78,7 +78,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.21 2002/04/02 11:54:28 joe Exp $"; + "$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.22 2002/04/04 21:03:17 jhb Exp $"; #endif /* ==== //depot/projects/smpng/sys/dev/usb/if_kue.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_kue.c,v 1.34 2002/04/02 11:54:28 joe Exp $ + * $FreeBSD: src/sys/dev/usb/if_kue.c,v 1.35 2002/04/04 21:03:17 jhb Exp $ */ /* @@ -94,7 +94,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.34 2002/04/02 11:54:28 joe Exp $"; + "$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.35 2002/04/04 21:03:17 jhb Exp $"; #endif MODULE_DEPEND(if_kue, usb, 1, 1, 1); ==== //depot/projects/smpng/sys/dev/usb/udbp.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/udbp.c,v 1.13 2001/01/09 04:33:17 wollman Exp $ + * $FreeBSD: src/sys/dev/usb/udbp.c,v 1.14 2002/04/04 21:03:17 jhb Exp $ */ /* Driver for arbitrary double bulk pipe devices. ==== //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/usb_ethersubr.c,v 1.10 2002/03/20 02:07:46 alfred Exp $ + * $FreeBSD: src/sys/dev/usb/usb_ethersubr.c,v 1.11 2002/04/04 21:03:17 jhb Exp $ */ /* @@ -69,7 +69,7 @@ #ifndef lint Static const char rcsid[] = - "$FreeBSD: src/sys/dev/usb/usb_ethersubr.c,v 1.10 2002/03/20 02:07:46 alfred Exp $"; + "$FreeBSD: src/sys/dev/usb/usb_ethersubr.c,v 1.11 2002/04/04 21:03:17 jhb Exp $"; #endif Static struct ifqueue usbq_rx; ==== //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#5 (text+ko) ==== @@ -46,7 +46,7 @@ * advised of the possibility of such damage. * * $Id: vinumconfig.c,v 1.30 2000/05/01 09:45:50 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.46 2002/01/29 02:49:15 grog Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.47 2002/04/04 21:03:18 jhb Exp $ */ #define STATIC static ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#29 (text+ko) ==== @@ -100,7 +100,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.90 2002/04/04 06:28:16 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.91 2002/04/04 21:03:18 jhb Exp $"; #endif static void wi_intr(void *); ==== //depot/projects/smpng/sys/fs/hpfs/hpfs_hash.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95 - * $FreeBSD: src/sys/fs/hpfs/hpfs_hash.c,v 1.13 2002/03/17 01:25:40 mckusick Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_hash.c,v 1.14 2002/04/04 21:03:18 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.24 2002/03/19 22:20:00 alfred Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.25 2002/04/04 21:03:18 jhb Exp $ */ ==== //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.60 2002/03/19 22:20:10 alfred Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_denode.c,v 1.61 2002/04/04 21:03:18 jhb Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $ */ /*- ==== //depot/projects/smpng/sys/fs/ntfs/ntfs_ihash.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95 - * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.17 2001/11/27 00:18:33 jhb Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.18 2002/04/04 21:03:19 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/fs/ntfs/ntfs_subr.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_subr.c,v 1.24 2002/03/19 22:20:11 alfred Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_subr.c,v 1.25 2002/04/04 21:03:19 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#12 (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. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.12 2001/12/10 08:09:45 obrien Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.13 2002/04/04 21:03:19 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs_fileno.c#4 (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. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs_fileno.c,v 1.5 2001/11/03 03:07:09 des Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs_fileno.c,v 1.6 2002/04/04 21:03:19 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#8 (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. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vncache.c,v 1.12 2002/01/08 11:15:57 msmith Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vncache.c,v 1.13 2002/04/04 21:03:19 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/geom/geom_event.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_event.c,v 1.5 2002/04/04 09:54:13 phk Exp $ + * $FreeBSD: src/sys/geom/geom_event.c,v 1.6 2002/04/04 21:03:19 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/geom/geom_io.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_io.c,v 1.4 2002/04/04 09:58:20 phk Exp $ + * $FreeBSD: src/sys/geom/geom_io.c,v 1.5 2002/04/04 21:03:19 jhb Exp $ */ ==== //depot/projects/smpng/sys/i386/i386/machdep.c#33 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.511 2002/04/04 17:49:45 bde Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.512 2002/04/04 21:03:19 jhb Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 18: 2:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C152C37B420; Thu, 4 Apr 2002 18:02:34 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E1DB537B41D for ; Thu, 4 Apr 2002 18:02:33 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3522XQ17788 for perforce@freebsd.org; Thu, 4 Apr 2002 18:02:33 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 4 Apr 2002 18:02:33 -0800 (PST) Message-Id: <200204050202.g3522XQ17788@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9078 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9078 Change 9078 by peter@peter_daintree on 2002/04/04 18:02:06 back out local addition of -lz for static linking support. the static linked sshd was handy, but is no longer required. Affected files ... ... //depot/projects/ia64/secure/libexec/sftp-server/Makefile#4 edit ... //depot/projects/ia64/secure/usr.bin/scp/Makefile#5 edit ... //depot/projects/ia64/secure/usr.bin/sftp/Makefile#5 edit ... //depot/projects/ia64/secure/usr.bin/ssh-add/Makefile#4 edit ... //depot/projects/ia64/secure/usr.bin/ssh-agent/Makefile#4 edit ... //depot/projects/ia64/secure/usr.bin/ssh-keygen/Makefile#4 edit ... //depot/projects/ia64/secure/usr.bin/ssh-keyscan/Makefile#4 edit Differences ... ==== //depot/projects/ia64/secure/libexec/sftp-server/Makefile#4 (text+ko) ==== @@ -5,8 +5,8 @@ SRCS= sftp-server.c sftp-common.c MAN= sftp-server.8 -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include ==== //depot/projects/ia64/secure/usr.bin/scp/Makefile#5 (text+ko) ==== @@ -4,8 +4,8 @@ PROG= scp SRCS= scp.c -DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} -LDADD= -lssh -lcrypto -lz +DPADD= ${LIBSSH} +LDADD= -lssh .include ==== //depot/projects/ia64/secure/usr.bin/sftp/Makefile#5 (text+ko) ==== @@ -4,8 +4,8 @@ PROG= sftp SRCS= sftp.c sftp-client.c sftp-int.c sftp-common.c sftp-glob.c -LDADD= -lssh -lcrypto -lz -DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD= -lssh -lcrypto +DPADD= ${LIBSSH} ${LIBCRYPTO} .include ==== //depot/projects/ia64/secure/usr.bin/ssh-add/Makefile#4 (text+ko) ==== @@ -4,8 +4,8 @@ PROG= ssh-add SRCS= ssh-add.c -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include ==== //depot/projects/ia64/secure/usr.bin/ssh-agent/Makefile#4 (text+ko) ==== @@ -4,8 +4,8 @@ PROG= ssh-agent SRCS= ssh-agent.c -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include ==== //depot/projects/ia64/secure/usr.bin/ssh-keygen/Makefile#4 (text+ko) ==== @@ -4,8 +4,8 @@ PROG= ssh-keygen SRCS= ssh-keygen.c -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPTO} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include ==== //depot/projects/ia64/secure/usr.bin/ssh-keyscan/Makefile#4 (text+ko) ==== @@ -4,8 +4,8 @@ PROG= ssh-keyscan SRCS= ssh-keyscan.c -LDADD+= -lssh -lcrypto -lz -DPADD+= ${LIBSSH} ${LIBCRYPTO} ${LIBZ} +LDADD+= -lssh -lcrypto +DPADD+= ${LIBSSH} ${LIBCRYPTO} .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 18: 7:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 049D837B41B; Thu, 4 Apr 2002 18:05:45 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 277BA37B417 for ; Thu, 4 Apr 2002 18:05:43 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3525bN19609 for perforce@freebsd.org; Thu, 4 Apr 2002 18:05:37 -0800 (PST) (envelope-from peter@freebsd.org) Date: Thu, 4 Apr 2002 18:05:37 -0800 (PST) Message-Id: <200204050205.g3525bN19609@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9079 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9079 Change 9079 by peter@peter_daintree on 2002/04/04 18:04:48 IFC @9077 Affected files ... ... //depot/projects/ia64/Makefile.inc1#15 integrate ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/INTERNALS#1 branch ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/LICENSE#1 branch ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/Makefile#1 branch ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/PLATFORMS#1 branch ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/README#1 branch ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/pam_macros.h#1 branch ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c#1 branch ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec#1 branch ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/passwdqc.h#1 branch ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/passwdqc_check.c#1 branch ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/passwdqc_random.c#1 branch ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/wordset_4k.c#1 branch ... //depot/projects/ia64/etc/mail/Makefile#5 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1obj/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#3 integrate ... //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#2 integrate ... //depot/projects/ia64/include/string.h#4 integrate ... //depot/projects/ia64/include/strings.h#2 integrate ... //depot/projects/ia64/lib/libpam/modules/modules.inc#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_passwdqc/Makefile#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_ssh/pam_ssh.c#6 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ssh/pam_ssh.h#2 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#8 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate ... //depot/projects/ia64/sbin/disklabel/disklabel.5#3 integrate ... //depot/projects/ia64/sbin/disklabel/disklabel.c#7 integrate ... //depot/projects/ia64/sbin/newfs/mkfs.c#7 integrate ... //depot/projects/ia64/sbin/newfs/newfs.c#8 integrate ... //depot/projects/ia64/share/termcap/Makefile#3 integrate ... //depot/projects/ia64/share/zoneinfo/asia#4 integrate ... //depot/projects/ia64/share/zoneinfo/australasia#4 integrate ... //depot/projects/ia64/share/zoneinfo/backward#3 integrate ... //depot/projects/ia64/share/zoneinfo/europe#4 integrate ... //depot/projects/ia64/share/zoneinfo/leapseconds#4 integrate ... //depot/projects/ia64/share/zoneinfo/northamerica#4 integrate ... //depot/projects/ia64/share/zoneinfo/southamerica#4 integrate ... //depot/projects/ia64/share/zoneinfo/zone.tab#4 integrate ... //depot/projects/ia64/sys/alpha/alpha/busdma_machdep.c#3 integrate ... //depot/projects/ia64/sys/alpha/alpha/interrupt.c#7 integrate ... //depot/projects/ia64/sys/alpha/alpha/machdep.c#9 integrate ... //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#6 integrate ... //depot/projects/ia64/sys/alpha/alpha/pmap.c#7 integrate ... //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#4 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#6 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#4 integrate ... //depot/projects/ia64/sys/boot/efi/loader/Makefile#6 integrate ... //depot/projects/ia64/sys/coda/coda_psdev.c#3 integrate ... //depot/projects/ia64/sys/compat/linux/linux_signal.c#2 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_signal.c#3 integrate ... //depot/projects/ia64/sys/conf/NOTES#2 integrate ... //depot/projects/ia64/sys/conf/files#13 integrate ... //depot/projects/ia64/sys/conf/files.sparc64#8 integrate ... //depot/projects/ia64/sys/conf/majors#3 integrate ... //depot/projects/ia64/sys/conf/options#8 integrate ... //depot/projects/ia64/sys/dev/aac/aacvar.h#5 integrate ... //depot/projects/ia64/sys/dev/acpica/Osd/OsdSchedule.c#5 integrate ... //depot/projects/ia64/sys/dev/acpica/Osd/OsdSynch.c#3 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi.c#7 integrate ... //depot/projects/ia64/sys/dev/an/if_an.c#8 integrate ... //depot/projects/ia64/sys/dev/ar/if_ar.c#2 integrate ... //depot/projects/ia64/sys/dev/bge/if_bge.c#7 integrate ... //depot/projects/ia64/sys/dev/bge/if_bgereg.h#4 integrate ... //depot/projects/ia64/sys/dev/fxp/if_fxp.c#5 integrate ... //depot/projects/ia64/sys/dev/fxp/if_fxpvar.h#3 integrate ... //depot/projects/ia64/sys/dev/gx/if_gx.c#3 integrate ... //depot/projects/ia64/sys/dev/gx/if_gxvar.h#2 integrate ... //depot/projects/ia64/sys/dev/ichsmb/ichsmb.c#3 integrate ... //depot/projects/ia64/sys/dev/isp/isp.c#5 integrate ... //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#4 integrate ... //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#6 integrate ... //depot/projects/ia64/sys/dev/isp/isp_inline.h#4 integrate ... //depot/projects/ia64/sys/dev/isp/isp_pci.c#5 integrate ... //depot/projects/ia64/sys/dev/isp/ispmbox.h#4 integrate ... //depot/projects/ia64/sys/dev/isp/ispvar.h#6 integrate ... //depot/projects/ia64/sys/dev/lmc/if_lmc.c#2 integrate ... //depot/projects/ia64/sys/dev/mk48txx/mk48txx.c#1 branch ... //depot/projects/ia64/sys/dev/mk48txx/mk48txxreg.h#1 branch ... //depot/projects/ia64/sys/dev/my/if_my.c#1 branch ... //depot/projects/ia64/sys/dev/my/if_myreg.h#1 branch ... //depot/projects/ia64/sys/dev/nge/if_nge.c#5 integrate ... //depot/projects/ia64/sys/dev/pccbb/pccbb.c#5 integrate ... //depot/projects/ia64/sys/dev/pdq/pdq_ifsubr.c#4 integrate ... //depot/projects/ia64/sys/dev/random/yarrow.c#3 integrate ... //depot/projects/ia64/sys/dev/sio/sio.c#8 integrate ... //depot/projects/ia64/sys/dev/sound/isa/ad1816.c#2 integrate ... //depot/projects/ia64/sys/dev/sound/isa/emu8000.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/isa/gusmidi.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/isa/mpu.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/isa/mss.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/isa/opl.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/isa/sbc.c#2 integrate ... //depot/projects/ia64/sys/dev/sound/isa/uartsio.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/midi/midi.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/midi/sequencer.c#4 integrate ... //depot/projects/ia64/sys/dev/sound/midi/timer.c#2 integrate ... //depot/projects/ia64/sys/dev/sound/pci/cmi.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/pci/csamidi.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/pci/ds1.c#2 integrate ... //depot/projects/ia64/sys/dev/sound/pci/emu10k1.c#2 integrate ... //depot/projects/ia64/sys/dev/sound/pci/t4dwave.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#4 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/channel.c#5 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/mixer.c#2 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/sndstat.c#2 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/sound.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/sound.h#3 integrate ... //depot/projects/ia64/sys/dev/sr/if_sr.c#2 integrate ... //depot/projects/ia64/sys/dev/txp/if_txp.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/if_aue.c#6 integrate ... //depot/projects/ia64/sys/dev/usb/if_cue.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/if_kue.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/udbp.c#2 integrate ... //depot/projects/ia64/sys/dev/usb/usb_ethersubr.c#3 integrate ... //depot/projects/ia64/sys/dev/vinum/vinumconfig.c#3 integrate ... //depot/projects/ia64/sys/dev/wi/if_wavelan_ieee.h#4 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi.c#12 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#2 integrate ... //depot/projects/ia64/sys/dev/wi/if_wireg.h#6 integrate ... //depot/projects/ia64/sys/dev/wi/if_wivar.h#2 integrate ... //depot/projects/ia64/sys/fs/hpfs/hpfs_hash.c#4 integrate ... //depot/projects/ia64/sys/fs/hpfs/hpfs_vfsops.c#6 integrate ... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_denode.c#4 integrate ... //depot/projects/ia64/sys/fs/ntfs/ntfs_ihash.c#3 integrate ... //depot/projects/ia64/sys/fs/ntfs/ntfs_subr.c#6 integrate ... //depot/projects/ia64/sys/fs/pseudofs/pseudofs.c#5 integrate ... //depot/projects/ia64/sys/fs/pseudofs/pseudofs_fileno.c#3 integrate ... //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vncache.c#4 integrate ... //depot/projects/ia64/sys/geom/geom.h#4 integrate ... //depot/projects/ia64/sys/geom/geom_bsd.c#5 integrate ... //depot/projects/ia64/sys/geom/geom_dev.c#6 integrate ... //depot/projects/ia64/sys/geom/geom_disk.c#5 integrate ... //depot/projects/ia64/sys/geom/geom_dump.c#4 integrate ... //depot/projects/ia64/sys/geom/geom_event.c#3 integrate ... //depot/projects/ia64/sys/geom/geom_int.h#2 integrate ... //depot/projects/ia64/sys/geom/geom_io.c#3 integrate ... //depot/projects/ia64/sys/geom/geom_mbr.c#4 integrate ... //depot/projects/ia64/sys/geom/geom_pc98.c#2 integrate ... //depot/projects/ia64/sys/geom/geom_slice.c#6 integrate ... //depot/projects/ia64/sys/geom/geom_slice.h#3 integrate ... //depot/projects/ia64/sys/geom/geom_subr.c#4 integrate ... //depot/projects/ia64/sys/geom/geom_sunlabel.c#4 integrate ... //depot/projects/ia64/sys/i386/i386/autoconf.c#7 integrate ... //depot/projects/ia64/sys/i386/i386/machdep.c#10 integrate ... //depot/projects/ia64/sys/i386/i386/mp_machdep.c#7 integrate ... //depot/projects/ia64/sys/i386/i386/trap.c#8 integrate ... //depot/projects/ia64/sys/i386/i386/vm86.c#4 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_signal.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/if_el.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/intr_machdep.c#4 integrate ... //depot/projects/ia64/sys/i386/linux/linux.h#2 integrate ... //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#7 integrate ... //depot/projects/ia64/sys/i386/svr4/svr4_machdep.c#4 integrate ... //depot/projects/ia64/sys/i4b/capi/capi_l4if.c#4 integrate ... //depot/projects/ia64/sys/i4b/capi/iavc/iavc_isa.c#4 integrate ... //depot/projects/ia64/sys/i4b/capi/iavc/iavc_pci.c#4 integrate ... //depot/projects/ia64/sys/i4b/driver/i4b_ing.c#4 integrate ... //depot/projects/ia64/sys/i4b/driver/i4b_ipr.c#5 integrate ... //depot/projects/ia64/sys/i4b/driver/i4b_rbch.c#4 integrate ... //depot/projects/ia64/sys/i4b/driver/i4b_trace.c#4 integrate ... //depot/projects/ia64/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate ... //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate ... //depot/projects/ia64/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate ... //depot/projects/ia64/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#3 integrate ... //depot/projects/ia64/sys/i4b/layer1/isic/i4b_bchan.c#4 integrate ... //depot/projects/ia64/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#3 integrate ... //depot/projects/ia64/sys/i4b/layer2/i4b_l2.c#4 integrate ... //depot/projects/ia64/sys/i4b/layer4/i4b_i4bdrv.c#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/autoconf.c#6 integrate ... //depot/projects/ia64/sys/ia64/ia64/interrupt.c#7 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#22 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#13 integrate ... //depot/projects/ia64/sys/ia64/ia64/trap.c#17 integrate ... //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#6 integrate ... //depot/projects/ia64/sys/ia64/include/elf.h#2 integrate ... //depot/projects/ia64/sys/isofs/cd9660/cd9660_node.c#4 integrate ... //depot/projects/ia64/sys/kern/clock_if.m#1 branch ... //depot/projects/ia64/sys/kern/init_main.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#12 integrate ... //depot/projects/ia64/sys/kern/kern_exec.c#11 integrate ... //depot/projects/ia64/sys/kern/kern_fork.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_intr.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_jail.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_lock.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_malloc.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_mtxpool.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_mutex.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_resource.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_sema.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_sig.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_sx.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_timeout.c#3 integrate ... //depot/projects/ia64/sys/kern/subr_clock.c#1 branch ... //depot/projects/ia64/sys/kern/subr_disklabel.c#6 integrate ... //depot/projects/ia64/sys/kern/subr_eventhandler.c#3 integrate ... //depot/projects/ia64/sys/kern/subr_mbuf.c#4 integrate ... //depot/projects/ia64/sys/kern/subr_rman.c#4 integrate ... //depot/projects/ia64/sys/kern/subr_smp.c#6 integrate ... //depot/projects/ia64/sys/kern/subr_taskqueue.c#3 integrate ... //depot/projects/ia64/sys/kern/subr_trap.c#6 integrate ... //depot/projects/ia64/sys/kern/subr_witness.c#7 integrate ... //depot/projects/ia64/sys/kern/sys_generic.c#8 integrate ... //depot/projects/ia64/sys/kern/sys_pipe.c#10 integrate ... //depot/projects/ia64/sys/kern/uipc_syscalls.c#7 integrate ... //depot/projects/ia64/sys/kern/vfs_bio.c#12 integrate ... //depot/projects/ia64/sys/kern/vfs_subr.c#9 integrate ... //depot/projects/ia64/sys/net/bpf.c#6 integrate ... //depot/projects/ia64/sys/net/bsd_comp.c#4 integrate ... //depot/projects/ia64/sys/net/ethernet.h#4 integrate ... //depot/projects/ia64/sys/net/if.c#6 integrate ... //depot/projects/ia64/sys/net/if_arcsubr.c#3 integrate ... //depot/projects/ia64/sys/net/if_ethersubr.c#8 integrate ... //depot/projects/ia64/sys/net/if_loop.c#5 integrate ... //depot/projects/ia64/sys/net/if_ppp.c#5 integrate ... //depot/projects/ia64/sys/net/if_sl.c#5 integrate ... //depot/projects/ia64/sys/net/if_spppsubr.c#3 integrate ... //depot/projects/ia64/sys/net/if_tap.c#7 integrate ... //depot/projects/ia64/sys/net/if_tun.c#4 integrate ... //depot/projects/ia64/sys/net/if_vlan.c#5 integrate ... //depot/projects/ia64/sys/net/ppp_deflate.c#4 integrate ... //depot/projects/ia64/sys/netatalk/ddp_usrreq.c#5 integrate ... //depot/projects/ia64/sys/netatm/atm_subr.c#4 integrate ... //depot/projects/ia64/sys/netgraph/ng_base.c#4 integrate ... //depot/projects/ia64/sys/netinet/if_ether.c#6 integrate ... //depot/projects/ia64/sys/netinet/ip_input.c#7 integrate ... //depot/projects/ia64/sys/netinet6/ip6_input.c#5 integrate ... //depot/projects/ia64/sys/netipx/ipx_input.c#3 integrate ... //depot/projects/ia64/sys/netnatm/natm_proto.c#4 integrate ... //depot/projects/ia64/sys/netns/ns_input.c#3 integrate ... //depot/projects/ia64/sys/netsmb/smb_subr.h#5 integrate ... //depot/projects/ia64/sys/pc98/i386/machdep.c#10 integrate ... //depot/projects/ia64/sys/pc98/pc98/sio.c#8 integrate ... //depot/projects/ia64/sys/pci/if_dc.c#8 integrate ... //depot/projects/ia64/sys/pci/if_pcn.c#4 integrate ... //depot/projects/ia64/sys/pci/if_rl.c#6 integrate ... //depot/projects/ia64/sys/pci/if_sf.c#4 integrate ... //depot/projects/ia64/sys/pci/if_sis.c#7 integrate ... //depot/projects/ia64/sys/pci/if_sk.c#4 integrate ... //depot/projects/ia64/sys/pci/if_ste.c#4 integrate ... //depot/projects/ia64/sys/pci/if_ti.c#6 integrate ... //depot/projects/ia64/sys/pci/if_tl.c#4 integrate ... //depot/projects/ia64/sys/pci/if_vr.c#4 integrate ... //depot/projects/ia64/sys/pci/if_wb.c#4 integrate ... //depot/projects/ia64/sys/pci/if_xl.c#6 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/clock.c#3 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/eeprom.c#1 branch ... //depot/projects/ia64/sys/sparc64/sparc64/eeprom_ebus.c#1 branch ... //depot/projects/ia64/sys/sparc64/sparc64/eeprom_sbus.c#1 branch ... //depot/projects/ia64/sys/sparc64/sparc64/intr_machdep.c#6 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#9 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/mp_machdep.c#4 integrate ... //depot/projects/ia64/sys/sys/_lock.h#2 integrate ... //depot/projects/ia64/sys/sys/clock.h#1 branch ... //depot/projects/ia64/sys/sys/disklabel.h#9 integrate ... //depot/projects/ia64/sys/sys/mutex.h#7 integrate ... //depot/projects/ia64/sys/sys/pcpu.h#5 integrate ... //depot/projects/ia64/sys/sys/proc.h#11 integrate ... //depot/projects/ia64/sys/sys/signalvar.h#4 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#10 integrate ... //depot/projects/ia64/sys/ufs/ifs/ifs_vfsops.c#4 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_dirhash.c#5 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_ihash.c#3 integrate ... //depot/projects/ia64/sys/vm/device_pager.c#5 integrate ... //depot/projects/ia64/sys/vm/phys_pager.c#3 integrate ... //depot/projects/ia64/sys/vm/swap_pager.c#7 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#5 integrate ... //depot/projects/ia64/sys/vm/uma_int.h#3 integrate ... //depot/projects/ia64/sys/vm/vm_extern.h#6 integrate ... //depot/projects/ia64/sys/vm/vm_meter.c#3 integrate ... //depot/projects/ia64/sys/vm/vm_object.c#7 integrate ... //depot/projects/ia64/sys/vm/vm_page.c#7 integrate ... //depot/projects/ia64/sys/vm/vm_pageq.c#4 integrate ... //depot/projects/ia64/sys/vm/vm_pager.c#6 integrate ... //depot/projects/ia64/sys/vm/vm_zone.c#6 integrate ... //depot/projects/ia64/tools/regression/geom/geom_simdev.c#3 integrate ... //depot/projects/ia64/tools/regression/geom/geom_simdisk.c#3 integrate ... //depot/projects/ia64/tools/regression/geom/geom_simdisk.h#3 integrate ... //depot/projects/ia64/tools/regression/geom/geom_simdisk_xml.c#4 integrate ... //depot/projects/ia64/usr.bin/sort/extern.h#3 integrate ... //depot/projects/ia64/usr.bin/sort/fields.c#3 integrate ... //depot/projects/ia64/usr.bin/sort/files.c#3 integrate ... //depot/projects/ia64/usr.bin/sort/init.c#4 integrate ... //depot/projects/ia64/usr.bin/sort/msort.c#3 integrate ... //depot/projects/ia64/usr.bin/sort/sort.c#4 integrate ... //depot/projects/ia64/usr.bin/sort/sort.h#2 integrate ... //depot/projects/ia64/usr.bin/yacc/error.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/main.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/mkpar.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/output.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/reader.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/verbose.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/yacc.1#2 integrate ... //depot/projects/ia64/usr.bin/yacc/yyfix.1#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/auth.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/radius.h#2 integrate ... //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.c#3 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.248 2002/04/01 20:47:27 joe Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.249 2002/04/04 06:49:46 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -226,8 +226,8 @@ usr/share/groff_font/devutf8 \ usr/share/tmac/mdoc usr/share/tmac/mm -INCDIRS= arpa g++/std isc objc protocols readline rpc rpcsvc openssl \ - security +INCDIRS= arpa dev fs g++/std isc isofs objc protocols \ + readline rpc rpcsvc openssl security ufs # # buildworld ==== //depot/projects/ia64/etc/mail/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/mail/Makefile,v 1.24 2002/03/28 03:30:27 gshapiro Exp $ +# $FreeBSD: src/etc/mail/Makefile,v 1.26 2002/04/04 07:42:12 ru Exp $ # # This Makefile provides an easy way to generate the configuration # file and database maps for the sendmail(8) daemon. ==== //depot/projects/ia64/gnu/usr.bin/cc/cc1/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc1/Makefile,v 1.22 2002/04/04 01:25:26 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc1/Makefile,v 1.23 2002/04/04 19:26:12 obrien Exp $ .include "../Makefile.inc" @@ -27,7 +27,7 @@ ${.ALLSRC} > c-parse.y ${YACC} -d -o c-parse.c c-parse.y -CLEANFILES+= c-parse.c c-parse.h c-parse.y # insurance +CLEANFILES+= c-parse.c c-parse.h c-parse.y # insurance #----------------------------------------------------------------------- ==== //depot/projects/ia64/gnu/usr.bin/cc/cc1obj/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc1obj/Makefile,v 1.16 2002/04/04 01:25:26 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc1obj/Makefile,v 1.17 2002/04/04 19:26:13 obrien Exp $ .include "../Makefile.inc" @@ -28,7 +28,7 @@ ${YACC} -d -o objc-parse.c objc-parse.y mv objc-parse.h c-parse.h -CLEANFILES+= objc-parse.c c-parse.h objc-parse.y # insurance +CLEANFILES+= objc-parse.c c-parse.h objc-parse.y # insurance #----------------------------------------------------------------------- ==== //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.54 2002/04/04 00:11:00 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.55 2002/04/04 18:24:56 obrien Exp $ # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk @@ -12,7 +12,6 @@ # aliases of generated headers. CFLAGS+= -I. -WARNS= 0 .include "../Makefile.inc" ==== //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#3 (text+ko) ==== @@ -1,10 +1,9 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.13 2002/02/24 06:05:22 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.14 2002/04/04 19:36:33 obrien Exp $ */ /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD source tree so it can be configured appropriately without using the GNU configure/build mechanism. */ -#undef FREEBSD_NATIVE #define FREEBSD_NATIVE 1 #undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */ @@ -29,17 +28,17 @@ libraries: MD_EXEC_PREFIX:MD_STARTFILE_PREFIX:STANDARD_STARTFILE_PREFIX */ #undef TOOLDIR_BASE_PREFIX /* Old?? This is not documented. */ +#define STANDARD_EXEC_PREFIX PREFIX"/libexec/" #undef MD_EXEC_PREFIX /* We don't want one. */ -#define STANDARD_EXEC_PREFIX PREFIX"/libexec/" /* Under FreeBSD, the normal location of the various *crt*.o files is the /usr/lib directory. */ -#undef MD_STARTFILE_PREFIX /* We don't need one for now. */ #define STANDARD_STARTFILE_PREFIX PREFIX"/lib/" #ifdef CROSS_COMPILE #define CROSS_STARTFILE_PREFIX PREFIX"/lib/" #endif +#undef MD_STARTFILE_PREFIX /* We don't need one for now. */ /* For the native system compiler, we actually build libgcc in a profiled version. So we should use it with -pg. */ ==== //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" .\" --------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.11 2001/06/17 11:22:57 alex Exp $ +.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.12 2002/04/04 18:31:36 des Exp $ .nh .TH SEND-PR 1 3.113 "February 1993" .SH NAME @@ -194,6 +194,9 @@ .B i386 Intel x86 processor specific problems. .TP +.B ia64 +Intel ia64 processor specific problems. +.TP .B kern Changes or enhancements to the architecture independent kernel sources. .TP @@ -203,8 +206,14 @@ .B ports Corrections or enhancements (including new ports) to the ports collection. .TP -.B sparc +.B sparc64 SPARC processor specific problems. +.TP +.B standards +Standards conformance issues. +.TP +.B www +Changes or enhancements to the FreeBSD website. .SH ENVIRONMENT The environment variable .B EDITOR ==== //depot/projects/ia64/include/string.h#4 (text+ko) ==== @@ -31,13 +31,23 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.12 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/string.h,v 1.13 2002/04/04 05:41:57 mike Exp $ */ #ifndef _STRING_H_ #define _STRING_H_ + +#include #include +/* + * Prototype functions which were historically defined in , but + * are required by POSIX to be prototyped in . + */ +#if __BSD_VISIBLE +#include +#endif + #ifdef _BSD_SIZE_T_ typedef _BSD_SIZE_T_ size_t; #undef _BSD_SIZE_T_ @@ -47,53 +57,45 @@ #define NULL 0 #endif -#include - __BEGIN_DECLS void *memchr(const void *, int, size_t); int memcmp(const void *, const void *, size_t); -void *memcpy(void *, const void *, size_t); +void *memcpy(void * __restrict, const void * __restrict, size_t); void *memmove(void *, const void *, size_t); void *memset(void *, int, size_t); -char *strcat(char *, const char *); +char *strcat(char * __restrict, const char * __restrict); char *strchr(const char *, int); int strcmp(const char *, const char *); int strcoll(const char *, const char *); -char *strcpy(char *, const char *); +char *strcpy(char * __restrict, const char * __restrict); size_t strcspn(const char *, const char *); char *strerror(int); size_t strlen(const char *); -char *strncat(char *, const char *, size_t); +char *strncat(char * __restrict, const char * __restrict, size_t); int strncmp(const char *, const char *, size_t); -char *strncpy(char *, const char *, size_t); +char *strncpy(char * __restrict, const char * __restrict, size_t); char *strpbrk(const char *, const char *); char *strrchr(const char *, int); size_t strspn(const char *, const char *); char *strstr(const char *, const char *); -char *strtok(char *, const char *); -size_t strxfrm(char *, const char *, size_t); +char *strtok(char * __restrict, const char * __restrict); +size_t strxfrm(char * __restrict, const char * __restrict, size_t); -/* Nonstandard routines */ -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -int bcmp(const void *, const void *, size_t); -void bcopy(const void *, void *, size_t); -void bzero(void *, size_t); -int ffs(int); -char *index(const char *, int); -void *memccpy(void *, const void *, int, size_t); -char *rindex(const char *, int); -int strcasecmp(const char *, const char *); -char *strcasestr(const char *, const char *); +#if __POSIX_VISIBLE >= 200112 +void *memccpy(void * __restrict, const void * __restrict, int, size_t); char *strdup(const char *); int strerror_r(int, char *, size_t); +char *strtok_r(char *, const char *, char **); +#endif + +#if __BSD_VISIBLE +char *strcasestr(const char *, const char *); size_t strlcat(char *, const char *, size_t); size_t strlcpy(char *, const char *, size_t); void strmode(int, char *); -int strncasecmp(const char *, const char *, size_t); char *strnstr(const char *, const char *, size_t); char *strsep(char **, const char *); char *strsignal(int); -char *strtok_r(char *, const char *, char **); void swab(const void *, void *, size_t); #endif __END_DECLS ==== //depot/projects/ia64/include/strings.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. + * Copyright (c) 2002 Mike Barcroft + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,18 +10,11 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -30,7 +23,29 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)strings.h 8.1 (Berkeley) 6/2/93 + * $FreeBSD: src/include/strings.h,v 1.2 2002/04/04 05:41:57 mike Exp $ */ -#include +#ifndef _STRINGS_H_ +#define _STRINGS_H_ + +#include +#include + +#ifdef _BSD_SIZE_T_ +typedef _BSD_SIZE_T_ size_t; +#undef _BSD_SIZE_T_ +#endif + +__BEGIN_DECLS +int bcmp(const void *, const void *, size_t); /* LEGACY */ +void bcopy(const void *, void *, size_t); /* LEGACY */ +void bzero(void *, size_t); /* LEGACY */ +int ffs(int); +char *index(const char *, int); /* LEGACY */ +char *rindex(const char *, int); /* LEGACY */ +int strcasecmp(const char *, const char *); +int strncasecmp(const char *, const char *, size_t); +__END_DECLS + +#endif /* _STRINGS_H_ */ ==== //depot/projects/ia64/lib/libpam/modules/modules.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.3 2002/03/07 02:23:16 green Exp $ +# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.4 2002/04/04 16:08:28 des Exp $ MODULES = MODULES += pam_deny @@ -14,6 +14,7 @@ MODULES += pam_nologin MODULES += pam_opie MODULES += pam_opieaccess +MODULES += pam_passwdqc MODULES += pam_permit MODULES += pam_radius MODULES += pam_rootok ==== //depot/projects/ia64/lib/libpam/modules/pam_ssh/pam_ssh.c#6 (text+ko) ==== @@ -32,27 +32,26 @@ * 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. + * + * $Id: pam_ssh.c,v 1.23 2001/08/20 01:44:02 akorty Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.28 2002/03/14 23:27:59 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.29 2002/04/04 18:45:21 des Exp $"); #include -#include #include #include -#include +#include #include #include -#include #include #include #include -#include #include -#define PAM_SM_AUTH +#define PAM_SM_AUTH #define PAM_SM_ACCOUNT #define PAM_SM_SESSION #define PAM_SM_PASSWORD @@ -70,16 +69,12 @@ #include "log.h" #include "pam_ssh.h" -static int auth_via_key(pam_handle_t *, int, const char *, const char *, const struct passwd *, const char *); -static void key_cleanup(pam_handle_t *, void *, int); -static void ssh_cleanup(pam_handle_t *, void *, int); - /* - * Generic cleanup function for SSH "Key" type. + * Generic cleanup function for OpenSSH "Key" type. */ -static void -key_cleanup(pam_handle_t *pamh __unused, void *data, int error_status __unused) +void +key_cleanup(pam_handle_t *pamh, void *data, int error_status) { if (data) key_free(data); @@ -90,8 +85,8 @@ * Generic PAM cleanup function for this module. */ -static void -ssh_cleanup(pam_handle_t *pamh __unused, void *data, int error_status __unused) +void +ssh_cleanup(pam_handle_t *pamh, void *data, int error_status) { if (data) free(data); @@ -107,39 +102,46 @@ */ static int -auth_via_key(pam_handle_t *pamh, int type, const char *file, - const char *dir, const struct passwd *user, const char *pass) +auth_via_key(pam_handle_t *pamh, const char *file, const char *dir, + const struct passwd *user, const char *pass) { - char *comment; /* private key comment */ - char *data_name; /* PAM state */ - static int indx = 0; /* for saved keys */ - Key *key; /* user's key */ - char *path; /* to key files */ - int retval; /* from calls */ - uid_t saved_uid; /* caller's uid */ + char *comment; /* private key comment */ + char *data_name; /* PAM state */ + static int index = 0; /* for saved keys */ + Key *key; /* user's key */ + char *path; /* to key files */ + int retval; /* from calls */ + uid_t saved_uid; /* caller's uid */ /* locate the user's private key file */ + if (!asprintf(&path, "%s/%s", dir, file)) { - syslog(LOG_CRIT, "%s: %m", MODULE_NAME); + openpam_log(PAM_LOG_ERROR, "%s: %m", MODULE_NAME); return PAM_SERVICE_ERR; } - saved_uid = geteuid(); - /* - * Try to decrypt the private key with the passphrase provided. - * If success, the user is authenticated. - */ - seteuid(user->pw_uid); - key = key_load_private_type(type, path, pass, &comment); + + saved_uid = getuid(); + + /* Try to decrypt the private key with the passphrase provided. If + success, the user is authenticated. */ + + comment = NULL; + (void) setreuid(user->pw_uid, saved_uid); + key = key_load_private(path, pass, &comment); + (void) setuid(saved_uid); free(path); - seteuid(saved_uid); - if (key == NULL) + if (!comment) + comment = strdup(file); + if (!key) { + free(comment); return PAM_AUTH_ERR; - /* - * Save the key and comment to pass to ssh-agent in the session - * phase. - */ - if (!asprintf(&data_name, "ssh_private_key_%d", indx)) { - syslog(LOG_CRIT, "%s: %m", MODULE_NAME); + } + + /* save the key and comment to pass to ssh-agent in the session + phase */ + + if (!asprintf(&data_name, "ssh_private_key_%d", index)) { + openpam_log(PAM_LOG_ERROR, "%s: %m", MODULE_NAME); free(comment); return PAM_SERVICE_ERR; } @@ -150,8 +152,8 @@ free(comment); return retval; } - if (!asprintf(&data_name, "ssh_key_comment_%d", indx)) { - syslog(LOG_CRIT, "%s: %m", MODULE_NAME); + if (!asprintf(&data_name, "ssh_key_comment_%d", index)) { + openpam_log(PAM_LOG_ERROR, "%s: %m", MODULE_NAME); free(comment); return PAM_SERVICE_ERR; } @@ -161,435 +163,478 @@ free(comment); return retval; } - ++indx; + + ++index; return PAM_SUCCESS; } -PAM_EXTERN int -pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv) +/* + * Add the keys stored by auth_via_key() to the agent connected to the + * socket provided. + */ + +static int +add_keys(pam_handle_t *pamh, char *socket) { - struct options options; /* module options */ - int authenticated; /* user authenticated? */ - char *dotdir; /* .ssh2 dir name */ - struct dirent *dotdir_ent; /* .ssh2 dir entry */ - DIR *dotdir_p; /* .ssh2 dir pointer */ - const char *pass; /* passphrase */ - struct passwd *pwd; /* user's passwd entry */ - struct passwd *pwd_keep; /* our own copy */ - int retval; /* from calls */ - int pam_auth_dsa; /* Authorised via DSA */ - int pam_auth_rsa; /* Authorised via RSA */ - const char *user; /* username */ - - pam_std_option(&options, NULL, argc, argv); + AuthenticationConnection *ac; /* connection to ssh-agent */ + char *comment; /* private key comment */ + char *data_name; /* PAM state */ + int final; /* final return value */ + int index; /* for saved keys */ + Key *key; /* user's private key */ + int retval; /* from calls */ - PAM_LOG("Options processed"); - - retval = pam_get_user(pamh, &user, NULL); - if (retval != PAM_SUCCESS) - PAM_RETURN(retval); - pwd = getpwnam(user); - if (pwd == NULL || pwd->pw_dir == NULL) - /* delay? */ - PAM_RETURN(PAM_AUTH_ERR); - - PAM_LOG("Got user: %s", user); - /* - * Pass prompt message to application and receive - * passphrase. + * Connect to the agent. + * + * XXX Because ssh_get_authentication_connection() gets the + * XXX agent parameters from the environment, we have to + * XXX temporarily replace the environment with the PAM + * XXX environment list. This is a hack. */ - retval = pam_get_authtok(pamh, &pass, NEED_PASSPHRASE); - if (retval != PAM_SUCCESS) - PAM_RETURN(retval); - OpenSSL_add_all_algorithms(); /* required for DSA */ + { + extern char **environ; + char **saved, **evp; - PAM_LOG("Got passphrase"); - - /* - * Either the DSA or the RSA key will authenticate us, but if - * we can decrypt both, we'll do so here so we can cache them in - * the session phase. - */ - if (!asprintf(&dotdir, "%s/%s", pwd->pw_dir, SSH_CLIENT_DIR)) { - syslog(LOG_CRIT, "%s: %m", MODULE_NAME); - PAM_RETURN(PAM_SERVICE_ERR); + saved = environ; + if ((environ = pam_getenvlist(pamh)) == NULL) { + environ = saved; + openpam_log(PAM_LOG_ERROR, "%s: %m", MODULE_NAME); + return (PAM_BUF_ERR); + } + ac = ssh_get_authentication_connection(); + for (evp = environ; *evp; evp++) + free(*evp); + free(environ); + environ = saved; } - pam_auth_dsa = auth_via_key(pamh, KEY_DSA, SSH_CLIENT_ID_DSA, dotdir, - pwd, pass); - pam_auth_rsa = auth_via_key(pamh, KEY_RSA1, SSH_CLIENT_IDENTITY, dotdir, - pwd, pass); - authenticated = 0; - if (pam_auth_dsa == PAM_SUCCESS) - authenticated++; - if (pam_auth_rsa == PAM_SUCCESS) - authenticated++; - - PAM_LOG("Done pre-authenticating; got %d", authenticated); - - /* - * Compatibility with SSH2 from SSH Communications Security. - */ - if (!asprintf(&dotdir, "%s/%s", pwd->pw_dir, SSH2_CLIENT_DIR)) { - syslog(LOG_CRIT, "%s: %m", MODULE_NAME); - PAM_RETURN(PAM_SERVICE_ERR); + if (!ac) { + openpam_log(PAM_LOG_ERROR, "%s: %s: %m", MODULE_NAME, socket); + return PAM_SESSION_ERR; } - /* - * Try to load anything that looks like a private key. For - * now, we only support DSA and RSA keys. - */ - dotdir_p = opendir(dotdir); - while (dotdir_p && (dotdir_ent = readdir(dotdir_p))) { - /* skip public keys */ - if (strcmp(&dotdir_ent->d_name[dotdir_ent->d_namlen - - strlen(SSH2_PUB_SUFFIX)], SSH2_PUB_SUFFIX) == 0) - continue; - /* DSA keys */ - if (strncmp(dotdir_ent->d_name, SSH2_DSA_PREFIX, - strlen(SSH2_DSA_PREFIX)) == 0) - retval = auth_via_key(pamh, KEY_DSA, - dotdir_ent->d_name, dotdir, pwd, pass); - /* RSA keys */ - else if (strncmp(dotdir_ent->d_name, SSH2_RSA_PREFIX, - strlen(SSH2_RSA_PREFIX)) == 0) - retval = auth_via_key(pamh, KEY_RSA, - dotdir_ent->d_name, dotdir, pwd, pass); - /* skip other files */ - else - continue; - authenticated += (retval == PAM_SUCCESS); - } - if (!authenticated) { - PAM_VERBOSE_ERROR("SSH authentication refused"); - PAM_RETURN(PAM_AUTH_ERR); - } - PAM_LOG("Done authenticating; got %d", authenticated); + /* hand off each private key to the agent */ - /* - * Copy the passwd entry (in case successive calls are made) - * and save it for the session phase. - */ - pwd_keep = malloc(sizeof *pwd); - if (pwd_keep == NULL) { - syslog(LOG_CRIT, "%m"); - PAM_RETURN(PAM_SERVICE_ERR); + final = 0; + for (index = 0; ; index++) { + if (!asprintf(&data_name, "ssh_private_key_%d", index)) { + openpam_log(PAM_LOG_ERROR, "%s: %m", MODULE_NAME); + ssh_close_authentication_connection(ac); + return PAM_SERVICE_ERR; + } + retval = pam_get_data(pamh, data_name, (const void **)&key); + free(data_name); + if (retval != PAM_SUCCESS) + break; + if (!asprintf(&data_name, "ssh_key_comment_%d", index)) { + openpam_log(PAM_LOG_ERROR, "%s: %m", MODULE_NAME); + ssh_close_authentication_connection(ac); + return PAM_SERVICE_ERR; + } + retval = pam_get_data(pamh, data_name, + (const void **)&comment); + free(data_name); + if (retval != PAM_SUCCESS) + break; + retval = ssh_add_identity(ac, key, comment); + if (!final) + final = retval; } - memcpy(pwd_keep, pwd, sizeof *pwd_keep); - retval = pam_set_data(pamh, "ssh_passwd_entry", pwd_keep, ssh_cleanup); - if (retval != PAM_SUCCESS) { - free(pwd_keep); - PAM_RETURN(retval); - } + ssh_close_authentication_connection(ac); - PAM_LOG("Saved ssh_passwd_entry"); - - PAM_RETURN(PAM_SUCCESS); + return final ? PAM_SUCCESS : PAM_SESSION_ERR; } PAM_EXTERN int -pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv) +pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, + const char **argv) { - struct options options; /* module options */ + int authenticated; /* user authenticated? */ + char *dotdir; /* .ssh dir name */ + char *file; /* current key file */ + char *keyfiles; /* list of key files to add */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 18:25:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52F4437B41C; Thu, 4 Apr 2002 18:25:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8A1E137B41B for ; Thu, 4 Apr 2002 18:25:09 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g352P9f27801 for perforce@freebsd.org; Thu, 4 Apr 2002 18:25:09 -0800 (PST) (envelope-from tmm@freebsd.org) Date: Thu, 4 Apr 2002 18:25:09 -0800 (PST) Message-Id: <200204050225.g352P9f27801@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 9081 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9081 Change 9081 by tmm@tmm_sparc64 on 2002/04/04 18:24:18 Add missing include. Affected files ... ... //depot/projects/sparc64/sys/sparc64/sparc64/mp_machdep.c#12 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/sparc64/mp_machdep.c#12 (text+ko) ==== @@ -81,6 +81,7 @@ #include #include #include +#include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 19:31:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00E3337B41E; Thu, 4 Apr 2002 19:31:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0BCD337B420 for ; Thu, 4 Apr 2002 19:31:31 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g353VUT40709 for perforce@freebsd.org; Thu, 4 Apr 2002 19:31:30 -0800 (PST) (envelope-from jake@freebsd.org) Date: Thu, 4 Apr 2002 19:31:30 -0800 (PST) Message-Id: <200204050331.g353VUT40709@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9085 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9085 Change 9085 by jake@jake_sparc64 on 2002/04/04 19:30:33 Add a file with the register definitions. Affected files ... ... //depot/projects/sparc64/sys/dev/se/sereg.h#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 4 20:48:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1121D37B417; Thu, 4 Apr 2002 20:48:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4F40237B41A for ; Thu, 4 Apr 2002 20:48:04 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g354m4a56241 for perforce@freebsd.org; Thu, 4 Apr 2002 20:48:04 -0800 (PST) (envelope-from jake@freebsd.org) Date: Thu, 4 Apr 2002 20:48:04 -0800 (PST) Message-Id: <200204050448.g354m4a56241@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9088 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9088 Change 9088 by jake@jake_sparc64 on 2002/04/04 20:47:03 Add definitions for register bits. Affected files ... ... //depot/projects/sparc64/sys/dev/se/sereg.h#2 edit Differences ... ==== //depot/projects/sparc64/sys/dev/se/sereg.h#2 (text+ko) ==== @@ -34,11 +34,49 @@ #define SE_RFIFO 0x0 /* receive fifo */ #define SE_XFIFO 0x0 /* transmit fifo */ + #define SE_STAR 0x20 /* status register */ +#define STAR_WFA 0x1 /* wait for acknowledgement */ +#define STAR_CTS 0x2 /* clear to send state */ +#define STAR_CEC 0x4 /* command executing */ +#define STAR_RLI 0x8 /* receive line inactive */ +#define STAR_RRNR 0x10 /* receive receiver not ready */ +#define STAR_XRNR 0x20 /* transmit receiver not ready */ +#define STAR_XFW 0x40 /* transmit fifo write enable */ +#define STAR_XDOV 0x80 /* transmit data overflow */ + #define SE_CMDR 0x20 /* command register */ +#define CMDR_XRES 0x1 /* transmitter reset */ +#define CMDR_XME 0x2 /* transmit message end */ +#define CMDR_XIF 0x4 /* transmit I-frame */ +#define CMDR_XTF 0x8 /* transmit transparent frame */ +#define CMDR_STI 0x10 /* start timer */ +#define CMDR_XREP 0x20 /* transmission repeat */ +#define CMDR_RHR 0x40 /* reset HDLC receiver */ +#define CMDR_RMC 0x80 /* receive message complete */ + #define SE_RSTA 0x21 /* receive status */ +#define RSTA_LA 0x1 /* low byte address compare */ +#define RSTA_CR 0x2 /* command/response */ +#define RSTA_HA0 0x4 /* high byte address compare 0 */ +#define RSTA_HA1 0x8 /* high byte address compare 1 */ +#define RSTA_RAB 0x10 /* receive message aborted */ +#define RSTA_CRC 0x20 /* CRC compare/check */ +#define RSTA_RDO 0x40 /* receive data overflow */ +#define RSTA_VFR 0x80 /* valid frame */ + #define SE_PRE 0x21 /* preamble register */ + #define SE_MODE 0x22 /* mode register */ +#define MODE_TLP 0x1 /* test loop */ +#define MODE_TRS 0x2 /* timer resolution */ +#define MODE_RTS 0x4 /* request to send */ +#define MODE_RAC 0x8 /* receiver active */ +#define MODE_TMD 0x10 /* timer mode */ +#define MODE_ADM 0x20 /* address mode */ +#define MODE_MDS0 0x40 /* mode select 0 */ +#define MODE_MDS1 0x80 /* mode select 1 */ + #define SE_TIMR 0x23 /* timer register */ #define SE_XAD1 0x24 /* transmit address 1 */ #define SE_XAD2 0x25 /* transmit address 2 */ @@ -51,30 +89,129 @@ #define SE_XBCL 0x2a /* transmit byte count low */ #define SE_RBCH 0x2b /* receive byte count high */ #define SE_XBCH 0x2b /* transmit byte count high */ + #define SE_CCR0 0x2c /* channel configuration register 0 */ +#define CCR0_SM0 0x1 /* serial mode 0 */ +#define CCR0_SM1 0x2 /* serial mode 1 */ +#define CCR0_SC0 0x4 /* serial configuration 0 */ +#define CCR0_SC1 0x8 /* serial configuration 1 */ +#define CCR0_SC2 0x10 /* serial configuration 2 */ +#define CCR0_UNUSED0 0x20 /* unused */ +#define CCR0_MSE 0x40 /* master clock enable */ +#define CCR0_PU 0x80 /* power up */ + #define SE_CCR1 0x2d /* channel configuration register 1 */ +#define CCR1_CM0 0x1 /* clock mode 0 */ +#define CCR1_CM1 0x2 /* clock mode 1 */ +#define CCR1_CM2 0x4 /* clock mode 2 */ +#define CCR1_ITF 0x8 /* interframe time fill */ +#define CCR1_ODS 0x10 /* output driver select */ +#define CCR1_GLP 0x20 /* go on loop */ +#define CCR1_GALP 0x40 /* go active on loop */ +#define CCR1_SFLG 0x80 /* enable shared flags */ + #define SE_CCR2 0x2e /* channel configuration register 2 */ +#define CCR2_DIV 0x1 /* data inversion */ +#define CCR2_C32 0x2 /* enable CRC-32 */ +#define CCR2_RWX 0x4 /* read/write exchange */ +#define CCR2_TOE 0x8 /* TxCLK ouput enable */ +#define CCR2_SSEL 0x10 /* clock source select */ +#define CCR2_BDF 0x20 /* baud rate division factor */ +#define CCR2_BR8 0x40 /* baud rate 8 */ +#define CCR2_BR9 0x80 /* baud rate 9 */ +#define CCR2_RCS0 0x10 /* receive clock shift 0 (5) */ +#define CCR2_XCS0 0x20 /* transmit clock shift 0 (5) */ +#define CCR2_SOC0 0x40 /* special output control 0 (0a, 1, 4, 5) */ +#define CCR2_SOC1 0x80 /* special output control 1 (0a, 1, 4, 5) */ + #define SE_CCR3 0x2f /* channel configuration register 3 */ +#define CCR3_PSD 0x1 /* DPLL phase shift disable */ +#define CCR3_XCRC 0x2 /* transmit CRC on/off */ +#define CCR3_RCRC 0x4 /* receive CRC on/off */ +#define CCR3_CRL 0x8 /* CRC reset level */ +#define CCR3_RADD 0x10 /* receive address pushed to rfifo */ +#define CCR3_EPT 0x20 /* enable preamble transmission */ +#define CCR3_PRE0 0x40 /* number of preamble repetition 0 */ +#define CCR3_PRE1 0x80 /* number of preamble repetition 1 */ + #define SE_TSAX 0x30 /* transmit timeslot assignment register */ #define SE_TSAR 0x31 /* receive timeslot assignment register */ #define SE_XCCR 0x32 /* transmit channel capacity register */ -#define SE_RCCR 0x33 /* transmit channel capacity register */ +#define SE_RCCR 0x33 /* receive channel capacity register */ + #define SE_VSTR 0x34 /* version status register */ +#define VSTR_VN0 0x1 /* version number 0 */ +#define VSTR_VN1 0x2 /* version number 1 */ +#define VSTR_VN2 0x4 /* version number 2 */ +#define VSTR_VN3 0x8 /* version number 3 */ +#define VSTR_UNUSED0 0x10 /* unused */ +#define VSTR_UNUSED1 0x20 /* unused */ +#define VSTR_DPLA 0x40 /* DPLL asynchronous */ +#define VSTR_CD 0x80 /* carrier detect */ + #define SE_BGR 0x34 /* baud rate generator register */ #define SE_RLCR 0x35 /* receive frame length check */ #define SE_AML 0x36 /* address mask low */ #define SE_AMH 0x37 /* address mask high */ + #define SE_GIS 0x38 /* global interrupt status */ +#define GIS_ISB0 0x1 /* interrupt status channel B 0 */ +#define GIS_ISB1 0x2 /* interrupt status channel B 1 */ +#define GIS_ISA0 0x4 /* interrupt status channel A 0 */ +#define GIS_ISA1 0x8 /* interrupt status channel A 1 */ +#define GIS_UNUSED0 0x10 /* unused */ +#define GIS_UNUSED1 0x20 /* unused */ +#define GIS_UNUSED2 0x40 /* unused */ +#define GIS_PI 0x80 /* univerisal port interrupt */ + #define SE_IVA 0x38 /* interrupt vector address */ + #define SE_IPC 0x39 /* interrupt port configuration */ +#define IPC_IC0 0x1 /* interrupt configuration 0 */ +#define IPC_IC1 0x2 /* interrupt configuration 1 */ +#define IPC_CASM 0x4 /* cascading mode */ +#define IPC_SLA0 0x8 /* slave address 0 */ +#define IPC_SLA1 0x10 /* slave address 1 */ +#define IPC_UNUSED0 0x20 /* unused */ +#define IPC_UNUSED1 0x40 /* unused */ +#define IPC_VIS 0x80 /* masked interrupts visible */ + #define SE_ISR0 0x3a /* interrupt status 0 */ +#define ISR0_RPF 0x1 /* receive pool full */ +#define ISR0_RFO 0x2 /* receive frame overflow */ +#define ISR0_CDSC 0x4 /* carrier detect status change */ +#define ISR0_PLLA 0x8 /* DPLL asynchronous */ +#define ISR0_PCE 0x10 /* protocol error */ +#define ISR0_RSC 0x20 /* receive status change */ +#define ISR0_RFS 0x40 /* receive frame start */ +#define ISR0_RME 0x80 /* receive frame end */ + #define SE_IMR0 0x3a /* interrupt mask 0 */ + #define SE_ISR1 0x3b /* interrupt status 1 */ +#define ISR1_XPR 0x1 /* transmit pool ready */ +#define ISR1_XMR 0x2 /* transmit message repeat */ +#define ISR1_CSC 0x4 /* clear to send status change */ +#define ISR1_TIN 0x8 /* timer interrupt */ +#define ISR1_XDU 0x10 /* transmit data underrun */ +#define ISR1_AOLP 0x20 /* active on loop */ +#define ISR1_OLP 0x40 /* on loop */ +#define ISR1_EOP 0x80 /* end of poll sequence detected */ + #define SE_IMR1 0x3b /* interrupt mask 1 */ #define SE_PVR 0x3c /* port value register */ #define SE_PIS 0x3d /* port interrupt status */ #define SE_PIM 0x3d /* port interrupt mask */ #define SE_PCR 0x3e /* port configuration register */ + #define SE_CCR4 0x3f /* channel configuration register 4 */ +#define CCR4_RFT0 0x1 /* rfifo threshold level 0 */ +#define CCR4_RFT1 0x2 /* rfifo threshold level 1 */ +#define CCR4_UNUSED0 0x4 /* unused */ +#define CCR4_UNUSED1 0x8 /* unused */ +#define CCR4_ICD 0x10 /* invert polarity of carrier detect signal */ +#define CCR4_TST1 0x20 /* test pin */ +#define CCR4_EBRG 0x40 /* enhanced baud rate generator mode */ +#define CCR4_MCK4 0x80 /* master clock divide by 4 */ #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 8:17:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B14F37B41E; Fri, 5 Apr 2002 08:15:44 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C510E37B420 for ; Fri, 5 Apr 2002 08:15:39 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g35GFS025877 for perforce@freebsd.org; Fri, 5 Apr 2002 08:15:28 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 5 Apr 2002 08:15:28 -0800 (PST) Message-Id: <200204051615.g35GFS025877@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9101 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9101 Change 9101 by jhb@jhb_laptop on 2002/04/05 08:15:23 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#38 integrate ... //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#10 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#13 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#8 integrate ... //depot/projects/smpng/sys/conf/files#32 integrate ... //depot/projects/smpng/sys/conf/files.sparc64#14 integrate ... //depot/projects/smpng/sys/conf/options#18 integrate ... //depot/projects/smpng/sys/dev/ata/ata-all.c#17 integrate ... //depot/projects/smpng/sys/dev/ata/ata-all.h#8 integrate ... //depot/projects/smpng/sys/dev/ata/ata-disk.c#16 integrate ... //depot/projects/smpng/sys/dev/ata/ata-disk.h#8 integrate ... //depot/projects/smpng/sys/dev/ata/ata-dma.c#17 integrate ... //depot/projects/smpng/sys/dev/ata/ata-isa.c#4 integrate ... //depot/projects/smpng/sys/dev/ata/ata-pci.c#17 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-all.c#11 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-all.h#6 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#21 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-cd.h#6 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-fd.c#7 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-tape.c#10 integrate ... //depot/projects/smpng/sys/dev/isp/isp.c#17 integrate ... //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#12 integrate ... //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#10 integrate ... //depot/projects/smpng/sys/dev/isp/isp_inline.h#5 integrate ... //depot/projects/smpng/sys/dev/isp/isp_pci.c#11 integrate ... //depot/projects/smpng/sys/dev/isp/ispmbox.h#9 integrate ... //depot/projects/smpng/sys/dev/isp/ispvar.h#13 integrate ... //depot/projects/smpng/sys/dev/mk48txx/mk48txx.c#1 branch ... //depot/projects/smpng/sys/dev/mk48txx/mk48txxreg.h#1 branch ... //depot/projects/smpng/sys/dev/wi/if_wi.c#30 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#3 integrate ... //depot/projects/smpng/sys/dev/wi/if_wireg.h#11 integrate ... //depot/projects/smpng/sys/dev/wi/if_wivar.h#3 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#13 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate ... //depot/projects/smpng/sys/i386/i386/trap.c#36 integrate ... //depot/projects/smpng/sys/i386/linux/linux.h#5 integrate ... //depot/projects/smpng/sys/kern/clock_if.m#1 branch ... //depot/projects/smpng/sys/kern/kern_exec.c#32 integrate ... //depot/projects/smpng/sys/kern/subr_clock.c#1 branch ... //depot/projects/smpng/sys/kern/subr_smp.c#12 integrate ... //depot/projects/smpng/sys/sparc64/include/eeprom.h#1 branch ... //depot/projects/smpng/sys/sparc64/sparc64/clock.c#5 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/eeprom.c#1 branch ... //depot/projects/smpng/sys/sparc64/sparc64/eeprom_ebus.c#1 branch ... //depot/projects/smpng/sys/sparc64/sparc64/eeprom_sbus.c#1 branch ... //depot/projects/smpng/sys/sys/ata.h#9 integrate ... //depot/projects/smpng/sys/sys/cdio.h#3 integrate ... //depot/projects/smpng/sys/sys/clock.h#1 branch ... //depot/projects/smpng/sys/sys/pcpu.h#7 integrate ... //depot/projects/smpng/sys/vm/vm_extern.h#10 integrate ... //depot/projects/smpng/sys/vm/vm_meter.c#6 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#38 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.173 2002/04/04 21:03:13 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.174 2002/04/05 00:52:15 alc Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1204,21 +1204,6 @@ sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); PROC_UNLOCK(p); - (void)grow_stack(p, (u_long)sip); - if (!useracc((caddr_t)sip, fsize, VM_PROT_WRITE)) { - /* - * Process has trashed its stack; give it an illegal - * instruction to halt it in its tracks. - */ - PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); - return; - } - /* * Build the signal context to be used by sigreturn. */ @@ -1255,7 +1240,19 @@ /* * copy the frame out to userland. */ - (void) copyout((caddr_t)&ksi, (caddr_t)sip, fsize); + if (copyout((caddr_t)&ksi, (caddr_t)sip, fsize) != 0) { + /* + * Process has trashed its stack; give it an illegal + * instruction to halt it in its tracks. + */ + PROC_LOCK(p); + SIGACTION(p, SIGILL) = SIG_DFL; + SIGDELSET(p->p_sigignore, SIGILL); + SIGDELSET(p->p_sigcatch, SIGILL); + SIGDELSET(p->p_sigmask, SIGILL); + psignal(p, SIGILL); + return; + } /* * Set up the registers to return to sigcode. @@ -1338,31 +1335,11 @@ sfp = (struct sigframe *)(alpha_pal_rdusp() - rndfsize); PROC_UNLOCK(p); - (void)grow_stack(p, (u_long)sfp); #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) printf("sendsig(%d): sig %d ssp %p usp %p\n", p->p_pid, sig, &sf, sfp); #endif - if (!useracc((caddr_t)sfp, sizeof(sf), VM_PROT_WRITE)) { -#ifdef DEBUG - if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) - printf("sendsig(%d): useracc failed on sig %d\n", - p->p_pid, sig); -#endif - /* - * Process has trashed its stack; give it an illegal - * instruction to halt it in its tracks. - */ - PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); - return; - } - /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDP_FPUSED; @@ -1380,7 +1357,24 @@ /* * copy the frame out to userland. */ - (void) copyout((caddr_t)&sf, (caddr_t)sfp, sizeof(sf)); + if (copyout((caddr_t)&sf, (caddr_t)sfp, sizeof(sf)) != 0) { +#ifdef DEBUG + if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) + printf("sendsig(%d): copyout failed on sig %d\n", + p->p_pid, sig); +#endif + /* + * Process has trashed its stack; give it an illegal + * instruction to halt it in its tracks. + */ + PROC_LOCK(p); + SIGACTION(p, SIGILL) = SIG_DFL; + SIGDELSET(p->p_sigignore, SIGILL); + SIGDELSET(p->p_sigcatch, SIGILL); + SIGDELSET(p->p_sigmask, SIGILL); + psignal(p, SIGILL); + return; + } #ifdef DEBUG if (sigdebug & SDB_FOLLOW) printf("sendsig(%d): sig %d sfp %p code %lx\n", p->p_pid, sig, ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.65 2002/03/20 18:58:44 obrien Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.66 2002/04/05 00:52:15 alc Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -352,21 +352,6 @@ prom_halt(0); } -int -grow_stack(p, sp) - struct proc *p; - size_t sp; -{ - int rv; - - rv = vm_map_growstack (p, sp); - if (rv != KERN_SUCCESS) - return (0); - - return (1); -} - - /* * Software interrupt handler for queued VM system processing. */ ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#13 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.28 2002/04/01 21:30:29 jhb Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.29 2002/04/05 00:08:38 eric Exp $ */ @@ -1039,10 +1039,10 @@ * setuid() won't work. * * Instead, by P1003.1b-1993, setuid() is supposed to work like: - * If the process has appropriate [super-user] priviledges, the + * If the process has appropriate [super-user] privileges, the * setuid() function sets the real user ID, effective user * ID, and the saved set-user-ID to uid. - * If the process does not have appropriate priviledges, but uid + * If the process does not have appropriate privileges, but uid * is equal to the real user ID or the saved set-user-ID, the * setuid() function sets the effective user ID to uid; the * real user ID and saved set-user-ID remain unchanged by ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#8 (text+ko) ==== @@ -30,7 +30,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/alpha/osf1/osf1_signal.c,v 1.16 2002/04/04 17:49:44 bde Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.17 2002/04/05 00:52:15 alc Exp $ */ #include @@ -616,21 +616,6 @@ sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); PROC_UNLOCK(p); - (void)grow_stack(p, (u_long)sip); - if (useracc((caddr_t)sip, fsize, VM_PROT_WRITE) == 0) { - /* - * Process has trashed its stack; give it an illegal - * instruction to halt it in its tracks. - */ - PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); - return; - } - /* * Build the signal context to be used by sigreturn. */ @@ -667,7 +652,19 @@ /* * copy the frame out to userland. */ - (void) copyout((caddr_t)&ksi, (caddr_t)sip, fsize); + if (copyout((caddr_t)&ksi, (caddr_t)sip, fsize) != 0) { + /* + * Process has trashed its stack; give it an illegal + * instruction to halt it in its tracks. + */ + PROC_LOCK(p); + SIGACTION(p, SIGILL) = SIG_DFL; + SIGDELSET(p->p_sigignore, SIGILL); + SIGDELSET(p->p_sigcatch, SIGILL); + SIGDELSET(p->p_sigmask, SIGILL); + psignal(p, SIGILL); + return; + } /* * Set up the registers to return to sigcode. ==== //depot/projects/smpng/sys/conf/files#32 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.618 2002/04/02 02:50:48 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.620 2002/04/04 23:44:33 tmm Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -16,6 +16,7 @@ dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" kern/device_if.m standard kern/bus_if.m standard +kern/clock_if.m optional genclock kern/linker_if.m standard cam/cam.c optional scbus cam/cam_extend.c optional scbus @@ -419,6 +420,7 @@ dev/mii/qsphy.c optional miibus dev/mii/acphy.c optional miibus dev/mii/miibus_if.m optional miibus +dev/mk48txx/mk48txx.c optional mk48txx dev/mlx/mlx.c optional mlx dev/mlx/mlx_disk.c optional mlx dev/mlx/mlx_pci.c optional mlx @@ -838,6 +840,7 @@ kern/subr_autoconf.c standard kern/subr_blist.c standard kern/subr_bus.c standard +kern/subr_clock.c optional genclock kern/subr_devstat.c standard kern/subr_disk.c standard kern/subr_disklabel.c standard ==== //depot/projects/smpng/sys/conf/files.sparc64#14 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.16 2002/03/27 05:39:18 dillon Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.18 2002/04/05 02:42:25 tmm Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -17,8 +17,8 @@ kern/syscalls.c optional ktr sparc64/ebus/ebus.c count ebus sparc64/isa/isa.c optional isa -# The following is needed for both ISA and EBus. -sparc64/isa/ofw_isa.c standard +sparc64/isa/ofw_isa.c optional ebus +sparc64/isa/ofw_isa.c optional isa sparc64/pci/apb.c optional apb sparc64/pci/ofw_pci.c optional pci sparc64/pci/psycho.c optional pci @@ -38,6 +38,9 @@ # Otherwise it's they're normal. # sparc64/sparc64/locore.s standard # sparc64/sparc64/exception.s standard +sparc64/sparc64/eeprom.c optional eeprom +sparc64/sparc64/eeprom_ebus.c optional eeprom ebus +sparc64/sparc64/eeprom_sbus.c optional eeprom sbus sparc64/sparc64/emul.c standard sparc64/sparc64/fp.c standard sparc64/sparc64/identcpu.c standard ==== //depot/projects/smpng/sys/conf/options#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.309 2002/04/03 10:56:53 ru Exp $ +# $FreeBSD: src/sys/conf/options,v 1.310 2002/04/04 23:54:58 mjacob Exp $ # # On the handling of kernel options # @@ -231,8 +231,9 @@ SCSI_NCR_MAX_WIDE opt_ncr.h SCSI_NCR_MYADDR opt_ncr.h -# Options used only in pci/isp_pci.c +# Options used only in dev/isp/* ISP_TARGET_MODE opt_isp.h +ISP_FW_CRASH_DUMP opt_isp.h # Options used in the 'ata' ATA/ATAPI driver ACD_DEBUG opt_ata.h ==== //depot/projects/smpng/sys/dev/ata/ata-all.c#17 (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. * - * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.144 2002/04/02 13:47:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.146 2002/04/05 15:58:45 sos Exp $ */ #include "opt_ata.h" @@ -249,6 +249,7 @@ ch->device[MASTER].mode = ATA_PIO; ch->device[SLAVE].mode = ATA_PIO; ch->devices = 0; + ata_dmafreetags(ch); bus_teardown_intr(dev, ch->r_irq, ch->ih); bus_release_resource(dev, SYS_RES_IRQ, ATA_IRQ_RID, ch->r_irq); @@ -383,8 +384,10 @@ id1 = ata_drawersensor(atadev, 0, 0x4f, 0); ata_drawersensor(atadev, 1, 0x4e, 0x80); id2 = ata_drawersensor(atadev, 0, 0x4f, 0); - if (id1 != 0xa3 || id2 != 0x5c) + if (id1 != 0xa3 || id2 != 0x5c) { + ATA_UNLOCK_CH(ch); return ENXIO; + } div = 1 << (((ata_drawersensor(atadev, 0, 0x5d, 0)&0x20)>>3) + ((ata_drawersensor(atadev, 0, 0x47, 0)&0x30)>>4) + 1); @@ -1251,7 +1254,7 @@ } ATA_SLEEPLOCK_CH(atadev->channel, ATA_ACTIVE); - ata_dmainit(atadev->channel, atadev->unit, pmode, wmode, umode); + ata_dmainit(atadev, pmode, wmode, umode); ATA_UNLOCK_CH(atadev->channel); ata_start(atadev->channel); /* XXX SOS */ } ==== //depot/projects/smpng/sys/dev/ata/ata-all.h#8 (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. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.51 2002/03/11 21:04:32 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.52 2002/04/05 13:13:55 sos Exp $ */ /* ATA register defines */ @@ -158,6 +158,18 @@ u_int32_t count; }; +struct ata_dmastate { + bus_dma_tag_t ddmatag; /* data DMA tag */ + bus_dmamap_t ddmamap; /* data DMA map */ + bus_dma_tag_t cdmatag; /* control DMA tag */ + bus_dmamap_t cdmamap; /* control DMA map */ + struct ata_dmaentry *dmatab; /* DMA transfer table */ + bus_addr_t mdmatab; /* bus address of dmatab */ + int flags; /* debugging */ +#define ATA_DS_ACTIVE 0x01 /* debugging */ +#define ATA_DS_READ 0x02 /* transaction is a read */ +}; + /* structure describing an ATA/ATAPI device */ struct ata_device { struct ata_channel *channel; @@ -176,6 +188,7 @@ int mode; /* transfermode */ int cmd; /* last cmd executed */ void *result; /* misc data */ + struct ata_dmastate dmastate; /* dma state */ }; /* structure describing an ATA channel */ @@ -185,6 +198,7 @@ struct resource *r_io; /* io addr resource handle */ struct resource *r_altio; /* altio addr resource handle */ struct resource *r_bmio; /* bmio addr resource handle */ + bus_dma_tag_t dmatag; /* parent dma tag */ struct resource *r_irq; /* interrupt of this channel */ void *ih; /* interrupt handle */ int (*intr_func)(struct ata_channel *); /* interrupt function */ @@ -259,12 +273,14 @@ int ata_umode(struct ata_params *); int ata_find_dev(device_t, u_int32_t, u_int32_t); -void *ata_dmaalloc(struct ata_channel *, int); -void ata_dmainit(struct ata_channel *, int, int, int, int); -int ata_dmasetup(struct ata_channel *, int, struct ata_dmaentry *, caddr_t, int); -void ata_dmastart(struct ata_channel *, int, struct ata_dmaentry *, int); +int ata_dmaalloc(struct ata_device *); +void ata_dmafree(struct ata_device *); +void ata_dmafreetags(struct ata_channel *); +void ata_dmainit(struct ata_device *, int, int, int); +int ata_dmasetup(struct ata_device *, caddr_t, int32_t); +void ata_dmastart(struct ata_device *, int); int ata_dmastatus(struct ata_channel *); -int ata_dmadone(struct ata_channel *); +int ata_dmadone(struct ata_device *); /* macros for locking a channel */ #define ATA_LOCK_CH(ch, value)\ @@ -294,10 +310,18 @@ bus_space_read_multi_2(rman_get_bustag((res)), \ rman_get_bushandle((res)), \ (offset), (addr), (count)) +#define ATA_INSW_STRM(res, offset, addr, count) \ + bus_space_read_multi_stream_2(rman_get_bustag((res)), \ + rman_get_bushandle((res)), \ + (offset), (addr), (count)) #define ATA_INSL(res, offset, addr, count) \ bus_space_read_multi_4(rman_get_bustag((res)), \ rman_get_bushandle((res)), \ (offset), (addr), (count)) +#define ATA_INSL_STRM(res, offset, addr, count) \ + bus_space_read_multi_stream_4(rman_get_bustag((res)), \ + rman_get_bushandle((res)), \ + (offset), (addr), (count)) #define ATA_OUTB(res, offset, value) \ bus_space_write_1(rman_get_bustag((res)), \ rman_get_bushandle((res)), (offset), (value)) @@ -311,7 +335,15 @@ bus_space_write_multi_2(rman_get_bustag((res)), \ rman_get_bushandle((res)), \ (offset), (addr), (count)) +#define ATA_OUTSW_STRM(res, offset, addr, count) \ + bus_space_write_multi_stream_2(rman_get_bustag((res)), \ + rman_get_bushandle((res)), \ + (offset), (addr), (count)) #define ATA_OUTSL(res, offset, addr, count) \ bus_space_write_multi_4(rman_get_bustag((res)), \ rman_get_bushandle((res)), \ (offset), (addr), (count)) +#define ATA_OUTSL_STRM(res, offset, addr, count) \ + bus_space_write_multi_stream_4(rman_get_bustag((res)), \ + rman_get_bushandle((res)), \ + (offset), (addr), (count)) ==== //depot/projects/smpng/sys/dev/ata/ata-disk.c#16 (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. * - * $FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.129 2002/03/31 22:36:35 phk Exp $ + * $FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.130 2002/04/05 13:13:55 sos Exp $ */ #include "opt_ata.h" @@ -106,6 +106,8 @@ { struct ad_softc *adp; dev_t dev; + u_int32_t lbasize; + u_int64_t lbasize48; if (!(adp = malloc(sizeof(struct ad_softc), M_AD, M_NOWAIT | M_ZERO))) { ata_prtdev(atadev, "failed to allocate driver storage\n"); @@ -123,20 +125,26 @@ adp->total_secs = atadev->param->cylinders * adp->heads * adp->sectors; bioq_init(&adp->queue); + lbasize = (u_int32_t)atadev->param->lba_size_lo | + ((u_int32_t)atadev->param->lba_size_hi << 16); + /* does this device need oldstyle CHS addressing */ if (!ad_version(atadev->param->version_major) || - !(atadev->param->atavalid & ATA_FLAG_54_58) || !atadev->param->lba_size) + !(atadev->param->atavalid & ATA_FLAG_54_58) || !lbasize) adp->flags |= AD_F_CHS_USED; /* use the 28bit LBA size if valid */ - if (atadev->param->cylinders == 16383 && - adp->total_secs < atadev->param->lba_size) - adp->total_secs = atadev->param->lba_size; + if (atadev->param->cylinders == 16383 && adp->total_secs < lbasize) + adp->total_secs = lbasize; + + lbasize48 = (u_int64_t)atadev->param->lba_size48_1 | + ((u_int64_t)atadev->param->lba_size48_2 << 16) | + ((u_int64_t)atadev->param->lba_size48_3 << 32) | + ((u_int64_t)atadev->param->lba_size48_4 << 48); /* use the 48bit LBA size if valid */ - if (atadev->param->support.address48 && - atadev->param->lba_size48 > 268435455) - adp->total_secs = atadev->param->lba_size48; + if (atadev->param->support.address48 && lbasize48 > 268435455) + adp->total_secs = lbasize48; ATA_SLEEPLOCK_CH(atadev->channel, ATA_CONTROL); /* use multiple sectors/interrupt if device supports it */ @@ -168,11 +176,10 @@ /* use DMA if allowed and if drive/controller supports it */ if (ata_dma) - ata_dmainit(atadev->channel, atadev->unit, ata_pmode(atadev->param), + ata_dmainit(atadev, ata_pmode(atadev->param), ata_wmode(atadev->param), ata_umode(atadev->param)); else - ata_dmainit(atadev->channel, atadev->unit, - ata_pmode(atadev->param), -1, -1); + ata_dmainit(atadev, ata_pmode(atadev->param), -1, -1); /* use tagged queueing if allowed and supported */ if (ata_tags && ad_tagsupported(adp)) { @@ -235,6 +242,7 @@ biofinish(request->bp, NULL, ENXIO); ad_free(request); } + ata_dmafree(atadev); while ((bp = bioq_first(&adp->queue))) { bioq_remove(&adp->queue, bp); biofinish(bp, NULL, ENXIO); @@ -366,7 +374,7 @@ if (bp->bio_cmd == BIO_READ) request->flags |= ADR_F_READ; if (adp->device->mode >= ATA_DMA) { - if (!(request->dmatab = ata_dmaalloc(atadev->channel, atadev->unit))) + if (ata_dmaalloc(atadev)) adp->device->mode = ATA_PIO; } @@ -430,8 +438,7 @@ /* does this drive & transfer work with DMA ? */ request->flags &= ~ADR_F_DMA_USED; if (adp->device->mode >= ATA_DMA && - !ata_dmasetup(adp->device->channel, adp->device->unit, - request->dmatab, request->data, request->bytecount)) { + !ata_dmasetup(adp->device, request->data, request->bytecount)) { request->flags |= ADR_F_DMA_USED; request->currentsize = request->bytecount; @@ -480,8 +487,7 @@ } /* start transfer, return and wait for interrupt */ - ata_dmastart(adp->device->channel, adp->device->unit, - request->dmatab, request->flags & ADR_F_READ); + ata_dmastart(adp->device, request->flags & ADR_F_READ); return ATA_OP_CONTINUES; } @@ -514,13 +520,13 @@ /* output the data */ if (adp->device->channel->flags & ATA_USE_16BIT) - ATA_OUTSW(adp->device->channel->r_io, ATA_DATA, - (void *)((uintptr_t)request->data + request->donecount), - request->currentsize / sizeof(int16_t)); + ATA_OUTSW_STRM(adp->device->channel->r_io, ATA_DATA, + (void *)((uintptr_t)request->data + request->donecount), + request->currentsize / sizeof(int16_t)); else - ATA_OUTSL(adp->device->channel->r_io, ATA_DATA, - (void *)((uintptr_t)request->data + request->donecount), - request->currentsize / sizeof(int32_t)); + ATA_OUTSL_STRM(adp->device->channel->r_io, ATA_DATA, + (void *)((uintptr_t)request->data + request->donecount), + request->currentsize / sizeof(int32_t)); return ATA_OP_CONTINUES; transfer_failed: @@ -551,7 +557,7 @@ /* finish DMA transfer */ if (request->flags & ADR_F_DMA_USED) - dma_stat = ata_dmadone(adp->device->channel); + dma_stat = ata_dmadone(adp->device); /* do we have a corrected soft error ? */ if (adp->device->channel->status & ATA_S_CORR) @@ -578,8 +584,7 @@ if (request->retries++ < AD_MAX_RETRIES) printf(" retrying\n"); else { - ata_dmainit(adp->device->channel, adp->device->unit, - ata_pmode(adp->device->param), -1, -1); + ata_dmainit(adp->device, ata_pmode(adp->device->param), -1, -1); printf(" falling back to PIO mode\n"); } TAILQ_INSERT_HEAD(&adp->device->channel->ata_queue, request, chain); @@ -590,8 +595,7 @@ if (request->flags & ADR_F_DMA_USED) { untimeout((timeout_t *)ad_timeout, request,request->timeout_handle); ad_invalidatequeue(adp, request); - ata_dmainit(adp->device->channel, adp->device->unit, - ata_pmode(adp->device->param), -1, -1); + ata_dmainit(adp->device, ata_pmode(adp->device->param), -1, -1); request->flags |= ADR_F_FORCE_PIO; printf(" trying PIO mode\n"); TAILQ_INSERT_HEAD(&adp->device->channel->ata_queue, request, chain); @@ -623,13 +627,15 @@ else { /* data ready, read in */ if (adp->device->channel->flags & ATA_USE_16BIT) - ATA_INSW(adp->device->channel->r_io, ATA_DATA, - (void*)((uintptr_t)request->data + request->donecount), - request->currentsize / sizeof(int16_t)); + ATA_INSW_STRM(adp->device->channel->r_io, ATA_DATA, + (void*)((uintptr_t)request->data + + request->donecount), request->currentsize / + sizeof(int16_t)); else - ATA_INSL(adp->device->channel->r_io, ATA_DATA, - (void*)((uintptr_t)request->data + request->donecount), - request->currentsize / sizeof(int32_t)); + ATA_INSL_STRM(adp->device->channel->r_io, ATA_DATA, + (void*)((uintptr_t)request->data + + request->donecount), request->currentsize / + sizeof(int32_t)); } } @@ -743,8 +749,7 @@ ad_invalidatequeue(adp, NULL); return ATA_OP_FINISHED; } - ata_dmastart(adp->device->channel, adp->device->unit, - request->dmatab, request->flags & ADR_F_READ); + ata_dmastart(adp->device, request->flags & ADR_F_READ); return ATA_OP_CONTINUES; } return ATA_OP_FINISHED; @@ -753,8 +758,6 @@ static void ad_free(struct ad_request *request) { - if (request->dmatab) - free(request->dmatab, M_DEVBUF); request->softc->tags[request->tag] = NULL; free(request, M_AD); } @@ -829,11 +832,10 @@ request->tag, request->serv); if (request->flags & ADR_F_DMA_USED) { - ata_dmadone(adp->device->channel); + ata_dmadone(adp->device); ad_invalidatequeue(adp, request); if (request->retries == AD_MAX_RETRIES) { - ata_dmainit(adp->device->channel, adp->device->unit, - ata_pmode(adp->device->param), -1, -1); + ata_dmainit(adp->device, ata_pmode(adp->device->param), -1, -1); ata_prtdev(adp->device, "trying fallback to PIO mode\n"); request->retries = 0; } @@ -863,13 +865,11 @@ ata_command(atadev, ATA_C_SET_MULTI, 0, adp->transfersize / DEV_BSIZE, 0, ATA_WAIT_READY); if (adp->device->mode >= ATA_DMA) - ata_dmainit(atadev->channel, atadev->unit, - ata_pmode(adp->device->param), + ata_dmainit(atadev, ata_pmode(adp->device->param), ata_wmode(adp->device->param), ata_umode(adp->device->param)); else - ata_dmainit(atadev->channel, atadev->unit, - ata_pmode(adp->device->param), -1, -1); + ata_dmainit(atadev, ata_pmode(adp->device->param), -1, -1); } void ==== //depot/projects/smpng/sys/dev/ata/ata-disk.h#8 (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. * - * $FreeBSD: src/sys/dev/ata/ata-disk.h,v 1.40 2002/03/03 15:36:20 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-disk.h,v 1.41 2002/04/05 13:13:55 sos Exp $ */ /* structure describing an ATA disk request */ @@ -48,7 +48,6 @@ struct bio *bp; /* associated bio ptr */ u_int8_t tag; /* tag ID of this request */ int serv; /* request had service */ - struct ata_dmaentry *dmatab; /* DMA transfer table */ TAILQ_ENTRY(ad_request) chain; /* list management */ }; ==== //depot/projects/smpng/sys/dev/ata/ata-dma.c#17 (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. * - * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.92 2002/04/02 16:45:06 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.93 2002/04/05 13:13:55 sos Exp $ */ #include @@ -36,80 +36,184 @@ #include #include #include -#include -#include #include #include #include #include /* prototypes */ -static void cyrix_timing(struct ata_channel *, int, int); -static void promise_timing(struct ata_channel *, int, int); -static void hpt_timing(struct ata_channel *, int, int); -static int hpt_cable80(struct ata_channel *); +static void ata_dmacreate(struct ata_device *, int, int); +static void ata_dmasetupd_cb(void *, bus_dma_segment_t *, int, int); +static void ata_dmasetupc_cb(void *, bus_dma_segment_t *, int, int); +static void cyrix_timing(struct ata_device *, int, int); +static void promise_timing(struct ata_device *, int, int); +static void hpt_timing(struct ata_device *, int, int); +static int hpt_cable80(struct ata_device *); /* misc defines */ -#ifdef __alpha__ -#undef vtophys -#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va) -#endif -#define ATAPI_DEVICE(ch, device) \ - ((device == ATA_MASTER && ch->devices & ATA_ATAPI_MASTER) || \ - (device == ATA_SLAVE && ch->devices & ATA_ATAPI_SLAVE)) +#define ATAPI_DEVICE(atadev) \ + ((atadev->unit == ATA_MASTER && \ + atadev->channel->devices & ATA_ATAPI_MASTER) || \ + (atadev->unit == ATA_SLAVE && \ + atadev->channel->devices & ATA_ATAPI_SLAVE)) + +#define MAXSEGSZ PAGE_SIZE +#define MAXTABSZ PAGE_SIZE +#define MAXCTLDMASZ (2 * (MAXTABSZ + MAXPHYS)) + +struct ata_dc_cb_args { + bus_addr_t maddr; + int error; +}; + +static void +ata_dmasetupc_cb(void *xsc, bus_dma_segment_t *segs, int nsegs, int error) +{ + struct ata_dc_cb_args *cba = (struct ata_dc_cb_args *)xsc; + + if (!(cba->error = error)) + cba->maddr = segs[0].ds_addr; +} + +int +ata_dmaalloc(struct ata_device *atadev) +{ + struct ata_channel *ch; + struct ata_dc_cb_args ccba; + struct ata_dmastate *ds; + int error; + + ch = atadev->channel; + ds = &atadev->dmastate; + if (!ds->cdmatag) { + if ((error = bus_dma_tag_create(ch->dmatag, 1, PAGE_SIZE, + BUS_SPACE_MAXADDR_32BIT, + BUS_SPACE_MAXADDR, NULL, NULL, + MAXTABSZ, 1, MAXTABSZ, + BUS_DMA_ALLOCNOW, &ds->cdmatag))) + return error; + } + if (!ds->ddmatag) { + if ((error = bus_dma_tag_create(ch->dmatag, ch->alignment + 1, 0, + BUS_SPACE_MAXADDR_32BIT, + BUS_SPACE_MAXADDR, NULL, NULL, + MAXPHYS, ATA_DMA_ENTRIES, MAXSEGSZ, + BUS_DMA_ALLOCNOW, &ds->ddmatag))) + return error; + } + if (!ds->mdmatab) { + if ((error = bus_dmamem_alloc(ds->cdmatag, (void **)&ds->dmatab, 0, + &ds->cdmamap))) + return error; + + if ((error = bus_dmamap_load(ds->cdmatag, ds->cdmamap, ds->dmatab, + MAXTABSZ, ata_dmasetupc_cb, &ccba, + 0)) != 0 || ccba.error != 0) { + bus_dmamem_free(ds->cdmatag, ds->dmatab, ds->cdmamap); + return error; + } + ds->mdmatab = ccba.maddr; + } + if (!ds->ddmamap) { + if ((error = bus_dmamap_create(ds->ddmatag, 0, &ds->ddmamap)) != 0) + return error; + } + return 0; +} + +void +ata_dmafree(struct ata_device *atadev) +{ + struct ata_dmastate *ds; + + ds = &atadev->dmastate; + if (ds->mdmatab) { + bus_dmamap_unload(ds->cdmatag, ds->cdmamap); + bus_dmamem_free(ds->cdmatag, ds->dmatab, ds->cdmamap); + ds->mdmatab = 0; + ds->cdmamap = NULL; + ds->dmatab = NULL; + } + if (ds->ddmamap) { + bus_dmamap_destroy(ds->ddmatag, ds->ddmamap); + ds->ddmamap = NULL; + } + if (ds->cdmatag) { + bus_dma_tag_destroy(ds->cdmatag); + ds->cdmatag = NULL; + } + if (ds->ddmatag) { + bus_dma_tag_destroy(ds->ddmatag); + ds->ddmatag = NULL; + } +} + +void +ata_dmafreetags(struct ata_channel *ch) +{ + + if (ch->dmatag) { + bus_dma_tag_destroy(ch->dmatag); + ch->dmatag = NULL; + } +} -void * -ata_dmaalloc(struct ata_channel *ch, int device) +static void +ata_dmacreate(struct ata_device *atadev, int apiomode, int mode) { - void *dmatab; - if ((dmatab = malloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT))) { - if (((uintptr_t)dmatab >> PAGE_SHIFT) ^ - (((uintptr_t)dmatab + PAGE_SIZE - 1) >> PAGE_SHIFT)) { - ata_printf(ch, device, "dmatab crosses page boundary, no DMA\n"); - free(dmatab, M_DEVBUF); - dmatab = NULL; + atadev->mode = mode; + if (!atadev->channel->dmatag) { + if (bus_dma_tag_create(NULL, 1, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, + NULL, NULL, MAXCTLDMASZ, ATA_DMA_ENTRIES, + BUS_SPACE_MAXSIZE_32BIT, 0, + &atadev->channel->dmatag)) { + ata_prtdev(atadev, "DMA tag allocation failed, disabling DMA\n"); + ata_dmainit(atadev, apiomode, -1, -1); } } - return dmatab; } void -ata_dmainit(struct ata_channel *ch, int device, - int apiomode, int wdmamode, int udmamode) +ata_dmainit(struct ata_device *atadev, int apiomode, int wdmamode, int udmamode) { - struct ata_device *atadev = &ch->device[ATA_DEV(device)]; - device_t parent = device_get_parent(ch->dev); - int devno = (ch->unit << 1) + ATA_DEV(device); + device_t parent = device_get_parent(atadev->channel->dev); + int chiptype = atadev->channel->chiptype; + int chiprev = pci_get_revid(parent); + int channel = atadev->channel->unit; + int device = ATA_DEV(atadev->unit); + int devno = (channel << 1) + device; int error; /* set our most pessimistic default mode */ atadev->mode = ATA_PIO; - if (!ch->r_bmio) + if (!atadev->channel->r_bmio) return; /* if simplex controller, only allow DMA on primary channel */ - if (ch->unit == 1) { - ATA_OUTB(ch->r_bmio, ATA_BMSTAT_PORT, - ATA_INB(ch->r_bmio, ATA_BMSTAT_PORT) & + if (channel == 1) { + ATA_OUTB(atadev->channel->r_bmio, ATA_BMSTAT_PORT, + ATA_INB(atadev->channel->r_bmio, ATA_BMSTAT_PORT) & (ATA_BMSTAT_DMA_MASTER | ATA_BMSTAT_DMA_SLAVE)); - if (ATA_INB(ch->r_bmio, ATA_BMSTAT_PORT) & ATA_BMSTAT_DMA_SIMPLEX) { + if (ATA_INB(atadev->channel->r_bmio, ATA_BMSTAT_PORT) & + ATA_BMSTAT_DMA_SIMPLEX) { ata_prtdev(atadev, "simplex device, DMA on primary only\n"); return; } } /* DMA engine address alignment is usually 1 word (2 bytes) */ - ch->alignment = 0x1; + atadev->channel->alignment = 0x1; #if 1 - if (udmamode > 2 && !ch->device[ATA_DEV(device)].param->hwres_cblid) { + if (udmamode > 2 && !atadev->param->hwres_cblid) { ata_prtdev(atadev,"DMA limited to UDMA33, non-ATA66 cable or device\n"); udmamode = 2; } #endif - switch (ch->chiptype) { + switch (chiptype) { case 0x248a8086: /* Intel ICH3 mobile */ case 0x248b8086: /* Intel ICH3 */ @@ -133,7 +237,7 @@ (pci_read_config(parent, 0x48, 4) & ~mask48) | new48, 4); pci_write_config(parent, 0x54, word54 | (0x1000<mode = ATA_UDMA5; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 8:18:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 587D237B405; Fri, 5 Apr 2002 08:18:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9AF2C37B416 for ; Fri, 5 Apr 2002 08:18:07 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g35GHWC26203 for perforce@freebsd.org; Fri, 5 Apr 2002 08:17:32 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 5 Apr 2002 08:17:32 -0800 (PST) Message-Id: <200204051617.g35GHWC26203@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9102 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9102 Change 9102 by jhb@jhb_laptop on 2002/04/05 08:16:47 Woot, this stuff is in CVS now. Affected files ... ... //depot/projects/smpng/sys/sparc64/conf/SPARC64#4 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/conf/SPARC64#4 (text+ko) ==== @@ -42,9 +42,9 @@ device ofw_console -#device genclock -#device eeprom -#device "mk48txx" +device genclock +device eeprom +device "mk48txx" device miibus device hme @@ -61,7 +61,7 @@ makeoptions NO_MODULES=true options PCI_ENABLE_IO_MODES -#options ATA_ENABLE_BUSMASTER +options ATA_ENABLE_BUSMASTER options DEBUGGER_ON_POWERFAIL options KTR To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 8:31:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC14637B41B; Fri, 5 Apr 2002 08:31:14 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 285F937B41A for ; Fri, 5 Apr 2002 08:31:13 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g35GV4r30451 for perforce@freebsd.org; Fri, 5 Apr 2002 08:31:04 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 5 Apr 2002 08:31:04 -0800 (PST) Message-Id: <200204051631.g35GV4r30451@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9106 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9106 Change 9106 by jhb@jhb_laptop on 2002/04/05 08:30:53 It's in some parts of CVS but not all of it it seems. Affected files ... ... //depot/projects/smpng/sys/sparc64/conf/SPARC64#5 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/conf/SPARC64#5 (text+ko) ==== @@ -61,7 +61,7 @@ makeoptions NO_MODULES=true options PCI_ENABLE_IO_MODES -options ATA_ENABLE_BUSMASTER +#options ATA_ENABLE_BUSMASTER options DEBUGGER_ON_POWERFAIL options KTR To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 12: 5:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 921F837B404; Fri, 5 Apr 2002 12:05:54 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D8DDD37B41C for ; Fri, 5 Apr 2002 12:05:52 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g35K5q277574 for perforce@freebsd.org; Fri, 5 Apr 2002 12:05:52 -0800 (PST) (envelope-from green@freebsd.org) Date: Fri, 5 Apr 2002 12:05:52 -0800 (PST) Message-Id: <200204052005.g35K5q277574@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 9124 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9124 Change 9124 by green@green_laptop_2 on 2002/04/05 12:05:24 Make sure the security/mac_bsdextended headers get installed. Affected files ... ... //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#5 edit ... //depot/projects/trustedbsd/mac/include/Makefile#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#5 (text+ko) ==== @@ -110,6 +110,8 @@ rpcsvc .. security + mac_bsdextended + .. .. sys .. ==== //depot/projects/trustedbsd/mac/include/Makefile#7 (text+ko) ==== @@ -43,12 +43,12 @@ netipx netkey netnatm netncp netns netsmb nfs nfsclient nfsserver \ pccard posix4 sys vm -LNOHEADERDIRS= fs isofs ufs dev +LNOHEADERDIRS= fs isofs ufs dev security LSUBDIRS= cam/scsi dev/ic dev/ppbus dev/usb dev/wi dev/an fs/devfs \ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ - ufs/ffs ufs/ufs + security/mac_bsdextended ufs/ffs ufs/ufs # For SHARED=symlinks, cam is a symlink, so cam/scsi is taken care of LSYMSUBDIRS= ${LSUBDIRS:Ncam/scsi} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 12:24:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BB7237B41E; Fri, 5 Apr 2002 12:22:36 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3AC8737B404 for ; Fri, 5 Apr 2002 12:22:29 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g35KMC679837 for perforce@freebsd.org; Fri, 5 Apr 2002 12:22:12 -0800 (PST) (envelope-from jake@freebsd.org) Date: Fri, 5 Apr 2002 12:22:12 -0800 (PST) Message-Id: <200204052022.g35KMC679837@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9126 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9126 Change 9126 by jake@jake_sparc64 on 2002/04/05 12:21:37 Integ@9116 Affected files ... ... //depot/projects/sparc64/Makefile.inc1#5 integrate ... //depot/projects/sparc64/UPDATING#3 integrate ... //depot/projects/sparc64/bin/dd/dd.1#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/FREEBSD-upgrade#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/Makefile.conf#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/README#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/RELNOTES#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/client/clparse.c#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/client/dhclient.c#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/client/dhclient.conf.5#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/common/conflex.c#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/common/dns.c#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/common/options.c#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/common/print.c#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/common/tables.c#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/configure#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/includes/dhcpd.h#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/includes/dhctoken.h#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/includes/minires/minires.h#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/includes/site.h#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/includes/version.h#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/minires/ns_parse.c#2 integrate ... //depot/projects/sparc64/contrib/isc-dhcp/minires/ns_verify.c#2 integrate ... //depot/projects/sparc64/contrib/openpam/HISTORY#4 integrate ... //depot/projects/sparc64/contrib/openpam/INSTALL#4 integrate ... //depot/projects/sparc64/contrib/openpam/LICENSE#4 integrate ... //depot/projects/sparc64/contrib/openpam/MANIFEST#4 integrate ... //depot/projects/sparc64/contrib/openpam/Makefile#4 integrate ... //depot/projects/sparc64/contrib/openpam/README#4 integrate ... //depot/projects/sparc64/contrib/openpam/RELNOTES#4 integrate ... //depot/projects/sparc64/contrib/openpam/bin/Makefile#4 integrate ... //depot/projects/sparc64/contrib/openpam/bin/su/Makefile#4 integrate ... //depot/projects/sparc64/contrib/openpam/bin/su/su.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/Makefile#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setenv.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_strerror.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_verror.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vinfo.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vprompt.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#4 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_appl.h#4 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_constants.h#4 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_modules.h#4 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_types.h#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/Makefile#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_dispatch.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_dynamic.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_findenv.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_get_option.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_impl.h#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_load.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_log.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_set_option.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_static.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_ttyconv.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_acct_mgmt.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate_secondary.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_chauthtok.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_close_session.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_end.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_error.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_data.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_item.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_mapped_authtok.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_mapped_username.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_user.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_getenv.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_getenvlist.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_info.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_open_session.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_prompt.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_putenv.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_data.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_item.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_mapped_authtok.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_mapped_username.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_setcred.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_setenv.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_acct_mgmt.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_authenticate.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_chauthtok.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_close_session.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_get_mapped_username.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_open_session.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_set_mapped_username.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_setcred.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_start.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_strerror.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_verror.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_vinfo.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_vprompt.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/misc/gendoc.pl#4 integrate ... //depot/projects/sparc64/contrib/openpam/modules/Makefile#4 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_deny/Makefile#4 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_deny/pam_deny.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_dummy/Makefile#4 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_dummy/pam_dummy.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_permit/Makefile#4 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_permit/pam_permit.c#4 integrate ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/INTERNALS#1 branch ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/LICENSE#1 branch ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/Makefile#1 branch ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/PLATFORMS#1 branch ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/README#1 branch ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/pam_macros.h#1 branch ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c#1 branch ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec#1 branch ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/passwdqc.h#1 branch ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/passwdqc_check.c#1 branch ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/passwdqc_random.c#1 branch ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/wordset_4k.c#1 branch ... //depot/projects/sparc64/contrib/sendmail/FREEBSD-upgrade#2 integrate ... //depot/projects/sparc64/crypto/openssh/readconf.c#3 integrate ... //depot/projects/sparc64/crypto/openssh/ssh_config#3 integrate ... //depot/projects/sparc64/crypto/openssh/sshconnect2.c#3 integrate ... //depot/projects/sparc64/crypto/openssh/sshd_config#3 integrate ... //depot/projects/sparc64/crypto/openssh/version.h#3 integrate ... //depot/projects/sparc64/etc/MAKEDEV#2 integrate ... //depot/projects/sparc64/etc/defaults/rc.conf#3 integrate ... //depot/projects/sparc64/etc/mail/Makefile#3 integrate ... //depot/projects/sparc64/etc/mail/mailer.conf#2 integrate ... //depot/projects/sparc64/etc/mtree/BSD.local.dist#3 integrate ... //depot/projects/sparc64/etc/mtree/BSD.usr.dist#3 integrate ... //depot/projects/sparc64/etc/rc#6 integrate ... //depot/projects/sparc64/etc/rc.network#3 integrate ... //depot/projects/sparc64/etc/sendmail/Makefile#2 integrate ... //depot/projects/sparc64/etc/sendmail/rc.sendmail#1 branch ... //depot/projects/sparc64/games/fortune/datfiles/freebsd-tips#2 integrate ... //depot/projects/sparc64/gnu/lib/csu/Makefile#2 integrate ... //depot/projects/sparc64/gnu/lib/libgcc/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/Makefile.inc#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc1/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc1obj/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc1plus/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc_int/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/send-pr/send-pr.1#2 integrate ... //depot/projects/sparc64/include/Makefile#4 integrate ... //depot/projects/sparc64/include/arpa/inet.h#3 integrate ... //depot/projects/sparc64/include/disktab.h#2 delete ... //depot/projects/sparc64/include/grp.h#4 integrate ... //depot/projects/sparc64/include/string.h#3 integrate ... //depot/projects/sparc64/include/strings.h#2 integrate ... //depot/projects/sparc64/include/unistd.h#3 integrate ... //depot/projects/sparc64/lib/libc/gen/disklabel.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/res_send.c#4 integrate ... //depot/projects/sparc64/lib/libpam/modules/modules.inc#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_passwdqc/Makefile#1 branch ... //depot/projects/sparc64/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_ssh/pam_ssh.h#2 integrate ... //depot/projects/sparc64/lib/libz/infcodes.c#2 integrate ... //depot/projects/sparc64/libexec/revnetgroup/parse_netgroup.c#2 integrate ... //depot/projects/sparc64/libexec/rtld-elf/rtld.c#13 integrate ... //depot/projects/sparc64/release/Makefile#5 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml#3 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#5 integrate ... //depot/projects/sparc64/sbin/Makefile#10 integrate ... //depot/projects/sparc64/sbin/atacontrol/atacontrol.8#3 integrate ... //depot/projects/sparc64/sbin/atacontrol/atacontrol.c#3 integrate ... //depot/projects/sparc64/sbin/camcontrol/camcontrol.c#3 integrate ... //depot/projects/sparc64/sbin/disklabel/disklabel.5#3 integrate ... //depot/projects/sparc64/sbin/disklabel/disklabel.c#6 integrate ... //depot/projects/sparc64/sbin/dumpon/Makefile#2 integrate ... //depot/projects/sparc64/sbin/dumpon/dumpon.c#3 integrate ... //depot/projects/sparc64/sbin/newfs/mkfs.c#4 integrate ... //depot/projects/sparc64/sbin/newfs/newfs.c#4 integrate ... //depot/projects/sparc64/sbin/ping/ping.c#4 integrate ... //depot/projects/sparc64/sbin/savecore/Makefile#2 integrate ... //depot/projects/sparc64/sbin/savecore/savecore.c#4 integrate ... //depot/projects/sparc64/share/colldef/Makefile#2 integrate ... //depot/projects/sparc64/share/dict/Makefile#3 integrate ... //depot/projects/sparc64/share/dict/README#3 integrate ... //depot/projects/sparc64/share/dict/freebsd#1 branch ... //depot/projects/sparc64/share/dict/tech#2 delete ... //depot/projects/sparc64/share/examples/smbfs/Makefile#3 integrate ... //depot/projects/sparc64/share/examples/smbfs/print/Makefile#2 integrate ... //depot/projects/sparc64/share/man/man5/disktab.5#2 integrate ... //depot/projects/sparc64/share/man/man5/rc.conf.5#4 integrate ... //depot/projects/sparc64/share/man/man7/hier.7#3 integrate ... //depot/projects/sparc64/share/man/man8/Makefile#3 integrate ... //depot/projects/sparc64/share/man/man8/rc.sendmail.8#1 branch ... //depot/projects/sparc64/share/man/man9/Makefile#3 integrate ... //depot/projects/sparc64/share/man/man9/mutex.9#3 integrate ... //depot/projects/sparc64/share/man/man9/suser.9#2 integrate ... //depot/projects/sparc64/share/man/man9/sx.9#3 integrate ... //depot/projects/sparc64/share/man/man9/vm_page_hold.9#2 integrate ... //depot/projects/sparc64/share/misc/pci_vendors#3 integrate ... //depot/projects/sparc64/share/mklocale/Makefile#2 integrate ... //depot/projects/sparc64/share/monetdef/Makefile#2 integrate ... //depot/projects/sparc64/share/monetdef/pt_BR.ISO8859-1.src#1 branch ... //depot/projects/sparc64/share/msgdef/Makefile#2 integrate ... //depot/projects/sparc64/share/msgdef/ja_JP.SJIS.src#1 branch ... //depot/projects/sparc64/share/numericdef/Makefile#2 integrate ... //depot/projects/sparc64/share/numericdef/pt_BR.ISO8859-1.src#1 branch ... //depot/projects/sparc64/share/termcap/Makefile#2 integrate ... //depot/projects/sparc64/share/timedef/Makefile#2 integrate ... //depot/projects/sparc64/share/timedef/pt_BR.ISO8859-1.src#1 branch ... //depot/projects/sparc64/share/zoneinfo/asia#2 integrate ... //depot/projects/sparc64/share/zoneinfo/australasia#2 integrate ... //depot/projects/sparc64/share/zoneinfo/backward#2 integrate ... //depot/projects/sparc64/share/zoneinfo/europe#2 integrate ... //depot/projects/sparc64/share/zoneinfo/leapseconds#2 integrate ... //depot/projects/sparc64/share/zoneinfo/northamerica#2 integrate ... //depot/projects/sparc64/share/zoneinfo/southamerica#2 integrate ... //depot/projects/sparc64/share/zoneinfo/zone.tab#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/autoconf.c#6 integrate ... //depot/projects/sparc64/sys/alpha/alpha/busdma_machdep.c#5 integrate ... //depot/projects/sparc64/sys/alpha/alpha/critical.c#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/interrupt.c#13 integrate ... //depot/projects/sparc64/sys/alpha/alpha/machdep.c#24 integrate ... //depot/projects/sparc64/sys/alpha/alpha/mp_machdep.c#14 integrate ... //depot/projects/sparc64/sys/alpha/alpha/pmap.c#14 integrate ... //depot/projects/sparc64/sys/alpha/alpha/promcons.c#7 integrate ... //depot/projects/sparc64/sys/alpha/alpha/sys_machdep.c#6 integrate ... //depot/projects/sparc64/sys/alpha/alpha/vm_machdep.c#9 integrate ... //depot/projects/sparc64/sys/alpha/conf/GENERIC#15 integrate ... //depot/projects/sparc64/sys/alpha/conf/SIMOS#4 integrate ... //depot/projects/sparc64/sys/alpha/include/cpufunc.h#5 integrate ... //depot/projects/sparc64/sys/alpha/include/critical.h#1 branch ... //depot/projects/sparc64/sys/alpha/osf1/osf1_misc.c#11 integrate ... //depot/projects/sparc64/sys/alpha/osf1/osf1_signal.c#6 integrate ... //depot/projects/sparc64/sys/alpha/tlsb/zs_tlsb.c#7 integrate ... //depot/projects/sparc64/sys/boot/efi/loader/Makefile#6 integrate ... //depot/projects/sparc64/sys/boot/sparc64/Makefile#2 integrate ... //depot/projects/sparc64/sys/boot/sparc64/boot1/Makefile#5 integrate ... //depot/projects/sparc64/sys/boot/sparc64/loader/Makefile#20 integrate ... //depot/projects/sparc64/sys/boot/sparc64/loader/help.sparc64#2 integrate ... //depot/projects/sparc64/sys/boot/sparc64/loader/locore.S#3 integrate ... //depot/projects/sparc64/sys/boot/sparc64/loader/main.c#22 integrate ... //depot/projects/sparc64/sys/boot/sparc64/loader/metadata.c#8 integrate ... //depot/projects/sparc64/sys/cam/scsi/scsi_all.c#7 integrate ... //depot/projects/sparc64/sys/cam/scsi/scsi_da.c#23 integrate ... //depot/projects/sparc64/sys/coda/coda_psdev.c#6 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_misc.c#13 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_signal.c#4 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_uid16.c#5 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_fcntl.c#6 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_misc.c#9 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_signal.c#4 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_stat.c#5 integrate ... //depot/projects/sparc64/sys/conf/NOTES#1 branch ... //depot/projects/sparc64/sys/conf/files#48 integrate ... //depot/projects/sparc64/sys/conf/files.i386#24 integrate ... //depot/projects/sparc64/sys/conf/files.ia64#13 integrate ... //depot/projects/sparc64/sys/conf/files.sparc64#34 integrate ... //depot/projects/sparc64/sys/conf/majors#7 integrate ... //depot/projects/sparc64/sys/conf/options#23 integrate ... //depot/projects/sparc64/sys/dev/aac/aac_disk.c#10 integrate ... //depot/projects/sparc64/sys/dev/aac/aac_pci.c#9 integrate ... //depot/projects/sparc64/sys/dev/aac/aacvar.h#8 integrate ... //depot/projects/sparc64/sys/dev/acpica/Osd/OsdSchedule.c#9 integrate ... //depot/projects/sparc64/sys/dev/acpica/Osd/OsdSynch.c#4 integrate ... //depot/projects/sparc64/sys/dev/acpica/acpi.c#22 integrate ... //depot/projects/sparc64/sys/dev/an/if_an.c#13 integrate ... //depot/projects/sparc64/sys/dev/ar/if_ar.c#2 integrate ... //depot/projects/sparc64/sys/dev/asr/asr.c#8 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-all.c#23 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-all.h#14 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-disk.c#25 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-disk.h#10 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-dma.c#26 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-isa.c#8 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-pci.c#26 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-raid.c#17 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-raid.h#11 integrate ... //depot/projects/sparc64/sys/dev/ata/atapi-all.c#16 integrate ... //depot/projects/sparc64/sys/dev/ata/atapi-all.h#9 integrate ... //depot/projects/sparc64/sys/dev/ata/atapi-cd.c#19 integrate ... //depot/projects/sparc64/sys/dev/ata/atapi-cd.h#8 integrate ... //depot/projects/sparc64/sys/dev/ata/atapi-fd.c#7 integrate ... //depot/projects/sparc64/sys/dev/ata/atapi-tape.c#11 integrate ... //depot/projects/sparc64/sys/dev/awi/awi.c#4 integrate ... //depot/projects/sparc64/sys/dev/awi/awi_wep.c#4 integrate ... //depot/projects/sparc64/sys/dev/awi/awi_wicfg.c#4 integrate ... //depot/projects/sparc64/sys/dev/bge/if_bge.c#9 integrate ... //depot/projects/sparc64/sys/dev/bge/if_bgereg.h#4 integrate ... //depot/projects/sparc64/sys/dev/ccd/ccd.c#10 integrate ... //depot/projects/sparc64/sys/dev/cnw/if_cnw.c#4 integrate ... //depot/projects/sparc64/sys/dev/dgb/dgb.c#7 integrate ... //depot/projects/sparc64/sys/dev/digi/digi.c#11 integrate ... //depot/projects/sparc64/sys/dev/ed/if_ed_pccard.c#7 integrate ... //depot/projects/sparc64/sys/dev/fxp/if_fxp.c#13 integrate ... //depot/projects/sparc64/sys/dev/fxp/if_fxpvar.h#4 integrate ... //depot/projects/sparc64/sys/dev/gx/if_gx.c#4 integrate ... //depot/projects/sparc64/sys/dev/gx/if_gxvar.h#2 integrate ... //depot/projects/sparc64/sys/dev/ichsmb/ichsmb.c#3 integrate ... //depot/projects/sparc64/sys/dev/ida/ida_disk.c#5 integrate ... //depot/projects/sparc64/sys/dev/isp/isp.c#16 integrate ... //depot/projects/sparc64/sys/dev/isp/isp_freebsd.c#11 integrate ... //depot/projects/sparc64/sys/dev/isp/isp_freebsd.h#10 integrate ... //depot/projects/sparc64/sys/dev/isp/isp_inline.h#6 integrate ... //depot/projects/sparc64/sys/dev/isp/isp_pci.c#9 integrate ... //depot/projects/sparc64/sys/dev/isp/ispmbox.h#9 integrate ... //depot/projects/sparc64/sys/dev/isp/ispvar.h#11 integrate ... //depot/projects/sparc64/sys/dev/lmc/if_lmc.c#2 integrate ... //depot/projects/sparc64/sys/dev/mk48txx/mk48txx.c#3 integrate ... //depot/projects/sparc64/sys/dev/mk48txx/mk48txxreg.h#3 integrate ... //depot/projects/sparc64/sys/dev/my/if_my.c#1 branch ... //depot/projects/sparc64/sys/dev/my/if_myreg.h#1 branch ... //depot/projects/sparc64/sys/dev/nge/if_nge.c#8 integrate ... //depot/projects/sparc64/sys/dev/nmdm/nmdm.c#8 integrate ... //depot/projects/sparc64/sys/dev/null/null.c#2 integrate ... //depot/projects/sparc64/sys/dev/ofw/ofw_console.c#12 integrate ... //depot/projects/sparc64/sys/dev/pccard/pccarddevs#13 integrate ... //depot/projects/sparc64/sys/dev/pccard/pccarddevs.h#13 integrate ... //depot/projects/sparc64/sys/dev/pccbb/pccbb.c#10 integrate ... //depot/projects/sparc64/sys/dev/pdq/pdq_ifsubr.c#4 integrate ... //depot/projects/sparc64/sys/dev/puc/pucdata.c#5 integrate ... //depot/projects/sparc64/sys/dev/random/randomdev.c#6 integrate ... //depot/projects/sparc64/sys/dev/random/yarrow.c#4 integrate ... //depot/projects/sparc64/sys/dev/rp/rp.c#6 integrate ... //depot/projects/sparc64/sys/dev/sbni/if_sbni.c#3 integrate ... //depot/projects/sparc64/sys/dev/se/se.c#2 edit ... //depot/projects/sparc64/sys/dev/se/sereg.h#3 edit ... //depot/projects/sparc64/sys/dev/si/si.c#3 integrate ... //depot/projects/sparc64/sys/dev/sio/sio.c#16 integrate ... //depot/projects/sparc64/sys/dev/sound/isa/ad1816.c#4 integrate ... //depot/projects/sparc64/sys/dev/sound/isa/emu8000.c#6 integrate ... //depot/projects/sparc64/sys/dev/sound/isa/gusmidi.c#5 integrate ... //depot/projects/sparc64/sys/dev/sound/isa/mpu.c#7 integrate ... //depot/projects/sparc64/sys/dev/sound/isa/mss.c#7 integrate ... //depot/projects/sparc64/sys/dev/sound/isa/opl.c#5 integrate ... //depot/projects/sparc64/sys/dev/sound/isa/sbc.c#4 integrate ... //depot/projects/sparc64/sys/dev/sound/isa/uartsio.c#6 integrate ... //depot/projects/sparc64/sys/dev/sound/midi/midi.c#5 integrate ... //depot/projects/sparc64/sys/dev/sound/midi/sequencer.c#6 integrate ... //depot/projects/sparc64/sys/dev/sound/midi/timer.c#2 integrate ... //depot/projects/sparc64/sys/dev/sound/pci/cmi.c#8 integrate ... //depot/projects/sparc64/sys/dev/sound/pci/csamidi.c#5 integrate ... //depot/projects/sparc64/sys/dev/sound/pci/ds1.c#4 integrate ... //depot/projects/sparc64/sys/dev/sound/pci/emu10k1.c#4 integrate ... //depot/projects/sparc64/sys/dev/sound/pci/t4dwave.c#6 integrate ... //depot/projects/sparc64/sys/dev/sound/pcm/ac97.c#6 integrate ... //depot/projects/sparc64/sys/dev/sound/pcm/channel.c#14 integrate ... //depot/projects/sparc64/sys/dev/sound/pcm/mixer.c#4 integrate ... //depot/projects/sparc64/sys/dev/sound/pcm/sndstat.c#5 integrate ... //depot/projects/sparc64/sys/dev/sound/pcm/sound.c#8 integrate ... //depot/projects/sparc64/sys/dev/sound/pcm/sound.h#7 integrate ... //depot/projects/sparc64/sys/dev/sr/if_sr.c#2 integrate ... //depot/projects/sparc64/sys/dev/syscons/syscons.c#10 integrate ... //depot/projects/sparc64/sys/dev/syscons/sysmouse.c#3 integrate ... //depot/projects/sparc64/sys/dev/twe/twe_freebsd.c#5 integrate ... //depot/projects/sparc64/sys/dev/txp/if_txp.c#6 integrate ... //depot/projects/sparc64/sys/dev/usb/devlist2h.awk#2 integrate ... //depot/projects/sparc64/sys/dev/usb/hid.h#2 integrate ... //depot/projects/sparc64/sys/dev/usb/if_aue.c#8 integrate ... //depot/projects/sparc64/sys/dev/usb/if_cue.c#4 integrate ... //depot/projects/sparc64/sys/dev/usb/if_kue.c#4 integrate ... //depot/projects/sparc64/sys/dev/usb/ohci.c#12 integrate ... //depot/projects/sparc64/sys/dev/usb/ohcireg.h#3 integrate ... //depot/projects/sparc64/sys/dev/usb/ohcivar.h#4 integrate ... //depot/projects/sparc64/sys/dev/usb/ucom.c#2 integrate ... //depot/projects/sparc64/sys/dev/usb/udbp.c#2 integrate ... //depot/projects/sparc64/sys/dev/usb/uhci.c#12 integrate ... //depot/projects/sparc64/sys/dev/usb/uhcivar.h#4 integrate ... //depot/projects/sparc64/sys/dev/usb/uhid.c#8 integrate ... //depot/projects/sparc64/sys/dev/usb/uhub.c#7 integrate ... //depot/projects/sparc64/sys/dev/usb/ukbd.c#4 integrate ... //depot/projects/sparc64/sys/dev/usb/umass.c#12 integrate ... //depot/projects/sparc64/sys/dev/usb/umodem.c#7 integrate ... //depot/projects/sparc64/sys/dev/usb/ums.c#9 integrate ... //depot/projects/sparc64/sys/dev/usb/urio.c#7 integrate ... //depot/projects/sparc64/sys/dev/usb/usb.c#9 integrate ... //depot/projects/sparc64/sys/dev/usb/usb_ethersubr.c#3 integrate ... //depot/projects/sparc64/sys/dev/usb/usb_port.h#8 integrate ... //depot/projects/sparc64/sys/dev/usb/usb_subr.c#7 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdevs#15 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdevs.h#15 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdevs_data.h#15 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdi.c#6 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdi.h#4 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdi_util.c#2 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdi_util.h#2 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdivar.h#5 integrate ... //depot/projects/sparc64/sys/dev/vinum/vinum.c#6 integrate ... //depot/projects/sparc64/sys/dev/vinum/vinumconfig.c#4 integrate ... //depot/projects/sparc64/sys/dev/vinum/vinumio.c#4 integrate ... //depot/projects/sparc64/sys/dev/vinum/vinumioctl.c#5 integrate ... //depot/projects/sparc64/sys/dev/vinum/vinumobj.h#2 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wavelan_ieee.h#4 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wi.c#22 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wi_pccard.c#1 branch ... //depot/projects/sparc64/sys/dev/wi/if_wi_pci.c#1 branch ... //depot/projects/sparc64/sys/dev/wi/if_wireg.h#9 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wivar.h#1 branch ... //depot/projects/sparc64/sys/dev/wl/if_wl.c#4 integrate ... //depot/projects/sparc64/sys/fs/devfs/devfs_vnops.c#11 integrate ... //depot/projects/sparc64/sys/fs/hpfs/hpfs_hash.c#7 integrate ... //depot/projects/sparc64/sys/fs/hpfs/hpfs_vfsops.c#9 integrate ... //depot/projects/sparc64/sys/fs/hpfs/hpfs_vnops.c#9 integrate ... //depot/projects/sparc64/sys/fs/msdosfs/msdosfs_denode.c#7 integrate ... //depot/projects/sparc64/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate ... //depot/projects/sparc64/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate ... //depot/projects/sparc64/sys/fs/ntfs/ntfs_ihash.c#3 integrate ... //depot/projects/sparc64/sys/fs/ntfs/ntfs_subr.c#8 integrate ... //depot/projects/sparc64/sys/fs/procfs/procfs_ioctl.c#3 integrate ... //depot/projects/sparc64/sys/fs/pseudofs/pseudofs.c#10 integrate ... //depot/projects/sparc64/sys/fs/pseudofs/pseudofs_fileno.c#3 integrate ... //depot/projects/sparc64/sys/fs/pseudofs/pseudofs_vncache.c#8 integrate ... //depot/projects/sparc64/sys/fs/umapfs/umap_vfsops.c#4 integrate ... //depot/projects/sparc64/sys/geom/geom.h#5 integrate ... //depot/projects/sparc64/sys/geom/geom_bsd.c#7 integrate ... //depot/projects/sparc64/sys/geom/geom_dev.c#6 integrate ... //depot/projects/sparc64/sys/geom/geom_disk.c#4 integrate ... //depot/projects/sparc64/sys/geom/geom_dump.c#4 integrate ... //depot/projects/sparc64/sys/geom/geom_event.c#3 integrate ... //depot/projects/sparc64/sys/geom/geom_int.h#2 integrate ... //depot/projects/sparc64/sys/geom/geom_io.c#3 integrate ... //depot/projects/sparc64/sys/geom/geom_mbr.c#5 integrate ... //depot/projects/sparc64/sys/geom/geom_pc98.c#2 integrate ... //depot/projects/sparc64/sys/geom/geom_slice.c#6 integrate ... //depot/projects/sparc64/sys/geom/geom_slice.h#3 integrate ... //depot/projects/sparc64/sys/geom/geom_subr.c#4 integrate ... //depot/projects/sparc64/sys/geom/geom_sunlabel.c#5 integrate ... //depot/projects/sparc64/sys/gnu/ext2fs/ext2_vfsops.c#10 integrate ... //depot/projects/sparc64/sys/gnu/ext2fs/ext2_vnops.c#5 integrate ... //depot/projects/sparc64/sys/i386/conf/GENERIC#17 integrate ... //depot/projects/sparc64/sys/i386/conf/Makefile#2 integrate ... //depot/projects/sparc64/sys/i386/conf/NEWCARD#9 integrate ... //depot/projects/sparc64/sys/i386/conf/NOTES#37 integrate ... //depot/projects/sparc64/sys/i386/i386/autoconf.c#9 integrate ... //depot/projects/sparc64/sys/i386/i386/critical.c#2 integrate ... //depot/projects/sparc64/sys/i386/i386/i386dump.c#1 branch ... //depot/projects/sparc64/sys/i386/i386/machdep.c#26 integrate ... //depot/projects/sparc64/sys/i386/i386/mem.c#5 integrate ... //depot/projects/sparc64/sys/i386/i386/mp_machdep.c#20 integrate ... //depot/projects/sparc64/sys/i386/i386/sys_machdep.c#13 integrate ... //depot/projects/sparc64/sys/i386/i386/trap.c#21 integrate ... //depot/projects/sparc64/sys/i386/i386/vm86.c#4 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_misc.c#4 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_signal.c#4 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_socksys.c#5 integrate ... //depot/projects/sparc64/sys/i386/ibcs2/ibcs2_sysi86.c#3 integrate ... //depot/projects/sparc64/sys/i386/include/cpufunc.h#13 integrate ... //depot/projects/sparc64/sys/i386/include/critical.h#1 branch ... //depot/projects/sparc64/sys/i386/isa/apic_vector.s#10 integrate ... //depot/projects/sparc64/sys/i386/isa/cx.c#3 integrate ... //depot/projects/sparc64/sys/i386/isa/cy.c#11 integrate ... //depot/projects/sparc64/sys/i386/isa/icu_vector.s#7 integrate ... //depot/projects/sparc64/sys/i386/isa/if_el.c#2 integrate ... //depot/projects/sparc64/sys/i386/isa/intr_machdep.c#13 integrate ... //depot/projects/sparc64/sys/i386/isa/istallion.c#3 integrate ... //depot/projects/sparc64/sys/i386/isa/matcd/matcd.c#5 integrate ... //depot/projects/sparc64/sys/i386/isa/mcd.c#5 integrate ... //depot/projects/sparc64/sys/i386/isa/pcvt/pcvt_drv.c#3 integrate ... //depot/projects/sparc64/sys/i386/isa/pcvt/pcvt_ext.c#6 integrate ... //depot/projects/sparc64/sys/i386/isa/rc.c#6 integrate ... //depot/projects/sparc64/sys/i386/isa/scd.c#5 integrate ... //depot/projects/sparc64/sys/i386/isa/spigot.c#7 integrate ... //depot/projects/sparc64/sys/i386/isa/stallion.c#3 integrate ... //depot/projects/sparc64/sys/i386/linux/linux.h#6 integrate ... //depot/projects/sparc64/sys/i386/linux/linux_machdep.c#8 integrate ... //depot/projects/sparc64/sys/i386/linux/linux_sysvec.c#14 integrate ... //depot/projects/sparc64/sys/i386/svr4/svr4_machdep.c#7 integrate ... //depot/projects/sparc64/sys/i4b/capi/capi_l4if.c#4 integrate ... //depot/projects/sparc64/sys/i4b/capi/iavc/iavc_isa.c#4 integrate ... //depot/projects/sparc64/sys/i4b/capi/iavc/iavc_pci.c#4 integrate ... //depot/projects/sparc64/sys/i4b/driver/i4b_ing.c#4 integrate ... //depot/projects/sparc64/sys/i4b/driver/i4b_ipr.c#5 integrate ... //depot/projects/sparc64/sys/i4b/driver/i4b_rbch.c#5 integrate ... //depot/projects/sparc64/sys/i4b/driver/i4b_trace.c#5 integrate ... //depot/projects/sparc64/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate ... //depot/projects/sparc64/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#4 integrate ... //depot/projects/sparc64/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate ... //depot/projects/sparc64/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#3 integrate ... //depot/projects/sparc64/sys/i4b/layer1/isic/i4b_bchan.c#4 integrate ... //depot/projects/sparc64/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#3 integrate ... //depot/projects/sparc64/sys/i4b/layer2/i4b_l2.c#4 integrate ... //depot/projects/sparc64/sys/i4b/layer4/i4b_i4bdrv.c#7 integrate ... //depot/projects/sparc64/sys/ia64/conf/GENERIC#12 integrate ... //depot/projects/sparc64/sys/ia64/conf/SKI#3 integrate ... //depot/projects/sparc64/sys/ia64/ia64/autoconf.c#7 integrate ... //depot/projects/sparc64/sys/ia64/ia64/critical.c#2 integrate ... //depot/projects/sparc64/sys/ia64/ia64/ia64dump.c#1 branch ... //depot/projects/sparc64/sys/ia64/ia64/interrupt.c#10 integrate ... //depot/projects/sparc64/sys/ia64/ia64/machdep.c#34 integrate ... //depot/projects/sparc64/sys/ia64/ia64/pmap.c#23 integrate ... //depot/projects/sparc64/sys/ia64/ia64/ssc.c#6 integrate ... //depot/projects/sparc64/sys/ia64/ia64/trap.c#20 integrate ... //depot/projects/sparc64/sys/ia64/ia64/vm_machdep.c#13 integrate ... //depot/projects/sparc64/sys/ia64/include/cpufunc.h#10 integrate ... //depot/projects/sparc64/sys/ia64/include/critical.h#1 branch ... //depot/projects/sparc64/sys/ia64/include/elf.h#4 integrate ... //depot/projects/sparc64/sys/isa/fd.c#9 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/cd9660_node.c#5 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/cd9660_vfsops.c#9 integrate ... //depot/projects/sparc64/sys/kern/clock_if.m#2 integrate ... //depot/projects/sparc64/sys/kern/init_main.c#19 integrate ... //depot/projects/sparc64/sys/kern/kern_acct.c#9 integrate ... //depot/projects/sparc64/sys/kern/kern_acl.c#12 integrate ... //depot/projects/sparc64/sys/kern/kern_descrip.c#19 integrate ... //depot/projects/sparc64/sys/kern/kern_exec.c#21 integrate ... //depot/projects/sparc64/sys/kern/kern_exit.c#20 integrate ... //depot/projects/sparc64/sys/kern/kern_fork.c#25 integrate ... //depot/projects/sparc64/sys/kern/kern_intr.c#13 integrate ... //depot/projects/sparc64/sys/kern/kern_jail.c#11 integrate ... //depot/projects/sparc64/sys/kern/kern_ktrace.c#9 integrate ... //depot/projects/sparc64/sys/kern/kern_linker.c#16 integrate ... //depot/projects/sparc64/sys/kern/kern_lock.c#9 integrate ... //depot/projects/sparc64/sys/kern/kern_malloc.c#6 integrate ... //depot/projects/sparc64/sys/kern/kern_mib.c#10 integrate ... //depot/projects/sparc64/sys/kern/kern_mtxpool.c#5 integrate ... //depot/projects/sparc64/sys/kern/kern_mutex.c#16 integrate ... //depot/projects/sparc64/sys/kern/kern_ntptime.c#5 integrate ... //depot/projects/sparc64/sys/kern/kern_proc.c#14 integrate ... //depot/projects/sparc64/sys/kern/kern_prot.c#26 integrate ... //depot/projects/sparc64/sys/kern/kern_resource.c#15 integrate ... //depot/projects/sparc64/sys/kern/kern_sema.c#3 integrate ... //depot/projects/sparc64/sys/kern/kern_shutdown.c#14 integrate ... //depot/projects/sparc64/sys/kern/kern_sig.c#23 integrate ... //depot/projects/sparc64/sys/kern/kern_switch.c#9 integrate ... //depot/projects/sparc64/sys/kern/kern_sx.c#10 integrate ... //depot/projects/sparc64/sys/kern/kern_sysctl.c#12 integrate ... //depot/projects/sparc64/sys/kern/kern_time.c#7 integrate ... //depot/projects/sparc64/sys/kern/kern_timeout.c#6 integrate ... //depot/projects/sparc64/sys/kern/kern_xxx.c#4 integrate ... //depot/projects/sparc64/sys/kern/subr_clock.c#4 integrate ... //depot/projects/sparc64/sys/kern/subr_disk.c#10 integrate ... //depot/projects/sparc64/sys/kern/subr_disklabel.c#7 integrate ... //depot/projects/sparc64/sys/kern/subr_diskslice.c#8 integrate ... //depot/projects/sparc64/sys/kern/subr_eventhandler.c#3 integrate ... //depot/projects/sparc64/sys/kern/subr_mbuf.c#9 integrate ... //depot/projects/sparc64/sys/kern/subr_prf.c#11 integrate ... //depot/projects/sparc64/sys/kern/subr_rman.c#8 integrate ... //depot/projects/sparc64/sys/kern/subr_smp.c#15 integrate ... //depot/projects/sparc64/sys/kern/subr_taskqueue.c#4 integrate ... //depot/projects/sparc64/sys/kern/subr_trap.c#21 integrate ... //depot/projects/sparc64/sys/kern/subr_witness.c#20 integrate ... //depot/projects/sparc64/sys/kern/subr_xxx.c#4 integrate ... //depot/projects/sparc64/sys/kern/sys_generic.c#13 integrate ... //depot/projects/sparc64/sys/kern/sys_pipe.c#16 integrate ... //depot/projects/sparc64/sys/kern/sysv_ipc.c#7 integrate ... //depot/projects/sparc64/sys/kern/sysv_msg.c#8 integrate ... //depot/projects/sparc64/sys/kern/tty.c#14 integrate ... //depot/projects/sparc64/sys/kern/tty_cons.c#7 integrate ... //depot/projects/sparc64/sys/kern/tty_pty.c#10 integrate ... //depot/projects/sparc64/sys/kern/uipc_syscalls.c#12 integrate ... //depot/projects/sparc64/sys/kern/vfs_aio.c#16 integrate ... //depot/projects/sparc64/sys/kern/vfs_bio.c#21 integrate ... //depot/projects/sparc64/sys/kern/vfs_conf.c#6 integrate ... //depot/projects/sparc64/sys/kern/vfs_subr.c#22 integrate ... //depot/projects/sparc64/sys/kern/vfs_syscalls.c#25 integrate ... //depot/projects/sparc64/sys/kern/vfs_vnops.c#19 integrate ... //depot/projects/sparc64/sys/modules/wi/Makefile#4 integrate ... //depot/projects/sparc64/sys/net/bpf.c#11 integrate ... //depot/projects/sparc64/sys/net/bsd_comp.c#4 integrate ... //depot/projects/sparc64/sys/net/ethernet.h#5 integrate ... //depot/projects/sparc64/sys/net/if.c#17 integrate ... //depot/projects/sparc64/sys/net/if_arcsubr.c#3 integrate ... //depot/projects/sparc64/sys/net/if_ethersubr.c#14 integrate ... //depot/projects/sparc64/sys/net/if_loop.c#10 integrate ... //depot/projects/sparc64/sys/net/if_ppp.c#7 integrate ... //depot/projects/sparc64/sys/net/if_sl.c#9 integrate ... //depot/projects/sparc64/sys/net/if_spppsubr.c#6 integrate ... //depot/projects/sparc64/sys/net/if_tap.c#9 integrate ... //depot/projects/sparc64/sys/net/if_tun.c#7 integrate ... //depot/projects/sparc64/sys/net/if_vlan.c#10 integrate ... //depot/projects/sparc64/sys/net/net_osdep.h#3 integrate ... //depot/projects/sparc64/sys/net/ppp_deflate.c#4 integrate ... //depot/projects/sparc64/sys/net/ppp_tty.c#5 integrate ... //depot/projects/sparc64/sys/net/raw_usrreq.c#4 integrate ... //depot/projects/sparc64/sys/net/rtsock.c#10 integrate ... //depot/projects/sparc64/sys/netatalk/at_control.c#3 integrate ... //depot/projects/sparc64/sys/netatalk/ddp_usrreq.c#5 integrate ... //depot/projects/sparc64/sys/netatm/atm_subr.c#5 integrate ... //depot/projects/sparc64/sys/netatm/atm_usrreq.c#4 integrate ... //depot/projects/sparc64/sys/netgraph/ng_base.c#5 integrate ... //depot/projects/sparc64/sys/netgraph/ng_socket.c#8 integrate ... //depot/projects/sparc64/sys/netgraph/ng_tty.c#5 integrate ... //depot/projects/sparc64/sys/netinet/if_ether.c#12 integrate ... //depot/projects/sparc64/sys/netinet/in.c#10 integrate ... //depot/projects/sparc64/sys/netinet/in.h#7 integrate ... //depot/projects/sparc64/sys/netinet/in_pcb.c#16 integrate ... //depot/projects/sparc64/sys/netinet/ip_divert.c#8 integrate ... //depot/projects/sparc64/sys/netinet/ip_input.c#17 integrate ... //depot/projects/sparc64/sys/netinet/ip_output.c#17 integrate ... //depot/projects/sparc64/sys/netinet/raw_ip.c#12 integrate ... //depot/projects/sparc64/sys/netinet/tcp_subr.c#14 integrate ... //depot/projects/sparc64/sys/netinet/udp_usrreq.c#15 integrate ... //depot/projects/sparc64/sys/netinet6/in6.c#6 integrate ... //depot/projects/sparc64/sys/netinet6/in6_pcb.c#10 integrate ... //depot/projects/sparc64/sys/netinet6/in6_src.c#5 integrate ... //depot/projects/sparc64/sys/netinet6/ip6_input.c#6 integrate ... //depot/projects/sparc64/sys/netinet6/ip6_output.c#7 integrate ... //depot/projects/sparc64/sys/netinet6/nd6.c#5 integrate ... //depot/projects/sparc64/sys/netinet6/raw_ip6.c#6 integrate ... //depot/projects/sparc64/sys/netinet6/udp6_output.c#5 integrate ... //depot/projects/sparc64/sys/netinet6/udp6_usrreq.c#7 integrate ... //depot/projects/sparc64/sys/netipx/ipx.c#3 integrate ... //depot/projects/sparc64/sys/netipx/ipx_input.c#3 integrate ... //depot/projects/sparc64/sys/netipx/ipx_pcb.c#4 integrate ... //depot/projects/sparc64/sys/netipx/ipx_usrreq.c#4 integrate ... //depot/projects/sparc64/sys/netnatm/natm_proto.c#4 integrate ... //depot/projects/sparc64/sys/netncp/ncp_subr.h#3 integrate ... //depot/projects/sparc64/sys/netns/ns_input.c#3 integrate ... //depot/projects/sparc64/sys/netsmb/smb_subr.h#4 integrate ... //depot/projects/sparc64/sys/nfsclient/nfs_lock.c#9 integrate ... //depot/projects/sparc64/sys/nfsserver/nfs_serv.c#12 integrate ... //depot/projects/sparc64/sys/nfsserver/nfs_syscalls.c#6 integrate ... //depot/projects/sparc64/sys/pc98/conf/GENERIC#14 integrate ... //depot/projects/sparc64/sys/pc98/i386/machdep.c#22 integrate ... //depot/projects/sparc64/sys/pc98/pc98/fd.c#7 integrate ... //depot/projects/sparc64/sys/pc98/pc98/sio.c#12 integrate ... //depot/projects/sparc64/sys/pc98/pc98/syscons.c#9 integrate ... //depot/projects/sparc64/sys/pc98/pc98/wd_cd.c#6 integrate ... //depot/projects/sparc64/sys/pccard/pccard.c#10 integrate ... //depot/projects/sparc64/sys/pci/if_dc.c#14 integrate ... //depot/projects/sparc64/sys/pci/if_pcn.c#5 integrate ... //depot/projects/sparc64/sys/pci/if_rl.c#7 integrate ... //depot/projects/sparc64/sys/pci/if_sf.c#7 integrate ... //depot/projects/sparc64/sys/pci/if_sis.c#12 integrate ... //depot/projects/sparc64/sys/pci/if_sk.c#5 integrate ... //depot/projects/sparc64/sys/pci/if_ste.c#6 integrate ... //depot/projects/sparc64/sys/pci/if_ti.c#8 integrate ... //depot/projects/sparc64/sys/pci/if_tl.c#4 integrate ... //depot/projects/sparc64/sys/pci/if_vr.c#4 integrate ... //depot/projects/sparc64/sys/pci/if_wb.c#4 integrate ... //depot/projects/sparc64/sys/pci/if_xl.c#9 integrate ... //depot/projects/sparc64/sys/powerpc/include/cpufunc.h#9 integrate ... //depot/projects/sparc64/sys/powerpc/include/critical.h#1 branch ... //depot/projects/sparc64/sys/powerpc/powerpc/autoconf.c#5 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/critical.c#2 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/machdep.c#20 integrate ... //depot/projects/sparc64/sys/security/lomac/kernel_mmap.c#5 integrate ... //depot/projects/sparc64/sys/security/lomac/kernel_util.c#5 integrate ... //depot/projects/sparc64/sys/sparc64/conf/GENERIC#18 integrate ... //depot/projects/sparc64/sys/sparc64/include/cpufunc.h#20 integrate ... //depot/projects/sparc64/sys/sparc64/include/critical.h#1 branch ... //depot/projects/sparc64/sys/sparc64/include/eeprom.h#2 integrate ... //depot/projects/sparc64/sys/sparc64/include/iommureg.h#9 integrate ... //depot/projects/sparc64/sys/sparc64/include/param.h#23 integrate ... //depot/projects/sparc64/sys/sparc64/include/tlb.h#34 integrate ... //depot/projects/sparc64/sys/sparc64/include/upa.h#8 integrate ... //depot/projects/sparc64/sys/sparc64/isa/isa.c#11 integrate ... //depot/projects/sparc64/sys/sparc64/pci/psycho.c#28 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/autoconf.c#10 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/clock.c#12 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/critical.c#2 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/eeprom.c#3 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/eeprom_ebus.c#2 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/eeprom_sbus.c#2 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/intr_machdep.c#25 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/iommu.c#21 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/machdep.c#72 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/mp_machdep.c#13 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/pmap.c#82 integrate ... //depot/projects/sparc64/sys/sys/_lock.h#5 integrate ... //depot/projects/sparc64/sys/sys/_mutex.h#5 integrate ... //depot/projects/sparc64/sys/sys/_types.h#1 branch ... //depot/projects/sparc64/sys/sys/ata.h#11 integrate ... //depot/projects/sparc64/sys/sys/cdefs.h#9 integrate ... //depot/projects/sparc64/sys/sys/cdio.h#4 integrate ... //depot/projects/sparc64/sys/sys/clock.h#3 integrate ... //depot/projects/sparc64/sys/sys/condvar.h#3 integrate ... //depot/projects/sparc64/sys/sys/conf.h#13 integrate ... //depot/projects/sparc64/sys/sys/disk.h#4 integrate ... //depot/projects/sparc64/sys/sys/disklabel.h#16 integrate ... //depot/projects/sparc64/sys/sys/eventhandler.h#4 integrate ... //depot/projects/sparc64/sys/sys/kerneldump.h#1 branch ... //depot/projects/sparc64/sys/sys/ktr.h#11 integrate ... //depot/projects/sparc64/sys/sys/mutex.h#15 integrate ... //depot/projects/sparc64/sys/sys/param.h#16 integrate ... //depot/projects/sparc64/sys/sys/pcpu.h#7 integrate ... //depot/projects/sparc64/sys/sys/proc.h#30 integrate ... //depot/projects/sparc64/sys/sys/signalvar.h#7 integrate ... //depot/projects/sparc64/sys/sys/stdint.h#2 integrate ... //depot/projects/sparc64/sys/sys/sx.h#8 integrate ... //depot/projects/sparc64/sys/sys/sysctl.h#7 integrate ... //depot/projects/sparc64/sys/sys/systm.h#21 integrate ... //depot/projects/sparc64/sys/sys/types.h#12 integrate ... //depot/projects/sparc64/sys/sys/ucred.h#7 integrate ... //depot/projects/sparc64/sys/ufs/ffs/ffs_alloc.c#9 integrate ... //depot/projects/sparc64/sys/ufs/ffs/ffs_tables.c#2 integrate ... //depot/projects/sparc64/sys/ufs/ffs/ffs_vfsops.c#15 integrate ... //depot/projects/sparc64/sys/ufs/ffs/fs.h#7 integrate ... //depot/projects/sparc64/sys/ufs/ifs/ifs_vfsops.c#5 integrate ... //depot/projects/sparc64/sys/ufs/ifs/ifs_vnops.c#3 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_dirhash.c#8 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_extattr.c#10 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_ihash.c#4 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_quota.c#8 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_readwrite.c#6 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_vfsops.c#5 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_vnops.c#11 integrate ... //depot/projects/sparc64/sys/vm/device_pager.c#3 integrate ... //depot/projects/sparc64/sys/vm/phys_pager.c#3 integrate ... //depot/projects/sparc64/sys/vm/swap_pager.c#10 integrate ... //depot/projects/sparc64/sys/vm/uma_core.c#4 integrate ... //depot/projects/sparc64/sys/vm/uma_int.h#3 integrate ... //depot/projects/sparc64/sys/vm/vm_extern.h#9 integrate ... //depot/projects/sparc64/sys/vm/vm_meter.c#6 integrate ... //depot/projects/sparc64/sys/vm/vm_mmap.c#14 integrate ... //depot/projects/sparc64/sys/vm/vm_object.c#9 integrate ... //depot/projects/sparc64/sys/vm/vm_page.c#13 integrate ... //depot/projects/sparc64/sys/vm/vm_pageq.c#5 integrate ... //depot/projects/sparc64/sys/vm/vm_pager.c#11 integrate ... //depot/projects/sparc64/sys/vm/vm_swap.c#7 integrate ... //depot/projects/sparc64/sys/vm/vm_zone.c#11 integrate ... //depot/projects/sparc64/tools/regression/geom/geom_simdev.c#3 integrate ... //depot/projects/sparc64/tools/regression/geom/geom_simdisk.c#3 integrate ... //depot/projects/sparc64/tools/regression/geom/geom_simdisk.h#3 integrate ... //depot/projects/sparc64/tools/regression/geom/geom_simdisk_xml.c#4 integrate ... //depot/projects/sparc64/tools/tools/commitsdb/query_commit_db#2 integrate ... //depot/projects/sparc64/usr.bin/Makefile#17 integrate ... //depot/projects/sparc64/usr.bin/calendar/calendars/calendar.freebsd#4 integrate ... //depot/projects/sparc64/usr.bin/find/Makefile#3 integrate ... //depot/projects/sparc64/usr.bin/find/extern.h#4 integrate ... //depot/projects/sparc64/usr.bin/find/find.1#2 integrate ... //depot/projects/sparc64/usr.bin/find/find.c#3 integrate ... //depot/projects/sparc64/usr.bin/find/function.c#5 integrate ... //depot/projects/sparc64/usr.bin/find/ls.c#3 integrate ... //depot/projects/sparc64/usr.bin/find/main.c#3 integrate ... //depot/projects/sparc64/usr.bin/find/misc.c#2 integrate ... //depot/projects/sparc64/usr.bin/find/operator.c#4 integrate ... //depot/projects/sparc64/usr.bin/find/option.c#3 integrate ... //depot/projects/sparc64/usr.bin/kdump/mkioctls#3 integrate ... //depot/projects/sparc64/usr.bin/ktrace/ktrace.c#3 integrate ... //depot/projects/sparc64/usr.bin/ktrace/ktrace.h#2 integrate ... //depot/projects/sparc64/usr.bin/ktrace/subr.c#2 integrate ... //depot/projects/sparc64/usr.bin/ktrdump/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/ktrdump/ktrdump.8#1 branch ... //depot/projects/sparc64/usr.bin/ktrdump/ktrdump.c#2 integrate ... //depot/projects/sparc64/usr.bin/limits/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/logger/logger.c#3 integrate ... //depot/projects/sparc64/usr.bin/pr/pr.1#2 integrate ... //depot/projects/sparc64/usr.bin/pr/pr.c#2 integrate ... //depot/projects/sparc64/usr.bin/sed/process.c#3 integrate ... //depot/projects/sparc64/usr.bin/sort/extern.h#3 integrate ... //depot/projects/sparc64/usr.bin/sort/fields.c#3 integrate ... //depot/projects/sparc64/usr.bin/sort/files.c#3 integrate ... //depot/projects/sparc64/usr.bin/sort/init.c#3 integrate ... //depot/projects/sparc64/usr.bin/sort/msort.c#3 integrate ... //depot/projects/sparc64/usr.bin/sort/sort.1#3 integrate ... //depot/projects/sparc64/usr.bin/sort/sort.c#4 integrate ... //depot/projects/sparc64/usr.bin/sort/sort.h#2 integrate ... //depot/projects/sparc64/usr.bin/yacc/error.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/main.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/mkpar.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/output.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/reader.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/verbose.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/yacc.1#2 integrate ... //depot/projects/sparc64/usr.bin/yacc/yyfix.1#2 integrate ... //depot/projects/sparc64/usr.sbin/Makefile#10 integrate ... //depot/projects/sparc64/usr.sbin/arp/arp.c#3 integrate ... //depot/projects/sparc64/usr.sbin/diskpart/Makefile#2 delete ... //depot/projects/sparc64/usr.sbin/diskpart/diskpart.8#3 delete ... //depot/projects/sparc64/usr.sbin/diskpart/diskpart.c#2 delete ... //depot/projects/sparc64/usr.sbin/fdformat/fdformat.c#2 integrate ... //depot/projects/sparc64/usr.sbin/mailwrapper/Makefile#2 integrate ... //depot/projects/sparc64/usr.sbin/newsyslog/newsyslog.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ntp/doc/ntp.conf.5#2 integrate ... //depot/projects/sparc64/usr.sbin/ntp/doc/ntp.keys.5#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/add/extract.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/add/futil.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/add/main.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/add/perform.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/create/main.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/create/perform.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/create/pl.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/delete/main.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/delete/perform.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/info/main.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/info/perform.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/info/show.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/deps.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/exec.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/file.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/global.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/match.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/msg.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/pen.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/plist.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/str.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/version.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/sign/check.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/sign/common.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/sign/gzip.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/sign/main.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/sign/pgp_check.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/sign/pgp_sign.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/sign/sha1.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/sign/sign.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/sign/stand.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/sign/x509.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/auth.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/mppe.c#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/radius.h#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/route.c#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/tty.c#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/vjcomp.c#2 integrate ... //depot/projects/sparc64/usr.sbin/pw/pw.8#2 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/Makefile#4 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/dispatch.c#2 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/dist.c#4 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/install.c#3 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/installUpgrade.c#2 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/media.c#3 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/menus.c#5 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/package.c#3 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/sysinstall.8#2 integrate ... //depot/projects/sparc64/usr.sbin/wicontrol/wicontrol.c#3 integrate Differences ... ==== //depot/projects/sparc64/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.246 2002/03/26 16:05:09 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.249 2002/04/04 06:49:46 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -226,8 +226,8 @@ usr/share/groff_font/devutf8 \ usr/share/tmac/mdoc usr/share/tmac/mm -INCDIRS= arpa g++/std isc objc protocols readline rpc rpcsvc openssl \ - security +INCDIRS= arpa dev fs g++/std isc isofs objc protocols \ + readline rpc rpcsvc openssl security ufs # # buildworld @@ -706,6 +706,7 @@ cd ${.CURDIR}/lib/libstand; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libtacplus; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcom_err; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libusbhid; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libutil; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libvgl; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libwrap; ${MAKE} beforeinstall ==== //depot/projects/sparc64/UPDATING#3 (text+ko) ==== @@ -23,6 +23,24 @@ integrity. Re-enabling write caching can substantially improve performance. +20020404: + New sendmail startup scripts have been installed to make it + easier to use alternative MTAs with FreeBSD. Setting the rc.conf + variable sendmail_enable to "NO" no longer prevents any sendmail + daemons from starting. Instead, either set sendmail_enable to + "NONE" or change mta_start_script to a script for starting + an alternative MTA. Setting mta_start_script to "" will + also prevent any MTA from being started at boot. + +20020404: + Due to the import of sendmail 8.12.2 (see 20020217 entry), a new + user and group are required in order for sendmail to run as a + set-group-ID binary. A 'make installworld' will use the new user + and group to set the owner and group of /var/spool/clientmqueue + and will fail if the new user and group do not exist. The 'smmsp' + user and group must be merged from src/etc/group and + src/etc/master.passwd before using 'make installworld'. + 20020315: FreeBSD 5.0 DP-1 was basically branched today. @@ -984,4 +1002,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.196 2002/03/18 04:52:24 imp Exp $ +$FreeBSD: src/UPDATING,v 1.197 2002/04/05 07:42:42 gshapiro Exp $ ==== //depot/projects/sparc64/bin/dd/dd.1#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.18 2001/08/15 09:09:34 ru Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.19 2002/03/31 20:49:37 keramida Exp $ .\" .Dd January 13, 1994 .Dt DD 1 @@ -43,7 +43,7 @@ .Nd convert and copy a file .Sh SYNOPSIS .Nm -.Op operands ... +.Op Ar operands ... .Sh DESCRIPTION The .Nm @@ -57,10 +57,11 @@ and truncated input records to the standard error output. .Pp The following operands are available: +.\" XXX .Bl -tag -width of=file -.It Cm bs= Ns Ar n +.It Cm bs Ns = Ns Ar n Set both input and output block size to -.Va n +.Ar n bytes, superseding the .Cm ibs and @@ -73,40 +74,40 @@ .Cm sync are specified, then each input block is copied to the output as a single block without any aggregation of short blocks. -.It Cm cbs= Ns Ar n +.It Cm cbs Ns = Ns Ar n Set the conversion record size to -.Va n +.Ar n bytes. The conversion record size is required by the record oriented conversion values. -.It Cm count= Ns Ar n +.It Cm count Ns = Ns Ar n Copy only -.Va n +.Ar n input blocks. -.It Cm files= Ns Ar n +.It Cm files Ns = Ns Ar n Copy -.Va n +.Ar n input files before terminating. This operand is only applicable when the input device is a tape. -.It Cm ibs= Ns Ar n +.It Cm ibs Ns = Ns Ar n Set the input block size to -.Va n +.Ar n bytes instead of the default 512. -.It Cm if= Ns Ar file +.It Cm if Ns = Ns Ar file Read input from .Ar file instead of the standard input. -.It Cm iseek= Ns Ar n +.It Cm iseek Ns = Ns Ar n Seek on the input file -.Va n +.Ar n blocks. This is synonymous with -.Cm skip= Ns Ar n . -.It Cm obs= Ns Ar n +.Cm skip Ns = Ns Ar n . +.It Cm obs Ns = Ns Ar n Set the output block size to -.Va n +.Ar n bytes instead of the default 512. -.It Cm of= Ns Ar file +.It Cm of Ns = Ns Ar file >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 14:35:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 873C637B404; Fri, 5 Apr 2002 14:35:23 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5339537B417 for ; Fri, 5 Apr 2002 14:35:22 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g35MZLc10168 for perforce@freebsd.org; Fri, 5 Apr 2002 14:35:21 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 5 Apr 2002 14:35:21 -0800 (PST) Message-Id: <200204052235.g35MZLc10168@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9138 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9138 Change 9138 by jhb@jhb_laptop on 2002/04/05 14:35:08 From jhb_proc: change fill_kinfo_proc() to require the proc to be locked. Fixup callers. Change sysctl_out_proc() to require the proc to already be locked and drop the lock before returning. Lock the proc only once during the kern.proc sysctl loop. Affected files ... ... //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#13 integrate ... //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#8 integrate ... //depot/projects/smpng/sys/kern/imgact_aout.c#10 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#23 integrate ... //depot/projects/smpng/sys/kern/sys_process.c#11 integrate Differences ... ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#13 (text+ko) ==== @@ -489,12 +489,12 @@ { struct kinfo_proc kp; + PROC_LOCK(p); fill_kinfo_proc(p, &kp); sbuf_printf(sb, "%d", p->p_pid); #define PS_ADD(name, fmt, arg) sbuf_printf(sb, " " fmt, arg) PS_ADD("comm", "(%s)", p->p_comm); PS_ADD("statr", "%c", '0'); /* XXX */ - PROC_LOCK(p); PS_ADD("ppid", "%d", p->p_pptr ? p->p_pptr->p_pid : 0); PS_ADD("pgrp", "%d", p->p_pgid); PS_ADD("session", "%d", p->p_session->s_sid); @@ -571,6 +571,7 @@ state = state_str[(int)p->p_stat]; mtx_unlock_spin(&sched_lock); + PROC_LOCK(p); fill_kinfo_proc(p, &kp); sbuf_printf(sb, "Name:\t%s\n", p->p_comm); /* XXX escape */ sbuf_printf(sb, "State:\t%s\n", state); @@ -579,7 +580,6 @@ * Credentials */ sbuf_printf(sb, "Pid:\t%d\n", p->p_pid); - PROC_LOCK(p); sbuf_printf(sb, "PPid:\t%d\n", p->p_pptr ? p->p_pptr->p_pid : 0); sbuf_printf(sb, "Uid:\t%d %d %d %d\n", p->p_ucred->cr_ruid, ==== //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#8 (text+ko) ==== @@ -173,7 +173,9 @@ #endif if (ctob((UAREA_PAGES+KSTACK_PAGES) + vm->vm_dsize + vm->vm_ssize) >= limit) return (EFAULT); + PROC_LOCK(td->td_proc); fill_kinfo_proc(td->td_proc, &td->td_proc->p_uarea->u_kproc); + PROC_UNLOCK(td-td_proc); #if PECOFF_DEBUG fill_regs(td, ®s); ==== //depot/projects/smpng/sys/kern/imgact_aout.c#10 (text+ko) ==== @@ -263,7 +263,9 @@ if (ctob((UAREA_PAGES + KSTACK_PAGES) + vm->vm_dsize + vm->vm_ssize) >= limit) return (EFAULT); + PROC_LOCK(p); fill_kinfo_proc(p, &p->p_uarea->u_kproc); + PROC_UNLOCK(p); error = cpu_coredump(td, vp, cred); if (error == 0) error = vn_rdwr(UIO_WRITE, vp, vm->vm_daddr, ==== //depot/projects/smpng/sys/kern/kern_proc.c#23 (text+ko) ==== @@ -643,6 +643,7 @@ /* * Fill in an kinfo_proc structure for the specified process. + * Must be called with the target process locked. */ void fill_kinfo_proc(p, kp) @@ -658,7 +659,7 @@ kp->ki_structsize = sizeof(*kp); kp->ki_paddr = p; - PROC_LOCK(p); + PROC_LOCK_ASSERT(p, MA_OWNED); kp->ki_addr =/* p->p_addr; */0; /* XXXKSE */ kp->ki_args = p->p_args; kp->ki_tracep = p->p_tracep; @@ -778,7 +779,6 @@ kp->ki_lock = p->p_lock; if (p->p_pptr) kp->ki_ppid = p->p_pptr->p_pid; - PROC_UNLOCK(p); } /* @@ -800,6 +800,9 @@ } +/* + * Must be called with the process locked and will return with it unlocked. + */ static int sysctl_out_proc(struct proc *p, struct sysctl_req *req, int doingzomb) { @@ -808,7 +811,9 @@ struct proc *np; pid_t pid = p->p_pid; + PROC_LOCK_ASSERT(p, MA_OWNED); fill_kinfo_proc(p, &kinfo_proc); + PROC_UNLOCK(p); error = SYSCTL_OUT(req, (caddr_t)&kinfo_proc, sizeof(kinfo_proc)); if (error) return (error); @@ -872,16 +877,21 @@ else p = LIST_FIRST(&zombproc); for (; p != 0; p = LIST_NEXT(p, p_list)) { + PROC_LOCK(p); /* * Show a user only appropriate processes. */ - if (p_cansee(curproc, p)) + if (p_cansee(curproc, p)) { + PROC_UNLOCK(p); continue; + } /* * Skip embryonic processes. */ - if (p->p_stat == SIDL) + if (p->p_stat == SIDL) { + PROC_UNLOCK(p); continue; + } /* * TODO - make more efficient (see notes below). * do by session. @@ -890,17 +900,14 @@ case KERN_PROC_PGRP: /* could do this by traversing pgrp */ - PROC_LOCK(p); if (p->p_pgrp == NULL || p->p_pgrp->pg_id != (pid_t)name[0]) { PROC_UNLOCK(p); continue; } - PROC_UNLOCK(p); break; case KERN_PROC_TTY: - PROC_LOCK(p); if ((p->p_flag & P_CONTROLT) == 0 || p->p_session == NULL) { PROC_UNLOCK(p); @@ -915,25 +922,25 @@ continue; } SESS_UNLOCK(p->p_session); - PROC_UNLOCK(p); break; case KERN_PROC_UID: if (p->p_ucred == NULL || - p->p_ucred->cr_uid != (uid_t)name[0]) + p->p_ucred->cr_uid != (uid_t)name[0]) { + PROC_UNLOCK(p); continue; + } break; case KERN_PROC_RUID: if (p->p_ucred == NULL || - p->p_ucred->cr_ruid != (uid_t)name[0]) + p->p_ucred->cr_ruid != (uid_t)name[0]) { + PROC_UNLOCK(p); continue; + } break; } - if (p_cansee(curproc, p)) - continue; - error = sysctl_out_proc(p, req, doingzomb); if (error) { sx_sunlock(&allproc_lock); ==== //depot/projects/smpng/sys/kern/sys_process.c#11 (text+ko) ==== @@ -488,7 +488,9 @@ } if (uap->addr != (caddr_t)1) { + PROC_LOCK(p); fill_kinfo_proc(p, &p->p_uarea->u_kproc); + PROC_UNLOCK(p); error = ptrace_set_pc(td2, (u_long)(uintfptr_t)uap->addr); if (error) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 14:40:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2020937B405; Fri, 5 Apr 2002 14:40:30 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 535D937B41A for ; Fri, 5 Apr 2002 14:40:29 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g35MeTQ10803 for perforce@freebsd.org; Fri, 5 Apr 2002 14:40:29 -0800 (PST) (envelope-from jake@freebsd.org) Date: Fri, 5 Apr 2002 14:40:29 -0800 (PST) Message-Id: <200204052240.g35MeTQ10803@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9140 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9140 Change 9140 by jake@jake_sparc64 on 2002/04/05 14:40:21 Don't need hot spare make variables. Affected files ... ... //depot/projects/sparc64/sys/boot/sparc64/boot1/Makefile#6 edit Differences ... ==== //depot/projects/sparc64/sys/boot/sparc64/boot1/Makefile#6 (text+ko) ==== @@ -7,13 +7,6 @@ BINDIR?= /boot BINMODE= 444 -PROG= boot1 -SRCS= _start.S boot1.c -NOMAN= -STRIP= -BINDIR?= /boot -BINMODE= 444 - BOOTBLOCKBASE= 0x4000 CFLAGS= -W -Wall -I../../ -I../../common/ -Os -ffreestanding -mno-app-regs \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 14:41:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75E6737B41F; Fri, 5 Apr 2002 14:41:32 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D4B4137B41E for ; Fri, 5 Apr 2002 14:41:31 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g35MfVe10904 for perforce@freebsd.org; Fri, 5 Apr 2002 14:41:31 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 5 Apr 2002 14:41:31 -0800 (PST) Message-Id: <200204052241.g35MfVe10904@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9141 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9141 Change 9141 by jhb@jhb_laptop on 2002/04/05 14:40:52 Integ from jhb_proc: use a proc pointer. Affected files ... ... //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#9 integrate Differences ... ==== //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#9 (text+ko) ==== @@ -163,7 +163,8 @@ off_t limit) { register struct ucred *cred = td->td_ucred; - register struct vmspace *vm = td->td_proc->p_vmspace; + struct proc *p = td->td_proc; + register struct vmspace *vm = p->p_vmspace; int error; #ifdef PECOFF_DEBUG struct vm_map *map; @@ -173,9 +174,9 @@ #endif if (ctob((UAREA_PAGES+KSTACK_PAGES) + vm->vm_dsize + vm->vm_ssize) >= limit) return (EFAULT); - PROC_LOCK(td->td_proc); - fill_kinfo_proc(td->td_proc, &td->td_proc->p_uarea->u_kproc); - PROC_UNLOCK(td-td_proc); + PROC_LOCK(p); + fill_kinfo_proc(p, &p->p_uarea->u_kproc); + PROC_UNLOCK(p); #if PECOFF_DEBUG fill_regs(td, ®s); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 14:59:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 830B437B405; Fri, 5 Apr 2002 14:59:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 08F1937B425 for ; Fri, 5 Apr 2002 14:59:02 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g35Mx1s13232 for perforce@freebsd.org; Fri, 5 Apr 2002 14:59:01 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 5 Apr 2002 14:59:01 -0800 (PST) Message-Id: <200204052259.g35Mx1s13232@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9146 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9146 Change 9146 by jhb@jhb_laptop on 2002/04/05 14:58:05 Merge from jhb_proc: remove a weird diagnostic leftover from KSE. Also, we don't need Giant for suser() now. Affected files ... ... //depot/projects/smpng/sys/kern/kern_acct.c#12 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_acct.c#12 (text+ko) ==== @@ -119,14 +119,12 @@ struct nameidata nd; int error, flags; - mtx_lock(&Giant); - if (td != curthread) - panic("acct"); /* XXXKSE DIAGNOSTIC */ /* Make sure that the caller is root. */ error = suser(td); if (error) - goto done2; + return (error); + mtx_lock(&Giant); /* * If accounting is to be started to a file, open that file for * writing and make sure it's a 'normal'. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 15: 1:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FFB337B41A; Fri, 5 Apr 2002 15:01:07 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 455DA37B41B for ; Fri, 5 Apr 2002 15:01:06 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g35N16K13505 for perforce@freebsd.org; Fri, 5 Apr 2002 15:01:06 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 5 Apr 2002 15:01:06 -0800 (PST) Message-Id: <200204052301.g35N16K13505@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9147 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9147 Change 9147 by jhb@jhb_laptop on 2002/04/05 15:00:57 Small Giant pushdown. Affected files ... ... //depot/projects/smpng/sys/kern/kern_exit.c#29 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_exit.c#29 (text+ko) ==== @@ -506,17 +506,15 @@ struct pargs *pa; int status, error; - mtx_lock(&Giant); q = td->td_proc; if (uap->pid == 0) { PROC_LOCK(q); uap->pid = -q->p_pgid; PROC_UNLOCK(q); } - if (uap->options &~ (WUNTRACED|WNOHANG|WLINUXCLONE)) { - error = EINVAL; - goto done2; - } + if (uap->options &~ (WUNTRACED|WNOHANG|WLINUXCLONE)) + return (EINVAL); + mtx_lock(&Giant); loop: nfound = 0; sx_slock(&proctree_lock); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 15: 6:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3561537B405; Fri, 5 Apr 2002 15:06:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 783E537B416 for ; Fri, 5 Apr 2002 15:06:14 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g35N6EC17698 for perforce@freebsd.org; Fri, 5 Apr 2002 15:06:14 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 5 Apr 2002 15:06:14 -0800 (PST) Message-Id: <200204052306.g35N6EC17698@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9148 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9148 Change 9148 by jhb@jhb_laptop on 2002/04/05 15:05:22 Whitespace fixes. Wrap long lines. Affected files ... ... //depot/projects/smpng/sys/kern/kern_fork.c#33 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_fork.c#33 (text+ko) ==== @@ -642,16 +642,20 @@ if (flags == (RFFDG | RFPROC)) { cnt.v_forks++; - cnt.v_forkpages += p2->p_vmspace->vm_dsize + p2->p_vmspace->vm_ssize; + cnt.v_forkpages += p2->p_vmspace->vm_dsize + + p2->p_vmspace->vm_ssize; } else if (flags == (RFFDG | RFPROC | RFPPWAIT | RFMEM)) { cnt.v_vforks++; - cnt.v_vforkpages += p2->p_vmspace->vm_dsize + p2->p_vmspace->vm_ssize; + cnt.v_vforkpages += p2->p_vmspace->vm_dsize + + p2->p_vmspace->vm_ssize; } else if (p1 == &proc0) { cnt.v_kthreads++; - cnt.v_kthreadpages += p2->p_vmspace->vm_dsize + p2->p_vmspace->vm_ssize; + cnt.v_kthreadpages += p2->p_vmspace->vm_dsize + + p2->p_vmspace->vm_ssize; } else { cnt.v_rforks++; - cnt.v_rforkpages += p2->p_vmspace->vm_dsize + p2->p_vmspace->vm_ssize; + cnt.v_rforkpages += p2->p_vmspace->vm_dsize + + p2->p_vmspace->vm_ssize; } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 15:14:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01DCF37B416; Fri, 5 Apr 2002 15:14:25 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 28C5D37B404 for ; Fri, 5 Apr 2002 15:14:25 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g35NEOb18822 for perforce@freebsd.org; Fri, 5 Apr 2002 15:14:24 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 5 Apr 2002 15:14:24 -0800 (PST) Message-Id: <200204052314.g35NEOb18822@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9150 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9150 Change 9150 by jhb@jhb_laptop on 2002/04/05 15:13:26 Change settime() to take a thread as the first argument and push down Giant in the clock_settime() syscall. Affected files ... ... //depot/projects/smpng/sys/kern/kern_time.c#10 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_time.c#10 (text+ko) ==== @@ -66,7 +66,7 @@ static int nanosleep1(struct thread *td, struct timespec *rqt, struct timespec *rmt); -static int settime(struct proc *, struct timeval *); +static int settime(struct thread *, struct timeval *); static void timevalfix(struct timeval *); static void no_lease_updatetime(int); @@ -79,8 +79,8 @@ void (*lease_updatetime)(int) = no_lease_updatetime; static int -settime(p, tv) - struct proc *p; +settime(td, tv) + struct thread *td; struct timeval *tv; { struct timeval delta, tv1, tv2; @@ -104,7 +104,7 @@ * than one second, nor more than once per second. This allows * a miscreant to make the clock march double-time, but no worse. */ - if (securelevel_gt(p->p_ucred, 1) != 0) { + if (securelevel_gt(td->td_ucred, 1) != 0) { if (delta.tv_sec < 0 || delta.tv_usec < 0) { /* * Update maxtime to latest time we've seen. @@ -186,23 +186,18 @@ struct timespec ats; int error; - mtx_lock(&Giant); if ((error = suser(td)) != 0) - goto done2; - if (SCARG(uap, clock_id) != CLOCK_REALTIME) { - error = EINVAL; - goto done2; - } + return (error); + if (SCARG(uap, clock_id) != CLOCK_REALTIME) + return (EINVAL); if ((error = copyin(SCARG(uap, tp), &ats, sizeof(ats))) != 0) - goto done2; - if (ats.tv_nsec < 0 || ats.tv_nsec >= 1000000000) { - error = EINVAL; - goto done2; - } + return (error); + if (ats.tv_nsec < 0 || ats.tv_nsec >= 1000000000) + return (EINVAL); /* XXX Don't convert nsec->usec and back */ TIMESPEC_TO_TIMEVAL(&atv, &ats); - error = settime(td->td_proc, &atv); -done2: + mtx_lock(&Giant); + error = settime(td, &atv); mtx_unlock(&Giant); return (error); } @@ -387,7 +382,7 @@ (error = copyin((caddr_t)uap->tzp, (caddr_t)&atz, sizeof(atz)))) { goto done2; } - if (uap->tv && (error = settime(td->td_proc, &atv))) + if (uap->tv && (error = settime(td, &atv))) goto done2; if (uap->tzp) tz = atz; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 15:17:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A54D337B41A; Fri, 5 Apr 2002 15:17:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0869E37B405 for ; Fri, 5 Apr 2002 15:17:33 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g35NHVJ19149 for perforce@freebsd.org; Fri, 5 Apr 2002 15:17:31 -0800 (PST) (envelope-from jhb@freebsd.org) Date: Fri, 5 Apr 2002 15:17:31 -0800 (PST) Message-Id: <200204052317.g35NHVJ19149@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9151 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9151 Change 9151 by jhb@jhb_laptop on 2002/04/05 15:16:36 Change prison_xinpcb() to take a thread as the first argument and use td_ucred appropriately. Affected files ... ... //depot/projects/smpng/sys/netinet/in_pcb.c#22 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.h#9 integrate ... //depot/projects/smpng/sys/netinet/ip_divert.c#12 integrate Differences ... ==== //depot/projects/smpng/sys/netinet/in_pcb.c#22 (text+ko) ==== @@ -1031,11 +1031,11 @@ } int -prison_xinpcb(struct proc *p, struct inpcb *inp) +prison_xinpcb(struct thread *td, struct inpcb *inp) { - if (!jailed(p->p_ucred)) + if (!jailed(td->td_ucred)) return (0); - if (ntohl(inp->inp_laddr.s_addr) == prison_getip(p->p_ucred)) + if (ntohl(inp->inp_laddr.s_addr) == prison_getip(td->td_ucred)) return (0); return (1); } ==== //depot/projects/smpng/sys/netinet/in_pcb.h#9 (text+ko) ==== @@ -329,7 +329,7 @@ int in_setpeeraddr(struct socket *so, struct sockaddr **nam); int in_setsockaddr(struct socket *so, struct sockaddr **nam); void in_pcbremlists(struct inpcb *inp); -int prison_xinpcb(struct proc *p, struct inpcb *inp); +int prison_xinpcb(struct thread *td, struct inpcb *inp); #endif /* _KERNEL */ #endif /* !_NETINET_IN_PCB_H_ */ ==== //depot/projects/smpng/sys/netinet/ip_divert.c#12 (text+ko) ==== @@ -487,8 +487,7 @@ s = splnet(); for (inp = LIST_FIRST(divcbinfo.listhead), i = 0; inp && i < n; inp = LIST_NEXT(inp, inp_list)) { - if (inp->inp_gencnt <= gencnt && !prison_xinpcb( - req->td->td_proc, inp)) + if (inp->inp_gencnt <= gencnt && !prison_xinpcb(req->td, inp)) inp_list[i++] = inp; } splx(s); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 16:25:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E117A37B416; Fri, 5 Apr 2002 16:25:02 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 62A0537B41D for ; Fri, 5 Apr 2002 16:24:59 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g360Oxa30624 for perforce@freebsd.org; Fri, 5 Apr 2002 16:24:59 -0800 (PST) (envelope-from jake@freebsd.org) Date: Fri, 5 Apr 2002 16:24:59 -0800 (PST) Message-Id: <200204060024.g360Oxa30624@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9154 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9154 Change 9154 by jake@jake_sparc64 on 2002/04/05 16:23:59 Reduce diffs. Affected files ... ... //depot/projects/sparc64/sys/dev/mk48txx/mk48txx.c#4 edit ... //depot/projects/sparc64/sys/dev/mk48txx/mk48txxreg.h#4 edit ... //depot/projects/sparc64/sys/kern/clock_if.m#3 edit ... //depot/projects/sparc64/sys/kern/subr_clock.c#5 edit ... //depot/projects/sparc64/sys/sparc64/include/asmacros.h#19 edit ... //depot/projects/sparc64/sys/sparc64/include/clock.h#8 edit ... //depot/projects/sparc64/sys/sparc64/include/eeprom.h#3 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/eeprom.c#4 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/eeprom_ebus.c#3 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/eeprom_sbus.c#3 edit ... //depot/projects/sparc64/sys/sys/clock.h#4 edit Differences ... ==== //depot/projects/sparc64/sys/dev/mk48txx/mk48txx.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ * * $NetBSD: mk48txx.c,v 1.7 2001/04/08 17:05:10 tsutsui Exp $ * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/mk48txx/mk48txx.c,v 1.1 2002/04/04 23:44:42 tmm Exp $ */ /* ==== //depot/projects/sparc64/sys/dev/mk48txx/mk48txxreg.h#4 (text+ko) ==== @@ -35,7 +35,7 @@ * * $NetBSD: mk48txxreg.h,v 1.4 2000/11/11 11:59:42 pk Exp $ * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/mk48txx/mk48txxreg.h,v 1.1 2002/04/04 23:44:42 tmm Exp $ */ /* ==== //depot/projects/sparc64/sys/kern/clock_if.m#3 (text+ko) ==== @@ -21,7 +21,7 @@ # 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. # -# $FreeBSD$ +# $FreeBSD: src/sys/kern/clock_if.m,v 1.1 2002/04/04 23:39:10 tmm Exp $ #include #include ==== //depot/projects/sparc64/sys/kern/subr_clock.c#5 (text+ko) ==== @@ -41,7 +41,7 @@ * and * from: src/sys/i386/isa/clock.c,v 1.176 2001/09/04 * - * $FreeBSD$ + * $FreeBSD: src/sys/kern/subr_clock.c,v 1.1 2002/04/04 23:39:10 tmm Exp $ */ /* ==== //depot/projects/sparc64/sys/sparc64/include/asmacros.h#19 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/asmacros.h,v 1.8 2002/01/08 04:34:20 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/asmacros.h,v 1.10 2002/03/13 06:04:36 jake Exp $ */ #ifndef _MACHINE_ASMACROS_H_ ==== //depot/projects/sparc64/sys/sparc64/include/clock.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/clock.h,v 1.3 2001/08/09 02:09:34 obrien Exp $ + * $FreeBSD: src/sys/sparc64/include/clock.h,v 1.4 2002/03/25 04:53:18 tmm Exp $ */ #ifndef _MACHINE_CLOCK_H_ ==== //depot/projects/sparc64/sys/sparc64/include/eeprom.h#3 (text+ko) ==== @@ -51,7 +51,7 @@ * from: @(#)clock.c 8.1 (Berkeley) 6/11/93 * from: NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp * - * $FreeBSD$ + * $FreeBSD: src/sys/sparc64/include/eeprom.h,v 1.1 2002/04/05 02:40:54 tmm Exp $ */ #ifndef _MACHINE_EEPROM_H_ ==== //depot/projects/sparc64/sys/sparc64/sparc64/eeprom.c#4 (text+ko) ==== @@ -51,7 +51,7 @@ * from: @(#)clock.c 8.1 (Berkeley) 6/11/93 * from: NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp * - * $FreeBSD$ + * $FreeBSD: src/sys/sparc64/sparc64/eeprom.c,v 1.1 2002/04/04 23:58:50 tmm Exp $ */ #include ==== //depot/projects/sparc64/sys/sparc64/sparc64/eeprom_ebus.c#3 (text+ko) ==== @@ -51,7 +51,7 @@ * from: @(#)clock.c 8.1 (Berkeley) 6/11/93 * from: NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp * - * $FreeBSD$ + * $FreeBSD: src/sys/sparc64/sparc64/eeprom_ebus.c,v 1.1 2002/04/04 23:58:50 tmm Exp $ */ #include ==== //depot/projects/sparc64/sys/sparc64/sparc64/eeprom_sbus.c#3 (text+ko) ==== @@ -51,7 +51,7 @@ * from: @(#)clock.c 8.1 (Berkeley) 6/11/93 * from: NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp * - * $FreeBSD$ + * $FreeBSD: src/sys/sparc64/sparc64/eeprom_sbus.c,v 1.1 2002/04/04 23:58:50 tmm Exp $ */ #include ==== //depot/projects/sparc64/sys/sys/clock.h#4 (text+ko) ==== @@ -35,7 +35,7 @@ * * $NetBSD: clock_subr.h,v 1.7 2000/10/03 13:41:07 tsutsui Exp $ * - * $FreeBSD$ + * $FreeBSD: src/sys/sys/clock.h,v 1.1 2002/04/04 23:39:08 tmm Exp $ */ #ifndef _SYS_CLOCK_H_ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 5 20: 7: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D92A37B41B; Fri, 5 Apr 2002 20:05:33 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B6D5437B419 for ; Fri, 5 Apr 2002 20:05:31 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3645Vs67658 for perforce@freebsd.org; Fri, 5 Apr 2002 20:05:31 -0800 (PST) (envelope-from peter@freebsd.org) Date: Fri, 5 Apr 2002 20:05:31 -0800 (PST) Message-Id: <200204060405.g3645Vs67658@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9162 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9162 Change 9162 by peter@peter_daintree on 2002/04/05 20:05:11 IFC @9160 Affected files ... ... //depot/projects/ia64/UPDATING#7 integrate ... //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#3 integrate ... //depot/projects/ia64/etc/defaults/rc.conf#7 integrate ... //depot/projects/ia64/etc/mail/Makefile#6 integrate ... //depot/projects/ia64/etc/mail/mailer.conf#2 integrate ... //depot/projects/ia64/etc/mtree/BSD.local.dist#6 integrate ... //depot/projects/ia64/etc/mtree/BSD.usr.dist#8 integrate ... //depot/projects/ia64/etc/rc#10 integrate ... //depot/projects/ia64/etc/sendmail/Makefile#4 integrate ... //depot/projects/ia64/etc/sendmail/rc.sendmail#1 branch ... //depot/projects/ia64/gnu/lib/csu/Makefile#2 integrate ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#5 integrate ... //depot/projects/ia64/lib/libc/sparc64/net/htonl.S#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/net/ntohl.S#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ssh/pam_ssh.c#7 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#5 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#17 integrate ... //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#8 integrate ... //depot/projects/ia64/sbin/atacontrol/atacontrol.c#5 integrate ... //depot/projects/ia64/share/colldef/Makefile#5 integrate ... //depot/projects/ia64/share/man/man5/rc.conf.5#12 integrate ... //depot/projects/ia64/share/man/man8/Makefile#4 integrate ... //depot/projects/ia64/share/man/man8/rc.sendmail.8#1 branch ... //depot/projects/ia64/share/man/man9/vm_page_hold.9#2 integrate ... //depot/projects/ia64/share/mklocale/Makefile#5 integrate ... //depot/projects/ia64/share/monetdef/Makefile#5 integrate ... //depot/projects/ia64/share/monetdef/pt_BR.ISO8859-1.src#1 branch ... //depot/projects/ia64/share/msgdef/Makefile#5 integrate ... //depot/projects/ia64/share/msgdef/ja_JP.SJIS.src#1 branch ... //depot/projects/ia64/share/numericdef/Makefile#5 integrate ... //depot/projects/ia64/share/numericdef/pt_BR.ISO8859-1.src#1 branch ... //depot/projects/ia64/share/timedef/Makefile#5 integrate ... //depot/projects/ia64/share/timedef/pt_BR.ISO8859-1.src#1 branch ... //depot/projects/ia64/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 integrate ... //depot/projects/ia64/sys/boot/efi/loader/Makefile#7 integrate ... //depot/projects/ia64/sys/conf/files.sparc64#9 integrate ... //depot/projects/ia64/sys/dev/aac/aac_pci.c#5 integrate ... //depot/projects/ia64/sys/dev/ata/ata-all.c#11 integrate ... //depot/projects/ia64/sys/dev/ata/ata-all.h#4 integrate ... //depot/projects/ia64/sys/dev/ata/ata-disk.c#7 integrate ... //depot/projects/ia64/sys/dev/ata/ata-disk.h#3 integrate ... //depot/projects/ia64/sys/dev/ata/ata-dma.c#9 integrate ... //depot/projects/ia64/sys/dev/ata/ata-isa.c#3 integrate ... //depot/projects/ia64/sys/dev/ata/ata-pci.c#9 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-all.c#5 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-all.h#3 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-cd.c#9 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-cd.h#4 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-fd.c#5 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-tape.c#6 integrate ... //depot/projects/ia64/sys/dev/em/if_em.c#4 integrate ... //depot/projects/ia64/sys/dev/em/if_em.h#3 integrate ... //depot/projects/ia64/sys/dev/em/if_em_fxhw.c#3 integrate ... //depot/projects/ia64/sys/dev/em/if_em_fxhw.h#3 integrate ... //depot/projects/ia64/sys/dev/em/if_em_osdep.h#3 integrate ... //depot/projects/ia64/sys/dev/em/if_em_phy.c#3 integrate ... //depot/projects/ia64/sys/dev/em/if_em_phy.h#3 integrate ... //depot/projects/ia64/sys/dev/pccard/pccarddevs#10 integrate ... //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#10 integrate ... //depot/projects/ia64/sys/dev/syscons/syscons.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/ohci.c#5 integrate ... //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#7 integrate ... //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate ... //depot/projects/ia64/sys/kern/subr_smp.c#7 integrate ... //depot/projects/ia64/sys/netinet/if_fddi.h#3 delete ... //depot/projects/ia64/sys/netinet6/nd6.c#4 integrate ... //depot/projects/ia64/sys/sparc64/include/eeprom.h#1 branch ... //depot/projects/ia64/sys/sys/ata.h#5 integrate ... //depot/projects/ia64/sys/sys/cdio.h#2 integrate ... //depot/projects/ia64/usr.bin/sed/process.c#4 integrate ... //depot/projects/ia64/usr.bin/sort/init.c#5 integrate ... //depot/projects/ia64/usr.bin/sort/sort.1#4 integrate ... //depot/projects/ia64/usr.bin/yacc/error.c#6 integrate ... //depot/projects/ia64/usr.bin/yacc/mkpar.c#6 integrate ... //depot/projects/ia64/usr.sbin/arp/arp.4#2 integrate ... //depot/projects/ia64/usr.sbin/burncd/burncd.c#4 integrate ... //depot/projects/ia64/usr.sbin/mailwrapper/Makefile#2 integrate ... //depot/projects/ia64/usr.sbin/pw/pw.8#3 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/config.c#3 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/menus.c#8 integrate Differences ... ==== //depot/projects/ia64/UPDATING#7 (text+ko) ==== @@ -23,6 +23,24 @@ integrity. Re-enabling write caching can substantially improve performance. +20020404: + New sendmail startup scripts have been installed to make it + easier to use alternative MTAs with FreeBSD. Setting the rc.conf + variable sendmail_enable to "NO" no longer prevents any sendmail + daemons from starting. Instead, either set sendmail_enable to + "NONE" or change mta_start_script to a script for starting + an alternative MTA. Setting mta_start_script to "" will + also prevent any MTA from being started at boot. + +20020404: + Due to the import of sendmail 8.12.2 (see 20020217 entry), a new + user and group are required in order for sendmail to run as a + set-group-ID binary. A 'make installworld' will use the new user + and group to set the owner and group of /var/spool/clientmqueue + and will fail if the new user and group do not exist. The 'smmsp' + user and group must be merged from src/etc/group and + src/etc/master.passwd before using 'make installworld'. + 20020315: FreeBSD 5.0 DP-1 was basically branched today. @@ -984,4 +1002,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.196 2002/03/18 04:52:24 imp Exp $ +$FreeBSD: src/UPDATING,v 1.197 2002/04/05 07:42:42 gshapiro Exp $ ==== //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.8 2002/02/17 22:06:57 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.10 2002/04/05 04:28:10 gshapiro Exp $ sendmail 8.12.2 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ @@ -32,5 +32,57 @@ All local changes should be submitted to the Sendmail Consortium for inclusion in the next vendor release. +The following files make up the sendmail build/install/runtime +infrastructure in FreeBSD: + + bin/Makefile + bin/rmail/Makefile + contrib/sendmail/ + etc/Makefile + etc/defaults/make.conf (RELENG_4) + etc/defaults/rc.conf + etc/mail/Makefile + etc/mail/README + etc/mail/access.sample + etc/mail/aliases + etc/mail/mailer.conf + etc/mail/mailertable.sample + etc/mail/virtusertable.sample + etc/mtree/BSD.include.dist + etc/mtree/BSD.usr.dist + etc/mtree/BSD.var.dist + etc/rc + etc/sendmail/Makefile + etc/sendmail/freebsd.mc + etc/sendmail/freefall.mc + etc/sendmail/rc.sendmail + lib/Makefile + lib/libmilter/Makefile + lib/libsm/Makefile + lib/libsmdb/Makefile + lib/libsmutil/Makefile + libexec/Makefile + libexec/mail.local/Makefile + libexec/smrsh/Makefile + share/Makefile + share/doc/smm/Makefile + share/doc/smm/08.sendmailop/Makefile + share/examples/etc/make.conf (HEAD) + share/man/man5/make.conf.5 + share/man/man5/rc.conf.5 + share/man/man8/Makefile + share/man/man8/rc.sendmail.8 + share/mk/bsd.libnames.mk + share/sendmail/Makefile + usr.bin/Makefile + usr.bin/vacation/Makefile + usr.sbin/Makefile + usr.sbin/editmap/Makefile + usr.sbin/mailstats/Makefile + usr.sbin/makemap/Makefile + usr.sbin/praliases/Makefile + usr.sbin/sendmail/Makefile + usr.sbin/mailwrapper/Makefile + gshapiro@FreeBSD.org 17-February-2002 ==== //depot/projects/ia64/etc/defaults/rc.conf#7 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.141 2002/03/28 03:29:20 gshapiro Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.142 2002/04/05 02:30:41 gshapiro Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -324,17 +324,12 @@ ############################################################## -### Miscellaneous administrative options ################### +### Mail Transfer Agent (MTA) options ###################### ############################################################## -cron_enable="YES" # Run the periodic job daemon. -cron_program="/usr/sbin/cron" # Which cron executable to run (if enabled). -cron_flags="" # Which options to pass to the cron daemon. -lpd_enable="NO" # Run the line printer daemon. -lpd_program="/usr/sbin/lpd" # path to lpd, if you want a different one. -lpd_flags="" # Flags to lpd (if enabled). -usbd_enable="NO" # Run the usbd daemon. -usbd_flags="" # Flags to usbd (if enabled). +mta_start_script="/etc/rc.sendmail" + # Script to start your chosen MTA, called by /etc/rc. +# Settings for /etc/rc.sendmail: sendmail_enable="NO" # Run the sendmail inbound daemon (YES/NO/NONE). # If NONE, don't start any sendmail processes. sendmail_flags="-L sm-mta -bd -q30m" # Flags to sendmail (as a server) @@ -346,6 +341,20 @@ sendmail_msp_queue_enable="YES" # Dequeue stuck clientmqueue mail (YES/NO). sendmail_msp_queue_flags="-L sm-msp-queue -Ac -q30m" # Flags for sendmail_msp_queue daemon. + + +############################################################## +### Miscellaneous administrative options ################### +############################################################## + +cron_enable="YES" # Run the periodic job daemon. +cron_program="/usr/sbin/cron" # Which cron executable to run (if enabled). +cron_flags="" # Which options to pass to the cron daemon. +lpd_enable="NO" # Run the line printer daemon. +lpd_program="/usr/sbin/lpd" # path to lpd, if you want a different one. +lpd_flags="" # Flags to lpd (if enabled). +usbd_enable="NO" # Run the usbd daemon. +usbd_flags="" # Flags to usbd (if enabled). dumpdev="NO" # Device name to crashdump to (or NO). dumpdir="/var/crash" # Directory where crash dumps are to be stored savecore_flags="" # Used if dumpdev is enabled above, and present. ==== //depot/projects/ia64/etc/mail/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/mail/Makefile,v 1.26 2002/04/04 07:42:12 ru Exp $ +# $FreeBSD: src/etc/mail/Makefile,v 1.27 2002/04/05 02:30:45 gshapiro Exp $ # # This Makefile provides an easy way to generate the configuration # file and database maps for the sendmail(8) daemon. @@ -12,13 +12,22 @@ # aliases - Build the sendmail aliases # install - Install the .cf file as /etc/mail/sendmail.cf # -# For the MTA daemon: -# start - Start the sendmail daemon with the flags defined in -# /etc/defaults/rc.conf or /etc/rc.conf -# stop - Stop the sendmail daemon -# restart - Restart the sendmail daemon +# For acting on both the MTA daemon and MSP queue running daemon: +# start - Start both the sendmail MTA daemon and MSP queue running +# daemon with the flags defined in /etc/defaults/rc.conf or +# /etc/rc.conf +# stop - Stop both the sendmail MTA daemon and MSP queue running +# daemon +# restart - Restart both the sendmail MTA daemon and MSP queue running +# daemon +# +# For acting on just the MTA daemon: +# start-mta - Start the sendmail MTA daemon with the flags defined in +# /etc/defaults/rc.conf or /etc/rc.conf +# stop-mta - Stop the sendmail MTA daemon +# restart-mta - Restart the sendmail MTA daemon # -# For the MSP queue running daemon: +# For acting on just the MSP queue running daemon: # start-mspq - Start the sendmail MSP queue running daemon with the # flags defined in /etc/defaults/rc.conf or /etc/rc.conf # stop-mspq - Stop the sendmail MSP queue running daemon @@ -70,10 +79,9 @@ .endif # -# The pid is used to stop and restart the running daemon. +# The sendmail startup script # -SENDMAIL_PIDFILE?= /var/run/sendmail.pid -SENDMAIL_MSPQ_PIDFILE?= /var/spool/clientmqueue/sm-client.pid +SENDMAIL_START_SCRIPT?= /etc/rc.sendmail # # Some useful programs we need. @@ -81,7 +89,6 @@ SENDMAIL?= /usr/sbin/sendmail MAKEMAP?= /usr/sbin/makemap M4?= /usr/bin/m4 -KILL?= /bin/kill # Set a reasonable default .MAIN: all @@ -172,65 +179,26 @@ ${INSTALL} -c -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf .endif -start: - @(. /etc/defaults/rc.conf; source_rc_confs; \ - case "$${sendmail_enable}" in \ - [Nn][Oo][Nn][Ee]) \ - echo "ERROR: sendmail_enable is set to $${sendmail_enable}" \ - ;; \ - [Yy][Ee][Ss]) \ - ${SENDMAIL} $${sendmail_flags}; \ - echo "${SENDMAIL} $${sendmail_flags}" \ - ;; \ - *) \ - case "$${sendmail_submit_enable}" in \ - [Yy][Ee][Ss]) \ - ${SENDMAIL} $${sendmail_submit_flags}; \ - echo "${SENDMAIL} $${sendmail_submit_flags}" \ - ;; \ - *) \ - case "$${sendmail_outbound_enable}" in \ - [Yy][Ee][Ss]) \ - ${SENDMAIL} $${sendmail_outbound_flags}; \ - echo "${SENDMAIL} $${sendmail_outbound_flags}" \ - ;; \ - esac \ - ;; \ - esac \ - ;; \ - esac \ - ) +start start-mta start-mspq: + @if [ -r ${SENDMAIL_START_SCRIPT} ]; then \ + echo -n 'Starting:'; \ + sh ${SENDMAIL_START_SCRIPT} $@; \ + echo '.'; \ + fi -stop: - ${KILL} -TERM `head -1 ${SENDMAIL_PIDFILE}` +stop stop-mta stop-mspq: + @if [ -r ${SENDMAIL_START_SCRIPT} ]; then \ + echo -n 'Stopping:'; \ + sh ${SENDMAIL_START_SCRIPT} $@; \ + echo '.'; \ + fi -restart: - ${KILL} -HUP `head -1 ${SENDMAIL_PIDFILE}` - -start-mspq: - @(. /etc/defaults/rc.conf; source_rc_confs; \ - case "$${sendmail_enable}" in \ - [Nn][Oo][Nn][Ee]) \ - echo "ERROR: sendmail_enable is set to $${sendmail_enable}" \ - ;; \ - *) \ - if [ -r /etc/mail/submit.cf ]; then \ - case "$${sendmail_msp_queue_enable}" in \ - [Yy][Ee][Ss]) \ - ${SENDMAIL} $${sendmail_msp_queue_flags}; \ - echo "${SENDMAIL} $${sendmail_msp_queue_flags}" \ - ;; \ - esac \ - fi \ - ;; \ - esac \ - ) - -stop-mspq: - ${KILL} -TERM `head -1 ${SENDMAIL_MSPQ_PIDFILE}` - -restart-mspq: - ${KILL} -HUP `head -1 ${SENDMAIL_MSPQ_PIDFILE}` +restart restart-mta restart-mspq: + @if [ -r ${SENDMAIL_START_SCRIPT} ]; then \ + echo -n 'Restarting:'; \ + sh ${SENDMAIL_START_SCRIPT} $@; \ + echo '.'; \ + fi # User defined targets .if exists(Makefile.local) ==== //depot/projects/ia64/etc/mail/mailer.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mail/mailer.conf,v 1.2 1999/12/29 18:24:06 peter Exp $ +# $FreeBSD: src/etc/mail/mailer.conf,v 1.3 2002/04/05 04:25:12 gshapiro Exp $ # # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail # @@ -6,3 +6,5 @@ send-mail /usr/libexec/sendmail/sendmail mailq /usr/libexec/sendmail/sendmail newaliases /usr/libexec/sendmail/sendmail +hoststat /usr/libexec/sendmail/sendmail +purgestat /usr/libexec/sendmail/sendmail ==== //depot/projects/ia64/etc/mtree/BSD.local.dist#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.88 2002/03/16 21:37:56 markm Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.89 2002/04/05 14:58:03 phantom Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -371,6 +371,8 @@ .. pl_PL.ISO8859-2 .. + pt_BR.ISO8859-1 + .. pt_PT.ISO8859-1 .. pt_PT.ISO8859-15 ==== //depot/projects/ia64/etc/mtree/BSD.usr.dist#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.255 2002/03/16 21:37:56 markm Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.256 2002/04/05 14:58:03 phantom Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -617,6 +617,8 @@ .. pl_PL.ISO8859-2 .. + pt_BR.ISO8859-1 + .. pt_PT.ISO8859-1 .. pt_PT.ISO8859-15 @@ -935,6 +937,8 @@ .. pl_PL.ISO8859-2 .. + pt_BR.ISO8859-1 + .. pt_PT.ISO8859-1 .. pt_PT.ISO8859-15 ==== //depot/projects/ia64/etc/rc#10 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.307 2002/03/28 03:29:18 gshapiro Exp $ +# $FreeBSD: src/etc/rc,v 1.308 2002/04/05 02:30:40 gshapiro Exp $ # # System startup script run by init on autoboot @@ -702,44 +702,10 @@ ;; esac -# Note: Please keep the sendmail startup code here in sync with the code -# in src/etc/mail/Makefile. -case ${sendmail_enable} in -[Nn][Oo][Nn][Ee]) - ;; -[Yy][Ee][Ss]) - echo -n ' sendmail' - /usr/sbin/sendmail ${sendmail_flags} - ;; -*) - case ${sendmail_submit_enable} in - [Yy][Ee][Ss]) - echo -n ' sendmail-submit' - /usr/sbin/sendmail ${sendmail_submit_flags} - ;; - *) - case ${sendmail_outbound_enable} in - [Yy][Ee][Ss]) - echo -n ' sendmail-outbound' - /usr/sbin/sendmail ${sendmail_outbound_flags} - ;; - esac - ;; - esac - ;; -esac - -case ${sendmail_enable} in -[Nn][Oo][Nn][Ee]) - ;; -*) - if [ -r /etc/mail/submit.cf ]; then - case ${sendmail_msp_queue_enable} in - [Yy][Ee][Ss]) - echo -n ' sendmail-clientmqueue' - /usr/sbin/sendmail ${sendmail_msp_queue_flags} - ;; - esac +case ${mta_start_script} in +/*) + if [ -r ${mta_start_script} ]; then + sh ${mta_start_script} fi ;; esac ==== //depot/projects/ia64/etc/sendmail/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.19 (Berkeley) 1/14/97 -# $FreeBSD: src/etc/sendmail/Makefile,v 1.15 2002/02/24 02:38:23 gshapiro Exp $ +# $FreeBSD: src/etc/sendmail/Makefile,v 1.16 2002/04/05 02:30:46 gshapiro Exp $ M4= m4 CHMOD= chmod @@ -82,6 +82,8 @@ @echo ">>> ERROR: Both SENDMAIL_CF and SENDMAIL_MC can not be set" @false .endif + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/rc.sendmail \ + ${DESTDIR}/etc ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/freebsd.mc \ ${DESTDIR}/etc/mail/freebsd.mc ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ ==== //depot/projects/ia64/gnu/lib/csu/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.3 2001/10/04 14:13:16 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.4 2002/04/05 08:53:35 obrien Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc.295 @@ -16,11 +16,7 @@ CFLAGS+= -I${GCCDIR}/config -I. -DIN_GCC \ -finhibit-size-directive -fno-inline-functions \ -fno-exceptions -fno-omit-frame-pointer -NOMAN= true -NOPIC= true -NOPROFILE= true INTERNALLIB= true -CLEANFILES+= tm.h CRTS_CFLAGS= -DCRTSTUFFS_O ${PICFLAG} @@ -35,7 +31,7 @@ ln -sf ${.ALLSRC} ${.TARGET} .endfor .else -crtbegin.o crtbegin.So crtend.o crtend.So: crtstuff.c tm.h +crtbegin.o crtbegin.So crtend.o crtend.So: ${SRCS} .endif crtbegin.o: @@ -54,6 +50,7 @@ ${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \ -c -o ${.TARGET} ${UGLYHACK} ${.ALLSRC:N*.h} +CLEANFILES+= tm.h # KEEP THIS IN SYNC with src/gnu/usr.bin/cc/cc_tools/Makefile !! tm.h: echo '#include "${MACHINE_ARCH}/${MACHINE_ARCH}.h"' > ${.TARGET} ==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.34 2001/01/06 06:16:25 obrien Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.35 2002/04/05 09:12:25 obrien Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc.295 @@ -63,7 +63,6 @@ CFLAGS+= -fexceptions CFLAGS+= -DIN_GCC .if ${OBJFORMAT} != aout -#CFLAGS+= -D_PTHREADS -fPIC -DGTHREAD_USE_WEAK CFLAGS+= -D_PTHREADS -DGTHREAD_USE_WEAK .endif CXXFLAGS+= -I${GCCDIR}/cp/inc @@ -86,7 +85,7 @@ NEW1POBJS= ${NEW1FUNCS:S/$/.po/} NEW2POBJS= ${NEW2FUNCS:S/$/.po/} -OBJS= ${LIB1OBJS} ${LIB2OBJS} ${NEW1OBJS} ${NEW2OBJS} +OBJS= ${LIB1OBJS} ${LIB2OBJS} ${NEW1OBJS} ${NEW2OBJS} config.h: echo '#include <${MACHINE_ARCH}/xm-${MACHINE_ARCH}.h>' > ${.TARGET} @@ -132,22 +131,22 @@ .if !defined(NOPIC) ${LIB1SOBJS}: libgcc1.c - ${CC} -c -fpic ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} + ${CC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} ${LIB2SOBJS}: libgcc2.c - ${XCC} -c -fpic ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} + ${XCC} -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.c} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} ${NEW1SOBJS}: new1.cc - ${XCXX} -c -fpic ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc} + ${XCXX} -c ${PICFLAG} ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} ${NEW2SOBJS}: new2.cc - ${CXX} -c -fpic ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc} + ${CXX} -c ${PICFLAG} ${CXXFLAGS} -DL${.PREFIX} -o ${.TARGET} ${.ALLSRC:M*.cc} @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} @mv ${.TARGET}.tmp ${.TARGET} .endif ==== //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.55 2002/04/04 18:24:56 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.56 2002/04/05 10:23:19 obrien Exp $ # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk @@ -12,6 +12,7 @@ # aliases of generated headers. CFLAGS+= -I. +CFLAGS+= -static .include "../Makefile.inc" @@ -33,8 +34,8 @@ .for F in attr codes config emit extract flags opinit output peep recog build-tools: gen$F -gen$F: gen$F.o rtl.o obstack.o print-rtl.o bitmap.o - ${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} +gen$F: gen$F.o rtl.o print-rtl.o obstack.o bitmap.o + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} GENSRCS+= gen$F.c CLEANFILES+= gen$F @@ -44,7 +45,7 @@ build-tools: gen$F gen$F: gen$F.o rtl.o rtlanal.o print-rtl.o obstack.o bitmap.o - ${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} GENSRCS+= gen$F.c CLEANFILES+= gen$F @@ -56,7 +57,7 @@ build-tools: gen$F gen$F: gen$F.o - ${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} GENSRCS+= gen$F.c CLEANFILES+= gen$F ==== //depot/projects/ia64/lib/libc/sparc64/net/htonl.S#3 (text+ko) ==== @@ -49,7 +49,7 @@ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$FreeBSD: src/lib/libc/sparc64/net/htonl.S,v 1.2 2002/02/18 20:35:18 mike Exp $" + .asciz "$FreeBSD: src/lib/libc/sparc64/net/htonl.S,v 1.3 2002/04/06 00:07:15 tmm Exp $" #endif /* SYSLIBC_RCS and not lint */ /* netorder = htonl(hostorder) */ @@ -57,5 +57,5 @@ .set CNAME(htonl),CNAME(__htonl) ENTRY(__htonl) retl - srl %o0, 0, %o0 /* zero extend -- or do we sign extend? */ + srl %o0, 0, %o0 /* zero extend */ END(__htonl) ==== //depot/projects/ia64/lib/libc/sparc64/net/ntohl.S#3 (text+ko) ==== @@ -49,7 +49,7 @@ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$FreeBSD: src/lib/libc/sparc64/net/ntohl.S,v 1.2 2002/02/18 20:35:18 mike Exp $" + .asciz "$FreeBSD: src/lib/libc/sparc64/net/ntohl.S,v 1.3 2002/04/06 00:07:15 tmm Exp $" #endif /* SYSLIBC_RCS and not lint */ /* hostorder = ntohl(netorder) */ @@ -57,5 +57,5 @@ .set CNAME(ntohl),CNAME(__ntohl) ENTRY(__ntohl) retl - signx %o0, %o0 + srl %o0, 0, %o0 /* zero extend */ END(__ntohl) ==== //depot/projects/ia64/lib/libpam/modules/pam_ssh/pam_ssh.c#7 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.29 2002/04/04 18:45:21 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.31 2002/04/05 20:00:05 des Exp $"); #include #include @@ -282,7 +282,7 @@ /* pass prompt message to application and receive passphrase */ - if ((retval = pam_get_pass(pamh, &pass, NEED_PASSPHRASE, options)) + if ((retval = pam_get_authtok(pamh, &pass, NEED_PASSPHRASE)) != PAM_SUCCESS) return retval; @@ -303,6 +303,7 @@ if (auth_via_key(pamh, file, dotdir, pwent, pass) == PAM_SUCCESS) authenticated++; + free(dotdir); free(keyfiles); if (!authenticated) return PAM_AUTH_ERR; @@ -346,6 +347,7 @@ int no_link; /* link per-agent file? */ char *per_agent; /* to store env */ char *per_session; /* per-session filename */ + char *agent_pid; /* agent pid */ const struct passwd *pwent; /* user's passwd entry */ int retval; /* from calls */ uid_t saved_uid; /* caller's uid */ @@ -416,7 +418,6 @@ SSH_AGENT); if (env_write >= 0) (void) close(env_write); - free(per_agent); return PAM_SESSION_ERR; } } @@ -448,7 +449,6 @@ (void) close(env_write); if (agent_socket) free(agent_socket); - free(per_agent); return PAM_SERVICE_ERR; } @@ -470,12 +470,12 @@ (void) close(env_write); if (agent_socket) free(agent_socket); - free(per_agent); return PAM_SERVICE_ERR; } else if (strcmp(&env_string[strlen(env_string) - strlen(ENV_PID_SUFFIX)], ENV_PID_SUFFIX) == 0 && + ((agent_pid = strdup(env_value)) == NULL || (retval = pam_set_data(pamh, "ssh_agent_pid", - env_value, ssh_cleanup)) != PAM_SUCCESS) { + agent_pid, ssh_cleanup)) != PAM_SUCCESS)) { if (start_agent) (void) pclose(env_read); else @@ -484,7 +484,8 @@ (void) close(env_write); if (agent_socket) free(agent_socket); - free(per_agent); + if (agent_pid) + free(agent_pid); return retval; } @@ -499,7 +500,6 @@ SSH_AGENT); if (agent_socket) free(agent_socket); - free(per_agent); return PAM_SESSION_ERR; case 0: break; @@ -508,7 +508,6 @@ MODULE_NAME, SSH_AGENT); if (agent_socket) free(agent_socket); - free(per_agent); return PAM_SESSION_ERR; default: openpam_log(PAM_LOG_ERROR, "%s: %s exited %s %d", @@ -518,22 +517,17 @@ WTERMSIG(retval) : WEXITSTATUS(retval)); if (agent_socket) free(agent_socket); - free(per_agent); return PAM_SESSION_ERR; } } else (void) fclose(env_read); - if (!agent_socket) { - free(per_agent); + if (!agent_socket) return PAM_SESSION_ERR; - } if (start_agent && (retval = add_keys(pamh, agent_socket)) - != PAM_SUCCESS) { - free(per_agent); + != PAM_SUCCESS) return retval; - } free(agent_socket); /* if we couldn't access the per-agent file, don't link a @@ -546,14 +540,11 @@ well as the hostname */ if ((retval = pam_get_item(pamh, PAM_TTY, (const void **)&tty)) - != PAM_SUCCESS) { - free(per_agent); + != PAM_SUCCESS) return retval; - } if (asprintf(&per_session, "%s/.ssh/agent-%s-%s", pwent->pw_dir, hname, tty) == -1) { openpam_log(PAM_LOG_ERROR, "%s: %m", MODULE_NAME); - free(per_agent); return PAM_SERVICE_ERR; } @@ -563,14 +554,11 @@ if ((retval = pam_set_data(pamh, "ssh_agent_env_session", per_session, ssh_cleanup)) != PAM_SUCCESS) { free(per_session); - free(per_agent); return retval; } (void) unlink(per_session); /* remove cruft */ (void) link(per_agent, per_session); - free(per_agent); - free(per_session); return PAM_SUCCESS; } ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ ;-;.;<'.>;/;\ # digits 0;...;9;\ -# symbols - .;\,;\;;?;!;:;';`;\";\ - <-->;-;|;/;\\;\(;\);[;];\<;>;\{;\};\ - &;;%;;;\ - _;=;^;<-:>;+;<*X>;*;;~;;;\ - <'.>;<''>;<'<>;<'(>;<':>;<'">;<',>;<';>;\ -# controls - ;...;;
;;...; +# + :;\;;\<;=;>;?;;;\ +# capital + (A,,>,,,);\ + B;(C,,,);(D,,);(E,,,,);\ + F;G;H;\ + {CH,Ch};\ + (I,,>);\ + J;K;(L,,,);M;(N,,);(O,,>,,);\ + P;Q;(R,,);(S,,,);(T,,);\ + (U,,,,);\ + V;W;X;(Y,);(Z,,,);\ +# + [;\\;];^;<':>;<'">;<'<>;<'(>;_;<''>;`;\ +# small + (a,,>,,,);\ + b;(c,,,);(d,,);(e,,,,);\ + f;g;h;\ + ch;\ + (i,,>);\ + j;k;(l,,,);m;(n,,);(o,,>,,);\ + p;q;(r,,);(s,,,);(t,,);\ + (u,,,,);\ + v;w;x;(y,);(z,,,);\ +# + \{;|;\};~;;
==== //depot/projects/ia64/sys/kern/vfs_aio.c#8 (text+ko) ==== @@ -13,7 +13,7 @@ * bad that happens because of using this software isn't the responsibility * of the author. This software is distributed AS-IS. * - * $FreeBSD: src/sys/kern/vfs_aio.c,v 1.121 2002/04/04 02:13:20 alc Exp $ + * $FreeBSD: src/sys/kern/vfs_aio.c,v 1.122 2002/04/07 01:28:34 alc Exp $ */ /* @@ -1594,7 +1594,7 @@ { struct proc *p = td->td_proc; int s; - int jobref; + long jobref; struct aiocblist *cb, *ncb; struct aiocb *ujob; struct kaioinfo *ki; @@ -1664,7 +1664,7 @@ int i; int njoblist; int error, s, timo; - int *ijoblist; + long *ijoblist; struct aiocb **ujoblist; if (uap->nent > AIO_LISTIO_MAX) @@ -1890,7 +1890,7 @@ int s; struct aiocblist *cb; struct kaioinfo *ki; - int jobref; + long jobref; ki = p->p_aioinfo; if (ki == NULL) ==== //depot/projects/ia64/usr.bin/sed/process.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/sed/process.c,v 1.14 2002/04/05 05:40:20 jmallett Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/sed/process.c,v 1.15 2002/04/07 02:29:56 jmallett Exp $"); #ifndef lint static const char sccsid[] = "@(#)process.c 8.6 (Berkeley) 4/20/94"; @@ -136,7 +136,8 @@ case 'D': if (pd) goto new; - if ((p = memchr(ps, '\n', psl - 1)) == NULL) { + if (psl == 0 || + (p = memchr(ps, '\n', psl - 1)) == NULL) { pd = 1; goto new; } else { @@ -188,7 +189,8 @@ case 'P': if (pd) break; - if ((p = memchr(ps, '\n', psl - 1)) != NULL) { + if (psl != 0 && + (p = memchr(ps, '\n', psl - 1)) != NULL) { oldpsl = psl; psl = (p + 1) - ps; } @@ -240,7 +242,7 @@ HS = tspace; break; case 'y': - if (pd) + if (pd || psl == 0) break; for (p = ps, len = psl; --len; ++p) *p = cp->u.y[(unsigned char)*p]; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 6 20:54:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C0AD37B405; Sat, 6 Apr 2002 20:54:26 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 35FB937B419 for ; Sat, 6 Apr 2002 20:54:25 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g374sOk75927 for perforce@freebsd.org; Sat, 6 Apr 2002 20:54:25 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 6 Apr 2002 20:54:25 -0800 (PST) Message-Id: <200204070454.g374sOk75927@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9258 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9258 Change 9258 by peter@peter_daintree on 2002/04/06 20:53:49 IFC @9257 Affected files ... ... //depot/projects/ia64/libexec/rtld-elf/ia64/reloc.c#3 integrate ... //depot/projects/ia64/sys/boot/efi/loader/Makefile#12 integrate ... //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#9 integrate ... //depot/projects/ia64/sys/conf/Makefile.ia64#11 integrate ... //depot/projects/ia64/sys/ia64/conf/GENERIC#8 integrate ... //depot/projects/ia64/sys/sys/ucred.h#5 integrate Differences ... ==== //depot/projects/ia64/libexec/rtld-elf/ia64/reloc.c#3 (text+ko) ==== @@ -22,7 +22,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/libexec/rtld-elf/ia64/reloc.c,v 1.2 2001/10/29 10:10:10 peter Exp $ + * $FreeBSD: src/libexec/rtld-elf/ia64/reloc.c,v 1.3 2002/04/07 04:16:35 peter Exp $ */ /* ==== //depot/projects/ia64/sys/boot/efi/loader/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.14 2002/04/06 04:29:36 peter Exp $ +# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.17 2002/04/07 04:27:50 peter Exp $ .PATH: ${.CURDIR}/../common @@ -6,7 +6,8 @@ PROG= ${BASE}.efi NOMAN= NEWVERSWHAT= "EFI boot" ${MACHINE_ARCH} -STRIP= #do not strip PE loader.efi +BINDIR?= /boot +STRIP= # We must not strip loader.efi at install time. SRCS+= main.c conf.c dev_net.c ==== //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#9 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.7 2002/04/06 04:33:53 peter Exp $ +# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.8 2002/04/07 04:26:42 peter Exp $ .PATH: ${.CURDIR}/../common PROG= skiload NOMAN= NEWVERSWHAT= "ia64 SKI boot" ${MACHINE_ARCH} +BINDIR?= /boot SRCS+= main.c conf.c ==== //depot/projects/ia64/sys/conf/Makefile.ia64#11 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.48 2002/03/24 17:45:46 obrien Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.49 2002/04/07 04:34:21 peter Exp $ # # Makefile for FreeBSD # ==== //depot/projects/ia64/sys/ia64/conf/GENERIC#8 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.27 2002/04/03 10:56:57 ru Exp $ +# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.28 2002/04/07 04:36:02 peter Exp $ machine ia64 cpu ITANIUM ==== //depot/projects/ia64/sys/sys/ucred.h#5 (text+ko) ==== @@ -31,16 +31,12 @@ * SUCH DAMAGE. * * @(#)ucred.h 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/ucred.h,v 1.33 2002/04/01 21:31:11 jhb Exp $ + * $FreeBSD: src/sys/sys/ucred.h,v 1.34 2002/04/07 03:59:31 dd Exp $ */ #ifndef _SYS_UCRED_H_ #define _SYS_UCRED_H_ -#include -#include -#include - /* * Credentials. * @@ -61,16 +57,13 @@ struct uidinfo *cr_ruidinfo; /* per ruid resource consumption */ struct prison *cr_prison; /* jail(4) */ #define cr_endcopy cr_mtxp - struct mtx *cr_mtxp; /* protect refcount */ + struct mtx *cr_mtxp; /* protect refcount */ }; -#define cr_gid cr_groups[0] #define NOCRED ((struct ucred *)0) /* no credential available */ #define FSCRED ((struct ucred *)-1) /* filesystem credential */ /* - * This is the external representation of struct ucred, based upon the - * size of a 4.2-RELEASE struct ucred. There will probably never be - * any need to change the size of this or layout of its used fields. + * This is the external representation of struct ucred. */ struct xucred { u_int cr_version; /* structure layout version */ @@ -81,7 +74,11 @@ }; #define XUCRED_VERSION 0 +/* This can be used for both ucred and xucred structures. */ +#define cr_gid cr_groups[0] + #ifdef _KERNEL +struct thread; #ifdef DIAGNOSTIC void cred_free_thread(struct thread *td); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 6 20:58:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC3C037B417; Sat, 6 Apr 2002 20:58:31 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C711537B416 for ; Sat, 6 Apr 2002 20:58:30 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g374wUU76548 for perforce@freebsd.org; Sat, 6 Apr 2002 20:58:30 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 6 Apr 2002 20:58:30 -0800 (PST) Message-Id: <200204070458.g374wUU76548@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9260 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9260 Change 9260 by peter@peter_thunder on 2002/04/06 20:57:40 revert unneeded change Affected files ... ... //depot/projects/ia64/Makefile.inc1#16 edit Differences ... ==== //depot/projects/ia64/Makefile.inc1#16 (text+ko) ==== @@ -83,7 +83,7 @@ .if exists(${.CURDIR}/share) && !defined(NOSHARE) SUBDIR+= share .endif -.if exists(${.CURDIR}/sys) && !defined(NOSYS) +.if exists(${.CURDIR}/sys) SUBDIR+= sys .endif .if exists(${.CURDIR}/usr.bin) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 6 21: 1:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B678C37B41C; Sat, 6 Apr 2002 21:01:35 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E325537B405 for ; Sat, 6 Apr 2002 21:01:34 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3751Y377007 for perforce@freebsd.org; Sat, 6 Apr 2002 21:01:34 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 6 Apr 2002 21:01:34 -0800 (PST) Message-Id: <200204070501.g3751Y377007@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9261 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9261 Change 9261 by peter@peter_thunder on 2002/04/06 21:01:06 revert change done differently in cvs. Affected files ... ... //depot/projects/ia64/sys/boot/efi/Makefile.inc#6 edit ... //depot/projects/ia64/sys/boot/ia64/Makefile.inc#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/Makefile.inc#6 (text+ko) ==== @@ -2,5 +2,3 @@ # Options used when building app-specific efi components CFLAGS+= -ffreestanding - -BINDIR?= /boot ==== //depot/projects/ia64/sys/boot/ia64/Makefile.inc#3 (text+ko) ==== @@ -2,5 +2,3 @@ # Options used when building standalone components CFLAGS+= -ffreestanding - -BINDIR?= /boot To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 6 21: 3:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BB6037B416; Sat, 6 Apr 2002 21:03:38 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C5AD137B405 for ; Sat, 6 Apr 2002 21:03:37 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3753bl77355 for perforce@freebsd.org; Sat, 6 Apr 2002 21:03:37 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 6 Apr 2002 21:03:37 -0800 (PST) Message-Id: <200204070503.g3753bl77355@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9262 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9262 Change 9262 by peter@peter_thunder on 2002/04/06 21:03:24 revert to cvs version now that hints etc work Affected files ... ... //depot/projects/ia64/sys/ia64/conf/GENERIC#9 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/GENERIC#9 (text+ko) ==== @@ -27,7 +27,7 @@ maxusers 0 #To statically compile in device wiring instead of /boot/device.hints -hints "GENERIC.hints" +#hints "GENERIC.hints" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions NO_CPU_COPTFLAGS=true #Ignore any x86 CPUTYPE @@ -58,7 +58,6 @@ # SMP options SMP - # Debugging for use in -current options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 6 21: 4:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4873137B419; Sat, 6 Apr 2002 21:04:40 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 75F3637B405 for ; Sat, 6 Apr 2002 21:04:39 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3754dF77478 for perforce@freebsd.org; Sat, 6 Apr 2002 21:04:39 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 6 Apr 2002 21:04:39 -0800 (PST) Message-Id: <200204070504.g3754dF77478@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9263 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9263 Change 9263 by peter@peter_thunder on 2002/04/06 21:04:17 xlint excluded elsewhere in cvs Affected files ... ... //depot/projects/ia64/usr.bin/Makefile#15 edit Differences ... ==== //depot/projects/ia64/usr.bin/Makefile#15 (text+ko) ==== @@ -194,10 +194,6 @@ ypmatch \ ypwhich -.if !defined(NO_LINT) -SUBDIR+=xlint -.endif - .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../kerberosIV) && !exists(${.CURDIR}/../secure)) || \ defined(NOCRYPT) || (defined(NOSECURE) && !defined(MAKE_KERBEROS4)) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 6 22:57:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A40D37B419; Sat, 6 Apr 2002 22:57:03 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3A15237B416 for ; Sat, 6 Apr 2002 22:57:02 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g376v2C97116 for perforce@freebsd.org; Sat, 6 Apr 2002 22:57:02 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sat, 6 Apr 2002 22:57:02 -0800 (PST) Message-Id: <200204070657.g376v2C97116@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9267 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9267 Change 9267 by peter@peter_daintree on 2002/04/06 22:56:17 IFC @9266 Affected files ... ... //depot/projects/ia64/bin/ps/ps.c#4 integrate ... //depot/projects/ia64/lib/libkvm/kvm_proc.c#5 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_krb5/Makefile#3 integrate ... //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#9 integrate ... //depot/projects/ia64/sbin/fsck_ffs/setup.c#5 integrate ... //depot/projects/ia64/usr.bin/xlint/xlint/xlint.c#6 integrate ... //depot/projects/ia64/usr.sbin/lpr/lpd/printjob.c#3 integrate Differences ... ==== //depot/projects/ia64/bin/ps/ps.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.49 2002/02/21 18:27:16 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.50 2002/04/07 04:59:13 jedgar Exp $"); #ifndef lint static const char copyright[] = @@ -308,7 +308,7 @@ /* XXX - should be cleaner */ if (!all && ttydev == NODEV && pid == -1 && !nuids) { if ((uids = malloc(sizeof (*uids))) == NULL) - errx(1, "malloc: %s", strerror(errno)); + err(1, "malloc"); nuids = 1; *uids = getuid(); } @@ -421,7 +421,7 @@ moreuids = realloc(uids, alloc * sizeof (*uids)); if (moreuids == NULL) { free(uids); - errx(1, "realloc: %s", strerror(errno)); + err(1, "realloc"); } uids = moreuids; } ==== //depot/projects/ia64/lib/libkvm/kvm_proc.c#5 (text+ko) ==== @@ -34,11 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.45 2002/03/21 23:38:09 obrien Exp $ + * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.46 2002/04/07 04:47:58 dd Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.45 2002/03/21 23:38:09 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.46 2002/04/07 04:47:58 dd Exp $"); #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93"; @@ -409,6 +409,25 @@ _kvm_syserr(kd, kd->program, "kvm_getprocs"); return (0); } + /* + * We can't continue with a size of 0 because we pass + * it to realloc() (via _kvm_realloc()), and passing 0 + * to realloc() results in undefined behavior. + */ + if (size == 0) { + /* + * XXX: We should probably return an invalid, + * but non-NULL, pointer here so any client + * program trying to dereference it will + * crash. However, _kvm_freeprocs() calls + * free() on kd->procbase if it isn't NULL, + * and free()'ing a junk pointer isn't good. + * Then again, _kvm_freeprocs() isn't used + * anywhere . . . + */ + kd->procbase = _kvm_malloc(kd, 1); + goto liveout; + } do { size += size / 10; kd->procbase = (struct kinfo_proc *) @@ -422,6 +441,12 @@ _kvm_syserr(kd, kd->program, "kvm_getprocs"); return (0); } + /* + * We have to check the size again because sysctl() + * may "round up" oldlenp if oldp is NULL; hence it + * might've told us that there was data to get when + * there really isn't any. + */ if (size > 0 && kd->procbase->ki_structsize != sizeof(struct kinfo_proc)) { _kvm_err(kd, kd->program, @@ -430,6 +455,7 @@ kd->procbase->ki_structsize); return (0); } +liveout: nprocs = size == 0 ? 0 : size / kd->procbase->ki_structsize; } else { struct nlist nl[4], *p; ==== //depot/projects/ia64/lib/libpam/modules/pam_krb5/Makefile#3 (text+ko) ==== @@ -22,11 +22,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_krb5/Makefile,v 1.6 2002/03/05 21:56:14 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_krb5/Makefile,v 1.7 2002/04/07 04:44:16 des Exp $ LIB= pam_krb5 SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_krb5.c +NO_WERROR= yes DPADD= ${LIBKRB5} ${LIBGSSAPI} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} ${LIBROKEN} LDADD= -lkrb5 -lgssapi -lasn1 -lcrypto -lcrypt -lcom_err \ ==== //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#9 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.26 2002/04/06 01:24:58 murray Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.27 2002/04/07 06:03:33 murray Exp $ # # MAINTAINER: jkh # @@ -150,6 +150,8 @@ ## Start of set for CDROM #3 CDROM_SET_3="${CDROM_SET_3} editors/xemacs21" +CDROM_SET_3="${CDROM_SET_3} net/cvsup-without-gui" +CDROM_SET_3="${CDROM_SET_3} print/acroread4" CDROM_SET_3="${CDROM_SET_3} print/teTeX" CDROM_SET_3="${CDROM_SET_3} textproc/docproj" ==== //depot/projects/ia64/sbin/fsck_ffs/setup.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.29 2002/03/20 22:57:09 imp Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.30 2002/04/07 05:16:33 mckusick Exp $"; #endif /* not lint */ #define DKTYPENAMES @@ -376,9 +376,6 @@ { badsb(listerr, "NCG OUT OF RANGE"); return (0); } if (sblock.fs_cpg < 1) { badsb(listerr, "CPG OUT OF RANGE"); return (0); } - if (sblock.fs_ncg * sblock.fs_cpg < sblock.fs_ncyl || - (sblock.fs_ncg - 1) * sblock.fs_cpg >= sblock.fs_ncyl) - { badsb(listerr, "NCYL LESS THAN NCG*CPG"); return (0); } if (sblock.fs_sbsize > SBSIZE) { badsb(listerr, "SIZE PREPOSTEROUSLY LARGE"); return (0); } /* @@ -394,69 +391,36 @@ return (1); } /* - * Set all possible fields that could differ, then do check - * of whole super block against an alternate super block. + * Compare all fields that should not differ in alternate super block. * When an alternate super-block is specified this check is skipped. */ getblk(&asblk, cgsblock(&sblock, sblock.fs_ncg - 1), sblock.fs_sbsize); if (asblk.b_errs) return (0); - altsblock.fs_firstfield = sblock.fs_firstfield; - altsblock.fs_unused_1 = sblock.fs_unused_1; - altsblock.fs_time = sblock.fs_time; - altsblock.fs_cstotal = sblock.fs_cstotal; - altsblock.fs_cgrotor = sblock.fs_cgrotor; - altsblock.fs_fmod = sblock.fs_fmod; - altsblock.fs_clean = sblock.fs_clean; - altsblock.fs_ronly = sblock.fs_ronly; - altsblock.fs_flags = sblock.fs_flags; - altsblock.fs_maxcontig = sblock.fs_maxcontig; - altsblock.fs_minfree = sblock.fs_minfree; - altsblock.fs_optim = sblock.fs_optim; - altsblock.fs_rotdelay = sblock.fs_rotdelay; - altsblock.fs_maxbpg = sblock.fs_maxbpg; - memmove(altsblock.fs_ocsp, sblock.fs_ocsp, sizeof sblock.fs_ocsp); - altsblock.fs_csp = sblock.fs_csp; - altsblock.fs_maxcluster = sblock.fs_maxcluster; - altsblock.fs_contigdirs = sblock.fs_contigdirs; - altsblock.fs_active = sblock.fs_active; - altsblock.fs_avgfilesize = sblock.fs_avgfilesize; - altsblock.fs_avgfpdir = sblock.fs_avgfpdir; - altsblock.fs_pendingblocks = sblock.fs_pendingblocks; - altsblock.fs_pendinginodes = sblock.fs_pendinginodes; - memmove(altsblock.fs_fsmnt, sblock.fs_fsmnt, sizeof sblock.fs_fsmnt); - memmove(altsblock.fs_snapinum, sblock.fs_snapinum, - sizeof sblock.fs_snapinum); - memmove(altsblock.fs_sparecon, - sblock.fs_sparecon, sizeof sblock.fs_sparecon); - /* - * The following should not have to be copied. - */ - altsblock.fs_fsbtodb = sblock.fs_fsbtodb; - altsblock.fs_interleave = sblock.fs_interleave; - altsblock.fs_npsect = sblock.fs_npsect; - altsblock.fs_nrpos = sblock.fs_nrpos; - altsblock.fs_state = sblock.fs_state; - altsblock.fs_qbmask = sblock.fs_qbmask; - altsblock.fs_qfmask = sblock.fs_qfmask; - altsblock.fs_state = sblock.fs_state; - altsblock.fs_maxfilesize = sblock.fs_maxfilesize; - if (memcmp(&sblock, &altsblock, (int)sblock.fs_sbsize)) { - if (debug) { - long *nlp, *olp, *endlp; - - printf("superblock mismatches\n"); - nlp = (long *)&altsblock; - olp = (long *)&sblock; - endlp = olp + (sblock.fs_sbsize / sizeof *olp); - for ( ; olp < endlp; olp++, nlp++) { - if (*olp == *nlp) - continue; - printf( - "offset %d, original %ld, alternate %ld\n", - olp - (long *)&sblock, *olp, *nlp); - } - } + if (altsblock.fs_sblkno != sblock.fs_sblkno || + altsblock.fs_cblkno != sblock.fs_cblkno || + altsblock.fs_iblkno != sblock.fs_iblkno || + altsblock.fs_dblkno != sblock.fs_dblkno || + altsblock.fs_cgoffset != sblock.fs_cgoffset || + altsblock.fs_cgmask != sblock.fs_cgmask || + altsblock.fs_ncg != sblock.fs_ncg || + altsblock.fs_bsize != sblock.fs_bsize || + altsblock.fs_fsize != sblock.fs_fsize || + altsblock.fs_frag != sblock.fs_frag || + altsblock.fs_bmask != sblock.fs_bmask || + altsblock.fs_fmask != sblock.fs_fmask || + altsblock.fs_bshift != sblock.fs_bshift || + altsblock.fs_fshift != sblock.fs_fshift || + altsblock.fs_fragshift != sblock.fs_fragshift || + altsblock.fs_fsbtodb != sblock.fs_fsbtodb || + altsblock.fs_sbsize != sblock.fs_sbsize || + altsblock.fs_nindir != sblock.fs_nindir || + altsblock.fs_inopb != sblock.fs_inopb || + altsblock.fs_cssize != sblock.fs_cssize || + altsblock.fs_cpg != sblock.fs_cpg || + altsblock.fs_ipg != sblock.fs_ipg || + altsblock.fs_fpg != sblock.fs_fpg || + altsblock.fs_magic != sblock.fs_magic) { badsb(listerr, "VALUES IN SUPER BLOCK DISAGREE WITH THOSE IN FIRST ALTERNATE"); return (0); ==== //depot/projects/ia64/usr.bin/xlint/xlint/xlint.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #if defined(__RCSID) && !defined(lint) __RCSID("$NetBSD: xlint.c,v 1.26 2002/01/22 01:14:03 thorpej Exp $"); #endif -__FBSDID("$FreeBSD: src/usr.bin/xlint/xlint/xlint.c,v 1.17 2002/03/11 11:32:55 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/xlint/xlint/xlint.c,v 1.18 2002/04/07 06:28:38 peter Exp $"); #include #include ==== //depot/projects/ia64/usr.sbin/lpr/lpd/printjob.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ static char sccsid[] = "@(#)printjob.c 8.7 (Berkeley) 5/10/95"; */ static const char rcsid[] = - "$FreeBSD: src/usr.sbin/lpr/lpd/printjob.c,v 1.44 2001/11/27 01:32:25 gad Exp $"; + "$FreeBSD: src/usr.sbin/lpr/lpd/printjob.c,v 1.45 2002/04/07 05:37:27 gad Exp $"; #endif /* not lint */ @@ -130,6 +130,8 @@ static void banner(struct printer *_pp, char *_name1, char *_name2); static int dofork(const struct printer *_pp, int _action); static int dropit(int _c); +static int execfilter(struct printer *_pp, char *_f_cmd, char **_f_av, + int _infd, int _outfd); static void init(struct printer *_pp); static void openpr(const struct printer *_pp); static void opennet(const struct printer *_pp); @@ -971,9 +973,9 @@ { register int f, i, amt; struct stat stb; - FILE *fp; - char buf[BUFSIZ]; - int closedpr, resp, sizerr, statrc; + char *av[15], *filtcmd; + char buf[BUFSIZ], opt_c[4], opt_h[4], opt_n[4]; + int filtstat, narg, resp, sizerr, statrc; statrc = lstat(file, &stb); if (statrc < 0) { @@ -996,145 +998,103 @@ (stb.st_dev != fdev || stb.st_ino != fino)) return(ACCESS); - job_dfcnt++; /* increment datafile counter for this job */ - - /* everything seems OK, start it up */ + /* Everything seems OK for reading the file, now to send it */ + filtcmd = NULL; sizerr = 0; - closedpr = 0; + tfd = -1; if (type == '\3') { + /* + * Type == 3 means this is a datafile, not a control file. + * Increment the counter of data-files in this job, and + * then check for input or output filters (which are only + * applied to datafiles, not control files). + */ + job_dfcnt++; + + /* + * Note that here we are filtering datafiles, one at a time, + * as they are sent to the remote machine. Here, the *only* + * difference between an input filter (`if=') and an output + * filter (`of=') is the argument list that the filter is + * started up with. Here, the output filter is executed + * for each individual file as it is sent. This is not the + * same as local print queues, where the output filter is + * started up once, and then all jobs are passed thru that + * single invocation of the output filter. + * + * Also note that a queue for a remote-machine can have an + * input filter or an output filter, but not both. + */ if (pp->filters[LPF_INPUT]) { - /* - * We're sending something with an ifilter. We have to - * run the ifilter and store the output as a temporary - * spool file (tfile...), because the protocol requires - * us to send the file size before we start sending any - * of the data. - */ - char *av[15]; - int n; - int ifilter; - union wait status; /* XXX */ + filtcmd = pp->filters[LPF_INPUT]; + av[0] = filtcmd; + narg = 0; + strcpy(opt_c, "-c"); + strcpy(opt_h, "-h"); + strcpy(opt_n, "-n"); + if (format == 'l') + av[++narg] = opt_c; + av[++narg] = width; + av[++narg] = length; + av[++narg] = indent; + av[++narg] = opt_n; + av[++narg] = logname; + av[++narg] = opt_h; + av[++narg] = origin_host; + av[++narg] = pp->acct_file; + av[++narg] = NULL; + } else if (pp->filters[LPF_OUTPUT]) { + filtcmd = pp->filters[LPF_OUTPUT]; + av[0] = filtcmd; + narg = 0; + av[++narg] = width; + av[++narg] = length; + av[++narg] = NULL; + } + } + if (filtcmd) { + /* + * If there is an input or output filter, we have to run + * the datafile thru that filter and store the result as + * a temporary spool file, because the protocol requires + * that we send the remote host the file-size before we + * start to send any of the data. + */ + strcpy(tfile, TFILENAME); + tfd = mkstemp(tfile); + if (tfd == -1) { + syslog(LOG_ERR, "%s: mkstemp(%s): %m", pp->printer, + TFILENAME); + return (ERROR); + } + filtstat = execfilter(pp, filtcmd, av, f, tfd); - strcpy(tfile,TFILENAME); - if ((tfd = mkstemp(tfile)) == -1) { - syslog(LOG_ERR, "mkstemp: %m"); - return(ERROR); - } - if ((av[0] = strrchr(pp->filters[LPF_INPUT], '/')) == NULL) - av[0] = pp->filters[LPF_INPUT]; - else - av[0]++; - if (format == 'l') - av[n=1] = "-c"; - else - n = 0; - av[++n] = width; - av[++n] = length; - av[++n] = indent; - av[++n] = "-n"; - av[++n] = logname; - av[++n] = "-h"; - av[++n] = origin_host; - av[++n] = pp->acct_file; - av[++n] = 0; - if ((ifilter = dofork(pp, DORETURN)) == 0) { /* child */ - dup2(f, 0); - dup2(tfd, 1); - /* setup stderr for the filter (child process) - * so it goes to our temporary errors file */ - n = open(tempstderr, O_WRONLY|O_TRUNC, 0664); - if (n >= 0) - dup2(n, 2); - closelog(); - closeallfds(3); - execv(pp->filters[LPF_INPUT], av); - syslog(LOG_ERR, "cannot execv %s", - pp->filters[LPF_INPUT]); - exit(2); - } - (void) close(f); - if (ifilter < 0) - status.w_retcode = 100; - else { - while ((pid = wait((int *)&status)) > 0 && - pid != ifilter) - ; - if (pid < 0) { - status.w_retcode = 100; - syslog(LOG_WARNING, "%s: after execv(%s), wait() returned: %m", - pp->printer, pp->filters[LPF_INPUT]); - } - } - /* Copy the filter's output to "lf" logfile */ - if ((fp = fopen(tempstderr, "r"))) { - while (fgets(buf, sizeof(buf), fp)) - fputs(buf, stderr); - fclose(fp); - } - /* process the return-code from the filter */ - switch (status.w_retcode) { - case 0: - break; - case 1: - unlink(tfile); - return(REPRINT); - case 2: - unlink(tfile); - return(ERROR); - default: - syslog(LOG_WARNING, "%s: filter '%c' exited" - " (retcode=%d)", - pp->printer, format, status.w_retcode); - unlink(tfile); - return(FILTERERR); - } - statrc = fstat(tfd, &stb); /* to find size of tfile */ - if (statrc < 0) { - syslog(LOG_ERR, "%s: error processing 'if', fstat(%s): %m", - pp->printer, tfile); - return(ERROR); - } - f = tfd; - lseek(f,0,SEEK_SET); - } else if (ofilter) { - /* - * We're sending something with an ofilter, we have to - * store the output as a temporary file (tfile)... the - * protocol requires us to send the file size - */ - int i; - for (i = 0; i < stb.st_size; i += BUFSIZ) { - amt = BUFSIZ; - if (i + amt > stb.st_size) - amt = stb.st_size - i; - if (sizerr == 0 && read(f, buf, amt) != amt) { - sizerr = 1; - break; - } - if (write(ofd, buf, amt) != amt) { - (void) close(f); - return(REPRINT); - } - } - close(ofd); - close(f); - while ((i = wait(NULL)) > 0 && i != ofilter) - ; - if (i < 0) - syslog(LOG_WARNING, "%s: after closing 'of', wait() returned: %m", - pp->printer); - ofilter = 0; - statrc = fstat(tfd, &stb); /* to find size of tfile */ - if (statrc < 0) { - syslog(LOG_ERR, "%s: error processing 'of', fstat(%s): %m", - pp->printer, tfile); - openpr(pp); - return(ERROR); - } - f = tfd; - lseek(f,0,SEEK_SET); - closedpr = 1; + /* process the return-code from the filter */ + switch (filtstat) { + case 0: + break; + case 1: + unlink(tfile); + return (REPRINT); + case 2: + unlink(tfile); + return (ERROR); + default: + syslog(LOG_WARNING, + "%s: filter '%c' exited (retcode=%d)", + pp->printer, format, filtstat); + unlink(tfile); + return (FILTERERR); + } + statrc = fstat(tfd, &stb); /* to find size of tfile */ + if (statrc < 0) { + syslog(LOG_ERR, + "%s: error processing 'if', fstat(%s): %m", + pp->printer, tfile); + return (ERROR); } + f = tfd; + lseek(f,0,SEEK_SET); } (void) sprintf(buf, "%c%qd %s\n", type, stb.st_size, file); @@ -1146,8 +1106,6 @@ if (tfd != -1 && type == '\3') { tfd = -1; unlink(tfile); - if (closedpr) - openpr(pp); } return(REPRINT); } else if (resp == '\0') @@ -1175,8 +1133,6 @@ if (tfd != -1 && type == '\3') { tfd = -1; unlink(tfile); - if (closedpr) - openpr(pp); } return(REPRINT); } @@ -1191,17 +1147,11 @@ syslog(LOG_INFO, "%s: %s: changed size", pp->printer, file); /* tell recvjob to ignore this file */ (void) write(pfd, "\1", 1); - if (closedpr) - openpr(pp); return(ERROR); } if (write(pfd, "", 1) != 1 || response(pp)) { - if (closedpr) - openpr(pp); return(REPRINT); } - if (closedpr) - openpr(pp); if (type == '\3') trstat_write(pp, TR_SENDING, stb.st_size, logname, pp->remote_host, origin_host); @@ -1209,6 +1159,89 @@ } /* + * This routine is called to execute one of the filters as was + * specified in a printcap entry. + */ +static int +execfilter(struct printer *pp, char *f_cmd, char *f_av[], int infd, int outfd) +{ + int errfd, fpid, wpid; + FILE *errfp; + union wait status; /* XXX */ + char buf[BUFSIZ], *slash; + + fpid = dofork(pp, DORETURN); + if (fpid != 0) { + /* + * This is the parent process, which just waits for the child + * to complete and then returns the result. Note that it is + * the child process which reads the input stream. + */ + (void) close(infd); + if (fpid < 0) + status.w_retcode = 100; + else { + while ((wpid = wait((int *)&status)) > 0 && + wpid != fpid) + ; + if (wpid < 0) { + status.w_retcode = 100; + syslog(LOG_WARNING, + "%s: after execv(%s), wait() returned: %m", + pp->printer, f_cmd); + } + } + + /* + * Copy everything the filter wrote to stderr from our + * temporary errors file to the "lf=" logfile. + */ + errfp = fopen(tempstderr, "r"); + if (errfp) { + while (fgets(buf, sizeof(buf), errfp)) + fputs(buf, stderr); + fclose(errfp); + } + + return (status.w_retcode); + } + + /* + * This is the child process, which is the one that executes the + * given filter. + */ + /* + * If the first parameter has any slashes in it, then change it + * to point to the first character after the last slash. + */ + slash = strrchr(f_av[0], '/'); + if (slash != NULL) + f_av[0] = slash + 1; + /* + * XXX - in the future, this should setup an explicit list of + * environment variables and use execve()! + */ + + /* + * Setup stdin, stdout, and stderr as we want them when the filter + * is running. Stderr is setup so it points to a temporary errors + * file, and the parent process will copy that temporary file to + * the real logfile after the filter completes. + */ + dup2(infd, 0); + dup2(outfd, 1); + errfd = open(tempstderr, O_WRONLY|O_TRUNC, 0664); + if (errfd >= 0) + dup2(errfd, 2); + closelog(); + closeallfds(3); + execv(f_cmd, f_av); + syslog(LOG_ERR, "%s: cannot execv %s", pp->printer, f_cmd); + exit(2); + /* NOTREACHED */ +} + +/* * Check to make sure there have been no errors and that both programs * are in sync with eachother. * Return non-zero if the connection was lost. @@ -1559,6 +1592,17 @@ if (pp->remote) { openrem(pp); + /* + * Lpd does support the setting of 'of=' filters for + * jobs going to remote machines, but that does not + * have the same meaning as 'of=' does when handling + * local print queues. For remote machines, all 'of=' + * filter processing is handled in sendfile(), and that + * does not use these global "output filter" variables. + */ + ofd = -1; + ofilter = 0; + return; } else if (*pp->lp) { if ((cp = strchr(pp->lp, '@')) != NULL) opennet(pp); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 7 0:37:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C16B137B404; Sun, 7 Apr 2002 00:37:08 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D656137B405 for ; Sun, 7 Apr 2002 00:37:07 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g378b7q16621 for perforce@freebsd.org; Sun, 7 Apr 2002 00:37:07 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Apr 2002 00:37:07 -0800 (PST) Message-Id: <200204070837.g378b7q16621@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9270 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9270 Change 9270 by peter@peter_thunder on 2002/04/07 00:36:39 make this build with gcc 3.1 Affected files ... ... //depot/projects/ia64/libexec/lukemftpd/Makefile#3 edit Differences ... ==== //depot/projects/ia64/libexec/lukemftpd/Makefile#3 (text+ko) ==== @@ -30,7 +30,8 @@ CLEANFILES+= ls-unmain.c ls-unmain.c: ls.c - sed -e 's/^main(/ls_main(/g' ${.ALLSRC} > ${.TARGET} + sed -e 's/^main(/ls_main(/g' -e 's|extern.h|${LSDIR}/extern.h|' \ + ${.ALLSRC} > ${.TARGET} .if !defined(NOPAM) CFLAGS+= -DUSE_PAM To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 7 0:38:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2077C37B405; Sun, 7 Apr 2002 00:38:10 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6E41437B400 for ; Sun, 7 Apr 2002 00:38:09 -0800 (PST) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g378c9R16767 for perforce@freebsd.org; Sun, 7 Apr 2002 00:38:09 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 7 Apr 2002 00:38:09 -0800 (PST) Message-Id: <200204070838.g378c9R16767@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9271 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9271 Change 9271 by peter@peter_thunder on 2002/04/07 00:37:23 add lukemftpd back Affected files ... ... //depot/projects/ia64/libexec/Makefile#4 edit Differences ... ==== //depot/projects/ia64/libexec/Makefile#4 (text+ko) ==== @@ -9,6 +9,7 @@ ftpd \ getNAME \ getty \ + lukemftpd \ makekey \ mknetid \ pppoed \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 7 18:27:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8261737B416; Sun, 7 Apr 2002 18:27:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A1F6537B405 for ; Sun, 7 Apr 2002 18:27:28 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g381RSZ36398 for perforce@freebsd.org; Sun, 7 Apr 2002 18:27:28 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 7 Apr 2002 18:27:28 -0700 (PDT) Message-Id: <200204080127.g381RSZ36398@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9347 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9347 Change 9347 by jake@jake_sparc64 on 2002/04/07 18:26:31 Move the console part into its own file. Affected files ... ... //depot/projects/sparc64/sys/dev/se/se.c#3 delete ... //depot/projects/sparc64/sys/dev/se/se_console.c#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 7 18:32:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9AD037B41A; Sun, 7 Apr 2002 18:31:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F177F37B416 for ; Sun, 7 Apr 2002 18:31:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g381VXo36788 for perforce@freebsd.org; Sun, 7 Apr 2002 18:31:33 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 7 Apr 2002 18:31:33 -0700 (PDT) Message-Id: <200204080131.g381VXo36788@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9348 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9348 Change 9348 by jake@jake_sparc64 on 2002/04/07 18:31:21 Implement console support; works pretty well, seems to drop output characters sometimes, input works for ddb. Affected files ... ... //depot/projects/sparc64/sys/dev/se/se_console.c#2 edit ... //depot/projects/sparc64/sys/dev/se/sereg.h#4 edit Differences ... ==== //depot/projects/sparc64/sys/dev/se/se_console.c#2 (text+ko) ==== @@ -1,3 +1,31 @@ +/*- + * Copyright (c) 2002 Jake Burkholder. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. + * + * $FreeBSD$ + */ + #include #include #include @@ -10,6 +38,9 @@ #include #include #include +#include + +#ifdef __sparc64__ #include #include @@ -21,14 +52,21 @@ #include #include -#define CDEV_MAJOR 0 +#include + +#define SE_CNREAD_1(off) \ + bus_space_read_1(&se_cntag, se_cnhandle, se_cnchan + (off)) +#define SE_CNWRITE_1(off, val) \ + bus_space_write_1(&se_cntag, se_cnhandle, se_cnchan + (off), (val)) #define SE_CONSOLE(flags) ((flags) & 0x10) #define SE_FORCECONSOLE(flags) ((flags) & 0x20) -devclass_t se_devclass; +#define SE_CHANNELS 2 + +#define KTR_SE KTR_CT4 -#define SE_UNITS 2 +#define CDEV_MAJOR 200 static cn_probe_t se_cnprobe; static cn_init_t se_cninit; @@ -36,36 +74,40 @@ static cn_checkc_t se_cncheckc; static cn_putc_t se_cnputc; -static struct bus_space_tag cn_bustag; -static bus_space_handle_t cn_bushandle; -static bus_addr_t cn_phys; +static void se_cnregdump(void); + +static u_char se_cnchan; +static struct bus_space_tag se_cntag; +static bus_space_handle_t se_cnhandle; CONS_DRIVER(se, se_cnprobe, se_cninit, NULL, se_cngetc, se_cncheckc, se_cnputc, NULL); -static phandle_t -OF_traverse(phandle_t root, int (*func)(phandle_t)) +static int +OF_traverse(phandle_t root, phandle_t *node, + int (*func)(phandle_t, phandle_t *)) { - phandle_t node; - phandle_t rv; + phandle_t child; - for (node = OF_child(root); node != 0; node = OF_peer(node)) { - if ((rv = func(node)) > 0 || - (rv = OF_traverse(node, func)) > 0) - return (rv); + for (child = OF_child(root); child != 0; child = OF_peer(child)) { + if (func(child, node) == 0 || + OF_traverse(child, node, func) == 0) + return (0); } return (-1); } static int -se_cnfind(phandle_t node) +se_cnfind(phandle_t child, phandle_t *node) { char name[8]; - if (OF_getprop(node, "name", name, sizeof(name)) < 0 || - strncmp(name, "se", sizeof(name)) != 0) - return (-1); - return (node); + if (OF_getprop(child, "name", name, sizeof(name)) != -1 && + strncmp(name, "se", sizeof(name)) == 0) { + *node = child; + return (0); + } + return (-1); } static int @@ -88,8 +130,9 @@ int i; if (OF_getprop(node, "reg", ®, sizeof(reg)) == -1 || - (rsz = OF_getprop(parent, "ranges", ir, sizeof(ir))) == -1) + (rsz = OF_getprop(parent, "ranges", ir, sizeof(ir))) == -1) { return (ENXIO); + } phys = ISA_REG_PHYS(®); dummy = phys + 8; type = ofw_isa_map_iorange(ir, rsz / sizeof(*ir), &phys, &dummy); @@ -123,9 +166,8 @@ child = UPA_RANGE_CHILD(&ur[i]); if (UPA_RANGE_CS(&ur[i]) == cs && phys >= child && phys - child < UPA_RANGE_SIZE(&ur[i])) { - cn_phys = phys; - cn_bushandle = sparc64_fake_bustag(bs, - UPA_RANGE_PHYS(&ur[i]) + phys, &cn_bustag); + se_cnhandle = sparc64_fake_bustag(bs, + UPA_RANGE_PHYS(&ur[i]) + phys, &se_cntag); error = 0; break; } @@ -138,20 +180,23 @@ { phandle_t parent; phandle_t node; + phandle_t root; char name[8]; + int channel; int disabled; int flags; - int unit; disabled = 0; cn->cn_pri = CN_DEAD; - if ((node = OF_peer(0)) <= 0 || - (node = OF_traverse(node, se_cnfind)) <= 0) + if ((root = OF_peer(0)) == -1 || + OF_traverse(root, &node, se_cnfind) == -1) return; - for (unit = 0; unit < SE_UNITS; unit++) { - if (resource_int_value("se", unit, "disabled", &disabled) != 0) + for (channel = 0; channel < SE_CHANNELS; channel++) { + if (resource_int_value("se", channel, "disabled", + &disabled) != 0) { disabled = 0; - if (resource_int_value("se", unit, "flags", &flags) == 0) { + } + if (resource_int_value("se", channel, "flags", &flags) == 0) { if (!disabled && SE_CONSOLE(flags)) goto map; } @@ -166,31 +211,110 @@ return; if (se_cnmap(node, parent) != 0) return; -#if 0 - cn->cn_dev = makedev(CDEV_MAJOR, unit); + se_cnchan = (channel == 0 ? SE_CHA : SE_CHB); + + cn->cn_dev = makedev(CDEV_MAJOR, channel); cn->cn_pri = SE_FORCECONSOLE(flags) || boothowto & RB_SERIAL ? CN_REMOTE : CN_NORMAL; -#endif } static void se_cninit(struct consdev *cn) { + u_char ccr0; + + /* + * Power down the chip for initialization. + */ + SE_CNWRITE_1(SE_CCR0, 0x0); + + /* + * Now program the chip for polled asynchronous serial io. + */ + SE_CNWRITE_1(SE_CCR0, CCR0_MCE | CCR0_SM_ASYNC); + SE_CNWRITE_1(SE_CMDR, CMDR_RRES | CMDR_XRES); + SE_CNWRITE_1(SE_CCR1, CCR1_ODS | CCR1_BCR | CCR1_CM_7); + SE_CNWRITE_1(SE_BGR, SE_DIV(48, 2)); + SE_CNWRITE_1(SE_CCR2, CCR2_TOE | CCR2_SSEL | CCR2_BDF); + SE_CNWRITE_1(SE_CCR3, 0x0); + SE_CNWRITE_1(SE_CCR4, CCR4_EBRG | CCR4_MCK4); + SE_CNWRITE_1(SE_MODE, MODE_FCTS | MODE_RAC | MODE_RTS); + SE_CNWRITE_1(SE_DAFO, DAFO_CHL_8); + SE_CNWRITE_1(SE_RFC, RFC_DPS | RFC_RFTH_32); + SE_CNWRITE_1(SE_IPC, IPC_VIS); + + /* + * Now power up the chip again. + */ + ccr0 = SE_CNREAD_1(SE_CCR0); + ccr0 |= CCR0_PU; + SE_CNWRITE_1(SE_CCR0, ccr0); + + SE_CNWRITE_1(SE_CMDR, CMDR_RRES | CMDR_XRES); } static int se_cngetc(dev_t dev) { - return (0); + u_char c; + + while ((SE_CNREAD_1(SE_STAR) & (STAR_CEC | STAR_RFNE)) != STAR_RFNE) + ; + SE_CNWRITE_1(SE_CMDR, CMDR_RFRD); + while ((SE_CNREAD_1(SE_ISR0) & ISR0_TCD) == 0) + ; + c = SE_CNREAD_1(SE_RFIFO); + SE_CNWRITE_1(SE_CMDR, CMDR_RMC); + return (c); } static int se_cncheckc(dev_t dev) { - return (0); + u_char c; + + if ((SE_CNREAD_1(SE_STAR) & STAR_RFNE) != 0) { + while ((SE_CNREAD_1(SE_STAR) & STAR_CEC) != 0) + ; + SE_CNWRITE_1(SE_CMDR, CMDR_RFRD); + while ((SE_CNREAD_1(SE_ISR0) & ISR0_TCD) == 0) + ; + c = SE_CNREAD_1(SE_RFIFO); + SE_CNWRITE_1(SE_CMDR, CMDR_RMC); + return (c); + } + return (-1); } static void se_cnputc(dev_t dev, int c) { + + while ((SE_CNREAD_1(SE_STAR) & (STAR_CTS | STAR_CEC | STAR_XFW)) != + (STAR_CTS | STAR_XFW)) + ; + SE_CNWRITE_1(SE_XFIFO, c); + SE_CNWRITE_1(SE_CMDR, CMDR_XF); +} + +static void +se_cnregdump(void) +{ + + CTR1(KTR_SE, "se_cnprobe: mode=%#x", SE_CNREAD_1(SE_MODE)); + CTR1(KTR_SE, "se_cnprobe: timr=%#x", SE_CNREAD_1(SE_TIMR)); + CTR1(KTR_SE, "se_cnprobe: xon=%#x", SE_CNREAD_1(SE_XON)); + CTR1(KTR_SE, "se_cnprobe: xoff=%#x", SE_CNREAD_1(SE_XOFF)); + CTR1(KTR_SE, "se_cnprobe: tcr=%#x", SE_CNREAD_1(SE_TCR)); + CTR1(KTR_SE, "se_cnprobe: dafo=%#x", SE_CNREAD_1(SE_DAFO)); + CTR1(KTR_SE, "se_cnprobe: rfc=%#x", SE_CNREAD_1(SE_RFC)); + CTR1(KTR_SE, "se_cnprobe: ccr0=%#x", SE_CNREAD_1(SE_CCR0)); + CTR1(KTR_SE, "se_cnprobe: ccr1=%#x", SE_CNREAD_1(SE_CCR1)); + CTR1(KTR_SE, "se_cnprobe: ccr2=%#x", SE_CNREAD_1(SE_CCR2)); + CTR1(KTR_SE, "se_cnprobe: ccr3=%#x", SE_CNREAD_1(SE_CCR3)); + CTR1(KTR_SE, "se_cnprobe: vstr=%#x", SE_CNREAD_1(SE_VSTR)); + CTR1(KTR_SE, "se_cnprobe: ipc=%#x", SE_CNREAD_1(SE_IPC)); + CTR1(KTR_SE, "se_cnprobe: ccr4=%#x", SE_CNREAD_1(SE_CCR4)); } + +#endif ==== //depot/projects/sparc64/sys/dev/se/sereg.h#4 (text+ko) ==== @@ -29,6 +29,8 @@ #ifndef _DEV_SE_SEREG_H_ #define _DEV_SE_SEREG_H_ +#define SE_DIV(n, m) (((m) << 6) | ((n) - 1)) + #define SE_CHA 0x0 /* channel a offset */ #define SE_CHB 0x40 /* channel b offset */ @@ -36,83 +38,86 @@ #define SE_XFIFO 0x0 /* transmit fifo */ #define SE_STAR 0x20 /* status register */ -#define STAR_WFA 0x1 /* wait for acknowledgement */ #define STAR_CTS 0x2 /* clear to send state */ #define STAR_CEC 0x4 /* command executing */ -#define STAR_RLI 0x8 /* receive line inactive */ -#define STAR_RRNR 0x10 /* receive receiver not ready */ -#define STAR_XRNR 0x20 /* transmit receiver not ready */ +#define STAR_TEC 0x8 /* tic executing */ +#define STAR_FCS 0x10 /* flow control status */ +#define STAR_RFNE 0x20 /* receive fifo not empty */ #define STAR_XFW 0x40 /* transmit fifo write enable */ #define STAR_XDOV 0x80 /* transmit data overflow */ #define SE_CMDR 0x20 /* command register */ #define CMDR_XRES 0x1 /* transmitter reset */ -#define CMDR_XME 0x2 /* transmit message end */ -#define CMDR_XIF 0x4 /* transmit i-frame */ -#define CMDR_XTF 0x8 /* transmit transparent frame */ +#define CMDR_XF 0x8 /* transmit frame */ #define CMDR_STI 0x10 /* start timer */ -#define CMDR_XREP 0x20 /* transmission repeat */ -#define CMDR_RHR 0x40 /* reset hdlc receiver */ +#define CMDR_RFRD 0x20 /* receive fifo read enable */ +#define CMDR_RRES 0x40 /* reveiver reset */ #define CMDR_RMC 0x80 /* receive message complete */ -#define SE_RSTA 0x21 /* receive status */ -#define RSTA_LA 0x1 /* low byte address compare */ -#define RSTA_CR 0x2 /* command/response */ -#define RSTA_HA0 0x4 /* high byte address compare 0 */ -#define RSTA_HA1 0x8 /* high byte address compare 1 */ -#define RSTA_RAB 0x10 /* receive message aborted */ -#define RSTA_CRC 0x20 /* crc compare/check */ -#define RSTA_RDO 0x40 /* receive data overflow */ -#define RSTA_VFR 0x80 /* valid frame */ - -#define SE_PRE 0x21 /* preamble register */ - #define SE_MODE 0x22 /* mode register */ #define MODE_TLP 0x1 /* test loop */ #define MODE_TRS 0x2 /* timer resolution */ #define MODE_RTS 0x4 /* request to send */ #define MODE_RAC 0x8 /* receiver active */ -#define MODE_TMD 0x10 /* timer mode */ -#define MODE_ADM 0x20 /* address mode */ -#define MODE_MDS0 0x40 /* mode select 0 */ -#define MODE_MDS1 0x80 /* mode select 1 */ +#define MODE_FLON 0x10 /* flow control on */ +#define MODE_FCTS 0x20 /* flow control using cts */ +#define MODE_FRTS 0x40 /* flow control using rts */ #define SE_TIMR 0x23 /* timer register */ -#define SE_XAD1 0x24 /* transmit address 1 */ -#define SE_XAD2 0x25 /* transmit address 2 */ -#define SE_RAH1 0x26 /* receive address high 1 */ -#define SE_RAH2 0x27 /* receive address high 2 */ -#define SE_RAL1 0x28 /* receive address low 1 */ -#define SE_RHCR 0x29 /* receive hdlc control */ -#define SE_RAL2 0x29 /* receive address low 2 */ +#define SE_XON 0x24 /* xon character */ +#define SE_XOFF 0x25 /* xoff character */ +#define SE_TCR 0x26 /* transmit character register */ + +#define SE_DAFO 0x27 /* data format */ +#define DAFO_CHL 0x2 /* character length */ +#define DAFO_CHL_8 0x0 /* 8 bits */ +#define DAFO_CHL_7 0x1 /* 7 bits */ +#define DAFO_CHL_6 0x2 /* 6 bits */ +#define DAFO_CHL_5 0x3 /* 5 bits */ +#define DAFO_PARE 0x4 /* parity enable */ +#define DAFO_PAR 0x18 /* parity format */ +#define DAFO_STOP 0x20 /* stop bit */ +#define DAFO_XBRK 0x40 /* transmit break */ + +#define SE_RFC 0x28 /* rfifo control register */ +#define RFC_TCDE 0x1 /* termination character detection enable */ +#define RFC_RFTH 0xc /* rfifo threshold level */ +#define RFC_RFTH_2 0x0 /* 2 bytes */ +#define RFC_RFTH_4 0x4 /* 4 bytes */ +#define RFC_RFTH_16 0x8 /* 16 bytes */ +#define RFC_RFTH_32 0xc /* 32 bytes */ +#define RFC_RFDF 0x10 /* rfifo data format */ +#define RFC_DXS 0x20 /* disable storage of xon/xoff characters */ +#define RFC_DPS 0x40 /* disable parity storage */ + #define SE_RBCL 0x2a /* receive byte count low */ #define SE_XBCL 0x2a /* transmit byte count low */ #define SE_RBCH 0x2b /* receive byte count high */ #define SE_XBCH 0x2b /* transmit byte count high */ #define SE_CCR0 0x2c /* channel configuration register 0 */ -#define CCR0_SM0 0x1 /* serial mode 0 */ -#define CCR0_SM1 0x2 /* serial mode 1 */ -#define CCR0_SC0 0x4 /* serial configuration 0 */ -#define CCR0_SC1 0x8 /* serial configuration 1 */ -#define CCR0_SC2 0x10 /* serial configuration 2 */ -#define CCR0_UNUSED0 0x20 /* unused */ -#define CCR0_MSE 0x40 /* master clock enable */ +#define CCR0_SM 0x3 /* serial mode */ +#define CCR0_SM_HDLC 0x0 /* hdlc/sdlc mode */ +#define CCR0_SM_SDLC 0x1 /* sdlc loop mode */ +#define CCR0_SM_BISYNC 0x2 /* bisync mode */ +#define CCR0_SM_ASYNC 0x3 /* async mode */ +#define CCR0_SC 0x1c /* serial configuration */ +#define CCR0_SC_NRZ 0x0 /* nrz data encoding */ +#define CCR0_SC_NRZI 0x2 /* nrzi data encoding */ +#define CCR0_SC_FM0 0x4 /* fm0 data encoding */ +#define CCR0_SC_FM1 0x5 /* fm1 data encoding */ +#define CCR0_SC_MCHSTR 0x6 /* manchester data encoding */ +#define CCR0_MCE 0x40 /* master clock enable */ #define CCR0_PU 0x80 /* power up */ #define SE_CCR1 0x2d /* channel configuration register 1 */ -#define CCR1_CM0 0x1 /* clock mode 0 */ -#define CCR1_CM1 0x2 /* clock mode 1 */ -#define CCR1_CM2 0x4 /* clock mode 2 */ -#define CCR1_ITF 0x8 /* interframe time fill */ +#define CCR1_CM 0x7 /* clock mode */ +#define CCR1_CM_7 0x7 /* clock mode 7 */ +#define CCR1_BCR 0x8 /* bit clock rate */ #define CCR1_ODS 0x10 /* output driver select */ -#define CCR1_GLP 0x20 /* go on loop */ -#define CCR1_GALP 0x40 /* go active on loop */ -#define CCR1_SFLG 0x80 /* enable shared flags */ #define SE_CCR2 0x2e /* channel configuration register 2 */ #define CCR2_DIV 0x1 /* data inversion */ -#define CCR2_C32 0x2 /* enable crc32 */ #define CCR2_RWX 0x4 /* read/write exchange */ #define CCR2_TOE 0x8 /* txclk ouput enable */ #define CCR2_SSEL 0x10 /* clock source select */ @@ -126,13 +131,6 @@ #define SE_CCR3 0x2f /* channel configuration register 3 */ #define CCR3_PSD 0x1 /* dpll phase shift disable */ -#define CCR3_XCRC 0x2 /* transmit crc on/off */ -#define CCR3_RCRC 0x4 /* receive crc on/off */ -#define CCR3_CRL 0x8 /* crc reset level */ -#define CCR3_RADD 0x10 /* receive address pushed to rfifo */ -#define CCR3_EPT 0x20 /* enable preamble transmission */ -#define CCR3_PRE0 0x40 /* number of preamble repetition 0 */ -#define CCR3_PRE1 0x80 /* number of preamble repetition 1 */ #define SE_TSAX 0x30 /* transmit timeslot assignment register */ #define SE_TSAR 0x31 /* receive timeslot assignment register */ @@ -140,28 +138,20 @@ #define SE_RCCR 0x33 /* receive channel capacity register */ #define SE_VSTR 0x34 /* version status register */ -#define VSTR_VN0 0x1 /* version number 0 */ -#define VSTR_VN1 0x2 /* version number 1 */ -#define VSTR_VN2 0x4 /* version number 2 */ -#define VSTR_VN3 0x8 /* version number 3 */ -#define VSTR_UNUSED0 0x10 /* unused */ -#define VSTR_UNUSED1 0x20 /* unused */ +#define VSTR_VN 0xf /* version number 0 */ #define VSTR_DPLA 0x40 /* dpll asynchronous */ #define VSTR_CD 0x80 /* carrier detect */ #define SE_BGR 0x34 /* baud rate generator register */ -#define SE_RLCR 0x35 /* receive frame length check */ -#define SE_AML 0x36 /* address mask low */ -#define SE_AMH 0x37 /* address mask high */ +#define SE_TIC 0x35 /* trasmit immediate character */ +#define SE_MXN 0x36 /* mask xon character */ +#define SE_MXF 0x37 /* mask xoff character */ #define SE_GIS 0x38 /* global interrupt status */ #define GIS_ISB0 0x1 /* interrupt status channel B 0 */ #define GIS_ISB1 0x2 /* interrupt status channel B 1 */ #define GIS_ISA0 0x4 /* interrupt status channel A 0 */ #define GIS_ISA1 0x8 /* interrupt status channel A 1 */ -#define GIS_UNUSED0 0x10 /* unused */ -#define GIS_UNUSED1 0x20 /* unused */ -#define GIS_UNUSED2 0x40 /* unused */ #define GIS_PI 0x80 /* univerisal port interrupt */ #define SE_IVA 0x38 /* interrupt vector address */ @@ -172,8 +162,6 @@ #define IPC_CASM 0x4 /* cascading mode */ #define IPC_SLA0 0x8 /* slave address 0 */ #define IPC_SLA1 0x10 /* slave address 1 */ -#define IPC_UNUSED0 0x20 /* unused */ -#define IPC_UNUSED1 0x40 /* unused */ #define IPC_VIS 0x80 /* masked interrupts visible */ #define SE_ISR0 0x3a /* interrupt status 0 */ @@ -181,22 +169,22 @@ #define ISR0_RFO 0x2 /* receive frame overflow */ #define ISR0_CDSC 0x4 /* carrier detect status change */ #define ISR0_PLLA 0x8 /* dpll asynchronous */ -#define ISR0_PCE 0x10 /* protocol error */ -#define ISR0_RSC 0x20 /* receive status change */ -#define ISR0_RFS 0x40 /* receive frame start */ -#define ISR0_RME 0x80 /* receive frame end */ +#define ISR0_FERR 0x10 /* framing error */ +#define ISR0_PERR 0x20 /* parity error */ +#define ISR0_TIME 0x40 /* time out */ +#define ISR0_TCD 0x80 /* termination character detected */ #define SE_IMR0 0x3a /* interrupt mask 0 */ #define SE_ISR1 0x3b /* interrupt status 1 */ #define ISR1_XPR 0x1 /* transmit pool ready */ -#define ISR1_XMR 0x2 /* transmit message repeat */ +#define ISR1_XON 0x2 /* transmit message repeat */ #define ISR1_CSC 0x4 /* clear to send status change */ #define ISR1_TIN 0x8 /* timer interrupt */ -#define ISR1_XDU 0x10 /* transmit data underrun */ -#define ISR1_AOLP 0x20 /* active on loop */ -#define ISR1_OLP 0x40 /* on loop */ -#define ISR1_EOP 0x80 /* end of poll sequence detected */ +#define ISR1_XOFF 0x10 /* xoff character detected */ +#define ISR1_ALLS 0x20 /* all sent */ +#define ISR1_BRKT 0x40 /* break terminated */ +#define ISR1_BRK 0x80 /* break */ #define SE_IMR1 0x3b /* interrupt mask 1 */ #define SE_PVR 0x3c /* port value register */ @@ -205,10 +193,6 @@ #define SE_PCR 0x3e /* port configuration register */ #define SE_CCR4 0x3f /* channel configuration register 4 */ -#define CCR4_RFT0 0x1 /* rfifo threshold level 0 */ -#define CCR4_RFT1 0x2 /* rfifo threshold level 1 */ -#define CCR4_UNUSED0 0x4 /* unused */ -#define CCR4_UNUSED1 0x8 /* unused */ #define CCR4_ICD 0x10 /* invert polarity of carrier detect signal */ #define CCR4_TST1 0x20 /* test pin */ #define CCR4_EBRG 0x40 /* enhanced baud rate generator mode */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 7 18:32:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40E8337B41A; Sun, 7 Apr 2002 18:32:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 84B4C37B405 for ; Sun, 7 Apr 2002 18:32:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g381WZK36865 for perforce@freebsd.org; Sun, 7 Apr 2002 18:32:35 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 7 Apr 2002 18:32:35 -0700 (PDT) Message-Id: <200204080132.g381WZK36865@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9349 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9349 Change 9349 by jake@jake_sparc64 on 2002/04/07 18:32:20 Remove the other files for now, add se_console.c. Affected files ... ... //depot/projects/sparc64/sys/conf/files#49 edit Differences ... ==== //depot/projects/sparc64/sys/conf/files#49 (text+ko) ==== @@ -480,8 +480,7 @@ dev/rp/rp.c optional rp dev/rp/rp_isa.c optional rp isa dev/rp/rp_pci.c optional rp pci -dev/se/se.c optional se -dev/se/se_ebus.c optional se ebus +dev/se/se_console.c optional se ebus dev/si/si.c optional si dev/si/si2_z280.c optional si dev/si/si3_t225.c optional si To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 7 19: 6:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DA4737B419; Sun, 7 Apr 2002 19:06:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B814B37B417 for ; Sun, 7 Apr 2002 19:06:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3826Ga45426 for perforce@freebsd.org; Sun, 7 Apr 2002 19:06:16 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 7 Apr 2002 19:06:16 -0700 (PDT) Message-Id: <200204080206.g3826Ga45426@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9350 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9350 Change 9350 by jake@jake_sparc64 on 2002/04/07 19:06:02 Fix breakage from header changes. Pointy hat to: jake Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#8 edit Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#8 (text+ko) ==== @@ -241,7 +241,7 @@ * the frame. */ frm = (struct frame *)(uf->uf_out[6] + SPOFF); - return (frm->f_local[reg - IREG_L0]); + return (frm->fr_local[reg - IREG_L0]); } __fpu_panic("fetch_reg: bogus register"); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 7 21:48:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02C8C37B417; Sun, 7 Apr 2002 21:48:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8C68837B416 for ; Sun, 7 Apr 2002 21:48:31 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g384mVB72240 for perforce@freebsd.org; Sun, 7 Apr 2002 21:48:31 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 7 Apr 2002 21:48:31 -0700 (PDT) Message-Id: <200204080448.g384mVB72240@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9353 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9353 Change 9353 by jake@jake_sparc64 on 2002/04/07 21:48:05 enable the scsi pass through device. Affected files ... ... //depot/projects/sparc64/sys/sparc64/conf/GENERIC#19 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/conf/GENERIC#19 (text+ko) ==== @@ -97,7 +97,7 @@ device da # Direct Access (disks) #device sa # Sequential Access (tape etc) device cd # CD -#device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct SCSI access) #device ses # SCSI Environmental Services (and SAF-TE) # RAID controllers To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 0: 2:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2FBD37B41B; Mon, 8 Apr 2002 00:01:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A09B637B419 for ; Mon, 8 Apr 2002 00:01:13 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3871Ck02960 for perforce@freebsd.org; Mon, 8 Apr 2002 00:01:12 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 8 Apr 2002 00:01:12 -0700 (PDT) Message-Id: <200204080701.g3871Ck02960@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9360 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9360 Change 9360 by peter@peter_thunder on 2002/04/08 00:00:11 IFC @9359 Affected files ... ... //depot/projects/ia64/lib/libc/locale/euc.c#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_kerberosIV/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.c#6 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml#5 integrate ... //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml#3 integrate ... //depot/projects/ia64/release/picobsd/floppy.tree/etc/rc1#3 integrate ... //depot/projects/ia64/release/picobsd/tinyware/simple_httpd/simple_httpd.c#2 integrate ... //depot/projects/ia64/sbin/disklabel/Makefile#3 integrate ... //depot/projects/ia64/sbin/disklabel/disklabel.c#8 integrate ... //depot/projects/ia64/sbin/mount_std/mount_std.c#3 integrate ... //depot/projects/ia64/sbin/newfs/mkfs.c#8 integrate ... //depot/projects/ia64/sbin/newfs/newfs.c#9 integrate ... //depot/projects/ia64/sbin/newfs/newfs.h#3 integrate ... //depot/projects/ia64/sbin/routed/parms.c#3 integrate ... //depot/projects/ia64/sbin/routed/routed.8#4 integrate ... //depot/projects/ia64/share/mk/bsd.lib.mk#7 integrate ... //depot/projects/ia64/share/mk/bsd.prog.mk#4 integrate ... //depot/projects/ia64/share/mk/bsd.sys.mk#4 integrate ... //depot/projects/ia64/sys/alpha/alpha/machdep.c#10 integrate ... //depot/projects/ia64/sys/dev/ata/ata-dma.c#10 integrate ... //depot/projects/ia64/sys/dev/ata/ata-pci.c#10 integrate ... //depot/projects/ia64/sys/dev/mii/miidevs#3 integrate ... //depot/projects/ia64/sys/dev/mii/miidevs.h#3 integrate ... //depot/projects/ia64/sys/dev/mii/rlphy.c#4 integrate ... //depot/projects/ia64/sys/dev/ppbus/if_plip.c#2 integrate ... //depot/projects/ia64/sys/dev/ppbus/lpbb.c#3 integrate ... //depot/projects/ia64/sys/dev/ppbus/lpt.c#2 integrate ... //depot/projects/ia64/sys/dev/ppbus/pcfclock.c#2 integrate ... //depot/projects/ia64/sys/dev/ppbus/ppi.c#2 integrate ... //depot/projects/ia64/sys/dev/ppbus/pps.c#3 integrate ... //depot/projects/ia64/sys/dev/ppbus/vpo.c#2 integrate ... //depot/projects/ia64/sys/dev/usb/hid.c#3 integrate ... //depot/projects/ia64/sys/dev/usb/if_aue.c#8 integrate ... //depot/projects/ia64/sys/dev/usb/if_auereg.h#4 integrate ... //depot/projects/ia64/sys/dev/usb/if_cue.c#6 integrate ... //depot/projects/ia64/sys/dev/usb/if_cuereg.h#3 integrate ... //depot/projects/ia64/sys/dev/usb/if_kue.c#6 integrate ... //depot/projects/ia64/sys/dev/usb/if_kuereg.h#3 integrate ... //depot/projects/ia64/sys/dev/usb/ohci.c#6 integrate ... //depot/projects/ia64/sys/dev/usb/ohcivar.h#5 integrate ... //depot/projects/ia64/sys/dev/usb/ugraphire_rdesc.h#1 branch ... //depot/projects/ia64/sys/dev/usb/uhci.c#6 integrate ... //depot/projects/ia64/sys/dev/usb/uhcireg.h#3 integrate ... //depot/projects/ia64/sys/dev/usb/uhcivar.h#5 integrate ... //depot/projects/ia64/sys/dev/usb/uhid.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/uhub.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/ukbd.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/ums.c#7 integrate ... //depot/projects/ia64/sys/dev/usb/usb.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/usb_port.h#6 integrate ... //depot/projects/ia64/sys/dev/usb/usb_subr.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs#10 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs.h#9 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#9 integrate ... //depot/projects/ia64/sys/dev/usb/usbdi.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/usbdi.h#4 integrate ... //depot/projects/ia64/sys/dev/usb/usbdi_util.c#3 integrate ... //depot/projects/ia64/sys/dev/usb/usbdi_util.h#3 integrate ... //depot/projects/ia64/sys/dev/usb/usbdivar.h#6 integrate ... //depot/projects/ia64/sys/dev/wi/if_wireg.h#7 integrate ... //depot/projects/ia64/sys/i386/i386/machdep.c#12 integrate ... //depot/projects/ia64/sys/kern/uipc_socket.c#8 integrate ... //depot/projects/ia64/sys/kern/vfs_aio.c#9 integrate ... //depot/projects/ia64/sys/kern/vfs_cache.c#5 integrate ... //depot/projects/ia64/sys/kern/vfs_syscalls.c#12 integrate ... //depot/projects/ia64/sys/pc98/i386/machdep.c#11 integrate ... //depot/projects/ia64/sys/pci/if_rl.c#7 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#8 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#10 integrate ... //depot/projects/ia64/sys/sys/disklabel.h#10 integrate ... //depot/projects/ia64/sys/sys/socketvar.h#9 integrate ... //depot/projects/ia64/sys/vm/uma.h#3 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#6 integrate ... //depot/projects/ia64/sys/vm/uma_int.h#4 integrate ... //depot/projects/ia64/sys/vm/vm_zone.c#7 delete ... //depot/projects/ia64/sys/vm/vm_zone.h#3 delete ... //depot/projects/ia64/usr.bin/xlint/lint1/main1.c#5 integrate ... //depot/projects/ia64/usr.bin/xlint/xlint/xlint.c#7 integrate ... //depot/projects/ia64/usr.sbin/arp/arp.c#6 integrate ... //depot/projects/ia64/usr.sbin/lpr/lpd/printjob.c#4 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/config.c#4 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/package.c#4 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#5 integrate Differences ... ==== //depot/projects/ia64/lib/libc/locale/euc.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)euc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.6 2002/03/22 21:52:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.7 2002/04/07 16:37:15 asmodai Exp $"); #include @@ -123,6 +123,8 @@ #define _SS2 0x008e #define _SS3 0x008f +#define GR_BITS 0x80808080 /* XXX: to be fixed */ + static inline int _euc_set(c) u_int c; @@ -202,6 +204,8 @@ } *string++ = _SS2; --i; + /* SS2 designates G2 into GR */ + nm |= GR_BITS; } else if (m == CEI->bits[3]) { i = len = CEI->count[3]; @@ -212,6 +216,8 @@ } *string++ = _SS3; --i; + /* SS3 designates G3 into GR */ + nm |= GR_BITS; } else goto CodeSet1; /* Bletch */ while (i-- > 0) ==== //depot/projects/ia64/lib/libpam/modules/pam_kerberosIV/Makefile#3 (text+ko) ==== @@ -22,11 +22,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_kerberosIV/Makefile,v 1.9 2002/03/05 21:56:14 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_kerberosIV/Makefile,v 1.10 2002/04/07 12:53:58 des Exp $ LIB= pam_kerberosIV SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_kerberosIV.c klogin.c +NO_WERROR= yes CFLAGS+= -DKERBEROS DPADD= ${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR} LDADD= -lkrb -lcrypto -lcom_err ==== //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.c,v 1.28 2002/04/06 19:30:04 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_unix/pam_unix.c,v 1.30 2002/04/07 21:18:18 des Exp $"); #include #include @@ -121,16 +121,16 @@ struct options options; struct passwd *pwd; int retval; - const char *pass, *user; - char *encrypted, *password_prompt; + const char *pass, *user, *realpw; + char *prompt; pam_std_option(&options, other_options, argc, argv); PAM_LOG("Options processed"); - if (pam_test_option(&options, PAM_OPT_AUTH_AS_SELF, NULL)) + if (pam_test_option(&options, PAM_OPT_AUTH_AS_SELF, NULL)) { pwd = getpwnam(getlogin()); - else { + } else { retval = pam_get_user(pamh, &user, NULL); if (retval != PAM_SUCCESS) PAM_RETURN(retval); @@ -139,67 +139,32 @@ PAM_LOG("Got user: %s", user); - lc = login_getclass(NULL); - password_prompt = login_getcapstr(lc, "passwd_prompt", - password_prompt, NULL); - login_close(lc); - lc = NULL; - if (pwd != NULL) { - PAM_LOG("Doing real authentication"); - - if (pwd->pw_passwd[0] == '\0' - && pam_test_option(&options, PAM_OPT_NULLOK, NULL)) { - /* - * No password case. XXX Are we giving too much away - * by not prompting for a password? - */ - PAM_LOG("No password, and null password OK"); - PAM_RETURN(PAM_SUCCESS); + realpw = pwd->pw_passwd; + if (realpw[0] == '\0') { + if (!(flags & PAM_DISALLOW_NULL_AUTHTOK) && + pam_test_option(&options, PAM_OPT_NULLOK, NULL)) + PAM_RETURN(PAM_SUCCESS); + realpw = "*"; } - else { - retval = pam_get_authtok(pamh, PAM_AUTHTOK, - &pass, password_prompt); - if (retval != PAM_SUCCESS) - PAM_RETURN(retval); - PAM_LOG("Got password"); - } - encrypted = crypt(pass, pwd->pw_passwd); - if (pass[0] == '\0' && pwd->pw_passwd[0] != '\0') - encrypted = colon; - - PAM_LOG("Encrypted password 1 is: %s", encrypted); - PAM_LOG("Encrypted password 2 is: %s", pwd->pw_passwd); - - retval = strcmp(encrypted, pwd->pw_passwd) == 0 ? - PAM_SUCCESS : PAM_AUTH_ERR; - } - else { - + lc = login_getpwclass(pwd); + } else { PAM_LOG("Doing dummy authentication"); - - /* - * User unknown. - * Encrypt a dummy password so as to not give away too much. - */ - retval = pam_get_authtok(pamh, - PAM_AUTHTOK, &pass, password_prompt); - if (retval != PAM_SUCCESS) - PAM_RETURN(retval); - PAM_LOG("Got password"); - crypt(pass, "xx"); - retval = PAM_AUTH_ERR; + realpw = "*"; + lc = login_getclass(NULL); } - - /* - * The PAM infrastructure will obliterate the cleartext - * password before returning to the application. - */ + prompt = login_getcapstr(lc, "passwd_prompt", NULL, NULL); + retval = pam_get_authtok(pamh, PAM_AUTHTOK, &pass, prompt); + login_close(lc); if (retval != PAM_SUCCESS) - PAM_VERBOSE_ERROR("UNIX authentication refused"); + PAM_RETURN(retval); + PAM_LOG("Got password"); + if (strcmp(crypt(pass, realpw), realpw) == 0) + PAM_RETURN(PAM_SUCCESS); - PAM_RETURN(retval); + PAM_VERBOSE_ERROR("UNIX authentication refused"); + PAM_RETURN(PAM_AUTH_ERR); } PAM_EXTERN int ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ &os;/&arch; &release.current; notes de version - $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml,v 1.12 2002/03/10 15:37:56 gioria Exp $ + $FreeBSD: src/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml,v 1.13 2002/04/07 09:04:04 gioria Exp $ Le Projet FreeBSD @@ -1368,10 +1368,249 @@ Changements liés a la sécurité + &man.sysinstall.8; permet maintenant a un utilisateur de choisir + un des deux profils de sécurité au moment de l'installation + Ces profils activent ou désactivent alors différents services via + le fichier de configuration &man.rc.conf.5; lors de nouvelles + installations. &merged; + + Un bogue qui fixait le système pour des images ELF exécutables + malformées a été résolu (voir l'avis de sécurité + FreeBSD-SA-00:41). &merged; + + Un trou de sécurité dans l'émulation Linux a été corrigé (voir + l'avis de sécuritéFreeBSD-SA-00:42). &merged; + + Les appels a la librairie de traitement des chaines + ont été corrigés dans beaucoups de programmes, pour réduire + la possiblité d'exploitation des dépassements de tampons. + &merged; + + TCP utilise maintenant une fonction plus aléatoire pour + le choix du nombre initial lors de l'initialisation de la + séquence (voir l'avis de sécurité FreeBSD-SA-00:52). &merged; + + Différents dépassements de tampons dans &man.tcpdump.1; ont été + corrigés (voir l'avis de sécurité FreeBSD-SA-00:61). &merged; + + Le trou de sécurité de &man.top.1; a été corrigé + (voir l'avis de sécurité FreeBSD-SA-00:62). &merged; + + Un potentiel trou de sécurité du a une erreur potentielle + dans &man.gethostbyname.3; a été corrigé (voir l'avis de sécurité + FreeBSD-SA-00:63). &merged; + + Un potentiel dépassement de tampon dans la libraire + &man.ncurses.3; permettant l'execution de programme + via &man.systat.1; a été corrigé(voir l'avis de sécurité + FreeBSD-SA-00:68). &merged; + + La vulnérabilité de &man.telnetd.8; causant + une consommation importante de ressources du serveur + a été corrigée (voir l'avis de sécurité FreeBSD-SA-00:69). &merged; + La commande nat deny_incoming de + &man.ppp.8; fonctionne maintenant correctement (voir l'avis + de sécurité FreeBSD-SA-00:70). &merged; - + La vulnérabilité dans les fichiers temporaires créés par + &man.csh.1;/&man.tcsh.1; permettant d'écraser certains fichiers + utilisateurs a été corrigée (voir l'avis de sécurité FreeBSD-SA-00:76). &merged; + + Le binaire &man.ssh.1; n'est plus SUID root par défaut. &merged; + + Différentes corrections ont été apportées à l'implémentation + de Kerberos IV relatives a des variables d'environnements, un + possible dépassent de tampon, et l'écrasement de fichiers de + tickets. &merged; + + &man.telnet.1; nettoie maintenant mieux son environnement.&merged; + + Différentes vulnérabilités dans &man.procfs.5; ont été + corrigées (voir l'avis de sécurité FreeBSD-SA-00:77). &merged; + + Un bogue dans OpenSSH dans + lesquel un serveur n'etait pas capable de désactivé &man.ssh-agent.1; + ou X11Forwarding a été corrigé (voir l'avis + de sécurité FreeBSD-SA-01:01). &merged; + + Un bogue dans &man.ipfw.8; et &man.ip6fw.8; traitant + des segments TCP entrants comme des connexions établies + a été corrigé (voir l'avis de sécurité FreeBSD-SA-01:08). &merged; + + Un bogue dans &man.crontab.1; permettant a un utilisateur + de lire n'importe quel fichier en ayant une syntaxe de &man.crontab.5; + valide a été corrigé(voir l'avis de sécurité FreeBSD-SA-01:09). &merged; + + La vulnérabilité dans &man.inetd.8; permettant l'accès + en lecture aux 16 bytes initiaux des fichiers accessibles + par le groupe wheel a été corrigé(voir + l'avis de sécrurité FreeBSD-SA-01:11). &merged; + + Un bogue dans &man.periodic.8; qui utilisait des fichiers + temporaires de façon peu sécurisée a été corrigé (voir l'avis + de sécurité FreeBSD-SA-01:12). &merged; + + Un bogue dans &man.sort.1; permettant a un attaquant d'arrèter + son traitement a été corrigé (voir l'avis de sécurité + FreeBSD-SA-01:13). &merged; + + OpenSSH intègre maintenant un code + permettant de prévenir (plutot que de limiter le nombre + de connexions) aux attaques permettant de trouver la clef + du serveur (pas la clef de la machine) en regénérant une nouvelle + clef lorsque un problème RSA est détecté (voir l'avis de sécurité + FreeBSD-SA-01:24). &merged; + + Plusieurs programmes ont subit une correction dans le formattage + de l'affichage de sortie des chaines pour réduire le risque + de vulnérabilités. &merged; + + Plusieurs programmes utilisants des fichiers temporaires les + utilisent maintenant de façon plus sécurisée. &merged; + + Un bogue dans ICMP premettant a un attaquant de perturber + les sessions TCP et UDP a été corrigé. &merged; + + Un bogue dans &man.timed.8;, causant un crash lors de l'envoi + de paquets mals formés, a été corrigé (voir l'avis de sécurité + FreeBSD-SA-01:28). &merged; + + Un bogue dans &man.rwhod.8;, permettant de le "crasher" lors de + l'envoi de paquets mal formés a été corrigé (voir l'avis de sécurité + FreeBSD-SA-01:29). &merged; + + Un trou de sécurité dans les implémentations FFS et EXT2FS de &os; + permettant à des utilisateurs l'accès a des données non autorisées, a été + corrigé. (voir l'avis de sécurité FreeBSD-SA-01:30). &merged; + + Un vulnérabilité, exploitable à distance, de &man.ntpd.8; a + été réglée(voir l'avis de sécurité FreeBSD-SA-01:31). &merged; + + Un trou de sécurité dans le mécanisme de "cache" des fragments IP + d'IPFilter a été corrigé (voir l'avis de + sécurité FreeBSD-SA-01:32). &merged; + + Un dépassement dans &man.glob.3; permettant l'execution de code + dans le serveur de FTP a été corrigé. De plus, pour prévenir certaines + formes d'attaques DOS, &man.glob.3; permet de limiter le nombre de + répertoires qu'il retourne. &man.ftpd.8; utilise maintenant cette + fonctionnalité (voeyz l'avis de sécurité FreeBSD-SA-01:33). &merged; + + L'initialisation des numéros de séquences TCP est plus + aléatoire (voyez l'avis de sécurité FreeBSD-SA-01:39). Suite + a des potentiels problèmes de compatiblité, cette fonctionalité + de sécurité peut etre activé ou désactivé via la variable sysctl + net.inet.tcp.tcp_seq_genscheme.&merged; + + Un vulnérabilité dans les routines &man.fts.3; (utilisés par + des applications pour parcourir de façon récursive un système de fichier) + permet à un programme de lire des fichiers en dehors de la hiérarchie + de répertoire autorisé. Ce bogue a été corrigé voir l'avis de sécurité + FreeBSD-SA-01:40). &merged; + + L'implémentation de la couche TCP de &os; a été rendue plus + résistante aux attaques SYN, en éliminant le segment RST envoyé + normalement lors du nettoyage d'une connexion de la file + d'attente + + OpenSSH prend, maintenant, l'UID + de l'utilisateur avant d'essayer d'effacer le fichier + d'authentification, annulant les effets d'une "race" + + A flaw allowed some signal handlers to remain in effect in a + child process after being exec-ed from its parent. This allowed + an attacker to execute arbitrary code in the context of a setuid + binary. This flaw has been corrected (see security advisory + FreeBSD-SA-01:42). &merged; + + Un dépassement de buffer à distance dans &man.tcpdump.1; a été + corrigé (voir l'avis de sécurité FreeBSD-SA-01:48). &merged; + + Un dépassement de buffer à distance dans &man.telnetd.8; a été + corrigé (voir l'avis de sécurité FreeBSD-SA-01:49). &merged; + + Les nouvelles variables sysctl + net.inet.ip.maxfragpackets + et net.inet.ip6.maxfragpackets permettent + de limiter la quantité de mémoire utilisée par les fragments des + paquets IPv4 et IPv6; cela permet de mieux se prévenir contre les + attaques par déni de service (voyez l'avis de sécurité + FreeBSD-SA-01:52). &merged; + + Tous les services dans inetd.conf sont + maintenant désactivés par défaut pour les nouvelles installations. + &man.sysinstall.8; done la possiblité d'activer ou désactiver + &man.inetd.8; pour les nouvelles installation, comme l'édition + de inetd.conf. &merged; + + Un bogue dans l'implémentation des règles de &man.ipfw.8; + comportant me sur les liens point à point a + été corrigé. Les règles de filtrage comportant me + matchaient l'adresse IP distante a la place de l'adresse IP + local (voyez l'avis de sécurité FreeBSD-SA-01:53). &merged; + + Une vulnérabilité dans &man.procfs.5;, permettant a un + processus de lire des informations sensibles depuis l'espace + mémoire d'un autre processus, a été corrigée (voyez l'avis + de sécurité FreeBSD-SA-01:55). &merged; + + La vérification d'un nom de machine en mode + PARANOID de tcp_wrappers + fonctionne maintenant correctement (voyez l'avis de sécurité + FreeBSD-SA-01:56). &merged; + + Un bogue permettant de passer root dans &man.sendmail.8; a + été corrigé(voyez l'avis de sécurité FreeBSD-SA-01:57). &merged; + + Un bogue permettant de passer root a distance dans &man.lpd.8; + a été corrigé (voyez l'avis de sécurité FreeBSD-SA-01:58). &merged; + + Une "race condition" dans &man.rmuser.8; qui rendait brièvement + /etc/master.passwd lisible pour tout utilisateur + a été corrigée (voyez l'avis de sécurité FreeBSD-SA-01:59). &merged; + + Un bogue dans UUCP a été + corrigé (voyez l'avis de sécurité FreeBSD-SA-01:62). Tous + les binaires n'appartenant pas a root + dans les "path" système standard ont maintenant le drapeau + schg permettant d'empecher l'exploitation + de bogues via &man.cron.8;, par root, + ou par un utilisateur autre que celui auquel appartient + le binaire. De plus &man.uustat.1; est lancé maintenant + via /etc/periodic/daily/410.status-uucp + sous l'utilisateur uucp, et non + plus root. Dans &os; -CURRENT, + UUCP ne fait plus partie des binaires + systèmes, et a été déplacé dans la collection des Ports. &merged; + + Un trou de sécurité, sous la forme d'un dépassement de buffer, dans + l'appel système &man.semop.2; a été corrigé.&merged; + + Un trou de sécurité dans OpenSSH, + permettant a un utilisateur d'executer du code avec des privilèges + supplémentaires si UseLogin yes était activé, a été + corrigé. Notez que la valeur par défaut de ce paramètre est + UseLogin no. (Voyez l'avis de sécurité + FreeBSD-SA-01:63.) &merged; + + L'utilisation de répertoire temporaire par &man.pkg.add.1; + pouvait permettre a un attaquant local de modifier le contenu + des binaires distribués au moment ou ils allaient etre installé. Ce + bogue a été corrigé (voyez l'avis de sécurité FreeBSD-SA-02:01). + &merged; + + Une "race condition" dans &man.pw.8;, permettant de lire + le contenu du fichier /etc/master.passwd, a + été corrigé (voyez l'avis de sécurité FreeBSD-SA-02:02.) &merged; + + Un bogue dans &man.k5su.8; pouvait permettre a un processus + ayant obtenu des privilèges super-utilisateur de les ré-obtenir. Ce + bogue a été corrigé (voyez l'avis de sécurité FreeBSD-SA-02:07.) + &merged; + + Changements dans les programmes utilisateurs ==== //depot/projects/ia64/release/picobsd/floppy.tree/etc/rc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: src/release/picobsd/floppy.tree/etc/rc1,v 1.3 2002/03/10 20:47:26 luigi Exp $ +# $FreeBSD: src/release/picobsd/floppy.tree/etc/rc1,v 1.4 2002/04/07 20:41:09 luigi Exp $ ### rc1, next stage 'rc' for PicoBSD -- THIS IS NOT THE NORMAL /etc/rc . /etc/rc.conf.defaults # Load default procedures @@ -16,8 +16,9 @@ ### Now use some variables to override files in /etc ### ( IFS='' -[ -n ${host_conf} ] && echo ${host_conf} > /etc/host.conf -[ -n ${resolv_conf} ] && echo ${resolv_conf} > /etc/resolv.conf +[ -n "${host_conf}" ] && echo ${host_conf} > /etc/host.conf +[ -n "${resolv_conf}" ] && echo ${resolv_conf} > /etc/resolv.conf +[ -n "${rc_local}" ] && echo ${rc_local} > /etc/rc.local unset IFS ) @@ -43,6 +44,9 @@ [ -n "$network_pass1_done" ] && network_pass2 [ -n "$network_pass2_done" ] && network_pass3 +[ -f /etc/syslog.conf -a -f /stand/syslogd ] && \ + { echo "Starting syslogd."; syslogd ${syslogd_flags} ; } + [ "${inetd_enable}" = "YES" -a -f /stand/inetd ] && \ { echo "Starting inetd."; inetd ${inetd_flags} ; } ==== //depot/projects/ia64/release/picobsd/tinyware/simple_httpd/simple_httpd.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/release/picobsd/tinyware/simple_httpd/simple_httpd.c,v 1.7 2001/07/09 09:23:43 brian Exp $ + * $FreeBSD: src/release/picobsd/tinyware/simple_httpd/simple_httpd.c,v 1.12 2002/04/07 17:42:27 asmodai Exp $ */ #include @@ -99,12 +99,13 @@ perror("bind socket"); exit(1); } - if (verbose) printf("simple_httpd\n",http_port); + if (verbose) printf("simple_httpd:%d\n",http_port); } /* * Wait here until we see an incoming http request */ +void wait_connection(void) { int lg; @@ -121,7 +122,8 @@ /* * Print timestamp for HTTP HEAD and GET */ -http_date() +void +http_date(void) { time_t tl; char buff[50]; @@ -135,6 +137,7 @@ /* * Send data to the open socket */ +void http_output(char *html) { write(con_sock, html, strlen(html)); @@ -146,6 +149,7 @@ * Create and write the log information to file * Log file format is one line per entry */ +void log_line(char *req) { char log_buff[256]; @@ -189,16 +193,15 @@ * We have a connection. Identify what type of request GET, HEAD, CGI, etc * and do what needs to be done */ -http_request() +void +http_request(void) { - int fd, lg, ld, i; + int fd, lg, i; int cmd = 0; - int http1 = 0; char *p, *par; char *filename, *c; struct stat file_status; char req[1024]; - char msg[1024]; char buff[8192]; lg = read(con_sock, req, 1024); @@ -309,7 +312,7 @@ http_output(httpd_server_ident); http_date(); - sprintf(buff, "Content-length: %d\r\n", file_status.st_size); + sprintf(buff, "Content-length: %lld\r\n", file_status.st_size); if (strstr(filename,".txt")) { strcpy(buff,"Content-type: text/plain\r\n"); @@ -347,12 +350,12 @@ * Should satisfy simple httpd needs. For more demanding situations * apache is probably a better (but much larger) choice. */ +int main(int argc, char *argv[]) { extern char *optarg; extern int optind; - int bflag, ch, fd, ld; - int lg; + int ch, ld; int httpd_group = 65534; pid_t server_pid; ==== //depot/projects/ia64/sbin/disklabel/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/17/94 -# $FreeBSD: src/sbin/disklabel/Makefile,v 1.8 2001/12/04 02:19:45 obrien Exp $ +# $FreeBSD: src/sbin/disklabel/Makefile,v 1.10 2002/04/08 06:26:46 phk Exp $ PROG= disklabel SRCS= disklabel.c @@ -8,6 +8,5 @@ .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 .endif -WARNS= 0 .include ==== //depot/projects/ia64/sbin/disklabel/disklabel.c#8 (text+ko) ==== @@ -52,7 +52,7 @@ /* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */ #endif static const char rcsid[] = - "$FreeBSD: src/sbin/disklabel/disklabel.c,v 1.47 2002/04/04 20:22:15 phk Exp $"; + "$FreeBSD: src/sbin/disklabel/disklabel.c,v 1.49 2002/04/07 10:57:00 phk Exp $"; #endif /* not lint */ #include @@ -134,8 +134,6 @@ struct disklabel lab; char bootarea[BBSIZE]; -/* partition 'c' is the full disk and is special */ -#define FULL_DISK_PART 2 #define MAX_PART ('z') #define MAX_NUM_PARTS (1 + MAX_PART - 'a') char part_size_type[MAX_NUM_PARTS]; @@ -159,12 +157,7 @@ int rflag; int disable_write; /* set to disable writing to disk label */ -#ifdef DEBUG -int debug; -#define OPTIONS "BNRWb:denrs:w" -#else #define OPTIONS "BNRWb:enrs:w" -#endif int main(int argc, char *argv[]) @@ -220,11 +213,6 @@ usage(); op = WRITE; break; -#ifdef DEBUG - case 'd': - debug++; - break; -#endif case '?': default: usage(); @@ -628,11 +616,6 @@ } #endif } -#ifdef DEBUG - if (debug) - fprintf(stderr, "bootstraps: xxboot = %s, bootxx = %s\n", - xxboot, bootxx ? bootxx : "NONE"); -#endif /* * Strange rules: @@ -945,10 +928,11 @@ int getasciilabel(FILE *f, struct disklabel *lp) { - char **cpp, *cp; + char *cp; + const char **cpp; struct partition *pp; unsigned int part; - char *tp, *s, line[BUFSIZ]; + char *tp, line[BUFSIZ]; int v, lineno = 0, errors = 0; int i; @@ -973,7 +957,7 @@ tp = "unknown"; cpp = dktypenames; for (; cpp < &dktypenames[DKMAXTYPES]; cpp++) - if ((s = *cpp) && streq(s, tp)) { + if (*cpp && streq(*cpp, tp)) { lp->d_type = cpp - dktypenames; goto next; } @@ -1216,7 +1200,7 @@ cp = tp, tp = word(cp); cpp = fstypenames; for (; cpp < &fstypenames[FSMAXTYPES]; cpp++) - if ((s = *cpp) && streq(s, cp)) { + if (*cpp && streq(*cpp, cp)) { pp->p_fstype = cpp - fstypenames; goto gottype; @@ -1366,8 +1350,7 @@ pp = &lp->d_partitions[i]; if (part_set[i]) { if (part_size_type[i] == '*') { - /* partition 2 ('c') is special */ - if (i == FULL_DISK_PART) { + if (i == RAW_PART) { pp->p_size = lp->d_secperunit; } else { if (hog_part != -1) @@ -1416,8 +1399,7 @@ pp->p_size = size; } /* else already in sectors */ - /* partition 2 ('c') is special */ - if (i != FULL_DISK_PART) + if (i != RAW_PART) total_size += size; } } @@ -1427,7 +1409,7 @@ if (total_percent != 0) { long free_space = lp->d_secperunit - total_size; if (total_percent > 100) { - fprintf(stderr,"total percentage %d is greater than 100\n", + fprintf(stderr,"total percentage %lu is greater than 100\n", total_percent); errors++; } @@ -1446,7 +1428,7 @@ } } else { fprintf(stderr, - "%ld sectors available to give to '*' and '%' partitions\n", + "%ld sectors available to give to '*' and '%%' partitions\n", free_space); errors++; /* fix? set all % partitions to size 0? */ @@ -1466,8 +1448,7 @@ pp = &lp->d_partitions[i]; if (part_set[i]) { if (part_offset_type[i] == '*') { - /* partition 2 ('c') is special */ - if (i == FULL_DISK_PART) { + if (i == RAW_PART) { pp->p_offset = 0; } else { pp->p_offset = current_offset; @@ -1475,28 +1456,26 @@ } } else { /* allow them to be out of order for old-style tables */ - /* partition 2 ('c') is special */ if (pp->p_offset < current_offset && - seen_default_offset && i != FULL_DISK_PART) { + seen_default_offset && i != RAW_PART) { fprintf(stderr, -"Offset %ld for partition %c overlaps previous partition which ends at %ld\n", - pp->p_offset,i+'a',current_offset); +"Offset %ld for partition %c overlaps previous partition which ends at %lu\n", + (long)pp->p_offset,i+'a',current_offset); fprintf(stderr, "Labels with any *'s for offset must be in ascending order by sector\n"); errors++; } else if (pp->p_offset != current_offset && - i != FULL_DISK_PART && seen_default_offset) { + i != RAW_PART && seen_default_offset) { /* * this may give unneeded warnings if * partitions are out-of-order */ Warning( "Offset %ld for partition %c doesn't match expected value %ld", - pp->p_offset, i + 'a', current_offset); + (long)pp->p_offset, i + 'a', current_offset); } } - /* partition 2 ('c') is special */ - if (i != FULL_DISK_PART) + if (i != RAW_PART) current_offset = pp->p_offset + pp->p_size; } } @@ -1534,7 +1513,7 @@ part); errors++; } - if (i == FULL_DISK_PART) + if (i == RAW_PART) { if (pp->p_fstype != FS_UNUSED) Warning("partition %c is not marked as unused!",part); @@ -1553,8 +1532,7 @@ /* check for overlaps */ /* this will check for all possible overlaps once and only once */ for (j = 0; j < i; j++) { - /* partition 2 ('c') is special */ - if (j != FULL_DISK_PART && i != FULL_DISK_PART && + if (j != RAW_PART && i != RAW_PART && part_set[i] && part_set[j]) { pp2 = &lp->d_partitions[j]; if (pp2->p_offset < pp->p_offset + pp->p_size && ==== //depot/projects/ia64/sbin/mount_std/mount_std.c#3 (text+ko) ==== @@ -43,13 +43,15 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/mount_std/mount_std.c,v 1.12 2002/03/21 13:14:20 imp Exp $"; + "$FreeBSD: src/sbin/mount_std/mount_std.c,v 1.13 2002/04/07 13:28:18 mux Exp $"; #endif /* not lint */ #include #include +#include #include +#include #include #include #include @@ -74,6 +76,7 @@ int ch, mntflags; char mntpath[MAXPATHLEN]; struct vfsconf vfc; + struct iovec iov[4]; int error; /* @@ -121,7 +124,25 @@ /* resolve the mountpoint with realpath(3) */ (void)checkpath(argv[1], mntpath); - if (mount(vfc.vfc_name, mntpath, mntflags, NULL)) + error = mount(vfc.vfc_name, mntpath, mntflags, NULL); + + /* + * Try with the new mount syscall in the case + * this filesystem has been converted. + */ + if (error && errno == EOPNOTSUPP) { + iov[0].iov_base = "fstype"; + iov[0].iov_len = sizeof("fstype"); + iov[1].iov_base = vfc.vfc_name; + iov[1].iov_len = strlen(vfc.vfc_name) + 1; + iov[2].iov_base = "fspath"; + iov[2].iov_len = sizeof("fstype"); + iov[3].iov_base = mntpath; + iov[3].iov_len = strlen(mntpath) + 1; + error = nmount(iov, 4, mntflags); + } + + if (error) err(EX_OSERR, NULL); exit(0); } ==== //depot/projects/ia64/sbin/newfs/mkfs.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.53 2002/04/04 09:45:11 bde Exp $"; + "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.54 2002/04/07 14:57:57 phk Exp $"; #endif /* not lint */ #include @@ -217,9 +217,9 @@ sblock.fs_nspf = sblock.fs_fsize / sectorsize; sblock.fs_fsbtodb = ilog2(NSPF(&sblock)); sblock.fs_sblkno = - roundup(howmany(bbsize + sbsize, sblock.fs_fsize), sblock.fs_frag); + roundup(howmany(BBSIZE + SBSIZE, sblock.fs_fsize), sblock.fs_frag); sblock.fs_cblkno = (daddr_t)(sblock.fs_sblkno + - roundup(howmany(sbsize, sblock.fs_fsize), sblock.fs_frag)); + roundup(howmany(SBSIZE, sblock.fs_fsize), sblock.fs_frag)); sblock.fs_iblkno = sblock.fs_cblkno + sblock.fs_frag; sblock.fs_cgoffset = roundup(howmany(sblock.fs_nsect, NSPF(&sblock)), sblock.fs_frag); @@ -545,7 +545,7 @@ */ fsinit(utime); sblock.fs_time = utime; - wtfs((int)SBOFF / sectorsize, sbsize, (char *)&sblock); + wtfs((int)SBOFF / sectorsize, SBSIZE, (char *)&sblock); for (i = 0; i < sblock.fs_cssize; i += sblock.fs_bsize) wtfs(fsbtodb(&sblock, sblock.fs_csaddr + numfrags(&sblock, i)), sblock.fs_cssize - i < sblock.fs_bsize ? @@ -556,7 +556,7 @@ */ for (cylno = 0; cylno < sblock.fs_ncg; cylno++) wtfs(fsbtodb(&sblock, cgsblock(&sblock, cylno)), - sbsize, (char *)&sblock); + SBSIZE, (char *)&sblock); wtfsflush(); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 4:42:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72AA837B417; Mon, 8 Apr 2002 04:42:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A0C0A37B416 for ; Mon, 8 Apr 2002 04:42:13 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38BgDV83445 for perforce@freebsd.org; Mon, 8 Apr 2002 04:42:13 -0700 (PDT) (envelope-from des@freebsd.org) Date: Mon, 8 Apr 2002 04:42:13 -0700 (PDT) Message-Id: <200204081142.g38BgDV83445@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9371 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9371 Change 9371 by des@des.at.des.thinksec.com on 2002/04/08 04:42:13 Add openpam_{borrow,restore}_cred() (for temporarily switching to user credentials) and openpam_free_data() (generic cleanup function for pam_set_data() consumers) Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/doc/man/Makefile#6 edit ... //depot/projects/openpam/include/security/openpam.h#15 edit ... //depot/projects/openpam/lib/Makefile#13 edit ... //depot/projects/openpam/lib/openpam_borrow_cred.c#1 add ... //depot/projects/openpam/lib/openpam_free_data.c#1 add ... //depot/projects/openpam/lib/openpam_impl.h#12 edit ... //depot/projects/openpam/lib/openpam_restore_cred.c#1 add Differences ... ==== //depot/projects/openpam/doc/man/Makefile#6 (text+ko) ==== @@ -31,12 +31,15 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/doc/man/Makefile#5 $ +# $P4: //depot/projects/openpam/doc/man/Makefile#6 $ # MAN = +MAN += openpam_borrow_cred.3 +MAN += openpam_free_data.3 MAN += openpam_get_option.3 MAN += openpam_log.3 +MAN += openpam_restore_cred.3 MAN += openpam_set_option.3 MAN += openpam_ttyconv.3 MAN += pam.3 ==== //depot/projects/openpam/include/security/openpam.h#15 (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#14 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#15 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED @@ -46,14 +46,28 @@ extern "C" { #endif +struct passwd; + /* * API extensions */ +int +openpam_borrow_cred(pam_handle_t *_pamh, + const struct passwd *_pwd); + +void +openpam_free_data(pam_handle_t *_pamh, + void *_data, + int _status); + const char * openpam_get_option(pam_handle_t *_pamh, const char *_option); int +openpam_restore_cred(pam_handle_t *_pamh); + +int openpam_set_option(pam_handle_t *_pamh, const char *_option, const char *_value); ==== //depot/projects/openpam/lib/Makefile#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/Makefile#12 $ +# $P4: //depot/projects/openpam/lib/Makefile#13 $ # LIB = pam @@ -44,12 +44,15 @@ CFLAGS += -DLIB_MAJ=${SHLIB_MAJOR} SRCS = +SRCS += openpam_borrow_cred.c SRCS += openpam_dispatch.c SRCS += openpam_dynamic.c SRCS += openpam_findenv.c +SRCS += openpam_free_data.c SRCS += openpam_get_option.c SRCS += openpam_load.c SRCS += openpam_log.c +SRCS += openpam_restore_cred.c SRCS += openpam_set_option.c SRCS += openpam_static.c SRCS += openpam_ttyconv.c ==== //depot/projects/openpam/lib/openpam_impl.h#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_impl.h#11 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#12 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -93,6 +93,16 @@ int env_size; }; +#ifdef NGROUPS_MAX +#define PAM_SAVED_CRED "pam_saved_cred" +struct pam_saved_cred { + uid_t euid; + gid_t egid; + gid_t groups[NGROUPS_MAX]; + int ngroups; +}; +#endif + #define PAM_OTHER "other" int openpam_dispatch(pam_handle_t *, int, int); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 5: 6:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB99A37B41A; Mon, 8 Apr 2002 05:05:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CF85937B41B for ; Mon, 8 Apr 2002 05:05:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38C5gs88736 for perforce@freebsd.org; Mon, 8 Apr 2002 05:05:42 -0700 (PDT) (envelope-from des@freebsd.org) Date: Mon, 8 Apr 2002 05:05:42 -0700 (PDT) Message-Id: <200204081205.g38C5gs88736@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9373 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9373 Change 9373 by des@des.at.des.thinksec.com on 2002/04/08 05:04:56 Regenerate. Affected files ... ... //depot/projects/openpam/doc/man/openpam_borrow_cred.3#1 add ... //depot/projects/openpam/doc/man/openpam_free_data.3#1 add ... //depot/projects/openpam/doc/man/openpam_get_option.3#5 edit ... //depot/projects/openpam/doc/man/openpam_log.3#6 edit ... //depot/projects/openpam/doc/man/openpam_restore_cred.3#1 add ... //depot/projects/openpam/doc/man/openpam_set_option.3#5 edit ... //depot/projects/openpam/doc/man/openpam_ttyconv.3#6 edit ... //depot/projects/openpam/doc/man/pam.3#12 edit ... //depot/projects/openpam/doc/man/pam_acct_mgmt.3#10 edit ... //depot/projects/openpam/doc/man/pam_authenticate.3#10 edit ... //depot/projects/openpam/doc/man/pam_chauthtok.3#10 edit ... //depot/projects/openpam/doc/man/pam_close_session.3#10 edit ... //depot/projects/openpam/doc/man/pam_end.3#10 edit ... //depot/projects/openpam/doc/man/pam_error.3#10 edit ... //depot/projects/openpam/doc/man/pam_get_authtok.3#11 edit ... //depot/projects/openpam/doc/man/pam_get_data.3#10 edit ... //depot/projects/openpam/doc/man/pam_get_item.3#11 edit ... //depot/projects/openpam/doc/man/pam_get_user.3#11 edit ... //depot/projects/openpam/doc/man/pam_getenv.3#10 edit ... //depot/projects/openpam/doc/man/pam_getenvlist.3#10 edit ... //depot/projects/openpam/doc/man/pam_info.3#10 edit ... //depot/projects/openpam/doc/man/pam_open_session.3#10 edit ... //depot/projects/openpam/doc/man/pam_prompt.3#11 edit ... //depot/projects/openpam/doc/man/pam_putenv.3#10 edit ... //depot/projects/openpam/doc/man/pam_set_data.3#10 edit ... //depot/projects/openpam/doc/man/pam_set_item.3#10 edit ... //depot/projects/openpam/doc/man/pam_setcred.3#11 edit ... //depot/projects/openpam/doc/man/pam_setenv.3#10 edit ... //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#6 edit ... //depot/projects/openpam/doc/man/pam_sm_authenticate.3#6 edit ... //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#6 edit ... //depot/projects/openpam/doc/man/pam_sm_close_session.3#6 edit ... //depot/projects/openpam/doc/man/pam_sm_open_session.3#6 edit ... //depot/projects/openpam/doc/man/pam_sm_setcred.3#6 edit ... //depot/projects/openpam/doc/man/pam_start.3#10 edit ... //depot/projects/openpam/doc/man/pam_strerror.3#10 edit ... //depot/projects/openpam/doc/man/pam_verror.3#8 edit ... //depot/projects/openpam/doc/man/pam_vinfo.3#8 edit ... //depot/projects/openpam/doc/man/pam_vprompt.3#8 edit Differences ... ==== //depot/projects/openpam/doc/man/openpam_get_option.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#4 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_log.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#6 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt OPENPAM_LOG 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_set_option.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#4 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_ttyconv.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#6 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam.3#12 (text+ko) ==== @@ -31,12 +31,15 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.3#12 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM 3 .Os .Sh NAME +.Nm openpam_borrow_cred , +.Nm openpam_free_data , +.Nm openpam_restore_cred , .Nm pam_acct_mgmt , .Nm pam_authenticate , .Nm pam_chauthtok , @@ -68,6 +71,12 @@ .Sh SYNOPSIS .In security/pam_appl.h .Ft int +.Fn openpam_borrow_cred "pam_handle_t *pamh" "const struct passwd *pwd" +.Ft void +.Fn openpam_free_data "pam_handle_t *pamh" "void *data" "int status" +.Ft int +.Fn openpam_restore_cred "pam_handle_t *pamh" +.Ft int .Fn pam_acct_mgmt "pam_handle_t *pamh" "int flags" .Ft int .Fn pam_authenticate "pam_handle_t *pamh" "int flags" @@ -80,7 +89,7 @@ .Ft int .Fn pam_error "pam_handle_t *pamh" "const char *fmt" "..." .Ft int -.Fn pam_get_authtok "pam_handle_t *pamh" "const char **authtok" "const char *prompt" +.Fn pam_get_authtok "pam_handle_t *pamh" "int item" "const char **authtok" "const char *prompt" .Ft int .Fn pam_get_data "pam_handle_t *pamh" "const char *module_data_name" "const void **data" .Ft int @@ -185,6 +194,9 @@ Unknown user. .El .Sh SEE ALSO +.Xr openpam_borrow_cred 3 , +.Xr openpam_free_data 3 , +.Xr openpam_restore_cred 3 , .Xr pam_acct_mgmt 3 , .Xr pam_authenticate 3 , .Xr pam_chauthtok 3 , ==== //depot/projects/openpam/doc/man/pam_acct_mgmt.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_authenticate.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME @@ -46,7 +46,31 @@ .Ft int .Fn pam_authenticate "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +function attempts to authenticate the user +associated with the pam context specified by the +.Va pamh +argument. +.Pp +The application is free to call +.Nm +as many times as it +wishes, but some modules may maintain an internal retry counter and +return +.Dv PAM_MAXTRIES +when it exceeds some preset or hardcoded limit. +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Pp +.Bd -literal + =PAM_SILENT + Do not emit any messages. + =PAM_DISALLOW_NULL_AUTHTOK + Fail if the user's authentication token is null. .Sh RETURN VALUES The .Nm ==== //depot/projects/openpam/doc/man/pam_chauthtok.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME @@ -46,7 +46,23 @@ .Ft int .Fn pam_chauthtok "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +function attempts to change the authentication token +for the user associated with the pam context specified by the +.Va pamh +argument. +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Pp +.Bd -literal + =PAM_SILENT + Do not emit any messages. + =PAM_CHANGE_EXPIRED_AUTHTOK + Change only those authentication tokens that have expired. .Sh RETURN VALUES The .Nm ==== //depot/projects/openpam/doc/man/pam_close_session.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_end.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_END 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_error.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_ERROR 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_authtok.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#11 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME @@ -44,9 +44,66 @@ .Sh SYNOPSIS .In security/pam_appl.h .Ft int -.Fn pam_get_authtok "pam_handle_t *pamh" "const char **authtok" "const char *prompt" +.Fn pam_get_authtok "pam_handle_t *pamh" "int item" "const char **authtok" "const char *prompt" .Sh DESCRIPTION -No description available. +The +.Nm +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 +.Va authtok +argument. +.Pp +The +.Va item +argument must have one of the following values: +.Pp +.Bd -literal + =PAM_AUTHTOK + Returns the current authentication token, or the new token + when changing authentication tokens. + =PAM_OLDAUTHTOK + Returns the previous authentication token when changing + authentication tokens. + +.Ed +The +.Va prompt +argument specifies a prompt to use if no token is cached. +.Ed +If it is +.Dv NULL , +the +.Dv PAM_AUTHTOK_PROMPT +or +.Dv PAM_OLDAUTHTOK_PROMPT +item, +.Ed +as appropriate, will be used. If that item is also +.Dv NULL , +a hardcoded +.Ed +default prompt will be used. + +.Ed +If +.Va item +is set to +.Dv PAM_AUTHTOK +and there is a non-null +.Dv PAM_OLDAUTHTOK +.Ed +item, +.Nm +will ask the user to confirm the new token by +.Ed +retyping it. If there is a mismatch, +.Nm +will return +.Ed +.Dv PAM_TRY_AGAIN . + .Sh RETURN VALUES The .Nm @@ -58,9 +115,13 @@ Conversation failure. .It Bq Er PAM_SYSTEM_ERR System error. +.It Bq Er PAM_TRY_AGAIN +Try again. .El .Sh SEE ALSO .Xr pam 3 , +.Xr pam_get_item 3 , +.Xr pam_get_user 3 , .Xr pam_strerror 3 .Sh STANDARDS The ==== //depot/projects/openpam/doc/man/pam_get_data.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GET_DATA 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_item.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#11 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GET_ITEM 3 .Os .Sh NAME @@ -85,6 +85,9 @@ .It Dv PAM_AUTHTOK_PROMPT The prompt to use when asking the applicant for an authentication token. +.It Dv PAM_OLDAUTHTOK_PROMPT +The prompt to use when asking the applicant for an +expired authentication token prior to changing it. .El See .Xr pam_start 3 ==== //depot/projects/openpam/doc/man/pam_get_user.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#11 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GET_USER 3 .Os .Sh NAME @@ -46,7 +46,31 @@ .Ft int .Fn pam_get_user "pam_handle_t *pamh" "const char **user" "const char *prompt" .Sh DESCRIPTION -No description available. +The +.Nm +function returns the name of the target user, as +specified to +.Xr pam_start 3 . +If no user was specified, nor set using +.Xr pam_set_item 3 , +.Nm +will prompt for a user name. Either way, +a pointer to the user name is stored in the location pointed to by the +.Va user +argument. +.Pp +The +.Va prompt +argument specifies a prompt to use if no user name is +cached. If it is +.Dv NULL , +the +.Dv PAM_USER_PROMPT +will be used. If that +item is also +.Dv NULL , +a hardcoded default prompt will be used. +.Pp .Sh RETURN VALUES The .Nm @@ -61,6 +85,10 @@ .El .Sh SEE ALSO .Xr pam 3 , +.Xr pam_get_authtok 3 , +.Xr pam_get_item 3 , +.Xr pam_set_item 3 , +.Xr pam_start 3 , .Xr pam_strerror 3 .Sh STANDARDS .Rs ==== //depot/projects/openpam/doc/man/pam_getenv.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GETENV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_getenvlist.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GETENVLIST 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_info.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_INFO 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_open_session.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_prompt.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#11 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_PROMPT 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_putenv.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_PUTENV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_set_data.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SET_DATA 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_set_item.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SET_ITEM 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_setcred.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#11 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_setenv.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SETENV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#6 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_authenticate.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#6 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#6 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_close_session.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#6 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_open_session.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#6 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_setcred.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#6 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_start.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_START 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_strerror.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#10 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_STRERROR 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_verror.3#8 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#8 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_VERROR 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_vinfo.3#8 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#8 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_VINFO 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_vprompt.3#8 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#8 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_VPROMPT 3 .Os .Sh NAME To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 5:20:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3572E37B41B; Mon, 8 Apr 2002 05:20:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8101137B404 for ; Mon, 8 Apr 2002 05:20:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38CK0792906 for perforce@freebsd.org; Mon, 8 Apr 2002 05:20:00 -0700 (PDT) (envelope-from des@freebsd.org) Date: Mon, 8 Apr 2002 05:20:00 -0700 (PDT) Message-Id: <200204081220.g38CK0792906@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9374 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9374 Change 9374 by des@des.at.des.thinksec.com on 2002/04/08 05:19:12 Release documentation for OpenPAM Cinchona. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/CREDITS#1 add ... //depot/projects/openpam/HISTORY#8 edit ... //depot/projects/openpam/README#3 edit ... //depot/projects/openpam/RELNOTES#7 edit Differences ... ==== //depot/projects/openpam/HISTORY#8 (text+ko) ==== @@ -1,4 +1,35 @@ ============================================================================ +OpenPAM Cinchona 2002-04-08 + + - ENHANCE: Improved documentation for several API functions. + + - BUGFIX: Fix bug in pam_set_data() that would result in corruption + of the module data list. + + - BUGFIX: Allocate the correct amount of memory for the environment + list in pam_putenv(). + + - ENHANCE: Change pam_get_authtok()'s prototype so the caller can + specify what token it wants. Also introduce PAM_OLDAUTHTOK_PROMPT. + + - BUGFIX: Plug memory leak in pam_get_user() / pam_get_authtok(), and + reduce differences between these very similar functions. + + - ENHANCE: Check flags carefully in pam_authenticate() and + pam_chauthtok(). + + - BUGFIX: Fix bugs in portability code; libpam now builds on NetBSD. + + - ENHANCE: In pam_get_authtok(), if PAM_OLDAUTHTOK is set, we're + asked for PAM_AUTHTOK, and we have to prompt the user, prompt her + twice and compare the responses. + + - ENHANCE: Add openpam_{borrow,restore}_cred(), for temporarily + switching to user credentials. + + - ENHANCE: Add openpam_free_data(), a generic cleanup function for + pam_set_data() consumers. +============================================================================ OpenPAM Centaury 2002-03-14 - BUGFIX: Add missing #include to openpam_log.c. @@ -83,4 +114,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#7 $ +$P4: //depot/projects/openpam/HISTORY#8 $ ==== //depot/projects/openpam/README#3 (text+ko) ==== @@ -13,18 +13,14 @@ paper and in OSF-RFC 86.0; this corresponds to the full XSSO API except for mappings and secondary authentication. - - Extends the API with several useful and time-saving functions: - pam_error(), pam_get_authtok(), pam_info(), pam_prompt(), - pam_setenv(), pam_verror(), pam_vinfo(), pam_vprompt() - - - Offers a number of time-saving convenience functions: - openpam_log(), openpam_ttyconv(). + - Extends the API with several useful and time-saving functions. - Performs strict checking of return values from service modules. - Reads configuration from /etc/pam.d/, /usr/local/etc/pam.d/ and /etc/pam.conf, in that order; this will be made configurable in a - future release.Please direct bug reports and inquiries to - openpam@thinksec.com. + future release. + +Please direct bug reports and inquiries to openpam@thinksec.com. -$P4: //depot/projects/openpam/README#2 $ +$P4: //depot/projects/openpam/README#3 $ ==== //depot/projects/openpam/RELNOTES#7 (text+ko) ==== @@ -1,19 +1,20 @@ - Release notes for OpenPAM Centaury + Release notes for OpenPAM Cinchona ================================== This is a beta release. The library itself is complete. Documentation exists in the form of -man pages for the library functions, though some pages are still +man pages for the library functions, though a few pages are still incomplete. -This release is incorporated into FreeBSD-CURRENT as of 2002-03-14. -It has not been tested on any other OS, though it should build and run -with minimal tweaks on NetBSD and OpenBSD. +This release is incorporated into FreeBSD-CURRENT as of 2002-04-08. +It has also been successfully built on NetBSD, and should build with +minimal or no changes on OpenBSD. It has not been tested on any other +OS. Known issues: - The documentation is still incomplete. -$P4: //depot/projects/openpam/RELNOTES#6 $ +$P4: //depot/projects/openpam/RELNOTES#7 $ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 5:26:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BDBC37B41A; Mon, 8 Apr 2002 05:26:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4E34337B419 for ; Mon, 8 Apr 2002 05:26:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38CQ8i93864 for perforce@freebsd.org; Mon, 8 Apr 2002 05:26:08 -0700 (PDT) (envelope-from des@freebsd.org) Date: Mon, 8 Apr 2002 05:26:08 -0700 (PDT) Message-Id: <200204081226.g38CQ8i93864@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9375 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9375 Change 9375 by des@des.at.des.thinksec.com on 2002/04/08 05:25:12 Last-minute addition to "known issues". Affected files ... ... //depot/projects/openpam/RELNOTES#8 edit Differences ... ==== //depot/projects/openpam/RELNOTES#8 (text+ko) ==== @@ -17,4 +17,9 @@ - The documentation is still incomplete. -$P4: //depot/projects/openpam/RELNOTES#7 $ + - It should be possible to create incomplete modules without + recourse to placeholders or elaborate preprocessor tricks. This + is made difficult by the requirement that it should be possible to + link modules statically. + +$P4: //depot/projects/openpam/RELNOTES#8 $ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 5:37:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E127637B41C; Mon, 8 Apr 2002 05:37:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2DA7437B405 for ; Mon, 8 Apr 2002 05:37:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38CbLH96407 for perforce@freebsd.org; Mon, 8 Apr 2002 05:37:21 -0700 (PDT) (envelope-from des@freebsd.org) Date: Mon, 8 Apr 2002 05:37:21 -0700 (PDT) Message-Id: <200204081237.g38CbLH96407@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9376 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9376 Change 9376 by des@des.at.des.thinksec.com on 2002/04/08 05:36:37 Forgot CREDITS. Affected files ... ... //depot/projects/openpam/MANIFEST#6 edit Differences ... ==== //depot/projects/openpam/MANIFEST#6 (text+ko) ==== @@ -1,6 +1,7 @@ # -# $P4: //depot/projects/openpam/MANIFEST#5 $ +# $P4: //depot/projects/openpam/MANIFEST#6 $ # +CREDITS HISTORY INSTALL LICENSE @@ -13,8 +14,11 @@ bin/su/su.c doc/Makefile doc/man/Makefile +doc/man/openpam_borrow_cred.3 +doc/man/openpam_free_data.3 doc/man/openpam_get_option.3 doc/man/openpam_log.3 +doc/man/openpam_restore_cred.3 doc/man/openpam_set_option.3 doc/man/openpam_ttyconv.3 doc/man/pam.3 @@ -55,13 +59,16 @@ include/security/pam_modules.h include/security/pam_types.h lib/Makefile +lib/openpam_borrow_cred.c lib/openpam_dispatch.c lib/openpam_dynamic.c lib/openpam_findenv.c +lib/openpam_free_data.c lib/openpam_get_option.c lib/openpam_impl.h lib/openpam_load.c lib/openpam_log.c +lib/openpam_restore_cred.c lib/openpam_set_option.c lib/openpam_static.c lib/openpam_ttyconv.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 8: 7:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B56F537B419; Mon, 8 Apr 2002 08:07:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail14.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by hub.freebsd.org (Postfix) with ESMTP id 71FDB37B41C for ; Mon, 8 Apr 2002 08:07:04 -0700 (PDT) Received: (qmail 32697 invoked from network); 8 Apr 2002 15:07:03 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail14.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 8 Apr 2002 15:07:03 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g38F7tv45028; Mon, 8 Apr 2002 11:07:55 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200204061747.g36HlL529756@freefall.freebsd.org> Date: Mon, 08 Apr 2002 10:07:08 -0400 (EDT) From: John Baldwin To: Jake Burkholder Subject: RE: PERFORCE change 9216 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 06-Apr-2002 Jake Burkholder wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9216 > > Change 9216 by jake@jake_sparc64 on 2002/04/06 09:47:05 > > Build setjmp.S. Thanks! -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 9:58:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07A4D37B426; Mon, 8 Apr 2002 09:56:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1ABEF37B41E for ; Mon, 8 Apr 2002 09:56:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38Gubw78208 for perforce@freebsd.org; Mon, 8 Apr 2002 09:56:37 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 8 Apr 2002 09:56:37 -0700 (PDT) Message-Id: <200204081656.g38Gubw78208@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9381 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9381 Change 9381 by peter@peter_daintree on 2002/04/08 09:55:51 IFC @9380 Affected files ... ... //depot/projects/ia64/Makefile.inc1#17 integrate ... //depot/projects/ia64/contrib/openpam/CREDITS#1 branch ... //depot/projects/ia64/contrib/openpam/HISTORY#5 integrate ... //depot/projects/ia64/contrib/openpam/MANIFEST#5 integrate ... //depot/projects/ia64/contrib/openpam/README#5 integrate ... //depot/projects/ia64/contrib/openpam/RELNOTES#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/Makefile#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#1 branch ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#1 branch ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#1 branch ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#5 integrate ... //depot/projects/ia64/contrib/openpam/include/security/openpam.h#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/Makefile#5 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_borrow_cred.c#1 branch ... //depot/projects/ia64/contrib/openpam/lib/openpam_free_data.c#1 branch ... //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#5 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_restore_cred.c#1 branch ... //depot/projects/ia64/crypto/openssh/session.c#6 integrate ... //depot/projects/ia64/etc/pam.d/login#3 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate ... //depot/projects/ia64/gnu/usr.bin/sort/COPYING#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/Makefile#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/config.h#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/error.c#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/error.h#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/getopt.c#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/getopt.h#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/getopt1.c#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/long-options.c#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/long-options.h#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/sort.1#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/sort.c#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/system.h#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/version.c#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/version.h#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/xstrtod.c#3 branch ... //depot/projects/ia64/gnu/usr.bin/sort/xstrtod.h#3 branch ... //depot/projects/ia64/lib/libc/gen/disklabel.c#4 integrate ... //depot/projects/ia64/lib/libc/net/ether_addr.c#4 integrate ... //depot/projects/ia64/lib/libpam/Makefile.inc#3 integrate ... //depot/projects/ia64/lib/libpam/libpam/Makefile#7 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ssh/pam_ssh.c#9 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.c#7 integrate ... //depot/projects/ia64/lib/libutil/login_auth.c#2 integrate ... //depot/projects/ia64/lib/libutil/login_cap.3#2 integrate ... //depot/projects/ia64/lib/libutil/login_cap.c#3 integrate ... //depot/projects/ia64/lib/libutil/login_cap.h#3 integrate ... //depot/projects/ia64/lib/libutil/login_class.c#2 integrate ... //depot/projects/ia64/lib/libutil/login_crypt.c#2 integrate ... //depot/projects/ia64/release/picobsd/tinyware/login/pico-login.c#2 integrate ... //depot/projects/ia64/sbin/dumpon/dumpon.c#4 integrate ... //depot/projects/ia64/sbin/savecore/savecore.c#8 integrate ... //depot/projects/ia64/share/colldef/README#2 integrate ... //depot/projects/ia64/share/colldef/cs_CZ.ISO8859-2.src#3 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi.c#8 integrate ... //depot/projects/ia64/sys/dev/ccd/ccd.c#7 integrate ... //depot/projects/ia64/sys/dev/null/null.c#3 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs#11 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs.h#10 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#10 integrate ... //depot/projects/ia64/sys/dev/vinum/vinumhdr.h#2 integrate ... //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#8 integrate ... //depot/projects/ia64/sys/fs/smbfs/smbfs_vfsops.c#6 integrate ... //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#4 integrate ... //depot/projects/ia64/sys/fs/unionfs/union_subr.c#4 integrate ... //depot/projects/ia64/sys/geom/geom_dev.c#7 integrate ... //depot/projects/ia64/sys/geom/geom_disk.c#6 integrate ... //depot/projects/ia64/sys/i386/i386/machdep.c#13 integrate ... //depot/projects/ia64/sys/kern/kern_shutdown.c#6 integrate ... //depot/projects/ia64/sys/kern/subr_diskslice.c#6 integrate ... //depot/projects/ia64/sys/sys/disk.h#5 integrate ... //depot/projects/ia64/sys/sys/disklabel.h#11 integrate ... //depot/projects/ia64/sys/sys/malloc.h#6 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#11 integrate ... //depot/projects/ia64/usr.bin/login/login.c#7 integrate ... //depot/projects/ia64/usr.bin/tail/forward.c#5 integrate ... //depot/projects/ia64/usr.bin/tail/reverse.c#4 integrate ... //depot/projects/ia64/usr.bin/vmstat/vmstat.c#5 integrate ... //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.8#3 integrate ... //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.sh#3 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.249 2002/04/04 06:49:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.251 2002/04/08 15:11:29 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -428,12 +428,11 @@ ${KERNCONFDIR}/${_kernel} .endif .if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN) -.if defined(MODULES_WITH_WORLD) || defined(NO_MODULES) || !exists(${KRNLSRCDIR}/modules) cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} clean -.else + ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} -DNO_MODULES clean +.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KRNLSRCDIR}/modules) cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} clean cleandir + ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} cleandir .endif .endif cd ${KRNLOBJDIR}/${_kernel}; \ @@ -557,7 +556,8 @@ .endif bootstrap-tools: -.for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef usr.bin/xinstall \ +.for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef \ + usr.bin/xargs usr.bin/xinstall \ usr.sbin/config usr.sbin/kbdcontrol \ gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo cd ${.CURDIR}/${_tool}; \ ==== //depot/projects/ia64/contrib/openpam/HISTORY#5 (text+ko) ==== @@ -1,4 +1,35 @@ ============================================================================ +OpenPAM Cinchona 2002-04-08 + + - ENHANCE: Improved documentation for several API functions. + + - BUGFIX: Fix bug in pam_set_data() that would result in corruption + of the module data list. + + - BUGFIX: Allocate the correct amount of memory for the environment + list in pam_putenv(). + + - ENHANCE: Change pam_get_authtok()'s prototype so the caller can + specify what token it wants. Also introduce PAM_OLDAUTHTOK_PROMPT. + + - BUGFIX: Plug memory leak in pam_get_user() / pam_get_authtok(), and + reduce differences between these very similar functions. + + - ENHANCE: Check flags carefully in pam_authenticate() and + pam_chauthtok(). + + - BUGFIX: Fix bugs in portability code; libpam now builds on NetBSD. + + - ENHANCE: In pam_get_authtok(), if PAM_OLDAUTHTOK is set, we're + asked for PAM_AUTHTOK, and we have to prompt the user, prompt her + twice and compare the responses. + + - ENHANCE: Add openpam_{borrow,restore}_cred(), for temporarily + switching to user credentials. + + - ENHANCE: Add openpam_free_data(), a generic cleanup function for + pam_set_data() consumers. +============================================================================ OpenPAM Centaury 2002-03-14 - BUGFIX: Add missing #include to openpam_log.c. @@ -16,7 +47,7 @@ - ENHANCE: Suppress debugging logs, unless compiled with -DDEBUG. ============================================================================ -OpenPAM Celandine 2002-03-05 +OpenPAM Celandine 2002-03-05 - BUGFIX: PAM_TRY_AGAIN is a valid return value for pam_chauthtok(). @@ -83,4 +114,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/ia64/contrib/openpam/HISTORY#4 $ +$P4: //depot/projects/ia64/contrib/openpam/HISTORY#5 $ ==== //depot/projects/ia64/contrib/openpam/MANIFEST#5 (text+ko) ==== @@ -1,6 +1,7 @@ # -# $P4: //depot/projects/ia64/contrib/openpam/MANIFEST#4 $ +# $P4: //depot/projects/ia64/contrib/openpam/MANIFEST#5 $ # +CREDITS HISTORY INSTALL LICENSE @@ -13,8 +14,11 @@ bin/su/su.c doc/Makefile doc/man/Makefile +doc/man/openpam_borrow_cred.3 +doc/man/openpam_free_data.3 doc/man/openpam_get_option.3 doc/man/openpam_log.3 +doc/man/openpam_restore_cred.3 doc/man/openpam_set_option.3 doc/man/openpam_ttyconv.3 doc/man/pam.3 @@ -55,13 +59,16 @@ include/security/pam_modules.h include/security/pam_types.h lib/Makefile +lib/openpam_borrow_cred.c lib/openpam_dispatch.c lib/openpam_dynamic.c lib/openpam_findenv.c +lib/openpam_free_data.c lib/openpam_get_option.c lib/openpam_impl.h lib/openpam_load.c lib/openpam_log.c +lib/openpam_restore_cred.c lib/openpam_set_option.c lib/openpam_static.c lib/openpam_ttyconv.c ==== //depot/projects/ia64/contrib/openpam/README#5 (text+ko) ==== @@ -13,18 +13,14 @@ paper and in OSF-RFC 86.0; this corresponds to the full XSSO API except for mappings and secondary authentication. - - Extends the API with several useful and time-saving functions: - pam_error(), pam_get_authtok(), pam_info(), pam_prompt(), - pam_setenv(), pam_verror(), pam_vinfo(), pam_vprompt() - - - Offers a number of time-saving convenience functions: - openpam_log(), openpam_ttyconv(). + - Extends the API with several useful and time-saving functions. - Performs strict checking of return values from service modules. - Reads configuration from /etc/pam.d/, /usr/local/etc/pam.d/ and /etc/pam.conf, in that order; this will be made configurable in a - future release.Please direct bug reports and inquiries to - openpam@thinksec.com. + future release. + +Please direct bug reports and inquiries to openpam@thinksec.com. -$P4: //depot/projects/ia64/contrib/openpam/README#4 $ +$P4: //depot/projects/ia64/contrib/openpam/README#5 $ ==== //depot/projects/ia64/contrib/openpam/RELNOTES#5 (text+ko) ==== @@ -1,19 +1,25 @@ - Release notes for OpenPAM Centaury + Release notes for OpenPAM Cinchona ================================== This is a beta release. The library itself is complete. Documentation exists in the form of -man pages for the library functions, though some pages are still +man pages for the library functions, though a few pages are still incomplete. -This release is incorporated into FreeBSD-CURRENT as of 2002-03-14. -It has not been tested on any other OS, though it should build and run -with minimal tweaks on NetBSD and OpenBSD. +This release is incorporated into FreeBSD-CURRENT as of 2002-04-08. +It has also been successfully built on NetBSD, and should build with +minimal or no changes on OpenBSD. It has not been tested on any other +OS. Known issues: - The documentation is still incomplete. -$P4: //depot/projects/ia64/contrib/openpam/RELNOTES#4 $ + - It should be possible to create incomplete modules without + recourse to placeholders or elaborate preprocessor tricks. This + is made difficult by the requirement that it should be possible to + link modules statically. + +$P4: //depot/projects/ia64/contrib/openpam/RELNOTES#5 $ ==== //depot/projects/ia64/contrib/openpam/doc/man/Makefile#5 (text+ko) ==== @@ -31,12 +31,15 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/ia64/contrib/openpam/doc/man/Makefile#4 $ +# $P4: //depot/projects/ia64/contrib/openpam/doc/man/Makefile#5 $ # MAN = +MAN += openpam_borrow_cred.3 +MAN += openpam_free_data.3 MAN += openpam_get_option.3 MAN += openpam_log.3 +MAN += openpam_restore_cred.3 MAN += openpam_set_option.3 MAN += openpam_ttyconv.3 MAN += pam.3 ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt OPENPAM_LOG 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam.3#5 (text+ko) ==== @@ -31,12 +31,15 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM 3 .Os .Sh NAME +.Nm openpam_borrow_cred , +.Nm openpam_free_data , +.Nm openpam_restore_cred , .Nm pam_acct_mgmt , .Nm pam_authenticate , .Nm pam_chauthtok , @@ -68,6 +71,12 @@ .Sh SYNOPSIS .In security/pam_appl.h .Ft int +.Fn openpam_borrow_cred "pam_handle_t *pamh" "const struct passwd *pwd" +.Ft void +.Fn openpam_free_data "pam_handle_t *pamh" "void *data" "int status" +.Ft int +.Fn openpam_restore_cred "pam_handle_t *pamh" +.Ft int .Fn pam_acct_mgmt "pam_handle_t *pamh" "int flags" .Ft int .Fn pam_authenticate "pam_handle_t *pamh" "int flags" @@ -80,7 +89,7 @@ .Ft int .Fn pam_error "pam_handle_t *pamh" "const char *fmt" "..." .Ft int -.Fn pam_get_authtok "pam_handle_t *pamh" "const char **authtok" "const char *prompt" +.Fn pam_get_authtok "pam_handle_t *pamh" "int item" "const char **authtok" "const char *prompt" .Ft int .Fn pam_get_data "pam_handle_t *pamh" "const char *module_data_name" "const void **data" .Ft int @@ -185,6 +194,9 @@ Unknown user. .El .Sh SEE ALSO +.Xr openpam_borrow_cred 3 , +.Xr openpam_free_data 3 , +.Xr openpam_restore_cred 3 , .Xr pam_acct_mgmt 3 , .Xr pam_authenticate 3 , .Xr pam_chauthtok 3 , ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME @@ -46,7 +46,31 @@ .Ft int .Fn pam_authenticate "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +function attempts to authenticate the user +associated with the pam context specified by the +.Va pamh +argument. +.Pp +The application is free to call +.Nm +as many times as it +wishes, but some modules may maintain an internal retry counter and +return +.Dv PAM_MAXTRIES +when it exceeds some preset or hardcoded limit. +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Pp +.Bd -literal + =PAM_SILENT + Do not emit any messages. + =PAM_DISALLOW_NULL_AUTHTOK + Fail if the user's authentication token is null. .Sh RETURN VALUES The .Nm ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME @@ -46,7 +46,23 @@ .Ft int .Fn pam_chauthtok "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +function attempts to change the authentication token +for the user associated with the pam context specified by the +.Va pamh +argument. +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Pp +.Bd -literal + =PAM_SILENT + Do not emit any messages. + =PAM_CHANGE_EXPIRED_AUTHTOK + Change only those authentication tokens that have expired. .Sh RETURN VALUES The .Nm ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_END 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_ERROR 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME @@ -44,9 +44,66 @@ .Sh SYNOPSIS .In security/pam_appl.h .Ft int -.Fn pam_get_authtok "pam_handle_t *pamh" "const char **authtok" "const char *prompt" +.Fn pam_get_authtok "pam_handle_t *pamh" "int item" "const char **authtok" "const char *prompt" .Sh DESCRIPTION -No description available. +The +.Nm +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 +.Va authtok +argument. +.Pp +The +.Va item +argument must have one of the following values: +.Pp +.Bd -literal + =PAM_AUTHTOK + Returns the current authentication token, or the new token + when changing authentication tokens. + =PAM_OLDAUTHTOK + Returns the previous authentication token when changing + authentication tokens. + +.Ed +The +.Va prompt +argument specifies a prompt to use if no token is cached. +.Ed +If it is +.Dv NULL , +the +.Dv PAM_AUTHTOK_PROMPT +or +.Dv PAM_OLDAUTHTOK_PROMPT +item, +.Ed +as appropriate, will be used. If that item is also +.Dv NULL , +a hardcoded +.Ed +default prompt will be used. + +.Ed +If +.Va item +is set to +.Dv PAM_AUTHTOK +and there is a non-null +.Dv PAM_OLDAUTHTOK +.Ed +item, +.Nm +will ask the user to confirm the new token by +.Ed +retyping it. If there is a mismatch, +.Nm +will return +.Ed +.Dv PAM_TRY_AGAIN . + .Sh RETURN VALUES The .Nm @@ -58,9 +115,13 @@ Conversation failure. .It Bq Er PAM_SYSTEM_ERR System error. +.It Bq Er PAM_TRY_AGAIN +Try again. .El .Sh SEE ALSO .Xr pam 3 , +.Xr pam_get_item 3 , +.Xr pam_get_user 3 , .Xr pam_strerror 3 .Sh STANDARDS The ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GET_DATA 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GET_ITEM 3 .Os .Sh NAME @@ -85,6 +85,9 @@ .It Dv PAM_AUTHTOK_PROMPT The prompt to use when asking the applicant for an authentication token. +.It Dv PAM_OLDAUTHTOK_PROMPT +The prompt to use when asking the applicant for an +expired authentication token prior to changing it. .El See .Xr pam_start 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GET_USER 3 .Os .Sh NAME @@ -46,7 +46,31 @@ .Ft int .Fn pam_get_user "pam_handle_t *pamh" "const char **user" "const char *prompt" .Sh DESCRIPTION -No description available. +The +.Nm +function returns the name of the target user, as +specified to +.Xr pam_start 3 . +If no user was specified, nor set using +.Xr pam_set_item 3 , +.Nm +will prompt for a user name. Either way, +a pointer to the user name is stored in the location pointed to by the +.Va user +argument. +.Pp +The +.Va prompt +argument specifies a prompt to use if no user name is +cached. If it is +.Dv NULL , +the +.Dv PAM_USER_PROMPT +will be used. If that +item is also +.Dv NULL , +a hardcoded default prompt will be used. +.Pp .Sh RETURN VALUES The .Nm @@ -61,6 +85,10 @@ .El .Sh SEE ALSO .Xr pam 3 , +.Xr pam_get_authtok 3 , +.Xr pam_get_item 3 , +.Xr pam_set_item 3 , +.Xr pam_start 3 , .Xr pam_strerror 3 .Sh STANDARDS .Rs ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GETENV 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GETENVLIST 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_INFO 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_PROMPT 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_PUTENV 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SET_DATA 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SET_ITEM 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SETENV 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_SM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#4 $ +.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#5 $ .\" -.Dd March 7, 2002 >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 12:59:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABD7837B417; Mon, 8 Apr 2002 12:58:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D8EC137B416 for ; Mon, 8 Apr 2002 12:58:21 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38JwKf25432 for perforce@freebsd.org; Mon, 8 Apr 2002 12:58:20 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Mon, 8 Apr 2002 12:58:20 -0700 (PDT) Message-Id: <200204081958.g38JwKf25432@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9385 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9385 Change 9385 by jhb@jhb_laptop on 2002/04/08 12:57:41 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#39 integrate ... //depot/projects/smpng/sys/boot/common/load_elf.c#3 integrate ... //depot/projects/smpng/sys/boot/efi/Makefile.inc#3 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#4 integrate ... //depot/projects/smpng/sys/boot/efi/loader/Makefile#7 integrate ... //depot/projects/smpng/sys/boot/ia64/Makefile.inc#1 branch ... //depot/projects/smpng/sys/boot/ia64/libski/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#5 integrate ... //depot/projects/smpng/sys/conf/Makefile.ia64#17 integrate ... //depot/projects/smpng/sys/conf/files.pc98#22 integrate ... //depot/projects/smpng/sys/dev/aac/aac_pci.c#12 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi.c#24 integrate ... //depot/projects/smpng/sys/dev/ata/ata-all.c#18 integrate ... //depot/projects/smpng/sys/dev/ata/ata-disk.c#17 integrate ... //depot/projects/smpng/sys/dev/ata/ata-dma.c#18 integrate ... //depot/projects/smpng/sys/dev/ata/ata-pci.c#18 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#22 integrate ... //depot/projects/smpng/sys/dev/ccd/ccd.c#13 integrate ... //depot/projects/smpng/sys/dev/em/if_em.c#5 integrate ... //depot/projects/smpng/sys/dev/em/if_em.h#4 integrate ... //depot/projects/smpng/sys/dev/em/if_em_fxhw.c#4 integrate ... //depot/projects/smpng/sys/dev/em/if_em_fxhw.h#3 integrate ... //depot/projects/smpng/sys/dev/em/if_em_osdep.h#3 integrate ... //depot/projects/smpng/sys/dev/em/if_em_phy.c#3 integrate ... //depot/projects/smpng/sys/dev/em/if_em_phy.h#3 integrate ... //depot/projects/smpng/sys/dev/kbd/atkbd.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/miidevs#5 integrate ... //depot/projects/smpng/sys/dev/mii/miidevs.h#5 integrate ... //depot/projects/smpng/sys/dev/mii/rlphy.c#5 integrate ... //depot/projects/smpng/sys/dev/null/null.c#5 integrate ... //depot/projects/smpng/sys/dev/pccard/pccarddevs#13 integrate ... //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#13 integrate ... //depot/projects/smpng/sys/dev/ppbus/if_plip.c#2 integrate ... //depot/projects/smpng/sys/dev/ppbus/lpbb.c#3 integrate ... //depot/projects/smpng/sys/dev/ppbus/lpt.c#3 integrate ... //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#3 integrate ... //depot/projects/smpng/sys/dev/ppbus/ppi.c#3 integrate ... //depot/projects/smpng/sys/dev/ppbus/pps.c#5 integrate ... //depot/projects/smpng/sys/dev/ppbus/vpo.c#2 integrate ... //depot/projects/smpng/sys/dev/syscons/syscons.c#17 integrate ... //depot/projects/smpng/sys/dev/usb/hid.c#3 integrate ... //depot/projects/smpng/sys/dev/usb/if_aue.c#12 integrate ... //depot/projects/smpng/sys/dev/usb/if_auereg.h#3 integrate ... //depot/projects/smpng/sys/dev/usb/if_cue.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/if_cuereg.h#2 integrate ... //depot/projects/smpng/sys/dev/usb/if_kue.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/if_kuereg.h#2 integrate ... //depot/projects/smpng/sys/dev/usb/ohci.c#14 integrate ... //depot/projects/smpng/sys/dev/usb/ohcivar.h#6 integrate ... //depot/projects/smpng/sys/dev/usb/ugraphire_rdesc.h#1 branch ... //depot/projects/smpng/sys/dev/usb/uhci.c#16 integrate ... //depot/projects/smpng/sys/dev/usb/uhcireg.h#4 integrate ... //depot/projects/smpng/sys/dev/usb/uhcivar.h#6 integrate ... //depot/projects/smpng/sys/dev/usb/uhid.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/uhub.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/ukbd.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/ums.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/usb.c#12 integrate ... //depot/projects/smpng/sys/dev/usb/usb_port.h#10 integrate ... //depot/projects/smpng/sys/dev/usb/usb_quirks.c#2 integrate ... //depot/projects/smpng/sys/dev/usb/usb_subr.c#9 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs#17 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs.h#18 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#18 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.c#9 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.h#7 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi_util.c#4 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi_util.h#3 integrate ... //depot/projects/smpng/sys/dev/usb/usbdivar.h#9 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumhdr.h#2 integrate ... //depot/projects/smpng/sys/dev/wi/if_wireg.h#12 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#9 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#8 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#9 integrate ... //depot/projects/smpng/sys/fs/unionfs/union_subr.c#8 integrate ... //depot/projects/smpng/sys/geom/geom_dev.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_disk.c#5 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#34 integrate ... //depot/projects/smpng/sys/i386/isa/icu.h#5 integrate ... //depot/projects/smpng/sys/i386/isa/icu_ipl.s#2 integrate ... //depot/projects/smpng/sys/i386/isa/icu_vector.s#11 integrate ... //depot/projects/smpng/sys/i386/isa/intr_machdep.h#9 integrate ... //depot/projects/smpng/sys/ia64/conf/GENERIC#14 integrate ... //depot/projects/smpng/sys/ia64/ia64/autoconf.c#9 integrate ... //depot/projects/smpng/sys/ia64/ia64/ia64dump.c#3 integrate ... //depot/projects/smpng/sys/ia64/include/param.h#4 integrate ... //depot/projects/smpng/sys/kern/kern_ktr.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#24 integrate ... //depot/projects/smpng/sys/kern/kern_shutdown.c#22 integrate ... //depot/projects/smpng/sys/kern/subr_diskslice.c#8 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#18 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#18 integrate ... //depot/projects/smpng/sys/kern/vfs_cache.c#10 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#34 integrate ... //depot/projects/smpng/sys/netinet/if_fddi.h#3 delete ... //depot/projects/smpng/sys/netinet6/nd6.c#6 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#30 integrate ... //depot/projects/smpng/sys/pc98/pc98/fd.c#10 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio.c#18 integrate ... //depot/projects/smpng/sys/pc98/pc98/syscons.c#14 integrate ... //depot/projects/smpng/sys/pci/if_rl.c#9 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#21 integrate ... //depot/projects/smpng/sys/sparc64/conf/GENERIC#9 integrate ... //depot/projects/smpng/sys/sparc64/include/ktr.h#4 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#19 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#24 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#20 integrate ... //depot/projects/smpng/sys/sys/ata.h#10 integrate ... //depot/projects/smpng/sys/sys/cdefs.h#11 integrate ... //depot/projects/smpng/sys/sys/disk.h#5 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#14 integrate ... //depot/projects/smpng/sys/sys/malloc.h#6 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#16 integrate ... //depot/projects/smpng/sys/sys/types.h#11 integrate ... //depot/projects/smpng/sys/sys/ucred.h#15 integrate ... //depot/projects/smpng/sys/sys/user.h#10 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#22 integrate ... //depot/projects/smpng/sys/vm/uma.h#3 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#7 integrate ... //depot/projects/smpng/sys/vm/uma_int.h#5 integrate ... //depot/projects/smpng/sys/vm/vm_zone.c#8 delete ... //depot/projects/smpng/sys/vm/vm_zone.h#4 delete Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#39 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.174 2002/04/05 00:52:15 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.175 2002/04/07 21:01:34 phk Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -190,7 +190,6 @@ struct msgbuf *msgbufp=0; int Maxmem = 0; -long dumplo; int totalphysmem; /* total amount of physical memory in system */ int physmem; /* physical memory used by NetBSD + some rsvd */ ==== //depot/projects/smpng/sys/boot/common/load_elf.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.21 2001/09/11 01:09:19 peter Exp $ + * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.22 2002/04/06 04:09:42 peter Exp $ */ #include @@ -48,11 +48,11 @@ Elf_Phdr *ph; Elf_Ehdr *ehdr; Elf_Sym *symtab; - Elf_Off *hashtab; - Elf_Off nbuckets; - Elf_Off nchains; - Elf_Off* buckets; - Elf_Off* chains; + Elf_Hashelt *hashtab; + Elf_Hashelt nbuckets; + Elf_Hashelt nchains; + Elf_Hashelt *buckets; + Elf_Hashelt *chains; char *strtab; size_t strsz; int fd; @@ -481,7 +481,7 @@ break; switch (dp[i].d_tag) { case DT_HASH: - ef->hashtab = (Elf_Off*)(dp[i].d_un.d_ptr + off); + ef->hashtab = (Elf_Hashelt*)(dp[i].d_un.d_ptr + off); break; case DT_STRTAB: ef->strtab = (char *)(dp[i].d_un.d_ptr + off); ==== //depot/projects/smpng/sys/boot/efi/Makefile.inc#3 (text+ko) ==== @@ -1,9 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.3 2002/03/19 10:51:57 peter Exp $ +# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.4 2002/04/06 04:29:36 peter Exp $ # Options used when building app-specific efi components - -DPADD+= ${DESTDIR}/${LIBDIR}/libstand.a -LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand -LIBSTAND= -lstand -LIBEFI= ${.OBJDIR}/../libefi/libefi.a CFLAGS+= -ffreestanding ==== //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64,v 1.5 2001/10/25 08:50:14 dfr Exp $ */ +/* $FreeBSD: src/sys/boot/efi/libefi/arch/ia64/ldscript.ia64,v 1.6 2002/04/06 03:39:22 peter Exp $ */ OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little") OUTPUT_ARCH(ia64) ENTRY(_start_plabel) @@ -22,9 +22,10 @@ . = ALIGN(4096); .data : { - *(.rodata) - *(.rodata1) - *(.set.*) + *(.rodata*) + __start_set_Xcommand_set = .; + *(set_Xcommand_set) + __stop_set_Xcommand_set = .; *(.ctors) *(.data) *(.data1) ==== //depot/projects/smpng/sys/boot/efi/loader/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.11 2002/04/04 06:04:38 peter Exp $ +# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.17 2002/04/07 04:27:50 peter Exp $ .PATH: ${.CURDIR}/../common @@ -6,6 +6,8 @@ PROG= ${BASE}.efi NOMAN= NEWVERSWHAT= "EFI boot" ${MACHINE_ARCH} +BINDIR?= /boot +STRIP= # We must not strip loader.efi at install time. SRCS+= main.c conf.c dev_net.c @@ -23,6 +25,19 @@ LIBFICL= .endif +# where to get libstand from +.if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a) +LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a +.else +LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a +.endif + +.if exists(${.OBJDIR}/../libefi/libefi.a) +LIBEFI= ${.OBJDIR}/../libefi/libefi.a +.else +LIBEFI= ${.CURDIR}/../libefi/libefi.a +.endif + # Always add MI sources .PATH: ${.CURDIR}/../../common .include <${.CURDIR}/../../common/Makefile.inc> @@ -38,6 +53,7 @@ LDSCRIPT= ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH} LDFLAGS= -nostdlib -T ${LDSCRIPT} -shared -Bsymbolic +OBJCOPY?= objcopy CLEANFILES+= setdef0.c setdef0.o setdef1.c setdef1.o setdefs.h start.o \ vers.c vers.o ${BASE}.efi ${BASE}.sym ${BASE}.list @@ -46,15 +62,16 @@ CRT= start.o -all: ${PROG} +all: ${BASE} vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} ${CC} -c vers.c +${BASE}: ${BASE}.efi ${BASE}.help + ${BASE}.efi: ${BASE}.sym ${OBJCOPY} -j .text \ - -j set_Xcommand_set \ -j .hash \ -j .data \ -j .sdata \ @@ -66,16 +83,30 @@ --target=efi-app-${MACHINE_ARCH} \ ${BASE}.sym ${BASE}.efi -${BASE}.help: help.common help.efi +${BASE}.help: help.common cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk \ > ${.TARGET} beforeinstall: -.if exists(${.OBJDIR}/${BASE}.help) +.if exists(${.OBJDIR}/loader.help) + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot +.else + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/${BASE}.help ${DESTDIR}/boot +.endif +.if !exists(${DESTDIR}/boot/loader.rc) ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot + ${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot .endif + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/../../forth/loader.4th ${DESTDIR}/boot + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/../../forth/support.4th ${DESTDIR}/boot + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${.CURDIR}/../../forth/loader.conf ${DESTDIR}/boot/defaults + # Other fragments still to be brought in from ../Makfile.booters? start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S ${CC} -c ${CFLAGS} ${.IMPSRC} @@ -85,9 +116,8 @@ .include -${BASE}.sym: ${OBJS} ${LIBEFI} ${CRT} vers.o +${BASE}.sym: ${OBJS} ${LIBFICL} ${LIBEFI} ${LIBSTAND} ${CRT} vers.o ${LD} ${LDFLAGS} -o ${BASE}.sym -M ${CRT} ${OBJS} vers.o \ - ${LIBFICL} ${LIBEFI} -L${DESTDIR}${LIBDIR} ${LIBSTAND} \ - > ${.OBJDIR}/${BASE}.list + ${LIBFICL} ${LIBEFI} ${LIBSTAND} > ${.OBJDIR}/${BASE}.list beforedepend ${OBJS}: machine ==== //depot/projects/smpng/sys/boot/ia64/libski/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.3 2002/03/19 10:51:57 peter Exp $ +# $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.4 2002/04/06 04:33:53 peter Exp $ LIB= ski NOPIC= true @@ -15,7 +15,6 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ CFLAGS+= -I${.CURDIR}/../../efi/include CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH} -CFLAGS+= -ffreestanding # Pick up the bootstrap header for some interface items CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. ==== //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#5 (text+ko) ==== @@ -1,17 +1,18 @@ -# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.5 2002/03/29 22:53:56 marcel Exp $ +# $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.8 2002/04/07 04:26:42 peter Exp $ .PATH: ${.CURDIR}/../common PROG= skiload NOMAN= NEWVERSWHAT= "ia64 SKI boot" ${MACHINE_ARCH} +BINDIR?= /boot SRCS+= main.c conf.c # Enable BootForth BOOT_FORTH= yes CFLAGS+= -g -CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/alpha +CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/ia64 .if BOOT_FORTH CFLAGS+= -DBOOT_FORTH .if exists(${.OBJDIR}/../../ficl/libficl.a) @@ -24,13 +25,10 @@ .endif # where to get libstand from -#XXX need a better way to do this +.if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a) +LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a +.else LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a -.if !exists(${LIBSTAND}) -LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a -.if !exists(${LIBSTAND}) -LIBSTAND= -lstand -.endif .endif .if exists(${.OBJDIR}/../libski/libski.a) @@ -50,7 +48,6 @@ CFLAGS+= -I${.CURDIR}/../../.. -I. CFLAGS+= -I${.CURDIR}/../libski CFLAGS+= -DLOADER -CFLAGS+= -ffreestanding LDFLAGS= -nostdlib -T ${.CURDIR}/ldscript.ia64 @@ -74,14 +71,10 @@ ${.OBJDIR}/${PROG}.help ${DESTDIR}/boot .endif -# Other fragments still to be brought in from ../Makfile.booters? -start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S - ${CC} -c ${CFLAGS} ${.IMPSRC} - machine: ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine -${PROG}: ${OBJS} ${LIBFICL} ${LIBSKI} vers.o +${PROG}: ${OBJS} ${LIBFICL} ${LIBSKI} ${LIBSTAND} vers.o ${LD} ${LDFLAGS} -o ${PROG} -M \ ${OBJS} vers.o \ ${LIBFICL} ${LIBSTAND} ${LIBSKI} ${LIBSTAND} \ ==== //depot/projects/smpng/sys/conf/Makefile.ia64#17 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.48 2002/03/24 17:45:46 obrien Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.49 2002/04/07 04:34:21 peter Exp $ # # Makefile for FreeBSD # @@ -20,13 +20,6 @@ CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -Wno-format -ffreestanding -CC= ia64-unknown-freebsd5.0-gcc -LD= ia64-unknown-freebsd5.0-ld -NM= ia64-unknown-freebsd5.0-nm -SIZE= ia64-unknown-freebsd5.0-size -OBJCOPY= ia64-unknown-freebsd5.0-objcopy -OBJDUMP= ia64-unknown-freebsd5.0-objdump -MACHINE_ARCH= ia64 # Which version of config(8) is required. %VERSREQ= 500010 ==== //depot/projects/smpng/sys/conf/files.pc98#22 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.228 2002/03/27 05:39:16 dillon Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.229 2002/04/06 06:41:54 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -190,6 +190,7 @@ i386/i386/elf_machdep.c standard i386/i386/exception.s standard i386/i386/i386-gdbstub.c optional ddb +i386/i386/i386dump.c standard i386/i386/i686_mem.c standard i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet ==== //depot/projects/smpng/sys/dev/aac/aac_pci.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.19 2002/04/02 21:49:26 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.20 2002/04/05 20:00:29 scottl Exp $ */ /* @@ -101,6 +101,7 @@ {0x1028, 0x0008, 0x1028, 0x00cf, AAC_HWIF_I960RX, "Dell PERC 3/Di"}, {0x1028, 0x000a, 0x1028, 0x0106, AAC_HWIF_I960RX, "Dell PERC 3/Di"}, {0x1028, 0x000a, 0x1028, 0x011b, AAC_HWIF_I960RX, "Dell PERC 3/Di"}, + {0x1028, 0x000a, 0x1028, 0x0121, AAC_HWIF_I960RX, "Dell PERC 3/Di"}, {0x1011, 0x0046, 0x9005, 0x0364, AAC_HWIF_STRONGARM, "Adaptec AAC-364"}, {0x1011, 0x0046, 0x9005, 0x0365, AAC_HWIF_STRONGARM, "Adaptec SCSI RAID 5400S"}, ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#24 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.57 2002/04/04 21:03:13 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.58 2002/04/08 06:58:17 takawata Exp $ */ #include "opt_acpi.h" @@ -556,6 +556,7 @@ retval += acpi_print_resources(rl, "port", SYS_RES_IOPORT, "%#lx"); retval += acpi_print_resources(rl, "iomem", SYS_RES_MEMORY, "%#lx"); retval += acpi_print_resources(rl, "irq", SYS_RES_IRQ, "%ld"); + retval += acpi_print_resources(rl, "drq", SYS_RES_DRQ, "%ld"); retval += bus_print_child_footer(bus, child); return(retval); ==== //depot/projects/smpng/sys/dev/ata/ata-all.c#18 (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. * - * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.146 2002/04/05 15:58:45 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.148 2002/04/05 18:37:04 sos Exp $ */ #include "opt_ata.h" @@ -215,7 +215,8 @@ struct ata_channel *ch; int s; - if (!dev || !(ch = device_get_softc(dev))) + if (!dev || !(ch = device_get_softc(dev)) || + !ch->r_io || !ch->r_altio || !ch->r_irq) return ENXIO; /* make sure channel is not busy */ @@ -302,7 +303,8 @@ if (!device || !(ch = device_get_softc(device))) return ENXIO; ATA_SLEEPLOCK_CH(ch, ATA_ACTIVE); - error = ata_reinit(ch); + if ((error = ata_reinit(ch))) + ATA_UNLOCK_CH(ch); return error; case ATAGMODE: @@ -837,6 +839,7 @@ if (!ch->r_io || !ch->r_altio || !ch->r_irq) return ENXIO; + ATA_FORCELOCK_CH(ch, ATA_CONTROL); ch->running = NULL; devices = ch->devices; ==== //depot/projects/smpng/sys/dev/ata/ata-disk.c#17 (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. * - * $FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.130 2002/04/05 13:13:55 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.131 2002/04/05 18:04:05 sos Exp $ */ #include "opt_ata.h" @@ -125,8 +125,8 @@ adp->total_secs = atadev->param->cylinders * adp->heads * adp->sectors; bioq_init(&adp->queue); - lbasize = (u_int32_t)atadev->param->lba_size_lo | - ((u_int32_t)atadev->param->lba_size_hi << 16); + lbasize = (u_int32_t)atadev->param->lba_size_1 | + ((u_int32_t)atadev->param->lba_size_2 << 16); /* does this device need oldstyle CHS addressing */ if (!ad_version(atadev->param->version_major) || @@ -137,10 +137,10 @@ if (atadev->param->cylinders == 16383 && adp->total_secs < lbasize) adp->total_secs = lbasize; - lbasize48 = (u_int64_t)atadev->param->lba_size48_1 | - ((u_int64_t)atadev->param->lba_size48_2 << 16) | - ((u_int64_t)atadev->param->lba_size48_3 << 32) | - ((u_int64_t)atadev->param->lba_size48_4 << 48); + lbasize48 = ((u_int64_t)atadev->param->lba_size48_1) | + ((u_int64_t)atadev->param->lba_size48_2 << 16) | + ((u_int64_t)atadev->param->lba_size48_3 << 32) | + ((u_int64_t)atadev->param->lba_size48_4 << 48); /* use the 48bit LBA size if valid */ if (atadev->param->support.address48 && lbasize48 > 268435455) ==== //depot/projects/smpng/sys/dev/ata/ata-dma.c#18 (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. * - * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.93 2002/04/05 13:13:55 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.94 2002/04/07 07:53:34 sos Exp $ */ #include @@ -969,6 +969,7 @@ break; case 0x4d69105a: /* Promise TX2 ATA133 controllers */ + case 0x5275105a: /* Promise TX2 ATA133 controllers */ ATA_OUTB(atadev->channel->r_bmio, ATA_BMDEVSPEC_0, 0x0b); if (udmamode >= 6 && !(ATA_INB(atadev->channel->r_bmio, ATA_BMDEVSPEC_1) & 0x04)) { ==== //depot/projects/smpng/sys/dev/ata/ata-pci.c#18 (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. * - * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.37 2002/04/05 13:13:55 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.39 2002/04/07 07:53:34 sos Exp $ */ #include "opt_ata.h" @@ -269,6 +269,7 @@ return "Promise TX2 ATA100 controller"; case 0x4d69105a: + case 0x5275105a: return "Promise TX2 ATA133 controller"; case 0x00041103: @@ -371,7 +372,7 @@ return 0; } -#ifdef ATA_ENABLE_BUSMASTER +#ifdef __sparc64__ if (!(cmd & PCIM_CMD_BUSMASTEREN)) { pci_write_config(dev, PCIR_COMMAND, cmd | PCIM_CMD_BUSMASTEREN, 2); cmd = pci_read_config(dev, PCIR_COMMAND, 2); @@ -570,6 +571,7 @@ case 0x4d68105a: /* Promise TX2 ATA100 */ case 0x6268105a: /* Promise TX2 ATA100 */ case 0x4d69105a: /* Promise TX2 ATA133 */ + case 0x5275105a: /* Promise TX2 ATA133 */ ATA_OUTB(ch->r_bmio, ATA_BMDEVSPEC_0, 0x0b); if (!(ATA_INB(ch->r_bmio, ATA_BMDEVSPEC_1) & 0x20)) return 1; ==== //depot/projects/smpng/sys/dev/ata/atapi-cd.c#22 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.117 2002/04/05 13:13:55 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.118 2002/04/05 18:04:05 sos Exp $ */ #include "opt_ata.h" @@ -255,22 +255,17 @@ return cdp; } -/* - * Handle dev_clone events, so that acd can be used as root device. - */ static void acd_clone(void *arg, char *name, int namelen, dev_t *dev) { - struct acd_softc *cdp; + struct acd_softc *cdp = arg; char *p; int unit; - cdp = arg; if (*dev != NODEV) return; if (!dev_stdclone(name, &p, "acd", &unit)) return; - /* Handle compatability slices. */ if (*p != '\0' && strcmp(p, "a") != 0 && strcmp(p, "c") != 0) return; if (unit == cdp->lun) ==== //depot/projects/smpng/sys/dev/ccd/ccd.c#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.102 2002/04/02 11:52:08 phk Exp $ */ +/* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.103 2002/04/08 09:20:06 phk Exp $ */ /* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */ @@ -98,7 +98,7 @@ #include #include #include -#include +#include #include #include #include ==== //depot/projects/smpng/sys/dev/em/if_em.c#5 (text+ko) ==== @@ -1,6 +1,6 @@ /************************************************************************** -Copyright (c) 2001 Intel Corporation +Copyright (c) 2001-2002 Intel Corporation All rights reserved. Redistribution and use in source and binary forms of the Software, with or @@ -33,7 +33,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.4 2002/03/20 02:07:19 alfred Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.5 2002/04/06 00:36:53 pdeuskar Exp $*/ #include @@ -53,7 +53,7 @@ * Driver version *********************************************************************/ -char em_driver_version[] = "1.1.10"; +char em_driver_version[] = "1.2.7"; /********************************************************************* @@ -75,6 +75,7 @@ { 0x8086, 0x1009, PCI_ANY_ID, PCI_ANY_ID, 0 }, { 0x8086, 0x100C, PCI_ANY_ID, PCI_ANY_ID, 0 }, { 0x8086, 0x100D, PCI_ANY_ID, PCI_ANY_ID, 0 }, + { 0x8086, 0x100E, PCI_ANY_ID, PCI_ANY_ID, 0 }, /* required last entry */ { 0, 0, 0, 0, 0} }; @@ -91,52 +92,53 @@ /********************************************************************* * Function prototypes *********************************************************************/ -static int em_probe(device_t); -static int em_attach(device_t); -static int em_detach(device_t); -static int em_shutdown(device_t); +static int em_probe(device_t); +static int em_attach(device_t); +static int em_detach(device_t); +static int em_shutdown(device_t); static void em_intr(void *); static void em_start(struct ifnet *); -static int em_ioctl(struct ifnet *, IOCTL_CMD_TYPE, caddr_t); +static int em_ioctl(struct ifnet *, IOCTL_CMD_TYPE, caddr_t); static void em_watchdog(struct ifnet *); static void em_init(void *); static void em_stop(void *); static void em_media_status(struct ifnet *, struct ifmediareq *); -static int em_media_change(struct ifnet *); +static int em_media_change(struct ifnet *); static void em_identify_hardware(struct adapter *); -static int em_allocate_pci_resources(struct adapter *); +static int em_allocate_pci_resources(struct adapter *); static void em_free_pci_resources(struct adapter *); static void em_local_timer(void *); -static int em_hardware_init(struct adapter *); +static int em_hardware_init(struct adapter *); static void em_read_mac_address(struct adapter *, u_int8_t *); static void em_setup_interface(device_t, struct adapter *); -static int em_setup_transmit_structures(struct adapter *); +static int em_setup_transmit_structures(struct adapter *); static void em_initialize_transmit_unit(struct adapter *); -static int em_setup_receive_structures(struct adapter *); +static int em_setup_receive_structures(struct adapter *); static void em_initialize_receive_unit(struct adapter *); -static void EnableInterrupts(struct adapter *); -static void DisableInterrupts(struct adapter *); +static void em_enable_intr(struct adapter *); +static void em_disable_intr(struct adapter *); static void em_free_transmit_structures(struct adapter *); static void em_free_receive_structures(struct adapter *); static void em_update_stats_counters(struct adapter *); static void em_clean_transmit_interrupts(struct adapter *); -static int em_allocate_receive_structures(struct adapter *); -static int em_allocate_transmit_structures(struct adapter *); +static int em_allocate_receive_structures(struct adapter *); +static int em_allocate_transmit_structures(struct adapter *); static void em_process_receive_interrupts(struct adapter *); static void em_receive_checksum(struct adapter *, - struct em_rx_desc * RxDescriptor, - struct mbuf *); + struct em_rx_desc * rx_desc, + struct mbuf *); static void em_transmit_checksum_setup(struct adapter *, - struct mbuf *, - struct em_tx_buffer *, - u_int32_t *, - u_int32_t *); + struct mbuf *, + struct em_tx_buffer *, + u_int32_t *, + u_int32_t *); static void em_set_promisc(struct adapter *); static void em_disable_promisc(struct adapter *); static void em_set_multi(struct adapter *); static void em_print_hw_stats(struct adapter *); static void em_print_link_status(struct adapter *); -static int em_get_buf(struct em_rx_buffer *, struct adapter *, struct mbuf *); +static int em_get_buf(struct em_rx_buffer *, struct adapter *, + struct mbuf *); /********************************************************************* * FreeBSD Device Interface Entry Points *********************************************************************/ @@ -223,128 +225,128 @@ static int em_attach(device_t dev) { - struct adapter * Adapter; + struct adapter * adapter; int s; int tsize, rsize; INIT_DEBUGOUT("em_attach: begin"); s = splimp(); - /* Allocate, clear, and link in our Adapter structure */ - if (!(Adapter = device_get_softc(dev))) { - printf("em: Adapter structure allocation failed\n"); + /* Allocate, clear, and link in our adapter structure */ + if (!(adapter = device_get_softc(dev))) { + printf("em: adapter structure allocation failed\n"); splx(s); return(ENOMEM); } - bzero(Adapter, sizeof(struct adapter )); - Adapter->dev = dev; - Adapter->osdep.dev = dev; - Adapter->unit = device_get_unit(dev); + bzero(adapter, sizeof(struct adapter )); + adapter->dev = dev; + adapter->osdep.dev = dev; + adapter->unit = device_get_unit(dev); if (em_adapter_list != NULL) - em_adapter_list->prev = Adapter; - Adapter->next = em_adapter_list; - em_adapter_list = Adapter; + em_adapter_list->prev = adapter; + adapter->next = em_adapter_list; + em_adapter_list = adapter; - callout_handle_init(&Adapter->timer_handle); + callout_handle_init(&adapter->timer_handle); /* Determine hardware revision */ - em_identify_hardware(Adapter); + em_identify_hardware(adapter); /* Parameters (to be read from user) */ - Adapter->NumTxDescriptors = MAX_TXD; - Adapter->NumRxDescriptors = MAX_RXD; - Adapter->TxIntDelay = TIDV; - Adapter->RxIntDelay = RIDV; - Adapter->shared.autoneg = DO_AUTO_NEG; - Adapter->shared.wait_autoneg_complete = WAIT_FOR_AUTO_NEG_DEFAULT; - Adapter->shared.autoneg_advertised = AUTONEG_ADV_DEFAULT; - Adapter->shared.tbi_compatibility_en = TRUE; - Adapter->RxBufferLen = EM_RXBUFFER_2048; - Adapter->RxChecksum = EM_ENABLE_RXCSUM_OFFLOAD; + adapter->num_tx_desc = MAX_TXD; + adapter->num_rx_desc = MAX_RXD; + adapter->tx_int_delay = TIDV; + adapter->rx_int_delay = RIDV; + adapter->shared.autoneg = DO_AUTO_NEG; + adapter->shared.wait_autoneg_complete = WAIT_FOR_AUTO_NEG_DEFAULT; + adapter->shared.autoneg_advertised = AUTONEG_ADV_DEFAULT; + adapter->shared.tbi_compatibility_en = TRUE; + adapter->rx_buffer_len = EM_RXBUFFER_2048; + adapter->rx_checksum = EM_ENABLE_RXCSUM_OFFLOAD; - Adapter->shared.fc_high_water = FC_DEFAULT_HI_THRESH; - Adapter->shared.fc_low_water = FC_DEFAULT_LO_THRESH; - Adapter->shared.fc_pause_time = FC_DEFAULT_TX_TIMER; - Adapter->shared.fc_send_xon = TRUE; - Adapter->shared.fc = em_fc_full; + adapter->shared.fc_high_water = FC_DEFAULT_HI_THRESH; + adapter->shared.fc_low_water = FC_DEFAULT_LO_THRESH; + adapter->shared.fc_pause_time = FC_DEFAULT_TX_TIMER; + adapter->shared.fc_send_xon = TRUE; + adapter->shared.fc = em_fc_full; - /* Set the max frame size assuming standard ethernet sized frames */ - Adapter->shared.max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHER_CRC_LEN; + adapter->shared.max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHER_CRC_LEN; + adapter->shared.min_frame_size = MINIMUM_ETHERNET_PACKET_SIZE + ETHER_CRC_LEN; /* This controls when hardware reports transmit completion status. */ if ((EM_REPORT_TX_EARLY == 0) || (EM_REPORT_TX_EARLY == 1)) { - Adapter->shared.report_tx_early = EM_REPORT_TX_EARLY; + adapter->shared.report_tx_early = EM_REPORT_TX_EARLY; } else { - if(Adapter->shared.mac_type < em_82543) { - Adapter->shared.report_tx_early = 0; + if(adapter->shared.mac_type < em_82543) { + adapter->shared.report_tx_early = 0; } else { - Adapter->shared.report_tx_early = 1; + adapter->shared.report_tx_early = 1; } } - if (em_allocate_pci_resources(Adapter)) { - printf("em%d: Allocation of PCI resources failed\n", Adapter->unit); - em_free_pci_resources(Adapter); + if (em_allocate_pci_resources(adapter)) { + printf("em%d: Allocation of PCI resources failed\n", adapter->unit); + em_free_pci_resources(adapter); splx(s); return(ENXIO); } - tsize = EM_ROUNDUP(Adapter->NumTxDescriptors * + tsize = EM_ROUNDUP(adapter->num_tx_desc * sizeof(struct em_tx_desc), 4096); /* Allocate Transmit Descriptor ring */ - if (!(Adapter->TxDescBase = (struct em_tx_desc *) + if (!(adapter->tx_desc_base = (struct em_tx_desc *) contigmalloc(tsize, M_DEVBUF, M_NOWAIT, 0, ~0, PAGE_SIZE, 0))) { - printf("em%d: Unable to allocate TxDescriptor memory\n", Adapter->unit); - em_free_pci_resources(Adapter); + printf("em%d: Unable to allocate TxDescriptor memory\n", adapter->unit); + em_free_pci_resources(adapter); splx(s); return(ENOMEM); } - rsize = EM_ROUNDUP(Adapter->NumRxDescriptors * + rsize = EM_ROUNDUP(adapter->num_rx_desc * sizeof(struct em_rx_desc), 4096); /* Allocate Receive Descriptor ring */ - if (!(Adapter->RxDescBase = (struct em_rx_desc *) + if (!(adapter->rx_desc_base = (struct em_rx_desc *) contigmalloc(rsize, M_DEVBUF, M_NOWAIT, 0, ~0, PAGE_SIZE, 0))) { - printf("em%d: Unable to allocate RxDescriptor memory\n", Adapter->unit); - em_free_pci_resources(Adapter); - contigfree(Adapter->TxDescBase, tsize, M_DEVBUF); + printf("em%d: Unable to allocate rx_desc memory\n", adapter->unit); + em_free_pci_resources(adapter); + contigfree(adapter->tx_desc_base, tsize, M_DEVBUF); splx(s); return(ENOMEM); } /* Initialize the hardware */ - if (em_hardware_init(Adapter)) { - printf("em%d: Unable to initialize the hardware\n",Adapter->unit); - em_free_pci_resources(Adapter); - contigfree(Adapter->TxDescBase, tsize, M_DEVBUF); - contigfree(Adapter->RxDescBase, rsize, M_DEVBUF); + if (em_hardware_init(adapter)) { + printf("em%d: Unable to initialize the hardware\n",adapter->unit); + em_free_pci_resources(adapter); + contigfree(adapter->tx_desc_base, tsize, M_DEVBUF); + contigfree(adapter->rx_desc_base, rsize, M_DEVBUF); splx(s); return(EIO); } /* Setup OS specific network interface */ - em_setup_interface(dev, Adapter); + em_setup_interface(dev, adapter); /* Initialize statistics */ - em_clear_hw_cntrs(&Adapter->shared); - em_update_stats_counters(Adapter); - Adapter->shared.get_link_status = 1; - em_check_for_link(&Adapter->shared); + em_clear_hw_cntrs(&adapter->shared); + em_update_stats_counters(adapter); + adapter->shared.get_link_status = 1; + em_check_for_link(&adapter->shared); /* Print the link status */ - if (Adapter->LinkIsActive == 1) { - em_get_speed_and_duplex(&Adapter->shared, &Adapter->LineSpeed, &Adapter->FullDuplex); + if (adapter->link_active == 1) { + em_get_speed_and_duplex(&adapter->shared, &adapter->link_speed, &adapter->link_duplex); printf("em%d: Speed:%d Mbps Duplex:%s\n", - Adapter->unit, - Adapter->LineSpeed, - Adapter->FullDuplex == FULL_DUPLEX ? "Full" : "Half"); + adapter->unit, + adapter->link_speed, + adapter->link_duplex == FULL_DUPLEX ? "Full" : "Half"); } else - printf("em%d: Speed:N/A Duplex:N/A\n", Adapter->unit); + printf("em%d: Speed:N/A Duplex:N/A\n", adapter->unit); INIT_DEBUGOUT("em_attach: end"); @@ -365,44 +367,44 @@ static int em_detach(device_t dev) { >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 14:24:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A75EB37B416; Mon, 8 Apr 2002 14:24:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C32AF37B419 for ; Mon, 8 Apr 2002 14:24:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38LOAA49098 for perforce@freebsd.org; Mon, 8 Apr 2002 14:24:10 -0700 (PDT) (envelope-from amigus@tislabs.com) Date: Mon, 8 Apr 2002 14:24:10 -0700 (PDT) Message-Id: <200204082124.g38LOAA49098@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@tislabs.com using -f From: Adam Migus Subject: PERFORCE change 9392 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9392 Change 9392 by amigus@amigus_ganymede on 2002/04/08 14:24:07 Changed sysctl/tunable security.mac.biba.trusted_interface to security.mac.biba.trusted_interfaces. It now takes a comma separated list of interfaces to consider trusted. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#26 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#26 (text+ko) ==== @@ -83,12 +83,12 @@ TUNABLE_INT("security.mac.biba.trust_all_interfaces", &mac_biba_trust_all_interfaces); -static char mac_biba_trusted_interface[128] = ""; -SYSCTL_STRING(_security_mac_biba, OID_AUTO, trusted_interface, CTLFLAG_RD, - mac_biba_trusted_interface, sizeof(mac_biba_trusted_interface), - "'trusted' network interface at system boot"); -TUNABLE_STR("security.mac.biba.trusted_interface", - mac_biba_trusted_interface, sizeof(mac_biba_trusted_interface)); +static char mac_biba_trusted_interfaces[128] = ""; +SYSCTL_STRING(_security_mac_biba, OID_AUTO, trusted_interfaces, CTLFLAG_RD, + mac_biba_trusted_interfaces, sizeof(mac_biba_trusted_interfaces), + "'trusted' network interfaces at system boot"); +TUNABLE_STR("security.mac.biba.trusted_interfaces", + mac_biba_trusted_interfaces, sizeof(mac_biba_trusted_interfaces)); static int mac_biba_element_dominate(struct mac_biba_element *labela, @@ -449,12 +449,46 @@ static void mac_biba_create_ifnet(struct ifnet *ifnet) { - int interface_label_type, trusted_interface; - char ifr_name[IFNAMSIZ]; + int interface_label_type, trusted_interface = 0; + char ifr_name[IFNAMSIZ], tifr_name[IFNAMSIZ]; + char *p0 = NULL, *p1 = NULL, *end = NULL; + int len = 0; snprintf(ifr_name, IFNAMSIZ, "%s%d", ifnet->if_name, ifnet->if_unit); - trusted_interface = !strncmp(mac_biba_trusted_interface, ifr_name, - IFNAMSIZ); + + p0 = mac_biba_trusted_interfaces; + end = p0 + strlen(mac_biba_trusted_interfaces); + + do { + if ((p1 = index(p0, ',')) != NULL) + len = p1 - p0; + else + len = strlen(p0); + + if (len > IFNAMSIZ) { + if (p1) + *p1 = '\0'; + printf("%s: name exceeds maximum length\n", p0); + if (p1) + *p1 = ','; + } else if (len == 0) + break; + + strncpy(tifr_name, p0, len); + if (!strncmp(tifr_name, ifr_name, len) && + len == strlen(ifr_name)) { + trusted_interface = 1; + break; + } + + if (p1 == NULL) + break; + + do { + p0 = ++p1; + } while (*p1 == ' ' || *p1 == '\t'); + } while (p0 < end); + if (trusted_interface) { printf("%s: initialized as trusted interface\n", ifr_name); interface_label_type = MAC_BIBA_TYPE_HIGH; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 15:55:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 092E237B416; Mon, 8 Apr 2002 15:55:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3C7A437B405 for ; Mon, 8 Apr 2002 15:55:06 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38Mt6A86553 for perforce@freebsd.org; Mon, 8 Apr 2002 15:55:06 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 8 Apr 2002 15:55:06 -0700 (PDT) Message-Id: <200204082255.g38Mt6A86553@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9395 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9395 Change 9395 by jake@jake_sparc64 on 2002/04/08 15:54:59 Add some more baud rates. Affected files ... ... //depot/projects/sparc64/sys/dev/se/se_console.c#3 edit ... //depot/projects/sparc64/sys/dev/se/sereg.h#5 edit Differences ... ==== //depot/projects/sparc64/sys/dev/se/se_console.c#3 (text+ko) ==== @@ -234,7 +234,7 @@ SE_CNWRITE_1(SE_CCR0, CCR0_MCE | CCR0_SM_ASYNC); SE_CNWRITE_1(SE_CMDR, CMDR_RRES | CMDR_XRES); SE_CNWRITE_1(SE_CCR1, CCR1_ODS | CCR1_BCR | CCR1_CM_7); - SE_CNWRITE_1(SE_BGR, SE_DIV(48, 2)); + SE_CNWRITE_1(SE_BGR, SE_DIV_9600); SE_CNWRITE_1(SE_CCR2, CCR2_TOE | CCR2_SSEL | CCR2_BDF); SE_CNWRITE_1(SE_CCR3, 0x0); SE_CNWRITE_1(SE_CCR4, CCR4_EBRG | CCR4_MCK4); ==== //depot/projects/sparc64/sys/dev/se/sereg.h#5 (text+ko) ==== @@ -30,6 +30,10 @@ #define _DEV_SE_SEREG_H_ #define SE_DIV(n, m) (((m) << 6) | ((n) - 1)) +#define SE_DIV_9600 SE_DIV(48, 2) +#define SE_DIV_19200 SE_DIV(48, 1) +#define SE_DIV_38400 SE_DIV(24, 1) +#define SE_DIV_115200 SE_DIV(8, 1) #define SE_CHA 0x0 /* channel a offset */ #define SE_CHB 0x40 /* channel b offset */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 16:12:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 245A537B416; Mon, 8 Apr 2002 16:12:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6E96C37B400 for ; Mon, 8 Apr 2002 16:12:27 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38NCRI93007 for perforce@freebsd.org; Mon, 8 Apr 2002 16:12:27 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 8 Apr 2002 16:12:27 -0700 (PDT) Message-Id: <200204082312.g38NCRI93007@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9396 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9396 Change 9396 by jake@jake_sparc64 on 2002/04/08 16:12:16 Revert accidental slippage. Affected files ... ... //depot/projects/sparc64/gnu/lib/csu/Makefile#3 edit Differences ... ==== //depot/projects/sparc64/gnu/lib/csu/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD: src/gnu/lib/csu/Makefile,v 1.4 2002/04/05 08:53:35 obrien Exp $ -GCCDIR= ${.CURDIR}/../../../contrib/gcc +GCCDIR= ${.CURDIR}/../../../contrib/gcc.295 .if ${MACHINE_ARCH} == "alpha" .PATH: ${GCCDIR}/config/alpha To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 16:14:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E55BE37B41A; Mon, 8 Apr 2002 16:14:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 38CE737B405 for ; Mon, 8 Apr 2002 16:14:30 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38NEUI93317 for perforce@freebsd.org; Mon, 8 Apr 2002 16:14:30 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 8 Apr 2002 16:14:30 -0700 (PDT) Message-Id: <200204082314.g38NEUI93317@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9397 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9397 Change 9397 by jake@jake_sparc64 on 2002/04/08 16:13:38 Integ this file. Affected files ... ... //depot/projects/sparc64/lib/csu/sparc64/Makefile#6 integrate Differences ... ==== //depot/projects/sparc64/lib/csu/sparc64/Makefile#6 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/lib/csu/sparc64/Makefile,v 1.4 2002/03/29 22:43:41 markm Exp $ +# $FreeBSD: src/lib/csu/sparc64/Makefile,v 1.5 2002/04/08 20:31:20 obrien Exp $ .PATH: ${.CURDIR}/../common SRCS= crt1.c crti.S crtn.S crtbegin.c crtend.c OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o -CFLAGS+= -I${.CURDIR}/../common \ - -I${.CURDIR}/../../libc/include +SOBJS= crtbegin.So crtend.So +CFLAGS+= -I${.CURDIR}/../common -I${.CURDIR}/../../libc/include NOMAN= true NOPIC= true NOPROFILE= true To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 16:16:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD08337B41A; Mon, 8 Apr 2002 16:16:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 202F337B416 for ; Mon, 8 Apr 2002 16:16:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38NGWD93720 for perforce@freebsd.org; Mon, 8 Apr 2002 16:16:32 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 8 Apr 2002 16:16:32 -0700 (PDT) Message-Id: <200204082316.g38NGWD93720@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9398 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9398 Change 9398 by jake@jake_sparc64 on 2002/04/08 16:15:47 Integ these files. Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/net/htonl.S#7 integrate ... //depot/projects/sparc64/lib/libc/sparc64/net/ntohl.S#7 integrate Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/net/htonl.S#7 (text+ko) ==== @@ -49,7 +49,7 @@ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$FreeBSD: src/lib/libc/sparc64/net/htonl.S,v 1.2 2002/02/18 20:35:18 mike Exp $" + .asciz "$FreeBSD: src/lib/libc/sparc64/net/htonl.S,v 1.3 2002/04/06 00:07:15 tmm Exp $" #endif /* SYSLIBC_RCS and not lint */ /* netorder = htonl(hostorder) */ ==== //depot/projects/sparc64/lib/libc/sparc64/net/ntohl.S#7 (text+ko) ==== @@ -49,7 +49,7 @@ #if defined(SYSLIBC_RCS) && !defined(lint) .text - .asciz "$FreeBSD: src/lib/libc/sparc64/net/ntohl.S,v 1.2 2002/02/18 20:35:18 mike Exp $" + .asciz "$FreeBSD: src/lib/libc/sparc64/net/ntohl.S,v 1.3 2002/04/06 00:07:15 tmm Exp $" #endif /* SYSLIBC_RCS and not lint */ /* hostorder = ntohl(netorder) */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 16:17:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72D4837B41B; Mon, 8 Apr 2002 16:17:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BA5EB37B41A for ; Mon, 8 Apr 2002 16:17:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38NHYN93963 for perforce@freebsd.org; Mon, 8 Apr 2002 16:17:34 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 8 Apr 2002 16:17:34 -0700 (PDT) Message-Id: <200204082317.g38NHYN93963@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9399 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9399 Change 9399 by jake@jake_sparc64 on 2002/04/08 16:16:55 Integ this file. Affected files ... ... //depot/projects/sparc64/lib/libstand/Makefile#7 integrate Differences ... ==== //depot/projects/sparc64/lib/libstand/Makefile#7 (text+ko) ==== @@ -1,5 +1,4 @@ -# $FreeBSD: src/lib/libstand/Makefile,v 1.30 2002/03/19 12:03:05 peter Exp $ -# +# $FreeBSD: src/lib/libstand/Makefile,v 1.32 2002/04/08 20:46:07 obrien Exp $ # Originally from $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $ # # Notes: @@ -12,8 +11,7 @@ NOPIC= YES MAN= libstand.3 -# Mostly OK, some of the libc imports are a bit noisy -CFLAGS+= -Wall -ffreestanding +CFLAGS+= -ffreestanding .if ${MACHINE_ARCH} == "alpha" CFLAGS+= -mno-fp-regs To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 16:33:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C78237B405; Mon, 8 Apr 2002 16:30:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2F2B437B400 for ; Mon, 8 Apr 2002 16:30:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38NUpE95947 for perforce@freebsd.org; Mon, 8 Apr 2002 16:30:51 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 8 Apr 2002 16:30:51 -0700 (PDT) Message-Id: <200204082330.g38NUpE95947@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9401 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9401 Change 9401 by jake@jake_sparc64 on 2002/04/08 16:30:28 Integ@9394 Affected files ... ... //depot/projects/sparc64/Makefile.inc1#6 integrate ... //depot/projects/sparc64/bin/ps/ps.c#2 integrate ... //depot/projects/sparc64/contrib/openpam/CREDITS#1 branch ... //depot/projects/sparc64/contrib/openpam/HISTORY#5 integrate ... //depot/projects/sparc64/contrib/openpam/MANIFEST#5 integrate ... //depot/projects/sparc64/contrib/openpam/README#5 integrate ... //depot/projects/sparc64/contrib/openpam/RELNOTES#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_borrow_cred.3#1 branch ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_free_data.3#1 branch ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_restore_cred.3#1 branch ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setenv.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_strerror.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_verror.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vinfo.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vprompt.3#5 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#5 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_constants.h#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/Makefile#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_borrow_cred.c#1 branch ... //depot/projects/sparc64/contrib/openpam/lib/openpam_free_data.c#1 branch ... //depot/projects/sparc64/contrib/openpam/lib/openpam_impl.h#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_restore_cred.c#1 branch ... //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_chauthtok.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_item.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_user.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_item.c#5 integrate ... //depot/projects/sparc64/contrib/sendmail/FREEBSD-upgrade#3 integrate ... //depot/projects/sparc64/contrib/sort/Makefile#1 branch ... //depot/projects/sparc64/contrib/sort/append.c#1 branch ... //depot/projects/sparc64/contrib/sort/extern.h#1 branch ... //depot/projects/sparc64/contrib/sort/fields.c#1 branch ... //depot/projects/sparc64/contrib/sort/files.c#1 branch ... //depot/projects/sparc64/contrib/sort/fsort.c#1 branch ... //depot/projects/sparc64/contrib/sort/fsort.h#1 branch ... //depot/projects/sparc64/contrib/sort/init.c#1 branch ... //depot/projects/sparc64/contrib/sort/msort.c#1 branch ... //depot/projects/sparc64/contrib/sort/pathnames.h#1 branch ... //depot/projects/sparc64/contrib/sort/regress/Makefile#1 branch ... //depot/projects/sparc64/contrib/sort/regress/stests#1 branch ... //depot/projects/sparc64/contrib/sort/sort.1#1 branch ... //depot/projects/sparc64/contrib/sort/sort.c#1 branch ... //depot/projects/sparc64/contrib/sort/sort.h#1 branch ... //depot/projects/sparc64/contrib/sort/tmp.c#1 branch ... //depot/projects/sparc64/crypto/openssh/pam_ssh/pam_ssh.c#2 delete ... //depot/projects/sparc64/crypto/openssh/session.c#3 integrate ... //depot/projects/sparc64/etc/defaults/rc.conf#4 integrate ... //depot/projects/sparc64/etc/pam.d/login#2 integrate ... //depot/projects/sparc64/etc/rc.network6#2 integrate ... //depot/projects/sparc64/etc/syslog.conf#2 integrate ... //depot/projects/sparc64/gnu/lib/Makefile#5 integrate ... //depot/projects/sparc64/gnu/usr.bin/Makefile#9 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/Makefile.fe#1 branch ... //depot/projects/sparc64/gnu/usr.bin/cc/Makefile.tgt#1 branch ... //depot/projects/sparc64/gnu/usr.bin/cc/cc/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc1/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc1obj/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc1plus/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cccp/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/collect2/Makefile#1 branch ... //depot/projects/sparc64/gnu/usr.bin/cc/protoize/Makefile#1 branch ... //depot/projects/sparc64/gnu/usr.bin/gperf/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/devices/grodvi/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/devices/grohtml/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/devices/grolbp/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/devices/grolj4/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/devices/grops/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/devices/grotty/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/preproc/eqn/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/preproc/grn/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/preproc/html/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/preproc/pic/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/preproc/refer/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/preproc/tbl/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/roff/groff/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/roff/troff/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/utils/addftinfo/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/utils/indxbib/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/utils/lkbib/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/utils/lookbib/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/sort/COPYING#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/Makefile#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/config.h#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/error.c#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/error.h#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/getopt.c#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/getopt.h#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/getopt1.c#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/long-options.c#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/long-options.h#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/sort.1#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/sort.c#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/system.h#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/version.c#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/version.h#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/xstrtod.c#3 branch ... //depot/projects/sparc64/gnu/usr.bin/sort/xstrtod.h#3 branch ... //depot/projects/sparc64/gnu/usr.bin/tar/port.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/tar/prepend_args.c#2 integrate ... //depot/projects/sparc64/lib/libc/gen/disklabel.c#4 integrate ... //depot/projects/sparc64/lib/libc/locale/euc.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/ether_addr.c#3 integrate ... //depot/projects/sparc64/lib/libkvm/kvm_proc.c#5 integrate ... //depot/projects/sparc64/lib/libpam/Makefile.inc#2 integrate ... //depot/projects/sparc64/lib/libpam/libpam/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/Makefile.inc#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/modules.inc#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_kerberosIV/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_krb5/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_opie/pam_opie.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_radius/pam_radius.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_self/pam_self.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_ssh/pam_ssh.c#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_tacplus/pam_tacplus.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_unix/pam_unix.c#3 integrate ... //depot/projects/sparc64/lib/libutil/login_auth.c#2 integrate ... //depot/projects/sparc64/lib/libutil/login_cap.3#2 integrate ... //depot/projects/sparc64/lib/libutil/login_cap.c#2 integrate ... //depot/projects/sparc64/lib/libutil/login_cap.h#3 integrate ... //depot/projects/sparc64/lib/libutil/login_class.c#2 integrate ... //depot/projects/sparc64/lib/libutil/login_crypt.c#2 integrate ... //depot/projects/sparc64/libexec/lukemftpd/Makefile#2 integrate ... //depot/projects/sparc64/libexec/rtld-elf/ia64/reloc.c#2 integrate ... //depot/projects/sparc64/libexec/ypxfr/ypxfr_extern.h#2 integrate ... //depot/projects/sparc64/libexec/ypxfr/ypxfr_main.c#2 integrate ... //depot/projects/sparc64/libexec/ypxfr/ypxfr_misc.c#2 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml#3 integrate ... //depot/projects/sparc64/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml#2 integrate ... //depot/projects/sparc64/release/picobsd/floppy.tree/etc/rc1#2 integrate ... //depot/projects/sparc64/release/picobsd/tinyware/login/pico-login.c#2 integrate ... //depot/projects/sparc64/release/picobsd/tinyware/simple_httpd/simple_httpd.c#2 integrate ... //depot/projects/sparc64/release/scripts/print-cdrom-packages.sh#4 integrate ... //depot/projects/sparc64/sbin/atacontrol/atacontrol.c#4 integrate ... //depot/projects/sparc64/sbin/disklabel/Makefile#2 integrate ... //depot/projects/sparc64/sbin/disklabel/disklabel.c#7 integrate ... //depot/projects/sparc64/sbin/dumpon/dumpon.c#4 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/setup.c#3 integrate ... //depot/projects/sparc64/sbin/mount_std/mount_std.c#3 integrate ... //depot/projects/sparc64/sbin/newfs/mkfs.c#5 integrate ... //depot/projects/sparc64/sbin/newfs/newfs.c#5 integrate ... //depot/projects/sparc64/sbin/newfs/newfs.h#3 integrate ... //depot/projects/sparc64/sbin/routed/parms.c#2 integrate ... //depot/projects/sparc64/sbin/routed/routed.8#2 integrate ... //depot/projects/sparc64/sbin/savecore/savecore.c#5 integrate ... //depot/projects/sparc64/share/colldef/README#1 branch ... //depot/projects/sparc64/share/colldef/cs_CZ.ISO8859-2.src#2 integrate ... //depot/projects/sparc64/share/man/man5/Makefile#4 integrate ... //depot/projects/sparc64/share/man/man5/types.5#2 delete ... //depot/projects/sparc64/share/man/man7/Makefile#2 integrate ... //depot/projects/sparc64/share/man/man7/hier.7#4 integrate ... //depot/projects/sparc64/share/man/man7/stdint.7#1 branch ... //depot/projects/sparc64/share/mk/bsd.lib.mk#9 integrate ... //depot/projects/sparc64/share/mk/bsd.prog.mk#7 integrate ... //depot/projects/sparc64/share/mk/bsd.sys.mk#4 integrate ... //depot/projects/sparc64/share/syscons/keymaps/uk.iso.kbd#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/machdep.c#25 integrate ... //depot/projects/sparc64/sys/boot/common/load_elf.c#10 integrate ... //depot/projects/sparc64/sys/boot/efi/Makefile.inc#3 integrate ... //depot/projects/sparc64/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#4 integrate ... //depot/projects/sparc64/sys/boot/efi/loader/Makefile#7 integrate ... //depot/projects/sparc64/sys/boot/ia64/Makefile.inc#1 branch ... //depot/projects/sparc64/sys/boot/ia64/libski/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/ia64/skiload/Makefile#5 integrate ... //depot/projects/sparc64/sys/conf/Makefile.ia64#18 integrate ... //depot/projects/sparc64/sys/conf/files.pc98#20 integrate ... //depot/projects/sparc64/sys/dev/aac/aac_pci.c#10 integrate ... //depot/projects/sparc64/sys/dev/acpica/acpi.c#23 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-dma.c#27 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-pci.c#27 integrate ... //depot/projects/sparc64/sys/dev/ccd/ccd.c#11 integrate ... //depot/projects/sparc64/sys/dev/em/if_em.c#4 integrate ... //depot/projects/sparc64/sys/dev/em/if_em.h#4 integrate ... //depot/projects/sparc64/sys/dev/em/if_em_fxhw.c#3 integrate ... //depot/projects/sparc64/sys/dev/em/if_em_fxhw.h#3 integrate ... //depot/projects/sparc64/sys/dev/em/if_em_osdep.h#3 integrate ... //depot/projects/sparc64/sys/dev/em/if_em_phy.c#3 integrate ... //depot/projects/sparc64/sys/dev/em/if_em_phy.h#3 integrate ... //depot/projects/sparc64/sys/dev/kbd/atkbd.c#2 integrate ... //depot/projects/sparc64/sys/dev/mii/miidevs#5 integrate ... //depot/projects/sparc64/sys/dev/mii/miidevs.h#5 integrate ... //depot/projects/sparc64/sys/dev/mii/rlphy.c#5 integrate ... //depot/projects/sparc64/sys/dev/null/null.c#3 integrate ... //depot/projects/sparc64/sys/dev/ppbus/if_plip.c#2 integrate ... //depot/projects/sparc64/sys/dev/ppbus/lpbb.c#3 integrate ... //depot/projects/sparc64/sys/dev/ppbus/lpt.c#3 integrate ... //depot/projects/sparc64/sys/dev/ppbus/pcfclock.c#3 integrate ... //depot/projects/sparc64/sys/dev/ppbus/ppi.c#3 integrate ... //depot/projects/sparc64/sys/dev/ppbus/pps.c#5 integrate ... //depot/projects/sparc64/sys/dev/ppbus/vpo.c#2 integrate ... //depot/projects/sparc64/sys/dev/usb/hid.c#3 integrate ... //depot/projects/sparc64/sys/dev/usb/if_aue.c#9 integrate ... //depot/projects/sparc64/sys/dev/usb/if_auereg.h#3 integrate ... //depot/projects/sparc64/sys/dev/usb/if_cue.c#5 integrate ... //depot/projects/sparc64/sys/dev/usb/if_cuereg.h#2 integrate ... //depot/projects/sparc64/sys/dev/usb/if_kue.c#5 integrate ... //depot/projects/sparc64/sys/dev/usb/if_kuereg.h#2 integrate ... //depot/projects/sparc64/sys/dev/usb/ohci.c#13 integrate ... //depot/projects/sparc64/sys/dev/usb/ohcivar.h#5 integrate ... //depot/projects/sparc64/sys/dev/usb/ugraphire_rdesc.h#1 branch ... //depot/projects/sparc64/sys/dev/usb/uhci.c#13 integrate ... //depot/projects/sparc64/sys/dev/usb/uhcireg.h#4 integrate ... //depot/projects/sparc64/sys/dev/usb/uhcivar.h#5 integrate ... //depot/projects/sparc64/sys/dev/usb/uhid.c#9 integrate ... //depot/projects/sparc64/sys/dev/usb/uhub.c#8 integrate ... //depot/projects/sparc64/sys/dev/usb/ukbd.c#5 integrate ... //depot/projects/sparc64/sys/dev/usb/ums.c#10 integrate ... //depot/projects/sparc64/sys/dev/usb/usb.c#10 integrate ... //depot/projects/sparc64/sys/dev/usb/usb_port.h#9 integrate ... //depot/projects/sparc64/sys/dev/usb/usb_quirks.c#2 integrate ... //depot/projects/sparc64/sys/dev/usb/usb_subr.c#8 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdevs#16 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdevs.h#16 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdevs_data.h#16 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdi.c#7 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdi.h#5 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdi_util.c#3 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdi_util.h#3 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdivar.h#6 integrate ... //depot/projects/sparc64/sys/dev/vinum/vinumhdr.h#2 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wireg.h#10 integrate ... //depot/projects/sparc64/sys/fs/hpfs/hpfs_vnops.c#10 integrate ... //depot/projects/sparc64/sys/fs/smbfs/smbfs_vfsops.c#7 integrate ... //depot/projects/sparc64/sys/fs/smbfs/smbfs_vnops.c#7 integrate ... //depot/projects/sparc64/sys/fs/unionfs/union_subr.c#7 integrate ... //depot/projects/sparc64/sys/geom/geom_dev.c#7 integrate ... //depot/projects/sparc64/sys/geom/geom_disk.c#5 integrate ... //depot/projects/sparc64/sys/i386/i386/machdep.c#27 integrate ... //depot/projects/sparc64/sys/i386/isa/icu.h#5 integrate ... //depot/projects/sparc64/sys/i386/isa/icu_ipl.s#2 integrate ... //depot/projects/sparc64/sys/i386/isa/icu_vector.s#8 integrate ... //depot/projects/sparc64/sys/i386/isa/intr_machdep.h#8 integrate ... //depot/projects/sparc64/sys/ia64/conf/GENERIC#13 integrate ... //depot/projects/sparc64/sys/ia64/ia64/autoconf.c#8 integrate ... //depot/projects/sparc64/sys/ia64/ia64/ia64dump.c#2 integrate ... //depot/projects/sparc64/sys/ia64/include/param.h#4 integrate ... //depot/projects/sparc64/sys/kern/kern_ktr.c#15 integrate ... //depot/projects/sparc64/sys/kern/kern_proc.c#15 integrate ... //depot/projects/sparc64/sys/kern/kern_shutdown.c#15 integrate ... //depot/projects/sparc64/sys/kern/subr_diskslice.c#9 integrate ... //depot/projects/sparc64/sys/kern/uipc_socket.c#16 integrate ... //depot/projects/sparc64/sys/kern/vfs_aio.c#17 integrate ... //depot/projects/sparc64/sys/kern/vfs_cache.c#11 integrate ... //depot/projects/sparc64/sys/kern/vfs_syscalls.c#26 integrate ... //depot/projects/sparc64/sys/netinet/if_fddi.h#3 delete ... //depot/projects/sparc64/sys/netinet6/nd6.c#6 integrate ... //depot/projects/sparc64/sys/pc98/i386/machdep.c#23 integrate ... //depot/projects/sparc64/sys/pc98/pc98/fd.c#8 integrate ... //depot/projects/sparc64/sys/pc98/pc98/sio.c#13 integrate ... //depot/projects/sparc64/sys/pc98/pc98/syscons.c#10 integrate ... //depot/projects/sparc64/sys/pci/if_rl.c#8 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/machdep.c#21 integrate ... //depot/projects/sparc64/sys/sparc64/conf/GENERIC#20 integrate ... //depot/projects/sparc64/sys/sparc64/include/ktr.h#10 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/genassym.c#67 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/machdep.c#74 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/pmap.c#83 integrate ... //depot/projects/sparc64/sys/sys/cdefs.h#10 integrate ... //depot/projects/sparc64/sys/sys/disk.h#5 integrate ... //depot/projects/sparc64/sys/sys/disklabel.h#17 integrate ... //depot/projects/sparc64/sys/sys/malloc.h#6 integrate ... //depot/projects/sparc64/sys/sys/socketvar.h#16 integrate ... //depot/projects/sparc64/sys/sys/types.h#13 integrate ... //depot/projects/sparc64/sys/sys/ucred.h#8 integrate ... //depot/projects/sparc64/sys/sys/user.h#11 integrate ... //depot/projects/sparc64/sys/ufs/ffs/ffs_vfsops.c#16 integrate ... //depot/projects/sparc64/sys/vm/uma.h#3 integrate ... //depot/projects/sparc64/sys/vm/uma_core.c#5 integrate ... //depot/projects/sparc64/sys/vm/uma_int.h#4 integrate ... //depot/projects/sparc64/sys/vm/vm_zone.c#12 delete ... //depot/projects/sparc64/sys/vm/vm_zone.h#4 delete ... //depot/projects/sparc64/usr.bin/Makefile#18 integrate ... //depot/projects/sparc64/usr.bin/chpass/pw_yp.c#4 integrate ... //depot/projects/sparc64/usr.bin/login/login.c#2 integrate ... //depot/projects/sparc64/usr.bin/netstat/route.c#2 integrate ... //depot/projects/sparc64/usr.bin/sed/process.c#4 integrate ... //depot/projects/sparc64/usr.bin/sort/Makefile#2 delete ... //depot/projects/sparc64/usr.bin/sort/append.c#3 delete ... //depot/projects/sparc64/usr.bin/sort/extern.h#4 delete ... //depot/projects/sparc64/usr.bin/sort/fields.c#4 delete ... //depot/projects/sparc64/usr.bin/sort/files.c#4 delete ... //depot/projects/sparc64/usr.bin/sort/fsort.c#3 delete ... //depot/projects/sparc64/usr.bin/sort/fsort.h#2 delete ... //depot/projects/sparc64/usr.bin/sort/init.c#4 delete ... //depot/projects/sparc64/usr.bin/sort/msort.c#4 delete ... //depot/projects/sparc64/usr.bin/sort/pathnames.h#2 delete ... //depot/projects/sparc64/usr.bin/sort/sort.1#4 delete ... //depot/projects/sparc64/usr.bin/sort/sort.c#5 delete ... //depot/projects/sparc64/usr.bin/sort/sort.h#3 delete ... //depot/projects/sparc64/usr.bin/sort/tmp.c#3 delete ... //depot/projects/sparc64/usr.bin/tail/forward.c#3 integrate ... //depot/projects/sparc64/usr.bin/tail/reverse.c#3 integrate ... //depot/projects/sparc64/usr.bin/vmstat/vmstat.c#4 integrate ... //depot/projects/sparc64/usr.bin/xlint/lint1/main1.c#2 integrate ... //depot/projects/sparc64/usr.bin/xlint/xlint/xlint.c#2 integrate ... //depot/projects/sparc64/usr.sbin/Makefile#11 integrate ... //depot/projects/sparc64/usr.sbin/arp/arp.4#2 integrate ... //depot/projects/sparc64/usr.sbin/arp/arp.c#4 integrate ... //depot/projects/sparc64/usr.sbin/burncd/burncd.c#2 integrate ... //depot/projects/sparc64/usr.sbin/extattrctl/extattrctl.c#2 integrate ... //depot/projects/sparc64/usr.sbin/lpr/lpd/printjob.c#2 integrate ... //depot/projects/sparc64/usr.sbin/mergemaster/mergemaster.8#2 integrate ... //depot/projects/sparc64/usr.sbin/mergemaster/mergemaster.sh#2 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/config.c#3 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/menus.c#6 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/package.c#4 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/sysinstall.h#3 integrate Differences ... ==== //depot/projects/sparc64/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.249 2002/04/04 06:49:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.251 2002/04/08 15:11:29 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -428,12 +428,11 @@ ${KERNCONFDIR}/${_kernel} .endif .if !defined(NOCLEAN) && !defined(NO_KERNELCLEAN) -.if defined(MODULES_WITH_WORLD) || defined(NO_MODULES) || !exists(${KRNLSRCDIR}/modules) cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} clean -.else + ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} -DNO_MODULES clean +.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KRNLSRCDIR}/modules) cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} clean cleandir + ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} cleandir .endif .endif cd ${KRNLOBJDIR}/${_kernel}; \ @@ -557,7 +556,8 @@ .endif bootstrap-tools: -.for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef usr.bin/xinstall \ +.for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef \ + usr.bin/xargs usr.bin/xinstall \ usr.sbin/config usr.sbin/kbdcontrol \ gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo cd ${.CURDIR}/${_tool}; \ ==== //depot/projects/sparc64/bin/ps/ps.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.49 2002/02/21 18:27:16 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.50 2002/04/07 04:59:13 jedgar Exp $"); #ifndef lint static const char copyright[] = @@ -308,7 +308,7 @@ /* XXX - should be cleaner */ if (!all && ttydev == NODEV && pid == -1 && !nuids) { if ((uids = malloc(sizeof (*uids))) == NULL) - errx(1, "malloc: %s", strerror(errno)); + err(1, "malloc"); nuids = 1; *uids = getuid(); } @@ -421,7 +421,7 @@ moreuids = realloc(uids, alloc * sizeof (*uids)); if (moreuids == NULL) { free(uids); - errx(1, "realloc: %s", strerror(errno)); + err(1, "realloc"); } uids = moreuids; } ==== //depot/projects/sparc64/contrib/openpam/HISTORY#5 (text+ko) ==== @@ -1,4 +1,35 @@ ============================================================================ +OpenPAM Cinchona 2002-04-08 + + - ENHANCE: Improved documentation for several API functions. + + - BUGFIX: Fix bug in pam_set_data() that would result in corruption + of the module data list. + + - BUGFIX: Allocate the correct amount of memory for the environment + list in pam_putenv(). + + - ENHANCE: Change pam_get_authtok()'s prototype so the caller can + specify what token it wants. Also introduce PAM_OLDAUTHTOK_PROMPT. + + - BUGFIX: Plug memory leak in pam_get_user() / pam_get_authtok(), and + reduce differences between these very similar functions. + + - ENHANCE: Check flags carefully in pam_authenticate() and + pam_chauthtok(). + + - BUGFIX: Fix bugs in portability code; libpam now builds on NetBSD. + + - ENHANCE: In pam_get_authtok(), if PAM_OLDAUTHTOK is set, we're + asked for PAM_AUTHTOK, and we have to prompt the user, prompt her + twice and compare the responses. + + - ENHANCE: Add openpam_{borrow,restore}_cred(), for temporarily + switching to user credentials. + + - ENHANCE: Add openpam_free_data(), a generic cleanup function for + pam_set_data() consumers. +============================================================================ OpenPAM Centaury 2002-03-14 - BUGFIX: Add missing #include to openpam_log.c. @@ -16,7 +47,7 @@ - ENHANCE: Suppress debugging logs, unless compiled with -DDEBUG. ============================================================================ -OpenPAM Celandine 2002-03-05 +OpenPAM Celandine 2002-03-05 - BUGFIX: PAM_TRY_AGAIN is a valid return value for pam_chauthtok(). @@ -83,4 +114,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/sparc64/contrib/openpam/HISTORY#4 $ +$P4: //depot/projects/sparc64/contrib/openpam/HISTORY#5 $ ==== //depot/projects/sparc64/contrib/openpam/MANIFEST#5 (text+ko) ==== @@ -1,6 +1,7 @@ # -# $P4: //depot/projects/sparc64/contrib/openpam/MANIFEST#4 $ +# $P4: //depot/projects/sparc64/contrib/openpam/MANIFEST#5 $ # +CREDITS HISTORY INSTALL LICENSE @@ -13,8 +14,11 @@ bin/su/su.c doc/Makefile doc/man/Makefile +doc/man/openpam_borrow_cred.3 +doc/man/openpam_free_data.3 doc/man/openpam_get_option.3 doc/man/openpam_log.3 +doc/man/openpam_restore_cred.3 doc/man/openpam_set_option.3 doc/man/openpam_ttyconv.3 doc/man/pam.3 @@ -55,13 +59,16 @@ include/security/pam_modules.h include/security/pam_types.h lib/Makefile +lib/openpam_borrow_cred.c lib/openpam_dispatch.c lib/openpam_dynamic.c lib/openpam_findenv.c +lib/openpam_free_data.c lib/openpam_get_option.c lib/openpam_impl.h lib/openpam_load.c lib/openpam_log.c +lib/openpam_restore_cred.c lib/openpam_set_option.c lib/openpam_static.c lib/openpam_ttyconv.c ==== //depot/projects/sparc64/contrib/openpam/README#5 (text+ko) ==== @@ -13,18 +13,14 @@ paper and in OSF-RFC 86.0; this corresponds to the full XSSO API except for mappings and secondary authentication. - - Extends the API with several useful and time-saving functions: - pam_error(), pam_get_authtok(), pam_info(), pam_prompt(), - pam_setenv(), pam_verror(), pam_vinfo(), pam_vprompt() - - - Offers a number of time-saving convenience functions: - openpam_log(), openpam_ttyconv(). + - Extends the API with several useful and time-saving functions. - Performs strict checking of return values from service modules. - Reads configuration from /etc/pam.d/, /usr/local/etc/pam.d/ and /etc/pam.conf, in that order; this will be made configurable in a - future release.Please direct bug reports and inquiries to - openpam@thinksec.com. + future release. + +Please direct bug reports and inquiries to openpam@thinksec.com. -$P4: //depot/projects/sparc64/contrib/openpam/README#4 $ +$P4: //depot/projects/sparc64/contrib/openpam/README#5 $ ==== //depot/projects/sparc64/contrib/openpam/RELNOTES#5 (text+ko) ==== @@ -1,19 +1,25 @@ - Release notes for OpenPAM Centaury + Release notes for OpenPAM Cinchona ================================== This is a beta release. The library itself is complete. Documentation exists in the form of -man pages for the library functions, though some pages are still +man pages for the library functions, though a few pages are still incomplete. -This release is incorporated into FreeBSD-CURRENT as of 2002-03-14. -It has not been tested on any other OS, though it should build and run -with minimal tweaks on NetBSD and OpenBSD. +This release is incorporated into FreeBSD-CURRENT as of 2002-04-08. +It has also been successfully built on NetBSD, and should build with +minimal or no changes on OpenBSD. It has not been tested on any other +OS. Known issues: - The documentation is still incomplete. -$P4: //depot/projects/sparc64/contrib/openpam/RELNOTES#4 $ + - It should be possible to create incomplete modules without + recourse to placeholders or elaborate preprocessor tricks. This + is made difficult by the requirement that it should be possible to + link modules statically. + +$P4: //depot/projects/sparc64/contrib/openpam/RELNOTES#5 $ ==== //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#5 (text+ko) ==== @@ -31,12 +31,15 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#4 $ +# $P4: //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#5 $ # MAN = +MAN += openpam_borrow_cred.3 +MAN += openpam_free_data.3 MAN += openpam_get_option.3 MAN += openpam_log.3 +MAN += openpam_restore_cred.3 MAN += openpam_set_option.3 MAN += openpam_ttyconv.3 MAN += pam.3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt OPENPAM_LOG 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#5 (text+ko) ==== @@ -31,12 +31,15 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM 3 .Os .Sh NAME +.Nm openpam_borrow_cred , +.Nm openpam_free_data , +.Nm openpam_restore_cred , .Nm pam_acct_mgmt , .Nm pam_authenticate , .Nm pam_chauthtok , @@ -68,6 +71,12 @@ .Sh SYNOPSIS .In security/pam_appl.h .Ft int +.Fn openpam_borrow_cred "pam_handle_t *pamh" "const struct passwd *pwd" +.Ft void +.Fn openpam_free_data "pam_handle_t *pamh" "void *data" "int status" +.Ft int +.Fn openpam_restore_cred "pam_handle_t *pamh" +.Ft int .Fn pam_acct_mgmt "pam_handle_t *pamh" "int flags" .Ft int .Fn pam_authenticate "pam_handle_t *pamh" "int flags" @@ -80,7 +89,7 @@ .Ft int .Fn pam_error "pam_handle_t *pamh" "const char *fmt" "..." .Ft int -.Fn pam_get_authtok "pam_handle_t *pamh" "const char **authtok" "const char *prompt" +.Fn pam_get_authtok "pam_handle_t *pamh" "int item" "const char **authtok" "const char *prompt" .Ft int .Fn pam_get_data "pam_handle_t *pamh" "const char *module_data_name" "const void **data" .Ft int @@ -185,6 +194,9 @@ Unknown user. .El .Sh SEE ALSO +.Xr openpam_borrow_cred 3 , +.Xr openpam_free_data 3 , +.Xr openpam_restore_cred 3 , .Xr pam_acct_mgmt 3 , .Xr pam_authenticate 3 , .Xr pam_chauthtok 3 , ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME @@ -46,7 +46,31 @@ .Ft int .Fn pam_authenticate "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +function attempts to authenticate the user +associated with the pam context specified by the +.Va pamh +argument. +.Pp +The application is free to call +.Nm +as many times as it +wishes, but some modules may maintain an internal retry counter and +return +.Dv PAM_MAXTRIES +when it exceeds some preset or hardcoded limit. +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Pp +.Bd -literal + =PAM_SILENT + Do not emit any messages. + =PAM_DISALLOW_NULL_AUTHTOK + Fail if the user's authentication token is null. .Sh RETURN VALUES The .Nm ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME @@ -46,7 +46,23 @@ .Ft int .Fn pam_chauthtok "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +function attempts to change the authentication token +for the user associated with the pam context specified by the +.Va pamh +argument. +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Pp +.Bd -literal + =PAM_SILENT + Do not emit any messages. + =PAM_CHANGE_EXPIRED_AUTHTOK + Change only those authentication tokens that have expired. .Sh RETURN VALUES The .Nm ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_END 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_ERROR 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME @@ -44,9 +44,66 @@ .Sh SYNOPSIS .In security/pam_appl.h .Ft int -.Fn pam_get_authtok "pam_handle_t *pamh" "const char **authtok" "const char *prompt" +.Fn pam_get_authtok "pam_handle_t *pamh" "int item" "const char **authtok" "const char *prompt" .Sh DESCRIPTION -No description available. +The +.Nm +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 +.Va authtok +argument. +.Pp +The +.Va item +argument must have one of the following values: +.Pp +.Bd -literal + =PAM_AUTHTOK + Returns the current authentication token, or the new token + when changing authentication tokens. + =PAM_OLDAUTHTOK + Returns the previous authentication token when changing + authentication tokens. + +.Ed +The +.Va prompt +argument specifies a prompt to use if no token is cached. +.Ed +If it is +.Dv NULL , +the +.Dv PAM_AUTHTOK_PROMPT +or +.Dv PAM_OLDAUTHTOK_PROMPT +item, +.Ed +as appropriate, will be used. If that item is also +.Dv NULL , +a hardcoded +.Ed +default prompt will be used. + +.Ed +If +.Va item +is set to +.Dv PAM_AUTHTOK +and there is a non-null +.Dv PAM_OLDAUTHTOK +.Ed +item, +.Nm +will ask the user to confirm the new token by +.Ed +retyping it. If there is a mismatch, +.Nm +will return +.Ed +.Dv PAM_TRY_AGAIN . + .Sh RETURN VALUES The .Nm @@ -58,9 +115,13 @@ Conversation failure. .It Bq Er PAM_SYSTEM_ERR System error. +.It Bq Er PAM_TRY_AGAIN +Try again. .El .Sh SEE ALSO .Xr pam 3 , +.Xr pam_get_item 3 , +.Xr pam_get_user 3 , .Xr pam_strerror 3 .Sh STANDARDS The ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GET_DATA 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#4 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#5 $ .\" -.Dd March 7, 2002 +.Dd April 8, 2002 .Dt PAM_GET_ITEM 3 .Os .Sh NAME @@ -85,6 +85,9 @@ .It Dv PAM_AUTHTOK_PROMPT The prompt to use when asking the applicant for an authentication token. +.It Dv PAM_OLDAUTHTOK_PROMPT +The prompt to use when asking the applicant for an +expired authentication token prior to changing it. .El See .Xr pam_start 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 16:47:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D7A537B416; Mon, 8 Apr 2002 16:47:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B528837B400 for ; Mon, 8 Apr 2002 16:47:13 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38NlDs01765 for perforce@freebsd.org; Mon, 8 Apr 2002 16:47:13 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 8 Apr 2002 16:47:13 -0700 (PDT) Message-Id: <200204082347.g38NlDs01765@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9402 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9402 Change 9402 by jake@jake_sparc64 on 2002/04/08 16:46:33 atacontrol builds. Affected files ... ... //depot/projects/sparc64/sbin/Makefile#11 edit Differences ... ==== //depot/projects/sparc64/sbin/Makefile#11 (text+ko) ==== @@ -4,6 +4,7 @@ # XXX MISSING: icheck ncheck SUBDIR= adjkerntz \ + atacontrol \ atm \ badsect \ camcontrol \ @@ -102,7 +103,7 @@ # Nogo on sparc64 .if ${MACHINE_ARCH} != "sparc64" -SUBDIR+=atacontrol vinum +SUBDIR+=vinum .endif .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 16:52:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01E3B37B405; Mon, 8 Apr 2002 16:52:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F242937B419 for ; Mon, 8 Apr 2002 16:52:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38NqKK02604 for perforce@freebsd.org; Mon, 8 Apr 2002 16:52:20 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 8 Apr 2002 16:52:20 -0700 (PDT) Message-Id: <200204082352.g38NqKK02604@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9403 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9403 Change 9403 by jake@jake_sparc64 on 2002/04/08 16:51:41 lukemftpd builds. Affected files ... ... //depot/projects/sparc64/libexec/Makefile#3 edit Differences ... ==== //depot/projects/sparc64/libexec/Makefile#3 (text+ko) ==== @@ -9,6 +9,7 @@ ftpd \ getNAME \ getty \ + lukemftpd \ makekey \ mknetid \ pppoed \ @@ -28,10 +29,6 @@ xtend \ ypxfr -.if ${MACHINE_ARCH} != "sparc64" -SUBDIR+=lukemftpd -.endif - .if !defined(NO_BIND) SUBDIR+=named-xfer .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 16:54:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3B8637B417; Mon, 8 Apr 2002 16:54:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 298E137B405 for ; Mon, 8 Apr 2002 16:54:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38NsM002919 for perforce@freebsd.org; Mon, 8 Apr 2002 16:54:22 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 8 Apr 2002 16:54:22 -0700 (PDT) Message-Id: <200204082354.g38NsM002919@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9404 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9404 Change 9404 by jake@jake_sparc64 on 2002/04/08 16:53:37 ATA_ENABLE_BUSMASTER is no more. Affected files ... ... //depot/projects/sparc64/sys/conf/options#24 edit Differences ... ==== //depot/projects/sparc64/sys/conf/options#24 (text+ko) ==== @@ -241,8 +241,6 @@ AST_DEBUG opt_ata.h ATAPI_DEBUG opt_ata.h ATA_DEBUG opt_ata.h -ATA_ENABLE_BUSMASTER opt_ata.h #Try to enable bus master support even - #if it wasn't enabled by the BIOS ATA_STATIC_ID opt_ata.h DEV_ATADISK opt_ata.h DEV_ATAPICD opt_ata.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 16:55:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E48BC37B41B; Mon, 8 Apr 2002 16:55:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 65E5337B404 for ; Mon, 8 Apr 2002 16:55:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38NtbK03419 for perforce@freebsd.org; Mon, 8 Apr 2002 16:55:37 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 8 Apr 2002 16:55:37 -0700 (PDT) Message-Id: <200204082355.g38NtbK03419@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9406 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9406 Change 9406 by jake@jake_sparc64 on 2002/04/08 16:55:33 Reduce diffs. Affected files ... ... //depot/projects/sparc64/sys/dev/ofw/ofw_console.c#13 edit Differences ... ==== //depot/projects/sparc64/sys/dev/ofw/ofw_console.c#13 (text+ko) ==== @@ -130,7 +130,11 @@ error = (*linesw[tp->t_line].l_open)(dev, tp); if (error == 0 && setuptimeout) { - polltime = hz / 4; + polltime = hz / OFW_POLL_HZ; + if (polltime < 1) { + polltime = 1; + } + ofw_timeouthandle = timeout(ofw_timeout, tp, polltime); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 16:56:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C50D137B417; Mon, 8 Apr 2002 16:54:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D375A37B41A for ; Mon, 8 Apr 2002 16:54:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38NsNW02924 for perforce@freebsd.org; Mon, 8 Apr 2002 16:54:23 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 8 Apr 2002 16:54:23 -0700 (PDT) Message-Id: <200204082354.g38NsNW02924@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 9405 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9405 Change 9405 by arr@arr_shibby on 2002/04/08 16:54:00 Integ. Affected files ... ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/api_up1000.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/autoconf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/clock.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/cpuconf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/db_disasm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/db_interface.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/db_trace.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/dec_1000a.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/dec_2100_a50.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/dec_2100_a500.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/dec_axppci_33.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/dec_eb164.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/dec_eb64plus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/dec_kn20aa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/dec_kn300.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/dec_st550.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/dec_st6600.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/interrupt.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/machdep.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/mem.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/mp_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/pmap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/prom.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/promcons.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/sys_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/trap.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/vm_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/conf/GENERIC#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/ansi.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/bootinfo.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/bus.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/clock.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/cpu.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/cpuconf.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/cpufunc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/db_machdep.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/endian.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/float.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/md_var.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/pmap.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/profile.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/prom.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/ptrace.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/reg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/sigframe.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/signal.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/sysarch.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/linux/linux_proto.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/linux/linux_sysvec.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/mcbus/mcpcia.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/osf1/osf1_ioctl.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/osf1/osf1_misc.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/osf1/osf1_mount.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/osf1/osf1_proto.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/osf1/osf1_signal.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/osf1/osf1_signal.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/osf1/osf1_sysvec.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/osf1/osf1_util.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/apecs_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/cia.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/cia_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/irongate_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/lca_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/pcibus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/pcibus.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/t2.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/t2_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/tsunami.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/tsunami_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/am7990.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/am7990var.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/ascvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/esp.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/if_le_dec.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/if_le_ioasic.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/if_levar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/ioasic.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/ioasicvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/sticvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/tc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/tcds.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/tcdsreg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/tcdsvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tc/tcvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tlsb/dwlpx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tlsb/zs_tlsb.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/arm/include/types.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/common/bcache.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/common/bootstrap.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/common/isapnp.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/common/loader.8#4 integrate ... //depot/projects/trustedbsd/audit/sys/boot/efi/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/efi/include/efiapi.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/efi/libefi/efifs.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/efi/loader/conf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/forth/loader.conf#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/forth/loader.conf.5#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/i386/boot2/boot2.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/i386/loader/conf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ia64/libski/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ia64/skiload/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ofw/libofw/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ofw/libofw/disklabel.h#2 delete ... //depot/projects/trustedbsd/audit/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ofw/libofw/ofw_console.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ofw/libofw/ofw_disk.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ofw/libofw/ofw_net.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ofw/libofw/openfirm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ofw/libofw/openfirm.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/pc98/boot2/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/boot1/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/boot1/boot1.c#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/bootblock/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/bootblock/bootblock.c#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/loader/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/loader/locore.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/loader/main.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/loader/metadata.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/cam/scsi/scsi_all.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/cam/scsi/scsi_cd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/cam/scsi/scsi_da.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/cam/scsi/scsi_low.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/cam/scsi/scsi_low.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/cam/scsi/scsi_low_pisa.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/cam/scsi/scsi_pass.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/coda/coda_fbsd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/coda/coda_venus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/coda/coda_vfsops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/coda/coda_vnops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/coda/coda_vnops.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linprocfs/linprocfs.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_file.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_getcwd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_ioctl.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_ipc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_mib.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_misc.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_signal.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_uid16.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_util.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_util.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/pecoff/imgact_pecoff.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/imgact_svr4.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_exec.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_fcntl.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_ioctl.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_ioctl.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_ipc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_misc.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_proto.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_resource.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_signal.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_signal.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_socket.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_sockio.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_stat.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_stream.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_stropts.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_sysvec.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_termios.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_ttold.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_util.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/Makefile.alpha#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/Makefile.i386#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/Makefile.ia64#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/Makefile.pc98#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/Makefile.powerpc#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/Makefile.sparc64#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files#7 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.alpha#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.i386#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.ia64#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.pc98#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.powerpc#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.sparc64#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/kern.post.mk#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/kern.pre.mk#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/kmod.mk#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/majors#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/options#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/options.alpha#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/options.i386#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/options.pc98#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/options.sparc64#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acconfig.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acdebug.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acdispat.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acdos16.h#1 branch ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acefi.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acenv.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acevents.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acexcep.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acfreebsd.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acgcc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acglobal.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/achware.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acinterp.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/aclocal.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acmacros.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acnamesp.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acobject.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acoutput.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acparser.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acpi.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acpiosxf.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acpixf.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acresrc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acstruct.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/actables.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/actbl.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/actbl1.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/actbl2.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/actbl71.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/actypes.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/acutils.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/amlcode.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dbcmds.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dbdisasm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dbdisply.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dbexec.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dbfileio.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dbhistry.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dbinput.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dbstats.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dbutils.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dbxface.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dsfield.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dsmethod.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dsmthdat.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dsobject.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dsopcode.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dsutils.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dswexec.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dswload.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dswscope.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/dswstate.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/evevent.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/evmisc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/evregion.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/evrgnini.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/evsci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/evxface.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/evxfevnt.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/evxfregn.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exconfig.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exconvrt.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/excreate.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exdump.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exfield.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exfldio.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exmisc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exmutex.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exnames.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exoparg1.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exoparg2.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exoparg3.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exoparg6.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exprep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exregion.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exresnte.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exresolv.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exresop.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exstore.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exstoren.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exstorob.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exsystem.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/exutils.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/hwacpi.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/hwgpe.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/hwregs.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/hwsleep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/hwtimer.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/nsaccess.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/nsalloc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/nsdump.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/nseval.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/nsinit.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/nsload.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/nsnames.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/nsobject.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/nssearch.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/nsutils.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/nswalk.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/nsxfname.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/nsxfobj.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/psargs.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/psfind.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/psopcode.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/psparse.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/psscope.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/pstree.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/psutils.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/pswalk.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/psxface.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/rsaddr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/rscalc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/rscreate.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/rsdump.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/rsio.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/rsirq.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/rslist.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/rsmemory.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/rsmisc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/rsutils.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/rsxface.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/tbconvrt.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/tbget.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/tbinstal.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/tbutils.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/tbxface.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/tbxfroot.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/utalloc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/utclib.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/utcopy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/utdebug.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/utdelete.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/uteval.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/utglobal.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/utinit.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/utmath.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/utmisc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/utobject.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/acpica/utxface.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/dev/fla/fla.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/fil.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_auth.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_fil.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#1 branch ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#1 branch ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ipl.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/blowfish/arch/i386/bf_enc.S#1 branch ... //depot/projects/trustedbsd/audit/sys/crypto/blowfish/arch/i386/bf_enc_586.S#1 branch ... //depot/projects/trustedbsd/audit/sys/crypto/blowfish/arch/i386/bf_enc_686.S#1 branch ... //depot/projects/trustedbsd/audit/sys/crypto/blowfish/bf_enc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/blowfish/bf_locl.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/blowfish/bf_pi.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/blowfish/bf_skey.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/blowfish/blowfish.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/cast128/cast128.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/des/arch/i386/des_enc.S#1 branch ... //depot/projects/trustedbsd/audit/sys/crypto/des/des.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/des/des_ecb.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/des/des_enc.c#1 branch ... //depot/projects/trustedbsd/audit/sys/crypto/des/des_locl.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/des/des_setkey.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/des/spr.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/md5.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/md5.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/sha1.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/sha1.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/sha2/sha2.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/sha2/sha2.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_access.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_break.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_break.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_command.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_command.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_examine.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_expr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_input.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_lex.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_lex.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_output.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_output.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_run.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_sym.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_sym.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_variables.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_variables.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_watch.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/ddb.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac_pci.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/Osd/OsdHardware.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/Osd/OsdMemory.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/Osd/OsdStream.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/Osd/OsdSynch.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_acad.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_button.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_cmbat.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_cpu.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_ec.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_lid.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_pcib.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_powerprofile.c#2 delete ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_powerres.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_resource.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_thermal.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_timer.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpica_support.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpivar.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic/aic.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic/aic6360reg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic/aic_cbus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic/aic_isa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic/aicvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/amr/amr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/an/if_an.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/an/if_an_isa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/an/if_an_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/an/if_anreg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/asr/asr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-all.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-all.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-disk.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-disk.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-dma.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-pci.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-raid.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-raid.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/atapi-all.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/atapi-all.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/atapi-cd.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/atapi-cd.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/atapi-fd.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/atapi-tape.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/awi/am79c930.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/awi/am79c930var.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/awi/awi.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/awi/awi_wep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/awi/awi_wicfg.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/awi/awivar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/awi/if_awi_pccard.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/bge/if_bge.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/bktr/bktr_core.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/bktr/bktr_os.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/cardbus/cardbus.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/cardbus/cardbus_cis.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/cardbus/cardbusvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ccd/ccd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/cm/if_cm_isa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/cm/smc90cx6.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/cm/smc90cx6var.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/cnw/if_cnw.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ct/bshw_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ct/bshwvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ct/ct.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ct/ct_isa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ct/ct_machdep.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ct/ctvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/dgb/dgb.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/digi.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/digi.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/digi_isa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/digi_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ed/if_ed.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ed/if_ed_cbus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ed/if_ed_isa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ed/if_ed_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ed/if_edvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/eisa/eisaconf.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em_fxhw.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em_fxhw.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em_osdep.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em_phy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em_phy.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/en/midway.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/en/midwayvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ep/if_ep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ep/if_ep_eisa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ex/if_ex.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ex/if_ex_isa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ex/if_ex_pccard.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/gem/if_gem.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/gem/if_gem_pci.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/gem/if_gemreg.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/gem/if_gemvar.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/hea/eni.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hea/eni_buffer.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hea/eni_if.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hea/eni_intr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hea/eni_receive.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hea/eni_var.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hea/eni_vcm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hfa/fore_buffer.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hfa/fore_include.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hfa/fore_init.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hfa/fore_load.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hfa/fore_output.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hfa/fore_receive.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hme/if_hme.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/hme/if_hme_pci.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/hme/if_hme_sbus.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/hme/if_hmereg.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/hme/if_hmevar.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/ida/ida.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ida/ida_disk.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iir/iir.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iir/iir_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp_freebsd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp_freebsd.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp_ioctl.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp_pci.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp_target.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/ispmbox.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/ispreg.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/ispvar.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ispfw/ispfw.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/kbd/atkbdc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/kbd/kbd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/lge/if_lge.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/lnc/if_lnc.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/lnc/if_lncvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/md/md.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/acphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/amphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/brgphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/dcphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/exphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/lxtphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/mii.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/mii_physubr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/miivar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/mlphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/nsgphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/nsphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/pnaphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/pnphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/qsphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/rlphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/tdkphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/tlphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/ukphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/xmphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mlx/mlx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mly/mly_tables.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ncv/ncr53c500.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ncv/ncr53c500_pccard.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ncv/ncr53c500var.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/nge/if_nge.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/nmdm/nmdm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/nsp/nsp.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/nsp/nsp_pccard.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/nsp/nspvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccard/pccard.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccard/pccard_cis.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccard/pccarddevs#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccard/pccarddevs.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccard/pccardvar.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccbb/pccbb.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccbb/pccbbreg.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccbb/pccbbvar.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pci/pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pci/pci_pci.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pci/pci_private.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/pci/pci_user.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pci/pcivar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pdq/if_fea.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pdq/pdq_ifsubr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ppbus/ppb_msq.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/puc/puc.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/puc/pucdata.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/puc/pucvar.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/random/harvest.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/random/hash.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/random/hash.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/random/randomdev.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/random/randomdev.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/random/yarrow.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/rp/rp.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sio/sio.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sio/sio_isa.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sio/sio_pccard.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sio/sio_pci.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sio/sio_puc.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/sio/siovar.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/snc/dp83932.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/snc/dp83932subr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/snc/dp83932subr.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/snc/dp83932var.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/snc/if_snc_cbus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/snc/if_sncvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/snp/snp.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/midi/midibuf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/midi/sequencer.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/ich.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/neomagic.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/via82c686.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/via82c686.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/channel.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/stg/tmc18c30.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/stg/tmc18c30_isa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/stg/tmc18c30_pccard.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/stg/tmc18c30var.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/streams/streams.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sym/sym_hipd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/syscons/apm/apm_saver.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/syscons/scgfbrndr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/syscons/scvgarndr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/syscons/scvidctl.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/syscons/syscons.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/twe/twe.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/twe/twe_freebsd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/twe/twe_tables.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/twe/twereg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/twe/twevar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/txp/if_txp.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/FILES#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/dsbr100io.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/usb/if_aue.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/if_cue.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/if_kue.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ohci.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ohcivar.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ucom.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/usb/ucomvar.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/usb/ufm.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/usb/ugen.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uhci.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uhcivar.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uhid.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uhub.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ulpt.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/umass.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/umodem.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ums.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uplcom.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/usb/urio.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usb.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usb.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usb_ethersubr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usb_ethersubr.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usb_port.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usb_subr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdevs#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdevs.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdevs_data.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdi.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdi.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdivar.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uscanner.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uvscom.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinumdaemon.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinuminterrupt.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinumio.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinumrequest.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinumrevive.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vx/if_vx.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vx/if_vx_eisa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vx/if_vxreg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wavelan_ieee.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wi.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wireg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wl/if_wl.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/xe/if_xe.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/xe/if_xe_pccard.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/xe/if_xevar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/deadfs/dead_vnops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/devfs/devfs_vfsops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/devfs/devfs_vnops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/fdescfs/fdesc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/fdescfs/fdesc_vnops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/fifofs/fifo.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/fifofs/fifo_vnops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/hpfs/hpfs.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/hpfs/hpfs_hash.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/hpfs/hpfs_subr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/hpfs/hpfs_vfsops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/hpfs/hpfs_vnops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/msdosfs/denode.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/msdosfs/direntry.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/msdosfs/fat.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/msdosfs/msdosfs_conv.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/msdosfs/msdosfs_denode.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/msdosfs/msdosfs_fat.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/msdosfs/msdosfsmount.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/ntfs/ntfs_ihash.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/ntfs/ntfs_subr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/ntfs/ntfs_subr.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/ntfs/ntfs_vfsops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/ntfs/ntfs_vnops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/nullfs/null_vfsops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/nullfs/null_vnops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/nwfs/nwfs_io.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/nwfs/nwfs_node.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/nwfs/nwfs_vfsops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/portalfs/portal_vfsops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/portalfs/portal_vnops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_ctl.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_dbregs.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_fpregs.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_regs.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_status.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/smbfs/smbfs_io.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/smbfs/smbfs_node.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/smbfs/smbfs_vfsops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/smbfs/smbfs_vnops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/specfs/spec_vnops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/umapfs/umap.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/umapfs/umap_subr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/umapfs/umap_vfsops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/umapfs/umap_vnops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/unionfs/union.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/unionfs/union_subr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/unionfs/union_vfsops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/unionfs/union_vnops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom.h#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_bsd.c#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_dev.c#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_disk.c#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_dump.c#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_event.c#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_io.c#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_kern.c#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_mbr.c#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_mbrext.c#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_slice.c#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_slice.h#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_subr.c#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_sunlabel.c#1 branch ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_alloc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_extern.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_inode.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_lookup.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_subr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_vfsops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_vnops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/i386/fpemul/fpu_aux.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/apm/apm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/conf/GENERIC#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/conf/NEWCARD#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/conf/NOTES#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/autoconf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/bios.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/db_disasm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/db_interface.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/db_trace.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/exception.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/genassym.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/identcpu.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/initcpu.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/locore.s#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/machdep.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/mem.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/mp_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/mpapic.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/nexus.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/perfmon.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/pmap.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/support.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/swtch.s#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/sys_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/trap.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/vm_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_fcntl.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_ioctl.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_other.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_proto.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_signal.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_signal.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_socksys.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_stat.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_util.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_util.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/imgact_coff.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/ansi.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/apm_bios.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/atomic.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/bus.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/bus_at386.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/bus_pc98.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/clock.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/cpu.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/cpufunc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/dvcfg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/endian.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/frame.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/i4b_cause.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/i4b_debug.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/i4b_ioctl.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/i4b_isppp.h#2 delete ... //depot/projects/trustedbsd/audit/sys/i386/include/i4b_rbch_ioctl.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/i4b_tel_ioctl.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/i4b_trace.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/in_cksum.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/md_var.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/mutex.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/npx.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/pcb.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/pcb_ext.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/perfmon.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/physio_proc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/pmap.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/proc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/profile.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/ptrace.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/reg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/segments.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/sigframe.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/signal.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/smp.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/smptests.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/sysarch.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/types.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/vm86.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/apic_vector.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/asc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/bs/bs.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/bs/bsfunc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/bs/bsfunc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/bs/bshw.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/bs/bshw.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/bs/bshw_dma.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/bs/bshw_pdma.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/bs/bsif.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/bs/bsif.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/bs/bsvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/ccbque.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/clock.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/ctx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/cy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/elink.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/icu.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/icu_vector.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/if_cx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/if_le.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/if_rdp.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/intr_machdep.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/intr_machdep.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/isa.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/isa_dma.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/isa_dma.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/mse.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/npx.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/pcaudio.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/pcvt/pcvt_ext.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/pcvt/pcvt_out.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/pcvt/pcvt_sup.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/rc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/spigot.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/spkr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/linux/imgact_linux.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/linux/linux_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/linux/linux_proto.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/linux/linux_syscall.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/linux/linux_sysent.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/linux/linux_sysvec.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/pci/pci_cfgreg.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/svr4/svr4_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/svr4/svr4_machdep.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/capi/capi_l4if.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/capi/iavc/iavc_isa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/capi/iavc/iavc_lli.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/capi/iavc/iavc_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/driver/i4b_bsdi_ibc.c#2 delete ... //depot/projects/trustedbsd/audit/sys/i4b/driver/i4b_ctl.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/driver/i4b_ing.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/driver/i4b_ipr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/driver/i4b_isppp.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/driver/i4b_ispppsubr.c#2 delete ... //depot/projects/trustedbsd/audit/sys/i4b/driver/i4b_rbch.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/driver/i4b_tel.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/driver/i4b_trace.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/include/i4b_global.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/include/i4b_isdnq931.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/include/i4b_l1l2.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/include/i4b_l2l3.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/include/i4b_l3l4.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/include/i4b_mbuf.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer1/isic/i4b_bchan.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer1/isic/i4b_ctx_s0P.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer1/isic/i4b_hscx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer2/i4b_iframe.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer2/i4b_l2.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer2/i4b_l2.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer2/i4b_l2fsm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer2/i4b_l2fsm.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer2/i4b_l2timer.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer2/i4b_lme.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer2/i4b_mbuf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer2/i4b_sframe.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer2/i4b_tei.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer2/i4b_uframe.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer2/i4b_util.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer3/i4b_l3fsm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer3/i4b_l3fsm.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer3/i4b_l3timer.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer3/i4b_l4if.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer3/i4b_q931.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer3/i4b_q932fac.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer3/i4b_q932fac.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer4/i4b_l4.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer4/i4b_l4timer.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/acpica/madt.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/conf/GENERIC#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/conf/SKI#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/autoconf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/clock.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/db_disasm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/db_interface.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/db_trace.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/exception.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/genassym.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/ia64-gdbstub.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/interrupt.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/machdep.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/mem.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/mp_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/nexus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/pal_stub.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/pmap.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/sal.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/sapic.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/ssc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/swtch.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/trap.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/unwind.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/vm_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/ansi.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/bus.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/clock.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/cpu.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/cpufunc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/db_machdep.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/endian.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/ia64_cpu.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/md_var.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/pcb.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/pmap.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/profile.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/ptrace.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/reg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/sapicvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/vmparam.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/isa/isa_dma.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/isa/fd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/isa/isa_common.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/isa/isavar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/isa/psm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/isofs/cd9660/cd9660_lookup.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/isofs/cd9660/cd9660_node.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/isofs/cd9660/cd9660_node.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/isofs/cd9660/cd9660_rrip.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/isofs/cd9660/cd9660_vfsops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/isofs/cd9660/cd9660_vnops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/isofs/cd9660/iso.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/isofs/cd9660/iso_rrip.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/Make.tags.inc#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/genassym.sh#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/imgact_aout.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/imgact_elf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/imgact_gzip.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/inflate.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/init_main.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/init_sysent.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_acct.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_acl.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_clock.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_condvar.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_conf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_descrip.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_event.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_exec.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_exit.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_fork.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_intr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_jail.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_ktr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_ktrace.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 17: 0:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F0E637B416; Mon, 8 Apr 2002 16:59:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3D2B237B400 for ; Mon, 8 Apr 2002 16:59:43 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g38NxhZ06335 for perforce@freebsd.org; Mon, 8 Apr 2002 16:59:43 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 8 Apr 2002 16:59:43 -0700 (PDT) Message-Id: <200204082359.g38NxhZ06335@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9407 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9407 Change 9407 by jake@jake_sparc64 on 2002/04/08 16:59:33 Revert unneeded change from kld testing. Affected files ... ... //depot/projects/sparc64/sys/kern/link_elf.c#11 edit Differences ... ==== //depot/projects/sparc64/sys/kern/link_elf.c#11 (text+ko) ==== @@ -615,8 +615,6 @@ * We rely on there being exactly two load segments, text and data, * in that order. */ - segs[0] = 0; - segs[1] = 0; phdr = (Elf_Phdr *) (firstpage + hdr->e_phoff); phlimit = phdr + hdr->e_phnum; nsegs = 0; @@ -663,10 +661,7 @@ */ base_offset = trunc_page(segs[0]->p_offset); base_vaddr = trunc_page(segs[0]->p_vaddr); - if (segs[1] != NULL) - base_vlimit = round_page(segs[1]->p_vaddr + segs[1]->p_memsz); - else - base_vlimit = round_page(segs[0]->p_vaddr + segs[0]->p_memsz); + base_vlimit = round_page(segs[1]->p_vaddr + segs[1]->p_memsz); mapsize = base_vlimit - base_vaddr; lf = linker_make_file(filename, &link_elf_class); @@ -707,10 +702,7 @@ * Read the text and data sections and zero the bss. */ for (i = 0; i < 2; i++) { - caddr_t segbase; - if (segs[i] == NULL) - continue; - segbase = mapbase + segs[i]->p_vaddr - base_vaddr; + caddr_t segbase = mapbase + segs[i]->p_vaddr - base_vaddr; error = vn_rdwr(UIO_READ, nd.ni_vp, segbase, segs[i]->p_filesz, segs[i]->p_offset, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, &resid, td); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 17: 2:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73A7F37B416; Mon, 8 Apr 2002 17:02:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4FEE137B41A for ; Mon, 8 Apr 2002 17:02:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3902lo08749 for perforce@freebsd.org; Mon, 8 Apr 2002 17:02:47 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 8 Apr 2002 17:02:47 -0700 (PDT) Message-Id: <200204090002.g3902lo08749@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9408 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9408 Change 9408 by jake@jake_sparc64 on 2002/04/08 17:02:32 Reduce diffs. Affected files ... ... //depot/projects/sparc64/gnu/lib/Makefile#6 edit ... //depot/projects/sparc64/sys/boot/sparc64/boot1/_start.S#3 edit Differences ... ==== //depot/projects/sparc64/gnu/lib/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/Makefile,v 1.33 2002/01/07 19:27:50 jhb Exp $ +# $FreeBSD: src/gnu/lib/Makefile,v 1.34 2002/04/08 20:36:39 obrien Exp $ SUBDIR= libdialog libregex libreadline ==== //depot/projects/sparc64/sys/boot/sparc64/boot1/_start.S#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD$ */ +/* $FreeBSD: src/sys/boot/sparc64/boot1/_start.S,v 1.1 2002/03/28 02:41:52 obrien Exp $ */ .text .globl _start To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 17: 5: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEF8037B405; Mon, 8 Apr 2002 17:04:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 315B637B404 for ; Mon, 8 Apr 2002 17:04:50 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3904os10370 for perforce@freebsd.org; Mon, 8 Apr 2002 17:04:50 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 8 Apr 2002 17:04:50 -0700 (PDT) Message-Id: <200204090004.g3904os10370@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 9409 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9409 Change 9409 by arr@arr_shibby on 2002/04/08 17:04:44 - Remove sysctl tunable (this is unrealistic). - Add SYSINIT for audit_init() routine to be called at startup. For the moment we are using the same subsystem startup value as the TrustedBSD MAC code. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#15 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#15 (text+ko) ==== @@ -47,7 +47,6 @@ #include -int sysctl_handle_enable(SYSCTL_HANDLER_ARGS); void audit_write_thread(void *); static __inline audit_record_t *audit_record_alloc(vm_zone_t, u_long *); static __inline void audit_record_free(audit_record_t *, vm_zone_t, u_long *); @@ -137,14 +136,13 @@ return; bzero(ai, sizeof(*ai)); - mtx_init(&ai->ai_mtx, "audit info lock", MTX_DEF); + mtx_init(&ai->ai_mtx, "audit info lock", 0, MTX_DEF); vp = audit_write_init(audit_file, td, &cred); if (vp == NULL) panic("Unable to init audit system.\n"); - zone = zinit("AUDIT", sizeof(audit_record_t), - pool_size, 0, 4); + zone = zinit("AUDIT", sizeof(audit_record_t), pool_size, 0, 4); if (zone == NULL) panic("audit_init: unable to init audit record zone"); @@ -163,10 +161,8 @@ err = kthread_create(&audit_write_thread, ai, NULL, RFNOWAIT, "TrustedBSD audit write thread"); } +SYSINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_init, NULL); -/* - * Executed when the audit system is turned off. - */ void audit_shutdown(int what, void *arg, struct thread *td) { @@ -201,54 +197,6 @@ wakeup((caddr_t)&record_queue); } -int -sysctl_handle_enable(SYSCTL_HANDLER_ARGS) -{ - int err = 0; - unsigned int state; - audit_record_t *ar; - struct aud_sysctl_enable *ev = NULL; - struct proc *p = req->td->td_proc; - - err = SYSCTL_OUT(req, arg1, sizeof(unsigned int)); - if (err || !req->newptr) - goto enqueue; - - if (securelevel > 0) { - return(EPERM); - } - - state = audit_system_state; - err = SYSCTL_IN(req, arg1, sizeof(unsigned int)); - if (err || (audit_system_state == state)) - return(0); - - /* - * Init ainfo. - */ - if (state < audit_system_state) { - audit_init(0, &ainfo, req->td); - goto enqueue; - } else { - audit_shutdown(0, &ainfo, req->td); - return(0); - } -enqueue: - /* XXX arr: crashes on mtx_lock of ai_mtx. - ar = audit_record_init(AUD_SYSCTL_ENABLE, sizeof(*ev), &ainfo); - PROC_LOCK(p); - ar->ar_subj.as_pid = p->p_pid; - ar->ar_subj.as_euid = p->p_ucred->cr_uid; - ar->ar_subj.as_uid = p->p_ucred->cr_ruid; - ar->ar_subj.as_gid = p->p_ucred->cr_rgid; - PROC_UNLOCK(p); - ev = &ar->ar_evinfo.sysctlenable; - ev->as_val = audit_system_state; - audit_record_enqueue(ar); - */ - return(0); -} - struct vnode * audit_write_init(const char *path, struct thread *td, struct ucred **cred) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 17: 7:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF33537B400; Mon, 8 Apr 2002 17:07:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 487A337B405 for ; Mon, 8 Apr 2002 17:07:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3907sS16961 for perforce@freebsd.org; Mon, 8 Apr 2002 17:07:54 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 8 Apr 2002 17:07:54 -0700 (PDT) Message-Id: <200204090007.g3907sS16961@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9410 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9410 Change 9410 by jake@jake_sparc64 on 2002/04/08 17:07:48 Don't need a clock_if.m hot spare. Affected files ... ... //depot/projects/sparc64/sys/conf/files#50 edit Differences ... ==== //depot/projects/sparc64/sys/conf/files#50 (text+ko) ==== @@ -786,7 +786,6 @@ isofs/cd9660/cd9660_util.c optional cd9660 isofs/cd9660/cd9660_vfsops.c optional cd9660 isofs/cd9660/cd9660_vnops.c optional cd9660 -kern/clock_if.m optional genclock kern/imgact_elf.c standard kern/imgact_shell.c standard kern/inflate.c optional gzip To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 17:15:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC11D37B429; Mon, 8 Apr 2002 17:15:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AC90D37B404 for ; Mon, 8 Apr 2002 17:15:03 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g390F3Y18432 for perforce@freebsd.org; Mon, 8 Apr 2002 17:15:03 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 8 Apr 2002 17:15:03 -0700 (PDT) Message-Id: <200204090015.g390F3Y18432@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 9412 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9412 Change 9412 by arr@arr_shibby on 2002/04/08 17:14:35 - Finish XXX note about re-includes. - Add ai_lname element to audit_info. Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#11 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#11 (text+ko) ==== @@ -29,7 +29,7 @@ #ifndef _SYS_AUDIT_H_ #define _SYS_AUDIT_H_ -/* XXX */ +/* XXX arr: this is all very bad. */ #include #include #include @@ -69,6 +69,7 @@ struct vnode *ai_vp; audit_id_t ai_id; u_long ai_leased; + char *ai_lname; }; #define AINFO_LOCK(a) mtx_lock(&(a)->ai_mtx) @@ -239,6 +240,7 @@ void audit_init(int, void *, struct thread *); void audit_shutdown(int, void *, struct thread *); + struct vnode *audit_write_init(const char *, struct thread *, struct ucred **); void audit_write_shutdown(struct vnode *, struct thread *, struct ucred *); int audit_record_write(audit_record_t *, struct audit_info *, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 17:21:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38AEB37B417; Mon, 8 Apr 2002 17:21:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 780B437B405 for ; Mon, 8 Apr 2002 17:21:11 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g390LBI19321 for perforce@freebsd.org; Mon, 8 Apr 2002 17:21:11 -0700 (PDT) (envelope-from amigus@tislabs.com) Date: Mon, 8 Apr 2002 17:21:11 -0700 (PDT) Message-Id: <200204090021.g390LBI19321@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@tislabs.com using -f From: Adam Migus Subject: PERFORCE change 9413 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9413 Change 9413 by amigus@amigus_ganyopa on 2002/04/08 17:20:55 Oops. Forgot to test and properly handle when user declares an interface name with strlen() > IFNAMSIZ. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#27 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#27 (text+ko) ==== @@ -465,20 +465,22 @@ else len = strlen(p0); - if (len > IFNAMSIZ) { + if (len <= IFNAMSIZ) { + strncpy(tifr_name, p0, len); + if (!strncmp(tifr_name, ifr_name, len) && + len == strlen(ifr_name)) { + trusted_interface = 1; + break; + } + } else if (len == 0) { + break; + } else { if (p1) *p1 = '\0'; - printf("%s: name exceeds maximum length\n", p0); + printf("%s: interface name exceeds IFNAMSIZ (%d)\n", + p0, IFNAMSIZ); if (p1) *p1 = ','; - } else if (len == 0) - break; - - strncpy(tifr_name, p0, len); - if (!strncmp(tifr_name, ifr_name, len) && - len == strlen(ifr_name)) { - trusted_interface = 1; - break; } if (p1 == NULL) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 17:22:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E78937B41D; Mon, 8 Apr 2002 17:22:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2BDF937B41A for ; Mon, 8 Apr 2002 17:22:13 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g390MCM19438 for perforce@freebsd.org; Mon, 8 Apr 2002 17:22:12 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 8 Apr 2002 17:22:12 -0700 (PDT) Message-Id: <200204090022.g390MCM19438@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 9414 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9414 Change 9414 by arr@arr_shibby on 2002/04/08 17:22:12 - Add SYSUNINIT; this will be a basis for shutdown log writing. - Static-ize some variables. - Make use of ai_lname. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#16 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#16 (text+ko) ==== @@ -52,13 +52,12 @@ static __inline void audit_record_free(audit_record_t *, vm_zone_t, u_long *); static __inline audit_id_t audit_record_generate_id(audit_id_t *); -struct audit_info ainfo; -const char *audit_file = "/var/log/audit"; /* XXX */ -struct audit_record_list record_queue; -struct mtx record_queue_mtx; -int audit_shutdown_flag = 0; -size_t audit_system_state = 0; -size_t pool_size = 32; +static struct audit_info ainfo; +static struct audit_record_list record_queue; +static struct mtx record_queue_mtx; + +static int audit_shutdown_flag = 0; +static size_t pool_size = 32; SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, audit, CTLFLAG_RW, 0, ""); @@ -124,21 +123,24 @@ * Executed when the audit system is turned on. */ void -audit_init(int what, void *arg, struct thread *td) +audit_init(void) { - struct audit_info *ai = arg; + struct audit_info *ai; struct ucred *cred; struct vnode *vp; vm_zone_t zone; + char *sptr; int err = 0; - if (audit_system_state != 0) - return; + ai = &ainfo; bzero(ai, sizeof(*ai)); mtx_init(&ai->ai_mtx, "audit info lock", 0, MTX_DEF); - vp = audit_write_init(audit_file, td, &cred); + sptr = malloc(strlen(AUDLOG), M_TEMP, M_WAITOK|M_ZERO); + strcpy(sptr, AUDLOG); + + vp = audit_write_init(sptr, td, &cred); if (vp == NULL) panic("Unable to init audit system.\n"); @@ -150,6 +152,7 @@ ai->ai_cred = cred; ai->ai_vp = vp; ai->ai_zone = zone; + ai->ai_lname = sptr; AINFO_UNLOCK(ai); mtx_init(&record_queue_mtx, "audit record queue lock", MTX_DEF); @@ -170,22 +173,23 @@ struct ucred *cred; struct vnode *vp; vm_zone_t zone = NULL; + char *ptr; - if (!audit_system_state) - return; - audit_shutdown_flag = 1; AINFO_LOCK(ai); cred = ai->ai_cred; vp = ai->ai_vp; zone = ai->ai_zone; + ptr = ai->ai_lname; AINFO_UNLOCK(ai); mtx_destroy(&ai->ai_mtx); bzero(ai, sizeof(*ai)); + free(ptr, M_TEMP); audit_write_shutdown(vp, td, cred); zdestroy(zone); } +SYSUNINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_shutdown, NULL); static void audit_record_enqueue(audit_record_t *ar) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 17:25:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A20F137B41C; Mon, 8 Apr 2002 17:24:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1CF8337B42F for ; Mon, 8 Apr 2002 17:24:17 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g390OF719864 for perforce@freebsd.org; Mon, 8 Apr 2002 17:24:15 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 8 Apr 2002 17:24:15 -0700 (PDT) Message-Id: <200204090024.g390OF719864@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 9415 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9415 Change 9415 by arr@arr_shibby on 2002/04/08 17:23:33 - Add #define AUDLOG value (part of a temp. hack) Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#17 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#17 (text+ko) ==== @@ -47,6 +47,8 @@ #include +#define AUDLOG "/var/log/audit" + void audit_write_thread(void *); static __inline audit_record_t *audit_record_alloc(vm_zone_t, u_long *); static __inline void audit_record_free(audit_record_t *, vm_zone_t, u_long *); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 20:38:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A21A37B405; Mon, 8 Apr 2002 20:38:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4CFD937B41D for ; Mon, 8 Apr 2002 20:38:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g393cMY62307 for perforce@freebsd.org; Mon, 8 Apr 2002 20:38:22 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 8 Apr 2002 20:38:22 -0700 (PDT) Message-Id: <200204090338.g393cMY62307@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 9425 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9425 Change 9425 by arr@arr_shibby on 2002/04/08 20:37:55 - When I zfree an audit record, it would really help for me to decrement the leased value, rather than increment it. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#18 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#18 (text+ko) ==== @@ -80,7 +80,7 @@ audit_record_free(audit_record_t *ar, vm_zone_t aizone, u_long *lease) { - *(u_long *)lease++; + *(u_long *)lease--; zfree(aizone, ar); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 8 21:21:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52E1E37B416; Mon, 8 Apr 2002 21:21:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 271C337B417 for ; Mon, 8 Apr 2002 21:21:14 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g394LED72201 for perforce@freebsd.org; Mon, 8 Apr 2002 21:21:14 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 8 Apr 2002 21:21:14 -0700 (PDT) Message-Id: <200204090421.g394LED72201@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 9426 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9426 Change 9426 by arr@arr_shibby on 2002/04/08 21:21:08 - Some style cleanup. - Better the usage of the record queue mutex. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#19 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#19 (text+ko) ==== @@ -63,8 +63,6 @@ SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, audit, CTLFLAG_RW, 0, ""); -SYSCTL_OID(_security_audit, OID_AUTO, enabled, CTLFLAG_RW|CTLTYPE_UINT, - &audit_system_state, 0, sysctl_handle_enable, "IU", ""); static __inline audit_record_t * @@ -100,15 +98,16 @@ { audit_record_t *rec; audit_header_t *h; + vm_zone_t z; audit_id_t *id; u_long *lease; - vm_zone_t z; AINFO_LOCK(ai); lease = &ai->ai_leased; z = ai->ai_zone; id = &ai->ai_id; AINFO_UNLOCK(ai); + rec = audit_record_alloc(z, lease); bzero(rec, sizeof(*rec)); h = &rec->ar_hdr; @@ -117,7 +116,7 @@ h->ah_len = AUDIT_RECORD_SZ + evsz; h->ah_type = type; nanotime(&h->ah_evtime); - return(rec); + return (rec); } @@ -127,9 +126,9 @@ void audit_init(void) { + struct vnode *vp; struct audit_info *ai; struct ucred *cred; - struct vnode *vp; vm_zone_t zone; char *sptr; int err = 0; @@ -142,7 +141,8 @@ sptr = malloc(strlen(AUDLOG), M_TEMP, M_WAITOK|M_ZERO); strcpy(sptr, AUDLOG); - vp = audit_write_init(sptr, td, &cred); + /* XXX curthread */ + vp = audit_write_init(sptr, curthread, &cred); if (vp == NULL) panic("Unable to init audit system.\n"); @@ -171,9 +171,9 @@ void audit_shutdown(int what, void *arg, struct thread *td) { + struct vnode *vp; struct audit_info *ai = arg; struct ucred *cred; - struct vnode *vp; vm_zone_t zone = NULL; char *ptr; @@ -216,29 +216,22 @@ NDINIT(&ni, LOOKUP, NOFOLLOW, UIO_SYSSPACE, path, td); err = namei(&ni); if (err != 0) - return(NULL); + return (NULL); err = vn_open(&ni, &flag, S_IRUSR | S_IWUSR); if (err != 0) - return(NULL); + return (NULL); NDFREE(&ni, NDF_ONLY_PNBUF); vp = ni.ni_vp; VOP_UNLOCK(vp, 0, td); - return(vp); + return (vp); } void audit_write_shutdown(struct vnode *vp, struct thread *td, struct ucred *cred) { - struct proc *p = td->td_proc; - - /* - * XXX arr: Essentially this is a temporary function - * that here for debugging purposes. - */ vn_close(vp, 0, cred, td); crfree(cred); - return; } int @@ -267,10 +260,10 @@ lf.l_type = F_WRLCK; err = VOP_ADVLOCK(vp, (caddr_t)td->td_proc, F_SETLK, &lf, F_FLOCK); if (err != 0) - return(err); + return (err); err = vn_start_write(vp, &mp, V_NOWAIT); - if (err != 0) { + if (err != 0) /* * If we can't write to the audit file from kernel * land, then something is wrong. In the future, @@ -278,8 +271,6 @@ * but for now, we panic. */ panic("unable to write to audit log."); - - } vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); @@ -293,7 +284,7 @@ td->td_proc->p_ucred); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); - return(ar->ar_hdr.ah_len); + return (ar->ar_hdr.ah_len); } void @@ -304,25 +295,24 @@ u_long *lease; vm_zone_t z; - mtx_lock(&record_queue_mtx); for (;;) { ar = NULL; + mtx_lock(&record_queue_mtx); TAILQ_REMOVE(&record_queue, ar, ar_next); + mtx_unlock(&record_queue_mtx); if (ar) { - (void)audit_record_write(ar, NULL, NULL); /* XXX */ + /* XXX */ + (void)audit_record_write(ar, NULL, NULL); AINFO_LOCK(ai); z = ai->ai_zone; lease = &ai->ai_leased; AINFO_UNLOCK(ai); audit_record_free(ar, z, lease); } else if (ar == NULL && audit_shutdown_flag) { - mtx_unlock(&record_queue_mtx); mtx_destroy(&record_queue_mtx); kthread_exit(0); } if (audit_shutdown_flag) continue; - msleep(&record_queue, &record_queue_mtx, PPAUSE, - "Record queue", 0); } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 10:53:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB90B37B41F; Tue, 9 Apr 2002 10:53:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C8D5037B41D for ; Tue, 9 Apr 2002 10:53:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g39HrcE38215 for perforce@freebsd.org; Tue, 9 Apr 2002 10:53:38 -0700 (PDT) (envelope-from tmm@freebsd.org) Date: Tue, 9 Apr 2002 10:53:38 -0700 (PDT) Message-Id: <200204091753.g39HrcE38215@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 9451 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9451 Change 9451 by tmm@tmm_sparc64 on 2002/04/09 10:52:50 Fix cluster read/write by adding the required offsets after calling vmiomapbuf(), and add a KASSERT() to the latter to catch such errors easily in the future. While being there, add two trunc_page()s to the vm_mdpg_*() functions; they are not necessary atm, but remove a pitfall. Head ending in a singularity to: tmm Affected files ... ... //depot/projects/sparc64/sys/kern/vfs_bio.c#22 edit ... //depot/projects/sparc64/sys/kern/vfs_cluster.c#10 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#48 edit Differences ... ==== //depot/projects/sparc64/sys/kern/vfs_bio.c#22 (text+ko) ==== @@ -3436,7 +3436,12 @@ vm_offset_t kva; int color; - kva = trunc_page((vm_offset_t)bp->b_data); + kva = (vm_offset_t)bp->b_data; + /* + * This indicates that the caller was not converted properly, and has + * added required offsets to b_data. + */ + KASSERT((kva & PAGE_MASK) == 0, ("vmiomapbuf: page offset present!")); color = vm_mdpg_pref_vcol(obj, offs, m, count); if (color != -1) { kva = vm_roundcolor2(kva, (vm_offset_t)color << PAGE_SHIFT, ==== //depot/projects/sparc64/sys/kern/vfs_cluster.c#10 (text+ko) ==== @@ -336,6 +336,7 @@ { struct buf *bp, *tbp; vm_object_t obj; + vm_offset_t boffs; daddr_t bn; int i, inc, j; @@ -378,8 +379,7 @@ * address may not be either. Inherit the b_data offset * from the original buffer. */ - bp->b_data = (char *)((vm_offset_t)bp->b_data | - ((vm_offset_t)tbp->b_data & PAGE_MASK)); + boffs = (vm_offset_t)tbp->b_data & PAGE_MASK; bp->b_flags = B_ASYNC | B_CLUSTER | B_VMIO; bp->b_iocmd = BIO_READ; bp->b_iodone = cluster_callback; @@ -532,6 +532,7 @@ VOP_GETVOBJECT(vp, &obj); vmiomapbuf(bp, obj, bp->b_offset, bp->b_pages, bp->b_npages, BIO_READ); + bp->b_data = (char *)((vm_offset_t)bp->b_data | boffs); return (bp); } @@ -787,6 +788,7 @@ int len; { struct buf *bp, *tbp; + vm_offset_t boffs; int i, j, s; int totalwritten = 0; int dbsize = btodb(size); @@ -856,8 +858,7 @@ * address may not be either. Inherit the b_data offset * from the original buffer. */ - bp->b_data = (char *)((vm_offset_t)bp->b_data | - ((vm_offset_t)tbp->b_data & PAGE_MASK)); + boffs = (vm_offset_t)tbp->b_data & PAGE_MASK; bp->b_flags |= B_CLUSTER | (tbp->b_flags & (B_VMIO | B_NEEDCOMMIT | B_NOWDRAIN)); bp->b_iodone = cluster_callback; @@ -982,6 +983,7 @@ finishcluster: vmiomapbuf(bp, vp->v_object, bp->b_offset, bp->b_pages, bp->b_npages, bp->b_iocmd); + bp->b_data = (char *)((vm_offset_t)bp->b_data | boffs); if (bp->b_bufsize > bp->b_kvasize) panic( "cluster_wbuild: b_bufsize(%ld) > b_kvasize(%d)\n", ==== //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#48 (text+ko) ==== @@ -484,6 +484,7 @@ int i; VMMD_STATS_INC(nstart_io); + kva = trunc_page(kva); switch (ioflag) { case VM_MDPG_WRITE: for (i = 0; i < count; i++) { @@ -535,6 +536,7 @@ int i; VMMD_STATS_INC(ndone_io); + kva = trunc_page(kva); switch (ioflag) { case VM_MDPG_WRITE: color = 0; /* silence warning. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 12:21:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70BC537B41A; Tue, 9 Apr 2002 12:21:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8121737B41B for ; Tue, 9 Apr 2002 12:21:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g39JL9R62159 for perforce@freebsd.org; Tue, 9 Apr 2002 12:21:09 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Tue, 9 Apr 2002 12:21:09 -0700 (PDT) Message-Id: <200204091921.g39JL9R62159@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 9457 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9457 Change 9457 by arr@arr_shibby on 2002/04/09 12:20:46 - Use curthread instead of a passed in thread pointer in some places. - Remember crfree() our saved cred. - Rearrange a check of the shutdown flag, so we can better handle a bad situation -- this needs to possibly lock the flag on write Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#20 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#20 (text+ko) ==== @@ -87,9 +87,6 @@ audit_record_generate_id(audit_id_t *id) { - /* - * XXX - */ return(*++id); } @@ -128,7 +125,6 @@ { struct vnode *vp; struct audit_info *ai; - struct ucred *cred; vm_zone_t zone; char *sptr; int err = 0; @@ -141,8 +137,7 @@ sptr = malloc(strlen(AUDLOG), M_TEMP, M_WAITOK|M_ZERO); strcpy(sptr, AUDLOG); - /* XXX curthread */ - vp = audit_write_init(sptr, curthread, &cred); + vp = audit_write_init(sptr, curthread, curthread->td_ucred); if (vp == NULL) panic("Unable to init audit system.\n"); @@ -151,7 +146,7 @@ panic("audit_init: unable to init audit record zone"); AINFO_LOCK(ai); - ai->ai_cred = cred; + ai->ai_cred = curthread->td_ucred; ai->ai_vp = vp; ai->ai_zone = zone; ai->ai_lname = sptr; @@ -169,15 +164,17 @@ SYSINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_init, NULL); void -audit_shutdown(int what, void *arg, struct thread *td) +audit_shutdown(void) { struct vnode *vp; - struct audit_info *ai = arg; + struct audit_info *ai; struct ucred *cred; vm_zone_t zone = NULL; char *ptr; audit_shutdown_flag = 1; + ai = &ainfo; + AINFO_LOCK(ai); cred = ai->ai_cred; vp = ai->ai_vp; @@ -185,10 +182,10 @@ ptr = ai->ai_lname; AINFO_UNLOCK(ai); mtx_destroy(&ai->ai_mtx); + free(ptr, M_TEMP); bzero(ai, sizeof(*ai)); - - free(ptr, M_TEMP); - audit_write_shutdown(vp, td, cred); + audit_write_shutdown(vp, curthread, cred); /* curthread ok? */ + crfree(cred); zdestroy(zone); } SYSUNINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_shutdown, NULL); @@ -300,19 +297,20 @@ mtx_lock(&record_queue_mtx); TAILQ_REMOVE(&record_queue, ar, ar_next); mtx_unlock(&record_queue_mtx); + + /* XXX Check flag here and hope it doesnt change. */ + if (audit_shutdown_flag) { + mtx_destroy(&record_queue_mtx); + kthread_exit(0); + } + if (ar) { - /* XXX */ (void)audit_record_write(ar, NULL, NULL); AINFO_LOCK(ai); z = ai->ai_zone; lease = &ai->ai_leased; AINFO_UNLOCK(ai); audit_record_free(ar, z, lease); - } else if (ar == NULL && audit_shutdown_flag) { - mtx_destroy(&record_queue_mtx); - kthread_exit(0); } - if (audit_shutdown_flag) - continue; } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 12:26:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F27537B404; Tue, 9 Apr 2002 12:26:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by hub.freebsd.org (Postfix) with ESMTP id 10ACD37B417 for ; Tue, 9 Apr 2002 12:26:05 -0700 (PDT) Received: (qmail 32043 invoked from network); 9 Apr 2002 19:26:03 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 9 Apr 2002 19:26:03 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g39JQqv49806; Tue, 9 Apr 2002 15:26:52 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200204091921.g39JL9R62159@freefall.freebsd.org> Date: Tue, 09 Apr 2002 15:25:55 -0400 (EDT) From: John Baldwin To: "Andrew R. Reiter" Subject: RE: PERFORCE change 9457 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 09-Apr-2002 Andrew R. Reiter wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9457 > > Change 9457 by arr@arr_shibby on 2002/04/09 12:20:46 > > - Use curthread instead of a passed in thread pointer in > some places. > - Remember crfree() our saved cred. You don't do a crhold on it though, which you probably should. > - Rearrange a check of the shutdown flag, so we can better > handle a bad situation -- this needs to possibly lock > the flag on write > > Affected files ... > > ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#20 edit > > Differences ... > > ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#20 (text+ko) > ==== > > @@ -87,9 +87,6 @@ > audit_record_generate_id(audit_id_t *id) > { > > - /* > - * XXX > - */ > return(*++id); > } > > @@ -128,7 +125,6 @@ > { > struct vnode *vp; > struct audit_info *ai; > - struct ucred *cred; > vm_zone_t zone; > char *sptr; > int err = 0; > @@ -141,8 +137,7 @@ > sptr = malloc(strlen(AUDLOG), M_TEMP, M_WAITOK|M_ZERO); > strcpy(sptr, AUDLOG); > > - /* XXX curthread */ > - vp = audit_write_init(sptr, curthread, &cred); > + vp = audit_write_init(sptr, curthread, curthread->td_ucred); > if (vp == NULL) > panic("Unable to init audit system.\n"); > > @@ -151,7 +146,7 @@ > panic("audit_init: unable to init audit record zone"); > > AINFO_LOCK(ai); > - ai->ai_cred = cred; > + ai->ai_cred = curthread->td_ucred; Here, do a crhold() so you preserve your own reference in case this audit info lives longer than the syscall. > ai->ai_vp = vp; > ai->ai_zone = zone; > ai->ai_lname = sptr; > @@ -169,15 +164,17 @@ > SYSINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_init, NULL); > > void > -audit_shutdown(int what, void *arg, struct thread *td) > +audit_shutdown(void) > { > struct vnode *vp; > - struct audit_info *ai = arg; > + struct audit_info *ai; > struct ucred *cred; > vm_zone_t zone = NULL; > char *ptr; > > audit_shutdown_flag = 1; > + ai = &ainfo; > + > AINFO_LOCK(ai); > cred = ai->ai_cred; > vp = ai->ai_vp; > @@ -185,10 +182,10 @@ > ptr = ai->ai_lname; > AINFO_UNLOCK(ai); > mtx_destroy(&ai->ai_mtx); > + free(ptr, M_TEMP); > bzero(ai, sizeof(*ai)); > - > - free(ptr, M_TEMP); > - audit_write_shutdown(vp, td, cred); > + audit_write_shutdown(vp, curthread, cred); /* curthread ok? */ > + crfree(cred); > zdestroy(zone); > } > SYSUNINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_shutdown, NULL); > @@ -300,19 +297,20 @@ > mtx_lock(&record_queue_mtx); > TAILQ_REMOVE(&record_queue, ar, ar_next); > mtx_unlock(&record_queue_mtx); > + > + /* XXX Check flag here and hope it doesnt change. */ > + if (audit_shutdown_flag) { > + mtx_destroy(&record_queue_mtx); > + kthread_exit(0); > + } > + > if (ar) { > - /* XXX */ > (void)audit_record_write(ar, NULL, NULL); > AINFO_LOCK(ai); > z = ai->ai_zone; > lease = &ai->ai_leased; > AINFO_UNLOCK(ai); > audit_record_free(ar, z, lease); > - } else if (ar == NULL && audit_shutdown_flag) { > - mtx_destroy(&record_queue_mtx); > - kthread_exit(0); > } > - if (audit_shutdown_flag) > - continue; > } > } -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 12:27:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46E4F37B400; Tue, 9 Apr 2002 12:26:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4C4F037B416 for ; Tue, 9 Apr 2002 12:26:17 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g39JQGo63159 for perforce@freebsd.org; Tue, 9 Apr 2002 12:26:16 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Tue, 9 Apr 2002 12:26:16 -0700 (PDT) Message-Id: <200204091926.g39JQGo63159@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9458 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9458 Change 9458 by jake@jake_sparc64 on 2002/04/09 12:25:16 Integ@9456 Affected files ... ... //depot/projects/sparc64/bin/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/FREEBSD-upgrade#4 integrate ... //depot/projects/sparc64/gnu/lib/Makefile#7 integrate ... //depot/projects/sparc64/gnu/lib/libreadline/readline/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/Makefile#10 integrate ... //depot/projects/sparc64/gnu/usr.bin/sort/sort.c#4 integrate ... //depot/projects/sparc64/lib/libc/gen/getobjformat.c#4 integrate ... //depot/projects/sparc64/lib/libc/gen/strtofflags.c#4 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#9 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_select.c#2 integrate ... //depot/projects/sparc64/lib/libedit/Makefile#2 integrate ... //depot/projects/sparc64/lib/libstand/Makefile#8 integrate ... //depot/projects/sparc64/release/Makefile#6 integrate ... //depot/projects/sparc64/sbin/Makefile#12 integrate ... //depot/projects/sparc64/sbin/dumpon/dumpon.c#5 integrate ... //depot/projects/sparc64/sbin/kget/Makefile#2 delete ... //depot/projects/sparc64/sbin/kget/kget.8#2 delete ... //depot/projects/sparc64/sbin/kget/kget.c#2 delete ... //depot/projects/sparc64/share/examples/etc/make.conf#5 integrate ... //depot/projects/sparc64/share/man/man4/ip.4#2 integrate ... //depot/projects/sparc64/share/mk/bsd.libnames.mk#6 integrate ... //depot/projects/sparc64/sys/alpha/alpha/machdep.c#26 integrate ... //depot/projects/sparc64/sys/boot/common/load_elf.c#11 integrate ... //depot/projects/sparc64/sys/boot/ficl/Makefile#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/alpha/sysdep.h#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/dict.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/ficl.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/ficl.h#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/fileaccess.c#1 branch ... //depot/projects/sparc64/sys/boot/ficl/float.c#1 branch ... //depot/projects/sparc64/sys/boot/ficl/i386/sysdep.h#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/ia64/sysdep.h#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/loader.c#4 integrate ... //depot/projects/sparc64/sys/boot/ficl/math64.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/math64.h#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/prefix.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/search.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/softwords/ficlclass.fr#1 branch ... //depot/projects/sparc64/sys/boot/ficl/softwords/fileaccess.fr#1 branch ... //depot/projects/sparc64/sys/boot/ficl/softwords/forml.fr#1 branch ... //depot/projects/sparc64/sys/boot/ficl/softwords/ifbrack.fr#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/softwords/marker.fr#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/softwords/oo.fr#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/softwords/prefix.fr#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/softwords/softcore.fr#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/stack.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/testmain.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/tools.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/vm.c#2 integrate ... //depot/projects/sparc64/sys/boot/ficl/words.c#3 integrate ... //depot/projects/sparc64/sys/conf/NOTES#2 integrate ... //depot/projects/sparc64/sys/conf/files#51 integrate ... //depot/projects/sparc64/sys/conf/majors#8 integrate ... //depot/projects/sparc64/sys/conf/options#25 integrate ... //depot/projects/sparc64/sys/dev/eisa/eisaconf.c#2 integrate ... //depot/projects/sparc64/sys/dev/fb/vga.c#5 integrate ... //depot/projects/sparc64/sys/dev/kbd/atkbd.c#3 integrate ... //depot/projects/sparc64/sys/dev/null/null.c#4 integrate ... //depot/projects/sparc64/sys/dev/usb/usb.c#11 integrate ... //depot/projects/sparc64/sys/geom/geom.h#6 integrate ... //depot/projects/sparc64/sys/geom/geom_bsd.c#8 integrate ... //depot/projects/sparc64/sys/geom/geom_dev.c#8 integrate ... //depot/projects/sparc64/sys/geom/geom_disk.c#6 integrate ... //depot/projects/sparc64/sys/geom/geom_io.c#4 integrate ... //depot/projects/sparc64/sys/geom/geom_mbr.c#6 integrate ... //depot/projects/sparc64/sys/geom/geom_pc98.c#3 integrate ... //depot/projects/sparc64/sys/geom/geom_slice.c#7 integrate ... //depot/projects/sparc64/sys/geom/geom_slice.h#4 integrate ... //depot/projects/sparc64/sys/geom/geom_subr.c#5 integrate ... //depot/projects/sparc64/sys/geom/geom_sunlabel.c#6 integrate ... //depot/projects/sparc64/sys/i386/conf/GENERIC#18 integrate ... //depot/projects/sparc64/sys/i386/conf/NEWCARD#10 integrate ... //depot/projects/sparc64/sys/i386/conf/NOTES#38 integrate ... //depot/projects/sparc64/sys/i386/i386/machdep.c#28 integrate ... //depot/projects/sparc64/sys/i386/include/md_var.h#10 integrate ... //depot/projects/sparc64/sys/i386/include/uc_device.h#2 delete ... //depot/projects/sparc64/sys/i386/isa/isa_device.h#2 integrate ... //depot/projects/sparc64/sys/i386/isa/pcvt/pcvt_drv.c#4 integrate ... //depot/projects/sparc64/sys/ia64/ia64/machdep.c#35 integrate ... //depot/projects/sparc64/sys/ia64/ia64/ssc.c#7 integrate ... //depot/projects/sparc64/sys/ia64/include/ia64_cpu.h#7 integrate ... //depot/projects/sparc64/sys/isa/pnpreg.h#2 integrate ... //depot/projects/sparc64/sys/kern/kern_intr.c#14 integrate ... //depot/projects/sparc64/sys/kern/subr_disk.c#11 integrate ... //depot/projects/sparc64/sys/kern/vfs_cache.c#12 integrate ... //depot/projects/sparc64/sys/kern/vfs_syscalls.c#27 integrate ... //depot/projects/sparc64/sys/kern/vfs_vnops.c#20 integrate ... //depot/projects/sparc64/sys/netinet/in.h#8 integrate ... //depot/projects/sparc64/sys/pc98/conf/GENERIC#15 integrate ... //depot/projects/sparc64/sys/pc98/i386/machdep.c#24 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/machdep.c#22 integrate ... //depot/projects/sparc64/sys/sparc64/conf/GENERIC#21 integrate ... //depot/projects/sparc64/sys/sparc64/include/frame.h#22 integrate ... //depot/projects/sparc64/sys/sparc64/include/reg.h#13 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/db_trace.c#28 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/emul.c#12 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/machdep.c#75 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/trap.c#70 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#49 integrate ... //depot/projects/sparc64/sys/sys/bio.h#8 integrate ... //depot/projects/sparc64/sys/sys/disk.h#6 integrate ... //depot/projects/sparc64/sys/sys/ioccom.h#4 integrate ... //depot/projects/sparc64/usr.bin/Makefile#19 integrate ... //depot/projects/sparc64/usr.bin/awk/Makefile#3 integrate ... //depot/projects/sparc64/usr.bin/colldef/parse.y#2 integrate ... //depot/projects/sparc64/usr.bin/colldef/scan.l#2 integrate ... //depot/projects/sparc64/usr.bin/xinstall/xinstall.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/closure.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/error.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/lalr.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/lr0.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/main.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/mkpar.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/output.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/reader.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/skeleton.c#2 integrate ... //depot/projects/sparc64/usr.bin/yacc/symtab.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/verbose.c#4 integrate ... //depot/projects/sparc64/usr.bin/yacc/warshall.c#3 integrate ... //depot/projects/sparc64/usr.sbin/Makefile#12 integrate ... //depot/projects/sparc64/usr.sbin/wicontrol/wicontrol.8#2 integrate Differences ... ==== //depot/projects/sparc64/bin/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.19 2002/02/11 18:38:54 mike Exp $ +# $FreeBSD: src/bin/Makefile,v 1.20 2002/04/09 18:25:37 bmilekic Exp $ SUBDIR= cat \ chio \ @@ -22,7 +22,6 @@ pax \ ps \ pwd \ - rcp \ realpath \ rm \ rmdir \ @@ -33,6 +32,10 @@ sync \ test +.if !defined(NO_RCMNDS) +SUBDIR+=rcp +.endif + .if !defined(NO_TCSH) SUBDIR+=csh .endif ==== //depot/projects/sparc64/contrib/sendmail/FREEBSD-upgrade#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.11 2002/04/06 17:53:06 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.12 2002/04/09 02:09:14 gshapiro Exp $ sendmail 8.12.2 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ @@ -51,6 +51,8 @@ etc/mtree/BSD.include.dist etc/mtree/BSD.usr.dist etc/mtree/BSD.var.dist + etc/periodic/daily/440.status-mailq + etc/periodic/daily/500.queuerun etc/rc etc/sendmail/Makefile etc/sendmail/freebsd.mc ==== //depot/projects/sparc64/gnu/lib/Makefile#7 (text+ko) ==== ==== //depot/projects/sparc64/gnu/lib/libreadline/readline/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libreadline/readline/Makefile,v 1.8 2001/04/21 22:05:33 ache Exp $ +# $FreeBSD: src/gnu/lib/libreadline/readline/Makefile,v 1.9 2002/04/09 13:02:26 ru Exp $ SUBDIR= doc @@ -14,8 +14,8 @@ INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \ rlstdc.h rlconf.h rltypedefs.h -DPADD+= $(LIBTERMCAP) -LDADD+= -ltermcap +DPADD= ${LIBNCURSES} +LDADD= -lncurses INCDIR= /usr/include/readline ==== //depot/projects/sparc64/gnu/usr.bin/Makefile#10 (text+ko) ==== ==== //depot/projects/sparc64/gnu/usr.bin/sort/sort.c#4 (text+ko) ==== @@ -19,7 +19,7 @@ The author may be reached (Email) at the address mike@gnu.ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ -/* $FreeBSD: src/gnu/usr.bin/sort/sort.c,v 1.20 2002/04/08 12:12:06 ache Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/sort/sort.c,v 1.21 2002/04/08 22:00:28 ache Exp $ */ #include @@ -198,6 +198,8 @@ static struct keyfield keyhead; #ifdef __FreeBSD__ +static unsigned char decimal_point; + static int COLLDIFF (int a, int b) { @@ -751,7 +753,11 @@ { register tmpa = UCHAR (*a), tmpb = UCHAR (*b); +#ifdef __FreeBSD__ + if (tmpa == decimal_point && tmpb == decimal_point) +#else if (tmpa == '.' && tmpb == '.') +#endif { do tmpa = UCHAR (*++a), tmpb = UCHAR (*++b); @@ -776,7 +782,11 @@ } return 0; } +#ifdef __FreeBSD__ + else if (tmpa == decimal_point) +#else else if (tmpa == '.') +#endif { do tmpa = UCHAR (*++a); @@ -785,7 +795,11 @@ return 1; return 0; } +#ifdef __FreeBSD__ + else if (tmpb == decimal_point) +#else else if (tmpb == '.') +#endif { do tmpb = UCHAR (*++b); @@ -821,7 +835,11 @@ while (tmpa == '0'); if (tmpb != '-') { +#ifdef __FreeBSD__ + if (tmpa == decimal_point) +#else if (tmpa == '.') +#endif do tmpa = UCHAR (*++a); while (tmpa == '0'); @@ -829,7 +847,11 @@ return -1; while (tmpb == '0') tmpb = UCHAR (*++b); +#ifdef __FreeBSD__ + if (tmpb == decimal_point) +#else if (tmpb == '.') +#endif do tmpb = UCHAR (*++b); while (tmpb == '0'); @@ -844,7 +866,12 @@ while (tmpa == tmpb && digits[tmpa]) tmpa = UCHAR (*++a), tmpb = UCHAR (*++b); +#ifdef __FreeBSD__ + if ((tmpa == decimal_point && !digits[tmpb]) || + (tmpb == decimal_point && !digits[tmpa])) +#else if ((tmpa == '.' && !digits[tmpb]) || (tmpb == '.' && !digits[tmpa])) +#endif return -fraccompare (a, b); if (digits[tmpa]) @@ -876,7 +903,11 @@ do tmpb = UCHAR (*++b); while (tmpb == '0'); +#ifdef __FreeBSD__ + if (tmpb == decimal_point) +#else if (tmpb == '.') +#endif do tmpb = UCHAR (*++b); while (tmpb == '0'); @@ -884,7 +915,11 @@ return 1; while (tmpa == '0') tmpa = UCHAR (*++a); +#ifdef __FreeBSD__ + if (tmpa == decimal_point) +#else if (tmpa == '.') +#endif do tmpa = UCHAR (*++a); while (tmpa == '0'); @@ -902,7 +937,12 @@ while (tmpa == tmpb && digits[tmpa]) tmpa = UCHAR (*++a), tmpb = UCHAR (*++b); +#ifdef __FreeBSD__ + if ((tmpa == decimal_point && !digits[tmpb]) || + (tmpb == decimal_point && !digits[tmpa])) +#else if ((tmpa == '.' && !digits[tmpb]) || (tmpb == '.' && !digits[tmpa])) +#endif return fraccompare (a, b); if (digits[tmpa]) @@ -1738,6 +1778,7 @@ #ifdef __FreeBSD__ (void) setlocale(LC_ALL, ""); + decimal_point = localeconv()->decimal_point[0]; #endif program_name = argv[0]; ==== //depot/projects/sparc64/lib/libc/gen/getobjformat.c#4 (text+ko) ==== @@ -25,9 +25,7 @@ */ #include -#ifdef __FBSDID -__FBSDID("$FreeBSD: src/lib/libc/gen/getobjformat.c,v 1.5 2002/02/08 09:34:17 ru Exp $"); -#endif +__FBSDID("$FreeBSD: src/lib/libc/gen/getobjformat.c,v 1.6 2002/04/09 11:39:03 ru Exp $"); #include #include ==== //depot/projects/sparc64/lib/libc/gen/strtofflags.c#4 (text+ko) ==== @@ -35,9 +35,7 @@ static char sccsid[] = "@(#)stat_flags.c 8.1 (Berkeley) 5/31/93"; #endif /* LIBC_SCCS and not lint */ #include -#ifdef __FBSDID -__FBSDID("$FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.20 2002/02/08 09:34:17 ru Exp $"); -#endif +__FBSDID("$FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.21 2002/04/09 11:39:03 ru Exp $"); #include #include ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#9 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.3 2002/03/22 21:52:58 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.4 2002/04/09 00:57:23 jake Exp $"); #include ==== //depot/projects/sparc64/lib/libc_r/uthread/uthread_select.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_select.c,v 1.18 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_select.c,v 1.19 2002/04/09 05:41:00 asmodai Exp $ */ #include #include @@ -52,7 +52,7 @@ struct pthread *curthread = _get_curthread(); struct timespec ts; int i, ret = 0, f_wait = 1; - int pfd_index, got_one = 0, fd_count = 0; + int pfd_index, got_events = 0, fd_count = 0; struct pthread_poll_data data; if (numfds > _thread_dtablesize) { @@ -166,12 +166,22 @@ * this file descriptor from the fdset if * the requested event wasn't ready. */ - got_one = 0; + + /* + * First check for invalid descriptor. + * If found, set errno and return -1. + */ + if (data.fds[i].revents & POLLNVAL) { + errno = EBADF; + return -1; + } + + got_events = 0; if (readfds != NULL) { if (FD_ISSET(data.fds[i].fd, readfds)) { if (data.fds[i].revents & (POLLIN | POLLRDNORM)) - got_one = 1; + got_events++; else FD_CLR(data.fds[i].fd, readfds); } @@ -180,7 +190,7 @@ if (FD_ISSET(data.fds[i].fd, writefds)) { if (data.fds[i].revents & (POLLOUT | POLLWRNORM | POLLWRBAND)) - got_one = 1; + got_events++; else FD_CLR(data.fds[i].fd, writefds); @@ -189,16 +199,15 @@ if (exceptfds != NULL) { if (FD_ISSET(data.fds[i].fd, exceptfds)) { if (data.fds[i].revents & (POLLRDBAND | - POLLPRI | POLLHUP | POLLERR | - POLLNVAL)) - got_one = 1; + POLLPRI)) + got_events++; else FD_CLR(data.fds[i].fd, exceptfds); } } - if (got_one) - numfds++; + if (got_events != 0) + numfds+=got_events; } ret = numfds; } ==== //depot/projects/sparc64/lib/libedit/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.19 2000/08/15 12:01:40 mrg Exp $ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libedit/Makefile,v 1.24 2001/10/01 23:10:48 obrien Exp $ +# $FreeBSD: src/lib/libedit/Makefile,v 1.25 2002/04/09 13:04:31 ru Exp $ LIB= edit SHLIB_MAJOR= 4 @@ -9,8 +9,8 @@ OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \ parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBNCURSES} +LDADD= -lncurses MAN= editline.3 editrc.5 ==== //depot/projects/sparc64/lib/libstand/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libstand/Makefile,v 1.32 2002/04/08 20:46:07 obrien Exp $ +# $FreeBSD: src/lib/libstand/Makefile,v 1.33 2002/04/09 05:34:22 obrien Exp $ # Originally from $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $ # # Notes: @@ -11,8 +11,6 @@ NOPIC= YES MAN= libstand.3 -CFLAGS+= -ffreestanding - .if ${MACHINE_ARCH} == "alpha" CFLAGS+= -mno-fp-regs .endif ==== //depot/projects/sparc64/release/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.666 2002/04/02 15:07:34 matusita Exp $ +# $FreeBSD: src/release/Makefile,v 1.667 2002/04/09 01:17:47 matusita Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \ # [ RELEASETAG=tag ] @@ -1009,6 +1009,7 @@ @echo "read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc .endif @echo "load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc + @echo "set hint.acpi.0.disable=1" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "echo \\007\\007" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "autoboot 10" >> ${RD}/image.${FSIMAGE}/boot/loader.rc .if ${MACHINE_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT} ==== //depot/projects/sparc64/sbin/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.101 2002/04/02 10:58:30 marcel Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.102 2002/04/09 10:55:11 phk Exp $ # XXX MISSING: icheck ncheck @@ -86,7 +86,6 @@ .if ${MACHINE_ARCH} == "i386" SUBDIR+=cxconfig \ - kget \ mount_nwfs \ mount_smbfs \ nextboot ==== //depot/projects/sparc64/sbin/dumpon/dumpon.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "From: @(#)swapon.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.15 2002/04/08 09:20:04 phk Exp $"; + "$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.16 2002/04/09 10:00:18 phk Exp $"; #endif /* not lint */ #include @@ -84,9 +84,9 @@ if (fd < 0) err(EX_OSFILE, "%s", argv[0]); u = 0; - i = ioctl(fd, DIOCGKERNELDUMP, &u); + i = ioctl(fd, DIOCSKERNELDUMP, &u); u = 1; - i = ioctl(fd, DIOCGKERNELDUMP, &u); + i = ioctl(fd, DIOCSKERNELDUMP, &u); if (i == 0 && verbose) printf("kernel dumps on %s\n", argv[0]); @@ -95,12 +95,12 @@ if (fd < 0) err(EX_OSFILE, "%s", _PATH_DEVNULL); u = 0; - i = ioctl(fd, DIOCGKERNELDUMP, &u); + i = ioctl(fd, DIOCSKERNELDUMP, &u); if (i == 0 && verbose) printf("kernel dumps disabled\n"); } if (i < 0) - err(EX_OSERR, "ioctl(DIOCGKERNELDUMP)"); + err(EX_OSERR, "ioctl(DIOCSKERNELDUMP)"); exit (0); } ==== //depot/projects/sparc64/share/examples/etc/make.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.183 2002/03/30 18:14:37 ume Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.184 2002/04/09 18:25:40 bmilekic Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -116,6 +116,7 @@ #NOSECURE= true # do not build crypto code in secure/ subdir #NOSHARE= true # do not go into the share subdir #NOUUCP= true # do not build uucp related programs +#NO_RCMNDS= true # do not build rlogin, rsh & rcp # # To build the OpenSSL manpages, uncomment the following. These are not # built by default because they clobber a number of system manpages with ==== //depot/projects/sparc64/share/man/man4/ip.4#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ip.4 8.2 (Berkeley) 11/30/93 -.\" $FreeBSD: src/share/man/man4/ip.4,v 1.24 2001/10/01 16:09:21 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ip.4,v 1.25 2002/04/09 18:03:18 silby Exp $ .\" .Dd March 3, 2001 .Dt IP 4 @@ -144,9 +144,9 @@ .Bl -tag -width IP_PORTRANGE_DEFAULT .It Dv IP_PORTRANGE_DEFAULT use the default range of values, normally -.Dv IPPORT_RESERVED +.Dv IPPORT_HIFIRSTAUTO through -.Dv IPPORT_USERRESERVED . +.Dv IPPORT_HILASTAUTO . This is adjustable through the sysctl setting: .Sy net.inet.ip.portrange.first and ==== //depot/projects/sparc64/share/mk/bsd.libnames.mk#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.52 2002/03/28 18:44:24 joe Exp $ +# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.53 2002/04/09 13:19:09 ru Exp $ # The include file define library names. # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this @@ -34,6 +34,7 @@ LIBG2C?= ${DESTDIR}${LIBDIR}/libg2c.a LIBGCC?= ${DESTDIR}${LIBDIR}/libgcc.a LIBGNUREGEX?= ${DESTDIR}${LIBDIR}/libgnuregex.a +LIBGSSAPI?= ${DESTDIR}${LIBDIR}/libgssapi.a # XXX in secure dist, not base LIBHISTORY?= ${DESTDIR}${LIBDIR}/libhistory.a LIBIPSEC?= ${DESTDIR}${LIBDIR}/libipsec.a LIBIPX?= ${DESTDIR}${LIBDIR}/libipx.a ==== //depot/projects/sparc64/sys/alpha/alpha/machdep.c#26 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.175 2002/04/07 21:01:34 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.176 2002/04/09 11:18:26 phk Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -278,18 +278,6 @@ vm_ksubmap_init(&kmi); -#if defined(USERCONFIG) -#if defined(USERCONFIG_BOOT) - if (1) -#else - if (boothowto & RB_CONFIG) -#endif - { - userconfig(); - cninit(); /* the preferred console may have changed */ - } -#endif - printf("avail memory = %ld (%ldK bytes)\n", ptoa(cnt.v_free_count), ptoa(cnt.v_free_count) / 1024); ==== //depot/projects/sparc64/sys/boot/common/load_elf.c#11 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.22 2002/04/06 04:09:42 peter Exp $ + * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.23 2002/04/09 00:05:46 jake Exp $ */ #include ==== //depot/projects/sparc64/sys/boot/ficl/Makefile#2 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.26 2001/04/29 02:36:33 dcs Exp $ +# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.27 2002/04/09 17:45:11 dcs Exp $ # .PATH: ${.CURDIR}/${MACHINE_ARCH} -BASE_SRCS= dict.c ficl.c math64.c search.c stack.c tools.c \ - prefix.c loader.c vm.c words.c +BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ + prefix.c search.c stack.c tools.c vm.c words.c + SRCS= ${BASE_SRCS} sysdep.c softcore.c CLEANFILES= softcore.c testmain testmain.o .if ${MACHINE_ARCH} == "alpha" ==== //depot/projects/sparc64/sys/boot/ficl/alpha/sysdep.h#2 (text+ko) ==== @@ -9,7 +9,7 @@ ** FICL_ROBUST is enabled. This may require some consideration ** in firmware systems since assert often ** assumes stderr/stdout. -** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $ +** $Id: sysdep.h,v 1.11 2001/12/05 07:21:34 jsadler Exp $ *******************************************************************/ /* ** Copyright (c) 1997-2001 John Sadler (john_sadler@alum.mit.edu) @@ -17,6 +17,11 @@ ** ** Get the latest Ficl release at http://ficl.sourceforge.net ** +** I am interested in hearing from anyone who uses ficl. If you have +** a problem, a success story, a defect, an enhancement request, or +** if you would like to contribute to the ficl release, please +** contact me by email at the address above. +** ** L I C E N S E and D I S C L A I M E R ** ** Redistribution and use in source and binary forms, with or without @@ -39,16 +44,9 @@ ** 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. -** -** I am interested in hearing from anyone who uses ficl. If you have -** a problem, a success story, a defect, an enhancement request, or -** if you would like to contribute to the ficl release, please send -** contact me by email at the address above. -** -** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $ */ -/* $FreeBSD: src/sys/boot/ficl/alpha/sysdep.h,v 1.7 2001/04/29 02:36:35 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/alpha/sysdep.h,v 1.8 2002/04/09 17:45:22 dcs Exp $ */ #if !defined (__SYSDEP_H__) #define __SYSDEP_H__ @@ -75,7 +73,6 @@ #define FALSE 0 #endif - /* ** System dependent data type declarations... */ @@ -162,6 +159,7 @@ #endif #if (FICL_MINIMAL) #define FICL_WANT_SOFTWORDS 0 +#define FICL_WANT_FILE 0 #define FICL_WANT_FLOAT 0 #define FICL_WANT_USER 0 #define FICL_WANT_LOCALS 0 @@ -181,6 +179,17 @@ #define FICL_PLATFORM_EXTEND 1 #endif + +/* +** FICL_WANT_FILE +** Includes the FILE and FILE-EXT wordset and associated code. Turn this off if you do not +** have a file system! +** Contributed by Larry Hastings +*/ +#if !defined (FICL_WANT_FILE) +#define FICL_WANT_FILE 0 +#endif + /* ** FICL_WANT_FLOAT ** Includes a floating point stack for the VM, and words to do float operations. @@ -199,6 +208,14 @@ #endif /* +** FICL_EXTENDED_PREFIX enables a bunch of extra prefixes in prefix.c and prefix.fr (if +** included as part of softcore.c) +*/ +#if !defined FICL_EXTENDED_PREFIX +#define FICL_EXTENDED_PREFIX 0 +#endif + +/* ** User variables: per-instance variables bound to the VM. ** Kinda like thread-local storage. Could be implemented in a ** VM private dictionary, but I've chosen the lower overhead @@ -341,14 +358,6 @@ #endif /* -** FICL_EXTENDED_PREFIX enables a bunch of extra prefixes in prefix.c and prefix.fr (if -** included as part of softcore.c) -*/ -#if !defined FICL_EXTENDED_PREFIX -#define FICL_EXTENDED_PREFIX 0 -#endif - -/* ** FICL_ALIGN is the power of two to which the dictionary ** pointer address must be aligned. This value is usually ** either 1 or 2, depending on the memory architecture @@ -409,4 +418,15 @@ DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y); UNSQR ficlLongDiv(DPUNS q, FICL_UNS y); + +/* +** FICL_HAVE_FTRUNCATE indicates whether the current OS supports +** the ftruncate() function (available on most UNIXes). This +** function is necessary to provide the complete File-Access wordset. +*/ +#if !defined (FICL_HAVE_FTRUNCATE) +#define FICL_HAVE_FTRUNCATE 0 +#endif + + #endif /*__SYSDEP_H__*/ ==== //depot/projects/sparc64/sys/boot/ficl/dict.c#2 (text+ko) ==== @@ -3,7 +3,7 @@ ** Forth Inspired Command Language - dictionary methods ** Author: John Sadler (john_sadler@alum.mit.edu) ** Created: 19 July 1997 -** $Id: dict.c,v 1.6 2000-06-17 07:43:44-07 jsadler Exp jsadler $ +** $Id: dict.c,v 1.14 2001/12/05 07:21:34 jsadler Exp $ *******************************************************************/ /* ** This file implements the dictionary -- FICL's model of @@ -22,6 +22,11 @@ ** ** Get the latest Ficl release at http://ficl.sourceforge.net ** +** I am interested in hearing from anyone who uses ficl. If you have +** a problem, a success story, a defect, an enhancement request, or +** if you would like to contribute to the ficl release, please +** contact me by email at the address above. +** ** L I C E N S E and D I S C L A I M E R ** ** Redistribution and use in source and binary forms, with or without @@ -44,20 +49,12 @@ ** 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. -** -** I am interested in hearing from anyone who uses ficl. If you have -** a problem, a success story, a defect, an enhancement request, or -** if you would like to contribute to the ficl release, please send -** contact me by email at the address above. -** -** $Id: dict.c,v 1.8 2001-04-26 21:41:45-07 jsadler Exp jsadler $ */ -/* $FreeBSD: src/sys/boot/ficl/dict.c,v 1.12 2001/05/29 23:44:12 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/dict.c,v 1.13 2002/04/09 17:45:11 dcs Exp $ */ #ifdef TESTMAIN #include -#include #include #else #include @@ -304,16 +301,19 @@ /************************************************************************** d i c t C h e c k ** Checks the dictionary for corruption and throws appropriate -** errors +** errors. +** Input: +n number of ADDRESS UNITS (not Cells) proposed to allot +** -n number of ADDRESS UNITS proposed to de-allot +** 0 just do a consistency check **************************************************************************/ -void dictCheck(FICL_DICT *pDict, FICL_VM *pVM, int nCells) +void dictCheck(FICL_DICT *pDict, FICL_VM *pVM, int n) { - if ((nCells >= 0) && (dictCellsAvail(pDict) < nCells)) + if ((n >= 0) && (dictCellsAvail(pDict) * (int)sizeof(CELL) < n)) { vmThrowErr(pVM, "Error: dictionary full"); } - if ((nCells <= 0) && (dictCellsUsed(pDict) < -nCells)) + if ((n <= 0) && (dictCellsUsed(pDict) * (int)sizeof(CELL) < -n)) { vmThrowErr(pVM, "Error: dictionary underflow"); } @@ -396,6 +396,7 @@ memset(pDict, 0, sizeof (FICL_DICT)); pDict->dict = ficlMalloc(nAlloc); assert(pDict->dict); + pDict->size = nCells; dictEmpty(pDict, nHash); return pDict; @@ -460,6 +461,84 @@ /************************************************************************** + d i c t H a s h S u m m a r y +** Calculate a figure of merit for the dictionary hash table based +** on the average search depth for all the words in the dictionary, +** assuming uniform distribution of target keys. The figure of merit +** is the ratio of the total search depth for all keys in the table +** versus a theoretical optimum that would be achieved if the keys +** were distributed into the table as evenly as possible. +** The figure would be worse if the hash table used an open +** addressing scheme (i.e. collisions resolved by searching the +** table for an empty slot) for a given size table. +**************************************************************************/ +#if FICL_WANT_FLOAT +void dictHashSummary(FICL_VM *pVM) +{ + FICL_DICT *dp = vmGetDict(pVM); + FICL_HASH *pFHash; + FICL_WORD **pHash; + unsigned size; + FICL_WORD *pFW; + unsigned i; + int nMax = 0; + int nWords = 0; + int nFilled; + double avg = 0.0; + double best; + int nAvg, nRem, nDepth; + + dictCheck(dp, pVM, 0); + + pFHash = dp->pSearch[dp->nLists - 1]; + pHash = pFHash->table; + size = pFHash->size; + nFilled = size; + + for (i = 0; i < size; i++) + { + int n = 0; + pFW = pHash[i]; + + while (pFW) + { + ++n; + ++nWords; + pFW = pFW->link; + } + + avg += (double)(n * (n+1)) / 2.0; + + if (n > nMax) + nMax = n; + if (n == 0) + --nFilled; + } + + /* Calc actual avg search depth for this hash */ + avg = avg / nWords; + + /* Calc best possible performance with this size hash */ + nAvg = nWords / size; + nRem = nWords % size; + nDepth = size * (nAvg * (nAvg+1))/2 + (nAvg+1)*nRem; + best = (double)nDepth/nWords; + + sprintf(pVM->pad, + "%d bins, %2.0f%% filled, Depth: Max=%d, Avg=%2.1f, Best=%2.1f, Score: %2.0f%%", + size, + (double)nFilled * 100.0 / size, nMax, + avg, + best, + 100.0 * best / avg); + + ficlTextOut(pVM, pVM->pad, 1); + + return; +} +#endif + +/************************************************************************** d i c t I n c l u d e s ** Returns TRUE iff the given pointer is within the address range of ** the dictionary. @@ -471,7 +550,6 @@ ); } - /************************************************************************** d i c t L o o k u p ** Find the FICL_WORD that matches the given name and length. @@ -501,15 +579,16 @@ /************************************************************************** - d i c t L o o k u p L o c + f i c l L o o k u p L o c ** Same as dictLookup, but looks in system locals dictionary first... ** Assumes locals dictionary has only one wordlist... **************************************************************************/ #if FICL_WANT_LOCALS -FICL_WORD *dictLookupLoc(FICL_DICT *pDict, STRINGINFO si) +FICL_WORD *ficlLookupLoc(FICL_SYSTEM *pSys, STRINGINFO si) { FICL_WORD *pFW = NULL; - FICL_HASH *pHash = ficlGetLoc()->pForthWords; + FICL_DICT *pDict = pSys->dp; + FICL_HASH *pHash = ficlGetLoc(pSys)->pForthWords; int i; UNS16 hashCode = hashHashCode(si); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 13:22:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0FCB37B41D; Tue, 9 Apr 2002 13:22:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id CE4F937B494; Tue, 9 Apr 2002 13:21:10 -0700 (PDT) Received: from localhost (arr@localhost) by fledge.watson.org (8.11.6/8.11.6) with SMTP id g39KL3d09951; Tue, 9 Apr 2002 16:21:03 -0400 (EDT) (envelope-from arr@FreeBSD.org) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Tue, 9 Apr 2002 16:21:02 -0400 (EDT) From: "Andrew R. Reiter" X-Sender: arr@fledge.watson.org To: John Baldwin Cc: "Andrew R. Reiter" , Perforce Change Reviews Subject: RE: PERFORCE change 9457 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, 9 Apr 2002, John Baldwin wrote: : :On 09-Apr-2002 Andrew R. Reiter wrote: :> http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9457 :> :> Change 9457 by arr@arr_shibby on 2002/04/09 12:20:46 :> :> - Use curthread instead of a passed in thread pointer in :> some places. :> - Remember crfree() our saved cred. : :You don't do a crhold on it though, which you probably should. Erps -- this is probably something I accidentally chopped. Most of this code is some stuff I'm cleaning out while I ponder a design change. Thanks for the feedback. Cheers, Andrew : :> - Rearrange a check of the shutdown flag, so we can better :> handle a bad situation -- this needs to possibly lock :> the flag on write :> :> Affected files ... :> :> ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#20 edit :> :> Differences ... :> :> ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#20 (text+ko) :> ==== :> :> @@ -87,9 +87,6 @@ :> audit_record_generate_id(audit_id_t *id) :> { :> :> - /* :> - * XXX :> - */ :> return(*++id); :> } :> :> @@ -128,7 +125,6 @@ :> { :> struct vnode *vp; :> struct audit_info *ai; :> - struct ucred *cred; :> vm_zone_t zone; :> char *sptr; :> int err = 0; :> @@ -141,8 +137,7 @@ :> sptr = malloc(strlen(AUDLOG), M_TEMP, M_WAITOK|M_ZERO); :> strcpy(sptr, AUDLOG); :> :> - /* XXX curthread */ :> - vp = audit_write_init(sptr, curthread, &cred); :> + vp = audit_write_init(sptr, curthread, curthread->td_ucred); :> if (vp == NULL) :> panic("Unable to init audit system.\n"); :> :> @@ -151,7 +146,7 @@ :> panic("audit_init: unable to init audit record zone"); :> :> AINFO_LOCK(ai); :> - ai->ai_cred = cred; :> + ai->ai_cred = curthread->td_ucred; : :Here, do a crhold() so you preserve your own reference in case this audit info :lives longer than the syscall. : :> ai->ai_vp = vp; :> ai->ai_zone = zone; :> ai->ai_lname = sptr; :> @@ -169,15 +164,17 @@ :> SYSINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_init, NULL); :> :> void :> -audit_shutdown(int what, void *arg, struct thread *td) :> +audit_shutdown(void) :> { :> struct vnode *vp; :> - struct audit_info *ai = arg; :> + struct audit_info *ai; :> struct ucred *cred; :> vm_zone_t zone = NULL; :> char *ptr; :> :> audit_shutdown_flag = 1; :> + ai = &ainfo; :> + :> AINFO_LOCK(ai); :> cred = ai->ai_cred; :> vp = ai->ai_vp; :> @@ -185,10 +182,10 @@ :> ptr = ai->ai_lname; :> AINFO_UNLOCK(ai); :> mtx_destroy(&ai->ai_mtx); :> + free(ptr, M_TEMP); :> bzero(ai, sizeof(*ai)); :> - :> - free(ptr, M_TEMP); :> - audit_write_shutdown(vp, td, cred); :> + audit_write_shutdown(vp, curthread, cred); /* curthread ok? */ :> + crfree(cred); :> zdestroy(zone); :> } :> SYSUNINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_shutdown, NULL); :> @@ -300,19 +297,20 @@ :> mtx_lock(&record_queue_mtx); :> TAILQ_REMOVE(&record_queue, ar, ar_next); :> mtx_unlock(&record_queue_mtx); :> + :> + /* XXX Check flag here and hope it doesnt change. */ :> + if (audit_shutdown_flag) { :> + mtx_destroy(&record_queue_mtx); :> + kthread_exit(0); :> + } :> + :> if (ar) { :> - /* XXX */ :> (void)audit_record_write(ar, NULL, NULL); :> AINFO_LOCK(ai); :> z = ai->ai_zone; :> lease = &ai->ai_leased; :> AINFO_UNLOCK(ai); :> audit_record_free(ar, z, lease); :> - } else if (ar == NULL && audit_shutdown_flag) { :> - mtx_destroy(&record_queue_mtx); :> - kthread_exit(0); :> } :> - if (audit_shutdown_flag) :> - continue; :> } :> } : :-- : :John Baldwin <>< http://www.FreeBSD.org/~jhb/ :"Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ : -- Andrew R. Reiter arr@watson.org arr@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 13:29:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F06F37B417; Tue, 9 Apr 2002 13:29:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 786EE37B405 for ; Tue, 9 Apr 2002 13:29:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g39KTbt26226 for perforce@freebsd.org; Tue, 9 Apr 2002 13:29:37 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 9 Apr 2002 13:29:37 -0700 (PDT) Message-Id: <200204092029.g39KTbt26226@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9465 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9465 Change 9465 by jhb@jhb_laptop on 2002/04/09 13:28:52 Push down Giant in settime() until we actually talk to the timecounters and time of day clocks to set the time. Also, push down Giant in the settimeofday() syscall until we set the 'tz' value. Affected files ... ... //depot/projects/smpng/sys/kern/kern_time.c#11 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_time.c#11 (text+ko) ==== @@ -132,11 +132,13 @@ ts.tv_sec = tv->tv_sec; ts.tv_nsec = tv->tv_usec * 1000; + mtx_lock(&Giant); tc_setclock(&ts); (void) splsoftclock(); lease_updatetime(delta.tv_sec); splx(s); resettodr(); + mtx_unlock(&Giant); return (0); } @@ -196,9 +198,7 @@ return (EINVAL); /* XXX Don't convert nsec->usec and back */ TIMESPEC_TO_TIMEVAL(&atv, &ats); - mtx_lock(&Giant); error = settime(td, &atv); - mtx_unlock(&Giant); return (error); } @@ -366,28 +366,26 @@ mtx_lock(&Giant); if ((error = suser(td))) - goto done2; + return (error); /* Verify all parameters before changing time. */ if (uap->tv) { if ((error = copyin((caddr_t)uap->tv, (caddr_t)&atv, - sizeof(atv)))) { - goto done2; - } - if (atv.tv_usec < 0 || atv.tv_usec >= 1000000) { - error = EINVAL; - goto done2; - } + sizeof(atv)))) + return (error); + if (atv.tv_usec < 0 || atv.tv_usec >= 1000000) + return (EINVAL); } if (uap->tzp && - (error = copyin((caddr_t)uap->tzp, (caddr_t)&atz, sizeof(atz)))) { - goto done2; - } + (error = copyin((caddr_t)uap->tzp, (caddr_t)&atz, sizeof(atz)))) + return (error); + if (uap->tv && (error = settime(td, &atv))) - goto done2; - if (uap->tzp) + return (error); + if (uap->tzp) { + mtx_lock(&Giant); tz = atz; -done2: - mtx_unlock(&Giant); + mtx_unlock(&Giant); + } return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 13:34: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 903D037B400; Tue, 9 Apr 2002 13:32:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 53F5337B404 for ; Tue, 9 Apr 2002 13:32:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g39KWf226790 for perforce@freebsd.org; Tue, 9 Apr 2002 13:32:41 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 9 Apr 2002 13:32:41 -0700 (PDT) Message-Id: <200204092032.g39KWf226790@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9466 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9466 Change 9466 by jhb@jhb_laptop on 2002/04/09 13:32:31 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#40 integrate ... //depot/projects/smpng/sys/boot/common/load_elf.c#4 integrate ... //depot/projects/smpng/sys/boot/ficl/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/ficl/alpha/sysdep.h#2 integrate ... //depot/projects/smpng/sys/boot/ficl/dict.c#2 integrate ... //depot/projects/smpng/sys/boot/ficl/ficl.c#2 integrate ... //depot/projects/smpng/sys/boot/ficl/ficl.h#2 integrate ... //depot/projects/smpng/sys/boot/ficl/fileaccess.c#1 branch ... //depot/projects/smpng/sys/boot/ficl/float.c#1 branch ... //depot/projects/smpng/sys/boot/ficl/i386/sysdep.h#2 integrate ... //depot/projects/smpng/sys/boot/ficl/ia64/sysdep.h#2 integrate ... //depot/projects/smpng/sys/boot/ficl/loader.c#4 integrate ... //depot/projects/smpng/sys/boot/ficl/math64.c#2 integrate ... //depot/projects/smpng/sys/boot/ficl/math64.h#2 integrate ... //depot/projects/smpng/sys/boot/ficl/prefix.c#2 integrate ... //depot/projects/smpng/sys/boot/ficl/search.c#2 integrate ... //depot/projects/smpng/sys/boot/ficl/softwords/ficlclass.fr#1 branch ... //depot/projects/smpng/sys/boot/ficl/softwords/fileaccess.fr#1 branch ... //depot/projects/smpng/sys/boot/ficl/softwords/forml.fr#1 branch ... //depot/projects/smpng/sys/boot/ficl/softwords/ifbrack.fr#2 integrate ... //depot/projects/smpng/sys/boot/ficl/softwords/marker.fr#2 integrate ... //depot/projects/smpng/sys/boot/ficl/softwords/oo.fr#2 integrate ... //depot/projects/smpng/sys/boot/ficl/softwords/prefix.fr#2 integrate ... //depot/projects/smpng/sys/boot/ficl/softwords/softcore.fr#2 integrate ... //depot/projects/smpng/sys/boot/ficl/stack.c#2 integrate ... //depot/projects/smpng/sys/boot/ficl/testmain.c#2 integrate ... //depot/projects/smpng/sys/boot/ficl/tools.c#2 integrate ... //depot/projects/smpng/sys/boot/ficl/vm.c#2 integrate ... //depot/projects/smpng/sys/boot/ficl/words.c#3 integrate ... //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#14 integrate ... //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#10 integrate ... //depot/projects/smpng/sys/conf/NOTES#4 integrate ... //depot/projects/smpng/sys/conf/files#33 integrate ... //depot/projects/smpng/sys/conf/majors#8 integrate ... //depot/projects/smpng/sys/conf/options#19 integrate ... //depot/projects/smpng/sys/dev/eisa/eisaconf.c#2 integrate ... //depot/projects/smpng/sys/dev/fb/vga.c#6 integrate ... //depot/projects/smpng/sys/dev/kbd/atkbd.c#4 integrate ... //depot/projects/smpng/sys/dev/null/null.c#6 integrate ... //depot/projects/smpng/sys/dev/se/se_console.c#1 branch ... //depot/projects/smpng/sys/dev/se/sereg.h#1 branch ... //depot/projects/smpng/sys/dev/usb/usb.c#13 integrate ... //depot/projects/smpng/sys/geom/geom.h#5 integrate ... //depot/projects/smpng/sys/geom/geom_bsd.c#6 integrate ... //depot/projects/smpng/sys/geom/geom_dev.c#5 integrate ... //depot/projects/smpng/sys/geom/geom_disk.c#6 integrate ... //depot/projects/smpng/sys/geom/geom_io.c#6 integrate ... //depot/projects/smpng/sys/geom/geom_mbr.c#5 integrate ... //depot/projects/smpng/sys/geom/geom_pc98.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_slice.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_slice.h#4 integrate ... //depot/projects/smpng/sys/geom/geom_subr.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_sunlabel.c#5 integrate ... //depot/projects/smpng/sys/i386/conf/GENERIC#18 integrate ... //depot/projects/smpng/sys/i386/conf/NEWCARD#12 integrate ... //depot/projects/smpng/sys/i386/conf/NOTES#34 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#35 integrate ... //depot/projects/smpng/sys/i386/include/md_var.h#10 integrate ... //depot/projects/smpng/sys/i386/include/uc_device.h#2 delete ... //depot/projects/smpng/sys/i386/isa/isa_device.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#6 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#34 integrate ... //depot/projects/smpng/sys/ia64/ia64/ssc.c#8 integrate ... //depot/projects/smpng/sys/ia64/include/ia64_cpu.h#7 integrate ... //depot/projects/smpng/sys/isa/pnpreg.h#2 integrate ... //depot/projects/smpng/sys/kern/imgact_aout.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_acct.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#30 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#34 integrate ... //depot/projects/smpng/sys/kern/kern_intr.c#15 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#25 integrate ... //depot/projects/smpng/sys/kern/subr_disk.c#9 integrate ... //depot/projects/smpng/sys/kern/sys_process.c#12 integrate ... //depot/projects/smpng/sys/kern/vfs_cache.c#11 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#35 integrate ... //depot/projects/smpng/sys/kern/vfs_vnops.c#22 integrate ... //depot/projects/smpng/sys/netinet/in.h#9 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.c#23 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.h#10 integrate ... //depot/projects/smpng/sys/netinet/ip_divert.c#13 integrate ... //depot/projects/smpng/sys/pc98/conf/GENERIC#18 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#31 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#22 integrate ... //depot/projects/smpng/sys/sparc64/conf/GENERIC#10 integrate ... //depot/projects/smpng/sys/sparc64/include/emul.h#1 branch ... //depot/projects/smpng/sys/sparc64/include/frame.h#10 integrate ... //depot/projects/smpng/sys/sparc64/include/reg.h#9 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#10 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/emul.c#3 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#25 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/trap.c#31 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#18 integrate ... //depot/projects/smpng/sys/sys/bio.h#7 integrate ... //depot/projects/smpng/sys/sys/disk.h#6 integrate ... //depot/projects/smpng/sys/sys/ioccom.h#4 integrate ... //depot/projects/smpng/sys/vm/uma_int.h#6 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#40 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.175 2002/04/07 21:01:34 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.176 2002/04/09 11:18:26 phk Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -278,18 +278,6 @@ vm_ksubmap_init(&kmi); -#if defined(USERCONFIG) -#if defined(USERCONFIG_BOOT) - if (1) -#else - if (boothowto & RB_CONFIG) -#endif - { - userconfig(); - cninit(); /* the preferred console may have changed */ - } -#endif - printf("avail memory = %ld (%ldK bytes)\n", ptoa(cnt.v_free_count), ptoa(cnt.v_free_count) / 1024); ==== //depot/projects/smpng/sys/boot/common/load_elf.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.22 2002/04/06 04:09:42 peter Exp $ + * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.23 2002/04/09 00:05:46 jake Exp $ */ #include @@ -622,7 +622,7 @@ elf_lookup_symbol(struct preloaded_file *fp, elf_file_t ef, const char* name, Elf_Sym *symp) { - unsigned long symnum; + Elf_Hashelt symnum; Elf_Sym sym; char *strp; unsigned long hash; ==== //depot/projects/smpng/sys/boot/ficl/Makefile#2 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.26 2001/04/29 02:36:33 dcs Exp $ +# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.27 2002/04/09 17:45:11 dcs Exp $ # .PATH: ${.CURDIR}/${MACHINE_ARCH} -BASE_SRCS= dict.c ficl.c math64.c search.c stack.c tools.c \ - prefix.c loader.c vm.c words.c +BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ + prefix.c search.c stack.c tools.c vm.c words.c + SRCS= ${BASE_SRCS} sysdep.c softcore.c CLEANFILES= softcore.c testmain testmain.o .if ${MACHINE_ARCH} == "alpha" ==== //depot/projects/smpng/sys/boot/ficl/alpha/sysdep.h#2 (text+ko) ==== @@ -9,7 +9,7 @@ ** FICL_ROBUST is enabled. This may require some consideration ** in firmware systems since assert often ** assumes stderr/stdout. -** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $ +** $Id: sysdep.h,v 1.11 2001/12/05 07:21:34 jsadler Exp $ *******************************************************************/ /* ** Copyright (c) 1997-2001 John Sadler (john_sadler@alum.mit.edu) @@ -17,6 +17,11 @@ ** ** Get the latest Ficl release at http://ficl.sourceforge.net ** +** I am interested in hearing from anyone who uses ficl. If you have +** a problem, a success story, a defect, an enhancement request, or +** if you would like to contribute to the ficl release, please +** contact me by email at the address above. +** ** L I C E N S E and D I S C L A I M E R ** ** Redistribution and use in source and binary forms, with or without @@ -39,16 +44,9 @@ ** 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. -** -** I am interested in hearing from anyone who uses ficl. If you have -** a problem, a success story, a defect, an enhancement request, or -** if you would like to contribute to the ficl release, please send -** contact me by email at the address above. -** -** $Id: sysdep.h,v 1.6 2001-04-26 21:41:55-07 jsadler Exp jsadler $ */ -/* $FreeBSD: src/sys/boot/ficl/alpha/sysdep.h,v 1.7 2001/04/29 02:36:35 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/alpha/sysdep.h,v 1.8 2002/04/09 17:45:22 dcs Exp $ */ #if !defined (__SYSDEP_H__) #define __SYSDEP_H__ @@ -75,7 +73,6 @@ #define FALSE 0 #endif - /* ** System dependent data type declarations... */ @@ -162,6 +159,7 @@ #endif #if (FICL_MINIMAL) #define FICL_WANT_SOFTWORDS 0 +#define FICL_WANT_FILE 0 #define FICL_WANT_FLOAT 0 #define FICL_WANT_USER 0 #define FICL_WANT_LOCALS 0 @@ -181,6 +179,17 @@ #define FICL_PLATFORM_EXTEND 1 #endif + +/* +** FICL_WANT_FILE +** Includes the FILE and FILE-EXT wordset and associated code. Turn this off if you do not +** have a file system! +** Contributed by Larry Hastings +*/ +#if !defined (FICL_WANT_FILE) +#define FICL_WANT_FILE 0 +#endif + /* ** FICL_WANT_FLOAT ** Includes a floating point stack for the VM, and words to do float operations. @@ -199,6 +208,14 @@ #endif /* +** FICL_EXTENDED_PREFIX enables a bunch of extra prefixes in prefix.c and prefix.fr (if +** included as part of softcore.c) +*/ +#if !defined FICL_EXTENDED_PREFIX +#define FICL_EXTENDED_PREFIX 0 +#endif + +/* ** User variables: per-instance variables bound to the VM. ** Kinda like thread-local storage. Could be implemented in a ** VM private dictionary, but I've chosen the lower overhead @@ -341,14 +358,6 @@ #endif /* -** FICL_EXTENDED_PREFIX enables a bunch of extra prefixes in prefix.c and prefix.fr (if -** included as part of softcore.c) -*/ -#if !defined FICL_EXTENDED_PREFIX -#define FICL_EXTENDED_PREFIX 0 -#endif - -/* ** FICL_ALIGN is the power of two to which the dictionary ** pointer address must be aligned. This value is usually ** either 1 or 2, depending on the memory architecture @@ -409,4 +418,15 @@ DPUNS ficlLongMul(FICL_UNS x, FICL_UNS y); UNSQR ficlLongDiv(DPUNS q, FICL_UNS y); + +/* +** FICL_HAVE_FTRUNCATE indicates whether the current OS supports +** the ftruncate() function (available on most UNIXes). This +** function is necessary to provide the complete File-Access wordset. +*/ +#if !defined (FICL_HAVE_FTRUNCATE) +#define FICL_HAVE_FTRUNCATE 0 +#endif + + #endif /*__SYSDEP_H__*/ ==== //depot/projects/smpng/sys/boot/ficl/dict.c#2 (text+ko) ==== @@ -3,7 +3,7 @@ ** Forth Inspired Command Language - dictionary methods ** Author: John Sadler (john_sadler@alum.mit.edu) ** Created: 19 July 1997 -** $Id: dict.c,v 1.6 2000-06-17 07:43:44-07 jsadler Exp jsadler $ +** $Id: dict.c,v 1.14 2001/12/05 07:21:34 jsadler Exp $ *******************************************************************/ /* ** This file implements the dictionary -- FICL's model of @@ -22,6 +22,11 @@ ** ** Get the latest Ficl release at http://ficl.sourceforge.net ** +** I am interested in hearing from anyone who uses ficl. If you have +** a problem, a success story, a defect, an enhancement request, or +** if you would like to contribute to the ficl release, please +** contact me by email at the address above. +** ** L I C E N S E and D I S C L A I M E R ** ** Redistribution and use in source and binary forms, with or without @@ -44,20 +49,12 @@ ** 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. -** -** I am interested in hearing from anyone who uses ficl. If you have -** a problem, a success story, a defect, an enhancement request, or -** if you would like to contribute to the ficl release, please send -** contact me by email at the address above. -** -** $Id: dict.c,v 1.8 2001-04-26 21:41:45-07 jsadler Exp jsadler $ */ -/* $FreeBSD: src/sys/boot/ficl/dict.c,v 1.12 2001/05/29 23:44:12 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/dict.c,v 1.13 2002/04/09 17:45:11 dcs Exp $ */ #ifdef TESTMAIN #include -#include #include #else #include @@ -304,16 +301,19 @@ /************************************************************************** d i c t C h e c k ** Checks the dictionary for corruption and throws appropriate -** errors +** errors. +** Input: +n number of ADDRESS UNITS (not Cells) proposed to allot +** -n number of ADDRESS UNITS proposed to de-allot +** 0 just do a consistency check **************************************************************************/ -void dictCheck(FICL_DICT *pDict, FICL_VM *pVM, int nCells) +void dictCheck(FICL_DICT *pDict, FICL_VM *pVM, int n) { - if ((nCells >= 0) && (dictCellsAvail(pDict) < nCells)) + if ((n >= 0) && (dictCellsAvail(pDict) * (int)sizeof(CELL) < n)) { vmThrowErr(pVM, "Error: dictionary full"); } - if ((nCells <= 0) && (dictCellsUsed(pDict) < -nCells)) + if ((n <= 0) && (dictCellsUsed(pDict) * (int)sizeof(CELL) < -n)) { vmThrowErr(pVM, "Error: dictionary underflow"); } @@ -396,6 +396,7 @@ memset(pDict, 0, sizeof (FICL_DICT)); pDict->dict = ficlMalloc(nAlloc); assert(pDict->dict); + pDict->size = nCells; dictEmpty(pDict, nHash); return pDict; @@ -460,6 +461,84 @@ /************************************************************************** + d i c t H a s h S u m m a r y +** Calculate a figure of merit for the dictionary hash table based +** on the average search depth for all the words in the dictionary, +** assuming uniform distribution of target keys. The figure of merit +** is the ratio of the total search depth for all keys in the table +** versus a theoretical optimum that would be achieved if the keys +** were distributed into the table as evenly as possible. +** The figure would be worse if the hash table used an open +** addressing scheme (i.e. collisions resolved by searching the +** table for an empty slot) for a given size table. +**************************************************************************/ +#if FICL_WANT_FLOAT +void dictHashSummary(FICL_VM *pVM) +{ + FICL_DICT *dp = vmGetDict(pVM); + FICL_HASH *pFHash; + FICL_WORD **pHash; + unsigned size; + FICL_WORD *pFW; + unsigned i; + int nMax = 0; + int nWords = 0; + int nFilled; + double avg = 0.0; + double best; + int nAvg, nRem, nDepth; + + dictCheck(dp, pVM, 0); + + pFHash = dp->pSearch[dp->nLists - 1]; + pHash = pFHash->table; + size = pFHash->size; + nFilled = size; + + for (i = 0; i < size; i++) + { + int n = 0; + pFW = pHash[i]; + + while (pFW) + { + ++n; + ++nWords; + pFW = pFW->link; + } + + avg += (double)(n * (n+1)) / 2.0; + + if (n > nMax) + nMax = n; + if (n == 0) + --nFilled; + } + + /* Calc actual avg search depth for this hash */ + avg = avg / nWords; + + /* Calc best possible performance with this size hash */ + nAvg = nWords / size; + nRem = nWords % size; + nDepth = size * (nAvg * (nAvg+1))/2 + (nAvg+1)*nRem; + best = (double)nDepth/nWords; + + sprintf(pVM->pad, + "%d bins, %2.0f%% filled, Depth: Max=%d, Avg=%2.1f, Best=%2.1f, Score: %2.0f%%", + size, + (double)nFilled * 100.0 / size, nMax, + avg, + best, + 100.0 * best / avg); + + ficlTextOut(pVM, pVM->pad, 1); + + return; +} +#endif + +/************************************************************************** d i c t I n c l u d e s ** Returns TRUE iff the given pointer is within the address range of ** the dictionary. @@ -471,7 +550,6 @@ ); } - /************************************************************************** d i c t L o o k u p ** Find the FICL_WORD that matches the given name and length. @@ -501,15 +579,16 @@ /************************************************************************** - d i c t L o o k u p L o c + f i c l L o o k u p L o c ** Same as dictLookup, but looks in system locals dictionary first... ** Assumes locals dictionary has only one wordlist... **************************************************************************/ #if FICL_WANT_LOCALS -FICL_WORD *dictLookupLoc(FICL_DICT *pDict, STRINGINFO si) +FICL_WORD *ficlLookupLoc(FICL_SYSTEM *pSys, STRINGINFO si) { FICL_WORD *pFW = NULL; - FICL_HASH *pHash = ficlGetLoc()->pForthWords; + FICL_DICT *pDict = pSys->dp; + FICL_HASH *pHash = ficlGetLoc(pSys)->pForthWords; int i; UNS16 hashCode = hashHashCode(si); ==== //depot/projects/smpng/sys/boot/ficl/ficl.c#2 (text+ko) ==== @@ -3,7 +3,7 @@ ** Forth Inspired Command Language - external interface ** Author: John Sadler (john_sadler@alum.mit.edu) ** Created: 19 July 1997 -** $Id: ficl.c,v 1.10 2001-04-26 21:41:42-07 jsadler Exp jsadler $ +** $Id: ficl.c,v 1.16 2001/12/05 07:21:34 jsadler Exp $ *******************************************************************/ /* ** This is an ANS Forth interpreter written in C. @@ -26,6 +26,11 @@ ** ** Get the latest Ficl release at http://ficl.sourceforge.net ** +** I am interested in hearing from anyone who uses ficl. If you have +** a problem, a success story, a defect, an enhancement request, or +** if you would like to contribute to the ficl release, please +** contact me by email at the address above. +** ** L I C E N S E and D I S C L A I M E R ** ** Redistribution and use in source and binary forms, with or without @@ -48,16 +53,9 @@ ** 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. -** -** I am interested in hearing from anyone who uses ficl. If you have -** a problem, a success story, a defect, an enhancement request, or -** if you would like to contribute to the ficl release, please send -** contact me by email at the address above. -** -** $Id: ficl.c,v 1.10 2001-04-26 21:41:42-07 jsadler Exp jsadler $ */ -/* $FreeBSD: src/sys/boot/ficl/ficl.c,v 1.17 2001/04/29 02:36:33 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/ficl.c,v 1.18 2002/04/09 17:45:11 dcs Exp $ */ #ifdef TESTMAIN #include @@ -70,19 +68,19 @@ /* ** System statics -** The system builds a global dictionary during its start -** sequence. This is shared by all interpreter instances. -** Therefore only one instance can update the dictionary +** Each FICL_SYSTEM builds a global dictionary during its start +** sequence. This is shared by all virtual machines of that system. +** Therefore only one VM can update the dictionary ** at a time. The system imports a locking function that ** you can override in order to control update access to ** the dictionary. The function is stubbed out by default, ** but you can insert one: #define FICL_MULTITHREAD 1 ** and supply your own version of ficlLockDictionary. */ -static FICL_SYSTEM *pSys = NULL; +static int defaultStack = FICL_DEFAULT_STACK; + -static int defaultStack = FICL_DEFAULT_STACK; -static int defaultDict = FICL_DEFAULT_DICT; +static void ficlSetVersionEnv(FICL_SYSTEM *pSys); /************************************************************************** @@ -96,67 +94,94 @@ ** precompiled part. Try 1K cells minimum. Use "words" to find ** out how much of the dictionary is used at any time. **************************************************************************/ -void ficlInitSystem(int nDictCells) +FICL_SYSTEM *ficlInitSystemEx(FICL_SYSTEM_INFO *fsi) { - pSys = ficlMalloc(sizeof (FICL_SYSTEM)); + int nDictCells; + int nEnvCells; + FICL_SYSTEM *pSys = ficlMalloc(sizeof (FICL_SYSTEM)); + assert(pSys); + assert(fsi->size == sizeof (FICL_SYSTEM_INFO)); memset(pSys, 0, sizeof (FICL_SYSTEM)); + nDictCells = fsi->nDictCells; if (nDictCells <= 0) - nDictCells = defaultDict; + nDictCells = FICL_DEFAULT_DICT; + + nEnvCells = fsi->nEnvCells; + if (nEnvCells <= 0) + nEnvCells = FICL_DEFAULT_DICT; pSys->dp = dictCreateHashed((unsigned)nDictCells, HASHSIZE); pSys->dp->pForthWords->name = "forth-wordlist"; - pSys->envp = dictCreate((unsigned)FICL_DEFAULT_ENV); + pSys->envp = dictCreate((unsigned)nEnvCells); pSys->envp->pForthWords->name = "environment"; + pSys->textOut = fsi->textOut; + pSys->pExtend = fsi->pExtend; + #if FICL_WANT_LOCALS /* ** The locals dictionary is only searched while compiling, ** but this is where speed is most important. On the other ** hand, the dictionary gets emptied after each use of locals - ** The need to balance search speed with the cost of the empty + ** The need to balance search speed with the cost of the 'empty' ** operation led me to select a single-threaded list... */ pSys->localp = dictCreate((unsigned)FICL_MAX_LOCALS * CELLS_PER_WORD); #endif /* - ** Establish the parse order. Note that prefixes precede numbers - - ** this allows constructs like "0b101010" which would parse as a - ** valid hex value otherwise. - */ - ficlCompilePrefix(pSys); - ficlAddPrecompiledParseStep(pSys, "number?", ficlParseNumber); - - /* ** Build the precompiled dictionary and load softwords. We need a temporary ** VM to do this - ficlNewVM links one to the head of the system VM list. ** ficlCompilePlatform (defined in win32.c, for example) adds platform specific words. */ ficlCompileCore(pSys); + ficlCompilePrefix(pSys); #if FICL_WANT_FLOAT ficlCompileFloat(pSys); #endif - #if FICL_PLATFORM_EXTEND ficlCompilePlatform(pSys); #endif + ficlSetVersionEnv(pSys); + + /* + ** Establish the parse order. Note that prefixes precede numbers - + ** this allows constructs like "0b101010" which might parse as a + ** hex value otherwise. + */ + ficlAddPrecompiledParseStep(pSys, "?prefix", ficlParsePrefix); + ficlAddPrecompiledParseStep(pSys, "?number", ficlParseNumber); +#if FICL_WANT_FLOAT + ficlAddPrecompiledParseStep(pSys, ">float", ficlParseFloatNumber); +#endif /* - ** Now we can create a VM to compile the softwords. Note that the VM initialization - ** code needs to be able to find "interpret" in the dictionary in order to - ** succeed, so as presently constructed ficlCompileCore has to finish before - ** a VM can be created successfully. + ** Now create a temporary VM to compile the softwords. Since all VMs are + ** linked into the vmList of FICL_SYSTEM, we don't have to pass the VM + ** to ficlCompileSoftCore -- it just hijacks whatever it finds in the VM list. + ** ficl 2.05: vmCreate no longer depends on the presence of INTERPRET in the + ** dictionary, so a VM can be created before the dictionary is built. It just + ** can't do much... */ - ficlNewVM(); + ficlNewVM(pSys); ficlCompileSoftCore(pSys); ficlFreeVM(pSys->vmList); - return; + return pSys; +} + + +FICL_SYSTEM *ficlInitSystem(int nDictCells) +{ + FICL_SYSTEM_INFO fsi; + ficlInitInfo(&fsi); + fsi.nDictCells = nDictCells; + return ficlInitSystemEx(&fsi); } @@ -226,11 +251,13 @@ ** Create a new virtual machine and link it into the system list ** of VMs for later cleanup by ficlTermSystem. **************************************************************************/ -FICL_VM *ficlNewVM(void) +FICL_VM *ficlNewVM(FICL_SYSTEM *pSys) { FICL_VM *pVM = vmCreate(NULL, defaultStack, defaultStack); pVM->link = pSys->vmList; pVM->pSys = pSys; + pVM->pExtend = pSys->pExtend; + vmSetTextOut(pVM, pSys->textOut); pSys->vmList = pVM; return pVM; @@ -246,6 +273,7 @@ **************************************************************************/ void ficlFreeVM(FICL_VM *pVM) { + FICL_SYSTEM *pSys = pVM->pSys; FICL_VM *pList = pSys->vmList; assert(pVM != 0); @@ -284,10 +312,12 @@ ** flags -- 0 or more of F_IMMEDIATE, F_COMPILE, use bitwise OR! ** **************************************************************************/ -int ficlBuild(char *name, FICL_CODE code, char flags) +int ficlBuild(FICL_SYSTEM *pSys, char *name, FICL_CODE code, char flags) { +#if FICL_MULTITHREAD int err = ficlLockDictionary(TRUE); if (err) return err; +#endif /* FICL_MULTITHREAD */ assert(dictCellsAvail(pSys->dp) > sizeof (FICL_WORD) / sizeof (CELL)); dictAppendWord(pSys->dp, name, code, flags); @@ -298,6 +328,21 @@ /************************************************************************** + f i c l E v a l u a t e +** Wrapper for ficlExec() which sets SOURCE-ID to -1. +**************************************************************************/ +int ficlEvaluate(FICL_VM *pVM, char *pText) +{ + int returnValue; + CELL id = pVM->sourceID; + pVM->sourceID.i = -1; + returnValue = ficlExecC(pVM, pText, -1); + pVM->sourceID = id; + return returnValue; +} + + +/************************************************************************** f i c l E x e c ** Evaluates a block of input text in the context of the ** specified interpreter. Emits any requested output to the @@ -322,23 +367,16 @@ int ficlExecC(FICL_VM *pVM, char *pText, FICL_INT size) { - FICL_WORD **pInterp = pSys->pInterp; - FICL_DICT *dp = pSys->dp; + FICL_SYSTEM *pSys = pVM->pSys; + FICL_DICT *dp = pSys->dp; int except; jmp_buf vmState; jmp_buf *oldState; TIB saveTib; - if (!pInterp[0]) - { - pInterp[0] = ficlLookup("interpret"); - pInterp[1] = ficlLookup("(branch)"); - pInterp[2] = (FICL_WORD *)(void *)(-2); - } - - assert(pInterp[0]); assert(pVM); + assert(pSys->pInterp[0]); if (size < 0) size = strlen(pText); @@ -362,7 +400,7 @@ } else { /* set VM up to interpret text */ - vmPushIP(pVM, &pInterp[0]); + vmPushIP(pVM, &(pSys->pInterp[0])); } vmInnerLoop(pVM); @@ -438,17 +476,13 @@ **************************************************************************/ int ficlExecXT(FICL_VM *pVM, FICL_WORD *pWord) { - static FICL_WORD *pQuit = NULL; int except; jmp_buf vmState; jmp_buf *oldState; FICL_WORD *oldRunningWord; - if (!pQuit) - pQuit = ficlLookup("exit-inner"); - assert(pVM); - assert(pQuit); + assert(pVM->pSys->pExitInner); /* ** Save the runningword so that RESTART behaves correctly @@ -465,7 +499,7 @@ if (except) vmPopIP(pVM); else - vmPushIP(pVM, &pQuit); + vmPushIP(pVM, &(pVM->pSys->pExitInner)); switch (except) { @@ -506,7 +540,7 @@ ** found, return the address of the corresponding FICL_WORD. Otherwise ** return NULL. **************************************************************************/ -FICL_WORD *ficlLookup(char *name) +FICL_WORD *ficlLookup(FICL_SYSTEM *pSys, char *name) { STRINGINFO si; SI_PSZ(si, name); @@ -518,7 +552,7 @@ f i c l G e t D i c t ** Returns the address of the system dictionary **************************************************************************/ -FICL_DICT *ficlGetDict(void) +FICL_DICT *ficlGetDict(FICL_SYSTEM *pSys) { return pSys->dp; } @@ -528,7 +562,7 @@ f i c l G e t E n v ** Returns the address of the system environment space **************************************************************************/ -FICL_DICT *ficlGetEnv(void) +FICL_DICT *ficlGetEnv(FICL_SYSTEM *pSys) { return pSys->envp; } @@ -539,7 +573,7 @@ ** Create an environment variable with a one-CELL payload. ficlSetEnvD ** makes one with a two-CELL payload. **************************************************************************/ -void ficlSetEnv(char *name, FICL_UNS value) +void ficlSetEnv(FICL_SYSTEM *pSys, char *name, FICL_UNS value) { STRINGINFO si; FICL_WORD *pFW; @@ -561,7 +595,7 @@ return; } -void ficlSetEnvD(char *name, FICL_UNS hi, FICL_UNS lo) +void ficlSetEnvD(FICL_SYSTEM *pSys, char *name, FICL_UNS hi, FICL_UNS lo) { FICL_WORD *pFW; STRINGINFO si; @@ -591,7 +625,7 @@ ** only used during compilation, and is shared by all VMs. **************************************************************************/ #if FICL_WANT_LOCALS -FICL_DICT *ficlGetLoc(void) +FICL_DICT *ficlGetLoc(FICL_SYSTEM *pSys) { return pSys->localp; } @@ -620,7 +654,7 @@ ** Tear the system down by deleting the dictionaries and all VMs. ** This saves you from having to keep track of all that stuff. **************************************************************************/ -void ficlTermSystem(void) +void ficlTermSystem(FICL_SYSTEM *pSys) { if (pSys->dp) dictDelete(pSys->dp); @@ -649,3 +683,14 @@ } +/************************************************************************** + f i c l S e t V e r s i o n E n v +** Create a double cell environment constant for the version ID +**************************************************************************/ +static void ficlSetVersionEnv(FICL_SYSTEM *pSys) +{ + ficlSetEnvD(pSys, "ficl-version", FICL_VER_MAJOR, FICL_VER_MINOR); + ficlSetEnv (pSys, "ficl-robust", FICL_ROBUST); + return; +} + ==== //depot/projects/smpng/sys/boot/ficl/ficl.h#2 (text+ko) ==== @@ -3,7 +3,8 @@ ** Forth Inspired Command Language ** Author: John Sadler (john_sadler@alum.mit.edu) ** Created: 19 July 1997 -** $Id: ficl.h,v 1.11 2001-04-26 21:41:48-07 jsadler Exp jsadler $ +** Dedicated to RHS, in loving memory +** $Id: ficl.h,v 1.18 2001/12/05 07:21:34 jsadler Exp $ *******************************************************************/ /* ** Copyright (c) 1997-2001 John Sadler (john_sadler@alum.mit.edu) @@ -11,6 +12,11 @@ ** ** Get the latest Ficl release at http://ficl.sourceforge.net ** +** I am interested in hearing from anyone who uses ficl. If you have +** a problem, a success story, a defect, an enhancement request, or +** if you would like to contribute to the ficl release, please +** contact me by email at the address above. +** ** L I C E N S E and D I S C L A I M E R ** ** Redistribution and use in source and binary forms, with or without @@ -33,16 +39,9 @@ ** 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. -** -** I am interested in hearing from anyone who uses ficl. If you have -** a problem, a success story, a defect, an enhancement request, or -** if you would like to contribute to the ficl release, please send -** contact me by email at the address above. -** -** $Id: ficl.h,v 1.11 2001-04-26 21:41:48-07 jsadler Exp jsadler $ */ -/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.19 2001/05/29 23:44:12 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/ficl.h,v 1.20 2002/04/09 17:45:11 dcs Exp $ */ #if !defined (__FICL_H__) #define __FICL_H__ @@ -125,17 +124,14 @@ ** T o D o L i s t ** ** 1. Unimplemented system dependent CORE word: key -** 2. Kludged CORE word: ACCEPT -** 3. Dictionary locking is full of holes - only one vm at a time -** can alter the dict. -** 4. Ficl uses the pad in CORE words - this violates the standard, +** 2. Ficl uses the PAD in some CORE words - this violates the standard, ** but it's cleaner for a multithreaded system. I'll have to make a ** second pad for reference by the word PAD to fix this. ** ** F o r M o r e I n f o r m a t i o n ** ** Web home of ficl -** http://www.taygeta.com/forth/compilers +** http://ficl.sourceforge.net ** Check this website for Forth literature (including the ANSI standard) ** http://www.taygeta.com/forthlit.html ** and here for software and more links @@ -154,7 +150,7 @@ ** - Make the main hash table a bigger prime (HASHSIZE) ** - FORGET about twiddling the hash function - my experience is ** that that is a waste of time. -** - eliminate the need to pass the pVM parameter on the stack +** - Eliminate the need to pass the pVM parameter on the stack ** by dedicating a register to it. Most words need access to the ** vm, but the parameter passing overhead can be reduced. One way ** requires that the host OS have a task switch callout. Create @@ -228,15 +224,22 @@ ** Forward declarations... read on. */ struct ficl_word; +typedef struct ficl_word FICL_WORD; struct vm; +typedef struct vm FICL_VM; struct ficl_dict; +typedef struct ficl_dict FICL_DICT; struct ficl_system; typedef struct ficl_system FICL_SYSTEM; +struct ficl_system_info; +typedef struct ficl_system_info FICL_SYSTEM_INFO; /* ** the Good Stuff starts here... */ -#define FICL_VER "2.05" +#define FICL_VER "3.02" +#define FICL_VER_MAJOR 3 +#define FICL_VER_MINOR 2 #if !defined (FICL_PROMPT) #define FICL_PROMPT "ok> " #endif @@ -254,7 +257,8 @@ /* ** A CELL is the main storage type. It must be large enough ** to contain a pointer or a scalar. In order to accommodate -** 32 bit and 64 bit processors, use abstract types for i and u. +** 32 bit and 64 bit processors, use abstract types for int, +** unsigned, and float. */ typedef union _cell { @@ -268,7 +272,7 @@ } CELL; /* -** LVALUEtoCELL does a little pointer trickery to cast any 32 bit +** LVALUEtoCELL does a little pointer trickery to cast any CELL sized ** lvalue (informal definition: an expression whose result has an ** address) to CELL. Remember that constants and casts are NOT ** themselves lvalues! @@ -363,59 +367,59 @@ /* ** Stack methods... many map closely to required Forth words. */ -FICL_STACK *stackCreate(unsigned nCells); -void stackDelete(FICL_STACK *pStack); -int stackDepth (FICL_STACK *pStack); -void stackDrop (FICL_STACK *pStack, int n); -CELL stackFetch (FICL_STACK *pStack, int n); -CELL stackGetTop(FICL_STACK *pStack); -void stackLink (FICL_STACK *pStack, int nCells); -void stackPick (FICL_STACK *pStack, int n); -CELL stackPop (FICL_STACK *pStack); -void *stackPopPtr(FICL_STACK *pStack); -FICL_UNS stackPopUNS(FICL_STACK *pStack); -FICL_INT stackPopINT(FICL_STACK *pStack); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 13:49: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0566437B416; Tue, 9 Apr 2002 13:49:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EF18A37B404 for ; Tue, 9 Apr 2002 13:49:02 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g39Kn2l38137 for perforce@freebsd.org; Tue, 9 Apr 2002 13:49:02 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 9 Apr 2002 13:49:02 -0700 (PDT) Message-Id: <200204092049.g39Kn2l38137@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9468 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9468 Change 9468 by jhb@jhb_laptop on 2002/04/09 13:48:56 Bah, remove the lock of Giant at the start of settimeofday(). Reported by: panic on deimos Affected files ... ... //depot/projects/smpng/sys/kern/kern_time.c#12 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_time.c#12 (text+ko) ==== @@ -363,8 +363,6 @@ struct timezone atz; int error = 0; - mtx_lock(&Giant); - if ((error = suser(td))) return (error); /* Verify all parameters before changing time. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 14: 7:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8485137B404; Tue, 9 Apr 2002 14:07:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E14D137B400 for ; Tue, 9 Apr 2002 14:07:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g39L7PM46885 for perforce@freebsd.org; Tue, 9 Apr 2002 14:07:25 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Tue, 9 Apr 2002 14:07:25 -0700 (PDT) Message-Id: <200204092107.g39L7PM46885@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 9470 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9470 Change 9470 by arr@arr_shibby on 2002/04/09 14:06:25 - Remove audit_info and AINFO locking macros (design change) Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#12 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#12 (text+ko) ==== @@ -59,23 +59,6 @@ typedef void * audit_event_info_t; typedef struct timespec audit_time_t; -/* - * Holds audit system key references. - */ -struct audit_info { - struct mtx ai_mtx; - vm_zone_t ai_zone; - struct ucred *ai_cred; - struct vnode *ai_vp; - audit_id_t ai_id; - u_long ai_leased; - char *ai_lname; -}; - -#define AINFO_LOCK(a) mtx_lock(&(a)->ai_mtx) -#define AINFO_UNLOCK(a) mtx_unlock(&(a)->ai_mtx) -#define AINFO_ASSERT_OWNED(a) mtx_assert(&(a)->ai_mtx, MA_OWNED) - typedef struct audit_header { audit_status_t ah_evresult; unsigned short ah_v; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 15:15:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11EE637B405; Tue, 9 Apr 2002 15:14:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2817E37B404 for ; Tue, 9 Apr 2002 15:14:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g39MEkF62380 for perforce@freebsd.org; Tue, 9 Apr 2002 15:14:46 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Tue, 9 Apr 2002 15:14:46 -0700 (PDT) Message-Id: <200204092214.g39MEkF62380@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 9472 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9472 Change 9472 by arr@arr_shibby on 2002/04/09 15:14:08 - Various cleanups/cleandowns/changes to facilitate changing design. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#21 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#21 (text+ko) ==== @@ -45,148 +45,96 @@ #include #include -#include +#include #define AUDLOG "/var/log/audit" -void audit_write_thread(void *); -static __inline audit_record_t *audit_record_alloc(vm_zone_t, u_long *); -static __inline void audit_record_free(audit_record_t *, vm_zone_t, u_long *); -static __inline audit_id_t audit_record_generate_id(audit_id_t *); +static __inline audit_record_t *audit_record_alloc(uma_zone_t, u_long *); +static __inline void audit_record_free(audit_record_t *, uma_zone_t, u_long *); -static struct audit_info ainfo; +static struct mtx audit_mtx; static struct audit_record_list record_queue; -static struct mtx record_queue_mtx; - +static uma_zone_t record_zone; +static u_long record_leased; static int audit_shutdown_flag = 0; -static size_t pool_size = 32; +static int audit_id = 0; +static size_t pool_size = 32; -SYSCTL_DECL(_security); -SYSCTL_NODE(_security, OID_AUTO, audit, CTLFLAG_RW, 0, ""); - static __inline audit_record_t * -audit_record_alloc(vm_zone_t aizone, u_long *lease) +audit_record_alloc(uma_zone_t zone, u_long *lease) { *(u_long *)lease++; - return(zalloc(aizone)); + return(uma_zalloc(zone)); } static __inline void -audit_record_free(audit_record_t *ar, vm_zone_t aizone, u_long *lease) +audit_record_free(audit_record_t *ar, uma_zone_t zone, u_long *lease) { *(u_long *)lease--; - zfree(aizone, ar); -} - -static __inline -audit_id_t -audit_record_generate_id(audit_id_t *id) -{ - - return(*++id); + uma_zfree(zone, ar); } audit_record_t * -audit_record_init(int type, size_t evsz, struct audit_info *ai) +audit_record_init(int type, size_t evsz) { audit_record_t *rec; audit_header_t *h; - vm_zone_t z; + uma_zone_t z; audit_id_t *id; u_long *lease; - AINFO_LOCK(ai); - lease = &ai->ai_leased; - z = ai->ai_zone; - id = &ai->ai_id; - AINFO_UNLOCK(ai); + mtx_lock(&audit_mtx) + z = record_zone; + mtx_unlock(&audit_mtx) rec = audit_record_alloc(z, lease); bzero(rec, sizeof(*rec)); h = &rec->ar_hdr; h->ah_v = AUDIT_VERSION; - h->ah_id = audit_record_generate_id(id); + h->ah_id = id++; // prolly should be locked. h->ah_len = AUDIT_RECORD_SZ + evsz; h->ah_type = type; nanotime(&h->ah_evtime); return (rec); } - -/* - * Executed when the audit system is turned on. - */ void audit_init(void) { - struct vnode *vp; - struct audit_info *ai; - vm_zone_t zone; - char *sptr; - int err = 0; + uma_zone_t zone; - ai = &ainfo; - - bzero(ai, sizeof(*ai)); - mtx_init(&ai->ai_mtx, "audit info lock", 0, MTX_DEF); - - sptr = malloc(strlen(AUDLOG), M_TEMP, M_WAITOK|M_ZERO); - strcpy(sptr, AUDLOG); - - vp = audit_write_init(sptr, curthread, curthread->td_ucred); - if (vp == NULL) - panic("Unable to init audit system.\n"); - - zone = zinit("AUDIT", sizeof(audit_record_t), pool_size, 0, 4); + zone = uma_zinit("AUDIT", sizeof(audit_record_t), pool_size, 0, 4); if (zone == NULL) panic("audit_init: unable to init audit record zone"); - AINFO_LOCK(ai); - ai->ai_cred = curthread->td_ucred; - ai->ai_vp = vp; - ai->ai_zone = zone; - ai->ai_lname = sptr; - AINFO_UNLOCK(ai); + mtx_init(&audit_mtx, "audit lock", 0, MTX_DEF); + mtx_lock(&audit_mtx); + record_zone = zone; + TAILQ_INIT(&record_queue); + audit_shutdown_flag = 0; + mtx_unlock(&audit_mtx); - mtx_init(&record_queue_mtx, "audit record queue lock", MTX_DEF); - mtx_lock(&record_queue_mtx); - TAILQ_INIT(&record_queue); - mtx_unlock(&record_queue_mtx); + (void)kthread_create(&audit_write_thread, ai, NULL, RFNOWAIT, + "TrustedBSD audit write thread"); - audit_shutdown_flag = 0; - err = kthread_create(&audit_write_thread, ai, NULL, RFNOWAIT, - "TrustedBSD audit write thread"); } SYSINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_init, NULL); void audit_shutdown(void) { - struct vnode *vp; - struct audit_info *ai; - struct ucred *cred; - vm_zone_t zone = NULL; - char *ptr; + uma_zone_t zone; + mtx_lock(&audit_mtx); audit_shutdown_flag = 1; - ai = &ainfo; - - AINFO_LOCK(ai); - cred = ai->ai_cred; - vp = ai->ai_vp; - zone = ai->ai_zone; - ptr = ai->ai_lname; - AINFO_UNLOCK(ai); - mtx_destroy(&ai->ai_mtx); - free(ptr, M_TEMP); - bzero(ai, sizeof(*ai)); - audit_write_shutdown(vp, curthread, cred); /* curthread ok? */ - crfree(cred); - zdestroy(zone); + zone = record_zone; + mtx_unlock(&audit_mtx); + mtx_destroy(&audit_mtx); + uma_zdestroy(zone); } SYSUNINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_shutdown, NULL); @@ -194,122 +142,39 @@ audit_record_enqueue(audit_record_t *ar) { - mtx_lock(&record_queue_mtx); + mtx_lock(&audit_mtx); TAILQ_INSERT_TAIL(&record_queue, ar, ar_next); - mtx_unlock(&record_queue_mtx); - wakeup((caddr_t)&record_queue); + mtx_unlock(&audit_mtx); } -struct vnode * -audit_write_init(const char *path, struct thread *td, struct ucred **cred) -{ - struct nameidata ni; - struct ucred *cred = td->td_proc->p_ucred; - struct vnode *vp; - int err = 0, flag = O_CREAT | FWRITE | O_TRUNC | O_NOFOLLOW; - - *cred = crhold(cred); - bzero(&ni, sizeof(ni)); - NDINIT(&ni, LOOKUP, NOFOLLOW, UIO_SYSSPACE, path, td); - err = namei(&ni); - if (err != 0) - return (NULL); - err = vn_open(&ni, &flag, S_IRUSR | S_IWUSR); - if (err != 0) - return (NULL); - NDFREE(&ni, NDF_ONLY_PNBUF); - vp = ni.ni_vp; - VOP_UNLOCK(vp, 0, td); - return (vp); -} - -void -audit_write_shutdown(struct vnode *vp, struct thread *td, struct ucred *cred) -{ - - vn_close(vp, 0, cred, td); - crfree(cred); -} - int -audit_record_write(audit_record_t *ar, struct audit_info *ai, - struct thread *td) +audit_record_write(audit_record_t *ar) { - struct flock lf; - struct mount *mp; - struct ucred *cred; - struct uio u; - struct vnode *vp; - size_t len; - int err = 0; - KASSERT(ar != NULL, ("audit_record_write: audit record null")); - - AINFO_LOCK(ai); - cred = ai->ai_cred; - vp = ai->ai_vp; - AINFO_UNLOCK(ai); - - /* XXX */ - lf.l_whence = SEEK_SET; - lf.l_start = 0; - lf.l_len = 0; - lf.l_type = F_WRLCK; - err = VOP_ADVLOCK(vp, (caddr_t)td->td_proc, F_SETLK, &lf, F_FLOCK); - if (err != 0) - return (err); - - err = vn_start_write(vp, &mp, V_NOWAIT); - if (err != 0) - /* - * If we can't write to the audit file from kernel - * land, then something is wrong. In the future, - * this will be handled more cleanly and thorougly, - * but for now, we panic. - */ - panic("unable to write to audit log."); - - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); - uiomove((caddr_t)&ar, AUDIT_RECORD_SZ, &u); - len = ar->ar_hdr.ah_len - AUDIT_RECORD_SZ; - KASSERT(len != 0, ("audit_record_write: Bad audit record")); - VOP_WRITE(vp, &u, IO_APPEND|IO_UNIT|IO_NODELOCKED, - td->td_proc->p_ucred); - uiomove((caddr_t)&ar->ar_evinfo, len, &u); - VOP_WRITE(vp, &u, IO_APPEND|IO_UNIT|IO_NODELOCKED, - td->td_proc->p_ucred); - VOP_UNLOCK(vp, 0, td); - vn_finished_write(mp); - return (ar->ar_hdr.ah_len); + return (-1); } void audit_write_thread(void *arg) { audit_record_t *ar; - struct audit_info *ai = arg; u_long *lease; - vm_zone_t z; + uma_zone_t z; + /* + * XXX No locking strategy at the moment.. + */ for (;;) { ar = NULL; - mtx_lock(&record_queue_mtx); TAILQ_REMOVE(&record_queue, ar, ar_next); - mtx_unlock(&record_queue_mtx); - /* XXX Check flag here and hope it doesnt change. */ - if (audit_shutdown_flag) { - mtx_destroy(&record_queue_mtx); + /* Check flag here and hope it doesnt change. */ + if (audit_shutdown_flag) kthread_exit(0); - } - + if (ar) { - (void)audit_record_write(ar, NULL, NULL); - AINFO_LOCK(ai); - z = ai->ai_zone; - lease = &ai->ai_leased; - AINFO_UNLOCK(ai); + z = record_zone; + lease = &record_leased; audit_record_free(ar, z, lease); } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 15:57:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A84537B404; Tue, 9 Apr 2002 15:56:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B86AA37B400 for ; Tue, 9 Apr 2002 15:56:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g39Mubf68197 for perforce@freebsd.org; Tue, 9 Apr 2002 15:56:37 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 9 Apr 2002 15:56:37 -0700 (PDT) Message-Id: <200204092256.g39Mubf68197@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9474 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9474 Change 9474 by peter@peter_daintree on 2002/04/09 15:56:07 IFC @9473 - including trying to deal with obrien's NIH gcc ifdefs. It's probably still hosed. :-( Affected files ... ... //depot/projects/ia64/bin/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#5 integrate ... //depot/projects/ia64/gnu/lib/Makefile#4 integrate ... //depot/projects/ia64/gnu/lib/libreadline/readline/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/Makefile#7 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1obj/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1plus/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cccp/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/collect2/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/sort/sort.c#4 integrate ... //depot/projects/ia64/lib/csu/sparc64/Makefile#4 integrate ... //depot/projects/ia64/lib/libc/gen/getobjformat.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/strtofflags.c#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu.c#4 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_select.c#2 integrate ... //depot/projects/ia64/lib/libcrypt/crypt.3#3 integrate ... //depot/projects/ia64/lib/libedit/Makefile#2 integrate ... //depot/projects/ia64/lib/libstand/Makefile#6 integrate ... //depot/projects/ia64/libexec/lukemftpd/Makefile#4 integrate ... //depot/projects/ia64/libexec/tftpd/tftpd.c#4 integrate ... //depot/projects/ia64/release/Makefile#8 integrate ... //depot/projects/ia64/sbin/Makefile#8 integrate ... //depot/projects/ia64/sbin/dumpon/dumpon.8#3 integrate ... //depot/projects/ia64/sbin/dumpon/dumpon.c#5 integrate ... //depot/projects/ia64/sbin/kget/Makefile#3 delete ... //depot/projects/ia64/sbin/kget/kget.8#2 delete ... //depot/projects/ia64/sbin/kget/kget.c#2 delete ... //depot/projects/ia64/share/examples/etc/make.conf#6 integrate ... //depot/projects/ia64/share/man/man4/Makefile#7 integrate ... //depot/projects/ia64/share/man/man4/ip.4#2 integrate ... //depot/projects/ia64/share/man/man4/ng_etf.4#3 integrate ... //depot/projects/ia64/share/man/man7/hier.7#7 integrate ... //depot/projects/ia64/share/man/man8/intro.8#2 integrate ... //depot/projects/ia64/share/mk/bsd.libnames.mk#4 integrate ... //depot/projects/ia64/share/syscons/keymaps/uk.iso.kbd#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/machdep.c#11 integrate ... //depot/projects/ia64/sys/boot/common/interp_forth.c#4 integrate ... //depot/projects/ia64/sys/boot/common/load_elf.c#5 integrate ... //depot/projects/ia64/sys/boot/ficl/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/ficl/alpha/sysdep.h#2 integrate ... //depot/projects/ia64/sys/boot/ficl/dict.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/ficl.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/ficl.h#2 integrate ... //depot/projects/ia64/sys/boot/ficl/fileaccess.c#1 branch ... //depot/projects/ia64/sys/boot/ficl/float.c#1 branch ... //depot/projects/ia64/sys/boot/ficl/i386/sysdep.h#2 integrate ... //depot/projects/ia64/sys/boot/ficl/ia64/sysdep.h#2 integrate ... //depot/projects/ia64/sys/boot/ficl/loader.c#3 integrate ... //depot/projects/ia64/sys/boot/ficl/math64.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/math64.h#2 integrate ... //depot/projects/ia64/sys/boot/ficl/prefix.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/search.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/softwords/ficlclass.fr#1 branch ... //depot/projects/ia64/sys/boot/ficl/softwords/fileaccess.fr#1 branch ... //depot/projects/ia64/sys/boot/ficl/softwords/forml.fr#1 branch ... //depot/projects/ia64/sys/boot/ficl/softwords/ifbrack.fr#2 integrate ... //depot/projects/ia64/sys/boot/ficl/softwords/marker.fr#2 integrate ... //depot/projects/ia64/sys/boot/ficl/softwords/oo.fr#2 integrate ... //depot/projects/ia64/sys/boot/ficl/softwords/prefix.fr#2 integrate ... //depot/projects/ia64/sys/boot/ficl/softwords/softcore.fr#2 integrate ... //depot/projects/ia64/sys/boot/ficl/stack.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/testmain.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/tools.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/vm.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/words.c#2 integrate ... //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#6 integrate ... //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#4 integrate ... //depot/projects/ia64/sys/conf/NOTES#3 integrate ... //depot/projects/ia64/sys/conf/files#14 integrate ... //depot/projects/ia64/sys/conf/majors#4 integrate ... //depot/projects/ia64/sys/conf/options#9 integrate ... //depot/projects/ia64/sys/dev/eisa/eisaconf.c#2 integrate ... //depot/projects/ia64/sys/dev/fb/vga.c#2 integrate ... //depot/projects/ia64/sys/dev/kbd/atkbd.c#2 integrate ... //depot/projects/ia64/sys/dev/null/null.c#4 integrate ... //depot/projects/ia64/sys/dev/se/se_console.c#1 branch ... //depot/projects/ia64/sys/dev/se/sereg.h#1 branch ... //depot/projects/ia64/sys/dev/usb/usb.c#6 integrate ... //depot/projects/ia64/sys/geom/geom.h#5 integrate ... //depot/projects/ia64/sys/geom/geom_bsd.c#6 integrate ... //depot/projects/ia64/sys/geom/geom_dev.c#8 integrate ... //depot/projects/ia64/sys/geom/geom_disk.c#7 integrate ... //depot/projects/ia64/sys/geom/geom_io.c#4 integrate ... //depot/projects/ia64/sys/geom/geom_mbr.c#5 integrate ... //depot/projects/ia64/sys/geom/geom_pc98.c#3 integrate ... //depot/projects/ia64/sys/geom/geom_slice.c#7 integrate ... //depot/projects/ia64/sys/geom/geom_slice.h#4 integrate ... //depot/projects/ia64/sys/geom/geom_subr.c#5 integrate ... //depot/projects/ia64/sys/geom/geom_sunlabel.c#5 integrate ... //depot/projects/ia64/sys/i386/conf/GENERIC#8 integrate ... //depot/projects/ia64/sys/i386/conf/NEWCARD#5 integrate ... //depot/projects/ia64/sys/i386/conf/NOTES#13 integrate ... //depot/projects/ia64/sys/i386/i386/machdep.c#14 integrate ... //depot/projects/ia64/sys/i386/include/md_var.h#5 integrate ... //depot/projects/ia64/sys/i386/include/uc_device.h#2 delete ... //depot/projects/ia64/sys/i386/isa/isa_device.h#2 integrate ... //depot/projects/ia64/sys/i386/isa/pcvt/pcvt_drv.c#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#23 integrate ... //depot/projects/ia64/sys/ia64/ia64/ssc.c#4 integrate ... //depot/projects/ia64/sys/ia64/include/ia64_cpu.h#3 integrate ... //depot/projects/ia64/sys/isa/pnpreg.h#2 integrate ... //depot/projects/ia64/sys/kern/imgact_aout.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_acct.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_exit.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_fork.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_intr.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#10 integrate ... //depot/projects/ia64/sys/kern/subr_disk.c#6 integrate ... //depot/projects/ia64/sys/kern/sys_process.c#5 integrate ... //depot/projects/ia64/sys/kern/vfs_cache.c#6 integrate ... //depot/projects/ia64/sys/kern/vfs_syscalls.c#13 integrate ... //depot/projects/ia64/sys/kern/vfs_vnops.c#10 integrate ... //depot/projects/ia64/sys/netinet/in.h#7 integrate ... //depot/projects/ia64/sys/netinet/in_pcb.c#12 integrate ... //depot/projects/ia64/sys/netinet/in_pcb.h#8 integrate ... //depot/projects/ia64/sys/netinet/ip_divert.c#7 integrate ... //depot/projects/ia64/sys/pc98/conf/GENERIC#8 integrate ... //depot/projects/ia64/sys/pc98/i386/machdep.c#12 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#9 integrate ... //depot/projects/ia64/sys/sparc64/conf/GENERIC#7 integrate ... //depot/projects/ia64/sys/sparc64/include/emul.h#1 branch ... //depot/projects/ia64/sys/sparc64/include/frame.h#5 integrate ... //depot/projects/ia64/sys/sparc64/include/reg.h#4 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/db_trace.c#5 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/emul.c#3 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#11 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/trap.c#7 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#5 integrate ... //depot/projects/ia64/sys/sys/bio.h#7 integrate ... //depot/projects/ia64/sys/sys/disk.h#6 integrate ... //depot/projects/ia64/sys/sys/ioccom.h#4 integrate ... //depot/projects/ia64/sys/vm/uma_int.h#5 integrate ... //depot/projects/ia64/usr.bin/Makefile#16 integrate ... //depot/projects/ia64/usr.bin/awk/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/colldef/parse.y#4 integrate ... //depot/projects/ia64/usr.bin/colldef/scan.l#4 integrate ... //depot/projects/ia64/usr.bin/compress/compress.1#2 integrate ... //depot/projects/ia64/usr.bin/sort/Makefile#3 delete ... //depot/projects/ia64/usr.bin/vmstat/vmstat.c#6 integrate ... //depot/projects/ia64/usr.bin/xinstall/xinstall.c#6 integrate ... //depot/projects/ia64/usr.bin/yacc/closure.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/error.c#7 integrate ... //depot/projects/ia64/usr.bin/yacc/lalr.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/lr0.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/main.c#6 integrate ... //depot/projects/ia64/usr.bin/yacc/mkpar.c#7 integrate ... //depot/projects/ia64/usr.bin/yacc/output.c#6 integrate ... //depot/projects/ia64/usr.bin/yacc/reader.c#6 integrate ... //depot/projects/ia64/usr.bin/yacc/skeleton.c#4 integrate ... //depot/projects/ia64/usr.bin/yacc/symtab.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/verbose.c#6 integrate ... //depot/projects/ia64/usr.bin/yacc/warshall.c#5 integrate ... //depot/projects/ia64/usr.sbin/Makefile#11 integrate ... //depot/projects/ia64/usr.sbin/chown/chown.8#2 integrate ... //depot/projects/ia64/usr.sbin/timed/timed/timed.8#2 integrate ... //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.8#2 integrate Differences ... ==== //depot/projects/ia64/bin/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.19 2002/02/11 18:38:54 mike Exp $ +# $FreeBSD: src/bin/Makefile,v 1.20 2002/04/09 18:25:37 bmilekic Exp $ SUBDIR= cat \ chio \ @@ -22,7 +22,6 @@ pax \ ps \ pwd \ - rcp \ realpath \ rm \ rmdir \ @@ -33,6 +32,10 @@ sync \ test +.if !defined(NO_RCMNDS) +SUBDIR+=rcp +.endif + .if !defined(NO_TCSH) SUBDIR+=csh .endif ==== //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.11 2002/04/06 17:53:06 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.12 2002/04/09 02:09:14 gshapiro Exp $ sendmail 8.12.2 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ @@ -51,6 +51,8 @@ etc/mtree/BSD.include.dist etc/mtree/BSD.usr.dist etc/mtree/BSD.var.dist + etc/periodic/daily/440.status-mailq + etc/periodic/daily/500.queuerun etc/rc etc/sendmail/Makefile etc/sendmail/freebsd.mc ==== //depot/projects/ia64/gnu/lib/Makefile#4 (text+ko) ==== @@ -1,9 +1,14 @@ -# $FreeBSD: src/gnu/lib/Makefile,v 1.33 2002/01/07 19:27:50 jhb Exp $ +# $FreeBSD: src/gnu/lib/Makefile,v 1.35 2002/04/08 22:56:28 peter Exp $ -SUBDIR= libdialog libregex libreadline +.if !defined(NO_GCC) && ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64" +SUBDIR+= csu libgcc +.else +NO_CXX= yes +NO_OBJC=yes +NO_FORTRAN=yes +.endif -.if !defined(NO_GCC) -SUBDIR+= csu libgcc +SUBDIR+= libdialog libregex libreadline .if ${OBJFORMAT} == aout .if !defined(NOLIBC_R) ==== //depot/projects/ia64/gnu/lib/libreadline/readline/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libreadline/readline/Makefile,v 1.8 2001/04/21 22:05:33 ache Exp $ +# $FreeBSD: src/gnu/lib/libreadline/readline/Makefile,v 1.9 2002/04/09 13:02:26 ru Exp $ SUBDIR= doc @@ -14,8 +14,8 @@ INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \ rlstdc.h rlconf.h rltypedefs.h -DPADD+= $(LIBTERMCAP) -LDADD+= -ltermcap +DPADD= ${LIBNCURSES} +LDADD= -lncurses INCDIR= /usr/include/readline ==== //depot/projects/ia64/gnu/usr.bin/Makefile#7 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.58 2002/03/24 16:01:17 markm Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.61 2002/04/08 22:58:52 peter Exp $ -SUBDIR= awk bc cpio dc dialog diff diff3 gperf \ - grep groff gzip man patch ptx rcs sdiff send-pr tar texinfo +SUBDIR= awk bc cpio dc dialog diff diff3 \ + grep gzip man patch ptx rcs sdiff send-pr sort tar texinfo .if !defined(NO_BINUTILS) SUBDIR+=binutils @@ -21,6 +21,14 @@ .endif .endif +.if !defined(NO_GCC) && ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64" +SUBDIR+=cc +.endif + +.if !defined(NO_CXX) +SUBDIR+=gperf groff +.endif + .if !defined(NOPERL) && !defined(NO_PERL) && exists(${.CURDIR}/perl) SUBDIR+=perl .endif ==== //depot/projects/ia64/gnu/usr.bin/cc/cc/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.24 2001/03/27 14:58:37 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.25 2002/04/08 18:48:37 obrien Exp $ .include "../Makefile.inc" @@ -7,7 +7,7 @@ PROG= cc MAN= gcc.1 SRCS= gcc.c gccspec.c -NOSHARED?=yes +NOSHARED=yes LINKS= ${BINDIR}/cc ${BINDIR}/gcc MLINKS= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1 ==== //depot/projects/ia64/gnu/usr.bin/cc/cc1/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc1/Makefile,v 1.23 2002/04/04 19:26:12 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc1/Makefile,v 1.24 2002/04/08 18:48:37 obrien Exp $ .include "../Makefile.inc" @@ -10,7 +10,7 @@ SRCS+= c-decl.c c-lex.c BINDIR= /usr/libexec NOMAN= 1 -NOSHARED?=yes +NOSHARED=yes CFLAGS+= -I. ==== //depot/projects/ia64/gnu/usr.bin/cc/cc1obj/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc1obj/Makefile,v 1.17 2002/04/04 19:26:13 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc1obj/Makefile,v 1.18 2002/04/08 18:48:38 obrien Exp $ .include "../Makefile.inc" @@ -10,7 +10,7 @@ SRCS+= c-decl.c c-lex.c BINDIR= /usr/libexec NOMAN= 1 -NOSHARED?=yes +NOSHARED=yes CFLAGS+= -I${GCCDIR}/objc -I. ==== //depot/projects/ia64/gnu/usr.bin/cc/cc1plus/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc1plus/Makefile,v 1.24 2002/04/04 00:50:14 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc1plus/Makefile,v 1.25 2002/04/08 18:48:38 obrien Exp $ .include "../Makefile.inc" @@ -11,7 +11,7 @@ search.c semantics.c sig.c spew.c tree.c typeck.c typeck2.c xref.c BINDIR= /usr/libexec NOMAN= 1 -NOSHARED?=yes +NOSHARED=yes CFLAGS+= -I${GCCDIR}/cp -I. ==== //depot/projects/ia64/gnu/usr.bin/cc/cccp/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cccp/Makefile,v 1.20 2001/03/27 14:58:38 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cccp/Makefile,v 1.21 2002/04/08 18:48:38 obrien Exp $ .include "../Makefile.inc" @@ -8,7 +8,7 @@ SRCS= cccp.c cexp.y obstack.c prefix.c version.c YFLAGS= BINDIR= /usr/libexec -NOSHARED?=yes +NOSHARED=yes MAN= cccp.1 MLINKS= cccp.1 cpp.1 ==== //depot/projects/ia64/gnu/usr.bin/cc/collect2/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/collect2/Makefile,v 1.2 2002/04/06 23:12:46 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/collect2/Makefile,v 1.3 2002/04/08 18:48:38 obrien Exp $ .include "../Makefile.inc" @@ -8,7 +8,7 @@ SRCS= collect2.c cplus-dem.c tlink.c underscore.c BINDIR= /usr/libexec NOMAN= -NOSHARED?=yes +NOSHARED=yes DPADD+= ${LIBCC_INT} LDADD+= ${LIBCC_INT} ==== //depot/projects/ia64/gnu/usr.bin/sort/sort.c#4 (text+ko) ==== @@ -19,7 +19,7 @@ The author may be reached (Email) at the address mike@gnu.ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ -/* $FreeBSD: src/gnu/usr.bin/sort/sort.c,v 1.20 2002/04/08 12:12:06 ache Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/sort/sort.c,v 1.21 2002/04/08 22:00:28 ache Exp $ */ #include @@ -198,6 +198,8 @@ static struct keyfield keyhead; #ifdef __FreeBSD__ +static unsigned char decimal_point; + static int COLLDIFF (int a, int b) { @@ -751,7 +753,11 @@ { register tmpa = UCHAR (*a), tmpb = UCHAR (*b); +#ifdef __FreeBSD__ + if (tmpa == decimal_point && tmpb == decimal_point) +#else if (tmpa == '.' && tmpb == '.') +#endif { do tmpa = UCHAR (*++a), tmpb = UCHAR (*++b); @@ -776,7 +782,11 @@ } return 0; } +#ifdef __FreeBSD__ + else if (tmpa == decimal_point) +#else else if (tmpa == '.') +#endif { do tmpa = UCHAR (*++a); @@ -785,7 +795,11 @@ return 1; return 0; } +#ifdef __FreeBSD__ + else if (tmpb == decimal_point) +#else else if (tmpb == '.') +#endif { do tmpb = UCHAR (*++b); @@ -821,7 +835,11 @@ while (tmpa == '0'); if (tmpb != '-') { +#ifdef __FreeBSD__ + if (tmpa == decimal_point) +#else if (tmpa == '.') +#endif do tmpa = UCHAR (*++a); while (tmpa == '0'); @@ -829,7 +847,11 @@ return -1; while (tmpb == '0') tmpb = UCHAR (*++b); +#ifdef __FreeBSD__ + if (tmpb == decimal_point) +#else if (tmpb == '.') +#endif do tmpb = UCHAR (*++b); while (tmpb == '0'); @@ -844,7 +866,12 @@ while (tmpa == tmpb && digits[tmpa]) tmpa = UCHAR (*++a), tmpb = UCHAR (*++b); +#ifdef __FreeBSD__ + if ((tmpa == decimal_point && !digits[tmpb]) || + (tmpb == decimal_point && !digits[tmpa])) +#else if ((tmpa == '.' && !digits[tmpb]) || (tmpb == '.' && !digits[tmpa])) +#endif return -fraccompare (a, b); if (digits[tmpa]) @@ -876,7 +903,11 @@ do tmpb = UCHAR (*++b); while (tmpb == '0'); +#ifdef __FreeBSD__ + if (tmpb == decimal_point) +#else if (tmpb == '.') +#endif do tmpb = UCHAR (*++b); while (tmpb == '0'); @@ -884,7 +915,11 @@ return 1; while (tmpa == '0') tmpa = UCHAR (*++a); +#ifdef __FreeBSD__ + if (tmpa == decimal_point) +#else if (tmpa == '.') +#endif do tmpa = UCHAR (*++a); while (tmpa == '0'); @@ -902,7 +937,12 @@ while (tmpa == tmpb && digits[tmpa]) tmpa = UCHAR (*++a), tmpb = UCHAR (*++b); +#ifdef __FreeBSD__ + if ((tmpa == decimal_point && !digits[tmpb]) || + (tmpb == decimal_point && !digits[tmpa])) +#else if ((tmpa == '.' && !digits[tmpb]) || (tmpb == '.' && !digits[tmpa])) +#endif return fraccompare (a, b); if (digits[tmpa]) @@ -1738,6 +1778,7 @@ #ifdef __FreeBSD__ (void) setlocale(LC_ALL, ""); + decimal_point = localeconv()->decimal_point[0]; #endif program_name = argv[0]; ==== //depot/projects/ia64/lib/csu/sparc64/Makefile#4 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/lib/csu/sparc64/Makefile,v 1.4 2002/03/29 22:43:41 markm Exp $ +# $FreeBSD: src/lib/csu/sparc64/Makefile,v 1.5 2002/04/08 20:31:20 obrien Exp $ .PATH: ${.CURDIR}/../common -SRCS= crt1.c crti.S crtn.S +SRCS= crt1.c crti.S crtn.S crtbegin.c crtend.c OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o -CFLAGS+= -I${.CURDIR}/../common \ - -I${.CURDIR}/../../libc/include +SOBJS= crtbegin.So crtend.So +CFLAGS+= -I${.CURDIR}/../common -I${.CURDIR}/../../libc/include NOMAN= true NOPIC= true NOPROFILE= true ==== //depot/projects/ia64/lib/libc/gen/getobjformat.c#3 (text+ko) ==== @@ -25,9 +25,7 @@ */ #include -#ifdef __FBSDID -__FBSDID("$FreeBSD: src/lib/libc/gen/getobjformat.c,v 1.5 2002/02/08 09:34:17 ru Exp $"); -#endif +__FBSDID("$FreeBSD: src/lib/libc/gen/getobjformat.c,v 1.6 2002/04/09 11:39:03 ru Exp $"); #include #include ==== //depot/projects/ia64/lib/libc/gen/strtofflags.c#3 (text+ko) ==== @@ -35,9 +35,7 @@ static char sccsid[] = "@(#)stat_flags.c 8.1 (Berkeley) 5/31/93"; #endif /* LIBC_SCCS and not lint */ #include -#ifdef __FBSDID -__FBSDID("$FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.20 2002/02/08 09:34:17 ru Exp $"); -#endif +__FBSDID("$FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.21 2002/04/09 11:39:03 ru Exp $"); #include #include ==== //depot/projects/ia64/lib/libc/sparc64/fpu/fpu.c#4 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.3 2002/03/22 21:52:58 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.4 2002/04/09 00:57:23 jake Exp $"); #include @@ -241,7 +241,7 @@ * the frame. */ frm = (struct frame *)(uf->uf_out[6] + SPOFF); - return (frm->f_local[reg - IREG_L0]); + return (frm->fr_local[reg - IREG_L0]); } __fpu_panic("fetch_reg: bogus register"); } ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_select.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_select.c,v 1.18 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_select.c,v 1.19 2002/04/09 05:41:00 asmodai Exp $ */ #include #include @@ -52,7 +52,7 @@ struct pthread *curthread = _get_curthread(); struct timespec ts; int i, ret = 0, f_wait = 1; - int pfd_index, got_one = 0, fd_count = 0; + int pfd_index, got_events = 0, fd_count = 0; struct pthread_poll_data data; if (numfds > _thread_dtablesize) { @@ -166,12 +166,22 @@ * this file descriptor from the fdset if * the requested event wasn't ready. */ - got_one = 0; + + /* + * First check for invalid descriptor. + * If found, set errno and return -1. + */ + if (data.fds[i].revents & POLLNVAL) { + errno = EBADF; + return -1; + } + + got_events = 0; if (readfds != NULL) { if (FD_ISSET(data.fds[i].fd, readfds)) { if (data.fds[i].revents & (POLLIN | POLLRDNORM)) - got_one = 1; + got_events++; else FD_CLR(data.fds[i].fd, readfds); } @@ -180,7 +190,7 @@ if (FD_ISSET(data.fds[i].fd, writefds)) { if (data.fds[i].revents & (POLLOUT | POLLWRNORM | POLLWRBAND)) - got_one = 1; + got_events++; else FD_CLR(data.fds[i].fd, writefds); @@ -189,16 +199,15 @@ if (exceptfds != NULL) { if (FD_ISSET(data.fds[i].fd, exceptfds)) { if (data.fds[i].revents & (POLLRDBAND | - POLLPRI | POLLHUP | POLLERR | - POLLNVAL)) - got_one = 1; + POLLPRI)) + got_events++; else FD_CLR(data.fds[i].fd, exceptfds); } } - if (got_one) - numfds++; + if (got_events != 0) + numfds+=got_events; } ret = numfds; } ==== //depot/projects/ia64/lib/libcrypt/crypt.3#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libcrypt/crypt.3,v 1.24 2001/12/13 08:05:32 ru Exp $ +.\" $FreeBSD: src/lib/libcrypt/crypt.3,v 1.25 2002/04/09 22:32:59 trhodes Exp $ .\" .\" Manual page, using -mandoc macros .\" @@ -167,7 +167,7 @@ .Fa digit represents which algorithm is used in encryption. Following the token is the actual salt to use in the encryption. The length of the salt is limited -to 16 characters--because the length of the returned output is also limited +to 8 characters--because the length of the returned output is also limited (_PASSWORD_LEN). The salt must be terminated with the end of the string (NULL) or a dollar sign. Any characters after the dollar sign are ignored. .Pp ==== //depot/projects/ia64/lib/libedit/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.19 2000/08/15 12:01:40 mrg Exp $ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libedit/Makefile,v 1.24 2001/10/01 23:10:48 obrien Exp $ +# $FreeBSD: src/lib/libedit/Makefile,v 1.25 2002/04/09 13:04:31 ru Exp $ LIB= edit SHLIB_MAJOR= 4 @@ -9,8 +9,8 @@ OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \ parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBNCURSES} +LDADD= -lncurses MAN= editline.3 editrc.5 ==== //depot/projects/ia64/lib/libstand/Makefile#6 (text+ko) ==== @@ -1,5 +1,4 @@ -# $FreeBSD: src/lib/libstand/Makefile,v 1.30 2002/03/19 12:03:05 peter Exp $ -# +# $FreeBSD: src/lib/libstand/Makefile,v 1.34 2002/04/09 20:38:29 obrien Exp $ # Originally from $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $ # # Notes: @@ -12,8 +11,7 @@ NOPIC= YES MAN= libstand.3 -# Mostly OK, some of the libc imports are a bit noisy -CFLAGS+= -Wall +CFLAGS+= -ffreestanding .if ${MACHINE_ARCH} == "alpha" CFLAGS+= -mno-fp-regs @@ -104,15 +102,11 @@ .PATH: ${.CURDIR}/../libc/ia64/gen SRCS+= __divdi3.S __divsi3.S __moddi3.S __modsi3.S SRCS+= __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S -# XXX should be global -CFLAGS+= -ffreestanding .endif -.if ${MACHINE_ARCH} != "sparc64" # _setjmp/_longjmp .PATH: ${.CURDIR}/${MACHINE_ARCH} SRCS+= _setjmp.S -.endif # decompression functionality from libbz2 .PATH: ${.CURDIR}/../../contrib/bzip2 ==== //depot/projects/ia64/libexec/lukemftpd/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/4/94 -# $FreeBSD: src/libexec/lukemftpd/Makefile,v 1.3 2002/03/01 17:30:01 obrien Exp $ +# $FreeBSD: src/libexec/lukemftpd/Makefile,v 1.4 2002/04/08 21:22:58 obrien Exp $ MAINTAINER= obrien @@ -30,7 +30,7 @@ CLEANFILES+= ls-unmain.c ls-unmain.c: ls.c - sed -e 's/^main(/ls_main(/g' -e 's|extern.h|${LSDIR}/extern.h|' \ + sed -e 's/^main(/ls_main(/g' -e 's,extern.h,${LSDIR}/extern.h,' \ ${.ALLSRC} > ${.TARGET} .if !defined(NOPAM) ==== //depot/projects/ia64/libexec/tftpd/tftpd.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)tftpd.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/tftpd/tftpd.c,v 1.22 2002/02/07 04:49:34 imp Exp $"; + "$FreeBSD: src/libexec/tftpd/tftpd.c,v 1.23 2002/04/09 19:13:43 ambrisko Exp $"; #endif /* not lint */ /* @@ -576,9 +576,19 @@ (void)setjmp(timeoutbuf); send_data: - if (send(peer, dp, size + 4, 0) != size + 4) { - syslog(LOG_ERR, "write: %m"); - goto abort; + { + int i, t = 1; + for (i = 0; ; i++){ + if (send(peer, dp, size + 4, 0) != size + 4) { + sleep(t); + t = (t < 32) ? t<< 1 : t; + if (i >= 12) { + syslog(LOG_ERR, "write: %m"); + goto abort; + } + } + break; + } } read_ahead(file, pf->f_convert); for ( ; ; ) { ==== //depot/projects/ia64/release/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.666 2002/04/02 15:07:34 matusita Exp $ +# $FreeBSD: src/release/Makefile,v 1.667 2002/04/09 01:17:47 matusita Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \ # [ RELEASETAG=tag ] @@ -1009,6 +1009,7 @@ @echo "read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc .endif @echo "load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc + @echo "set hint.acpi.0.disable=1" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "echo \\007\\007" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "autoboot 10" >> ${RD}/image.${FSIMAGE}/boot/loader.rc .if ${MACHINE_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT} ==== //depot/projects/ia64/sbin/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.101 2002/04/02 10:58:30 marcel Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.102 2002/04/09 10:55:11 phk Exp $ # XXX MISSING: icheck ncheck @@ -87,7 +87,6 @@ .if ${MACHINE_ARCH} == "i386" SUBDIR+=cxconfig \ - kget \ mount_nwfs \ mount_smbfs \ nextboot ==== //depot/projects/ia64/sbin/dumpon/dumpon.8#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)swapon.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.22 2002/01/23 09:35:55 sobomax Exp $ +.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.23 2002/04/09 19:51:50 trhodes Exp $ .\" .Dd May 12, 1995 .Dt DUMPON 8 @@ -96,14 +96,12 @@ .Pp Since .Nm -can only be called after the system enters single-user mode, -it can not be used to create dumps for system panics during -kernel initialization. -In such cases use +cannot be used during kernel initialization, the .Va dumpdev -tunable provided by +variable of .Xr loader 8 -instead. +must be used to enable dumps for system panics which occur +during kernel initialization. .Sh SEE ALSO .Xr sysctl 3 , .Xr fstab 5 , ==== //depot/projects/ia64/sbin/dumpon/dumpon.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "From: @(#)swapon.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.15 2002/04/08 09:20:04 phk Exp $"; + "$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.16 2002/04/09 10:00:18 phk Exp $"; #endif /* not lint */ #include @@ -84,9 +84,9 @@ if (fd < 0) err(EX_OSFILE, "%s", argv[0]); u = 0; - i = ioctl(fd, DIOCGKERNELDUMP, &u); + i = ioctl(fd, DIOCSKERNELDUMP, &u); u = 1; - i = ioctl(fd, DIOCGKERNELDUMP, &u); + i = ioctl(fd, DIOCSKERNELDUMP, &u); if (i == 0 && verbose) printf("kernel dumps on %s\n", argv[0]); @@ -95,12 +95,12 @@ if (fd < 0) err(EX_OSFILE, "%s", _PATH_DEVNULL); u = 0; - i = ioctl(fd, DIOCGKERNELDUMP, &u); + i = ioctl(fd, DIOCSKERNELDUMP, &u); if (i == 0 && verbose) printf("kernel dumps disabled\n"); } if (i < 0) - err(EX_OSERR, "ioctl(DIOCGKERNELDUMP)"); + err(EX_OSERR, "ioctl(DIOCSKERNELDUMP)"); exit (0); } ==== //depot/projects/ia64/share/examples/etc/make.conf#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.183 2002/03/30 18:14:37 ume Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.184 2002/04/09 18:25:40 bmilekic Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -116,6 +116,7 @@ #NOSECURE= true # do not build crypto code in secure/ subdir #NOSHARE= true # do not go into the share subdir #NOUUCP= true # do not build uucp related programs +#NO_RCMNDS= true # do not build rlogin, rsh & rcp # # To build the OpenSSL manpages, uncomment the following. These are not # built by default because they clobber a number of system manpages with ==== //depot/projects/ia64/share/man/man4/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.151 2002/03/27 09:58:14 phk Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.152 2002/04/09 21:34:33 julian Exp $ MAN= aac.4 \ acpi.4 \ @@ -95,6 +95,7 @@ ng_bridge.4 \ ng_cisco.4 \ ng_echo.4 \ + ng_etf.4 \ ng_ether.4 \ ng_frame_relay.4 \ ng_gif.4 \ ==== //depot/projects/ia64/share/man/man4/ip.4#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ip.4 8.2 (Berkeley) 11/30/93 -.\" $FreeBSD: src/share/man/man4/ip.4,v 1.24 2001/10/01 16:09:21 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ip.4,v 1.25 2002/04/09 18:03:18 silby Exp $ .\" .Dd March 3, 2001 .Dt IP 4 @@ -144,9 +144,9 @@ .Bl -tag -width IP_PORTRANGE_DEFAULT .It Dv IP_PORTRANGE_DEFAULT use the default range of values, normally -.Dv IPPORT_RESERVED +.Dv IPPORT_HIFIRSTAUTO through -.Dv IPPORT_USERRESERVED . +.Dv IPPORT_HILASTAUTO . This is adjustable through the sysctl setting: .Sy net.inet.ip.portrange.first and ==== //depot/projects/ia64/share/man/man4/ng_etf.4#3 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ng_etf.4,v 1.3 2001/11/21 17:29:00 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ng_etf.4,v 1.4 2002/04/09 21:34:33 julian Exp $ .\" .Dd February 28, 2001 .Dt NG_ETF 4 @@ -128,7 +128,7 @@ DONE ngctl -f /tmp/xwert -# something to set a hook to catch packets an dshow them. +# something to set a hook to catch packets and show them. echo "Unrecognised packets:" nghook -a etf: newproto & # Filter two random ethertypes to that hook. ==== //depot/projects/ia64/share/man/man7/hier.7#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 16: 0:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3F0337B41A; Tue, 9 Apr 2002 16:00:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1216837B405 for ; Tue, 9 Apr 2002 16:00:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g39N0hQ70334 for perforce@freebsd.org; Tue, 9 Apr 2002 16:00:43 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 9 Apr 2002 16:00:43 -0700 (PDT) Message-Id: <200204092300.g39N0hQ70334@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9475 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9475 Change 9475 by peter@peter_daintree on 2002/04/09 15:59:52 getconf should be conditional on no C++ tools, not specific machines. Affected files ... ... //depot/projects/ia64/usr.bin/Makefile#17 edit Differences ... ==== //depot/projects/ia64/usr.bin/Makefile#17 (text+ko) ==== @@ -237,7 +237,7 @@ .if ${MACHINE_ARCH} != "sparc64" && ${MACHINE_ARCH} != "ia64" SUBDIR+=xlint .endif -.if ${MACHINE_ARCH} != "sparc64" +.if !defined(NO_CXX) && ${MACHINE_ARCH} != "sparc64" SUBDIR+=getconf .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 18:47:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1307A37B41B; Tue, 9 Apr 2002 18:46:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D88F337B41A for ; Tue, 9 Apr 2002 18:46:13 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3A1k3s07087 for perforce@freebsd.org; Tue, 9 Apr 2002 18:46:04 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Tue, 9 Apr 2002 18:46:04 -0700 (PDT) Message-Id: <200204100146.g3A1k3s07087@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 9481 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9481 Change 9481 by julian@julian_ref on 2002/04/09 18:45:44 MFC Affected files ... ... //depot/projects/kse/bin/ps/ps.c#7 integrate ... //depot/projects/kse/lib/libkvm/kvm_proc.c#10 integrate ... //depot/projects/kse/sys/alpha/alpha/busdma_machdep.c#6 integrate ... //depot/projects/kse/sys/alpha/alpha/interrupt.c#14 integrate ... //depot/projects/kse/sys/alpha/alpha/machdep.c#36 integrate ... //depot/projects/kse/sys/alpha/alpha/mp_machdep.c#14 integrate ... //depot/projects/kse/sys/alpha/alpha/pmap.c#26 integrate ... //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#21 integrate ... //depot/projects/kse/sys/alpha/conf/GENERIC#10 integrate ... //depot/projects/kse/sys/alpha/conf/SIMOS#4 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_misc.c#10 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_signal.c#6 integrate ... //depot/projects/kse/sys/boot/common/interp_forth.c#4 integrate ... //depot/projects/kse/sys/boot/common/load_elf.c#3 integrate ... //depot/projects/kse/sys/boot/efi/Makefile.inc#3 integrate ... //depot/projects/kse/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#4 integrate ... //depot/projects/kse/sys/boot/efi/loader/Makefile#6 integrate ... //depot/projects/kse/sys/boot/ficl/Makefile#2 integrate ... //depot/projects/kse/sys/boot/ficl/alpha/sysdep.h#2 integrate ... //depot/projects/kse/sys/boot/ficl/dict.c#2 integrate ... //depot/projects/kse/sys/boot/ficl/ficl.c#2 integrate ... //depot/projects/kse/sys/boot/ficl/ficl.h#2 integrate ... //depot/projects/kse/sys/boot/ficl/fileaccess.c#1 branch ... //depot/projects/kse/sys/boot/ficl/float.c#1 branch ... //depot/projects/kse/sys/boot/ficl/i386/sysdep.h#2 integrate ... //depot/projects/kse/sys/boot/ficl/ia64/sysdep.h#2 integrate ... //depot/projects/kse/sys/boot/ficl/loader.c#4 integrate ... //depot/projects/kse/sys/boot/ficl/math64.c#2 integrate ... //depot/projects/kse/sys/boot/ficl/math64.h#2 integrate ... //depot/projects/kse/sys/boot/ficl/prefix.c#2 integrate ... //depot/projects/kse/sys/boot/ficl/search.c#2 integrate ... //depot/projects/kse/sys/boot/ficl/softwords/ficlclass.fr#1 branch ... //depot/projects/kse/sys/boot/ficl/softwords/fileaccess.fr#1 branch ... //depot/projects/kse/sys/boot/ficl/softwords/forml.fr#1 branch ... //depot/projects/kse/sys/boot/ficl/softwords/ifbrack.fr#2 integrate ... //depot/projects/kse/sys/boot/ficl/softwords/marker.fr#2 integrate ... //depot/projects/kse/sys/boot/ficl/softwords/oo.fr#2 integrate ... //depot/projects/kse/sys/boot/ficl/softwords/prefix.fr#2 integrate ... //depot/projects/kse/sys/boot/ficl/softwords/softcore.fr#2 integrate ... //depot/projects/kse/sys/boot/ficl/stack.c#2 integrate ... //depot/projects/kse/sys/boot/ficl/testmain.c#2 integrate ... //depot/projects/kse/sys/boot/ficl/tools.c#2 integrate ... //depot/projects/kse/sys/boot/ficl/vm.c#2 integrate ... //depot/projects/kse/sys/boot/ficl/words.c#3 integrate ... //depot/projects/kse/sys/boot/ia64/Makefile.inc#1 branch ... //depot/projects/kse/sys/boot/ia64/libski/Makefile#4 integrate ... //depot/projects/kse/sys/boot/ia64/skiload/Makefile#4 integrate ... //depot/projects/kse/sys/coda/coda_psdev.c#8 integrate ... //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#14 integrate ... //depot/projects/kse/sys/compat/linux/linux_signal.c#5 integrate ... //depot/projects/kse/sys/compat/pecoff/imgact_pecoff.c#10 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_signal.c#5 integrate ... //depot/projects/kse/sys/conf/Makefile.ia64#14 integrate ... //depot/projects/kse/sys/conf/NOTES#2 integrate ... //depot/projects/kse/sys/conf/files#30 integrate ... //depot/projects/kse/sys/conf/files.ia64#11 integrate ... //depot/projects/kse/sys/conf/files.pc98#22 integrate ... //depot/projects/kse/sys/conf/files.sparc64#14 integrate ... //depot/projects/kse/sys/conf/majors#7 integrate ... //depot/projects/kse/sys/conf/options#13 integrate ... //depot/projects/kse/sys/dev/aac/aac_pci.c#12 integrate ... //depot/projects/kse/sys/dev/aac/aacvar.h#9 integrate ... //depot/projects/kse/sys/dev/acpica/Osd/OsdSchedule.c#8 integrate ... //depot/projects/kse/sys/dev/acpica/Osd/OsdSynch.c#4 integrate ... //depot/projects/kse/sys/dev/acpica/acpi.c#20 integrate ... //depot/projects/kse/sys/dev/an/if_an.c#13 integrate ... //depot/projects/kse/sys/dev/ar/if_ar.c#2 integrate ... //depot/projects/kse/sys/dev/ata/ata-all.c#17 integrate ... //depot/projects/kse/sys/dev/ata/ata-all.h#7 integrate ... //depot/projects/kse/sys/dev/ata/ata-disk.c#18 integrate ... //depot/projects/kse/sys/dev/ata/ata-disk.h#8 integrate ... //depot/projects/kse/sys/dev/ata/ata-dma.c#19 integrate ... //depot/projects/kse/sys/dev/ata/ata-isa.c#4 integrate ... //depot/projects/kse/sys/dev/ata/ata-pci.c#20 integrate ... //depot/projects/kse/sys/dev/ata/atapi-all.c#10 integrate ... //depot/projects/kse/sys/dev/ata/atapi-all.h#6 integrate ... //depot/projects/kse/sys/dev/ata/atapi-cd.c#15 integrate ... //depot/projects/kse/sys/dev/ata/atapi-cd.h#6 integrate ... //depot/projects/kse/sys/dev/ata/atapi-fd.c#8 integrate ... //depot/projects/kse/sys/dev/ata/atapi-tape.c#11 integrate ... //depot/projects/kse/sys/dev/bge/if_bge.c#8 integrate ... //depot/projects/kse/sys/dev/bge/if_bgereg.h#4 integrate ... //depot/projects/kse/sys/dev/ccd/ccd.c#11 integrate ... //depot/projects/kse/sys/dev/eisa/eisaconf.c#2 integrate ... //depot/projects/kse/sys/dev/em/if_em.c#4 integrate ... //depot/projects/kse/sys/dev/em/if_em.h#4 integrate ... //depot/projects/kse/sys/dev/em/if_em_fxhw.c#3 integrate ... //depot/projects/kse/sys/dev/em/if_em_fxhw.h#3 integrate ... //depot/projects/kse/sys/dev/em/if_em_osdep.h#3 integrate ... //depot/projects/kse/sys/dev/em/if_em_phy.c#3 integrate ... //depot/projects/kse/sys/dev/em/if_em_phy.h#3 integrate ... //depot/projects/kse/sys/dev/fb/vga.c#6 integrate ... //depot/projects/kse/sys/dev/fxp/if_fxp.c#12 integrate ... //depot/projects/kse/sys/dev/fxp/if_fxpvar.h#4 integrate ... //depot/projects/kse/sys/dev/gx/if_gx.c#4 integrate ... //depot/projects/kse/sys/dev/gx/if_gxvar.h#2 integrate ... //depot/projects/kse/sys/dev/ichsmb/ichsmb.c#3 integrate ... //depot/projects/kse/sys/dev/isp/isp.c#18 integrate ... //depot/projects/kse/sys/dev/isp/isp_freebsd.c#12 integrate ... //depot/projects/kse/sys/dev/isp/isp_freebsd.h#9 integrate ... //depot/projects/kse/sys/dev/isp/isp_inline.h#6 integrate ... //depot/projects/kse/sys/dev/isp/isp_pci.c#10 integrate ... //depot/projects/kse/sys/dev/isp/ispmbox.h#11 integrate ... //depot/projects/kse/sys/dev/isp/ispvar.h#11 integrate ... //depot/projects/kse/sys/dev/kbd/atkbd.c#2 integrate ... //depot/projects/kse/sys/dev/lmc/if_lmc.c#3 integrate ... //depot/projects/kse/sys/dev/mii/miidevs#5 integrate ... //depot/projects/kse/sys/dev/mii/miidevs.h#5 integrate ... //depot/projects/kse/sys/dev/mii/rlphy.c#5 integrate ... //depot/projects/kse/sys/dev/mk48txx/mk48txx.c#1 branch ... //depot/projects/kse/sys/dev/mk48txx/mk48txxreg.h#1 branch ... //depot/projects/kse/sys/dev/my/if_my.c#1 branch ... //depot/projects/kse/sys/dev/my/if_myreg.h#1 branch ... //depot/projects/kse/sys/dev/nge/if_nge.c#7 integrate ... //depot/projects/kse/sys/dev/null/null.c#3 integrate ... //depot/projects/kse/sys/dev/pccard/pccarddevs#10 integrate ... //depot/projects/kse/sys/dev/pccard/pccarddevs.h#10 integrate ... //depot/projects/kse/sys/dev/pccbb/pccbb.c#14 integrate ... //depot/projects/kse/sys/dev/pdq/pdq_ifsubr.c#5 integrate ... //depot/projects/kse/sys/dev/ppbus/if_plip.c#2 integrate ... //depot/projects/kse/sys/dev/ppbus/lpbb.c#3 integrate ... //depot/projects/kse/sys/dev/ppbus/lpt.c#4 integrate ... //depot/projects/kse/sys/dev/ppbus/pcfclock.c#4 integrate ... //depot/projects/kse/sys/dev/ppbus/ppi.c#4 integrate ... //depot/projects/kse/sys/dev/ppbus/pps.c#6 integrate ... //depot/projects/kse/sys/dev/ppbus/vpo.c#2 integrate ... //depot/projects/kse/sys/dev/random/yarrow.c#4 integrate ... //depot/projects/kse/sys/dev/se/se_console.c#1 branch ... //depot/projects/kse/sys/dev/se/sereg.h#1 branch ... //depot/projects/kse/sys/dev/sio/sio.c#13 integrate ... //depot/projects/kse/sys/dev/sound/isa/ad1816.c#4 integrate ... //depot/projects/kse/sys/dev/sound/isa/emu8000.c#7 integrate ... //depot/projects/kse/sys/dev/sound/isa/gusmidi.c#6 integrate ... //depot/projects/kse/sys/dev/sound/isa/mpu.c#8 integrate ... //depot/projects/kse/sys/dev/sound/isa/mss.c#6 integrate ... //depot/projects/kse/sys/dev/sound/isa/opl.c#6 integrate ... //depot/projects/kse/sys/dev/sound/isa/sbc.c#4 integrate ... //depot/projects/kse/sys/dev/sound/isa/uartsio.c#7 integrate ... //depot/projects/kse/sys/dev/sound/midi/midi.c#6 integrate ... //depot/projects/kse/sys/dev/sound/midi/sequencer.c#7 integrate ... //depot/projects/kse/sys/dev/sound/midi/timer.c#2 integrate ... //depot/projects/kse/sys/dev/sound/pci/cmi.c#8 integrate ... //depot/projects/kse/sys/dev/sound/pci/csamidi.c#5 integrate ... //depot/projects/kse/sys/dev/sound/pci/ds1.c#4 integrate ... //depot/projects/kse/sys/dev/sound/pci/emu10k1.c#4 integrate ... //depot/projects/kse/sys/dev/sound/pci/t4dwave.c#7 integrate ... //depot/projects/kse/sys/dev/sound/pcm/ac97.c#6 integrate ... //depot/projects/kse/sys/dev/sound/pcm/channel.c#17 integrate ... //depot/projects/kse/sys/dev/sound/pcm/mixer.c#5 integrate ... //depot/projects/kse/sys/dev/sound/pcm/sndstat.c#6 integrate ... //depot/projects/kse/sys/dev/sound/pcm/sound.c#9 integrate ... //depot/projects/kse/sys/dev/sound/pcm/sound.h#7 integrate ... //depot/projects/kse/sys/dev/sr/if_sr.c#2 integrate ... //depot/projects/kse/sys/dev/syscons/syscons.c#12 integrate ... //depot/projects/kse/sys/dev/txp/if_txp.c#6 integrate ... //depot/projects/kse/sys/dev/usb/hid.c#3 integrate ... //depot/projects/kse/sys/dev/usb/if_aue.c#9 integrate ... //depot/projects/kse/sys/dev/usb/if_auereg.h#3 integrate ... //depot/projects/kse/sys/dev/usb/if_cue.c#4 integrate ... //depot/projects/kse/sys/dev/usb/if_cuereg.h#2 integrate ... //depot/projects/kse/sys/dev/usb/if_kue.c#4 integrate ... //depot/projects/kse/sys/dev/usb/if_kuereg.h#2 integrate ... //depot/projects/kse/sys/dev/usb/ohci.c#14 integrate ... //depot/projects/kse/sys/dev/usb/ohcivar.h#4 integrate ... //depot/projects/kse/sys/dev/usb/udbp.c#2 integrate ... //depot/projects/kse/sys/dev/usb/ugraphire_rdesc.h#1 branch ... //depot/projects/kse/sys/dev/usb/uhci.c#16 integrate ... //depot/projects/kse/sys/dev/usb/uhcireg.h#5 integrate ... //depot/projects/kse/sys/dev/usb/uhcivar.h#5 integrate ... //depot/projects/kse/sys/dev/usb/uhid.c#11 integrate ... //depot/projects/kse/sys/dev/usb/uhub.c#9 integrate ... //depot/projects/kse/sys/dev/usb/ukbd.c#6 integrate ... //depot/projects/kse/sys/dev/usb/ums.c#9 integrate ... //depot/projects/kse/sys/dev/usb/usb.c#14 integrate ... //depot/projects/kse/sys/dev/usb/usb_ethersubr.c#3 integrate ... //depot/projects/kse/sys/dev/usb/usb_port.h#9 integrate ... //depot/projects/kse/sys/dev/usb/usb_quirks.c#2 integrate ... //depot/projects/kse/sys/dev/usb/usb_subr.c#7 integrate ... //depot/projects/kse/sys/dev/usb/usbdevs#16 integrate ... //depot/projects/kse/sys/dev/usb/usbdevs.h#16 integrate ... //depot/projects/kse/sys/dev/usb/usbdevs_data.h#16 integrate ... //depot/projects/kse/sys/dev/usb/usbdi.c#7 integrate ... //depot/projects/kse/sys/dev/usb/usbdi.h#5 integrate ... //depot/projects/kse/sys/dev/usb/usbdi_util.c#3 integrate ... //depot/projects/kse/sys/dev/usb/usbdi_util.h#3 integrate ... //depot/projects/kse/sys/dev/usb/usbdivar.h#5 integrate ... //depot/projects/kse/sys/dev/vinum/vinumconfig.c#5 integrate ... //depot/projects/kse/sys/dev/vinum/vinumhdr.h#2 integrate ... //depot/projects/kse/sys/dev/wi/if_wavelan_ieee.h#3 integrate ... //depot/projects/kse/sys/dev/wi/if_wi.c#20 integrate ... //depot/projects/kse/sys/dev/wi/if_wi_pccard.c#2 integrate ... //depot/projects/kse/sys/dev/wi/if_wi_pci.c#2 integrate ... //depot/projects/kse/sys/dev/wi/if_wireg.h#8 integrate ... //depot/projects/kse/sys/dev/wi/if_wivar.h#2 integrate ... //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#10 integrate ... //depot/projects/kse/sys/fs/hpfs/hpfs_hash.c#7 integrate ... //depot/projects/kse/sys/fs/hpfs/hpfs_vfsops.c#9 integrate ... //depot/projects/kse/sys/fs/hpfs/hpfs_vnops.c#8 integrate ... //depot/projects/kse/sys/fs/msdosfs/msdosfs_denode.c#7 integrate ... //depot/projects/kse/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate ... //depot/projects/kse/sys/fs/ntfs/ntfs_ihash.c#3 integrate ... //depot/projects/kse/sys/fs/ntfs/ntfs_subr.c#9 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs.c#9 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs_fileno.c#4 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs_vncache.c#10 integrate ... //depot/projects/kse/sys/fs/smbfs/smbfs_vfsops.c#7 integrate ... //depot/projects/kse/sys/fs/smbfs/smbfs_vnops.c#9 integrate ... //depot/projects/kse/sys/fs/unionfs/union_subr.c#8 integrate ... //depot/projects/kse/sys/geom/geom.h#3 integrate ... //depot/projects/kse/sys/geom/geom_bsd.c#3 integrate ... //depot/projects/kse/sys/geom/geom_dev.c#3 integrate ... //depot/projects/kse/sys/geom/geom_disk.c#3 integrate ... //depot/projects/kse/sys/geom/geom_dump.c#3 integrate ... //depot/projects/kse/sys/geom/geom_event.c#3 integrate ... //depot/projects/kse/sys/geom/geom_int.h#2 integrate ... //depot/projects/kse/sys/geom/geom_io.c#3 integrate ... //depot/projects/kse/sys/geom/geom_mbr.c#3 integrate ... //depot/projects/kse/sys/geom/geom_pc98.c#2 integrate ... //depot/projects/kse/sys/geom/geom_slice.c#3 integrate ... //depot/projects/kse/sys/geom/geom_slice.h#3 integrate ... //depot/projects/kse/sys/geom/geom_subr.c#3 integrate ... //depot/projects/kse/sys/geom/geom_sunlabel.c#2 integrate ... //depot/projects/kse/sys/i386/conf/GENERIC#14 integrate ... //depot/projects/kse/sys/i386/conf/Makefile#2 integrate ... //depot/projects/kse/sys/i386/conf/NEWCARD#9 integrate ... //depot/projects/kse/sys/i386/conf/NOTES#31 integrate ... //depot/projects/kse/sys/i386/i386/autoconf.c#9 integrate ... //depot/projects/kse/sys/i386/i386/i386dump.c#2 integrate ... //depot/projects/kse/sys/i386/i386/machdep.c#45 integrate ... //depot/projects/kse/sys/i386/i386/mp_machdep.c#21 integrate ... //depot/projects/kse/sys/i386/i386/trap.c#36 integrate ... //depot/projects/kse/sys/i386/i386/vm86.c#8 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_signal.c#5 integrate ... //depot/projects/kse/sys/i386/include/md_var.h#10 integrate ... //depot/projects/kse/sys/i386/include/uc_device.h#2 delete ... //depot/projects/kse/sys/i386/isa/icu.h#4 integrate ... //depot/projects/kse/sys/i386/isa/icu_ipl.s#2 integrate ... //depot/projects/kse/sys/i386/isa/icu_vector.s#10 integrate ... //depot/projects/kse/sys/i386/isa/if_el.c#2 integrate ... //depot/projects/kse/sys/i386/isa/intr_machdep.c#13 integrate ... //depot/projects/kse/sys/i386/isa/intr_machdep.h#8 integrate ... //depot/projects/kse/sys/i386/isa/isa_device.h#2 integrate ... //depot/projects/kse/sys/i386/isa/pcvt/pcvt_drv.c#5 integrate ... //depot/projects/kse/sys/i386/linux/linux.h#8 integrate ... //depot/projects/kse/sys/i386/linux/linux_sysvec.c#16 integrate ... //depot/projects/kse/sys/i386/svr4/svr4_machdep.c#9 integrate ... //depot/projects/kse/sys/i4b/capi/capi_l4if.c#4 integrate ... //depot/projects/kse/sys/i4b/capi/iavc/iavc_isa.c#4 integrate ... //depot/projects/kse/sys/i4b/capi/iavc/iavc_pci.c#4 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_ing.c#4 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_ipr.c#5 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_rbch.c#6 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_trace.c#6 integrate ... //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate ... //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate ... //depot/projects/kse/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#3 integrate ... //depot/projects/kse/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#3 integrate ... //depot/projects/kse/sys/i4b/layer1/isic/i4b_bchan.c#4 integrate ... //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#3 integrate ... //depot/projects/kse/sys/i4b/layer2/i4b_l2.c#4 integrate ... //depot/projects/kse/sys/i4b/layer4/i4b_i4bdrv.c#8 integrate ... //depot/projects/kse/sys/ia64/conf/GENERIC#10 integrate ... //depot/projects/kse/sys/ia64/conf/SKI#3 integrate ... //depot/projects/kse/sys/ia64/ia64/autoconf.c#6 integrate ... //depot/projects/kse/sys/ia64/ia64/ia64dump.c#2 integrate ... //depot/projects/kse/sys/ia64/ia64/interrupt.c#10 integrate ... //depot/projects/kse/sys/ia64/ia64/machdep.c#29 integrate ... //depot/projects/kse/sys/ia64/ia64/pmap.c#21 integrate ... //depot/projects/kse/sys/ia64/ia64/ssc.c#7 integrate ... //depot/projects/kse/sys/ia64/ia64/trap.c#17 integrate ... //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#16 integrate ... //depot/projects/kse/sys/ia64/include/elf.h#4 integrate ... //depot/projects/kse/sys/ia64/include/ia64_cpu.h#7 integrate ... //depot/projects/kse/sys/ia64/include/param.h#5 integrate ... //depot/projects/kse/sys/isa/pnpreg.h#2 integrate ... //depot/projects/kse/sys/isofs/cd9660/cd9660_node.c#5 integrate ... //depot/projects/kse/sys/kern/clock_if.m#1 branch ... //depot/projects/kse/sys/kern/imgact_aout.c#12 integrate ... //depot/projects/kse/sys/kern/init_main.c#37 integrate ... //depot/projects/kse/sys/kern/kern_acct.c#12 integrate ... //depot/projects/kse/sys/kern/kern_descrip.c#26 integrate ... //depot/projects/kse/sys/kern/kern_exec.c#23 integrate ... //depot/projects/kse/sys/kern/kern_exit.c#40 integrate ... //depot/projects/kse/sys/kern/kern_fork.c#60 integrate ... //depot/projects/kse/sys/kern/kern_intr.c#21 integrate ... //depot/projects/kse/sys/kern/kern_jail.c#14 integrate ... //depot/projects/kse/sys/kern/kern_ktr.c#8 integrate ... //depot/projects/kse/sys/kern/kern_lock.c#12 integrate ... //depot/projects/kse/sys/kern/kern_malloc.c#8 integrate ... //depot/projects/kse/sys/kern/kern_mtxpool.c#3 integrate ... //depot/projects/kse/sys/kern/kern_mutex.c#25 integrate ... //depot/projects/kse/sys/kern/kern_proc.c#56 integrate ... //depot/projects/kse/sys/kern/kern_prot.c#23 integrate ... //depot/projects/kse/sys/kern/kern_resource.c#18 integrate ... //depot/projects/kse/sys/kern/kern_sema.c#3 integrate ... //depot/projects/kse/sys/kern/kern_shutdown.c#27 integrate ... //depot/projects/kse/sys/kern/kern_sig.c#44 integrate ... //depot/projects/kse/sys/kern/kern_sx.c#13 integrate ... //depot/projects/kse/sys/kern/kern_timeout.c#6 integrate ... //depot/projects/kse/sys/kern/subr_clock.c#1 branch ... //depot/projects/kse/sys/kern/subr_disk.c#10 integrate ... //depot/projects/kse/sys/kern/subr_disklabel.c#7 integrate ... //depot/projects/kse/sys/kern/subr_diskslice.c#7 integrate ... //depot/projects/kse/sys/kern/subr_eventhandler.c#5 integrate ... //depot/projects/kse/sys/kern/subr_mbuf.c#10 integrate ... //depot/projects/kse/sys/kern/subr_rman.c#6 integrate ... //depot/projects/kse/sys/kern/subr_smp.c#11 integrate ... //depot/projects/kse/sys/kern/subr_taskqueue.c#4 integrate ... //depot/projects/kse/sys/kern/subr_trap.c#50 integrate ... //depot/projects/kse/sys/kern/subr_witness.c#21 integrate ... //depot/projects/kse/sys/kern/sys_generic.c#22 integrate ... //depot/projects/kse/sys/kern/sys_pipe.c#10 integrate ... //depot/projects/kse/sys/kern/sys_process.c#23 integrate ... //depot/projects/kse/sys/kern/tty.c#21 integrate ... //depot/projects/kse/sys/kern/uipc_socket.c#13 integrate ... //depot/projects/kse/sys/kern/uipc_syscalls.c#12 integrate ... //depot/projects/kse/sys/kern/vfs_aio.c#23 integrate ... //depot/projects/kse/sys/kern/vfs_bio.c#16 integrate ... //depot/projects/kse/sys/kern/vfs_cache.c#12 integrate ... //depot/projects/kse/sys/kern/vfs_subr.c#30 integrate ... //depot/projects/kse/sys/kern/vfs_syscalls.c#24 integrate ... //depot/projects/kse/sys/kern/vfs_vnops.c#23 integrate ... //depot/projects/kse/sys/net/bpf.c#10 integrate ... //depot/projects/kse/sys/net/bsd_comp.c#3 integrate ... //depot/projects/kse/sys/net/ethernet.h#6 integrate ... //depot/projects/kse/sys/net/if.c#15 integrate ... //depot/projects/kse/sys/net/if_arcsubr.c#3 integrate ... //depot/projects/kse/sys/net/if_ethersubr.c#12 integrate ... //depot/projects/kse/sys/net/if_loop.c#7 integrate ... //depot/projects/kse/sys/net/if_ppp.c#9 integrate ... //depot/projects/kse/sys/net/if_sl.c#11 integrate ... //depot/projects/kse/sys/net/if_spppsubr.c#6 integrate ... //depot/projects/kse/sys/net/if_tap.c#10 integrate ... //depot/projects/kse/sys/net/if_tun.c#10 integrate ... //depot/projects/kse/sys/net/if_vlan.c#7 integrate ... //depot/projects/kse/sys/net/ppp_deflate.c#3 integrate ... //depot/projects/kse/sys/netatalk/ddp_usrreq.c#7 integrate ... //depot/projects/kse/sys/netatm/atm_subr.c#5 integrate ... //depot/projects/kse/sys/netgraph/ng_base.c#5 integrate ... //depot/projects/kse/sys/netinet/if_ether.c#10 integrate ... //depot/projects/kse/sys/netinet/if_fddi.h#3 delete ... //depot/projects/kse/sys/netinet/in.h#7 integrate ... //depot/projects/kse/sys/netinet/in_pcb.c#13 integrate ... //depot/projects/kse/sys/netinet/in_pcb.h#10 integrate ... //depot/projects/kse/sys/netinet/ip_divert.c#9 integrate ... //depot/projects/kse/sys/netinet/ip_input.c#18 integrate ... //depot/projects/kse/sys/netinet6/ip6_input.c#7 integrate ... //depot/projects/kse/sys/netinet6/nd6.c#6 integrate ... //depot/projects/kse/sys/netipx/ipx_input.c#3 integrate ... //depot/projects/kse/sys/netnatm/natm_proto.c#4 integrate ... //depot/projects/kse/sys/netns/ns_input.c#3 integrate ... //depot/projects/kse/sys/netsmb/smb_subr.h#6 integrate ... //depot/projects/kse/sys/pc98/conf/GENERIC#13 integrate ... //depot/projects/kse/sys/pc98/i386/machdep.c#25 integrate ... //depot/projects/kse/sys/pc98/pc98/fd.c#8 integrate ... //depot/projects/kse/sys/pc98/pc98/sio.c#13 integrate ... //depot/projects/kse/sys/pc98/pc98/syscons.c#9 integrate ... //depot/projects/kse/sys/pci/if_dc.c#13 integrate ... //depot/projects/kse/sys/pci/if_pcn.c#5 integrate ... //depot/projects/kse/sys/pci/if_rl.c#7 integrate ... //depot/projects/kse/sys/pci/if_sf.c#8 integrate ... //depot/projects/kse/sys/pci/if_sis.c#11 integrate ... //depot/projects/kse/sys/pci/if_sk.c#5 integrate ... //depot/projects/kse/sys/pci/if_ste.c#6 integrate ... //depot/projects/kse/sys/pci/if_ti.c#8 integrate ... //depot/projects/kse/sys/pci/if_tl.c#4 integrate ... //depot/projects/kse/sys/pci/if_vr.c#4 integrate ... //depot/projects/kse/sys/pci/if_wb.c#4 integrate ... //depot/projects/kse/sys/pci/if_xl.c#9 integrate ... //depot/projects/kse/sys/powerpc/powerpc/machdep.c#17 integrate ... //depot/projects/kse/sys/sparc64/conf/GENERIC#8 integrate ... //depot/projects/kse/sys/sparc64/include/eeprom.h#1 branch ... //depot/projects/kse/sys/sparc64/include/emul.h#1 branch ... //depot/projects/kse/sys/sparc64/include/frame.h#12 integrate ... //depot/projects/kse/sys/sparc64/include/ktr.h#4 integrate ... //depot/projects/kse/sys/sparc64/include/reg.h#10 integrate ... //depot/projects/kse/sys/sparc64/sparc64/clock.c#5 integrate ... //depot/projects/kse/sys/sparc64/sparc64/db_trace.c#10 integrate ... //depot/projects/kse/sys/sparc64/sparc64/eeprom.c#1 branch ... //depot/projects/kse/sys/sparc64/sparc64/eeprom_ebus.c#1 branch ... //depot/projects/kse/sys/sparc64/sparc64/eeprom_sbus.c#1 branch ... //depot/projects/kse/sys/sparc64/sparc64/emul.c#3 integrate ... //depot/projects/kse/sys/sparc64/sparc64/genassym.c#23 integrate ... //depot/projects/kse/sys/sparc64/sparc64/intr_machdep.c#10 integrate ... //depot/projects/kse/sys/sparc64/sparc64/machdep.c#28 integrate ... //depot/projects/kse/sys/sparc64/sparc64/mp_machdep.c#5 integrate ... //depot/projects/kse/sys/sparc64/sparc64/pmap.c#24 integrate ... //depot/projects/kse/sys/sparc64/sparc64/trap.c#24 integrate ... //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#21 integrate ... //depot/projects/kse/sys/sys/_lock.h#5 integrate ... //depot/projects/kse/sys/sys/ata.h#8 integrate ... //depot/projects/kse/sys/sys/bio.h#5 integrate ... //depot/projects/kse/sys/sys/cdefs.h#12 integrate ... //depot/projects/kse/sys/sys/cdio.h#3 integrate ... //depot/projects/kse/sys/sys/clock.h#1 branch ... //depot/projects/kse/sys/sys/disk.h#4 integrate ... //depot/projects/kse/sys/sys/disklabel.h#8 integrate ... //depot/projects/kse/sys/sys/ioccom.h#3 integrate ... //depot/projects/kse/sys/sys/kerneldump.h#2 integrate ... //depot/projects/kse/sys/sys/malloc.h#5 integrate ... //depot/projects/kse/sys/sys/mutex.h#19 integrate ... //depot/projects/kse/sys/sys/param.h#17 integrate ... //depot/projects/kse/sys/sys/pcpu.h#10 integrate ... //depot/projects/kse/sys/sys/proc.h#95 integrate ... //depot/projects/kse/sys/sys/signalvar.h#9 integrate ... //depot/projects/kse/sys/sys/socketvar.h#15 integrate ... //depot/projects/kse/sys/sys/types.h#12 integrate ... //depot/projects/kse/sys/sys/ucred.h#9 integrate ... //depot/projects/kse/sys/sys/user.h#16 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_tables.c#2 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_vfsops.c#17 integrate ... //depot/projects/kse/sys/ufs/ffs/fs.h#6 integrate ... //depot/projects/kse/sys/ufs/ifs/ifs_vfsops.c#6 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_dirhash.c#8 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_ihash.c#6 integrate ... //depot/projects/kse/sys/vm/device_pager.c#3 integrate ... //depot/projects/kse/sys/vm/phys_pager.c#3 integrate ... //depot/projects/kse/sys/vm/swap_pager.c#9 integrate ... //depot/projects/kse/sys/vm/uma.h#2 integrate ... //depot/projects/kse/sys/vm/uma_core.c#2 integrate ... //depot/projects/kse/sys/vm/uma_int.h#2 integrate ... //depot/projects/kse/sys/vm/vm_extern.h#14 integrate ... //depot/projects/kse/sys/vm/vm_meter.c#11 integrate ... //depot/projects/kse/sys/vm/vm_object.c#7 integrate ... //depot/projects/kse/sys/vm/vm_page.c#10 integrate ... //depot/projects/kse/sys/vm/vm_pageq.c#4 integrate ... //depot/projects/kse/sys/vm/vm_pager.c#6 integrate ... //depot/projects/kse/sys/vm/vm_zone.c#7 delete ... //depot/projects/kse/sys/vm/vm_zone.h#4 delete Differences ... ==== //depot/projects/kse/bin/ps/ps.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.49 2002/02/21 18:27:16 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.50 2002/04/07 04:59:13 jedgar Exp $"); #ifndef lint static const char copyright[] = @@ -308,7 +308,7 @@ /* XXX - should be cleaner */ if (!all && ttydev == NODEV && pid == -1 && !nuids) { if ((uids = malloc(sizeof (*uids))) == NULL) - errx(1, "malloc: %s", strerror(errno)); + err(1, "malloc"); nuids = 1; *uids = getuid(); } @@ -421,7 +421,7 @@ moreuids = realloc(uids, alloc * sizeof (*uids)); if (moreuids == NULL) { free(uids); - errx(1, "realloc: %s", strerror(errno)); + err(1, "realloc"); } uids = moreuids; } ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#10 (text+ko) ==== @@ -34,11 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.45 2002/03/21 23:38:09 obrien Exp $ + * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.46 2002/04/07 04:47:58 dd Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.45 2002/03/21 23:38:09 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.46 2002/04/07 04:47:58 dd Exp $"); #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93"; @@ -409,6 +409,25 @@ _kvm_syserr(kd, kd->program, "kvm_getprocs"); return (0); } + /* + * We can't continue with a size of 0 because we pass + * it to realloc() (via _kvm_realloc()), and passing 0 + * to realloc() results in undefined behavior. + */ + if (size == 0) { + /* + * XXX: We should probably return an invalid, + * but non-NULL, pointer here so any client + * program trying to dereference it will + * crash. However, _kvm_freeprocs() calls + * free() on kd->procbase if it isn't NULL, + * and free()'ing a junk pointer isn't good. + * Then again, _kvm_freeprocs() isn't used + * anywhere . . . + */ + kd->procbase = _kvm_malloc(kd, 1); + goto liveout; + } do { size += size / 10; kd->procbase = (struct kinfo_proc *) @@ -422,6 +441,12 @@ _kvm_syserr(kd, kd->program, "kvm_getprocs"); return (0); } + /* + * We have to check the size again because sysctl() + * may "round up" oldlenp if oldp is NULL; hence it + * might've told us that there was data to get when + * there really isn't any. + */ if (size > 0 && kd->procbase->ki_structsize != sizeof(struct kinfo_proc)) { _kvm_err(kd, kd->program, @@ -430,6 +455,7 @@ kd->procbase->ki_structsize); return (0); } +liveout: nprocs = size == 0 ? 0 : size / kd->procbase->ki_structsize; } else { struct nlist nl[4], *p; ==== //depot/projects/kse/sys/alpha/alpha/busdma_machdep.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.22 2002/01/05 08:47:09 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.23 2002/04/04 21:03:13 jhb Exp $ */ #include @@ -600,7 +600,7 @@ count = 0; if (total_bpages == 0) { - mtx_init(&bounce_lock, "BouncePage", MTX_DEF); + mtx_init(&bounce_lock, "BouncePage", NULL, MTX_DEF); STAILQ_INIT(&bounce_page_list); STAILQ_INIT(&bounce_map_waitinglist); STAILQ_INIT(&bounce_map_callbacklist); ==== //depot/projects/kse/sys/alpha/alpha/interrupt.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.67 2002/03/22 15:55:56 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.68 2002/04/04 21:03:13 jhb Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /* @@ -343,7 +343,7 @@ ithds_init(void *dummy) { - mtx_init(&alpha_intr_hash_lock, "ithread table lock", MTX_SPIN); + mtx_init(&alpha_intr_hash_lock, "ithread table lock", NULL, MTX_SPIN); } SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL); ==== //depot/projects/kse/sys/alpha/alpha/machdep.c#36 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.171 2002/04/02 22:19:14 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.176 2002/04/09 11:18:26 phk Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -190,7 +190,6 @@ struct msgbuf *msgbufp=0; int Maxmem = 0; -long dumplo; int totalphysmem; /* total amount of physical memory in system */ int physmem; /* physical memory used by NetBSD + some rsvd */ @@ -279,18 +278,6 @@ vm_ksubmap_init(&kmi); -#if defined(USERCONFIG) -#if defined(USERCONFIG_BOOT) - if (1) -#else - if (boothowto & RB_CONFIG) -#endif - { - userconfig(); - cninit(); /* the preferred console may have changed */ - } -#endif - printf("avail memory = %ld (%ldK bytes)\n", ptoa(cnt.v_free_count), ptoa(cnt.v_free_count) / 1024); @@ -945,8 +932,8 @@ thread0.td_pcb->pcb_hw.apcb_ksp = (u_int64_t)thread0.td_frame; mutex_init(); - mtx_init(&clock_lock, "clk", MTX_SPIN | MTX_RECURSE); - mtx_init(&icu_lock, "icu", MTX_SPIN); + mtx_init(&clock_lock, "clk", NULL, MTX_SPIN | MTX_RECURSE); + mtx_init(&icu_lock, "icu", NULL, MTX_SPIN); /* * Look at arguments passed to us and compute boothowto. @@ -1204,21 +1191,6 @@ sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); PROC_UNLOCK(p); - (void)grow_stack(p, (u_long)sip); - if (!useracc((caddr_t)sip, fsize, VM_PROT_WRITE)) { - /* - * Process has trashed its stack; give it an illegal - * instruction to halt it in its tracks. - */ - PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); - return; - } - /* * Build the signal context to be used by sigreturn. */ @@ -1255,7 +1227,19 @@ /* * copy the frame out to userland. */ - (void) copyout((caddr_t)&ksi, (caddr_t)sip, fsize); + if (copyout((caddr_t)&ksi, (caddr_t)sip, fsize) != 0) { + /* + * Process has trashed its stack; give it an illegal + * instruction to halt it in its tracks. + */ + PROC_LOCK(p); + SIGACTION(p, SIGILL) = SIG_DFL; + SIGDELSET(p->p_sigignore, SIGILL); + SIGDELSET(p->p_sigcatch, SIGILL); + SIGDELSET(p->p_sigmask, SIGILL); + psignal(p, SIGILL); + return; + } /* * Set up the registers to return to sigcode. @@ -1338,31 +1322,11 @@ sfp = (struct sigframe *)(alpha_pal_rdusp() - rndfsize); PROC_UNLOCK(p); - (void)grow_stack(p, (u_long)sfp); #ifdef DEBUG if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) printf("sendsig(%d): sig %d ssp %p usp %p\n", p->p_pid, sig, &sf, sfp); #endif - if (!useracc((caddr_t)sfp, sizeof(sf), VM_PROT_WRITE)) { -#ifdef DEBUG - if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) - printf("sendsig(%d): useracc failed on sig %d\n", - p->p_pid, sig); -#endif - /* - * Process has trashed its stack; give it an illegal - * instruction to halt it in its tracks. - */ - PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); - return; - } - /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDP_FPUSED; @@ -1380,7 +1344,24 @@ /* * copy the frame out to userland. */ - (void) copyout((caddr_t)&sf, (caddr_t)sfp, sizeof(sf)); + if (copyout((caddr_t)&sf, (caddr_t)sfp, sizeof(sf)) != 0) { +#ifdef DEBUG + if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) + printf("sendsig(%d): copyout failed on sig %d\n", + p->p_pid, sig); +#endif + /* + * Process has trashed its stack; give it an illegal + * instruction to halt it in its tracks. + */ + PROC_LOCK(p); + SIGACTION(p, SIGILL) = SIG_DFL; + SIGDELSET(p->p_sigignore, SIGILL); + SIGDELSET(p->p_sigcatch, SIGILL); + SIGDELSET(p->p_sigmask, SIGILL); + psignal(p, SIGILL); + return; + } #ifdef DEBUG if (sigdebug & SDB_FOLLOW) printf("sendsig(%d): sig %d sfp %p code %lx\n", p->p_pid, sig, @@ -1471,6 +1452,7 @@ */ SIGSETOLD(p->p_sigmask, ksc.sc_mask); SIG_CANTMASK(p->p_sigmask); + signotify(p); PROC_UNLOCK(p); set_regs(td, (struct reg *)ksc.sc_regs); @@ -1553,6 +1535,7 @@ p->p_sigmask = uc.uc_sigmask; SIG_CANTMASK(p->p_sigmask); + signotify(p); PROC_UNLOCK(p); /* XXX ksc.sc_ownedfp ? */ ==== //depot/projects/kse/sys/alpha/alpha/mp_machdep.c#14 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.37 2002/03/22 15:54:31 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.38 2002/04/04 21:03:13 jhb Exp $ */ #include @@ -345,7 +345,7 @@ { int i; - mtx_init(&ap_boot_mtx, "ap boot", MTX_SPIN); + mtx_init(&ap_boot_mtx, "ap boot", NULL, MTX_SPIN); for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) { int dv; ==== //depot/projects/kse/sys/alpha/alpha/pmap.c#26 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.88 2002/03/20 18:58:44 obrien Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.89 2002/04/04 21:03:13 jhb Exp $ */ /* @@ -1365,7 +1365,7 @@ } TAILQ_INIT(&pmap->pm_pvlist); bzero(&pmap->pm_stats, sizeof pmap->pm_stats); - mtx_init(&allpmaps_lock, "allpmaps", MTX_SPIN | MTX_QUIET); + mtx_init(&allpmaps_lock, "allpmaps", NULL, MTX_SPIN | MTX_QUIET); LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); } ==== //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#21 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.65 2002/03/20 18:58:44 obrien Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.66 2002/04/05 00:52:15 alc Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -352,21 +352,6 @@ prom_halt(0); } -int -grow_stack(p, sp) - struct proc *p; - size_t sp; -{ - int rv; - - rv = vm_map_growstack (p, sp); - if (rv != KERN_SUCCESS) - return (0); - - return (1); -} - - /* * Software interrupt handler for queued VM system processing. */ ==== //depot/projects/kse/sys/alpha/conf/GENERIC#10 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.134 2002/03/27 21:10:38 wilko Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.135 2002/04/03 10:56:54 ru Exp $ machine alpha cpu EV4 @@ -63,7 +63,6 @@ options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI -options UCONSOLE #Allow users to grab the console options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues ==== //depot/projects/kse/sys/alpha/conf/SIMOS#4 (text+ko) ==== @@ -11,7 +11,7 @@ # device lines is present in the ./NOTES file. If you are in doubt as # to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.18 2001/12/04 11:16:41 des Exp $ +# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.19 2002/04/03 10:56:54 ru Exp $ machine "alpha" cpu "EV5" @@ -31,7 +31,6 @@ options PSEUDOFS #Pseudo-filesystem framework options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=100 #Be pessimistic about Joe SCSI device -options UCONSOLE #Allow users to grab the console config kernel ==== //depot/projects/kse/sys/alpha/osf1/osf1_misc.c#10 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.28 2002/04/01 21:30:29 jhb Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.29 2002/04/05 00:08:38 eric Exp $ */ @@ -1039,10 +1039,10 @@ * setuid() won't work. * * Instead, by P1003.1b-1993, setuid() is supposed to work like: - * If the process has appropriate [super-user] priviledges, the + * If the process has appropriate [super-user] privileges, the * setuid() function sets the real user ID, effective user * ID, and the saved set-user-ID to uid. - * If the process does not have appropriate priviledges, but uid + * If the process does not have appropriate privileges, but uid * is equal to the real user ID or the saved set-user-ID, the * setuid() function sets the effective user ID to uid; the * real user ID and saved set-user-ID remain unchanged by ==== //depot/projects/kse/sys/alpha/osf1/osf1_signal.c#6 (text+ko) ==== @@ -30,7 +30,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/alpha/osf1/osf1_signal.c,v 1.15 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.17 2002/04/05 00:52:15 alc Exp $ */ #include @@ -491,11 +491,13 @@ case OSF1_SIG_UNBLOCK: SIGSETNAND(p->p_sigmask, bss); + signotify(p); break; case OSF1_SIG_SETMASK: p->p_sigmask = bss; SIG_CANTMASK(p->p_sigmask); + signotify(p); break; default: @@ -614,21 +616,6 @@ sip = (osiginfo_t *)(alpha_pal_rdusp() - rndfsize); PROC_UNLOCK(p); - (void)grow_stack(p, (u_long)sip); - if (useracc((caddr_t)sip, fsize, VM_PROT_WRITE) == 0) { - /* - * Process has trashed its stack; give it an illegal - * instruction to halt it in its tracks. - */ - PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); - return; - } - /* * Build the signal context to be used by sigreturn. */ @@ -665,7 +652,19 @@ /* * copy the frame out to userland. */ - (void) copyout((caddr_t)&ksi, (caddr_t)sip, fsize); + if (copyout((caddr_t)&ksi, (caddr_t)sip, fsize) != 0) { + /* + * Process has trashed its stack; give it an illegal + * instruction to halt it in its tracks. + */ + PROC_LOCK(p); + SIGACTION(p, SIGILL) = SIG_DFL; + SIGDELSET(p->p_sigignore, SIGILL); + SIGDELSET(p->p_sigcatch, SIGILL); + SIGDELSET(p->p_sigmask, SIGILL); + psignal(p, SIGILL); + return; + } /* * Set up the registers to return to sigcode. @@ -729,6 +728,7 @@ */ osf1_to_bsd_sigset(&ksc.sc_mask, &p->p_sigmask); SIG_CANTMASK(p->p_sigmask); + signotify(p); PROC_UNLOCK(p); set_regs(td, (struct reg *)ksc.sc_regs); ==== //depot/projects/kse/sys/boot/common/interp_forth.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/interp_forth.c,v 1.21 2001/12/10 08:09:40 obrien Exp $ + * $FreeBSD: src/sys/boot/common/interp_forth.c,v 1.22 2002/04/09 20:59:34 dcs Exp $ */ #include /* to pick up __FreeBSD_version */ @@ -53,6 +53,7 @@ * BootForth Interface to Ficl Forth interpreter. */ +FICL_SYSTEM *bf_sys; FICL_VM *bf_vm; FICL_WORD *pInterp; @@ -232,8 +233,8 @@ char create_buf[41]; /* 31 characters-long builtins */ int fd; - ficlInitSystem(10000); /* Default dictionary ~4000 cells */ - bf_vm = ficlNewVM(); + bf_sys = ficlInitSystem(10000); /* Default dictionary ~4000 cells */ + bf_vm = ficlNewVM(bf_sys); /* Put all private definitions in a "builtins" vocabulary */ ficlExec(bf_vm, "vocabulary builtins also builtins definitions"); @@ -243,7 +244,7 @@ /* make all commands appear as Forth words */ SET_FOREACH(cmdp, Xcommand_set) { - ficlBuild((*cmdp)->c_name, bf_command, FW_DEFAULT); + ficlBuild(bf_sys, (char *)(*cmdp)->c_name, bf_command, FW_DEFAULT); ficlExec(bf_vm, "forth definitions builtins"); sprintf(create_buf, "builtin: %s", (*cmdp)->c_name); ficlExec(bf_vm, create_buf); @@ -252,8 +253,8 @@ ficlExec(bf_vm, "only forth definitions"); /* Export some version numbers so that code can detect the loader/host version */ - ficlSetEnv("FreeBSD_version", __FreeBSD_version); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 19:44:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9287C37B404; Tue, 9 Apr 2002 19:44:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D0D8A37B416 for ; Tue, 9 Apr 2002 19:44:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3A2iOv25021 for perforce@freebsd.org; Tue, 9 Apr 2002 19:44:24 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 9 Apr 2002 19:44:24 -0700 (PDT) Message-Id: <200204100244.g3A2iOv25021@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9484 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9484 Change 9484 by jhb@jhb_laptop on 2002/04/09 19:43:53 Tidy up sched locking. Affected files ... ... //depot/projects/smpng/sys/kern/kern_sig.c#28 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_sig.c#28 (text+ko) ==== @@ -1040,13 +1040,10 @@ PROC_UNLOCK(p); continue; } - mtx_lock_spin(&sched_lock); if (p->p_stat == SZOMB) { - mtx_unlock_spin(&sched_lock); PROC_UNLOCK(p); continue; } - mtx_unlock_spin(&sched_lock); if (p_cansignal(cp, p, sig) == 0) { nfound++; if (sig) @@ -1333,6 +1330,10 @@ * Defer further processing for signals which are held, * except that stopped processes must be continued by SIGCONT. */ + /* + * XXX: we shouldn't drop sched_lock from signotify() and then lock it + * again here. + */ mtx_lock_spin(&sched_lock); if (action == SIG_HOLD && (!(prop & SA_CONT) || p->p_stat != SSTOP)) { mtx_unlock_spin(&sched_lock); @@ -1352,6 +1353,7 @@ mtx_unlock_spin(&sched_lock); goto out; } + mtx_unlock_spin(&sched_lock); /* * Process is sleeping and traced... make it runnable * so it can discover the signal in issignal() and stop @@ -1359,7 +1361,6 @@ */ if (p->p_flag & P_TRACED) goto run; - mtx_unlock_spin(&sched_lock); /* * If SIGCONT is default (or ignored) and process is * asleep, we are finished; the process should not @@ -1443,13 +1444,12 @@ /* mark it as sleeping */ } } - mtx_unlock_spin(&sched_lock); } else { if (td->td_wchan == NULL) goto run; p->p_stat = SSLEEP; - mtx_unlock_spin(&sched_lock); } + mtx_unlock_spin(&sched_lock); goto out; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 9 20:57:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FC3537B404; Tue, 9 Apr 2002 20:56:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 207F837B41A for ; Tue, 9 Apr 2002 20:56:55 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3A3usR38841 for perforce@freebsd.org; Tue, 9 Apr 2002 20:56:54 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 9 Apr 2002 20:56:54 -0700 (PDT) Message-Id: <200204100356.g3A3usR38841@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9489 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9489 Change 9489 by jhb@jhb_laptop on 2002/04/09 20:56:10 Hold sched_lock for almost all of the switch statement inside psignal() except for when signalling our parent when we stop. The code in the switch assumes that if we are in one state we are in that state for the entire switch, so we hold sched_lock to ensure the process doesn't change state out from under us. Affected files ... ... //depot/projects/smpng/sys/kern/kern_sig.c#29 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_sig.c#29 (text+ko) ==== @@ -190,7 +190,6 @@ { PROC_LOCK_ASSERT(p, MA_OWNED); - mtx_assert(&sched_lock, MA_NOTOWNED); mtx_lock_spin(&sched_lock); if (SIGPENDING(p)) { p->p_sflag |= PS_NEEDSIGCHK; @@ -1324,6 +1323,7 @@ SIG_CONTSIGMASK(p->p_siglist); } SIGADDSET(p->p_siglist, sig); + mtx_lock_spin(&sched_lock); signotify(p); /* @@ -1334,7 +1334,6 @@ * XXX: we shouldn't drop sched_lock from signotify() and then lock it * again here. */ - mtx_lock_spin(&sched_lock); if (action == SIG_HOLD && (!(prop & SA_CONT) || p->p_stat != SSTOP)) { mtx_unlock_spin(&sched_lock); return; @@ -1349,11 +1348,8 @@ * be noticed when the process returns through * trap() or syscall(). */ - if ((td->td_flags & TDF_SINTR) == 0) { - mtx_unlock_spin(&sched_lock); + if ((td->td_flags & TDF_SINTR) == 0) goto out; - } - mtx_unlock_spin(&sched_lock); /* * Process is sleeping and traced... make it runnable * so it can discover the signal in issignal() and stop @@ -1385,6 +1381,7 @@ */ if (p->p_flag & P_PPWAIT) goto out; + mtx_unlock_spin(&sched_lock); SIGDELSET(p->p_siglist, sig); p->p_xstat = sig; PROC_LOCK(p->p_pptr); @@ -1393,14 +1390,12 @@ PROC_UNLOCK(p->p_pptr); mtx_lock_spin(&sched_lock); stop(p); - mtx_unlock_spin(&sched_lock); goto out; } else goto runfast; /* NOTREACHED */ case SSTOP: - mtx_unlock_spin(&sched_lock); /* * If traced process is already stopped, * then no further action is necessary. @@ -1429,7 +1424,6 @@ SIGDELSET(p->p_siglist, sig); if (action == SIG_CATCH) goto runfast; - mtx_lock_spin(&sched_lock); /* * XXXKSE * do this for each thread. @@ -1449,7 +1443,6 @@ goto run; p->p_stat = SSLEEP; } - mtx_unlock_spin(&sched_lock); goto out; } @@ -1469,7 +1462,6 @@ * the process runnable, leave it stopped. * XXXKSE should we wake ALL blocked threads? */ - mtx_lock_spin(&sched_lock); if (p->p_flag & P_KSES) { FOREACH_THREAD_IN_PROC(p, td) { if (td->td_wchan && (td->td_flags & TDF_SINTR)){ @@ -1487,7 +1479,6 @@ unsleep(td); /* XXXKSE */ } } - mtx_unlock_spin(&sched_lock); goto out; default: @@ -1511,7 +1502,6 @@ } #endif } - mtx_unlock_spin(&sched_lock); goto out; } /*NOTREACHED*/ @@ -1522,7 +1512,6 @@ * XXXKSE Should we make them all run fast? * Maybe just one would be enough? */ - mtx_lock_spin(&sched_lock); if (FIRST_THREAD_IN_PROC(p)->td_priority > PUSER) { FIRST_THREAD_IN_PROC(p)->td_priority = PUSER; @@ -1531,9 +1520,10 @@ /* If we jump here, sched_lock has to be owned. */ mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED); setrunnable(td); /* XXXKSE */ +out: mtx_unlock_spin(&sched_lock); -out: - /* If we jump here, sched_lock should not be owned. */ + + /* Once we get here, sched_lock should not be owned. */ mtx_assert(&sched_lock, MA_NOTOWNED); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 3:16:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AE4837B416; Wed, 10 Apr 2002 03:16:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BDCBE37B419 for ; Wed, 10 Apr 2002 03:16:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3AAGWP30314 for perforce@freebsd.org; Wed, 10 Apr 2002 03:16:32 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 10 Apr 2002 03:16:32 -0700 (PDT) Message-Id: <200204101016.g3AAGWP30314@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9499 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9499 Change 9499 by peter@peter_thunder on 2002/04/10 03:15:52 Ugh! Deal with bde's signal changes that moved signal posting from userret to ast(). For the normal syscall path, ia64 does not call ast() before returning to userland. This makes tcsh etc die horribly when sigsuspend() returns EINTR without fetching the signal. Failing to call ast() would explain some other anomolies too. This is embarresing. Temporarily put back the guts of what userret() used to do, but this time in the bottom of syscall() itself. :-( This fixes signals, but not the rest. Maybe a better hack would be to call ast() from the bottom of syscall for the FRAME_SYSCALL case. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/trap.c#18 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#18 (text+ko) ==== @@ -860,6 +860,36 @@ */ STOPEVENT(p, S_SCX, code); + /* + * Deal with the fact that we do not call ast() if we are + * just returning from a syscall frame. Sigh. + */ + if (framep->tf_flags & FRAME_SYSCALL) { + int sig; + mtx_lock(&Giant); + PROC_LOCK(p); + while ((sig = CURSIG(p)) != 0) + postsig(sig); + PROC_UNLOCK(p); + mtx_unlock(&Giant); + + mtx_lock_spin(&sched_lock); + td->td_priority = td->td_ksegrp->kg_user_pri; + if (td->td_kse->ke_flags & KEF_NEEDRESCHED) { + setrunqueue(td); + p->p_stats->p_ru.ru_nivcsw++; + mi_switch(); + mtx_unlock_spin(&sched_lock); + mtx_lock(&Giant); + PROC_LOCK(p); + while ((sig = CURSIG(p)) != 0) + postsig(sig); + PROC_UNLOCK(p); + mtx_unlock(&Giant); + } else + mtx_unlock_spin(&sched_lock); + } + #ifdef DIAGNOSTIC cred_free_thread(td); #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 3:29:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7919737B405; Wed, 10 Apr 2002 03:28:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5EDC337B416 for ; Wed, 10 Apr 2002 03:28:51 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3AASoJ32242 for perforce@freebsd.org; Wed, 10 Apr 2002 03:28:50 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 10 Apr 2002 03:28:50 -0700 (PDT) Message-Id: <200204101028.g3AASoJ32242@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9500 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9500 Change 9500 by peter@peter_daintree on 2002/04/10 03:28:15 IFC @9499 Affected files ... ... //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#6 integrate ... //depot/projects/ia64/contrib/sendmail/KNOWNBUGS#3 integrate ... //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/README#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/README#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/submit.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/access_db.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/compat_check.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/ldap_routing.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/msp.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/darwin.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/buildvirtuser#3 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/qtool.8#3 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/qtool.pl#3 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/smcontrol.pl#2 integrate ... //depot/projects/ia64/contrib/sendmail/doc/op/op.me#3 integrate ... //depot/projects/ia64/contrib/sendmail/editmap/editmap.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/libmilter/mfapi.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/libmilter/milter.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/cdefs.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/conf.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/config.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/gen.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/io.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/ldap.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_freebsd.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/Makefile.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/comm.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/docs/installation.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#1 branch ... //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/engine.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/main.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/signal.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/smfi.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/README#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/clock.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/config.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/debug.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fclose.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/findfp.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/ldap.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/local.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/mbdb.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/smstdio.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/sscanf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/stdio.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strio.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strl.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-event.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-fopen.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-shm.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-types.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vsscanf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/wsetup.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsmdb/smdb.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsmdb/smdb1.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsmdb/smndbm.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/mail.local/Makefile.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/mail.local/mail.local.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/mailstats/mailstats.8#3 integrate ... //depot/projects/ia64/contrib/sendmail/smrsh/Makefile.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/README#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/SECURITY#2 integrate ... //depot/projects/ia64/contrib/sendmail/src/TUNING#2 integrate ... //depot/projects/ia64/contrib/sendmail/src/bf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/src/collect.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/conf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/conf.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/control.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/daemon.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/deliver.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/domain.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/envelope.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/helpfile#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/main.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/map.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/mci.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/milter.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/mime.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/parseaddr.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/queue.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/readcf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/sasl.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/src/sendmail.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/sfsasl.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/srvrsmtp.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/stats.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/tls.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/src/usersmtp.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/util.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/version.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/vacation/vacation.1#3 integrate ... //depot/projects/ia64/contrib/sendmail/vacation/vacation.c#3 integrate ... //depot/projects/ia64/etc/defaults/periodic.conf#3 integrate ... //depot/projects/ia64/etc/periodic/daily/440.status-mailq#2 integrate ... //depot/projects/ia64/etc/periodic/daily/500.queuerun#2 integrate ... //depot/projects/ia64/gnu/usr.bin/Makefile#8 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1/Makefile#5 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1obj/Makefile#5 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1plus/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/collect2/Makefile#4 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 integrate ... //depot/projects/ia64/share/man/man5/make.conf.5#5 integrate ... //depot/projects/ia64/share/man/man5/periodic.conf.5#5 integrate ... //depot/projects/ia64/share/mk/bsd.sys.mk#5 integrate ... //depot/projects/ia64/sys/dev/digi/CX.c#2 integrate ... //depot/projects/ia64/sys/dev/digi/CX_PCI.c#2 integrate ... //depot/projects/ia64/sys/dev/digi/EPCX.c#2 integrate ... //depot/projects/ia64/sys/dev/digi/EPCX_PCI.c#2 integrate ... //depot/projects/ia64/sys/dev/digi/Xe.c#2 integrate ... //depot/projects/ia64/sys/dev/digi/Xem.c#2 integrate ... //depot/projects/ia64/sys/dev/digi/Xr.c#2 integrate ... //depot/projects/ia64/sys/dev/digi/digi.c#7 integrate ... //depot/projects/ia64/sys/dev/pci/pci.c#4 integrate ... //depot/projects/ia64/sys/dev/snp/snp.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_linker.c#13 integrate ... //depot/projects/ia64/sys/kern/kern_time.c#5 integrate ... //depot/projects/ia64/sys/kern/subr_witness.c#8 integrate ... //depot/projects/ia64/sys/net/if.c#7 integrate ... //depot/projects/ia64/sys/netinet/in.c#5 integrate ... //depot/projects/ia64/sys/sys/ioccom.h#5 integrate ... //depot/projects/ia64/sys/sys/linker.h#3 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#7 integrate ... //depot/projects/ia64/usr.bin/awk/Makefile#5 integrate ... //depot/projects/ia64/usr.bin/yacc/output.c#7 integrate ... //depot/projects/ia64/usr.bin/yacc/reader.c#7 integrate Differences ... ==== //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#6 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.12 2002/04/09 02:09:14 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.14 2002/04/10 05:16:45 gshapiro Exp $ -sendmail 8.12.2 +sendmail 8.12.3 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following files were removed: @@ -21,8 +21,8 @@ Imported using: - cvs import -m 'Import sendmail 8.12.2' \ - src/contrib/sendmail SENDMAIL v8_12_2 + cvs import -m 'Import sendmail 8.12.3' \ + src/contrib/sendmail SENDMAIL v8_12_3 To make local changes to sendmail, simply patch and commit to the main @@ -40,6 +40,7 @@ contrib/sendmail/ etc/Makefile etc/defaults/make.conf (RELENG_4) + etc/defaults/periodic.conf etc/defaults/rc.conf etc/mail/Makefile etc/mail/README @@ -71,6 +72,7 @@ share/doc/smm/08.sendmailop/Makefile share/examples/etc/make.conf (HEAD) share/man/man5/make.conf.5 + share/man/man5/periodic.conf.5 share/man/man5/rc.conf.5 share/man/man7/hier.7 share/man/man8/Makefile @@ -88,4 +90,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -17-February-2002 +9-April-2002 ==== //depot/projects/ia64/contrib/sendmail/KNOWNBUGS#3 (text+ko) ==== @@ -41,6 +41,25 @@ characters then no header check is done even if one is configured for the header. +* Sender addresses whose domain part cause a temporary A record lookup + failure but have a valid MX record will be temporarily rejected in + the default configuration. Solution: fix the DNS at the sender side. + If that's not easy to achieve, possible workarounds are: + - add an entry to the access map: + dom.ain OK + - (only for advanced users) replace + +# Resolve map (to check if a host exists in check_mail) +Kresolve host -a -T + + with + +# Resolve map (to check if a host exists in check_mail) +Kcanon host -a -T +Kdnsmx dns -R MX -a -T +Kresolve sequence dnsmx canon + + * Duplicate error messages. Sometimes identical, duplicate error messages can be generated. As @@ -216,4 +235,4 @@ the file. This is unavoidable as sendmail must verify the file is safe to open before opening it. A file can not be locked until it is open. -$Revision: 8.54 $, Last updated $Date: 2001/12/17 16:07:51 $ +$Revision: 8.55 $, Last updated $Date: 2002/03/05 00:45:54 $ ==== //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#3 (text+ko) ==== @@ -1,11 +1,190 @@ SENDMAIL RELEASE NOTES - $Id: RELEASE_NOTES,v 8.1218 2002/01/13 18:24:15 ca Exp $ + $Id: RELEASE_NOTES,v 8.1296 2002/04/05 19:17:34 ca Exp $ This listing shows the version of the sendmail binary, the version of the sendmail configuration files, the date of release, and a summary of the changes in that release. +8.12.3/8.12.3 2002/04/05 + NOTICE: In general queue files should not be moved if queue groups + are used. In previous versions this could cause mail + not to be delivered if a queue file is repeatedly moved + by an external process whenever sendmail moved it back + into the right place. Some precautions have been taken + to avoid moving queue files if not really necessary. + sendmail may use links to refer to queue files and it + may store the path of data files in queue files. Hence + queue files should not be moved unless those internals + are understood and the integrity of the files is not + compromised. Problem noted by Anne Bennett of Concordia + University. + If an error mail is created, and the mail is split across different + queue directories, and SuperSafe is off, then write the mail + to disk before splitting it, otherwise an assertion is + triggered. Problem tracked down by Henning Schmiedehausen + of INTERMETA. + Fix possible race condition that could cause sendmail to forget + running queues. Problem noted by Jeff Wasilko of smoe.org. + Handle bogus qf files better without triggering assertions. + Problem noted by Guy Feltin. + Protect against interrupted select() call when enforcing Milter + read and write timeouts. Patch from Gurusamy Sarathy of + ActiveState. + Matching queue IDs with -qI should be case sensitive. Problem + noted by Anne Bennett of Concordia University. + If privileges have been dropped, don't try to change group ID to + the RunAsUser group. Problem noted by Neil Rickert of + Northern Illinois University. + Fix SafeFileEnvironment path munging when the specified path + contains a trailing slash. Based on patch from Dirk Meyer + of Dinoex. + Do not limit sendmail command line length to SM_ARG_MAX (usually + 4096). Problem noted by Allan E Johannesen of Worcester + Polytechnic Institute. + Clear full name of sender for each new envelope to avoid bogus data + if several mails are sent in one session and some of them + do not have a From: header. Problem noted by Bas Haakman. + Change timeout check such that cached information about a connection + will be immediately invalid if ConnectionCacheTimeout is zero. + Based on patch from David Burns of Portland State University. + Properly count message size for mailstats during mail collection. + Problem noted by Werner Wiethege. + Log complete response from LMTP delivery agent on failure. Based on + patch from by Motonori Nakamura of Kyoto University. + Provide workaround for getopt() implementations that do not catch + missing arguments. + Fix the message size calculation if the message body is replaced by + a milter filter and buffered file I/O is being used. + Problem noted by Sergey Akhapkin of Dr.Web. + Do not honor SIGUSR1 requests if running with extra privileges. + Problem noted by Werner Wiethege. + Prevent a file descriptor leak on mail delivery if the initial + connect fails and DialDelay is set. Patch from Servaas + Vandenberghe of Katholieke Universiteit Leuven. + Properly deal with a case where sendmail is called by root running + a set-user-ID (non-root) program. Problem noted by Jon + Lusky of ISS Atlanta. + Avoid leaving behind stray transcript (xf) files if multiple queue + directories are used and mail is sent to a mailing list + which has an owner- alias. Problem noted by Anne Bennett + of Concordia University. + Fix class map parsing code if optional key is specified. Problem + found by Mario Nigrovic. + The SMTP daemon no longer tries to fix up improperly dot-stuffed + incoming messages. A leading dot is always stripped by the + SMTP receiver regardless of whether or not it is followed by + another dot. Problem noted by Jordan Ritter of darkridge.com. + Fix corruption when doing automatic MIME 7-bit quoted-printable or + base64 encoding to 8-bit text. Problem noted by Mark + Elvers. + Correct the statistics gathered for total number of connections. + Instead of being the exact same number as the total number + of messages (T line in mailstats) it now represents the + total number of TCP connections. + Be more explicit about syntax errors in addresses, especially + non-ASCII characters, and properly create DSNs if necessary. + Problem noted by Leena Heino of the University of Tampere. + Prevent small timeouts from being lost on slow machines if itimers + are used. Problem noted by Suresh Ramasubramanian. + Prevent a race condition on child cleanup for delivery to files. + Problem noted by Fletcher Mattox of the University of + Texas. + Change the SMTP error code for temporary map failures from 421 + to 451. + Do not assume that realloc(NULL, size) works on all OS (this was + only done in one place: queue group creation). Based on + patch by Bryan Costales. + Initialize Timeout.iconnect in the code to prevent randomly short + timeouts. Problem noted by Bradley Watts of AT&T Canada. + Do not try to send a second SMTP QUIT command if the remote + responds to a MAIL command with a 421 reply or on I/O + errors. By doing so, the host was marked as having a + temporary problem and other mail destined for that host was + queued for the next queue run. Problem noted by Fletcher + Mattox of the University of Texas, Allan E Johannesen of + Worcester Polytechnic Institute, Larry Greenfield of CMU, + and Neil Rickert of Northern Illinois University. + Ignore error replies from the SMTP QUIT command (including servers + which drop the connection instead of responding to the + command). + Portability: + Check LDAP_API_VERSION to determine if ldap_memfree() is + availble. + Define HPUX10 when building on HP-UX 10.X. That platform + now gets the proper _PATH_SENDMAIL and SMRSH_CMDDIR + settings. Patch from Elias Halldor Agustsson of + Skyrr. + Fix dependency building on Mac OS X and Darwin. Problem + noted by John Beck. + Preliminary support for the sparc64 port of FreeBSD 5.0. + Add /sbin/sh as an acceptable user shell on HP-UX. From + Rajesh Somasund of Hewlett-Packard. + CONFIG: Add FEATURE(`authinfo') to allow a separate database for + SMTP AUTH information. This feature was actually added in + 8.12.0 but a release note was not included. + CONFIG: Do not bounce mail if FEATURE(`ldap_routing')'s bounce + parameter is set and the LDAP lookup returns a temporary + error. + CONFIG: Honor FEATURE(`relay_hosts_only') when using + FEATURE(`relay_mail_from', `domain'). Problem noted by + Krzysztof Oledzki. + CONFIG: FEATURE(`msp') now disables any type of alias + initialization as aliases are not needed for the MSP. + CONFIG: Allow users to override RELAY_MAILER_ARGS when FEATURE(`msp') + is in use. Patch from Andrzej Filip. + CONFIG: FEATURE(`msp') uses `[localhost]' as default instead of + `localhost' and turns on MX lookups for the SMTP mailers. + This will only have an effect if a parameter is specified, + i.e., an MX lookup will be performed on the hostname unless + it is embedded in square brackets. Problem noted by + Theo Van Dinter of Collective Technologies. + CONFIG: Set confTIME_ZONE to USE_TZ in submit.mc (TimeZoneSpec= in + submit.cf) to use $TZ for time stamps. This is a compromise + to allow for the proper time zone on systems where the + default results in misleading time stamps. That is, syslog + time stamps and Date headers on submitted mail will use the + user's $TZ setting. Problem noted by Mark Roth of the + University of Illinois at Urbana-Champaign, solution proposed + by Neil Rickert of Northern Illinois University. + CONFIG: Mac OS X (Darwin) ships with mail.local as non-set-user-ID + binary. Adjust local mailer flags accordingly. Problem + noted by John Beck. + CONTRIB: Add a warning to qtool.pl to not move queue files around + if queue groups are used. + CONTRIB: buildvirtuser: Add -f option to force rebuild. + CONTRIB: smcontrol.pl: Add -f option to specify control socket. + CONTRIB: smcontrol.pl: Add support for 'memdump' command. + Suggested by Bryan Costales. + DEVTOOLS: Add dependency generation for test programs. + LIBMILTER: Remove conversion of port number for the socket + structure that is passed to xxfi_connect(). Notice: + this fix requires that sendmail and libmilter have both + this change, mixing versions may lead to wrong port + values depending on the endianness of the involved systems. + Problem noted by Gisle Aas of ActiveState. + LIBMILTER: If smfi_setreply() sets a custom reply code of '4XX' but + SMFI_REJECT is returned, ignore the custom reply. Do the + same if '5XX' is used and SMFI_TEMPFAIL is returned. + LIBMILTER: Install include files in ${INCLUDEDIR}/libmilter/ as + required by mfapi.h. Problem noted by Jose Marcio Martins + da Cruz of Ecole Nationale Superieure des Mines de Paris. + LIBSM: Add SM_CONF_LDAP_MEMFREE as a configuration define. Set + this to 1 if your LDAP client libraries include + ldap_memfree(). + LIBSMDB: Avoid a file creation race condition for Berkeley DB 1.X + and NDBM on systems with the O_EXLOCK open(2) flag. + SMRSH: Fix compilation problem on some operating systems. Problem + noted by Christian Krackowizer of schuler technodat GmbH. + VACATION: Allow root to operate on user vacation databases. Based + on patch from Greg Couch of the University of California, + San Francisco. + VACATION: Don't ignore -C option. Based on patch by Bryan Costales. + VACATION: Clarify option usage in the man page. Problem noted by + Joe Barbish. + New Files: + libmilter/docs/smfi_setbacklog.html + 8.12.2/8.12.2 2002/01/13 Don't complain too much if stdin, stdout, or stderr are missing at startup, only log an error message. ==== //depot/projects/ia64/contrib/sendmail/cf/README#3 (text+ko) ==== @@ -367,6 +367,9 @@ SMTP_MAILER_MAXMSGS [undefined] If defined, the maximum number of messages to deliver in a single connection for the smtp, smtp8, esmtp, or dsmtp mailers. +SMTP_MAILER_MAXRCPTS [undefined] If defined, the maximum number of + recipients to deliver in a single connection for the + smtp, smtp8, esmtp, or dsmtp mailers. SMTP_MAILER_ARGS [TCP $h] The arguments passed to the smtp mailer. About the only reason you would want to change this would be to change the default port. @@ -1084,6 +1087,9 @@ By default, only hosts listed as RELAY in the access db will be allowed to relay. This option also allows any host in your domain as defined by class {m}. + Notice: make sure that your domain is not just a top level + domain, e.g., com. This can happen if you give your + host a name like example.com instead of host.example.com. relay_hosts_only By default, names that are listed as RELAY in the access @@ -1274,11 +1280,13 @@ FEATURE and introduce new settings via DAEMON_OPTIONS(). msp Defines config file for Message Submission Program. - See sendmail/SECURITY for details and cf/cf/submit.mc - how to use it. An optional argument can be used to - override the default of `localhost' to use as host to send - all e-mails to. If `MSA' is specified as second argument - then port 587 is used to contact the server. Example: + See sendmail/SECURITY for details and cf/cf/submit.mc how + to use it. An optional argument can be used to override + the default of `[localhost]' to use as host to send all + e-mails to. Note that MX records will be used if the + specified hostname is not in square brackets (e.g., + [hostname]). If `MSA' is specified as second argument then + port 587 is used to contact the server. Example: FEATURE(`msp', `', `MSA') @@ -1298,6 +1306,9 @@ queue groups. If an argument is specified, it is used as default queue group. + Note: please read the warning in doc/op/op.me about + queue groups and possible queue manipulations. + +-------+ | HACKS | +-------+ @@ -1744,7 +1755,7 @@ sendmailMTAKey: bob sendmailMTAAliasValue: eric - dn: sendmailMTAKey=bob, dc=sendmail, dc=org + dn: sendmailMTAKey=bobetrn, dc=sendmail, dc=org objectClass: sendmailMTA objectClass: sendmailMTAAlias objectClass: sendmailMTAAliasObject @@ -1973,19 +1984,21 @@ The default map definition is: - ldap -1 -v mailHost -k (&(objectClass=inetLocalMailRecipient) + ldap -1 -T -v mailHost -k (&(objectClass=inetLocalMailRecipient) (mailLocalAddress=%0)) The default map definition is: - ldap -1 -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient) - (mailLocalAddress=%0)) + ldap -1 -T -v mailRoutingAddress + -k (&(objectClass=inetLocalMailRecipient) + (mailLocalAddress=%0)) Note that neither includes the LDAP server hostname (-h server) or base DN (-b o=org,c=COUNTRY), both necessary for LDAP queries. It is presumed that your .mc file contains a setting for the confLDAP_DEFAULT_SPEC option with these settings. If this is not the case, the map definitions should be -changed as described above. +changed as described above. The "-T" is required in any user +specified map definition to catch temporary errors. The following possibilities exist as a result of an LDAP lookup on an address: @@ -2242,14 +2255,16 @@ spammer@aol.com REJECT cyberspammer.com REJECT + TLD REJECT 192.168.212 REJECT IPv6:2002:c0a8:02c7 RELAY IPv6:2002:c0a8:51d2::23f4 REJECT would refuse mail from spammer@aol.com, any user from cyberspammer.com -(or any host within the cyberspammer.com domain), any host on the -192.168.212.* network, and the IPv6 address 2002:c0a8:51d2::23f4. It would -allow relay for the IPv6 network 2002:c0a8:02c7::/48. +(or any host within the cyberspammer.com domain), any host in the entire +top level domain TLD, 192.168.212.* network, and the IPv6 address +2002:c0a8:51d2::23f4. It would allow relay for the IPv6 network +2002:c0a8:02c7::/48. The value part of the map can contain: @@ -2505,11 +2520,15 @@ FEATURE(`delay_checks', `hater') enables spamhater test -If such an argument is given, the recipient will be looked up in the access -map (using the tag Spam:). If the argument is `friend', then the other -rulesets will be skipped if the recipient address is found and has RHS -friend. If the argument is `hater', then the other rulesets will be -applied if the recipient address is found and has RHS hater. +If such an argument is given, the recipient will be looked up in the +access map (using the tag Spam:). If the argument is `friend', then +the default behavior is to apply the other rulesets and make a SPAM +friend the exception. The rulesets check_mail and check_relay will be +skipped only if the recipient address is found and has RHS FRIEND. If +the argument is `hater', then the default behavior is to skip the rulesets +check_mail and check_relay and make a SPAM hater the exception. The +other two rulesets will be applied only if the recipient address is +found and has RHS HATER. This allows for simple exceptions from the tests, e.g., by activating the friend option and having @@ -3022,8 +3041,8 @@ LOCAL_NET_CONFIG R$* < @ $* .$m. > $* $#smtp $@ $2.$m. $: $1 < @ $2.$m. > $3 -This will cause all names that end in your domain name ($m) via -SMTP; anything else will be sent via uucp-new (smart UUCP) to uunet. +This will cause all names that end in your domain name ($m) to be sent +via SMTP; anything else will be sent via uucp-new (smart UUCP) to uunet. If you have FEATURE(`nocanonify'), you may need to omit the dots after the $m. If you are running a local DNS inside your domain which is not otherwise connected to the outside world, you probably want to @@ -3998,7 +4017,9 @@ absolutely sure you need them. Options you may want to change include: -- confTIME_ZONE on OS that don't use the default, e.g., Irix. +- confTRUSTED_USERS, FEATURE(`use_ct_file'), and confCT_FILE for + avoiding X-Authorization warnings. +- confTIME_ZONE to change it from the default `USE_TZ'. - confDELIVERY_MODE is set to interactive in msp.m4 instead of the default background mode. @@ -4237,4 +4258,4 @@ 8 DNS based blacklists 9 special local rulesets (1 and 2) -$Revision: 8.600 $, Last updated $Date: 2002/01/10 17:43:41 $ +$Revision: 8.612 $, Last updated $Date: 2002/04/03 17:12:52 $ ==== //depot/projects/ia64/contrib/sendmail/cf/cf/README#2 (text+ko) ==== @@ -5,8 +5,8 @@ Please see ../README about the sendmail configuration files themselves. By default you need two .mc files: sendmail.mc and submit.mc. The -latter is a copy of msp.mc in which OSTYPE() has been filled in -according to the host OS. For the former see ../README. +latter is an OS independent configuration file for the mail submission +program (MSP). See ../README for details about both files. Installation of these two files can be done via: @@ -31,4 +31,4 @@ For more details see Makefile. -$Revision: 1.1 $, Last updated $Date: 2001/04/26 15:43:20 $ +$Revision: 1.2 $, Last updated $Date: 2002/02/22 00:33:54 $ ==== //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#2 (text+ko) ==== @@ -26,13 +26,13 @@ ##### $Id: cfhead.m4,v 8.107 2001/07/22 03:25:37 ca Exp $ ##### ##### $Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp $ ##### -##### $Id: submit.mc,v 8.5 2001/09/08 01:20:53 gshapiro Exp $ ##### -##### $Id: msp.m4,v 1.29 2001/12/13 23:56:38 gshapiro Exp $ ##### +##### $Id: submit.mc,v 8.6 2002/03/26 03:30:58 ca Exp $ ##### +##### $Id: msp.m4,v 1.32 2002/03/26 22:02:03 ca Exp $ ##### ##### $Id: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $ ##### -##### $Id: proto.m4,v 8.628 2001/12/28 19:02:40 ca Exp $ ##### +##### $Id: proto.m4,v 8.639 2002/04/02 23:42:42 gshapiro Exp $ ##### # level 10 config file format V10/Berkeley @@ -106,11 +106,11 @@ DnMAILER-DAEMON -D{MTAHost}localhost +D{MTAHost}[localhost] # Configuration version number -DZ8.12.2/Submit +DZ8.12.3/Submit ############### @@ -127,7 +127,7 @@ O AliasWait=10 # location of alias file -O AliasFile +#O AliasFile=/etc/mail/aliases # minimum number of free blocks on filesystem O MinFreeBlocks=100 @@ -259,6 +259,8 @@ # key for shared memory; 0 to turn off #O SharedMemoryKey=0 + + # timeouts (many of these) #O Timeout.initial=5m #O Timeout.connect=5m @@ -312,7 +314,7 @@ # if undefined, use system default # if defined but null, use TZ envariable passed in # if defined and non-null, use that info -#O TimeZoneSpec= +O TimeZoneSpec= # default UID (can be username or userid:groupid) #O DefaultUser=mailnull @@ -1351,19 +1353,19 @@ R$+ $: $>MasqSMTP $1 R$+ $: $>MasqHdr $1 -Msmtp, P=[IPC], F=mDFMuXk05, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, +Msmtp, P=[IPC], F=mDFMuXk5, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, T=DNS/RFC822/SMTP, A=TCP $h -Mesmtp, P=[IPC], F=mDFMuXak05, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, +Mesmtp, P=[IPC], F=mDFMuXak5, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, T=DNS/RFC822/SMTP, A=TCP $h -Msmtp8, P=[IPC], F=mDFMuX8k05, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, +Msmtp8, P=[IPC], F=mDFMuX8k5, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, T=DNS/RFC822/SMTP, A=TCP $h -Mdsmtp, P=[IPC], F=mDFMuXa%k05, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, +Mdsmtp, P=[IPC], F=mDFMuXa%k5, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, T=DNS/RFC822/SMTP, A=TCP $h -Mrelay, P=[IPC], F=mDFMuXa8k0, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n, L=2040, +Mrelay, P=[IPC], F=mDFMuXa8k, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n, L=2040, T=DNS/RFC822/SMTP, A=TCP $h ==== //depot/projects/ia64/contrib/sendmail/cf/cf/submit.mc#2 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 2001 Sendmail, Inc. and its suppliers. +# Copyright (c) 2001, 2002 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -15,8 +15,9 @@ # divert(0)dnl -VERSIONID(`$Id: submit.mc,v 8.5 2001/09/08 01:20:53 gshapiro Exp $') +VERSIONID(`$Id: submit.mc,v 8.6 2002/03/26 03:30:58 ca Exp $') define(`confCF_VERSION', `Submit')dnl define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet +define(`confTIME_ZONE', `USE_TZ')dnl FEATURE(`msp')dnl ==== //depot/projects/ia64/contrib/sendmail/cf/feature/access_db.m4#3 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,7 +10,7 @@ # divert(0) -VERSIONID(`$Id: access_db.m4,v 8.23 2001/03/16 00:51:25 gshapiro Exp $') +VERSIONID(`$Id: access_db.m4,v 8.24 2002/03/06 21:50:25 ca Exp $') divert(-1) define(`_ACCESS_TABLE_', `') @@ -21,14 +21,18 @@ ifelse(lower(_ARG3_),`lookupdotdomain',`define(`_LOOKUPDOTDOMAIN_', `1')') define(`_ATMPF_', `')dnl dnl check whether arg contains -T`'_ATMPF_ +dnl unless it is a sequence map ifelse(defn(`_ARG_'), `', `', - defn(`_ARG_'), `LDAP', `', - `ifelse(index(_ARG_, _ATMPF_), `-1', - `errprint(`*** WARNING: missing -T'_ATMPF_` in argument of FEATURE(`access_db',' defn(`_ARG_')`) + defn(`_ARG_'), `LDAP', `', + `ifelse(index(_ARG_, `sequence '), `0', `', + `ifelse(index(_ARG_, _ATMPF_), `-1', + `errprint(`*** WARNING: missing -T'_ATMPF_` in argument of FEATURE(`access_db',' defn(`_ARG_')`) ') - define(`_ABP_', index(_ARG_, ` ')) - define(`_NARG_', `substr(_ARG_, 0, _ABP_) -T'_ATMPF_` substr(_ARG_, _ABP_)') -')') + define(`_ABP_', index(_ARG_, ` ')) + define(`_NARG_', `substr(_ARG_, 0, _ABP_) -T'_ATMPF_` substr(_ARG_, _ABP_)') + ') + ') + ') LOCAL_CONFIG # Access list database (for spam stomping) ==== //depot/projects/ia64/contrib/sendmail/cf/feature/compat_check.m4#2 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. +# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ # # divert(0) -VERSIONID(`$Id: compat_check.m4,v 1.3 2001/11/21 18:40:06 ca Exp $') +VERSIONID(`$Id: compat_check.m4,v 1.4 2002/02/26 22:15:31 gshapiro Exp $') divert(-1) ifdef(`_ACCESS_TABLE_', `', `errprint(`FEATURE(`compat_check') requires FEATURE(`access_db') @@ -25,7 +25,7 @@ R$* $| $* $@ ok # act on the result, # it must be one of the following... anything else will be allowed.. -dnl for consistency with the other two even though discard does not take an +dnl for consistency with the other two even though discard does not take a dnl reply code R< DISCARD:$* > $#discard $: $1 " - discarded by check_compat" R< DISCARD $* > $#discard $: $1 " - discarded by check_compat" ==== //depot/projects/ia64/contrib/sendmail/cf/feature/ldap_routing.m4#3 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers. +# Copyright (c) 1999-2002 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,7 +10,7 @@ # divert(0) -VERSIONID(`$Id: ldap_routing.m4,v 8.8 2001/06/27 21:46:31 gshapiro Exp $') +VERSIONID(`$Id: ldap_routing.m4,v 8.10 2002/03/27 22:17:43 ca Exp $') divert(-1) # Check first two arguments. If they aren't set, may need to warn in proto.m4 @@ -31,9 +31,9 @@ LOCAL_CONFIG # LDAP routing maps Kldapmh ifelse(len(X`'_ARG1_), `1', - `ldap -1 -v mailHost -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', + `ldap -1 -T -v mailHost -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', `_ARG1_') Kldapmra ifelse(len(X`'_ARG2_), `1', - `ldap -1 -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', + `ldap -1 -T -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', `_ARG2_') ==== //depot/projects/ia64/contrib/sendmail/cf/feature/msp.m4#2 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. +# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,9 +10,9 @@ # divert(0)dnl -VERSIONID(`$Id: msp.m4,v 1.29 2001/12/13 23:56:38 gshapiro Exp $') +VERSIONID(`$Id: msp.m4,v 1.32 2002/03/26 22:02:03 ca Exp $') divert(-1) -define(`ALIAS_FILE', `') +undefine(`ALIAS_FILE') define(`confDELIVERY_MODE', `i') define(`confUSE_MSP', `True') define(`confFORWARD_PATH', `') @@ -29,10 +29,10 @@ ifdef(`MSP_QUEUE_DIR', `define(`QUEUE_DIR', `MSP_QUEUE_DIR')', `define(`QUEUE_DIR', `/var/spool/clientmqueue')') -define(`_MTA_HOST_', ifelse(defn(`_ARG_'), `', `localhost', `_ARG_')) +define(`_MTA_HOST_', ifelse(defn(`_ARG_'), `', `[localhost]', `_ARG_')) define(`_MSP_FQHN_',`dnl used to qualify addresses ifdef(`MASQUERADE_NAME', ifdef(`_MASQUERADE_ENVELOPE_', `$M', `$j'), `$j')') -define(`RELAY_MAILER_ARGS', `TCP $h'ifelse(_ARG2_, `MSA', ` 587')) +ifelse(_ARG2_, `MSA', `define(`RELAY_MAILER_ARGS', `TCP $h 587')') dnl --------------------------------------------- ifdef(`confPID_FILE', `dnl', `define(`confPID_FILE', QUEUE_DIR`/sm-client.pid')') @@ -55,11 +55,11 @@ define(`LOCAL_SHELL_PATH', `[IPC]')dnl define(`LOCAL_SHELL_FLAGS', `lmDFMuXk5')dnl define(`LOCAL_SHELL_ARGS', `TCP $h')dnl -MODIFY_MAILER_FLAGS(`SMTP', `+k05')dnl -MODIFY_MAILER_FLAGS(`ESMTP', `+k05')dnl -MODIFY_MAILER_FLAGS(`DSMTP', `+k05')dnl -MODIFY_MAILER_FLAGS(`SMTP8', `+k05')dnl -MODIFY_MAILER_FLAGS(`RELAY', `+k0')dnl +MODIFY_MAILER_FLAGS(`SMTP', `+k5')dnl +MODIFY_MAILER_FLAGS(`ESMTP', `+k5')dnl +MODIFY_MAILER_FLAGS(`DSMTP', `+k5')dnl +MODIFY_MAILER_FLAGS(`SMTP8', `+k5')dnl +MODIFY_MAILER_FLAGS(`RELAY', `+k')dnl MAILER(`local')dnl MAILER(`smtp')dnl ==== //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#3 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,7 +13,7 @@ # divert(0) -VERSIONID(`$Id: proto.m4,v 8.628 2001/12/28 19:02:40 ca Exp $') +VERSIONID(`$Id: proto.m4,v 8.639 2002/04/02 23:42:42 gshapiro Exp $') # level CF_LEVEL config file format V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley') @@ -337,7 +337,8 @@ # SMTP daemon options ifelse(defn(`confDAEMON_OPTIONS'), `', `dnl', -`errprint(WARNING: `confDAEMON_OPTIONS' is no longer valid. See cf/README for more information. +`errprint(WARNING: `confDAEMON_OPTIONS' is no longer valid. + Use `DAEMON_OPTIONS()'; see cf/README. )'dnl `DAEMON_OPTIONS(`confDAEMON_OPTIONS')') ifelse(defn(`_DPO_'), `', @@ -395,6 +396,10 @@ # key for shared memory; 0 to turn off _OPTION(SharedMemoryKey, `confSHARED_MEMORY_KEY', `0') +ifdef(`confSHARED_MEMORY_KEY_FILE', `dnl +# file to store key for shared memory (if SharedMemoryKey = -1) +O SharedMemoryKeyFile=confSHARED_MEMORY_KEY_FILE') + # timeouts (many of these) _OPTION(Timeout.initial, `confTO_INITIAL', `5m') _OPTION(Timeout.connect, `confTO_CONNECT', `5m') @@ -1416,6 +1421,10 @@ # do the LDAP lookups R<$+><$+><$*> $: <$(ldapmra $2 $: $)> <$(ldapmh $2 $: $)> <$1> <$2> <$3> +# look for temporary failures (return original address, MTA will queue up) +R<$* > <$*> <$+> <$+> <$*> $@ $2 +R<$*> <$* > <$+> <$+> <$*> $@ $2 + # if mailRoutingAddress and local or non-existant mailHost, # return the new mailRoutingAddress ifelse(_LDAP_ROUTE_DETAIL_, `_PRESERVE_', `dnl @@ -2104,7 +2113,7 @@ # check whether local FROM is ok R $+ < @ $=w > $@ RELAY FROM local', `dnl') ifdef(`_RELAY_DB_FROM_', `dnl -R $+ < @ $+ > $: <@> $>SearchList $| ifdef(`_RELAY_DB_FROM_DOMAIN_', `') <> +R $+ < @ $+ > $: <@> $>SearchList $| ifdef(`_RELAY_DB_FROM_DOMAIN_', ifdef(`_RELAY_HOSTS_ONLY_', `', `')) <> R<@> $@ RELAY RELAY FROM sender ok ifdef(`_ATMPF_', `R<@> <_ATMPF_> $#TEMP $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl') ', `dnl @@ -2201,9 +2210,10 @@ ifdef(`_FFR_MAIL_MACRO', `R$* $: $1 $| $>checkmail $&{mail_from}', `R$* $: $1 $| $>checkmail <$&f>') +dnl recipient (canonical format) $| result of checkmail R$* $| $#$* $#$2 dnl run further checks: check_relay -R$* $: $1 $| $>checkrelay $&{client_name} $| $&{client_addr} +R$* $| $* $: $1 $| $>checkrelay $&{client_name} $| $&{client_addr} R$* $| $#$* $#$2 R$* $| $* $: $1 ', `dnl') ==== //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#3 (text+ko) ==== @@ -11,8 +11,8 @@ # the sendmail distribution. # # -VERSIONID(`$Id: version.m4,v 8.81 2002/01/13 18:23:32 ca Exp $') +VERSIONID(`$Id: version.m4,v 8.89 2002/04/04 22:20:08 ca Exp $') # divert(0) # Configuration version number -DZ8.12.2`'ifdef(`confCF_VERSION', `/confCF_VERSION') +DZ8.12.3`'ifdef(`confCF_VERSION', `/confCF_VERSION') ==== //depot/projects/ia64/contrib/sendmail/cf/ostype/darwin.m4#3 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 2000 Sendmail, Inc. and its suppliers. +# Copyright (c) 2000, 2002 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -8,10 +8,11 @@ # the sendmail distribution. # # -# divert(0) -VERSIONID(`$Id: darwin.m4,v 8.1 2000/06/15 06:36:30 gshapiro Exp $') +VERSIONID(`$Id: darwin.m4,v 8.3 2002/03/05 01:55:40 ca Exp $') ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl +dnl turn on S flag for local mailer +MODIFY_MAILER_FLAGS(`LOCAL', `+S')dnl ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl ==== //depot/projects/ia64/contrib/sendmail/contrib/buildvirtuser#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# Copyright (c) 1999-2001 Gregory Neil Shapiro. All Rights Reserved. +# Copyright (c) 1999-2002 Gregory Neil Shapiro. All Rights Reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -27,7 +27,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# $Id: buildvirtuser,v 1.3 2001/02/12 02:58:20 gshapiro Exp $ +# $Id: buildvirtuser,v 1.5 2002/02/08 08:10:59 gshapiro Exp $ =head1 NAME @@ -35,7 +35,7 @@ =head1 SYNOPSIS - buildvirtuser + buildvirtuser [-f] =head1 DESCRIPTION @@ -50,6 +50,9 @@ Occurrences of $LHS in the right hand side are replaced by the address on >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 4:52:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E747137B405; Wed, 10 Apr 2002 04:52:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 33A6F37B404 for ; Wed, 10 Apr 2002 04:52:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3ABqYV54915 for perforce@freebsd.org; Wed, 10 Apr 2002 04:52:34 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 10 Apr 2002 04:52:34 -0700 (PDT) Message-Id: <200204101152.g3ABqYV54915@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9504 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9504 Change 9504 by peter@peter_thunder on 2002/04/10 04:51:36 Use dfr's fix instead of my hack. I expect he'll commit this to freefall soon. :-) Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/exception.s#10 edit ... //depot/projects/ia64/sys/ia64/ia64/trap.c#19 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/exception.s#10 (text+ko) ==== @@ -1406,8 +1406,49 @@ mov out1=r16 // arguments add out2=(8*8),r16 // trapframe pointer br.call.sptk.many rp=syscall // do the work +} { .mmi +3: rsm psr.i // we know that psr.i == 1 + add r14=PC_CURTHREAD,r13 // &curthread + nop.i 0 + ;; +} { .mmi + ld8 r14=[r14] // curthread + ;; + add r14=TD_KSE,r14 // &curthread->td_kse + nop.i 0 + ;; +} { .mmi + ld8 r14=[r14] // curkse + ;; + add r14=KE_FLAGS,r14 // &curkse->ke_flags + nop.i 0 + ;; +} { .mmi + ld4 r14=[r14] // curkse->ke_flags + ;; + nop.m 0 + tbit.nz p6,p7=r14,10 // KEF_ASTPENDING + ;; +} { .mib + nop.m 0 +(p7) tbit.nz.or.andcm p6,p7=r14,11 // KEF_NEEDRESCHED +(p7) br.cond.dptk 2f + ;; +} { .mmi + ssm psr.i // restore interrupts + ;; + srlz.d + mov out0=loc0 // trapframe argument to ast() +} { .mib + nop.m 0 + nop.i 0 + br.call.sptk.many rp=ast +} { .mib + nop.m 0 + nop.i 0 + br 3b } { .mii - ld8 r14=[loc0] // check tf_flags +2: ld8 r14=[loc0] // check tf_flags dep r15=0,loc0,61,3 // physical address of trapframe ;; tbit.z p6,p0=r14,0 // check FRAME_SYSCALL bit ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#19 (text+ko) ==== @@ -860,36 +860,6 @@ */ STOPEVENT(p, S_SCX, code); - /* - * Deal with the fact that we do not call ast() if we are - * just returning from a syscall frame. Sigh. - */ - if (framep->tf_flags & FRAME_SYSCALL) { - int sig; - mtx_lock(&Giant); - PROC_LOCK(p); - while ((sig = CURSIG(p)) != 0) - postsig(sig); - PROC_UNLOCK(p); - mtx_unlock(&Giant); - - mtx_lock_spin(&sched_lock); - td->td_priority = td->td_ksegrp->kg_user_pri; - if (td->td_kse->ke_flags & KEF_NEEDRESCHED) { - setrunqueue(td); - p->p_stats->p_ru.ru_nivcsw++; - mi_switch(); - mtx_unlock_spin(&sched_lock); - mtx_lock(&Giant); - PROC_LOCK(p); - while ((sig = CURSIG(p)) != 0) - postsig(sig); - PROC_UNLOCK(p); - mtx_unlock(&Giant); - } else - mtx_unlock_spin(&sched_lock); - } - #ifdef DIAGNOSTIC cred_free_thread(td); #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 6: 6:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5029F37B400; Wed, 10 Apr 2002 06:06:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by hub.freebsd.org (Postfix) with ESMTP id E06F437B416 for ; Wed, 10 Apr 2002 06:06:22 -0700 (PDT) Received: (qmail 8115 invoked from network); 10 Apr 2002 13:06:21 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail14.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 10 Apr 2002 13:06:21 -0000 Received: from laptop.baldwin.cx (john@laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g3AD77v52784; Wed, 10 Apr 2002 09:07:07 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200204101152.g3ABqYV54915@freefall.freebsd.org> Date: Wed, 10 Apr 2002 09:06:18 -0400 (EDT) From: John Baldwin To: Peter Wemm Subject: RE: PERFORCE change 9504 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 10-Apr-2002 Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9504 > > Change 9504 by peter@peter_thunder on 2002/04/10 04:51:36 > > Use dfr's fix instead of my hack. I expect he'll commit this to > freefall soon. :-) Yep, much better. :) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 8: 4:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BE9E37B41B; Wed, 10 Apr 2002 08:04:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from k6.locore.ca (k6.locore.ca [198.96.117.170]) by hub.freebsd.org (Postfix) with ESMTP id 985EC37B417; Wed, 10 Apr 2002 08:04:19 -0700 (PDT) Received: (from jake@localhost) by k6.locore.ca (8.11.6/8.11.6) id g3AF6p502265; Wed, 10 Apr 2002 11:06:51 -0400 (EDT) (envelope-from jake) Date: Wed, 10 Apr 2002 11:06:50 -0400 From: Jake Burkholder To: John Baldwin Cc: Peter Wemm , Perforce Change Reviews Subject: Re: PERFORCE change 9504 for review Message-ID: <20020410110650.C209@locore.ca> References: <200204101152.g3ABqYV54915@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: ; from jhb@freebsd.org on Wed, Apr 10, 2002 at 09:06:18AM -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Apparently, On Wed, Apr 10, 2002 at 09:06:18AM -0400, John Baldwin said words to the effect of; > > On 10-Apr-2002 Peter Wemm wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9504 > > > > Change 9504 by peter@peter_thunder on 2002/04/10 04:51:36 > > > > Use dfr's fix instead of my hack. I expect he'll commit this to > > freefall soon. :-) > > Yep, much better. :) Well, now the flag checking code is duplicated in both the trap and syscall return paths, alpha is the same. One wonders if the FRAME_SYSCALL optimization is actually worth all this complication. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 8:26:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3D1137B405; Wed, 10 Apr 2002 08:26:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from anchor-post-36.mail.demon.net (anchor-post-36.mail.demon.net [194.217.242.94]) by hub.freebsd.org (Postfix) with ESMTP id 57C0337B400; Wed, 10 Apr 2002 08:26:14 -0700 (PDT) Received: from mailgate.nlsystems.com ([62.49.251.130] helo=herring.nlsystems.com) by anchor-post-36.mail.demon.net with esmtp (Exim 3.35 #1) id 16vJzB-000MpN-0a; Wed, 10 Apr 2002 16:26:13 +0100 Received: from herring (herring [10.0.0.2]) by herring.nlsystems.com (8.12.2/8.11.2) with ESMTP id g3AFQC3I014120; Wed, 10 Apr 2002 16:26:12 +0100 (BST) (envelope-from dfr@nlsystems.com) Date: Wed, 10 Apr 2002 16:26:12 +0100 (BST) From: Doug Rabson To: Jake Burkholder Cc: John Baldwin , Peter Wemm , Perforce Change Reviews Subject: Re: PERFORCE change 9504 for review In-Reply-To: <20020410110650.C209@locore.ca> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, 10 Apr 2002, Jake Burkholder wrote: > Apparently, On Wed, Apr 10, 2002 at 09:06:18AM -0400, > John Baldwin said words to the effect of; > > > > > On 10-Apr-2002 Peter Wemm wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9504 > > > > > > Change 9504 by peter@peter_thunder on 2002/04/10 04:51:36 > > > > > > Use dfr's fix instead of my hack. I expect he'll commit this to > > > freefall soon. :-) > > > > Yep, much better. :) > > Well, now the flag checking code is duplicated in both the trap and syscall > return paths, alpha is the same. One wonders if the FRAME_SYSCALL optimization > is actually worth all this complication. I think its still worth it - it still does a lot less work in the common case. Bear in mind that calling ast() is quite rare and being forced to do a full exception restore (e.g. for a signal) is even rarer. A harmless extra call to ast() in that case is unlikely to be noticable. Having said that, for ia64 at least, it should be possible for the syscall to bypass the ast() bits at the beginning of exception_restore(). As long as syscall sets (p1,p2) to (1,0), it can jump to label 2 in exception_restore. -- Doug Rabson Mail: dfr@nlsystems.com Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 10:45:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5764637B41A; Wed, 10 Apr 2002 10:43:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3B71037B426 for ; Wed, 10 Apr 2002 10:43:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3AHhMO40998 for perforce@freebsd.org; Wed, 10 Apr 2002 10:43:22 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Wed, 10 Apr 2002 10:43:22 -0700 (PDT) Message-Id: <200204101743.g3AHhMO40998@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9519 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9519 Change 9519 by jhb@jhb_laptop on 2002/04/10 10:42:23 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/include/ansi.h#11 integrate ... //depot/projects/smpng/sys/alpha/include/endian.h#7 integrate ... //depot/projects/smpng/sys/boot/common/interp_forth.c#4 integrate ... //depot/projects/smpng/sys/conf/NOTES#5 integrate ... //depot/projects/smpng/sys/dev/ata/ata-all.c#19 integrate ... //depot/projects/smpng/sys/dev/ata/ata-raid.c#11 integrate ... //depot/projects/smpng/sys/dev/digi/CX.c#2 integrate ... //depot/projects/smpng/sys/dev/digi/CX_PCI.c#2 integrate ... //depot/projects/smpng/sys/dev/digi/EPCX.c#2 integrate ... //depot/projects/smpng/sys/dev/digi/EPCX_PCI.c#2 integrate ... //depot/projects/smpng/sys/dev/digi/Xe.c#2 integrate ... //depot/projects/smpng/sys/dev/digi/Xem.c#2 integrate ... //depot/projects/smpng/sys/dev/digi/Xr.c#2 integrate ... //depot/projects/smpng/sys/dev/digi/digi.c#13 integrate ... //depot/projects/smpng/sys/dev/digi/digi.h#5 integrate ... //depot/projects/smpng/sys/dev/digi/digi_isa.c#4 integrate ... //depot/projects/smpng/sys/dev/pci/pci.c#10 integrate ... //depot/projects/smpng/sys/dev/snp/snp.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/umass.c#13 integrate ... //depot/projects/smpng/sys/i386/include/ansi.h#11 integrate ... //depot/projects/smpng/sys/i386/include/endian.h#8 integrate ... //depot/projects/smpng/sys/ia64/ia64/exception.s#18 integrate ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#26 integrate ... //depot/projects/smpng/sys/ia64/include/ansi.h#11 integrate ... //depot/projects/smpng/sys/ia64/include/endian.h#7 integrate ... //depot/projects/smpng/sys/kern/kern_linker.c#19 integrate ... //depot/projects/smpng/sys/kern/kern_time.c#13 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#42 integrate ... //depot/projects/smpng/sys/net/if.c#22 integrate ... //depot/projects/smpng/sys/netinet/in.c#12 integrate ... //depot/projects/smpng/sys/netinet/in.h#10 integrate ... //depot/projects/smpng/sys/netinet6/in6.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/ansi.h#11 integrate ... //depot/projects/smpng/sys/powerpc/include/endian.h#6 integrate ... //depot/projects/smpng/sys/sparc64/include/ansi.h#12 integrate ... //depot/projects/smpng/sys/sparc64/include/endian.h#7 integrate ... //depot/projects/smpng/sys/sys/ioccom.h#5 integrate ... //depot/projects/smpng/sys/sys/linker.h#5 integrate ... //depot/projects/smpng/sys/sys/param.h#20 integrate ... //depot/projects/smpng/sys/sys/types.h#12 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#8 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/include/ansi.h#11 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.26 2002/03/24 11:25:44 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.27 2002/04/10 15:58:11 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -53,6 +53,7 @@ #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ +#define _BSD_SEGSZ_T_ __int64_t /* segment size (in pages) */ #define _BSD_SIZE_T_ unsigned long /* sizeof() */ #define _BSD_SOCKLEN_T_ __uint32_t /* socklen_t (duh) */ #define _BSD_SSIZE_T_ long /* byte count or error */ ==== //depot/projects/smpng/sys/alpha/include/endian.h#7 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/alpha/include/endian.h,v 1.9 2002/03/09 21:02:11 mike Exp $ + * $FreeBSD: src/sys/alpha/include/endian.h,v 1.10 2002/04/10 14:39:12 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -46,17 +46,26 @@ #define _QUAD_HIGHWORD 1 #define _QUAD_LOWWORD 0 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ -#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ -#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ +#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ +#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ +#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ + +#define _BYTE_ORDER _LITTLE_ENDIAN -#define BYTE_ORDER LITTLE_ENDIAN -#endif /* !_POSIX_SOURCE */ +/* + * Deprecated variants that don't have enough underscores to be useful in more + * strict namespaces. + */ +#if __BSD_VISIBLE +#define LITTLE_ENDIAN _LITTLE_ENDIAN +#define BIG_ENDIAN _BIG_ENDIAN +#define PDP_ENDIAN _PDP_ENDIAN +#define BYTE_ORDER _BYTE_ORDER +#endif #ifdef __GNUC__ ==== //depot/projects/smpng/sys/boot/common/interp_forth.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/interp_forth.c,v 1.21 2001/12/10 08:09:40 obrien Exp $ + * $FreeBSD: src/sys/boot/common/interp_forth.c,v 1.22 2002/04/09 20:59:34 dcs Exp $ */ #include /* to pick up __FreeBSD_version */ @@ -53,6 +53,7 @@ * BootForth Interface to Ficl Forth interpreter. */ +FICL_SYSTEM *bf_sys; FICL_VM *bf_vm; FICL_WORD *pInterp; @@ -232,8 +233,8 @@ char create_buf[41]; /* 31 characters-long builtins */ int fd; - ficlInitSystem(10000); /* Default dictionary ~4000 cells */ - bf_vm = ficlNewVM(); + bf_sys = ficlInitSystem(10000); /* Default dictionary ~4000 cells */ + bf_vm = ficlNewVM(bf_sys); /* Put all private definitions in a "builtins" vocabulary */ ficlExec(bf_vm, "vocabulary builtins also builtins definitions"); @@ -243,7 +244,7 @@ /* make all commands appear as Forth words */ SET_FOREACH(cmdp, Xcommand_set) { - ficlBuild((*cmdp)->c_name, bf_command, FW_DEFAULT); + ficlBuild(bf_sys, (char *)(*cmdp)->c_name, bf_command, FW_DEFAULT); ficlExec(bf_vm, "forth definitions builtins"); sprintf(create_buf, "builtin: %s", (*cmdp)->c_name); ficlExec(bf_vm, create_buf); @@ -252,8 +253,8 @@ ficlExec(bf_vm, "only forth definitions"); /* Export some version numbers so that code can detect the loader/host version */ - ficlSetEnv("FreeBSD_version", __FreeBSD_version); - ficlSetEnv("loader_version", + ficlSetEnv(bf_sys, "FreeBSD_version", __FreeBSD_version); + ficlSetEnv(bf_sys, "loader_version", (bootprog_rev[0] - '0') * 10 + (bootprog_rev[2] - '0')); /* try to load and run init file if present */ @@ -263,7 +264,7 @@ } /* Do this last, so /boot/boot.4th can change it */ - pInterp = ficlLookup("interpret"); + pInterp = ficlLookup(bf_sys, "interpret"); } /* ==== //depot/projects/smpng/sys/conf/NOTES#5 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1019 2002/04/09 18:26:49 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1020 2002/04/10 17:27:52 brian Exp $ # # @@ -1767,7 +1767,7 @@ hint.digi.0.at="isa" hint.digi.0.port="0x104" hint.digi.0.maddr="0xd0000" -# BIOS & FEP/OS components of device digi. Normally left as modules +# BIOS & FEP/OS components of device digi. device digi_CX device digi_CX_PCI device digi_EPCX ==== //depot/projects/smpng/sys/dev/ata/ata-all.c#19 (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. * - * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.148 2002/04/05 18:37:04 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.149 2002/04/10 11:18:07 sos Exp $ */ #include "opt_ata.h" @@ -406,7 +406,7 @@ iocmd->u.enclosure.temp = temp; iocmd->u.enclosure.v05 = ata_drawersensor(atadev, 0, 0x23, 0) * 27; iocmd->u.enclosure.v12 = ata_drawersensor(atadev, 0, 0x24, 0) * 61; - + ATA_UNLOCK_CH(ch); return 0; } ==== //depot/projects/smpng/sys/dev/ata/ata-raid.c#11 (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. * - * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.44 2002/04/02 13:47:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.45 2002/04/10 11:18:07 sos Exp $ */ #include "opt_ata.h" @@ -97,11 +97,12 @@ continue; for (disk = 0; disk < rdp->total_disks; disk++) { - if (rdp->disks[disk].device == adp->device) { + if ((rdp->disks[disk].flags & AR_DF_ASSIGNED) && + rdp->disks[disk].device == adp->device) { ata_prtdev(rdp->disks[disk].device, "inserted into ar%d disk%d as spare\n", array, disk); - rdp->disks[disk].flags = (AR_DF_PRESENT | AR_DF_SPARE); + rdp->disks[disk].flags |= (AR_DF_PRESENT | AR_DF_SPARE); AD_SOFTC(rdp->disks[disk])->flags = AD_F_RAID_SUBDISK; ar_config_changed(rdp, 1); return 1; @@ -216,18 +217,19 @@ } printf(" subdisks:\n"); for (disk = 0; disk < rdp->total_disks; disk++) { - if (rdp->disks[disk].flags & AR_DF_ONLINE) - printf(" %d READY ", disk); + if (rdp->disks[disk].flags & AR_DF_PRESENT) { + if (rdp->disks[disk].flags & AR_DF_ONLINE) + printf(" %d READY ", disk); + else if (rdp->disks[disk].flags & AR_DF_SPARE) + printf(" %d SPARE ", disk); + else + printf(" %d FREE ", disk); + ad_print(AD_SOFTC(rdp->disks[disk])); + } else if (rdp->disks[disk].flags & AR_DF_ASSIGNED) - printf(" %d DOWN ", disk); - else if (rdp->disks[disk].flags & AR_DF_SPARE) - printf(" %d SPARE ", disk); - else if (rdp->disks[disk].flags & AR_DF_PRESENT) - printf(" %d FREE ", disk); + printf(" %d DOWN\n", disk); else printf(" %d INVALID no RAID config info on this disk\n", disk); - if (rdp->disks[disk].flags & AR_DF_PRESENT) - ad_print(AD_SOFTC(rdp->disks[disk])); } } @@ -286,7 +288,8 @@ break; } if (rdp->flags & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID) && - (rdp->flags & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID)) != ctlr){ + (rdp->flags & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID)) != + (ctlr & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID))) { free(rdp, M_AR); return EXDEV; } @@ -555,7 +558,8 @@ switch (rdp->flags & (AR_F_RAID0 | AR_F_RAID1 | AR_F_SPAN)) { case AR_F_SPAN: case AR_F_RAID0: - if (rdp->disks[buf1->drive].flags & AR_DF_ONLINE && + if ((rdp->disks[buf1->drive].flags & + (AR_DF_PRESENT|AR_DF_ONLINE))==(AR_DF_PRESENT|AR_DF_ONLINE) && !AD_SOFTC(rdp->disks[buf1->drive])->dev->si_disk) { rdp->disks[buf1->drive].flags &= ~AR_DF_ONLINE; ar_config_changed(rdp, 1); @@ -579,12 +583,14 @@ tsleep(rdp, PRIBIO, "arwait", 0); } } - if (rdp->disks[buf1->drive].flags & AR_DF_ONLINE && + if ((rdp->disks[buf1->drive].flags & + (AR_DF_PRESENT|AR_DF_ONLINE))==(AR_DF_PRESENT|AR_DF_ONLINE) && !AD_SOFTC(rdp->disks[buf1->drive])->dev->si_disk) { rdp->disks[buf1->drive].flags &= ~AR_DF_ONLINE; change = 1; } - if (rdp->disks[buf1->drive + rdp->width].flags & AR_DF_ONLINE && + if ((rdp->disks[buf1->drive + rdp->width].flags & + (AR_DF_PRESENT|AR_DF_ONLINE))==(AR_DF_PRESENT|AR_DF_ONLINE) && !AD_SOFTC(rdp->disks[buf1->drive + rdp->width])->dev->si_disk) { rdp->disks[buf1->drive + rdp->width].flags &= ~AR_DF_ONLINE; change = 1; @@ -727,6 +733,10 @@ rdp->flags |= AR_F_READY; rdp->flags &= ~AR_F_DEGRADED; + for (disk = 0; disk < rdp->total_disks; disk++) + if (!(rdp->disks[disk].flags & AR_DF_PRESENT)) + rdp->disks[disk].flags &= ~AR_DF_ONLINE; + for (disk = 0; disk < rdp->total_disks; disk++) { switch (rdp->flags & (AR_F_RAID0 | AR_F_RAID1 | AR_F_SPAN)) { case AR_F_SPAN: @@ -1228,12 +1238,12 @@ raid->disks[disk].flags |= AR_DF_ONLINE; if (info->raid.disk[disk].flags & PR_F_ASSIGNED) raid->disks[disk].flags |= AR_DF_ASSIGNED; - if (info->raid.disk[disk].flags & PR_F_SPARE) + if (info->raid.disk[disk].flags & PR_F_SPARE) { + raid->disks[disk].flags &= ~AR_DF_ONLINE; raid->disks[disk].flags |= AR_DF_SPARE; - if (info->raid.disk[disk].flags & (PR_F_REDIR | PR_F_DOWN)) { + } + if (info->raid.disk[disk].flags & (PR_F_REDIR | PR_F_DOWN)) raid->disks[disk].flags &= ~AR_DF_ONLINE; - raid->disks[disk].flags |= AR_DF_PRESENT; - } } if (!disksum) { free(raidp[array], M_AR); @@ -1285,18 +1295,8 @@ config->magic_0 = PR_MAGIC0(rdp->disks[disk]) | timestamp.tv_sec; config->magic_1 = timestamp.tv_sec >> 16; config->magic_2 = timestamp.tv_sec; - config->raid.integrity = PR_I_VALID; - config->raid.flags = 0; - if (rdp->disks[disk].flags & AR_DF_PRESENT) - config->raid.flags |= PR_F_VALID; - if (rdp->disks[disk].flags & AR_DF_ASSIGNED) - config->raid.flags |= PR_F_ASSIGNED; - if (rdp->disks[disk].flags & AR_DF_ONLINE) - config->raid.flags |= PR_F_ONLINE; - else - config->raid.flags |= PR_F_DOWN; config->raid.disk_number = disk; if (rdp->disks[disk].flags & AR_DF_PRESENT && rdp->disks[disk].device) { config->raid.channel = rdp->disks[disk].device->channel->unit; @@ -1310,6 +1310,7 @@ config->raid.generation = rdp->generation; if (rdp->flags & AR_F_READY) { + config->raid.flags = (PR_F_VALID | PR_F_ASSIGNED | PR_F_ONLINE); config->raid.status = (PR_S_VALID | PR_S_ONLINE | PR_S_INITED | PR_S_READY); if (rdp->flags & AR_F_DEGRADED) @@ -1317,8 +1318,10 @@ else config->raid.status |= PR_S_FUNCTIONAL; } - else + else { + config->raid.flags = PR_F_DOWN; config->raid.status = 0; + } switch (rdp->flags & (AR_F_RAID0 | AR_F_RAID1 | AR_F_SPAN)) { case AR_F_RAID0: ==== //depot/projects/smpng/sys/dev/digi/CX.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/CX.c,v 1.1 2001/05/02 01:08:02 brian Exp $ + * $FreeBSD: src/sys/dev/digi/CX.c,v 1.2 2002/04/10 01:12:55 brian Exp $ */ #include @@ -42,4 +42,5 @@ { NULL, 0 } }; +MODULE_VERSION(digi_CX, 1); DEV_MODULE(digi_CX, 0, 0); ==== //depot/projects/smpng/sys/dev/digi/CX_PCI.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/CX_PCI.c,v 1.1 2001/05/02 01:08:02 brian Exp $ + * $FreeBSD: src/sys/dev/digi/CX_PCI.c,v 1.2 2002/04/10 01:12:55 brian Exp $ */ #include @@ -42,4 +42,5 @@ { NULL, 0 } }; +MODULE_VERSION(digi_CX_PCI, 1); DEV_MODULE(digi_CX_PCI, 0, 0); ==== //depot/projects/smpng/sys/dev/digi/EPCX.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/EPCX.c,v 1.1 2001/05/02 01:08:02 brian Exp $ + * $FreeBSD: src/sys/dev/digi/EPCX.c,v 1.2 2002/04/10 01:12:55 brian Exp $ */ #include @@ -42,4 +42,5 @@ { NULL, 0 } }; +MODULE_VERSION(digi_EPCX, 1); DEV_MODULE(digi_EPCX, 0, 0); ==== //depot/projects/smpng/sys/dev/digi/EPCX_PCI.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/EPCX_PCI.c,v 1.1 2001/05/02 01:08:02 brian Exp $ + * $FreeBSD: src/sys/dev/digi/EPCX_PCI.c,v 1.2 2002/04/10 01:12:55 brian Exp $ */ #include @@ -42,4 +42,5 @@ { NULL, 0 } }; +MODULE_VERSION(digi_EPCX_PCI, 1); DEV_MODULE(digi_EPCX_PCI, 0, 0); ==== //depot/projects/smpng/sys/dev/digi/Xe.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/Xe.c,v 1.1 2001/05/02 01:08:02 brian Exp $ + * $FreeBSD: src/sys/dev/digi/Xe.c,v 1.2 2002/04/10 01:12:55 brian Exp $ */ #include @@ -42,4 +42,5 @@ { NULL, 0 } }; +MODULE_VERSION(digi_Xe, 1); DEV_MODULE(digi_Xe, 0, 0); ==== //depot/projects/smpng/sys/dev/digi/Xem.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/Xem.c,v 1.1 2001/05/02 01:08:03 brian Exp $ + * $FreeBSD: src/sys/dev/digi/Xem.c,v 1.2 2002/04/10 01:12:55 brian Exp $ */ #include @@ -42,4 +42,5 @@ { NULL, 0 } }; +MODULE_VERSION(digi_Xem, 1); DEV_MODULE(digi_Xem, 0, 0); ==== //depot/projects/smpng/sys/dev/digi/Xr.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/Xr.c,v 1.1 2001/05/02 01:08:03 brian Exp $ + * $FreeBSD: src/sys/dev/digi/Xr.c,v 1.2 2002/04/10 01:12:55 brian Exp $ */ #include @@ -42,4 +42,5 @@ { NULL, 0 } }; +MODULE_VERSION(digi_Xr, 1); DEV_MODULE(digi_Xr, 0, 0); ==== //depot/projects/smpng/sys/dev/digi/digi.c#13 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi.c,v 1.21 2002/04/01 21:30:32 jhb Exp $ + * $FreeBSD: src/sys/dev/digi/digi.c,v 1.27 2002/04/10 14:32:55 brian Exp $ */ /*- @@ -221,6 +221,15 @@ return (1); } +void +digi_delay(struct digi_softc *sc, const char *txt, u_long timo) +{ + if (cold) + DELAY(timo * 1000000 / hz); + else + tsleep(sc, PUSER | PCATCH, txt, timo); +} + static int digi_init(struct digi_softc *sc) { @@ -298,19 +307,19 @@ case PCXEM: case PCIEPCX: case PCIXR: - if (sc->model == PCIXR) + if (sc->pcibus) PCIPORT = FEPRST; else outb(sc->port, FEPRST | FEPMEM); - for (i = 0; ((sc->model == PCIXR ? PCIPORT : inb(sc->port)) & + for (i = 0; ((sc->pcibus ? PCIPORT : inb(sc->port)) & FEPMASK) != FEPRST; i++) { - if (i > 1000) { - log(LOG_ERR, "digi%d: init reset failed\n", - sc->res.unit); + if (i > 100) { + log(LOG_ERR, "digi%d: %s init reset failed\n", + sc->res.unit, sc->name); return (EIO); } - tsleep(sc, PUSER | PCATCH, "digiinit0", 1); + digi_delay(sc, "digiinit0", 5); } DLOG(DIGIDB_INIT, (sc->dev, "Got init reset after %d us\n", i)); @@ -348,7 +357,7 @@ ptr = sc->setwin(sc, MISCGLOBAL); W(ptr) = 0; - if (sc->model == PCIXR) { + if (sc->pcibus) { PCIPORT = FEPCLR; resp = FEPRST; } else if (sc->model == PCXEVE) { @@ -359,26 +368,26 @@ resp = FEPRST | FEPMEM; } - for (i = 0; ((sc->model == PCIXR ? PCIPORT : inb(sc->port)) & FEPMASK) + for (i = 0; ((sc->pcibus ? PCIPORT : inb(sc->port)) & FEPMASK) == resp; i++) { - if (i > 1000) { + if (i > 100) { log(LOG_ERR, "digi%d: BIOS start failed\n", sc->res.unit); return (EIO); } - tsleep(sc, PUSER | PCATCH, "digibios0", 1); + digi_delay(sc, "digibios0", 5); } DLOG(DIGIDB_INIT, (sc->dev, "BIOS started after %d us\n", i)); for (i = 0; vW(ptr) != *(u_short *)"GD"; i++) { - if (i > 2000) { + if (i > 200) { log(LOG_ERR, "digi%d: BIOS boot failed " "(0x%02x != 0x%02x)\n", sc->res.unit, vW(ptr), *(u_short *)"GD"); return (EIO); } - tsleep(sc, PUSER | PCATCH, "digibios1", 1); + digi_delay(sc, "digibios1", 5); } DLOG(DIGIDB_INIT, (sc->dev, "BIOS booted after %d iterations\n", i)); @@ -412,13 +421,13 @@ outb(sc->port, FEPCLR | FEPMEM); for (i = 0; W(ptr); i++) { - if (i > 10) { + if (i > 100) { log(LOG_ERR, "digi%d: FEP/OS move failed\n", sc->res.unit); sc->hidewin(sc); return (EIO); } - tsleep(sc, PUSER | PCATCH, "digifep0", 1); + digi_delay(sc, "digifep0", 5); } DLOG(DIGIDB_INIT, (sc->dev, "FEP/OS moved after %d iterations\n", i)); @@ -497,14 +506,14 @@ /* Now wait 'till the FEP/OS has booted */ for (i = 0; vW(ptr) != *(u_short *)"OS"; i++) { - if (i > 2000) { + if (i > 200) { log(LOG_ERR, "digi%d: FEP/OS start failed " "(0x%02x != 0x%02x)\n", sc->res.unit, vW(ptr), *(u_short *)"OS"); sc->hidewin(sc); return (EIO); } - tsleep(sc, PUSER | PCATCH, "digifep1", 1); + digi_delay(sc, "digifep1", 5); } DLOG(DIGIDB_INIT, (sc->dev, "FEP/OS started after %d iterations\n", i)); @@ -1028,8 +1037,14 @@ modlen = strlen(sc->module); modfile = malloc(modlen + 6, M_TEMP, M_WAITOK); snprintf(modfile, modlen + 6, "digi_%s", sc->module); - if ((res = linker_reference_module(modfile, &lf)) != 0) - printf("%s: Failed %d to load module\n", modfile, res); + if ((res = linker_reference_module(modfile, NULL, &lf)) != 0) { + if (res == ENOENT && rootdev == NODEV) + printf("%s: Failed to autoload module: No filesystem\n", + modfile); + else + printf("%s: Failed %d to autoload module\n", modfile, + res); + } free(modfile, M_TEMP); if (res != 0) return (res); @@ -1944,3 +1959,5 @@ { return (0); } + +MODULE_VERSION(digi, 1); ==== //depot/projects/smpng/sys/dev/digi/digi.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi.h,v 1.10 2002/02/27 23:47:45 peter Exp $ + * $FreeBSD: src/sys/dev/digi/digi.h,v 1.12 2002/04/10 14:32:55 brian Exp $ */ #define W(p) (*(u_int16_t *)(p)) @@ -215,3 +215,5 @@ int digi_attach(struct digi_softc *); int digi_detach(device_t _dev); int digi_shutdown(device_t _dev); +void digi_delay(struct digi_softc *_sc, const char *_txt, + u_long _timo); ==== //depot/projects/smpng/sys/dev/digi/digi_isa.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi_isa.c,v 1.7 2002/02/27 23:47:45 peter Exp $ + * $FreeBSD: src/sys/dev/digi/digi_isa.c,v 1.9 2002/04/10 14:32:55 brian Exp $ */ /*- @@ -112,12 +112,14 @@ /* Invasive probe - reset the card */ outb(sc->port, FEPRST); - for (i = 1000; DELAY(1), i >= 0; i--) + for (i = 0; i < 10; i++) { if ((inb(sc->port) & FEPMASK) == FEPRST) break; - if (i == -1) + digi_delay(sc, "digirst", 1); + } + if (i == 10) return (NULL); - DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d us\n", 1000 - i)); + DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d delays\n", i)); ident = inb(sc->port); @@ -373,18 +375,17 @@ reset |= FEPMEM; outb(sc->port, reset); - for (i = 10; DELAY(1), i >= 0; i--) { + for (i = 0; i < 10; i++) { if ((inb(sc->port) & FEPMASK) == reset) break; - tsleep(sc, PUSER | PCATCH, "digirst0", hz / 5); + digi_delay(sc, "digirst1", 1); } - if (i == -1) { + if (i == 10) { device_printf(dev, "1st reset failed\n"); sc->hidewin(sc); goto failed; } - DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d us\n", - (10 - i) * (hz / 5))); + DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d delays\n", i)); if (sc->model != PCXI) { t = (sc->pmem >> 8) & 0xffe0; @@ -396,17 +397,18 @@ if (sc->model == PCXI || sc->model == PCXE) { outb(sc->port, FEPRST | FEPMEM); - for (i = 10000; DELAY(1), i >= 0; i--) + for (i = 0; i < 10; i++) { if ((inb(sc->port) & FEPMASK) != FEPRST) break; - if (i == -1) { + digi_delay(sc, "digirst2", 1); + } + if (i == 10) { device_printf(dev, "2nd reset failed (0x%02x)\n", inb(sc->port)); sc->hidewin(sc); goto failed; } - DLOG(DIGIDB_INIT, (sc->dev, "got memory after %d us\n", - 10000 - i)); + DLOG(DIGIDB_INIT, (sc->dev, "got memory after %d delays\n", i)); } DLOG(DIGIDB_INIT, (sc->dev, "short memory test\n")); ==== //depot/projects/smpng/sys/dev/pci/pci.c#10 (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. * - * $FreeBSD: src/sys/dev/pci/pci.c,v 1.188 2002/03/13 16:32:11 imp Exp $ + * $FreeBSD: src/sys/dev/pci/pci.c,v 1.189 2002/04/10 07:35:28 n_hibma Exp $ * */ @@ -750,7 +750,11 @@ pci_add_map(pcib, b, s, f, q->arg1, rl); } - if (cfg->intpin > 0 && cfg->intline != 255) { + if (cfg->intpin > 0 && cfg->intline != 255 +#ifdef __i386__ + && cfg->intline != 0 +#endif + ) { #ifdef __ia64__ /* * Re-route interrupts on ia64 so that we can get the ==== //depot/projects/smpng/sys/dev/snp/snp.c#8 (text+ko) ==== @@ -12,7 +12,7 @@ * * Snoop stuff. * - * $FreeBSD: src/sys/dev/snp/snp.c,v 1.72 2002/03/20 02:07:42 alfred Exp $ + * $FreeBSD: src/sys/dev/snp/snp.c,v 1.73 2002/04/10 03:51:49 dd Exp $ */ #include @@ -202,7 +202,7 @@ struct snoop *snp; struct tty *tp; int error, i, len; - char c[SNP_INPUT_BUF]; + unsigned char c[SNP_INPUT_BUF]; snp = dev->si_drv1; tp = snp->snp_tty; ==== //depot/projects/smpng/sys/dev/usb/umass.c#13 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.57 2002/04/01 21:13:21 joe Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.58 2002/04/10 13:22:12 n_hibma Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -394,25 +394,26 @@ int transfer_status; int transfer_state; -# define TSTATE_IDLE 0 -# define TSTATE_BBB_COMMAND 1 /* CBW transfer */ -# define TSTATE_BBB_DATA 2 /* Data transfer */ -# define TSTATE_BBB_DCLEAR 3 /* clear endpt stall */ -# define TSTATE_BBB_STATUS1 4 /* clear endpt stall */ -# define TSTATE_BBB_SCLEAR 5 /* clear endpt stall */ -# define TSTATE_BBB_STATUS2 6 /* CSW transfer */ -# define TSTATE_BBB_RESET1 7 /* reset command */ -# define TSTATE_BBB_RESET2 8 /* in clear stall */ -# define TSTATE_BBB_RESET3 9 /* out clear stall */ -# define TSTATE_CBI_COMMAND 10 /* command transfer */ -# define TSTATE_CBI_DATA 11 /* data transfer */ -# define TSTATE_CBI_STATUS 12 /* status transfer */ -# define TSTATE_CBI_DCLEAR 13 /* clear ep stall */ -# define TSTATE_CBI_SCLEAR 14 /* clear ep stall */ -# define TSTATE_CBI_RESET1 15 /* reset command */ -# define TSTATE_CBI_RESET2 16 /* in clear stall */ -# define TSTATE_CBI_RESET3 17 /* out clear stall */ -# define TSTATE_STATES 18 /* # of states above */ +# define TSTATE_ATTACH 0 /* in attach */ +# define TSTATE_IDLE 1 +# define TSTATE_BBB_COMMAND 2 /* CBW transfer */ +# define TSTATE_BBB_DATA 3 /* Data transfer */ +# define TSTATE_BBB_DCLEAR 4 /* clear endpt stall */ +# define TSTATE_BBB_STATUS1 5 /* clear endpt stall */ +# define TSTATE_BBB_SCLEAR 6 /* clear endpt stall */ +# define TSTATE_BBB_STATUS2 7 /* CSW transfer */ +# define TSTATE_BBB_RESET1 8 /* reset command */ +# define TSTATE_BBB_RESET2 9 /* in clear stall */ +# define TSTATE_BBB_RESET3 10 /* out clear stall */ +# define TSTATE_CBI_COMMAND 11 /* command transfer */ +# define TSTATE_CBI_DATA 12 /* data transfer */ +# define TSTATE_CBI_STATUS 13 /* status transfer */ +# define TSTATE_CBI_DCLEAR 14 /* clear ep stall */ +# define TSTATE_CBI_SCLEAR 15 /* clear ep stall */ +# define TSTATE_CBI_RESET1 16 /* reset command */ +# define TSTATE_CBI_RESET2 17 /* in clear stall */ +# define TSTATE_CBI_RESET3 18 /* out clear stall */ +# define TSTATE_STATES 19 /* # of states above */ /* SCSI/CAM specific variables */ @@ -428,6 +429,7 @@ #ifdef UMASS_DEBUG char *states[TSTATE_STATES+1] = { /* should be kept in sync with the list at transfer_state */ + "Attach", "Idle", "BBB CBW", "BBB Data", @@ -932,7 +934,7 @@ } /* initialisation of generic part */ - sc->transfer_state = TSTATE_IDLE; + sc->transfer_state = TSTATE_ATTACH; /* request a sufficient number of xfer handles */ for (i = 0; i < XFER_NR; i++) { @@ -1015,7 +1017,7 @@ __FILE__, __LINE__, sc->proto); } - + sc->transfer_state = TSTATE_IDLE; DPRINTF(UDMASS_GEN, ("%s: Attach finished\n", USBDEVNAME(sc->sc_dev))); USB_ATTACH_SUCCESS_RETURN; ==== //depot/projects/smpng/sys/i386/include/ansi.h#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/i386/include/ansi.h,v 1.36 2002/03/24 11:25:45 obrien Exp $ + * $FreeBSD: src/sys/i386/include/ansi.h,v 1.37 2002/04/10 15:58:11 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -52,6 +52,7 @@ #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ +#define _BSD_SEGSZ_T_ __int32_t /* segment size (in pages) */ #define _BSD_SIZE_T_ unsigned int /* sizeof() */ #define _BSD_SOCKLEN_T_ __uint32_t /* socklen_t (duh) */ #define _BSD_SSIZE_T_ int /* byte count or error */ ==== //depot/projects/smpng/sys/i386/include/endian.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)endian.h 7.8 (Berkeley) 4/3/91 - * $FreeBSD: src/sys/i386/include/endian.h,v 1.32 2002/03/09 21:02:12 mike Exp $ + * $FreeBSD: src/sys/i386/include/endian.h,v 1.33 2002/04/10 14:39:13 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -46,17 +46,26 @@ #define _QUAD_HIGHWORD 1 #define _QUAD_LOWWORD 0 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ -#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ -#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ +#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ +#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ +#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ + +#define _BYTE_ORDER _LITTLE_ENDIAN -#define BYTE_ORDER LITTLE_ENDIAN -#endif /* ! _POSIX_SOURCE */ +/* + * Deprecated variants that don't have enough underscores to be useful in more + * strict namespaces. + */ +#if __BSD_VISIBLE +#define LITTLE_ENDIAN _LITTLE_ENDIAN +#define BIG_ENDIAN _BIG_ENDIAN +#define PDP_ENDIAN _PDP_ENDIAN +#define BYTE_ORDER _BYTE_ORDER +#endif #ifdef __GNUC__ ==== //depot/projects/smpng/sys/ia64/ia64/exception.s#18 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/exception.s,v 1.32 2002/03/29 16:35:25 jake Exp $ + * $FreeBSD: src/sys/ia64/ia64/exception.s,v 1.33 2002/04/10 16:35:44 dfr Exp $ */ #include @@ -1406,8 +1406,49 @@ mov out1=r16 // arguments add out2=(8*8),r16 // trapframe pointer br.call.sptk.many rp=syscall // do the work +} { .mmi +3: rsm psr.i // we know that psr.i == 1 + add r14=PC_CURTHREAD,r13 // &curthread + nop.i 0 + ;; +} { .mmi + ld8 r14=[r14] // curthread + ;; + add r14=TD_KSE,r14 // &curthread->td_kse + nop.i 0 + ;; +} { .mmi + ld8 r14=[r14] // curkse + ;; + add r14=KE_FLAGS,r14 // &curkse->ke_flags + nop.i 0 + ;; +} { .mmi + ld4 r14=[r14] // curkse->ke_flags + ;; + nop.m 0 + tbit.nz p6,p7=r14,10 // KEF_ASTPENDING + ;; +} { .mib + nop.m 0 +(p7) tbit.nz.or.andcm p6,p7=r14,11 // KEF_NEEDRESCHED +(p7) br.cond.dptk 2f + ;; +} { .mmi + ssm psr.i // restore interrupts + ;; + srlz.d + mov out0=loc0 // trapframe argument to ast() +} { .mib + nop.m 0 + nop.i 0 + br.call.sptk.many rp=ast +} { .mib + nop.m 0 + nop.i 0 + br 3b } { .mii >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 11:42:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1970837B41B; Wed, 10 Apr 2002 11:41:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9B63D37B417 for ; Wed, 10 Apr 2002 11:41:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3AIfdQ56595 for perforce@freebsd.org; Wed, 10 Apr 2002 11:41:39 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Wed, 10 Apr 2002 11:41:39 -0700 (PDT) Message-Id: <200204101841.g3AIfdQ56595@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9523 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9523 Change 9523 by jhb@jhb_laptop on 2002/04/10 11:41:27 Merge a bunch of stuff over from jhb_proc. Affected files ... ... //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#14 integrate ... //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#15 edit ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#18 edit ... //depot/projects/smpng/sys/compat/linux/linux_uid16.c#10 edit ... //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#5 edit ... //depot/projects/smpng/sys/ddb/db_ps.c#6 edit ... //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#9 edit ... //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#7 edit ... //depot/projects/smpng/sys/fs/procfs/procfs_fpregs.c#7 edit ... //depot/projects/smpng/sys/fs/procfs/procfs_mem.c#5 edit ... //depot/projects/smpng/sys/fs/procfs/procfs_regs.c#7 edit ... //depot/projects/smpng/sys/fs/procfs/procfs_status.c#10 edit ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#13 edit ... //depot/projects/smpng/sys/kern/kern_exec.c#33 edit ... //depot/projects/smpng/sys/kern/kern_exit.c#31 edit ... //depot/projects/smpng/sys/kern/kern_fork.c#35 edit ... //depot/projects/smpng/sys/kern/kern_intr.c#16 edit ... //depot/projects/smpng/sys/kern/kern_ktrace.c#19 edit ... //depot/projects/smpng/sys/kern/kern_prot.c#57 edit ... //depot/projects/smpng/sys/kern/kern_resource.c#20 edit ... //depot/projects/smpng/sys/kern/kern_sig.c#30 edit ... //depot/projects/smpng/sys/kern/sys_process.c#13 edit ... //depot/projects/smpng/sys/security/lomac/kernel_log.c#3 edit ... //depot/projects/smpng/sys/sys/proc.h#43 edit Differences ... ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#14 (text+ko) ==== @@ -1060,13 +1060,18 @@ p = td->td_proc; uid = SCARG(uap, uid); + newcred = crget(); + PROC_LOCK(p); oldcred = p->p_ucred; if ((error = suser_cred(p->p_ucred, PRISON_ROOT)) != 0 && - uid != oldcred->cr_ruid && uid != oldcred->cr_svuid) + uid != oldcred->cr_ruid && uid != oldcred->cr_svuid) { + PROC_UNLOCK(p); + crfree(newcred); return (error); + } - newcred = crdup(oldcred); + crcopy(newcred, oldcred); if (error == 0) { if (uid != oldcred->cr_ruid) { change_ruid(newcred, uid); @@ -1082,6 +1087,7 @@ setsugid(p); } p->p_ucred = newcred; + PROC_UNLOCK(p); crfree(oldcred); return (0); } @@ -1106,13 +1112,18 @@ p = td->td_proc; gid = SCARG(uap, gid); + newcred = crget(); + PROC_LOCK(p); oldcred = p->p_ucred; if (((error = suser_cred(p->p_ucred, PRISON_ROOT)) != 0 ) && - gid != oldcred->cr_rgid && gid != oldcred->cr_svgid) + gid != oldcred->cr_rgid && gid != oldcred->cr_svgid) { + PROC_UNLOCK(p); + crfree(newcred); return (error); + } - newcred = crdup(oldcred); + crcopy(newcred, oldcred); if (error == 0) { if (gid != oldcred->cr_rgid) { change_rgid(newcred, gid); @@ -1128,6 +1139,7 @@ setsugid(p); } p->p_ucred = newcred; + PROC_UNLOCK(p); crfree(oldcred); return (0); } ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#15 (text+ko) ==== @@ -672,23 +672,21 @@ * Linux behaviour is to return zero-length in this case. */ - if (ps_argsopen || !p_cansee(td->td_proc, p)) { - PROC_LOCK(p); - if (p->p_args) { - sbuf_bcpy(sb, p->p_args->ar_args, p->p_args->ar_length); - PROC_UNLOCK(p); - } else if (p != td->td_proc) { - sbuf_printf(sb, "%.*s", MAXCOMLEN, p->p_comm); - PROC_UNLOCK(p); - } else { - PROC_UNLOCK(p); - error = copyin((void*)PS_STRINGS, &pstr, sizeof(pstr)); - if (error) - return (error); - for (i = 0; i < pstr.ps_nargvstr; i++) { - sbuf_copyin(sb, pstr.ps_argvstr[i], 0); - sbuf_printf(sb, "%c", '\0'); - } + PROC_LOCK(p); + if (p->p_args && (ps_argsopen || !p_cansee(td->td_proc, p))) { + sbuf_bcpy(sb, p->p_args->ar_args, p->p_args->ar_length); + PROC_UNLOCK(p); + } else if (p != td->td_proc) { + PROC_UNLOCK(p); + sbuf_printf(sb, "%.*s", MAXCOMLEN, p->p_comm); + } else { + PROC_UNLOCK(p); + error = copyin((void*)PS_STRINGS, &pstr, sizeof(pstr)); + if (error) + return (error); + for (i = 0; i < pstr.ps_nargvstr; i++) { + sbuf_copyin(sb, pstr.ps_argvstr[i], 0); + sbuf_printf(sb, "%c", '\0'); } } ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#18 (text+ko) ==== @@ -970,9 +970,19 @@ l_gid_t linux_gidset[NGROUPS]; gid_t *bsd_gidset; int ngrp, error; + struct proc *p; ngrp = args->gidsetsize; - oldcred = td->td_proc->p_ucred; + if (ngrp >= NGROUPS) + return (EINVAL); + error = copyin((caddr_t)args->grouplist, linux_gidset, + ngrp * sizeof(l_gid_t)); + if (error) + return (error); + newcred = crget(); + p = td->td_proc; + PROC_LOCK(p); + oldcred = p->p_ucred; /* * cr_groups[0] holds egid. Setting the whole set from @@ -980,19 +990,14 @@ * Keep cr_groups[0] unchanged to prevent that. */ - if ((error = suser_cred(oldcred, PRISON_ROOT)) != 0) + if ((error = suser_cred(oldcred, PRISON_ROOT)) != 0) { + PROC_UNLOCK(p); + crfree(newcred); return (error); + } - if (ngrp >= NGROUPS) - return (EINVAL); - - newcred = crdup(oldcred); + crcopy(newcred, oldcred); if (ngrp > 0) { - error = copyin((caddr_t)args->grouplist, linux_gidset, - ngrp * sizeof(l_gid_t)); - if (error) - return (error); - newcred->cr_ngroups = ngrp + 1; bsd_gidset = newcred->cr_groups; @@ -1005,8 +1010,9 @@ else newcred->cr_ngroups = 1; - setsugid(td->td_proc); - td->td_proc->p_ucred = newcred; + setsugid(p); + p->p_ucred = newcred; + PROC_UNLOCK(p); crfree(oldcred); return (0); } @@ -1019,7 +1025,7 @@ gid_t *bsd_gidset; int bsd_gidsetsz, ngrp, error; - cred = td->td_proc->p_ucred; + cred = td->td_ucred; bsd_gidset = cred->cr_groups; bsd_gidsetsz = cred->cr_ngroups - 1; @@ -1310,7 +1316,7 @@ linux_getgid(struct thread *td, struct linux_getgid_args *args) { - td->td_retval[0] = td->td_proc->p_ucred->cr_rgid; + td->td_retval[0] = td->td_ucred->cr_rgid; return (0); } @@ -1318,7 +1324,7 @@ linux_getuid(struct thread *td, struct linux_getuid_args *args) { - td->td_retval[0] = td->td_proc->p_ucred->cr_ruid; + td->td_retval[0] = td->td_ucred->cr_ruid; return (0); } ==== //depot/projects/smpng/sys/compat/linux/linux_uid16.c#10 (text+ko) ==== @@ -30,6 +30,8 @@ #include #include +#include +#include #include #include @@ -93,6 +95,7 @@ l_gid16_t linux_gidset[NGROUPS]; gid_t *bsd_gidset; int ngrp, error; + struct proc *p; #ifdef DEBUG if (ldebug(setgroups16)) @@ -100,7 +103,16 @@ #endif ngrp = args->gidsetsize; - oldcred = td->td_proc->p_ucred; + if (ngrp >= NGROUPS) + return (EINVAL); + error = copyin((caddr_t)args->gidset, linux_gidset, + ngrp * sizeof(l_gid16_t)); + if (error) + return (error); + newcred = crget(); + p = td->td_proc; + PROC_LOCK(p); + oldcred = p->p_ucred; /* * cr_groups[0] holds egid. Setting the whole set from @@ -108,19 +120,14 @@ * Keep cr_groups[0] unchanged to prevent that. */ - if ((error = suser_cred(oldcred, PRISON_ROOT)) != 0) + if ((error = suser_cred(oldcred, PRISON_ROOT)) != 0) { + PROC_UNLOCK(p); + crfree(newcred); return (error); + } - if (ngrp >= NGROUPS) - return (EINVAL); - - newcred = crdup(oldcred); + crcopy(newcred, oldcred); if (ngrp > 0) { - error = copyin((caddr_t)args->gidset, linux_gidset, - ngrp * sizeof(l_gid16_t)); - if (error) - return (error); - newcred->cr_ngroups = ngrp + 1; bsd_gidset = newcred->cr_groups; @@ -134,7 +141,8 @@ newcred->cr_ngroups = 1; setsugid(td->td_proc); - td->td_proc->p_ucred = newcred; + p->p_ucred = newcred; + PROC_UNLOCK(p); crfree(oldcred); return (0); } ==== //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#5 (text+ko) ==== @@ -44,7 +44,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -213,10 +215,12 @@ AUXARGS_ENTRY(pos, AT_FLAGS, args->flags); AUXARGS_ENTRY(pos, AT_ENTRY, args->entry); AUXARGS_ENTRY(pos, AT_BASE, args->base); + PROC_LOCK(imgp->proc); AUXARGS_ENTRY(pos, AT_UID, imgp->proc->p_ucred->cr_ruid); AUXARGS_ENTRY(pos, AT_EUID, imgp->proc->p_ucred->cr_svuid); AUXARGS_ENTRY(pos, AT_GID, imgp->proc->p_ucred->cr_rgid); AUXARGS_ENTRY(pos, AT_EGID, imgp->proc->p_ucred->cr_svgid); + PROC_UNLOCK(imgp->proc); AUXARGS_ENTRY(pos, AT_NULL, 0); free(imgp->auxargs, M_TEMP); ==== //depot/projects/smpng/sys/ddb/db_ps.c#6 (text+ko) ==== @@ -55,6 +55,7 @@ np = nprocs; + /* sx_slock(&allproc_lock); */ if (!LIST_EMPTY(&allproc)) p = LIST_FIRST(&allproc); else @@ -90,6 +91,7 @@ printf("oops, ran out of processes early!\n"); break; } + /* PROC_LOCK(p); */ pp = p->p_pptr; if (pp == NULL) pp = p; @@ -126,8 +128,11 @@ } db_printf(" %s\n", p->p_comm); } + /* PROC_UNLOCK(p); */ + p = LIST_NEXT(p, p_list); if (p == NULL && np > 0) p = LIST_FIRST(&zombproc); } + /* sx_sunlock(&allproc_lock); */ } ==== //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#9 (text+ko) ==== @@ -108,37 +108,29 @@ { 0 }, }; -static int procfs_control(struct proc *curp, struct proc *p, int op); +static int procfs_control(struct thread *td, struct proc *p, int op); static int -procfs_control(struct proc *curp, struct proc *p, int op) +procfs_control(struct thread *td, struct proc *p, int op) { int error = 0; /* - * Authorization check: rely on normal debugging protection, except - * allow processes to disengage debugging on a process onto which - * they have previously attached, but no longer have permission to - * debug. - */ - if (op != PROCFS_CTL_DETACH && - ((error = p_candebug(curp, p)))) - return (error); - - /* * Attach - attaches the target process for debugging * by the calling process. */ if (op == PROCFS_CTL_ATTACH) { sx_xlock(&proctree_lock); PROC_LOCK(p); + if ((error = p_candebug(td->td_proc, p)) != 0) + goto out; if (p->p_flag & P_TRACED) { error = EBUSY; goto out; } /* Can't trace yourself! */ - if (p->p_pid == curp->p_pid) { + if (p->p_pid == td->td_proc->p_pid) { error = EINVAL; goto out; } @@ -154,9 +146,9 @@ p->p_flag |= P_TRACED; faultin(p); p->p_xstat = 0; /* XXX ? */ - if (p->p_pptr != curp) { + if (p->p_pptr != td->td_proc) { p->p_oppid = p->p_pptr->p_pid; - proc_reparent(p, curp); + proc_reparent(p, td->td_proc); } psignal(p, SIGSTOP); out: @@ -166,7 +158,20 @@ } /* - * Target process must be stopped, owned by (curp) and + * Authorization check: rely on normal debugging protection, except + * allow processes to disengage debugging on a process onto which + * they have previously attached, but no longer have permission to + * debug. + */ + PROC_LOCK(p); + if (op != PROCFS_CTL_DETACH && + ((error = p_candebug(td->td_proc, p)))) { + PROC_UNLOCK(p); + return (error); + } + + /* + * Target process must be stopped, owned by (td) and * be set up for tracing (P_TRACED flag set). * Allow DETACH to take place at any time for sanity. * Allow WAIT any time, of course. @@ -177,15 +182,10 @@ break; default: - PROC_LOCK(p); - mtx_lock_spin(&sched_lock); - if (!TRACE_WAIT_P(curp, p)) { - mtx_unlock_spin(&sched_lock); + if (!TRACE_WAIT_P(td->td_proc, p)) { PROC_UNLOCK(p); return (EBUSY); } - mtx_unlock_spin(&sched_lock); - PROC_UNLOCK(p); } @@ -201,7 +201,6 @@ * To continue with a signal, just send * the signal name to the ctl file */ - PROC_LOCK(p); p->p_xstat = 0; switch (op) { @@ -241,7 +240,7 @@ PROC_UNLOCK(p); sx_xunlock(&proctree_lock); - wakeup((caddr_t) curp); /* XXX for CTL_WAIT below ? */ + wakeup((caddr_t) td->td_proc); /* XXX for CTL_WAIT below ? */ break; @@ -272,31 +271,19 @@ */ case PROCFS_CTL_WAIT: if (p->p_flag & P_TRACED) { - mtx_lock_spin(&sched_lock); while (error == 0 && (p->p_stat != SSTOP) && (p->p_flag & P_TRACED) && - (p->p_pptr == curp)) { - mtx_unlock_spin(&sched_lock); + (p->p_pptr == td->td_proc)) error = msleep((caddr_t) p, &p->p_mtx, PWAIT|PCATCH, "procfsx", 0); - mtx_lock_spin(&sched_lock); - } - if (error == 0 && !TRACE_WAIT_P(curp, p)) + if (error == 0 && !TRACE_WAIT_P(td->td_proc, p)) error = EBUSY; - mtx_unlock_spin(&sched_lock); - PROC_UNLOCK(p); - } else { - PROC_UNLOCK(p); - mtx_lock_spin(&sched_lock); - while (error == 0 && p->p_stat != SSTOP) { - mtx_unlock_spin(&sched_lock); - error = tsleep((caddr_t) p, + } else + while (error == 0 && p->p_stat != SSTOP) + error = msleep((caddr_t) p, &p->p_mtx, PWAIT|PCATCH, "procfs", 0); - mtx_lock_spin(&sched_lock); - } - mtx_unlock_spin(&sched_lock); - } + PROC_UNLOCK(p); return (error); default: @@ -346,13 +333,12 @@ nm = findname(ctlnames, sbuf_data(sb), sbuf_len(sb)); if (nm) { printf("procfs: got a %s command\n", sbuf_data(sb)); - error = procfs_control(td->td_proc, p, nm->nm_val); + error = procfs_control(td, p, nm->nm_val); } else { nm = findname(signames, sbuf_data(sb), sbuf_len(sb)); if (nm) { printf("procfs: got a sig%s\n", sbuf_data(sb)); PROC_LOCK(p); - mtx_lock_spin(&sched_lock); /* This is very broken XXXKSE: */ if (TRACE_WAIT_P(td->td_proc, p)) { @@ -361,13 +347,12 @@ /* XXXKSE: */ FIX_SSTEP(FIRST_THREAD_IN_PROC(p)); #endif + mtx_lock_spin(&sched_lock); /* XXXKSE: */ setrunnable(FIRST_THREAD_IN_PROC(p)); mtx_unlock_spin(&sched_lock); - } else { - mtx_unlock_spin(&sched_lock); + } else psignal(p, nm->nm_val); - } PROC_UNLOCK(p); error = 0; } ==== //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#7 (text+ko) ==== @@ -68,8 +68,11 @@ char *kv; int kl; - if (p_candebug(td->td_proc, p)) + PROC_LOCK(p); + if (p_candebug(td->td_proc, p) != 0) { + PROC_UNLOCK(p); return (EPERM); + } kl = sizeof(r); kv = (char *) &r; @@ -78,7 +81,7 @@ if (kl > uio->uio_resid) kl = uio->uio_resid; - PHOLD(p); + _PHOLD(p); if (kl < 0) error = EINVAL; else @@ -93,7 +96,8 @@ /* XXXKSE: */ error = proc_write_dbregs(FIRST_THREAD_IN_PROC(p), &r); } - PRELE(p); + _PRELE(p); + PROC_UNLOCK(p); uio->uio_offset = 0; return (error); ==== //depot/projects/smpng/sys/fs/procfs/procfs_fpregs.c#7 (text+ko) ==== @@ -62,8 +62,11 @@ char *kv; int kl; - if (p_candebug(td->td_proc, p)) + PROC_LOCK(p); + if (p_candebug(td->td_proc, p)) { + PROC_UNLOCK(p); return (EPERM); + } kl = sizeof(r); kv = (char *) &r; @@ -72,7 +75,7 @@ if (kl > uio->uio_resid) kl = uio->uio_resid; - PHOLD(p); + _PHOLD(p); if (kl < 0) error = EINVAL; else @@ -87,7 +90,8 @@ /* XXXKSE: */ error = proc_write_fpregs(FIRST_THREAD_IN_PROC(p), &r); } - PRELE(p); + _PRELE(p); + PROC_UNLOCK(p); uio->uio_offset = 0; return (error); ==== //depot/projects/smpng/sys/fs/procfs/procfs_mem.c#5 (text+ko) ==== @@ -64,10 +64,11 @@ if (uio->uio_resid == 0) return (0); + PROC_LOCK(p); error = p_candebug(td->td_proc, p); - if (error) - return (error); - error = proc_rwmem(p, uio); + PROC_UNLOCK(p); + if (error == 0) + error = proc_rwmem(p, uio); return (error); } ==== //depot/projects/smpng/sys/fs/procfs/procfs_regs.c#7 (text+ko) ==== @@ -62,8 +62,11 @@ char *kv; int kl; - if (p_candebug(td->td_proc, p)) + PROC_LOCK(p); + if (p_candebug(td->td_proc, p)) { + PROC_UNLOCK(p); return (EPERM); + } kl = sizeof(r); kv = (char *) &r; @@ -72,7 +75,8 @@ if (kl > uio->uio_resid) kl = uio->uio_resid; - PHOLD(p); + _PHOLD(p); + PROC_UNLOCK(p); if (kl < 0) error = EINVAL; else @@ -80,6 +84,7 @@ error = proc_read_regs(FIRST_THREAD_IN_PROC(p), &r); if (error == 0) error = uiomove(kv, kl, uio); + PROC_LOCK(p); if (error == 0 && uio->uio_rw == UIO_WRITE) { if (p->p_stat != SSTOP) error = EBUSY; @@ -87,7 +92,8 @@ /* XXXKSE: */ error = proc_write_regs(FIRST_THREAD_IN_PROC(p), &r); } - PRELE(p); + _PRELE(p); + PROC_UNLOCK(p); uio->uio_offset = 0; return (error); ==== //depot/projects/smpng/sys/fs/procfs/procfs_status.c#10 (text+ko) ==== @@ -109,7 +109,6 @@ sep = ","; } SESS_UNLOCK(sess); - PROC_UNLOCK(p); if (*sep != ',') { sbuf_printf(sb, "noflags"); } @@ -160,6 +159,7 @@ } else { sbuf_printf(sb, " -"); } + PROC_UNLOCK(p); sbuf_printf(sb, "\n"); return (0); @@ -181,23 +181,22 @@ * Linux behaviour is to return zero-length in this case. */ - if (ps_argsopen || !p_cansee(td->td_proc, p)) { - PROC_LOCK(p); - if (p->p_args) { - sbuf_bcpy(sb, p->p_args->ar_args, p->p_args->ar_length); - PROC_UNLOCK(p); - } else if (p != td->td_proc) { - sbuf_printf(sb, "%.*s", MAXCOMLEN, p->p_comm); - PROC_UNLOCK(p); - } else { - PROC_UNLOCK(p); - error = copyin((void*)PS_STRINGS, &pstr, sizeof(pstr)); - if (error) - return (error); - for (i = 0; i < pstr.ps_nargvstr; i++) { - sbuf_copyin(sb, pstr.ps_argvstr[i], 0); - sbuf_printf(sb, "%c", '\0'); - } + PROC_LOCK(p); + if (p->p_args && (ps_argsopen || !p_cansee(td->td_proc, p))) { + sbuf_bcpy(sb, p->p_args->ar_args, p->p_args->ar_length); + PROC_UNLOCK(p); + return (0); + } + PROC_UNLOCK(p); + if (p != td->td_proc) { + sbuf_printf(sb, "%.*s", MAXCOMLEN, p->p_comm); + } else { + error = copyin((void*)PS_STRINGS, &pstr, sizeof(pstr)); + if (error) + return (error); + for (i = 0; i < pstr.ps_nargvstr; i++) { + sbuf_copyin(sb, pstr.ps_argvstr[i], 0); + sbuf_printf(sb, "%c", '\0'); } } ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#13 (text+ko) ==== @@ -86,10 +86,13 @@ if (pid != NO_PID) { if ((proc = pfind(pid)) == NULL) PFS_RETURN (0); - /* XXX should lock td->td_proc? */ if (p_cansee(td->td_proc, proc) != 0 || (pn->pn_vis != NULL && !(pn->pn_vis)(td, proc, pn))) r = 0; + /* + * XXX: We might should return with the proc locked to + * avoid some races. + */ PROC_UNLOCK(proc); } PFS_RETURN (r); ==== //depot/projects/smpng/sys/kern/kern_exec.c#33 (text+ko) ==== @@ -127,13 +127,15 @@ { struct proc *p = td->td_proc; struct nameidata nd, *ndp; - struct ucred *newcred, *oldcred; + struct ucred *newcred = NULL, *oldcred; register_t *stack_base; int error, len, i; struct image_params image_params, *imgp; struct vattr attr; int (*img_first)(struct image_params *); - struct pargs *pa; + struct pargs *oldargs, *newargs = NULL; + struct procsig *newprocsig = NULL; + struct vnode *tracevp = NULL, *textvp = NULL; imgp = &image_params; @@ -295,16 +297,27 @@ FILEDESC_UNLOCK(p->p_fd); /* + * Malloc things before we need locks. + */ + MALLOC(newprocsig, struct procsig *, sizeof(struct procsig), + M_SUBPROC, M_WAITOK); + newcred = crget(); + i = imgp->endargs - imgp->stringbase; + if (ps_arg_cache_limit >= i + sizeof(struct pargs)) + newargs = pargs_alloc(i); + + /* close files on exec */ + fdcloseexec(td); + + /* * For security and other reasons, signal handlers cannot * be shared after an exec. The new process gets a copy of the old * handlers. In execsigs(), the new process will have its signals * reset. */ + PROC_LOCK(p); + mp_fixme("procsig needs a lock"); if (p->p_procsig->ps_refcnt > 1) { - struct procsig *newprocsig; - - MALLOC(newprocsig, struct procsig *, sizeof(struct procsig), - M_SUBPROC, M_WAITOK); bcopy(p->p_procsig, newprocsig, sizeof(*newprocsig)); p->p_procsig->ps_refcnt--; p->p_procsig = newprocsig; @@ -318,9 +331,6 @@ /* Stop profiling */ stopprofclock(p); - /* close files on exec */ - fdcloseexec(td); - /* reset caught signals */ execsigs(p); @@ -333,7 +343,6 @@ * mark as execed, wakeup the process that vforked (if any) and tell * it that it now has its own resources back */ - PROC_LOCK(p); p->p_flag |= P_EXEC; if (p->p_pptr && (p->p_flag & P_PPWAIT)) { p->p_flag &= ~P_PPWAIT; @@ -347,12 +356,10 @@ * the process is being traced. */ oldcred = p->p_ucred; - newcred = NULL; if ((((attr.va_mode & VSUID) && oldcred->cr_uid != attr.va_uid) || ((attr.va_mode & VSGID) && oldcred->cr_gid != attr.va_gid)) && (imgp->vp->v_mount->mnt_flag & MNT_NOSUID) == 0 && (p->p_flag & P_TRACED) == 0) { - PROC_UNLOCK(p); /* * Turn off syscall tracing for set-id programs, except for * root. Record any set-id flags first to make sure that @@ -360,66 +367,56 @@ */ setsugid(p); if (p->p_tracep && suser_cred(oldcred, PRISON_ROOT)) { - struct vnode *vtmp; - - if ((vtmp = p->p_tracep) != NULL) { - p->p_tracep = NULL; - p->p_traceflag = 0; - vrele(vtmp); - } + p->p_traceflag = 0; + tracevp = p->p_tracep; + p->p_tracep = NULL; } /* * Set the new credentials. */ - newcred = crdup(oldcred); + crcopy(newcred, oldcred); if (attr.va_mode & VSUID) change_euid(newcred, attr.va_uid); if (attr.va_mode & VSGID) change_egid(newcred, attr.va_gid); setugidsafety(td); + /* + * Implement correct POSIX saved-id behavior. + */ + change_svuid(newcred, newcred->cr_uid); + change_svgid(newcred, newcred->cr_gid); + p->p_ucred = newcred; + newcred = NULL; } else { if (oldcred->cr_uid == oldcred->cr_ruid && oldcred->cr_gid == oldcred->cr_rgid) p->p_flag &= ~P_SUGID; - PROC_UNLOCK(p); - } - - /* - * Implement correct POSIX saved-id behavior. - * - * XXX: It's not clear that the existing behavior is - * POSIX-compliant. A number of sources indicate that the saved - * uid/gid should only be updated if the new ruid is not equal to - * the old ruid, or the new euid is not equal to the old euid and - * the new euid is not equal to the old ruid. The FreeBSD code - * always updates the saved uid/gid. Also, this code uses the new - * (replaced) euid and egid as the source, which may or may not be - * the right ones to use. - */ - if (newcred == NULL) { + /* + * Implement correct POSIX saved-id behavior. + * + * XXX: It's not clear that the existing behavior is + * POSIX-compliant. A number of sources indicate that the + * saved uid/gid should only be updated if the new ruid is + * not equal to the old ruid, or the new euid is not equal + * to the old euid and the new euid is not equal to the old + * ruid. The FreeBSD code always updates the saved uid/gid. + * Also, this code uses the new (replaced) euid and egid as + * the source, which may or may not be the right ones to use. + */ if (oldcred->cr_svuid != oldcred->cr_uid || oldcred->cr_svgid != oldcred->cr_gid) { - newcred = crdup(oldcred); + crcopy(newcred, oldcred); change_svuid(newcred, newcred->cr_uid); change_svgid(newcred, newcred->cr_gid); + p->p_ucred = newcred; + newcred = NULL; } - } else { - change_svuid(newcred, newcred->cr_uid); - change_svgid(newcred, newcred->cr_gid); - } - - if (newcred != NULL) { - PROC_LOCK(p); - p->p_ucred = newcred; - PROC_UNLOCK(p); - crfree(oldcred); } /* * Store the vp for use in procfs */ - if (p->p_textvp) /* release old reference */ - vrele(p->p_textvp); + textvp = p->p_textvp; VREF(ndp->ni_vp); p->p_textvp = ndp->ni_vp; @@ -427,7 +424,6 @@ * Notify others that we exec'd, and clear the P_INEXEC flag * as we're now a bona fide freshly-execed process. */ - PROC_LOCK(p); KNOTE(&p->p_klist, NOTE_EXEC); p->p_flag &= ~P_INEXEC; @@ -444,24 +440,39 @@ p->p_acflag &= ~AFORK; /* Free any previous argument cache */ - pa = p->p_args; + oldargs = p->p_args; p->p_args = NULL; - PROC_UNLOCK(p); - pargs_drop(pa); /* Set values passed into the program in registers. */ setregs(td, imgp->entry_addr, (u_long)(uintptr_t)stack_base, imgp->ps_strings); /* Cache arguments if they fit inside our allowance */ - i = imgp->endargs - imgp->stringbase; if (ps_arg_cache_limit >= i + sizeof(struct pargs)) { - pa = pargs_alloc(i); - bcopy(imgp->stringbase, pa->ar_args, i); - PROC_LOCK(p); - p->p_args = pa; - PROC_UNLOCK(p); + bcopy(imgp->stringbase, newargs->ar_args, i); + p->p_args = newargs; + newargs = NULL; } + PROC_UNLOCK(p); + + /* + * Free any resources malloc'd earlier that we didn't use. + */ + if (newprocsig != NULL) + FREE(newprocsig, M_SUBPROC); + if (newcred == NULL) + crfree(oldcred); + else + crfree(newcred); + KASSERT(newargs == NULL, ("leaking p_args")); + /* + * Handle deferred decrement of ref counts. + */ + if (textvp != NULL) + vrele(textvp); + if (tracevp != NULL) + vrele(tracevp); + pargs_drop(oldargs); exec_fail_dealloc: ==== //depot/projects/smpng/sys/kern/kern_exit.c#31 (text+ko) ==== @@ -127,6 +127,9 @@ struct exitlist *ep; struct vnode *ttyvp; struct tty *tp; +#ifdef KTRACE + struct vnode *tracevp; +#endif GIANT_REQUIRED; @@ -293,11 +296,13 @@ /* * release trace file */ + PROC_LOCK(p); p->p_traceflag = 0; /* don't trace the vrele() */ - if ((vtmp = p->p_tracep) != NULL) { >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 12:11:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CDFB37B404; Wed, 10 Apr 2002 12:11:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fw.wemm.org (12-232-135-171.client.attbi.com [12.232.135.171]) by hub.freebsd.org (Postfix) with ESMTP id 5900937B400; Wed, 10 Apr 2002 12:11:37 -0700 (PDT) Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by fw.wemm.org (8.11.6/8.11.6) with ESMTP id g3AJCuQ25104; Wed, 10 Apr 2002 12:12:56 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 92F753810; Wed, 10 Apr 2002 12:12:20 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Doug Rabson Cc: Jake Burkholder , John Baldwin , Perforce Change Reviews Subject: Re: PERFORCE change 9504 for review In-Reply-To: Date: Wed, 10 Apr 2002 12:12:20 -0700 From: Peter Wemm Message-Id: <20020410191220.92F753810@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Doug Rabson wrote: > On Wed, 10 Apr 2002, Jake Burkholder wrote: > > > Apparently, On Wed, Apr 10, 2002 at 09:06:18AM -0400, > > John Baldwin said words to the effect of; > > > > > > > > On 10-Apr-2002 Peter Wemm wrote: > > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9504 > > > > > > > > Change 9504 by peter@peter_thunder on 2002/04/10 04:51:36 > > > > > > > > Use dfr's fix instead of my hack. I expect he'll commit this to > > > > freefall soon. :-) > > > > > > Yep, much better. :) > > > > Well, now the flag checking code is duplicated in both the trap and syscall > > return paths, alpha is the same. One wonders if the FRAME_SYSCALL optimiza tion > > is actually worth all this complication. > > I think its still worth it - it still does a lot less work in the common > case. Bear in mind that calling ast() is quite rare and being forced to do > a full exception restore (e.g. for a signal) is even rarer. A harmless > extra call to ast() in that case is unlikely to be noticable. Having said > that, for ia64 at least, it should be possible for the syscall to bypass > the ast() bits at the beginning of exception_restore(). As long as syscall > sets (p1,p2) to (1,0), it can jump to label 2 in exception_restore. John asked an awkward question a while ago.. What happens if the ast() call in the back of the fast syscall return path changes the frame type? eg: it posted a signal and turned off the FRAME_SYSCALL bit. We'll continue with the fast return, right? Is this good or bad? Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 12:16:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E26637B41C; Wed, 10 Apr 2002 12:16:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6865037B400 for ; Wed, 10 Apr 2002 12:16:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3AJGOX68182 for perforce@freebsd.org; Wed, 10 Apr 2002 12:16:24 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Wed, 10 Apr 2002 12:16:24 -0700 (PDT) Message-Id: <200204101916.g3AJGOX68182@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9529 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9529 Change 9529 by jhb@jhb_laptop on 2002/04/10 12:15:51 - First, fix a lock order reversal. pgrp comes before proc. - Second, limcopy() can block, so release locks around the limit stuff for now until the limit stuff is reworked. Also, this lets us not hold pgrpsess and pgrp locks quite so long. Affected files ... ... //depot/projects/smpng/sys/kern/kern_fork.c#36 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_fork.c#36 (text+ko) ==== @@ -465,10 +465,8 @@ (unsigned) RANGEOF(struct ksegrp, kg_startzero, kg_endzero)); mtx_init(&p2->p_mtx, "process lock", NULL, MTX_DEF | MTX_DUPOK); - PGRPSESS_XLOCK(); PROC_LOCK(p2); PROC_LOCK(p1); - PGRP_LOCK(p1->p_pgrp); bcopy(&p1->p_startcopy, &p2->p_startcopy, (unsigned) RANGEOF(struct proc, p_startcopy, p_endcopy)); @@ -556,6 +554,8 @@ if (p2->p_textvp) VREF(p2->p_textvp); p2->p_fd = fd; + PROC_UNLOCK(p1); + PROC_UNLOCK(p2); /* * If p_limit is still copy-on-write, bump refcnt, @@ -570,6 +570,11 @@ p2->p_limit->p_refcnt++; } + PGRPSESS_XLOCK(); + PGRP_LOCK(p1->p_pgrp); + PROC_LOCK(p2); + PROC_LOCK(p1); + /* * Preserve some more flags in subprocess. PS_PROFIL has already * been preserved. @@ -584,6 +589,7 @@ LIST_INSERT_AFTER(p1, p2, p_pglist); PGRP_UNLOCK(p1->p_pgrp); + PGRPSESS_XUNLOCK(); LIST_INIT(&p2->p_children); LIST_INIT(&td2->td_contested); /* XXXKSE only 1 thread? */ @@ -618,7 +624,6 @@ _PHOLD(p1); PROC_UNLOCK(p1); PROC_UNLOCK(p2); - PGRPSESS_XUNLOCK(); /* * Attach the new process to its parent. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 12:17: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A513137B416; Wed, 10 Apr 2002 12:15:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BB9F137B400 for ; Wed, 10 Apr 2002 12:15:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3AJFMU67599 for perforce@freebsd.org; Wed, 10 Apr 2002 12:15:22 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 10 Apr 2002 12:15:22 -0700 (PDT) Message-Id: <200204101915.g3AJFMU67599@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9528 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9528 Change 9528 by peter@peter_daintree on 2002/04/10 12:14:57 IFC @9518 Affected files ... ... //depot/projects/ia64/include/arpa/inet.h#7 integrate ... //depot/projects/ia64/lib/libmd/Makefile#2 integrate ... //depot/projects/ia64/sys/alpha/include/ansi.h#6 integrate ... //depot/projects/ia64/sys/alpha/include/endian.h#4 integrate ... //depot/projects/ia64/sys/conf/NOTES#4 integrate ... //depot/projects/ia64/sys/dev/ata/ata-all.c#12 integrate ... //depot/projects/ia64/sys/dev/ata/ata-raid.c#8 integrate ... //depot/projects/ia64/sys/dev/digi/digi.c#8 integrate ... //depot/projects/ia64/sys/dev/digi/digi.h#4 integrate ... //depot/projects/ia64/sys/dev/digi/digi_isa.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/umass.c#8 integrate ... //depot/projects/ia64/sys/i386/include/ansi.h#6 integrate ... //depot/projects/ia64/sys/i386/include/endian.h#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/exception.s#11 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#14 integrate ... //depot/projects/ia64/sys/ia64/include/ansi.h#6 integrate ... //depot/projects/ia64/sys/ia64/include/endian.h#4 integrate ... //depot/projects/ia64/sys/netinet/in.h#8 integrate ... //depot/projects/ia64/sys/netinet6/in6.h#4 integrate ... //depot/projects/ia64/sys/powerpc/include/ansi.h#6 integrate ... //depot/projects/ia64/sys/powerpc/include/endian.h#4 integrate ... //depot/projects/ia64/sys/sparc64/include/ansi.h#6 integrate ... //depot/projects/ia64/sys/sparc64/include/endian.h#4 integrate ... //depot/projects/ia64/sys/sys/param.h#8 integrate ... //depot/projects/ia64/sys/sys/types.h#9 integrate ... //depot/projects/ia64/usr.bin/find/find.1#4 integrate ... //depot/projects/ia64/usr.bin/renice/renice.8#2 integrate ... //depot/projects/ia64/usr.bin/renice/renice.c#4 integrate ... //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#5 integrate Differences ... ==== //depot/projects/ia64/include/arpa/inet.h#7 (text+ko) ==== @@ -50,7 +50,7 @@ * * @(#)inet.h 8.1 (Berkeley) 6/2/93 * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $ - * $FreeBSD: src/include/arpa/inet.h,v 1.21 2002/04/01 08:12:21 mike Exp $ + * $FreeBSD: src/include/arpa/inet.h,v 1.22 2002/04/10 10:51:53 mike Exp $ */ #ifndef _ARPA_INET_H_ @@ -64,13 +64,8 @@ /* Required for byteorder(3) functions. */ #include -#ifndef INET_ADDRSTRLEN #define INET_ADDRSTRLEN 16 -#endif - -#ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 46 -#endif #ifndef _UINT16_T_DECLARED typedef __uint16_t uint16_t; @@ -116,7 +111,7 @@ #endif /* XXX all new diversions!! argh!! */ -#ifndef _POSIX_SOURCE +#if __BSD_VISIBLE #define inet_addr __inet_addr #define inet_aton __inet_aton #define inet_lnaof __inet_lnaof @@ -131,7 +126,7 @@ #define inet_ntop __inet_ntop #define inet_nsap_addr __inet_nsap_addr #define inet_nsap_ntoa __inet_nsap_ntoa -#endif /* !_POSIX_SOURCE */ +#endif /* __BSD_VISIBLE */ __BEGIN_DECLS #ifndef _BYTEORDER_PROTOTYPED @@ -147,8 +142,7 @@ const char *inet_ntop(int, const void *, char *, socklen_t); int inet_pton(int, const char *, void *); -/* Nonstandard functions. */ -#ifndef _POSIX_SOURCE +#if __BSD_VISIBLE int ascii2addr(int, const char *, void *); char *addr2ascii(int, const void *, int, char *); int inet_aton(const char *, struct in_addr *); @@ -161,7 +155,7 @@ int inet_net_pton(int, const char *, void *, size_t); unsigned inet_nsap_addr(const char *, unsigned char *, int); char *inet_nsap_ntoa(int, const unsigned char *, char *); -#endif /* !_POSIX_SOURCE */ +#endif /* __BSD_VISIBLE */ __END_DECLS #ifndef _BYTEORDER_FUNC_DEFINED ==== //depot/projects/ia64/lib/libmd/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libmd/Makefile,v 1.36 2001/03/27 17:27:06 ru Exp $ +# $FreeBSD: src/lib/libmd/Makefile,v 1.37 2002/04/10 17:01:55 ru Exp $ LIB= md SRCS= md2c.c md4c.c md5c.c md2hl.c md4hl.c md5hl.c \ @@ -43,8 +43,6 @@ .endif .endif -all: md2.3 md4.3 md5.3 - md2hl.c: mdXhl.c (echo '#define LENGTH 16'; \ sed -e 's/mdX/md2/g' -e 's/MDX/MD2/g' ${.ALLSRC}) > ${.TARGET} @@ -73,17 +71,11 @@ -e 's/RIPEMD160__/RIPEMD160_/g' \ ${.ALLSRC}) > ${.TARGET} -md2.3: ${.CURDIR}/mdX.3 - sed -e 's/mdX/md2/g' -e 's/MDX/MD2/g' ${.ALLSRC} > ${.TARGET} - cat ${.CURDIR}/md2.copyright >> ${.TARGET} - -md4.3: ${.CURDIR}/mdX.3 - sed -e 's/mdX/md4/g' -e 's/MDX/MD4/g' ${.ALLSRC} > ${.TARGET} - cat ${.CURDIR}/md4.copyright >> ${.TARGET} - -md5.3: ${.CURDIR}/mdX.3 - sed -e 's/mdX/md5/g' -e 's/MDX/MD5/g' ${.ALLSRC} > ${.TARGET} - cat ${.CURDIR}/md5.copyright >> ${.TARGET} +.for i in 2 4 5 +md${i}.3: ${.CURDIR}/mdX.3 + sed -e "s/mdX/md${i}/g" -e "s/MDX/MD${i}/g" ${.ALLSRC} > ${.TARGET} + cat ${.CURDIR}/md${i}.copyright >> ${.TARGET} +.endfor md2.ref: echo 'MD2 test suite:' > ${.TARGET} ==== //depot/projects/ia64/sys/alpha/include/ansi.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.26 2002/03/24 11:25:44 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.27 2002/04/10 15:58:11 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -53,6 +53,7 @@ #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ +#define _BSD_SEGSZ_T_ __int64_t /* segment size (in pages) */ #define _BSD_SIZE_T_ unsigned long /* sizeof() */ #define _BSD_SOCKLEN_T_ __uint32_t /* socklen_t (duh) */ #define _BSD_SSIZE_T_ long /* byte count or error */ ==== //depot/projects/ia64/sys/alpha/include/endian.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/alpha/include/endian.h,v 1.9 2002/03/09 21:02:11 mike Exp $ + * $FreeBSD: src/sys/alpha/include/endian.h,v 1.10 2002/04/10 14:39:12 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -46,17 +46,26 @@ #define _QUAD_HIGHWORD 1 #define _QUAD_LOWWORD 0 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ -#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ -#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ +#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ +#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ +#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ + +#define _BYTE_ORDER _LITTLE_ENDIAN -#define BYTE_ORDER LITTLE_ENDIAN -#endif /* !_POSIX_SOURCE */ +/* + * Deprecated variants that don't have enough underscores to be useful in more + * strict namespaces. + */ +#if __BSD_VISIBLE +#define LITTLE_ENDIAN _LITTLE_ENDIAN +#define BIG_ENDIAN _BIG_ENDIAN +#define PDP_ENDIAN _PDP_ENDIAN +#define BYTE_ORDER _BYTE_ORDER +#endif #ifdef __GNUC__ ==== //depot/projects/ia64/sys/conf/NOTES#4 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1019 2002/04/09 18:26:49 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1020 2002/04/10 17:27:52 brian Exp $ # # @@ -1767,7 +1767,7 @@ hint.digi.0.at="isa" hint.digi.0.port="0x104" hint.digi.0.maddr="0xd0000" -# BIOS & FEP/OS components of device digi. Normally left as modules +# BIOS & FEP/OS components of device digi. device digi_CX device digi_CX_PCI device digi_EPCX ==== //depot/projects/ia64/sys/dev/ata/ata-all.c#12 (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. * - * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.148 2002/04/05 18:37:04 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.149 2002/04/10 11:18:07 sos Exp $ */ #include "opt_ata.h" @@ -406,7 +406,7 @@ iocmd->u.enclosure.temp = temp; iocmd->u.enclosure.v05 = ata_drawersensor(atadev, 0, 0x23, 0) * 27; iocmd->u.enclosure.v12 = ata_drawersensor(atadev, 0, 0x24, 0) * 61; - + ATA_UNLOCK_CH(ch); return 0; } ==== //depot/projects/ia64/sys/dev/ata/ata-raid.c#8 (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. * - * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.44 2002/04/02 13:47:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.45 2002/04/10 11:18:07 sos Exp $ */ #include "opt_ata.h" @@ -97,11 +97,12 @@ continue; for (disk = 0; disk < rdp->total_disks; disk++) { - if (rdp->disks[disk].device == adp->device) { + if ((rdp->disks[disk].flags & AR_DF_ASSIGNED) && + rdp->disks[disk].device == adp->device) { ata_prtdev(rdp->disks[disk].device, "inserted into ar%d disk%d as spare\n", array, disk); - rdp->disks[disk].flags = (AR_DF_PRESENT | AR_DF_SPARE); + rdp->disks[disk].flags |= (AR_DF_PRESENT | AR_DF_SPARE); AD_SOFTC(rdp->disks[disk])->flags = AD_F_RAID_SUBDISK; ar_config_changed(rdp, 1); return 1; @@ -216,18 +217,19 @@ } printf(" subdisks:\n"); for (disk = 0; disk < rdp->total_disks; disk++) { - if (rdp->disks[disk].flags & AR_DF_ONLINE) - printf(" %d READY ", disk); + if (rdp->disks[disk].flags & AR_DF_PRESENT) { + if (rdp->disks[disk].flags & AR_DF_ONLINE) + printf(" %d READY ", disk); + else if (rdp->disks[disk].flags & AR_DF_SPARE) + printf(" %d SPARE ", disk); + else + printf(" %d FREE ", disk); + ad_print(AD_SOFTC(rdp->disks[disk])); + } else if (rdp->disks[disk].flags & AR_DF_ASSIGNED) - printf(" %d DOWN ", disk); - else if (rdp->disks[disk].flags & AR_DF_SPARE) - printf(" %d SPARE ", disk); - else if (rdp->disks[disk].flags & AR_DF_PRESENT) - printf(" %d FREE ", disk); + printf(" %d DOWN\n", disk); else printf(" %d INVALID no RAID config info on this disk\n", disk); - if (rdp->disks[disk].flags & AR_DF_PRESENT) - ad_print(AD_SOFTC(rdp->disks[disk])); } } @@ -286,7 +288,8 @@ break; } if (rdp->flags & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID) && - (rdp->flags & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID)) != ctlr){ + (rdp->flags & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID)) != + (ctlr & (AR_F_PROMISE_RAID|AR_F_HIGHPOINT_RAID))) { free(rdp, M_AR); return EXDEV; } @@ -555,7 +558,8 @@ switch (rdp->flags & (AR_F_RAID0 | AR_F_RAID1 | AR_F_SPAN)) { case AR_F_SPAN: case AR_F_RAID0: - if (rdp->disks[buf1->drive].flags & AR_DF_ONLINE && + if ((rdp->disks[buf1->drive].flags & + (AR_DF_PRESENT|AR_DF_ONLINE))==(AR_DF_PRESENT|AR_DF_ONLINE) && !AD_SOFTC(rdp->disks[buf1->drive])->dev->si_disk) { rdp->disks[buf1->drive].flags &= ~AR_DF_ONLINE; ar_config_changed(rdp, 1); @@ -579,12 +583,14 @@ tsleep(rdp, PRIBIO, "arwait", 0); } } - if (rdp->disks[buf1->drive].flags & AR_DF_ONLINE && + if ((rdp->disks[buf1->drive].flags & + (AR_DF_PRESENT|AR_DF_ONLINE))==(AR_DF_PRESENT|AR_DF_ONLINE) && !AD_SOFTC(rdp->disks[buf1->drive])->dev->si_disk) { rdp->disks[buf1->drive].flags &= ~AR_DF_ONLINE; change = 1; } - if (rdp->disks[buf1->drive + rdp->width].flags & AR_DF_ONLINE && + if ((rdp->disks[buf1->drive + rdp->width].flags & + (AR_DF_PRESENT|AR_DF_ONLINE))==(AR_DF_PRESENT|AR_DF_ONLINE) && !AD_SOFTC(rdp->disks[buf1->drive + rdp->width])->dev->si_disk) { rdp->disks[buf1->drive + rdp->width].flags &= ~AR_DF_ONLINE; change = 1; @@ -727,6 +733,10 @@ rdp->flags |= AR_F_READY; rdp->flags &= ~AR_F_DEGRADED; + for (disk = 0; disk < rdp->total_disks; disk++) + if (!(rdp->disks[disk].flags & AR_DF_PRESENT)) + rdp->disks[disk].flags &= ~AR_DF_ONLINE; + for (disk = 0; disk < rdp->total_disks; disk++) { switch (rdp->flags & (AR_F_RAID0 | AR_F_RAID1 | AR_F_SPAN)) { case AR_F_SPAN: @@ -1228,12 +1238,12 @@ raid->disks[disk].flags |= AR_DF_ONLINE; if (info->raid.disk[disk].flags & PR_F_ASSIGNED) raid->disks[disk].flags |= AR_DF_ASSIGNED; - if (info->raid.disk[disk].flags & PR_F_SPARE) + if (info->raid.disk[disk].flags & PR_F_SPARE) { + raid->disks[disk].flags &= ~AR_DF_ONLINE; raid->disks[disk].flags |= AR_DF_SPARE; - if (info->raid.disk[disk].flags & (PR_F_REDIR | PR_F_DOWN)) { + } + if (info->raid.disk[disk].flags & (PR_F_REDIR | PR_F_DOWN)) raid->disks[disk].flags &= ~AR_DF_ONLINE; - raid->disks[disk].flags |= AR_DF_PRESENT; - } } if (!disksum) { free(raidp[array], M_AR); @@ -1285,18 +1295,8 @@ config->magic_0 = PR_MAGIC0(rdp->disks[disk]) | timestamp.tv_sec; config->magic_1 = timestamp.tv_sec >> 16; config->magic_2 = timestamp.tv_sec; - config->raid.integrity = PR_I_VALID; - config->raid.flags = 0; - if (rdp->disks[disk].flags & AR_DF_PRESENT) - config->raid.flags |= PR_F_VALID; - if (rdp->disks[disk].flags & AR_DF_ASSIGNED) - config->raid.flags |= PR_F_ASSIGNED; - if (rdp->disks[disk].flags & AR_DF_ONLINE) - config->raid.flags |= PR_F_ONLINE; - else - config->raid.flags |= PR_F_DOWN; config->raid.disk_number = disk; if (rdp->disks[disk].flags & AR_DF_PRESENT && rdp->disks[disk].device) { config->raid.channel = rdp->disks[disk].device->channel->unit; @@ -1310,6 +1310,7 @@ config->raid.generation = rdp->generation; if (rdp->flags & AR_F_READY) { + config->raid.flags = (PR_F_VALID | PR_F_ASSIGNED | PR_F_ONLINE); config->raid.status = (PR_S_VALID | PR_S_ONLINE | PR_S_INITED | PR_S_READY); if (rdp->flags & AR_F_DEGRADED) @@ -1317,8 +1318,10 @@ else config->raid.status |= PR_S_FUNCTIONAL; } - else + else { + config->raid.flags = PR_F_DOWN; config->raid.status = 0; + } switch (rdp->flags & (AR_F_RAID0 | AR_F_RAID1 | AR_F_SPAN)) { case AR_F_RAID0: ==== //depot/projects/ia64/sys/dev/digi/digi.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi.c,v 1.25 2002/04/10 03:13:28 brian Exp $ + * $FreeBSD: src/sys/dev/digi/digi.c,v 1.27 2002/04/10 14:32:55 brian Exp $ */ /*- @@ -221,13 +221,13 @@ return (1); } -static void -digi_delay(struct digi_softc *sc, const char *txt) +void +digi_delay(struct digi_softc *sc, const char *txt, u_long timo) { if (cold) - DELAY(5000); + DELAY(timo * 1000000 / hz); else - tsleep(sc, PUSER | PCATCH, txt, 5); + tsleep(sc, PUSER | PCATCH, txt, timo); } static int @@ -314,12 +314,12 @@ for (i = 0; ((sc->pcibus ? PCIPORT : inb(sc->port)) & FEPMASK) != FEPRST; i++) { - if (i > 1000) { + if (i > 100) { log(LOG_ERR, "digi%d: %s init reset failed\n", sc->res.unit, sc->name); return (EIO); } - digi_delay(sc, "digiinit0"); + digi_delay(sc, "digiinit0", 5); } DLOG(DIGIDB_INIT, (sc->dev, "Got init reset after %d us\n", i)); @@ -370,24 +370,24 @@ for (i = 0; ((sc->pcibus ? PCIPORT : inb(sc->port)) & FEPMASK) == resp; i++) { - if (i > 1000) { + if (i > 100) { log(LOG_ERR, "digi%d: BIOS start failed\n", sc->res.unit); return (EIO); } - digi_delay(sc, "digibios0"); + digi_delay(sc, "digibios0", 5); } DLOG(DIGIDB_INIT, (sc->dev, "BIOS started after %d us\n", i)); for (i = 0; vW(ptr) != *(u_short *)"GD"; i++) { - if (i > 2000) { + if (i > 200) { log(LOG_ERR, "digi%d: BIOS boot failed " "(0x%02x != 0x%02x)\n", sc->res.unit, vW(ptr), *(u_short *)"GD"); return (EIO); } - digi_delay(sc, "digibios1"); + digi_delay(sc, "digibios1", 5); } DLOG(DIGIDB_INIT, (sc->dev, "BIOS booted after %d iterations\n", i)); @@ -421,13 +421,13 @@ outb(sc->port, FEPCLR | FEPMEM); for (i = 0; W(ptr); i++) { - if (i > 10) { + if (i > 100) { log(LOG_ERR, "digi%d: FEP/OS move failed\n", sc->res.unit); sc->hidewin(sc); return (EIO); } - digi_delay(sc, "digifep0"); + digi_delay(sc, "digifep0", 5); } DLOG(DIGIDB_INIT, (sc->dev, "FEP/OS moved after %d iterations\n", i)); @@ -506,14 +506,14 @@ /* Now wait 'till the FEP/OS has booted */ for (i = 0; vW(ptr) != *(u_short *)"OS"; i++) { - if (i > 2000) { + if (i > 200) { log(LOG_ERR, "digi%d: FEP/OS start failed " "(0x%02x != 0x%02x)\n", sc->res.unit, vW(ptr), *(u_short *)"OS"); sc->hidewin(sc); return (EIO); } - digi_delay(sc, "digifep1"); + digi_delay(sc, "digifep1", 5); } DLOG(DIGIDB_INIT, (sc->dev, "FEP/OS started after %d iterations\n", i)); ==== //depot/projects/ia64/sys/dev/digi/digi.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi.h,v 1.10 2002/02/27 23:47:45 peter Exp $ + * $FreeBSD: src/sys/dev/digi/digi.h,v 1.12 2002/04/10 14:32:55 brian Exp $ */ #define W(p) (*(u_int16_t *)(p)) @@ -215,3 +215,5 @@ int digi_attach(struct digi_softc *); int digi_detach(device_t _dev); int digi_shutdown(device_t _dev); +void digi_delay(struct digi_softc *_sc, const char *_txt, + u_long _timo); ==== //depot/projects/ia64/sys/dev/digi/digi_isa.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/digi/digi_isa.c,v 1.7 2002/02/27 23:47:45 peter Exp $ + * $FreeBSD: src/sys/dev/digi/digi_isa.c,v 1.9 2002/04/10 14:32:55 brian Exp $ */ /*- @@ -112,12 +112,14 @@ /* Invasive probe - reset the card */ outb(sc->port, FEPRST); - for (i = 1000; DELAY(1), i >= 0; i--) + for (i = 0; i < 10; i++) { if ((inb(sc->port) & FEPMASK) == FEPRST) break; - if (i == -1) + digi_delay(sc, "digirst", 1); + } + if (i == 10) return (NULL); - DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d us\n", 1000 - i)); + DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d delays\n", i)); ident = inb(sc->port); @@ -373,18 +375,17 @@ reset |= FEPMEM; outb(sc->port, reset); - for (i = 10; DELAY(1), i >= 0; i--) { + for (i = 0; i < 10; i++) { if ((inb(sc->port) & FEPMASK) == reset) break; - tsleep(sc, PUSER | PCATCH, "digirst0", hz / 5); + digi_delay(sc, "digirst1", 1); } - if (i == -1) { + if (i == 10) { device_printf(dev, "1st reset failed\n"); sc->hidewin(sc); goto failed; } - DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d us\n", - (10 - i) * (hz / 5))); + DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d delays\n", i)); if (sc->model != PCXI) { t = (sc->pmem >> 8) & 0xffe0; @@ -396,17 +397,18 @@ if (sc->model == PCXI || sc->model == PCXE) { outb(sc->port, FEPRST | FEPMEM); - for (i = 10000; DELAY(1), i >= 0; i--) + for (i = 0; i < 10; i++) { if ((inb(sc->port) & FEPMASK) != FEPRST) break; - if (i == -1) { + digi_delay(sc, "digirst2", 1); + } + if (i == 10) { device_printf(dev, "2nd reset failed (0x%02x)\n", inb(sc->port)); sc->hidewin(sc); goto failed; } - DLOG(DIGIDB_INIT, (sc->dev, "got memory after %d us\n", - 10000 - i)); + DLOG(DIGIDB_INIT, (sc->dev, "got memory after %d delays\n", i)); } DLOG(DIGIDB_INIT, (sc->dev, "short memory test\n")); ==== //depot/projects/ia64/sys/dev/usb/umass.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.57 2002/04/01 21:13:21 joe Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.58 2002/04/10 13:22:12 n_hibma Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -394,25 +394,26 @@ int transfer_status; int transfer_state; -# define TSTATE_IDLE 0 -# define TSTATE_BBB_COMMAND 1 /* CBW transfer */ -# define TSTATE_BBB_DATA 2 /* Data transfer */ -# define TSTATE_BBB_DCLEAR 3 /* clear endpt stall */ -# define TSTATE_BBB_STATUS1 4 /* clear endpt stall */ -# define TSTATE_BBB_SCLEAR 5 /* clear endpt stall */ -# define TSTATE_BBB_STATUS2 6 /* CSW transfer */ -# define TSTATE_BBB_RESET1 7 /* reset command */ -# define TSTATE_BBB_RESET2 8 /* in clear stall */ -# define TSTATE_BBB_RESET3 9 /* out clear stall */ -# define TSTATE_CBI_COMMAND 10 /* command transfer */ -# define TSTATE_CBI_DATA 11 /* data transfer */ -# define TSTATE_CBI_STATUS 12 /* status transfer */ -# define TSTATE_CBI_DCLEAR 13 /* clear ep stall */ -# define TSTATE_CBI_SCLEAR 14 /* clear ep stall */ -# define TSTATE_CBI_RESET1 15 /* reset command */ -# define TSTATE_CBI_RESET2 16 /* in clear stall */ -# define TSTATE_CBI_RESET3 17 /* out clear stall */ -# define TSTATE_STATES 18 /* # of states above */ +# define TSTATE_ATTACH 0 /* in attach */ +# define TSTATE_IDLE 1 +# define TSTATE_BBB_COMMAND 2 /* CBW transfer */ +# define TSTATE_BBB_DATA 3 /* Data transfer */ +# define TSTATE_BBB_DCLEAR 4 /* clear endpt stall */ +# define TSTATE_BBB_STATUS1 5 /* clear endpt stall */ +# define TSTATE_BBB_SCLEAR 6 /* clear endpt stall */ +# define TSTATE_BBB_STATUS2 7 /* CSW transfer */ +# define TSTATE_BBB_RESET1 8 /* reset command */ +# define TSTATE_BBB_RESET2 9 /* in clear stall */ +# define TSTATE_BBB_RESET3 10 /* out clear stall */ +# define TSTATE_CBI_COMMAND 11 /* command transfer */ +# define TSTATE_CBI_DATA 12 /* data transfer */ +# define TSTATE_CBI_STATUS 13 /* status transfer */ +# define TSTATE_CBI_DCLEAR 14 /* clear ep stall */ +# define TSTATE_CBI_SCLEAR 15 /* clear ep stall */ +# define TSTATE_CBI_RESET1 16 /* reset command */ +# define TSTATE_CBI_RESET2 17 /* in clear stall */ +# define TSTATE_CBI_RESET3 18 /* out clear stall */ +# define TSTATE_STATES 19 /* # of states above */ /* SCSI/CAM specific variables */ @@ -428,6 +429,7 @@ #ifdef UMASS_DEBUG char *states[TSTATE_STATES+1] = { /* should be kept in sync with the list at transfer_state */ + "Attach", "Idle", "BBB CBW", "BBB Data", @@ -932,7 +934,7 @@ } /* initialisation of generic part */ - sc->transfer_state = TSTATE_IDLE; + sc->transfer_state = TSTATE_ATTACH; /* request a sufficient number of xfer handles */ for (i = 0; i < XFER_NR; i++) { @@ -1015,7 +1017,7 @@ __FILE__, __LINE__, sc->proto); } - + sc->transfer_state = TSTATE_IDLE; DPRINTF(UDMASS_GEN, ("%s: Attach finished\n", USBDEVNAME(sc->sc_dev))); USB_ATTACH_SUCCESS_RETURN; ==== //depot/projects/ia64/sys/i386/include/ansi.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/i386/include/ansi.h,v 1.36 2002/03/24 11:25:45 obrien Exp $ + * $FreeBSD: src/sys/i386/include/ansi.h,v 1.37 2002/04/10 15:58:11 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -52,6 +52,7 @@ #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ +#define _BSD_SEGSZ_T_ __int32_t /* segment size (in pages) */ #define _BSD_SIZE_T_ unsigned int /* sizeof() */ #define _BSD_SOCKLEN_T_ __uint32_t /* socklen_t (duh) */ #define _BSD_SSIZE_T_ int /* byte count or error */ ==== //depot/projects/ia64/sys/i386/include/endian.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)endian.h 7.8 (Berkeley) 4/3/91 - * $FreeBSD: src/sys/i386/include/endian.h,v 1.32 2002/03/09 21:02:12 mike Exp $ + * $FreeBSD: src/sys/i386/include/endian.h,v 1.33 2002/04/10 14:39:13 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -46,17 +46,26 @@ #define _QUAD_HIGHWORD 1 #define _QUAD_LOWWORD 0 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ -#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ -#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ +#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ +#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ +#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ + +#define _BYTE_ORDER _LITTLE_ENDIAN -#define BYTE_ORDER LITTLE_ENDIAN -#endif /* ! _POSIX_SOURCE */ +/* + * Deprecated variants that don't have enough underscores to be useful in more + * strict namespaces. + */ +#if __BSD_VISIBLE +#define LITTLE_ENDIAN _LITTLE_ENDIAN +#define BIG_ENDIAN _BIG_ENDIAN +#define PDP_ENDIAN _PDP_ENDIAN +#define BYTE_ORDER _BYTE_ORDER +#endif #ifdef __GNUC__ ==== //depot/projects/ia64/sys/ia64/ia64/exception.s#11 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/exception.s,v 1.32 2002/03/29 16:35:25 jake Exp $ + * $FreeBSD: src/sys/ia64/ia64/exception.s,v 1.33 2002/04/10 16:35:44 dfr Exp $ */ #include ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#14 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.54 2002/04/04 21:03:25 jhb Exp $ + * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.55 2002/04/10 16:34:52 dfr Exp $ */ /* @@ -445,6 +445,7 @@ kernel_pmap->pm_count = 1; kernel_pmap->pm_active = 1; TAILQ_INIT(&kernel_pmap->pm_pvlist); + PCPU_SET(current_pmap, kernel_pmap); /* * Region 5 is mapped via the vhpt. ==== //depot/projects/ia64/sys/ia64/include/ansi.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/ia64/include/ansi.h,v 1.19 2002/03/26 02:59:00 obrien Exp $ + * $FreeBSD: src/sys/ia64/include/ansi.h,v 1.20 2002/04/10 15:58:12 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -53,6 +53,7 @@ #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ +#define _BSD_SEGSZ_T_ __int32_t /* segment size (in pages) */ #define _BSD_SIZE_T_ unsigned long /* sizeof() */ #define _BSD_SOCKLEN_T_ __uint32_t #define _BSD_SSIZE_T_ long /* byte count or error */ ==== //depot/projects/ia64/sys/ia64/include/endian.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/ia64/include/endian.h,v 1.8 2002/03/09 21:02:14 mike Exp $ + * $FreeBSD: src/sys/ia64/include/endian.h,v 1.9 2002/04/10 14:39:13 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -47,17 +47,26 @@ #define _QUAD_HIGHWORD 1 #define _QUAD_LOWWORD 0 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ -#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ -#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ +#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ +#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ +#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ + +#define _BYTE_ORDER _LITTLE_ENDIAN -#define BYTE_ORDER LITTLE_ENDIAN -#endif /* !_POSIX_SOURCE */ +/* + * Deprecated variants that don't have enough underscores to be useful in more + * strict namespaces. + */ +#if __BSD_VISIBLE +#define LITTLE_ENDIAN _LITTLE_ENDIAN +#define BIG_ENDIAN _BIG_ENDIAN +#define PDP_ENDIAN _PDP_ENDIAN +#define BYTE_ORDER _BYTE_ORDER +#endif #ifdef __GNUC__ ==== //depot/projects/ia64/sys/netinet/in.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in.h 8.3 (Berkeley) 1/3/94 - * $FreeBSD: src/sys/netinet/in.h,v 1.64 2002/04/09 18:01:26 silby Exp $ + * $FreeBSD: src/sys/netinet/in.h,v 1.65 2002/04/10 11:59:02 mike Exp $ */ #ifndef _NETINET_IN_H_ @@ -324,9 +324,7 @@ char sin_zero[8]; }; -#ifndef INET_ADDRSTRLEN #define INET_ADDRSTRLEN 16 -#endif /* * Options for use with [gs]etsockopt at the IP level. ==== //depot/projects/ia64/sys/netinet6/in6.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6.h,v 1.17 2002/03/19 15:01:21 darrenr Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6.h,v 1.18 2002/04/10 11:59:02 mike Exp $ */ /* $KAME: in6.h,v 1.89 2001/05/27 13:28:35 itojun Exp $ */ /* @@ -132,9 +132,7 @@ #define s6_addr32 __u6_addr.__u6_addr32 #endif -#ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 46 -#endif /* * Socket address for IPv6 ==== //depot/projects/ia64/sys/powerpc/include/ansi.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/powerpc/include/ansi.h,v 1.19 2002/03/24 11:25:46 obrien Exp $ + * $FreeBSD: src/sys/powerpc/include/ansi.h,v 1.20 2002/04/10 15:58:12 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -52,6 +52,7 @@ #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ int /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ +#define _BSD_SEGSZ_T_ __int32_t /* segment size (in pages) */ #define _BSD_SIZE_T_ unsigned int /* sizeof() */ #define _BSD_SOCKLEN_T_ __uint32_t /* socklen_t (duh) */ #define _BSD_SSIZE_T_ long /* byte count or error */ ==== //depot/projects/ia64/sys/powerpc/include/endian.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $ - * $FreeBSD: src/sys/powerpc/include/endian.h,v 1.7 2002/03/09 21:02:15 mike Exp $ + * $FreeBSD: src/sys/powerpc/include/endian.h,v 1.8 2002/04/10 14:39:13 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -50,13 +50,22 @@ * Definitions for byte order, according to byte significance from low * address to high. */ -#ifndef _POSIX_SOURCE -#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ -#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ -#define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ +#define _LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ +#define _BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ +#define _PDP_ENDIAN 3412 /* LSB first in word, MSW first in long */ + +#define _BYTE_ORDER _BIG_ENDIAN -#define BYTE_ORDER BIG_ENDIAN -#endif /* !_POSIX_SOURCE */ +/* + * Deprecated variants that don't have enough underscores to be useful in more + * strict namespaces. + */ +#if __BSD_VISIBLE +#define LITTLE_ENDIAN _LITTLE_ENDIAN +#define BIG_ENDIAN _BIG_ENDIAN +#define PDP_ENDIAN _PDP_ENDIAN +#define BYTE_ORDER _BYTE_ORDER +#endif #ifdef __GNUC__ ==== //depot/projects/ia64/sys/sparc64/include/ansi.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/sparc64/include/ansi.h,v 1.13 2002/03/24 11:25:46 obrien Exp $ + * $FreeBSD: src/sys/sparc64/include/ansi.h,v 1.14 2002/04/10 15:58:12 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -53,6 +53,7 @@ #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ +#define _BSD_SEGSZ_T_ __int64_t /* segment size (in pages) */ #define _BSD_SIZE_T_ unsigned long /* sizeof() */ #define _BSD_SOCKLEN_T_ __uint32_t /* socklen_t (duh) */ #define _BSD_SSIZE_T_ long /* byte count or error */ ==== //depot/projects/ia64/sys/sparc64/include/endian.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)endian.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/sparc64/include/endian.h,v 1.7 2002/03/09 21:02:15 mike Exp $ + * $FreeBSD: src/sys/sparc64/include/endian.h,v 1.8 2002/04/10 14:39:14 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -45,17 +45,26 @@ #define _QUAD_HIGHWORD 0 #define _QUAD_LOWWORD 1 -#ifndef _POSIX_SOURCE /* * Definitions for byte order, according to byte significance from low * address to high. */ -#define LITTLE_ENDIAN 1234 /* LSB first: i386, vax */ -#define BIG_ENDIAN 4321 /* MSB first: 68000, ibm, net */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 12:20:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F28437B41C; Wed, 10 Apr 2002 12:20:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from anchor-post-35.mail.demon.net (anchor-post-35.mail.demon.net [194.217.242.93]) by hub.freebsd.org (Postfix) with ESMTP id E09BC37B400; Wed, 10 Apr 2002 12:19:58 -0700 (PDT) Received: from mailgate.nlsystems.com ([62.49.251.130] helo=herring.nlsystems.com) by anchor-post-35.mail.demon.net with esmtp (Exim 3.35 #1) id 16vNdN-0002SQ-0Z; Wed, 10 Apr 2002 20:19:57 +0100 Received: from salmon.nlsystems.com (salmon [10.0.0.3]) by herring.nlsystems.com (8.12.2/8.11.2) with ESMTP id g3AJJv3I014886; Wed, 10 Apr 2002 20:19:57 +0100 (BST) (envelope-from dfr@nlsystems.com) Date: Wed, 10 Apr 2002 20:19:56 +0100 (BST) From: Doug Rabson To: Peter Wemm Cc: Jake Burkholder , John Baldwin , Perforce Change Reviews Subject: Re: PERFORCE change 9504 for review In-Reply-To: <20020410191220.92F753810@overcee.wemm.org> Message-ID: <20020410201934.D16912-100000@salmon.nlsystems.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, 10 Apr 2002, Peter Wemm wrote: > Doug Rabson wrote: > > On Wed, 10 Apr 2002, Jake Burkholder wrote: > > > > > Apparently, On Wed, Apr 10, 2002 at 09:06:18AM -0400, > > > John Baldwin said words to the effect of; > > > > > > > > > > > On 10-Apr-2002 Peter Wemm wrote: > > > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9504 > > > > > > > > > > Change 9504 by peter@peter_thunder on 2002/04/10 04:51:36 > > > > > > > > > > Use dfr's fix instead of my hack. I expect he'll commit this to > > > > > freefall soon. :-) > > > > > > > > Yep, much better. :) > > > > > > Well, now the flag checking code is duplicated in both the trap and syscall > > > return paths, alpha is the same. One wonders if the FRAME_SYSCALL optimiza > tion > > > is actually worth all this complication. > > > > I think its still worth it - it still does a lot less work in the common > > case. Bear in mind that calling ast() is quite rare and being forced to do > > a full exception restore (e.g. for a signal) is even rarer. A harmless > > extra call to ast() in that case is unlikely to be noticable. Having said > > that, for ia64 at least, it should be possible for the syscall to bypass > > the ast() bits at the beginning of exception_restore(). As long as syscall > > sets (p1,p2) to (1,0), it can jump to label 2 in exception_restore. > > John asked an awkward question a while ago.. What happens if the ast() > call in the back of the fast syscall return path changes the frame type? > eg: it posted a signal and turned off the FRAME_SYSCALL bit. We'll continue > with the fast return, right? Is this good or bad? Nonono. We check the frame type *after* the call to ast()... -- Doug Rabson Mail: dfr@nlsystems.com Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 12:32:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED79E37B419; Wed, 10 Apr 2002 12:29:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CACC037B416 for ; Wed, 10 Apr 2002 12:29:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3AJTfm70663 for perforce@freebsd.org; Wed, 10 Apr 2002 12:29:41 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Wed, 10 Apr 2002 12:29:41 -0700 (PDT) Message-Id: <200204101929.g3AJTfm70663@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9531 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9531 Change 9531 by jake@jake_sparc64 on 2002/04/10 12:29:22 Integ@9518 Affected files ... ... //depot/projects/sparc64/contrib/sendmail/FREEBSD-upgrade#5 integrate ... //depot/projects/sparc64/contrib/sendmail/KNOWNBUGS#2 integrate ... //depot/projects/sparc64/contrib/sendmail/RELEASE_NOTES#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/README#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/README#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/submit.cf#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/submit.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/access_db.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/compat_check.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/ldap_routing.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/msp.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/m4/proto.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/m4/version.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/darwin.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/contrib/buildvirtuser#2 integrate ... //depot/projects/sparc64/contrib/sendmail/contrib/qtool.8#2 integrate ... //depot/projects/sparc64/contrib/sendmail/contrib/qtool.pl#2 integrate ... //depot/projects/sparc64/contrib/sendmail/contrib/smcontrol.pl#2 integrate ... //depot/projects/sparc64/contrib/sendmail/doc/op/op.me#2 integrate ... //depot/projects/sparc64/contrib/sendmail/editmap/editmap.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/libmilter/mfapi.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/libmilter/milter.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/cdefs.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/conf.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/config.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/gen.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/io.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/ldap.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_freebsd.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/Makefile.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/comm.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/docs/installation.html#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#1 branch ... //depot/projects/sparc64/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/engine.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/listener.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/main.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/signal.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/smfi.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/README#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/clock.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/config.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/debug.html#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fclose.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/findfp.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/ldap.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/local.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/mbdb.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/smstdio.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/sscanf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/stdio.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/strio.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/strl.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-event.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-fopen.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-shm.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-types.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/vsscanf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/wsetup.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmdb/smdb.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmdb/smdb1.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmdb/smndbm.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/mail.local/Makefile.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/mail.local/mail.local.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/mailstats/mailstats.8#2 integrate ... //depot/projects/sparc64/contrib/sendmail/smrsh/Makefile.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/README#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/SECURITY#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/TUNING#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/bf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/collect.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/conf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/conf.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/control.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/daemon.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/deliver.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/domain.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/envelope.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/helpfile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/main.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/map.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/mci.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/milter.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/mime.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/parseaddr.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/queue.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/readcf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/sasl.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/sendmail.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/sfsasl.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/srvrsmtp.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/stats.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/tls.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/usersmtp.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/util.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/version.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/vacation/vacation.1#2 integrate ... //depot/projects/sparc64/contrib/sendmail/vacation/vacation.c#2 integrate ... //depot/projects/sparc64/etc/defaults/periodic.conf#2 integrate ... //depot/projects/sparc64/etc/periodic/daily/440.status-mailq#2 integrate ... //depot/projects/sparc64/etc/periodic/daily/500.queuerun#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/Makefile#11 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc1/Makefile#4 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc1obj/Makefile#4 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc1plus/Makefile#4 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/collect2/Makefile#2 integrate ... //depot/projects/sparc64/include/arpa/inet.h#4 integrate ... //depot/projects/sparc64/lib/libcrypt/crypt.3#2 integrate ... //depot/projects/sparc64/lib/libmd/Makefile#2 integrate ... //depot/projects/sparc64/lib/libstand/Makefile#9 integrate ... //depot/projects/sparc64/libexec/tftpd/tftpd.c#2 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#6 integrate ... //depot/projects/sparc64/sbin/dumpon/dumpon.8#2 integrate ... //depot/projects/sparc64/share/man/man4/Makefile#3 integrate ... //depot/projects/sparc64/share/man/man4/ng_etf.4#2 integrate ... //depot/projects/sparc64/share/man/man5/make.conf.5#4 integrate ... //depot/projects/sparc64/share/man/man5/periodic.conf.5#2 integrate ... //depot/projects/sparc64/share/man/man8/intro.8#2 integrate ... //depot/projects/sparc64/share/mk/bsd.sys.mk#5 integrate ... //depot/projects/sparc64/sys/alpha/include/ansi.h#11 integrate ... //depot/projects/sparc64/sys/alpha/include/endian.h#7 integrate ... //depot/projects/sparc64/sys/boot/common/interp_forth.c#4 integrate ... //depot/projects/sparc64/sys/boot/sparc64/loader/main.c#23 edit ... //depot/projects/sparc64/sys/compat/linprocfs/linprocfs.c#15 integrate ... //depot/projects/sparc64/sys/compat/pecoff/imgact_pecoff.c#6 integrate ... //depot/projects/sparc64/sys/conf/NOTES#3 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-all.c#24 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-raid.c#18 integrate ... //depot/projects/sparc64/sys/dev/digi/CX.c#2 integrate ... //depot/projects/sparc64/sys/dev/digi/CX_PCI.c#2 integrate ... //depot/projects/sparc64/sys/dev/digi/EPCX.c#2 integrate ... //depot/projects/sparc64/sys/dev/digi/EPCX_PCI.c#2 integrate ... //depot/projects/sparc64/sys/dev/digi/Xe.c#2 integrate ... //depot/projects/sparc64/sys/dev/digi/Xem.c#2 integrate ... //depot/projects/sparc64/sys/dev/digi/Xr.c#2 integrate ... //depot/projects/sparc64/sys/dev/digi/digi.c#12 integrate ... //depot/projects/sparc64/sys/dev/digi/digi.h#6 integrate ... //depot/projects/sparc64/sys/dev/digi/digi_isa.c#5 integrate ... //depot/projects/sparc64/sys/dev/pci/pci.c#12 integrate ... //depot/projects/sparc64/sys/dev/se/se_console.c#4 integrate ... //depot/projects/sparc64/sys/dev/se/sereg.h#6 integrate ... //depot/projects/sparc64/sys/dev/snp/snp.c#9 integrate ... //depot/projects/sparc64/sys/dev/usb/umass.c#13 integrate ... //depot/projects/sparc64/sys/i386/include/ansi.h#11 integrate ... //depot/projects/sparc64/sys/i386/include/endian.h#9 integrate ... //depot/projects/sparc64/sys/ia64/ia64/exception.s#15 integrate ... //depot/projects/sparc64/sys/ia64/ia64/pmap.c#24 integrate ... //depot/projects/sparc64/sys/ia64/include/ansi.h#10 integrate ... //depot/projects/sparc64/sys/ia64/include/endian.h#8 integrate ... //depot/projects/sparc64/sys/kern/imgact_aout.c#8 integrate ... //depot/projects/sparc64/sys/kern/kern_acct.c#10 integrate ... //depot/projects/sparc64/sys/kern/kern_exit.c#21 integrate ... //depot/projects/sparc64/sys/kern/kern_fork.c#26 integrate ... //depot/projects/sparc64/sys/kern/kern_linker.c#17 integrate ... //depot/projects/sparc64/sys/kern/kern_proc.c#16 integrate ... //depot/projects/sparc64/sys/kern/kern_time.c#8 integrate ... //depot/projects/sparc64/sys/kern/subr_witness.c#21 integrate ... //depot/projects/sparc64/sys/kern/sys_process.c#16 integrate ... //depot/projects/sparc64/sys/net/if.c#18 integrate ... //depot/projects/sparc64/sys/netinet/in.c#11 integrate ... //depot/projects/sparc64/sys/netinet/in.h#9 integrate ... //depot/projects/sparc64/sys/netinet/in_pcb.c#17 integrate ... //depot/projects/sparc64/sys/netinet/in_pcb.h#10 integrate ... //depot/projects/sparc64/sys/netinet/ip_divert.c#9 integrate ... //depot/projects/sparc64/sys/netinet6/in6.h#5 integrate ... //depot/projects/sparc64/sys/powerpc/include/ansi.h#11 integrate ... //depot/projects/sparc64/sys/powerpc/include/endian.h#6 integrate ... //depot/projects/sparc64/sys/sparc64/include/ansi.h#12 integrate ... //depot/projects/sparc64/sys/sparc64/include/emul.h#2 integrate ... //depot/projects/sparc64/sys/sparc64/include/endian.h#12 integrate ... //depot/projects/sparc64/sys/sys/ioccom.h#5 integrate ... //depot/projects/sparc64/sys/sys/linker.h#13 integrate ... //depot/projects/sparc64/sys/sys/param.h#17 integrate ... //depot/projects/sparc64/sys/sys/types.h#14 integrate ... //depot/projects/sparc64/sys/vm/uma_core.c#6 integrate ... //depot/projects/sparc64/usr.bin/awk/Makefile#4 integrate ... //depot/projects/sparc64/usr.bin/compress/compress.1#2 integrate ... //depot/projects/sparc64/usr.bin/find/find.1#3 integrate ... //depot/projects/sparc64/usr.bin/renice/renice.8#2 integrate ... //depot/projects/sparc64/usr.bin/renice/renice.c#3 integrate ... //depot/projects/sparc64/usr.bin/yacc/output.c#5 integrate ... //depot/projects/sparc64/usr.bin/yacc/reader.c#5 integrate ... //depot/projects/sparc64/usr.sbin/chown/chown.8#2 integrate ... //depot/projects/sparc64/usr.sbin/newsyslog/newsyslog.c#3 integrate ... //depot/projects/sparc64/usr.sbin/timed/timed/timed.8#2 integrate Differences ... ==== //depot/projects/sparc64/contrib/sendmail/FREEBSD-upgrade#5 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.12 2002/04/09 02:09:14 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.14 2002/04/10 05:16:45 gshapiro Exp $ -sendmail 8.12.2 +sendmail 8.12.3 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following files were removed: @@ -21,8 +21,8 @@ Imported using: - cvs import -m 'Import sendmail 8.12.2' \ - src/contrib/sendmail SENDMAIL v8_12_2 + cvs import -m 'Import sendmail 8.12.3' \ + src/contrib/sendmail SENDMAIL v8_12_3 To make local changes to sendmail, simply patch and commit to the main @@ -40,6 +40,7 @@ contrib/sendmail/ etc/Makefile etc/defaults/make.conf (RELENG_4) + etc/defaults/periodic.conf etc/defaults/rc.conf etc/mail/Makefile etc/mail/README @@ -71,6 +72,7 @@ share/doc/smm/08.sendmailop/Makefile share/examples/etc/make.conf (HEAD) share/man/man5/make.conf.5 + share/man/man5/periodic.conf.5 share/man/man5/rc.conf.5 share/man/man7/hier.7 share/man/man8/Makefile @@ -88,4 +90,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -17-February-2002 +9-April-2002 ==== //depot/projects/sparc64/contrib/sendmail/KNOWNBUGS#2 (text+ko) ==== @@ -41,6 +41,25 @@ characters then no header check is done even if one is configured for the header. +* Sender addresses whose domain part cause a temporary A record lookup + failure but have a valid MX record will be temporarily rejected in + the default configuration. Solution: fix the DNS at the sender side. + If that's not easy to achieve, possible workarounds are: + - add an entry to the access map: + dom.ain OK + - (only for advanced users) replace + +# Resolve map (to check if a host exists in check_mail) +Kresolve host -a -T + + with + +# Resolve map (to check if a host exists in check_mail) +Kcanon host -a -T +Kdnsmx dns -R MX -a -T +Kresolve sequence dnsmx canon + + * Duplicate error messages. Sometimes identical, duplicate error messages can be generated. As @@ -216,4 +235,4 @@ the file. This is unavoidable as sendmail must verify the file is safe to open before opening it. A file can not be locked until it is open. -$Revision: 8.54 $, Last updated $Date: 2001/12/17 16:07:51 $ +$Revision: 8.55 $, Last updated $Date: 2002/03/05 00:45:54 $ ==== //depot/projects/sparc64/contrib/sendmail/RELEASE_NOTES#2 (text+ko) ==== @@ -1,11 +1,190 @@ SENDMAIL RELEASE NOTES - $Id: RELEASE_NOTES,v 8.1218 2002/01/13 18:24:15 ca Exp $ + $Id: RELEASE_NOTES,v 8.1296 2002/04/05 19:17:34 ca Exp $ This listing shows the version of the sendmail binary, the version of the sendmail configuration files, the date of release, and a summary of the changes in that release. +8.12.3/8.12.3 2002/04/05 + NOTICE: In general queue files should not be moved if queue groups + are used. In previous versions this could cause mail + not to be delivered if a queue file is repeatedly moved + by an external process whenever sendmail moved it back + into the right place. Some precautions have been taken + to avoid moving queue files if not really necessary. + sendmail may use links to refer to queue files and it + may store the path of data files in queue files. Hence + queue files should not be moved unless those internals + are understood and the integrity of the files is not + compromised. Problem noted by Anne Bennett of Concordia + University. + If an error mail is created, and the mail is split across different + queue directories, and SuperSafe is off, then write the mail + to disk before splitting it, otherwise an assertion is + triggered. Problem tracked down by Henning Schmiedehausen + of INTERMETA. + Fix possible race condition that could cause sendmail to forget + running queues. Problem noted by Jeff Wasilko of smoe.org. + Handle bogus qf files better without triggering assertions. + Problem noted by Guy Feltin. + Protect against interrupted select() call when enforcing Milter + read and write timeouts. Patch from Gurusamy Sarathy of + ActiveState. + Matching queue IDs with -qI should be case sensitive. Problem + noted by Anne Bennett of Concordia University. + If privileges have been dropped, don't try to change group ID to + the RunAsUser group. Problem noted by Neil Rickert of + Northern Illinois University. + Fix SafeFileEnvironment path munging when the specified path + contains a trailing slash. Based on patch from Dirk Meyer + of Dinoex. + Do not limit sendmail command line length to SM_ARG_MAX (usually + 4096). Problem noted by Allan E Johannesen of Worcester + Polytechnic Institute. + Clear full name of sender for each new envelope to avoid bogus data + if several mails are sent in one session and some of them + do not have a From: header. Problem noted by Bas Haakman. + Change timeout check such that cached information about a connection + will be immediately invalid if ConnectionCacheTimeout is zero. + Based on patch from David Burns of Portland State University. + Properly count message size for mailstats during mail collection. + Problem noted by Werner Wiethege. + Log complete response from LMTP delivery agent on failure. Based on + patch from by Motonori Nakamura of Kyoto University. + Provide workaround for getopt() implementations that do not catch + missing arguments. + Fix the message size calculation if the message body is replaced by + a milter filter and buffered file I/O is being used. + Problem noted by Sergey Akhapkin of Dr.Web. + Do not honor SIGUSR1 requests if running with extra privileges. + Problem noted by Werner Wiethege. + Prevent a file descriptor leak on mail delivery if the initial + connect fails and DialDelay is set. Patch from Servaas + Vandenberghe of Katholieke Universiteit Leuven. + Properly deal with a case where sendmail is called by root running + a set-user-ID (non-root) program. Problem noted by Jon + Lusky of ISS Atlanta. + Avoid leaving behind stray transcript (xf) files if multiple queue + directories are used and mail is sent to a mailing list + which has an owner- alias. Problem noted by Anne Bennett + of Concordia University. + Fix class map parsing code if optional key is specified. Problem + found by Mario Nigrovic. + The SMTP daemon no longer tries to fix up improperly dot-stuffed + incoming messages. A leading dot is always stripped by the + SMTP receiver regardless of whether or not it is followed by + another dot. Problem noted by Jordan Ritter of darkridge.com. + Fix corruption when doing automatic MIME 7-bit quoted-printable or + base64 encoding to 8-bit text. Problem noted by Mark + Elvers. + Correct the statistics gathered for total number of connections. + Instead of being the exact same number as the total number + of messages (T line in mailstats) it now represents the + total number of TCP connections. + Be more explicit about syntax errors in addresses, especially + non-ASCII characters, and properly create DSNs if necessary. + Problem noted by Leena Heino of the University of Tampere. + Prevent small timeouts from being lost on slow machines if itimers + are used. Problem noted by Suresh Ramasubramanian. + Prevent a race condition on child cleanup for delivery to files. + Problem noted by Fletcher Mattox of the University of + Texas. + Change the SMTP error code for temporary map failures from 421 + to 451. + Do not assume that realloc(NULL, size) works on all OS (this was + only done in one place: queue group creation). Based on + patch by Bryan Costales. + Initialize Timeout.iconnect in the code to prevent randomly short + timeouts. Problem noted by Bradley Watts of AT&T Canada. + Do not try to send a second SMTP QUIT command if the remote + responds to a MAIL command with a 421 reply or on I/O + errors. By doing so, the host was marked as having a + temporary problem and other mail destined for that host was + queued for the next queue run. Problem noted by Fletcher + Mattox of the University of Texas, Allan E Johannesen of + Worcester Polytechnic Institute, Larry Greenfield of CMU, + and Neil Rickert of Northern Illinois University. + Ignore error replies from the SMTP QUIT command (including servers + which drop the connection instead of responding to the + command). + Portability: + Check LDAP_API_VERSION to determine if ldap_memfree() is + availble. + Define HPUX10 when building on HP-UX 10.X. That platform + now gets the proper _PATH_SENDMAIL and SMRSH_CMDDIR + settings. Patch from Elias Halldor Agustsson of + Skyrr. + Fix dependency building on Mac OS X and Darwin. Problem + noted by John Beck. + Preliminary support for the sparc64 port of FreeBSD 5.0. + Add /sbin/sh as an acceptable user shell on HP-UX. From + Rajesh Somasund of Hewlett-Packard. + CONFIG: Add FEATURE(`authinfo') to allow a separate database for + SMTP AUTH information. This feature was actually added in + 8.12.0 but a release note was not included. + CONFIG: Do not bounce mail if FEATURE(`ldap_routing')'s bounce + parameter is set and the LDAP lookup returns a temporary + error. + CONFIG: Honor FEATURE(`relay_hosts_only') when using + FEATURE(`relay_mail_from', `domain'). Problem noted by + Krzysztof Oledzki. + CONFIG: FEATURE(`msp') now disables any type of alias + initialization as aliases are not needed for the MSP. + CONFIG: Allow users to override RELAY_MAILER_ARGS when FEATURE(`msp') + is in use. Patch from Andrzej Filip. + CONFIG: FEATURE(`msp') uses `[localhost]' as default instead of + `localhost' and turns on MX lookups for the SMTP mailers. + This will only have an effect if a parameter is specified, + i.e., an MX lookup will be performed on the hostname unless + it is embedded in square brackets. Problem noted by + Theo Van Dinter of Collective Technologies. + CONFIG: Set confTIME_ZONE to USE_TZ in submit.mc (TimeZoneSpec= in + submit.cf) to use $TZ for time stamps. This is a compromise + to allow for the proper time zone on systems where the + default results in misleading time stamps. That is, syslog + time stamps and Date headers on submitted mail will use the + user's $TZ setting. Problem noted by Mark Roth of the + University of Illinois at Urbana-Champaign, solution proposed + by Neil Rickert of Northern Illinois University. + CONFIG: Mac OS X (Darwin) ships with mail.local as non-set-user-ID + binary. Adjust local mailer flags accordingly. Problem + noted by John Beck. + CONTRIB: Add a warning to qtool.pl to not move queue files around + if queue groups are used. + CONTRIB: buildvirtuser: Add -f option to force rebuild. + CONTRIB: smcontrol.pl: Add -f option to specify control socket. + CONTRIB: smcontrol.pl: Add support for 'memdump' command. + Suggested by Bryan Costales. + DEVTOOLS: Add dependency generation for test programs. + LIBMILTER: Remove conversion of port number for the socket + structure that is passed to xxfi_connect(). Notice: + this fix requires that sendmail and libmilter have both + this change, mixing versions may lead to wrong port + values depending on the endianness of the involved systems. + Problem noted by Gisle Aas of ActiveState. + LIBMILTER: If smfi_setreply() sets a custom reply code of '4XX' but + SMFI_REJECT is returned, ignore the custom reply. Do the + same if '5XX' is used and SMFI_TEMPFAIL is returned. + LIBMILTER: Install include files in ${INCLUDEDIR}/libmilter/ as + required by mfapi.h. Problem noted by Jose Marcio Martins + da Cruz of Ecole Nationale Superieure des Mines de Paris. + LIBSM: Add SM_CONF_LDAP_MEMFREE as a configuration define. Set + this to 1 if your LDAP client libraries include + ldap_memfree(). + LIBSMDB: Avoid a file creation race condition for Berkeley DB 1.X + and NDBM on systems with the O_EXLOCK open(2) flag. + SMRSH: Fix compilation problem on some operating systems. Problem + noted by Christian Krackowizer of schuler technodat GmbH. + VACATION: Allow root to operate on user vacation databases. Based + on patch from Greg Couch of the University of California, + San Francisco. + VACATION: Don't ignore -C option. Based on patch by Bryan Costales. + VACATION: Clarify option usage in the man page. Problem noted by + Joe Barbish. + New Files: + libmilter/docs/smfi_setbacklog.html + 8.12.2/8.12.2 2002/01/13 Don't complain too much if stdin, stdout, or stderr are missing at startup, only log an error message. ==== //depot/projects/sparc64/contrib/sendmail/cf/README#2 (text+ko) ==== @@ -367,6 +367,9 @@ SMTP_MAILER_MAXMSGS [undefined] If defined, the maximum number of messages to deliver in a single connection for the smtp, smtp8, esmtp, or dsmtp mailers. +SMTP_MAILER_MAXRCPTS [undefined] If defined, the maximum number of + recipients to deliver in a single connection for the + smtp, smtp8, esmtp, or dsmtp mailers. SMTP_MAILER_ARGS [TCP $h] The arguments passed to the smtp mailer. About the only reason you would want to change this would be to change the default port. @@ -1084,6 +1087,9 @@ By default, only hosts listed as RELAY in the access db will be allowed to relay. This option also allows any host in your domain as defined by class {m}. + Notice: make sure that your domain is not just a top level + domain, e.g., com. This can happen if you give your + host a name like example.com instead of host.example.com. relay_hosts_only By default, names that are listed as RELAY in the access @@ -1274,11 +1280,13 @@ FEATURE and introduce new settings via DAEMON_OPTIONS(). msp Defines config file for Message Submission Program. - See sendmail/SECURITY for details and cf/cf/submit.mc - how to use it. An optional argument can be used to - override the default of `localhost' to use as host to send - all e-mails to. If `MSA' is specified as second argument - then port 587 is used to contact the server. Example: + See sendmail/SECURITY for details and cf/cf/submit.mc how + to use it. An optional argument can be used to override + the default of `[localhost]' to use as host to send all + e-mails to. Note that MX records will be used if the + specified hostname is not in square brackets (e.g., + [hostname]). If `MSA' is specified as second argument then + port 587 is used to contact the server. Example: FEATURE(`msp', `', `MSA') @@ -1298,6 +1306,9 @@ queue groups. If an argument is specified, it is used as default queue group. + Note: please read the warning in doc/op/op.me about + queue groups and possible queue manipulations. + +-------+ | HACKS | +-------+ @@ -1744,7 +1755,7 @@ sendmailMTAKey: bob sendmailMTAAliasValue: eric - dn: sendmailMTAKey=bob, dc=sendmail, dc=org + dn: sendmailMTAKey=bobetrn, dc=sendmail, dc=org objectClass: sendmailMTA objectClass: sendmailMTAAlias objectClass: sendmailMTAAliasObject @@ -1973,19 +1984,21 @@ The default map definition is: - ldap -1 -v mailHost -k (&(objectClass=inetLocalMailRecipient) + ldap -1 -T -v mailHost -k (&(objectClass=inetLocalMailRecipient) (mailLocalAddress=%0)) The default map definition is: - ldap -1 -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient) - (mailLocalAddress=%0)) + ldap -1 -T -v mailRoutingAddress + -k (&(objectClass=inetLocalMailRecipient) + (mailLocalAddress=%0)) Note that neither includes the LDAP server hostname (-h server) or base DN (-b o=org,c=COUNTRY), both necessary for LDAP queries. It is presumed that your .mc file contains a setting for the confLDAP_DEFAULT_SPEC option with these settings. If this is not the case, the map definitions should be -changed as described above. +changed as described above. The "-T" is required in any user +specified map definition to catch temporary errors. The following possibilities exist as a result of an LDAP lookup on an address: @@ -2242,14 +2255,16 @@ spammer@aol.com REJECT cyberspammer.com REJECT + TLD REJECT 192.168.212 REJECT IPv6:2002:c0a8:02c7 RELAY IPv6:2002:c0a8:51d2::23f4 REJECT would refuse mail from spammer@aol.com, any user from cyberspammer.com -(or any host within the cyberspammer.com domain), any host on the -192.168.212.* network, and the IPv6 address 2002:c0a8:51d2::23f4. It would -allow relay for the IPv6 network 2002:c0a8:02c7::/48. +(or any host within the cyberspammer.com domain), any host in the entire +top level domain TLD, 192.168.212.* network, and the IPv6 address +2002:c0a8:51d2::23f4. It would allow relay for the IPv6 network +2002:c0a8:02c7::/48. The value part of the map can contain: @@ -2505,11 +2520,15 @@ FEATURE(`delay_checks', `hater') enables spamhater test -If such an argument is given, the recipient will be looked up in the access -map (using the tag Spam:). If the argument is `friend', then the other -rulesets will be skipped if the recipient address is found and has RHS -friend. If the argument is `hater', then the other rulesets will be -applied if the recipient address is found and has RHS hater. +If such an argument is given, the recipient will be looked up in the +access map (using the tag Spam:). If the argument is `friend', then +the default behavior is to apply the other rulesets and make a SPAM +friend the exception. The rulesets check_mail and check_relay will be +skipped only if the recipient address is found and has RHS FRIEND. If +the argument is `hater', then the default behavior is to skip the rulesets +check_mail and check_relay and make a SPAM hater the exception. The +other two rulesets will be applied only if the recipient address is +found and has RHS HATER. This allows for simple exceptions from the tests, e.g., by activating the friend option and having @@ -3022,8 +3041,8 @@ LOCAL_NET_CONFIG R$* < @ $* .$m. > $* $#smtp $@ $2.$m. $: $1 < @ $2.$m. > $3 -This will cause all names that end in your domain name ($m) via -SMTP; anything else will be sent via uucp-new (smart UUCP) to uunet. +This will cause all names that end in your domain name ($m) to be sent +via SMTP; anything else will be sent via uucp-new (smart UUCP) to uunet. If you have FEATURE(`nocanonify'), you may need to omit the dots after the $m. If you are running a local DNS inside your domain which is not otherwise connected to the outside world, you probably want to @@ -3998,7 +4017,9 @@ absolutely sure you need them. Options you may want to change include: -- confTIME_ZONE on OS that don't use the default, e.g., Irix. +- confTRUSTED_USERS, FEATURE(`use_ct_file'), and confCT_FILE for + avoiding X-Authorization warnings. +- confTIME_ZONE to change it from the default `USE_TZ'. - confDELIVERY_MODE is set to interactive in msp.m4 instead of the default background mode. @@ -4237,4 +4258,4 @@ 8 DNS based blacklists 9 special local rulesets (1 and 2) -$Revision: 8.600 $, Last updated $Date: 2002/01/10 17:43:41 $ +$Revision: 8.612 $, Last updated $Date: 2002/04/03 17:12:52 $ ==== //depot/projects/sparc64/contrib/sendmail/cf/cf/README#2 (text+ko) ==== @@ -5,8 +5,8 @@ Please see ../README about the sendmail configuration files themselves. By default you need two .mc files: sendmail.mc and submit.mc. The -latter is a copy of msp.mc in which OSTYPE() has been filled in -according to the host OS. For the former see ../README. +latter is an OS independent configuration file for the mail submission +program (MSP). See ../README for details about both files. Installation of these two files can be done via: @@ -31,4 +31,4 @@ For more details see Makefile. -$Revision: 1.1 $, Last updated $Date: 2001/04/26 15:43:20 $ +$Revision: 1.2 $, Last updated $Date: 2002/02/22 00:33:54 $ ==== //depot/projects/sparc64/contrib/sendmail/cf/cf/submit.cf#2 (text+ko) ==== @@ -26,13 +26,13 @@ ##### $Id: cfhead.m4,v 8.107 2001/07/22 03:25:37 ca Exp $ ##### ##### $Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp $ ##### -##### $Id: submit.mc,v 8.5 2001/09/08 01:20:53 gshapiro Exp $ ##### -##### $Id: msp.m4,v 1.29 2001/12/13 23:56:38 gshapiro Exp $ ##### +##### $Id: submit.mc,v 8.6 2002/03/26 03:30:58 ca Exp $ ##### +##### $Id: msp.m4,v 1.32 2002/03/26 22:02:03 ca Exp $ ##### ##### $Id: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $ ##### -##### $Id: proto.m4,v 8.628 2001/12/28 19:02:40 ca Exp $ ##### +##### $Id: proto.m4,v 8.639 2002/04/02 23:42:42 gshapiro Exp $ ##### # level 10 config file format V10/Berkeley @@ -106,11 +106,11 @@ DnMAILER-DAEMON -D{MTAHost}localhost +D{MTAHost}[localhost] # Configuration version number -DZ8.12.2/Submit +DZ8.12.3/Submit ############### @@ -127,7 +127,7 @@ O AliasWait=10 # location of alias file -O AliasFile +#O AliasFile=/etc/mail/aliases # minimum number of free blocks on filesystem O MinFreeBlocks=100 @@ -259,6 +259,8 @@ # key for shared memory; 0 to turn off #O SharedMemoryKey=0 + + # timeouts (many of these) #O Timeout.initial=5m #O Timeout.connect=5m @@ -312,7 +314,7 @@ # if undefined, use system default # if defined but null, use TZ envariable passed in # if defined and non-null, use that info -#O TimeZoneSpec= +O TimeZoneSpec= # default UID (can be username or userid:groupid) #O DefaultUser=mailnull @@ -1351,19 +1353,19 @@ R$+ $: $>MasqSMTP $1 R$+ $: $>MasqHdr $1 -Msmtp, P=[IPC], F=mDFMuXk05, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, +Msmtp, P=[IPC], F=mDFMuXk5, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, T=DNS/RFC822/SMTP, A=TCP $h -Mesmtp, P=[IPC], F=mDFMuXak05, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, +Mesmtp, P=[IPC], F=mDFMuXak5, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, T=DNS/RFC822/SMTP, A=TCP $h -Msmtp8, P=[IPC], F=mDFMuX8k05, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, +Msmtp8, P=[IPC], F=mDFMuX8k5, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, T=DNS/RFC822/SMTP, A=TCP $h -Mdsmtp, P=[IPC], F=mDFMuXa%k05, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, +Mdsmtp, P=[IPC], F=mDFMuXa%k5, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990, T=DNS/RFC822/SMTP, A=TCP $h -Mrelay, P=[IPC], F=mDFMuXa8k0, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n, L=2040, +Mrelay, P=[IPC], F=mDFMuXa8k, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n, L=2040, T=DNS/RFC822/SMTP, A=TCP $h ==== //depot/projects/sparc64/contrib/sendmail/cf/cf/submit.mc#2 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 2001 Sendmail, Inc. and its suppliers. +# Copyright (c) 2001, 2002 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -15,8 +15,9 @@ # divert(0)dnl -VERSIONID(`$Id: submit.mc,v 8.5 2001/09/08 01:20:53 gshapiro Exp $') +VERSIONID(`$Id: submit.mc,v 8.6 2002/03/26 03:30:58 ca Exp $') define(`confCF_VERSION', `Submit')dnl define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet +define(`confTIME_ZONE', `USE_TZ')dnl FEATURE(`msp')dnl ==== //depot/projects/sparc64/contrib/sendmail/cf/feature/access_db.m4#2 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,7 +10,7 @@ # divert(0) -VERSIONID(`$Id: access_db.m4,v 8.23 2001/03/16 00:51:25 gshapiro Exp $') +VERSIONID(`$Id: access_db.m4,v 8.24 2002/03/06 21:50:25 ca Exp $') divert(-1) define(`_ACCESS_TABLE_', `') @@ -21,14 +21,18 @@ ifelse(lower(_ARG3_),`lookupdotdomain',`define(`_LOOKUPDOTDOMAIN_', `1')') define(`_ATMPF_', `')dnl dnl check whether arg contains -T`'_ATMPF_ +dnl unless it is a sequence map ifelse(defn(`_ARG_'), `', `', - defn(`_ARG_'), `LDAP', `', - `ifelse(index(_ARG_, _ATMPF_), `-1', - `errprint(`*** WARNING: missing -T'_ATMPF_` in argument of FEATURE(`access_db',' defn(`_ARG_')`) + defn(`_ARG_'), `LDAP', `', + `ifelse(index(_ARG_, `sequence '), `0', `', + `ifelse(index(_ARG_, _ATMPF_), `-1', + `errprint(`*** WARNING: missing -T'_ATMPF_` in argument of FEATURE(`access_db',' defn(`_ARG_')`) ') - define(`_ABP_', index(_ARG_, ` ')) - define(`_NARG_', `substr(_ARG_, 0, _ABP_) -T'_ATMPF_` substr(_ARG_, _ABP_)') -')') + define(`_ABP_', index(_ARG_, ` ')) + define(`_NARG_', `substr(_ARG_, 0, _ABP_) -T'_ATMPF_` substr(_ARG_, _ABP_)') + ') + ') + ') LOCAL_CONFIG # Access list database (for spam stomping) ==== //depot/projects/sparc64/contrib/sendmail/cf/feature/compat_check.m4#2 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. +# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ # # divert(0) -VERSIONID(`$Id: compat_check.m4,v 1.3 2001/11/21 18:40:06 ca Exp $') +VERSIONID(`$Id: compat_check.m4,v 1.4 2002/02/26 22:15:31 gshapiro Exp $') divert(-1) ifdef(`_ACCESS_TABLE_', `', `errprint(`FEATURE(`compat_check') requires FEATURE(`access_db') @@ -25,7 +25,7 @@ R$* $| $* $@ ok # act on the result, # it must be one of the following... anything else will be allowed.. -dnl for consistency with the other two even though discard does not take an +dnl for consistency with the other two even though discard does not take a dnl reply code R< DISCARD:$* > $#discard $: $1 " - discarded by check_compat" R< DISCARD $* > $#discard $: $1 " - discarded by check_compat" ==== //depot/projects/sparc64/contrib/sendmail/cf/feature/ldap_routing.m4#2 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers. +# Copyright (c) 1999-2002 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,7 +10,7 @@ # divert(0) -VERSIONID(`$Id: ldap_routing.m4,v 8.8 2001/06/27 21:46:31 gshapiro Exp $') +VERSIONID(`$Id: ldap_routing.m4,v 8.10 2002/03/27 22:17:43 ca Exp $') divert(-1) # Check first two arguments. If they aren't set, may need to warn in proto.m4 @@ -31,9 +31,9 @@ LOCAL_CONFIG # LDAP routing maps Kldapmh ifelse(len(X`'_ARG1_), `1', - `ldap -1 -v mailHost -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', + `ldap -1 -T -v mailHost -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', `_ARG1_') Kldapmra ifelse(len(X`'_ARG2_), `1', - `ldap -1 -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', + `ldap -1 -T -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', `_ARG2_') ==== //depot/projects/sparc64/contrib/sendmail/cf/feature/msp.m4#2 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. +# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,9 +10,9 @@ # divert(0)dnl -VERSIONID(`$Id: msp.m4,v 1.29 2001/12/13 23:56:38 gshapiro Exp $') +VERSIONID(`$Id: msp.m4,v 1.32 2002/03/26 22:02:03 ca Exp $') divert(-1) -define(`ALIAS_FILE', `') +undefine(`ALIAS_FILE') define(`confDELIVERY_MODE', `i') define(`confUSE_MSP', `True') define(`confFORWARD_PATH', `') @@ -29,10 +29,10 @@ ifdef(`MSP_QUEUE_DIR', `define(`QUEUE_DIR', `MSP_QUEUE_DIR')', `define(`QUEUE_DIR', `/var/spool/clientmqueue')') -define(`_MTA_HOST_', ifelse(defn(`_ARG_'), `', `localhost', `_ARG_')) +define(`_MTA_HOST_', ifelse(defn(`_ARG_'), `', `[localhost]', `_ARG_')) define(`_MSP_FQHN_',`dnl used to qualify addresses ifdef(`MASQUERADE_NAME', ifdef(`_MASQUERADE_ENVELOPE_', `$M', `$j'), `$j')') -define(`RELAY_MAILER_ARGS', `TCP $h'ifelse(_ARG2_, `MSA', ` 587')) +ifelse(_ARG2_, `MSA', `define(`RELAY_MAILER_ARGS', `TCP $h 587')') dnl --------------------------------------------- ifdef(`confPID_FILE', `dnl', `define(`confPID_FILE', QUEUE_DIR`/sm-client.pid')') @@ -55,11 +55,11 @@ define(`LOCAL_SHELL_PATH', `[IPC]')dnl define(`LOCAL_SHELL_FLAGS', `lmDFMuXk5')dnl define(`LOCAL_SHELL_ARGS', `TCP $h')dnl -MODIFY_MAILER_FLAGS(`SMTP', `+k05')dnl -MODIFY_MAILER_FLAGS(`ESMTP', `+k05')dnl -MODIFY_MAILER_FLAGS(`DSMTP', `+k05')dnl -MODIFY_MAILER_FLAGS(`SMTP8', `+k05')dnl -MODIFY_MAILER_FLAGS(`RELAY', `+k0')dnl +MODIFY_MAILER_FLAGS(`SMTP', `+k5')dnl +MODIFY_MAILER_FLAGS(`ESMTP', `+k5')dnl +MODIFY_MAILER_FLAGS(`DSMTP', `+k5')dnl +MODIFY_MAILER_FLAGS(`SMTP8', `+k5')dnl +MODIFY_MAILER_FLAGS(`RELAY', `+k')dnl MAILER(`local')dnl MAILER(`smtp')dnl ==== //depot/projects/sparc64/contrib/sendmail/cf/m4/proto.m4#2 (text+ko) ==== @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,7 +13,7 @@ # divert(0) -VERSIONID(`$Id: proto.m4,v 8.628 2001/12/28 19:02:40 ca Exp $') +VERSIONID(`$Id: proto.m4,v 8.639 2002/04/02 23:42:42 gshapiro Exp $') # level CF_LEVEL config file format V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley') @@ -337,7 +337,8 @@ # SMTP daemon options ifelse(defn(`confDAEMON_OPTIONS'), `', `dnl', -`errprint(WARNING: `confDAEMON_OPTIONS' is no longer valid. See cf/README for more information. +`errprint(WARNING: `confDAEMON_OPTIONS' is no longer valid. + Use `DAEMON_OPTIONS()'; see cf/README. )'dnl `DAEMON_OPTIONS(`confDAEMON_OPTIONS')') ifelse(defn(`_DPO_'), `', @@ -395,6 +396,10 @@ # key for shared memory; 0 to turn off _OPTION(SharedMemoryKey, `confSHARED_MEMORY_KEY', `0') +ifdef(`confSHARED_MEMORY_KEY_FILE', `dnl +# file to store key for shared memory (if SharedMemoryKey = -1) +O SharedMemoryKeyFile=confSHARED_MEMORY_KEY_FILE') + # timeouts (many of these) _OPTION(Timeout.initial, `confTO_INITIAL', `5m') _OPTION(Timeout.connect, `confTO_CONNECT', `5m') @@ -1416,6 +1421,10 @@ # do the LDAP lookups R<$+><$+><$*> $: <$(ldapmra $2 $: $)> <$(ldapmh $2 $: $)> <$1> <$2> <$3> +# look for temporary failures (return original address, MTA will queue up) +R<$* > <$*> <$+> <$+> <$*> $@ $2 +R<$*> <$* > <$+> <$+> <$*> $@ $2 + # if mailRoutingAddress and local or non-existant mailHost, # return the new mailRoutingAddress ifelse(_LDAP_ROUTE_DETAIL_, `_PRESERVE_', `dnl @@ -2104,7 +2113,7 @@ # check whether local FROM is ok R $+ < @ $=w > $@ RELAY FROM local', `dnl') ifdef(`_RELAY_DB_FROM_', `dnl -R $+ < @ $+ > $: <@> $>SearchList $| ifdef(`_RELAY_DB_FROM_DOMAIN_', `') <> +R $+ < @ $+ > $: <@> $>SearchList $| ifdef(`_RELAY_DB_FROM_DOMAIN_', ifdef(`_RELAY_HOSTS_ONLY_', `', `')) <> R<@> $@ RELAY RELAY FROM sender ok ifdef(`_ATMPF_', `R<@> <_ATMPF_> $#TEMP $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl') ', `dnl @@ -2201,9 +2210,10 @@ ifdef(`_FFR_MAIL_MACRO', `R$* $: $1 $| $>checkmail $&{mail_from}', `R$* $: $1 $| $>checkmail <$&f>') +dnl recipient (canonical format) $| result of checkmail R$* $| $#$* $#$2 dnl run further checks: check_relay -R$* $: $1 $| $>checkrelay $&{client_name} $| $&{client_addr} +R$* $| $* $: $1 $| $>checkrelay $&{client_name} $| $&{client_addr} R$* $| $#$* $#$2 R$* $| $* $: $1 ', `dnl') ==== //depot/projects/sparc64/contrib/sendmail/cf/m4/version.m4#2 (text+ko) ==== @@ -11,8 +11,8 @@ # the sendmail distribution. # # -VERSIONID(`$Id: version.m4,v 8.81 2002/01/13 18:23:32 ca Exp $') +VERSIONID(`$Id: version.m4,v 8.89 2002/04/04 22:20:08 ca Exp $') # divert(0) # Configuration version number -DZ8.12.2`'ifdef(`confCF_VERSION', `/confCF_VERSION') +DZ8.12.3`'ifdef(`confCF_VERSION', `/confCF_VERSION') ==== //depot/projects/sparc64/contrib/sendmail/cf/ostype/darwin.m4#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 10 14:12:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42A3237B437; Wed, 10 Apr 2002 14:08:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4603237B486 for ; Wed, 10 Apr 2002 14:08:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3AL8im95279 for perforce@freebsd.org; Wed, 10 Apr 2002 14:08:44 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Wed, 10 Apr 2002 14:08:44 -0700 (PDT) Message-Id: <200204102108.g3AL8im95279@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9540 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9540 Change 9540 by jhb@jhb_laptop on 2002/04/10 14:08:41 The lock order of pgrpsess_lock and proctree_lock has become too much of a mess, so bite the bullet and merge the two locks into one proctree_lock. phk reports that an unnamed Unix uses a single lock for all of this as well. Affected files ... ... //depot/projects/smpng/sys/coda/coda_venus.c#3 edit ... //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#14 edit ... //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#12 edit ... //depot/projects/smpng/sys/kern/kern_descrip.c#22 edit ... //depot/projects/smpng/sys/kern/kern_exit.c#32 edit ... //depot/projects/smpng/sys/kern/kern_fork.c#37 edit ... //depot/projects/smpng/sys/kern/kern_ktrace.c#20 edit ... //depot/projects/smpng/sys/kern/kern_proc.c#26 edit ... //depot/projects/smpng/sys/kern/kern_prot.c#58 edit ... //depot/projects/smpng/sys/kern/kern_resource.c#21 edit ... //depot/projects/smpng/sys/kern/kern_sig.c#31 edit ... //depot/projects/smpng/sys/kern/subr_witness.c#43 edit ... //depot/projects/smpng/sys/kern/tty.c#18 edit ... //depot/projects/smpng/sys/kern/tty_pty.c#15 edit ... //depot/projects/smpng/sys/kern/vfs_aio.c#19 edit ... //depot/projects/smpng/sys/kern/vfs_vnops.c#23 edit ... //depot/projects/smpng/sys/sys/proc.h#44 edit Differences ... ==== //depot/projects/smpng/sys/coda/coda_venus.c#3 (text+ko) ==== @@ -95,11 +95,11 @@ #define INIT_IN(in, op, ident, p) \ (in)->opcode = (op); \ - PGRPSESS_SLOCK(); \ + sx_slock(&proctree_lock); \ (in)->pid = p ? p->p_pid : -1; \ (in)->pgid = p ? p->p_pgid : -1; \ (in)->sid = (p && p->p_session && p->p_session->s_leader) ? (p->p_session->s_leader->p_pid) : -1; \ - PGRPSESS_SUNLOCK(); \ + sx_sunlock(&proctree_lock); \ if (ident != NOCRED) { \ (in)->cred.cr_uid = ident->cr_uid; \ (in)->cred.cr_groupid = ident->cr_gid; \ ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#14 (text+ko) ==== @@ -1337,13 +1337,13 @@ * Finally finished with old proc entry. * Unlink it from its process group and free it. */ + sx_xlock(&proctree_lock); leavepgrp(q); sx_xlock(&allproc_lock); LIST_REMOVE(q, p_list); /* off zombproc */ sx_xunlock(&allproc_lock); - sx_xlock(&proctree_lock); LIST_REMOVE(q, p_sibling); sx_xunlock(&proctree_lock); ==== //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#12 (text+ko) ==== @@ -587,7 +587,7 @@ * plus the session), release the reference from the session. */ oldvp = NULL; - PGRPSESS_XLOCK(); + sx_xlock(&proctree_lock); if (vcount(vp) == 2 && td && (vp->v_flag & VXLOCK) == 0 && vp == td->td_proc->p_session->s_ttyvp) { SESS_LOCK(td->td_proc->p_session); @@ -595,7 +595,7 @@ SESS_UNLOCK(td->td_proc->p_session); oldvp = vp; } - PGRPSESS_XUNLOCK(); + sx_xunlock(&proctree_lock); if (oldvp != NULL) vrele(oldvp); /* ==== //depot/projects/smpng/sys/kern/kern_descrip.c#22 (text+ko) ==== @@ -640,7 +640,7 @@ sigio->sio_ucred = crhold(curthread->td_ucred); sigio->sio_myref = sigiop; - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); if (pgid > 0) { proc = pfind(pgid); if (proc == NULL) { @@ -698,14 +698,14 @@ sigio->sio_pgrp = pgrp; PGRP_UNLOCK(pgrp); } - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); s = splhigh(); *sigiop = sigio; splx(s); return (0); fail: - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); crfree(sigio->sio_ucred); FREE(sigio, M_SIGIO); return (ret); ==== //depot/projects/smpng/sys/kern/kern_exit.c#32 (text+ko) ==== @@ -234,7 +234,7 @@ vm->vm_freer = p; } - PGRPSESS_XLOCK(); + sx_xlock(&proctree_lock); if (SESS_LEADER(p)) { register struct session *sp; @@ -254,9 +254,9 @@ PGRP_UNLOCK(sp->s_ttyp->t_pgrp); } /* XXX tp should be locked. */ - PGRPSESS_XUNLOCK(); + sx_xunlock(&proctree_lock); (void) ttywait(tp); - PGRPSESS_XLOCK(); + sx_xlock(&proctree_lock); /* * The tty could have been revoked * if we blocked. @@ -266,10 +266,10 @@ SESS_LOCK(p->p_session); sp->s_ttyvp = NULL; SESS_UNLOCK(p->p_session); - PGRPSESS_XUNLOCK(); + sx_xunlock(&proctree_lock); VOP_REVOKE(ttyvp, REVOKEALL); - PGRPSESS_XLOCK(); vrele(ttyvp); + sx_xlock(&proctree_lock); } } if (sp->s_ttyvp) { @@ -290,7 +290,7 @@ SESS_UNLOCK(p->p_session); } fixjobc(p, p->p_pgrp, 0); - PGRPSESS_XUNLOCK(); + sx_xunlock(&proctree_lock); (void)acct_process(td); #ifdef KTRACE /* ==== //depot/projects/smpng/sys/kern/kern_fork.c#37 (text+ko) ==== @@ -570,7 +570,7 @@ p2->p_limit->p_refcnt++; } - PGRPSESS_XLOCK(); + sx_xlock(&proctree_lock); PGRP_LOCK(p1->p_pgrp); PROC_LOCK(p2); PROC_LOCK(p1); @@ -589,7 +589,6 @@ LIST_INSERT_AFTER(p1, p2, p_pglist); PGRP_UNLOCK(p1->p_pgrp); - PGRPSESS_XUNLOCK(); LIST_INIT(&p2->p_children); LIST_INIT(&td2->td_contested); /* XXXKSE only 1 thread? */ @@ -623,7 +622,6 @@ */ _PHOLD(p1); PROC_UNLOCK(p1); - PROC_UNLOCK(p2); /* * Attach the new process to its parent. @@ -636,12 +634,8 @@ pptr = initproc; else pptr = p1; - sx_xlock(&proctree_lock); - PROC_LOCK(p2); p2->p_pptr = pptr; - PROC_LOCK(pptr); LIST_INSERT_HEAD(&pptr->p_children, p2, p_sibling); - PROC_UNLOCK(pptr); PROC_UNLOCK(p2); sx_xunlock(&proctree_lock); ==== //depot/projects/smpng/sys/kern/kern_ktrace.c#20 (text+ko) ==== @@ -357,16 +357,16 @@ /* * by process group */ - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); pg = pgfind(-uap->pid); if (pg == NULL) { - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); error = ESRCH; goto done; } /* * ktrops() may call vrele(). Lock pg_members - * by the pgrpsess_lock rather than pg_mtx. + * by the proctree_lock rather than pg_mtx. */ PGRP_UNLOCK(pg); LIST_FOREACH(p, &pg->pg_members, p_pglist) @@ -374,7 +374,7 @@ ret |= ktrsetchildren(td, p, ops, facs, vp); else ret |= ktrops(td, p, ops, facs, vp); - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); } else { /* * by pid ==== //depot/projects/smpng/sys/kern/kern_proc.c#26 (text+ko) ==== @@ -80,7 +80,6 @@ struct proclist zombproc; struct sx allproc_lock; struct sx proctree_lock; -struct sx pgrpsess_lock; struct mtx pargs_ref_lock; uma_zone_t proc_zone; uma_zone_t ithread_zone; @@ -96,7 +95,6 @@ sx_init(&allproc_lock, "allproc"); sx_init(&proctree_lock, "proctree"); - sx_init(&pgrpsess_lock, "pgrpsess"); mtx_init(&pargs_ref_lock, "struct pargs.ref", NULL, MTX_DEF); LIST_INIT(&allproc); LIST_INIT(&zombproc); @@ -284,7 +282,7 @@ /* * Locate a process group by number. - * The caller must hold pgrpsess_lock. + * The caller must hold proctree_lock. */ struct pgrp * pgfind(pgid) @@ -292,7 +290,7 @@ { register struct pgrp *pgrp; - PGRPSESS_LOCK_ASSERT(SX_LOCKED); + sx_assert(&proctree_lock, SX_LOCKED); LIST_FOREACH(pgrp, PGRPHASH(pgid), pg_hash) { if (pgrp->pg_id == pgid) { @@ -317,7 +315,7 @@ { struct pgrp *pgrp2; - PGRPSESS_LOCK_ASSERT(SX_XLOCKED); + sx_assert(&proctree_lock, SX_XLOCKED); KASSERT(pgrp != NULL, ("enterpgrp: pgrp == NULL")); KASSERT(p->p_pid == pgid, @@ -362,7 +360,7 @@ LIST_INIT(&pgrp->pg_members); /* - * As we have an exclusive lock of pgrpsess_lock, + * As we have an exclusive lock of proctree_lock, * this should not deadlock. */ LIST_INSERT_HEAD(PGRPHASH(pgid), pgrp, pg_hash); @@ -383,7 +381,8 @@ register struct proc *p; struct pgrp *pgrp; { - PGRPSESS_LOCK_ASSERT(SX_XLOCKED); + + sx_assert(&proctree_lock, SX_XLOCKED); PROC_LOCK_ASSERT(p, MA_NOTOWNED); PGRP_LOCK_ASSERT(pgrp, MA_NOTOWNED); PGRP_LOCK_ASSERT(p->p_pgrp, MA_NOTOWNED); @@ -411,7 +410,7 @@ { struct pgrp *savepgrp; - PGRPSESS_LOCK_ASSERT(SX_XLOCKED); + sx_assert(&proctree_lock, SX_XLOCKED); PROC_LOCK_ASSERT(p, MA_NOTOWNED); PGRP_LOCK_ASSERT(pgrp, MA_NOTOWNED); PGRP_LOCK_ASSERT(p->p_pgrp, MA_NOTOWNED); @@ -449,7 +448,7 @@ { struct pgrp *savepgrp; - PGRPSESS_XLOCK(); + sx_assert(&proctree_lock, SX_XLOCKED); savepgrp = p->p_pgrp; PGRP_LOCK(savepgrp); PROC_LOCK(p); @@ -459,7 +458,6 @@ PGRP_UNLOCK(savepgrp); if (LIST_EMPTY(&savepgrp->pg_members)) pgdelete(savepgrp); - PGRPSESS_XUNLOCK(); return (0); } @@ -472,7 +470,7 @@ { struct session *savesess; - PGRPSESS_LOCK_ASSERT(SX_XLOCKED); + sx_assert(&proctree_lock, SX_XLOCKED); PGRP_LOCK_ASSERT(pgrp, MA_NOTOWNED); SESS_LOCK_ASSERT(pgrp->pg_session, MA_NOTOWNED); @@ -520,7 +518,7 @@ register struct pgrp *hispgrp; register struct session *mysession; - PGRPSESS_LOCK_ASSERT(SX_LOCKED); + sx_assert(&proctree_lock, SX_LOCKED); PROC_LOCK_ASSERT(p, MA_NOTOWNED); PGRP_LOCK_ASSERT(pgrp, MA_NOTOWNED); SESS_LOCK_ASSERT(pgrp->pg_session, MA_NOTOWNED); @@ -530,7 +528,6 @@ * group; if so, adjust count for p's process group. */ mysession = pgrp->pg_session; - sx_slock(&proctree_lock); if ((hispgrp = p->p_pptr->p_pgrp) != pgrp && hispgrp->pg_session == mysession) { PGRP_LOCK(pgrp); @@ -564,7 +561,6 @@ PGRP_UNLOCK(hispgrp); } } - sx_sunlock(&proctree_lock); } /* ==== //depot/projects/smpng/sys/kern/kern_prot.c#58 (text+ko) ==== @@ -349,30 +349,28 @@ MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_WAITOK | M_ZERO); MALLOC(newsess, struct session *, sizeof(struct session), M_SESSION, M_WAITOK | M_ZERO); - PGRPSESS_XLOCK(); + sx_xlock(&proctree_lock); if (p->p_pgid == p->p_pid || (pgrp = pgfind(p->p_pid)) != NULL) { if (pgrp != NULL) PGRP_UNLOCK(pgrp); error = EPERM; - goto fail; } else { (void)enterpgrp(p, p->p_pid, newpgrp, newsess); td->td_retval[0] = p->p_pid; - error = 0; + newpgrp = NULL; + newsess = NULL; } - PGRPSESS_XUNLOCK(); - mtx_unlock(&Giant); - return (0); -fail: - PGRPSESS_XUNLOCK(); + sx_xunlock(&proctree_lock); - FREE(newpgrp, M_PGRP); - FREE(newsess, M_SESSION); + if (newpgrp != NULL) + FREE(newpgrp, M_PGRP); + if (newsess != NULL) + FREE(newsess, M_SESSION); mtx_unlock(&Giant); - return (0); + return (error); } /* @@ -416,45 +414,40 @@ MALLOC(newpgrp, struct pgrp *, sizeof(struct pgrp), M_PGRP, M_WAITOK | M_ZERO); - PGRPSESS_XLOCK(); - + sx_xlock(&proctree_lock); if (uap->pid != 0 && uap->pid != curp->p_pid) { - sx_slock(&proctree_lock); if ((targp = pfind(uap->pid)) == NULL) { if (targp) PROC_UNLOCK(targp); - sx_sunlock(&proctree_lock); error = ESRCH; - goto fail; + goto done; } if (!inferior(targp)) { PROC_UNLOCK(targp); - sx_sunlock(&proctree_lock); error = ESRCH; - goto fail; + goto done; } - sx_sunlock(&proctree_lock); if ((error = p_cansee(curproc, targp))) { PROC_UNLOCK(targp); - goto fail; + goto done; } if (targp->p_pgrp == NULL || targp->p_session != curp->p_session) { PROC_UNLOCK(targp); error = EPERM; - goto fail; + goto done; } if (targp->p_flag & P_EXEC) { PROC_UNLOCK(targp); error = EACCES; - goto fail; + goto done; } PROC_UNLOCK(targp); } else targp = curp; if (SESS_LEADER(targp)) { error = EPERM; - goto fail; + goto done; } if (uap->pgid == 0) uap->pgid = targp->p_pid; @@ -470,7 +463,7 @@ if (pgrp != NULL) PGRP_UNLOCK(pgrp); error = EPERM; - goto fail; + goto done; } if (pgrp == targp->p_pgrp) { PGRP_UNLOCK(pgrp); @@ -480,20 +473,12 @@ error = enterthispgrp(targp, pgrp); } done: - PGRPSESS_XUNLOCK(); + sx_xunlock(&proctree_lock); + KASSERT((error == 0) || (newpgrp != NULL), + ("setpgid failed and newpgrp is NULL")); if (newpgrp != NULL) FREE(newpgrp, M_PGRP); mtx_unlock(&Giant); - return (0); - -fail: - PGRPSESS_XUNLOCK(); - - KASSERT(newpgrp != NULL, ("setpgid failed and newpgrp is null.")); - KASSERT(error != 0, ("setpgid successfully failed?")); - FREE(newpgrp, M_PGRP); - - mtx_unlock(&Giant); return (error); } ==== //depot/projects/smpng/sys/kern/kern_resource.c#21 (text+ko) ==== @@ -110,18 +110,18 @@ case PRIO_PGRP: { register struct pgrp *pg; - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); if (uap->who == 0) { pg = td->td_proc->p_pgrp; PGRP_LOCK(pg); } else { pg = pgfind(uap->who); if (pg == NULL) { - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); break; } } - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); LIST_FOREACH(p, &pg->pg_members, p_pglist) { PROC_LOCK(p); if (!p_cansee(td->td_proc, p) && p->p_ksegrp.kg_nice /* XXXKSE */ < low) @@ -200,18 +200,18 @@ case PRIO_PGRP: { register struct pgrp *pg; - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); if (uap->who == 0) { pg = curp->p_pgrp; PGRP_LOCK(pg); } else { pg = pgfind(uap->who); if (pg == NULL) { - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); break; } } - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); LIST_FOREACH(p, &pg->pg_members, p_pglist) { PROC_LOCK(p); if (!p_cansee(td->td_proc, p)) { ==== //depot/projects/smpng/sys/kern/kern_sig.c#31 (text+ko) ==== @@ -1018,7 +1018,7 @@ } sx_sunlock(&allproc_lock); } else { - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); if (pgid == 0) { /* * zero pgid means send to my process group. @@ -1028,11 +1028,11 @@ } else { pgrp = pgfind(pgid); if (pgrp == NULL) { - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); return (ESRCH); } } - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); LIST_FOREACH(p, &pgrp->pg_members, p_pglist) { PROC_LOCK(p); if (p->p_pid <= 1 || p->p_flag & P_SYSTEM) { @@ -1144,9 +1144,9 @@ struct pgrp *pgrp; if (pgid != 0) { - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); pgrp = pgfind(pgid); - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); if (pgrp != NULL) { pgsignal(pgrp, sig, 0); PGRP_UNLOCK(pgrp); ==== //depot/projects/smpng/sys/kern/subr_witness.c#43 (text+ko) ==== @@ -187,7 +187,6 @@ static struct witness_order_list_entry order_lists[] = { { "Giant", &lock_class_mtx_sleep }, - { "pgrpsess", &lock_class_sx }, { "proctree", &lock_class_sx }, { "allproc", &lock_class_sx }, { "process group", &lock_class_mtx_sleep }, ==== //depot/projects/smpng/sys/kern/tty.c#18 (text+ko) ==== @@ -731,6 +731,7 @@ { register struct proc *p; struct thread *td; + struct pgrp *pgrp; int s, error; td = curthread; /* XXX */ @@ -770,30 +771,30 @@ case TIOCSETP: case TIOCSLTC: #endif - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); PROC_LOCK(p); while (isbackground(p, tp) && !(p->p_flag & P_PPWAIT) && !SIGISMEMBER(p->p_sigignore, SIGTTOU) && !SIGISMEMBER(p->p_sigmask, SIGTTOU)) { - if (p->p_pgrp->pg_jobc == 0) { - PROC_UNLOCK(p); - PGRPSESS_SUNLOCK(); + pgrp = p->p_pgrp; + PROC_UNLOCK(p); + if (pgrp->pg_jobc == 0) { + sx_sunlock(&proctree_lock); return (EIO); } - PROC_UNLOCK(p); - PGRP_LOCK(p->p_pgrp); - PGRPSESS_SUNLOCK(); - pgsignal(p->p_pgrp, SIGTTOU, 1); - PGRP_UNLOCK(p->p_pgrp); + PGRP_LOCK(pgrp); + sx_sunlock(&proctree_lock); + pgsignal(pgrp, SIGTTOU, 1); + PGRP_UNLOCK(pgrp); error = ttysleep(tp, &lbolt, TTOPRI | PCATCH, "ttybg1", 0); if (error) return (error); - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); PROC_LOCK(p); } PROC_UNLOCK(p); - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); break; } @@ -1053,11 +1054,11 @@ break; case TIOCSCTTY: /* become controlling tty */ /* Session ctty vnode pointer set in vnode layer. */ - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); if (!SESS_LEADER(p) || ((p->p_session->s_ttyvp || tp->t_session) && (tp->t_session != p->p_session))) { - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); return (EPERM); } tp->t_session = p->p_session; @@ -1068,29 +1069,27 @@ PROC_LOCK(p); p->p_flag |= P_CONTROLT; PROC_UNLOCK(p); - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); break; case TIOCSPGRP: { /* set pgrp of tty */ - register struct pgrp *pgrp; - - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); pgrp = pgfind(*(int *)data); if (!isctty(p, tp)) { if (pgrp != NULL) PGRP_UNLOCK(pgrp); - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); return (ENOTTY); } if (pgrp == NULL) { - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); return (EPERM); } PGRP_UNLOCK(pgrp); if (pgrp->pg_session != p->p_session) { - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); return (EPERM); } - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); tp->t_pgrp = pgrp; break; } @@ -1527,7 +1526,7 @@ SET(tp->t_state, TS_ZOMBIE); CLR(tp->t_state, TS_CONNECTED); if (tp->t_session) { - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); if (tp->t_session->s_leader) { struct proc *p; @@ -1536,7 +1535,7 @@ psignal(p, SIGHUP); PROC_UNLOCK(p); } - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); } ttyflush(tp, FREAD | FWRITE); return (0); @@ -1601,6 +1600,7 @@ int has_stime = 0, last_cc = 0; long slp = 0; /* XXX this should be renamed `timo'. */ struct timeval stime; + struct pgrp *pg; loop: s = spltty(); @@ -1620,20 +1620,21 @@ */ if (isbackground(p, tp)) { splx(s); - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); PROC_LOCK(p); if (SIGISMEMBER(p->p_sigignore, SIGTTIN) || SIGISMEMBER(p->p_sigmask, SIGTTIN) || (p->p_flag & P_PPWAIT) || p->p_pgrp->pg_jobc == 0) { PROC_UNLOCK(p); - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); return (EIO); } + pg = p->p_pgrp; PROC_UNLOCK(p); - PGRP_LOCK(p->p_pgrp); - PGRPSESS_SUNLOCK(); - pgsignal(p->p_pgrp, SIGTTIN, 1); - PGRP_UNLOCK(p->p_pgrp); + PGRP_LOCK(pg); + sx_sunlock(&proctree_lock); + pgsignal(pg, SIGTTIN, 1); + PGRP_UNLOCK(pg); error = ttysleep(tp, &lbolt, TTIPRI | PCATCH, "ttybg2", 0); if (error) return (error); @@ -1939,7 +1940,7 @@ * Hang the process if it's in the background. */ p = curproc; - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); PROC_LOCK(p); if (isbackground(p, tp) && ISSET(tp->t_lflag, TOSTOP) && !(p->p_flag & P_PPWAIT) && @@ -1947,13 +1948,13 @@ !SIGISMEMBER(p->p_sigmask, SIGTTOU)) { if (p->p_pgrp->pg_jobc == 0) { PROC_UNLOCK(p); - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); error = EIO; goto out; } PROC_UNLOCK(p); PGRP_LOCK(p->p_pgrp); - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); pgsignal(p->p_pgrp, SIGTTOU, 1); PGRP_UNLOCK(p->p_pgrp); error = ttysleep(tp, &lbolt, TTIPRI | PCATCH, "ttybg4", 0); @@ -1962,7 +1963,7 @@ goto loop; } else { PROC_UNLOCK(p); - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); } /* * Process the user's data in at most OBUFSIZ chunks. Perform any ==== //depot/projects/smpng/sys/kern/tty_pty.c#15 (text+ko) ==== @@ -234,25 +234,27 @@ struct proc *p = td->td_proc; register struct tty *tp = dev->si_tty; register struct pt_ioctl *pti = dev->si_drv1; + struct pgrp *pg; int error = 0; again: if (pti->pt_flags & PF_REMOTE) { while (isbackground(p, tp)) { - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); PROC_LOCK(p); if (SIGISMEMBER(p->p_sigignore, SIGTTIN) || SIGISMEMBER(p->p_sigmask, SIGTTIN) || p->p_pgrp->pg_jobc == 0 || p->p_flag & P_PPWAIT) { PROC_UNLOCK(p); - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); return (EIO); } + pg = p->p_pgrp; PROC_UNLOCK(p); - PGRP_LOCK(p->p_pgrp); - PGRPSESS_SUNLOCK(); - pgsignal(p->p_pgrp, SIGTTIN, 1); - PGRP_UNLOCK(p->p_pgrp); + PGRP_LOCK(pg); + sx_sunlock(&proctree_lock); + pgsignal(pg, SIGTTIN, 1); + PGRP_UNLOCK(pg); error = ttysleep(tp, &lbolt, TTIPRI | PCATCH, "ptsbg", 0); if (error) ==== //depot/projects/smpng/sys/kern/vfs_aio.c#19 (text+ko) ==== @@ -818,9 +818,9 @@ MALLOC(newsess, struct session *, sizeof(struct session), M_SESSION, M_WAITOK | M_ZERO); - PGRPSESS_XLOCK(); + sx_xlock(&proctree_lock); enterpgrp(mycp, mycp->p_pid, newpgrp, newsess); - PGRPSESS_XUNLOCK(); + sx_xunlock(&proctree_lock); /* Mark special process type. */ mycp->p_flag |= P_SYSTEM; ==== //depot/projects/smpng/sys/kern/vfs_vnops.c#23 (text+ko) ==== @@ -701,9 +701,9 @@ if (error == 0 && com == TIOCSCTTY) { /* Do nothing if reassigning same control tty */ - PGRPSESS_SLOCK(); + sx_slock(&proctree_lock); if (td->td_proc->p_session->s_ttyvp == vp) { - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); return (0); } @@ -713,7 +713,7 @@ td->td_proc->p_session->s_ttyvp = vp; SESS_UNLOCK(td->td_proc->p_session); - PGRPSESS_SUNLOCK(); + sx_sunlock(&proctree_lock); /* Get rid of reference to old control tty */ if (vpold) ==== //depot/projects/smpng/sys/sys/proc.h#44 (text+ko) ==== @@ -64,12 +64,12 @@ * * List of locks * (m) locked by s_mtx mtx - * (ps) locked by pgrpsess_lock sx + * (e) locked by proctree_lock sx * (c) const until freeing */ struct session { int s_count; /* (m) Ref cnt; pgrps in session. */ - struct proc *s_leader; /* (m, ps) Session leader. */ + struct proc *s_leader; /* (m + e) Session leader. */ struct vnode *s_ttyvp; /* (m) Vnode of controlling terminal. */ struct tty *s_ttyp; /* (m) Controlling terminal. */ pid_t s_sid; /* (c) Session ID. */ @@ -83,12 +83,12 @@ * * List of locks * (m) locked by pg_mtx mtx - * (ps) locked by pgrpsess_lock sx + * (e) locked by proctree_lock sx * (c) const until freeing */ struct pgrp { - LIST_ENTRY(pgrp) pg_hash; /* (ps) Hash chain. */ - LIST_HEAD(, proc) pg_members; /* (m, ps) Pointer to pgrp members. */ + LIST_ENTRY(pgrp) pg_hash; /* (e) Hash chain. */ + LIST_HEAD(, proc) pg_members; /* (m + e) Pointer to pgrp members. */ struct session *pg_session; /* (c) Pointer to session. */ struct sigiolst pg_sigiolst; /* (m) List of sigio sources. */ pid_t pg_id; /* (c) Pgrp id. */ @@ -147,7 +147,6 @@ * l - the attaching proc or attaching proc parent * m - Giant * n - not locked, lazy - * o - locked by pgrpsess_lock sx * p - select lock (sellock) * * If the locking key specifies two identifiers (for example, p_pptr) then @@ -399,7 +398,7 @@ pid_t p_pid; /* (b) Process identifier. */ LIST_ENTRY(proc) p_hash; /* (d) Hash chain. */ - LIST_ENTRY(proc) p_pglist; /* (g + o) List of processes in pgrp. */ + LIST_ENTRY(proc) p_pglist; /* (g + e) List of processes in pgrp. */ struct proc *p_pptr; /* (c + e) Pointer to parent process. */ LIST_ENTRY(proc) p_sibling; /* (e) List of sibling processes. */ LIST_HEAD(, proc) p_children; /* (e) Pointer to list of children. */ @@ -438,7 +437,7 @@ stack_t p_sigstk; /* (c) Stack ptr and on-stack flag. */ int p_magic; /* (b) Magic number. */ char p_comm[MAXCOMLEN + 1]; /* (b) Process name. */ - struct pgrp *p_pgrp; /* (c + o) Pointer to process group. */ + struct pgrp *p_pgrp; /* (c + e) Pointer to process group. */ struct sysentvec *p_sysent; /* (b) Syscall dispatch info. */ struct pargs *p_args; /* (c) Process arguments. */ /* End area that is copied on creation. */ @@ -603,12 +602,6 @@ #define PROC_LOCKED(p) mtx_owned(&(p)->p_mtx) #define PROC_LOCK_ASSERT(p, type) mtx_assert(&(p)->p_mtx, (type)) -#define PGRPSESS_SLOCK() sx_slock(&pgrpsess_lock) -#define PGRPSESS_XLOCK() sx_xlock(&pgrpsess_lock) -#define PGRPSESS_SUNLOCK() sx_sunlock(&pgrpsess_lock) -#define PGRPSESS_XUNLOCK() sx_xunlock(&pgrpsess_lock) -#define PGRPSESS_LOCK_ASSERT(type) sx_assert(&pgrpsess_lock, (type)) - /* Lock and unlock a process group. */ #define PGRP_LOCK(pg) mtx_lock(&(pg)->pg_mtx) #define PGRP_UNLOCK(pg) mtx_unlock(&(pg)->pg_mtx) @@ -673,7 +666,6 @@ extern struct sx allproc_lock; extern struct sx proctree_lock; -extern struct sx pgrpsess_lock; extern struct mtx pargs_ref_lock; extern struct proc proc0; /* Process slot for swapper. */ extern struct thread thread0; /* Primary thread in proc0 */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 11 3: 9:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5775037B41A; Thu, 11 Apr 2002 03:07:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3F02337B423 for ; Thu, 11 Apr 2002 03:07:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3BA7aX74412 for perforce@freebsd.org; Thu, 11 Apr 2002 03:07:36 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 11 Apr 2002 03:07:36 -0700 (PDT) Message-Id: <200204111007.g3BA7aX74412@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9564 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9564 Change 9564 by peter@peter_daintree on 2002/04/11 03:07:06 IFC @9563 - hopefully I got everthing needed for the loader. Affected files ... ... //depot/projects/ia64/UPDATING#8 integrate ... //depot/projects/ia64/etc/defaults/rc.conf#9 integrate ... //depot/projects/ia64/etc/rc.network#13 integrate ... //depot/projects/ia64/lib/libc/stdio/scanf.3#3 integrate ... //depot/projects/ia64/lib/libpam/libpam/Makefile#8 integrate ... //depot/projects/ia64/lib/libpam/modules/Makefile.inc#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_deny/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ftp/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_kerberosIV/Makefile#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_krb5/Makefile#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_lastlog/Makefile#2 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_login_access/Makefile#2 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_nologin/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_opie/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_opieaccess/Makefile#2 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_passwdqc/Makefile#2 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_permit/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_radius/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_rootok/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_securetty/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_self/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ssh/Makefile#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_tacplus/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_unix/Makefile#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_wheel/Makefile#3 integrate ... //depot/projects/ia64/share/man/man4/tcp.4#3 integrate ... //depot/projects/ia64/share/mk/bsd.obj.mk#3 integrate ... //depot/projects/ia64/share/mk/bsd.prog.mk#5 integrate ... //depot/projects/ia64/sys/boot/common/module.c#3 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/efifs.c#4 integrate ... //depot/projects/ia64/sys/boot/i386/boot2/boot2.c#5 integrate ... //depot/projects/ia64/sys/conf/files.ia64#4 integrate ... //depot/projects/ia64/sys/conf/options.ia64#2 integrate ... //depot/projects/ia64/sys/dev/ata/ata-raid.h#6 integrate ... //depot/projects/ia64/sys/dev/ciss/ciss.c#4 integrate ... //depot/projects/ia64/sys/dev/wi/if_wavelan_ieee.h#5 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi.c#13 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#3 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#2 integrate ... //depot/projects/ia64/sys/dev/wi/if_wireg.h#8 integrate ... //depot/projects/ia64/sys/dev/wi/if_wivar.h#3 integrate ... //depot/projects/ia64/sys/dev/wi/wi_hostap.c#1 branch ... //depot/projects/ia64/sys/dev/wi/wi_hostap.h#1 branch ... //depot/projects/ia64/sys/i386/i386/machdep.c#15 integrate ... //depot/projects/ia64/sys/i386/include/cpufunc.h#7 integrate ... //depot/projects/ia64/sys/ia64/ia32/Makefile#1 branch ... //depot/projects/ia64/sys/ia64/ia32/ia32_proto.h#1 branch ... //depot/projects/ia64/sys/ia64/ia32/ia32_syscall.h#1 branch ... //depot/projects/ia64/sys/ia64/ia32/ia32_sysent.c#1 branch ... //depot/projects/ia64/sys/ia64/ia32/imgact_ia32.c#1 branch ... //depot/projects/ia64/sys/ia64/ia32/imgact_ia32.h#1 branch ... //depot/projects/ia64/sys/ia64/ia32/syscalls.conf#1 branch ... //depot/projects/ia64/sys/ia64/ia32/syscalls.master#1 branch ... //depot/projects/ia64/sys/ia64/ia64/support.s#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/swtch.s#6 integrate ... //depot/projects/ia64/sys/ia64/ia64/trap.c#20 integrate ... //depot/projects/ia64/sys/ia64/include/ia64_cpu.h#4 integrate ... //depot/projects/ia64/sys/ia64/include/pcb.h#3 integrate ... //depot/projects/ia64/sys/ia64/include/signal.h#2 integrate ... //depot/projects/ia64/sys/libkern/bsearch.c#3 integrate ... //depot/projects/ia64/sys/net/if_ef.c#3 integrate ... //depot/projects/ia64/sys/net/if_ieee80211.h#2 integrate ... //depot/projects/ia64/sys/netinet/in.h#9 integrate ... //depot/projects/ia64/sys/netinet/ip_ecn.c#2 integrate ... //depot/projects/ia64/sys/netinet/tcp_input.c#8 integrate ... //depot/projects/ia64/sys/netinet/tcp_subr.c#9 integrate ... //depot/projects/ia64/sys/pc98/i386/machdep.c#13 integrate ... //depot/projects/ia64/sys/pci/if_rl.c#8 integrate ... //depot/projects/ia64/sys/pci/if_rlreg.h#3 integrate ... //depot/projects/ia64/usr.sbin/cron/lib/misc.c#2 integrate ... //depot/projects/ia64/usr.sbin/kldxref/ef.c#4 integrate ... //depot/projects/ia64/usr.sbin/kldxref/ef.h#2 integrate ... //depot/projects/ia64/usr.sbin/rpc.lockd/lockd.c#5 integrate Differences ... ==== //depot/projects/ia64/UPDATING#8 (text+ko) ==== @@ -1,9 +1,8 @@ Updating Information for FreeBSD current users This file is maintained and copyrighted by M. Warner Losh -. Please send new entries directly to him. See end -of file for further details. For commonly done items, please see the -COMMON ITEMS: section later in the file. +. See end of file for further details. For commonly +done items, please see the COMMON ITEMS: section later in the file. NOTE TO PEOPLE WHO THINK THAT 5.0-CURRENT IS SLOW: FreeBSD 5.0-CURRENT has many debugging features turned on, in @@ -802,6 +801,11 @@ of the config file has changed as well. Please see GENERIC or NEWCARD for examples of the new format. + Indirectly, this also breaks USERCONFIG. Unless a newer entry + says that it has been fixed, assume that must use the hints mechanism + in the loader if you need to use a machine with very old ISA cards + in it. + 20000522: A new set of binutils went into the tree today. Anybody building a kernel after this point is advised that they need @@ -973,16 +977,13 @@ and it only starts on March 15, 2000. Updating files can found in previous releases if your system is older than this. -Please filter your entries through Warner Losh (imp@village.org) so -that the style, formatting, etc of this file can be maintained. - Copyright information: -Copyright 1998, 2001 M. Warner Losh. All Rights Reserved. +Copyright 1998, 2002 M. Warner Losh. All Rights Reserved. Redistribution, publication, translation and use, with or without modification, in full or in part, in any form or format of this -document are permitted. +document are permitted without further permission from the author. THIS DOCUMENT IS PROVIDED BY WARNER LOSH ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -1002,4 +1003,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.197 2002/04/05 07:42:42 gshapiro Exp $ +$FreeBSD: src/UPDATING,v 1.199 2002/04/11 05:45:17 imp Exp $ ==== //depot/projects/ia64/etc/defaults/rc.conf#9 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.144 2002/04/06 18:02:52 asmodai Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.146 2002/04/11 08:48:52 peter Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -31,7 +31,7 @@ pccard_conf="/etc/defaults/pccard.conf" # pccardd(8) config file pccard_ether_delay="5" # Delay before trying to start dhclient in pccard_ether removable_interfaces="" # Removable network interfaces for /etc/pccard_ether. -local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. +local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. script_name_sep=" " # Change if your startup scripts' names contain spaces rc_conf_files="/etc/rc.conf /etc/rc.conf.local" fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. ==== //depot/projects/ia64/etc/rc.network#13 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.network,v 1.132 2002/04/01 18:33:45 dougb Exp $ +# $FreeBSD: src/etc/rc.network,v 1.133 2002/04/10 22:30:54 peter Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -853,15 +853,20 @@ [Yy][Ee][Ss]) if [ -x /usr/bin/ssh-keygen ]; then if [ ! -f /etc/ssh/ssh_host_key ]; then - echo ' creating ssh RSA host key'; - /usr/bin/ssh-keygen -trsa1 -N "" \ + echo ' creating ssh protocol v1 RSA host key'; + /usr/bin/ssh-keygen -t rsa1 -N "" \ -f /etc/ssh/ssh_host_key fi if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then - echo ' creating ssh DSA host key'; - /usr/bin/ssh-keygen -tdsa -N "" \ + echo ' creating ssh protocol v2 DSA host key'; + /usr/bin/ssh-keygen -t dsa -N "" \ -f /etc/ssh/ssh_host_dsa_key fi + if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then + echo ' creating ssh protocol v2 RSA host key'; + /usr/bin/ssh-keygen -t rsa -N "" \ + -f /etc/ssh/ssh_host_rsa_key + fi fi ;; esac ==== //depot/projects/ia64/lib/libc/stdio/scanf.3#3 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)scanf.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/stdio/scanf.3,v 1.14 2002/03/10 09:20:28 dd Exp $ +.\" $FreeBSD: src/lib/libc/stdio/scanf.3,v 1.15 2002/04/10 20:52:49 trhodes Exp $ .\" .Dd December 11, 1993 .Dt SCANF 3 @@ -422,13 +422,6 @@ .Fn sscanf conform to .St -isoC . -.Sh HISTORY -The functions -.Fn vscanf , -.Fn vsscanf -and -.Fn vfscanf -are new to this release. .Sh BUGS The current situation with .Cm %F ==== //depot/projects/ia64/lib/libpam/libpam/Makefile#8 (text+ko) ==== @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.31 2002/04/08 12:34:53 des Exp $ +# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.32 2002/04/10 17:46:59 ru Exp $ # OPENPAM = ${.CURDIR}/../../../contrib/openpam @@ -141,19 +141,19 @@ STATICOBJS += openpam_static_modules.o CLEANFILES += openpam_static.o -_EXTRADEPEND: openpam_static.c +# We want to add to _EXTRADEPEND actions, not to override them. +_EXTRADEPEND: _EXTRADEPEND_openpam_static.c +_EXTRADEPEND_openpam_static.c: openpam_static.c ${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \ ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*} \ ${.ALLSRC} -.if ${OBJFORMAT} == elf -CLEANFILES+= setdef0.o openpam_static_modules.o setdef1.o \ - setdef0.c setdef1.c setdefs.h +CLEANFILES+= openpam_static_modules.o openpam_static_modules.o: openpam_static.o ${STATIC_MODULES} +.if ${OBJFORMAT} == elf ${LD} -o ${.TARGET} -r --whole-archive ${.ALLSRC} .else -openpam_static_modules.o: openpam_static.o ${STATIC_MODULES} ${LD} -o ${.TARGET} -r -Bforcearchive ${.ALLSRC} .endif ==== //depot/projects/ia64/lib/libpam/modules/Makefile.inc#4 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/lib/libpam/modules/Makefile.inc,v 1.10 2002/04/06 19:32:37 des Exp $ +# $FreeBSD: src/lib/libpam/modules/Makefile.inc,v 1.11 2002/04/10 18:06:58 ru Exp $ PAMDIR= ${.CURDIR}/../../../../contrib/openpam INTERNALLIB= yes INTERNALSTATICLIB=yes +SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} CFLAGS+= -I${PAMDIR}/include CFLAGS+= -I${.CURDIR}/../../libpam ==== //depot/projects/ia64/lib/libpam/modules/pam_deny/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_deny/Makefile,v 1.5 2002/03/05 21:56:08 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_deny/Makefile,v 1.6 2002/04/10 18:07:00 ru Exp $ LIB= pam_deny -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_deny.c MAN= pam_deny.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_ftp/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_ftp/Makefile,v 1.3 2002/03/05 21:56:08 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_ftp/Makefile,v 1.4 2002/04/10 18:07:00 ru Exp $ LIB= pam_ftp -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_ftp.c MAN= pam_ftp.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_kerberosIV/Makefile#4 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_kerberosIV/Makefile,v 1.10 2002/04/07 12:53:58 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_kerberosIV/Makefile,v 1.11 2002/04/10 18:07:00 ru Exp $ LIB= pam_kerberosIV -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_kerberosIV.c klogin.c NO_WERROR= yes CFLAGS+= -DKERBEROS ==== //depot/projects/ia64/lib/libpam/modules/pam_krb5/Makefile#4 (text+ko) ==== @@ -22,16 +22,15 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_krb5/Makefile,v 1.7 2002/04/07 04:44:16 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_krb5/Makefile,v 1.9 2002/04/10 18:07:01 ru Exp $ LIB= pam_krb5 -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_krb5.c NO_WERROR= yes DPADD= ${LIBKRB5} ${LIBGSSAPI} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} \ ${LIBCOM_ERR} ${LIBROKEN} LDADD= -lkrb5 -lgssapi -lasn1 -lcrypto -lcrypt -lcom_err \ - -L${.OBJDIR}/../../../../kerberos5/lib/libroken -lroken + -lroken MAN= pam_krb5.8 .include ==== //depot/projects/ia64/lib/libpam/modules/pam_lastlog/Makefile#2 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_lastlog/Makefile,v 1.3 2002/03/05 21:56:14 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_lastlog/Makefile,v 1.4 2002/04/10 18:07:01 ru Exp $ LIB= pam_lastlog -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_lastlog.c DPADD= ${LIBUTIL} LDADD= -lutil ==== //depot/projects/ia64/lib/libpam/modules/pam_login_access/Makefile#2 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_login_access/Makefile,v 1.3 2002/03/05 21:56:14 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_login_access/Makefile,v 1.4 2002/04/10 18:07:01 ru Exp $ LIB= pam_login_access -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_login_access.c login_access.c MAN= pam_login_access.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_nologin/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_nologin/Makefile,v 1.5 2002/03/05 21:56:14 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_nologin/Makefile,v 1.6 2002/04/10 18:07:02 ru Exp $ LIB= pam_nologin -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_nologin.c DPADD= ${LIBUTIL} LDADD= -lutil ==== //depot/projects/ia64/lib/libpam/modules/pam_opie/Makefile#3 (text+ko) ==== @@ -23,10 +23,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_opie/Makefile,v 1.7 2002/03/05 21:56:21 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_opie/Makefile,v 1.8 2002/04/10 18:07:02 ru Exp $ LIB= pam_opie -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_opie.c DPADD= ${LIBOPIE} LDADD= -lopie ==== //depot/projects/ia64/lib/libpam/modules/pam_opieaccess/Makefile#2 (text+ko) ==== @@ -1,7 +1,6 @@ -# $FreeBSD: src/lib/libpam/modules/pam_opieaccess/Makefile,v 1.2 2002/03/05 21:56:22 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_opieaccess/Makefile,v 1.3 2002/04/10 18:07:02 ru Exp $ LIB= pam_opieaccess -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= ${LIB}.c DPADD= ${LIBOPIE} LDADD= -lopie ==== //depot/projects/ia64/lib/libpam/modules/pam_passwdqc/Makefile#2 (text+ko) ==== @@ -1,9 +1,8 @@ -# $FreeBSD: src/lib/libpam/modules/pam_passwdqc/Makefile,v 1.1 2002/04/04 16:08:28 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_passwdqc/Makefile,v 1.2 2002/04/10 18:07:02 ru Exp $ SRCDIR= ${.CURDIR}/../../../../contrib/pam_modules/pam_passwdqc LIB= pam_passwdqc -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_passwdqc.c passwdqc_check.c passwdqc_random.c wordset_4k.c CFLAGS+= -I${SRCDIR} -DPAM_AUTHTOK_RECOVER_ERR=PAM_AUTHTOK_RECOVERY_ERR MAN= #pam_passwdqc.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_permit/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_permit/Makefile,v 1.5 2002/03/05 21:56:22 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_permit/Makefile,v 1.6 2002/04/10 18:07:03 ru Exp $ LIB= pam_permit -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_permit.c MAN= pam_permit.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_radius/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_radius/Makefile,v 1.10 2002/03/05 21:56:22 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_radius/Makefile,v 1.11 2002/04/10 18:07:03 ru Exp $ LIB= pam_radius -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_radius.c DPADD= ${LIBRADIUS} LDADD= -lradius ==== //depot/projects/ia64/lib/libpam/modules/pam_rootok/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_rootok/Makefile,v 1.4 2002/03/05 21:56:23 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_rootok/Makefile,v 1.5 2002/04/10 18:07:03 ru Exp $ LIB= pam_rootok -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_rootok.c MAN= pam_rootok.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_securetty/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_securetty/Makefile,v 1.3 2002/03/05 21:56:23 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_securetty/Makefile,v 1.4 2002/04/10 18:07:04 ru Exp $ LIB= pam_securetty -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_securetty.c MAN= pam_securetty.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_self/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_self/Makefile,v 1.2 2002/03/05 21:56:24 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_self/Makefile,v 1.3 2002/04/10 18:07:04 ru Exp $ LIB= pam_self -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_self.c MAN= pam_self.8 ==== //depot/projects/ia64/lib/libpam/modules/pam_ssh/Makefile#4 (text+ko) ==== @@ -1,10 +1,9 @@ # PAM module for SSH -# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.12 2002/03/05 21:56:24 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.13 2002/04/10 18:07:04 ru Exp $ SSHSRC= ${.CURDIR}/../../../../crypto/openssh LIB= pam_ssh -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_ssh.c CFLAGS+= -I${SSHSRC} DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} ${LIBUTIL} ==== //depot/projects/ia64/lib/libpam/modules/pam_tacplus/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_tacplus/Makefile,v 1.6 2002/03/05 21:56:24 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_tacplus/Makefile,v 1.7 2002/04/10 18:07:05 ru Exp $ LIB= pam_tacplus -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_tacplus.c DPADD= ${LIBTACPLUS} LDADD= -ltacplus ==== //depot/projects/ia64/lib/libpam/modules/pam_unix/Makefile#4 (text+ko) ==== @@ -22,13 +22,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_unix/Makefile,v 1.13 2002/03/18 12:55:10 cjc Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_unix/Makefile,v 1.15 2002/04/10 18:07:05 ru Exp $ LIB= pam_unix -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_unix.c pw_copy.c pw_yp.c pw_util.c ypxfr_misc.c ${GENSRCS} CFLAGS+= -DYP -Dyp_error=warnx \ - -I${.OBJDIR} \ + -I. \ -I${.CURDIR}/../../../../libexec/ypxfr \ -I${.CURDIR}/../../../../usr.sbin/vipw \ -I${.CURDIR}/../../../../usr.bin/chpass \ ==== //depot/projects/ia64/lib/libpam/modules/pam_wheel/Makefile#3 (text+ko) ==== @@ -22,10 +22,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/modules/pam_wheel/Makefile,v 1.4 2002/03/05 21:56:25 des Exp $ +# $FreeBSD: src/lib/libpam/modules/pam_wheel/Makefile,v 1.5 2002/04/10 18:07:05 ru Exp $ LIB= pam_wheel -SHLIB_NAME= ${LIB}.so.${SHLIB_MAJOR} SRCS= pam_wheel.c MAN= pam_wheel.8 ==== //depot/projects/ia64/share/man/man4/tcp.4#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.23 2002/01/21 12:09:13 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/tcp.4,v 1.24 2002/04/10 19:52:21 silby Exp $ .\" .Dd February 14, 1995 .Dt TCP 4 @@ -255,13 +255,6 @@ Flush packets in the .Tn TCP reassembly queue if the system is low on mbufs. -.\" -.\" This option should go away and become the default. -.\" -.It tcp.tcp_lq_overflow -If a connection is dropped due to a listen queue overflow, delete the -cloned route associated with the connection if it does not have any -prior information. .It tcp.blackhole If enabled, disable sending of RST when a connection is attempted to a port where there is not a socket accepting connections. @@ -290,12 +283,10 @@ .It tcp.pcbcount Number of active process control blocks (read-only). -.It tcp.strict_rfc1948 -Enable strict RFC 1948 (Defending Against Sequence Number Attacks) -compliance. -Setting this variable to a non-zero value will disable reseeding and -will disable the use of randomized initial sequence numbers in favor -of MD5-generated initial sequence numbers. +.It tcp.syncookies +Determines whether or not syn cookies should be generated for +outbound syn-ack packets. Syn cookies are a great help during +syn flood attacks, and are enabled by default. .It tcp.isn_reseed_interval The interval (in seconds) specifying how often the secret data used in RFC 1948 initial sequence number calculations should be reseeded. ==== //depot/projects/ia64/share/mk/bsd.obj.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.38 2002/02/06 18:08:31 ru Exp $ +# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.39 2002/04/11 08:54:21 ru Exp $ # # The include file handles creating the 'obj' directory # and cleaning up object files, etc. @@ -144,7 +144,7 @@ echo "LDADD -> $$ldadd1" ; \ fi .else - @dpadd=`echo \`ld -Bstatic -f ${LDDESTDIR} ${LDADD}\`` ; \ + @dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \ if [ "$$dpadd" != "${DPADD}" ] ; then \ echo ${.CURDIR} ; \ echo "LDADD -> $$dpadd" ; \ ==== //depot/projects/ia64/share/mk/bsd.prog.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.105 2002/04/07 14:58:12 ru Exp $ +# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.106 2002/04/11 08:54:21 ru Exp $ .if !target(__initialized__) __initialized__: @@ -32,7 +32,7 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ${PROG}: ${OBJS} - ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDDESTDIR} ${LDADD} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} .else !defined(SRCS) @@ -47,7 +47,7 @@ OBJS= ${PROG}.o ${PROG}: ${OBJS} - ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDDESTDIR} ${LDADD} + ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} .endif .endif @@ -74,7 +74,7 @@ .if defined(PROG) _EXTRADEPEND: .if ${OBJFORMAT} == aout - echo ${PROG}: `${CC} -Wl,-f ${CFLAGS} ${LDFLAGS} ${LDDESTDIR} \ + echo ${PROG}: `${CC} -Wl,-f ${CFLAGS} ${LDFLAGS} \ ${LDADD:S/^/-Wl,/}` >> ${DEPENDFILE} .else echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE} ==== //depot/projects/ia64/sys/boot/common/module.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/module.c,v 1.22 2001/11/16 21:08:40 iedowse Exp $ + * $FreeBSD: src/sys/boot/common/module.c,v 1.23 2002/04/11 10:00:44 peter Exp $ */ /* @@ -937,6 +937,8 @@ mdp->d_flags = 0; STAILQ_INSERT_TAIL(&moduledir_list, mdp, d_link); } + if (*ep == 0) + break; } /* * Delete unused directories if any ==== //depot/projects/ia64/sys/boot/efi/libefi/efifs.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.5 2002/03/30 01:36:03 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.6 2002/04/11 09:50:11 peter Exp $ */ #include @@ -233,6 +233,8 @@ sb->st_mode = S_IRUSR | S_IWUSR; if (info->Attribute & EFI_FILE_DIRECTORY) sb->st_mode |= S_IFDIR; + else + sb->st_mode |= S_IFREG; sb->st_size = info->FileSize; free(buf); ==== //depot/projects/ia64/sys/boot/i386/boot2/boot2.c#5 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.38 2002/03/23 19:40:27 pb Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.39 2002/04/11 09:21:10 pb Exp $ */ #include @@ -37,6 +37,11 @@ #include "boot2.h" #include "lib.h" +#define IO_KEYBOARD 1 +#define IO_SERIAL 2 + +#define SECOND 18 /* Circa that many ticks in a second. */ + #define RBX_ASKNAME 0x0 /* -a */ #define RBX_SINGLE 0x1 /* -s */ #define RBX_DFLTROOT 0x5 /* -r */ @@ -138,7 +143,7 @@ static struct bootinfo bootinfo; static int ls; static uint32_t fs_off; -static uint8_t ioctrl = 0x1; +static uint8_t ioctrl = IO_KEYBOARD; void exit(int); static void load(const char *); @@ -281,34 +286,43 @@ bootinfo.bi_memsizes_valid++; for (i = 0; i < N_BIOS_GEOM; i++) bootinfo.bi_bios_geom[i] = drvinfo(i); - autoboot = 2; + + /* Process configuration file */ + + autoboot = 1; readfile(PATH_CONFIG, cmd, sizeof(cmd)); if (*cmd) { printf("%s: %s", PATH_CONFIG, cmd); if (parse(cmd)) autoboot = 0; + /* Do not process this command twice */ *cmd = 0; } + + /* + * Try to exec stage 3 boot loader. If interrupted by a keypress, + * or in case of failure, try to load a kernel directly instead. + */ + if (autoboot && !*kname) { - if (autoboot == 2) { - memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3)); - if (!keyhit(0x37)) { - load(kname); - autoboot = 1; - } + memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3)); + if (!keyhit(3*SECOND)) { + load(kname); + memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL)); } - if (autoboot == 1) - memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL)); } + + /* Present the user with the boot2 prompt. */ + for (;;) { printf(" \n>> FreeBSD/i386 BOOT\n" "Default: %u:%s(%u,%c)%s\n" "boot: ", dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit, 'a' + dsk.part, kname); - if (ioctrl & 0x2) + if (ioctrl & IO_SERIAL) sio_flush(); - if (!autoboot || keyhit(0x5a)) + if (!autoboot || keyhit(5*SECOND)) getstr(cmd, sizeof(cmd)); else putchar('\n'); @@ -447,9 +461,9 @@ opts |= 1 << RBX_DUAL | 1 << RBX_SERIAL; opts &= ~(1 << RBX_PROBEKBD); } - ioctrl = opts & 1 << RBX_DUAL ? 0x3 : - opts & 1 << RBX_SERIAL ? 0x2 : 0x1; - if (ioctrl & 0x2) + ioctrl = opts & 1 << RBX_DUAL ? (IO_SERIAL|IO_KEYBOARD) : + opts & 1 << RBX_SERIAL ? IO_SERIAL : IO_KEYBOARD; + if (ioctrl & IO_SERIAL) sio_init(); } else { for (q = arg--; *q && *q != '('; q++); @@ -794,9 +808,9 @@ static int xputc(int c) { - if (ioctrl & 0x1) + if (ioctrl & IO_KEYBOARD) putc(c); - if (ioctrl & 0x2) + if (ioctrl & IO_SERIAL) sio_putc(c); return c; } @@ -807,9 +821,9 @@ if (opts & 1 << RBX_NOINTR) return 0; for (;;) { - if (ioctrl & 0x1 && getc(1)) + if (ioctrl & IO_KEYBOARD && getc(1)) return fn ? 1 : getc(0); - if (ioctrl & 0x2 && sio_ischar()) + if (ioctrl & IO_SERIAL && sio_ischar()) return fn ? 1 : sio_getc(); if (fn) return 0; ==== //depot/projects/ia64/sys/conf/files.ia64#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.29 2002/04/03 04:42:14 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.30 2002/04/10 19:35:50 dfr Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -22,6 +22,8 @@ ia64/acpica/acpi_wakeup.c optional acpica ia64/acpica/OsdEnvironment.c optional acpica ia64/acpica/madt.c optional acpica +ia64/ia32/ia32_sysent.c optional ia32 +ia64/ia32/imgact_ia32.c optional ia32 ia64/ia64/ia64-gdbstub.c optional ddb ia64/ia64/ia64dump.c standard ia64/ia64/autoconf.c standard ==== //depot/projects/ia64/sys/conf/options.ia64#2 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/sys/conf/options.ia64,v 1.8 2001/09/29 11:46:22 dfr Exp $ +# $FreeBSD: src/sys/conf/options.ia64,v 1.9 2002/04/10 19:35:50 dfr Exp $ # Options specific to the ia64 platform kernels ITANIUM opt_global.h +IA32 opt_ia32.h + PAGE_SIZE_4K opt_global.h PAGE_SIZE_8K opt_global.h PAGE_SIZE_16K opt_global.h ==== //depot/projects/ia64/sys/dev/ata/ata-raid.h#6 (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. * - * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.17 2002/04/02 13:47:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.18 2002/04/11 08:52:32 sos Exp $ */ /* misc defines */ @@ -158,8 +158,8 @@ u_int32_t dummy_0; u_int64_t magic_0; -#define PR_MAGIC0(x) ((u_int64_t)x.device->channel->unit << 48) | \ - ((u_int64_t)(x.device->unit != 0) << 56) +#define PR_MAGIC0(x) (x.device ? ((u_int64_t)x.device->channel->unit<<48) | \ + ((u_int64_t)(x.device->unit != 0) << 56) : 0) u_int16_t magic_1; u_int32_t magic_2; u_int8_t filler1[470]; ==== //depot/projects/ia64/sys/dev/ciss/ciss.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.3 2001/12/18 08:01:48 peter Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.4 2002/04/11 09:28:09 ps Exp $ */ /* @@ -1999,8 +1999,9 @@ * Create a SIM. */ if ((sc->ciss_cam_sim = cam_sim_alloc(ciss_cam_action, ciss_cam_poll, "ciss", sc, - device_get_unit(sc->ciss_dev), 1, + device_get_unit(sc->ciss_dev), sc->ciss_cfg->max_outstanding_commands, + 1, sc->ciss_cam_devq)) == NULL) { ciss_printf(sc, "can't allocate CAM SIM\n"); return(ENOMEM); ==== //depot/projects/ia64/sys/dev/wi/if_wavelan_ieee.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/wi/if_wavelan_ieee.h,v 1.11 2002/04/04 06:28:16 imp Exp $ + * $FreeBSD: src/sys/dev/wi/if_wavelan_ieee.h,v 1.12 2002/04/11 07:21:16 imp Exp $ */ #ifndef _IF_WAVELAN_IEEE_H @@ -50,6 +50,7 @@ #ifndef SIOCGWAVELAN #define SIOCGWAVELAN SIOCGIFGENERIC #endif +#define WI_RID_MONITOR_MODE 0x0500 /* * Technically I don't think there's a limit to a record @@ -113,6 +114,13 @@ #define WI_STYPE_MGMT_AUTH 0x00B0 /* authentication */ #define WI_STYPE_MGMT_DEAUTH 0x00C0 /* deauthentication */ +#define WI_STYPE_CTL_PSPOLL 0x00A0 +#define WI_STYPE_CTL_RTS 0x00B0 +#define WI_STYPE_CTL_CTS 0x00C0 +#define WI_STYPE_CTL_ACK 0x00D0 +#define WI_STYPE_CTL_CFEND 0x00E0 +#define WI_STYPE_CTL_CFENDACK 0x00F0 + struct wi_mgmt_hdr { u_int16_t frame_ctl; u_int16_t duration; @@ -209,7 +217,7 @@ #define IV_EVERY100_FRAME 0x60 /* every 100 frame IV reuse */ #define HOST_DECRYPT 0x80 #define WI_RID_WEP_MAPTABLE 0xFC29 -#define WI_RID_AUTH_CNTL 0xFC2A +#define WI_RID_CNFAUTHMODE 0xFC2A #define WI_RID_ROAMING_MODE 0xFC2D #define WI_RID_BASIC_RATE 0xFCB3 #define WI_RID_SUPPORT_RATE 0xFCB4 @@ -221,7 +229,11 @@ #define WI_RID_CREATE_IBSS 0xFC81 /* create IBSS */ #define WI_RID_FRAG_THRESH 0xFC82 /* frag len, unicast msg xmit */ #define WI_RID_RTS_THRESH 0xFC83 /* frame len for RTS/CTS handshake */ -#define WI_RID_TX_RATE 0xFC84 /* data rate for message xmit */ +#define WI_RID_TX_RATE 0xFC84 /* data rate for message xmit + * 0 == Fixed 1mbps + * 1 == Fixed 2mbps + * 2 == auto fallback + */ #define WI_RID_PROMISC 0xFC85 /* enable promisc mode */ #define WI_RID_FRAG_THRESH0 0xFC90 #define WI_RID_FRAG_THRESH1 0xFC91 ==== //depot/projects/ia64/sys/dev/wi/if_wi.c#13 (text+ko) ==== @@ -95,12 +95,16 @@ #include #include +#ifdef WI_HOSTAP +#include +#include +#endif #include #include #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.93 2002/04/04 22:22:31 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.95 2002/04/11 07:21:16 imp Exp $"; #endif static void wi_intr(void *); @@ -124,7 +128,6 @@ static int wi_alloc_nicmem(struct wi_softc *, int, int *); static void wi_inquire(void *); static void wi_setdef(struct wi_softc *, struct wi_req *); -static int wi_mgmt_xmit(struct wi_softc *, caddr_t, int); #ifdef WICACHE static @@ -214,6 +217,7 @@ struct ifnet *ifp; int error; + /* XXX maybe we need the splimp stuff here XXX */ sc = device_get_softc(dev); ifp = &sc->arpcom.ac_if; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 11 20:35:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2274837B405; Thu, 11 Apr 2002 20:35:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6B02137B41C for ; Thu, 11 Apr 2002 20:35:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3C3ZZU22826 for perforce@freebsd.org; Thu, 11 Apr 2002 20:35:35 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 11 Apr 2002 20:35:35 -0700 (PDT) Message-Id: <200204120335.g3C3ZZU22826@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9592 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9592 Change 9592 by peter@peter_thunder on 2002/04/11 20:35:14 Note to self: do not use variables before they are initialized. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#24 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#24 (text+ko) ==== @@ -669,7 +669,6 @@ */ pcpup = (struct pcpu *) pmap_steal_memory(PAGE_SIZE); pcpu_init(pcpup, 0, PAGE_SIZE); - pcpup->pc_current_pmap = kernel_pmap; ia64_set_k4((u_int64_t) pcpup); PCPU_SET(curthread, &thread0); @@ -695,6 +694,7 @@ * Initialize the virtual memory system. */ pmap_bootstrap(); + pcpup->pc_current_pmap = kernel_pmap; /* * Initialize debuggers, and break into them if appropriate. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 11 21: 7:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2112F37B404; Thu, 11 Apr 2002 21:07:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by hub.freebsd.org (Postfix) with ESMTP id 9D54C37B43F for ; Thu, 11 Apr 2002 21:07:13 -0700 (PDT) Received: (qmail 24889 invoked from network); 12 Apr 2002 04:07:07 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 12 Apr 2002 04:07:07 -0000 Received: from laptop.baldwin.cx (john@laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g3C47vv59100; Fri, 12 Apr 2002 00:07:57 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200204120335.g3C3ZZU22826@freefall.freebsd.org> Date: Fri, 12 Apr 2002 00:06:26 -0400 (EDT) From: John Baldwin To: Peter Wemm Subject: RE: PERFORCE change 9592 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 12-Apr-2002 Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9592 > > Change 9592 by peter@peter_thunder on 2002/04/11 20:35:14 > > Note to self: do not use variables before they are initialized. Why not? I think it's fun. ;) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 11 22: 0:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CC2737B405; Thu, 11 Apr 2002 21:59:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6490C37B400 for ; Thu, 11 Apr 2002 21:59:17 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3C4xGd37672 for perforce@freebsd.org; Thu, 11 Apr 2002 21:59:16 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Thu, 11 Apr 2002 21:59:16 -0700 (PDT) Message-Id: <200204120459.g3C4xGd37672@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9595 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9595 Change 9595 by jhb@jhb_laptop on 2002/04/11 21:58:21 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#41 integrate ... //depot/projects/smpng/sys/alpha/pci/lca_pci.c#3 integrate ... //depot/projects/smpng/sys/boot/common/module.c#4 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/efifs.c#6 integrate ... //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#8 integrate ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#19 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#6 integrate ... //depot/projects/smpng/sys/conf/files.ia64#13 integrate ... //depot/projects/smpng/sys/conf/options.ia64#6 integrate ... //depot/projects/smpng/sys/ddb/db_ps.c#7 integrate ... //depot/projects/smpng/sys/dev/ata/ata-dma.c#19 integrate ... //depot/projects/smpng/sys/dev/ata/ata-pci.c#19 integrate ... //depot/projects/smpng/sys/dev/ata/ata-raid.c#12 integrate ... //depot/projects/smpng/sys/dev/ata/ata-raid.h#9 integrate ... //depot/projects/smpng/sys/dev/ciss/ciss.c#4 integrate ... //depot/projects/smpng/sys/dev/pccard/pccarddevs#14 integrate ... //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#14 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#3 integrate ... //depot/projects/smpng/sys/dev/usb/umass.c#14 integrate ... //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#7 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#31 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#4 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#3 integrate ... //depot/projects/smpng/sys/dev/wi/if_wireg.h#13 integrate ... //depot/projects/smpng/sys/dev/wi/if_wivar.h#4 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.c#1 branch ... //depot/projects/smpng/sys/dev/wi/wi_hostap.h#1 branch ... //depot/projects/smpng/sys/i386/i386/machdep.c#36 integrate ... //depot/projects/smpng/sys/i386/include/cpufunc.h#14 integrate ... //depot/projects/smpng/sys/ia64/ia32/Makefile#1 branch ... //depot/projects/smpng/sys/ia64/ia32/ia32_proto.h#1 branch ... //depot/projects/smpng/sys/ia64/ia32/ia32_syscall.h#1 branch ... //depot/projects/smpng/sys/ia64/ia32/ia32_sysent.c#1 branch ... //depot/projects/smpng/sys/ia64/ia32/imgact_ia32.c#1 branch ... //depot/projects/smpng/sys/ia64/ia32/imgact_ia32.h#1 branch ... //depot/projects/smpng/sys/ia64/ia32/syscalls.conf#1 branch ... //depot/projects/smpng/sys/ia64/ia32/syscalls.master#1 branch ... //depot/projects/smpng/sys/ia64/ia64/support.s#8 integrate ... //depot/projects/smpng/sys/ia64/ia64/swtch.s#8 integrate ... //depot/projects/smpng/sys/ia64/ia64/trap.c#27 integrate ... //depot/projects/smpng/sys/ia64/include/ia64_cpu.h#8 integrate ... //depot/projects/smpng/sys/ia64/include/pcb.h#3 integrate ... //depot/projects/smpng/sys/ia64/include/signal.h#3 integrate ... //depot/projects/smpng/sys/kern/init_sysent.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_intr.c#17 integrate ... //depot/projects/smpng/sys/kern/syscalls.c#11 integrate ... //depot/projects/smpng/sys/kern/syscalls.master#10 integrate ... //depot/projects/smpng/sys/kern/uipc_mbuf.c#5 integrate ... //depot/projects/smpng/sys/libkern/bsearch.c#4 integrate ... //depot/projects/smpng/sys/net/if_ef.c#4 integrate ... //depot/projects/smpng/sys/net/if_ieee80211.h#2 integrate ... //depot/projects/smpng/sys/netinet/in.h#11 integrate ... //depot/projects/smpng/sys/netinet/ip_ecn.c#2 integrate ... //depot/projects/smpng/sys/netinet/tcp_input.c#15 integrate ... //depot/projects/smpng/sys/netinet/tcp_subr.c#18 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#32 integrate ... //depot/projects/smpng/sys/pci/if_rl.c#10 integrate ... //depot/projects/smpng/sys/pci/if_rlreg.h#4 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_log.c#4 integrate ... //depot/projects/smpng/sys/sys/syscall.h#11 integrate ... //depot/projects/smpng/sys/sys/syscall.mk#11 integrate ... //depot/projects/smpng/sys/sys/sysproto.h#13 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#41 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.176 2002/04/09 11:18:26 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.177 2002/04/11 17:13:08 alc Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1408,6 +1408,8 @@ * context left by sendsig. Check carefully to * make sure that the user has not modified the * state to gain improper privileges. + * + * MPSAFE */ int osigreturn(struct thread *td, ==== //depot/projects/smpng/sys/alpha/pci/lca_pci.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.13 2002/02/28 18:18:41 gallatin Exp $ + * $FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.14 2002/04/11 13:24:20 ticso Exp $ */ #include @@ -104,7 +104,7 @@ static int lca_pcib_maxslots(device_t dev) { - return 31; + return 15; } #define LCA_CFGOFF(b, s, f, r) \ ==== //depot/projects/smpng/sys/boot/common/module.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/module.c,v 1.22 2001/11/16 21:08:40 iedowse Exp $ + * $FreeBSD: src/sys/boot/common/module.c,v 1.23 2002/04/11 10:00:44 peter Exp $ */ /* @@ -937,6 +937,8 @@ mdp->d_flags = 0; STAILQ_INSERT_TAIL(&moduledir_list, mdp, d_link); } + if (*ep == 0) + break; } /* * Delete unused directories if any ==== //depot/projects/smpng/sys/boot/efi/libefi/efifs.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.5 2002/03/30 01:36:03 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/efifs.c,v 1.6 2002/04/11 09:50:11 peter Exp $ */ #include @@ -233,6 +233,8 @@ sb->st_mode = S_IRUSR | S_IWUSR; if (info->Attribute & EFI_FILE_DIRECTORY) sb->st_mode |= S_IFDIR; + else + sb->st_mode |= S_IFREG; sb->st_size = info->FileSize; free(buf); ==== //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#8 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.38 2002/03/23 19:40:27 pb Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.39 2002/04/11 09:21:10 pb Exp $ */ #include @@ -37,6 +37,11 @@ #include "boot2.h" #include "lib.h" +#define IO_KEYBOARD 1 +#define IO_SERIAL 2 + +#define SECOND 18 /* Circa that many ticks in a second. */ + #define RBX_ASKNAME 0x0 /* -a */ #define RBX_SINGLE 0x1 /* -s */ #define RBX_DFLTROOT 0x5 /* -r */ @@ -138,7 +143,7 @@ static struct bootinfo bootinfo; static int ls; static uint32_t fs_off; -static uint8_t ioctrl = 0x1; +static uint8_t ioctrl = IO_KEYBOARD; void exit(int); static void load(const char *); @@ -281,34 +286,43 @@ bootinfo.bi_memsizes_valid++; for (i = 0; i < N_BIOS_GEOM; i++) bootinfo.bi_bios_geom[i] = drvinfo(i); - autoboot = 2; + + /* Process configuration file */ + + autoboot = 1; readfile(PATH_CONFIG, cmd, sizeof(cmd)); if (*cmd) { printf("%s: %s", PATH_CONFIG, cmd); if (parse(cmd)) autoboot = 0; + /* Do not process this command twice */ *cmd = 0; } + + /* + * Try to exec stage 3 boot loader. If interrupted by a keypress, + * or in case of failure, try to load a kernel directly instead. + */ + if (autoboot && !*kname) { - if (autoboot == 2) { - memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3)); - if (!keyhit(0x37)) { - load(kname); - autoboot = 1; - } + memcpy(kname, PATH_BOOT3, sizeof(PATH_BOOT3)); + if (!keyhit(3*SECOND)) { + load(kname); + memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL)); } - if (autoboot == 1) - memcpy(kname, PATH_KERNEL, sizeof(PATH_KERNEL)); } + + /* Present the user with the boot2 prompt. */ + for (;;) { printf(" \n>> FreeBSD/i386 BOOT\n" "Default: %u:%s(%u,%c)%s\n" "boot: ", dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit, 'a' + dsk.part, kname); - if (ioctrl & 0x2) + if (ioctrl & IO_SERIAL) sio_flush(); - if (!autoboot || keyhit(0x5a)) + if (!autoboot || keyhit(5*SECOND)) getstr(cmd, sizeof(cmd)); else putchar('\n'); @@ -447,9 +461,9 @@ opts |= 1 << RBX_DUAL | 1 << RBX_SERIAL; opts &= ~(1 << RBX_PROBEKBD); } - ioctrl = opts & 1 << RBX_DUAL ? 0x3 : - opts & 1 << RBX_SERIAL ? 0x2 : 0x1; - if (ioctrl & 0x2) + ioctrl = opts & 1 << RBX_DUAL ? (IO_SERIAL|IO_KEYBOARD) : + opts & 1 << RBX_SERIAL ? IO_SERIAL : IO_KEYBOARD; + if (ioctrl & IO_SERIAL) sio_init(); } else { for (q = arg--; *q && *q != '('; q++); @@ -794,9 +808,9 @@ static int xputc(int c) { - if (ioctrl & 0x1) + if (ioctrl & IO_KEYBOARD) putc(c); - if (ioctrl & 0x2) + if (ioctrl & IO_SERIAL) sio_putc(c); return c; } @@ -807,9 +821,9 @@ if (opts & 1 << RBX_NOINTR) return 0; for (;;) { - if (ioctrl & 0x1 && getc(1)) + if (ioctrl & IO_KEYBOARD && getc(1)) return fn ? 1 : getc(0); - if (ioctrl & 0x2 && sio_ischar()) + if (ioctrl & IO_SERIAL && sio_ischar()) return fn ? 1 : sio_getc(); if (fn) return 0; ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#19 (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. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.117 2002/04/01 21:30:29 jhb Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.118 2002/04/11 21:00:05 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#6 (text+ko) ==== @@ -27,7 +27,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/compat/svr4/svr4_sysvec.c,v 1.23 2002/02/27 18:31:42 jhb Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.24 2002/04/11 21:00:38 jhb Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/smpng/sys/conf/files.ia64#13 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.29 2002/04/03 04:42:14 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.30 2002/04/10 19:35:50 dfr Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -22,6 +22,8 @@ ia64/acpica/acpi_wakeup.c optional acpica ia64/acpica/OsdEnvironment.c optional acpica ia64/acpica/madt.c optional acpica +ia64/ia32/ia32_sysent.c optional ia32 +ia64/ia32/imgact_ia32.c optional ia32 ia64/ia64/ia64-gdbstub.c optional ddb ia64/ia64/ia64dump.c standard ia64/ia64/autoconf.c standard ==== //depot/projects/smpng/sys/conf/options.ia64#6 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/sys/conf/options.ia64,v 1.8 2001/09/29 11:46:22 dfr Exp $ +# $FreeBSD: src/sys/conf/options.ia64,v 1.9 2002/04/10 19:35:50 dfr Exp $ # Options specific to the ia64 platform kernels ITANIUM opt_global.h +IA32 opt_ia32.h + PAGE_SIZE_4K opt_global.h PAGE_SIZE_8K opt_global.h PAGE_SIZE_16K opt_global.h ==== //depot/projects/smpng/sys/ddb/db_ps.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/db_ps.c,v 1.27 2002/02/07 20:58:43 julian Exp $ + * $FreeBSD: src/sys/ddb/db_ps.c,v 1.28 2002/04/11 21:01:34 jhb Exp $ */ #include #include ==== //depot/projects/smpng/sys/dev/ata/ata-dma.c#19 (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. * - * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.94 2002/04/07 07:53:34 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.95 2002/04/11 11:04:23 sos Exp $ */ #include @@ -970,6 +970,7 @@ case 0x4d69105a: /* Promise TX2 ATA133 controllers */ case 0x5275105a: /* Promise TX2 ATA133 controllers */ + case 0x6269105a: /* Promise TX2 ATA133 controllers */ ATA_OUTB(atadev->channel->r_bmio, ATA_BMDEVSPEC_0, 0x0b); if (udmamode >= 6 && !(ATA_INB(atadev->channel->r_bmio, ATA_BMDEVSPEC_1) & 0x04)) { ==== //depot/projects/smpng/sys/dev/ata/ata-pci.c#19 (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. * - * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.39 2002/04/07 07:53:34 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.40 2002/04/11 11:04:23 sos Exp $ */ #include "opt_ata.h" @@ -270,6 +270,7 @@ case 0x4d69105a: case 0x5275105a: + case 0x6269105a: return "Promise TX2 ATA133 controller"; case 0x00041103: @@ -572,6 +573,7 @@ case 0x6268105a: /* Promise TX2 ATA100 */ case 0x4d69105a: /* Promise TX2 ATA133 */ case 0x5275105a: /* Promise TX2 ATA133 */ + case 0x6269105a: /* Promise TX2 ATA133 */ ATA_OUTB(ch->r_bmio, ATA_BMDEVSPEC_0, 0x0b); if (!(ATA_INB(ch->r_bmio, ATA_BMDEVSPEC_1) & 0x20)) return 1; ==== //depot/projects/smpng/sys/dev/ata/ata-raid.c#12 (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. * - * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.45 2002/04/10 11:18:07 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.46 2002/04/11 11:04:23 sos Exp $ */ #include "opt_ata.h" @@ -122,6 +122,7 @@ switch(adp->device->channel->chiptype) { case 0x4d33105a: case 0x4d38105a: case 0x4d30105a: case 0x0d30105a: case 0x4d68105a: case 0x6268105a: + case 0x6269105a: /* test RAID bit in PCI reg XXX */ return (ar_promise_read_conf(adp, ar_table, 0)); ==== //depot/projects/smpng/sys/dev/ata/ata-raid.h#9 (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. * - * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.17 2002/04/02 13:47:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.18 2002/04/11 08:52:32 sos Exp $ */ /* misc defines */ @@ -158,8 +158,8 @@ u_int32_t dummy_0; u_int64_t magic_0; -#define PR_MAGIC0(x) ((u_int64_t)x.device->channel->unit << 48) | \ - ((u_int64_t)(x.device->unit != 0) << 56) +#define PR_MAGIC0(x) (x.device ? ((u_int64_t)x.device->channel->unit<<48) | \ + ((u_int64_t)(x.device->unit != 0) << 56) : 0) u_int16_t magic_1; u_int32_t magic_2; u_int8_t filler1[470]; ==== //depot/projects/smpng/sys/dev/ciss/ciss.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.3 2001/12/18 08:01:48 peter Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.4 2002/04/11 09:28:09 ps Exp $ */ /* @@ -1999,8 +1999,9 @@ * Create a SIM. */ if ((sc->ciss_cam_sim = cam_sim_alloc(ciss_cam_action, ciss_cam_poll, "ciss", sc, - device_get_unit(sc->ciss_dev), 1, + device_get_unit(sc->ciss_dev), sc->ciss_cfg->max_outstanding_commands, + 1, sc->ciss_cam_devq)) == NULL) { ciss_printf(sc, "can't allocate CAM SIM\n"); return(ENOMEM); ==== //depot/projects/smpng/sys/dev/pccard/pccarddevs#14 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.31 2002/04/05 16:25:03 imp Exp $ +$FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.32 2002/04/11 21:18:17 imp Exp $ /* $NetBSD: pcmciadevs,v 1.163 2002/03/04 16:41:50 martin Exp $ */ /* $OpenBSD: pcmciadevs,v 1.85 2002/03/29 18:54:07 millert Exp $ */ @@ -90,6 +90,7 @@ vendor NWN 0x0602 No Wires Needed vendor BREEZECOM 0x0a02 BreezeCOM vendor NEWMEDIA2 0x10cd NewMedia +vendor ACTIONTEC 0x1668 ACTIONTEC vendor LASAT 0x3401 Lasat Communications A/S vendor BONDWELL 0x3b01 Bondwell vendor LEXARMEDIA 0x4e01 Lexar Media @@ -127,6 +128,9 @@ product 3COM 3C1 0x0cf1 3Com Megahertz 3C1 10Mbps LAN CF+ Card product 3COM 3CRWE62092A 0x2092 3Com 3CRWE62092A Wireless LAN +/* ACTIONTEC */ +product ACTIONTEC HWC01170 0x0101 ACTIONTEC Wireless LAN PC CARD + /* Adaptec Products */ product ADAPTEC APA1460 0x0001 Adaptec APA-1460 SlimSCSI product ADAPTEC APA1460A 0x0002 Adaptec APA-1460A SlimSCSI ==== //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#14 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.31 2002/04/05 16:25:34 imp Exp $ */ +/* $FreeBSD: src/sys/dev/pccard/pccarddevs.h,v 1.32 2002/04/11 21:19:04 imp Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.31 2002/04/05 16:25:03 imp Exp + * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.32 2002/04/11 21:18:17 imp Exp */ /* $NetBSD: pcmciadevs,v 1.163 2002/03/04 16:41:50 martin Exp $ */ /* $OpenBSD: pcmciadevs,v 1.85 2002/03/29 18:54:07 millert Exp $ */ @@ -97,6 +97,7 @@ #define PCMCIA_VENDOR_NWN 0x0602 /* No Wires Needed */ #define PCMCIA_VENDOR_BREEZECOM 0x0a02 /* BreezeCOM */ #define PCMCIA_VENDOR_NEWMEDIA2 0x10cd /* NewMedia */ +#define PCMCIA_VENDOR_ACTIONTEC 0x1668 /* ACTIONTEC */ #define PCMCIA_VENDOR_LASAT 0x3401 /* Lasat Communications A/S */ #define PCMCIA_VENDOR_BONDWELL 0x3b01 /* Bondwell */ #define PCMCIA_VENDOR_LEXARMEDIA 0x4e01 /* Lexar Media */ @@ -156,6 +157,11 @@ #define PCMCIA_PRODUCT_3COM_3CRWE62092A 0x2092 #define PCMCIA_STR_3COM_3CRWE62092A "3Com 3CRWE62092A Wireless LAN" +/* ACTIONTEC */ +#define PCMCIA_CIS_ACTIONTEC_HWC01170 { NULL, NULL, NULL, NULL } +#define PCMCIA_PRODUCT_ACTIONTEC_HWC01170 0x0101 +#define PCMCIA_STR_ACTIONTEC_HWC01170 "ACTIONTEC Wireless LAN PC CARD" + /* Adaptec Products */ #define PCMCIA_CIS_ADAPTEC_APA1460 { NULL, NULL, NULL, NULL } #define PCMCIA_PRODUCT_ADAPTEC_APA1460 0x0001 ==== //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.6 2001/08/23 11:30:52 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_fmt.c,v 1.7 2002/04/11 15:31:01 jhb Exp $"); MALLOC_DEFINE(M_FMTFEEDER, "fmtfeed", "pcm format feeder"); @@ -446,7 +446,7 @@ feed_sign(struct pcm_feeder *f, struct pcm_channel *c, u_int8_t *b, u_int32_t count, void *source) { int i = 0, j = FEEDER_FEED(f->source, c, b, count, source); - int ssz = (int)f->data, ofs = ssz - 1; + intptr_t ssz = (intptr_t)f->data, ofs = ssz - 1; while (i < j) { b[i + ofs] ^= 0x80; ==== //depot/projects/smpng/sys/dev/usb/umass.c#14 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.58 2002/04/10 13:22:12 n_hibma Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.60 2002/04/11 21:09:41 jhb Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -517,7 +517,7 @@ Static void umass_cam_rescan_callback (struct cam_periph *periph,union ccb *ccb); -Static void umass_cam_rescan (struct umass_softc *sc); +Static void umass_cam_rescan (void *addr); Static int umass_cam_attach_sim (void); Static int umass_cam_attach (struct umass_softc *sc); @@ -2097,8 +2097,15 @@ } Static void -umass_cam_rescan(struct umass_softc *sc) +umass_cam_rescan(void *addr) { + /* Note: The sc is only passed in for debugging prints. If the device + * is disconnected before umass_cam_rescan has been able to run the + * driver might bomb. + */ +#ifdef UMASS_DEBUG + struct umass_softc *sc = (struct umass_softc *) addr; +#endif struct cam_path *path; union ccb *ccb = malloc(sizeof(union ccb), M_USBDEV, M_WAITOK); @@ -2155,7 +2162,11 @@ * after booting has completed, when interrupts have been * enabled. */ - umass_cam_rescan(sc); + + /* XXX This will bomb if the driver is unloaded between attach + * and execution of umass_cam_rescan. + */ + timeout(umass_cam_rescan, sc, MS_TO_TICKS(200)); } return(0); /* always succesfull */ ==== //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#7 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/wi/if_wavelan_ieee.h,v 1.11 2002/04/04 06:28:16 imp Exp $ + * $FreeBSD: src/sys/dev/wi/if_wavelan_ieee.h,v 1.12 2002/04/11 07:21:16 imp Exp $ */ #ifndef _IF_WAVELAN_IEEE_H @@ -50,6 +50,7 @@ #ifndef SIOCGWAVELAN #define SIOCGWAVELAN SIOCGIFGENERIC #endif +#define WI_RID_MONITOR_MODE 0x0500 /* * Technically I don't think there's a limit to a record @@ -113,6 +114,13 @@ #define WI_STYPE_MGMT_AUTH 0x00B0 /* authentication */ #define WI_STYPE_MGMT_DEAUTH 0x00C0 /* deauthentication */ +#define WI_STYPE_CTL_PSPOLL 0x00A0 +#define WI_STYPE_CTL_RTS 0x00B0 +#define WI_STYPE_CTL_CTS 0x00C0 +#define WI_STYPE_CTL_ACK 0x00D0 +#define WI_STYPE_CTL_CFEND 0x00E0 +#define WI_STYPE_CTL_CFENDACK 0x00F0 + struct wi_mgmt_hdr { u_int16_t frame_ctl; u_int16_t duration; @@ -209,7 +217,7 @@ #define IV_EVERY100_FRAME 0x60 /* every 100 frame IV reuse */ #define HOST_DECRYPT 0x80 #define WI_RID_WEP_MAPTABLE 0xFC29 -#define WI_RID_AUTH_CNTL 0xFC2A +#define WI_RID_CNFAUTHMODE 0xFC2A #define WI_RID_ROAMING_MODE 0xFC2D #define WI_RID_BASIC_RATE 0xFCB3 #define WI_RID_SUPPORT_RATE 0xFCB4 @@ -221,7 +229,11 @@ #define WI_RID_CREATE_IBSS 0xFC81 /* create IBSS */ #define WI_RID_FRAG_THRESH 0xFC82 /* frag len, unicast msg xmit */ #define WI_RID_RTS_THRESH 0xFC83 /* frame len for RTS/CTS handshake */ -#define WI_RID_TX_RATE 0xFC84 /* data rate for message xmit */ +#define WI_RID_TX_RATE 0xFC84 /* data rate for message xmit + * 0 == Fixed 1mbps + * 1 == Fixed 2mbps + * 2 == auto fallback + */ #define WI_RID_PROMISC 0xFC85 /* enable promisc mode */ #define WI_RID_FRAG_THRESH0 0xFC90 #define WI_RID_FRAG_THRESH1 0xFC91 ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#31 (text+ko) ==== @@ -95,12 +95,16 @@ #include #include +#ifdef WI_HOSTAP +#include +#include +#endif #include #include #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.93 2002/04/04 22:22:31 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.96 2002/04/12 03:42:37 imp Exp $"; #endif static void wi_intr(void *); @@ -124,7 +128,6 @@ static int wi_alloc_nicmem(struct wi_softc *, int, int *); static void wi_inquire(void *); static void wi_setdef(struct wi_softc *, struct wi_req *); -static int wi_mgmt_xmit(struct wi_softc *, caddr_t, int); #ifdef WICACHE static @@ -214,6 +217,7 @@ struct ifnet *ifp; int error; + /* XXX maybe we need the splimp stuff here XXX */ sc = device_get_softc(dev); ifp = &sc->arpcom.ac_if; @@ -290,6 +294,7 @@ sc->wi_max_sleep = WI_DEFAULT_MAX_SLEEP; sc->wi_roaming = WI_DEFAULT_ROAMING; sc->wi_authtype = WI_DEFAULT_AUTHTYPE; + sc->wi_authmode = IEEE80211_AUTH_OPEN; /* * Read the default channel from the NIC. This may vary @@ -311,11 +316,18 @@ sc->wi_has_wep = gen.wi_val; if (bootverbose) { - device_printf(sc->dev, - "%s:wi_has_wep = %d\n", - __func__, sc->wi_has_wep); + device_printf(sc->dev, "%s:wi_has_wep = %d\n", + __func__, sc->wi_has_wep); } + /* + * Find supported rates. + */ + gen.wi_type = WI_RID_TX_RATE; + gen.wi_len = 2; + wi_read_record(sc, &gen); + sc->wi_supprates = gen.wi_val; + bzero((char *)&sc->wi_stats, sizeof(sc->wi_stats)); wi_init(sc); @@ -339,6 +351,20 @@ ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, IFM_IEEE80211_ADHOC, 0), 0); ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, 0, 0), 0); +#ifdef IFM_IEEE80211_HOSTAP + if (sc->sc_firmware_type == WI_INTERSIL) { + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, + IFM_IEEE80211_HOSTAP, 0), 0); + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, + IFM_IEEE80211_HOSTAP, 0), 0); + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, + IFM_IEEE80211_HOSTAP, 0), 0); + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, + IFM_IEEE80211_HOSTAP, 0), 0); + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, + IFM_IEEE80211_HOSTAP, 0), 0); + } +#endif #undef ADD ifmedia_set(&sc->ifmedia, IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, 0, 0)); @@ -587,6 +613,38 @@ eh = mtod(m, struct ether_header *); m->m_pkthdr.rcvif = ifp; +#ifdef WI_HOSTAP + if (rx_frame.wi_status == WI_STAT_MGMT && + sc->wi_ptype == WI_PORTTYPE_AP) { + if ((WI_802_11_OFFSET_RAW + rx_frame.wi_dat_len + 2) > + MCLBYTES) { + device_printf(sc->dev, "oversized mgmt packet " + "received in hostap mode " + "(wi_dat_len=%d, wi_status=0x%x)\n", + rx_frame.wi_dat_len, rx_frame.wi_status); + m_freem(m); + ifp->if_ierrors++; + return; + } + + /* Put the whole header in there. */ + bcopy(&rx_frame, mtod(m, void *), + sizeof(struct wi_frame)); + if (wi_read_data(sc, id, WI_802_11_OFFSET_RAW, + mtod(m, caddr_t) + WI_802_11_OFFSET_RAW, + rx_frame.wi_dat_len + 2)) { + m_freem(m); + ifp->if_ierrors++; + return; + } + m->m_pkthdr.len = m->m_len = + WI_802_11_OFFSET_RAW + rx_frame.wi_dat_len; + /* XXX: consider giving packet to bhp? */ + wihap_mgmt_input(sc, &rx_frame, m); + return; + } +#endif /* WI_HOSTAP */ + if (rx_frame.wi_status == WI_STAT_1042 || rx_frame.wi_status == WI_STAT_TUNNEL || rx_frame.wi_status == WI_STAT_WMP_MSG) { @@ -653,6 +711,18 @@ ifp->if_ipackets++; +#ifdef WI_HOSTAP + if (sc->wi_ptype == WI_PORTTYPE_AP) { + /* + * Give host AP code first crack at data + * packets. If it decides to handle it (or + * drop it), it will return a non-zero. + * Otherwise, it is destined for this host. + */ + if (wihap_data_input(sc, &rx_frame, m)) + return; + } +#endif /* Receive packet. */ m_adj(m, sizeof(struct ether_header)); #ifdef WICACHE @@ -688,6 +758,7 @@ { struct wi_softc *sc; struct ifnet *ifp; + int s; sc = xsc; ifp = &sc->arpcom.ac_if; @@ -698,7 +769,9 @@ if (ifp->if_flags & IFF_OACTIVE) return; + s = splimp(); wi_cmd(sc, WI_CMD_INQUIRE, WI_INFO_COUNTERS, 0, 0); + splx(s); return; } @@ -887,7 +960,7 @@ wi_reset(sc) struct wi_softc *sc; { -#define WI_INIT_TRIES 5 +#define WI_INIT_TRIES 3 int i; int tries; @@ -904,8 +977,12 @@ break; DELAY(WI_DELAY * 1000); } - if (i == WI_INIT_TRIES) + sc->sc_enabled = 1; + + if (i == tries) { device_printf(sc->dev, "init failed\n"); + return; + } CSR_WRITE_2(sc, WI_INT_EN, 0); CSR_WRITE_2(sc, WI_EVENT_ACK, 0xFFFF); @@ -913,8 +990,6 @@ /* Calibrate timer. */ WI_SETVAL(WI_RID_TICK_TIME, 8); - sc->sc_enabled = 1; - return; } @@ -1000,7 +1075,7 @@ oltv->wi_len = 2; oltv->wi_val = ltv->wi_val; break; - case WI_RID_AUTH_CNTL: + case WI_RID_CNFAUTHMODE: oltv->wi_len = 2; if (le16toh(ltv->wi_val) & 0x01) oltv->wi_val = htole16(1); @@ -1045,10 +1120,18 @@ case WI_RID_ENCRYPTION: p2ltv.wi_type = WI_RID_P2_ENCRYPTION; p2ltv.wi_len = 2; - if (le16toh(ltv->wi_val)) + if (le16toh(ltv->wi_val)) { p2ltv.wi_val =htole16(PRIVACY_INVOKED | EXCLUDE_UNENCRYPTED); - else +#ifdef WI_HOSTAP + if (sc->wi_ptype == WI_PORTTYPE_AP) + /* + * Disable tx encryption... + * it's broken. + */ + p2ltv.wi_val |= htole16(HOST_ENCRYPT); +#endif + } else p2ltv.wi_val = htole16(HOST_ENCRYPT | HOST_DECRYPT); ltv = &p2ltv; @@ -1082,8 +1165,8 @@ } return 0; } - case WI_RID_AUTH_CNTL: - p2ltv.wi_type = WI_RID_AUTH_CNTL; + case WI_RID_CNFAUTHMODE: + p2ltv.wi_type = WI_RID_CNFAUTHMODE; p2ltv.wi_len = 2; if (le16toh(ltv->wi_val) == 1) p2ltv.wi_val = htole16(0x01); @@ -1370,7 +1453,7 @@ case WI_RID_MAX_SLEEP: sc->wi_max_sleep = le16toh(wreq->wi_val[0]); break; - case WI_RID_AUTH_CNTL: + case WI_RID_CNFAUTHMODE: sc->wi_authtype = le16toh(wreq->wi_val[0]); break; case WI_RID_ROAMING_MODE: @@ -1630,7 +1713,7 @@ ireq->i_val = sc->wi_tx_key; break; case IEEE80211_IOC_AUTHMODE: - ireq->i_val = IEEE80211_AUTH_NONE; + ireq->i_val = sc->wi_authmode; break; case IEEE80211_IOC_STATIONNAME: error = copyout(sc->wi_node_name, @@ -1710,7 +1793,7 @@ sc->wi_tx_key = ireq->i_val; break; case IEEE80211_IOC_AUTHMODE: - error = EINVAL; + sc->wi_authmode = ireq->i_val; break; case IEEE80211_IOC_STATIONNAME: if (ireq->i_len > 32) { @@ -1761,7 +1844,18 @@ /* Reinitialize WaveLAN. */ wi_init(sc); + break; +#ifdef WI_HOSTAP + case SIOCHOSTAP_ADD: + case SIOCHOSTAP_DEL: + case SIOCHOSTAP_GET: + case SIOCHOSTAP_GETALL: + case SIOCHOSTAP_GFLAGS: + case SIOCHOSTAP_SFLAGS: + /* Send all Host AP specific ioctl's to Host AP code. */ + error = wihap_ioctl(sc, command, data); break; +#endif default: error = EINVAL; break; @@ -1832,6 +1926,9 @@ /* Program the nodename. */ WI_SETSTR(WI_RID_NODENAME, sc->wi_node_name); + /* Specify the authentication mode. */ + WI_SETVAL(WI_RID_CNFAUTHMODE, sc->wi_authmode); + /* Set our MAC address. */ mac.wi_len = 4; mac.wi_type = WI_RID_MAC_NODE; @@ -1861,7 +1958,7 @@ /* firm ver < 0.8 variant 2 */ WI_SETVAL(WI_RID_PROMISC, 1); } - WI_SETVAL(WI_RID_AUTH_CNTL, sc->wi_authtype); + WI_SETVAL(WI_RID_CNFAUTHMODE, sc->wi_authtype); } } @@ -1889,6 +1986,15 @@ /* enable interrupts */ CSR_WRITE_2(sc, WI_INT_EN, WI_INTRS); +#ifdef WI_HOSTAP + wihap_init(sc); + + /* + * Initialize ICV to something random. XXX: this doesn't work + * if init happens in early boot-up. Fix later. + */ + read_random(&sc->wi_icv, sizeof(sc->wi_icv)); +#endif ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; @@ -1898,7 +2004,142 @@ return; } +static u_int32_t crc32_tab[] = { + 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, + 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, + 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, + 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, + 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, + 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, + 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, + 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, + 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, + 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, + 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, + 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, + 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, + 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, + 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, + 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, + 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, + 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, + 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, + 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, + 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 11 23: 4:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BFEC37B405; Thu, 11 Apr 2002 23:04:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BEBF537B404 for ; Thu, 11 Apr 2002 23:04:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3C64fq51758 for perforce@freebsd.org; Thu, 11 Apr 2002 23:04:41 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 11 Apr 2002 23:04:41 -0700 (PDT) Message-Id: <200204120604.g3C64fq51758@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9602 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9602 Change 9602 by peter@peter_thunder on 2002/04/11 23:03:49 Try and make 'options SKI' non-fatal for real hardware and make the detection work properly. Affected files ... ... //depot/projects/ia64/sys/conf/options.ia64#3 edit ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#25 edit Differences ... ==== //depot/projects/ia64/sys/conf/options.ia64#3 (text+ko) ==== @@ -70,3 +70,4 @@ # Device options DEV_SPLASH opt_splash.h +DEV_ACPICA opt_acpi.h ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#25 (text+ko) ==== @@ -30,6 +30,11 @@ #include "opt_ddb.h" #include "opt_ski.h" #include "opt_msgbuf.h" +#include "opt_acpi.h" + +#if !defined(SKI) && !defined(DEV_ACPICA) +#error "You need the SKI option and/or the acpica device" +#endif #include #include @@ -222,12 +227,19 @@ bufinit(); vm_pager_bufferinit(); -#ifndef SKI +#ifdef DEV_ACPICA /* * Traverse the MADT to discover IOSAPIC and Local SAPIC * information. */ - ia64_probe_sapics(); + if (!ia64_running_in_simulator()) + ia64_probe_sapics(); +#else + /* + * It is an error to boot a SKI-only kernel on hardware. + */ + if (!ia64_running_in_simulator()) + panic("Mandatory 'device acpica' is missing"); #endif } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 12 0: 2: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB5E237B419; Fri, 12 Apr 2002 00:01:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C243837B416 for ; Fri, 12 Apr 2002 00:01:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3C71rF69170 for perforce@freebsd.org; Fri, 12 Apr 2002 00:01:53 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 12 Apr 2002 00:01:53 -0700 (PDT) Message-Id: <200204120701.g3C71rF69170@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9609 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9609 Change 9609 by peter@peter_thunder on 2002/04/12 00:01:20 ok, skimping and sharing an opt file cost me one large recompile. :-] Affected files ... ... //depot/projects/ia64/sys/conf/options.ia64#4 edit ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#26 edit Differences ... ==== //depot/projects/ia64/sys/conf/options.ia64#4 (text+ko) ==== @@ -70,4 +70,4 @@ # Device options DEV_SPLASH opt_splash.h -DEV_ACPICA opt_acpi.h +DEV_ACPICA opt_acpica.h ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#26 (text+ko) ==== @@ -30,7 +30,7 @@ #include "opt_ddb.h" #include "opt_ski.h" #include "opt_msgbuf.h" -#include "opt_acpi.h" +#include "opt_acpica.h" #if !defined(SKI) && !defined(DEV_ACPICA) #error "You need the SKI option and/or the acpica device" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 12 0: 4:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2642937B416; Fri, 12 Apr 2002 00:04:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from finch-post-12.mail.demon.net (finch-post-12.mail.demon.net [194.217.242.41]) by hub.freebsd.org (Postfix) with ESMTP id 18AE937B400; Fri, 12 Apr 2002 00:04:34 -0700 (PDT) Received: from mailgate.nlsystems.com ([62.49.251.130] helo=herring.nlsystems.com) by finch-post-12.mail.demon.net with esmtp (Exim 3.35 #1) id 16vv6n-000F1I-0C; Fri, 12 Apr 2002 07:04:33 +0000 Received: from salmon.nlsystems.com (salmon [10.0.0.3]) by herring.nlsystems.com (8.12.2/8.11.2) with ESMTP id g3C74W3I026555; Fri, 12 Apr 2002 08:04:32 +0100 (BST) (envelope-from dfr@nlsystems.com) Date: Fri, 12 Apr 2002 08:04:32 +0100 (BST) From: Doug Rabson To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 9592 for review In-Reply-To: <200204120335.g3C3ZZU22826@freefall.freebsd.org> Message-ID: <20020412080401.E16912-100000@salmon.nlsystems.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, 11 Apr 2002, Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9592 > > Change 9592 by peter@peter_thunder on 2002/04/11 20:35:14 > > Note to self: do not use variables before they are initialized. I forgot you had this in P4. I just added code in CVS to initialise current_pmap in pmap_bootstrap itself. -- Doug Rabson Mail: dfr@nlsystems.com Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 12 10:25:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DC2B37B404; Fri, 12 Apr 2002 10:25:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 534F637B400 for ; Fri, 12 Apr 2002 10:25:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3CHPr336666 for perforce@freebsd.org; Fri, 12 Apr 2002 10:25:53 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Fri, 12 Apr 2002 10:25:53 -0700 (PDT) Message-Id: <200204121725.g3CHPr336666@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9621 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9621 Change 9621 by jhb@jhb_zion on 2002/04/12 10:25:26 Integ fixing of this header from current so that ldd compiles. The sparc64_base label needs a labelsync but I don't have permission to do that. Affected files ... ... //depot/projects/sparc64/sys/sparc64/include/endian.h#13 integrate Differences ... ==== //depot/projects/sparc64/sys/sparc64/include/endian.h#13 (text+ko) ==== @@ -31,12 +31,13 @@ * SUCH DAMAGE. * * @(#)endian.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/sparc64/include/endian.h,v 1.8 2002/04/10 14:39:14 mike Exp $ + * $FreeBSD: src/sys/sparc64/include/endian.h,v 1.9 2002/04/12 15:56:45 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ #define _MACHINE_ENDIAN_H_ +#include #include /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 12 11:17:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CA2637B405; Fri, 12 Apr 2002 11:17:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7FB9C37B404 for ; Fri, 12 Apr 2002 11:17:01 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3CIH1V50122 for perforce@freebsd.org; Fri, 12 Apr 2002 11:17:01 -0700 (PDT) (envelope-from des@freebsd.org) Date: Fri, 12 Apr 2002 11:17:01 -0700 (PDT) Message-Id: <200204121817.g3CIH1V50122@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9623 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9623 Change 9623 by des@des.at.des.thinksec.com on 2002/04/12 11:16:08 Adopt the same preprocessor tricks that Linux-PAM uses for modules. This reduces the amount of changes needed to adopt modules written for Linux-PAM. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/include/security/openpam.h#16 edit ... //depot/projects/openpam/include/security/pam_modules.h#7 edit Differences ... ==== //depot/projects/openpam/include/security/openpam.h#16 (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#15 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#16 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED @@ -208,6 +208,46 @@ }; /* + * Source-code compatibility with Linux-PAM modules + */ +#if defined(PAM_SM_AUTH) || defined(PAM_SM_ACCOUNT) || \ + defined(PAM_SM_SESSION) || defined(PAM_SM_PASSWORD) +#define LINUX_PAM_MODULE +#endif +#if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_AUTH) +#define _PAM_SM_AUTHENTICATE 0 +#define _PAM_SM_SETCRED 0 +#else +#undef PAM_SM_AUTH +#define PAM_SM_AUTH +#define _PAM_SM_AUTHENTICATE pam_sm_authenticate +#define _PAM_SM_SETCRED pam_sm_setcred +#endif +#if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_ACCOUNT) +#define _PAM_SM_ACCT_MGMT 0 +#else +#undef PAM_SM_ACCOUNT +#define PAM_SM_ACCOUNT +#define _PAM_SM_ACCT_MGMT pam_sm_acct_mgmt +#endif +#if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_SESSION) +#define _PAM_SM_OPEN_SESSION 0 +#define _PAM_SM_CLOSE_SESSION 0 +#else +#undef PAM_SM_SESSION +#define PAM_SM_SESSION +#define _PAM_SM_OPEN_SESSION pam_sm_open_session +#define _PAM_SM_CLOSE_SESSION pam_sm_close_session +#endif +#if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_PASSWORD) +#define _PAM_SM_CHAUTHTOK 0 +#else +#undef PAM_SM_PASSWORD +#define PAM_SM_PASSWORD +#define _PAM_SM_CHAUTHTOK pam_sm_chauthtok +#endif + +/* * Infrastructure for static modules using GCC linker sets. * You are not expected to understand this. */ @@ -227,8 +267,8 @@ #define PAM_MODULE_ENTRY(name) \ static char _pam_name[] = name PAM_SOEXT; \ static struct pam_module _pam_module = { _pam_name, { \ - pam_sm_authenticate, pam_sm_setcred, pam_sm_acct_mgmt, \ - pam_sm_open_session, pam_sm_close_session, pam_sm_chauthtok }, \ + _PAM_SM_AUTHENTICATE, _PAM_SM_SETCRED, _PAM_SM_ACCT_MGMT, \ + _PAM_SM_OPEN_SESSION, _PAM_SM_CLOSE_SESSION, _PAM_SM_CHAUTHTOK }, \ NULL, 0, NULL, NULL }; \ DATA_SET(_openpam_static_modules, _pam_module) #else ==== //depot/projects/openpam/include/security/pam_modules.h#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/include/security/pam_modules.h#6 $ + * $P4: //depot/projects/openpam/include/security/pam_modules.h#7 $ */ #ifndef _PAM_MODULES_H_INCLUDED @@ -49,41 +49,53 @@ * XSSO 4.2.2, 6 */ +#if defined(PAM_SM_ACCOUNT) PAM_EXTERN int pam_sm_acct_mgmt(pam_handle_t *_pamh, int _flags, int _argc, const char **_argv); +#endif +#if defined(PAM_SM_AUTH) PAM_EXTERN int pam_sm_authenticate(pam_handle_t *_pamh, int _flags, int _argc, const char **_argv); +#endif +#if defined(PAM_SM_PASSWORD) PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *_pamh, int _flags, int _argc, const char **_argv); +#endif +#if defined(PAM_SM_SESSION) PAM_EXTERN int pam_sm_close_session(pam_handle_t *_pamh, int _flags, int _args, const char **_argv); +#endif +#if defined(PAM_SM_SESSION) PAM_EXTERN int pam_sm_open_session(pam_handle_t *_pamh, int _flags, int _argc, const char **_argv); +#endif +#if defined(PAM_SM_AUTH) PAM_EXTERN int pam_sm_setcred(pam_handle_t *_pamh, int _flags, int _argc, const char **_argv); +#endif /* * Single Sign-On extensions To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 12 11:28:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52E0037B405; Fri, 12 Apr 2002 11:28:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 61E6B37B400 for ; Fri, 12 Apr 2002 11:28:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3CISGm52424 for perforce@freebsd.org; Fri, 12 Apr 2002 11:28:16 -0700 (PDT) (envelope-from des@freebsd.org) Date: Fri, 12 Apr 2002 11:28:16 -0700 (PDT) Message-Id: <200204121828.g3CISGm52424@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9624 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9624 Change 9624 by des@des.at.des.thinksec.com on 2002/04/12 11:27:47 Move the policy-loading code into a separate file. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/lib/Makefile#14 edit ... //depot/projects/openpam/lib/openpam_configure.c#1 add ... //depot/projects/openpam/lib/openpam_impl.h#13 edit ... //depot/projects/openpam/lib/pam_start.c#13 edit Differences ... ==== //depot/projects/openpam/lib/Makefile#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/Makefile#13 $ +# $P4: //depot/projects/openpam/lib/Makefile#14 $ # LIB = pam @@ -45,6 +45,7 @@ SRCS = SRCS += openpam_borrow_cred.c +SRCS += openpam_configure.c SRCS += openpam_dispatch.c SRCS += openpam_dynamic.c SRCS += openpam_findenv.c ==== //depot/projects/openpam/lib/openpam_impl.h#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_impl.h#12 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#13 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -105,6 +105,7 @@ #define PAM_OTHER "other" +int openpam_configure(pam_handle_t *, const char *); int openpam_dispatch(pam_handle_t *, int, int); int openpam_findenv(pam_handle_t *, const char *, size_t); int openpam_add_module(pam_handle_t *, int, int, ==== //depot/projects/openpam/lib/pam_start.c#13 (text+ko) ==== @@ -31,21 +31,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_start.c#12 $ + * $P4: //depot/projects/openpam/lib/pam_start.c#13 $ */ -#include -#include -#include #include -#include #include #include "openpam_impl.h" -static int _pam_configure_service(pam_handle_t *pamh, const char *service); - /* * XSSO 4.2.1 * XSSO 6 page 89 @@ -71,9 +65,9 @@ if ((r = pam_set_item(ph, PAM_CONV, pam_conv)) != PAM_SUCCESS) goto fail; - if ((r = _pam_configure_service(ph, service)) != PAM_SUCCESS && - r != PAM_BUF_ERR) - r = _pam_configure_service(ph, PAM_OTHER); + r = openpam_configure(ph, service); + if (r != PAM_SUCCESS && r != PAM_BUF_ERR) + r = openpam_configure(ph, PAM_OTHER); if (r != PAM_SUCCESS) goto fail; @@ -86,217 +80,12 @@ return (r); } -#define PAM_CONF_STYLE 0 -#define PAM_D_STYLE 1 -#define MAX_LINE_LEN 1024 -#define MAX_OPTIONS 256 - -static int -_pam_read_policy_file(pam_handle_t *pamh, - const char *service, - const char *filename, - int style) -{ - char buf[MAX_LINE_LEN], *p, *q; - const char *optv[MAX_OPTIONS + 1]; - int ch, chain, flag, line, optc, n, r; - size_t len; - FILE *f; - - n = 0; - - if ((f = fopen(filename, "r")) == NULL) { - openpam_log(errno == ENOENT ? PAM_LOG_DEBUG : PAM_LOG_NOTICE, - "%s: %m", filename); - return (0); - } - openpam_log(PAM_LOG_DEBUG, "looking for '%s' in %s", - service, filename); - - for (line = 1; fgets(buf, MAX_LINE_LEN, f) != NULL; ++line) { - if ((len = strlen(buf)) == 0) - continue; - - /* check for overflow */ - if (buf[--len] != '\n' && !feof(f)) { - openpam_log(PAM_LOG_ERROR, "%s: line %d too long", - filename, line); - openpam_log(PAM_LOG_ERROR, "%s: ignoring line %d", - filename, line); - while ((ch = fgetc(f)) != EOF) - if (ch == '\n') - break; - continue; - } - - /* strip comments and trailing whitespace */ - if ((p = strchr(buf, '#')) != NULL) - len = p - buf ? p - buf - 1 : p - buf; - while (len > 0 && isspace(buf[len - 1])) - --len; - if (len == 0) - continue; - buf[len] = '\0'; - p = q = buf; - - /* check service name */ - if (style == PAM_CONF_STYLE) { - for (q = p = buf; *q != '\0' && !isspace(*q); ++q) - /* nothing */; - if (*q == '\0') - goto syntax_error; - *q++ = '\0'; - if (strcmp(p, service) != 0) - continue; - openpam_log(PAM_LOG_DEBUG, "%s: line %d matches '%s'", - filename, line, service); - } - - - /* get module type */ - for (p = q; isspace(*p); ++p) - /* nothing */; - for (q = p; *q != '\0' && !isspace(*q); ++q) - /* nothing */; - if (q == p || *q == '\0') - goto syntax_error; - *q++ = '\0'; - if (strcmp(p, "auth") == 0) { - chain = PAM_AUTH; - } else if (strcmp(p, "account") == 0) { - chain = PAM_ACCOUNT; - } else if (strcmp(p, "session") == 0) { - chain = PAM_SESSION; - } else if (strcmp(p, "password") == 0) { - chain = PAM_PASSWORD; - } else { - openpam_log(PAM_LOG_ERROR, - "%s: invalid module type on line %d: '%s'", - filename, line, p); - continue; - } - - /* get control flag */ - for (p = q; isspace(*p); ++p) - /* nothing */; - for (q = p; *q != '\0' && !isspace(*q); ++q) - /* nothing */; - if (q == p || *q == '\0') - goto syntax_error; - *q++ = '\0'; - if (strcmp(p, "required") == 0) { - flag = PAM_REQUIRED; - } else if (strcmp(p, "requisite") == 0) { - flag = PAM_REQUISITE; - } else if (strcmp(p, "sufficient") == 0) { - flag = PAM_SUFFICIENT; - } else if (strcmp(p, "optional") == 0) { - flag = PAM_OPTIONAL; - } else { - openpam_log(PAM_LOG_ERROR, - "%s: invalid control flag on line %d: '%s'", - filename, line, p); - continue; - } - - /* get module name */ - for (p = q; isspace(*p); ++p) - /* nothing */; - for (q = p; *q != '\0' && !isspace(*q); ++q) - /* nothing */; - if (q == p) - goto syntax_error; - - /* get options */ - for (optc = 0; *q != '\0' && optc < MAX_OPTIONS; ++optc) { - *q++ = '\0'; - while (isspace(*q)) - ++q; - optv[optc] = q; - while (*q != '\0' && !isspace(*q)) - ++q; - } - optv[optc] = NULL; - if (*q != '\0') { - *q = '\0'; - openpam_log(PAM_LOG_ERROR, - "%s: too many options on line %d", - filename, line); - } - - /* - * Finally, add the module at the end of the - * appropriate chain and bump the counter. - */ - r = openpam_add_module(pamh, chain, flag, p, optc, optv); - if (r != PAM_SUCCESS) - return (-r); - ++n; - continue; - syntax_error: - openpam_log(PAM_LOG_ERROR, "%s: syntax error on line %d", - filename, line); - openpam_log(PAM_LOG_DEBUG, "%s: line %d: [%s]", - filename, line, q); - openpam_log(PAM_LOG_ERROR, "%s: ignoring line %d", - filename, line); - } - - if (ferror(f)) - openpam_log(PAM_LOG_ERROR, "%s: %m", filename); - - fclose(f); - return (n); -} - -static const char *_pam_policy_path[] = { - "/etc/pam.d/", - "/etc/pam.conf", - "/usr/local/etc/pam.d/", - NULL -}; - -static int -_pam_configure_service(pam_handle_t *pamh, - const char *service) -{ - const char **path; - char *filename; - size_t len; - int r; - - for (path = _pam_policy_path; *path != NULL; ++path) { - len = strlen(*path); - if ((*path)[len - 1] == '/') { - filename = malloc(len + strlen(service) + 1); - if (filename == NULL) { - openpam_log(PAM_LOG_ERROR, "malloc(): %m"); - return (PAM_BUF_ERR); - } - strcpy(filename, *path); - strcat(filename, service); - r = _pam_read_policy_file(pamh, - service, filename, PAM_D_STYLE); - free(filename); - } else { - r = _pam_read_policy_file(pamh, - service, *path, PAM_CONF_STYLE); - } - if (r < 0) - return (-r); - if (r > 0) - return (PAM_SUCCESS); - } - - return (PAM_SYSTEM_ERR); -} - /* * Error codes: * + * =openpam_configure * =pam_set_item * !PAM_SYMBOL_ERR - * PAM_SYSTEM_ERR * PAM_BUF_ERR */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 12 14:38:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D73F637B41A; Fri, 12 Apr 2002 14:38:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0CDA837B405 for ; Fri, 12 Apr 2002 14:38:13 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3CLcCa95359 for perforce@freebsd.org; Fri, 12 Apr 2002 14:38:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 12 Apr 2002 14:38:12 -0700 (PDT) Message-Id: <200204122138.g3CLcCa95359@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9631 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9631 Change 9631 by rwatson@rwatson_tislabs on 2002/04/12 14:37:43 Whitespace consistency fix for SEBSD: config options are optionsfoo#foo comment Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#19 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#19 (text+ko) ==== @@ -36,7 +36,7 @@ options MAC_MLS options MAC_NONE options MAC_TE -#options SEBSD #Warning, won't boot without a policy +#options SEBSD #Warning, won't boot without a policy options INET #InterNETworking #options INET6 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 12 14:40:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B328B37B41A; Fri, 12 Apr 2002 14:40:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DF4FE37B419 for ; Fri, 12 Apr 2002 14:40:15 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3CLeFk95711 for perforce@freebsd.org; Fri, 12 Apr 2002 14:40:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 12 Apr 2002 14:40:15 -0700 (PDT) Message-Id: <200204122140.g3CLeFk95711@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9632 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9632 Change 9632 by rwatson@rwatson_tislabs on 2002/04/12 14:39:34 INET6 no longer crashes the machine on boot, so re-enable. Proper labeling may not yet be complete in the INET6 stack, which could result in security problems if you rely on it being correct, or potentially crashes. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#20 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#20 (text+ko) ==== @@ -39,7 +39,7 @@ #options SEBSD #Warning, won't boot without a policy options INET #InterNETworking -#options INET6 +options INET6 options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options UFS_DIRHASH #Improve performance on big directories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 12 15:13: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CF8037B405; Fri, 12 Apr 2002 15:12:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F0D3C37B400 for ; Fri, 12 Apr 2002 15:12:55 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3CMCtl04212 for perforce@freebsd.org; Fri, 12 Apr 2002 15:12:55 -0700 (PDT) (envelope-from des@freebsd.org) Date: Fri, 12 Apr 2002 15:12:55 -0700 (PDT) Message-Id: <200204122212.g3CMCtl04212@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9634 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9634 Change 9634 by des@des.at.des.thinksec.com on 2002/04/12 15:12:46 Fix typo in openpam_log macro. Affected files ... ... //depot/projects/openpam/include/security/openpam.h#17 edit Differences ... ==== //depot/projects/openpam/include/security/openpam.h#17 (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#16 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#17 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED @@ -141,7 +141,7 @@ #define openpam_log(lvl, fmt, ...) \ _openpam_log((lvl), __func__, fmt, __VA_ARGS__) #elif defined(__GNUC__) && (__GNUC__ >= 2) && (__GNUC_MINOR__ >= 95) -#define openpam_log(lvl, fmt, ...) \ +#define openpam_log(lvl, fmt...) \ _openpam_log((lvl), __func__, fmt, ##fmt) #elif defined(__GNUC__) && defined(__FUNCTION__) #define openpam_log(lvl, fmt...) \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 12 18:12:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E57137B405; Fri, 12 Apr 2002 18:12:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B447A37B419 for ; Fri, 12 Apr 2002 18:12:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3D1CYA40687 for perforce@freebsd.org; Fri, 12 Apr 2002 18:12:34 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Fri, 12 Apr 2002 18:12:34 -0700 (PDT) Message-Id: <200204130112.g3D1CYA40687@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9641 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9641 Change 9641 by jake@jake_sparc64 on 2002/04/12 18:11:48 Simple fix for a program sent by art@openbsd.org, which just misaligns the stack pointer and then calls into the kernel. This causes it to catch a sigbus instead of spin forever, which still isn't really right, but better than nothing. Affected files ... ... //depot/projects/sparc64/sys/sparc64/sparc64/rwindow.c#10 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/sparc64/rwindow.c#10 (text+ko) ==== @@ -60,6 +60,8 @@ for (i = 0; i < n; i++) { CTR1(KTR_TRAP, "rwindow_load: usp=%#lx", usp); usp += SPOFF; + if ((error = (usp & 0x7)) != 0) + break; error = copyin((void *)usp, &rw, sizeof rw); usp = rw.rw_in[6]; } @@ -91,6 +93,8 @@ usp = *ausp; CTR1(KTR_TRAP, "rwindow_save: usp=%#lx", usp); usp += SPOFF; + if ((error = (usp & 0x7)) != 0) + break; error = copyout(rw, (void *)usp, sizeof *rw); if (error) break; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 13 8:27:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94DC737B416; Sat, 13 Apr 2002 08:27:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CE3E037B404 for ; Sat, 13 Apr 2002 08:27:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3DFRGW14275 for perforce@freebsd.org; Sat, 13 Apr 2002 08:27:16 -0700 (PDT) (envelope-from tmm@freebsd.org) Date: Sat, 13 Apr 2002 08:27:16 -0700 (PDT) Message-Id: <200204131527.g3DFRGW14275@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 9657 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9657 Change 9657 by tmm@tmm_sparc64 on 2002/04/13 08:26:41 Use pmap_extract() again for now to avoid the same problem that was also present in the pipe implementation. While being there, turn some diagnostic panics into KASSERT()s. Affected files ... ... //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#50 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#50 (text+ko) ==== @@ -336,20 +336,15 @@ void vmapbuf(struct buf *bp) { - vm_map_t map; - vm_map_entry_t me; - vm_object_t obj; - vm_pindex_t midx; - vm_prot_t prot, rprot; - boolean_t wired; + vm_prot_t prot; caddr_t addr, kva; int pidx; struct vm_page *m; + vm_offset_t phys; GIANT_REQUIRED; - if ((bp->b_flags & B_PHYS) == 0) - panic("vmapbuf"); + KASSERT((bp->b_flags & B_PHYS) != 0, ("vmapbuf: not a B_PHYS buffer")); /* * Use the d-cache color of b->b_data (the user space region) for the @@ -373,19 +368,16 @@ */ vm_fault_quick((addr >= (caddr_t)bp->b_saveaddr) ? addr : bp->b_saveaddr, prot); - map = &curproc->p_vmspace->vm_map; - if (vm_map_lookup(&map, (vm_offset_t)addr, prot, &me, &obj, - &midx, &rprot, &wired) != KERN_SUCCESS || - (m = vm_page_lookup(obj, midx)) == NULL) - panic("vmapbuf: page not present"); - vm_map_lookup_done(map, me); + phys = pmap_extract(&curproc->p_vmspace->vm_pmap, + (vm_offset_t)addr); + KASSERT(phys != 0, ("vmapbuf: page not present")); + m = PHYS_TO_VM_PAGE(phys); vm_page_hold(m); bp->b_pages[pidx] = m; pmap_enter(kernel_pmap, (vm_offset_t)kva, m, VM_PROT_READ | VM_PROT_WRITE, TRUE); } - if (pidx > btoc(MAXPHYS)) - panic("vmapbuf: mapped more than MAXPHYS"); + KASSERT(pidx <= btoc(MAXPHYS), ("vmapbuf: mapped more than MAXPHYS")); bp->b_npages = pidx; } @@ -403,8 +395,8 @@ GIANT_REQUIRED; - if ((bp->b_flags & B_PHYS) == 0) - panic("vunmapbuf"); + KASSERT((bp->b_flags & B_PHYS) != 0, + ("vunmapbuf: not a B_PHYS buffer")); npages = bp->b_npages; kva = trunc_page((vm_offset_t)bp->b_data); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 13 12:45:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A41BE37B404; Sat, 13 Apr 2002 12:45:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E043F37B400 for ; Sat, 13 Apr 2002 12:45:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3DJjbQ70016 for perforce@freebsd.org; Sat, 13 Apr 2002 12:45:37 -0700 (PDT) (envelope-from tmm@freebsd.org) Date: Sat, 13 Apr 2002 12:45:37 -0700 (PDT) Message-Id: <200204131945.g3DJjbQ70016@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 9665 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9665 Change 9665 by tmm@tmm_sparc64 on 2002/04/13 12:45:19 The CVS version still uses the old (and more correct) pmap_extract() code to get the physical address, so reduce unnecessary diffs to it. Affected files ... ... //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#51 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#51 (text+ko) ==== @@ -338,14 +338,16 @@ { vm_prot_t prot; caddr_t addr, kva; + vm_offset_t pa; int pidx; struct vm_page *m; - vm_offset_t phys; + pmap_t pmap; GIANT_REQUIRED; KASSERT((bp->b_flags & B_PHYS) != 0, ("vmapbuf: not a B_PHYS buffer")); + pmap = &curproc->p_vmspace->vm_pmap; /* * Use the d-cache color of b->b_data (the user space region) for the * kva region too, to avoid illegal cache aliases which would require @@ -368,10 +370,9 @@ */ vm_fault_quick((addr >= (caddr_t)bp->b_saveaddr) ? addr : bp->b_saveaddr, prot); - phys = pmap_extract(&curproc->p_vmspace->vm_pmap, - (vm_offset_t)addr); - KASSERT(phys != 0, ("vmapbuf: page not present")); - m = PHYS_TO_VM_PAGE(phys); + pa = pmap_extract(pmap, (vm_offset_t)addr); + KASSERT(pa != 0, ("vmapbuf: page not present")); + m = PHYS_TO_VM_PAGE(pa); vm_page_hold(m); bp->b_pages[pidx] = m; pmap_enter(kernel_pmap, (vm_offset_t)kva, m, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 13 18:34:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F2CC37B41C; Sat, 13 Apr 2002 18:33:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2E85837B405 for ; Sat, 13 Apr 2002 18:33:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3E1Wx040354 for perforce@freebsd.org; Sat, 13 Apr 2002 18:32:59 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sat, 13 Apr 2002 18:32:59 -0700 (PDT) Message-Id: <200204140132.g3E1Wx040354@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9684 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9684 Change 9684 by jake@jake_sparc64 on 2002/04/13 18:32:50 Integ@9862. Affected files ... ... //depot/projects/sparc64/Makefile.inc1#7 integrate ... //depot/projects/sparc64/UPDATING#4 integrate ... //depot/projects/sparc64/bin/pax/options.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/ChangeLog#3 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/Makefile.am#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/aclocal.m4#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/aout-tic30.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/aoutx.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/archive.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/archures.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/bfd-in2.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/coff-arm.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/coff-mips.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/coff-tic30.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/coff-z8k.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/coffcode.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/cofflink.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/config.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/configure#3 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/configure.in#3 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/cpu-i386.c#3 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/cpu-mips.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/cpu-sparc.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/cpu-v850.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/cpu-z8k.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/dep-in.sed#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/doc/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/doc/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/dwarf2.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/ecoff.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf-bfd.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf32-arm.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf32-i386.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf32-mips.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf32-sparc.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf32-v850.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf64-alpha.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf64-mips.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf64-ppc.c#3 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf64-sparc.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elf64-x86-64.c#3 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elflink.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elflink.h#3 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elfxx-ia64.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/elfxx-target.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/i386linux.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/ihex.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/libbfd.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/libbfd.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/libpei.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/linker.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/merge.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/mipsbsd.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/pe-mips.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/peicode.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/sparclinux.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/srec.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/sunos.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/syms.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/version.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/xcoff-target.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/bfd/xcofflink.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/ChangeLog#3 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/Makefile.am#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/aclocal.m4#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/configure#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/configure.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/dep-in.sed#2 integrate ... //depot/projects/sparc64/contrib/binutils/binutils/unwind-ia64.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/ChangeLog#3 integrate ... //depot/projects/sparc64/contrib/binutils/gas/Makefile.am#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/aclocal.m4#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/as.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/atof-vax.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/obj-elf.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/tc-arm.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/tc-i386.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/tc-i386.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/tc-ia64.c#3 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/tc-ia64.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/tc-tic30.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/tc-v850.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/tc-v850.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/config/tc-z8k.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/dep-in.sed#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/doc/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/doc/c-sh.texi#2 integrate ... //depot/projects/sparc64/contrib/binutils/gas/write.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/include/opcode/mips.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/include/opcode/v850.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/ChangeLog#3 integrate ... //depot/projects/sparc64/contrib/binutils/ld/Makefile.am#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/configure.host#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/dep-in.sed#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emulparams/elf32bmip.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emulparams/elf32bmipn32.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emulparams/elf32bsmip.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emulparams/elf32ebmip.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emulparams/elf32elmip.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emulparams/elf32lmip.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emulparams/elf32lsmip.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emulparams/elf64bmip.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emulparams/shelf.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emulparams/shelf_linux.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emulparams/shl.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/emulparams/shlelf.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/genscripts.sh#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/ldlang.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/ldmain.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/scripttempl/elf.sc#2 integrate ... //depot/projects/sparc64/contrib/binutils/ld/scripttempl/v850.sc#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/ChangeLog#3 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/Makefile.am#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/aclocal.m4#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/config.in#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/configure#3 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/dep-in.sed#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/ppc-opc.c#3 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/v850-dis.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/v850-opc.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/z8k-dis.c#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/z8k-opc.h#2 integrate ... //depot/projects/sparc64/contrib/binutils/opcodes/z8kgen.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/toplev.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#6 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_modules.h#5 integrate ... //depot/projects/sparc64/crypto/openssh/myproposal.h#3 integrate ... //depot/projects/sparc64/crypto/openssh/servconf.c#4 integrate ... //depot/projects/sparc64/etc/defaults/rc.conf#5 integrate ... //depot/projects/sparc64/etc/inetd.conf#3 integrate ... //depot/projects/sparc64/etc/isdn/holidays.D#2 integrate ... //depot/projects/sparc64/etc/mtree/BSD.local.dist#4 integrate ... //depot/projects/sparc64/etc/pam.d/rsh#2 integrate ... //depot/projects/sparc64/etc/rc.network#4 integrate ... //depot/projects/sparc64/etc/sendmail/rc.sendmail#2 integrate ... //depot/projects/sparc64/games/hack/hack.ioctl.c#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/Makefile#12 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/Makefile.inc0#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/binutils/gdb/alpha/nm.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/collect2/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/gperf/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/devices/grodvi/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/devices/grohtml/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/devices/grolbp/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/devices/grolj4/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/devices/grops/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/devices/grotty/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/preproc/eqn/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/preproc/grn/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/preproc/html/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/preproc/pic/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/preproc/refer/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/preproc/soelim/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/preproc/tbl/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/roff/groff/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/roff/troff/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/utils/addftinfo/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/utils/indxbib/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/utils/lkbib/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/utils/lookbib/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/man/man/man.c#2 integrate ... //depot/projects/sparc64/lib/csu/alpha/crt1.c#4 integrate ... //depot/projects/sparc64/lib/libc/ia64/gen/Makefile.inc#4 integrate ... //depot/projects/sparc64/lib/libc/ia64/gen/unwind.c#1 branch ... //depot/projects/sparc64/lib/libc/locale/Makefile.inc#3 integrate ... //depot/projects/sparc64/lib/libc/locale/nl_langinfo.3#3 integrate ... //depot/projects/sparc64/lib/libc/stdio/scanf.3#4 integrate ... //depot/projects/sparc64/lib/libc/sys/fcntl.2#5 integrate ... //depot/projects/sparc64/lib/libpam/libpam/Makefile#3 integrate ... //depot/projects/sparc64/lib/libpam/libpam/pam_debug_log.c#2 integrate ... //depot/projects/sparc64/lib/libpam/libpam/security/pam_mod_misc.h#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/Makefile.inc#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/modules.inc#4 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_deny/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_deny/pam_deny.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_ftp/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_ftp/pam_ftp.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_kerberosIV/Makefile#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_kerberosIV/klogin.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_kerberosIV/klogin.h#1 branch ... //depot/projects/sparc64/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_krb5/Makefile#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_krb5/pam_krb5.c#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_lastlog/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_login_access/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_login_access/pam_login_access.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_nologin/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_nologin/pam_nologin.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_opie/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_opie/pam_opie.c#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_opieaccess/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_passwdqc/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_permit/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_permit/pam_permit.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_radius/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_radius/pam_radius.c#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_rhosts/Makefile#1 branch ... //depot/projects/sparc64/lib/libpam/modules/pam_rhosts/pam_rhosts.8#1 branch ... //depot/projects/sparc64/lib/libpam/modules/pam_rhosts/pam_rhosts.c#1 branch ... //depot/projects/sparc64/lib/libpam/modules/pam_rootok/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_rootok/pam_rootok.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_securetty/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_securetty/pam_securetty.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_self/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_self/pam_self.8#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_self/pam_self.c#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_ssh/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_ssh/pam_ssh.c#4 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_tacplus/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_tacplus/pam_tacplus.c#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_unix/Makefile#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_unix/pam_unix.c#4 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_wheel/Makefile#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_wheel/pam_wheel.c#2 integrate ... //depot/projects/sparc64/lib/libstand/sparc64/_setjmp.S#2 integrate ... //depot/projects/sparc64/lib/libypclnt/Makefile#1 branch ... //depot/projects/sparc64/lib/libypclnt/ypclnt.h#1 branch ... //depot/projects/sparc64/lib/libypclnt/ypclnt_connect.c#1 branch ... //depot/projects/sparc64/lib/libypclnt/ypclnt_error.c#1 branch ... //depot/projects/sparc64/lib/libypclnt/ypclnt_free.c#1 branch ... //depot/projects/sparc64/lib/libypclnt/ypclnt_get.c#1 branch ... //depot/projects/sparc64/lib/libypclnt/ypclnt_new.c#1 branch ... //depot/projects/sparc64/lib/libypclnt/ypclnt_passwd.c#1 branch ... //depot/projects/sparc64/libexec/tftpd/tftpd.c#3 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/errata/article.sgml#2 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#2 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#3 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#3 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/readme/article.sgml#3 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#3 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate ... //depot/projects/sparc64/release/i386/mkisoimages.sh#2 integrate ... //depot/projects/sparc64/sbin/dhclient/Makefile.inc#2 integrate ... //depot/projects/sparc64/sbin/natd/Makefile#2 integrate ... //depot/projects/sparc64/sbin/restore/restore.8#2 integrate ... //depot/projects/sparc64/sbin/route/Makefile#2 integrate ... //depot/projects/sparc64/sbin/savecore/savecore.c#6 integrate ... //depot/projects/sparc64/share/examples/netgraph/ether.bridge#2 integrate ... //depot/projects/sparc64/share/man/man4/tap.4#2 integrate ... //depot/projects/sparc64/share/man/man4/tcp.4#2 integrate ... //depot/projects/sparc64/share/man/man5/make.conf.5#5 integrate ... //depot/projects/sparc64/share/man/man9/Makefile#4 integrate ... //depot/projects/sparc64/share/man/man9/VFS_VGET.9#2 integrate ... //depot/projects/sparc64/share/man/man9/VOP_GETEXTATTR.9#2 integrate ... //depot/projects/sparc64/share/man/man9/critical_enter.9#2 integrate ... //depot/projects/sparc64/share/man/man9/lock.9#3 integrate ... //depot/projects/sparc64/share/man/man9/mutex.9#4 integrate ... //depot/projects/sparc64/share/man/man9/random.9#2 integrate ... //depot/projects/sparc64/share/man/man9/random_harvest.9#3 integrate ... //depot/projects/sparc64/share/man/man9/rijndael.9#3 integrate ... //depot/projects/sparc64/share/man/man9/scheduler.9#2 integrate ... //depot/projects/sparc64/share/man/man9/selrecord.9#1 branch ... //depot/projects/sparc64/share/man/man9/sx.9#4 integrate ... //depot/projects/sparc64/share/mk/bsd.README#3 integrate ... //depot/projects/sparc64/share/mk/bsd.libnames.mk#7 integrate ... //depot/projects/sparc64/share/mk/bsd.obj.mk#3 integrate ... //depot/projects/sparc64/share/mk/bsd.prog.mk#8 integrate ... //depot/projects/sparc64/sys/alpha/alpha/db_instruction.h#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/machdep.c#27 integrate ... //depot/projects/sparc64/sys/alpha/conf/GENERIC#16 integrate ... //depot/projects/sparc64/sys/alpha/include/endian.h#8 integrate ... //depot/projects/sparc64/sys/alpha/osf1/osf1_misc.c#12 integrate ... //depot/projects/sparc64/sys/alpha/pci/lca_pci.c#3 integrate ... //depot/projects/sparc64/sys/boot/common/module.c#4 integrate ... //depot/projects/sparc64/sys/boot/efi/libefi/efifs.c#6 integrate ... //depot/projects/sparc64/sys/boot/i386/boot2/boot2.c#7 integrate ... //depot/projects/sparc64/sys/boot/i386/kgzldr/Makefile#2 integrate ... //depot/projects/sparc64/sys/compat/linprocfs/linprocfs.c#16 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_misc.c#14 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_uid16.c#6 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_sysvec.c#4 integrate ... //depot/projects/sparc64/sys/conf/files#52 integrate ... //depot/projects/sparc64/sys/conf/files.alpha#12 integrate ... //depot/projects/sparc64/sys/conf/files.ia64#14 integrate ... //depot/projects/sparc64/sys/conf/options.alpha#4 integrate ... //depot/projects/sparc64/sys/conf/options.ia64#4 integrate ... //depot/projects/sparc64/sys/ddb/db_ps.c#6 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-dma.c#28 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-pci.c#28 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-raid.c#19 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-raid.h#12 integrate ... //depot/projects/sparc64/sys/dev/ciss/ciss.c#4 integrate ... //depot/projects/sparc64/sys/dev/fb/fb.c#3 integrate ... //depot/projects/sparc64/sys/dev/fb/fbreg.h#4 integrate ... //depot/projects/sparc64/sys/dev/fb/gfb.c#2 integrate ... //depot/projects/sparc64/sys/dev/fb/tga.c#2 integrate ... //depot/projects/sparc64/sys/dev/gfb/gfb_pci.c#3 integrate ... //depot/projects/sparc64/sys/dev/nge/if_nge.c#9 integrate ... //depot/projects/sparc64/sys/dev/nge/if_ngereg.h#3 integrate ... //depot/projects/sparc64/sys/dev/pccard/pccarddevs#14 integrate ... //depot/projects/sparc64/sys/dev/pccard/pccarddevs.h#14 integrate ... //depot/projects/sparc64/sys/dev/pccbb/pccbb.c#11 integrate ... //depot/projects/sparc64/sys/dev/pccbb/pccbbreg.h#5 integrate ... //depot/projects/sparc64/sys/dev/pci/pci_pci.c#11 integrate ... //depot/projects/sparc64/sys/dev/sound/pcm/feeder_fmt.c#3 integrate ... //depot/projects/sparc64/sys/dev/syscons/scgfbrndr.c#3 integrate ... //depot/projects/sparc64/sys/dev/syscons/syscons.c#11 integrate ... //depot/projects/sparc64/sys/dev/syscons/syscons.h#3 integrate ... //depot/projects/sparc64/sys/dev/usb/umass.c#14 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wavelan_ieee.h#5 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wi.c#23 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wi_pccard.c#2 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wi_pci.c#2 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wireg.h#11 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wivar.h#2 integrate ... //depot/projects/sparc64/sys/dev/wi/wi_hostap.c#1 branch ... //depot/projects/sparc64/sys/dev/wi/wi_hostap.h#1 branch ... //depot/projects/sparc64/sys/fs/procfs/procfs_ctl.c#9 integrate ... //depot/projects/sparc64/sys/fs/procfs/procfs_dbregs.c#7 integrate ... //depot/projects/sparc64/sys/fs/procfs/procfs_fpregs.c#7 integrate ... //depot/projects/sparc64/sys/fs/procfs/procfs_mem.c#4 integrate ... //depot/projects/sparc64/sys/fs/procfs/procfs_regs.c#7 integrate ... //depot/projects/sparc64/sys/fs/procfs/procfs_status.c#10 integrate ... //depot/projects/sparc64/sys/fs/smbfs/smbfs_vnops.c#8 integrate ... //depot/projects/sparc64/sys/i386/i386/machdep.c#29 integrate ... //depot/projects/sparc64/sys/i386/include/cpufunc.h#14 integrate ... //depot/projects/sparc64/sys/ia64/ia32/Makefile#1 branch ... //depot/projects/sparc64/sys/ia64/ia32/ia32_proto.h#1 branch ... //depot/projects/sparc64/sys/ia64/ia32/ia32_syscall.h#1 branch ... //depot/projects/sparc64/sys/ia64/ia32/ia32_sysent.c#1 branch ... //depot/projects/sparc64/sys/ia64/ia32/imgact_ia32.c#1 branch ... //depot/projects/sparc64/sys/ia64/ia32/imgact_ia32.h#1 branch ... //depot/projects/sparc64/sys/ia64/ia32/syscalls.conf#1 branch ... //depot/projects/sparc64/sys/ia64/ia32/syscalls.master#1 branch ... //depot/projects/sparc64/sys/ia64/ia64/machdep.c#36 integrate ... //depot/projects/sparc64/sys/ia64/ia64/mp_machdep.c#14 integrate ... //depot/projects/sparc64/sys/ia64/ia64/support.s#7 integrate ... //depot/projects/sparc64/sys/ia64/ia64/swtch.s#9 integrate ... //depot/projects/sparc64/sys/ia64/ia64/trap.c#21 integrate ... //depot/projects/sparc64/sys/ia64/include/ia64_cpu.h#8 integrate ... //depot/projects/sparc64/sys/ia64/include/pcb.h#3 integrate ... //depot/projects/sparc64/sys/ia64/include/signal.h#3 integrate ... //depot/projects/sparc64/sys/ia64/include/stdarg.h#2 integrate ... //depot/projects/sparc64/sys/kern/init_sysent.c#16 integrate ... //depot/projects/sparc64/sys/kern/kern_descrip.c#20 integrate ... //depot/projects/sparc64/sys/kern/kern_intr.c#15 integrate ... //depot/projects/sparc64/sys/kern/kern_ktrace.c#10 integrate ... //depot/projects/sparc64/sys/kern/kern_prot.c#27 integrate ... //depot/projects/sparc64/sys/kern/kern_resource.c#16 integrate ... //depot/projects/sparc64/sys/kern/kern_sig.c#24 integrate ... //depot/projects/sparc64/sys/kern/sys_pipe.c#17 integrate ... //depot/projects/sparc64/sys/kern/sys_process.c#17 integrate ... //depot/projects/sparc64/sys/kern/syscalls.c#15 integrate ... //depot/projects/sparc64/sys/kern/syscalls.master#14 integrate ... //depot/projects/sparc64/sys/kern/uipc_mbuf.c#5 integrate ... //depot/projects/sparc64/sys/libkern/bsearch.c#4 integrate ... //depot/projects/sparc64/sys/modules/wi/Makefile#5 integrate ... //depot/projects/sparc64/sys/net/if_ef.c#4 integrate ... //depot/projects/sparc64/sys/net/if_ieee80211.h#2 integrate ... //depot/projects/sparc64/sys/net/if_media.h#3 integrate ... //depot/projects/sparc64/sys/netinet/in.h#10 integrate ... //depot/projects/sparc64/sys/netinet/ip_ecn.c#2 integrate ... //depot/projects/sparc64/sys/netinet/tcp_input.c#15 integrate ... //depot/projects/sparc64/sys/netinet/tcp_subr.c#15 integrate ... //depot/projects/sparc64/sys/pc98/i386/machdep.c#25 integrate ... //depot/projects/sparc64/sys/pci/if_rl.c#9 integrate ... //depot/projects/sparc64/sys/pci/if_rlreg.h#4 integrate ... //depot/projects/sparc64/sys/powerpc/include/endian.h#7 integrate ... //depot/projects/sparc64/sys/security/lomac/kernel_log.c#3 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/machdep.c#76 edit ... //depot/projects/sparc64/sys/sys/fbio.h#2 integrate ... //depot/projects/sparc64/sys/sys/syscall.h#15 integrate ... //depot/projects/sparc64/sys/sys/syscall.mk#15 integrate ... //depot/projects/sparc64/sys/sys/sysproto.h#17 integrate ... //depot/projects/sparc64/tools/make_libdeps.sh#1 branch ... //depot/projects/sparc64/usr.bin/Makefile#20 integrate ... //depot/projects/sparc64/usr.bin/doscmd/cwd.c#2 integrate ... //depot/projects/sparc64/usr.bin/doscmd/dos.h#2 integrate ... //depot/projects/sparc64/usr.bin/doscmd/ems.c#2 integrate ... //depot/projects/sparc64/usr.bin/doscmd/emuint.c#2 integrate ... //depot/projects/sparc64/usr.bin/doscmd/emuint.h#2 integrate ... //depot/projects/sparc64/usr.bin/doscmd/trace.c#2 integrate ... //depot/projects/sparc64/usr.bin/doscmd/tty.c#3 integrate ... //depot/projects/sparc64/usr.bin/doscmd/xms.c#2 integrate ... //depot/projects/sparc64/usr.bin/doscmd/xms.h#2 integrate ... //depot/projects/sparc64/usr.bin/find/operator.c#5 integrate ... //depot/projects/sparc64/usr.bin/fstat/fstat.1#3 integrate ... //depot/projects/sparc64/usr.bin/gcore/gcore.c#3 integrate ... //depot/projects/sparc64/usr.bin/kdump/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/limits/limits.c#2 integrate ... //depot/projects/sparc64/usr.bin/make/Makefile#3 integrate ... //depot/projects/sparc64/usr.bin/make/arch.c#3 integrate ... //depot/projects/sparc64/usr.bin/make/buf.c#2 integrate ... //depot/projects/sparc64/usr.bin/make/buf.h#3 integrate ... //depot/projects/sparc64/usr.bin/make/compat.c#3 integrate ... //depot/projects/sparc64/usr.bin/make/cond.c#3 integrate ... //depot/projects/sparc64/usr.bin/make/config.h#2 integrate ... //depot/projects/sparc64/usr.bin/make/dir.c#3 integrate ... //depot/projects/sparc64/usr.bin/make/dir.h#3 integrate ... //depot/projects/sparc64/usr.bin/make/for.c#3 integrate ... //depot/projects/sparc64/usr.bin/make/hash.c#3 integrate ... //depot/projects/sparc64/usr.bin/make/hash.h#3 integrate ... //depot/projects/sparc64/usr.bin/make/job.c#3 integrate ... //depot/projects/sparc64/usr.bin/make/job.h#3 integrate ... //depot/projects/sparc64/usr.bin/make/list.h#2 integrate ... //depot/projects/sparc64/usr.bin/make/lst.h#4 integrate ... //depot/projects/sparc64/usr.bin/make/main.c#4 integrate ... //depot/projects/sparc64/usr.bin/make/make.1#2 integrate ... //depot/projects/sparc64/usr.bin/make/make.c#3 integrate ... //depot/projects/sparc64/usr.bin/make/make.h#3 integrate ... //depot/projects/sparc64/usr.bin/make/nonints.h#3 integrate ... //depot/projects/sparc64/usr.bin/make/parse.c#4 integrate ... //depot/projects/sparc64/usr.bin/make/pathnames.h#2 integrate ... //depot/projects/sparc64/usr.bin/make/sprite.h#2 integrate ... //depot/projects/sparc64/usr.bin/make/str.c#2 integrate ... //depot/projects/sparc64/usr.bin/make/suff.c#3 integrate ... //depot/projects/sparc64/usr.bin/make/targ.c#4 integrate ... //depot/projects/sparc64/usr.bin/make/var.c#3 integrate ... //depot/projects/sparc64/usr.bin/mkstr/mkstr.1#2 integrate ... //depot/projects/sparc64/usr.bin/mkstr/mkstr.c#3 integrate ... //depot/projects/sparc64/usr.bin/msgs/msgs.1#2 integrate ... //depot/projects/sparc64/usr.bin/msgs/msgs.c#3 integrate ... //depot/projects/sparc64/usr.bin/mt/mt.1#2 integrate ... //depot/projects/sparc64/usr.bin/mt/mt.c#4 integrate ... //depot/projects/sparc64/usr.bin/passwd/Makefile#3 integrate ... //depot/projects/sparc64/usr.bin/sed/compile.c#3 integrate ... //depot/projects/sparc64/usr.bin/systat/pigs.c#3 integrate ... //depot/projects/sparc64/usr.bin/tail/reverse.c#4 integrate ... //depot/projects/sparc64/usr.bin/tftp/main.c#3 integrate ... //depot/projects/sparc64/usr.bin/tftp/tftp.1#2 integrate ... //depot/projects/sparc64/usr.bin/tftp/tftp.c#4 integrate ... //depot/projects/sparc64/usr.bin/tftp/tftpsubs.c#2 integrate ... //depot/projects/sparc64/usr.bin/truss/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/vmstat/vmstat.c#5 integrate ... //depot/projects/sparc64/usr.sbin/amd/include/Makefile#2 integrate ... //depot/projects/sparc64/usr.sbin/cron/lib/misc.c#2 integrate ... //depot/projects/sparc64/usr.sbin/kldxref/ef.c#2 integrate ... //depot/projects/sparc64/usr.sbin/kldxref/ef.h#2 integrate ... //depot/projects/sparc64/usr.sbin/rpc.lockd/lockd.c#3 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/cdrom.c#2 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/index.c#3 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/sysinstall.h#4 integrate Differences ... ==== //depot/projects/sparc64/Makefile.inc1#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.251 2002/04/08 15:11:29 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.255 2002/04/13 07:24:14 des Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -123,17 +123,21 @@ MAKEOBJDIRPREFIX?= /usr/obj TARGET_ARCH?= ${MACHINE_ARCH} +.if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} +.else +TARGET?= ${TARGET_ARCH} +.endif .if make(buildworld) BUILD_ARCH!= sysctl -n hw.machine_arch .if ${MACHINE_ARCH} != ${BUILD_ARCH} .error To cross-build, set TARGET_ARCH. .endif .endif -.if ${MACHINE_ARCH} == ${TARGET_ARCH} +.if ${MACHINE} == ${TARGET} OBJTREE= ${MAKEOBJDIRPREFIX} .else -OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET_ARCH} +OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/${MACHINE_ARCH} # /usr/games added for fortune which depend on strfile @@ -242,6 +246,10 @@ @echo "--------------------------------------------------------------" .if !defined(NOCLEAN) rm -rf ${WORLDTMP} +.else + # XXX - These two can depend on any header file. + rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c + rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in ${USRDIRS} mkdir -p ${WORLDTMP}/${_dir} @@ -375,13 +383,6 @@ .endif INSTKERNNAME?= kernel -# The only exotic TARGET_ARCH/TARGET combination valid at this -# time is i386/pc98. In all other cases set TARGET equal to -# TARGET_ARCH. -.if ${TARGET_ARCH} != "i386" || ${TARGET} != "pc98" -TARGET= ${TARGET_ARCH} -.endif - KRNLSRCDIR= ${.CURDIR}/sys KRNLCONFDIR= ${KRNLSRCDIR}/${TARGET}/conf KRNLOBJDIR= ${OBJTREE}${KRNLSRCDIR} @@ -710,77 +711,74 @@ cd ${.CURDIR}/lib/libutil; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libvgl; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libwrap; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libypclnt; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libz; ${MAKE} beforeinstall cd ${.CURDIR}/usr.bin/lex; ${MAKE} beforeinstall # # libraries - build all libraries, and install them under ${DESTDIR}. # -# The following dependencies exist between the libraries: +# The list of libraries with dependents (${_prebuild_libs}) and their +# interdependencies (__L) are built automatically by the +# ${.CURDIR}/tools/make_libdeps.sh script. # -# lib*: csu libgcc_pic -# libatm: libmd -# libcam: libsbuf -# libcrypt: libmd -# libdevstat: libkvm -# libdialog: libncurses -# libedit: libncurses -# libg++: msun -# libkrb: libcrypt -# libopie: libmd -# libpam: libcom_err libcrypt libcrypto libkrb libopie libradius \ -# librpcsvc libtacplus libutil libz libssh -# libradius: libmd -# libreadline: libncurses -# libssh: libcrypto libz -# libstc++: msun -# libtacplus: libmd -# -# Across directories this comes down to (rougly): -# -# gnu/lib: lib/msun lib/libncurses -# kerberosIV/lib kerberos5/lib: lib/libcrypt -# lib/libpam: secure/lib/libcrypto kerberosIV/lib/libkrb \ -# secure/lib/libssh lib/libz -# secure/lib: secure/lib/libcrypto lib/libmd lib/libz -# +libraries: + cd ${.CURDIR}; \ + ${MAKE} -f Makefile.inc1 _startup_libs; \ + ${MAKE} -f Makefile.inc1 _prebuild_libs; \ + ${MAKE} -f Makefile.inc1 _generic_libs; + .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}.pcc) -_csu= lib/csu/${MACHINE_ARCH}.pcc +_startup_libs= lib/csu/${MACHINE_ARCH}.pcc .elif ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" -_csu= lib/csu/i386-elf +_startup_libs= lib/csu/i386-elf .else -_csu= lib/csu/${MACHINE_ARCH} +_startup_libs= lib/csu/${MACHINE_ARCH} .endif +_startup_libs+= gnu/lib/csu gnu/lib/libgcc + +_prebuild_libs= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ + lib/libncurses lib/libopie lib/libradius lib/librpcsvc \ + lib/libsbuf lib/libtacplus lib/libutil lib/libz lib/msun + +lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L + +_generic_libs= lib gnu/lib -.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) -_secure_lib= secure/lib -.if exists(${.CURDIR}/secure/lib/libcrypto) -_libcrypto= secure/lib/libcrypto +.if !defined(NOPERL) && !defined(NO_PERL) +_generic_libs+= gnu/usr.bin/perl/libperl .endif + +.if !defined(NOCRYPT) +.if defined(MAKE_KERBEROS4) +_prebuild_libs+= kerberosIV/lib/libkrb +kerberosIV/lib/libkrb__L: lib/libcrypt__L +_generic_libs+= kerberosIV/lib .endif - -.if !defined(NOCRYPT) && defined(MAKE_KERBEROS4) -_kerberosIV_lib= kerberosIV/lib +.if defined(MAKE_KERBEROS5) +_prebuild_libs+= kerberos5/lib/libasn1 +_prebuild_libs+= kerberos5/lib/libgssapi +_prebuild_libs+= kerberos5/lib/libkrb5 +_prebuild_libs+= kerberos5/lib/libroken +_generic_libs+= kerberos5/lib .endif - -.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5) -_kerberos5_lib= kerberos5/lib +.if !defined(NOSECURE) +_prebuild_libs+= secure/lib/libcrypto +.if !defined(NO_OPENSSH) +_prebuild_libs+= secure/lib/libssh +secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L .endif +_generic_libs+= secure/lib +.endif !defined(NOSECURE) +.endif !defined(NOCRYPT) +_generic_libs+= usr.bin/lex/lib .if ${MACHINE_ARCH} == "i386" -_libkeycap= usr.sbin/pcvt/keycap +_generic_libs+= usr.sbin/pcvt/keycap .endif -.if !defined(NOPERL) && !defined(NO_PERL) -_libperl= gnu/usr.bin/perl/libperl -.endif - -libraries: -.for _lib in ${_csu} gnu/lib/csu gnu/lib/libgcc lib/libmd lib/libcrypt \ - lib/libz ${_libcrypto} ${_secure_lib} ${_kerberosIV_lib} \ - ${_kerberos5_lib} lib/libcom_err lib/libkvm lib/msun lib/libncurses \ - lib/libopie lib/libradius lib/librpcsvc lib/libsbuf lib/libtacplus \ - lib/libutil lib gnu/lib ${_libperl} usr.bin/lex/lib ${_libkeycap} +.for _lib in ${_startup_libs} ${_prebuild_libs} ${_generic_libs} +${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) cd ${.CURDIR}/${_lib}; \ ${MAKE} depend; \ @@ -789,6 +787,10 @@ .endif .endfor +_startup_libs: ${_startup_libs:S/$/__L/} +_prebuild_libs: ${_prebuild_libs:S/$/__L/} +_generic_libs: ${_generic_libs:S/$/__L/} + .for __target in clean cleandepend cleandir depend obj .for entry in ${SUBDIR} ${entry}.${__target}__D: .PHONY ==== //depot/projects/sparc64/UPDATING#4 (text+ko) ==== @@ -1,9 +1,8 @@ Updating Information for FreeBSD current users This file is maintained and copyrighted by M. Warner Losh -. Please send new entries directly to him. See end -of file for further details. For commonly done items, please see the -COMMON ITEMS: section later in the file. +. See end of file for further details. For commonly +done items, please see the COMMON ITEMS: section later in the file. NOTE TO PEOPLE WHO THINK THAT 5.0-CURRENT IS SLOW: FreeBSD 5.0-CURRENT has many debugging features turned on, in @@ -802,6 +801,11 @@ of the config file has changed as well. Please see GENERIC or NEWCARD for examples of the new format. + Indirectly, this also breaks USERCONFIG. Unless a newer entry + says that it has been fixed, assume that must use the hints mechanism + in the loader if you need to use a machine with very old ISA cards + in it. + 20000522: A new set of binutils went into the tree today. Anybody building a kernel after this point is advised that they need @@ -973,16 +977,13 @@ and it only starts on March 15, 2000. Updating files can found in previous releases if your system is older than this. -Please filter your entries through Warner Losh (imp@village.org) so -that the style, formatting, etc of this file can be maintained. - Copyright information: -Copyright 1998, 2001 M. Warner Losh. All Rights Reserved. +Copyright 1998, 2002 M. Warner Losh. All Rights Reserved. Redistribution, publication, translation and use, with or without modification, in full or in part, in any form or format of this -document are permitted. +document are permitted without further permission from the author. THIS DOCUMENT IS PROVIDED BY WARNER LOSH ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -1002,4 +1003,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.197 2002/04/05 07:42:42 gshapiro Exp $ +$FreeBSD: src/UPDATING,v 1.199 2002/04/11 05:45:17 imp Exp $ ==== //depot/projects/sparc64/bin/pax/options.c#2 (text+ko) ==== @@ -39,10 +39,11 @@ #if 0 static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94"; #endif -static const char rcsid[] = - "$FreeBSD: src/bin/pax/options.c,v 1.21 2002/02/02 07:07:59 imp Exp $"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/bin/pax/options.c,v 1.22 2002/04/12 20:23:51 charnier Exp $"); + #include #include #include @@ -161,15 +162,20 @@ else argv0 = argv[0]; - if (strcmp(NM_TAR, argv0) == 0) - return(tar_options(argc, argv)); - else if (strcmp(NM_CPIO, argv0) == 0) - return(cpio_options(argc, argv)); + if (strcmp(NM_TAR, argv0) == 0) { + tar_options(argc, argv); + return; + } + else if (strcmp(NM_CPIO, argv0) == 0) { + cpio_options(argc, argv); + return; + } /* * assume pax as the default */ argv0 = NM_PAX; - return(pax_options(argc, argv)); + pax_options(argc, argv); + return; } /* @@ -555,7 +561,7 @@ } --argc; dirptr = argv[argc]; - /* FALL THROUGH */ + /* FALLTHROUGH */ case ARCHIVE: case APPND: for (; optind < argc; optind++) @@ -1240,7 +1246,7 @@ cpio_usage(); --argc; ++argv; - /* FALL THROUGH */ + /* FALLTHROUGH */ case ARCHIVE: case APPND: if (*argv != NULL) ==== //depot/projects/sparc64/contrib/binutils/bfd/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,302 @@ +2002-04-06 Hans-Peter Nilsson + + * elf32-cris.c (cris_elf_howto_table) : Fix typo in name. + (cris_elf_check_relocs): Always create .rela.got here when + R_CRIS_16_GOTPLT or R_CRIS_32_GOTPLT is seen. + (elf_cris_adjust_gotplt_to_got): Don't create .rela.got here; + assume it's created. + +2002-04-04 Alan Modra + + * configure.in: Bump version to 2.12.1 and comment out is_release. + * configure: Regenerate. + * dep-in.sed: Cope with absolute paths. + * Makefile.am (dep.sed): Subst TOPDIR, and not INCDIR. + Run "make dep-am". + * Makefile.in: Regenerate. + + Merge from mainline + 2002-04-04 Alan Modra + * srec.c (MAXCHUNK, Chunk): Revise comments. + (srec_write_record): Correct buffer size. + (srec_write_header): Do without intermediate buffer. + (srec_write_section): Validate Chunk. + (srec_write_terminator): Pass NULL instead of dummy buffer. + (srec_write_symbols): Pass file and symbol names directly to + bfd_bwrite so sprintf won't overflow buffer. + + 2002-04-03 Jakub Jelinek + * elf32-sparc.c (elf32_sparc_relocate_section): Don't emit dynamic + PC relative relocs against hidden symbols. + * elf64-sparc.c (sparc64_elf_relocate_section): Likewise. + + 2002-04-03 Alan Modra + * elf.c (_bfd_elf_make_section_from_shdr): When setting section + LMAs, loop over segments until p_vaddr and p_memsz specify an + extent enclosing the section. + + 2002-04-02 Nick Clifton + * ihex.c (ihex_write_object_contents): Do not allow records to + cross a 64K boundary - wrap if necessary. + + 2002-03-28 Alan Modra + * linker.c (link_action): Ignore duplicate warning syms. + (_bfd_generic_link_write_global_symbol): Follow warning symbol link. + * elflink.h (elf_adjust_dynstr_offsets): Likewise. + (elf_adjust_dynamic_symbol): Likewise. + (elf_export_symbol): Likewise. + (elf_link_find_version_dependencies): Likewise. + (elf_link_assign_sym_version): Likewise. + (elf_link_sec_merge_syms): Likewise. + (elf_link_output_extsym): Likewise. + (elf_gc_sweep_symbol): Likewise. + (elf_gc_propagate_vtable_entries_used): Likewise. + (elf_gc_smash_unused_vtentry_relocs): Likewise. + (elf_gc_allocate_got_offsets): Likewise. + (elf_collect_hash_codes): Likewise. + * elflink.c (elf_link_renumber_hash_table_dynsyms): Likewise. + * elf-hppa.h (elf_hppa_unmark_useless_dynamic_symbols): Likewise. + (elf_hppa_remark_useless_dynamic_symbols): Likewise. + * elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Likewise. + * elf32-arm.h (elf32_arm_discard_copies): Likewise. + * elf32-cris.c (elf_cris_adjust_gotplt_to_got): Likewise. + (elf_cris_discard_excess_dso_dynamics): Likewise. + * elf32-hppa.c (clobber_millicode_symbols): Likewise. + (mark_PIC_calls): Likewise. + (allocate_plt_static): Likewise. + (allocate_dynrelocs): Likewise. + (readonly_dynrelocs): Likewise. + * elf32-i386.c (allocate_dynrelocs): Likewise. + (readonly_dynrelocs): Likewise. + * elf32-i370.c (i370_elf_adjust_dynindx): Likewise. + * elf32-m68k.c (elf_m68k_discard_copies): Likewise. + * elf32-mips.c (mips_elf_output_extsym): Likewise. + (mips_elf_sort_hash_table_f): Likewise. + (mips_elf_check_mips16_stubs): Likewise. + * elf32-s390.c (allocate_dynrelocs): Likewise. + (readonly_dynrelocs): Likewise. + * elf32-sh.c (sh_elf_discard_copies): Likewise. + * elf32-xstormy16.c (xstormy16_relax_plt_check): Likewise. + (xstormy16_relax_plt_realloc): Likewise. + * elf64-alpha.c (elf64_alpha_calc_got_offsets_for_symbol): Likewise. + (elf64_alpha_output_extsym): Likewise. + * elf64-hppa.c (elf64_hppa_mark_exported_functions): Likewise. + * elf64-mips.c (mips_elf64_sort_hash_table_f): Likewise. + (mips_elf64_check_mips16_stubs): Likewise. + (mips_elf64_output_extsym): Likewise. + * elf64-ppc.c (func_desc_adjust): Likewise. + (allocate_dynrelocs): Likewise. + (readonly_dynrelocs): Likewise. + * elf64-s390.c (allocate_dynrelocs): Likewise. + (readonly_dynrelocs): Likewise. + * elf64-sh64.c (sh64_elf64_discard_copies): Likewise. + * elf64-x86-64.c (elf64_x86_64_discard_copies): Likewise. + * elfxx-ia64.c (elfNN_ia64_global_dyn_sym_thunk): Likewise. + * aoutx.h (aout_link_write_other_symbol): Likewise. + * cofflink.c (_bfd_coff_write_task_globals): Likewise. + (_bfd_coff_write_global_sym): Likewise. + * i386linux.c (linux_tally_symbols): Likewise. + * m68klinux.c (linux_tally_symbols): Likewise. + * sparclinux.c (linux_tally_symbols): Likewise. + * pdp11.c (aout_link_write_other_symbol): Likewise. + * sunos.c (sunos_scan_dynamic_symbol): Likewise. + * xcofflink.c (xcoff_build_ldsyms): Likewise. + (xcoff_write_global_symbol): Likewise. + * cofflink.c (_bfd_coff_final_link): Formatting. + * elf32-i386.c (elf_i386_check_relocs): Formatting. + * elf32-sh.c (sh_elf_size_dynamic_sections): Likewise. + * elf64-alpha.c (elf64_alpha_output_extsym): Likewise. + * elf64-mips.c (mips_elf64_sort_hash_table): Likewise. + (mips_elf64_final_link): Likewise. + * elflink.h (elf_link_find_version_dependencies): Remove duplicate + prototype. + + 2002-03-21 Richard Earnshaw + * elf32-arm.h (elf32_arm_final_link_relocate , + ): Handle relocations to Thumb functions. + + 2002-03-19 Hans-Peter Nilsson + * elflink.h (NAME(bfd_elf,record_link_assignment)): Don't set + STT_NOTYPE symbols to STT_OBJECT. + + 2002-03-13 Alan Modra + * archures.c (bfd_default_compatible): Test bits_per_word. + * cpu-i386.c (i386_compatible): Remove. Replace occurrences with + bfd_default_compatible. + * cpu-i370.c (i370_compatible): Likewise. + * cpu-sparc.c (sparc_compatible): Likewise. + * cpu-h8300.c (compatible): Test in->arch == out->arch. + + 2002-02-19 Martin Schwidefsky + * archures.c (bfd_mach_s390_esa): Rename to bfd_mach_s390_31. + (bfd_mach_s390_esame): Rename to bfd_mach_s390_64. + * bfd-in2.h: Regenerate. + * cpu-s390.c (arch_info_struct): Use renamed architecture defines. + Replace architecture name "s390" with "s390:31-bit" and "s390:esame" + with "s390:64-bit". + * elf32-s390.c (elf_howto_table): Add 32 bit pc relative relocations. + (elf_s390_reloc_type_lookup): Likewise. + (elf_s390_check_relocs): Likewise. + (elf_s390_gc_sweep_hook): Likewise. + (elf_s390_relocate_section): Likewise. + (elf_s390_object_p): Use renamed architecture define. + * elf64-s390.c (elf_s390_object_p): Use renamed architecture define. + +2002-04-03 Alan Modra + + Merge from mainline. + 2002-03-28 Alan Modra + * cpu-mips.c (mips_compatible): Make static, prototype. + + 2002-03-14 Alan Modra + * cpu-mips.c (mips_compatible): New. Don't check bits_per_word. + (N): Use the above. + +2002-04-01 Nathan Williams + + * elf.c (elfcore_netbsd_get_lwpid): Fix off-by-one error + which caused the returned LWP ID to always be 0. + +2002-04-01 Richard Henderson + + * elf32-sparc.c (WILL_CALL_FINISH_DYNAMIC_SYMBOL): New. + (elf32_sparc_relocate_section): Use it to figure out when to + initialize .got entries. + * elf64-sparc.c: Similarly. + +2002-03-28 Alan Modra + + * aclocal.m4: Regenerate. + * config.in: Regenerate. + * Makefile.am: Run "make dep-am". + * Makefile.in: Regenerate. + + Merge from mainline + 2002-03-27 Gregory Steuck + * elf.c (_bfd_elf_get_symtab_upper_bound): Leave space for + terminating NULL if empty symbol table. + (_bfd_elf_get_dynamic_symtab_upper_bound): Likewise. + + 2002-03-26 Alan Modra + * elflink.h (elf_gc_mark): Don't recurse into non-ELF sections. + + 2002-03-23 Alan Modra + * elf.c (_bfd_elf_make_section_from_shdr): Don't set lma based on + section file offset for !SEC_LOAD sections. + + 2002-03-20 Daniel Jacobowitz + * dwarf2.c (struct funcinfo): Move up. + (lookup_address_in_function_table): New argument function_ptr. + Set it. + (lookup_address_in_line_table): New argument function. If function + is non-NULL, use it to handle ``addr'' before the first line note of + the function. + (comp_unit_find_nearest_line): Update and swap calls to + lookup_address_in_function_table and lookup_address_in_line_table. + * syms.c (_bfd_stab_section_find_nearest_line): Use the first + N_SLINE encountered if we see an N_FUN before any N_SLINE. + + 2002-03-18 Alan Modra + * libbfd.c (bfd_write_bigendian_4byte_int): Return true iff success. + * libbfd.h: Regenerate. + * archive.c (coff_write_armap): Pass on failures from + bfd_write_bigendian_4byte_int. + + 2002-03-14 H.J. Lu + * elflink.h (NAME(bfd_elf,size_dynamic_sections)): Set the BFD + error to bfd_error_nonrepresentable_section for reinit_array + section in DSO. + + 2002-03-14 Nick Clifton + * coffcode.h (coff_slurp_symbol_table): When adding BSF_WEAK flag, + OR it in rather than replacing previously selected flags. + * elfxx-target.h (TARGET_BIG_SYM): Set ar_max_namelen to 15. + (TARGET_LITTLE_SYM): Set ar_max_namelen to 15. + + 2002-03-14 Alan Modra + * elflink.h (elf_bfd_final_link): Revert last change. Instead, + ensure reloc size matches before calling elf_link_input_bfd. + Add an assert to check reloc size when counting output relocs. + + 2002-03-14 Nick Clifton + * mmo.c (mmo_get_loc): Return NULL rather than false. + + 2002-03-13 Alan Modra + * elflink.h: Formatting fixes. + (elf_link_output_extsym): Merge undefined and undef weak cases. + * elflink.h (elf_bfd_final_link): Only call elf_link_input_bfd + when word size of input matches output word size. + + 2002-03-07 H.J. Lu (hjl@gnu.org) + * coff-sh.c (shcoff_reloc_map): Use bfd_reloc_code_real_type + as the type for bfd_reloc_val. + >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 13 19: 5: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B27C37B419; Sat, 13 Apr 2002 19:04:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6511237B405 for ; Sat, 13 Apr 2002 19:04:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3E24lg49465 for perforce@freebsd.org; Sat, 13 Apr 2002 19:04:47 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sat, 13 Apr 2002 19:04:47 -0700 (PDT) Message-Id: <200204140204.g3E24lg49465@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9687 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9687 Change 9687 by jake@jake_sparc64 on 2002/04/13 19:04:44 Fix mismerge. Affected files ... ... //depot/projects/sparc64/sys/kern/sys_pipe.c#18 edit Differences ... ==== //depot/projects/sparc64/sys/kern/sys_pipe.c#18 (text+ko) ==== @@ -602,6 +602,8 @@ u_int size; int i, col; vm_offset_t addr, endaddr, kva; + vm_offset_t paddr; + vm_page_t m; GIANT_REQUIRED; PIPE_LOCK_ASSERT(wpipe, MA_NOTOWNED); @@ -613,7 +615,6 @@ endaddr = round_page((vm_offset_t)uio->uio_iov->iov_base + size); addr = trunc_page((vm_offset_t)uio->uio_iov->iov_base); for (i = 0; addr < endaddr; addr += PAGE_SIZE, i++) { - map = &curproc->p_vmspace->vm_map; if (vm_fault_quick((caddr_t)addr, VM_PROT_READ) < 0 || (paddr = pmap_extract(vmspace_pmap(curproc->p_vmspace), addr)) == 0) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 13 21:12:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24AEF37B416; Sat, 13 Apr 2002 21:11:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 252EC37B405 for ; Sat, 13 Apr 2002 21:11:31 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3E4BUq73723 for perforce@freebsd.org; Sat, 13 Apr 2002 21:11:30 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Sat, 13 Apr 2002 21:11:30 -0700 (PDT) Message-Id: <200204140411.g3E4BUq73723@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9693 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9693 Change 9693 by jhb@jhb_laptop on 2002/04/13 21:10:40 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/db_instruction.h#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#42 integrate ... //depot/projects/smpng/sys/alpha/conf/GENERIC#16 integrate ... //depot/projects/smpng/sys/alpha/include/endian.h#8 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#15 integrate ... //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#3 integrate ... //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#16 integrate ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#20 integrate ... //depot/projects/smpng/sys/compat/linux/linux_uid16.c#11 integrate ... //depot/projects/smpng/sys/conf/files#34 integrate ... //depot/projects/smpng/sys/conf/files.alpha#12 integrate ... //depot/projects/smpng/sys/conf/options.alpha#5 integrate ... //depot/projects/smpng/sys/dev/ata/ata-raid.c#13 integrate ... //depot/projects/smpng/sys/dev/fb/fb.c#4 integrate ... //depot/projects/smpng/sys/dev/fb/fbreg.h#5 integrate ... //depot/projects/smpng/sys/dev/fb/gfb.c#2 integrate ... //depot/projects/smpng/sys/dev/fb/tga.c#2 integrate ... //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#3 integrate ... //depot/projects/smpng/sys/dev/nge/if_nge.c#11 integrate ... //depot/projects/smpng/sys/dev/nge/if_ngereg.h#3 integrate ... //depot/projects/smpng/sys/dev/pccbb/pccbb.c#12 integrate ... //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#5 integrate ... //depot/projects/smpng/sys/dev/pci/pci_pci.c#8 integrate ... //depot/projects/smpng/sys/dev/syscons/scgfbrndr.c#3 integrate ... //depot/projects/smpng/sys/dev/syscons/syscons.c#18 integrate ... //depot/projects/smpng/sys/dev/syscons/syscons.h#5 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#32 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#5 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#4 integrate ... //depot/projects/smpng/sys/dev/wi/if_wivar.h#5 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.c#2 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#10 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#8 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_fpregs.c#8 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_mem.c#6 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_regs.c#8 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_status.c#11 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#10 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#35 integrate ... //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#12 integrate ... //depot/projects/smpng/sys/ia64/ia64/trap.c#28 integrate ... //depot/projects/smpng/sys/ia64/include/stdarg.h#2 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#23 integrate ... //depot/projects/smpng/sys/kern/kern_ktrace.c#21 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#59 integrate ... //depot/projects/smpng/sys/kern/kern_resource.c#22 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#32 integrate ... //depot/projects/smpng/sys/kern/sys_pipe.c#15 integrate ... //depot/projects/smpng/sys/kern/sys_process.c#14 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#20 integrate ... //depot/projects/smpng/sys/modules/wi/Makefile#5 integrate ... //depot/projects/smpng/sys/net/if_media.h#3 integrate ... //depot/projects/smpng/sys/powerpc/include/endian.h#7 integrate ... //depot/projects/smpng/sys/sparc64/include/endian.h#8 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#26 integrate ... //depot/projects/smpng/sys/sys/fbio.h#3 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#9 integrate ... //depot/projects/smpng/sys/vm/uma_int.h#7 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/db_instruction.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.4 2001/03/05 21:21:01 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.5 2002/04/13 22:21:28 obrien Exp $ */ /* $NetBSD: db_instruction.h,v 1.4 1997/09/16 22:53:32 thorpej Exp $ */ /* @@ -172,7 +172,7 @@ } alpha_instruction; -#endif !defined(ASSEMBLER) +#endif /* !defined(ASSEMBLER) */ /* * ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#42 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.177 2002/04/11 17:13:08 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.178 2002/04/13 23:37:10 alc Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1476,6 +1476,9 @@ #endif /* COMPAT_43 */ } +/* + * MPSAFE + */ int sigreturn(struct thread *td, struct sigreturn_args /* { ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#16 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.135 2002/04/03 10:56:54 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.136 2002/04/13 22:34:14 obrien Exp $ machine alpha cpu EV4 @@ -119,6 +119,7 @@ device psm # psm mouse device vga # VGA screen +device tga # TGA screen # splash screen/screen saver device splash ==== //depot/projects/smpng/sys/alpha/include/endian.h#8 (text+ko) ==== @@ -32,12 +32,13 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/alpha/include/endian.h,v 1.10 2002/04/10 14:39:12 mike Exp $ + * $FreeBSD: src/sys/alpha/include/endian.h,v 1.11 2002/04/12 15:56:44 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ #define _MACHINE_ENDIAN_H_ +#include #include /* ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#15 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.29 2002/04/05 00:08:38 eric Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.30 2002/04/13 23:11:22 jhb Exp $ */ ==== //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.6 2001/07/21 14:32:44 rnordier Exp $ +# $FreeBSD: src/sys/boot/i386/kgzldr/Makefile,v 1.7 2002/04/12 15:49:30 ru Exp $ -PROG= kgzldr.o SRCS= start.s boot.c inflate.c lib.c crt.s sio.s +OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -fno-builtin .if ${OBJFORMAT} == aout CFLAGS+=-O2 ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#16 (text+ko) ==== @@ -38,7 +38,7 @@ * * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 * - * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.50 2002/04/09 20:10:36 jhb Exp $ + * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.51 2002/04/13 23:09:41 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#20 (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. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.118 2002/04/11 21:00:05 jhb Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.119 2002/04/13 23:11:23 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/linux/linux_uid16.c#11 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.6 2002/04/01 21:30:29 jhb Exp $ + * $FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.7 2002/04/13 23:11:23 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/conf/files#34 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.621 2002/04/09 00:30:43 jake Exp $ +# $FreeBSD: src/sys/conf/files,v 1.622 2002/04/12 06:19:18 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -629,6 +629,7 @@ dev/wi/if_wi_pccard.c optional wi pccard dev/wi/if_wi_pccard.c optional wi card dev/wi/if_wi_pci.c optional wi pci +dev/wi/wi_hostap.c optional wi dev/wl/if_wl.c optional wl isa dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe card ==== //depot/projects/smpng/sys/conf/files.alpha#12 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.82 2002/03/27 05:39:16 dillon Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.83 2002/04/13 22:34:15 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -206,6 +206,7 @@ dev/syscons/scterm-dumb.c optional sc dev/syscons/scterm-sc.c optional sc dev/syscons/scvgarndr.c optional sc vga +dev/syscons/scgfbrndr.c optional sc tga dev/syscons/scvidctl.c optional sc dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc @@ -222,3 +223,9 @@ libkern/alpha/bswap32.S standard libkern/bcmp.c standard libkern/ffs.c standard +dev/fb/tga.c optional tga +dev/fb/boot_font.c optional tga +dev/tga/tga_pci.c optional tga +dev/fb/fb.c optional tga +dev/fb/gfb.c optional tga +dev/gfb/gfb_pci.c optional tga ==== //depot/projects/smpng/sys/conf/options.alpha#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.alpha,v 1.33 2002/02/15 10:19:38 bde Exp $ +# $FreeBSD: src/sys/conf/options.alpha,v 1.34 2002/04/13 22:34:15 obrien Exp $ # Options specific to the Alpha platform kernels EV5 opt_global.h @@ -53,6 +53,14 @@ VGA_SLOW_IOACCESS opt_vga.h VGA_WIDTH90 opt_vga.h +GFB_DEBUG opt_gfb.h +GFB_NO_FONT_LOADING opt_gfb.h +GFB_NO_MODE_CHANGE opt_gfb.h + +TGA_DEBUG opt_tga.h +TGA_NO_FONT_LOADING opt_tga.h +TGA_NO_MODE_CHANGE opt_tga.h + PSM_HOOKRESUME opt_psm.h PSM_RESETAFTERSUSPEND opt_psm.h PSM_DEBUG opt_psm.h ==== //depot/projects/smpng/sys/dev/ata/ata-raid.c#13 (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. * - * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.46 2002/04/11 11:04:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.47 2002/04/12 14:10:19 sos Exp $ */ #include "opt_ata.h" @@ -122,7 +122,8 @@ switch(adp->device->channel->chiptype) { case 0x4d33105a: case 0x4d38105a: case 0x4d30105a: case 0x0d30105a: case 0x4d68105a: case 0x6268105a: - case 0x6269105a: + case 0x4d69105a: case 0x5275105a: case 0x6269105a: + /* test RAID bit in PCI reg XXX */ return (ar_promise_read_conf(adp, ar_table, 0)); ==== //depot/projects/smpng/sys/dev/fb/fb.c#4 (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. * - * $FreeBSD: src/sys/dev/fb/fb.c,v 1.19 2001/09/12 08:37:03 julian Exp $ + * $FreeBSD: src/sys/dev/fb/fb.c,v 1.20 2002/04/13 22:34:15 obrien Exp $ */ #include "opt_fb.h" @@ -637,10 +637,11 @@ printf("%s%d: %s%d, %s, type:%s (%d), flags:0x%x\n", FB_DRIVER_NAME, adp->va_index, driver, adp->va_unit, adp->va_name, adapter_name(adp->va_type), adp->va_type, adp->va_flags); - printf("%s%d: port:0x%x-0x%x, crtc:0x%x, mem:0x%x 0x%x\n", - FB_DRIVER_NAME, adp->va_index, - adp->va_io_base, adp->va_io_base + adp->va_io_size - 1, - adp->va_crtc_addr, adp->va_mem_base, adp->va_mem_size); + printf("%s%d: port:0x%lx-0x%lx, crtc:0x%lx, mem:0x%lx 0x%x\n", + FB_DRIVER_NAME, adp->va_index, (u_long)adp->va_io_base, + (u_long)adp->va_io_base + adp->va_io_size - 1, + (u_long)adp->va_crtc_addr, (u_long)adp->va_mem_base, + adp->va_mem_size); printf("%s%d: init mode:%d, bios mode:%d, current mode:%d\n", FB_DRIVER_NAME, adp->va_index, adp->va_initial_mode, adp->va_initial_bios_mode, adp->va_mode); @@ -669,7 +670,7 @@ printf("T %dx%d, font:%dx%d, ", info->vi_width, info->vi_height, info->vi_cwidth, info->vi_cheight); - printf("win:0x%x\n", info->vi_window); + printf("win:0x%lx\n", (u_long)info->vi_window); } int ==== //depot/projects/smpng/sys/dev/fb/fbreg.h#5 (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/sys/dev/fb/fbreg.h,v 1.10 2001/11/06 02:36:26 des Exp $ + * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.11 2002/04/13 22:34:15 obrien Exp $ */ #ifndef _DEV_FB_FBREG_H_ @@ -86,8 +86,21 @@ typedef int vi_clear_t(video_adapter_t *adp); typedef int vi_fill_rect_t(video_adapter_t *adp, int val, int x, int y, int cx, int cy); -typedef int vi_bitblt_t(video_adapter_t *adp,...); +typedef int vi_bitblt_t(video_adapter_t *adp, ...); typedef int vi_diag_t(video_adapter_t *adp, int level); +typedef int vi_save_cursor_palette_t(video_adapter_t *adp, u_char *palette); +typedef int vi_load_cursor_palette_t(video_adapter_t *adp, u_char *palette); +typedef int vi_copy_t(video_adapter_t *adp, vm_offset_t src, vm_offset_t dst, + int n); +typedef int vi_putp_t(video_adapter_t *adp, vm_offset_t off, u_int32_t p, + u_int32_t a, int size, int bpp, int bit_ltor, + int byte_ltor); +typedef int vi_putc_t(video_adapter_t *adp, vm_offset_t off, u_int8_t c, + u_int8_t a); +typedef int vi_puts_t(video_adapter_t *adp, vm_offset_t off, u_int16_t *s, + int len); +typedef int vi_putm_t(video_adapter_t *adp, int x, int y, + u_int8_t *pixel_image, u_int32_t pixel_mask, int size); typedef struct video_switch { vi_probe_t *probe; @@ -116,6 +129,13 @@ int (*reserved1)(void); int (*reserved2)(void); vi_diag_t *diag; + vi_save_cursor_palette_t *save_cursor_palette; + vi_load_cursor_palette_t *load_cursor_palette; + vi_copy_t *copy; + vi_putp_t *putp; + vi_putc_t *putc; + vi_puts_t *puts; + vi_putm_t *putm; } video_switch_t; #define save_palette(adp, pal) \ ==== //depot/projects/smpng/sys/dev/fb/gfb.c#2 (text+ko) ==== @@ -51,7 +51,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/gfb.c,v 1.1 2001/11/01 08:26:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/gfb.c,v 1.2 2002/04/13 22:34:15 obrien Exp $"); #include @@ -541,7 +541,6 @@ int /*gfb_clear(video_adapter_t *adp, int n)*/ gfb_clear(video_adapter_t *adp) - video_adapter_t *adp; { int off; ==== //depot/projects/smpng/sys/dev/fb/tga.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/tga.c,v 1.1 2001/11/01 08:26:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/tga.c,v 1.2 2002/04/13 22:34:15 obrien Exp $"); #include @@ -105,10 +105,12 @@ /* TGA-specific functionality. */ static gfb_builtin_save_palette_t tga_builtin_save_palette; static gfb_builtin_load_palette_t tga_builtin_load_palette; +#ifdef TGA2 static gfb_builtin_save_palette_t tga2_builtin_save_palette; static gfb_builtin_load_palette_t tga2_builtin_load_palette; static gfb_builtin_save_cursor_palette_t tga2_builtin_save_cursor_palette; static gfb_builtin_load_cursor_palette_t tga2_builtin_load_cursor_palette; +#endif static gfb_builtin_read_hw_cursor_t tga_builtin_read_hw_cursor; static gfb_builtin_set_hw_cursor_t tga_builtin_set_hw_cursor; static gfb_builtin_set_hw_cursor_shape_t tga_builtin_set_hw_cursor_shape; @@ -128,8 +130,10 @@ /* RAMDAC-specific functions */ static gfb_ramdac_init_t bt463_init; static void bt463_update_window_type(struct gfb_softc *); +#if 0 static gfb_ramdac_save_palette_t bt463_save_palette; static gfb_ramdac_load_palette_t bt463_load_palette; +#endif static gfb_ramdac_save_cursor_palette_t bt463_save_cursor_palette; static gfb_ramdac_load_cursor_palette_t bt463_load_cursor_palette; static gfb_ramdac_init_t bt485_init; @@ -150,7 +154,9 @@ static vi_query_mode_t tga_query_mode; static vi_set_mode_t tga_set_mode; static vi_blank_display_t tga_blank_display; +#if 0 static vi_ioctl_t tga_ioctl; +#endif static vi_set_border_t tga_set_border; static vi_set_win_org_t tga_set_win_org; static vi_fill_rect_t tga_fill_rect; @@ -670,7 +676,7 @@ /* Assume the best... */ error = 0; - gder = READ_GFB_REGISTER(video_adapter_t *adp, TGA_REG_GDER); + gder = READ_GFB_REGISTER(adp, TGA_REG_GDER); /* Determine the adapter type first @@ -686,13 +692,13 @@ switch(mode) { case TGA2_2DA_MODE: vgae_mask = ~0x00400000; - WRITE_GFB_REGISTER(video_adapter_t *adp, TGA_REG_GDER, + WRITE_GFB_REGISTER(adp, TGA_REG_GDER, gder & vgae_mask); adp->va_mode = mode; break; case TGA2_VGA_MODE: vgae_mask = 0x00400000; - WRITE_GFB_REGISTER(video_adapter_t *adp, TGA_REG_GDER, + WRITE_GFB_REGISTER(adp, TGA_REG_GDER, gder | vgae_mask); adp->va_mode = mode; break; @@ -757,6 +763,8 @@ return(0); } +#if 0 + static int tga_ioctl(video_adapter_t *adp, u_long cmd, caddr_t arg) { @@ -784,6 +792,8 @@ return(error); } +#endif /* 0 */ + static int tga_set_border(video_adapter_t *adp, int color) { return(ENODEV); @@ -916,7 +926,7 @@ static int #if 0 tga_clear(video_adapter_t *adp, int n) -else +#else tga_clear(video_adapter_t *adp) #endif { @@ -1410,6 +1420,7 @@ return(error); } +#ifdef TGA2 static int tga2_builtin_save_palette(video_adapter_t *adp, video_color_palette_t *palette) { @@ -1512,8 +1523,10 @@ return(error); } +#endif /* TGA2 */ + static int -tga_builtin_read_hw_cursor(video_adapter_t *adp, int col, int row) +tga_builtin_read_hw_cursor(video_adapter_t *adp, int *col, int *row) { gfb_reg_t cxyr; int error; @@ -1969,6 +1982,7 @@ } } +#if 0 static int bt463_save_palette(video_adapter_t *adp, video_color_palette_t *palette) { @@ -2016,6 +2030,8 @@ return(error); } +#endif /* 0 */ + static int bt463_save_cursor_palette(video_adapter_t *adp, struct fbcmap *palette) { @@ -2040,7 +2056,7 @@ } static int -bt463_load_cursor_palette(video_adapter_t *adp, struct bfcmap *palette) +bt463_load_cursor_palette(video_adapter_t *adp, struct fbcmap *palette) { struct gfb_softc *sc; int error, i; ==== //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gfb/gfb_pci.c,v 1.2 2001/11/08 01:49:06 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gfb/gfb_pci.c,v 1.3 2002/04/13 22:34:15 obrien Exp $"); #include #include @@ -70,7 +70,9 @@ #include "opt_fb.h" +#if 0 static devclass_t gfb_devclass; +#endif #ifdef __alpha__ ==== //depot/projects/smpng/sys/dev/nge/if_nge.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.27 2002/04/04 21:03:15 jhb Exp $ + * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.28 2002/04/13 21:33:33 phk Exp $ */ /* @@ -132,7 +132,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.27 2002/04/04 21:03:15 jhb Exp $"; + "$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.28 2002/04/13 21:33:33 phk Exp $"; #endif #define NGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) @@ -160,9 +160,6 @@ static int nge_encap (struct nge_softc *, struct mbuf *, u_int32_t *); static void nge_rxeof (struct nge_softc *); -#ifdef notdef -static void nge_rxeoc (struct nge_softc *); -#endif static void nge_txeof (struct nge_softc *); static void nge_intr (void *); static void nge_tick (void *); @@ -1348,20 +1345,6 @@ return; } -#ifdef notdef -void nge_rxeoc(sc) - struct nge_softc *sc; -{ - struct ifnet *ifp; - - ifp = &sc->arpcom.ac_if; - nge_rxeof(sc); - ifp->if_flags &= ~IFF_RUNNING; - nge_init(sc); - return; -} -#endif - /* * A frame was downloaded to the chip. It's safe for us to clean up * the list buffers. @@ -1496,12 +1479,14 @@ if ((status & NGE_ISR_RX_DESC_OK) || (status & NGE_ISR_RX_ERR) || (status & NGE_ISR_RX_OFLOW) || + (status & NGE_ISR_RX_FIFO_OFLOW) || + (status & NGE_ISR_RX_IDLE) || (status & NGE_ISR_RX_OK)) nge_rxeof(sc); -#ifdef notdef - if ((status & NGE_ISR_RX_OFLOW)) - nge_rxeoc(sc); -#endif + + if ((status & NGE_ISR_RX_IDLE)) + NGE_SETBIT(sc, NGE_CSR, NGE_CSR_RX_ENABLE); + if (status & NGE_ISR_SYSERR) { nge_reset(sc); ifp->if_flags &= ~IFF_RUNNING; ==== //depot/projects/smpng/sys/dev/nge/if_ngereg.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nge/if_ngereg.h,v 1.5 2001/09/19 21:39:26 wpaul Exp $ + * $FreeBSD: src/sys/dev/nge/if_ngereg.h,v 1.6 2002/04/13 21:33:33 phk Exp $ */ #define NGE_CSR 0x00 @@ -226,7 +226,8 @@ #define NGE_INTRS \ (NGE_IMR_RX_OFLOW|NGE_IMR_TX_UFLOW|NGE_IMR_TX_OK|\ NGE_IMR_TX_IDLE|NGE_IMR_RX_OK|NGE_IMR_RX_ERR|\ - NGE_IMR_SYSERR|NGE_IMR_PHY_INTR) + NGE_IMR_SYSERR|NGE_IMR_PHY_INTR|\ + NGE_IMR_RX_IDLE|NGE_IMR_RX_FIFO_OFLOW) /* Interrupt enable register */ #define NGE_IER_INTRENB 0x00000001 ==== //depot/projects/smpng/sys/dev/pccbb/pccbb.c#12 (text+ko) ==== @@ -25,7 +25,37 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.42 2002/04/04 21:03:15 jhb Exp $ + * $FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.43 2002/04/13 04:07:07 imp Exp $ + */ + +/* + * Copyright (c) 1998, 1999 and 2000 + * HAYAKAWA Koichi. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by HAYAKAWA Koichi. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. */ /* ==== //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#5 (text+ko) ==== @@ -25,7 +25,37 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pccbb/pccbbreg.h,v 1.9 2002/02/17 03:11:11 imp Exp $ + * $FreeBSD: src/sys/dev/pccbb/pccbbreg.h,v 1.10 2002/04/13 04:07:07 imp Exp $ + */ + +/* + * Copyright (c) 1998, 1999 and 2000 + * HAYAKAWA Koichi. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by HAYAKAWA Koichi. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. */ /* ==== //depot/projects/smpng/sys/dev/pci/pci_pci.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.12 2002/02/26 03:31:35 imp Exp $ + * $FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.13 2002/04/13 05:52:35 imp Exp $ */ /* @@ -345,7 +345,7 @@ case SYS_RES_MEMORY: if (!pcib_is_isa_mem(start)) { #ifndef PCI_ALLOW_UNSUPPORTED_IO_RANGE - if (start < sc->membase && end > sc->membase) + if (start < sc->membase && end >= sc->membase) start = sc->membase; if (end > sc->memlimit) end = sc->memlimit; ==== //depot/projects/smpng/sys/dev/syscons/scgfbrndr.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.15 2002/02/14 22:29:03 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.16 2002/04/13 22:34:16 obrien Exp $"); #include "opt_syscons.h" #include "opt_gfb.h" @@ -256,7 +256,8 @@ video_adapter_t *adp; adp = scp->sc->adp; - if (scp->cursor_height <= 0) /* the text cursor is disabled */ + if (scp->curs_attr.height <= 0) + /* the text cursor is disabled */ return; if (on) { ==== //depot/projects/smpng/sys/dev/syscons/syscons.c#18 (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. * - * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.382 2002/04/05 18:17:49 alfred Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.383 2002/04/13 22:34:16 obrien Exp $ */ #include "opt_syscons.h" @@ -2907,14 +2907,14 @@ scp->status |= GRAPHICS_MODE; scp->xpixel = info.vi_width; scp->ypixel = info.vi_height; - scp->xsize = info.vi_width/8; + scp->xsize = info.vi_width/info.vi_cwidth; scp->ysize = info.vi_height/info.vi_cheight; scp->font_size = 0; scp->font = NULL; } else { scp->xsize = info.vi_width; scp->ysize = info.vi_height; - scp->xpixel = scp->xsize*8; + scp->xpixel = scp->xsize*info.vi_cwidth; scp->ypixel = scp->ysize*info.vi_cheight; if (info.vi_cheight < 14) { scp->font_size = 8; ==== //depot/projects/smpng/sys/dev/syscons/syscons.h#5 (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. * - * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.73 2001/09/12 08:37:14 julian Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.74 2002/04/13 22:34:16 obrien Exp $ */ #ifndef _DEV_SYSCONS_SYSCONS_H_ @@ -129,8 +129,15 @@ /* misc defines */ #define FALSE 0 #define TRUE 1 -#define COL 80 -#define ROW 25 + +/* + The following #defines are hard-coded for a maximum text + resolution corresponding to a maximum framebuffer + resolution of 1600x1200 with an 8x8 font... +*/ +#define COL 200 +#define ROW 150 + #define PCBURST 128 #ifndef BELL_DURATION ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#32 (text+ko) ==== @@ -71,6 +71,7 @@ #include #include #include +#include #include #include @@ -95,16 +96,13 @@ #include #include -#ifdef WI_HOSTAP #include -#include -#endif #include #include #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.96 2002/04/12 03:42:37 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.99 2002/04/12 06:12:21 imp Exp $"; #endif static void wi_intr(void *); @@ -315,10 +313,8 @@ wi_read_record(sc, &gen); sc->wi_has_wep = gen.wi_val; - if (bootverbose) { - device_printf(sc->dev, "%s:wi_has_wep = %d\n", - __func__, sc->wi_has_wep); - } + if (bootverbose) + device_printf(sc->dev, "wi_has_wep = %d\n", sc->wi_has_wep); /* * Find supported rates. @@ -351,7 +347,6 @@ ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, IFM_IEEE80211_ADHOC, 0), 0); ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, 0, 0), 0); -#ifdef IFM_IEEE80211_HOSTAP if (sc->sc_firmware_type == WI_INTERSIL) { ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, IFM_IEEE80211_HOSTAP, 0), 0); @@ -364,7 +359,6 @@ ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, IFM_IEEE80211_HOSTAP, 0), 0); } -#endif #undef ADD ifmedia_set(&sc->ifmedia, IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, 0, 0)); @@ -613,7 +607,6 @@ eh = mtod(m, struct ether_header *); m->m_pkthdr.rcvif = ifp; -#ifdef WI_HOSTAP if (rx_frame.wi_status == WI_STAT_MGMT && sc->wi_ptype == WI_PORTTYPE_AP) { if ((WI_802_11_OFFSET_RAW + rx_frame.wi_dat_len + 2) > @@ -643,7 +636,6 @@ wihap_mgmt_input(sc, &rx_frame, m); return; } -#endif /* WI_HOSTAP */ if (rx_frame.wi_status == WI_STAT_1042 || rx_frame.wi_status == WI_STAT_TUNNEL || @@ -711,7 +703,6 @@ ifp->if_ipackets++; -#ifdef WI_HOSTAP if (sc->wi_ptype == WI_PORTTYPE_AP) { /* * Give host AP code first crack at data @@ -722,7 +713,6 @@ if (wihap_data_input(sc, &rx_frame, m)) return; } -#endif /* Receive packet. */ m_adj(m, sizeof(struct ether_header)); #ifdef WICACHE @@ -1123,14 +1113,12 @@ if (le16toh(ltv->wi_val)) { p2ltv.wi_val =htole16(PRIVACY_INVOKED | EXCLUDE_UNENCRYPTED); -#ifdef WI_HOSTAP if (sc->wi_ptype == WI_PORTTYPE_AP) /* * Disable tx encryption... * it's broken. */ p2ltv.wi_val |= htole16(HOST_ENCRYPT); -#endif } else p2ltv.wi_val = htole16(HOST_ENCRYPT | HOST_DECRYPT); @@ -1845,7 +1833,6 @@ wi_init(sc); break; -#ifdef WI_HOSTAP case SIOCHOSTAP_ADD: case SIOCHOSTAP_DEL: case SIOCHOSTAP_GET: @@ -1855,7 +1842,6 @@ /* Send all Host AP specific ioctl's to Host AP code. */ error = wihap_ioctl(sc, command, data); break; -#endif default: error = EINVAL; break; @@ -1986,15 +1972,8 @@ /* enable interrupts */ CSR_WRITE_2(sc, WI_INT_EN, WI_INTRS); -#ifdef WI_HOSTAP wihap_init(sc); - /* - * Initialize ICV to something random. XXX: this doesn't work - * if init happens in early boot-up. Fix later. - */ - read_random(&sc->wi_icv, sizeof(sc->wi_icv)); -#endif ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; @@ -2162,9 +2141,7 @@ return; } -#ifdef WI_HOSTAP nextpkt: -#endif IF_DEQUEUE(&ifp->if_snd, m0); if (m0 == NULL) { WI_UNLOCK(sc); @@ -2176,7 +2153,6 @@ id = sc->wi_tx_data_id; eh = mtod(m0, struct ether_header *); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 13 21:24:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88CD637B41A; Sat, 13 Apr 2002 21:23:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B87F137B405 for ; Sat, 13 Apr 2002 21:22:55 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3E4Mlo75223 for perforce@freebsd.org; Sat, 13 Apr 2002 21:22:47 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 13 Apr 2002 21:22:47 -0700 (PDT) Message-Id: <200204140422.g3E4Mlo75223@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9698 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9698 Change 9698 by peter@peter_daintree on 2002/04/13 21:22:29 IFC @9691 Affected files ... ... //depot/projects/ia64/Makefile.inc1#18 integrate ... //depot/projects/ia64/bin/pax/options.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/ChangeLog#4 integrate ... //depot/projects/ia64/contrib/binutils/bfd/Makefile.am#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/Makefile.in#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/aclocal.m4#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/aout-tic30.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/aoutx.h#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/archive.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/archures.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/bfd-in2.h#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/coff-arm.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/coff-mips.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/coff-tic30.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/coff-z8k.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/coffcode.h#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/cofflink.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/config.in#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/configure#4 integrate ... //depot/projects/ia64/contrib/binutils/bfd/configure.in#4 integrate ... //depot/projects/ia64/contrib/binutils/bfd/cpu-i386.c#4 integrate ... //depot/projects/ia64/contrib/binutils/bfd/cpu-mips.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/cpu-sparc.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/cpu-v850.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/cpu-z8k.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/dep-in.sed#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/doc/ChangeLog#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/doc/Makefile.in#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/dwarf2.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/ecoff.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf-bfd.h#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf.c#4 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf32-arm.h#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf32-i386.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf32-mips.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf32-sparc.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf32-v850.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf64-alpha.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf64-mips.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf64-ppc.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf64-sparc.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elf64-x86-64.c#4 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elflink.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elflink.h#4 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elfxx-ia64.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/elfxx-target.h#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/i386linux.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/ihex.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/libbfd.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/libbfd.h#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/libpei.h#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/linker.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/merge.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/mipsbsd.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/pe-mips.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/peicode.h#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/sparclinux.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/srec.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/sunos.c#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/syms.c#3 integrate ... //depot/projects/ia64/contrib/binutils/bfd/version.h#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/xcoff-target.h#2 integrate ... //depot/projects/ia64/contrib/binutils/bfd/xcofflink.c#2 integrate ... //depot/projects/ia64/contrib/binutils/binutils/ChangeLog#4 integrate ... //depot/projects/ia64/contrib/binutils/binutils/Makefile.am#3 integrate ... //depot/projects/ia64/contrib/binutils/binutils/Makefile.in#3 integrate ... //depot/projects/ia64/contrib/binutils/binutils/aclocal.m4#3 integrate ... //depot/projects/ia64/contrib/binutils/binutils/configure#3 integrate ... //depot/projects/ia64/contrib/binutils/binutils/configure.in#3 integrate ... //depot/projects/ia64/contrib/binutils/binutils/dep-in.sed#2 integrate ... //depot/projects/ia64/contrib/binutils/binutils/unwind-ia64.c#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/ChangeLog#4 integrate ... //depot/projects/ia64/contrib/binutils/gas/Makefile.am#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/Makefile.in#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/aclocal.m4#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/as.c#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/config.in#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/atof-vax.c#2 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/obj-elf.c#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/tc-arm.c#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/tc-i386.c#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/tc-i386.h#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/tc-ia64.c#4 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/tc-ia64.h#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/tc-tic30.c#2 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/tc-v850.c#2 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/tc-v850.h#2 integrate ... //depot/projects/ia64/contrib/binutils/gas/config/tc-z8k.c#2 integrate ... //depot/projects/ia64/contrib/binutils/gas/dep-in.sed#2 integrate ... //depot/projects/ia64/contrib/binutils/gas/doc/Makefile.in#3 integrate ... //depot/projects/ia64/contrib/binutils/gas/doc/c-sh.texi#2 integrate ... //depot/projects/ia64/contrib/binutils/gas/write.c#3 integrate ... //depot/projects/ia64/contrib/binutils/include/opcode/mips.h#2 integrate ... //depot/projects/ia64/contrib/binutils/include/opcode/v850.h#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/ChangeLog#4 integrate ... //depot/projects/ia64/contrib/binutils/ld/Makefile.am#3 integrate ... //depot/projects/ia64/contrib/binutils/ld/Makefile.in#3 integrate ... //depot/projects/ia64/contrib/binutils/ld/configure.host#3 integrate ... //depot/projects/ia64/contrib/binutils/ld/dep-in.sed#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32bmip.sh#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32bmipn32.sh#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32bsmip.sh#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32ebmip.sh#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32elmip.sh#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32lmip.sh#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/emulparams/elf32lsmip.sh#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/emulparams/elf64bmip.sh#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/emulparams/shelf.sh#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/emulparams/shelf_linux.sh#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/emulparams/shl.sh#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/emulparams/shlelf.sh#2 integrate ... //depot/projects/ia64/contrib/binutils/ld/genscripts.sh#3 integrate ... //depot/projects/ia64/contrib/binutils/ld/ldlang.c#3 integrate ... //depot/projects/ia64/contrib/binutils/ld/ldmain.c#3 integrate ... //depot/projects/ia64/contrib/binutils/ld/scripttempl/elf.sc#3 integrate ... //depot/projects/ia64/contrib/binutils/ld/scripttempl/v850.sc#2 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/ChangeLog#4 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/Makefile.am#3 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/Makefile.in#3 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/aclocal.m4#3 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/config.in#3 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/configure#4 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/dep-in.sed#2 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/ppc-opc.c#4 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/v850-dis.c#2 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/v850-opc.c#2 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/z8k-dis.c#2 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/z8k-opc.h#2 integrate ... //depot/projects/ia64/contrib/binutils/opcodes/z8kgen.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/toplev.c#3 integrate ... //depot/projects/ia64/contrib/openpam/include/security/openpam.h#7 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_modules.h#5 integrate ... //depot/projects/ia64/crypto/openssh/myproposal.h#3 integrate ... //depot/projects/ia64/crypto/openssh/servconf.c#5 integrate ... //depot/projects/ia64/etc/inetd.conf#5 integrate ... //depot/projects/ia64/etc/isdn/holidays.D#2 integrate ... //depot/projects/ia64/etc/mtree/BSD.local.dist#7 integrate ... //depot/projects/ia64/etc/pam.d/rsh#2 integrate ... //depot/projects/ia64/etc/rc.network#14 integrate ... //depot/projects/ia64/etc/sendmail/rc.sendmail#2 integrate ... //depot/projects/ia64/games/hack/hack.ioctl.c#2 integrate ... //depot/projects/ia64/gnu/usr.bin/Makefile#9 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/Makefile.inc0#5 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/gdb/alpha/nm.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/collect2/Makefile#5 integrate ... //depot/projects/ia64/gnu/usr.bin/gperf/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grodvi/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grohtml/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grolbp/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grolj4/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grops/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/devices/grotty/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/eqn/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/grn/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/html/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/pic/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/refer/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/soelim/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/preproc/tbl/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/roff/groff/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/roff/troff/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/utils/addftinfo/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/utils/indxbib/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/utils/lkbib/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/utils/lookbib/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/man/man/man.c#3 integrate ... //depot/projects/ia64/lib/csu/alpha/crt1.c#3 integrate ... //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#6 integrate ... //depot/projects/ia64/lib/libc/ia64/gen/unwind.c#4 integrate ... //depot/projects/ia64/lib/libc/locale/Makefile.inc#3 integrate ... //depot/projects/ia64/lib/libc/locale/nl_langinfo.3#3 integrate ... //depot/projects/ia64/lib/libc/sys/fcntl.2#3 integrate ... //depot/projects/ia64/lib/libc/sys/ioctl.2#2 integrate ... //depot/projects/ia64/lib/libpam/libpam/Makefile#9 integrate ... //depot/projects/ia64/lib/libpam/libpam/pam_debug_log.c#3 integrate ... //depot/projects/ia64/lib/libpam/libpam/security/pam_mod_misc.h#2 integrate ... //depot/projects/ia64/lib/libpam/modules/modules.inc#6 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_deny/pam_deny.c#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ftp/pam_ftp.c#5 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_kerberosIV/klogin.c#2 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_kerberosIV/klogin.h#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_kerberosIV/pam_kerberosIV.c#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_krb5/pam_krb5.c#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_login_access/pam_login_access.c#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_nologin/pam_nologin.c#5 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_opie/pam_opie.c#6 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_permit/pam_permit.c#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_radius/pam_radius.c#6 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_rhosts/Makefile#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_rhosts/pam_rhosts.8#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_rhosts/pam_rhosts.c#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_rootok/pam_rootok.c#5 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_securetty/pam_securetty.c#5 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_self/pam_self.8#6 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_self/pam_self.c#5 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ssh/pam_ssh.c#10 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_tacplus/pam_tacplus.c#6 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.c#8 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_wheel/pam_wheel.c#5 integrate ... //depot/projects/ia64/lib/libstand/sparc64/_setjmp.S#1 branch ... //depot/projects/ia64/lib/libypclnt/Makefile#1 branch ... //depot/projects/ia64/lib/libypclnt/ypclnt.h#1 branch ... //depot/projects/ia64/lib/libypclnt/ypclnt_connect.c#1 branch ... //depot/projects/ia64/lib/libypclnt/ypclnt_error.c#1 branch ... //depot/projects/ia64/lib/libypclnt/ypclnt_free.c#1 branch ... //depot/projects/ia64/lib/libypclnt/ypclnt_get.c#1 branch ... //depot/projects/ia64/lib/libypclnt/ypclnt_new.c#1 branch ... //depot/projects/ia64/lib/libypclnt/ypclnt_passwd.c#1 branch ... //depot/projects/ia64/libexec/tftpd/tftpd.c#5 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/errata/article.sgml#3 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#4 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#2 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#3 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#3 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/readme/article.sgml#3 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#5 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#9 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 integrate ... //depot/projects/ia64/release/i386/mkisoimages.sh#3 integrate ... //depot/projects/ia64/sbin/dhclient/Makefile.inc#2 integrate ... //depot/projects/ia64/sbin/natd/Makefile#3 integrate ... //depot/projects/ia64/sbin/restore/restore.8#2 integrate ... //depot/projects/ia64/sbin/route/Makefile#3 integrate ... //depot/projects/ia64/sbin/savecore/savecore.c#9 integrate ... //depot/projects/ia64/share/examples/netgraph/ether.bridge#2 integrate ... //depot/projects/ia64/share/man/man4/tap.4#2 integrate ... //depot/projects/ia64/share/man/man5/make.conf.5#6 integrate ... //depot/projects/ia64/share/man/man9/Makefile#7 integrate ... //depot/projects/ia64/share/man/man9/VFS_VGET.9#3 integrate ... //depot/projects/ia64/share/man/man9/VOP_GETEXTATTR.9#3 integrate ... //depot/projects/ia64/share/man/man9/critical_enter.9#3 integrate ... //depot/projects/ia64/share/man/man9/lock.9#4 integrate ... //depot/projects/ia64/share/man/man9/mutex.9#4 integrate ... //depot/projects/ia64/share/man/man9/random.9#2 integrate ... //depot/projects/ia64/share/man/man9/random_harvest.9#3 integrate ... //depot/projects/ia64/share/man/man9/rijndael.9#3 integrate ... //depot/projects/ia64/share/man/man9/scheduler.9#3 integrate ... //depot/projects/ia64/share/man/man9/selrecord.9#1 branch ... //depot/projects/ia64/share/man/man9/sx.9#4 integrate ... //depot/projects/ia64/share/mk/bsd.README#3 integrate ... //depot/projects/ia64/share/mk/bsd.libnames.mk#5 integrate ... //depot/projects/ia64/share/mk/bsd.prog.mk#6 integrate ... //depot/projects/ia64/sys/alpha/alpha/db_instruction.h#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/machdep.c#12 integrate ... //depot/projects/ia64/sys/alpha/conf/GENERIC#7 integrate ... //depot/projects/ia64/sys/alpha/include/endian.h#5 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#7 integrate ... //depot/projects/ia64/sys/alpha/pci/lca_pci.c#3 integrate ... //depot/projects/ia64/sys/boot/i386/kgzldr/Makefile#2 integrate ... //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#7 integrate ... //depot/projects/ia64/sys/compat/linux/linux_misc.c#7 integrate ... //depot/projects/ia64/sys/compat/linux/linux_uid16.c#4 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#3 integrate ... //depot/projects/ia64/sys/conf/files#15 integrate ... //depot/projects/ia64/sys/conf/files.alpha#5 integrate ... //depot/projects/ia64/sys/conf/options.alpha#3 integrate ... //depot/projects/ia64/sys/ddb/db_ps.c#3 integrate ... //depot/projects/ia64/sys/dev/ata/ata-dma.c#11 integrate ... //depot/projects/ia64/sys/dev/ata/ata-pci.c#11 integrate ... //depot/projects/ia64/sys/dev/ata/ata-raid.c#9 integrate ... //depot/projects/ia64/sys/dev/fb/fb.c#2 integrate ... //depot/projects/ia64/sys/dev/fb/fbreg.h#3 integrate ... //depot/projects/ia64/sys/dev/fb/gfb.c#2 integrate ... //depot/projects/ia64/sys/dev/fb/tga.c#2 integrate ... //depot/projects/ia64/sys/dev/gfb/gfb_pci.c#3 integrate ... //depot/projects/ia64/sys/dev/nge/if_nge.c#6 integrate ... //depot/projects/ia64/sys/dev/nge/if_ngereg.h#2 integrate ... //depot/projects/ia64/sys/dev/pccard/pccarddevs#11 integrate ... //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#11 integrate ... //depot/projects/ia64/sys/dev/pccbb/pccbb.c#6 integrate ... //depot/projects/ia64/sys/dev/pccbb/pccbbreg.h#3 integrate ... //depot/projects/ia64/sys/dev/pci/pci_pci.c#4 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/feeder_fmt.c#2 integrate ... //depot/projects/ia64/sys/dev/syscons/scgfbrndr.c#3 integrate ... //depot/projects/ia64/sys/dev/syscons/syscons.c#6 integrate ... //depot/projects/ia64/sys/dev/syscons/syscons.h#2 integrate ... //depot/projects/ia64/sys/dev/usb/umass.c#9 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi.c#14 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#4 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#3 integrate ... //depot/projects/ia64/sys/dev/wi/if_wivar.h#4 integrate ... //depot/projects/ia64/sys/dev/wi/wi_hostap.c#2 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_ctl.c#5 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_dbregs.c#4 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_fpregs.c#4 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_mem.c#3 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_regs.c#4 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_status.c#6 integrate ... //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#27 integrate ... //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#11 integrate ... //depot/projects/ia64/sys/ia64/ia64/trap.c#21 integrate ... //depot/projects/ia64/sys/ia64/include/stdarg.h#2 integrate ... //depot/projects/ia64/sys/kern/init_sysent.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#13 integrate ... //depot/projects/ia64/sys/kern/kern_intr.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_ktrace.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_prot.c#11 integrate ... //depot/projects/ia64/sys/kern/kern_resource.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_sig.c#8 integrate ... //depot/projects/ia64/sys/kern/sys_pipe.c#11 integrate ... //depot/projects/ia64/sys/kern/sys_process.c#6 integrate ... //depot/projects/ia64/sys/kern/syscalls.c#4 integrate ... //depot/projects/ia64/sys/kern/syscalls.master#4 integrate ... //depot/projects/ia64/sys/kern/uipc_mbuf.c#4 integrate ... //depot/projects/ia64/sys/kern/vfs_aio.c#10 integrate ... //depot/projects/ia64/sys/modules/wi/Makefile#4 integrate ... //depot/projects/ia64/sys/net/if_media.h#3 integrate ... //depot/projects/ia64/sys/powerpc/include/endian.h#5 integrate ... //depot/projects/ia64/sys/security/lomac/kernel_log.c#3 integrate ... //depot/projects/ia64/sys/sparc64/include/endian.h#5 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#12 integrate ... //depot/projects/ia64/sys/sys/fbio.h#2 integrate ... //depot/projects/ia64/sys/sys/syscall.h#4 integrate ... //depot/projects/ia64/sys/sys/syscall.mk#4 integrate ... //depot/projects/ia64/sys/sys/sysproto.h#5 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#8 integrate ... //depot/projects/ia64/sys/vm/uma_int.h#6 integrate ... //depot/projects/ia64/tools/make_libdeps.sh#1 branch ... //depot/projects/ia64/usr.bin/Makefile#18 integrate ... //depot/projects/ia64/usr.bin/doscmd/cwd.c#4 integrate ... //depot/projects/ia64/usr.bin/doscmd/dos.h#2 integrate ... //depot/projects/ia64/usr.bin/doscmd/ems.c#4 integrate ... //depot/projects/ia64/usr.bin/doscmd/emuint.c#3 integrate ... //depot/projects/ia64/usr.bin/doscmd/emuint.h#2 integrate ... //depot/projects/ia64/usr.bin/doscmd/trace.c#3 integrate ... //depot/projects/ia64/usr.bin/doscmd/tty.c#5 integrate ... //depot/projects/ia64/usr.bin/doscmd/xms.c#3 integrate ... //depot/projects/ia64/usr.bin/doscmd/xms.h#2 integrate ... //depot/projects/ia64/usr.bin/find/Makefile#6 integrate ... //depot/projects/ia64/usr.bin/find/getdate.y#1 branch ... //depot/projects/ia64/usr.bin/find/operator.c#6 integrate ... //depot/projects/ia64/usr.bin/fstat/fstat.1#3 integrate ... //depot/projects/ia64/usr.bin/gcore/gcore.c#3 integrate ... //depot/projects/ia64/usr.bin/kdump/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/limits/limits.c#2 integrate ... //depot/projects/ia64/usr.bin/make/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/make/arch.c#3 integrate ... //depot/projects/ia64/usr.bin/make/buf.c#2 integrate ... //depot/projects/ia64/usr.bin/make/buf.h#3 integrate ... //depot/projects/ia64/usr.bin/make/compat.c#3 integrate ... //depot/projects/ia64/usr.bin/make/cond.c#3 integrate ... //depot/projects/ia64/usr.bin/make/config.h#2 integrate ... //depot/projects/ia64/usr.bin/make/dir.c#3 integrate ... //depot/projects/ia64/usr.bin/make/dir.h#3 integrate ... //depot/projects/ia64/usr.bin/make/for.c#3 integrate ... //depot/projects/ia64/usr.bin/make/hash.c#3 integrate ... //depot/projects/ia64/usr.bin/make/hash.h#3 integrate ... //depot/projects/ia64/usr.bin/make/job.c#3 integrate ... //depot/projects/ia64/usr.bin/make/job.h#3 integrate ... //depot/projects/ia64/usr.bin/make/list.h#2 integrate ... //depot/projects/ia64/usr.bin/make/lst.h#4 integrate ... //depot/projects/ia64/usr.bin/make/main.c#4 integrate ... //depot/projects/ia64/usr.bin/make/make.1#2 integrate ... //depot/projects/ia64/usr.bin/make/make.c#3 integrate ... //depot/projects/ia64/usr.bin/make/make.h#3 integrate ... //depot/projects/ia64/usr.bin/make/nonints.h#3 integrate ... //depot/projects/ia64/usr.bin/make/parse.c#4 integrate ... //depot/projects/ia64/usr.bin/make/pathnames.h#2 integrate ... //depot/projects/ia64/usr.bin/make/sprite.h#2 integrate ... //depot/projects/ia64/usr.bin/make/str.c#2 integrate ... //depot/projects/ia64/usr.bin/make/suff.c#3 integrate ... //depot/projects/ia64/usr.bin/make/targ.c#4 integrate ... //depot/projects/ia64/usr.bin/make/var.c#4 integrate ... //depot/projects/ia64/usr.bin/mkstr/mkstr.1#2 integrate ... //depot/projects/ia64/usr.bin/mkstr/mkstr.c#4 integrate ... //depot/projects/ia64/usr.bin/msgs/msgs.1#2 integrate ... //depot/projects/ia64/usr.bin/msgs/msgs.c#3 integrate ... //depot/projects/ia64/usr.bin/mt/mt.1#2 integrate ... //depot/projects/ia64/usr.bin/mt/mt.c#4 integrate ... //depot/projects/ia64/usr.bin/passwd/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/sed/compile.c#5 integrate ... //depot/projects/ia64/usr.bin/systat/pigs.c#4 integrate ... //depot/projects/ia64/usr.bin/tail/reverse.c#5 integrate ... //depot/projects/ia64/usr.bin/tftp/main.c#5 integrate ... //depot/projects/ia64/usr.bin/tftp/tftp.1#2 integrate ... //depot/projects/ia64/usr.bin/tftp/tftp.c#5 integrate ... //depot/projects/ia64/usr.bin/tftp/tftpsubs.c#3 integrate ... //depot/projects/ia64/usr.bin/truss/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/vmstat/vmstat.c#7 integrate ... //depot/projects/ia64/usr.sbin/amd/include/Makefile#2 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/cdrom.c#2 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/index.c#3 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#6 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#18 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.251 2002/04/08 15:11:29 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.255 2002/04/13 07:24:14 des Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -123,17 +123,21 @@ MAKEOBJDIRPREFIX?= /usr/obj TARGET_ARCH?= ${MACHINE_ARCH} +.if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} +.else +TARGET?= ${TARGET_ARCH} +.endif .if make(buildworld) BUILD_ARCH!= sysctl -n hw.machine_arch .if ${MACHINE_ARCH} != ${BUILD_ARCH} .error To cross-build, set TARGET_ARCH. .endif .endif -.if ${MACHINE_ARCH} == ${TARGET_ARCH} +.if ${MACHINE} == ${TARGET} OBJTREE= ${MAKEOBJDIRPREFIX} .else -OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET_ARCH} +OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/${MACHINE_ARCH} # /usr/games added for fortune which depend on strfile @@ -242,6 +246,10 @@ @echo "--------------------------------------------------------------" .if !defined(NOCLEAN) rm -rf ${WORLDTMP} +.else + # XXX - These two can depend on any header file. + rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c + rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif .for _dir in ${USRDIRS} mkdir -p ${WORLDTMP}/${_dir} @@ -375,13 +383,6 @@ .endif INSTKERNNAME?= kernel -# The only exotic TARGET_ARCH/TARGET combination valid at this -# time is i386/pc98. In all other cases set TARGET equal to -# TARGET_ARCH. -.if ${TARGET_ARCH} != "i386" || ${TARGET} != "pc98" -TARGET= ${TARGET_ARCH} -.endif - KRNLSRCDIR= ${.CURDIR}/sys KRNLCONFDIR= ${KRNLSRCDIR}/${TARGET}/conf KRNLOBJDIR= ${OBJTREE}${KRNLSRCDIR} @@ -716,82 +717,76 @@ cd ${.CURDIR}/lib/libutil; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libvgl; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libwrap; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libypclnt; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libz; ${MAKE} beforeinstall cd ${.CURDIR}/usr.bin/lex; ${MAKE} beforeinstall # # libraries - build all libraries, and install them under ${DESTDIR}. # -# The following dependencies exist between the libraries: +# The list of libraries with dependents (${_prebuild_libs}) and their +# interdependencies (__L) are built automatically by the +# ${.CURDIR}/tools/make_libdeps.sh script. # -# lib*: csu libgcc_pic -# libatm: libmd -# libcam: libsbuf -# libcrypt: libmd -# libdevstat: libkvm -# libdialog: libncurses -# libedit: libncurses -# libg++: msun -# libkrb: libcrypt -# libopie: libmd -# libpam: libcom_err libcrypt libcrypto libkrb libopie libradius \ -# librpcsvc libtacplus libutil libz libssh -# libradius: libmd -# libreadline: libncurses -# libssh: libcrypto libz -# libstc++: msun -# libtacplus: libmd -# -# Across directories this comes down to (rougly): -# -# gnu/lib: lib/msun lib/libncurses -# kerberosIV/lib kerberos5/lib: lib/libcrypt -# lib/libpam: secure/lib/libcrypto kerberosIV/lib/libkrb \ -# secure/lib/libssh lib/libz -# secure/lib: secure/lib/libcrypto lib/libmd lib/libz -# +libraries: + cd ${.CURDIR}; \ + ${MAKE} -f Makefile.inc1 _startup_libs; \ + ${MAKE} -f Makefile.inc1 _prebuild_libs; \ + ${MAKE} -f Makefile.inc1 _generic_libs; + .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}.pcc) -_csu= lib/csu/${MACHINE_ARCH}.pcc +_startup_libs= lib/csu/${MACHINE_ARCH}.pcc .elif ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" -_csu= lib/csu/i386-elf +_startup_libs= lib/csu/i386-elf .else -_csu= lib/csu/${MACHINE_ARCH} +_startup_libs= lib/csu/${MACHINE_ARCH} .endif - .if !defined(NO_GCC) -_gnu_csu= gnu/lib/csu -_libgcc= gnu/lib/libgcc +_startup_libs+= gnu/lib/csu gnu/lib/libgcc .endif -.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) -_secure_lib= secure/lib -.if exists(${.CURDIR}/secure/lib/libcrypto) -_libcrypto= secure/lib/libcrypto +_prebuild_libs= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ + lib/libncurses lib/libopie lib/libradius lib/librpcsvc \ + lib/libsbuf lib/libtacplus lib/libutil lib/libz lib/msun + +lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L + +_generic_libs= lib gnu/lib + +.if !defined(NOPERL) && !defined(NO_PERL) +_generic_libs+= gnu/usr.bin/perl/libperl .endif + +.if !defined(NOCRYPT) +.if defined(MAKE_KERBEROS4) +_prebuild_libs+= kerberosIV/lib/libkrb +kerberosIV/lib/libkrb__L: lib/libcrypt__L +_generic_libs+= kerberosIV/lib .endif - -.if !defined(NOCRYPT) && defined(MAKE_KERBEROS4) -_kerberosIV_lib= kerberosIV/lib +.if defined(MAKE_KERBEROS5) +_prebuild_libs+= kerberos5/lib/libasn1 +_prebuild_libs+= kerberos5/lib/libgssapi +_prebuild_libs+= kerberos5/lib/libkrb5 +_prebuild_libs+= kerberos5/lib/libroken +_generic_libs+= kerberos5/lib .endif - -.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5) -_kerberos5_lib= kerberos5/lib +.if !defined(NOSECURE) +_prebuild_libs+= secure/lib/libcrypto +.if !defined(NO_OPENSSH) +_prebuild_libs+= secure/lib/libssh +secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L .endif +_generic_libs+= secure/lib +.endif !defined(NOSECURE) +.endif !defined(NOCRYPT) +_generic_libs+= usr.bin/lex/lib .if ${MACHINE_ARCH} == "i386" -_libkeycap= usr.sbin/pcvt/keycap +_generic_libs+= usr.sbin/pcvt/keycap .endif -.if !defined(NOPERL) && !defined(NO_PERL) -_libperl= gnu/usr.bin/perl/libperl -.endif - -libraries: -.for _lib in ${_csu} ${_gnu_csu} ${_libgcc} lib/libmd lib/libcrypt \ - lib/libz ${_libcrypto} ${_secure_lib} ${_kerberosIV_lib} \ - ${_kerberos5_lib} lib/libcom_err lib/libkvm lib/msun lib/libncurses \ - lib/libopie lib/libradius lib/librpcsvc lib/libsbuf lib/libtacplus \ - lib/libutil lib gnu/lib ${_libperl} usr.bin/lex/lib ${_libkeycap} +.for _lib in ${_startup_libs} ${_prebuild_libs} ${_generic_libs} +${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) cd ${.CURDIR}/${_lib}; \ ${MAKE} depend; \ @@ -800,6 +795,10 @@ .endif .endfor +_startup_libs: ${_startup_libs:S/$/__L/} +_prebuild_libs: ${_prebuild_libs:S/$/__L/} +_generic_libs: ${_generic_libs:S/$/__L/} + .for __target in clean cleandepend cleandir depend obj .for entry in ${SUBDIR} ${entry}.${__target}__D: .PHONY ==== //depot/projects/ia64/bin/pax/options.c#3 (text+ko) ==== @@ -39,10 +39,11 @@ #if 0 static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94"; #endif -static const char rcsid[] = - "$FreeBSD: src/bin/pax/options.c,v 1.21 2002/02/02 07:07:59 imp Exp $"; #endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/bin/pax/options.c,v 1.22 2002/04/12 20:23:51 charnier Exp $"); + #include #include #include @@ -161,15 +162,20 @@ else argv0 = argv[0]; - if (strcmp(NM_TAR, argv0) == 0) - return(tar_options(argc, argv)); - else if (strcmp(NM_CPIO, argv0) == 0) - return(cpio_options(argc, argv)); + if (strcmp(NM_TAR, argv0) == 0) { + tar_options(argc, argv); + return; + } + else if (strcmp(NM_CPIO, argv0) == 0) { + cpio_options(argc, argv); + return; + } /* * assume pax as the default */ argv0 = NM_PAX; - return(pax_options(argc, argv)); + pax_options(argc, argv); + return; } /* @@ -555,7 +561,7 @@ } --argc; dirptr = argv[argc]; - /* FALL THROUGH */ + /* FALLTHROUGH */ case ARCHIVE: case APPND: for (; optind < argc; optind++) @@ -1240,7 +1246,7 @@ cpio_usage(); --argc; ++argv; - /* FALL THROUGH */ + /* FALLTHROUGH */ case ARCHIVE: case APPND: if (*argv != NULL) ==== //depot/projects/ia64/contrib/binutils/bfd/ChangeLog#4 (text+ko) ==== @@ -1,3 +1,302 @@ +2002-04-06 Hans-Peter Nilsson + + * elf32-cris.c (cris_elf_howto_table) : Fix typo in name. + (cris_elf_check_relocs): Always create .rela.got here when + R_CRIS_16_GOTPLT or R_CRIS_32_GOTPLT is seen. + (elf_cris_adjust_gotplt_to_got): Don't create .rela.got here; + assume it's created. + +2002-04-04 Alan Modra + + * configure.in: Bump version to 2.12.1 and comment out is_release. + * configure: Regenerate. + * dep-in.sed: Cope with absolute paths. + * Makefile.am (dep.sed): Subst TOPDIR, and not INCDIR. + Run "make dep-am". + * Makefile.in: Regenerate. + + Merge from mainline + 2002-04-04 Alan Modra + * srec.c (MAXCHUNK, Chunk): Revise comments. + (srec_write_record): Correct buffer size. + (srec_write_header): Do without intermediate buffer. + (srec_write_section): Validate Chunk. + (srec_write_terminator): Pass NULL instead of dummy buffer. + (srec_write_symbols): Pass file and symbol names directly to + bfd_bwrite so sprintf won't overflow buffer. + + 2002-04-03 Jakub Jelinek + * elf32-sparc.c (elf32_sparc_relocate_section): Don't emit dynamic + PC relative relocs against hidden symbols. + * elf64-sparc.c (sparc64_elf_relocate_section): Likewise. + + 2002-04-03 Alan Modra + * elf.c (_bfd_elf_make_section_from_shdr): When setting section + LMAs, loop over segments until p_vaddr and p_memsz specify an + extent enclosing the section. + + 2002-04-02 Nick Clifton + * ihex.c (ihex_write_object_contents): Do not allow records to + cross a 64K boundary - wrap if necessary. + + 2002-03-28 Alan Modra + * linker.c (link_action): Ignore duplicate warning syms. + (_bfd_generic_link_write_global_symbol): Follow warning symbol link. + * elflink.h (elf_adjust_dynstr_offsets): Likewise. + (elf_adjust_dynamic_symbol): Likewise. + (elf_export_symbol): Likewise. + (elf_link_find_version_dependencies): Likewise. + (elf_link_assign_sym_version): Likewise. + (elf_link_sec_merge_syms): Likewise. + (elf_link_output_extsym): Likewise. + (elf_gc_sweep_symbol): Likewise. + (elf_gc_propagate_vtable_entries_used): Likewise. + (elf_gc_smash_unused_vtentry_relocs): Likewise. + (elf_gc_allocate_got_offsets): Likewise. + (elf_collect_hash_codes): Likewise. + * elflink.c (elf_link_renumber_hash_table_dynsyms): Likewise. + * elf-hppa.h (elf_hppa_unmark_useless_dynamic_symbols): Likewise. + (elf_hppa_remark_useless_dynamic_symbols): Likewise. + * elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Likewise. + * elf32-arm.h (elf32_arm_discard_copies): Likewise. + * elf32-cris.c (elf_cris_adjust_gotplt_to_got): Likewise. + (elf_cris_discard_excess_dso_dynamics): Likewise. + * elf32-hppa.c (clobber_millicode_symbols): Likewise. + (mark_PIC_calls): Likewise. + (allocate_plt_static): Likewise. + (allocate_dynrelocs): Likewise. + (readonly_dynrelocs): Likewise. + * elf32-i386.c (allocate_dynrelocs): Likewise. + (readonly_dynrelocs): Likewise. + * elf32-i370.c (i370_elf_adjust_dynindx): Likewise. + * elf32-m68k.c (elf_m68k_discard_copies): Likewise. + * elf32-mips.c (mips_elf_output_extsym): Likewise. + (mips_elf_sort_hash_table_f): Likewise. + (mips_elf_check_mips16_stubs): Likewise. + * elf32-s390.c (allocate_dynrelocs): Likewise. + (readonly_dynrelocs): Likewise. + * elf32-sh.c (sh_elf_discard_copies): Likewise. + * elf32-xstormy16.c (xstormy16_relax_plt_check): Likewise. + (xstormy16_relax_plt_realloc): Likewise. + * elf64-alpha.c (elf64_alpha_calc_got_offsets_for_symbol): Likewise. + (elf64_alpha_output_extsym): Likewise. + * elf64-hppa.c (elf64_hppa_mark_exported_functions): Likewise. + * elf64-mips.c (mips_elf64_sort_hash_table_f): Likewise. + (mips_elf64_check_mips16_stubs): Likewise. + (mips_elf64_output_extsym): Likewise. + * elf64-ppc.c (func_desc_adjust): Likewise. + (allocate_dynrelocs): Likewise. + (readonly_dynrelocs): Likewise. + * elf64-s390.c (allocate_dynrelocs): Likewise. + (readonly_dynrelocs): Likewise. + * elf64-sh64.c (sh64_elf64_discard_copies): Likewise. + * elf64-x86-64.c (elf64_x86_64_discard_copies): Likewise. + * elfxx-ia64.c (elfNN_ia64_global_dyn_sym_thunk): Likewise. + * aoutx.h (aout_link_write_other_symbol): Likewise. + * cofflink.c (_bfd_coff_write_task_globals): Likewise. + (_bfd_coff_write_global_sym): Likewise. + * i386linux.c (linux_tally_symbols): Likewise. + * m68klinux.c (linux_tally_symbols): Likewise. + * sparclinux.c (linux_tally_symbols): Likewise. + * pdp11.c (aout_link_write_other_symbol): Likewise. + * sunos.c (sunos_scan_dynamic_symbol): Likewise. + * xcofflink.c (xcoff_build_ldsyms): Likewise. + (xcoff_write_global_symbol): Likewise. + * cofflink.c (_bfd_coff_final_link): Formatting. + * elf32-i386.c (elf_i386_check_relocs): Formatting. + * elf32-sh.c (sh_elf_size_dynamic_sections): Likewise. + * elf64-alpha.c (elf64_alpha_output_extsym): Likewise. + * elf64-mips.c (mips_elf64_sort_hash_table): Likewise. + (mips_elf64_final_link): Likewise. + * elflink.h (elf_link_find_version_dependencies): Remove duplicate + prototype. + + 2002-03-21 Richard Earnshaw + * elf32-arm.h (elf32_arm_final_link_relocate , + ): Handle relocations to Thumb functions. + + 2002-03-19 Hans-Peter Nilsson + * elflink.h (NAME(bfd_elf,record_link_assignment)): Don't set + STT_NOTYPE symbols to STT_OBJECT. + + 2002-03-13 Alan Modra + * archures.c (bfd_default_compatible): Test bits_per_word. + * cpu-i386.c (i386_compatible): Remove. Replace occurrences with + bfd_default_compatible. + * cpu-i370.c (i370_compatible): Likewise. + * cpu-sparc.c (sparc_compatible): Likewise. + * cpu-h8300.c (compatible): Test in->arch == out->arch. + + 2002-02-19 Martin Schwidefsky + * archures.c (bfd_mach_s390_esa): Rename to bfd_mach_s390_31. + (bfd_mach_s390_esame): Rename to bfd_mach_s390_64. + * bfd-in2.h: Regenerate. + * cpu-s390.c (arch_info_struct): Use renamed architecture defines. + Replace architecture name "s390" with "s390:31-bit" and "s390:esame" + with "s390:64-bit". + * elf32-s390.c (elf_howto_table): Add 32 bit pc relative relocations. + (elf_s390_reloc_type_lookup): Likewise. + (elf_s390_check_relocs): Likewise. + (elf_s390_gc_sweep_hook): Likewise. + (elf_s390_relocate_section): Likewise. + (elf_s390_object_p): Use renamed architecture define. + * elf64-s390.c (elf_s390_object_p): Use renamed architecture define. + +2002-04-03 Alan Modra + + Merge from mainline. + 2002-03-28 Alan Modra + * cpu-mips.c (mips_compatible): Make static, prototype. + + 2002-03-14 Alan Modra + * cpu-mips.c (mips_compatible): New. Don't check bits_per_word. + (N): Use the above. + +2002-04-01 Nathan Williams + + * elf.c (elfcore_netbsd_get_lwpid): Fix off-by-one error + which caused the returned LWP ID to always be 0. + +2002-04-01 Richard Henderson + + * elf32-sparc.c (WILL_CALL_FINISH_DYNAMIC_SYMBOL): New. + (elf32_sparc_relocate_section): Use it to figure out when to + initialize .got entries. + * elf64-sparc.c: Similarly. + +2002-03-28 Alan Modra + + * aclocal.m4: Regenerate. + * config.in: Regenerate. + * Makefile.am: Run "make dep-am". + * Makefile.in: Regenerate. + + Merge from mainline + 2002-03-27 Gregory Steuck + * elf.c (_bfd_elf_get_symtab_upper_bound): Leave space for + terminating NULL if empty symbol table. + (_bfd_elf_get_dynamic_symtab_upper_bound): Likewise. + + 2002-03-26 Alan Modra + * elflink.h (elf_gc_mark): Don't recurse into non-ELF sections. + + 2002-03-23 Alan Modra + * elf.c (_bfd_elf_make_section_from_shdr): Don't set lma based on + section file offset for !SEC_LOAD sections. + + 2002-03-20 Daniel Jacobowitz + * dwarf2.c (struct funcinfo): Move up. + (lookup_address_in_function_table): New argument function_ptr. + Set it. + (lookup_address_in_line_table): New argument function. If function + is non-NULL, use it to handle ``addr'' before the first line note of + the function. + (comp_unit_find_nearest_line): Update and swap calls to + lookup_address_in_function_table and lookup_address_in_line_table. + * syms.c (_bfd_stab_section_find_nearest_line): Use the first + N_SLINE encountered if we see an N_FUN before any N_SLINE. + + 2002-03-18 Alan Modra + * libbfd.c (bfd_write_bigendian_4byte_int): Return true iff success. + * libbfd.h: Regenerate. + * archive.c (coff_write_armap): Pass on failures from + bfd_write_bigendian_4byte_int. + + 2002-03-14 H.J. Lu + * elflink.h (NAME(bfd_elf,size_dynamic_sections)): Set the BFD + error to bfd_error_nonrepresentable_section for reinit_array + section in DSO. + + 2002-03-14 Nick Clifton + * coffcode.h (coff_slurp_symbol_table): When adding BSF_WEAK flag, + OR it in rather than replacing previously selected flags. + * elfxx-target.h (TARGET_BIG_SYM): Set ar_max_namelen to 15. + (TARGET_LITTLE_SYM): Set ar_max_namelen to 15. + + 2002-03-14 Alan Modra + * elflink.h (elf_bfd_final_link): Revert last change. Instead, + ensure reloc size matches before calling elf_link_input_bfd. + Add an assert to check reloc size when counting output relocs. + + 2002-03-14 Nick Clifton + * mmo.c (mmo_get_loc): Return NULL rather than false. + + 2002-03-13 Alan Modra + * elflink.h: Formatting fixes. + (elf_link_output_extsym): Merge undefined and undef weak cases. + * elflink.h (elf_bfd_final_link): Only call elf_link_input_bfd + when word size of input matches output word size. + + 2002-03-07 H.J. Lu (hjl@gnu.org) + * coff-sh.c (shcoff_reloc_map): Use bfd_reloc_code_real_type + as the type for bfd_reloc_val. + + 2002-03-05 John David Anglin + * elf-hppa.h (elf_hppa_is_dynamic_loader_symbol): New function. + (elf_hppa_relocate_section): Ignore undefined dynamic loader symbols. + (elf_hppa_final_link_relocate): Correct relocations for indirect + references to local data through the DLT. Fix .opd creation for + local symbols using R_PARISC_LTOFF_FPTR32 and R_PARISC_FPTR64 + relocations. Use e_lsel selector for R_PARISC_DLTIND21L, + R_PARISC_LTOFF_FPTR21L and R_PARISC_LTOFF_TP21L as per + "Processor-Specific ELF for PA_RISC, Version 1.43" document. + Similarly, use e_rsel for DLT and LTOFF 'R' relocations. + * elf32-hppa.c (final_link_relocate): Revise relocation selectors + as per "Processor-Specific ELF for PA_RISC, Version 1.43" document. + + 2002-03-05 Jakub Jelinek + * merge.c (_bfd_merge_sections): Don't segfault if there + is nothing to merge due to GC. + + 2002-03-05 Alan Modra + * elf32-hppa.c (clobber_millicode_symbols): Remove hack to keep + symbols that have been forced local. + * elflink.h (elf_bfd_final_link): Call elf_link_output_extsym + to output forced local syms for non-shared link. + (elf_link_output_extsym): Tweak condition for calling backend + adjust_dynamic_symbol so that previous behaviour is kept. + Whitespace changes throughout file. + + 2002-03-04 H.J. Lu + * elf.c (bfd_section_from_shdr): Handle special sections, + .init_array, .fini_array and .preinit_array. + (elf_fake_sections): Likewise. + * elflink.h (NAME(bfd_elf,size_dynamic_sections)): Create the + DT entry only if the section is in output for .init_array, + .fini_array and .preinit_array. Complain about .preinit_array + section in DSO. + (elf_bfd_final_link): Warn zero size for .init_array, + .fini_array and .preinit_array sections. + * elfxx-ia64.c (elfNN_ia64_section_from_shdr): Remove + SHT_INIT_ARRAY, SHT_FINI_ARRAY and SHT_PREINIT_ARRAY. + (elfNN_ia64_fake_sections): Remove .init_array, .fini_array and + .preinit_array. + + 2002-03-01 David Mosberger + * elflink.h (size_dynamic_sections): If section named + ".preinit_array" exists, create DT_PREINIT_ARRAY and + DT_PREINIT_ARRAYSZ entries in dynamic table. Analogously for + ".init_array" and ".fini_array". + (elf_bfd_final_link): Handle DT_PREINIT_ARRAYSZ, DT_INIT_ARRAYSZ, + DT_FINI_ARRAYSZ, DT_PREINIT_ARRAY, DT_INIT_ARRAY, and + DT_FINI_ARRAY. + + 2002-02-19 Frank Ch. Eigler + * syms.c (stt[]): Sorted. Added .init/.fini -> "t" mapping. + + 2002-02-13 Nick Clifton + * elf.c (_bfd_elf_make_section_from_shdr): Do not insist on + non-zero physical addresses when adjusting the LMAs of new + sections. + + 2002-02-11 Michael Snyder + * elf-bfd.h (elfcore_write_lwpstatus): Add prototype. + * elf.c (elfcore_grok_pstatus): Add prototype. + (elfcore_grok_lwpstatus): Add prototype. + (elfcore_write_lwpstatus): New function. + (elfcore_write_pstatus): Fix typo, eliminate unnecessary memcpy. + 2002-03-20 Tom Rix * coff-rs6000.c (_bfd_xcoff_stat_arch_elt): Renamed from ==== //depot/projects/ia64/contrib/binutils/bfd/Makefile.am#3 (text+ko) ==== @@ -700,8 +700,8 @@ dep.sed: dep-in.sed config.status sed <$(srcdir)/dep-in.sed >dep.sed \ -e 's!@BFD_H@!$(BFD_H)!' \ - -e 's!@INCDIR@!$(INCDIR)!' \ - -e 's!@SRCDIR@!$(srcdir)!' + -e 's!@SRCDIR@!$(srcdir)!' \ + -e 's!@TOPDIR@!'`echo $(srcdir) | sed -e s,/bfd$$,,`'!' dep: DEP sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile @@ -1141,12 +1141,9 @@ elf32-target.h elf32-sh64.lo: elf32-sh64.c $(INCDIR)/filenames.h elf-bfd.h \ $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \ - $(INCDIR)/bfdlink.h elf32-sh.c $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \ - elf32-target.h $(srcdir)/../opcodes/sh64-opc.h -elf64-sh64.lo: elf64-sh64.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ - elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ - $(INCDIR)/elf/external.h $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \ - elf64-target.h + $(INCDIR)/bfdlink.h $(srcdir)/../opcodes/sh64-opc.h \ + elf32-sh.c $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h \ + elf32-target.h elf32-s390.lo: elf32-s390.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ $(INCDIR)/elf/external.h $(INCDIR)/elf/s390.h $(INCDIR)/elf/reloc-macros.h \ @@ -1426,6 +1423,10 @@ elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ $(INCDIR)/elf/external.h $(INCDIR)/elf/s390.h $(INCDIR)/elf/reloc-macros.h \ elf64-target.h +elf64-sh64.lo: elf64-sh64.c $(INCDIR)/filenames.h $(INCDIR)/bfdlink.h \ + elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 13 21:43:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 794C237B405; Sat, 13 Apr 2002 21:43:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AC9D737B404 for ; Sat, 13 Apr 2002 21:43:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3E4hNF81028 for perforce@freebsd.org; Sat, 13 Apr 2002 21:43:23 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 13 Apr 2002 21:43:23 -0700 (PDT) Message-Id: <200204140443.g3E4hNF81028@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9701 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9701 Change 9701 by peter@peter_thunder on 2002/04/13 21:42:43 sync with unwind.c as committed to cvs Affected files ... ... //depot/projects/ia64/lib/libc/ia64/gen/unwind.c#5 integrate Differences ... ==== //depot/projects/ia64/lib/libc/ia64/gen/unwind.c#5 (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$ + * $FreeBSD: src/lib/libc/ia64/gen/unwind.c,v 1.1 2002/04/13 04:06:34 marcel Exp $ */ #include @@ -38,7 +38,7 @@ #define PT_IA_64_UNWIND 0x70000001 #endif -#define SANITY 1 +#define SANITY 0 struct ia64_unwind_entry { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 13 21:48:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4FCC37B405; Sat, 13 Apr 2002 21:47:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3382C37B400 for ; Sat, 13 Apr 2002 21:47:30 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3E4lSV81394 for perforce@freebsd.org; Sat, 13 Apr 2002 21:47:28 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 13 Apr 2002 21:47:28 -0700 (PDT) Message-Id: <200204140447.g3E4lSV81394@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9702 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9702 Change 9702 by peter@peter_thunder on 2002/04/13 21:47:15 convert type to "text" instead of "text+ko" Affected files ... ... //depot/projects/ia64/contrib/openpam/CREDITS#2 edit ... //depot/projects/ia64/contrib/openpam/HISTORY#6 edit ... //depot/projects/ia64/contrib/openpam/INSTALL#5 edit ... //depot/projects/ia64/contrib/openpam/LICENSE#5 edit ... //depot/projects/ia64/contrib/openpam/MANIFEST#6 edit ... //depot/projects/ia64/contrib/openpam/Makefile#5 edit ... //depot/projects/ia64/contrib/openpam/README#6 edit ... //depot/projects/ia64/contrib/openpam/RELNOTES#6 edit ... //depot/projects/ia64/contrib/openpam/bin/Makefile#5 edit ... //depot/projects/ia64/contrib/openpam/bin/su/Makefile#5 edit ... //depot/projects/ia64/contrib/openpam/bin/su/su.c#5 edit ... //depot/projects/ia64/contrib/openpam/doc/Makefile#5 edit ... //depot/projects/ia64/contrib/openpam/doc/man/Makefile#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#2 edit ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#2 edit ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#2 edit ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#6 edit ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#6 edit ... //depot/projects/ia64/contrib/openpam/include/security/openpam.h#8 edit ... //depot/projects/ia64/contrib/openpam/include/security/pam_appl.h#5 edit ... //depot/projects/ia64/contrib/openpam/include/security/pam_constants.h#6 edit ... //depot/projects/ia64/contrib/openpam/include/security/pam_modules.h#6 edit ... //depot/projects/ia64/contrib/openpam/include/security/pam_types.h#5 edit ... //depot/projects/ia64/contrib/openpam/lib/Makefile#6 edit ... //depot/projects/ia64/contrib/openpam/lib/openpam_borrow_cred.c#2 edit ... //depot/projects/ia64/contrib/openpam/lib/openpam_dispatch.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/openpam_findenv.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/openpam_free_data.c#2 edit ... //depot/projects/ia64/contrib/openpam/lib/openpam_get_option.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#6 edit ... //depot/projects/ia64/contrib/openpam/lib/openpam_load.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/openpam_restore_cred.c#2 edit ... //depot/projects/ia64/contrib/openpam/lib/openpam_set_option.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/openpam_static.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_acct_mgmt.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_authenticate.c#6 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_authenticate_secondary.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_chauthtok.c#6 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_close_session.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_end.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_error.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#6 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_get_data.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_get_item.c#6 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_authtok.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_username.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_get_user.c#6 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_getenv.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_getenvlist.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_info.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_open_session.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_prompt.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_putenv.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_set_data.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_set_item.c#6 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_authtok.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_username.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_setcred.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_setenv.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_acct_mgmt.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_chauthtok.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_close_session.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_username.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_open_session.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_username.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_setcred.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_start.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_strerror.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_verror.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_vinfo.c#5 edit ... //depot/projects/ia64/contrib/openpam/lib/pam_vprompt.c#5 edit ... //depot/projects/ia64/contrib/openpam/misc/gendoc.pl#5 edit ... //depot/projects/ia64/contrib/openpam/modules/Makefile#5 edit ... //depot/projects/ia64/contrib/openpam/modules/pam_deny/Makefile#5 edit ... //depot/projects/ia64/contrib/openpam/modules/pam_deny/pam_deny.c#5 edit ... //depot/projects/ia64/contrib/openpam/modules/pam_dummy/Makefile#5 edit ... //depot/projects/ia64/contrib/openpam/modules/pam_dummy/pam_dummy.c#5 edit ... //depot/projects/ia64/contrib/openpam/modules/pam_permit/Makefile#5 edit ... //depot/projects/ia64/contrib/openpam/modules/pam_permit/pam_permit.c#5 edit Differences ... ==== //depot/projects/ia64/contrib/openpam/CREDITS#2 (text) ==== ==== //depot/projects/ia64/contrib/openpam/HISTORY#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/INSTALL#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/LICENSE#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/MANIFEST#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/Makefile#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/README#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/RELNOTES#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/bin/Makefile#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/bin/su/Makefile#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/bin/su/su.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/Makefile#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/Makefile#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#2 (text) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#2 (text) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#2 (text) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/include/security/openpam.h#8 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/include/security/pam_appl.h#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/include/security/pam_constants.h#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/include/security/pam_modules.h#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/include/security/pam_types.h#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/Makefile#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_borrow_cred.c#2 (text) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_dispatch.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_findenv.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_free_data.c#2 (text) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_get_option.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_load.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_restore_cred.c#2 (text) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_set_option.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_static.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_acct_mgmt.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_authenticate.c#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_authenticate_secondary.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_chauthtok.c#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_close_session.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_end.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_error.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_get_data.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_get_item.c#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_authtok.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_username.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_get_user.c#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_getenv.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_getenvlist.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_info.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_open_session.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_prompt.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_putenv.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_set_data.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_set_item.c#6 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_authtok.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_username.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_setcred.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_setenv.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_sm_acct_mgmt.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_sm_chauthtok.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_sm_close_session.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_username.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_sm_open_session.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_username.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_sm_setcred.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_start.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_strerror.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_verror.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_vinfo.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/lib/pam_vprompt.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/misc/gendoc.pl#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/modules/Makefile#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/modules/pam_deny/Makefile#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/modules/pam_deny/pam_deny.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/modules/pam_dummy/Makefile#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/modules/pam_dummy/pam_dummy.c#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/modules/pam_permit/Makefile#5 (text/text+ko) ==== ==== //depot/projects/ia64/contrib/openpam/modules/pam_permit/pam_permit.c#5 (text/text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 13 21:48:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8262237B416; Sat, 13 Apr 2002 21:48:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C561437B404 for ; Sat, 13 Apr 2002 21:48:31 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3E4mV081951 for perforce@freebsd.org; Sat, 13 Apr 2002 21:48:31 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 13 Apr 2002 21:48:31 -0700 (PDT) Message-Id: <200204140448.g3E4mV081951@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9703 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9703 Change 9703 by peter@peter_thunder on 2002/04/13 21:48:31 eliminate differences Affected files ... ... //depot/projects/ia64/contrib/openpam/include/security/openpam.h#9 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_modules.h#7 integrate Differences ... ==== //depot/projects/ia64/contrib/openpam/include/security/openpam.h#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/include/security/openpam.h#7 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#17 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED ==== //depot/projects/ia64/contrib/openpam/include/security/pam_modules.h#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/include/security/pam_modules.h#5 $ + * $P4: //depot/projects/openpam/include/security/pam_modules.h#7 $ */ #ifndef _PAM_MODULES_H_INCLUDED To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 13 21:49:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72F4437B404; Sat, 13 Apr 2002 21:49:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 718A137B416 for ; Sat, 13 Apr 2002 21:49:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3E4nXZ82066 for perforce@freebsd.org; Sat, 13 Apr 2002 21:49:33 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 13 Apr 2002 21:49:33 -0700 (PDT) Message-Id: <200204140449.g3E4nXZ82066@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9704 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9704 Change 9704 by peter@peter_thunder on 2002/04/13 21:49:08 eliminate differences Affected files ... ... //depot/projects/ia64/contrib/lukemftpd/src/extern.h#4 edit Differences ... ==== //depot/projects/ia64/contrib/lukemftpd/src/extern.h#4 (text+ko) ==== @@ -100,9 +100,6 @@ * SUCH DAMAGE. */ -#include -#include - #ifdef NO_LONG_LONG # define LLF "%ld" # define LLFP(x) "%" x "ld" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 13 21:56:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56DA637B400; Sat, 13 Apr 2002 21:55:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 74C9537B405 for ; Sat, 13 Apr 2002 21:55:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3E4tf282709 for perforce@freebsd.org; Sat, 13 Apr 2002 21:55:41 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 13 Apr 2002 21:55:41 -0700 (PDT) Message-Id: <200204140455.g3E4tf282709@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9705 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9705 Change 9705 by peter@peter_thunder on 2002/04/13 21:55:03 really sync, the last attempt failed miserably. Affected files ... ... //depot/projects/ia64/contrib/openpam/CREDITS#3 integrate ... //depot/projects/ia64/contrib/openpam/HISTORY#7 integrate ... //depot/projects/ia64/contrib/openpam/INSTALL#6 integrate ... //depot/projects/ia64/contrib/openpam/LICENSE#6 integrate ... //depot/projects/ia64/contrib/openpam/MANIFEST#7 integrate ... //depot/projects/ia64/contrib/openpam/Makefile#6 integrate ... //depot/projects/ia64/contrib/openpam/README#7 integrate ... //depot/projects/ia64/contrib/openpam/RELNOTES#7 integrate ... //depot/projects/ia64/contrib/openpam/bin/Makefile#6 integrate ... //depot/projects/ia64/contrib/openpam/bin/su/Makefile#6 integrate ... //depot/projects/ia64/contrib/openpam/bin/su/su.c#6 integrate ... //depot/projects/ia64/contrib/openpam/doc/Makefile#6 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/Makefile#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#3 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#7 integrate ... //depot/projects/ia64/contrib/openpam/include/security/openpam.h#10 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_appl.h#6 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_constants.h#7 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_modules.h#8 integrate ... //depot/projects/ia64/contrib/openpam/include/security/pam_types.h#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/Makefile#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_borrow_cred.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_dispatch.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_findenv.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_free_data.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_get_option.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_load.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_restore_cred.c#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_set_option.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_static.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_acct_mgmt.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_authenticate.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_authenticate_secondary.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_chauthtok.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_close_session.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_end.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_error.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_data.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_item.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_authtok.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_username.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_user.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_getenv.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_getenvlist.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_info.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_open_session.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_prompt.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_putenv.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_set_data.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_set_item.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_authtok.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_username.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_setcred.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_setenv.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_acct_mgmt.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_chauthtok.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_close_session.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_username.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_open_session.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_username.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_sm_setcred.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_start.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_strerror.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_verror.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_vinfo.c#6 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_vprompt.c#6 integrate ... //depot/projects/ia64/contrib/openpam/misc/gendoc.pl#6 integrate ... //depot/projects/ia64/contrib/openpam/modules/Makefile#6 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_deny/Makefile#6 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_deny/pam_deny.c#6 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_dummy/Makefile#6 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_dummy/pam_dummy.c#6 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_permit/Makefile#6 integrate ... //depot/projects/ia64/contrib/openpam/modules/pam_permit/pam_permit.c#6 integrate Differences ... ==== //depot/projects/ia64/contrib/openpam/CREDITS#3 (text) ==== ==== //depot/projects/ia64/contrib/openpam/HISTORY#7 (text) ==== @@ -114,4 +114,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/ia64/contrib/openpam/HISTORY#5 $ +$P4: //depot/projects/openpam/HISTORY#8 $ ==== //depot/projects/ia64/contrib/openpam/INSTALL#6 (text) ==== @@ -22,4 +22,4 @@ Change into the top-level OpenPAM directory and run 'make install'. -$P4: //depot/projects/ia64/contrib/openpam/INSTALL#4 $ +$P4: //depot/projects/openpam/INSTALL#2 $ ==== //depot/projects/ia64/contrib/openpam/LICENSE#6 (text) ==== @@ -31,4 +31,4 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$P4: //depot/projects/ia64/contrib/openpam/LICENSE#4 $ +$P4: //depot/projects/openpam/LICENSE#4 $ ==== //depot/projects/ia64/contrib/openpam/MANIFEST#7 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/ia64/contrib/openpam/MANIFEST#5 $ +# $P4: //depot/projects/openpam/MANIFEST#6 $ # CREDITS HISTORY ==== //depot/projects/ia64/contrib/openpam/Makefile#6 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/ia64/contrib/openpam/Makefile#4 $ +# $P4: //depot/projects/openpam/Makefile#6 $ # SUBDIR = ==== //depot/projects/ia64/contrib/openpam/README#7 (text) ==== @@ -23,4 +23,4 @@ Please direct bug reports and inquiries to openpam@thinksec.com. -$P4: //depot/projects/ia64/contrib/openpam/README#5 $ +$P4: //depot/projects/openpam/README#3 $ ==== //depot/projects/ia64/contrib/openpam/RELNOTES#7 (text) ==== @@ -22,4 +22,4 @@ is made difficult by the requirement that it should be possible to link modules statically. -$P4: //depot/projects/ia64/contrib/openpam/RELNOTES#5 $ +$P4: //depot/projects/openpam/RELNOTES#8 $ ==== //depot/projects/ia64/contrib/openpam/bin/Makefile#6 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/ia64/contrib/openpam/bin/Makefile#4 $ +# $P4: //depot/projects/openpam/bin/Makefile#5 $ # SUBDIR = ==== //depot/projects/ia64/contrib/openpam/bin/su/Makefile#6 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/ia64/contrib/openpam/bin/su/Makefile#4 $ +# $P4: //depot/projects/openpam/bin/su/Makefile#4 $ # PROG = su ==== //depot/projects/ia64/contrib/openpam/bin/su/su.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/bin/su/su.c#4 $ + * $P4: //depot/projects/openpam/bin/su/su.c#5 $ */ #include ==== //depot/projects/ia64/contrib/openpam/doc/Makefile#6 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/ia64/contrib/openpam/doc/Makefile#4 $ +# $P4: //depot/projects/openpam/doc/Makefile#3 $ # SUBDIR = ==== //depot/projects/ia64/contrib/openpam/doc/man/Makefile#7 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/ia64/contrib/openpam/doc/man/Makefile#5 $ +# $P4: //depot/projects/openpam/doc/man/Makefile#6 $ # MAN = ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#3 (text) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#3 (text) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#5 $ .\" .Dd April 8, 2002 .Dt OPENPAM_GET_OPTION 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#6 $ .\" .Dd April 8, 2002 .Dt OPENPAM_LOG 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#3 (text) ==== ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#5 $ .\" .Dd April 8, 2002 .Dt OPENPAM_SET_OPTION 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#6 $ .\" .Dd April 8, 2002 .Dt OPENPAM_TTYCONV 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.3#12 $ .\" .Dd April 8, 2002 .Dt PAM 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_ACCT_MGMT 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_AUTHENTICATE 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_CHAUTHTOK 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_CLOSE_SESSION 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_END 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_ERROR 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#11 $ .\" .Dd April 8, 2002 .Dt PAM_GET_AUTHTOK 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_GET_DATA 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#11 $ .\" .Dd April 8, 2002 .Dt PAM_GET_ITEM 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#11 $ .\" .Dd April 8, 2002 .Dt PAM_GET_USER 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_GETENV 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_GETENVLIST 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_INFO 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_OPEN_SESSION 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#11 $ .\" .Dd April 8, 2002 .Dt PAM_PROMPT 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_PUTENV 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_SET_DATA 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_SET_ITEM 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#11 $ .\" .Dd April 8, 2002 .Dt PAM_SETCRED 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_SETENV 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#6 $ .\" .Dd April 8, 2002 .Dt PAM_SM_ACCT_MGMT 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#6 $ .\" .Dd April 8, 2002 .Dt PAM_SM_AUTHENTICATE 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#6 $ .\" .Dd April 8, 2002 .Dt PAM_SM_CHAUTHTOK 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#6 $ .\" .Dd April 8, 2002 .Dt PAM_SM_CLOSE_SESSION 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#6 $ .\" .Dd April 8, 2002 .Dt PAM_SM_OPEN_SESSION 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#6 $ .\" .Dd April 8, 2002 .Dt PAM_SM_SETCRED 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_START 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#10 $ .\" .Dd April 8, 2002 .Dt PAM_STRERROR 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#8 $ .\" .Dd April 8, 2002 .Dt PAM_VERROR 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#8 $ .\" .Dd April 8, 2002 .Dt PAM_VINFO 3 ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#7 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#8 $ .\" .Dd April 8, 2002 .Dt PAM_VPROMPT 3 ==== //depot/projects/ia64/contrib/openpam/include/security/openpam.h#10 (text) ==== ==== //depot/projects/ia64/contrib/openpam/include/security/pam_appl.h#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/include/security/pam_appl.h#4 $ + * $P4: //depot/projects/openpam/include/security/pam_appl.h#9 $ */ #ifndef _PAM_APPL_H_INCLUDED ==== //depot/projects/ia64/contrib/openpam/include/security/pam_constants.h#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/include/security/pam_constants.h#5 $ + * $P4: //depot/projects/openpam/include/security/pam_constants.h#13 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED ==== //depot/projects/ia64/contrib/openpam/include/security/pam_modules.h#8 (text) ==== ==== //depot/projects/ia64/contrib/openpam/include/security/pam_types.h#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/include/security/pam_types.h#4 $ + * $P4: //depot/projects/openpam/include/security/pam_types.h#5 $ */ #ifndef _PAM_TYPES_H_INCLUDED ==== //depot/projects/ia64/contrib/openpam/lib/Makefile#7 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/ia64/contrib/openpam/lib/Makefile#5 $ +# $P4: //depot/projects/openpam/lib/Makefile#13 $ # LIB = pam ==== //depot/projects/ia64/contrib/openpam/lib/openpam_borrow_cred.c#3 (text) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_dispatch.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/openpam_dispatch.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#14 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#3 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/openpam_findenv.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/openpam_findenv.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_findenv.c#7 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/openpam_free_data.c#3 (text) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_get_option.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/openpam_get_option.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_get_option.c#3 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#5 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#12 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED ==== //depot/projects/ia64/contrib/openpam/lib/openpam_load.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/openpam_load.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_load.c#12 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_log.c#12 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/openpam_restore_cred.c#3 (text) ==== ==== //depot/projects/ia64/contrib/openpam/lib/openpam_set_option.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/openpam_set_option.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_set_option.c#4 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/openpam_static.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/openpam_static.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_static.c#4 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#9 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/pam_acct_mgmt.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/pam_acct_mgmt.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#7 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/pam_authenticate.c#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/pam_authenticate.c#5 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate.c#9 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/pam_authenticate_secondary.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/pam_authenticate_secondary.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate_secondary.c#5 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/pam_chauthtok.c#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/pam_chauthtok.c#5 $ + * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#10 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/pam_close_session.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/pam_close_session.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_close_session.c#7 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/pam_end.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/pam_end.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_end.c#8 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/pam_error.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/pam_error.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_error.c#6 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#5 $ + * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#15 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/pam_get_data.c#6 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/pam_get_data.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_get_data.c#7 $ */ #include ==== //depot/projects/ia64/contrib/openpam/lib/pam_get_item.c#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/ia64/contrib/openpam/lib/pam_get_item.c#5 $ + * $P4: //depot/projects/openpam/lib/pam_get_item.c#11 $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 13 22:29:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7B9037B416; Sat, 13 Apr 2002 22:29:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3660737B404 for ; Sat, 13 Apr 2002 22:29:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3E5TM690045 for perforce@freebsd.org; Sat, 13 Apr 2002 22:29:22 -0700 (PDT) (envelope-from amigus@tislabs.com) Date: Sat, 13 Apr 2002 22:29:22 -0700 (PDT) Message-Id: <200204140529.g3E5TM690045@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@tislabs.com using -f From: Adam Migus Subject: PERFORCE change 9706 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9706 Change 9706 by amigus@amigus_ganyopa on 2002/04/13 22:29:12 Fixed a simple test-for-null bug. Fixed a comment. Affected files ... ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_biba.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_biba.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ /* * Biba labels take the following format: - * [optional bibasingle][optional mlsrange] + * [optional bibasingle][optional bibarange] * bibasingle: {low,0-65535,high,equal} * bibarange: ([bibasingle]-[bibasingle]) */ @@ -104,7 +104,7 @@ */ string_single = strsep(&string, "("); - if (*string_single == '\0' && label == NULL) { + if (*string_single == '\0' && string == NULL) { /* No interesting elements to parse, flags already zero'd. */ return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 10:40:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0218437B41C; Sun, 14 Apr 2002 10:40:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B319D37B41A for ; Sun, 14 Apr 2002 10:40:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3EHeT740411 for perforce@freebsd.org; Sun, 14 Apr 2002 10:40:29 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 10:40:29 -0700 (PDT) Message-Id: <200204141740.g3EHeT740411@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9722 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9722 Change 9722 by des@des.at.des.thinksec.com on 2002/04/14 10:40:11 Add version macros. Affected files ... ... //depot/projects/openpam/include/security/openpam_version.h#1 add ... //depot/projects/openpam/include/security/pam_constants.h#14 edit Differences ... ==== //depot/projects/openpam/include/security/pam_constants.h#14 (text+ko) ==== @@ -31,12 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/pam_constants.h#13 $ + * $P4: //depot/projects/openpam/include/security/pam_constants.h#14 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED #define _PAM_CONSTANTS_H_INCLUDED +#include + #ifdef __cplusplus extern "C" { #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 11:22:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E366637B405; Sun, 14 Apr 2002 11:22:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0777237B404 for ; Sun, 14 Apr 2002 11:22:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3EIMLf50803 for perforce@freebsd.org; Sun, 14 Apr 2002 11:22:21 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 11:22:21 -0700 (PDT) Message-Id: <200204141822.g3EIMLf50803@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9724 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9724 Change 9724 by des@des.at.des.thinksec.com on 2002/04/14 11:22:20 More checks & documentation, and fix some markup nits. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/lib/pam_acct_mgmt.c#8 edit ... //depot/projects/openpam/lib/pam_authenticate.c#10 edit ... //depot/projects/openpam/lib/pam_chauthtok.c#11 edit ... //depot/projects/openpam/lib/pam_close_session.c#8 edit ... //depot/projects/openpam/lib/pam_open_session.c#8 edit ... //depot/projects/openpam/lib/pam_setcred.c#9 edit Differences ... ==== //depot/projects/openpam/lib/pam_acct_mgmt.c#8 (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_acct_mgmt.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#8 $ */ #include @@ -62,3 +62,19 @@ * =pam_sm_acct_mgmt * !PAM_IGNORE */ + +/** + * The =pam_acct_mgmt function verifies and enforces account restrictions + * after the user has been authenticated. + * + * The =flags argument is the binary or of zero or more of the following + * values: + * + * =PAM_SILENT: + * Do not emit any messages. + * =PAM_DISALLOW_NULL_AUTHTOK: + * Fail if the user's authentication token is null. + * + * If any other bits are set, =pam_authenticate will return + * =PAM_SYMBOL_ERR. + */ ==== //depot/projects/openpam/lib/pam_authenticate.c#10 (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_authenticate.c#9 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate.c#10 $ */ #include @@ -66,6 +66,7 @@ * =openpam_dispatch * =pam_sm_authenticate * !PAM_IGNORE + * PAM_SYMBOL_ERR */ /** @@ -79,8 +80,11 @@ * The =flags argument is the binary or of zero or more of the following * values: * - * =PAM_SILENT + * =PAM_SILENT: * Do not emit any messages. - * =PAM_DISALLOW_NULL_AUTHTOK + * =PAM_DISALLOW_NULL_AUTHTOK: * Fail if the user's authentication token is null. + * + * If any other bits are set, =pam_authenticate will return + * =PAM_SYMBOL_ERR. */ ==== //depot/projects/openpam/lib/pam_chauthtok.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/pam_chauthtok.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#11 $ */ #include @@ -82,8 +82,10 @@ * The =flags argument is the binary or of zero or more of the following * values: * - * =PAM_SILENT + * =PAM_SILENT: * Do not emit any messages. - * =PAM_CHANGE_EXPIRED_AUTHTOK + * =PAM_CHANGE_EXPIRED_AUTHTOK: * Change only those authentication tokens that have expired. + * + * If any other bits are set, =pam_chauthtok will return =PAM_SYMBOL_ERR. */ ==== //depot/projects/openpam/lib/pam_close_session.c#8 (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_close_session.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_close_session.c#8 $ */ #include @@ -52,6 +52,8 @@ int flags) { + if (flags & ~(PAM_SILENT)) + return (PAM_SYMBOL_ERR); return (openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags)); } @@ -61,4 +63,19 @@ * =openpam_dispatch * =pam_sm_close_session * !PAM_IGNORE + * PAM_SYMBOL_ERR + */ + +/** + * The =pam_close_session function tears down the user session previously + * set up by =pam_open_session. + * + * The =flags argument is the binary or of zero or more of the following + * values: + * + * =PAM_SILENT: + * Do not emit any messages. + * + * If any other bits are set, =pam_close_session will return + * =PAM_SYMBOL_ERR. */ ==== //depot/projects/openpam/lib/pam_open_session.c#8 (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#7 $ + * $P4: //depot/projects/openpam/lib/pam_open_session.c#8 $ */ #include @@ -52,6 +52,8 @@ int flags) { + if (flags & ~(PAM_SILENT)) + return (PAM_SYMBOL_ERR); return (openpam_dispatch(pamh, PAM_SM_OPEN_SESSION, flags)); } @@ -61,4 +63,20 @@ * =openpam_dispatch * =pam_sm_open_session * !PAM_IGNORE + * PAM_SYMBOL_ERR + */ + +/** + * 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. + * + * The =flags argument is the binary or of zero or more of the following + * values: + * + * =PAM_SILENT: + * Do not emit any messages. + * + * If any other bits are set, =pam_open_session will return + * =PAM_SYMBOL_ERR. */ ==== //depot/projects/openpam/lib/pam_setcred.c#9 (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_setcred.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_setcred.c#9 $ */ #include @@ -52,6 +52,10 @@ int flags) { + if (flags & ~(PAM_SILENT|PAM_ESTABLISH_CRED|PAM_DELETE_CRED| + PAM_REINITIALIZE_CRED|PAM_REFRESH_CRED)) + return (PAM_SYMBOL_ERR); + /* XXX enforce exclusivity */ return (openpam_dispatch(pamh, PAM_SM_SETCRED, flags)); } @@ -61,18 +65,27 @@ * =openpam_dispatch * =pam_sm_setcred * !PAM_IGNORE + * PAM_SYMBOL_ERR */ /** * The =pam_setcred function manages the application's credentials. - * The operation to perform is specified by the =flags argument: + * + * The =flags argument is the binary or of zero or more of the following + * values: * - * PAM_ESTABLISH_CRED: + * =PAM_SILENT: + * Do not emit any messages. + * =PAM_ESTABLISH_CRED: * Establish the credentials of the target user. - * PAM_DELETE_CRED: + * =PAM_DELETE_CRED: * Revoke all established credentials. - * PAM_REINITIALIZE_CRED: + * =PAM_REINITIALIZE_CRED: * Fully reinitialise credentials. - * PAM_REFRESH_CRED: + * =PAM_REFRESH_CRED: * Refresh credentials. + * + * The latter four are mutually exclusive. + * + * If any other bits are set, =pam_setcred will return =PAM_SYMBOL_ERR. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 11:23:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5364E37B41D; Sun, 14 Apr 2002 11:23:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3BB7B37B416 for ; Sun, 14 Apr 2002 11:23:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3EINOL50928 for perforce@freebsd.org; Sun, 14 Apr 2002 11:23:24 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 11:23:24 -0700 (PDT) Message-Id: <200204141823.g3EINOL50928@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9726 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9726 Change 9726 by des@des.at.des.thinksec.com on 2002/04/14 11:23:20 Note typo on page 40. Affected files ... ... //depot/projects/openpam/doc/xsso_errata.txt#7 edit Differences ... ==== //depot/projects/openpam/doc/xsso_errata.txt#7 (text+ko) ==== @@ -1,4 +1,4 @@ -$P4: //depot/projects/openpam/doc/xsso_errata.txt#6 $ +$P4: //depot/projects/openpam/doc/xsso_errata.txt#7 $ Errata in XSSO, chapter 5: @@ -18,6 +18,9 @@ p. 34: "PAM_AUTH_ERR" is misspelled as "PAM_AUTH_ERROR" in the second-last line of the DESCRIPTION section. +p. 40: in the second paragraph of the DESCRIPTION section, the phrase + "In this case the, [...]" should be "In this case, the [...]". + p. 46: "PAM_AUTHOK" and "PAM_OLDAUTHOK" in the DESCRIPTION section should be "PAM_AUTHTOK" and "PAM_OLDAUTHTOK", respectively. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 11:24:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 251CF37B41F; Sun, 14 Apr 2002 11:23:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EEDBE37B41B for ; Sun, 14 Apr 2002 11:23:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3EINNU50916 for perforce@freebsd.org; Sun, 14 Apr 2002 11:23:23 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 11:23:23 -0700 (PDT) Message-Id: <200204141823.g3EINNU50916@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9725 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9725 Change 9725 by des@des.at.des.thinksec.com on 2002/04/14 11:22:58 New files. Affected files ... ... //depot/projects/openpam/MANIFEST#7 edit Differences ... ==== //depot/projects/openpam/MANIFEST#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#6 $ +# $P4: //depot/projects/openpam/MANIFEST#7 $ # CREDITS HISTORY @@ -54,12 +54,14 @@ doc/man/pam_vinfo.3 doc/man/pam_vprompt.3 include/security/openpam.h +include/security/openpam_version.h include/security/pam_appl.h include/security/pam_constants.h include/security/pam_modules.h include/security/pam_types.h lib/Makefile lib/openpam_borrow_cred.c +lib/openpam_configure.c lib/openpam_dispatch.c lib/openpam_dynamic.c lib/openpam_findenv.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 11:25:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D73BC37B427; Sun, 14 Apr 2002 11:24:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0C4D737B43C for ; Sun, 14 Apr 2002 11:24:26 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3EIOPO51444 for perforce@freebsd.org; Sun, 14 Apr 2002 11:24:25 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 11:24:25 -0700 (PDT) Message-Id: <200204141824.g3EIOPO51444@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9727 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9727 Change 9727 by des@des.at.des.thinksec.com on 2002/04/14 11:24:13 Stuff the tarball in /tmp. Affected files ... ... //depot/projects/openpam/dist.sh#3 edit Differences ... ==== //depot/projects/openpam/dist.sh#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $P4: //depot/projects/openpam/dist.sh#2 $ +# $P4: //depot/projects/openpam/dist.sh#3 $ # set -e @@ -13,5 +13,5 @@ install -d -m 0755 "${distname}/$(dirname ${file})" install -c -m 0644 "${file}" "${distname}/${file}" done -tar zcf "${distname}.tar.gz" "${distname}" +tar zcf "/tmp/${distname}.tar.gz" "${distname}" rm -rf "${distname}" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 11:25:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD16937B41E; Sun, 14 Apr 2002 11:25:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2F92137B419 for ; Sun, 14 Apr 2002 11:25:28 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3EIPSA51801 for perforce@freebsd.org; Sun, 14 Apr 2002 11:25:28 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 11:25:28 -0700 (PDT) Message-Id: <200204141825.g3EIPSA51801@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9730 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9730 Change 9730 by des@des.at.des.thinksec.com on 2002/04/14 11:25:15 Bump version & release. Affected files ... ... //depot/projects/openpam/include/security/openpam_version.h#2 edit Differences ... ==== //depot/projects/openpam/include/security/openpam_version.h#2 (text+ko) ==== @@ -31,14 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam_version.h#1 $ + * $P4: //depot/projects/openpam/include/security/openpam_version.h#2 $ */ #ifndef _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM -#define _OPENPAM_VERSION 20020408 -#define _OPENPAM_RELEASE "Cinchona" +#define _OPENPAM_VERSION 20020414 +#define _OPENPAM_RELEASE "Cineraria" #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 11:26:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B609F37B416; Sun, 14 Apr 2002 11:26:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CE70B37B405 for ; Sun, 14 Apr 2002 11:26:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3EIQTe52007 for perforce@freebsd.org; Sun, 14 Apr 2002 11:26:29 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 11:26:29 -0700 (PDT) Message-Id: <200204141826.g3EIQTe52007@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9731 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9731 Change 9731 by des@des.at.des.thinksec.com on 2002/04/14 11:25:33 Release documentation for OpenPAM Cineraria. Affected files ... ... //depot/projects/openpam/HISTORY#9 edit ... //depot/projects/openpam/RELNOTES#9 edit Differences ... ==== //depot/projects/openpam/HISTORY#9 (text+ko) ==== @@ -1,4 +1,18 @@ ============================================================================ +OpenPAM Cineraria 2002-04-14 + + - ENHANCE: Improved documentation. + + - ENHANCE: Adopt the same preprocessor tricks that were used in + FreeBSD's version of Linux-PAM to simplify static linking without + requiring dummy primitives. + + - ENHANCE: move the policy-loading code out of pam_start.c. + + - BUGFIX: Fix typo in one of the versions of the openpam_log macro. + + - ENHANCE: Add versioning macros. +============================================================================ OpenPAM Cinchona 2002-04-08 - ENHANCE: Improved documentation for several API functions. @@ -114,4 +128,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#8 $ +$P4: //depot/projects/openpam/HISTORY#9 $ ==== //depot/projects/openpam/RELNOTES#9 (text+ko) ==== @@ -1,14 +1,12 @@ - Release notes for OpenPAM Cinchona - ================================== + Release notes for OpenPAM Cineraria + =================================== -This is a beta release. - The library itself is complete. Documentation exists in the form of man pages for the library functions, though a few pages are still incomplete. -This release is incorporated into FreeBSD-CURRENT as of 2002-04-08. +This release is incorporated into FreeBSD-CURRENT as of 2002-04-14. It has also been successfully built on NetBSD, and should build with minimal or no changes on OpenBSD. It has not been tested on any other OS. @@ -17,9 +15,4 @@ - The documentation is still incomplete. - - It should be possible to create incomplete modules without - recourse to placeholders or elaborate preprocessor tricks. This - is made difficult by the requirement that it should be possible to - link modules statically. - -$P4: //depot/projects/openpam/RELNOTES#8 $ +$P4: //depot/projects/openpam/RELNOTES#9 $ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 11:27:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2962C37B419; Sun, 14 Apr 2002 11:25:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id ADDFE37B416 for ; Sun, 14 Apr 2002 11:25:27 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3EIPRM51789 for perforce@freebsd.org; Sun, 14 Apr 2002 11:25:27 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 11:25:27 -0700 (PDT) Message-Id: <200204141825.g3EIPRM51789@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9728 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9728 Change 9728 by des@des.at.des.thinksec.com on 2002/04/14 11:24:37 Regenerate. Affected files ... ... //depot/projects/openpam/doc/man/openpam_borrow_cred.3#2 edit ... //depot/projects/openpam/doc/man/openpam_free_data.3#2 edit ... //depot/projects/openpam/doc/man/openpam_get_option.3#6 edit ... //depot/projects/openpam/doc/man/openpam_log.3#7 edit ... //depot/projects/openpam/doc/man/openpam_restore_cred.3#2 edit ... //depot/projects/openpam/doc/man/openpam_set_option.3#6 edit ... //depot/projects/openpam/doc/man/openpam_ttyconv.3#7 edit ... //depot/projects/openpam/doc/man/pam.3#13 edit ... //depot/projects/openpam/doc/man/pam_acct_mgmt.3#11 edit ... //depot/projects/openpam/doc/man/pam_authenticate.3#11 edit ... //depot/projects/openpam/doc/man/pam_chauthtok.3#11 edit ... //depot/projects/openpam/doc/man/pam_close_session.3#11 edit ... //depot/projects/openpam/doc/man/pam_end.3#11 edit ... //depot/projects/openpam/doc/man/pam_error.3#11 edit ... //depot/projects/openpam/doc/man/pam_get_authtok.3#12 edit ... //depot/projects/openpam/doc/man/pam_get_data.3#11 edit ... //depot/projects/openpam/doc/man/pam_get_item.3#12 edit ... //depot/projects/openpam/doc/man/pam_get_user.3#12 edit ... //depot/projects/openpam/doc/man/pam_getenv.3#11 edit ... //depot/projects/openpam/doc/man/pam_getenvlist.3#11 edit ... //depot/projects/openpam/doc/man/pam_info.3#11 edit ... //depot/projects/openpam/doc/man/pam_open_session.3#11 edit ... //depot/projects/openpam/doc/man/pam_prompt.3#12 edit ... //depot/projects/openpam/doc/man/pam_putenv.3#11 edit ... //depot/projects/openpam/doc/man/pam_set_data.3#11 edit ... //depot/projects/openpam/doc/man/pam_set_item.3#11 edit ... //depot/projects/openpam/doc/man/pam_setcred.3#12 edit ... //depot/projects/openpam/doc/man/pam_setenv.3#11 edit ... //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#7 edit ... //depot/projects/openpam/doc/man/pam_sm_authenticate.3#7 edit ... //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#7 edit ... //depot/projects/openpam/doc/man/pam_sm_close_session.3#7 edit ... //depot/projects/openpam/doc/man/pam_sm_open_session.3#7 edit ... //depot/projects/openpam/doc/man/pam_sm_setcred.3#7 edit ... //depot/projects/openpam/doc/man/pam_start.3#11 edit ... //depot/projects/openpam/doc/man/pam_strerror.3#11 edit ... //depot/projects/openpam/doc/man/pam_verror.3#9 edit ... //depot/projects/openpam/doc/man/pam_vinfo.3#9 edit ... //depot/projects/openpam/doc/man/pam_vprompt.3#9 edit Differences ... ==== //depot/projects/openpam/doc/man/openpam_borrow_cred.3#2 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#1 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#2 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_free_data.3#2 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#1 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#2 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_get_option.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_log.3#7 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#7 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_LOG 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_restore_cred.3#2 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#1 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#2 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_set_option.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_ttyconv.3#7 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#7 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.3#13 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_acct_mgmt.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME @@ -46,7 +46,25 @@ .Ft int .Fn pam_acct_mgmt "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +function verifies and enforces account restrictions +after the user has been authenticated. +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.It Dv PAM_DISALLOW_NULL_AUTHTOK +Fail if the user's authentication token is null. +.El +If any other bits are set, +.Xr pam_authenticate 3 +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm @@ -75,6 +93,7 @@ .El .Sh SEE ALSO .Xr pam 3 , +.Xr pam_authenticate 3 , .Xr pam_strerror 3 .Sh STANDARDS .Rs ==== //depot/projects/openpam/doc/man/pam_authenticate.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME @@ -65,12 +65,16 @@ .Va flags argument is the binary or of zero or more of the following values: -.Pp -.Bd -literal - =PAM_SILENT - Do not emit any messages. - =PAM_DISALLOW_NULL_AUTHTOK - Fail if the user's authentication token is null. +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.It Dv PAM_DISALLOW_NULL_AUTHTOK +Fail if the user's authentication token is null. +.El +If any other bits are set, +.Nm +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm @@ -94,6 +98,8 @@ Permission denied. .It Bq Er PAM_SERVICE_ERR Error in service module. +.It Bq Er PAM_SYMBOL_ERR +Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .It Bq Er PAM_USER_UNKNOWN ==== //depot/projects/openpam/doc/man/pam_chauthtok.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME @@ -57,12 +57,16 @@ .Va flags argument is the binary or of zero or more of the following values: -.Pp -.Bd -literal - =PAM_SILENT - Do not emit any messages. - =PAM_CHANGE_EXPIRED_AUTHTOK - Change only those authentication tokens that have expired. +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.It Dv PAM_CHANGE_EXPIRED_AUTHTOK +Change only those authentication tokens that have expired. +.El +If any other bits are set, +.Nm +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm ==== //depot/projects/openpam/doc/man/pam_close_session.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME @@ -46,7 +46,24 @@ .Ft int .Fn pam_close_session "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +function tears down the user session previously +set up by +.Xr pam_open_session 3 . +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.El +If any other bits are set, +.Nm +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm @@ -64,11 +81,14 @@ Error in service module. .It Bq Er PAM_SESSION_ERR Session failure. +.It Bq Er PAM_SYMBOL_ERR +Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .El .Sh SEE ALSO .Xr pam 3 , +.Xr pam_open_session 3 , .Xr pam_strerror 3 .Sh STANDARDS .Rs ==== //depot/projects/openpam/doc/man/pam_end.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_END 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_error.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_ERROR 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_authtok.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#12 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_data.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GET_DATA 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_item.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#12 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GET_ITEM 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_user.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#12 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GET_USER 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_getenv.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GETENV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_getenvlist.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GETENVLIST 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_info.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_INFO 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_open_session.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME @@ -46,7 +46,24 @@ .Ft int .Fn pam_open_session "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +sets up a user session for a previously +authenticated user. The session should later be torn down by a call to +.Xr pam_close_session 3 . +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.El +If any other bits are set, +.Nm +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm @@ -64,11 +81,14 @@ Error in service module. .It Bq Er PAM_SESSION_ERR Session failure. +.It Bq Er PAM_SYMBOL_ERR +Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .El .Sh SEE ALSO .Xr pam 3 , +.Xr pam_close_session 3 , .Xr pam_strerror 3 .Sh STANDARDS .Rs ==== //depot/projects/openpam/doc/man/pam_prompt.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#12 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_PROMPT 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_putenv.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_PUTENV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_set_data.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_SET_DATA 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_set_item.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_SET_ITEM 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_setcred.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#12 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_SETCRED 3 .Os .Sh NAME @@ -49,18 +49,29 @@ The .Nm function manages the application's credentials. -The operation to perform is specified by the +.Pp +The .Va flags -argument: +argument is the binary or of zero or more of the following +values: .Bl -tag -width 18n -.It PAM_ESTABLISH_CRED +.It Dv PAM_SILENT +Do not emit any messages. +.It Dv PAM_ESTABLISH_CRED Establish the credentials of the target user. -.It PAM_DELETE_CRED +.It Dv PAM_DELETE_CRED Revoke all established credentials. -.It PAM_REINITIALIZE_CRED +.It Dv PAM_REINITIALIZE_CRED Fully reinitialise credentials. -.It PAM_REFRESH_CRED +.It Dv PAM_REFRESH_CRED Refresh credentials. +.El +The latter four are mutually exclusive. +.Pp +If any other bits are set, +.Nm +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm @@ -82,6 +93,8 @@ Permission denied. .It Bq Er PAM_SERVICE_ERR Error in service module. +.It Bq Er PAM_SYMBOL_ERR +Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .It Bq Er PAM_USER_UNKNOWN ==== //depot/projects/openpam/doc/man/pam_setenv.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_SETENV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#7 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#7 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_SM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_authenticate.3#7 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#7 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_SM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#7 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#7 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_SM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_close_session.3#7 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#7 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_SM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_open_session.3#7 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#7 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_SM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_setcred.3#7 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#7 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_SM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_start.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_START 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_strerror.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_STRERROR 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_verror.3#9 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#9 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_VERROR 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_vinfo.3#9 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#9 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_VINFO 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_vprompt.3#9 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#9 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_VPROMPT 3 .Os .Sh NAME To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 17:32:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEECF37B400; Sun, 14 Apr 2002 17:32:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 000E037B404 for ; Sun, 14 Apr 2002 17:32:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3F0W8938733 for perforce@freebsd.org; Sun, 14 Apr 2002 17:32:08 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 17:32:08 -0700 (PDT) Message-Id: <200204150032.g3F0W8938733@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9746 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9746 Change 9746 by des@des.at.des.thinksec.com on 2002/04/14 17:31:56 Fix highly embarassing typo. This makes a good argument for using verbose variable names. Affected files ... ... //depot/projects/openpam/lib/pam_get_authtok.c#16 edit Differences ... ==== //depot/projects/openpam/lib/pam_get_authtok.c#16 (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#15 $ + * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#16 $ */ #include @@ -120,11 +120,11 @@ } if (resp == NULL) return (PAM_TRY_AGAIN); - r = pam_set_item(pamh, pitem, resp); + r = pam_set_item(pamh, item, resp); free(resp); if (r != PAM_SUCCESS) return (r); - return (pam_get_item(pamh, pitem, (const void **)authtok)); + return (pam_get_item(pamh, item, (const void **)authtok)); } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 17:35:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 163DB37B405; Sun, 14 Apr 2002 17:35:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3716537B400 for ; Sun, 14 Apr 2002 17:35:13 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3F0ZDF39836 for perforce@freebsd.org; Sun, 14 Apr 2002 17:35:13 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 17:35:13 -0700 (PDT) Message-Id: <200204150035.g3F0ZDF39836@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9747 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9747 Change 9747 by des@des.at.des.thinksec.com on 2002/04/14 17:34:19 Document change 9736, I'm rerolling Cinenaria. Affected files ... ... //depot/projects/openpam/HISTORY#10 edit Differences ... ==== //depot/projects/openpam/HISTORY#10 (text+ko) ==== @@ -1,6 +1,9 @@ ============================================================================ OpenPAM Cineraria 2002-04-14 + - BUGFIX: Fix confusion between token and prompt in + pam_get_authtok(3). + - ENHANCE: Improved documentation. - ENHANCE: Adopt the same preprocessor tricks that were used in @@ -128,4 +131,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#9 $ +$P4: //depot/projects/openpam/HISTORY#10 $ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 18:27:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9079137B405; Sun, 14 Apr 2002 18:27:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EC3C037B404 for ; Sun, 14 Apr 2002 18:27:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3F1RGA53587 for perforce@freebsd.org; Sun, 14 Apr 2002 18:27:16 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 18:27:16 -0700 (PDT) Message-Id: <200204150127.g3F1RGA53587@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9750 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9750 Change 9750 by des@des.at.des.thinksec.com on 2002/04/14 18:26:55 Print a newline after an error or info message. Affected files ... ... //depot/projects/openpam/lib/openpam_ttyconv.c#10 edit Differences ... ==== //depot/projects/openpam/lib/openpam_ttyconv.c#10 (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#9 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#10 $ */ #include @@ -160,9 +160,15 @@ break; case PAM_ERROR_MSG: fputs(msg[i]->msg, stderr); + if (strlen(msg[i]->msg) > 0 && + msg[i]->msg[strlen(msg[i]->msg) - 1] != '\n') + fputc('\n', stderr); break; case PAM_TEXT_INFO: fputs(msg[i]->msg, stdout); + if (strlen(msg[i]->msg) > 0 && + msg[i]->msg[strlen(msg[i]->msg) - 1] != '\n') + fputc('\n', stdout); break; default: goto fail; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 18:50:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86ABF37B404; Sun, 14 Apr 2002 18:50:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B85FB37B400 for ; Sun, 14 Apr 2002 18:50:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3F1ojv59326 for perforce@freebsd.org; Sun, 14 Apr 2002 18:50:45 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 14 Apr 2002 18:50:45 -0700 (PDT) Message-Id: <200204150150.g3F1ojv59326@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9752 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9752 Change 9752 by jake@jake_sparc64 on 2002/04/14 18:49:49 Add 57600. This divisor isn't in the manual for some reason, found by trial and error. Affected files ... ... //depot/projects/sparc64/sys/dev/se/sereg.h#7 edit Differences ... ==== //depot/projects/sparc64/sys/dev/se/sereg.h#7 (text+ko) ==== @@ -33,6 +33,7 @@ #define SE_DIV_9600 SE_DIV(48, 2) #define SE_DIV_19200 SE_DIV(48, 1) #define SE_DIV_38400 SE_DIV(24, 1) +#define SE_DIV_57600 SE_DIV(16, 1) #define SE_DIV_115200 SE_DIV(8, 1) #define SE_CHA 0x0 /* channel a offset */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 23:29:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFF2E37B41C; Sun, 14 Apr 2002 23:29:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9066937B404 for ; Sun, 14 Apr 2002 23:29:28 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3F6TSG13328 for perforce@freebsd.org; Sun, 14 Apr 2002 23:29:28 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 23:29:28 -0700 (PDT) Message-Id: <200204150629.g3F6TSG13328@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9758 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9758 Change 9758 by des@des.at.des.thinksec.com on 2002/04/14 23:28:43 Don't copy log messages to stderr, even #ifdef DEBUG. Affected files ... ... //depot/projects/openpam/lib/openpam_log.c#13 edit Differences ... ==== //depot/projects/openpam/lib/openpam_log.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_log.c#12 $ + * $P4: //depot/projects/openpam/lib/openpam_log.c#13 $ */ #include @@ -83,9 +83,6 @@ if ((format = malloc(strlen(func) + len + 16)) != NULL) { sprintf(format, "in %s(): %.*s\n", func, len, fmt); vsyslog(priority, format, ap); -#ifdef DEBUG - vfprintf(stderr, format, ap); -#endif free(format); } else { vsyslog(priority, fmt, ap); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 23:29:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57E3F37B404; Sun, 14 Apr 2002 23:29:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CB1C737B41B for ; Sun, 14 Apr 2002 23:29:28 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3F6TSg13335 for perforce@freebsd.org; Sun, 14 Apr 2002 23:29:28 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 23:29:28 -0700 (PDT) Message-Id: <200204150629.g3F6TSg13335@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9759 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9759 Change 9759 by des@des.at.des.thinksec.com on 2002/04/14 23:29:23 Typo on page 73. Affected files ... ... //depot/projects/openpam/doc/xsso_errata.txt#8 edit Differences ... ==== //depot/projects/openpam/doc/xsso_errata.txt#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$P4: //depot/projects/openpam/doc/xsso_errata.txt#7 $ +$P4: //depot/projects/openpam/doc/xsso_errata.txt#8 $ Errata in XSSO, chapter 5: @@ -50,6 +50,9 @@ p. 72: the flags argument to pam_sm_chauthtok() is of type int, not const int. +p. 73: "aging" is misspelled as "again" in the description of + PAM_AUTHTOK_DISABLE_AGING in the "RETURN VALUE" section. + p. 77: the names of several arguments to pam_sm_get_mapped_authtok() are missing the initial "t" in "target". To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 14 23:31:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C517637B41B; Sun, 14 Apr 2002 23:31:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A90AB37B419 for ; Sun, 14 Apr 2002 23:31:31 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3F6VVZ13705 for perforce@freebsd.org; Sun, 14 Apr 2002 23:31:31 -0700 (PDT) (envelope-from des@freebsd.org) Date: Sun, 14 Apr 2002 23:31:31 -0700 (PDT) Message-Id: <200204150631.g3F6VVZ13705@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9760 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9760 Change 9760 by des@des.at.des.thinksec.com on 2002/04/14 23:30:42 Additional debugging messages. Affected files ... ... //depot/projects/openpam/lib/openpam_dynamic.c#4 edit Differences ... ==== //depot/projects/openpam/lib/openpam_dynamic.c#4 (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_dynamic.c#3 $ + * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#4 $ */ #include @@ -64,8 +64,10 @@ if (asprintf(&vpath, "%s.%d", path, LIB_MAJ) == -1) goto buf_err; if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) { + openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror()); *strrchr(vpath, '.') = '\0'; if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) { + openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror()); free(module); return (NULL); } @@ -74,8 +76,12 @@ if ((module->path = strdup(path)) == NULL) goto buf_err; module->dlh = dlh; - for (i = 0; i < PAM_NUM_PRIMITIVES; ++i) + for (i = 0; i < PAM_NUM_PRIMITIVES; ++i) { module->func[i] = dlsym(dlh, _pam_sm_func_name[i]); + if (module->func[i] == NULL) + openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s", + vpath, _pam_sm_func_name[i], dlerror()); + } return (module); buf_err: openpam_log(PAM_LOG_ERROR, "%m"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 15 11:40: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5ED3337B419; Mon, 15 Apr 2002 11:39:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E8A3237B400 for ; Mon, 15 Apr 2002 11:39:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3FIdlB29841 for perforce@freebsd.org; Mon, 15 Apr 2002 11:39:47 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Mon, 15 Apr 2002 11:39:47 -0700 (PDT) Message-Id: <200204151839.g3FIdlB29841@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9784 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9784 Change 9784 by jhb@jhb_zion on 2002/04/15 11:38:56 Axe UCONSOLE. Affected files ... ... //depot/projects/smpng/sys/alpha/conf/ALPHA-up#2 edit Differences ... ==== //depot/projects/smpng/sys/alpha/conf/ALPHA-up#2 (text+ko) ==== @@ -23,7 +23,6 @@ options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI -options UCONSOLE #Allow users to grab the console options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 15 11:56:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B470337B416; Mon, 15 Apr 2002 11:56:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E3A6A37B404 for ; Mon, 15 Apr 2002 11:56:07 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3FIu7m32674 for perforce@freebsd.org; Mon, 15 Apr 2002 11:56:07 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Mon, 15 Apr 2002 11:56:07 -0700 (PDT) Message-Id: <200204151856.g3FIu7m32674@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9785 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9785 Change 9785 by jhb@jhb_laptop on 2002/04/15 11:55:11 IFC much desired warning fix. Affected files ... ... //depot/projects/smpng/sys/dev/sound/pci/es137x.c#4 integrate Differences ... ==== //depot/projects/smpng/sys/dev/sound/pci/es137x.c#4 (text+ko) ==== @@ -59,7 +59,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.40 2001/10/08 05:58:52 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.41 2002/04/15 14:43:23 roberto Exp $"); static int debug = 0; SYSCTL_INT(_debug, OID_AUTO, es_debug, CTLFLAG_RW, &debug, 0, ""); @@ -595,7 +595,7 @@ es1371_rdcd(kobj_t obj, void *s, int addr) { int sl; - unsigned t, x; + unsigned t, x = 0; struct es_info *es = (struct es_info *)s; if (debug > 0) printf("rdcodec addr 0x%x ... ", addr); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 15 17:32: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AAA637B404; Mon, 15 Apr 2002 17:32:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 498C837B400 for ; Mon, 15 Apr 2002 17:32:03 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3G0W3Y03014 for perforce@freebsd.org; Mon, 15 Apr 2002 17:32:03 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Mon, 15 Apr 2002 17:32:03 -0700 (PDT) Message-Id: <200204160032.g3G0W3Y03014@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9801 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9801 Change 9801 by jhb@jhb_laptop on 2002/04/15 17:31:08 Merge a change I committed to CVS. Affected files ... ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#14 integrate Differences ... ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#14 (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. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.24 2002/02/10 04:43:21 rwatson Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.25 2002/04/14 04:12:44 jhb Exp $ */ #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 15 19:33:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E811A37B405; Mon, 15 Apr 2002 19:33:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1756537B404 for ; Mon, 15 Apr 2002 19:33:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3G2XVU30310 for perforce@freebsd.org; Mon, 15 Apr 2002 19:33:31 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 15 Apr 2002 19:33:31 -0700 (PDT) Message-Id: <200204160233.g3G2XVU30310@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9808 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9808 Change 9808 by jake@jake_sparc64 on 2002/04/15 19:32:40 sysinstall builds. Affected files ... ... //depot/projects/sparc64/usr.sbin/Makefile#13 edit Differences ... ==== //depot/projects/sparc64/usr.sbin/Makefile#13 (text+ko) ==== @@ -97,6 +97,7 @@ sliplogin \ slstat \ spray \ + sysinstall \ syslogd \ tcpdchk \ tcpdmatch \ @@ -122,10 +123,6 @@ ypset \ zic -.if ${MACHINE_ARCH} != "sparc64" -SUBDIR+=sysinstall -.endif - .if !defined(NO_IPFILTER) SUBDIR+=ipftest \ ipresend \ @@ -133,10 +130,6 @@ iptest .endif -.if ${MACHINE_ARCH} != "sparc64" -SUBDIR+=sysinstall -.endif - .if !defined(NOLIBC_R) && ${MACHINE_ARCH} != "ia64" SUBDIR+=pppctl .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 15 20: 2:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2698037B405; Mon, 15 Apr 2002 20:01:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 42B7637B404 for ; Mon, 15 Apr 2002 20:01:06 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3G315734054 for perforce@freebsd.org; Mon, 15 Apr 2002 20:01:05 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 15 Apr 2002 20:01:05 -0700 (PDT) Message-Id: <200204160301.g3G315734054@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9809 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9809 Change 9809 by jake@jake_sparc64 on 2002/04/15 20:00:17 Integ@9807 Affected files ... ... //depot/projects/sparc64/MAINTAINERS#1 branch ... //depot/projects/sparc64/Makefile.inc1#8 integrate ... //depot/projects/sparc64/bin/date/date.1#2 integrate ... //depot/projects/sparc64/bin/ls/ls.1#2 integrate ... //depot/projects/sparc64/bin/sh/exec.c#2 integrate ... //depot/projects/sparc64/contrib/openpam/HISTORY#6 integrate ... //depot/projects/sparc64/contrib/openpam/MANIFEST#6 integrate ... //depot/projects/sparc64/contrib/openpam/RELNOTES#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_free_data.3#2 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setenv.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_strerror.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_verror.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vinfo.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vprompt.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/openpam_version.h#1 branch ... //depot/projects/sparc64/contrib/openpam/include/security/pam_constants.h#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/Makefile#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_configure.c#1 branch ... //depot/projects/sparc64/contrib/openpam/lib/openpam_impl.h#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_ttyconv.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_acct_mgmt.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_chauthtok.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_close_session.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_open_session.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_setcred.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_start.c#5 integrate ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/PLATFORMS#2 integrate ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c#2 integrate ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec#2 integrate ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/passwdqc.h#2 integrate ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/passwdqc_check.c#2 integrate ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/passwdqc_random.c#2 integrate ... //depot/projects/sparc64/contrib/smbfs/lib/smb/ctx.c#3 integrate ... //depot/projects/sparc64/crypto/openssh/session.c#4 integrate ... //depot/projects/sparc64/etc/Makefile#4 integrate ... //depot/projects/sparc64/etc/mail/Makefile#4 integrate ... //depot/projects/sparc64/etc/mail/README#3 integrate ... //depot/projects/sparc64/etc/pam.d/Makefile#2 integrate ... //depot/projects/sparc64/etc/pam.d/passwd#1 branch ... //depot/projects/sparc64/etc/pam.d/sshd#3 integrate ... //depot/projects/sparc64/etc/sendmail/Makefile#3 integrate ... //depot/projects/sparc64/games/battlestar/com2.c#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/gperf/Makefile#4 integrate ... //depot/projects/sparc64/include/grp.h#5 integrate ... //depot/projects/sparc64/include/pwd.h#4 integrate ... //depot/projects/sparc64/include/string.h#4 integrate ... //depot/projects/sparc64/lib/Makefile#3 integrate ... //depot/projects/sparc64/lib/libc/gen/getpwent.c#4 integrate ... //depot/projects/sparc64/lib/libc/locale/euc.c#4 integrate ... //depot/projects/sparc64/lib/libc/net/rcmdsh.c#3 integrate ... //depot/projects/sparc64/lib/libc/sys/ioctl.2#4 integrate ... //depot/projects/sparc64/lib/libc_r/Makefile#2 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_cap_get_fd.c#2 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_cap_set_fd.c#2 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_main_np.c#2 integrate ... //depot/projects/sparc64/lib/libpam/libpam/Makefile#4 integrate ... //depot/projects/sparc64/lib/libpam/libpam/pam_debug_log.c#3 integrate ... //depot/projects/sparc64/lib/libpam/libpam/pam_std_option.c#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/Makefile.inc#4 integrate ... //depot/projects/sparc64/lib/libpam/modules/modules.inc#5 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#4 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_passwdqc/Makefile#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8#1 branch ... //depot/projects/sparc64/lib/libpam/modules/pam_unix/Makefile#4 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_unix/pam_unix.c#5 integrate ... //depot/projects/sparc64/lib/libypclnt/Makefile#2 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 integrate ... //depot/projects/sparc64/sbin/Makefile#13 integrate ... //depot/projects/sparc64/sbin/disklabel/disklabel.8#3 integrate ... //depot/projects/sparc64/sbin/mount_udf/Makefile#1 branch ... //depot/projects/sparc64/sbin/mount_udf/mount_udf.8#1 branch ... //depot/projects/sparc64/sbin/mount_udf/mount_udf.c#1 branch ... //depot/projects/sparc64/sbin/sysctl/sysctl.c#2 integrate ... //depot/projects/sparc64/sbin/vinum/vinum.8#2 integrate ... //depot/projects/sparc64/share/examples/etc/make.conf#6 integrate ... //depot/projects/sparc64/share/man/man4/vinum.4#3 integrate ... //depot/projects/sparc64/share/man/man5/a.out.5#2 integrate ... //depot/projects/sparc64/share/man/man5/make.conf.5#6 integrate ... //depot/projects/sparc64/share/man/man9/cd.9#2 integrate ... //depot/projects/sparc64/share/man/man9/style.9#4 integrate ... //depot/projects/sparc64/share/mk/bsd.dep.mk#4 integrate ... //depot/projects/sparc64/share/mk/bsd.libnames.mk#8 integrate ... //depot/projects/sparc64/share/mk/bsd.man.mk#2 integrate ... //depot/projects/sparc64/share/mk/bsd.nls.mk#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/pal.s#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/pmap.c#15 integrate ... //depot/projects/sparc64/sys/alpha/alpha/prom_disp.s#2 integrate ... //depot/projects/sparc64/sys/boot/pc98/kgzldr/Makefile#2 integrate ... //depot/projects/sparc64/sys/conf/NOTES#4 integrate ... //depot/projects/sparc64/sys/conf/files#53 edit ... //depot/projects/sparc64/sys/conf/files.alpha#13 integrate ... //depot/projects/sparc64/sys/conf/files.powerpc#6 integrate ... //depot/projects/sparc64/sys/conf/majors#9 integrate ... //depot/projects/sparc64/sys/conf/options#26 integrate ... //depot/projects/sparc64/sys/conf/options.ia64#5 integrate ... //depot/projects/sparc64/sys/dev/hfa/fore_load.c#3 integrate ... //depot/projects/sparc64/sys/dev/hfa/fore_slave.h#2 integrate ... //depot/projects/sparc64/sys/dev/ofw/ofw_disk.c#1 branch ... //depot/projects/sparc64/sys/dev/se/se_console.c#5 edit ... //depot/projects/sparc64/sys/dev/sound/pci/es137x.c#4 integrate ... //depot/projects/sparc64/sys/dev/sound/pci/ich.c#12 integrate ... //depot/projects/sparc64/sys/dev/sound/pci/maestro.c#5 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wi.c#24 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wi_pci.c#3 integrate ... //depot/projects/sparc64/sys/fs/pseudofs/pseudofs_vnops.c#13 integrate ... //depot/projects/sparc64/sys/fs/udf/ecma167-udf.h#1 branch ... //depot/projects/sparc64/sys/fs/udf/osta.c#1 branch ... //depot/projects/sparc64/sys/fs/udf/osta.h#1 branch ... //depot/projects/sparc64/sys/fs/udf/udf.h#1 branch ... //depot/projects/sparc64/sys/fs/udf/udf_mount.h#1 branch ... //depot/projects/sparc64/sys/fs/udf/udf_vfsops.c#1 branch ... //depot/projects/sparc64/sys/fs/udf/udf_vnops.c#1 branch ... //depot/projects/sparc64/sys/i386/i386/i686_mem.c#2 integrate ... //depot/projects/sparc64/sys/i386/i386/pmap.c#23 integrate ... //depot/projects/sparc64/sys/ia64/ia64/ia64dump.c#3 integrate ... //depot/projects/sparc64/sys/ia64/ia64/machdep.c#37 integrate ... //depot/projects/sparc64/sys/ia64/ia64/pmap.c#25 integrate ... //depot/projects/sparc64/sys/kern/init_sysent.c#17 integrate ... //depot/projects/sparc64/sys/kern/kern_clock.c#14 integrate ... //depot/projects/sparc64/sys/kern/kern_malloc.c#7 integrate ... //depot/projects/sparc64/sys/kern/kern_ntptime.c#6 integrate ... //depot/projects/sparc64/sys/kern/kern_tc.c#9 integrate ... //depot/projects/sparc64/sys/kern/kern_time.c#9 integrate ... //depot/projects/sparc64/sys/kern/subr_param.c#10 integrate ... //depot/projects/sparc64/sys/kern/sys_process.c#18 integrate ... //depot/projects/sparc64/sys/kern/syscalls.c#16 integrate ... //depot/projects/sparc64/sys/kern/syscalls.master#15 integrate ... //depot/projects/sparc64/sys/kern/vfs_aio.c#18 integrate ... //depot/projects/sparc64/sys/kern/vfs_vnops.c#21 integrate ... //depot/projects/sparc64/sys/modules/Makefile#28 integrate ... //depot/projects/sparc64/sys/modules/udf/Makefile#1 branch ... //depot/projects/sparc64/sys/net/if_arcsubr.c#4 integrate ... //depot/projects/sparc64/sys/netgraph/ng_pptpgre.c#3 integrate ... //depot/projects/sparc64/sys/pci/agp_amd.c#4 integrate ... //depot/projects/sparc64/sys/powerpc/conf/GENERIC#5 integrate ... //depot/projects/sparc64/sys/powerpc/include/cpu.h#8 integrate ... //depot/projects/sparc64/sys/powerpc/include/nexusvar.h#1 branch ... //depot/projects/sparc64/sys/powerpc/powerpc/nexus.c#1 branch ... //depot/projects/sparc64/sys/powerpc/powerpc/pmap.c#17 integrate ... //depot/projects/sparc64/sys/sparc64/conf/GENERIC#22 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/pmap.c#84 integrate ... //depot/projects/sparc64/sys/sys/kernel.h#11 integrate ... //depot/projects/sparc64/sys/sys/malloc.h#7 integrate ... //depot/projects/sparc64/sys/sys/memrange.h#2 integrate ... //depot/projects/sparc64/sys/sys/syscall.h#16 integrate ... //depot/projects/sparc64/sys/sys/syscall.mk#16 integrate ... //depot/projects/sparc64/sys/sys/sysproto.h#18 integrate ... //depot/projects/sparc64/sys/sys/time.h#6 integrate ... //depot/projects/sparc64/sys/sys/vnode.h#14 integrate ... //depot/projects/sparc64/sys/ufs/ffs/ffs_softdep.c#11 integrate ... //depot/projects/sparc64/sys/vm/pmap.h#8 integrate ... //depot/projects/sparc64/sys/vm/uma_core.c#7 integrate ... //depot/projects/sparc64/sys/vm/uma_int.h#5 integrate ... //depot/projects/sparc64/sys/vm/vm_map.c#13 integrate ... //depot/projects/sparc64/sys/vm/vm_page.c#14 integrate ... //depot/projects/sparc64/sys/vm/vm_zeroidle.c#6 integrate ... //depot/projects/sparc64/tools/tools/README#2 integrate ... //depot/projects/sparc64/tools/tools/prstats/prstats.pl#2 integrate ... //depot/projects/sparc64/usr.bin/find/Makefile#4 integrate ... //depot/projects/sparc64/usr.bin/find/getdate.y#1 branch ... //depot/projects/sparc64/usr.bin/find/ls.c#4 integrate ... //depot/projects/sparc64/usr.bin/killall/killall.1#2 integrate ... //depot/projects/sparc64/usr.bin/killall/killall.c#3 integrate ... //depot/projects/sparc64/usr.bin/make/str.c#3 integrate ... //depot/projects/sparc64/usr.bin/passwd/Makefile#4 integrate ... //depot/projects/sparc64/usr.bin/passwd/passwd.c#3 integrate ... //depot/projects/sparc64/usr.bin/sockstat/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/usbhidctl/Makefile#3 integrate ... //depot/projects/sparc64/usr.bin/vmstat/vmstat.c#6 integrate ... //depot/projects/sparc64/usr.bin/xlint/Makefile.inc#3 integrate ... //depot/projects/sparc64/usr.sbin/memcontrol/memcontrol.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/bundle.c#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/defs.c#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/defs.h#3 integrate ... //depot/projects/sparc64/usr.sbin/vipw/pw_util.c#2 integrate Differences ... ==== //depot/projects/sparc64/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.255 2002/04/13 07:24:14 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.257 2002/04/15 15:31:25 des Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -739,9 +739,11 @@ _prebuild_libs= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ lib/libncurses lib/libopie lib/libradius lib/librpcsvc \ - lib/libsbuf lib/libtacplus lib/libutil lib/libz lib/msun + lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ + lib/libz lib/msun lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L +lib/libypclnt__L: lib/librpcsvc__L _generic_libs= lib gnu/lib ==== //depot/projects/sparc64/bin/date/date.1#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.54 2001/08/07 15:48:26 ru Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.56 2002/04/15 18:17:18 trhodes Exp $ .\" .Dd November 17, 1993 .Dt DATE 1 @@ -72,6 +72,12 @@ .Nm will set the date and time or print it in a user-defined way. .Pp +The +.Nm +utility displays the date and time read from the kernel clock. +When used to set the date and time, +both the kernel clock and the CMOS clock are updated. +.Pp Only the superuser may set the date, and if the system securelevel (see .Xr securelevel 8 ) ==== //depot/projects/sparc64/bin/ls/ls.1#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.62 2002/01/09 13:29:39 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.63 2002/04/15 02:21:12 jwd Exp $ .\" .Dd December 29, 2002 .Dt LS 1 @@ -137,8 +137,12 @@ .It Fl R Recursively list subdirectories encountered. .It Fl T -Display complete time information for the file, including -month, day, hour, minute, second, and year. +When used with the +.Fl l +(lowercase letter +.Dq ell ) +option, display complete time information for the file, including +month, day, hour, minute, second, and year. .It Fl W Display whiteouts when scanning directories. .It Fl Z @@ -167,7 +171,7 @@ .Pq Fl l format output. .It Fl h -When used wih the +When used with the .Fl l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of digits to three or less ==== //depot/projects/sparc64/bin/sh/exec.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)exec.c 8.4 (Berkeley) 6/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/exec.c,v 1.16 2002/02/02 06:50:46 imp Exp $"; + "$FreeBSD: src/bin/sh/exec.c,v 1.17 2002/04/15 15:49:30 greid Exp $"; #endif /* not lint */ #include @@ -350,7 +350,10 @@ if (verbose) { if (entry.cmdtype != CMDUNKNOWN) { /* if no error msg */ cmdp = cmdlookup(name, 0); - printentry(cmdp, verbose); + if (cmdp != NULL) + printentry(cmdp, verbose); + else + outfmt(&errout, "%s: not found\n", name); } flushall(); } ==== //depot/projects/sparc64/contrib/openpam/HISTORY#6 (text+ko) ==== @@ -1,4 +1,18 @@ ============================================================================ +OpenPAM Cineraria 2002-04-14 + + - ENHANCE: Improved documentation. + + - ENHANCE: Adopt the same preprocessor tricks that were used in + FreeBSD's version of Linux-PAM to simplify static linking without + requiring dummy primitives. + + - ENHANCE: move the policy-loading code out of pam_start.c. + + - BUGFIX: Fix typo in one of the versions of the openpam_log macro. + + - ENHANCE: Add versioning macros. +============================================================================ OpenPAM Cinchona 2002-04-08 - ENHANCE: Improved documentation for several API functions. @@ -114,4 +128,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/sparc64/contrib/openpam/HISTORY#5 $ +$P4: //depot/projects/sparc64/contrib/openpam/HISTORY#6 $ ==== //depot/projects/sparc64/contrib/openpam/MANIFEST#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/sparc64/contrib/openpam/MANIFEST#5 $ +# $P4: //depot/projects/sparc64/contrib/openpam/MANIFEST#6 $ # CREDITS HISTORY @@ -54,12 +54,14 @@ doc/man/pam_vinfo.3 doc/man/pam_vprompt.3 include/security/openpam.h +include/security/openpam_version.h include/security/pam_appl.h include/security/pam_constants.h include/security/pam_modules.h include/security/pam_types.h lib/Makefile lib/openpam_borrow_cred.c +lib/openpam_configure.c lib/openpam_dispatch.c lib/openpam_dynamic.c lib/openpam_findenv.c ==== //depot/projects/sparc64/contrib/openpam/RELNOTES#6 (text+ko) ==== @@ -1,14 +1,12 @@ - Release notes for OpenPAM Cinchona - ================================== + Release notes for OpenPAM Cineraria + =================================== -This is a beta release. - The library itself is complete. Documentation exists in the form of man pages for the library functions, though a few pages are still incomplete. -This release is incorporated into FreeBSD-CURRENT as of 2002-04-08. +This release is incorporated into FreeBSD-CURRENT as of 2002-04-14. It has also been successfully built on NetBSD, and should build with minimal or no changes on OpenBSD. It has not been tested on any other OS. @@ -17,9 +15,4 @@ - The documentation is still incomplete. - - It should be possible to create incomplete modules without - recourse to placeholders or elaborate preprocessor tricks. This - is made difficult by the requirement that it should be possible to - link modules statically. - -$P4: //depot/projects/sparc64/contrib/openpam/RELNOTES#5 $ +$P4: //depot/projects/sparc64/contrib/openpam/RELNOTES#6 $ ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_borrow_cred.3#2 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#1 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#2 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_free_data.3#2 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#1 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#2 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_LOG 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_restore_cred.3#2 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#1 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#2 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME @@ -46,7 +46,25 @@ .Ft int .Fn pam_acct_mgmt "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +function verifies and enforces account restrictions +after the user has been authenticated. +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.It Dv PAM_DISALLOW_NULL_AUTHTOK +Fail if the user's authentication token is null. +.El +If any other bits are set, +.Xr pam_authenticate 3 +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm @@ -75,6 +93,7 @@ .El .Sh SEE ALSO .Xr pam 3 , +.Xr pam_authenticate 3 , .Xr pam_strerror 3 .Sh STANDARDS .Rs ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME @@ -65,12 +65,16 @@ .Va flags argument is the binary or of zero or more of the following values: -.Pp -.Bd -literal - =PAM_SILENT - Do not emit any messages. - =PAM_DISALLOW_NULL_AUTHTOK - Fail if the user's authentication token is null. +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.It Dv PAM_DISALLOW_NULL_AUTHTOK +Fail if the user's authentication token is null. +.El +If any other bits are set, +.Nm +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm @@ -94,6 +98,8 @@ Permission denied. .It Bq Er PAM_SERVICE_ERR Error in service module. +.It Bq Er PAM_SYMBOL_ERR +Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .It Bq Er PAM_USER_UNKNOWN ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME @@ -57,12 +57,16 @@ .Va flags argument is the binary or of zero or more of the following values: -.Pp -.Bd -literal - =PAM_SILENT - Do not emit any messages. - =PAM_CHANGE_EXPIRED_AUTHTOK - Change only those authentication tokens that have expired. +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.It Dv PAM_CHANGE_EXPIRED_AUTHTOK +Change only those authentication tokens that have expired. +.El +If any other bits are set, +.Nm +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME @@ -46,7 +46,24 @@ .Ft int .Fn pam_close_session "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +function tears down the user session previously +set up by +.Xr pam_open_session 3 . +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.El +If any other bits are set, +.Nm +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm @@ -64,11 +81,14 @@ Error in service module. .It Bq Er PAM_SESSION_ERR Session failure. +.It Bq Er PAM_SYMBOL_ERR +Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .El .Sh SEE ALSO .Xr pam 3 , +.Xr pam_open_session 3 , .Xr pam_strerror 3 .Sh STANDARDS .Rs ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_END 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_ERROR 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GET_DATA 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GET_ITEM 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GET_USER 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GETENV 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GETENVLIST 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_INFO 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME @@ -46,7 +46,24 @@ .Ft int .Fn pam_open_session "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +sets up a user session for a previously +authenticated user. The session should later be torn down by a call to +.Xr pam_close_session 3 . +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.El +If any other bits are set, +.Nm +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm @@ -64,11 +81,14 @@ Error in service module. .It Bq Er PAM_SESSION_ERR Session failure. +.It Bq Er PAM_SYMBOL_ERR +Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .El .Sh SEE ALSO .Xr pam 3 , +.Xr pam_close_session 3 , .Xr pam_strerror 3 .Sh STANDARDS .Rs ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_PROMPT 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_PUTENV 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_SET_DATA 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_SET_ITEM 3 .Os .Sh NAME ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#6 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#5 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_SETCRED 3 .Os .Sh NAME @@ -49,18 +49,29 @@ The .Nm function manages the application's credentials. -The operation to perform is specified by the +.Pp +The .Va flags -argument: +argument is the binary or of zero or more of the following >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 15 20:16:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0684A37B41B; Mon, 15 Apr 2002 20:16:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by hub.freebsd.org (Postfix) with ESMTP id 8FDCF37B404 for ; Mon, 15 Apr 2002 20:16:35 -0700 (PDT) Received: (qmail 22219 invoked from network); 16 Apr 2002 03:16:34 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 16 Apr 2002 03:16:34 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g3G3H7v75139; Mon, 15 Apr 2002 23:17:07 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200204160233.g3G2XVU30310@freefall.freebsd.org> Date: Mon, 15 Apr 2002 23:15:45 -0400 (EDT) From: John Baldwin To: Jake Burkholder Subject: RE: PERFORCE change 9808 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 16-Apr-2002 Jake Burkholder wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9808 > > Change 9808 by jake@jake_sparc64 on 2002/04/15 19:32:40 > > sysinstall builds. Uh, someone fixed libdisk are is that part hacked out for now? -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 15 21:42:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2B0737B419; Mon, 15 Apr 2002 21:42:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from k6.locore.ca (k6.locore.ca [198.96.117.170]) by hub.freebsd.org (Postfix) with ESMTP id B828437B400; Mon, 15 Apr 2002 21:42:03 -0700 (PDT) Received: (from jake@localhost) by k6.locore.ca (8.11.6/8.11.6) id g3G4kKA33219; Tue, 16 Apr 2002 00:46:20 -0400 (EDT) (envelope-from jake) Date: Tue, 16 Apr 2002 00:46:19 -0400 From: Jake Burkholder To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 9808 for review Message-ID: <20020416004619.A24202@locore.ca> References: <200204160233.g3G2XVU30310@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: ; from jhb@FreeBSD.org on Mon, Apr 15, 2002 at 11:15:45PM -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Apparently, On Mon, Apr 15, 2002 at 11:15:45PM -0400, John Baldwin said words to the effect of; > > On 16-Apr-2002 Jake Burkholder wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9808 > > > > Change 9808 by jake@jake_sparc64 on 2002/04/15 19:32:40 > > > > sysinstall builds. > > Uh, someone fixed libdisk are is that part hacked out for now? It compiles, I have no idea if it works. > > -- > > John Baldwin <>< http://www.FreeBSD.org/~jhb/ > "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 5:48: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F22237B400; Tue, 16 Apr 2002 05:47:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail13.speakeasy.net [216.254.0.213]) by hub.freebsd.org (Postfix) with ESMTP id 6F66537B416 for ; Tue, 16 Apr 2002 05:47:17 -0700 (PDT) Received: (qmail 10402 invoked from network); 16 Apr 2002 12:47:14 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail13.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 16 Apr 2002 12:47:14 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g3GClCv76428; Tue, 16 Apr 2002 08:47:12 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20020416004619.A24202@locore.ca> Date: Tue, 16 Apr 2002 08:46:16 -0400 (EDT) From: John Baldwin To: Jake Burkholder Subject: Re: PERFORCE change 9808 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 16-Apr-2002 Jake Burkholder wrote: > Apparently, On Mon, Apr 15, 2002 at 11:15:45PM -0400, > John Baldwin said words to the effect of; > >> >> On 16-Apr-2002 Jake Burkholder wrote: >> > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9808 >> > >> > Change 9808 by jake@jake_sparc64 on 2002/04/15 19:32:40 >> > >> > sysinstall builds. >> >> Uh, someone fixed libdisk are is that part hacked out for now? > > It compiles, I have no idea if it works. I seriously doubt it works then since it assumes i386 rather than alpha so it's going to try to create slices. Also, I doubt it does the cylinder calculations right for sun labels, but I could be wrong. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 5:58:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECEBC37B404; Tue, 16 Apr 2002 05:58:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from k6.locore.ca (k6.locore.ca [198.96.117.170]) by hub.freebsd.org (Postfix) with ESMTP id 7711937B416; Tue, 16 Apr 2002 05:58:38 -0700 (PDT) Received: (from jake@localhost) by k6.locore.ca (8.11.6/8.11.6) id g3GD31934763; Tue, 16 Apr 2002 09:03:01 -0400 (EDT) (envelope-from jake) Date: Tue, 16 Apr 2002 09:03:01 -0400 From: Jake Burkholder To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 9808 for review Message-ID: <20020416090301.C24202@locore.ca> References: <20020416004619.A24202@locore.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: ; from jhb@FreeBSD.org on Tue, Apr 16, 2002 at 08:46:16AM -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Apparently, On Tue, Apr 16, 2002 at 08:46:16AM -0400, John Baldwin said words to the effect of; > > On 16-Apr-2002 Jake Burkholder wrote: > > Apparently, On Mon, Apr 15, 2002 at 11:15:45PM -0400, > > John Baldwin said words to the effect of; > > > >> > >> On 16-Apr-2002 Jake Burkholder wrote: > >> > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9808 > >> > > >> > Change 9808 by jake@jake_sparc64 on 2002/04/15 19:32:40 > >> > > >> > sysinstall builds. > >> > >> Uh, someone fixed libdisk are is that part hacked out for now? > > > > It compiles, I have no idea if it works. > > I seriously doubt it works then since it assumes i386 rather than alpha so it's > going to try to create slices. Also, I doubt it does the cylinder calculations > right for sun labels, but I could be wrong. Peter said sysinstall basically works for ia64, except you need to create the partitions before hand, I imagine its about the same. > > -- > > John Baldwin <>< http://www.FreeBSD.org/~jhb/ > "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 6:41: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F3E437B416; Tue, 16 Apr 2002 06:39:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E32D437B400 for ; Tue, 16 Apr 2002 06:39:36 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3GDbuR90579 for perforce@freebsd.org; Tue, 16 Apr 2002 06:37:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 16 Apr 2002 06:37:56 -0700 (PDT) Message-Id: <200204161337.g3GDbuR90579@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9826 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9826 Change 9826 by rwatson@rwatson_curry on 2002/04/16 06:36:52 Integ TrustedBSD base tree from FreeBSD vendor tree head. Affected files ... ... //depot/projects/trustedbsd/base/MAINTAINERS#1 branch ... //depot/projects/trustedbsd/base/Makefile.inc1#12 integrate ... //depot/projects/trustedbsd/base/README#2 integrate ... //depot/projects/trustedbsd/base/UPDATING#11 integrate ... //depot/projects/trustedbsd/base/bin/Makefile#3 integrate ... //depot/projects/trustedbsd/base/bin/chio/chio.c#5 integrate ... //depot/projects/trustedbsd/base/bin/date/date.1#2 integrate ... //depot/projects/trustedbsd/base/bin/dd/dd.1#2 integrate ... //depot/projects/trustedbsd/base/bin/df/df.c#6 integrate ... //depot/projects/trustedbsd/base/bin/expr/Makefile#3 integrate ... //depot/projects/trustedbsd/base/bin/expr/expr.1#2 integrate ... //depot/projects/trustedbsd/base/bin/expr/expr.y#3 integrate ... //depot/projects/trustedbsd/base/bin/ls/lomac.c#5 integrate ... //depot/projects/trustedbsd/base/bin/ls/ls.1#7 integrate ... //depot/projects/trustedbsd/base/bin/mv/mv.1#2 integrate ... //depot/projects/trustedbsd/base/bin/mv/mv.c#4 integrate ... //depot/projects/trustedbsd/base/bin/pax/options.c#3 integrate ... //depot/projects/trustedbsd/base/bin/pax/sel_subs.c#3 integrate ... //depot/projects/trustedbsd/base/bin/ps/lomac.c#5 integrate ... //depot/projects/trustedbsd/base/bin/ps/ps.c#7 integrate ... //depot/projects/trustedbsd/base/bin/sh/exec.c#3 integrate ... //depot/projects/trustedbsd/base/bin/test/test.c#7 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/ChangeLog#5 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/Makefile.am#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/Makefile.in#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/aclocal.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/aout-tic30.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/aoutx.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/archive.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/archures.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/bfd-in2.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-arm.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-mips.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-tic30.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-z8k.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/coffcode.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/cofflink.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/config.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/configure#5 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/configure.in#5 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-i386.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-mips.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-sparc.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-v850.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-z8k.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/dep-in.sed#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/ChangeLog#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/Makefile.in#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/dwarf2.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/ecoff.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf-bfd.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-arm.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-i386.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-mips.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-sparc.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-v850.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-alpha.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-mips.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-ppc.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-sparc.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-x86-64.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elflink.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elflink.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elfxx-ia64.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/elfxx-target.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/i386linux.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/ihex.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/libbfd.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/libbfd.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/libpei.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/linker.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/merge.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/mipsbsd.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/pe-mips.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/peicode.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/sparclinux.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/srec.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/sunos.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/syms.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/version.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/xcoff-target.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/bfd/xcofflink.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/ChangeLog#5 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/Makefile.am#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/Makefile.in#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/aclocal.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/configure#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/configure.in#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/dep-in.sed#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/binutils/unwind-ia64.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/ChangeLog#5 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/Makefile.am#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/Makefile.in#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/aclocal.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/as.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config.in#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/atof-vax.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/obj-elf.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-arm.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-i386.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-i386.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-ia64.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-ia64.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-tic30.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-v850.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-v850.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-z8k.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/dep-in.sed#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/Makefile.in#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/c-sh.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/gas/write.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/mips.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/v850.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/ChangeLog#5 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/Makefile.am#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/Makefile.in#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/configure.host#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/dep-in.sed#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32bmip.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32bmipn32.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32bsmip.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32ebmip.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32elmip.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32lmip.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf32lsmip.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf64bmip.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/shelf.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/shelf_linux.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/shl.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/shlelf.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/genscripts.sh#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/ldlang.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/ldmain.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/scripttempl/elf.sc#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/ld/scripttempl/v850.sc#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ChangeLog#5 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/Makefile.am#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/Makefile.in#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/aclocal.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/config.in#3 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/configure#5 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/dep-in.sed#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ppc-opc.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/v850-dis.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/v850-opc.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/z8k-dis.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/z8k-opc.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/binutils/opcodes/z8kgen.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/cccp.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/freebsd.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/toplev.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/crtbegin.asm#3 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/crtend.asm#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ip_ipsec_pxy.c#2 delete ... //depot/projects/trustedbsd/base/contrib/ipfilter/ip_netbios_pxy.c#2 delete ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/FREEBSD-upgrade#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/Makefile.conf#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/README#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/RELNOTES#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/clparse.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/dhclient.conf.5#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/conflex.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/dns.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/options.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/print.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/common/tables.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/configure#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/dhcpd.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/dhctoken.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/minires/minires.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/site.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/includes/version.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_parse.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/isc-dhcp/minires/ns_verify.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/CREDITS#1 branch ... //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/INSTALL#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/LICENSE#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/Makefile#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/README#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/bin/su/su.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#1 branch ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#1 branch ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#1 branch ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#1 branch ... //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_appl.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_constants.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_modules.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_borrow_cred.c#1 branch ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_configure.c#1 branch ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dispatch.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_findenv.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_free_data.c#1 branch ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_get_option.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_restore_cred.c#1 branch ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_set_option.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_static.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_acct_mgmt.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate_secondary.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_chauthtok.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_close_session.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_end.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_error.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_authtok.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_data.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_item.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_authtok.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_username.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_user.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenv.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenvlist.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_info.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_open_session.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_prompt.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_putenv.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_data.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_item.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_authtok.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_username.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setcred.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setenv.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_acct_mgmt.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate_secondary.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_chauthtok.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_close_session.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_username.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_open_session.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_username.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_setcred.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_start.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_strerror.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_verror.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vinfo.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vprompt.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/misc/gendoc.pl#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/Makefile#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/Makefile#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/pam_deny.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_dummy/Makefile#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_dummy/pam_dummy.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/Makefile#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/pam_permit.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/opie/BUG-REPORT#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/INSTALL#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/Makefile.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/README#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/acconfig.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/config.h.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/configure#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/configure.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/ftpcmd.y#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/glob.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libmissing/Makefile.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libmissing/endutent.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libmissing/getutline.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libmissing/pututline.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libmissing/setutent.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/Makefile.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/accessfile.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/atob8.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/btoa8.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/btoe.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/btoh.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/challenge.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/generator.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/getsequence.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/getutmpentry.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/hash.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/hashlen.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/insecure.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/keycrunch.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/lock.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/login.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/logwtmp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/lookup.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/md4c.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/md5c.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/newseed.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/open.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/parsechallenge.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/passcheck.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/passwd.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/randomchallenge.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/readpass.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/readrec.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/unlock.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/verify.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/version.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/libopie/writerec.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opie.4#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opie.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opie_cfg.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opieaccess.5#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opieauto.c#1 branch ... //depot/projects/trustedbsd/base/contrib/opie/opieftpd.8#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opieftpd.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opiegen.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opiegen.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opieinfo.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opieinfo.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opiekey.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opiekey.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opielogin.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opielogin.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opiepasswd.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opiepasswd.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opieserv.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opieserv.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opiesu.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opiesu.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/opietest.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/permsfile.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/opie/popen.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/INTERNALS#1 branch ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/LICENSE#1 branch ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/Makefile#1 branch ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/PLATFORMS#1 branch ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/README#1 branch ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/pam_macros.h#1 branch ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c#1 branch ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec#1 branch ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/passwdqc.h#1 branch ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/passwdqc_check.c#1 branch ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/passwdqc_random.c#1 branch ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/wordset_4k.c#1 branch ... //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/KNOWNBUGS#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/README#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/access_db.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/compat_check.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/ldap_routing.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/msp.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/proto.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/darwin.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/contrib/buildvirtuser#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/contrib/qtool.8#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/contrib/qtool.pl#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/contrib/smcontrol.pl#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/op.me#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/editmap/editmap.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/mfapi.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/milter.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/cdefs.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/conf.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/config.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/gen.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/io.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/ldap.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_freebsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/Makefile.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/comm.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/installation.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#1 branch ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/engine.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/listener.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/main.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/signal.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/smfi.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/README#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/clock.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/config.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/debug.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fclose.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/findfp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ldap.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/local.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/mbdb.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/smstdio.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/sscanf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/stdio.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/strio.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/strl.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-event.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-fopen.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-shm.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-types.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vsscanf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/wsetup.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/smdb.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/smdb1.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/smndbm.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/Makefile.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/mail.local.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/mailstats/mailstats.8#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/Makefile.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/README#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/SECURITY#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/TUNING#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/bf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/control.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/domain.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/envelope.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/helpfile#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/map.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/milter.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/mime.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/readcf.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/sasl.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/stats.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/usersmtp.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/util.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/vacation/vacation.1#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/vacation/vacation.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/ctx.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sort/Makefile#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/append.c#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/extern.h#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/fields.c#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/files.c#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/fsort.c#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/fsort.h#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/init.c#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/msort.c#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/pathnames.h#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/regress/Makefile#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/regress/stests#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/sort.1#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/sort.c#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/sort.h#1 branch ... //depot/projects/trustedbsd/base/contrib/sort/tmp.c#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/COPYING#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/COPYING.DOC#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/ChangeLog#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/FREEBSD-Xlist#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/FREEBSD-upgrade#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/INSTALL#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/INTRODUCTION#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/NEWS#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/README#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/TODO#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/config.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/config.h.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/doc/README#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/doc/help2man#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/doc/info-stnd.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/doc/info.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/doc/info.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/doc/install-info.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/doc/makeinfo.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/doc/texindex.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/doc/texinfo.txi#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/doc/version-stnd.texi#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/doc/version.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/doc.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/doc.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/echo-area.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/filesys.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/funs.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/info.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/info.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/infodoc.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/infokey.c#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/info/infokey.h#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/info/infomap.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/infomap.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/key.c#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/info/key.h#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/info/m-x.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/man.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/nodes.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/session.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/session.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/termdep.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/terminal.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/terminal.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/variables.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/info/window.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/lib/getopt.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/lib/getopt.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/lib/getopt1.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/lib/gettext.h#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/lib/system.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/lib/xstrdup.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/README#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/cmds.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/defun.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/docbook.c#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/docbook.h#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/files.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/files.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/footnote.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/html.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/html.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/index.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/insertion.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/insertion.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/lang.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/lang.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/macro.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/makeinfo.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/makeinfo.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/multi.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/node.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/node.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/sectioning.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/texinfo.dtd#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/texinfo.xsl#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/toc.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/toc.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/xml.c#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/xml.h#1 branch ... //depot/projects/trustedbsd/base/contrib/texinfo/util/install-info.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/texinfo/util/texindex.c#2 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/auth1.c#3 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/auth2.c#3 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/myproposal.h#3 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/pam_ssh/pam_ssh.c#2 delete ... //depot/projects/trustedbsd/base/crypto/openssh/readconf.c#3 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/servconf.c#3 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/session.c#6 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#3 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/sshconnect2.c#3 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/sshd.8#3 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#3 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/version.h#5 integrate ... //depot/projects/trustedbsd/base/etc/MAKEDEV#11 integrate ... //depot/projects/trustedbsd/base/etc/Makefile#12 integrate ... //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#3 integrate ... //depot/projects/trustedbsd/base/etc/defaults/rc.conf#9 integrate ... //depot/projects/trustedbsd/base/etc/inetd.conf#5 integrate ... //depot/projects/trustedbsd/base/etc/isdn/holidays.D#2 integrate ... //depot/projects/trustedbsd/base/etc/locale.deprecated#4 integrate ... //depot/projects/trustedbsd/base/etc/mail/Makefile#4 integrate ... //depot/projects/trustedbsd/base/etc/mail/README#4 integrate ... //depot/projects/trustedbsd/base/etc/mail/mailer.conf#2 integrate ... //depot/projects/trustedbsd/base/etc/moduli#1 branch ... //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#5 integrate ... //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#8 integrate ... //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#12 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/Makefile#2 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/login#5 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/passwd#1 branch ... //depot/projects/trustedbsd/base/etc/pam.d/rsh#2 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/sshd#2 integrate ... //depot/projects/trustedbsd/base/etc/periodic/daily/440.status-mailq#2 integrate ... //depot/projects/trustedbsd/base/etc/periodic/daily/500.queuerun#2 integrate ... //depot/projects/trustedbsd/base/etc/primes#2 delete ... //depot/projects/trustedbsd/base/etc/rc#10 integrate ... //depot/projects/trustedbsd/base/etc/rc.network#11 integrate ... //depot/projects/trustedbsd/base/etc/rc.network6#6 integrate ... //depot/projects/trustedbsd/base/etc/sendmail/Makefile#4 integrate ... //depot/projects/trustedbsd/base/etc/sendmail/freebsd.mc#4 integrate ... //depot/projects/trustedbsd/base/etc/sendmail/freefall.mc#3 integrate ... //depot/projects/trustedbsd/base/etc/sendmail/rc.sendmail#1 branch ... //depot/projects/trustedbsd/base/etc/syslog.conf#4 integrate ... //depot/projects/trustedbsd/base/games/backgammon/common_source/fancy.c#2 integrate ... //depot/projects/trustedbsd/base/games/battlestar/com2.c#2 integrate ... //depot/projects/trustedbsd/base/games/canfield/canfield/canfield.c#2 integrate ... //depot/projects/trustedbsd/base/games/canfield/cfscores/cfscores.c#2 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#10 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2-o#2 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/freebsd-tips#5 integrate ... //depot/projects/trustedbsd/base/games/fortune/fortune/fortune.c#3 integrate ... //depot/projects/trustedbsd/base/games/fortune/strfile/strfile.c#3 integrate ... //depot/projects/trustedbsd/base/games/hack/hack.ioctl.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/lib/Makefile#4 integrate ... //depot/projects/trustedbsd/base/gnu/lib/csu/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/lib/libgcc/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/lib/libreadline/readline/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/Makefile.inc0#6 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/alpha/nm.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/i386/tm.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile#5 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile.alpha#4 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile.i386#4 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile.ia64#4 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile.powerpc#4 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile.sparc64#4 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile.fe#1 branch ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile.inc#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile.tgt#1 branch ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc1/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc1obj/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc1plus/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/Makefile#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/freebsd-native.h#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cccp/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/collect2/Makefile#1 branch ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/protoize/Makefile#1 branch ... //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/cvsbug/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/lib/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/gperf/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/devices/grodvi/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/devices/grohtml/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/devices/grolbp/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/devices/grolj4/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/devices/grops/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/devices/grotty/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/preproc/eqn/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/preproc/grn/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/preproc/html/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/preproc/pic/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/preproc/refer/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/preproc/soelim/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/preproc/tbl/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/roff/groff/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/roff/troff/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/utils/addftinfo/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/utils/indxbib/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/utils/lkbib/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/utils/lookbib/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/man/makewhatis/makewhatis.perl#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/man/man/man.c#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/man/manpath/manpath.config#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/send-pr.1#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/tar/port.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/tar/prepend_args.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/texinfo/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/texinfo/infokey/Makefile#1 branch ... //depot/projects/trustedbsd/base/gnu/usr.bin/texinfo/makeinfo/Makefile#2 integrate ... //depot/projects/trustedbsd/base/include/Makefile#7 integrate ... //depot/projects/trustedbsd/base/include/arpa/inet.h#5 integrate ... //depot/projects/trustedbsd/base/include/arpa/nameser.h#2 integrate ... //depot/projects/trustedbsd/base/include/assert.h#2 integrate ... //depot/projects/trustedbsd/base/include/complex.h#2 integrate ... //depot/projects/trustedbsd/base/include/ctype.h#3 integrate ... //depot/projects/trustedbsd/base/include/db.h#2 integrate ... //depot/projects/trustedbsd/base/include/dirent.h#2 integrate ... //depot/projects/trustedbsd/base/include/disktab.h#2 delete ... //depot/projects/trustedbsd/base/include/dlfcn.h#3 integrate ... //depot/projects/trustedbsd/base/include/err.h#2 integrate ... //depot/projects/trustedbsd/base/include/fnmatch.h#2 integrate ... //depot/projects/trustedbsd/base/include/fstab.h#2 integrate ... //depot/projects/trustedbsd/base/include/fts.h#2 integrate ... //depot/projects/trustedbsd/base/include/glob.h#2 integrate ... //depot/projects/trustedbsd/base/include/grp.h#5 integrate ... //depot/projects/trustedbsd/base/include/hesiod.h#2 integrate ... //depot/projects/trustedbsd/base/include/ieeefp.h#2 integrate ... //depot/projects/trustedbsd/base/include/ifaddrs.h#2 integrate ... //depot/projects/trustedbsd/base/include/langinfo.h#4 integrate ... //depot/projects/trustedbsd/base/include/libgen.h#2 integrate ... //depot/projects/trustedbsd/base/include/link.h#2 integrate ... //depot/projects/trustedbsd/base/include/locale.h#2 integrate ... //depot/projects/trustedbsd/base/include/math.h#2 integrate ... //depot/projects/trustedbsd/base/include/mpool.h#2 integrate ... //depot/projects/trustedbsd/base/include/ndbm.h#2 integrate ... //depot/projects/trustedbsd/base/include/netconfig.h#2 integrate ... //depot/projects/trustedbsd/base/include/netdb.h#2 integrate ... //depot/projects/trustedbsd/base/include/nl_types.h#2 integrate ... //depot/projects/trustedbsd/base/include/nlist.h#2 integrate ... //depot/projects/trustedbsd/base/include/nsswitch.h#2 integrate ... //depot/projects/trustedbsd/base/include/paths.h#3 integrate ... //depot/projects/trustedbsd/base/include/pthread.h#2 integrate ... //depot/projects/trustedbsd/base/include/pthread_np.h#2 integrate ... //depot/projects/trustedbsd/base/include/pwd.h#3 integrate ... //depot/projects/trustedbsd/base/include/regex.h#2 integrate ... //depot/projects/trustedbsd/base/include/regexp.h#2 integrate ... //depot/projects/trustedbsd/base/include/resolv.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/auth.h#3 integrate ... //depot/projects/trustedbsd/base/include/rpc/auth_des.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/auth_unix.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/clnt.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/clnt_soc.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/des.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/des_crypt.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/nettype.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/pmap_clnt.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/pmap_prot.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/pmap_rmt.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/rpc.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/rpc_com.h#3 integrate ... //depot/projects/trustedbsd/base/include/rpc/rpc_msg.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/rpcb_clnt.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/rpcent.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/svc.h#3 integrate ... //depot/projects/trustedbsd/base/include/rpc/svc_auth.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/svc_soc.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/xdr.h#3 integrate ... //depot/projects/trustedbsd/base/include/rpcsvc/nis_db.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpcsvc/nislib.h#2 integrate ... //depot/projects/trustedbsd/base/include/rpcsvc/sm_inter.x#2 integrate ... //depot/projects/trustedbsd/base/include/rpcsvc/ypclnt.h#3 integrate ... //depot/projects/trustedbsd/base/include/rpcsvc/yppasswd.x#2 integrate ... //depot/projects/trustedbsd/base/include/rune.h#2 integrate ... //depot/projects/trustedbsd/base/include/runetype.h#2 integrate ... //depot/projects/trustedbsd/base/include/search.h#2 integrate ... //depot/projects/trustedbsd/base/include/setjmp.h#2 integrate ... //depot/projects/trustedbsd/base/include/signal.h#3 integrate ... //depot/projects/trustedbsd/base/include/stdio.h#4 integrate ... //depot/projects/trustedbsd/base/include/stdlib.h#6 integrate ... //depot/projects/trustedbsd/base/include/string.h#4 integrate ... //depot/projects/trustedbsd/base/include/stringlist.h#2 integrate ... //depot/projects/trustedbsd/base/include/strings.h#2 integrate ... //depot/projects/trustedbsd/base/include/time.h#3 integrate ... //depot/projects/trustedbsd/base/include/ttyent.h#2 integrate ... //depot/projects/trustedbsd/base/include/unistd.h#6 integrate ... //depot/projects/trustedbsd/base/include/utime.h#2 integrate ... //depot/projects/trustedbsd/base/include/vis.h#2 integrate ... //depot/projects/trustedbsd/base/include/wchar.h#2 integrate ... //depot/projects/trustedbsd/base/include/wctype.h#2 integrate ... //depot/projects/trustedbsd/base/lib/Makefile#5 integrate ... //depot/projects/trustedbsd/base/lib/csu/alpha/Makefile#2 integrate ... //depot/projects/trustedbsd/base/lib/csu/alpha/crt1.c#2 integrate ... //depot/projects/trustedbsd/base/lib/csu/i386-elf/Makefile#2 integrate ... //depot/projects/trustedbsd/base/lib/csu/i386-elf/crt1.c#3 integrate ... //depot/projects/trustedbsd/base/lib/csu/i386/Makefile#2 integrate ... //depot/projects/trustedbsd/base/lib/csu/i386/crt0.c#2 integrate ... //depot/projects/trustedbsd/base/lib/csu/ia64/Makefile#2 integrate ... //depot/projects/trustedbsd/base/lib/csu/ia64/crt1.c#2 integrate ... //depot/projects/trustedbsd/base/lib/csu/powerpc/Makefile#2 integrate ... //depot/projects/trustedbsd/base/lib/csu/powerpc/crt1.c#3 integrate ... //depot/projects/trustedbsd/base/lib/csu/sparc64/Makefile#3 integrate ... //depot/projects/trustedbsd/base/lib/csu/sparc64/crt1.c#6 integrate ... //depot/projects/trustedbsd/base/lib/libatm/ip_checksum.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libatm/libatm.h#2 integrate ... //depot/projects/trustedbsd/base/lib/libbind/Makefile#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/Makefile#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/alpha/SYS.h#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/compat-43/creat.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/compat-43/gethostid.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/compat-43/getwd.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/compat-43/killpg.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/compat-43/sethostid.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/compat-43/setpgrp.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/compat-43/setrgid.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/compat-43/setruid.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/compat-43/sigcompat.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_close.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_conv.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_debug.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_delete.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_get.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_open.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_overflow.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_page.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_put.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_search.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_seq.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/bt_split.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/btree.h#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/btree/extern.h#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/db/db.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/hash/extern.h#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/hash/hash.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/hash/hash.h#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/hash/hash_bigkey.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/hash/hash_buf.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/hash/hash_func.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/hash/hash_page.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/hash/ndbm.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/hash/page.h#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/mpool/mpool.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/recno/extern.h#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_close.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_delete.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_get.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_open.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_put.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_seq.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/recno/rec_utils.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/recno/recno.h#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/test/btree.tests/main.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/test/dbtest.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/driver2.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/tcreat3.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/tdel.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/thash4.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/tread2.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/tseq.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/db/test/hash.tests/tverify.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/_rand48.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/arc4random.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/clock.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/confstr.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/ctermid.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/disklabel.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/drand48.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/erand48.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/err.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/errlst.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/getcap.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/getgrouplist.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/gethostname.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/getloadavg.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/getlogin.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/getobjformat.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/getprogname.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/getpwent.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/jrand48.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/lcong48.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/lrand48.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/mrand48.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/msgctl.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/msgget.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/msgrcv.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/msgsnd.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/nice.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/nrand48.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/pw_scan.h#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/pwcache.3#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/pwcache.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/raise.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/seed48.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/semconfig.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/semctl.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/semget.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/semop.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/sethostname.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/setproctitle.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/setprogname.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/siglist.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/strtofflags.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/sysconf.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/sysctl.3#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/sysctl.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/syslog.c#5 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/time.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/utime.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/valloc.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gmon/gmon.c#5 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/SYS.h#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/gen/_ctx_start.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/gen/_setjmp.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/gen/alloca.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/gen/fabs.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/gen/frexp.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/gen/getcontext.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/gen/infinity.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/gen/isinf.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/gen/ldexp.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/gen/modf.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/gen/rfork_thread.S#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/gen/setjmp.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/gen/sigsetjmp.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/net/htonl.S#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/net/htons.S#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/net/ntohl.S#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/net/ntohs.S#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/stdlib/abs.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/stdlib/div.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/stdlib/labs.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/stdlib/ldiv.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/bcmp.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/bcopy.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/bzero.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/ffs.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/index.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/memchr.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/memcmp.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/memcpy.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/memmove.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/memset.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/rindex.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/strcat.S#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/strchr.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/strcmp.S#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/strcpy.S#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/strlen.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/strncmp.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/strrchr.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/string/swab.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/Ovfork.S#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/brk.S#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/cerror.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/exect.S#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_clr_watch.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_ioperm.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_get_ldt.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_set_ioperm.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_set_ldt.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_set_watch.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/i386_vm86.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/pipe.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/ptrace.S#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/reboot.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/sbrk.S#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/setlogin.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/sigreturn.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/i386/sys/syscall.S#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/ia64/SYS.h#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/ia64/gen/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/ia64/gen/fpgetmask.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/ia64/gen/fpsetmask.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/ia64/gen/frexp.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/ia64/gen/infinity.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/ia64/gen/isinf.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/ia64/gen/ldexp.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/ia64/gen/modf.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/ia64/gen/unwind.c#1 branch ... //depot/projects/trustedbsd/base/lib/libc/include/libc_private.h#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/include/namespace.h#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/include/spinlock.h#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/include/un-namespace.h#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/ansi.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/big5.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/collate.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/collate.h#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/collcmp.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/euc.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/fix_grouping.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/frune.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/isctype.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/ldpart.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/lmessages.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/lmonetary.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/lnumeric.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/localeconv.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/mbrune.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/mskanji.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/nl_langinfo.3#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/nl_langinfo.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/nomacros.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/none.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/rune.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/runetype.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/locale/setinvalidrune.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 7:28:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A949B37B41B; Tue, 16 Apr 2002 07:28:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail15.speakeasy.net [216.254.0.215]) by hub.freebsd.org (Postfix) with ESMTP id 84EDD37B417 for ; Tue, 16 Apr 2002 07:28:28 -0700 (PDT) Received: (qmail 12029 invoked from network); 16 Apr 2002 14:28:27 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail15.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 16 Apr 2002 14:28:27 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g3GESXv76703; Tue, 16 Apr 2002 10:28:33 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20020416090301.C24202@locore.ca> Date: Tue, 16 Apr 2002 10:27:28 -0400 (EDT) From: John Baldwin To: Jake Burkholder Subject: Re: PERFORCE change 9808 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 16-Apr-2002 Jake Burkholder wrote: > Apparently, On Tue, Apr 16, 2002 at 08:46:16AM -0400, > John Baldwin said words to the effect of; > >> >> On 16-Apr-2002 Jake Burkholder wrote: >> > Apparently, On Mon, Apr 15, 2002 at 11:15:45PM -0400, >> > John Baldwin said words to the effect of; >> > >> >> >> >> On 16-Apr-2002 Jake Burkholder wrote: >> >> > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9808 >> >> > >> >> > Change 9808 by jake@jake_sparc64 on 2002/04/15 19:32:40 >> >> > >> >> > sysinstall builds. >> >> >> >> Uh, someone fixed libdisk are is that part hacked out for now? >> > >> > It compiles, I have no idea if it works. >> >> I seriously doubt it works then since it assumes i386 rather than alpha so >> it's >> going to try to create slices. Also, I doubt it does the cylinder >> calculations >> right for sun labels, but I could be wrong. > > Peter said sysinstall basically works for ia64, except you need to create > the partitions before hand, I imagine its about the same. Hmm, so it's still not ready for installation use then. :) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 9: 4:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1085137B416; Tue, 16 Apr 2002 09:03:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6E16937B42A for ; Tue, 16 Apr 2002 09:02:58 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3GG1bi46917 for perforce@freebsd.org; Tue, 16 Apr 2002 09:01:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 16 Apr 2002 09:01:37 -0700 (PDT) Message-Id: <200204161601.g3GG1bi46917@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9828 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9828 Change 9828 by rwatson@rwatson_curry on 2002/04/16 09:00:48 First pass integ -- pam, suser changes, etc. Various minor things to clean up from this still, so probably doesn't build or run yet. Affected files ... ... //depot/projects/trustedbsd/mac/MAINTAINERS#1 branch ... //depot/projects/trustedbsd/mac/Makefile.inc1#10 integrate ... //depot/projects/trustedbsd/mac/README#2 integrate ... //depot/projects/trustedbsd/mac/UPDATING#9 integrate ... //depot/projects/trustedbsd/mac/bin/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/bin/chio/chio.c#5 integrate ... //depot/projects/trustedbsd/mac/bin/date/date.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/dd/dd.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/df/df.c#6 integrate ... //depot/projects/trustedbsd/mac/bin/expr/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/bin/expr/expr.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/expr/expr.y#3 integrate ... //depot/projects/trustedbsd/mac/bin/ls/lomac.c#5 integrate ... //depot/projects/trustedbsd/mac/bin/ls/ls.1#6 integrate ... //depot/projects/trustedbsd/mac/bin/mv/mv.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/mv/mv.c#4 integrate ... //depot/projects/trustedbsd/mac/bin/pax/options.c#3 integrate ... //depot/projects/trustedbsd/mac/bin/pax/sel_subs.c#3 integrate ... //depot/projects/trustedbsd/mac/bin/ps/lomac.c#5 integrate ... //depot/projects/trustedbsd/mac/bin/ps/ps.c#6 integrate ... //depot/projects/trustedbsd/mac/bin/sh/exec.c#3 integrate ... //depot/projects/trustedbsd/mac/bin/test/test.c#6 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/ChangeLog#5 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/Makefile.am#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/Makefile.in#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/aclocal.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/aout-tic30.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/aoutx.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/archive.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/archures.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/bfd-in2.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/coff-arm.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/coff-mips.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/coff-tic30.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/coff-z8k.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/coffcode.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/cofflink.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/config.in#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/configure#5 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/configure.in#5 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/cpu-i386.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/cpu-mips.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/cpu-sparc.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/cpu-v850.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/cpu-z8k.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/dep-in.sed#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/ChangeLog#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/Makefile.in#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/dwarf2.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/ecoff.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf-bfd.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf.c#5 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf32-arm.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf32-i386.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf32-mips.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf32-sparc.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf32-v850.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-alpha.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-mips.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-ppc.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-sparc.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-x86-64.c#5 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elflink.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elflink.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elfxx-ia64.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elfxx-target.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/i386linux.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/ihex.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/libbfd.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/libbfd.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/libpei.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/linker.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/merge.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/mipsbsd.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/pe-mips.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/peicode.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/sparclinux.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/srec.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/sunos.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/syms.c#5 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/version.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/xcoff-target.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/bfd/xcofflink.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/ChangeLog#5 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/Makefile.am#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/Makefile.in#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/aclocal.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/configure#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/configure.in#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/dep-in.sed#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/binutils/unwind-ia64.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/ChangeLog#5 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/Makefile.am#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/Makefile.in#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/aclocal.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/as.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config.in#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/atof-vax.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/obj-elf.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-arm.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-i386.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-i386.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-ia64.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-ia64.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-tic30.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-v850.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-v850.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-z8k.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/dep-in.sed#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/doc/Makefile.in#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/doc/c-sh.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/gas/write.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/include/opcode/mips.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/include/opcode/v850.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/ChangeLog#5 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/Makefile.am#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/Makefile.in#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/configure.host#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/dep-in.sed#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32bmip.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32bmipn32.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32bsmip.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32ebmip.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32elmip.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32lmip.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf32lsmip.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf64bmip.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/shelf.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/shelf_linux.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/shl.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/shlelf.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/genscripts.sh#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/ldlang.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/ldmain.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/scripttempl/elf.sc#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/ld/scripttempl/v850.sc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/ChangeLog#5 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/Makefile.am#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/Makefile.in#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/aclocal.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/config.in#3 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/configure#5 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/dep-in.sed#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/ppc-opc.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/v850-dis.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/v850-opc.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/z8k-dis.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/z8k-opc.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/z8kgen.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/cccp.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/freebsd.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/toplev.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/crtbegin.asm#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/crtend.asm#4 delete ... //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_ipsec_pxy.c#2 delete ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_netbios_pxy.c#2 delete ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/FREEBSD-upgrade#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/Makefile.conf#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/README#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/RELNOTES#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/clparse.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/dhclient.conf.5#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/conflex.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/dns.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/options.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/print.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/common/tables.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/configure#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/dhcpd.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/dhctoken.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/minires/minires.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/site.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/includes/version.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/ns_parse.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/isc-dhcp/minires/ns_verify.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/CREDITS#1 branch ... //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/INSTALL#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/LICENSE#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/MANIFEST#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/README#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/bin/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/su.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_borrow_cred.3#1 branch ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_data.3#1 branch ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_restore_cred.3#1 branch ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam_version.h#1 branch ... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_appl.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_constants.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_modules.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_types.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_borrow_cred.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_configure.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dispatch.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dynamic.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_findenv.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_free_data.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_get_option.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_impl.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_load.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_log.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_restore_cred.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_set_option.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_static.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_acct_mgmt.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate_secondary.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_chauthtok.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_close_session.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_end.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_error.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_authtok.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_data.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_item.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_mapped_authtok.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_mapped_username.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_user.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_getenv.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_getenvlist.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_info.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_open_session.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_prompt.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_putenv.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_data.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_item.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_mapped_authtok.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_mapped_username.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_setcred.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_setenv.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_acct_mgmt.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_authenticate.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_authenticate_secondary.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_chauthtok.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_close_session.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_get_mapped_username.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_open_session.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_set_mapped_username.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_setcred.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_start.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_strerror.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_verror.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vinfo.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vprompt.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/misc/gendoc.pl#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/pam_deny.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_dummy/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_dummy/pam_dummy.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/pam_permit.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/BUG-REPORT#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/INSTALL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/Makefile.in#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/README#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/acconfig.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/config.h.in#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/configure#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/configure.in#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/ftpcmd.y#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/glob.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libmissing/Makefile.in#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libmissing/endutent.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libmissing/getutline.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libmissing/pututline.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libmissing/setutent.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/Makefile.in#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/accessfile.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/atob8.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/btoa8.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/btoe.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/btoh.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/challenge.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/generator.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/getsequence.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/getutmpentry.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/hash.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/hashlen.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/insecure.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/keycrunch.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/lock.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/login.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/logwtmp.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/lookup.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/md4c.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/md5c.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/newseed.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/open.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/parsechallenge.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/passcheck.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/passwd.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/randomchallenge.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/readpass.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/readrec.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/unlock.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/verify.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/version.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/libopie/writerec.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opie.4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opie.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opie_cfg.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opieaccess.5#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opieauto.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/opie/opieftpd.8#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opieftpd.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opiegen.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opiegen.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opieinfo.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opieinfo.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opiekey.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opiekey.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opielogin.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opielogin.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opiepasswd.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opiepasswd.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opieserv.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opieserv.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opiesu.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opiesu.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/opietest.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/permsfile.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/opie/popen.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/INTERNALS#1 branch ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/LICENSE#1 branch ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/Makefile#1 branch ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/PLATFORMS#1 branch ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/README#1 branch ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/pam_macros.h#1 branch ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec#1 branch ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/passwdqc.h#1 branch ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/passwdqc_check.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/passwdqc_random.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/wordset_4k.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/KNOWNBUGS#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/README#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/README#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/access_db.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/compat_check.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/ldap_routing.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/msp.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/proto.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/darwin.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/buildvirtuser#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/qtool.8#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/qtool.pl#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/smcontrol.pl#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/op.me#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/editmap/editmap.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/mfapi.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/milter.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/cdefs.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/conf.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/config.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/gen.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/io.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/ldap.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_freebsd.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/Makefile.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/comm.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/installation.html#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#1 branch ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/engine.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/listener.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/main.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/signal.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/smfi.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/README#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/clock.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/config.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/debug.html#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fclose.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/findfp.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ldap.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/local.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/mbdb.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/smstdio.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/sscanf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/stdio.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/strio.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/strl.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-event.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-fopen.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-shm.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-types.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vsscanf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/wsetup.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/smdb.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/smdb1.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/smndbm.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/Makefile.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/mail.local.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/mailstats/mailstats.8#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/Makefile.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/README#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/SECURITY#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/TUNING#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/bf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/collect.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/control.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/daemon.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/domain.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/envelope.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/helpfile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/main.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/map.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/mci.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/milter.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/mime.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/parseaddr.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/readcf.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/sasl.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/sfsasl.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/stats.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/tls.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/usersmtp.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/util.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/vacation/vacation.1#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/vacation/vacation.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/ctx.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sort/Makefile#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/append.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/extern.h#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/fields.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/files.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/fsort.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/fsort.h#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/init.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/msort.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/pathnames.h#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/regress/Makefile#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/regress/stests#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/sort.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/sort.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/sort.h#1 branch ... //depot/projects/trustedbsd/mac/contrib/sort/tmp.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/COPYING#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/COPYING.DOC#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/ChangeLog#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/FREEBSD-Xlist#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/FREEBSD-upgrade#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/INSTALL#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/INTRODUCTION#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/NEWS#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/README#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/TODO#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/config.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/config.h.in#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/doc/README#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/doc/help2man#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info-stnd.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/doc/install-info.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/doc/makeinfo.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/doc/texindex.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/doc/texinfo.txi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/doc/version-stnd.texi#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/doc/version.texi#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/doc.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/doc.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/echo-area.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/filesys.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/funs.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/info.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/info.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/infodoc.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/infokey.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/infokey.h#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/infomap.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/infomap.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/key.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/key.h#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/m-x.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/man.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/nodes.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/session.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/session.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/termdep.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/terminal.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/terminal.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/variables.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/info/window.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/lib/getopt.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/lib/getopt.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/lib/getopt1.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/lib/gettext.h#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/lib/system.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/lib/xstrdup.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/README#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/cmds.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/defun.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/docbook.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/docbook.h#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/files.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/files.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/footnote.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/html.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/html.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/index.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/insertion.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/insertion.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/lang.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/lang.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/macro.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/makeinfo.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/makeinfo.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/multi.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/node.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/node.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/sectioning.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/texinfo.dtd#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/texinfo.xsl#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/toc.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/toc.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/xml.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/xml.h#1 branch ... //depot/projects/trustedbsd/mac/contrib/texinfo/util/install-info.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/texinfo/util/texindex.c#2 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/auth1.c#3 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/auth2.c#3 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/myproposal.h#3 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/pam_ssh/pam_ssh.c#2 delete ... //depot/projects/trustedbsd/mac/crypto/openssh/readconf.c#3 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/servconf.c#3 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/session.c#7 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#3 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/sshconnect2.c#3 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/sshd.8#3 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#3 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/version.h#5 integrate ... //depot/projects/trustedbsd/mac/etc/MAKEDEV#9 integrate ... //depot/projects/trustedbsd/mac/etc/Makefile#9 integrate ... //depot/projects/trustedbsd/mac/etc/defaults/periodic.conf#3 integrate ... //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#11 integrate ... //depot/projects/trustedbsd/mac/etc/inetd.conf#5 integrate ... //depot/projects/trustedbsd/mac/etc/isdn/holidays.D#2 integrate ... //depot/projects/trustedbsd/mac/etc/locale.deprecated#2 integrate ... //depot/projects/trustedbsd/mac/etc/mail/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/etc/mail/README#4 integrate ... //depot/projects/trustedbsd/mac/etc/mail/mailer.conf#2 integrate ... //depot/projects/trustedbsd/mac/etc/moduli#1 branch ... //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#6 integrate ... //depot/projects/trustedbsd/mac/etc/mtree/BSD.local.dist#6 integrate ... //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#8 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/login#5 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/passwd#1 branch ... //depot/projects/trustedbsd/mac/etc/pam.d/rsh#2 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/sshd#2 integrate ... //depot/projects/trustedbsd/mac/etc/periodic/daily/440.status-mailq#2 integrate ... //depot/projects/trustedbsd/mac/etc/periodic/daily/500.queuerun#2 integrate ... //depot/projects/trustedbsd/mac/etc/primes#2 delete ... //depot/projects/trustedbsd/mac/etc/rc#12 integrate ... //depot/projects/trustedbsd/mac/etc/rc.network#10 integrate ... //depot/projects/trustedbsd/mac/etc/rc.network6#6 integrate ... //depot/projects/trustedbsd/mac/etc/sendmail/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/etc/sendmail/freebsd.mc#4 integrate ... //depot/projects/trustedbsd/mac/etc/sendmail/freefall.mc#3 integrate ... //depot/projects/trustedbsd/mac/etc/sendmail/rc.sendmail#1 branch ... //depot/projects/trustedbsd/mac/etc/syslog.conf#4 integrate ... //depot/projects/trustedbsd/mac/games/backgammon/common_source/fancy.c#2 integrate ... //depot/projects/trustedbsd/mac/games/battlestar/com2.c#2 integrate ... //depot/projects/trustedbsd/mac/games/canfield/canfield/canfield.c#2 integrate ... //depot/projects/trustedbsd/mac/games/canfield/cfscores/cfscores.c#2 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#9 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#2 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/freebsd-tips#5 integrate ... //depot/projects/trustedbsd/mac/games/fortune/fortune/fortune.c#3 integrate ... //depot/projects/trustedbsd/mac/games/fortune/strfile/strfile.c#3 integrate ... //depot/projects/trustedbsd/mac/games/hack/hack.ioctl.c#2 integrate ... //depot/projects/trustedbsd/mac/gnu/lib/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/gnu/lib/csu/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/lib/libgcc/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/lib/libreadline/readline/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/Makefile.inc0#6 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/alpha/nm.h#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/i386/tm.h#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.alpha#4 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.i386#4 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.ia64#4 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.powerpc#4 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/ld/Makefile.sparc64#4 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile.fe#1 branch ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile.inc#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile.tgt#1 branch ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1obj/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc1plus/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_int/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/freebsd-native.h#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cccp/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/collect2/Makefile#1 branch ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/protoize/Makefile#1 branch ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/cvsbug/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/lib/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/gperf/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/devices/grodvi/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/devices/grohtml/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/devices/grolbp/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/devices/grolj4/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/devices/grops/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/devices/grotty/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/preproc/eqn/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/preproc/grn/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/preproc/html/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/preproc/pic/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/preproc/refer/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/preproc/soelim/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/preproc/tbl/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/roff/groff/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/roff/troff/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/utils/addftinfo/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/utils/hpftodit/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/utils/indxbib/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/utils/lkbib/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/utils/lookbib/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/man/makewhatis/makewhatis.perl#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/man/man/man.c#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/man/manpath/manpath.config#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/send-pr.1#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/tar/port.h#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/tar/prepend_args.c#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/infokey/Makefile#1 branch ... //depot/projects/trustedbsd/mac/gnu/usr.bin/texinfo/makeinfo/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/include/Makefile#8 integrate ... //depot/projects/trustedbsd/mac/include/arpa/inet.h#5 integrate ... //depot/projects/trustedbsd/mac/include/arpa/nameser.h#2 integrate ... //depot/projects/trustedbsd/mac/include/assert.h#2 integrate ... //depot/projects/trustedbsd/mac/include/complex.h#2 integrate ... //depot/projects/trustedbsd/mac/include/ctype.h#3 integrate ... //depot/projects/trustedbsd/mac/include/db.h#2 integrate ... //depot/projects/trustedbsd/mac/include/dirent.h#2 integrate ... //depot/projects/trustedbsd/mac/include/disktab.h#2 delete ... //depot/projects/trustedbsd/mac/include/dlfcn.h#3 integrate ... //depot/projects/trustedbsd/mac/include/err.h#2 integrate ... //depot/projects/trustedbsd/mac/include/fnmatch.h#2 integrate ... //depot/projects/trustedbsd/mac/include/fstab.h#2 integrate ... //depot/projects/trustedbsd/mac/include/fts.h#2 integrate ... //depot/projects/trustedbsd/mac/include/glob.h#2 integrate ... //depot/projects/trustedbsd/mac/include/grp.h#5 integrate ... //depot/projects/trustedbsd/mac/include/hesiod.h#2 integrate ... //depot/projects/trustedbsd/mac/include/ieeefp.h#2 integrate ... //depot/projects/trustedbsd/mac/include/ifaddrs.h#2 integrate ... //depot/projects/trustedbsd/mac/include/langinfo.h#4 integrate ... //depot/projects/trustedbsd/mac/include/libgen.h#2 integrate ... //depot/projects/trustedbsd/mac/include/link.h#2 integrate ... //depot/projects/trustedbsd/mac/include/locale.h#2 integrate ... //depot/projects/trustedbsd/mac/include/math.h#2 integrate ... //depot/projects/trustedbsd/mac/include/mpool.h#2 integrate ... //depot/projects/trustedbsd/mac/include/ndbm.h#2 integrate ... //depot/projects/trustedbsd/mac/include/netconfig.h#2 integrate ... //depot/projects/trustedbsd/mac/include/netdb.h#2 integrate ... //depot/projects/trustedbsd/mac/include/nl_types.h#2 integrate ... //depot/projects/trustedbsd/mac/include/nlist.h#2 integrate ... //depot/projects/trustedbsd/mac/include/nsswitch.h#2 integrate ... //depot/projects/trustedbsd/mac/include/paths.h#3 integrate ... //depot/projects/trustedbsd/mac/include/pthread.h#2 integrate ... //depot/projects/trustedbsd/mac/include/pthread_np.h#2 integrate ... //depot/projects/trustedbsd/mac/include/pwd.h#3 integrate ... //depot/projects/trustedbsd/mac/include/regex.h#2 integrate ... //depot/projects/trustedbsd/mac/include/regexp.h#2 integrate ... //depot/projects/trustedbsd/mac/include/resolv.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/auth.h#3 integrate ... //depot/projects/trustedbsd/mac/include/rpc/auth_des.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/auth_unix.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/clnt.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/clnt_soc.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/des.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/des_crypt.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/nettype.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/pmap_clnt.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/pmap_prot.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/pmap_rmt.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/rpc.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/rpc_com.h#3 integrate ... //depot/projects/trustedbsd/mac/include/rpc/rpc_msg.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/rpcb_clnt.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/rpcent.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/svc.h#3 integrate ... //depot/projects/trustedbsd/mac/include/rpc/svc_auth.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/svc_soc.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/xdr.h#3 integrate ... //depot/projects/trustedbsd/mac/include/rpcsvc/nis_db.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpcsvc/nislib.h#2 integrate ... //depot/projects/trustedbsd/mac/include/rpcsvc/sm_inter.x#2 integrate ... //depot/projects/trustedbsd/mac/include/rpcsvc/ypclnt.h#3 integrate ... //depot/projects/trustedbsd/mac/include/rpcsvc/yppasswd.x#2 integrate ... //depot/projects/trustedbsd/mac/include/rune.h#2 integrate ... //depot/projects/trustedbsd/mac/include/runetype.h#2 integrate ... //depot/projects/trustedbsd/mac/include/search.h#2 integrate ... //depot/projects/trustedbsd/mac/include/setjmp.h#2 integrate ... //depot/projects/trustedbsd/mac/include/signal.h#3 integrate ... //depot/projects/trustedbsd/mac/include/stdio.h#4 integrate ... //depot/projects/trustedbsd/mac/include/stdlib.h#6 integrate ... //depot/projects/trustedbsd/mac/include/string.h#3 integrate ... //depot/projects/trustedbsd/mac/include/stringlist.h#2 integrate ... //depot/projects/trustedbsd/mac/include/strings.h#2 integrate ... //depot/projects/trustedbsd/mac/include/time.h#3 integrate ... //depot/projects/trustedbsd/mac/include/ttyent.h#2 integrate ... //depot/projects/trustedbsd/mac/include/unistd.h#4 integrate ... //depot/projects/trustedbsd/mac/include/utime.h#2 integrate ... //depot/projects/trustedbsd/mac/include/vis.h#2 integrate ... //depot/projects/trustedbsd/mac/include/wchar.h#2 integrate ... //depot/projects/trustedbsd/mac/include/wctype.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/lib/csu/alpha/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/lib/csu/alpha/crt1.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/csu/i386-elf/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/lib/csu/i386-elf/crt1.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/csu/i386/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/lib/csu/i386/crt0.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/csu/ia64/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/lib/csu/ia64/crt1.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/csu/powerpc/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/lib/csu/powerpc/crt1.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/csu/sparc64/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/lib/csu/sparc64/crt1.c#6 integrate ... //depot/projects/trustedbsd/mac/lib/libatm/ip_checksum.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libatm/libatm.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libbind/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/alpha/SYS.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/compat-43/creat.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/compat-43/gethostid.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/compat-43/getwd.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/compat-43/killpg.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/compat-43/sethostid.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/compat-43/setpgrp.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/compat-43/setrgid.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/compat-43/setruid.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/compat-43/sigcompat.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/bt_close.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/bt_conv.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/bt_debug.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/bt_delete.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/bt_get.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/bt_open.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/bt_overflow.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/bt_page.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/bt_put.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/bt_search.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/bt_seq.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/bt_split.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/btree.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/btree/extern.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/db/db.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/hash/extern.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/hash/hash.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/hash/hash.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/hash/hash_bigkey.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/hash/hash_buf.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/hash/hash_func.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/hash/hash_page.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/hash/ndbm.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/hash/page.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/mpool/mpool.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/recno/extern.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/recno/rec_close.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/recno/rec_delete.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/recno/rec_get.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/recno/rec_open.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/recno/rec_put.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/recno/rec_seq.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/recno/rec_utils.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/recno/recno.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/test/btree.tests/main.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/test/dbtest.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/test/hash.tests/driver2.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/test/hash.tests/tcreat3.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/test/hash.tests/tdel.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/test/hash.tests/thash4.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/test/hash.tests/tread2.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/test/hash.tests/tseq.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/db/test/hash.tests/tverify.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/_rand48.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/arc4random.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/clock.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/confstr.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/ctermid.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/disklabel.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/drand48.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/erand48.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/err.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/errlst.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/getbsize.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/getcap.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/getgrouplist.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/gethostname.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/getloadavg.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/getlogin.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/getobjformat.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/getprogname.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/getpwent.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/jrand48.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/lcong48.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/lrand48.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/mrand48.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/msgctl.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/msgget.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/msgrcv.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/msgsnd.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/nice.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/nrand48.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/pw_scan.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/pwcache.3#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/pwcache.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/raise.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/seed48.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/semconfig.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/semctl.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/semget.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/semop.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/sethostname.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/setproctitle.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/setprogname.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/siglist.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/strtofflags.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/sysconf.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/sysctl.3#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/sysctl.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/syslog.c#5 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/time.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/utime.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/valloc.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gmon/gmon.c#5 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/SYS.h#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/gen/_ctx_start.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/gen/_setjmp.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/gen/alloca.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/gen/fabs.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/gen/frexp.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/gen/getcontext.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/gen/infinity.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/gen/isinf.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/gen/ldexp.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/gen/modf.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/gen/rfork_thread.S#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/gen/setjmp.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/gen/sigsetjmp.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/net/htonl.S#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/net/htons.S#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/net/ntohl.S#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/net/ntohs.S#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/stdlib/abs.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/stdlib/div.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/stdlib/labs.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/stdlib/ldiv.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/bcmp.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/bcopy.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/bzero.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/ffs.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/index.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/memchr.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/memcmp.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/memcpy.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/memmove.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/memset.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/rindex.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/strcat.S#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/strchr.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/strcmp.S#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/strcpy.S#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/strlen.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/strncmp.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/strrchr.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/string/swab.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/Ovfork.S#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/brk.S#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/cerror.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/exect.S#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_clr_watch.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_get_ioperm.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_get_ldt.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_set_ioperm.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_set_ldt.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_set_watch.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_vm86.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/pipe.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/ptrace.S#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/reboot.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/sbrk.S#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/setlogin.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/sigreturn.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/i386/sys/syscall.S#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/ia64/SYS.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/fpgetmask.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/fpsetmask.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/frexp.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/infinity.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/isinf.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/ldexp.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/modf.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/unwind.c#1 branch ... //depot/projects/trustedbsd/mac/lib/libc/include/libc_private.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/include/namespace.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/include/spinlock.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/include/un-namespace.h#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/ansi.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/big5.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/collate.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/collate.h#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/collcmp.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/euc.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/fix_grouping.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/frune.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/isctype.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/ldpart.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/lmessages.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/lmonetary.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/lnumeric.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/localeconv.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/mbrune.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/mskanji.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/nl_langinfo.3#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/nl_langinfo.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/nomacros.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/none.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/rune.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/locale/runetype.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 9: 9:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CC3037B41C; Tue, 16 Apr 2002 09:09:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3718137B405 for ; Tue, 16 Apr 2002 09:09:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3GG99o55816 for perforce@freebsd.org; Tue, 16 Apr 2002 09:09:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 16 Apr 2002 09:09:09 -0700 (PDT) Message-Id: <200204161609.g3GG99o55816@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9830 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9830 Change 9830 by rwatson@rwatson_curry on 2002/04/16 09:09:00 suser API sync Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#123 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#123 (text+ko) ==== @@ -1363,7 +1363,7 @@ * policies impose this check themselves if required by the * policy. Eventually, this should go away. */ - error = suser_xxx(cred, NULL, 0); + error = suser_cred(cred, 0); if (error) return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 9: 9:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B5A537B404; Tue, 16 Apr 2002 09:09:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E361237B404 for ; Tue, 16 Apr 2002 09:09:09 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3GG99x55808 for perforce@freebsd.org; Tue, 16 Apr 2002 09:09:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 16 Apr 2002 09:09:09 -0700 (PDT) Message-Id: <200204161609.g3GG99x55808@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9829 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9829 Change 9829 by rwatson@rwatson_curry on 2002/04/16 09:08:32 Regen system call files. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#13 edit ... //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#11 edit ... //depot/projects/trustedbsd/mac/sys/sys/syscall.h#14 edit ... //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#14 edit ... //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#15 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#13 (text+ko) ==== @@ -2,16 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL init_sysent.c#6 - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.118 2002/03/05 16:13:00 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.107 2002/03/05 16:11:11 rwatson Exp -==== THEIRS init_sysent.c#7 - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.120 2002/04/14 05:33:58 alc Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== YOURS init_sysent.c - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.107 2002/03/05 16:11:11 rwatson Exp -<<<< */ #include "opt_compat.h" ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#11 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.h#14 (text+ko) ==== @@ -2,16 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL syscall.h#7 - * $FreeBSD: src/sys/sys/syscall.h,v 1.104 2002/03/05 16:13:01 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.107 2002/03/05 16:11:11 rwatson Exp -==== THEIRS syscall.h#8 - * $FreeBSD: src/sys/sys/syscall.h,v 1.106 2002/04/14 05:33:58 alc Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== YOURS syscall.h - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.107 2002/03/05 16:11:11 rwatson Exp -<<<< */ #define SYS_syscall 0 ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#14 (text+ko) ==== @@ -1,15 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL syscall.mk#7 -# $FreeBSD: src/sys/sys/syscall.mk,v 1.59 2002/03/05 16:13:01 rwatson Exp $ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.107 2002/03/05 16:11:11 rwatson Exp -==== THEIRS syscall.mk#8 -# $FreeBSD: src/sys/sys/syscall.mk,v 1.61 2002/04/14 05:33:58 alc Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== YOURS syscall.mk -# $FreeBSD$ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.107 2002/03/05 16:11:11 rwatson Exp -<<<< MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#15 (text+ko) ==== @@ -2,16 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL sysproto.h#8 - * $FreeBSD: src/sys/sys/sysproto.h,v 1.96 2002/03/19 20:18:41 alfred Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.107 2002/03/05 16:11:11 rwatson Exp -==== THEIRS sysproto.h#9 - * $FreeBSD: src/sys/sys/sysproto.h,v 1.98 2002/04/14 05:33:58 alc Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== YOURS sysproto.h - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.107 2002/03/05 16:11:11 rwatson Exp -<<<< */ #ifndef _SYS_SYSPROTO_H_ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 9:11:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4166137B405; Tue, 16 Apr 2002 09:11:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 063EF37B404 for ; Tue, 16 Apr 2002 09:11:13 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3GGBCn57606 for perforce@freebsd.org; Tue, 16 Apr 2002 09:11:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 16 Apr 2002 09:11:12 -0700 (PDT) Message-Id: <200204161611.g3GGBCn57606@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9831 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9831 Change 9831 by rwatson@rwatson_curry on 2002/04/16 09:10:47 suser() api sync Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#28 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#22 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#28 (text+ko) ==== @@ -363,7 +363,7 @@ if (!mac_biba_single_in_range(newlabel, &cred->cr_label)) privilege_needed = 1; if (privilege_needed) { - error = suser_xxx(cred, NULL, 0); + error = suser_cred(cred, 0); if (error) return (error); } @@ -394,7 +394,7 @@ if (!(mac_biba_single_in_range(newlabel, &cred->cr_label))) privilege_needed = 1; if (privilege_needed) { - error = suser_xxx(cred, NULL, 0); + error = suser_cred(cred, 0); if (error) return (error); } @@ -527,7 +527,7 @@ if ((newlabel->m_biba.mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAGS_BOTH) return (EINVAL); - return (suser_xxx(cred, NULL, 0)); + return (suser_cred(cred, 0)); } static void @@ -675,7 +675,7 @@ if ((newlabel->m_biba.mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) return (EINVAL); - return (suser_xxx(cred, NULL, 0)); + return (suser_cred(cred, 0)); } static void ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#22 (text+ko) ==== @@ -349,7 +349,7 @@ if (!mac_mls_single_in_range(newlabel, &cred->cr_label)) privilege_needed = 1; if (privilege_needed) { - error = suser_xxx(cred, NULL, 0); + error = suser_cred(cred, 0); if (error) return (error); } @@ -380,7 +380,7 @@ if (!(mac_mls_single_in_range(newlabel, &cred->cr_label))) privilege_needed = 1; if (privilege_needed) { - error = suser_xxx(cred, NULL, 0); + error = suser_cred(cred, 0); if (error) return (error); } @@ -459,7 +459,7 @@ if ((newlabel->m_mls.mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAGS_BOTH) return (EINVAL); - return (suser_xxx(cred, NULL, 0)); + return (suser_cred(cred, 0)); } static void @@ -607,7 +607,7 @@ if ((newlabel->m_mls.mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAG_SINGLE) return (EINVAL); - return (suser_xxx(cred, NULL, 0)); + return (suser_cred(cred, 0)); } static void ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#21 (text+ko) ==== @@ -384,7 +384,7 @@ privilege_needed = 1; if (privilege_needed) { - error = suser_xxx(cred, NULL, 0); + error = suser_cred(cred, 0); if (error) return (error); } @@ -408,7 +408,7 @@ privilege_needed = 1; if (privilege_needed) { - error = suser_xxx(cred, NULL, 0); + error = suser_cred(cred, 0); if (error) return (error); } @@ -446,7 +446,7 @@ if (error) return (error); - return (suser_xxx(cred, NULL, 0)); + return (suser_cred(cred, 0)); } static void @@ -618,7 +618,7 @@ if (error) return (error); - error = suser_xxx(cred, NULL, 0); + error = suser_cred(cred, 0); if (error) return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 10:42:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47BD437B400; Tue, 16 Apr 2002 10:41:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 443C737B438 for ; Tue, 16 Apr 2002 10:41:06 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3GHf4w93651 for perforce@freebsd.org; Tue, 16 Apr 2002 10:41:04 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 16 Apr 2002 10:41:04 -0700 (PDT) Message-Id: <200204161741.g3GHf4w93651@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9836 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9836 Change 9836 by jhb@jhb_laptop on 2002/04/16 10:41:01 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/pal.s#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/pmap.c#29 integrate ... //depot/projects/smpng/sys/alpha/alpha/prom_disp.s#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/trap.c#30 integrate ... //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#2 integrate ... //depot/projects/smpng/sys/coda/coda_venus.c#4 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#15 integrate ... //depot/projects/smpng/sys/conf/NOTES#6 integrate ... //depot/projects/smpng/sys/conf/files#35 integrate ... //depot/projects/smpng/sys/conf/files.alpha#13 integrate ... //depot/projects/smpng/sys/conf/files.powerpc#6 integrate ... //depot/projects/smpng/sys/conf/majors#9 integrate ... //depot/projects/smpng/sys/conf/options#20 integrate ... //depot/projects/smpng/sys/conf/options.ia64#7 integrate ... //depot/projects/smpng/sys/dev/ata/ata-dma.c#20 integrate ... //depot/projects/smpng/sys/dev/ata/ata-pci.c#20 integrate ... //depot/projects/smpng/sys/dev/hfa/fore_load.c#3 integrate ... //depot/projects/smpng/sys/dev/hfa/fore_slave.h#2 integrate ... //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#1 branch ... //depot/projects/smpng/sys/dev/sound/pci/ich.c#13 integrate ... //depot/projects/smpng/sys/dev/sound/pci/maestro.c#5 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#33 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#5 integrate ... //depot/projects/smpng/sys/dev/wi/if_wivar.h#6 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.c#3 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.h#2 integrate ... //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#13 integrate ... //depot/projects/smpng/sys/fs/udf/ecma167-udf.h#1 branch ... //depot/projects/smpng/sys/fs/udf/osta.c#1 branch ... //depot/projects/smpng/sys/fs/udf/osta.h#1 branch ... //depot/projects/smpng/sys/fs/udf/udf.h#1 branch ... //depot/projects/smpng/sys/fs/udf/udf_mount.h#1 branch ... //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#1 branch ... //depot/projects/smpng/sys/fs/udf/udf_vnops.c#1 branch ... //depot/projects/smpng/sys/i386/i386/i686_mem.c#2 integrate ... //depot/projects/smpng/sys/i386/i386/pmap.c#20 integrate ... //depot/projects/smpng/sys/ia64/ia64/ia64dump.c#4 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#36 integrate ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#27 integrate ... //depot/projects/smpng/sys/ia64/ia64/trap.c#29 integrate ... //depot/projects/smpng/sys/kern/init_sysent.c#12 integrate ... //depot/projects/smpng/sys/kern/kern_clock.c#16 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#24 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#33 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#38 integrate ... //depot/projects/smpng/sys/kern/kern_ktrace.c#22 integrate ... //depot/projects/smpng/sys/kern/kern_malloc.c#9 integrate ... //depot/projects/smpng/sys/kern/kern_ntptime.c#8 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#27 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#60 integrate ... //depot/projects/smpng/sys/kern/kern_resource.c#23 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#33 integrate ... //depot/projects/smpng/sys/kern/kern_tc.c#8 integrate ... //depot/projects/smpng/sys/kern/kern_time.c#14 integrate ... //depot/projects/smpng/sys/kern/subr_param.c#9 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#44 integrate ... //depot/projects/smpng/sys/kern/sys_process.c#15 integrate ... //depot/projects/smpng/sys/kern/syscalls.c#12 integrate ... //depot/projects/smpng/sys/kern/syscalls.master#11 integrate ... //depot/projects/smpng/sys/kern/tty.c#19 integrate ... //depot/projects/smpng/sys/kern/tty_pty.c#16 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#21 integrate ... //depot/projects/smpng/sys/kern/vfs_vnops.c#24 integrate ... //depot/projects/smpng/sys/modules/Makefile#25 integrate ... //depot/projects/smpng/sys/modules/udf/Makefile#1 branch ... //depot/projects/smpng/sys/net/if_arcsubr.c#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#3 integrate ... //depot/projects/smpng/sys/pci/agp_amd.c#4 integrate ... //depot/projects/smpng/sys/powerpc/conf/GENERIC#5 integrate ... //depot/projects/smpng/sys/powerpc/include/cpu.h#9 integrate ... //depot/projects/smpng/sys/powerpc/include/cpufunc.h#12 integrate ... //depot/projects/smpng/sys/powerpc/include/nexusvar.h#1 branch ... //depot/projects/smpng/sys/powerpc/powerpc/nexus.c#1 branch ... //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#15 integrate ... //depot/projects/smpng/sys/sparc64/conf/GENERIC#11 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#21 integrate ... //depot/projects/smpng/sys/sys/kernel.h#13 integrate ... //depot/projects/smpng/sys/sys/malloc.h#7 integrate ... //depot/projects/smpng/sys/sys/memrange.h#2 integrate ... //depot/projects/smpng/sys/sys/proc.h#45 integrate ... //depot/projects/smpng/sys/sys/syscall.h#12 integrate ... //depot/projects/smpng/sys/sys/syscall.mk#12 integrate ... //depot/projects/smpng/sys/sys/sysproto.h#14 integrate ... //depot/projects/smpng/sys/sys/time.h#5 integrate ... //depot/projects/smpng/sys/sys/vnode.h#15 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#11 integrate ... //depot/projects/smpng/sys/vm/pmap.h#6 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#10 integrate ... //depot/projects/smpng/sys/vm/vm_map.c#10 integrate ... //depot/projects/smpng/sys/vm/vm_page.c#14 integrate ... //depot/projects/smpng/sys/vm/vm_zeroidle.c#6 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/pal.s#2 (text+ko) ==== @@ -23,8 +23,6 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/sys/alpha/alpha/pal.s,v 1.5 2001/05/28 09:52:20 obrien Exp $ */ /* @@ -42,8 +40,8 @@ #include __KERNEL_RCSID(1, "$NetBSD: pal.s,v 1.12 1998/02/27 03:44:53 thorpej Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pal.s,v 1.8 2002/04/15 23:28:10 obrien Exp $"); -inc2: .stabs __FILE__,132,0,0,inc2 .text .loc 1 __LINE__ @@ -370,5 +368,3 @@ call_pal PAL_OSF1_wrperfmon RET END(alpha_pal_wrperfmon) - - ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#29 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.89 2002/04/04 21:03:13 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.91 2002/04/15 16:07:52 peter Exp $ */ /* @@ -1731,9 +1731,9 @@ nklev2++; vm_page_wire(nkpg); + pmap_zero_page(nkpg); + pa = VM_PAGE_TO_PHYS(nkpg); - pmap_zero_page(pa); - newlev1 = pmap_phys_to_pte(pa) | PG_V | PG_ASM | PG_KRE | PG_KWE; @@ -1765,8 +1765,8 @@ nklev3++; vm_page_wire(nkpg); + pmap_zero_page(nkpg); pa = VM_PAGE_TO_PHYS(nkpg); - pmap_zero_page(pa); newlev2 = pmap_phys_to_pte(pa) | PG_V | PG_ASM | PG_KRE | PG_KWE; *pte = newlev2; @@ -2709,9 +2709,9 @@ */ void -pmap_zero_page(vm_offset_t pa) +pmap_zero_page(vm_page_t m) { - vm_offset_t va = ALPHA_PHYS_TO_K0SEG(pa); + vm_offset_t va = ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(m)); bzero((caddr_t) va, PAGE_SIZE); } @@ -2725,9 +2725,9 @@ */ void -pmap_zero_page_area(vm_offset_t pa, int off, int size) +pmap_zero_page_area(vm_page_t m, int off, int size) { - vm_offset_t va = ALPHA_PHYS_TO_K0SEG(pa); + vm_offset_t va = ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(m)); bzero((char *)(caddr_t)va + off, size); } @@ -2738,10 +2738,10 @@ * time. */ void -pmap_copy_page(vm_offset_t src, vm_offset_t dst) +pmap_copy_page(vm_page_t msrc, vm_page_t mdst) { - src = ALPHA_PHYS_TO_K0SEG(src); - dst = ALPHA_PHYS_TO_K0SEG(dst); + vm_offset_t src = ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(msrc)); + vm_offset_t dst = ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(mdst)); bcopy((caddr_t) src, (caddr_t) dst, PAGE_SIZE); } ==== //depot/projects/smpng/sys/alpha/alpha/prom_disp.s#2 (text+ko) ==== @@ -23,14 +23,13 @@ * * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. - * - * $FreeBSD: src/sys/alpha/alpha/prom_disp.s,v 1.4 2001/05/28 09:52:20 obrien Exp $ */ #ifndef _LOCORE #include #else __KERNEL_RCSID(2, "$NetBSD: prom_disp.s,v 1.8 1997/11/03 04:22:03 ross Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/prom_disp.s,v 1.5 2002/04/15 21:44:19 obrien Exp $"); #endif .globl prom_dispatch_v @@ -39,7 +38,6 @@ .text .align 4 -inc3: .stabs __FILE__,132,0,0,inc3 .text .loc 1 __LINE__ /* ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#30 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.90 2002/03/29 18:55:07 alc Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.91 2002/04/16 05:56:01 alc Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -559,26 +559,6 @@ */ rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL); } - - /* - * If this was a stack access we keep track of the - * maximum accessed stack size. Also, if vm_fault - * gets a protection failure it is due to accessing - * the stack region outside the current limit and - * we need to reflect that as an access error. - */ - if (map != kernel_map && - (caddr_t)va >= vm->vm_maxsaddr && - (caddr_t)va < (caddr_t)USRSTACK) { - if (rv == KERN_SUCCESS) { - unsigned long nss, rp; - rp = round_page(USRSTACK - va); - nss = alpha_btop(rp); - if (nss > vm->vm_ssize) - vm->vm_ssize = nss; - } else if (rv == KERN_PROTECTION_FAILURE) - rv = KERN_INVALID_ADDRESS; - } mtx_unlock(&Giant); if (rv == KERN_SUCCESS) goto out; ==== //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.1 2002/01/18 09:00:38 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.2 2002/04/15 13:44:00 nyan Exp $ -PROG= kgzldr.o SRCS= start.s boot.c inflate.c lib.c crt.s sio.s +OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -fno-builtin .if ${OBJFORMAT} == aout CFLAGS+=-O2 ==== //depot/projects/smpng/sys/coda/coda_venus.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/cfs/coda_venus.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_venus.c,v 1.14 2002/02/23 22:55:47 tmm Exp $ + * $FreeBSD: src/sys/coda/coda_venus.c,v 1.15 2002/04/16 17:11:30 jhb Exp $ * */ ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#15 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.44 2002/04/01 21:30:30 jhb Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.45 2002/04/16 17:04:21 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/conf/NOTES#6 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1020 2002/04/10 17:27:52 brian Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1022 2002/04/15 19:42:15 des Exp $ # # @@ -134,6 +134,28 @@ options WITNESS_DDB options WITNESS_SKIPSPIN +# +# MUTEX_PROFILING - Profiling mutual exclusion locks (mutexes). This +# records four numbers for each acquisition point (identified by +# source file name and line number): longest time held, total time held, +# number of non-recursive acquisitions, and average time held. Measurements +# are made and stored in nanoseconds (using nanotime(9)), but are presented +# in microseconds, which should be sufficient for the locks which actually +# want this (those that are held long and / or often). The MUTEX_PROFILING +# option has the following sysctl namespace for controlling and viewing its +# operation: +# +# debug.mutex.prof.enable - enable / disable profiling +# debug.mutex.prof.acquisitions - number of mutex acquisitions held +# debug.mutex.prof.records - number of acquisition points recorded +# debug.mutex.prof.maxrecords - max number of acquisition points +# debug.mutex.prof.rejected - number of rejections (due to full table) +# debug.mutex.prof.hashsize - hash size +# debug.mutex.prof.collisions - number of hash collisions +# debug.mutex.prof.stats - profiling statistics +# +options MUTEX_PROFILING + ##################################################################### # COMPATIBILITY OPTIONS @@ -555,6 +577,7 @@ options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options SMBFS #SMB/CIFS filesystem +options UDF #Universal Disk Format options UMAPFS #UID map filesystem options UNIONFS #Union filesystem # options NODEVFS #disable devices filesystem ==== //depot/projects/smpng/sys/conf/files#35 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.622 2002/04/12 06:19:18 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.623 2002/04/14 16:36:38 scottl Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -686,6 +686,9 @@ fs/pseudofs/pseudofs_vncache.c optional pseudofs fs/pseudofs/pseudofs_vnops.c optional pseudofs fs/specfs/spec_vnops.c standard +fs/udf/udf_vfsops.c optional udf +fs/udf/udf_vnops.c optional udf +fs/udf/osta.c optional udf fs/umapfs/umap_subr.c optional umapfs fs/umapfs/umap_vfsops.c optional umapfs fs/umapfs/umap_vnops.c optional umapfs ==== //depot/projects/smpng/sys/conf/files.alpha#13 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.83 2002/04/13 22:34:15 obrien Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.84 2002/04/15 23:28:09 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -69,7 +69,6 @@ alpha/alpha/machdep.c standard alpha/alpha/mem.c standard alpha/alpha/mountroot.c optional slice -alpha/alpha/pal.s standard alpha/alpha/perfmon.c optional perfmon profiling-routine alpha/alpha/perfmon.c optional perfmon alpha/alpha/pmap.c standard ==== //depot/projects/smpng/sys/conf/files.powerpc#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.7 2002/03/27 05:39:18 dillon Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.8 2002/04/15 12:30:14 benno Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -42,6 +42,7 @@ dev/ofw/openfirm.c standard dev/ofw/ofw_console.c standard +dev/ofw/ofw_disk.c optional ofwd libkern/ashldi3.c standard libkern/ashrdi3.c standard ==== //depot/projects/smpng/sys/conf/majors#9 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/conf/majors,v 1.134 2002/04/09 00:34:18 jake Exp $ +$FreeBSD: src/sys/conf/majors,v 1.135 2002/04/15 10:41:47 benno Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. @@ -184,6 +184,7 @@ 166 ciss Compaq SmartArray 5* adapter 167 ufm USB Fm Radio 168 se Siemens SAB82532 serial chip +169 ofwd OpenFirmware disk 200 ?? entries from 200-252 are reserved for local use 252 ?? entries from 200-252 are reserved for local use 254 internal Used internally by the kernel ==== //depot/projects/smpng/sys/conf/options#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.311 2002/04/09 05:14:16 jeff Exp $ +# $FreeBSD: src/sys/conf/options,v 1.312 2002/04/14 16:36:38 scottl Exp $ # # On the handling of kernel options # @@ -129,6 +129,7 @@ NTFS opt_dontuse.h HPFS opt_dontuse.h UNIONFS opt_dontuse.h +UDF opt_dontuse.h # Broken - ffs_snapshot() dependency from ufs_lookup() :-( FFS opt_ffs_broken_fixme.h ==== //depot/projects/smpng/sys/conf/options.ia64#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.ia64,v 1.9 2002/04/10 19:35:50 dfr Exp $ +# $FreeBSD: src/sys/conf/options.ia64,v 1.10 2002/04/14 04:33:41 peter Exp $ # Options specific to the ia64 platform kernels ITANIUM opt_global.h @@ -70,3 +70,4 @@ # Device options DEV_SPLASH opt_splash.h +DEV_ACPICA opt_acpica.h ==== //depot/projects/smpng/sys/dev/ata/ata-dma.c#20 (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. * - * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.95 2002/04/11 11:04:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.96 2002/04/16 08:30:51 sos Exp $ */ #include @@ -502,45 +502,20 @@ } break; + case 0x01bc10de: /* nVIDIA nForce */ case 0x74411022: /* AMD 768 */ case 0x74111022: /* AMD 766 */ - if (udmamode >= 5) { - error = ata_command(atadev, ATA_C_SETFEATURES, 0, - ATA_UDMA5, ATA_C_F_SETXFER, ATA_WAIT_READY); - if (bootverbose) - ata_prtdev(atadev, "%s setting UDMA5 on AMD chip\n", - (error) ? "failed" : "success"); - if (!error) { - pci_write_config(parent, 0x53 - devno, 0xc6, 1); - ata_dmacreate(atadev, apiomode, ATA_UDMA5); - return; - } - } - /* FALLTHROUGH */ - case 0x74091022: /* AMD 756 */ - if (udmamode >= 4) { - error = ata_command(atadev, ATA_C_SETFEATURES, 0, - ATA_UDMA4, ATA_C_F_SETXFER, ATA_WAIT_READY); - if (bootverbose) - ata_prtdev(atadev, "%s setting UDMA4 on AMD chip\n", - (error) ? "failed" : "success"); - if (!error) { - pci_write_config(parent, 0x53 - devno, 0xc5, 1); - ata_dmacreate(atadev, apiomode, ATA_UDMA4); - return; - } - } - goto via_82c586; - case 0x05711106: /* VIA 82C571, 82C586, 82C596, 82C686 , 8231, 8233 */ { - int via_modes[4][7] = { - { 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 }, /* ATA33 */ - { 0x00, 0x00, 0xea, 0x00, 0xe8, 0x00, 0x00 }, /* ATA66 */ - { 0x00, 0x00, 0xf4, 0x00, 0xf1, 0xf0, 0x00 }, /* ATA100 */ - { 0x00, 0x00, 0xf6, 0x00, 0xf2, 0xf1, 0xf0 }}; /* ATA133 */ + int via_modes[5][7] = { + { 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00 }, /* VIA ATA33 */ + { 0x00, 0x00, 0xea, 0x00, 0xe8, 0x00, 0x00 }, /* VIA ATA66 */ + { 0x00, 0x00, 0xf4, 0x00, 0xf1, 0xf0, 0x00 }, /* VIA ATA100 */ + { 0x00, 0x00, 0xf6, 0x00, 0xf2, 0xf1, 0xf0 }, /* VIA ATA133 */ + { 0x00, 0x00, 0xc0, 0x00, 0xc5, 0xc6, 0x00 }}; /* AMD/nVIDIA */ int *reg_val = NULL; + char *chip = "VIA"; if (ata_find_dev(parent, 0x31471106, 0)) { /* 8233a */ udmamode = imin(udmamode, 6); @@ -564,19 +539,34 @@ } else if (ata_find_dev(parent, 0x05961106, 0) || /* 82C596a */ ata_find_dev(parent, 0x05861106, 0x03)) { /* 82C586b */ -via_82c586: udmamode = imin(udmamode, 2); reg_val = via_modes[0]; } - else + else if (chiptype == 0x74411022 || /* AMD 768 */ + chiptype == 0x74111022) { /* AMD 766 */ + udmamode = imin(udmamode, 5); + reg_val = via_modes[4]; + chip = "AMD"; + } + else if (chiptype == 0x74091022) { /* AMD 756 */ + udmamode = imin(udmamode, 4); + reg_val = via_modes[4]; + chip = "AMD"; + } + else if (chiptype == 0x01bc10de) { /* nVIDIA */ + udmamode = imin(udmamode, 5); + reg_val = via_modes[4]; + chip = "nVIDIA"; + } + else udmamode = 0; - + if (udmamode >= 6) { error = ata_command(atadev, ATA_C_SETFEATURES, 0, ATA_UDMA6, ATA_C_F_SETXFER, ATA_WAIT_READY); if (bootverbose) - ata_prtdev(atadev, "%s setting UDMA6 on VIA chip\n", - (error) ? "failed" : "success"); + ata_prtdev(atadev, "%s setting UDMA6 on %s chip\n", + (error) ? "failed" : "success", chip); if (!error) { pci_write_config(parent, 0x53 - devno, reg_val[6], 1); ata_dmacreate(atadev, apiomode, ATA_UDMA6); @@ -587,8 +577,8 @@ error = ata_command(atadev, ATA_C_SETFEATURES, 0, ATA_UDMA5, ATA_C_F_SETXFER, ATA_WAIT_READY); if (bootverbose) - ata_prtdev(atadev, "%s setting UDMA5 on VIA chip\n", - (error) ? "failed" : "success"); + ata_prtdev(atadev, "%s setting UDMA5 on %s chip\n", + (error) ? "failed" : "success", chip); if (!error) { pci_write_config(parent, 0x53 - devno, reg_val[5], 1); ata_dmacreate(atadev, apiomode, ATA_UDMA5); @@ -599,8 +589,8 @@ error = ata_command(atadev, ATA_C_SETFEATURES, 0, ATA_UDMA4, ATA_C_F_SETXFER, ATA_WAIT_READY); if (bootverbose) - ata_prtdev(atadev, "%s setting UDMA4 on VIA chip\n", - (error) ? "failed" : "success"); + ata_prtdev(atadev, "%s setting UDMA4 on %s chip\n", + (error) ? "failed" : "success", chip); if (!error) { pci_write_config(parent, 0x53 - devno, reg_val[4], 1); ata_dmacreate(atadev, apiomode, ATA_UDMA4); @@ -611,28 +601,26 @@ error = ata_command(atadev, ATA_C_SETFEATURES, 0, ATA_UDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY); if (bootverbose) - ata_prtdev(atadev, "%s setting UDMA2 on VIA chip\n", - (error) ? "failed" : "success"); + ata_prtdev(atadev, "%s setting UDMA2 on %s chip\n", + (error) ? "failed" : "success", chip); if (!error) { pci_write_config(parent, 0x53 - devno, reg_val[2], 1); ata_dmacreate(atadev, apiomode, ATA_UDMA2); return; } } - - } - if (wdmamode >= 2 && apiomode >= 4) { - error = ata_command(atadev, ATA_C_SETFEATURES, 0, - ATA_WDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY); - if (bootverbose) - ata_prtdev(atadev, "%s setting WDMA2 on %s chip\n", - (error) ? "failed" : "success", - (chiptype == 0x74091022) ? "AMD" : "VIA"); - if (!error) { - pci_write_config(parent, 0x53 - devno, 0x0b, 1); - pci_write_config(parent, 0x4b - devno, 0x31, 1); - ata_dmacreate(atadev, apiomode, ATA_WDMA2); - return; + if (wdmamode >= 2 && apiomode >= 4) { + error = ata_command(atadev, ATA_C_SETFEATURES, 0, + ATA_WDMA2, ATA_C_F_SETXFER, ATA_WAIT_READY); + if (bootverbose) + ata_prtdev(atadev, "%s setting WDMA2 on %s chip\n", + (error) ? "failed" : "success", chip); + if (!error) { + pci_write_config(parent, 0x53 - devno, 0x0b, 1); + pci_write_config(parent, 0x4b - devno, 0x31, 1); + ata_dmacreate(atadev, apiomode, ATA_WDMA2); + return; + } } } /* we could set PIO mode timings, but we assume the BIOS did that */ ==== //depot/projects/smpng/sys/dev/ata/ata-pci.c#20 (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. * - * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.40 2002/04/11 11:04:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.41 2002/04/16 08:30:51 sos Exp $ */ #include "opt_ata.h" @@ -228,6 +228,9 @@ case 0x74411022: return "AMD 768 ATA100 controller"; + case 0x01bc10de: + return "nVIDIA nForce ATA100 controller"; + case 0x02111166: return "ServerWorks ROSB4 ATA33 controller"; @@ -465,6 +468,7 @@ case 0x74091022: /* AMD 756 default setup */ case 0x74111022: /* AMD 766 default setup */ case 0x74411022: /* AMD 768 default setup */ + case 0x01bc10de: /* nVIDIA nForce default setup */ /* set prefetch, postwrite */ pci_write_config(dev, 0x41, pci_read_config(dev, 0x41, 1) | 0xf0, 1); ==== //depot/projects/smpng/sys/dev/hfa/fore_load.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.24 2002/03/20 02:07:23 alfred Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.25 2002/04/16 01:38:31 arr Exp $ * */ @@ -67,44 +67,39 @@ #include #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.24 2002/03/20 02:07:23 alfred Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.25 2002/04/16 01:38:31 arr Exp $"); #endif +static int fore_probe(device_t); +static int fore_attach(device_t); +static int fore_detach(device_t); +static int fore_shutdown(device_t); -/* - * Local functions - */ -static int fore_start(void); -static const char * fore_pci_probe(pcici_t, pcidi_t); -static void fore_pci_attach(pcici_t, int); -static void fore_pci_shutdown(void *, int); -static void fore_unattach(Fore_unit *); -static void fore_reset(Fore_unit *); - -#ifndef COMPAT_OLDPCI -#error "The fore device requires the old pci compatibility shims" +#ifndef COMPAT_OLDPCI +#error "The fore device requires the old pci compatibility shims" #endif -/* - * Local variables - */ static int fore_inited = 0; -/* - * Driver entry points - */ - static u_long fore_pci_count = 0; -static struct pci_device fore_pci_device = { - FORE_DEV_NAME, - fore_pci_probe, - fore_pci_attach, - &fore_pci_count, - NULL +static device_method_t fore_methods[] = { + DEVMETHOD(device_probe, fore_probe), + DEVMETHOD(device_attach, fore_attach), + DEVMETHOD(device_detach, fore_detach), + DEVMETHOD(device_shutdown, fore_shutdown), + { 0, 0 } }; -COMPAT_PCI_DRIVER(fore_pci, fore_pci_device); +static struct fore_ident fore_ident_table[] = { + { 0x0200, "FORE Systems PCA-200 ATM ForeRunner" }, + { 0x0210, "FORE Systems PCA-200PC" }, + { 0x0250, "FORE Systems ATM" }, + { 0x0300, "FORE Systems PCA-200E" }, + { 0x0310, "FORE Systems ATM" }, + { 0x0400, "FORE Systems PCA-200HE ATM ForeRunner" }, + { 0, NULL }, +}; /* @@ -135,7 +130,6 @@ ATM_VERS_MAJ(atm_version), ATM_VERS_MIN(atm_version)); return (EINVAL); } - /* * Initialize DMA mapping */ @@ -145,9 +139,7 @@ * Start up watchdog timer */ atm_timeout(&fore_timer, ATM_HZ * FORE_TIME_TICK, fore_timeout); - fore_inited = 1; - return (0); } @@ -160,40 +152,24 @@ * Determine if this driver will support the identified device. If we claim * to support the device, our attach routine will (later) be called for the * device. - * - * Arguments: - * config_id device's PCI configuration ID - * device_id device's PCI Vendor/Device ID - * - * Returns: - * name device identification string - * NULL device not claimed by this driver - * */ -static const char * -fore_pci_probe(config_id, device_id) - pcici_t config_id; - pcidi_t device_id; +static int +fore_probe(device_t dev) { + struct fore_ident *ident; + u_int16_t devid; - /* - * Initialize driver stuff - */ - if (fore_inited == 0) { - if (fore_start()) - return (NULL); + if (pci_get_vendor(dev) == FORE_VENDOR_ID) { + devid = pci_get_device(dev); + for (ident = fore_ident_table; ident->name != NULL; ident++) + if (ident->devid == devid) { + device_set_desc(dev, ident->name); + return (0); + } } - - if ((device_id & 0xffff) != FORE_VENDOR_ID) - return (NULL); - - if (((device_id >> 16) & 0xffff) == FORE_PCA200E_ID) - return ("FORE Systems PCA-200E ATM"); - - return (NULL); + return (ENXIO); } - /* * Device attach routine * @@ -213,8 +189,8 @@ */ static void fore_pci_attach(config_id, unit) - pcici_t config_id; - int unit; + pcici_t config_id; + int unit; { Fore_unit *fup; vm_offset_t va; @@ -223,14 +199,11 @@ long val; int err_count = BOOT_LOOPS; + /* - * Just checking... - */ - if (unit >= FORE_MAX_UNITS) { - log(LOG_ERR, "%s%d: too many devices\n", - FORE_DEV_NAME, unit); - return; - } + * Check that unit is not >= FORE_MAX_UNITS + */ + /* * Make sure this isn't a duplicate unit @@ -238,6 +211,7 @@ if (fore_units[unit] != NULL) return; + /* * Allocate a new unit structure */ ==== //depot/projects/smpng/sys/dev/hfa/fore_slave.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_slave.h,v 1.2 1999/08/28 00:41:52 peter Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_slave.h,v 1.3 2002/04/16 01:34:00 arr Exp $ * */ @@ -135,7 +135,6 @@ * PCI Identifiers */ #define FORE_VENDOR_ID 0x1127 -#define FORE_PCA200E_ID 0x0300 /* * PCA-200E PCI Configuration Space ==== //depot/projects/smpng/sys/dev/sound/pci/ich.c#13 (text+ko) ==== @@ -32,7 +32,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.18 2002/02/19 00:59:23 alfred Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.20 2002/04/15 20:42:40 jhb Exp $"); /* -------------------------------------------------------------------- */ @@ -298,7 +298,12 @@ if (sc->ac97rate <= 32000 || sc->ac97rate >= 64000) sc->ac97rate = 48000; r = (speed * 48000) / sc->ac97rate; - ch->spd = (ac97_setrate(sc->codec, ch->spdreg, r) * sc->ac97rate) / 48000; + /* + * Cast the return value of ac97_setrate() to u_int so that + * the math don't overflow into the negative range. + */ + ch->spd = ((u_int)ac97_setrate(sc->codec, ch->spdreg, r) * + sc->ac97rate) / 48000; } else { ch->spd = 48000; } @@ -601,6 +606,10 @@ device_set_desc(dev, "SiS 7012"); return 0; + case 0x01b110de: + device_set_desc(dev, "Nvidia nForce AC97 controller"); + return 0; + default: return ENXIO; } @@ -682,8 +691,8 @@ extcaps = ac97_getextcaps(sc->codec); sc->hasvra = extcaps & AC97_EXTCAP_VRA; sc->hasvrm = extcaps & AC97_EXTCAP_VRM; - sc->hasmic = extcaps & AC97_CAP_MICCHANNEL; - ac97_setextmode(sc->codec, sc->hasvra | sc->hasvrm | sc->hasmic); + sc->hasmic = ac97_getcaps(sc->codec) & AC97_CAP_MICCHANNEL; + ac97_setextmode(sc->codec, sc->hasvra | sc->hasvrm); if (pcm_register(dev, sc, 1, sc->hasmic? 2 : 1)) goto bad; ==== //depot/projects/smpng/sys/dev/sound/pci/maestro.c#5 (text+ko) ==== @@ -51,7 +51,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro.c,v 1.14 2002/01/27 23:09:41 scottl Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro.c,v 1.16 2002/04/16 01:58:13 jhb Exp $"); #define inline __inline @@ -520,10 +520,10 @@ static void aggch_start_dac(struct agg_chinfo *ch) { - u_int wpwa = APU_USE_SYSMEM | (ch->offset >> 9); + bus_addr_t wpwa = APU_USE_SYSMEM | (ch->offset >> 9); u_int size = ch->parent->bufsz >> 1; u_int speed = ch->speed; - u_int offset = ch->offset >> 1; + bus_addr_t offset = ch->offset >> 1; u_int cp = 0; u_int16_t apuch = ch->num << 1; u_int dv; @@ -663,7 +663,7 @@ ch->offset = physaddr - ess->baseaddr; if (physaddr < ess->baseaddr || ch->offset > WPWA_MAXADDR) { device_printf(ess->dev, - "offset %#x exceeds limit. ", ch->offset); + "offset %#llx exceeds limit. ", (long long)ch->offset); dma_free(ess, sndbuf_getbuf(b)); return NULL; } @@ -673,9 +673,9 @@ if (dir == PCMDIR_PLAY) { ess->playchns++; if (bootverbose) - device_printf(ess->dev, "pch[%d].offset = %#x\n", ch->num, ch->offset); + device_printf(ess->dev, "pch[%d].offset = %#llx\n", ch->num, (long long)ch->offset); } else if (bootverbose) - device_printf(ess->dev, "rch.offset = %#x\n", ch->offset); + device_printf(ess->dev, "rch.offset = %#llx\n", (long long)ch->offset); return ch; } @@ -983,7 +983,8 @@ goto bad; } if (bootverbose) - device_printf(dev, "Maestro DMA base: %#x\n", ess->baseaddr); + device_printf(dev, "Maestro DMA base: %#llx\n", + (long long)ess->baseaddr); agg_power(ess, PPMI_D0); DELAY(100000); ==== //depot/projects/smpng/sys/dev/wi/if_wi.c#33 (text+ko) ==== @@ -102,7 +102,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.99 2002/04/12 06:12:21 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.100 2002/04/14 23:18:40 brooks Exp $"; #endif static void wi_intr(void *); @@ -1163,6 +1163,21 @@ ltv = &p2ltv; break; } + } else { + /* LUCENT */ + switch (ltv->wi_type) { + case WI_RID_TX_RATE: + switch (ltv->wi_val) { + case 1: ltv->wi_val = 1; break; /* 1Mb/s fixed */ + case 2: ltv->wi_val = 2; break; /* 2Mb/s fixed */ + case 3: ltv->wi_val = 3; break; /* 11Mb/s auto */ + case 5: ltv->wi_val = 4; break; /* 5.5Mb/s fixed */ + case 6: ltv->wi_val = 6; break; /* 2Mb/s auto */ + case 7: ltv->wi_val = 7; break; /* 5.5Mb/s auto */ + case 11: ltv->wi_val = 5; break; /* 11Mb/s fixed */ + default: return EINVAL; + } + } } >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 11:58:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7099837B416; Tue, 16 Apr 2002 11:58:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6DA3C37B405 for ; Tue, 16 Apr 2002 11:58:43 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3GIwhp11518 for perforce@freebsd.org; Tue, 16 Apr 2002 11:58:43 -0700 (PDT) (envelope-from green@freebsd.org) Date: Tue, 16 Apr 2002 11:58:43 -0700 (PDT) Message-Id: <200204161858.g3GIwhp11518@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 9840 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9840 Change 9840 by green@green_laptop_2 on 2002/04/16 11:57:49 Back out old kern.dumpdev tuneable as it no longer can apply. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_conf.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_conf.c#7 (text+ko) ==== @@ -282,9 +282,6 @@ return ((x << 8) | y); } -static char dumpdevname[32]; -TUNABLE_STR("kern.dumpdev", dumpdevname, sizeof(dumpdevname)); - dev_t make_dev(struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, const char *fmt, ...) { @@ -320,8 +317,6 @@ if (devfs_create_hook) devfs_create_hook(dev); - if (dumpdev == NODEV && strcmp(dev->si_name, dumpdevname) == 0) - dumpdev = dev; return (dev); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 12: 3:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB61637B416; Tue, 16 Apr 2002 12:03:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EF6B037B405 for ; Tue, 16 Apr 2002 12:03:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3GJ3ng12484 for perforce@freebsd.org; Tue, 16 Apr 2002 12:03:49 -0700 (PDT) (envelope-from green@freebsd.org) Date: Tue, 16 Apr 2002 12:03:49 -0700 (PDT) Message-Id: <200204161903.g3GJ3ng12484@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 9841 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9841 Change 9841 by green@green_laptop_2 on 2002/04/16 12:02:53 Reinsert reverted #defines. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#6 (text+ko) ==== @@ -114,6 +114,13 @@ {0, NULL}, }; +/* + * The WEIRD_ADDR is used as known text to copy into free objects so + * that modifications after frees can be detected. + */ +#define WEIRD_ADDR 0xdeadc0de +#define MAX_COPY 64 + u_int vm_kmem_size; static struct mtx malloc_mtx; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 12:18:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FA5937B41A; Tue, 16 Apr 2002 12:18:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6EF4C37B405 for ; Tue, 16 Apr 2002 12:18:07 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3GJI7F19473 for perforce@freebsd.org; Tue, 16 Apr 2002 12:18:07 -0700 (PDT) (envelope-from green@freebsd.org) Date: Tue, 16 Apr 2002 12:18:07 -0700 (PDT) Message-Id: <200204161918.g3GJI7F19473@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 9842 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9842 Change 9842 by green@green_laptop_2 on 2002/04/16 12:17:25 #include where needed. Affected files ... ... //depot/projects/trustedbsd/mac/release/Makefile#10 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/release/Makefile#10 (text+ko) ==== @@ -273,7 +273,10 @@ for i in ${BOOTSTRAPUTILS} ; do \ cp -p ${CHROOTDIR}$$i ${CHROOTDIR}/${BOOTSTRAPDIR} ; \ done -.if !defined(RELEASETAG) +.if defined(SRCROOTDIR) + cd ${CHROOTDIR}/usr && rm -rf src && \ + cp -Rp ${SRCROOTDIR}/ src +.elif !defined(RELEASETAG) cd ${CHROOTDIR}/usr && rm -rf src && \ cvs -R -d ${CVSROOT} co -P ${RELEASESRCMODULE} .else ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#2 (text+ko) ==== @@ -13,6 +13,8 @@ #include #include +#include + #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 12:23:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77D2737B416; Tue, 16 Apr 2002 12:23:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 176F437B404 for ; Tue, 16 Apr 2002 12:23:17 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3GJNGH20203 for perforce@freebsd.org; Tue, 16 Apr 2002 12:23:16 -0700 (PDT) (envelope-from green@freebsd.org) Date: Tue, 16 Apr 2002 12:23:16 -0700 (PDT) Message-Id: <200204161923.g3GJNGH20203@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 9843 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9843 Change 9843 by green@green_laptop_2 on 2002/04/16 12:23:00 Change more suser_xxx()s into suser_cred()s. Affected files ... ... //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#13 (text+ko) ==== @@ -736,7 +736,7 @@ return (error); if (attrnamespace == 0 || attrnamespace == EXTATTR_NAMESPACE_SYSTEM) { - error = suser_xxx(td->td_ucred, td->td_proc, 0); + error = suser_cred(td->td_ucred, 0); if (error) return (error); } @@ -799,7 +799,7 @@ VOP_UNLOCK(filename_vp, 0, td); return (EINVAL); } - if ((error = suser_xxx(td->td_ucred, td->td_proc, 0))) + if ((error = suser_cred(td->td_ucred, 0))) return (error); if (attrname != NULL) return (EINVAL); @@ -813,7 +813,7 @@ VOP_UNLOCK(filename_vp, 0, td); return (EINVAL); } - if ((error = suser_xxx(td->td_ucred, td->td_proc, 0))) + if ((error = suser_cred(td->td_ucred, 0))) return (error); if (attrname != NULL) return (EINVAL); @@ -830,7 +830,7 @@ VOP_UNLOCK(filename_vp, 0, td); return (EINVAL); } - if ((error = suser_xxx(td->td_ucred, td->td_proc, 0))) + if ((error = suser_cred(td->td_ucred, 0))) return (error); /* @@ -851,7 +851,7 @@ VOP_UNLOCK(filename_vp, 0, td); return (EINVAL); } - if ((error = suser_xxx(td->td_ucred, td->td_proc, 0))) + if ((error = suser_cred(td->td_ucred, 0))) return (error); if (attrname == NULL) return (EINVAL); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 12:25:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2BF137B400; Tue, 16 Apr 2002 12:25:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail13.speakeasy.net [216.254.0.213]) by hub.freebsd.org (Postfix) with ESMTP id 742EA37B417 for ; Tue, 16 Apr 2002 12:25:04 -0700 (PDT) Received: (qmail 4177 invoked from network); 16 Apr 2002 19:25:00 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail13.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 16 Apr 2002 19:25:00 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g3GJPEv77483; Tue, 16 Apr 2002 15:25:14 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200204161918.g3GJI7F19473@freefall.freebsd.org> Date: Tue, 16 Apr 2002 15:24:04 -0400 (EDT) From: John Baldwin To: Brian Feldman Subject: RE: PERFORCE change 9842 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 16-Apr-2002 Brian Feldman wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9842 > > Change 9842 by green@green_laptop_2 on 2002/04/16 12:17:25 > > #include where needed. > > Affected files ... > > ... //depot/projects/trustedbsd/mac/release/Makefile#10 edit > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#2 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/release/Makefile#10 (text+ko) ==== > > @@ -273,7 +273,10 @@ > for i in ${BOOTSTRAPUTILS} ; do \ > cp -p ${CHROOTDIR}$$i ${CHROOTDIR}/${BOOTSTRAPDIR} ; \ > done > -.if !defined(RELEASETAG) > +.if defined(SRCROOTDIR) > + cd ${CHROOTDIR}/usr && rm -rf src && \ > + cp -Rp ${SRCROOTDIR}/ src > +.elif !defined(RELEASETAG) > cd ${CHROOTDIR}/usr && rm -rf src && \ > cvs -R -d ${CVSROOT} co -P ${RELEASESRCMODULE} > .else > This doesn't look like a #include. :) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 12:32:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CE3C37B417; Tue, 16 Apr 2002 12:32:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2253037B416; Tue, 16 Apr 2002 12:32:42 -0700 (PDT) Received: from localhost (green@localhost) by green.bikeshed.org (8.11.6/8.11.6) with ESMTP id g3GJWfe80273; Tue, 16 Apr 2002 15:32:41 -0400 (EDT) (envelope-from green@green.bikeshed.org) Message-Id: <200204161932.g3GJWfe80273@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 9842 for review In-Reply-To: Message from John Baldwin of "Tue, 16 Apr 2002 15:24:04 EDT." From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 16 Apr 2002 15:32:41 -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin wrote: > > On 16-Apr-2002 Brian Feldman wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9842 > > > > Change 9842 by green@green_laptop_2 on 2002/04/16 12:17:25 > > > > #include where needed. > > > > Affected files ... > > > > ... //depot/projects/trustedbsd/mac/release/Makefile#10 edit > > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#2 edit > > > > Differences ... > > > > ==== //depot/projects/trustedbsd/mac/release/Makefile#10 (text+ko) ==== > > > > @@ -273,7 +273,10 @@ > > for i in ${BOOTSTRAPUTILS} ; do \ > > cp -p ${CHROOTDIR}$$i ${CHROOTDIR}/${BOOTSTRAPDIR} ; \ > > done > > -.if !defined(RELEASETAG) > > +.if defined(SRCROOTDIR) > > + cd ${CHROOTDIR}/usr && rm -rf src && \ > > + cp -Rp ${SRCROOTDIR}/ src > > +.elif !defined(RELEASETAG) > > cd ${CHROOTDIR}/usr && rm -rf src && \ > > cvs -R -d ${CVSROOT} co -P ${RELEASESRCMODULE} > > .else > > > > This doesn't look like a #include. :) Yeah, "oops". I don't think I can do a forced commit, though;, maybe I should just revert the change and recreate it? -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 13:44:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EC7837B419; Tue, 16 Apr 2002 13:43:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8176B37B404 for ; Tue, 16 Apr 2002 13:43:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3GKhA338547 for perforce@freebsd.org; Tue, 16 Apr 2002 13:43:10 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 16 Apr 2002 13:43:10 -0700 (PDT) Message-Id: <200204162043.g3GKhA338547@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9851 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9851 Change 9851 by peter@peter_daintree on 2002/04/16 13:42:57 IFC @9849 Affected files ... ... //depot/projects/ia64/MAINTAINERS#1 branch ... //depot/projects/ia64/Makefile.inc1#19 integrate ... //depot/projects/ia64/bin/date/date.1#2 integrate ... //depot/projects/ia64/bin/ls/ls.1#5 integrate ... //depot/projects/ia64/bin/sh/exec.c#3 integrate ... //depot/projects/ia64/contrib/gcc.295/cccp.c#3 integrate ... //depot/projects/ia64/contrib/openpam/HISTORY#8 integrate ... //depot/projects/ia64/contrib/openpam/MANIFEST#8 integrate ... //depot/projects/ia64/contrib/openpam/RELNOTES#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#4 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#8 integrate ... //depot/projects/ia64/contrib/openpam/include/security/openpam_version.h#1 branch ... //depot/projects/ia64/contrib/openpam/include/security/pam_constants.h#8 integrate ... //depot/projects/ia64/contrib/openpam/lib/Makefile#8 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#1 branch ... //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#8 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_acct_mgmt.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_authenticate.c#8 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_chauthtok.c#8 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_close_session.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#8 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_open_session.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_setcred.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_start.c#7 integrate ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/PLATFORMS#2 integrate ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c#2 integrate ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec#2 integrate ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/passwdqc.h#2 integrate ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/passwdqc_check.c#2 integrate ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/passwdqc_random.c#2 integrate ... //depot/projects/ia64/contrib/smbfs/lib/smb/ctx.c#4 integrate ... //depot/projects/ia64/crypto/openssh/session.c#7 integrate ... //depot/projects/ia64/etc/Makefile#8 integrate ... //depot/projects/ia64/etc/locale.deprecated#2 integrate ... //depot/projects/ia64/etc/mail/Makefile#7 integrate ... //depot/projects/ia64/etc/mail/README#4 integrate ... //depot/projects/ia64/etc/pam.d/Makefile#2 integrate ... //depot/projects/ia64/etc/pam.d/passwd#1 branch ... //depot/projects/ia64/etc/pam.d/sshd#3 integrate ... //depot/projects/ia64/etc/sendmail/Makefile#5 integrate ... //depot/projects/ia64/games/battlestar/com2.c#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/gperf/Makefile#5 integrate ... //depot/projects/ia64/include/grp.h#6 integrate ... //depot/projects/ia64/include/pwd.h#5 integrate ... //depot/projects/ia64/include/string.h#5 integrate ... //depot/projects/ia64/lib/Makefile#8 integrate ... //depot/projects/ia64/lib/libc/gen/getpwent.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/strtofflags.c#4 integrate ... //depot/projects/ia64/lib/libc/locale/euc.c#4 integrate ... //depot/projects/ia64/lib/libc/net/rcmdsh.c#3 integrate ... //depot/projects/ia64/lib/libc_r/Makefile#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_cap_get_fd.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_cap_set_fd.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_main_np.c#2 integrate ... //depot/projects/ia64/lib/libpam/libpam/Makefile#10 integrate ... //depot/projects/ia64/lib/libpam/libpam/pam_debug_log.c#4 integrate ... //depot/projects/ia64/lib/libpam/libpam/pam_std_option.c#3 integrate ... //depot/projects/ia64/lib/libpam/modules/Makefile.inc#5 integrate ... //depot/projects/ia64/lib/libpam/modules/modules.inc#7 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_opieaccess/pam_opieaccess.8#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#5 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_passwdqc/Makefile#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_unix/Makefile#5 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.c#9 integrate ... //depot/projects/ia64/lib/libutil/auth.conf.5#2 integrate ... //depot/projects/ia64/lib/libypclnt/Makefile#2 integrate ... //depot/projects/ia64/libexec/rexecd/rexecd.c#3 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#7 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#20 integrate ... //depot/projects/ia64/sbin/Makefile#9 integrate ... //depot/projects/ia64/sbin/disklabel/disklabel.8#4 integrate ... //depot/projects/ia64/sbin/mount_udf/Makefile#1 branch ... //depot/projects/ia64/sbin/mount_udf/mount_udf.8#1 branch ... //depot/projects/ia64/sbin/mount_udf/mount_udf.c#1 branch ... //depot/projects/ia64/sbin/sysctl/sysctl.c#5 integrate ... //depot/projects/ia64/sbin/tunefs/tunefs.8#3 integrate ... //depot/projects/ia64/sbin/vinum/vinum.8#2 integrate ... //depot/projects/ia64/share/examples/etc/make.conf#7 integrate ... //depot/projects/ia64/share/man/man4/tcp.4#4 integrate ... //depot/projects/ia64/share/man/man4/vinum.4#4 integrate ... //depot/projects/ia64/share/man/man5/a.out.5#2 integrate ... //depot/projects/ia64/share/man/man5/make.conf.5#7 integrate ... //depot/projects/ia64/share/man/man9/cd.9#2 integrate ... //depot/projects/ia64/share/man/man9/style.9#8 integrate ... //depot/projects/ia64/share/mk/bsd.dep.mk#4 integrate ... //depot/projects/ia64/share/mk/bsd.libnames.mk#6 integrate ... //depot/projects/ia64/share/mk/bsd.man.mk#2 integrate ... //depot/projects/ia64/share/mk/bsd.nls.mk#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/pal.s#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/pmap.c#8 integrate ... //depot/projects/ia64/sys/alpha/alpha/prom_disp.s#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/trap.c#8 integrate ... //depot/projects/ia64/sys/boot/pc98/kgzldr/Makefile#2 integrate ... //depot/projects/ia64/sys/coda/coda_venus.c#3 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#5 integrate ... //depot/projects/ia64/sys/conf/NOTES#5 integrate ... //depot/projects/ia64/sys/conf/files#16 integrate ... //depot/projects/ia64/sys/conf/files.alpha#6 integrate ... //depot/projects/ia64/sys/conf/files.powerpc#5 integrate ... //depot/projects/ia64/sys/conf/majors#5 integrate ... //depot/projects/ia64/sys/conf/options#10 integrate ... //depot/projects/ia64/sys/conf/options.ia64#5 integrate ... //depot/projects/ia64/sys/dev/ata/ata-dma.c#12 integrate ... //depot/projects/ia64/sys/dev/ata/ata-pci.c#12 integrate ... //depot/projects/ia64/sys/dev/hfa/fore_load.c#3 integrate ... //depot/projects/ia64/sys/dev/hfa/fore_slave.h#2 integrate ... //depot/projects/ia64/sys/dev/isp/isp.c#6 integrate ... //depot/projects/ia64/sys/dev/isp/isp_inline.h#5 integrate ... //depot/projects/ia64/sys/dev/isp/ispmbox.h#5 integrate ... //depot/projects/ia64/sys/dev/my/if_my.c#2 integrate ... //depot/projects/ia64/sys/dev/ofw/ofw_disk.c#1 branch ... //depot/projects/ia64/sys/dev/sound/pci/es137x.c#2 integrate ... //depot/projects/ia64/sys/dev/sound/pci/ich.c#5 integrate ... //depot/projects/ia64/sys/dev/sound/pci/maestro.c#3 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi.c#15 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#4 integrate ... //depot/projects/ia64/sys/dev/wi/if_wivar.h#5 integrate ... //depot/projects/ia64/sys/dev/wi/wi_hostap.c#3 integrate ... //depot/projects/ia64/sys/dev/wi/wi_hostap.h#2 integrate ... //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#6 integrate ... //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#4 integrate ... //depot/projects/ia64/sys/fs/udf/ecma167-udf.h#1 branch ... //depot/projects/ia64/sys/fs/udf/osta.c#1 branch ... //depot/projects/ia64/sys/fs/udf/osta.h#1 branch ... //depot/projects/ia64/sys/fs/udf/udf.h#1 branch ... //depot/projects/ia64/sys/fs/udf/udf_mount.h#1 branch ... //depot/projects/ia64/sys/fs/udf/udf_vfsops.c#1 branch ... //depot/projects/ia64/sys/fs/udf/udf_vnops.c#1 branch ... //depot/projects/ia64/sys/i386/i386/i686_mem.c#2 integrate ... //depot/projects/ia64/sys/i386/i386/pmap.c#8 integrate ... //depot/projects/ia64/sys/ia64/ia64/ia64dump.c#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#28 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#15 integrate ... //depot/projects/ia64/sys/ia64/ia64/trap.c#22 integrate ... //depot/projects/ia64/sys/kern/init_sysent.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_clock.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#14 integrate ... //depot/projects/ia64/sys/kern/kern_exit.c#9 integrate ... //depot/projects/ia64/sys/kern/kern_fork.c#9 integrate ... //depot/projects/ia64/sys/kern/kern_ktrace.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_malloc.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_ntptime.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#11 integrate ... //depot/projects/ia64/sys/kern/kern_prot.c#12 integrate ... //depot/projects/ia64/sys/kern/kern_resource.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_sig.c#9 integrate ... //depot/projects/ia64/sys/kern/kern_tc.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_time.c#6 integrate ... //depot/projects/ia64/sys/kern/subr_param.c#6 integrate ... //depot/projects/ia64/sys/kern/subr_witness.c#9 integrate ... //depot/projects/ia64/sys/kern/sys_process.c#7 integrate ... //depot/projects/ia64/sys/kern/syscalls.c#5 integrate ... //depot/projects/ia64/sys/kern/syscalls.master#5 integrate ... //depot/projects/ia64/sys/kern/tty.c#8 integrate ... //depot/projects/ia64/sys/kern/tty_pty.c#5 integrate ... //depot/projects/ia64/sys/kern/vfs_aio.c#11 integrate ... //depot/projects/ia64/sys/kern/vfs_vnops.c#11 integrate ... //depot/projects/ia64/sys/modules/Makefile#9 integrate ... //depot/projects/ia64/sys/modules/my/Makefile#1 branch ... //depot/projects/ia64/sys/modules/udf/Makefile#1 branch ... //depot/projects/ia64/sys/net/if_arcsubr.c#4 integrate ... //depot/projects/ia64/sys/netgraph/ng_pptpgre.c#3 integrate ... //depot/projects/ia64/sys/pci/agp_amd.c#3 integrate ... //depot/projects/ia64/sys/powerpc/conf/GENERIC#4 integrate ... //depot/projects/ia64/sys/powerpc/include/cpu.h#5 integrate ... //depot/projects/ia64/sys/powerpc/include/cpufunc.h#6 integrate ... //depot/projects/ia64/sys/powerpc/include/nexusvar.h#1 branch ... //depot/projects/ia64/sys/powerpc/powerpc/nexus.c#1 branch ... //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#7 integrate ... //depot/projects/ia64/sys/sparc64/conf/GENERIC#8 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#8 integrate ... //depot/projects/ia64/sys/sys/kernel.h#6 integrate ... //depot/projects/ia64/sys/sys/malloc.h#7 integrate ... //depot/projects/ia64/sys/sys/memrange.h#2 integrate ... //depot/projects/ia64/sys/sys/proc.h#12 integrate ... //depot/projects/ia64/sys/sys/syscall.h#5 integrate ... //depot/projects/ia64/sys/sys/syscall.mk#5 integrate ... //depot/projects/ia64/sys/sys/sysproto.h#6 integrate ... //depot/projects/ia64/sys/sys/time.h#5 integrate ... //depot/projects/ia64/sys/sys/vnode.h#8 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#7 integrate ... //depot/projects/ia64/sys/vm/pmap.h#5 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#9 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#8 integrate ... //depot/projects/ia64/sys/vm/vm_page.c#8 integrate ... //depot/projects/ia64/sys/vm/vm_zeroidle.c#3 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T001/ref.conf#3 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T002/ref.conf#3 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T003/ref.conf#3 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T004/ref.conf#3 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T005/ref.conf#3 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T010/ref.conf#3 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T012/ref.conf#3 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T013/ref.conf#3 integrate ... //depot/projects/ia64/tools/regression/geom/Test/T014/ref.conf#2 integrate ... //depot/projects/ia64/tools/regression/geom/geom_kernsim.c#3 integrate ... //depot/projects/ia64/tools/regression/geom/geom_sim.h#4 integrate ... //depot/projects/ia64/tools/tools/README#5 integrate ... //depot/projects/ia64/tools/tools/prstats/prstats.pl#2 integrate ... //depot/projects/ia64/usr.bin/find/Makefile#7 integrate ... //depot/projects/ia64/usr.bin/find/getdate.y#2 integrate ... //depot/projects/ia64/usr.bin/find/ls.c#5 integrate ... //depot/projects/ia64/usr.bin/killall/killall.1#3 integrate ... //depot/projects/ia64/usr.bin/killall/killall.c#3 integrate ... //depot/projects/ia64/usr.bin/make/str.c#3 integrate ... //depot/projects/ia64/usr.bin/passwd/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/passwd/passwd.c#3 integrate ... //depot/projects/ia64/usr.bin/sockstat/Makefile#2 integrate ... //depot/projects/ia64/usr.bin/usbhidctl/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/vmstat/vmstat.c#8 integrate ... //depot/projects/ia64/usr.bin/xlint/Makefile.inc#3 integrate ... //depot/projects/ia64/usr.sbin/inetd/inetd.8#3 integrate ... //depot/projects/ia64/usr.sbin/memcontrol/memcontrol.c#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/bundle.c#4 integrate ... //depot/projects/ia64/usr.sbin/ppp/defs.c#5 integrate ... //depot/projects/ia64/usr.sbin/ppp/defs.h#4 integrate ... //depot/projects/ia64/usr.sbin/vipw/pw_util.c#3 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.255 2002/04/13 07:24:14 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.259 2002/04/16 14:38:15 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -734,53 +734,63 @@ ${MAKE} -f Makefile.inc1 _prebuild_libs; \ ${MAKE} -f Makefile.inc1 _generic_libs; -.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}.pcc) -_startup_libs= lib/csu/${MACHINE_ARCH}.pcc -.elif ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" -_startup_libs= lib/csu/i386-elf -.else -_startup_libs= lib/csu/${MACHINE_ARCH} -.endif +# These dependencies are not automatically generated: +# +# gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all +# shared libraries for ELF. +# .if !defined(NO_GCC) _startup_libs+= gnu/lib/csu gnu/lib/libgcc .endif +.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-${OBJFORMAT}) +_startup_libs+= lib/csu/${MACHINE_ARCH}-${OBJFORMAT} +.else +_startup_libs+= lib/csu/${MACHINE_ARCH} +.endif -_prebuild_libs= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ - lib/libncurses lib/libopie lib/libradius lib/librpcsvc \ - lib/libsbuf lib/libtacplus lib/libutil lib/libz lib/msun +_prebuild_libs= -lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L +_generic_libs= gnu/lib -_generic_libs= lib gnu/lib - .if !defined(NOPERL) && !defined(NO_PERL) _generic_libs+= gnu/usr.bin/perl/libperl .endif -.if !defined(NOCRYPT) -.if defined(MAKE_KERBEROS4) -_prebuild_libs+= kerberosIV/lib/libkrb -kerberosIV/lib/libkrb__L: lib/libcrypt__L -_generic_libs+= kerberosIV/lib -.endif -.if defined(MAKE_KERBEROS5) +.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 _prebuild_libs+= kerberos5/lib/libroken _generic_libs+= kerberos5/lib .endif -.if !defined(NOSECURE) + +.if !defined(NOCRYPT) && defined(MAKE_KERBEROS4) +_prebuild_libs+= kerberosIV/lib/libkrb +kerberosIV/lib/libkrb__L: lib/libcrypt__L +_generic_libs+= kerberosIV/lib +.endif + +_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ + lib/libncurses lib/libopie lib/libradius lib/librpcsvc \ + lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ + lib/libz lib/msun + +lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L +lib/libypclnt__L: lib/librpcsvc__L + +_generic_libs+= lib + +.if !defined(NOCRYPT) && !defined(NOSECURE) _prebuild_libs+= secure/lib/libcrypto .if !defined(NO_OPENSSH) _prebuild_libs+= secure/lib/libssh secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L .endif _generic_libs+= secure/lib -.endif !defined(NOSECURE) -.endif !defined(NOCRYPT) +.endif _generic_libs+= usr.bin/lex/lib + .if ${MACHINE_ARCH} == "i386" _generic_libs+= usr.sbin/pcvt/keycap .endif ==== //depot/projects/ia64/bin/date/date.1#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.54 2001/08/07 15:48:26 ru Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.57 2002/04/16 14:28:47 trhodes Exp $ .\" .Dd November 17, 1993 .Dt DATE 1 @@ -72,6 +72,12 @@ .Nm will set the date and time or print it in a user-defined way. .Pp +The +.Nm +utility displays the date and time read from the kernel clock. +When used to set the date and time, +both the kernel clock and the hardware clock are updated. +.Pp Only the superuser may set the date, and if the system securelevel (see .Xr securelevel 8 ) ==== //depot/projects/ia64/bin/ls/ls.1#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.62 2002/01/09 13:29:39 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.63 2002/04/15 02:21:12 jwd Exp $ .\" .Dd December 29, 2002 .Dt LS 1 @@ -137,8 +137,12 @@ .It Fl R Recursively list subdirectories encountered. .It Fl T -Display complete time information for the file, including -month, day, hour, minute, second, and year. +When used with the +.Fl l +(lowercase letter +.Dq ell ) +option, display complete time information for the file, including +month, day, hour, minute, second, and year. .It Fl W Display whiteouts when scanning directories. .It Fl Z @@ -167,7 +171,7 @@ .Pq Fl l format output. .It Fl h -When used wih the +When used with the .Fl l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of digits to three or less ==== //depot/projects/ia64/bin/sh/exec.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)exec.c 8.4 (Berkeley) 6/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/exec.c,v 1.16 2002/02/02 06:50:46 imp Exp $"; + "$FreeBSD: src/bin/sh/exec.c,v 1.17 2002/04/15 15:49:30 greid Exp $"; #endif /* not lint */ #include @@ -350,7 +350,10 @@ if (verbose) { if (entry.cmdtype != CMDUNKNOWN) { /* if no error msg */ cmdp = cmdlookup(name, 0); - printentry(cmdp, verbose); + if (cmdp != NULL) + printentry(cmdp, verbose); + else + outfmt(&errout, "%s: not found\n", name); } flushall(); } ==== //depot/projects/ia64/contrib/gcc.295/cccp.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc.295/cccp.c,v 1.8 2002/03/21 00:01:14 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc.295/cccp.c,v 1.9 2002/04/16 08:07:37 ru Exp $ */ #include "config.h" @@ -4757,12 +4757,14 @@ is_system_include (filename) register char *filename; { +#ifndef FREEBSD_NATIVE struct file_name_list *searchptr; for (searchptr = first_system_include; searchptr; searchptr = searchptr->next) if (! strncmp (searchptr->fname, filename, strlen (searchptr->fname))) return searchptr->c_system_include_path + 1; +#endif return 0; } ==== //depot/projects/ia64/contrib/openpam/HISTORY#8 (text) ==== @@ -1,4 +1,18 @@ ============================================================================ +OpenPAM Cineraria 2002-04-14 + + - ENHANCE: Improved documentation. + + - ENHANCE: Adopt the same preprocessor tricks that were used in + FreeBSD's version of Linux-PAM to simplify static linking without + requiring dummy primitives. + + - ENHANCE: move the policy-loading code out of pam_start.c. + + - BUGFIX: Fix typo in one of the versions of the openpam_log macro. + + - ENHANCE: Add versioning macros. +============================================================================ OpenPAM Cinchona 2002-04-08 - ENHANCE: Improved documentation for several API functions. @@ -114,4 +128,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#8 $ +$P4: //depot/projects/openpam/HISTORY#9 $ ==== //depot/projects/ia64/contrib/openpam/MANIFEST#8 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#6 $ +# $P4: //depot/projects/openpam/MANIFEST#7 $ # CREDITS HISTORY @@ -54,12 +54,14 @@ doc/man/pam_vinfo.3 doc/man/pam_vprompt.3 include/security/openpam.h +include/security/openpam_version.h include/security/pam_appl.h include/security/pam_constants.h include/security/pam_modules.h include/security/pam_types.h lib/Makefile lib/openpam_borrow_cred.c +lib/openpam_configure.c lib/openpam_dispatch.c lib/openpam_dynamic.c lib/openpam_findenv.c ==== //depot/projects/ia64/contrib/openpam/RELNOTES#8 (text) ==== @@ -1,14 +1,12 @@ - Release notes for OpenPAM Cinchona - ================================== + Release notes for OpenPAM Cineraria + =================================== -This is a beta release. - The library itself is complete. Documentation exists in the form of man pages for the library functions, though a few pages are still incomplete. -This release is incorporated into FreeBSD-CURRENT as of 2002-04-08. +This release is incorporated into FreeBSD-CURRENT as of 2002-04-14. It has also been successfully built on NetBSD, and should build with minimal or no changes on OpenBSD. It has not been tested on any other OS. @@ -17,9 +15,4 @@ - The documentation is still incomplete. - - It should be possible to create incomplete modules without - recourse to placeholders or elaborate preprocessor tricks. This - is made difficult by the requirement that it should be possible to - link modules statically. - -$P4: //depot/projects/openpam/RELNOTES#8 $ +$P4: //depot/projects/openpam/RELNOTES#9 $ ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#4 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#1 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#2 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#4 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#1 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#2 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#7 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_LOG 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#4 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#1 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#2 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#5 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#6 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#7 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.3#13 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME @@ -46,7 +46,25 @@ .Ft int .Fn pam_acct_mgmt "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +function verifies and enforces account restrictions +after the user has been authenticated. +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.It Dv PAM_DISALLOW_NULL_AUTHTOK +Fail if the user's authentication token is null. +.El +If any other bits are set, +.Xr pam_authenticate 3 +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm @@ -75,6 +93,7 @@ .El .Sh SEE ALSO .Xr pam 3 , +.Xr pam_authenticate 3 , .Xr pam_strerror 3 .Sh STANDARDS .Rs ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME @@ -65,12 +65,16 @@ .Va flags argument is the binary or of zero or more of the following values: -.Pp -.Bd -literal - =PAM_SILENT - Do not emit any messages. - =PAM_DISALLOW_NULL_AUTHTOK - Fail if the user's authentication token is null. +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.It Dv PAM_DISALLOW_NULL_AUTHTOK +Fail if the user's authentication token is null. +.El +If any other bits are set, +.Nm +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm @@ -94,6 +98,8 @@ Permission denied. .It Bq Er PAM_SERVICE_ERR Error in service module. +.It Bq Er PAM_SYMBOL_ERR +Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .It Bq Er PAM_USER_UNKNOWN ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME @@ -57,12 +57,16 @@ .Va flags argument is the binary or of zero or more of the following values: -.Pp -.Bd -literal - =PAM_SILENT - Do not emit any messages. - =PAM_CHANGE_EXPIRED_AUTHTOK - Change only those authentication tokens that have expired. +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.It Dv PAM_CHANGE_EXPIRED_AUTHTOK +Change only those authentication tokens that have expired. +.El +If any other bits are set, +.Nm +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME @@ -46,7 +46,24 @@ .Ft int .Fn pam_close_session "pam_handle_t *pamh" "int flags" .Sh DESCRIPTION -No description available. +The +.Nm +function tears down the user session previously +set up by +.Xr pam_open_session 3 . +.Pp +The +.Va flags +argument is the binary or of zero or more of the following +values: +.Bl -tag -width 18n +.It Dv PAM_SILENT +Do not emit any messages. +.El +If any other bits are set, +.Nm +will return +.Dv PAM_SYMBOL_ERR . .Sh RETURN VALUES The .Nm @@ -64,11 +81,14 @@ Error in service module. .It Bq Er PAM_SESSION_ERR Session failure. +.It Bq Er PAM_SYMBOL_ERR +Invalid symbol. .It Bq Er PAM_SYSTEM_ERR System error. .El .Sh SEE ALSO .Xr pam 3 , +.Xr pam_open_session 3 , .Xr pam_strerror 3 .Sh STANDARDS .Rs ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_END 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_ERROR 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#12 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GET_DATA 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#12 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GET_ITEM 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#12 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GET_USER 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GETENV 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#11 $ .\" -.Dd April 8, 2002 +.Dd April 14, 2002 .Dt PAM_GETENVLIST 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#8 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#11 $ .\" >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 14:30:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5601A37B419; Tue, 16 Apr 2002 14:30:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 01A0C37B405 for ; Tue, 16 Apr 2002 14:30:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3GLU9t51864 for perforce@freebsd.org; Tue, 16 Apr 2002 14:30:09 -0700 (PDT) (envelope-from des@freebsd.org) Date: Tue, 16 Apr 2002 14:30:09 -0700 (PDT) Message-Id: <200204162130.g3GLU9t51864@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9853 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9853 Change 9853 by des@des.at.des.thinksec.com on 2002/04/16 14:29:40 Fix braino in the gcc version of the openpam_log() macro. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/include/security/openpam.h#18 edit Differences ... ==== //depot/projects/openpam/include/security/openpam.h#18 (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#17 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#18 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED @@ -142,7 +142,7 @@ _openpam_log((lvl), __func__, fmt, __VA_ARGS__) #elif defined(__GNUC__) && (__GNUC__ >= 2) && (__GNUC_MINOR__ >= 95) #define openpam_log(lvl, fmt...) \ - _openpam_log((lvl), __func__, fmt, ##fmt) + _openpam_log((lvl), __func__, ##fmt) #elif defined(__GNUC__) && defined(__FUNCTION__) #define openpam_log(lvl, fmt...) \ _openpam_log((lvl), __FUNCTION__, ##fmt) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 14:43:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C470337B400; Tue, 16 Apr 2002 14:43:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail13.speakeasy.net [216.254.0.213]) by hub.freebsd.org (Postfix) with ESMTP id 4020437B417 for ; Tue, 16 Apr 2002 14:43:16 -0700 (PDT) Received: (qmail 19734 invoked from network); 16 Apr 2002 21:43:12 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail13.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 16 Apr 2002 21:43:12 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g3GLhMv77996; Tue, 16 Apr 2002 17:43:22 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200204161932.g3GJWfe80273@green.bikeshed.org> Date: Tue, 16 Apr 2002 17:42:16 -0400 (EDT) From: John Baldwin To: "Brian F. Feldman" Subject: Re: PERFORCE change 9842 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 16-Apr-2002 Brian F. Feldman wrote: > John Baldwin wrote: >> >> On 16-Apr-2002 Brian Feldman wrote: >> > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9842 >> > >> > Change 9842 by green@green_laptop_2 on 2002/04/16 12:17:25 >> > >> > #include where needed. >> > >> > Affected files ... >> > >> > ... //depot/projects/trustedbsd/mac/release/Makefile#10 edit >> > ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#2 edit >> > >> > Differences ... >> > >> > ==== //depot/projects/trustedbsd/mac/release/Makefile#10 (text+ko) ==== >> > >> > @@ -273,7 +273,10 @@ >> > for i in ${BOOTSTRAPUTILS} ; do \ >> > cp -p ${CHROOTDIR}$$i ${CHROOTDIR}/${BOOTSTRAPDIR} ; \ >> > done >> > -.if !defined(RELEASETAG) >> > +.if defined(SRCROOTDIR) >> > + cd ${CHROOTDIR}/usr && rm -rf src && \ >> > + cp -Rp ${SRCROOTDIR}/ src >> > +.elif !defined(RELEASETAG) >> > cd ${CHROOTDIR}/usr && rm -rf src && \ >> > cvs -R -d ${CVSROOT} co -P ${RELEASESRCMODULE} >> > .else >> > >> >> This doesn't look like a #include. :) > > Yeah, "oops". I don't think I can do a forced commit, though;, maybe I > should just revert the change and recreate it? You can do a forced commit I think. p4 edit foo, p4 submit foo. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 17:24:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8371037B420; Tue, 16 Apr 2002 17:24:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id 9A39337B41D; Tue, 16 Apr 2002 17:24:43 -0700 (PDT) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.11.6/8.11.6) with SMTP id g3H0OYw30105; Tue, 16 Apr 2002 20:24:34 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Tue, 16 Apr 2002 20:24:34 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: "Brian F. Feldman" Cc: John Baldwin , Perforce Change Reviews Subject: Re: PERFORCE change 9842 for review In-Reply-To: <200204161932.g3GJWfe80273@green.bikeshed.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, 16 Apr 2002, Brian F. Feldman wrote: > > This doesn't look like a #include. :) > > Yeah, "oops". I don't think I can do a forced commit, though;, maybe I > should just revert the change and recreate it? I think P4 will let you edit the submit message, so you can always tweak it now, and send out an e-mail indicating the tweak to the review list, I suppose. That assumes it's a good change, but I haven't really looked. Thanks for fixing the various problems with the MAC integ, btw, I had to run out the door and figured there would be a few snags, but completely forgot about ufs_extattr.c's suser_xxx's. Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 17:40:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D132937B404; Tue, 16 Apr 2002 17:40:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by hub.freebsd.org (Postfix) with ESMTP id AEC0A37B416; Tue, 16 Apr 2002 17:40:20 -0700 (PDT) Received: by flood.ping.uio.no (Postfix, from userid 2602) id 4E5455309; Wed, 17 Apr 2002 02:40:18 +0200 (CEST) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: Robert Watson Cc: "Brian F. Feldman" , John Baldwin , Perforce Change Reviews Subject: Re: PERFORCE change 9842 for review References: From: Dag-Erling Smorgrav Date: 17 Apr 2002 02:40:18 +0200 In-Reply-To: Message-ID: Lines: 8 User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/21.1 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson writes: > I think P4 will let you edit the submit message [...] How? I've tried to do this, but haven't figured out how to do it. DES -- Dag-Erling Smorgrav - des@ofug.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 17:49: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FF5037B41F; Tue, 16 Apr 2002 17:48:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by hub.freebsd.org (Postfix) with ESMTP id 0338D37B42F for ; Tue, 16 Apr 2002 17:48:33 -0700 (PDT) Received: (qmail 31651 invoked from network); 17 Apr 2002 00:48:30 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 17 Apr 2002 00:48:30 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g3H0mSv78445; Tue, 16 Apr 2002 20:48:28 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Tue, 16 Apr 2002 20:47:26 -0400 (EDT) From: John Baldwin To: Dag-Erling Smorgrav Subject: Re: PERFORCE change 9842 for review Cc: Perforce Change Reviews Cc: Perforce Change Reviews , "Brian F. Feldman" , Robert Watson Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 17-Apr-2002 Dag-Erling Smorgrav wrote: > Robert Watson writes: >> I think P4 will let you edit the submit message [...] > > How? I've tried to do this, but haven't figured out how to do it. p4 change #### perhaps? -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 17:50:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AD4F37B41A; Tue, 16 Apr 2002 17:50:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by hub.freebsd.org (Postfix) with ESMTP id 3BEC437B400; Tue, 16 Apr 2002 17:50:03 -0700 (PDT) Received: by flood.ping.uio.no (Postfix, from userid 2602) id 37E43530B; Wed, 17 Apr 2002 02:49:59 +0200 (CEST) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: John Baldwin Cc: Perforce Change Reviews , "Brian F. Feldman" , Robert Watson Subject: Re: PERFORCE change 9842 for review References: From: Dag-Erling Smorgrav Date: 17 Apr 2002 02:49:58 +0200 In-Reply-To: Message-ID: Lines: 14 User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/21.1 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin writes: > On 17-Apr-2002 Dag-Erling Smorgrav wrote: > > Robert Watson writes: > > > I think P4 will let you edit the submit message [...] > > How? I've tried to do this, but haven't figured out how to do it. > p4 change #### perhaps? Didn't work - it started an editor with the change description, but the file was read-only, and modifying it didn't do anything (or didn't seem to, anyway) DES -- Dag-Erling Smorgrav - des@ofug.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 17:56:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 650FD37B416; Tue, 16 Apr 2002 17:56:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BD01437B405 for ; Tue, 16 Apr 2002 17:56:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3H0uNP94730 for perforce@freebsd.org; Tue, 16 Apr 2002 17:56:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 16 Apr 2002 17:56:23 -0700 (PDT) Message-Id: <200204170056.g3H0uNP94730@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9866 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9866 Change 9866 by rwatson@rwatson_curry on 2002/04/16 17:56:01 NOTES now lives in two directories--MI in sys/conf, and MD in each sys//conf. During the last integ, I removed the MAC-related options from the MD NOTES file. This commit re-adds them to the MI NOTES file. Affected files ... ... //depot/projects/trustedbsd/mac/sys/conf/NOTES#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/NOTES#2 (text+ko) ==== @@ -696,6 +696,17 @@ options _KPOSIX_PRIORITY_SCHEDULING options _KPOSIX_VERSION=199309L +##################################################################### +# SECURITY POLICY PARAMETERS + +# Support for Mandatory Access Control (MAC) +options MAC +options MAC_BIBA +options MAC_MLS +options MAC_NONE +options MAC_TE +options SEBSD #Warning, won't boot without a policy + ##################################################################### # CLOCK OPTIONS To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 18:17:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25C0437B416; Tue, 16 Apr 2002 18:17:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 56FE337B405 for ; Tue, 16 Apr 2002 18:17:50 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3H1Hov01341 for perforce@freebsd.org; Tue, 16 Apr 2002 18:17:50 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 16 Apr 2002 18:17:50 -0700 (PDT) Message-Id: <200204170117.g3H1Hov01341@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9868 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9868 Change 9868 by peter@peter_thunder on 2002/04/16 18:17:21 merge glitch Affected files ... ... //depot/projects/ia64/gnu/lib/Makefile#5 edit Differences ... ==== //depot/projects/ia64/gnu/lib/Makefile#5 (text+ko) ==== @@ -27,6 +27,5 @@ .if !defined(NO_FORTRAN) SUBDIR+= libg2c .endif -.endif .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 18:20:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71C7E37B430; Tue, 16 Apr 2002 18:19:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from finntroll.newgold.net (Durham-ar1-4-64-252-019.dsl.genuity.net [4.64.252.19]) by hub.freebsd.org (Postfix) with SMTP id 5F7EA37B41D for ; Tue, 16 Apr 2002 18:19:23 -0700 (PDT) Received: (qmail 15905 invoked by uid 1001); 17 Apr 2002 01:25:12 -0000 Date: Wed, 17 Apr 2002 01:25:12 +0000 From: "J. Mallett" To: Dag-Erling Smorgrav Cc: Robert Watson , "Brian F. Feldman" , John Baldwin , Perforce Change Reviews Subject: Re: PERFORCE change 9842 for review Message-ID: <20020417012511.GA11969@FreeBSD.ORG> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.27i Organisation: FreeBSD Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, Apr 17, 2002 at 02:40:18AM +0200, Dag-Erling Smorgrav wrote: > Robert Watson writes: > > I think P4 will let you edit the submit message [...] > > How? I've tried to do this, but haven't figured out how to do it. p4 change Tada. > > DES > -- > Dag-Erling Smorgrav - des@ofug.org -- jmallett@FreeBSD.org | C, MIPS, POSIX, UNIX, BSD, IRC Geek. http://www.FreeBSD.org | The Power to Serve "We all need mirrors to remind ourselves who we are -- I'm no different." To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 18:20:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D765B37B48B; Tue, 16 Apr 2002 18:20:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BFD8837B43E for ; Tue, 16 Apr 2002 18:19:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3H1JrA01695 for perforce@freebsd.org; Tue, 16 Apr 2002 18:19:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 16 Apr 2002 18:19:53 -0700 (PDT) Message-Id: <200204170119.g3H1JrA01695@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9869 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9869 Change 9869 by rwatson@rwatson_tislabs on 2002/04/16 18:19:01 Sync changes in GENERIC from integ to MAC kernel Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#21 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.332 2001/12/14 16:27:08 iedowse Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.338 2002/04/09 11:18:38 phk Exp $ machine i386 cpu I486_CPU @@ -39,7 +39,7 @@ #options SEBSD #Warning, won't boot without a policy options INET #InterNETworking -options INET6 +options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support options UFS_DIRHASH #Improve performance on big directories @@ -52,9 +52,6 @@ options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI -options UCONSOLE #Allow users to grab the console -#options USERCONFIG #boot -c editor -#options VISUAL_USERCONFIG #visual boot -c editor options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues @@ -68,8 +65,8 @@ options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS options WITNESS #Enable mutex checks to detects deadlocks and cycles -options WITNESS_SKIPSPIN -options ALT_BREAK_TO_DEBUGGER +options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +options ALT_BREAK_TO_DEBUGGER # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel @@ -111,7 +108,9 @@ # RAID controllers interfaced to the SCSI subsystem device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID +device ciss # Compaq Smart RAID 5* device dpt # DPT Smartcache III, IV - See NOTES for options! +device iir # Intel Integrated RAID device mly # Mylex AcceleRAID/eXtremeRAID # SCSI peripherals To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 18:26:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC9EC37B400; Tue, 16 Apr 2002 18:26:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F17D537B41F for ; Tue, 16 Apr 2002 18:26:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3H1Q0U02503 for perforce@freebsd.org; Tue, 16 Apr 2002 18:26:00 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 16 Apr 2002 18:26:00 -0700 (PDT) Message-Id: <200204170126.g3H1Q0U02503@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9870 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9870 Change 9870 by peter@peter_thunder on 2002/04/16 18:25:34 grump. crtbegin.asm in gcc is still hosed. I must have tested with the wrong files crt*.o or libc.so.5 or something. Affected files ... ... //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#7 edit ... //depot/projects/ia64/lib/libc/ia64/gen/cxa.c#3 add Differences ... ==== //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#7 (text+ko) ==== @@ -9,3 +9,6 @@ # The following may go away if function _Unwind_FindTableEntry() # will be part of GCC. SRCS+= unwind.c + +# The following will go away if gcc ever fixes their crtbegin.asm bug +SRCS+= cxa.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 18:34:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 606C237B41E; Tue, 16 Apr 2002 18:34:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by hub.freebsd.org (Postfix) with ESMTP id 106C437B416; Tue, 16 Apr 2002 18:34:48 -0700 (PDT) Received: by flood.ping.uio.no (Postfix, from userid 2602) id 7272D5309; Wed, 17 Apr 2002 03:34:44 +0200 (CEST) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: "J. Mallett" Cc: Robert Watson , "Brian F. Feldman" , John Baldwin , Perforce Change Reviews Subject: Re: PERFORCE change 9842 for review References: <20020417012511.GA11969@FreeBSD.ORG> From: Dag-Erling Smorgrav Date: 17 Apr 2002 03:34:44 +0200 In-Reply-To: <20020417012511.GA11969@FreeBSD.ORG> Message-ID: Lines: 13 User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/21.1 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG "J. Mallett" writes: > On Wed, Apr 17, 2002 at 02:40:18AM +0200, Dag-Erling Smorgrav wrote: > > Robert Watson writes: > > > I think P4 will let you edit the submit message [...] > > How? I've tried to do this, but haven't figured out how to do it. > p4 change As noted previously, it doesn't work. P4 calls up an editor with a read-only file and ignores any changes I make to it. DES -- Dag-Erling Smorgrav - des@ofug.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 21:47:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4B9137B41A; Tue, 16 Apr 2002 21:47:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 305E437B416 for ; Tue, 16 Apr 2002 21:47:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3H4lJS43947 for perforce@freebsd.org; Tue, 16 Apr 2002 21:47:19 -0700 (PDT) (envelope-from des@freebsd.org) Date: Tue, 16 Apr 2002 21:47:19 -0700 (PDT) Message-Id: <200204170447.g3H4lJS43947@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9880 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9880 Change 9880 by des@des.at.des.thinksec.com on 2002/04/16 21:46:51 Add a null conversation function. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/MANIFEST#8 edit ... //depot/projects/openpam/include/security/openpam.h#19 edit ... //depot/projects/openpam/lib/Makefile#15 edit ... //depot/projects/openpam/lib/openpam_nullconv.c#1 add Differences ... ==== //depot/projects/openpam/MANIFEST#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#7 $ +# $P4: //depot/projects/openpam/MANIFEST#8 $ # CREDITS HISTORY @@ -70,6 +70,7 @@ lib/openpam_impl.h lib/openpam_load.c lib/openpam_log.c +lib/openpam_nullconv.c lib/openpam_restore_cred.c lib/openpam_set_option.c lib/openpam_static.c ==== //depot/projects/openpam/include/security/openpam.h#19 (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#18 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#19 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED @@ -164,6 +164,14 @@ void *_data); /* + * Null conversation function + */ +int openpam_nullconv(int _n, + const struct pam_message **_msg, + struct pam_response **_resp, + void *_data); + +/* * PAM primitives */ enum { ==== //depot/projects/openpam/lib/Makefile#15 (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/Makefile#14 $ +# $P4: //depot/projects/openpam/lib/Makefile#15 $ # LIB = pam @@ -53,6 +53,7 @@ SRCS += openpam_get_option.c SRCS += openpam_load.c SRCS += openpam_log.c +SRCS += openpam_nullconv.c SRCS += openpam_restore_cred.c SRCS += openpam_set_option.c SRCS += openpam_static.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 22:27:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C888237B41A; Tue, 16 Apr 2002 22:27:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 233DE37B419 for ; Tue, 16 Apr 2002 22:27:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3H5RBQ53393 for perforce@freebsd.org; Tue, 16 Apr 2002 22:27:11 -0700 (PDT) (envelope-from des@freebsd.org) Date: Tue, 16 Apr 2002 22:27:11 -0700 (PDT) Message-Id: <200204170527.g3H5RBQ53393@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9889 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9889 Change 9889 by des@des.at.des.thinksec.com on 2002/04/16 22:26:16 Set rsp to NULL before calling the conversation function, so we can later detect if it hasn't been touched. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/lib/pam_vprompt.c#6 edit Differences ... ==== //depot/projects/openpam/lib/pam_vprompt.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/pam_vprompt.c#5 $ + * $P4: //depot/projects/openpam/lib/pam_vprompt.c#6 $ */ #include @@ -72,6 +72,7 @@ msg.msg_style = style; msg.msg = msgbuf; msgp = &msg; + rsp = NULL; r = (conv->conv)(1, &msgp, &rsp, conv->appdata_ptr); *resp = rsp == NULL ? NULL : rsp->resp; free(rsp); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 16 23:34:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3E3B37B405; Tue, 16 Apr 2002 23:34:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2AD5E37B42A for ; Tue, 16 Apr 2002 23:34:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3H6Yie68545 for perforce@freebsd.org; Tue, 16 Apr 2002 23:34:44 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 16 Apr 2002 23:34:44 -0700 (PDT) Message-Id: <200204170634.g3H6Yie68545@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9894 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9894 Change 9894 by peter@peter_thunder on 2002/04/16 23:34:14 OK, this is pretty gross, but teach fdisk(8) how to initialize an mbr without having to read /boot/mbr (which does not exist on ia64 - it has no bootblocks at all) Affected files ... ... //depot/projects/ia64/sbin/fdisk/fdisk.c#4 edit Differences ... ==== //depot/projects/ia64/sbin/fdisk/fdisk.c#4 (text+ko) ==== @@ -471,6 +471,7 @@ static void init_boot(void) { +#ifndef __ia64__ const char *fname; int fdesc, n; struct stat sb; @@ -490,6 +491,15 @@ err(1, "%s", fname); if (n != mboot.bootinst_size) errx(1, "%s: short read", fname); +#else + if (mboot.bootinst != NULL) + free(mboot.bootinst); + mboot.bootinst_size = secsize; + if ((mboot.bootinst = malloc(mboot.bootinst_size)) == NULL) + errx(1, "unable to allocate boot block buffer"); + memset(mboot.bootinst, 0, mboot.bootinst_size); + *(uint16_t *)&mboot.bootinst[MBRSIGOFF] = BOOT_MAGIC; +#endif } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 8: 9:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A050E37B404; Wed, 17 Apr 2002 08:09:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9023D37B41C for ; Wed, 17 Apr 2002 08:09:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HF9fd96118 for perforce@freebsd.org; Wed, 17 Apr 2002 08:09:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 17 Apr 2002 08:09:41 -0700 (PDT) Message-Id: <200204171509.g3HF9fd96118@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9908 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9908 Change 9908 by rwatson@rwatson_tislabs on 2002/04/17 08:09:28 Remove XXX for __mac_get_proc, since it used td_ucred not p_ucred so doesn't require proc locking. __mac_set_proc still needs fixing. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#124 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#124 (text+ko) ==== @@ -1442,7 +1442,6 @@ /* * MPSAFE - * XXX Proc Locking */ int __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 9: 0:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B03537B405; Wed, 17 Apr 2002 08:59:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5544637B41A for ; Wed, 17 Apr 2002 08:59:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HFxnJ05061 for perforce@freebsd.org; Wed, 17 Apr 2002 08:59:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 17 Apr 2002 08:59:49 -0700 (PDT) Message-Id: <200204171559.g3HFxnJ05061@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9913 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9913 Change 9913 by rwatson@rwatson_tislabs on 2002/04/17 08:59:13 Remove use of an SX lock to protect the MAC policy chain. Instead, use a mutex to protect the list in addition to a busy count. Read-only consumers of the list (such as policy evaluation entry points) will lock the mutex, increment the busy count, and release the lock, prevent long-term holding of a lock and interference with lock orders (as well as permitting recursion). When done, they'll grab the lock, decrement the busy count, and release it. Exclusive consumers, such as those registering and unregistering policies, grab the mutex, check that the busy count is zero, and return EBUSY if it is. They then hold the mutex for the duration of the list modification, as well as the entry points for module initialization and shutdown. It may be eventually we need two classes of busy to avoid that. Note: no waiting occurs if the list is busy and exclusive access is required. This means that kldloading a module can fail with EBUSY if a policy check is occurring simultaneously. As Giant gets pushed down, this will become an issue. Eventually, a CV should be used to wake up consumers waiting on exclusive access so that this does not occur. This commit gets rid of the various lock order warnings concerning the MAC policy lock. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#125 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#125 (text+ko) ==== @@ -134,9 +134,28 @@ * operations, locks should be held for the entire compound operation, * and that this is not yet done for relabel requests. */ -static struct sx mac_policy_list_lock; +static struct mtx mac_policy_list_lock; static LIST_HEAD(, mac_policy_conf) mac_policy_list; +static int mac_policy_list_busy; +#define MAC_POLICY_LIST_LOCKINIT() mtx_init(&mac_policy_list_lock, \ + "mac_policy_list_lock", NULL, MTX_DEF); +#define MAC_POLICY_LIST_LOCK() mtx_lock(&mac_policy_list_lock); +#define MAC_POLICY_LIST_UNLOCK() mtx_unlock(&mac_policy_list_lock); +#define MAC_POLICY_LIST_BUSY() do { \ + MAC_POLICY_LIST_LOCK(); \ + mac_policy_list_busy++; \ + MAC_POLICY_LIST_UNLOCK(); \ +} while (0) + +#define MAC_POLICY_LIST_UNBUSY() do { \ + MAC_POLICY_LIST_LOCK(); \ + mac_policy_list_busy--; \ + if (mac_policy_list_busy < 0) \ + panic("Extra mac_policy_list_busy--"); \ + MAC_POLICY_LIST_UNLOCK(); \ +} while (0) + /* * MAC_CHECK performs the designated check by walking the policy * module list and checking with each as to how it feels about the @@ -147,14 +166,14 @@ struct mac_policy_conf *mpc; \ \ error = 0; \ - sx_slock(&mac_policy_list_lock); \ + MAC_POLICY_LIST_BUSY(); \ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ - if (mpc->mpc_ops.mpo_ ## check != NULL) \ + if (mpc->mpc_ops.mpo_ ## check != NULL) \ error = error_select( \ mpc->mpc_ops.mpo_ ## check (## args), \ error); \ } \ - sx_sunlock(&mac_policy_list_lock); \ + MAC_POLICY_LIST_UNBUSY(); \ } while (0) /* @@ -168,13 +187,13 @@ #define MAC_BOOLEAN(operation, composition, args...) do { \ struct mac_policy_conf *mpc; \ \ - sx_slock(&mac_policy_list_lock); \ + MAC_POLICY_LIST_BUSY(); \ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ if (mpc->mpc_ops.mpo_ ## operation != NULL) \ result = result composition \ mpc->mpc_ops.mpo_ ## operation ( ## args); \ } \ - sx_sunlock(&mac_policy_list_lock); \ + MAC_POLICY_LIST_UNBUSY(); \ } while (0) /* @@ -184,12 +203,12 @@ #define MAC_PERFORM(operation, args...) do { \ struct mac_policy_conf *mpc; \ \ - sx_slock(&mac_policy_list_lock); \ + MAC_POLICY_LIST_BUSY(); \ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ if (mpc->mpc_ops.mpo_ ## operation != NULL) \ mpc->mpc_ops.mpo_ ## operation (## args); \ } \ - sx_sunlock(&mac_policy_list_lock); \ + MAC_POLICY_LIST_UNBUSY(); \ } while (0) /* @@ -200,7 +219,7 @@ { LIST_INIT(&mac_policy_list); - sx_init(&mac_policy_list_lock, "MAC policy chain lock"); + MAC_POLICY_LIST_LOCKINIT(); } /* @@ -480,17 +499,21 @@ return (EINVAL); } } - sx_xlock(&mac_policy_list_lock); + MAC_POLICY_LIST_LOCK(); + if (mac_policy_list_busy > 0) { + MAC_POLICY_LIST_UNLOCK(); + return (EBUSY); + } LIST_FOREACH(tmpc, &mac_policy_list, mpc_list) { if (strcmp(tmpc->mpc_name, mpc->mpc_name) == 0) { - sx_xunlock(&mac_policy_list_lock); + MAC_POLICY_LIST_UNLOCK(); return (EEXIST); } } if (mpc->mpc_field_off) { slot = ffs(mac_policies_free); if (slot == 0) { - sx_xunlock(&mac_policy_list_lock); + MAC_POLICY_LIST_UNLOCK(); return (ENOMEM); } slot--; @@ -505,7 +528,7 @@ /* Per-policy initialization. */ if (mpc->mpc_ops.mpo_init != NULL) (*(mpc->mpc_ops.mpo_init))(mpc); - sx_xunlock(&mac_policy_list_lock); + MAC_POLICY_LIST_UNLOCK(); return (0); } @@ -519,12 +542,16 @@ */ if (mpc->mpc_field_off != -1) return (EBUSY); - sx_xlock(&mac_policy_list_lock); + MAC_POLICY_LIST_LOCK(); + if (mac_policy_list_busy > 0) { + MAC_POLICY_LIST_UNLOCK(); + return (EBUSY); + } if (mpc->mpc_ops.mpo_destroy != NULL) (*(mpc->mpc_ops.mpo_destroy))(mpc); LIST_REMOVE(mpc, mpc_list); - sx_xunlock(&mac_policy_list_lock); + MAC_POLICY_LIST_UNLOCK(); return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 9:50:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D2C937B417; Wed, 17 Apr 2002 09:50:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7C3DA37B419 for ; Wed, 17 Apr 2002 09:50:51 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HGopi20409 for perforce@freebsd.org; Wed, 17 Apr 2002 09:50:51 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 17 Apr 2002 09:50:51 -0700 (PDT) Message-Id: <200204171650.g3HGopi20409@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9916 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9916 Change 9916 by peter@peter_thunder on 2002/04/17 09:50:45 fix nfsd for ia64. missing strdup() prototype. (!) Affected files ... ... //depot/projects/ia64/sbin/nfsd/nfsd.c#3 edit Differences ... ==== //depot/projects/ia64/sbin/nfsd/nfsd.c#3 (text+ko) ==== @@ -69,7 +69,7 @@ #include #include #include -#include +#include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 9:52: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C23037B419; Wed, 17 Apr 2002 09:52:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7D96937B404 for ; Wed, 17 Apr 2002 09:51:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HGpqn20649 for perforce@freebsd.org; Wed, 17 Apr 2002 09:51:52 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 17 Apr 2002 09:51:52 -0700 (PDT) Message-Id: <200204171651.g3HGpqn20649@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 9917 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9917 Change 9917 by peter@peter_thunder on 2002/04/17 09:51:43 calm down gcc 3.1 Affected files ... ... //depot/projects/ia64/sbin/nfsd/nfsd.c#4 edit Differences ... ==== //depot/projects/ia64/sbin/nfsd/nfsd.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static const char copyright[] = "@(#) Copyright (c) 1989, 1993, 1994\n\ The Regents of the University of California. All rights reserved.\n"; -#endif not lint +#endif /* not lint */ #ifndef lint #if 0 @@ -46,7 +46,7 @@ #endif static const char rcsid[] = "$FreeBSD: src/sbin/nfsd/nfsd.c,v 1.23 2002/03/26 17:37:59 pb Exp $"; -#endif not lint +#endif /* not lint */ #include #include @@ -741,6 +741,7 @@ } break; default: + break; } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 10:29:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C99F37B404; Wed, 17 Apr 2002 10:28:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by hub.freebsd.org (Postfix) with ESMTP id 1BE8437B417 for ; Wed, 17 Apr 2002 10:28:46 -0700 (PDT) Received: (qmail 15030 invoked from network); 17 Apr 2002 17:28:45 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 17 Apr 2002 17:28:45 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g3HHSiv81321; Wed, 17 Apr 2002 13:28:45 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200204171559.g3HFxnJ05061@freefall.freebsd.org> Date: Wed, 17 Apr 2002 13:27:48 -0400 (EDT) From: John Baldwin To: Robert Watson Subject: RE: PERFORCE change 9913 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 17-Apr-2002 Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9913 > > Change 9913 by rwatson@rwatson_tislabs on 2002/04/17 08:59:13 > > Remove use of an SX lock to protect the MAC policy chain. Instead, > use a mutex to protect the list in addition to a busy count. > Read-only consumers of the list (such as policy evaluation entry > points) will lock the mutex, increment the busy count, and release > the lock, prevent long-term holding of a lock and interference > with lock orders (as well as permitting recursion). When done, > they'll grab the lock, decrement the busy count, and release it. > Exclusive consumers, such as those registering and unregistering > policies, grab the mutex, check that the busy count is zero, > and return EBUSY if it is. They then hold the mutex for the > duration of the list modification, as well as the entry points for > module initialization and shutdown. It may be eventually we need > two classes of busy to avoid that. > > Note: no waiting occurs if the list is busy and exclusive access > is required. This means that kldloading a module can fail with > EBUSY if a policy check is occurring simultaneously. As Giant > gets pushed down, this will become an issue. Eventually, a CV > should be used to wake up consumers waiting on exclusive access > so that this does not occur. > > This commit gets rid of the various lock order warnings concerning > the MAC policy lock. So basically you just reinvented sx locks but they don't get checked for lock order reversals. If possible, I think you should go back to using sx locks but find out where the reversal is occuring and fix that. You can use a sx_try_xlock() to handle the EBUSY case. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 11: 1:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0892737B405; Wed, 17 Apr 2002 11:01:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 45F4D37B400 for ; Wed, 17 Apr 2002 11:01:18 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HI1Id36075 for perforce@freebsd.org; Wed, 17 Apr 2002 11:01:18 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Wed, 17 Apr 2002 11:01:18 -0700 (PDT) Message-Id: <200204171801.g3HI1Id36075@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9921 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9921 Change 9921 by jhb@jhb_laptop on 2002/04/17 11:00:44 Only malloc newprocsig if we need it. To make this nicer we need a procsig_alloc/hold/free(drop?)/dup/shared. At some point I would like a standard naming scheme for all our refcounted objects as above. Note that if _alloc() sets the refcount appropriately, then it won't need to use separate drop/free routines. I also would like for us to use common names for all these refcount operations. Affected files ... ... //depot/projects/smpng/sys/kern/kern_exec.c#34 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exec.c#34 (text+ko) ==== @@ -134,7 +134,7 @@ struct vattr attr; int (*img_first)(struct image_params *); struct pargs *oldargs, *newargs = NULL; - struct procsig *newprocsig = NULL; + struct procsig *oldprocsig, *newprocsig; struct vnode *tracevp = NULL, *textvp = NULL; imgp = &image_params; @@ -299,8 +299,6 @@ /* * Malloc things before we need locks. */ - MALLOC(newprocsig, struct procsig *, sizeof(struct procsig), - M_SUBPROC, M_WAITOK); newcred = crget(); i = imgp->endargs - imgp->stringbase; if (ps_arg_cache_limit >= i + sizeof(struct pargs)) @@ -318,10 +316,15 @@ PROC_LOCK(p); mp_fixme("procsig needs a lock"); if (p->p_procsig->ps_refcnt > 1) { - bcopy(p->p_procsig, newprocsig, sizeof(*newprocsig)); - p->p_procsig->ps_refcnt--; + oldprocsig = p->p_procsig; + PROC_UNLOCK(p); + MALLOC(newprocsig, struct procsig *, sizeof(struct procsig), + M_SUBPROC, M_WAITOK); + bcopy(oldprocsig, newprocsig, sizeof(*newprocsig)); + newprocsig->ps_refcnt = 1; + oldprocsig->ps_refcnt--; + PROC_LOCK(p); p->p_procsig = newprocsig; - p->p_procsig->ps_refcnt = 1; if (p->p_sigacts == &p->p_uarea->u_sigacts) panic("shared procsig but private sigacts?"); @@ -458,8 +461,6 @@ /* * Free any resources malloc'd earlier that we didn't use. */ - if (newprocsig != NULL) - FREE(newprocsig, M_SUBPROC); if (newcred == NULL) crfree(oldcred); else To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 11:21:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91F2337B417; Wed, 17 Apr 2002 11:19:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 103CA37B405 for ; Wed, 17 Apr 2002 11:19:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HIJfC42819 for perforce@freebsd.org; Wed, 17 Apr 2002 11:19:41 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Wed, 17 Apr 2002 11:19:41 -0700 (PDT) Message-Id: <200204171819.g3HIJfC42819@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 9923 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9923 Change 9923 by cvance@cvance_korben on 2002/04/17 11:18:44 A bunch of small changes necessary to build some portions of the security server from userspace. This functionality is needed to build a policy. - Fixed includes - Correctly ifdef'd policy writing routines - replaced malloc/free with a macro Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/linux-compat.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/avtab.c#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/avtab.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/ebitmap.c#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/ebitmap.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/fileutils.c#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/fileutils.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/hashtab.c#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/hashtab.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/init.c#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/mls.c#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/policydb.c#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/queue.c#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services_private.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#3 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/symtab.c#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/syscalls.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#2 (text+ko) ==== @@ -14,13 +14,16 @@ */ #ifdef __FreeBSD__ +#include #include #include #include #include +#ifdef _KERNEL MALLOC_DECLARE(M_SEBSD_AVC); +#endif /* _KERNEL */ #else /* __FreeBSD__ */ #include ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/linux-compat.h#2 (text+ko) ==== @@ -51,10 +51,27 @@ typedef u_int16_t __u16; typedef u_int8_t __u8; + +#ifdef _KERNEL #define le32_to_cpu(a) le32toh(a) #define le64_to_cpu(a) le64toh(a) +#else /* !_KERNEL */ -#else /* __FreeBSD__ */ +#if BYTE_ORDER == LITTLE_ENDIAN +#define cpu_to_le32(x) ((__uint32_t)(x)) +#define cpu_to_le64(x) ((__uint64_t)(x)) +#define le32_to_cpu(x) ((__uint32_t)(x)) +#define le64_to_cpu(x) ((__uint64_t)(x)) +#else /* BYTE_ORDER != LITTLE_ENDIAN */ +#define cpu_to_le32(x) bswap32((x)) +#define cpu_to_le64(x) bswap64((x)) +#define le32_to_cpu(x) bswap32((x)) +#define le64_to_cpu(x) bswap64((x)) +#endif /* BYTE_ORDER */ + +#endif /* _KERNEL */ + +#else /* !__FreeBSD__ */ /* Should be Linux */ /* printk */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#2 (text+ko) ==== @@ -37,7 +37,10 @@ #ifndef _SYS_SECURITY_SEBSD_H #define _SYS_SECURITY_SEBSD_H +#ifdef _KERNEL MALLOC_DECLARE(M_SEBSD); +#endif /* _KERNEL */ + extern int avc_debug_always_allow; extern int security_init(void); ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/avtab.c#2 (text+ko) ==== @@ -8,11 +8,11 @@ */ - +#if defined(__FreeBSD__) && defined(_KERNEL) #include -#include #include #include +#endif /* _KERNEL */ #include #include @@ -59,8 +59,8 @@ break; } - newnode = (avtab_ptr_t)malloc(sizeof(struct avtab_node), M_SEBSD_SS, - M_WAITOK | M_ZERO); + newnode = (avtab_ptr_t)sebsd_malloc(sizeof(struct avtab_node), + M_SEBSD_SS, M_WAITOK | M_ZERO); if (newnode == NULL) return -ENOMEM; /* memset(newnode, 0, sizeof(struct avtab_node)); */ @@ -126,11 +126,11 @@ while (cur != NULL) { temp = cur; cur = cur->next; - free(temp, M_SEBSD_SS); + sebsd_free(temp, M_SEBSD_SS); } h->htable[i] = NULL; } - free(h->htable, M_SEBSD_SS); + sebsd_free(h->htable, M_SEBSD_SS); } @@ -164,8 +164,8 @@ { int i; - h->htable = malloc(sizeof(avtab_ptr_t)*AVTAB_SIZE, - M_SEBSD_SS, M_WAITOK | M_ZERO); + h->htable = sebsd_malloc(sizeof(avtab_ptr_t)*AVTAB_SIZE, + M_SEBSD_SS, M_WAITOK | M_ZERO); if (!h->htable) return -1; for (i = 0; i < AVTAB_SIZE; i++) @@ -293,8 +293,7 @@ } -#ifndef __FreeBSD__ /* TBD */ -#ifndef __KERNEL__ +#if !defined(__KERNEL__) && !defined(_KERNEL) int avtab_write(avtab_t * a, FILE * fp) { int i; @@ -349,5 +348,5 @@ return 0; } -#endif -#endif /* __FreeBSD__ */ /* TBD */ +#endif /* KERNEL */ + ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/avtab.h#2 (text+ko) ==== @@ -73,11 +73,9 @@ int avtab_read(avtab_t * a, FILE * fp, __u32 config); -#ifndef __FreeBSD__ /* TBD */ -#ifndef __KERNEL__ +#if !defined(__KERNEL__) && !defined(_KERNEL) int avtab_write(avtab_t * a, FILE * fp); -#endif -#endif /* __FreeBSD__ */ /* TBD */ +#endif /* KERNEL */ #endif /* _AVTAB_H_ */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/ebitmap.c#2 (text+ko) ==== @@ -7,10 +7,12 @@ * Implementation of the extensible bitmap type. */ + +#if defined(__FreeBSD__) && defined(_KERNEL) #include -#include #include #include +#endif /* FreeBSD _KERNEL */ #include #include @@ -27,8 +29,9 @@ n2 = e2->node; prev = 0; while (n1 || n2) { - new = (ebitmap_node_t *) malloc(sizeof(ebitmap_node_t), - M_SEBSD_SS, M_WAITOK | M_ZERO); + new = (ebitmap_node_t *) sebsd_malloc(sizeof(ebitmap_node_t), + M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!new) { ebitmap_destroy(dst); return FALSE; @@ -95,8 +98,9 @@ n = src->node; prev = 0; while (n) { - new = (ebitmap_node_t *) malloc(sizeof(ebitmap_node_t), - M_SEBSD_SS, M_WAITOK | M_ZERO); + new = (ebitmap_node_t *) sebsd_malloc(sizeof(ebitmap_node_t), + M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!new) { ebitmap_destroy(dst); return FALSE; @@ -201,7 +205,7 @@ else e->node = n->next; - free(n, M_SEBSD_SS); + sebsd_free(n, M_SEBSD_SS); } } return TRUE; @@ -213,8 +217,8 @@ if (!value) return TRUE; - new = (ebitmap_node_t *) malloc(sizeof(ebitmap_node_t), - M_SEBSD_SS, M_WAITOK | M_ZERO); + new = (ebitmap_node_t *) sebsd_malloc(sizeof(ebitmap_node_t), + M_SEBSD_SS, M_WAITOK | M_ZERO); if (!new) return FALSE; /* memset(new, 0, sizeof(ebitmap_node_t)); */ @@ -250,7 +254,7 @@ while (n) { temp = n; n = n->next; - free(temp, M_SEBSD_SS); + sebsd_free(temp, M_SEBSD_SS); } e->highbit = 0; @@ -295,8 +299,9 @@ printf("security: ebitmap: truncated map\n"); goto bad; } - n = (ebitmap_node_t *) malloc(sizeof(ebitmap_node_t), - M_SEBSD_SS, M_WAITOK | M_ZERO); + n = (ebitmap_node_t *) sebsd_malloc(sizeof(ebitmap_node_t), + M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!n) { printf("security: ebitmap: out of memory\n"); goto bad; @@ -339,15 +344,14 @@ return TRUE; bad_free: - free(n, M_SEBSD_SS); + sebsd_free(n, M_SEBSD_SS); bad: ebitmap_destroy(e); return FALSE; } -#ifndef __FreeBSD__ /* TBD */ -#ifndef __KERNEL__ +#if !defined(__KERNEL__) && !defined(_KERNEL) int ebitmap_write(ebitmap_t * e, FILE * fp) { ebitmap_node_t *n; @@ -381,8 +385,7 @@ return TRUE; } -#endif -#endif /* __FreeBSD__ */ /* TBD */ +#endif /* KERNEL */ /* FLASK */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/ebitmap.h#2 (text+ko) ==== @@ -66,11 +66,9 @@ int ebitmap_read(ebitmap_t * e, FILE * fp); -#ifndef __FreeBSD__ /* TBD */ -#ifndef __KERNEL__ +#if !defined(__KERNEL__) && !defined(_KERNEL) int ebitmap_write(ebitmap_t * e, FILE * fp); -#endif -#endif /* __FreeBSD__ */ /* TBD */ +#endif /* KERNEL */ #endif /* _EBITMAP_H_ */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/fileutils.c#2 (text+ko) ==== @@ -36,11 +36,11 @@ #ifdef __FreeBSD__ #include +#include #include #include #include -#include #include #include #include @@ -55,7 +55,7 @@ error = vn_close(fp->FILE_vp, fp->FILE_saved_open_flags, curthread->td_ucred, curthread); - free(fp, M_TEMP); + sebsd_free(fp, M_TEMP); return (error); } @@ -69,7 +69,7 @@ if (strcmp(type, "r") != 0) return (NULL); - fp = malloc(sizeof(*fp), M_TEMP, M_WAITOK | M_ZERO); + fp = sebsd_malloc(sizeof(*fp), M_TEMP, M_WAITOK | M_ZERO); fp->FILE_saved_open_flags = FREAD; NDINIT(&nd, LOOKUP, LOCKLEAF, UIO_SYSSPACE, path, td); error = vn_open(&nd, &fp->FILE_saved_open_flags, 0); ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/fileutils.h#2 (text+ko) ==== @@ -38,11 +38,12 @@ #define _FILEUTILS_H_ #ifdef __FreeBSD__ +#ifdef _KERNEL #include +#include #include #include #include -#include typedef struct kFILE { struct uio FILE_uio; @@ -54,7 +55,9 @@ int fclose(FILE *fp); FILE *fopen(const char *path, const char *type); size_t fread(void *ptr, size_t size, size_t nmemb, FILE *fp); - +#else /* _KERNEL */ +#include +#endif /* _KERNEL */ #endif /* __FreeBSD__ */ #endif /* _FILEUTILS_H_ */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#2 (text+ko) ==== @@ -21,9 +21,20 @@ * This variable is set to one when the security server * has completed initialization. */ -extern int ss_initialized; +#include +#ifdef _KERNEL MALLOC_DECLARE(M_SEBSD_SS); +#define sebsd_malloc(a,b,c) malloc(a,b,c) +#define sebsd_free(a,b) free(a,b) +#else /* _KERNEL */ +#include +#include +#define sebsd_malloc(a,b,c) (c&M_ZERO)?calloc(1,a):malloc(a) +#define sebsd_free(a,b) free(a) +#endif /* _KERNEL */ + +extern int ss_initialized; #ifdef __TDB_CDV__ #include /* printk */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/hashtab.c#2 (text+ko) ==== @@ -7,10 +7,11 @@ * Implementation of the hash table type. */ +#if defined(__FreeBSD__) && defined(_KERNEL) #include -#include #include #include +#endif /* FreeBSD _KERNEL */ #include #include @@ -27,8 +28,8 @@ int i; - p = (hashtab_t) malloc(sizeof(hashtab_val_t), - M_SEBSD_SS, M_WAITOK | M_ZERO); + p = (hashtab_t) sebsd_malloc(sizeof(hashtab_val_t), + M_SEBSD_SS, M_WAITOK | M_ZERO); if (p == NULL) return p; @@ -37,10 +38,11 @@ p->nel = 0; p->hash_value = hash_value; p->keycmp = keycmp; - p->htable = (hashtab_ptr_t *) malloc(sizeof(hashtab_ptr_t) * size, - M_SEBSD_SS, M_WAITOK); + p->htable = (hashtab_ptr_t *) sebsd_malloc(sizeof(hashtab_ptr_t) *size, + M_SEBSD_SS, + M_WAITOK); if (p->htable == NULL) { - free(p, M_SEBSD_SS); + sebsd_free(p, M_SEBSD_SS); return NULL; } for (i = 0; i < size; i++) @@ -70,8 +72,8 @@ if (cur && (h->keycmp(h, key, cur->key) == 0)) return HASHTAB_PRESENT; - newnode = (hashtab_ptr_t) malloc(sizeof(hashtab_node_t), - M_SEBSD_SS, M_WAITOK | M_ZERO); + newnode = (hashtab_ptr_t) sebsd_malloc(sizeof(hashtab_node_t), + M_SEBSD_SS, M_WAITOK | M_ZERO); if (newnode == NULL) return HASHTAB_OVERFLOW; /* memset(newnode, 0, sizeof(struct hashtab_node)); */ @@ -121,7 +123,7 @@ if (destroy) destroy(cur->key, cur->datum, args); - free(cur, M_SEBSD_SS); + sebsd_free(cur, M_SEBSD_SS); h->nel--; return HASHTAB_SUCCESS; } @@ -154,8 +156,9 @@ cur->key = key; cur->datum = datum; } else { - newnode = (hashtab_ptr_t) malloc(sizeof(hashtab_node_t), - M_SEBSD_SS, M_WAITOK | M_ZERO); + newnode = (hashtab_ptr_t) sebsd_malloc(sizeof(hashtab_node_t), + M_SEBSD_SS, + M_WAITOK | M_ZERO); if (newnode == NULL) return HASHTAB_OVERFLOW; /* memset(newnode, 0, sizeof(struct hashtab_node)); */ @@ -210,15 +213,15 @@ while (cur != NULL) { temp = cur; cur = cur->next; - free(temp, M_SEBSD_SS); + sebsd_free(temp, M_SEBSD_SS); } h->htable[i] = NULL; } - free(h->htable, M_SEBSD_SS); + sebsd_free(h->htable, M_SEBSD_SS); h->htable = NULL; - free(h, M_SEBSD_SS); + sebsd_free(h, M_SEBSD_SS); } @@ -280,7 +283,7 @@ cur = cur->next; if (destroy) destroy(temp->key, temp->datum, args); - free(temp, M_SEBSD_SS); + sebsd_free(temp, M_SEBSD_SS); h->nel--; } else { last = cur; ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/hashtab.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/init.c#2 (text+ko) ==== @@ -10,7 +10,6 @@ #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/mls.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/policydb.c#2 (text+ko) ==== @@ -6,11 +6,12 @@ /* * Implementation of the policy database. */ +#if defined(__FreeBSD__) && defined(_KERNEL) #include -#include #include #include #include +#endif /* FreeBSD _KERNEL */ #include #include @@ -47,14 +48,15 @@ char *key = 0; role_datum_t *role; - role = malloc(sizeof(role_datum_t), M_SEBSD_SS, M_WAITOK | M_ZERO); + role = sebsd_malloc(sizeof(role_datum_t), M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!role) return -1; /* memset(role, 0, sizeof(role_datum_t)); */ role->value = ++p->p_roles.nprim; if (role->value != OBJECT_R_VAL) return -1; - key = malloc(strlen(OBJECT_R)+1, M_SEBSD_SS, M_WAITOK); + key = sebsd_malloc(strlen(OBJECT_R)+1, M_SEBSD_SS, M_WAITOK); if (!key) return -1; strcpy(key, OBJECT_R); @@ -196,8 +198,8 @@ int policydb_index_classes(policydb_t * p) { p->p_common_val_to_name = (char **) - malloc(p->p_commons.nprim * sizeof(char *), - M_SEBSD_SS, M_WAITOK); + sebsd_malloc(p->p_commons.nprim * sizeof(char *), + M_SEBSD_SS, M_WAITOK); if (!p->p_common_val_to_name) return -1; @@ -205,14 +207,14 @@ return -1; p->class_val_to_struct = (class_datum_t **) - malloc(p->p_classes.nprim * sizeof(class_datum_t *), - M_SEBSD_SS, M_WAITOK); + sebsd_malloc(p->p_classes.nprim * sizeof(class_datum_t *), + M_SEBSD_SS, M_WAITOK); if (!p->class_val_to_struct) return -1; p->p_class_val_to_name = (char **) - malloc(p->p_classes.nprim * sizeof(char *), - M_SEBSD_SS, M_WAITOK); + sebsd_malloc(p->p_classes.nprim * sizeof(char *), + M_SEBSD_SS, M_WAITOK); if (!p->p_class_val_to_name) return -1; @@ -246,21 +248,21 @@ #endif p->role_val_to_struct = (role_datum_t **) - malloc(p->p_roles.nprim * sizeof(role_datum_t *), - M_SEBSD_SS, M_WAITOK); + sebsd_malloc(p->p_roles.nprim * sizeof(role_datum_t *), + M_SEBSD_SS, M_WAITOK); if (!p->role_val_to_struct) return -1; p->user_val_to_struct = (user_datum_t **) - malloc(p->p_users.nprim * sizeof(user_datum_t *), - M_SEBSD_SS, M_WAITOK); + sebsd_malloc(p->p_users.nprim * sizeof(user_datum_t *), + M_SEBSD_SS, M_WAITOK); if (!p->user_val_to_struct) return -1; for (i = SYM_ROLES; i < SYM_NUM; i++) { p->sym_val_to_name[i] = (char **) - malloc(p->symtab[i].nprim * sizeof(char *), - M_SEBSD_SS, M_WAITOK); + sebsd_malloc(p->symtab[i].nprim * sizeof(char *), + M_SEBSD_SS, M_WAITOK); if (!p->sym_val_to_name[i]) return -1; if (hashtab_map(p->symtab[i].table, index_f[i], p)) @@ -280,8 +282,8 @@ static int perm_destroy(hashtab_key_t key, hashtab_datum_t datum, void *p) { if (key) - free(key, M_SEBSD_SS); - free(datum, M_SEBSD_SS); + sebsd_free(key, M_SEBSD_SS); + sebsd_free(datum, M_SEBSD_SS); return 0; } @@ -291,11 +293,11 @@ common_datum_t *comdatum; if (key) - free(key, M_SEBSD_SS); + sebsd_free(key, M_SEBSD_SS); comdatum = (common_datum_t *) datum; hashtab_map(comdatum->permissions.table, perm_destroy, 0); hashtab_destroy(comdatum->permissions.table); - free(datum, M_SEBSD_SS); + sebsd_free(datum, M_SEBSD_SS); return 0; } @@ -309,7 +311,7 @@ constraint_expr_destroy(expr->left); if (expr->right) constraint_expr_destroy(expr->right); - free(expr, M_SEBSD_SS); + sebsd_free(expr, M_SEBSD_SS); } return 0; } @@ -321,7 +323,7 @@ constraint_node_t *constraint, *ctemp; if (key) - free(key, M_SEBSD_SS); + sebsd_free(key, M_SEBSD_SS); cladatum = (class_datum_t *) datum; hashtab_map(cladatum->permissions.table, perm_destroy, 0); hashtab_destroy(cladatum->permissions.table); @@ -330,11 +332,11 @@ constraint_expr_destroy(constraint->expr); ctemp = constraint; constraint = constraint->next; - free(ctemp, M_SEBSD_SS); + sebsd_free(ctemp, M_SEBSD_SS); } if (cladatum->comkey) - free(cladatum->comkey, M_SEBSD_SS); - free(datum, M_SEBSD_SS); + sebsd_free(cladatum->comkey, M_SEBSD_SS); + sebsd_free(datum, M_SEBSD_SS); return 0; } @@ -343,19 +345,19 @@ role_datum_t *role; if (key) - free(key, M_SEBSD_SS); + sebsd_free(key, M_SEBSD_SS); role = (role_datum_t *) datum; ebitmap_destroy(&role->dominates); ebitmap_destroy(&role->types); - free(datum, M_SEBSD_SS); + sebsd_free(datum, M_SEBSD_SS); return 0; } static int type_destroy(hashtab_key_t key, hashtab_datum_t datum, void *p) { if (key) - free(key, M_SEBSD_SS); - free(datum, M_SEBSD_SS); + sebsd_free(key, M_SEBSD_SS); + sebsd_free(datum, M_SEBSD_SS); return 0; } @@ -364,11 +366,11 @@ user_datum_t *usrdatum; if (key) - free(key, M_SEBSD_SS); + sebsd_free(key, M_SEBSD_SS); usrdatum = (user_datum_t *) datum; ebitmap_destroy(&usrdatum->roles); mls_user_destroy(usrdatum); - free(datum, M_SEBSD_SS); + sebsd_free(datum, M_SEBSD_SS); return 0; } @@ -399,15 +401,15 @@ for (i = 0; i < SYM_NUM; i++) { if (p->sym_val_to_name[i]) - free(p->sym_val_to_name[i], M_SEBSD_SS); + sebsd_free(p->sym_val_to_name[i], M_SEBSD_SS); } if (p->class_val_to_struct) - free(p->class_val_to_struct, M_SEBSD_SS); + sebsd_free(p->class_val_to_struct, M_SEBSD_SS); if (p->role_val_to_struct) - free(p->role_val_to_struct, M_SEBSD_SS); + sebsd_free(p->role_val_to_struct, M_SEBSD_SS); if (p->user_val_to_struct) - free(p->user_val_to_struct, M_SEBSD_SS); + sebsd_free(p->user_val_to_struct, M_SEBSD_SS); avtab_destroy(&p->te_avtab); @@ -419,8 +421,8 @@ context_destroy(&ctmp->context[0]); context_destroy(&ctmp->context[1]); if (i == OCON_ISID || i == OCON_FS || i == OCON_NETIF || i == OCON_DEVFS) - free(ctmp->u.name, M_SEBSD_SS); - free(ctmp, M_SEBSD_SS); + sebsd_free(ctmp->u.name, M_SEBSD_SS); + sebsd_free(ctmp, M_SEBSD_SS); } } @@ -550,7 +552,8 @@ __u32 buf[32], len; int items, items2; - perdatum = malloc(sizeof(perm_datum_t), M_SEBSD_SS, M_WAITOK | M_ZERO); + perdatum = sebsd_malloc(sizeof(perm_datum_t), M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!perdatum) return -1; /* memset(perdatum, 0, sizeof(perm_datum_t)); */ @@ -565,7 +568,7 @@ if (mls_read_perm(perdatum, fp)) goto bad; - key = malloc(len + 1, M_SEBSD_SS, M_WAITOK); + key = sebsd_malloc(len + 1, M_SEBSD_SS, M_WAITOK); if (!key) goto bad; items = fread(key, 1, len, fp); @@ -591,8 +594,8 @@ __u32 buf[32], len, nel; int items, i; - comdatum = malloc(sizeof(common_datum_t), M_SEBSD_SS, - M_WAITOK | M_ZERO); + comdatum = sebsd_malloc(sizeof(common_datum_t), M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!comdatum) return -1; /* memset(comdatum, 0, sizeof(common_datum_t)); */ @@ -609,7 +612,7 @@ comdatum->permissions.nprim = le32_to_cpu(buf[2]); nel = le32_to_cpu(buf[3]); - key = malloc(len + 1, M_SEBSD_SS, M_WAITOK); + key = sebsd_malloc(len + 1, M_SEBSD_SS, M_WAITOK); if (!key) goto bad; items = fread(key, 1, len, fp); @@ -640,8 +643,8 @@ __u32 buf[32]; int items; - expr = malloc(sizeof(constraint_expr_t), M_SEBSD_SS, - M_WAITOK | M_ZERO); + expr = sebsd_malloc(sizeof(constraint_expr_t), M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!expr) return NULL; /* memset(expr, 0, sizeof(constraint_expr_t)); */ @@ -693,8 +696,9 @@ __u32 buf[32], len, len2, ncons, nel; int items, i; - cladatum = (class_datum_t *) malloc(sizeof(class_datum_t), - M_SEBSD_SS, M_WAITOK | M_ZERO); + cladatum = (class_datum_t *) sebsd_malloc(sizeof(class_datum_t), + M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!cladatum) return -1; /* memset(cladatum, 0, sizeof(class_datum_t)); */ @@ -714,7 +718,7 @@ ncons = le32_to_cpu(buf[5]); - key = malloc(len + 1, M_SEBSD_SS, M_WAITOK); + key = sebsd_malloc(len + 1, M_SEBSD_SS, M_WAITOK); if (!key) goto bad; items = fread(key, 1, len, fp); @@ -723,7 +727,8 @@ key[len] = 0; if (len2) { - cladatum->comkey = malloc(len2 + 1, M_SEBSD_SS, M_WAITOK); + cladatum->comkey = sebsd_malloc(len2 + 1, M_SEBSD_SS, + M_WAITOK); if (!cladatum->comkey) goto bad; items = fread(cladatum->comkey, 1, len2, fp); @@ -745,8 +750,8 @@ l = NULL; for (i = 0; i < ncons; i++) { - c = malloc(sizeof(constraint_node_t), - M_SEBSD_SS, M_WAITOK | M_ZERO); + c = sebsd_malloc(sizeof(constraint_node_t), + M_SEBSD_SS, M_WAITOK | M_ZERO); if (!c) goto bad; /* memset(c, 0, sizeof(constraint_node_t)); */ @@ -787,7 +792,8 @@ __u32 buf[32], len; int items; - role = malloc(sizeof(role_datum_t), M_SEBSD_SS, M_WAITOK | M_ZERO); + role = sebsd_malloc(sizeof(role_datum_t), M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!role) return -1; /* memset(role, 0, sizeof(role_datum_t)); */ @@ -799,7 +805,7 @@ len = le32_to_cpu(buf[0]); role->value = le32_to_cpu(buf[1]); - key = malloc(len + 1, M_SEBSD_SS, M_WAITOK); + key = sebsd_malloc(len + 1, M_SEBSD_SS, M_WAITOK); if (!key) goto bad; items = fread(key, 1, len, fp); @@ -842,7 +848,8 @@ __u32 buf[32], len; int items; - typdatum = malloc(sizeof(type_datum_t), M_SEBSD_SS, M_WAITOK | M_ZERO); + typdatum = sebsd_malloc(sizeof(type_datum_t), M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!typdatum) return -1; /* memset(typdatum, 0, sizeof(type_datum_t)); */ @@ -855,7 +862,7 @@ typdatum->value = le32_to_cpu(buf[1]); typdatum->primary = le32_to_cpu(buf[2]); - key = malloc(len + 1, M_SEBSD_SS, M_WAITOK); + key = sebsd_malloc(len + 1, M_SEBSD_SS, M_WAITOK); if (!key) goto bad; items = fread(key, 1, len, fp); @@ -881,7 +888,8 @@ int items; - usrdatum = malloc(sizeof(user_datum_t), M_SEBSD_SS, M_WAITOK | M_ZERO); + usrdatum = sebsd_malloc(sizeof(user_datum_t), M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!usrdatum) return -1; /* memset(usrdatum, 0, sizeof(user_datum_t)); */ @@ -893,7 +901,7 @@ len = le32_to_cpu(buf[0]); usrdatum->value = le32_to_cpu(buf[1]); - key = malloc(len + 1, M_SEBSD_SS, M_WAITOK); + key = sebsd_malloc(len + 1, M_SEBSD_SS, M_WAITOK); if (!key) goto bad; items = fread(key, 1, len, fp); @@ -998,8 +1006,8 @@ nel = le32_to_cpu(buf[0]); ltr = NULL; for (i = 0; i < nel; i++) { - tr = malloc(sizeof(struct role_trans), M_SEBSD_SS, - M_WAITOK | M_ZERO); + tr = sebsd_malloc(sizeof(struct role_trans), M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!tr) { goto bad; } @@ -1024,8 +1032,8 @@ nel = le32_to_cpu(buf[0]); lra = NULL; for (i = 0; i < nel; i++) { - ra = malloc(sizeof(struct role_allow), M_SEBSD_SS, - M_WAITOK | M_ZERO); + ra = sebsd_malloc(sizeof(struct role_allow), M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!ra) { goto bad; } @@ -1056,8 +1064,8 @@ nel = le32_to_cpu(buf[0]); l = NULL; for (j = 0; j < nel; j++) { - c = malloc(sizeof(ocontext_t), M_SEBSD_SS, - M_WAITOK | M_ZERO); + c = sebsd_malloc(sizeof(ocontext_t), M_SEBSD_SS, + M_WAITOK | M_ZERO); if (!c) { goto bad; } @@ -1083,8 +1091,8 @@ if (items != 1) goto bad; len = le32_to_cpu(buf[0]); - c->u.name = malloc(len + 1, - M_SEBSD_SS, M_WAITOK); + c->u.name = sebsd_malloc(len + 1, + M_SEBSD_SS, M_WAITOK); if (!c->u.name) { goto bad; } @@ -1132,8 +1140,8 @@ if (items != 1) goto bad; len = le32_to_cpu(buf[0]); - c->u.name = malloc(len + 1, - M_SEBSD_SS, M_WAITOK); + c->u.name = sebsd_malloc(len + 1, + M_SEBSD_SS, M_WAITOK); if (!c->u.name) { goto bad; } ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/queue.c#2 (text+ko) ==== @@ -7,10 +7,11 @@ * Implementation of the double-ended queue type. */ +#if defined(__FreeBSD__) && defined(_KERNEL) #include -#include #include #include +#endif /* FreeBSD _KERNEL */ #include #include @@ -21,8 +22,8 @@ { queue_t q; - q = (queue_t) malloc(sizeof(struct queue_info), - M_SEBSD_SS, M_WAITOK); + q = (queue_t) sebsd_malloc(sizeof(struct queue_info), + M_SEBSD_SS, M_WAITOK); if (q == NULL) return NULL; @@ -39,8 +40,8 @@ if (!q) return -1; - newnode = (queue_node_ptr_t) malloc(sizeof(struct queue_node), - M_SEBSD_SS, M_WAITOK); + newnode = (queue_node_ptr_t) sebsd_malloc(sizeof(struct queue_node), + M_SEBSD_SS, M_WAITOK); if (newnode == NULL) return -1; @@ -65,8 +66,8 @@ if (!q) return -1; - newnode = (queue_node_ptr_t) malloc(sizeof(struct queue_node), - M_SEBSD_SS, M_WAITOK); + newnode = (queue_node_ptr_t) sebsd_malloc(sizeof(struct queue_node), + M_SEBSD_SS, M_WAITOK); if (newnode == NULL) return -1; @@ -102,7 +103,7 @@ q->tail = NULL; e = node->element; - free(node, M_SEBSD_SS); + sebsd_free(node, M_SEBSD_SS); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 11:34: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A6EE137B419; Wed, 17 Apr 2002 11:34:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DB9EA37B417 for ; Wed, 17 Apr 2002 11:33:59 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HIXxX45867 for perforce@freebsd.org; Wed, 17 Apr 2002 11:33:59 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Wed, 17 Apr 2002 11:33:59 -0700 (PDT) Message-Id: <200204171833.g3HIXxX45867@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 9925 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9925 Change 9925 by cvance@cvance_korben on 2002/04/17 11:33:25 Add SEBSD policy checking/compiling tool. Mostly untested and it still needs a policy.conf file to be copied from SELinux. Affected files ... ... //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/checkpolicy.c#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/checkpolicy.h#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/policy_parse.y#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/policy_scan.l#1 add ... //depot/projects/trustedbsd/mac/sbin/Makefile#5 edit ... //depot/projects/trustedbsd/mac/sbin/sebsd_checkpolicy/Makefile#1 add Differences ... ==== //depot/projects/trustedbsd/mac/sbin/Makefile#5 (text+ko) ==== @@ -68,6 +68,7 @@ routed \ rtsol \ savecore \ + sebsd_checkpolicy \ shutdown \ slattach \ spppcontrol \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 11:43:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7511737B417; Wed, 17 Apr 2002 11:43:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B8CB837B404 for ; Wed, 17 Apr 2002 11:43:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HIhCv48591 for perforce@freebsd.org; Wed, 17 Apr 2002 11:43:12 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Wed, 17 Apr 2002 11:43:12 -0700 (PDT) Message-Id: <200204171843.g3HIhCv48591@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9926 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9926 Change 9926 by jhb@jhb_laptop on 2002/04/17 11:42:49 Protect nprocs decrement with xlock of allproc_lock. Affected files ... ... //depot/projects/smpng/sys/kern/kern_exit.c#34 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exit.c#34 (text+ko) ==== @@ -665,7 +665,9 @@ vm_waitproc(p); mtx_destroy(&p->p_mtx); uma_zfree(proc_zone, p); + sx_xlock(&allproc_lock); nprocs--; + sx_xunlock(&allproc_lock); mtx_unlock(&Giant); return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 11:45:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E254337B41E; Wed, 17 Apr 2002 11:45:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 731C137B417 for ; Wed, 17 Apr 2002 11:45:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HIjGG49156 for perforce@freebsd.org; Wed, 17 Apr 2002 11:45:16 -0700 (PDT) (envelope-from green@freebsd.org) Date: Wed, 17 Apr 2002 11:45:16 -0700 (PDT) Message-Id: <200204171845.g3HIjGG49156@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 9927 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9927 Change 9927 by green@green_laptop_2 on 2002/04/17 11:44:26 Fix warnings. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#11 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_log.c#4 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_log.h#3 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_mediate.c#3 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_mediate.h#3 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_util.c#6 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#29 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#23 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#11 (text+ko) ==== @@ -264,7 +264,7 @@ #endif /* MAC */ } else { #ifdef MAC - const struct ucred *cred = td->td_ucred; + struct ucred *cred = td->td_ucred; /* * We know it's ISLASTCN, so do the MAC delete, rename, ==== //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_log.c#4 (text+ko) ==== @@ -130,7 +130,7 @@ */ void -log_append_subject_id(lomac_log_t *s, const lomac_subject_t *p_subject) { +log_append_subject_id(lomac_log_t *s, lomac_subject_t *p_subject) { uid_t uid; pid_t pgid; ==== //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_log.h#3 (text+ko) ==== @@ -70,7 +70,7 @@ lomac_log_t *log_start( void ); void log_append_string( lomac_log_t *s, const char *data_s ); void log_append_int( lomac_log_t *s, int data ); -void log_append_subject_id( lomac_log_t *s, const lomac_subject_t *p_subject ); +void log_append_subject_id( lomac_log_t *s, lomac_subject_t *p_subject ); void log_append_object_id( lomac_log_t *s, const lomac_object_t *p_object ); void log_print( lomac_log_t *s ); ==== //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_mediate.c#3 (text+ko) ==== @@ -76,7 +76,7 @@ int mediate_subject_level_subject(const char *op_s, - const lomac_subject_t *p_subject_one, level_t level_one, + lomac_subject_t *p_subject_one, level_t level_one, lomac_subject_t *p_subject_two) { lattr_t lattr_two; /* lattr of `p_subject_two' */ ==== //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_mediate.h#3 (text+ko) ==== @@ -41,7 +41,7 @@ #include "kernel_interface.h" int mediate_subject_level_subject( const char *op_s, - const lomac_subject_t *p_subject_one, + lomac_subject_t *p_subject_one, level_t level_one, lomac_subject_t *p_subject_two ); int mediate_subject_object( const char *op_s, lomac_subject_t *p_subject, ==== //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_util.c#6 (text+ko) ==== @@ -109,6 +109,7 @@ } } +#ifdef P_CAN_HOOKS static int lomac_proc_candebug(struct proc *p1, struct proc *p2) { lattr_t lattr; @@ -145,7 +146,7 @@ else return (EPERM); } - +#endif int lomac_initialize_procs(void) { @@ -213,8 +214,6 @@ struct linker_file *parent, struct mod_depend *verinfo, struct linker_file **lfpp); -MALLOC_DECLARE(M_LINKER); - /* * MPSAFE */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#29 (text+ko) ==== @@ -290,6 +290,7 @@ labelto->m_biba.mb_flags |= MAC_BIBA_FLAG_SINGLE; } +#if 0 static void mac_biba_copy_range(struct mac *labelfrom, struct mac *labelto) { @@ -300,6 +301,7 @@ sizeof(labelto->m_biba.mb_rangehigh)); labelto->m_biba.mb_flags |= MAC_BIBA_FLAG_RANGE; } +#endif /* * Initialize system processes as MAC_BIBA_TYPE_EQUAL so that they can ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#23 (text+ko) ==== @@ -277,6 +277,7 @@ labelto->m_mls.mm_flags |= MAC_MLS_FLAG_SINGLE; } +#if 0 static void mac_mls_copy_range(struct mac *labelfrom, struct mac *labelto) { @@ -287,6 +288,7 @@ sizeof(labelto->m_mls.mm_rangehigh)); labelto->m_mls.mm_flags |= MAC_MLS_FLAG_RANGE; } +#endif /* * Initialize system processes as MAC_MLS_TYPE_EQUAL so that they can To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 11:54:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F422737B41E; Wed, 17 Apr 2002 11:54:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 52FE637B41D for ; Wed, 17 Apr 2002 11:54:28 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HIsSM50632 for perforce@freebsd.org; Wed, 17 Apr 2002 11:54:28 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Wed, 17 Apr 2002 11:54:28 -0700 (PDT) Message-Id: <200204171854.g3HIsSM50632@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 9929 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9929 Change 9929 by cvance@cvance_korben on 2002/04/17 11:54:05 Some of the changes to fix userspace builds broke the kernel build. Fix those. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#3 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#3 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#3 (text+ko) ==== @@ -14,7 +14,6 @@ */ #ifdef __FreeBSD__ -#include #include #include @@ -22,7 +21,10 @@ #include #ifdef _KERNEL +#include MALLOC_DECLARE(M_SEBSD_AVC); +#else /* _KERNEL */ +#include #endif /* _KERNEL */ #else /* __FreeBSD__ */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#3 (text+ko) ==== @@ -12,18 +12,21 @@ /* * Implementation of the security services. */ -#if defined(__FreeBSD__) && defined(_KERNEL) +#ifdef __FreeBSD__ + +#ifdef _KERNEL #include #include #include #include -#endif /* FreeBSD _KERNEL */ +#include +#else /* _KERNEL */ +#include +#endif /* _KERNEL */ +#endif /* __FreeBSD__ */ -#ifdef __FreeBSD__ -#include #include #include -#endif /* __FreeBSD__ */ #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 11:57:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 352C837B41F; Wed, 17 Apr 2002 11:57:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7943737B400 for ; Wed, 17 Apr 2002 11:57:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HIvWb51262 for perforce@freebsd.org; Wed, 17 Apr 2002 11:57:32 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Wed, 17 Apr 2002 11:57:32 -0700 (PDT) Message-Id: <200204171857.g3HIvWb51262@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9930 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9930 Change 9930 by jhb@jhb_laptop on 2002/04/17 11:56:44 Don't need sched_lock to test p_stat against SZOMB and SSTOP. Affected files ... ... //depot/projects/smpng/sys/kern/kern_exit.c#35 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exit.c#35 (text+ko) ==== @@ -539,7 +539,6 @@ } nfound++; - mtx_lock_spin(&sched_lock); if (p->p_stat == SZOMB) { /* * charge childs scheduling cpu usage to parent @@ -553,11 +552,12 @@ * XXXKSE */ if (curthread->td_proc->p_pid != 1) { + mtx_lock_spin(&sched_lock); curthread->td_ksegrp->kg_estcpu = ESTCPULIM(curthread->td_ksegrp->kg_estcpu + p->p_ksegrp.kg_estcpu); + mtx_unlock_spin(&sched_lock); } - mtx_unlock_spin(&sched_lock); td->td_retval[0] = p->p_pid; #ifdef COMPAT_43 @@ -673,7 +673,6 @@ } if (p->p_stat == SSTOP && (p->p_flag & P_WAITED) == 0 && (p->p_flag & P_TRACED || uap->options & WUNTRACED)) { - mtx_unlock_spin(&sched_lock); p->p_flag |= P_WAITED; sx_xunlock(&proctree_lock); td->td_retval[0] = p->p_pid; @@ -696,7 +695,6 @@ mtx_unlock(&Giant); return (error); } - mtx_unlock_spin(&sched_lock); PROC_UNLOCK(p); } sx_xunlock(&proctree_lock); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 11:59:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11E1D37B420; Wed, 17 Apr 2002 11:59:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5BC2A37B405 for ; Wed, 17 Apr 2002 11:59:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HIxZA51546 for perforce@freebsd.org; Wed, 17 Apr 2002 11:59:35 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Wed, 17 Apr 2002 11:59:35 -0700 (PDT) Message-Id: <200204171859.g3HIxZA51546@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 9931 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9931 Change 9931 by cvance@cvance_korben on 2002/04/17 11:58:45 Include current directory for build (Yacc-created headers) Affected files ... ... //depot/projects/trustedbsd/mac/sbin/sebsd_checkpolicy/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/sebsd_checkpolicy/Makefile#2 (text+ko) ==== @@ -10,7 +10,7 @@ CFLAGS+=-I${.CURDIR}/../../sys/security/sebsd/ss CFLAGS+=-I${.CURDIR}/../../sys/security/sebsd CFLAGS+=-I${.CURDIR}/../../sys -CFLAGS+=-I${.CURDIR} +CFLAGS+=-I. LDADD+= -lfl To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 12:40:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D2F237B400; Wed, 17 Apr 2002 12:40:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88]) by hub.freebsd.org (Postfix) with ESMTP id 0D6B937B416; Wed, 17 Apr 2002 12:40:32 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc52.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020417194008.SXNU1901.rwcrmhc52.attbi.com@InterJet.elischer.org>; Wed, 17 Apr 2002 19:40:08 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id MAA98088; Wed, 17 Apr 2002 12:27:49 -0700 (PDT) Date: Wed, 17 Apr 2002 12:27:47 -0700 (PDT) From: Julian Elischer To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 9921 for review In-Reply-To: <200204171801.g3HI1Id36075@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, 17 Apr 2002, John Baldwin wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9921 > > Change 9921 by jhb@jhb_laptop on 2002/04/17 11:00:44 > > Only malloc newprocsig if we need it. To make this nicer we need > a procsig_alloc/hold/free(drop?)/dup/shared. At some point I would > like a standard naming scheme for all our refcounted objects as > above. Note that if _alloc() sets the refcount appropriately, then > it won't need to use separate drop/free routines. I also would > like for us to use common names for all these refcount operations. Very true.. In netgraph I use: {obj}_ref() (add a reference) {obj}_unref() (decrement and maybe free) {obj}_new() (returns with one reference preallocated for the caller to use.) > > Affected files ... > > ... //depot/projects/smpng/sys/kern/kern_exec.c#34 edit > > Differences ... > > ==== //depot/projects/smpng/sys/kern/kern_exec.c#34 (text+ko) ==== > > @@ -134,7 +134,7 @@ > struct vattr attr; > int (*img_first)(struct image_params *); > struct pargs *oldargs, *newargs = NULL; > - struct procsig *newprocsig = NULL; > + struct procsig *oldprocsig, *newprocsig; > struct vnode *tracevp = NULL, *textvp = NULL; > > imgp = &image_params; > @@ -299,8 +299,6 @@ > /* > * Malloc things before we need locks. > */ > - MALLOC(newprocsig, struct procsig *, sizeof(struct procsig), > - M_SUBPROC, M_WAITOK); > newcred = crget(); > i = imgp->endargs - imgp->stringbase; > if (ps_arg_cache_limit >= i + sizeof(struct pargs)) > @@ -318,10 +316,15 @@ > PROC_LOCK(p); > mp_fixme("procsig needs a lock"); > if (p->p_procsig->ps_refcnt > 1) { > - bcopy(p->p_procsig, newprocsig, sizeof(*newprocsig)); > - p->p_procsig->ps_refcnt--; > + oldprocsig = p->p_procsig; > + PROC_UNLOCK(p); > + MALLOC(newprocsig, struct procsig *, sizeof(struct procsig), > + M_SUBPROC, M_WAITOK); > + bcopy(oldprocsig, newprocsig, sizeof(*newprocsig)); > + newprocsig->ps_refcnt = 1; > + oldprocsig->ps_refcnt--; > + PROC_LOCK(p); > p->p_procsig = newprocsig; > - p->p_procsig->ps_refcnt = 1; > if (p->p_sigacts == &p->p_uarea->u_sigacts) > panic("shared procsig but private sigacts?"); > > @@ -458,8 +461,6 @@ > /* > * Free any resources malloc'd earlier that we didn't use. > */ > - if (newprocsig != NULL) > - FREE(newprocsig, M_SUBPROC); > if (newcred == NULL) > crfree(oldcred); > else > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 13: 9:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D11337B416; Wed, 17 Apr 2002 13:08:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A7DD437B405 for ; Wed, 17 Apr 2002 13:08:58 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HK8ww70397 for perforce@freebsd.org; Wed, 17 Apr 2002 13:08:58 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Wed, 17 Apr 2002 13:08:58 -0700 (PDT) Message-Id: <200204172008.g3HK8ww70397@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 9932 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9932 Change 9932 by jhb@jhb_laptop on 2002/04/17 13:08:14 - Shuffle a few things up before locking the proctree_lock. - Interlock proctree_lock and the lock on the parent proces at the end of exit1() and before the parent sleeps at the end of wait1() to properly close the race of a parent missing the wakeup from one of it's children exiting. Affected files ... ... //depot/projects/smpng/sys/kern/kern_exit.c#36 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exit.c#36 (text+ko) ==== @@ -313,6 +313,25 @@ } /* + * Release our limits structure. + */ + mtx_assert(&Giant, MA_OWNED); + if (--p->p_limit->p_refcnt == 0) { + FREE(p->p_limit, M_SUBPROC); + p->p_limit = NULL; + } + + /* + * Release this thread's reference to the ucred. The actual proc + * reference will stay around until the proc is harvested by + * wait(). At this point the ucred is immutable (no other threads + * from this proc are around that can change it) so we leave the + * per-thread ucred pointer intact in case it is needed although + * in theory nothing should be using it at this point. + */ + crfree(td->td_ucred); + + /* * Remove proc from allproc queue and pidhash chain. * Place onto zombproc. Unlink from parent's child list. */ @@ -391,35 +410,8 @@ if (p->p_flag & P_KTHREAD) wakeup((caddr_t)p); PROC_UNLOCK(p); - sx_xunlock(&proctree_lock); /* - * Clear curproc after we've done all operations - * that could block, and before tearing down the rest - * of the process state that might be used from clock, etc. - * Also, can't clear curproc while we're still runnable, - * as we're not on a run queue (we are current, just not - * a proper proc any longer!). - * - * Other substructures are freed from wait(). - */ - mtx_assert(&Giant, MA_OWNED); - if (--p->p_limit->p_refcnt == 0) { - FREE(p->p_limit, M_SUBPROC); - p->p_limit = NULL; - } - - /* - * Release this thread's reference to the ucred. The actual proc - * reference will stay around until the proc is harvested by - * wait(). At this point the ucred is immutable (no other threads - * from this proc are around that can change it) so we leave the - * per-thread ucred pointer intact in case it is needed although - * in theory nothing should be using it at this point. - */ - crfree(td->td_ucred); - - /* * Finally, call machine-dependent code to release the remaining * resources including address space, the kernel stack and pcb. * The address space is released by "vmspace_exitfree(p)" in @@ -429,6 +421,7 @@ PROC_LOCK(p); PROC_LOCK(p->p_pptr); + sx_xunlock(&proctree_lock); mtx_lock_spin(&sched_lock); while (mtx_owned(&Giant)) mtx_unlock(&Giant); @@ -697,17 +690,19 @@ } PROC_UNLOCK(p); } - sx_xunlock(&proctree_lock); if (nfound == 0) { + sx_xunlock(&proctree_lock); mtx_unlock(&Giant); return (ECHILD); } if (uap->options & WNOHANG) { + sx_xunlock(&proctree_lock); td->td_retval[0] = 0; mtx_unlock(&Giant); return (0); } PROC_LOCK(q); + sx_xunlock(&proctree_lock); error = msleep((caddr_t)q, &q->p_mtx, PWAIT | PCATCH, "wait", 0); PROC_UNLOCK(q); if (error) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 13:14:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D673A37B41A; Wed, 17 Apr 2002 13:14:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by hub.freebsd.org (Postfix) with ESMTP id 50E6B37B417 for ; Wed, 17 Apr 2002 13:14:30 -0700 (PDT) Received: (qmail 30481 invoked from network); 17 Apr 2002 20:14:29 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 17 Apr 2002 20:14:29 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g3HKEUv81832; Wed, 17 Apr 2002 16:14:30 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200204172008.g3HK8ww70397@freefall.freebsd.org> Date: Wed, 17 Apr 2002 16:13:32 -0400 (EDT) From: John Baldwin To: John Baldwin Subject: RE: PERFORCE change 9932 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 17-Apr-2002 John Baldwin wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9932 > > Change 9932 by jhb@jhb_laptop on 2002/04/17 13:08:14 > > - Shuffle a few things up before locking the proctree_lock. > - Interlock proctree_lock and the lock on the parent proces at > the end of exit1() and before the parent sleeps at the end of > wait1() to properly close the race of a parent missing the > wakeup from one of it's children exiting. What a pain. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 14:29:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D69037B41E; Wed, 17 Apr 2002 14:29:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from finntroll.newgold.net (Durham-ar1-4-64-252-019.dsl.genuity.net [4.64.252.19]) by hub.freebsd.org (Postfix) with SMTP id 4D48237B41D for ; Wed, 17 Apr 2002 14:29:31 -0700 (PDT) Received: (qmail 32546 invoked by uid 1001); 17 Apr 2002 21:35:33 -0000 Date: Wed, 17 Apr 2002 21:35:33 +0000 From: "J. Mallett" To: Chris Vance Cc: Perforce Change Reviews Subject: Re: PERFORCE change 9931 for review Message-ID: <20020417213532.GA27678@FreeBSD.ORG> References: <200204171859.g3HIxZA51546@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200204171859.g3HIxZA51546@freefall.freebsd.org> User-Agent: Mutt/1.3.27i Organisation: FreeBSD Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, Apr 17, 2002 at 11:59:35AM -0700, Chris Vance wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9931 > > Change 9931 by cvance@cvance_korben on 2002/04/17 11:58:45 > > Include current directory for build (Yacc-created headers) > Maybe -I${.OBJDIR} in addition to -I${.CURDIR}, instead of killing the latter in favor of -I.? The yacc output should end up in .OBJDIR, though I don't know if you want to hardcode this to . I think, anyway. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 14:49: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2D9037B416; Wed, 17 Apr 2002 14:49:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 418F537B405 for ; Wed, 17 Apr 2002 14:49:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HLn0H89608 for perforce@freebsd.org; Wed, 17 Apr 2002 14:49:00 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 17 Apr 2002 14:49:00 -0700 (PDT) Message-Id: <200204172149.g3HLn0H89608@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9935 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9935 Change 9935 by des@des.at.des.thinksec.com on 2002/04/17 14:48:53 When closing a literal section, reset $inliteral, not $inlist. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/misc/gendoc.pl#11 edit Differences ... ==== //depot/projects/openpam/misc/gendoc.pl#11 (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#10 $ +# $P4: //depot/projects/openpam/misc/gendoc.pl#11 $ # use strict; @@ -139,6 +139,7 @@ $argnames =~ s/([\|\[\]\(\)\.\*\+\?])/\\$1/g; $argnames =~ s/\" \"/|/g; $argnames =~ s/^\"(.*)\"$/($1)/; + $inliteral = $inlist = 0; foreach (split("\n", $source)) { s/\s*$//; if (!defined($man)) { @@ -185,7 +186,7 @@ $inlist = 0; } elsif ($inliteral && m/^\S/) { $man .= ".Ed\n"; - $inlist = 0; + $inliteral = 0; } elsif ($inliteral) { $man .= "$_\n"; next; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 14:52:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07A9B37B405; Wed, 17 Apr 2002 14:52:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5E95137B400 for ; Wed, 17 Apr 2002 14:52:04 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HLq4M90167 for perforce@freebsd.org; Wed, 17 Apr 2002 14:52:04 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 17 Apr 2002 14:52:04 -0700 (PDT) Message-Id: <200204172152.g3HLq4M90167@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9936 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9936 Change 9936 by des@des.at.des.thinksec.com on 2002/04/17 14:51:34 Add colons so gendoc recognizes this as a list rather than a literal section. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/lib/pam_get_authtok.c#17 edit Differences ... ==== //depot/projects/openpam/lib/pam_get_authtok.c#17 (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#16 $ + * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#17 $ */ #include @@ -145,10 +145,10 @@ * * The =item argument must have one of the following values: * - * =PAM_AUTHTOK + * =PAM_AUTHTOK: * Returns the current authentication token, or the new token * when changing authentication tokens. - * =PAM_OLDAUTHTOK + * =PAM_OLDAUTHTOK: * Returns the previous authentication token when changing * authentication tokens. * To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 14:52:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8067037B404; Wed, 17 Apr 2002 14:52:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A38B237B417 for ; Wed, 17 Apr 2002 14:52:04 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HLq4L90172 for perforce@freebsd.org; Wed, 17 Apr 2002 14:52:04 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 17 Apr 2002 14:52:04 -0700 (PDT) Message-Id: <200204172152.g3HLq4L90172@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9937 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9937 Change 9937 by des@des.at.des.thinksec.com on 2002/04/17 14:51:52 Regenerate. Affected files ... ... //depot/projects/openpam/doc/man/pam_get_authtok.3#13 edit Differences ... ==== //depot/projects/openpam/doc/man/pam_get_authtok.3#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/doc/man/pam_get_authtok.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#13 $ .\" .Dd April 14, 2002 .Dt PAM_GET_AUTHTOK 3 @@ -58,20 +58,17 @@ The .Va item argument must have one of the following values: -.Pp -.Bd -literal - =PAM_AUTHTOK - Returns the current authentication token, or the new token - when changing authentication tokens. - =PAM_OLDAUTHTOK - Returns the previous authentication token when changing - authentication tokens. - -.Ed +.Bl -tag -width 18n +.It Dv PAM_AUTHTOK +Returns the current authentication token, or the new token +when changing authentication tokens. +.It Dv PAM_OLDAUTHTOK +Returns the previous authentication token when changing +authentication tokens. +.El The .Va prompt argument specifies a prompt to use if no token is cached. -.Ed If it is .Dv NULL , the @@ -79,31 +76,25 @@ or .Dv PAM_OLDAUTHTOK_PROMPT item, -.Ed as appropriate, will be used. If that item is also .Dv NULL , a hardcoded -.Ed default prompt will be used. - -.Ed +.Pp If .Va item is set to .Dv PAM_AUTHTOK and there is a non-null .Dv PAM_OLDAUTHTOK -.Ed item, .Nm will ask the user to confirm the new token by -.Ed retyping it. If there is a mismatch, .Nm will return -.Ed .Dv PAM_TRY_AGAIN . - +.Pp .Sh RETURN VALUES The .Nm To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 15: 1:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EBE137B400; Wed, 17 Apr 2002 15:01:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4C56137B425 for ; Wed, 17 Apr 2002 15:01:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HM1GL91454 for perforce@freebsd.org; Wed, 17 Apr 2002 15:01:16 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 17 Apr 2002 15:01:16 -0700 (PDT) Message-Id: <200204172201.g3HM1GL91454@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9939 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9939 Change 9939 by des@des.at.des.thinksec.com on 2002/04/17 15:00:40 Regenerate in order to properly close literal sections. Affected files ... ... //depot/projects/openpam/doc/man/pam_getenvlist.3#12 edit ... //depot/projects/openpam/doc/man/pam_start.3#12 edit Differences ... ==== //depot/projects/openpam/doc/man/pam_getenvlist.3#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/doc/man/pam_getenvlist.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#12 $ .\" .Dd April 14, 2002 .Dt PAM_GETENVLIST 3 @@ -72,7 +72,7 @@ free(*env); free(environ); environ = envlist; - +.Ed .Sh RETURN VALUES The .Nm ==== //depot/projects/openpam/doc/man/pam_start.3#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/doc/man/pam_start.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#12 $ .\" .Dd April 14, 2002 .Dt PAM_START 3 @@ -79,7 +79,7 @@ struct pam_response **, void *); void *appdata_ptr; }; - +.Ed .Sh RETURN VALUES The .Nm To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 15: 1:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1AA937B405; Wed, 17 Apr 2002 15:01:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 15F5037B433 for ; Wed, 17 Apr 2002 15:01:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3HM1Fk91449 for perforce@freebsd.org; Wed, 17 Apr 2002 15:01:15 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 17 Apr 2002 15:01:15 -0700 (PDT) Message-Id: <200204172201.g3HM1Fk91449@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 9938 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9938 Change 9938 by des@des.at.des.thinksec.com on 2002/04/17 15:00:17 Properly terminate literal sections that appear at the end of the DESCRIPTION section. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/misc/gendoc.pl#12 edit Differences ... ==== //depot/projects/openpam/misc/gendoc.pl#12 (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#11 $ +# $P4: //depot/projects/openpam/misc/gendoc.pl#12 $ # use strict; @@ -212,10 +212,17 @@ $man .= "$_\n"; } if (defined($man)) { + if ($inlist) { + $man .= ".El\n"; + } + if ($inliteral) { + $man .= ".Ed\n"; + } $man =~ s/(\n\.[A-Z][a-z] [\w ]+)\n([\.,:;-]\S*)\s*/$1 $2\n/gs; $man =~ s/\s*$/\n/gm; $man =~ s/\n+/\n/gs; $man =~ s/\0//gs; + $man =~ s/\n\n\./\n\./gs; chomp($man); } else { $man = "No description available."; @@ -367,10 +374,12 @@ "; $fn = "$func->{'name'}.3"; - sysopen(FILE, $fn, O_RDWR|O_CREAT|O_TRUNC) - or die("$fn: open(): $!\n"); - print(FILE $mdoc); - close(FILE); + if (sysopen(FILE, $fn, O_RDWR|O_CREAT|O_TRUNC)) { + print(FILE $mdoc); + close(FILE); + } else { + warn("$fn: open(): $!\n"); + } } sub gensummary() { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 17 17:56:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DA2937B405; Wed, 17 Apr 2002 17:56:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AD5B237B404 for ; Wed, 17 Apr 2002 17:56:48 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3I0umF29180 for perforce@freebsd.org; Wed, 17 Apr 2002 17:56:48 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Wed, 17 Apr 2002 17:56:48 -0700 (PDT) Message-Id: <200204180056.g3I0umF29180@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 9943 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9943 Change 9943 by jake@jake_sparc64 on 2002/04/17 17:56:41 Catch up to pmap_zero_page changes. Affected files ... ... //depot/projects/sparc64/sys/vm/vnode_pager.c#12 edit Differences ... ==== //depot/projects/sparc64/sys/vm/vnode_pager.c#12 (text+ko) ==== @@ -316,8 +316,7 @@ * Clear out partial-page garbage in case * the page has been mapped. */ - pmap_zero_page_area(VM_PAGE_TO_PHYS(m), - base, size); + pmap_zero_page_area(m, base, size); /* * XXX work around SMP data integrity race To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 18 6:48:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B14DF37B417; Thu, 18 Apr 2002 06:48:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DD74F37B404 for ; Thu, 18 Apr 2002 06:48:06 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3IDm6S15139 for perforce@freebsd.org; Thu, 18 Apr 2002 06:48:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 18 Apr 2002 06:48:06 -0700 (PDT) Message-Id: <200204181348.g3IDm6S15139@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9960 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9960 Change 9960 by rwatson@rwatson_tislabs on 2002/04/18 06:47:49 Remove copy/pasto: this is the seeotheruids policy, not type enforcement as the sysctl description suggests. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#7 (text+ko) ==== @@ -68,7 +68,7 @@ SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, seeotheruids, CTLFLAG_RW, 0, - "TrustedBSD Type Enforcement policy controls"); + "TrustedBSD mac_seeotheruids policy controls"); static int mac_seeotheruids_enabled = 0; SYSCTL_INT(_security_mac_seeotheruids, OID_AUTO, enabled, CTLFLAG_RW, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 18 13:28:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20B4737B405; Thu, 18 Apr 2002 13:28:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5ACDB37B419 for ; Thu, 18 Apr 2002 13:28:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3IKSKk08840 for perforce@freebsd.org; Thu, 18 Apr 2002 13:28:20 -0700 (PDT) (envelope-from green@freebsd.org) Date: Thu, 18 Apr 2002 13:28:20 -0700 (PDT) Message-Id: <200204182028.g3IKSKk08840@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 9973 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9973 Change 9973 by green@green_laptop_2 on 2002/04/18 13:28:00 Print the device name and inode number of files with corrupt labels. Affected files ... ... //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_mac.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_mac.c#6 (text+ko) ==== @@ -49,11 +49,14 @@ #include #include #include +#include #include #include #include #include +#include +#include #ifdef MAC /* @@ -96,7 +99,9 @@ ip->i_flag |= IN_MACCACHED; return (0); } - printf("Corrupted label\n"); + printf("Corrupted label on %s inode %u\n", + devtoname(VFSTOUFS(ap->a_vp->v_mount)->um_devvp->v_rdev), + ip->i_number); error = EPERM; if (!mac_debug_label_fallback) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 19 6:26:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1F7437B417; Fri, 19 Apr 2002 06:26:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D8C5637B405 for ; Fri, 19 Apr 2002 06:26:19 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3JDQJL39010 for perforce@freebsd.org; Fri, 19 Apr 2002 06:26:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Apr 2002 06:26:19 -0700 (PDT) Message-Id: <200204191326.g3JDQJL39010@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9995 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9995 Change 9995 by rwatson@rwatson_tislabs on 2002/04/19 06:25:49 During integ, lost the definition of chunksize. extattrctl still doesn't build due to unresolved issues merging DES's main-tree optimization and green's trustedbsd_mac optimization, which (unfortunately) accomplish the optimization in a way that doesn't merge easily. Affected files ... ... //depot/projects/trustedbsd/mac/usr.sbin/extattrctl/extattrctl.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/extattrctl/extattrctl.c#9 (text+ko) ==== @@ -91,7 +91,7 @@ { struct ufs_extattr_fileheader uef; char *fs_path = NULL; - int ch, i, error, flags; + int ch, chunksize, i, error, flags; ssize_t wlen; size_t easize; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 19 6:37:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EE4237B417; Fri, 19 Apr 2002 06:37:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A286D37B416 for ; Fri, 19 Apr 2002 06:37:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3JDbXs40812 for perforce@freebsd.org; Fri, 19 Apr 2002 06:37:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Apr 2002 06:37:33 -0700 (PDT) Message-Id: <200204191337.g3JDbXs40812@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9996 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9996 Change 9996 by rwatson@rwatson_tislabs on 2002/04/19 06:36:48 Pro-active diff reduction. Restructure the proc0/proc1 credential divorcing to reflect the crcopy() approach now used in the main tree. This is identical to the code committed to the main tree a few minutes ago, and reduces diffs between the trees. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/init_main.c#18 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_main.c#18 (text+ko) ==== @@ -644,12 +644,11 @@ if (error) panic("cannot fork init: %d\n", error); /* divorce init's credentials from the kernel's */ - oldcred = initproc->p_ucred; - newcred = crdup(oldcred); - if (newcred == NULL) - panic("cannot generate ucred for init: %d\n", error); + newcred = crget(); PROC_LOCK(initproc); initproc->p_flag |= P_SYSTEM; + oldcred = initproc->p_ucred; + crcopy(newcred, oldcred); initproc->p_ucred = newcred; PROC_UNLOCK(initproc); crfree(oldcred); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 19 6:40:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CCA637B417; Fri, 19 Apr 2002 06:40:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id F090237B41C for ; Fri, 19 Apr 2002 06:40:18 -0700 (PDT) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.11.6/8.11.6) with SMTP id g3JDdOw69530 for ; Fri, 19 Apr 2002 09:39:24 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Fri, 19 Apr 2002 09:39:24 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Perforce Change Reviews Subject: Re: PERFORCE change 9996 for review In-Reply-To: <200204191337.g3JDbXs40812@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG This may also close a small race involving process locking, by moving all references to initproc under the locking. In practice, this may not have been an issue given the nascent condition of the system, but it was worth fixing if only to help people who do copy-and-paste programming :-). Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services On Fri, 19 Apr 2002, Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9996 > > Change 9996 by rwatson@rwatson_tislabs on 2002/04/19 06:36:48 > > Pro-active diff reduction. > > Restructure the proc0/proc1 credential divorcing to reflect the > crcopy() approach now used in the main tree. This is identical > to the code committed to the main tree a few minutes ago, and > reduces diffs between the trees. > > Affected files ... > > ... //depot/projects/trustedbsd/mac/sys/kern/init_main.c#18 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/init_main.c#18 (text+ko) ==== > > @@ -644,12 +644,11 @@ > if (error) > panic("cannot fork init: %d\n", error); > /* divorce init's credentials from the kernel's */ > - oldcred = initproc->p_ucred; > - newcred = crdup(oldcred); > - if (newcred == NULL) > - panic("cannot generate ucred for init: %d\n", error); > + newcred = crget(); > PROC_LOCK(initproc); > initproc->p_flag |= P_SYSTEM; > + oldcred = initproc->p_ucred; > + crcopy(newcred, oldcred); > initproc->p_ucred = newcred; > PROC_UNLOCK(initproc); > crfree(oldcred); > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 19 6:54: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4718637B41D; Fri, 19 Apr 2002 06:53:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 979F337B41C for ; Fri, 19 Apr 2002 06:53:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3JDrsD43759 for perforce@freebsd.org; Fri, 19 Apr 2002 06:53:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Apr 2002 06:53:54 -0700 (PDT) Message-Id: <200204191353.g3JDrsD43759@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 9999 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9999 Change 9999 by rwatson@rwatson_tislabs on 2002/04/19 06:53:27 During the last integ, I missed submitting the regenerated syscalls.c. Because the only differences were in the header comment, this didn't affect compilation, but is worth fixing to prevent P4 from getting upset in the future. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#13 (text+ko) ==== @@ -2,16 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL syscalls.c#6 - * $FreeBSD: src/sys/kern/syscalls.c,v 1.105 2002/03/05 16:13:00 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.107 2002/03/05 16:11:11 rwatson Exp -==== THEIRS syscalls.c#7 - * $FreeBSD: src/sys/kern/syscalls.c,v 1.107 2002/04/14 05:33:58 alc Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== YOURS syscalls.c - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.107 2002/03/05 16:11:11 rwatson Exp -<<<< */ char *syscallnames[] = { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 19 6:58: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDE4837B400; Fri, 19 Apr 2002 06:58:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E50BC37B404 for ; Fri, 19 Apr 2002 06:57:59 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3JDvxx44343 for perforce@freebsd.org; Fri, 19 Apr 2002 06:57:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Apr 2002 06:57:59 -0700 (PDT) Message-Id: <200204191357.g3JDvxx44343@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10000 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10000 Change 10000 by rwatson@rwatson_tislabs on 2002/04/19 06:57:44 Whitespace diff reduction from main tree. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#17 (text+ko) ==== @@ -184,11 +184,9 @@ so->so_type = type; so->so_cred = crhold(cred); so->so_proto = prp; - #ifdef MAC mac_create_socket(td->td_ucred, so); #endif - soref(so); error = (*prp->pr_usrreqs->pru_attach)(so, proto, td); if (error) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 19 6:59: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE1F737B400; Fri, 19 Apr 2002 06:59:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8CC7637B416 for ; Fri, 19 Apr 2002 06:59:01 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3JDx1A44483 for perforce@freebsd.org; Fri, 19 Apr 2002 06:59:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Apr 2002 06:59:01 -0700 (PDT) Message-Id: <200204191359.g3JDx1A44483@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10001 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10001 Change 10001 by rwatson@rwatson_tislabs on 2002/04/19 06:58:25 Whitespace diff reduction from main tree. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#13 (text+ko) ==== @@ -240,11 +240,9 @@ so->so_proto = head->so_proto; so->so_timeo = head->so_timeo; so->so_cred = crhold(head->so_cred); - #ifdef MAC mac_create_socket(so->so_cred, so); #endif - if (soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat) || (*so->so_proto->pr_usrreqs->pru_attach)(so, 0, NULL)) { sotryfree(so); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 19 7:45:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 408E837B41D; Fri, 19 Apr 2002 07:45:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by hub.freebsd.org (Postfix) with ESMTP id 10FAF37B405; Fri, 19 Apr 2002 07:45:13 -0700 (PDT) Received: by flood.ping.uio.no (Postfix, from userid 2602) id 43015530B; Fri, 19 Apr 2002 16:45:11 +0200 (CEST) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 9995 for review References: <200204191326.g3JDQJL39010@freefall.freebsd.org> From: Dag-Erling Smorgrav Date: 19 Apr 2002 16:45:10 +0200 In-Reply-To: <200204191326.g3JDQJL39010@freefall.freebsd.org> Message-ID: Lines: 13 User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/21.1 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson writes: > During integ, lost the definition of chunksize. extattrctl still > doesn't build due to unresolved issues merging DES's main-tree > optimization and green's trustedbsd_mac optimization, which > (unfortunately) accomplish the optimization in a way that doesn't > merge easily. I sent you a patch a couple of weeks before I committed that, but didn't get a reply... DES -- Dag-Erling Smorgrav - des@ofug.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 19 16:19:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CF9A37B41A; Fri, 19 Apr 2002 16:18:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fw.wemm.org (12-232-135-171.client.attbi.com [12.232.135.171]) by hub.freebsd.org (Postfix) with ESMTP id 9E4EB37B41E; Fri, 19 Apr 2002 16:18:25 -0700 (PDT) Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by fw.wemm.org (8.11.6/8.11.6) with ESMTP id g3JNIPe14822; Fri, 19 Apr 2002 16:18:25 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 363FC380F; Fri, 19 Apr 2002 16:18:25 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10000 for review In-Reply-To: <200204191357.g3JDvxx44343@freefall.freebsd.org> Date: Fri, 19 Apr 2002 16:18:25 -0700 From: Peter Wemm Message-Id: <20020419231825.363FC380F@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10000 > > Change 10000 by rwatson@rwatson_tislabs on 2002/04/19 06:57:44 w00t. 10000 changes. :-] Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 19 16:21: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8532537B404; Fri, 19 Apr 2002 16:21:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from finntroll.newgold.net (Durham-ar1-4-64-252-019.dsl.genuity.net [4.64.252.19]) by hub.freebsd.org (Postfix) with SMTP id 775CE37B41B for ; Fri, 19 Apr 2002 16:21:02 -0700 (PDT) Received: (qmail 6703 invoked by uid 1001); 19 Apr 2002 23:27:26 -0000 Date: Fri, 19 Apr 2002 23:27:26 +0000 From: "J. Mallett" To: Peter Wemm Cc: Robert Watson , Perforce Change Reviews Subject: Re: PERFORCE change 10000 for review Message-ID: <20020419232726.GA16783@FreeBSD.ORG> References: <200204191357.g3JDvxx44343@freefall.freebsd.org> <20020419231825.363FC380F@overcee.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020419231825.363FC380F@overcee.wemm.org> User-Agent: Mutt/1.3.27i Organisation: FreeBSD Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, Apr 19, 2002 at 04:18:25PM -0700, Peter Wemm wrote: > Robert Watson wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10000 > > > > Change 10000 by rwatson@rwatson_tislabs on 2002/04/19 06:57:44 > > w00t. 10000 changes. :-] And of course, it was Robert who broke the barrier. Go rwatson go! -- jmallett@FreeBSD.org | C, MIPS, POSIX, UNIX, BSD, IRC Geek. http://www.FreeBSD.org | The Power to Serve "We all need mirrors to remind ourselves who we are -- I'm no different." To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 19 17:49:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C3FF37B41B; Fri, 19 Apr 2002 17:49:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2E3B437B41C for ; Fri, 19 Apr 2002 17:49:07 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3K0n6A05913 for perforce@freebsd.org; Fri, 19 Apr 2002 17:49:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Apr 2002 17:49:06 -0700 (PDT) Message-Id: <200204200049.g3K0n6A05913@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10017 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10017 Change 10017 by rwatson@rwatson_tislabs on 2002/04/19 17:48:47 Strategic whitespace diff reduction from main tree. Not sure how this whitespace diff arrived in the first place, but it's swelling the diff size. Affected files ... ... //depot/projects/trustedbsd/mac/sys/dev/an/if_an_isa.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/dev/an/if_an_isa.c#4 (text+ko) ==== @@ -41,7 +41,6 @@ */ #include "opt_inet.h" - #ifdef INET #define ANCACHE #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 19 18:16:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BEA437B41A; Fri, 19 Apr 2002 18:16:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7CC4037B417 for ; Fri, 19 Apr 2002 18:16:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3K1Gf813074 for perforce@freebsd.org; Fri, 19 Apr 2002 18:16:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 19 Apr 2002 18:16:41 -0700 (PDT) Message-Id: <200204200116.g3K1Gf813074@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10020 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10020 Change 10020 by rwatson@rwatson_tislabs on 2002/04/19 18:16:36 Remove trailing whitespace originating from xterm copy/paste. Affected files ... ... //depot/projects/trustedbsd/mac/sys/conf/NOTES#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/NOTES#3 (text+ko) ==== @@ -698,7 +698,7 @@ ##################################################################### # SECURITY POLICY PARAMETERS - + # Support for Mandatory Access Control (MAC) options MAC options MAC_BIBA @@ -706,7 +706,7 @@ options MAC_NONE options MAC_TE options SEBSD #Warning, won't boot without a policy - + ##################################################################### # CLOCK OPTIONS To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 20 2:11:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AA0837B41A; Sat, 20 Apr 2002 02:09:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CAF8F37B41D for ; Sat, 20 Apr 2002 02:09:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3K99M902377 for perforce@freebsd.org; Sat, 20 Apr 2002 02:09:22 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sat, 20 Apr 2002 02:09:22 -0700 (PDT) Message-Id: <200204200909.g3K99M902377@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10034 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10034 Change 10034 by jake@jake_sparc64 on 2002/04/20 02:08:57 Integ@10032 Affected files ... ... //depot/projects/sparc64/MAINTAINERS#2 integrate ... //depot/projects/sparc64/Makefile.inc1#9 integrate ... //depot/projects/sparc64/UPDATING#5 integrate ... //depot/projects/sparc64/bin/date/date.1#3 integrate ... //depot/projects/sparc64/bin/df/df.1#2 integrate ... //depot/projects/sparc64/bin/domainname/domainname.1#2 integrate ... //depot/projects/sparc64/bin/ed/ed.1#2 integrate ... //depot/projects/sparc64/bin/hostname/hostname.1#2 integrate ... //depot/projects/sparc64/bin/ls/ls.1#3 integrate ... //depot/projects/sparc64/bin/mkdir/mkdir.1#2 integrate ... //depot/projects/sparc64/bin/ps/ps.1#2 integrate ... //depot/projects/sparc64/bin/pwd/pwd.1#2 integrate ... //depot/projects/sparc64/bin/rcp/Makefile#2 integrate ... //depot/projects/sparc64/bin/rcp/rcp.1#2 integrate ... //depot/projects/sparc64/bin/sh/bltin/echo.1#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/cccp.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_dynamic.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_log.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_vprompt.c#5 integrate ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c#3 integrate ... //depot/projects/sparc64/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec#3 integrate ... //depot/projects/sparc64/crypto/openssh/session.c#5 integrate ... //depot/projects/sparc64/etc/etc.alpha/ttys#2 integrate ... //depot/projects/sparc64/etc/etc.i386/ttys#2 integrate ... //depot/projects/sparc64/etc/etc.ia64/ttys#2 integrate ... //depot/projects/sparc64/etc/etc.sparc64/ttys#2 integrate ... //depot/projects/sparc64/etc/locale.deprecated#2 integrate ... //depot/projects/sparc64/etc/pam.d/Makefile#3 integrate ... //depot/projects/sparc64/etc/pam.d/ftp#2 integrate ... //depot/projects/sparc64/etc/pam.d/ftpd#2 integrate ... //depot/projects/sparc64/etc/pam.d/gdm#2 integrate ... //depot/projects/sparc64/etc/pam.d/login#3 integrate ... //depot/projects/sparc64/etc/pam.d/other#2 integrate ... //depot/projects/sparc64/etc/pam.d/rsh#3 integrate ... //depot/projects/sparc64/etc/pam.d/sshd#4 integrate ... //depot/projects/sparc64/etc/pam.d/su#2 integrate ... //depot/projects/sparc64/etc/pam.d/xdm#2 integrate ... //depot/projects/sparc64/gnu/lib/libgcc/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/cvs/cvs/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/gperf/Makefile#5 integrate ... //depot/projects/sparc64/include/Makefile#5 integrate ... //depot/projects/sparc64/include/kenv.h#1 branch ... //depot/projects/sparc64/lib/compat/Makefile.inc#2 integrate ... //depot/projects/sparc64/lib/compat/compat3x.i386/Makefile#2 integrate ... //depot/projects/sparc64/lib/compat/compat4x.alpha/Makefile#2 integrate ... //depot/projects/sparc64/lib/compat/compat4x.i386/Makefile#2 integrate ... //depot/projects/sparc64/lib/libc/gen/strtofflags.c#5 integrate ... //depot/projects/sparc64/lib/libc/net/getaddrinfo.3#3 integrate ... //depot/projects/sparc64/lib/libc/net/ifname.c#4 integrate ... //depot/projects/sparc64/lib/libc/net/inet_addr.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/inet_pton.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/rthdr.c#3 integrate ... //depot/projects/sparc64/lib/libc/net/vars.c#3 integrate ... //depot/projects/sparc64/lib/libc/sys/Makefile.inc#2 integrate ... //depot/projects/sparc64/lib/libc/sys/kenv.2#1 branch ... //depot/projects/sparc64/lib/libipsec/ipsec_set_policy.3#2 integrate ... //depot/projects/sparc64/lib/libipsec/ipsec_strerror.3#2 integrate ... //depot/projects/sparc64/lib/libncp/ncpl_nls.c#2 integrate ... //depot/projects/sparc64/lib/libpam/libpam/Makefile#5 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8#2 integrate ... //depot/projects/sparc64/lib/libutil/auth.conf.5#2 integrate ... //depot/projects/sparc64/lib/libypclnt/Makefile#3 integrate ... //depot/projects/sparc64/libexec/rexecd/rexecd.c#2 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml#4 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate ... //depot/projects/sparc64/release/picobsd/bridge/crunch.conf#2 integrate ... //depot/projects/sparc64/release/picobsd/dial/crunch.conf#2 integrate ... //depot/projects/sparc64/release/picobsd/isp/crunch.conf#2 integrate ... //depot/projects/sparc64/release/picobsd/net/crunch.conf#2 integrate ... //depot/projects/sparc64/release/picobsd/router/crunch.conf#2 integrate ... //depot/projects/sparc64/sbin/dump/Makefile#2 integrate ... //depot/projects/sparc64/sbin/dump/dump.8#2 integrate ... //depot/projects/sparc64/sbin/fdisk/fdisk.8#2 integrate ... //depot/projects/sparc64/sbin/fdisk/fdisk.c#3 integrate ... //depot/projects/sparc64/sbin/ifconfig/ifconfig.c#4 integrate ... //depot/projects/sparc64/sbin/ifconfig/ifieee80211.c#2 integrate ... //depot/projects/sparc64/sbin/ifconfig/ifmedia.c#2 integrate ... //depot/projects/sparc64/sbin/ifconfig/ifvlan.c#2 integrate ... //depot/projects/sparc64/sbin/ip6fw/ip6fw.8#2 integrate ... //depot/projects/sparc64/sbin/ip6fw/ip6fw.c#2 integrate ... //depot/projects/sparc64/sbin/md5/md5.1#2 integrate ... //depot/projects/sparc64/sbin/mount_nwfs/mount_nwfs.8#2 integrate ... //depot/projects/sparc64/sbin/restore/Makefile#2 integrate ... //depot/projects/sparc64/sbin/savecore/savecore.c#7 integrate ... //depot/projects/sparc64/sbin/startslip/startslip.1#2 integrate ... //depot/projects/sparc64/sbin/tunefs/tunefs.8#2 integrate ... //depot/projects/sparc64/share/examples/nwclient/dot.nwfsrc#2 integrate ... //depot/projects/sparc64/share/info/Makefile#2 integrate ... //depot/projects/sparc64/share/man/man3/Makefile#2 integrate ... //depot/projects/sparc64/share/man/man3/queue.3#2 integrate ... //depot/projects/sparc64/share/man/man4/Makefile#4 integrate ... //depot/projects/sparc64/share/man/man4/ed.4#2 integrate ... //depot/projects/sparc64/share/man/man4/ef.4#2 integrate ... //depot/projects/sparc64/share/man/man4/tcp.4#3 integrate ... //depot/projects/sparc64/share/man/man4/ucom.4#1 branch ... //depot/projects/sparc64/share/man/man4/uhid.4#1 branch ... //depot/projects/sparc64/share/man/man4/uhidev.4#1 branch ... //depot/projects/sparc64/share/man/man4/ulpt.4#1 branch ... //depot/projects/sparc64/share/man/man4/umodem.4#1 branch ... //depot/projects/sparc64/share/man/man4/uplcom.4#1 branch ... //depot/projects/sparc64/share/man/man4/uvscom.4#1 branch ... //depot/projects/sparc64/share/man/man5/moduli.5#2 integrate ... //depot/projects/sparc64/share/man/man7/stdint.7#2 integrate ... //depot/projects/sparc64/share/man/man8/intro.8#3 integrate ... //depot/projects/sparc64/share/man/man9/sx.9#5 integrate ... //depot/projects/sparc64/share/mk/Makefile#4 integrate ... //depot/projects/sparc64/share/mk/bsd.cpu.mk#2 integrate ... //depot/projects/sparc64/share/mk/bsd.dep.mk#5 integrate ... //depot/projects/sparc64/share/mk/bsd.doc.mk#3 integrate ... //depot/projects/sparc64/share/mk/bsd.docb.mk#2 integrate ... //depot/projects/sparc64/share/mk/bsd.info.mk#3 integrate ... //depot/projects/sparc64/share/mk/bsd.init.mk#1 branch ... //depot/projects/sparc64/share/mk/bsd.lib.mk#10 integrate ... //depot/projects/sparc64/share/mk/bsd.libnames.mk#9 integrate ... //depot/projects/sparc64/share/mk/bsd.man.mk#3 integrate ... //depot/projects/sparc64/share/mk/bsd.nls.mk#3 integrate ... //depot/projects/sparc64/share/mk/bsd.obj.mk#4 integrate ... //depot/projects/sparc64/share/mk/bsd.own.mk#3 integrate ... //depot/projects/sparc64/share/mk/bsd.port.mk#2 integrate ... //depot/projects/sparc64/share/mk/bsd.port.post.mk#2 integrate ... //depot/projects/sparc64/share/mk/bsd.port.pre.mk#2 integrate ... //depot/projects/sparc64/share/mk/bsd.port.subdir.mk#2 integrate ... //depot/projects/sparc64/share/mk/bsd.prog.mk#9 integrate ... //depot/projects/sparc64/share/mk/bsd.sgml.mk#2 integrate ... //depot/projects/sparc64/share/mk/bsd.subdir.mk#3 integrate ... //depot/projects/sparc64/share/mk/sys.mk#4 integrate ... //depot/projects/sparc64/sys/alpha/alpha/dec_axppci_33.c#3 integrate ... //depot/projects/sparc64/sys/alpha/alpha/machdep.c#28 integrate ... //depot/projects/sparc64/sys/alpha/alpha/trap.c#18 integrate ... //depot/projects/sparc64/sys/alpha/conf/GENERIC#17 integrate ... //depot/projects/sparc64/sys/alpha/pci/lca.c#3 integrate ... //depot/projects/sparc64/sys/alpha/pci/lca_pci.c#4 integrate ... //depot/projects/sparc64/sys/alpha/pci/tsunami_pci.c#3 integrate ... //depot/projects/sparc64/sys/boot/efi/libefi/elf_freebsd.c#6 integrate ... //depot/projects/sparc64/sys/boot/i386/kgzldr/Makefile#3 integrate ... //depot/projects/sparc64/sys/boot/i386/loader/Makefile#6 integrate ... //depot/projects/sparc64/sys/coda/coda_subr.c#4 integrate ... //depot/projects/sparc64/sys/coda/coda_venus.c#4 integrate ... //depot/projects/sparc64/sys/compat/svr4/svr4_misc.c#10 integrate ... //depot/projects/sparc64/sys/conf/NOTES#5 integrate ... //depot/projects/sparc64/sys/conf/files#54 integrate ... //depot/projects/sparc64/sys/conf/kmod_syms.awk#3 integrate ... //depot/projects/sparc64/sys/crypto/des/podd.h#2 integrate ... //depot/projects/sparc64/sys/crypto/des/sk.h#2 integrate ... //depot/projects/sparc64/sys/dev/aac/aac_pci.c#11 integrate ... //depot/projects/sparc64/sys/dev/acpica/acpi.c#24 integrate ... //depot/projects/sparc64/sys/dev/acpica/acpi_timer.c#9 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-all.h#15 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-disk.c#26 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-dma.c#29 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-isa.c#9 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-pci.c#29 integrate ... //depot/projects/sparc64/sys/dev/ata/atapi-all.c#17 integrate ... //depot/projects/sparc64/sys/dev/awi/awi.c#5 integrate ... //depot/projects/sparc64/sys/dev/awi/awi_wep.c#5 integrate ... //depot/projects/sparc64/sys/dev/awi/awi_wicfg.c#5 integrate ... //depot/projects/sparc64/sys/dev/digi/digi.c#13 integrate ... //depot/projects/sparc64/sys/dev/digi/digi_isa.c#6 integrate ... //depot/projects/sparc64/sys/dev/hea/eni.c#3 integrate ... //depot/projects/sparc64/sys/dev/hea/eni_buffer.c#4 integrate ... //depot/projects/sparc64/sys/dev/hea/eni_transmit.c#2 integrate ... //depot/projects/sparc64/sys/dev/hea/eni_vcm.c#3 integrate ... //depot/projects/sparc64/sys/dev/hfa/hfa_eisa.c#1 branch ... //depot/projects/sparc64/sys/dev/hfa/hfa_freebsd.c#1 branch ... //depot/projects/sparc64/sys/dev/hfa/hfa_freebsd.h#1 branch ... //depot/projects/sparc64/sys/dev/hfa/hfa_pci.c#1 branch ... //depot/projects/sparc64/sys/dev/hfa/hfa_sbus.c#1 branch ... //depot/projects/sparc64/sys/dev/isp/isp.c#17 integrate ... //depot/projects/sparc64/sys/dev/isp/isp_inline.h#7 integrate ... //depot/projects/sparc64/sys/dev/isp/ispmbox.h#10 integrate ... //depot/projects/sparc64/sys/dev/mii/dcphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mly/mly.c#5 integrate ... //depot/projects/sparc64/sys/dev/my/if_my.c#2 integrate ... //depot/projects/sparc64/sys/dev/pci/pci.c#13 integrate ... //depot/projects/sparc64/sys/dev/tdfx/tdfx_pci.c#4 integrate ... //depot/projects/sparc64/sys/dev/tx/if_tx.c#1 branch ... //depot/projects/sparc64/sys/dev/tx/if_txreg.h#1 branch ... //depot/projects/sparc64/sys/dev/tx/if_txvar.h#1 branch ... //depot/projects/sparc64/sys/dev/usb/if_aue.c#10 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wi.c#25 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wivar.h#3 integrate ... //depot/projects/sparc64/sys/dev/wi/wi_hostap.c#2 integrate ... //depot/projects/sparc64/sys/dev/wi/wi_hostap.h#2 integrate ... //depot/projects/sparc64/sys/fs/fifofs/fifo_vnops.c#9 integrate ... //depot/projects/sparc64/sys/fs/procfs/procfs.h#6 integrate ... //depot/projects/sparc64/sys/fs/specfs/spec_vnops.c#11 integrate ... //depot/projects/sparc64/sys/geom/geom.h#7 integrate ... //depot/projects/sparc64/sys/geom/geom_dev.c#9 integrate ... //depot/projects/sparc64/sys/geom/geom_disk.c#7 integrate ... //depot/projects/sparc64/sys/geom/geom_dump.c#5 integrate ... //depot/projects/sparc64/sys/geom/geom_slice.c#8 integrate ... //depot/projects/sparc64/sys/i386/conf/GENERIC#19 integrate ... //depot/projects/sparc64/sys/i386/i386/autoconf.c#10 integrate ... //depot/projects/sparc64/sys/i386/i386/bios.c#10 integrate ... //depot/projects/sparc64/sys/i386/i386/busdma_machdep.c#4 integrate ... //depot/projects/sparc64/sys/i386/i386/machdep.c#30 integrate ... //depot/projects/sparc64/sys/i386/i386/mp_machdep.c#21 integrate ... //depot/projects/sparc64/sys/i386/i386/trap.c#22 integrate ... //depot/projects/sparc64/sys/ia64/conf/GENERIC#14 integrate ... //depot/projects/sparc64/sys/ia64/ia64/machdep.c#38 integrate ... //depot/projects/sparc64/sys/ia64/ia64/trap.c#22 integrate ... //depot/projects/sparc64/sys/kern/init_main.c#20 integrate ... //depot/projects/sparc64/sys/kern/init_sysent.c#18 integrate ... //depot/projects/sparc64/sys/kern/kern_descrip.c#21 integrate ... //depot/projects/sparc64/sys/kern/kern_environment.c#5 integrate ... //depot/projects/sparc64/sys/kern/kern_exec.c#22 integrate ... //depot/projects/sparc64/sys/kern/kern_exit.c#22 integrate ... //depot/projects/sparc64/sys/kern/kern_fork.c#27 integrate ... //depot/projects/sparc64/sys/kern/kern_ktrace.c#11 integrate ... //depot/projects/sparc64/sys/kern/kern_ntptime.c#7 integrate ... //depot/projects/sparc64/sys/kern/kern_proc.c#17 integrate ... //depot/projects/sparc64/sys/kern/kern_prot.c#28 integrate ... //depot/projects/sparc64/sys/kern/kern_resource.c#17 integrate ... //depot/projects/sparc64/sys/kern/kern_sig.c#25 integrate ... //depot/projects/sparc64/sys/kern/subr_hints.c#3 integrate ... //depot/projects/sparc64/sys/kern/subr_witness.c#22 integrate ... //depot/projects/sparc64/sys/kern/syscalls.c#17 integrate ... //depot/projects/sparc64/sys/kern/syscalls.master#16 integrate ... //depot/projects/sparc64/sys/kern/tty.c#15 integrate ... //depot/projects/sparc64/sys/kern/tty_pty.c#11 integrate ... //depot/projects/sparc64/sys/kern/uipc_mbuf2.c#3 integrate ... //depot/projects/sparc64/sys/kern/uipc_syscalls.c#13 integrate ... //depot/projects/sparc64/sys/kern/vfs_aio.c#19 integrate ... //depot/projects/sparc64/sys/kern/vfs_conf.c#7 integrate ... //depot/projects/sparc64/sys/kern/vfs_syscalls.c#28 integrate ... //depot/projects/sparc64/sys/kern/vfs_vnops.c#22 integrate ... //depot/projects/sparc64/sys/modules/Makefile#29 integrate ... //depot/projects/sparc64/sys/modules/hfa/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/hfa/eisa/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/hfa/hfa/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/hfa/pci/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/hfa/sbus/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/my/Makefile#1 branch ... //depot/projects/sparc64/sys/modules/tx/Makefile#4 integrate ... //depot/projects/sparc64/sys/net/if.c#19 integrate ... //depot/projects/sparc64/sys/net/if_faith.c#10 integrate ... //depot/projects/sparc64/sys/net/if_gif.c#10 integrate ... //depot/projects/sparc64/sys/net/if_stf.c#12 integrate ... //depot/projects/sparc64/sys/net/if_stf.h#4 integrate ... //depot/projects/sparc64/sys/net/net_osdep.c#2 integrate ... //depot/projects/sparc64/sys/net/net_osdep.h#4 integrate ... //depot/projects/sparc64/sys/net/radix.c#4 integrate ... //depot/projects/sparc64/sys/netatm/atm.h#2 integrate ... //depot/projects/sparc64/sys/netatm/atm_cm.c#3 integrate ... //depot/projects/sparc64/sys/netatm/atm_device.c#3 integrate ... //depot/projects/sparc64/sys/netatm/atm_if.c#4 integrate ... //depot/projects/sparc64/sys/netatm/atm_if.h#3 integrate ... //depot/projects/sparc64/sys/netatm/atm_ioctl.h#2 integrate ... //depot/projects/sparc64/sys/netatm/atm_signal.c#3 integrate ... //depot/projects/sparc64/sys/netatm/atm_socket.c#3 integrate ... //depot/projects/sparc64/sys/netatm/atm_subr.c#6 integrate ... //depot/projects/sparc64/sys/netatm/atm_sys.h#3 integrate ... //depot/projects/sparc64/sys/netatm/atm_usrreq.c#5 integrate ... //depot/projects/sparc64/sys/netatm/atm_var.h#5 integrate ... //depot/projects/sparc64/sys/netatm/ipatm/ipatm_usrreq.c#2 integrate ... //depot/projects/sparc64/sys/netatm/port.h#3 integrate ... //depot/projects/sparc64/sys/netatm/sigpvc/sigpvc_if.c#3 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_arp.c#3 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_cls.c#3 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_if.c#3 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_kxdr.c#3 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_msg.c#3 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_proto.c#3 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_util.c#2 integrate ... //depot/projects/sparc64/sys/netatm/spans/spans_var.h#3 integrate ... //depot/projects/sparc64/sys/netatm/uni/sscop_pdu.c#3 integrate ... //depot/projects/sparc64/sys/netatm/uni/sscop_subr.c#3 integrate ... //depot/projects/sparc64/sys/netatm/uni/sscop_upper.c#3 integrate ... //depot/projects/sparc64/sys/netatm/uni/uniarp.c#3 integrate ... //depot/projects/sparc64/sys/netatm/uni/uniarp_output.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/uniip.c#3 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_decode.c#3 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_if.c#3 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_sigmgr_state.c#3 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_subr.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_util.c#2 integrate ... //depot/projects/sparc64/sys/netatm/uni/unisig_vc_state.c#3 integrate ... //depot/projects/sparc64/sys/netinet/icmp6.h#3 integrate ... //depot/projects/sparc64/sys/netinet/in.h#11 integrate ... //depot/projects/sparc64/sys/netinet/in_gif.c#5 integrate ... //depot/projects/sparc64/sys/netinet/ip_encap.c#4 integrate ... //depot/projects/sparc64/sys/netinet/tcp_input.c#16 integrate ... //depot/projects/sparc64/sys/netinet6/ah.h#3 integrate ... //depot/projects/sparc64/sys/netinet6/ah_core.c#2 integrate ... //depot/projects/sparc64/sys/netinet6/ah_input.c#5 integrate ... //depot/projects/sparc64/sys/netinet6/ah_output.c#2 integrate ... //depot/projects/sparc64/sys/netinet6/dest6.c#2 integrate ... //depot/projects/sparc64/sys/netinet6/esp.h#3 integrate ... //depot/projects/sparc64/sys/netinet6/esp_input.c#5 integrate ... //depot/projects/sparc64/sys/netinet6/esp_output.c#2 integrate ... //depot/projects/sparc64/sys/netinet6/frag6.c#2 integrate ... //depot/projects/sparc64/sys/netinet6/icmp6.c#4 integrate ... //depot/projects/sparc64/sys/netinet6/in6.c#7 integrate ... //depot/projects/sparc64/sys/netinet6/in6.h#6 integrate ... //depot/projects/sparc64/sys/netinet6/in6_ifattach.c#3 integrate ... //depot/projects/sparc64/sys/netinet6/in6_pcb.c#11 integrate ... //depot/projects/sparc64/sys/netinet6/in6_proto.c#2 integrate ... //depot/projects/sparc64/sys/netinet6/in6_rmx.c#2 integrate ... //depot/projects/sparc64/sys/netinet6/in6_var.h#3 integrate ... //depot/projects/sparc64/sys/netinet6/ip6_forward.c#5 integrate ... //depot/projects/sparc64/sys/netinet6/ip6_fw.c#6 integrate ... //depot/projects/sparc64/sys/netinet6/ip6_fw.h#2 integrate ... //depot/projects/sparc64/sys/netinet6/ip6_input.c#7 integrate ... //depot/projects/sparc64/sys/netinet6/ip6_mroute.c#5 integrate ... //depot/projects/sparc64/sys/netinet6/ip6_mroute.h#2 integrate ... //depot/projects/sparc64/sys/netinet6/ip6_output.c#8 integrate ... //depot/projects/sparc64/sys/netinet6/ip6protosw.h#4 integrate ... //depot/projects/sparc64/sys/netinet6/ipcomp.h#3 integrate ... //depot/projects/sparc64/sys/netinet6/ipcomp_core.c#2 integrate ... //depot/projects/sparc64/sys/netinet6/ipcomp_input.c#3 integrate ... //depot/projects/sparc64/sys/netinet6/ipcomp_output.c#2 integrate ... //depot/projects/sparc64/sys/netinet6/ipsec.c#4 integrate ... //depot/projects/sparc64/sys/netinet6/ipsec.h#2 integrate ... //depot/projects/sparc64/sys/netinet6/nd6.c#7 integrate ... //depot/projects/sparc64/sys/netinet6/nd6.h#4 integrate ... //depot/projects/sparc64/sys/netinet6/nd6_nbr.c#3 integrate ... //depot/projects/sparc64/sys/netinet6/nd6_rtr.c#4 integrate ... //depot/projects/sparc64/sys/netinet6/route6.c#2 integrate ... //depot/projects/sparc64/sys/netinet6/udp6_output.c#6 integrate ... //depot/projects/sparc64/sys/netinet6/udp6_usrreq.c#8 integrate ... //depot/projects/sparc64/sys/netkey/key.h#3 integrate ... //depot/projects/sparc64/sys/netkey/key_debug.c#7 integrate ... //depot/projects/sparc64/sys/netncp/ncp_nls.h#2 integrate ... //depot/projects/sparc64/sys/netsmb/netbios.h#3 integrate ... //depot/projects/sparc64/sys/netsmb/smb.h#5 integrate ... //depot/projects/sparc64/sys/netsmb/smb_subr.c#5 integrate ... //depot/projects/sparc64/sys/nfsclient/nfs_socket.c#9 integrate ... //depot/projects/sparc64/sys/pc98/i386/machdep.c#26 integrate ... //depot/projects/sparc64/sys/pci/if_rl.c#10 integrate ... //depot/projects/sparc64/sys/pci/if_rlreg.h#5 integrate ... //depot/projects/sparc64/sys/pci/if_tx.c#6 delete ... //depot/projects/sparc64/sys/pci/if_txvar.h#3 delete ... //depot/projects/sparc64/sys/powerpc/include/cpufunc.h#10 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/pmap.c#18 integrate ... //depot/projects/sparc64/sys/sparc64/conf/GENERIC#23 integrate ... //depot/projects/sparc64/sys/sys/_types.h#2 integrate ... //depot/projects/sparc64/sys/sys/conf.h#14 integrate ... //depot/projects/sparc64/sys/sys/disklabel.h#18 integrate ... //depot/projects/sparc64/sys/sys/filedesc.h#10 integrate ... //depot/projects/sparc64/sys/sys/kenv.h#1 branch ... //depot/projects/sparc64/sys/sys/mount.h#10 integrate ... //depot/projects/sparc64/sys/sys/poll.h#4 integrate ... //depot/projects/sparc64/sys/sys/proc.h#31 integrate ... //depot/projects/sparc64/sys/sys/queue.h#5 integrate ... //depot/projects/sparc64/sys/sys/socket.h#5 integrate ... //depot/projects/sparc64/sys/sys/syscall.h#17 integrate ... //depot/projects/sparc64/sys/sys/syscall.mk#17 integrate ... //depot/projects/sparc64/sys/sys/sysproto.h#19 integrate ... //depot/projects/sparc64/sys/sys/systm.h#22 integrate ... //depot/projects/sparc64/sys/sys/un.h#6 integrate ... //depot/projects/sparc64/sys/ufs/ifs/ifs_vnops.c#4 integrate ... //depot/projects/sparc64/sys/vm/vm_fault.c#10 integrate ... //depot/projects/sparc64/sys/vm/vm_map.c#14 integrate ... //depot/projects/sparc64/sys/vm/vm_map.h#9 integrate ... //depot/projects/sparc64/sys/vm/vm_meter.c#7 integrate ... //depot/projects/sparc64/sys/vm/vm_object.c#10 integrate ... //depot/projects/sparc64/sys/vm/vm_object.h#4 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T001/ref.conf#3 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T002/ref.conf#3 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T003/ref.conf#3 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T004/ref.conf#3 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T005/ref.conf#3 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T010/ref.conf#3 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T012/ref.conf#3 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T013/ref.conf#3 integrate ... //depot/projects/sparc64/tools/regression/geom/Test/T014/ref.conf#2 integrate ... //depot/projects/sparc64/tools/regression/geom/geom_kernsim.c#3 integrate ... //depot/projects/sparc64/tools/regression/geom/geom_sim.h#4 integrate ... //depot/projects/sparc64/usr.bin/apply/apply.1#2 integrate ... //depot/projects/sparc64/usr.bin/ar/ar.1#2 integrate ... //depot/projects/sparc64/usr.bin/ar/ar.1aout#2 integrate ... //depot/projects/sparc64/usr.bin/basename/basename.1#2 integrate ... //depot/projects/sparc64/usr.bin/biff/biff.1#2 integrate ... //depot/projects/sparc64/usr.bin/cap_mkdb/cap_mkdb.1#2 integrate ... //depot/projects/sparc64/usr.bin/checknr/checknr.1#2 integrate ... //depot/projects/sparc64/usr.bin/chkey/chkey.1#2 integrate ... //depot/projects/sparc64/usr.bin/chpass/chpass.1#2 integrate ... //depot/projects/sparc64/usr.bin/col/col.1#2 integrate ... //depot/projects/sparc64/usr.bin/colcrt/colcrt.1#2 integrate ... //depot/projects/sparc64/usr.bin/colrm/colrm.1#2 integrate ... //depot/projects/sparc64/usr.bin/comm/comm.1#2 integrate ... //depot/projects/sparc64/usr.bin/compress/compress.1#3 integrate ... //depot/projects/sparc64/usr.bin/ctags/ctags.1#2 integrate ... //depot/projects/sparc64/usr.bin/doscmd/doscmd.1#2 integrate ... //depot/projects/sparc64/usr.bin/du/du.1#2 integrate ... //depot/projects/sparc64/usr.bin/ee/ee.1#2 integrate ... //depot/projects/sparc64/usr.bin/enigma/enigma.1#2 integrate ... //depot/projects/sparc64/usr.bin/expand/expand.1#2 integrate ... //depot/projects/sparc64/usr.bin/fetch/fetch.1#2 integrate ... //depot/projects/sparc64/usr.bin/file/file.1#2 integrate ... //depot/projects/sparc64/usr.bin/finger/finger.1#2 integrate ... //depot/projects/sparc64/usr.bin/fmt/fmt.1#2 integrate ... //depot/projects/sparc64/usr.bin/fold/fold.1#2 integrate ... //depot/projects/sparc64/usr.bin/fold/fold.c#3 integrate ... //depot/projects/sparc64/usr.bin/gcore/gcore.1#2 integrate ... //depot/projects/sparc64/usr.bin/getopt/getopt.1#2 integrate ... //depot/projects/sparc64/usr.bin/hexdump/hexdump.1#2 integrate ... //depot/projects/sparc64/usr.bin/hexdump/od.1#2 integrate ... //depot/projects/sparc64/usr.bin/join/join.1#3 integrate ... //depot/projects/sparc64/usr.bin/join/join.c#4 integrate ... //depot/projects/sparc64/usr.bin/kenv/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/kenv/kenv.1#2 integrate ... //depot/projects/sparc64/usr.bin/kenv/kenv.c#2 integrate ... //depot/projects/sparc64/usr.bin/login/login.c#3 integrate ... //depot/projects/sparc64/usr.bin/m4/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/m4/TEST/ack.m4#2 integrate ... //depot/projects/sparc64/usr.bin/m4/TEST/hanoi.m4#2 integrate ... //depot/projects/sparc64/usr.bin/m4/TEST/hash.m4#2 integrate ... //depot/projects/sparc64/usr.bin/m4/TEST/sqroot.m4#2 integrate ... //depot/projects/sparc64/usr.bin/m4/TEST/string.m4#2 integrate ... //depot/projects/sparc64/usr.bin/m4/TEST/test.m4#2 integrate ... //depot/projects/sparc64/usr.bin/m4/eval.c#2 integrate ... //depot/projects/sparc64/usr.bin/m4/expr.c#3 integrate ... //depot/projects/sparc64/usr.bin/m4/extern.h#3 integrate ... //depot/projects/sparc64/usr.bin/m4/gnum4.c#1 branch ... //depot/projects/sparc64/usr.bin/m4/look.c#2 integrate ... //depot/projects/sparc64/usr.bin/m4/m4.1#2 integrate ... //depot/projects/sparc64/usr.bin/m4/main.c#2 integrate ... //depot/projects/sparc64/usr.bin/m4/mdef.h#2 integrate ... //depot/projects/sparc64/usr.bin/m4/misc.c#2 integrate ... //depot/projects/sparc64/usr.bin/m4/pathnames.h#2 integrate ... //depot/projects/sparc64/usr.bin/m4/stdd.h#2 integrate ... //depot/projects/sparc64/usr.bin/m4/trace.c#1 branch ... //depot/projects/sparc64/usr.bin/make/main.c#5 integrate ... //depot/projects/sparc64/usr.bin/make/make.1#3 integrate ... //depot/projects/sparc64/usr.bin/msgs/msgs.c#4 integrate ... //depot/projects/sparc64/usr.bin/rlogin/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/rsh/Makefile#3 integrate ... //depot/projects/sparc64/usr.bin/tip/tip/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/uniq/uniq.c#3 integrate ... //depot/projects/sparc64/usr.bin/uudecode/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/uudecode/uudecode.c#4 integrate ... //depot/projects/sparc64/usr.bin/uuencode/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/uuencode/uuencode.1#2 integrate ... //depot/projects/sparc64/usr.bin/xargs/Makefile#2 integrate ... //depot/projects/sparc64/usr.bin/xargs/strnsubst.c#1 branch ... //depot/projects/sparc64/usr.bin/xargs/xargs.1#2 integrate ... //depot/projects/sparc64/usr.bin/xargs/xargs.c#2 integrate ... //depot/projects/sparc64/usr.bin/yacc/yacc.1#3 integrate ... //depot/projects/sparc64/usr.sbin/extattrctl/extattrctl.c#3 integrate ... //depot/projects/sparc64/usr.sbin/faithd/README#2 integrate ... //depot/projects/sparc64/usr.sbin/faithd/faithd.8#2 integrate ... //depot/projects/sparc64/usr.sbin/faithd/faithd.c#2 integrate ... //depot/projects/sparc64/usr.sbin/faithd/faithd.h#2 integrate ... //depot/projects/sparc64/usr.sbin/faithd/ftp.c#2 integrate ... //depot/projects/sparc64/usr.sbin/faithd/prefix.c#2 integrate ... //depot/projects/sparc64/usr.sbin/faithd/prefix.h#2 integrate ... //depot/projects/sparc64/usr.sbin/faithd/rsh.c#2 integrate ... //depot/projects/sparc64/usr.sbin/faithd/tcp.c#2 integrate ... //depot/projects/sparc64/usr.sbin/inetd/inetd.8#2 integrate ... //depot/projects/sparc64/usr.sbin/lpr/lpd/lpd.8#2 integrate ... //depot/projects/sparc64/usr.sbin/lpr/lpd/lpd.c#2 integrate ... //depot/projects/sparc64/usr.sbin/lpr/lpd/printjob.c#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/ccp.c#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/ccp.h#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/command.c#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/deflate.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/fsm.c#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/fsm.h#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/ipcp.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/ipv6cp.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/lcp.c#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/lcp.h#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/mppe.c#4 integrate ... //depot/projects/sparc64/usr.sbin/ppp/ppp.8.m4#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/pred.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/throughput.c#2 integrate ... //depot/projects/sparc64/usr.sbin/rtsold/rtsol.c#2 integrate ... //depot/projects/sparc64/usr.sbin/vipw/pw_util.c#3 integrate ... //depot/projects/sparc64/usr.sbin/yppush/yppush_main.c#2 integrate Differences ... ==== //depot/projects/sparc64/MAINTAINERS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.3 2002/04/15 16:01:41 imp Exp $ +$FreeBSD: src/MAINTAINERS,v 1.18 2002/04/20 08:24:11 jake Exp $ subsystem login notes ------------------------- @@ -6,8 +6,52 @@ binutils obrien Insists to keep BU blocked from other's unapproved commits gcc obrien Do not commit w/o approval until Gcc 3.1 WIP completed -ATA/IDE sos Prefers to pre-approve commits -ahc(4) gibbs Prefers to pre-approve commits -NEWCARD imp Pre-commit review strongly requested -OLDCARD imp Pre-commit review preferred -wi imp Would like to review patches +libc/posix1e rwatson Would like to review patches +ATA/IDE sos Pre-commit review requested. +ahc(4) gibbs Pre-commit review requested. +NEWCARD imp Pre-commit review requested. +OLDCARD imp Pre-commit review requested. +wi imp Pre-commit review requested. +perl5 markm wants to be (reasonably) sure that commits do + not break STABLE upgrades and cross-builds +telnet markm commits _must_ be made to src/crypto/telnet + first, only then to "base" telnet via "make + unifdef" +i386 boot[012] jhb Pre-commit review preferred. Robert Nordier would + probably also like to review these as well. +cdboot jhb Pre-commit review requested. +pxeboot jhb Pre-commit review requested. +witness jhb Pre-commit review requested. +geom phk Pre-commit review requested. +specinfo/dev_t phk Pre-commit review requested. +struct disk phk Pre-commit review requested. +specfs phk Pre-commit review requested. +devfs phk Pre-commit review requested. +geom phk Pre-commit review requested. +timekeeping phk Pre-commit review requested. +md(4) phk Pre-commit review requested. +aac scottl Pre-commit review requested +udf scottl Pre-commit review with myself or asmodai requested. +powerpc benno Pre-commit review preferred. +CAM gibbs, + ken, + mjacob Pre-commit review requested. send to scsi@freebsd.org +devstat(9) ken Pre-commit review requested. +camcontrol(8) ken Pre-commit review requested. +libcam ken Pre-commit review requested. +libdevstat ken Pre-commit review requested. +iostat(8) ken Pre-commit review requested. +cd(4) ken Pre-commit review requested. +pass(4) ken Pre-commit review requested. +ch(4) ken Pre-commit review requested. +isp(4) mjacob {isp_freebsd.?,isp_pci.c}: heads-up on changes please. + All other files need pre-commit with mjacob as they're + shared with five other platforms. +sendmail gshapiro Pre-commit review requested. +etc/mail gshapiro Pre-commit review requested. + Keep in sync with -STABLE. +etc/sendmail gshapiro Pre-commit review requested. + Keep in sync with -STABLE. +dhcp murray Needs to pre-approve commits to contrib/isc-dhcp, so + changes can be made to the isc.org CVS repository. +RELENG_4_* security-officer Requires Security Officer approval. ==== //depot/projects/sparc64/Makefile.inc1#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.257 2002/04/15 15:31:25 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.259 2002/04/16 14:38:15 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -728,53 +728,61 @@ ${MAKE} -f Makefile.inc1 _prebuild_libs; \ ${MAKE} -f Makefile.inc1 _generic_libs; -.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}.pcc) -_startup_libs= lib/csu/${MACHINE_ARCH}.pcc -.elif ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" -_startup_libs= lib/csu/i386-elf +# These dependencies are not automatically generated: +# +# gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all +# shared libraries for ELF. +# +_startup_libs= gnu/lib/csu gnu/lib/libgcc +.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-${OBJFORMAT}) +_startup_libs+= lib/csu/${MACHINE_ARCH}-${OBJFORMAT} .else -_startup_libs= lib/csu/${MACHINE_ARCH} +_startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_startup_libs+= gnu/lib/csu gnu/lib/libgcc -_prebuild_libs= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ - lib/libncurses lib/libopie lib/libradius lib/librpcsvc \ - lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ - lib/libz lib/msun +_prebuild_libs= -lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L -lib/libypclnt__L: lib/librpcsvc__L +_generic_libs= gnu/lib -_generic_libs= lib gnu/lib - .if !defined(NOPERL) && !defined(NO_PERL) _generic_libs+= gnu/usr.bin/perl/libperl .endif -.if !defined(NOCRYPT) -.if defined(MAKE_KERBEROS4) -_prebuild_libs+= kerberosIV/lib/libkrb -kerberosIV/lib/libkrb__L: lib/libcrypt__L -_generic_libs+= kerberosIV/lib -.endif -.if defined(MAKE_KERBEROS5) +.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 _prebuild_libs+= kerberos5/lib/libroken _generic_libs+= kerberos5/lib .endif -.if !defined(NOSECURE) + +.if !defined(NOCRYPT) && defined(MAKE_KERBEROS4) +_prebuild_libs+= kerberosIV/lib/libkrb +kerberosIV/lib/libkrb__L: lib/libcrypt__L +_generic_libs+= kerberosIV/lib +.endif + +_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ + lib/libncurses lib/libopie lib/libradius lib/librpcsvc \ + lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ + lib/libz lib/msun + +lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L +lib/libypclnt__L: lib/librpcsvc__L + +_generic_libs+= lib + +.if !defined(NOCRYPT) && !defined(NOSECURE) _prebuild_libs+= secure/lib/libcrypto .if !defined(NO_OPENSSH) _prebuild_libs+= secure/lib/libssh secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L .endif _generic_libs+= secure/lib -.endif !defined(NOSECURE) -.endif !defined(NOCRYPT) +.endif _generic_libs+= usr.bin/lex/lib + .if ${MACHINE_ARCH} == "i386" _generic_libs+= usr.sbin/pcvt/keycap .endif ==== //depot/projects/sparc64/UPDATING#5 (text+ko) ==== @@ -31,14 +31,8 @@ an alternative MTA. Setting mta_start_script to "" will also prevent any MTA from being started at boot. -20020404: - Due to the import of sendmail 8.12.2 (see 20020217 entry), a new - user and group are required in order for sendmail to run as a - set-group-ID binary. A 'make installworld' will use the new user - and group to set the owner and group of /var/spool/clientmqueue - and will fail if the new user and group do not exist. The 'smmsp' - user and group must be merged from src/etc/group and - src/etc/master.passwd before using 'make installworld'. +20020403: + UCONSOLE is no longer a valid kernel option. 20020315: FreeBSD 5.0 DP-1 was basically branched today. @@ -54,6 +48,18 @@ mergemaster (especially for updating /etc/rc, /etc/defaults/rc.conf, and /etc/mail) and read /etc/mail/README for more details. + Due to the import of sendmail 8.12.2, a new user and group are + required in order for sendmail to run as a set-group-ID + binary. A 'make installworld' will use the new user and group + to set the owner and group of /var/spool/clientmqueue and will + fail if the new user and group do not exist. The 'smmsp' user + and group must be merged from src/etc/group and + src/etc/master.passwd before using 'make installworld'. + 'mergemaster -p' will do this. You may need to install + mergemaster before this will work if you are updating from a + very old version of current. The updating recipe has changed + as of this date. + 20020112: The preferred configuration method for PAM is now /etc/pam.d/ rather than /etc/pam.conf. If you have an unmodified @@ -64,7 +70,6 @@ Please see the following url for more details: http://www.freebsd.org/cgi/mid.cgi?db=mid&id= - 20011229: If anyone here is already using the new rc.conf(5) variable networkfs_types, please note that it has changed @@ -931,6 +936,7 @@ cp src/sys/${MACHINE_ARCH}/conf/GENERIC.hints /boot/device.hints [2] make installkernel KERNCONF=YOUR_KERNEL_HERE reboot in single user [3] + mergemaster -p [5] make installworld mergemaster [4] [1] @@ -970,6 +976,13 @@ as the archives of freebsd-current and freebsd-hackers mailing lists for potential gotchas. + [5] Usually this step is a noop. However, from time to time + you may need to do this if you get unknown user in the following + step. It never hurts to do it all the time. You may need to + install a new mergemaster (cd src/usr.sbin/mergemaster && make + install) after the buildworld before this step if you last updated + from current before 20020224 or from -stable before 20020408. + FORMAT: This file contains a list, in reverse chronological order, of major @@ -1003,4 +1016,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.199 2002/04/11 05:45:17 imp Exp $ +$FreeBSD: src/UPDATING,v 1.201 2002/04/19 11:37:34 ru Exp $ ==== //depot/projects/sparc64/bin/date/date.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)date.1 8.3 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/date/date.1,v 1.56 2002/04/15 18:17:18 trhodes Exp $ +.\" $FreeBSD: src/bin/date/date.1,v 1.57 2002/04/16 14:28:47 trhodes Exp $ .\" .Dd November 17, 1993 .Dt DATE 1 @@ -76,7 +76,7 @@ .Nm utility displays the date and time read from the kernel clock. When used to set the date and time, -both the kernel clock and the CMOS clock are updated. +both the kernel clock and the hardware clock are updated. .Pp Only the superuser may set the date, and if the system securelevel (see ==== //depot/projects/sparc64/bin/df/df.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.25 2001/07/10 10:04:05 ru Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.26 2002/04/16 20:00:45 charnier Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -48,7 +48,9 @@ .Op Fl t Ar type .Op Ar file | filesystem ... .Sh DESCRIPTION -.Nm Df +The +.Nm +utility displays statistics about the amount of free disk space on the specified .Ar filesystem or on the filesystem of which ==== //depot/projects/sparc64/bin/domainname/domainname.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)hostname.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/domainname/domainname.1,v 1.14 2001/10/19 14:44:13 ru Exp $ +.\" $FreeBSD: src/bin/domainname/domainname.1,v 1.15 2002/04/16 20:01:22 charnier Exp $ .\" .Dd September 18, 1994 .Dt DOMAINNAME 1 @@ -42,8 +42,9 @@ .Nm .Op Ar ypdomain .Sh DESCRIPTION -.Nm Domainname -prints the name of the current YP/NIS domain. The super-user can +The +.Nm +utility prints the name of the current YP/NIS domain. The super-user can set the domain name by supplying an argument; this is usually done in the network initialization script .Pa /etc/rc.network , ==== //depot/projects/sparc64/bin/ed/ed.1#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/bin/ed/ed.1,v 1.29 2001/08/10 17:35:07 ru Exp $ +.\" $FreeBSD: src/bin/ed/ed.1,v 1.30 2002/04/16 20:02:15 charnier Exp $ .Dd May 21, 1993 .Dt ED 1 .Os @@ -15,8 +15,9 @@ .\" .LP .\" red [-] [-sx] [-p \fIstring\fR] [\fIfile\fR] .Sh DESCRIPTION -.Nm Ed -is a line-oriented text editor. +The +.Nm +utility is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files. .\" .B red @@ -147,8 +148,9 @@ .El .Sh LINE ADDRESSING An address represents the number of a line in the buffer. -.Nm Ed -maintains a +The +.Nm +utility maintains a .Em current address which is typically supplied to commands as the default address when none is specified. @@ -442,7 +444,9 @@ An interrupt (typically ^C) has the effect of aborting the current command and returning the editor to command mode. .Pp -.Nm Ed +The +.Nm +utility recognizes the following commands. The commands are shown together with the default address or address range supplied if none is specified (in parenthesis). @@ -578,8 +582,9 @@ If a single line fills for than one screen (as might be the case when viewing a binary file, for instance), a `--More--' prompt is printed on the last line. -.Nm Ed -waits until the RETURN key is pressed +The +.Nm +utility waits until the RETURN key is pressed before displaying the next screen. The current address is set to the last line printed. @@ -804,8 +809,9 @@ is `!', then it is replaced by text of the previous .Ar !command . -.Nm Ed -does not process +The +.Nm +utility does not process .Ar command for backslash (\\) escapes. However, an unescaped @@ -845,8 +851,9 @@ .%D 1981 .Re .Sh LIMITATIONS -.Nm Ed -processes +The +.Nm +utility processes .Ar file arguments for backslash escapes, i.e., in a filename, any characters preceded by a backslash (\\) are ==== //depot/projects/sparc64/bin/hostname/hostname.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)hostname.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.13 2001/07/15 07:49:01 dd Exp $ +.\" $FreeBSD: src/bin/hostname/hostname.1,v 1.14 2002/04/16 20:02:56 charnier Exp $ .\" .Dd April 28, 1995 .Dt HOSTNAME 1 @@ -43,8 +43,9 @@ .Op Fl s .Op Ar name-of-host .Sh DESCRIPTION -.Nm Hostname -prints the name of the current host. The super-user can +The +.Nm +utility prints the name of the current host. The super-user can set the hostname by supplying an argument; this is usually done in the network initialization script .Pa /etc/rc.network , ==== //depot/projects/sparc64/bin/ls/ls.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.63 2002/04/15 02:21:12 jwd Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.64 2002/04/16 20:03:54 charnier Exp $ .\" .Dd December 29, 2002 .Dt LS 1 @@ -627,7 +627,7 @@ .Sh STANDARDS The .Nm -function is expected to be a superset of the +utility is expected to be a superset of the .St -p1003.2 specification. .Sh BUGS ==== //depot/projects/sparc64/bin/mkdir/mkdir.1#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mkdir.1 8.2 (Berkeley) 1/25/94 -.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.15 2001/08/15 09:09:35 ru Exp $ +.\" $FreeBSD: src/bin/mkdir/mkdir.1,v 1.16 2002/04/16 20:04:43 charnier Exp $ .\" .Dd January 25, 1994 .Dt MKDIR 1 @@ -47,8 +47,9 @@ .Op Fl m Ar mode .Ar directory_name ... .Sh DESCRIPTION -.Nm Mkdir -creates the directories named as operands, in the order specified, +The +.Nm +utility creates the directories named as operands, in the order specified, using mode .Li rwxrwxrwx (\&0777) as modified by the current ==== //depot/projects/sparc64/bin/ps/ps.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.42 2002/02/21 18:27:16 dillon Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.43 2002/04/16 20:05:55 charnier Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -54,7 +54,9 @@ .Nm .Op Fl L .Sh DESCRIPTION -.Nm Ps +The +.Nm +utility displays a header line followed by lines containing information about your processes that have controlling terminals. This information is sorted by controlling terminal, then by process @@ -347,7 +349,9 @@ has a parent that has not yet waited for the process (in other words, a zombie) is listed as ``'', and a process which is blocked while trying to exit is listed as ``''. -.Nm Ps +The +.Nm +utility makes an educated guess as to the file name and arguments given when the process was created by examining memory or the swap area. The method is inherently somewhat unreliable and in any event a process ==== //depot/projects/sparc64/bin/pwd/pwd.1#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.17 2002/03/15 14:21:13 ru Exp $ +.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.18 2002/04/16 20:06:27 charnier Exp $ .\" .Dd February 4, 2002 .Dt PWD 1 @@ -45,8 +45,9 @@ .Nm .Op Fl L | P .Sh DESCRIPTION -.Nm Pwd -writes the absolute pathname of the current working directory to +The +.Nm +utility writes the absolute pathname of the current working directory to the standard output. .Pp Some shells may provide a builtin ==== //depot/projects/sparc64/bin/rcp/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 20 7:13:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8121F37B41A; Sat, 20 Apr 2002 07:11:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C54FD37B41D for ; Sat, 20 Apr 2002 07:11:21 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3KEBLa78069 for perforce@freebsd.org; Sat, 20 Apr 2002 07:11:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 20 Apr 2002 07:11:21 -0700 (PDT) Message-Id: <200204201411.g3KEBLa78069@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10045 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10045 Change 10045 by rwatson@rwatson_tislabs on 2002/04/20 07:10:26 For compatibility/standards reasons, we can't make mbuf.h depend on new include files in consuming source; bfeldman already added mac.h include to mbuf.h, now propagate removal of mac.h to various interface source files in the dev tree. This is a pretty large diff reduction against the base source tree. It is still recommended that explicit consumers of the MAC interfaces explicitly include mac.h even if they include mbuf.h, however. Affected files ... ... //depot/projects/trustedbsd/mac/sys/dev/an/if_an.c#9 edit ... //depot/projects/trustedbsd/mac/sys/dev/an/if_an_isa.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/an/if_an_pccard.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/an/if_an_pci.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/ar/if_ar.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/awi/awi.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/awi/awi_wep.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/awi/awi_wicfg.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/awi/if_awi_pccard.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#9 edit ... //depot/projects/trustedbsd/mac/sys/dev/cnw/if_cnw.c#6 edit ... //depot/projects/trustedbsd/mac/sys/dev/cs/if_cs.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/cs/if_cs_isa.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/cs/if_cs_pccard.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_isa.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_pccard.c#6 edit ... //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_pci.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#6 edit ... //depot/projects/trustedbsd/mac/sys/dev/en/midway.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep_eisa.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep_isa.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep_pccard.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/ex/if_ex.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/ex/if_ex_isa.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/ex/if_ex_pccard.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/fe/if_fe.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/fe/if_fe_isa.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/fe/if_fe_pccard.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#7 edit ... //depot/projects/trustedbsd/mac/sys/dev/gx/if_gx.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/ie/if_ie.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/iicbus/if_ic.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/lge/if_lge.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/lmc/if_lmc.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc_isa.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc_pci.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/acphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/amphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/brgphy.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/dcphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/e1000phy.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/exphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/inphy.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/lxtphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/mii.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/mii_physubr.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/mlphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/nsphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/pnaphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/pnphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/qsphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/tdkphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/tlphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/ukphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/ukphy_subr.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/mii/xmphy.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/musycc/musycc.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#7 edit ... //depot/projects/trustedbsd/mac/sys/dev/pdq/pdqvar.h#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/ppbus/if_plip.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/ppbus/pcfclock.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/ray/if_ray.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni_isa.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni_pci.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn_isa.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn_pccard.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/sr/if_sr.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/txp/if_txp.c#6 edit ... //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#7 edit ... //depot/projects/trustedbsd/mac/sys/dev/usb/if_cue.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/usb/if_kue.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/usb/udbp.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/usb/usb_ethersubr.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/vx/if_vx.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/vx/if_vx_eisa.c#4 edit ... //depot/projects/trustedbsd/mac/sys/dev/vx/if_vx_pci.c#3 edit ... //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#14 edit ... //depot/projects/trustedbsd/mac/sys/dev/wl/if_wl.c#5 edit ... //depot/projects/trustedbsd/mac/sys/dev/xe/if_xe.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/dev/an/if_an.c#9 (text+ko) ==== @@ -90,7 +90,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/an/if_an_isa.c#5 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/an/if_an_pccard.c#4 (text+ko) ==== @@ -51,7 +51,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/an/if_an_pci.c#4 (text+ko) ==== @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ar/if_ar.c#4 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/awi/awi.c#5 (text+ko) ==== @@ -98,7 +98,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/awi/awi_wep.c#5 (text+ko) ==== @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/awi/awi_wicfg.c#5 (text+ko) ==== @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/awi/if_awi_pccard.c#5 (text+ko) ==== @@ -30,7 +30,6 @@ #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#9 (text+ko) ==== @@ -73,7 +73,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/cnw/if_cnw.c#6 (text+ko) ==== @@ -231,7 +231,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/cs/if_cs.c#3 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/cs/if_cs_isa.c#3 (text+ko) ==== @@ -31,7 +31,6 @@ #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/cs/if_cs_pccard.c#4 (text+ko) ==== @@ -30,7 +30,6 @@ #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed.c#5 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_isa.c#4 (text+ko) ==== @@ -28,7 +28,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_pccard.c#6 (text+ko) ==== @@ -30,7 +30,6 @@ #include "opt_ed.h" #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_pci.c#4 (text+ko) ==== @@ -21,7 +21,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#6 (text+ko) ==== @@ -41,7 +41,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/en/midway.c#4 (text+ko) ==== @@ -125,7 +125,6 @@ #include #endif #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep.c#5 (text+ko) ==== @@ -63,7 +63,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep_eisa.c#4 (text+ko) ==== @@ -23,7 +23,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep_isa.c#3 (text+ko) ==== @@ -31,7 +31,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep_pccard.c#4 (text+ko) ==== @@ -37,7 +37,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ex/if_ex.c#4 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ex/if_ex_isa.c#4 (text+ko) ==== @@ -27,7 +27,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ex/if_ex_pccard.c#4 (text+ko) ==== @@ -27,7 +27,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/fe/if_fe.c#3 (text+ko) ==== @@ -72,7 +72,6 @@ #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/fe/if_fe_isa.c#3 (text+ko) ==== @@ -23,7 +23,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/fe/if_fe_pccard.c#4 (text+ko) ==== @@ -24,7 +24,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#7 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include -#include #include #include /* #include */ ==== //depot/projects/trustedbsd/mac/sys/dev/gx/if_gx.c#5 (text+ko) ==== @@ -31,7 +31,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ie/if_ie.c#3 (text+ko) ==== @@ -116,7 +116,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/iicbus/if_ic.c#5 (text+ko) ==== @@ -32,7 +32,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/lge/if_lge.c#4 (text+ko) ==== @@ -76,7 +76,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/lmc/if_lmc.c#4 (text+ko) ==== @@ -37,7 +37,6 @@ #include "opt_netgraph.h" #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc.c#5 (text+ko) ==== @@ -65,7 +65,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc_isa.c#3 (text+ko) ==== @@ -31,7 +31,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc_pci.c#3 (text+ko) ==== @@ -31,7 +31,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/acphy.c#4 (text+ko) ==== @@ -69,7 +69,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/amphy.c#4 (text+ko) ==== @@ -39,7 +39,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/brgphy.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/dcphy.c#4 (text+ko) ==== @@ -42,7 +42,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/e1000phy.c#3 (text+ko) ==== @@ -35,7 +35,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/exphy.c#4 (text+ko) ==== @@ -71,7 +71,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/inphy.c#3 (text+ko) ==== @@ -34,7 +34,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/lxtphy.c#4 (text+ko) ==== @@ -73,7 +73,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/mii.c#4 (text+ko) ==== @@ -44,7 +44,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/mii_physubr.c#4 (text+ko) ==== @@ -42,7 +42,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/mlphy.c#4 (text+ko) ==== @@ -48,7 +48,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/nsphy.c#4 (text+ko) ==== @@ -72,7 +72,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/pnaphy.c#4 (text+ko) ==== @@ -43,7 +43,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/pnphy.c#4 (text+ko) ==== @@ -40,7 +40,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/qsphy.c#4 (text+ko) ==== @@ -73,7 +73,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/tdkphy.c#4 (text+ko) ==== @@ -43,7 +43,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/tlphy.c#4 (text+ko) ==== @@ -71,7 +71,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/ukphy.c#4 (text+ko) ==== @@ -71,7 +71,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/ukphy_subr.c#3 (text+ko) ==== @@ -42,7 +42,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/mii/xmphy.c#4 (text+ko) ==== @@ -39,7 +39,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/musycc/musycc.c#3 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#7 (text+ko) ==== @@ -90,7 +90,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/pdq/pdqvar.h#4 (text+ko) ==== @@ -66,7 +66,6 @@ #include #include #ifndef M_MCAST -#include #include #endif /* M_CAST */ #include ==== //depot/projects/trustedbsd/mac/sys/dev/ppbus/if_plip.c#4 (text+ko) ==== @@ -84,7 +84,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ppbus/pcfclock.c#4 (text+ko) ==== @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/ray/if_ray.c#3 (text+ko) ==== @@ -251,7 +251,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni.c#5 (text+ko) ==== @@ -63,7 +63,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni_isa.c#4 (text+ko) ==== @@ -29,7 +29,6 @@ #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni_pci.c#3 (text+ko) ==== @@ -29,7 +29,6 @@ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn.c#3 (text+ko) ==== @@ -83,7 +83,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn_isa.c#3 (text+ko) ==== @@ -32,7 +32,6 @@ #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn_pccard.c#4 (text+ko) ==== @@ -33,7 +33,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/sr/if_sr.c#4 (text+ko) ==== @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/txp/if_txp.c#6 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#7 (text+ko) ==== @@ -64,7 +64,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/usb/if_cue.c#5 (text+ko) ==== @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/usb/if_kue.c#5 (text+ko) ==== @@ -67,7 +67,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/usb/udbp.c#4 (text+ko) ==== @@ -83,7 +83,6 @@ #include #endif #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/usb/usb_ethersubr.c#5 (text+ko) ==== @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/vx/if_vx.c#5 (text+ko) ==== @@ -59,7 +59,6 @@ #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/vx/if_vx_eisa.c#4 (text+ko) ==== @@ -30,7 +30,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/vx/if_vx_pci.c#3 (text+ko) ==== @@ -30,7 +30,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#14 (text+ko) ==== @@ -65,7 +65,6 @@ #include #include #include -#include #include #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 20 7:18:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5396837B405; Sat, 20 Apr 2002 07:18:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id C439F37B400 for ; Sat, 20 Apr 2002 07:18:18 -0700 (PDT) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.11.6/8.11.6) with SMTP id g3KEI5w85674; Sat, 20 Apr 2002 10:18:05 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Sat, 20 Apr 2002 10:18:05 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Dag-Erling Smorgrav Cc: Perforce Change Reviews Subject: Re: PERFORCE change 9995 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 19 Apr 2002, Dag-Erling Smorgrav wrote: > Robert Watson writes: > > During integ, lost the definition of chunksize. extattrctl still > > doesn't build due to unresolved issues merging DES's main-tree > > optimization and green's trustedbsd_mac optimization, which > > (unfortunately) accomplish the optimization in a way that doesn't > > merge easily. > > I sent you a patch a couple of weeks before I committed that, but didn't > get a reply... Neither change is necessarily bad -- they just conflict, since they're in different branches, and I just integ'd the tree such that they appeared in the same branch. One thing that does need to happen is that non-MAC-specific changes need to be made less in the MAC branch, since that's caused a number of conflicts and multi-hour merges. General changes, and in particular style changes to existing code, should be made in the main tree and *not* in the MAC tree, where the sole result is conflicts. Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 20 7:19:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 183DE37B420; Sat, 20 Apr 2002 07:19:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id 4A7A537B41F; Sat, 20 Apr 2002 07:19:16 -0700 (PDT) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.11.6/8.11.6) with SMTP id g3KEJ5w85698; Sat, 20 Apr 2002 10:19:05 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Sat, 20 Apr 2002 10:19:05 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: "J. Mallett" Cc: Peter Wemm , Perforce Change Reviews Subject: Re: PERFORCE change 10000 for review In-Reply-To: <20020419232726.GA16783@FreeBSD.ORG> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 19 Apr 2002, J. Mallett wrote: > On Fri, Apr 19, 2002 at 04:18:25PM -0700, Peter Wemm wrote: > > Robert Watson wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10000 > > > > > > Change 10000 by rwatson@rwatson_tislabs on 2002/04/19 06:57:44 > > > > w00t. 10000 changes. :-] > > And of course, it was Robert who broke the barrier. Go rwatson go! And how telling is it that the change in question was a one-line whitespace change. :-) Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 20 20:15:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BEB937B416; Sat, 20 Apr 2002 20:14:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0602737B419 for ; Sat, 20 Apr 2002 20:14:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3L3ESS32158 for perforce@freebsd.org; Sat, 20 Apr 2002 20:14:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 20 Apr 2002 20:14:28 -0700 (PDT) Message-Id: <200204210314.g3L3ESS32158@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10073 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10073 Change 10073 by rwatson@rwatson_tislabs on 2002/04/20 20:14:17 Back out Brian's fix to the "loadable module file system bug", which could result in crashes when a module is loaded supporting a filesystem. This bug was fixed differently (and perhaps with less cleanliness) in the main tree, but in a recent integ, I apparently missed something and it resulted in mknod() causing system crashes during a vput() on device vnodes on UFS. This backout appears to resolve that problem, and also will reduce integ costs in the future. It may be worth looking at re-introducing these changes in the main tree in the future. Affected files ... ... //depot/projects/trustedbsd/mac/sys/coda/coda_vnops.c#6 edit ... //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#14 edit ... //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#5 edit ... //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#8 edit ... //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_denode.c#6 edit ... //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#7 edit ... //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_subr.c#3 edit ... //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vfsops.c#5 edit ... //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#4 edit ... //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vfsops.c#6 edit ... //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vnops.c#7 edit ... //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vncache.c#7 edit ... //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_node.c#6 edit ... //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#2 edit ... //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_subr.c#4 edit ... //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_vnops.c#4 edit ... //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_subr.c#8 edit ... //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vfsops.c#6 edit ... //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#5 edit ... //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vfsops.c#7 edit ... //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#7 edit ... //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#22 edit ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_node.c#5 edit ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_subs.c#6 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs.h#4 edit ... //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs_subr.c#4 edit ... //depot/projects/trustedbsd/mac/sys/sys/vnode.h#21 edit ... //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#11 edit ... //depot/projects/trustedbsd/mac/sys/ufs/ifs/ifs_vfsops.c#6 edit ... //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#32 edit ... //depot/projects/trustedbsd/mac/sys/vm/vm_swap.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/coda/coda_vnops.c#6 (text+ko) ==== @@ -578,7 +578,7 @@ * Make sure this is a coda style cnode, but it may be a * different vfsp */ - if (tvp->v_op != &coda_vnodeop_p) { + if (tvp->v_op != coda_vnodeop_p) { vrele(tvp); NDFREE(&ndp, NDF_ONLY_PNBUF); MARK_INT_FAIL(CODA_IOCTL_STATS); @@ -1959,7 +1959,7 @@ lockinit(&cp->c_lock, PINOD, "cnode", 0, 0); cp->c_fid = *fid; - err = getnewvnode(VT_CODA, vfsp, &coda_vnodeop_p, &vp); + err = getnewvnode(VT_CODA, vfsp, coda_vnodeop_p, &vp); if (err) { panic("coda: getnewvnode returned error %d\n", err); } ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#14 (text+ko) ==== @@ -143,7 +143,7 @@ } else { dev = NODEV; } - error = getnewvnode(VT_DEVFS, mp, &devfs_vnodeop_p, &vp); + error = getnewvnode(VT_DEVFS, mp, devfs_vnodeop_p, &vp); if (error != 0) { printf("devfs_allocv: failed to allocate new vnode\n"); return (error); @@ -152,7 +152,7 @@ if (de->de_dirent->d_type == DT_CHR) { vp->v_type = VCHR; vp = addaliasu(vp, dev->si_udev); - vp->v_op = &devfs_specop_p; + vp->v_op = devfs_specop_p; } else if (de->de_dirent->d_type == DT_DIR) { vp->v_type = VDIR; } else if (de->de_dirent->d_type == DT_LNK) { ==== //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#5 (text+ko) ==== @@ -135,7 +135,7 @@ */ MALLOC(fd, struct fdescnode *, sizeof(struct fdescnode), M_TEMP, M_WAITOK); - error = getnewvnode(VT_FDESC, mp, &fdesc_vnodeop_p, vpp); + error = getnewvnode(VT_FDESC, mp, fdesc_vnodeop_p, vpp); if (error) { FREE(fd, M_TEMP); goto out; ==== //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#8 (text+ko) ==== @@ -496,7 +496,7 @@ MALLOC(hp, struct hpfsnode *, sizeof(struct hpfsnode), M_HPFSNO, M_WAITOK); - error = getnewvnode(VT_HPFS, hpmp->hpm_mp, &hpfs_vnodeop_p, &vp); + error = getnewvnode(VT_HPFS, hpmp->hpm_mp, hpfs_vnodeop_p, &vp); if (error) { printf("hpfs_vget: can't get new vnode\n"); FREE(hp, M_HPFSNO); ==== //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_denode.c#6 (text+ko) ==== @@ -253,7 +253,7 @@ * copy it from the passed disk buffer. */ /* getnewvnode() does a VREF() on the vnode */ - error = getnewvnode(VT_MSDOSFS, mntp, &msdosfs_vnodeop_p, &nvp); + error = getnewvnode(VT_MSDOSFS, mntp, msdosfs_vnodeop_p, &nvp); if (error) { *depp = NULL; FREE(ldep, M_MSDOSFSNODE); ==== //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#7 (text+ko) ==== @@ -732,7 +732,7 @@ return (0); } - error = getnewvnode(VT_NTFS, ntmp->ntm_mountp, &ntfs_vnodeop_p, &vp); + error = getnewvnode(VT_NTFS, ntmp->ntm_mountp, ntfs_vnodeop_p, &vp); if(error) { ntfs_frele(fp); ntfs_ntput(ip); ==== //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_subr.c#3 (text+ko) ==== @@ -176,7 +176,7 @@ MALLOC(xp, struct null_node *, sizeof(struct null_node), M_NULLFSNODE, M_WAITOK); - error = getnewvnode(VT_NULL, mp, &null_vnodeop_p, vpp); + error = getnewvnode(VT_NULL, mp, null_vnodeop_p, vpp); if (error) { FREE(xp, M_NULLFSNODE); return (error); @@ -307,7 +307,7 @@ * Can't do this check because vop_reclaim runs * with a funny vop vector. */ - if (vp->v_op != &null_vnodeop_p) { + if (vp->v_op != null_vnodeop_p) { printf ("null_checkvp: on non-null-node\n"); while (null_checkvp_barrier) /*WAIT*/ ; panic("null_checkvp"); ==== //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vfsops.c#5 (text+ko) ==== @@ -121,7 +121,7 @@ * Unlock lower node to avoid deadlock. * (XXX) VOP_ISLOCKED is needed? */ - if ((mp->mnt_vnodecovered->v_op == &null_vnodeop_p) && + if ((mp->mnt_vnodecovered->v_op == null_vnodeop_p) && VOP_ISLOCKED(mp->mnt_vnodecovered, NULL)) { VOP_UNLOCK(mp->mnt_vnodecovered, 0, td); isvnunlocked = 1; ==== //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#4 (text+ko) ==== @@ -280,7 +280,7 @@ * that aren't. (We must always map first vp or vclean fails.) */ if (i && (*this_vp_p == NULLVP || - (*this_vp_p)->v_op != &null_vnodeop_p)) { + (*this_vp_p)->v_op != null_vnodeop_p)) { old_vps[i] = NULLVP; } else { old_vps[i] = *this_vp_p; ==== //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vfsops.c#6 (text+ko) ==== @@ -118,7 +118,7 @@ MALLOC(fmp, struct portalmount *, sizeof(struct portalmount), M_PORTALFSMNT, M_WAITOK); /* XXX */ - error = getnewvnode(VT_PORTAL, mp, &portal_vnodeop_p, &rvp); /* XXX */ + error = getnewvnode(VT_PORTAL, mp, portal_vnodeop_p, &rvp); /* XXX */ if (error) { FREE(fmp, M_PORTALFSMNT); FREE(pn, M_TEMP); ==== //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vnops.c#7 (text+ko) ==== @@ -135,7 +135,7 @@ MALLOC(pt, struct portalnode *, sizeof(struct portalnode), M_TEMP, M_WAITOK); - error = getnewvnode(VT_PORTAL, dvp->v_mount, &portal_vnodeop_p, &fvp); + error = getnewvnode(VT_PORTAL, dvp->v_mount, portal_vnodeop_p, &fvp); if (error) { FREE(pt, M_TEMP); goto bad; ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vncache.c#7 (text+ko) ==== @@ -133,7 +133,7 @@ MALLOC(pvd, struct pfs_vdata *, sizeof *pvd, M_PFSVNCACHE, M_WAITOK); if (++pfs_vncache_entries > pfs_vncache_maxentries) pfs_vncache_maxentries = pfs_vncache_entries; - error = getnewvnode(VT_PSEUDOFS, mp, &pfs_vnodeop_p, vpp); + error = getnewvnode(VT_PSEUDOFS, mp, pfs_vnodeop_p, vpp); if (error) return (error); pvd->pvd_pn = pn; ==== //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_node.c#6 (text+ko) ==== @@ -220,7 +220,7 @@ return ENOENT; MALLOC(np, struct smbnode *, sizeof *np, M_SMBNODE, M_WAITOK); - error = getnewvnode(VT_SMBFS, mp, &smbfs_vnodeop_p, &vp); + error = getnewvnode(VT_SMBFS, mp, smbfs_vnodeop_p, &vp); if (error) { FREE(np, M_SMBNODE); return error; ==== //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_subr.c#4 (text+ko) ==== @@ -212,7 +212,7 @@ MALLOC(xp, struct umap_node *, sizeof(struct umap_node), M_TEMP, M_WAITOK); - error = getnewvnode(VT_UMAP, mp, &umap_vnodeop_p, vpp); + error = getnewvnode(VT_UMAP, mp, umap_vnodeop_p, vpp); if (error) { FREE(xp, M_TEMP); return (error); @@ -311,7 +311,7 @@ * Can't do this check because vop_reclaim runs * with funny vop vector. */ - if (vp->v_op != &umap_vnodeop_p) { + if (vp->v_op != umap_vnodeop_p) { printf ("umap_checkvp: on non-umap-node\n"); while (umap_checkvp_barrier) /*WAIT*/ ; panic("umap_checkvp"); ==== //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_vnops.c#4 (text+ko) ==== @@ -125,7 +125,7 @@ * that aren't. (Must map first vp or vclean fails.) */ - if (i && (*this_vp_p)->v_op != &umap_vnodeop_p) { + if (i && (*this_vp_p)->v_op != umap_vnodeop_p) { old_vps[i] = NULL; } else { old_vps[i] = *this_vp_p; ==== //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_subr.c#8 (text+ko) ==== @@ -545,7 +545,7 @@ * Create new node rather then replace old node */ - error = getnewvnode(VT_UNION, mp, &union_vnodeop_p, vpp); + error = getnewvnode(VT_UNION, mp, union_vnodeop_p, vpp); if (error) { /* * If an error occurs clear out vnodes. @@ -1216,7 +1216,7 @@ { struct union_node *un; - if (vp->v_op != &union_vnodeop_p) { + if (vp->v_op != union_vnodeop_p) { if (vppp) { VREF(vp); *(*vppp)++ = vp; @@ -1299,7 +1299,7 @@ { int error = 0; - if ((*vp)->v_op == &union_vnodeop_p) { + if ((*vp)->v_op == union_vnodeop_p) { struct vnode *lvp; lvp = union_dircache(*vp, td); ==== //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vfsops.c#6 (text+ko) ==== @@ -126,7 +126,7 @@ /* * Unlock lower node to avoid deadlock. */ - if (lowerrootvp->v_op == &union_vnodeop_p) + if (lowerrootvp->v_op == union_vnodeop_p) VOP_UNLOCK(lowerrootvp, 0, td); #endif @@ -140,7 +140,7 @@ error = namei(ndp); #if 0 - if (lowerrootvp->v_op == &union_vnodeop_p) + if (lowerrootvp->v_op == union_vnodeop_p) vn_lock(lowerrootvp, LK_EXCLUSIVE | LK_RETRY, td); #endif if (error) ==== //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#5 (text+ko) ==== @@ -1319,7 +1319,7 @@ * replace the fdvp, release the original one and ref the new one. */ - if (fdvp->v_op == &union_vnodeop_p) { /* always true */ + if (fdvp->v_op == union_vnodeop_p) { /* always true */ struct union_node *un = VTOUNION(fdvp); if (un->un_uppervp == NULLVP) { /* @@ -1341,7 +1341,7 @@ * replace the fvp, release the original one and ref the new one. */ - if (fvp->v_op == &union_vnodeop_p) { /* always true */ + if (fvp->v_op == union_vnodeop_p) { /* always true */ struct union_node *un = VTOUNION(fvp); #if 0 struct union_mount *um = MOUNTTOUNIONMOUNT(fvp->v_mount); @@ -1399,7 +1399,7 @@ * reference. */ - if (tdvp->v_op == &union_vnodeop_p) { + if (tdvp->v_op == union_vnodeop_p) { struct union_node *un = VTOUNION(tdvp); if (un->un_uppervp == NULLVP) { @@ -1429,7 +1429,7 @@ * file and change tvp to NULL. */ - if (tvp != NULLVP && tvp->v_op == &union_vnodeop_p) { + if (tvp != NULLVP && tvp->v_op == union_vnodeop_p) { struct union_node *un = VTOUNION(tvp); tvp = union_lock_upper(un, ap->a_tcnp->cn_thread); ==== //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vfsops.c#7 (text+ko) ==== @@ -1033,7 +1033,7 @@ MALLOC(ip, struct inode *, sizeof(struct inode), M_EXT2NODE, M_WAITOK); /* Allocate a new vnode/inode. */ - if ((error = getnewvnode(VT_UFS, mp, &ext2_vnodeop_p, &vp)) != 0) { + if ((error = getnewvnode(VT_UFS, mp, ext2_vnodeop_p, &vp)) != 0) { if (ext2fs_inode_hash_lock < 0) wakeup(&ext2fs_inode_hash_lock); ext2fs_inode_hash_lock = 0; ==== //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#7 (text+ko) ==== @@ -709,7 +709,7 @@ return (0); /* Allocate a new vnode/iso_node. */ - if ((error = getnewvnode(VT_ISOFS, mp, &cd9660_vnodeop_p, &vp)) != 0) { + if ((error = getnewvnode(VT_ISOFS, mp, cd9660_vnodeop_p, &vp)) != 0) { *vpp = NULLVP; return (error); } @@ -856,11 +856,11 @@ */ switch (vp->v_type = IFTOVT(ip->inode.iso_mode)) { case VFIFO: - vp->v_op = &cd9660_fifoop_p; + vp->v_op = cd9660_fifoop_p; break; case VCHR: case VBLK: - vp->v_op = &cd9660_specop_p; + vp->v_op = cd9660_specop_p; vp = addaliasu(vp, ip->inode.iso_rdev); ip->i_vnode = vp; break; ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#22 (text+ko) ==== @@ -754,7 +754,7 @@ getnewvnode(tag, mp, vops, vpp) enum vtagtype tag; struct mount *mp; - vop_t ***vops; + vop_t **vops; struct vnode **vpp; { int s; @@ -1629,7 +1629,7 @@ } if (vfinddev(dev, VCHR, vpp)) return (0); - error = getnewvnode(VT_NON, (struct mount *)0, &spec_vnodeop_p, &nvp); + error = getnewvnode(VT_NON, (struct mount *)0, spec_vnodeop_p, &nvp); if (error) { *vpp = NULLVP; return (error); @@ -1655,7 +1655,7 @@ udev_t nvp_rdev; { struct vnode *ovp; - vop_t ***ops; + vop_t **ops; dev_t dev; if (nvp->v_type == VBLK) @@ -2029,7 +2029,7 @@ vgonel(vp, td); } else { vclean(vp, 0, td); - vp->v_op = &spec_vnodeop_p; + vp->v_op = spec_vnodeop_p; insmntque(vp, (struct mount *) 0); } mtx_lock(&mntvnode_mtx); @@ -2185,7 +2185,7 @@ /* * Done with purge, notify sleepers of the grim news. */ - vp->v_op = &dead_vnodeop_p; + vp->v_op = dead_vnodeop_p; if (vp->v_pollinfo != NULL) vn_pollgone(vp); vp->v_tag = VT_NON; @@ -2924,7 +2924,7 @@ int error; /* Allocate a new vnode */ - if ((error = getnewvnode(VT_VFS, mp, &sync_vnodeop_p, &vp)) != 0) { + if ((error = getnewvnode(VT_VFS, mp, sync_vnodeop_p, &vp)) != 0) { mp->mnt_syncer = NULL; return (error); } ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_node.c#5 (text+ko) ==== @@ -223,7 +223,7 @@ */ np = uma_zalloc(nfsnode_zone, M_WAITOK); - error = getnewvnode(VT_NFS, mntp, &nfsv2_vnodeop_p, &nvp); + error = getnewvnode(VT_NFS, mntp, nfsv2_vnodeop_p, &nvp); if (error) { if (nfs_node_hash_lock < 0) wakeup(&nfs_node_hash_lock); ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_subs.c#6 (text+ko) ==== @@ -527,10 +527,10 @@ if (vp->v_type != vtyp) { vp->v_type = vtyp; if (vp->v_type == VFIFO) { - vp->v_op = &fifo_nfsv2nodeop_p; + vp->v_op = fifo_nfsv2nodeop_p; } if (vp->v_type == VCHR || vp->v_type == VBLK) { - vp->v_op = &spec_nfsv2nodeop_p; + vp->v_op = spec_nfsv2nodeop_p; vp = addaliasu(vp, rdev); np->n_vnode = vp; } ==== //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs.h#4 (text+ko) ==== @@ -103,7 +103,7 @@ #define VTOLOMAC(vp) ((struct lomac_node *)(vp)->v_data) #define VTOLVP(vp) VTOLOMAC(vp)->ln_lowervp #define VFSTOLOMAC(mp) ((struct lomac_mount *)mp->mnt_data) -#define VISLOMAC(vp) (vp->v_op == &lomacfs_vnodeop_p) +#define VISLOMAC(vp) (vp->v_op == lomacfs_vnodeop_p) int lomacfs_node_alloc(struct mount *mp, struct componentname *cnp, struct vnode *dvp, struct vnode *lowervp, struct vnode **vpp); ==== //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs_subr.c#4 (text+ko) ==== @@ -73,7 +73,7 @@ return (EEXIST); } } - error = getnewvnode(VT_NULL, mp, &lomacfs_vnodeop_p, vpp); + error = getnewvnode(VT_NULL, mp, lomacfs_vnodeop_p, vpp); if (error) { vput(lowervp); free(lp, M_LOMACFS); ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#21 (text+ko) ==== @@ -105,7 +105,7 @@ int v_holdcnt; /* page & buffer references */ u_long v_id; /* capability identifier */ struct mount *v_mount; /* ptr to vfs we are in */ - vop_t ***v_op; /* vnode operations vector */ + vop_t **v_op; /* vnode operations vector */ TAILQ_ENTRY(vnode) v_freelist; /* vnode freelist */ TAILQ_ENTRY(vnode) v_nmntvnodes; /* vnodes for mount point */ struct buflists v_cleanblkhd; /* clean blocklist head */ @@ -527,7 +527,7 @@ /* * This call works for vnodes in the kernel. */ -#define VCALL(VP,OFF,AP) VOCALL(*(VP)->v_op,(OFF),(AP)) +#define VCALL(VP,OFF,AP) VOCALL((VP)->v_op,(OFF),(AP)) #define VDESC(OP) (& __CONCAT(OP,_desc)) #define VOFFSET(OP) (VDESC(OP)->vdesc_offset) @@ -583,7 +583,7 @@ void cvtstat(struct stat *st, struct ostat *ost); void cvtnstat(struct stat *sb, struct nstat *nsb); int getnewvnode(enum vtagtype tag, - struct mount *mp, vop_t ***vops, struct vnode **vpp); + struct mount *mp, vop_t **vops, struct vnode **vpp); int lease_check(struct vop_lease_args *ap); int spec_vnoperate(struct vop_generic_args *); int speedup_syncer(void); ==== //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#11 (text+ko) ==== @@ -1194,7 +1194,7 @@ ump->um_malloctype, M_WAITOK); /* Allocate a new vnode/inode. */ - error = getnewvnode(VT_UFS, mp, &ffs_vnodeop_p, &vp); + error = getnewvnode(VT_UFS, mp, ffs_vnodeop_p, &vp); if (error) { /* * Do not wake up processes while holding the mutex, ==== //depot/projects/trustedbsd/mac/sys/ufs/ifs/ifs_vfsops.c#6 (text+ko) ==== @@ -201,7 +201,7 @@ ump->um_malloctype, M_WAITOK); /* Allocate a new vnode/inode. */ - error = getnewvnode(VT_UFS, mp, &ifs_vnodeop_p, &vp); + error = getnewvnode(VT_UFS, mp, ifs_vnodeop_p, &vp); if (error) { /* * Do not wake up processes while holding the mutex, ==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#32 (text+ko) ==== @@ -2208,12 +2208,12 @@ switch(vp->v_type = IFTOVT(ip->i_mode)) { case VCHR: case VBLK: - vp->v_op = &specops; + vp->v_op = specops; vp = addaliasu(vp, ip->i_rdev); ip->i_vnode = vp; break; case VFIFO: - vp->v_op = &fifoops; + vp->v_op = fifoops; break; default: break; ==== //depot/projects/trustedbsd/mac/sys/vm/vm_swap.c#7 (text+ko) ==== @@ -263,7 +263,7 @@ u_long aligned_nblks; if (!swapdev_vp) { - error = getnewvnode(VT_NON, NULL, &swapdev_vnodeop_p, + error = getnewvnode(VT_NON, NULL, swapdev_vnodeop_p, &swapdev_vp); if (error) panic("Cannot get vnode for swapdev"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 20 20:16:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B50C337B405; Sat, 20 Apr 2002 20:16:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DEB0F37B404 for ; Sat, 20 Apr 2002 20:16:31 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3L3GVx32827 for perforce@freebsd.org; Sat, 20 Apr 2002 20:16:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 20 Apr 2002 20:16:31 -0700 (PDT) Message-Id: <200204210316.g3L3GVx32827@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10074 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10074 Change 10074 by rwatson@rwatson_tislabs on 2002/04/20 20:15:51 During the last integ, I failed to update UDF so that it used the vnaccess() call, which replaces vaccess() in the MAC branch. Without this change, the udf module could not be loaded due to a missing symbol. Affected files ... ... //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#3 (text+ko) ==== @@ -218,7 +218,7 @@ mode = udf_permtomode(node); - return (vaccess(vp->v_type, mode, node->fentry->uid, node->fentry->gid, + return (vnaccess(vp, mode, node->fentry->uid, node->fentry->gid, a_mode, a->a_cred, NULL)); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 20 20:18:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5D1B37B416; Sat, 20 Apr 2002 20:18:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CC15437B404 for ; Sat, 20 Apr 2002 20:18:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3L3IYK33057 for perforce@freebsd.org; Sat, 20 Apr 2002 20:18:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 20 Apr 2002 20:18:34 -0700 (PDT) Message-Id: <200204210318.g3L3IYK33057@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10075 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10075 Change 10075 by rwatson@rwatson_tislabs on 2002/04/20 20:18:09 mbuf.h no longer requires explicit include of mac.h: remove all mac.h includes from ipfilter so that there are no diffs present from the main tree. Affected files ... ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/fil.c#5 edit ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_auth.c#6 edit ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_fil.c#6 edit ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_frag.c#5 edit ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_log.c#5 edit ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_nat.c#7 edit ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_proxy.c#6 edit ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_state.c#5 edit ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/fil.c#5 (text+ko) ==== @@ -39,7 +39,6 @@ #endif #if !defined(__SVR4) && !defined(__svr4__) # ifndef linux -# include # include # endif #else ==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_auth.c#6 (text+ko) ==== @@ -31,7 +31,6 @@ #endif #if !defined(__SVR4) && !defined(__svr4__) # ifndef linux -# include # include # endif #else ==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_fil.c#6 (text+ko) ==== @@ -54,7 +54,6 @@ # else # include # endif -# include # include #else # include ==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_frag.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ # include # endif # ifndef linux -# include # include # endif #else ==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_log.c#5 (text+ko) ==== @@ -64,7 +64,6 @@ # else # include # endif -# include # include # else # include ==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_nat.c#7 (text+ko) ==== @@ -43,7 +43,6 @@ #endif #if !defined(__SVR4) && !defined(__svr4__) # ifndef linux -# include # include # endif #else ==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_proxy.c#6 (text+ko) ==== @@ -38,7 +38,6 @@ #endif #if !defined(__SVR4) && !defined(__svr4__) # ifndef linux -# include # include # endif #else ==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_state.c#5 (text+ko) ==== @@ -48,7 +48,6 @@ #endif #if !defined(__SVR4) && !defined(__svr4__) # ifndef linux -# include # include # endif #else ==== //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/mlfk_ipl.c#4 (text+ko) ==== @@ -28,9 +28,6 @@ #include -#if (__FreeBSD_version >= 500027) -# include -#endif #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 20 20:19:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 479F037B416; Sat, 20 Apr 2002 20:19:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 74E1A37B405 for ; Sat, 20 Apr 2002 20:19:36 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3L3Jax33151 for perforce@freebsd.org; Sat, 20 Apr 2002 20:19:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 20 Apr 2002 20:19:36 -0700 (PDT) Message-Id: <200204210319.g3L3Jax33151@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10076 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10076 Change 10076 by rwatson@rwatson_tislabs on 2002/04/20 20:19:13 Remove an instance of a mac.h include where mbuf.h is now sufficient. Missed in previous pass of dev tree. Affected files ... ... //depot/projects/trustedbsd/mac/sys/dev/iicbus/if_ic.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/dev/iicbus/if_ic.c#6 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 20 20:20:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E3EF37B41C; Sat, 20 Apr 2002 20:20:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2582C37B41A for ; Sat, 20 Apr 2002 20:20:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3L3KbA33355 for perforce@freebsd.org; Sat, 20 Apr 2002 20:20:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 20 Apr 2002 20:20:37 -0700 (PDT) Message-Id: <200204210320.g3L3KbA33355@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10077 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10077 Change 10077 by rwatson@rwatson_tislabs on 2002/04/20 20:20:30 Remove unnecessary includes of mac.h where just mbuf.h will now suffice. Diff reduction against -CURRENT. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_ing.c#6 edit ... //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_ipr.c#6 edit ... //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_isppp.c#5 edit ... //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_rbch.c#6 edit ... //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_tel.c#4 edit ... //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_trace.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_ing.c#6 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_ipr.c#6 (text+ko) ==== @@ -64,7 +64,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_isppp.c#5 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_rbch.c#6 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_tel.c#4 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_trace.c#6 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 20 20:29:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FF1D37B400; Sat, 20 Apr 2002 20:29:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7A6CB37B41B for ; Sat, 20 Apr 2002 20:29:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3L3Tn134300 for perforce@freebsd.org; Sat, 20 Apr 2002 20:29:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 20 Apr 2002 20:29:49 -0700 (PDT) Message-Id: <200204210329.g3L3Tn134300@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10078 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10078 Change 10078 by rwatson@rwatson_tislabs on 2002/04/20 20:28:50 mac.h include is no longer explicitly required for mbuf.h include. Diff reduction against -CURRENT. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/isa/if_cx.c#4 edit ... //depot/projects/trustedbsd/mac/sys/i386/isa/if_el.c#4 edit ... //depot/projects/trustedbsd/mac/sys/i386/isa/if_le.c#5 edit ... //depot/projects/trustedbsd/mac/sys/i386/isa/if_rdp.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/isa/if_cx.c#4 (text+ko) ==== @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/i386/isa/if_el.c#4 (text+ko) ==== @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/i386/isa/if_le.c#5 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/i386/isa/if_rdp.c#5 (text+ko) ==== @@ -67,7 +67,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 21 7:24:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF8C637B416; Sun, 21 Apr 2002 07:22:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 659B837B400 for ; Sun, 21 Apr 2002 07:22:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3LEMQk64093 for perforce@freebsd.org; Sun, 21 Apr 2002 07:22:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 21 Apr 2002 07:22:26 -0700 (PDT) Message-Id: <200204211422.g3LEMQk64093@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10096 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10096 Change 10096 by rwatson@rwatson_tislabs on 2002/04/21 07:22:00 Integ TrustedBSD base tree from FreeBSD vendor branch. Pick up various things, including PAM/ssh fixes, and earlier diff reduction merges from the MAC tree. Affected files ... ... //depot/projects/trustedbsd/base/MAINTAINERS#2 integrate ... //depot/projects/trustedbsd/base/Makefile#4 integrate ... //depot/projects/trustedbsd/base/Makefile.inc1#13 integrate ... //depot/projects/trustedbsd/base/UPDATING#12 integrate ... //depot/projects/trustedbsd/base/bin/date/date.1#3 integrate ... //depot/projects/trustedbsd/base/bin/df/df.1#2 integrate ... //depot/projects/trustedbsd/base/bin/domainname/domainname.1#2 integrate ... //depot/projects/trustedbsd/base/bin/ed/ed.1#2 integrate ... //depot/projects/trustedbsd/base/bin/hostname/hostname.1#2 integrate ... //depot/projects/trustedbsd/base/bin/ls/ls.1#8 integrate ... //depot/projects/trustedbsd/base/bin/mkdir/mkdir.1#2 integrate ... //depot/projects/trustedbsd/base/bin/pax/cpio.1#2 integrate ... //depot/projects/trustedbsd/base/bin/pax/tar.1#2 integrate ... //depot/projects/trustedbsd/base/bin/ps/ps.1#6 integrate ... //depot/projects/trustedbsd/base/bin/pwd/pwd.1#4 integrate ... //depot/projects/trustedbsd/base/bin/rcp/Makefile#4 integrate ... //depot/projects/trustedbsd/base/bin/rcp/rcp.1#2 integrate ... //depot/projects/trustedbsd/base/bin/realpath/realpath.1#2 integrate ... //depot/projects/trustedbsd/base/bin/sh/bltin/echo.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vprompt.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/FAQ#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/INSTALL#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/KNOWNBUGS#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/LICENSE#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/PGPKEYS#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/README#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/README#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/chez.cs.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/clientproto.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/cs-hpux10.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/cs-hpux9.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/cs-osf1.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/cs-solaris2.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/cs-sunos4.1.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/cs-ultrix4.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/cyrusproto.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/generic-bsd4.4.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/generic-hpux10.mc#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/generic-hpux9.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/generic-linux.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/generic-mpeix.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/generic-nextstep3.3.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/generic-osf1.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/generic-solaris.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/generic-sunos4.1.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/generic-ultrix4.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/huginn.cs.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/knecht.mc#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/mail.cs.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/mail.eecs.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/mailspool.cs.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/python.cs.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/s2k-osf1.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/s2k-ultrix4.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.mc#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/tcpproto.mc#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/ucbarpa.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/ucbvax.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/uucpproto.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/vangogh.cs.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/domain/Berkeley.EDU.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/domain/berkeley-only.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/domain/generic.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/accept_unqualified_senders.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/access_db.m4#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/allmasquerade.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/always_add_domain.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/authinfo.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/bestmx_is_local.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/bitdomain.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/blacklist_recipients.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/compat_check.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/delay_checks.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/dnsbl.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/domaintable.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/generics_entire_domain.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/genericstable.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/ldap_routing.m4#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/limited_masquerade.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/local_lmtp.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/local_no_masquerade.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/local_procmail.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/lookupdotdomain.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/loose_relay_check.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/mailertable.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/masquerade_entire_domain.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/masquerade_envelope.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/msp.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/no_default_msa.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/nocanonify.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/nodns.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/notsticky.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/nouucp.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/nullclient.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/preserve_luser_host.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/promiscuous_relay.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/queuegroup.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/redirect.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/relay_based_on_MX.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/relay_entire_domain.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/relay_hosts_only.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/relay_local_from.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/relay_mail_from.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/smrsh.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/stickyhost.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/use_ct_file.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/use_cw_file.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/uucpdomain.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/virtuser_entire_domain.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/feature/virtusertable.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/hack/cssubdomain.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/cf.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/cfhead.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/proto.m4#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/cyrus.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/fax.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/local.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/mail11.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/phquery.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/pop.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/procmail.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/qpage.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/smtp.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/usenet.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/mailer/uucp.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/a-ux.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/aix3.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/aix4.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/aix5.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/altos.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/amdahl-uts.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/bsd4.3.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/bsd4.4.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/bsdi.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/bsdi1.0.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/bsdi2.0.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/darwin.m4#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/dgux.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/domainos.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/dynix3.2.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/freebsd4.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/freebsd5.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/gnu.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/hpux10.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/hpux11.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/hpux9.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/irix4.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/irix5.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/irix6.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/isc4.1.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/linux.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/maxion.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/mklinux.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/mpeix.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/nextstep.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/openbsd.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/osf1.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/powerux.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/ptx2.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/qnx.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/riscos4.5.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/sco-uw-2.1.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/sco3.2.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/sinix.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/solaris2.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/solaris2.ml.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/solaris2.pre5.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/solaris8.m4#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/sunos3.5.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/sunos4.1.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/svr4.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/ultrix4.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/unixware7.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/unknown.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/ostype/uxpds.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/sendmail.schema#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/cf/sh/makeinfo.sh#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/contrib/README#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/contrib/bsdi.mc#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/contrib/buildvirtuser#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/contrib/dnsblaccess.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/contrib/link_hash.sh#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/contrib/qtool.8#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/contrib/qtool.pl#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/op.me#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/editmap/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/editmap/editmap.8#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/editmap/editmap.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/mfapi.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/mfdef.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/libmilter/milter.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/libsmdb/smdb.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sendmail/mailstats.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sendmail/pathnames.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sendmail/sendmail.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/assert.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/bitops.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/cdefs.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/cf.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/clock.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/conf.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/config.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/debug.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/errstring.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/exc.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/fdset.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/gen.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/heap.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/io.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/ldap.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/limits.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/mbdb.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_aix.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_freebsd.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_hp.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_irix.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_linux.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_mpeix.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_next.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_openbsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_openunix.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_osf1.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_sunos.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_ultrix.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/os/sm_os_unixware.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/path.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/rpool.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/setjmp.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/shm.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/signal.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/string.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/sysexits.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/test.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/types.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/varargs.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/xtrap.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/README#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/comm.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/index.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/docs/overview.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/engine.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/handler.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/libmilter.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/listener.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/main.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/signal.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/sm_gethost.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/smfi.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/README#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/assert.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/assert.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/b-strcmp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/b-strl.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/cdefs.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/cf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/clock.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/clrerr.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/config.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/debug.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/debug.html#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/errstring.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/exc.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/exc.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fclose.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/feof.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ferror.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fflush.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fget.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/findfp.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/flags.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fopen.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fpos.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fprintf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fpurge.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fput.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fread.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fscanf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fseek.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fvwrite.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fvwrite.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fwalk.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/fwrite.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/gen.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/get.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/glue.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/heap.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/heap.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/index.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/io.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ldap.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/local.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/makebuf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/match.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/mbdb.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/mpeix.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/niprop.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/path.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/put.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/refill.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/rewind.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/rpool.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/rpool.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/setvbuf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/shm.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/signal.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/smstdio.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/snprintf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/sscanf.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/stdio.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/strcasecmp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/strdup.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/strerror.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/strexit.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/string.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/stringf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/strio.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/strl.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/strrevcmp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/strto.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/syslogio.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-cf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-event.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-exc.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-float.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-fopen.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-heap.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-match.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-path.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-rpool.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-scanf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-shm.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-smstdio.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-string.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-strio.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-strl.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-strrevcmp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/t-types.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/test.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ungetc.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vasprintf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vfprintf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vfscanf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vprintf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vsnprintf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vsprintf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/vsscanf.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/wbuf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/wsetup.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsm/xtrap.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/smdb.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/smdb1.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/smdb2.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmdb/smndbm.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmutil/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmutil/cf.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmutil/debug.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmutil/err.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmutil/lockfile.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmutil/safefile.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/libsmutil/snprintf.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/README#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/mail.local.8#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/mail.local.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/mailstats/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/mailstats/mailstats.8#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/mailstats/mailstats.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/makemap/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/makemap/makemap.8#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/makemap/makemap.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/praliases/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/praliases/praliases.8#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/praliases/praliases.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/rmail/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/rmail/rmail.8#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/rmail/rmail.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/README#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/smrsh.8#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/smrsh.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/README#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/SECURITY#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/TRACEFLAGS#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/TUNING#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/alias.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/aliases#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/aliases.5#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/arpadate.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/bf.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/bf.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/control.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/convtime.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/daemon.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/domain.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/envelope.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/err.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/helpfile#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/macro.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/mailq.1#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/map.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/milter.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/mime.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/newaliases.1#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/readcf.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/recipient.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/sasl.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/savemail.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.8#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/shmticklib.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/sm_resolve.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/sm_resolve.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/stab.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/stats.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/statusd_shm.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/sysexits.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/timers.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/timers.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/tls.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/trace.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/udb.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/usersmtp.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/util.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/test/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/test/README#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/test/Results#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/test/t_dropgid.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/test/t_exclopen.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/test/t_pathconf.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/test/t_seteuid.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/test/t_setgid.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/test/t_setreuid.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/test/t_setuid.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/test/t_snprintf.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/vacation/Makefile#2 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/vacation/vacation.1#4 integrate ... //depot/projects/trustedbsd/base/contrib/sendmail/vacation/vacation.c#4 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/servconf.c#4 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/session.c#7 integrate ... //depot/projects/trustedbsd/base/etc/Makefile#13 integrate ... //depot/projects/trustedbsd/base/etc/defaults/rc.conf#10 integrate ... //depot/projects/trustedbsd/base/etc/etc.alpha/ttys#2 integrate ... //depot/projects/trustedbsd/base/etc/etc.i386/ttys#2 integrate ... //depot/projects/trustedbsd/base/etc/etc.ia64/ttys#2 integrate ... //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#2 integrate ... //depot/projects/trustedbsd/base/etc/mtree/BSD.sendmail.dist#1 branch ... //depot/projects/trustedbsd/base/etc/mtree/BSD.var.dist#4 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/Makefile#3 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/ftp#3 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/ftpd#4 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/gdm#2 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/login#6 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/other#3 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/rsh#3 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/sshd#3 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/su#4 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/xdm#2 integrate ... //depot/projects/trustedbsd/base/gnu/lib/libgcc/Makefile#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/cvs/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/perl/Makefile#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/perl/libperl/config.SH-elf.alpha#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/perl/libperl/config.SH-elf.i386#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/perl/libperl/config.SH-elf.ia64#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/perl/libperl/config.SH-elf.sparc64#5 integrate ... //depot/projects/trustedbsd/base/include/Makefile#8 integrate ... //depot/projects/trustedbsd/base/include/kenv.h#1 branch ... //depot/projects/trustedbsd/base/lib/compat/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/base/lib/compat/compat3x.i386/Makefile#2 integrate ... //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/Makefile#3 integrate ... //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/Makefile#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.3#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/net/ifname.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/net/inet_addr.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/net/inet_pton.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/net/rthdr.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/net/vars.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/stdio/scanf.3#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/stdio/vfscanf.c#5 integrate ... //depot/projects/trustedbsd/base/lib/libc/sys/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/sys/kenv.2#1 branch ... //depot/projects/trustedbsd/base/lib/libipsec/ipsec_set_policy.3#2 integrate ... //depot/projects/trustedbsd/base/lib/libipsec/ipsec_strerror.3#2 integrate ... //depot/projects/trustedbsd/base/lib/libncp/ncpl_nls.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libpam/libpam/Makefile#10 integrate ... //depot/projects/trustedbsd/base/lib/libpam/modules/pam_lastlog/pam_lastlog.c#7 integrate ... //depot/projects/trustedbsd/base/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8#2 integrate ... //depot/projects/trustedbsd/base/lib/libutil/login.3#2 integrate ... //depot/projects/trustedbsd/base/lib/libutil/login.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libypclnt/Makefile#2 integrate ... //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#16 integrate ... //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml#5 integrate ... //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 integrate ... //depot/projects/trustedbsd/base/release/picobsd/bridge/crunch.conf#4 integrate ... //depot/projects/trustedbsd/base/release/picobsd/dial/crunch.conf#2 integrate ... //depot/projects/trustedbsd/base/release/picobsd/isp/crunch.conf#3 integrate ... //depot/projects/trustedbsd/base/release/picobsd/net/crunch.conf#3 integrate ... //depot/projects/trustedbsd/base/release/picobsd/router/crunch.conf#2 integrate ... //depot/projects/trustedbsd/base/sbin/dump/Makefile#3 integrate ... //depot/projects/trustedbsd/base/sbin/dump/dump.8#5 integrate ... //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.8#2 integrate ... //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#5 integrate ... //depot/projects/trustedbsd/base/sbin/ffsinfo/ffsinfo.8#3 integrate ... //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#5 integrate ... //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#4 integrate ... //depot/projects/trustedbsd/base/sbin/ifconfig/ifmedia.c#3 integrate ... //depot/projects/trustedbsd/base/sbin/ifconfig/ifvlan.c#2 integrate ... //depot/projects/trustedbsd/base/sbin/ip6fw/ip6fw.8#2 integrate ... //depot/projects/trustedbsd/base/sbin/ip6fw/ip6fw.c#3 integrate ... //depot/projects/trustedbsd/base/sbin/md5/md5.1#2 integrate ... //depot/projects/trustedbsd/base/sbin/mount_nwfs/mount_nwfs.8#2 integrate ... //depot/projects/trustedbsd/base/sbin/restore/Makefile#3 integrate ... //depot/projects/trustedbsd/base/sbin/savecore/savecore.c#5 integrate ... //depot/projects/trustedbsd/base/sbin/startslip/startslip.1#2 integrate ... //depot/projects/trustedbsd/base/share/examples/nwclient/dot.nwfsrc#2 integrate ... //depot/projects/trustedbsd/base/share/info/Makefile#2 integrate ... //depot/projects/trustedbsd/base/share/man/man3/Makefile#3 integrate ... //depot/projects/trustedbsd/base/share/man/man3/queue.3#4 integrate ... //depot/projects/trustedbsd/base/share/man/man4/Makefile#10 integrate ... //depot/projects/trustedbsd/base/share/man/man4/ed.4#3 integrate ... //depot/projects/trustedbsd/base/share/man/man4/ef.4#2 integrate ... //depot/projects/trustedbsd/base/share/man/man4/man4.i386/viapm.4#2 integrate ... //depot/projects/trustedbsd/base/share/man/man4/tcp.4#4 integrate ... //depot/projects/trustedbsd/base/share/man/man4/ucom.4#1 branch ... //depot/projects/trustedbsd/base/share/man/man4/uhid.4#1 branch ... //depot/projects/trustedbsd/base/share/man/man4/uhidev.4#1 branch ... //depot/projects/trustedbsd/base/share/man/man4/ulpt.4#1 branch ... //depot/projects/trustedbsd/base/share/man/man4/umodem.4#1 branch ... //depot/projects/trustedbsd/base/share/man/man4/uplcom.4#1 branch ... //depot/projects/trustedbsd/base/share/man/man4/uvscom.4#1 branch ... //depot/projects/trustedbsd/base/share/man/man5/moduli.5#2 integrate ... //depot/projects/trustedbsd/base/share/man/man7/stdint.7#2 integrate ... //depot/projects/trustedbsd/base/share/man/man8/intro.8#3 integrate ... //depot/projects/trustedbsd/base/share/man/man9/sx.9#4 integrate ... //depot/projects/trustedbsd/base/share/mk/Makefile#4 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#2 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.dep.mk#4 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.doc.mk#3 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.docb.mk#2 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.info.mk#3 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.init.mk#1 branch ... //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#7 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#7 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.man.mk#3 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.nls.mk#3 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.obj.mk#4 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#3 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.port.mk#2 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.port.post.mk#2 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.port.pre.mk#2 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.port.subdir.mk#2 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#6 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.sgml.mk#2 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.subdir.mk#3 integrate ... //depot/projects/trustedbsd/base/share/mk/sys.mk#3 integrate ... //depot/projects/trustedbsd/base/sys/alpha/alpha/dec_axppci_33.c#3 integrate ... //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#12 integrate ... //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#8 integrate ... //depot/projects/trustedbsd/base/sys/alpha/pci/lca.c#2 integrate ... //depot/projects/trustedbsd/base/sys/alpha/pci/lca_pci.c#4 integrate ... //depot/projects/trustedbsd/base/sys/alpha/pci/tsunami_pci.c#3 integrate ... //depot/projects/trustedbsd/base/sys/boot/efi/libefi/arch/ia64/start.S#3 integrate ... //depot/projects/trustedbsd/base/sys/boot/efi/libefi/elf_freebsd.c#3 integrate ... //depot/projects/trustedbsd/base/sys/boot/i386/kgzldr/Makefile#3 integrate ... //depot/projects/trustedbsd/base/sys/boot/i386/loader/Makefile#3 integrate ... //depot/projects/trustedbsd/base/sys/boot/sparc64/boot1/Makefile#3 integrate ... //depot/projects/trustedbsd/base/sys/coda/coda_subr.c#2 integrate ... //depot/projects/trustedbsd/base/sys/coda/coda_venus.c#3 integrate ... //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#8 integrate ... //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#6 integrate ... //depot/projects/trustedbsd/base/sys/conf/NOTES#2 integrate ... //depot/projects/trustedbsd/base/sys/conf/files#15 integrate ... //depot/projects/trustedbsd/base/sys/conf/kmod_syms.awk#3 integrate ... //depot/projects/trustedbsd/base/sys/crypto/des/podd.h#2 integrate ... //depot/projects/trustedbsd/base/sys/crypto/des/sk.h#2 integrate ... //depot/projects/trustedbsd/base/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#7 integrate ... //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#9 integrate ... //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_timer.c#5 integrate ... //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#5 integrate ... //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#9 integrate ... //depot/projects/trustedbsd/base/sys/dev/ata/ata-dma.c#13 integrate ... //depot/projects/trustedbsd/base/sys/dev/ata/ata-isa.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/ata/atapi-all.c#7 integrate ... //depot/projects/trustedbsd/base/sys/dev/awi/awi.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/awi/awi_wep.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/awi/awi_wicfg.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/digi/digi.c#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/digi/digi_isa.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/hea/eni.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/hea/eni_buffer.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/hea/eni_transmit.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/hea/eni_vcm.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/hfa/fore_command.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/hfa/fore_output.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/hfa/hfa_eisa.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/hfa/hfa_freebsd.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/hfa/hfa_freebsd.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/hfa/hfa_pci.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/hfa/hfa_sbus.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#9 integrate ... //depot/projects/trustedbsd/base/sys/dev/isp/isp_inline.h#7 integrate ... //depot/projects/trustedbsd/base/sys/dev/isp/ispmbox.h#7 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/dcphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mly/mly.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#8 integrate ... //depot/projects/trustedbsd/base/sys/dev/random/harvest.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_pci.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/tx/if_tx.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/tx/if_txreg.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/tx/if_txvar.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/usb/if_aue.c#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#14 integrate ... //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#8 integrate ... //depot/projects/trustedbsd/base/sys/fs/procfs/procfs.h#4 integrate ... //depot/projects/trustedbsd/base/sys/fs/specfs/spec_vnops.c#6 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom.h#4 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#4 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#4 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom_dump.c#3 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom_slice.c#4 integrate ... //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#9 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/autoconf.c#7 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/bios.c#6 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/busdma_machdep.c#3 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#12 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/mp_machdep.c#11 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#10 integrate ... //depot/projects/trustedbsd/base/sys/i386/include/profile.h#4 integrate ... //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#8 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/locore.s#6 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#13 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#7 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/vm_machdep.c#7 integrate ... //depot/projects/trustedbsd/base/sys/kern/bus_if.m#3 integrate ... //depot/projects/trustedbsd/base/sys/kern/init_main.c#9 integrate ... //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#8 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#11 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#2 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#10 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#10 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#9 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#5 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_ntptime.c#4 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#8 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#11 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_resource.c#6 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#10 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_hints.c#2 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#13 integrate ... //depot/projects/trustedbsd/base/sys/kern/sys_process.c#6 integrate ... //depot/projects/trustedbsd/base/sys/kern/syscalls.c#8 integrate ... //depot/projects/trustedbsd/base/sys/kern/syscalls.master#8 integrate ... //depot/projects/trustedbsd/base/sys/kern/tty.c#8 integrate ... //depot/projects/trustedbsd/base/sys/kern/tty_pty.c#5 integrate ... //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf2.c#3 integrate ... //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#9 integrate ... //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#12 integrate ... //depot/projects/trustedbsd/base/sys/kern/vfs_conf.c#6 integrate ... //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#14 integrate ... //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#13 integrate ... //depot/projects/trustedbsd/base/sys/modules/Makefile#14 integrate ... //depot/projects/trustedbsd/base/sys/modules/hfa/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/hfa/eisa/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/hfa/hfa/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/hfa/pci/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/hfa/sbus/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/my/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/tx/Makefile#2 integrate ... //depot/projects/trustedbsd/base/sys/net/if.c#8 integrate ... //depot/projects/trustedbsd/base/sys/net/if_faith.c#8 integrate ... //depot/projects/trustedbsd/base/sys/net/if_gif.c#7 integrate ... //depot/projects/trustedbsd/base/sys/net/if_stf.c#8 integrate ... //depot/projects/trustedbsd/base/sys/net/if_stf.h#3 integrate ... //depot/projects/trustedbsd/base/sys/net/net_osdep.c#2 integrate ... //depot/projects/trustedbsd/base/sys/net/net_osdep.h#4 integrate ... //depot/projects/trustedbsd/base/sys/net/radix.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm.h#2 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_aal5.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_cm.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_device.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_if.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_if.h#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_ioctl.h#2 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_proto.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_signal.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_socket.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_subr.c#6 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_sys.h#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_usrreq.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_var.h#4 integrate ... //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_if.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_input.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_output.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_usrreq.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netatm/ipatm/ipatm_vcm.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netatm/port.h#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/sigpvc/sigpvc_if.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/spans/spans_arp.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/spans/spans_cls.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/spans/spans_if.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/spans/spans_kxdr.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/spans/spans_msg.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/spans/spans_proto.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/spans/spans_util.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netatm/spans/spans_var.h#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/uni/sscop_pdu.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/uni/sscop_subr.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/uni/sscop_upper.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/uni/uniarp.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/uni/uniarp_cache.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netatm/uni/uniarp_output.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netatm/uni/uniip.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_decode.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_if.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_sigmgr_state.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_subr.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_util.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netatm/uni/unisig_vc_state.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netinet/icmp6.h#3 integrate ... //depot/projects/trustedbsd/base/sys/netinet/in.h#7 integrate ... //depot/projects/trustedbsd/base/sys/netinet/in_gif.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netinet/ip_encap.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#9 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ah.h#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ah_core.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ah_input.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ah_output.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/dest6.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/esp.h#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/esp_input.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/esp_output.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/frag6.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/icmp6.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/in6.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/in6.h#5 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/in6_ifattach.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/in6_pcb.c#6 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/in6_proto.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/in6_rmx.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/in6_var.h#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ip6_forward.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ip6_fw.c#5 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ip6_fw.h#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ip6_input.c#5 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ip6_mroute.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ip6_mroute.h#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ip6_output.c#5 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ip6protosw.h#3 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ipcomp.h#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ipcomp_core.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ipcomp_input.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ipcomp_output.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ipsec.h#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/nd6.h#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/nd6_nbr.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/nd6_rtr.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/route6.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/udp6_output.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#6 integrate ... //depot/projects/trustedbsd/base/sys/netkey/key.h#3 integrate ... //depot/projects/trustedbsd/base/sys/netkey/key_debug.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netncp/ncp_nls.h#2 integrate ... //depot/projects/trustedbsd/base/sys/netsmb/netbios.h#3 integrate ... //depot/projects/trustedbsd/base/sys/netsmb/smb.h#4 integrate ... //depot/projects/trustedbsd/base/sys/netsmb/smb_subr.c#4 integrate ... //depot/projects/trustedbsd/base/sys/nfsclient/nfs_socket.c#6 integrate ... //depot/projects/trustedbsd/base/sys/pc98/i386/machdep.c#13 integrate ... //depot/projects/trustedbsd/base/sys/pci/if_rl.c#7 integrate ... //depot/projects/trustedbsd/base/sys/pci/if_rlreg.h#4 integrate ... //depot/projects/trustedbsd/base/sys/pci/if_tx.c#4 delete ... //depot/projects/trustedbsd/base/sys/pci/if_txvar.h#2 delete ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/clock.c#4 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#6 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_machdep.c#6 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#9 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/rwindow.c#5 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#10 integrate ... //depot/projects/trustedbsd/base/sys/sys/_types.h#2 integrate ... //depot/projects/trustedbsd/base/sys/sys/conf.h#8 integrate ... //depot/projects/trustedbsd/base/sys/sys/disklabel.h#6 integrate ... //depot/projects/trustedbsd/base/sys/sys/eventhandler.h#4 integrate ... //depot/projects/trustedbsd/base/sys/sys/filedesc.h#8 integrate ... //depot/projects/trustedbsd/base/sys/sys/kenv.h#1 branch ... //depot/projects/trustedbsd/base/sys/sys/kernel.h#7 integrate ... //depot/projects/trustedbsd/base/sys/sys/linker_set.h#2 integrate ... //depot/projects/trustedbsd/base/sys/sys/lock.h#5 integrate ... //depot/projects/trustedbsd/base/sys/sys/malloc.h#4 integrate ... //depot/projects/trustedbsd/base/sys/sys/mount.h#6 integrate ... //depot/projects/trustedbsd/base/sys/sys/poll.h#4 integrate ... //depot/projects/trustedbsd/base/sys/sys/proc.h#10 integrate ... //depot/projects/trustedbsd/base/sys/sys/queue.h#4 integrate ... //depot/projects/trustedbsd/base/sys/sys/socket.h#4 integrate ... //depot/projects/trustedbsd/base/sys/sys/syscall.h#9 integrate ... //depot/projects/trustedbsd/base/sys/sys/syscall.mk#9 integrate ... //depot/projects/trustedbsd/base/sys/sys/sysproto.h#10 integrate ... //depot/projects/trustedbsd/base/sys/sys/systm.h#10 integrate ... //depot/projects/trustedbsd/base/sys/sys/un.h#3 integrate ... //depot/projects/trustedbsd/base/sys/ufs/ifs/ifs_vnops.c#4 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#6 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_map.c#7 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_map.h#5 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_meter.c#4 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_object.c#6 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_object.h#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/README#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T014/ref.conf#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/Makefile#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/file2c/Makefile#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/file2c/regress.in#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/file2c/regress.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/file2c/regress.sh#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/join/Makefile#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/join/regress.1.in#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/join/regress.2.in#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/join/regress.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/join/regress.sh#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/jot/Makefile#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/jot/regress.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/jot/regress.sh#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/make/Makefile#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/make/regress.variables.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/Makefile#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.G.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.P.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.in#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.psl.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.sh#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uudecode/Makefile#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uudecode/regress.base64.in#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uudecode/regress.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uudecode/regress.sh#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uudecode/regress.traditional.in#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uuencode/Makefile#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uuencode/regress.base64.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uuencode/regress.in#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uuencode/regress.sh#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uuencode/regress.traditional.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/Makefile#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/regress.I.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/regress.J.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/regress.L.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/regress.in#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/regress.normal.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/regress.sh#1 branch ... //depot/projects/trustedbsd/base/usr.bin/apply/apply.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ar/ar.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ar/ar.1aout#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/basename/basename.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/biff/biff.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendar.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/cap_mkdb/cap_mkdb.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/checknr/checknr.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/chkey/chkey.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/chpass/chpass.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/col/col.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/colcrt/colcrt.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/colldef/colldef.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/colrm/colrm.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/comm/comm.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/compress/compress.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ctags/ctags.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/doscmd/doscmd.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/du/du.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ee/ee.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/enigma/enigma.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/expand/expand.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/fetch/fetch.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/file/file.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/find/find.1#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/finger/finger.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/fmt/fmt.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/fold/fold.1#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/fold/fold.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/fstat/fstat.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/gcore/gcore.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/getopt/getopt.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/gprof/gprof.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/hesinfo/hesinfo.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/hexdump/hexdump.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/hexdump/od.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/indent/indent.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ipcrm/ipcrm.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ipcs/ipcs.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/join/join.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/join/join.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/jot/jot.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/kenv/Makefile#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/kenv/kenv.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/kenv/kenv.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/keylogin/keylogin.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/keylogout/keylogout.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/killall/killall.1#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/ktrace/ktrace.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/lam/lam.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/last/last.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/lastcomm/lastcomm.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ldd/ldd.1#5 integrate ... //depot/projects/trustedbsd/base/usr.bin/ldd/ldd.c#6 integrate ... //depot/projects/trustedbsd/base/usr.bin/ldd/sods.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/leave/leave.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/limits/limits.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/lock/lock.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/lockf/lockf.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/logger/logger.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/login/Makefile#5 integrate ... //depot/projects/trustedbsd/base/usr.bin/login/login.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/login/login.c#11 integrate ... //depot/projects/trustedbsd/base/usr.bin/look/look.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/lorder/lorder.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/Makefile#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/TEST/ack.m4#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/TEST/hanoi.m4#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/TEST/hash.m4#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/TEST/sqroot.m4#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/TEST/string.m4#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/TEST/test.m4#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/eval.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/expr.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/extern.h#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/gnum4.c#1 branch ... //depot/projects/trustedbsd/base/usr.bin/m4/look.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/m4.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/main.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/mdef.h#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/misc.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/pathnames.h#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/stdd.h#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/trace.c#1 branch ... //depot/projects/trustedbsd/base/usr.bin/mail/mail.1#6 integrate ... //depot/projects/trustedbsd/base/usr.bin/make/main.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/make/make.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/minigzip/minigzip.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/mkdep/mkdep.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/mkfifo/mkfifo.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/mkstr/mkstr.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/mktemp/mktemp.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/msgs/msgs.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/msgs/msgs.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/mt/mt.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ncal/ncal.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ncplogin/ncplogin.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ncplogin/ncplogout.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/nice/nice.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/objformat/objformat.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/pagesize/pagesize.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/passwd/passwd.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/printenv/printenv.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/printf/printf.1#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/quota/quota.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ranlib/ranlib.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/rlogin/Makefile#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 21 20:21:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 268D037B400; Sun, 21 Apr 2002 20:19:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 786FA37B404 for ; Sun, 21 Apr 2002 20:19:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3M3Jbw52585 for perforce@freebsd.org; Sun, 21 Apr 2002 20:19:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 21 Apr 2002 20:19:37 -0700 (PDT) Message-Id: <200204220319.g3M3Jbw52585@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10116 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10116 Change 10116 by rwatson@rwatson_tislabs on 2002/04/21 20:19:15 Integ TrustedBSD MAC branch from main TrustedBSD branch. Pick up various diff reductions, PAM fixes, etc. Affected files ... ... //depot/projects/trustedbsd/mac/MAINTAINERS#2 integrate ... //depot/projects/trustedbsd/mac/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/Makefile.inc1#11 integrate ... //depot/projects/trustedbsd/mac/UPDATING#10 integrate ... //depot/projects/trustedbsd/mac/bin/date/date.1#3 integrate ... //depot/projects/trustedbsd/mac/bin/df/df.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/domainname/domainname.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/ed/ed.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/hostname/hostname.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/ls/ls.1#7 integrate ... //depot/projects/trustedbsd/mac/bin/mkdir/mkdir.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/pax/cpio.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/pax/tar.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/ps/ps.1#5 integrate ... //depot/projects/trustedbsd/mac/bin/pwd/pwd.1#4 integrate ... //depot/projects/trustedbsd/mac/bin/rcp/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/bin/rcp/rcp.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/realpath/realpath.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/sh/bltin/echo.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam.h#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dynamic.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_log.c#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vprompt.c#5 integrate ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/FAQ#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/INSTALL#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/KNOWNBUGS#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/LICENSE#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/PGPKEYS#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/README#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/README#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/README#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/chez.cs.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/clientproto.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/cs-hpux10.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/cs-hpux9.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/cs-osf1.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/cs-solaris2.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/cs-sunos4.1.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/cs-ultrix4.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/cyrusproto.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/generic-bsd4.4.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/generic-hpux10.mc#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/generic-hpux9.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/generic-linux.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/generic-mpeix.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/generic-nextstep3.3.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/generic-osf1.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/generic-solaris.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/generic-sunos4.1.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/generic-ultrix4.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/huginn.cs.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/knecht.mc#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/mail.cs.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/mail.eecs.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/mailspool.cs.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/python.cs.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/s2k-osf1.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/s2k-ultrix4.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.mc#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/tcpproto.mc#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/ucbarpa.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/ucbvax.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/uucpproto.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/vangogh.cs.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/domain/Berkeley.EDU.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/domain/berkeley-only.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/domain/generic.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/accept_unqualified_senders.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/access_db.m4#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/allmasquerade.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/always_add_domain.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/authinfo.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/bestmx_is_local.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/bitdomain.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/blacklist_recipients.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/compat_check.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/delay_checks.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/dnsbl.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/domaintable.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/generics_entire_domain.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/genericstable.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/ldap_routing.m4#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/limited_masquerade.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/local_lmtp.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/local_no_masquerade.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/local_procmail.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/lookupdotdomain.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/loose_relay_check.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/mailertable.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/masquerade_entire_domain.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/masquerade_envelope.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/msp.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/no_default_msa.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/nocanonify.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/nodns.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/notsticky.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/nouucp.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/nullclient.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/preserve_luser_host.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/promiscuous_relay.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/queuegroup.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/redirect.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/relay_based_on_MX.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/relay_entire_domain.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/relay_hosts_only.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/relay_local_from.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/relay_mail_from.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/smrsh.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/stickyhost.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/use_ct_file.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/use_cw_file.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/uucpdomain.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/virtuser_entire_domain.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/feature/virtusertable.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/hack/cssubdomain.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/cf.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/cfhead.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/proto.m4#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/cyrus.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/fax.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/local.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/mail11.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/phquery.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/pop.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/procmail.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/qpage.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/smtp.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/usenet.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/uucp.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/a-ux.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/aix3.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/aix4.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/aix5.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/altos.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/amdahl-uts.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/bsd4.3.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/bsd4.4.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/bsdi.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/bsdi1.0.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/bsdi2.0.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/darwin.m4#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/dgux.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/domainos.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/dynix3.2.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/freebsd4.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/freebsd5.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/gnu.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/hpux10.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/hpux11.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/hpux9.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/irix4.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/irix5.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/irix6.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/isc4.1.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/linux.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/maxion.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/mklinux.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/mpeix.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/nextstep.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/openbsd.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/osf1.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/powerux.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/ptx2.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/qnx.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/riscos4.5.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/sco-uw-2.1.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/sco3.2.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/sinix.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/solaris2.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/solaris2.ml.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/solaris2.pre5.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/solaris8.m4#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/sunos3.5.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/sunos4.1.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/svr4.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/ultrix4.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/unixware7.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/unknown.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/ostype/uxpds.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/sendmail.schema#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/cf/sh/makeinfo.sh#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/README#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/bsdi.mc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/buildvirtuser#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/dnsblaccess.m4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/link_hash.sh#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/qtool.8#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/qtool.pl#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/op.me#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/editmap/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/editmap/editmap.8#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/editmap/editmap.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/mfapi.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/mfdef.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/libmilter/milter.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/libsmdb/smdb.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sendmail/mailstats.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sendmail/pathnames.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sendmail/sendmail.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/assert.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/bitops.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/cdefs.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/cf.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/clock.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/conf.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/config.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/debug.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/errstring.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/exc.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/fdset.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/gen.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/heap.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/io.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/ldap.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/limits.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/mbdb.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_aix.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_freebsd.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_hp.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_irix.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_linux.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_mpeix.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_next.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_openbsd.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_openunix.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_osf1.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_sunos.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_ultrix.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/os/sm_os_unixware.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/path.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/rpool.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/setjmp.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/shm.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/signal.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/string.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/sysexits.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/test.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/types.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/varargs.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/xtrap.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/README#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/comm.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/index.html#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/overview.html#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/engine.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/handler.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/libmilter.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/listener.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/main.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/signal.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/sm_gethost.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/smfi.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/README#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/assert.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/assert.html#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/b-strcmp.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/b-strl.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/cdefs.html#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/cf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/clock.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/clrerr.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/config.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/debug.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/debug.html#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/errstring.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/exc.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/exc.html#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fclose.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/feof.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ferror.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fflush.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fget.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/findfp.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/flags.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fopen.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fpos.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fprintf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fpurge.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fput.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fread.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fscanf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fseek.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fvwrite.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fvwrite.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fwalk.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/fwrite.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/gen.html#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/get.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/glue.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/heap.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/heap.html#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/index.html#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/io.html#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ldap.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/local.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/makebuf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/match.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/mbdb.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/mpeix.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/niprop.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/path.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/put.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/refill.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/rewind.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/rpool.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/rpool.html#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/setvbuf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/shm.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/signal.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/smstdio.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/snprintf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/sscanf.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/stdio.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/strcasecmp.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/strdup.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/strerror.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/strexit.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/string.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/stringf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/strio.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/strl.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/strrevcmp.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/strto.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/syslogio.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-cf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-event.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-exc.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-float.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-fopen.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-heap.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-match.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-path.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-rpool.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-scanf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-shm.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-smstdio.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-string.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-strio.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-strl.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-strrevcmp.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/t-types.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/test.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ungetc.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vasprintf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vfprintf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vfscanf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vprintf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vsnprintf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vsprintf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/vsscanf.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/wbuf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/wsetup.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/xtrap.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/smdb.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/smdb1.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/smdb2.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmdb/smndbm.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmutil/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmutil/cf.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmutil/debug.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmutil/err.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmutil/lockfile.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmutil/safefile.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/libsmutil/snprintf.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/README#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/mail.local.8#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/mail.local.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/mailstats/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/mailstats/mailstats.8#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/mailstats/mailstats.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/makemap/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/makemap/makemap.8#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/makemap/makemap.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/praliases/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/praliases/praliases.8#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/praliases/praliases.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/rmail/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/rmail/rmail.8#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/rmail/rmail.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/README#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/smrsh.8#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/smrsh.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/README#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/SECURITY#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/TRACEFLAGS#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/TUNING#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/alias.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/aliases#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/aliases.5#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/arpadate.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/bf.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/bf.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/collect.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/control.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/convtime.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/daemon.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#5 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/domain.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/envelope.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/err.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/helpfile#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/macro.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/mailq.1#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/main.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/map.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/mci.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/milter.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/mime.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/newaliases.1#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/parseaddr.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/readcf.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/recipient.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/sasl.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/savemail.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.8#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/sfsasl.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/sfsasl.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/shmticklib.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/sm_resolve.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/sm_resolve.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/stab.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/stats.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/statusd_shm.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/sysexits.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/timers.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/timers.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/tls.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/trace.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/udb.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/usersmtp.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/util.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/test/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/test/README#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/test/Results#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/test/t_dropgid.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/test/t_exclopen.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/test/t_pathconf.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/test/t_seteuid.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/test/t_setgid.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/test/t_setreuid.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/test/t_setuid.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/test/t_snprintf.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/vacation/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/vacation/vacation.1#4 integrate ... //depot/projects/trustedbsd/mac/contrib/sendmail/vacation/vacation.c#4 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/servconf.c#4 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/session.c#8 integrate ... //depot/projects/trustedbsd/mac/etc/Makefile#10 integrate ... //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#12 integrate ... //depot/projects/trustedbsd/mac/etc/etc.alpha/ttys#2 integrate ... //depot/projects/trustedbsd/mac/etc/etc.i386/ttys#2 integrate ... //depot/projects/trustedbsd/mac/etc/etc.ia64/ttys#2 integrate ... //depot/projects/trustedbsd/mac/etc/etc.sparc64/ttys#2 integrate ... //depot/projects/trustedbsd/mac/etc/mtree/BSD.sendmail.dist#1 branch ... //depot/projects/trustedbsd/mac/etc/mtree/BSD.var.dist#4 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/ftp#3 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/ftpd#4 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/gdm#2 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/login#6 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/other#3 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/rsh#3 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/sshd#3 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/su#4 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/xdm#2 integrate ... //depot/projects/trustedbsd/mac/gnu/lib/libgcc/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/cvs/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/perl/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/perl/libperl/config.SH-elf.alpha#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/perl/libperl/config.SH-elf.i386#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/perl/libperl/config.SH-elf.ia64#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/perl/libperl/config.SH-elf.sparc64#5 integrate ... //depot/projects/trustedbsd/mac/include/Makefile#9 integrate ... //depot/projects/trustedbsd/mac/include/kenv.h#1 branch ... //depot/projects/trustedbsd/mac/lib/compat/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/mac/lib/compat/compat3x.i386/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/lib/compat/compat4x.alpha/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/lib/compat/compat4x.i386/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.3#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/net/ifname.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/net/inet_addr.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/net/inet_pton.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/net/rthdr.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/net/vars.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/stdio/scanf.3#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/stdio/vfscanf.c#5 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sys/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sys/kenv.2#1 branch ... //depot/projects/trustedbsd/mac/lib/libipsec/ipsec_set_policy.3#2 integrate ... //depot/projects/trustedbsd/mac/lib/libipsec/ipsec_strerror.3#2 integrate ... //depot/projects/trustedbsd/mac/lib/libncp/ncpl_nls.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libpam/libpam/Makefile#9 integrate ... //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_lastlog/pam_lastlog.c#7 integrate ... //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8#2 integrate ... //depot/projects/trustedbsd/mac/lib/libutil/login.3#2 integrate ... //depot/projects/trustedbsd/mac/lib/libutil/login.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libypclnt/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#13 integrate ... //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml#5 integrate ... //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#16 integrate ... //depot/projects/trustedbsd/mac/release/picobsd/bridge/crunch.conf#4 integrate ... //depot/projects/trustedbsd/mac/release/picobsd/dial/crunch.conf#2 integrate ... //depot/projects/trustedbsd/mac/release/picobsd/isp/crunch.conf#3 integrate ... //depot/projects/trustedbsd/mac/release/picobsd/net/crunch.conf#3 integrate ... //depot/projects/trustedbsd/mac/release/picobsd/router/crunch.conf#2 integrate ... //depot/projects/trustedbsd/mac/sbin/dump/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/sbin/dump/dump.8#5 integrate ... //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.8#2 integrate ... //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.c#5 integrate ... //depot/projects/trustedbsd/mac/sbin/ffsinfo/ffsinfo.8#3 integrate ... //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#7 integrate ... //depot/projects/trustedbsd/mac/sbin/ifconfig/ifieee80211.c#4 integrate ... //depot/projects/trustedbsd/mac/sbin/ifconfig/ifmedia.c#3 integrate ... //depot/projects/trustedbsd/mac/sbin/ifconfig/ifvlan.c#2 integrate ... //depot/projects/trustedbsd/mac/sbin/ip6fw/ip6fw.8#2 integrate ... //depot/projects/trustedbsd/mac/sbin/ip6fw/ip6fw.c#3 integrate ... //depot/projects/trustedbsd/mac/sbin/md5/md5.1#2 integrate ... //depot/projects/trustedbsd/mac/sbin/mount_nwfs/mount_nwfs.8#2 integrate ... //depot/projects/trustedbsd/mac/sbin/restore/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/sbin/savecore/savecore.c#5 integrate ... //depot/projects/trustedbsd/mac/sbin/startslip/startslip.1#2 integrate ... //depot/projects/trustedbsd/mac/share/examples/nwclient/dot.nwfsrc#2 integrate ... //depot/projects/trustedbsd/mac/share/info/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/share/man/man3/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/share/man/man3/queue.3#4 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/Makefile#9 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/ed.4#3 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/ef.4#2 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/viapm.4#2 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/tcp.4#4 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/ucom.4#1 branch ... //depot/projects/trustedbsd/mac/share/man/man4/uhid.4#1 branch ... //depot/projects/trustedbsd/mac/share/man/man4/uhidev.4#1 branch ... //depot/projects/trustedbsd/mac/share/man/man4/ulpt.4#1 branch ... //depot/projects/trustedbsd/mac/share/man/man4/umodem.4#1 branch ... //depot/projects/trustedbsd/mac/share/man/man4/uplcom.4#1 branch ... //depot/projects/trustedbsd/mac/share/man/man4/uvscom.4#1 branch ... //depot/projects/trustedbsd/mac/share/man/man5/moduli.5#2 integrate ... //depot/projects/trustedbsd/mac/share/man/man7/stdint.7#2 integrate ... //depot/projects/trustedbsd/mac/share/man/man8/intro.8#3 integrate ... //depot/projects/trustedbsd/mac/share/man/man9/sx.9#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.cpu.mk#2 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.dep.mk#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.doc.mk#3 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.docb.mk#2 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.info.mk#3 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.init.mk#1 branch ... //depot/projects/trustedbsd/mac/share/mk/bsd.lib.mk#7 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.libnames.mk#6 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.man.mk#3 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.nls.mk#3 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.obj.mk#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.own.mk#3 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.port.mk#2 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.port.post.mk#2 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.port.pre.mk#2 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.port.subdir.mk#2 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.prog.mk#6 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.sgml.mk#2 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.subdir.mk#3 integrate ... //depot/projects/trustedbsd/mac/share/mk/sys.mk#3 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/alpha/dec_axppci_33.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#8 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/pci/lca.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/pci/lca_pci.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/pci/tsunami_pci.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/arch/ia64/start.S#3 integrate ... //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/elf_freebsd.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/boot/i386/kgzldr/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/sys/boot/i386/loader/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/sys/boot/sparc64/boot1/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/sys/coda/coda_subr.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/coda/coda_venus.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/conf/NOTES#4 integrate ... //depot/projects/trustedbsd/mac/sys/conf/files#24 integrate ... //depot/projects/trustedbsd/mac/sys/conf/kmod_syms.awk#3 integrate ... //depot/projects/trustedbsd/mac/sys/crypto/des/podd.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/crypto/des/sk.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac_pci.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_timer.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/ata/ata-disk.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/dev/ata/ata-dma.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/dev/ata/ata-isa.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-all.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/awi/awi.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/awi/awi_wep.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/awi/awi_wicfg.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/digi/digi.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/digi/digi_isa.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/hea/eni.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/hea/eni_buffer.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/hea/eni_transmit.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/hea/eni_vcm.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/hfa/fore_command.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/hfa/fore_output.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/hfa/hfa_eisa.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/hfa/hfa_freebsd.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/hfa/hfa_freebsd.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/hfa/hfa_pci.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/hfa/hfa_sbus.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/isp/isp.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/dev/isp/isp_inline.h#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/isp/ispmbox.h#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/dcphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mly/mly.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/my/if_my.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/random/harvest.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_pci.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/tx/if_txreg.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/tx/if_txvar.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#15 integrate ... //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/fs/specfs/spec_vnops.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_disk.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_dump.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_slice.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#9 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/autoconf.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/bios.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/busdma_machdep.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/mp_machdep.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/i386/include/profile.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/conf/GENERIC#8 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/locore.s#5 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/trap.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/vm_machdep.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/kern/bus_if.m#3 integrate ... //depot/projects/trustedbsd/mac/sys/kern/init_main.c#19 integrate ... //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#14 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#17 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_ntptime.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#17 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_resource.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_hints.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/kern/sys_process.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#14 integrate ... //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#12 integrate ... //depot/projects/trustedbsd/mac/sys/kern/tty.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/kern/tty_pty.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf2.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vfs_conf.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#39 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#18 integrate ... //depot/projects/trustedbsd/mac/sys/modules/Makefile#15 integrate ... //depot/projects/trustedbsd/mac/sys/modules/hfa/Makefile#1 branch ... //depot/projects/trustedbsd/mac/sys/modules/hfa/eisa/Makefile#1 branch ... //depot/projects/trustedbsd/mac/sys/modules/hfa/hfa/Makefile#1 branch ... //depot/projects/trustedbsd/mac/sys/modules/hfa/pci/Makefile#1 branch ... //depot/projects/trustedbsd/mac/sys/modules/hfa/sbus/Makefile#1 branch ... //depot/projects/trustedbsd/mac/sys/modules/my/Makefile#1 branch ... //depot/projects/trustedbsd/mac/sys/modules/tx/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/sys/net/if.c#17 integrate ... //depot/projects/trustedbsd/mac/sys/net/if_faith.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/net/if_gif.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/net/if_stf.c#13 integrate ... //depot/projects/trustedbsd/mac/sys/net/if_stf.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/net/net_osdep.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/net/net_osdep.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/net/radix.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_aal5.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_cm.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_device.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_if.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_if.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_ioctl.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_proto.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_signal.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_socket.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_subr.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_sys.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_usrreq.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_var.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/ipatm/ipatm_if.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/ipatm/ipatm_input.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/ipatm/ipatm_output.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/ipatm/ipatm_usrreq.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/ipatm/ipatm_vcm.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/port.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/sigpvc/sigpvc_if.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/spans/spans_arp.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/spans/spans_cls.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/spans/spans_if.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/spans/spans_kxdr.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/spans/spans_msg.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/spans/spans_proto.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/spans/spans_util.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/spans/spans_var.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_pdu.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_subr.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_upper.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/uni/uniarp.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/uni/uniarp_cache.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/uni/uniarp_output.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/uni/uniip.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/uni/unisig_decode.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/uni/unisig_if.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/uni/unisig_sigmgr_state.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/uni/unisig_subr.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/uni/unisig_util.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/uni/unisig_vc_state.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/icmp6.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/in.h#7 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/in_gif.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/ip_encap.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ah.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ah_core.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ah_input.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ah_output.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/dest6.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/esp.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/esp_input.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/esp_output.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/frag6.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/icmp6.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/in6.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/in6.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/in6_ifattach.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/in6_pcb.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/in6_proto.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/in6_rmx.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/in6_var.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_forward.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_fw.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_fw.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_input.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_mroute.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_mroute.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_output.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6protosw.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_core.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_input.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_output.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ipsec.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ipsec.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/nd6.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/nd6_nbr.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/nd6_rtr.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/route6.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/udp6_output.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/udp6_usrreq.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/netkey/key.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/netkey/key_debug.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netncp/ncp_nls.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/netsmb/netbios.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/netsmb/smb.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/netsmb/smb_subr.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/pc98/i386/machdep.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/pci/if_rl.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/pci/if_rlreg.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/pci/if_tx.c#5 delete ... //depot/projects/trustedbsd/mac/sys/pci/if_txvar.h#2 delete ... //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/clock.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#6 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_machdep.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/rwindow.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/sys/_types.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/sys/conf.h#7 integrate ... //depot/projects/trustedbsd/mac/sys/sys/disklabel.h#6 integrate ... //depot/projects/trustedbsd/mac/sys/sys/eventhandler.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/sys/filedesc.h#7 integrate ... //depot/projects/trustedbsd/mac/sys/sys/kenv.h#1 branch ... //depot/projects/trustedbsd/mac/sys/sys/kernel.h#9 integrate ... //depot/projects/trustedbsd/mac/sys/sys/linker_set.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/sys/lock.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/sys/malloc.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/sys/mount.h#11 integrate ... //depot/projects/trustedbsd/mac/sys/sys/poll.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/sys/proc.h#12 integrate ... //depot/projects/trustedbsd/mac/sys/sys/queue.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/sys/socket.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/sys/syscall.h#15 integrate ... //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#15 integrate ... //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#16 integrate ... //depot/projects/trustedbsd/mac/sys/sys/systm.h#10 integrate ... //depot/projects/trustedbsd/mac/sys/sys/un.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/ufs/ifs/ifs_vnops.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_map.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_meter.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_object.h#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/README#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T014/ref.conf#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/Makefile#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/file2c/Makefile#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/file2c/regress.in#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/file2c/regress.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/file2c/regress.sh#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/join/Makefile#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/join/regress.1.in#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/join/regress.2.in#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/join/regress.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/join/regress.sh#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/jot/Makefile#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/jot/regress.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/jot/regress.sh#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/make/Makefile#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/make/regress.variables.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/sed/Makefile#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/sed/regress.G.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/sed/regress.P.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/sed/regress.in#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/sed/regress.psl.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/sed/regress.sh#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uudecode/Makefile#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uudecode/regress.base64.in#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uudecode/regress.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uudecode/regress.sh#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uudecode/regress.traditional.in#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uuencode/Makefile#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uuencode/regress.base64.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uuencode/regress.in#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uuencode/regress.sh#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uuencode/regress.traditional.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/Makefile#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.I.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.J.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.L.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.in#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.normal.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.sh#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/apply/apply.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ar/ar.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ar/ar.1aout#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/basename/basename.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/biff/biff.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/calendar/calendar.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/cap_mkdb/cap_mkdb.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/checknr/checknr.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/chkey/chkey.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/chpass/chpass.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/col/col.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/colcrt/colcrt.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/colldef/colldef.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/colrm/colrm.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/comm/comm.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/compress/compress.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ctags/ctags.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/doscmd/doscmd.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/du/du.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ee/ee.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/enigma/enigma.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/expand/expand.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/fetch/fetch.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/file/file.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/find/find.1#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/finger/finger.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/fmt/fmt.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/fold/fold.1#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/fold/fold.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/fstat/fstat.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/gcore/gcore.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/getopt/getopt.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/gprof/gprof.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/hesinfo/hesinfo.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/hexdump/hexdump.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/hexdump/od.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/indent/indent.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ipcrm/ipcrm.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ipcs/ipcs.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/join/join.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/join/join.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/jot/jot.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/kenv/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/kenv/kenv.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/kenv/kenv.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/keylogin/keylogin.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/keylogout/keylogout.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/killall/killall.1#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ktrace/ktrace.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/lam/lam.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/last/last.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/lastcomm/lastcomm.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ldd/ldd.1#5 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ldd/ldd.c#6 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ldd/sods.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/leave/leave.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/limits/limits.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/lock/lock.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/lockf/lockf.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/logger/logger.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/login/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/usr.bin/login/login.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/login/login.c#14 integrate ... //depot/projects/trustedbsd/mac/usr.bin/look/look.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/lorder/lorder.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/TEST/ack.m4#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/TEST/hanoi.m4#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/TEST/hash.m4#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/TEST/sqroot.m4#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/TEST/string.m4#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/TEST/test.m4#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/eval.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/expr.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/extern.h#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/gnum4.c#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/m4/look.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/m4.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/main.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/mdef.h#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/misc.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/pathnames.h#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/stdd.h#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/trace.c#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/mail/mail.1#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/make/main.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/make/make.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/minigzip/minigzip.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/mkdep/mkdep.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/mkfifo/mkfifo.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/mkstr/mkstr.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/mktemp/mktemp.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/msgs/msgs.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/msgs/msgs.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/mt/mt.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ncal/ncal.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ncplogin/ncplogin.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ncplogin/ncplogout.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/nice/nice.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/objformat/objformat.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/pagesize/pagesize.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/passwd/passwd.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/printenv/printenv.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/printf/printf.1#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/quota/quota.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ranlib/ranlib.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/rlogin/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/rlogin/rlogin.1#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 21 20:33:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1763637B404; Sun, 21 Apr 2002 20:32:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A552B37B400 for ; Sun, 21 Apr 2002 20:32:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3M3WDO62193 for perforce@freebsd.org; Sun, 21 Apr 2002 20:32:13 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Sun, 21 Apr 2002 20:32:13 -0700 (PDT) Message-Id: <200204220332.g3M3WDO62193@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10117 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10117 Change 10117 by arr@arr_shibby on 2002/04/21 20:31:13 Integ Affected files ... ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/autoconf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/busdma_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/critical.c#1 branch ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/db_instruction.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/dec_axppci_33.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/dec_eb64plus.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/dec_kn300.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/exception.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/genassym.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/interrupt.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/machdep.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/mp_machdep.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/pal.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/pmap.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/prom_disp.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/promcons.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/sys_machdep.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/trap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/vm_machdep.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/conf/GENERIC#4 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/conf/SIMOS#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/ansi.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/asm.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/cpufunc.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/critical.h#1 branch ... //depot/projects/trustedbsd/audit/sys/alpha/include/endian.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/proc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/mcbus/mcbus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/mcbus/mcbusvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/mcbus/mcpcia.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/mcbus/mcpciavar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/osf1/osf1_misc.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/osf1/osf1_signal.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/lca.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/lca_pci.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/pci/tsunami_pci.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/tlsb/zs_tlsb.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/arm/include/ansi.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/common/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/common/interp_forth.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/common/load_elf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/common/module.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/efi/Makefile.inc#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/efi/libefi/arch/ia64/start.S#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/efi/libefi/efifs.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/efi/libefi/efinet.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/efi/libefi/elf_freebsd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/efi/loader/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/efi/loader/main.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/efi/loader/version#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/alpha/sysdep.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/dict.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/ficl.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/ficl.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/fileaccess.c#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/ficl/float.c#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/ficl/i386/sysdep.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/ia64/sysdep.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/loader.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/math64.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/math64.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/prefix.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/search.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/softwords/ficlclass.fr#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/ficl/softwords/fileaccess.fr#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/ficl/softwords/forml.fr#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/ficl/softwords/ifbrack.fr#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/softwords/marker.fr#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/softwords/oo.fr#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/softwords/prefix.fr#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/softwords/softcore.fr#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/stack.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/testmain.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/tools.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/vm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ficl/words.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/i386/boot2/boot2.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/boot/i386/kgzldr/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/i386/loader/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ia64/Makefile.inc#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/ia64/libski/Makefile#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ia64/libski/elf_freebsd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ia64/skiload/Makefile#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/ia64/skiload/version#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/pc98/kgzldr/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/pc98/loader/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/boot1/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/boot1/_start.S#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/bootblock/Makefile#2 delete ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/bootblock/bootblock.c#2 delete ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/loader/Makefile#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/loader/help.sparc64#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/loader/locore.S#1 branch ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/loader/locore.s#3 delete ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/loader/main.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/loader/metadata.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/cam/cam_xpt.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/cam/scsi/scsi_all.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/cam/scsi/scsi_da.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/coda/coda_psdev.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/coda/coda_subr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/coda/coda_venus.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linprocfs/linprocfs.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_mib.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_misc.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_signal.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_uid16.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/compat/pecoff/imgact_pecoff.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_fcntl.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_misc.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_signal.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_stat.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/compat/svr4/svr4_sysvec.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/Makefile.ia64#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/Makefile.powerpc#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/Makefile.sparc64#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/NOTES#1 branch ... //depot/projects/trustedbsd/audit/sys/conf/files#8 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.alpha#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.i386#5 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.ia64#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.pc98#5 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.powerpc#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.sparc64#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/kern.pre.mk#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/kmod_syms.awk#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/majors#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/options#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/options.alpha#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/options.ia64#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/des/podd.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/des/sk.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_command.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_ps.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/db_sym.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/ddb/ddb.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac_disk.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac_pci.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aacvar.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/Osd/OsdSynch.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_timer.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/an/if_an.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ar/if_ar.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/asr/asr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-all.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-all.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-disk.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-disk.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-dma.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-isa.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-pci.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-raid.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-raid.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/atapi-all.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/atapi-all.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/atapi-cd.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/atapi-cd.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/atapi-fd.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/atapi-tape.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/awi/awi.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/awi/awi_wep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/awi/awi_wicfg.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/bge/if_bge.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/bge/if_bgereg.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/bktr/bktr_i2c.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/bktr/bktr_i2c.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/bktr/bktr_os.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/bktr/bktr_reg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ccd/ccd.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ciss/ciss.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/cnw/if_cnw.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/dgb/dgb.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/CX.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/CX_PCI.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/EPCX.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/EPCX_PCI.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/Xe.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/Xem.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/Xr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/digi.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/digi.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/digi/digi_isa.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ed/if_ed_pccard.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/eisa/eisaconf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em_fxhw.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em_fxhw.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em_osdep.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em_phy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em_phy.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/fb/fb.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/fb/fbreg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/fb/gfb.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/fb/tga.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/fb/vga.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/fxp/if_fxp.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/fxp/if_fxpvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/gem/if_gem.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/gem/if_gemvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/gfb/gfb_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/gx/if_gx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/gx/if_gxvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hea/eni.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hea/eni_buffer.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hea/eni_transmit.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hea/eni_vcm.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hfa/fore_command.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hfa/fore_load.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hfa/fore_output.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hfa/fore_slave.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hfa/hfa_eisa.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/hfa/hfa_freebsd.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/hfa/hfa_freebsd.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/hfa/hfa_pci.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/hfa/hfa_sbus.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/hme/if_hme.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hme/if_hme_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hme/if_hme_sbus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hme/if_hmevar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ichsmb/ichsmb.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ida/ida_disk.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iicbus/if_ic.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iicbus/iic.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iicbus/iicbb.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iicbus/iicbb_if.m#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iicbus/iicbus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iicbus/iiconf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iicbus/iiconf.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iicbus/iicsmb.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp_freebsd.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp_freebsd.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp_inline.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp_pci.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/ispmbox.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/ispvar.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/kbd/atkbd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/kbd/atkbdc.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/lmc/if_lmc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/brgphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/dcphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/miidevs#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/miidevs.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/rlphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mk48txx/mk48txx.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/mk48txx/mk48txxreg.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/mly/mly.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/my/if_my.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/my/if_myreg.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/nge/if_nge.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/nge/if_ngereg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/nmdm/nmdm.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/null/null.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ofw/ofw_console.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ofw/ofw_disk.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/pccard/pccard_cis.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccard/pccarddevs#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccard/pccarddevs.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccbb/pccbb.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccbb/pccbbreg.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pci/pci.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pci/pci_pci.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pdq/if_fea.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pdq/if_fpa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pdq/pdq.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pdq/pdq_freebsd.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/pdq/pdq_ifsubr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pdq/pdqreg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pdq/pdqvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ppbus/if_plip.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ppbus/lpbb.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ppbus/lpt.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ppbus/pcfclock.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ppbus/ppi.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ppbus/pps.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ppbus/vpo.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/puc/pucdata.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/random/harvest.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/random/randomdev.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/random/yarrow.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/rp/rp.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sbni/if_sbni.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/se/se_console.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/se/sereg.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/si/si.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sio/sio.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sio/sio_isa.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/smbus/smb.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/smbus/smbconf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/smbus/smbconf.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/smbus/smbus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/snp/snp.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/isa/ad1816.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/isa/emu8000.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/isa/gusmidi.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/isa/mpu.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/isa/mss.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/isa/opl.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/isa/sbc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/isa/uartsio.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/midi/midi.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/midi/midi.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/midi/sequencer.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/midi/timer.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/cmi.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/csamidi.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/ds1.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/emu10k1.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/es137x.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/ich.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/maestro.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/t4dwave.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/ac97.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/channel.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/feeder_fmt.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/mixer.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/sndstat.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/sound.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/sound.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sr/if_sr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/syscons/dragon/dragon_saver.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/syscons/fire/fire_saver.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/syscons/logo/logo_saver.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/syscons/rain/rain_saver.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/syscons/scgfbrndr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/syscons/syscons.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/syscons/syscons.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/syscons/sysmouse.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/syscons/warp/warp_saver.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/tdfx/tdfx_pci.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/twe/twe_freebsd.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/tx/if_tx.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/tx/if_txreg.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/tx/if_txvar.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/txp/if_txp.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/devlist2h.awk#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/hid.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/hid.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/if_aue.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/if_auereg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/if_cue.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/if_cuereg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/if_kue.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/if_kuereg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ohci.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ohcireg.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ohcivar.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ucom.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/udbp.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ugraphire_rdesc.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/usb/uhci.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uhcireg.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uhcivar.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uhid.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uhub.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ukbd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/umass.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/umodem.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ums.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/urio.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usb.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usb_ethersubr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usb_port.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usb_quirks.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usb_subr.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdevs#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdevs.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdevs_data.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdi.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdi.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdi_util.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdi_util.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdivar.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uvscom.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinum.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinumconfig.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinumext.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinumhdr.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinumio.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinumioctl.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinumobj.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wavelan_ieee.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wi.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wi_pccard.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wi_pci.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wireg.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wivar.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/wi/wi_hostap.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/wi/wi_hostap.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/wl/if_wl.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/devfs/devfs_vnops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/fifofs/fifo_vnops.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/fs/hpfs/hpfs_hash.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/hpfs/hpfs_vfsops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/hpfs/hpfs_vnops.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/fs/msdosfs/msdosfs_denode.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/msdosfs/msdosfs_fat.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/ntfs/ntfs_ihash.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/ntfs/ntfs_subr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_ctl.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_dbregs.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_fpregs.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_ioctl.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_mem.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_regs.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_status.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/fs/pseudofs/pseudofs.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/fs/smbfs/smbfs_vfsops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/smbfs/smbfs_vnops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/specfs/spec_vnops.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/fs/udf/ecma167-udf.h#1 branch ... //depot/projects/trustedbsd/audit/sys/fs/udf/osta.c#1 branch ... //depot/projects/trustedbsd/audit/sys/fs/udf/osta.h#1 branch ... //depot/projects/trustedbsd/audit/sys/fs/udf/udf.h#1 branch ... //depot/projects/trustedbsd/audit/sys/fs/udf/udf_mount.h#1 branch ... //depot/projects/trustedbsd/audit/sys/fs/udf/udf_vfsops.c#1 branch ... //depot/projects/trustedbsd/audit/sys/fs/udf/udf_vnops.c#1 branch ... //depot/projects/trustedbsd/audit/sys/fs/umapfs/umap_vfsops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/unionfs/union_subr.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_bsd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_dev.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_disk.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_dump.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_enc.c#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_event.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_int.h#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_io.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_kern.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_mbr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_mbrext.c#2 delete ... //depot/projects/trustedbsd/audit/sys/geom/geom_pc98.c#1 branch ... //depot/projects/trustedbsd/audit/sys/geom/geom_slice.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_slice.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_subr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_sunlabel.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_alloc.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_extern.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_inode.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_lookup.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_subr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_vfsops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/gnu/ext2fs/ext2_vnops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/conf/GENERIC#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/conf/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/conf/NEWCARD#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/conf/NOTES#5 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/autoconf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/bios.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/busdma_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/critical.c#1 branch ... //depot/projects/trustedbsd/audit/sys/i386/i386/db_disasm.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/db_trace.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/exception.s#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/genassym.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/i386dump.c#1 branch ... //depot/projects/trustedbsd/audit/sys/i386/i386/i686_mem.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/machdep.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/mem.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/mp_machdep.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/mpapic.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/pmap.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/swtch.s#5 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/sys_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/trap.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/vm86.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/vm_machdep.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_misc.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_signal.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_socksys.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/ibcs2/ibcs2_sysi86.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/ansi.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/asm.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/cpufunc.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/critical.h#1 branch ... //depot/projects/trustedbsd/audit/sys/i386/include/endian.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/i4b_ioctl.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/md_var.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/mutex.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/pcb.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/pcpu.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/proc.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/profile.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/segments.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/smp.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/uc_device.h#2 delete ... //depot/projects/trustedbsd/audit/sys/i386/isa/apic_vector.s#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/clock.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/cx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/cy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/icu.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/icu_ipl.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/icu_vector.s#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/if_el.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/if_rdp.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/intr_machdep.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/intr_machdep.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/ipl.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/isa_device.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/istallion.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/matcd/matcd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/mcd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/mse.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/npx.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/pcf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/pcvt/pcvt_ext.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/rc.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/scd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/spic.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/spicreg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/spigot.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/stallion.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/linux/linux.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/linux/linux_machdep.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/linux/linux_sysvec.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/pci/pci_bus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/svr4/svr4_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/capi/capi_l4if.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/capi/iavc/iavc_isa.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/capi/iavc/iavc_pci.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/driver/i4b_ing.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/driver/i4b_ipr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/driver/i4b_rbch.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/driver/i4b_trace.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/include/i4b_l3l4.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer1/isic/i4b_bchan.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer2/i4b_l2.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer3/i4b_l2if.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer3/i4b_q931.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer3/i4b_q931.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer4/i4b_i4bdrv.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer4/i4b_l4.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/conf/GENERIC#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/conf/SKI#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia32/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/ia32/ia32_proto.h#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/ia32/ia32_syscall.h#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/ia32/ia32_sysent.c#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/ia32/imgact_ia32.c#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/ia32/imgact_ia32.h#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/ia32/syscalls.conf#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/ia32/syscalls.master#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/autoconf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/critical.c#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/exception.s#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/genassym.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/ia64dump.c#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/interrupt.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/locore.s#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/machdep.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/mp_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/pmap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/ssc.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/support.s#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/swtch.s#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/trap.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/vm_machdep.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/ansi.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/asm.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/cpufunc.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/critical.h#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/include/elf.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/endian.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/ia64_cpu.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/param.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/pcb.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/proc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/signal.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/stdarg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/isa/fd.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/isa/pnpreg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/isa/ppc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/isofs/cd9660/cd9660_node.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/isofs/cd9660/cd9660_rrip.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/isofs/cd9660/iso.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/bus_if.m#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/clock_if.m#1 branch ... //depot/projects/trustedbsd/audit/sys/kern/imgact_aout.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/imgact_gzip.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/inflate.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/init_main.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/init_sysent.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_acct.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_acl.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_clock.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_condvar.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_descrip.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_environment.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_exec.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_exit.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_fork.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_intr.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_jail.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_ktr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_ktrace.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_linker.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_lock.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_malloc.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_mib.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_mtxpool.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_mutex.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_ntptime.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_proc.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_prot.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_resource.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_sema.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_shutdown.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_sig.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_switch.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_sx.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_sysctl.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_tc.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_time.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_timeout.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_xxx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_bus.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_clock.c#1 branch ... //depot/projects/trustedbsd/audit/sys/kern/subr_disk.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_disklabel.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_diskslice.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_eventhandler.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_hints.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_mbuf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_param.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_prf.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_rman.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_smp.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_taskqueue.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_trap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_witness.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_xxx.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/sys_generic.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/sys_pipe.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/sys_process.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/syscalls.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/syscalls.master#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/sysv_ipc.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/sysv_msg.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/tty.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/tty_compat.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/tty_cons.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/tty_pty.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/uipc_mbuf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/uipc_mbuf2.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/uipc_socket.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/uipc_syscalls.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/uipc_usrreq.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_aio.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_bio.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_cache.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_conf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_export.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_init.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_subr.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_syscalls.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_vnops.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/libkern/bsearch.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/modules/Makefile#5 integrate ... //depot/projects/trustedbsd/audit/sys/modules/bktr/bktr/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/modules/hfa/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/hfa/eisa/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/hfa/hfa/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/hfa/pci/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/hfa/sbus/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/controllers/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/controllers/alpm/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/controllers/amdpm/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/controllers/intpm/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/controllers/lpbb/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/controllers/pcf/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/controllers/viapm/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/if_ic/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/iic/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/iicbb/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/iicbus/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/iicsmb/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/smb/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/i2c/smbus/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/my/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/syscons/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/modules/syscons/dragon/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/tx/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/modules/udf/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/wi/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/net/bpf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/bsd_comp.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/ethernet.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/fddi.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/if.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_arcsubr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_ef.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_ethersubr.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_faith.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_fddisubr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_gif.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_gif.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_ieee80211.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_llc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_loop.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_media.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_ppp.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_pppvar.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_sl.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_spppsubr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_stf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_stf.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_tap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_tun.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_vlan.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/net_osdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/net/net_osdep.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/pfil.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/ppp_comp.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/ppp_deflate.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/ppp_tty.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/net/radix.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/raw_usrreq.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/net/route.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/net/rtsock.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/net/zlib.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatalk/at_control.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatalk/ddp_usrreq.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_aal5.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_cm.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_device.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_if.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_if.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_ioctl.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_proto.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_signal.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_socket.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_subr.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_sys.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_usrreq.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_var.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/ipatm/ipatm_if.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/ipatm/ipatm_input.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/ipatm/ipatm_output.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/ipatm/ipatm_usrreq.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/ipatm/ipatm_vcm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/port.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/sigpvc/sigpvc_if.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/spans/spans_arp.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/spans/spans_cls.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/spans/spans_if.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/spans/spans_kxdr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/spans/spans_msg.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/spans/spans_proto.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/spans/spans_util.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/spans/spans_var.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/uni/sscop_pdu.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/uni/sscop_subr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/uni/sscop_upper.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/uni/uniarp.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/uni/uniarp_cache.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/uni/uniarp_output.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/uni/uniip.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/uni/unisig_decode.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/uni/unisig_if.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/uni/unisig_sigmgr_state.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/uni/unisig_subr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/uni/unisig_util.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/uni/unisig_vc_state.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netgraph/ng_base.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netgraph/ng_pptpgre.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netgraph/ng_socket.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netgraph/ng_tty.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/icmp6.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/if_ether.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/if_ether.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/if_fddi.h#3 delete ... //depot/projects/trustedbsd/audit/sys/netinet/in.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/in.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/in_gif.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/in_pcb.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/in_pcb.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/in_var.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/ip_divert.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/ip_ecn.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/ip_encap.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/ip_icmp.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/ip_input.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/ip_mroute.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/ip_output.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/raw_ip.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/tcp_input.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/tcp_subr.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/tcp_usrreq.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/udp_usrreq.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ah.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ah_core.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ah_input.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ah_output.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/dest6.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/esp.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/esp_input.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/esp_output.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/frag6.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/icmp6.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/in6.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/in6.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/in6_ifattach.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/in6_pcb.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/in6_proto.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/in6_rmx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/in6_src.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/in6_var.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ip6_forward.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ip6_fw.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ip6_fw.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ip6_input.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ip6_mroute.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ip6_mroute.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ip6_output.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ip6protosw.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ipcomp.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ipcomp_core.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ipcomp_input.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ipcomp_output.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ipsec.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ipsec.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/nd6.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/nd6.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/nd6_nbr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/nd6_rtr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/raw_ip6.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/route6.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/scope6.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/udp6_output.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/udp6_usrreq.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netipx/ipx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netipx/ipx_input.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netipx/ipx_pcb.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netipx/ipx_usrreq.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netkey/key.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netkey/key_debug.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netnatm/natm_proto.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netncp/ncp_nls.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/netncp/ncp_subr.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/netns/ns_input.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netsmb/netbios.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/netsmb/smb.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netsmb/smb_subr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netsmb/smb_subr.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/nfsclient/nfs_lock.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/nfsclient/nfs_socket.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/nfsserver/nfs_serv.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/nfsserver/nfs_syscalls.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/conf/GENERIC#3 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/i386/machdep.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/clock.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/fd.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/mse.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/sio.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/syscons.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/wd_cd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/pccard/pccard.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pci/agp_amd.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/pci/alpm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/pci/amdpm.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_dc.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_pcn.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_rl.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_rlreg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_sf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_sis.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_sk.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_ste.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_ti.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_tl.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_tx.c#3 delete ... //depot/projects/trustedbsd/audit/sys/pci/if_txvar.h#2 delete ... //depot/projects/trustedbsd/audit/sys/pci/if_vr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_wb.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_xl.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pci/intpm.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pci/viapm.c#1 branch ... //depot/projects/trustedbsd/audit/sys/powerpc/conf/GENERIC#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/ansi.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/asm.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/cpu.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/cpufunc.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/critical.h#1 branch ... //depot/projects/trustedbsd/audit/sys/powerpc/include/endian.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/nexusvar.h#1 branch ... //depot/projects/trustedbsd/audit/sys/powerpc/include/proc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/autoconf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/clock.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/copyinout.c#1 branch ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/copyinstr.c#2 delete ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/critical.c#1 branch ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/fubyte.c#2 delete ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/fuword.c#2 delete ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/machdep.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/nexus.c#1 branch ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/pmap.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/subyte.c#2 delete ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/suword.c#2 delete ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/trap.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/vm_machdep.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/security/lomac/kernel_log.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/security/lomac/kernel_mmap.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/security/lomac/kernel_util.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/conf/GENERIC#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/ebus/ebus.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/ebus/ebusvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/ansi.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/asm.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/bus.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/bus_private.h#1 branch ... //depot/projects/trustedbsd/audit/sys/sparc64/include/clock.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/cpufunc.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/critical.h#1 branch ... //depot/projects/trustedbsd/audit/sys/sparc64/include/eeprom.h#1 branch ... //depot/projects/trustedbsd/audit/sys/sparc64/include/emul.h#1 branch ... //depot/projects/trustedbsd/audit/sys/sparc64/include/endian.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/frame.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/iommureg.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/iommuvar.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/ktr.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/ofw_bus.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/param.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/proc.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/reg.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/tlb.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/upa.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/isa/isa.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/isa/ofw_isa.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/pci/apb.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/pci/ofw_pci.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/pci/ofw_pci.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/pci/psycho.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/pci/psychoreg.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/pci/psychovar.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sbus/sbus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/autoconf.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/bus_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/cache.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/clock.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/critical.c#1 branch ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/db_disasm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/db_trace.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/eeprom.c#1 branch ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/eeprom_ebus.c#1 branch ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/eeprom_sbus.c#1 branch ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/emul.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/exception.s#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/genassym.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/identcpu.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/intr_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/iommu.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/machdep.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/mp_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/ofw_bus.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/pmap.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/pv.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/rwindow.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/trap.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/vm_machdep.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/sys/_lock.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sys/_mutex.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sys/_types.h#1 branch ... //depot/projects/trustedbsd/audit/sys/sys/ata.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sys/bio.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sys/bus.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sys/cdefs.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sys/cdio.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sys/clock.h#1 branch ... //depot/projects/trustedbsd/audit/sys/sys/condvar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sys/conf.h#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 21 20:44:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73CA537B419; Sun, 21 Apr 2002 20:44:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B463C37B417 for ; Sun, 21 Apr 2002 20:44:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3M3idv70737 for perforce@freebsd.org; Sun, 21 Apr 2002 20:44:39 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Sun, 21 Apr 2002 20:44:39 -0700 (PDT) Message-Id: <200204220344.g3M3idv70737@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10118 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10118 Change 10118 by arr@arr_shibby on 2002/04/21 20:44:17 - Finish update from vm_zone to uma_zone. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#22 edit ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#13 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#22 (text+ko) ==== @@ -103,11 +103,19 @@ } void +audit_uma_ctor(void *mem, int size) +{ + + bzero(mem, size); +} + +void audit_init(void) { uma_zone_t zone; - zone = uma_zinit("AUDIT", sizeof(audit_record_t), pool_size, 0, 4); + zone = uma_zcreate("AUDIT", &audit_uma_ctor, NULL, NULL, NULL, + UMA_ALIGN_PTR, 0); if (zone == NULL) panic("audit_init: unable to init audit record zone"); ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#13 (text+ko) ==== @@ -229,5 +229,6 @@ int audit_record_write(audit_record_t *, struct audit_info *, struct thread *); audit_record_t *audit_record_init(int, size_t, struct audit_info *); +void audit_uma_ctor(void *, int); #endif /* !_SYS_AUDIT_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 21 21:49:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80ED337B425; Sun, 21 Apr 2002 21:48:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AA66037B41F for ; Sun, 21 Apr 2002 21:48:57 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3M4mvJ83510 for perforce@freebsd.org; Sun, 21 Apr 2002 21:48:57 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Sun, 21 Apr 2002 21:48:57 -0700 (PDT) Message-Id: <200204220448.g3M4mvJ83510@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10120 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10120 Change 10120 by arr@arr_shibby on 2002/04/21 21:48:19 - Make this compile (Yeesh). Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#23 edit ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#14 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#23 (text+ko) ==== @@ -49,32 +49,31 @@ #define AUDLOG "/var/log/audit" -static __inline audit_record_t *audit_record_alloc(uma_zone_t, u_long *); -static __inline void audit_record_free(audit_record_t *, uma_zone_t, u_long *); +static __inline audit_record_t *audit_record_alloc(uma_zone_t); +static __inline void audit_record_free(audit_record_t *, uma_zone_t); static struct mtx audit_mtx; static struct audit_record_list record_queue; static uma_zone_t record_zone; -static u_long record_leased; static int audit_shutdown_flag = 0; static int audit_id = 0; -static size_t pool_size = 32; +/* readd this later. + static size_t pool_size = 32; + */ static __inline audit_record_t * -audit_record_alloc(uma_zone_t zone, u_long *lease) +audit_record_alloc(uma_zone_t zone) { - *(u_long *)lease++; - return(uma_zalloc(zone)); + return(uma_zalloc(zone, 0)); } static __inline void -audit_record_free(audit_record_t *ar, uma_zone_t zone, u_long *lease) +audit_record_free(audit_record_t *ar, uma_zone_t zone) { - *(u_long *)lease--; uma_zfree(zone, ar); } @@ -84,18 +83,15 @@ audit_record_t *rec; audit_header_t *h; uma_zone_t z; - audit_id_t *id; - u_long *lease; - mtx_lock(&audit_mtx) + mtx_lock(&audit_mtx); z = record_zone; - mtx_unlock(&audit_mtx) + mtx_unlock(&audit_mtx); - rec = audit_record_alloc(z, lease); - bzero(rec, sizeof(*rec)); + rec = audit_record_alloc(z); h = &rec->ar_hdr; h->ah_v = AUDIT_VERSION; - h->ah_id = id++; // prolly should be locked. + h->ah_id = audit_id++; h->ah_len = AUDIT_RECORD_SZ + evsz; h->ah_type = type; nanotime(&h->ah_evtime); @@ -114,8 +110,9 @@ { uma_zone_t zone; - zone = uma_zcreate("AUDIT", &audit_uma_ctor, NULL, NULL, NULL, - UMA_ALIGN_PTR, 0); + zone = uma_zcreate("AUDIT", sizeof(audit_record_t), + (uma_ctor)&audit_uma_ctor, + NULL, NULL, NULL, UMA_ALIGN_PTR, 0); if (zone == NULL) panic("audit_init: unable to init audit record zone"); @@ -126,7 +123,7 @@ audit_shutdown_flag = 0; mtx_unlock(&audit_mtx); - (void)kthread_create(&audit_write_thread, ai, NULL, RFNOWAIT, + (void)kthread_create(&audit_write_thread, NULL, NULL, RFNOWAIT, "TrustedBSD audit write thread"); } @@ -146,6 +143,7 @@ } SYSUNINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_shutdown, NULL); +/* static void audit_record_enqueue(audit_record_t *ar) { @@ -154,6 +152,7 @@ TAILQ_INSERT_TAIL(&record_queue, ar, ar_next); mtx_unlock(&audit_mtx); } +*/ int audit_record_write(audit_record_t *ar) @@ -166,7 +165,6 @@ audit_write_thread(void *arg) { audit_record_t *ar; - u_long *lease; uma_zone_t z; /* @@ -182,8 +180,7 @@ if (ar) { z = record_zone; - lease = &record_leased; - audit_record_free(ar, z, lease); + audit_record_free(ar, z); } } } ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#14 (text+ko) ==== @@ -221,14 +221,14 @@ audit_time_t ui_mtime; }; -void audit_init(int, void *, struct thread *); -void audit_shutdown(int, void *, struct thread *); +void audit_init(void); +void audit_shutdown(void); struct vnode *audit_write_init(const char *, struct thread *, struct ucred **); void audit_write_shutdown(struct vnode *, struct thread *, struct ucred *); -int audit_record_write(audit_record_t *, struct audit_info *, - struct thread *); -audit_record_t *audit_record_init(int, size_t, struct audit_info *); +int audit_record_write(audit_record_t *); +audit_record_t *audit_record_init(int, size_t); void audit_uma_ctor(void *, int); +void audit_write_thread(void *); #endif /* !_SYS_AUDIT_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 22 9:26:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AF6337B431; Mon, 22 Apr 2002 09:26:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A6DD837B41A for ; Mon, 22 Apr 2002 09:26:26 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3MGNh473059 for perforce@freebsd.org; Mon, 22 Apr 2002 09:23:43 -0700 (PDT) (envelope-from obrien@freebsd.org) Date: Mon, 22 Apr 2002 09:23:43 -0700 (PDT) Message-Id: <200204221623.g3MGNh473059@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" Subject: PERFORCE change 10140 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10140 Change 10140 by obrien@obrien_trang on 2002/04/22 09:23:25 Add back groff and gperf -- we have a working C++ compiler now. Affected files ... ... //depot/projects/sparc64/gnu/usr.bin/Makefile#13 edit Differences ... ==== //depot/projects/sparc64/gnu/usr.bin/Makefile#13 (text+ko) ==== @@ -1,10 +1,10 @@ # $FreeBSD: src/gnu/usr.bin/Makefile,v 1.58 2002/03/24 16:01:17 markm Exp $ -SUBDIR= awk bc binutils cpio dc dialog diff diff3 \ - grep gzip man patch ptx rcs sdiff send-pr tar texinfo +SUBDIR= awk bc binutils cpio dc dialog diff diff3 gperf \ + grep groff gzip man patch ptx rcs sdiff send-pr tar texinfo .if ${MACHINE_ARCH} != "sparc64" -SUBDIR+=cc gperf groff +SUBDIR+=cc .endif .if !defined(NO_CVS) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 22 11:52:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3D9237B416; Mon, 22 Apr 2002 11:51:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 533C737B421 for ; Mon, 22 Apr 2002 11:51:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3MIaRK11376 for perforce@freebsd.org; Mon, 22 Apr 2002 11:36:27 -0700 (PDT) (envelope-from green@freebsd.org) Date: Mon, 22 Apr 2002 11:36:27 -0700 (PDT) Message-Id: <200204221836.g3MIaRK11376@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 10146 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10146 Change 10146 by green@green_laptop_2 on 2002/04/22 11:35:57 Back out badness. Affected files ... ... //depot/projects/trustedbsd/mac/usr.sbin/extattrctl/extattrctl.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/extattrctl/extattrctl.c#11 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002 Robert N. M. Watson + * Copyright (c) 1999-2001 Robert N. M. Watson * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/usr.sbin/extattrctl/extattrctl.c,v 1.19 2002/04/19 01:42:55 rwatson Exp $ + * $FreeBSD: src/usr.sbin/extattrctl/extattrctl.c,v 1.17 2001/12/31 18:21:24 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -84,26 +84,26 @@ return (buf.f_files); } -static const char zero_buf[8192]; - int initattr(int argc, char *argv[]) { struct ufs_extattr_fileheader uef; char *fs_path = NULL; - int ch, chunksize, i, error, flags; - ssize_t wlen; - size_t easize; + char *zero_buf = NULL; + long loop, num_inodes; + int ch, i, error, chunksize, overwrite = 0, flags; - flags = O_CREAT | O_WRONLY | O_TRUNC | O_EXCL; optind = 0; while ((ch = getopt(argc, argv, "fp:r:w:")) != -1) switch (ch) { case 'f': - flags &= ~O_EXCL; + overwrite = 1; break; case 'p': - fs_path = optarg; + if ((fs_path = strdup(optarg)) == NULL) { + perror("strdup"); + return(-1); + } break; case '?': default: @@ -116,6 +116,11 @@ if (argc != 2) usage(); + if (overwrite) + flags = O_CREAT | O_WRONLY; + else + flags = O_CREAT | O_EXCL | O_WRONLY; + error = 0; if ((i = open(argv[1], flags, 0600)) != -1) { FILE *fp; @@ -161,26 +166,6 @@ perror(argv[1]); return (-1); } - uef.uef_magic = UFS_EXTATTR_MAGIC; - uef.uef_version = UFS_EXTATTR_VERSION; - uef.uef_size = atoi(argv[0]); - if (write(i, &uef, sizeof(uef)) == -1) - error = -1; - else if (fs_path != NULL) { - easize = (sizeof uef + uef.uef_size) * - num_inodes_by_path(fs_path); - while (easize > 0) { - if (easize > sizeof zero_buf) - wlen = write(i, zero_buf, sizeof zero_buf); - else - wlen = write(i, zero_buf, easize); - if (wlen == -1) { - error = -1; - break; - } - easize -= wlen; - } - } if (error == -1) { perror(argv[1]); unlink(argv[1]); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 22 18:32:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2A4837B426; Mon, 22 Apr 2002 18:32:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D51D437B422 for ; Mon, 22 Apr 2002 18:32:13 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3N1WD306427 for perforce@freebsd.org; Mon, 22 Apr 2002 18:32:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 22 Apr 2002 18:32:13 -0700 (PDT) Message-Id: <200204230132.g3N1WD306427@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10157 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10157 Change 10157 by rwatson@rwatson_curry on 2002/04/22 18:31:20 Add two more MAC policy entry points: mac_cred_check_getextattr_vnode() mac_cred_check_setextattr_vnode() These permit policies to limit access to extended attribute operations. Policies are provided with access to the operation type, attribute namespace, and attribute name. In addition, a reference to the 'struct uio' for the operation is provided: however, it is intended that policies use this only to determine whether or not this is a delete/size query, rather than that policies attempt to use the 'struct uio' themselves, as pointers to kernel/userspace may be subject to time of check/time of use races if used. No policies currently implement these checks. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#126 edit ... //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#40 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#92 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#57 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#126 (text+ko) ==== @@ -437,6 +437,10 @@ mpc->mpc_ops.mpo_cred_check_exec_vnode = mpe->mpe_function; break; + case MAC_CRED_CHECK_GETEXTATTR_VNODE: + mpc->mpc_ops.mpo_cred_check_getextattr_vnode = + mpe->mpe_function; + break; case MAC_CRED_CHECK_OPEN_VNODE: mpc->mpc_ops.mpo_cred_check_open_vnode = mpe->mpe_function; @@ -457,6 +461,10 @@ mpc->mpc_ops.mpo_cred_check_search_vnode = mpe->mpe_function; break; + case MAC_CRED_CHECK_SETEXTATTR_VNODE: + mpc->mpc_ops.mpo_cred_check_setextattr_vnode = + mpe->mpe_function; + break; case MAC_CRED_CHECK_SETFLAGS_VNODE: mpc->mpc_ops.mpo_cred_check_setflags_vnode = mpe->mpe_function; @@ -993,6 +1001,21 @@ } int +mac_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, + int attrnamespace, const char *name, struct uio *uio) +{ + struct mac label; + int error; + + error = VOP_GETLABEL(vp, &label, cred, curthread); + if (error) + return (error); + MAC_CHECK(cred_check_getextattr_vnode, cred, vp, &label, attrnamespace, + name, uio); + return (error); +} + +int mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode) { struct mac label; @@ -1032,6 +1055,21 @@ } int +mac_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, + int attrnamespace, const char *name, struct uio *uio) +{ + struct mac label; + int error; + + error = VOP_GETLABEL(vp, &label, cred, curthread); + if (error) + return (error); + MAC_CHECK(cred_check_setextattr_vnode, cred, vp, &label, attrnamespace, + name, uio); + return (error); +} + +int mac_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp, u_long flags) { ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#40 (text+ko) ==== @@ -4768,6 +4768,13 @@ auio.uio_td = td; cnt = nbytes; +#ifdef MAC + error = mac_cred_check_setextattr_vnode(td->td_ucred, vp, + attrnamespace, attrname, &auio); + if (error) + goto done; +#endif + error = VOP_SETEXTATTR(vp, attrnamespace, attrname, &auio, td->td_ucred, td); cnt -= auio.uio_resid; @@ -4881,11 +4888,23 @@ auio.uio_segflg = UIO_USERSPACE; auio.uio_td = td; cnt = nbytes; +#ifdef MAC + error = mac_cred_check_getextattr_vnode(td->td_ucred, vp, + attrnamespace, attrname, &auio); + if (error) + goto done; +#endif error = VOP_GETEXTATTR(vp, attrnamespace, attrname, &auio, NULL, td->td_ucred, td); cnt -= auio.uio_resid; td->td_retval[0] = cnt; } else { +#ifdef MAC + error = mac_cred_check_getextattr_vnode(td->td_ucred, vp, + attrnamespace, attrname, NULL); + if (error) + goto done; +#endif error = VOP_GETEXTATTR(vp, attrnamespace, attrname, NULL, &size, td->td_ucred, td); td->td_retval[0] = size; @@ -4977,6 +4996,11 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); +#ifdef MAC + error = mac_cred_check_setextattr_vnode(td->td_ucred, vp, + attrnamespace, attrname, NULL); +#endif + error = VOP_SETEXTATTR(vp, attrnamespace, attrname, NULL, td->td_ucred, td); ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#92 (text+ko) ==== @@ -275,6 +275,7 @@ struct socket; struct timespec; struct ucred; +struct uio; struct vattr; struct vnode; @@ -309,7 +310,11 @@ int mac_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp); int mac_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct vattr *vap); +int mac_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, + int attrnamespace, const char *name, struct uio *uio); int mac_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp); +int mac_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, + int attrnamespace, const char *name, struct uio *uio); int mac_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp, u_long flags); int mac_cred_check_setmode_vnode(struct ucred *cred, struct vnode *vp, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#57 (text+ko) ==== @@ -170,6 +170,9 @@ struct mac *label); int (*mpo_cred_check_exec_vnode)(struct ucred *cred, struct vnode *vp, struct mac *label); + int (*mpo_cred_check_getextattr_vnode)(struct ucred *cred, + struct vnode *vp, struct mac *label, int attrnamespace, + const char *name, struct uio *uio); int (*mpo_cred_check_open_vnode)(struct ucred *cred, struct vnode *vp, struct mac *label, mode_t acc_mode); int (*mpo_cred_check_rename_from_vnode)(struct ucred *cred, @@ -182,6 +185,9 @@ struct vnode *vp, struct mac *label); int (*mpo_cred_check_search_vnode)(struct ucred *cred, struct vnode *dvp, struct mac *dlabel); + int (*mpo_cred_check_setextattr_vnode)(struct ucred *cred, + struct vnode *vp, struct mac *label, int attrnamespace, + const char *name, struct uio *uio); int (*mpo_cred_check_setflags_vnode)(struct ucred *cred, struct vnode *vp, struct mac *label, u_long flags); int (*mpo_cred_check_setmode_vnode)(struct ucred *cred, @@ -256,11 +262,13 @@ MAC_CRED_CHECK_CREATE_VNODE, MAC_CRED_CHECK_DELETE_VNODE, MAC_CRED_CHECK_EXEC_VNODE, + MAC_CRED_CHECK_GETEXTATTR_VNODE, MAC_CRED_CHECK_OPEN_VNODE, MAC_CRED_CHECK_RENAME_FROM_VNODE, MAC_CRED_CHECK_RENAME_TO_VNODE, MAC_CRED_CHECK_REVOKE_VNODE, MAC_CRED_CHECK_SEARCH_VNODE, + MAC_CRED_CHECK_SETEXTATTR_VNODE, MAC_CRED_CHECK_SETFLAGS_VNODE, MAC_CRED_CHECK_SETMODE_VNODE, MAC_CRED_CHECK_SETOWNER_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 22 19:30:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4593A37B404; Mon, 22 Apr 2002 19:30:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9DFDB37B416 for ; Mon, 22 Apr 2002 19:30:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3N2UP817375 for perforce@freebsd.org; Mon, 22 Apr 2002 19:30:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 22 Apr 2002 19:30:25 -0700 (PDT) Message-Id: <200204230230.g3N2UP817375@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10160 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10160 Change 10160 by rwatson@rwatson_curry on 2002/04/22 19:30:00 Teach various policies about getextattr/setextattr entry points: babyaudit: audit getextattr/setextattr events without much detail mac_biba: treat getextattr as a read, setextattr as a write for integrity purposes mac_bsdextended: treat getextattr as a read, setextattr as a write mac_mls: treat getextattr as a read, setextattr as a write for confidentiality purposes mac_none: the usual mac_te: introduce two new operations for file/dir: getextattr and setextattr; authorize as appropriate SEBSD and mac_seeotheruids were not updated, as they are not [currently] relevant to those policies. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#7 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#30 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#27 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#24 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#21 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#22 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#93 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#7 (text+ko) ==== @@ -124,6 +124,15 @@ } static int +babyaudit_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, + struct mac *label, int attrnamespace, const char *name, struct uio *uio) +{ + + babyaudit_print("babyaudit_cred_check_getextattr_vnode", vp, NULL); + return (0); +} + +static int babyaudit_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp, struct mac *dlabel) { @@ -133,6 +142,15 @@ } static int +babyaudit_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, + struct mac *label, int attrnamespace, const char *name, struct uio *uio) +{ + + babyaudit_print("babyaudit_cred_check_setextattr_vnode", vp, NULL); + return (0); +} + +static int babyaudit_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp, struct mac *label, u_long flags) { @@ -232,6 +250,8 @@ (macop_t)babyaudit_cred_check_delete_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)babyaudit_cred_check_exec_vnode }, + { MAC_CRED_CHECK_GETEXTATTR_VNODE, + (macop_t)babyaudit_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)babyaudit_cred_check_open_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, @@ -242,6 +262,8 @@ (macop_t)babyaudit_cred_check_revoke_vnode }, { MAC_CRED_CHECK_SEARCH_VNODE, (macop_t)babyaudit_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETEXTATTR_VNODE, + (macop_t)babyaudit_cred_check_setextattr_vnode }, { MAC_CRED_CHECK_SETFLAGS_VNODE, (macop_t)babyaudit_cred_check_setflags_vnode }, { MAC_CRED_CHECK_SETMODE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#30 (text+ko) ==== @@ -862,6 +862,18 @@ } static int +mac_biba_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, + struct mac *label, int attrnamespace, const char *name, struct uio *uio) +{ + + if (!mac_biba_enabled) + return (0); + if (!mac_biba_single_dominate(label, &cred->cr_label)) + return (EACCES); + return (0); +} + +static int mac_biba_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp, struct mac *label) { @@ -886,6 +898,18 @@ } static int +mac_biba_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, + struct mac *label, int attrnamespace, const char *name, struct uio *uio) +{ + + if (!mac_biba_enabled) + return (0); + if (!mac_biba_single_dominate(&cred->cr_label, label)) + return (EACCES); + return (0); +} + +static int mac_biba_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp, struct mac *label, u_long flags) { @@ -1128,6 +1152,8 @@ (macop_t)mac_biba_cred_check_delete_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)mac_biba_cred_check_exec_vnode }, + { MAC_CRED_CHECK_GETEXTATTR_VNODE, + (macop_t)mac_biba_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_biba_cred_check_open_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, @@ -1138,6 +1164,8 @@ (macop_t)mac_biba_cred_check_revoke_vnode }, { MAC_CRED_CHECK_SEARCH_VNODE, (macop_t)mac_biba_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETEXTATTR_VNODE, + (macop_t)mac_biba_cred_check_setextattr_vnode }, { MAC_CRED_CHECK_SETFLAGS_VNODE, (macop_t)mac_biba_cred_check_setflags_vnode }, { MAC_CRED_CHECK_SETMODE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#27 (text+ko) ==== @@ -351,6 +351,23 @@ } static int +mac_bsdextended_cred_check_getextattr_vnode(struct ucred *cred, + struct vnode *vp, struct mac *label, int attrnamespace, + const char *name, struct uio *uio) +{ + struct vattr vap; + int error; + + if (!mac_bsdextended_enabled) + return (0); + + error = VOP_GETATTR(vp, &vap, cred, curthread); + if (error) + return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VREAD)); +} + +static int mac_bsdextended_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct mac *filelabel, mode_t acc_mode) { @@ -452,6 +469,23 @@ } static int +mac_bsdextended_cred_check_setextattr_vnode(struct ucred *cred, + struct vnode *vp, struct mac *label, int attrnamespace, const char *name, + struct uio *uio) +{ + struct vattr vap; + int error; + + if (!mac_bsdextended_enabled) + return (0); + + error = VOP_GETATTR(vp, &vap, cred, curthread); + if (error) + return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VWRITE)); +} + +static int mac_bsdextended_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp, struct mac *label, u_long flags) { @@ -605,6 +639,8 @@ (macop_t)mac_bsdextended_cred_check_delete_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)mac_bsdextended_cred_check_exec_vnode }, + { MAC_CRED_CHECK_GETEXTATTR_VNODE, + (macop_t)mac_bsdextended_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_bsdextended_cred_check_open_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, @@ -615,6 +651,8 @@ (macop_t)mac_bsdextended_cred_check_revoke_vnode }, { MAC_CRED_CHECK_SEARCH_VNODE, (macop_t)mac_bsdextended_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETEXTATTR_VNODE, + (macop_t)mac_bsdextended_cred_check_setextattr_vnode }, { MAC_CRED_CHECK_SETFLAGS_VNODE, (macop_t)mac_bsdextended_cred_check_setflags_vnode }, { MAC_CRED_CHECK_SETMODE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#24 (text+ko) ==== @@ -795,6 +795,18 @@ } static int +mac_mls_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, + struct mac *label) +{ + + if (mac_mls_enabled) + return (0); + if (!mac_mls_single_dominate(&cred->cr_label, label)) + return (EACCES); + return (0); +} + +static int mac_mls_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp, struct mac *label) { @@ -819,6 +831,18 @@ } static int +mac_mls_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, + struct mac *label, int attrnamespace, const char *name, struct uio *uio) +{ + + if (!mac_mls_enabled) + return (0); + if (!mac_mls_single_dominate(label, &cred->cr_label)) + return (EACCES); + return (0); +} + +static int mac_mls_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp, struct mac *label, u_long flags) { @@ -1061,6 +1085,8 @@ (macop_t)mac_mls_cred_check_delete_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)mac_mls_cred_check_exec_vnode }, + { MAC_CRED_CHECK_GETEXTATTR_VNODE, + (macop_t)mac_mls_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_mls_cred_check_open_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, @@ -1071,6 +1097,8 @@ (macop_t)mac_mls_cred_check_revoke_vnode }, { MAC_CRED_CHECK_SEARCH_VNODE, (macop_t)mac_mls_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETEXTATTR_VNODE, + (macop_t)mac_mls_cred_check_setextattr_vnode }, { MAC_CRED_CHECK_SETFLAGS_VNODE, (macop_t)mac_mls_cred_check_setflags_vnode }, { MAC_CRED_CHECK_SETMODE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#21 (text+ko) ==== @@ -455,6 +455,15 @@ } static int +mac_none_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, + struct mac *label, int attrnamespace, const char *name, struct uio *uio) +{ + + /* Perform access control check here. */ + return (0); +} + +static int mac_none_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp, struct mac *dlabel) { @@ -464,6 +473,15 @@ } static int +mac_none_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, + struct mac *label, int attrnamespace, const char *name, struct uio *uio) +{ + + /* Perform access control check here. */ + return (0); +} + +static int mac_none_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp, struct mac *label, u_long flags) { @@ -686,6 +704,8 @@ (macop_t)mac_none_cred_check_delete_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)mac_none_cred_check_exec_vnode }, + { MAC_CRED_CHECK_GETEXTATTR_VNODE, + (macop_t)mac_none_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_none_cred_check_open_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, @@ -696,6 +716,8 @@ (macop_t)mac_none_cred_check_revoke_vnode }, { MAC_CRED_CHECK_SEARCH_VNODE, (macop_t)mac_none_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETEXTATTR_VNODE, + (macop_t)mac_none_cred_check_setextattr_vnode }, { MAC_CRED_CHECK_SETFLAGS_VNODE, (macop_t)mac_none_cred_check_setflags_vnode }, { MAC_CRED_CHECK_SETMODE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#22 (text+ko) ==== @@ -816,6 +816,21 @@ } static int +mac_te_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, + struct mac *label, int attrnamespace, const char *name, struct uio *uio) +{ + + switch (vp->v_type) { + case VDIR: + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_DIR_GETEXTATTR)); + default: + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_FILE_GETEXTATTR)); + } +} + +static int mac_te_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp, struct mac *label) { @@ -834,6 +849,21 @@ } static int +mac_te_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, + struct mac *label, int attrnamespace, const char *name, struct uio *uio) +{ + + switch (vp->v_type) { + case VDIR: + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_SETEXTATTR)); + default: + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_FILE_SETEXTATTR)); + } +} + +static int mac_te_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp, struct mac *label, u_long flags) { @@ -1131,6 +1161,8 @@ (macop_t)mac_te_cred_check_delete_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)mac_te_cred_check_exec_vnode }, + { MAC_CRED_CHECK_GETEXTATTR_VNODE, + (macop_t)mac_te_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_te_cred_check_open_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, @@ -1141,6 +1173,8 @@ (macop_t)mac_te_cred_check_revoke_vnode }, { MAC_CRED_CHECK_SEARCH_VNODE, (macop_t)mac_te_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETEXTATTR_VNODE, + (macop_t)mac_te_cred_check_setextattr_vnode }, { MAC_CRED_CHECK_SETFLAGS_VNODE, (macop_t)mac_te_cred_check_setflags_vnode }, { MAC_CRED_CHECK_SETMODE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#93 (text+ko) ==== @@ -157,9 +157,11 @@ #define MAC_TE_OPERATION_FILE_ADMIN 1 #define MAC_TE_OPERATION_FILE_DELETE 2 #define MAC_TE_OPERATION_FILE_EXEC 3 -#define MAC_TE_OPERATION_FILE_READ 4 -#define MAC_TE_OPERATION_FILE_STAT 5 -#define MAC_TE_OPERATION_FILE_WRITE 6 +#define MAC_TE_OPERATION_FILE_GETEXTATTR 4 +#define MAC_TE_OPERATION_FILE_READ 5 +#define MAC_TE_OPERATION_FILE_SETEXTATTR 6 +#define MAC_TE_OPERATION_FILE_STAT 7 +#define MAC_TE_OPERATION_FILE_WRITE 8 #define MAC_TE_CLASS_MBUF 3 #define MAC_TE_OPERATION_MBUF_RECEIVE 1 @@ -169,10 +171,12 @@ #define MAC_TE_OPERATION_DIR_ADMIN 1 #define MAC_TE_OPERATION_DIR_CHDIR 2 #define MAC_TE_OPERATION_DIR_DELETE 3 -#define MAC_TE_OPERATION_DIR_LOOKUP 4 -#define MAC_TE_OPERATION_DIR_READ 5 -#define MAC_TE_OPERATION_DIR_STAT 6 -#define MAC_TE_OPERATION_DIR_WRITE 7 +#define MAC_TE_OPERATION_DIR_GETEXTATTR 4 +#define MAC_TE_OPERATION_DIR_LOOKUP 5 +#define MAC_TE_OPERATION_DIR_READ 6 +#define MAC_TE_OPERATION_DIR_SETEXTATTR 7 +#define MAC_TE_OPERATION_DIR_STAT 8 +#define MAC_TE_OPERATION_DIR_WRITE 9 #define MAC_TE_CLASS_FS 5 #define MAC_TE_OPERATION_FS_STATFS 1 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 22 19:46:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F8FE37B41A; Mon, 22 Apr 2002 19:46:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4244537B417 for ; Mon, 22 Apr 2002 19:46:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3N2kkE19236 for perforce@freebsd.org; Mon, 22 Apr 2002 19:46:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 22 Apr 2002 19:46:46 -0700 (PDT) Message-Id: <200204230246.g3N2kkE19236@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10161 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10161 Change 10161 by rwatson@rwatson_curry on 2002/04/22 19:45:56 Clean up usage() for ugidfw. Affected files ... ... //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#3 (text+ko) ==== @@ -60,8 +60,9 @@ { fprintf(stderr, "ugidfw list\n"); - fprintf(stderr, "ugidfw set [rulenum] ruletext]\n"); - fprintf(stderr, "ugidfs remove [rulenum]\n"); + fprintf(stderr, "ugidfw set rulenum [subject [not] [uid uid] [gid gid]]" + " [object [not] [uid uid] [gid gid]] mode arswxn\n"); + fprintf(stderr, "ugidfw remove rulenum\n"); exit (-1); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 23 9:43:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B582937B400; Tue, 23 Apr 2002 09:43:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BEC1737B434 for ; Tue, 23 Apr 2002 09:43:03 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3NGh3318923 for perforce@freebsd.org; Tue, 23 Apr 2002 09:43:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 23 Apr 2002 09:43:03 -0700 (PDT) Message-Id: <200204231643.g3NGh3318923@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10182 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10182 Change 10182 by rwatson@rwatson_curry on 2002/04/23 09:42:58 Remove many of the mac_te-local definitions from mac.h, and stick them in a new mac_te.h under the sub-directory specific to mac_te. Not all definitions can be moved, because 'struct mac_te' is still relevant to the definition of 'struct mac'. Currently, there don't appear to be consumers of these definitions outside the kernel, so mac_te.h is not installed. If that conclusion is wrong/changes, we can fix it easily enough. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#23 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#1 add ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#94 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#23 (text+ko) ==== @@ -66,6 +66,8 @@ #include #include +#include + #ifdef MAC SYSCTL_DECL(_security_mac); ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#94 (text+ko) ==== @@ -132,60 +132,6 @@ struct mac_te { char mt_type[MAC_TE_TYPE_MAXLEN+1]; /* TE type */ }; -#define MAC_TE_TYPE_UNINITIALIZED "uninitialized_t" -#define MAC_TE_TYPE_EQUAL "equal" -#define MAC_TE_TYPE_INIT "init_d" -#define MAC_TE_TYPE_KPROC "kproc_d" -#define MAC_TE_TYPE_ROOTFS "rootfs_t" -#define MAC_TE_TYPE_FS "fs_t" -#define MAC_TE_TYPE_DEVICE "device_t" -#define MAC_TE_TYPE_DEVNULL "devnull_t" -#define MAC_TE_TYPE_DEVZERO "devzero_t" -#define MAC_TE_TYPE_DEVRANDOM "devrandom_t" -#define MAC_TE_TYPE_DEVFD "devfd_t" - -#define MAC_TE_CLASS_ANY 0 -#define MAC_TE_OPERATION_ANY 0 - -#define MAC_TE_CLASS_PROC 1 -#define MAC_TE_OPERATION_PROC_DEBUG 1 -#define MAC_TE_OPERATION_PROC_SCHED 2 -#define MAC_TE_OPERATION_PROC_SEE 3 -#define MAC_TE_OPERATION_PROC_SIGNAL 4 - -#define MAC_TE_CLASS_FILE 2 -#define MAC_TE_OPERATION_FILE_ADMIN 1 -#define MAC_TE_OPERATION_FILE_DELETE 2 -#define MAC_TE_OPERATION_FILE_EXEC 3 -#define MAC_TE_OPERATION_FILE_GETEXTATTR 4 -#define MAC_TE_OPERATION_FILE_READ 5 -#define MAC_TE_OPERATION_FILE_SETEXTATTR 6 -#define MAC_TE_OPERATION_FILE_STAT 7 -#define MAC_TE_OPERATION_FILE_WRITE 8 - -#define MAC_TE_CLASS_MBUF 3 -#define MAC_TE_OPERATION_MBUF_RECEIVE 1 -#define MAC_TE_OPERATION_MBUF_SEND 2 - -#define MAC_TE_CLASS_DIR 4 -#define MAC_TE_OPERATION_DIR_ADMIN 1 -#define MAC_TE_OPERATION_DIR_CHDIR 2 -#define MAC_TE_OPERATION_DIR_DELETE 3 -#define MAC_TE_OPERATION_DIR_GETEXTATTR 4 -#define MAC_TE_OPERATION_DIR_LOOKUP 5 -#define MAC_TE_OPERATION_DIR_READ 6 -#define MAC_TE_OPERATION_DIR_SETEXTATTR 7 -#define MAC_TE_OPERATION_DIR_STAT 8 -#define MAC_TE_OPERATION_DIR_WRITE 9 - -#define MAC_TE_CLASS_FS 5 -#define MAC_TE_OPERATION_FS_STATFS 1 - -#define MAC_TE_CLASS_BPF 6 -#define MAC_TE_OPERATION_BPF_RECEIVE 1 - -#define MAC_TE_CLASS_SOCKET 7 -#define MAC_TE_OPERATION_SOCKET_SEE 1 struct mac_sebsd { uint32_t ms_psid; /* persistent sid storage */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 23 12:28:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A24637B433; Tue, 23 Apr 2002 12:28:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by hub.freebsd.org (Postfix) with ESMTP id C101837B4BC for ; Tue, 23 Apr 2002 12:27:55 -0700 (PDT) Received: (qmail 28029 invoked from network); 23 Apr 2002 19:27:53 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail14.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 23 Apr 2002 19:27:53 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g3NJRsv03551; Tue, 23 Apr 2002 15:27:54 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Tue, 23 Apr 2002 15:27:01 -0400 (EDT) From: John Baldwin To: Robert Watson Subject: Re: PERFORCE change 10000 for review Cc: Perforce Change Reviews , Peter Wemm , "J. Mallett" Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 20-Apr-2002 Robert Watson wrote: > On Fri, 19 Apr 2002, J. Mallett wrote: > >> On Fri, Apr 19, 2002 at 04:18:25PM -0700, Peter Wemm wrote: >> > Robert Watson wrote: >> > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10000 >> > > >> > > Change 10000 by rwatson@rwatson_tislabs on 2002/04/19 06:57:44 >> > >> > w00t. 10000 changes. :-] >> >> And of course, it was Robert who broke the barrier. Go rwatson go! > > And how telling is it that the change in question was a one-line > whitespace change. :-) Dang it, I wanted the 10000th change. :-P Stupid vacations. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 23 17:45:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 911C637B419; Tue, 23 Apr 2002 17:45:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8794337B41F for ; Tue, 23 Apr 2002 17:45:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3O0jMb31640 for perforce@freebsd.org; Tue, 23 Apr 2002 17:45:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 23 Apr 2002 17:45:22 -0700 (PDT) Message-Id: <200204240045.g3O0jMb31640@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10196 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10196 Change 10196 by rwatson@rwatson_curry on 2002/04/23 17:44:46 Add vnode locking assertions to MAC hooks that act on vnodes; not yet tested, and may hurt due to possible VFS locking issues. In particular, the revoke() MAC hook may assume locking, but the revoke VOP_() doesn't. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#127 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#127 (text+ko) ==== @@ -962,6 +962,8 @@ struct mac oldlabel; int error; + ASSERT_VOP_LOCKED(vp, "mac_cred_check_relabel_vnode"); + if (!mac_label_valid(newlabel)) return (EINVAL); @@ -979,6 +981,8 @@ struct mac dirlabel; int error; + ASSERT_VOP_LOCKED(dvp, "mac_cred_check_chdir_vnode"); + error = VOP_GETLABEL(dvp, &dirlabel, cred, curthread); if (error) return (error); @@ -993,6 +997,8 @@ struct mac dirlabel; int error; + ASSERT_VOP_LOCKED(dvp, "mac_cred_check_create_vnode"); + error = VOP_GETLABEL(dvp, &dirlabel, cred, curthread); if (error) return (error); @@ -1007,6 +1013,8 @@ struct mac label; int error; + ASSERT_VOP_LOCKED(vp, "mac_cred_check_getextattr_vnode"); + error = VOP_GETLABEL(vp, &label, cred, curthread); if (error) return (error); @@ -1021,6 +1029,8 @@ struct mac label; int error; + ASSERT_VOP_LOCKED(vp, "mac_cred_check_open_vnode"); + error = VOP_GETLABEL(vp, &label, cred, curthread); if (error) return (error); @@ -1034,6 +1044,8 @@ struct mac label; int error; + ASSERT_VOP_LOCKED(vp, "mac_cred_check_revoke_vnode"); + error = VOP_GETLABEL(vp, &label, cred, curthread); if (error) return (error); @@ -1047,6 +1059,8 @@ struct mac dirlabel; int error; + ASSERT_VOP_LOCKED(dvp, "mac_cred_check_search_vnode"); + error = VOP_GETLABEL(dvp, &dirlabel, cred, curthread); if (error) return (error); @@ -1061,6 +1075,8 @@ struct mac label; int error; + ASSERT_VOP_LOCKED(vp, "mac_cred_check_setextattr_vnode"); + error = VOP_GETLABEL(vp, &label, cred, curthread); if (error) return (error); @@ -1076,6 +1092,8 @@ struct mac label; int error; + ASSERT_VOP_LOCKED(vp, "mac_cred_check_setflags_vnode"); + error = VOP_GETLABEL(vp, &label, cred, curthread); if (error) return (error); @@ -1090,6 +1108,8 @@ struct mac label; int error; + ASSERT_VOP_LOCKED(vp, "mac_cred_check_setmode_vnode"); + error = VOP_GETLABEL(vp, &label, cred, curthread); if (error) return (error); @@ -1104,6 +1124,8 @@ struct mac label; int error; + ASSERT_VOP_LOCKED(vp, "mac_cred_check_setowner_vnode"); + error = VOP_GETLABEL(vp, &label, cred, curthread); if (error) return (error); @@ -1118,6 +1140,8 @@ struct mac label; int error; + ASSERT_VOP_LOCKED(vp, "mac_cred_check_setutimes_vnode"); + error = VOP_GETLABEL(vp, &label, cred, curthread); if (error) return (error); @@ -1132,6 +1156,9 @@ struct mac dirlabel, filelabel; int error; + ASSERT_VOP_LOCKED(dvp, "mac_cred_check_delete_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_cred_check_delete_vnode"); + error = VOP_GETLABEL(dvp, &dirlabel, cred, curthread); if (error) return (error); @@ -1150,6 +1177,9 @@ struct mac dirlabel, filelabel; int error; + ASSERT_VOP_LOCKED(dvp, "mac_cred_check_rename_from_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_cred_check_rename_from_vnode"); + error = VOP_GETLABEL(dvp, &dirlabel, cred, curthread); if (error) return (error); @@ -1168,6 +1198,9 @@ struct mac dirlabel, filelabel; int error; + ASSERT_VOP_LOCKED(dvp, "mac_cred_check_rename_to_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_cred_check_rename_to_vnode"); + error = VOP_GETLABEL(dvp, &dirlabel, cred, curthread); if (error) return (error); @@ -1187,6 +1220,8 @@ struct mac label; int error; + ASSERT_VOP_LOCKED(vp, "mac_cred_check_stat_vnode"); + error = VOP_GETLABEL(vp, &label, cred, curthread); if (error) return (error); @@ -1480,6 +1515,9 @@ struct mac parentlabel; int error; + ASSERT_VOP_LOCKED(parent, "mac_create_vnode_from_vnode"); + ASSERT_VOP_LOCKED(child, "mac_create_vnode_from_vnode"); + error = VOP_GETLABEL(parent, &parentlabel, curthread->td_ucred, curthread); if (error) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 23 20:14:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9BC937B405; Tue, 23 Apr 2002 20:14:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1912F37B400 for ; Tue, 23 Apr 2002 20:14:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3O3EP963911 for perforce@freebsd.org; Tue, 23 Apr 2002 20:14:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 23 Apr 2002 20:14:25 -0700 (PDT) Message-Id: <200204240314.g3O3EP963911@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10204 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10204 Change 10204 by rwatson@rwatson_tislabs on 2002/04/23 20:13:49 Work around existing FreeBSD VFS locking breakage: don't assert that vp is locked for mac_cred_check_search_vnode(), because apparently it's not. Existing assertions in lookup() already catch this same bug, so it's not our fault (and needs to be fixed). Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#128 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#128 (text+ko) ==== @@ -1059,7 +1059,7 @@ struct mac dirlabel; int error; - ASSERT_VOP_LOCKED(dvp, "mac_cred_check_search_vnode"); + /* XXX: ASSERT_VOP_LOCKED(dvp, "mac_cred_check_search_vnode"); */ error = VOP_GETLABEL(dvp, &dirlabel, cred, curthread); if (error) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 24 7:19:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B7B037B426; Wed, 24 Apr 2002 07:19:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AC1FB37B404; Wed, 24 Apr 2002 07:19:09 -0700 (PDT) Received: from localhost (green@localhost) by green.bikeshed.org (8.11.6/8.11.6) with ESMTP id g3OEIIR33520; Wed, 24 Apr 2002 10:18:18 -0400 (EDT) (envelope-from green@green.bikeshed.org) Message-Id: <200204241418.g3OEIIR33520@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10204 for review In-Reply-To: Your message of "Tue, 23 Apr 2002 20:14:25 PDT." <200204240314.g3O3EP963911@freefall.freebsd.org> From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 24 Apr 2002 10:18:18 -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10204 > > Change 10204 by rwatson@rwatson_tislabs on 2002/04/23 20:13:49 > > Work around existing FreeBSD VFS locking breakage: don't assert > that vp is locked for mac_cred_check_search_vnode(), because > apparently it's not. Existing assertions in lookup() already > catch this same bug, so it's not our fault (and needs to be > fixed). Are you sure ASSERT_VOP_LOCKED() works like you'd expect for shared locks, too? -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 24 7:57:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB7B737B41D; Wed, 24 Apr 2002 07:57:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 79DC437B404 for ; Wed, 24 Apr 2002 07:57:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3OEtr032258 for perforce@freebsd.org; Wed, 24 Apr 2002 07:55:53 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Wed, 24 Apr 2002 07:55:53 -0700 (PDT) Message-Id: <200204241455.g3OEtr032258@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10227 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10227 Change 10227 by jake@jake_sparc64 on 2002/04/24 07:55:11 Fix bug, || should be &&. Affected files ... ... //depot/projects/sparc64/sys/boot/sparc64/loader/main.c#24 edit Differences ... ==== //depot/projects/sparc64/sys/boot/sparc64/loader/main.c#24 (text+ko) ==== @@ -336,7 +336,7 @@ if (OF_getprop(child, "device_type", buf, sizeof(buf)) > 0 && strcmp(buf, "cpu") == 0) { if (OF_getprop(child, "upa-portid", &cpu, - sizeof(cpu)) == -1 || OF_getprop(child, "portid", + sizeof(cpu)) == -1 && OF_getprop(child, "portid", &cpu, sizeof(cpu)) == -1) panic("main: OF_getprop"); if (cpu == bootcpu) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 24 8:11:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 359B837B419; Wed, 24 Apr 2002 08:11:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E3F2F37B420 for ; Wed, 24 Apr 2002 08:11:11 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3OF9Al43865 for perforce@freebsd.org; Wed, 24 Apr 2002 08:09:10 -0700 (PDT) (envelope-from green@freebsd.org) Date: Wed, 24 Apr 2002 08:09:10 -0700 (PDT) Message-Id: <200204241509.g3OF9Al43865@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 10228 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10228 Change 10228 by green@green_laptop_2 on 2002/04/24 08:08:23 Copy a MAC.hints from GENERIC.hints. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC.hints#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 24 8:49:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 295AD37B41A; Wed, 24 Apr 2002 08:49:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4A00537B400 for ; Wed, 24 Apr 2002 08:49:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3OFmxG54528 for perforce@freebsd.org; Wed, 24 Apr 2002 08:48:59 -0700 (PDT) (envelope-from green@freebsd.org) Date: Wed, 24 Apr 2002 08:48:59 -0700 (PDT) Message-Id: <200204241548.g3OFmxG54528@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 10231 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10231 Change 10231 by green@green_laptop_2 on 2002/04/24 08:48:22 Err... use MAC.hints, too. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#22 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#22 (text+ko) ==== @@ -25,7 +25,7 @@ maxusers 0 #To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" #Default places to look for devices. +hints "MAC.hints" #Default places to look for devices. makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 24 9:51:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9AB437B41E; Wed, 24 Apr 2002 09:51:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7ED0037B41D for ; Wed, 24 Apr 2002 09:51:18 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3OGpI470015 for perforce@freebsd.org; Wed, 24 Apr 2002 09:51:18 -0700 (PDT) (envelope-from green@freebsd.org) Date: Wed, 24 Apr 2002 09:51:18 -0700 (PDT) Message-Id: <200204241651.g3OGpI470015@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 10234 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10234 Change 10234 by green@green_laptop_2 on 2002/04/24 09:51:11 Hints don't need to have to be compiled in by default. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#23 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#23 (text+ko) ==== @@ -25,7 +25,7 @@ maxusers 0 #To statically compile in device wiring instead of /boot/device.hints -hints "MAC.hints" #Default places to look for devices. +#hints "MAC.hints" #Default places to look for devices. makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 24 13:53:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2733537B41B; Wed, 24 Apr 2002 13:53:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E3EE937B404 for ; Wed, 24 Apr 2002 13:53:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3OKpOl25325 for perforce@freebsd.org; Wed, 24 Apr 2002 13:51:24 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 24 Apr 2002 13:51:24 -0700 (PDT) Message-Id: <200204242051.g3OKpOl25325@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 10244 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10244 Change 10244 by des@des.at.des.thinksec.com on 2002/04/24 13:50:40 Don't reference vpath after it's been freed. Affected files ... ... //depot/projects/openpam/lib/openpam_dynamic.c#5 edit Differences ... ==== //depot/projects/openpam/lib/openpam_dynamic.c#5 (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_dynamic.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#5 $ */ #include @@ -80,7 +80,7 @@ module->func[i] = dlsym(dlh, _pam_sm_func_name[i]); if (module->func[i] == NULL) openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s", - vpath, _pam_sm_func_name[i], dlerror()); + path, _pam_sm_func_name[i], dlerror()); } return (module); buf_err: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Apr 24 18:16:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDCB437B41A; Wed, 24 Apr 2002 18:16:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id 4627437B417; Wed, 24 Apr 2002 18:16:09 -0700 (PDT) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.11.6/8.11.6) with SMTP id g3P1ELw40468; Wed, 24 Apr 2002 21:14:21 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Wed, 24 Apr 2002 21:14:20 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: "Brian F. Feldman" Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10204 for review In-Reply-To: <200204241418.g3OEIIR33520@green.bikeshed.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, 24 Apr 2002, Brian F. Feldman wrote: > Robert Watson wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10204 > > > > Change 10204 by rwatson@rwatson_tislabs on 2002/04/23 20:13:49 > > > > Work around existing FreeBSD VFS locking breakage: don't assert > > that vp is locked for mac_cred_check_search_vnode(), because > > apparently it's not. Existing assertions in lookup() already > > catch this same bug, so it's not our fault (and needs to be > > fixed). > > Are you sure ASSERT_VOP_LOCKED() works like you'd expect for shared > locks, too? Not entirely sure, and should check. Interestingly, disabling my assert still results in a panic early in init due to existing adjacent assertions in lookup(). I'm busy unwinding lookup behavior to try and get a grasp of what's going on. I realize VFS locking is a deep pit, but having a few more assertions working would be helpful for debugging this stuff. Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 25 12:19:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 959A737B41C; Thu, 25 Apr 2002 12:19:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E535D37B405 for ; Thu, 25 Apr 2002 12:19:30 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3PJJUH51976 for perforce@freebsd.org; Thu, 25 Apr 2002 12:19:30 -0700 (PDT) (envelope-from green@freebsd.org) Date: Thu, 25 Apr 2002 12:19:30 -0700 (PDT) Message-Id: <200204251919.g3PJJUH51976@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 10281 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10281 Change 10281 by green@green_laptop_2 on 2002/04/25 12:19:16 Use ${DEFAULTKERNEL} and ${EXTRAKERNELS} instead of the single ${KERNELS} variable to allow a release without GENERIC. Affected files ... ... //depot/projects/trustedbsd/mac/release/Makefile#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/release/Makefile#11 (text+ko) ==== @@ -133,7 +133,8 @@ CRYPTO_DISTS?= crypto krb4 krb5 BIN_DISTS?= bin DISTRIBUTIONS?= ${BIN_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} -KERNELS?= GENERIC +DEFAULTKERNEL?= GENERIC +EXTRAKERNELS?= MAC BOOT1= etc/defaults/rc.conf @@ -459,7 +460,7 @@ # Make and install the generic kernel(s). release.3: -.for kernel in ${KERNELS} +.for kernel in ${DEFAULTKERNEL} ${EXTRAKERNELS} -chflags -R noschg ${RD}/kernels/${kernel} rm -rf ${RD}/kernels/${kernel} rm -rf ${.CURDIR}/../sys/${MACHINE}/compile/${kernel} @@ -470,7 +471,7 @@ .endfor # Install a standard boot kernel+modules mkdir -p ${RD}/trees/bin/boot/kernel - cp -Rp ${RD}/kernels/GENERIC/* ${RD}/trees/bin/boot/kernel + cp -Rp ${RD}/kernels/${DEFAULTKERNEL}/* ${RD}/trees/bin/boot/kernel touch release.3 # Make and install the three crunched binaries which live on the floppies. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 25 15:38: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FBEB37B41D; Thu, 25 Apr 2002 15:38:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 36A8937B41B for ; Thu, 25 Apr 2002 15:38:02 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3PMc2u92362 for perforce@freebsd.org; Thu, 25 Apr 2002 15:38:02 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Thu, 25 Apr 2002 15:38:02 -0700 (PDT) Message-Id: <200204252238.g3PMc2u92362@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10286 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10286 Change 10286 by jake@jake_sparc64 on 2002/04/25 15:37:40 Remove ATA_ENABLE_BUSMASTER. Affected files ... ... //depot/projects/sparc64/sys/sparc64/conf/SUN4U#28 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/conf/SUN4U#28 (text+ko) ==== @@ -59,7 +59,6 @@ makeoptions NO_MODULES=true options PCI_ENABLE_IO_MODES -options ATA_ENABLE_BUSMASTER options DEBUGGER_ON_POWERFAIL options KTR To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 25 16:28:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29E5037B417; Thu, 25 Apr 2002 16:28:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 625FB37B416 for ; Thu, 25 Apr 2002 16:28:03 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3PNS3p02345 for perforce@freebsd.org; Thu, 25 Apr 2002 16:28:03 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Thu, 25 Apr 2002 16:28:03 -0700 (PDT) Message-Id: <200204252328.g3PNS3p02345@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10289 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10289 Change 10289 by jake@jake_sparc64 on 2002/04/25 16:27:03 Put back gnu sort. Affected files ... ... //depot/projects/sparc64/gnu/usr.bin/Makefile#14 edit Differences ... ==== //depot/projects/sparc64/gnu/usr.bin/Makefile#14 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/gnu/usr.bin/Makefile,v 1.58 2002/03/24 16:01:17 markm Exp $ SUBDIR= awk bc binutils cpio dc dialog diff diff3 gperf \ - grep groff gzip man patch ptx rcs sdiff send-pr tar texinfo + grep groff gzip man patch ptx rcs sdiff send-pr sort tar texinfo .if ${MACHINE_ARCH} != "sparc64" SUBDIR+=cc To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 25 21:58: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E64F637B419; Thu, 25 Apr 2002 21:56:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9457937B41A for ; Thu, 25 Apr 2002 21:56:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3Q4ug469029 for perforce@freebsd.org; Thu, 25 Apr 2002 21:56:42 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 25 Apr 2002 21:56:42 -0700 (PDT) Message-Id: <200204260456.g3Q4ug469029@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10298 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10298 Change 10298 by rwatson@rwatson_curry on 2002/04/25 21:56:08 Integ TrustedBSD Base branch from FreeBSD vendor branch to pick up various new features/bugfixes, including vnode.h fix relating to VFS lock debugging that I committed to the main tree. Affected files ... ... //depot/projects/trustedbsd/base/MAINTAINERS#3 integrate ... //depot/projects/trustedbsd/base/Makefile#5 integrate ... //depot/projects/trustedbsd/base/UPDATING#13 integrate ... //depot/projects/trustedbsd/base/bin/expr/expr.1#3 integrate ... //depot/projects/trustedbsd/base/bin/expr/expr.y#4 integrate ... //depot/projects/trustedbsd/base/bin/pax/pax.1#2 integrate ... //depot/projects/trustedbsd/base/bin/sh/options.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/freebsd.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#6 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/kupgrade#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/FreeBSD-4.0/kinstall#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/HISTORY#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/QNX_OCL.txt#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/fils.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ip_sfil.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipf.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipfs.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsend.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/ipt.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/kmem.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/l4check/l4check.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipmon.8#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipnat.5#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/mlf_ipl.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/mls_ipl.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/natparse.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/printnat.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/printstate.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/solaris.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/Makefile#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f11#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f17#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in1#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in2#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in3#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in4#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ipv6.1#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ipv6.2#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/l1#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/l1.b#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni4#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f11#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f17#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ipv6.2#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni4#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/intest#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/logtest#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/mhtest#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/f11#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/f17#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in1#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in2#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in3#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in4#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ipv6.2#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni4.ipf#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni4.nat#1 branch ... //depot/projects/trustedbsd/base/contrib/smbfs/CREDITS#2 integrate ... //depot/projects/trustedbsd/base/contrib/smbfs/HISTORY#4 integrate ... //depot/projects/trustedbsd/base/contrib/smbfs/Makefile.inc#3 integrate ... //depot/projects/trustedbsd/base/contrib/smbfs/examples/dot.nsmbrc#2 integrate ... //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/ctx.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mount_smbfs.8#3 integrate ... //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mount_smbfs.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/smbfs/smbutil/smbutil.1#3 integrate ... //depot/projects/trustedbsd/base/contrib/smbfs/smbutil/view.c#3 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/auth2-pam.c#2 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/servconf.c#5 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/session.c#8 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#4 integrate ... //depot/projects/trustedbsd/base/etc/Makefile#14 integrate ... //depot/projects/trustedbsd/base/etc/mail/Makefile#5 integrate ... //depot/projects/trustedbsd/base/etc/nsmb.conf#5 integrate ... //depot/projects/trustedbsd/base/etc/rc#11 integrate ... //depot/projects/trustedbsd/base/etc/rc.d/wscons#2 integrate ... //depot/projects/trustedbsd/base/etc/rc.diskless1#6 integrate ... //depot/projects/trustedbsd/base/etc/rc.sendmail#1 branch ... //depot/projects/trustedbsd/base/etc/rc.serial#3 integrate ... //depot/projects/trustedbsd/base/etc/rc.subr#2 integrate ... //depot/projects/trustedbsd/base/etc/sendmail/Makefile#5 integrate ... //depot/projects/trustedbsd/base/etc/sendmail/rc.sendmail#2 delete ... //depot/projects/trustedbsd/base/games/adventure/setup.c#2 integrate ... //depot/projects/trustedbsd/base/games/atc/main.c#2 integrate ... //depot/projects/trustedbsd/base/games/backgammon/common_source/subs.c#2 integrate ... //depot/projects/trustedbsd/base/games/bs/bs.c#3 integrate ... //depot/projects/trustedbsd/base/games/canfield/cfscores/cfscores.c#3 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#11 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2#4 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2-o#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile.inc#4 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/man/man/man.c#4 integrate ... //depot/projects/trustedbsd/base/include/stdlib.h#7 integrate ... //depot/projects/trustedbsd/base/kerberos5/lib/libvers/Makefile#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/gen/getnetgrent.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.3#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#6 integrate ... //depot/projects/trustedbsd/base/lib/libc_r/test/guard_b.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libcam/camlib.h#3 integrate ... //depot/projects/trustedbsd/base/lib/libedit/makelist#2 integrate ... //depot/projects/trustedbsd/base/lib/libpam/modules/pam_unix/pam_unix.c#8 integrate ... //depot/projects/trustedbsd/base/libexec/pppoed/pppoed.c#5 integrate ... //depot/projects/trustedbsd/base/release/Makefile#10 integrate ... //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#4 integrate ... //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#3 integrate ... //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml#3 integrate ... //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#4 integrate ... //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#17 integrate ... //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#22 integrate ... //depot/projects/trustedbsd/base/release/picobsd/tinyware/msh/sh3.c#2 integrate ... //depot/projects/trustedbsd/base/release/scripts/bin-install.sh#2 integrate ... //depot/projects/trustedbsd/base/release/scripts/catpages-make.sh#2 integrate ... //depot/projects/trustedbsd/base/release/scripts/dict-make.sh#2 integrate ... //depot/projects/trustedbsd/base/release/scripts/doc-make.sh#2 integrate ... //depot/projects/trustedbsd/base/release/scripts/driver-copy2.pl#2 integrate ... //depot/projects/trustedbsd/base/release/scripts/driver-remove.pl#2 integrate ... //depot/projects/trustedbsd/base/release/scripts/games-make.sh#2 integrate ... //depot/projects/trustedbsd/base/release/scripts/info-make.sh#2 integrate ... //depot/projects/trustedbsd/base/release/scripts/manpages-make.sh#2 integrate ... //depot/projects/trustedbsd/base/release/scripts/proflibs-make.sh#2 integrate ... //depot/projects/trustedbsd/base/sbin/fsck/fsck.c#4 integrate ... //depot/projects/trustedbsd/base/sbin/fsck_ffs/main.c#5 integrate ... //depot/projects/trustedbsd/base/sbin/fsck_ifs/main.c#4 integrate ... //depot/projects/trustedbsd/base/sbin/fsck_msdosfs/main.c#3 integrate ... //depot/projects/trustedbsd/base/sbin/mdconfig/mdconfig.c#4 integrate ... //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.c#2 integrate ... //depot/projects/trustedbsd/base/sbin/mount/mount.8#2 integrate ... //depot/projects/trustedbsd/base/sbin/mount/mount.c#3 integrate ... //depot/projects/trustedbsd/base/sbin/newfs/mkfs.c#4 integrate ... //depot/projects/trustedbsd/base/sbin/newfs/newfs.8#6 integrate ... //depot/projects/trustedbsd/base/sbin/newfs/newfs.c#5 integrate ... //depot/projects/trustedbsd/base/sbin/newfs/newfs.h#3 integrate ... //depot/projects/trustedbsd/base/sbin/vinum/commands.c#2 integrate ... //depot/projects/trustedbsd/base/sbin/vinum/list.c#2 integrate ... //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#5 integrate ... //depot/projects/trustedbsd/base/share/examples/etc/make.conf#6 integrate ... //depot/projects/trustedbsd/base/share/examples/isdn/contrib/answer.c#2 integrate ... //depot/projects/trustedbsd/base/share/examples/isdn/contrib/isdnctl#2 integrate ... //depot/projects/trustedbsd/base/share/examples/netgraph/ether.bridge#3 integrate ... //depot/projects/trustedbsd/base/share/man/man4/Makefile#11 integrate ... //depot/projects/trustedbsd/base/share/man/man4/ed.4#4 integrate ... //depot/projects/trustedbsd/base/share/man/man4/man4.i386/tx.4#3 integrate ... //depot/projects/trustedbsd/base/share/man/man4/polling.4#3 integrate ... //depot/projects/trustedbsd/base/share/man/man4/ulpt.4#2 integrate ... //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#6 integrate ... //depot/projects/trustedbsd/base/share/man/man8/Makefile#5 integrate ... //depot/projects/trustedbsd/base/share/mk/Makefile#5 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.dep.mk#5 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.doc.mk#4 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.docb.mk#3 delete ... //depot/projects/trustedbsd/base/share/mk/bsd.info.mk#4 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#8 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.man.mk#4 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.nls.mk#4 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.obj.mk#5 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#7 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.sgml.mk#3 delete ... //depot/projects/trustedbsd/base/share/mk/bsd.subdir.mk#4 integrate ... //depot/projects/trustedbsd/base/share/mk/sys.mk#4 integrate ... //depot/projects/trustedbsd/base/sys/alpha/alpha/elf_machdep.c#3 integrate ... //depot/projects/trustedbsd/base/sys/boot/pc98/kgzldr/Makefile#3 integrate ... //depot/projects/trustedbsd/base/sys/boot/pc98/loader/Makefile#3 integrate ... //depot/projects/trustedbsd/base/sys/boot/sparc64/boot1/Makefile#4 integrate ... //depot/projects/trustedbsd/base/sys/boot/sparc64/boot1/boot1.c#2 integrate ... //depot/projects/trustedbsd/base/sys/cam/cam_xpt.c#7 integrate ... //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_all.c#6 integrate ... //depot/projects/trustedbsd/base/sys/conf/files#16 integrate ... //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#7 integrate ... //depot/projects/trustedbsd/base/sys/conf/kmod.mk#6 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#2 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#4 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil.c#5 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_frag.c#4 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.c#6 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ipl.h#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aac_disk.c#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#8 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aacreg.h#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aacvar.h#7 integrate ... //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#10 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_eisa.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_pci.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7770.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.reg#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.seq#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_freebsd.c#2 delete ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_freebsd.h#2 delete ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/Makefile#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/aicasm.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#1 branch ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#1 branch ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#8 integrate ... //depot/projects/trustedbsd/base/sys/dev/puc/puc.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#5 integrate ... //depot/projects/trustedbsd/base/sys/dev/tx/if_tx.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/usb/usb_subr.c#7 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/wi_hostap.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/wi_hostap.h#2 integrate ... //depot/projects/trustedbsd/base/sys/fs/devfs/devfs.h#2 integrate ... //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_mem.c#4 integrate ... //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_io.c#4 integrate ... //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vfsops.c#7 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom.h#5 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom_bsd.c#4 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#5 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom_dump.c#4 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom_enc.c#2 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom_slice.c#5 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom_slice.h#3 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#3 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/autoconf.c#8 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#4 integrate ... //depot/projects/trustedbsd/base/sys/i386/pci/pci_cfgreg.c#5 integrate ... //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#5 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/elf_machdep.c#3 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#14 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/sal.c#3 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/swtch.s#7 integrate ... //depot/projects/trustedbsd/base/sys/ia64/include/sal.h#2 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#6 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_conf.c#6 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#12 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#3 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#4 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#9 integrate ... //depot/projects/trustedbsd/base/sys/kern/link_elf.c#4 integrate ... //depot/projects/trustedbsd/base/sys/kern/makesyscalls.sh#4 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_bus.c#8 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_disklabel.c#6 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#14 integrate ... //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#10 integrate ... //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#9 integrate ... //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#15 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_cm.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_subr.c#7 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_var.h#5 integrate ... //depot/projects/trustedbsd/base/sys/netinet/in.h#8 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#5 integrate ... //depot/projects/trustedbsd/base/sys/netsmb/smb_trantcp.c#6 integrate ... //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#9 integrate ... //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#9 integrate ... //depot/projects/trustedbsd/base/sys/pc98/pc98/syscons.c#5 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#10 integrate ... //depot/projects/trustedbsd/base/sys/sys/linker.h#4 integrate ... //depot/projects/trustedbsd/base/sys/sys/socketvar.h#9 integrate ... //depot/projects/trustedbsd/base/sys/sys/vnode.h#9 integrate ... //depot/projects/trustedbsd/base/sys/vm/uma_core.c#3 integrate ... //depot/projects/trustedbsd/base/tools/diag/localeck/localeck.c#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/ConfCmp/ConfCmp.c#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/ConfCmp/Makefile#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/ConfCmp/a2.conf#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/ConfCmp/a2a.conf#1 branch ... //depot/projects/trustedbsd/base/tools/regression/geom/ConfCmp/a2b.conf#1 branch ... //depot/projects/trustedbsd/base/tools/regression/geom/ConfCmp/a2c.conf#1 branch ... //depot/projects/trustedbsd/base/tools/regression/geom/ConfCmp/a2d.conf#1 branch ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T000/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T001/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T002/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T003/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T004/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T005/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T006/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T007/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T008/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T009/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T010/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T011/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T012/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T013/ref.conf#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/geom/Test/T014/ref.conf#3 integrate ... //depot/projects/trustedbsd/base/tools/regression/p1003_1b/yield.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/Makefile#10 integrate ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendar.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#9 integrate ... //depot/projects/trustedbsd/base/usr.bin/doscmd/config.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/elf2aout/Makefile#1 branch ... //depot/projects/trustedbsd/base/usr.bin/expand/expand.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/fetch/fetch.c#6 integrate ... //depot/projects/trustedbsd/base/usr.bin/fmt/fmt.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/hesinfo/hesinfo.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/login/login.c#12 integrate ... //depot/projects/trustedbsd/base/usr.bin/mklocale/yacc.y#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/objformat/objformat.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/passwd/passwd.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/printf/printf.1#5 integrate ... //depot/projects/trustedbsd/base/usr.bin/printf/printf.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/rpcinfo/rpcinfo.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/sed/sed.1#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.pl#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/telnet/commands.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/telnet/main.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/truss/syscalls.c#5 integrate ... //depot/projects/trustedbsd/base/usr.bin/unexpand/unexpand.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/usbhidctl/usbhid.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/xlint/lint1/main1.c#5 integrate ... //depot/projects/trustedbsd/base/usr.bin/xlint/xlint/xlint.c#7 integrate ... //depot/projects/trustedbsd/base/usr.bin/yacc/lalr.c#5 integrate ... //depot/projects/trustedbsd/base/usr.sbin/burncd/burncd.c#8 integrate ... //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/crunchide.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ctm/ctm_rmail/options.h#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/digictl/digictl.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/faithd/faithd.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/faithd/ftp.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/jail/jail.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/kldxref/kldxref.c#4 integrate ... //depot/projects/trustedbsd/base/usr.sbin/lpr/common_source/common.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/lpr/common_source/ctlinfo.c#4 integrate ... //depot/projects/trustedbsd/base/usr.sbin/lpr/common_source/lp.h#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/lpr/common_source/printcap.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/lpr/common_source/startdaemon.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/lpr/filters.ru/Makefile#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/lpr/lpc/cmds.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/lpr/lpc/lpc.8#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/lpr/lpd/lpd.8#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/lpr/lpd/printjob.c#5 integrate ... //depot/projects/trustedbsd/base/usr.sbin/lpr/lpr/lpr.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/lpr/lpr/printcap.5#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/lpr/pac/pac.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/named/Makefile.maninc#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ngctl/main.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardc/beep.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/pccard/pccardc/power.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/pcvt/keycap/keycap.src#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/pcvt/userkeys/vt220keys.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ppp/command.c#5 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ppp/main.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ppp/nat_cmd.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ppp/systems.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/pppstats/pppstats.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/rip6query/rip6query.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dist.c#7 integrate ... //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dist.h#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/sysinstall/doc.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/sysinstall/installUpgrade.c#4 integrate ... //depot/projects/trustedbsd/base/usr.sbin/sysinstall/menus.c#10 integrate ... //depot/projects/trustedbsd/base/usr.sbin/usbd/usbd.c#5 integrate ... //depot/projects/trustedbsd/base/usr.sbin/usbdevs/usbdevs.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#3 (text+ko) ==== @@ -1,7 +1,7 @@ -$FreeBSD: src/MAINTAINERS,v 1.18 2002/04/20 08:24:11 jake Exp $ +$FreeBSD: src/MAINTAINERS,v 1.22 2002/04/25 16:43:58 des Exp $ subsystem login notes -------------------------- +----------------------------- mergemaster dougb Prefers to pre-approve commits binutils obrien Insists to keep BU blocked from other's unapproved commits @@ -17,8 +17,7 @@ telnet markm commits _must_ be made to src/crypto/telnet first, only then to "base" telnet via "make unifdef" -i386 boot[012] jhb Pre-commit review preferred. Robert Nordier would - probably also like to review these as well. +i386 boot[012] jhb Pre-commit review preferred. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. @@ -47,6 +46,7 @@ isp(4) mjacob {isp_freebsd.?,isp_pci.c}: heads-up on changes please. All other files need pre-commit with mjacob as they're shared with five other platforms. +tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. @@ -55,3 +55,5 @@ dhcp murray Needs to pre-approve commits to contrib/isc-dhcp, so changes can be made to the isc.org CVS repository. RELENG_4_* security-officer Requires Security Officer approval. +openssh des Pre-commit review requested. +libpam des Pre-commit review requested. ==== //depot/projects/trustedbsd/base/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.249 2002/04/20 19:04:59 gshapiro Exp $ +# $FreeBSD: src/Makefile,v 1.250 2002/04/23 09:03:55 ru Exp $ # # The user-driven targets are: # @@ -85,7 +85,7 @@ TGTS= afterdistribute all all-man buildkernel buildworld checkdpadd clean \ cleandepend cleandir depend distribute distribworld everything \ hierarchy includes install installcheck installkernel kernel \ - reinstallkernel installmost installworld libraries lint maninstall \ + reinstallkernel installmost installworld libraries lint \ mk most obj objlink regress rerelease tags update PATH= /sbin:/bin:/usr/sbin:/usr/bin ==== //depot/projects/trustedbsd/base/UPDATING#13 (text+ko) ==== @@ -22,6 +22,10 @@ integrity. Re-enabling write caching can substantially improve performance. +20020421: + When exec'ing set[ug]id executables, the kernel now ensures that the + stdio file descriptors (0..2) are open. See FreeBSD-SA-02:23.stdio. + 20020404: New sendmail startup scripts have been installed to make it easier to use alternative MTAs with FreeBSD. Setting the rc.conf @@ -934,7 +938,7 @@ make buildworld make buildkernel KERNCONF=YOUR_KERNEL_HERE cp src/sys/${MACHINE_ARCH}/conf/GENERIC.hints /boot/device.hints [2] - make installkernel KERNCONF=YOUR_KERNEL_HERE + make installkernel KERNCONF=YOUR_KERNEL_HERE [6] reboot in single user [3] mergemaster -p [5] make installworld @@ -968,6 +972,8 @@ mount -a cd /usr/src adjkerntz -i # if CMOS is wall time + Also, when doing a major release upgrade, it is required that + you boot into single user mode to do the installworld. [4] Note: This step is non-optional. Failure to do this step can result in a significant reduction in the functionality of the @@ -983,6 +989,9 @@ install) after the buildworld before this step if you last updated from current before 20020224 or from -stable before 20020408. + [6] You may get a warning from kldxref. Ignore it. It doesn't + matter. + FORMAT: This file contains a list, in reverse chronological order, of major @@ -1016,4 +1025,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.201 2002/04/19 11:37:34 ru Exp $ +$FreeBSD: src/UPDATING,v 1.203 2002/04/25 14:41:39 nectar Exp $ ==== //depot/projects/trustedbsd/base/bin/expr/expr.1#3 (text+ko) ==== @@ -28,7 +28,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/bin/expr/expr.1,v 1.16 2002/03/22 20:49:29 wollman Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.17 2002/04/22 21:23:09 wollman Exp $ .\" .Dd March 22, 2002 .Dt EXPR 1 @@ -111,7 +111,9 @@ .Pp Parentheses are used for grouping in the usual manner. .Pp -This version of +Unless the +.Ev EXPR_COMPAT +variable is defined in the process environment, this version of .Nm adheres to the .Tn POSIX @@ -141,6 +143,15 @@ command in general is historic and inconvenient. New applications are advised to use shell arithmetic rather than .Nm . +.Sh ENVIRONMENT +.Bl -tag -compact -width EXPR_COMPAT +.It Ev EXPR_COMPAT +If set, +.Nm +will emulate historic +.Nm +implementations which did not obey the Utility Syntax Guidelines. +.El .Sh EXAMPLES .Bl -bullet .It @@ -216,7 +227,10 @@ The .Nm utility conforms to -.St -p1003.1-2001 . +.St -p1003.1-2001 , +provided that the +.Ev EXPR_COMPAT +environment variable is not defined. .Tn POSIX does not specify whether arithmetic overflow is detected, nor does it specify the possible range of integer arguments to ==== //depot/projects/trustedbsd/base/bin/expr/expr.y#4 (text+ko) ==== @@ -4,7 +4,7 @@ * * Largely rewritten by J.T. Conklin (jtc@wimsey.com) * - * $FreeBSD: src/bin/expr/expr.y,v 1.19 2002/03/22 20:18:26 wollman Exp $ + * $FreeBSD: src/bin/expr/expr.y,v 1.20 2002/04/22 21:23:09 wollman Exp $ */ #include @@ -270,14 +270,17 @@ int c; setlocale (LC_ALL, ""); - while ((c = getopt(argc, argv, "")) != -1) - switch (c) { - default: - fprintf(stderr, "usage: expr [--] expression\n"); - exit(ERR_EXIT); - } - - av = argv + optind; + if (getenv("EXPR_COMPAT") != NULL) { + av = argv + 1; + } else { + while ((c = getopt(argc, argv, "")) != -1) + switch (c) { + default: + fprintf(stderr,"usage: expr [--] expression\n"); + exit(ERR_EXIT); + } + av = argv + optind; + } yyparse(); ==== //depot/projects/trustedbsd/base/bin/pax/pax.1#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/pax/pax.1,v 1.24 2001/08/14 10:01:43 ru Exp $ +.\" $FreeBSD: src/bin/pax/pax.1,v 1.25 2002/04/21 12:53:08 charnier Exp $ .\" .Dd April 18, 1994 .Dt PAX 1 @@ -179,12 +179,12 @@ .Op Ar .Ar directory .Sh DESCRIPTION -.Nm Pax -will read, write, and list the members of an archive file, +The +.Nm +utility will read, write, and list the members of an archive file, and will copy directory hierarchies. -.Nm Pax -operation is independent of the specific archive format, -and supports a wide variety of different archive formats. +These operations are independent of the specific archive format, +and support a wide variety of different archive formats. A list of supported archive formats can be found under the description of the .Fl x option. @@ -202,8 +202,7 @@ .Bl -tag -width 6n .It .Em List . -.Nm Pax -will write to +Write to .Dv standard output a table of contents of the members of the archive file read from .Dv standard input , @@ -213,8 +212,7 @@ and is written using single line buffering. .It Fl r .Em Read . -.Nm Pax -extracts the members of the archive file read from the +Extract the members of the archive file read from the .Dv standard input , with pathnames matching the specified .Ar patterns . @@ -228,8 +226,7 @@ option. .It Fl w .Em Write . -.Nm Pax -writes an archive containing the +Write an archive containing the .Ar file operands to .Dv standard output @@ -244,8 +241,7 @@ at that directory will be included. .It Fl r Fl w .Em Copy . -.Nm Pax -copies the +Copy the .Ar file operands to the destination .Ar directory . @@ -465,15 +461,17 @@ will prompt to .Pa /dev/tty giving the name of the file, its file mode and its modification time. -.Nm Pax -will then read a line from +The +.Nm +utility will then read a line from .Pa /dev/tty . If this line is blank, the file or archive member is skipped. If this line consists of a single period, the file or archive member is processed with no modification to its name. Otherwise, its name is replaced with the contents of the line. -.Nm Pax -will immediately exit with a non-zero exit status if +The +.Nm +utility will immediately exit with a non-zero exit status if .Dv is encountered when reading a response or if .Pa /dev/tty @@ -691,8 +689,9 @@ .It Fl x Ar format Specify the output archive format, with the default format being .Ar ustar . -.Nm Pax -currently supports the following formats: +The +.Nm +utility currently supports the following formats: .Bl -tag -width "sv4cpio" .It Ar cpio The extended cpio interchange format specified in the @@ -753,8 +752,9 @@ Pathnames stored by this format must be 250 characters or less in length. .El .Pp -.Nm Pax -will detect and report any file that it is unable to store or extract +The +.Nm +utility will detect and report any file that it is unable to store or extract as the result of any specific archive format restrictions. The individual archive formats may impose additional restrictions on use. Typical archive format restrictions include (but are not limited to): @@ -1145,8 +1145,9 @@ .An Keith Muller at the University of California, San Diego .Sh DIAGNOSTICS -.Nm Pax -will exit with one of the following values: +The +.Nm +utility will exit with one of the following values: .Bl -tag -width 2n .It 0 All files were processed successfully. ==== //depot/projects/trustedbsd/base/bin/sh/options.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/options.c,v 1.17 2002/02/02 06:50:47 imp Exp $"; + "$FreeBSD: src/bin/sh/options.c,v 1.18 2002/04/22 13:44:17 des Exp $"; #endif /* not lint */ #include @@ -373,7 +373,7 @@ char **optbase = NULL; if (argc < 3) - error("Usage: getopts optstring var [arg]"); + error("usage: getopts optstring var [arg]"); else if (argc == 3) optbase = shellparam.p; else ==== //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/freebsd.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.42 2002/03/27 05:19:51 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.43 2002/04/24 04:21:41 obrien Exp $ */ #undef CPP_PREDEFINES #define CPP_PREDEFINES \ @@ -755,8 +755,8 @@ (n) + 4) #undef DBX_REGISTER_NUMBER -#define DBX_REGISTER_NUMBER(n) ((write_symbols == DWARF_DEBUG \ - || write_symbols == DWARF2_DEBUG) \ +#define DBX_REGISTER_NUMBER(n) ((write_symbols == DWARF2_DEBUG \ + || write_symbols == DWARF_DEBUG) \ ? DWARF_DBX_REGISTER_NUMBER(n) \ : STABS_DBX_REGISTER_NUMBER(n)) ==== //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* Definitions for Intel 386 running FreeBSD with either a.out or ELF format - Copyright (C) 1996-2000 Free Software Foundation, Inc. + Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc. Contributed by Eric Youngdale. Modified for stabs-in-ELF by H.J. Lu. Adapted from GNU/Linux version by John Polstra. @@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.42 2002/03/27 05:22:35 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.44 2002/04/24 04:49:34 obrien Exp $ */ #undef CPP_PREDEFINES #define CPP_PREDEFINES \ @@ -38,7 +38,7 @@ #undef ASM_SPEC #define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" -#undef ASM_FINAL_SPEC +#undef ASM_FINAL_SPEC #define ASM_FINAL_SPEC "%|" /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support @@ -49,9 +49,6 @@ have the time to search for those flags. I am sure how to add support for -soname shared_object_name. H.J. - I took out %{v:%{!V:-V}}. It is too much :-(. They can use - -Wl,-V. - When the -shared link option is used a final link is not being done. */ @@ -64,14 +61,19 @@ %{assert*} %{R*}} \ %{!maout: \ %{Wl,*:%*} \ + %{v:-V} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ %{shared:-Bshareable %{h*} %{soname*}} \ - %{symbolic:-Bsymbolic} \ %{!shared: \ %{!static: \ %{rdynamic: -export-dynamic} \ %{!dynamic-linker: -dynamic-linker /usr/libexec/ld-elf.so.1}} \ - %{static:-Bstatic}}}" + %{static:-Bstatic}} \ + %{symbolic:-Bsymbolic}}" + +/* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical + crtbegin.o file (see crtstuff.c) which provides part of the support for + getting C++ file-scope static object constructed before entering `main'. */ #undef STARTFILE_SPEC #define STARTFILE_SPEC "\ @@ -86,10 +88,12 @@ %{!pg: \ %{p:gcrt1.o%s} \ %{!p:crt1.o%s}}} \ - crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}" + crti.o%s \ + %{!shared:crtbegin.o%s} \ + %{shared:crtbeginS.o%s}}" /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. Here we tack on our - own magical crtend.o file (compare w/crtstuff.c) which provides part of the + own magical crtend.o file (see crtstuff.c) which provides part of the support for getting C++ file-scope static object constructed before entering `main', followed by the normal "finalizer" file, `crtn.o'. */ @@ -102,20 +106,23 @@ /************************[ Target stuff ]***********************************/ -/* Define the actual types of some ANSI-mandated types. +/* Define the actual types of some ANSI-mandated types. Needs to agree with . GCC defaults come from c-decl.c, c-common.c, and config//.h. */ -#undef SIZE_TYPE +#undef SIZE_TYPE #define SIZE_TYPE "unsigned int" - -#undef PTRDIFF_TYPE + +#undef PTRDIFF_TYPE #define PTRDIFF_TYPE "int" +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE BITS_PER_WORD + /* This is the pseudo-op used to generate a 32-bit word of data with a specific value in some section. */ -#undef INT_ASM_OP +#undef INT_ASM_OP #define INT_ASM_OP ".long" /* Biggest alignment supported by the object file format of this @@ -151,27 +158,23 @@ #define TARGET_DEFAULT \ (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) -/* Prefix for internally generated assembler labels. If we aren't using - underscores, we are using prefix `.'s to identify labels that should - be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ -#undef LPREFIX -#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") +/* Don't default to pcc-struct-return, we want to retain compatibility with + older gcc versions AND pcc-struct-return is nonreentrant. + (even though the SVR4 ABI for the i386 says that records and unions are + returned in memory). */ + +#undef DEFAULT_PCC_STRUCT_RETURN +#define DEFAULT_PCC_STRUCT_RETURN 0 /* The a.out tools do not support "linkonce" sections. */ #undef SUPPORTS_ONE_ONLY #define SUPPORTS_ONE_ONLY TARGET_ELF -/* Enable alias attribute support. */ -#undef SET_ASM_OP -#define SET_ASM_OP ".set" - -/* The a.out tools do not support "Lscope" .stabs symbols. */ -#undef NO_DBX_FUNCTION_END -#define NO_DBX_FUNCTION_END TARGET_AOUT - -/* In ELF, the function stabs come first, before the relative offsets. */ -#undef DBX_FUNCTION_FIRST -#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF +/* Prefix for internally generated assembler labels. If we aren't using + underscores, we are using prefix `.'s to identify labels that should + be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ +#undef LPREFIX +#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") /* supply our own hook for calling __main() from main() */ #undef INVOKE__main @@ -255,11 +258,19 @@ /************************[ Assembler stuff ]********************************/ +/* Override the default comment-starter of "/" from unix.h. */ +#undef ASM_COMMENT_START +#define ASM_COMMENT_START "#" + #undef ASM_APP_ON #define ASM_APP_ON "#APP\n" #undef ASM_APP_OFF -#define ASM_APP_OFF "#NO_APP\n" +#define ASM_APP_OFF "#NO_APP\n" + +/* Enable alias attribute support. */ +#undef SET_ASM_OP +#define SET_ASM_OP ".set" /* This is how to begin an assembly language file. The .file command should always begin the output. @@ -274,8 +285,8 @@ } while (0) /* This is how to store into the string BUF - the symbol_ref name of an internal numbered label where - PREFIX is the class of label and NUM is the number within the class. + the symbol_ref name of an internal numbered label where + PREFIX is the class of label and NUM is the number within the class. This is suitable for output with `assemble_name'. */ #undef ASM_GENERATE_INTERNAL_LABEL #define ASM_GENERATE_INTERNAL_LABEL(BUF, PREFIX, NUMBER) \ @@ -405,7 +416,6 @@ } \ } while (0) - #undef ASM_OUTPUT_SOURCE_LINE #define ASM_OUTPUT_SOURCE_LINE(FILE, LINE) \ do { \ @@ -503,10 +513,10 @@ } while (0) /* Switch into a generic section. - + We make the section read-only and executable for a function decl, read-only for a const data decl, and writable for a non-const data decl. - + If the section has already been defined, we must not emit the attributes here. The SVR4 assembler does not recognize section redefinitions. @@ -666,13 +676,21 @@ some don't. *OLD* GAS requires the %cl argument, so override i386/unix.h. */ - + #undef AS3_SHIFT_DOUBLE #define AS3_SHIFT_DOUBLE(a,b,c,d) AS3 (a,b,c,d) /************************[ Debugger stuff ]*********************************/ +/* The a.out tools do not support "Lscope" .stabs symbols. */ +#undef NO_DBX_FUNCTION_END +#define NO_DBX_FUNCTION_END TARGET_AOUT + +/* In ELF, the function stabs come first, before the relative offsets. */ +#undef DBX_FUNCTION_FIRST +#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF + /* Copy this from the svr4 specifications... */ /* Define the register numbers to be used in Dwarf debugging information. The SVR4 reference port C compiler uses the following register numbers ==== //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile#3 (text+ko) ==== @@ -7,6 +7,8 @@ # BINDEST=/usr/sbin SBINDEST=/sbin +SEARCHDIRS=$(BINDEST) $(SBINDEST) /bin /usr/bin /sbin /usr/sbin \ + /usr/local/bin /usr/local/sbin MANDIR=/usr/share/man CC=cc -Wall -Wstrict-prototypes -Wuninitialized -O CFLAGS=-g -I$(TOP) @@ -49,6 +51,14 @@ FILS=fils.o parse.o kmem.o opt.o facpri.o common.o printstate.o build all: ipf ipfs ipfstat ipftest ipmon ipnat $(LKM) + /bin/rm -f $(TOP)/ipf + ln -s `pwd`/ipf $(TOP) + /bin/rm -f $(TOP)/ipftest + ln -s `pwd`/ipftest $(TOP) + /bin/rm -f $(TOP)/ipmon + ln -s `pwd`/ipmon $(TOP) + /bin/rm -f $(TOP)/ipnat + ln -s `pwd`/ipnat $(TOP) ipfstat: $(FILS) $(CC) -static $(DEBUG) $(CFLAGS) $(STATETOP_CFLAGS) $(STATETOP_INC) \ @@ -56,13 +66,9 @@ ipf: $(IPF) $(CC) -static $(DEBUG) $(CFLAGS) $(IPF) -o $@ $(LIBS) - /bin/rm -f $(TOP)/ipf - ln -s `pwd`/ipf $(TOP) ipftest: $(IPT) $(CC) $(DEBUG) $(CFLAGS) $(IPT) -o $@ $(LIBS) - /bin/rm -f $(TOP)/ipftest - ln -s `pwd`/ipftest $(TOP) ipnat: $(IPNAT) $(CC) -static $(DEBUG) $(CFLAGS) $(IPNAT) -o $@ $(LIBS) -lkvm >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Apr 25 23:27:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1BB537B417; Thu, 25 Apr 2002 23:26:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3421037B404 for ; Thu, 25 Apr 2002 23:26:02 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3Q6PoV92957 for perforce@freebsd.org; Thu, 25 Apr 2002 23:25:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 25 Apr 2002 23:25:50 -0700 (PDT) Message-Id: <200204260625.g3Q6PoV92957@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10301 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10301 Change 10301 by rwatson@rwatson_curry on 2002/04/25 23:25:18 Integ TrustedBSD MAC from TrustedBSD base branch, bringing in various features/fixes, including rename of "bin" distribution to "base" distribution, style/code flow cleanups of VFS code, VFS locking assertion fixes, PAM fixes, etc. Affected files ... ... //depot/projects/trustedbsd/mac/MAINTAINERS#3 integrate ... //depot/projects/trustedbsd/mac/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/UPDATING#11 integrate ... //depot/projects/trustedbsd/mac/bin/expr/expr.1#3 integrate ... //depot/projects/trustedbsd/mac/bin/expr/expr.y#4 integrate ... //depot/projects/trustedbsd/mac/bin/pax/pax.1#2 integrate ... //depot/projects/trustedbsd/mac/bin/sh/options.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/freebsd.h#4 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#5 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/kupgrade#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/FreeBSD-4.0/kinstall#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/HISTORY#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/QNX_OCL.txt#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/fils.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_sfil.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipf.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipfs.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipsend/ipsend.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/ipt.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/kmem.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/l4check/l4check.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipmon.8#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipnat.5#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/mlf_ipl.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/mls_ipl.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/natparse.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/printnat.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/printstate.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/solaris.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f11#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f17#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in1#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in2#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in3#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/in4#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ipv6.1#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ipv6.2#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/l1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/l1.b#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni4#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f11#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f17#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ipv6.2#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni4#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/intest#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/logtest#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/mhtest#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/f11#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/f17#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in1#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in2#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in3#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/in4#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ipv6.2#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni4.ipf#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni4.nat#1 branch ... //depot/projects/trustedbsd/mac/contrib/smbfs/CREDITS#2 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/HISTORY#3 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/examples/dot.nsmbrc#2 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/ctx.c#5 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/mount_smbfs/mount_smbfs.8#2 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/mount_smbfs/mount_smbfs.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/smbutil/smbutil.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/smbfs/smbutil/view.c#2 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam.c#2 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/servconf.c#5 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/session.c#9 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#4 integrate ... //depot/projects/trustedbsd/mac/etc/Makefile#11 integrate ... //depot/projects/trustedbsd/mac/etc/mail/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/etc/nsmb.conf#3 integrate ... //depot/projects/trustedbsd/mac/etc/rc#13 integrate ... //depot/projects/trustedbsd/mac/etc/rc.d/wscons#2 integrate ... //depot/projects/trustedbsd/mac/etc/rc.diskless1#5 integrate ... //depot/projects/trustedbsd/mac/etc/rc.sendmail#1 branch ... //depot/projects/trustedbsd/mac/etc/rc.serial#3 integrate ... //depot/projects/trustedbsd/mac/etc/rc.subr#2 integrate ... //depot/projects/trustedbsd/mac/etc/sendmail/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/etc/sendmail/rc.sendmail#2 delete ... //depot/projects/trustedbsd/mac/games/adventure/setup.c#2 integrate ... //depot/projects/trustedbsd/mac/games/atc/main.c#2 integrate ... //depot/projects/trustedbsd/mac/games/backgammon/common_source/subs.c#2 integrate ... //depot/projects/trustedbsd/mac/games/bs/bs.c#3 integrate ... //depot/projects/trustedbsd/mac/games/canfield/cfscores/cfscores.c#3 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#10 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#4 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile.inc#4 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/man/man/man.c#4 integrate ... //depot/projects/trustedbsd/mac/include/stdlib.h#7 integrate ... //depot/projects/trustedbsd/mac/kerberos5/lib/libvers/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/gen/getnetgrent.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.3#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.c#6 integrate ... //depot/projects/trustedbsd/mac/lib/libc_r/test/guard_b.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libcam/camlib.h#3 integrate ... //depot/projects/trustedbsd/mac/lib/libedit/makelist#2 integrate ... //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_unix/pam_unix.c#8 integrate ... //depot/projects/trustedbsd/mac/libexec/pppoed/pppoed.c#5 integrate ... //depot/projects/trustedbsd/mac/release/Makefile#12 integrate ... //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#4 integrate ... //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#3 integrate ... //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml#3 integrate ... //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#4 integrate ... //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#14 integrate ... //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#17 integrate ... //depot/projects/trustedbsd/mac/release/picobsd/tinyware/msh/sh3.c#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/bin-install.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/catpages-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/dict-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/doc-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/driver-copy2.pl#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/driver-remove.pl#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/games-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/info-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/manpages-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/proflibs-make.sh#2 integrate ... //depot/projects/trustedbsd/mac/sbin/fsck/fsck.c#4 integrate ... //depot/projects/trustedbsd/mac/sbin/fsck_ffs/main.c#5 integrate ... //depot/projects/trustedbsd/mac/sbin/fsck_ifs/main.c#4 integrate ... //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/main.c#3 integrate ... //depot/projects/trustedbsd/mac/sbin/mdconfig/mdconfig.c#4 integrate ... //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.c#2 integrate ... //depot/projects/trustedbsd/mac/sbin/mount/mount.8#2 integrate ... //depot/projects/trustedbsd/mac/sbin/mount/mount.c#5 integrate ... //depot/projects/trustedbsd/mac/sbin/newfs/mkfs.c#4 integrate ... //depot/projects/trustedbsd/mac/sbin/newfs/newfs.8#5 integrate ... //depot/projects/trustedbsd/mac/sbin/newfs/newfs.c#5 integrate ... //depot/projects/trustedbsd/mac/sbin/newfs/newfs.h#3 integrate ... //depot/projects/trustedbsd/mac/sbin/vinum/commands.c#2 integrate ... //depot/projects/trustedbsd/mac/sbin/vinum/list.c#2 integrate ... //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#6 integrate ... //depot/projects/trustedbsd/mac/share/examples/isdn/contrib/answer.c#2 integrate ... //depot/projects/trustedbsd/mac/share/examples/isdn/contrib/isdnctl#2 integrate ... //depot/projects/trustedbsd/mac/share/examples/netgraph/ether.bridge#3 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/Makefile#10 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/ed.4#4 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/tx.4#3 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/polling.4#3 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/ulpt.4#2 integrate ... //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#6 integrate ... //depot/projects/trustedbsd/mac/share/man/man8/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/share/mk/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.dep.mk#5 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.doc.mk#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.docb.mk#3 delete ... //depot/projects/trustedbsd/mac/share/mk/bsd.info.mk#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.lib.mk#8 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.man.mk#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.nls.mk#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.obj.mk#5 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.prog.mk#7 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.sgml.mk#3 delete ... //depot/projects/trustedbsd/mac/share/mk/bsd.subdir.mk#4 integrate ... //depot/projects/trustedbsd/mac/share/mk/sys.mk#4 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/alpha/elf_machdep.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/boot/pc98/kgzldr/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/sys/boot/pc98/loader/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/sys/boot/sparc64/boot1/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/sys/boot/sparc64/boot1/boot1.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/cam/cam_xpt.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_all.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/conf/files#25 integrate ... //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#6 integrate ... //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#5 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#2 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/fil.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_auth.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_fil.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_frag.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_log.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_nat.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_state.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ipl.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac_disk.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac_pci.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aacreg.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aacvar.h#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/ahc_eisa.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/ahc_pci.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7770.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx.reg#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx.seq#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_freebsd.c#2 delete ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_freebsd.h#2 delete ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/dev/puc/puc.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/puc/pucdata.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/usb/usb_subr.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/wi/wi_hostap.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/wi/wi_hostap.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mem.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_io.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_vfsops.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_bsd.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_dump.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_enc.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_slice.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_slice.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/autoconf.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/i386/pci/pci_cfgreg.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/elf_machdep.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#13 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/sal.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/swtch.s#7 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/include/sal.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_condvar.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_conf.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/kern/link_elf.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/kern/makesyscalls.sh#4 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_bus.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_disklabel.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#13 integrate ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#18 integrate ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#14 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#41 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_cm.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_subr.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_var.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/in.h#8 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/netsmb/smb_trantcp.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC#9 integrate ... //depot/projects/trustedbsd/mac/sys/pc98/pc98/syscons.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/sys/linker.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#11 integrate ... //depot/projects/trustedbsd/mac/sys/sys/vnode.h#22 integrate ... //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#3 integrate ... //depot/projects/trustedbsd/mac/tools/diag/localeck/localeck.c#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/ConfCmp.c#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/a2.conf#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/a2a.conf#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/a2b.conf#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/a2c.conf#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/geom/ConfCmp/a2d.conf#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T000/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T001/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T002/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T003/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T004/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T005/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T006/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T007/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T008/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T009/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T010/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T011/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T012/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T013/ref.conf#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T014/ref.conf#3 integrate ... //depot/projects/trustedbsd/mac/tools/regression/p1003_1b/yield.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/Makefile#8 integrate ... //depot/projects/trustedbsd/mac/usr.bin/calendar/calendar.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.freebsd#8 integrate ... //depot/projects/trustedbsd/mac/usr.bin/doscmd/config.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/elf2aout/Makefile#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/expand/expand.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/fetch/fetch.c#5 integrate ... //depot/projects/trustedbsd/mac/usr.bin/fmt/fmt.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/hesinfo/hesinfo.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/login/login.c#15 integrate ... //depot/projects/trustedbsd/mac/usr.bin/mklocale/yacc.y#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/objformat/objformat.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/passwd/passwd.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/printf/printf.1#5 integrate ... //depot/projects/trustedbsd/mac/usr.bin/printf/printf.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/rpcinfo/rpcinfo.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/sed/sed.1#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/sockstat/sockstat.pl#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/telnet/commands.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/telnet/main.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/truss/syscalls.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/unexpand/unexpand.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/usbhidctl/usbhid.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/xlint/lint1/main1.c#5 integrate ... //depot/projects/trustedbsd/mac/usr.bin/xlint/xlint/xlint.c#7 integrate ... //depot/projects/trustedbsd/mac/usr.bin/yacc/lalr.c#5 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/burncd/burncd.c#8 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/crunchide.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ctm/ctm_rmail/options.h#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/digictl/digictl.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/faithd/faithd.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/faithd/ftp.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/jail/jail.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/kldxref/kldxref.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/common.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/ctlinfo.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/lp.h#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/printcap.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/startdaemon.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/filters.ru/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/lpc/cmds.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/lpc/lpc.8#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/lpd/lpd.8#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/lpd/printjob.c#5 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/lpr/lpr.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/lpr/printcap.5#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/lpr/pac/pac.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/named/Makefile.maninc#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ngctl/main.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pccard/pccardc/beep.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pccard/pccardc/power.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pcvt/keycap/keycap.src#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pcvt/userkeys/vt220keys.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ppp/command.c#5 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ppp/main.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ppp/nat_cmd.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ppp/systems.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pppstats/pppstats.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/rip6query/rip6query.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dist.c#6 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dist.h#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/doc.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/installUpgrade.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/menus.c#10 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/usbd/usbd.c#5 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/usbdevs/usbdevs.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac/MAINTAINERS#3 (text+ko) ==== @@ -1,7 +1,7 @@ -$FreeBSD: src/MAINTAINERS,v 1.18 2002/04/20 08:24:11 jake Exp $ +$FreeBSD: src/MAINTAINERS,v 1.22 2002/04/25 16:43:58 des Exp $ subsystem login notes -------------------------- +----------------------------- mergemaster dougb Prefers to pre-approve commits binutils obrien Insists to keep BU blocked from other's unapproved commits @@ -17,8 +17,7 @@ telnet markm commits _must_ be made to src/crypto/telnet first, only then to "base" telnet via "make unifdef" -i386 boot[012] jhb Pre-commit review preferred. Robert Nordier would - probably also like to review these as well. +i386 boot[012] jhb Pre-commit review preferred. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. @@ -47,6 +46,7 @@ isp(4) mjacob {isp_freebsd.?,isp_pci.c}: heads-up on changes please. All other files need pre-commit with mjacob as they're shared with five other platforms. +tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. @@ -55,3 +55,5 @@ dhcp murray Needs to pre-approve commits to contrib/isc-dhcp, so changes can be made to the isc.org CVS repository. RELENG_4_* security-officer Requires Security Officer approval. +openssh des Pre-commit review requested. +libpam des Pre-commit review requested. ==== //depot/projects/trustedbsd/mac/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.249 2002/04/20 19:04:59 gshapiro Exp $ +# $FreeBSD: src/Makefile,v 1.250 2002/04/23 09:03:55 ru Exp $ # # The user-driven targets are: # @@ -85,7 +85,7 @@ TGTS= afterdistribute all all-man buildkernel buildworld checkdpadd clean \ cleandepend cleandir depend distribute distribworld everything \ hierarchy includes install installcheck installkernel kernel \ - reinstallkernel installmost installworld libraries lint maninstall \ + reinstallkernel installmost installworld libraries lint \ mk most obj objlink regress rerelease tags update PATH= /sbin:/bin:/usr/sbin:/usr/bin ==== //depot/projects/trustedbsd/mac/UPDATING#11 (text+ko) ==== @@ -22,6 +22,10 @@ integrity. Re-enabling write caching can substantially improve performance. +20020421: + When exec'ing set[ug]id executables, the kernel now ensures that the + stdio file descriptors (0..2) are open. See FreeBSD-SA-02:23.stdio. + 20020404: New sendmail startup scripts have been installed to make it easier to use alternative MTAs with FreeBSD. Setting the rc.conf @@ -934,7 +938,7 @@ make buildworld make buildkernel KERNCONF=YOUR_KERNEL_HERE cp src/sys/${MACHINE_ARCH}/conf/GENERIC.hints /boot/device.hints [2] - make installkernel KERNCONF=YOUR_KERNEL_HERE + make installkernel KERNCONF=YOUR_KERNEL_HERE [6] reboot in single user [3] mergemaster -p [5] make installworld @@ -968,6 +972,8 @@ mount -a cd /usr/src adjkerntz -i # if CMOS is wall time + Also, when doing a major release upgrade, it is required that + you boot into single user mode to do the installworld. [4] Note: This step is non-optional. Failure to do this step can result in a significant reduction in the functionality of the @@ -983,6 +989,9 @@ install) after the buildworld before this step if you last updated from current before 20020224 or from -stable before 20020408. + [6] You may get a warning from kldxref. Ignore it. It doesn't + matter. + FORMAT: This file contains a list, in reverse chronological order, of major @@ -1016,4 +1025,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.201 2002/04/19 11:37:34 ru Exp $ +$FreeBSD: src/UPDATING,v 1.203 2002/04/25 14:41:39 nectar Exp $ ==== //depot/projects/trustedbsd/mac/bin/expr/expr.1#3 (text+ko) ==== @@ -28,7 +28,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/bin/expr/expr.1,v 1.16 2002/03/22 20:49:29 wollman Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.17 2002/04/22 21:23:09 wollman Exp $ .\" .Dd March 22, 2002 .Dt EXPR 1 @@ -111,7 +111,9 @@ .Pp Parentheses are used for grouping in the usual manner. .Pp -This version of +Unless the +.Ev EXPR_COMPAT +variable is defined in the process environment, this version of .Nm adheres to the .Tn POSIX @@ -141,6 +143,15 @@ command in general is historic and inconvenient. New applications are advised to use shell arithmetic rather than .Nm . +.Sh ENVIRONMENT +.Bl -tag -compact -width EXPR_COMPAT +.It Ev EXPR_COMPAT +If set, +.Nm +will emulate historic +.Nm +implementations which did not obey the Utility Syntax Guidelines. +.El .Sh EXAMPLES .Bl -bullet .It @@ -216,7 +227,10 @@ The .Nm utility conforms to -.St -p1003.1-2001 . +.St -p1003.1-2001 , +provided that the +.Ev EXPR_COMPAT +environment variable is not defined. .Tn POSIX does not specify whether arithmetic overflow is detected, nor does it specify the possible range of integer arguments to ==== //depot/projects/trustedbsd/mac/bin/expr/expr.y#4 (text+ko) ==== @@ -4,7 +4,7 @@ * * Largely rewritten by J.T. Conklin (jtc@wimsey.com) * - * $FreeBSD: src/bin/expr/expr.y,v 1.19 2002/03/22 20:18:26 wollman Exp $ + * $FreeBSD: src/bin/expr/expr.y,v 1.20 2002/04/22 21:23:09 wollman Exp $ */ #include @@ -270,14 +270,17 @@ int c; setlocale (LC_ALL, ""); - while ((c = getopt(argc, argv, "")) != -1) - switch (c) { - default: - fprintf(stderr, "usage: expr [--] expression\n"); - exit(ERR_EXIT); - } - - av = argv + optind; + if (getenv("EXPR_COMPAT") != NULL) { + av = argv + 1; + } else { + while ((c = getopt(argc, argv, "")) != -1) + switch (c) { + default: + fprintf(stderr,"usage: expr [--] expression\n"); + exit(ERR_EXIT); + } + av = argv + optind; + } yyparse(); ==== //depot/projects/trustedbsd/mac/bin/pax/pax.1#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pax.1 8.4 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/pax/pax.1,v 1.24 2001/08/14 10:01:43 ru Exp $ +.\" $FreeBSD: src/bin/pax/pax.1,v 1.25 2002/04/21 12:53:08 charnier Exp $ .\" .Dd April 18, 1994 .Dt PAX 1 @@ -179,12 +179,12 @@ .Op Ar .Ar directory .Sh DESCRIPTION -.Nm Pax -will read, write, and list the members of an archive file, +The +.Nm +utility will read, write, and list the members of an archive file, and will copy directory hierarchies. -.Nm Pax -operation is independent of the specific archive format, -and supports a wide variety of different archive formats. +These operations are independent of the specific archive format, +and support a wide variety of different archive formats. A list of supported archive formats can be found under the description of the .Fl x option. @@ -202,8 +202,7 @@ .Bl -tag -width 6n .It .Em List . -.Nm Pax -will write to +Write to .Dv standard output a table of contents of the members of the archive file read from .Dv standard input , @@ -213,8 +212,7 @@ and is written using single line buffering. .It Fl r .Em Read . -.Nm Pax -extracts the members of the archive file read from the +Extract the members of the archive file read from the .Dv standard input , with pathnames matching the specified .Ar patterns . @@ -228,8 +226,7 @@ option. .It Fl w .Em Write . -.Nm Pax -writes an archive containing the +Write an archive containing the .Ar file operands to .Dv standard output @@ -244,8 +241,7 @@ at that directory will be included. .It Fl r Fl w .Em Copy . -.Nm Pax -copies the +Copy the .Ar file operands to the destination .Ar directory . @@ -465,15 +461,17 @@ will prompt to .Pa /dev/tty giving the name of the file, its file mode and its modification time. -.Nm Pax -will then read a line from +The +.Nm +utility will then read a line from .Pa /dev/tty . If this line is blank, the file or archive member is skipped. If this line consists of a single period, the file or archive member is processed with no modification to its name. Otherwise, its name is replaced with the contents of the line. -.Nm Pax -will immediately exit with a non-zero exit status if +The +.Nm +utility will immediately exit with a non-zero exit status if .Dv is encountered when reading a response or if .Pa /dev/tty @@ -691,8 +689,9 @@ .It Fl x Ar format Specify the output archive format, with the default format being .Ar ustar . -.Nm Pax -currently supports the following formats: +The +.Nm +utility currently supports the following formats: .Bl -tag -width "sv4cpio" .It Ar cpio The extended cpio interchange format specified in the @@ -753,8 +752,9 @@ Pathnames stored by this format must be 250 characters or less in length. .El .Pp -.Nm Pax -will detect and report any file that it is unable to store or extract +The +.Nm +utility will detect and report any file that it is unable to store or extract as the result of any specific archive format restrictions. The individual archive formats may impose additional restrictions on use. Typical archive format restrictions include (but are not limited to): @@ -1145,8 +1145,9 @@ .An Keith Muller at the University of California, San Diego .Sh DIAGNOSTICS -.Nm Pax -will exit with one of the following values: +The +.Nm +utility will exit with one of the following values: .Bl -tag -width 2n .It 0 All files were processed successfully. ==== //depot/projects/trustedbsd/mac/bin/sh/options.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/options.c,v 1.17 2002/02/02 06:50:47 imp Exp $"; + "$FreeBSD: src/bin/sh/options.c,v 1.18 2002/04/22 13:44:17 des Exp $"; #endif /* not lint */ #include @@ -373,7 +373,7 @@ char **optbase = NULL; if (argc < 3) - error("Usage: getopts optstring var [arg]"); + error("usage: getopts optstring var [arg]"); else if (argc == 3) optbase = shellparam.p; else ==== //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/freebsd.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.42 2002/03/27 05:19:51 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.43 2002/04/24 04:21:41 obrien Exp $ */ #undef CPP_PREDEFINES #define CPP_PREDEFINES \ @@ -755,8 +755,8 @@ (n) + 4) #undef DBX_REGISTER_NUMBER -#define DBX_REGISTER_NUMBER(n) ((write_symbols == DWARF_DEBUG \ - || write_symbols == DWARF2_DEBUG) \ +#define DBX_REGISTER_NUMBER(n) ((write_symbols == DWARF2_DEBUG \ + || write_symbols == DWARF_DEBUG) \ ? DWARF_DBX_REGISTER_NUMBER(n) \ : STABS_DBX_REGISTER_NUMBER(n)) ==== //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* Definitions for Intel 386 running FreeBSD with either a.out or ELF format - Copyright (C) 1996-2000 Free Software Foundation, Inc. + Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc. Contributed by Eric Youngdale. Modified for stabs-in-ELF by H.J. Lu. Adapted from GNU/Linux version by John Polstra. @@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.42 2002/03/27 05:22:35 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.44 2002/04/24 04:49:34 obrien Exp $ */ #undef CPP_PREDEFINES #define CPP_PREDEFINES \ @@ -38,7 +38,7 @@ #undef ASM_SPEC #define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" -#undef ASM_FINAL_SPEC +#undef ASM_FINAL_SPEC #define ASM_FINAL_SPEC "%|" /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support @@ -49,9 +49,6 @@ have the time to search for those flags. I am sure how to add support for -soname shared_object_name. H.J. - I took out %{v:%{!V:-V}}. It is too much :-(. They can use - -Wl,-V. - When the -shared link option is used a final link is not being done. */ @@ -64,14 +61,19 @@ %{assert*} %{R*}} \ %{!maout: \ %{Wl,*:%*} \ + %{v:-V} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ %{shared:-Bshareable %{h*} %{soname*}} \ - %{symbolic:-Bsymbolic} \ %{!shared: \ %{!static: \ %{rdynamic: -export-dynamic} \ %{!dynamic-linker: -dynamic-linker /usr/libexec/ld-elf.so.1}} \ - %{static:-Bstatic}}}" + %{static:-Bstatic}} \ + %{symbolic:-Bsymbolic}}" + +/* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical + crtbegin.o file (see crtstuff.c) which provides part of the support for + getting C++ file-scope static object constructed before entering `main'. */ #undef STARTFILE_SPEC #define STARTFILE_SPEC "\ @@ -86,10 +88,12 @@ %{!pg: \ %{p:gcrt1.o%s} \ %{!p:crt1.o%s}}} \ - crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}" + crti.o%s \ + %{!shared:crtbegin.o%s} \ + %{shared:crtbeginS.o%s}}" /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. Here we tack on our - own magical crtend.o file (compare w/crtstuff.c) which provides part of the + own magical crtend.o file (see crtstuff.c) which provides part of the support for getting C++ file-scope static object constructed before entering `main', followed by the normal "finalizer" file, `crtn.o'. */ @@ -102,20 +106,23 @@ /************************[ Target stuff ]***********************************/ -/* Define the actual types of some ANSI-mandated types. +/* Define the actual types of some ANSI-mandated types. Needs to agree with . GCC defaults come from c-decl.c, c-common.c, and config//.h. */ -#undef SIZE_TYPE +#undef SIZE_TYPE #define SIZE_TYPE "unsigned int" - -#undef PTRDIFF_TYPE + +#undef PTRDIFF_TYPE #define PTRDIFF_TYPE "int" +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE BITS_PER_WORD + /* This is the pseudo-op used to generate a 32-bit word of data with a specific value in some section. */ -#undef INT_ASM_OP +#undef INT_ASM_OP #define INT_ASM_OP ".long" /* Biggest alignment supported by the object file format of this @@ -151,27 +158,23 @@ #define TARGET_DEFAULT \ (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) -/* Prefix for internally generated assembler labels. If we aren't using - underscores, we are using prefix `.'s to identify labels that should - be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ -#undef LPREFIX -#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") +/* Don't default to pcc-struct-return, we want to retain compatibility with + older gcc versions AND pcc-struct-return is nonreentrant. + (even though the SVR4 ABI for the i386 says that records and unions are + returned in memory). */ + +#undef DEFAULT_PCC_STRUCT_RETURN +#define DEFAULT_PCC_STRUCT_RETURN 0 /* The a.out tools do not support "linkonce" sections. */ #undef SUPPORTS_ONE_ONLY #define SUPPORTS_ONE_ONLY TARGET_ELF -/* Enable alias attribute support. */ -#undef SET_ASM_OP -#define SET_ASM_OP ".set" - -/* The a.out tools do not support "Lscope" .stabs symbols. */ -#undef NO_DBX_FUNCTION_END -#define NO_DBX_FUNCTION_END TARGET_AOUT - -/* In ELF, the function stabs come first, before the relative offsets. */ -#undef DBX_FUNCTION_FIRST -#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF +/* Prefix for internally generated assembler labels. If we aren't using + underscores, we are using prefix `.'s to identify labels that should + be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ +#undef LPREFIX +#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") /* supply our own hook for calling __main() from main() */ #undef INVOKE__main @@ -255,11 +258,19 @@ /************************[ Assembler stuff ]********************************/ +/* Override the default comment-starter of "/" from unix.h. */ +#undef ASM_COMMENT_START +#define ASM_COMMENT_START "#" + #undef ASM_APP_ON #define ASM_APP_ON "#APP\n" #undef ASM_APP_OFF -#define ASM_APP_OFF "#NO_APP\n" +#define ASM_APP_OFF "#NO_APP\n" + +/* Enable alias attribute support. */ +#undef SET_ASM_OP +#define SET_ASM_OP ".set" /* This is how to begin an assembly language file. The .file command should always begin the output. @@ -274,8 +285,8 @@ } while (0) /* This is how to store into the string BUF - the symbol_ref name of an internal numbered label where - PREFIX is the class of label and NUM is the number within the class. + the symbol_ref name of an internal numbered label where + PREFIX is the class of label and NUM is the number within the class. This is suitable for output with `assemble_name'. */ #undef ASM_GENERATE_INTERNAL_LABEL #define ASM_GENERATE_INTERNAL_LABEL(BUF, PREFIX, NUMBER) \ @@ -405,7 +416,6 @@ } \ } while (0) - #undef ASM_OUTPUT_SOURCE_LINE #define ASM_OUTPUT_SOURCE_LINE(FILE, LINE) \ do { \ @@ -503,10 +513,10 @@ } while (0) /* Switch into a generic section. - + We make the section read-only and executable for a function decl, read-only for a const data decl, and writable for a non-const data decl. - + If the section has already been defined, we must not emit the attributes here. The SVR4 assembler does not recognize section redefinitions. @@ -666,13 +676,21 @@ some don't. *OLD* GAS requires the %cl argument, so override i386/unix.h. */ - + #undef AS3_SHIFT_DOUBLE #define AS3_SHIFT_DOUBLE(a,b,c,d) AS3 (a,b,c,d) /************************[ Debugger stuff ]*********************************/ +/* The a.out tools do not support "Lscope" .stabs symbols. */ +#undef NO_DBX_FUNCTION_END +#define NO_DBX_FUNCTION_END TARGET_AOUT + +/* In ELF, the function stabs come first, before the relative offsets. */ +#undef DBX_FUNCTION_FIRST +#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF + /* Copy this from the svr4 specifications... */ /* Define the register numbers to be used in Dwarf debugging information. The SVR4 reference port C compiler uses the following register numbers ==== //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/Makefile#3 (text+ko) ==== @@ -7,6 +7,8 @@ # BINDEST=/usr/sbin SBINDEST=/sbin +SEARCHDIRS=$(BINDEST) $(SBINDEST) /bin /usr/bin /sbin /usr/sbin \ + /usr/local/bin /usr/local/sbin MANDIR=/usr/share/man CC=cc -Wall -Wstrict-prototypes -Wuninitialized -O CFLAGS=-g -I$(TOP) @@ -49,6 +51,14 @@ FILS=fils.o parse.o kmem.o opt.o facpri.o common.o printstate.o build all: ipf ipfs ipfstat ipftest ipmon ipnat $(LKM) + /bin/rm -f $(TOP)/ipf + ln -s `pwd`/ipf $(TOP) + /bin/rm -f $(TOP)/ipftest + ln -s `pwd`/ipftest $(TOP) + /bin/rm -f $(TOP)/ipmon + ln -s `pwd`/ipmon $(TOP) + /bin/rm -f $(TOP)/ipnat + ln -s `pwd`/ipnat $(TOP) ipfstat: $(FILS) $(CC) -static $(DEBUG) $(CFLAGS) $(STATETOP_CFLAGS) $(STATETOP_INC) \ @@ -56,13 +66,9 @@ ipf: $(IPF) $(CC) -static $(DEBUG) $(CFLAGS) $(IPF) -o $@ $(LIBS) - /bin/rm -f $(TOP)/ipf - ln -s `pwd`/ipf $(TOP) ipftest: $(IPT) $(CC) $(DEBUG) $(CFLAGS) $(IPT) -o $@ $(LIBS) - /bin/rm -f $(TOP)/ipftest - ln -s `pwd`/ipftest $(TOP) ipnat: $(IPNAT) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 26 15:48:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E623D37B425; Fri, 26 Apr 2002 15:48:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1446037B421 for ; Fri, 26 Apr 2002 15:48:05 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3QMm4W38433 for perforce@freebsd.org; Fri, 26 Apr 2002 15:48:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Fri, 26 Apr 2002 15:48:04 -0700 (PDT) Message-Id: <200204262248.g3QMm4W38433@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 10331 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10331 Change 10331 by marcel@marcel_nfs on 2002/04/26 15:47:54 A simple tool for showing and dumping MCA records. By default error records are read through sysctl(3) and showed in a readable from. The -f option can be used to read records from a file in which the records have been dumped previously. Error records can be dumped to a file when -d is given. The -f option can be used to name the file. The default filename is /var/log/mca.log. Keep it unhooked until its buildable from within P4. Affected files ... ... //depot/projects/ia64/sbin/mca/Makefile#1 add ... //depot/projects/ia64/sbin/mca/mca.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 26 16:51:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FAC837B419; Fri, 26 Apr 2002 16:50:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 56BCC37B41F for ; Fri, 26 Apr 2002 16:50:36 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3QNoLF50775 for perforce@freebsd.org; Fri, 26 Apr 2002 16:50:21 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 26 Apr 2002 16:50:21 -0700 (PDT) Message-Id: <200204262350.g3QNoLF50775@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10335 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10335 Change 10335 by peter@peter_daintree on 2002/04/26 16:49:50 IFC @10334 Affected files ... ... //depot/projects/ia64/MAINTAINERS#2 integrate ... //depot/projects/ia64/Makefile#3 integrate ... //depot/projects/ia64/Makefile.inc1#20 integrate ... //depot/projects/ia64/UPDATING#9 integrate ... //depot/projects/ia64/bin/df/df.1#2 integrate ... //depot/projects/ia64/bin/domainname/domainname.1#2 integrate ... //depot/projects/ia64/bin/ed/ed.1#2 integrate ... //depot/projects/ia64/bin/expr/expr.1#3 integrate ... //depot/projects/ia64/bin/expr/expr.y#4 integrate ... //depot/projects/ia64/bin/hostname/hostname.1#2 integrate ... //depot/projects/ia64/bin/ls/ls.1#6 integrate ... //depot/projects/ia64/bin/mkdir/mkdir.1#2 integrate ... //depot/projects/ia64/bin/pax/cpio.1#2 integrate ... //depot/projects/ia64/bin/pax/pax.1#2 integrate ... //depot/projects/ia64/bin/pax/tar.1#2 integrate ... //depot/projects/ia64/bin/ps/ps.1#5 integrate ... //depot/projects/ia64/bin/pwd/pwd.1#4 integrate ... //depot/projects/ia64/bin/rcp/Makefile#4 integrate ... //depot/projects/ia64/bin/rcp/rcp.1#2 integrate ... //depot/projects/ia64/bin/realpath/realpath.1#2 integrate ... //depot/projects/ia64/bin/sh/bltin/echo.1#2 integrate ... //depot/projects/ia64/bin/sh/options.c#3 integrate ... //depot/projects/ia64/contrib/gcc.295/config/i386/freebsd.h#4 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#6 integrate ... //depot/projects/ia64/contrib/ipfilter/BSD/Makefile#3 integrate ... //depot/projects/ia64/contrib/ipfilter/BSD/kupgrade#3 integrate ... //depot/projects/ia64/contrib/ipfilter/FreeBSD-4.0/kinstall#3 integrate ... //depot/projects/ia64/contrib/ipfilter/HISTORY#3 integrate ... //depot/projects/ia64/contrib/ipfilter/QNX_OCL.txt#1 branch ... //depot/projects/ia64/contrib/ipfilter/fils.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/ip_sfil.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/ipf.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/ipfs.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/ipsend.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/ipt.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/kmem.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/l4check/l4check.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/man/ipmon.8#3 integrate ... //depot/projects/ia64/contrib/ipfilter/man/ipnat.5#3 integrate ... //depot/projects/ia64/contrib/ipfilter/mlf_ipl.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/mls_ipl.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/natparse.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/printnat.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/printstate.c#2 integrate ... //depot/projects/ia64/contrib/ipfilter/solaris.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/test/Makefile#3 integrate ... //depot/projects/ia64/contrib/ipfilter/test/expected/f11#2 integrate ... //depot/projects/ia64/contrib/ipfilter/test/expected/f17#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/in1#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/in2#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/in3#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/in4#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/ipv6.1#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/ipv6.2#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/l1#2 integrate ... //depot/projects/ia64/contrib/ipfilter/test/expected/l1.b#2 integrate ... //depot/projects/ia64/contrib/ipfilter/test/expected/ni4#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/input/f11#2 integrate ... //depot/projects/ia64/contrib/ipfilter/test/input/f17#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/input/ipv6.2#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/input/ni4#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/intest#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/logtest#2 integrate ... //depot/projects/ia64/contrib/ipfilter/test/mhtest#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/f11#2 integrate ... //depot/projects/ia64/contrib/ipfilter/test/regress/f17#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/in1#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/in2#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/in3#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/in4#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/ipv6.2#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/ni4.ipf#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/ni4.nat#1 branch ... //depot/projects/ia64/contrib/lukemftp/src/fetch.c#2 integrate ... //depot/projects/ia64/contrib/lukemftp/src/ftp.1#2 integrate ... //depot/projects/ia64/contrib/lukemftp/src/ftp.c#2 integrate ... //depot/projects/ia64/contrib/lukemftp/src/ftp_var.h#2 integrate ... //depot/projects/ia64/contrib/lukemftp/src/main.c#2 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#9 integrate ... //depot/projects/ia64/contrib/openpam/include/security/openpam.h#11 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_vprompt.c#7 integrate ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/pam_passwdqc.c#3 integrate ... //depot/projects/ia64/contrib/pam_modules/pam_passwdqc/pam_passwdqc.spec#3 integrate ... //depot/projects/ia64/contrib/sendmail/FAQ#2 integrate ... //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#7 integrate ... //depot/projects/ia64/contrib/sendmail/INSTALL#3 integrate ... //depot/projects/ia64/contrib/sendmail/KNOWNBUGS#4 integrate ... //depot/projects/ia64/contrib/sendmail/LICENSE#3 integrate ... //depot/projects/ia64/contrib/sendmail/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/PGPKEYS#3 integrate ... //depot/projects/ia64/contrib/sendmail/README#3 integrate ... //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/README#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/README#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/chez.cs.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/clientproto.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cs-hpux10.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cs-hpux9.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cs-osf1.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cs-solaris2.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cs-sunos4.1.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cs-ultrix4.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cyrusproto.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-bsd4.4.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-hpux10.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-hpux9.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-linux.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-mpeix.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-nextstep3.3.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-osf1.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-solaris.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-sunos4.1.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-ultrix4.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/huginn.cs.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/knecht.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/mail.cs.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/mail.eecs.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/mailspool.cs.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/python.cs.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/s2k-osf1.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/s2k-ultrix4.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/submit.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/tcpproto.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/ucbarpa.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/ucbvax.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/uucpproto.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/vangogh.cs.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/domain/Berkeley.EDU.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/domain/berkeley-only.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/domain/generic.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/accept_unqualified_senders.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/access_db.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/allmasquerade.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/always_add_domain.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/authinfo.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/bestmx_is_local.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/bitdomain.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/blacklist_recipients.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/compat_check.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/delay_checks.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/dnsbl.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/domaintable.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/generics_entire_domain.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/genericstable.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/ldap_routing.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/limited_masquerade.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/local_lmtp.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/local_no_masquerade.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/local_procmail.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/lookupdotdomain.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/loose_relay_check.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/mailertable.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/masquerade_entire_domain.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/masquerade_envelope.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/msp.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/no_default_msa.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/nocanonify.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/nodns.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/notsticky.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/nouucp.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/nullclient.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/preserve_luser_host.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/promiscuous_relay.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/queuegroup.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/redirect.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/relay_based_on_MX.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/relay_entire_domain.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/relay_hosts_only.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/relay_local_from.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/relay_mail_from.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/smrsh.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/stickyhost.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/use_ct_file.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/use_cw_file.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/uucpdomain.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/virtuser_entire_domain.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/virtusertable.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/hack/cssubdomain.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/m4/cf.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/m4/cfhead.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/cyrus.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/fax.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/local.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/mail11.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/phquery.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/pop.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/procmail.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/qpage.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/smtp.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/usenet.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/uucp.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/a-ux.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/aix3.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/aix4.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/aix5.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/altos.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/amdahl-uts.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/bsd4.3.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/bsd4.4.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/bsdi.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/bsdi1.0.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/bsdi2.0.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/darwin.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/dgux.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/domainos.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/dynix3.2.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/freebsd4.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/freebsd5.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/gnu.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/hpux10.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/hpux11.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/hpux9.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/irix4.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/irix5.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/irix6.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/isc4.1.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/linux.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/maxion.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/mklinux.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/mpeix.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/nextstep.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/openbsd.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/osf1.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/powerux.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/ptx2.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/qnx.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/riscos4.5.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/sco-uw-2.1.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/sco3.2.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/sinix.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/solaris2.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/solaris2.ml.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/solaris2.pre5.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/solaris8.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/sunos3.5.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/sunos4.1.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/svr4.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/ultrix4.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/unixware7.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/unknown.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/uxpds.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/sendmail.schema#2 integrate ... //depot/projects/ia64/contrib/sendmail/cf/sh/makeinfo.sh#2 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/README#2 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/bsdi.mc#2 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/buildvirtuser#4 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/dnsblaccess.m4#2 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/link_hash.sh#3 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/qtool.8#4 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/qtool.pl#4 integrate ... //depot/projects/ia64/contrib/sendmail/doc/op/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/doc/op/op.me#4 integrate ... //depot/projects/ia64/contrib/sendmail/editmap/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/editmap/editmap.8#2 integrate ... //depot/projects/ia64/contrib/sendmail/editmap/editmap.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/libmilter/mfapi.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/libmilter/mfdef.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/libmilter/milter.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/libsmdb/smdb.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sendmail/mailstats.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sendmail/pathnames.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sendmail/sendmail.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/assert.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/bitops.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/cdefs.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/cf.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/clock.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/conf.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/config.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/debug.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/errstring.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/exc.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/fdset.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/gen.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/heap.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/io.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/ldap.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/limits.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/mbdb.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_aix.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_freebsd.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_hp.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_irix.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_linux.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_mpeix.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_next.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_openbsd.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_openunix.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_osf1.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_sunos.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_ultrix.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_unixware.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/path.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/rpool.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/setjmp.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/shm.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/signal.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/string.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/sysexits.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/test.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/types.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/varargs.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/xtrap.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/README#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/comm.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/docs/index.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/docs/overview.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/engine.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/handler.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/libmilter.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/main.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/signal.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/sm_gethost.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/smfi.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/README#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/assert.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/assert.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/b-strcmp.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/b-strl.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/cdefs.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/cf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/clock.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/clrerr.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/config.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/debug.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/debug.html#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/errstring.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/exc.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/exc.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fclose.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/feof.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/ferror.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fflush.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fget.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/findfp.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/flags.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fopen.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fpos.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fprintf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fpurge.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fput.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fread.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fscanf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fseek.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fvwrite.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fvwrite.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fwalk.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fwrite.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/gen.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/get.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/glue.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/heap.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/heap.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/index.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/io.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/ldap.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/local.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/makebuf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/match.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/mbdb.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/mpeix.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/niprop.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/path.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/put.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/refill.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/rewind.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/rpool.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/rpool.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/setvbuf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/shm.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/signal.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/smstdio.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/snprintf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/sscanf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/stdio.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strcasecmp.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strdup.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strerror.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strexit.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/string.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/stringf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strio.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strl.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strrevcmp.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strto.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/syslogio.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-cf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-event.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-exc.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-float.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-fopen.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-heap.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-match.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-path.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-rpool.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-scanf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-shm.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-smstdio.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-string.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-strio.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-strl.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-strrevcmp.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-types.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/test.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/ungetc.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vasprintf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vfprintf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vfscanf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vprintf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vsnprintf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vsprintf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vsscanf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/wbuf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/wsetup.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/xtrap.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsmdb/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsmdb/smdb.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsmdb/smdb1.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsmdb/smdb2.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsmdb/smndbm.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/cf.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/debug.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/err.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/lockfile.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/safefile.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/snprintf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/mail.local/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/mail.local/README#3 integrate ... //depot/projects/ia64/contrib/sendmail/mail.local/mail.local.8#3 integrate ... //depot/projects/ia64/contrib/sendmail/mail.local/mail.local.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/mailstats/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/mailstats/mailstats.8#4 integrate ... //depot/projects/ia64/contrib/sendmail/mailstats/mailstats.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/makemap/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/makemap/makemap.8#3 integrate ... //depot/projects/ia64/contrib/sendmail/makemap/makemap.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/praliases/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/praliases/praliases.8#3 integrate ... //depot/projects/ia64/contrib/sendmail/praliases/praliases.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/rmail/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/rmail/rmail.8#3 integrate ... //depot/projects/ia64/contrib/sendmail/rmail/rmail.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/smrsh/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/smrsh/README#3 integrate ... //depot/projects/ia64/contrib/sendmail/smrsh/smrsh.8#3 integrate ... //depot/projects/ia64/contrib/sendmail/smrsh/smrsh.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/src/README#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/SECURITY#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/TRACEFLAGS#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/TUNING#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/alias.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/aliases#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/aliases.5#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/arpadate.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/bf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/bf.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/collect.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/conf.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/conf.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/control.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/convtime.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/daemon.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/deliver.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/domain.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/envelope.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/err.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/helpfile#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/macro.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/mailq.1#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/main.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/map.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/mci.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/milter.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/mime.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/newaliases.1#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/parseaddr.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/queue.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/readcf.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/recipient.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/sasl.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/savemail.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/sendmail.8#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/sendmail.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/sfsasl.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/sfsasl.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/shmticklib.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/sm_resolve.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/src/sm_resolve.h#2 integrate ... //depot/projects/ia64/contrib/sendmail/src/srvrsmtp.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/stab.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/stats.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/statusd_shm.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/sysexits.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/timers.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/timers.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/tls.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/trace.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/udb.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/usersmtp.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/util.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/version.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/test/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/test/README#2 integrate ... //depot/projects/ia64/contrib/sendmail/test/Results#3 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_dropgid.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_exclopen.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_pathconf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_seteuid.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_setgid.c#2 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_setreuid.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_setuid.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_snprintf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/vacation/Makefile#2 integrate ... //depot/projects/ia64/contrib/sendmail/vacation/vacation.1#4 integrate ... //depot/projects/ia64/contrib/sendmail/vacation/vacation.c#4 integrate ... //depot/projects/ia64/contrib/smbfs/CREDITS#2 integrate ... //depot/projects/ia64/contrib/smbfs/HISTORY#3 integrate ... //depot/projects/ia64/contrib/smbfs/Makefile.inc#3 integrate ... //depot/projects/ia64/contrib/smbfs/examples/dot.nsmbrc#2 integrate ... //depot/projects/ia64/contrib/smbfs/lib/smb/ctx.c#5 integrate ... //depot/projects/ia64/contrib/smbfs/mount_smbfs/mount_smbfs.8#3 integrate ... //depot/projects/ia64/contrib/smbfs/mount_smbfs/mount_smbfs.c#3 integrate ... //depot/projects/ia64/contrib/smbfs/smbutil/smbutil.1#3 integrate ... //depot/projects/ia64/contrib/smbfs/smbutil/view.c#3 integrate ... //depot/projects/ia64/crypto/openssh/auth2-pam.c#2 integrate ... //depot/projects/ia64/crypto/openssh/servconf.c#6 integrate ... //depot/projects/ia64/crypto/openssh/session.c#8 integrate ... //depot/projects/ia64/crypto/openssh/sshd_config#4 integrate ... //depot/projects/ia64/etc/Makefile#9 integrate ... //depot/projects/ia64/etc/defaults/rc.conf#10 integrate ... //depot/projects/ia64/etc/etc.alpha/ttys#2 integrate ... //depot/projects/ia64/etc/etc.i386/ttys#2 integrate ... //depot/projects/ia64/etc/etc.ia64/ttys#2 integrate ... //depot/projects/ia64/etc/etc.sparc64/ttys#2 integrate ... //depot/projects/ia64/etc/mail/Makefile#8 integrate ... //depot/projects/ia64/etc/mtree/BSD.sendmail.dist#1 branch ... //depot/projects/ia64/etc/mtree/BSD.var.dist#6 integrate ... //depot/projects/ia64/etc/nsmb.conf#3 integrate ... //depot/projects/ia64/etc/pam.d/Makefile#3 integrate ... //depot/projects/ia64/etc/pam.d/ftp#3 integrate ... //depot/projects/ia64/etc/pam.d/ftpd#3 integrate ... //depot/projects/ia64/etc/pam.d/gdm#2 integrate ... //depot/projects/ia64/etc/pam.d/login#4 integrate ... //depot/projects/ia64/etc/pam.d/other#3 integrate ... //depot/projects/ia64/etc/pam.d/rsh#3 integrate ... //depot/projects/ia64/etc/pam.d/sshd#4 integrate ... //depot/projects/ia64/etc/pam.d/su#3 integrate ... //depot/projects/ia64/etc/pam.d/xdm#2 integrate ... //depot/projects/ia64/etc/rc#11 integrate ... //depot/projects/ia64/etc/rc.d/wscons#2 integrate ... //depot/projects/ia64/etc/rc.diskless1#3 integrate ... //depot/projects/ia64/etc/rc.sendmail#1 branch ... //depot/projects/ia64/etc/rc.serial#3 integrate ... //depot/projects/ia64/etc/rc.subr#2 integrate ... //depot/projects/ia64/etc/sendmail/Makefile#6 integrate ... //depot/projects/ia64/etc/sendmail/rc.sendmail#3 delete ... //depot/projects/ia64/games/adventure/setup.c#2 integrate ... //depot/projects/ia64/games/atc/main.c#2 integrate ... //depot/projects/ia64/games/backgammon/common_source/subs.c#2 integrate ... //depot/projects/ia64/games/bs/bs.c#3 integrate ... //depot/projects/ia64/games/canfield/cfscores/cfscores.c#3 integrate ... //depot/projects/ia64/games/fortune/datfiles/fortunes#11 integrate ... //depot/projects/ia64/games/fortune/datfiles/fortunes2#5 integrate ... //depot/projects/ia64/games/fortune/datfiles/fortunes2-o#3 integrate ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile.inc#4 integrate ... //depot/projects/ia64/gnu/usr.bin/cvs/cvs/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/man/man/man.c#4 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/pch.c#2 integrate ... //depot/projects/ia64/gnu/usr.bin/perl/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/perl/libperl/config.SH-elf.alpha#3 integrate ... //depot/projects/ia64/gnu/usr.bin/perl/libperl/config.SH-elf.i386#3 integrate ... //depot/projects/ia64/gnu/usr.bin/perl/libperl/config.SH-elf.ia64#4 integrate ... //depot/projects/ia64/gnu/usr.bin/perl/libperl/config.SH-elf.sparc64#5 integrate ... //depot/projects/ia64/gnu/usr.bin/perl/library/Makefile.inc#2 integrate ... //depot/projects/ia64/include/Makefile#10 integrate ... //depot/projects/ia64/include/kenv.h#1 branch ... //depot/projects/ia64/include/stdlib.h#7 integrate ... //depot/projects/ia64/kerberos5/Makefile#2 integrate ... //depot/projects/ia64/kerberos5/Makefile.inc#3 integrate ... //depot/projects/ia64/kerberos5/lib/Makefile#2 integrate ... //depot/projects/ia64/kerberos5/lib/libkrb5/Makefile#3 integrate ... //depot/projects/ia64/kerberos5/lib/libvers/Makefile#2 integrate ... //depot/projects/ia64/kerberos5/libexec/hprop/Makefile#2 integrate ... //depot/projects/ia64/kerberos5/libexec/hpropd/Makefile#2 integrate ... //depot/projects/ia64/kerberos5/libexec/ipropd-master/Makefile#2 integrate ... //depot/projects/ia64/kerberos5/libexec/ipropd-slave/Makefile#2 integrate ... //depot/projects/ia64/kerberos5/libexec/k5admind/Makefile#2 integrate ... //depot/projects/ia64/kerberos5/libexec/k5passwdd/Makefile#2 integrate ... //depot/projects/ia64/kerberos5/libexec/kdc/Makefile#3 integrate ... //depot/projects/ia64/kerberos5/usr.bin/k5admin/Makefile#2 integrate ... //depot/projects/ia64/kerberos5/usr.bin/k5destroy/Makefile#3 integrate ... //depot/projects/ia64/kerberos5/usr.bin/k5init/Makefile#3 integrate ... //depot/projects/ia64/kerberos5/usr.bin/k5list/Makefile#3 integrate ... //depot/projects/ia64/kerberos5/usr.bin/k5passwd/Makefile#3 integrate ... //depot/projects/ia64/kerberos5/usr.bin/k5su/Makefile#3 integrate ... //depot/projects/ia64/kerberos5/usr.sbin/k5stash/Makefile#2 integrate ... //depot/projects/ia64/kerberos5/usr.sbin/ktutil/Makefile#3 integrate ... //depot/projects/ia64/kerberosIV/Makefile#2 integrate ... //depot/projects/ia64/kerberosIV/Makefile.inc#2 integrate ... //depot/projects/ia64/lib/compat/Makefile.inc#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/Makefile#2 integrate ... //depot/projects/ia64/lib/compat/compat4x.alpha/Makefile#3 integrate ... //depot/projects/ia64/lib/compat/compat4x.i386/Makefile#3 integrate ... //depot/projects/ia64/lib/libc/gen/getnetgrent.c#3 integrate ... //depot/projects/ia64/lib/libc/net/getaddrinfo.3#2 integrate ... //depot/projects/ia64/lib/libc/net/ifname.c#3 integrate ... //depot/projects/ia64/lib/libc/net/inet_addr.c#3 integrate ... //depot/projects/ia64/lib/libc/net/inet_pton.c#3 integrate ... //depot/projects/ia64/lib/libc/net/rthdr.c#3 integrate ... //depot/projects/ia64/lib/libc/net/vars.c#3 integrate ... //depot/projects/ia64/lib/libc/stdio/scanf.3#4 integrate ... //depot/projects/ia64/lib/libc/stdio/vfscanf.c#4 integrate ... //depot/projects/ia64/lib/libc/stdlib/malloc.3#5 integrate ... //depot/projects/ia64/lib/libc/stdlib/malloc.c#8 integrate ... //depot/projects/ia64/lib/libc/sys/Makefile.inc#2 integrate ... //depot/projects/ia64/lib/libc/sys/kenv.2#1 branch ... //depot/projects/ia64/lib/libc_r/test/guard_b.c#2 integrate ... //depot/projects/ia64/lib/libcam/camlib.h#3 integrate ... //depot/projects/ia64/lib/libedit/makelist#2 integrate ... //depot/projects/ia64/lib/libipsec/ipsec_set_policy.3#2 integrate ... //depot/projects/ia64/lib/libipsec/ipsec_strerror.3#2 integrate ... //depot/projects/ia64/lib/libncp/ncpl_nls.c#2 integrate ... //depot/projects/ia64/lib/libpam/libpam/Makefile#11 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8#2 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.c#10 integrate ... //depot/projects/ia64/lib/libutil/login.3#2 integrate ... //depot/projects/ia64/lib/libutil/login.c#3 integrate ... //depot/projects/ia64/lib/libypclnt/Makefile#3 integrate ... //depot/projects/ia64/libexec/pppoed/pppoed.c#4 integrate ... //depot/projects/ia64/libexec/tftpd/tftpd.c#6 integrate ... //depot/projects/ia64/release/Makefile#9 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#5 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#3 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml#4 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#6 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#10 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/sparc64/install.sgml#6 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 integrate ... //depot/projects/ia64/release/picobsd/bridge/crunch.conf#4 integrate ... //depot/projects/ia64/release/picobsd/dial/crunch.conf#2 integrate ... //depot/projects/ia64/release/picobsd/isp/crunch.conf#3 integrate ... //depot/projects/ia64/release/picobsd/net/crunch.conf#3 integrate ... //depot/projects/ia64/release/picobsd/router/crunch.conf#2 integrate ... //depot/projects/ia64/release/picobsd/tinyware/msh/sh3.c#2 integrate ... //depot/projects/ia64/release/scripts/bin-install.sh#2 integrate ... //depot/projects/ia64/release/scripts/catpages-make.sh#2 integrate ... //depot/projects/ia64/release/scripts/compat4x-install.sh#1 branch ... //depot/projects/ia64/release/scripts/dict-make.sh#2 integrate ... //depot/projects/ia64/release/scripts/doFS.sh#5 integrate ... //depot/projects/ia64/release/scripts/doc-make.sh#2 integrate ... //depot/projects/ia64/release/scripts/driver-copy2.pl#2 integrate ... //depot/projects/ia64/release/scripts/driver-remove.pl#2 integrate ... //depot/projects/ia64/release/scripts/games-make.sh#2 integrate ... //depot/projects/ia64/release/scripts/info-make.sh#2 integrate ... //depot/projects/ia64/release/scripts/manpages-make.sh#2 integrate ... //depot/projects/ia64/release/scripts/proflibs-make.sh#2 integrate ... //depot/projects/ia64/sbin/dump/Makefile#3 integrate ... //depot/projects/ia64/sbin/dump/dump.8#4 integrate ... //depot/projects/ia64/sbin/fdisk/fdisk.8#2 integrate ... //depot/projects/ia64/sbin/fdisk/fdisk.c#5 integrate ... //depot/projects/ia64/sbin/ffsinfo/ffsinfo.8#3 integrate ... //depot/projects/ia64/sbin/fsck/fsck.c#4 integrate ... //depot/projects/ia64/sbin/fsck_ffs/main.c#5 integrate ... //depot/projects/ia64/sbin/fsck_ifs/main.c#4 integrate ... //depot/projects/ia64/sbin/fsck_msdosfs/main.c#3 integrate ... //depot/projects/ia64/sbin/ifconfig/ifconfig.c#5 integrate ... //depot/projects/ia64/sbin/ifconfig/ifieee80211.c#3 integrate ... //depot/projects/ia64/sbin/ifconfig/ifmedia.c#3 integrate ... //depot/projects/ia64/sbin/ifconfig/ifvlan.c#2 integrate ... //depot/projects/ia64/sbin/ip6fw/ip6fw.8#2 integrate ... //depot/projects/ia64/sbin/ip6fw/ip6fw.c#3 integrate ... //depot/projects/ia64/sbin/md5/md5.1#2 integrate ... //depot/projects/ia64/sbin/mdconfig/mdconfig.c#4 integrate ... //depot/projects/ia64/sbin/mdmfs/mdmfs.c#2 integrate ... //depot/projects/ia64/sbin/mount/mount.8#2 integrate ... //depot/projects/ia64/sbin/mount/mount.c#3 integrate ... //depot/projects/ia64/sbin/mount_nwfs/mount_nwfs.8#2 integrate ... //depot/projects/ia64/sbin/newfs/mkfs.c#9 integrate ... //depot/projects/ia64/sbin/newfs/newfs.8#6 integrate ... //depot/projects/ia64/sbin/newfs/newfs.c#10 integrate ... //depot/projects/ia64/sbin/newfs/newfs.h#4 integrate ... //depot/projects/ia64/sbin/reboot/reboot.8#2 integrate ... //depot/projects/ia64/sbin/reboot/reboot.c#2 integrate ... //depot/projects/ia64/sbin/restore/Makefile#3 integrate ... //depot/projects/ia64/sbin/savecore/savecore.c#10 integrate ... //depot/projects/ia64/sbin/startslip/startslip.1#2 integrate ... //depot/projects/ia64/sbin/vinum/commands.c#2 integrate ... //depot/projects/ia64/sbin/vinum/list.c#2 integrate ... //depot/projects/ia64/secure/lib/libssh/Makefile#4 integrate ... //depot/projects/ia64/secure/usr.bin/ssh/Makefile#3 integrate ... //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#8 integrate ... //depot/projects/ia64/share/examples/etc/make.conf#8 integrate ... //depot/projects/ia64/share/examples/isdn/contrib/answer.c#2 integrate ... //depot/projects/ia64/share/examples/isdn/contrib/isdnctl#2 integrate ... //depot/projects/ia64/share/examples/netgraph/ether.bridge#3 integrate ... //depot/projects/ia64/share/examples/nwclient/dot.nwfsrc#2 integrate ... //depot/projects/ia64/share/info/Makefile#2 integrate ... //depot/projects/ia64/share/man/man3/Makefile#3 integrate ... //depot/projects/ia64/share/man/man3/queue.3#3 integrate ... //depot/projects/ia64/share/man/man4/Makefile#8 integrate ... //depot/projects/ia64/share/man/man4/ed.4#4 integrate ... //depot/projects/ia64/share/man/man4/ef.4#2 integrate ... //depot/projects/ia64/share/man/man4/man4.i386/tx.4#3 integrate ... //depot/projects/ia64/share/man/man4/man4.i386/viapm.4#2 integrate ... //depot/projects/ia64/share/man/man4/polling.4#3 integrate ... //depot/projects/ia64/share/man/man4/ucom.4#1 branch ... //depot/projects/ia64/share/man/man4/uhid.4#1 branch ... //depot/projects/ia64/share/man/man4/uhidev.4#1 branch ... //depot/projects/ia64/share/man/man4/ulpt.4#1 branch ... //depot/projects/ia64/share/man/man4/umodem.4#1 branch ... //depot/projects/ia64/share/man/man4/uplcom.4#1 branch ... //depot/projects/ia64/share/man/man4/uvscom.4#1 branch ... //depot/projects/ia64/share/man/man5/make.conf.5#8 integrate ... //depot/projects/ia64/share/man/man5/moduli.5#2 integrate ... //depot/projects/ia64/share/man/man7/stdint.7#2 integrate ... //depot/projects/ia64/share/man/man8/Makefile#5 integrate ... //depot/projects/ia64/share/man/man8/intro.8#3 integrate ... //depot/projects/ia64/share/man/man9/sx.9#5 integrate ... //depot/projects/ia64/share/mk/Makefile#3 integrate ... //depot/projects/ia64/share/mk/bsd.cpu.mk#2 integrate ... //depot/projects/ia64/share/mk/bsd.dep.mk#5 integrate ... //depot/projects/ia64/share/mk/bsd.doc.mk#3 integrate ... //depot/projects/ia64/share/mk/bsd.docb.mk#2 delete ... //depot/projects/ia64/share/mk/bsd.info.mk#3 integrate ... //depot/projects/ia64/share/mk/bsd.init.mk#1 branch ... //depot/projects/ia64/share/mk/bsd.lib.mk#8 integrate ... //depot/projects/ia64/share/mk/bsd.libnames.mk#7 integrate ... //depot/projects/ia64/share/mk/bsd.man.mk#3 integrate ... //depot/projects/ia64/share/mk/bsd.nls.mk#3 integrate ... //depot/projects/ia64/share/mk/bsd.obj.mk#4 integrate ... //depot/projects/ia64/share/mk/bsd.own.mk#3 integrate ... //depot/projects/ia64/share/mk/bsd.port.mk#2 integrate ... //depot/projects/ia64/share/mk/bsd.port.post.mk#2 integrate ... //depot/projects/ia64/share/mk/bsd.port.pre.mk#2 integrate ... //depot/projects/ia64/share/mk/bsd.port.subdir.mk#2 integrate ... //depot/projects/ia64/share/mk/bsd.prog.mk#7 integrate ... //depot/projects/ia64/share/mk/bsd.sgml.mk#2 delete ... //depot/projects/ia64/share/mk/bsd.subdir.mk#3 integrate ... //depot/projects/ia64/share/mk/sys.mk#4 integrate ... //depot/projects/ia64/share/termcap/termcap.src#4 integrate ... //depot/projects/ia64/sys/Makefile#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/dec_axppci_33.c#3 integrate ... //depot/projects/ia64/sys/alpha/alpha/elf_machdep.c#3 integrate ... //depot/projects/ia64/sys/alpha/alpha/machdep.c#13 integrate ... //depot/projects/ia64/sys/alpha/conf/GENERIC#8 integrate ... //depot/projects/ia64/sys/alpha/pci/lca.c#2 integrate ... //depot/projects/ia64/sys/alpha/pci/lca_pci.c#4 integrate ... //depot/projects/ia64/sys/alpha/pci/tsunami_pci.c#3 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/arch/ia64/start.S#3 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/elf_freebsd.c#3 integrate ... //depot/projects/ia64/sys/boot/forth/loader.conf#5 integrate ... //depot/projects/ia64/sys/boot/i386/kgzldr/Makefile#3 integrate ... //depot/projects/ia64/sys/boot/i386/loader/Makefile#3 integrate ... //depot/projects/ia64/sys/boot/pc98/kgzldr/Makefile#3 integrate ... //depot/projects/ia64/sys/boot/pc98/loader/Makefile#3 integrate ... //depot/projects/ia64/sys/boot/sparc64/boot1/Makefile#3 integrate ... //depot/projects/ia64/sys/boot/sparc64/boot1/boot1.c#2 integrate ... //depot/projects/ia64/sys/cam/cam_xpt.c#6 integrate ... //depot/projects/ia64/sys/cam/scsi/scsi_all.c#6 integrate ... //depot/projects/ia64/sys/coda/coda_subr.c#2 integrate ... //depot/projects/ia64/sys/compat/linux/linux_misc.c#8 integrate ... //depot/projects/ia64/sys/conf/NOTES#6 integrate ... //depot/projects/ia64/sys/conf/files#17 integrate ... //depot/projects/ia64/sys/conf/kern.post.mk#9 integrate ... //depot/projects/ia64/sys/conf/kmod.mk#4 integrate ... //depot/projects/ia64/sys/conf/kmod_syms.awk#3 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#2 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/fil.c#4 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_fil.c#4 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_frag.c#4 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_nat.c#5 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ipl.h#3 integrate ... //depot/projects/ia64/sys/crypto/des/podd.h#2 integrate ... //depot/projects/ia64/sys/crypto/des/sk.h#2 integrate ... //depot/projects/ia64/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate ... //depot/projects/ia64/sys/dev/aac/aac.c#4 integrate ... //depot/projects/ia64/sys/dev/aac/aac_disk.c#6 integrate ... //depot/projects/ia64/sys/dev/aac/aac_pci.c#6 integrate ... //depot/projects/ia64/sys/dev/aac/aacreg.h#4 integrate ... //depot/projects/ia64/sys/dev/aac/aacvar.h#6 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi.c#9 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#4 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/ahc_eisa.c#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aic7770.c#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.c#3 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.h#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.reg#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.seq#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_freebsd.c#2 delete ... //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_freebsd.h#2 delete ... //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/Makefile#3 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm.h#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#1 branch ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#1 branch ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#3 integrate ... //depot/projects/ia64/sys/dev/ata/ata-all.h#5 integrate ... //depot/projects/ia64/sys/dev/ata/ata-disk.c#8 integrate ... //depot/projects/ia64/sys/dev/ata/ata-dma.c#13 integrate ... //depot/projects/ia64/sys/dev/ata/ata-isa.c#4 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-all.c#6 integrate ... //depot/projects/ia64/sys/dev/awi/awi.c#4 integrate ... //depot/projects/ia64/sys/dev/awi/awi_wep.c#4 integrate ... //depot/projects/ia64/sys/dev/awi/awi_wicfg.c#4 integrate ... //depot/projects/ia64/sys/dev/bge/if_bge.c#8 integrate ... //depot/projects/ia64/sys/dev/digi/digi.c#9 integrate ... //depot/projects/ia64/sys/dev/digi/digi_isa.c#5 integrate ... //depot/projects/ia64/sys/dev/gem/if_gem.c#4 integrate ... //depot/projects/ia64/sys/dev/hea/eni.c#3 integrate ... //depot/projects/ia64/sys/dev/hea/eni_buffer.c#4 integrate ... //depot/projects/ia64/sys/dev/hea/eni_transmit.c#2 integrate ... //depot/projects/ia64/sys/dev/hea/eni_vcm.c#3 integrate ... //depot/projects/ia64/sys/dev/hfa/fore_command.c#2 integrate ... //depot/projects/ia64/sys/dev/hfa/fore_output.c#3 integrate ... //depot/projects/ia64/sys/dev/hfa/hfa_eisa.c#1 branch ... //depot/projects/ia64/sys/dev/hfa/hfa_freebsd.c#1 branch ... //depot/projects/ia64/sys/dev/hfa/hfa_freebsd.h#1 branch ... //depot/projects/ia64/sys/dev/hfa/hfa_pci.c#1 branch ... //depot/projects/ia64/sys/dev/hfa/hfa_sbus.c#1 branch ... //depot/projects/ia64/sys/dev/hme/if_hme.c#4 integrate ... //depot/projects/ia64/sys/dev/iir/iir.c#2 integrate ... //depot/projects/ia64/sys/dev/iir/iir_ctrl.c#2 integrate ... //depot/projects/ia64/sys/dev/iir/iir_pci.c#3 integrate ... //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#7 integrate ... //depot/projects/ia64/sys/dev/mii/dcphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mly/mly.c#2 integrate ... //depot/projects/ia64/sys/dev/my/if_my.c#3 integrate ... //depot/projects/ia64/sys/dev/pci/pci.c#5 integrate ... //depot/projects/ia64/sys/dev/ppbus/pps.c#4 integrate ... //depot/projects/ia64/sys/dev/puc/puc.c#3 integrate ... //depot/projects/ia64/sys/dev/puc/pucdata.c#3 integrate ... //depot/projects/ia64/sys/dev/random/harvest.c#3 integrate ... //depot/projects/ia64/sys/dev/sio/sio.c#9 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#5 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/ac97.h#2 integrate ... //depot/projects/ia64/sys/dev/sym/sym_hipd.c#6 integrate ... //depot/projects/ia64/sys/dev/tdfx/tdfx_pci.c#3 integrate ... //depot/projects/ia64/sys/dev/tx/if_tx.c#1 branch ... //depot/projects/ia64/sys/dev/tx/if_txreg.h#1 branch ... //depot/projects/ia64/sys/dev/tx/if_txvar.h#1 branch ... //depot/projects/ia64/sys/dev/usb/if_aue.c#9 integrate ... //depot/projects/ia64/sys/dev/usb/ohci.c#7 integrate ... //depot/projects/ia64/sys/dev/usb/uhci.c#7 integrate ... //depot/projects/ia64/sys/dev/usb/usb_subr.c#6 integrate ... //depot/projects/ia64/sys/dev/vinum/vinumio.c#4 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi.c#16 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#5 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#5 integrate ... //depot/projects/ia64/sys/dev/wi/if_wivar.h#6 integrate ... //depot/projects/ia64/sys/dev/wi/wi_hostap.c#4 integrate ... //depot/projects/ia64/sys/dev/wi/wi_hostap.h#3 integrate ... //depot/projects/ia64/sys/fs/devfs/devfs.h#2 integrate ... //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#6 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs.h#4 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_mem.c#4 integrate ... //depot/projects/ia64/sys/fs/smbfs/smbfs_io.c#4 integrate ... //depot/projects/ia64/sys/fs/smbfs/smbfs_vfsops.c#7 integrate ... //depot/projects/ia64/sys/geom/geom.h#6 integrate ... //depot/projects/ia64/sys/geom/geom_bsd.c#7 integrate ... //depot/projects/ia64/sys/geom/geom_dev.c#9 integrate ... //depot/projects/ia64/sys/geom/geom_disk.c#8 integrate ... //depot/projects/ia64/sys/geom/geom_dump.c#5 integrate ... //depot/projects/ia64/sys/geom/geom_enc.c#2 integrate ... //depot/projects/ia64/sys/geom/geom_slice.c#8 integrate ... //depot/projects/ia64/sys/geom/geom_slice.h#5 integrate ... //depot/projects/ia64/sys/geom/geom_subr.c#6 integrate ... //depot/projects/ia64/sys/i386/conf/GENERIC#9 integrate ... //depot/projects/ia64/sys/i386/i386/autoconf.c#8 integrate ... //depot/projects/ia64/sys/i386/i386/bios.c#6 integrate ... //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#3 integrate ... //depot/projects/ia64/sys/i386/i386/elf_machdep.c#2 integrate ... //depot/projects/ia64/sys/i386/i386/machdep.c#16 integrate ... //depot/projects/ia64/sys/i386/i386/mp_clock.c#2 integrate ... //depot/projects/ia64/sys/i386/i386/mp_machdep.c#8 integrate ... //depot/projects/ia64/sys/i386/i386/trap.c#9 integrate ... //depot/projects/ia64/sys/i386/include/profile.h#4 integrate ... //depot/projects/ia64/sys/i386/isa/clock.c#5 integrate ... //depot/projects/ia64/sys/i386/pci/pci_bus.c#4 integrate ... //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#5 integrate ... //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate ... //depot/projects/ia64/sys/ia64/conf/GENERIC#10 integrate ... //depot/projects/ia64/sys/ia64/ia64/elf_machdep.c#4 integrate ... //depot/projects/ia64/sys/ia64/ia64/locore.s#7 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#29 integrate ... //depot/projects/ia64/sys/ia64/ia64/mca.c#1 branch ... //depot/projects/ia64/sys/ia64/ia64/sal.c#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/swtch.s#7 integrate ... //depot/projects/ia64/sys/ia64/ia64/trap.c#23 integrate ... //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#7 integrate ... //depot/projects/ia64/sys/ia64/include/mca.h#1 branch ... //depot/projects/ia64/sys/ia64/include/sal.h#2 integrate ... //depot/projects/ia64/sys/kern/bus_if.m#3 integrate ... //depot/projects/ia64/sys/kern/init_main.c#6 integrate ... //depot/projects/ia64/sys/kern/init_sysent.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_clock.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_condvar.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_conf.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#15 integrate ... //depot/projects/ia64/sys/kern/kern_environment.c#2 integrate ... //depot/projects/ia64/sys/kern/kern_exec.c#12 integrate ... //depot/projects/ia64/sys/kern/kern_linker.c#14 integrate ... //depot/projects/ia64/sys/kern/kern_malloc.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_ntptime.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#12 integrate ... //depot/projects/ia64/sys/kern/kern_prot.c#13 integrate ... //depot/projects/ia64/sys/kern/kern_tc.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_time.c#7 integrate ... //depot/projects/ia64/sys/kern/link_elf.c#4 integrate ... //depot/projects/ia64/sys/kern/makesyscalls.sh#4 integrate ... //depot/projects/ia64/sys/kern/subr_bus.c#6 integrate ... //depot/projects/ia64/sys/kern/subr_disklabel.c#7 integrate ... //depot/projects/ia64/sys/kern/subr_hints.c#2 integrate ... //depot/projects/ia64/sys/kern/subr_mchain.c#4 integrate ... //depot/projects/ia64/sys/kern/subr_witness.c#10 integrate ... //depot/projects/ia64/sys/kern/sys_process.c#8 integrate ... //depot/projects/ia64/sys/kern/syscalls.c#6 integrate ... //depot/projects/ia64/sys/kern/syscalls.master#6 integrate ... //depot/projects/ia64/sys/kern/uipc_mbuf2.c#3 integrate ... //depot/projects/ia64/sys/kern/uipc_socket.c#9 integrate ... //depot/projects/ia64/sys/kern/uipc_socket2.c#6 integrate ... //depot/projects/ia64/sys/kern/uipc_syscalls.c#8 integrate ... //depot/projects/ia64/sys/kern/vfs_aio.c#12 integrate ... //depot/projects/ia64/sys/kern/vfs_conf.c#7 integrate ... //depot/projects/ia64/sys/kern/vfs_syscalls.c#14 integrate ... //depot/projects/ia64/sys/modules/Makefile#10 integrate ... //depot/projects/ia64/sys/modules/hfa/Makefile#1 branch ... //depot/projects/ia64/sys/modules/hfa/eisa/Makefile#1 branch ... //depot/projects/ia64/sys/modules/hfa/hfa/Makefile#1 branch ... //depot/projects/ia64/sys/modules/hfa/pci/Makefile#1 branch ... //depot/projects/ia64/sys/modules/hfa/sbus/Makefile#1 branch ... //depot/projects/ia64/sys/modules/my/Makefile#2 integrate ... //depot/projects/ia64/sys/modules/tx/Makefile#2 integrate ... //depot/projects/ia64/sys/net/if.c#8 integrate ... //depot/projects/ia64/sys/net/if_faith.c#5 integrate ... //depot/projects/ia64/sys/net/if_gif.c#5 integrate ... //depot/projects/ia64/sys/net/if_stf.c#6 integrate ... //depot/projects/ia64/sys/net/if_stf.h#3 integrate ... //depot/projects/ia64/sys/net/net_osdep.c#2 integrate ... //depot/projects/ia64/sys/net/net_osdep.h#4 integrate ... //depot/projects/ia64/sys/net/radix.c#4 integrate ... //depot/projects/ia64/sys/netatm/atm.h#2 integrate ... //depot/projects/ia64/sys/netatm/atm_aal5.c#3 integrate ... //depot/projects/ia64/sys/netatm/atm_cm.c#3 integrate ... //depot/projects/ia64/sys/netatm/atm_device.c#3 integrate ... //depot/projects/ia64/sys/netatm/atm_if.c#3 integrate ... //depot/projects/ia64/sys/netatm/atm_if.h#3 integrate ... //depot/projects/ia64/sys/netatm/atm_ioctl.h#2 integrate ... //depot/projects/ia64/sys/netatm/atm_proto.c#2 integrate ... //depot/projects/ia64/sys/netatm/atm_signal.c#3 integrate ... //depot/projects/ia64/sys/netatm/atm_socket.c#3 integrate ... //depot/projects/ia64/sys/netatm/atm_subr.c#5 integrate ... //depot/projects/ia64/sys/netatm/atm_sys.h#3 integrate ... //depot/projects/ia64/sys/netatm/atm_usrreq.c#4 integrate ... //depot/projects/ia64/sys/netatm/atm_var.h#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 26 17:44:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3660137B400; Fri, 26 Apr 2002 17:44:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5628A37B41B for ; Fri, 26 Apr 2002 17:44:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3R0ig278230 for perforce@freebsd.org; Fri, 26 Apr 2002 17:44:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Fri, 26 Apr 2002 17:44:42 -0700 (PDT) Message-Id: <200204270044.g3R0ig278230@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 10336 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10336 Change 10336 by marcel@marcel_nfs on 2002/04/26 17:44:27 Connect mca to the build. Thanks Peter! Affected files ... ... //depot/projects/ia64/sbin/Makefile#10 edit Differences ... ==== //depot/projects/ia64/sbin/Makefile#10 (text+ko) ==== @@ -99,7 +99,8 @@ .endif .if ${MACHINE_ARCH} == "ia64" -SUBDIR+=fdisk +SUBDIR+=fdisk \ + mca .endif .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 26 17:54:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9CB437B41C; Fri, 26 Apr 2002 17:54:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 004EF37B416 for ; Fri, 26 Apr 2002 17:54:55 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3R0ss179125 for perforce@freebsd.org; Fri, 26 Apr 2002 17:54:54 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Fri, 26 Apr 2002 17:54:54 -0700 (PDT) Message-Id: <200204270054.g3R0ss179125@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 10337 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10337 Change 10337 by marcel@marcel_nfs on 2002/04/26 17:54:00 [binary] A dump of a couple of error records I collected. The log file contains 4 error records with seqnrs: 4, 5, 14 and 15. Records 4 and 5 were collected by the BSP. Records 14 and 15 were collected by the AP when woken up (actually launched). Affected files ... ... //depot/projects/ia64/sbin/mca/mca.log#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 26 20:37: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7CC737B423; Fri, 26 Apr 2002 20:36:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 01DE937B416 for ; Fri, 26 Apr 2002 20:36:17 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3R3aGI74416 for perforce@freebsd.org; Fri, 26 Apr 2002 20:36:16 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Fri, 26 Apr 2002 20:36:16 -0700 (PDT) Message-Id: <200204270336.g3R3aGI74416@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10343 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10343 Change 10343 by jake@jake_sparc64 on 2002/04/26 20:35:21 Emulate ldq and stq instructions. gcc is now using these to load long doubles. Also move the emulation of popc into userland. Shift some things around in the utrap code to make things more accessible. Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/fpu/Makefile.inc#4 edit ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#10 edit ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_add.c#5 edit ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_explode.c#5 edit ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_extern.h#7 edit ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_implode.c#6 edit ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_subr.c#5 edit ... //depot/projects/sparc64/lib/libc/sparc64/sys/Makefile.inc#13 edit ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap.c#7 edit ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_emul.c#1 add ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_private.h#6 edit ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_setup.c#5 edit Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/Makefile.inc#4 (text+ko) ==== @@ -2,5 +2,7 @@ .PATH: ${.CURDIR}/../libc/sparc64/fpu/ +CFLAGS+= -I${.CURDIR}/sparc64/sys + SRCS+= fpu.c fpu_add.c fpu_compare.c fpu_div.c fpu_explode.c fpu_implode.c \ fpu_mul.c fpu_reg.S fpu_sqrt.c fpu_subr.c ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#10 (text+ko) ==== @@ -87,7 +87,7 @@ #include #include -#include "../sys/__sparc_utrap_private.h" +#include "__sparc_utrap_private.h" #include "fpu_emu.h" #include "fpu_extern.h" @@ -119,89 +119,52 @@ #endif /* FPU_DEBUG */ static int __fpu_execute(struct utrapframe *, struct fpemu *, u_int32_t, u_long); -static void utrap_write(char *); -static void utrap_kill_self(int); /* - * System call wrappers usable in an utrap environment. - */ -static void -utrap_write(char *str) -{ - int berrno; - - berrno = errno; - __sys_write(STDERR_FILENO, str, strlen(str)); - errno = berrno; -} - -static void -utrap_kill_self(sig) -{ - int berrno; - - berrno = errno; - __sys_kill(__sys_getpid(), sig); - errno = berrno; -} - -void -__fpu_panic(char *msg) -{ - - utrap_write(msg); - utrap_write("\n"); - utrap_kill_self(SIGKILL); -} - -/* * Need to use an fpstate on the stack; we could switch, so we cannot safely * modify the pcb one, it might get overwritten. */ -void +int __fpu_exception(struct utrapframe *uf) { struct fpemu fe; u_long fsr, tstate; u_int insn; - int rv; + int sig; fsr = uf->uf_fsr; switch (FSR_GET_FTT(fsr)) { case FSR_FTT_NONE: - utrap_write("lost FPU trap type\n"); - return; + __utrap_write("lost FPU trap type\n"); + return (0); case FSR_FTT_IEEE: - goto fatal; + return (SIGFPE); case FSR_FTT_SEQERR: - utrap_write("FPU sequence error\n"); - goto fatal; + __utrap_write("FPU sequence error\n"); + return (SIGFPE); case FSR_FTT_HWERR: - utrap_write("FPU hardware error\n"); - goto fatal; + __utrap_write("FPU hardware error\n"); + return (SIGFPE); case FSR_FTT_UNFIN: case FSR_FTT_UNIMP: break; default: - utrap_write("unknown FPU error\n"); - goto fatal; + __utrap_write("unknown FPU error\n"); + return (SIGFPE); } fe.fe_fsr = fsr & ~FSR_FTT_MASK; insn = *(u_int32_t *)uf->uf_pc; if (IF_OP(insn) != IOP_MISC || (IF_F3_OP3(insn) != INS2_FPop1 && IF_F3_OP3(insn) != INS2_FPop2)) - __fpu_panic("bogus FP fault"); + __utrap_panic("bogus FP fault"); tstate = uf->uf_state; - rv = __fpu_execute(uf, &fe, insn, tstate); - if (rv != 0) - utrap_kill_self(rv); + sig = __fpu_execute(uf, &fe, insn, tstate); + if (sig != 0) + return (sig); __asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); - return; -fatal: - utrap_kill_self(SIGFPE); - return; + return (0); } #ifdef FPU_DEBUG @@ -223,29 +186,6 @@ } #endif -static u_long -fetch_reg(struct utrapframe *uf, int reg) -{ - u_long offs; - struct frame *frm; - - if (reg == IREG_G0) - return (0); - else if (reg < IREG_O0) /* global */ - return (uf->uf_global[reg]); - else if (reg < IREG_L0) /* out */ - return (uf->uf_out[reg - IREG_O0]); - else { /* local, in */ - /* - * The in registers are immediately after the locals in - * the frame. - */ - frm = (struct frame *)(uf->uf_out[6] + SPOFF); - return (frm->fr_local[reg - IREG_L0]); - } - __fpu_panic("fetch_reg: bogus register"); -} - static void __fpu_mov(struct fpemu *fe, int type, int rd, int rs1, int rs2) { @@ -361,32 +301,32 @@ (tstate & TSTATE_XCC_MASK) >> (TSTATE_XCC_SHIFT)); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_Z)): - reg = fetch_reg(uf, IF_F4_RS1(insn)); + reg = __emul_fetch_reg(uf, IF_F4_RS1(insn)); if (reg == 0) __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_LEZ)): - reg = fetch_reg(uf, IF_F4_RS1(insn)); + reg = __emul_fetch_reg(uf, IF_F4_RS1(insn)); if (reg <= 0) __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_LZ)): - reg = fetch_reg(uf, IF_F4_RS1(insn)); + reg = __emul_fetch_reg(uf, IF_F4_RS1(insn)); if (reg < 0) __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_NZ)): - reg = fetch_reg(uf, IF_F4_RS1(insn)); + reg = __emul_fetch_reg(uf, IF_F4_RS1(insn)); if (reg != 0) __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_GZ)): - reg = fetch_reg(uf, IF_F4_RS1(insn)); + reg = __emul_fetch_reg(uf, IF_F4_RS1(insn)); if (reg > 0) __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_GEZ)): - reg = fetch_reg(uf, IF_F4_RS1(insn)); + reg = __emul_fetch_reg(uf, IF_F4_RS1(insn)); if (reg >= 0) __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); return (0); ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_add.c#5 (text+ko) ==== @@ -62,6 +62,7 @@ #include "fpu_arith.h" #include "fpu_emu.h" #include "fpu_extern.h" +#include "__sparc_utrap_private.h" struct fpn * __fpu_add(fe) @@ -198,7 +199,7 @@ */ #ifdef DIAGNOSTIC if (x->fp_exp != y->fp_exp || r->fp_sticky) - __fpu_panic("fpu_add"); + __utrap_panic("fpu_add"); #endif r->fp_sign = y->fp_sign; FPU_SUBS(r3, 0, r3); ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_explode.c#5 (text+ko) ==== @@ -62,6 +62,7 @@ #include "fpu_arith.h" #include "fpu_emu.h" #include "fpu_extern.h" +#include "__sparc_utrap_private.h" /* * N.B.: in all of the following, we assume the FP format is @@ -278,7 +279,7 @@ break; default: - __fpu_panic("fpu_explode"); + __utrap_panic("fpu_explode"); } if (s == FPC_QNAN && (fp->fp_mant[0] & FP_QUIETBIT) == 0) { ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_extern.h#7 (text+ko) ==== @@ -40,16 +40,13 @@ #ifndef _SPARC64_FPU_FPU_EXTERN_H_ #define _SPARC64_FPU_FPU_EXTERN_H_ -struct proc; -struct fpstate; struct utrapframe; union instr; struct fpemu; struct fpn; /* fpu.c */ -void __fpu_exception(struct utrapframe *tf); -void __fpu_panic(char *msg); +int __fpu_exception(struct utrapframe *tf); /* fpu_add.c */ struct fpn *__fpu_add(struct fpemu *); ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_implode.c#6 (text+ko) ==== @@ -62,6 +62,7 @@ #include "fpu_arith.h" #include "fpu_emu.h" #include "fpu_extern.h" +#include "__sparc_utrap_private.h" static int round(struct fpemu *, struct fpn *); static int toinf(struct fpemu *, int); @@ -354,7 +355,7 @@ (void) __fpu_shr(fp, FP_NMANT - FP_NG - 1 - SNG_FRACBITS); #ifdef DIAGNOSTIC if ((fp->fp_mant[3] & SNG_EXP(1 << FP_NG)) == 0) - __fpu_panic("fpu_ftos"); + __utrap_panic("fpu_ftos"); #endif if (round(fe, fp) && fp->fp_mant[3] == SNG_EXP(2)) exp++; @@ -529,7 +530,7 @@ break; default: - __fpu_panic("fpu_implode"); + __utrap_panic("fpu_implode"); } DPRINTF(FPE_REG, ("fpu_implode: %x %x %x %x\n", space[0], space[1], space[2], space[3])); ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_subr.c#5 (text+ko) ==== @@ -60,6 +60,7 @@ #include "fpu_arith.h" #include "fpu_emu.h" #include "fpu_extern.h" +#include "__sparc_utrap_private.h" /* * Shift the given number right rsh bits. Any bits that `fall off' will get @@ -75,7 +76,7 @@ #ifdef DIAGNOSTIC if (rsh <= 0 || (fp->fp_class != FPC_NUM && !ISNAN(fp))) - __fpu_panic("fpu_rightshift 1"); + __utrap_panic("fpu_rightshift 1"); #endif m0 = fp->fp_mant[0]; @@ -87,7 +88,7 @@ if (rsh >= FP_NMANT) { #ifdef DIAGNOSTIC if ((m0 | m1 | m2 | m3) == 0) - __fpu_panic("fpu_rightshift 2"); + __utrap_panic("fpu_rightshift 2"); #endif fp->fp_mant[0] = 0; fp->fp_mant[1] = 0; ==== //depot/projects/sparc64/lib/libc/sparc64/sys/Makefile.inc#13 (text+ko) ==== @@ -1,7 +1,9 @@ # $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.3 2002/01/01 21:59:53 jake Exp $ -SRCS+= __sparc_utrap.c __sparc_utrap_fp_disabled.S __sparc_utrap_gen.S \ - __sparc_utrap_install.c __sparc_utrap_setup.c +SRCS+= __sparc_utrap.c __sparc_utrap_emul.c __sparc_utrap_fp_disabled.S \ + __sparc_utrap_gen.S __sparc_utrap_install.c __sparc_utrap_setup.c + +CFLAGS+= -I${.CURDIR}/sparc64/fpu MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S ==== //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap.c#7 (text+ko) ==== @@ -32,8 +32,11 @@ #include #include +#include +#include #include #include +#include #include "__sparc_utrap_private.h" @@ -77,23 +80,56 @@ void __sparc_utrap(struct utrapframe *uf) { + int sig; switch (uf->uf_type) { case UT_FP_EXCEPTION_IEEE_754: case UT_FP_EXCEPTION_OTHER: - __fpu_exception(uf); - UF_DONE(uf); - return; + sig = __fpu_exception(uf); + break; case UT_ILLEGAL_INSTRUCTION: + sig = __emul_insn(uf); + break; case UT_MEM_ADDRESS_NOT_ALIGNED: break; - case UT_TRAP_INSTRUCTION_16: - UF_DONE(uf); - return; default: break; } - printf("__sparc_utrap: type=%s pc=%#lx npc=%#lx\n", - utrap_msg[uf->uf_type], uf->uf_pc, uf->uf_npc); - abort(); + if (sig) { + __utrap_write("__sparc_utrap: fatal "); + __utrap_write(utrap_msg[uf->uf_type]); + __utrap_write("\n"); + __utrap_kill_self(sig); + /* NOTREACHED */ + } + UF_DONE(uf); +} + +void +__utrap_write(const char *str) +{ + int berrno; + + berrno = errno; + __sys_write(STDERR_FILENO, str, strlen(str)); + errno = berrno; +} + +void +__utrap_kill_self(sig) +{ + int berrno; + + berrno = errno; + __sys_kill(__sys_getpid(), sig); + errno = berrno; +} + +void +__utrap_panic(const char *msg) +{ + + __utrap_write(msg); + __utrap_write("\n"); + __utrap_kill_self(SIGKILL); } ==== //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_private.h#6 (text+ko) ==== @@ -50,6 +50,16 @@ extern char __sparc_utrap_fp_disabled[]; extern char __sparc_utrap_gen[]; +int __emul_insn(struct utrapframe *uf); +u_long __emul_fetch_reg(struct utrapframe *uf, int reg); +void __emul_store_reg(struct utrapframe *uf, int reg, u_long val); +u_long __emul_f3_op2(struct utrapframe *uf, u_int insn); +u_long __emul_f3_memop_addr(struct utrapframe *uf, u_int insn); + void __sparc_utrap(struct utrapframe *); +void __utrap_write(const char *); +void __utrap_kill_self(int); +void __utrap_panic(const char *); + #endif ==== //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_setup.c#5 (text+ko) ==== @@ -40,8 +40,8 @@ { UT_FP_DISABLED, __sparc_utrap_fp_disabled, NULL, NULL, NULL }, { UT_FP_EXCEPTION_IEEE_754, __sparc_utrap_gen, NULL, NULL, NULL }, { UT_FP_EXCEPTION_OTHER, __sparc_utrap_gen, NULL, NULL, NULL }, + { UT_ILLEGAL_INSTRUCTION, __sparc_utrap_gen, NULL, NULL, NULL }, #if 0 - { UT_ILLEGAL_INSTRUCTION, __sparc_utrap_gen, NULL, NULL, NULL }, { UT_MEM_ADDRESS_NOT_ALIGNED, __sparc_utrap_gen, NULL, NULL, NULL }, #endif { UT_TRAP_INSTRUCTION_16, __sparc_utrap_gen, NULL, NULL, NULL }, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Apr 26 20:39:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEB1B37B423; Fri, 26 Apr 2002 20:39:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1B8BD37B404 for ; Fri, 26 Apr 2002 20:39:21 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3R3dKb94869 for perforce@freebsd.org; Fri, 26 Apr 2002 20:39:20 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Fri, 26 Apr 2002 20:39:20 -0700 (PDT) Message-Id: <200204270339.g3R3dKb94869@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10344 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10344 Change 10344 by jake@jake_sparc64 on 2002/04/26 20:39:01 Remove test code; we don't use utrap 16 for anything. Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_setup.c#6 edit Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_setup.c#6 (text+ko) ==== @@ -44,7 +44,6 @@ #if 0 { UT_MEM_ADDRESS_NOT_ALIGNED, __sparc_utrap_gen, NULL, NULL, NULL }, #endif - { UT_TRAP_INSTRUCTION_16, __sparc_utrap_gen, NULL, NULL, NULL }, }; static const struct sparc_utrap_install_args uia[] = { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 27 15: 8:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F5BB37B417; Sat, 27 Apr 2002 15:08:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5F92F37B404 for ; Sat, 27 Apr 2002 15:08:09 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3RM89871527 for perforce@freebsd.org; Sat, 27 Apr 2002 15:08:09 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sat, 27 Apr 2002 15:08:09 -0700 (PDT) Message-Id: <200204272208.g3RM89871527@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10375 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10375 Change 10375 by jake@jake_sparc64 on 2002/04/27 15:08:08 Add code to emulate operations on long doubles. GCC generates calls to these functions when configured without HARD_QUAD or with the -msoft-quad-float flag. It sometimes has problems with long doubles otherwise. Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/fpu/Makefile.inc#5 edit ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_qp.c#1 add Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/Makefile.inc#5 (text+ko) ==== @@ -5,4 +5,4 @@ CFLAGS+= -I${.CURDIR}/sparc64/sys SRCS+= fpu.c fpu_add.c fpu_compare.c fpu_div.c fpu_explode.c fpu_implode.c \ - fpu_mul.c fpu_reg.S fpu_sqrt.c fpu_subr.c + fpu_mul.c fpu_qp.c fpu_reg.S fpu_sqrt.c fpu_subr.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Apr 27 22:51:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95D9A37B41C; Sat, 27 Apr 2002 22:51:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D540F37B41B for ; Sat, 27 Apr 2002 22:51:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3S5pjb55197 for perforce@freebsd.org; Sat, 27 Apr 2002 22:51:45 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 27 Apr 2002 22:51:45 -0700 (PDT) Message-Id: <200204280551.g3S5pjb55197@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 10391 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10391 Change 10391 by marcel@marcel_vaio on 2002/04/27 22:51:29 Draft implementation of ptrace_set_pc and ptrace_single_step. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#30 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#30 (text+ko) ==== @@ -1125,15 +1125,33 @@ int ptrace_set_pc(struct thread *td, unsigned long addr) { - /* TODO set pc in trapframe */ - return 0; + uint64_t slot; + + switch (addr & 0xFUL) { + case 0: + slot = IA64_PSR_RI_0; + break; + case 1: + /* XXX we need to deal with MLX bundles here */ + slot = IA64_PSR_RI_1; + break; + case 2: + slot = IA64_PSR_RI_2; + break; + default: + return (EINVAL); + } + + td->td_frame->tf_cr_iip = addr & ~0x0FULL; + td->td_frame->tf_cr_ipsr = (tf_cr_ipsr & ~IA64_PSR_RI) | slot; + return (0); } int ptrace_single_step(struct thread *td) { - /* TODO arrange for user process to single step */ - return 0; + td->td_frame->tf_cr_ipsr |= IA64_PSR_SS; + return (0); } int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 28 11:20:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFAAE37B41A; Sun, 28 Apr 2002 11:20:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7C6EC37B404 for ; Sun, 28 Apr 2002 11:20:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3SIK8x15222 for perforce@freebsd.org; Sun, 28 Apr 2002 11:20:08 -0700 (PDT) (envelope-from tmm@freebsd.org) Date: Sun, 28 Apr 2002 11:20:08 -0700 (PDT) Message-Id: <200204281820.g3SIK8x15222@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 10406 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10406 Change 10406 by tmm@tmm_sparc64 on 2002/04/28 11:19:17 Add a support macro to convert the 5-bit packed register field of a floating point instruction into a 6-bit register number for double and quad arguments. Affected files ... ... //depot/projects/sparc64/sys/sparc64/include/instr.h#8 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/include/instr.h#8 (text+ko) ==== @@ -459,6 +459,9 @@ #define INSFP2_FCMP 0x050 /* s, d, q */ #define INSFP2_FCMPE 0x054 /* s, d, q */ +/* Decode 5-bit register field into 6-bit number (for doubles and quads). */ +#define INSFPdq_RN(rn) (((rn) & ~1) | (((rn) & 1) << 5)) + /* IMPLDEP1 for Sun UltraSparc */ #define IIDP1_EDGE8 0x00 #define IIDP1_EDGE8L 0x02 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 28 11:26: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B266437B419; Sun, 28 Apr 2002 11:25:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 80B5637B404 for ; Sun, 28 Apr 2002 11:25:15 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3SIPFg16454 for perforce@freebsd.org; Sun, 28 Apr 2002 11:25:15 -0700 (PDT) (envelope-from tmm@freebsd.org) Date: Sun, 28 Apr 2002 11:25:15 -0700 (PDT) Message-Id: <200204281825.g3SIPFg16454@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 10407 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10407 Change 10407 by tmm@tmm_forge on 2002/04/28 11:24:19 Make use of the new INSFPdq_RN macro where apporpriate; this is required for correctly handling the "high" fp registers (>= %f32). Fix a number of bugs related to the handling of the high registers which were caused by using __fpu_[gs]etreg() where __fpu_[gs]etreg64() should be used (the former can only access the low, single-precision, registers). Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#11 edit ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_explode.c#6 edit ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_emul.c#2 edit Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#11 (text+ko) ==== @@ -186,24 +186,62 @@ } #endif +static int opmask[] = {0, 0, 1, 3}; + +/* Decode 5 bit register field depending on the type. */ +#define RN_DECODE(tp, rn) \ + ((tp == FTYPE_DBL || tp == FTYPE_EXT ? INSFPdq_RN((rn)) : (rn)) & \ + ~opmask[tp]) + +/* Operand size in 32-bit registers. */ +#define OPSZ(tp) ((tp) == FTYPE_LNG ? 2 : (1 << (tp))) + +/* + * Helper for forming the below case statements. Build only the op3 and opf + * field of the instruction, these are the only ones that need to match. + */ +#define FOP(op3, opf) \ + ((op3) << IF_F3_OP3_SHIFT | (opf) << IF_F3_OPF_SHIFT) + +/* + * Implement a move operation for all supported operand types. The additional + * nand and xor parameters will be applied to the upper 32 bit word of the + * source operand. This allows to implement fabs and fneg (for fp operands + * only!) using this functions, too, by passing (1 << 31) for one of the + * parameters, and 0 for the other. + */ static void -__fpu_mov(struct fpemu *fe, int type, int rd, int rs1, int rs2) +__fpu_mov(struct fpemu *fe, int type, int rd, int rs2, u_int32_t nand, + u_int32_t xor) { + u_int64_t tmp64; + u_int32_t *p32; int i; - i = 1 << type; - __fpu_setreg(rd++, rs1); - while (--i) - __fpu_setreg(rd++, __fpu_getreg(++rs2)); + if (type == FTYPE_INT || type == FTYPE_SNG) + __fpu_setreg(rd, (__fpu_getreg(rs2) & ~nand) ^ xor); + else { + /* + * Need to use the double versions to be able to access + * the upper 32 fp registers. + */ + for (i = 0; i < OPSZ(type); i += 2, rd += 2, rs2 += 2) { + tmp64 = __fpu_getreg64(rs2); + if (i == 0) + tmp64 = (tmp64 & ~((u_int64_t)nand << 32)) ^ + ((u_int64_t)xor << 32); + __fpu_setreg64(rd, tmp64); + } + } } static __inline void -__fpu_ccmov(struct fpemu *fe, int type, int rd, int rs1, int rs2, +__fpu_ccmov(struct fpemu *fe, int type, int rd, int rs2, u_int32_t insn, int fcc) { if (IF_F4_COND(insn) == fcc) - __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); + __fpu_mov(fe, type, rd, rs2, 0, 0); } static int @@ -230,16 +268,7 @@ return (0); } -static int opmask[] = {0, 0, 1, 3}; - /* - * Helper for forming the below case statements. Build only the op3 and opf - * field of the instruction, these are the only that need to match. - */ -#define FOP(op3, opf) \ - ((op3) << IF_F3_OP3_SHIFT | (opf) << IF_F3_OPF_SHIFT) - -/* * Execute an FPU instruction (one that runs entirely in the FPU; not * FBfcc or STF, for instance). On return, fe->fe_fs->fs_fsr will be * modified to reflect the setting the hardware would have left. @@ -254,6 +283,7 @@ int opf, rs1, rs2, rd, type, mask, cx, cond; u_long reg, fsr; u_int space[4]; + int i; /* * `Decode' and execute instruction. Start with no exceptions. @@ -263,13 +293,12 @@ opf = insn & (IF_MASK(IF_F3_OP3_SHIFT, IF_F3_OP3_BITS) | IF_MASK(IF_F3_OPF_SHIFT + 2, IF_F3_OPF_BITS - 2)); type = IF_F3_OPF(insn) & 3; - mask = opmask[type]; - rs1 = IF_F3_RS1(insn) & ~mask; - rs2 = IF_F3_RS2(insn) & ~mask; - rd = IF_F3_RD(insn) & ~mask; + rs1 = RN_DECODE(type, IF_F3_RS1(insn)); + rs2 = RN_DECODE(type, IF_F3_RS2(insn)); + rd = RN_DECODE(type, IF_F3_RD(insn)); cond = 0; #ifdef notdef - if ((rs1 | rs2 | rd) & mask) + if ((rs1 | rs2 | rd) & opmask[type]) return (SIGILL); #endif fsr = fe->fe_fsr; @@ -277,58 +306,54 @@ fe->fe_cx = 0; switch (opf) { case FOP(INS2_FPop2, INSFP2_FMOV_CC(IFCC_FCC(0))): - __fpu_ccmov(fe, type, rd, __fpu_getreg(rs2), rs2, insn, - FSR_GET_FCC0(fsr)); + __fpu_ccmov(fe, type, rd, rs2, insn, FSR_GET_FCC0(fsr)); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_CC(IFCC_FCC(1))): - __fpu_ccmov(fe, type, rd, __fpu_getreg(rs2), rs2, insn, - FSR_GET_FCC1(fsr)); + __fpu_ccmov(fe, type, rd, rs2, insn, FSR_GET_FCC1(fsr)); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_CC(IFCC_FCC(2))): - __fpu_ccmov(fe, type, rd, __fpu_getreg(rs2), rs2, insn, - FSR_GET_FCC2(fsr)); + __fpu_ccmov(fe, type, rd, rs2, insn, FSR_GET_FCC2(fsr)); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_CC(IFCC_FCC(3))): - __fpu_ccmov(fe, type, rd, __fpu_getreg(rs2), rs2, insn, - FSR_GET_FCC3(fsr)); + __fpu_ccmov(fe, type, rd, rs2, insn, FSR_GET_FCC3(fsr)); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_CC(IFCC_ICC)): - __fpu_ccmov(fe, type, rd, __fpu_getreg(rs2), rs2, insn, + __fpu_ccmov(fe, type, rd, rs2, insn, (tstate & TSTATE_ICC_MASK) >> TSTATE_ICC_SHIFT); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_CC(IFCC_XCC)): - __fpu_ccmov(fe, type, rd, __fpu_getreg(rs2), rs2, insn, + __fpu_ccmov(fe, type, rd, rs2, insn, (tstate & TSTATE_XCC_MASK) >> (TSTATE_XCC_SHIFT)); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_Z)): reg = __emul_fetch_reg(uf, IF_F4_RS1(insn)); if (reg == 0) - __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); + __fpu_mov(fe, type, rd, rs2, 0, 0); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_LEZ)): reg = __emul_fetch_reg(uf, IF_F4_RS1(insn)); if (reg <= 0) - __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); + __fpu_mov(fe, type, rd, rs2, 0, 0); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_LZ)): reg = __emul_fetch_reg(uf, IF_F4_RS1(insn)); if (reg < 0) - __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); + __fpu_mov(fe, type, rd, rs2, 0, 0); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_NZ)): reg = __emul_fetch_reg(uf, IF_F4_RS1(insn)); if (reg != 0) - __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); + __fpu_mov(fe, type, rd, rs2, 0, 0); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_GZ)): reg = __emul_fetch_reg(uf, IF_F4_RS1(insn)); if (reg > 0) - __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); + __fpu_mov(fe, type, rd, rs2, 0, 0); return (0); case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_GEZ)): reg = __emul_fetch_reg(uf, IF_F4_RS1(insn)); if (reg >= 0) - __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); + __fpu_mov(fe, type, rd, rs2, 0, 0); return (0); case FOP(INS2_FPop2, INSFP2_FCMP): __fpu_explode(fe, &fe->fe_f1, type, rs1); @@ -341,13 +366,13 @@ __fpu_compare(fe, 1, IF_F3_CC(insn)); return (__fpu_cmpck(fe)); case FOP(INS2_FPop1, INSFP1_FMOV): /* these should all be pretty obvious */ - __fpu_mov(fe, type, rd, __fpu_getreg(rs2), rs2); + __fpu_mov(fe, type, rd, rs2, 0, 0); return (0); case FOP(INS2_FPop1, INSFP1_FNEG): - __fpu_mov(fe, type, rd, __fpu_getreg(rs2) ^ (1 << 31), rs2); + __fpu_mov(fe, type, rd, rs2, 0, (1 << 31)); return (0); case FOP(INS2_FPop1, INSFP1_FABS): - __fpu_mov(fe, type, rd, __fpu_getreg(rs2) & ~(1 << 31), rs2); + __fpu_mov(fe, type, rd, rs2, (1 << 31), 0); return (0); case FOP(INS2_FPop1, INSFP1_FSQRT): __fpu_explode(fe, &fe->fe_f1, type, rs2); @@ -384,8 +409,7 @@ * Recalculate rd (the old type applied for the source regs * only, the target one has a different size). */ - mask = opmask[type]; - rd = IF_F3_RD(insn) & ~mask; + rd = RN_DECODE(type, IF_F3_RD(insn)); fp = __fpu_mul(fe); break; case FOP(INS2_FPop1, INSFP1_FxTOs): @@ -395,8 +419,7 @@ __fpu_explode(fe, fp = &fe->fe_f1, type, rs2); /* sneaky; depends on instruction encoding */ type = (IF_F3_OPF(insn) >> 2) & 3; - mask = opmask[type]; - rd = IF_F3_RD(insn) & ~mask; + rd = RN_DECODE(type, IF_F3_RD(insn)); break; case FOP(INS2_FPop1, INSFP1_FTOx): __fpu_explode(fe, fp = &fe->fe_f1, type, rs2); @@ -411,8 +434,7 @@ __fpu_explode(fe, fp = &fe->fe_f1, type, rs2); /* sneaky; depends on instruction encoding */ type = (IF_F3_OPF(insn) >> 2) & 3; - mask = opmask[type]; - rd = IF_F3_RD(insn) & ~mask; + rd = RN_DECODE(type, IF_F3_RD(insn)); break; default: return (SIGILL); @@ -438,12 +460,12 @@ fsr |= (cx << FSR_CEXC_SHIFT) | (cx << FSR_AEXC_SHIFT); } fe->fe_fsr = fsr; - __fpu_setreg(rd, space[0]); - if (type >= FTYPE_DBL || type == FTYPE_LNG) { - __fpu_setreg(rd + 1, space[1]); - if (type > FTYPE_DBL) { - __fpu_setreg(rd + 2, space[2]); - __fpu_setreg(rd + 3, space[3]); + if (type == FTYPE_INT || type == FTYPE_SNG) + __fpu_setreg(rd, space[0]); + else { + for (i = 0; i < OPSZ(type); i += 2) { + __fpu_setreg64(rd + i, ((u_int64_t)space[i] << 32) | + space[i + 1]); } } return (0); /* success */ ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_explode.c#6 (text+ko) ==== @@ -248,16 +248,21 @@ struct fpn *fp; int type, reg; { - u_int s; - u_int64_t l; + u_int32_t s, *sp; + u_int64_t l[2]; - l = __fpu_getreg64(reg & ~1); - s = __fpu_getreg(reg); - fp->fp_sign = s >> 31; + if (type == FTYPE_LNG || type == FTYPE_DBL || type == FTYPE_EXT) { + l[0] = __fpu_getreg64(reg & ~1); + sp = (u_int32_t *)l; + fp->fp_sign = sp[0] >> 31; + } else { + s = __fpu_getreg(reg); + fp->fp_sign = s >> 31; + } fp->fp_sticky = 0; switch (type) { case FTYPE_LNG: - s = __fpu_xtof(fp, l); + s = __fpu_xtof(fp, l[0]); break; case FTYPE_INT: @@ -269,13 +274,12 @@ break; case FTYPE_DBL: - s = __fpu_dtof(fp, s, __fpu_getreg(reg + 1)); + s = __fpu_dtof(fp, sp[0], sp[1]); break; case FTYPE_EXT: - s = __fpu_qtof(fp, s, __fpu_getreg(reg + 1), - __fpu_getreg(reg + 2), - __fpu_getreg(reg + 3)); + l[1] = __fpu_getreg64((reg & ~1) + 2); + s = __fpu_qtof(fp, sp[0], sp[1], sp[2], sp[3]); break; default: ==== //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_emul.c#2 (text+ko) ==== @@ -70,15 +70,13 @@ case IOP_LDST: switch (IF_F3_OP3(insn)) { case INS3_LDQF: - rd = IF_F3_RD(insn); - rd = (rd & ~3) | ((rd & 1) << 5); + rd = INSFPdq_RN(IF_F3_RD(insn)); addr = (u_long *)__emul_f3_memop_addr(uf, insn); __fpu_setreg64(rd, addr[0]); __fpu_setreg64(rd + 2, addr[1]); break; case INS3_STQF: - rd = IF_F3_RD(insn); - rd = (rd & ~3) | ((rd & 1) << 5); + rd = INSFPdq_RN(IF_F3_RD(insn)); addr = (u_long *)__emul_f3_memop_addr(uf, insn); addr[0] = __fpu_getreg64(rd); addr[1] = __fpu_getreg64(rd + 2); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 28 20:34:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7933337B419; Sun, 28 Apr 2002 20:34:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9875737B400 for ; Sun, 28 Apr 2002 20:34:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3T3YfP21329 for perforce@freebsd.org; Sun, 28 Apr 2002 20:34:41 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 28 Apr 2002 20:34:41 -0700 (PDT) Message-Id: <200204290334.g3T3YfP21329@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10430 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10430 Change 10430 by jake@jake_sparc64 on 2002/04/28 20:34:31 Add support for an alternate signal trampoline, registered with a system call. Add sysarch(SPARC_SIGTRAMP_INSTALL). Affected files ... ... //depot/projects/sparc64/sys/sparc64/include/proc.h#10 edit ... //depot/projects/sparc64/sys/sparc64/include/sysarch.h#4 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/machdep.c#77 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/sys_machdep.c#12 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#52 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/include/proc.h#10 (text+ko) ==== @@ -52,6 +52,7 @@ struct mdproc { struct md_utrap *md_utrap; + void *md_sigtramp; }; #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/sparc64/sys/sparc64/include/sysarch.h#4 (text+ko) ==== @@ -41,12 +41,18 @@ #define _MACHINE_SYSARCH_H_ #define SPARC_UTRAP_INSTALL 1 +#define SPARC_SIGTRAMP_INSTALL 2 struct sparc_utrap_install_args { int num; const struct sparc_utrap_args *handlers; }; +struct sparc_sigtramp_install_args { + void *sia_new; + void **sia_old; +}; + struct sparc_utrap_args { utrap_entry_t type; utrap_handler_t new_precise; ==== //depot/projects/sparc64/sys/sparc64/sparc64/machdep.c#77 (text+ko) ==== @@ -282,6 +282,7 @@ * Initialize proc0 stuff (p_contested needs to be done early). */ proc_linkup(&proc0, &proc0.p_ksegrp, &proc0.p_kse, &thread0); + proc0.p_md.md_sigtramp = NULL; proc0.p_md.md_utrap = NULL; proc0.p_uarea = (struct user *)uarea0; proc0.p_stats = &proc0.p_uarea->u_stats; @@ -421,7 +422,10 @@ /* NOTREACHED */ } - tf->tf_tpc = PS_STRINGS - *(p->p_sysent->sv_szsigcode); + if (p->p_md.md_sigtramp != NULL) + tf->tf_tpc = (u_long)p->p_md.md_sigtramp; + else + tf->tf_tpc = PS_STRINGS - *(p->p_sysent->sv_szsigcode); tf->tf_tnpc = tf->tf_tpc + 4; tf->tf_sp = (u_long)fp - SPOFF; @@ -583,6 +587,7 @@ u_long sp; /* XXX no cpu_exec */ + td->td_proc->p_md.md_sigtramp = NULL; if ((ut = td->td_proc->p_md.md_utrap) != NULL) { ut->ut_refcnt--; if (ut->ut_refcnt == 0) ==== //depot/projects/sparc64/sys/sparc64/sparc64/sys_machdep.c#12 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include +static int sparc_sigtramp_install(struct thread *td, char *args); static int sparc_utrap_install(struct thread *td, char *args); #ifndef _SYS_SYSPROTO_H_ @@ -51,6 +52,9 @@ error = 0; switch (uap->op) { + case SPARC_SIGTRAMP_INSTALL: + error = sparc_sigtramp_install(td, uap->parms); + break; case SPARC_UTRAP_INSTALL: error = sparc_utrap_install(td, uap->parms); break; @@ -62,6 +66,24 @@ } static int +sparc_sigtramp_install(struct thread *td, char *args) +{ + struct sparc_sigtramp_install_args sia; + struct proc *p; + int error; + + p = td->td_proc; + if ((error = copyin(args, &sia, sizeof(sia))) != 0) + return (error); + if (sia.sia_old != NULL) { + if (suword(sia.sia_old, (long)p->p_md.md_sigtramp) != 0) + return (EFAULT); + } + p->p_md.md_sigtramp = sia.sia_new; + return (0); +} + +static int sparc_utrap_install(struct thread *td, char *args) { struct sparc_utrap_install_args uia; ==== //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#52 (text+ko) ==== @@ -116,6 +116,7 @@ struct proc *p; p = td->td_proc; + p->p_md.md_sigtramp = NULL; if ((ut = p->p_md.md_utrap) != NULL) { ut->ut_refcnt--; if (ut->ut_refcnt == 0) @@ -170,6 +171,7 @@ if ((flags & RFPROC) == 0) return; + p2->p_md.md_sigtramp = td1->td_proc->p_md.md_sigtramp; if ((ut = td1->td_proc->p_md.md_utrap) != NULL) ut->ut_refcnt++; p2->p_md.md_utrap = ut; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 28 20:38:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B077137B405; Sun, 28 Apr 2002 20:38:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F0FA337B41B for ; Sun, 28 Apr 2002 20:38:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3T3cks22138 for perforce@freebsd.org; Sun, 28 Apr 2002 20:38:46 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 28 Apr 2002 20:38:46 -0700 (PDT) Message-Id: <200204290338.g3T3cks22138@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10431 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10431 Change 10431 by jake@jake_sparc64 on 2002/04/28 20:38:43 Add signal trampoline code to libc, add a wrapper for the sysarch. Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/sys/Makefile.inc#14 edit ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#1 add ... //depot/projects/sparc64/lib/libc/sparc64/sys/assym.s#6 edit ... //depot/projects/sparc64/lib/libc/sparc64/sys/sigcode.S#1 add Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/sys/Makefile.inc#14 (text+ko) ==== @@ -1,7 +1,13 @@ # $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.3 2002/01/01 21:59:53 jake Exp $ -SRCS+= __sparc_utrap.c __sparc_utrap_emul.c __sparc_utrap_fp_disabled.S \ - __sparc_utrap_gen.S __sparc_utrap_install.c __sparc_utrap_setup.c +SRCS+= __sparc_sigtramp_setup.c \ + __sparc_utrap.c \ + __sparc_utrap_emul.c \ + __sparc_utrap_fp_disabled.S \ + __sparc_utrap_gen.S \ + __sparc_utrap_install.c \ + __sparc_utrap_setup.c \ + sigcode.S CFLAGS+= -I${.CURDIR}/sparc64/fpu ==== //depot/projects/sparc64/lib/libc/sparc64/sys/assym.s#6 (text+ko) ==== @@ -35,3 +35,5 @@ #define UF_STATE 0xb0 #define UF_FSR 0xb8 #define UF_SIZEOF 0xc0 + +#define SF_UC 0x0 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Apr 28 20:41:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5ADF37B420; Sun, 28 Apr 2002 20:41:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1B08D37B419 for ; Sun, 28 Apr 2002 20:41:51 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3T3foa22537 for perforce@freebsd.org; Sun, 28 Apr 2002 20:41:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 28 Apr 2002 20:41:50 -0700 (PDT) Message-Id: <200204290341.g3T3foa22537@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10432 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10432 Change 10432 by rwatson@rwatson_curry on 2002/04/28 20:41:09 Reduce spurious diff's from main tree -- probably due to mismerges at some point during an integ. Affected files ... ... //depot/projects/trustedbsd/mac/sys/net/if_stf.c#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/net/if_stf.c#14 (text+ko) ==== @@ -585,7 +585,7 @@ sc = (struct stf_softc *)encap_getarg(m); - if (sc == NULL) { + if (sc == NULL || (sc->sc_if.if_flags & IFF_UP) == 0) { m_freem(m); return; } @@ -596,11 +596,6 @@ mac_create_mbuf_from_ifnet(ifp, m); #endif - if (ifp->if_flags & IFF_UP) { - m_free(m); - return; - } - /* * perform sanity check against outer src/dst. * for source, perform ingress filter as well. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 11:51:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DDB037B405; Mon, 29 Apr 2002 11:51:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3F60F37B41A for ; Mon, 29 Apr 2002 11:51:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3TIpAd63136 for perforce@freebsd.org; Mon, 29 Apr 2002 11:51:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 29 Apr 2002 11:51:10 -0700 (PDT) Message-Id: <200204291851.g3TIpAd63136@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10466 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10466 Change 10466 by rwatson@rwatson_curry on 2002/04/29 11:50:11 Integ kern_malloc.c stability fix from main tree. Affected files ... ... //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/kern/kern_malloc.c,v 1.100 2002/04/23 18:50:25 phk Exp $ + * $FreeBSD: src/sys/kern/kern_malloc.c,v 1.102 2002/04/29 17:53:23 rwatson Exp $ */ #include "opt_vm.h" @@ -90,7 +90,7 @@ #define KMEM_ZBASE 16 #define KMEM_ZMASK (KMEM_ZBASE - 1) -#define KMEM_ZMAX 8192 +#define KMEM_ZMAX 65536 #define KMEM_ZSIZE (KMEM_ZMAX >> KMEM_ZSHIFT) static u_int8_t kmemsize[KMEM_ZSIZE + 1]; @@ -110,6 +110,9 @@ {2048, "2048", NULL}, {4096, "4096", NULL}, {8192, "8192", NULL}, + {16384, "16384", NULL}, + {32768, "32768", NULL}, + {65536, "65536", NULL}, {0, NULL}, }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 11:51:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0610137B416; Mon, 29 Apr 2002 11:51:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 63B3A37B41C for ; Mon, 29 Apr 2002 11:51:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3TIpAI63141 for perforce@freebsd.org; Mon, 29 Apr 2002 11:51:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 29 Apr 2002 11:51:10 -0700 (PDT) Message-Id: <200204291851.g3TIpAI63141@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10467 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10467 Change 10467 by rwatson@rwatson_curry on 2002/04/29 11:50:48 Integ kern_malloc.c stability fix to MAC branch from TrustedBSD base branch. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#8 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/kern/kern_malloc.c,v 1.100 2002/04/23 18:50:25 phk Exp $ + * $FreeBSD: src/sys/kern/kern_malloc.c,v 1.102 2002/04/29 17:53:23 rwatson Exp $ */ #include "opt_vm.h" @@ -91,7 +91,7 @@ #define KMEM_ZBASE 16 #define KMEM_ZMASK (KMEM_ZBASE - 1) -#define KMEM_ZMAX 8192 +#define KMEM_ZMAX 65536 #define KMEM_ZSIZE (KMEM_ZMAX >> KMEM_ZSHIFT) static u_int8_t kmemsize[KMEM_ZSIZE + 1]; @@ -111,6 +111,9 @@ {2048, "2048", NULL}, {4096, "4096", NULL}, {8192, "8192", NULL}, + {16384, "16384", NULL}, + {32768, "32768", NULL}, + {65536, "65536", NULL}, {0, NULL}, }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 12: 1:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6073237B41C; Mon, 29 Apr 2002 12:01:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0EB3E37B41B for ; Mon, 29 Apr 2002 12:01:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3TJ1M264759 for perforce@freebsd.org; Mon, 29 Apr 2002 12:01:22 -0700 (PDT) (envelope-from green@freebsd.org) Date: Mon, 29 Apr 2002 12:01:22 -0700 (PDT) Message-Id: <200204291901.g3TJ1M264759@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 10468 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10468 Change 10468 by green@green_laptop_2 on 2002/04/29 12:01:10 Prefer "${.OBJDIR}" in Makefiles instead of ".". Affected files ... ... //depot/projects/trustedbsd/mac/sbin/sebsd_checkpolicy/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/sebsd_checkpolicy/Makefile#3 (text+ko) ==== @@ -10,7 +10,7 @@ CFLAGS+=-I${.CURDIR}/../../sys/security/sebsd/ss CFLAGS+=-I${.CURDIR}/../../sys/security/sebsd CFLAGS+=-I${.CURDIR}/../../sys -CFLAGS+=-I. +CFLAGS+=-I${.OBJDIR} LDADD+= -lfl To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 12:55:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5364637B404; Mon, 29 Apr 2002 12:55:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 49EE537B425 for ; Mon, 29 Apr 2002 12:55:30 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3TJtUG79595 for perforce@freebsd.org; Mon, 29 Apr 2002 12:55:30 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Mon, 29 Apr 2002 12:55:30 -0700 (PDT) Message-Id: <200204291955.g3TJtUG79595@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 10471 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10471 Change 10471 by cvance@cvance_korben on 2002/04/29 12:55:08 Add a sample SEBSD policy. For use in testing the policy compilation tools. Still NO kernel enforcement. Affected files ... ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/policy.conf#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 13: 2:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2DE937B416; Mon, 29 Apr 2002 13:01:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AD6CB37B417 for ; Mon, 29 Apr 2002 13:00:48 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3TK0ab86224 for perforce@freebsd.org; Mon, 29 Apr 2002 13:00:36 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Mon, 29 Apr 2002 13:00:36 -0700 (PDT) Message-Id: <200204292000.g3TK0ab86224@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 10472 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10472 Change 10472 by jhb@jhb_laptop on 2002/04/29 13:00:17 IFC. Affected files ... ... //depot/projects/smpng/sys/Makefile#2 integrate ... //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#3 integrate ... //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#3 integrate ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#43 integrate ... //depot/projects/smpng/sys/alpha/alpha/pmap.c#30 integrate ... //depot/projects/smpng/sys/alpha/alpha/trap.c#31 integrate ... //depot/projects/smpng/sys/alpha/conf/GENERIC#17 integrate ... //depot/projects/smpng/sys/alpha/include/pmap.h#9 integrate ... //depot/projects/smpng/sys/alpha/isa/isa_dma.c#2 integrate ... //depot/projects/smpng/sys/alpha/pci/lca.c#4 integrate ... //depot/projects/smpng/sys/alpha/pci/lca_pci.c#4 integrate ... //depot/projects/smpng/sys/alpha/pci/tsunami_pci.c#3 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/arch/ia64/start.S#4 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/elf_freebsd.c#6 integrate ... //depot/projects/smpng/sys/boot/forth/loader.conf#8 integrate ... //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/i386/loader/Makefile#6 integrate ... //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/pc98/loader/Makefile#5 integrate ... //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#2 integrate ... //depot/projects/smpng/sys/cam/cam_xpt.c#8 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_all.c#8 integrate ... //depot/projects/smpng/sys/coda/coda_subr.c#4 integrate ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#21 integrate ... //depot/projects/smpng/sys/conf/NOTES#7 integrate ... //depot/projects/smpng/sys/conf/files#36 integrate ... //depot/projects/smpng/sys/conf/files.ia64#14 integrate ... //depot/projects/smpng/sys/conf/kern.post.mk#8 integrate ... //depot/projects/smpng/sys/conf/kmod.mk#8 integrate ... //depot/projects/smpng/sys/conf/kmod_syms.awk#3 integrate ... //depot/projects/smpng/sys/conf/options#21 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#2 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#6 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.c#7 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.c#5 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#4 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_log.c#5 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#7 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.h#4 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.c#6 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.c#5 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.h#4 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ipl.h#4 integrate ... //depot/projects/smpng/sys/crypto/des/podd.h#2 integrate ... //depot/projects/smpng/sys/crypto/des/sk.h#2 integrate ... //depot/projects/smpng/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate ... //depot/projects/smpng/sys/dev/aac/aac.c#13 integrate ... //depot/projects/smpng/sys/dev/aac/aac_cam.c#1 branch ... //depot/projects/smpng/sys/dev/aac/aac_cam.h#1 branch ... //depot/projects/smpng/sys/dev/aac/aac_disk.c#10 integrate ... //depot/projects/smpng/sys/dev/aac/aac_pci.c#13 integrate ... //depot/projects/smpng/sys/dev/aac/aacreg.h#7 integrate ... //depot/projects/smpng/sys/dev/aac/aacvar.h#11 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi.c#25 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#7 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#2 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7770.c#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#7 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.h#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.reg#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.seq#4 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_93cx6.c#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_freebsd.c#3 delete ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_freebsd.h#3 delete ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_inline.h#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_pci.c#4 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.h#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_gram.y#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#1 branch ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#1 branch ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_scan.l#4 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#3 integrate ... //depot/projects/smpng/sys/dev/ata/ata-all.h#9 integrate ... //depot/projects/smpng/sys/dev/ata/ata-disk.c#18 integrate ... //depot/projects/smpng/sys/dev/ata/ata-dma.c#21 integrate ... //depot/projects/smpng/sys/dev/ata/ata-isa.c#5 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-all.c#12 integrate ... //depot/projects/smpng/sys/dev/awi/awi.c#7 integrate ... //depot/projects/smpng/sys/dev/awi/awi_wep.c#7 integrate ... //depot/projects/smpng/sys/dev/awi/awi_wicfg.c#7 integrate ... //depot/projects/smpng/sys/dev/bge/if_bge.c#11 integrate ... //depot/projects/smpng/sys/dev/digi/digi.c#14 integrate ... //depot/projects/smpng/sys/dev/digi/digi_isa.c#5 integrate ... //depot/projects/smpng/sys/dev/drm/drm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drmP.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_agpsupport.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_auth.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_bufs.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_context.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_dma.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_drawable.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_drv.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_fops.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_init.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_ioctl.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_linux.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_lists.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_lock.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_memory.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_scatter.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_sysctl.h#1 branch ... //depot/projects/smpng/sys/dev/drm/drm_vm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/gamma.h#1 branch ... //depot/projects/smpng/sys/dev/drm/gamma_dma.c#1 branch ... //depot/projects/smpng/sys/dev/drm/gamma_drv.c#1 branch ... //depot/projects/smpng/sys/dev/drm/gamma_drv.h#1 branch ... //depot/projects/smpng/sys/dev/drm/i810_drm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/mga.h#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_dma.c#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_drm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_drv.c#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_drv.h#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_state.c#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_ucode.h#1 branch ... //depot/projects/smpng/sys/dev/drm/mga_warp.c#1 branch ... //depot/projects/smpng/sys/dev/drm/r128.h#1 branch ... //depot/projects/smpng/sys/dev/drm/r128_cce.c#1 branch ... //depot/projects/smpng/sys/dev/drm/r128_drm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/r128_drv.c#1 branch ... //depot/projects/smpng/sys/dev/drm/r128_drv.h#1 branch ... //depot/projects/smpng/sys/dev/drm/r128_state.c#1 branch ... //depot/projects/smpng/sys/dev/drm/radeon.h#1 branch ... //depot/projects/smpng/sys/dev/drm/radeon_cp.c#1 branch ... //depot/projects/smpng/sys/dev/drm/radeon_drm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/radeon_drv.c#1 branch ... //depot/projects/smpng/sys/dev/drm/radeon_drv.h#1 branch ... //depot/projects/smpng/sys/dev/drm/radeon_state.c#1 branch ... //depot/projects/smpng/sys/dev/drm/sis_drm.h#1 branch ... //depot/projects/smpng/sys/dev/drm/tdfx.h#1 branch ... //depot/projects/smpng/sys/dev/drm/tdfx_drv.c#1 branch ... //depot/projects/smpng/sys/dev/em/if_em.c#6 integrate ... //depot/projects/smpng/sys/dev/gem/if_gem.c#4 integrate ... //depot/projects/smpng/sys/dev/gx/if_gx.c#6 integrate ... //depot/projects/smpng/sys/dev/hea/eni.c#3 integrate ... //depot/projects/smpng/sys/dev/hea/eni_buffer.c#4 integrate ... //depot/projects/smpng/sys/dev/hea/eni_transmit.c#2 integrate ... //depot/projects/smpng/sys/dev/hea/eni_vcm.c#3 integrate ... //depot/projects/smpng/sys/dev/hfa/fore_command.c#2 integrate ... //depot/projects/smpng/sys/dev/hfa/fore_output.c#3 integrate ... //depot/projects/smpng/sys/dev/hfa/hfa_eisa.c#1 branch ... //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.c#1 branch ... //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.h#1 branch ... //depot/projects/smpng/sys/dev/hfa/hfa_pci.c#1 branch ... //depot/projects/smpng/sys/dev/hfa/hfa_sbus.c#1 branch ... //depot/projects/smpng/sys/dev/hme/if_hme.c#4 integrate ... //depot/projects/smpng/sys/dev/iir/iir.c#2 integrate ... //depot/projects/smpng/sys/dev/iir/iir_ctrl.c#2 integrate ... //depot/projects/smpng/sys/dev/iir/iir_pci.c#3 integrate ... //depot/projects/smpng/sys/dev/isp/isp.c#18 integrate ... //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#11 integrate ... //depot/projects/smpng/sys/dev/isp/isp_inline.h#6 integrate ... //depot/projects/smpng/sys/dev/isp/ispmbox.h#10 integrate ... //depot/projects/smpng/sys/dev/lge/if_lge.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/acphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/amphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/brgphy.c#7 integrate ... //depot/projects/smpng/sys/dev/mii/dcphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/e1000phy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/exphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/inphy.c#3 integrate ... //depot/projects/smpng/sys/dev/mii/lxtphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/mii.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/mii.h#2 integrate ... //depot/projects/smpng/sys/dev/mii/mii_physubr.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/miivar.h#4 integrate ... //depot/projects/smpng/sys/dev/mii/mlphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/nsgphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/nsgphyreg.h#2 integrate ... //depot/projects/smpng/sys/dev/mii/nsphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/pnaphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/pnphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/qsphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/rlphy.c#6 integrate ... //depot/projects/smpng/sys/dev/mii/tdkphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/tlphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/ukphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/ukphy_subr.c#2 integrate ... //depot/projects/smpng/sys/dev/mii/xmphy.c#4 integrate ... //depot/projects/smpng/sys/dev/mly/mly.c#8 integrate ... //depot/projects/smpng/sys/dev/my/if_my.c#2 integrate ... //depot/projects/smpng/sys/dev/nge/if_nge.c#12 integrate ... //depot/projects/smpng/sys/dev/pccbb/pccbb.c#13 integrate ... //depot/projects/smpng/sys/dev/pci/pci.c#11 integrate ... //depot/projects/smpng/sys/dev/ppbus/pps.c#6 integrate ... //depot/projects/smpng/sys/dev/puc/puc.c#4 integrate ... //depot/projects/smpng/sys/dev/puc/pucdata.c#4 integrate ... //depot/projects/smpng/sys/dev/random/harvest.c#4 integrate ... //depot/projects/smpng/sys/dev/sio/sio.c#18 integrate ... //depot/projects/smpng/sys/dev/sound/pci/es137x.c#5 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#8 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/ac97.h#3 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/sound.c#10 integrate ... //depot/projects/smpng/sys/dev/sym/sym_hipd.c#7 integrate ... //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#4 integrate ... //depot/projects/smpng/sys/dev/tx/if_tx.c#1 branch ... //depot/projects/smpng/sys/dev/tx/if_txreg.h#1 branch ... //depot/projects/smpng/sys/dev/tx/if_txvar.h#1 branch ... //depot/projects/smpng/sys/dev/usb/if_aue.c#13 integrate ... //depot/projects/smpng/sys/dev/usb/ohci.c#15 integrate ... //depot/projects/smpng/sys/dev/usb/uhci.c#17 integrate ... //depot/projects/smpng/sys/dev/usb/usb_subr.c#10 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs#18 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs.h#19 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#19 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumio.c#6 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#34 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#6 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#6 integrate ... //depot/projects/smpng/sys/dev/wi/if_wivar.h#7 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.c#4 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.h#3 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs.h#3 integrate ... //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#10 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs.h#8 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_mem.c#7 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#6 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#9 integrate ... //depot/projects/smpng/sys/geom/geom.h#6 integrate ... //depot/projects/smpng/sys/geom/geom_bsd.c#7 integrate ... //depot/projects/smpng/sys/geom/geom_dev.c#6 integrate ... //depot/projects/smpng/sys/geom/geom_disk.c#7 integrate ... //depot/projects/smpng/sys/geom/geom_dump.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_enc.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_slice.c#5 integrate ... //depot/projects/smpng/sys/geom/geom_slice.h#5 integrate ... //depot/projects/smpng/sys/geom/geom_subr.c#5 integrate ... //depot/projects/smpng/sys/i386/conf/GENERIC#19 integrate ... //depot/projects/smpng/sys/i386/i386/autoconf.c#11 integrate ... //depot/projects/smpng/sys/i386/i386/bios.c#9 integrate ... //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#5 integrate ... //depot/projects/smpng/sys/i386/i386/elf_machdep.c#2 integrate ... //depot/projects/smpng/sys/i386/i386/identcpu.c#8 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#37 integrate ... //depot/projects/smpng/sys/i386/i386/mp_clock.c#2 integrate ... //depot/projects/smpng/sys/i386/i386/mp_machdep.c#23 integrate ... //depot/projects/smpng/sys/i386/i386/pmap.c#21 integrate ... //depot/projects/smpng/sys/i386/i386/trap.c#37 integrate ... //depot/projects/smpng/sys/i386/include/pmap.h#7 integrate ... //depot/projects/smpng/sys/i386/include/profile.h#5 integrate ... //depot/projects/smpng/sys/i386/isa/bs/bsif.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/clock.c#15 integrate ... //depot/projects/smpng/sys/i386/isa/isa_dma.c#4 integrate ... //depot/projects/smpng/sys/i386/pci/pci_bus.c#5 integrate ... //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#8 integrate ... //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#4 integrate ... //depot/projects/smpng/sys/ia64/conf/GENERIC#15 integrate ... //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#3 integrate ... //depot/projects/smpng/sys/ia64/ia64/locore.s#12 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#37 integrate ... //depot/projects/smpng/sys/ia64/ia64/mca.c#1 branch ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#28 integrate ... //depot/projects/smpng/sys/ia64/ia64/sal.c#6 integrate ... //depot/projects/smpng/sys/ia64/ia64/swtch.s#9 integrate ... //depot/projects/smpng/sys/ia64/ia64/trap.c#30 integrate ... //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#12 integrate ... //depot/projects/smpng/sys/ia64/include/mca.h#1 branch ... //depot/projects/smpng/sys/ia64/include/pmap.h#7 integrate ... //depot/projects/smpng/sys/ia64/include/sal.h#4 integrate ... //depot/projects/smpng/sys/ia64/isa/isa_dma.c#3 integrate ... //depot/projects/smpng/sys/kern/bus_if.m#3 integrate ... //depot/projects/smpng/sys/kern/init_main.c#17 integrate ... //depot/projects/smpng/sys/kern/init_sysent.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_clock.c#17 integrate ... //depot/projects/smpng/sys/kern/kern_condvar.c#12 integrate ... //depot/projects/smpng/sys/kern/kern_conf.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#25 integrate ... //depot/projects/smpng/sys/kern/kern_environment.c#6 integrate ... //depot/projects/smpng/sys/kern/kern_exec.c#35 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#37 integrate ... //depot/projects/smpng/sys/kern/kern_linker.c#20 integrate ... //depot/projects/smpng/sys/kern/kern_malloc.c#10 integrate ... //depot/projects/smpng/sys/kern/kern_ntptime.c#9 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#28 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#61 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#34 integrate ... //depot/projects/smpng/sys/kern/kern_tc.c#9 integrate ... //depot/projects/smpng/sys/kern/kern_time.c#15 integrate ... //depot/projects/smpng/sys/kern/link_elf.c#12 integrate ... //depot/projects/smpng/sys/kern/makesyscalls.sh#10 integrate ... //depot/projects/smpng/sys/kern/subr_bus.c#9 integrate ... //depot/projects/smpng/sys/kern/subr_disklabel.c#9 integrate ... //depot/projects/smpng/sys/kern/subr_hints.c#3 integrate ... //depot/projects/smpng/sys/kern/subr_mchain.c#4 integrate ... //depot/projects/smpng/sys/kern/subr_prf.c#14 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#45 edit ... //depot/projects/smpng/sys/kern/sys_process.c#16 integrate ... //depot/projects/smpng/sys/kern/syscalls.c#13 integrate ... //depot/projects/smpng/sys/kern/syscalls.master#12 integrate ... //depot/projects/smpng/sys/kern/uipc_mbuf2.c#3 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#19 integrate ... //depot/projects/smpng/sys/kern/uipc_socket2.c#12 integrate ... //depot/projects/smpng/sys/kern/uipc_syscalls.c#17 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#22 integrate ... //depot/projects/smpng/sys/kern/vfs_conf.c#6 integrate ... //depot/projects/smpng/sys/kern/vfs_default.c#6 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#36 integrate ... //depot/projects/smpng/sys/modules/Makefile#26 integrate ... //depot/projects/smpng/sys/modules/aac/Makefile#2 integrate ... //depot/projects/smpng/sys/modules/drm/Makefile#1 branch ... //depot/projects/smpng/sys/modules/drm/gamma/Makefile#1 branch ... //depot/projects/smpng/sys/modules/drm/mga/Makefile#1 branch ... //depot/projects/smpng/sys/modules/drm/r128/Makefile#1 branch ... //depot/projects/smpng/sys/modules/drm/radeon/Makefile#1 branch ... //depot/projects/smpng/sys/modules/drm/tdfx/Makefile#1 branch ... //depot/projects/smpng/sys/modules/hfa/Makefile#1 branch ... //depot/projects/smpng/sys/modules/hfa/eisa/Makefile#1 branch ... //depot/projects/smpng/sys/modules/hfa/hfa/Makefile#1 branch ... //depot/projects/smpng/sys/modules/hfa/pci/Makefile#1 branch ... //depot/projects/smpng/sys/modules/hfa/sbus/Makefile#1 branch ... //depot/projects/smpng/sys/modules/my/Makefile#1 branch ... //depot/projects/smpng/sys/modules/tx/Makefile#4 integrate ... //depot/projects/smpng/sys/modules/udf/Makefile#2 integrate ... //depot/projects/smpng/sys/net/if.c#23 integrate ... //depot/projects/smpng/sys/net/if_faith.c#9 integrate ... //depot/projects/smpng/sys/net/if_gif.c#8 integrate ... //depot/projects/smpng/sys/net/if_media.h#4 integrate ... //depot/projects/smpng/sys/net/if_stf.c#12 integrate ... //depot/projects/smpng/sys/net/if_stf.h#4 integrate ... //depot/projects/smpng/sys/net/net_osdep.c#3 integrate ... //depot/projects/smpng/sys/net/net_osdep.h#6 integrate ... //depot/projects/smpng/sys/net/radix.c#4 integrate ... //depot/projects/smpng/sys/net/rtsock.c#16 integrate ... //depot/projects/smpng/sys/netatm/atm.h#2 integrate ... //depot/projects/smpng/sys/netatm/atm_aal5.c#4 integrate ... //depot/projects/smpng/sys/netatm/atm_cm.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_device.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_if.c#4 integrate ... //depot/projects/smpng/sys/netatm/atm_if.h#3 integrate ... //depot/projects/smpng/sys/netatm/atm_ioctl.h#2 integrate ... //depot/projects/smpng/sys/netatm/atm_proto.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_signal.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_socket.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_subr.c#7 integrate ... //depot/projects/smpng/sys/netatm/atm_sys.h#3 integrate ... //depot/projects/smpng/sys/netatm/atm_usrreq.c#7 integrate ... //depot/projects/smpng/sys/netatm/atm_var.h#5 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_if.c#3 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_input.c#2 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_output.c#2 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_usrreq.c#2 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_vcm.c#2 integrate ... //depot/projects/smpng/sys/netatm/port.h#3 integrate ... //depot/projects/smpng/sys/netatm/sigpvc/sigpvc_if.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_arp.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_cls.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_if.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_kxdr.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_msg.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_proto.c#3 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_util.c#2 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_var.h#3 integrate ... //depot/projects/smpng/sys/netatm/uni/sscop_pdu.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/sscop_subr.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/sscop_upper.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/uniarp.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/uniarp_cache.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/uniarp_output.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/uniip.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_decode.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_if.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_sigmgr_state.c#3 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_subr.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_util.c#2 integrate ... //depot/projects/smpng/sys/netatm/uni/unisig_vc_state.c#3 integrate ... //depot/projects/smpng/sys/netinet/accf_data.c#2 integrate ... //depot/projects/smpng/sys/netinet/accf_http.c#2 integrate ... //depot/projects/smpng/sys/netinet/icmp6.h#3 integrate ... //depot/projects/smpng/sys/netinet/in.h#12 integrate ... //depot/projects/smpng/sys/netinet/in_gif.c#5 integrate ... //depot/projects/smpng/sys/netinet/ip_encap.c#6 integrate ... //depot/projects/smpng/sys/netinet/tcp_input.c#16 integrate ... //depot/projects/smpng/sys/netinet6/ah.h#3 integrate ... //depot/projects/smpng/sys/netinet6/ah_core.c#2 integrate ... //depot/projects/smpng/sys/netinet6/ah_input.c#6 integrate ... //depot/projects/smpng/sys/netinet6/ah_output.c#2 integrate ... //depot/projects/smpng/sys/netinet6/dest6.c#2 integrate ... //depot/projects/smpng/sys/netinet6/esp.h#3 integrate ... //depot/projects/smpng/sys/netinet6/esp_input.c#6 integrate ... //depot/projects/smpng/sys/netinet6/esp_output.c#2 integrate ... //depot/projects/smpng/sys/netinet6/frag6.c#2 integrate ... //depot/projects/smpng/sys/netinet6/icmp6.c#4 integrate ... //depot/projects/smpng/sys/netinet6/in6.c#10 integrate ... //depot/projects/smpng/sys/netinet6/in6.h#5 integrate ... //depot/projects/smpng/sys/netinet6/in6_ifattach.c#3 integrate ... //depot/projects/smpng/sys/netinet6/in6_pcb.c#13 integrate ... //depot/projects/smpng/sys/netinet6/in6_proto.c#2 integrate ... //depot/projects/smpng/sys/netinet6/in6_rmx.c#2 integrate ... //depot/projects/smpng/sys/netinet6/in6_var.h#3 integrate ... //depot/projects/smpng/sys/netinet6/ip6_forward.c#5 integrate ... //depot/projects/smpng/sys/netinet6/ip6_fw.c#6 integrate ... //depot/projects/smpng/sys/netinet6/ip6_fw.h#2 integrate ... //depot/projects/smpng/sys/netinet6/ip6_input.c#14 integrate ... //depot/projects/smpng/sys/netinet6/ip6_mroute.c#5 integrate ... //depot/projects/smpng/sys/netinet6/ip6_mroute.h#2 integrate ... //depot/projects/smpng/sys/netinet6/ip6_output.c#10 integrate ... //depot/projects/smpng/sys/netinet6/ip6protosw.h#4 integrate ... //depot/projects/smpng/sys/netinet6/ipcomp.h#3 integrate ... //depot/projects/smpng/sys/netinet6/ipcomp_core.c#2 integrate ... //depot/projects/smpng/sys/netinet6/ipcomp_input.c#4 integrate ... //depot/projects/smpng/sys/netinet6/ipcomp_output.c#2 integrate ... //depot/projects/smpng/sys/netinet6/ipsec.c#4 integrate ... //depot/projects/smpng/sys/netinet6/ipsec.h#2 integrate ... //depot/projects/smpng/sys/netinet6/nd6.c#7 integrate ... //depot/projects/smpng/sys/netinet6/nd6.h#4 integrate ... //depot/projects/smpng/sys/netinet6/nd6_nbr.c#3 integrate ... //depot/projects/smpng/sys/netinet6/nd6_rtr.c#4 integrate ... //depot/projects/smpng/sys/netinet6/route6.c#2 integrate ... //depot/projects/smpng/sys/netinet6/udp6_output.c#8 integrate ... //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#11 integrate ... //depot/projects/smpng/sys/netkey/key.h#3 integrate ... //depot/projects/smpng/sys/netkey/key_debug.c#5 integrate ... //depot/projects/smpng/sys/netkey/keysock.c#6 integrate ... //depot/projects/smpng/sys/netncp/ncp_nls.h#2 integrate ... //depot/projects/smpng/sys/netsmb/netbios.h#3 integrate ... //depot/projects/smpng/sys/netsmb/smb.h#5 integrate ... //depot/projects/smpng/sys/netsmb/smb_iod.c#5 integrate ... //depot/projects/smpng/sys/netsmb/smb_rq.c#6 integrate ... //depot/projects/smpng/sys/netsmb/smb_subr.c#6 integrate ... //depot/projects/smpng/sys/netsmb/smb_trantcp.c#7 integrate ... //depot/projects/smpng/sys/nfsclient/bootp_subr.c#9 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_node.c#6 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_socket.c#8 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#12 integrate ... //depot/projects/smpng/sys/nfsclient/nfsnode.h#4 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_serv.c#16 integrate ... //depot/projects/smpng/sys/pc98/conf/GENERIC#19 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#33 integrate ... //depot/projects/smpng/sys/pc98/pc98/clock.c#8 integrate ... //depot/projects/smpng/sys/pc98/pc98/isa_dma.c#4 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio.c#19 integrate ... //depot/projects/smpng/sys/pc98/pc98/syscons.c#15 integrate ... //depot/projects/smpng/sys/pci/if_dc.c#15 integrate ... //depot/projects/smpng/sys/pci/if_de.c#2 integrate ... //depot/projects/smpng/sys/pci/if_rl.c#11 integrate ... //depot/projects/smpng/sys/pci/if_rlreg.h#5 integrate ... //depot/projects/smpng/sys/pci/if_sk.c#7 integrate ... //depot/projects/smpng/sys/pci/if_ti.c#11 integrate ... //depot/projects/smpng/sys/pci/if_tx.c#6 delete ... //depot/projects/smpng/sys/pci/if_txvar.h#3 delete ... //depot/projects/smpng/sys/pci/xrpu.c#3 integrate ... //depot/projects/smpng/sys/powerpc/include/frame.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/pcpu.h#3 integrate ... //depot/projects/smpng/sys/powerpc/include/pmap.h#6 integrate ... //depot/projects/smpng/sys/powerpc/include/spr.h#1 branch ... //depot/projects/smpng/sys/powerpc/powerpc/clock.c#5 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#2 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#2 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#13 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/locore.s#7 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#16 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/sigcode.S#1 branch ... //depot/projects/smpng/sys/powerpc/powerpc/swtch.s#10 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#17 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#1 branch ... //depot/projects/smpng/sys/sparc64/conf/GENERIC#12 integrate ... //depot/projects/smpng/sys/sparc64/include/pmap.h#11 integrate ... //depot/projects/smpng/sys/sparc64/include/proc.h#8 integrate ... //depot/projects/smpng/sys/sparc64/include/sysarch.h#2 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#4 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#27 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#7 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#22 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/rwindow.c#6 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/sys_machdep.c#7 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/trap.c#32 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#19 integrate ... //depot/projects/smpng/sys/sys/_types.h#2 integrate ... //depot/projects/smpng/sys/sys/conf.h#14 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#15 integrate ... //depot/projects/smpng/sys/sys/endian.h#1 branch ... //depot/projects/smpng/sys/sys/eventhandler.h#5 integrate ... //depot/projects/smpng/sys/sys/filedesc.h#10 integrate ... //depot/projects/smpng/sys/sys/kenv.h#1 branch ... //depot/projects/smpng/sys/sys/kernel.h#14 integrate ... //depot/projects/smpng/sys/sys/linker.h#6 integrate ... //depot/projects/smpng/sys/sys/linker_set.h#2 integrate ... //depot/projects/smpng/sys/sys/lock.h#15 integrate ... //depot/projects/smpng/sys/sys/malloc.h#8 integrate ... //depot/projects/smpng/sys/sys/mount.h#10 integrate ... //depot/projects/smpng/sys/sys/param.h#21 integrate ... //depot/projects/smpng/sys/sys/poll.h#4 integrate ... //depot/projects/smpng/sys/sys/proc.h#46 integrate ... //depot/projects/smpng/sys/sys/queue.h#5 integrate ... //depot/projects/smpng/sys/sys/socket.h#5 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#17 integrate ... //depot/projects/smpng/sys/sys/syscall.h#13 integrate ... //depot/projects/smpng/sys/sys/syscall.mk#13 integrate ... //depot/projects/smpng/sys/sys/sysproto.h#15 integrate ... //depot/projects/smpng/sys/sys/systm.h#29 integrate ... //depot/projects/smpng/sys/sys/time.h#6 integrate ... //depot/projects/smpng/sys/sys/timepps.h#3 integrate ... //depot/projects/smpng/sys/sys/timetc.h#6 integrate ... //depot/projects/smpng/sys/sys/timex.h#3 integrate ... //depot/projects/smpng/sys/sys/un.h#6 integrate ... //depot/projects/smpng/sys/sys/vnode.h#16 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_vnops.c#5 integrate ... //depot/projects/smpng/sys/vm/pmap.h#7 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#11 integrate ... //depot/projects/smpng/sys/vm/vm_fault.c#8 integrate ... //depot/projects/smpng/sys/vm/vm_glue.c#12 integrate ... //depot/projects/smpng/sys/vm/vm_kern.c#5 integrate ... //depot/projects/smpng/sys/vm/vm_map.c#11 integrate ... //depot/projects/smpng/sys/vm/vm_map.h#6 integrate ... //depot/projects/smpng/sys/vm/vm_meter.c#7 integrate ... //depot/projects/smpng/sys/vm/vm_object.c#10 integrate ... //depot/projects/smpng/sys/vm/vm_object.h#4 integrate ... //depot/projects/smpng/sys/vm/vm_page.c#15 integrate ... //depot/projects/smpng/sys/vm/vm_page.h#7 integrate ... //depot/projects/smpng/sys/vm/vm_pageout.c#11 integrate ... //depot/projects/smpng/sys/vm/vnode_pager.c#13 integrate Differences ... ==== //depot/projects/smpng/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.25 2000/08/24 18:53:09 peter Exp $ +# $FreeBSD: src/sys/Makefile,v 1.26 2002/04/26 17:55:21 ru Exp $ # The boot loader SUBDIR= boot @@ -8,11 +8,6 @@ SUBDIR+=modules .endif -afterdistribute: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${MACHINE}/conf/GENERIC.hints \ - ${DESTDIR}/boot/device.hints - HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` .include ==== //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.13 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.15 2002/04/17 15:32:11 ticso Exp $ */ /* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */ /* @@ -55,7 +55,7 @@ void dec_axppci_33_init(void); static void dec_axppci_33_cons_init(void); -static void dec_axppci_33_intr_map(void *); +static int dec_axppci_33_intr_route (device_t, device_t, int); extern int siocnattach(int, int); extern int siogdbattach(int, int); @@ -93,7 +93,8 @@ platform.iobus = "lca"; platform.cons_init = dec_axppci_33_cons_init; - platform.pci_intr_map = dec_axppci_33_intr_map; + platform.pci_intr_route = dec_axppci_33_intr_route; + platform.pci_intr_map = NULL; lca_init(); @@ -167,16 +168,13 @@ #define SIO_PCIREG_PIRQ_RTCTRL 0x60 /* PIRQ0 Route Control */ -void -dec_axppci_33_intr_map(void *arg) +static int +dec_axppci_33_intr_route(device_t pcib, device_t dev, int pin) { - pcicfgregs *cfg; int pirq; u_int32_t pirqreg; u_int8_t pirqline; - cfg = (pcicfgregs *)arg; - #ifndef DIAGNOSTIC pirq = 0; /* XXX gcc -Wuninitialized */ #endif @@ -185,23 +183,22 @@ * Slot->interrupt translation. Taken from NetBSD. */ - if (cfg->intpin == 0) { + if (pin == 0) { /* No IRQ used. */ - return; + return -1; } - if (cfg->intpin > 4) { - printf("dec_axppci_33_intr_map: bad interrupt pin %d\n", - cfg->intpin); - return; + if (pin > 4) { + printf("dec_axppci_33_intr_route: bad interrupt pin %d\n", pin); + return -1; } - switch (cfg->slot) { + switch (pci_get_slot(dev)) { case 6: /* NCR SCSI */ pirq = 3; break; case 11: /* slot 1 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 0; @@ -214,14 +211,14 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map: bogus PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route: bogus PCI pin %d\n", + pin); #endif }; break; case 12: /* slot 2 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 1; @@ -234,14 +231,14 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map: bogus PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route: bogus PCI pin %d\n", + pin); #endif }; break; case 8: /* slot 3 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 2; @@ -254,33 +251,24 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map bogus: PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route bogus: PCI pin %d\n", + pin); #endif }; break; default: - printf("dec_axppci_33_intr_map: weird device number %d\n", - cfg->slot); - return; + printf("dec_axppci_33_intr_route: weird device number %d\n", + pci_get_slot(dev)); + return -1; } pirqreg = lca_pcib_read_config(0, 0, 7, 0, SIO_PCIREG_PIRQ_RTCTRL, 4); -#if 0 - printf("dec_axppci_33_intr_map: device %d pin %c: pirq %d, reg = %x\n", - device, '@' + cfg->intpin, pirq, pirqreg); -#endif pirqline = (pirqreg >> (pirq * 8)) & 0xff; if ((pirqline & 0x80) != 0) panic("bad pirqline %d",pirqline); pirqline &= 0xf; -#if 0 - printf("dec_axppci_33_intr_map: device %d pin %c: mapped to line %d\n", - device, '@' + cfg->intpin, pirqline); -#endif - - cfg->intline = pirqline; + return(pirqline); } ==== //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#3 (text+ko) ==== @@ -22,7 +22,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/alpha/alpha/elf_machdep.c,v 1.8 2002/02/21 23:34:09 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.9 2002/04/25 01:22:15 marcel Exp $ */ #include @@ -38,13 +38,13 @@ /* Process one elf relocation with addend. */ int -elf_reloc(linker_file_t lf, const void *data, int type, const char *sym) +elf_reloc(linker_file_t lf, const void *data, int type) { Elf_Addr relocbase = (Elf_Addr) lf->address; Elf_Addr *where; Elf_Addr addr; Elf_Addr addend; - Elf_Word rtype; + Elf_Word rtype, symidx; const Elf_Rel *rel; const Elf_Rela *rela; @@ -54,12 +54,14 @@ where = (Elf_Addr *) (relocbase + rel->r_offset); addend = *where; rtype = ELF_R_TYPE(rel->r_info); + symidx = ELF_R_SYM(rel->r_info); break; case ELF_RELOC_RELA: rela = (const Elf_Rela *)data; where = (Elf_Addr *) (relocbase + rela->r_offset); addend = rela->r_addend; rtype = ELF_R_TYPE(rela->r_info); + symidx = ELF_R_SYM(rela->r_info); break; default: panic("elf_reloc: unknown relocation mode %d\n", type); @@ -71,9 +73,8 @@ break; case R_ALPHA_REFQUAD: - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; addr += addend; if (*where != addr) @@ -81,9 +82,8 @@ break; case R_ALPHA_GLOB_DAT: - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; addr += addend; if (*where != addr) @@ -92,9 +92,8 @@ case R_ALPHA_JMP_SLOT: /* No point in lazy binding for kernel modules. */ - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; if (*where != addr) *where = addr; ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#43 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.178 2002/04/13 23:37:10 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.179 2002/04/17 13:06:32 mux Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -834,6 +834,7 @@ printf("Ignoring invalid memory size of '%s'\n", p); else Maxmem = alpha_btop(AllowMem); + freeenv(p); } while (physmem > Maxmem) { @@ -1015,6 +1016,7 @@ boothowto |= RB_VERBOSE; bootverbose = 1; } + freeenv(p); } /* @@ -1025,6 +1027,7 @@ min(sizeof(kernelname), sizeof bootinfo.booted_kernel) - 1); } else if ((p = getenv("kernelname")) != NULL) { strncpy(kernelname, p, sizeof(kernelname) - 1); + freeenv(p); } /* ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#30 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.91 2002/04/15 16:07:52 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.92 2002/04/29 07:43:08 peter Exp $ */ /* @@ -222,7 +222,7 @@ * Given a map and a machine independent protection code, * convert to an alpha protection code. */ -#define pte_prot(m, p) (protection_codes[m == pmap_kernel() ? 0 : 1][p]) +#define pte_prot(m, p) (protection_codes[m == kernel_pmap ? 0 : 1][p]) int protection_codes[2][8]; /* @@ -296,8 +296,7 @@ /* * Statically allocated kernel pmap */ -static struct pmap kernel_pmap_store; -pmap_t kernel_pmap; +struct pmap kernel_pmap_store; vm_offset_t avail_start; /* PA of first available physical page */ vm_offset_t avail_end; /* PA of last available physical page */ @@ -531,13 +530,9 @@ alpha_protection_init(); /* - * The kernel's pmap is statically allocated so we don't have to use - * pmap_create, which is unlikely to work correctly at this part of - * the boot sequence (XXX and which no longer exists). + * Initialize the kernel pmap (which is statically allocated). */ - kernel_pmap = &kernel_pmap_store; kernel_pmap->pm_lev1 = Lev1map; - kernel_pmap->pm_count = 1; kernel_pmap->pm_active = ~0; kernel_pmap->pm_asn[alpha_pal_whami()].asn = 0; kernel_pmap->pm_asn[alpha_pal_whami()].gen = 1; @@ -1356,7 +1351,6 @@ int i; pmap->pm_lev1 = Lev1map; - pmap->pm_count = 1; pmap->pm_ptphint = NULL; pmap->pm_active = 0; for (i = 0; i < MAXCPU; i++) { @@ -1407,7 +1401,6 @@ pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) | PG_V | PG_KRE | PG_KWE; - pmap->pm_count = 1; pmap->pm_ptphint = NULL; pmap->pm_active = 0; for (i = 0; i < MAXCPU; i++) { @@ -1775,39 +1768,9 @@ critical_exit(); } -/* - * Retire the given physical map from service. - * Should only be called if the map contains - * no valid mappings. - */ -void -pmap_destroy(pmap_t pmap) -{ - int count; - if (pmap == NULL) - return; - - count = --pmap->pm_count; - if (count == 0) { - pmap_release(pmap); - panic("destroying a pmap is not yet implemented"); - } -} - -/* - * Add a reference to the specified pmap. - */ -void -pmap_reference(pmap_t pmap) -{ - if (pmap != NULL) { - pmap->pm_count++; - } -} - /*************************************************** -* page management routines. + * page management routines. ***************************************************/ /* @@ -2691,16 +2654,6 @@ { } -/* - * Routine: pmap_kernel - * Function: - * Returns the physical map handle for the kernel. - */ -pmap_t -pmap_kernel() -{ - return (kernel_pmap); -} /* * pmap_zero_page zeros the specified hardware page by ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#31 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.91 2002/04/16 05:56:01 alc Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.92 2002/04/27 09:34:15 alc Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -472,7 +472,6 @@ goto out; } - mtx_lock(&Giant); /* * It is only a kernel address space fault iff: * 1. !user and @@ -515,7 +514,6 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - mtx_unlock(&Giant); goto dopanic; #endif } @@ -531,20 +529,8 @@ ++p->p_lock; PROC_UNLOCK(p); - /* - * Grow the stack if necessary - */ - /* vm_map_growstack fails only if va falls into - * a growable stack region and the stack growth - * fails. It succeeds if va was not within - * a growable stack region, or if the stack - * growth succeeded. - */ - if (vm_map_growstack(p, va) != KERN_SUCCESS) - rv = KERN_FAILURE; - else - /* Fault in the user page: */ - rv = vm_fault(map, va, ftype, + /* Fault in the user page: */ + rv = vm_fault(map, va, ftype, (ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY : VM_FAULT_NORMAL); @@ -559,7 +545,6 @@ */ rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL); } - mtx_unlock(&Giant); if (rv == KERN_SUCCESS) goto out; ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#17 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 13:20:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D29337B41C; Mon, 29 Apr 2002 13:20:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D068A37B416 for ; Mon, 29 Apr 2002 13:20:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3TKKCY92421 for perforce@freebsd.org; Mon, 29 Apr 2002 13:20:12 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Mon, 29 Apr 2002 13:20:12 -0700 (PDT) Message-Id: <200204292020.g3TKKCY92421@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 10474 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10474 Change 10474 by cvance@cvance_korben on 2002/04/29 13:19:26 Change location of SEBSD policy file from /ss_policy to /etc/security/sebsd/ss_policy Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/init.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/init.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ #include #include -char *policyfile = "/ss_policy"; +char *policyfile = "/etc/security/sebsd/ss_policy"; int security_init(void) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 13:21:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C720837B41A; Mon, 29 Apr 2002 13:21:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 867E837B404 for ; Mon, 29 Apr 2002 13:21:14 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3TKLE092675 for perforce@freebsd.org; Mon, 29 Apr 2002 13:21:14 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 29 Apr 2002 13:21:14 -0700 (PDT) Message-Id: <200204292021.g3TKLE092675@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10475 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10475 Change 10475 by jake@jake_sparc64 on 2002/04/29 13:20:47 Install the libc signal trampoline on startup. Affected files ... ... //depot/projects/sparc64/lib/csu/sparc64/crt1.c#8 edit Differences ... ==== //depot/projects/sparc64/lib/csu/sparc64/crt1.c#8 (text+ko) ==== @@ -46,6 +46,7 @@ extern void _init(void); extern void _fini(void); extern int main(int, char **, char **); +extern void __sparc64_sigtramp_setup(void); extern void __sparc64_utrap_setup(void); #ifdef GCRT @@ -99,6 +100,7 @@ __progname = s + 1; } + __sparc_sigtramp_setup(); __sparc_utrap_setup(); #if 0 /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 14: 9:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D18837B400; Mon, 29 Apr 2002 14:09:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3BCA237B404 for ; Mon, 29 Apr 2002 14:09:21 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3TL9KZ02339 for perforce@freebsd.org; Mon, 29 Apr 2002 14:09:20 -0700 (PDT) (envelope-from green@freebsd.org) Date: Mon, 29 Apr 2002 14:09:20 -0700 (PDT) Message-Id: <200204292109.g3TL9KZ02339@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 10478 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10478 Change 10478 by green@green_laptop_2 on 2002/04/29 14:09:16 Install SEBSD example policy files and everything needed to boot an SEBSD kernel after an installation. Affected files ... ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/README#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/policy.conf#2 edit ... //depot/projects/trustedbsd/mac/etc/Makefile#12 edit ... //depot/projects/trustedbsd/mac/etc/mtree/BSD.root.dist#3 edit ... //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#9 edit ... //depot/projects/trustedbsd/mac/share/Makefile#2 edit ... //depot/projects/trustedbsd/mac/share/security/Makefile#1 add ... //depot/projects/trustedbsd/mac/share/security/sebsd/Makefile#1 add Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/policy.conf#2 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/etc/Makefile#12 (text+ko) ==== @@ -97,6 +97,10 @@ (cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${SSL} \ ${DESTDIR}/etc/ssl ) .endif +.if exists(${.CURDIR}/../contrib/sebsd) + (cd ${.CURDIR}/../contrib/sebsd/policy; \ + /sbin/sebsd_checkpolicy -o ${DESTDIR}/etc/security/sebsd/ss_policy) +.endif .if !defined(NO_MAKEDEV_INSTALL) ( cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \ MAKEDEV.local MAKEDEV ${DESTDIR}/dev ) ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.root.dist#3 (text+ko) ==== @@ -54,6 +54,10 @@ .. rc.d .. + security + sebsd + .. + .. skel .. ssh ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#9 (text+ko) ==== @@ -984,6 +984,12 @@ .. .. .. + security + sebsd + policy + .. + .. + .. sendmail .. skel ==== //depot/projects/trustedbsd/mac/share/Makefile#2 (text+ko) ==== @@ -4,7 +4,7 @@ # Do not include `info' in the SUBDIR list, it is handled separately. SUBDIR= colldef dict examples man me misc mk mklocale monetdef \ - msgdef numericdef skel syscons tabset termcap timedef zoneinfo + msgdef numericdef security skel syscons tabset termcap timedef zoneinfo .if !defined(NO_SHAREDOCS) SUBDIR+= doc To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 14:11:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55B5137B400; Mon, 29 Apr 2002 14:11:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 17DF037B41D for ; Mon, 29 Apr 2002 14:11:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3TLBNG02914 for perforce@freebsd.org; Mon, 29 Apr 2002 14:11:23 -0700 (PDT) (envelope-from green@freebsd.org) Date: Mon, 29 Apr 2002 14:11:23 -0700 (PDT) Message-Id: <200204292111.g3TLBNG02914@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 10479 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10479 Change 10479 by green@green_laptop_2 on 2002/04/29 14:10:42 Since we build and install "a" policy now, make SEBSD a default-on option in the MAC kernel config file. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#24 (text+ko) ==== @@ -36,7 +36,7 @@ options MAC_MLS options MAC_NONE options MAC_TE -#options SEBSD #Warning, won't boot without a policy +options SEBSD options INET #InterNETworking options INET6 #IPv6 communications protocols To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 15:37:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38EB337B417; Mon, 29 Apr 2002 15:37:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 63A5837B416 for ; Mon, 29 Apr 2002 15:37:28 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3TMbS717871 for perforce@freebsd.org; Mon, 29 Apr 2002 15:37:28 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 29 Apr 2002 15:37:28 -0700 (PDT) Message-Id: <200204292237.g3TMbS717871@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10487 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10487 Change 10487 by jake@jake_sparc64 on 2002/04/29 15:36:40 Use the elf2aout in the base system. Affected files ... ... //depot/projects/sparc64/sys/boot/sparc64/boot1/Makefile#7 edit Differences ... ==== //depot/projects/sparc64/sys/boot/sparc64/boot1/Makefile#7 (text+ko) ==== @@ -16,7 +16,7 @@ ${LD} -N -Ttext ${BOOTBLOCKBASE} -o ${.TARGET} _start.o boot1.o boot1.aout: boot1.elf - /usr/local/bin/elftoaout -o ${.TARGET} boot1.elf + elf2aout -o ${.TARGET} boot1.elf # Construct boot1. disklabel expects it to contain zeroed-out space for the # label, and to be of the correct size. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 15:41:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FE2837B416; Mon, 29 Apr 2002 15:41:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AE7A337B405 for ; Mon, 29 Apr 2002 15:41:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3TMfX318287 for perforce@freebsd.org; Mon, 29 Apr 2002 15:41:33 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 29 Apr 2002 15:41:33 -0700 (PDT) Message-Id: <200204292241.g3TMfX318287@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10488 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10488 Change 10488 by jake@jake_sparc64 on 2002/04/29 15:41:07 Build elf2aout for sparc64. Affected files ... ... //depot/projects/sparc64/usr.bin/Makefile#21 edit Differences ... ==== //depot/projects/sparc64/usr.bin/Makefile#21 (text+ko) ==== @@ -233,6 +233,10 @@ SUBDIR+=uac .endif +.if ${MACHINE_ARCH} == "sparc64" +SUBDIR+=elf2aout +.endif + .if !defined(NO_RCMNDS) SUBDIR+=rlogin \ rsh To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 15:45:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B346037B404; Mon, 29 Apr 2002 15:45:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D092237B41E for ; Mon, 29 Apr 2002 15:45:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3TMjcM18926 for perforce@freebsd.org; Mon, 29 Apr 2002 15:45:38 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 29 Apr 2002 15:45:38 -0700 (PDT) Message-Id: <200204292245.g3TMjcM18926@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10489 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10489 Change 10489 by jake@jake_sparc64 on 2002/04/29 15:45:10 Don't try to build the gnu startup libs in make libraries. Affected files ... ... //depot/projects/sparc64/Makefile.inc1#10 edit Differences ... ==== //depot/projects/sparc64/Makefile.inc1#10 (text+ko) ==== @@ -733,7 +733,11 @@ # gnu/lib/csu, gnu/lib/libgcc and lib/csu must be built before all # shared libraries for ELF. # +.if ${MACHINE_ARCH} != "sparc64" _startup_libs= gnu/lib/csu gnu/lib/libgcc +.else +_startup_libs= +.endif .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-${OBJFORMAT}) _startup_libs+= lib/csu/${MACHINE_ARCH}-${OBJFORMAT} .else To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 16:54:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8D3537B41D; Mon, 29 Apr 2002 16:53:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3396837B41B for ; Mon, 29 Apr 2002 16:53:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3TNr1l29326 for perforce@freebsd.org; Mon, 29 Apr 2002 16:53:01 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 29 Apr 2002 16:53:01 -0700 (PDT) Message-Id: <200204292353.g3TNr1l29326@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10492 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10492 Change 10492 by jake@jake_sparc64 on 2002/04/29 16:52:22 Integ@10484 Affected files ... ... //depot/projects/sparc64/MAINTAINERS#3 integrate ... //depot/projects/sparc64/Makefile#2 integrate ... //depot/projects/sparc64/Makefile.inc1#11 integrate ... //depot/projects/sparc64/UPDATING#6 integrate ... //depot/projects/sparc64/bin/expr/expr.1#3 integrate ... //depot/projects/sparc64/bin/expr/expr.y#3 integrate ... //depot/projects/sparc64/bin/pax/cpio.1#2 integrate ... //depot/projects/sparc64/bin/pax/pax.1#2 integrate ... //depot/projects/sparc64/bin/pax/tar.1#2 integrate ... //depot/projects/sparc64/bin/realpath/realpath.1#2 integrate ... //depot/projects/sparc64/bin/sh/options.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/config/i386/freebsd.h#3 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/freebsd.h#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/BSD/Makefile#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/BSD/kupgrade#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/FreeBSD-4.0/kinstall#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/HISTORY#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/QNX_OCL.txt#1 branch ... //depot/projects/sparc64/contrib/ipfilter/fils.c#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/ip_sfil.c#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipf.c#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipfs.c#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipsend/ipsend.c#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/ipt.c#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/kmem.c#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/l4check/l4check.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/man/ipmon.8#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/man/ipnat.5#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/misc.c#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/mlf_ipl.c#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/mls_ipl.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/natparse.c#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/printnat.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/printstate.c#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/solaris.c#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/test/Makefile#3 integrate ... //depot/projects/sparc64/contrib/ipfilter/test/expected/f11#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/test/expected/f17#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/expected/in1#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/expected/in2#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/expected/in3#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/expected/in4#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/expected/ipv6.1#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/expected/ipv6.2#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/expected/l1#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/test/expected/l1.b#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/test/expected/ni1#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/test/expected/ni2#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/test/expected/ni4#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/expected/ni5#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/input/f11#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/test/input/f17#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/input/ipv6.2#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/input/ni2#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/test/input/ni4#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/input/ni5#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/intest#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/logtest#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/test/mhtest#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/f11#2 integrate ... //depot/projects/sparc64/contrib/ipfilter/test/regress/f17#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/in1#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/in2#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/in3#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/in4#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/ipv6.2#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/ni4.ipf#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/ni4.nat#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/ni5.ipf#1 branch ... //depot/projects/sparc64/contrib/ipfilter/test/regress/ni5.nat#1 branch ... //depot/projects/sparc64/contrib/lukemftp/src/fetch.c#2 integrate ... //depot/projects/sparc64/contrib/lukemftp/src/ftp.1#2 integrate ... //depot/projects/sparc64/contrib/lukemftp/src/ftp.c#2 integrate ... //depot/projects/sparc64/contrib/lukemftp/src/ftp_var.h#2 integrate ... //depot/projects/sparc64/contrib/lukemftp/src/main.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/FAQ#2 integrate ... //depot/projects/sparc64/contrib/sendmail/FREEBSD-upgrade#6 integrate ... //depot/projects/sparc64/contrib/sendmail/INSTALL#2 integrate ... //depot/projects/sparc64/contrib/sendmail/KNOWNBUGS#3 integrate ... //depot/projects/sparc64/contrib/sendmail/LICENSE#2 integrate ... //depot/projects/sparc64/contrib/sendmail/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/PGPKEYS#2 integrate ... //depot/projects/sparc64/contrib/sendmail/README#2 integrate ... //depot/projects/sparc64/contrib/sendmail/RELEASE_NOTES#3 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/README#3 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/README#3 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/chez.cs.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/clientproto.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/cs-hpux10.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/cs-hpux9.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/cs-osf1.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/cs-solaris2.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/cs-sunos4.1.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/cs-ultrix4.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/cyrusproto.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/generic-bsd4.4.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/generic-hpux10.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/generic-hpux9.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/generic-linux.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/generic-mpeix.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/generic-nextstep3.3.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/generic-osf1.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/generic-solaris.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/generic-sunos4.1.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/generic-ultrix4.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/huginn.cs.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/knecht.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/mail.cs.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/mail.eecs.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/mailspool.cs.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/python.cs.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/s2k-osf1.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/s2k-ultrix4.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/submit.cf#3 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/submit.mc#3 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/tcpproto.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/ucbarpa.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/ucbvax.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/uucpproto.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/cf/vangogh.cs.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/domain/Berkeley.EDU.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/domain/berkeley-only.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/domain/generic.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/accept_unqualified_senders.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/access_db.m4#3 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/allmasquerade.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/always_add_domain.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/authinfo.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/bestmx_is_local.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/bitdomain.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/blacklist_recipients.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/compat_check.m4#3 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/delay_checks.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/dnsbl.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/domaintable.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/enhdnsbl.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/generics_entire_domain.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/genericstable.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/ldap_routing.m4#3 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/limited_masquerade.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/local_lmtp.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/local_no_masquerade.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/local_procmail.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/lookupdotdomain.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/loose_relay_check.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/mailertable.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/masquerade_entire_domain.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/masquerade_envelope.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/msp.m4#3 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/no_default_msa.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/nocanonify.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/nodns.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/notsticky.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/nouucp.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/nullclient.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/preserve_luser_host.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/promiscuous_relay.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/queuegroup.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/redirect.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/relay_based_on_MX.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/relay_entire_domain.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/relay_hosts_only.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/relay_local_from.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/relay_mail_from.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/smrsh.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/stickyhost.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/use_ct_file.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/use_cw_file.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/uucpdomain.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/virtuser_entire_domain.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/feature/virtusertable.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/hack/cssubdomain.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/m4/cf.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/m4/cfhead.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/m4/proto.m4#3 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/m4/version.m4#3 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/mailer/cyrus.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/mailer/fax.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/mailer/local.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/mailer/mail11.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/mailer/phquery.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/mailer/pop.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/mailer/procmail.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/mailer/qpage.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/mailer/smtp.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/mailer/usenet.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/mailer/uucp.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/a-ux.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/aix3.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/aix4.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/aix5.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/altos.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/amdahl-uts.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/bsd4.3.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/bsd4.4.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/bsdi.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/bsdi1.0.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/bsdi2.0.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/darwin.m4#3 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/dgux.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/domainos.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/dynix3.2.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/freebsd4.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/freebsd5.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/gnu.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/hpux10.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/hpux11.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/hpux9.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/irix4.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/irix5.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/irix6.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/isc4.1.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/linux.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/maxion.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/mklinux.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/mpeix.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/nextstep.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/openbsd.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/osf1.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/powerux.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/ptx2.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/qnx.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/riscos4.5.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/sco-uw-2.1.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/sco3.2.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/sinix.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/solaris2.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/solaris2.ml.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/solaris2.pre5.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/solaris8.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/sunos3.5.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/sunos4.1.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/svr4.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/ultrix4.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/unixware7.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/unknown.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/ostype/uxpds.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/sendmail.schema#2 integrate ... //depot/projects/sparc64/contrib/sendmail/cf/sh/makeinfo.sh#2 integrate ... //depot/projects/sparc64/contrib/sendmail/contrib/README#2 integrate ... //depot/projects/sparc64/contrib/sendmail/contrib/bsdi.mc#2 integrate ... //depot/projects/sparc64/contrib/sendmail/contrib/buildvirtuser#3 integrate ... //depot/projects/sparc64/contrib/sendmail/contrib/dnsblaccess.m4#2 integrate ... //depot/projects/sparc64/contrib/sendmail/contrib/link_hash.sh#2 integrate ... //depot/projects/sparc64/contrib/sendmail/contrib/qtool.8#3 integrate ... //depot/projects/sparc64/contrib/sendmail/contrib/qtool.pl#3 integrate ... //depot/projects/sparc64/contrib/sendmail/doc/op/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/doc/op/op.me#3 integrate ... //depot/projects/sparc64/contrib/sendmail/editmap/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/editmap/editmap.8#2 integrate ... //depot/projects/sparc64/contrib/sendmail/editmap/editmap.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/include/libmilter/mfapi.h#3 integrate ... //depot/projects/sparc64/contrib/sendmail/include/libmilter/mfdef.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/libmilter/milter.h#3 integrate ... //depot/projects/sparc64/contrib/sendmail/include/libsmdb/smdb.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sendmail/mailstats.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sendmail/pathnames.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sendmail/sendmail.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/assert.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/bitops.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/cdefs.h#3 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/cf.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/clock.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/conf.h#3 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/config.h#3 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/debug.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/errstring.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/exc.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/fdset.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/gen.h#3 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/heap.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/io.h#3 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/ldap.h#3 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/limits.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/mbdb.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_aix.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_freebsd.h#3 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_hp.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_irix.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_linux.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_mpeix.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_next.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_openbsd.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_openunix.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_osf1.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_sunos.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_ultrix.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/os/sm_os_unixware.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/path.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/rpool.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/setjmp.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/shm.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/signal.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/string.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/sysexits.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/test.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/types.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/varargs.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/include/sm/xtrap.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/README#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/comm.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/docs/index.html#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/docs/overview.html#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/engine.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/handler.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/libmilter.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/listener.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/main.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/signal.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/sm_gethost.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libmilter/smfi.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/README#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/assert.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/assert.html#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/b-strcmp.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/b-strl.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/cdefs.html#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/cf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/clock.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/clrerr.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/config.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/debug.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/debug.html#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/errstring.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/exc.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/exc.html#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fclose.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/feof.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/ferror.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fflush.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fget.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/findfp.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/flags.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fopen.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fpos.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fprintf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fpurge.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fput.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fread.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fscanf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fseek.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fvwrite.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fvwrite.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fwalk.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/fwrite.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/gen.html#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/get.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/glue.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/heap.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/heap.html#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/index.html#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/io.html#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/ldap.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/local.h#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/makebuf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/match.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/mbdb.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/mpeix.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/niprop.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/path.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/put.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/refill.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/rewind.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/rpool.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/rpool.html#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/setvbuf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/shm.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/signal.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/smstdio.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/snprintf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/sscanf.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/stdio.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/strcasecmp.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/strdup.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/strerror.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/strexit.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/string.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/stringf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/strio.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/strl.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/strrevcmp.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/strto.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/syslogio.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-cf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-event.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-exc.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-float.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-fopen.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-heap.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-match.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-path.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-rpool.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-scanf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-shm.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-smstdio.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-string.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-strio.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-strl.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-strrevcmp.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/t-types.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/test.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/ungetc.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/vasprintf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/vfprintf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/vfscanf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/vprintf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/vsnprintf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/vsprintf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/vsscanf.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/wbuf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/wsetup.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsm/xtrap.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmdb/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmdb/smdb.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmdb/smdb1.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmdb/smdb2.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmdb/smndbm.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmutil/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmutil/cf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmutil/debug.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmutil/err.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmutil/lockfile.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmutil/safefile.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/libsmutil/snprintf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/mail.local/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/mail.local/README#2 integrate ... //depot/projects/sparc64/contrib/sendmail/mail.local/mail.local.8#2 integrate ... //depot/projects/sparc64/contrib/sendmail/mail.local/mail.local.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/mailstats/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/mailstats/mailstats.8#3 integrate ... //depot/projects/sparc64/contrib/sendmail/mailstats/mailstats.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/makemap/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/makemap/makemap.8#2 integrate ... //depot/projects/sparc64/contrib/sendmail/makemap/makemap.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/praliases/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/praliases/praliases.8#2 integrate ... //depot/projects/sparc64/contrib/sendmail/praliases/praliases.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/rmail/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/rmail/rmail.8#2 integrate ... //depot/projects/sparc64/contrib/sendmail/rmail/rmail.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/smrsh/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/smrsh/README#2 integrate ... //depot/projects/sparc64/contrib/sendmail/smrsh/smrsh.8#2 integrate ... //depot/projects/sparc64/contrib/sendmail/smrsh/smrsh.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/README#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/SECURITY#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/TRACEFLAGS#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/TUNING#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/alias.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/aliases#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/aliases.5#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/arpadate.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/bf.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/bf.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/collect.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/conf.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/conf.h#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/control.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/convtime.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/daemon.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/deliver.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/domain.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/envelope.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/err.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/helpfile#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/macro.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/mailq.1#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/main.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/map.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/mci.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/milter.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/mime.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/newaliases.1#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/parseaddr.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/queue.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/readcf.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/recipient.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/sasl.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/savemail.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/sendmail.8#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/sendmail.h#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/sfsasl.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/sfsasl.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/shmticklib.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/sm_resolve.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/sm_resolve.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/srvrsmtp.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/stab.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/stats.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/statusd_shm.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/sysexits.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/timers.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/timers.h#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/tls.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/trace.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/udb.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/src/usersmtp.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/util.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/src/version.c#3 integrate ... //depot/projects/sparc64/contrib/sendmail/test/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/test/README#2 integrate ... //depot/projects/sparc64/contrib/sendmail/test/Results#2 integrate ... //depot/projects/sparc64/contrib/sendmail/test/t_dropgid.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/test/t_exclopen.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/test/t_pathconf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/test/t_seteuid.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/test/t_setgid.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/test/t_setreuid.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/test/t_setuid.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/test/t_snprintf.c#2 integrate ... //depot/projects/sparc64/contrib/sendmail/vacation/Makefile#2 integrate ... //depot/projects/sparc64/contrib/sendmail/vacation/vacation.1#3 integrate ... //depot/projects/sparc64/contrib/sendmail/vacation/vacation.c#3 integrate ... //depot/projects/sparc64/contrib/smbfs/CREDITS#2 integrate ... //depot/projects/sparc64/contrib/smbfs/HISTORY#2 integrate ... //depot/projects/sparc64/contrib/smbfs/Makefile.inc#2 integrate ... //depot/projects/sparc64/contrib/smbfs/examples/dot.nsmbrc#2 integrate ... //depot/projects/sparc64/contrib/smbfs/lib/smb/ctx.c#4 integrate ... //depot/projects/sparc64/contrib/smbfs/mount_smbfs/mount_smbfs.8#2 integrate ... //depot/projects/sparc64/contrib/smbfs/mount_smbfs/mount_smbfs.c#2 integrate ... //depot/projects/sparc64/contrib/smbfs/smbutil/smbutil.1#2 integrate ... //depot/projects/sparc64/contrib/smbfs/smbutil/view.c#2 integrate ... //depot/projects/sparc64/crypto/openssh/auth2-pam.c#2 integrate ... //depot/projects/sparc64/crypto/openssh/servconf.c#5 integrate ... //depot/projects/sparc64/crypto/openssh/session.c#6 integrate ... //depot/projects/sparc64/crypto/openssh/sshd_config#4 integrate ... //depot/projects/sparc64/etc/Makefile#5 integrate ... //depot/projects/sparc64/etc/defaults/rc.conf#6 integrate ... //depot/projects/sparc64/etc/mail/Makefile#5 integrate ... //depot/projects/sparc64/etc/mtree/BSD.sendmail.dist#1 branch ... //depot/projects/sparc64/etc/mtree/BSD.usr.dist#4 integrate ... //depot/projects/sparc64/etc/mtree/BSD.var.dist#2 integrate ... //depot/projects/sparc64/etc/nsmb.conf#2 integrate ... //depot/projects/sparc64/etc/pam.d/other#3 integrate ... //depot/projects/sparc64/etc/rc#7 integrate ... //depot/projects/sparc64/etc/rc.d/wscons#2 integrate ... //depot/projects/sparc64/etc/rc.diskless1#2 integrate ... //depot/projects/sparc64/etc/rc.sendmail#1 branch ... //depot/projects/sparc64/etc/rc.serial#2 integrate ... //depot/projects/sparc64/etc/rc.subr#2 integrate ... //depot/projects/sparc64/etc/sendmail/Makefile#4 integrate ... //depot/projects/sparc64/etc/sendmail/rc.sendmail#3 delete ... //depot/projects/sparc64/games/adventure/setup.c#2 integrate ... //depot/projects/sparc64/games/atc/main.c#2 integrate ... //depot/projects/sparc64/games/backgammon/common_source/subs.c#2 integrate ... //depot/projects/sparc64/games/bs/bs.c#2 integrate ... //depot/projects/sparc64/games/canfield/cfscores/cfscores.c#3 integrate ... //depot/projects/sparc64/games/fortune/datfiles/fortunes#3 integrate ... //depot/projects/sparc64/games/fortune/datfiles/fortunes-o.real#2 integrate ... //depot/projects/sparc64/games/fortune/datfiles/fortunes2#2 integrate ... //depot/projects/sparc64/games/fortune/datfiles/fortunes2-o#3 integrate ... //depot/projects/sparc64/games/fortune/datfiles/freebsd-tips#3 integrate ... //depot/projects/sparc64/games/fortune/datfiles/gerrold.limerick#2 integrate ... //depot/projects/sparc64/games/fortune/datfiles/limerick#2 integrate ... //depot/projects/sparc64/games/fortune/datfiles/zippy#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/Makefile.inc#4 integrate ... //depot/projects/sparc64/gnu/usr.bin/man/man/man.c#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/backupfile.c#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/backupfile.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/common.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/getopt.c#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/getopt.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/inp.c#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/inp.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/patch.c#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/pch.c#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/pch.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/util.c#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/util.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/version.c#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/patch/version.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/perl/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/perl/libperl/config.SH-elf.alpha#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/perl/libperl/config.SH-elf.i386#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/perl/libperl/config.SH-elf.ia64#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/perl/libperl/config.SH-elf.sparc64#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/perl/library/Makefile.inc#2 integrate ... //depot/projects/sparc64/include/rpc/clnt.h#3 integrate ... //depot/projects/sparc64/include/rpc/pmap_clnt.h#3 integrate ... //depot/projects/sparc64/include/rpc/svc.h#3 integrate ... //depot/projects/sparc64/include/rpc/xdr.h#3 integrate ... //depot/projects/sparc64/include/rpcsvc/ypclnt.h#3 integrate ... //depot/projects/sparc64/include/stdlib.h#4 integrate ... //depot/projects/sparc64/kerberos5/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/Makefile.inc#2 integrate ... //depot/projects/sparc64/kerberos5/include/version.h#2 integrate ... //depot/projects/sparc64/kerberos5/lib/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/lib/libkrb5/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/lib/libvers/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/libexec/hprop/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/libexec/hpropd/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/libexec/ipropd-master/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/libexec/ipropd-slave/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/libexec/k5admind/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/libexec/k5passwdd/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/libexec/kdc/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/usr.bin/k5admin/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/usr.bin/k5destroy/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/usr.bin/k5init/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/usr.bin/k5list/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/usr.bin/k5passwd/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/usr.bin/k5su/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/usr.sbin/k5stash/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/usr.sbin/ktutil/Makefile#2 integrate ... //depot/projects/sparc64/kerberosIV/Makefile#2 integrate ... //depot/projects/sparc64/kerberosIV/Makefile.inc#2 integrate ... //depot/projects/sparc64/lib/csu/i386-elf/Makefile#4 integrate ... //depot/projects/sparc64/lib/csu/sparc64/crt1.c#9 integrate ... //depot/projects/sparc64/lib/libc/gen/getnetgrent.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/auth_time.c#4 integrate ... //depot/projects/sparc64/lib/libc/rpc/clnt_dg.c#4 integrate ... //depot/projects/sparc64/lib/libc/rpc/clnt_raw.c#4 integrate ... //depot/projects/sparc64/lib/libc/rpc/clnt_vc.c#5 integrate ... //depot/projects/sparc64/lib/libc/rpc/crypt_client.c#4 integrate ... //depot/projects/sparc64/lib/libc/rpc/key_call.c#4 integrate ... //depot/projects/sparc64/lib/libc/rpc/rpc_soc.c#5 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc_dg.c#3 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc_raw.c#4 integrate ... //depot/projects/sparc64/lib/libc/rpc/svc_vc.c#5 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/Makefile.inc#6 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#12 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_add.c#6 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_explode.c#7 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_extern.h#8 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_implode.c#7 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_subr.c#6 integrate ... //depot/projects/sparc64/lib/libc/sparc64/sys/Makefile.inc#15 integrate ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap.c#8 integrate ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_private.h#7 integrate ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_setup.c#7 integrate ... //depot/projects/sparc64/lib/libc/sparc64/sys/assym.s#7 integrate ... //depot/projects/sparc64/lib/libc/stdio/scanf.3#5 integrate ... //depot/projects/sparc64/lib/libc/stdio/vfscanf.c#5 integrate ... //depot/projects/sparc64/lib/libc/stdlib/malloc.3#5 integrate ... //depot/projects/sparc64/lib/libc/stdlib/malloc.c#8 integrate ... //depot/projects/sparc64/lib/libc/xdr/xdr.c#3 integrate ... //depot/projects/sparc64/lib/libc/xdr/xdr_rec.c#3 integrate ... //depot/projects/sparc64/lib/libc/yp/xdryp.c#4 integrate ... //depot/projects/sparc64/lib/libc/yp/yplib.c#6 integrate ... //depot/projects/sparc64/lib/libc_r/test/guard_b.c#2 integrate ... //depot/projects/sparc64/lib/libcam/camlib.h#2 integrate ... //depot/projects/sparc64/lib/libedit/makelist#2 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_unix/pam_unix.c#6 integrate ... //depot/projects/sparc64/lib/libutil/login.3#2 integrate ... //depot/projects/sparc64/lib/libutil/login.c#3 integrate ... //depot/projects/sparc64/lib/libutil/pw_copy.c#1 branch ... //depot/projects/sparc64/lib/libutil/pw_util.c#1 branch ... //depot/projects/sparc64/lib/libypclnt/ypclnt_passwd.c#2 integrate ... //depot/projects/sparc64/libexec/pppoed/pppoed.c#2 integrate ... //depot/projects/sparc64/libexec/rpc.rquotad/rquotad.c#2 integrate ... //depot/projects/sparc64/libexec/rpc.rstatd/rstat_proc.c#2 integrate ... //depot/projects/sparc64/libexec/rpc.rusersd/rusers_proc.c#2 integrate ... //depot/projects/sparc64/libexec/rpc.rwalld/rwalld.c#2 integrate ... //depot/projects/sparc64/libexec/rpc.sprayd/sprayd.c#2 integrate ... //depot/projects/sparc64/libexec/rtld-elf/ia64/reloc.c#3 integrate ... //depot/projects/sparc64/libexec/rtld-elf/rtld.c#14 integrate ... //depot/projects/sparc64/libexec/tftpd/tftpd.c#4 integrate ... //depot/projects/sparc64/libexec/ypxfr/ypxfr_getmap.c#2 integrate ... //depot/projects/sparc64/libexec/ypxfr/ypxfr_misc.c#3 integrate ... //depot/projects/sparc64/release/Makefile#7 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#3 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#3 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml#4 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#4 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate ... //depot/projects/sparc64/release/picobsd/tinyware/msh/sh3.c#2 integrate ... //depot/projects/sparc64/release/scripts/base-install.sh#1 branch ... //depot/projects/sparc64/release/scripts/bin-install.sh#2 integrate ... //depot/projects/sparc64/release/scripts/catpages-make.sh#2 integrate ... //depot/projects/sparc64/release/scripts/compat4x-install.sh#1 branch ... //depot/projects/sparc64/release/scripts/dict-make.sh#2 integrate ... //depot/projects/sparc64/release/scripts/doFS.sh#2 integrate ... //depot/projects/sparc64/release/scripts/doc-make.sh#2 integrate ... //depot/projects/sparc64/release/scripts/driver-copy2.pl#2 integrate ... //depot/projects/sparc64/release/scripts/driver-remove.pl#2 integrate ... //depot/projects/sparc64/release/scripts/games-make.sh#2 integrate ... //depot/projects/sparc64/release/scripts/info-make.sh#2 integrate ... //depot/projects/sparc64/release/scripts/manpages-make.sh#2 integrate ... //depot/projects/sparc64/release/scripts/proflibs-make.sh#2 integrate ... //depot/projects/sparc64/sbin/fdisk/fdisk.c#4 integrate ... //depot/projects/sparc64/sbin/ffsinfo/ffsinfo.8#3 integrate ... //depot/projects/sparc64/sbin/fsck/fsck.c#4 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/main.c#4 integrate ... //depot/projects/sparc64/sbin/fsck_ifs/main.c#4 integrate ... //depot/projects/sparc64/sbin/fsck_msdosfs/main.c#3 integrate ... //depot/projects/sparc64/sbin/mdconfig/mdconfig.c#3 integrate ... //depot/projects/sparc64/sbin/mdmfs/mdmfs.c#2 integrate ... //depot/projects/sparc64/sbin/mount/mount.8#2 integrate ... //depot/projects/sparc64/sbin/mount/mount.c#3 integrate ... //depot/projects/sparc64/sbin/newfs/mkfs.c#6 integrate ... //depot/projects/sparc64/sbin/newfs/newfs.8#3 integrate ... //depot/projects/sparc64/sbin/newfs/newfs.c#6 integrate ... //depot/projects/sparc64/sbin/newfs/newfs.h#4 integrate ... //depot/projects/sparc64/sbin/reboot/reboot.8#2 integrate ... //depot/projects/sparc64/sbin/reboot/reboot.c#2 integrate ... //depot/projects/sparc64/sbin/savecore/savecore.c#8 integrate ... //depot/projects/sparc64/sbin/vinum/commands.c#2 integrate ... //depot/projects/sparc64/sbin/vinum/list.c#2 integrate ... //depot/projects/sparc64/secure/lib/libssh/Makefile#3 integrate ... //depot/projects/sparc64/secure/usr.bin/ssh/Makefile#2 integrate ... //depot/projects/sparc64/secure/usr.sbin/sshd/Makefile#5 integrate ... //depot/projects/sparc64/share/examples/etc/make.conf#7 integrate ... //depot/projects/sparc64/share/examples/isdn/SupportedCards#2 integrate ... //depot/projects/sparc64/share/examples/isdn/contrib/answer.c#2 integrate ... //depot/projects/sparc64/share/examples/isdn/contrib/isdnctl#2 integrate ... //depot/projects/sparc64/share/examples/netgraph/ether.bridge#3 integrate ... //depot/projects/sparc64/share/man/man4/Makefile#5 integrate ... //depot/projects/sparc64/share/man/man4/ed.4#3 integrate ... //depot/projects/sparc64/share/man/man4/man4.i386/tx.4#2 integrate ... //depot/projects/sparc64/share/man/man4/man4.i386/viapm.4#2 integrate ... //depot/projects/sparc64/share/man/man4/polling.4#3 integrate ... //depot/projects/sparc64/share/man/man4/ulpt.4#2 integrate ... //depot/projects/sparc64/share/man/man5/make.conf.5#7 integrate ... //depot/projects/sparc64/share/man/man8/Makefile#4 integrate ... //depot/projects/sparc64/share/man/man9/Makefile#5 integrate ... //depot/projects/sparc64/share/man/man9/byteorder.9#2 integrate ... //depot/projects/sparc64/share/mk/Makefile#5 integrate ... //depot/projects/sparc64/share/mk/bsd.dep.mk#6 integrate ... //depot/projects/sparc64/share/mk/bsd.doc.mk#4 integrate ... //depot/projects/sparc64/share/mk/bsd.docb.mk#3 delete ... //depot/projects/sparc64/share/mk/bsd.info.mk#4 integrate ... //depot/projects/sparc64/share/mk/bsd.lib.mk#11 integrate ... //depot/projects/sparc64/share/mk/bsd.man.mk#4 integrate ... //depot/projects/sparc64/share/mk/bsd.nls.mk#4 integrate ... //depot/projects/sparc64/share/mk/bsd.obj.mk#5 integrate ... //depot/projects/sparc64/share/mk/bsd.prog.mk#10 integrate ... //depot/projects/sparc64/share/mk/bsd.sgml.mk#3 delete ... //depot/projects/sparc64/share/mk/bsd.subdir.mk#4 integrate ... //depot/projects/sparc64/share/mk/sys.mk#5 integrate ... //depot/projects/sparc64/share/termcap/termcap.src#2 integrate ... //depot/projects/sparc64/sys/Makefile#4 integrate ... //depot/projects/sparc64/sys/alpha/alpha/elf_machdep.c#3 integrate ... //depot/projects/sparc64/sys/alpha/alpha/pmap.c#16 integrate ... //depot/projects/sparc64/sys/alpha/alpha/trap.c#19 integrate ... //depot/projects/sparc64/sys/alpha/include/pmap.h#6 integrate ... //depot/projects/sparc64/sys/alpha/isa/isa_dma.c#2 integrate ... //depot/projects/sparc64/sys/boot/efi/libefi/arch/ia64/start.S#4 integrate ... //depot/projects/sparc64/sys/boot/forth/loader.conf#8 integrate ... //depot/projects/sparc64/sys/boot/pc98/kgzldr/Makefile#3 integrate ... //depot/projects/sparc64/sys/boot/pc98/loader/Makefile#5 integrate ... //depot/projects/sparc64/sys/boot/sparc64/boot1/Makefile#8 integrate ... //depot/projects/sparc64/sys/boot/sparc64/boot1/boot1.c#2 integrate ... //depot/projects/sparc64/sys/cam/cam_xpt.c#8 integrate ... //depot/projects/sparc64/sys/cam/scsi/scsi_all.c#8 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_misc.c#15 integrate ... //depot/projects/sparc64/sys/conf/NOTES#6 integrate ... //depot/projects/sparc64/sys/conf/files#55 integrate ... //depot/projects/sparc64/sys/conf/files.ia64#15 integrate ... //depot/projects/sparc64/sys/conf/kern.post.mk#12 integrate ... //depot/projects/sparc64/sys/conf/kmod.mk#8 integrate ... //depot/projects/sparc64/sys/conf/options#27 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#2 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/fil.c#5 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ip_fil.c#6 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ip_fil.h#4 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ip_frag.c#4 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ip_nat.c#6 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ip_proxy.c#5 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate ... //depot/projects/sparc64/sys/contrib/ipfilter/netinet/ipl.h#3 integrate ... //depot/projects/sparc64/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate ... //depot/projects/sparc64/sys/dev/aac/aac.c#13 integrate ... //depot/projects/sparc64/sys/dev/aac/aac_cam.c#1 branch ... //depot/projects/sparc64/sys/dev/aac/aac_cam.h#1 branch ... //depot/projects/sparc64/sys/dev/aac/aac_disk.c#11 integrate ... //depot/projects/sparc64/sys/dev/aac/aac_pci.c#12 integrate ... //depot/projects/sparc64/sys/dev/aac/aacreg.h#7 integrate ... //depot/projects/sparc64/sys/dev/aac/aacvar.h#9 integrate ... //depot/projects/sparc64/sys/dev/acpica/acpi.c#25 integrate ... //depot/projects/sparc64/sys/dev/acpica/acpi_timer.c#10 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/ahc_eisa.c#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/ahc_pci.c#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7770.c#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx.c#6 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx.h#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx.reg#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx.seq#4 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx_freebsd.c#2 delete ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx_osm.h#4 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx_pci.c#4 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aicasm/Makefile#4 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aicasm/aicasm.h#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#1 branch ... //depot/projects/sparc64/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#1 branch ... //depot/projects/sparc64/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#3 integrate ... //depot/projects/sparc64/sys/dev/ata/ata-dma.c#30 integrate ... //depot/projects/sparc64/sys/dev/bge/if_bge.c#10 integrate ... //depot/projects/sparc64/sys/dev/ciss/ciss.c#5 integrate ... //depot/projects/sparc64/sys/dev/drm/drm.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drmP.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_agpsupport.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_auth.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_bufs.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_context.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_dma.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_drawable.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_drv.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_fops.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_init.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_ioctl.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_linux.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_lists.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_lock.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_memory.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_os_freebsd.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_scatter.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_sysctl.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/drm_vm.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/gamma.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/gamma_dma.c#1 branch ... //depot/projects/sparc64/sys/dev/drm/gamma_drv.c#1 branch ... //depot/projects/sparc64/sys/dev/drm/gamma_drv.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/i810_drm.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/mga.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/mga_dma.c#1 branch ... //depot/projects/sparc64/sys/dev/drm/mga_drm.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/mga_drv.c#1 branch ... //depot/projects/sparc64/sys/dev/drm/mga_drv.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/mga_state.c#1 branch ... //depot/projects/sparc64/sys/dev/drm/mga_ucode.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/mga_warp.c#1 branch ... //depot/projects/sparc64/sys/dev/drm/r128.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/r128_cce.c#1 branch ... //depot/projects/sparc64/sys/dev/drm/r128_drm.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/r128_drv.c#1 branch ... //depot/projects/sparc64/sys/dev/drm/r128_drv.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/r128_state.c#1 branch ... //depot/projects/sparc64/sys/dev/drm/radeon.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/radeon_cp.c#1 branch ... //depot/projects/sparc64/sys/dev/drm/radeon_drm.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/radeon_drv.c#1 branch ... //depot/projects/sparc64/sys/dev/drm/radeon_drv.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/radeon_state.c#1 branch ... //depot/projects/sparc64/sys/dev/drm/sis_drm.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/tdfx.h#1 branch ... //depot/projects/sparc64/sys/dev/drm/tdfx_drv.c#1 branch ... //depot/projects/sparc64/sys/dev/em/if_em.c#5 integrate ... //depot/projects/sparc64/sys/dev/gem/if_gem.c#13 integrate ... //depot/projects/sparc64/sys/dev/gx/if_gx.c#5 integrate ... //depot/projects/sparc64/sys/dev/hfa/fore_command.c#2 integrate ... //depot/projects/sparc64/sys/dev/hfa/fore_output.c#3 integrate ... //depot/projects/sparc64/sys/dev/hme/if_hme.c#18 integrate ... //depot/projects/sparc64/sys/dev/iir/iir.c#2 integrate ... //depot/projects/sparc64/sys/dev/iir/iir_ctrl.c#2 integrate ... //depot/projects/sparc64/sys/dev/iir/iir_pci.c#3 integrate ... //depot/projects/sparc64/sys/dev/isp/isp_freebsd.h#11 integrate ... //depot/projects/sparc64/sys/dev/lge/if_lge.c#5 integrate ... //depot/projects/sparc64/sys/dev/mii/acphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/amphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/brgphy.c#7 integrate ... //depot/projects/sparc64/sys/dev/mii/dcphy.c#5 integrate ... //depot/projects/sparc64/sys/dev/mii/e1000phy.c#3 integrate ... //depot/projects/sparc64/sys/dev/mii/exphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/inphy.c#3 integrate ... //depot/projects/sparc64/sys/dev/mii/lxtphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/mii.c#5 integrate ... //depot/projects/sparc64/sys/dev/mii/mii.h#2 integrate ... //depot/projects/sparc64/sys/dev/mii/mii_physubr.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/miivar.h#4 integrate ... //depot/projects/sparc64/sys/dev/mii/mlphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/nsgphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/nsgphyreg.h#2 integrate ... //depot/projects/sparc64/sys/dev/mii/nsphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/pnaphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/pnphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/qsphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/rlphy.c#6 integrate ... //depot/projects/sparc64/sys/dev/mii/tdkphy.c#5 integrate ... //depot/projects/sparc64/sys/dev/mii/tlphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/ukphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/ukphy_subr.c#2 integrate ... //depot/projects/sparc64/sys/dev/mii/xmphy.c#4 integrate ... //depot/projects/sparc64/sys/dev/my/if_my.c#3 integrate ... //depot/projects/sparc64/sys/dev/nge/if_nge.c#10 integrate ... //depot/projects/sparc64/sys/dev/pccbb/pccbb.c#12 integrate ... //depot/projects/sparc64/sys/dev/ppbus/pps.c#6 integrate ... //depot/projects/sparc64/sys/dev/puc/puc.c#5 integrate ... //depot/projects/sparc64/sys/dev/puc/pucdata.c#6 integrate ... //depot/projects/sparc64/sys/dev/random/harvest.c#3 integrate ... //depot/projects/sparc64/sys/dev/sio/sio.c#17 integrate ... //depot/projects/sparc64/sys/dev/sound/pci/es137x.c#5 integrate ... //depot/projects/sparc64/sys/dev/sound/pcm/ac97.c#7 integrate ... //depot/projects/sparc64/sys/dev/sound/pcm/ac97.h#3 integrate ... //depot/projects/sparc64/sys/dev/sound/pcm/sound.c#9 integrate ... //depot/projects/sparc64/sys/dev/sym/sym_hipd.c#8 integrate ... //depot/projects/sparc64/sys/dev/tx/if_tx.c#2 integrate ... //depot/projects/sparc64/sys/dev/usb/ohci.c#14 integrate ... //depot/projects/sparc64/sys/dev/usb/uhci.c#14 integrate ... //depot/projects/sparc64/sys/dev/usb/usb_subr.c#9 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdevs#17 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdevs.h#17 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdevs_data.h#17 integrate ... //depot/projects/sparc64/sys/dev/vinum/vinumio.c#5 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wi.c#26 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wi_pccard.c#3 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wi_pci.c#4 integrate ... //depot/projects/sparc64/sys/dev/wi/if_wivar.h#4 integrate ... //depot/projects/sparc64/sys/dev/wi/wi_hostap.c#3 integrate ... //depot/projects/sparc64/sys/dev/wi/wi_hostap.h#3 integrate ... //depot/projects/sparc64/sys/fs/devfs/devfs.h#3 integrate ... //depot/projects/sparc64/sys/fs/devfs/devfs_vnops.c#12 integrate ... //depot/projects/sparc64/sys/fs/procfs/procfs_mem.c#5 integrate ... //depot/projects/sparc64/sys/fs/smbfs/smbfs_io.c#5 integrate ... //depot/projects/sparc64/sys/fs/smbfs/smbfs_vfsops.c#8 integrate ... //depot/projects/sparc64/sys/geom/geom.h#8 integrate ... //depot/projects/sparc64/sys/geom/geom_bsd.c#9 integrate ... //depot/projects/sparc64/sys/geom/geom_dev.c#10 integrate ... //depot/projects/sparc64/sys/geom/geom_dump.c#6 integrate ... //depot/projects/sparc64/sys/geom/geom_enc.c#3 integrate ... //depot/projects/sparc64/sys/geom/geom_slice.c#9 integrate ... //depot/projects/sparc64/sys/geom/geom_slice.h#5 integrate ... //depot/projects/sparc64/sys/geom/geom_subr.c#6 integrate ... //depot/projects/sparc64/sys/i386/conf/GENERIC#20 integrate ... //depot/projects/sparc64/sys/i386/i386/autoconf.c#11 integrate ... //depot/projects/sparc64/sys/i386/i386/elf_machdep.c#2 integrate ... //depot/projects/sparc64/sys/i386/i386/identcpu.c#9 integrate ... //depot/projects/sparc64/sys/i386/i386/mp_clock.c#2 integrate ... //depot/projects/sparc64/sys/i386/i386/pmap.c#24 integrate ... //depot/projects/sparc64/sys/i386/i386/trap.c#23 integrate ... //depot/projects/sparc64/sys/i386/include/pmap.h#9 integrate ... //depot/projects/sparc64/sys/i386/include/profile.h#5 integrate ... //depot/projects/sparc64/sys/i386/isa/bs/bsif.c#3 integrate ... //depot/projects/sparc64/sys/i386/isa/clock.c#11 integrate ... //depot/projects/sparc64/sys/i386/isa/isa_dma.c#4 integrate ... //depot/projects/sparc64/sys/i386/pci/pci_bus.c#5 integrate ... //depot/projects/sparc64/sys/i386/pci/pci_cfgreg.c#7 integrate ... //depot/projects/sparc64/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#5 integrate ... //depot/projects/sparc64/sys/ia64/ia64/elf_machdep.c#3 integrate ... //depot/projects/sparc64/sys/ia64/ia64/locore.s#13 integrate ... //depot/projects/sparc64/sys/ia64/ia64/machdep.c#39 integrate ... //depot/projects/sparc64/sys/ia64/ia64/mca.c#1 branch ... //depot/projects/sparc64/sys/ia64/ia64/pmap.c#26 integrate ... //depot/projects/sparc64/sys/ia64/ia64/sal.c#6 integrate ... //depot/projects/sparc64/sys/ia64/ia64/swtch.s#10 integrate ... //depot/projects/sparc64/sys/ia64/ia64/vm_machdep.c#14 integrate ... //depot/projects/sparc64/sys/ia64/include/mca.h#1 branch ... //depot/projects/sparc64/sys/ia64/include/pmap.h#6 integrate ... //depot/projects/sparc64/sys/ia64/include/sal.h#3 integrate ... //depot/projects/sparc64/sys/ia64/isa/isa_dma.c#3 integrate ... //depot/projects/sparc64/sys/kern/bus_if.m#3 integrate ... //depot/projects/sparc64/sys/kern/kern_clock.c#15 integrate ... //depot/projects/sparc64/sys/kern/kern_condvar.c#9 integrate ... //depot/projects/sparc64/sys/kern/kern_conf.c#11 integrate ... //depot/projects/sparc64/sys/kern/kern_descrip.c#22 integrate ... //depot/projects/sparc64/sys/kern/kern_environment.c#6 integrate ... //depot/projects/sparc64/sys/kern/kern_exit.c#23 integrate ... //depot/projects/sparc64/sys/kern/kern_linker.c#18 integrate ... //depot/projects/sparc64/sys/kern/kern_malloc.c#8 integrate ... //depot/projects/sparc64/sys/kern/kern_ntptime.c#8 integrate ... //depot/projects/sparc64/sys/kern/kern_proc.c#18 integrate ... //depot/projects/sparc64/sys/kern/kern_prot.c#29 integrate ... //depot/projects/sparc64/sys/kern/kern_sig.c#26 integrate ... //depot/projects/sparc64/sys/kern/kern_tc.c#10 integrate ... //depot/projects/sparc64/sys/kern/kern_time.c#10 integrate ... //depot/projects/sparc64/sys/kern/link_elf.c#12 integrate ... //depot/projects/sparc64/sys/kern/makesyscalls.sh#13 integrate ... //depot/projects/sparc64/sys/kern/subr_bus.c#13 integrate ... //depot/projects/sparc64/sys/kern/subr_disklabel.c#8 integrate ... //depot/projects/sparc64/sys/kern/subr_hints.c#4 integrate ... //depot/projects/sparc64/sys/kern/subr_mchain.c#4 integrate ... //depot/projects/sparc64/sys/kern/subr_prf.c#12 integrate ... //depot/projects/sparc64/sys/kern/subr_witness.c#23 integrate ... //depot/projects/sparc64/sys/kern/sys_process.c#19 integrate ... //depot/projects/sparc64/sys/kern/uipc_socket.c#17 integrate ... //depot/projects/sparc64/sys/kern/uipc_socket2.c#13 integrate ... //depot/projects/sparc64/sys/kern/vfs_aio.c#20 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 19:21:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4804737B416; Mon, 29 Apr 2002 19:21:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5E5DC37B405 for ; Mon, 29 Apr 2002 19:21:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3U2LPQ69326 for perforce@freebsd.org; Mon, 29 Apr 2002 19:21:25 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 29 Apr 2002 19:21:25 -0700 (PDT) Message-Id: <200204300221.g3U2LPQ69326@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10497 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10497 Change 10497 by jake@jake_sparc64 on 2002/04/29 19:20:40 Back out changes to work around long double problems now that -msoft-quad-float works. Affected files ... ... //depot/projects/sparc64/lib/libdevstat/devstat.c#5 edit ... //depot/projects/sparc64/lib/libdevstat/devstat.h#3 edit ... //depot/projects/sparc64/lib/msun/src/s_rint.c#3 edit ... //depot/projects/sparc64/usr.bin/systat/iostat.c#4 edit ... //depot/projects/sparc64/usr.bin/systat/vmstat.c#4 edit ... //depot/projects/sparc64/usr.sbin/iostat/iostat.c#3 edit Differences ... ==== //depot/projects/sparc64/lib/libdevstat/devstat.c#5 (text+ko) ==== @@ -1162,7 +1162,7 @@ int devstat_compute_statistics(struct devstat *current, struct devstat *previous, - double etime, ...) + long double etime, ...) { const char *func_name = "devstat_compute_statistics"; u_int64_t totalbytes, totalbytesread, totalbyteswrite; @@ -1172,7 +1172,7 @@ va_list ap; devstat_metric metric; u_int64_t *destu64; - double *destld; + long double *destld; int retval; retval = 0; @@ -1239,10 +1239,10 @@ destu64 = (u_int64_t *)va_arg(ap, u_int64_t *); break; case DEVSTAT_ARG_LD: - destld = (double *)va_arg(ap, double *); + destld = (long double *)va_arg(ap, long double *); break; case DEVSTAT_ARG_SKIP: - destld = (double *)va_arg(ap, double *); + destld = (long double *)va_arg(ap, long double *); break; default: retval = -1; ==== //depot/projects/sparc64/lib/libdevstat/devstat.h#3 (text+ko) ==== @@ -163,7 +163,7 @@ int *num_matches); int devstat_compute_statistics(struct devstat *current, struct devstat *previous, - double etime, ...); + long double etime, ...); long double devstat_compute_etime(struct timeval cur_time, struct timeval prev_time); __END_DECLS ==== //depot/projects/sparc64/lib/msun/src/s_rint.c#3 (text+ko) ==== @@ -35,9 +35,9 @@ * case this is compiled with gcc -traditional. */ #ifdef __STDC__ -static const double +static const long double #else -static double +static long double #endif TWO52[2]={ 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ ==== //depot/projects/sparc64/usr.bin/systat/iostat.c#4 (text+ko) ==== @@ -89,7 +89,7 @@ static int kbpt = 0; /* default ms/seek shown */ static int barlabels(int); -static void histogram(double, int, double); +static void histogram(long double, int, double); static int numlabels(int); static int devstats(int, int, int); static void stat1(int, int); @@ -369,7 +369,7 @@ static void histogram(val, colwidth, scale) - double val; + long double val; int colwidth; double scale; { ==== //depot/projects/sparc64/usr.bin/systat/vmstat.c#4 (text+ko) ==== @@ -137,7 +137,7 @@ static void getinfo(struct Info *); static void putint(int, int, int, int); static void putfloat(double, int, int, int, int, int); -static void putlongdouble(double, int, int, int, int, int); +static void putlongdouble(long double, int, int, int, int, int); static int ucount(void); static int ncpu; @@ -712,7 +712,7 @@ static void putlongdouble(f, l, lc, w, d, nz) - double f; + long double f; int l, lc, w, d, nz; { char b[128]; ==== //depot/projects/sparc64/usr.sbin/iostat/iostat.c#3 (text+ko) ==== @@ -422,7 +422,7 @@ for (headercount = 1;;) { struct devinfo *tmp_dinfo; long tmp; - double etime; + long double etime; if (Tflag > 0) { if ((readvar(kd, "kern.tty_nin", X_TK_NIN, &cur.tk_nin, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 19:30:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC35337B400; Mon, 29 Apr 2002 19:29:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AF43937B420 for ; Mon, 29 Apr 2002 19:29:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3U2TZJ70152 for perforce@freebsd.org; Mon, 29 Apr 2002 19:29:35 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 29 Apr 2002 19:29:35 -0700 (PDT) Message-Id: <200204300229.g3U2TZJ70152@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10498 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10498 Change 10498 by jake@jake_sparc64 on 2002/04/29 19:29:16 I'm tired of seeing these changes. Affected files ... ... //depot/projects/sparc64/libexec/rtld-elf/alpha/lockdflt.c#5 edit ... //depot/projects/sparc64/libexec/rtld-elf/alpha/rtld_machdep.h#4 edit ... //depot/projects/sparc64/libexec/rtld-elf/alpha/rtld_start.S#4 edit ... //depot/projects/sparc64/libexec/rtld-elf/i386/lockdflt.c#5 edit ... //depot/projects/sparc64/libexec/rtld-elf/i386/rtld_machdep.h#3 edit ... //depot/projects/sparc64/libexec/rtld-elf/ia64/lockdflt.c#5 edit ... //depot/projects/sparc64/libexec/rtld-elf/ia64/rtld_machdep.h#3 edit ... //depot/projects/sparc64/libexec/rtld-elf/ia64/rtld_start.S#3 edit Differences ... ==== //depot/projects/sparc64/libexec/rtld-elf/alpha/lockdflt.c#5 (text+ko) ==== @@ -50,8 +50,6 @@ #include #include -#include - #include "debug.h" #include "rtld.h" @@ -118,7 +116,7 @@ { Lock *l = (Lock *)lock; - atomic_add_acq_int(&l->lock, RC_INCR); + atomic_add_int(&l->lock, RC_INCR); while (l->lock & WAFLAG) nanosleep(&usec, NULL); } @@ -131,7 +129,7 @@ for ( ; ; ) { sigprocmask(SIG_BLOCK, &fullsigmask, &tmp_oldsigmask); - if (atomic_cmpset_acq_int(&l->lock, 0, WAFLAG)) + if (cmp0_and_store_int(&l->lock, WAFLAG) == 0) break; sigprocmask(SIG_SETMASK, &tmp_oldsigmask, NULL); nanosleep(&usec, NULL); @@ -144,7 +142,7 @@ { Lock *l = (Lock *)lock; - atomic_add_rel_int(&l->lock, -RC_INCR); + atomic_add_int(&l->lock, -RC_INCR); } static void @@ -152,7 +150,7 @@ { Lock *l = (Lock *)lock; - atomic_add_rel_int(&l->lock, -WAFLAG); + atomic_add_int(&l->lock, -WAFLAG); sigprocmask(SIG_SETMASK, &oldsigmask, NULL); } ==== //depot/projects/sparc64/libexec/rtld-elf/alpha/rtld_machdep.h#4 (text+ko) ==== @@ -46,4 +46,10 @@ /* Lazy binding entry point, called via PLT. */ void _rtld_bind_start_old(void); +/* Atomic operations. */ +int cmp0_and_store_int(volatile int *, int); +void atomic_add_int(volatile int *, int); +void atomic_incr_int(volatile int *); +void atomic_decr_int(volatile int *); + #endif ==== //depot/projects/sparc64/libexec/rtld-elf/alpha/rtld_start.S#4 (text+ko) ==== @@ -208,3 +208,53 @@ RTLD_BIND_START_EPILOGUE END(_rtld_bind_start_old) + +/* + * int cmp0_and_store_int(volatile int *p, int newval); + * + * If an int holds 0, store newval into it; else do nothing. Returns + * the previous value. + */ +LEAF(cmp0_and_store_int, 2) +1: mov a1, t0 + ldl_l v0, 0(a0) + bne v0, 3f + stl_c t0, 0(a0) + beq t0, 2f + mb + RET +2: br 1b +3: RET +END(cmp0_and_store_int) + +LEAF(atomic_add_int, 2) +0: ldl_l t0, 0(a0) + addq t0, a1, t0 + stl_c t0, 0(a0) + beq t0, 1f + mb + RET +1: br 0b +END(atomic_add_int) + +/* Atomically increment an int. */ +LEAF(atomic_incr_int, 1) +0: ldl_l t0, 0(a0) + addq t0, 1, t0 + stl_c t0, 0(a0) + beq t0, 1f + mb + RET +1: br 0b +END(atomic_incr_int) + +/* Atomically decrement an int. */ +LEAF(atomic_decr_int, 1) +0: ldl_l t0, 0(a0) + subq t0, 1, t0 + stl_c t0, 0(a0) + beq t0, 1f + mb + RET +1: br 0b +END(atomic_decr_int) ==== //depot/projects/sparc64/libexec/rtld-elf/i386/lockdflt.c#5 (text+ko) ==== @@ -58,8 +58,6 @@ #include #include -#include - #include "debug.h" #include "rtld.h" @@ -77,6 +75,19 @@ static sigset_t fullsigmask, oldsigmask; static inline int +cmpxchgl(int old, int new, volatile int *m) +{ + int result; + + __asm __volatile ("lock; cmpxchgl %2, %0" + : "=m"(*m), "=a"(result) + : "r"(new), "0"(*m), "1"(old) + : "cc"); + + return result; +} + +static inline int xchgl(int v, volatile int *m) { int result; @@ -164,7 +175,7 @@ { Lock *l = (Lock *)lock; - atomic_add_acq_int(&l->lock, RC_INCR); + atomic_add_int(&l->lock, RC_INCR); while (l->lock & WAFLAG) nanosleep(&usec, NULL); } @@ -177,7 +188,7 @@ for ( ; ; ) { sigprocmask(SIG_BLOCK, &fullsigmask, &tmp_oldsigmask); - if (atomic_cmpset_acq_int(&l->lock, 0, WAFLAG)) + if (cmpxchgl(0, WAFLAG, &l->lock) == 0) break; sigprocmask(SIG_SETMASK, &tmp_oldsigmask, NULL); nanosleep(&usec, NULL); @@ -190,7 +201,7 @@ { Lock *l = (Lock *)lock; - atomic_add_rel_int(&l->lock, -RC_INCR); + atomic_add_int(&l->lock, -RC_INCR); } static void @@ -198,7 +209,7 @@ { Lock *l = (Lock *)lock; - atomic_add_rel_int(&l->lock, -WAFLAG); + atomic_add_int(&l->lock, -WAFLAG); sigprocmask(SIG_SETMASK, &oldsigmask, NULL); } @@ -230,7 +241,7 @@ sigaction(SIGILL, &act, &oact); if (setjmp(sigill_env) == 0) { lock = 0; - atomic_cmpset_int(&lock, 0, 1); + cmpxchgl(0, 1, &lock); result = 1; } else result = 0; ==== //depot/projects/sparc64/libexec/rtld-elf/i386/rtld_machdep.h#3 (text+ko) ==== @@ -52,4 +52,25 @@ #define call_initfini_pointer(obj, target) \ (((InitFunc)(target))()) +static inline void +atomic_decr_int(volatile int *p) +{ + __asm __volatile ("lock; decl %0" : "=m"(*p) : "0"(*p) : "cc"); +} + +static inline void +atomic_incr_int(volatile int *p) +{ + __asm __volatile ("lock; incl %0" : "=m"(*p) : "0"(*p) : "cc"); +} + +static inline void +atomic_add_int(volatile int *p, int val) +{ + __asm __volatile ("lock; addl %1, %0" + : "=m"(*p) + : "ri"(val), "0"(*p) + : "cc"); +} + #endif ==== //depot/projects/sparc64/libexec/rtld-elf/ia64/lockdflt.c#5 (text+ko) ==== @@ -50,8 +50,6 @@ #include #include -#include - #include "debug.h" #include "rtld.h" @@ -118,7 +116,7 @@ { Lock *l = (Lock *)lock; - atomic_add_acq_int(&l->lock, RC_INCR); + atomic_add_int(&l->lock, RC_INCR); while (l->lock & WAFLAG) nanosleep(&usec, NULL); } @@ -131,7 +129,7 @@ for ( ; ; ) { sigprocmask(SIG_BLOCK, &fullsigmask, &tmp_oldsigmask); - if (atomic_cmpset_acq_int(&l->lock, 0, WAFLAG)) + if (cmp0_and_store_int(&l->lock, WAFLAG) == 0) break; sigprocmask(SIG_SETMASK, &tmp_oldsigmask, NULL); nanosleep(&usec, NULL); @@ -144,7 +142,7 @@ { Lock *l = (Lock *)lock; - atomic_add_rel_int(&l->lock, -RC_INCR); + atomic_add_int(&l->lock, -RC_INCR); } static void @@ -152,7 +150,7 @@ { Lock *l = (Lock *)lock; - atomic_add_rel_int(&l->lock, -WAFLAG); + atomic_add_int(&l->lock, -WAFLAG); sigprocmask(SIG_SETMASK, &oldsigmask, NULL); } ==== //depot/projects/sparc64/libexec/rtld-elf/ia64/rtld_machdep.h#3 (text+ko) ==== @@ -49,4 +49,10 @@ void *make_function_pointer(const Elf_Sym *, const struct Struct_Obj_Entry *); void call_initfini_pointer(const struct Struct_Obj_Entry *, Elf_Addr); +/* Atomic operations. */ +int cmp0_and_store_int(volatile int *, int); +void atomic_add_int(volatile int *, int); +void atomic_incr_int(volatile int *); +void atomic_decr_int(volatile int *); + #endif ==== //depot/projects/sparc64/libexec/rtld-elf/ia64/rtld_start.S#3 (text+ko) ==== @@ -157,6 +157,60 @@ } END(_rtld_bind_start) +/* + * int cmp0_and_store_int(volatile int *p, int newval); + * + * If an int holds 0, store newval into it; else do nothing. Returns + * the previous value. + */ +ENTRY(cmp0_and_store_int, 2) + mov ar.ccv=0 + ;; + cmpxchg4.acq r8=[in0],in1,ar.ccv + br.ret.sptk.many rp +END(cmp0_and_store_int) + +ENTRY(atomic_add_int, 2) +1: ld4 r14=[in0] + ;; + mov ar.ccv=r14 + add r15=in1,r14 + ;; + cmpxchg4.acq r16=[in0],r15,ar.ccv + ;; + cmp.ne p6,p0=r14,r16 +(p6) br.cond.spnt.few 1b + br.ret.sptk.many rp +END(atomic_add_int) + +/* Atomically increment an int. */ +ENTRY(atomic_incr_int, 1) +1: ld4 r14=[in0] + ;; + mov ar.ccv=r14 + add r15=1,r14 + ;; + cmpxchg4.acq r16=[in0],r15,ar.ccv + ;; + cmp.ne p6,p0=r14,r16 +(p6) br.cond.spnt.few 1b + br.ret.sptk.many rp +END(atomic_incr_int) + +/* Atomically decrement an int. */ +ENTRY(atomic_decr_int, 1) +1: ld4 r14=[in0] + ;; + mov ar.ccv=r14 + add r15=-1,r14 + ;; + cmpxchg4.acq r16=[in0],r15,ar.ccv + ;; + cmp.ne p6,p0=r14,r16 +(p6) br.cond.spnt.few 1b + br.ret.sptk.many rp +END(atomic_decr_int) + #define DT_NULL 0 /* Terminating entry. */ #define DT_RELA 7 /* Address of ElfNN_Rela relocations. */ #define DT_RELASZ 8 /* Total size of ElfNN_Rela relocations. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 19:38: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1FB337B400; Mon, 29 Apr 2002 19:37:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6B89C37B438 for ; Mon, 29 Apr 2002 19:37:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3U2bkZ71381 for perforce@freebsd.org; Mon, 29 Apr 2002 19:37:46 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 29 Apr 2002 19:37:46 -0700 (PDT) Message-Id: <200204300237.g3U2bkZ71381@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10500 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10500 Change 10500 by jake@jake_sparc64 on 2002/04/29 19:37:29 Backout ELF_CRC32 changes. These should either be committed or forgotten about, I'm tired of the diffs. Affected files ... ... //depot/projects/sparc64/sys/boot/common/bootstrap.h#7 edit ... //depot/projects/sparc64/sys/boot/common/load_elf.c#12 edit ... //depot/projects/sparc64/sys/boot/sparc64/loader/main.c#25 edit Differences ... ==== //depot/projects/sparc64/sys/boot/common/bootstrap.h#7 (text+ko) ==== @@ -274,10 +274,6 @@ /* Read from file to module address space, same semantics as read() */ ssize_t (*arch_readin)(const int fd, vm_offset_t dest, const size_t len); -#ifdef ELF_CRC32 - /* Compute a CRC32 checksum of data in the module address space. */ - u_int32_t (*arch_crc32)(u_int32_t sum, vm_offset_t start, size_t size); -#endif /* Perform ISA byte port I/O (only for systems with ISA) */ int (*arch_isainb)(int port); void (*arch_isaoutb)(int port, int value); ==== //depot/projects/sparc64/sys/boot/common/load_elf.c#12 (text+ko) ==== @@ -214,59 +214,7 @@ return(err); } -#ifdef ELF_CRC32 -struct crcinfo { - u_int32_t ci_start; - u_int32_t ci_size; - u_int32_t ci_sum; -}; - -#define CKSUM_SECT "cksum" -#define SHSTR(off, tab) (&((tab)[(off)])) - /* - * Extract CRC info so that the PT_LOAD checksums can be verified. Note that - * this does not work for gzipped kernels; those have their own checksums in - * the gzip format, though. - */ -static int -elf_cksum_init(elf_file_t ef, Elf_Ehdr *ehdr, Elf_Shdr *shdr, struct crcinfo **ci) -{ - char *shstrt; - int rv = -1; - int stt; - int i; - - /* Get the section name string table section. */ - stt = ehdr->e_shstrndx; - if (stt == SHN_UNDEF || shdr[stt].sh_type != SHT_STRTAB) - return (-1); - if ((shstrt = malloc(shdr[stt].sh_size)) == NULL) - return (-1); - if (lseek(ef->fd, shdr[stt].sh_offset, SEEK_SET) == -1) - return (-1); - if (read(ef->fd, shstrt, shdr[stt].sh_size) == -1) - return (-1); - - /* Try to find the checksum section. */ - for (i = 0; i < ehdr->e_shnum; i++) { - if (strcmp(SHSTR(shdr[i].sh_name, shstrt), CKSUM_SECT) == 0) { - rv = shdr[i].sh_size; - if ((*ci = malloc(rv)) == NULL) - return (-1); - if (lseek(ef->fd, shdr[i].sh_offset, SEEK_SET) == -1) - return (-1); - if (read(ef->fd, *ci, rv) == -1) - return (-1); - rv /= sizeof(struct crcinfo); - break; - } - } - return (rv); -} -#endif - -/* * With the file (fd) open on the image, and (ehdr) containing * the Elf header, load the image at (off) */ @@ -292,11 +240,6 @@ int symtabindex; long size; u_int fpcopy; -#ifdef ELF_CRC32 - struct crcinfo *crctab; - int ncrc, checked, k; - u_int32_t crc; -#endif dp = NULL; shdr = NULL; @@ -308,7 +251,6 @@ off = - (off & 0xff000000u); /* i386 relocates after locore */ #else off = 0; /* alpha is direct mapped for kernels */ - /* sparc64's MD part maps on demand. */ #endif } ef->off = off; @@ -319,30 +261,6 @@ } phdr = (Elf_Phdr *)(ef->firstpage + ehdr->e_phoff); - /* Try to load the section header (see comments in the symtab code below) */ - chunk = ehdr->e_shnum * ehdr->e_shentsize; - if (chunk == 0 || ehdr->e_shoff == 0) - goto noshdr; - shdr = malloc(chunk); - if (shdr == NULL) - goto noshdr; - if (lseek(ef->fd, (off_t)ehdr->e_shoff, SEEK_SET) == -1) { - printf("\nelf_loadimage: cannot lseek() to section headers"); - shdr = NULL; - goto noshdr; - } - result = read(ef->fd, shdr, chunk); - if (result < 0 || (size_t)result != chunk) { - printf("\nelf_loadimage: read section headers failed"); - shdr = NULL; - goto noshdr; - } - -#ifdef ELF_CRC32 - ncrc = elf_cksum_init(ef, ehdr, shdr, &crctab); -#endif - -noshdr: for (i = 0; i < ehdr->e_phnum; i++) { /* We want to load PT_LOAD segments only.. */ if (phdr[i].p_type != PT_LOAD) @@ -406,28 +324,6 @@ } free(buf); } -#ifdef ELF_CRC32 - if (archsw.arch_crc32 != NULL) { - crc = archsw.arch_crc32(0, phdr[i].p_vaddr + off, - phdr[i].p_filesz); - printf("crc32=%lu", (u_long)crc); - checked = 0; - for (k = 0; k < ncrc; k++) { - if (crctab[k].ci_start == phdr[i].p_offset && - crctab[k].ci_size == phdr[i].p_filesz) { - checked = 1; - if (crc == crctab[k].ci_sum) - printf("[OK] "); - else { - panic("Bad checksum (%lu vs %lu)!", (u_long)crc, - (u_long)crctab[k].ci_sum); - } - } - } - if (!checked) - printf("[unchecked] "); - } -#endif #ifdef ELF_VERBOSE printf("\n"); #endif @@ -445,8 +341,21 @@ * strip a file to remove symbols before gzipping it so that we do not * try to lseek() on it. */ + chunk = ehdr->e_shnum * ehdr->e_shentsize; + if (chunk == 0 || ehdr->e_shoff == 0) + goto nosyms; + shdr = malloc(chunk); if (shdr == NULL) goto nosyms; + if (lseek(ef->fd, (off_t)ehdr->e_shoff, SEEK_SET) == -1) { + printf("\nelf_loadimage: cannot lseek() to section headers"); + goto nosyms; + } + result = read(ef->fd, shdr, chunk); + if (result < 0 || (size_t)result != chunk) { + printf("\nelf_loadimage: read section headers failed"); + goto nosyms; + } symtabindex = -1; symstrindex = -1; for (i = 0; i < ehdr->e_shnum; i++) { ==== //depot/projects/sparc64/sys/boot/sparc64/loader/main.c#25 (text+ko) ==== @@ -28,17 +28,12 @@ #include #include #include -#include #include #include #include #include #include -#ifdef ELF_CRC32 -#include -#endif - #include "bootstrap.h" #include "libofw.h" #include "dev_net.h" @@ -212,14 +207,6 @@ return len; } -#ifdef ELF_CRC32 -static u_int32_t -sparc64_crc32(u_int32_t sum, vm_offset_t start, size_t size) -{ - return (crc32(sum, (char *)start, size)); -} -#endif - /* * other MD functions */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 20:32:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0731137B416; Mon, 29 Apr 2002 20:31:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 874D137B400 for ; Mon, 29 Apr 2002 20:31:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3U3Uo781542 for perforce@freebsd.org; Mon, 29 Apr 2002 20:30:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 29 Apr 2002 20:30:50 -0700 (PDT) Message-Id: <200204300330.g3U3Uo781542@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10502 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10502 Change 10502 by rwatson@rwatson_curry on 2002/04/29 20:30:29 Integ TrustedBSD base branch to pick up various things, including UMA-related fixes. Affected files ... ... //depot/projects/trustedbsd/base/Makefile#6 integrate ... //depot/projects/trustedbsd/base/Makefile.inc1#14 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/misc.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/printnat.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/Makefile#4 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni1#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni2#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni4#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni5#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni2#2 integrate ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni5#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni5.ipf#1 branch ... //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni5.nat#1 branch ... //depot/projects/trustedbsd/base/contrib/lukemftp/src/fetch.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp_var.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/lukemftp/src/main.c#2 integrate ... //depot/projects/trustedbsd/base/etc/Makefile#15 integrate ... //depot/projects/trustedbsd/base/etc/defaults/rc.conf#11 integrate ... //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#13 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/other#4 integrate ... //depot/projects/trustedbsd/base/etc/rc#12 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#12 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes-o.real#3 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2#5 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2-o#4 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/freebsd-tips#6 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/gerrold.limerick#2 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/limerick#2 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/zippy#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/man/man/man.c#5 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/backupfile.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/backupfile.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/common.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/getopt.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/getopt.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/inp.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/inp.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/patch.c#3 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/pch.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/pch.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/util.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/util.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/version.c#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/patch/version.h#2 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/perl/library/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/base/include/rpc/clnt.h#3 integrate ... //depot/projects/trustedbsd/base/include/rpc/pmap_clnt.h#3 integrate ... //depot/projects/trustedbsd/base/include/rpc/svc.h#4 integrate ... //depot/projects/trustedbsd/base/include/rpc/xdr.h#4 integrate ... //depot/projects/trustedbsd/base/include/rpcsvc/ypclnt.h#4 integrate ... //depot/projects/trustedbsd/base/kerberos5/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/Makefile.inc#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/include/version.h#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/lib/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/lib/libkrb5/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/hprop/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/hpropd/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-master/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-slave/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/k5admind/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/k5passwdd/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/libexec/kdc/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5admin/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5destroy/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5init/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5list/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5passwd/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5su/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.sbin/k5stash/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberos5/usr.sbin/ktutil/Makefile#3 integrate ... //depot/projects/trustedbsd/base/kerberosIV/Makefile#2 integrate ... //depot/projects/trustedbsd/base/kerberosIV/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/base/lib/csu/i386-elf/Makefile#3 integrate ... //depot/projects/trustedbsd/base/lib/csu/sparc64/crt1.c#7 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/auth_time.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_dg.c#5 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_raw.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/clnt_vc.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/crypt_client.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/key_call.c#5 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_soc.c#5 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/svc.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/svc_dg.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/svc_raw.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/rpc/svc_vc.c#5 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_add.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_explode.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_extern.h#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_implode.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_qp.c#1 branch ... //depot/projects/trustedbsd/base/lib/libc/sparc64/fpu/fpu_subr.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/Makefile.inc#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#1 branch ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_utrap.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_utrap_emul.c#1 branch ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_utrap_private.h#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/__sparc_utrap_setup.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/assym.s#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/sparc64/sys/sigcode.S#1 branch ... //depot/projects/trustedbsd/base/lib/libc/xdr/xdr.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_rec.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc/yp/xdryp.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/yp/yplib.c#6 integrate ... //depot/projects/trustedbsd/base/lib/libpam/modules/pam_unix/pam_unix.c#9 integrate ... //depot/projects/trustedbsd/base/lib/libutil/pw_copy.c#1 branch ... //depot/projects/trustedbsd/base/lib/libutil/pw_util.c#1 branch ... //depot/projects/trustedbsd/base/lib/libypclnt/ypclnt_passwd.c#2 integrate ... //depot/projects/trustedbsd/base/libexec/rpc.rquotad/rquotad.c#3 integrate ... //depot/projects/trustedbsd/base/libexec/rpc.rstatd/rstat_proc.c#3 integrate ... //depot/projects/trustedbsd/base/libexec/rpc.rusersd/rusers_proc.c#3 integrate ... //depot/projects/trustedbsd/base/libexec/rpc.rwalld/rwalld.c#4 integrate ... //depot/projects/trustedbsd/base/libexec/rpc.sprayd/sprayd.c#3 integrate ... //depot/projects/trustedbsd/base/libexec/rtld-elf/ia64/reloc.c#3 integrate ... //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#6 integrate ... //depot/projects/trustedbsd/base/libexec/tftpd/tftpd.c#5 integrate ... //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfr_getmap.c#3 integrate ... //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfr_misc.c#4 integrate ... //depot/projects/trustedbsd/base/release/Makefile#11 integrate ... //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#18 integrate ... //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 integrate ... //depot/projects/trustedbsd/base/release/scripts/base-install.sh#1 branch ... //depot/projects/trustedbsd/base/release/scripts/catpages-make.sh#3 integrate ... //depot/projects/trustedbsd/base/release/scripts/compat4x-install.sh#1 branch ... //depot/projects/trustedbsd/base/release/scripts/dict-make.sh#3 integrate ... //depot/projects/trustedbsd/base/release/scripts/doFS.sh#4 integrate ... //depot/projects/trustedbsd/base/release/scripts/manpages-make.sh#3 integrate ... //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#6 integrate ... //depot/projects/trustedbsd/base/sbin/reboot/reboot.8#2 integrate ... //depot/projects/trustedbsd/base/sbin/reboot/reboot.c#2 integrate ... //depot/projects/trustedbsd/base/sbin/vinum/commands.c#3 integrate ... //depot/projects/trustedbsd/base/secure/usr.bin/ssh/Makefile#3 integrate ... //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#5 integrate ... //depot/projects/trustedbsd/base/share/examples/isdn/SupportedCards#3 integrate ... //depot/projects/trustedbsd/base/share/man/man9/Makefile#14 integrate ... //depot/projects/trustedbsd/base/share/man/man9/byteorder.9#2 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#8 integrate ... //depot/projects/trustedbsd/base/share/mk/bsd.subdir.mk#5 integrate ... //depot/projects/trustedbsd/base/share/termcap/termcap.src#6 integrate ... //depot/projects/trustedbsd/base/sys/Makefile#2 integrate ... //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#10 integrate ... //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#9 integrate ... //depot/projects/trustedbsd/base/sys/alpha/include/pmap.h#5 integrate ... //depot/projects/trustedbsd/base/sys/alpha/isa/isa_dma.c#2 integrate ... //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#6 integrate ... //depot/projects/trustedbsd/base/sys/conf/NOTES#3 integrate ... //depot/projects/trustedbsd/base/sys/conf/files#17 integrate ... //depot/projects/trustedbsd/base/sys/conf/files.ia64#5 integrate ... //depot/projects/trustedbsd/base/sys/conf/kmod.mk#7 integrate ... //depot/projects/trustedbsd/base/sys/conf/options#8 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#5 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_log.c#5 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.c#7 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_proxy.c#5 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.c#5 integrate ... //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ipl.h#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#7 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/aac/aac_disk.c#7 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#9 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aacreg.h#5 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aacvar.h#8 integrate ... //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_timer.c#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/ata/ata-dma.c#14 integrate ... //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#9 integrate ... //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/drm/drm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drmP.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_agpsupport.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_auth.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_bufs.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_context.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_dma.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_drawable.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_drv.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_fops.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_init.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_ioctl.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_linux.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_lists.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_lock.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_memory.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_os_freebsd.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_scatter.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_sysctl.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_vm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/gamma.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/gamma_dma.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/gamma_drv.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/gamma_drv.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/i810_drm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_dma.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_drm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_drv.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_drv.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_state.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_ucode.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/mga_warp.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/r128.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/r128_cce.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/r128_drm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/r128_drv.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/r128_drv.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/r128_state.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/radeon.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/radeon_cp.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drv.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/radeon_drv.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/radeon_state.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/sis_drm.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/tdfx.h#1 branch ... //depot/projects/trustedbsd/base/sys/dev/drm/tdfx_drv.c#1 branch ... //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/gem/if_gem.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/gx/if_gx.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/hme/if_hme.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/iir/iir.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/iir/iir_ctrl.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/iir/iir_pci.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.h#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/lge/if_lge.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/acphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/amphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/dcphy.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/e1000phy.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/exphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/inphy.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/lxtphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/mii.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/mii.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/mii_physubr.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/miivar.h#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/mlphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/nsgphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/nsgphyreg.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/nsphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/pnaphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/pnphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/qsphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/rlphy.c#5 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/tdkphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/tlphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/ukphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/ukphy_subr.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/xmphy.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#10 integrate ... //depot/projects/trustedbsd/base/sys/dev/ppbus/pps.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#11 integrate ... //depot/projects/trustedbsd/base/sys/dev/sound/pci/es137x.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97.c#5 integrate ... //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/sym/sym_hipd.c#6 integrate ... //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#10 integrate ... //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#13 integrate ... //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#11 integrate ... //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs.h#11 integrate ... //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs_data.h#11 integrate ... //depot/projects/trustedbsd/base/sys/dev/vinum/vinumio.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#15 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pccard.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pci.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/if_wivar.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/wi_hostap.c#3 integrate ... //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#5 integrate ... //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#9 integrate ... //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#4 integrate ... //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#10 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#7 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/mp_clock.c#2 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#10 integrate ... //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#11 integrate ... //depot/projects/trustedbsd/base/sys/i386/include/pmap.h#5 integrate ... //depot/projects/trustedbsd/base/sys/i386/isa/bs/bsif.c#3 integrate ... //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#7 integrate ... //depot/projects/trustedbsd/base/sys/i386/isa/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/base/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#6 integrate ... //depot/projects/trustedbsd/base/sys/ia64/conf/SKI#4 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#15 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/mca.c#1 branch ... //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#12 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/sal.c#4 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/sscdisk.c#2 integrate ... //depot/projects/trustedbsd/base/sys/ia64/include/mca.h#1 branch ... //depot/projects/trustedbsd/base/sys/ia64/include/pmap.h#4 integrate ... //depot/projects/trustedbsd/base/sys/ia64/isa/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_clock.c#9 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#13 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#11 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#8 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_ntptime.c#5 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#11 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#8 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_time.c#5 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_hints.c#3 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_mchain.c#4 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#10 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#15 integrate ... //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#10 integrate ... //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#9 integrate ... //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#4 integrate ... //depot/projects/trustedbsd/base/sys/modules/Makefile#15 integrate ... //depot/projects/trustedbsd/base/sys/modules/aac/Makefile#2 integrate ... //depot/projects/trustedbsd/base/sys/modules/drm/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/drm/gamma/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/drm/mga/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/drm/r128/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/drm/radeon/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/drm/tdfx/Makefile#1 branch ... //depot/projects/trustedbsd/base/sys/modules/udf/Makefile#2 integrate ... //depot/projects/trustedbsd/base/sys/net/if_media.h#4 integrate ... //depot/projects/trustedbsd/base/sys/net/raw_usrreq.c#4 integrate ... //depot/projects/trustedbsd/base/sys/net/rtsock.c#8 integrate ... //depot/projects/trustedbsd/base/sys/netatalk/ddp_input.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_aal5.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netgraph/ng_socket.c#6 integrate ... //depot/projects/trustedbsd/base/sys/netinet/accf_data.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet/accf_http.c#2 integrate ... //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#7 integrate ... //depot/projects/trustedbsd/base/sys/netinet/ip_mroute.c#6 integrate ... //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#7 integrate ... //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#10 integrate ... //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#6 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/icmp6.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/ip6_mroute.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/raw_ip6.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#7 integrate ... //depot/projects/trustedbsd/base/sys/netipx/ipx_usrreq.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netipx/spx_usrreq.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netkey/keysock.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netnatm/natm.c#5 integrate ... //depot/projects/trustedbsd/base/sys/netsmb/smb_iod.c#4 integrate ... //depot/projects/trustedbsd/base/sys/netsmb/smb_rq.c#5 integrate ... //depot/projects/trustedbsd/base/sys/netsmb/smb_subr.c#5 integrate ... //depot/projects/trustedbsd/base/sys/netsmb/smb_trantcp.c#7 integrate ... //depot/projects/trustedbsd/base/sys/nfsclient/bootp_subr.c#5 integrate ... //depot/projects/trustedbsd/base/sys/nfsclient/nfs_node.c#4 integrate ... //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#8 integrate ... //depot/projects/trustedbsd/base/sys/nfsclient/nfsnode.h#2 integrate ... //depot/projects/trustedbsd/base/sys/pc98/pc98/clock.c#6 integrate ... //depot/projects/trustedbsd/base/sys/pc98/pc98/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/base/sys/pc98/pc98/sio.c#10 integrate ... //depot/projects/trustedbsd/base/sys/pci/if_dc.c#9 integrate ... //depot/projects/trustedbsd/base/sys/pci/if_de.c#2 integrate ... //depot/projects/trustedbsd/base/sys/pci/if_sk.c#5 integrate ... //depot/projects/trustedbsd/base/sys/pci/if_ti.c#7 integrate ... //depot/projects/trustedbsd/base/sys/pci/xrpu.c#2 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/include/frame.h#3 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/include/pcpu.h#3 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/include/pmap.h#3 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/include/spr.h#1 branch ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/copyinout.c#2 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/genassym.c#6 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/locore.s#4 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap.c#7 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/sigcode.S#1 branch ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/swtch.s#4 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/trap.c#5 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/trap_subr.S#1 branch ... //depot/projects/trustedbsd/base/sys/sparc64/include/pmap.h#6 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/include/proc.h#5 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/include/sysarch.h#2 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#15 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#11 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/sys_machdep.c#4 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/sparc64/vm_machdep.c#10 integrate ... //depot/projects/trustedbsd/base/sys/sys/endian.h#1 branch ... //depot/projects/trustedbsd/base/sys/sys/filedesc.h#9 integrate ... //depot/projects/trustedbsd/base/sys/sys/param.h#8 integrate ... //depot/projects/trustedbsd/base/sys/sys/proc.h#11 integrate ... //depot/projects/trustedbsd/base/sys/sys/signalvar.h#5 integrate ... //depot/projects/trustedbsd/base/sys/sys/socketvar.h#10 integrate ... //depot/projects/trustedbsd/base/sys/sys/time.h#5 integrate ... //depot/projects/trustedbsd/base/sys/sys/timepps.h#3 integrate ... //depot/projects/trustedbsd/base/sys/sys/timetc.h#6 integrate ... //depot/projects/trustedbsd/base/sys/sys/timex.h#3 integrate ... //depot/projects/trustedbsd/base/sys/sys/vnode.h#10 integrate ... //depot/projects/trustedbsd/base/sys/vm/pmap.h#6 integrate ... //depot/projects/trustedbsd/base/sys/vm/uma.h#3 integrate ... //depot/projects/trustedbsd/base/sys/vm/uma_core.c#4 integrate ... //depot/projects/trustedbsd/base/sys/vm/uma_int.h#3 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#7 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#9 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_kern.c#4 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_map.c#8 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_map.h#6 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_page.c#7 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_page.h#4 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#7 integrate ... //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#6 integrate ... //depot/projects/trustedbsd/base/tools/regression/README#4 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/file2c/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/join/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/jot/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/make/Makefile#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/sed/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uudecode/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/uuencode/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/regress.sh#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/calendar/Makefile#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendar.1#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.all#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.french#1 branch ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all#1 branch ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes#1 branch ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french#1 branch ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies#1 branch ... //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes#1 branch ... //depot/projects/trustedbsd/base/usr.bin/chat/Makefile#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/chflags/Makefile#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/ee/Makefile#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/fmt/Makefile#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/getopt/getopt.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/head/head.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/ipcrm/ipcrm.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/join/join.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/ktrace/ktrace.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ktrace/ktrace.h#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ktrace/subr.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ldd/Makefile#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ldd/extern.h#1 branch ... //depot/projects/trustedbsd/base/usr.bin/ldd/ldd.c#7 integrate ... //depot/projects/trustedbsd/base/usr.bin/ldd/sods.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/look/look.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/lsvfs/Makefile#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/mklocale/extern.h#1 branch ... //depot/projects/trustedbsd/base/usr.bin/mklocale/lex.l#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/mklocale/yacc.y#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/mkstr/mkstr.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/ncal/Makefile#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ncal/ncal.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ncplist/ncplist.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ncplogin/ncplogin.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/netstat/Makefile#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/netstat/if.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/netstat/inet6.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/netstat/main.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/newkey/Makefile#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/newkey/generic.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/newkey/newkey.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/newkey/update.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/nm/nm.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/passwd/local_passwd.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/passwd/passwd.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/passwd/yp_passwd.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/paste/paste.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/quota/quota.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ranlib/build.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ranlib/extern.h#1 branch ... //depot/projects/trustedbsd/base/usr.bin/ranlib/misc.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ranlib/ranlib.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/ranlib/touch.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/rlogin/Makefile#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/rlogin/rlogin.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/rs/rs.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/rup/rup.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/ruptime/ruptime.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/rusers/rusers.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/strip/Makefile#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/tftp/tftp.1#4 integrate ... //depot/projects/trustedbsd/base/usr.sbin/keyserv/keyserv.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/moused/moused.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/prefix/Makefile#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.8#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/rpc.ypxfrd/ypxfrd_server.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/spray/spray.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/yp_mkdb/yp_mkdb.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ypbind/yp_ping.c#4 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ypbind/ypbind.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/yppush/yppush_main.c#4 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_dblookup.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_server.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ypset/ypset.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.250 2002/04/23 09:03:55 ru Exp $ +# $FreeBSD: src/Makefile,v 1.252 2002/04/29 15:22:01 ru Exp $ # # The user-driven targets are: # @@ -82,12 +82,17 @@ # Define the user-driven targets. These are listed here in alphabetical # order, but that's not important. # -TGTS= afterdistribute all all-man buildkernel buildworld checkdpadd clean \ +TGTS= all all-man buildkernel buildworld checkdpadd clean \ cleandepend cleandir depend distribute distribworld everything \ - hierarchy includes install installcheck installkernel kernel \ + hierarchy includes install installcheck installkernel \ reinstallkernel installmost installworld libraries lint \ mk most obj objlink regress rerelease tags update +.ORDER: buildworld installworld +.ORDER: buildworld distribworld +.ORDER: buildkernel installkernel +.ORDER: buildkernel reinstallkernel + PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKE= PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1 @@ -134,6 +139,13 @@ @echo "--------------------------------------------------------------" # +# kernel +# +# Short hand for `make buildkernel installkernel' +# +kernel: buildkernel installkernel + +# # Perform a few tests to determine if the installed tools are adequate # for building the world. These are for older systems (prior to 2.2.5). # ==== //depot/projects/trustedbsd/base/Makefile.inc1#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.260 2002/04/20 19:04:59 gshapiro Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.262 2002/04/29 15:22:01 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -57,6 +57,9 @@ .if exists(${.CURDIR}/bin) SUBDIR+= bin .endif +.if exists(${.CURDIR}/etc) +SUBDIR+= etc +.endif .if exists(${.CURDIR}/games) && !defined(NOGAMES) SUBDIR+= games .endif @@ -93,11 +96,6 @@ SUBDIR+= usr.sbin .endif -# etc must be last for "distribute" to work -.if exists(${.CURDIR}/etc) -SUBDIR+= etc -.endif - # These are last, since it is nice to at least get the base system # rebuilt before you do them. .if defined(LOCAL_DIRS) @@ -108,6 +106,10 @@ .endfor .endif +.if defined(SUBDIR_OVERRIDE) +SUBDIR= ${SUBDIR_OVERRIDE} +.endif + .if defined(NOCLEANDIR) CLEANDIR= clean cleandepend .else @@ -239,7 +241,7 @@ # Attempt to rebuild the entire system, with reasonable chance of # success, regardless of how old your existing system is. # -buildworld: +_worldtmp: @echo @echo "--------------------------------------------------------------" @echo ">>> Rebuilding the temporary build tree" @@ -258,11 +260,13 @@ mkdir -p ${WORLDTMP}/usr/include/${_dir} .endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} +_bootstrap-tools: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 1: bootstrap tools" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${BMAKE} bootstrap-tools +_cleanobj: .if !defined(NOCLEAN) @echo @echo "--------------------------------------------------------------" @@ -270,47 +274,62 @@ @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/} .endif +_obj: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2: rebuilding the object tree" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} par-obj +_build-tools: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2: build tools" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${TMAKE} build-tools +_cross-tools: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 3: cross tools" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${XMAKE} cross-tools +_includes: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: populating ${WORLDTMP}/usr/include" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes +_libraries: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: building libraries" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG libraries +_depend: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: make dependencies" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} par-depend +everything: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: building everything.." @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} all -everything: - @echo "--------------------------------------------------------------" - @echo ">>> Building everything.." - @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${WMAKE} all + +WMAKE_TGTS= +.if !defined(SUBDIR_OVERRIDE) +WMAKE_TGTS+= _worldtmp _bootstrap-tools +.endif +WMAKE_TGTS+= _cleanobj _obj _build-tools +.if !defined(SUBDIR_OVERRIDE) +WMAKE_TGTS+= _cross-tools +.endif +WMAKE_TGTS+= _includes _libraries _depend everything + +buildworld: ${WMAKE_TGTS} +.ORDER: ${WMAKE_TGTS} # # installcheck @@ -361,7 +380,7 @@ @echo ">>> Installing everything.." @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if !defined(NOMAN) +.if !defined(NOMAN) && !defined(NO_MAKEDB_RUN) @echo @echo "--------------------------------------------------------------" @echo ">>> Rebuilding man page indices" @@ -472,19 +491,9 @@ # # Install the kernel defined by INSTALLKERNEL # -installkernel: +installkernel reinstallkernel: cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ - ${CROSSENV} ${MAKE} KERNEL=${INSTKERNNAME} install -reinstallkernel: - cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ - ${CROSSENV} ${MAKE} KERNEL=${INSTKERNNAME} reinstall - -# -# kernel -# -# Short hand for `make buildkernel installkernel' -# -kernel: buildkernel installkernel + ${CROSSENV} ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//} # # update ==== //depot/projects/trustedbsd/base/contrib/ipfilter/misc.c#3 (text+ko) ==== @@ -53,7 +53,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)misc.c 1.3 2/4/96 (C) 1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: misc.c,v 2.2.2.7 2002/02/22 15:32:55 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: misc.c,v 2.2.2.8 2002/04/26 10:24:24 darrenr Exp $"; #endif extern int opts; @@ -82,7 +82,8 @@ i++; printf("%02x", *s++ & 0xff); } - putchar(' '); + if (i + 1 != len) + putchar(' '); } putchar('\n'); return; @@ -103,9 +104,29 @@ (void)printf(",%d", ntohs(tcp->th_sport)); (void)printf(" > "); (void)printf("%s", inet_ntoa(ip->ip_dst)); - if (!(ip->ip_off & IP_OFFMASK)) + if (!(ip->ip_off & IP_OFFMASK)) { if (ip->ip_p == IPPROTO_TCP || ip->ip_p == IPPROTO_UDP) (void)printf(",%d", ntohs(tcp->th_dport)); + if ((ip->ip_p == IPPROTO_TCP) && (tcp->th_flags)) { + putchar(' '); + if (tcp->th_flags & TH_FIN) + putchar('F'); + if (tcp->th_flags & TH_SYN) + putchar('S'); + if (tcp->th_flags & TH_RST) + putchar('R'); + if (tcp->th_flags & TH_PUSH) + putchar('P'); + if (tcp->th_flags & TH_ACK) + putchar('A'); + if (tcp->th_flags & TH_URG) + putchar('U'); + if (tcp->th_flags & TH_ECN) + putchar('E'); + if (tcp->th_flags & TH_CWR) + putchar('C'); + } + } putchar('\n'); } ==== //depot/projects/trustedbsd/base/contrib/ipfilter/printnat.c#3 (text+ko) ==== @@ -58,7 +58,7 @@ #endif #if !defined(lint) -static const char rcsid[] = "@(#)$Id: printnat.c,v 1.1.2.7 2002/04/24 17:35:37 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: printnat.c,v 1.1.2.8 2002/04/25 16:44:13 darrenr Exp $"; #endif @@ -298,8 +298,7 @@ struct servent *sv; int bits; - if (np->in_p != 0) - pr = getprotobynumber(np->in_p); + pr = getprotobynumber(np->in_p); switch (np->in_redir) { ==== //depot/projects/trustedbsd/base/contrib/ipfilter/test/Makefile#4 (text+ko) ==== @@ -22,7 +22,7 @@ ntests: n1 n2 n3 n4 n5 n6 n7 -nitests: ni1 ni2 ni3 ni4 +nitests: ni1 ni2 ni3 ni4 ni5 intests: in1 in2 in3 in4 @@ -51,7 +51,7 @@ n1 n2 n3 n4 n5 n6 n7: @/bin/sh ./nattest $@ -ni1 ni2 ni3 ni4: +ni1 ni2 ni3 ni4 ni5: @/bin/sh ./natipftest $@ in1 in2 in3 in4: @@ -67,7 +67,7 @@ /bin/rm -f f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f13 f12 f14 f15 f16 f17 /bin/rm -f i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 /bin/rm -f n1 n2 n3 n4 n5 n6 n7 - /bin/rm -f ni1 ni2 ni3 ni4 + /bin/rm -f ni1 ni2 ni3 ni4 ni5 /bin/rm -f in1 in2 in3 in4 /bin/rm -f l1 /bin/rm -f ipv6.1 ipv6.2 ==== //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni1#2 (text+ko) ==== @@ -1,3 +1,3 @@ -4500 0028 4706 4000 0111 ced8 0606 0606 0404 0404 afc9 829e 0014 0b2d 0402 0000 3be5 468d 000a cfc3 -4500 0038 809a 0000 ff01 8f31 0303 0303 0202 0202 0b00 a537 0000 0000 4500 0028 4703 4000 0111 ef89 0202 0202 0404 0404 afc9 829e 0014 1d4f +4500 0028 4706 4000 0111 ced8 0606 0606 0404 0404 afc9 829e 0014 0b2d 0402 0000 3be5 468d 000a cfc3 +4500 0038 809a 0000 ff01 8f31 0303 0303 0202 0202 0b00 a537 0000 0000 4500 0028 4703 4000 0111 ef89 0202 0202 0404 0404 afc9 829e 0014 1d4f ------------------------------- ==== //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni2#2 (text+ko) ==== @@ -1,10 +1,10 @@ -4510 002c bd0d 4000 3e06 ea1d 0101 0101 c0a8 0133 9c40 0077 a664 2485 0000 0000 6002 4000 cea4 0000 0204 05b4 -4500 002c ce83 4000 7e06 98b7 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 6012 2238 62a5 0000 0204 05b4 -4510 0028 bd0e 4000 3e06 ea20 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a22 5010 4470 cbdf 0000 -4500 005b cf83 4000 7e06 9788 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 5018 2238 b5d9 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0a -4510 0028 bd18 4000 3e06 ea16 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5010 4470 cbac 0000 -4510 002e bd1e 4000 3e06 ea0a 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5018 4470 deb6 0000 0000 0000 0d0a -4500 0048 e383 4000 7e06 839b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c 5018 2232 fe54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 -4500 05dc e483 4000 7e06 7d07 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c 5010 2232 9f6c 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 222! 2 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3331 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 -4500 0038 d71d 4000 4001 f0be 0101 0101 c0a8 0133 0304 348b 0000 05a0 4500 05dc e483 4000 7e06 8707 c0a8 0133 0101 0101 0077 9c40 fbdf 1a75 +4510 002c bd0d 4000 3e06 ea1d 0101 0101 c0a8 0133 9c40 0077 a664 2485 0000 0000 6002 4000 2ca8 0000 0204 05b4 +4500 002c ce83 4000 7e06 98b7 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 6012 2238 c0a8 0000 0204 05b4 +4510 0028 bd0e 4000 3e06 ea20 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a22 5010 4470 29e3 0000 +4500 005b cf83 4000 7e06 9788 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 5018 2238 ce2a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0a +4510 0028 bd18 4000 3e06 ea16 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5010 4470 29b0 0000 +4510 002e bd1e 4000 3e06 ea0a 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5018 4470 1c98 0000 0000 0000 0d0a +4500 0048 e383 4000 7e06 839b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c 5018 2232 d80a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 +4500 05dc e483 4000 7e06 7d07 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c 5010 2232 9f2d 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 222! 2 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3331 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 +4500 0038 d71d 4000 4001 f0be 0101 0101 c0a8 0133 0304 348b 0000 05a0 4500 05dc e483 4000 7e06 8707 c0a8 0133 0101 0101 0077 9c40 fbdf 1a75 ------------------------------- ==== //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -4500 003c 4706 4000 ff06 28aa 0606 0606 0404 0404 9c40 0050 0000 0001 0000 0000 a002 16d0 849a 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 -4500 0038 809a 0000 ff01 3323 0303 0303 0202 0202 0303 acab 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 -4500 0058 809a 0000 ff01 3303 0303 0303 0202 0202 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 +4500 003c 4706 4000 ff06 28aa 0606 0606 0404 0404 9c40 0050 0000 0001 0000 0000 a002 16d0 849a 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 +4500 0038 809a 0000 ff01 3323 0303 0303 0202 0202 0303 acab 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 +4500 0058 809a 0000 ff01 3303 0303 0303 0202 0202 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 ------------------------------- ==== //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni2#2 (text+ko) ==== @@ -4,28 +4,28 @@ 0a01 0201 c0a8 0133 05f6 0077 a664 2485 0000 0000 -6002 4000 5aef 0000 0204 05b4 +6002 4000 b8f2 0000 0204 05b4 [in,xl0] 4500 002c ce83 4000 7e06 98b7 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 -6012 2238 62a5 0000 0204 05b4 0000 +6012 2238 c0a8 0000 0204 05b4 0000 [out,xl0] 4510 0028 bd0e 4000 3e06 ea20 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a22 -5010 4470 582a 0000 +5010 4470 b62d 0000 [in,xl0] 4500 005b cf83 4000 7e06 9788 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 -5018 2238 b5d9 0000 0000 0000 0000 0000 +5018 2238 ce2a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0a @@ -35,21 +35,21 @@ 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a55 -5010 4470 57f7 0000 +5010 4470 b5fa 0000 [out,xl0] 4510 002e bd1e 4000 3e06 ea0a 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a55 -5018 4470 6b01 0000 0000 0000 0d0a +5018 4470 a8e2 0000 0000 0000 0d0a [in,xl0] 4500 0048 e383 4000 7e06 839b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c -5018 2232 fe54 0000 0000 0000 0000 0000 +5018 2232 d80a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 @@ -58,7 +58,7 @@ c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c -5010 2232 9f6c 0000 0000 0000 0000 0000 +5010 2232 9f2d 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 ==== //depot/projects/trustedbsd/base/contrib/lukemftp/src/fetch.c#2 (text+ko) ==== @@ -617,7 +617,7 @@ memset(&hints, 0, sizeof(hints)); hints.ai_flags = 0; - hints.ai_family = AF_UNSPEC; + hints.ai_family = family; hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = 0; error = getaddrinfo(host, NULL, &hints, &res0); ==== //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.1#2 (text+ko) ==== @@ -77,7 +77,7 @@ Internet file transfer program .Sh SYNOPSIS .Nm "" -.Op Fl AadefginpRtvV +.Op Fl 46AadefginpRtvV .Bk -words .Op Fl o Ar output .Ek @@ -146,6 +146,14 @@ Options may be specified at the command line, or to the command interpreter. .Bl -tag -width "port " +.It Fl 4 +Forces +.Nm +to only use IPv4 addresses. +.It Fl 6 +Forces +.Nm +to only use IPv6 addresses. .It Fl A Force active mode ftp. By default, ==== //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.c#2 (text+ko) ==== @@ -149,7 +149,7 @@ memset(&hints, 0, sizeof(hints)); portnum = parseport(port, FTP_PORT); hints.ai_flags = AI_CANONNAME; - hints.ai_family = AF_UNSPEC; + hints.ai_family = family; hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = 0; error = getaddrinfo(host, NULL, &hints, &res0); @@ -453,9 +453,10 @@ if (dig > 4 && pflag == 1 && isdigit(c)) pflag = 2; if (pflag == 2) { - if (c != '\r' && c != ')') - *pt++ = c; - else { + if (c != '\r' && c != ')') { + if (pt < &pasv[sizeof(pasv) - 1]) + *pt++ = c; + } else { *pt = '\0'; pflag = 3; } @@ -689,7 +690,7 @@ rc = -1; switch (curtype) { case TYPE_A: - rc = fseek(fin, (long) restart_point, SEEK_SET); + rc = fseeko(fin, restart_point, SEEK_SET); break; case TYPE_I: case TYPE_L: @@ -1134,18 +1135,17 @@ case TYPE_A: if (is_retr && restart_point) { int ch; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Apr 29 21: 8:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10A9537B404; Mon, 29 Apr 2002 21:07:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1E4D237B41A for ; Mon, 29 Apr 2002 21:06:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3U46ln94469 for perforce@freebsd.org; Mon, 29 Apr 2002 21:06:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 29 Apr 2002 21:06:47 -0700 (PDT) Message-Id: <200204300406.g3U46ln94469@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10506 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10506 Change 10506 by rwatson@rwatson_curry on 2002/04/29 21:06:19 Integ TrustedBSD base to TrustedBSD MAC tree. Pick up various things, including UMA fixes, devfs locking, a bunch of gratuiutous include file tweaks, et al. Affected files ... ... //depot/projects/trustedbsd/mac/Makefile#6 integrate ... //depot/projects/trustedbsd/mac/Makefile.inc1#12 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/misc.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/printnat.c#3 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni2#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni4#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni5#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni2#2 integrate ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni5#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni5.ipf#1 branch ... //depot/projects/trustedbsd/mac/contrib/ipfilter/test/regress/ni5.nat#1 branch ... //depot/projects/trustedbsd/mac/contrib/lukemftp/src/fetch.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp.1#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp_var.h#2 integrate ... //depot/projects/trustedbsd/mac/contrib/lukemftp/src/main.c#2 integrate ... //depot/projects/trustedbsd/mac/etc/Makefile#13 integrate ... //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#13 integrate ... //depot/projects/trustedbsd/mac/etc/mtree/BSD.usr.dist#10 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/other#4 integrate ... //depot/projects/trustedbsd/mac/etc/rc#14 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#11 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes-o.real#3 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#5 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2-o#4 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/freebsd-tips#6 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/gerrold.limerick#2 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/limerick#2 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/zippy#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/man/man/man.c#5 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/backupfile.c#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/backupfile.h#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/common.h#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/getopt.c#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/getopt.h#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/inp.c#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/inp.h#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/patch.c#3 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/pch.c#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/pch.h#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/util.c#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/util.h#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/version.c#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/patch/version.h#2 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/perl/library/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/mac/include/rpc/clnt.h#3 integrate ... //depot/projects/trustedbsd/mac/include/rpc/pmap_clnt.h#3 integrate ... //depot/projects/trustedbsd/mac/include/rpc/svc.h#4 integrate ... //depot/projects/trustedbsd/mac/include/rpc/xdr.h#4 integrate ... //depot/projects/trustedbsd/mac/include/rpcsvc/ypclnt.h#4 integrate ... //depot/projects/trustedbsd/mac/kerberos5/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/kerberos5/Makefile.inc#3 integrate ... //depot/projects/trustedbsd/mac/kerberos5/include/version.h#2 integrate ... //depot/projects/trustedbsd/mac/kerberos5/lib/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/kerberos5/lib/libkrb5/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/kerberos5/libexec/hprop/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/kerberos5/libexec/hpropd/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-master/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-slave/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/kerberos5/libexec/k5admind/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/kerberos5/libexec/k5passwdd/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/kerberos5/libexec/kdc/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5admin/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5destroy/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5init/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5list/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5passwd/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5su/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/kerberos5/usr.sbin/k5stash/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/kerberos5/usr.sbin/ktutil/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/kerberosIV/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/kerberosIV/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/mac/lib/csu/i386-elf/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/lib/csu/sparc64/crt1.c#7 integrate ... //depot/projects/trustedbsd/mac/lib/libc/rpc/auth_time.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_dg.c#5 integrate ... //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_raw.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/rpc/clnt_vc.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/rpc/crypt_client.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/rpc/key_call.c#5 integrate ... //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_soc.c#5 integrate ... //depot/projects/trustedbsd/mac/lib/libc/rpc/svc.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_dg.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_raw.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/rpc/svc_vc.c#5 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/Makefile.inc#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/fpu.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/fpu_add.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/fpu_explode.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/fpu_extern.h#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/fpu_implode.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/fpu_qp.c#1 branch ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/fpu/fpu_subr.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/Makefile.inc#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#1 branch ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/__sparc_utrap.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/__sparc_utrap_emul.c#1 branch ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/__sparc_utrap_private.h#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/__sparc_utrap_setup.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/assym.s#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/sparc64/sys/sigcode.S#1 branch ... //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_rec.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc/yp/xdryp.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/yp/yplib.c#6 integrate ... //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_unix/pam_unix.c#9 integrate ... //depot/projects/trustedbsd/mac/lib/libutil/pw_copy.c#1 branch ... //depot/projects/trustedbsd/mac/lib/libutil/pw_util.c#1 branch ... //depot/projects/trustedbsd/mac/lib/libypclnt/ypclnt_passwd.c#2 integrate ... //depot/projects/trustedbsd/mac/libexec/rpc.rquotad/rquotad.c#3 integrate ... //depot/projects/trustedbsd/mac/libexec/rpc.rstatd/rstat_proc.c#3 integrate ... //depot/projects/trustedbsd/mac/libexec/rpc.rusersd/rusers_proc.c#3 integrate ... //depot/projects/trustedbsd/mac/libexec/rpc.rwalld/rwalld.c#4 integrate ... //depot/projects/trustedbsd/mac/libexec/rpc.sprayd/sprayd.c#3 integrate ... //depot/projects/trustedbsd/mac/libexec/rtld-elf/ia64/reloc.c#3 integrate ... //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#6 integrate ... //depot/projects/trustedbsd/mac/libexec/tftpd/tftpd.c#5 integrate ... //depot/projects/trustedbsd/mac/libexec/ypxfr/ypxfr_getmap.c#3 integrate ... //depot/projects/trustedbsd/mac/libexec/ypxfr/ypxfr_misc.c#4 integrate ... //depot/projects/trustedbsd/mac/release/Makefile#13 integrate ... //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#15 integrate ... //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 integrate ... //depot/projects/trustedbsd/mac/release/scripts/base-install.sh#1 branch ... //depot/projects/trustedbsd/mac/release/scripts/catpages-make.sh#3 integrate ... //depot/projects/trustedbsd/mac/release/scripts/compat4x-install.sh#1 branch ... //depot/projects/trustedbsd/mac/release/scripts/dict-make.sh#3 integrate ... //depot/projects/trustedbsd/mac/release/scripts/doFS.sh#4 integrate ... //depot/projects/trustedbsd/mac/release/scripts/manpages-make.sh#3 integrate ... //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.c#6 integrate ... //depot/projects/trustedbsd/mac/sbin/reboot/reboot.8#2 integrate ... //depot/projects/trustedbsd/mac/sbin/reboot/reboot.c#2 integrate ... //depot/projects/trustedbsd/mac/sbin/vinum/commands.c#3 integrate ... //depot/projects/trustedbsd/mac/secure/usr.bin/ssh/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/secure/usr.sbin/sshd/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/share/examples/isdn/SupportedCards#3 integrate ... //depot/projects/trustedbsd/mac/share/man/man9/Makefile#15 integrate ... //depot/projects/trustedbsd/mac/share/man/man9/byteorder.9#2 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.prog.mk#8 integrate ... //depot/projects/trustedbsd/mac/share/mk/bsd.subdir.mk#5 integrate ... //depot/projects/trustedbsd/mac/share/termcap/termcap.src#5 integrate ... //depot/projects/trustedbsd/mac/sys/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/include/pmap.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/isa/isa_dma.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#6 integrate ... //depot/projects/trustedbsd/mac/sys/conf/NOTES#5 integrate ... //depot/projects/trustedbsd/mac/sys/conf/files#26 integrate ... //depot/projects/trustedbsd/mac/sys/conf/files.ia64#5 integrate ... //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#6 integrate ... //depot/projects/trustedbsd/mac/sys/conf/options#15 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/fil.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_log.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_nat.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_proxy.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ip_state.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/contrib/ipfilter/netinet/ipl.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac_cam.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac_cam.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac_disk.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac_pci.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aacreg.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aacvar.h#8 integrate ... //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_timer.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/ata/ata-dma.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/dev/ciss/ciss.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drmP.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_agpsupport.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_auth.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_bufs.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_context.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_dma.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drawable.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_fops.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_init.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_ioctl.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_linux.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_lists.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_lock.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_memory.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_os_freebsd.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_scatter.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_sysctl.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_vm.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/gamma.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/gamma_dma.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/gamma_drv.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/gamma_drv.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/i810_drm.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/mga.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/mga_dma.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/mga_drm.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/mga_drv.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/mga_drv.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/mga_state.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/mga_ucode.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/mga_warp.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/r128.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/r128_cce.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/r128_drm.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/r128_drv.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/r128_drv.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/r128_state.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/radeon.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_cp.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_drm.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_drv.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_drv.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/radeon_state.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/sis_drm.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/tdfx.h#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/drm/tdfx_drv.c#1 branch ... //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/gem/if_gem.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/gx/if_gx.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/hme/if_hme.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/iir/iir.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/iir/iir_ctrl.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/iir/iir_pci.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.h#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/lge/if_lge.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/acphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/amphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/brgphy.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/dcphy.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/e1000phy.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/exphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/inphy.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/lxtphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/mii.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/mii.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/mii_physubr.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/miivar.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/mlphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/nsgphy.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/nsgphyreg.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/nsphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/pnaphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/pnphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/qsphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/rlphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/tdkphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/tlphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/ukphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/ukphy_subr.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/xmphy.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/my/if_my.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/dev/ppbus/pps.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/sio/sio.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/dev/sound/pci/es137x.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/ac97.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/ac97.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/sound.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/sym/sym_hipd.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#11 integrate ... //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs.h#11 integrate ... //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs_data.h#11 integrate ... //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumio.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#16 integrate ... //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi_pccard.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi_pci.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/wi/if_wivar.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/wi/wi_hostap.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#15 integrate ... //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#10 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/identcpu.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/mp_clock.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/i386/include/pmap.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/i386/isa/bs/bsif.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/i386/isa/clock.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/i386/isa/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/conf/SKI#4 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#14 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/mca.c#1 branch ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/sal.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/sscdisk.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/include/mca.h#1 branch ... //depot/projects/trustedbsd/mac/sys/ia64/include/pmap.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/isa/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_clock.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#13 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_ntptime.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_tc.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_time.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_hints.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_mchain.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_prf.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#14 integrate ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#15 integrate ... //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#13 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/modules/Makefile#16 integrate ... //depot/projects/trustedbsd/mac/sys/modules/aac/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/sys/modules/drm/Makefile#1 branch ... //depot/projects/trustedbsd/mac/sys/modules/drm/gamma/Makefile#1 branch ... //depot/projects/trustedbsd/mac/sys/modules/drm/mga/Makefile#1 branch ... //depot/projects/trustedbsd/mac/sys/modules/drm/r128/Makefile#1 branch ... //depot/projects/trustedbsd/mac/sys/modules/drm/radeon/Makefile#1 branch ... //depot/projects/trustedbsd/mac/sys/modules/drm/tdfx/Makefile#1 branch ... //depot/projects/trustedbsd/mac/sys/modules/udf/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/sys/net/if_media.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/net/raw_usrreq.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/net/rtsock.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/netatalk/ddp_input.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_aal5.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_socket.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/accf_data.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/accf_http.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/icmp6.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_mroute.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/raw_ip6.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/udp6_usrreq.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/netipx/ipx_usrreq.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netipx/spx_usrreq.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netkey/keysock.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netnatm/natm.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/netsmb/smb_iod.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netsmb/smb_rq.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/netsmb/smb_subr.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/netsmb/smb_trantcp.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/nfsclient/bootp_subr.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_node.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfsnode.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/pc98/pc98/clock.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/pc98/pc98/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/pc98/pc98/sio.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/pci/if_dc.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/pci/if_de.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/pci/if_sk.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/pci/xrpu.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/powerpc/include/frame.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/powerpc/include/pcpu.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/powerpc/include/pmap.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/powerpc/include/spr.h#1 branch ... //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/copyinout.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/genassym.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/locore.s#4 integrate ... //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/pmap.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/sigcode.S#1 branch ... //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/swtch.s#4 integrate ... //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/trap.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/trap_subr.S#1 branch ... //depot/projects/trustedbsd/mac/sys/sparc64/include/pmap.h#6 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/include/proc.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/include/sysarch.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/machdep.c#14 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/sys_machdep.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/vm_machdep.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/sys/endian.h#1 branch ... //depot/projects/trustedbsd/mac/sys/sys/filedesc.h#8 integrate ... //depot/projects/trustedbsd/mac/sys/sys/param.h#8 integrate ... //depot/projects/trustedbsd/mac/sys/sys/proc.h#13 integrate ... //depot/projects/trustedbsd/mac/sys/sys/signalvar.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#12 integrate ... //depot/projects/trustedbsd/mac/sys/sys/time.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/sys/timepps.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/sys/timetc.h#6 integrate ... //depot/projects/trustedbsd/mac/sys/sys/timex.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/sys/vnode.h#23 integrate ... //depot/projects/trustedbsd/mac/sys/vm/pmap.h#6 integrate ... //depot/projects/trustedbsd/mac/sys/vm/uma.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/vm/uma_int.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_glue.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_kern.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_map.h#6 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_page.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#6 integrate ... //depot/projects/trustedbsd/mac/tools/regression/README#4 integrate ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/file2c/regress.sh#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/join/regress.sh#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/jot/regress.sh#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/make/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/sed/regress.sh#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uudecode/regress.sh#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/uuencode/regress.sh#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.sh#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/calendar/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/calendar/calendar.1#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.all#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.french#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/chat/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/chflags/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ee/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/fmt/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/getopt/getopt.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/head/head.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ipcrm/ipcrm.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/join/join.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ktrace/ktrace.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ktrace/ktrace.h#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ktrace/subr.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ldd/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ldd/extern.h#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/ldd/ldd.c#7 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ldd/sods.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/look/look.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/lsvfs/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/mklocale/extern.h#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/mklocale/lex.l#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/mklocale/yacc.y#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/mkstr/mkstr.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ncal/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ncal/ncal.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ncplist/ncplist.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ncplogin/ncplogin.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/netstat/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/netstat/if.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/netstat/inet6.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/netstat/main.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/newkey/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/newkey/generic.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/newkey/newkey.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/newkey/update.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/nm/nm.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/passwd/local_passwd.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/passwd/passwd.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/passwd/yp_passwd.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/paste/paste.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/quota/quota.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ranlib/build.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ranlib/extern.h#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/ranlib/misc.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ranlib/ranlib.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ranlib/touch.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/rlogin/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/rlogin/rlogin.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/rs/rs.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/rup/rup.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/ruptime/ruptime.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/rusers/rusers.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/strip/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/tftp/tftp.1#4 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/keyserv/keyserv.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/moused/moused.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/prefix/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pstat/pstat.8#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pstat/pstat.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/rpc.ypxfrd/ypxfrd_server.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/spray/spray.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/yp_mkdb/yp_mkdb.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ypbind/yp_ping.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ypbind/ypbind.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/yppush/yppush_main.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ypserv/yp_dblookup.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ypserv/yp_server.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ypset/ypset.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.250 2002/04/23 09:03:55 ru Exp $ +# $FreeBSD: src/Makefile,v 1.252 2002/04/29 15:22:01 ru Exp $ # # The user-driven targets are: # @@ -82,12 +82,17 @@ # Define the user-driven targets. These are listed here in alphabetical # order, but that's not important. # -TGTS= afterdistribute all all-man buildkernel buildworld checkdpadd clean \ +TGTS= all all-man buildkernel buildworld checkdpadd clean \ cleandepend cleandir depend distribute distribworld everything \ - hierarchy includes install installcheck installkernel kernel \ + hierarchy includes install installcheck installkernel \ reinstallkernel installmost installworld libraries lint \ mk most obj objlink regress rerelease tags update +.ORDER: buildworld installworld +.ORDER: buildworld distribworld +.ORDER: buildkernel installkernel +.ORDER: buildkernel reinstallkernel + PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKE= PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1 @@ -134,6 +139,13 @@ @echo "--------------------------------------------------------------" # +# kernel +# +# Short hand for `make buildkernel installkernel' +# +kernel: buildkernel installkernel + +# # Perform a few tests to determine if the installed tools are adequate # for building the world. These are for older systems (prior to 2.2.5). # ==== //depot/projects/trustedbsd/mac/Makefile.inc1#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.260 2002/04/20 19:04:59 gshapiro Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.262 2002/04/29 15:22:01 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -57,6 +57,9 @@ .if exists(${.CURDIR}/bin) SUBDIR+= bin .endif +.if exists(${.CURDIR}/etc) +SUBDIR+= etc +.endif .if exists(${.CURDIR}/games) && !defined(NOGAMES) SUBDIR+= games .endif @@ -93,11 +96,6 @@ SUBDIR+= usr.sbin .endif -# etc must be last for "distribute" to work -.if exists(${.CURDIR}/etc) -SUBDIR+= etc -.endif - # These are last, since it is nice to at least get the base system # rebuilt before you do them. .if defined(LOCAL_DIRS) @@ -108,6 +106,10 @@ .endfor .endif +.if defined(SUBDIR_OVERRIDE) +SUBDIR= ${SUBDIR_OVERRIDE} +.endif + .if defined(NOCLEANDIR) CLEANDIR= clean cleandepend .else @@ -239,7 +241,7 @@ # Attempt to rebuild the entire system, with reasonable chance of # success, regardless of how old your existing system is. # -buildworld: +_worldtmp: @echo @echo "--------------------------------------------------------------" @echo ">>> Rebuilding the temporary build tree" @@ -258,11 +260,13 @@ mkdir -p ${WORLDTMP}/usr/include/${_dir} .endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} +_bootstrap-tools: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 1: bootstrap tools" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${BMAKE} bootstrap-tools +_cleanobj: .if !defined(NOCLEAN) @echo @echo "--------------------------------------------------------------" @@ -270,47 +274,62 @@ @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} ${CLEANDIR:S/^/par-/} .endif +_obj: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2: rebuilding the object tree" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} par-obj +_build-tools: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2: build tools" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${TMAKE} build-tools +_cross-tools: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 3: cross tools" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${XMAKE} cross-tools +_includes: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: populating ${WORLDTMP}/usr/include" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} SHARED=symlinks includes +_libraries: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: building libraries" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} -DNOHTML -DNOINFO -DNOMAN -DNOFSCHG libraries +_depend: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: make dependencies" @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} par-depend +everything: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 4: building everything.." @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${WMAKE} all -everything: - @echo "--------------------------------------------------------------" - @echo ">>> Building everything.." - @echo "--------------------------------------------------------------" - cd ${.CURDIR}; ${WMAKE} all + +WMAKE_TGTS= +.if !defined(SUBDIR_OVERRIDE) +WMAKE_TGTS+= _worldtmp _bootstrap-tools +.endif +WMAKE_TGTS+= _cleanobj _obj _build-tools +.if !defined(SUBDIR_OVERRIDE) +WMAKE_TGTS+= _cross-tools +.endif +WMAKE_TGTS+= _includes _libraries _depend everything + +buildworld: ${WMAKE_TGTS} +.ORDER: ${WMAKE_TGTS} # # installcheck @@ -361,7 +380,7 @@ @echo ">>> Installing everything.." @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install -.if !defined(NOMAN) +.if !defined(NOMAN) && !defined(NO_MAKEDB_RUN) @echo @echo "--------------------------------------------------------------" @echo ">>> Rebuilding man page indices" @@ -472,19 +491,9 @@ # # Install the kernel defined by INSTALLKERNEL # -installkernel: +installkernel reinstallkernel: cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ - ${CROSSENV} ${MAKE} KERNEL=${INSTKERNNAME} install -reinstallkernel: - cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ - ${CROSSENV} ${MAKE} KERNEL=${INSTKERNNAME} reinstall - -# -# kernel -# -# Short hand for `make buildkernel installkernel' -# -kernel: buildkernel installkernel + ${CROSSENV} ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//} # # update ==== //depot/projects/trustedbsd/mac/contrib/ipfilter/misc.c#3 (text+ko) ==== @@ -53,7 +53,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)misc.c 1.3 2/4/96 (C) 1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: misc.c,v 2.2.2.7 2002/02/22 15:32:55 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: misc.c,v 2.2.2.8 2002/04/26 10:24:24 darrenr Exp $"; #endif extern int opts; @@ -82,7 +82,8 @@ i++; printf("%02x", *s++ & 0xff); } - putchar(' '); + if (i + 1 != len) + putchar(' '); } putchar('\n'); return; @@ -103,9 +104,29 @@ (void)printf(",%d", ntohs(tcp->th_sport)); (void)printf(" > "); (void)printf("%s", inet_ntoa(ip->ip_dst)); - if (!(ip->ip_off & IP_OFFMASK)) + if (!(ip->ip_off & IP_OFFMASK)) { if (ip->ip_p == IPPROTO_TCP || ip->ip_p == IPPROTO_UDP) (void)printf(",%d", ntohs(tcp->th_dport)); + if ((ip->ip_p == IPPROTO_TCP) && (tcp->th_flags)) { + putchar(' '); + if (tcp->th_flags & TH_FIN) + putchar('F'); + if (tcp->th_flags & TH_SYN) + putchar('S'); + if (tcp->th_flags & TH_RST) + putchar('R'); + if (tcp->th_flags & TH_PUSH) + putchar('P'); + if (tcp->th_flags & TH_ACK) + putchar('A'); + if (tcp->th_flags & TH_URG) + putchar('U'); + if (tcp->th_flags & TH_ECN) + putchar('E'); + if (tcp->th_flags & TH_CWR) + putchar('C'); + } + } putchar('\n'); } ==== //depot/projects/trustedbsd/mac/contrib/ipfilter/printnat.c#3 (text+ko) ==== @@ -58,7 +58,7 @@ #endif #if !defined(lint) -static const char rcsid[] = "@(#)$Id: printnat.c,v 1.1.2.7 2002/04/24 17:35:37 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: printnat.c,v 1.1.2.8 2002/04/25 16:44:13 darrenr Exp $"; #endif @@ -298,8 +298,7 @@ struct servent *sv; int bits; - if (np->in_p != 0) - pr = getprotobynumber(np->in_p); + pr = getprotobynumber(np->in_p); switch (np->in_redir) { ==== //depot/projects/trustedbsd/mac/contrib/ipfilter/test/Makefile#4 (text+ko) ==== @@ -22,7 +22,7 @@ ntests: n1 n2 n3 n4 n5 n6 n7 -nitests: ni1 ni2 ni3 ni4 +nitests: ni1 ni2 ni3 ni4 ni5 intests: in1 in2 in3 in4 @@ -51,7 +51,7 @@ n1 n2 n3 n4 n5 n6 n7: @/bin/sh ./nattest $@ -ni1 ni2 ni3 ni4: +ni1 ni2 ni3 ni4 ni5: @/bin/sh ./natipftest $@ in1 in2 in3 in4: @@ -67,7 +67,7 @@ /bin/rm -f f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f13 f12 f14 f15 f16 f17 /bin/rm -f i1 i2 i3 i4 i5 i6 i7 i8 i9 i10 i11 /bin/rm -f n1 n2 n3 n4 n5 n6 n7 - /bin/rm -f ni1 ni2 ni3 ni4 + /bin/rm -f ni1 ni2 ni3 ni4 ni5 /bin/rm -f in1 in2 in3 in4 /bin/rm -f l1 /bin/rm -f ipv6.1 ipv6.2 ==== //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni1#2 (text+ko) ==== @@ -1,3 +1,3 @@ -4500 0028 4706 4000 0111 ced8 0606 0606 0404 0404 afc9 829e 0014 0b2d 0402 0000 3be5 468d 000a cfc3 -4500 0038 809a 0000 ff01 8f31 0303 0303 0202 0202 0b00 a537 0000 0000 4500 0028 4703 4000 0111 ef89 0202 0202 0404 0404 afc9 829e 0014 1d4f +4500 0028 4706 4000 0111 ced8 0606 0606 0404 0404 afc9 829e 0014 0b2d 0402 0000 3be5 468d 000a cfc3 +4500 0038 809a 0000 ff01 8f31 0303 0303 0202 0202 0b00 a537 0000 0000 4500 0028 4703 4000 0111 ef89 0202 0202 0404 0404 afc9 829e 0014 1d4f ------------------------------- ==== //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni2#2 (text+ko) ==== @@ -1,10 +1,10 @@ -4510 002c bd0d 4000 3e06 ea1d 0101 0101 c0a8 0133 9c40 0077 a664 2485 0000 0000 6002 4000 cea4 0000 0204 05b4 -4500 002c ce83 4000 7e06 98b7 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 6012 2238 62a5 0000 0204 05b4 -4510 0028 bd0e 4000 3e06 ea20 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a22 5010 4470 cbdf 0000 -4500 005b cf83 4000 7e06 9788 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 5018 2238 b5d9 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0a -4510 0028 bd18 4000 3e06 ea16 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5010 4470 cbac 0000 -4510 002e bd1e 4000 3e06 ea0a 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5018 4470 deb6 0000 0000 0000 0d0a -4500 0048 e383 4000 7e06 839b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c 5018 2232 fe54 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 -4500 05dc e483 4000 7e06 7d07 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c 5010 2232 9f6c 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 222! 2 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3331 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 -4500 0038 d71d 4000 4001 f0be 0101 0101 c0a8 0133 0304 348b 0000 05a0 4500 05dc e483 4000 7e06 8707 c0a8 0133 0101 0101 0077 9c40 fbdf 1a75 +4510 002c bd0d 4000 3e06 ea1d 0101 0101 c0a8 0133 9c40 0077 a664 2485 0000 0000 6002 4000 2ca8 0000 0204 05b4 +4500 002c ce83 4000 7e06 98b7 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 6012 2238 c0a8 0000 0204 05b4 +4510 0028 bd0e 4000 3e06 ea20 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a22 5010 4470 29e3 0000 +4500 005b cf83 4000 7e06 9788 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 5018 2238 ce2a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0a +4510 0028 bd18 4000 3e06 ea16 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5010 4470 29b0 0000 +4510 002e bd1e 4000 3e06 ea0a 0101 0101 c0a8 0133 9c40 0077 a664 2486 fbdf 1a55 5018 4470 1c98 0000 0000 0000 0d0a +4500 0048 e383 4000 7e06 839b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c 5018 2232 d80a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 +4500 05dc e483 4000 7e06 7d07 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c 5010 2232 9f2d 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 222! 2 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3331 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 +4500 0038 d71d 4000 4001 f0be 0101 0101 c0a8 0133 0304 348b 0000 05a0 4500 05dc e483 4000 7e06 8707 c0a8 0133 0101 0101 0077 9c40 fbdf 1a75 ------------------------------- ==== //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/ni4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -4500 003c 4706 4000 ff06 28aa 0606 0606 0404 0404 9c40 0050 0000 0001 0000 0000 a002 16d0 849a 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 -4500 0038 809a 0000 ff01 3323 0303 0303 0202 0202 0303 acab 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 -4500 0058 809a 0000 ff01 3303 0303 0303 0202 0202 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 +4500 003c 4706 4000 ff06 28aa 0606 0606 0404 0404 9c40 0050 0000 0001 0000 0000 a002 16d0 849a 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 +4500 0038 809a 0000 ff01 3323 0303 0303 0202 0202 0303 acab 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 +4500 0058 809a 0000 ff01 3303 0303 0303 0202 0202 0303 0937 0000 0000 4500 003c 4706 4000 ff06 28aa 0202 0202 0404 0404 5000 0050 0000 0001 0000 0000 a002 16d0 d8e2 0000 0204 05b4 0402 080a 0047 fbb0 0000 0000 0103 0300 ------------------------------- ==== //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/ni2#2 (text+ko) ==== @@ -4,28 +4,28 @@ 0a01 0201 c0a8 0133 05f6 0077 a664 2485 0000 0000 -6002 4000 5aef 0000 0204 05b4 +6002 4000 b8f2 0000 0204 05b4 [in,xl0] 4500 002c ce83 4000 7e06 98b7 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a21 a664 2486 -6012 2238 62a5 0000 0204 05b4 0000 +6012 2238 c0a8 0000 0204 05b4 0000 [out,xl0] 4510 0028 bd0e 4000 3e06 ea20 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a22 -5010 4470 582a 0000 +5010 4470 b62d 0000 [in,xl0] 4500 005b cf83 4000 7e06 9788 c0a8 0133 0a01 0201 0077 05f6 fbdf 1a22 a664 2486 -5018 2238 b5d9 0000 0000 0000 0000 0000 +5018 2238 ce2a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0a @@ -35,21 +35,21 @@ 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a55 -5010 4470 57f7 0000 +5010 4470 b5fa 0000 [out,xl0] 4510 002e bd1e 4000 3e06 ea0a 0a01 0201 c0a8 0133 05f6 0077 a664 2486 fbdf 1a55 -5018 4470 6b01 0000 0000 0000 0d0a +5018 4470 a8e2 0000 0000 0000 0d0a [in,xl0] 4500 0048 e383 4000 7e06 839b c0a8 0133 0a01 0201 0077 05f6 fbdf 1a55 a664 248c -5018 2232 fe54 0000 0000 0000 0000 0000 +5018 2232 d80a 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 @@ -58,7 +58,7 @@ c0a8 0133 0a01 0201 0077 05f6 fbdf 1a75 a664 248c -5010 2232 9f6c 0000 0000 0000 0000 0000 +5010 2232 9f2d 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 1111 2222 3333 0000 0000 0000 0000 ==== //depot/projects/trustedbsd/mac/contrib/lukemftp/src/fetch.c#2 (text+ko) ==== @@ -617,7 +617,7 @@ memset(&hints, 0, sizeof(hints)); hints.ai_flags = 0; - hints.ai_family = AF_UNSPEC; + hints.ai_family = family; hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = 0; error = getaddrinfo(host, NULL, &hints, &res0); ==== //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp.1#2 (text+ko) ==== @@ -77,7 +77,7 @@ Internet file transfer program .Sh SYNOPSIS .Nm "" -.Op Fl AadefginpRtvV +.Op Fl 46AadefginpRtvV .Bk -words .Op Fl o Ar output .Ek @@ -146,6 +146,14 @@ Options may be specified at the command line, or to the command interpreter. .Bl -tag -width "port " +.It Fl 4 +Forces +.Nm +to only use IPv4 addresses. +.It Fl 6 +Forces +.Nm +to only use IPv6 addresses. .It Fl A Force active mode ftp. By default, ==== //depot/projects/trustedbsd/mac/contrib/lukemftp/src/ftp.c#2 (text+ko) ==== @@ -149,7 +149,7 @@ memset(&hints, 0, sizeof(hints)); portnum = parseport(port, FTP_PORT); hints.ai_flags = AI_CANONNAME; - hints.ai_family = AF_UNSPEC; + hints.ai_family = family; hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = 0; error = getaddrinfo(host, NULL, &hints, &res0); @@ -453,9 +453,10 @@ if (dig > 4 && pflag == 1 && isdigit(c)) pflag = 2; if (pflag == 2) { - if (c != '\r' && c != ')') - *pt++ = c; - else { + if (c != '\r' && c != ')') { + if (pt < &pasv[sizeof(pasv) - 1]) + *pt++ = c; + } else { *pt = '\0'; pflag = 3; } @@ -689,7 +690,7 @@ rc = -1; switch (curtype) { case TYPE_A: - rc = fseek(fin, (long) restart_point, SEEK_SET); + rc = fseeko(fin, restart_point, SEEK_SET); break; case TYPE_I: case TYPE_L: @@ -1134,18 +1135,17 @@ case TYPE_A: if (is_retr && restart_point) { >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 8: 4:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8C6037B419; Tue, 30 Apr 2002 08:04:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D28E737B400 for ; Tue, 30 Apr 2002 08:04:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3UF4MC45743 for perforce@freebsd.org; Tue, 30 Apr 2002 08:04:22 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 30 Apr 2002 08:04:22 -0700 (PDT) Message-Id: <200204301504.g3UF4MC45743@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 10523 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10523 Change 10523 by jhb@jhb_laptop on 2002/04/30 08:03:35 Compiling is a wonderful thing. Affected files ... ... //depot/projects/smpng/sys/kern/subr_witness.c#46 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#46 (text+ko) ==== @@ -932,7 +932,7 @@ mtx_lock_spin(&w_mtx); STAILQ_FOREACH(w, &w_all, w_list) { if (w->w_name == description || (w->w_refcount > 0 && - strcmp(description, w->w_name) == 0) { + strcmp(description, w->w_name) == 0)) { w->w_refcount++; mtx_unlock_spin(&w_mtx); if (lock_class != w->w_class) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 8:23:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A01C937B422; Tue, 30 Apr 2002 08:23:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A66BC37B421 for ; Tue, 30 Apr 2002 08:23:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3UFNk353269 for perforce@freebsd.org; Tue, 30 Apr 2002 08:23:46 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Tue, 30 Apr 2002 08:23:46 -0700 (PDT) Message-Id: <200204301523.g3UFNk353269@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 10524 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10524 Change 10524 by cvance@cvance_korben on 2002/04/30 08:23:29 Need to include endian.h now so le32toh(), etc. are defined. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/sebsd/linux-compat.h#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/linux-compat.h#3 (text+ko) ==== @@ -45,6 +45,7 @@ #ifdef __FreeBSD__ #include +#include typedef u_int64_t __u64; typedef u_int32_t __u32; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 9: 7:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 178DC37B404; Tue, 30 Apr 2002 09:07:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3E86737B419 for ; Tue, 30 Apr 2002 09:07:40 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3UG7ea65652 for perforce@freebsd.org; Tue, 30 Apr 2002 09:07:40 -0700 (PDT) (envelope-from green@freebsd.org) Date: Tue, 30 Apr 2002 09:07:40 -0700 (PDT) Message-Id: <200204301607.g3UG7ea65652@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 10526 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10526 Change 10526 by green@green_laptop_2 on 2002/04/30 09:07:31 Don't prepend DESTDIR to FILESDIR. Affected files ... ... //depot/projects/trustedbsd/mac/share/security/sebsd/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/share/security/sebsd/Makefile#2 (text+ko) ==== @@ -3,7 +3,7 @@ FILES= policy/policy.conf policy/README NOOBJ= noobj -FILESDIR= ${DESTDIR}/usr/share/security/sebsd +FILESDIR= /usr/share/security/sebsd .PATH: ${.CURDIR}/../../../contrib/sebsd To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 12: 6:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B29837B420; Tue, 30 Apr 2002 12:06:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7FF7B37B400 for ; Tue, 30 Apr 2002 12:06:27 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3UJ6R853857 for perforce@freebsd.org; Tue, 30 Apr 2002 12:06:27 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 30 Apr 2002 12:06:27 -0700 (PDT) Message-Id: <200204301906.g3UJ6R853857@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10532 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10532 Change 10532 by rwatson@rwatson_curry on 2002/04/30 12:06:15 Grab a vnode lock before entering mac_cred_check_open_vnode() to prevent assertion failures in fcntl() with F_SETFL. Possibly eventually this hook should change some. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#14 (text+ko) ==== @@ -323,8 +323,11 @@ mode |= VWRITE; if (fflag & O_APPEND) mode |= VAPPEND; + vn_lock((struct vnode *)fp->f_data, LK_EXCLUSIVE | + LK_RETRY, td); error = mac_cred_check_open_vnode(td->td_ucred, (struct vnode *)fp->f_data, mode); + VOP_UNLOCK((struct vnode *)fp->f_data, 0, td); if (error) { fdrop(fp, td); break; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 12:26:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2650437B400; Tue, 30 Apr 2002 12:25:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4870F37B405 for ; Tue, 30 Apr 2002 12:25:51 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3UJPpL56888 for perforce@freebsd.org; Tue, 30 Apr 2002 12:25:51 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Tue, 30 Apr 2002 12:25:51 -0700 (PDT) Message-Id: <200204301925.g3UJPpL56888@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 10533 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10533 Change 10533 by cvance@cvance_korben on 2002/04/30 12:24:51 Just a small collection of minor revisions to clean up the compile. Nothing major: removing unused functions, clearing up prototypes and includes. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#4 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#3 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/hashtab.c#3 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/init.c#4 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/policydb.c#3 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/security.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#4 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#4 (text+ko) ==== @@ -218,7 +218,7 @@ { struct avc_entry *ae; int rc; - unsigned long flags; +/* unsigned long flags; */ struct avc_entry entry; __u32 seqno; ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#3 (text+ko) ==== @@ -72,7 +72,7 @@ sysctl_rule(SYSCTL_HANDLER_ARGS) { u_int namelen; - int error, index, *name; + int *name; name = (int *)arg1; namelen = arg2; @@ -103,7 +103,11 @@ /* Destroy ruleset lock. */ } -void +/* + * Initialize the SEBSD security server after the root partition has + * been mounted; policy is located on root partition. + */ +static void sebsd_create_root_mount(struct ucred *cred, struct mount *mp) { printf("sebsd hook:: create_root_mount\n"); @@ -121,19 +125,4 @@ MAC_POLICY_SET(sebsd_ops, trustedbsd_sebsd, "Security Enhanced BSD", 1); - -/* - * Initialize the SEBSD security server after the root partition has - * been mounted; policy is located on root partition. - */ -void -ss_init(void) -{ - if (security_init()) - panic("SEBSD: can't initialize security server"); -} - -/* SYSINIT(sebsd, SI_SUB_SMP, SI_ORDER_ANY, ss_init, NULL) */ -/* SYSINIT(sebsd, SI_SUB_MOUNT_ROOT, SI_ORDER_ANY, ss_init, NULL) */ - #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/hashtab.c#3 (text+ko) ==== @@ -10,6 +10,7 @@ #if defined(__FreeBSD__) && defined(_KERNEL) #include #include +#include #include #endif /* FreeBSD _KERNEL */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/init.c#4 (text+ko) ==== @@ -12,8 +12,10 @@ #include #include #include +#include #include +#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/policydb.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ /* * Initialize the role table. */ -int roles_init(policydb_t *p) +static int roles_init(policydb_t *p) { char *key = 0; role_datum_t *role; ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/security.h#2 (text+ko) ==== @@ -22,9 +22,6 @@ #include #endif /* __FreeBSD__ */ -/* Initialize the security server */ -int security_init(void); - /* * Compute access vectors based on a SID pair for * the permissions in a particular class. ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#4 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include #include +#include #include #include ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#4 (text+ko) ==== @@ -100,7 +100,7 @@ return 0; } - +#if defined(__FreeBSD__) && !defined(_KERNEL) int sidtab_remove(sidtab_t * s, security_id_t sid) { int hvalue; @@ -132,7 +132,7 @@ s->nel--; return 0; } - +#endif /* __FreeBSD__ && !_KERNEL */ context_struct_t * sidtab_search(sidtab_t * s, security_id_t sid) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 16:57:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1FAD37B416; Tue, 30 Apr 2002 16:57:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F215437B404 for ; Tue, 30 Apr 2002 16:57:27 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g3UNvRV04596 for perforce@freebsd.org; Tue, 30 Apr 2002 16:57:27 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Apr 2002 16:57:27 -0700 (PDT) Message-Id: <200204302357.g3UNvRV04596@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10547 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10547 Change 10547 by peter@peter_thunder on 2002/04/30 16:56:44 GRR. add aicasm.h include path to -I Affected files ... ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/Makefile#4 edit Differences ... ==== //depot/projects/ia64/sys/dev/aic7xxx/aicasm/Makefile#4 (text+ko) ==== @@ -23,6 +23,9 @@ .endif CFLAGS+= -I/usr/include -I. +.ifdef MAKESRCPATH +CFLAGS+= -I${MAKESRCPATH} +.endif NOMAN= noman YFLAGS= -b ${.TARGET:R} ${.TARGET:M*macro*:S/$(.TARGET)/-p mm/} -d LFLAGS+= ${.TARGET:M*macro*:S/$(.TARGET)/-Pmm/} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 17: 4: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FD0637B41D; Tue, 30 Apr 2002 17:02:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0C55737B404 for ; Tue, 30 Apr 2002 17:02:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4102YM05161 for perforce@freebsd.org; Tue, 30 Apr 2002 17:02:34 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Tue, 30 Apr 2002 17:02:34 -0700 (PDT) Message-Id: <200205010002.g4102YM05161@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10549 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10549 Change 10549 by arr@arr_shibby on 2002/04/30 17:02:01 - Integ from TrustedBSD Base. Affected files ... ... //depot/projects/trustedbsd/audit/sys/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/elf_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/pmap.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/trap.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/pmap.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/isa/isa_dma.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/forth/loader.conf#4 integrate ... //depot/projects/trustedbsd/audit/sys/boot/pc98/kgzldr/Makefile#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/pc98/loader/Makefile#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/boot1/Makefile#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/boot1/boot1.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/cam/cam_xpt.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/cam/scsi/scsi_all.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/NOTES#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files#9 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.ia64#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/kern.post.mk#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/kmod.mk#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/options#5 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/fil.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_fil.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_frag.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_proxy.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ipl.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac_cam.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac_cam.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac_disk.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac_pci.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aacreg.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aacvar.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_timer.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/ahc_eisa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/ahc_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7770.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx.reg#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx.seq#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_freebsd.c#2 delete ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_freebsd.h#2 delete ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/Makefile#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-dma.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/dev/bge/if_bge.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ciss/ciss.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drmP.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_agpsupport.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_auth.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_bufs.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_context.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_dma.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_drawable.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_drv.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_fops.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_init.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_ioctl.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_linux.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_lists.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_lock.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_memory.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_os_freebsd.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_scatter.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_sysctl.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_vm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/gamma.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/gamma_dma.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/gamma_drv.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/gamma_drv.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/i810_drm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_dma.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_drm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_drv.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_drv.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_state.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_ucode.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_warp.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/r128.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/r128_cce.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/r128_drm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/r128_drv.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/r128_drv.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/r128_state.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/radeon.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/radeon_cp.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/radeon_drm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/radeon_drv.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/radeon_drv.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/radeon_state.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/sis_drm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/tdfx.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/tdfx_drv.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/gem/if_gem.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/gx/if_gx.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hme/if_hme.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iir/iir.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iir/iir_ctrl.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iir/iir_pci.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp_freebsd.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/lge/if_lge.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/acphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/amphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/brgphy.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/dcphy.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/e1000phy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/exphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/inphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/lxtphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/mii.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/mii.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/mii_physubr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/miivar.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/mlphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/nsgphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/nsgphyreg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/nsphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/pnaphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/pnphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/qsphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/rlphy.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/tdkphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/tlphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/ukphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/ukphy_subr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/xmphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/my/if_my.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/nge/if_nge.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccbb/pccbb.c#8 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ppbus/pps.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/puc/puc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/puc/pucdata.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sio/sio.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/es137x.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/ac97.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/ac97.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/sound.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sym/sym_hipd.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/tx/if_tx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ohci.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uhci.c#8 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usb_subr.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdevs#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdevs.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdevs_data.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinumio.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wi.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wi_pccard.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wi_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wivar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/wi_hostap.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/wi_hostap.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/devfs/devfs.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/devfs/devfs_vnops.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/fs/fifofs/fifo_vnops.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_mem.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/smbfs/smbfs_io.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/smbfs/smbfs_vfsops.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_bsd.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_dev.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_dump.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_enc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_slice.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_slice.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_subr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/conf/GENERIC#5 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/autoconf.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/identcpu.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/mp_clock.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/pmap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/trap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/pmap.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/bs/bsif.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/clock.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/pci/pci_bus.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/pci/pci_cfgreg.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/conf/SKI#4 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/elf_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/machdep.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/mca.c#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/pmap.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/sal.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/sscdisk.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/swtch.s#4 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/mca.h#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/include/pmap.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/sal.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/isa/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_clock.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_condvar.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_conf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_descrip.c#8 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_environment.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_exit.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_linker.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_malloc.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_ntptime.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_proc.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_sig.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_tc.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_time.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/link_elf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/makesyscalls.sh#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_bus.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_disklabel.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_hints.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_mchain.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_prf.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_witness.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/uipc_socket.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/uipc_socket2.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/uipc_usrreq.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_default.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_syscalls.c#8 integrate ... //depot/projects/trustedbsd/audit/sys/modules/Makefile#6 integrate ... //depot/projects/trustedbsd/audit/sys/modules/aac/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/modules/drm/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/drm/gamma/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/drm/mga/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/drm/r128/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/drm/radeon/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/drm/tdfx/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/udf/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_media.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/net/raw_usrreq.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/rtsock.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/netatalk/ddp_input.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_aal5.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_cm.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_subr.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_var.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/netgraph/ng_socket.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/accf_data.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/accf_http.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/in.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/ip_divert.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/ip_mroute.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/raw_ip.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/tcp_input.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/udp_usrreq.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/icmp6.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ip6_mroute.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/nd6.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/raw_ip6.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/udp6_usrreq.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/netipx/ipx_usrreq.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netipx/spx_usrreq.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netkey/keysock.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netnatm/natm.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netsmb/smb_iod.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netsmb/smb_rq.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netsmb/smb_subr.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netsmb/smb_trantcp.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/nfsclient/bootp_subr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/nfsclient/nfs_node.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/nfsclient/nfs_vfsops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/nfsclient/nfsnode.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/nfsserver/nfs_serv.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/conf/GENERIC#4 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/clock.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/sio.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/syscons.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_dc.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_de.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_sk.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_ti.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/pci/xrpu.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/frame.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/pcpu.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/pmap.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/spr.h#1 branch ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/copyinout.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/genassym.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/locore.s#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/pmap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/sigcode.S#1 branch ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/swtch.s#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/trap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/trap_subr.S#1 branch ... //depot/projects/trustedbsd/audit/sys/sparc64/include/pmap.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/proc.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/sysarch.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/machdep.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/pmap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/sys_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/vm_machdep.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/sys/endian.h#1 branch ... //depot/projects/trustedbsd/audit/sys/sys/filedesc.h#7 integrate ... //depot/projects/trustedbsd/audit/sys/sys/linker.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sys/param.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/sys/proc.h#6 integrate ... //depot/projects/trustedbsd/audit/sys/sys/signalvar.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/sys/socketvar.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/sys/time.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/sys/timepps.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sys/timetc.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/sys/timex.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sys/vnode.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/vm/pmap.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/vm/uma.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/vm/uma_core.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/vm/uma_int.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_fault.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_glue.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_kern.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_map.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_map.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_page.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_page.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_pageout.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.25 2000/08/24 18:53:09 peter Exp $ +# $FreeBSD: src/sys/Makefile,v 1.26 2002/04/26 17:55:21 ru Exp $ # The boot loader SUBDIR= boot @@ -8,11 +8,6 @@ SUBDIR+=modules .endif -afterdistribute: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${MACHINE}/conf/GENERIC.hints \ - ${DESTDIR}/boot/device.hints - HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` .include ==== //depot/projects/trustedbsd/audit/sys/alpha/alpha/elf_machdep.c#3 (text+ko) ==== @@ -22,7 +22,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/alpha/alpha/elf_machdep.c,v 1.8 2002/02/21 23:34:09 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.9 2002/04/25 01:22:15 marcel Exp $ */ #include @@ -38,13 +38,13 @@ /* Process one elf relocation with addend. */ int -elf_reloc(linker_file_t lf, const void *data, int type, const char *sym) +elf_reloc(linker_file_t lf, const void *data, int type) { Elf_Addr relocbase = (Elf_Addr) lf->address; Elf_Addr *where; Elf_Addr addr; Elf_Addr addend; - Elf_Word rtype; + Elf_Word rtype, symidx; const Elf_Rel *rel; const Elf_Rela *rela; @@ -54,12 +54,14 @@ where = (Elf_Addr *) (relocbase + rel->r_offset); addend = *where; rtype = ELF_R_TYPE(rel->r_info); + symidx = ELF_R_SYM(rel->r_info); break; case ELF_RELOC_RELA: rela = (const Elf_Rela *)data; where = (Elf_Addr *) (relocbase + rela->r_offset); addend = rela->r_addend; rtype = ELF_R_TYPE(rela->r_info); + symidx = ELF_R_SYM(rela->r_info); break; default: panic("elf_reloc: unknown relocation mode %d\n", type); @@ -71,9 +73,8 @@ break; case R_ALPHA_REFQUAD: - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; addr += addend; if (*where != addr) @@ -81,9 +82,8 @@ break; case R_ALPHA_GLOB_DAT: - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; addr += addend; if (*where != addr) @@ -92,9 +92,8 @@ case R_ALPHA_JMP_SLOT: /* No point in lazy binding for kernel modules. */ - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; if (*where != addr) *where = addr; ==== //depot/projects/trustedbsd/audit/sys/alpha/alpha/pmap.c#6 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.91 2002/04/15 16:07:52 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.92 2002/04/29 07:43:08 peter Exp $ */ /* @@ -222,7 +222,7 @@ * Given a map and a machine independent protection code, * convert to an alpha protection code. */ -#define pte_prot(m, p) (protection_codes[m == pmap_kernel() ? 0 : 1][p]) +#define pte_prot(m, p) (protection_codes[m == kernel_pmap ? 0 : 1][p]) int protection_codes[2][8]; /* @@ -296,8 +296,7 @@ /* * Statically allocated kernel pmap */ -static struct pmap kernel_pmap_store; -pmap_t kernel_pmap; +struct pmap kernel_pmap_store; vm_offset_t avail_start; /* PA of first available physical page */ vm_offset_t avail_end; /* PA of last available physical page */ @@ -531,13 +530,9 @@ alpha_protection_init(); /* - * The kernel's pmap is statically allocated so we don't have to use - * pmap_create, which is unlikely to work correctly at this part of - * the boot sequence (XXX and which no longer exists). + * Initialize the kernel pmap (which is statically allocated). */ - kernel_pmap = &kernel_pmap_store; kernel_pmap->pm_lev1 = Lev1map; - kernel_pmap->pm_count = 1; kernel_pmap->pm_active = ~0; kernel_pmap->pm_asn[alpha_pal_whami()].asn = 0; kernel_pmap->pm_asn[alpha_pal_whami()].gen = 1; @@ -1356,7 +1351,6 @@ int i; pmap->pm_lev1 = Lev1map; - pmap->pm_count = 1; pmap->pm_ptphint = NULL; pmap->pm_active = 0; for (i = 0; i < MAXCPU; i++) { @@ -1407,7 +1401,6 @@ pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) | PG_V | PG_KRE | PG_KWE; - pmap->pm_count = 1; pmap->pm_ptphint = NULL; pmap->pm_active = 0; for (i = 0; i < MAXCPU; i++) { @@ -1775,39 +1768,9 @@ critical_exit(); } -/* - * Retire the given physical map from service. - * Should only be called if the map contains - * no valid mappings. - */ -void -pmap_destroy(pmap_t pmap) -{ - int count; - if (pmap == NULL) - return; - - count = --pmap->pm_count; - if (count == 0) { - pmap_release(pmap); - panic("destroying a pmap is not yet implemented"); - } -} - -/* - * Add a reference to the specified pmap. - */ -void -pmap_reference(pmap_t pmap) -{ - if (pmap != NULL) { - pmap->pm_count++; - } -} - /*************************************************** -* page management routines. + * page management routines. ***************************************************/ /* @@ -2691,16 +2654,6 @@ { } -/* - * Routine: pmap_kernel - * Function: - * Returns the physical map handle for the kernel. - */ -pmap_t -pmap_kernel() -{ - return (kernel_pmap); -} /* * pmap_zero_page zeros the specified hardware page by ==== //depot/projects/trustedbsd/audit/sys/alpha/alpha/trap.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.91 2002/04/16 05:56:01 alc Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.92 2002/04/27 09:34:15 alc Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -472,7 +472,6 @@ goto out; } - mtx_lock(&Giant); /* * It is only a kernel address space fault iff: * 1. !user and @@ -515,7 +514,6 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - mtx_unlock(&Giant); goto dopanic; #endif } @@ -531,20 +529,8 @@ ++p->p_lock; PROC_UNLOCK(p); - /* - * Grow the stack if necessary - */ - /* vm_map_growstack fails only if va falls into - * a growable stack region and the stack growth - * fails. It succeeds if va was not within - * a growable stack region, or if the stack - * growth succeeded. - */ - if (vm_map_growstack(p, va) != KERN_SUCCESS) - rv = KERN_FAILURE; - else - /* Fault in the user page: */ - rv = vm_fault(map, va, ftype, + /* Fault in the user page: */ + rv = vm_fault(map, va, ftype, (ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY : VM_FAULT_NORMAL); @@ -559,7 +545,6 @@ */ rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL); } - mtx_unlock(&Giant); if (rv == KERN_SUCCESS) goto out; ==== //depot/projects/trustedbsd/audit/sys/alpha/include/pmap.h#5 (text+ko) ==== @@ -43,7 +43,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.16 2002/03/20 18:58:45 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.17 2002/04/29 07:43:08 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -173,7 +173,6 @@ pt_entry_t *pm_lev1; /* KVA of lev0map */ vm_object_t pm_pteobj; /* Container for pte's */ TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ - int pm_count; /* reference count */ u_int32_t pm_active; /* active cpus */ struct { u_int32_t asn:ASN_BITS; /* address space number */ @@ -192,7 +191,8 @@ typedef struct pmap *pmap_t; #ifdef _KERNEL -extern pmap_t kernel_pmap; +extern struct pmap kernel_pmap_store; +#define kernel_pmap (&kernel_pmap_store) #endif /* @@ -231,7 +231,6 @@ void pmap_bootstrap(vm_offset_t, u_int); void pmap_setdevram(unsigned long long basea, vm_offset_t sizea); int pmap_uses_prom_console(void); -pmap_t pmap_kernel(void); void *pmap_mapdev(vm_offset_t, vm_size_t); void pmap_unmapdev(vm_offset_t, vm_size_t); unsigned *pmap_pte(pmap_t, vm_offset_t) __pure2; ==== //depot/projects/trustedbsd/audit/sys/alpha/isa/isa_dma.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 * from: isa_dma.c,v 1.3 1999/05/09 23:56:00 peter Exp $ - * $FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.6 2001/06/30 05:29:10 imp Exp $ + * $FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.7 2002/04/29 07:43:09 peter Exp $ */ /* @@ -239,7 +239,7 @@ panic("isa_dmastart: transfer mapping not contiguous"); if ((chipset.sgmap == NULL) && - (pmap_extract(pmap_kernel(), (vm_offset_t)addr) + (pmap_extract(kernel_pmap, (vm_offset_t)addr) > BUS_SPACE_MAXADDR_24BIT)) { /* we bounced */ dma_bounced |= (1 << chan); ==== //depot/projects/trustedbsd/audit/sys/boot/forth/loader.conf#4 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.55 2002/03/04 03:51:19 alfred Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.58 2002/04/26 22:31:18 wes Exp $ ############################################################## ### Basic configuration options ############################ @@ -22,7 +22,7 @@ userconfig_script_name="/boot/kernel.conf" userconfig_script_type="userconfig_script" -loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local" +loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local /boot/nextboot.conf" verbose_loading="NO" # Set to YES for verbose loader output @@ -77,6 +77,8 @@ #kern.vm.kmem.size="" # Sets the size of kernel memory (bytes) #machdep.pccard.pcic_irq="0" # Assigns PCCARD controller IRQ (0=polled) #net.inet.tcp.tcbhashsize="" # Set the value of TCBHASHSIZE +#vfs.root.mountfrom="" # Specify root partition in a way the + # kernel understands #debug.ktr.cpumask="0xf" # Bitmask of CPUs to enable KTR on #debug.ktr.mask="0x1200" # Bitmask of KTR events to enable #debug.ktr.verbose="1" # Enable console dump of KTR events ==== //depot/projects/trustedbsd/audit/sys/boot/pc98/kgzldr/Makefile#3 (text+ko) ==== @@ -1,5 +1,6 @@ -# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.2 2002/04/15 13:44:00 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.3 2002/04/25 13:28:10 nyan Exp $ +FILES= kgzldr.o SRCS= start.s boot.c inflate.c lib.c crt.s sio.s OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -fno-builtin @@ -10,23 +11,20 @@ .endif CFLAGS+=-DKZIP LDFLAGS=-nostdlib -static -r -NOMAN= BINDIR= /usr/lib -BINMODE=444 -STRIP= .PATH: ${.CURDIR}/../../../kern .PATH: ${.CURDIR}/../../i386/kgzldr AFLAGS+=--defsym PC98=1 +CLEANFILES=${FILES} + M4?= m4 M4FLAGS=-DOBJFORMAT=${OBJFORMAT} BOOT_COMCONSOLE_PORT?= 0x238 M4FLAGS+=-DSIOPRT=${BOOT_COMCONSOLE_PORT} -all: kgzldr.o - kgzldr.o: ${OBJS} ${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} ==== //depot/projects/trustedbsd/audit/sys/boot/pc98/loader/Makefile#3 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.24 2002/03/30 11:18:30 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.25 2002/04/25 13:31:27 nyan Exp $ BASE= loader PROG= ${BASE} -#NOMAN= STRIP= NEWVERSWHAT= "bootstrap loader" pc98 BINDIR?= /boot @@ -94,7 +93,7 @@ sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/../../i386/loader/version ${NEWVERSWHAT} ${CC} -c vers.c -${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT} ${BASE}.help +${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT} btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ -b ${BTXKERN} ${BASE}.bin # /usr/bin/kzip ${.TARGET} @@ -107,24 +106,13 @@ ${BASE}.help: help.common help.i386 cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} -beforeinstall: -.if exists(${.OBJDIR}/loader.help) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot -.else - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${BASE}.help ${DESTDIR}/boot -.endif +.PATH: ${.CURDIR}/../../forth +FILES= ${BASE}.help loader.4th support.4th loader.conf +FILESDIR_loader.conf= /boot/defaults + .if !exists(${DESTDIR}/boot/loader.rc) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot +FILES+= loader.rc .endif - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/support.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.conf ${DESTDIR}/boot/defaults .include <${.CURDIR}/../Makefile.inc> ==== //depot/projects/trustedbsd/audit/sys/boot/sparc64/boot1/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.4 2002/04/21 02:37:55 obrien Exp $ +# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.5 2002/04/24 02:50:36 jake Exp $ PROG= boot1 SRCS= _start.S boot1.c @@ -9,7 +9,7 @@ BOOTBLOCKBASE= 0x4000 -CFLAGS= -W -Wall -I../../ -I../../common/ -Os -ffreestanding -mno-app-regs \ +CFLAGS= -W -Wall -Wno-unused -I../../ -I../../common/ -Os -ffreestanding \ -mcmodel=medlow boot1.elf: _start.o boot1.o ==== //depot/projects/trustedbsd/audit/sys/boot/sparc64/boot1/boot1.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/boot1/boot1.c,v 1.3 2002/03/05 11:22:43 robert Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/boot1/boot1.c,v 1.10 2002/04/24 05:54:10 jake Exp $"); #include #include @@ -30,86 +30,66 @@ #include #include -#include +#define _PATH_LOADER "/boot/loader" +#define _PATH_KERNEL "/boot/kernel/kernel" -#define RBX_ASKNAME 0x0 /* -a */ -#define RBX_SINGLE 0x1 /* -s */ -#define RBX_DFLTROOT 0x5 /* -r */ -#define RBX_KDB 0x6 /* -d */ -#define RBX_CONFIG 0xa /* -c */ -#define RBX_VERBOSE 0xb /* -v */ -#define RBX_CDROM 0xd /* -C */ -#define RBX_GDB 0xf /* -g */ +#define BSIZEMAX 8192 -#define RBX_MASK 0x2000ffff +typedef int putc_func_t(int c, void *arg); +typedef int32_t ofwh_t; -#define PATH_CONFIG "/boot.config" -#define PATH_LOADER "/boot/loader" -#define PATH_KERNEL "/kernel" +struct sp_data { + char *sp_buf; + u_int sp_len; + u_int sp_size; +}; -#define ARGS 0x900 -#define NOPT 11 -#define BSIZEMAX 8192 -#define NDEV 5 +static const char digits[] = "0123456789abcdef"; -#define TYPE_AD 0 -#define TYPE_WD 1 -#define TYPE_WFD 2 -#define TYPE_FD 3 -#define TYPE_DA 4 +static char bootpath[128]; +static char bootargs[128]; -/* - * This structure will be refined along with the addition of a bootpath - * parsing routine when it is necessary to cope with bootpaths that are - * not in the exact @,: format and - * for which we need to evaluate the disklabel ourselves. - */ -struct disk { - int meta; -}; -struct disk dsk; +static ofwh_t bootdev; -extern uint32_t _end; +static struct fs fs; +static ino_t inomap; +static char blkbuf[BSIZEMAX]; +static unsigned int fsblks; -static const char optstr[NOPT] = "aCcgrsv"; -static const unsigned char flags[NOPT] = { - RBX_ASKNAME, - RBX_CDROM, - RBX_CONFIG, - RBX_GDB, - RBX_DFLTROOT, - RBX_SINGLE, - RBX_VERBOSE -}; +static uint32_t fs_off; -static char cmd[512]; /* command to parse */ -static char bname[1024]; /* name of the binary to load */ -static uint32_t opts; -static int ls; -static uint32_t fs_off; +int main(int ac, char **av); -int main(void); -void exit(int); +static void exit(int) __dead2; static void load(const char *); -static int parse(char *); static ino_t lookup(const char *); -static int xfsread(ino_t, void *, size_t); static ssize_t fsread(ino_t, void *, size_t); static int dskread(void *, u_int64_t, int); -static int printf(const char *, ...); -static int putchar(int); -static int keyhit(unsigned int); -static int getc(void); + +static void usage(void); + +static void bcopy(const void *src, void *dst, size_t len); +static void bzero(void *b, size_t len); + +static int mount(const char *device); + +static void panic(const char *fmt, ...) __dead2; +static int printf(const char *fmt, ...); +static int putchar(int c, void *arg); +static int vprintf(const char *fmt, va_list ap); +static int vsnprintf(char *str, size_t sz, const char *fmt, va_list ap); -static void *memcpy(void *, const void *, size_t); -static void *memset(void *, int, size_t); -static void *malloc(size_t); +static int __printf(const char *fmt, putc_func_t *putc, void *arg, va_list ap); +static int __putc(int c, void *arg); +static int __puts(const char *s, putc_func_t *putc, void *arg); +static int __sputc(int c, void *arg); +static char *__uitoa(char *buf, u_int val, int base); +static char *__ultoa(char *buf, u_long val, int base); /* * Open Firmware interface functions */ typedef u_int64_t ofwcell_t; -typedef int32_t ofwh_t; typedef u_int32_t u_ofwh_t; typedef int (*ofwfp_t)(ofwcell_t []); ofwfp_t ofw; /* the prom Open Firmware entry */ @@ -121,10 +101,10 @@ int ofw_read(ofwh_t, void *, size_t); int ofw_write(ofwh_t, const void *, size_t); int ofw_seek(ofwh_t, u_int64_t); +void ofw_exit(void) __dead2; ofwh_t bootdevh; ofwh_t stdinh, stdouth; -char bootpath[64]; /* * This has to stay here, as the PROM seems to ignore the @@ -135,20 +115,36 @@ ofw_init(int d, int d1, int d2, int d3, ofwfp_t ofwaddr) { ofwh_t chosenh; + char *av[16]; + char *p; + int ac; ofw = ofwaddr; chosenh = ofw_finddevice("/chosen"); ofw_getprop(chosenh, "stdin", &stdinh, sizeof(stdinh)); ofw_getprop(chosenh, "stdout", &stdouth, sizeof(stdouth)); + ofw_getprop(chosenh, "bootargs", bootargs, sizeof(bootargs)); ofw_getprop(chosenh, "bootpath", bootpath, sizeof(bootpath)); - if ((bootdevh = ofw_open(bootpath)) == -1) { - printf("Could not open boot device.\n"); - } + bootargs[sizeof(bootargs) - 1] = '\0'; + bootpath[sizeof(bootpath) - 1] = '\0'; + + ac = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 17: 6:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0660937B41A; Tue, 30 Apr 2002 17:06:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 448E037B417 for ; Tue, 30 Apr 2002 17:06:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4106gI11275 for perforce@freebsd.org; Tue, 30 Apr 2002 17:06:42 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Tue, 30 Apr 2002 17:06:42 -0700 (PDT) Message-Id: <200205010006.g4106gI11275@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10550 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10550 Change 10550 by arr@arr_shibby on 2002/04/30 17:06:09 - Remove the audit_record_alloc and audit_record_free inlines. - Remove the uma_ctor function and make use of M_ZERO. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#24 edit ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#15 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#24 (text+ko) ==== @@ -49,9 +49,6 @@ #define AUDLOG "/var/log/audit" -static __inline audit_record_t *audit_record_alloc(uma_zone_t); -static __inline void audit_record_free(audit_record_t *, uma_zone_t); - static struct mtx audit_mtx; static struct audit_record_list record_queue; static uma_zone_t record_zone; @@ -61,22 +58,6 @@ static size_t pool_size = 32; */ -static __inline -audit_record_t * -audit_record_alloc(uma_zone_t zone) -{ - - return(uma_zalloc(zone, 0)); -} - -static __inline -void -audit_record_free(audit_record_t *ar, uma_zone_t zone) -{ - - uma_zfree(zone, ar); -} - audit_record_t * audit_record_init(int type, size_t evsz) { @@ -88,7 +69,7 @@ z = record_zone; mtx_unlock(&audit_mtx); - rec = audit_record_alloc(z); + rec = uma_zalloc(z, M_ZERO); h = &rec->ar_hdr; h->ah_v = AUDIT_VERSION; h->ah_id = audit_id++; @@ -180,7 +161,7 @@ if (ar) { z = record_zone; - audit_record_free(ar, z); + uma_zfree(z, ar); } } } ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#15 (text+ko) ==== @@ -228,7 +228,6 @@ void audit_write_shutdown(struct vnode *, struct thread *, struct ucred *); int audit_record_write(audit_record_t *); audit_record_t *audit_record_init(int, size_t); -void audit_uma_ctor(void *, int); void audit_write_thread(void *); #endif /* !_SYS_AUDIT_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 18:25:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31B0637B41A; Tue, 30 Apr 2002 18:24:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DFFFD37B417 for ; Tue, 30 Apr 2002 18:24:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g411OGC29611 for perforce@freebsd.org; Tue, 30 Apr 2002 18:24:16 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Apr 2002 18:24:16 -0700 (PDT) Message-Id: <200205010124.g411OGC29611@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10553 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10553 Change 10553 by peter@peter_daintree on 2002/04/30 18:23:17 IFC @10551 Affected files ... ... //depot/projects/ia64/Makefile#4 integrate ... //depot/projects/ia64/Makefile.inc1#21 integrate ... //depot/projects/ia64/contrib/gcc/config/freebsd.h#4 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#7 integrate ... //depot/projects/ia64/contrib/ipfilter/misc.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/printnat.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/test/Makefile#4 integrate ... //depot/projects/ia64/contrib/ipfilter/test/expected/ni1#2 integrate ... //depot/projects/ia64/contrib/ipfilter/test/expected/ni2#2 integrate ... //depot/projects/ia64/contrib/ipfilter/test/expected/ni4#2 integrate ... //depot/projects/ia64/contrib/ipfilter/test/expected/ni5#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/input/ni2#2 integrate ... //depot/projects/ia64/contrib/ipfilter/test/input/ni5#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/ni5.ipf#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/ni5.nat#1 branch ... //depot/projects/ia64/etc/defaults/rc.conf#11 integrate ... //depot/projects/ia64/etc/mtree/BSD.usr.dist#9 integrate ... //depot/projects/ia64/etc/pam.d/other#4 integrate ... //depot/projects/ia64/etc/periodic/daily/460.status-mail-rejects#2 integrate ... //depot/projects/ia64/etc/periodic/monthly/200.accounting#3 integrate ... //depot/projects/ia64/games/fortune/datfiles/fortunes#12 integrate ... //depot/projects/ia64/games/fortune/datfiles/fortunes-o.real#3 integrate ... //depot/projects/ia64/games/fortune/datfiles/fortunes2#6 integrate ... //depot/projects/ia64/games/fortune/datfiles/fortunes2-o#4 integrate ... //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#5 integrate ... //depot/projects/ia64/games/fortune/datfiles/gerrold.limerick#2 integrate ... //depot/projects/ia64/games/fortune/datfiles/limerick#2 integrate ... //depot/projects/ia64/games/fortune/datfiles/zippy#2 integrate ... //depot/projects/ia64/gnu/usr.bin/man/man/man.c#5 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/backupfile.c#2 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/backupfile.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/common.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/getopt.c#2 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/getopt.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/inp.c#2 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/inp.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/patch.c#3 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/pch.c#3 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/pch.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/util.c#2 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/util.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/version.c#2 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/version.h#2 integrate ... //depot/projects/ia64/include/rpc/clnt.h#3 integrate ... //depot/projects/ia64/include/rpc/pmap_clnt.h#3 integrate ... //depot/projects/ia64/include/rpc/svc.h#4 integrate ... //depot/projects/ia64/include/rpc/xdr.h#4 integrate ... //depot/projects/ia64/include/rpcsvc/ypclnt.h#4 integrate ... //depot/projects/ia64/kerberos5/include/version.h#2 integrate ... //depot/projects/ia64/lib/csu/i386-elf/Makefile#3 integrate ... //depot/projects/ia64/lib/csu/sparc64/crt1.c#4 integrate ... //depot/projects/ia64/lib/libc/rpc/auth_time.c#4 integrate ... //depot/projects/ia64/lib/libc/rpc/clnt_dg.c#4 integrate ... //depot/projects/ia64/lib/libc/rpc/clnt_raw.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/clnt_vc.c#4 integrate ... //depot/projects/ia64/lib/libc/rpc/crypt_client.c#4 integrate ... //depot/projects/ia64/lib/libc/rpc/key_call.c#4 integrate ... //depot/projects/ia64/lib/libc/rpc/rpc_soc.c#4 integrate ... //depot/projects/ia64/lib/libc/rpc/svc.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/svc_dg.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/svc_raw.c#3 integrate ... //depot/projects/ia64/lib/libc/rpc/svc_vc.c#4 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/Makefile.inc#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu.c#5 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_add.c#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_explode.c#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_extern.h#4 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_implode.c#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_qp.c#1 branch ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_subr.c#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/sys/Makefile.inc#4 integrate ... //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#1 branch ... //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap.c#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap_emul.c#1 branch ... //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap_private.h#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap_setup.c#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/sys/assym.s#2 integrate ... //depot/projects/ia64/lib/libc/sparc64/sys/sigcode.S#1 branch ... //depot/projects/ia64/lib/libc/xdr/xdr.c#3 integrate ... //depot/projects/ia64/lib/libc/xdr/xdr_rec.c#3 integrate ... //depot/projects/ia64/lib/libc/yp/xdryp.c#4 integrate ... //depot/projects/ia64/lib/libc/yp/yplib.c#4 integrate ... //depot/projects/ia64/lib/libutil/pw_copy.c#1 branch ... //depot/projects/ia64/lib/libutil/pw_util.c#1 branch ... //depot/projects/ia64/lib/libypclnt/ypclnt_passwd.c#2 integrate ... //depot/projects/ia64/libexec/rpc.rquotad/rquotad.c#3 integrate ... //depot/projects/ia64/libexec/rpc.rstatd/rstat_proc.c#3 integrate ... //depot/projects/ia64/libexec/rpc.rusersd/rusers_proc.c#3 integrate ... //depot/projects/ia64/libexec/rpc.rwalld/rwalld.c#3 integrate ... //depot/projects/ia64/libexec/rpc.sprayd/sprayd.c#3 integrate ... //depot/projects/ia64/libexec/rtld-elf/ia64/reloc.c#4 integrate ... //depot/projects/ia64/libexec/rtld-elf/rtld.c#4 integrate ... //depot/projects/ia64/libexec/ypxfr/ypxfr_getmap.c#3 integrate ... //depot/projects/ia64/libexec/ypxfr/ypxfr_misc.c#4 integrate ... //depot/projects/ia64/release/Makefile#10 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#11 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#22 integrate ... //depot/projects/ia64/release/scripts/base-install.sh#1 branch ... //depot/projects/ia64/release/scripts/doFS.sh#6 integrate ... //depot/projects/ia64/sbin/fdisk/fdisk.c#6 integrate ... //depot/projects/ia64/share/examples/isdn/SupportedCards#3 integrate ... //depot/projects/ia64/share/man/man4/em.4#4 integrate ... //depot/projects/ia64/share/man/man7/release.7#7 integrate ... //depot/projects/ia64/share/man/man9/Makefile#8 integrate ... //depot/projects/ia64/share/man/man9/byteorder.9#2 integrate ... //depot/projects/ia64/share/man/man9/zone.9#4 integrate ... //depot/projects/ia64/share/mk/bsd.prog.mk#8 integrate ... //depot/projects/ia64/sys/alpha/alpha/clock.c#4 integrate ... //depot/projects/ia64/sys/alpha/alpha/pmap.c#9 integrate ... //depot/projects/ia64/sys/alpha/alpha/trap.c#9 integrate ... //depot/projects/ia64/sys/alpha/include/pmap.h#4 integrate ... //depot/projects/ia64/sys/alpha/isa/isa_dma.c#2 integrate ... //depot/projects/ia64/sys/conf/NOTES#7 integrate ... //depot/projects/ia64/sys/conf/files#18 integrate ... //depot/projects/ia64/sys/conf/files.ia64#5 integrate ... //depot/projects/ia64/sys/conf/files.powerpc#6 integrate ... //depot/projects/ia64/sys/conf/kmod.mk#5 integrate ... //depot/projects/ia64/sys/conf/options#11 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/fil.c#5 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_log.c#5 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_nat.c#6 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_proxy.c#6 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_state.c#5 integrate ... //depot/projects/ia64/sys/contrib/ipfilter/netinet/ipl.h#4 integrate ... //depot/projects/ia64/sys/dev/aac/aac.c#5 integrate ... //depot/projects/ia64/sys/dev/aac/aac_cam.c#1 branch ... //depot/projects/ia64/sys/dev/aac/aac_cam.h#1 branch ... //depot/projects/ia64/sys/dev/aac/aac_disk.c#7 integrate ... //depot/projects/ia64/sys/dev/aac/aac_pci.c#7 integrate ... //depot/projects/ia64/sys/dev/aac/aacreg.h#5 integrate ... //depot/projects/ia64/sys/dev/aac/aacvar.h#7 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#5 integrate ... //depot/projects/ia64/sys/dev/bge/if_bge.c#9 integrate ... //depot/projects/ia64/sys/dev/ciss/ciss.c#5 integrate ... //depot/projects/ia64/sys/dev/drm/drm.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drmP.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_agpsupport.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_auth.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_bufs.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_context.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_dma.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_drawable.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_drv.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_fops.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_init.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_ioctl.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_linux.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_lists.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_lock.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_memory.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_os_freebsd.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_scatter.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_sysctl.h#1 branch ... //depot/projects/ia64/sys/dev/drm/drm_vm.h#1 branch ... //depot/projects/ia64/sys/dev/drm/gamma.h#1 branch ... //depot/projects/ia64/sys/dev/drm/gamma_dma.c#1 branch ... //depot/projects/ia64/sys/dev/drm/gamma_drv.c#1 branch ... //depot/projects/ia64/sys/dev/drm/gamma_drv.h#1 branch ... //depot/projects/ia64/sys/dev/drm/i810_drm.h#1 branch ... //depot/projects/ia64/sys/dev/drm/mga.h#1 branch ... //depot/projects/ia64/sys/dev/drm/mga_dma.c#1 branch ... //depot/projects/ia64/sys/dev/drm/mga_drm.h#1 branch ... //depot/projects/ia64/sys/dev/drm/mga_drv.c#1 branch ... //depot/projects/ia64/sys/dev/drm/mga_drv.h#1 branch ... //depot/projects/ia64/sys/dev/drm/mga_state.c#1 branch ... //depot/projects/ia64/sys/dev/drm/mga_ucode.h#1 branch ... //depot/projects/ia64/sys/dev/drm/mga_warp.c#1 branch ... //depot/projects/ia64/sys/dev/drm/r128.h#1 branch ... //depot/projects/ia64/sys/dev/drm/r128_cce.c#1 branch ... //depot/projects/ia64/sys/dev/drm/r128_drm.h#1 branch ... //depot/projects/ia64/sys/dev/drm/r128_drv.c#1 branch ... //depot/projects/ia64/sys/dev/drm/r128_drv.h#1 branch ... //depot/projects/ia64/sys/dev/drm/r128_state.c#1 branch ... //depot/projects/ia64/sys/dev/drm/radeon.h#1 branch ... //depot/projects/ia64/sys/dev/drm/radeon_cp.c#1 branch ... //depot/projects/ia64/sys/dev/drm/radeon_drm.h#1 branch ... //depot/projects/ia64/sys/dev/drm/radeon_drv.c#1 branch ... //depot/projects/ia64/sys/dev/drm/radeon_drv.h#1 branch ... //depot/projects/ia64/sys/dev/drm/radeon_state.c#1 branch ... //depot/projects/ia64/sys/dev/drm/sis_drm.h#1 branch ... //depot/projects/ia64/sys/dev/drm/tdfx.h#1 branch ... //depot/projects/ia64/sys/dev/drm/tdfx_drv.c#1 branch ... //depot/projects/ia64/sys/dev/em/if_em.c#5 integrate ... //depot/projects/ia64/sys/dev/gx/if_gx.c#4 integrate ... //depot/projects/ia64/sys/dev/lge/if_lge.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/acphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/amphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/brgphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/dcphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/e1000phy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/exphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/inphy.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/lxtphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/mii.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/mii.h#2 integrate ... //depot/projects/ia64/sys/dev/mii/mii_physubr.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/miivar.h#3 integrate ... //depot/projects/ia64/sys/dev/mii/mlphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/nsgphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/nsgphyreg.h#2 integrate ... //depot/projects/ia64/sys/dev/mii/nsphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/pnaphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/pnphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/qsphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/rlphy.c#5 integrate ... //depot/projects/ia64/sys/dev/mii/tdkphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/tlphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/ukphy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/ukphy_subr.c#2 integrate ... //depot/projects/ia64/sys/dev/mii/xmphy.c#3 integrate ... //depot/projects/ia64/sys/dev/my/if_my.c#4 integrate ... //depot/projects/ia64/sys/dev/nge/if_nge.c#7 integrate ... //depot/projects/ia64/sys/dev/pccbb/pccbb.c#7 integrate ... //depot/projects/ia64/sys/dev/sound/pci/es137x.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/sound.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/ohci.c#8 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs#12 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs.h#11 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#11 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi.c#17 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#6 integrate ... //depot/projects/ia64/sys/dev/wi/wi_hostap.c#5 integrate ... //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#8 integrate ... //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#7 integrate ... //depot/projects/ia64/sys/fs/udf/udf_vnops.c#2 integrate ... //depot/projects/ia64/sys/geom/geom_subr.c#7 integrate ... //depot/projects/ia64/sys/i386/conf/GENERIC#10 integrate ... //depot/projects/ia64/sys/i386/i386/identcpu.c#4 integrate ... //depot/projects/ia64/sys/i386/i386/mp_clock.c#3 integrate ... //depot/projects/ia64/sys/i386/i386/pmap.c#9 integrate ... //depot/projects/ia64/sys/i386/i386/trap.c#10 integrate ... //depot/projects/ia64/sys/i386/include/pmap.h#5 integrate ... //depot/projects/ia64/sys/i386/isa/bs/bsif.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/clock.c#6 integrate ... //depot/projects/ia64/sys/i386/isa/isa_dma.c#3 integrate ... //depot/projects/ia64/sys/i386/isa/loran.c#2 integrate ... //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#4 integrate ... //depot/projects/ia64/sys/ia64/conf/SKI#4 integrate ... //depot/projects/ia64/sys/ia64/ia64/clock.c#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/exception.s#12 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#31 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#16 integrate ... //depot/projects/ia64/sys/ia64/ia64/sscdisk.c#2 integrate ... //depot/projects/ia64/sys/ia64/include/frame.h#2 integrate ... //depot/projects/ia64/sys/ia64/include/pmap.h#4 integrate ... //depot/projects/ia64/sys/ia64/isa/isa_dma.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#16 integrate ... //depot/projects/ia64/sys/kern/kern_exit.c#10 integrate ... //depot/projects/ia64/sys/kern/kern_malloc.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_sig.c#10 integrate ... //depot/projects/ia64/sys/kern/kern_tc.c#7 integrate ... //depot/projects/ia64/sys/kern/subr_hints.c#3 integrate ... //depot/projects/ia64/sys/kern/subr_prf.c#8 integrate ... //depot/projects/ia64/sys/kern/subr_witness.c#11 integrate ... //depot/projects/ia64/sys/kern/uipc_socket2.c#7 integrate ... //depot/projects/ia64/sys/kern/uipc_usrreq.c#11 integrate ... //depot/projects/ia64/sys/kern/vfs_default.c#6 integrate ... //depot/projects/ia64/sys/kern/vfs_init.c#5 integrate ... //depot/projects/ia64/sys/modules/Makefile#11 integrate ... //depot/projects/ia64/sys/modules/aac/Makefile#2 integrate ... //depot/projects/ia64/sys/modules/drm/Makefile#1 branch ... //depot/projects/ia64/sys/modules/drm/gamma/Makefile#1 branch ... //depot/projects/ia64/sys/modules/drm/mga/Makefile#1 branch ... //depot/projects/ia64/sys/modules/drm/r128/Makefile#1 branch ... //depot/projects/ia64/sys/modules/drm/radeon/Makefile#1 branch ... //depot/projects/ia64/sys/modules/drm/tdfx/Makefile#1 branch ... //depot/projects/ia64/sys/modules/udf/Makefile#2 integrate ... //depot/projects/ia64/sys/net/if_media.h#4 integrate ... //depot/projects/ia64/sys/net/raw_usrreq.c#4 integrate ... //depot/projects/ia64/sys/net/rtsock.c#5 integrate ... //depot/projects/ia64/sys/netatalk/ddp_input.c#3 integrate ... //depot/projects/ia64/sys/netatm/atm_aal5.c#4 integrate ... //depot/projects/ia64/sys/netatm/atm_cm.c#4 integrate ... //depot/projects/ia64/sys/netatm/atm_subr.c#6 integrate ... //depot/projects/ia64/sys/netatm/atm_var.h#5 integrate ... //depot/projects/ia64/sys/netgraph/ng_socket.c#5 integrate ... //depot/projects/ia64/sys/netinet/accf_data.c#2 integrate ... //depot/projects/ia64/sys/netinet/accf_http.c#2 integrate ... //depot/projects/ia64/sys/netinet/ip_divert.c#8 integrate ... //depot/projects/ia64/sys/netinet/ip_mroute.c#7 integrate ... //depot/projects/ia64/sys/netinet/raw_ip.c#9 integrate ... //depot/projects/ia64/sys/netinet/tcp_input.c#10 integrate ... //depot/projects/ia64/sys/netinet/udp_usrreq.c#9 integrate ... //depot/projects/ia64/sys/netinet6/icmp6.c#4 integrate ... //depot/projects/ia64/sys/netinet6/ip6_mroute.c#4 integrate ... //depot/projects/ia64/sys/netinet6/raw_ip6.c#4 integrate ... //depot/projects/ia64/sys/netinet6/udp6_usrreq.c#6 integrate ... //depot/projects/ia64/sys/netipx/ipx_usrreq.c#4 integrate ... //depot/projects/ia64/sys/netipx/spx_usrreq.c#3 integrate ... //depot/projects/ia64/sys/netkey/keysock.c#5 integrate ... //depot/projects/ia64/sys/netnatm/natm.c#5 integrate ... //depot/projects/ia64/sys/netsmb/smb_trantcp.c#6 integrate ... //depot/projects/ia64/sys/nfsclient/bootp_subr.c#4 integrate ... //depot/projects/ia64/sys/nfsclient/nfs_node.c#4 integrate ... //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#5 integrate ... //depot/projects/ia64/sys/nfsclient/nfsnode.h#2 integrate ... //depot/projects/ia64/sys/pc98/pc98/clock.c#6 integrate ... //depot/projects/ia64/sys/pc98/pc98/isa_dma.c#3 integrate ... //depot/projects/ia64/sys/pci/if_dc.c#9 integrate ... //depot/projects/ia64/sys/pci/if_sk.c#5 integrate ... //depot/projects/ia64/sys/pci/if_ti.c#7 integrate ... //depot/projects/ia64/sys/powerpc/include/frame.h#3 integrate ... //depot/projects/ia64/sys/powerpc/include/pcpu.h#3 integrate ... //depot/projects/ia64/sys/powerpc/include/pmap.h#3 integrate ... //depot/projects/ia64/sys/powerpc/include/spr.h#1 branch ... //depot/projects/ia64/sys/powerpc/powerpc/clock.c#5 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/copyinout.c#2 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/genassym.c#5 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/locore.s#5 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#8 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/sigcode.S#1 branch ... //depot/projects/ia64/sys/powerpc/powerpc/swtch.s#5 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/trap.c#8 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/trap_subr.S#1 branch ... //depot/projects/ia64/sys/sparc64/include/pmap.h#3 integrate ... //depot/projects/ia64/sys/sparc64/include/proc.h#5 integrate ... //depot/projects/ia64/sys/sparc64/include/sysarch.h#2 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#13 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#10 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/sys_machdep.c#3 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#6 integrate ... //depot/projects/ia64/sys/sys/endian.h#2 integrate ... //depot/projects/ia64/sys/sys/filedesc.h#7 integrate ... //depot/projects/ia64/sys/sys/malloc.h#9 integrate ... //depot/projects/ia64/sys/sys/param.h#10 integrate ... //depot/projects/ia64/sys/sys/proc.h#13 integrate ... //depot/projects/ia64/sys/sys/signalvar.h#5 integrate ... //depot/projects/ia64/sys/sys/socketvar.h#11 integrate ... //depot/projects/ia64/sys/sys/time.h#7 integrate ... //depot/projects/ia64/sys/sys/timepps.h#4 integrate ... //depot/projects/ia64/sys/sys/timetc.h#5 integrate ... //depot/projects/ia64/sys/sys/timex.h#4 integrate ... //depot/projects/ia64/sys/sys/vnode.h#10 integrate ... //depot/projects/ia64/sys/vm/pmap.h#6 integrate ... //depot/projects/ia64/sys/vm/uma.h#4 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#11 integrate ... //depot/projects/ia64/sys/vm/uma_dbg.c#1 branch ... //depot/projects/ia64/sys/vm/uma_dbg.h#1 branch ... //depot/projects/ia64/sys/vm/uma_int.h#7 integrate ... //depot/projects/ia64/sys/vm/vm_fault.c#9 integrate ... //depot/projects/ia64/sys/vm/vm_glue.c#9 integrate ... //depot/projects/ia64/sys/vm/vm_kern.c#5 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#10 integrate ... //depot/projects/ia64/sys/vm/vm_map.h#8 integrate ... //depot/projects/ia64/sys/vm/vm_page.c#10 integrate ... //depot/projects/ia64/sys/vm/vm_page.h#4 integrate ... //depot/projects/ia64/sys/vm/vm_pageout.c#9 integrate ... //depot/projects/ia64/sys/vm/vnode_pager.c#8 integrate ... //depot/projects/ia64/tools/regression/README#4 integrate ... //depot/projects/ia64/tools/regression/usr.bin/file2c/regress.sh#2 integrate ... //depot/projects/ia64/tools/regression/usr.bin/join/regress.sh#2 integrate ... //depot/projects/ia64/tools/regression/usr.bin/jot/regress.sh#2 integrate ... //depot/projects/ia64/tools/regression/usr.bin/make/Makefile#2 integrate ... //depot/projects/ia64/tools/regression/usr.bin/sed/regress.sh#2 integrate ... //depot/projects/ia64/tools/regression/usr.bin/uudecode/regress.sh#2 integrate ... //depot/projects/ia64/tools/regression/usr.bin/uuencode/regress.sh#2 integrate ... //depot/projects/ia64/tools/regression/usr.bin/xargs/regress.sh#2 integrate ... //depot/projects/ia64/usr.bin/Makefile#20 integrate ... //depot/projects/ia64/usr.bin/calendar/Makefile#5 integrate ... //depot/projects/ia64/usr.bin/calendar/calendar.1#3 integrate ... //depot/projects/ia64/usr.bin/calendar/calendars/calendar.all#2 integrate ... //depot/projects/ia64/usr.bin/calendar/calendars/calendar.french#1 branch ... //depot/projects/ia64/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.all#1 branch ... //depot/projects/ia64/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes#1 branch ... //depot/projects/ia64/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.french#1 branch ... //depot/projects/ia64/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.jferies#1 branch ... //depot/projects/ia64/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.proverbes#1 branch ... //depot/projects/ia64/usr.bin/chat/Makefile#2 integrate ... //depot/projects/ia64/usr.bin/chflags/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/ee/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/fmt/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/getopt/getopt.c#3 integrate ... //depot/projects/ia64/usr.bin/head/head.c#6 integrate ... //depot/projects/ia64/usr.bin/ipcrm/ipcrm.c#4 integrate ... //depot/projects/ia64/usr.bin/join/join.c#5 integrate ... //depot/projects/ia64/usr.bin/ktrace/ktrace.c#4 integrate ... //depot/projects/ia64/usr.bin/ktrace/ktrace.h#3 integrate ... //depot/projects/ia64/usr.bin/ktrace/subr.c#3 integrate ... //depot/projects/ia64/usr.bin/ldd/Makefile#2 integrate ... //depot/projects/ia64/usr.bin/ldd/extern.h#1 branch ... //depot/projects/ia64/usr.bin/ldd/ldd.c#5 integrate ... //depot/projects/ia64/usr.bin/ldd/sods.c#3 integrate ... //depot/projects/ia64/usr.bin/look/look.c#4 integrate ... //depot/projects/ia64/usr.bin/lsvfs/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/mklocale/extern.h#1 branch ... //depot/projects/ia64/usr.bin/mklocale/lex.l#2 integrate ... //depot/projects/ia64/usr.bin/mklocale/yacc.y#4 integrate ... //depot/projects/ia64/usr.bin/mkstr/mkstr.c#5 integrate ... //depot/projects/ia64/usr.bin/ncal/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/ncal/ncal.c#2 integrate ... //depot/projects/ia64/usr.bin/ncplist/ncplist.c#2 integrate ... //depot/projects/ia64/usr.bin/ncplogin/ncplogin.c#3 integrate ... //depot/projects/ia64/usr.bin/netstat/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/netstat/if.c#2 integrate ... //depot/projects/ia64/usr.bin/netstat/inet6.c#2 integrate ... //depot/projects/ia64/usr.bin/netstat/main.c#2 integrate ... //depot/projects/ia64/usr.bin/newkey/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/newkey/generic.c#4 integrate ... //depot/projects/ia64/usr.bin/newkey/newkey.c#4 integrate ... //depot/projects/ia64/usr.bin/newkey/update.c#4 integrate ... //depot/projects/ia64/usr.bin/nm/nm.c#3 integrate ... //depot/projects/ia64/usr.bin/passwd/local_passwd.c#3 integrate ... //depot/projects/ia64/usr.bin/passwd/passwd.c#5 integrate ... //depot/projects/ia64/usr.bin/passwd/yp_passwd.c#3 integrate ... //depot/projects/ia64/usr.bin/paste/paste.c#4 integrate ... //depot/projects/ia64/usr.bin/quota/quota.c#3 integrate ... //depot/projects/ia64/usr.bin/ranlib/build.c#3 integrate ... //depot/projects/ia64/usr.bin/ranlib/extern.h#1 branch ... //depot/projects/ia64/usr.bin/ranlib/misc.c#3 integrate ... //depot/projects/ia64/usr.bin/ranlib/ranlib.c#3 integrate ... //depot/projects/ia64/usr.bin/ranlib/touch.c#3 integrate ... //depot/projects/ia64/usr.bin/rlogin/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/rlogin/rlogin.c#5 integrate ... //depot/projects/ia64/usr.bin/rs/rs.c#3 integrate ... //depot/projects/ia64/usr.bin/rup/rup.c#2 integrate ... //depot/projects/ia64/usr.bin/ruptime/ruptime.c#3 integrate ... //depot/projects/ia64/usr.bin/rusers/rusers.c#3 integrate ... //depot/projects/ia64/usr.bin/strip/Makefile#4 integrate ... //depot/projects/ia64/usr.sbin/crunch/crunchide/Makefile#2 integrate ... //depot/projects/ia64/usr.sbin/crunch/crunchide/crunchide.c#3 integrate ... //depot/projects/ia64/usr.sbin/crunch/crunchide/exec_aout.c#2 integrate ... //depot/projects/ia64/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate ... //depot/projects/ia64/usr.sbin/crunch/crunchide/extern.h#2 integrate ... //depot/projects/ia64/usr.sbin/keyserv/keyserv.c#3 integrate ... //depot/projects/ia64/usr.sbin/moused/moused.c#3 integrate ... //depot/projects/ia64/usr.sbin/prefix/Makefile#2 integrate ... //depot/projects/ia64/usr.sbin/pstat/pstat.8#2 integrate ... //depot/projects/ia64/usr.sbin/pstat/pstat.c#2 integrate ... //depot/projects/ia64/usr.sbin/rpc.ypxfrd/ypxfrd_server.c#3 integrate ... //depot/projects/ia64/usr.sbin/spray/spray.c#2 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/Makefile#6 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/dist.c#7 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/media.c#4 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/package.c#5 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#7 integrate ... //depot/projects/ia64/usr.sbin/yp_mkdb/yp_mkdb.c#3 integrate ... //depot/projects/ia64/usr.sbin/ypbind/yp_ping.c#3 integrate ... //depot/projects/ia64/usr.sbin/ypbind/ypbind.c#3 integrate ... //depot/projects/ia64/usr.sbin/yppush/yppush_main.c#4 integrate ... //depot/projects/ia64/usr.sbin/ypserv/yp_dblookup.c#3 integrate ... //depot/projects/ia64/usr.sbin/ypserv/yp_server.c#3 integrate ... //depot/projects/ia64/usr.sbin/ypset/ypset.c#3 integrate Differences ... ==== //depot/projects/ia64/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.251 2002/04/26 17:55:10 ru Exp $ +# $FreeBSD: src/Makefile,v 1.253 2002/04/30 11:50:01 ru Exp $ # # The user-driven targets are: # @@ -83,11 +83,16 @@ # order, but that's not important. # TGTS= all all-man buildkernel buildworld checkdpadd clean \ - cleandepend cleandir depend distribute distribworld everything \ - hierarchy includes install installcheck installkernel kernel \ + cleandepend cleandir depend distribute distributeworld everything \ + hierarchy includes install installcheck installkernel \ reinstallkernel installmost installworld libraries lint \ mk most obj objlink regress rerelease tags update +.ORDER: buildworld installworld +.ORDER: buildworld distributeworld +.ORDER: buildkernel installkernel +.ORDER: buildkernel reinstallkernel + PATH= /sbin:/bin:/usr/sbin:/usr/bin MAKE= PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1 @@ -134,6 +139,13 @@ @echo "--------------------------------------------------------------" # +# kernel +# +# Short hand for `make buildkernel installkernel' +# +kernel: buildkernel installkernel + +# # Perform a few tests to determine if the installed tools are adequate # for building the world. These are for older systems (prior to 2.2.5). # ==== //depot/projects/ia64/Makefile.inc1#21 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.261 2002/04/26 17:55:10 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.266 2002/04/30 23:29:00 bde Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -57,9 +57,6 @@ .if exists(${.CURDIR}/bin) SUBDIR+= bin .endif -.if exists(${.CURDIR}/etc) -SUBDIR+= etc -.endif .if exists(${.CURDIR}/games) && !defined(NOGAMES) SUBDIR+= games .endif @@ -96,6 +93,11 @@ SUBDIR+= usr.sbin .endif +# etc must be last for "distribute" to work +.if exists(${.CURDIR}/etc) +SUBDIR+= etc +.endif + # These are last, since it is nice to at least get the base system # rebuilt before you do them. .if defined(LOCAL_DIRS) @@ -353,14 +355,14 @@ # # Installs everything compiled by a 'buildworld'. # -installworld: installcheck +distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} for prog in [ awk cat chflags chmod chown date echo egrep find grep \ - ln make makewhatis mkdir mtree mv perl rm sed sh sysctl \ + ln make makewhatis mkdir mtree mv perl pwd_mkdb rm sed sh sysctl \ test true uname wc zic; do \ cp `which $$prog` ${INSTALLTMP}; \ done - cd ${.CURDIR}; ${IMAKE} reinstall + cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} rm -rf ${INSTALLTMP} # @@ -388,14 +390,11 @@ cd ${.CURDIR}/share/man; ${MAKE} makedb .endif -# -# distribworld -# -# Front-end to distribute to make sure the search path contains -# the object directory. Needed for miniperl. -# -distribworld: - cd ${.CURDIR}; PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 distribute +redistribute: + @echo "--------------------------------------------------------------" + @echo ">>> Distributing everything.." + @echo "--------------------------------------------------------------" + cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute # # buildkernel and installkernel @@ -496,13 +495,6 @@ ${CROSSENV} ${MAKE} KERNEL=${INSTKERNNAME} ${.TARGET:S/kernel$//} # -# kernel -# -# Short hand for `make buildkernel installkernel' -# -kernel: buildkernel installkernel - -# # update # # Update the source tree, by running sup and/or running cvs to update to the @@ -657,7 +649,8 @@ cross-tools: .for _tool in ${_btxld} ${_elf2exe} \ - gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc ${_xlint} + gnu/usr.bin/binutils usr.bin/objformat usr.sbin/crunch/crunchide \ + gnu/usr.bin/cc ${_xlint} cd ${.CURDIR}/${_tool}; \ ${MAKE} obj; \ ${MAKE} depend; \ @@ -677,20 +670,25 @@ includes: cd ${.CURDIR}/include; ${MAKE} -B all install cd ${.CURDIR}/gnu/include; ${MAKE} install +.if !defined(NO_GCC) + cd ${.CURDIR}/gnu/lib/csu; ${MAKE} beforeinstall +.endif + cd ${.CURDIR}/gnu/lib/libdialog; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libobjc; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libreadline/readline; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libregex; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libstdc++; ${MAKE} beforeinstall - cd ${.CURDIR}/gnu/lib/libdialog; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/usr.bin/cc/cc1plus; ${MAKE} beforeinstall -.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) -.if exists(${.CURDIR}/secure/lib/libcrypto) - cd ${.CURDIR}/secure/lib/libcrypto; ${MAKE} beforeinstall +.if exists(${.CURDIR}/kerberos5) && !defined(NOCRYPT) && \ + defined(MAKE_KERBEROS5) + cd ${.CURDIR}/kerberos5/lib/libasn1; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libhdb; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkadm5clnt; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkadm5srv; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkafs5; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkrb5; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libsl; ${MAKE} beforeinstall .endif -.if exists(${.CURDIR}/secure/lib/libssl) - cd ${.CURDIR}/secure/lib/libssl; ${MAKE} beforeinstall -.endif -.endif .if exists(${.CURDIR}/kerberosIV) && !defined(NOCRYPT) && \ defined(MAKE_KERBEROS4) cd ${.CURDIR}/kerberosIV/lib/libacl; ${MAKE} beforeinstall @@ -704,28 +702,16 @@ .else cd ${.CURDIR}/lib/libtelnet; ${MAKE} beforeinstall .endif -.if exists(${.CURDIR}/kerberos5) && !defined(NOCRYPT) && \ - defined(MAKE_KERBEROS5) - cd ${.CURDIR}/kerberos5/lib/libasn1; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libhdb; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkadm5clnt; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkadm5srv; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkafs5; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkrb5; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libsl; ${MAKE} beforeinstall -.endif .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}) cd ${.CURDIR}/lib/csu/${MACHINE_ARCH}; ${MAKE} beforeinstall .endif -.if !defined(NO_GCC) - cd ${.CURDIR}/gnu/lib/csu; ${MAKE} beforeinstall -.endif cd ${.CURDIR}/lib/libalias; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libatm; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libdevstat; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libc; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcalendar; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcam; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libcom_err; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libdevstat; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libdisk; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libedit; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libfetch; ${MAKE} beforeinstall @@ -733,25 +719,32 @@ cd ${.CURDIR}/lib/libkvm; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libmd; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libmp; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/msun; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libncp; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libncurses; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libnetgraph; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libopie; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libpam/libpam; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libpcap; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libradius; ${MAKE} beforeinstall cd ${.CURDIR}/lib/librpcsvc; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libpam/libpam; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libsbuf; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libstand; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libtacplus; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libcom_err; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libusbhid; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libutil; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libvgl; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libwrap; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libypclnt; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libz; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/msun; ${MAKE} beforeinstall +.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/secure/lib/libcrypto) + cd ${.CURDIR}/secure/lib/libcrypto; ${MAKE} beforeinstall +.endif +.if exists(${.CURDIR}/secure/lib/libssl) + cd ${.CURDIR}/secure/lib/libssl; ${MAKE} beforeinstall +.endif +.endif cd ${.CURDIR}/usr.bin/lex; ${MAKE} beforeinstall # ==== //depot/projects/ia64/contrib/gcc/config/freebsd.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* Base configuration file for all FreeBSD targets. - Copyright (C) 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU CC. @@ -21,116 +21,72 @@ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify their commonalities. - Adapted from /usr/src/contrib/gcc/config/i386/freebsd.h, - /usr/src/contrib/gcc/config/svr4.h & - egcs/gcc/config/i386/freebsd-elf.h by - David O'Brien . */ + Adapted from gcc/config/i386/freebsd-elf.h by + David O'Brien . + Further work by David O'Brien and + Loren J. Rittle . */ -/* $FreeBSD: src/contrib/gcc/config/freebsd.h,v 1.36 2001/05/14 22:45:26 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd.h,v 1.37 2002/04/30 17:22:42 obrien Exp $ */ - -/* Cpp, assembler, linker, library, and startfile spec's. */ +/* In case we need to know. */ +#define USING_CONFIG_FREEBSD 1 /* This defines which switch letters take arguments. On FreeBSD, most of the normal cases (defined in gcc.c) apply, and we also have -h* and -z* options (for the linker) (coming from SVR4). We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -#define FBSD_SWITCH_TAKES_ARG(CHAR) \ - (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ - || (CHAR) == 'h' \ - || (CHAR) == 'z' /* ignored by ld */ \ - || (CHAR) == 'R') - #undef SWITCH_TAKES_ARG #define SWITCH_TAKES_ARG(CHAR) (FBSD_SWITCH_TAKES_ARG(CHAR)) -/* This defines which multi-letter switches take arguments. */ - -#define FBSD_WORD_SWITCH_TAKES_ARG(STR) \ - (DEFAULT_WORD_SWITCH_TAKES_ARG (STR) \ - || !strcmp ((STR), "rpath") || !strcmp ((STR), "rpath-link") \ - || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") \ - || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker")) - #undef WORD_SWITCH_TAKES_ARG #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) -/* Place spaces around this string. We depend on string splicing to produce - the final CPP_PREDEFINES value. */ - -#define FBSD_CPP_PREDEFINES \ - " -D__FreeBSD__=5 -D__FreeBSD_cc_version=500002 -Dunix -Asystem(unix) -Asystem(FreeBSD) " - -#define FBSD_CPP_SPEC " \ - %(cpp_cpu) \ - %{!maout: -D__ELF__} \ - %{munderscores: -D__UNDERSCORES__} \ - %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ - %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ - %{posix:-D_POSIX_SOURCE}" +#undef CPP_PREDEFINES +#define CPP_PREDEFINES FBSD_CPP_PREDEFINES #undef CPP_SPEC #define CPP_SPEC FBSD_CPP_SPEC -/* Provide a LIB_SPEC appropriate for FreeBSD. Before - __FreeBSD_version 500016, select the appropriate libc, depending on - whether we're doing profiling or need threads support. (similar to - the default, except no -lg, and no -p). At __FreeBSD_version - 500016 and later, when threads support is requested include both - -lc and -lc_r instead of only -lc_r. */ +#undef STARTFILE_SPEC +#define STARTFILE_SPEC FBSD_STARTFILE_SPEC + +#undef ENDFILE_SPEC +#define ENDFILE_SPEC FBSD_ENDFILE_SPEC #undef LIB_SPEC -#include -#if __FreeBSD_version >= 500016 -#define LIB_SPEC " \ - %{!shared: \ - %{!pg: %{pthread:-lc_r} -lc} \ - %{pg: %{pthread:-lc_r_p} -lc_p} \ - }" -#else -#define LIB_SPEC " \ - %{!shared: \ - %{!pg: \ - %{!pthread:-lc} \ - %{pthread:-lc_r}} \ - %{pg: \ - %{!pthread:-lc_p} \ - %{pthread:-lc_r_p}} \ - }" -#endif +#define LIB_SPEC FBSD_LIB_SPEC /************************[ Target stuff ]***********************************/ /* All FreeBSD Architectures support the ELF object file format. */ #undef OBJECT_FORMAT_ELF -#define OBJECT_FORMAT_ELF +#define OBJECT_FORMAT_ELF 1 /* Don't assume anything about the header files. */ #undef NO_IMPLICIT_EXTERN_C -#define NO_IMPLICIT_EXTERN_C - -/* Implicit library calls should use memcpy, not bcopy, etc. */ -#undef TARGET_MEM_FUNCTIONS -#define TARGET_MEM_FUNCTIONS +#define NO_IMPLICIT_EXTERN_C 1 /* Allow #sccs in preprocessor. */ #undef SCCS_DIRECTIVE -#define SCCS_DIRECTIVE +#define SCCS_DIRECTIVE 1 + +/* Make gcc agree with FreeBSD's standard headers (, etc...) */ + +#undef WCHAR_TYPE +#define WCHAR_TYPE "int" + +#undef WCHAR_UNSIGNED +#define WCHAR_UNSIGNED 0 -#undef HAVE_ATEXIT -#define HAVE_ATEXIT +#ifdef FREEBSD_NATIVE +#define LIBSTDCXX_PROFILE "-lstdc++_p" +#endif +#define MATH_LIBRARY_PROFILE "-lm_p" /* Code generation parameters. */ -/* Don't default to pcc-struct-return, because gcc is the only compiler, and - we want to retain compatibility with older gcc versions - (even though the SVR4 ABI for the i386 says that records and unions are - returned in memory). */ -#undef DEFAULT_PCC_STRUCT_RETURN -#define DEFAULT_PCC_STRUCT_RETURN 0 - /* Writing `int' for a bitfield forces int alignment for the structure. */ /* XXX: ok for Alpha?? */ #undef PCC_BITFIELD_TYPE_MATTERS @@ -141,395 +97,13 @@ with libraries compiled with the native cc. */ #undef NO_DOLLAR_IN_LABEL -/* The prefix to add to user-visible assembler symbols. - For System V Release 4 & ELF the convention is *not* to prepend a leading - underscore onto user-level symbol names. */ - -#undef USER_LABEL_PREFIX -#define USER_LABEL_PREFIX "" - -/* Handle #pragma weak and #pragma pack. */ -#undef HANDLE_SYSV_PRAGMA -#define HANDLE_SYSV_PRAGMA - -#ifdef WANT_DWARF2_UNWIND -/* FreeBSD ELF uses across the board will now use DWARF2 unwinding as the IA-64 - psABI requires it. */ -#define DWARF2_UNWIND_INFO 1 -#else -/* Maintain compatibility with the FreeBSD {3,4}.x C++ ABI. */ -#define DWARF2_UNWIND_INFO 0 -#endif - -/* Do not use ``thunks'' to implement C++ vtables. This method still has - fatal bugs. Also, GCC 3.0 will have a new C++ ABI that may not even - support `thunks'. */ -#undef DEFAULT_VTABLE_THUNKS +/* Used by libgcc2.c. We support file locking with fcntl / F_SETLKW. + This enables the test coverage code to use file locking when exiting a + program, which avoids race conditions if the program has forked. */ +#define TARGET_HAS_F_SETLKW 1 /************************[ Assembler stuff ]********************************/ -/* Override the default comment-starter of "/". */ -#undef ASM_COMMENT_START -#define ASM_COMMENT_START "#" - -/* Attach a special .ident directive to the end of the file to identify - the version of GCC which compiled this code. The format of the .ident - string is patterned after the ones produced by native SVR4 C compilers. */ - -#undef IDENT_ASM_OP -#define IDENT_ASM_OP "\t.ident\t" - -/* Output #ident as a .ident. */ - -#undef ASM_OUTPUT_IDENT -#define ASM_OUTPUT_IDENT(FILE, NAME) \ - fprintf ((FILE), "%s\"%s\"\n", IDENT_ASM_OP, (NAME)); - -/* Identify the front-end which produced this file. To keep symbol - space down, and not confuse kdb, only do this if the language is - not C. (svr4.h defines ASM_IDENTIFY_GCC but neglects this) */ - -#undef ASM_IDENTIFY_LANGUAGE -#define ASM_IDENTIFY_LANGUAGE(FILE) \ - { \ - if (strcmp (lang_identify (), "c") != 0) \ - output_lang_identify (FILE); \ - } - -#undef ASM_FILE_END -#define ASM_FILE_END(FILE) \ - do { \ - if (!flag_no_ident) \ - fprintf ((FILE), "%s\"[ASM_FILE_END]GCC: (%s) %s\"\n", \ - IDENT_ASM_OP, lang_identify(), version_string); \ - } while (0) - -/* This is the pseudo-op used to generate a contiguous sequence of byte - values from a double-quoted string WITHOUT HAVING A TERMINATING NUL - AUTOMATICALLY APPENDED. This is the same for most SVR4 assemblers. */ - -#undef ASCII_DATA_ASM_OP -#define ASCII_DATA_ASM_OP "\t.ascii\t" - -#undef ASM_BYTE_OP -#define ASM_BYTE_OP "\t.byte\t" - -/* This is how to allocate empty space in some section. The .zero - pseudo-op is used for this on most ELF assemblers. */ - -#undef SKIP_ASM_OP -#define SKIP_ASM_OP "\t.zero\t" - -/* A table of bytes codes used by the ASM_OUTPUT_ASCII and - ASM_OUTPUT_LIMITED_STRING macros. Each byte in the table - corresponds to a particular byte value [0..255]. For any - given byte value, if the value in the corresponding table - position is zero, the given character can be output directly. - If the table value is 1, the byte must be output as a \ooo - octal escape. If the tables value is anything else, then the - byte value should be output as a \ followed by the value - in the table. Note that we can use standard UN*X escape - sequences for many control characters, but we don't use - \a to represent BEL because some SVR4 assemblers (e.g. on - the i386) don't know about that. Also, we don't use \v - since some versions of gas, such as 2.2 did not accept it. */ - -#define ESCAPES \ -"\1\1\1\1\1\1\1\1btn\1fr\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\ -\0\0\"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\ -\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\\\0\0\0\ -\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\ -\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\ -\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\ -\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\ -\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1" - -/* Some SVR4 assemblers have a limit on the number of characters which - can appear in the operand of a .string directive. If your assembler - has such a limitation, you should define STRING_LIMIT to reflect that - limit. Note that at least some SVR4 assemblers have a limit on the - actual number of bytes in the double-quoted string, and that they - count each character in an escape sequence as one byte. Thus, an - escape sequence like \377 would count as four bytes. - - If your target assembler doesn't support the .string directive, you - should define this to zero. -*/ - -#undef STRING_LIMIT -#define STRING_LIMIT ((unsigned) 256) - -#undef STRING_ASM_OP -#define STRING_ASM_OP "\t.string\t" - -/* Output the label which precedes a jumptable. Note that for all svr4/ELF - systems where we actually generate jumptables (which is to say every - SVR4 target except i386, where we use casesi instead) we put the jump- - tables into the .rodata section and since other stuff could have been - put into the .rodata section prior to any given jumptable, we have to - make sure that the location counter for the .rodata section gets pro- - perly re-aligned prior to the actual beginning of the jump table. */ - -#undef ALIGN_ASM_OP -#define ALIGN_ASM_OP "\t.align\t" - -/* This says how to output assembler code to declare an - uninitialized external linkage data object. Under SVR4/ELF, - the linker seems to want the alignment of data objects - to depend on their types. We do exactly that here. */ - -#undef COMMON_ASM_OP -#define COMMON_ASM_OP "\t.comm\t" - -/* This says how to output assembler code to declare an - uninitialized internal linkage data object. Under SVR4/ELF, - the linker seems to want the alignment of data objects - to depend on their types. We do exactly that here. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 19:37:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BFDF37B41C; Tue, 30 Apr 2002 19:37:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 551CC37B417 for ; Tue, 30 Apr 2002 19:37:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g412bqQ44759 for perforce@freebsd.org; Tue, 30 Apr 2002 19:37:52 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Tue, 30 Apr 2002 19:37:52 -0700 (PDT) Message-Id: <200205010237.g412bqQ44759@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10556 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10556 Change 10556 by jake@jake_sparc64 on 2002/04/30 19:37:14 Fix merge-o. Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/sys/Makefile.inc#16 edit Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/sys/Makefile.inc#16 (text+ko) ==== @@ -14,11 +14,9 @@ MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S # Don't generate default code for these syscalls: -NOASM= __semctl.o break.o exit.o ftruncate.o getdomainname.o getlogin.o \ - lseek.o mlockall.o mmap.o msgctl.o msgget.o msgrcv.o msgsnd.o \ - munlockall.o openbsd_poll.o pread.o pwrite.o semconfig.o semget.o \ - semop.o setdomainname.o shmat.o shmctl.o shmdt.o shmget.o sstk.o \ - truncate.o uname.o yield.o +NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ + lseek.o mlockall.o mmap.o munlockall.o openbsd_poll.o pread.o \ + pwrite.o setdomainname.o sstk.o truncate.o uname.o yield.o PSEUDO= _getlogin.o _exit.o To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 19:59:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BC8A37B41E; Tue, 30 Apr 2002 19:59:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2F5CB37B41B for ; Tue, 30 Apr 2002 19:59:19 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g412xIV47235 for perforce@freebsd.org; Tue, 30 Apr 2002 19:59:18 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Apr 2002 19:59:18 -0700 (PDT) Message-Id: <200205010259.g412xIV47235@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10558 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10558 Change 10558 by peter@peter_daintree on 2002/04/30 19:58:34 IFC @10557 Affected files ... ... //depot/projects/ia64/release/scripts/bin-install.sh#3 delete ... //depot/projects/ia64/sys/compat/linux/linux_misc.c#9 integrate ... //depot/projects/ia64/sys/conf/kmod.mk#6 integrate ... //depot/projects/ia64/sys/kern/kern_environment.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_tc.c#8 integrate ... //depot/projects/ia64/sys/kern/subr_hints.c#4 integrate ... //depot/projects/ia64/sys/kern/vnode_if.pl#3 delete ... //depot/projects/ia64/sys/modules/drm/mga/Makefile#2 integrate ... //depot/projects/ia64/sys/modules/drm/r128/Makefile#2 integrate ... //depot/projects/ia64/sys/modules/drm/radeon/Makefile#2 integrate Differences ... ==== //depot/projects/ia64/sys/compat/linux/linux_misc.c#9 (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. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.120 2002/04/20 14:43:34 rwatson Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.121 2002/05/01 02:17:33 peter Exp $ */ #include "opt_compat.h" @@ -64,13 +64,7 @@ #include #include -#include #include -#include -#include -#ifdef __i386__ -#include -#endif #include ==== //depot/projects/ia64/sys/conf/kmod.mk#6 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.120 2002/04/29 06:35:25 obrien Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.121 2002/05/01 01:32:28 peter Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -82,6 +82,10 @@ KMODUNLOAD?= /sbin/kldunload OBJCOPY?= objcopy +.if defined(KMODDEPS) +.error "Do not use KMODDEPS on 5.0+, use MODULE_VERSION/MODULE_DEPEND" +.endif + .include .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S ==== //depot/projects/ia64/sys/kern/kern_environment.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_environment.c,v 1.23 2002/04/25 20:25:15 bde Exp $ + * $FreeBSD: src/sys/kern/kern_environment.c,v 1.24 2002/05/01 02:51:50 peter Exp $ */ /* @@ -85,7 +85,7 @@ char *name, *value; size_t len, done; int error, i; - + KASSERT(dynamic_kenv, ("kenv: dynamic_kenv = 0")); error = 0; @@ -368,16 +368,16 @@ int getenv_string(const char *name, char *data, int size) { - char *tmp; + char *tmp; - tmp = getenv(name); - if (tmp != NULL) { - strncpy(data, tmp, size); - freeenv(tmp); - data[size - 1] = 0; - return (1); - } else - return (0); + tmp = getenv(name); + if (tmp != NULL) { + strncpy(data, tmp, size); + freeenv(tmp); + data[size - 1] = 0; + return (1); + } else + return (0); } /* @@ -386,14 +386,13 @@ int getenv_int(const char *name, int *data) { - quad_t tmp; - int rval; + quad_t tmp; + int rval; - rval = getenv_quad(name, &tmp); - if (rval) { - *data = (int) tmp; - } - return (rval); + rval = getenv_quad(name, &tmp); + if (rval) + *data = (int) tmp; + return (rval); } /* @@ -402,22 +401,21 @@ int getenv_quad(const char *name, quad_t *data) { - char *value; - char *vtp; - quad_t iv; - - if ((value = getenv(name)) == NULL) - return(0); - - iv = strtoq(value, &vtp, 0); - if ((vtp == value) || (*vtp != '\0')) { - freeenv(value); - return(0); - } - - freeenv(value); - *data = iv; - return(1); + char *value; + char *vtp; + quad_t iv; + + value = getenv(name); + if (value == NULL) + return (0); + iv = strtoq(value, &vtp, 0); + if ((vtp == value) || (*vtp != '\0')) { + freeenv(value); + return (0); + } + freeenv(value); + *data = iv; + return (1); } /* @@ -427,14 +425,15 @@ static char * kernenv_next(char *cp) { - if (cp != NULL) { - while (*cp != 0) - cp++; - cp++; - if (*cp == 0) - cp = NULL; - } - return(cp); + + if (cp != NULL) { + while (*cp != 0) + cp++; + cp++; + if (*cp == 0) + cp = NULL; + } + return (cp); } void ==== //depot/projects/ia64/sys/kern/kern_tc.c#8 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/kern/kern_tc.c,v 1.131 2002/04/30 20:42:06 phk Exp $ + * $FreeBSD: src/sys/kern/kern_tc.c,v 1.132 2002/05/01 01:31:26 peter Exp $ */ #include "opt_ntp.h" @@ -19,8 +19,6 @@ #include #include -#include - /* * Implement a dummy timecounter which we can use until we get a real one * in the air. This allows the console and other early stuff to use ==== //depot/projects/ia64/sys/kern/subr_hints.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_hints.c,v 1.6 2002/04/27 22:32:57 peter Exp $ + * $FreeBSD: src/sys/kern/subr_hints.c,v 1.7 2002/05/01 02:51:50 peter Exp $ */ #include @@ -61,7 +61,7 @@ if (checkmethod) { switch (hintmode) { - case 0: /* config supplied nothing */ + case 0: /* loader hints in environment only */ break; case 1: /* static hints only */ hintp = static_hints; @@ -118,9 +118,8 @@ sx_sunlock(&kenv_lock); return (ENOENT); } - } else { + } else cp = hintp; - } while (cp) { hit = 1; (*line)++; ==== //depot/projects/ia64/sys/modules/drm/mga/Makefile#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/modules/drm/mga/Makefile,v 1.2 2002/04/28 04:58:36 anholt Exp $ +# $FreeBSD: src/sys/modules/drm/mga/Makefile,v 1.3 2002/05/01 01:34:48 peter Exp $ .PATH: ${.CURDIR}/../../../dev/drm KMOD = mga NOMAN = YES SRCS = mga_drv.c mga_state.c mga_warp.c mga_dma.c SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h -KMODDEPS= agp .include ==== //depot/projects/ia64/sys/modules/drm/r128/Makefile#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/modules/drm/r128/Makefile,v 1.2 2002/04/28 04:58:37 anholt Exp $ +# $FreeBSD: src/sys/modules/drm/r128/Makefile,v 1.3 2002/05/01 01:34:48 peter Exp $ .PATH: ${.CURDIR}/../../../dev/drm KMOD = r128 NOMAN = YES SRCS = r128_cce.c r128_drv.c r128_state.c SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h -KMODDEPS= agp .include ==== //depot/projects/ia64/sys/modules/drm/radeon/Makefile#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/modules/drm/radeon/Makefile,v 1.2 2002/04/28 04:58:38 anholt Exp $ +# $FreeBSD: src/sys/modules/drm/radeon/Makefile,v 1.3 2002/05/01 01:34:48 peter Exp $ .PATH: ${.CURDIR}/../../../dev/drm KMOD = radeon NOMAN = YES SRCS = radeon_cp.c radeon_drv.c radeon_state.c SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h -KMODDEPS= agp .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 20:34:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12F8437B419; Tue, 30 Apr 2002 20:34:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EEE0637B417 for ; Tue, 30 Apr 2002 20:34:02 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g413Y2M55171 for perforce@freebsd.org; Tue, 30 Apr 2002 20:34:02 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Apr 2002 20:34:02 -0700 (PDT) Message-Id: <200205010334.g413Y2M55171@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10562 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10562 Change 10562 by peter@peter_daintree on 2002/04/30 20:33:52 IFC @10561 (use makeobjops.awk) Affected files ... ... //depot/projects/ia64/sys/conf/kern.post.mk#10 integrate ... //depot/projects/ia64/sys/conf/kern.pre.mk#6 integrate ... //depot/projects/ia64/sys/conf/kmod.mk#7 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/ac97_if.m#2 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/feeder_if.m#2 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/mixer_if.m#2 integrate ... //depot/projects/ia64/sys/tools/makeobjops.awk#1 branch Differences ... ==== //depot/projects/ia64/sys/conf/kern.post.mk#10 (text+ko) ==== @@ -1,4 +1,3 @@ - # Part of unified Makefile for building kenrels. This includes all # the definitions that need to be included after all the % directives, # except %RULES and things that act like they are part of %RULES @@ -7,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.16 2002/04/24 11:26:19 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.17 2002/05/01 03:28:14 obrien Exp $ # # XXX why are only some phony targets marked phony? @@ -43,7 +42,7 @@ .for mfile in ${MFILES} ${mfile:T:S/.m$/.h/}: ${mfile} - perl5 $S/kern/makeobjops.pl -h ${mfile} + ${AWK} -f $S/tools/makeobjops.awk ${mfile} -h .endfor kernel-clean: ==== //depot/projects/ia64/sys/conf/kern.pre.mk#6 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kenrels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.10 2002/03/24 17:45:46 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.11 2002/05/01 03:28:14 obrien Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -73,7 +73,7 @@ PROFILE_C= ${CC} -c ${CFLAGS} ${WERROR} ${.IMPSRC} NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC} -NORMAL_M= perl5 $S/kern/makeobjops.pl -c $<; \ +NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk $< -c ; \ ${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c GEN_CFILES= $S/$M/$M/genassym.c ==== //depot/projects/ia64/sys/conf/kmod.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.121 2002/05/01 01:32:28 peter Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.122 2002/05/01 03:28:14 obrien Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -312,9 +312,9 @@ ${_src}: @ .endif .if exists(@) -${_src}: @/kern/makeobjops.pl @/${_srcsrc} +${_src}: @/tools/makeobjops.awk @/${_srcsrc} .endif - perl @/kern/makeobjops.pl -${_ext} @/${_srcsrc} + ${AWK} -f @/tools/makeobjops.awk @/${_srcsrc} -${_ext} .endif .endfor # _src .endfor # _ext ==== //depot/projects/ia64/sys/dev/sound/pcm/ac97_if.m#2 (text+ko) ==== @@ -1,61 +1,60 @@ -# KOBJ -# -# Copyright (c) 2000 Cameron Grant -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. -# -# $FreeBSD: src/sys/dev/sound/pcm/ac97_if.m,v 1.2 2001/03/05 16:42:06 cg Exp $ -# - -#include - -INTERFACE ac97; - -CODE { - - static u_int32_t - ac97_noinit(kobj_t obj, void *devinfo) - { - return 1; - } - -}; - -METHOD u_int32_t init { - kobj_t obj; - void *devinfo; -} DEFAULT ac97_noinit; - -METHOD int read { - kobj_t obj; - void *devinfo; - int regno; -}; - -METHOD int write { - kobj_t obj; - void *devinfo; - int regno; - u_int32_t data; -}; - +# KOBJ +# +# Copyright (c) 2000 Cameron Grant +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. +# +# $FreeBSD: src/sys/dev/sound/pcm/ac97_if.m,v 1.3 2002/05/01 03:07:40 obrien Exp $ +# + +#include + +INTERFACE ac97; + +CODE { + + static u_int32_t + ac97_noinit(kobj_t obj, void *devinfo) + { + return 1; + } + +}; + +METHOD u_int32_t init { + kobj_t obj; + void *devinfo; +} DEFAULT ac97_noinit; + +METHOD int read { + kobj_t obj; + void *devinfo; + int regno; +}; + +METHOD int write { + kobj_t obj; + void *devinfo; + int regno; + u_int32_t data; +}; ==== //depot/projects/ia64/sys/dev/sound/pcm/feeder_if.m#2 (text+ko) ==== @@ -1,89 +1,87 @@ -# KOBJ -# -# Copyright (c) 2000 Cameron Grant -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. -# -# $FreeBSD: src/sys/dev/sound/pcm/feeder_if.m,v 1.4 2001/05/27 14:49:14 cg Exp $ -# - -#include - -INTERFACE feeder; - -CODE { - - static int - feeder_noinit(struct pcm_feeder* feeder) - { - return 0; - } - - static int - feeder_nofree(struct pcm_feeder* feeder) - { - return 0; - } - - static int - feeder_noset(struct pcm_feeder* feeder, int what, int value) - { - return -1; - } - - static int - feeder_noget(struct pcm_feeder* feeder, int what) - { - return -1; - } - -}; - -METHOD int init { - struct pcm_feeder* feeder; -} DEFAULT feeder_noinit; - -METHOD int free { - struct pcm_feeder* feeder; -} DEFAULT feeder_nofree; - -METHOD int set { - struct pcm_feeder* feeder; - int what; - int value; -} DEFAULT feeder_noset; - -METHOD int get { - struct pcm_feeder* feeder; - int what; -} DEFAULT feeder_noget; - -METHOD int feed { - struct pcm_feeder* feeder; - struct pcm_channel* c; - u_int8_t* buffer; - u_int32_t count; - void* source; -}; - - +# KOBJ +# +# Copyright (c) 2000 Cameron Grant +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. +# +# $FreeBSD: src/sys/dev/sound/pcm/feeder_if.m,v 1.5 2002/05/01 03:07:40 obrien Exp $ +# + +#include + +INTERFACE feeder; + +CODE { + + static int + feeder_noinit(struct pcm_feeder* feeder) + { + return 0; + } + + static int + feeder_nofree(struct pcm_feeder* feeder) + { + return 0; + } + + static int + feeder_noset(struct pcm_feeder* feeder, int what, int value) + { + return -1; + } + + static int + feeder_noget(struct pcm_feeder* feeder, int what) + { + return -1; + } + +}; + +METHOD int init { + struct pcm_feeder* feeder; +} DEFAULT feeder_noinit; + +METHOD int free { + struct pcm_feeder* feeder; +} DEFAULT feeder_nofree; + +METHOD int set { + struct pcm_feeder* feeder; + int what; + int value; +} DEFAULT feeder_noset; + +METHOD int get { + struct pcm_feeder* feeder; + int what; +} DEFAULT feeder_noget; + +METHOD int feed { + struct pcm_feeder* feeder; + struct pcm_channel* c; + u_int8_t* buffer; + u_int32_t count; + void* source; +}; ==== //depot/projects/ia64/sys/dev/sound/pcm/mixer_if.m#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sys/dev/sound/pcm/mixer_if.m,v 1.3 2001/03/24 23:10:29 cg Exp $ +# $FreeBSD: src/sys/dev/sound/pcm/mixer_if.m,v 1.4 2002/05/01 03:07:40 obrien Exp $ # #include @@ -64,6 +64,3 @@ struct snd_mixer *m; u_int32_t src }; - - - To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 21: 7:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47E2637B41B; Tue, 30 Apr 2002 21:07:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4A4C037B405 for ; Tue, 30 Apr 2002 21:07:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4147id63114 for perforce@freebsd.org; Tue, 30 Apr 2002 21:07:44 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Apr 2002 21:07:44 -0700 (PDT) Message-Id: <200205010407.g4147id63114@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10565 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10565 Change 10565 by peter@peter_thunder on 2002/04/30 21:07:14 fix apparent typo. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#32 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#32 (text+ko) ==== @@ -1142,7 +1142,8 @@ } td->td_frame->tf_cr_iip = addr & ~0x0FULL; - td->td_frame->tf_cr_ipsr = (tf_cr_ipsr & ~IA64_PSR_RI) | slot; + td->td_frame->tf_cr_ipsr = (td->td_frame->tf_cr_ipsr & ~IA64_PSR_RI) | + slot; return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 23:21:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C1DF37B400; Tue, 30 Apr 2002 23:21:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5980437B405 for ; Tue, 30 Apr 2002 23:21:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g416LPp84535 for perforce@freebsd.org; Tue, 30 Apr 2002 23:21:25 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Apr 2002 23:21:25 -0700 (PDT) Message-Id: <200205010621.g416LPp84535@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10568 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10568 Change 10568 by peter@peter_daintree on 2002/04/30 23:20:30 It might help if we set up the kern_envp pointers etc *before* probing consoles and doing getenv(). Otherwise loader hints and variables cannot be found and only work in the static case. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#33 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#33 (text+ko) ==== @@ -381,7 +381,7 @@ vm_offset_t kernstartpfn, kernendpfn, pfn0, pfn1; char *p; EFI_MEMORY_DESCRIPTOR *md, *mdp; - int mdcount, i; + int mdcount, i, metadata_missing; /* NO OUTPUT ALLOWED UNTIL FURTHER NOTICE */ @@ -446,6 +446,16 @@ ia64_pal_base = mdp->PhysicalStart; } + metadata_missing = 0; + if (bootinfo.bi_modulep) + preload_metadata = (caddr_t)bootinfo.bi_modulep; + else + metadata_missing = 1; + if (envmode == 1) + kern_envp = static_env; + else + kern_envp = (caddr_t)bootinfo.bi_envp; + KASSERT(ia64_port_base != 0, ("%s: no I/O memory region", __func__)); @@ -508,13 +518,10 @@ /* But if the bootstrap tells us otherwise, believe it! */ if (bootinfo.bi_kernend) kernend = round_page(bootinfo.bi_kernend); - preload_metadata = (caddr_t)bootinfo.bi_modulep; - if (envmode == 1) - kern_envp = static_env; - else - kern_envp = (caddr_t)bootinfo.bi_envp; + if (metadata_missing) + printf("WARNING: loader(8) metadata is missing!\n"); - /* get fpswa interface */ + /* Get FPSWA interface */ fpswa_interface = (FPSWA_INTERFACE*)IA64_PHYS_TO_RR7(bootinfo.bi_fpswa); /* Init basic tunables, including hz */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 23:36:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36C9837B417; Tue, 30 Apr 2002 23:35:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D187B37B433 for ; Tue, 30 Apr 2002 23:35:43 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g416ZhH86336 for perforce@freebsd.org; Tue, 30 Apr 2002 23:35:43 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Apr 2002 23:35:43 -0700 (PDT) Message-Id: <200205010635.g416ZhH86336@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10571 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10571 Change 10571 by peter@peter_daintree on 2002/04/30 23:35:02 IFC @10570 (I botched something last time) Affected files ... ... //depot/projects/ia64/sys/alpha/alpha/mem.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/mixer_if.m#3 integrate ... //depot/projects/ia64/sys/net/if_spppsubr.c#4 integrate ... //depot/projects/ia64/sys/netinet/ip_fw.c#6 integrate Differences ... ==== //depot/projects/ia64/sys/alpha/alpha/mem.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.39 2002/02/27 18:31:35 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.40 2002/05/01 06:24:51 peter Exp $ */ /* @@ -59,8 +59,6 @@ #include #include -#include -#include #ifdef PERFMON #include #endif ==== //depot/projects/ia64/sys/dev/sound/pcm/mixer_if.m#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sys/dev/sound/pcm/mixer_if.m,v 1.4 2002/05/01 03:07:40 obrien Exp $ +# $FreeBSD: src/sys/dev/sound/pcm/mixer_if.m,v 1.5 2002/05/01 03:52:40 obrien Exp $ # #include @@ -62,5 +62,5 @@ METHOD u_int32_t setrecsrc { struct snd_mixer *m; - u_int32_t src + u_int32_t src; }; ==== //depot/projects/ia64/sys/net/if_spppsubr.c#4 (text+ko) ==== @@ -17,7 +17,7 @@ * * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997 * - * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.92 2002/04/04 21:03:28 jhb Exp $ + * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.93 2002/05/01 04:18:36 obrien Exp $ */ #include @@ -5029,7 +5029,7 @@ } switch (subcmd) { - case SPPPIOGDEFS: + case (int)SPPPIOGDEFS: if (cmd != SIOCGIFGENERIC) { rv = EINVAL; break; @@ -5064,7 +5064,7 @@ sizeof(struct spppreq)); break; - case SPPPIOSDEFS: + case (int)SPPPIOSDEFS: if (cmd != SIOCSIFGENERIC) { rv = EINVAL; break; ==== //depot/projects/ia64/sys/netinet/ip_fw.c#6 (text+ko) ==== @@ -13,7 +13,7 @@ * * This software is provided ``AS IS'' without any warranties of any kind. * - * $FreeBSD: src/sys/netinet/ip_fw.c,v 1.183 2002/02/27 18:32:17 jhb Exp $ + * $FreeBSD: src/sys/netinet/ip_fw.c,v 1.184 2002/05/01 06:29:16 cjc Exp $ */ #define DEB(x) @@ -1470,8 +1470,12 @@ break; bogusfrag: - if (fw_verbose && ip != NULL) - ipfw_report(NULL, ip, offset, ip_len, rif, oif); + if (fw_verbose) { + if (ip != NULL) + ipfw_report(NULL, ip, offset, ip_len, rif, oif); + else + printf("pullup failed\n"); + } goto dropit; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Apr 30 23:43:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B707837B416; Tue, 30 Apr 2002 23:43:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E1F7B37B417 for ; Tue, 30 Apr 2002 23:43:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g416hr188716 for perforce@freebsd.org; Tue, 30 Apr 2002 23:43:53 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 30 Apr 2002 23:43:53 -0700 (PDT) Message-Id: <200205010643.g416hr188716@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10572 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10572 Change 10572 by peter@peter_daintree on 2002/04/30 23:42:56 reenable the sc0/vga stuff. I think the fatal bug before was the uninitialized atkbd isa bus_space handle that was fixed ages ago. Affected files ... ... //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#3 (text+ko) ==== @@ -11,8 +11,8 @@ hint.atkbd.0.irq="1" hint.psm.0.at="atkbdc" hint.psm.0.irq="12" -#hint.vga.0.at="isa" -#hint.sc.0.at="isa" +hint.vga.0.at="isa" +hint.sc.0.at="isa" hint.mcclock.0.at="isa" hint.mcclock.0.port="0x70" hint.sio.0.at="isa" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 0:26:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFFED37B404; Wed, 1 May 2002 00:25:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CE59437B417 for ; Wed, 1 May 2002 00:25:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g417Plr96999 for perforce@freebsd.org; Wed, 1 May 2002 00:25:47 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 1 May 2002 00:25:47 -0700 (PDT) Message-Id: <200205010725.g417Plr96999@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10575 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10575 Change 10575 by peter@peter_daintree on 2002/05/01 00:24:55 IFC @10574 Affected files ... ... //depot/projects/ia64/games/fortune/datfiles/fortunes#13 integrate ... //depot/projects/ia64/games/fortune/datfiles/fortunes2#7 integrate ... //depot/projects/ia64/release/alpha/drivers.conf#2 integrate ... //depot/projects/ia64/release/i386/drivers.conf#2 integrate ... //depot/projects/ia64/release/pc98/drivers.conf#3 integrate ... //depot/projects/ia64/release/scripts/driver-remove.pl#3 integrate ... //depot/projects/ia64/sbin/fdisk/fdisk.c#7 integrate ... //depot/projects/ia64/sbin/ipfw/ipfw.8#4 integrate ... //depot/projects/ia64/sbin/nfsd/nfsd.c#5 integrate ... //depot/projects/ia64/share/man/man5/drivers.conf.5#3 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/Makefile#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#34 integrate ... //depot/projects/ia64/usr.bin/truss/alpha-fbsd.c#2 integrate Differences ... ==== //depot/projects/ia64/games/fortune/datfiles/fortunes#13 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.87 2002/04/30 10:13:42 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.88 2002/05/01 06:20:57 mph Exp $ % -- Gifts for Children -- @@ -13815,7 +13815,7 @@ the heat received by radiation, i.e., Heaven loses 50 times as much heat as the Earth by radiation. Using the Stefan-Boltzmann law for radiation, (_H/_E)^4 = 50, where _E is the absolute temperature of the -earth (-300K), gives _H as 798K (525C). The exact temperature of Hell +earth (~300K), gives _H as 798K (525C). The exact temperature of Hell cannot be computed ... [However] Revelations 21:8 says "But the fearful, and unbelieving ... shall have their part in the lake which burneth with fire and brimstone." A lake of molten brimstone means ==== //depot/projects/ia64/games/fortune/datfiles/fortunes2#7 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.39 2002/04/29 06:26:12 jmallett Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.40 2002/05/01 06:20:57 mph Exp $ % ======================================================================= @@ -45377,7 +45377,7 @@ the heat lost by radiation is just equal to the heat received by radiation, i.e., Heaven loses fifty times as much heat as the Earth by radiation. Using the Stefan-Boltzmann law for radiation, (H/E)^4 = 50, where E is the absolute -temperature of the earth (-300K), gives H as 798K (525C). The exact +temperature of the earth (~300K), gives H as 798K (525C). The exact temperature of Hell cannot be computed, but it must be less than 444.6C, the temperature at which brimstone or sulphur changes from a liquid to a gas. Revelations 21:8 says "But the fearful, and unbelieving ... shall have their ==== //depot/projects/ia64/release/alpha/drivers.conf#2 (text+ko) ==== @@ -24,12 +24,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/alpha/drivers.conf,v 1.1 2002/03/30 03:35:58 murray Exp $ +# $FreeBSD: src/release/alpha/drivers.conf,v 1.2 2002/05/01 05:05:31 murray Exp $ # # drv: driver name in kernel config file # filename: filename of kernel module (without .ko) # floppy: 2 (mfsroot.flp), 3 (drivers.flp - not implemented yet) -# type: disk/floppy/network/cdrom/tape/any (currently not used) +# type: 'options' (for a kernel option) or anything else for a driver # description: short description of the driver # ==== //depot/projects/ia64/release/i386/drivers.conf#2 (text+ko) ==== @@ -24,13 +24,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/i386/drivers.conf,v 1.3 2001/10/23 22:56:41 jhb Exp $ +# $FreeBSD: src/release/i386/drivers.conf,v 1.5 2002/05/01 05:05:31 murray Exp $ # # drv: driver name in kernel config file # filename: filename of kernel module (without .ko) # floppy: 2 (mfsroot.flp), 3 (drivers.flp - not implemented yet) -# type: disk/floppy/network/cdrom/tape/any (currently not used) +# type: 'options' (for a kernel option) or anything else for a driver # description: short description of the driver # @@ -55,3 +55,6 @@ wb if_wb 2 network "Winbond W89C840F PCI ethernet card" wi if_wi 2 network "Lucent WaveLAN/IEEE 802.11 PCMCIA card" xl if_xl 2 network "3COM 3c90x / 3c90xB PCI ethernet card" +SYSVSHM sysvshm 2 options "SYSV-style shared memory" +SYSVMSG sysvmsg 2 options "SYSV-style message queues" +SYSVSEM sysvsem 2 options "SYSV-style semaphores" ==== //depot/projects/ia64/release/pc98/drivers.conf#3 (text+ko) ==== @@ -24,13 +24,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/pc98/drivers.conf,v 1.3 2002/03/05 11:53:56 nyan Exp $ +# $FreeBSD: src/release/pc98/drivers.conf,v 1.4 2002/05/01 05:05:31 murray Exp $ # # drv: driver name in kernel config file # filename: filename of kernel module (without .ko) # floppy: 2 (mfsroot.flp), 3 (drivers.flp - not implemented yet) -# type: disk/floppy/network/cdrom/tape/any (currently not used) +# type: 'options' (for a kernel option) or anything else for a driver # description: short description of the driver # ==== //depot/projects/ia64/release/scripts/driver-remove.pl#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/scripts/driver-remove.pl,v 1.2 2002/04/22 13:44:24 des Exp $ +# $FreeBSD: src/release/scripts/driver-remove.pl,v 1.3 2002/05/01 04:54:35 murray Exp $ # if ($#ARGV != 1) { @@ -39,7 +39,11 @@ while () { s/#.*$//; if (/^(\w+)\s+(\w+)\s+(\d+)\s+(\w+)\s+\"(.*)\"\s*$/) { - $drivers{$1} = 1; + if ($4 eq "options") { + $options{$1} = 1; + } else { + $drivers{$1} = 1; + } } } close CONFIG; @@ -47,6 +51,7 @@ open BOOTMFS, "< $bootmfs" or die "Cannot open $bootmfs.\n"; while () { next if (/^device\s+(\w+)/ && $drivers{$1}); + next if (/^options\s+(\w+)/ && $options{$1}); push @bootmfs, $_; } close BOOTMFS; ==== //depot/projects/ia64/sbin/fdisk/fdisk.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.58 2002/04/28 01:52:17 grog Exp $"; + "$FreeBSD: src/sbin/fdisk/fdisk.c,v 1.59 2002/05/01 06:48:29 peter Exp $"; #endif /* not lint */ #include ==== //depot/projects/ia64/sbin/ipfw/ipfw.8#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.101 2002/01/10 15:41:06 ru Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.102 2002/05/01 06:29:09 cjc Exp $ .\" .Dd May 31, 2001 .Dt IPFW 8 @@ -1052,9 +1052,20 @@ .Sh FINE POINTS .Bl -bullet .It -There is one kind of packet that the firewall will always -discard, that is a TCP packet's fragment with a fragment offset of -one. +There are circumstances where fragmented datagrams are unconditionally +dropped. +TCP packets are dropped if they do not contain at least 20 bytes of +TCP header, UDP packets are dropped if they do not contain a full 8 +byte UDP header, and ICMP packets are dropped if they do not contain +4 bytes of ICMP header, enough to specify the ICMP type, code, and +checksum. +These packets are simply logged as +.Dq pullup failed +since there may not be enough good data in the packet to produce a +meaningful log entry. +.It +Another type of packet is unconditionally dropped, a TCP packet with a +fragment offset of one. This is a valid packet, but it only has one use, to try to circumvent firewalls. When logging is enabled, these packets are ==== //depot/projects/ia64/sbin/nfsd/nfsd.c#5 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)nfsd.c 8.9 (Berkeley) 3/29/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/nfsd/nfsd.c,v 1.23 2002/03/26 17:37:59 pb Exp $"; + "$FreeBSD: src/sbin/nfsd/nfsd.c,v 1.24 2002/05/01 06:49:43 peter Exp $"; #endif /* not lint */ #include ==== //depot/projects/ia64/share/man/man5/drivers.conf.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/share/man/man5/drivers.conf.5,v 1.3 2002/03/28 12:57:47 dd Exp $ +.\" $FreeBSD: src/share/man/man5/drivers.conf.5,v 1.4 2002/05/01 05:02:56 murray Exp $ .\" .Dd March 23, 2002 .Dt DRIVERS.CONF 5 @@ -61,7 +61,7 @@ .Pp The first field, .Ar driver , -is the name of the driver in the kernel configuration file. +is the name of the driver or option in the kernel configuration file. This is used by .Pa driver-remove.pl to remove drivers from the boot floppy kernel configuration @@ -85,7 +85,9 @@ The fourth field, .Ar type , specifies the driver category. -This field is currently unused. +If set to 'options', then this module is assumed to add the +functionality of a kernel option. +Otherwise, this module is assumed to represent a device driver. .Pp The fifth field, .Ar description , ==== //depot/projects/ia64/sys/dev/aic7xxx/aicasm/Makefile#5 (text+ko) ==== @@ -1,6 +1,6 @@ # $Id$ # -# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.11 2002/04/24 16:24:43 gibbs Exp $ +# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.12 2002/05/01 06:50:59 peter Exp $ PROG= aicasm ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#34 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.100 2002/04/30 02:29:00 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.101 2002/05/01 06:52:08 peter Exp $ */ #include "opt_compat.h" ==== //depot/projects/ia64/usr.bin/truss/alpha-fbsd.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.bin/truss/alpha-fbsd.c,v 1.5 2001/10/22 02:02:00 des Exp $"; + "$FreeBSD: src/usr.bin/truss/alpha-fbsd.c,v 1.6 2002/05/01 06:23:48 peter Exp $"; #endif /* not lint */ /* @@ -50,7 +50,6 @@ #include #include -#include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 7: 6: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33D4F37B41B; Wed, 1 May 2002 07:05:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0C95F37B41A for ; Wed, 1 May 2002 07:05:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41E5tm92318 for perforce@freebsd.org; Wed, 1 May 2002 07:05:55 -0700 (PDT) (envelope-from green@freebsd.org) Date: Wed, 1 May 2002 07:05:55 -0700 (PDT) Message-Id: <200205011405.g41E5tm92318@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 10580 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10580 Change 10580 by green@green_laptop_2 on 2002/05/01 07:05:38 Fix a merge-o preventing release build. Affected files ... ... //depot/projects/trustedbsd/mac/release/Makefile#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/release/Makefile#14 (text+ko) ==== @@ -131,7 +131,7 @@ .endif OTHER_DISTS?= games catpages manpages proflibs dict info doc CRYPTO_DISTS?= crypto krb4 krb5 -BIN_DISTS?= base +BASE_DISTS?= base DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} KERNELS?= GENERIC MAC To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 9:23:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 435C937B41A; Wed, 1 May 2002 09:23:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5C86F37B417 for ; Wed, 1 May 2002 09:23:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41GNf419684 for perforce@freebsd.org; Wed, 1 May 2002 09:23:41 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Wed, 1 May 2002 09:23:41 -0700 (PDT) Message-Id: <200205011623.g41GNf419684@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10581 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10581 Change 10581 by arr@arr_shibby on 2002/05/01 09:23:39 - Erm, this time actually nuke the uma zone constructor function; accidental submit of only partially changed code. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#25 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#25 (text+ko) ==== @@ -80,20 +80,12 @@ } void -audit_uma_ctor(void *mem, int size) -{ - - bzero(mem, size); -} - -void audit_init(void) { uma_zone_t zone; zone = uma_zcreate("AUDIT", sizeof(audit_record_t), - (uma_ctor)&audit_uma_ctor, - NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); if (zone == NULL) panic("audit_init: unable to init audit record zone"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 9:30: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5437F37B416; Wed, 1 May 2002 09:29:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2EB9137B404 for ; Wed, 1 May 2002 09:29:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41GTm920701 for perforce@freebsd.org; Wed, 1 May 2002 09:29:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 09:29:48 -0700 (PDT) Message-Id: <200205011629.g41GTm920701@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10582 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10582 Change 10582 by rwatson@rwatson_tislabs on 2002/05/01 09:29:02 Add a comment to the VAPPEND flag. Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/vnode.h#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#24 (text+ko) ==== @@ -242,7 +242,7 @@ #define VREAD 000400 /* read, write, execute, append permissions */ #define VWRITE 000200 #define VEXEC 000100 -#define VAPPEND 040000 +#define VAPPEND 040000 /* permission to write/append */ #define VADMIN 010000 /* permission to administer vnode */ #define VSTAT 020000 /* permission to retrieve vnode attrs */ #define VALL (VREAD | VWRITE | VEXEC | VAPPEND | VSTAT | VADMIN) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 9:30:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D112737B400; Wed, 1 May 2002 09:29:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8944537B417 for ; Wed, 1 May 2002 09:29:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41GTnJ20706 for perforce@freebsd.org; Wed, 1 May 2002 09:29:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 09:29:49 -0700 (PDT) Message-Id: <200205011629.g41GTnJ20706@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10583 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10583 Change 10583 by rwatson@rwatson_tislabs on 2002/05/01 09:29:44 Re-enable the VFS locking assertion in mac_cred_check_search_vnode() due to recent VFS locking fixes regarding devfs. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#129 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#129 (text+ko) ==== @@ -1059,7 +1059,7 @@ struct mac dirlabel; int error; - /* XXX: ASSERT_VOP_LOCKED(dvp, "mac_cred_check_search_vnode"); */ + ASSERT_VOP_LOCKED(dvp, "mac_cred_check_search_vnode"); error = VOP_GETLABEL(dvp, &dirlabel, cred, curthread); if (error) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 9:57:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A75437B419; Wed, 1 May 2002 09:57:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B629F37B417 for ; Wed, 1 May 2002 09:57:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41GvMx23613 for perforce@freebsd.org; Wed, 1 May 2002 09:57:22 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Wed, 1 May 2002 09:57:22 -0700 (PDT) Message-Id: <200205011657.g41GvMx23613@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10584 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10584 Change 10584 by arr@arr_shibby on 2002/05/01 09:56:35 - Clean up some comments to make clear their purpose. - Move ar_next to top of audit_record data structure. - Make the enqueue function (commented out currently) into an inline. - General cleanup. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#26 edit ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#16 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#26 (text+ko) ==== @@ -47,15 +47,17 @@ #include -#define AUDLOG "/var/log/audit" - static struct mtx audit_mtx; static struct audit_record_list record_queue; static uma_zone_t record_zone; static int audit_shutdown_flag = 0; static int audit_id = 0; -/* readd this later. - static size_t pool_size = 32; + +/* + * Re-add this later when handling the decrease in the pool + * size can be properly handled. + * + * static size_t pool_size = 32; */ audit_record_t * @@ -69,6 +71,15 @@ z = record_zone; mtx_unlock(&audit_mtx); + /* + * XXX: + * Think about changing over to where we do not have to pass + * in a size value, but rather, we can use the ``int type'' + * value to lookup in a table (or something). + * + * evsz = ev_size_tab[type]; + */ + rec = uma_zalloc(z, M_ZERO); h = &rec->ar_hdr; h->ah_v = AUDIT_VERSION; @@ -116,8 +127,9 @@ } SYSUNINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_shutdown, NULL); -/* -static void +/* +static __inline +void audit_record_enqueue(audit_record_t *ar) { @@ -147,10 +159,13 @@ ar = NULL; TAILQ_REMOVE(&record_queue, ar, ar_next); - /* Check flag here and hope it doesnt change. */ + /* + * If we don't exit, we might try to zfree + * an object that no longer has a zone.. Oof. + */ if (audit_shutdown_flag) kthread_exit(0); - + if (ar) { z = record_zone; uma_zfree(z, ar); ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#16 (text+ko) ==== @@ -92,18 +92,16 @@ } audit_object_t; #define AUDIT_OBJ_LEN sizeof(audit_object_t) -struct aud_sysctl_enable { - int as_ret; /* return value */ - int as_val; /* new value */ -}; typedef struct audit_record { + TAILQ_ENTRY(audit_record) ar_next; struct audit_header ar_hdr; struct audit_subject ar_subj; struct audit_object ar_obj; + union audit_evinfo { - struct aud_sysctl_enable sysctlenable; + struct chmod_info av_chmod; } ar_evinfo; - TAILQ_ENTRY(audit_record) ar_next; + } audit_record_t; TAILQ_HEAD(audit_record_list, audit_record); @@ -111,7 +109,7 @@ #define AUD_CHMOD 1 #define AUD_CHOWN 2 -#define AUD_DUP 3 +#define AUD_DUP 3 #define AUD_EXEC 4 #define AUD_EXIT 5 #define AUD_FORK 6 @@ -127,8 +125,6 @@ #define AUD_SETGID 16 #define AUD_UNLINK 17 #define AUD_UTIME 18 -#define AUD_SYSCTL_ENABLE 200 - struct chmod_info { char ci_path[MAXPATHLEN]; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 11:39:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1943E37B416; Wed, 1 May 2002 11:39:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 40B5737B405 for ; Wed, 1 May 2002 11:39:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41IdTE46463 for perforce@freebsd.org; Wed, 1 May 2002 11:39:29 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Wed, 1 May 2002 11:39:29 -0700 (PDT) Message-Id: <200205011839.g41IdTE46463@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10587 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10587 Change 10587 by arr@arr_shibby on 2002/05/01 11:39:22 - Make this compile & add a comment. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#27 edit ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#17 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#27 (text+ko) ==== @@ -47,6 +47,11 @@ #include +/* + * There might be a need to use another lock besides just audit_mtx + * because of thrashing with the record_queue and memory allocation. + * + */ static struct mtx audit_mtx; static struct audit_record_list record_queue; static uma_zone_t record_zone; @@ -60,6 +65,8 @@ * static size_t pool_size = 32; */ +static __inline void audit_record_enqueue(audit_record_t *); + audit_record_t * audit_record_init(int type, size_t evsz) { @@ -127,9 +134,7 @@ } SYSUNINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_shutdown, NULL); -/* -static __inline -void +static __inline void audit_record_enqueue(audit_record_t *ar) { @@ -137,7 +142,6 @@ TAILQ_INSERT_TAIL(&record_queue, ar, ar_next); mtx_unlock(&audit_mtx); } -*/ int audit_record_write(audit_record_t *ar) @@ -157,7 +161,12 @@ */ for (;;) { ar = NULL; + + /* thrash thrash */ + mtx_lock(&audit_mtx); TAILQ_REMOVE(&record_queue, ar, ar_next); + z = record_zone; + mtx_unlock(&audit_mtx); /* * If we don't exit, we might try to zfree @@ -167,6 +176,7 @@ kthread_exit(0); if (ar) { + printf("audit_write_thread: Record received.\n"); z = record_zone; uma_zfree(z, ar); } ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#17 (text+ko) ==== @@ -97,11 +97,7 @@ struct audit_header ar_hdr; struct audit_subject ar_subj; struct audit_object ar_obj; - - union audit_evinfo { - struct chmod_info av_chmod; - } ar_evinfo; - + union audit_evinfo ar_evinfo; } audit_record_t; TAILQ_HEAD(audit_record_list, audit_record); @@ -217,6 +213,10 @@ audit_time_t ui_mtime; }; +union audit_evinfo { + struct chown_info av_chown; +}; + void audit_init(void); void audit_shutdown(void); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 13:46:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A95B237B41F; Wed, 1 May 2002 13:46:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id ECC6337B41B for ; Wed, 1 May 2002 13:46:05 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41Kk5M73170 for perforce@freebsd.org; Wed, 1 May 2002 13:46:05 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Wed, 1 May 2002 13:46:05 -0700 (PDT) Message-Id: <200205012046.g41Kk5M73170@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10593 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10593 Change 10593 by arr@arr_shibby on 2002/05/01 13:45:13 - Add ah_evresult #define's. Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#18 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#18 (text+ko) ==== @@ -71,6 +71,10 @@ } audit_header_t; #define AUDIT_HDR_LEN sizeof(audit_header_t) +/* Values for ah_evresult */ +#define AUDIT_EVR_SUCCESS 1 +#define AUDIT_EVR_FAIL 2 + typedef struct audit_subject { uid_t as_euid; /* Effective UID */ gid_t as_gid; /* Group ID */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 14: 6:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D16A037B400; Wed, 1 May 2002 14:06:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 46E4F37B404 for ; Wed, 1 May 2002 14:06:31 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41L6Vi80690 for perforce@freebsd.org; Wed, 1 May 2002 14:06:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 14:06:31 -0700 (PDT) Message-Id: <200205012106.g41L6Vi80690@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10595 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10595 Change 10595 by rwatson@rwatson_curry on 2002/05/01 14:05:37 Create a new MAC/policy entry point: mac_accept_socket() -- similar to mac_create_socket, except for taking a socket rather than a credential as the first argument. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#130 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#95 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#58 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#130 (text+ko) ==== @@ -303,6 +303,9 @@ mpc->mpc_ops.mpo_create_mbuf_from_socket = mpe->mpe_function; break; + case MAC_ACCEPT_SOCKET: + mpc->mpc_ops.mpo_accept_socket = mpe->mpe_function; + break; case MAC_CREATE_SOCKET: mpc->mpc_ops.mpo_create_socket = mpe->mpe_function; break; @@ -1251,6 +1254,13 @@ } void +mac_accept_socket(struct socket *listenso, struct socket *acceptso) +{ + + MAC_PERFORM(accept_socket, listenso, acceptso); +} + +void mac_create_socket(struct ucred *cred, struct socket *socket) { ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#95 (text+ko) ==== @@ -292,6 +292,7 @@ struct ifnet *ifnet); /* Label creation events. */ +void mac_accept_socket(struct socket *listenso, struct socket *acceptso); void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d); void mac_create_devfs_device(dev_t dev, struct mac *devicelabel); void mac_create_devfs_directory(char *dirname, int dirnamelen, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#58 (text+ko) ==== @@ -87,6 +87,8 @@ /* * Labeling event operations: IPC objects. */ + void (*mpo_accept_socket)(struct socket *listenso, + struct socket *acceptso); void (*mpo_create_mbuf_from_socket)(struct socket *so, struct mbuf *m); void (*mpo_create_socket)(struct ucred *cred, @@ -226,6 +228,7 @@ MAC_CREATE_MOUNT, MAC_CREATE_ROOT_MOUNT, MAC_CREATE_MBUF_FROM_SOCKET, + MAC_ACCEPT_SOCKET, MAC_CREATE_SOCKET, MAC_RELABEL_SOCKET, MAC_CREATE_BPFDESC, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 14:15: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75DC537B400; Wed, 1 May 2002 14:14:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7815B37B404 for ; Wed, 1 May 2002 14:14:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41LEfg82533 for perforce@freebsd.org; Wed, 1 May 2002 14:14:41 -0700 (PDT) (envelope-from green@freebsd.org) Date: Wed, 1 May 2002 14:14:41 -0700 (PDT) Message-Id: <200205012114.g41LEfg82533@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 10596 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10596 Change 10596 by green@green_laptop_2 on 2002/05/01 14:13:43 Make sure the extra kernels defined to be built by release do come with their modules. Also, I guess we don't need a slightly-different GENERIC kernel by default in addition to the one in /boot/kernel. Affected files ... ... //depot/projects/trustedbsd/mac/release/Makefile#15 edit Differences ... ==== //depot/projects/trustedbsd/mac/release/Makefile#15 (text+ko) ==== @@ -123,7 +123,7 @@ # Things which without too much trouble can be considered variables # BASE_DISTS are special in that they get full /etc installation sets. -# +# .if ${MACHINE_ARCH} == "i386" COMPAT_DISTS?= compat1x compat20 compat21 compat22 compat3x compat4x .else @@ -133,7 +133,7 @@ CRYPTO_DISTS?= crypto krb4 krb5 BASE_DISTS?= base DISTRIBUTIONS?= ${BASE_DISTS} ${OTHER_DISTS} ${COMPAT_DISTS} ${CRYPTO_DISTS} -KERNELS?= GENERIC MAC +KERNELS?= MAC BOOT1= etc/defaults/rc.conf @@ -469,7 +469,7 @@ release.3: .for kernel in ${KERNELS} cd ${.CURDIR}/..; \ - ${MAKE} ${KERNEL_FLAGS} -DNO_WERROR -DNO_MODULES \ + ${MAKE} ${KERNEL_FLAGS} -DNO_WERROR \ KERNCONF=${kernel} INSTKERNNAME=${kernel} kernel \ DESTDIR=${RD}/trees/base .endfor To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 14:23:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6CD937B41A; Wed, 1 May 2002 14:23:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E181837B416 for ; Wed, 1 May 2002 14:23:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41LNq584573 for perforce@freebsd.org; Wed, 1 May 2002 14:23:52 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Wed, 1 May 2002 14:23:52 -0700 (PDT) Message-Id: <200205012123.g41LNq584573@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10597 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10597 Change 10597 by arr@arr_shibby on 2002/05/01 14:23:01 - Initialize audit records with AUDIT_EVR_FAILED so that we only set the ah_evresult variable on failed events. If we find that doing the opposite is "better," then we'll do that. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#28 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#28 (text+ko) ==== @@ -93,6 +93,7 @@ h->ah_id = audit_id++; h->ah_len = AUDIT_RECORD_SZ + evsz; h->ah_type = type; + h->ah_evresult = AUDIT_EVR_SUCCESS; nanotime(&h->ah_evtime); return (rec); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 14:24:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A34137B404; Wed, 1 May 2002 14:24:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 77F4437B417 for ; Wed, 1 May 2002 14:24:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41LOs484843 for perforce@freebsd.org; Wed, 1 May 2002 14:24:54 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Wed, 1 May 2002 14:24:54 -0700 (PDT) Message-Id: <200205012124.g41LOs484843@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10598 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10598 Change 10598 by arr@arr_shibby on 2002/05/01 14:24:00 - Um, properly set ah_evresult... My previous commit was backwards. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#29 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#29 (text+ko) ==== @@ -93,7 +93,7 @@ h->ah_id = audit_id++; h->ah_len = AUDIT_RECORD_SZ + evsz; h->ah_type = type; - h->ah_evresult = AUDIT_EVR_SUCCESS; + h->ah_evresult = AUDIT_EVR_FAILED; nanotime(&h->ah_evtime); return (rec); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 14:26: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE33637B41C; Wed, 1 May 2002 14:25:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3258437B419 for ; Wed, 1 May 2002 14:25:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41LPu685167 for perforce@freebsd.org; Wed, 1 May 2002 14:25:56 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Wed, 1 May 2002 14:25:56 -0700 (PDT) Message-Id: <200205012125.g41LPu685167@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10599 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10599 Change 10599 by arr@arr_shibby on 2002/05/01 14:25:22 - AUDIT_EVR_FAIL -> AUDIT_EVR_FAILED Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#19 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#19 (text+ko) ==== @@ -73,7 +73,7 @@ /* Values for ah_evresult */ #define AUDIT_EVR_SUCCESS 1 -#define AUDIT_EVR_FAIL 2 +#define AUDIT_EVR_FAILED 2 typedef struct audit_subject { uid_t as_euid; /* Effective UID */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 14:34:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC2F137B41C; Wed, 1 May 2002 14:34:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5CED437B419 for ; Wed, 1 May 2002 14:34:06 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41LY6e86935 for perforce@freebsd.org; Wed, 1 May 2002 14:34:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 14:34:06 -0700 (PDT) Message-Id: <200205012134.g41LY6e86935@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10600 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10600 Change 10600 by rwatson@rwatson_curry on 2002/05/01 14:33:58 Change my mind: call it mac_create_socket_from_socket() rather than mac_accept_socket(), keeping consistency with the 'create' naming scheme, and permitting the call to be used more sensibly in other situations. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#131 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#96 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#59 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#131 (text+ko) ==== @@ -303,12 +303,13 @@ mpc->mpc_ops.mpo_create_mbuf_from_socket = mpe->mpe_function; break; - case MAC_ACCEPT_SOCKET: - mpc->mpc_ops.mpo_accept_socket = mpe->mpe_function; - break; case MAC_CREATE_SOCKET: mpc->mpc_ops.mpo_create_socket = mpe->mpe_function; break; + case MAC_CREATE_SOCKET_FROM_SOCKET: + mpc->mpc_ops.mpo_create_socket_from_socket = + mpe->mpe_function; + break; case MAC_RELABEL_SOCKET: mpc->mpc_ops.mpo_relabel_socket = mpe->mpe_function; break; @@ -1254,17 +1255,18 @@ } void -mac_accept_socket(struct socket *listenso, struct socket *acceptso) +mac_create_socket(struct ucred *cred, struct socket *socket) { - MAC_PERFORM(accept_socket, listenso, acceptso); + MAC_PERFORM(create_socket, cred, socket); } void -mac_create_socket(struct ucred *cred, struct socket *socket) +mac_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket) { - MAC_PERFORM(create_socket, cred, socket); + MAC_PERFORM(create_socket_from_socket, oldsocket, newsocket); } static void ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#96 (text+ko) ==== @@ -292,7 +292,6 @@ struct ifnet *ifnet); /* Label creation events. */ -void mac_accept_socket(struct socket *listenso, struct socket *acceptso); void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d); void mac_create_devfs_device(dev_t dev, struct mac *devicelabel); void mac_create_devfs_directory(char *dirname, int dirnamelen, @@ -319,6 +318,8 @@ void mac_create_proc1(struct ucred *cred); void mac_create_root_mount(struct ucred *cred, struct mount *mp); void mac_create_socket(struct ucred *cred, struct socket *socket); +void mac_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket); void mac_create_subject(struct ucred *cred_parent, struct ucred *cred_child); void mac_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#59 (text+ko) ==== @@ -87,12 +87,12 @@ /* * Labeling event operations: IPC objects. */ - void (*mpo_accept_socket)(struct socket *listenso, - struct socket *acceptso); void (*mpo_create_mbuf_from_socket)(struct socket *so, struct mbuf *m); void (*mpo_create_socket)(struct ucred *cred, struct socket *socket); + void (*mpo_create_socket_from_socket)(struct socket *oldsocket, + struct socket *newsocket); void (*mpo_relabel_socket)(struct ucred *cred, struct socket *socket, struct mac *newlabel); @@ -228,8 +228,8 @@ MAC_CREATE_MOUNT, MAC_CREATE_ROOT_MOUNT, MAC_CREATE_MBUF_FROM_SOCKET, - MAC_ACCEPT_SOCKET, MAC_CREATE_SOCKET, + MAC_CREATE_SOCKET_FROM_SOCKET, MAC_RELABEL_SOCKET, MAC_CREATE_BPFDESC, MAC_CREATE_IFNET, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 15:29: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBA7437B417; Wed, 1 May 2002 15:28:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 82A2D37B416 for ; Wed, 1 May 2002 15:28:30 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41MSTw01935 for perforce@freebsd.org; Wed, 1 May 2002 15:28:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 15:28:29 -0700 (PDT) Message-Id: <200205012228.g41MSTw01935@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10606 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10606 Change 10606 by rwatson@rwatson_curry on 2002/05/01 15:27:44 Implement mpo_create_socket_from_socket() for mac_biba, mac_mls, mac_none, and mac_te. Generally, copy the oldsocket label to newsocket. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#31 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#25 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#22 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#31 (text+ko) ==== @@ -649,6 +649,15 @@ } static void +mac_biba_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket) +{ + + mac_biba_init_label(&newsocket->so_label); + mac_biba_copy_single(&oldsocket->so_label, &newsocket->so_label); +} + +static void mac_biba_relabel_socket(struct ucred *cred, struct socket *socket, struct mac *newlabel) { @@ -1084,6 +1093,8 @@ (macop_t)mac_biba_create_mbuf_from_socket }, { MAC_CREATE_SOCKET, (macop_t)mac_biba_create_socket }, + { MAC_CREATE_SOCKET_FROM_SOCKET, + (macop_t)mac_biba_create_socket_from_socket }, { MAC_RELABEL_SOCKET, (macop_t)mac_biba_relabel_socket }, { MAC_CREATE_BPFDESC, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#25 (text+ko) ==== @@ -581,6 +581,15 @@ } static void +mac_mls_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket) +{ + + mac_mls_init_label(&newsocket->so_label); + mac_mls_copy_single(&oldsocket->so_label, &newsocket->so_label); +} + +static void mac_mls_relabel_socket(struct ucred *cred, struct socket *socket, struct mac *newlabel) { @@ -1017,6 +1026,8 @@ (macop_t)mac_mls_create_mbuf_from_socket }, { MAC_CREATE_SOCKET, (macop_t)mac_mls_create_socket }, + { MAC_CREATE_SOCKET_FROM_SOCKET, + (macop_t)mac_mls_create_socket_from_socket }, { MAC_RELABEL_SOCKET, (macop_t)mac_mls_relabel_socket }, { MAC_CREATE_BPFDESC, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#22 (text+ko) ==== @@ -311,6 +311,14 @@ } static void +mac_none_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket) +{ + + /* Initialize socket here. +} + +static void mac_none_relabel_socket(struct ucred *cred, struct socket *socket, struct mac *newlabel) { @@ -634,6 +642,8 @@ (macop_t)mac_none_create_mbuf_from_socket }, { MAC_CREATE_SOCKET, (macop_t)mac_none_create_socket }, + { MAC_CREATE_SOCKET_FROM_SOCKET, + (macop_t)mac_none_create_socket_from_socket }, { MAC_RELABEL_SOCKET, (macop_t)mac_none_relabel_socket }, { MAC_CREATE_BPFDESC, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#24 (text+ko) ==== @@ -510,6 +510,13 @@ } static void +mac_te_create_object_from_object(struct mac *oldlabel, struct mac *newlabel) +{ + + mac_te_copy_label(oldlabel, newlabel); +} + +static void mac_te_create_mbuf_datagram_from_mbuf_fragmentqueue(struct mbuf *fragmentqueue, struct mbuf *datagram) { @@ -596,6 +603,15 @@ } static void +mac_te_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket) +{ + + mac_te_create_object_from_onject(&oldsocket->so_label, + &newsocket->so_label); +} + +static void mac_te_relabel_socket(struct ucred *cred, struct socket *socket, struct mac *newlabel) { @@ -1095,6 +1111,8 @@ (macop_t)mac_te_create_mbuf_from_socket }, { MAC_CREATE_SOCKET, (macop_t)mac_te_create_socket }, + { MAC_CREATE_SOCKET_FROM_SOCKET, + (macop_t)mac_te_create_socket_from_socket }, { MAC_RELABEL_SOCKET, (macop_t)mac_te_relabel_socket }, { MAC_CREATE_BPFDESC, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 15:30:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CC8937B405; Wed, 1 May 2002 15:30:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 498AB37B417 for ; Wed, 1 May 2002 15:30:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41MUXX02383 for perforce@freebsd.org; Wed, 1 May 2002 15:30:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 15:30:33 -0700 (PDT) Message-Id: <200205012230.g41MUXX02383@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10607 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10607 Change 10607 by rwatson@rwatson_curry on 2002/05/01 15:30:03 Call mac_create_socket_from_socket() instead of mac_create_socket() when we derive an acceptable socket from a listen socket. Previously, we created the new socket label from the credential cached in the old socket. Now we leave that up to individual policies, which now generally derive it from the old socket label. For existing policies, this results in the same material endpoint, but improves flexibility as well as pushing us in the direction of peer credentials. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#16 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#16 (text+ko) ==== @@ -249,7 +249,7 @@ so->so_timeo = head->so_timeo; so->so_cred = crhold(head->so_cred); #ifdef MAC - mac_create_socket(so->so_cred, so); + mac_create_socket_from_socket(head, so); #endif if (soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat) || (*so->so_proto->pr_usrreqs->pru_attach)(so, 0, NULL)) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 15:36:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5E8E37B416; Wed, 1 May 2002 15:36:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0EBE437B400 for ; Wed, 1 May 2002 15:36:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41Maeq03178 for perforce@freebsd.org; Wed, 1 May 2002 15:36:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 15:36:40 -0700 (PDT) Message-Id: <200205012236.g41Maeq03178@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10608 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10608 Change 10608 by rwatson@rwatson_curry on 2002/05/01 15:36:26 Add an additional label to 'struct socket': struct label so_peerlabel. This will hold a copy of the label associated with the peering socket, or an appropriately derived socket generated in the network stack. Until we have a notion of "undefined labels", this will work pseudo-well. Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#13 (text+ko) ==== @@ -129,6 +129,7 @@ void *so_upcallarg; struct ucred *so_cred; /* user credentials */ struct mac so_label; /* socket MAC label */ + struct mac so_peerlabel; /* socket peer MAC label */ /* NB: generation count must not be first; easiest to make it last. */ so_gen_t so_gencnt; /* generation count */ void *so_emuldata; /* private data for emulators */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 15:37:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AE1D37B417; Wed, 1 May 2002 15:37:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B34FE37B416 for ; Wed, 1 May 2002 15:37:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41Mbgf03289 for perforce@freebsd.org; Wed, 1 May 2002 15:37:42 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 15:37:42 -0700 (PDT) Message-Id: <200205012237.g41Mbgf03289@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10609 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10609 Change 10609 by rwatson@rwatson_curry on 2002/05/01 15:37:19 Initialize so_peerlabel to relatively arbitrary values for the time being in each policy. Eventually label initialization will be owned by kern_mac.c and initialized there (with values being optionally set by policies), but for now labels are initialized by each policy. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#32 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#26 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#25 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#32 (text+ko) ==== @@ -645,6 +645,7 @@ { mac_biba_init_label(&socket->so_label); + mac_biba_init_label(&socket->so_peerlabel); mac_biba_copy_single(&cred->cr_label, &socket->so_label); } @@ -654,6 +655,7 @@ { mac_biba_init_label(&newsocket->so_label); + mac_biba_init_label(&newsocket->so_peerlabel); mac_biba_copy_single(&oldsocket->so_label, &newsocket->so_label); } ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#26 (text+ko) ==== @@ -577,6 +577,7 @@ { mac_mls_init_label(&socket->so_label); + mac_mls_init_label(&socket->so_peerlabel); mac_mls_copy_single(&cred->cr_label, &socket->so_label); } @@ -586,6 +587,7 @@ { mac_mls_init_label(&newsocket->so_label); + mac_mls_init_label(&newsocket->so_peerlabel); mac_mls_copy_single(&oldsocket->so_label, &newsocket->so_label); } ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#25 (text+ko) ==== @@ -600,6 +600,7 @@ { mac_te_create_object(cred, &socket->so_label); + mac_te_create_object(cred, &socket->so_peerlabel); } static void @@ -607,8 +608,10 @@ struct socket *newsocket) { - mac_te_create_object_from_onject(&oldsocket->so_label, + mac_te_create_object_from_object(&oldsocket->so_label, &newsocket->so_label); + mac_te_create_object_from_objsect(&oldsocket->so_peerlabel, + &newsocket->so_peerlabel); } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 16: 5:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50B5537B416; Wed, 1 May 2002 16:05:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8990437B419 for ; Wed, 1 May 2002 16:05:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41N5G909065 for perforce@freebsd.org; Wed, 1 May 2002 16:05:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 16:05:16 -0700 (PDT) Message-Id: <200205012305.g41N5G909065@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10611 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10611 Change 10611 by rwatson@rwatson_curry on 2002/05/01 16:05:08 Typo-fix: add missing */ Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#23 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#23 (text+ko) ==== @@ -315,7 +315,7 @@ struct socket *newsocket) { - /* Initialize socket here. + /* Initialize socket here. */ } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 16:13:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C5D437B400; Wed, 1 May 2002 16:13:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 63AE737B419 for ; Wed, 1 May 2002 16:13:27 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41NDRX11623 for perforce@freebsd.org; Wed, 1 May 2002 16:13:27 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 16:13:27 -0700 (PDT) Message-Id: <200205012313.g41NDRX11623@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10613 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10613 Change 10613 by rwatson@rwatson_curry on 2002/05/01 16:12:44 Add two new MAC/policy entry points to provide the opportunity to label sockets when the socket peer or mbuf is available. mac_set_socket_peer_from_mbuf(m, s): provide a useful mbuf and the socket to label. For stream connections, it will be the first useful mbuf. For datagram connections, calls will be made when the first mbuf in the chain to be delivered changes, and that mbuf will be provided (making for next-read semantics on the peer label). mac_set_socket_peer_from_socket(os, ns): provide the socket peer for the newly accepted/connected socket so that the peer cred can be cached. This will probably only be used for unix domain stream sockets. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#132 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#97 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#60 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#132 (text+ko) ==== @@ -313,6 +313,14 @@ case MAC_RELABEL_SOCKET: mpc->mpc_ops.mpo_relabel_socket = mpe->mpe_function; break; + case MAC_SET_SOCKET_PEER_FROM_MBUF: + mpc->mpc_ops.mpo_set_socket_peer_from_mbuf = + mpe->mpe_function; + break; + case MAC_SET_SOCKET_PEER_FROM_SOCKET: + mpc->mpc_ops.mpo_set_socket_peer_from_socket = + mpe->mpe_function; + break; case MAC_CREATE_BPFDESC: mpc->mpc_ops.mpo_create_bpfdesc = mpe->mpe_function; break; @@ -1277,6 +1285,21 @@ MAC_PERFORM(relabel_socket, cred, socket, newlabel); } +static void +mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) +{ + + MAC_PERFORM(set_socket_peer_from_mbuf, mbuf, socket); +} + +static void +mac_set_socket_peer_from_socket(struct socket *oldsocket, + struct socket *newsocket) +{ + + MAC_PERFORM(set_socket_peer_from_socket, oldsocket, newsocket); +} + void mac_create_mbuf_datagram_from_mbuf_fragmentqueue(struct mbuf *fragmentqueue, struct mbuf *datagram) ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#97 (text+ko) ==== @@ -324,6 +324,10 @@ struct ucred *cred_child); void mac_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, struct vnode *child, struct mac *childlabel); +void mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, + struct socket *socket); +void mac_set_socket_peer_from_socket(struct socket *oldsocket, + struct socket *newsocket); /* Network event miscellany. */ int mac_ifnet_can_send(struct ifnet *ifnet, struct mbuf *m); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#60 (text+ko) ==== @@ -95,6 +95,10 @@ struct socket *newsocket); void (*mpo_relabel_socket)(struct ucred *cred, struct socket *socket, struct mac *newlabel); + void (*mpo_set_socket_peer_from_mbuf)(struct socket *oldsocket, + struct socket *newsocket); + void (*mpo_set_socket_peer_from_socket)(struct mbuf *mbuf, + struct socket *socket); /* * Labeling event operations: network objects. @@ -231,6 +235,8 @@ MAC_CREATE_SOCKET, MAC_CREATE_SOCKET_FROM_SOCKET, MAC_RELABEL_SOCKET, + MAC_SET_SOCKET_PEER_FROM_MBUF, + MAC_SET_SOCKET_PEER_FROM_SOCKET, MAC_CREATE_BPFDESC, MAC_CREATE_IFNET, MAC_CREATE_MBUF_DATAGRAM_FROM_MBUF_FRAGMENTQUEUE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 16:24:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DA8F37B400; Wed, 1 May 2002 16:23:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CAF1437B419 for ; Wed, 1 May 2002 16:23:09 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41NMp412611 for perforce@freebsd.org; Wed, 1 May 2002 16:22:51 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Wed, 1 May 2002 16:22:51 -0700 (PDT) Message-Id: <200205012322.g41NMp412611@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 10614 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10614 Change 10614 by mini@freefall on 2002/05/01 16:22:37 MFC Affected files ... ... //depot/projects/kse/sys/Makefile#2 integrate ... //depot/projects/kse/sys/alpha/alpha/clock.c#4 integrate ... //depot/projects/kse/sys/alpha/alpha/db_instruction.h#2 integrate ... //depot/projects/kse/sys/alpha/alpha/dec_axppci_33.c#3 integrate ... //depot/projects/kse/sys/alpha/alpha/elf_machdep.c#3 integrate ... //depot/projects/kse/sys/alpha/alpha/machdep.c#37 integrate ... //depot/projects/kse/sys/alpha/alpha/mem.c#6 integrate ... //depot/projects/kse/sys/alpha/alpha/pal.s#2 integrate ... //depot/projects/kse/sys/alpha/alpha/pmap.c#27 integrate ... //depot/projects/kse/sys/alpha/alpha/prom_disp.s#2 integrate ... //depot/projects/kse/sys/alpha/alpha/trap.c#21 integrate ... //depot/projects/kse/sys/alpha/conf/GENERIC#11 integrate ... //depot/projects/kse/sys/alpha/include/ansi.h#9 integrate ... //depot/projects/kse/sys/alpha/include/endian.h#6 integrate ... //depot/projects/kse/sys/alpha/include/pmap.h#11 integrate ... //depot/projects/kse/sys/alpha/isa/isa_dma.c#2 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_misc.c#11 integrate ... //depot/projects/kse/sys/alpha/pci/lca.c#3 integrate ... //depot/projects/kse/sys/alpha/pci/lca_pci.c#3 integrate ... //depot/projects/kse/sys/alpha/pci/tsunami_pci.c#3 integrate ... //depot/projects/kse/sys/boot/common/module.c#4 integrate ... //depot/projects/kse/sys/boot/efi/libefi/arch/ia64/start.S#4 integrate ... //depot/projects/kse/sys/boot/efi/libefi/efifs.c#5 integrate ... //depot/projects/kse/sys/boot/efi/libefi/elf_freebsd.c#6 integrate ... //depot/projects/kse/sys/boot/forth/loader.conf#8 integrate ... //depot/projects/kse/sys/boot/i386/boot2/boot2.c#8 integrate ... //depot/projects/kse/sys/boot/i386/kgzldr/Makefile#2 integrate ... //depot/projects/kse/sys/boot/i386/loader/Makefile#7 integrate ... //depot/projects/kse/sys/boot/pc98/kgzldr/Makefile#2 integrate ... //depot/projects/kse/sys/boot/pc98/loader/Makefile#5 integrate ... //depot/projects/kse/sys/boot/sparc64/boot1/Makefile#3 integrate ... //depot/projects/kse/sys/boot/sparc64/boot1/boot1.c#2 integrate ... //depot/projects/kse/sys/cam/cam_xpt.c#8 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_all.c#8 integrate ... //depot/projects/kse/sys/coda/coda_subr.c#4 integrate ... //depot/projects/kse/sys/coda/coda_venus.c#3 integrate ... //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#15 integrate ... //depot/projects/kse/sys/compat/linux/linux_misc.c#15 integrate ... //depot/projects/kse/sys/compat/linux/linux_uid16.c#7 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_misc.c#12 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_sysvec.c#5 integrate ... //depot/projects/kse/sys/conf/NOTES#3 integrate ... //depot/projects/kse/sys/conf/files#31 integrate ... //depot/projects/kse/sys/conf/files.alpha#13 integrate ... //depot/projects/kse/sys/conf/files.ia64#12 integrate ... //depot/projects/kse/sys/conf/files.powerpc#5 integrate ... //depot/projects/kse/sys/conf/kern.post.mk#8 integrate ... //depot/projects/kse/sys/conf/kern.pre.mk#10 integrate ... //depot/projects/kse/sys/conf/kmod.mk#9 integrate ... //depot/projects/kse/sys/conf/kmod_syms.awk#3 integrate ... //depot/projects/kse/sys/conf/majors#8 integrate ... //depot/projects/kse/sys/conf/options#14 integrate ... //depot/projects/kse/sys/conf/options.alpha#6 integrate ... //depot/projects/kse/sys/conf/options.ia64#6 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#2 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch ... //depot/projects/kse/sys/contrib/ipfilter/netinet/fil.c#5 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_fil.c#7 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_frag.c#4 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_nat.c#6 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ipl.h#3 integrate ... //depot/projects/kse/sys/crypto/des/podd.h#2 integrate ... //depot/projects/kse/sys/crypto/des/sk.h#2 integrate ... //depot/projects/kse/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate ... //depot/projects/kse/sys/ddb/db_ps.c#19 integrate ... //depot/projects/kse/sys/dev/aac/aac.c#20 integrate ... //depot/projects/kse/sys/dev/aac/aac_cam.c#1 branch ... //depot/projects/kse/sys/dev/aac/aac_cam.h#1 branch ... //depot/projects/kse/sys/dev/aac/aac_disk.c#13 integrate ... //depot/projects/kse/sys/dev/aac/aac_pci.c#13 integrate ... //depot/projects/kse/sys/dev/aac/aacreg.h#8 integrate ... //depot/projects/kse/sys/dev/aac/aacvar.h#10 integrate ... //depot/projects/kse/sys/dev/acpica/acpi.c#21 integrate ... //depot/projects/kse/sys/dev/acpica/acpi_timer.c#7 integrate ... //depot/projects/kse/sys/dev/aic7xxx/ahc_eisa.c#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/ahc_pci.c#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aic7770.c#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aic7xxx.c#5 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aic7xxx.h#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aic7xxx.reg#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aic7xxx.seq#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_freebsd.c#2 delete ... //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_freebsd.h#2 delete ... //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_pci.c#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/Makefile#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm.h#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#3 integrate ... //depot/projects/kse/sys/dev/ata/ata-all.c#18 integrate ... //depot/projects/kse/sys/dev/ata/ata-all.h#8 integrate ... //depot/projects/kse/sys/dev/ata/ata-disk.c#19 integrate ... //depot/projects/kse/sys/dev/ata/ata-dma.c#20 integrate ... //depot/projects/kse/sys/dev/ata/ata-isa.c#5 integrate ... //depot/projects/kse/sys/dev/ata/ata-pci.c#21 integrate ... //depot/projects/kse/sys/dev/ata/ata-raid.c#13 integrate ... //depot/projects/kse/sys/dev/ata/ata-raid.h#8 integrate ... //depot/projects/kse/sys/dev/ata/atapi-all.c#11 integrate ... //depot/projects/kse/sys/dev/awi/awi.c#5 integrate ... //depot/projects/kse/sys/dev/awi/awi_wep.c#5 integrate ... //depot/projects/kse/sys/dev/awi/awi_wicfg.c#5 integrate ... //depot/projects/kse/sys/dev/bge/if_bge.c#9 integrate ... //depot/projects/kse/sys/dev/ciss/ciss.c#4 integrate ... //depot/projects/kse/sys/dev/digi/CX.c#2 integrate ... //depot/projects/kse/sys/dev/digi/CX_PCI.c#2 integrate ... //depot/projects/kse/sys/dev/digi/EPCX.c#2 integrate ... //depot/projects/kse/sys/dev/digi/EPCX_PCI.c#2 integrate ... //depot/projects/kse/sys/dev/digi/Xe.c#2 integrate ... //depot/projects/kse/sys/dev/digi/Xem.c#2 integrate ... //depot/projects/kse/sys/dev/digi/Xr.c#2 integrate ... //depot/projects/kse/sys/dev/digi/digi.c#11 integrate ... //depot/projects/kse/sys/dev/digi/digi.h#5 integrate ... //depot/projects/kse/sys/dev/digi/digi_isa.c#4 integrate ... //depot/projects/kse/sys/dev/drm/drm.h#1 branch ... //depot/projects/kse/sys/dev/drm/drmP.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_agpsupport.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_auth.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_bufs.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_context.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_dma.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_drawable.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_drv.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_fops.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_init.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_ioctl.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_linux.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_lists.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_lock.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_memory.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_os_freebsd.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_scatter.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_sysctl.h#1 branch ... //depot/projects/kse/sys/dev/drm/drm_vm.h#1 branch ... //depot/projects/kse/sys/dev/drm/gamma.h#1 branch ... //depot/projects/kse/sys/dev/drm/gamma_dma.c#1 branch ... //depot/projects/kse/sys/dev/drm/gamma_drv.c#1 branch ... //depot/projects/kse/sys/dev/drm/gamma_drv.h#1 branch ... //depot/projects/kse/sys/dev/drm/i810_drm.h#1 branch ... //depot/projects/kse/sys/dev/drm/mga.h#1 branch ... //depot/projects/kse/sys/dev/drm/mga_dma.c#1 branch ... //depot/projects/kse/sys/dev/drm/mga_drm.h#1 branch ... //depot/projects/kse/sys/dev/drm/mga_drv.c#1 branch ... //depot/projects/kse/sys/dev/drm/mga_drv.h#1 branch ... //depot/projects/kse/sys/dev/drm/mga_state.c#1 branch ... //depot/projects/kse/sys/dev/drm/mga_ucode.h#1 branch ... //depot/projects/kse/sys/dev/drm/mga_warp.c#1 branch ... //depot/projects/kse/sys/dev/drm/r128.h#1 branch ... //depot/projects/kse/sys/dev/drm/r128_cce.c#1 branch ... //depot/projects/kse/sys/dev/drm/r128_drm.h#1 branch ... //depot/projects/kse/sys/dev/drm/r128_drv.c#1 branch ... //depot/projects/kse/sys/dev/drm/r128_drv.h#1 branch ... //depot/projects/kse/sys/dev/drm/r128_state.c#1 branch ... //depot/projects/kse/sys/dev/drm/radeon.h#1 branch ... //depot/projects/kse/sys/dev/drm/radeon_cp.c#1 branch ... //depot/projects/kse/sys/dev/drm/radeon_drm.h#1 branch ... //depot/projects/kse/sys/dev/drm/radeon_drv.c#1 branch ... //depot/projects/kse/sys/dev/drm/radeon_drv.h#1 branch ... //depot/projects/kse/sys/dev/drm/radeon_state.c#1 branch ... //depot/projects/kse/sys/dev/drm/sis_drm.h#1 branch ... //depot/projects/kse/sys/dev/drm/tdfx.h#1 branch ... //depot/projects/kse/sys/dev/drm/tdfx_drv.c#1 branch ... //depot/projects/kse/sys/dev/em/if_em.c#5 integrate ... //depot/projects/kse/sys/dev/fb/fb.c#5 integrate ... //depot/projects/kse/sys/dev/fb/fbreg.h#6 integrate ... //depot/projects/kse/sys/dev/fb/gfb.c#2 integrate ... //depot/projects/kse/sys/dev/fb/tga.c#2 integrate ... //depot/projects/kse/sys/dev/gem/if_gem.c#3 integrate ... //depot/projects/kse/sys/dev/gfb/gfb_pci.c#2 integrate ... //depot/projects/kse/sys/dev/gx/if_gx.c#5 integrate ... //depot/projects/kse/sys/dev/hea/eni.c#4 integrate ... //depot/projects/kse/sys/dev/hea/eni_buffer.c#4 integrate ... //depot/projects/kse/sys/dev/hea/eni_transmit.c#2 integrate ... //depot/projects/kse/sys/dev/hea/eni_vcm.c#3 integrate ... //depot/projects/kse/sys/dev/hfa/fore_command.c#2 integrate ... //depot/projects/kse/sys/dev/hfa/fore_load.c#4 integrate ... //depot/projects/kse/sys/dev/hfa/fore_output.c#3 integrate ... //depot/projects/kse/sys/dev/hfa/fore_slave.h#2 integrate ... //depot/projects/kse/sys/dev/hfa/hfa_eisa.c#1 branch ... //depot/projects/kse/sys/dev/hfa/hfa_freebsd.c#1 branch ... //depot/projects/kse/sys/dev/hfa/hfa_freebsd.h#1 branch ... //depot/projects/kse/sys/dev/hfa/hfa_pci.c#1 branch ... //depot/projects/kse/sys/dev/hfa/hfa_sbus.c#1 branch ... //depot/projects/kse/sys/dev/hme/if_hme.c#4 integrate ... //depot/projects/kse/sys/dev/iir/iir.c#2 integrate ... //depot/projects/kse/sys/dev/iir/iir_ctrl.c#2 integrate ... //depot/projects/kse/sys/dev/iir/iir_pci.c#3 integrate ... //depot/projects/kse/sys/dev/isp/isp.c#19 integrate ... //depot/projects/kse/sys/dev/isp/isp_freebsd.h#10 integrate ... //depot/projects/kse/sys/dev/isp/isp_inline.h#7 integrate ... //depot/projects/kse/sys/dev/isp/ispmbox.h#12 integrate ... //depot/projects/kse/sys/dev/lge/if_lge.c#4 integrate ... //depot/projects/kse/sys/dev/mii/acphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/amphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/brgphy.c#5 integrate ... //depot/projects/kse/sys/dev/mii/dcphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/e1000phy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/exphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/inphy.c#3 integrate ... //depot/projects/kse/sys/dev/mii/lxtphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/mii.c#5 integrate ... //depot/projects/kse/sys/dev/mii/mii.h#2 integrate ... //depot/projects/kse/sys/dev/mii/mii_physubr.c#4 integrate ... //depot/projects/kse/sys/dev/mii/miivar.h#4 integrate ... //depot/projects/kse/sys/dev/mii/mlphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/nsgphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/nsgphyreg.h#2 integrate ... //depot/projects/kse/sys/dev/mii/nsphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/pnaphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/pnphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/qsphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/rlphy.c#6 integrate ... //depot/projects/kse/sys/dev/mii/tdkphy.c#5 integrate ... //depot/projects/kse/sys/dev/mii/tlphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/ukphy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/ukphy_subr.c#2 integrate ... //depot/projects/kse/sys/dev/mii/xmphy.c#4 integrate ... //depot/projects/kse/sys/dev/mly/mly.c#6 integrate ... //depot/projects/kse/sys/dev/my/if_my.c#2 integrate ... //depot/projects/kse/sys/dev/nge/if_nge.c#8 integrate ... //depot/projects/kse/sys/dev/nge/if_ngereg.h#3 integrate ... //depot/projects/kse/sys/dev/ofw/ofw_disk.c#1 branch ... //depot/projects/kse/sys/dev/pccard/pccarddevs#11 integrate ... //depot/projects/kse/sys/dev/pccard/pccarddevs.h#11 integrate ... //depot/projects/kse/sys/dev/pccbb/pccbb.c#15 integrate ... //depot/projects/kse/sys/dev/pccbb/pccbbreg.h#5 integrate ... //depot/projects/kse/sys/dev/pci/pci.c#11 integrate ... //depot/projects/kse/sys/dev/pci/pci_pci.c#10 integrate ... //depot/projects/kse/sys/dev/ppbus/pps.c#7 integrate ... //depot/projects/kse/sys/dev/puc/puc.c#5 integrate ... //depot/projects/kse/sys/dev/puc/pucdata.c#4 integrate ... //depot/projects/kse/sys/dev/random/harvest.c#3 integrate ... //depot/projects/kse/sys/dev/sio/sio.c#14 integrate ... //depot/projects/kse/sys/dev/snp/snp.c#8 integrate ... //depot/projects/kse/sys/dev/sound/pci/es137x.c#4 integrate ... //depot/projects/kse/sys/dev/sound/pci/ich.c#13 integrate ... //depot/projects/kse/sys/dev/sound/pci/maestro.c#5 integrate ... //depot/projects/kse/sys/dev/sound/pcm/ac97.c#7 integrate ... //depot/projects/kse/sys/dev/sound/pcm/ac97.h#3 integrate ... //depot/projects/kse/sys/dev/sound/pcm/ac97_if.m#2 integrate ... //depot/projects/kse/sys/dev/sound/pcm/feeder_fmt.c#3 integrate ... //depot/projects/kse/sys/dev/sound/pcm/feeder_if.m#2 integrate ... //depot/projects/kse/sys/dev/sound/pcm/mixer_if.m#2 integrate ... //depot/projects/kse/sys/dev/sound/pcm/sound.c#10 integrate ... //depot/projects/kse/sys/dev/sym/sym_hipd.c#5 integrate ... //depot/projects/kse/sys/dev/syscons/scgfbrndr.c#3 integrate ... //depot/projects/kse/sys/dev/syscons/syscons.c#13 integrate ... //depot/projects/kse/sys/dev/syscons/syscons.h#6 integrate ... //depot/projects/kse/sys/dev/tdfx/tdfx_pci.c#6 integrate ... //depot/projects/kse/sys/dev/tx/if_tx.c#1 branch ... //depot/projects/kse/sys/dev/tx/if_txreg.h#1 branch ... //depot/projects/kse/sys/dev/tx/if_txvar.h#1 branch ... //depot/projects/kse/sys/dev/usb/if_aue.c#10 integrate ... //depot/projects/kse/sys/dev/usb/ohci.c#15 integrate ... //depot/projects/kse/sys/dev/usb/uhci.c#17 integrate ... //depot/projects/kse/sys/dev/usb/umass.c#11 integrate ... //depot/projects/kse/sys/dev/usb/usb_subr.c#8 integrate ... //depot/projects/kse/sys/dev/usb/usbdevs#17 integrate ... //depot/projects/kse/sys/dev/usb/usbdevs.h#17 integrate ... //depot/projects/kse/sys/dev/usb/usbdevs_data.h#17 integrate ... //depot/projects/kse/sys/dev/vinum/vinumio.c#5 integrate ... //depot/projects/kse/sys/dev/wi/if_wavelan_ieee.h#4 integrate ... //depot/projects/kse/sys/dev/wi/if_wi.c#21 integrate ... //depot/projects/kse/sys/dev/wi/if_wi_pccard.c#3 integrate ... //depot/projects/kse/sys/dev/wi/if_wi_pci.c#3 integrate ... //depot/projects/kse/sys/dev/wi/if_wireg.h#9 integrate ... //depot/projects/kse/sys/dev/wi/if_wivar.h#3 integrate ... //depot/projects/kse/sys/dev/wi/wi_hostap.c#1 branch ... //depot/projects/kse/sys/dev/wi/wi_hostap.h#1 branch ... //depot/projects/kse/sys/fs/devfs/devfs.h#4 integrate ... //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#11 integrate ... //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#10 integrate ... //depot/projects/kse/sys/fs/procfs/procfs.h#9 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_ctl.c#20 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_dbregs.c#13 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_fpregs.c#13 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_mem.c#6 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_regs.c#13 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_status.c#13 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs_vnops.c#12 integrate ... //depot/projects/kse/sys/fs/smbfs/smbfs_io.c#4 integrate ... //depot/projects/kse/sys/fs/smbfs/smbfs_vfsops.c#8 integrate ... //depot/projects/kse/sys/fs/smbfs/smbfs_vnops.c#10 integrate ... //depot/projects/kse/sys/fs/specfs/spec_vnops.c#12 integrate ... //depot/projects/kse/sys/fs/udf/ecma167-udf.h#1 branch ... //depot/projects/kse/sys/fs/udf/osta.c#1 branch ... //depot/projects/kse/sys/fs/udf/osta.h#1 branch ... //depot/projects/kse/sys/fs/udf/udf.h#1 branch ... //depot/projects/kse/sys/fs/udf/udf_mount.h#1 branch ... //depot/projects/kse/sys/fs/udf/udf_vfsops.c#1 branch ... //depot/projects/kse/sys/fs/udf/udf_vnops.c#1 branch ... //depot/projects/kse/sys/geom/geom.h#4 integrate ... //depot/projects/kse/sys/geom/geom_bsd.c#4 integrate ... //depot/projects/kse/sys/geom/geom_dev.c#4 integrate ... //depot/projects/kse/sys/geom/geom_disk.c#4 integrate ... //depot/projects/kse/sys/geom/geom_dump.c#4 integrate ... //depot/projects/kse/sys/geom/geom_enc.c#2 integrate ... //depot/projects/kse/sys/geom/geom_slice.c#4 integrate ... //depot/projects/kse/sys/geom/geom_slice.h#4 integrate ... //depot/projects/kse/sys/geom/geom_subr.c#4 integrate ... //depot/projects/kse/sys/i386/acpica/Makefile#3 integrate ... //depot/projects/kse/sys/i386/acpica/genwakecode.sh#1 branch ... //depot/projects/kse/sys/i386/conf/GENERIC#15 integrate ... //depot/projects/kse/sys/i386/i386/autoconf.c#10 integrate ... //depot/projects/kse/sys/i386/i386/bios.c#9 integrate ... //depot/projects/kse/sys/i386/i386/busdma_machdep.c#4 integrate ... //depot/projects/kse/sys/i386/i386/elf_machdep.c#2 integrate ... //depot/projects/kse/sys/i386/i386/i686_mem.c#2 integrate ... //depot/projects/kse/sys/i386/i386/identcpu.c#11 integrate ... //depot/projects/kse/sys/i386/i386/machdep.c#46 integrate ... //depot/projects/kse/sys/i386/i386/mp_clock.c#2 integrate ... //depot/projects/kse/sys/i386/i386/mp_machdep.c#22 integrate ... //depot/projects/kse/sys/i386/i386/pmap.c#32 integrate ... //depot/projects/kse/sys/i386/i386/trap.c#37 integrate ... //depot/projects/kse/sys/i386/include/ansi.h#9 integrate ... //depot/projects/kse/sys/i386/include/cpufunc.h#9 integrate ... //depot/projects/kse/sys/i386/include/endian.h#8 integrate ... //depot/projects/kse/sys/i386/include/pmap.h#8 integrate ... //depot/projects/kse/sys/i386/include/profile.h#5 integrate ... //depot/projects/kse/sys/i386/isa/bs/bsif.c#3 integrate ... //depot/projects/kse/sys/i386/isa/clock.c#11 integrate ... //depot/projects/kse/sys/i386/isa/isa_dma.c#4 integrate ... //depot/projects/kse/sys/i386/isa/loran.c#4 integrate ... //depot/projects/kse/sys/i386/pci/pci_bus.c#5 integrate ... //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#8 integrate ... //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#4 integrate ... //depot/projects/kse/sys/ia64/conf/GENERIC#11 integrate ... //depot/projects/kse/sys/ia64/conf/SKI#4 integrate ... //depot/projects/kse/sys/ia64/ia32/Makefile#1 branch ... //depot/projects/kse/sys/ia64/ia32/ia32_proto.h#1 branch ... //depot/projects/kse/sys/ia64/ia32/ia32_syscall.h#1 branch ... //depot/projects/kse/sys/ia64/ia32/ia32_sysent.c#1 branch ... //depot/projects/kse/sys/ia64/ia32/imgact_ia32.c#1 branch ... //depot/projects/kse/sys/ia64/ia32/imgact_ia32.h#1 branch ... //depot/projects/kse/sys/ia64/ia32/syscalls.conf#1 branch ... //depot/projects/kse/sys/ia64/ia32/syscalls.master#1 branch ... //depot/projects/kse/sys/ia64/ia64/clock.c#7 integrate ... //depot/projects/kse/sys/ia64/ia64/elf_machdep.c#3 integrate ... //depot/projects/kse/sys/ia64/ia64/exception.s#12 integrate ... //depot/projects/kse/sys/ia64/ia64/ia64dump.c#3 integrate ... //depot/projects/kse/sys/ia64/ia64/locore.s#17 integrate ... //depot/projects/kse/sys/ia64/ia64/machdep.c#30 integrate ... //depot/projects/kse/sys/ia64/ia64/mca.c#1 branch ... //depot/projects/kse/sys/ia64/ia64/mp_machdep.c#11 integrate ... //depot/projects/kse/sys/ia64/ia64/pmap.c#22 integrate ... //depot/projects/kse/sys/ia64/ia64/sal.c#6 integrate ... //depot/projects/kse/sys/ia64/ia64/sscdisk.c#8 integrate ... //depot/projects/kse/sys/ia64/ia64/support.s#9 integrate ... //depot/projects/kse/sys/ia64/ia64/swtch.s#16 integrate ... //depot/projects/kse/sys/ia64/ia64/trap.c#18 integrate ... //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#17 integrate ... //depot/projects/kse/sys/ia64/include/ansi.h#9 integrate ... //depot/projects/kse/sys/ia64/include/endian.h#7 integrate ... //depot/projects/kse/sys/ia64/include/frame.h#2 integrate ... //depot/projects/kse/sys/ia64/include/ia64_cpu.h#8 integrate ... //depot/projects/kse/sys/ia64/include/mca.h#1 branch ... //depot/projects/kse/sys/ia64/include/pcb.h#3 integrate ... //depot/projects/kse/sys/ia64/include/pmap.h#6 integrate ... //depot/projects/kse/sys/ia64/include/sal.h#3 integrate ... //depot/projects/kse/sys/ia64/include/signal.h#3 integrate ... //depot/projects/kse/sys/ia64/include/stdarg.h#2 integrate ... //depot/projects/kse/sys/ia64/isa/isa_dma.c#3 integrate ... //depot/projects/kse/sys/kern/bus_if.m#3 integrate ... //depot/projects/kse/sys/kern/init_main.c#38 integrate ... //depot/projects/kse/sys/kern/init_sysent.c#16 integrate ... //depot/projects/kse/sys/kern/kern_clock.c#18 integrate ... //depot/projects/kse/sys/kern/kern_condvar.c#31 integrate ... //depot/projects/kse/sys/kern/kern_conf.c#11 integrate ... //depot/projects/kse/sys/kern/kern_descrip.c#27 integrate ... //depot/projects/kse/sys/kern/kern_environment.c#5 integrate ... //depot/projects/kse/sys/kern/kern_exec.c#24 integrate ... //depot/projects/kse/sys/kern/kern_exit.c#41 integrate ... //depot/projects/kse/sys/kern/kern_fork.c#61 integrate ... //depot/projects/kse/sys/kern/kern_intr.c#22 integrate ... //depot/projects/kse/sys/kern/kern_ktrace.c#10 integrate ... //depot/projects/kse/sys/kern/kern_linker.c#15 integrate ... //depot/projects/kse/sys/kern/kern_malloc.c#9 integrate ... //depot/projects/kse/sys/kern/kern_ntptime.c#7 integrate ... //depot/projects/kse/sys/kern/kern_proc.c#57 integrate ... //depot/projects/kse/sys/kern/kern_prot.c#24 integrate ... //depot/projects/kse/sys/kern/kern_resource.c#19 integrate ... //depot/projects/kse/sys/kern/kern_sig.c#45 integrate ... //depot/projects/kse/sys/kern/kern_tc.c#7 integrate ... //depot/projects/kse/sys/kern/kern_time.c#9 integrate ... //depot/projects/kse/sys/kern/link_elf.c#12 integrate ... //depot/projects/kse/sys/kern/makesyscalls.sh#11 integrate ... //depot/projects/kse/sys/kern/subr_bus.c#10 integrate ... //depot/projects/kse/sys/kern/subr_disklabel.c#8 integrate ... //depot/projects/kse/sys/kern/subr_hints.c#3 integrate ... //depot/projects/kse/sys/kern/subr_log.c#5 integrate ... //depot/projects/kse/sys/kern/subr_mchain.c#4 integrate ... //depot/projects/kse/sys/kern/subr_param.c#10 integrate ... //depot/projects/kse/sys/kern/subr_prf.c#13 integrate ... //depot/projects/kse/sys/kern/subr_witness.c#22 integrate ... //depot/projects/kse/sys/kern/sys_pipe.c#11 integrate ... //depot/projects/kse/sys/kern/sys_process.c#24 integrate ... //depot/projects/kse/sys/kern/syscalls.c#16 integrate ... //depot/projects/kse/sys/kern/syscalls.master#15 integrate ... //depot/projects/kse/sys/kern/tty.c#22 integrate ... //depot/projects/kse/sys/kern/tty_pty.c#11 integrate ... //depot/projects/kse/sys/kern/uipc_mbuf.c#6 integrate ... //depot/projects/kse/sys/kern/uipc_mbuf2.c#3 integrate ... //depot/projects/kse/sys/kern/uipc_socket.c#14 integrate ... //depot/projects/kse/sys/kern/uipc_socket2.c#13 integrate ... //depot/projects/kse/sys/kern/uipc_syscalls.c#13 integrate ... //depot/projects/kse/sys/kern/uipc_usrreq.c#17 integrate ... //depot/projects/kse/sys/kern/vfs_aio.c#24 integrate ... //depot/projects/kse/sys/kern/vfs_conf.c#7 integrate ... //depot/projects/kse/sys/kern/vfs_default.c#7 integrate ... //depot/projects/kse/sys/kern/vfs_init.c#4 integrate ... //depot/projects/kse/sys/kern/vfs_syscalls.c#25 integrate ... //depot/projects/kse/sys/kern/vfs_vnops.c#24 integrate ... //depot/projects/kse/sys/kern/vnode_if.pl#5 delete ... //depot/projects/kse/sys/libkern/bsearch.c#4 integrate ... //depot/projects/kse/sys/modules/Makefile#25 integrate ... //depot/projects/kse/sys/modules/aac/Makefile#2 integrate ... //depot/projects/kse/sys/modules/drm/Makefile#1 branch ... //depot/projects/kse/sys/modules/drm/gamma/Makefile#1 branch ... //depot/projects/kse/sys/modules/drm/mga/Makefile#1 branch ... //depot/projects/kse/sys/modules/drm/r128/Makefile#1 branch ... //depot/projects/kse/sys/modules/drm/radeon/Makefile#1 branch ... //depot/projects/kse/sys/modules/drm/tdfx/Makefile#1 branch ... //depot/projects/kse/sys/modules/hfa/Makefile#1 branch ... //depot/projects/kse/sys/modules/hfa/eisa/Makefile#1 branch ... //depot/projects/kse/sys/modules/hfa/hfa/Makefile#1 branch ... //depot/projects/kse/sys/modules/hfa/pci/Makefile#1 branch ... //depot/projects/kse/sys/modules/hfa/sbus/Makefile#1 branch ... //depot/projects/kse/sys/modules/my/Makefile#1 branch ... //depot/projects/kse/sys/modules/tx/Makefile#4 integrate ... //depot/projects/kse/sys/modules/udf/Makefile#1 branch ... //depot/projects/kse/sys/modules/wi/Makefile#5 integrate ... //depot/projects/kse/sys/net/bpf.c#11 integrate ... //depot/projects/kse/sys/net/if.c#16 integrate ... //depot/projects/kse/sys/net/if_arcsubr.c#4 integrate ... //depot/projects/kse/sys/net/if_ef.c#4 integrate ... //depot/projects/kse/sys/net/if_faith.c#9 integrate ... //depot/projects/kse/sys/net/if_gif.c#10 integrate ... //depot/projects/kse/sys/net/if_ieee80211.h#3 integrate ... //depot/projects/kse/sys/net/if_media.h#4 integrate ... //depot/projects/kse/sys/net/if_spppsubr.c#7 integrate ... //depot/projects/kse/sys/net/if_stf.c#11 integrate ... //depot/projects/kse/sys/net/if_stf.h#5 integrate ... //depot/projects/kse/sys/net/if_tap.c#11 integrate ... //depot/projects/kse/sys/net/if_tun.c#11 integrate ... //depot/projects/kse/sys/net/net_osdep.c#2 integrate ... //depot/projects/kse/sys/net/net_osdep.h#5 integrate ... //depot/projects/kse/sys/net/radix.c#3 integrate ... //depot/projects/kse/sys/net/raw_usrreq.c#6 integrate ... //depot/projects/kse/sys/net/rtsock.c#14 integrate ... //depot/projects/kse/sys/netatalk/ddp_input.c#3 integrate ... //depot/projects/kse/sys/netatm/atm.h#2 integrate ... //depot/projects/kse/sys/netatm/atm_aal5.c#5 integrate ... //depot/projects/kse/sys/netatm/atm_cm.c#3 integrate ... //depot/projects/kse/sys/netatm/atm_device.c#3 integrate ... //depot/projects/kse/sys/netatm/atm_if.c#4 integrate ... //depot/projects/kse/sys/netatm/atm_if.h#3 integrate ... //depot/projects/kse/sys/netatm/atm_ioctl.h#2 integrate ... //depot/projects/kse/sys/netatm/atm_proto.c#4 integrate ... //depot/projects/kse/sys/netatm/atm_signal.c#3 integrate ... //depot/projects/kse/sys/netatm/atm_socket.c#3 integrate ... //depot/projects/kse/sys/netatm/atm_subr.c#6 integrate ... //depot/projects/kse/sys/netatm/atm_sys.h#3 integrate ... //depot/projects/kse/sys/netatm/atm_usrreq.c#5 integrate ... //depot/projects/kse/sys/netatm/atm_var.h#6 integrate ... //depot/projects/kse/sys/netatm/ipatm/ipatm_if.c#3 integrate ... //depot/projects/kse/sys/netatm/ipatm/ipatm_input.c#2 integrate ... //depot/projects/kse/sys/netatm/ipatm/ipatm_output.c#2 integrate ... //depot/projects/kse/sys/netatm/ipatm/ipatm_usrreq.c#2 integrate ... //depot/projects/kse/sys/netatm/ipatm/ipatm_vcm.c#2 integrate ... //depot/projects/kse/sys/netatm/port.h#3 integrate ... //depot/projects/kse/sys/netatm/sigpvc/sigpvc_if.c#3 integrate ... //depot/projects/kse/sys/netatm/spans/spans_arp.c#3 integrate ... //depot/projects/kse/sys/netatm/spans/spans_cls.c#3 integrate ... //depot/projects/kse/sys/netatm/spans/spans_if.c#3 integrate ... //depot/projects/kse/sys/netatm/spans/spans_kxdr.c#3 integrate ... //depot/projects/kse/sys/netatm/spans/spans_msg.c#3 integrate ... //depot/projects/kse/sys/netatm/spans/spans_proto.c#3 integrate ... //depot/projects/kse/sys/netatm/spans/spans_util.c#2 integrate ... //depot/projects/kse/sys/netatm/spans/spans_var.h#3 integrate ... //depot/projects/kse/sys/netatm/uni/sscop_pdu.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/sscop_subr.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/sscop_upper.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/uniarp.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/uniarp_cache.c#2 integrate ... //depot/projects/kse/sys/netatm/uni/uniarp_output.c#2 integrate ... //depot/projects/kse/sys/netatm/uni/uniip.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/unisig_decode.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/unisig_if.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/unisig_sigmgr_state.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/unisig_subr.c#2 integrate ... //depot/projects/kse/sys/netatm/uni/unisig_util.c#2 integrate ... //depot/projects/kse/sys/netatm/uni/unisig_vc_state.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_pptpgre.c#4 integrate ... //depot/projects/kse/sys/netgraph/ng_socket.c#9 integrate ... //depot/projects/kse/sys/netinet/accf_data.c#2 integrate ... //depot/projects/kse/sys/netinet/accf_http.c#2 integrate ... //depot/projects/kse/sys/netinet/icmp6.h#3 integrate ... //depot/projects/kse/sys/netinet/in.c#10 integrate ... //depot/projects/kse/sys/netinet/in.h#8 integrate ... //depot/projects/kse/sys/netinet/in_gif.c#6 integrate ... //depot/projects/kse/sys/netinet/ip_divert.c#10 integrate ... //depot/projects/kse/sys/netinet/ip_ecn.c#2 integrate ... //depot/projects/kse/sys/netinet/ip_encap.c#6 integrate ... //depot/projects/kse/sys/netinet/ip_fw.c#14 integrate ... //depot/projects/kse/sys/netinet/ip_mroute.c#8 integrate ... //depot/projects/kse/sys/netinet/raw_ip.c#11 integrate ... //depot/projects/kse/sys/netinet/tcp_input.c#17 integrate ... //depot/projects/kse/sys/netinet/tcp_subr.c#10 integrate ... //depot/projects/kse/sys/netinet/udp_usrreq.c#11 integrate ... //depot/projects/kse/sys/netinet6/ah.h#3 integrate ... //depot/projects/kse/sys/netinet6/ah_core.c#2 integrate ... //depot/projects/kse/sys/netinet6/ah_input.c#6 integrate ... //depot/projects/kse/sys/netinet6/ah_output.c#2 integrate ... //depot/projects/kse/sys/netinet6/dest6.c#2 integrate ... //depot/projects/kse/sys/netinet6/esp.h#3 integrate ... //depot/projects/kse/sys/netinet6/esp_input.c#6 integrate ... //depot/projects/kse/sys/netinet6/esp_output.c#2 integrate ... //depot/projects/kse/sys/netinet6/frag6.c#2 integrate ... //depot/projects/kse/sys/netinet6/icmp6.c#4 integrate ... //depot/projects/kse/sys/netinet6/in6.c#9 integrate ... //depot/projects/kse/sys/netinet6/in6.h#5 integrate ... //depot/projects/kse/sys/netinet6/in6_ifattach.c#3 integrate ... //depot/projects/kse/sys/netinet6/in6_pcb.c#11 integrate ... //depot/projects/kse/sys/netinet6/in6_proto.c#2 integrate ... //depot/projects/kse/sys/netinet6/in6_rmx.c#2 integrate ... //depot/projects/kse/sys/netinet6/in6_var.h#4 integrate ... //depot/projects/kse/sys/netinet6/ip6_forward.c#5 integrate ... //depot/projects/kse/sys/netinet6/ip6_fw.c#6 integrate ... //depot/projects/kse/sys/netinet6/ip6_fw.h#2 integrate ... //depot/projects/kse/sys/netinet6/ip6_input.c#8 integrate ... //depot/projects/kse/sys/netinet6/ip6_mroute.c#5 integrate ... //depot/projects/kse/sys/netinet6/ip6_mroute.h#2 integrate ... //depot/projects/kse/sys/netinet6/ip6_output.c#7 integrate ... //depot/projects/kse/sys/netinet6/ip6protosw.h#5 integrate ... //depot/projects/kse/sys/netinet6/ipcomp.h#3 integrate ... //depot/projects/kse/sys/netinet6/ipcomp_core.c#2 integrate ... //depot/projects/kse/sys/netinet6/ipcomp_input.c#4 integrate ... //depot/projects/kse/sys/netinet6/ipcomp_output.c#2 integrate ... //depot/projects/kse/sys/netinet6/ipsec.c#4 integrate ... //depot/projects/kse/sys/netinet6/ipsec.h#2 integrate ... //depot/projects/kse/sys/netinet6/nd6.c#7 integrate ... //depot/projects/kse/sys/netinet6/nd6.h#4 integrate ... //depot/projects/kse/sys/netinet6/nd6_nbr.c#3 integrate ... //depot/projects/kse/sys/netinet6/nd6_rtr.c#4 integrate ... //depot/projects/kse/sys/netinet6/raw_ip6.c#9 integrate ... //depot/projects/kse/sys/netinet6/route6.c#2 integrate ... //depot/projects/kse/sys/netinet6/udp6_output.c#7 integrate ... //depot/projects/kse/sys/netinet6/udp6_usrreq.c#9 integrate ... //depot/projects/kse/sys/netipx/ipx_usrreq.c#6 integrate ... //depot/projects/kse/sys/netipx/spx_usrreq.c#7 integrate ... //depot/projects/kse/sys/netkey/key.h#3 integrate ... //depot/projects/kse/sys/netkey/key_debug.c#5 integrate ... //depot/projects/kse/sys/netkey/keysock.c#7 integrate ... //depot/projects/kse/sys/netnatm/natm.c#5 integrate ... //depot/projects/kse/sys/netncp/ncp_nls.h#2 integrate ... //depot/projects/kse/sys/netsmb/netbios.h#3 integrate ... //depot/projects/kse/sys/netsmb/smb.h#5 integrate ... //depot/projects/kse/sys/netsmb/smb_iod.c#4 integrate ... //depot/projects/kse/sys/netsmb/smb_rq.c#5 integrate ... //depot/projects/kse/sys/netsmb/smb_subr.c#5 integrate ... //depot/projects/kse/sys/netsmb/smb_trantcp.c#6 integrate ... //depot/projects/kse/sys/nfsclient/bootp_subr.c#7 integrate ... //depot/projects/kse/sys/nfsclient/nfs_node.c#6 integrate ... //depot/projects/kse/sys/nfsclient/nfs_socket.c#10 integrate ... //depot/projects/kse/sys/nfsclient/nfs_vfsops.c#10 integrate ... //depot/projects/kse/sys/nfsclient/nfsnode.h#5 integrate ... //depot/projects/kse/sys/nfsserver/nfs_serv.c#11 integrate ... //depot/projects/kse/sys/pc98/conf/GENERIC#14 integrate ... //depot/projects/kse/sys/pc98/i386/machdep.c#26 integrate ... //depot/projects/kse/sys/pc98/pc98/clock.c#7 integrate ... //depot/projects/kse/sys/pc98/pc98/isa_dma.c#4 integrate ... //depot/projects/kse/sys/pc98/pc98/sio.c#14 integrate ... //depot/projects/kse/sys/pc98/pc98/syscons.c#10 integrate ... //depot/projects/kse/sys/pci/agp_amd.c#4 integrate ... //depot/projects/kse/sys/pci/if_dc.c#14 integrate ... //depot/projects/kse/sys/pci/if_de.c#2 integrate ... //depot/projects/kse/sys/pci/if_rl.c#8 integrate ... //depot/projects/kse/sys/pci/if_rlreg.h#4 integrate ... //depot/projects/kse/sys/pci/if_sk.c#6 integrate ... //depot/projects/kse/sys/pci/if_ti.c#9 integrate ... //depot/projects/kse/sys/pci/if_tx.c#6 delete ... //depot/projects/kse/sys/pci/if_txvar.h#3 delete ... //depot/projects/kse/sys/pci/xrpu.c#4 integrate ... //depot/projects/kse/sys/powerpc/conf/GENERIC#5 integrate ... //depot/projects/kse/sys/powerpc/include/ansi.h#9 integrate ... //depot/projects/kse/sys/powerpc/include/cpu.h#8 integrate ... //depot/projects/kse/sys/powerpc/include/cpufunc.h#8 integrate ... //depot/projects/kse/sys/powerpc/include/endian.h#6 integrate ... //depot/projects/kse/sys/powerpc/include/frame.h#4 integrate ... //depot/projects/kse/sys/powerpc/include/nexusvar.h#1 branch ... //depot/projects/kse/sys/powerpc/include/pcpu.h#3 integrate ... //depot/projects/kse/sys/powerpc/include/pmap.h#6 integrate ... //depot/projects/kse/sys/powerpc/include/spr.h#1 branch ... //depot/projects/kse/sys/powerpc/powerpc/clock.c#5 integrate ... //depot/projects/kse/sys/powerpc/powerpc/copyinout.c#2 integrate ... //depot/projects/kse/sys/powerpc/powerpc/elf_machdep.c#2 integrate ... //depot/projects/kse/sys/powerpc/powerpc/genassym.c#14 integrate ... //depot/projects/kse/sys/powerpc/powerpc/locore.s#7 integrate ... //depot/projects/kse/sys/powerpc/powerpc/nexus.c#1 branch ... //depot/projects/kse/sys/powerpc/powerpc/pmap.c#14 integrate ... //depot/projects/kse/sys/powerpc/powerpc/sigcode.S#1 branch ... //depot/projects/kse/sys/powerpc/powerpc/swtch.s#11 integrate ... //depot/projects/kse/sys/powerpc/powerpc/trap.c#11 integrate ... //depot/projects/kse/sys/powerpc/powerpc/trap_subr.S#1 branch ... //depot/projects/kse/sys/security/lomac/kernel_log.c#3 integrate ... //depot/projects/kse/sys/sparc64/conf/GENERIC#9 integrate ... //depot/projects/kse/sys/sparc64/include/ansi.h#10 integrate ... //depot/projects/kse/sys/sparc64/include/endian.h#7 integrate ... //depot/projects/kse/sys/sparc64/include/pmap.h#12 integrate ... //depot/projects/kse/sys/sparc64/include/proc.h#10 integrate ... //depot/projects/kse/sys/sparc64/include/sysarch.h#2 integrate ... //depot/projects/kse/sys/sparc64/sparc64/elf_machdep.c#4 integrate ... //depot/projects/kse/sys/sparc64/sparc64/machdep.c#29 integrate ... //depot/projects/kse/sys/sparc64/sparc64/mp_machdep.c#6 integrate ... //depot/projects/kse/sys/sparc64/sparc64/pmap.c#25 integrate ... //depot/projects/kse/sys/sparc64/sparc64/rwindow.c#7 integrate ... //depot/projects/kse/sys/sparc64/sparc64/sys_machdep.c#9 integrate ... //depot/projects/kse/sys/sparc64/sparc64/trap.c#25 integrate ... //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#22 integrate ... //depot/projects/kse/sys/sys/_types.h#2 integrate ... //depot/projects/kse/sys/sys/conf.h#14 integrate ... //depot/projects/kse/sys/sys/disklabel.h#9 integrate ... //depot/projects/kse/sys/sys/endian.h#1 branch ... //depot/projects/kse/sys/sys/eventhandler.h#5 integrate ... //depot/projects/kse/sys/sys/fbio.h#3 integrate ... //depot/projects/kse/sys/sys/filedesc.h#13 integrate ... //depot/projects/kse/sys/sys/ioccom.h#4 integrate ... //depot/projects/kse/sys/sys/kenv.h#1 branch ... //depot/projects/kse/sys/sys/kernel.h#9 integrate ... //depot/projects/kse/sys/sys/linker.h#5 integrate ... //depot/projects/kse/sys/sys/linker_set.h#2 integrate ... //depot/projects/kse/sys/sys/lock.h#11 integrate ... //depot/projects/kse/sys/sys/malloc.h#6 integrate ... //depot/projects/kse/sys/sys/memrange.h#2 integrate ... //depot/projects/kse/sys/sys/mount.h#8 integrate ... //depot/projects/kse/sys/sys/param.h#18 integrate ... //depot/projects/kse/sys/sys/poll.h#4 integrate ... //depot/projects/kse/sys/sys/proc.h#96 integrate ... //depot/projects/kse/sys/sys/queue.h#5 integrate ... //depot/projects/kse/sys/sys/signalvar.h#10 integrate ... //depot/projects/kse/sys/sys/socket.h#5 integrate ... //depot/projects/kse/sys/sys/socketvar.h#16 integrate ... //depot/projects/kse/sys/sys/syscall.h#16 integrate ... //depot/projects/kse/sys/sys/syscall.mk#16 integrate ... //depot/projects/kse/sys/sys/sysproto.h#20 integrate ... //depot/projects/kse/sys/sys/systm.h#22 integrate ... //depot/projects/kse/sys/sys/time.h#7 integrate ... //depot/projects/kse/sys/sys/timepps.h#3 integrate ... //depot/projects/kse/sys/sys/timetc.h#5 integrate ... //depot/projects/kse/sys/sys/timex.h#3 integrate ... //depot/projects/kse/sys/sys/types.h#13 integrate ... //depot/projects/kse/sys/sys/un.h#6 integrate ... //depot/projects/kse/sys/sys/vnode.h#23 integrate ... //depot/projects/kse/sys/tools/makeobjops.awk#1 branch ... //depot/projects/kse/sys/ufs/ffs/ffs_softdep.c#11 integrate ... //depot/projects/kse/sys/ufs/ifs/ifs_vnops.c#3 integrate ... //depot/projects/kse/sys/vm/pmap.h#11 integrate ... //depot/projects/kse/sys/vm/uma.h#3 integrate ... //depot/projects/kse/sys/vm/uma_core.c#3 integrate ... //depot/projects/kse/sys/vm/uma_dbg.c#1 branch ... //depot/projects/kse/sys/vm/uma_dbg.h#1 branch ... //depot/projects/kse/sys/vm/uma_int.h#3 integrate ... //depot/projects/kse/sys/vm/vm_fault.c#9 integrate ... //depot/projects/kse/sys/vm/vm_glue.c#30 integrate ... //depot/projects/kse/sys/vm/vm_kern.c#5 integrate ... //depot/projects/kse/sys/vm/vm_map.c#14 integrate ... //depot/projects/kse/sys/vm/vm_map.h#8 integrate ... //depot/projects/kse/sys/vm/vm_meter.c#12 integrate ... //depot/projects/kse/sys/vm/vm_object.c#8 integrate ... //depot/projects/kse/sys/vm/vm_object.h#3 integrate ... //depot/projects/kse/sys/vm/vm_page.c#11 integrate ... //depot/projects/kse/sys/vm/vm_page.h#6 integrate ... //depot/projects/kse/sys/vm/vm_pageout.c#15 integrate ... //depot/projects/kse/sys/vm/vm_zeroidle.c#9 integrate ... //depot/projects/kse/sys/vm/vnode_pager.c#12 integrate Differences ... ==== //depot/projects/kse/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.25 2000/08/24 18:53:09 peter Exp $ +# $FreeBSD: src/sys/Makefile,v 1.26 2002/04/26 17:55:21 ru Exp $ # The boot loader SUBDIR= boot @@ -8,11 +8,6 @@ SUBDIR+=modules .endif -afterdistribute: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${MACHINE}/conf/GENERIC.hints \ - ${DESTDIR}/boot/device.hints - HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` .include ==== //depot/projects/kse/sys/alpha/alpha/clock.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.28 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.29 2002/04/30 19:34:28 phk Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* @@ -124,9 +124,6 @@ "alpha" /* name */ }; -SYSCTL_OPAQUE(_debug, OID_AUTO, alpha_timecounter, CTLFLAG_RD, - &alpha_timecounter, sizeof(alpha_timecounter), "S,timecounter", ""); - static struct timecounter i8254_timecounter = { i8254_get_timecount, /* get_timecount */ 0, /* no poll_pps */ @@ -135,9 +132,6 @@ "i8254" /* name */ }; -SYSCTL_OPAQUE(_debug, OID_AUTO, i8254_timecounter, CTLFLAG_RD, - &i8254_timecounter, sizeof(i8254_timecounter), "S,timecounter", ""); - /* Values for timerX_state: */ #define RELEASED 0 #define RELEASE_PENDING 1 ==== //depot/projects/kse/sys/alpha/alpha/db_instruction.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.4 2001/03/05 21:21:01 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.5 2002/04/13 22:21:28 obrien Exp $ */ /* $NetBSD: db_instruction.h,v 1.4 1997/09/16 22:53:32 thorpej Exp $ */ /* @@ -172,7 +172,7 @@ } alpha_instruction; -#endif !defined(ASSEMBLER) +#endif /* !defined(ASSEMBLER) */ /* * ==== //depot/projects/kse/sys/alpha/alpha/dec_axppci_33.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.13 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.15 2002/04/17 15:32:11 ticso Exp $ */ /* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */ /* @@ -55,7 +55,7 @@ void dec_axppci_33_init(void); static void dec_axppci_33_cons_init(void); -static void dec_axppci_33_intr_map(void *); +static int dec_axppci_33_intr_route (device_t, device_t, int); extern int siocnattach(int, int); extern int siogdbattach(int, int); @@ -93,7 +93,8 @@ platform.iobus = "lca"; platform.cons_init = dec_axppci_33_cons_init; - platform.pci_intr_map = dec_axppci_33_intr_map; + platform.pci_intr_route = dec_axppci_33_intr_route; + platform.pci_intr_map = NULL; lca_init(); @@ -167,16 +168,13 @@ #define SIO_PCIREG_PIRQ_RTCTRL 0x60 /* PIRQ0 Route Control */ -void -dec_axppci_33_intr_map(void *arg) +static int +dec_axppci_33_intr_route(device_t pcib, device_t dev, int pin) { - pcicfgregs *cfg; int pirq; u_int32_t pirqreg; u_int8_t pirqline; - cfg = (pcicfgregs *)arg; - #ifndef DIAGNOSTIC pirq = 0; /* XXX gcc -Wuninitialized */ #endif @@ -185,23 +183,22 @@ * Slot->interrupt translation. Taken from NetBSD. */ - if (cfg->intpin == 0) { + if (pin == 0) { /* No IRQ used. */ - return; + return -1; } - if (cfg->intpin > 4) { - printf("dec_axppci_33_intr_map: bad interrupt pin %d\n", - cfg->intpin); - return; + if (pin > 4) { + printf("dec_axppci_33_intr_route: bad interrupt pin %d\n", pin); + return -1; } - switch (cfg->slot) { + switch (pci_get_slot(dev)) { case 6: /* NCR SCSI */ pirq = 3; break; case 11: /* slot 1 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 0; @@ -214,14 +211,14 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map: bogus PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route: bogus PCI pin %d\n", + pin); #endif }; break; case 12: /* slot 2 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 1; @@ -234,14 +231,14 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map: bogus PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route: bogus PCI pin %d\n", + pin); #endif }; break; case 8: /* slot 3 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 2; @@ -254,33 +251,24 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map bogus: PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route bogus: PCI pin %d\n", + pin); #endif }; break; default: - printf("dec_axppci_33_intr_map: weird device number %d\n", - cfg->slot); - return; + printf("dec_axppci_33_intr_route: weird device number %d\n", + pci_get_slot(dev)); + return -1; } pirqreg = lca_pcib_read_config(0, 0, 7, 0, SIO_PCIREG_PIRQ_RTCTRL, 4); -#if 0 - printf("dec_axppci_33_intr_map: device %d pin %c: pirq %d, reg = %x\n", - device, '@' + cfg->intpin, pirq, pirqreg); -#endif pirqline = (pirqreg >> (pirq * 8)) & 0xff; if ((pirqline & 0x80) != 0) panic("bad pirqline %d",pirqline); pirqline &= 0xf; -#if 0 - printf("dec_axppci_33_intr_map: device %d pin %c: mapped to line %d\n", - device, '@' + cfg->intpin, pirqline); -#endif - - cfg->intline = pirqline; + return(pirqline); } ==== //depot/projects/kse/sys/alpha/alpha/elf_machdep.c#3 (text+ko) ==== @@ -22,7 +22,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/alpha/alpha/elf_machdep.c,v 1.8 2002/02/21 23:34:09 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.9 2002/04/25 01:22:15 marcel Exp $ */ #include @@ -38,13 +38,13 @@ /* Process one elf relocation with addend. */ int -elf_reloc(linker_file_t lf, const void *data, int type, const char *sym) +elf_reloc(linker_file_t lf, const void *data, int type) { Elf_Addr relocbase = (Elf_Addr) lf->address; Elf_Addr *where; Elf_Addr addr; Elf_Addr addend; - Elf_Word rtype; + Elf_Word rtype, symidx; const Elf_Rel *rel; const Elf_Rela *rela; @@ -54,12 +54,14 @@ where = (Elf_Addr *) (relocbase + rel->r_offset); addend = *where; rtype = ELF_R_TYPE(rel->r_info); + symidx = ELF_R_SYM(rel->r_info); break; case ELF_RELOC_RELA: rela = (const Elf_Rela *)data; where = (Elf_Addr *) (relocbase + rela->r_offset); addend = rela->r_addend; rtype = ELF_R_TYPE(rela->r_info); + symidx = ELF_R_SYM(rela->r_info); break; default: panic("elf_reloc: unknown relocation mode %d\n", type); @@ -71,9 +73,8 @@ break; case R_ALPHA_REFQUAD: - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; addr += addend; if (*where != addr) @@ -81,9 +82,8 @@ break; case R_ALPHA_GLOB_DAT: - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; addr += addend; if (*where != addr) @@ -92,9 +92,8 @@ case R_ALPHA_JMP_SLOT: /* No point in lazy binding for kernel modules. */ - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 16:24:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AB0337B41B; Wed, 1 May 2002 16:24:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A03AC37B404 for ; Wed, 1 May 2002 16:24:11 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41NOBn13481 for perforce@freebsd.org; Wed, 1 May 2002 16:24:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 16:24:11 -0700 (PDT) Message-Id: <200205012324.g41NOBn13481@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10615 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10615 Change 10615 by rwatson@rwatson_curry on 2002/05/01 16:23:48 Implement MAC_SET_SOCKET_PEER_FROM_MBUF and MAC_SET_SOCKET_PEER_FROM_SOCKET for relevant policies. Generally, copy so_label from existing sockets to so_peerlabel on new ones, or m.m_pkthdr.label from mbufs to so_peerlabel of new sockets. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#33 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#27 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#24 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#26 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#33 (text+ko) ==== @@ -668,6 +668,21 @@ } static void +mac_biba_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) +{ + + mac_biba_copy_label(&mbuf->m_pkthdr.label, &socket->so_peerlabel); +} + +static void +mac_biba_set_socket_peer_from_socket(struct socket *oldsocket, + struct socket *newsocket) +{ + + mac_biba_copy_label(&oldsocket->so_label, &newsocket->so_peerlabel); +} + +static void mac_biba_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *mbuf) { @@ -1099,6 +1114,10 @@ (macop_t)mac_biba_create_socket_from_socket }, { MAC_RELABEL_SOCKET, (macop_t)mac_biba_relabel_socket }, + { MAC_SET_SOCKET_PEER_FROM_MBUF, + (macop_t)mac_biba_set_socket_peer_from_mbuf }, + { MAC_SET_SOCKET_PEER_FROM_SOCKET, + (macop_t)mac_biba_set_socket_peer_from_socket }, { MAC_CREATE_BPFDESC, (macop_t)mac_biba_create_bpfdesc }, { MAC_CREATE_IFNET, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#27 (text+ko) ==== @@ -600,6 +600,21 @@ } static void +mac_mls_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) +{ + + mac_mls_copy_label(&mbuf->m_pkthdr.label, &socket->so_peerlabel); +} + +static void +mac_mls_set_socket_peer_from_socket(struct socket *oldsocket, + struct socket *newsocket) +{ + + mac_mls_copy_label(&oldsocket->so_label, &newsocket->so_peerlabel); +} + +static void mac_mls_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *mbuf) { @@ -1032,6 +1047,10 @@ (macop_t)mac_mls_create_socket_from_socket }, { MAC_RELABEL_SOCKET, (macop_t)mac_mls_relabel_socket }, + { MAC_SET_SOCKET_PEER_FROM_MBUF, + (macop_t)mac_mls_set_socket_peer_from_mbuf }, + { MAC_SET_SOCKET_PEER_FROM_SOCKET, + (macop_t)mac_mls_set_socket_peer_from_socket }, { MAC_CREATE_BPFDESC, (macop_t)mac_mls_create_bpfdesc }, { MAC_CREATE_IFNET, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#24 (text+ko) ==== @@ -327,6 +327,21 @@ } static void +mac_none_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) +{ + + /* Initialize socket here. */ +} + +static void +mac_none_set_socket_peer_from_socket(struct socket *oldsocket, + struct socket *newsocket) +{ + + /* Initialize socket here. */ +} + +static void mac_none_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *mbuf) { @@ -646,6 +661,10 @@ (macop_t)mac_none_create_socket_from_socket }, { MAC_RELABEL_SOCKET, (macop_t)mac_none_relabel_socket }, + { MAC_SET_SOCKET_PEER_FROM_MBUF, + (macop_t)mac_none_set_socket_peer_from_mbuf }, + { MAC_SET_SOCKET_PEER_FROM_SOCKET, + (macop_t)mac_none_set_socket_peer_from_socket }, { MAC_CREATE_BPFDESC, (macop_t)mac_none_create_bpfdesc }, { MAC_CREATE_IFNET, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#26 (text+ko) ==== @@ -623,6 +623,21 @@ } static void +mac_te_create_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) +{ + + mac_te_copy_label(&mbuf->m_pkthdr.label, &socket->so_peerlabel); +} + +static void +mac_te_set_socket_peer_from_socket(struct socket *oldsocket, + struct socket *newsocket) +{ + + mac_te_copy_label(&oldsocket->so_label, &newsocket->so_peerlabel); +} + +static void mac_te_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *mbuf) { @@ -1118,6 +1133,10 @@ (macop_t)mac_te_create_socket_from_socket }, { MAC_RELABEL_SOCKET, (macop_t)mac_te_relabel_socket }, + { MAC_SET_SOCKET_PEER_FROM_MBUF, + (macop_t)mac_te_set_socket_peer_from_mbuf }, + { MAC_SET_SOCKET_PEER_FROM_SOCKET, + (macop_t)mac_te_set_socket_peer_from_socket }, { MAC_CREATE_BPFDESC, (macop_t)mac_te_create_bpfdesc }, { MAC_CREATE_IFNET, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 16:25:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FD6C37B400; Wed, 1 May 2002 16:25:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3712837B41D for ; Wed, 1 May 2002 16:25:13 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g41NPC714407 for perforce@freebsd.org; Wed, 1 May 2002 16:25:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 16:25:12 -0700 (PDT) Message-Id: <200205012325.g41NPC714407@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10616 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10616 Change 10616 by rwatson@rwatson_curry on 2002/05/01 16:24:40 Implement socket peer labeling for new unix domain socket and TCP socket connections. Note: the entry points here may change, this is a WIP. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#14 edit ... //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#13 edit ... //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#14 (text+ko) ==== @@ -739,6 +739,11 @@ sizeof(unp->unp_peercred)); unp->unp_flags |= UNP_HAVEPC; +#ifdef MAC + mac_set_socket_peer_from_socket(so, so3); + mac_set_socket_peer_from_socket(so3, so); +#endif + so2 = so3; } error = unp_connect2(so, so2); ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#13 (text+ko) ==== @@ -1149,6 +1149,9 @@ tp->t_flags &= ~TF_RCVD_CC; tcpstat.tcps_connects++; soisconnected(so); +#ifdef MAC + mac_set_socket_peer_from_mbuf(m, so); +#endif /* Do window scaling on this connection? */ if ((tp->t_flags & (TF_RCVD_SCALE|TF_REQ_SCALE)) == (TF_RCVD_SCALE|TF_REQ_SCALE)) { ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#10 (text+ko) ==== @@ -97,7 +97,8 @@ static void syncache_insert(struct syncache *, struct syncache_head *); struct syncache *syncache_lookup(struct in_conninfo *, struct syncache_head **); static int syncache_respond(struct syncache *, struct mbuf *); -static struct socket *syncache_socket(struct syncache *, struct socket *); +static struct socket *syncache_socket(struct syncache *, struct socket *, + struct mbuf *m); static void syncache_timer(void *); static u_int32_t syncookie_generate(struct syncache *); static struct syncache *syncookie_lookup(struct in_conninfo *, @@ -526,9 +527,10 @@ * Build a new TCP socket structure from a syncache entry. */ static struct socket * -syncache_socket(sc, lso) +syncache_socket(sc, lso, m) struct syncache *sc; struct socket *lso; + struct mbuf *m; { struct inpcb *inp = NULL; struct socket *so; @@ -549,6 +551,9 @@ tcpstat.tcps_listendrop++; goto abort; } +#ifdef MAC + mac_set_socket_peer_from_mbuf(m, so); +#endif inp = sotoinpcb(so); @@ -756,7 +761,7 @@ if (th->th_ack != sc->sc_iss + 1) return (0); - so = syncache_socket(sc, *sop); + so = syncache_socket(sc, *sop, m); if (so == NULL) { #if 0 resetandabort: @@ -985,7 +990,7 @@ taop != NULL && taop->tao_cc != 0 && CC_GT(to->to_cc, taop->tao_cc)) { sc->sc_rxtslot = 0; - so = syncache_socket(sc, *sop); + so = syncache_socket(sc, *sop, m); if (so != NULL) { sc->sc_flags |= SCF_KEEPROUTE; taop->tao_cc = to->to_cc; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 17:28:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28F6637B41A; Wed, 1 May 2002 17:28:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 49B1E37B416 for ; Wed, 1 May 2002 17:28:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g420STi28412 for perforce@freebsd.org; Wed, 1 May 2002 17:28:29 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Wed, 1 May 2002 17:28:29 -0700 (PDT) Message-Id: <200205020028.g420STi28412@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10617 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10617 Change 10617 by arr@arr_shibby on 2002/05/01 17:28:16 - Remove ah_error as this is a duplicate of ah_evresult Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#20 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#20 (text+ko) ==== @@ -63,7 +63,6 @@ audit_status_t ah_evresult; unsigned short ah_v; int ah_errno; - int ah_error; audit_id_t ah_id; unsigned int ah_len; /* including hdr & evinfo */ int ah_type; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 17:40:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 468E637B416; Wed, 1 May 2002 17:40:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6C9FB37B417 for ; Wed, 1 May 2002 17:40:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g420eix34446 for perforce@freebsd.org; Wed, 1 May 2002 17:40:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 17:40:44 -0700 (PDT) Message-Id: <200205020040.g420eix34446@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10618 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10618 Change 10618 by rwatson@rwatson_curry on 2002/05/01 17:39:43 mac_ifoff: a small policy module that prevents premature or inappropriate access to network interfaces. Load this in the pre-kernel loader mechanism to prevent access to the network interface before it's administratively enabled. Otherwise, network protocol stacks have a nasty habit of sending out or receiving packets on networks where you'd rather they didn't. This module makes it easier to bring up a machine "silently" on a network without pulling out the cable or network card. Affected files ... ... //depot/projects/trustedbsd/mac/sys/modules/mac_ifoff/Makefile#1 add ... //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 17:44:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B13037B417; Wed, 1 May 2002 17:43:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F2C1737B404 for ; Wed, 1 May 2002 17:43:48 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g420hmh34827 for perforce@freebsd.org; Wed, 1 May 2002 17:43:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 17:43:48 -0700 (PDT) Message-Id: <200205020043.g420hmh34827@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10620 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10620 Change 10620 by rwatson@rwatson_curry on 2002/05/01 17:42:55 Add a sysctl/tunable to exempt BPF reception from the mac_ifoff policy. This makes it possible to have the module loaded to "silence" the outgoing stack, yet still use BPF to monitor the interface. Some caution should be used when combing this with applications that use BPF, such as dhclient. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#2 (text+ko) ==== @@ -89,6 +89,12 @@ &mac_ifoff_other_enabled, 0, "Enable other interfaces"); TUNABLE_INT("security.mac.ifoff.other_enabled", &mac_ifoff_other_enabled); +static int mac_ifoff_bpfrecv_enabled = 0; +SYSCTL_INT(_security_mac_ifoff, OID_AUTO, bpfrecv_enabled, CTLFLAG_RW, + &mac_ifoff_bpfrecv_enabled, 0, "Enable BPF reception even when interface " + "is disabled"); +TUNABLE_INT("security.mac.ifoff.bpfrecv.enabled", &mac_ifoff_bpfrecv_enabled); + int check_ifnet_outgoing(struct ifnet *ifnet) { @@ -106,7 +112,7 @@ } int -check_ifnet_incoming(struct ifnet *ifnet) +check_ifnet_incoming(struct ifnet *ifnet, int viabpf) { if (mac_ifoff_enabled == 0) return (0); @@ -117,6 +123,9 @@ if (mac_ifoff_other_enabled && ifnet->if_type != IFT_LOOP) return (0); + if (isbpf && mac_ifoff_bpfrecv_enabled) + return (0); + return (EPERM); } @@ -132,7 +141,7 @@ struct ifnet *ifnet) { - return (check_ifnet_incoming(ifnet)); + return (check_ifnet_incoming(ifnet, 1)); } mac_ifoff_socket_check_receive_mbuf(struct socket *so, struct mbuf *m) @@ -140,7 +149,7 @@ if (m->m_flags & M_PKTHDR) { if (m->m_pkthdr.rcvif != NULL) - return (check_ifnet_incoming(ifnet)); + return (check_ifnet_incoming(ifnet, 0)); } return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 18:11:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1015B37B416; Wed, 1 May 2002 18:11:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 238A637B404 for ; Wed, 1 May 2002 18:11:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g421BSN41459 for perforce@freebsd.org; Wed, 1 May 2002 18:11:28 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Wed, 1 May 2002 18:11:28 -0700 (PDT) Message-Id: <200205020111.g421BSN41459@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10621 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10621 Change 10621 by arr@arr_shibby on 2002/05/01 18:10:40 Create AUDIT_SET_SUBJECT macro to decrease code clutter when labeling the subject of a generated audit record. Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#21 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#21 (text+ko) ==== @@ -125,6 +125,13 @@ #define AUD_UNLINK 17 #define AUD_UTIME 18 +#define AUDIT_SET_SUBJECT(subj, euid, ruid, gid, pid) do { \ + (subj)->as_euid = (euid); \ + (subj)->as_gid = (gid); \ + (subj)->as_uid = (ruid); \ + (subj)->as_pid = (pid); \ +} while (0) + struct chmod_info { char ci_path[MAXPATHLEN]; mode_t ci_mode; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 18:36: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 972E237B405; Wed, 1 May 2002 18:35:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D91B637B41A for ; Wed, 1 May 2002 18:35:58 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g421Zwk44410 for perforce@freebsd.org; Wed, 1 May 2002 18:35:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 18:35:58 -0700 (PDT) Message-Id: <200205020135.g421Zwk44410@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10622 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10622 Change 10622 by rwatson@rwatson_curry on 2002/05/01 18:35:03 Typo fix. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#27 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#27 (text+ko) ==== @@ -610,7 +610,7 @@ mac_te_create_object_from_object(&oldsocket->so_label, &newsocket->so_label); - mac_te_create_object_from_objsect(&oldsocket->so_peerlabel, + mac_te_create_object_from_object(&oldsocket->so_peerlabel, &newsocket->so_peerlabel); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 18:37: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 630C337B41C; Wed, 1 May 2002 18:37:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8DC0037B41B for ; Wed, 1 May 2002 18:37:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g421b0i44567 for perforce@freebsd.org; Wed, 1 May 2002 18:37:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 18:37:00 -0700 (PDT) Message-Id: <200205020137.g421b0i44567@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10623 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10623 Change 10623 by rwatson@rwatson_curry on 2002/05/01 18:36:02 Another typo fix. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#28 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#28 (text+ko) ==== @@ -623,7 +623,7 @@ } static void -mac_te_create_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) +mac_te_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) { mac_te_copy_label(&mbuf->m_pkthdr.label, &socket->so_peerlabel); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 18:43:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 946F537B400; Wed, 1 May 2002 18:43:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C033237B416 for ; Wed, 1 May 2002 18:43:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g421h8j45294 for perforce@freebsd.org; Wed, 1 May 2002 18:43:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 18:43:08 -0700 (PDT) Message-Id: <200205020143.g421h8j45294@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10625 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10625 Change 10625 by rwatson@rwatson_curry on 2002/05/01 18:42:52 Un-static-ize two functions that were not meant to be static. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#133 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#133 (text+ko) ==== @@ -1285,14 +1285,14 @@ MAC_PERFORM(relabel_socket, cred, socket, newlabel); } -static void +void mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) { MAC_PERFORM(set_socket_peer_from_mbuf, mbuf, socket); } -static void +void mac_set_socket_peer_from_socket(struct socket *oldsocket, struct socket *newsocket) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 18:47:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C83E337B404; Wed, 1 May 2002 18:47:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F27EE37B41D for ; Wed, 1 May 2002 18:47:13 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g421lDE45822 for perforce@freebsd.org; Wed, 1 May 2002 18:47:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 18:47:13 -0700 (PDT) Message-Id: <200205020147.g421lDE45822@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10626 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10626 Change 10626 by rwatson@rwatson_curry on 2002/05/01 18:46:55 Connect mac_ifoff to the build. Affected files ... ... //depot/projects/trustedbsd/mac/sys/modules/Makefile#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#17 (text+ko) ==== @@ -51,6 +51,7 @@ lnc \ lpt \ mac_bsdextended \ + mac_ifoff \ mac_none \ mac_seeotheruids \ md \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 18:56:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41CE537B41C; Wed, 1 May 2002 18:56:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7389937B404 for ; Wed, 1 May 2002 18:56:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g421uPV46832 for perforce@freebsd.org; Wed, 1 May 2002 18:56:25 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Wed, 1 May 2002 18:56:25 -0700 (PDT) Message-Id: <200205020156.g421uPV46832@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 10627 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10627 Change 10627 by mini@mini_stylus on 2002/05/01 18:56:22 Don't include , it has been replaced with uma. Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#41 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#41 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include #include -#include /*static MALLOC_DEFINE(M_PROC, "proc", "Proc structures"); */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 19: 1:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6B4637B41B; Wed, 1 May 2002 19:01:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DE2AC37B41A for ; Wed, 1 May 2002 19:01:31 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4221VA47538 for perforce@freebsd.org; Wed, 1 May 2002 19:01:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 19:01:31 -0700 (PDT) Message-Id: <200205020201.g4221VA47538@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10628 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10628 Change 10628 by rwatson@rwatson_curry on 2002/05/01 19:01:20 Don't #ifdef MAC this module: since it's only included as a module, it can assume MAC. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#3 (text+ko) ==== @@ -68,8 +68,6 @@ #include #include -#ifdef MAC - SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, ifoff, CTLFLAG_RW, 0, @@ -167,5 +165,3 @@ }; MAC_POLICY_SET(mac_ifoff_ops, trustedbsd_mac_ifoff, "TrustedBSD MAC/ifoff", 0); - -#endif /* !MAC */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 19: 7:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6ABC137B41C; Wed, 1 May 2002 19:07:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A468E37B41A for ; Wed, 1 May 2002 19:07:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4227d651865 for perforce@freebsd.org; Wed, 1 May 2002 19:07:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 19:07:39 -0700 (PDT) Message-Id: <200205020207.g4227d651865@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10629 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10629 Change 10629 by rwatson@rwatson_curry on 2002/05/01 19:07:37 Various type, variable name, etc, fixes due to a poor merge from a local tree. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#4 (text+ko) ==== @@ -93,11 +93,11 @@ "is disabled"); TUNABLE_INT("security.mac.ifoff.bpfrecv.enabled", &mac_ifoff_bpfrecv_enabled); -int +static int check_ifnet_outgoing(struct ifnet *ifnet) { - if (mac_ifoff_enabled == 0) + if (!mac_ifoff_enabled) return (0); if (mac_ifoff_lo_enabled && ifnet->if_type == IFT_LOOP) @@ -109,10 +109,10 @@ return (EPERM); } -int +static int check_ifnet_incoming(struct ifnet *ifnet, int viabpf) { - if (mac_ifoff_enabled == 0) + if (!mac_ifoff_enabled) return (0); if (mac_ifoff_lo_enabled && ifnet->if_type == IFT_LOOP) @@ -121,7 +121,7 @@ if (mac_ifoff_other_enabled && ifnet->if_type != IFT_LOOP) return (0); - if (isbpf && mac_ifoff_bpfrecv_enabled) + if (viabpf && mac_ifoff_bpfrecv_enabled) return (0); return (EPERM); @@ -142,12 +142,13 @@ return (check_ifnet_incoming(ifnet, 1)); } +static int mac_ifoff_socket_check_receive_mbuf(struct socket *so, struct mbuf *m) { if (m->m_flags & M_PKTHDR) { if (m->m_pkthdr.rcvif != NULL) - return (check_ifnet_incoming(ifnet, 0)); + return (check_ifnet_incoming(m->m_pkthdr.rcvif, 0)); } return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 19:12:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 753BB37B41A; Wed, 1 May 2002 19:12:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B77FC37B417 for ; Wed, 1 May 2002 19:12:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g422Ckj52889 for perforce@freebsd.org; Wed, 1 May 2002 19:12:46 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Wed, 1 May 2002 19:12:46 -0700 (PDT) Message-Id: <200205020212.g422Ckj52889@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 10631 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10631 Change 10631 by mini@mini_stylus on 2002/05/01 19:12:26 Ooops. Do other half of previous commit: actually convert to uma. Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#42 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#42 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include +#include #include /*static MALLOC_DEFINE(M_PROC, "proc", "Proc structures"); */ @@ -54,7 +55,7 @@ /* * Thread related storage */ -static vm_zone_t thread_zone; +static uma_zone_t thread_zone; /* The cache of available threads */ static tdlist_head_t free_threads; @@ -88,7 +89,8 @@ threadinit(void) { - thread_zone = zinit("THREAD", sizeof (struct thread), 0, 0, 2); + thread_zone = uma_zcreate("THREAD", sizeof (struct thread), NULL, + NULL, NULL, NULL, UMA_ALIGN_CACHE, 0); TAILQ_INIT(&free_threads); } @@ -130,7 +132,7 @@ #endif /* put the thread back in the zone */ - zfree(thread_zone, td); + uma_zfree(thread_zone, td); } } @@ -152,7 +154,7 @@ /* Probably should clean up stuff here */ } else { /* allocate the thread structure itself */ - td = zalloc(thread_zone); + td = uma_zalloc(thread_zone, M_WAITOK); /* assuming we got one, allocate pages for the stack it needs */ if (td) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 19:14:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59B2E37B404; Wed, 1 May 2002 19:14:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 98FAB37B400 for ; Wed, 1 May 2002 19:14:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g422EnR53324 for perforce@freebsd.org; Wed, 1 May 2002 19:14:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 19:14:49 -0700 (PDT) Message-Id: <200205020214.g422EnR53324@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10632 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10632 Change 10632 by rwatson@rwatson_curry on 2002/05/01 19:13:51 Expose the basic security.mac.ifoff.enabled sysctl as a tunable. Why you'd load this module before booting the kernel and not mean it, I'm not sure, but I guess I needed to for debugging purposes, so why not share. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#5 (text+ko) ==== @@ -76,6 +76,7 @@ static int mac_ifoff_enabled = 1; SYSCTL_INT(_security_mac_ifoff, OID_AUTO, enabled, CTLFLAG_RW, &mac_ifoff_enabled, 0, "Enforce ifoff policy"); +TUNABLE_INT("security.mac.ifoff.enabled", &mac_ifoff_enabled); static int mac_ifoff_lo_enabled = 1; SYSCTL_INT(_security_mac_ifoff, OID_AUTO, lo_enabled, CTLFLAG_RW, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 20:34:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AB1837B419; Wed, 1 May 2002 20:32:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 43E4137B404 for ; Wed, 1 May 2002 20:32:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g423WNV65224 for perforce@freebsd.org; Wed, 1 May 2002 20:32:23 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 1 May 2002 20:32:23 -0700 (PDT) Message-Id: <200205020332.g423WNV65224@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10635 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10635 Change 10635 by peter@peter_daintree on 2002/05/01 20:32:15 IFC @10634 Affected files ... ... //depot/projects/ia64/contrib/gcc.295/config/i386/freebsd.h#5 integrate ... //depot/projects/ia64/contrib/gcc.295/config/mips/abi64.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/bsd-4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/bsd-5.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/cross64.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/dec-bsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/dec-osf1.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/ecoff.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/ecoffl.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/elf.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/elf64.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/elfl.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/elfl64.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/elflorion.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/elforion.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/gnu.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/iris3.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/iris4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/iris4loser.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/iris5.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/iris5gas.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/iris6.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/linux.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/mips-5.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/mips.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/mips.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/mips.md#3 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/mips16.S#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/netbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/news4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/news5.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/nws3250v4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/osfrose.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/r3900.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/rtems64.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/sni-gas.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/sni-svr4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/svr3-4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/svr3-5.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/svr4-4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/svr4-5.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/svr4-t.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-bsd#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-bsd-gas#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-cross64#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-ecoff#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-elf#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-iris6#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-mips#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-mips-gas#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-osfrose#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-r3900#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-svr3#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-svr3-gas#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-svr4#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/t-svr4-gas#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/vxworks.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/x-dec-osf1#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/x-iris#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/x-iris3#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/x-iris6#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/x-mips#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/x-netbsd#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/x-nws3250v4#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/x-osfrose#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/x-sni-svr4#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/x-sony#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/x-sysv#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/xm-iris3.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/xm-iris4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/xm-iris5.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/xm-iris6.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/xm-mips.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/xm-news.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/xm-nws3250v4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/xm-sysv.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/mips/xm-sysv4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/g++spec.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/integrate.c#2 integrate ... //depot/projects/ia64/contrib/gcc.295/stmt.c#2 integrate ... //depot/projects/ia64/crypto/openssh/ssh_config#4 integrate ... //depot/projects/ia64/crypto/openssh/sshd_config#5 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#4 integrate ... //depot/projects/ia64/sbin/fsck_ffs/fsutil.c#4 integrate ... //depot/projects/ia64/sbin/fsck_ffs/pass5.c#4 integrate ... //depot/projects/ia64/sys/conf/kmod.mk#8 integrate ... //depot/projects/ia64/sys/dev/isp/isp.c#7 integrate ... //depot/projects/ia64/sys/dev/mii/acphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/qsphy.c#4 integrate ... //depot/projects/ia64/sys/dev/tx/if_tx.c#2 integrate ... //depot/projects/ia64/sys/i386/acpica/Makefile#2 integrate ... //depot/projects/ia64/sys/i386/acpica/genwakecode.sh#1 branch ... //depot/projects/ia64/sys/i386/conf/NOTES#14 integrate ... //depot/projects/ia64/sys/ia64/ia64/mca.c#2 integrate ... //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#12 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#17 integrate ... //depot/projects/ia64/sys/kern/kern_malloc.c#9 integrate ... //depot/projects/ia64/sys/kern/kern_sig.c#11 integrate ... //depot/projects/ia64/sys/kern/subr_log.c#2 integrate ... //depot/projects/ia64/sys/kern/sys_pipe.c#12 integrate ... //depot/projects/ia64/sys/kern/tty.c#9 integrate ... //depot/projects/ia64/sys/kern/uipc_socket.c#10 integrate ... //depot/projects/ia64/sys/kern/uipc_socket2.c#8 integrate ... //depot/projects/ia64/sys/net/bpf.c#7 integrate ... //depot/projects/ia64/sys/net/if_tap.c#8 integrate ... //depot/projects/ia64/sys/net/if_tun.c#5 integrate ... //depot/projects/ia64/sys/net/rtsock.c#6 integrate ... //depot/projects/ia64/sys/netinet/accf_data.c#3 integrate ... //depot/projects/ia64/sys/netinet/accf_http.c#3 integrate ... //depot/projects/ia64/sys/netinet/tcp_input.c#11 integrate ... //depot/projects/ia64/sys/netkey/keysock.c#6 integrate ... //depot/projects/ia64/sys/sys/proc.h#14 integrate ... //depot/projects/ia64/sys/sys/signalvar.h#6 integrate ... //depot/projects/ia64/sys/sys/socketvar.h#12 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#12 integrate ... //depot/projects/ia64/sys/vm/uma_dbg.c#2 integrate ... //depot/projects/ia64/sys/vm/uma_dbg.h#2 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#11 integrate ... //depot/projects/ia64/sys/vm/vm_map.h#9 integrate ... //depot/projects/ia64/usr.bin/m4/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/m4/eval.c#3 integrate ... //depot/projects/ia64/usr.bin/m4/expr.c#4 integrate ... //depot/projects/ia64/usr.bin/m4/gnum4.c#2 integrate ... //depot/projects/ia64/usr.bin/m4/look.c#3 integrate ... //depot/projects/ia64/usr.bin/m4/main.c#3 integrate ... //depot/projects/ia64/usr.bin/m4/misc.c#3 integrate ... //depot/projects/ia64/usr.bin/m4/trace.c#2 integrate ... //depot/projects/ia64/usr.bin/xargs/strnsubst.c#2 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.c#7 integrate ... //depot/projects/ia64/usr.sbin/ppp/command.c#6 integrate ... //depot/projects/ia64/usr.sbin/ppp/fsm.c#4 integrate ... //depot/projects/ia64/usr.sbin/ppp/lcp.c#5 integrate Differences ... ==== //depot/projects/ia64/contrib/gcc.295/config/i386/freebsd.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* Definitions for Intel 386 running FreeBSD with either a.out or ELF format - Copyright (C) 1996-2000 Free Software Foundation, Inc. + Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc. Contributed by Eric Youngdale. Modified for stabs-in-ELF by H.J. Lu. Adapted from GNU/Linux version by John Polstra. @@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.43 2002/04/24 04:21:41 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.44 2002/05/01 19:20:37 obrien Exp $ */ #undef CPP_PREDEFINES #define CPP_PREDEFINES \ @@ -38,7 +38,7 @@ #undef ASM_SPEC #define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" -#undef ASM_FINAL_SPEC +#undef ASM_FINAL_SPEC #define ASM_FINAL_SPEC "%|" /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support @@ -49,9 +49,6 @@ have the time to search for those flags. I am sure how to add support for -soname shared_object_name. H.J. - I took out %{v:%{!V:-V}}. It is too much :-(. They can use - -Wl,-V. - When the -shared link option is used a final link is not being done. */ @@ -64,14 +61,19 @@ %{assert*} %{R*}} \ %{!maout: \ %{Wl,*:%*} \ + %{v:-V} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ %{shared:-Bshareable %{h*} %{soname*}} \ - %{symbolic:-Bsymbolic} \ %{!shared: \ %{!static: \ %{rdynamic: -export-dynamic} \ %{!dynamic-linker: -dynamic-linker /usr/libexec/ld-elf.so.1}} \ - %{static:-Bstatic}}}" + %{static:-Bstatic}} \ + %{symbolic:-Bsymbolic}}" + +/* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical + crtbegin.o file (see crtstuff.c) which provides part of the support for + getting C++ file-scope static object constructed before entering `main'. */ #undef STARTFILE_SPEC #define STARTFILE_SPEC "\ @@ -86,10 +88,12 @@ %{!pg: \ %{p:gcrt1.o%s} \ %{!p:crt1.o%s}}} \ - crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}" + crti.o%s \ + %{!shared:crtbegin.o%s} \ + %{shared:crtbeginS.o%s}}" /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. Here we tack on our - own magical crtend.o file (compare w/crtstuff.c) which provides part of the + own magical crtend.o file (see crtstuff.c) which provides part of the support for getting C++ file-scope static object constructed before entering `main', followed by the normal "finalizer" file, `crtn.o'. */ @@ -102,20 +106,23 @@ /************************[ Target stuff ]***********************************/ -/* Define the actual types of some ANSI-mandated types. +/* Define the actual types of some ANSI-mandated types. Needs to agree with . GCC defaults come from c-decl.c, c-common.c, and config//.h. */ -#undef SIZE_TYPE +#undef SIZE_TYPE #define SIZE_TYPE "unsigned int" - -#undef PTRDIFF_TYPE + +#undef PTRDIFF_TYPE #define PTRDIFF_TYPE "int" +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE BITS_PER_WORD + /* This is the pseudo-op used to generate a 32-bit word of data with a specific value in some section. */ -#undef INT_ASM_OP +#undef INT_ASM_OP #define INT_ASM_OP ".long" /* Biggest alignment supported by the object file format of this @@ -151,27 +158,23 @@ #define TARGET_DEFAULT \ (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) -/* Prefix for internally generated assembler labels. If we aren't using - underscores, we are using prefix `.'s to identify labels that should - be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ -#undef LPREFIX -#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") +/* Don't default to pcc-struct-return, we want to retain compatibility with + older gcc versions AND pcc-struct-return is nonreentrant. + (even though the SVR4 ABI for the i386 says that records and unions are + returned in memory). */ + +#undef DEFAULT_PCC_STRUCT_RETURN +#define DEFAULT_PCC_STRUCT_RETURN 0 /* The a.out tools do not support "linkonce" sections. */ #undef SUPPORTS_ONE_ONLY #define SUPPORTS_ONE_ONLY TARGET_ELF -/* Enable alias attribute support. */ -#undef SET_ASM_OP -#define SET_ASM_OP ".set" - -/* The a.out tools do not support "Lscope" .stabs symbols. */ -#undef NO_DBX_FUNCTION_END -#define NO_DBX_FUNCTION_END TARGET_AOUT - -/* In ELF, the function stabs come first, before the relative offsets. */ -#undef DBX_FUNCTION_FIRST -#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF +/* Prefix for internally generated assembler labels. If we aren't using + underscores, we are using prefix `.'s to identify labels that should + be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ +#undef LPREFIX +#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") /* supply our own hook for calling __main() from main() */ #undef INVOKE__main @@ -255,11 +258,19 @@ /************************[ Assembler stuff ]********************************/ +/* Override the default comment-starter of "/" from unix.h. */ +#undef ASM_COMMENT_START +#define ASM_COMMENT_START "#" + #undef ASM_APP_ON #define ASM_APP_ON "#APP\n" #undef ASM_APP_OFF -#define ASM_APP_OFF "#NO_APP\n" +#define ASM_APP_OFF "#NO_APP\n" + +/* Enable alias attribute support. */ +#undef SET_ASM_OP +#define SET_ASM_OP ".set" /* This is how to begin an assembly language file. The .file command should always begin the output. @@ -274,8 +285,8 @@ } while (0) /* This is how to store into the string BUF - the symbol_ref name of an internal numbered label where - PREFIX is the class of label and NUM is the number within the class. + the symbol_ref name of an internal numbered label where + PREFIX is the class of label and NUM is the number within the class. This is suitable for output with `assemble_name'. */ #undef ASM_GENERATE_INTERNAL_LABEL #define ASM_GENERATE_INTERNAL_LABEL(BUF, PREFIX, NUMBER) \ @@ -405,7 +416,6 @@ } \ } while (0) - #undef ASM_OUTPUT_SOURCE_LINE #define ASM_OUTPUT_SOURCE_LINE(FILE, LINE) \ do { \ @@ -503,10 +513,10 @@ } while (0) /* Switch into a generic section. - + We make the section read-only and executable for a function decl, read-only for a const data decl, and writable for a non-const data decl. - + If the section has already been defined, we must not emit the attributes here. The SVR4 assembler does not recognize section redefinitions. @@ -666,13 +676,21 @@ some don't. *OLD* GAS requires the %cl argument, so override i386/unix.h. */ - + #undef AS3_SHIFT_DOUBLE #define AS3_SHIFT_DOUBLE(a,b,c,d) AS3 (a,b,c,d) /************************[ Debugger stuff ]*********************************/ +/* The a.out tools do not support "Lscope" .stabs symbols. */ +#undef NO_DBX_FUNCTION_END +#define NO_DBX_FUNCTION_END TARGET_AOUT + +/* In ELF, the function stabs come first, before the relative offsets. */ +#undef DBX_FUNCTION_FIRST +#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF + /* Copy this from the svr4 specifications... */ /* Define the register numbers to be used in Dwarf debugging information. The SVR4 reference port C compiler uses the following register numbers ==== //depot/projects/ia64/contrib/gcc.295/cp/g++spec.c#2 (text+ko) ==== @@ -18,6 +18,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc.295/cp/g++spec.c,v 1.3 2002/05/01 20:04:18 obrien Exp $ */ + #include "config.h" #include "system.h" @@ -31,10 +33,16 @@ #ifndef MATH_LIBRARY #define MATH_LIBRARY "-lm" #endif +#ifndef MATH_LIBRARY_PROFILE +#define MATH_LIBRARY_PROFILE "-lm" +#endif #ifndef LIBSTDCXX #define LIBSTDCXX "-lstdc++" #endif +#ifndef LIBSTDCXX_PROFILE +#define LIBSTDCXX_PROFILE "-lstdc++" +#endif void lang_specific_driver (fn, in_argc, in_argv, in_added_libraries) @@ -45,6 +53,9 @@ { int i, j; + /* If non-zero, the user gave us the `-p' or `-pg' flag. */ + int saw_profile_flag = 0; + /* If non-zero, the user gave us the `-v' flag. */ int saw_verbose_flag = 0; @@ -135,6 +146,8 @@ } else if (strcmp (argv[i], "-lc") == 0) args[i] |= WITHLIBC; + else if (strcmp (argv[i], "-pg") == 0 || strcmp (argv[i], "-p") == 0) + saw_profile_flag++; else if (strcmp (argv[i], "-v") == 0) { saw_verbose_flag = 1; @@ -236,14 +249,14 @@ /* Add `-lstdc++' if we haven't already done so. */ if (library) { - arglist[j++] = LIBSTDCXX; + arglist[j++] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX; added_libraries++; } if (saw_math) arglist[j++] = saw_math; else if (library && need_math) { - arglist[j++] = MATH_LIBRARY; + arglist[j++] = saw_profile_flag ? MATH_LIBRARY_PROFILE : MATH_LIBRARY; added_libraries++; } if (saw_libc) ==== //depot/projects/ia64/contrib/gcc.295/integrate.c#2 (text+ko) ==== @@ -19,6 +19,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc.295/integrate.c,v 1.2 2002/05/01 19:40:55 obrien Exp $ */ + #include "config.h" #include "system.h" @@ -1608,6 +1610,20 @@ if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_NEEDS_CONTEXT) static_chain_value = lookup_static_chain (fndecl); + /* If the inline function has these flags sets, that means that + coresponding global flags should be set for this function. */ + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_CALLS_SETJMP) + current_function_calls_setjmp = 1; + + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_CALLS_LONGJMP) + current_function_calls_longjmp = 1; + + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_HAS_NONLOCAL_LABEL) + current_function_has_nonlocal_label = 1; + + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_USES_CONST_POOL) + current_function_uses_const_pool = 1; + if (GET_CODE (parm_insns) == NOTE && NOTE_LINE_NUMBER (parm_insns) > 0) { ==== //depot/projects/ia64/contrib/gcc.295/stmt.c#2 (text+ko) ==== @@ -19,6 +19,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc.295/stmt.c,v 1.2 2002/05/01 19:40:55 obrien Exp $ */ + /* This file handles the generation of rtl code from tree structure above the level of expressions, using subroutines in exp*.c and emit-rtl.c. @@ -4027,6 +4029,10 @@ cleanup = protect_with_terminate (cleanup); expand_eh_region_end (cleanup); } + else + { + do_pending_stack_adjust(); + } } if (reachable) ==== //depot/projects/ia64/crypto/openssh/ssh_config#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $OpenBSD: ssh_config,v 1.12 2002/01/16 17:55:33 stevesk Exp $ -# $FreeBSD: src/crypto/openssh/ssh_config,v 1.11 2002/04/02 21:53:54 des Exp $ +# $FreeBSD: src/crypto/openssh/ssh_config,v 1.12 2002/05/01 22:39:53 obrien Exp $ # This is the ssh client system-wide configuration file. See ssh(1) # for more information. This file provides defaults for users, and ==== //depot/projects/ia64/crypto/openssh/sshd_config#5 (text+ko) ==== @@ -1,5 +1,5 @@ # $OpenBSD: src/usr.bin/ssh/sshd_config,v 1.48 2002/02/19 02:50:59 deraadt Exp $ -# $FreeBSD: src/crypto/openssh/sshd_config,v 1.21 2002/04/25 16:50:35 des Exp $ +# $FreeBSD: src/crypto/openssh/sshd_config,v 1.22 2002/05/01 22:39:53 obrien Exp $ # This is the sshd server system-wide configuration file. See sshd(8) # for more information. ==== //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.14 2002/04/04 19:36:33 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/freebsd-native.h,v 1.15 2002/05/01 19:19:22 obrien Exp $ */ /* FREEBSD_NATIVE is defined when gcc is integrated into the FreeBSD source tree so it can be configured appropriately without using @@ -42,7 +42,9 @@ /* For the native system compiler, we actually build libgcc in a profiled version. So we should use it with -pg. */ -#define LIBGCC_SPEC "%{!pg: -lgcc} %{pg: -lgcc_p}" +#define LIBGCC_SPEC "%{!pg: -lgcc} %{pg: -lgcc_p}" +#define LIBSTDCXX_PROFILE "-lstdc++_p" +#define MATH_LIBRARY_PROFILE "-lm_p" /* FreeBSD is 4.4BSD derived */ #define bsd4_4 ==== //depot/projects/ia64/sbin/fsck_ffs/fsutil.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.10 2002/03/20 22:57:09 imp Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.11 2002/05/02 01:03:06 mckusick Exp $"; #endif /* not lint */ #include @@ -195,7 +195,6 @@ getblk(bp, blkno, size); /* fall through */ foundit: - totalreads++; bp->b_prev->b_next = bp->b_next; bp->b_next->b_prev = bp->b_prev; bp->b_prev = &bufhead; @@ -211,6 +210,7 @@ { ufs_daddr_t dblk; + totalreads++; dblk = fsbtodb(&sblock, blk); if (bp->b_bno != dblk) { flush(fswritefd, bp); ==== //depot/projects/ia64/sbin/fsck_ffs/pass5.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)pass5.c 8.9 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.25 2002/03/20 22:57:09 imp Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.26 2002/05/02 01:03:06 mckusick Exp $"; #endif /* not lint */ #include @@ -186,7 +186,7 @@ dmax = fs->fs_size; newcg->cg_time = cg->cg_time; newcg->cg_cgx = c; - if (c == fs->fs_ncg - 1) + if (c == fs->fs_ncg - 1 && fs->fs_ncyl % fs->fs_cpg > 0) newcg->cg_ncyl = fs->fs_ncyl % fs->fs_cpg; else newcg->cg_ncyl = fs->fs_cpg; ==== //depot/projects/ia64/sys/conf/kmod.mk#8 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.122 2002/05/01 03:28:14 obrien Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.123 2002/05/01 19:24:26 imp Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -170,6 +170,9 @@ .endif .endif +.if !exists(/usr/sbin/kldxref) +NO_XREF=yes +.endif _ILINKS=@ machine @@ -257,9 +260,7 @@ done; true .endif .if !defined(NO_XREF) - @echo "FAILURES HERE ARE OK" -kldxref ${DESTDIR}${KMODDIR} - @echo "END OF SECTION WHERE FAILURES ARE OK" .endif .endif @@ -345,5 +346,4 @@ .endif .include - .include ==== //depot/projects/ia64/sys/dev/isp/isp.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.92 2002/04/16 19:55:35 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.93 2002/05/01 21:58:36 mjacob Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -107,6 +107,8 @@ static const char sc2[] = "%s CHAN %d TGT %d FLAGS 0x%x 0x%x/0x%x"; static const char sc3[] = "Generated"; static const char sc4[] = "NVRAM"; +static const char bun[] = + "bad underrun for %d.%d (count %d, resid %d, status %s)"; /* * Local function prototypes. @@ -4397,11 +4399,25 @@ break; case RQCS_DATA_UNDERRUN: + { + if (IS_FC(isp)) { + int ru_marked = (sp->req_scsi_status & RQCS_RU) != 0; + if (!ru_marked || sp->req_resid > XS_XFRLEN(xs)) { + isp_prt(isp, ISP_LOGWARN, bun, XS_TGT(xs), + XS_LUN(xs), XS_XFRLEN(xs), sp->req_resid, + (ru_marked)? "marked" : "not marked"); + if (XS_NOERR(xs)) { + XS_SETERR(xs, HBA_BOTCH); + } + return; + } + } XS_RESID(xs) = sp->req_resid; if (XS_NOERR(xs)) { XS_SETERR(xs, HBA_NOERROR); } return; + } case RQCS_XACT_ERR1: isp_prt(isp, ISP_LOGERR, xact1, XS_CHANNEL(xs), @@ -4424,8 +4440,8 @@ case RQCS_QUEUE_FULL: isp_prt(isp, ISP_LOGDEBUG0, - "internal queues full for %d.%d.%d status 0x%x", XS_TGT(xs), - XS_LUN(xs), XS_CHANNEL(xs), *XS_STSP(xs)); + "internal queues full for %d.%d.%d status 0x%x", + XS_CHANNEL(xs), XS_TGT(xs), XS_LUN(xs), *XS_STSP(xs)); /* * If QFULL or some other status byte is set, then this @@ -4507,13 +4523,14 @@ */ if ((sp->req_completion_status & 0xff) == RQCS_PORT_UNAVAILABLE) isp_prt(isp, ISP_LOGINFO, - "Port Unavailable for target %d", XS_TGT(xs)); + "port unavailable for target %d", XS_TGT(xs)); else isp_prt(isp, ISP_LOGINFO, "port logout for target %d", XS_TGT(xs)); /* * If we're on a local loop, force a LIP (which is overkill) - * to force a re-login of this unit. + * to force a re-login of this unit. If we're on fabric, + * then we'll have to relogin as a matter of course. */ if (FCPARAM(isp)->isp_topo == TOPO_NL_PORT || FCPARAM(isp)->isp_topo == TOPO_FL_PORT) { @@ -4933,8 +4950,8 @@ ISPOPMAP(0x00, 0x00), /* 0x58: */ ISPOPMAP(0x00, 0x00), /* 0x59: */ ISPOPMAP(0x00, 0x00), /* 0x5a: */ - ISPOPMAP(0x00, 0x00), /* 0x5b: */ - ISPOPMAP(0x00, 0x00), /* 0x5c: */ + ISPOPMAP(0x03, 0x01), /* 0x5b: MBOX_DRIVER_HEARTBEAT */ + ISPOPMAP(0xcf, 0x01), /* 0x5c: MBOX_FW_HEARTBEAT */ ISPOPMAP(0x07, 0x03), /* 0x5d: MBOX_GET_SET_DATA_RATE */ ISPOPMAP(0x00, 0x00), /* 0x5e: */ ISPOPMAP(0x00, 0x00), /* 0x5f: */ ==== //depot/projects/ia64/sys/dev/mii/acphy.c#4 (text+ko) ==== @@ -89,7 +89,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/acphy.c,v 1.7 2002/04/29 13:07:31 phk Exp $"; + "$FreeBSD: src/sys/dev/mii/acphy.c,v 1.8 2002/05/01 19:15:54 semenu Exp $"; #endif static int acphy_probe (device_t); @@ -176,33 +176,31 @@ struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; + /* + * If we're not selected, then do nothing, just isolate and power + * down, if changing media. + */ + if (IFM_INST(ife->ifm_media) != sc->mii_inst) { + if (cmd == MII_MEDIACHG) { + reg = PHY_READ(sc, MII_BMCR); + PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO | BMCR_PDOWN); + } + + return (0); + } + switch (cmd) { case MII_POLLSTAT: - /* - * If we're not polling our PHY instance, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); break; case MII_MEDIACHG: /* - * If the media indicates a different PHY instance, - * isolate ourselves. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) { - reg = PHY_READ(sc, MII_BMCR); - PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO | BMCR_PDOWN); - return (0); - } - - /* * If the interface is not up, don't do anything. */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) break; - /* Wake & deisolate up is needed */ + /* Wake & deisolate up if necessary */ reg = PHY_READ(sc, MII_BMCR); if (reg & (BMCR_ISO | BMCR_PDOWN)) PHY_WRITE(sc, MII_BMCR, reg & ~(BMCR_ISO | BMCR_PDOWN)); @@ -230,12 +228,6 @@ case MII_TICK: /* - * If we're not currently selected, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); - - /* * Is the interface even up? */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) @@ -248,23 +240,8 @@ break; /* - * check for link. - * Read the status register twice; BMSR_LINK is latch-low. + * This PHY's autonegotiation doesn't need to be kicked. */ - reg = PHY_READ(sc, MII_BMSR) | PHY_READ(sc, MII_BMSR); - if (reg & BMSR_LINK) - break; - - /* - * Only retry autonegotiation every 5 seconds. - */ - if (++sc->mii_ticks != 5) - return (0); - - sc->mii_ticks = 0; - acphy_reset(sc); - if (mii_phy_auto(sc, 0) == EJUSTRETURN) - return (0); break; } @@ -308,8 +285,7 @@ mii->mii_media_active |= IFM_NONE; return; } - diag = PHY_READ(sc, MII_ACPHY_DIAG) | - PHY_READ(sc, MII_ACPHY_DIAG); + diag = PHY_READ(sc, MII_ACPHY_DIAG); if (diag & AC_DIAG_SPEED) mii->mii_media_active |= IFM_100_TX; else ==== //depot/projects/ia64/sys/dev/mii/qsphy.c#4 (text+ko) ==== @@ -93,7 +93,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/qsphy.c,v 1.6 2002/04/29 13:07:32 phk Exp $"; + "$FreeBSD: src/sys/dev/mii/qsphy.c,v 1.7 2002/05/01 19:15:54 semenu Exp $"; #endif static int qsphy_probe (device_t); @@ -180,27 +180,25 @@ struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; + /* + * If we're not selected, then do nothing, just isolate, if + * changing media. + */ + if (IFM_INST(ife->ifm_media) != sc->mii_inst) { + if (cmd == MII_MEDIACHG) { + reg = PHY_READ(sc, MII_BMCR); + PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO); + } + + return (0); + } + switch (cmd) { case MII_POLLSTAT: - /* - * If we're not polling our PHY instance, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); break; case MII_MEDIACHG: /* - * If the media indicates a different PHY instance, - * isolate ourselves. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) { - reg = PHY_READ(sc, MII_BMCR); - PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO); - return (0); - } - - /* * If the interface is not up, don't do anything. */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) @@ -229,12 +227,6 @@ case MII_TICK: /* - * If we're not currently selected, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); - - /* * Is the interface even up? */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) @@ -247,23 +239,8 @@ break; /* - * check for link. - * Read the status register twice; BMSR_LINK is latch-low. + * This PHY's autonegotiation doesn't need to be kicked. */ - reg = PHY_READ(sc, MII_BMSR) | PHY_READ(sc, MII_BMSR); - if (reg & BMSR_LINK) - break; - - /* - * Only retry autonegotiation every 5 seconds. - */ - if (++sc->mii_ticks != 5) - return (0); - - sc->mii_ticks = 0; - qsphy_reset(sc); - if (mii_phy_auto(sc, 0) == EJUSTRETURN) - return (0); break; } @@ -280,7 +257,6 @@ struct mii_softc *sc; { struct mii_data *mii = sc->mii_pdata; - struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int bmsr, bmcr, pctl; mii->mii_media_status = IFM_AVALID; @@ -301,37 +277,31 @@ if (bmcr & BMCR_LOOP) mii->mii_media_active |= IFM_LOOP; - if (bmcr & BMCR_AUTOEN) { - if ((bmsr & BMSR_ACOMP) == 0) { - /* Erg, still trying, I guess... */ - mii->mii_media_active |= IFM_NONE; - return; - } - pctl = PHY_READ(sc, MII_QSPHY_PCTL) | - PHY_READ(sc, MII_QSPHY_PCTL); - switch (pctl & PCTL_OPMASK) { - case PCTL_10_T: - mii->mii_media_active |= IFM_10_T; - break; - case PCTL_10_T_FDX: - mii->mii_media_active |= IFM_10_T|IFM_FDX; - break; - case PCTL_100_TX: - mii->mii_media_active |= IFM_100_TX; - break; - case PCTL_100_TX_FDX: - mii->mii_media_active |= IFM_100_TX|IFM_FDX; - break; - case PCTL_100_T4: - mii->mii_media_active |= IFM_100_T4; - break; - default: - /* Erg... this shouldn't happen. */ - mii->mii_media_active |= IFM_NONE; - break; - } - } else - mii->mii_media_active = ife->ifm_media; + pctl = PHY_READ(sc, MII_QSPHY_PCTL); + switch (pctl & PCTL_OPMASK) { + case PCTL_10_T: + mii->mii_media_active |= IFM_10_T; + break; + case PCTL_10_T_FDX: + mii->mii_media_active |= IFM_10_T|IFM_FDX; + break; + case PCTL_100_TX: + mii->mii_media_active |= IFM_100_TX; + break; + case PCTL_100_TX_FDX: + mii->mii_media_active |= IFM_100_TX|IFM_FDX; + break; + case PCTL_100_T4: + mii->mii_media_active |= IFM_100_T4; + break; + case PCTL_AN: + mii->mii_media_active |= IFM_NONE; + break; + default: + /* Erg... this shouldn't happen. */ + mii->mii_media_active |= IFM_NONE; + break; + } } static void ==== //depot/projects/ia64/sys/dev/tx/if_tx.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: if_tx.c,v 1.9.2.1 2000/02/21 22:29:13 niklas Exp $ */ -/* $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.56 2002/04/25 18:16:15 semenu Exp $ */ +/* $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.57 2002/05/01 19:23:04 semenu Exp $ */ /*- * Copyright (c) 1997 Semen Ustimenko (semenu@FreeBSD.org) @@ -140,6 +140,7 @@ static int epic_common_attach(epic_softc_t *); static void epic_ifstart(struct ifnet *); static void epic_ifwatchdog(struct ifnet *); +static void epic_stats_update(epic_softc_t *); static int epic_init(epic_softc_t *); static void epic_stop(epic_softc_t *); static void epic_rx_done(epic_softc_t *); @@ -1149,6 +1150,26 @@ } /* + * Despite the name of this function, it doesn't update statistics, it only + * helps in autonegotiation process. + */ +static void +epic_stats_update(epic_softc_t * sc) +{ + struct mii_data * mii; + int s; + + s = splimp(); + + mii = device_get_softc(sc->miibus); + mii_tick(mii); + + sc->stat_ch = timeout((timeout_t *)epic_stats_update, sc, hz); + + splx(s); +} + >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 20:43:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6004637B41A; Wed, 1 May 2002 20:43:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2DF9037B416 for ; Wed, 1 May 2002 20:43:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g423hbZ68655 for perforce@freebsd.org; Wed, 1 May 2002 20:43:37 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 1 May 2002 20:43:37 -0700 (PDT) Message-Id: <200205020343.g423hbZ68655@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10636 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10636 Change 10636 by peter@peter_daintree on 2002/05/01 20:43:08 panic rather than fault if contigmalloc fails here... (pmap_new_proc should use normal allocation here) Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#17 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#17 (text+ko) ==== @@ -717,6 +717,9 @@ PAGE_SIZE, 256*1024*1024); + if (up == NULL) + panic("pmap_new_proc: could not contigmalloc %d pages\n", + UAREA_PAGES); p->p_md.md_uservirt = up; p->p_uarea = (struct user *) IA64_PHYS_TO_RR7(ia64_tpa((u_int64_t) up)); @@ -771,6 +774,9 @@ PAGE_SIZE, 256*1024*1024); + if (ks == NULL) + panic("pmap_new_thread: could not contigmalloc %d pages\n", + KSTACK_PAGES); td->td_md.md_kstackvirt = ks; td->td_kstack = IA64_PHYS_TO_RR7(ia64_tpa((u_int64_t)ks)); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 21: 8:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 405E537B41B; Wed, 1 May 2002 21:08:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5785A37B416 for ; Wed, 1 May 2002 21:08:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42488v75279 for perforce@freebsd.org; Wed, 1 May 2002 21:08:08 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 1 May 2002 21:08:08 -0700 (PDT) Message-Id: <200205020408.g42488v75279@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 10638 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10638 Change 10638 by des@des.at.des.thinksec.com on 2002/05/01 21:08:02 Fall in line with Solaris and Linux-PAM wrt use of the "other" policy: use it to fill the gaps in incomplete policies as well as to replace missing ones. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/lib/openpam_configure.c#2 edit ... //depot/projects/openpam/lib/openpam_impl.h#14 edit ... //depot/projects/openpam/lib/openpam_load.c#13 edit ... //depot/projects/openpam/lib/pam_end.c#9 edit ... //depot/projects/openpam/lib/pam_start.c#14 edit Differences ... ==== //depot/projects/openpam/lib/openpam_configure.c#2 (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_configure.c#1 $ + * $P4: //depot/projects/openpam/lib/openpam_configure.c#2 $ */ #include @@ -50,7 +50,7 @@ #define MAX_OPTIONS 256 static int -openpam_read_policy_file(pam_handle_t *pamh, +openpam_read_policy_file(pam_chain_t *policy[], const char *service, const char *filename, int style) @@ -186,7 +186,7 @@ * Finally, add the module at the end of the * appropriate chain and bump the counter. */ - r = openpam_add_module(pamh, chain, flag, p, optc, optv); + r = openpam_add_module(policy, chain, flag, p, optc, optv); if (r != PAM_SUCCESS) return (-r); ++n; @@ -214,14 +214,8 @@ NULL }; -/* - * OpenPAM internal - * - * Configure a service - */ - -int -openpam_configure(pam_handle_t *pamh, +static int +openpam_load_policy(pam_chain_t *policy[], const char *service) { const char **path; @@ -235,24 +229,62 @@ filename = malloc(len + strlen(service) + 1); if (filename == NULL) { openpam_log(PAM_LOG_ERROR, "malloc(): %m"); - return (PAM_BUF_ERR); + return (-PAM_BUF_ERR); } strcpy(filename, *path); strcat(filename, service); - r = openpam_read_policy_file(pamh, + r = openpam_read_policy_file(policy, service, filename, PAM_D_STYLE); free(filename); } else { - r = openpam_read_policy_file(pamh, + r = openpam_read_policy_file(policy, service, *path, PAM_CONF_STYLE); } - if (r < 0) - return (-r); - if (r > 0) - return (PAM_SUCCESS); + if (r != 0) + return (r); + } + + return (0); +} + +/* + * OpenPAM internal + * + * Configure a service + */ + +int +openpam_configure(pam_handle_t *pamh, + const char *service) +{ + pam_chain_t *other[PAM_NUM_CHAINS]; + int i, n, r; + + /* try own configuration first */ + r = openpam_load_policy(pamh->chains, service); + if (r < 0) + return (-r); + for (i = n = 0; i < PAM_NUM_CHAINS; ++i) { + if (pamh->chains[i] != NULL) + ++n; } + if (n == PAM_NUM_CHAINS) + return (PAM_SUCCESS); - return (PAM_SYSTEM_ERR); + /* fill in the blanks with "other" */ + openpam_load_policy(other, PAM_OTHER); + if (r < 0) + return (-r); + for (i = n = 0; i < PAM_NUM_CHAINS; ++i) { + if (pamh->chains[i] == NULL) { + pamh->chains[i] = other[i]; + other[i] = NULL; + } + if (pamh->chains[i] != NULL) + ++n; + } + openpam_clear_chains(other); + return (n > 0 ? PAM_SUCCESS : PAM_SYSTEM_ERR); } /* ==== //depot/projects/openpam/lib/openpam_impl.h#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/openpam_impl.h#13 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#14 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -108,9 +108,9 @@ int openpam_configure(pam_handle_t *, const char *); int openpam_dispatch(pam_handle_t *, int, int); int openpam_findenv(pam_handle_t *, const char *, size_t); -int openpam_add_module(pam_handle_t *, int, int, +int openpam_add_module(pam_chain_t **, int, int, const char *, int, const char **); -void openpam_clear_chains(pam_handle_t *); +void openpam_clear_chains(pam_chain_t **); #ifdef OPENPAM_STATIC_MODULES pam_module_t *openpam_static(const char *); ==== //depot/projects/openpam/lib/openpam_load.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_load.c#12 $ + * $P4: //depot/projects/openpam/lib/openpam_load.c#13 $ */ #include @@ -156,7 +156,7 @@ */ int -openpam_add_module(pam_handle_t *pamh, +openpam_add_module(pam_chain_t *policy[], int chain, int flag, const char *modpath, @@ -178,12 +178,12 @@ openpam_destroy_chain(new); return (PAM_OPEN_ERR); } - if ((iterator = pamh->chains[chain]) != NULL) { + if ((iterator = policy[chain]) != NULL) { while (iterator->next != NULL) iterator = iterator->next; iterator->next = new; } else { - pamh->chains[chain] = new; + policy[chain] = new; } return (PAM_SUCCESS); @@ -199,12 +199,12 @@ */ void -openpam_clear_chains(pam_handle_t *pamh) +openpam_clear_chains(pam_chain_t *policy[]) { int i; for (i = 0; i < PAM_NUM_CHAINS; ++i) - openpam_destroy_chain(pamh->chains[i]); + openpam_destroy_chain(policy[i]); } /* ==== //depot/projects/openpam/lib/pam_end.c#9 (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_end.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_end.c#9 $ */ #include @@ -72,7 +72,7 @@ free(pamh->env); /* clear chains */ - openpam_clear_chains(pamh); + openpam_clear_chains(pamh->chains); /* clear items */ for (i = 0; i < PAM_NUM_ITEMS; ++i) ==== //depot/projects/openpam/lib/pam_start.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_start.c#13 $ + * $P4: //depot/projects/openpam/lib/pam_start.c#14 $ */ #include @@ -66,8 +66,6 @@ goto fail; r = openpam_configure(ph, service); - if (r != PAM_SUCCESS && r != PAM_BUF_ERR) - r = openpam_configure(ph, PAM_OTHER); if (r != PAM_SUCCESS) goto fail; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 21:28:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA3A637B405; Wed, 1 May 2002 21:27:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 496ED37B417 for ; Wed, 1 May 2002 21:27:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g424RYv77084 for perforce@freebsd.org; Wed, 1 May 2002 21:27:34 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 1 May 2002 21:27:34 -0700 (PDT) Message-Id: <200205020427.g424RYv77084@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 10640 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10640 Change 10640 by des@des.at.des.thinksec.com on 2002/05/01 21:27:17 Regenerate. Affected files ... ... //depot/projects/openpam/doc/man/openpam_borrow_cred.3#3 edit ... //depot/projects/openpam/doc/man/openpam_free_data.3#3 edit ... //depot/projects/openpam/doc/man/openpam_get_option.3#7 edit ... //depot/projects/openpam/doc/man/openpam_log.3#8 edit ... //depot/projects/openpam/doc/man/openpam_restore_cred.3#3 edit ... //depot/projects/openpam/doc/man/openpam_set_option.3#7 edit ... //depot/projects/openpam/doc/man/openpam_ttyconv.3#8 edit ... //depot/projects/openpam/doc/man/pam.3#14 edit ... //depot/projects/openpam/doc/man/pam_acct_mgmt.3#12 edit ... //depot/projects/openpam/doc/man/pam_authenticate.3#12 edit ... //depot/projects/openpam/doc/man/pam_chauthtok.3#12 edit ... //depot/projects/openpam/doc/man/pam_close_session.3#12 edit ... //depot/projects/openpam/doc/man/pam_end.3#12 edit ... //depot/projects/openpam/doc/man/pam_error.3#12 edit ... //depot/projects/openpam/doc/man/pam_get_authtok.3#14 edit ... //depot/projects/openpam/doc/man/pam_get_data.3#12 edit ... //depot/projects/openpam/doc/man/pam_get_item.3#13 edit ... //depot/projects/openpam/doc/man/pam_get_user.3#13 edit ... //depot/projects/openpam/doc/man/pam_getenv.3#12 edit ... //depot/projects/openpam/doc/man/pam_getenvlist.3#13 edit ... //depot/projects/openpam/doc/man/pam_info.3#12 edit ... //depot/projects/openpam/doc/man/pam_open_session.3#12 edit ... //depot/projects/openpam/doc/man/pam_prompt.3#13 edit ... //depot/projects/openpam/doc/man/pam_putenv.3#12 edit ... //depot/projects/openpam/doc/man/pam_set_data.3#12 edit ... //depot/projects/openpam/doc/man/pam_set_item.3#12 edit ... //depot/projects/openpam/doc/man/pam_setcred.3#13 edit ... //depot/projects/openpam/doc/man/pam_setenv.3#12 edit ... //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#8 edit ... //depot/projects/openpam/doc/man/pam_sm_authenticate.3#8 edit ... //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#8 edit ... //depot/projects/openpam/doc/man/pam_sm_close_session.3#8 edit ... //depot/projects/openpam/doc/man/pam_sm_open_session.3#8 edit ... //depot/projects/openpam/doc/man/pam_sm_setcred.3#8 edit ... //depot/projects/openpam/doc/man/pam_start.3#13 edit ... //depot/projects/openpam/doc/man/pam_strerror.3#12 edit ... //depot/projects/openpam/doc/man/pam_verror.3#10 edit ... //depot/projects/openpam/doc/man/pam_vinfo.3#10 edit ... //depot/projects/openpam/doc/man/pam_vprompt.3#10 edit Differences ... ==== //depot/projects/openpam/doc/man/openpam_borrow_cred.3#3 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#2 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#3 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_free_data.3#3 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#2 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#3 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_get_option.3#7 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#7 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_log.3#8 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_LOG 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_restore_cred.3#3 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#2 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#3 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_set_option.3#7 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#7 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_ttyconv.3#8 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam.3#14 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam.3#13 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.3#14 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_acct_mgmt.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_authenticate.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_chauthtok.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_close_session.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_end.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_END 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_error.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_ERROR 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_authtok.3#14 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#13 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#14 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_data.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GET_DATA 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_item.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GET_ITEM 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_user.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GET_USER 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_getenv.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GETENV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_getenvlist.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GETENVLIST 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_info.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_INFO 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_open_session.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_prompt.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_PROMPT 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_putenv.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_PUTENV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_set_data.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SET_DATA 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_set_item.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SET_ITEM 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_setcred.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_setenv.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SETENV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#8 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_authenticate.3#8 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#8 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_close_session.3#8 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_open_session.3#8 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_setcred.3#8 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_start.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_START 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_strerror.3#12 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_STRERROR 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_verror.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#10 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_VERROR 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_vinfo.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#10 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_VINFO 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_vprompt.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#10 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_VPROMPT 3 .Os .Sh NAME To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 21:30:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7399837B417; Wed, 1 May 2002 21:30:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5DE6737B404 for ; Wed, 1 May 2002 21:30:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g424Udr77375 for perforce@freebsd.org; Wed, 1 May 2002 21:30:39 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 1 May 2002 21:30:39 -0700 (PDT) Message-Id: <200205020430.g424Udr77375@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 10641 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10641 Change 10641 by des@des.at.des.thinksec.com on 2002/05/01 21:30:03 OpenPAM extensions need . Affected files ... ... //depot/projects/openpam/misc/gendoc.pl#13 edit Differences ... ==== //depot/projects/openpam/misc/gendoc.pl#13 (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#12 $ +# $P4: //depot/projects/openpam/misc/gendoc.pl#13 $ # use strict; @@ -315,6 +315,9 @@ if ($func->{'name'} =~ m/_sm_/) { $mdoc .= ".In security/pam_modules.h\n" } + if ($func->{'name'} =~ m/openpam/) { + $mdoc .= ".In security/openpam.h\n" + } $mdoc .= ".Ft $func->{'type'} .Fn $func->{'name'} $func->{'args'} .Sh DESCRIPTION To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 21:30:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52FD537B420; Wed, 1 May 2002 21:30:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AA83737B405 for ; Wed, 1 May 2002 21:30:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g424Ud077380 for perforce@freebsd.org; Wed, 1 May 2002 21:30:39 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 1 May 2002 21:30:39 -0700 (PDT) Message-Id: <200205020430.g424Ud077380@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 10642 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10642 Change 10642 by des@des.at.des.thinksec.com on 2002/05/01 21:30:26 Regenerate with correct #include information. Affected files ... ... //depot/projects/openpam/doc/man/openpam_borrow_cred.3#4 edit ... //depot/projects/openpam/doc/man/openpam_free_data.3#4 edit ... //depot/projects/openpam/doc/man/openpam_get_option.3#8 edit ... //depot/projects/openpam/doc/man/openpam_log.3#9 edit ... //depot/projects/openpam/doc/man/openpam_restore_cred.3#4 edit ... //depot/projects/openpam/doc/man/openpam_set_option.3#8 edit ... //depot/projects/openpam/doc/man/openpam_ttyconv.3#9 edit Differences ... ==== //depot/projects/openpam/doc/man/openpam_borrow_cred.3#4 (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/doc/man/openpam_borrow_cred.3#3 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#4 $ .\" .Dd May 2, 2002 .Dt OPENPAM_BORROW_CRED 3 @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft int .Fn openpam_borrow_cred "pam_handle_t *pamh" "const struct passwd *pwd" .Sh DESCRIPTION ==== //depot/projects/openpam/doc/man/openpam_free_data.3#4 (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/doc/man/openpam_free_data.3#3 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#4 $ .\" .Dd May 2, 2002 .Dt OPENPAM_FREE_DATA 3 @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft void .Fn openpam_free_data "pam_handle_t *pamh" "void *data" "int status" .Sh DESCRIPTION ==== //depot/projects/openpam/doc/man/openpam_get_option.3#8 (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/doc/man/openpam_get_option.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#8 $ .\" .Dd May 2, 2002 .Dt OPENPAM_GET_OPTION 3 @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft const char * .Fn openpam_get_option "pam_handle_t *pamh" "const char *option" .Sh DESCRIPTION ==== //depot/projects/openpam/doc/man/openpam_log.3#9 (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/doc/man/openpam_log.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#9 $ .\" .Dd May 2, 2002 .Dt OPENPAM_LOG 3 @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft void .Fn openpam_log "int level" "const char *fmt" "..." .Sh DESCRIPTION ==== //depot/projects/openpam/doc/man/openpam_restore_cred.3#4 (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/doc/man/openpam_restore_cred.3#3 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#4 $ .\" .Dd May 2, 2002 .Dt OPENPAM_RESTORE_CRED 3 @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft int .Fn openpam_restore_cred "pam_handle_t *pamh" .Sh DESCRIPTION ==== //depot/projects/openpam/doc/man/openpam_set_option.3#8 (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/doc/man/openpam_set_option.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#8 $ .\" .Dd May 2, 2002 .Dt OPENPAM_SET_OPTION 3 @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft int .Fn openpam_set_option "pam_handle_t *pamh" "const char *option" "const char *value" .Sh DESCRIPTION ==== //depot/projects/openpam/doc/man/openpam_ttyconv.3#9 (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/doc/man/openpam_ttyconv.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#9 $ .\" .Dd May 2, 2002 .Dt OPENPAM_TTYCONV 3 @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft int .Fn openpam_ttyconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data" .Sh DESCRIPTION To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 21:32:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CA7537B404; Wed, 1 May 2002 21:32:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 87B3537B400 for ; Wed, 1 May 2002 21:32:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g424Wgo77545 for perforce@freebsd.org; Wed, 1 May 2002 21:32:42 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 1 May 2002 21:32:42 -0700 (PDT) Message-Id: <200205020432.g424Wgo77545@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 10643 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10643 Change 10643 by des@des.at.des.thinksec.com on 2002/05/01 21:31:48 Release documentation for OpenPAM Cinnamon. Affected files ... ... //depot/projects/openpam/HISTORY#11 edit ... //depot/projects/openpam/RELNOTES#10 edit Differences ... ==== //depot/projects/openpam/HISTORY#11 (text+ko) ==== @@ -1,4 +1,25 @@ ============================================================================ +OpenPAM Cinnamon 2002-05-02 + + - ENHANCE: Add a null conversation function, openpam_nullconv(). + + - BUGFIX: Various markup bugs in the documentation. + + - BUGFIX: Document . + + - BUGFIX: Duplicate expansion of openpam_log() macro arguments. + + - ENHANCE: Restructure the policy-loading code and align our use of + the "other" policy with Solaris and Linux-PAM. + + - ENHANCE: Log dlopen() and dlsym() failures. + + - ENHANCE: In openpam_ttyconv(), emit a newline after error and info + messages unless the message contains one already. + + - BUGFIX: In pam_vprompt(), initialize the response pointer to NULL + so we can detect whether the conversation function touched it. +============================================================================ OpenPAM Cineraria 2002-04-14 - BUGFIX: Fix confusion between token and prompt in @@ -10,7 +31,7 @@ FreeBSD's version of Linux-PAM to simplify static linking without requiring dummy primitives. - - ENHANCE: move the policy-loading code out of pam_start.c. + - ENHANCE: Move the policy-loading code out of pam_start.c. - BUGFIX: Fix typo in one of the versions of the openpam_log macro. @@ -131,4 +152,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#10 $ +$P4: //depot/projects/openpam/HISTORY#11 $ ==== //depot/projects/openpam/RELNOTES#10 (text+ko) ==== @@ -1,12 +1,12 @@ - Release notes for OpenPAM Cineraria - =================================== + Release notes for OpenPAM Cinnamon + ================================== The library itself is complete. Documentation exists in the form of man pages for the library functions, though a few pages are still incomplete. -This release is incorporated into FreeBSD-CURRENT as of 2002-04-14. +This release is incorporated into FreeBSD-CURRENT as of 2002-05-02. It has also been successfully built on NetBSD, and should build with minimal or no changes on OpenBSD. It has not been tested on any other OS. @@ -15,4 +15,4 @@ - The documentation is still incomplete. -$P4: //depot/projects/openpam/RELNOTES#9 $ +$P4: //depot/projects/openpam/RELNOTES#10 $ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 21:36:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80EDF37B416; Wed, 1 May 2002 21:36:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C191537B404 for ; Wed, 1 May 2002 21:36:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g424al877909 for perforce@freebsd.org; Wed, 1 May 2002 21:36:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 21:36:47 -0700 (PDT) Message-Id: <200205020436.g424al877909@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10644 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10644 Change 10644 by rwatson@rwatson_tislabs on 2002/05/01 21:35:54 Fixed some reversed types in the prototypes for recently added peer calls. Worked fine, but warnings suck. Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#61 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#61 (text+ko) ==== @@ -95,10 +95,10 @@ struct socket *newsocket); void (*mpo_relabel_socket)(struct ucred *cred, struct socket *socket, struct mac *newlabel); - void (*mpo_set_socket_peer_from_mbuf)(struct socket *oldsocket, + void (*mpo_set_socket_peer_from_mbuf)(struct mbuf *mbuf, + struct socket *socket); + void (*mpo_set_socket_peer_from_socket)(struct socket *oldsocket, struct socket *newsocket); - void (*mpo_set_socket_peer_from_socket)(struct mbuf *mbuf, - struct socket *socket); /* * Labeling event operations: network objects. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 21:39: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D731237B419; Wed, 1 May 2002 21:38:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C63AB37B416 for ; Wed, 1 May 2002 21:38:50 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g424coS78108 for perforce@freebsd.org; Wed, 1 May 2002 21:38:50 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Wed, 1 May 2002 21:38:50 -0700 (PDT) Message-Id: <200205020438.g424coS78108@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 10648 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10648 Change 10648 by mini@mini_stylus on 2002/05/01 21:38:26 Change to new names (SZBOM -> PRS_ZOMBIE, p_stat -> p_state) Affected files ... ... //depot/projects/kse/lib/libkvm/kvm_proc.c#11 edit Differences ... ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#11 (text+ko) ==== @@ -329,7 +329,7 @@ kp->ki_sflag = proc.p_sflag; kp->ki_wchan = mainthread.td_wchan; /* XXXKSE */ kp->ki_traceflag = proc.p_traceflag; - kp->ki_stat = proc.p_stat; + kp->ki_stat = proc.p_state; kp->ki_pri.pri_class = proc.p_ksegrp.kg_pri_class; /* XXXKSE */ kp->ki_pri.pri_user = proc.p_ksegrp.kg_user_pri; /* XXXKSE */ kp->ki_pri.pri_level = mainthread.td_priority; /* XXXKSE */ @@ -744,7 +744,7 @@ if (sysctl(mib, 4, &newkp, &len, NULL, 0) == -1) return (0); return (curkp->ki_pid == newkp.ki_pid && - (newkp.ki_stat != SZOMB || curkp->ki_stat == SZOMB)); + (newkp.ki_stat != PRS_ZOMBIE || curkp->ki_stat == PRS_ZOMBIE)); } static char ** @@ -771,7 +771,7 @@ /* * Pointers are stored at the top of the user stack. */ - if (kp->ki_stat == SZOMB || + if (kp->ki_stat == PRS_ZOMBIE || kvm_uread(kd, kp, ps_strings, (char *)&arginfo, sizeof(arginfo)) != sizeof(arginfo)) return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 21:39: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BB6F37B405; Wed, 1 May 2002 21:38:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A4A9637B405 for ; Wed, 1 May 2002 21:38:50 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g424cor78103 for perforce@freebsd.org; Wed, 1 May 2002 21:38:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 21:38:50 -0700 (PDT) Message-Id: <200205020438.g424cor78103@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10647 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10647 Change 10647 by rwatson@rwatson_tislabs on 2002/05/01 21:38:24 Introduce a new startup ordering constant: SI_SUB_MAC_LATE. This allows the MAC subsystem to keep a 'mac_late' variable -- it is 0 initially, and set to 1 during SI_SUB_MAC_LATE after all policies have evaluated. This variable will allow modules to determine if they are being loaded "late" -- i.e., following the initialization of the MAC system and all modules linked into the kernel or loaded early. That way they can reject loading in the event that they need to be initialized before any objects are instantiated. This Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#134 edit ... //depot/projects/trustedbsd/mac/sys/sys/kernel.h#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#134 (text+ko) ==== @@ -98,6 +98,8 @@ void *labels[MAC_MAX_POLICIES]; }; +int mac_late = 0; + static int mac_enforce_fs = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_fs, CTLFLAG_RW, &mac_enforce_fs, 0, "Enforce MAC policy on file system objects"); @@ -223,6 +225,18 @@ } /* + * For the purposes of modules that want to know if they were loaded + * "early", set the mac_late flag once we've processed modules either + * linked into the kernel, or loaded before the kernel startup. + */ +static void +mac_late_init(void) +{ + + mac_late = 1; +} + +/* * Allow MAC policy modules to register during boot, etc. */ int @@ -1812,6 +1826,7 @@ } SYSINIT(mac, SI_SUB_MAC, SI_ORDER_FIRST, mac_init, NULL); +SYSINIT(mac_late, SI_SUB_MAC_LATE, SI_ORDER_FIRST, mac_late_init, NULL); #else /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/sys/kernel.h#10 (text+ko) ==== @@ -121,6 +121,7 @@ SI_SUB_CPU = 0x2100000, /* CPU resource(s)*/ SI_SUB_MAC = 0x2180000, /* TrustedBSD MAC subsystem */ SI_SUB_MAC_POLICY = 0x21C0000, /* TrustedBSD MAC policies */ + SI_SUB_MAC_LATE = 0x21D0000, /* TrustedBSD MAC subsystem */ SI_SUB_INTRINSIC = 0x2200000, /* proc 0*/ SI_SUB_VM_CONF = 0x2300000, /* config VM, set limits*/ SI_SUB_RUN_QUEUE = 0x2400000, /* set up run queue*/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 22: 0:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8072B37B416; Wed, 1 May 2002 22:00:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38]) by hub.freebsd.org (Postfix) with ESMTP id 9395337B404; Wed, 1 May 2002 22:00:15 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc51.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020502050015.ILIU9799.rwcrmhc51.attbi.com@InterJet.elischer.org>; Thu, 2 May 2002 05:00:15 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id VAA75413; Wed, 1 May 2002 21:46:36 -0700 (PDT) Date: Wed, 1 May 2002 21:46:35 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10648 for review In-Reply-To: <200205020438.g424coS78108@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jon.. My sugested next change: diff -reduction on fork() I ended up re-writing it too much I think.. take current fork.. take important ideas from my version.. blend to taste.. I think I spent too much time trying to optimise the locks (Hense the comment about not needing to lock p2 until it's findable by other threads (i.e. in some external structure/list)) Alternatively we could check in (to freeBSD) a rewritten fork() that tries to do that.. (defer the linking into external data structures until as late as possible, to avoid having to do any PROC_LOCK()s until then) As it is now, whenever jhb changes fork() it's merge-from hell.. thoughts? On Wed, 1 May 2002, Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10648 > > Change 10648 by mini@mini_stylus on 2002/05/01 21:38:26 > > Change to new names (SZBOM -> PRS_ZOMBIE, p_stat -> p_state) > > Affected files ... > > ... //depot/projects/kse/lib/libkvm/kvm_proc.c#11 edit > > Differences ... > > ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#11 (text+ko) ==== > > @@ -329,7 +329,7 @@ > kp->ki_sflag = proc.p_sflag; > kp->ki_wchan = mainthread.td_wchan; /* XXXKSE */ > kp->ki_traceflag = proc.p_traceflag; > - kp->ki_stat = proc.p_stat; > + kp->ki_stat = proc.p_state; > kp->ki_pri.pri_class = proc.p_ksegrp.kg_pri_class; /* XXXKSE */ > kp->ki_pri.pri_user = proc.p_ksegrp.kg_user_pri; /* XXXKSE */ > kp->ki_pri.pri_level = mainthread.td_priority; /* XXXKSE */ > @@ -744,7 +744,7 @@ > if (sysctl(mib, 4, &newkp, &len, NULL, 0) == -1) > return (0); > return (curkp->ki_pid == newkp.ki_pid && > - (newkp.ki_stat != SZOMB || curkp->ki_stat == SZOMB)); > + (newkp.ki_stat != PRS_ZOMBIE || curkp->ki_stat == PRS_ZOMBIE)); > } > > static char ** > @@ -771,7 +771,7 @@ > /* > * Pointers are stored at the top of the user stack. > */ > - if (kp->ki_stat == SZOMB || > + if (kp->ki_stat == PRS_ZOMBIE || > kvm_uread(kd, kp, ps_strings, (char *)&arginfo, > sizeof(arginfo)) != sizeof(arginfo)) > return (0); > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 22:15:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D75B737B405; Wed, 1 May 2002 22:15:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1486E37B404 for ; Wed, 1 May 2002 22:15:36 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g425FZm85979 for perforce@freebsd.org; Wed, 1 May 2002 22:15:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 22:15:35 -0700 (PDT) Message-Id: <200205020515.g425FZm85979@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10651 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10651 Change 10651 by rwatson@rwatson_tislabs on 2002/05/01 22:15:19 Make mac_late static. Add a new flag field to policy definition structures, mpc_loadtime_flags, which will allow policies to declare some of their properties using a series of flags. Define a flag MPC_LOADTIME_FLAG_NOTLATE, which will indicate a module refuses to register if it is loaded "late". Check this flag and the late variable during the registration process, reject modules with EBUSY if it's late and they refuse to be. Rename MPC_FLAG_REGISTERED to MPC_RUNTIME_FLAG_REGISTERED, to represent the fact that this flag is maintained by the MAC framework at runtime, and not by the policy itself. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#135 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#62 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#135 (text+ko) ==== @@ -98,7 +98,7 @@ void *labels[MAC_MAX_POLICIES]; }; -int mac_late = 0; +static int mac_late = 0; static int mac_enforce_fs = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_fs, CTLFLAG_RW, @@ -250,11 +250,17 @@ switch (type) { case MOD_LOAD: + if (mpc->mpc_loadtime_flags & MPC_LOADTIME_FLAG_NOTLATE && + mac_late) { + error = EBUSY; + break; + } error = mac_policy_register(mpc); break; case MOD_UNLOAD: /* Don't unregister the module if it was never registered. */ - if ((mpc->mpc_runtime_flags & MPC_FLAG_REGISTERED) != 0) + if ((mpc->mpc_runtime_flags & MPC_RUNTIME_FLAG_REGISTERED) + != 0) error = mac_policy_unregister(mpc); else error = 0; @@ -555,7 +561,7 @@ mpc->mpc_field_off = slot; } else mpc->mpc_field_off = -1; - mpc->mpc_runtime_flags |= MPC_FLAG_REGISTERED; + mpc->mpc_runtime_flags |= MPC_RUNTIME_FLAG_REGISTERED; LIST_INSERT_HEAD(&mac_policy_list, mpc, mpc_list); printf("Security policy: %s (%s)\n", mpc->mpc_fullname, mpc->mpc_name); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#62 (text+ko) ==== @@ -299,20 +299,25 @@ char *mpc_fullname; /* policy full name */ struct mac_policy_ops mpc_ops; /* policy operations */ struct mac_policy_op_entry *mpc_entries; /* ops to fill in */ + int mpc_loadtime_flags; /* flags */ int mpc_field_off; /* security field */ int mpc_runtime_flags; /* flags */ LIST_ENTRY(mac_policy_conf) mpc_list; /* global list */ }; +/* Flags for the mpc_loadtime_flags field. */ +#define MPC_LOADTIME_FLAG_NOTLATE 0x00000001 + /* Flags for the mpc_runtime_flags field. */ -#define MPC_FLAG_REGISTERED 0x00000001 +#define MPC_RUNTIME_FLAG_REGISTERED 0x00000001 -#define MAC_POLICY_SET(mpents, mpname, mpfullname, privdata_wanted) \ +#define MAC_POLICY_SET(mpents, mpname, mpfullname, mpflags, privdata_wanted)\ static struct mac_policy_conf mpname##_mac_policy_conf = { \ #mpname, \ mpfullname, \ { NULL /*... */ }, \ mpents, \ + mpflags, \ privdata_wanted, \ 0 \ }; \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 22:16:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B70537B41E; Wed, 1 May 2002 22:16:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1747537B41A for ; Wed, 1 May 2002 22:16:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g425Gbs86345 for perforce@freebsd.org; Wed, 1 May 2002 22:16:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 22:16:37 -0700 (PDT) Message-Id: <200205020516.g425Gbs86345@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10653 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10653 Change 10653 by rwatson@rwatson_tislabs on 2002/05/01 22:15:57 Update various policies to know about the new flags field, and set the MPC_LOADTIME_FLAG_NOTLATE flag for Biba, MLS, TE, and SEBSD, since they need the opportunity to maintain labeling on all objects starting from system instantiation. They can be compiled as modules, but those modules must be loaded before the kernel starts booting; attempting to load them late in the boot, or following the boot, will fail. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#8 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#34 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#28 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#6 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#28 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#25 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#8 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#29 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#8 (text+ko) ==== @@ -276,4 +276,4 @@ }; MAC_POLICY_SET(babyaudit_ops, trustedbsd_babyaudit, "TrustedBSD MAC/babyaudit", - 0); + 0, 0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#34 (text+ko) ==== @@ -1219,5 +1219,6 @@ { MAC_OP_LAST, NULL } }; -MAC_POLICY_SET(mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba", 1); +MAC_POLICY_SET(mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba", + MPC_LOADTIME_FLAG_NOTLATE, 1); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#28 (text+ko) ==== @@ -671,4 +671,4 @@ }; MAC_POLICY_SET(mac_bsdextended_ops, trustedbsd_mac_bsdextended, - "TrustedBSD MAC/BSD Extended", 0); + "TrustedBSD MAC/BSD Extended", 0, 0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#6 (text+ko) ==== @@ -166,4 +166,5 @@ { MAC_OP_LAST, NULL } }; -MAC_POLICY_SET(mac_ifoff_ops, trustedbsd_mac_ifoff, "TrustedBSD MAC/ifoff", 0); +MAC_POLICY_SET(mac_ifoff_ops, trustedbsd_mac_ifoff, "TrustedBSD MAC/ifoff", + 0, 0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#28 (text+ko) ==== @@ -1152,5 +1152,6 @@ { MAC_OP_LAST, NULL } }; -MAC_POLICY_SET(mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS", 1); +MAC_POLICY_SET(mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS", + MPC_LOADTIME_FLAG_NOTLATE, 1); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#25 (text+ko) ==== @@ -768,6 +768,6 @@ { MAC_OP_LAST, NULL } }; -MAC_POLICY_SET(mac_none_ops, trustedbsd_mac_none, "TrustedBSD MAC/None", 0); +MAC_POLICY_SET(mac_none_ops, trustedbsd_mac_none, "TrustedBSD MAC/None", 0, 0); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#8 (text+ko) ==== @@ -173,4 +173,4 @@ }; MAC_POLICY_SET(mac_seeotheruids_ops, trustedbsd_mac_seeotheruids, - "TrustedBSD MAC/seeotheruids", 0); + "TrustedBSD MAC/seeotheruids", 0, 0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#29 (text+ko) ==== @@ -1238,6 +1238,7 @@ { MAC_OP_LAST, NULL } }; -MAC_POLICY_SET(mac_te_ops, trustedbsd_mac_te, "TrustedBSD MAC/TE", 1); +MAC_POLICY_SET(mac_te_ops, trustedbsd_mac_te, "TrustedBSD MAC/TE", + MPC_LOADTIME_FLAG_NOTLATE, 1); #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#4 (text+ko) ==== @@ -123,6 +123,7 @@ { MAC_OP_LAST, NULL } }; -MAC_POLICY_SET(sebsd_ops, trustedbsd_sebsd, "Security Enhanced BSD", 1); +MAC_POLICY_SET(sebsd_ops, trustedbsd_sebsd, "Security Enhanced BSD", + MPC_LOADTIME_FLAG_NOTLATE, 1); #endif /* !MAC */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 22:17:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85A0837B405; Wed, 1 May 2002 22:17:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B0D3B37B404 for ; Wed, 1 May 2002 22:17:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g425Hd386450 for perforce@freebsd.org; Wed, 1 May 2002 22:17:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 22:17:39 -0700 (PDT) Message-Id: <200205020517.g425Hd386450@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10654 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10654 Change 10654 by rwatson@rwatson_tislabs on 2002/05/01 22:17:16 Allow Biba, MLS, and TE policies to be built as modules. Affected files ... ... //depot/projects/trustedbsd/mac/sys/modules/Makefile#18 edit ... //depot/projects/trustedbsd/mac/sys/modules/mac_biba/Makefile#1 add ... //depot/projects/trustedbsd/mac/sys/modules/mac_mls/Makefile#1 add ... //depot/projects/trustedbsd/mac/sys/modules/mac_te/Makefile#1 add Differences ... ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#18 (text+ko) ==== @@ -50,10 +50,13 @@ libmchain \ lnc \ lpt \ + mac_biba \ mac_bsdextended \ mac_ifoff \ + mac_mls \ mac_none \ mac_seeotheruids \ + mac_te \ md \ mii \ mlx \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 22:19:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 537EC37B41B; Wed, 1 May 2002 22:19:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A76C237B41B for ; Wed, 1 May 2002 22:19:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g425JgC86702 for perforce@freebsd.org; Wed, 1 May 2002 22:19:42 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 22:19:42 -0700 (PDT) Message-Id: <200205020519.g425JgC86702@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10655 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10655 Change 10655 by rwatson@rwatson_tislabs on 2002/05/01 22:19:36 Do not link mac_biba, mac_mls, or mac_te directly into the kernel. Build only via modules. Affected files ... ... //depot/projects/trustedbsd/mac/sys/conf/files#27 edit ... //depot/projects/trustedbsd/mac/sys/conf/options#16 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/files#27 (text+ko) ==== @@ -1297,10 +1297,7 @@ posix4/ksched.c optional _kposix_priority_scheduling posix4/p1003_1b.c standard posix4/posix4_mib.c standard -security/mac_biba/mac_biba.c optional mac_biba -security/mac_mls/mac_mls.c optional mac_mls security/mac_none/mac_none.c optional mac_none -security/mac_te/mac_te.c optional mac_te security/sebsd/sebsd.c optional sebsd security/sebsd/avc/avc.c optional sebsd ==== //depot/projects/trustedbsd/mac/sys/conf/options#16 (text+ko) ==== @@ -107,10 +107,7 @@ # TrustedBSD and POSIX.1e Kernel Options CAPABILITIES opt_cap.h MAC opt_mac.h -MAC_BIBA opt_mac.h -MAC_MLS opt_mac.h MAC_NONE opt_mac.h -MAC_TE opt_mac.h SEBSD opt_mac.h # Do we want the config file compiled into the kernel? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 22:20:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1AD537B416; Wed, 1 May 2002 22:20:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 89EA837B405 for ; Wed, 1 May 2002 22:20:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g425Kik86845 for perforce@freebsd.org; Wed, 1 May 2002 22:20:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 22:20:44 -0700 (PDT) Message-Id: <200205020520.g425Kik86845@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10657 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10657 Change 10657 by rwatson@rwatson_tislabs on 2002/05/01 22:20:41 Since mac_ifoff is not #ifdef MAC, remove the #include of opt_mac.h Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#7 (text+ko) ==== @@ -44,8 +44,6 @@ * environments. */ -#include "opt_mac.h" - #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 22:21: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA31237B400; Wed, 1 May 2002 22:20:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 19F4037B416 for ; Wed, 1 May 2002 22:20:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g425Khc86838 for perforce@freebsd.org; Wed, 1 May 2002 22:20:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 22:20:43 -0700 (PDT) Message-Id: <200205020520.g425Khc86838@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10656 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10656 Change 10656 by rwatson@rwatson_tislabs on 2002/05/01 22:20:25 Since biba, mls, and te are no longer built directly into the kernel, their #ifdef of MAC is no longer required. Also drop the include of opt_mac.h, since there are not currently any other relevant compile-time options in there (there may be at some point, in which case we'll re-add them). Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#35 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#29 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#30 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#35 (text+ko) ==== @@ -41,8 +41,6 @@ * Biba Integrity Policy. */ -#include "opt_mac.h" - #include #include #include @@ -65,8 +63,6 @@ #include #include -#ifdef MAC - SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, biba, CTLFLAG_RW, 0, @@ -1221,4 +1217,3 @@ MAC_POLICY_SET(mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba", MPC_LOADTIME_FLAG_NOTLATE, 1); -#endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#29 (text+ko) ==== @@ -41,8 +41,6 @@ * Multi-Level Security Policy. */ -#include "opt_mac.h" - #include #include #include @@ -65,8 +63,6 @@ #include #include -#ifdef MAC - SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, mls, CTLFLAG_RW, 0, @@ -1154,4 +1150,3 @@ MAC_POLICY_SET(mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS", MPC_LOADTIME_FLAG_NOTLATE, 1); -#endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#30 (text+ko) ==== @@ -42,8 +42,6 @@ * Support for mandatory Type Enforcement policy. */ -#include "opt_mac.h" - #include #include #include @@ -68,8 +66,6 @@ #include -#ifdef MAC - SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, te, CTLFLAG_RW, 0, @@ -1240,5 +1236,3 @@ MAC_POLICY_SET(mac_te_ops, trustedbsd_mac_te, "TrustedBSD MAC/TE", MPC_LOADTIME_FLAG_NOTLATE, 1); - -#endif /* !MAC */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 22:22:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10A1E37B416; Wed, 1 May 2002 22:22:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 38EC637B405 for ; Wed, 1 May 2002 22:22:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g425Mls87163 for perforce@freebsd.org; Wed, 1 May 2002 22:22:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 22:22:47 -0700 (PDT) Message-Id: <200205020522.g425Mls87163@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10658 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10658 Change 10658 by rwatson@rwatson_tislabs on 2002/05/01 22:21:54 MAC entries moved to MI NOTES, so strip from MD NOTES. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#16 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#16 (text+ko) ==== @@ -894,19 +894,6 @@ options DEBUG_SVR4 # enable verbose debugging device streams # STREAMS network driver (required for svr4). -##################################################################### -# SECURITY POLICY PARAMETERS - -# Support for Mandatory Access Control (MAC) -options MAC -options MAC_BIBA -options MAC_MLS -options MAC_NONE -options MAC_TE -options SEBSD #Warning, won't boot without a policy - -##################################################################### - # More undocumented options for linting. # Note that documenting these are not considered an affront. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 22:23: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EB9837B405; Wed, 1 May 2002 22:22:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6D91A37B417 for ; Wed, 1 May 2002 22:22:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g425Ml187168 for perforce@freebsd.org; Wed, 1 May 2002 22:22:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 22:22:47 -0700 (PDT) Message-Id: <200205020522.g425Ml187168@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10659 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10659 Change 10659 by rwatson@rwatson_tislabs on 2002/05/01 22:22:28 mac_biba, mac_mls, and mac_te no longer link directly to the kernel, so remove the options from MAC. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#25 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#25 (text+ko) ==== @@ -32,10 +32,7 @@ options MAC options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART -options MAC_BIBA -options MAC_MLS options MAC_NONE -options MAC_TE options SEBSD options INET #InterNETworking To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 22:27:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4A7137B416; Wed, 1 May 2002 22:27:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0466137B405 for ; Wed, 1 May 2002 22:27:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g425RrW87738 for perforce@freebsd.org; Wed, 1 May 2002 22:27:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 22:27:53 -0700 (PDT) Message-Id: <200205020527.g425RrW87738@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10660 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10660 Change 10660 by rwatson@rwatson_tislabs on 2002/05/01 22:27:22 Be a bit more verbose when failing to load a policy due to it being too late in the system boot process. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#136 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#136 (text+ko) ==== @@ -252,6 +252,8 @@ case MOD_LOAD: if (mpc->mpc_loadtime_flags & MPC_LOADTIME_FLAG_NOTLATE && mac_late) { + printf("mac_policy_modevent: can't load %s policy " + "after booting\n", mpc->mpc_name); error = EBUSY; break; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 22:34: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B11537B417; Wed, 1 May 2002 22:34:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BBBDE37B416 for ; Wed, 1 May 2002 22:34:01 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g425Y1B88287 for perforce@freebsd.org; Wed, 1 May 2002 22:34:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 22:34:01 -0700 (PDT) Message-Id: <200205020534.g425Y1B88287@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10661 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10661 Change 10661 by rwatson@rwatson_tislabs on 2002/05/01 22:33:32 Use opt_mac.h only for options MAC, not for other MAC-related options, since those options simply rely on the files being linked into the kernel. This avoids rebuilding any piece of the kernel with MAC-conditional behavior just because the set of policy modules changed. Affected files ... ... //depot/projects/trustedbsd/mac/sys/conf/options#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/options#17 (text+ko) ==== @@ -107,8 +107,8 @@ # TrustedBSD and POSIX.1e Kernel Options CAPABILITIES opt_cap.h MAC opt_mac.h -MAC_NONE opt_mac.h -SEBSD opt_mac.h +MAC_NONE opt_dontuse.h +SEBSD opt_dontuse.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 1 22:45:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6B5037B404; Wed, 1 May 2002 22:45:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 44CC437B416 for ; Wed, 1 May 2002 22:45:18 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g425jIK89741 for perforce@freebsd.org; Wed, 1 May 2002 22:45:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 1 May 2002 22:45:18 -0700 (PDT) Message-Id: <200205020545.g425jIK89741@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10664 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10664 Change 10664 by rwatson@rwatson_tislabs on 2002/05/01 22:45:10 Sample loader.conf entries to load various MAC modules. This is now the preferred way to load all MAC modules but sebsd and mac_none, which are currently linked in via MAC and their respective options. By default, these various modules are not loaded; some may be loaded at runtime. Affected files ... ... //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#7 (text+ko) ==== @@ -258,6 +258,20 @@ # Override DSDT in BIOS by this file ############################################################## +### TrustedBSD MAC settings ################################## +############################################################## + +babyaudit_load="NO" # Baby auditing module +mac_biba_load="NO" # Biba MAC policy +mac_bsdextended_load="NO" # BSD/extended MAC policy +mac_ifoff="NO" # Interface silencing policy +mac_mls_load="NO" # MLS MAC policy +mac_none_load="NO" # Null MAC policy +mac_seeotheruids_load="NO" # UID visbility MAC policy +mac_te_load="NO" # Type Enforcement policy +#sebsd_load="NO" # Security-Enhanced BSD module + +############################################################## ### Module loading syntax example ########################## ############################################################## To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 5:51:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F11C37B43B; Thu, 2 May 2002 05:49:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5169B37B400 for ; Thu, 2 May 2002 05:49:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42CnBm82603 for perforce@freebsd.org; Thu, 2 May 2002 05:49:11 -0700 (PDT) (envelope-from dfr@freebsd.org) Date: Thu, 2 May 2002 05:49:11 -0700 (PDT) Message-Id: <200205021249.g42CnBm82603@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson Subject: PERFORCE change 10678 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10678 Change 10678 by dfr@dfr_home on 2002/05/02 05:48:25 Allow both elf32 and elf64 in the same kernel. Affected files ... ... //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#5 edit ... //depot/projects/ia64/sys/compat/svr4/imgact_svr4.c#3 edit ... //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#4 edit ... //depot/projects/ia64/sys/conf/files#19 edit ... //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#5 edit ... //depot/projects/ia64/sys/i386/include/elf.h#2 edit ... //depot/projects/ia64/sys/i386/linux/imgact_linux.c#3 edit ... //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#8 edit ... //depot/projects/ia64/sys/ia64/include/elf.h#3 edit ... //depot/projects/ia64/sys/kern/imgact_aout.c#5 edit ... //depot/projects/ia64/sys/kern/imgact_elf.c#4 edit ... //depot/projects/ia64/sys/kern/imgact_elf32.c#1 add ... //depot/projects/ia64/sys/kern/imgact_elf64.c#1 add ... //depot/projects/ia64/sys/kern/imgact_elfN.c#1 add ... //depot/projects/ia64/sys/kern/imgact_gzip.c#4 edit ... //depot/projects/ia64/sys/kern/init_main.c#7 edit ... //depot/projects/ia64/sys/kern/kern_exec.c#13 edit ... //depot/projects/ia64/sys/kern/link_elf.c#5 edit ... //depot/projects/ia64/sys/powerpc/include/elf.h#2 edit ... //depot/projects/ia64/sys/sparc64/include/elf.h#2 edit ... //depot/projects/ia64/sys/sys/elf_generic.h#2 edit ... //depot/projects/ia64/sys/sys/imgact.h#4 edit ... //depot/projects/ia64/sys/sys/imgact_elf.h#3 edit ... //depot/projects/ia64/sys/sys/sysent.h#6 edit ... //depot/projects/ia64/sys/sys/user.h#5 edit ... //depot/projects/ia64/sys/vm/vm_extern.h#7 edit ... //depot/projects/ia64/sys/vm/vm_map.c#12 edit Differences ... ==== //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#5 (text+ko) ==== @@ -465,7 +465,7 @@ peofs + PECOFF_HDR_SIZE, (caddr_t) sh, scnsiz); if ((error = exec_extract_strings(imgp)) != 0) goto fail; - exec_new_vmspace(imgp); + exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK); vmspace = imgp->proc->p_vmspace; for (i = 0; i < fp->f_nscns; i++) { prot = VM_PROT_WRITE; /* XXX for relocation? */ ==== //depot/projects/ia64/sys/compat/svr4/imgact_svr4.c#3 (text+ko) ==== @@ -119,7 +119,7 @@ /* * Destroy old process VM and create a new one (with a new stack) */ - exec_new_vmspace(imgp); + exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK); vmspace = imgp->proc->p_vmspace; /* ==== //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#4 (text+ko) ==== @@ -179,7 +179,7 @@ &svr4_szsigcode, NULL, "SVR4", - elf_coredump, + elf32_coredump, NULL, SVR4_MINSIGSTKSZ }; @@ -376,7 +376,7 @@ switch(type) { case MOD_LOAD: - if (elf_insert_brand_entry(&svr4_brand) < 0) + if (elf32_insert_brand_entry(&svr4_brand) < 0) error = EINVAL; if (error) printf("cannot insert svr4 elf brand handler\n"); @@ -385,9 +385,9 @@ break; case MOD_UNLOAD: /* Only allow the emulator to be removed if it isn't in use. */ - if (elf_brand_inuse(&svr4_brand) != 0) { + if (elf32_brand_inuse(&svr4_brand) != 0) { error = EBUSY; - } else if (elf_remove_brand_entry(&svr4_brand) < 0) { + } else if (elf32_remove_brand_entry(&svr4_brand) < 0) { error = EINVAL; } ==== //depot/projects/ia64/sys/conf/files#19 (text+ko) ==== @@ -810,7 +810,9 @@ isofs/cd9660/cd9660_util.c optional cd9660 isofs/cd9660/cd9660_vfsops.c optional cd9660 isofs/cd9660/cd9660_vnops.c optional cd9660 -kern/imgact_elf.c standard +kern/imgact_elf32.c standard +kern/imgact_elf64.c standard +kern/imgact_elfN.c standard kern/imgact_shell.c standard kern/inflate.c optional gzip kern/init_main.c standard ==== //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#5 (text+ko) ==== @@ -333,7 +333,7 @@ return error; } - exec_new_vmspace(imgp); + exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK); vmspace = imgp->proc->p_vmspace; for (i = 0; i < nscns; i++) { ==== //depot/projects/ia64/sys/i386/include/elf.h#2 (text+ko) ==== @@ -69,8 +69,6 @@ typedef Elf32_Off Elf32_Hashelt; -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ ==== //depot/projects/ia64/sys/i386/linux/imgact_linux.c#3 (text+ko) ==== @@ -118,7 +118,7 @@ /* * Destroy old process VM and create a new one (with a new stack) */ - exec_new_vmspace(imgp); + exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK); vmspace = imgp->proc->p_vmspace; /* ==== //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#8 (text+ko) ==== @@ -792,7 +792,7 @@ &linux_szsigcode, linux_prepsyscall, "Linux ELF", - elf_coredump, + elf32_coredump, exec_linux_imgact_try, LINUX_MINSIGSTKSZ }; @@ -832,7 +832,7 @@ case MOD_LOAD: for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo) - if (elf_insert_brand_entry(*brandinfo) < 0) + if (elf32_insert_brand_entry(*brandinfo) < 0) error = EINVAL; if (error == 0) { SET_FOREACH(lihp, linux_ioctl_handler_set) @@ -845,12 +845,12 @@ case MOD_UNLOAD: for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo) - if (elf_brand_inuse(*brandinfo)) + if (elf32_brand_inuse(*brandinfo)) error = EBUSY; if (error == 0) { for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo) - if (elf_remove_brand_entry(*brandinfo) < 0) + if (elf32_remove_brand_entry(*brandinfo) < 0) error = EINVAL; } if (error == 0) { ==== //depot/projects/ia64/sys/ia64/include/elf.h#3 (text+ko) ==== @@ -33,9 +33,13 @@ * ELF definitions for the IA-64 architecture. */ +#ifndef __ELF_WORD_SIZE +#define __ELF_WORD_SIZE 64 +#endif + #include /* Definitions common to all 64 bit architectures. */ +#include /* Definitions common to all 32 bit architectures. */ -#define __ELF_WORD_SIZE 64 /* Used by */ #include #define ELF_ARCH EM_IA_64 @@ -52,14 +56,19 @@ typedef struct { /* Auxiliary vector entry on initial stack */ int a_type; /* Entry type. */ union { + int a_val; /* Integer value. */ + } a_un; +} Elf32_Auxinfo; + +typedef struct { /* Auxiliary vector entry on initial stack */ + int a_type; /* Entry type. */ + union { long a_val; /* Integer value. */ void *a_ptr; /* Address. */ void (*a_fcn)(void); /* Function pointer (not used). */ } a_un; } Elf64_Auxinfo; -__ElfType(Auxinfo); - /* * Types of dynamic symbol hash table bucket and chain elements. * @@ -67,10 +76,9 @@ * typedef is required. */ -typedef Elf64_Half Elf64_Hashelt; +typedef Elf32_Off Elf32_Hashelt; +typedef Elf64_Half Elf64_Hashelt; -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ @@ -205,7 +213,11 @@ #define R_IA64_LDXMOV 0x87 /* immediate22 special */ /* Define "machine" characteristics */ +#if __ELF_WORD_SIZE == 32 +#define ELF_TARG_CLASS ELFCLASS32 +#else #define ELF_TARG_CLASS ELFCLASS64 +#endif #define ELF_TARG_DATA ELFDATA2LSB #define ELF_TARG_MACH EM_IA_64 #define ELF_TARG_VER 1 ==== //depot/projects/ia64/sys/kern/imgact_aout.c#5 (text+ko) ==== @@ -178,7 +178,7 @@ /* * Destroy old process VM and create a new one (with a new stack) */ - exec_new_vmspace(imgp); + exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK); /* * The vm space can be changed by exec_new_vmspace ==== //depot/projects/ia64/sys/kern/imgact_elf.c#4 (text+ko) ==== @@ -70,21 +70,21 @@ __ElfType(Brandinfo); __ElfType(Auxargs); -static int elf_check_header(const Elf_Ehdr *hdr); -static int elf_freebsd_fixup(register_t **stack_base, +static int __elfN(check_header)(const Elf_Ehdr *hdr); +static int __elfN(freebsd_fixup)(register_t **stack_base, struct image_params *imgp); -static int elf_load_file(struct proc *p, const char *file, u_long *addr, +static int __elfN(load_file)(struct proc *p, const char *file, u_long *addr, u_long *entry); -static int elf_load_section(struct proc *p, +static int __elfN(load_section)(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot); -static int exec_elf_imgact(struct image_params *imgp); +static int __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp); static int elf_trace = 0; SYSCTL_INT(_debug, OID_AUTO, elf_trace, CTLFLAG_RW, &elf_trace, 0, ""); -struct sysentvec elf_freebsd_sysvec = { +struct sysentvec __elfN(freebsd_sysvec) = { SYS_MAXSYSCALL, sysent, 0, @@ -93,13 +93,13 @@ 0, 0, 0, - elf_freebsd_fixup, + __elfN(freebsd_fixup), sendsig, sigcode, &szsigcode, 0, "FreeBSD ELF", - elf_coredump, + __elfN(coredump), NULL, MINSIGSTKSZ }; @@ -109,7 +109,7 @@ "FreeBSD", "", "/usr/libexec/ld-elf.so.1", - &elf_freebsd_sysvec + &__elfN(freebsd_sysvec) }; static Elf_Brandinfo *elf_brand_list[MAX_BRANDS] = { &freebsd_brand_info, @@ -118,7 +118,7 @@ }; int -elf_insert_brand_entry(Elf_Brandinfo *entry) +__elfN(insert_brand_entry)(Elf_Brandinfo *entry) { int i; @@ -134,7 +134,7 @@ } int -elf_remove_brand_entry(Elf_Brandinfo *entry) +__elfN(remove_brand_entry)(Elf_Brandinfo *entry) { int i; @@ -150,7 +150,7 @@ } int -elf_brand_inuse(Elf_Brandinfo *entry) +__elfN(brand_inuse)(Elf_Brandinfo *entry) { struct proc *p; int rval = FALSE; @@ -168,7 +168,7 @@ } static int -elf_check_header(const Elf_Ehdr *hdr) +__elfN(check_header)(const Elf_Ehdr *hdr) { if (!IS_ELF(*hdr) || hdr->e_ident[EI_CLASS] != ELF_TARG_CLASS || @@ -186,7 +186,7 @@ } static int -elf_load_section(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot) +__elfN(load_section)(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot) { size_t map_len; vm_offset_t map_addr; @@ -322,7 +322,7 @@ * the entry point for the loaded file. */ static int -elf_load_file(struct proc *p, const char *file, u_long *addr, u_long *entry) +__elfN(load_file)(struct proc *p, const char *file, u_long *addr, u_long *entry) { struct { struct nameidata nd; @@ -394,7 +394,7 @@ goto fail; hdr = (const Elf_Ehdr *)imgp->image_header; - if ((error = elf_check_header(hdr)) != 0) + if ((error = __elfN(check_header)(hdr)) != 0) goto fail; if (hdr->e_type == ET_DYN) rbase = *addr; @@ -424,12 +424,13 @@ if (phdr[i].p_flags & PF_R) prot |= VM_PROT_READ; - if ((error = elf_load_section(p, vmspace, nd->ni_vp, - phdr[i].p_offset, - (caddr_t)phdr[i].p_vaddr + - rbase, - phdr[i].p_memsz, - phdr[i].p_filesz, prot)) != 0) + if ((error = __elfN(load_section) + (p, vmspace, nd->ni_vp, + phdr[i].p_offset, + (caddr_t)(uintptr_t)phdr[i].p_vaddr + + rbase, + phdr[i].p_memsz, + phdr[i].p_filesz, prot)) != 0) goto fail; /* * Establish the base address if this is the @@ -457,20 +458,10 @@ return error; } -/* - * non static, as it can be overridden by start_init() - */ -#ifdef __ia64__ -int fallback_elf_brand = ELFOSABI_FREEBSD; -#else -int fallback_elf_brand = -1; -#endif -SYSCTL_INT(_kern, OID_AUTO, fallback_elf_brand, CTLFLAG_RW, - &fallback_elf_brand, -1, - "ELF brand of last resort"); +extern int fallback_elf_brand; static int -exec_elf_imgact(struct image_params *imgp) +__CONCAT(exec_, __elfN(imgact))(struct image_params *imgp) { const Elf_Ehdr *hdr = (const Elf_Ehdr *) imgp->image_header; const Elf_Phdr *phdr; @@ -490,7 +481,7 @@ /* * Do we have a valid ELF header ? */ - if (elf_check_header(hdr) != 0 || hdr->e_type != ET_EXEC) + if (__elfN(check_header)(hdr) != 0 || hdr->e_type != ET_EXEC) return -1; /* @@ -522,7 +513,8 @@ if ((error = exec_extract_strings(imgp)) != 0) goto fail; - exec_new_vmspace(imgp); + exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, + USRSTACK); vmspace = imgp->proc->p_vmspace; @@ -538,12 +530,13 @@ if (phdr[i].p_flags & PF_R) prot |= VM_PROT_READ; - if ((error = elf_load_section(imgp->proc, - vmspace, imgp->vp, - phdr[i].p_offset, - (caddr_t)phdr[i].p_vaddr, - phdr[i].p_memsz, - phdr[i].p_filesz, prot)) != 0) + if ((error = __elfN(load_section) + (imgp->proc, + vmspace, imgp->vp, + phdr[i].p_offset, + (caddr_t)(uintptr_t)phdr[i].p_vaddr, + phdr[i].p_memsz, + phdr[i].p_filesz, prot)) != 0) goto fail; /* @@ -652,10 +645,11 @@ path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); snprintf(path, MAXPATHLEN, "%s%s", brand_info->emul_path, interp); - if ((error = elf_load_file(imgp->proc, path, &addr, - &imgp->entry_addr)) != 0) { - if ((error = elf_load_file(imgp->proc, interp, &addr, - &imgp->entry_addr)) != 0) { + if ((error = __elfN(load_file)(imgp->proc, path, &addr, + &imgp->entry_addr)) != 0) { + if ((error = __elfN(load_file) + (imgp->proc, interp, &addr, + &imgp->entry_addr)) != 0) { uprintf("ELF interpreter %s not found\n", path); free(path, M_TEMP); goto fail; @@ -686,7 +680,7 @@ } static int -elf_freebsd_fixup(register_t **stack_base, struct image_params *imgp) +__elfN(freebsd_fixup)(register_t **stack_base, struct image_params *imgp) { Elf_Auxargs *args = (Elf_Auxargs *)imgp->auxargs; register_t *pos; @@ -737,17 +731,17 @@ static void cb_put_phdr(vm_map_entry_t, void *); static void cb_size_segment(vm_map_entry_t, void *); static void each_writable_segment(struct proc *, segment_callback, void *); -static int elf_corehdr(struct thread *, struct vnode *, struct ucred *, +static int __elfN(corehdr)(struct thread *, struct vnode *, struct ucred *, int, void *, size_t); -static void elf_puthdr(struct proc *, void *, size_t *, +static void __elfN(puthdr)(struct proc *, void *, size_t *, const prstatus_t *, const prfpregset_t *, const prpsinfo_t *, int); -static void elf_putnote(void *, size_t *, const char *, int, +static void __elfN(putnote)(void *, size_t *, const char *, int, const void *, size_t); extern int osreldate; int -elf_coredump(td, vp, limit) +__elfN(coredump)(td, vp, limit) struct thread *td; register struct vnode *vp; off_t limit; @@ -770,7 +764,7 @@ * size is calculated. */ hdrsize = 0; - elf_puthdr((struct proc *)NULL, (void *)NULL, &hdrsize, + __elfN(puthdr)((struct proc *)NULL, (void *)NULL, &hdrsize, (const prstatus_t *)NULL, (const prfpregset_t *)NULL, (const prpsinfo_t *)NULL, seginfo.count); @@ -785,7 +779,7 @@ if (hdr == NULL) { return EINVAL; } - error = elf_corehdr(td, vp, cred, seginfo.count, hdr, hdrsize); + error = __elfN(corehdr)(td, vp, cred, seginfo.count, hdr, hdrsize); /* Write the contents of all of the writable segments. */ if (error == 0) { @@ -797,7 +791,7 @@ offset = hdrsize; for (i = 0; i < seginfo.count; i++) { error = vn_rdwr_inchunks(UIO_WRITE, vp, - (caddr_t)php->p_vaddr, + (caddr_t)(uintptr_t)php->p_vaddr, php->p_filesz, offset, UIO_USERSPACE, IO_UNIT | IO_DIRECT, cred, (int *)NULL, curthread); /* XXXKSE */ if (error != 0) @@ -911,7 +905,7 @@ * the page boundary. */ static int -elf_corehdr(td, vp, cred, numsegs, hdr, hdrsize) +__elfN(corehdr)(td, vp, cred, numsegs, hdr, hdrsize) struct thread *td; struct vnode *vp; struct ucred *cred; @@ -957,7 +951,7 @@ /* Fill in the header. */ bzero(hdr, hdrsize); off = 0; - elf_puthdr(p, hdr, &off, status, fpregset, psinfo, numsegs); + __elfN(puthdr)(p, hdr, &off, status, fpregset, psinfo, numsegs); free(tempdata, M_TEMP); @@ -967,7 +961,7 @@ } static void -elf_puthdr(struct proc *p, void *dst, size_t *off, const prstatus_t *status, +__elfN(puthdr)(struct proc *p, void *dst, size_t *off, const prstatus_t *status, const prfpregset_t *fpregset, const prpsinfo_t *psinfo, int numsegs) { size_t ehoff; @@ -982,11 +976,11 @@ *off += (numsegs + 1) * sizeof(Elf_Phdr); noteoff = *off; - elf_putnote(dst, off, "FreeBSD", NT_PRSTATUS, status, + __elfN(putnote)(dst, off, "FreeBSD", NT_PRSTATUS, status, sizeof *status); - elf_putnote(dst, off, "FreeBSD", NT_FPREGSET, fpregset, + __elfN(putnote)(dst, off, "FreeBSD", NT_FPREGSET, fpregset, sizeof *fpregset); - elf_putnote(dst, off, "FreeBSD", NT_PRPSINFO, psinfo, + __elfN(putnote)(dst, off, "FreeBSD", NT_PRPSINFO, psinfo, sizeof *psinfo); notesz = *off - noteoff; @@ -1049,7 +1043,7 @@ } static void -elf_putnote(void *dst, size_t *off, const char *name, int type, +__elfN(putnote)(void *dst, size_t *off, const char *name, int type, const void *desc, size_t descsz) { Elf_Note note; @@ -1071,5 +1065,10 @@ /* * Tell kern_execve.c about it, with a little help from the linker. */ -static struct execsw elf_execsw = {exec_elf_imgact, "ELF"}; -EXEC_SET(elf, elf_execsw); +#if __ELF_WORD_SIZE == 32 +static struct execsw elf_execsw = {exec_elf32_imgact, "ELF32"}; +EXEC_SET(elf32, elf_execsw); +#else +static struct execsw elf_execsw = {exec_elf64_imgact, "ELF64"}; +EXEC_SET(elf64, elf_execsw); +#endif ==== //depot/projects/ia64/sys/kern/imgact_gzip.c#4 (text+ko) ==== @@ -229,7 +229,7 @@ /* * Destroy old process VM and create a new one (with a new stack) */ - exec_new_vmspace(gz->ip); + exec_new_vmspace(gz->ip, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK); vmspace = gz->ip->proc->p_vmspace; ==== //depot/projects/ia64/sys/kern/init_main.c#7 (text+ko) ==== @@ -252,6 +252,9 @@ } SYSINIT(boot_verbose, SI_SUB_TUNABLES, SI_ORDER_ANY, set_boot_verbose, NULL) +static struct sysentvec null_sysvec; + + /* *************************************************************************** **** @@ -316,11 +319,7 @@ session0.s_count = 1; session0.s_leader = p; -#ifdef __ELF__ - p->p_sysent = &elf_freebsd_sysvec; -#else - p->p_sysent = &aout_sysvec; -#endif + p->p_sysent = &null_sysvec; ke = &proc0.p_kse; /* XXXKSE */ kg = &proc0.p_ksegrp; /* XXXKSE */ ==== //depot/projects/ia64/sys/kern/kern_exec.c#13 (text+ko) ==== @@ -266,7 +266,10 @@ /* * Copy out strings (args and env) and initialize stack base */ - stack_base = exec_copyout_strings(imgp); + if (p->p_sysent->sv_copyout_strings) + stack_base = (*p->p_sysent->sv_copyout_strings)(imgp); + else + stack_base = exec_copyout_strings(imgp); p->p_vmspace->vm_minsaddr = (char *)stack_base; /* @@ -454,8 +457,12 @@ pargs_drop(pa); /* Set values passed into the program in registers. */ - setregs(td, imgp->entry_addr, (u_long)(uintptr_t)stack_base, - imgp->ps_strings); + if (p->p_sysent->sv_setregs) + (*p->p_sysent->sv_setregs)(td, imgp->entry_addr, + (u_long)(uintptr_t)stack_base, imgp->ps_strings); + else + setregs(td, imgp->entry_addr, (u_long)(uintptr_t)stack_base, + imgp->ps_strings); /* Cache arguments if they fit inside our allowance */ i = imgp->endargs - imgp->stringbase; @@ -582,17 +589,19 @@ * automatically in trap.c. */ int -exec_new_vmspace(imgp) +exec_new_vmspace(imgp, minuser, maxuser, stack_addr) struct image_params *imgp; + vm_offset_t minuser, maxuser, stack_addr; { int error; struct execlist *ep; struct proc *p = imgp->proc; struct vmspace *vmspace = p->p_vmspace; - vm_offset_t stack_addr = USRSTACK - maxssiz; GIANT_REQUIRED; + stack_addr = stack_addr - maxssiz; + imgp->vmspace_destroyed = 1; /* @@ -606,13 +615,15 @@ * otherwise, create a new VM space so that other threads are * not disrupted */ - if (vmspace->vm_refcnt == 1) { + if (vmspace->vm_refcnt == 1 + && vm_map_min(&vmspace->vm_map) == minuser + && vm_map_max(&vmspace->vm_map) == maxuser) { if (vmspace->vm_shm) shmexit(p); - pmap_remove_pages(vmspace_pmap(vmspace), 0, VM_MAXUSER_ADDRESS); - vm_map_remove(&vmspace->vm_map, 0, VM_MAXUSER_ADDRESS); + pmap_remove_pages(vmspace_pmap(vmspace), minuser, maxuser); + vm_map_remove(&vmspace->vm_map, minuser, maxuser); } else { - vmspace_exec(p); + vmspace_exec(p, minuser, maxuser); vmspace = p->p_vmspace; } ==== //depot/projects/ia64/sys/kern/link_elf.c#5 (text+ko) ==== @@ -62,6 +62,8 @@ #include "linker_if.h" +__ElfType(Hashelt); + typedef struct elf_file { struct linker_file lf; /* Common fields */ int preloaded; /* Was file pre-loaded */ ==== //depot/projects/ia64/sys/powerpc/include/elf.h#2 (text+ko) ==== @@ -72,8 +72,6 @@ typedef Elf32_Off Elf32_Hashelt; -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ ==== //depot/projects/ia64/sys/sparc64/include/elf.h#2 (text+ko) ==== @@ -66,8 +66,6 @@ typedef Elf64_Half Elf64_Hashelt; -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ ==== //depot/projects/ia64/sys/sys/elf_generic.h#2 (text+ko) ==== @@ -50,6 +50,7 @@ #error "Unknown byte order" #endif +#define __elfN(x) __CONCAT(__CONCAT(__CONCAT(elf,__ELF_WORD_SIZE),_),x) #define __ElfN(x) __CONCAT(__CONCAT(__CONCAT(Elf,__ELF_WORD_SIZE),_),x) #define __ELFN(x) __CONCAT(__CONCAT(__CONCAT(ELF,__ELF_WORD_SIZE),_),x) #define __ElfType(x) typedef __ElfN(x) __CONCAT(Elf_,x) ==== //depot/projects/ia64/sys/sys/imgact.h#4 (text+ko) ==== @@ -64,7 +64,8 @@ #ifdef _KERNEL int exec_check_permissions(struct image_params *); int exec_extract_strings(struct image_params *); -int exec_new_vmspace(struct image_params *); +int exec_new_vmspace(struct image_params *, vm_offset_t, vm_offset_t, + vm_offset_t); int exec_shell_imgact(struct image_params *); #endif ==== //depot/projects/ia64/sys/sys/imgact_elf.h#3 (text+ko) ==== @@ -37,6 +37,8 @@ #define AUXARGS_ENTRY(pos, id, val) {suword(pos++, id); suword(pos++, val);} +struct thread; + #if ELF_TARG_CLASS == ELFCLASS32 /* @@ -65,9 +67,10 @@ #define MAX_BRANDS 8 -int elf_brand_inuse(Elf32_Brandinfo *entry); -int elf_insert_brand_entry(Elf32_Brandinfo *entry); -int elf_remove_brand_entry(Elf32_Brandinfo *entry); +int elf32_brand_inuse(Elf32_Brandinfo *entry); +int elf32_insert_brand_entry(Elf32_Brandinfo *entry); +int elf32_remove_brand_entry(Elf32_Brandinfo *entry); +int elf32_coredump(struct thread *, struct vnode *, off_t); #else /* !(ELF_TARG_CLASS == ELFCLASS32) */ @@ -97,16 +100,13 @@ #define MAX_BRANDS 8 -int elf_brand_inuse(Elf64_Brandinfo *entry); -int elf_insert_brand_entry(Elf64_Brandinfo *entry); -int elf_remove_brand_entry(Elf64_Brandinfo *entry); +int elf64_brand_inuse(Elf64_Brandinfo *entry); +int elf64_insert_brand_entry(Elf64_Brandinfo *entry); +int elf64_remove_brand_entry(Elf64_Brandinfo *entry); +int elf64_coredump(struct thread *, struct vnode *, off_t); #endif /* ELF_TARG_CLASS == ELFCLASS32 */ -struct thread; - -int elf_coredump(struct thread *, struct vnode *, off_t); - #endif /* _KERNEL */ #endif /* !_SYS_IMGACT_ELF_H_ */ ==== //depot/projects/ia64/sys/sys/sysent.h#6 (text+ko) ==== @@ -79,6 +79,8 @@ /* function to dump core, or NULL */ int (*sv_imgact_try)(struct image_params *); int sv_minsigstksz; /* minimum signal stack size */ + register_t *(*sv_copyout_strings)(struct image_params *); + void (*sv_setregs)(struct thread *, u_long, u_long, u_long); }; #ifdef _KERNEL ==== //depot/projects/ia64/sys/sys/user.h#5 (text+ko) ==== @@ -74,12 +74,9 @@ * to initialize it in two places: kern/kern_proc.c in the function * fill_kinfo_proc and in lib/libkvm/kvm_proc.c in the function kvm_proclist. */ -#if defined(__alpha__) || defined(__sparc64__) +#if defined(__alpha__) || defined(__sparc64__) || defined(__ia64__) #define KINFO_PROC_SIZE 912 /* the correct size for kinfo_proc */ #endif -#ifdef __ia64__ -#define KINFO_PROC_SIZE 888 -#endif #ifdef __i386__ #define KINFO_PROC_SIZE 648 /* the correct size for kinfo_proc */ #endif ==== //depot/projects/ia64/sys/vm/vm_extern.h#7 (text+ko) ==== @@ -85,7 +85,7 @@ void vm_set_page_size(void); struct vmspace *vmspace_alloc(vm_offset_t, vm_offset_t); struct vmspace *vmspace_fork(struct vmspace *); -void vmspace_exec(struct proc *); +void vmspace_exec(struct proc *, vm_offset_t, vm_offset_t); void vmspace_unshare(struct proc *); void vmspace_free(struct vmspace *); void vmspace_exitfree(struct proc *); ==== //depot/projects/ia64/sys/vm/vm_map.c#12 (text+ko) ==== @@ -2686,14 +2686,13 @@ * mapped to it, then create a new one. The new vmspace is null. */ void -vmspace_exec(struct proc *p) +vmspace_exec(struct proc *p, vm_offset_t minuser, vm_offset_t maxuser) { struct vmspace *oldvmspace = p->p_vmspace; struct vmspace *newvmspace; - vm_map_t map = &p->p_vmspace->vm_map; GIANT_REQUIRED; - newvmspace = vmspace_alloc(map->min_offset, map->max_offset); + newvmspace = vmspace_alloc(minuser, maxuser); bcopy(&oldvmspace->vm_startcopy, &newvmspace->vm_startcopy, (caddr_t) (newvmspace + 1) - (caddr_t) &newvmspace->vm_startcopy); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 5:58:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB8C537B404; Thu, 2 May 2002 05:58:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CD44B37B417 for ; Thu, 2 May 2002 05:58:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42CwNS83683 for perforce@freebsd.org; Thu, 2 May 2002 05:58:23 -0700 (PDT) (envelope-from dfr@freebsd.org) Date: Thu, 2 May 2002 05:58:23 -0700 (PDT) Message-Id: <200205021258.g42CwNS83683@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson Subject: PERFORCE change 10679 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10679 Change 10679 by dfr@dfr_home on 2002/05/02 05:57:39 Add [sf]uword32 and [sf]uword64 to access explicitly sized values in userland. Return retval[1] in edx, not retval[0]. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/support.s#4 edit ... //depot/projects/ia64/sys/ia64/ia64/trap.c#24 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/support.s#4 (text+ko) ==== @@ -192,7 +192,8 @@ * fu{byte,word} : fetch a byte (word) from user memory */ -ENTRY(suword, 2) +ENTRY(suword64, 2) +XENTRY(suword) movl r14=VM_MAXUSER_ADDRESS;; // make sure address is ok cmp.geu p6,p0=in0,r14 @@ -218,9 +219,9 @@ mov ret0=r0 br.ret.sptk.few rp -END(suword) +END(suword64) -ENTRY(suhword, 2) +ENTRY(suword32, 2) movl r14=VM_MAXUSER_ADDRESS;; // make sure address is ok cmp.geu p6,p0=in0,r14 @@ -246,7 +247,7 @@ mov ret0=r0 br.ret.sptk.few rp -END(suhword) +END(suword32) ENTRY(subyte, 2) @@ -276,7 +277,8 @@ END(subyte) -ENTRY(fuword, 1) +ENTRY(fuword64, 1) +XENTRY(fuword) movl r14=VM_MAXUSER_ADDRESS;; // make sure address is ok cmp.geu p6,p0=in0,r14 @@ -301,9 +303,9 @@ br.ret.sptk.few rp -END(fuword) +END(fuword64) -ENTRY(fuhword, 1) +ENTRY(fuword32, 1) movl r14=VM_MAXUSER_ADDRESS;; // make sure address is ok cmp.geu p6,p0=in0,r14 @@ -328,7 +330,7 @@ br.ret.sptk.few rp -END(fuhword) +END(fuword32) ENTRY(fubyte, 1) ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#24 (text+ko) ==== @@ -926,7 +926,7 @@ #include -extern long fuhword(const void *base); +extern long fuword32(const void *base); static void ia32_syscall(struct trapframe *framep) @@ -973,14 +973,16 @@ /* * Code is first argument, followed by actual args. */ - code = fuhword(params); + code = fuword32(params); params += sizeof(int); } else if (code == SYS___syscall) { /* * Like syscall, but code is a quad, so as to maintain * quad alignment for the rest of the arguments. + * We use a 32-bit fetch in case params is not + * aligned. */ - code = fuword(params); + code = fuword32(params); params += sizeof(quad_t); } } @@ -1036,7 +1038,7 @@ switch (error) { case 0: framep->tf_r[FRAME_R8] = td->td_retval[0]; /* eax */ - framep->tf_r[FRAME_R10] = td->td_retval[0]; /* edx */ + framep->tf_r[FRAME_R10] = td->td_retval[1]; /* edx */ ia64_set_eflag(ia64_get_eflag() & ~PSL_C); break; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 6: 2:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F93837B41A; Thu, 2 May 2002 06:00:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9B7F237B41B for ; Thu, 2 May 2002 06:00:26 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42D0QN84013 for perforce@freebsd.org; Thu, 2 May 2002 06:00:26 -0700 (PDT) (envelope-from dfr@freebsd.org) Date: Thu, 2 May 2002 06:00:26 -0700 (PDT) Message-Id: <200205021300.g42D0QN84013@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson Subject: PERFORCE change 10680 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10680 Change 10680 by dfr@dfr_home on 2002/05/02 05:59:55 * Use suword32 instead of suhword. * Rename to avoid conflicts with elf32. * Fix another page-size wrinkle in section mapping code. Affected files ... ... //depot/projects/ia64/sys/ia64/ia32/imgact_ia32.c#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia32/imgact_ia32.c#2 (text+ko) ==== @@ -61,6 +61,7 @@ #include #include +#include #include #include #include @@ -72,28 +73,25 @@ __ElfType(Brandinfo); __ElfType(Auxargs); -#define IA32_USRSTACK (3L*1024*1024*1024) -#define IA32_PS_STRINGS (IA32_USRSTACK - sizeof(struct ia32_ps_strings)) +extern int suword32(void *p, u_int32_t v); -extern int suhword(void *p, u_int32_t v); - -static int elf32_check_header(const Elf32_Ehdr *hdr); -static int elf32_freebsd_fixup(register_t **stack_base, +static int ia32_check_header(const Elf32_Ehdr *hdr); +static int ia32_freebsd_fixup(register_t **stack_base, struct image_params *imgp); -static int elf32_load_file(struct proc *p, const char *file, u_long *addr, +static int ia32_load_file(struct proc *p, const char *file, u_long *addr, u_long *entry); -static int elf32_load_section(struct proc *p, +static int ia32_load_section(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot); -static int exec_elf32_imgact(struct image_params *imgp); -static int elf32_coredump(struct thread *td, struct vnode *vp, off_t limit); -static register_t *elf32_copyout_strings(struct image_params *imgp); -static void elf32_setregs(struct thread *td, u_long entry, u_long stack, +static int exec_ia32_imgact(struct image_params *imgp); +static int ia32_coredump(struct thread *td, struct vnode *vp, off_t limit); +static register_t *ia32_copyout_strings(struct image_params *imgp); +static void ia32_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings); -static int elf32_trace = 0; -SYSCTL_INT(_debug, OID_AUTO, elf32_trace, CTLFLAG_RW, &elf32_trace, 0, ""); +static int ia32_trace = 0; +SYSCTL_INT(_debug, OID_AUTO, ia32_trace, CTLFLAG_RW, &ia32_trace, 0, ""); extern struct sysent ia32_sysent[]; @@ -112,7 +110,7 @@ }; static int ia32_szsigcode = sizeof(ia32_sigcode) & ~3; -struct sysentvec elf32_freebsd_sysvec = { +struct sysentvec ia32_freebsd_sysvec = { SYS_MAXSYSCALL, ia32_sysent, 0, @@ -121,27 +119,27 @@ 0, 0, 0, - elf32_freebsd_fixup, + ia32_freebsd_fixup, sendsig, ia32_sigcode, &ia32_szsigcode, 0, "FreeBSD ELF", - elf32_coredump, + ia32_coredump, NULL, MINSIGSTKSZ, - elf32_copyout_strings, - elf32_setregs + ia32_copyout_strings, + ia32_setregs }; static Elf32_Brandinfo freebsd_brand_info = { ELFOSABI_FREEBSD, "FreeBSD", - "", + "/compat/ia32", "/usr/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec + &ia32_freebsd_sysvec }; -static Elf32_Brandinfo *elf32_brand_list[MAX_BRANDS] = { +static Elf32_Brandinfo *ia32_brand_list[MAX_BRANDS] = { &freebsd_brand_info, NULL, NULL, NULL, NULL, NULL, NULL, NULL @@ -150,7 +148,7 @@ #if 0 int -elf32_insert_brand_entry(Elf32_Brandinfo *entry) +ia32_insert_brand_entry(Elf32_Brandinfo *entry) { int i; @@ -202,7 +200,7 @@ #endif static int -elf32_check_header(const Elf32_Ehdr *hdr) +ia32_check_header(const Elf32_Ehdr *hdr) { if (!IS_ELF(*hdr) || hdr->e_ident[EI_CLASS] != ELF_TARG_CLASS || @@ -225,7 +223,7 @@ #define trunc_page4k(x) ((x) & ~(PAGE4K_MASK)) static int -elf32_map_partial(vm_map_t map, vm_object_t object, vm_ooffset_t offset, +ia32_map_partial(vm_map_t map, vm_object_t object, vm_ooffset_t offset, vm_offset_t start, vm_offset_t end, vm_prot_t prot, vm_prot_t max) { @@ -272,32 +270,79 @@ } static int -elf32_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset, +ia32_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset, vm_offset_t start, vm_offset_t end, vm_prot_t prot, vm_prot_t max, int cow) { int rv; if (start != trunc_page(start)) { - rv = elf32_map_partial(map, object, offset, + rv = ia32_map_partial(map, object, offset, start, round_page(start), prot, max); if (rv) return rv; + offset += round_page(start) - start; start = round_page(start); - offset = round_page(offset); } if (end != round_page(end)) { - rv = elf32_map_partial(map, object, offset, + rv = ia32_map_partial(map, object, + offset + trunc_page(end) - start, trunc_page(end), end, prot, max); if (rv) return rv; end = trunc_page(end); } if (end > start) { - vm_map_lock(map); - rv = vm_map_insert(map, object, offset, start, end, - prot, max, cow); - vm_map_unlock(map); + if (offset & PAGE_MASK) { + vm_offset_t data_buf, off; + vm_size_t sz; + int error; + + /* + * The mapping is not page aligned. This means we have + * to copy the data. Sigh. + */ + rv = vm_map_find(map, 0, 0, + &start, end - start, + FALSE, prot, max, 0); + if (rv) + return rv; + while (start < end) { + vm_object_reference(object); + rv = vm_map_find(exec_map, + object, + trunc_page(offset), + &data_buf, + 2*PAGE_SIZE, + TRUE, + VM_PROT_READ, + VM_PROT_ALL, + (MAP_COPY_ON_WRITE + | MAP_PREFAULT_PARTIAL)); + if (rv != KERN_SUCCESS) { + vm_object_deallocate(object); + return rv; + } + off = offset - trunc_page(offset); + sz = end - start; + if (sz > PAGE_SIZE) + sz = PAGE_SIZE; + error = copyout((caddr_t)data_buf+off, + (caddr_t)start, sz); + vm_map_remove(exec_map, data_buf, + data_buf + 2*PAGE_SIZE); + if (error) { + return KERN_FAILURE; + } + start += sz; + } + rv = KERN_SUCCESS; + } else { + vm_map_lock(map); + rv = vm_map_insert(map, object, offset, start, end, + prot, max, cow); + vm_map_unlock(map); + } return rv; } else { return KERN_SUCCESS; @@ -305,7 +350,7 @@ } static int -elf32_load_section(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot) +ia32_load_section(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot) { size_t map_len; vm_offset_t map_addr; @@ -331,7 +376,7 @@ */ if ((off_t)filsz + offset > object->un_pager.vnp.vnp_size || filsz > memsz) { - uprintf("elf32_load_section: truncated ELF file\n"); + uprintf("ia32_load_section: truncated ELF file\n"); return (ENOEXEC); } @@ -351,7 +396,7 @@ if (map_len != 0) { vm_object_reference(object); - rv = elf32_map_insert(&vmspace->vm_map, + rv = ia32_map_insert(&vmspace->vm_map, object, file_addr, /* file offset */ map_addr, /* virtual start */ @@ -383,7 +428,7 @@ /* This had damn well better be true! */ if (map_len != 0) { - rv = elf32_map_insert(&vmspace->vm_map, NULL, 0, + rv = ia32_map_insert(&vmspace->vm_map, NULL, 0, map_addr, map_addr + map_len, VM_PROT_ALL, VM_PROT_ALL, 0); if (rv != KERN_SUCCESS) { @@ -420,8 +465,8 @@ /* * set it to the specified protection */ - vm_map_protect(&vmspace->vm_map, map_addr, map_addr + map_len, prot, - FALSE); + vm_map_protect(&vmspace->vm_map, trunc_page(map_addr), + round_page(map_addr + map_len), prot, FALSE); return error; } @@ -439,7 +484,7 @@ * the entry point for the loaded file. */ static int -elf32_load_file(struct proc *p, const char *file, u_long *addr, u_long *entry) +ia32_load_file(struct proc *p, const char *file, u_long *addr, u_long *entry) { struct { struct nameidata nd; @@ -458,7 +503,7 @@ int error, i, numsegs; if (curthread->td_proc != p) - panic("elf32_load_file - thread"); /* XXXKSE DIAGNOSTIC */ + panic("ia32_load_file - thread"); /* XXXKSE DIAGNOSTIC */ tempdata = malloc(sizeof(*tempdata), M_TEMP, M_WAITOK); nd = &tempdata->nd; @@ -511,7 +556,7 @@ goto fail; hdr = (const Elf32_Ehdr *)imgp->image_header; - if ((error = elf32_check_header(hdr)) != 0) + if ((error = ia32_check_header(hdr)) != 0) goto fail; if (hdr->e_type == ET_DYN) rbase = *addr; @@ -541,7 +586,7 @@ if (phdr[i].p_flags & PF_R) prot |= VM_PROT_READ; - if ((error = elf32_load_section(p, vmspace, nd->ni_vp, + if ((error = ia32_load_section(p, vmspace, nd->ni_vp, phdr[i].p_offset, (caddr_t)(uintptr_t)phdr[i].p_vaddr + rbase, @@ -578,16 +623,16 @@ * non static, as it can be overridden by start_init() */ #ifdef __ia64__ -int fallback_elf32_brand = ELFOSABI_FREEBSD; +int fallback_ia32_brand = ELFOSABI_FREEBSD; #else -int fallback_elf32_brand = -1; +int fallback_ia32_brand = -1; #endif -SYSCTL_INT(_kern, OID_AUTO, fallback_elf32_brand, CTLFLAG_RW, - &fallback_elf32_brand, -1, +SYSCTL_INT(_kern, OID_AUTO, fallback_ia32_brand, CTLFLAG_RW, + &fallback_ia32_brand, -1, "ELF brand of last resort"); static int -exec_elf32_imgact(struct image_params *imgp) +exec_ia32_imgact(struct image_params *imgp) { const Elf32_Ehdr *hdr = (const Elf32_Ehdr *) imgp->image_header; const Elf32_Phdr *phdr; @@ -607,7 +652,7 @@ /* * Do we have a valid ELF header ? */ - if (elf32_check_header(hdr) != 0 || hdr->e_type != ET_EXEC) + if (ia32_check_header(hdr) != 0 || hdr->e_type != ET_EXEC) return -1; /* @@ -639,7 +684,7 @@ if ((error = exec_extract_strings(imgp)) != 0) goto fail; - exec_new_vmspace(imgp, IA32_USRSTACK); + exec_new_vmspace(imgp, VM_MIN_ADDRESS, IA32_USRSTACK, IA32_USRSTACK); vmspace = imgp->proc->p_vmspace; @@ -655,7 +700,7 @@ if (phdr[i].p_flags & PF_R) prot |= VM_PROT_READ; - if ((error = elf32_load_section(imgp->proc, + if ((error = ia32_load_section(imgp->proc, vmspace, imgp->vp, phdr[i].p_offset, (caddr_t)(uintptr_t)phdr[i].p_vaddr, @@ -719,7 +764,7 @@ /* If the executable has a brand, search for it in the brand list. */ if (brand_info == NULL) { for (i = 0; i < MAX_BRANDS; i++) { - Elf32_Brandinfo *bi = elf32_brand_list[i]; + Elf32_Brandinfo *bi = ia32_brand_list[i]; if (bi != NULL && (hdr->e_ident[EI_OSABI] == bi->brand @@ -735,7 +780,7 @@ /* Lacking a known brand, search for a recognized interpreter. */ if (brand_info == NULL && interp != NULL) { for (i = 0; i < MAX_BRANDS; i++) { - Elf32_Brandinfo *bi = elf32_brand_list[i]; + Elf32_Brandinfo *bi = ia32_brand_list[i]; if (bi != NULL && strcmp(interp, bi->interp_path) == 0) { @@ -748,9 +793,9 @@ /* Lacking a recognized interpreter, try the default brand */ if (brand_info == NULL) { for (i = 0; i < MAX_BRANDS; i++) { - Elf32_Brandinfo *bi = elf32_brand_list[i]; + Elf32_Brandinfo *bi = ia32_brand_list[i]; - if (bi != NULL && fallback_elf32_brand == bi->brand) { + if (bi != NULL && fallback_ia32_brand == bi->brand) { brand_info = bi; break; } @@ -769,9 +814,9 @@ path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); snprintf(path, MAXPATHLEN, "%s%s", brand_info->emul_path, interp); - if ((error = elf32_load_file(imgp->proc, path, &addr, + if ((error = ia32_load_file(imgp->proc, path, &addr, &imgp->entry_addr)) != 0) { - if ((error = elf32_load_file(imgp->proc, interp, &addr, + if ((error = ia32_load_file(imgp->proc, interp, &addr, &imgp->entry_addr)) != 0) { uprintf("ELF interpreter %s not found\n", path); free(path, M_TEMP); @@ -793,7 +838,7 @@ elf32_auxargs->base = addr; elf32_auxargs->flags = 0; elf32_auxargs->entry = entry; - elf32_auxargs->trace = elf32_trace; + elf32_auxargs->trace = ia32_trace; imgp->auxargs = elf32_auxargs; imgp->interpreted = 0; @@ -802,10 +847,10 @@ return error; } -#define AUXARGS32_ENTRY(pos, id, val) {suhword(pos++, id); suhword(pos++, val);} +#define AUXARGS32_ENTRY(pos, id, val) {suword32(pos++, id); suword32(pos++, val);} static int -elf32_freebsd_fixup(register_t **stack_base, struct image_params *imgp) +ia32_freebsd_fixup(register_t **stack_base, struct image_params *imgp) { Elf32_Auxargs *args = (Elf32_Auxargs *)imgp->auxargs; u_int32_t *pos; @@ -831,7 +876,7 @@ imgp->auxargs = NULL; (*(u_int32_t **)stack_base)--; - suhword(*stack_base, (long) imgp->argc); + suword32(*stack_base, (long) imgp->argc); return 0; } @@ -856,17 +901,17 @@ static void cb_put_phdr(vm_map_entry_t, void *); static void cb_size_segment(vm_map_entry_t, void *); static void each_writable_segment(struct proc *, segment_callback, void *); -static int elf32_corehdr(struct thread *, struct vnode *, struct ucred *, +static int ia32_corehdr(struct thread *, struct vnode *, struct ucred *, int, void *, size_t); -static void elf32_puthdr(struct proc *, void *, size_t *, +static void ia32_puthdr(struct proc *, void *, size_t *, const prstatus_t *, const prfpregset_t *, const prpsinfo_t *, int); -static void elf32_putnote(void *, size_t *, const char *, int, +static void ia32_putnote(void *, size_t *, const char *, int, const void *, size_t); extern int osreldate; static int -elf32_coredump(td, vp, limit) +ia32_coredump(td, vp, limit) struct thread *td; register struct vnode *vp; off_t limit; @@ -889,7 +934,7 @@ * size is calculated. */ hdrsize = 0; - elf32_puthdr((struct proc *)NULL, (void *)NULL, &hdrsize, + ia32_puthdr((struct proc *)NULL, (void *)NULL, &hdrsize, (const prstatus_t *)NULL, (const prfpregset_t *)NULL, (const prpsinfo_t *)NULL, seginfo.count); @@ -904,7 +949,7 @@ if (hdr == NULL) { return EINVAL; } - error = elf32_corehdr(td, vp, cred, seginfo.count, hdr, hdrsize); + error = ia32_corehdr(td, vp, cred, seginfo.count, hdr, hdrsize); /* Write the contents of all of the writable segments. */ if (error == 0) { @@ -1030,7 +1075,7 @@ * the page boundary. */ static int -elf32_corehdr(td, vp, cred, numsegs, hdr, hdrsize) +ia32_corehdr(td, vp, cred, numsegs, hdr, hdrsize) struct thread *td; struct vnode *vp; struct ucred *cred; @@ -1076,7 +1121,7 @@ /* Fill in the header. */ bzero(hdr, hdrsize); off = 0; - elf32_puthdr(p, hdr, &off, status, fpregset, psinfo, numsegs); + ia32_puthdr(p, hdr, &off, status, fpregset, psinfo, numsegs); free(tempdata, M_TEMP); @@ -1086,7 +1131,7 @@ } static void -elf32_puthdr(struct proc *p, void *dst, size_t *off, const prstatus_t *status, +ia32_puthdr(struct proc *p, void *dst, size_t *off, const prstatus_t *status, const prfpregset_t *fpregset, const prpsinfo_t *psinfo, int numsegs) { size_t ehoff; @@ -1101,11 +1146,11 @@ *off += (numsegs + 1) * sizeof(Elf32_Phdr); noteoff = *off; - elf32_putnote(dst, off, "FreeBSD", NT_PRSTATUS, status, + ia32_putnote(dst, off, "FreeBSD", NT_PRSTATUS, status, sizeof *status); - elf32_putnote(dst, off, "FreeBSD", NT_FPREGSET, fpregset, + ia32_putnote(dst, off, "FreeBSD", NT_FPREGSET, fpregset, sizeof *fpregset); - elf32_putnote(dst, off, "FreeBSD", NT_PRPSINFO, psinfo, + ia32_putnote(dst, off, "FreeBSD", NT_PRPSINFO, psinfo, sizeof *psinfo); notesz = *off - noteoff; @@ -1168,7 +1213,7 @@ } static void -elf32_putnote(void *dst, size_t *off, const char *name, int type, +ia32_putnote(void *dst, size_t *off, const char *name, int type, const void *desc, size_t descsz) { Elf_Note note; @@ -1187,15 +1232,8 @@ *off += roundup2(note.n_descsz, sizeof(Elf32_Size)); } -struct ia32_ps_strings { - u_int32_t ps_argvstr; /* first of 0 or more argument strings */ - int ps_nargvstr; /* the number of argument strings */ - u_int32_t ps_envstr; /* first of 0 or more environment strings */ - int ps_nenvstr; /* the number of environment strings */ -}; - static register_t * -elf32_copyout_strings(struct image_params *imgp) +ia32_copyout_strings(struct image_params *imgp) { int argc, envc; u_int32_t *vectp; @@ -1264,44 +1302,43 @@ /* * Fill in "ps_strings" struct for ps, w, etc. */ - suhword(&arginfo->ps_argvstr, (u_int32_t)(intptr_t)vectp); - suhword(&arginfo->ps_nargvstr, argc); + suword32(&arginfo->ps_argvstr, (u_int32_t)(intptr_t)vectp); + suword32(&arginfo->ps_nargvstr, argc); /* * Fill in argument portion of vector table. */ for (; argc > 0; --argc) { - suhword(vectp++, (u_int32_t)(intptr_t)destp); + suword32(vectp++, (u_int32_t)(intptr_t)destp); while (*stringp++ != 0) destp++; destp++; } /* a null vector table pointer separates the argp's from the envp's */ - suhword(vectp++, 0); + suword32(vectp++, 0); - suhword(&arginfo->ps_envstr, (u_int32_t)(intptr_t)vectp); - suhword(&arginfo->ps_nenvstr, envc); + suword32(&arginfo->ps_envstr, (u_int32_t)(intptr_t)vectp); + suword32(&arginfo->ps_nenvstr, envc); /* * Fill in environment portion of vector table. */ for (; envc > 0; --envc) { - suhword(vectp++, (u_int32_t)(intptr_t)destp); + suword32(vectp++, (u_int32_t)(intptr_t)destp); while (*stringp++ != 0) destp++; destp++; } /* end of vector table is a null pointer */ - suhword(vectp, 0); + suword32(vectp, 0); return ((register_t *)stack_base); } static void -elf32_setregs(struct thread *td, u_long entry, u_long stack, - u_long ps_strings) +ia32_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) { struct trapframe *frame = td->td_frame; vm_offset_t gdt, ldt; @@ -1325,6 +1362,7 @@ | IA64_PSR_IT | IA64_PSR_DT | IA64_PSR_RT + | IA64_PSR_DFH | IA64_PSR_IS | IA64_PSR_BN | IA64_PSR_CPL_USER); @@ -1425,12 +1463,6 @@ frame->tf_r[FRAME_R11] = ps_strings; /* - * Set ia32 control registers. - */ - ia64_set_cflg((CR0_PE | CR0_PG) - | ((long)(CR4_XMM | CR4_FXSR) << 32)); - - /* * XXX - Linux emulator * Make sure sure edx is 0x0 on entry. Linux binaries depend * on it. @@ -1441,5 +1473,5 @@ /* * Tell kern_execve.c about it, with a little help from the linker. */ -static struct execsw elf32_execsw = {exec_elf32_imgact, "ELF32"}; -EXEC_SET(elf32, elf32_execsw); +static struct execsw ia32_execsw = {exec_ia32_imgact, "IA32"}; +EXEC_SET(ia32, ia32_execsw); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 6: 4: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B487A37B419; Thu, 2 May 2002 06:01:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 68D2F37B405 for ; Thu, 2 May 2002 06:01:28 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42D1S684244 for perforce@freebsd.org; Thu, 2 May 2002 06:01:28 -0700 (PDT) (envelope-from dfr@freebsd.org) Date: Thu, 2 May 2002 06:01:28 -0700 (PDT) Message-Id: <200205021301.g42D1S684244@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson Subject: PERFORCE change 10681 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10681 Change 10681 by dfr@dfr_home on 2002/05/02 06:00:49 Add a bunch of ilp32 wrappers for ia32 syscalls. Affected files ... ... //depot/projects/ia64/sys/conf/files.ia64#6 edit ... //depot/projects/ia64/sys/ia64/ia32/ia32.h#1 add ... //depot/projects/ia64/sys/ia64/ia32/ia32_misc.c#1 add ... //depot/projects/ia64/sys/ia64/ia32/ia32_proto.h#2 edit ... //depot/projects/ia64/sys/ia64/ia32/ia32_syscall.h#2 edit ... //depot/projects/ia64/sys/ia64/ia32/ia32_sysent.c#2 edit ... //depot/projects/ia64/sys/ia64/ia32/ia32_util.h#1 add ... //depot/projects/ia64/sys/ia64/ia32/syscalls.master#2 edit Differences ... ==== //depot/projects/ia64/sys/conf/files.ia64#6 (text+ko) ==== @@ -22,6 +22,7 @@ ia64/acpica/acpi_wakeup.c optional acpica ia64/acpica/OsdEnvironment.c optional acpica ia64/acpica/madt.c optional acpica +ia64/ia32/ia32_misc.c optional ia32 ia64/ia32/ia32_sysent.c optional ia32 ia64/ia32/imgact_ia32.c optional ia32 ia64/ia64/ia64-gdbstub.c optional ddb ==== //depot/projects/ia64/sys/ia64/ia32/ia32_proto.h#2 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/ia64/ia32/ia32_proto.h,v 1.1 2002/04/10 19:34:51 dfr Exp $ - * created from FreeBSD + * $FreeBSD$ + * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.1 2002/04/10 19:34:51 dfr Exp */ #ifndef _IA32_SYSPROTO_H_ @@ -28,508 +28,97 @@ #define PADR_(t) 0 #endif -struct nosys_args { - register_t dummy; -}; -struct sys_exit_args { - char rval_l_[PADL_(int)]; int rval; char rval_r_[PADR_(int)]; -}; -struct fork_args { - register_t dummy; -}; -struct read_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; - char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; -}; -struct write_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)]; - char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; -}; -struct open_args { +struct ia32_open_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; }; -struct close_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; -}; -struct wait_args { +struct ia32_wait4_args { char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)]; char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)]; char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)]; - char rusage_l_[PADL_(struct rusage *)]; struct rusage * rusage; char rusage_r_[PADR_(struct rusage *)]; + char rusage_l_[PADL_(struct rusage32 *)]; struct rusage32 * rusage; char rusage_r_[PADR_(struct rusage32 *)]; }; -struct link_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char link_l_[PADL_(char *)]; char * link; char link_r_[PADR_(char *)]; -}; -struct unlink_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; -}; -struct chdir_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; -}; -struct fchdir_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; -}; -struct mknod_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; - char dev_l_[PADL_(int)]; int dev; char dev_r_[PADR_(int)]; -}; -struct chmod_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; -}; -struct chown_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char uid_l_[PADL_(int)]; int uid; char uid_r_[PADR_(int)]; - char gid_l_[PADL_(int)]; int gid; char gid_r_[PADR_(int)]; -}; -struct obreak_args { - char nsize_l_[PADL_(char *)]; char * nsize; char nsize_r_[PADR_(char *)]; -}; -struct getfsstat_args { - char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)]; +struct ia32_getfsstat_args { + char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)]; char bufsize_l_[PADL_(long)]; long bufsize; char bufsize_r_[PADR_(long)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; -struct getpid_args { - register_t dummy; -}; -struct mount_args { - char type_l_[PADL_(char *)]; char * type; char type_r_[PADR_(char *)]; +struct ia32_access_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char data_l_[PADL_(caddr_t)]; caddr_t data; char data_r_[PADR_(caddr_t)]; }; -struct unmount_args { +struct ia32_chflags_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; -struct setuid_args { - char uid_l_[PADL_(uid_t)]; uid_t uid; char uid_r_[PADR_(uid_t)]; +struct ia32_sigaltstack_args { + char ss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * ss; char ss_r_[PADR_(struct sigaltstack32 *)]; + char oss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * oss; char oss_r_[PADR_(struct sigaltstack32 *)]; }; -struct getuid_args { - register_t dummy; -}; -struct geteuid_args { - register_t dummy; -}; -struct ptrace_args { - char req_l_[PADL_(int)]; int req; char req_r_[PADR_(int)]; - char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; - char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; - char data_l_[PADL_(int)]; int data; char data_r_[PADR_(int)]; -}; -struct recvmsg_args { - char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char msg_l_[PADL_(struct msghdr *)]; struct msghdr * msg; char msg_r_[PADR_(struct msghdr *)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; -struct sendmsg_args { - char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char msg_l_[PADL_(caddr_t)]; caddr_t msg; char msg_r_[PADR_(caddr_t)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; -struct recvfrom_args { - char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)]; - char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char from_l_[PADL_(caddr_t)]; caddr_t from; char from_r_[PADR_(caddr_t)]; - char fromlenaddr_l_[PADL_(int *)]; int * fromlenaddr; char fromlenaddr_r_[PADR_(int *)]; -}; -struct accept_args { - char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char name_l_[PADL_(caddr_t)]; caddr_t name; char name_r_[PADR_(caddr_t)]; - char anamelen_l_[PADL_(int *)]; int * anamelen; char anamelen_r_[PADR_(int *)]; -}; -struct getpeername_args { - char fdes_l_[PADL_(int)]; int fdes; char fdes_r_[PADR_(int)]; - char asa_l_[PADL_(caddr_t)]; caddr_t asa; char asa_r_[PADR_(caddr_t)]; - char alen_l_[PADL_(int *)]; int * alen; char alen_r_[PADR_(int *)]; -}; -struct getsockname_args { - char fdes_l_[PADL_(int)]; int fdes; char fdes_r_[PADR_(int)]; - char asa_l_[PADL_(caddr_t)]; caddr_t asa; char asa_r_[PADR_(caddr_t)]; - char alen_l_[PADL_(int *)]; int * alen; char alen_r_[PADR_(int *)]; -}; -struct access_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; -struct chflags_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; -struct fchflags_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; -struct sync_args { - register_t dummy; -}; -struct kill_args { - char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)]; - char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)]; -}; -struct getppid_args { - register_t dummy; -}; -struct dup_args { - char fd_l_[PADL_(u_int)]; u_int fd; char fd_r_[PADR_(u_int)]; -}; -struct pipe_args { - register_t dummy; -}; -struct getegid_args { - register_t dummy; -}; -struct profil_args { - char samples_l_[PADL_(caddr_t)]; caddr_t samples; char samples_r_[PADR_(caddr_t)]; - char size_l_[PADL_(size_t)]; size_t size; char size_r_[PADR_(size_t)]; - char offset_l_[PADL_(size_t)]; size_t offset; char offset_r_[PADR_(size_t)]; - char scale_l_[PADL_(u_int)]; u_int scale; char scale_r_[PADR_(u_int)]; -}; -struct ktrace_args { - char fname_l_[PADL_(const char *)]; const char * fname; char fname_r_[PADR_(const char *)]; - char ops_l_[PADL_(int)]; int ops; char ops_r_[PADR_(int)]; - char facs_l_[PADL_(int)]; int facs; char facs_r_[PADR_(int)]; - char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)]; -}; -struct getgid_args { - register_t dummy; -}; -struct getlogin_args { - char namebuf_l_[PADL_(char *)]; char * namebuf; char namebuf_r_[PADR_(char *)]; - char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)]; -}; -struct setlogin_args { - char namebuf_l_[PADL_(char *)]; char * namebuf; char namebuf_r_[PADR_(char *)]; -}; -struct acct_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; -}; -struct osigpending_args { - register_t dummy; -}; -struct sigaltstack_args { - char ss_l_[PADL_(stack_t *)]; stack_t * ss; char ss_r_[PADR_(stack_t *)]; - char oss_l_[PADL_(stack_t *)]; stack_t * oss; char oss_r_[PADR_(stack_t *)]; -}; -struct ioctl_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char com_l_[PADL_(u_long)]; u_long com; char com_r_[PADR_(u_long)]; - char data_l_[PADL_(caddr_t)]; caddr_t data; char data_r_[PADR_(caddr_t)]; -}; -struct reboot_args { - char opt_l_[PADL_(int)]; int opt; char opt_r_[PADR_(int)]; -}; -struct revoke_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; -}; -struct symlink_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char link_l_[PADL_(char *)]; char * link; char link_r_[PADR_(char *)]; -}; -struct readlink_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; - char count_l_[PADL_(int)]; int count; char count_r_[PADR_(int)]; -}; -struct execve_args { +struct ia32_execve_args { char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)]; - char argv_l_[PADL_(char **)]; char ** argv; char argv_r_[PADR_(char **)]; - char envv_l_[PADL_(char **)]; char ** envv; char envv_r_[PADR_(char **)]; + char argv_l_[PADL_(u_int32_t *)]; u_int32_t * argv; char argv_r_[PADR_(u_int32_t *)]; + char envv_l_[PADL_(u_int32_t *)]; u_int32_t * envv; char envv_r_[PADR_(u_int32_t *)]; }; -struct umask_args { - char newmask_l_[PADL_(int)]; int newmask; char newmask_r_[PADR_(int)]; -}; -struct chroot_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; -}; -struct getpagesize_args { - register_t dummy; -}; -struct msync_args { - char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; - char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; -struct vfork_args { - register_t dummy; -}; -struct sbrk_args { - char incr_l_[PADL_(int)]; int incr; char incr_r_[PADR_(int)]; -}; -struct sstk_args { - char incr_l_[PADL_(int)]; int incr; char incr_r_[PADR_(int)]; -}; -struct ovadvise_args { - char anom_l_[PADL_(int)]; int anom; char anom_r_[PADR_(int)]; -}; -struct munmap_args { - char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; - char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; -}; -struct mprotect_args { - char addr_l_[PADL_(const void *)]; const void * addr; char addr_r_[PADR_(const void *)]; - char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; - char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; -}; -struct madvise_args { - char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; - char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; - char behav_l_[PADL_(int)]; int behav; char behav_r_[PADR_(int)]; -}; -struct mincore_args { - char addr_l_[PADL_(const void *)]; const void * addr; char addr_r_[PADR_(const void *)]; - char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; - char vec_l_[PADL_(char *)]; char * vec; char vec_r_[PADR_(char *)]; -}; -struct getgroups_args { - char gidsetsize_l_[PADL_(u_int)]; u_int gidsetsize; char gidsetsize_r_[PADR_(u_int)]; - char gidset_l_[PADL_(gid_t *)]; gid_t * gidset; char gidset_r_[PADR_(gid_t *)]; -}; -struct setgroups_args { - char gidsetsize_l_[PADL_(u_int)]; u_int gidsetsize; char gidsetsize_r_[PADR_(u_int)]; - char gidset_l_[PADL_(gid_t *)]; gid_t * gidset; char gidset_r_[PADR_(gid_t *)]; -}; -struct getpgrp_args { - register_t dummy; -}; -struct setpgid_args { - char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)]; - char pgid_l_[PADL_(int)]; int pgid; char pgid_r_[PADR_(int)]; -}; -struct setitimer_args { +struct ia32_setitimer_args { char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)]; - char itv_l_[PADL_(struct itimerval *)]; struct itimerval * itv; char itv_r_[PADR_(struct itimerval *)]; - char oitv_l_[PADL_(struct itimerval *)]; struct itimerval * oitv; char oitv_r_[PADR_(struct itimerval *)]; + char itv_l_[PADL_(struct itimerval32 *)]; struct itimerval32 * itv; char itv_r_[PADR_(struct itimerval32 *)]; + char oitv_l_[PADL_(struct itimerval32 *)]; struct itimerval32 * oitv; char oitv_r_[PADR_(struct itimerval32 *)]; }; -struct owait_args { - register_t dummy; -}; -struct swapon_args { - char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)]; -}; -struct getitimer_args { - char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)]; - char itv_l_[PADL_(struct itimerval *)]; struct itimerval * itv; char itv_r_[PADR_(struct itimerval *)]; -}; -struct getdtablesize_args { - register_t dummy; -}; -struct dup2_args { - char from_l_[PADL_(u_int)]; u_int from; char from_r_[PADR_(u_int)]; - char to_l_[PADL_(u_int)]; u_int to; char to_r_[PADR_(u_int)]; -}; -struct fcntl_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; - char arg_l_[PADL_(long)]; long arg; char arg_r_[PADR_(long)]; -}; -struct select_args { +struct ia32_select_args { char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)]; char in_l_[PADL_(fd_set *)]; fd_set * in; char in_r_[PADR_(fd_set *)]; char ou_l_[PADL_(fd_set *)]; fd_set * ou; char ou_r_[PADR_(fd_set *)]; char ex_l_[PADL_(fd_set *)]; fd_set * ex; char ex_r_[PADR_(fd_set *)]; - char tv_l_[PADL_(struct timeval *)]; struct timeval * tv; char tv_r_[PADR_(struct timeval *)]; + char tv_l_[PADL_(struct timeval32 *)]; struct timeval32 * tv; char tv_r_[PADR_(struct timeval32 *)]; }; -struct fsync_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; -}; -struct setpriority_args { - char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; - char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)]; - char prio_l_[PADL_(int)]; int prio; char prio_r_[PADR_(int)]; -}; -struct socket_args { - char domain_l_[PADL_(int)]; int domain; char domain_r_[PADR_(int)]; - char type_l_[PADL_(int)]; int type; char type_r_[PADR_(int)]; - char protocol_l_[PADL_(int)]; int protocol; char protocol_r_[PADR_(int)]; -}; -struct connect_args { - char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char name_l_[PADL_(caddr_t)]; caddr_t name; char name_r_[PADR_(caddr_t)]; - char namelen_l_[PADL_(int)]; int namelen; char namelen_r_[PADR_(int)]; -}; -struct getpriority_args { - char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; - char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)]; -}; -struct osigreturn_args { - char sigcntxp_l_[PADL_(struct osigcontext *)]; struct osigcontext * sigcntxp; char sigcntxp_r_[PADR_(struct osigcontext *)]; -}; -struct bind_args { - char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char name_l_[PADL_(caddr_t)]; caddr_t name; char name_r_[PADR_(caddr_t)]; - char namelen_l_[PADL_(int)]; int namelen; char namelen_r_[PADR_(int)]; -}; -struct setsockopt_args { - char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char level_l_[PADL_(int)]; int level; char level_r_[PADR_(int)]; - char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)]; - char val_l_[PADL_(caddr_t)]; caddr_t val; char val_r_[PADR_(caddr_t)]; - char valsize_l_[PADL_(int)]; int valsize; char valsize_r_[PADR_(int)]; -}; -struct listen_args { - char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char backlog_l_[PADL_(int)]; int backlog; char backlog_r_[PADR_(int)]; -}; -struct gettimeofday_args { - char tp_l_[PADL_(struct timeval *)]; struct timeval * tp; char tp_r_[PADR_(struct timeval *)]; +struct ia32_gettimeofday_args { + char tp_l_[PADL_(struct timeval32 *)]; struct timeval32 * tp; char tp_r_[PADR_(struct timeval32 *)]; char tzp_l_[PADL_(struct timezone *)]; struct timezone * tzp; char tzp_r_[PADR_(struct timezone *)]; }; -struct getrusage_args { +struct ia32_getrusage_args { char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)]; - char rusage_l_[PADL_(struct rusage *)]; struct rusage * rusage; char rusage_r_[PADR_(struct rusage *)]; + char rusage_l_[PADL_(struct rusage32 *)]; struct rusage32 * rusage; char rusage_r_[PADR_(struct rusage32 *)]; }; -struct getsockopt_args { - char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char level_l_[PADL_(int)]; int level; char level_r_[PADR_(int)]; - char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)]; - char val_l_[PADL_(caddr_t)]; caddr_t val; char val_r_[PADR_(caddr_t)]; - char avalsize_l_[PADL_(int *)]; int * avalsize; char avalsize_r_[PADR_(int *)]; -}; -struct readv_args { +struct ia32_readv_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)]; + char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)]; char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)]; }; -struct writev_args { +struct ia32_writev_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)]; + char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)]; char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)]; }; -struct settimeofday_args { - char tv_l_[PADL_(struct timeval *)]; struct timeval * tv; char tv_r_[PADR_(struct timeval *)]; +struct ia32_settimeofday_args { + char tv_l_[PADL_(struct timeval32 *)]; struct timeval32 * tv; char tv_r_[PADR_(struct timeval32 *)]; char tzp_l_[PADL_(struct timezone *)]; struct timezone * tzp; char tzp_r_[PADR_(struct timezone *)]; }; -struct fchown_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char uid_l_[PADL_(int)]; int uid; char uid_r_[PADR_(int)]; - char gid_l_[PADL_(int)]; int gid; char gid_r_[PADR_(int)]; -}; -struct fchmod_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; -}; -struct setreuid_args { - char ruid_l_[PADL_(int)]; int ruid; char ruid_r_[PADR_(int)]; - char euid_l_[PADL_(int)]; int euid; char euid_r_[PADR_(int)]; -}; -struct setregid_args { - char rgid_l_[PADL_(int)]; int rgid; char rgid_r_[PADR_(int)]; - char egid_l_[PADL_(int)]; int egid; char egid_r_[PADR_(int)]; -}; -struct rename_args { - char from_l_[PADL_(char *)]; char * from; char from_r_[PADR_(char *)]; - char to_l_[PADL_(char *)]; char * to; char to_r_[PADR_(char *)]; -}; -struct flock_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)]; -}; -struct mkfifo_args { +struct ia32_utimes_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; + char tptr_l_[PADL_(struct timeval32 *)]; struct timeval32 * tptr; char tptr_r_[PADR_(struct timeval32 *)]; }; -struct sendto_args { - char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)]; - char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char to_l_[PADL_(caddr_t)]; caddr_t to; char to_r_[PADR_(caddr_t)]; - char tolen_l_[PADL_(int)]; int tolen; char tolen_r_[PADR_(int)]; +struct ia32_adjtime_args { + char delta_l_[PADL_(struct timeval32 *)]; struct timeval32 * delta; char delta_r_[PADR_(struct timeval32 *)]; + char olddelta_l_[PADL_(struct timeval32 *)]; struct timeval32 * olddelta; char olddelta_r_[PADR_(struct timeval32 *)]; }; -struct shutdown_args { - char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)]; -}; -struct socketpair_args { - char domain_l_[PADL_(int)]; int domain; char domain_r_[PADR_(int)]; - char type_l_[PADL_(int)]; int type; char type_r_[PADR_(int)]; - char protocol_l_[PADL_(int)]; int protocol; char protocol_r_[PADR_(int)]; - char rsv_l_[PADL_(int *)]; int * rsv; char rsv_r_[PADR_(int *)]; -}; -struct mkdir_args { +struct ia32_statfs_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; + char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)]; }; -struct rmdir_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; -}; -struct utimes_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char tptr_l_[PADL_(struct timeval *)]; struct timeval * tptr; char tptr_r_[PADR_(struct timeval *)]; -}; -struct adjtime_args { - char delta_l_[PADL_(struct timeval *)]; struct timeval * delta; char delta_r_[PADR_(struct timeval *)]; - char olddelta_l_[PADL_(struct timeval *)]; struct timeval * olddelta; char olddelta_r_[PADR_(struct timeval *)]; -}; -struct ogethostid_args { - register_t dummy; -}; -struct setsid_args { - register_t dummy; -}; -struct quotactl_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; - char uid_l_[PADL_(int)]; int uid; char uid_r_[PADR_(int)]; - char arg_l_[PADL_(caddr_t)]; caddr_t arg; char arg_r_[PADR_(caddr_t)]; -}; -struct oquota_args { - register_t dummy; -}; -struct nfssvc_args { - char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; - char argp_l_[PADL_(caddr_t)]; caddr_t argp; char argp_r_[PADR_(caddr_t)]; -}; -struct statfs_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)]; -}; -struct fstatfs_args { +struct ia32_fstatfs_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)]; + char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)]; }; -struct getfh_args { - char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)]; - char fhp_l_[PADL_(struct fhandle *)]; struct fhandle * fhp; char fhp_r_[PADR_(struct fhandle *)]; -}; -struct getdomainname_args { - char domainname_l_[PADL_(char *)]; char * domainname; char domainname_r_[PADR_(char *)]; - char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; -}; -struct setdomainname_args { - char domainname_l_[PADL_(char *)]; char * domainname; char domainname_r_[PADR_(char *)]; - char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; -}; -struct uname_args { - char name_l_[PADL_(struct utsname *)]; struct utsname * name; char name_r_[PADR_(struct utsname *)]; -}; -struct sysarch_args { - char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; - char parms_l_[PADL_(char *)]; char * parms; char parms_r_[PADR_(char *)]; -}; -struct rtprio_args { - char function_l_[PADL_(int)]; int function; char function_r_[PADR_(int)]; - char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; - char rtp_l_[PADL_(struct rtprio *)]; struct rtprio * rtp; char rtp_r_[PADR_(struct rtprio *)]; -}; -struct semsys_args { +struct ia32_semsys_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)]; char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)]; char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)]; char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)]; }; -struct msgsys_args { +struct ia32_msgsys_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)]; char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)]; @@ -537,988 +126,95 @@ char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)]; char a6_l_[PADL_(int)]; int a6; char a6_r_[PADR_(int)]; }; -struct shmsys_args { +struct ia32_shmsys_args { char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)]; char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)]; char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)]; char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)]; }; -struct pread_args { +struct ia32_pread_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)]; char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; + char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; + char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; }; -struct pwrite_args { +struct ia32_pwrite_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)]; char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)]; char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; + char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; + char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; }; -struct ntp_adjtime_args { - char tp_l_[PADL_(struct timex *)]; struct timex * tp; char tp_r_[PADR_(struct timex *)]; -}; -struct setgid_args { - char gid_l_[PADL_(gid_t)]; gid_t gid; char gid_r_[PADR_(gid_t)]; -}; -struct setegid_args { - char egid_l_[PADL_(gid_t)]; gid_t egid; char egid_r_[PADR_(gid_t)]; -}; -struct seteuid_args { - char euid_l_[PADL_(uid_t)]; uid_t euid; char euid_r_[PADR_(uid_t)]; -}; -struct stat_args { +struct ia32_stat_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char ub_l_[PADL_(struct stat *)]; struct stat * ub; char ub_r_[PADR_(struct stat *)]; + char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)]; }; -struct fstat_args { +struct ia32_fstat_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char sb_l_[PADL_(struct stat *)]; struct stat * sb; char sb_r_[PADR_(struct stat *)]; + char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)]; }; -struct lstat_args { +struct ia32_lstat_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char ub_l_[PADL_(struct stat *)]; struct stat * ub; char ub_r_[PADR_(struct stat *)]; + char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)]; }; -struct pathconf_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)]; -}; -struct fpathconf_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)]; -}; -struct __getrlimit_args { - char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)]; - char rlp_l_[PADL_(struct rlimit *)]; struct rlimit * rlp; char rlp_r_[PADR_(struct rlimit *)]; -}; -struct __setrlimit_args { - char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)]; - char rlp_l_[PADL_(struct rlimit *)]; struct rlimit * rlp; char rlp_r_[PADR_(struct rlimit *)]; -}; -struct getdirentries_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; - char count_l_[PADL_(u_int)]; u_int count; char count_r_[PADR_(u_int)]; - char basep_l_[PADL_(long *)]; long * basep; char basep_r_[PADR_(long *)]; -}; -struct mmap_args { +struct ia32_mmap_args { char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)]; char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char pos_l_[PADL_(off_t)]; off_t pos; char pos_r_[PADR_(off_t)]; + char poslo_l_[PADL_(u_int32_t)]; u_int32_t poslo; char poslo_r_[PADR_(u_int32_t)]; + char poshi_l_[PADL_(u_int32_t)]; u_int32_t poshi; char poshi_r_[PADR_(u_int32_t)]; }; -struct lseek_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; - char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)]; -}; -struct truncate_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)]; -}; -struct ftruncate_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; - char length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)]; -}; -struct sysctl_args { +struct ia32_sysctl_args { char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)]; char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)]; char old_l_[PADL_(void *)]; void * old; char old_r_[PADR_(void *)]; - char oldlenp_l_[PADL_(size_t *)]; size_t * oldlenp; char oldlenp_r_[PADR_(size_t *)]; + char oldlenp_l_[PADL_(u_int32_t *)]; u_int32_t * oldlenp; char oldlenp_r_[PADR_(u_int32_t *)]; char new_l_[PADL_(void *)]; void * new; char new_r_[PADR_(void *)]; - char newlen_l_[PADL_(size_t)]; size_t newlen; char newlen_r_[PADR_(size_t)]; + char newlen_l_[PADL_(u_int32_t)]; u_int32_t newlen; char newlen_r_[PADR_(u_int32_t)]; }; -struct mlock_args { - char addr_l_[PADL_(const void *)]; const void * addr; char addr_r_[PADR_(const void *)]; - char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; -}; -struct munlock_args { - char addr_l_[PADL_(const void *)]; const void * addr; char addr_r_[PADR_(const void *)]; - char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; -}; -struct undelete_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; -}; -struct futimes_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char tptr_l_[PADL_(struct timeval *)]; struct timeval * tptr; char tptr_r_[PADR_(struct timeval *)]; -}; -struct getpgid_args { - char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; -}; -struct poll_args { - char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char fds_r_[PADR_(struct pollfd *)]; - char nfds_l_[PADL_(u_int)]; u_int nfds; char nfds_r_[PADR_(u_int)]; - char timeout_l_[PADL_(int)]; int timeout; char timeout_r_[PADR_(int)]; -}; -struct __semctl_args { - char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)]; - char semnum_l_[PADL_(int)]; int semnum; char semnum_r_[PADR_(int)]; - char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; - char arg_l_[PADL_(union semun *)]; union semun * arg; char arg_r_[PADR_(union semun *)]; -}; -struct semget_args { - char key_l_[PADL_(key_t)]; key_t key; char key_r_[PADR_(key_t)]; - char nsems_l_[PADL_(int)]; int nsems; char nsems_r_[PADR_(int)]; - char semflg_l_[PADL_(int)]; int semflg; char semflg_r_[PADR_(int)]; -}; -struct semop_args { - char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)]; - char sops_l_[PADL_(struct sembuf *)]; struct sembuf * sops; char sops_r_[PADR_(struct sembuf *)]; - char nsops_l_[PADL_(u_int)]; u_int nsops; char nsops_r_[PADR_(u_int)]; -}; -struct msgctl_args { - char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)]; - char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; - char buf_l_[PADL_(struct msqid_ds *)]; struct msqid_ds * buf; char buf_r_[PADR_(struct msqid_ds *)]; -}; -struct msgget_args { - char key_l_[PADL_(key_t)]; key_t key; char key_r_[PADR_(key_t)]; - char msgflg_l_[PADL_(int)]; int msgflg; char msgflg_r_[PADR_(int)]; -}; -struct msgsnd_args { - char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)]; - char msgp_l_[PADL_(void *)]; void * msgp; char msgp_r_[PADR_(void *)]; - char msgsz_l_[PADL_(size_t)]; size_t msgsz; char msgsz_r_[PADR_(size_t)]; - char msgflg_l_[PADL_(int)]; int msgflg; char msgflg_r_[PADR_(int)]; -}; -struct msgrcv_args { - char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)]; - char msgp_l_[PADL_(void *)]; void * msgp; char msgp_r_[PADR_(void *)]; - char msgsz_l_[PADL_(size_t)]; size_t msgsz; char msgsz_r_[PADR_(size_t)]; - char msgtyp_l_[PADL_(long)]; long msgtyp; char msgtyp_r_[PADR_(long)]; - char msgflg_l_[PADL_(int)]; int msgflg; char msgflg_r_[PADR_(int)]; -}; -struct shmat_args { - char shmid_l_[PADL_(int)]; int shmid; char shmid_r_[PADR_(int)]; - char shmaddr_l_[PADL_(void *)]; void * shmaddr; char shmaddr_r_[PADR_(void *)]; - char shmflg_l_[PADL_(int)]; int shmflg; char shmflg_r_[PADR_(int)]; -}; -struct shmctl_args { - char shmid_l_[PADL_(int)]; int shmid; char shmid_r_[PADR_(int)]; - char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; - char buf_l_[PADL_(struct shmid_ds *)]; struct shmid_ds * buf; char buf_r_[PADR_(struct shmid_ds *)]; -}; -struct shmdt_args { - char shmaddr_l_[PADL_(void *)]; void * shmaddr; char shmaddr_r_[PADR_(void *)]; -}; -struct shmget_args { - char key_l_[PADL_(key_t)]; key_t key; char key_r_[PADR_(key_t)]; - char size_l_[PADL_(int)]; int size; char size_r_[PADR_(int)]; - char shmflg_l_[PADL_(int)]; int shmflg; char shmflg_r_[PADR_(int)]; -}; -struct clock_gettime_args { - char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)]; - char tp_l_[PADL_(struct timespec *)]; struct timespec * tp; char tp_r_[PADR_(struct timespec *)]; -}; -struct clock_settime_args { - char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)]; - char tp_l_[PADL_(const struct timespec *)]; const struct timespec * tp; char tp_r_[PADR_(const struct timespec *)]; -}; -struct clock_getres_args { - char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)]; - char tp_l_[PADL_(struct timespec *)]; struct timespec * tp; char tp_r_[PADR_(struct timespec *)]; -}; -struct nanosleep_args { - char rqtp_l_[PADL_(const struct timespec *)]; const struct timespec * rqtp; char rqtp_r_[PADR_(const struct timespec *)]; - char rmtp_l_[PADL_(struct timespec *)]; struct timespec * rmtp; char rmtp_r_[PADR_(struct timespec *)]; -}; -struct minherit_args { - char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)]; - char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; - char inherit_l_[PADL_(int)]; int inherit; char inherit_r_[PADR_(int)]; -}; -struct rfork_args { - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; -struct openbsd_poll_args { - char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char fds_r_[PADR_(struct pollfd *)]; - char nfds_l_[PADL_(u_int)]; u_int nfds; char nfds_r_[PADR_(u_int)]; - char timeout_l_[PADL_(int)]; int timeout; char timeout_r_[PADR_(int)]; -}; -struct issetugid_args { - register_t dummy; -}; -struct lchown_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char uid_l_[PADL_(int)]; int uid; char uid_r_[PADR_(int)]; - char gid_l_[PADL_(int)]; int gid; char gid_r_[PADR_(int)]; -}; -struct getdents_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; - char count_l_[PADL_(size_t)]; size_t count; char count_r_[PADR_(size_t)]; -}; -struct lchmod_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)]; -}; -struct lutimes_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char tptr_l_[PADL_(struct timeval *)]; struct timeval * tptr; char tptr_r_[PADR_(struct timeval *)]; -}; -struct nstat_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char ub_l_[PADL_(struct nstat *)]; struct nstat * ub; char ub_r_[PADR_(struct nstat *)]; -}; -struct nfstat_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char sb_l_[PADL_(struct nstat *)]; struct nstat * sb; char sb_r_[PADR_(struct nstat *)]; -}; -struct nlstat_args { - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char ub_l_[PADL_(struct nstat *)]; struct nstat * ub; char ub_r_[PADR_(struct nstat *)]; -}; -struct fhstatfs_args { - char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)]; - char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)]; -}; -struct fhopen_args { - char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; -struct fhstat_args { - char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)]; - char sb_l_[PADL_(struct stat *)]; struct stat * sb; char sb_r_[PADR_(struct stat *)]; -}; -struct modnext_args { - char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)]; -}; -struct modstat_args { - char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)]; - char stat_l_[PADL_(struct module_stat *)]; struct module_stat * stat; char stat_r_[PADR_(struct module_stat *)]; -}; -struct modfnext_args { - char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)]; -}; -struct modfind_args { - char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)]; -}; -struct kldload_args { - char file_l_[PADL_(const char *)]; const char * file; char file_r_[PADR_(const char *)]; -}; -struct kldunload_args { - char fileid_l_[PADL_(int)]; int fileid; char fileid_r_[PADR_(int)]; -}; -struct kldfind_args { - char file_l_[PADL_(const char *)]; const char * file; char file_r_[PADR_(const char *)]; -}; -struct kldnext_args { - char fileid_l_[PADL_(int)]; int fileid; char fileid_r_[PADR_(int)]; -}; -struct kldstat_args { - char fileid_l_[PADL_(int)]; int fileid; char fileid_r_[PADR_(int)]; - char stat_l_[PADL_(struct kld_file_stat *)]; struct kld_file_stat * stat; char stat_r_[PADR_(struct kld_file_stat *)]; -}; -struct kldfirstmod_args { - char fileid_l_[PADL_(int)]; int fileid; char fileid_r_[PADR_(int)]; -}; -struct getsid_args { - char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; -}; -struct setresuid_args { - char ruid_l_[PADL_(uid_t)]; uid_t ruid; char ruid_r_[PADR_(uid_t)]; - char euid_l_[PADL_(uid_t)]; uid_t euid; char euid_r_[PADR_(uid_t)]; - char suid_l_[PADL_(uid_t)]; uid_t suid; char suid_r_[PADR_(uid_t)]; -}; -struct setresgid_args { - char rgid_l_[PADL_(gid_t)]; gid_t rgid; char rgid_r_[PADR_(gid_t)]; - char egid_l_[PADL_(gid_t)]; gid_t egid; char egid_r_[PADR_(gid_t)]; - char sgid_l_[PADL_(gid_t)]; gid_t sgid; char sgid_r_[PADR_(gid_t)]; -}; -struct aio_return_args { - char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)]; -}; -struct aio_suspend_args { - char aiocbp_l_[PADL_(struct aiocb *const *)]; struct aiocb *const * aiocbp; char aiocbp_r_[PADR_(struct aiocb *const *)]; - char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)]; - char timeout_l_[PADL_(const struct timespec *)]; const struct timespec * timeout; char timeout_r_[PADR_(const struct timespec *)]; -}; -struct aio_cancel_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)]; -}; -struct aio_error_args { - char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)]; -}; -struct aio_read_args { - char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)]; -}; -struct aio_write_args { - char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)]; -}; -struct lio_listio_args { - char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; - char acb_list_l_[PADL_(struct aiocb *const *)]; struct aiocb *const * acb_list; char acb_list_r_[PADR_(struct aiocb *const *)]; - char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)]; - char sig_l_[PADL_(struct sigevent *)]; struct sigevent * sig; char sig_r_[PADR_(struct sigevent *)]; -}; -struct yield_args { - register_t dummy; -}; -struct mlockall_args { - char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)]; -}; -struct munlockall_args { - register_t dummy; -}; -struct __getcwd_args { - char buf_l_[PADL_(u_char *)]; u_char * buf; char buf_r_[PADR_(u_char *)]; - char buflen_l_[PADL_(u_int)]; u_int buflen; char buflen_r_[PADR_(u_int)]; -}; -struct sched_setparam_args { - char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; - char param_l_[PADL_(const struct sched_param *)]; const struct sched_param * param; char param_r_[PADR_(const struct sched_param *)]; -}; -struct sched_getparam_args { - char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; - char param_l_[PADL_(struct sched_param *)]; struct sched_param * param; char param_r_[PADR_(struct sched_param *)]; -}; -struct sched_setscheduler_args { - char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; - char policy_l_[PADL_(int)]; int policy; char policy_r_[PADR_(int)]; - char param_l_[PADL_(const struct sched_param *)]; const struct sched_param * param; char param_r_[PADR_(const struct sched_param *)]; -}; -struct sched_getscheduler_args { - char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; -}; -struct sched_yield_args { - register_t dummy; -}; -struct sched_get_priority_max_args { - char policy_l_[PADL_(int)]; int policy; char policy_r_[PADR_(int)]; -}; -struct sched_get_priority_min_args { - char policy_l_[PADL_(int)]; int policy; char policy_r_[PADR_(int)]; -}; -struct sched_rr_get_interval_args { - char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; - char interval_l_[PADL_(struct timespec *)]; struct timespec * interval; char interval_r_[PADR_(struct timespec *)]; -}; -struct utrace_args { - char addr_l_[PADL_(const void *)]; const void * addr; char addr_r_[PADR_(const void *)]; - char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)]; -}; -struct sendfile_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; - char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)]; - char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)]; - char hdtr_l_[PADL_(struct sf_hdtr *)]; struct sf_hdtr * hdtr; char hdtr_r_[PADR_(struct sf_hdtr *)]; - char sbytes_l_[PADL_(off_t *)]; off_t * sbytes; char sbytes_r_[PADR_(off_t *)]; - char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; -}; -struct kldsym_args { - char fileid_l_[PADL_(int)]; int fileid; char fileid_r_[PADR_(int)]; - char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)]; - char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; -}; -struct jail_args { - char jail_l_[PADL_(struct jail *)]; struct jail * jail; char jail_r_[PADR_(struct jail *)]; -}; -struct sigprocmask_args { >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 7:18:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FC5D37B419; Thu, 2 May 2002 07:18:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail13.speakeasy.net [216.254.0.213]) by hub.freebsd.org (Postfix) with ESMTP id C0B5E37B423 for ; Thu, 2 May 2002 07:17:36 -0700 (PDT) Received: (qmail 15530 invoked from network); 2 May 2002 14:17:35 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail13.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 2 May 2002 14:17:35 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g42EHZF07624; Thu, 2 May 2002 10:17:35 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200205021301.g42D1S684244@freefall.freebsd.org> Date: Thu, 02 May 2002 10:16:37 -0400 (EDT) From: John Baldwin To: Doug Rabson Subject: RE: PERFORCE change 10681 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 02-May-2002 Doug Rabson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10681 > > Change 10681 by dfr@dfr_home on 2002/05/02 06:00:49 > > Add a bunch of ilp32 wrappers for ia32 syscalls. Great fear. :) As we would say on IRC, you have entered into entirely new levels of Evilness now. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 8:37:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE59037B417; Thu, 2 May 2002 08:35:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B3C0B37B427 for ; Thu, 2 May 2002 08:35:51 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42FZmb50043 for perforce@freebsd.org; Thu, 2 May 2002 08:35:49 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Thu, 2 May 2002 08:35:49 -0700 (PDT) Message-Id: <200205021535.g42FZmb50043@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 10686 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10686 Change 10686 by jhb@jhb_laptop on 2002/05/02 08:35:43 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/clock.c#5 integrate ... //depot/projects/smpng/sys/alpha/alpha/mem.c#6 integrate ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#22 integrate ... //depot/projects/smpng/sys/conf/NOTES#8 integrate ... //depot/projects/smpng/sys/conf/files#37 integrate ... //depot/projects/smpng/sys/conf/files.powerpc#7 integrate ... //depot/projects/smpng/sys/conf/kern.post.mk#9 integrate ... //depot/projects/smpng/sys/conf/kern.pre.mk#10 integrate ... //depot/projects/smpng/sys/conf/kmod.mk#9 integrate ... //depot/projects/smpng/sys/dev/aac/aac_cam.c#2 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#8 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#4 integrate ... //depot/projects/smpng/sys/dev/ciss/ciss.c#5 integrate ... //depot/projects/smpng/sys/dev/isp/isp.c#19 integrate ... //depot/projects/smpng/sys/dev/mii/acphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/qsphy.c#5 integrate ... //depot/projects/smpng/sys/dev/my/if_my.c#3 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/ac97_if.m#2 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/feeder_if.m#2 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/mixer_if.m#2 integrate ... //depot/projects/smpng/sys/dev/tx/if_tx.c#2 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#7 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.c#5 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#14 integrate ... //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#11 integrate ... //depot/projects/smpng/sys/fs/udf/udf_vnops.c#2 integrate ... //depot/projects/smpng/sys/i386/acpica/Makefile#3 integrate ... //depot/projects/smpng/sys/i386/acpica/genwakecode.sh#1 branch ... //depot/projects/smpng/sys/i386/conf/Makefile#3 integrate ... //depot/projects/smpng/sys/i386/conf/NOTES#35 integrate ... //depot/projects/smpng/sys/i386/conf/makeLINT.sh#1 branch ... //depot/projects/smpng/sys/i386/i386/mp_clock.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/clock.c#16 integrate ... //depot/projects/smpng/sys/i386/isa/loran.c#3 integrate ... //depot/projects/smpng/sys/ia64/conf/SKI#4 integrate ... //depot/projects/smpng/sys/ia64/ia64/clock.c#6 integrate ... //depot/projects/smpng/sys/ia64/ia64/exception.s#19 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#38 integrate ... //depot/projects/smpng/sys/ia64/ia64/mca.c#2 integrate ... //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#13 integrate ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#29 integrate ... //depot/projects/smpng/sys/ia64/ia64/sscdisk.c#7 integrate ... //depot/projects/smpng/sys/ia64/include/ansi.h#12 integrate ... //depot/projects/smpng/sys/ia64/include/frame.h#2 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#26 integrate ... //depot/projects/smpng/sys/kern/kern_environment.c#7 integrate ... //depot/projects/smpng/sys/kern/kern_exec.c#36 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#38 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#39 integrate ... //depot/projects/smpng/sys/kern/kern_malloc.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#35 integrate ... //depot/projects/smpng/sys/kern/kern_tc.c#10 integrate ... //depot/projects/smpng/sys/kern/subr_hints.c#4 integrate ... //depot/projects/smpng/sys/kern/subr_log.c#4 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#47 integrate ... //depot/projects/smpng/sys/kern/sys_pipe.c#16 integrate ... //depot/projects/smpng/sys/kern/tty.c#20 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#20 integrate ... //depot/projects/smpng/sys/kern/uipc_socket2.c#13 integrate ... //depot/projects/smpng/sys/kern/uipc_usrreq.c#18 integrate ... //depot/projects/smpng/sys/kern/vfs_init.c#5 integrate ... //depot/projects/smpng/sys/kern/vnode_if.pl#4 delete ... //depot/projects/smpng/sys/modules/drm/mga/Makefile#2 integrate ... //depot/projects/smpng/sys/modules/drm/r128/Makefile#2 integrate ... //depot/projects/smpng/sys/modules/drm/radeon/Makefile#2 integrate ... //depot/projects/smpng/sys/net/bpf.c#14 integrate ... //depot/projects/smpng/sys/net/if_spppsubr.c#7 integrate ... //depot/projects/smpng/sys/net/if_tap.c#13 integrate ... //depot/projects/smpng/sys/net/if_tun.c#12 integrate ... //depot/projects/smpng/sys/net/raw_usrreq.c#7 integrate ... //depot/projects/smpng/sys/net/rtsock.c#17 integrate ... //depot/projects/smpng/sys/netatalk/ddp_input.c#3 integrate ... //depot/projects/smpng/sys/netatm/atm_aal5.c#5 integrate ... //depot/projects/smpng/sys/netatm/atm_cm.c#4 integrate ... //depot/projects/smpng/sys/netatm/atm_cm.h#3 integrate ... //depot/projects/smpng/sys/netatm/atm_subr.c#8 integrate ... //depot/projects/smpng/sys/netatm/atm_var.h#6 integrate ... //depot/projects/smpng/sys/netgraph/ng_socket.c#11 integrate ... //depot/projects/smpng/sys/netinet/accf_data.c#3 integrate ... //depot/projects/smpng/sys/netinet/accf_http.c#3 integrate ... //depot/projects/smpng/sys/netinet/ip_divert.c#14 integrate ... //depot/projects/smpng/sys/netinet/ip_fw.c#13 integrate ... //depot/projects/smpng/sys/netinet/ip_mroute.c#11 integrate ... //depot/projects/smpng/sys/netinet/raw_ip.c#17 integrate ... //depot/projects/smpng/sys/netinet/tcp_input.c#17 integrate ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#19 integrate ... //depot/projects/smpng/sys/netinet6/icmp6.c#5 integrate ... //depot/projects/smpng/sys/netinet6/ip6_mroute.c#6 integrate ... //depot/projects/smpng/sys/netinet6/raw_ip6.c#10 integrate ... //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#12 integrate ... //depot/projects/smpng/sys/netipx/ipx_usrreq.c#7 integrate ... //depot/projects/smpng/sys/netipx/spx_usrreq.c#4 integrate ... //depot/projects/smpng/sys/netkey/keysock.c#7 integrate ... //depot/projects/smpng/sys/netnatm/natm.c#5 integrate ... //depot/projects/smpng/sys/netsmb/smb_trantcp.c#8 integrate ... //depot/projects/smpng/sys/pc98/pc98/clock.c#9 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/clock.c#6 integrate ... //depot/projects/smpng/sys/sys/filedesc.h#11 integrate ... //depot/projects/smpng/sys/sys/malloc.h#9 integrate ... //depot/projects/smpng/sys/sys/param.h#22 integrate ... //depot/projects/smpng/sys/sys/proc.h#47 integrate ... //depot/projects/smpng/sys/sys/signalvar.h#8 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#18 integrate ... //depot/projects/smpng/sys/sys/time.h#7 integrate ... //depot/projects/smpng/sys/sys/timepps.h#4 integrate ... //depot/projects/smpng/sys/sys/timetc.h#7 integrate ... //depot/projects/smpng/sys/sys/vnode.h#17 integrate ... //depot/projects/smpng/sys/tools/makeobjops.awk#1 branch ... //depot/projects/smpng/sys/vm/uma.h#4 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#12 integrate ... //depot/projects/smpng/sys/vm/uma_dbg.c#1 branch ... //depot/projects/smpng/sys/vm/uma_dbg.h#1 branch ... //depot/projects/smpng/sys/vm/uma_int.h#8 integrate ... //depot/projects/smpng/sys/vm/vm_fault.c#9 integrate ... //depot/projects/smpng/sys/vm/vm_map.c#12 integrate ... //depot/projects/smpng/sys/vm/vm_map.h#7 integrate ... //depot/projects/smpng/sys/vm/vm_page.c#16 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.28 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.29 2002/04/30 19:34:28 phk Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* @@ -124,9 +124,6 @@ "alpha" /* name */ }; -SYSCTL_OPAQUE(_debug, OID_AUTO, alpha_timecounter, CTLFLAG_RD, - &alpha_timecounter, sizeof(alpha_timecounter), "S,timecounter", ""); - static struct timecounter i8254_timecounter = { i8254_get_timecount, /* get_timecount */ 0, /* no poll_pps */ @@ -135,9 +132,6 @@ "i8254" /* name */ }; -SYSCTL_OPAQUE(_debug, OID_AUTO, i8254_timecounter, CTLFLAG_RD, - &i8254_timecounter, sizeof(i8254_timecounter), "S,timecounter", ""); - /* Values for timerX_state: */ #define RELEASED 0 #define RELEASE_PENDING 1 ==== //depot/projects/smpng/sys/alpha/alpha/mem.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.39 2002/02/27 18:31:35 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.40 2002/05/01 06:24:51 peter Exp $ */ /* @@ -59,8 +59,6 @@ #include #include -#include -#include #ifdef PERFMON #include #endif ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#22 (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. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.120 2002/04/20 14:43:34 rwatson Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.121 2002/05/01 02:17:33 peter Exp $ */ #include "opt_compat.h" @@ -64,13 +64,7 @@ #include #include -#include #include -#include -#include -#ifdef __i386__ -#include -#endif #include ==== //depot/projects/smpng/sys/conf/NOTES#8 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1027 2002/04/28 04:58:12 anholt Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1029 2002/04/30 22:47:26 scottl Exp $ # # @@ -1308,7 +1308,7 @@ # support). # device aac -device aacp # SCSI Passthrough interface (optional) +device aacp # SCSI Passthrough interface (optional, CAM required) # # Compaq Smart RAID, Mylex DAC960 and AMI MegaRAID controllers. Only @@ -1633,6 +1633,7 @@ device de # DEC/Intel DC21x4x (``Tulip'') device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') +device my # Myson controllers # PCI Gigabit & FDDI NICs. device bge ==== //depot/projects/smpng/sys/conf/files#37 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.629 2002/04/28 04:58:12 anholt Exp $ +# $FreeBSD: src/sys/conf/files,v 1.630 2002/04/30 07:54:21 jeff Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1371,4 +1371,5 @@ vm/vm_swap.c standard vm/vm_unix.c standard vm/uma_core.c standard +vm/uma_dbg.c standard vm/vnode_pager.c standard ==== //depot/projects/smpng/sys/conf/files.powerpc#7 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.8 2002/04/15 12:30:14 benno Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.9 2002/04/30 11:13:16 benno Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -25,6 +25,7 @@ powerpc/powerpc/ofwmagic.s standard powerpc/powerpc/ofw_machdep.c standard powerpc/powerpc/pmap.c standard +powerpc/powerpc/sigcode.S standard powerpc/powerpc/suswintr.c standard powerpc/powerpc/syncicache.c standard powerpc/powerpc/sys_machdep.c standard ==== //depot/projects/smpng/sys/conf/kern.post.mk#9 (text+ko) ==== @@ -1,4 +1,3 @@ - # Part of unified Makefile for building kenrels. This includes all # the definitions that need to be included after all the % directives, # except %RULES and things that act like they are part of %RULES @@ -7,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.16 2002/04/24 11:26:19 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.17 2002/05/01 03:28:14 obrien Exp $ # # XXX why are only some phony targets marked phony? @@ -43,7 +42,7 @@ .for mfile in ${MFILES} ${mfile:T:S/.m$/.h/}: ${mfile} - perl5 $S/kern/makeobjops.pl -h ${mfile} + ${AWK} -f $S/tools/makeobjops.awk ${mfile} -h .endfor kernel-clean: ==== //depot/projects/smpng/sys/conf/kern.pre.mk#10 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kenrels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.10 2002/03/24 17:45:46 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.11 2002/05/01 03:28:14 obrien Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -73,7 +73,7 @@ PROFILE_C= ${CC} -c ${CFLAGS} ${WERROR} ${.IMPSRC} NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC} -NORMAL_M= perl5 $S/kern/makeobjops.pl -c $<; \ +NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk $< -c ; \ ${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c GEN_CFILES= $S/$M/$M/genassym.c ==== //depot/projects/smpng/sys/conf/kmod.mk#9 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.120 2002/04/29 06:35:25 obrien Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.123 2002/05/01 19:24:26 imp Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -82,6 +82,10 @@ KMODUNLOAD?= /sbin/kldunload OBJCOPY?= objcopy +.if defined(KMODDEPS) +.error "Do not use KMODDEPS on 5.0+, use MODULE_VERSION/MODULE_DEPEND" +.endif + .include .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S @@ -166,6 +170,9 @@ .endif .endif +.if !exists(/usr/sbin/kldxref) +NO_XREF=yes +.endif _ILINKS=@ machine @@ -253,9 +260,7 @@ done; true .endif .if !defined(NO_XREF) - @echo "FAILURES HERE ARE OK" -kldxref ${DESTDIR}${KMODDIR} - @echo "END OF SECTION WHERE FAILURES ARE OK" .endif .endif @@ -308,9 +313,9 @@ ${_src}: @ .endif .if exists(@) -${_src}: @/kern/makeobjops.pl @/${_srcsrc} +${_src}: @/tools/makeobjops.awk @/${_srcsrc} .endif - perl @/kern/makeobjops.pl -${_ext} @/${_srcsrc} + ${AWK} -f @/tools/makeobjops.awk @/${_srcsrc} -${_ext} .endif .endfor # _src .endfor # _ext @@ -341,5 +346,4 @@ .endif .include - .include ==== //depot/projects/smpng/sys/dev/aac/aac_cam.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.1 2002/04/27 01:31:13 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.2 2002/04/30 22:50:26 scottl Exp $ */ /* @@ -67,8 +67,6 @@ struct aac_cam { device_t dev; struct aac_cam_inf *inf; - u_int32_t scsi_method_id; - int bus; struct cam_sim *sim; struct cam_path *path; }; @@ -149,6 +147,7 @@ return (EIO); } + /* Since every bus has it's own sim, every bus 'appears' as bus 0 */ if (xpt_bus_register(sim, 0) != CAM_SUCCESS) { cam_sim_free(sim, TRUE); return (EIO); @@ -163,7 +162,6 @@ camsc->sim = sim; camsc->path = path; - camsc->bus = cam_sim_bus(sim); return (0); } @@ -227,7 +225,7 @@ cpi->max_target = camsc->inf->TargetsPerBus; cpi->max_lun = 8; /* Per the controller spec */ cpi->initiator_id = camsc->inf->InitiatorBusId; - cpi->bus_id = cam_sim_bus(sim); + cpi->bus_id = camsc->inf->BusNumber; cpi->base_transfer_speed = 3300; strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); strncpy(cpi->hba_vid, "Adaptec", HBA_IDLEN); @@ -242,7 +240,7 @@ { u_int32_t handle; - handle = AAC_BTL_TO_HANDLE(cam_sim_bus(sim), + handle = AAC_BTL_TO_HANDLE(camsc->inf->BusNumber, ccb->ccb_h.target_id, ccb->ccb_h.target_lun); ccb->ccb_h.status = aac_cam_get_tran_settings(sc, &ccb->cts, handle); @@ -371,7 +369,7 @@ break; } - srb->bus = cam_sim_bus(sim); /* Bus number relative to the card */ + srb->bus = camsc->inf->BusNumber; /* Bus number relative to the card */ srb->target = ccb->ccb_h.target_id; srb->lun = ccb->ccb_h.target_lun; srb->timeout = ccb->ccb_h.timeout; /* XXX */ @@ -509,7 +507,7 @@ vmi->IoctlCmd = ResetBus; rbc = (struct aac_resetbus *)&vmi->IoctlBuf[0]; - rbc->BusNumber = cam_sim_bus(sim); + rbc->BusNumber = camsc->inf->BusNumber; e = aac_sync_fib(sc, ContainerCommand, 0, fib, sizeof(struct aac_vmioctl)); ==== //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.17 2002/04/26 10:06:24 phk Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.18 2002/04/30 19:34:30 phk Exp $ */ #include "opt_acpi.h" #include @@ -102,8 +102,6 @@ "ACPI" }; -SYSCTL_OPAQUE(_debug, OID_AUTO, acpi_timecounter, CTLFLAG_RD, - &acpi_timer_timecounter, sizeof(acpi_timer_timecounter), "S,timecounter", ""); static int test_counter(void); #define N 2000 ==== //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ # $Id$ # -# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.11 2002/04/24 16:24:43 gibbs Exp $ +# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.12 2002/05/01 06:50:59 peter Exp $ PROG= aicasm @@ -23,6 +23,9 @@ .endif CFLAGS+= -I/usr/include -I. +.ifdef MAKESRCPATH +CFLAGS+= -I${MAKESRCPATH} +.endif NOMAN= noman YFLAGS= -b ${.TARGET:R} ${.TARGET:M*macro*:S/$(.TARGET)/-p mm/} -d LFLAGS+= ${.TARGET:M*macro*:S/$(.TARGET)/-Pmm/} ==== //depot/projects/smpng/sys/dev/ciss/ciss.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.4 2002/04/11 09:28:09 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.5 2002/04/29 21:46:09 ps Exp $ */ /* @@ -828,8 +828,10 @@ goto out; } +#if 0 /* XXX later revisions may not need this */ sc->ciss_flags |= CISS_FLAG_FAKE_SYNCH; +#endif /* XXX only really required for old 5300 adapters? */ sc->ciss_flags |= CISS_FLAG_BMIC_ABORT; @@ -2000,7 +2002,7 @@ */ if ((sc->ciss_cam_sim = cam_sim_alloc(ciss_cam_action, ciss_cam_poll, "ciss", sc, device_get_unit(sc->ciss_dev), - sc->ciss_cfg->max_outstanding_commands, + sc->ciss_max_requests - 2, 1, sc->ciss_cam_devq)) == NULL) { ciss_printf(sc, "can't allocate CAM SIM\n"); @@ -2421,6 +2423,9 @@ /* handle post-command fixup */ ciss_cam_complete_fixup(sc, csio); + /* tell CAM we're ready for more commands */ + csio->ccb_h.status |= CAM_RELEASE_SIMQ; + xpt_done((union ccb *)csio); ciss_release_request(cr); } @@ -2442,15 +2447,15 @@ target = csio->ccb_h.target_id; cl = &sc->ciss_logical[target]; - padstr(inq->vendor, ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance), 8); - padstr(inq->product, ciss_name_ldrive_status(cl->cl_lstatus->status), 16); - padstr(inq->revision, "", 4); + padstr(inq->vendor, "COMPAQ", 8); + padstr(inq->product, ciss_name_ldrive_org(cl->cl_ldrive->fault_tolerance), 8); + padstr(inq->revision, ciss_name_ldrive_status(cl->cl_lstatus->status), 16); } } /******************************************************************************** - * Find a peripheral attahed at (target) + * Find a peripheral attached at (target) */ static struct cam_periph * ciss_find_periph(struct ciss_softc *sc, int target) @@ -2928,9 +2933,17 @@ */ ostatus = ciss_decode_ldrive_status(cn->data.logical_status.previous_state); ld->cl_status = ciss_decode_ldrive_status(cn->data.logical_status.new_state); - if (ld->cl_status != NULL) + if (ld->cl_lstatus != NULL) ld->cl_lstatus->status = cn->data.logical_status.new_state; +#if 0 + /* + * Have CAM rescan the drive if its status has changed. + */ + if (ostatus != ld->cl_status) + ciss_cam_rescan_target(sc, cn->data.logical_status.logical_drive); +#endif + break; case 1: /* logical drive has recognised new media, needs Accept Media Exchange */ @@ -3044,6 +3057,11 @@ { int bus, target, i; + if (ld->cl_lstatus == NULL) { + printf("does not exist\n"); + return; + } + /* print drive status */ switch(ld->cl_lstatus->status) { case CISS_LSTATUS_OK: @@ -3082,7 +3100,7 @@ break; } - /* print failed drives */ + /* print failed physical drives */ for (i = 0; i < CISS_BIG_MAP_ENTRIES / 8; i++) { bus = CISS_BIG_MAP_BUS(sc, ld->cl_lstatus->drive_failure_map[i]); target = CISS_BIG_MAP_TARGET(sc, ld->cl_lstatus->drive_failure_map[i]); @@ -3093,6 +3111,54 @@ } } +#ifdef CISS_DEBUG +/************************************************************************ + * Print information about the controller/driver. + */ +static void +ciss_print_adapter(struct ciss_softc *sc) +{ + int i; + + ciss_printf(sc, "ADAPTER:\n"); + for (i = 0; i < CISSQ_COUNT; i++) { + ciss_printf(sc, "%s %d/%d\n", + i == 0 ? "free" : + i == 1 ? "busy" : "complete", + sc->ciss_qstat[i].q_length, + sc->ciss_qstat[i].q_max); + } + ciss_printf(sc, "max_requests %d\n", sc->ciss_max_requests); + ciss_printf(sc, "notify_head/tail %d/%d\n", + sc->ciss_notify_head, sc->ciss_notify_tail); + ciss_printf(sc, "flags %b\n", sc->ciss_flags, + "\20\1notify_ok\2control_open\3aborting\4running\21fake_synch\22bmic_abort\n"); + + for (i = 0; i < CISS_MAX_LOGICAL; i++) { + ciss_printf(sc, "LOGICAL DRIVE %d: ", i); + ciss_print_ldrive(sc, sc->ciss_logical + i); + } + + for (i = 1; i < sc->ciss_max_requests; i++) + ciss_print_request(sc->ciss_request + i); + +} + +/* DDB hook */ +void +ciss_print0(void) +{ + struct ciss_softc *sc; + + sc = devclass_get_softc(devclass_find("ciss"), 0); + if (sc == NULL) { + printf("no ciss controllers\n"); + } else { + ciss_print_adapter(sc); + } +} +#endif + /************************************************************************ * Return a name for a logical drive status value. */ ==== //depot/projects/smpng/sys/dev/isp/isp.c#19 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.92 2002/04/16 19:55:35 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.93 2002/05/01 21:58:36 mjacob Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -107,6 +107,8 @@ static const char sc2[] = "%s CHAN %d TGT %d FLAGS 0x%x 0x%x/0x%x"; static const char sc3[] = "Generated"; static const char sc4[] = "NVRAM"; +static const char bun[] = + "bad underrun for %d.%d (count %d, resid %d, status %s)"; /* * Local function prototypes. @@ -4397,11 +4399,25 @@ break; case RQCS_DATA_UNDERRUN: + { + if (IS_FC(isp)) { + int ru_marked = (sp->req_scsi_status & RQCS_RU) != 0; + if (!ru_marked || sp->req_resid > XS_XFRLEN(xs)) { + isp_prt(isp, ISP_LOGWARN, bun, XS_TGT(xs), + XS_LUN(xs), XS_XFRLEN(xs), sp->req_resid, + (ru_marked)? "marked" : "not marked"); + if (XS_NOERR(xs)) { + XS_SETERR(xs, HBA_BOTCH); + } + return; + } + } XS_RESID(xs) = sp->req_resid; if (XS_NOERR(xs)) { XS_SETERR(xs, HBA_NOERROR); } return; + } case RQCS_XACT_ERR1: isp_prt(isp, ISP_LOGERR, xact1, XS_CHANNEL(xs), @@ -4424,8 +4440,8 @@ case RQCS_QUEUE_FULL: isp_prt(isp, ISP_LOGDEBUG0, - "internal queues full for %d.%d.%d status 0x%x", XS_TGT(xs), - XS_LUN(xs), XS_CHANNEL(xs), *XS_STSP(xs)); + "internal queues full for %d.%d.%d status 0x%x", + XS_CHANNEL(xs), XS_TGT(xs), XS_LUN(xs), *XS_STSP(xs)); /* * If QFULL or some other status byte is set, then this @@ -4507,13 +4523,14 @@ */ if ((sp->req_completion_status & 0xff) == RQCS_PORT_UNAVAILABLE) isp_prt(isp, ISP_LOGINFO, - "Port Unavailable for target %d", XS_TGT(xs)); + "port unavailable for target %d", XS_TGT(xs)); else isp_prt(isp, ISP_LOGINFO, "port logout for target %d", XS_TGT(xs)); /* * If we're on a local loop, force a LIP (which is overkill) - * to force a re-login of this unit. + * to force a re-login of this unit. If we're on fabric, + * then we'll have to relogin as a matter of course. */ if (FCPARAM(isp)->isp_topo == TOPO_NL_PORT || FCPARAM(isp)->isp_topo == TOPO_FL_PORT) { @@ -4933,8 +4950,8 @@ ISPOPMAP(0x00, 0x00), /* 0x58: */ ISPOPMAP(0x00, 0x00), /* 0x59: */ ISPOPMAP(0x00, 0x00), /* 0x5a: */ - ISPOPMAP(0x00, 0x00), /* 0x5b: */ - ISPOPMAP(0x00, 0x00), /* 0x5c: */ + ISPOPMAP(0x03, 0x01), /* 0x5b: MBOX_DRIVER_HEARTBEAT */ + ISPOPMAP(0xcf, 0x01), /* 0x5c: MBOX_FW_HEARTBEAT */ ISPOPMAP(0x07, 0x03), /* 0x5d: MBOX_GET_SET_DATA_RATE */ ISPOPMAP(0x00, 0x00), /* 0x5e: */ ISPOPMAP(0x00, 0x00), /* 0x5f: */ ==== //depot/projects/smpng/sys/dev/mii/acphy.c#5 (text+ko) ==== @@ -89,7 +89,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/acphy.c,v 1.7 2002/04/29 13:07:31 phk Exp $"; + "$FreeBSD: src/sys/dev/mii/acphy.c,v 1.8 2002/05/01 19:15:54 semenu Exp $"; #endif static int acphy_probe (device_t); @@ -176,33 +176,31 @@ struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; + /* + * If we're not selected, then do nothing, just isolate and power + * down, if changing media. + */ + if (IFM_INST(ife->ifm_media) != sc->mii_inst) { + if (cmd == MII_MEDIACHG) { + reg = PHY_READ(sc, MII_BMCR); + PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO | BMCR_PDOWN); + } + + return (0); + } + switch (cmd) { case MII_POLLSTAT: - /* - * If we're not polling our PHY instance, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); break; case MII_MEDIACHG: /* - * If the media indicates a different PHY instance, - * isolate ourselves. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) { - reg = PHY_READ(sc, MII_BMCR); - PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO | BMCR_PDOWN); - return (0); - } - - /* * If the interface is not up, don't do anything. */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) break; - /* Wake & deisolate up is needed */ + /* Wake & deisolate up if necessary */ reg = PHY_READ(sc, MII_BMCR); if (reg & (BMCR_ISO | BMCR_PDOWN)) PHY_WRITE(sc, MII_BMCR, reg & ~(BMCR_ISO | BMCR_PDOWN)); @@ -230,12 +228,6 @@ case MII_TICK: /* - * If we're not currently selected, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); - - /* * Is the interface even up? */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) @@ -248,23 +240,8 @@ break; /* - * check for link. - * Read the status register twice; BMSR_LINK is latch-low. + * This PHY's autonegotiation doesn't need to be kicked. */ - reg = PHY_READ(sc, MII_BMSR) | PHY_READ(sc, MII_BMSR); - if (reg & BMSR_LINK) - break; - - /* - * Only retry autonegotiation every 5 seconds. - */ - if (++sc->mii_ticks != 5) - return (0); - - sc->mii_ticks = 0; - acphy_reset(sc); - if (mii_phy_auto(sc, 0) == EJUSTRETURN) - return (0); break; } @@ -308,8 +285,7 @@ mii->mii_media_active |= IFM_NONE; return; } - diag = PHY_READ(sc, MII_ACPHY_DIAG) | - PHY_READ(sc, MII_ACPHY_DIAG); + diag = PHY_READ(sc, MII_ACPHY_DIAG); if (diag & AC_DIAG_SPEED) mii->mii_media_active |= IFM_100_TX; else ==== //depot/projects/smpng/sys/dev/mii/qsphy.c#5 (text+ko) ==== @@ -93,7 +93,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/qsphy.c,v 1.6 2002/04/29 13:07:32 phk Exp $"; + "$FreeBSD: src/sys/dev/mii/qsphy.c,v 1.7 2002/05/01 19:15:54 semenu Exp $"; #endif static int qsphy_probe (device_t); @@ -180,27 +180,25 @@ struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; + /* + * If we're not selected, then do nothing, just isolate, if + * changing media. + */ + if (IFM_INST(ife->ifm_media) != sc->mii_inst) { + if (cmd == MII_MEDIACHG) { + reg = PHY_READ(sc, MII_BMCR); + PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO); + } + + return (0); + } + switch (cmd) { case MII_POLLSTAT: - /* - * If we're not polling our PHY instance, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); break; case MII_MEDIACHG: /* - * If the media indicates a different PHY instance, - * isolate ourselves. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) { - reg = PHY_READ(sc, MII_BMCR); - PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO); - return (0); - } - - /* * If the interface is not up, don't do anything. */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) @@ -229,12 +227,6 @@ case MII_TICK: /* - * If we're not currently selected, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); - - /* * Is the interface even up? */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) @@ -247,23 +239,8 @@ break; /* - * check for link. - * Read the status register twice; BMSR_LINK is latch-low. + * This PHY's autonegotiation doesn't need to be kicked. */ - reg = PHY_READ(sc, MII_BMSR) | PHY_READ(sc, MII_BMSR); - if (reg & BMSR_LINK) - break; - - /* - * Only retry autonegotiation every 5 seconds. - */ - if (++sc->mii_ticks != 5) - return (0); - - sc->mii_ticks = 0; - qsphy_reset(sc); - if (mii_phy_auto(sc, 0) == EJUSTRETURN) - return (0); break; } @@ -280,7 +257,6 @@ struct mii_softc *sc; { struct mii_data *mii = sc->mii_pdata; - struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int bmsr, bmcr, pctl; mii->mii_media_status = IFM_AVALID; @@ -301,37 +277,31 @@ if (bmcr & BMCR_LOOP) mii->mii_media_active |= IFM_LOOP; - if (bmcr & BMCR_AUTOEN) { - if ((bmsr & BMSR_ACOMP) == 0) { - /* Erg, still trying, I guess... */ - mii->mii_media_active |= IFM_NONE; - return; - } - pctl = PHY_READ(sc, MII_QSPHY_PCTL) | - PHY_READ(sc, MII_QSPHY_PCTL); - switch (pctl & PCTL_OPMASK) { - case PCTL_10_T: - mii->mii_media_active |= IFM_10_T; - break; - case PCTL_10_T_FDX: - mii->mii_media_active |= IFM_10_T|IFM_FDX; - break; - case PCTL_100_TX: - mii->mii_media_active |= IFM_100_TX; - break; - case PCTL_100_TX_FDX: - mii->mii_media_active |= IFM_100_TX|IFM_FDX; - break; - case PCTL_100_T4: - mii->mii_media_active |= IFM_100_T4; - break; - default: - /* Erg... this shouldn't happen. */ - mii->mii_media_active |= IFM_NONE; - break; - } - } else - mii->mii_media_active = ife->ifm_media; + pctl = PHY_READ(sc, MII_QSPHY_PCTL); + switch (pctl & PCTL_OPMASK) { + case PCTL_10_T: + mii->mii_media_active |= IFM_10_T; + break; + case PCTL_10_T_FDX: + mii->mii_media_active |= IFM_10_T|IFM_FDX; + break; + case PCTL_100_TX: + mii->mii_media_active |= IFM_100_TX; + break; + case PCTL_100_TX_FDX: + mii->mii_media_active |= IFM_100_TX|IFM_FDX; + break; + case PCTL_100_T4: + mii->mii_media_active |= IFM_100_T4; + break; + case PCTL_AN: + mii->mii_media_active |= IFM_NONE; + break; + default: + /* Erg... this shouldn't happen. */ + mii->mii_media_active |= IFM_NONE; + break; + } } static void ==== //depot/projects/smpng/sys/dev/my/if_my.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 8:49:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0502837B41C; Thu, 2 May 2002 08:49:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 49C1437B416 for ; Thu, 2 May 2002 08:49:09 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42Fn9p51564 for perforce@freebsd.org; Thu, 2 May 2002 08:49:09 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Thu, 2 May 2002 08:49:09 -0700 (PDT) Message-Id: <200205021549.g42Fn9p51564@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10688 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10688 Change 10688 by arr@arr_shibby on 2002/05/02 08:48:36 - Have chown events use the path within the object section of the audit record rather than keeping another one in chown_info. Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#22 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#22 (text+ko) ==== @@ -137,8 +137,8 @@ mode_t ci_mode; }; +/* Retrieve path from the audit record's object section */ struct chown_info { - char ci_path[MAXPATHLEN]; gid_t ci_gid; uid_t ci_uid; }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 9:11:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B59E37B404; Thu, 2 May 2002 09:11:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id F017737B416; Thu, 2 May 2002 09:11:04 -0700 (PDT) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.3/8.12.3) with SMTP id g42GAkb5026229; Thu, 2 May 2002 12:10:46 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Thu, 2 May 2002 12:10:45 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: John Baldwin Cc: Doug Rabson , Perforce Change Reviews Subject: RE: PERFORCE change 10681 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, 2 May 2002, John Baldwin wrote: > On 02-May-2002 Doug Rabson wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10681 > > > > Change 10681 by dfr@dfr_home on 2002/05/02 06:00:49 > > > > Add a bunch of ilp32 wrappers for ia32 syscalls. > > Great fear. :) > > As we would say on IRC, you have entered into entirely new levels of > Evilness now. We would invite him also to change his username to EvilDFR at this point so that he could wear this as a badge of honor. This speaks volumes. :-) Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 9:28: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B2A337B405; Thu, 2 May 2002 09:27:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9610E37B41B for ; Thu, 2 May 2002 09:27:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42GRuZ59325 for perforce@freebsd.org; Thu, 2 May 2002 09:27:56 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Thu, 2 May 2002 09:27:56 -0700 (PDT) Message-Id: <200205021627.g42GRuZ59325@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10690 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10690 Change 10690 by arr@arr_shibby on 2002/05/02 09:27:50 - Create AUDIT_SET_OBJECT - Create AUDIT_SET_OBJECT_UPATH for setting the path value with pointers from userland. - Create AUDIT_SET_OBJECT_KPATH for setting the path value with pointers from kernelland. The path handling stuff needs to be figured out. I've been toying with the idea of doing some minor caching method to decrease the # of copies... Perhaps those who read these submit messages have something to say about this? Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#23 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#23 (text+ko) ==== @@ -132,6 +132,22 @@ (subj)->as_pid = (pid); \ } while (0) +/* XXX strncpy */ +#define AUDIT_SET_OBJECT(obj, access, path, uid, gid) do { \ + (obj)->ao_access = (access); \ + strncpy((obj)->ao_path, (path), sizeof((obj)->ao_path) - 1); \ + (obj)->ao_uid = (uid); \ + (obj)->ao_gid = (gid); \ +} while (0) + +/* Set the path with a pointer from userland */ +#define AUDIT_SET_OBJECT_UPATH(obj, upath) \ + copyinstr((upath), (obj)->ao_path, sizeof(obj)->ao_path), NULL) + +/* Set the path with a pointer from kernel land */ +#define AUDIT_SET_OBJECT_KPATH(obj, kpath) \ + copystr((kpath), (obj)->ao_path, sizeof(obj)->ao_path), NULL) + struct chmod_info { char ci_path[MAXPATHLEN]; mode_t ci_mode; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 9:35:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D450137B41C; Thu, 2 May 2002 09:35:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BFC4137B433 for ; Thu, 2 May 2002 09:35:07 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42GZ5M60212 for perforce@freebsd.org; Thu, 2 May 2002 09:35:05 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Thu, 2 May 2002 09:35:05 -0700 (PDT) Message-Id: <200205021635.g42GZ5M60212@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10691 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10691 Change 10691 by arr@arr_shibby on 2002/05/02 09:34:29 - Axe audit_write for now. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#30 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#30 (text+ko) ==== @@ -144,13 +144,6 @@ mtx_unlock(&audit_mtx); } -int -audit_record_write(audit_record_t *ar) -{ - - return (-1); -} - void audit_write_thread(void *arg) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 9:47:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A5E637B416; Thu, 2 May 2002 09:47:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7AF6737B417 for ; Thu, 2 May 2002 09:47:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42GlOp61814 for perforce@freebsd.org; Thu, 2 May 2002 09:47:24 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Thu, 2 May 2002 09:47:24 -0700 (PDT) Message-Id: <200205021647.g42GlOp61814@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10694 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10694 Change 10694 by arr@arr_shibby on 2002/05/02 09:47:20 - Forgot vnode type argument to AUDIT_SET_OBJECT Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#24 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#24 (text+ko) ==== @@ -133,9 +133,10 @@ } while (0) /* XXX strncpy */ -#define AUDIT_SET_OBJECT(obj, access, path, uid, gid) do { \ +#define AUDIT_SET_OBJECT(obj, access, path, type, uid, gid) do { \ (obj)->ao_access = (access); \ strncpy((obj)->ao_path, (path), sizeof((obj)->ao_path) - 1); \ + (obj)->ao_type = (type); \ (obj)->ao_uid = (uid); \ (obj)->ao_gid = (gid); \ } while (0) @@ -248,8 +249,8 @@ struct vnode *audit_write_init(const char *, struct thread *, struct ucred **); void audit_write_shutdown(struct vnode *, struct thread *, struct ucred *); -int audit_record_write(audit_record_t *); audit_record_t *audit_record_init(int, size_t); void audit_write_thread(void *); +static __inline void audit_record_enqueue(audit_record_t *); #endif /* !_SYS_AUDIT_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 10:11: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A97937B41A; Thu, 2 May 2002 10:10:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B5E8737B419 for ; Thu, 2 May 2002 10:10:55 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42HAt467714 for perforce@freebsd.org; Thu, 2 May 2002 10:10:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 2 May 2002 10:10:55 -0700 (PDT) Message-Id: <200205021710.g42HAt467714@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10697 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10697 Change 10697 by rwatson@rwatson_tislabs on 2002/05/02 10:09:58 Suggestively add nmacvnodes to count the number of live vnodes with labels. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#137 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#137 (text+ko) ==== @@ -792,7 +792,7 @@ SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, "TrustedBSD MAC debug info"); static unsigned int nmacmbufs, nmacsubjects, nmacifnets, nmacbpfdescs, - nmacsockets, nmacmounts; + nmacsockets, nmacmounts, nmacvnodes; SYSCTL_UINT(_security_mac_debug, OID_AUTO, mbufs, CTLFLAG_RD, &nmacmbufs, 0, "number of mbufs in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, subjects, CTLFLAG_RD, @@ -805,6 +805,8 @@ &nmacsockets, 0, "number of sockets in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, mounts, CTLFLAG_RD, &nmacmounts, 0, "number of mounts in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, vnodes, CTLFLAG_RD, + &nmacvnodes, 0, "number of vnodes in use"); int mac_init_mbuf(struct mbuf *m, int how) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 10:42:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91A7E37B404; Thu, 2 May 2002 10:42:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 73F6C37B423 for ; Thu, 2 May 2002 10:42:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42HgYg71176 for perforce@freebsd.org; Thu, 2 May 2002 10:42:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 2 May 2002 10:42:34 -0700 (PDT) Message-Id: <200205021742.g42HgYg71176@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10699 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10699 Change 10699 by rwatson@rwatson_tislabs on 2002/05/02 10:42:24 While we'll still be able to link mac_none straight into the kernel, don't do so by default. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#26 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#26 (text+ko) ==== @@ -32,7 +32,6 @@ options MAC options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART -options MAC_NONE options SEBSD options INET #InterNETworking To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 10:44:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE36037B41B; Thu, 2 May 2002 10:44:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3FA7837B41C for ; Thu, 2 May 2002 10:44:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42Hib371380 for perforce@freebsd.org; Thu, 2 May 2002 10:44:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 2 May 2002 10:44:37 -0700 (PDT) Message-Id: <200205021744.g42Hib371380@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10700 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10700 Change 10700 by rwatson@rwatson_tislabs on 2002/05/02 10:43:48 Sync MAC to recent GENERIC updates. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#27 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#27 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.338 2002/04/09 11:18:38 phk Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.340 2002/04/27 01:31:16 scottl Exp $ machine i386 cpu I486_CPU @@ -60,7 +60,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS #Enable mutex checks to detects deadlocks and cycles +options WITNESS #Enable checks to detects deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed options ALT_BREAK_TO_DEBUGGER @@ -120,6 +120,7 @@ # RAID controllers device aac # Adaptec FSA RAID +device aacp # SCSI passthrough for aac (requires CAM) device amr # AMI MegaRAID device ida # Compaq Smart RAID device mlx # Mylex DAC960 family To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 11:43:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28F5937B417; Thu, 2 May 2002 11:43:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 74D1637B416 for ; Thu, 2 May 2002 11:43:09 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g42Ih9T83693 for perforce@freebsd.org; Thu, 2 May 2002 11:43:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 2 May 2002 11:43:09 -0700 (PDT) Message-Id: <200205021843.g42Ih9T83693@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10706 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10706 Change 10706 by rwatson@rwatson_tislabs on 2002/05/02 11:42:08 Don't #ifdef MAC the mac_none code; the file is either built as part of mac_none.ko, in which case all the code is wanted, or it's built into the kernel conditional on the option, in which case it's wanted. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#26 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#26 (text+ko) ==== @@ -42,8 +42,6 @@ * Generic mandatory access module that does nothing. */ -#include "opt_mac.h" - #include #include #include @@ -66,8 +64,6 @@ #include #include -#ifdef MAC - SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, none, CTLFLAG_RW, 0, @@ -769,5 +765,3 @@ }; MAC_POLICY_SET(mac_none_ops, trustedbsd_mac_none, "TrustedBSD MAC/None", 0, 0); - -#endif /* !MAC */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 20:17:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21B4F37B417; Thu, 2 May 2002 20:17:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 47F3F37B41C for ; Thu, 2 May 2002 20:17:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g433Hdd76050 for perforce@freebsd.org; Thu, 2 May 2002 20:17:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 2 May 2002 20:17:39 -0700 (PDT) Message-Id: <200205030317.g433Hdd76050@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10725 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10725 Change 10725 by rwatson@rwatson_tislabs on 2002/05/02 20:16:58 When there's a syntax error in the mode, print the letter of the mode that caused the breakage, rather than '?'. This is more useful. Affected files ... ... //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#4 (text+ko) ==== @@ -294,7 +294,8 @@ /* ignore */ break; default: - fprintf(stderr, "Unknown mode letter: %c\n", c); + fprintf(stderr, "Unknown mode letter: %c\n", + argv[0][i]); return (-1); } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 23:14:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDD5E37B419; Thu, 2 May 2002 23:14:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0051B37B417 for ; Thu, 2 May 2002 23:14:14 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g436EDo01174 for perforce@freebsd.org; Thu, 2 May 2002 23:14:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Thu, 2 May 2002 23:14:13 -0700 (PDT) Message-Id: <200205030614.g436EDo01174@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 10728 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10728 Change 10728 by marcel@marcel_nfs on 2002/05/02 23:14:08 o Add the currently defined GUIDs to mca.h, o Move the mca_guid struct to mca.h and define guid fields as such, o Recognize the GUIDs and select the appropriate dumper, o Mostly implement the CPU dumper. Affected files ... ... //depot/projects/ia64/sbin/mca/mca.c#2 edit ... //depot/projects/ia64/sys/ia64/include/mca.h#2 edit Differences ... ==== //depot/projects/ia64/sbin/mca/mca.c#2 (text+ko) ==== @@ -48,13 +48,6 @@ #include #include -struct mca_guid { - uint32_t data1; - uint16_t data2; - uint16_t data3; - uint8_t data4[8]; -}; - #define BCD(x) ((x >> 4) * 10 + (x & 15)) static char hw_mca_count[] = "hw.mca.count"; @@ -116,18 +109,138 @@ BCD(rh->rh_time[MCA_RH_TIME_MIN]), BCD(rh->rh_time[MCA_RH_TIME_SEC])); if (rh->rh_flags & MCA_RH_FLAGS_PLATFORM_ID) - printf(" platform=%s\n", guid((void*)rh->rh_platform)); + printf(" platform=%s\n", guid(&rh->rh_platform)); printf(" \n"); return (rh->rh_length); } +static void +show_cpu_mod(const char *what, int idx, struct mca_cpu_mod *cpu_mod) +{ + printf(" <%s-%d>\n", what, idx); + if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_INFO) + printf(" info=%016llx\n", cpu_mod->cpu_mod_info); + if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_REQID) + printf(" requester=%016llx\n", cpu_mod->cpu_mod_reqid); + if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_RSPID) + printf(" responder=%016llx\n", cpu_mod->cpu_mod_rspid); + if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_TGTID) + printf(" target=%016llx\n", cpu_mod->cpu_mod_tgtid); + if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_IP) + printf(" ip=%016llx\n", cpu_mod->cpu_mod_ip); + printf(" \n", what, idx); +} + +static void +show_cpu(struct mca_cpu_record *cpu) +{ + struct mca_cpu_mod *mod; + struct mca_cpu_cpuid *cpuid; + struct mca_cpu_psi *psi; + int i, n; + + printf(" \n"); + + if (cpu->cpu_flags & MCA_CPU_FLAGS_ERRMAP) + printf(" errmap=%016llx\n", (long long)cpu->cpu_errmap); + if (cpu->cpu_flags & MCA_CPU_FLAGS_STATE) + printf(" state=%016llx\n", (long long)cpu->cpu_state); + if (cpu->cpu_flags & MCA_CPU_FLAGS_CR_LID) + printf(" cr_lid=%016llx\n", (long long)cpu->cpu_cr_lid); + + mod = (struct mca_cpu_mod*)(cpu + 1); + n = MCA_CPU_FLAGS_CACHE(cpu->cpu_flags); + for (i = 0; i < n; i++) + show_cpu_mod("cache", i, mod++); + n = MCA_CPU_FLAGS_TLB(cpu->cpu_flags); + for (i = 0; i < n; i++) + show_cpu_mod("tlb", i, mod++); + n = MCA_CPU_FLAGS_BUS(cpu->cpu_flags); + for (i = 0; i < n; i++) + show_cpu_mod("bus", i, mod++); + n = MCA_CPU_FLAGS_REG(cpu->cpu_flags); + for (i = 0; i < n; i++) + show_cpu_mod("reg", i, mod++); + n = MCA_CPU_FLAGS_MS(cpu->cpu_flags); + for (i = 0; i < n; i++) + show_cpu_mod("ms", i, mod++); + + cpuid = (struct mca_cpu_cpuid*)mod; + for (i = 0; i < 6; i++) + printf(" cpuid%d=%016llx\n", i, cpuid->cpuid[i]); + + psi = (struct mca_cpu_psi*)(cpuid + 1); + /* TODO: Dump PSI */ + + printf(" \n"); +} + +static void +show_memory(void) +{ + printf(" # MEMORY\n"); +} + +static void +show_sel(void) +{ + printf(" # SEL\n"); +} + +static void +show_pci_bus(void) +{ + printf(" # PCI BUS\n"); +} + +static void +show_smbios(void) +{ + printf(" # SMBIOS\n"); +} + +static void +show_pci_dev(void) +{ + printf(" # PCI DEV\n"); +} + +static void +show_generic(void) +{ + printf(" # GENERIC\n"); +} + static size_t show_section(struct mca_section_header *sh) { + static struct mca_guid guid_cpu = MCA_GUID_CPU; + static struct mca_guid guid_memory = MCA_GUID_MEMORY; + static struct mca_guid guid_sel = MCA_GUID_SEL; + static struct mca_guid guid_pci_bus = MCA_GUID_PCI_BUS; + static struct mca_guid guid_smbios = MCA_GUID_SMBIOS; + static struct mca_guid guid_pci_dev = MCA_GUID_PCI_DEV; + static struct mca_guid guid_generic = MCA_GUID_GENERIC; printf("
\n"); - printf(" guid=%s\n", guid((void*)sh->sh_guid)); + printf(" guid=%s\n", guid(&sh->sh_guid)); printf(" revision=%d.%d\n", BCD(sh->sh_major), BCD(sh->sh_minor)); + + if (!memcmp(&sh->sh_guid, &guid_cpu, sizeof(guid_cpu))) + show_cpu((struct mca_cpu_record*)(sh + 1)); + else if (!memcmp(&sh->sh_guid, &guid_memory, sizeof(guid_memory))) + show_memory(); + else if (!memcmp(&sh->sh_guid, &guid_sel, sizeof(guid_sel))) + show_sel(); + else if (!memcmp(&sh->sh_guid, &guid_pci_bus, sizeof(guid_pci_bus))) + show_pci_bus(); + else if (!memcmp(&sh->sh_guid, &guid_smbios, sizeof(guid_smbios))) + show_smbios(); + else if (!memcmp(&sh->sh_guid, &guid_pci_dev, sizeof(guid_pci_dev))) + show_pci_dev(); + else if (!memcmp(&sh->sh_guid, &guid_generic, sizeof(guid_generic))) + show_generic(); + printf("
\n"); return (sh->sh_length); } ==== //depot/projects/ia64/sys/ia64/include/mca.h#2 (text+ko) ==== @@ -29,6 +29,13 @@ #ifndef _MACHINE_MCA_H_ #define _MACHINE_MCA_H_ +struct mca_guid { + uint32_t data1; + uint16_t data2; + uint16_t data3; + uint8_t data4[8]; +}; + struct mca_record_header { uint64_t rh_seqnr; /* Record id. */ uint8_t rh_major; /* BCD (=02). */ @@ -48,11 +55,11 @@ #define MCA_RH_TIME_MON 5 #define MCA_RH_TIME_YEAR 6 #define MCA_RH_TIME_CENT 7 - uint8_t rh_platform[16]; /* Platform id. */ + struct mca_guid rh_platform; /* XXX not really a GUID. */ }; struct mca_section_header { - uint8_t sh_guid[16]; + struct mca_guid sh_guid; uint8_t sh_major; /* BCD (=02). */ uint8_t sh_minor; /* BCD (=00). */ uint8_t sh_flags; @@ -66,14 +73,14 @@ struct mca_cpu_record { uint64_t cpu_flags; -#define MCA_CPU_FLAGS_ERROR_MAP (1ULL << 0) -#define MCA_CPU_FLAGS_STATE_PARM (1ULL << 1) +#define MCA_CPU_FLAGS_ERRMAP (1ULL << 0) +#define MCA_CPU_FLAGS_STATE (1ULL << 1) #define MCA_CPU_FLAGS_CR_LID (1ULL << 2) #define MCA_CPU_FLAGS_PSI_STRUCT (1ULL << 3) #define MCA_CPU_FLAGS_CACHE(x) (((x) >> 4) & 15) #define MCA_CPU_FLAGS_TLB(x) (((x) >> 8) & 15) #define MCA_CPU_FLAGS_BUS(x) (((x) >> 12) & 15) -#define MCA_CPU_FLAGS_REGF(x) (((x) >> 16) & 15) +#define MCA_CPU_FLAGS_REG(x) (((x) >> 16) & 15) #define MCA_CPU_FLAGS_MS(x) (((x) >> 20) & 15) #define MCA_CPU_FLAGS_CPUID (1ULL << 24) uint64_t cpu_errmap; @@ -82,7 +89,7 @@ /* Nx cpu_mod (cache) */ /* Nx cpu_mod (TLB) */ /* Nx cpu_mod (bus) */ - /* Nx cpu_mod (regf) */ + /* Nx cpu_mod (reg) */ /* Nx cpu_mod (MS) */ /* cpu_cpuid */ /* cpu_psi */ @@ -122,6 +129,21 @@ uint64_t cpu_psi_fr[256]; /* 16 bytes per register! */ }; +#define MCA_GUID_CPU \ + {0xe429faf1,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_GUID_MEMORY \ + {0xe429faf2,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_GUID_SEL \ + {0xe429faf3,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_GUID_PCI_BUS \ + {0xe429faf4,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_GUID_SMBIOS \ + {0xe429faf5,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_GUID_PCI_DEV \ + {0xe429faf6,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_GUID_GENERIC \ + {0xe429faf7,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} + #ifdef _KERNEL void ia64_mca_init(void); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 2 23:25:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A53D37B400; Thu, 2 May 2002 23:23:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E34A137B41E for ; Thu, 2 May 2002 23:23:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g436NPD02169 for perforce@freebsd.org; Thu, 2 May 2002 23:23:25 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 2 May 2002 23:23:25 -0700 (PDT) Message-Id: <200205030623.g436NPD02169@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10729 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10729 Change 10729 by peter@peter_overcee on 2002/05/02 23:23:08 IFC @10727 Affected files ... ... //depot/projects/ia64/bin/ps/fmt.c#3 integrate ... //depot/projects/ia64/contrib/openpam/HISTORY#9 integrate ... //depot/projects/ia64/contrib/openpam/MANIFEST#9 integrate ... //depot/projects/ia64/contrib/openpam/RELNOTES#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#5 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#9 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#9 integrate ... //depot/projects/ia64/contrib/openpam/include/security/openpam.h#12 integrate ... //depot/projects/ia64/contrib/openpam/lib/Makefile#9 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#2 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#8 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#9 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_load.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_nullconv.c#1 branch ... //depot/projects/ia64/contrib/openpam/lib/pam_end.c#7 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#9 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_start.c#8 integrate ... //depot/projects/ia64/contrib/openpam/misc/gendoc.pl#7 integrate ... //depot/projects/ia64/etc/pam.d/Makefile#4 integrate ... //depot/projects/ia64/etc/pam.d/gdm#3 integrate ... //depot/projects/ia64/etc/pam.d/rexecd#1 branch ... //depot/projects/ia64/etc/pam.d/xdm#3 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_cancel.c#3 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_poll.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_readv.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_select.c#3 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_wait4.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_writev.c#2 integrate ... //depot/projects/ia64/lib/libpam/libpam/Makefile#12 integrate ... //depot/projects/ia64/libexec/rexecd/Makefile#3 integrate ... //depot/projects/ia64/libexec/rexecd/rexecd.c#4 integrate ... //depot/projects/ia64/sbin/mount_std/mount_std.c#4 integrate ... //depot/projects/ia64/sbin/restore/tape.c#4 integrate ... //depot/projects/ia64/secure/lib/libcrypto/Makefile#5 integrate ... //depot/projects/ia64/secure/lib/libcrypto/Makefile.asm#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/Makefile.inc#4 integrate ... //depot/projects/ia64/secure/lib/libcrypto/i386/bf-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/bf-686.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/bn-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/cast-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/co-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/crypt586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/des-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/md5-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/rc4-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/rc5-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/rmd-586.s#1 branch ... //depot/projects/ia64/secure/lib/libcrypto/i386/sha1-586.s#1 branch ... //depot/projects/ia64/share/man/man4/wi.4#2 integrate ... //depot/projects/ia64/share/man/man4/wi.4tbl#1 branch ... //depot/projects/ia64/share/man/man4/wi.4tl#1 branch ... //depot/projects/ia64/sys/dev/aac/aac.c#6 integrate ... //depot/projects/ia64/sys/dev/aac/aac_cam.c#2 integrate ... //depot/projects/ia64/sys/dev/em/if_em.c#6 integrate ... //depot/projects/ia64/sys/dev/my/if_my.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/usbdi.c#6 integrate ... //depot/projects/ia64/sys/fs/deadfs/dead_vnops.c#3 integrate ... //depot/projects/ia64/sys/fs/devfs/devfs_vfsops.c#3 integrate ... //depot/projects/ia64/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate ... //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#8 integrate ... //depot/projects/ia64/sys/fs/pseudofs/pseudofs.c#6 integrate ... //depot/projects/ia64/sys/fs/pseudofs/pseudofs.h#6 integrate ... //depot/projects/ia64/sys/fs/udf/udf_vnops.c#3 integrate ... //depot/projects/ia64/sys/i386/acpica/genwakecode.pl#2 delete ... //depot/projects/ia64/sys/i386/conf/Makefile#3 integrate ... //depot/projects/ia64/sys/i386/conf/NOTES#15 integrate ... //depot/projects/ia64/sys/i386/conf/makeLINT.pl#2 delete ... //depot/projects/ia64/sys/i386/conf/makeLINT.sed#1 branch ... //depot/projects/ia64/sys/i386/conf/makeLINT.sh#1 branch ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#35 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#18 integrate ... //depot/projects/ia64/sys/ia64/include/ansi.h#7 integrate ... //depot/projects/ia64/sys/kern/init_main.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#18 integrate ... //depot/projects/ia64/sys/kern/kern_exec.c#14 integrate ... //depot/projects/ia64/sys/kern/kern_exit.c#11 integrate ... //depot/projects/ia64/sys/kern/kern_fork.c#10 integrate ... //depot/projects/ia64/sys/kern/kern_malloc.c#10 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#13 integrate ... //depot/projects/ia64/sys/kern/kern_sig.c#12 integrate ... //depot/projects/ia64/sys/kern/makeobjops.pl#4 delete ... //depot/projects/ia64/sys/kern/sys_generic.c#9 integrate ... //depot/projects/ia64/sys/netatm/atm_cm.c#5 integrate ... //depot/projects/ia64/sys/netatm/atm_cm.h#3 integrate ... //depot/projects/ia64/sys/netatm/atm_subr.c#7 integrate ... //depot/projects/ia64/sys/sys/malloc.h#10 integrate ... //depot/projects/ia64/sys/sys/socketvar.h#13 integrate ... //depot/projects/ia64/sys/sys/user.h#6 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#8 integrate ... //depot/projects/ia64/sys/vm/uma.h#5 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#13 integrate ... //depot/projects/ia64/sys/vm/uma_dbg.c#3 integrate ... //depot/projects/ia64/sys/vm/uma_dbg.h#3 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#13 integrate ... //depot/projects/ia64/tools/tools/vop_table/vop_table.tcl#2 integrate ... //depot/projects/ia64/usr.bin/Makefile#21 integrate ... //depot/projects/ia64/usr.bin/csplit/Makefile#1 branch ... //depot/projects/ia64/usr.bin/csplit/csplit.1#1 branch ... //depot/projects/ia64/usr.bin/csplit/csplit.c#1 branch ... //depot/projects/ia64/usr.bin/m4/main.c#4 integrate ... //depot/projects/ia64/usr.bin/m4/pathnames.h#3 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.1#3 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.c#8 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/create/perform.c#5 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/main.c#3 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/show.c#3 integrate Differences ... ==== //depot/projects/ia64/bin/ps/fmt.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.17 2002/02/03 14:43:04 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.18 2002/05/02 05:46:37 jmallett Exp $"); #if 0 #ifndef lint @@ -72,8 +72,8 @@ if (buf == NULL) { if ((arg_max = sysconf(_SC_ARG_MAX)) == -1) errx(1, "sysconf _SC_ARG_MAX failed"); - if ((buf = malloc((u_int)(4 * arg_max) + 1)) == NULL) - errx(1, "malloc failed"); + if ((buf = malloc((size_t)(4 * arg_max) + 1)) == NULL) + err(1, "malloc"); } if (*argv == 0) { ==== //depot/projects/ia64/contrib/openpam/HISTORY#9 (text) ==== @@ -1,13 +1,37 @@ ============================================================================ +OpenPAM Cinnamon 2002-05-02 + + - ENHANCE: Add a null conversation function, openpam_nullconv(). + + - BUGFIX: Various markup bugs in the documentation. + + - BUGFIX: Document . + + - BUGFIX: Duplicate expansion of openpam_log() macro arguments. + + - ENHANCE: Restructure the policy-loading code and align our use of + the "other" policy with Solaris and Linux-PAM. + + - ENHANCE: Log dlopen() and dlsym() failures. + + - ENHANCE: In openpam_ttyconv(), emit a newline after error and info + messages unless the message contains one already. + + - BUGFIX: In pam_vprompt(), initialize the response pointer to NULL + so we can detect whether the conversation function touched it. +============================================================================ OpenPAM Cineraria 2002-04-14 + - BUGFIX: Fix confusion between token and prompt in + pam_get_authtok(3). + - ENHANCE: Improved documentation. - ENHANCE: Adopt the same preprocessor tricks that were used in FreeBSD's version of Linux-PAM to simplify static linking without requiring dummy primitives. - - ENHANCE: move the policy-loading code out of pam_start.c. + - ENHANCE: Move the policy-loading code out of pam_start.c. - BUGFIX: Fix typo in one of the versions of the openpam_log macro. @@ -128,4 +152,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#9 $ +$P4: //depot/projects/openpam/HISTORY#11 $ ==== //depot/projects/ia64/contrib/openpam/MANIFEST#9 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#7 $ +# $P4: //depot/projects/openpam/MANIFEST#8 $ # CREDITS HISTORY @@ -70,6 +70,7 @@ lib/openpam_impl.h lib/openpam_load.c lib/openpam_log.c +lib/openpam_nullconv.c lib/openpam_restore_cred.c lib/openpam_set_option.c lib/openpam_static.c ==== //depot/projects/ia64/contrib/openpam/RELNOTES#9 (text) ==== @@ -1,12 +1,12 @@ - Release notes for OpenPAM Cineraria - =================================== + Release notes for OpenPAM Cinnamon + ================================== The library itself is complete. Documentation exists in the form of man pages for the library functions, though a few pages are still incomplete. -This release is incorporated into FreeBSD-CURRENT as of 2002-04-14. +This release is incorporated into FreeBSD-CURRENT as of 2002-05-02. It has also been successfully built on NetBSD, and should build with minimal or no changes on OpenBSD. It has not been tested on any other OS. @@ -15,4 +15,4 @@ - The documentation is still incomplete. -$P4: //depot/projects/openpam/RELNOTES#9 $ +$P4: //depot/projects/openpam/RELNOTES#10 $ ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#5 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#2 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#4 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft int .Fn openpam_borrow_cred "pam_handle_t *pamh" "const struct passwd *pwd" .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#5 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#2 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#4 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft void .Fn openpam_free_data "pam_handle_t *pamh" "void *data" "int status" .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft const char * .Fn openpam_get_option "pam_handle_t *pamh" "const char *option" .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#9 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_LOG 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft void .Fn openpam_log "int level" "const char *fmt" "..." .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#5 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#2 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#4 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft int .Fn openpam_restore_cred "pam_handle_t *pamh" .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#6 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft int .Fn openpam_set_option "pam_handle_t *pamh" "const char *option" "const char *value" .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#9 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h +.In security/openpam.h .Ft int .Fn openpam_ttyconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data" .Sh DESCRIPTION ==== //depot/projects/ia64/contrib/openpam/doc/man/pam.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam.3#13 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.3#14 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_END 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_ERROR 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#10 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#13 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#14 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GET_DATA 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GET_ITEM 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GET_USER 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GETENV 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#10 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_GETENVLIST 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_INFO 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_PROMPT 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_PUTENV 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SET_DATA 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SET_ITEM 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SETENV 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#7 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#8 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_SM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#10 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#13 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_START 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#11 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#12 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_STRERROR 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#10 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_VERROR 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#10 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_VINFO 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#9 (text) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#10 $ .\" -.Dd April 14, 2002 +.Dd May 2, 2002 .Dt PAM_VPROMPT 3 .Os .Sh NAME ==== //depot/projects/ia64/contrib/openpam/include/security/openpam.h#12 (text) ==== @@ -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#18 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#19 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED @@ -164,6 +164,14 @@ void *_data); /* + * Null conversation function + */ +int openpam_nullconv(int _n, + const struct pam_message **_msg, + struct pam_response **_resp, + void *_data); + +/* * PAM primitives */ enum { ==== //depot/projects/ia64/contrib/openpam/lib/Makefile#9 (text) ==== @@ -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/Makefile#14 $ +# $P4: //depot/projects/openpam/lib/Makefile#15 $ # LIB = pam @@ -53,6 +53,7 @@ SRCS += openpam_get_option.c SRCS += openpam_load.c SRCS += openpam_log.c +SRCS += openpam_nullconv.c SRCS += openpam_restore_cred.c SRCS += openpam_set_option.c SRCS += openpam_static.c ==== //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#2 (text) ==== @@ -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_configure.c#1 $ + * $P4: //depot/projects/openpam/lib/openpam_configure.c#2 $ */ #include @@ -50,7 +50,7 @@ #define MAX_OPTIONS 256 static int -openpam_read_policy_file(pam_handle_t *pamh, +openpam_read_policy_file(pam_chain_t *policy[], const char *service, const char *filename, int style) @@ -186,7 +186,7 @@ * Finally, add the module at the end of the * appropriate chain and bump the counter. */ - r = openpam_add_module(pamh, chain, flag, p, optc, optv); + r = openpam_add_module(policy, chain, flag, p, optc, optv); if (r != PAM_SUCCESS) return (-r); ++n; @@ -214,14 +214,8 @@ NULL }; -/* - * OpenPAM internal - * - * Configure a service - */ - -int -openpam_configure(pam_handle_t *pamh, +static int +openpam_load_policy(pam_chain_t *policy[], const char *service) { const char **path; @@ -235,24 +229,62 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 0:51:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCB4F37B416; Fri, 3 May 2002 00:51:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 759BF37B41A for ; Fri, 3 May 2002 00:51:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g437pCM16871 for perforce@freebsd.org; Fri, 3 May 2002 00:51:12 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 3 May 2002 00:51:12 -0700 (PDT) Message-Id: <200205030751.g437pCM16871@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10733 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10733 Change 10733 by peter@peter_thunder on 2002/05/03 00:50:30 It looks like __ElfType(Hashelt) got moved from the common headers to somewhere closer to the user of it. Affected files ... ... //depot/projects/ia64/sys/alpha/include/elf.h#2 edit ... //depot/projects/ia64/sys/boot/common/load_elf.c#6 edit Differences ... ==== //depot/projects/ia64/sys/alpha/include/elf.h#2 (text+ko) ==== @@ -69,8 +69,6 @@ typedef Elf64_Off Elf64_Hashelt; -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ ==== //depot/projects/ia64/sys/boot/common/load_elf.c#6 (text+ko) ==== @@ -43,6 +43,7 @@ #define COPYOUT(s,d,l) archsw.arch_copyout((vm_offset_t)(s), d, l) +__ElfType(Hashelt); typedef struct elf_file { Elf_Phdr *ph; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 1: 1:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6134637B405; Fri, 3 May 2002 01:01:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 10A3E37B41B for ; Fri, 3 May 2002 01:01:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4381OJ17772 for perforce@freebsd.org; Fri, 3 May 2002 01:01:24 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 3 May 2002 01:01:24 -0700 (PDT) Message-Id: <200205030801.g4381OJ17772@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10734 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10734 Change 10734 by peter@peter_thunder on 2002/05/03 01:01:17 kernel printf/panic does not have %i. Looks like it was meant to be %d. Affected files ... ... //depot/projects/ia64/sys/vm/uma_dbg.c#4 edit Differences ... ==== //depot/projects/ia64/sys/vm/uma_dbg.c#4 (text+ko) ==== @@ -258,7 +258,7 @@ / zone->uz_rsize; if (freei >= zone->uz_ipers) - panic("zone: %s(%p) slab %p freelist %i out of range 0-%d\n", + panic("zone: %s(%p) slab %p freelist %d out of range 0-%d\n", zone->uz_name, zone, slab, freei, zone->uz_ipers-1); if (((freei * zone->uz_rsize) + slab->us_data) != item) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 5:55:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A64637B41C; Fri, 3 May 2002 05:55:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 37D6537B404 for ; Fri, 3 May 2002 05:55:36 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g43CtaM79615 for perforce@freebsd.org; Fri, 3 May 2002 05:55:36 -0700 (PDT) (envelope-from des@freebsd.org) Date: Fri, 3 May 2002 05:55:36 -0700 (PDT) Message-Id: <200205031255.g43CtaM79615@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 10738 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10738 Change 10738 by des@des.at.des.thinksec.com on 2002/05/03 05:55:03 Initialize other to all-zeroes before using it. Affected files ... ... //depot/projects/openpam/lib/openpam_configure.c#3 edit Differences ... ==== //depot/projects/openpam/lib/openpam_configure.c#3 (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_configure.c#2 $ + * $P4: //depot/projects/openpam/lib/openpam_configure.c#3 $ */ #include @@ -257,7 +257,7 @@ openpam_configure(pam_handle_t *pamh, const char *service) { - pam_chain_t *other[PAM_NUM_CHAINS]; + pam_chain_t *other[PAM_NUM_CHAINS] = { 0 }; int i, n, r; /* try own configuration first */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 7:52: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C39037B405; Fri, 3 May 2002 07:51:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8724737B400 for ; Fri, 3 May 2002 07:51:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g43Epu600512 for perforce@freebsd.org; Fri, 3 May 2002 07:51:56 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Fri, 3 May 2002 07:51:56 -0700 (PDT) Message-Id: <200205031451.g43Epu600512@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 10740 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10740 Change 10740 by mini@mini_stylus on 2002/05/03 07:51:09 - Change thread_get(void) -> thread_alloc(void) to keep from conflicting with thread_get(struct proc *) in sys/kerne/kern_proc.c. - uma_zalloc(,M_WAITOK) will never return NULL, so don't bother testing for it. Affected files ... ... //depot/projects/kse/sys/kern/kern_fork.c#62 edit ... //depot/projects/kse/sys/kern/kern_thread.c#43 edit ... //depot/projects/kse/sys/sys/proc.h#97 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_fork.c#62 (text+ko) ==== @@ -346,7 +346,7 @@ thread_single_end(); return (EAGAIN); } - td2 = thread_get(); + td2 = thread_alloc(); if (td2 == NULL) { uma_zfree(proc_zone, p2); nprocs--; ==== //depot/projects/kse/sys/kern/kern_thread.c#43 (text+ko) ==== @@ -142,7 +142,7 @@ * create one from the zone as per normal */ struct thread * -thread_get(void) +thread_alloc(void) { struct thread *td; @@ -155,15 +155,10 @@ } else { /* allocate the thread structure itself */ td = uma_zalloc(thread_zone, M_WAITOK); - - /* assuming we got one, allocate pages for the stack it needs */ - if (td) { - allocated_threads++; - pmap_new_thread(td); - cpu_thread_setup(td); - } else { - return (NULL); - } + + allocated_threads++; + pmap_new_thread(td); + cpu_thread_setup(td); } /* may need to set some stuff here.. re state? */ /* Make sure the zero'd section is in fact zero'd */ @@ -319,7 +314,7 @@ { struct thread *td2; - td2 = thread_get(); + td2 = thread_alloc(); if (td2) { CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", td, td->td_proc->p_pid, td->td_proc->p_comm); ==== //depot/projects/kse/sys/sys/proc.h#97 (text+ko) ==== @@ -797,7 +797,7 @@ int cpu_coredump(struct thread *, struct vnode *, struct ucred *); /* new in KSE */ -struct thread *thread_get(void); +struct thread *thread_alloc(void); void thread_free(struct thread *td); int cpu_export_context(struct thread *td); void cpu_free_kse_mdstorage(struct kse *kse); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 8:20:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BC3937B400; Fri, 3 May 2002 08:20:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38]) by hub.freebsd.org (Postfix) with ESMTP id D917837B416; Fri, 3 May 2002 08:20:08 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc51.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020503152008.ZQZD9799.rwcrmhc51.attbi.com@InterJet.elischer.org>; Fri, 3 May 2002 15:20:08 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id IAA82850; Fri, 3 May 2002 08:12:33 -0700 (PDT) Date: Fri, 3 May 2002 08:12:31 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10740 for review In-Reply-To: <200205031451.g43Epu600512@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 3 May 2002, Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10740 > > Change 10740 by mini@mini_stylus on 2002/05/03 07:51:09 > > - Change thread_get(void) -> thread_alloc(void) to keep from > conflicting with thread_get(struct proc *) in sys/kerne/kern_proc.c. but, but but... the thread_get() in kern_proc.c is a standin for the one in kern_thread.c whe there is no kern_thread.c they are supposed to be the same function.. teh one in kern_proc.c is removed when kse is added..... I called it thread_get rather than thread_alloc because it caches them and doesn always need to allocate a new one.... > > - uma_zalloc(,M_WAITOK) will never return NULL, so don't bother > testing for it. You may be right, but I wasn't convinced that M_WAITOK was always correct. I was trying to concieve af a case where you may not ba able to wait when trying ot allocate a new thread.. for example if you are trying to allocate it when you are already in msleep().. it may be bad to sleep when in msleep already... I think I may have other ways to stop this but think about it and check the anti-recursion code in msleep(). It may be that M_NOWAIT is the right answer.. > > Affected files ... > > ... //depot/projects/kse/sys/kern/kern_fork.c#62 edit > ... //depot/projects/kse/sys/kern/kern_thread.c#43 edit > ... //depot/projects/kse/sys/sys/proc.h#97 edit > > Differences ... > > ==== //depot/projects/kse/sys/kern/kern_fork.c#62 (text+ko) ==== > > @@ -346,7 +346,7 @@ > thread_single_end(); > return (EAGAIN); > } > - td2 = thread_get(); > + td2 = thread_alloc(); > if (td2 == NULL) { > uma_zfree(proc_zone, p2); > nprocs--; > > ==== //depot/projects/kse/sys/kern/kern_thread.c#43 (text+ko) ==== > > @@ -142,7 +142,7 @@ > * create one from the zone as per normal > */ > struct thread * > -thread_get(void) > +thread_alloc(void) > { > struct thread *td; > > @@ -155,15 +155,10 @@ > } else { > /* allocate the thread structure itself */ > td = uma_zalloc(thread_zone, M_WAITOK); > - > - /* assuming we got one, allocate pages for the stack it needs */ > - if (td) { > - allocated_threads++; > - pmap_new_thread(td); > - cpu_thread_setup(td); > - } else { > - return (NULL); > - } > + > + allocated_threads++; > + pmap_new_thread(td); > + cpu_thread_setup(td); > } > /* may need to set some stuff here.. re state? */ > /* Make sure the zero'd section is in fact zero'd */ > @@ -319,7 +314,7 @@ > { > struct thread *td2; > > - td2 = thread_get(); > + td2 = thread_alloc(); > if (td2) { > CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", > td, td->td_proc->p_pid, td->td_proc->p_comm); > > ==== //depot/projects/kse/sys/sys/proc.h#97 (text+ko) ==== > > @@ -797,7 +797,7 @@ > int cpu_coredump(struct thread *, struct vnode *, struct ucred *); > > /* new in KSE */ > -struct thread *thread_get(void); > +struct thread *thread_alloc(void); > void thread_free(struct thread *td); > int cpu_export_context(struct thread *td); > void cpu_free_kse_mdstorage(struct kse *kse); > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 8:36: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FEF437B404; Fri, 3 May 2002 08:35:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail13.speakeasy.net [216.254.0.213]) by hub.freebsd.org (Postfix) with ESMTP id 87B1437B41B for ; Fri, 3 May 2002 08:35:36 -0700 (PDT) Received: (qmail 6989 invoked from network); 3 May 2002 15:35:35 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail13.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 3 May 2002 15:35:35 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g43FZYF11903; Fri, 3 May 2002 11:35:34 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Fri, 03 May 2002 11:35:27 -0400 (EDT) From: John Baldwin To: Julian Elischer Subject: Re: PERFORCE change 10740 for review Cc: Perforce Change Reviews Cc: Perforce Change Reviews , Jonathan Mini Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 03-May-2002 Julian Elischer wrote: > > > On Fri, 3 May 2002, Jonathan Mini wrote: > >> http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10740 >> >> Change 10740 by mini@mini_stylus on 2002/05/03 07:51:09 >> >> - Change thread_get(void) -> thread_alloc(void) to keep from >> conflicting with thread_get(struct proc *) in sys/kerne/kern_proc.c. > > but, but but... the thread_get() in kern_proc.c is a standin for the > one in kern_thread.c whe there is no kern_thread.c > > they are supposed to be the same function.. teh one in kern_proc.c > is removed when kse is added..... > > I called it thread_get rather than thread_alloc because > it caches them and doesn always need to allocate a new one.... We already have a slab allocator for that, no need to reinvent it. >> - uma_zalloc(,M_WAITOK) will never return NULL, so don't bother >> testing for it. > > You may be right, but I wasn't convinced that M_WAITOK was always > correct. I was trying to concieve af a case where you may not ba able to > wait when trying ot allocate a new thread.. > for example if you are trying to allocate it when you are already in > msleep().. it may be bad to sleep when in msleep already... > I think I may have other ways to stop this but think about it and > check the anti-recursion code in msleep(). > It may be that M_NOWAIT is the right answer.. This in fork1(). I think a better way of avoiding this is to have each KSE have a spare thread it can use when a thread blocks. The first action a spare thread when it starts up is to allocate a new spare thread if needed. However, I think you should only have one spare thread per-KSE and not a list. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 8:46:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A8C737B41C; Fri, 3 May 2002 08:46:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id B6C1F37B41B for ; Fri, 3 May 2002 08:46:14 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id B9463A900; Fri, 3 May 2002 08:50:09 -0700 (PDT) Date: Fri, 3 May 2002 08:50:09 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10740 for review Message-ID: <20020503085009.C81190@stylus.haikugeek.com> References: <200205031451.g43Epu600512@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from julian@elischer.org on Fri, May 03, 2002 at 08:12:31AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > On Fri, 3 May 2002, Jonathan Mini wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10740 > > > > Change 10740 by mini@mini_stylus on 2002/05/03 07:51:09 > > > > - Change thread_get(void) -> thread_alloc(void) to keep from > > conflicting with thread_get(struct proc *) in sys/kerne/kern_proc.c. > > but, but but... the thread_get() in kern_proc.c is a standin for the > one in kern_thread.c whe there is no kern_thread.c > > they are supposed to be the same function.. teh one in kern_proc.c > is removed when kse is added..... > > I called it thread_get rather than thread_alloc because > it caches them and doesn always need to allocate a new one.... Oho! Well, then. =) I see what was going on now. I misread the code and though that p_xxthread was a pointer. =) I can change the code back, no problem, but I still feel that thread_alloc() is a more appropriate name (caching allocators are really quite common). Also, after some discussion between me and jhb on #bsdcode, it became clear that we'd want a struct thread ctor/dtor pair that'd help with things like fork and exit. His suggestion was a thread_alloc()/thread_exit() pair. I haven't really looked into it in detail, so I'm not sure yet. > > - uma_zalloc(,M_WAITOK) will never return NULL, so don't bother > > testing for it. > > You may be right, but I wasn't convinced that M_WAITOK was always > correct. I was trying to concieve af a case where you may not ba able to > wait when trying ot allocate a new thread.. > for example if you are trying to allocate it when you are already in > msleep().. it may be bad to sleep when in msleep already... > I think I may have other ways to stop this but think about it and > check the anti-recursion code in msleep(). > It may be that M_NOWAIT is the right answer.. Hmm. Why would you allocate a thread from within msleep()? -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 9:40:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1F2637B426; Fri, 3 May 2002 09:40:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88]) by hub.freebsd.org (Postfix) with ESMTP id 22F6837B404; Fri, 3 May 2002 09:40:07 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc52.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020503164007.CSMG4412.rwcrmhc52.attbi.com@InterJet.elischer.org>; Fri, 3 May 2002 16:40:07 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id JAA83171; Fri, 3 May 2002 09:38:17 -0700 (PDT) Date: Fri, 3 May 2002 09:38:17 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10740 for review In-Reply-To: <20020503085009.C81190@stylus.haikugeek.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 3 May 2002, Jonathan Mini wrote: > Julian Elischer [julian@elischer.org] wrote : > > > On Fri, 3 May 2002, Jonathan Mini wrote: > > Oho! Well, then. =) > I see what was going on now. > I misread the code and though that p_xxthread was a pointer. =) > > I can change the code back, no problem, but I still feel that thread_alloc() > is a more appropriate name (caching allocators are really quite common). > Also, after some discussion between me and jhb on #bsdcode, it became > clear that we'd want a struct thread ctor/dtor pair that'd help with > things like fork and exit. His suggestion was a thread_alloc()/thread_exit() > pair. I haven't really looked into it in detail, so I'm not sure yet. the constructor is thread_alloc and the destructor is thread_exit/thread_free (it takes 2 steps to exit a thread) also check out thread_reap(). I have no problem with calling it thread_alloc except that your reason was spurious. (the clash with "itself"). > > > > - uma_zalloc(,M_WAITOK) will never return NULL, so don't bother > > > testing for it. > > > > You may be right, but I wasn't convinced that M_WAITOK was always > > correct. I was trying to concieve af a case where you may not ba able to > > wait when trying ot allocate a new thread.. > > for example if you are trying to allocate it when you are already in > > msleep().. it may be bad to sleep when in msleep already... > > I think I may have other ways to stop this but think about it and > > check the anti-recursion code in msleep(). > > It may be that M_NOWAIT is the right answer.. > > Hmm. Why would you allocate a thread from within msleep()? > Umm MOST threads are allocated from either msleep or fork. remember in a threaded process you allocate and activate a new thread when the old one blocks (i.e. is in msleep()). So to answer your question.. this is about the most common case.. :-) > -- > Jonathan Mini > http://www.haikugeek.com > > "He who is not aware of his ignorance will be only misled by his knowledge." > -- Richard Whatley > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 9:40:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A83F37B421; Fri, 3 May 2002 09:40:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88]) by hub.freebsd.org (Postfix) with ESMTP id A202437B423; Fri, 3 May 2002 09:40:13 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc52.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020503164012.CSPM4412.rwcrmhc52.attbi.com@InterJet.elischer.org>; Fri, 3 May 2002 16:40:12 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id JAA83159; Fri, 3 May 2002 09:32:09 -0700 (PDT) Date: Fri, 3 May 2002 09:32:09 -0700 (PDT) From: Julian Elischer To: John Baldwin Cc: Perforce Change Reviews , Perforce Change Reviews , Jonathan Mini Subject: Re: PERFORCE change 10740 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 3 May 2002, John Baldwin wrote: > > We already have a slab allocator for that, no need to reinvent it. You do NOT have a slab allocator that allocates fulli linked up thread structures with preallocated vm ojects for the stack etc. getting a thread structure, adding the stack and then ripping it off again when deallocatingnit is too heavy weight for what I want. You COULD just leave teh stack attached, and trust the slab allocator (as we do to not try free it back to the system, taking its stack with it, but i'd rather spend the extra 100 bytes making sure that I KNOW what I have on hand.. what we do now is (to quote peter) a "HACK". > > >> - uma_zalloc(,M_WAITOK) will never return NULL, so don't bother > >> testing for it. > > > > You may be right, but I wasn't convinced that M_WAITOK was always > > correct. I was trying to concieve af a case where you may not ba able to > > wait when trying ot allocate a new thread.. > > for example if you are trying to allocate it when you are already in > > msleep().. it may be bad to sleep when in msleep already... > > I think I may have other ways to stop this but think about it and > > check the anti-recursion code in msleep(). > > It may be that M_NOWAIT is the right answer.. > > This in fork1(). I think a better way of avoiding this is to have each > KSE have a spare thread it can use when a thread blocks. The first > action a spare thread when it starts up is to allocate a new spare thread > if needed. However, I think you should only have one spare thread per-KSE > and not a list. I have a list of them but it can be small. > > -- > > John Baldwin <>< http://www.FreeBSD.org/~jhb/ > "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 9:41:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE7DC37B4BF; Fri, 3 May 2002 09:41:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by hub.freebsd.org (Postfix) with ESMTP id 0661A37B42B for ; Fri, 3 May 2002 09:40:47 -0700 (PDT) Received: (qmail 11323 invoked from network); 3 May 2002 16:40:46 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 3 May 2002 16:40:46 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g43GeiF12105; Fri, 3 May 2002 12:40:44 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20020503085009.C81190@stylus.haikugeek.com> Date: Fri, 03 May 2002 12:40:38 -0400 (EDT) From: John Baldwin To: Jonathan Mini Subject: Re: PERFORCE change 10740 for review Cc: Perforce Change Reviews Cc: Perforce Change Reviews , Julian Elischer Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 03-May-2002 Jonathan Mini wrote: > Julian Elischer [julian@elischer.org] wrote : > >> On Fri, 3 May 2002, Jonathan Mini wrote: >> >> > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10740 >> > >> > Change 10740 by mini@mini_stylus on 2002/05/03 07:51:09 >> > >> > - Change thread_get(void) -> thread_alloc(void) to keep from >> > conflicting with thread_get(struct proc *) in sys/kerne/kern_proc.c. >> >> but, but but... the thread_get() in kern_proc.c is a standin for the >> one in kern_thread.c whe there is no kern_thread.c >> >> they are supposed to be the same function.. teh one in kern_proc.c >> is removed when kse is added..... >> >> I called it thread_get rather than thread_alloc because >> it caches them and doesn always need to allocate a new one.... > > Oho! Well, then. =) > I see what was going on now. > I misread the code and though that p_xxthread was a pointer. =) > > I can change the code back, no problem, but I still feel that thread_alloc() > is a more appropriate name (caching allocators are really quite common). > Also, after some discussion between me and jhb on #bsdcode, it became > clear that we'd want a struct thread ctor/dtor pair that'd help with > things like fork and exit. His suggestion was a thread_alloc()/thread_exit() > pair. I haven't really looked into it in detail, so I'm not sure yet. Well, thread_create/thread_destroy(), but thread_exit() might be more appropriate for when a thread wants to exit, then it gets destroyed via thread_destroy() later. > Hmm. Why would you allocate a thread from within msleep()? You need a new thread to do the upcall back into the userland scheduler when the current thread blocks before your quantum is up. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 9:54:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76B5237B421; Fri, 3 May 2002 09:54:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail15.speakeasy.net [216.254.0.215]) by hub.freebsd.org (Postfix) with ESMTP id 53C3437B41F for ; Fri, 3 May 2002 09:54:15 -0700 (PDT) Received: (qmail 11674 invoked from network); 3 May 2002 16:54:14 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail15.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 3 May 2002 16:54:14 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g43GsDF12177; Fri, 3 May 2002 12:54:13 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Fri, 03 May 2002 12:54:05 -0400 (EDT) From: John Baldwin To: Julian Elischer Subject: Re: PERFORCE change 10740 for review Cc: Jonathan Mini Cc: Jonathan Mini , Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 03-May-2002 Julian Elischer wrote: > > > On Fri, 3 May 2002, John Baldwin wrote: > >> >> We already have a slab allocator for that, no need to reinvent it. > > You do NOT have a slab allocator that allocates fulli linked up thread > structures with preallocated vm ojects for the stack etc. Uh, only cause you haven't bothered to write proper constructor's destructor's for the uma zone then. We _do_ have a proper slab allocator and by trying to manage it yourself you are simply preventing uma from being fully able to manage the memory in the system. > getting a thread structure, adding the stack and then ripping it off again > when deallocatingnit is too heavy weight for what I want. You COULD > just leave teh stack attached, and trust the slab allocator (as we do to > not try free it back to the system, taking its stack with it, but i'd > rather spend the extra 100 bytes making sure that I KNOW what I have on > hand.. what we do now is (to quote peter) a "HACK". You don't need to deallocate the stack unless you are doing an actual destruct of the thread. This isn't hard. >> This in fork1(). I think a better way of avoiding this is to have each >> KSE have a spare thread it can use when a thread blocks. The first >> action a spare thread when it starts up is to allocate a new spare thread >> if needed. However, I think you should only have one spare thread per-KSE >> and not a list. > > I have a list of them but it can be small. Your list needs to make sure it always has one so that we don't have to do malloc's during msleep, etc. Also, I think holding more than one per KSE prevents uma from managing system memory as fully as it can. We have subsystems, please use them instead of trying to home-roll your own. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 10: 0:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E08B37B404; Fri, 3 May 2002 10:00:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88]) by hub.freebsd.org (Postfix) with ESMTP id 678F037B417; Fri, 3 May 2002 10:00:12 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc52.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020503170012.DNUG4412.rwcrmhc52.attbi.com@InterJet.elischer.org>; Fri, 3 May 2002 17:00:12 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id JAA83284; Fri, 3 May 2002 09:59:12 -0700 (PDT) Date: Fri, 3 May 2002 09:59:12 -0700 (PDT) From: Julian Elischer To: John Baldwin Cc: Jonathan Mini , Jonathan Mini , Perforce Change Reviews Subject: Re: PERFORCE change 10740 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 3 May 2002, John Baldwin wrote: > Your list needs to make sure it always has one so that we don't have to do > malloc's during msleep, etc. Also, I think holding more than one per KSE > prevents uma from managing system memory as fully as it can. > > We have subsystems, please use them instead of trying to home-roll your own. > subsystems come, subsystems go.. witness zone.. I'd rather know I've got it doing what I wnat for now and let it be optimised later. I REALLY don't want to sleep in msleep.. see next email for comments on your changes to exit().. > -- > > John Baldwin <>< http://www.FreeBSD.org/~jhb/ > "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 10: 5:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D408237B404; Fri, 3 May 2002 10:05:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail17.speakeasy.net [216.254.0.217]) by hub.freebsd.org (Postfix) with ESMTP id 102DF37B41E for ; Fri, 3 May 2002 10:05:03 -0700 (PDT) Received: (qmail 30092 invoked from network); 3 May 2002 17:05:01 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail17.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 3 May 2002 17:05:01 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g43H4wF12210; Fri, 3 May 2002 13:04:59 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Fri, 03 May 2002 13:04:52 -0400 (EDT) From: John Baldwin To: John Baldwin Subject: Re: PERFORCE change 10740 for review Cc: Perforce Change Reviews Cc: Perforce Change Reviews , Jonathan Mini , Julian Elischer Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 03-May-2002 John Baldwin wrote: > > On 03-May-2002 Julian Elischer wrote: >> >> >> On Fri, 3 May 2002, John Baldwin wrote: >> >>> >>> We already have a slab allocator for that, no need to reinvent it. >> >> You do NOT have a slab allocator that allocates fulli linked up thread >> structures with preallocated vm ojects for the stack etc. > > Uh, only cause you haven't bothered to write proper constructor's > destructor's > for the uma zone then. We _do_ have a proper slab allocator and by trying > to manage it yourself you are simply preventing uma from being fully able > to manage the memory in the system. Correction. :) s/ctor/init/, s/dtor/fini/. In uma we have four functions associated with a zone: ctor() - called whenever a 'user' malloc, like uma_zalloc() is called dtor() - called whenever a 'user' free is called() init() - called when on objects when they are actually allocated into a slab from kmem fini() - called when on objects when the slab they are part of is released back to kmem Thus, you can perform type-stable initialization in init() and teardown in fini() and it won't get called on each malloc() or free(), but only when the memory is actually allocated from of free'd to KVM. By allowing uma to manage your "free" but still type-stable threads, you allow it to release those unused structures to kvm if there is a memory shortage. This lets the kernel adjust to temporary memory needs on the fly. For example, if we suddenly need a lot of mbuf's, uma can go find some unused slabs, fini() them, and then make them into mbuf slabs instead. Later when the need for mbuf's recedes to its normal level and more threads are needed, uma can grab some of the free mbuf slabs and convert them to thread slabs. This allows the kernel to better adjust to changing memory conditions in the kernel. If you insist on using your own free list to duplicate the work of init()/fini(), you reduce uma's ability to handle changing memory conditions. Does this make sense? -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 10:23:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C581937B485; Fri, 3 May 2002 10:22:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88]) by hub.freebsd.org (Postfix) with ESMTP id AA6BD37B47A; Fri, 3 May 2002 10:21:43 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc52.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020503172040.EKPK4412.rwcrmhc52.attbi.com@InterJet.elischer.org>; Fri, 3 May 2002 17:20:40 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id KAA83367; Fri, 3 May 2002 10:09:16 -0700 (PDT) Date: Fri, 3 May 2002 10:09:15 -0700 (PDT) From: Julian Elischer To: John Baldwin Cc: Perforce Change Reviews , Perforce Change Reviews , Jonathan Mini Subject: Re: PERFORCE change 10740 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG to some extent I agree with you but realise that all tehuma stuff has occured since young Edith dorothy was born.. :-) (i.e the patches predate uma) On Fri, 3 May 2002, John Baldwin wrote: > > On 03-May-2002 John Baldwin wrote: > > > > On 03-May-2002 Julian Elischer wrote: > >> > >> > >> On Fri, 3 May 2002, John Baldwin wrote: > >> > >>> > >>> We already have a slab allocator for that, no need to reinvent it. > >> > >> You do NOT have a slab allocator that allocates fulli linked up thread > >> structures with preallocated vm ojects for the stack etc. > > > > Uh, only cause you haven't bothered to write proper constructor's > > destructor's > > for the uma zone then. We _do_ have a proper slab allocator and by trying > > to manage it yourself you are simply preventing uma from being fully able > > to manage the memory in the system. > > Correction. :) s/ctor/init/, s/dtor/fini/. In uma we have four functions > associated with a zone: > > ctor() - called whenever a 'user' malloc, like uma_zalloc() is called > dtor() - called whenever a 'user' free is called() > init() - called when on objects when they are actually allocated into > a slab from kmem > fini() - called when on objects when the slab they are part of is > released back to kmem > > Thus, you can perform type-stable initialization in init() and teardown > in fini() and it won't get called on each malloc() or free(), but only > when the memory is actually allocated from of free'd to KVM. > > By allowing uma to manage your "free" but still type-stable threads, > you allow it to release those unused structures to kvm if there is a > memory shortage. This lets the kernel adjust to temporary memory needs > on the fly. For example, if we suddenly need a lot of mbuf's, uma can > go find some unused slabs, fini() them, and then make them into mbuf > slabs instead. Later when the need for mbuf's recedes to its normal > level and more threads are needed, uma can grab some of the free mbuf > slabs and convert them to thread slabs. This allows the kernel to better > adjust to changing memory conditions in the kernel. If you insist on > using your own free list to duplicate the work of init()/fini(), you > reduce uma's ability to handle changing memory conditions. > > Does this make sense? > > -- > > John Baldwin <>< http://www.FreeBSD.org/~jhb/ > "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 10:30:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7E2937B41D; Fri, 3 May 2002 10:30:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail13.speakeasy.net [216.254.0.213]) by hub.freebsd.org (Postfix) with ESMTP id 2BD7437B41C for ; Fri, 3 May 2002 10:30:13 -0700 (PDT) Received: (qmail 29367 invoked from network); 3 May 2002 17:30:11 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail13.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 3 May 2002 17:30:11 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g43HU9F12362; Fri, 3 May 2002 13:30:10 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Fri, 03 May 2002 13:30:03 -0400 (EDT) From: John Baldwin To: Julian Elischer Subject: Re: PERFORCE change 10740 for review Cc: Jonathan Mini Cc: Jonathan Mini , Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 03-May-2002 Julian Elischer wrote: > to some extent I agree with you but realise that all tehuma stuff has > occured since young Edith dorothy was born.. :-) > (i.e the patches predate uma) I realize that, I just think that the goal should be to eliminate the thread free-list in favor of letting uma do its job, but that to avoid any need to malloc in msleep, we instead let each KSE always have a spare "hot" thread for P_KSE processes and that when it uses the hot thread to do an upcall, the first act of the new thread will be to allocate a new hot spare. Does that sound ok? -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 11:19:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B38B737B417; Fri, 3 May 2002 11:15:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 70D4937B400 for ; Fri, 3 May 2002 11:15:55 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g43IFsE38744 for perforce@freebsd.org; Fri, 3 May 2002 11:15:54 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 3 May 2002 11:15:54 -0700 (PDT) Message-Id: <200205031815.g43IFsE38744@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 10747 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10747 Change 10747 by julian@julian_jules1 on 2002/05/03 11:15:43 An MFC BUT! ALso includes a rewritten but probably bogus fork1() (diff reduction version) this is probably bogus because: 1/ I have not tried compile it. 2/ it tries calling the thread single threading stuff without having locked the proc. 3/ generally all the locking needs checking Affected files ... ... //depot/projects/kse/sys/dev/aac/aac.c#21 integrate ... //depot/projects/kse/sys/dev/aac/aac_cam.c#2 integrate ... //depot/projects/kse/sys/dev/drm/drm_fops.h#2 integrate ... //depot/projects/kse/sys/dev/em/if_em.c#6 integrate ... //depot/projects/kse/sys/dev/my/if_my.c#3 integrate ... //depot/projects/kse/sys/dev/usb/usbdi.c#8 integrate ... //depot/projects/kse/sys/fs/deadfs/dead_vnops.c#3 integrate ... //depot/projects/kse/sys/fs/devfs/devfs_vfsops.c#6 integrate ... //depot/projects/kse/sys/fs/fdescfs/fdesc_vfsops.c#7 integrate ... //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#11 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs.c#10 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs.h#11 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs_vnops.c#13 integrate ... //depot/projects/kse/sys/fs/udf/udf_vnops.c#2 integrate ... //depot/projects/kse/sys/i386/acpica/genwakecode.pl#2 delete ... //depot/projects/kse/sys/i386/conf/Makefile#3 integrate ... //depot/projects/kse/sys/i386/conf/NOTES#32 integrate ... //depot/projects/kse/sys/i386/conf/makeLINT.pl#2 delete ... //depot/projects/kse/sys/i386/conf/makeLINT.sed#1 branch ... //depot/projects/kse/sys/i386/conf/makeLINT.sh#1 branch ... //depot/projects/kse/sys/ia64/ia64/machdep.c#31 integrate ... //depot/projects/kse/sys/ia64/ia64/pmap.c#23 integrate ... //depot/projects/kse/sys/ia64/include/ansi.h#10 integrate ... //depot/projects/kse/sys/kern/init_main.c#39 integrate ... //depot/projects/kse/sys/kern/kern_descrip.c#28 integrate ... //depot/projects/kse/sys/kern/kern_exec.c#25 integrate ... //depot/projects/kse/sys/kern/kern_exit.c#42 integrate ... //depot/projects/kse/sys/kern/kern_fork.c#63 integrate ... //depot/projects/kse/sys/kern/kern_malloc.c#10 integrate ... //depot/projects/kse/sys/kern/kern_proc.c#58 integrate ... //depot/projects/kse/sys/kern/kern_prot.c#25 integrate ... //depot/projects/kse/sys/kern/kern_sig.c#46 integrate ... //depot/projects/kse/sys/kern/kern_tc.c#8 integrate ... //depot/projects/kse/sys/kern/makeobjops.pl#3 delete ... //depot/projects/kse/sys/kern/sys_generic.c#23 integrate ... //depot/projects/kse/sys/kern/vfs_aio.c#25 integrate ... //depot/projects/kse/sys/netatm/atm_cm.c#4 integrate ... //depot/projects/kse/sys/netatm/atm_cm.h#3 integrate ... //depot/projects/kse/sys/netatm/atm_subr.c#7 integrate ... //depot/projects/kse/sys/pci/if_dc.c#15 integrate ... //depot/projects/kse/sys/sys/malloc.h#7 integrate ... //depot/projects/kse/sys/sys/socketvar.h#17 integrate ... //depot/projects/kse/sys/sys/timetc.h#6 integrate ... //depot/projects/kse/sys/sys/user.h#17 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_vnops.c#5 integrate ... //depot/projects/kse/sys/ufs/ufs/extattr.h#5 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_extattr.c#11 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_vnops.c#12 integrate ... //depot/projects/kse/sys/vm/uma.h#4 integrate ... //depot/projects/kse/sys/vm/uma_core.c#4 integrate ... //depot/projects/kse/sys/vm/uma_dbg.c#2 integrate ... //depot/projects/kse/sys/vm/uma_dbg.h#2 integrate ... //depot/projects/kse/sys/vm/vm_map.c#15 integrate ... //depot/projects/kse/sys/vm/vm_map.h#9 integrate Differences ... ==== //depot/projects/kse/sys/dev/aac/aac.c#21 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac.c,v 1.38 2002/04/27 01:31:13 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aac.c,v 1.39 2002/05/03 00:07:50 scottl Exp $ */ /* @@ -355,17 +355,17 @@ mi = (struct aac_mntinfo *)&fib->data[0]; /* loop over possible containers */ - mi->Command = VM_NameServe; - mi->MntType = FT_FILESYS; do { /* request information on this container */ + bzero(mi, sizeof(struct aac_mntinfo)); + mi->Command = VM_NameServe; + mi->MntType = FT_FILESYS; mi->MntCount = i; if (aac_sync_fib(sc, ContainerCommand, 0, fib, sizeof(struct aac_mntinfo))) { debug(2, "error probing container %d", i); continue; } - /* check response size */ mir = (struct aac_mntinforesp *)&fib->data[0]; aac_add_container(sc, mir, 0); @@ -550,6 +550,7 @@ aac_alloc_sync_fib(sc, &fib, AAC_SYNC_LOCK_FORCE); cc = (struct aac_close_command *)&fib->data[0]; + bzero(cc, sizeof(struct aac_close_command)); cc->Command = VM_CloseAll; cc->ContainerId = 0xffffffff; if (aac_sync_fib(sc, ContainerCommand, 0, fib, @@ -2373,8 +2374,6 @@ */ aac_alloc_sync_fib(sc, &fib, 0); mi = (struct aac_mntinfo *)&fib->data[0]; - mi->Command = VM_NameServe; - mi->MntType = FT_FILESYS; do { /* * Ask the controller for its containers one at @@ -2383,6 +2382,9 @@ * midway through this enumaration? * XXX This should be done async. */ + bzero(mi, sizeof(struct aac_mntinfo)); + mi->Command = VM_NameServe; + mi->MntType = FT_FILESYS; mi->MntCount = i; rsize = sizeof(mir); if (aac_sync_fib(sc, ContainerCommand, 0, fib, @@ -2717,6 +2719,7 @@ aac_alloc_sync_fib(sc, &fib, 0); c_cmd = (struct aac_ctcfg *)&fib->data[0]; + bzero(c_cmd, sizeof(struct aac_ctcfg)); c_cmd->Command = VM_ContainerConfig; c_cmd->cmd = CT_GET_SCSI_METHOD; @@ -2742,6 +2745,8 @@ sc->scsi_method_id = c_resp->param; vmi = (struct aac_vmioctl *)&fib->data[0]; + bzero(vmi, sizeof(struct aac_vmioctl)); + vmi->Command = VM_Ioctl; vmi->ObjType = FT_DRIVE; vmi->MethId = sc->scsi_method_id; ==== //depot/projects/kse/sys/dev/aac/aac_cam.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.2 2002/04/30 22:50:26 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.3 2002/05/03 00:07:50 scottl Exp $ */ /* @@ -500,6 +500,8 @@ aac_alloc_sync_fib(sc, &fib, 0); vmi = (struct aac_vmioctl *)&fib->data[0]; + bzero(vmi, sizeof(struct aac_vmioctl)); + vmi->Command = VM_Ioctl; vmi->ObjType = FT_DRIVE; vmi->MethId = sc->scsi_method_id; @@ -544,6 +546,7 @@ aac_alloc_sync_fib(sc, &fib, 0); vmi = (struct aac_vmioctl *)&fib->data[0]; + bzero(vmi, sizeof(struct aac_vmioctl)); vmi->Command = VM_Ioctl; vmi->ObjType = FT_DRIVE; ==== //depot/projects/kse/sys/dev/drm/drm_fops.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * Daryll Strauss * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.3 2002/04/29 18:18:42 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.4 2002/05/03 07:45:26 tanimura Exp $ */ #define __NO_VERSION__ @@ -315,7 +315,7 @@ DRM_DEBUG("dev->buf_sigio=%p\n", dev->buf_sigio); if (dev->buf_sigio) { DRM_DEBUG("dev->buf_sigio->sio_pgid=%d\n", dev->buf_sigio->sio_pgid); - pgsigio(dev->buf_sigio, SIGIO, 0); + pgsigio(&dev->buf_sigio, SIGIO, 0); } DRM_DEBUG("waking\n"); wakeup(&dev->buf_rp); ==== //depot/projects/kse/sys/dev/em/if_em.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.6 2002/04/28 20:34:19 phk Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.7 2002/05/02 22:21:01 pdeuskar Exp $*/ #include @@ -532,8 +532,8 @@ * Advance the Transmit Descriptor Tail (Tdt), this tells the E1000 * that this frame is available to transmit. */ - E1000_WRITE_REG(&adapter->shared, TDT, (((u_int32_t) adapter->next_avail_tx_desc - - (u_int32_t) adapter->first_tx_desc) >> 4)); + E1000_WRITE_REG(&adapter->shared, TDT, (((uintptr_t) adapter->next_avail_tx_desc - + (uintptr_t) adapter->first_tx_desc) >> 4)); } /* end of while loop */ splx(s); @@ -1716,8 +1716,8 @@ /* Setup the HW Rx Head and Tail Descriptor Pointers */ E1000_WRITE_REG(&adapter->shared, RDH, 0); E1000_WRITE_REG(&adapter->shared, RDT, - (((u_int32_t) adapter->last_rx_desc - - (u_int32_t) adapter->first_rx_desc) >> 4)); + (((uintptr_t) adapter->last_rx_desc - + (uintptr_t) adapter->first_rx_desc) >> 4)); /* Setup the Receive Control Register */ reg_rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_LBM_NO | ==== //depot/projects/kse/sys/dev/my/if_my.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ * * Written by: yen_cw@myson.com.tw available at: http://www.myson.com.tw/ * - * $FreeBSD: src/sys/dev/my/if_my.c,v 1.7 2002/04/30 16:43:51 julian Exp $ + * $FreeBSD: src/sys/dev/my/if_my.c,v 1.8 2002/05/02 15:58:04 julian Exp $ * * Myson fast ethernet PCI NIC driver */ @@ -1181,6 +1181,7 @@ if (m_new == NULL) { printf("my%d: no memory for rx list -- packet dropped!\n", sc->my_unit); + MY_UNLOCK(sc); return (ENOBUFS); } MCLGET(m_new, M_DONTWAIT); @@ -1188,6 +1189,7 @@ printf("my%d: no memory for rx list -- packet dropped!\n", sc->my_unit); m_freem(m_new); + MY_UNLOCK(sc); return (ENOBUFS); } c->my_mbuf = m_new; @@ -1296,8 +1298,10 @@ ifp = &sc->arpcom.ac_if; /* Clear the timeout timer. */ ifp->if_timer = 0; - if (sc->my_cdata.my_tx_head == NULL) + if (sc->my_cdata.my_tx_head == NULL) { + MY_UNLOCK(sc); return; + } /* * Go through our tx list and free mbufs for those frames that have * been transmitted. @@ -1450,6 +1454,7 @@ MGETHDR(m_new, M_DONTWAIT, MT_DATA); if (m_new == NULL) { printf("my%d: no memory for tx list", sc->my_unit); + MY_UNLOCK(sc); return (1); } if (m_head->m_pkthdr.len > MHLEN) { @@ -1457,6 +1462,7 @@ if (!(m_new->m_flags & M_EXT)) { m_freem(m_new); printf("my%d: no memory for tx list", sc->my_unit); + MY_UNLOCK(sc); return (1); } } @@ -1871,3 +1877,5 @@ my_stop(sc); return; } + + ==== //depot/projects/kse/sys/dev/usb/usbdi.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $NetBSD: usbdi.c,v 1.93 2001/12/24 21:36:15 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.71 2002/04/07 13:16:18 joe Exp $ */ +/* $NetBSD: usbdi.c,v 1.94 2001/12/30 20:26:59 augustss Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.72 2002/05/02 22:47:37 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1086,6 +1086,9 @@ dev->bus->use_polling++; else dev->bus->use_polling--; + /* When polling we need to make sure there is nothing pending to do. */ + if (dev->bus->use_polling) + dev->bus->methods->soft_intr(dev->bus); } ==== //depot/projects/kse/sys/fs/deadfs/dead_vnops.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dead_vnops.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/fs/deadfs/dead_vnops.c,v 1.32 2002/03/19 22:19:57 alfred Exp $ + * $FreeBSD: src/sys/fs/deadfs/dead_vnops.c,v 1.33 2002/05/02 19:13:44 phk Exp $ */ #include @@ -46,7 +46,6 @@ /* * Prototypes for dead operations on vnodes. */ -static int dead_badop(void); static int dead_bmap(struct vop_bmap_args *); static int dead_ioctl(struct vop_ioctl_args *); static int dead_lock(struct vop_lock_args *); @@ -63,15 +62,15 @@ { &vop_access_desc, (vop_t *) vop_ebadf }, { &vop_advlock_desc, (vop_t *) vop_ebadf }, { &vop_bmap_desc, (vop_t *) dead_bmap }, - { &vop_create_desc, (vop_t *) dead_badop }, + { &vop_create_desc, (vop_t *) vop_panic }, { &vop_getattr_desc, (vop_t *) vop_ebadf }, { &vop_inactive_desc, (vop_t *) vop_null }, { &vop_ioctl_desc, (vop_t *) dead_ioctl }, - { &vop_link_desc, (vop_t *) dead_badop }, + { &vop_link_desc, (vop_t *) vop_panic }, { &vop_lock_desc, (vop_t *) dead_lock }, { &vop_lookup_desc, (vop_t *) dead_lookup }, - { &vop_mkdir_desc, (vop_t *) dead_badop }, - { &vop_mknod_desc, (vop_t *) dead_badop }, + { &vop_mkdir_desc, (vop_t *) vop_panic }, + { &vop_mknod_desc, (vop_t *) vop_panic }, { &vop_open_desc, (vop_t *) dead_open }, { &vop_pathconf_desc, (vop_t *) vop_ebadf }, /* per pathconf(2) */ { &vop_poll_desc, (vop_t *) dead_poll }, @@ -80,11 +79,11 @@ { &vop_readdir_desc, (vop_t *) vop_ebadf }, { &vop_readlink_desc, (vop_t *) vop_ebadf }, { &vop_reclaim_desc, (vop_t *) vop_null }, - { &vop_remove_desc, (vop_t *) dead_badop }, - { &vop_rename_desc, (vop_t *) dead_badop }, - { &vop_rmdir_desc, (vop_t *) dead_badop }, + { &vop_remove_desc, (vop_t *) vop_panic }, + { &vop_rename_desc, (vop_t *) vop_panic }, + { &vop_rmdir_desc, (vop_t *) vop_panic }, { &vop_setattr_desc, (vop_t *) vop_ebadf }, - { &vop_symlink_desc, (vop_t *) dead_badop }, + { &vop_symlink_desc, (vop_t *) vop_panic }, { &vop_write_desc, (vop_t *) dead_write }, { NULL, NULL } }; @@ -254,17 +253,6 @@ } /* - * Empty vnode bad operation - */ -static int -dead_badop() -{ - - panic("dead_badop called"); - /* NOTREACHED */ -} - -/* * We have to wait during times when the vnode is * in a state of change. */ ==== //depot/projects/kse/sys/fs/devfs/devfs_vfsops.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vfsops.c 8.10 (Berkeley) 5/14/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36 * - * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.19 2002/03/19 22:19:57 alfred Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.20 2002/05/02 20:27:42 mux Exp $ */ #include "opt_devfs.h" @@ -50,8 +50,8 @@ MALLOC_DEFINE(M_DEVFS, "DEVFS", "DEVFS data"); -static int devfs_mount(struct mount *mp, char *path, caddr_t data, - struct nameidata *ndp, struct thread *td); +static int devfs_mount(struct mount *mp, struct nameidata *ndp, + struct thread *td); static int devfs_unmount(struct mount *mp, int mntflags, struct thread *td); static int devfs_root(struct mount *mp, struct vnode **vpp); @@ -62,10 +62,8 @@ * Mount the filesystem */ static int -devfs_mount(mp, path, data, ndp, td) +devfs_mount(mp, ndp, td) struct mount *mp; - char *path; - caddr_t data; struct nameidata *ndp; struct thread *td; { @@ -180,7 +178,7 @@ } static struct vfsops devfs_vfsops = { - devfs_mount, + NULL, vfs_stdstart, devfs_unmount, devfs_root, @@ -194,6 +192,7 @@ vfs_stdinit, vfs_stduninit, vfs_stdextattrctl, + devfs_mount, }; VFS_SET(devfs_vfsops, devfs, VFCF_SYNTHETIC); ==== //depot/projects/kse/sys/fs/fdescfs/fdesc_vfsops.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ * * @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94 * - * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.34 2002/03/19 22:19:59 alfred Exp $ + * $FreeBSD: src/sys/fs/fdescfs/fdesc_vfsops.c,v 1.35 2002/05/02 20:24:50 mux Exp $ */ /* @@ -58,8 +58,8 @@ static MALLOC_DEFINE(M_FDESCMNT, "FDESC mount", "FDESC mount structure"); -static int fdesc_mount(struct mount *mp, char *path, caddr_t data, - struct nameidata *ndp, struct thread *td); +static int fdesc_mount(struct mount *mp, struct nameidata *ndp, + struct thread *td); static int fdesc_unmount(struct mount *mp, int mntflags, struct thread *td); static int fdesc_statfs(struct mount *mp, struct statfs *sbp, @@ -69,10 +69,8 @@ * Mount the per-process file descriptors (/dev/fd) */ static int -fdesc_mount(mp, path, data, ndp, td) +fdesc_mount(mp, ndp, td) struct mount *mp; - char *path; - caddr_t data; struct nameidata *ndp; struct thread *td; { @@ -209,7 +207,7 @@ } static struct vfsops fdesc_vfsops = { - fdesc_mount, + NULL, vfs_stdstart, fdesc_unmount, fdesc_root, @@ -223,6 +221,7 @@ fdesc_init, vfs_stduninit, vfs_stdextattrctl, + fdesc_mount, }; VFS_SET(fdesc_vfsops, fdescfs, VFCF_SYNTHETIC); ==== //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.66 2002/04/30 01:54:51 tanimura Exp $ + * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.67 2002/05/02 19:13:19 phk Exp $ */ #include @@ -66,7 +66,6 @@ long fi_writers; }; -static int fifo_badop(void); static int fifo_print(struct vop_print_args *); static int fifo_lookup(struct vop_lookup_args *); static int fifo_open(struct vop_open_args *); @@ -95,30 +94,30 @@ { &vop_access_desc, (vop_t *) vop_ebadf }, { &vop_advlock_desc, (vop_t *) fifo_advlock }, { &vop_close_desc, (vop_t *) fifo_close }, - { &vop_create_desc, (vop_t *) fifo_badop }, + { &vop_create_desc, (vop_t *) vop_panic }, { &vop_getattr_desc, (vop_t *) vop_ebadf }, { &vop_getwritemount_desc, (vop_t *) vop_stdgetwritemount }, { &vop_ioctl_desc, (vop_t *) fifo_ioctl }, { &vop_kqfilter_desc, (vop_t *) fifo_kqfilter }, { &vop_lease_desc, (vop_t *) vop_null }, - { &vop_link_desc, (vop_t *) fifo_badop }, + { &vop_link_desc, (vop_t *) vop_panic }, { &vop_lookup_desc, (vop_t *) fifo_lookup }, - { &vop_mkdir_desc, (vop_t *) fifo_badop }, - { &vop_mknod_desc, (vop_t *) fifo_badop }, + { &vop_mkdir_desc, (vop_t *) vop_panic }, + { &vop_mknod_desc, (vop_t *) vop_panic }, { &vop_open_desc, (vop_t *) fifo_open }, { &vop_pathconf_desc, (vop_t *) fifo_pathconf }, { &vop_poll_desc, (vop_t *) fifo_poll }, { &vop_print_desc, (vop_t *) fifo_print }, { &vop_read_desc, (vop_t *) fifo_read }, - { &vop_readdir_desc, (vop_t *) fifo_badop }, - { &vop_readlink_desc, (vop_t *) fifo_badop }, - { &vop_reallocblks_desc, (vop_t *) fifo_badop }, + { &vop_readdir_desc, (vop_t *) vop_panic }, + { &vop_readlink_desc, (vop_t *) vop_panic }, + { &vop_reallocblks_desc, (vop_t *) vop_panic }, { &vop_reclaim_desc, (vop_t *) vop_null }, - { &vop_remove_desc, (vop_t *) fifo_badop }, - { &vop_rename_desc, (vop_t *) fifo_badop }, - { &vop_rmdir_desc, (vop_t *) fifo_badop }, + { &vop_remove_desc, (vop_t *) vop_panic }, + { &vop_rename_desc, (vop_t *) vop_panic }, + { &vop_rmdir_desc, (vop_t *) vop_panic }, { &vop_setattr_desc, (vop_t *) vop_ebadf }, - { &vop_symlink_desc, (vop_t *) fifo_badop }, + { &vop_symlink_desc, (vop_t *) vop_panic }, { &vop_write_desc, (vop_t *) fifo_write }, { NULL, NULL } }; @@ -610,14 +609,3 @@ return (ap->a_flags & F_FLOCK ? EOPNOTSUPP : EINVAL); } - -/* - * Fifo bad operation - */ -static int -fifo_badop() -{ - - panic("fifo_badop called"); - /* NOTREACHED */ -} ==== //depot/projects/kse/sys/fs/pseudofs/pseudofs.c#10 (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. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.13 2002/04/04 21:03:19 jhb Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs.c,v 1.14 2002/05/02 20:25:55 mux Exp $ */ #include @@ -240,8 +240,8 @@ * Mount a pseudofs instance */ int -pfs_mount(struct pfs_info *pi, struct mount *mp, char *path, caddr_t data, - struct nameidata *ndp, struct thread *td) +pfs_mount(struct pfs_info *pi, struct mount *mp, struct nameidata *ndp, + struct thread *td) { struct statfs *sbp; ==== //depot/projects/kse/sys/fs/pseudofs/pseudofs.h#11 (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. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.17 2002/02/10 04:43:21 rwatson Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.18 2002/05/02 20:25:55 mux Exp $ */ #ifndef _PSEUDOFS_H_INCLUDED @@ -197,8 +197,7 @@ /* * VFS interface */ -int pfs_mount (struct pfs_info *pi, - struct mount *mp, char *path, caddr_t data, +int pfs_mount (struct pfs_info *pi, struct mount *mp, struct nameidata *ndp, struct thread *td); int pfs_unmount (struct mount *mp, int mntflags, struct thread *td); @@ -235,9 +234,9 @@ }; \ \ static int \ -_##name##_mount(struct mount *mp, char *path, caddr_t data, \ - struct nameidata *ndp, struct thread *td) { \ - return pfs_mount(&name##_info, mp, path, data, ndp, td); \ +_##name##_mount(struct mount *mp, struct nameidata *ndp, \ + struct thread *td) { \ + return pfs_mount(&name##_info, mp, ndp, td); \ } \ \ static int \ @@ -251,7 +250,7 @@ } \ \ static struct vfsops name##_vfsops = { \ - _##name##_mount, \ + NULL, \ vfs_stdstart, \ pfs_unmount, \ pfs_root, \ @@ -265,6 +264,7 @@ _##name##_init, \ _##name##_uninit, \ vfs_stdextattrctl, \ + _##name##_mount, \ }; \ VFS_SET(name##_vfsops, name, VFCF_SYNTHETIC); \ MODULE_VERSION(name, version); \ ==== //depot/projects/kse/sys/fs/pseudofs/pseudofs_vnops.c#13 (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. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.25 2002/04/14 04:12:44 jhb Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.26 2002/05/03 14:58:25 des Exp $ */ #include @@ -780,14 +780,6 @@ } /* - * Dummy operations */ -static int pfs_badop(void *va) { return (EOPNOTSUPP); } -#if 0 -static int pfs_erofs(void *va) { return (EROFS); } -static int pfs_null(void *va) { return (0); } -#endif - -/* * Vnode operations */ vop_t **pfs_vnodeop_p; @@ -795,26 +787,26 @@ { &vop_default_desc, (vop_t *)vop_defaultop }, { &vop_access_desc, (vop_t *)pfs_access }, { &vop_close_desc, (vop_t *)pfs_close }, - { &vop_create_desc, (vop_t *)pfs_badop }, + { &vop_create_desc, (vop_t *)vop_eopnotsupp }, { &vop_getattr_desc, (vop_t *)pfs_getattr }, { &vop_getextattr_desc, (vop_t *)pfs_getextattr }, { &vop_ioctl_desc, (vop_t *)pfs_ioctl }, - { &vop_link_desc, (vop_t *)pfs_badop }, + { &vop_link_desc, (vop_t *)vop_eopnotsupp }, { &vop_lookup_desc, (vop_t *)pfs_lookup }, - { &vop_mkdir_desc, (vop_t *)pfs_badop }, - { &vop_mknod_desc, (vop_t *)pfs_badop }, + { &vop_mkdir_desc, (vop_t *)vop_eopnotsupp }, + { &vop_mknod_desc, (vop_t *)vop_eopnotsupp }, { &vop_open_desc, (vop_t *)pfs_open }, { &vop_read_desc, (vop_t *)pfs_read }, { &vop_readdir_desc, (vop_t *)pfs_readdir }, { &vop_readlink_desc, (vop_t *)pfs_readlink }, { &vop_reclaim_desc, (vop_t *)pfs_reclaim }, - { &vop_remove_desc, (vop_t *)pfs_badop }, - { &vop_rename_desc, (vop_t *)pfs_badop }, - { &vop_rmdir_desc, (vop_t *)pfs_badop }, + { &vop_remove_desc, (vop_t *)vop_eopnotsupp }, + { &vop_rename_desc, (vop_t *)vop_eopnotsupp }, + { &vop_rmdir_desc, (vop_t *)vop_eopnotsupp }, { &vop_setattr_desc, (vop_t *)pfs_setattr }, - { &vop_symlink_desc, (vop_t *)pfs_badop }, + { &vop_symlink_desc, (vop_t *)vop_eopnotsupp }, { &vop_write_desc, (vop_t *)pfs_write }, - /* XXX I've probably forgotten a few that need pfs_badop */ + /* XXX I've probably forgotten a few that need vop_eopnotsupp */ { NULL, (vop_t *)NULL } }; ==== //depot/projects/kse/sys/fs/udf/udf_vnops.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.3 2002/04/30 05:05:05 scottl Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.5 2002/05/02 20:23:47 scottl Exp $ */ /* udf_vnops.c */ @@ -72,7 +72,6 @@ { &vop_bmap_desc, (vop_t *) udf_bmap }, { &vop_cachedlookup_desc, (vop_t *) udf_lookup }, { &vop_getattr_desc, (vop_t *) udf_getattr }, - { &vop_inactive_desc, (vop_t *) vop_stdinactive }, { &vop_ioctl_desc, (vop_t *) udf_ioctl }, { &vop_islocked_desc, (vop_t *) vop_stdislocked }, { &vop_lock_desc, (vop_t *) vop_stdlock }, @@ -85,8 +84,6 @@ { &vop_reclaim_desc, (vop_t *) udf_reclaim }, { &vop_strategy_desc, (vop_t *) udf_strategy }, { &vop_unlock_desc, (vop_t *) vop_stdunlock }, - { &vop_getpages_desc, (vop_t *) vop_stdgetpages }, - { &vop_putpages_desc, (vop_t *) vop_stdputpages }, { NULL, NULL } }; static struct vnodeopv_desc udf_vnodeop_opv_desc = @@ -802,6 +799,7 @@ { struct udf_node *node; uint32_t max_size; + daddr64_t lsector; int error; node = VTON(a->a_vp); @@ -813,11 +811,14 @@ if (a->a_runb) *a->a_runb = 0; - error = udf_bmap_internal(node, a->a_bn * node->udfmp->bsize, a->a_bnp, + error = udf_bmap_internal(node, a->a_bn * node->udfmp->bsize, &lsector, &max_size); if (error > 0) return (error); + /* Translate logical to physical sector number */ + *a->a_bnp = lsector << (node->udfmp->bshift - DEV_BSHIFT); + /* Punt on read-ahead for now */ if (a->a_runp) *a->a_runp = 0; ==== //depot/projects/kse/sys/i386/conf/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/i386/conf/Makefile,v 1.3 2002/04/03 18:09:17 jhb Exp $ +# $FreeBSD: src/sys/i386/conf/Makefile,v 1.5 2002/05/02 16:34:47 des Exp $ all: @echo "make LINT only" @@ -6,5 +6,5 @@ clean: rm LINT -LINT: ../../conf/NOTES NOTES makeLINT.pl - cat ../../conf/NOTES NOTES | perl5 makeLINT.pl > LINT +LINT: ../../conf/NOTES NOTES makeLINT.sed + cat ../../conf/NOTES NOTES | sed -E -n -f makeLINT.sed > LINT ==== //depot/projects/kse/sys/i386/conf/NOTES#32 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1017 2002/04/09 18:26:58 jhb Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1019 2002/05/02 19:42:38 obrien Exp $ # # ==== //depot/projects/kse/sys/ia64/ia64/machdep.c#31 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.101 2002/05/01 06:52:08 peter Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.102 2002/05/02 05:30:42 marcel Exp $ */ #include "opt_compat.h" @@ -700,7 +700,6 @@ * Initialize the virtual memory system. */ pmap_bootstrap(); - pcpup->pc_current_pmap = kernel_pmap; /* * Initialize debuggers, and break into them if appropriate. ==== //depot/projects/kse/sys/ia64/ia64/pmap.c#23 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.58 2002/04/29 07:43:14 peter Exp $ + * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.59 2002/05/02 05:35:02 marcel Exp $ */ /* @@ -810,19 +810,8 @@ void pmap_pinit0(struct pmap *pmap) { - int i; - - /* - * kernel_pmap is the same as any other pmap. - */ + /* kernel_pmap is the same as any other pmap. */ pmap_pinit(pmap); - pmap->pm_flags = 0; - for (i = 0; i < 5; i++) - pmap->pm_rid[i] = 0; - pmap->pm_ptphint = NULL; - pmap->pm_active = 0; - TAILQ_INIT(&pmap->pm_pvlist); - bzero(&pmap->pm_stats, sizeof pmap->pm_stats); } /* ==== //depot/projects/kse/sys/ia64/include/ansi.h#10 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/ia64/include/ansi.h,v 1.20 2002/04/10 15:58:12 mike Exp $ + * $FreeBSD: src/sys/ia64/include/ansi.h,v 1.21 2002/05/02 09:04:29 dfr Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -53,7 +53,7 @@ #define _BSD_MBSTATE_T_ __mbstate_t /* mbstate_t */ #define _BSD_PTRDIFF_T_ long /* ptr1 - ptr2 */ #define _BSD_RUNE_T_ _BSD_CT_RUNE_T_ /* rune_t (see below) */ -#define _BSD_SEGSZ_T_ __int32_t /* segment size (in pages) */ +#define _BSD_SEGSZ_T_ __int64_t /* segment size (in pages) */ #define _BSD_SIZE_T_ unsigned long /* sizeof() */ #define _BSD_SOCKLEN_T_ __uint32_t #define _BSD_SSIZE_T_ long /* byte count or error */ ==== //depot/projects/kse/sys/kern/init_main.c#39 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/init_main.c,v 1.193 2002/04/19 13:35:53 rwatson Exp $ + * $FreeBSD: src/sys/kern/init_main.c,v 1.194 2002/05/02 20:27:42 mux Exp $ */ #include "opt_init_path.h" @@ -519,7 +519,8 @@ if (error == EEXIST) error = 0; if (error == 0) - error = vfs_mount(td, "devfs", "/dev", 0, 0); + error = kernel_vmount(0, "fstype", "devfs", + "fspath", "/dev", NULL); if (error != 0) init_does_devfs = 1; } ==== //depot/projects/kse/sys/kern/kern_descrip.c#28 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.142 2002/05/01 20:44:44 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.144 2002/05/03 07:46:59 tanimura Exp $ */ #include "opt_compat.h" @@ -571,6 +571,8 @@ struct proc *p; struct pgrp *pg; + SIGIO_ASSERT(MA_OWNED); + sigio = SLIST_FIRST(sigiolst); if (sigio == NULL) return; @@ -591,28 +593,26 @@ } while ((sigio = SLIST_FIRST(sigiolst)) != NULL) { - SIGIO_LOCK(); *(sigio->sio_myref) = NULL; - SIGIO_UNLOCK(); if (pg != NULL) { KASSERT(sigio->sio_pgid < 0, ("Proc sigio in pgrp sigio list")); KASSERT(sigio->sio_pgrp == pg, ("Bogus pgrp in sigio list")); SLIST_REMOVE(&pg->pg_sigiolst, sigio, sigio, sio_pgsigio); PGRP_UNLOCK(pg); + SIGIO_UNLOCK(); crfree(sigio->sio_ucred); - mtx_lock(&Giant); FREE(sigio, M_SIGIO); - mtx_unlock(&Giant); + SIGIO_LOCK(); PGRP_LOCK(pg); } else /* if (p != NULL) */ { KASSERT(sigio->sio_pgid > 0, ("Pgrp sigio in proc sigio list")); KASSERT(sigio->sio_proc == p, ("Bogus proc in sigio list")); SLIST_REMOVE(&p->p_sigiolst, sigio, sigio, sio_pgsigio); PROC_UNLOCK(p); + SIGIO_UNLOCK(); crfree(sigio->sio_ucred); - mtx_lock(&Giant); FREE(sigio, M_SIGIO); - mtx_unlock(&Giant); + SIGIO_LOCK(); PROC_LOCK(p); } } ==== //depot/projects/kse/sys/kern/kern_exec.c#25 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_exec.c,v 1.162 2002/04/19 00:45:26 nectar Exp $ + * $FreeBSD: src/sys/kern/kern_exec.c,v 1.163 2002/05/02 15:00:14 jhb Exp $ */ #include @@ -127,13 +127,15 @@ { struct proc *p = td->td_proc; struct nameidata nd, *ndp; - struct ucred *newcred, *oldcred; + struct ucred *newcred = NULL, *oldcred; register_t *stack_base; int error, len, i; struct image_params image_params, *imgp; struct vattr attr; int (*img_first)(struct image_params *); - struct pargs *pa; + struct pargs *oldargs, *newargs = NULL; + struct procsig *oldprocsig, *newprocsig; + struct vnode *tracevp = NULL, *textvp = NULL; imgp = &image_params; @@ -297,20 +299,34 @@ FILEDESC_UNLOCK(p->p_fd); /* + * Malloc things before we need locks. + */ + newcred = crget(); + i = imgp->endargs - imgp->stringbase; + if (ps_arg_cache_limit >= i + sizeof(struct pargs)) + newargs = pargs_alloc(i); + + /* close files on exec */ + fdcloseexec(td); + + /* * For security and other reasons, signal handlers cannot * be shared after an exec. The new process gets a copy of the old * handlers. In execsigs(), the new process will have its signals * reset. */ + PROC_LOCK(p); + mp_fixme("procsig needs a lock"); if (p->p_procsig->ps_refcnt > 1) { - struct procsig *newprocsig; - + oldprocsig = p->p_procsig; + PROC_UNLOCK(p); MALLOC(newprocsig, struct procsig *, sizeof(struct procsig), - M_SUBPROC, M_WAITOK); - bcopy(p->p_procsig, newprocsig, sizeof(*newprocsig)); - p->p_procsig->ps_refcnt--; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 11:39:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 271C137B417; Fri, 3 May 2002 11:39:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id 9123237B419; Fri, 3 May 2002 11:39:11 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 75A62A900; Fri, 3 May 2002 11:43:04 -0700 (PDT) Date: Fri, 3 May 2002 11:43:04 -0700 From: Jonathan Mini To: John Baldwin Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 10740 for review Message-ID: <20020503114304.D81190@stylus.haikugeek.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from jhb@FreeBSD.org on Fri, May 03, 2002 at 01:30:03PM -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin [jhb@FreeBSD.org] wrote : > > On 03-May-2002 Julian Elischer wrote: > > to some extent I agree with you but realise that all tehuma stuff has > > occured since young Edith dorothy was born.. :-) > > (i.e the patches predate uma) I agree with John here, and I think the UMA stuff is the right way to do it. These changes aren't hard. I can do them now. > I realize that, I just think that the goal should be to eliminate the > thread free-list in favor of letting uma do its job, but that to avoid > any need to malloc in msleep, we instead let each KSE always have a > spare "hot" thread for P_KSE processes and that when it uses the hot > thread to do an upcall, the first act of the new thread will be to > allocate a new hot spare. This sounds good to me as well. -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 11:40:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A695337B416; Fri, 3 May 2002 11:40:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39]) by hub.freebsd.org (Postfix) with ESMTP id D592A37B41C; Fri, 3 May 2002 11:40:13 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc53.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020503184013.KNAB5896.rwcrmhc53.attbi.com@InterJet.elischer.org>; Fri, 3 May 2002 18:40:13 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id LAA83702; Fri, 3 May 2002 11:23:14 -0700 (PDT) Date: Fri, 3 May 2002 11:23:13 -0700 (PDT) From: Julian Elischer To: John Baldwin Cc: Jonathan Mini , Jonathan Mini , Perforce Change Reviews Subject: Re: PERFORCE change 10740 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG That's certainly an option, though it would probably allocate more threads than needed. On Fri, 3 May 2002, John Baldwin wrote: > > On 03-May-2002 Julian Elischer wrote: > > to some extent I agree with you but realise that all tehuma stuff has > > occured since young Edith dorothy was born.. :-) > > (i.e the patches predate uma) > > I realize that, I just think that the goal should be to eliminate the > thread free-list in favor of letting uma do its job, but that to avoid > any need to malloc in msleep, we instead let each KSE always have a > spare "hot" thread for P_KSE processes and that when it uses the hot > thread to do an upcall, the first act of the new thread will be to > allocate a new hot spare. > > Does that sound ok? > > -- > > John Baldwin <>< http://www.FreeBSD.org/~jhb/ > "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 11:42:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46DC237B41D; Fri, 3 May 2002 11:42:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id BBF9F37B416 for ; Fri, 3 May 2002 11:42:32 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id BCC43A900; Fri, 3 May 2002 11:46:25 -0700 (PDT) Date: Fri, 3 May 2002 11:46:25 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10740 for review Message-ID: <20020503114625.E81190@stylus.haikugeek.com> References: <20020503085009.C81190@stylus.haikugeek.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from julian@elischer.org on Fri, May 03, 2002 at 09:38:17AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > I have no problem with calling it thread_alloc except that your reason was > spurious. (the clash with "itself"). Oh, totally. That commit deserves a little dunce cap. ;) > > > > - uma_zalloc(,M_WAITOK) will never return NULL, so don't bother > > > > testing for it. > > > > > > You may be right, but I wasn't convinced that M_WAITOK was always > > > correct. I was trying to concieve af a case where you may not ba able to > > > wait when trying ot allocate a new thread.. > > > for example if you are trying to allocate it when you are already in > > > msleep().. it may be bad to sleep when in msleep already... > > > I think I may have other ways to stop this but think about it and > > > check the anti-recursion code in msleep(). > > > It may be that M_NOWAIT is the right answer.. > > > > Hmm. Why would you allocate a thread from within msleep()? > > > Umm MOST threads are allocated from either msleep or fork. > > remember in a threaded process you allocate and activate a new thread > when the old one blocks (i.e. is in msleep()). > So to answer your question.. > this is about the most common case.. :-) Oh. I was under the mistaken impression that threads were only created in fork(). -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 11:44:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5262837B419; Fri, 3 May 2002 11:44:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CEAF037B41A for ; Fri, 3 May 2002 11:44:30 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g43IiUV44448 for perforce@freebsd.org; Fri, 3 May 2002 11:44:30 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 3 May 2002 11:44:30 -0700 (PDT) Message-Id: <200205031844.g43IiUV44448@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 10750 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10750 Change 10750 by julian@julian_jules1 on 2002/05/03 11:43:59 Make it compile.. May still not work Affected files ... ... //depot/projects/kse/sys/kern/kern_fork.c#64 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_fork.c#64 (text+ko) ==== @@ -419,7 +419,8 @@ lastpid = trypid; p2 = newproc; - p2->p_stat = SIDL; /* protect against others */ + p2->p_state = PRS_NEW; /* protect against others */ + p2->p_sflag = PS_INMEM; p2->p_pid = trypid; LIST_INSERT_HEAD(&allproc, p2, p_list); LIST_INSERT_HEAD(PIDHASH(p2->p_pid), p2, p_hash); @@ -457,7 +458,7 @@ * Start by zeroing the section of proc that is zero-initialized, * then copy the section that is copied directly from the parent. */ - td2 = thread_alloc(p2); + td2 = thread_alloc(); if (td2 == NULL) { /* XXX need to take out of pid hash I think */ uma_zfree(proc_zone, p2); @@ -505,12 +506,9 @@ * all returns to userland until completed) * This is wrong but ok for 1:1. */ - */ proc_linkup(p2, kg2, ke2, td2); /* Set up the thread as an active thread. As if runnable */ - p2->p_state = PRS_NEW; /* protect against others */ - p2->p_sflag = PS_INMEM; ke2->ke_thread = td2; td2->td_kse = ke2; TAILQ_REMOVE(&kg2->kg_iq, ke2, ke_kgrlist); @@ -718,7 +716,6 @@ p2->p_acflag = AFORK; if ((flags & RFSTOPPED) == 0) { mtx_lock_spin(&sched_lock); - p2->p_stat = SRUN; setrunqueue(td2); mtx_unlock_spin(&sched_lock); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 11:49: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37F5437B41D; Fri, 3 May 2002 11:48:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 435C737B419 for ; Fri, 3 May 2002 11:48:36 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g43ImZo44934 for perforce@freebsd.org; Fri, 3 May 2002 11:48:35 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 3 May 2002 11:48:35 -0700 (PDT) Message-Id: <200205031848.g43ImZo44934@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 10751 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10751 Change 10751 by julian@julian_jules1 on 2002/05/03 11:47:51 check MFC Affected files ... ... //depot/projects/kse/sys/alpha/conf/GENERIC#12 integrate ... //depot/projects/kse/sys/dev/md/md.c#17 integrate ... //depot/projects/kse/sys/fs/hpfs/hpfs_vnops.c#9 integrate ... //depot/projects/kse/sys/i386/conf/GENERIC#16 integrate ... //depot/projects/kse/sys/pc98/conf/GENERIC#15 integrate ... //depot/projects/kse/sys/sparc64/conf/GENERIC#10 integrate Differences ... ==== //depot/projects/kse/sys/alpha/conf/GENERIC#12 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.137 2002/04/18 03:44:44 rwatson Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.138 2002/05/03 17:59:21 jmallett Exp $ machine alpha cpu EV4 @@ -74,7 +74,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detects deadlocks and cycles +#options WITNESS #Enable checks to detect deadlocks and cycles # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel ==== //depot/projects/kse/sys/dev/md/md.c#17 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.57 2002/03/20 09:55:07 jeff Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.58 2002/05/03 17:55:10 phk Exp $ * */ @@ -609,18 +609,6 @@ struct nameidata nd; int error, flags; - if (mdio->md_options & MD_AUTOUNIT) { - sc = mdnew(-1); - mdio->md_unit = sc->unit; - } else { - sc = mdnew(mdio->md_unit); - } - if (sc == NULL) - return (EBUSY); - - sc->type = MD_VNODE; - sc->flags = mdio->md_options & MD_FORCE; - flags = FREAD|FWRITE; NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); error = vn_open(&nd, &flags, 0); @@ -628,7 +616,6 @@ if (error != EACCES && error != EPERM && error != EROFS) return (error); flags &= ~FWRITE; - sc->flags |= MD_READONLY; NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); error = vn_open(&nd, &flags, 0); if (error) @@ -642,6 +629,22 @@ return (error ? error : EINVAL); } VOP_UNLOCK(nd.ni_vp, 0, td); + + if (mdio->md_options & MD_AUTOUNIT) { + sc = mdnew(-1); + mdio->md_unit = sc->unit; + } else { + sc = mdnew(mdio->md_unit); + } + if (sc == NULL) { + (void) vn_close(nd.ni_vp, flags, td->td_ucred, td); + return (EBUSY); + } + + sc->type = MD_VNODE; + sc->flags = mdio->md_options & MD_FORCE; + if (!(flags & FWRITE)) + sc->flags |= MD_READONLY; sc->secsize = DEV_BSIZE; sc->vnode = nd.ni_vp; ==== //depot/projects/kse/sys/fs/hpfs/hpfs_vnops.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.27 2002/04/08 08:12:42 phk Exp $ + * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.28 2002/05/03 18:23:29 phk Exp $ */ #include @@ -1275,8 +1275,6 @@ { &vop_readdir_desc, (vop_t *)hpfs_readdir }, { &vop_fsync_desc, (vop_t *)hpfs_fsync }, { &vop_bmap_desc, (vop_t *)hpfs_bmap }, - { &vop_getpages_desc, (vop_t *) vop_stdgetpages }, - { &vop_putpages_desc, (vop_t *) vop_stdputpages }, { &vop_strategy_desc, (vop_t *)hpfs_strategy }, { &vop_read_desc, (vop_t *)hpfs_read }, { &vop_write_desc, (vop_t *)hpfs_write }, ==== //depot/projects/kse/sys/i386/conf/GENERIC#16 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.340 2002/04/27 01:31:16 scottl Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.341 2002/05/03 17:59:22 jmallett Exp $ machine i386 cpu I486_CPU @@ -56,7 +56,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS #Enable checks to detects deadlocks and cycles +options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed # To make an SMP kernel, the next two are needed ==== //depot/projects/kse/sys/pc98/conf/GENERIC#15 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.202 2002/04/25 13:32:56 nyan Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.203 2002/05/03 17:59:23 jmallett Exp $ machine pc98 #cpu I386_CPU #Do not enable with other cpu types @@ -62,7 +62,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS #Enable checks to detects deadlocks and cycles +options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed # To make an SMP kernel, the next two are needed ==== //depot/projects/kse/sys/sparc64/conf/GENERIC#10 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.15 2002/04/18 03:44:44 rwatson Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.16 2002/05/03 17:59:25 jmallett Exp $ machine sparc64 cpu SUN4U @@ -61,7 +61,7 @@ options BREAK_TO_DEBUGGER #a BREAK on a comconsole drops to DDB options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detects deadlocks and cycles +#options WITNESS #Enable checks to detect deadlocks and cycles # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 12: 0:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AFDE37B41D; Fri, 3 May 2002 12:00:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88]) by hub.freebsd.org (Postfix) with ESMTP id E28F937B41B; Fri, 3 May 2002 12:00:17 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc52.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020503190016.ILXK4412.rwcrmhc52.attbi.com@InterJet.elischer.org>; Fri, 3 May 2002 19:00:16 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id LAA83836; Fri, 3 May 2002 11:51:30 -0700 (PDT) Date: Fri, 3 May 2002 11:51:28 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10740 for review In-Reply-To: <20020503114625.E81190@stylus.haikugeek.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG BTW warning warning... I redid fork() fo rdiff-reduction.. it MAY EXPLODE. I have not checked the locking logic, just done the mechanical bits. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 13:55:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B709B37B400; Fri, 3 May 2002 13:54:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4158837B431 for ; Fri, 3 May 2002 13:54:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g43KsFs67773 for perforce@freebsd.org; Fri, 3 May 2002 13:54:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 3 May 2002 13:54:15 -0700 (PDT) Message-Id: <200205032054.g43KsFs67773@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 10755 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10755 Change 10755 by rwatson@rwatson_curry on 2002/05/03 13:54:08 Integ trustedbsd base branch. For some reason, PAM always causes boatloads of conflicts. -at rocks. Affected files ... ... //depot/projects/trustedbsd/base/Makefile#7 integrate ... //depot/projects/trustedbsd/base/Makefile.inc1#15 integrate ... //depot/projects/trustedbsd/base/bin/ps/fmt.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/freebsd.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/abi64.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/bsd-4.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/bsd-5.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/cross64.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/dec-bsd.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/dec-osf1.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/ecoff.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/ecoffl.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/elf.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/elf64.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/elfl.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/elfl64.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/elflorion.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/elforion.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/gnu.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/iris3.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/iris4.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/iris4loser.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/iris5.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/iris5gas.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/iris6.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/linux.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/mips-5.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/mips.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/mips.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/mips.md#3 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/mips16.S#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/netbsd.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/news4.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/news5.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/nws3250v4.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/osfrose.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/r3900.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/rtems64.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/sni-gas.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/sni-svr4.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/svr3-4.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/svr3-5.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/svr4-4.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/svr4-5.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/svr4-t.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-bsd#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-bsd-gas#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-cross64#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-ecoff#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-elf#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-iris6#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-mips#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-mips-gas#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-osfrose#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-r3900#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-svr3#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-svr3-gas#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-svr4#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/t-svr4-gas#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/vxworks.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/x-dec-osf1#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/x-iris#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/x-iris3#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/x-iris6#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/x-mips#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/x-netbsd#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/x-nws3250v4#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/x-osfrose#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/x-sni-svr4#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/x-sony#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/x-sysv#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/xm-iris3.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/xm-iris4.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/xm-iris5.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/xm-iris6.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/xm-mips.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/xm-news.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/xm-nws3250v4.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/xm-sysv.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/config/mips/xm-sysv4.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc.295/cp/g++spec.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/integrate.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc.295/stmt.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#7 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#2 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#6 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#6 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#6 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#6 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_configure.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_nullconv.c#1 branch ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_end.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_authtok.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_start.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/openpam/misc/gendoc.pl#5 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#4 integrate ... //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#5 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/Makefile#4 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/gdm#3 integrate ... //depot/projects/trustedbsd/base/etc/pam.d/rexecd#1 branch ... //depot/projects/trustedbsd/base/etc/pam.d/xdm#3 integrate ... //depot/projects/trustedbsd/base/etc/periodic/daily/460.status-mail-rejects#2 integrate ... //depot/projects/trustedbsd/base/etc/periodic/monthly/200.accounting#3 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#13 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes-o.real#4 integrate ... //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2#6 integrate ... //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/freebsd-native.h#4 integrate ... //depot/projects/trustedbsd/base/lib/libc/stdtime/localtime.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_cancel.c#4 integrate ... //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_poll.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_readv.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_select.c#3 integrate ... //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_wait4.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_writev.c#2 integrate ... //depot/projects/trustedbsd/base/lib/libpam/libpam/Makefile#11 integrate ... //depot/projects/trustedbsd/base/libexec/rexecd/Makefile#3 integrate ... //depot/projects/trustedbsd/base/libexec/rexecd/rexecd.c#4 integrate ... //depot/projects/trustedbsd/base/release/Makefile#12 integrate ... //depot/projects/trustedbsd/base/release/alpha/drivers.conf#2 integrate ... //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#24 integrate ... //depot/projects/trustedbsd/base/release/i386/drivers.conf#2 integrate ... //depot/projects/trustedbsd/base/release/pc98/drivers.conf#4 integrate ... //depot/projects/trustedbsd/base/release/scripts/base-install.sh#2 integrate ... //depot/projects/trustedbsd/base/release/scripts/bin-install.sh#3 delete ... //depot/projects/trustedbsd/base/release/scripts/doFS.sh#5 integrate ... //depot/projects/trustedbsd/base/release/scripts/driver-remove.pl#3 integrate ... //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#7 integrate ... //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsutil.c#4 integrate ... //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass5.c#4 integrate ... //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#7 integrate ... //depot/projects/trustedbsd/base/sbin/mount_std/mount_std.c#4 integrate ... //depot/projects/trustedbsd/base/sbin/nfsd/nfsd.c#3 integrate ... //depot/projects/trustedbsd/base/sbin/restore/tape.c#5 integrate ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile#5 integrate ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile.asm#1 branch ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile.inc#4 integrate ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/i386/bf-586.s#1 branch ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/i386/bf-686.s#1 branch ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/i386/bn-586.s#1 branch ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/i386/cast-586.s#1 branch ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/i386/co-586.s#1 branch ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/i386/crypt586.s#1 branch ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/i386/des-586.s#1 branch ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/i386/md5-586.s#1 branch ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/i386/rc4-586.s#1 branch ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/i386/rc5-586.s#1 branch ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/i386/rmd-586.s#1 branch ... //depot/projects/trustedbsd/base/secure/lib/libcrypto/i386/sha1-586.s#1 branch ... //depot/projects/trustedbsd/base/share/man/man4/em.4#6 integrate ... //depot/projects/trustedbsd/base/share/man/man4/wi.4#2 integrate ... //depot/projects/trustedbsd/base/share/man/man4/wi.4tbl#1 branch ... //depot/projects/trustedbsd/base/share/man/man4/wi.4tl#1 branch ... //depot/projects/trustedbsd/base/share/man/man5/drivers.conf.5#2 integrate ... //depot/projects/trustedbsd/base/share/man/man7/release.7#3 integrate ... //depot/projects/trustedbsd/base/share/man/man9/Makefile#15 integrate ... //depot/projects/trustedbsd/base/share/man/man9/zone.9#5 integrate ... //depot/projects/trustedbsd/base/sys/alpha/alpha/clock.c#3 integrate ... //depot/projects/trustedbsd/base/sys/alpha/alpha/mem.c#3 integrate ... //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#9 integrate ... //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#9 integrate ... //depot/projects/trustedbsd/base/sys/conf/NOTES#4 integrate ... //depot/projects/trustedbsd/base/sys/conf/files#18 integrate ... //depot/projects/trustedbsd/base/sys/conf/files.powerpc#4 integrate ... //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#8 integrate ... //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#8 integrate ... //depot/projects/trustedbsd/base/sys/conf/kmod.mk#8 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#8 integrate ... //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.c#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_timer.c#7 integrate ... //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aicasm/Makefile#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/drm/drm_fops.h#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#7 integrate ... //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#10 integrate ... //depot/projects/trustedbsd/base/sys/dev/md/md.c#7 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/acphy.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/mii/qsphy.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#4 integrate ... //depot/projects/trustedbsd/base/sys/dev/sound/pcm/ac97_if.m#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/sound/pcm/feeder_if.m#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/sound/pcm/mixer_if.m#2 integrate ... //depot/projects/trustedbsd/base/sys/dev/tx/if_tx.c#3 integrate ... //depot/projects/trustedbsd/base/sys/dev/usb/usbdi.c#5 integrate ... //depot/projects/trustedbsd/base/sys/dev/wi/wi_hostap.c#4 integrate ... //depot/projects/trustedbsd/base/sys/fs/deadfs/dead_vnops.c#3 integrate ... //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vfsops.c#3 integrate ... //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate ... //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#10 integrate ... //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#6 integrate ... //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.c#5 integrate ... //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.h#5 integrate ... //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate ... //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#2 integrate ... //depot/projects/trustedbsd/base/sys/i386/acpica/Makefile#2 integrate ... //depot/projects/trustedbsd/base/sys/i386/acpica/genwakecode.pl#2 delete ... //depot/projects/trustedbsd/base/sys/i386/acpica/genwakecode.sh#1 branch ... //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#11 integrate ... //depot/projects/trustedbsd/base/sys/i386/conf/Makefile#3 integrate ... //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#14 integrate ... //depot/projects/trustedbsd/base/sys/i386/conf/makeLINT.pl#2 delete ... //depot/projects/trustedbsd/base/sys/i386/conf/makeLINT.sed#1 branch ... //depot/projects/trustedbsd/base/sys/i386/conf/makeLINT.sh#1 branch ... //depot/projects/trustedbsd/base/sys/i386/i386/mp_clock.c#3 integrate ... //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#8 integrate ... //depot/projects/trustedbsd/base/sys/i386/isa/loran.c#2 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/clock.c#3 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/exception.s#8 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#16 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/mca.c#2 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/mp_machdep.c#10 integrate ... //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#13 integrate ... //depot/projects/trustedbsd/base/sys/ia64/include/ansi.h#5 integrate ... //depot/projects/trustedbsd/base/sys/ia64/include/frame.h#2 integrate ... //depot/projects/trustedbsd/base/sys/kern/init_main.c#10 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#14 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_environment.c#4 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#11 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#12 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#10 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#6 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#10 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#12 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#12 integrate ... //depot/projects/trustedbsd/base/sys/kern/kern_tc.c#9 integrate ... //depot/projects/trustedbsd/base/sys/kern/makeobjops.pl#3 delete ... //depot/projects/trustedbsd/base/sys/kern/subr_hints.c#4 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_log.c#2 integrate ... //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#16 integrate ... //depot/projects/trustedbsd/base/sys/kern/sys_generic.c#9 integrate ... //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#9 integrate ... //depot/projects/trustedbsd/base/sys/kern/tty.c#9 integrate ... //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#11 integrate ... //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#11 integrate ... //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#13 integrate ... //depot/projects/trustedbsd/base/sys/kern/vfs_init.c#5 integrate ... //depot/projects/trustedbsd/base/sys/kern/vnode_if.pl#3 delete ... //depot/projects/trustedbsd/base/sys/modules/drm/mga/Makefile#2 integrate ... //depot/projects/trustedbsd/base/sys/modules/drm/r128/Makefile#2 integrate ... //depot/projects/trustedbsd/base/sys/modules/drm/radeon/Makefile#2 integrate ... //depot/projects/trustedbsd/base/sys/net/bpf.c#6 integrate ... //depot/projects/trustedbsd/base/sys/net/if_spppsubr.c#4 integrate ... //depot/projects/trustedbsd/base/sys/net/if_tap.c#6 integrate ... //depot/projects/trustedbsd/base/sys/net/if_tun.c#5 integrate ... //depot/projects/trustedbsd/base/sys/net/rtsock.c#9 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_cm.c#5 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_cm.h#3 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_subr.c#8 integrate ... //depot/projects/trustedbsd/base/sys/netatm/atm_var.h#6 integrate ... //depot/projects/trustedbsd/base/sys/netinet/accf_data.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netinet/accf_http.c#3 integrate ... //depot/projects/trustedbsd/base/sys/netinet/ip_fw.c#8 integrate ... //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#11 integrate ... //depot/projects/trustedbsd/base/sys/netkey/keysock.c#5 integrate ... //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#10 integrate ... //depot/projects/trustedbsd/base/sys/pc98/pc98/clock.c#7 integrate ... //depot/projects/trustedbsd/base/sys/pci/if_dc.c#10 integrate ... //depot/projects/trustedbsd/base/sys/powerpc/powerpc/clock.c#5 integrate ... //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#7 integrate ... //depot/projects/trustedbsd/base/sys/sys/malloc.h#5 integrate ... //depot/projects/trustedbsd/base/sys/sys/param.h#9 integrate ... //depot/projects/trustedbsd/base/sys/sys/proc.h#12 integrate ... //depot/projects/trustedbsd/base/sys/sys/signalvar.h#6 integrate ... //depot/projects/trustedbsd/base/sys/sys/socketvar.h#11 integrate ... //depot/projects/trustedbsd/base/sys/sys/time.h#6 integrate ... //depot/projects/trustedbsd/base/sys/sys/timepps.h#4 integrate ... //depot/projects/trustedbsd/base/sys/sys/timetc.h#7 integrate ... //depot/projects/trustedbsd/base/sys/sys/user.h#5 integrate ... //depot/projects/trustedbsd/base/sys/tools/makeobjops.awk#1 branch ... //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#3 integrate ... //depot/projects/trustedbsd/base/sys/ufs/ufs/extattr.h#2 integrate ... //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#8 integrate ... //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#7 integrate ... //depot/projects/trustedbsd/base/sys/vm/uma.h#4 integrate ... //depot/projects/trustedbsd/base/sys/vm/uma_core.c#5 integrate ... //depot/projects/trustedbsd/base/sys/vm/uma_dbg.c#1 branch ... //depot/projects/trustedbsd/base/sys/vm/uma_dbg.h#1 branch ... //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#8 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_map.c#9 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_map.h#7 integrate ... //depot/projects/trustedbsd/base/sys/vm/vm_page.c#8 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/regress.I.out#2 integrate ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/regress.R.out#1 branch ... //depot/projects/trustedbsd/base/tools/regression/usr.bin/xargs/regress.sh#3 integrate ... //depot/projects/trustedbsd/base/tools/tools/vop_table/vop_table.tcl#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/Makefile#11 integrate ... //depot/projects/trustedbsd/base/usr.bin/csplit/Makefile#1 branch ... //depot/projects/trustedbsd/base/usr.bin/csplit/csplit.1#1 branch ... //depot/projects/trustedbsd/base/usr.bin/csplit/csplit.c#1 branch ... //depot/projects/trustedbsd/base/usr.bin/m4/Makefile#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/eval.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/expr.c#4 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/gnum4.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/look.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/main.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/misc.c#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/pathnames.h#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/m4/trace.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/truss/alpha-fbsd.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/xargs/strnsubst.c#2 integrate ... //depot/projects/trustedbsd/base/usr.bin/xargs/xargs.1#3 integrate ... //depot/projects/trustedbsd/base/usr.bin/xargs/xargs.c#7 integrate ... //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/Makefile#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/crunchide.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/exec_aout.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/extern.h#2 integrate ... //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/perform.c#6 integrate ... //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/main.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/show.c#3 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ppp/command.c#6 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ppp/fsm.c#4 integrate ... //depot/projects/trustedbsd/base/usr.sbin/ppp/lcp.c#4 integrate ... //depot/projects/trustedbsd/base/usr.sbin/sysinstall/Makefile#6 integrate ... //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dist.c#8 integrate ... //depot/projects/trustedbsd/base/usr.sbin/sysinstall/media.c#4 integrate ... //depot/projects/trustedbsd/base/usr.sbin/sysinstall/package.c#4 integrate ... //depot/projects/trustedbsd/base/usr.sbin/sysinstall/sysinstall.h#6 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.252 2002/04/29 15:22:01 ru Exp $ +# $FreeBSD: src/Makefile,v 1.253 2002/04/30 11:50:01 ru Exp $ # # The user-driven targets are: # @@ -83,13 +83,13 @@ # order, but that's not important. # TGTS= all all-man buildkernel buildworld checkdpadd clean \ - cleandepend cleandir depend distribute distribworld everything \ + cleandepend cleandir depend distribute distributeworld everything \ hierarchy includes install installcheck installkernel \ reinstallkernel installmost installworld libraries lint \ mk most obj objlink regress rerelease tags update .ORDER: buildworld installworld -.ORDER: buildworld distribworld +.ORDER: buildworld distributeworld .ORDER: buildkernel installkernel .ORDER: buildkernel reinstallkernel ==== //depot/projects/trustedbsd/base/Makefile.inc1#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.262 2002/04/29 15:22:01 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.266 2002/04/30 23:29:00 bde Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -57,9 +57,6 @@ .if exists(${.CURDIR}/bin) SUBDIR+= bin .endif -.if exists(${.CURDIR}/etc) -SUBDIR+= etc -.endif .if exists(${.CURDIR}/games) && !defined(NOGAMES) SUBDIR+= games .endif @@ -96,6 +93,11 @@ SUBDIR+= usr.sbin .endif +# etc must be last for "distribute" to work +.if exists(${.CURDIR}/etc) +SUBDIR+= etc +.endif + # These are last, since it is nice to at least get the base system # rebuilt before you do them. .if defined(LOCAL_DIRS) @@ -353,14 +355,14 @@ # # Installs everything compiled by a 'buildworld'. # -installworld: installcheck +distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} for prog in [ awk cat chflags chmod chown date echo egrep find grep \ - ln make makewhatis mkdir mtree mv perl rm sed sh sysctl \ + ln make makewhatis mkdir mtree mv perl pwd_mkdb rm sed sh sysctl \ test true uname wc zic; do \ cp `which $$prog` ${INSTALLTMP}; \ done - cd ${.CURDIR}; ${IMAKE} reinstall + cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} rm -rf ${INSTALLTMP} # @@ -388,14 +390,11 @@ cd ${.CURDIR}/share/man; ${MAKE} makedb .endif -# -# distribworld -# -# Front-end to distribute to make sure the search path contains -# the object directory. Needed for miniperl. -# -distribworld: - cd ${.CURDIR}; PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 distribute +redistribute: + @echo "--------------------------------------------------------------" + @echo ">>> Distributing everything.." + @echo "--------------------------------------------------------------" + cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute # # buildkernel and installkernel @@ -646,7 +645,8 @@ cross-tools: .for _tool in ${_btxld} ${_elf2exe} \ - gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc ${_xlint} + gnu/usr.bin/binutils usr.bin/objformat usr.sbin/crunch/crunchide \ + gnu/usr.bin/cc ${_xlint} cd ${.CURDIR}/${_tool}; \ ${MAKE} obj; \ ${MAKE} depend; \ @@ -666,19 +666,22 @@ includes: cd ${.CURDIR}/include; ${MAKE} -B all install cd ${.CURDIR}/gnu/include; ${MAKE} install + cd ${.CURDIR}/gnu/lib/csu; ${MAKE} beforeinstall + cd ${.CURDIR}/gnu/lib/libdialog; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libobjc; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libreadline/readline; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libregex; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libstdc++; ${MAKE} beforeinstall - cd ${.CURDIR}/gnu/lib/libdialog; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/usr.bin/cc/cc1plus; ${MAKE} beforeinstall -.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) -.if exists(${.CURDIR}/secure/lib/libcrypto) - cd ${.CURDIR}/secure/lib/libcrypto; ${MAKE} beforeinstall -.endif -.if exists(${.CURDIR}/secure/lib/libssl) - cd ${.CURDIR}/secure/lib/libssl; ${MAKE} beforeinstall -.endif +.if exists(${.CURDIR}/kerberos5) && !defined(NOCRYPT) && \ + defined(MAKE_KERBEROS5) + cd ${.CURDIR}/kerberos5/lib/libasn1; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libhdb; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkadm5clnt; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkadm5srv; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkafs5; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkrb5; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libsl; ${MAKE} beforeinstall .endif .if exists(${.CURDIR}/kerberosIV) && !defined(NOCRYPT) && \ defined(MAKE_KERBEROS4) @@ -693,26 +696,16 @@ .else cd ${.CURDIR}/lib/libtelnet; ${MAKE} beforeinstall .endif -.if exists(${.CURDIR}/kerberos5) && !defined(NOCRYPT) && \ - defined(MAKE_KERBEROS5) - cd ${.CURDIR}/kerberos5/lib/libasn1; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libhdb; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkadm5clnt; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkadm5srv; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkafs5; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkrb5; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libsl; ${MAKE} beforeinstall -.endif .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}) cd ${.CURDIR}/lib/csu/${MACHINE_ARCH}; ${MAKE} beforeinstall .endif - cd ${.CURDIR}/gnu/lib/csu; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libalias; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libatm; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libdevstat; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libc; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcalendar; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcam; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libcom_err; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libdevstat; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libdisk; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libedit; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libfetch; ${MAKE} beforeinstall @@ -720,25 +713,32 @@ cd ${.CURDIR}/lib/libkvm; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libmd; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libmp; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/msun; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libncp; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libncurses; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libnetgraph; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libopie; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libpam/libpam; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libpcap; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libradius; ${MAKE} beforeinstall cd ${.CURDIR}/lib/librpcsvc; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libpam/libpam; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libsbuf; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libstand; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libtacplus; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libcom_err; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libusbhid; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libutil; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libvgl; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libwrap; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libypclnt; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libz; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/msun; ${MAKE} beforeinstall +.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/secure/lib/libcrypto) + cd ${.CURDIR}/secure/lib/libcrypto; ${MAKE} beforeinstall +.endif +.if exists(${.CURDIR}/secure/lib/libssl) + cd ${.CURDIR}/secure/lib/libssl; ${MAKE} beforeinstall +.endif +.endif cd ${.CURDIR}/usr.bin/lex; ${MAKE} beforeinstall # ==== //depot/projects/trustedbsd/base/bin/ps/fmt.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.17 2002/02/03 14:43:04 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.18 2002/05/02 05:46:37 jmallett Exp $"); #if 0 #ifndef lint @@ -72,8 +72,8 @@ if (buf == NULL) { if ((arg_max = sysconf(_SC_ARG_MAX)) == -1) errx(1, "sysconf _SC_ARG_MAX failed"); - if ((buf = malloc((u_int)(4 * arg_max) + 1)) == NULL) - errx(1, "malloc failed"); + if ((buf = malloc((size_t)(4 * arg_max) + 1)) == NULL) + err(1, "malloc"); } if (*argv == 0) { ==== //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/freebsd.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* Definitions for Intel 386 running FreeBSD with either a.out or ELF format - Copyright (C) 1996-2000 Free Software Foundation, Inc. + Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc. Contributed by Eric Youngdale. Modified for stabs-in-ELF by H.J. Lu. Adapted from GNU/Linux version by John Polstra. @@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.43 2002/04/24 04:21:41 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.44 2002/05/01 19:20:37 obrien Exp $ */ #undef CPP_PREDEFINES #define CPP_PREDEFINES \ @@ -38,7 +38,7 @@ #undef ASM_SPEC #define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" -#undef ASM_FINAL_SPEC +#undef ASM_FINAL_SPEC #define ASM_FINAL_SPEC "%|" /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support @@ -49,9 +49,6 @@ have the time to search for those flags. I am sure how to add support for -soname shared_object_name. H.J. - I took out %{v:%{!V:-V}}. It is too much :-(. They can use - -Wl,-V. - When the -shared link option is used a final link is not being done. */ @@ -64,14 +61,19 @@ %{assert*} %{R*}} \ %{!maout: \ %{Wl,*:%*} \ + %{v:-V} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ %{shared:-Bshareable %{h*} %{soname*}} \ - %{symbolic:-Bsymbolic} \ %{!shared: \ %{!static: \ %{rdynamic: -export-dynamic} \ %{!dynamic-linker: -dynamic-linker /usr/libexec/ld-elf.so.1}} \ - %{static:-Bstatic}}}" + %{static:-Bstatic}} \ + %{symbolic:-Bsymbolic}}" + +/* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical + crtbegin.o file (see crtstuff.c) which provides part of the support for + getting C++ file-scope static object constructed before entering `main'. */ #undef STARTFILE_SPEC #define STARTFILE_SPEC "\ @@ -86,10 +88,12 @@ %{!pg: \ %{p:gcrt1.o%s} \ %{!p:crt1.o%s}}} \ - crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}" + crti.o%s \ + %{!shared:crtbegin.o%s} \ + %{shared:crtbeginS.o%s}}" /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. Here we tack on our - own magical crtend.o file (compare w/crtstuff.c) which provides part of the + own magical crtend.o file (see crtstuff.c) which provides part of the support for getting C++ file-scope static object constructed before entering `main', followed by the normal "finalizer" file, `crtn.o'. */ @@ -102,20 +106,23 @@ /************************[ Target stuff ]***********************************/ -/* Define the actual types of some ANSI-mandated types. +/* Define the actual types of some ANSI-mandated types. Needs to agree with . GCC defaults come from c-decl.c, c-common.c, and config//.h. */ -#undef SIZE_TYPE +#undef SIZE_TYPE #define SIZE_TYPE "unsigned int" - -#undef PTRDIFF_TYPE + +#undef PTRDIFF_TYPE #define PTRDIFF_TYPE "int" +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE BITS_PER_WORD + /* This is the pseudo-op used to generate a 32-bit word of data with a specific value in some section. */ -#undef INT_ASM_OP +#undef INT_ASM_OP #define INT_ASM_OP ".long" /* Biggest alignment supported by the object file format of this @@ -151,27 +158,23 @@ #define TARGET_DEFAULT \ (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) -/* Prefix for internally generated assembler labels. If we aren't using - underscores, we are using prefix `.'s to identify labels that should - be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ -#undef LPREFIX -#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") +/* Don't default to pcc-struct-return, we want to retain compatibility with + older gcc versions AND pcc-struct-return is nonreentrant. + (even though the SVR4 ABI for the i386 says that records and unions are + returned in memory). */ + +#undef DEFAULT_PCC_STRUCT_RETURN +#define DEFAULT_PCC_STRUCT_RETURN 0 /* The a.out tools do not support "linkonce" sections. */ #undef SUPPORTS_ONE_ONLY #define SUPPORTS_ONE_ONLY TARGET_ELF -/* Enable alias attribute support. */ -#undef SET_ASM_OP -#define SET_ASM_OP ".set" - -/* The a.out tools do not support "Lscope" .stabs symbols. */ -#undef NO_DBX_FUNCTION_END -#define NO_DBX_FUNCTION_END TARGET_AOUT - -/* In ELF, the function stabs come first, before the relative offsets. */ -#undef DBX_FUNCTION_FIRST -#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF +/* Prefix for internally generated assembler labels. If we aren't using + underscores, we are using prefix `.'s to identify labels that should + be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ +#undef LPREFIX +#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") /* supply our own hook for calling __main() from main() */ #undef INVOKE__main @@ -255,11 +258,19 @@ /************************[ Assembler stuff ]********************************/ +/* Override the default comment-starter of "/" from unix.h. */ +#undef ASM_COMMENT_START +#define ASM_COMMENT_START "#" + #undef ASM_APP_ON #define ASM_APP_ON "#APP\n" #undef ASM_APP_OFF -#define ASM_APP_OFF "#NO_APP\n" +#define ASM_APP_OFF "#NO_APP\n" + +/* Enable alias attribute support. */ +#undef SET_ASM_OP +#define SET_ASM_OP ".set" /* This is how to begin an assembly language file. The .file command should always begin the output. @@ -274,8 +285,8 @@ } while (0) /* This is how to store into the string BUF - the symbol_ref name of an internal numbered label where - PREFIX is the class of label and NUM is the number within the class. + the symbol_ref name of an internal numbered label where + PREFIX is the class of label and NUM is the number within the class. This is suitable for output with `assemble_name'. */ #undef ASM_GENERATE_INTERNAL_LABEL #define ASM_GENERATE_INTERNAL_LABEL(BUF, PREFIX, NUMBER) \ @@ -405,7 +416,6 @@ } \ } while (0) - #undef ASM_OUTPUT_SOURCE_LINE #define ASM_OUTPUT_SOURCE_LINE(FILE, LINE) \ do { \ @@ -503,10 +513,10 @@ } while (0) /* Switch into a generic section. - + We make the section read-only and executable for a function decl, read-only for a const data decl, and writable for a non-const data decl. - + If the section has already been defined, we must not emit the attributes here. The SVR4 assembler does not recognize section redefinitions. @@ -666,13 +676,21 @@ some don't. *OLD* GAS requires the %cl argument, so override i386/unix.h. */ - + #undef AS3_SHIFT_DOUBLE #define AS3_SHIFT_DOUBLE(a,b,c,d) AS3 (a,b,c,d) /************************[ Debugger stuff ]*********************************/ +/* The a.out tools do not support "Lscope" .stabs symbols. */ +#undef NO_DBX_FUNCTION_END +#define NO_DBX_FUNCTION_END TARGET_AOUT + +/* In ELF, the function stabs come first, before the relative offsets. */ +#undef DBX_FUNCTION_FIRST +#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF + /* Copy this from the svr4 specifications... */ /* Define the register numbers to be used in Dwarf debugging information. The SVR4 reference port C compiler uses the following register numbers ==== //depot/projects/trustedbsd/base/contrib/gcc.295/cp/g++spec.c#2 (text+ko) ==== @@ -18,6 +18,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc.295/cp/g++spec.c,v 1.3 2002/05/01 20:04:18 obrien Exp $ */ + #include "config.h" #include "system.h" @@ -31,10 +33,16 @@ #ifndef MATH_LIBRARY #define MATH_LIBRARY "-lm" #endif +#ifndef MATH_LIBRARY_PROFILE +#define MATH_LIBRARY_PROFILE "-lm" +#endif #ifndef LIBSTDCXX #define LIBSTDCXX "-lstdc++" #endif +#ifndef LIBSTDCXX_PROFILE +#define LIBSTDCXX_PROFILE "-lstdc++" +#endif void lang_specific_driver (fn, in_argc, in_argv, in_added_libraries) @@ -45,6 +53,9 @@ { int i, j; + /* If non-zero, the user gave us the `-p' or `-pg' flag. */ + int saw_profile_flag = 0; + /* If non-zero, the user gave us the `-v' flag. */ int saw_verbose_flag = 0; @@ -135,6 +146,8 @@ } else if (strcmp (argv[i], "-lc") == 0) args[i] |= WITHLIBC; + else if (strcmp (argv[i], "-pg") == 0 || strcmp (argv[i], "-p") == 0) + saw_profile_flag++; else if (strcmp (argv[i], "-v") == 0) { saw_verbose_flag = 1; @@ -236,14 +249,14 @@ /* Add `-lstdc++' if we haven't already done so. */ if (library) { - arglist[j++] = LIBSTDCXX; + arglist[j++] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX; added_libraries++; } if (saw_math) arglist[j++] = saw_math; else if (library && need_math) { - arglist[j++] = MATH_LIBRARY; + arglist[j++] = saw_profile_flag ? MATH_LIBRARY_PROFILE : MATH_LIBRARY; added_libraries++; } if (saw_libc) ==== //depot/projects/trustedbsd/base/contrib/gcc.295/integrate.c#2 (text+ko) ==== @@ -19,6 +19,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc.295/integrate.c,v 1.2 2002/05/01 19:40:55 obrien Exp $ */ + #include "config.h" #include "system.h" @@ -1608,6 +1610,20 @@ if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_NEEDS_CONTEXT) static_chain_value = lookup_static_chain (fndecl); + /* If the inline function has these flags sets, that means that + coresponding global flags should be set for this function. */ + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_CALLS_SETJMP) + current_function_calls_setjmp = 1; + + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_CALLS_LONGJMP) + current_function_calls_longjmp = 1; + + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_HAS_NONLOCAL_LABEL) + current_function_has_nonlocal_label = 1; + + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_USES_CONST_POOL) + current_function_uses_const_pool = 1; + if (GET_CODE (parm_insns) == NOTE && NOTE_LINE_NUMBER (parm_insns) > 0) { ==== //depot/projects/trustedbsd/base/contrib/gcc.295/stmt.c#2 (text+ko) ==== @@ -19,6 +19,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc.295/stmt.c,v 1.2 2002/05/01 19:40:55 obrien Exp $ */ + /* This file handles the generation of rtl code from tree structure above the level of expressions, using subroutines in exp*.c and emit-rtl.c. @@ -4027,6 +4029,10 @@ cleanup = protect_with_terminate (cleanup); expand_eh_region_end (cleanup); } + else + { + do_pending_stack_adjust(); + } } if (reachable) ==== //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* Base configuration file for all FreeBSD targets. - Copyright (C) 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU CC. @@ -21,116 +21,72 @@ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify their commonalities. - Adapted from /usr/src/contrib/gcc/config/i386/freebsd.h, - /usr/src/contrib/gcc/config/svr4.h & - egcs/gcc/config/i386/freebsd-elf.h by - David O'Brien . */ + Adapted from gcc/config/i386/freebsd-elf.h by + David O'Brien . + Further work by David O'Brien and + Loren J. Rittle . */ -/* $FreeBSD: src/contrib/gcc/config/freebsd.h,v 1.36 2001/05/14 22:45:26 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd.h,v 1.37 2002/04/30 17:22:42 obrien Exp $ */ - -/* Cpp, assembler, linker, library, and startfile spec's. */ +/* In case we need to know. */ +#define USING_CONFIG_FREEBSD 1 /* This defines which switch letters take arguments. On FreeBSD, most of the normal cases (defined in gcc.c) apply, and we also have -h* and -z* options (for the linker) (coming from SVR4). We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -#define FBSD_SWITCH_TAKES_ARG(CHAR) \ - (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ - || (CHAR) == 'h' \ - || (CHAR) == 'z' /* ignored by ld */ \ - || (CHAR) == 'R') - #undef SWITCH_TAKES_ARG #define SWITCH_TAKES_ARG(CHAR) (FBSD_SWITCH_TAKES_ARG(CHAR)) -/* This defines which multi-letter switches take arguments. */ - -#define FBSD_WORD_SWITCH_TAKES_ARG(STR) \ - (DEFAULT_WORD_SWITCH_TAKES_ARG (STR) \ - || !strcmp ((STR), "rpath") || !strcmp ((STR), "rpath-link") \ - || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") \ - || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker")) - #undef WORD_SWITCH_TAKES_ARG #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) -/* Place spaces around this string. We depend on string splicing to produce - the final CPP_PREDEFINES value. */ - -#define FBSD_CPP_PREDEFINES \ - " -D__FreeBSD__=5 -D__FreeBSD_cc_version=500002 -Dunix -Asystem(unix) -Asystem(FreeBSD) " - -#define FBSD_CPP_SPEC " \ - %(cpp_cpu) \ - %{!maout: -D__ELF__} \ - %{munderscores: -D__UNDERSCORES__} \ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 16:13:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C4F737B41B; Fri, 3 May 2002 16:12:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8C95337B404 for ; Fri, 3 May 2002 16:12:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g43NC6194130 for perforce@freebsd.org; Fri, 3 May 2002 16:12:06 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Fri, 3 May 2002 16:12:06 -0700 (PDT) Message-Id: <200205032312.g43NC6194130@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10758 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10758 Change 10758 by jake@jake_sparc64 on 2002/05/03 16:11:21 Integ@10757 Affected files ... ... //depot/projects/sparc64/MAINTAINERS#4 integrate ... //depot/projects/sparc64/Makefile#3 integrate ... //depot/projects/sparc64/Makefile.inc1#12 integrate ... //depot/projects/sparc64/bin/ps/fmt.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/config/i386/freebsd.h#4 integrate ... //depot/projects/sparc64/contrib/gcc.295/config/mips/abi64.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/bsd-4.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/bsd-5.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/cross64.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/dec-bsd.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/dec-osf1.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/ecoff.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/ecoffl.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/elf.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/elf64.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/elfl.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/elfl64.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/elflorion.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/elforion.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/gnu.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/iris3.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/iris4.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/iris4loser.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/iris5.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/iris5gas.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/iris6.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/linux.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/mips-5.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/mips.c#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/mips.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/mips.md#3 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/mips16.S#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/netbsd.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/news4.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/news5.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/nws3250v4.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/osfrose.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/r3900.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/rtems64.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/sni-gas.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/sni-svr4.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/svr3-4.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/svr3-5.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/svr4-4.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/svr4-5.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/svr4-t.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-bsd#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-bsd-gas#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-cross64#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-ecoff#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-elf#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-iris6#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-mips#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-mips-gas#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-osfrose#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-r3900#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-svr3#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-svr3-gas#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-svr4#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/t-svr4-gas#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/vxworks.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/x-dec-osf1#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/x-iris#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/x-iris3#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/x-iris6#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/x-mips#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/x-netbsd#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/x-nws3250v4#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/x-osfrose#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/x-sni-svr4#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/x-sony#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/x-sysv#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/xm-iris3.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/xm-iris4.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/xm-iris5.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/xm-iris6.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/xm-mips.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/xm-news.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/xm-nws3250v4.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/xm-sysv.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/config/mips/xm-sysv4.h#2 delete ... //depot/projects/sparc64/contrib/gcc.295/cp/g++spec.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/integrate.c#2 integrate ... //depot/projects/sparc64/contrib/gcc.295/stmt.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/freebsd.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/freebsd.h#4 integrate ... //depot/projects/sparc64/contrib/openpam/HISTORY#7 integrate ... //depot/projects/sparc64/contrib/openpam/MANIFEST#7 integrate ... //depot/projects/sparc64/contrib/openpam/RELNOTES#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_borrow_cred.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_free_data.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_restore_cred.3#3 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setenv.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_strerror.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_verror.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vinfo.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vprompt.3#7 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/Makefile#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_configure.c#2 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_dynamic.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_impl.h#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_load.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_nullconv.c#1 branch ... //depot/projects/sparc64/contrib/openpam/lib/pam_end.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_start.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/misc/gendoc.pl#5 integrate ... //depot/projects/sparc64/crypto/openssh/ssh_config#4 integrate ... //depot/projects/sparc64/crypto/openssh/sshd_config#5 integrate ... //depot/projects/sparc64/etc/pam.d/Makefile#4 integrate ... //depot/projects/sparc64/etc/pam.d/gdm#3 integrate ... //depot/projects/sparc64/etc/pam.d/rexecd#1 branch ... //depot/projects/sparc64/etc/pam.d/xdm#3 integrate ... //depot/projects/sparc64/etc/periodic/daily/460.status-mail-rejects#2 integrate ... //depot/projects/sparc64/etc/periodic/monthly/200.accounting#2 integrate ... //depot/projects/sparc64/games/fortune/datfiles/fortunes#4 integrate ... //depot/projects/sparc64/games/fortune/datfiles/fortunes-o.real#3 integrate ... //depot/projects/sparc64/games/fortune/datfiles/fortunes2#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/Makefile#15 edit ... //depot/projects/sparc64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#3 integrate ... //depot/projects/sparc64/lib/libc/sparc64/Makefile.inc#7 edit ... //depot/projects/sparc64/lib/libc/stdtime/localtime.c#3 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_cancel.c#2 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_poll.c#2 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_readv.c#2 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_select.c#3 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_wait4.c#2 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_writev.c#2 integrate ... //depot/projects/sparc64/lib/libpam/libpam/Makefile#6 integrate ... //depot/projects/sparc64/libexec/rexecd/Makefile#2 integrate ... //depot/projects/sparc64/libexec/rexecd/rexecd.c#3 integrate ... //depot/projects/sparc64/release/Makefile#8 integrate ... //depot/projects/sparc64/release/alpha/drivers.conf#2 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 integrate ... //depot/projects/sparc64/release/i386/drivers.conf#2 integrate ... //depot/projects/sparc64/release/pc98/drivers.conf#2 integrate ... //depot/projects/sparc64/release/scripts/base-install.sh#2 integrate ... //depot/projects/sparc64/release/scripts/bin-install.sh#3 delete ... //depot/projects/sparc64/release/scripts/doFS.sh#3 integrate ... //depot/projects/sparc64/release/scripts/driver-remove.pl#3 integrate ... //depot/projects/sparc64/sbin/fdisk/fdisk.c#5 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/fsutil.c#3 integrate ... //depot/projects/sparc64/sbin/fsck_ffs/pass5.c#3 integrate ... //depot/projects/sparc64/sbin/ipfw/ipfw.8#2 integrate ... //depot/projects/sparc64/sbin/mount_std/mount_std.c#4 integrate ... //depot/projects/sparc64/sbin/nfsd/nfsd.c#3 integrate ... //depot/projects/sparc64/sbin/restore/tape.c#3 integrate ... //depot/projects/sparc64/secure/lib/libcrypto/Makefile#4 integrate ... //depot/projects/sparc64/secure/lib/libcrypto/Makefile.asm#1 branch ... //depot/projects/sparc64/secure/lib/libcrypto/Makefile.inc#4 integrate ... //depot/projects/sparc64/secure/lib/libcrypto/i386/bf-586.s#1 branch ... //depot/projects/sparc64/secure/lib/libcrypto/i386/bf-686.s#1 branch ... //depot/projects/sparc64/secure/lib/libcrypto/i386/bn-586.s#1 branch ... //depot/projects/sparc64/secure/lib/libcrypto/i386/cast-586.s#1 branch ... //depot/projects/sparc64/secure/lib/libcrypto/i386/co-586.s#1 branch ... //depot/projects/sparc64/secure/lib/libcrypto/i386/crypt586.s#1 branch ... //depot/projects/sparc64/secure/lib/libcrypto/i386/des-586.s#1 branch ... //depot/projects/sparc64/secure/lib/libcrypto/i386/md5-586.s#1 branch ... //depot/projects/sparc64/secure/lib/libcrypto/i386/rc4-586.s#1 branch ... //depot/projects/sparc64/secure/lib/libcrypto/i386/rc5-586.s#1 branch ... //depot/projects/sparc64/secure/lib/libcrypto/i386/rmd-586.s#1 branch ... //depot/projects/sparc64/secure/lib/libcrypto/i386/sha1-586.s#1 branch ... //depot/projects/sparc64/share/man/man4/em.4#3 integrate ... //depot/projects/sparc64/share/man/man4/wi.4#2 integrate ... //depot/projects/sparc64/share/man/man4/wi.4tbl#1 branch ... //depot/projects/sparc64/share/man/man4/wi.4tl#1 branch ... //depot/projects/sparc64/share/man/man5/drivers.conf.5#3 integrate ... //depot/projects/sparc64/share/man/man7/release.7#5 integrate ... //depot/projects/sparc64/share/man/man9/Makefile#6 integrate ... //depot/projects/sparc64/share/man/man9/VOP_ATTRIB.9#3 integrate ... //depot/projects/sparc64/share/man/man9/zone.9#2 integrate ... //depot/projects/sparc64/sys/alpha/alpha/clock.c#4 integrate ... //depot/projects/sparc64/sys/alpha/alpha/mem.c#5 integrate ... //depot/projects/sparc64/sys/alpha/conf/GENERIC#18 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_misc.c#16 integrate ... //depot/projects/sparc64/sys/conf/NOTES#7 integrate ... //depot/projects/sparc64/sys/conf/files#56 integrate ... //depot/projects/sparc64/sys/conf/files.powerpc#7 integrate ... //depot/projects/sparc64/sys/conf/kern.post.mk#13 integrate ... //depot/projects/sparc64/sys/conf/kern.pre.mk#11 integrate ... //depot/projects/sparc64/sys/conf/kmod.mk#9 integrate ... //depot/projects/sparc64/sys/dev/aac/aac.c#14 integrate ... //depot/projects/sparc64/sys/dev/aac/aac_cam.c#2 integrate ... //depot/projects/sparc64/sys/dev/acpica/acpi_timer.c#11 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aicasm/Makefile#5 integrate ... //depot/projects/sparc64/sys/dev/drm/drm_fops.h#2 integrate ... //depot/projects/sparc64/sys/dev/em/if_em.c#6 integrate ... //depot/projects/sparc64/sys/dev/isp/isp.c#18 integrate ... //depot/projects/sparc64/sys/dev/md/md.c#16 integrate ... //depot/projects/sparc64/sys/dev/mii/acphy.c#5 integrate ... //depot/projects/sparc64/sys/dev/mii/qsphy.c#5 integrate ... //depot/projects/sparc64/sys/dev/my/if_my.c#4 integrate ... //depot/projects/sparc64/sys/dev/sound/pcm/ac97_if.m#2 integrate ... //depot/projects/sparc64/sys/dev/sound/pcm/feeder_if.m#2 integrate ... //depot/projects/sparc64/sys/dev/sound/pcm/mixer_if.m#2 integrate ... //depot/projects/sparc64/sys/dev/tx/if_tx.c#3 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdi.c#8 integrate ... //depot/projects/sparc64/sys/dev/wi/wi_hostap.c#4 integrate ... //depot/projects/sparc64/sys/fs/deadfs/dead_vnops.c#3 integrate ... //depot/projects/sparc64/sys/fs/devfs/devfs_vfsops.c#5 integrate ... //depot/projects/sparc64/sys/fs/fdescfs/fdesc_vfsops.c#6 integrate ... //depot/projects/sparc64/sys/fs/fifofs/fifo_vnops.c#10 integrate ... //depot/projects/sparc64/sys/fs/hpfs/hpfs_vnops.c#11 integrate ... //depot/projects/sparc64/sys/fs/pseudofs/pseudofs.c#11 integrate ... //depot/projects/sparc64/sys/fs/pseudofs/pseudofs.h#12 integrate ... //depot/projects/sparc64/sys/fs/pseudofs/pseudofs_vnops.c#14 integrate ... //depot/projects/sparc64/sys/fs/udf/udf_vnops.c#2 integrate ... //depot/projects/sparc64/sys/i386/acpica/Makefile#3 integrate ... //depot/projects/sparc64/sys/i386/acpica/genwakecode.pl#2 delete ... //depot/projects/sparc64/sys/i386/acpica/genwakecode.sh#1 branch ... //depot/projects/sparc64/sys/i386/conf/GENERIC#21 integrate ... //depot/projects/sparc64/sys/i386/conf/Makefile#3 integrate ... //depot/projects/sparc64/sys/i386/conf/NOTES#39 integrate ... //depot/projects/sparc64/sys/i386/conf/makeLINT.pl#2 delete ... //depot/projects/sparc64/sys/i386/conf/makeLINT.sed#1 branch ... //depot/projects/sparc64/sys/i386/conf/makeLINT.sh#1 branch ... //depot/projects/sparc64/sys/i386/i386/mp_clock.c#3 integrate ... //depot/projects/sparc64/sys/i386/isa/clock.c#12 integrate ... //depot/projects/sparc64/sys/i386/isa/loran.c#3 integrate ... //depot/projects/sparc64/sys/ia64/conf/SKI#4 integrate ... //depot/projects/sparc64/sys/ia64/ia64/clock.c#7 integrate ... //depot/projects/sparc64/sys/ia64/ia64/exception.s#16 integrate ... //depot/projects/sparc64/sys/ia64/ia64/machdep.c#40 integrate ... //depot/projects/sparc64/sys/ia64/ia64/mca.c#2 integrate ... //depot/projects/sparc64/sys/ia64/ia64/mp_machdep.c#15 integrate ... //depot/projects/sparc64/sys/ia64/ia64/pmap.c#27 integrate ... //depot/projects/sparc64/sys/ia64/ia64/sscdisk.c#7 integrate ... //depot/projects/sparc64/sys/ia64/include/ansi.h#11 integrate ... //depot/projects/sparc64/sys/ia64/include/frame.h#2 integrate ... //depot/projects/sparc64/sys/kern/init_main.c#21 edit ... //depot/projects/sparc64/sys/kern/kern_descrip.c#23 integrate ... //depot/projects/sparc64/sys/kern/kern_environment.c#7 integrate ... //depot/projects/sparc64/sys/kern/kern_exec.c#23 integrate ... //depot/projects/sparc64/sys/kern/kern_exit.c#24 integrate ... //depot/projects/sparc64/sys/kern/kern_fork.c#28 integrate ... //depot/projects/sparc64/sys/kern/kern_malloc.c#9 integrate ... //depot/projects/sparc64/sys/kern/kern_proc.c#19 integrate ... //depot/projects/sparc64/sys/kern/kern_prot.c#30 integrate ... //depot/projects/sparc64/sys/kern/kern_sig.c#27 integrate ... //depot/projects/sparc64/sys/kern/kern_tc.c#11 integrate ... //depot/projects/sparc64/sys/kern/makeobjops.pl#5 delete ... //depot/projects/sparc64/sys/kern/subr_hints.c#5 integrate ... //depot/projects/sparc64/sys/kern/subr_log.c#4 integrate ... //depot/projects/sparc64/sys/kern/subr_witness.c#24 integrate ... //depot/projects/sparc64/sys/kern/sys_generic.c#14 integrate ... //depot/projects/sparc64/sys/kern/sys_pipe.c#19 integrate ... //depot/projects/sparc64/sys/kern/tty.c#16 integrate ... //depot/projects/sparc64/sys/kern/uipc_socket.c#18 integrate ... //depot/projects/sparc64/sys/kern/uipc_socket2.c#14 integrate ... //depot/projects/sparc64/sys/kern/uipc_usrreq.c#19 integrate ... //depot/projects/sparc64/sys/kern/vfs_aio.c#21 integrate ... //depot/projects/sparc64/sys/kern/vfs_init.c#5 integrate ... //depot/projects/sparc64/sys/kern/vnode_if.pl#4 delete ... //depot/projects/sparc64/sys/modules/drm/mga/Makefile#2 integrate ... //depot/projects/sparc64/sys/modules/drm/r128/Makefile#2 integrate ... //depot/projects/sparc64/sys/modules/drm/radeon/Makefile#2 integrate ... //depot/projects/sparc64/sys/net/bpf.c#12 integrate ... //depot/projects/sparc64/sys/net/if_spppsubr.c#7 integrate ... //depot/projects/sparc64/sys/net/if_tap.c#10 integrate ... //depot/projects/sparc64/sys/net/if_tun.c#8 integrate ... //depot/projects/sparc64/sys/net/raw_usrreq.c#5 integrate ... //depot/projects/sparc64/sys/net/rtsock.c#12 integrate ... //depot/projects/sparc64/sys/netatalk/ddp_input.c#3 integrate ... //depot/projects/sparc64/sys/netatm/atm_aal5.c#5 integrate ... //depot/projects/sparc64/sys/netatm/atm_cm.c#5 integrate ... //depot/projects/sparc64/sys/netatm/atm_cm.h#3 integrate ... //depot/projects/sparc64/sys/netatm/atm_subr.c#8 integrate ... //depot/projects/sparc64/sys/netatm/atm_var.h#7 integrate ... //depot/projects/sparc64/sys/netgraph/ng_socket.c#9 integrate ... //depot/projects/sparc64/sys/netinet/accf_data.c#3 integrate ... //depot/projects/sparc64/sys/netinet/accf_http.c#3 integrate ... //depot/projects/sparc64/sys/netinet/ip_divert.c#10 integrate ... //depot/projects/sparc64/sys/netinet/ip_fw.c#13 integrate ... //depot/projects/sparc64/sys/netinet/ip_mroute.c#11 integrate ... //depot/projects/sparc64/sys/netinet/raw_ip.c#13 integrate ... //depot/projects/sparc64/sys/netinet/tcp_input.c#18 integrate ... //depot/projects/sparc64/sys/netinet/udp_usrreq.c#16 integrate ... //depot/projects/sparc64/sys/netinet6/icmp6.c#5 integrate ... //depot/projects/sparc64/sys/netinet6/ip6_mroute.c#6 integrate ... //depot/projects/sparc64/sys/netinet6/raw_ip6.c#7 integrate ... //depot/projects/sparc64/sys/netinet6/udp6_usrreq.c#9 integrate ... //depot/projects/sparc64/sys/netipx/ipx_usrreq.c#5 integrate ... //depot/projects/sparc64/sys/netipx/spx_usrreq.c#4 integrate ... //depot/projects/sparc64/sys/netkey/keysock.c#7 integrate ... //depot/projects/sparc64/sys/netnatm/natm.c#5 integrate ... //depot/projects/sparc64/sys/netsmb/smb_trantcp.c#7 integrate ... //depot/projects/sparc64/sys/pc98/conf/GENERIC#17 integrate ... //depot/projects/sparc64/sys/pc98/pc98/clock.c#9 integrate ... //depot/projects/sparc64/sys/pci/if_dc.c#16 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/clock.c#6 integrate ... //depot/projects/sparc64/sys/sparc64/conf/GENERIC#24 integrate ... //depot/projects/sparc64/sys/sys/filedesc.h#12 integrate ... //depot/projects/sparc64/sys/sys/malloc.h#9 integrate ... //depot/projects/sparc64/sys/sys/param.h#19 integrate ... //depot/projects/sparc64/sys/sys/proc.h#33 integrate ... //depot/projects/sparc64/sys/sys/signalvar.h#8 integrate ... //depot/projects/sparc64/sys/sys/socketvar.h#18 integrate ... //depot/projects/sparc64/sys/sys/time.h#8 integrate ... //depot/projects/sparc64/sys/sys/timepps.h#4 integrate ... //depot/projects/sparc64/sys/sys/timetc.h#6 integrate ... //depot/projects/sparc64/sys/sys/user.h#12 integrate ... //depot/projects/sparc64/sys/tools/makeobjops.awk#1 branch ... //depot/projects/sparc64/sys/ufs/ffs/ffs_vnops.c#5 integrate ... //depot/projects/sparc64/sys/ufs/ufs/extattr.h#4 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_extattr.c#11 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_vnops.c#12 integrate ... //depot/projects/sparc64/sys/vm/uma.h#4 integrate ... //depot/projects/sparc64/sys/vm/uma_core.c#9 integrate ... //depot/projects/sparc64/sys/vm/uma_dbg.c#1 branch ... //depot/projects/sparc64/sys/vm/uma_dbg.h#1 branch ... //depot/projects/sparc64/sys/vm/uma_int.h#6 integrate ... //depot/projects/sparc64/sys/vm/vm_fault.c#12 integrate ... //depot/projects/sparc64/sys/vm/vm_map.c#16 integrate ... //depot/projects/sparc64/sys/vm/vm_map.h#11 integrate ... //depot/projects/sparc64/sys/vm/vm_page.c#16 integrate ... //depot/projects/sparc64/tools/regression/usr.bin/xargs/regress.I.out#2 integrate ... //depot/projects/sparc64/tools/regression/usr.bin/xargs/regress.R.out#1 branch ... //depot/projects/sparc64/tools/regression/usr.bin/xargs/regress.sh#2 integrate ... //depot/projects/sparc64/tools/tools/vop_table/vop_table.tcl#2 integrate ... //depot/projects/sparc64/usr.bin/Makefile#23 integrate ... //depot/projects/sparc64/usr.bin/csplit/Makefile#1 branch ... //depot/projects/sparc64/usr.bin/csplit/csplit.1#1 branch ... //depot/projects/sparc64/usr.bin/csplit/csplit.c#1 branch ... //depot/projects/sparc64/usr.bin/m4/Makefile#4 integrate ... //depot/projects/sparc64/usr.bin/m4/eval.c#3 integrate ... //depot/projects/sparc64/usr.bin/m4/expr.c#4 integrate ... //depot/projects/sparc64/usr.bin/m4/gnum4.c#3 integrate ... //depot/projects/sparc64/usr.bin/m4/look.c#3 integrate ... //depot/projects/sparc64/usr.bin/m4/main.c#3 integrate ... //depot/projects/sparc64/usr.bin/m4/misc.c#3 integrate ... //depot/projects/sparc64/usr.bin/m4/pathnames.h#3 integrate ... //depot/projects/sparc64/usr.bin/m4/trace.c#2 integrate ... //depot/projects/sparc64/usr.bin/truss/alpha-fbsd.c#2 integrate ... //depot/projects/sparc64/usr.bin/xargs/strnsubst.c#2 integrate ... //depot/projects/sparc64/usr.bin/xargs/xargs.1#3 integrate ... //depot/projects/sparc64/usr.bin/xargs/xargs.c#3 integrate ... //depot/projects/sparc64/usr.sbin/Makefile#15 edit ... //depot/projects/sparc64/usr.sbin/crunch/crunchide/Makefile#2 integrate ... //depot/projects/sparc64/usr.sbin/crunch/crunchide/crunchide.c#3 integrate ... //depot/projects/sparc64/usr.sbin/crunch/crunchide/exec_aout.c#2 integrate ... //depot/projects/sparc64/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate ... //depot/projects/sparc64/usr.sbin/crunch/crunchide/extern.h#2 integrate ... //depot/projects/sparc64/usr.sbin/newsyslog/newsyslog.c#4 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/create/perform.c#4 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/info/main.c#3 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/info/show.c#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/command.c#5 integrate ... //depot/projects/sparc64/usr.sbin/ppp/fsm.c#4 integrate ... //depot/projects/sparc64/usr.sbin/ppp/lcp.c#4 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/Makefile#5 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/dist.c#6 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/media.c#4 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/package.c#5 integrate ... //depot/projects/sparc64/usr.sbin/sysinstall/sysinstall.h#5 integrate Differences ... ==== //depot/projects/sparc64/MAINTAINERS#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.22 2002/04/25 16:43:58 des Exp $ +$FreeBSD: src/MAINTAINERS,v 1.23 2002/05/03 21:02:42 phk Exp $ subsystem login notes ----------------------------- @@ -26,7 +26,6 @@ struct disk phk Pre-commit review requested. specfs phk Pre-commit review requested. devfs phk Pre-commit review requested. -geom phk Pre-commit review requested. timekeeping phk Pre-commit review requested. md(4) phk Pre-commit review requested. aac scottl Pre-commit review requested ==== //depot/projects/sparc64/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.252 2002/04/29 15:22:01 ru Exp $ +# $FreeBSD: src/Makefile,v 1.253 2002/04/30 11:50:01 ru Exp $ # # The user-driven targets are: # @@ -83,13 +83,13 @@ # order, but that's not important. # TGTS= all all-man buildkernel buildworld checkdpadd clean \ - cleandepend cleandir depend distribute distribworld everything \ + cleandepend cleandir depend distribute distributeworld everything \ hierarchy includes install installcheck installkernel \ reinstallkernel installmost installworld libraries lint \ mk most obj objlink regress rerelease tags update .ORDER: buildworld installworld -.ORDER: buildworld distribworld +.ORDER: buildworld distributeworld .ORDER: buildkernel installkernel .ORDER: buildkernel reinstallkernel ==== //depot/projects/sparc64/Makefile.inc1#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.262 2002/04/29 15:22:01 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.266 2002/04/30 23:29:00 bde Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -57,9 +57,6 @@ .if exists(${.CURDIR}/bin) SUBDIR+= bin .endif -.if exists(${.CURDIR}/etc) -SUBDIR+= etc -.endif .if exists(${.CURDIR}/games) && !defined(NOGAMES) SUBDIR+= games .endif @@ -96,6 +93,11 @@ SUBDIR+= usr.sbin .endif +# etc must be last for "distribute" to work +.if exists(${.CURDIR}/etc) +SUBDIR+= etc +.endif + # These are last, since it is nice to at least get the base system # rebuilt before you do them. .if defined(LOCAL_DIRS) @@ -353,14 +355,14 @@ # # Installs everything compiled by a 'buildworld'. # -installworld: installcheck +distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} for prog in [ awk cat chflags chmod chown date echo egrep find grep \ - ln make makewhatis mkdir mtree mv perl rm sed sh sysctl \ + ln make makewhatis mkdir mtree mv perl pwd_mkdb rm sed sh sysctl \ test true uname wc zic; do \ cp `which $$prog` ${INSTALLTMP}; \ done - cd ${.CURDIR}; ${IMAKE} reinstall + cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} rm -rf ${INSTALLTMP} # @@ -388,14 +390,11 @@ cd ${.CURDIR}/share/man; ${MAKE} makedb .endif -# -# distribworld -# -# Front-end to distribute to make sure the search path contains -# the object directory. Needed for miniperl. -# -distribworld: - cd ${.CURDIR}; PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 distribute +redistribute: + @echo "--------------------------------------------------------------" + @echo ">>> Distributing everything.." + @echo "--------------------------------------------------------------" + cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute # # buildkernel and installkernel @@ -646,7 +645,8 @@ cross-tools: .for _tool in ${_btxld} ${_elf2exe} \ - gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc ${_xlint} + gnu/usr.bin/binutils usr.bin/objformat usr.sbin/crunch/crunchide \ + gnu/usr.bin/cc ${_xlint} cd ${.CURDIR}/${_tool}; \ ${MAKE} obj; \ ${MAKE} depend; \ @@ -666,19 +666,22 @@ includes: cd ${.CURDIR}/include; ${MAKE} -B all install cd ${.CURDIR}/gnu/include; ${MAKE} install + cd ${.CURDIR}/gnu/lib/csu; ${MAKE} beforeinstall + cd ${.CURDIR}/gnu/lib/libdialog; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libobjc; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libreadline/readline; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libregex; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libstdc++; ${MAKE} beforeinstall - cd ${.CURDIR}/gnu/lib/libdialog; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/usr.bin/cc/cc1plus; ${MAKE} beforeinstall -.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) -.if exists(${.CURDIR}/secure/lib/libcrypto) - cd ${.CURDIR}/secure/lib/libcrypto; ${MAKE} beforeinstall -.endif -.if exists(${.CURDIR}/secure/lib/libssl) - cd ${.CURDIR}/secure/lib/libssl; ${MAKE} beforeinstall -.endif +.if exists(${.CURDIR}/kerberos5) && !defined(NOCRYPT) && \ + defined(MAKE_KERBEROS5) + cd ${.CURDIR}/kerberos5/lib/libasn1; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libhdb; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkadm5clnt; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkadm5srv; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkafs5; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkrb5; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libsl; ${MAKE} beforeinstall .endif .if exists(${.CURDIR}/kerberosIV) && !defined(NOCRYPT) && \ defined(MAKE_KERBEROS4) @@ -693,26 +696,16 @@ .else cd ${.CURDIR}/lib/libtelnet; ${MAKE} beforeinstall .endif -.if exists(${.CURDIR}/kerberos5) && !defined(NOCRYPT) && \ - defined(MAKE_KERBEROS5) - cd ${.CURDIR}/kerberos5/lib/libasn1; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libhdb; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkadm5clnt; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkadm5srv; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkafs5; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkrb5; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libsl; ${MAKE} beforeinstall -.endif .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}) cd ${.CURDIR}/lib/csu/${MACHINE_ARCH}; ${MAKE} beforeinstall .endif - cd ${.CURDIR}/gnu/lib/csu; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libalias; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libatm; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libdevstat; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libc; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcalendar; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcam; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libcom_err; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libdevstat; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libdisk; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libedit; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libfetch; ${MAKE} beforeinstall @@ -720,25 +713,32 @@ cd ${.CURDIR}/lib/libkvm; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libmd; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libmp; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/msun; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libncp; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libncurses; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libnetgraph; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libopie; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libpam/libpam; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libpcap; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libradius; ${MAKE} beforeinstall cd ${.CURDIR}/lib/librpcsvc; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libpam/libpam; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libsbuf; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libstand; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libtacplus; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libcom_err; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libusbhid; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libutil; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libvgl; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libwrap; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libypclnt; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libz; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/msun; ${MAKE} beforeinstall +.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/secure/lib/libcrypto) + cd ${.CURDIR}/secure/lib/libcrypto; ${MAKE} beforeinstall +.endif +.if exists(${.CURDIR}/secure/lib/libssl) + cd ${.CURDIR}/secure/lib/libssl; ${MAKE} beforeinstall +.endif +.endif cd ${.CURDIR}/usr.bin/lex; ${MAKE} beforeinstall # ==== //depot/projects/sparc64/bin/ps/fmt.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.17 2002/02/03 14:43:04 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.18 2002/05/02 05:46:37 jmallett Exp $"); #if 0 #ifndef lint @@ -72,8 +72,8 @@ if (buf == NULL) { if ((arg_max = sysconf(_SC_ARG_MAX)) == -1) errx(1, "sysconf _SC_ARG_MAX failed"); - if ((buf = malloc((u_int)(4 * arg_max) + 1)) == NULL) - errx(1, "malloc failed"); + if ((buf = malloc((size_t)(4 * arg_max) + 1)) == NULL) + err(1, "malloc"); } if (*argv == 0) { ==== //depot/projects/sparc64/contrib/gcc.295/config/i386/freebsd.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* Definitions for Intel 386 running FreeBSD with either a.out or ELF format - Copyright (C) 1996-2000 Free Software Foundation, Inc. + Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc. Contributed by Eric Youngdale. Modified for stabs-in-ELF by H.J. Lu. Adapted from GNU/Linux version by John Polstra. @@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.43 2002/04/24 04:21:41 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.44 2002/05/01 19:20:37 obrien Exp $ */ #undef CPP_PREDEFINES #define CPP_PREDEFINES \ @@ -38,7 +38,7 @@ #undef ASM_SPEC #define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" -#undef ASM_FINAL_SPEC +#undef ASM_FINAL_SPEC #define ASM_FINAL_SPEC "%|" /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support @@ -49,9 +49,6 @@ have the time to search for those flags. I am sure how to add support for -soname shared_object_name. H.J. - I took out %{v:%{!V:-V}}. It is too much :-(. They can use - -Wl,-V. - When the -shared link option is used a final link is not being done. */ @@ -64,14 +61,19 @@ %{assert*} %{R*}} \ %{!maout: \ %{Wl,*:%*} \ + %{v:-V} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ %{shared:-Bshareable %{h*} %{soname*}} \ - %{symbolic:-Bsymbolic} \ %{!shared: \ %{!static: \ %{rdynamic: -export-dynamic} \ %{!dynamic-linker: -dynamic-linker /usr/libexec/ld-elf.so.1}} \ - %{static:-Bstatic}}}" + %{static:-Bstatic}} \ + %{symbolic:-Bsymbolic}}" + +/* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical + crtbegin.o file (see crtstuff.c) which provides part of the support for + getting C++ file-scope static object constructed before entering `main'. */ #undef STARTFILE_SPEC #define STARTFILE_SPEC "\ @@ -86,10 +88,12 @@ %{!pg: \ %{p:gcrt1.o%s} \ %{!p:crt1.o%s}}} \ - crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}" + crti.o%s \ + %{!shared:crtbegin.o%s} \ + %{shared:crtbeginS.o%s}}" /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. Here we tack on our - own magical crtend.o file (compare w/crtstuff.c) which provides part of the + own magical crtend.o file (see crtstuff.c) which provides part of the support for getting C++ file-scope static object constructed before entering `main', followed by the normal "finalizer" file, `crtn.o'. */ @@ -102,20 +106,23 @@ /************************[ Target stuff ]***********************************/ -/* Define the actual types of some ANSI-mandated types. +/* Define the actual types of some ANSI-mandated types. Needs to agree with . GCC defaults come from c-decl.c, c-common.c, and config//.h. */ -#undef SIZE_TYPE +#undef SIZE_TYPE #define SIZE_TYPE "unsigned int" - -#undef PTRDIFF_TYPE + +#undef PTRDIFF_TYPE #define PTRDIFF_TYPE "int" +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE BITS_PER_WORD + /* This is the pseudo-op used to generate a 32-bit word of data with a specific value in some section. */ -#undef INT_ASM_OP +#undef INT_ASM_OP #define INT_ASM_OP ".long" /* Biggest alignment supported by the object file format of this @@ -151,27 +158,23 @@ #define TARGET_DEFAULT \ (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) -/* Prefix for internally generated assembler labels. If we aren't using - underscores, we are using prefix `.'s to identify labels that should - be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ -#undef LPREFIX -#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") +/* Don't default to pcc-struct-return, we want to retain compatibility with + older gcc versions AND pcc-struct-return is nonreentrant. + (even though the SVR4 ABI for the i386 says that records and unions are + returned in memory). */ + +#undef DEFAULT_PCC_STRUCT_RETURN +#define DEFAULT_PCC_STRUCT_RETURN 0 /* The a.out tools do not support "linkonce" sections. */ #undef SUPPORTS_ONE_ONLY #define SUPPORTS_ONE_ONLY TARGET_ELF -/* Enable alias attribute support. */ -#undef SET_ASM_OP -#define SET_ASM_OP ".set" - -/* The a.out tools do not support "Lscope" .stabs symbols. */ -#undef NO_DBX_FUNCTION_END -#define NO_DBX_FUNCTION_END TARGET_AOUT - -/* In ELF, the function stabs come first, before the relative offsets. */ -#undef DBX_FUNCTION_FIRST -#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF +/* Prefix for internally generated assembler labels. If we aren't using + underscores, we are using prefix `.'s to identify labels that should + be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ +#undef LPREFIX +#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") /* supply our own hook for calling __main() from main() */ #undef INVOKE__main @@ -255,11 +258,19 @@ /************************[ Assembler stuff ]********************************/ +/* Override the default comment-starter of "/" from unix.h. */ +#undef ASM_COMMENT_START +#define ASM_COMMENT_START "#" + #undef ASM_APP_ON #define ASM_APP_ON "#APP\n" #undef ASM_APP_OFF -#define ASM_APP_OFF "#NO_APP\n" +#define ASM_APP_OFF "#NO_APP\n" + +/* Enable alias attribute support. */ +#undef SET_ASM_OP +#define SET_ASM_OP ".set" /* This is how to begin an assembly language file. The .file command should always begin the output. @@ -274,8 +285,8 @@ } while (0) /* This is how to store into the string BUF - the symbol_ref name of an internal numbered label where - PREFIX is the class of label and NUM is the number within the class. + the symbol_ref name of an internal numbered label where + PREFIX is the class of label and NUM is the number within the class. This is suitable for output with `assemble_name'. */ #undef ASM_GENERATE_INTERNAL_LABEL #define ASM_GENERATE_INTERNAL_LABEL(BUF, PREFIX, NUMBER) \ @@ -405,7 +416,6 @@ } \ } while (0) - #undef ASM_OUTPUT_SOURCE_LINE #define ASM_OUTPUT_SOURCE_LINE(FILE, LINE) \ do { \ @@ -503,10 +513,10 @@ } while (0) /* Switch into a generic section. - + We make the section read-only and executable for a function decl, read-only for a const data decl, and writable for a non-const data decl. - + If the section has already been defined, we must not emit the attributes here. The SVR4 assembler does not recognize section redefinitions. @@ -666,13 +676,21 @@ some don't. *OLD* GAS requires the %cl argument, so override i386/unix.h. */ - + #undef AS3_SHIFT_DOUBLE #define AS3_SHIFT_DOUBLE(a,b,c,d) AS3 (a,b,c,d) /************************[ Debugger stuff ]*********************************/ +/* The a.out tools do not support "Lscope" .stabs symbols. */ +#undef NO_DBX_FUNCTION_END +#define NO_DBX_FUNCTION_END TARGET_AOUT + +/* In ELF, the function stabs come first, before the relative offsets. */ +#undef DBX_FUNCTION_FIRST +#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF + /* Copy this from the svr4 specifications... */ /* Define the register numbers to be used in Dwarf debugging information. The SVR4 reference port C compiler uses the following register numbers ==== //depot/projects/sparc64/contrib/gcc.295/cp/g++spec.c#2 (text+ko) ==== @@ -18,6 +18,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc.295/cp/g++spec.c,v 1.3 2002/05/01 20:04:18 obrien Exp $ */ + #include "config.h" #include "system.h" @@ -31,10 +33,16 @@ #ifndef MATH_LIBRARY #define MATH_LIBRARY "-lm" #endif +#ifndef MATH_LIBRARY_PROFILE +#define MATH_LIBRARY_PROFILE "-lm" +#endif #ifndef LIBSTDCXX #define LIBSTDCXX "-lstdc++" #endif +#ifndef LIBSTDCXX_PROFILE +#define LIBSTDCXX_PROFILE "-lstdc++" +#endif void lang_specific_driver (fn, in_argc, in_argv, in_added_libraries) @@ -45,6 +53,9 @@ { int i, j; + /* If non-zero, the user gave us the `-p' or `-pg' flag. */ + int saw_profile_flag = 0; + /* If non-zero, the user gave us the `-v' flag. */ int saw_verbose_flag = 0; @@ -135,6 +146,8 @@ } else if (strcmp (argv[i], "-lc") == 0) args[i] |= WITHLIBC; + else if (strcmp (argv[i], "-pg") == 0 || strcmp (argv[i], "-p") == 0) + saw_profile_flag++; else if (strcmp (argv[i], "-v") == 0) { saw_verbose_flag = 1; @@ -236,14 +249,14 @@ /* Add `-lstdc++' if we haven't already done so. */ if (library) { - arglist[j++] = LIBSTDCXX; + arglist[j++] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX; added_libraries++; } if (saw_math) arglist[j++] = saw_math; else if (library && need_math) { - arglist[j++] = MATH_LIBRARY; + arglist[j++] = saw_profile_flag ? MATH_LIBRARY_PROFILE : MATH_LIBRARY; added_libraries++; } if (saw_libc) ==== //depot/projects/sparc64/contrib/gcc.295/integrate.c#2 (text+ko) ==== @@ -19,6 +19,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc.295/integrate.c,v 1.2 2002/05/01 19:40:55 obrien Exp $ */ + #include "config.h" #include "system.h" @@ -1608,6 +1610,20 @@ if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_NEEDS_CONTEXT) static_chain_value = lookup_static_chain (fndecl); + /* If the inline function has these flags sets, that means that + coresponding global flags should be set for this function. */ + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_CALLS_SETJMP) + current_function_calls_setjmp = 1; + + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_CALLS_LONGJMP) + current_function_calls_longjmp = 1; + + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_HAS_NONLOCAL_LABEL) + current_function_has_nonlocal_label = 1; + + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_USES_CONST_POOL) + current_function_uses_const_pool = 1; + if (GET_CODE (parm_insns) == NOTE && NOTE_LINE_NUMBER (parm_insns) > 0) { ==== //depot/projects/sparc64/contrib/gcc.295/stmt.c#2 (text+ko) ==== @@ -19,6 +19,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc.295/stmt.c,v 1.2 2002/05/01 19:40:55 obrien Exp $ */ + /* This file handles the generation of rtl code from tree structure above the level of expressions, using subroutines in exp*.c and emit-rtl.c. @@ -4027,6 +4029,10 @@ cleanup = protect_with_terminate (cleanup); expand_eh_region_end (cleanup); } + else + { + do_pending_stack_adjust(); + } } if (reachable) ==== //depot/projects/sparc64/contrib/gcc/config/freebsd.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* Base configuration file for all FreeBSD targets. - Copyright (C) 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU CC. @@ -21,116 +21,72 @@ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify their commonalities. - Adapted from /usr/src/contrib/gcc/config/i386/freebsd.h, - /usr/src/contrib/gcc/config/svr4.h & - egcs/gcc/config/i386/freebsd-elf.h by - David O'Brien . */ + Adapted from gcc/config/i386/freebsd-elf.h by + David O'Brien . + Further work by David O'Brien and + Loren J. Rittle . */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 3 23:22:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C11237B41E; Fri, 3 May 2002 23:22:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id 53D3737B419 for ; Fri, 3 May 2002 23:22:06 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 854FBA900; Fri, 3 May 2002 23:25:50 -0700 (PDT) Date: Fri, 3 May 2002 23:25:50 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10740 for review Message-ID: <20020503232550.H81190@stylus.haikugeek.com> References: <20020503114625.E81190@stylus.haikugeek.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from julian@elischer.org on Fri, May 03, 2002 at 11:51:28AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > BTW > warning warning... > I redid fork() fo rdiff-reduction.. > it MAY EXPLODE. > I have not checked the locking logic, just done the mechanical > bits. Yeah, I saw that. Right now I'm going through and double-checking everything. -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 4 0:20:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B67237B41A; Sat, 4 May 2002 00:20:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38]) by hub.freebsd.org (Postfix) with ESMTP id 47B7537B41A; Sat, 4 May 2002 00:20:09 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc51.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020504072008.HZQA9799.rwcrmhc51.attbi.com@InterJet.elischer.org>; Sat, 4 May 2002 07:20:08 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id AAA86285; Sat, 4 May 2002 00:19:22 -0700 (PDT) Date: Sat, 4 May 2002 00:19:21 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10740 for review In-Reply-To: <20020503232550.H81190@stylus.haikugeek.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 3 May 2002, Jonathan Mini wrote: > Julian Elischer [julian@elischer.org] wrote : > > > BTW > > warning warning... > > I redid fork() fo rdiff-reduction.. > > it MAY EXPLODE. > > I have not checked the locking logic, just done the mechanical > > bits. > > Yeah, I saw that. Right now I'm going through and double-checking > everything. I know that the call to thread_single() will panic in a KSE process because it does an assert that the process is locked, and in the new version it isn't. I was going to ask jhb to look at it and decide where the locking would best be fiddled to extend it to cover this call.. I'm not absolutly sure yet that I got all the added bits from theold one.. that's the problem with the old one.. it was so big a change that it obfuscated teh functional diffs to the point where even I am not sure what they were.. :-( > > -- > Jonathan Mini > http://www.haikugeek.com > > "He who is not aware of his ignorance will be only misled by his knowledge." > -- Richard Whatley > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 4 3:45:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D81037B417; Sat, 4 May 2002 03:45:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 43B1637B400 for ; Sat, 4 May 2002 03:45:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g44AjMV99387 for perforce@freebsd.org; Sat, 4 May 2002 03:45:22 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sat, 4 May 2002 03:45:22 -0700 (PDT) Message-Id: <200205041045.g44AjMV99387@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 10776 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10776 Change 10776 by mini@mini_stylus on 2002/05/04 03:45:07 Don't lock twice. Affected files ... ... //depot/projects/kse/sys/kern/subr_trap.c#51 edit Differences ... ==== //depot/projects/kse/sys/kern/subr_trap.c#51 (text+ko) ==== @@ -239,7 +239,6 @@ * XXX should move PS_PROFIL to a place that can obviously be * accessed safely without sched_lock. */ - mtx_lock_spin(&sched_lock); /* XXX check if proc lock is enough */ if (p->p_sflag & PS_PROFIL) { quad_t ticks; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 4 3:57:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51BDB37B404; Sat, 4 May 2002 03:57:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 809C837B400 for ; Sat, 4 May 2002 03:57:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g44AvcD01620 for perforce@freebsd.org; Sat, 4 May 2002 03:57:38 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sat, 4 May 2002 03:57:38 -0700 (PDT) Message-Id: <200205041057.g44AvcD01620@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 10777 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10777 Change 10777 by mini@mini_stylus on 2002/05/04 03:57:12 Panic if thread_exit() returns, to act more like -CURRENT. Affected files ... ... //depot/projects/kse/sys/kern/kern_exit.c#43 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_exit.c#43 (text+ko) ==== @@ -491,6 +491,7 @@ * This will also release this thread's reference to the ucred. */ thread_exit(); + panic("exit1"); } #ifdef COMPAT_43 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 4 3:59:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3563E37B41B; Sat, 4 May 2002 03:59:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6D06937B41A for ; Sat, 4 May 2002 03:59:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g44Axfc02100 for perforce@freebsd.org; Sat, 4 May 2002 03:59:41 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sat, 4 May 2002 03:59:41 -0700 (PDT) Message-Id: <200205041059.g44Axfc02100@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 10778 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10778 Change 10778 by mini@mini_stylus on 2002/05/04 03:59:35 - Obtain PROC_LOCK when funneling through thread_single() and thread_single_end(). - For now, we know that thread_alloc() always succeeds, so don't check for failure and abort (the abort code was incorrect anyways). - Add jhb's race comment, although its not entirely accurate. Affected files ... ... //depot/projects/kse/sys/kern/kern_fork.c#65 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_fork.c#65 (text+ko) ==== @@ -289,10 +289,13 @@ * be aborted in the child. * (it is possible we could restart them there as well!) */ + PROC_LOCK(p1); if (thread_single(SNGLE_WAIT)) { /* abort.. someone else is single threading before us */ + PROC_UNLOCK(p1); return (ERESTART); } + PROC_UNLOCK(p1); /* * All other activity in this process * is now suspended at the user boundary, @@ -315,9 +318,12 @@ if ((nprocs >= maxproc - 10 && uid != 0) || nprocs >= maxproc) { sx_xunlock(&allproc_lock); uma_zfree(proc_zone, newproc); + if (p1->p_flag & P_KSES) { + PROC_LOCK(p1); + thread_single_end(); + PROC_UNLOCK(p1); + } tsleep(&forksleep, PUSER, "fork", hz / 2); - if (p1->p_flag & P_KSES) - thread_single_end(); return (EAGAIN); } /* @@ -332,8 +338,11 @@ sx_xunlock(&allproc_lock); uma_zfree(proc_zone, newproc); tsleep(&forksleep, PUSER, "fork", hz / 2); - if (p1->p_flag & P_KSES) + if (p1->p_flag & P_KSES) { + PROC_LOCK(p1); thread_single_end(); + PROC_UNLOCK(p1); + } return (EAGAIN); } @@ -459,14 +468,6 @@ * then copy the section that is copied directly from the parent. */ td2 = thread_alloc(); - if (td2 == NULL) { - /* XXX need to take out of pid hash I think */ - uma_zfree(proc_zone, p2); - nprocs--; - if (p1->p_flag & P_KSES) - thread_single_end(); - return (EAGAIN); - } ke2 = &p2->p_kse; kg2 = &p2->p_ksegrp; @@ -670,6 +671,19 @@ PROC_UNLOCK(p2); sx_xunlock(&proctree_lock); + /* + * XXXKSE: In KSE, there would be a race here if one thread was + * dieing due to a signal (or calling exit1() for that matter) while + * another thread was calling fork1(). Not sure how KSE wants to work + * around that. The problem is that up until the point above, if p1 + * gets killed, it won't find p2 in its list in order for it to be + * reparented. Alternatively, we could add a new p_flag that gets set + * before we reparent all the children that we check above and just + * use init as our parent if that if that flag is set. (Either that + * or abort the fork if the flag is set since our parent died trying + * to fork us (which is evil)). + */ + KASSERT(newprocsig == NULL, ("unused newprocsig")); if (newsigacts != NULL) FREE(newsigacts, M_SUBPROC); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 4 4: 6:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C28537B41D; Sat, 4 May 2002 04:06:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id EF53637B41C for ; Sat, 4 May 2002 04:06:42 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 77AFEA900; Sat, 4 May 2002 04:10:23 -0700 (PDT) Date: Sat, 4 May 2002 04:10:23 -0700 From: Jonathan Mini To: Perforce Change Reviews Subject: Re: PERFORCE change 10778 for review Message-ID: <20020504041023.N81190@stylus.haikugeek.com> References: <200205041059.g44Axfc02100@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <200205041059.g44Axfc02100@freefall.freebsd.org>; from mini@freebsd.org on Sat, May 04, 2002 at 03:59:41AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG With this change, the diff for kern_fork.c should integrate without handholding now. Also, as of this change, the KSE branch once again makes it to userland. The ksetest program works again, although I am still often seeing page faults in various areas of the KSE code. Jonathan Mini [mini@freebsd.org] wrote : > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10778 > > Change 10778 by mini@mini_stylus on 2002/05/04 03:59:35 > > - Obtain PROC_LOCK when funneling through thread_single() and > thread_single_end(). > - For now, we know that thread_alloc() always succeeds, so don't > check for failure and abort (the abort code was incorrect anyways). > - Add jhb's race comment, although its not entirely accurate. > > Affected files ... > > ... //depot/projects/kse/sys/kern/kern_fork.c#65 edit > > Differences ... > > ==== //depot/projects/kse/sys/kern/kern_fork.c#65 (text+ko) ==== > > @@ -289,10 +289,13 @@ > * be aborted in the child. > * (it is possible we could restart them there as well!) > */ > + PROC_LOCK(p1); > if (thread_single(SNGLE_WAIT)) { > /* abort.. someone else is single threading before us */ > + PROC_UNLOCK(p1); > return (ERESTART); > } > + PROC_UNLOCK(p1); > /* > * All other activity in this process > * is now suspended at the user boundary, > @@ -315,9 +318,12 @@ > if ((nprocs >= maxproc - 10 && uid != 0) || nprocs >= maxproc) { > sx_xunlock(&allproc_lock); > uma_zfree(proc_zone, newproc); > + if (p1->p_flag & P_KSES) { > + PROC_LOCK(p1); > + thread_single_end(); > + PROC_UNLOCK(p1); > + } > tsleep(&forksleep, PUSER, "fork", hz / 2); > - if (p1->p_flag & P_KSES) > - thread_single_end(); > return (EAGAIN); > } > /* > @@ -332,8 +338,11 @@ > sx_xunlock(&allproc_lock); > uma_zfree(proc_zone, newproc); > tsleep(&forksleep, PUSER, "fork", hz / 2); > - if (p1->p_flag & P_KSES) > + if (p1->p_flag & P_KSES) { > + PROC_LOCK(p1); > thread_single_end(); > + PROC_UNLOCK(p1); > + } > return (EAGAIN); > } > > @@ -459,14 +468,6 @@ > * then copy the section that is copied directly from the parent. > */ > td2 = thread_alloc(); > - if (td2 == NULL) { > - /* XXX need to take out of pid hash I think */ > - uma_zfree(proc_zone, p2); > - nprocs--; > - if (p1->p_flag & P_KSES) > - thread_single_end(); > - return (EAGAIN); > - } > ke2 = &p2->p_kse; > kg2 = &p2->p_ksegrp; > > @@ -670,6 +671,19 @@ > PROC_UNLOCK(p2); > sx_xunlock(&proctree_lock); > > + /* > + * XXXKSE: In KSE, there would be a race here if one thread was > + * dieing due to a signal (or calling exit1() for that matter) while > + * another thread was calling fork1(). Not sure how KSE wants to work > + * around that. The problem is that up until the point above, if p1 > + * gets killed, it won't find p2 in its list in order for it to be > + * reparented. Alternatively, we could add a new p_flag that gets set > + * before we reparent all the children that we check above and just > + * use init as our parent if that if that flag is set. (Either that > + * or abort the fork if the flag is set since our parent died trying > + * to fork us (which is evil)). > + */ > + > KASSERT(newprocsig == NULL, ("unused newprocsig")); > if (newsigacts != NULL) > FREE(newsigacts, M_SUBPROC); -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 4 4:20:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5573937B421; Sat, 4 May 2002 04:20:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39]) by hub.freebsd.org (Postfix) with ESMTP id C088C37B420; Sat, 4 May 2002 04:20:10 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc53.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020504112010.NAPB5896.rwcrmhc53.attbi.com@InterJet.elischer.org>; Sat, 4 May 2002 11:20:10 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id EAA87041; Sat, 4 May 2002 04:14:02 -0700 (PDT) Date: Sat, 4 May 2002 04:14:01 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10778 for review In-Reply-To: <20020504041023.N81190@stylus.haikugeek.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, 4 May 2002, Jonathan Mini wrote: > With this change, the diff for kern_fork.c should integrate without handholding > now. > > Also, as of this change, the KSE branch once again makes it to userland. The > ksetest program works again, although I am still often seeing page faults > in various areas of the KSE code. We are probably missing something.. I never had any pagefaults before.. (though I was not on an MP machine) I've been trying to get the diff utility to do the right thing but it consistantly fails.. apparently I'm adding the wrong tag or soemthing.. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 4 4:48: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D1B237B405; Sat, 4 May 2002 04:47:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id 08ED037B41D for ; Sat, 4 May 2002 04:47:57 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id F1C8EA900; Sat, 4 May 2002 04:51:36 -0700 (PDT) Date: Sat, 4 May 2002 04:51:36 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10778 for review Message-ID: <20020504045136.P81190@stylus.haikugeek.com> References: <20020504041023.N81190@stylus.haikugeek.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from julian@elischer.org on Sat, May 04, 2002 at 04:14:01AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > We are probably missing something.. > I never had any pagefaults before.. > (though I was not on an MP machine) I am not running this on an MP machine. This is the setup of my test box: CPU: AMD-K6(tm) 3D processor (400.91-MHz 586-class CPU) Origin = "AuthenticAMD" Id = 0x58c Stepping = 12 Features=0x8021bf AMD Features=0x80000800 real memory = 134217728 (131072K bytes) pcib0: at pcibus 0 on motherboard fxp0: port 0xe000-0xe01f mem 0xe4000000-0xe40fffff,0xe4101000-0xe4101fff irq 10 at device 14.0 on pci0 ata0: at 0x1f0 irq 14 on atapci0 ad0: 28629MB [58168/16/63] at ata0-master UDMA33 sio0: type 16550A, console A bit overkill for this testing, but it was my main system before I bought the dual Althon 1900 system I'm using for a workstation. > I've been trying to get the diff utility to do the right thing but it > consistantly fails.. > > apparently I'm adding the wrong tag or soemthing.. I dunno, this is all fscked up. -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 4 5:56:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 683FA37B404; Sat, 4 May 2002 05:56:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7ED1837B417 for ; Sat, 4 May 2002 05:56:14 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g44CuEl72375 for perforce@freebsd.org; Sat, 4 May 2002 05:56:14 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sat, 4 May 2002 05:56:14 -0700 (PDT) Message-Id: <200205041256.g44CuEl72375@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 10786 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10786 Change 10786 by mini@mini_stylus on 2002/05/04 05:55:43 After freeing td_ucred, set it to NULL so that we know we've released our refcount and don't do it again. Affected files ... ... //depot/projects/kse/sys/kern/kern_exit.c#44 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_exit.c#44 (text+ko) ==== @@ -375,6 +375,7 @@ * in theory nothing should be using it at this point. */ crfree(td->td_ucred); + td->td_ucred = NULL; /* * Remove proc from allproc queue and pidhash chain. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 4 6:30: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A51E537B41D; Sat, 4 May 2002 06:29:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E91CA37B41C for ; Sat, 4 May 2002 06:29:55 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g44DTtU81768 for perforce@freebsd.org; Sat, 4 May 2002 06:29:55 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sat, 4 May 2002 06:29:55 -0700 (PDT) Message-Id: <200205041329.g44DTtU81768@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 10787 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10787 Change 10787 by mini@mini_stylus on 2002/05/04 06:29:36 tsleep() just before we bail, to act more like current. Affected files ... ... //depot/projects/kse/sys/kern/kern_fork.c#66 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_fork.c#66 (text+ko) ==== @@ -337,12 +337,12 @@ if (!ok) { sx_xunlock(&allproc_lock); uma_zfree(proc_zone, newproc); - tsleep(&forksleep, PUSER, "fork", hz / 2); if (p1->p_flag & P_KSES) { PROC_LOCK(p1); thread_single_end(); PROC_UNLOCK(p1); } + tsleep(&forksleep, PUSER, "fork", hz / 2); return (EAGAIN); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 4 7:34:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45DFB37B41D; Sat, 4 May 2002 07:34:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6D3C237B41C for ; Sat, 4 May 2002 07:34:14 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g44EYEb29072 for perforce@freebsd.org; Sat, 4 May 2002 07:34:14 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sat, 4 May 2002 07:34:14 -0700 (PDT) Message-Id: <200205041434.g44EYEb29072@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 10789 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10789 Change 10789 by mini@mini_stylus on 2002/05/04 07:33:45 Don't initialize p_sflag twice. Affected files ... ... //depot/projects/kse/sys/kern/kern_fork.c#67 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_fork.c#67 (text+ko) ==== @@ -429,7 +429,6 @@ p2 = newproc; p2->p_state = PRS_NEW; /* protect against others */ - p2->p_sflag = PS_INMEM; p2->p_pid = trypid; LIST_INSERT_HEAD(&allproc, p2, p_list); LIST_INSERT_HEAD(PIDHASH(p2->p_pid), p2, p_hash); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 4 9:23:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96E8837B400; Sat, 4 May 2002 09:22:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9504537B41B for ; Sat, 4 May 2002 09:22:27 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g44GMQr46278 for perforce@freebsd.org; Sat, 4 May 2002 09:22:26 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 4 May 2002 09:22:26 -0700 (PDT) Message-Id: <200205041622.g44GMQr46278@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10794 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10794 Change 10794 by peter@peter_thunder on 2002/05/04 09:21:41 IFC @10793 Affected files ... ... //depot/projects/ia64/MAINTAINERS#3 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#3 integrate ... //depot/projects/ia64/lib/libc/stdtime/localtime.c#3 integrate ... //depot/projects/ia64/libexec/rexecd/rexecd.c#5 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#12 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 integrate ... //depot/projects/ia64/sbin/savecore/savecore.c#11 integrate ... //depot/projects/ia64/share/man/man4/wi.4#3 integrate ... //depot/projects/ia64/share/man/man9/VOP_ATTRIB.9#5 integrate ... //depot/projects/ia64/sys/alpha/conf/GENERIC#9 integrate ... //depot/projects/ia64/sys/dev/drm/drm_fops.h#2 integrate ... //depot/projects/ia64/sys/dev/md/md.c#8 integrate ... //depot/projects/ia64/sys/dev/mii/acphy.c#5 integrate ... //depot/projects/ia64/sys/dev/mii/amphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/brgphy.c#5 integrate ... //depot/projects/ia64/sys/dev/mii/dcphy.c#5 integrate ... //depot/projects/ia64/sys/dev/mii/e1000phy.c#3 integrate ... //depot/projects/ia64/sys/dev/mii/lxtphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/mii_physubr.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/miivar.h#4 integrate ... //depot/projects/ia64/sys/dev/mii/mlphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/nsgphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/nsphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/qsphy.c#5 integrate ... //depot/projects/ia64/sys/dev/mii/rlphy.c#6 integrate ... //depot/projects/ia64/sys/dev/mii/tdkphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/tlphy.c#4 integrate ... //depot/projects/ia64/sys/dev/mii/xmphy.c#4 integrate ... //depot/projects/ia64/sys/dev/nge/if_nge.c#8 integrate ... //depot/projects/ia64/sys/dev/syscons/syscons.c#7 integrate ... //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#9 integrate ... //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate ... //depot/projects/ia64/sys/i386/conf/GENERIC#11 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#19 integrate ... //depot/projects/ia64/sys/isofs/cd9660/cd9660_bmap.c#2 integrate ... //depot/projects/ia64/sys/isofs/cd9660/cd9660_util.c#2 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#19 integrate ... //depot/projects/ia64/sys/kern/kern_exit.c#12 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#14 integrate ... //depot/projects/ia64/sys/kern/kern_prot.c#14 integrate ... //depot/projects/ia64/sys/kern/kern_tc.c#9 integrate ... //depot/projects/ia64/sys/kern/vfs_aio.c#13 integrate ... //depot/projects/ia64/sys/pc98/conf/GENERIC#10 integrate ... //depot/projects/ia64/sys/pci/if_dc.c#10 integrate ... //depot/projects/ia64/sys/sparc64/conf/GENERIC#10 integrate ... //depot/projects/ia64/sys/sys/timetc.h#6 integrate ... //depot/projects/ia64/sys/tools/vnode_if.awk#2 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#4 integrate ... //depot/projects/ia64/sys/ufs/ufs/extattr.h#2 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#5 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_inode.c#3 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#9 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#14 integrate ... //depot/projects/ia64/sys/vm/vm_mmap.c#6 integrate ... //depot/projects/ia64/tools/regression/usr.bin/xargs/regress.I.out#2 integrate ... //depot/projects/ia64/tools/regression/usr.bin/xargs/regress.R.out#1 branch ... //depot/projects/ia64/tools/regression/usr.bin/xargs/regress.sh#3 integrate ... //depot/projects/ia64/usr.bin/at/at.man#5 integrate ... //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#11 integrate ... //depot/projects/ia64/usr.bin/m4/eval.c#4 integrate ... //depot/projects/ia64/usr.bin/m4/expr.c#5 integrate ... //depot/projects/ia64/usr.bin/m4/look.c#4 integrate ... //depot/projects/ia64/usr.bin/m4/main.c#5 integrate ... //depot/projects/ia64/usr.bin/m4/misc.c#4 integrate ... //depot/projects/ia64/usr.bin/m4/trace.c#3 integrate ... //depot/projects/ia64/usr.bin/xargs/strnsubst.c#3 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.c#9 integrate ... //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#6 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/info.h#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/main.c#4 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/perform.c#3 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/pkg_info.1#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/show.c#4 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/lib.h#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/plist.c#3 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.22 2002/04/25 16:43:58 des Exp $ +$FreeBSD: src/MAINTAINERS,v 1.23 2002/05/03 21:02:42 phk Exp $ subsystem login notes ----------------------------- @@ -26,7 +26,6 @@ struct disk phk Pre-commit review requested. specfs phk Pre-commit review requested. devfs phk Pre-commit review requested. -geom phk Pre-commit review requested. timekeeping phk Pre-commit review requested. md(4) phk Pre-commit review requested. aac scottl Pre-commit review requested ==== //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#3 (text) ==== @@ -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_configure.c#2 $ + * $P4: //depot/projects/openpam/lib/openpam_configure.c#3 $ */ #include @@ -257,7 +257,7 @@ openpam_configure(pam_handle_t *pamh, const char *service) { - pam_chain_t *other[PAM_NUM_CHAINS]; + pam_chain_t *other[PAM_NUM_CHAINS] = { 0 }; int i, n, r; /* try own configuration first */ ==== //depot/projects/ia64/lib/libc/stdtime/localtime.c#3 (text+ko) ==== @@ -9,7 +9,7 @@ #endif /* !defined NOID */ #endif /* !defined lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.30 2002/03/22 21:53:13 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.31 2002/05/03 17:28:28 wollman Exp $"); /* ** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu). @@ -316,8 +316,10 @@ return -1; if ((fid = _open(name, OPEN_MODE)) == -1) return -1; - if ((_fstat(fid, &stab) < 0) || !S_ISREG(stab.st_mode)) + if ((_fstat(fid, &stab) < 0) || !S_ISREG(stab.st_mode)) { + _close(fid); return -1; + } } { struct tzhead * tzhp; ==== //depot/projects/ia64/libexec/rexecd/rexecd.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)rexecd.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/rexecd/rexecd.c,v 1.29 2002/05/02 05:06:32 des Exp $"; + "$FreeBSD: src/libexec/rexecd/rexecd.c,v 1.30 2002/05/03 13:12:06 des Exp $"; #endif /* not lint */ #include @@ -80,20 +80,12 @@ struct sockaddr_storage asin; -void doit(struct sockaddr *); -void getstr(char *, int, char *); -void error(const char *fmt, ...); -void pam_fail(void); +static void doit(struct sockaddr *); +static void getstr(char *, int, char *); +static void error(const char *fmt, ...); int no_uid_0 = 1; -void -usage(void) -{ - syslog(LOG_ERR, "usage: rexecd [-i]"); - exit(1); -} - /* * remote execute server: * username\0 @@ -117,7 +109,8 @@ no_uid_0 = 0; break; default: - usage(); + syslog(LOG_ERR, "usage: rexecd [-i]"); + exit(1); } argc -= optind; argv += optind; @@ -133,7 +126,7 @@ return(0); } -void +static void doit(struct sockaddr *fromp) { char cmdbuf[NCARGS+1], *cp; @@ -292,7 +285,7 @@ err(1, "%s", pwd->pw_shell); } -void +static void error(const char *fmt, ...) { char buf[BUFSIZ]; @@ -305,7 +298,7 @@ va_end(ap); } -void +static void getstr(char *buf, int cnt, char *err) { char c; ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#12 (text+ko) ==== @@ -31,7 +31,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.86 2002/04/28 04:49:19 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.87 2002/05/03 22:41:35 bmah Exp $ Supported Devices @@ -1745,7 +1745,9 @@ Gigabit Ethernet NICs based on the Intel 82542 and 82543 - controller chips (&man.gx.4; and &man.em.4; drivers) + controller chips (&man.gx.4; and &man.em.4; drivers), plus NICs + supported by the Intel 82540EM and 82544 controller chips + (&man.em.4; driver only) Intel PRO/1000 Gigabit Ethernet ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.337 2002/04/30 19:40:22 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.338 2002/05/03 22:18:30 bmah Exp $ 2000 @@ -488,7 +488,7 @@ The CPU_ATHLON_SSE_HACK kernel option has been added, which attempts to enable the SSE feature bit on newer Athlon CPUs if the BIOS has forgotten to - enable it. + enable it. &merged; The UltraSPARC platform is now supported by &os;. The following machines are supported to at least some @@ -497,6 +497,12 @@ Ultra 2, Ultra 60, Enterprise 220R, and Enterprise 420R. + On some systems, the BIOS does not activate + the I/O ports and memory of PC devices, thus making them + unusable. The PCI_ENABLE_IO_MODES kernel + option forces &os; to enable these devices so that they can be + used. &merged; + @@ -984,7 +990,7 @@ The ephemeral port range used for TCP and UDP has been changed to 49152–65535 (the old default was 1024–5000). This increases the number of concurrent - outgoing connections/streams. &merged; + outgoing connections/streams. @@ -1350,6 +1356,14 @@ The ich sound driver now support the SiS 7012 chipset. &merged; + Drivers have been added to support the Direct + Rendering Infrastructure, which can used to provide 3D + acceleration within XFree86. Video + cards supported include the 3Dlabs Oxygen GMX 2000 (gammadrm), + AGP Matrox G200/G400/G450/G550 (mgadrm), 3dfx Voodoo + 3/4/5/Banshee (tdfxdrm), AGI ATI Rage 128 (r128drm), and AGP + ATI Radeon (radeondrm). + @@ -1870,6 +1884,9 @@ A number of buffer overflows in &man.config.8; have been fixed. &merged; + A new &man.csplit.1; utility, which splits files based on + context, has been added. + &man.ctags.1; no longer creates a corrupt tags file if the source file used // (C++-style) comments. &merged; @@ -2375,6 +2392,10 @@ /etc/rc.conf to the default options in /etc/defaults/rc.conf. &merged; + &man.mk.cmds.1; and the associated + libss have been removed; they have been + unused for quite some time. &merged; + &man.moused.8; now takes a option to control mouse acceleration. &merged; @@ -2776,6 +2797,10 @@ &man.sysinstall.8; no longer mounts the &man.procfs.5; filesystem by default on new installs. + &man.sysinstall.8; now has rudimentary support for + retrieving packages from the correct volume of a multiple-volume + installation (such as a multi-CD distribution). &merged; + &man.syslogd.8; can take a option to disable DNS queries for every request. &merged; @@ -3059,7 +3084,7 @@ lukemftpd, has been imported and is available as &man.lukemftpd.8;. - &man.m4.1; has been imported from OpenBSD, as of 19 April + &man.m4.1; has been imported from OpenBSD, as of 26 April 2002. ncurses has been updated to @@ -3069,7 +3094,7 @@ been updated to 4.1.0. &merged; OpenPAM - (Cineraria release) has been imported, + (Cinnamon release) has been imported, replacing Linux-PAM. ==== //depot/projects/ia64/sbin/savecore/savecore.c#11 (text+ko) ==== @@ -34,17 +34,20 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/savecore/savecore.c,v 1.57 2002/04/21 07:18:16 charnier Exp $"); +__FBSDID("$FreeBSD: src/sbin/savecore/savecore.c,v 1.58 2002/05/04 10:36:35 mux Exp $"); #include #include #include +#include +#include #include #include #include #include #include #include +#include #include #include #include @@ -52,7 +55,7 @@ #include int clear, force, keep, verbose; /* flags */ -int nfound, nsaved; /* statistics */ +int nfound, nsaved, nerr; /* statistics */ static void printheader(FILE *f, const struct kerneldumpheader *h, const char *device, @@ -78,9 +81,58 @@ fflush(f); } +/* + * Check that sufficient space is available on the disk that holds the + * save directory. + */ +static int +check_space(char *savedir, off_t dumpsize) +{ + FILE *fp; + const char *tkernel; + off_t minfree, spacefree, totfree, kernelsize, needed; + struct stat st; + struct statfs fsbuf; + char buf[100], path[MAXPATHLEN]; + tkernel = getbootfile(); + if (stat(tkernel, &st) < 0) + err(1, "%s", tkernel); + kernelsize = st.st_blocks * S_BLKSIZE; + + if (statfs(savedir, &fsbuf) < 0) + err(1, "%s", savedir); + spacefree = ((off_t) fsbuf.f_bavail * fsbuf.f_bsize) / 1024; + totfree = ((off_t) fsbuf.f_bfree * fsbuf.f_bsize) / 1024; + + (void)snprintf(path, sizeof(path), "%s/minfree", savedir); + if ((fp = fopen(path, "r")) == NULL) + minfree = 0; + else { + if (fgets(buf, sizeof(buf), fp) == NULL) + minfree = 0; + else + minfree = atoi(buf); + (void)fclose(fp); + } + + needed = (dumpsize + kernelsize) / 1024; + if (((minfree > 0) ? spacefree : totfree) - needed < minfree) { + warnx("no dump, not enough free space on device" + " (%lld available, need %lld)", + (long long)(minfree > 0 ? spacefree : totfree), + (long long)needed); + return (0); + } + if (spacefree - needed < 0) + warnx("dump performed, but free space threshold crossed"); + return (1); +} + + + static void -DoFile(const char *device) +DoFile(char *savedir, const char *device) { struct kerneldumpheader kdhf, kdhl; char buf[BUFSIZ]; @@ -139,6 +191,7 @@ if (kerneldump_parity(&kdhl)) { warnx("parity error on last dump header on %s", device); + nerr++; goto closefd; } dumpsize = dtoh64(kdhl.dumplength); @@ -148,10 +201,12 @@ if (error != sizeof kdhf) { warn("error reading first dump header at offset %lld in %s", (long long)firsthd, device); + nerr++; goto closefd; } if (memcmp(&kdhl, &kdhf, sizeof kdhl)) { warn("first and last dump headers disagree on %s", device); + nerr++; goto closefd; } md5 = MD5Data((unsigned char *)&kdhl, sizeof kdhl, NULL); @@ -170,15 +225,21 @@ } } else if (errno != ENOENT) { warn("error while checking for pre-saved core file"); + nerr++; goto closefd; } + if (!check_space(savedir, dumpsize)) { + nerr++; + goto closefd; + } /* * Create or overwrite any existing files. */ fdinfo = open(buf, O_WRONLY | O_CREAT | O_TRUNC, 0600); if (fdinfo < 0) { warn("%s", buf); + nerr++; goto closefd; } sprintf(buf, "%s.core", md5); @@ -186,6 +247,7 @@ if (fdcore < 0) { warn("%s", buf); close(fdinfo); + nerr++; goto closefd; } info = fdopen(fdinfo, "w"); @@ -194,7 +256,6 @@ printheader(stdout, &kdhl, device, md5); printf("Saving dump to file %s\n", buf); - nsaved++; printheader(info, &kdhl, device, md5); @@ -205,15 +266,18 @@ error = read(fd, buf, wl); if (error != wl) { warn("read error on %s", device); + nerr++; goto closeall; } error = write(fdcore, buf, wl); if (error != wl) { warn("write error on %s.core file", md5); + nerr++; goto closeall; } dumpsize -= wl; } + nsaved++; close(fdinfo); close(fdcore); @@ -253,7 +317,11 @@ { int i, ch, error; struct fstab *fsp; + char *savedir; + savedir = strdup("."); + if (savedir == NULL) + errx(1, "Cannot allocate memory"); while ((ch = getopt(argc, argv, "cdfkN:vz")) != -1) switch(ch) { case 'c': @@ -281,6 +349,7 @@ error = chdir(argv[0]); if (error) err(1, "chdir(%s)", argv[0]); + savedir = argv[0]; argc--; argv++; } @@ -292,18 +361,22 @@ if (strcmp(fsp->fs_vfstype, "swap") && strcmp(fsp->fs_vfstype, "dump")) continue; - DoFile(fsp->fs_spec); + DoFile(savedir, fsp->fs_spec); } } else { for (i = 0; i < argc; i++) - DoFile(argv[i]); + DoFile(savedir, argv[i]); } /* Emit minimal output. */ if (nfound == 0) printf("No dumps found\n"); - else if (nsaved == 0) - printf("No unsaved dumps found\n"); + else if (nsaved == 0) { + if (nerr != 0) + printf("Unsaved dumps found but not saved\n"); + else + printf("No unsaved dumps found\n"); + } return (0); } ==== //depot/projects/ia64/share/man/man4/wi.4#3 (text+ko) ==== @@ -28,10 +28,10 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wi.4,v 1.15 2002/05/02 22:51:40 imp Exp $ -.\" $OpenBSD: wi.4tbl,v 1.9 2002/04/11 20:34:06 millert Exp $ +.\" $FreeBSD: src/share/man/man4/wi.4,v 1.19 2002/05/04 04:59:20 imp Exp $ +.\" $OpenBSD: wi.4tbl,v 1.14 2002/04/29 19:53:50 jsyn Exp $ .\" -.Dd March 29, 2002 +.Dd May 2, 2002 .Dt WI 4 .Os .Sh NAME @@ -49,7 +49,7 @@ .Pp All host/device interaction is via programmed I/O. Supported features include 802.11 and 802.3 frames, power management, BSS, -IBSS, WDS and ad-hoc operation modes. +IBSS, WDS and old-style Lucent ad-hoc operation modes. Cards based on the Intersil PRISM-II and PRISM-2.5 chips also support a host-based access point mode which allows a card to act as a normal access point (with some assistance from the @@ -57,6 +57,7 @@ driver). The Lucent Hermes and Symbol Spectrum24 chipsets do not contain this functionality. +PRISM-II and PRISM-2.5 chips do not support the WDS functionality. .Pp The .Nm @@ -71,7 +72,9 @@ The Lucent WaveLAN/IEEE Bronze cards do not support WEP at all. To enable encryption, use the .Xr wicontrol 8 -utility to set your keys. +utility to set your keys, or use +.Xr ifconfig 8 +as shown below. .Pp By default, the .Nm @@ -81,20 +84,32 @@ .Pp The .Nm -driver also supports an ad-hoc (point-to-point) mode where -the nwid is ignored and stations can communicate amongst -themselves without the aid of an access point. -Note that there are two possible ad-hoc modes. +driver also supports an point-to-point mode where the ssid is +ignored and stations can communicate amongst themselves without the +aid of an access point. +Note that there are two possible point-to-point modes. One mode, referred to as .Dq ad-hoc demo mode , +or +.Dq legacy Lucent ad-hoc mode , predates the IEEE 802.11 specification and so may not interoperate -with cards from other vendors. -The standardized ad-hoc mode, also know as IBSS mode, is not -supported by cards with very old firmware revisions. +with cards from different vendors. +The standardized point-to-point mode, is called IBSS (or confusingly +just ad-hoc mode), but is not supported by cards with very old +firmware revisions. +If your cards supports IBSS mode, it is recommended that you use it in +preference to the +.Dq ad-hoc demo mode +in new installations. .Pp Cards based on the Intersil PRISM-II and PRISM-2.5 chips also have a host-based access point mode which allows the card to act as an access point (base station). +Access points are different than operating in IBSS mode. +They operate in BSS mode. +They allow for easier roaming and bridge all ethernet traffic such +that machines connected via an access point appear to be on the local +ethernet segment. .Pp For more information on configuring this device, see .Xr ifconfig 8 . @@ -118,7 +133,7 @@ Cards in this type of adapter should only be removed when the machine is powered down. .Pp -The following cards are among those supported to by +The following cards are among those supported by the .Nm driver: .Pp @@ -134,7 +149,6 @@ ACTIONTEC HWC01170:Prism-2.5:PCMCIA Addtron AWP-100:Prism-II:PCMCIA Agere Orinoco:Hermes:PCMCIA -Apple Airport:Hermes:macobio Buffalo AirStation:Prism-II:PCMCIA Buffalo AirStation:Prism-II:CF Cabletron RoamAbout:Hermes:PCMCIA @@ -144,6 +158,8 @@ Corega PCCA-11:Prism-II:PCMCIA Corega PCCB-11:Prism-II:PCMCIA Corega CGWLPCIA11:Prism-II:PCI +Dlink DWL520:Prism-2.5:PCI +Dlink DWL650:Prism-2.5:PCMCIA ELSA XI300:Prism-II:PCMCIA ELSA XI800:Prism-II:CF EMTAC A2424i:Prism-II:PCMCIA @@ -151,7 +167,7 @@ Gemtek WL-311:Prism-2.5:PCMCIA Hawking Technology WE110P:Prism-2.5:PCMCIA I-O DATA WN-B11/PCM:Prism-II:PCMCIA -Intel PRO/Wireless 2011:Prism-II:PCMCIA +Intel PRO/Wireless 2011:Spectrum24:PCMCIA Intersil Prism II:Prism-II:PCMCIA Intersil Mini-PCI:Prism-2.5:PCI Linksys Instant Wireless WPC11:Prism-II:PCMCIA @@ -164,8 +180,10 @@ NTT-ME 11Mbps Wireless LAN:Prism-II:PCMCIA Proxim RangeLAN-DS:Prism-II:PCMCIA Samsung MagicLAN SWL-2000N:Prism-II:PCMCIA +Socket Low Power WLAN-CF:Prism-II:CF +SMC 2602 EZ Connect (3.3V):Prism-II:PCI or PCMCIA +SMC 2632 EZ Connect:Prism-II:PCMCIA Symbol Spectrum24:Spectrum24:PCMCIA -SMC 2632 EZ Connect:Prism-II:PCMCIA TDK LAK-CD011WL:Prism-II:PCMCIA .TE .in -\n(dIu @@ -206,26 +224,30 @@ wepkey 0x8736639624 .Ed .Pp -Join an ad-hoc network with network name +Join a Lucent legacy demo ad-hoc network with network name .Dq my_net . .Bd -literal -compact -offset indent # ifconfig wi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e mediaopt adhoc .Ed .Pp -Create an IBBS network with network name +Create an IBSS network with network name .Dq my_net . .Bd -literal -compact -offset indent # ifconfig wi0 inet 192.168.0.20 netmask 0xffffff00 ssid my_net \e - mediaopt create-ibss + mediaopt ibss-master .Ed +Note: The infrastructure for mediaopt ibss-master has not been +committed yet. .Pp -Join an IBBS network with network name +Join an IBSS network with network name .Dq my_net . .Bd -literal -compact -offset indent # ifconfig wi0 inet 192.168.0.22 netmask 0xffffff00 ssid my_net \e mediaopt ibss .Ed +Note: The infrastructure for mediaopt ibss has not been +committed yet. .Pp Create a host-based access point (Prism only): .Bd -literal -compact -offset indent @@ -247,6 +269,8 @@ # sysctl net.link.ether.bridge_cfg="wi0 fxp0" # sysctl net.inet.ip.forwarding=1 .Ed +This will give you approximately the same functionality as an access +point. .Sh DIAGNOSTICS .Bl -diag .It "wi%d: init failed" @@ -287,6 +311,7 @@ newer cards use channel 10 by default. Non-Lucent cards vary, for instance the Addtron cards use channel 11 by default. +Different regulatory domains have different default channels. See .Xr wicontrol 8 for information on how to change the channel. @@ -295,3 +320,6 @@ .Pp Prism2 host-based access point mode has bugs for firmware versions prior to 0.8.3. +.Pp +Lucent cards prior to firmware version 6.0.4 do not support ibss +mode. ==== //depot/projects/ia64/share/man/man9/VOP_ATTRIB.9#5 (text+ko) ==== @@ -26,7 +26,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/share/man/man9/VOP_ATTRIB.9,v 1.16 2002/03/28 12:57:48 dd Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_ATTRIB.9,v 1.17 2002/05/03 20:28:38 rwatson Exp $ .\" .Dd July 24, 1996 .Os @@ -62,19 +62,27 @@ Attributes which are not being modified by .Xr VOP_SETATTR 9 should be set to the value -.Dv VNOVAL . +.Dv VNOVAL ; +.Fn VOP_NULL "" +may be used to clear all the values, and should generally be used to reset +the contents of +.Ar *vap +prior to setting specific values. .Sh LOCKS .Xr VOP_GETATTR 9 expects the vnode to be locked on entry and will leave the vnode locked on return. +The lock type can be either shared or exclusive. .Pp .Xr VOP_SETATTR 9 expects the vnode to be locked on entry and will leave the vnode locked on return. +The lock type must be exclusive. .Sh RETURN VALUES .Xr VOP_GETATTR 9 -returns information about the file in -.Fa *vap . +returns 0 if it was able to retrieve the attribute data via +.Fa *vap , +otherwise an appropriate error is returned. .Xr VOP_SETATTR 9 returns zero if the attributes were changed successfully, otherwise an appropriate error is returned. @@ -151,7 +159,8 @@ .El .Sh SEE ALSO .Xr vnode 9 , -.Xr VOP_ACCESS 9 +.Xr VOP_ACCESS 9 , +.Xr VFS 9 .Sh AUTHORS This man page was written by .An Doug Rabson . ==== //depot/projects/ia64/sys/alpha/conf/GENERIC#9 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.137 2002/04/18 03:44:44 rwatson Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.138 2002/05/03 17:59:21 jmallett Exp $ machine alpha cpu EV4 @@ -74,7 +74,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detects deadlocks and cycles +#options WITNESS #Enable checks to detect deadlocks and cycles # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel ==== //depot/projects/ia64/sys/dev/drm/drm_fops.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * Daryll Strauss * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.3 2002/04/29 18:18:42 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.4 2002/05/03 07:45:26 tanimura Exp $ */ #define __NO_VERSION__ @@ -315,7 +315,7 @@ DRM_DEBUG("dev->buf_sigio=%p\n", dev->buf_sigio); if (dev->buf_sigio) { DRM_DEBUG("dev->buf_sigio->sio_pgid=%d\n", dev->buf_sigio->sio_pgid); - pgsigio(dev->buf_sigio, SIGIO, 0); + pgsigio(&dev->buf_sigio, SIGIO, 0); } DRM_DEBUG("waking\n"); wakeup(&dev->buf_rp); ==== //depot/projects/ia64/sys/dev/md/md.c#8 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.57 2002/03/20 09:55:07 jeff Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.58 2002/05/03 17:55:10 phk Exp $ * */ @@ -609,18 +609,6 @@ struct nameidata nd; int error, flags; - if (mdio->md_options & MD_AUTOUNIT) { - sc = mdnew(-1); - mdio->md_unit = sc->unit; - } else { - sc = mdnew(mdio->md_unit); - } - if (sc == NULL) - return (EBUSY); - - sc->type = MD_VNODE; - sc->flags = mdio->md_options & MD_FORCE; - flags = FREAD|FWRITE; NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); error = vn_open(&nd, &flags, 0); @@ -628,7 +616,6 @@ if (error != EACCES && error != EPERM && error != EROFS) return (error); flags &= ~FWRITE; - sc->flags |= MD_READONLY; NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); error = vn_open(&nd, &flags, 0); if (error) @@ -642,6 +629,22 @@ return (error ? error : EINVAL); } VOP_UNLOCK(nd.ni_vp, 0, td); + + if (mdio->md_options & MD_AUTOUNIT) { + sc = mdnew(-1); + mdio->md_unit = sc->unit; + } else { + sc = mdnew(mdio->md_unit); + } + if (sc == NULL) { + (void) vn_close(nd.ni_vp, flags, td->td_ucred, td); + return (EBUSY); + } + + sc->type = MD_VNODE; + sc->flags = mdio->md_options & MD_FORCE; + if (!(flags & FWRITE)) + sc->flags |= MD_READONLY; sc->secsize = DEV_BSIZE; sc->vnode = nd.ni_vp; ==== //depot/projects/ia64/sys/dev/mii/acphy.c#5 (text+ko) ==== @@ -89,7 +89,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/acphy.c,v 1.8 2002/05/01 19:15:54 semenu Exp $"; + "$FreeBSD: src/sys/dev/mii/acphy.c,v 1.9 2002/05/04 11:00:30 phk Exp $"; #endif static int acphy_probe (device_t); @@ -213,7 +213,7 @@ if (PHY_READ(sc, MII_BMCR) & BMCR_AUTOEN) return (0); - (void) mii_phy_auto(sc, 1); + (void) mii_phy_auto(sc); break; default: ==== //depot/projects/ia64/sys/dev/mii/amphy.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mii/amphy.c,v 1.9 2002/04/29 13:07:31 phk Exp $ + * $FreeBSD: src/sys/dev/mii/amphy.c,v 1.10 2002/05/04 11:00:30 phk Exp $ */ /* @@ -57,7 +57,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/amphy.c,v 1.9 2002/04/29 13:07:31 phk Exp $"; + "$FreeBSD: src/sys/dev/mii/amphy.c,v 1.10 2002/05/04 11:00:30 phk Exp $"; #endif static int amphy_probe (device_t); @@ -190,7 +190,7 @@ */ if (PHY_READ(sc, MII_BMCR) & BMCR_AUTOEN) return (0); - (void) mii_phy_auto(sc, 1); + (void) mii_phy_auto(sc); break; case IFM_100_T4: /* ==== //depot/projects/ia64/sys/dev/mii/brgphy.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/mii/brgphy.c,v 1.12 2002/04/29 13:07:31 phk Exp $ + * $FreeBSD: src/sys/dev/mii/brgphy.c,v 1.13 2002/05/04 11:00:30 phk Exp $ */ /* @@ -59,7 +59,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.12 2002/04/29 13:07:31 phk Exp $"; + "$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.13 2002/05/04 11:00:30 phk Exp $"; #endif static int brgphy_probe (device_t); @@ -86,8 +86,7 @@ static int brgphy_service(struct mii_softc *, struct mii_data *, int); static void brgphy_status(struct mii_softc *); -static int brgphy_mii_phy_auto(struct mii_softc *, int); -extern void mii_phy_auto_timeout(void *); +static int brgphy_mii_phy_auto(struct mii_softc *); static int brgphy_probe(dev) device_t dev; @@ -228,7 +227,7 @@ if (PHY_READ(sc, BRGPHY_MII_BMCR) & BRGPHY_BMCR_AUTOEN) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 4 19:29: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D98637B417; Sat, 4 May 2002 19:28:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 99FDD37B41A for ; Sat, 4 May 2002 19:28:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g452SlW41643 for perforce@freebsd.org; Sat, 4 May 2002 19:28:47 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sat, 4 May 2002 19:28:47 -0700 (PDT) Message-Id: <200205050228.g452SlW41643@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 10813 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10813 Change 10813 by jake@jake_sparc64 on 2002/05/04 19:28:26 Make a macro for the guts of tl0_immu_miss, like dmmu_miss and prot. Rearrange things slightly so that the contents of the tag access register are read and restored outside of the macros. The intention is to pass the page size to look up as an argument to the macros. Affected files ... ... //depot/projects/sparc64/sys/sparc64/sparc64/exception.s#72 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/sparc64/exception.s#72 (text+ko) ==== @@ -543,19 +543,7 @@ .align 32 .endm - .macro tl0_immu_miss - /* - * Force kernel store order. - */ - wrpr %g0, PSTATE_MMU, %pstate - - /* - * Load the virtual page number and context from the tag access - * register. We ignore the context. - */ - wr %g0, ASI_IMMU, %asi - ldxa [%g0 + AA_IMMU_TAR] %asi, %g2 - + .macro immu_miss_user /* * Extract the virtual page number from the contents of the tag * access register. @@ -623,13 +611,22 @@ andcc %g1, (1 << (TSB_BUCKET_SHIFT + TTE_SHIFT)) - 1, %g0 bnz,a,pt %xcc, 1b nop + .endm + + .macro tl0_immu_miss + /* + * Force kernel store order. + */ + wrpr %g0, PSTATE_MMU, %pstate /* - * Put back the contents of the tag access register, in case we - * faulted. + * Load the virtual page number and context from the tag access + * register. We ignore the context. */ - stxa %g2, [%g0 + AA_IMMU_TAR] %asi - membar #Sync + wr %g0, ASI_IMMU, %asi + ldxa [%g0 + AA_IMMU_TAR] %asi, %g2 + + immu_miss_user b,a %xcc, tl0_immu_miss_trap nop @@ -658,6 +655,13 @@ ENTRY(tl0_immu_miss_trap) /* + * Put back the contents of the tag access register, in case we + * faulted. + */ + stxa %g2, [%g0 + AA_IMMU_TAR] %asi + membar #Sync + + /* * Switch to alternate globals. */ wrpr %g0, PSTATE_ALT, %pstate @@ -678,13 +682,6 @@ .macro dmmu_miss_user /* - * Load the virtual page number and context from the tag access - * register. We ignore the context. - */ - wr %g0, ASI_DMMU, %asi - ldxa [%g0 + AA_DMMU_TAR] %asi, %g2 - - /* * Extract the virtual page number from the contents of the tag * access register. */ @@ -748,13 +745,6 @@ andcc %g1, (1 << (TSB_BUCKET_SHIFT + TTE_SHIFT)) - 1, %g0 bnz,a,pt %xcc, 1b nop - - /* - * Put back the contents of the tag access register, in case we - * faulted. - */ - stxa %g2, [%g0 + AA_DMMU_TAR] %asi - membar #Sync .endm ENTRY(dmmu_miss_user_set_ref) @@ -784,6 +774,13 @@ wrpr %g0, PSTATE_MMU, %pstate /* + * Load the virtual page number and context from the tag access + * register. We ignore the context. + */ + wr %g0, ASI_DMMU, %asi + ldxa [%g0 + AA_DMMU_TAR] %asi, %g2 + + /* * Try a fast inline lookup of the primary tsb. */ dmmu_miss_user @@ -798,6 +795,13 @@ ENTRY(tl0_dmmu_miss_trap) /* + * Put back the contents of the tag access register, in case we + * faulted. + */ + stxa %g2, [%g0 + AA_DMMU_TAR] %asi + membar #Sync + + /* * Switch to alternate globals. */ wrpr %g0, PSTATE_ALT, %pstate @@ -818,13 +822,6 @@ .macro dmmu_prot_user /* - * Load the virtual page number and context from the tag access - * register. We ignore the context. - */ - wr %g0, ASI_DMMU, %asi - ldxa [%g0 + AA_DMMU_TAR] %asi, %g2 - - /* * Extract the virtual page number from the contents of the tag * access register. */ @@ -879,13 +876,6 @@ andcc %g1, (1 << (TSB_BUCKET_SHIFT + TTE_SHIFT)) - 1, %g0 bnz,a,pt %xcc, 1b nop - - /* - * Put back the contents of the tag access register, in case we - * faulted. - */ - stxa %g2, [%g0 + AA_DMMU_TAR] %asi - membar #Sync .endm .macro tl0_dmmu_prot @@ -895,6 +885,13 @@ wrpr %g0, PSTATE_MMU, %pstate /* + * Load the virtual page number and context from the tag access + * register. We ignore the context. + */ + wr %g0, ASI_DMMU, %asi + ldxa [%g0 + AA_DMMU_TAR] %asi, %g2 + + /* * Try a fast inline lookup of the tsb. */ dmmu_prot_user @@ -937,6 +934,13 @@ ENTRY(tl0_dmmu_prot_trap) /* + * Put back the contents of the tag access register, in case we + * faulted. + */ + stxa %g2, [%g0 + AA_DMMU_TAR] %asi + membar #Sync + + /* * Switch to alternate globals. */ wrpr %g0, PSTATE_ALT, %pstate @@ -1330,13 +1334,14 @@ * the virtual page number. */ sllx %g6, 64 - TAR_VPN_SHIFT, %g5 - brnz,pn %g5, tl1_dmmu_miss_user - srlx %g6, TAR_VPN_SHIFT, %g6 + brnz,a,pn %g5, tl1_dmmu_miss_user + mov %g6, %g2 /* * Find the index into the kernel tsb. */ set TSB_KERNEL_MASK, %g4 + srlx %g6, TAR_VPN_SHIFT, %g6 and %g6, %g4, %g3 /* @@ -1404,6 +1409,13 @@ dmmu_miss_user /* + * Put back the contents of the tag access register, in case we + * faulted. + */ + stxa %g2, [%g0 + AA_DMMU_TAR] %asi + membar #Sync + + /* * Switch to alternate globals. */ wrpr %g0, PSTATE_ALT, %pstate @@ -1438,13 +1450,14 @@ * the virtual page number. */ sllx %g6, 64 - TAR_VPN_SHIFT, %g5 - brnz,pn %g5, tl1_dmmu_prot_user - srlx %g6, TAR_VPN_SHIFT, %g6 + brnz,a,pn %g5, tl1_dmmu_prot_user + mov %g6, %g2 /* * Find the index into the kernel tsb. */ set TSB_KERNEL_MASK, %g4 + srlx %g6, TAR_VPN_SHIFT, %g6 and %g6, %g4, %g5 /* @@ -1479,6 +1492,12 @@ stxa %g0, [%g0 + AA_DMMU_SFSR] %asi membar #Sync + ba,a %xcc, tl1_dmmu_prot_cont + nop + .align 128 + .endm + +ENTRY(tl1_dmmu_prot_cont) /* * Set the hardware write bit. */ @@ -1490,8 +1509,7 @@ or %g5, TD_W, %g5 stxa %g5, [%g0] ASI_DTLB_DATA_IN_REG retry - .align 128 - .endm +END(tl1_dmmu_prot_cont) ENTRY(tl1_dmmu_prot_user) /* @@ -1500,6 +1518,13 @@ dmmu_prot_user /* + * Put back the contents of the tag access register, in case we + * faulted. + */ + stxa %g2, [%g0 + AA_DMMU_TAR] %asi + membar #Sync + + /* * Switch to alternate globals. */ wrpr %g0, PSTATE_ALT, %pstate To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 13:36:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9EB337B47E; Sun, 5 May 2002 13:36:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 44DB937B499 for ; Sun, 5 May 2002 13:35:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g45KZiB98842 for perforce@freebsd.org; Sun, 5 May 2002 13:35:44 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 5 May 2002 13:35:44 -0700 (PDT) Message-Id: <200205052035.g45KZiB98842@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10835 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10835 Change 10835 by peter@peter_thunder on 2002/05/05 13:35:18 do not need yet another debug.elf_trace here.. Affected files ... ... //depot/projects/ia64/sys/kern/imgact_elfN.c#2 edit Differences ... ==== //depot/projects/ia64/sys/kern/imgact_elfN.c#2 (text+ko) ==== @@ -37,9 +37,6 @@ #include #include -static int elf_trace = 0; -SYSCTL_INT(_debug, OID_AUTO, elf_trace, CTLFLAG_RW, &elf_trace, 0, ""); - /* * non static, as it can be overridden by start_init() */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 13:36:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4232537B405; Sun, 5 May 2002 13:36:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E8A4337B401 for ; Sun, 5 May 2002 13:36:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g45Kajt99003 for perforce@freebsd.org; Sun, 5 May 2002 13:36:45 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 5 May 2002 13:36:45 -0700 (PDT) Message-Id: <200205052036.g45Kajt99003@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10836 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10836 Change 10836 by peter@peter_thunder on 2002/05/05 13:36:04 attempt to solve: can't re-use a leaf (elf_trace)! can't re-use a leaf (elf_trace)! (ie: duplicate sysctl's) Affected files ... ... //depot/projects/ia64/sys/kern/imgact_elf.c#5 edit Differences ... ==== //depot/projects/ia64/sys/kern/imgact_elf.c#5 (text+ko) ==== @@ -82,7 +82,11 @@ static int __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp); static int elf_trace = 0; -SYSCTL_INT(_debug, OID_AUTO, elf_trace, CTLFLAG_RW, &elf_trace, 0, ""); +#if __ELF_WORD_SIZE == 32 +SYSCTL_INT(_debug, OID_AUTO, elf32_trace, CTLFLAG_RW, &elf_trace, 0, ""); +#else +SYSCTL_INT(_debug, OID_AUTO, elf64_trace, CTLFLAG_RW, &elf_trace, 0, ""); +#endif struct sysentvec __elfN(freebsd_sysvec) = { SYS_MAXSYSCALL, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 13:38:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97B7A37B407; Sun, 5 May 2002 13:38:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CCA0C37B406 for ; Sun, 5 May 2002 13:38:48 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g45Kcmm99192 for perforce@freebsd.org; Sun, 5 May 2002 13:38:48 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 5 May 2002 13:38:48 -0700 (PDT) Message-Id: <200205052038.g45Kcmm99192@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10837 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10837 Change 10837 by peter@peter_thunder on 2002/05/05 13:38:26 try and make this compile after Hashelt moving. Affected files ... ... //depot/projects/ia64/usr.sbin/kldxref/ef.c#5 edit Differences ... ==== //depot/projects/ia64/usr.sbin/kldxref/ef.c#5 (text+ko) ==== @@ -48,6 +48,8 @@ #include "ef.h" +__ElfType(Hashelt); + static void ef_print_phdr(Elf_Phdr *); static u_long ef_get_offset(elf_file_t, Elf_Off); static int ef_parse_dynamic(elf_file_t); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 13:41:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B926C37B406; Sun, 5 May 2002 13:41:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EC6D437B405 for ; Sun, 5 May 2002 13:41:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g45KfqN99536 for perforce@freebsd.org; Sun, 5 May 2002 13:41:52 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 5 May 2002 13:41:52 -0700 (PDT) Message-Id: <200205052041.g45KfqN99536@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10838 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10838 Change 10838 by peter@peter_thunder on 2002/05/05 13:41:31 make this compile after Hashelt/Auxinfo moves. Affected files ... ... //depot/projects/ia64/libexec/rtld-elf/rtld.h#2 edit Differences ... ==== //depot/projects/ia64/libexec/rtld-elf/rtld.h#2 (text+ko) ==== @@ -38,6 +38,9 @@ #include "rtld_machdep.h" +__ElfType(Hashelt); +__ElfType(Auxinfo); + #ifndef STANDARD_LIBRARY_PATH #define STANDARD_LIBRARY_PATH "/usr/lib/elf:/usr/lib" #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 13:43: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C960D37B405; Sun, 5 May 2002 13:42:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DB4C537B40A for ; Sun, 5 May 2002 13:42:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g45KgsW99638 for perforce@freebsd.org; Sun, 5 May 2002 13:42:54 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 5 May 2002 13:42:54 -0700 (PDT) Message-Id: <200205052042.g45KgsW99638@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10840 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10840 Change 10840 by peter@peter_thunder on 2002/05/05 13:42:23 Sigh. Really make this compile. Affected files ... ... //depot/projects/ia64/usr.sbin/kldxref/ef.c#6 edit ... //depot/projects/ia64/usr.sbin/kldxref/ef.h#3 edit Differences ... ==== //depot/projects/ia64/usr.sbin/kldxref/ef.c#6 (text+ko) ==== @@ -48,8 +48,6 @@ #include "ef.h" -__ElfType(Hashelt); - static void ef_print_phdr(Elf_Phdr *); static u_long ef_get_offset(elf_file_t, Elf_Off); static int ef_parse_dynamic(elf_file_t); ==== //depot/projects/ia64/usr.sbin/kldxref/ef.h#3 (text+ko) ==== @@ -3,6 +3,8 @@ #ifndef _EF_H_ #define _EF_H_ +__ElfType(Hashelt); + #define EFT_KLD 1 #define EFT_KERNEL 2 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 13:55:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADAD337B400; Sun, 5 May 2002 13:55:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1175237B41F for ; Sun, 5 May 2002 13:55:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g45Kt9S01170 for perforce@freebsd.org; Sun, 5 May 2002 13:55:09 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 5 May 2002 13:55:09 -0700 (PDT) Message-Id: <200205052055.g45Kt9S01170@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 10841 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10841 Change 10841 by marcel@marcel_vaio on 2002/05/05 13:54:28 Prune the branch: We don't need a dummy __cxa_finalize anymore. We now handle weak references to undefined symbols correctly. Affected files ... ... //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#8 edit ... //depot/projects/ia64/lib/libc/ia64/gen/cxa.c#4 delete ... //depot/projects/ia64/sys/ia64/ia64/exception.s#13 edit ... //depot/projects/ia64/sys/ia64/ia64/genassym.c#6 edit ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#36 edit ... //depot/projects/ia64/sys/ia64/include/frame.h#3 edit ... //depot/projects/ia64/sys/ia64/include/reg.h#3 edit Differences ... ==== //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#8 (text+ko) ==== @@ -9,6 +9,3 @@ # The following may go away if function _Unwind_FindTableEntry() # will be part of GCC. SRCS+= unwind.c - -# The following will go away if gcc ever fixes their crtbegin.asm bug -SRCS+= cxa.c ==== //depot/projects/ia64/sys/ia64/ia64/exception.s#13 (text+ko) ==== ==== //depot/projects/ia64/sys/ia64/ia64/genassym.c#6 (text+ko) ==== @@ -92,7 +92,7 @@ ASSYM(TF_CR_IPSR, offsetof(struct trapframe, tf_cr_ipsr)); ASSYM(TF_CR_IFS, offsetof(struct trapframe, tf_cr_ifs)); ASSYM(TF_NDIRTY, offsetof(struct trapframe, tf_ndirty)); -ASSYM(TF_AR_FPSR, offsetof(struct trapframe, tf_ar_fpsr)); +ASSYM(TF_AR_EC, offsetof(struct trapframe, tf_ar_ec)); ASSYM(TF_B, offsetof(struct trapframe, tf_b)); ASSYM(TF_R, offsetof(struct trapframe, tf_r)); ASSYM(TF_R_R1, offsetof(struct trapframe, tf_r[FRAME_R1])); ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#36 (text+ko) ==== @@ -1171,7 +1171,9 @@ struct thread *td; struct reg *regs; { - /* TODO copy trapframe to regs */ + bcopy(td->td_frame->tf_b, regs->r_br, sizeof(regs->r_br)); + bcopy(td->td_frame->tf_r, regs->r_gr+1, + sizeof(regs->r_gr) - sizeof(uint64_t)); return (0); } @@ -1180,7 +1182,8 @@ struct thread *td; struct reg *regs; { - /* TODO copy regs to trapframe */ + bcopy(regs->r_br, td->td_frame->tf_b, sizeof(td->td_frame->tf_b)); + bcopy(regs->r_gr+1, td->td_frame->tf_r, sizeof(td->td_frame->tf_r)); return (0); } ==== //depot/projects/ia64/sys/ia64/include/frame.h#3 (text+ko) ==== ==== //depot/projects/ia64/sys/ia64/include/reg.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ #ifndef _IA64_FPREG_DEFINED struct ia64_fpreg { - u_int64_t fpr_bits[2]; + uint64_t fpr_bits[2]; } __attribute__ ((aligned (16))); #define _IA64_FPREG_DEFINED @@ -40,7 +40,21 @@ #endif struct reg { - u_int64_t r_regs[128]; + uint64_t r_gr[32]; /* No rotating registers */ + uint64_t r_br[8]; + uint64_t r_cfm; + uint64_t r_ip; /* Bits 0-3 encode the slot number */ + uint64_t r_pr; + uint64_t r_psr; /* User mask */ + uint64_t r_ar_rsc; + uint64_t r_ar_bspstore; + uint64_t r_ar_rnat; + uint64_t r_ar_ccv; + uint64_t r_ar_unat; + uint64_t r_ar_fpsr; + uint64_t r_ar_pfs; + uint64_t r_ar_lc; + uint64_t r_ar_ec; }; struct fpreg { @@ -48,8 +62,8 @@ }; struct dbreg { - u_int64_t dbr_data[8]; - u_int64_t dbr_inst[8]; + uint64_t dbr_data[8]; + uint64_t dbr_inst[8]; }; #ifdef _KERNEL To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 13:59:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55E6C37B407; Sun, 5 May 2002 13:59:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by hub.freebsd.org (Postfix) with ESMTP id 89EFD37B408 for ; Sun, 5 May 2002 13:59:48 -0700 (PDT) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.11.6/8.11.4) with ESMTP id g45KxlJ21073 for ; Sun, 5 May 2002 13:59:47 -0700 (PDT) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.3/8.12.2) with ESMTP id g45L0H4E000778 for ; Sun, 5 May 2002 14:00:17 -0700 (PDT) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.3/8.12.3/Submit) id g45L0GOv000777 for perforce@freebsd.org; Sun, 5 May 2002 14:00:16 -0700 (PDT) Date: Sun, 5 May 2002 14:00:11 -0700 From: Marcel Moolenaar To: Perforce Change Reviews Subject: Re: PERFORCE change 10841 for review Message-ID: <20020505210011.GA754@dhcp01.pn.xcllnt.net> References: <200205052055.g45Kt9S01170@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200205052055.g45Kt9S01170@freefall.freebsd.org> User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, May 05, 2002 at 01:55:09PM -0700, Marcel Moolenaar wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10841 > > Change 10841 by marcel@marcel_vaio on 2002/05/05 13:54:28 > > Prune the branch: > We don't need a dummy __cxa_finalize anymore. We now handle > weak references to undefined symbols correctly. > > Affected files ... > > ... //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#8 edit > ... //depot/projects/ia64/lib/libc/ia64/gen/cxa.c#4 delete > ... //depot/projects/ia64/sys/ia64/ia64/exception.s#13 edit > ... //depot/projects/ia64/sys/ia64/ia64/genassym.c#6 edit > ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#36 edit > ... //depot/projects/ia64/sys/ia64/include/frame.h#3 edit > ... //depot/projects/ia64/sys/ia64/include/reg.h#3 edit Whoops! This should only have the first 2 files. I'll double check that what got piggybacked doesn't revert Peter's work (ie it breaks builds)... -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 14: 5:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CED937B409; Sun, 5 May 2002 14:05:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BFFAF37B408 for ; Sun, 5 May 2002 14:05:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g45L5Mt05424 for perforce@freebsd.org; Sun, 5 May 2002 14:05:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 5 May 2002 14:05:22 -0700 (PDT) Message-Id: <200205052105.g45L5Mt05424@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 10842 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10842 Change 10842 by marcel@marcel_vaio on 2002/05/05 14:04:53 Revert change 10841 to this file. It should not have been part of the change. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/genassym.c#7 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/genassym.c#7 (text+ko) ==== @@ -92,7 +92,7 @@ ASSYM(TF_CR_IPSR, offsetof(struct trapframe, tf_cr_ipsr)); ASSYM(TF_CR_IFS, offsetof(struct trapframe, tf_cr_ifs)); ASSYM(TF_NDIRTY, offsetof(struct trapframe, tf_ndirty)); -ASSYM(TF_AR_EC, offsetof(struct trapframe, tf_ar_ec)); +ASSYM(TF_AR_FPSR, offsetof(struct trapframe, tf_ar_fpsr)); ASSYM(TF_B, offsetof(struct trapframe, tf_b)); ASSYM(TF_R, offsetof(struct trapframe, tf_r)); ASSYM(TF_R_R1, offsetof(struct trapframe, tf_r[FRAME_R1])); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 14:15:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2A2337B409; Sun, 5 May 2002 14:15:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fw.wemm.org (12-232-135-171.client.attbi.com [12.232.135.171]) by hub.freebsd.org (Postfix) with ESMTP id AD3C137B403 for ; Sun, 5 May 2002 14:15:49 -0700 (PDT) Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by fw.wemm.org (8.11.6/8.11.6) with ESMTP id g45LFn421184 for ; Sun, 5 May 2002 14:15:49 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 10F2D3811; Sun, 5 May 2002 14:15:49 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Marcel Moolenaar Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10841 for review In-Reply-To: <20020505210011.GA754@dhcp01.pn.xcllnt.net> Date: Sun, 05 May 2002 14:15:49 -0700 From: Peter Wemm Message-Id: <20020505211549.10F2D3811@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Marcel Moolenaar wrote: > On Sun, May 05, 2002 at 01:55:09PM -0700, Marcel Moolenaar wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10841 > > > > Change 10841 by marcel@marcel_vaio on 2002/05/05 13:54:28 > > > > Prune the branch: > > We don't need a dummy __cxa_finalize anymore. We now handle > > weak references to undefined symbols correctly. > > > > Affected files ... > > > > ... //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#8 edit > > ... //depot/projects/ia64/lib/libc/ia64/gen/cxa.c#4 delete > > ... //depot/projects/ia64/sys/ia64/ia64/exception.s#13 edit > > ... //depot/projects/ia64/sys/ia64/ia64/genassym.c#6 edit > > ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#36 edit > > ... //depot/projects/ia64/sys/ia64/include/frame.h#3 edit > > ... //depot/projects/ia64/sys/ia64/include/reg.h#3 edit > > Whoops! This should only have the first 2 files. I'll double check > that what got piggybacked doesn't revert Peter's work (ie it breaks > builds)... It looked mostly harmless. It was fragments of debugger support, right? BTW: p4 diff -du before commit is your friend. BTW2: "p4 submit lib/libc/ia64/gen/..." is also your friend. :-) BTW3: you can edit out the lines in the submit template to not commit those files. ie: if you had noticed and deleted exception.s etc, it would have left them behind, still open. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 14:35: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A3D437B433; Sun, 5 May 2002 14:34:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by hub.freebsd.org (Postfix) with ESMTP id 1A81837B40A for ; Sun, 5 May 2002 14:34:29 -0700 (PDT) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.11.6/8.11.4) with ESMTP id g45LYLJ21180; Sun, 5 May 2002 14:34:21 -0700 (PDT) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.3/8.12.2) with ESMTP id g45LYp4E000861; Sun, 5 May 2002 14:34:51 -0700 (PDT) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.3/8.12.3/Submit) id g45LYpVM000860; Sun, 5 May 2002 14:34:51 -0700 (PDT) Date: Sun, 5 May 2002 14:34:51 -0700 From: Marcel Moolenaar To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10841 for review Message-ID: <20020505213451.GB754@dhcp01.pn.xcllnt.net> References: <20020505210011.GA754@dhcp01.pn.xcllnt.net> <20020505211549.10F2D3811@overcee.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020505211549.10F2D3811@overcee.wemm.org> User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, May 05, 2002 at 02:15:49PM -0700, Peter Wemm wrote: > Marcel Moolenaar wrote: > > On Sun, May 05, 2002 at 01:55:09PM -0700, Marcel Moolenaar wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10841 > > > > > > Change 10841 by marcel@marcel_vaio on 2002/05/05 13:54:28 > > > > > > Prune the branch: > > > We don't need a dummy __cxa_finalize anymore. We now handle > > > weak references to undefined symbols correctly. > > > > > > Affected files ... > > > > > > ... //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#8 edit > > > ... //depot/projects/ia64/lib/libc/ia64/gen/cxa.c#4 delete > > > ... //depot/projects/ia64/sys/ia64/ia64/exception.s#13 edit > > > ... //depot/projects/ia64/sys/ia64/ia64/genassym.c#6 edit > > > ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#36 edit > > > ... //depot/projects/ia64/sys/ia64/include/frame.h#3 edit > > > ... //depot/projects/ia64/sys/ia64/include/reg.h#3 edit > > > > Whoops! This should only have the first 2 files. I'll double check > > that what got piggybacked doesn't revert Peter's work (ie it breaks > > builds)... > > It looked mostly harmless. It was fragments of debugger support, right? Yes. Only genassym.c was bogus. A left-over I should have reverted locally days ago... > BTW: p4 diff -du before commit is your friend. > BTW2: "p4 submit lib/libc/ia64/gen/..." is also your friend. :-) > BTW3: you can edit out the lines in the submit template to not commit > those files. ie: if you had noticed and deleted exception.s etc, it > would have left them behind, still open. Ah, ok, thanks. Especially BTW3 is a good feature. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 14:38:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98A8B37B405; Sun, 5 May 2002 14:37:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CB30B37B401 for ; Sun, 5 May 2002 14:37:02 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g45Lb2V08325 for perforce@freebsd.org; Sun, 5 May 2002 14:37:02 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 5 May 2002 14:37:02 -0700 (PDT) Message-Id: <200205052137.g45Lb2V08325@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10846 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10846 Change 10846 by peter@peter_daintree on 2002/05/05 14:36:14 IFC @10845 (pick up savecore changes etc) Affected files ... ... //depot/projects/ia64/bin/ps/fmt.c#4 integrate ... //depot/projects/ia64/etc/periodic/security/100.chksetuid#2 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#24 integrate ... //depot/projects/ia64/sbin/mount_std/mount_std.c#5 integrate ... //depot/projects/ia64/sbin/savecore/Makefile#4 integrate ... //depot/projects/ia64/sbin/savecore/savecore.8#2 integrate ... //depot/projects/ia64/sbin/savecore/savecore.c#12 integrate ... //depot/projects/ia64/share/mk/bsd.kern.mk#2 integrate ... //depot/projects/ia64/sys/dev/sound/pci/ich.c#6 integrate ... //depot/projects/ia64/sys/i386/i386/i386dump.c#2 integrate ... //depot/projects/ia64/sys/i386/isa/ipl.s#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/sal.c#6 integrate ... //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#8 integrate ... //depot/projects/ia64/sys/ia64/include/mca.h#3 integrate ... //depot/projects/ia64/sys/ia64/include/md_var.h#3 integrate ... //depot/projects/ia64/sys/kern/kern_clock.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_sig.c#13 integrate ... //depot/projects/ia64/sys/kern/vfs_bio.c#13 integrate ... //depot/projects/ia64/sys/kern/vfs_subr.c#10 integrate ... //depot/projects/ia64/sys/kern/vfs_syscalls.c#15 integrate ... //depot/projects/ia64/sys/netinet/ip_dummynet.h#3 integrate ... //depot/projects/ia64/sys/sys/buf.h#7 integrate ... //depot/projects/ia64/sys/sys/kerneldump.h#2 integrate ... //depot/projects/ia64/sys/sys/time.h#8 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_extern.h#4 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#14 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#15 integrate ... //depot/projects/ia64/sys/vm/vm_object.c#9 integrate ... //depot/projects/ia64/sys/vm/vm_object.h#3 integrate ... //depot/projects/ia64/sys/vm/vm_swap.c#7 integrate ... //depot/projects/ia64/tools/regression/usr.bin/make/Makefile#3 integrate ... //depot/projects/ia64/tools/regression/usr.bin/make/regress.sysvmatch.out#1 branch ... //depot/projects/ia64/usr.bin/make/str.c#4 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.1#4 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.c#10 integrate ... //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.8#4 integrate ... //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.sh#4 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/create/perform.c#6 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/main.c#5 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/pkg_info.1#3 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/show.c#5 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/plist.c#4 integrate ... //depot/projects/ia64/usr.sbin/ppp/bundle.c#5 integrate ... //depot/projects/ia64/usr.sbin/ppp/command.c#7 integrate Differences ... ==== //depot/projects/ia64/bin/ps/fmt.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.18 2002/05/02 05:46:37 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.19 2002/05/05 04:42:50 jmallett Exp $"); #if 0 #ifndef lint @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -64,7 +65,8 @@ static char * shquote(char **argv) { - static long arg_max = -1; + long arg_max; + static size_t buf_size; size_t len; char **p, *dst, *src; static char *buf = NULL; @@ -72,8 +74,11 @@ if (buf == NULL) { if ((arg_max = sysconf(_SC_ARG_MAX)) == -1) errx(1, "sysconf _SC_ARG_MAX failed"); - if ((buf = malloc((size_t)(4 * arg_max) + 1)) == NULL) - err(1, "malloc"); + if (arg_max >= LONG_MAX / 4 || 4 * arg_max + 1 > SIZE_MAX) + errx(1, "sysconf _SC_ARG_MAX preposterously large"); + buf_size = 4 * arg_max + 1; + if ((buf = malloc(buf_size)) == NULL) + errx(1, "malloc failed"); } if (*argv == 0) { @@ -84,12 +89,12 @@ for (p = argv; (src = *p++) != 0; ) { if (*src == 0) continue; - len = (size_t)(4 * arg_max - (dst - buf)) / 4; + len = (buf_size - 1 - (dst - buf)) / 4; strvisx(dst, src, strlen(src) < len ? strlen(src) : len, VIS_NL | VIS_CSTYLE); while (*dst) dst++; - if ((4 * arg_max - (dst - buf)) / 4 > 0) + if ((buf_size - 1 - (dst - buf)) / 4 > 0) *dst++ = ' '; } /* Chop off trailing space */ ==== //depot/projects/ia64/etc/periodic/security/100.chksetuid#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.1 2001/12/07 23:57:38 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.2 2002/05/05 00:59:37 cjc Exp $ # # If there is a global system configuration file, suck it in. @@ -52,7 +52,7 @@ find $mount -xdev -type f \ \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \ \( -perm -u+s -or -perm -g+s \) -print0 - done | xargs -0 -n 20 ls -liTd | sort +10 > ${TMP} + done | xargs -0 -n 20 ls -liTd | sed 's/^ *//' | sort +10 > ${TMP} if [ ! -f ${LOG}/setuid.today ]; then rc=1 @@ -64,7 +64,7 @@ then [ $rc -lt 1 ] && rc=1 echo "${host} setuid diffs:" - diff -w ${LOG}/setuid.today ${TMP} + diff -b ${LOG}/setuid.today ${TMP} mv ${LOG}/setuid.today ${LOG}/setuid.yesterday || rc=3 mv ${TMP} ${LOG}/setuid.today || rc=3 fi ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#24 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.338 2002/05/03 22:18:30 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.339 2002/05/05 12:05:08 ue Exp $ 2000 @@ -802,7 +802,7 @@ kern.polling.user_frac sysctl indicating the percentage of CPU time to be reserved for userland. The devices initially supporting polling are &man.dc.4;, - &man.fxp.4;, &man.rl.4, and &man.sis.4;. More details can be found in + &man.fxp.4;, &man.rl.4;, and &man.sis.4;. More details can be found in the &man.polling.4; manual page. &merged; The packet-forwarding performance of certain ==== //depot/projects/ia64/sbin/mount_std/mount_std.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/mount_std/mount_std.c,v 1.14 2002/05/02 20:52:04 mux Exp $"; + "$FreeBSD: src/sbin/mount_std/mount_std.c,v 1.15 2002/05/05 10:08:04 mux Exp $"; #endif /* not lint */ #include @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -65,9 +66,17 @@ { NULL } }; -static void usage(void) __dead2; static const char *fsname; +static volatile sig_atomic_t caughtsig; + +static void usage(void) __dead2; +static void +catchsig(int s) +{ + caughtsig = 1; +} + int main(argc, argv) int argc; @@ -132,14 +141,26 @@ iov[2].iov_len = sizeof("fstype"); iov[3].iov_base = mntpath; iov[3].iov_len = strlen(mntpath) + 1; + + /* + * nmount(2) would kill us with SIGSYS if the kernel doesn't have it. + * This design bug is inconvenient. We must catch the signal and not + * just ignore it because of a plain bug: nmount(2) would return + * EINVAL instead of the correct ENOSYS if the kernel doesn't have it + * and we don't let the signal kill us. EINVAL is too ambiguous. + * This bug in 4.4BSD-Lite1 was fixed in 4.4BSD-Lite2 but is still in + * FreeBSD-5.0. + */ + signal(SIGSYS, catchsig); error = nmount(iov, 4, mntflags); + signal(SIGSYS, SIG_DFL); /* * Try with the old mount syscall in the case * this filesystem has not been converted yet, * or the user didn't recompile his kernel. */ - if (error && errno == EOPNOTSUPP) + if (error && (errno == EOPNOTSUPP || errno == ENOSYS || caughtsig)) error = mount(vfc.vfc_name, mntpath, mntflags, NULL); if (error) ==== //depot/projects/ia64/sbin/savecore/Makefile#4 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/sbin/savecore/Makefile,v 1.9 2002/04/01 08:27:19 phk Exp $ +# $FreeBSD: src/sbin/savecore/Makefile,v 1.10 2002/05/05 01:04:00 fenner Exp $ PROG= savecore WARNS= 4 -NOMAN= sorry, not yet. -LDADD= -lmd +MAN8= savecore.8 +DPADD+= ${LIBZ} +LDADD+= -lz .include ==== //depot/projects/ia64/sbin/savecore/savecore.8#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)savecore.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.15 2001/10/28 16:41:56 n_hibma Exp $ +.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.16 2002/05/05 01:04:00 fenner Exp $ .\" .Dd September 23, 1994 .Dt SAVECORE 8 @@ -43,12 +43,14 @@ .Fl c .Nm .Op Fl fkvz -.Op Fl N Ar system -.Ar directory +.Op Ar directory Op Ar device ... .Sh DESCRIPTION .Nm Savecore -copies the currently running kernel and its associated core dump into +copies a core dump into .Fa directory , +or the current working directory if no +.Fa directory +argument is given, and enters a reboot message and information about the core dump into the system log. .Pp @@ -59,15 +61,9 @@ .Nm will ignore it. .It Fl f -Force a dump to be taken even if the dump doesn't appear correct or there -is insufficient disk space. +Force a dump to be taken even if the dump was cleared. .It Fl k Do not clear the dump after saving it. -.It Fl N -Use -.Ar system -as the kernel instead of the running kernel (as determined from -.Xr getbootfile 3 ) . .It Fl v Print out some additional debugging information. .It Fl z @@ -76,12 +72,17 @@ .El .Pp .Nm Savecore -checks the core dump in various ways to make sure that it is current and -that it corresponds to the currently running system. +looks for dumps on each device specified by the +.Ar device +argument(s), or on each device in +.Pa /etc/fstab +marked as "dump" or "swap". +.Nm Savecore +checks the core dump in various ways to make sure that it is complete. If it passes these checks, it saves the core image in .Ar directory Ns Pa /vmcore.# -and the system in -.Ar directory Ns Pa /kernel.# +and information about the core in +.Ar directory Ns Pa /info.# The ``#'' is the number from the first line of the file .Ar directory Ns Pa /bounds , and it is incremented and stored back into the file each time @@ -111,7 +112,7 @@ (see .Xr rc 8 ) . .Sh BUGS -The minfree code does not consider the effect of compression. +The minfree code does not consider the effect of compression or sparse files. .Sh SEE ALSO .Xr gzip 1 , .Xr getbootfile 3 , ==== //depot/projects/ia64/sbin/savecore/savecore.c#12 (text+ko) ==== @@ -31,35 +31,68 @@ * 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. + * + * Copyright (c) 1986, 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. */ #include -__FBSDID("$FreeBSD: src/sbin/savecore/savecore.c,v 1.58 2002/05/04 10:36:35 mux Exp $"); +__FBSDID("$FreeBSD: src/sbin/savecore/savecore.c,v 1.59 2002/05/05 01:04:00 fenner Exp $"); -#include +#include #include #include #include #include #include -#include #include #include #include -#include #include +#include #include #include #include +#include #include #include -int clear, force, keep, verbose; /* flags */ -int nfound, nsaved, nerr; /* statistics */ +int compress, clear, force, keep, verbose; /* flags */ +int nfound, nsaved, nerr; /* statistics */ + +extern FILE *zopen(const char *, const char *); static void printheader(FILE *f, const struct kerneldumpheader *h, const char *device, - const char *md5) + int bounds) { uint64_t dumplen; time_t t; @@ -77,10 +110,51 @@ fprintf(f, " Hostname: %s\n", h->hostname); fprintf(f, " Versionstring: %s", h->versionstring); fprintf(f, " Panicstring: %s\n", h->panicstring); - fprintf(f, " MD5: %s\n", md5); + fprintf(f, " Bounds: %d\n", bounds); fflush(f); } +static int +getbounds(void) { + FILE *fp; + char buf[6]; + int ret; + + ret = 0; + + if ((fp = fopen("bounds", "r")) == NULL) { + syslog(LOG_WARNING, "unable to open bounds file, using 0"); + goto newfile; + } + + if (fgets(buf, sizeof buf, fp) == NULL) { + syslog(LOG_WARNING, "unable to read from bounds, using 0"); + fclose(fp); + goto newfile; + } + + errno = 0; + ret = (int)strtol(buf, NULL, 10); + if (ret == 0 && (errno == EINVAL || errno == ERANGE)) + syslog(LOG_WARNING, "invalid value found in bounds, using 0"); + +newfile: + + if ((fp = fopen("bounds", "w")) == NULL) { + syslog(LOG_WARNING, "unable to write to bounds file: %m"); + goto done; + } + + if (verbose) + printf("bounds number: %d\n", ret); + + fprintf(fp, "%d\n", (ret + 1)); + fclose(fp); + +done: + return (ret); +} + /* * Check that sufficient space is available on the disk that holds the * save directory. @@ -89,19 +163,14 @@ check_space(char *savedir, off_t dumpsize) { FILE *fp; - const char *tkernel; - off_t minfree, spacefree, totfree, kernelsize, needed; - struct stat st; + off_t minfree, spacefree, totfree, needed; struct statfs fsbuf; char buf[100], path[MAXPATHLEN]; - tkernel = getbootfile(); - if (stat(tkernel, &st) < 0) - err(1, "%s", tkernel); - kernelsize = st.st_blocks * S_BLKSIZE; - - if (statfs(savedir, &fsbuf) < 0) - err(1, "%s", savedir); + if (statfs(savedir, &fsbuf) < 0) { + syslog(LOG_ERR, "%s: %m", savedir); + exit(1); + } spacefree = ((off_t) fsbuf.f_bavail * fsbuf.f_bsize) / 1024; totfree = ((off_t) fsbuf.f_bfree * fsbuf.f_bsize) / 1024; @@ -116,71 +185,92 @@ (void)fclose(fp); } - needed = (dumpsize + kernelsize) / 1024; + needed = dumpsize / 1024 + 2; /* 2 for info file */ if (((minfree > 0) ? spacefree : totfree) - needed < minfree) { - warnx("no dump, not enough free space on device" - " (%lld available, need %lld)", + syslog(LOG_WARNING, + "no dump, not enough free space on device (%lld available, need %lld)", (long long)(minfree > 0 ? spacefree : totfree), (long long)needed); return (0); } if (spacefree - needed < 0) - warnx("dump performed, but free space threshold crossed"); + syslog(LOG_WARNING, + "dump performed, but free space threshold crossed"); return (1); } - +#define BLOCKSIZE (1<<12) +#define BLOCKMASK (~(BLOCKSIZE-1)) static void DoFile(char *savedir, const char *device) { struct kerneldumpheader kdhf, kdhl; - char buf[BUFSIZ]; - struct stat sb; - off_t mediasize, dumpsize, firsthd, lasthd; - char *md5; - FILE *info; - int fd, fdcore, fdinfo, error, wl; + char buf[1024 * 1024]; + off_t mediasize, dumpsize, firsthd, lasthd, dmpcnt; + FILE *info, *fp; + int fd, fdinfo, error, wl; + int nr, nw, hs, he; + int bounds; u_int sectorsize; + mode_t oumask; + dmpcnt = 0; + mediasize = 0; + if (verbose) - printf("Checking for kernel dump on device %s\n", device); + printf("checking for kernel dump on device %s\n", device); - mediasize = 0; fd = open(device, O_RDWR); if (fd < 0) { - warn("%s", device); + syslog(LOG_ERR, "%s: %m", device); return; } error = ioctl(fd, DIOCGMEDIASIZE, &mediasize); if (!error) error = ioctl(fd, DIOCGSECTORSIZE, §orsize); if (error) { - warn("couldn't find media and/or sector size of %s", device); + syslog(LOG_ERR, + "couldn't find media and/or sector size of %s: %m", device); goto closefd; } if (verbose) { - printf("Mediasize = %lld\n", (long long)mediasize); - printf("Sectorsize = %u\n", sectorsize); + printf("mediasize = %lld\n", (long long)mediasize); + printf("sectorsize = %u\n", sectorsize); } lasthd = mediasize - sectorsize; lseek(fd, lasthd, SEEK_SET); error = read(fd, &kdhl, sizeof kdhl); if (error != sizeof kdhl) { - warn("error reading last dump header at offset %lld in %s", + syslog(LOG_ERR, + "error reading last dump header at offset %lld in %s: %m", (long long)lasthd, device); goto closefd; } if (memcmp(kdhl.magic, KERNELDUMPMAGIC, sizeof kdhl.magic)) { if (verbose) - warnx("magic mismatch on last dump header on %s", + printf("magic mismatch on last dump header on %s\n", device); - goto closefd; + + if (force == 0) + goto closefd; + + if (memcmp(kdhl.magic, KERNELDUMPMAGIC_CLEARED, + sizeof kdhl.magic) == 0) { + if (verbose) + printf("forcing magic on %s\n", device); + memcpy(kdhl.magic, KERNELDUMPMAGIC, + sizeof kdhl.magic); + } else { + syslog(LOG_ERR, "unable to force dump - bad magic"); + goto closefd; + } } if (dtoh32(kdhl.version) != KERNELDUMPVERSION) { - warnx("unknown version (%d) in last dump header on %s", + syslog(LOG_ERR, + "unknown version (%d) in last dump header on %s", dtoh32(kdhl.version), device); goto closefd; } @@ -190,7 +280,8 @@ goto nuke; if (kerneldump_parity(&kdhl)) { - warnx("parity error on last dump header on %s", device); + syslog(LOG_ERR, + "parity error on last dump header on %s", device); nerr++; goto closefd; } @@ -199,109 +290,170 @@ lseek(fd, firsthd, SEEK_SET); error = read(fd, &kdhf, sizeof kdhf); if (error != sizeof kdhf) { - warn("error reading first dump header at offset %lld in %s", + syslog(LOG_ERR, + "error reading first dump header at offset %lld in %s: %m", (long long)firsthd, device); nerr++; goto closefd; } if (memcmp(&kdhl, &kdhf, sizeof kdhl)) { - warn("first and last dump headers disagree on %s", device); + syslog(LOG_ERR, + "first and last dump headers disagree on %s", device); nerr++; goto closefd; } - md5 = MD5Data((unsigned char *)&kdhl, sizeof kdhl, NULL); - sprintf(buf, "%s.info", md5); - /* - * See if the dump has been saved already. Don't save the dump - * again, unless 'force' is in effect. - */ - if (stat(buf, &sb) == 0) { - if (!force) { - if (verbose) - printf("Dump on device %s already saved\n", - device); - goto closefd; - } - } else if (errno != ENOENT) { - warn("error while checking for pre-saved core file"); - nerr++; - goto closefd; - } + if (kdhl.panicstring[0]) + syslog(LOG_ALERT, "reboot after panic: %s", kdhl.panicstring); + else + syslog(LOG_ALERT, "reboot"); + if (verbose) + printf("Checking for available free space\n"); if (!check_space(savedir, dumpsize)) { nerr++; goto closefd; } + + bounds = getbounds(); + + sprintf(buf, "info.%d", bounds); + /* * Create or overwrite any existing files. */ fdinfo = open(buf, O_WRONLY | O_CREAT | O_TRUNC, 0600); if (fdinfo < 0) { - warn("%s", buf); + syslog(LOG_ERR, "%s: %m", buf); nerr++; goto closefd; } - sprintf(buf, "%s.core", md5); - fdcore = open(buf, O_WRONLY | O_CREAT | O_TRUNC, 0600); - if (fdcore < 0) { - warn("%s", buf); + oumask = umask(S_IRWXG|S_IRWXO); /* Restrict access to the core file.*/ + if (compress) { + sprintf(buf, "vmcore.%d.gz", bounds); + fp = zopen(buf, "w"); + } else { + sprintf(buf, "vmcore.%d", bounds); + fp = fopen(buf, "w"); + } + if (fp == NULL) { + syslog(LOG_ERR, "%s: %m", buf); close(fdinfo); nerr++; goto closefd; } + (void)umask(oumask); + info = fdopen(fdinfo, "w"); if (verbose) - printheader(stdout, &kdhl, device, md5); + printheader(stdout, &kdhl, device, bounds); - printf("Saving dump to file %s\n", buf); + printheader(info, &kdhl, device, bounds); + fclose(info); - printheader(info, &kdhl, device, md5); + syslog(LOG_NOTICE, "writing %score to %s", + compress ? "compressed " : "", buf); while (dumpsize > 0) { wl = sizeof(buf); if (wl > dumpsize) wl = dumpsize; - error = read(fd, buf, wl); - if (error != wl) { - warn("read error on %s", device); + nr = read(fd, buf, wl); + if (nr != wl) { + if (nr == 0) + syslog(LOG_WARNING, + "WARNING: EOF on dump device"); + else + syslog(LOG_ERR, "read error on %s: %m", device); nerr++; goto closeall; } - error = write(fdcore, buf, wl); - if (error != wl) { - warn("write error on %s.core file", md5); + if (compress) { + nw = fwrite(buf, 1, wl, fp); + } else { + for (nw = 0; nw < nr; nw = he) { + /* find a contiguous block of zeroes */ + for (hs = nw; hs < nr; hs += BLOCKSIZE) { + for (he = hs; he < nr && buf[he] == 0; ++he) + /* nothing */ ; + /* is the hole long enough to matter? */ + if (he >= hs + BLOCKSIZE) + break; + } + + /* back down to a block boundary */ + he &= BLOCKMASK; + + /* + * 1) Don't go beyond the end of the buffer. + * 2) If the end of the buffer is less than + * BLOCKSIZE bytes away, we're at the end + * of the file, so just grab what's left. + */ + if (hs + BLOCKSIZE > nr) + hs = he = nr; + + /* + * At this point, we have a partial ordering: + * nw <= hs <= he <= nr + * If hs > nw, buf[nw..hs] contains non-zero data. + * If he > hs, buf[hs..he] is all zeroes. + */ + if (hs > nw) + if (fwrite(buf + nw, hs - nw, 1, fp) != 1) + break; + if (he > hs) + if (fseek(fp, he - hs, SEEK_CUR) == -1) + break; + } + } + if (nw != wl) { + syslog(LOG_ERR, + "write error on vmcore.%d file: %m", bounds); + syslog(LOG_WARNING, + "WARNING: vmcore may be incomplete"); nerr++; goto closeall; } + if (verbose) { + dmpcnt += wl; + printf("%llu\r", dmpcnt); + fflush(stdout); + } dumpsize -= wl; } + if (verbose) + printf("\n"); + + if (fclose(fp) < 0) { + syslog(LOG_ERR, "error on vmcore.%d: %m", bounds); + nerr++; + goto closeall; + } nsaved++; - close(fdinfo); - close(fdcore); if (verbose) - printf("Dump saved\n"); + printf("dump saved\n"); - nuke: +nuke: if (clear || !keep) { if (verbose) - printf("Clearing dump header\n"); - memset(&kdhl, 0, sizeof kdhl); + printf("clearing dump header\n"); + memcpy(kdhl.magic, KERNELDUMPMAGIC_CLEARED, sizeof kdhl.magic); lseek(fd, lasthd, SEEK_SET); error = write(fd, &kdhl, sizeof kdhl); if (error != sizeof kdhl) - warn("error while clearing the dump header"); + syslog(LOG_ERR, + "error while clearing the dump header: %m"); } close(fd); return; - closeall: - close(fdinfo); - close(fdcore); +closeall: + fclose(fp); - closefd: +closefd: close(fd); } @@ -319,9 +471,13 @@ struct fstab *fsp; char *savedir; + openlog("savecore", LOG_PERROR, LOG_DAEMON); + savedir = strdup("."); - if (savedir == NULL) - errx(1, "Cannot allocate memory"); + if (savedir == NULL) { + syslog(LOG_ERR, "Cannot allocate memory"); + exit(1); + } while ((ch = getopt(argc, argv, "cdfkN:vz")) != -1) switch(ch) { case 'c': @@ -336,9 +492,11 @@ case 'f': force = 1; break; + case 'z': + compress = 1; + break; case 'd': /* Obsolete */ case 'N': - case 'z': case '?': default: usage(); @@ -347,8 +505,10 @@ argv += optind; if (argc >= 1) { error = chdir(argv[0]); - if (error) - err(1, "chdir(%s)", argv[0]); + if (error) { + syslog(LOG_ERR, "chdir(%s): %m", argv[0]); + exit(1); + } savedir = argv[0]; argc--; argv++; @@ -370,12 +530,12 @@ /* Emit minimal output. */ if (nfound == 0) - printf("No dumps found\n"); + syslog(LOG_WARNING, "no dumps found"); else if (nsaved == 0) { if (nerr != 0) - printf("Unsaved dumps found but not saved\n"); + syslog(LOG_WARNING, "unsaved dumps found but not saved"); else - printf("No unsaved dumps found\n"); + syslog(LOG_WARNING, "no unsaved dumps found"); } return (0); ==== //depot/projects/ia64/share/mk/bsd.kern.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.kern.mk,v 1.24 2001/09/10 06:23:33 peter Exp $ +# $FreeBSD: src/share/mk/bsd.kern.mk,v 1.25 2002/05/04 20:07:33 obrien Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -59,6 +59,4 @@ # GCC 3.0 and above like to do certain optimizations based on the # assumption that the program is linked against libc. Stop this. # -.ifdef GCC3 CFLAGS+= -ffreestanding -.endif ==== //depot/projects/ia64/sys/dev/sound/pci/ich.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.20 2002/04/15 20:42:40 jhb Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.21 2002/05/05 15:37:09 orion Exp $"); /* -------------------------------------------------------------------- */ @@ -762,9 +762,6 @@ ichchan_trigger(0, &sc->ch[i], PCMTRIG_ABORT); } } - - /* ACLINK shut off */ - ich_wr(sc,ICH_REG_GLOB_CNT, ICH_GLOB_CTL_SHUT, 4); return 0; } ==== //depot/projects/ia64/sys/i386/i386/i386dump.c#2 (text+ko) ==== @@ -32,12 +32,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/i386dump.c,v 1.2 2002/04/03 07:24:07 marcel Exp $ + * $FreeBSD: src/sys/i386/i386/i386dump.c,v 1.3 2002/05/04 17:45:48 fenner Exp $ */ #include #include #include +#include #include #include #include @@ -56,6 +57,7 @@ u_int count, left, u; void *va; int i, mb; + int c; printf("Dumping %u MB\n", Maxmem / (1024*1024 / PAGE_SIZE)); @@ -104,6 +106,11 @@ count += left; dumplo += left * PAGE_SIZE; addr += left * PAGE_SIZE; + if ((c = cncheckc()) == 0x03) { + printf("\nDump aborted.\n"); + return; + } else if (c != -1) + printf("[CTRL-C to abort] "); } if (i) printf("\nDump failed writing data (%d)\n", i); ==== //depot/projects/ia64/sys/i386/isa/ipl.s#3 (text+ko) ==== @@ -36,7 +36,7 @@ * * @(#)ipl.s * - * $FreeBSD: src/sys/i386/isa/ipl.s,v 1.53 2002/03/29 16:35:25 jake Exp $ + * $FreeBSD: src/sys/i386/isa/ipl.s,v 1.54 2002/05/05 03:19:48 bde Exp $ */ @@ -57,13 +57,19 @@ doreti: FAKE_MCOUNT(bintr) /* init "from" bintr -> doreti */ doreti_next: - /* Check if ASTs can be handled now. */ + /* + * Check if ASTs can be handled now. PSL_VM must be checked first + * since segment registers only have an RPL in non-VM86 mode. + */ + testl $PSL_VM,TF_EFLAGS(%esp) /* are we in vm86 mode? */ + jz doreti_notvm86 + cmpl $1,in_vm86call /* are we in a vm86 call? */ + jne doreti_ast /* can handle ASTs now if not */ + jmp doreti_exit + +doreti_notvm86: testb $SEL_RPL_MASK,TF_CS(%esp) /* are we in user mode? */ - jne doreti_ast /* yes, do it now. */ - testl $PSL_VM,TF_EFLAGS(%esp) /* kernel mode */ - je doreti_exit /* and not VM86 mode, defer */ - cmpl $1,in_vm86call /* are we in a VM86 call? */ - je doreti_exit /* no, defer */ + jz doreti_exit /* can't handle ASTs now if not */ doreti_ast: /* ==== //depot/projects/ia64/sys/ia64/ia64/sal.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/sal.c,v 1.8 2002/04/26 19:33:20 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/sal.c,v 1.9 2002/05/05 08:18:42 marcel Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 15:18:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CD9737B407; Sun, 5 May 2002 15:18:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4D66A37B40B for ; Sun, 5 May 2002 15:17:55 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g45MHtb15569 for perforce@freebsd.org; Sun, 5 May 2002 15:17:55 -0700 (PDT) (envelope-from tmm@freebsd.org) Date: Sun, 5 May 2002 15:17:55 -0700 (PDT) Message-Id: <200205052217.g45MHtb15569@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 10849 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10849 Change 10849 by tmm@tmm_sparc64 on 2002/05/05 15:17:05 Perform a full reset on RX/TX error conditions; failing to do so seems to cause stalls under some circumstances. Reported, proposed and tested by: phk Affected files ... ... //depot/projects/sparc64/sys/dev/gem/if_gem.c#14 edit Differences ... ==== //depot/projects/sparc64/sys/dev/gem/if_gem.c#14 (text+ko) ==== @@ -1610,11 +1610,15 @@ int txstat = bus_space_read_4(t, seb, GEM_MAC_TX_STATUS); if (txstat & ~GEM_MAC_TX_XMIT_DONE) printf("MAC tx fault, status %x\n", txstat); + if (txstat & (GEM_MAC_TX_UNDERRUN | GEM_MAC_TX_PKT_TOO_LONG)) + gem_init(sc); } if (status & GEM_INTR_RX_MAC) { int rxstat = bus_space_read_4(t, seb, GEM_MAC_RX_STATUS); if (rxstat & ~(GEM_MAC_RX_DONE | GEM_MAC_RX_FRAME_CNT)) printf("MAC rx fault, status %x\n", rxstat); + if ((rxstat & GEM_MAC_RX_OVERFLOW) != 0) + gem_init(sc); } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 15:51:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8229737B408; Sun, 5 May 2002 15:51:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AD48E37B406 for ; Sun, 5 May 2002 15:51:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g45MpbM18270 for perforce@freebsd.org; Sun, 5 May 2002 15:51:37 -0700 (PDT) (envelope-from amigus@tislabs.com) Date: Sun, 5 May 2002 15:51:37 -0700 (PDT) Message-Id: <200205052251.g45MpbM18270@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@tislabs.com using -f From: Adam Migus Subject: PERFORCE change 10857 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10857 Change 10857 by amigus@amigus_vmganyopa on 2002/05/05 15:51:37 Set the ttylabel before the chflags() and chown() are called. Affected files ... ... //depot/projects/trustedbsd/mac/usr.bin/login/login.c#16 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.bin/login/login.c#16 (text+ko) ==== @@ -171,7 +171,7 @@ char *arg0; const char *shell = NULL; login_cap_t *lc = NULL; - char *label_string; + const char *label_string; pid_t pid; (void)signal(SIGQUIT, SIG_IGN); @@ -414,17 +414,6 @@ login_fbtab(tty, pwd->pw_uid, pwd->pw_gid); /* - * Clear flags of the tty. None should be set, and when the - * user sets them otherwise, this can cause the chown to fail. - * Since it isn't clear that flags are useful on character - * devices, we just clear them. - */ - if (ttyn != tname && chflags(ttyn, 0) && errno != EOPNOTSUPP) - syslog(LOG_ERR, "chflags(%s): %m", ttyn); - if (ttyn != tname && chown(ttyn, pwd->pw_uid, - (gr = getgrnam(TTYGRPNAME)) ? gr->gr_gid : pwd->pw_gid)) - syslog(LOG_ERR, "chmod(%s): %m", ttyn); - /* * Assign the user's tty MAC label to the terminal device. */ label_string = login_getcapstr(lc, "ttylabel", NULL, NULL); @@ -436,7 +425,7 @@ if (pathconf(ttyn, _POSIX_MAC_PRESENT) > 0 && mac_set_file(ttyn, label) == -1) syslog(LOG_WARNING, - "mac_set_proc(%s): warning: %m", + "mac_set_file(%s): warning: %m", label_string); mac_free(label); } else @@ -444,6 +433,18 @@ } /* + * Clear flags of the tty. None should be set, and when the + * user sets them otherwise, this can cause the chown to fail. + * Since it isn't clear that flags are useful on character + * devices, we just clear them. + */ + if (ttyn != tname && chflags(ttyn, 0) && errno != EOPNOTSUPP) + syslog(LOG_ERR, "chflags(%s): %m", ttyn); + if (ttyn != tname && chown(ttyn, pwd->pw_uid, + (gr = getgrnam(TTYGRPNAME)) ? gr->gr_gid : pwd->pw_gid)) + syslog(LOG_ERR, "chown(%s): %m", ttyn); + + /* * Exclude cons/vt/ptys only, assume dialup otherwise * TODO: Make dialup tty determination a library call * for consistency (finger etc.) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 16: 2:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4214637B403; Sun, 5 May 2002 16:02:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8625637B406 for ; Sun, 5 May 2002 16:02:51 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g45N2pK18837 for perforce@freebsd.org; Sun, 5 May 2002 16:02:51 -0700 (PDT) (envelope-from amigus@tislabs.com) Date: Sun, 5 May 2002 16:02:51 -0700 (PDT) Message-Id: <200205052302.g45N2pK18837@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@tislabs.com using -f From: Adam Migus Subject: PERFORCE change 10858 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10858 Change 10858 by amigus@amigus_vmganyopa on 2002/05/05 16:02:07 getty now sets a ttylabel whether "me" exists in ~/.login_conf or not. The label is root's label in /etc/login.conf. The man page says that login_getuserclass() defaults to root or default depending on who calls it. The source code says not to default if the user calls login_getuserclass(). As such this is more of a workaround than a fix. Affected files ... ... //depot/projects/trustedbsd/mac/libexec/getty/main.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/libexec/getty/main.c#6 (text+ko) ==== @@ -237,6 +237,20 @@ login_cap_t *lc; lc = login_getuserclass(rootpw); + /* + * login_getuserclass() searches for "me" + * (LOGIN_MECLASS) in ~/.login_conf. If it fails, + * it doesn't fallback to "root" (LOGIN_ROOTDEFCLASS) + * or "default" (LOGIN_DEFCLASS). Thus it will return + * NULL if root doesn't have a "me" entry defined in + * ~/.login_conf. + * login_getpwclass() will default, so if + * login_getuserclass() fails here we call it to + * ensure that a label gets set on the tty. + * / + if(lc == NULL) + lc = login_getpwclass(rootpw); + if (lc != NULL) { char *rootmacstr; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 5 16: 7: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B8FB37B404; Sun, 5 May 2002 16:06:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D82F937B408 for ; Sun, 5 May 2002 16:06:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g45N6uD22890 for perforce@freebsd.org; Sun, 5 May 2002 16:06:56 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 5 May 2002 16:06:56 -0700 (PDT) Message-Id: <200205052306.g45N6uD22890@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10859 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10859 Change 10859 by peter@peter_thunder on 2002/05/05 16:05:56 Commit from ia64 box running x86 p4 binary. Affected files ... ... //depot/projects/ia64/sys/fs/procfs/procfs_map.c#3 edit Differences ... ==== //depot/projects/ia64/sys/fs/procfs/procfs_map.c#3 (text+ko) ==== @@ -109,11 +109,13 @@ resident = 0; addr = entry->start; +#ifndef __ia64__ /* This explodes for some reason */ while (addr < entry->end) { if (pmap_extract( pmap, addr)) resident++; addr += PAGE_SIZE; } +#endif for (lobj = tobj = obj; tobj; tobj = tobj->backing_object) lobj = tobj; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 0:21:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F098237B411; Mon, 6 May 2002 00:21:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3FC5F37B62B for ; Mon, 6 May 2002 00:19:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g467JCY92734 for perforce@freebsd.org; Mon, 6 May 2002 00:19:12 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Mon, 6 May 2002 00:19:12 -0700 (PDT) Message-Id: <200205060719.g467JCY92734@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 10878 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10878 Change 10878 by marcel@marcel_vaio on 2002/05/06 00:18:07 We need libc_r if we want to build X libraries. Make it so. This still needs testing. Affected files ... ... //depot/projects/ia64/lib/Makefile#9 edit ... //depot/projects/ia64/lib/libc_r/arch/ia64/_atomic_lock.S#1 add ... //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#5 edit Differences ... ==== //depot/projects/ia64/lib/Makefile#9 (text+ko) ==== @@ -44,7 +44,7 @@ _libresolv= libresolv .endif -.if !defined(NOLIBC_R) && ${MACHINE_ARCH} != ia64 +.if !defined(NOLIBC_R) _libc_r= libc_r .endif ==== //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#5 (text+ko) ==== @@ -101,6 +101,17 @@ (jb)[0]._jb[R_RA + 4] = (long)(ra); \ (jb)[0]._jb[R_T12 + 4] = (long)(ra); \ } while (0) +#elif defined(__ia64__) +#define GET_STACK_JB(jb) (*((unsigned long*)JMPBUF_ADDR_OF(jb,J_SP))) +#define GET_STACK_SJB(sjb) (*((unsigned long*)JMPBUF_ADDR_OF(sjb,J_SP))) +#define GET_STACK_UC(ucp) ((ucp)->uc_mcontext.mc_sp) +#define SET_STACK_JB(jb, stk) GET_STACK_JB(jb) = (long)(stk) +#define SET_STACK_SJB(sjb, stk) GET_STACK_SJB(sjb) = (long)(stk) +#define SET_STACK_UC(ucp, stk) (ucp)->uc_mcontext.mc_sp = (unsigned long)(stk) +#define FP_SAVE_UC(ucp) +#define FP_RESTORE_UC(ucp) +#define SET_RETURN_ADDR_JB(jb, ra) \ + (*((unsigned long*)JMPBUF_ADDR_OF(jb,J_B0)) = (long)(ra)) #else #error "Don't recognize this architecture!" #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 0:50:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01D7F37B405; Mon, 6 May 2002 00:50:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fw.wemm.org (12-232-135-171.client.attbi.com [12.232.135.171]) by hub.freebsd.org (Postfix) with ESMTP id D9E0437B400; Mon, 6 May 2002 00:50:13 -0700 (PDT) Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by fw.wemm.org (8.11.6/8.11.6) with ESMTP id g467oD422685; Mon, 6 May 2002 00:50:13 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 4963C3811; Mon, 6 May 2002 00:50:13 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Marcel Moolenaar Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10878 for review In-Reply-To: <200205060719.g467JCY92734@freefall.freebsd.org> Date: Mon, 06 May 2002 00:50:13 -0700 From: Peter Wemm Message-Id: <20020506075013.4963C3811@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Marcel Moolenaar wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10878 > > Change 10878 by marcel@marcel_vaio on 2002/05/06 00:18:07 > > We need libc_r if we want to build X libraries. Make it so. > This still needs testing. dfr told me we couldn't use this since setjmp didn't support jumping to a different stack, and we'd have to use a swapcontext() style thing. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 8:23:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A673A37B404; Mon, 6 May 2002 08:21:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C0E7437B401 for ; Mon, 6 May 2002 08:21:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g46FLB871116 for perforce@freebsd.org; Mon, 6 May 2002 08:21:11 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 6 May 2002 08:21:11 -0700 (PDT) Message-Id: <200205061521.g46FLB871116@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10891 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10891 Change 10891 by arr@arr_shibby on 2002/05/06 08:20:39 integ Affected files ... ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/clock.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/mem.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/conf/GENERIC#5 integrate ... //depot/projects/trustedbsd/audit/sys/compat/linux/linux_misc.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/conf/NOTES#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files#10 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.powerpc#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/kern.post.mk#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/kern.pre.mk#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/kmod.mk#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac_cam.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_timer.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/Makefile#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_fops.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/md/md.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/acphy.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/qsphy.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/my/if_my.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/ac97_if.m#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/feeder_if.m#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/mixer_if.m#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/tx/if_tx.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdi.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/wi_hostap.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/deadfs/dead_vnops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/devfs/devfs_vfsops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/fs/fifofs/fifo_vnops.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/fs/hpfs/hpfs_vnops.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/fs/pseudofs/pseudofs.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/pseudofs/pseudofs.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/fs/udf/udf_vnops.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/acpica/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/acpica/genwakecode.pl#2 delete ... //depot/projects/trustedbsd/audit/sys/i386/acpica/genwakecode.sh#1 branch ... //depot/projects/trustedbsd/audit/sys/i386/conf/GENERIC#6 integrate ... //depot/projects/trustedbsd/audit/sys/i386/conf/Makefile#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/conf/NOTES#6 integrate ... //depot/projects/trustedbsd/audit/sys/i386/conf/makeLINT.pl#2 delete ... //depot/projects/trustedbsd/audit/sys/i386/conf/makeLINT.sed#1 branch ... //depot/projects/trustedbsd/audit/sys/i386/conf/makeLINT.sh#1 branch ... //depot/projects/trustedbsd/audit/sys/i386/i386/mp_clock.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/clock.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/loran.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/clock.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/exception.s#4 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/machdep.c#8 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/mca.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/mp_machdep.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/pmap.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/ansi.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/frame.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/init_main.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#31 edit ... //depot/projects/trustedbsd/audit/sys/kern/kern_descrip.c#9 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_environment.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_exec.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_exit.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_fork.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_malloc.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_proc.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_prot.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_sig.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_tc.c#8 integrate ... //depot/projects/trustedbsd/audit/sys/kern/makeobjops.pl#2 delete ... //depot/projects/trustedbsd/audit/sys/kern/subr_hints.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_log.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_witness.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/kern/sys_generic.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/kern/sys_pipe.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/tty.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/uipc_socket.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/kern/uipc_socket2.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_aio.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_init.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_syscalls.c#9 edit ... //depot/projects/trustedbsd/audit/sys/kern/vnode_if.pl#2 delete ... //depot/projects/trustedbsd/audit/sys/modules/drm/mga/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/modules/drm/r128/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/modules/drm/radeon/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/net/bpf.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_spppsubr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_tap.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_tun.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/net/rtsock.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_cm.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_cm.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_subr.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_var.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/accf_data.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/accf_http.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/ip_fw.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/tcp_input.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/netkey/keysock.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/conf/GENERIC#5 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/clock.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_dc.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/clock.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/conf/GENERIC#4 integrate ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#25 edit ... //depot/projects/trustedbsd/audit/sys/sys/malloc.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/sys/param.h#6 integrate ... //depot/projects/trustedbsd/audit/sys/sys/proc.h#7 integrate ... //depot/projects/trustedbsd/audit/sys/sys/signalvar.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/sys/socketvar.h#6 integrate ... //depot/projects/trustedbsd/audit/sys/sys/time.h#6 integrate ... //depot/projects/trustedbsd/audit/sys/sys/timepps.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/sys/timetc.h#6 integrate ... //depot/projects/trustedbsd/audit/sys/sys/user.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/tools/makeobjops.awk#1 branch ... //depot/projects/trustedbsd/audit/sys/ufs/ffs/ffs_vnops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ufs/ufs/extattr.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ufs/ufs/ufs_extattr.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/ufs/ufs/ufs_vnops.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/vm/uma.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/vm/uma_core.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/vm/uma_dbg.c#1 branch ... //depot/projects/trustedbsd/audit/sys/vm/uma_dbg.h#1 branch ... //depot/projects/trustedbsd/audit/sys/vm/vm_fault.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_map.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_map.h#6 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_page.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/audit/sys/alpha/alpha/clock.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.28 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.29 2002/04/30 19:34:28 phk Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* @@ -124,9 +124,6 @@ "alpha" /* name */ }; -SYSCTL_OPAQUE(_debug, OID_AUTO, alpha_timecounter, CTLFLAG_RD, - &alpha_timecounter, sizeof(alpha_timecounter), "S,timecounter", ""); - static struct timecounter i8254_timecounter = { i8254_get_timecount, /* get_timecount */ 0, /* no poll_pps */ @@ -135,9 +132,6 @@ "i8254" /* name */ }; -SYSCTL_OPAQUE(_debug, OID_AUTO, i8254_timecounter, CTLFLAG_RD, - &i8254_timecounter, sizeof(i8254_timecounter), "S,timecounter", ""); - /* Values for timerX_state: */ #define RELEASED 0 #define RELEASE_PENDING 1 ==== //depot/projects/trustedbsd/audit/sys/alpha/alpha/mem.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.39 2002/02/27 18:31:35 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.40 2002/05/01 06:24:51 peter Exp $ */ /* @@ -59,8 +59,6 @@ #include #include -#include -#include #ifdef PERFMON #include #endif ==== //depot/projects/trustedbsd/audit/sys/alpha/conf/GENERIC#5 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.137 2002/04/18 03:44:44 rwatson Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.138 2002/05/03 17:59:21 jmallett Exp $ machine alpha cpu EV4 @@ -74,7 +74,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detects deadlocks and cycles +#options WITNESS #Enable checks to detect deadlocks and cycles # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel ==== //depot/projects/trustedbsd/audit/sys/compat/linux/linux_misc.c#5 (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. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.120 2002/04/20 14:43:34 rwatson Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.121 2002/05/01 02:17:33 peter Exp $ */ #include "opt_compat.h" @@ -64,13 +64,7 @@ #include #include -#include #include -#include -#include -#ifdef __i386__ -#include -#endif #include ==== //depot/projects/trustedbsd/audit/sys/conf/NOTES#3 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1027 2002/04/28 04:58:12 anholt Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1029 2002/04/30 22:47:26 scottl Exp $ # # @@ -1308,7 +1308,7 @@ # support). # device aac -device aacp # SCSI Passthrough interface (optional) +device aacp # SCSI Passthrough interface (optional, CAM required) # # Compaq Smart RAID, Mylex DAC960 and AMI MegaRAID controllers. Only @@ -1633,6 +1633,7 @@ device de # DEC/Intel DC21x4x (``Tulip'') device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') +device my # Myson controllers # PCI Gigabit & FDDI NICs. device bge ==== //depot/projects/trustedbsd/audit/sys/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.629 2002/04/28 04:58:12 anholt Exp $ +# $FreeBSD: src/sys/conf/files,v 1.630 2002/04/30 07:54:21 jeff Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1373,4 +1373,5 @@ vm/vm_swap.c standard vm/vm_unix.c standard vm/uma_core.c standard +vm/uma_dbg.c standard vm/vnode_pager.c standard ==== //depot/projects/trustedbsd/audit/sys/conf/files.powerpc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.8 2002/04/15 12:30:14 benno Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.9 2002/04/30 11:13:16 benno Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -25,6 +25,7 @@ powerpc/powerpc/ofwmagic.s standard powerpc/powerpc/ofw_machdep.c standard powerpc/powerpc/pmap.c standard +powerpc/powerpc/sigcode.S standard powerpc/powerpc/suswintr.c standard powerpc/powerpc/syncicache.c standard powerpc/powerpc/sys_machdep.c standard ==== //depot/projects/trustedbsd/audit/sys/conf/kern.post.mk#4 (text+ko) ==== @@ -1,4 +1,3 @@ - # Part of unified Makefile for building kenrels. This includes all # the definitions that need to be included after all the % directives, # except %RULES and things that act like they are part of %RULES @@ -7,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.16 2002/04/24 11:26:19 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.17 2002/05/01 03:28:14 obrien Exp $ # # XXX why are only some phony targets marked phony? @@ -43,7 +42,7 @@ .for mfile in ${MFILES} ${mfile:T:S/.m$/.h/}: ${mfile} - perl5 $S/kern/makeobjops.pl -h ${mfile} + ${AWK} -f $S/tools/makeobjops.awk ${mfile} -h .endfor kernel-clean: ==== //depot/projects/trustedbsd/audit/sys/conf/kern.pre.mk#4 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kenrels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.10 2002/03/24 17:45:46 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.11 2002/05/01 03:28:14 obrien Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -73,7 +73,7 @@ PROFILE_C= ${CC} -c ${CFLAGS} ${WERROR} ${.IMPSRC} NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC} -NORMAL_M= perl5 $S/kern/makeobjops.pl -c $<; \ +NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk $< -c ; \ ${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c GEN_CFILES= $S/$M/$M/genassym.c ==== //depot/projects/trustedbsd/audit/sys/conf/kmod.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.120 2002/04/29 06:35:25 obrien Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.123 2002/05/01 19:24:26 imp Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -82,6 +82,10 @@ KMODUNLOAD?= /sbin/kldunload OBJCOPY?= objcopy +.if defined(KMODDEPS) +.error "Do not use KMODDEPS on 5.0+, use MODULE_VERSION/MODULE_DEPEND" +.endif + .include .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S @@ -166,6 +170,9 @@ .endif .endif +.if !exists(/usr/sbin/kldxref) +NO_XREF=yes +.endif _ILINKS=@ machine @@ -253,9 +260,7 @@ done; true .endif .if !defined(NO_XREF) - @echo "FAILURES HERE ARE OK" -kldxref ${DESTDIR}${KMODDIR} - @echo "END OF SECTION WHERE FAILURES ARE OK" .endif .endif @@ -308,9 +313,9 @@ ${_src}: @ .endif .if exists(@) -${_src}: @/kern/makeobjops.pl @/${_srcsrc} +${_src}: @/tools/makeobjops.awk @/${_srcsrc} .endif - perl @/kern/makeobjops.pl -${_ext} @/${_srcsrc} + ${AWK} -f @/tools/makeobjops.awk @/${_srcsrc} -${_ext} .endif .endfor # _src .endfor # _ext @@ -341,5 +346,4 @@ .endif .include - .include ==== //depot/projects/trustedbsd/audit/sys/dev/aac/aac.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac.c,v 1.38 2002/04/27 01:31:13 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aac.c,v 1.39 2002/05/03 00:07:50 scottl Exp $ */ /* @@ -355,17 +355,17 @@ mi = (struct aac_mntinfo *)&fib->data[0]; /* loop over possible containers */ - mi->Command = VM_NameServe; - mi->MntType = FT_FILESYS; do { /* request information on this container */ + bzero(mi, sizeof(struct aac_mntinfo)); + mi->Command = VM_NameServe; + mi->MntType = FT_FILESYS; mi->MntCount = i; if (aac_sync_fib(sc, ContainerCommand, 0, fib, sizeof(struct aac_mntinfo))) { debug(2, "error probing container %d", i); continue; } - /* check response size */ mir = (struct aac_mntinforesp *)&fib->data[0]; aac_add_container(sc, mir, 0); @@ -550,6 +550,7 @@ aac_alloc_sync_fib(sc, &fib, AAC_SYNC_LOCK_FORCE); cc = (struct aac_close_command *)&fib->data[0]; + bzero(cc, sizeof(struct aac_close_command)); cc->Command = VM_CloseAll; cc->ContainerId = 0xffffffff; if (aac_sync_fib(sc, ContainerCommand, 0, fib, @@ -2373,8 +2374,6 @@ */ aac_alloc_sync_fib(sc, &fib, 0); mi = (struct aac_mntinfo *)&fib->data[0]; - mi->Command = VM_NameServe; - mi->MntType = FT_FILESYS; do { /* * Ask the controller for its containers one at @@ -2383,6 +2382,9 @@ * midway through this enumaration? * XXX This should be done async. */ + bzero(mi, sizeof(struct aac_mntinfo)); + mi->Command = VM_NameServe; + mi->MntType = FT_FILESYS; mi->MntCount = i; rsize = sizeof(mir); if (aac_sync_fib(sc, ContainerCommand, 0, fib, @@ -2717,6 +2719,7 @@ aac_alloc_sync_fib(sc, &fib, 0); c_cmd = (struct aac_ctcfg *)&fib->data[0]; + bzero(c_cmd, sizeof(struct aac_ctcfg)); c_cmd->Command = VM_ContainerConfig; c_cmd->cmd = CT_GET_SCSI_METHOD; @@ -2742,6 +2745,8 @@ sc->scsi_method_id = c_resp->param; vmi = (struct aac_vmioctl *)&fib->data[0]; + bzero(vmi, sizeof(struct aac_vmioctl)); + vmi->Command = VM_Ioctl; vmi->ObjType = FT_DRIVE; vmi->MethId = sc->scsi_method_id; ==== //depot/projects/trustedbsd/audit/sys/dev/aac/aac_cam.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.1 2002/04/27 01:31:13 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.3 2002/05/03 00:07:50 scottl Exp $ */ /* @@ -67,8 +67,6 @@ struct aac_cam { device_t dev; struct aac_cam_inf *inf; - u_int32_t scsi_method_id; - int bus; struct cam_sim *sim; struct cam_path *path; }; @@ -149,6 +147,7 @@ return (EIO); } + /* Since every bus has it's own sim, every bus 'appears' as bus 0 */ if (xpt_bus_register(sim, 0) != CAM_SUCCESS) { cam_sim_free(sim, TRUE); return (EIO); @@ -163,7 +162,6 @@ camsc->sim = sim; camsc->path = path; - camsc->bus = cam_sim_bus(sim); return (0); } @@ -227,7 +225,7 @@ cpi->max_target = camsc->inf->TargetsPerBus; cpi->max_lun = 8; /* Per the controller spec */ cpi->initiator_id = camsc->inf->InitiatorBusId; - cpi->bus_id = cam_sim_bus(sim); + cpi->bus_id = camsc->inf->BusNumber; cpi->base_transfer_speed = 3300; strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); strncpy(cpi->hba_vid, "Adaptec", HBA_IDLEN); @@ -242,7 +240,7 @@ { u_int32_t handle; - handle = AAC_BTL_TO_HANDLE(cam_sim_bus(sim), + handle = AAC_BTL_TO_HANDLE(camsc->inf->BusNumber, ccb->ccb_h.target_id, ccb->ccb_h.target_lun); ccb->ccb_h.status = aac_cam_get_tran_settings(sc, &ccb->cts, handle); @@ -371,7 +369,7 @@ break; } - srb->bus = cam_sim_bus(sim); /* Bus number relative to the card */ + srb->bus = camsc->inf->BusNumber; /* Bus number relative to the card */ srb->target = ccb->ccb_h.target_id; srb->lun = ccb->ccb_h.target_lun; srb->timeout = ccb->ccb_h.timeout; /* XXX */ @@ -502,6 +500,8 @@ aac_alloc_sync_fib(sc, &fib, 0); vmi = (struct aac_vmioctl *)&fib->data[0]; + bzero(vmi, sizeof(struct aac_vmioctl)); + vmi->Command = VM_Ioctl; vmi->ObjType = FT_DRIVE; vmi->MethId = sc->scsi_method_id; @@ -509,7 +509,7 @@ vmi->IoctlCmd = ResetBus; rbc = (struct aac_resetbus *)&vmi->IoctlBuf[0]; - rbc->BusNumber = cam_sim_bus(sim); + rbc->BusNumber = camsc->inf->BusNumber; e = aac_sync_fib(sc, ContainerCommand, 0, fib, sizeof(struct aac_vmioctl)); @@ -546,6 +546,7 @@ aac_alloc_sync_fib(sc, &fib, 0); vmi = (struct aac_vmioctl *)&fib->data[0]; + bzero(vmi, sizeof(struct aac_vmioctl)); vmi->Command = VM_Ioctl; vmi->ObjType = FT_DRIVE; ==== //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_timer.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.17 2002/04/26 10:06:24 phk Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.18 2002/04/30 19:34:30 phk Exp $ */ #include "opt_acpi.h" #include @@ -102,8 +102,6 @@ "ACPI" }; -SYSCTL_OPAQUE(_debug, OID_AUTO, acpi_timecounter, CTLFLAG_RD, - &acpi_timer_timecounter, sizeof(acpi_timer_timecounter), "S,timecounter", ""); static int test_counter(void); #define N 2000 ==== //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ # $Id$ # -# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.11 2002/04/24 16:24:43 gibbs Exp $ +# $FreeBSD: src/sys/dev/aic7xxx/aicasm/Makefile,v 1.12 2002/05/01 06:50:59 peter Exp $ PROG= aicasm @@ -23,6 +23,9 @@ .endif CFLAGS+= -I/usr/include -I. +.ifdef MAKESRCPATH +CFLAGS+= -I${MAKESRCPATH} +.endif NOMAN= noman YFLAGS= -b ${.TARGET:R} ${.TARGET:M*macro*:S/$(.TARGET)/-p mm/} -d LFLAGS+= ${.TARGET:M*macro*:S/$(.TARGET)/-Pmm/} ==== //depot/projects/trustedbsd/audit/sys/dev/drm/drm_fops.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * Daryll Strauss * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.3 2002/04/29 18:18:42 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_fops.h,v 1.4 2002/05/03 07:45:26 tanimura Exp $ */ #define __NO_VERSION__ @@ -315,7 +315,7 @@ DRM_DEBUG("dev->buf_sigio=%p\n", dev->buf_sigio); if (dev->buf_sigio) { DRM_DEBUG("dev->buf_sigio->sio_pgid=%d\n", dev->buf_sigio->sio_pgid); - pgsigio(dev->buf_sigio, SIGIO, 0); + pgsigio(&dev->buf_sigio, SIGIO, 0); } DRM_DEBUG("waking\n"); wakeup(&dev->buf_rp); ==== //depot/projects/trustedbsd/audit/sys/dev/em/if_em.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.6 2002/04/28 20:34:19 phk Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.7 2002/05/02 22:21:01 pdeuskar Exp $*/ #include @@ -532,8 +532,8 @@ * Advance the Transmit Descriptor Tail (Tdt), this tells the E1000 * that this frame is available to transmit. */ - E1000_WRITE_REG(&adapter->shared, TDT, (((u_int32_t) adapter->next_avail_tx_desc - - (u_int32_t) adapter->first_tx_desc) >> 4)); + E1000_WRITE_REG(&adapter->shared, TDT, (((uintptr_t) adapter->next_avail_tx_desc - + (uintptr_t) adapter->first_tx_desc) >> 4)); } /* end of while loop */ splx(s); @@ -1716,8 +1716,8 @@ /* Setup the HW Rx Head and Tail Descriptor Pointers */ E1000_WRITE_REG(&adapter->shared, RDH, 0); E1000_WRITE_REG(&adapter->shared, RDT, - (((u_int32_t) adapter->last_rx_desc - - (u_int32_t) adapter->first_rx_desc) >> 4)); + (((uintptr_t) adapter->last_rx_desc - + (uintptr_t) adapter->first_rx_desc) >> 4)); /* Setup the Receive Control Register */ reg_rctl = E1000_RCTL_EN | E1000_RCTL_BAM | E1000_RCTL_LBM_NO | ==== //depot/projects/trustedbsd/audit/sys/dev/isp/isp.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.92 2002/04/16 19:55:35 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.93 2002/05/01 21:58:36 mjacob Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -107,6 +107,8 @@ static const char sc2[] = "%s CHAN %d TGT %d FLAGS 0x%x 0x%x/0x%x"; static const char sc3[] = "Generated"; static const char sc4[] = "NVRAM"; +static const char bun[] = + "bad underrun for %d.%d (count %d, resid %d, status %s)"; /* * Local function prototypes. @@ -4397,11 +4399,25 @@ break; case RQCS_DATA_UNDERRUN: + { + if (IS_FC(isp)) { + int ru_marked = (sp->req_scsi_status & RQCS_RU) != 0; + if (!ru_marked || sp->req_resid > XS_XFRLEN(xs)) { + isp_prt(isp, ISP_LOGWARN, bun, XS_TGT(xs), + XS_LUN(xs), XS_XFRLEN(xs), sp->req_resid, + (ru_marked)? "marked" : "not marked"); + if (XS_NOERR(xs)) { + XS_SETERR(xs, HBA_BOTCH); + } + return; + } + } XS_RESID(xs) = sp->req_resid; if (XS_NOERR(xs)) { XS_SETERR(xs, HBA_NOERROR); } return; + } case RQCS_XACT_ERR1: isp_prt(isp, ISP_LOGERR, xact1, XS_CHANNEL(xs), @@ -4424,8 +4440,8 @@ case RQCS_QUEUE_FULL: isp_prt(isp, ISP_LOGDEBUG0, - "internal queues full for %d.%d.%d status 0x%x", XS_TGT(xs), - XS_LUN(xs), XS_CHANNEL(xs), *XS_STSP(xs)); + "internal queues full for %d.%d.%d status 0x%x", + XS_CHANNEL(xs), XS_TGT(xs), XS_LUN(xs), *XS_STSP(xs)); /* * If QFULL or some other status byte is set, then this @@ -4507,13 +4523,14 @@ */ if ((sp->req_completion_status & 0xff) == RQCS_PORT_UNAVAILABLE) isp_prt(isp, ISP_LOGINFO, - "Port Unavailable for target %d", XS_TGT(xs)); + "port unavailable for target %d", XS_TGT(xs)); else isp_prt(isp, ISP_LOGINFO, "port logout for target %d", XS_TGT(xs)); /* * If we're on a local loop, force a LIP (which is overkill) - * to force a re-login of this unit. + * to force a re-login of this unit. If we're on fabric, + * then we'll have to relogin as a matter of course. */ if (FCPARAM(isp)->isp_topo == TOPO_NL_PORT || FCPARAM(isp)->isp_topo == TOPO_FL_PORT) { @@ -4933,8 +4950,8 @@ ISPOPMAP(0x00, 0x00), /* 0x58: */ ISPOPMAP(0x00, 0x00), /* 0x59: */ ISPOPMAP(0x00, 0x00), /* 0x5a: */ - ISPOPMAP(0x00, 0x00), /* 0x5b: */ - ISPOPMAP(0x00, 0x00), /* 0x5c: */ + ISPOPMAP(0x03, 0x01), /* 0x5b: MBOX_DRIVER_HEARTBEAT */ + ISPOPMAP(0xcf, 0x01), /* 0x5c: MBOX_FW_HEARTBEAT */ ISPOPMAP(0x07, 0x03), /* 0x5d: MBOX_GET_SET_DATA_RATE */ ISPOPMAP(0x00, 0x00), /* 0x5e: */ ISPOPMAP(0x00, 0x00), /* 0x5f: */ ==== //depot/projects/trustedbsd/audit/sys/dev/md/md.c#5 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.57 2002/03/20 09:55:07 jeff Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.58 2002/05/03 17:55:10 phk Exp $ * */ @@ -609,18 +609,6 @@ struct nameidata nd; int error, flags; - if (mdio->md_options & MD_AUTOUNIT) { - sc = mdnew(-1); - mdio->md_unit = sc->unit; - } else { - sc = mdnew(mdio->md_unit); - } - if (sc == NULL) - return (EBUSY); - - sc->type = MD_VNODE; - sc->flags = mdio->md_options & MD_FORCE; - flags = FREAD|FWRITE; NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); error = vn_open(&nd, &flags, 0); @@ -628,7 +616,6 @@ if (error != EACCES && error != EPERM && error != EROFS) return (error); flags &= ~FWRITE; - sc->flags |= MD_READONLY; NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, mdio->md_file, td); error = vn_open(&nd, &flags, 0); if (error) @@ -642,6 +629,22 @@ return (error ? error : EINVAL); } VOP_UNLOCK(nd.ni_vp, 0, td); + + if (mdio->md_options & MD_AUTOUNIT) { + sc = mdnew(-1); + mdio->md_unit = sc->unit; + } else { + sc = mdnew(mdio->md_unit); + } + if (sc == NULL) { + (void) vn_close(nd.ni_vp, flags, td->td_ucred, td); + return (EBUSY); + } + + sc->type = MD_VNODE; + sc->flags = mdio->md_options & MD_FORCE; + if (!(flags & FWRITE)) + sc->flags |= MD_READONLY; sc->secsize = DEV_BSIZE; sc->vnode = nd.ni_vp; ==== //depot/projects/trustedbsd/audit/sys/dev/mii/acphy.c#4 (text+ko) ==== @@ -89,7 +89,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/acphy.c,v 1.7 2002/04/29 13:07:31 phk Exp $"; + "$FreeBSD: src/sys/dev/mii/acphy.c,v 1.8 2002/05/01 19:15:54 semenu Exp $"; #endif static int acphy_probe (device_t); @@ -176,33 +176,31 @@ struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; + /* + * If we're not selected, then do nothing, just isolate and power + * down, if changing media. + */ + if (IFM_INST(ife->ifm_media) != sc->mii_inst) { + if (cmd == MII_MEDIACHG) { + reg = PHY_READ(sc, MII_BMCR); + PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO | BMCR_PDOWN); + } + + return (0); + } + switch (cmd) { case MII_POLLSTAT: - /* - * If we're not polling our PHY instance, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); break; case MII_MEDIACHG: /* - * If the media indicates a different PHY instance, - * isolate ourselves. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) { - reg = PHY_READ(sc, MII_BMCR); - PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO | BMCR_PDOWN); - return (0); - } - - /* * If the interface is not up, don't do anything. */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) break; - /* Wake & deisolate up is needed */ + /* Wake & deisolate up if necessary */ reg = PHY_READ(sc, MII_BMCR); if (reg & (BMCR_ISO | BMCR_PDOWN)) PHY_WRITE(sc, MII_BMCR, reg & ~(BMCR_ISO | BMCR_PDOWN)); @@ -230,12 +228,6 @@ case MII_TICK: /* - * If we're not currently selected, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); - - /* * Is the interface even up? */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) @@ -248,23 +240,8 @@ break; /* - * check for link. - * Read the status register twice; BMSR_LINK is latch-low. + * This PHY's autonegotiation doesn't need to be kicked. */ - reg = PHY_READ(sc, MII_BMSR) | PHY_READ(sc, MII_BMSR); - if (reg & BMSR_LINK) - break; - - /* - * Only retry autonegotiation every 5 seconds. - */ - if (++sc->mii_ticks != 5) - return (0); - - sc->mii_ticks = 0; - acphy_reset(sc); - if (mii_phy_auto(sc, 0) == EJUSTRETURN) - return (0); break; } @@ -308,8 +285,7 @@ mii->mii_media_active |= IFM_NONE; return; } - diag = PHY_READ(sc, MII_ACPHY_DIAG) | - PHY_READ(sc, MII_ACPHY_DIAG); + diag = PHY_READ(sc, MII_ACPHY_DIAG); if (diag & AC_DIAG_SPEED) mii->mii_media_active |= IFM_100_TX; else ==== //depot/projects/trustedbsd/audit/sys/dev/mii/qsphy.c#4 (text+ko) ==== @@ -93,7 +93,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/qsphy.c,v 1.6 2002/04/29 13:07:32 phk Exp $"; + "$FreeBSD: src/sys/dev/mii/qsphy.c,v 1.7 2002/05/01 19:15:54 semenu Exp $"; #endif static int qsphy_probe (device_t); @@ -180,27 +180,25 @@ struct ifmedia_entry *ife = mii->mii_media.ifm_cur; int reg; + /* + * If we're not selected, then do nothing, just isolate, if + * changing media. + */ + if (IFM_INST(ife->ifm_media) != sc->mii_inst) { + if (cmd == MII_MEDIACHG) { + reg = PHY_READ(sc, MII_BMCR); + PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO); + } + + return (0); + } + switch (cmd) { case MII_POLLSTAT: - /* - * If we're not polling our PHY instance, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); break; case MII_MEDIACHG: /* - * If the media indicates a different PHY instance, - * isolate ourselves. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) { - reg = PHY_READ(sc, MII_BMCR); - PHY_WRITE(sc, MII_BMCR, reg | BMCR_ISO); - return (0); - } - - /* * If the interface is not up, don't do anything. */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) @@ -229,12 +227,6 @@ case MII_TICK: /* - * If we're not currently selected, just return. - */ - if (IFM_INST(ife->ifm_media) != sc->mii_inst) - return (0); - - /* * Is the interface even up? */ if ((mii->mii_ifp->if_flags & IFF_UP) == 0) @@ -247,23 +239,8 @@ break; /* - * check for link. - * Read the status register twice; BMSR_LINK is latch-low. + * This PHY's autonegotiation doesn't need to be kicked. */ - reg = PHY_READ(sc, MII_BMSR) | PHY_READ(sc, MII_BMSR); - if (reg & BMSR_LINK) - break; - - /* - * Only retry autonegotiation every 5 seconds. - */ - if (++sc->mii_ticks != 5) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 10:41:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BDE837B40D; Mon, 6 May 2002 10:40:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail17.speakeasy.net [216.254.0.217]) by hub.freebsd.org (Postfix) with ESMTP id E308C37B409 for ; Mon, 6 May 2002 10:40:40 -0700 (PDT) Received: (qmail 22884 invoked from network); 6 May 2002 17:40:40 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail17.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 6 May 2002 17:40:40 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g46HedF25000; Mon, 6 May 2002 13:40:39 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20020504045136.P81190@stylus.haikugeek.com> Date: Mon, 06 May 2002 13:40:32 -0400 (EDT) From: John Baldwin To: Jonathan Mini Subject: Re: PERFORCE change 10778 for review Cc: Perforce Change Reviews Cc: Perforce Change Reviews , Julian Elischer Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 04-May-2002 Jonathan Mini wrote: > Julian Elischer [julian@elischer.org] wrote : > >> We are probably missing something.. >> I never had any pagefaults before.. >> (though I was not on an MP machine) > > I am not running this on an MP machine. This is the setup of my test box: > > CPU: AMD-K6(tm) 3D processor (400.91-MHz 586-class CPU) > Origin = "AuthenticAMD" Id = 0x58c Stepping = 12 > Features=0x8021bf > AMD Features=0x80000800 > real memory = 134217728 (131072K bytes) > pcib0: at pcibus 0 on > motherboard > fxp0: port 0xe000-0xe01f mem > 0xe4000000-0xe40fffff,0xe4101000-0xe4101fff irq 10 at device 14.0 on pci0 > ata0: at 0x1f0 irq 14 on atapci0 > ad0: 28629MB [58168/16/63] at ata0-master UDMA33 > sio0: type 16550A, console > > A bit overkill for this testing, but it was my main system before I bought > the dual Althon 1900 system I'm using for a workstation. > >> I've been trying to get the diff utility to do the right thing but it >> consistantly fails.. >> >> apparently I'm adding the wrong tag or soemthing.. > > I dunno, this is all fscked up. Did you do 'p4 labelsync -l kse_base #head' on the last integ from current? Hmm, btw, why doesn't thread_single_foo() take a proc pointer as an argument? btw, p4 diff2 -u -b kse @10751 #head is decent at least -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 10:41:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0070C37B417; Mon, 6 May 2002 10:40:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by hub.freebsd.org (Postfix) with ESMTP id 75F9C37B401 for ; Mon, 6 May 2002 10:40:47 -0700 (PDT) Received: (qmail 29906 invoked from network); 6 May 2002 17:40:46 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 6 May 2002 17:40:46 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g46HejF25004; Mon, 6 May 2002 13:40:45 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200205041256.g44CuEl72375@freefall.freebsd.org> Date: Mon, 06 May 2002 13:40:38 -0400 (EDT) From: John Baldwin To: Jonathan Mini Subject: RE: PERFORCE change 10786 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 04-May-2002 Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10786 > > Change 10786 by mini@mini_stylus on 2002/05/04 05:55:43 > > After freeing td_ucred, set it to NULL so that we know we've released > our refcount and don't do it again. You didn't read the comment above this line did you. It's quite a long comment for a reason. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 11: 9:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD65837B409; Mon, 6 May 2002 11:09:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0722537B408 for ; Mon, 6 May 2002 11:09:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g46I9jf95848 for perforce@freebsd.org; Mon, 6 May 2002 11:09:45 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Mon, 6 May 2002 11:09:45 -0700 (PDT) Message-Id: <200205061809.g46I9jf95848@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 10899 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10899 Change 10899 by cvance@cvance_korben on 2002/05/06 11:09:20 Clean up extraneous printfs Break off SYSCTLs into a separate file, add a new node that prints out the list of SIDs active in the security server. Affected files ... ... //depot/projects/trustedbsd/mac/sys/conf/files#28 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#5 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_sysctl.c#1 add Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/files#28 (text+ko) ==== @@ -1300,6 +1300,7 @@ security/mac_none/mac_none.c optional mac_none security/sebsd/sebsd.c optional sebsd +security/sebsd/sebsd_sysctl.c optional sebsd security/sebsd/avc/avc.c optional sebsd security/sebsd/ss/avtab.c optional sebsd security/sebsd/ss/ebitmap.c optional sebsd ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#5 (text+ko) ==== @@ -48,59 +48,21 @@ #include #include #include -#include #include -#ifdef MAC - -SYSCTL_DECL(_security_mac); - -SYSCTL_NODE(_security_mac, OID_AUTO, sebsd, CTLFLAG_RW, 0, - "Security Enhanced BSD policy controls"); - -static int sebsd_enabled = 1; - -SYSCTL_INT(_security_mac_sebsd, OID_AUTO, enabled, CTLFLAG_RW, - &sebsd_enabled, 0, "Enforce Security Enhanced BSD policy"); - -TUNABLE_INT("security.mac.sebsd.enabled", &sebsd_enabled); - MALLOC_DEFINE(M_SEBSD, "sebsd", "Security Enhanced BSD"); -static int -sysctl_rule(SYSCTL_HANDLER_ARGS) -{ - u_int namelen; - int *name; - - name = (int *)arg1; - namelen = arg2; - - printf("bsdextended sysctl handler (namelen %d)\n", namelen); - - return (0); -} - -SYSCTL_NODE(_security_mac_sebsd, OID_AUTO, rules, - CTLFLAG_RW, sysctl_rule, "Security Enhanced BSD rules"); - static void sebsd_init(struct mac_policy_conf *mpc) { printf("sebsd:: init\n"); - - /* Initialize ruleset lock. */ - /* Register dynamic sysctl's for rules. */ } static void sebsd_destroy(struct mac_policy_conf *mpc) { - printf("sebsd:: destroy\n"); - /* Tear down sysctls. */ - /* Destroy ruleset lock. */ } /* @@ -110,7 +72,6 @@ static void sebsd_create_root_mount(struct ucred *cred, struct mount *mp) { - printf("sebsd hook:: create_root_mount\n"); if (security_init()) { panic("SEBSD: couldn't read policy file"); } @@ -125,5 +86,3 @@ MAC_POLICY_SET(sebsd_ops, trustedbsd_sebsd, "Security Enhanced BSD", MPC_LOADTIME_FLAG_NOTLATE, 1); - -#endif /* !MAC */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 14:38:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B24537B405; Mon, 6 May 2002 14:38:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7190837B419 for ; Mon, 6 May 2002 14:37:59 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g46LbxA26573 for perforce@freebsd.org; Mon, 6 May 2002 14:37:59 -0700 (PDT) (envelope-from amigus@tislabs.com) Date: Mon, 6 May 2002 14:37:59 -0700 (PDT) Message-Id: <200205062137.g46LbxA26573@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@tislabs.com using -f From: Adam Migus Subject: PERFORCE change 10904 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10904 Change 10904 by amigus@amigus_ganymede on 2002/05/06 14:37:43 Oops. Also added a const. Affected files ... ... //depot/projects/trustedbsd/mac/libexec/getty/main.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/libexec/getty/main.c#7 (text+ko) ==== @@ -247,12 +247,12 @@ * login_getpwclass() will default, so if * login_getuserclass() fails here we call it to * ensure that a label gets set on the tty. - * / + */ if(lc == NULL) lc = login_getpwclass(rootpw); if (lc != NULL) { - char *rootmacstr; + const char *rootmacstr; rootmacstr = login_getcapstr(lc, "ttylabel", NULL, NULL); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 14:43:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6897337B403; Mon, 6 May 2002 14:43:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by hub.freebsd.org (Postfix) with ESMTP id 203C137B41A for ; Mon, 6 May 2002 14:43:24 -0700 (PDT) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.11.6/8.11.4) with ESMTP id g46LhCJ24365; Mon, 6 May 2002 14:43:12 -0700 (PDT) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.3/8.12.2) with ESMTP id g46LhgOK000341; Mon, 6 May 2002 14:43:42 -0700 (PDT) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.3/8.12.3/Submit) id g46LhgKj000340; Mon, 6 May 2002 14:43:42 -0700 (PDT) Date: Mon, 6 May 2002 14:43:42 -0700 From: Marcel Moolenaar To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10878 for review Message-ID: <20020506214342.GA314@dhcp01.pn.xcllnt.net> References: <200205060719.g467JCY92734@freefall.freebsd.org> <20020506075013.4963C3811@overcee.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020506075013.4963C3811@overcee.wemm.org> User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, May 06, 2002 at 12:50:13AM -0700, Peter Wemm wrote: > Marcel Moolenaar wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10878 > > > > Change 10878 by marcel@marcel_vaio on 2002/05/06 00:18:07 > > > > We need libc_r if we want to build X libraries. Make it so. > > This still needs testing. > > dfr told me we couldn't use this since setjmp didn't support jumping > to a different stack, and we'd have to use a swapcontext() style thing. Oh, ok. The *context effort by deischen appears on hold. I seem to recall that we want it implemented as a syscall for the non-thread case. Is there any news on that front? BTW: I'm not going to worry about libc_r. Of all the things we need to do, I think I'd better focus on ptrace for now. My machine checks have been reduced after I put the SCSI controller in a different slot, so I don't desperately need proper MCA support to make my machine usable. The login coredump has gone away, so I don't have to get ski working for useland that badly in order to diagnose that... PS: Let me know if what I did is as good as useless. I'll nuke before we start maintaining it.. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 14:56:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7860C37B400; Mon, 6 May 2002 14:56:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0DF1937B40D for ; Mon, 6 May 2002 14:56:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g46LuLd28054 for perforce@freebsd.org; Mon, 6 May 2002 14:56:21 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 6 May 2002 14:56:21 -0700 (PDT) Message-Id: <200205062156.g46LuLd28054@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10906 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10906 Change 10906 by arr@arr_shibby on 2002/05/06 14:56:13 - Change a prototype Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#26 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#26 (text+ko) ==== @@ -261,6 +261,6 @@ struct vnode *audit_write_init(const char *, struct thread *, struct ucred **); void audit_write_shutdown(struct vnode *, struct thread *, struct ucred *); audit_record_t *audit_record_init(int, size_t); -void audit_write_thread(void *); +void audit_write_thread(void); #endif /* !_SYS_AUDIT_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 14:57:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE51A37B403; Mon, 6 May 2002 14:56:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CA1C237B404 for ; Mon, 6 May 2002 14:56:21 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g46LuLU28049 for perforce@freebsd.org; Mon, 6 May 2002 14:56:21 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 6 May 2002 14:56:21 -0700 (PDT) Message-Id: <200205062156.g46LuLU28049@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10905 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10905 Change 10905 by arr@arr_shibby on 2002/05/06 14:55:44 - Move kthread_create out of the audit_init routine and make it its own SYSINIT. Rather than starting up the writer thread via kthread_create, we use kproc_start in a similar fashion to the bufdaemon startup code. - Make audit_write_thread have a void argument. - Change the locking with audit_write_thread to use msleep. - Change SYSINITs to have the system init value followed by the order within that system for the routine to be called. This unbreaks initializing the audit system. - Other various changes related to making things work. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#32 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#32 (text+ko) ==== @@ -54,6 +54,7 @@ */ struct mtx audit_q_mtx; struct mtx audit_z_mtx; + struct audit_record_list record_queue; static uma_zone_t record_zone; static int audit_shutdown_flag = 0; @@ -66,7 +67,6 @@ * static size_t pool_size = 32; */ - audit_record_t * audit_record_init(int type, size_t evsz) { @@ -108,10 +108,17 @@ panic("audit_init: unable to init audit record zone"); TAILQ_INIT(&record_queue); audit_shutdown_flag = 0; - (void)kthread_create(&audit_write_thread, NULL, NULL, RFNOWAIT, - "TrustedBSD audit write thread"); } -SYSINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_init, NULL); +SYSINIT(tbsd_audit, SI_SUB_MAC, SI_ORDER_ANY, &audit_init, NULL); + +static struct proc *auditproc; +static struct kproc_desc auditdesc = { + "audit", + audit_write_thread, + &auditproc +}; +SYSINIT(audit_thread, SI_SUB_KTHREAD_UPDATE, SI_ORDER_ANY, kproc_start, + &auditdesc); void audit_shutdown(void) @@ -121,32 +128,25 @@ uma_zdestroy(record_zone); mtx_destroy(&audit_q_mtx); mtx_destroy(&audit_z_mtx); -} -SYSUNINIT(tbsd_audit, SI_ORDER_ANY, SI_SUB_MAC, &audit_shutdown, NULL); +}; +SYSUNINIT(tbsd_audit, SI_SUB_MAC, SI_ORDER_ANY, &audit_shutdown, NULL); void -audit_write_thread(void *arg) +audit_write_thread(void) { audit_record_t *ar; mtx_lock(&audit_q_mtx); for (;;) { ar = NULL; - TAILQ_REMOVE(&record_queue, ar, ar_next); - - /* - * If we don't exit, we might try to zfree - * an object that no longer has a zone.. Oof. - */ - if (audit_shutdown_flag) { - mtx_unlock(&audit_q_mtx); + if (audit_shutdown_flag) kthread_exit(0); + if (!TAILQ_EMPTY(&record_queue)) { + ar = TAILQ_FIRST(&record_queue); + TAILQ_REMOVE(&record_queue, ar, ar_next); } - if (ar != NULL) uma_zfree(record_zone, ar); - else - msleep(&record_queue, &audit_q_mtx, PWAIT, - "record queue", 0); + msleep(&record_queue, &audit_q_mtx, PWAIT, "record queue", 0); } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 15: 4:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3A9A37B40B; Mon, 6 May 2002 15:04:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3D38537B406 for ; Mon, 6 May 2002 15:04:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g46M4WH28726 for perforce@freebsd.org; Mon, 6 May 2002 15:04:32 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 6 May 2002 15:04:32 -0700 (PDT) Message-Id: <200205062204.g46M4WH28726@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10907 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10907 Change 10907 by arr@arr_shibby on 2002/05/06 15:04:13 - Remove audit_z_mtx -- need to still rename audit_q_mtx. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#33 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#33 (text+ko) ==== @@ -53,7 +53,6 @@ * */ struct mtx audit_q_mtx; -struct mtx audit_z_mtx; struct audit_record_list record_queue; static uma_zone_t record_zone; @@ -81,10 +80,7 @@ * evsz = ev_size_tab[type]; */ - mtx_lock(&audit_z_mtx); rec = uma_zalloc(record_zone, M_NOWAIT|M_ZERO); - mtx_unlock(&audit_z_mtx); - h = &rec->ar_hdr; h->ah_v = AUDIT_VERSION; h->ah_id = audit_id++; @@ -101,7 +97,6 @@ { mtx_init(&audit_q_mtx, "audit q lock", NULL, MTX_DEF); - mtx_init(&audit_z_mtx, "audit z lock", NULL, MTX_DEF); record_zone = uma_zcreate("AUDIT", sizeof(audit_record_t), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); if (record_zone == NULL) @@ -127,7 +122,6 @@ audit_shutdown_flag = 1; uma_zdestroy(record_zone); mtx_destroy(&audit_q_mtx); - mtx_destroy(&audit_z_mtx); }; SYSUNINIT(tbsd_audit, SI_SUB_MAC, SI_ORDER_ANY, &audit_shutdown, NULL); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 15: 5:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D63D937B408; Mon, 6 May 2002 15:05:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E062F37B403 for ; Mon, 6 May 2002 15:05:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g46M5XH32548 for perforce@freebsd.org; Mon, 6 May 2002 15:05:33 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 6 May 2002 15:05:33 -0700 (PDT) Message-Id: <200205062205.g46M5XH32548@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10908 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10908 Change 10908 by arr@arr_shibby on 2002/05/06 15:04:36 - Finish removal of audit_z_mtx Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#27 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#27 (text+ko) ==== @@ -105,7 +105,6 @@ copystr((kpath), (obj)->ao_name, sizeof(obj)->ao_name, NULL) extern struct mtx audit_q_mtx; -extern struct mtx audit_z_mtx; extern struct audit_record_list record_queue; #define AUDIT_RECORD_ENQ(ar) do { \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 15:17:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4626237B405; Mon, 6 May 2002 15:17:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 814A537B403 for ; Mon, 6 May 2002 15:17:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g46MHnh33611 for perforce@freebsd.org; Mon, 6 May 2002 15:17:49 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 6 May 2002 15:17:49 -0700 (PDT) Message-Id: <200205062217.g46MHnh33611@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10910 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10910 Change 10910 by arr@arr_shibby on 2002/05/06 15:17:43 - Create a fairly lame _audit_print_record(). This will be wrapped with AUDIT_DEBUG (yeesh) shortly. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#34 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#34 (text+ko) ==== @@ -125,7 +125,22 @@ }; SYSUNINIT(tbsd_audit, SI_SUB_MAC, SI_ORDER_ANY, &audit_shutdown, NULL); +static __inline void +_audit_print_record(audit_record_t *ar) +{ + audit_header_t *ah; + audit_subject_t *as; + audit_object_t *ao; + + ah = &ar->ar_hdr; + as = &ar->ar_subj; + ao = &ar->ar_obj; + + printf("AUDIT RECORD! TYPE: %d\n", ah->ah_type); +} + +void audit_write_thread(void) { audit_record_t *ar; @@ -139,8 +154,10 @@ ar = TAILQ_FIRST(&record_queue); TAILQ_REMOVE(&record_queue, ar, ar_next); } - if (ar != NULL) + if (ar != NULL) { + _audit_print_record(ar); uma_zfree(record_zone, ar); + } msleep(&record_queue, &audit_q_mtx, PWAIT, "record queue", 0); } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 15:50:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DD8B37B404; Mon, 6 May 2002 15:50:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8BFE737B401 for ; Mon, 6 May 2002 15:50:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g46MoT936172 for perforce@freebsd.org; Mon, 6 May 2002 15:50:29 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 6 May 2002 15:50:29 -0700 (PDT) Message-Id: <200205062250.g46MoT936172@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10912 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10912 Change 10912 by arr@arr_shibby on 2002/05/06 15:50:20 - Add the AUDIT_DEBUG option Affected files ... ... //depot/projects/trustedbsd/audit/sys/conf/options#6 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/conf/options#6 (text+ko) ==== @@ -106,6 +106,7 @@ # TrustedBSD and POSIX.1e Kernel Options CAPABILITIES opt_cap.h +AUDIT_DEBUG opt_audit.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 15:52:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B86437B407; Mon, 6 May 2002 15:52:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6DD5237B405 for ; Mon, 6 May 2002 15:52:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g46MqWL36273 for perforce@freebsd.org; Mon, 6 May 2002 15:52:32 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Mon, 6 May 2002 15:52:32 -0700 (PDT) Message-Id: <200205062252.g46MqWL36273@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10913 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10913 Change 10913 by arr@arr_shibby on 2002/05/06 15:52:07 - Change audit_print_record -> _audit_print_record - Add the #define'd macro ``audit_print_record'' and have it wrap _audit_print_record, or nothing, depending on whether or not AUDIT_DEBUG is defined. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#35 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#35 (text+ko) ==== @@ -47,6 +47,8 @@ #include +#include "opt_audit.h" + /* * There might be a need to use another lock besides just audit_mtx * because of thrashing with the record_queue and memory allocation. @@ -59,6 +61,14 @@ static int audit_shutdown_flag = 0; static int audit_id = 0; +static __inline void _audit_print_record(audit_record_t *); + +#ifdef AUDIT_DEBUG +#define audit_print_record(ar) _audit_print_record((ar)) +#else +#define audit_print_record(ar) +#endif + /* * Re-add this later when handling the decrease in the pool * size can be properly handled. @@ -155,7 +165,7 @@ TAILQ_REMOVE(&record_queue, ar, ar_next); } if (ar != NULL) { - _audit_print_record(ar); + audit_print_record(ar); uma_zfree(record_zone, ar); } msleep(&record_queue, &audit_q_mtx, PWAIT, "record queue", 0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 18:24:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8D7537B401; Mon, 6 May 2002 18:24:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id B88F237B404; Mon, 6 May 2002 18:24:10 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 2540AA900; Mon, 6 May 2002 18:27:04 -0700 (PDT) Date: Mon, 6 May 2002 18:27:03 -0700 From: Jonathan Mini To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 10786 for review Message-ID: <20020506182703.A90519@stylus.haikugeek.com> References: <200205041256.g44CuEl72375@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from jhb@FreeBSD.org on Mon, May 06, 2002 at 01:40:38PM -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin [jhb@FreeBSD.org] wrote : > > On 04-May-2002 Jonathan Mini wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10786 > > > > Change 10786 by mini@mini_stylus on 2002/05/04 05:55:43 > > > > After freeing td_ucred, set it to NULL so that we know we've released > > our refcount and don't do it again. > > You didn't read the comment above this line did you. It's quite a long > comment for a reason. Hmm. I did, but I guess it didn't sink in. The problem is that something was using it, and it was causing a panic. Now that I think about it, maybe I was just bandaiding the symptoms. I'll back this out on my box and dig a little deeper. -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 19:30:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F326737B400; Mon, 6 May 2002 19:30:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4848337B400 for ; Mon, 6 May 2002 19:30:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g472U0w71040 for perforce@freebsd.org; Mon, 6 May 2002 19:30:00 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 6 May 2002 19:30:00 -0700 (PDT) Message-Id: <200205070230.g472U0w71040@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10928 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10928 Change 10928 by peter@peter_ia64 on 2002/05/06 19:29:17 hack for 'make world' with gcc-3.1. It seems that during stage 4, it wants to find cpp0 on the $PATH, and at this point it only lives in $OBJDIRPATH Affected files ... ... //depot/projects/ia64/Makefile.inc1#22 edit Differences ... ==== //depot/projects/ia64/Makefile.inc1#22 (text+ko) ==== @@ -203,7 +203,7 @@ WMAKEENV= ${CROSSENV} \ DESTDIR=${WORLDTMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ - PATH=${TMPPATH} + PATH=${TMPPATH}:${OBJFORMAT_PATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 # install stage To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 19:32:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05D7A37B404; Mon, 6 May 2002 19:32:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3376237B401 for ; Mon, 6 May 2002 19:32:03 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g472W2R71345 for perforce@freebsd.org; Mon, 6 May 2002 19:32:02 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 6 May 2002 19:32:02 -0700 (PDT) Message-Id: <200205070232.g472W2R71345@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10929 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10929 Change 10929 by peter@peter_ia64 on 2002/05/06 19:31:55 expose a few more "internal" targets. These can be used to resume 'make world' after fixing fixable problems. Affected files ... ... //depot/projects/ia64/Makefile#5 edit Differences ... ==== //depot/projects/ia64/Makefile#5 (text+ko) ==== @@ -86,7 +86,9 @@ cleandepend cleandir depend distribute distributeworld everything \ hierarchy includes install installcheck installkernel \ reinstallkernel installmost installworld libraries lint \ - mk most obj objlink regress rerelease tags update + mk most obj objlink regress rerelease tags update \ + _worldtmp _bootstrap-tools _cleanobj _obj _build-tools + _cross-tools _includes _libraries _depend .ORDER: buildworld installworld .ORDER: buildworld distributeworld To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 6 20:11:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6717C37B400; Mon, 6 May 2002 20:11:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3662F37B407 for ; Mon, 6 May 2002 20:11:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g473BqA78051 for perforce@freebsd.org; Mon, 6 May 2002 20:11:52 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 6 May 2002 20:11:52 -0700 (PDT) Message-Id: <200205070311.g473BqA78051@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 10932 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10932 Change 10932 by peter@peter_ia64 on 2002/05/06 20:11:41 argh. Trailing \ Affected files ... ... //depot/projects/ia64/Makefile#6 edit Differences ... ==== //depot/projects/ia64/Makefile#6 (text+ko) ==== @@ -87,7 +87,7 @@ hierarchy includes install installcheck installkernel \ reinstallkernel installmost installworld libraries lint \ mk most obj objlink regress rerelease tags update \ - _worldtmp _bootstrap-tools _cleanobj _obj _build-tools + _worldtmp _bootstrap-tools _cleanobj _obj _build-tools \ _cross-tools _includes _libraries _depend .ORDER: buildworld installworld To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 7 7:55:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80BDE37B40C; Tue, 7 May 2002 07:55:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B08EA37B403 for ; Tue, 7 May 2002 07:55:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g47EtbN90702 for perforce@freebsd.org; Tue, 7 May 2002 07:55:37 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Tue, 7 May 2002 07:55:37 -0700 (PDT) Message-Id: <200205071455.g47EtbN90702@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 10954 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10954 Change 10954 by mini@mini_stylus on 2002/05/07 07:55:28 Instead of marking ucred NULL when we drop our reference, don't try to drop ucred again in thread_reap(), because it is always dropped before thread_reap() is called. Affected files ... ... //depot/projects/kse/sys/kern/kern_exit.c#45 edit ... //depot/projects/kse/sys/kern/kern_thread.c#44 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_exit.c#45 (text+ko) ==== @@ -375,7 +375,6 @@ * in theory nothing should be using it at this point. */ crfree(td->td_ucred); - td->td_ucred = NULL; /* * Remove proc from allproc queue and pidhash chain. ==== //depot/projects/kse/sys/kern/kern_thread.c#44 (text+ko) ==== @@ -107,13 +107,6 @@ if (td == NULL) return; #endif - /* Undo all the linkages made by proc_linkup */ - /* thread_unlink(td); */ /* already done in thread_exit() */ - - if (td->td_ucred) { - crfree(td->td_ucred); - td->td_ucred = NULL; - } active_threads--; if (cached_threads < thread_cache_size) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 7 8: 8: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01C9E37B401; Tue, 7 May 2002 08:07:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3F5A837B403 for ; Tue, 7 May 2002 08:07:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g47F7rh95483 for perforce@freebsd.org; Tue, 7 May 2002 08:07:53 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 7 May 2002 08:07:53 -0700 (PDT) Message-Id: <200205071507.g47F7rh95483@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 10955 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10955 Change 10955 by jhb@jhb_laptop on 2002/05/07 08:07:02 Add a debugging printf for the time being to see if I can figure out why we are getting so many dead witnesses. Affected files ... ... //depot/projects/smpng/sys/kern/subr_witness.c#48 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#48 (text+ko) ==== @@ -382,6 +382,8 @@ mtx_lock_spin(&w_mtx); MPASS(w->w_refcount > 0); w->w_refcount--; + if (w->w_refcount == 0) + printf("dead witness: %s\n", w->w_name); mtx_unlock_spin(&w_mtx); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 7 14: 5:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22C4E37B400; Tue, 7 May 2002 14:05:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 53F6137B409 for ; Tue, 7 May 2002 14:05:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g47L58d47891 for perforce@freebsd.org; Tue, 7 May 2002 14:05:08 -0700 (PDT) (envelope-from amigus@tislabs.com) Date: Tue, 7 May 2002 14:05:08 -0700 (PDT) Message-Id: <200205072105.g47L58d47891@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@tislabs.com using -f From: Adam Migus Subject: PERFORCE change 10969 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10969 Change 10969 by amigus@amigus_ganymede on 2002/05/07 14:04:56 passwd and friends fail when the user has a '+' in their passwd file for NIS. It fails because _PWF_SOURCE is not set. This patch fixes it. This is also a bug in 5.0-CURRENT so someone should commit it to the main tree. Affected files ... ... //depot/projects/trustedbsd/mac/lib/libc/gen/getpwent.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/gen/getpwent.c#4 (text+ko) ==== @@ -966,6 +966,9 @@ break; } break; + default: + _pw_passwd.pw_fields &= ~_PWF_SOURCE; + _pw_passwd.pw_fields |= _PWF_FILES; } if ((search == _PW_KEYBYNAME && strcmp(_pw_passwd.pw_name, name) == 0) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 7 15:53:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A927537B401; Tue, 7 May 2002 15:53:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 94CCE37B400 for ; Tue, 7 May 2002 15:53:26 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g47MrQ063576 for perforce@freebsd.org; Tue, 7 May 2002 15:53:26 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Tue, 7 May 2002 15:53:26 -0700 (PDT) Message-Id: <200205072253.g47MrQ063576@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10979 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10979 Change 10979 by arr@arr_shibby on 2002/05/07 15:52:58 - Created AUDIT_EV_RESULT() to return "Success" or "Failure" string based upon a given ah_evresult from an audit header. - Created _dump_audit_hdr(), _dump_audit_subj(), and _dump_audit_obj() that just calls printf to display the record. - Moved _audit_print_record to audit.h for now. Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#28 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#28 (text+ko) ==== @@ -51,7 +51,7 @@ #define AUDIT #endif -#define AUDIT_VERSION 0 +#define AUDIT_VERSION 1 typedef u_int audit_id_t; typedef u_char audit_status_t; @@ -211,7 +211,7 @@ typedef struct audit_header { audit_status_t ah_evresult; - unsigned short ah_v; + unsigned int ah_v; int ah_errno; audit_id_t ah_id; unsigned int ah_len; /* including hdr & evinfo */ @@ -223,6 +223,23 @@ /* Values for ah_evresult */ #define AUDIT_EVR_SUCCESS 1 #define AUDIT_EVR_FAILED 2 + +#define AUDIT_EV_RESULT(res) ((res == AUDIT_EVR_SUCCESS) ? "Success" : "Failure") + +static __inline +void +_dump_audit_hdr(audit_header_t *ahp) +{ + + printf("---[ HEADER ]---\n" + "-[ Version: %u, Record ID: %u\n" + "-[ Result: %s, errno: %d\n" + "-[ Time event occured: %x\n", + ahp->ah_v, ahp->ah_id, + AUDIT_EV_RESULT(ahp->ah_evresult), ahp->ah_errno, + &ahp->ah_evtime); +} + typedef struct audit_subject { uid_t as_euid; /* Effective UID */ @@ -231,7 +248,19 @@ uid_t as_uid; /* (real) User ID */ } audit_subject_t; #define AUDIT_SUBJ_LEN sizeof(audit_subject_t) - + +static __inline +void +_dump_audit_subj(audit_subject_t *asp) +{ + + printf("---[ SUBJECT ]---\n" + "-[ Process ID: %u\n" + "-[ Effective uid: %u, Real uid: %u\n" + "-[ Group ID: %u\n", + asp->as_pid, asp->as_euid, asp->as_uid, asp->as_gid); +} + /* * As with vattr fields, those that are unable to be filled will * be set to VNOVAL (or to 0 for ao_pathname). @@ -245,6 +274,16 @@ } audit_object_t; #define AUDIT_OBJ_LEN sizeof(audit_object_t) +static __inline +void +_dump_audit_obj(audit_object_t *aop) +{ + + printf("---[ OBJECT ]---\n" + "-[ User ID: %u, Group ID: %u\n", + aop->ao_uid, aop->ao_gid); +} + typedef struct audit_record { TAILQ_ENTRY(audit_record) ar_next; struct audit_header ar_hdr; @@ -254,6 +293,25 @@ } audit_record_t; TAILQ_HEAD(audit_record_list, audit_record); +static __inline +void +_audit_print_record(audit_record_t *ar) +{ + audit_header_t *ah; + audit_subject_t *as; + audit_object_t *ao; + + ah = &ar->ar_hdr; + as = &ar->ar_subj; + ao = &ar->ar_obj; + + printf("----------------------------------------------------------\n"); + _dump_audit_hdr(ah); + _dump_audit_subj(as); + _dump_audit_obj(ao); + printf("----------------------------------------------------------\n"); +} + void audit_init(void); void audit_shutdown(void); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 7 16: 1:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1737137B403; Tue, 7 May 2002 16:01:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 999C037B407 for ; Tue, 7 May 2002 16:01:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g47N1bI64458 for perforce@freebsd.org; Tue, 7 May 2002 16:01:37 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Tue, 7 May 2002 16:01:37 -0700 (PDT) Message-Id: <200205072301.g47N1bI64458@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10980 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10980 Change 10980 by arr@arr_shibby on 2002/05/07 16:01:29 - Include atomic.h - Add a KASSERT() in audit_record_init - Use an atomic operation to increment the audit record id global variable. - Remove some remnants related to the _audit_print_record() move. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#36 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#36 (text+ko) ==== @@ -45,6 +45,8 @@ #include #include +#include + #include #include "opt_audit.h" @@ -61,8 +63,6 @@ static int audit_shutdown_flag = 0; static int audit_id = 0; -static __inline void _audit_print_record(audit_record_t *); - #ifdef AUDIT_DEBUG #define audit_print_record(ar) _audit_print_record((ar)) #else @@ -91,14 +91,15 @@ */ rec = uma_zalloc(record_zone, M_NOWAIT|M_ZERO); + KASSERT(rec != NULL, ("audit_record_init")); h = &rec->ar_hdr; h->ah_v = AUDIT_VERSION; - h->ah_id = audit_id++; + atomic_add_int(&audit_id, 1); + h->ah_id = audit_id; h->ah_len = AUDIT_RECORD_SZ + evsz; h->ah_type = type; h->ah_evresult = AUDIT_EVR_FAILED; nanotime(&h->ah_evtime); - return (rec); } @@ -135,21 +136,6 @@ }; SYSUNINIT(tbsd_audit, SI_SUB_MAC, SI_ORDER_ANY, &audit_shutdown, NULL); -static __inline -void -_audit_print_record(audit_record_t *ar) -{ - audit_header_t *ah; - audit_subject_t *as; - audit_object_t *ao; - - ah = &ar->ar_hdr; - as = &ar->ar_subj; - ao = &ar->ar_obj; - - printf("AUDIT RECORD! TYPE: %d\n", ah->ah_type); -} - void audit_write_thread(void) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 7 18: 0:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1511337B408; Tue, 7 May 2002 18:00:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by hub.freebsd.org (Postfix) with ESMTP id 5355537B416 for ; Tue, 7 May 2002 18:00:34 -0700 (PDT) Received: (qmail 17671 invoked from network); 8 May 2002 01:00:33 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 8 May 2002 01:00:33 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g4810WF31299; Tue, 7 May 2002 21:00:32 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200205072105.g47L58d47891@freefall.freebsd.org> Date: Tue, 07 May 2002 21:00:31 -0400 (EDT) From: John Baldwin To: Adam Migus Subject: RE: PERFORCE change 10969 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 07-May-2002 Adam Migus wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10969 > > Change 10969 by amigus@amigus_ganymede on 2002/05/07 14:04:56 > > passwd and friends fail when the user has a '+' in their passwd > file for NIS. It fails because _PWF_SOURCE is not set. This > patch fixes it. This is also a bug in 5.0-CURRENT so someone > should commit it to the main tree. Ooo, nice catch! > Affected files ... > > ... //depot/projects/trustedbsd/mac/lib/libc/gen/getpwent.c#4 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/lib/libc/gen/getpwent.c#4 (text+ko) ==== > > @@ -966,6 +966,9 @@ > break; > } > break; > + default: > + _pw_passwd.pw_fields &= ~_PWF_SOURCE; > + _pw_passwd.pw_fields |= _PWF_FILES; > } > if ((search == _PW_KEYBYNAME && > strcmp(_pw_passwd.pw_name, name) == 0) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 7 22:19:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB7CC37B406; Tue, 7 May 2002 22:19:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EF49637B403 for ; Tue, 7 May 2002 22:19:30 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g485JUB23714 for perforce@freebsd.org; Tue, 7 May 2002 22:19:30 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Tue, 7 May 2002 22:19:30 -0700 (PDT) Message-Id: <200205080519.g485JUB23714@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10996 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10996 Change 10996 by arr@arr_shibby on 2002/05/07 22:18:33 - Add security.audit node and a child, debug, that will allow toggling of verbose debugging output when the AUDIT_DEBUG option is used. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#37 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#37 (text+ko) ==== @@ -63,12 +63,6 @@ static int audit_shutdown_flag = 0; static int audit_id = 0; -#ifdef AUDIT_DEBUG -#define audit_print_record(ar) _audit_print_record((ar)) -#else -#define audit_print_record(ar) -#endif - /* * Re-add this later when handling the decrease in the pool * size can be properly handled. @@ -76,6 +70,24 @@ * static size_t pool_size = 32; */ +SYSCTL_DECL(_security); +SYSCTL_NODE(_security, OID_AUTO, audit, CTLFLAG_RW, 0, ""); + +#ifdef AUDIT_DEBUG +int audit_debug = 0; + +SYSCTL_INT(_security_audit, OID_AUTO, debug, CTLFLAG_RW, &audit_debug, + 0, ""); + +#define audit_print_record(ar) do { \ + if (audit_debug) \ + _audit_print_record((ar)); \ +} while (0) +#else +#define audit_print_record(ar) +#endif + + audit_record_t * audit_record_init(int type, size_t evsz) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 7 22:20:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0522137B406; Tue, 7 May 2002 22:20:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7F8D137B40F for ; Tue, 7 May 2002 22:20:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g485KWv23968 for perforce@freebsd.org; Tue, 7 May 2002 22:20:32 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Tue, 7 May 2002 22:20:32 -0700 (PDT) Message-Id: <200205080520.g485KWv23968@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 10997 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10997 Change 10997 by arr@arr_shibby on 2002/05/07 22:20:22 - Change some debug output (not to anything much better). Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#29 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#29 (text+ko) ==== @@ -233,11 +233,11 @@ printf("---[ HEADER ]---\n" "-[ Version: %u, Record ID: %u\n" - "-[ Result: %s, errno: %d\n" + "-[ Result: %s, errno: %d\n", "-[ Time event occured: %x\n", ahp->ah_v, ahp->ah_id, AUDIT_EV_RESULT(ahp->ah_evresult), ahp->ah_errno, - &ahp->ah_evtime); + ahp->ah_evtime); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 8 5:11: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D92537B404; Wed, 8 May 2002 05:10:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail13.speakeasy.net [216.254.0.213]) by hub.freebsd.org (Postfix) with ESMTP id 3930137B405 for ; Wed, 8 May 2002 05:10:44 -0700 (PDT) Received: (qmail 2305 invoked from network); 8 May 2002 12:10:43 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail13.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 8 May 2002 12:10:43 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g48CAgF33147; Wed, 8 May 2002 08:10:42 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200205080520.g485KWv23968@freefall.freebsd.org> Date: Wed, 08 May 2002 08:10:40 -0400 (EDT) From: John Baldwin To: "Andrew R. Reiter" Subject: RE: PERFORCE change 10997 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 08-May-2002 Andrew R. Reiter wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10997 > > Change 10997 by arr@arr_shibby on 2002/05/07 22:20:22 > > - Change some debug output (not to anything much better). > > Affected files ... > > ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#29 edit > > Differences ... > > ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#29 (text+ko) ==== > > @@ -233,11 +233,11 @@ > > printf("---[ HEADER ]---\n" > "-[ Version: %u, Record ID: %u\n" > - "-[ Result: %s, errno: %d\n" > + "-[ Result: %s, errno: %d\n", > "-[ Time event occured: %x\n", I don't think that extra comma will compile. > ahp->ah_v, ahp->ah_id, > AUDIT_EV_RESULT(ahp->ah_evresult), ahp->ah_errno, > - &ahp->ah_evtime); > + ahp->ah_evtime); > } > > -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 8 6:34:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FC6437B40C; Wed, 8 May 2002 06:34:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id E1C9A37B405; Wed, 8 May 2002 06:34:31 -0700 (PDT) Received: from fledge.watson.org (localhost [127.0.0.1]) by fledge.watson.org (8.12.3/8.12.3) with ESMTP id g48DYFb4083627; Wed, 8 May 2002 09:34:16 -0400 (EDT) (envelope-from arr@FreeBSD.org) Received: from localhost (arr@localhost) by fledge.watson.org (8.12.3/8.12.3/Submit) with SMTP id g48DYEMB083588; Wed, 8 May 2002 09:34:15 -0400 (EDT) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Wed, 8 May 2002 09:34:13 -0400 (EDT) From: "Andrew R. Reiter" X-Sender: arr@fledge.watson.org To: John Baldwin Cc: "Andrew R. Reiter" , Perforce Change Reviews Subject: RE: PERFORCE change 10997 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, 8 May 2002, John Baldwin wrote: : :On 08-May-2002 Andrew R. Reiter wrote: :> http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10997 :> :> Change 10997 by arr@arr_shibby on 2002/05/07 22:20:22 :> :> - Change some debug output (not to anything much better). :> :> Affected files ... :> :> ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#29 edit :> :> Differences ... :> :> ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#29 (text+ko) ==== :> :> @@ -233,11 +233,11 @@ :> :> printf("---[ HEADER ]---\n" :> "-[ Version: %u, Record ID: %u\n" :> - "-[ Result: %s, errno: %d\n" :> + "-[ Result: %s, errno: %d\n", :> "-[ Time event occured: %x\n", : :I don't think that extra comma will compile. This is correct. :-) Fix will go in shortly. Thanks for the reminder. : :> ahp->ah_v, ahp->ah_id, :> AUDIT_EV_RESULT(ahp->ah_evresult), ahp->ah_errno, :> - &ahp->ah_evtime); :> + ahp->ah_evtime); :> } :> :> : :-- : :John Baldwin <>< http://www.FreeBSD.org/~jhb/ :"Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ : -- Andrew R. Reiter arr@watson.org arr@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 8 8:33:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5E6037B408; Wed, 8 May 2002 08:33:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0D7A137B407 for ; Wed, 8 May 2002 08:33:04 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g48FX3q20811 for perforce@freebsd.org; Wed, 8 May 2002 08:33:03 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Wed, 8 May 2002 08:33:03 -0700 (PDT) Message-Id: <200205081533.g48FX3q20811@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11012 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11012 Change 11012 by mini@mini_stylus on 2002/05/08 08:32:05 - pass thread's instead of proc's to CURSIG() and issignal() - mark a thread TDS_UNQUEUED when blocking it while its parent handles its signal (via ptrace(2)). This make gdb work properly again, and fixed ptrace(2) on normal processes. Affected files ... ... //depot/projects/kse/sys/kern/kern_condvar.c#32 edit ... //depot/projects/kse/sys/kern/kern_sig.c#47 edit ... //depot/projects/kse/sys/kern/kern_synch.c#58 edit ... //depot/projects/kse/sys/kern/subr_trap.c#52 edit ... //depot/projects/kse/sys/sys/signalvar.h#11 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_condvar.c#32 (text+ko) ==== @@ -178,7 +178,7 @@ mtx_unlock_spin(&sched_lock); p = td->td_proc; PROC_LOCK(p); - sig = CURSIG(p); /* XXXKSE */ + sig = CURSIG(td); /* XXXKSE */ if (thread_suspend_check(1)) sig = SIGSTOP; mtx_lock_spin(&sched_lock); @@ -322,7 +322,7 @@ PROC_LOCK(p); if (sig == 0) - sig = CURSIG(p); /* XXXKSE */ + sig = CURSIG(td); /* XXXKSE */ if (sig != 0) { if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) rval = EINTR; @@ -482,7 +482,7 @@ PROC_LOCK(p); if (sig == 0) - sig = CURSIG(p); + sig = CURSIG(td); if (sig != 0) { if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) rval = EINTR; ==== //depot/projects/kse/sys/kern/kern_sig.c#47 (text+ko) ==== @@ -172,12 +172,13 @@ * MP SAFE. */ int -CURSIG(struct proc *p) +CURSIG(struct thread *td) { + struct proc *p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); mtx_assert(&sched_lock, MA_NOTOWNED); - return (SIGPENDING(p) ? issignal(p) : 0); + return (SIGPENDING(p) ? issignal(td) : 0); } /* @@ -1590,13 +1591,14 @@ * by checking the pending signal masks in the CURSIG macro.) The normal call * sequence is * - * while (sig = CURSIG(curproc)) + * while (sig = CURSIG(curthread)) * postsig(sig); */ int -issignal(p) - register struct proc *p; +issignal(td) + struct thread *td; { + struct proc *p = td->td_proc; sigset_t mask; register int sig, prop; @@ -1635,6 +1637,7 @@ do { mtx_lock_spin(&sched_lock); stop(p); + td->td_state = TDS_UNQUEUED; PROC_UNLOCK(p); DROP_GIANT(); p->p_stats->p_ru.ru_nivcsw++; ==== //depot/projects/kse/sys/kern/kern_synch.c#58 (text+ko) ==== @@ -518,7 +518,7 @@ td->td_flags |= TDF_SINTR; mtx_unlock_spin(&sched_lock); PROC_LOCK(p); - sig = CURSIG(p); + sig = CURSIG(td); if (thread_suspend_check(1)) { sig = EINTR; rval = EINTR; @@ -566,7 +566,7 @@ if (rval == 0 && catch) { PROC_LOCK(p); /* XXX: shouldn't we always be calling CURSIG() */ - if (sig != 0 || (sig = CURSIG(p))) { + if (sig != 0 || (sig = CURSIG(td))) { if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) rval = EINTR; else @@ -898,6 +898,7 @@ cv_waitq_remove(td); else unsleep(td); + case TDS_UNQUEUED: /* being put back onto the queue */ case TDS_NEW: /* not yet had time to suspend */ case TDS_RUNQ: /* not yet had time to suspend */ break; ==== //depot/projects/kse/sys/kern/subr_trap.c#52 (text+ko) ==== @@ -343,7 +343,7 @@ if (sflag & PS_NEEDSIGCHK) { mtx_lock(&Giant); PROC_LOCK(p); - while ((sig = CURSIG(p)) != 0) + while ((sig = CURSIG(td)) != 0) postsig(sig); PROC_UNLOCK(p); mtx_unlock(&Giant); ==== //depot/projects/kse/sys/sys/signalvar.h#11 (text+ko) ==== @@ -234,10 +234,10 @@ /* * Machine-independent functions: */ -int CURSIG(struct proc *p); +int CURSIG(struct thread *td); void execsigs(struct proc *p); void gsignal(int pgid, int sig); -int issignal(struct proc *p); +int issignal(struct thread *p); void killproc(struct proc *p, char *why); void pgsigio(struct sigio **, int signum, int checkctty); void pgsignal(struct pgrp *pgrp, int sig, int checkctty); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 8 12:44:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B686337B400; Wed, 8 May 2002 12:44:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 32D3B37B430 for ; Wed, 8 May 2002 12:44:11 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g48JiB366457 for perforce@freebsd.org; Wed, 8 May 2002 12:44:11 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Wed, 8 May 2002 12:44:11 -0700 (PDT) Message-Id: <200205081944.g48JiB366457@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 11021 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11021 Change 11021 by arr@arr_shibby on 2002/05/08 12:43:29 - Rewrite AUDIT_RECORD_ENQ into _audit_record_enq. - Change event time to a void * for the time being. - Change audit_write_thread to take an opaque pointer as an argument. Affected files ... ... //depot/projects/trustedbsd/audit/sys/sys/audit.h#30 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/sys/audit.h#30 (text+ko) ==== @@ -44,6 +44,8 @@ #include #include #include +#include +#include #include @@ -57,7 +59,11 @@ typedef u_char audit_status_t; typedef u_char audit_object_type_t; typedef void * audit_event_info_t; -typedef struct timespec audit_time_t; +typedef void * audit_time_t; + +extern struct mtx audit_q_mtx; +extern struct audit_record_list record_queue; +extern void *audit_h; #define AUDIT_RECORD_SZ (AUDIT_OBJ_LEN + AUDIT_SUBJ_LEN + AUDIT_HDR_LEN) @@ -104,16 +110,6 @@ #define AUDIT_SET_OBJECT_KPATH(obj, kpath) \ copystr((kpath), (obj)->ao_name, sizeof(obj)->ao_name, NULL) -extern struct mtx audit_q_mtx; -extern struct audit_record_list record_queue; - -#define AUDIT_RECORD_ENQ(ar) do { \ - mtx_lock(&audit_q_mtx); \ - TAILQ_INSERT_TAIL(&record_queue, (ar), ar_next); \ - mtx_unlock(&audit_q_mtx); \ - wakeup_one(&record_queue); \ -} while (0) - struct chmod_info { char ci_path[MAXPATHLEN]; mode_t ci_mode; @@ -234,12 +230,9 @@ printf("---[ HEADER ]---\n" "-[ Version: %u, Record ID: %u\n" "-[ Result: %s, errno: %d\n", - "-[ Time event occured: %x\n", ahp->ah_v, ahp->ah_id, - AUDIT_EV_RESULT(ahp->ah_evresult), ahp->ah_errno, - ahp->ah_evtime); + AUDIT_EV_RESULT(ahp->ah_evresult), ahp->ah_errno); } - typedef struct audit_subject { uid_t as_euid; /* Effective UID */ @@ -312,12 +305,25 @@ printf("----------------------------------------------------------\n"); } + +static __inline +void +_audit_record_enq(audit_record_t *ar) +{ + + mtx_lock(&audit_q_mtx); + TAILQ_INSERT_TAIL(&record_queue, ar, ar_next); + mtx_unlock(&audit_q_mtx); + swi_sched(audit_h, 0); +} + + void audit_init(void); void audit_shutdown(void); struct vnode *audit_write_init(const char *, struct thread *, struct ucred **); void audit_write_shutdown(struct vnode *, struct thread *, struct ucred *); audit_record_t *audit_record_init(int, size_t); -void audit_write_thread(void); +void audit_write_thread(void *); #endif /* !_SYS_AUDIT_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 8 12:46:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D05C337B400; Wed, 8 May 2002 12:46:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1670537B404 for ; Wed, 8 May 2002 12:46:14 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g48JkDo66670 for perforce@freebsd.org; Wed, 8 May 2002 12:46:14 -0700 (PDT) (envelope-from arr@freebsd.org) Date: Wed, 8 May 2002 12:46:14 -0700 (PDT) Message-Id: <200205081946.g48JkDo66670@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to arr@freebsd.org using -f From: "Andrew R. Reiter" Subject: PERFORCE change 11022 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11022 Change 11022 by arr@arr_shibby on 2002/05/08 12:46:11 - Comment out nanotime call while the audit_time_t is an opaque pointer. - Remove kproc code - Add in some code that makes the audit write thread an ithd ... using this to play around witht he idea of running writes to the audit log by scheduling a software interrupt. Affected files ... ... //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#38 edit Differences ... ==== //depot/projects/trustedbsd/audit/sys/kern/kern_audit.c#38 (text+ko) ==== @@ -44,6 +44,8 @@ #include #include #include +#include +#include #include @@ -62,6 +64,7 @@ static uma_zone_t record_zone; static int audit_shutdown_flag = 0; static int audit_id = 0; +void *audit_h; /* swi handler */ /* * Re-add this later when handling the decrease in the pool @@ -111,7 +114,7 @@ h->ah_len = AUDIT_RECORD_SZ + evsz; h->ah_type = type; h->ah_evresult = AUDIT_EVR_FAILED; - nanotime(&h->ah_evtime); + /* nanotime(&h->ah_evtime); */ return (rec); } @@ -126,17 +129,11 @@ panic("audit_init: unable to init audit record zone"); TAILQ_INIT(&record_queue); audit_shutdown_flag = 0; + + swi_add(NULL, "audit", audit_write_thread, NULL, SWI_TTY, 0, + &audit_h); } -SYSINIT(tbsd_audit, SI_SUB_MAC, SI_ORDER_ANY, &audit_init, NULL); - -static struct proc *auditproc; -static struct kproc_desc auditdesc = { - "audit", - audit_write_thread, - &auditproc -}; -SYSINIT(audit_thread, SI_SUB_KTHREAD_UPDATE, SI_ORDER_ANY, kproc_start, - &auditdesc); +SYSINIT(tbsd_audit, SI_SUB_KTHREAD_UPDATE, SI_ORDER_ANY, &audit_init, NULL); void audit_shutdown(void) @@ -149,23 +146,21 @@ SYSUNINIT(tbsd_audit, SI_SUB_MAC, SI_ORDER_ANY, &audit_shutdown, NULL); void -audit_write_thread(void) +audit_write_thread(void *arg) { audit_record_t *ar; - mtx_lock(&audit_q_mtx); for (;;) { - ar = NULL; - if (audit_shutdown_flag) - kthread_exit(0); + mtx_lock(&audit_q_mtx); if (!TAILQ_EMPTY(&record_queue)) { ar = TAILQ_FIRST(&record_queue); TAILQ_REMOVE(&record_queue, ar, ar_next); + mtx_unlock(&audit_q_mtx); + } else { + mtx_unlock(&audit_q_mtx); + break; } - if (ar != NULL) { - audit_print_record(ar); - uma_zfree(record_zone, ar); - } - msleep(&record_queue, &audit_q_mtx, PWAIT, "record queue", 0); + audit_print_record(ar); + uma_zfree(record_zone, ar); } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 8 19:13:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A82537B415; Wed, 8 May 2002 19:13:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 26F1C37B408 for ; Wed, 8 May 2002 19:13:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g492DBQ36604 for perforce@freebsd.org; Wed, 8 May 2002 19:13:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 8 May 2002 19:13:11 -0700 (PDT) Message-Id: <200205090213.g492DBQ36604@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11030 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11030 Change 11030 by rwatson@rwatson_curry on 2002/05/08 19:12:30 Insert a dummy lchflags() system call entry to avoid collisions as we add more system calls. The actual entry will be integ'd to this tree later as appropriate. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#15 edit ... //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#15 edit ... //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#13 edit ... //depot/projects/trustedbsd/mac/sys/sys/syscall.h#16 edit ... //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#16 edit ... //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#15 (text+ko) ==== @@ -413,4 +413,5 @@ { SYF_MPSAFE | AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd }, /* 388 = __mac_set_fd */ { SYF_MPSAFE | AS(__mac_set_file_args), (sy_call_t *)__mac_set_file }, /* 389 = __mac_set_file */ { AS(kenv_args), (sy_call_t *)kenv }, /* 390 = kenv */ + { 0, (sy_call_t *)nosys }, /* 391 = lchflags */ }; ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#15 (text+ko) ==== @@ -398,4 +398,5 @@ "__mac_set_fd", /* 388 = __mac_set_fd */ "__mac_set_file", /* 389 = __mac_set_file */ "kenv", /* 390 = kenv */ + "#391", /* 391 = lchflags */ }; ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#13 (text+ko) ==== @@ -561,3 +561,4 @@ 389 MSTD BSD { int __mac_set_file(const char *path_p, struct mac *mac_p); } 390 STD BSD { int kenv(int what, const char *name, char *value, \ int len); } +391 UNIMPL BSD lchflags ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.h#16 (text+ko) ==== @@ -310,4 +310,4 @@ #define SYS___mac_set_fd 388 #define SYS___mac_set_file 389 #define SYS_kenv 390 -#define SYS_MAXSYSCALL 391 +#define SYS_MAXSYSCALL 392 ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#16 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#17 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 9 0:42:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14BA637B40F; Thu, 9 May 2002 00:41:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F17AD37B403 for ; Thu, 9 May 2002 00:41:50 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g497foh78084 for perforce@freebsd.org; Thu, 9 May 2002 00:41:50 -0700 (PDT) (envelope-from amigus@tislabs.com) Date: Thu, 9 May 2002 00:41:50 -0700 (PDT) Message-Id: <200205090741.g497foh78084@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@tislabs.com using -f From: Adam Migus Subject: PERFORCE change 11034 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11034 Change 11034 by amigus@amigus_vmganyopa on 2002/05/09 00:41:32 Added __mac_get_peer(int) system call. As the name implies it returns the label of the peer of the socket s. Also added a libc stub called mac_get_peer(int) and mac_get_socket(int) (which just calls __mac_get_fd(int), it was added for consistency). Note that at present mac_get_peer() only returns valid data for TCP STREAM and UNIX domain sockets. Also updated the man pages. Affected files ... ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.3#4 edit ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.3#4 edit ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#3 edit ... //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#16 edit ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#138 edit ... //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#16 edit ... //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#14 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#98 edit ... //depot/projects/trustedbsd/mac/sys/sys/syscall.h#17 edit ... //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#17 edit ... //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#18 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.3#4 (text+ko) ==== @@ -77,6 +77,18 @@ and may be used to retrieve the MAC label associated with a named file. +.It Fn mac_get_socket +This function is described in +.Xr mac_get 3 , +and may be used to retrieve the +MAC label associated with +a specific socket descriptor. +.It Fn mac_get_peer +This function is described in +.Xr mac_get 3 , +and may be used to retrieve the +MAC label associated with +a the peer of a specific socket descriptor. .It Fn mac_get_proc This function is described in .Xr mac_get 3 , ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.3#4 (text+ko) ==== @@ -37,8 +37,10 @@ .Sh NAME .Nm mac_get_file , .Nm mac_get_fd , +.Nm mac_get_socket , +.Nm mac_get_peer , .Nm mac_get_proc -.Nd get the label of a file or process +.Nd get the label of a file, socket, socket peer or process .Sh SYNOPSIS .In sys/mac.h .Ft mac_t @@ -46,13 +48,17 @@ .Ft mac_t .Fn mac_get_fd "int fd" .Ft mac_t +.Fn mac_get_socket "int s" +.Ft mac_t +.Fn mac_get_peer "int s" +.Ft mac_t .Fn mac_get_proc .Sh DESCRIPTION The .Fn mac_get_file and .Fn mac_get_fd -functions return a MAC label associated +functions return the MAC label associated with the file referenced by the pathname pointed to by .Fa path_p @@ -60,6 +66,17 @@ .Fa fd , respectively. The +.Fn mac_get_socket +and +.Fn mac_get_peer +functions return the MAC label associated +with the socket descriptor and it's peer +specified by +.Fa s , +respectively. Note: mac_get_peer is currently only +valid for TCP STREAM and UNIX DOMAIN +sockets. +The .Fn mac_get_proc function returns a MAC label associated with the requesting process. ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#3 (text+ko) ==== @@ -99,3 +99,45 @@ return (label); } + +mac_t +mac_get_peer(int s) +{ + struct mac *label; + int error; + + label = (mac_t) malloc(sizeof(*label)); + if (label == NULL) { + errno = ENOMEM; + return (NULL); + } + + error = __mac_get_peer(s, label); + if (error) { + mac_free(label); + return (NULL); + } + + return (label); +} + +mac_t +mac_get_socket(int s) +{ + struct mac *label; + int error; + + label = (mac_t) malloc(sizeof(*label)); + if (label == NULL) { + errno = ENOMEM; + return (NULL); + } + + error = __mac_get_fd(s, label); + if (error) { + mac_free(label); + return (NULL); + } + + return (label); +} ==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#16 (text+ko) ==== @@ -414,4 +414,5 @@ { SYF_MPSAFE | AS(__mac_set_file_args), (sy_call_t *)__mac_set_file }, /* 389 = __mac_set_file */ { AS(kenv_args), (sy_call_t *)kenv }, /* 390 = kenv */ { 0, (sy_call_t *)nosys }, /* 391 = lchflags */ + { SYF_MPSAFE | AS(__mac_get_peer_args), (sy_call_t *)__mac_get_peer }, /* 392 = __mac_get_peer */ }; ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#138 (text+ko) ==== @@ -1710,6 +1710,41 @@ * MPSAFE */ int +__mac_get_peer(struct thread *td, struct __mac_get_peer_args *uap) +{ + struct file *fp; + struct socket *so; + struct mac label; + int error; + + mtx_lock(&Giant); + + error = fget(td, SCARG(uap, fd), &fp); + if (error) + goto out; + + if(fp->f_type != DTYPE_SOCKET) { + error = EINVAL; + goto out; + } + else { + so = (struct socket *)fp->f_data; + label = so->so_peerlabel; + } + + if (error == 0) + error = copyout(&label, SCARG(uap, mac_p), sizeof(label)); + fdrop(fp, td); + +out: + mtx_unlock(&Giant); + return (error); +} + +/* + * MPSAFE + */ +int __mac_get_file(struct thread *td, struct __mac_get_file_args *uap) { struct nameidata nd; @@ -1882,4 +1917,11 @@ return (ENOSYS); } +int +__mac_get_peer(struct thread *td, struct __mac_get_peer_args *uap) +{ + + return (ENOSYS); +} + #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#16 (text+ko) ==== @@ -399,4 +399,5 @@ "__mac_set_file", /* 389 = __mac_set_file */ "kenv", /* 390 = kenv */ "#391", /* 391 = lchflags */ + "__mac_get_peer", /* 392 = __mac_get_peer */ }; ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#14 (text+ko) ==== @@ -562,3 +562,4 @@ 390 STD BSD { int kenv(int what, const char *name, char *value, \ int len); } 391 UNIMPL BSD lchflags +392 MSTD BSD { int __mac_get_peer(int fd, struct mac *mac_p); } ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#98 (text+ko) ==== @@ -173,6 +173,8 @@ mac_t mac_from_text(const char *_text_p); mac_t mac_from_fd(int _fildes); mac_t mac_get_file(const char *_path_p); +mac_t mac_get_socket(int s); +mac_t mac_get_peer(int s); mac_t mac_get_proc(void); mac_t mac_glb(const mac_t _labela, const mac_t _labelb); mac_t mac_lub(const mac_t _labela, const mac_t _labelb); ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.h#17 (text+ko) ==== @@ -310,4 +310,5 @@ #define SYS___mac_set_fd 388 #define SYS___mac_set_file 389 #define SYS_kenv 390 -#define SYS_MAXSYSCALL 392 +#define SYS___mac_get_peer 392 +#define SYS_MAXSYSCALL 393 ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#17 (text+ko) ==== @@ -259,4 +259,5 @@ __mac_get_file.o \ __mac_set_fd.o \ __mac_set_file.o \ - kenv.o + kenv.o \ + __mac_get_peer.o ==== //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#18 (text+ko) ==== @@ -1134,6 +1134,10 @@ char value_l_[PADL_(char *)]; char * value; char value_r_[PADR_(char *)]; char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; }; +struct __mac_get_peer_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1390,6 +1394,7 @@ int __mac_set_fd(struct thread *, struct __mac_set_fd_args *); int __mac_set_file(struct thread *, struct __mac_set_file_args *); int kenv(struct thread *, struct kenv_args *); +int __mac_get_peer(struct thread *, struct __mac_get_peer_args *); #ifdef COMPAT_43 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 9 10:22: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EA6137B40D; Thu, 9 May 2002 10:21:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7E60C37B403 for ; Thu, 9 May 2002 10:21:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g49HLrr68544 for perforce@freebsd.org; Thu, 9 May 2002 10:21:53 -0700 (PDT) (envelope-from des@freebsd.org) Date: Thu, 9 May 2002 10:21:53 -0700 (PDT) Message-Id: <200205091721.g49HLrr68544@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 11049 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11049 Change 11049 by des@des.at.des.thinksec.com on 2002/05/09 10:21:04 Silly me forgot to update the version macros when I rolled Cinnamon. I need a "release procedures" document... Affected files ... ... //depot/projects/openpam/include/security/openpam_version.h#3 edit Differences ... ==== //depot/projects/openpam/include/security/openpam_version.h#3 (text+ko) ==== @@ -31,14 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam_version.h#2 $ + * $P4: //depot/projects/openpam/include/security/openpam_version.h#3 $ */ #ifndef _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM -#define _OPENPAM_VERSION 20020414 -#define _OPENPAM_RELEASE "Cineraria" +#define _OPENPAM_VERSION 20020502 +#define _OPENPAM_RELEASE "Cinnamon" #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 9 10:51:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A713E37B405; Thu, 9 May 2002 10:51:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2A43237B403 for ; Thu, 9 May 2002 10:51:30 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g49HpT371067 for perforce@freebsd.org; Thu, 9 May 2002 10:51:29 -0700 (PDT) (envelope-from des@freebsd.org) Date: Thu, 9 May 2002 10:51:29 -0700 (PDT) Message-Id: <200205091751.g49HpT371067@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 11052 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11052 Change 11052 by des@des.at.des.thinksec.com on 2002/05/09 10:50:54 Add support for marking up variable names and values. Affected files ... ... //depot/projects/openpam/misc/gendoc.pl#14 edit Differences ... ==== //depot/projects/openpam/misc/gendoc.pl#14 (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#13 $ +# $P4: //depot/projects/openpam/misc/gendoc.pl#14 $ # use strict; @@ -201,6 +201,8 @@ s/\s*=$func\b\s*/\n.Nm\n/gs; s/\s*=$argnames\b\s*/\n.Va $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; if (s/\s*=([a-z_]+)\b\s*/\n.Xr $1 3\n/gs) { ++$xref{"$1 3"}; } @@ -378,8 +380,8 @@ $fn = "$func->{'name'}.3"; if (sysopen(FILE, $fn, O_RDWR|O_CREAT|O_TRUNC)) { - print(FILE $mdoc); - close(FILE); + print(FILE $mdoc); + close(FILE); } else { warn("$fn: open(): $!\n"); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 9 10:54: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97DD037B408; Thu, 9 May 2002 10:53:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 07FFE37B407 for ; Thu, 9 May 2002 10:53:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g49HrWd71226 for perforce@freebsd.org; Thu, 9 May 2002 10:53:32 -0700 (PDT) (envelope-from des@freebsd.org) Date: Thu, 9 May 2002 10:53:32 -0700 (PDT) Message-Id: <200205091753.g49HrWd71226@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 11054 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11054 Change 11054 by des@des.at.des.thinksec.com on 2002/05/09 10:52:55 Add documentation. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/lib/openpam_nullconv.c#2 edit ... //depot/projects/openpam/lib/openpam_ttyconv.c#11 edit Differences ... ==== //depot/projects/openpam/lib/openpam_nullconv.c#2 (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#1 $ + * $P4: //depot/projects/openpam/lib/openpam_nullconv.c#2 $ */ #include @@ -66,3 +66,19 @@ * * PAM_CONV_ERR */ + +/** + * 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. + * + * >openpam_ttyconv + * >pam_prompt + * >pam_set_item + * >pam_vprompt + */ ==== //depot/projects/openpam/lib/openpam_ttyconv.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_ttyconv.c#10 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#11 $ */ #include @@ -192,3 +192,17 @@ * PAM_BUF_ERR * PAM_CONV_ERR */ + +/** + * 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. + * + * The =openpam_ttyconv function allows the application to specify a + * timeout for user input by setting the global variable + * :openpam_ttyconv_timeout to the length of the timeout in seconds. + * + * >openpam_nullconv + * >pam_prompt + * >pam_vprompt + */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 9 16: 7:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BAE937B403; Thu, 9 May 2002 16:07:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4558837B409 for ; Thu, 9 May 2002 16:07:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g49N7gm68486 for perforce@freebsd.org; Thu, 9 May 2002 16:07:42 -0700 (PDT) (envelope-from amigus@tislabs.com) Date: Thu, 9 May 2002 16:07:42 -0700 (PDT) Message-Id: <200205092307.g49N7gm68486@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@tislabs.com using -f From: Adam Migus Subject: PERFORCE change 11069 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11069 Change 11069 by amigus@amigus_ganymede on 2002/05/09 16:07:03 Forgot to fdrop() if fget() succeeded. Doh! Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#139 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#139 (text+ko) ==== @@ -1721,7 +1721,7 @@ error = fget(td, SCARG(uap, fd), &fp); if (error) - goto out; + goto out2; if(fp->f_type != DTYPE_SOCKET) { error = EINVAL; @@ -1734,9 +1734,9 @@ if (error == 0) error = copyout(&label, SCARG(uap, mac_p), sizeof(label)); +out: fdrop(fp, td); - -out: +out2: mtx_unlock(&Giant); return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 9 16:57:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D55337B407; Thu, 9 May 2002 16:56:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E21DE37B404 for ; Thu, 9 May 2002 16:56:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g49Nunp88435 for perforce@freebsd.org; Thu, 9 May 2002 16:56:49 -0700 (PDT) (envelope-from amigus@tislabs.com) Date: Thu, 9 May 2002 16:56:49 -0700 (PDT) Message-Id: <200205092356.g49Nunp88435@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@tislabs.com using -f From: Adam Migus Subject: PERFORCE change 11071 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11071 Change 11071 by amigus@amigus_ganymede on 2002/05/09 16:56:18 Added SO_LABEL and SO_PEERLABEL to getsockopt() (SOL_SOCKET), to retrieve the label and peer label respectively. This kind of makes the mac_get_socket(), and mac_get_peer() calls redundant. But everyone likes redundant code thats redundant right? :-) setsockopt() coming soon. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#19 edit ... //depot/projects/trustedbsd/mac/sys/sys/socket.h#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#19 (text+ko) ==== @@ -1333,6 +1333,9 @@ #ifdef INET struct accept_filter_arg *afap; #endif +#ifdef MAC + struct mac *label; +#endif /* MAC */ error = 0; if (sopt->sopt_level != SOL_SOCKET) { @@ -1413,7 +1416,14 @@ tv.tv_usec = (optval % hz) * tick; error = sooptcopyout(sopt, &tv, sizeof tv); break; - +#ifdef MAC + case SO_LABEL: + case SO_PEERLABEL: + label = (sopt->sopt_name == SO_LABEL ? + &so->so_label : &so->so_peerlabel); + error = sooptcopyout(sopt, label, sizeof *label); + break; +#endif /* MAC */ default: error = ENOPROTOOPT; break; ==== //depot/projects/trustedbsd/mac/sys/sys/socket.h#5 (text+ko) ==== @@ -96,6 +96,8 @@ #define SO_ERROR 0x1007 /* get error status and clear */ #define SO_TYPE 0x1008 /* get socket type */ /*efine SO_PRIVSTATE 0x1009 get/deny privileged state */ +#define SO_LABEL 0x1010 /* sockets MAC label */ +#define SO_PEERLABEL 0x1011 /* sockets peer MAC label */ /* * Structure used for manipulating linger option. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 0:58:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7BE237B403; Fri, 10 May 2002 00:58:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0418737B404 for ; Fri, 10 May 2002 00:58:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4A7wM508183 for perforce@freebsd.org; Fri, 10 May 2002 00:58:22 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Fri, 10 May 2002 00:58:22 -0700 (PDT) Message-Id: <200205100758.g4A7wM508183@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11095 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11095 Change 11095 by marcel@marcel_vaio on 2002/05/10 00:57:58 Sync with CVS. If I continue to piggyback, I'd better do it everywhere so that I don't have to wonder what's the version I was actually working on :-/ Affected files ... ... //depot/projects/ia64/sys/ia64/include/reg.h#4 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/reg.h#4 (text+ko) ==== @@ -40,13 +40,14 @@ #endif struct reg { - uint64_t r_gr[32]; /* No rotating registers */ + uint64_t r_gr[128]; uint64_t r_br[8]; uint64_t r_cfm; uint64_t r_ip; /* Bits 0-3 encode the slot number */ uint64_t r_pr; uint64_t r_psr; /* User mask */ uint64_t r_ar_rsc; + uint64_t r_ar_bsp; uint64_t r_ar_bspstore; uint64_t r_ar_rnat; uint64_t r_ar_ccv; @@ -54,7 +55,6 @@ uint64_t r_ar_fpsr; uint64_t r_ar_pfs; uint64_t r_ar_lc; - uint64_t r_ar_ec; }; struct fpreg { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 4:42:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B15837B404; Fri, 10 May 2002 04:41:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 953EC37B406 for ; Fri, 10 May 2002 04:41:36 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4ABeDw99838 for perforce@freebsd.org; Fri, 10 May 2002 04:40:13 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 04:40:13 -0700 (PDT) Message-Id: <200205101140.g4ABeDw99838@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11101 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11101 Change 11101 by peter@peter_daintree on 2002/05/10 04:39:45 IFC @11100 - gcc-3.1 - yeah! Affected files ... ... //depot/projects/ia64/MAINTAINERS#4 integrate ... //depot/projects/ia64/Makefile#7 integrate ... //depot/projects/ia64/Makefile.inc1#23 integrate ... //depot/projects/ia64/UPDATING#10 integrate ... //depot/projects/ia64/bin/Makefile.inc#4 integrate ... //depot/projects/ia64/bin/ps/ps.1#6 integrate ... //depot/projects/ia64/bin/rcp/pathnames.h#2 delete ... //depot/projects/ia64/bin/rcp/rcp.c#3 integrate ... //depot/projects/ia64/contrib/amd/amq/amq.c#3 integrate ... //depot/projects/ia64/contrib/amd/hlfsd/hlfsd.h#3 integrate ... //depot/projects/ia64/contrib/gcc/BUGS#2 delete ... //depot/projects/ia64/contrib/gcc/ChangeLog#4 integrate ... //depot/projects/ia64/contrib/gcc/ChangeLog.lib#1 branch ... //depot/projects/ia64/contrib/gcc/FREEBSD-libiberty#3 integrate ... //depot/projects/ia64/contrib/gcc/FREEBSD-upgrade#3 integrate ... //depot/projects/ia64/contrib/gcc/FSFChangeLog.10#1 branch ... //depot/projects/ia64/contrib/gcc/FSFChangeLog.11#1 branch ... //depot/projects/ia64/contrib/gcc/INSTALL#2 delete ... //depot/projects/ia64/contrib/gcc/Makefile.in#4 integrate ... //depot/projects/ia64/contrib/gcc/NEWS#4 delete ... //depot/projects/ia64/contrib/gcc/PROBLEMS#2 delete ... //depot/projects/ia64/contrib/gcc/PROJECTS#2 delete ... //depot/projects/ia64/contrib/gcc/README#2 delete ... //depot/projects/ia64/contrib/gcc/README-bugs#2 delete ... //depot/projects/ia64/contrib/gcc/README.DWARF#2 delete ... //depot/projects/ia64/contrib/gcc/README.TRAD#2 delete ... //depot/projects/ia64/contrib/gcc/TESTS.FLUNK#2 delete ... //depot/projects/ia64/contrib/gcc/alias.c#4 integrate ... //depot/projects/ia64/contrib/gcc/ansidecl.h#3 integrate ... //depot/projects/ia64/contrib/gcc/assert.h#2 delete ... //depot/projects/ia64/contrib/gcc/attribs.c#2 integrate ... //depot/projects/ia64/contrib/gcc/basic-block.h#3 integrate ... //depot/projects/ia64/contrib/gcc/bb-reorder.c#2 integrate ... //depot/projects/ia64/contrib/gcc/build-make#3 delete ... //depot/projects/ia64/contrib/gcc/builtins.c#2 integrate ... //depot/projects/ia64/contrib/gcc/c-common.c#4 integrate ... //depot/projects/ia64/contrib/gcc/c-common.def#2 integrate ... //depot/projects/ia64/contrib/gcc/c-common.h#2 integrate ... //depot/projects/ia64/contrib/gcc/c-decl.c#4 integrate ... //depot/projects/ia64/contrib/gcc/c-format.c#2 integrate ... //depot/projects/ia64/contrib/gcc/c-iterate.c#2 delete ... //depot/projects/ia64/contrib/gcc/c-lang.c#3 integrate ... //depot/projects/ia64/contrib/gcc/c-lex.c#3 integrate ... //depot/projects/ia64/contrib/gcc/c-objc-common.c#2 integrate ... //depot/projects/ia64/contrib/gcc/c-parse.gperf#2 delete ... //depot/projects/ia64/contrib/gcc/c-parse.in#3 integrate ... //depot/projects/ia64/contrib/gcc/c-pragma.c#3 integrate ... //depot/projects/ia64/contrib/gcc/c-pragma.h#3 integrate ... //depot/projects/ia64/contrib/gcc/c-semantics.c#2 integrate ... //depot/projects/ia64/contrib/gcc/c-tree.h#3 integrate ... //depot/projects/ia64/contrib/gcc/c-typeck.c#4 integrate ... //depot/projects/ia64/contrib/gcc/calls.c#4 integrate ... //depot/projects/ia64/contrib/gcc/cccp.c#2 delete ... //depot/projects/ia64/contrib/gcc/cexp.y#2 delete ... //depot/projects/ia64/contrib/gcc/cfg.c#2 integrate ... //depot/projects/ia64/contrib/gcc/cfganal.c#2 integrate ... //depot/projects/ia64/contrib/gcc/cfgcleanup.c#2 integrate ... //depot/projects/ia64/contrib/gcc/cfgrtl.c#2 integrate ... //depot/projects/ia64/contrib/gcc/choose-temp.c#2 integrate ... //depot/projects/ia64/contrib/gcc/collect2.c#4 integrate ... //depot/projects/ia64/contrib/gcc/combine.c#4 integrate ... //depot/projects/ia64/contrib/gcc/concat.c#1 branch ... //depot/projects/ia64/contrib/gcc/config.gcc#2 integrate ... //depot/projects/ia64/contrib/gcc/config.in#3 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/alpha-protos.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/alpha.c#4 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/alpha.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/alpha.md#3 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/elf.h#4 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/freebsd.h#4 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/linux.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/netbsd-elf.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/alpha/netbsd.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/osf.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/t-crtbe#3 delete ... //depot/projects/ia64/contrib/gcc/config/alpha/t-vms#3 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/vms-tramp.asm#2 delete ... //depot/projects/ia64/contrib/gcc/config/alpha/vms.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/x-alpha#2 delete ... //depot/projects/ia64/contrib/gcc/config/alpha/x-vms#2 integrate ... //depot/projects/ia64/contrib/gcc/config/alpha/xm-alpha.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/alpha/xm-freebsd.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/alpha/xm-openbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/alpha/xm-vms.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/arm/aof.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/arm/aout.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/arm/arm.c#2 integrate ... //depot/projects/ia64/contrib/gcc/config/arm/arm.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/arm/arm.md#2 integrate ... //depot/projects/ia64/contrib/gcc/config/arm/coff.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/arm/elf.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/arm/linux-elf.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/arm/netbsd.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/arm/rtems-elf.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/float-sparc.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/config-nt.sed#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/cygwin.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/dgux.c#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/djgpp-rtems.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#8 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/gnu.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/i386-interix.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/i386-protos.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/i386.c#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/i386.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/i386.md#4 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/libgcc-x86_64-glibc.ver#1 branch ... //depot/projects/ia64/contrib/gcc/config/i386/linux-aout.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/linux-oldld.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/linux.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/linux64.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/netbsd-elf.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/netbsd.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/os2.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/perform.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/rtems.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/rtemself.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/sco.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/sco4.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/sco4dbx.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/sco5.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/sco5gas.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/scodbx.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/sol2.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/t-i386bare#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/t-interix#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/t-linux64#1 branch ... //depot/projects/ia64/contrib/gcc/config/i386/t-rtems-i386#2 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/t-vsta#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/t-winnt#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/win-nt.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-aix#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-cygwin#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-dgux#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-djgpp#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-isc#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-isc3#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-ncr3000#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-next#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-osf1elf#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-osfrose#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-sco#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-sco4#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-sco5#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-sysv3#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x-vsta#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/x86-64.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/xm-aix.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-bsd386.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-dgux.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-dos.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-freebsd.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-gnu.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-i386.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-isc.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-linux.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-lynx.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-next.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-openbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-os2.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-osf.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-osf1elf.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-sco.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-sco5.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-sun.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-sysv3.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-sysv4.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-uwin.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/i386/xm-winnt.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/ia64/aix.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/ia64/elf.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/ia64/freebsd.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/ia64/hpux.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/ia64/ia64-protos.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/ia64/ia64.c#2 integrate ... //depot/projects/ia64/contrib/gcc/config/ia64/ia64.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/ia64/ia64.md#2 integrate ... //depot/projects/ia64/contrib/gcc/config/ia64/linux.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/ia64/sysv4.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/ia64/unwind-ia64.c#2 integrate ... //depot/projects/ia64/contrib/gcc/config/libgcc-glibc.ver#1 branch ... //depot/projects/ia64/contrib/gcc/config/netbsd.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/aix.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/aix43.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/aix51.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/altivec.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/crtsavres.asm#1 branch ... //depot/projects/ia64/contrib/gcc/config/rs6000/darwin.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/eabi.asm#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/gnu.h#1 branch ... //depot/projects/ia64/contrib/gcc/config/rs6000/linux64.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/netbsd.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/ppc-asm.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.c#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.md#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/rtems.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/sysv4.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/t-aix43#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/t-linux64#1 branch ... //depot/projects/ia64/contrib/gcc/config/rs6000/t-ppccomm#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/xcoff.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/rtems.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/aout.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/crtfastmath.c#1 branch ... //depot/projects/ia64/contrib/gcc/config/sparc/elf.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/freebsd.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/gmon-sol2.c#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/libgcc-sparc-glibc.ver#1 branch ... //depot/projects/ia64/contrib/gcc/config/sparc/linux-aout.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/linux.h#4 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/linux64.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/lite.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/litecoff.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/liteelf.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/netbsd-elf.h#1 branch ... //depot/projects/ia64/contrib/gcc/config/sparc/netbsd.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/pbd.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/rtems.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/rtemself.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/sol2-64.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/sol2-bi.h#1 branch ... //depot/projects/ia64/contrib/gcc/config/sparc/sol2-gas-bi.h#1 branch ... //depot/projects/ia64/contrib/gcc/config/sparc/sol2-gld-bi.h#1 branch ... //depot/projects/ia64/contrib/gcc/config/sparc/sol2-gld.h#1 branch ... //depot/projects/ia64/contrib/gcc/config/sparc/sol2-sld-64.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/sparc/sol2-sld.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/sparc/sol2.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/sol27-sld.h#1 branch ... //depot/projects/ia64/contrib/gcc/config/sparc/sp64-aout.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/sp64-elf.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/sp86x-aout.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/sp86x-elf.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/sparc-protos.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/sparc.c#4 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/sparc.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/sparc.md#4 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/splet.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/t-crtfm#1 branch ... //depot/projects/ia64/contrib/gcc/config/sparc/t-elf#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/t-linux64#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/t-netbsd64#1 branch ... //depot/projects/ia64/contrib/gcc/config/sparc/t-sol2-64#2 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/t-sp64#2 delete ... //depot/projects/ia64/contrib/gcc/config/sparc/t-sunos40#2 delete ... //depot/projects/ia64/contrib/gcc/config/sparc/vxsim.h#3 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/vxsparc64.h#2 integrate ... //depot/projects/ia64/contrib/gcc/config/sparc/x-sysv4#2 delete ... //depot/projects/ia64/contrib/gcc/config/sparc/xm-linux.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/sparc/xm-lynx.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/sparc/xm-openbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/sparc/xm-pbd.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/sparc/xm-sol2.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/sparc/xm-sp64.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/sparc/xm-sparc.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/sparc/xm-sysv4-64.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/sparc/xm-sysv4.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/t-slibgcc-elf-ver#2 integrate ... //depot/projects/ia64/contrib/gcc/config/t-slibgcc-nolc-override#1 branch ... //depot/projects/ia64/contrib/gcc/config/t-slibgcc-sld#2 integrate ... //depot/projects/ia64/contrib/gcc/config/x-linux#3 delete ... //depot/projects/ia64/contrib/gcc/config/x-linux-aout#2 delete ... //depot/projects/ia64/contrib/gcc/config/x-lynx#2 delete ... //depot/projects/ia64/contrib/gcc/config/x-svr4#2 delete ... //depot/projects/ia64/contrib/gcc/config/xm-alloca.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/xm-freebsd.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/xm-gnu.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/xm-interix.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/xm-linux.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/xm-lynx.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/xm-openbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/xm-siglist.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/xm-std32.h#3 delete ... //depot/projects/ia64/contrib/gcc/config/xm-svr3.h#2 delete ... //depot/projects/ia64/contrib/gcc/config/xm-svr4.h#3 delete ... //depot/projects/ia64/contrib/gcc/configure#4 integrate ... //depot/projects/ia64/contrib/gcc/configure.in#4 integrate ... //depot/projects/ia64/contrib/gcc/configure.lang#2 delete ... //depot/projects/ia64/contrib/gcc/cp-demangle.c#1 branch ... //depot/projects/ia64/contrib/gcc/cp/ChangeLog#4 integrate ... //depot/projects/ia64/contrib/gcc/cp/Make-lang.in#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/Makefile.in#2 delete ... //depot/projects/ia64/contrib/gcc/cp/NEWS#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/call.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/cfns.h#1 branch ... //depot/projects/ia64/contrib/gcc/cp/class.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/cp-tree.def#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/cp-tree.h#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/cvt.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/decl.c#4 integrate ... //depot/projects/ia64/contrib/gcc/cp/decl2.c#4 integrate ... //depot/projects/ia64/contrib/gcc/cp/dump.c#2 integrate ... //depot/projects/ia64/contrib/gcc/cp/errfn.c#3 delete ... //depot/projects/ia64/contrib/gcc/cp/error.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/exception.cc#2 delete ... //depot/projects/ia64/contrib/gcc/cp/friend.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/g++spec.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/gxx.gperf#2 delete ... //depot/projects/ia64/contrib/gcc/cp/gxxint.texi#2 delete ... //depot/projects/ia64/contrib/gcc/cp/inc/exception#2 delete ... //depot/projects/ia64/contrib/gcc/cp/inc/new#2 delete ... //depot/projects/ia64/contrib/gcc/cp/inc/new.h#2 delete ... //depot/projects/ia64/contrib/gcc/cp/inc/typeinfo#2 delete ... //depot/projects/ia64/contrib/gcc/cp/init.c#4 integrate ... //depot/projects/ia64/contrib/gcc/cp/input.c#2 delete ... //depot/projects/ia64/contrib/gcc/cp/lang-specs.h#4 integrate ... //depot/projects/ia64/contrib/gcc/cp/lex.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/mangle.c#2 integrate ... //depot/projects/ia64/contrib/gcc/cp/method.c#4 integrate ... //depot/projects/ia64/contrib/gcc/cp/new.cc#2 delete ... //depot/projects/ia64/contrib/gcc/cp/new1.cc#2 delete ... //depot/projects/ia64/contrib/gcc/cp/new2.cc#2 delete ... //depot/projects/ia64/contrib/gcc/cp/parse.y#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/pt.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/search.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/semantics.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/sig.c#2 delete ... //depot/projects/ia64/contrib/gcc/cp/spew.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/tinfo.cc#2 delete ... //depot/projects/ia64/contrib/gcc/cp/tinfo.h#2 delete ... //depot/projects/ia64/contrib/gcc/cp/tinfo2.cc#2 delete ... //depot/projects/ia64/contrib/gcc/cp/tree.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/typeck.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/typeck2.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/xref.c#3 delete ... //depot/projects/ia64/contrib/gcc/cplus-dem.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cpp.texi#2 delete ... //depot/projects/ia64/contrib/gcc/cppalloc.c#2 delete ... //depot/projects/ia64/contrib/gcc/cppexp.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cpphash.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cpphash.h#3 integrate ... //depot/projects/ia64/contrib/gcc/cppinit.c#4 integrate ... //depot/projects/ia64/contrib/gcc/cpplex.c#2 integrate ... //depot/projects/ia64/contrib/gcc/cpplib.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cpplib.h#3 integrate ... //depot/projects/ia64/contrib/gcc/cppmacro.c#2 integrate ... //depot/projects/ia64/contrib/gcc/cppmain.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cppulp.c#2 delete ... //depot/projects/ia64/contrib/gcc/cross-make#3 delete ... //depot/projects/ia64/contrib/gcc/crtstuff.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cse.c#4 integrate ... //depot/projects/ia64/contrib/gcc/cselib.c#2 integrate ... //depot/projects/ia64/contrib/gcc/dbxout.c#3 integrate ... //depot/projects/ia64/contrib/gcc/defaults.h#3 integrate ... //depot/projects/ia64/contrib/gcc/demangle.h#3 integrate ... //depot/projects/ia64/contrib/gcc/df.c#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/c-tree.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/contrib.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/contribute.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/cpp.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/cppenv.texi#1 branch ... //depot/projects/ia64/contrib/gcc/doc/cppopts.texi#1 branch ... //depot/projects/ia64/contrib/gcc/doc/extend.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/frontends.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/gcc.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/include/texinfo.tex#1 branch ... //depot/projects/ia64/contrib/gcc/doc/install.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/invoke.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/md.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/passes.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/rtl.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/sourcebuild.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/standards.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doc/tm.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/doprint.c#3 delete ... //depot/projects/ia64/contrib/gcc/dostage2#2 delete ... //depot/projects/ia64/contrib/gcc/dostage3#2 delete ... //depot/projects/ia64/contrib/gcc/dwarf2.h#4 integrate ... //depot/projects/ia64/contrib/gcc/dwarf2out.c#4 integrate ... //depot/projects/ia64/contrib/gcc/dwarfout.h#3 delete ... //depot/projects/ia64/contrib/gcc/dyn-string.c#3 integrate ... //depot/projects/ia64/contrib/gcc/dyn-string.h#3 integrate ... //depot/projects/ia64/contrib/gcc/eh-common.h#2 delete ... //depot/projects/ia64/contrib/gcc/emit-rtl.c#4 integrate ... //depot/projects/ia64/contrib/gcc/except.c#4 integrate ... //depot/projects/ia64/contrib/gcc/except.h#3 integrate ... //depot/projects/ia64/contrib/gcc/exgettext#3 delete ... //depot/projects/ia64/contrib/gcc/explow.c#3 integrate ... //depot/projects/ia64/contrib/gcc/expmed.c#4 integrate ... //depot/projects/ia64/contrib/gcc/expr.c#4 integrate ... //depot/projects/ia64/contrib/gcc/expr.h#4 integrate ... //depot/projects/ia64/contrib/gcc/extend.texi#2 delete ... //depot/projects/ia64/contrib/gcc/f/BUGS#3 delete ... //depot/projects/ia64/contrib/gcc/f/ChangeLog#4 integrate ... //depot/projects/ia64/contrib/gcc/f/INSTALL#2 delete ... //depot/projects/ia64/contrib/gcc/f/Make-lang.in#3 integrate ... //depot/projects/ia64/contrib/gcc/f/Makefile.in#2 delete ... //depot/projects/ia64/contrib/gcc/f/NEWS#3 delete ... //depot/projects/ia64/contrib/gcc/f/assert.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/bad.def#3 integrate ... //depot/projects/ia64/contrib/gcc/f/bugs.texi#3 integrate ... //depot/projects/ia64/contrib/gcc/f/com.c#3 integrate ... //depot/projects/ia64/contrib/gcc/f/config.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/convert.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/data.c#2 integrate ... //depot/projects/ia64/contrib/gcc/f/expr.c#3 integrate ... //depot/projects/ia64/contrib/gcc/f/ffe.texi#3 integrate ... //depot/projects/ia64/contrib/gcc/f/flags.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/g77.texi#3 integrate ... //depot/projects/ia64/contrib/gcc/f/g77install.texi#3 delete ... //depot/projects/ia64/contrib/gcc/f/glimits.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/hconfig.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/implic.c#3 integrate ... //depot/projects/ia64/contrib/gcc/f/input.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/intdoc.c#3 integrate ... //depot/projects/ia64/contrib/gcc/f/intdoc.texi#3 integrate ... //depot/projects/ia64/contrib/gcc/f/intrin.c#3 integrate ... //depot/projects/ia64/contrib/gcc/f/intrin.def#3 integrate ... //depot/projects/ia64/contrib/gcc/f/invoke.texi#2 integrate ... //depot/projects/ia64/contrib/gcc/f/lex.c#3 integrate ... //depot/projects/ia64/contrib/gcc/f/news.texi#3 integrate ... //depot/projects/ia64/contrib/gcc/f/output.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/proj.c#3 delete ... //depot/projects/ia64/contrib/gcc/f/proj.h#3 integrate ... //depot/projects/ia64/contrib/gcc/f/root.texi#3 integrate ... //depot/projects/ia64/contrib/gcc/f/rtl.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/stb.c#2 integrate ... //depot/projects/ia64/contrib/gcc/f/ste.c#3 integrate ... //depot/projects/ia64/contrib/gcc/f/stu.c#3 integrate ... //depot/projects/ia64/contrib/gcc/f/system.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/target.c#3 integrate ... //depot/projects/ia64/contrib/gcc/f/target.h#3 integrate ... //depot/projects/ia64/contrib/gcc/f/tconfig.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/tm.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/toplev.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/tree.j#2 delete ... //depot/projects/ia64/contrib/gcc/f/version.c#4 integrate ... //depot/projects/ia64/contrib/gcc/fibheap.c#1 branch ... //depot/projects/ia64/contrib/gcc/fibheap.h#1 branch ... //depot/projects/ia64/contrib/gcc/final.c#4 integrate ... //depot/projects/ia64/contrib/gcc/fixcpp#2 delete ... //depot/projects/ia64/contrib/gcc/fixinc-nt.sed#2 delete ... //depot/projects/ia64/contrib/gcc/fixincludes#2 delete ... //depot/projects/ia64/contrib/gcc/flags.h#3 integrate ... //depot/projects/ia64/contrib/gcc/flow.c#4 integrate ... //depot/projects/ia64/contrib/gcc/fold-const.c#4 integrate ... //depot/projects/ia64/contrib/gcc/frame.c#3 delete ... //depot/projects/ia64/contrib/gcc/frame.h#2 delete ... //depot/projects/ia64/contrib/gcc/function.c#4 integrate ... //depot/projects/ia64/contrib/gcc/function.h#3 integrate ... //depot/projects/ia64/contrib/gcc/gansidecl.h#3 delete ... //depot/projects/ia64/contrib/gcc/gcc.c#4 integrate ... //depot/projects/ia64/contrib/gcc/gcc.texi#3 delete ... //depot/projects/ia64/contrib/gcc/gccbug.in#1 branch ... //depot/projects/ia64/contrib/gcc/gcov.texi#2 delete ... //depot/projects/ia64/contrib/gcc/gcse.c#3 integrate ... //depot/projects/ia64/contrib/gcc/genattrtab.c#3 integrate ... //depot/projects/ia64/contrib/gcc/genemit.c#3 integrate ... //depot/projects/ia64/contrib/gcc/genextract.c#3 integrate ... //depot/projects/ia64/contrib/gcc/genflags.c#3 integrate ... //depot/projects/ia64/contrib/gcc/genoutput.c#3 integrate ... //depot/projects/ia64/contrib/gcc/genrecog.c#3 integrate ... //depot/projects/ia64/contrib/gcc/getopt.c#3 integrate ... //depot/projects/ia64/contrib/gcc/getopt.h#3 integrate ... //depot/projects/ia64/contrib/gcc/getopt1.c#3 integrate ... //depot/projects/ia64/contrib/gcc/getpwd.c#3 integrate ... //depot/projects/ia64/contrib/gcc/ggc-common.c#2 integrate ... //depot/projects/ia64/contrib/gcc/ginclude/math-3300.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/math-68881.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/ppc-asm.h#3 delete ... //depot/projects/ia64/contrib/gcc/ginclude/proto.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-alpha.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-arc.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-c4x.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-clipper.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-h8300.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-i860.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-i960.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-m32r.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-m88k.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-mips.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-mn10200.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-mn10300.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-pa.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-ppc.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-pyr.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-sh.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-sparc.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-spur.h#2 delete ... //depot/projects/ia64/contrib/gcc/ginclude/va-v850.h#2 delete ... //depot/projects/ia64/contrib/gcc/gthr-dce.h#3 integrate ... //depot/projects/ia64/contrib/gcc/gthr-posix.h#3 integrate ... //depot/projects/ia64/contrib/gcc/gthr-rtems.h#2 integrate ... //depot/projects/ia64/contrib/gcc/gthr-solaris.h#3 integrate ... //depot/projects/ia64/contrib/gcc/gthr-win32.h#1 branch ... //depot/projects/ia64/contrib/gcc/haifa-sched.c#3 integrate ... //depot/projects/ia64/contrib/gcc/hashtab.c#1 branch ... //depot/projects/ia64/contrib/gcc/hashtab.h#1 branch ... //depot/projects/ia64/contrib/gcc/hex.c#1 branch ... //depot/projects/ia64/contrib/gcc/hooks.c#1 branch ... //depot/projects/ia64/contrib/gcc/hooks.h#1 branch ... //depot/projects/ia64/contrib/gcc/hwint.h#3 integrate ... //depot/projects/ia64/contrib/gcc/ifcvt.c#2 integrate ... //depot/projects/ia64/contrib/gcc/install.texi#2 delete ... //depot/projects/ia64/contrib/gcc/integrate.c#3 integrate ... //depot/projects/ia64/contrib/gcc/invoke.texi#3 delete ... //depot/projects/ia64/contrib/gcc/jump.c#3 integrate ... //depot/projects/ia64/contrib/gcc/just-fixinc#2 delete ... //depot/projects/ia64/contrib/gcc/langhooks-def.h#2 integrate ... //depot/projects/ia64/contrib/gcc/langhooks.c#2 integrate ... //depot/projects/ia64/contrib/gcc/langhooks.h#2 integrate ... //depot/projects/ia64/contrib/gcc/lbasename.c#1 branch ... //depot/projects/ia64/contrib/gcc/libfuncs.h#2 integrate ... //depot/projects/ia64/contrib/gcc/libgcc1-test.c#3 delete ... //depot/projects/ia64/contrib/gcc/libgcc1.c#3 delete ... //depot/projects/ia64/contrib/gcc/libiberty.h#3 integrate ... //depot/projects/ia64/contrib/gcc/listing#2 delete ... //depot/projects/ia64/contrib/gcc/local-alloc.c#3 integrate ... //depot/projects/ia64/contrib/gcc/longlong.h#3 integrate ... //depot/projects/ia64/contrib/gcc/loop.c#4 integrate ... //depot/projects/ia64/contrib/gcc/loop.h#3 integrate ... //depot/projects/ia64/contrib/gcc/machmode.def#3 integrate ... //depot/projects/ia64/contrib/gcc/machmode.h#3 integrate ... //depot/projects/ia64/contrib/gcc/make-temp-file.c#1 branch ... //depot/projects/ia64/contrib/gcc/makefile.vms#3 delete ... //depot/projects/ia64/contrib/gcc/md.texi#2 delete ... //depot/projects/ia64/contrib/gcc/md5.c#1 branch ... //depot/projects/ia64/contrib/gcc/md5.h#1 branch ... //depot/projects/ia64/contrib/gcc/mkconfig.sh#2 integrate ... //depot/projects/ia64/contrib/gcc/mklibgcc.in#2 integrate ... //depot/projects/ia64/contrib/gcc/mkmap-symver.awk#2 integrate ... //depot/projects/ia64/contrib/gcc/objc/Makefile.in#2 delete ... //depot/projects/ia64/contrib/gcc/objc/lang-specs.h#4 integrate ... //depot/projects/ia64/contrib/gcc/objc/objc-act.c#3 integrate ... //depot/projects/ia64/contrib/gcc/objc/objc-lang.c#2 integrate ... //depot/projects/ia64/contrib/gcc/objc/objc.gperf#2 delete ... //depot/projects/ia64/contrib/gcc/obstack.c#3 integrate ... //depot/projects/ia64/contrib/gcc/obstack.h#3 integrate ... //depot/projects/ia64/contrib/gcc/optabs.c#4 integrate ... //depot/projects/ia64/contrib/gcc/output.h#3 integrate ... //depot/projects/ia64/contrib/gcc/partition.c#1 branch ... //depot/projects/ia64/contrib/gcc/partition.h#1 branch ... //depot/projects/ia64/contrib/gcc/patch-apollo-includes#2 delete ... //depot/projects/ia64/contrib/gcc/pcp.h#2 delete ... //depot/projects/ia64/contrib/gcc/pexecute.c#2 integrate ... //depot/projects/ia64/contrib/gcc/predict.c#2 integrate ... //depot/projects/ia64/contrib/gcc/print-tree.c#3 integrate ... //depot/projects/ia64/contrib/gcc/protoize.c#3 integrate ... //depot/projects/ia64/contrib/gcc/pself.c#2 delete ... //depot/projects/ia64/contrib/gcc/pself1.c#2 delete ... //depot/projects/ia64/contrib/gcc/pself2.c#2 delete ... //depot/projects/ia64/contrib/gcc/pself3.c#2 delete ... //depot/projects/ia64/contrib/gcc/pself4.c#2 delete ... //depot/projects/ia64/contrib/gcc/pself5.c#2 delete ... //depot/projects/ia64/contrib/gcc/recog.c#3 integrate ... //depot/projects/ia64/contrib/gcc/reg-stack.c#3 integrate ... //depot/projects/ia64/contrib/gcc/regclass.c#3 integrate ... //depot/projects/ia64/contrib/gcc/regmove.c#3 integrate ... //depot/projects/ia64/contrib/gcc/regrename.c#2 integrate ... //depot/projects/ia64/contrib/gcc/reload.c#4 integrate ... //depot/projects/ia64/contrib/gcc/reload1.c#4 integrate ... //depot/projects/ia64/contrib/gcc/reorg.c#3 integrate ... //depot/projects/ia64/contrib/gcc/resource.c#3 integrate ... //depot/projects/ia64/contrib/gcc/rtl.c#3 integrate ... //depot/projects/ia64/contrib/gcc/rtl.def#3 integrate ... //depot/projects/ia64/contrib/gcc/rtl.h#4 integrate ... //depot/projects/ia64/contrib/gcc/rtl.texi#2 delete ... //depot/projects/ia64/contrib/gcc/rtlanal.c#4 integrate ... //depot/projects/ia64/contrib/gcc/sched-deps.c#2 integrate ... //depot/projects/ia64/contrib/gcc/sched-int.h#2 integrate ... //depot/projects/ia64/contrib/gcc/sched-rgn.c#2 integrate ... //depot/projects/ia64/contrib/gcc/sched.c#2 delete ... //depot/projects/ia64/contrib/gcc/sibcall.c#2 integrate ... //depot/projects/ia64/contrib/gcc/simplify-rtx.c#2 integrate ... //depot/projects/ia64/contrib/gcc/splay-tree.c#3 integrate ... //depot/projects/ia64/contrib/gcc/splay-tree.h#3 integrate ... //depot/projects/ia64/contrib/gcc/ssa-ccp.c#2 integrate ... //depot/projects/ia64/contrib/gcc/stmt.c#4 integrate ... //depot/projects/ia64/contrib/gcc/stor-layout.c#3 integrate ... //depot/projects/ia64/contrib/gcc/stupid.c#2 delete ... //depot/projects/ia64/contrib/gcc/symcat.h#1 branch ... //depot/projects/ia64/contrib/gcc/system.h#4 integrate ... //depot/projects/ia64/contrib/gcc/target-def.h#2 integrate ... //depot/projects/ia64/contrib/gcc/target.h#2 integrate ... //depot/projects/ia64/contrib/gcc/tm.texi#2 delete ... //depot/projects/ia64/contrib/gcc/toplev.c#4 integrate ... //depot/projects/ia64/contrib/gcc/tradcif.y#2 integrate ... //depot/projects/ia64/contrib/gcc/tradcpp.c#2 integrate ... //depot/projects/ia64/contrib/gcc/tradcpp.h#2 integrate ... //depot/projects/ia64/contrib/gcc/tree-dump.c#2 integrate ... //depot/projects/ia64/contrib/gcc/tree-inline.c#2 integrate ... //depot/projects/ia64/contrib/gcc/tree.c#4 integrate ... //depot/projects/ia64/contrib/gcc/tree.def#3 integrate ... //depot/projects/ia64/contrib/gcc/tree.h#4 integrate ... //depot/projects/ia64/contrib/gcc/unprotoize.c#2 delete ... //depot/projects/ia64/contrib/gcc/unroll.c#4 integrate ... //depot/projects/ia64/contrib/gcc/unwind-dw2-fde-glibc.c#2 integrate ... //depot/projects/ia64/contrib/gcc/varasm.c#4 integrate ... //depot/projects/ia64/contrib/gcc/version.c#4 integrate ... //depot/projects/ia64/contrib/gcc/vmsdbgout.c#2 integrate ... //depot/projects/ia64/contrib/libf2c/ChangeLog#3 integrate ... //depot/projects/ia64/contrib/libf2c/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/libf2c/aclocal.m4#1 branch ... //depot/projects/ia64/contrib/libf2c/configure#3 integrate ... //depot/projects/ia64/contrib/libf2c/configure.in#3 integrate ... //depot/projects/ia64/contrib/libf2c/libF77/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/libf2c/libF77/Version.c#3 integrate ... //depot/projects/ia64/contrib/libf2c/libF77/configure#3 integrate ... //depot/projects/ia64/contrib/libf2c/libF77/configure.in#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/Makefile.in#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/Version.c#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/backspace.c#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/config.h.in#2 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/configure#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/configure.in#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/dfe.c#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/due.c#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/endfile.c#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/err.c#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/fio.h#2 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/ftell_.c#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/inquire.c#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/open.c#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/rdfmt.c#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/rewind.c#2 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/sfe.c#2 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/sue.c#3 integrate ... //depot/projects/ia64/contrib/libf2c/libI77/wsfe.c#2 integrate ... //depot/projects/ia64/contrib/libf2c/libU77/Makefile.in#3 integrate ... //depot/projects/ia64/contrib/libf2c/libU77/Version.c#3 integrate ... //depot/projects/ia64/contrib/libf2c/libU77/config.hin#2 integrate ... //depot/projects/ia64/contrib/libf2c/libU77/configure#3 integrate ... //depot/projects/ia64/contrib/libf2c/libU77/configure.in#3 integrate ... //depot/projects/ia64/contrib/libf2c/libU77/date_.c#2 integrate ... //depot/projects/ia64/contrib/libf2c/libU77/vxtidate_.c#3 integrate ... //depot/projects/ia64/contrib/libobjc/ChangeLog#4 integrate ... //depot/projects/ia64/contrib/libobjc/Makefile.in#4 integrate ... //depot/projects/ia64/contrib/libobjc/Object.m#4 integrate ... //depot/projects/ia64/contrib/libobjc/THREADS#3 integrate ... //depot/projects/ia64/contrib/libobjc/aclocal.m4#1 branch ... //depot/projects/ia64/contrib/libobjc/class.c#2 integrate ... //depot/projects/ia64/contrib/libobjc/config.h.in#1 branch ... //depot/projects/ia64/contrib/libobjc/configure#3 integrate ... //depot/projects/ia64/contrib/libobjc/configure.in#3 integrate ... //depot/projects/ia64/contrib/libobjc/encoding.c#4 integrate ... //depot/projects/ia64/contrib/libobjc/gc.c#2 integrate ... //depot/projects/ia64/contrib/libobjc/init.c#3 integrate ... //depot/projects/ia64/contrib/libobjc/libobjc.def#3 integrate ... //depot/projects/ia64/contrib/libobjc/objc/hash.h#3 integrate ... //depot/projects/ia64/contrib/libobjc/objc/objc-api.h#3 integrate ... //depot/projects/ia64/contrib/libobjc/objc/thr.h#3 integrate ... //depot/projects/ia64/contrib/libobjc/sarray.c#4 integrate ... //depot/projects/ia64/contrib/libobjc/sendmsg.c#4 integrate ... //depot/projects/ia64/contrib/libobjc/thr-objc.c#1 branch ... //depot/projects/ia64/contrib/libobjc/thr-posix.c#4 integrate ... //depot/projects/ia64/contrib/libobjc/thr-rtems.c#1 branch ... //depot/projects/ia64/contrib/libobjc/thr.c#3 integrate ... //depot/projects/ia64/crypto/kerberosIV/appl/bsd/pathnames.h#1 branch ... //depot/projects/ia64/crypto/telnet/libtelnet/sra.c#3 integrate ... //depot/projects/ia64/etc/defaults/pccard.conf#7 integrate ... //depot/projects/ia64/etc/ftpusers#3 integrate ... //depot/projects/ia64/etc/mail/README#5 integrate ... //depot/projects/ia64/etc/pam.d/login#5 integrate ... //depot/projects/ia64/etc/pam.d/other#5 integrate ... //depot/projects/ia64/etc/pam.d/sshd#5 integrate ... //depot/projects/ia64/etc/periodic/daily/440.status-mailq#3 integrate ... //depot/projects/ia64/etc/rc#12 integrate ... //depot/projects/ia64/games/atc/input.c#2 integrate ... //depot/projects/ia64/games/atc/log.c#2 integrate ... //depot/projects/ia64/games/atc/update.c#2 integrate ... //depot/projects/ia64/games/larn/global.c#2 integrate ... //depot/projects/ia64/games/larn/header.h#2 integrate ... //depot/projects/ia64/games/larn/help.c#2 integrate ... //depot/projects/ia64/games/larn/io.c#2 integrate ... //depot/projects/ia64/games/larn/main.c#2 integrate ... //depot/projects/ia64/games/larn/nap.c#2 integrate ... //depot/projects/ia64/games/larn/object.c#2 integrate ... //depot/projects/ia64/games/larn/scores.c#2 integrate ... //depot/projects/ia64/games/larn/signal.c#2 integrate ... //depot/projects/ia64/games/larn/tok.c#2 integrate ... //depot/projects/ia64/gnu/lib/Makefile#6 integrate ... //depot/projects/ia64/gnu/lib/csu/Makefile#3 integrate ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#4 integrate ... //depot/projects/ia64/gnu/lib/libiberty/Makefile#2 integrate ... //depot/projects/ia64/gnu/lib/libobjc/Makefile#2 integrate ... //depot/projects/ia64/gnu/lib/libstdc++/Makefile#2 integrate ... //depot/projects/ia64/gnu/lib/libstdc++/config.h#1 branch ... //depot/projects/ia64/gnu/lib/libsupc++/Makefile#1 branch ... //depot/projects/ia64/gnu/usr.bin/Makefile#10 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile.fe#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile.inc#5 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile.tgt#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/c++/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/c++filt/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1/Makefile#6 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1obj/Makefile#6 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1plus/Makefile#5 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_drv/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_fbsd/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_int/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#6 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/auto-host.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#5 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cccp/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/collect2/Makefile#6 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cpp/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cpp0/Makefile#1 branch ... //depot/projects/ia64/gnu/usr.bin/cc/doc/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/f77/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/f771/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/f77doc/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/gcov/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/protoize/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/tradcpp0/Makefile#1 branch ... //depot/projects/ia64/include/paths.h#4 integrate ... //depot/projects/ia64/kerberos5/lib/libsl/Makefile#2 integrate ... //depot/projects/ia64/kerberos5/usr.bin/krb5-config/Makefile#3 integrate ... //depot/projects/ia64/lib/csu/common/crtbrand.c#2 integrate ... //depot/projects/ia64/lib/csu/sparc64/Makefile#5 integrate ... //depot/projects/ia64/lib/libc/gen/getbootfile.3#2 integrate ... //depot/projects/ia64/lib/libc/gen/getpwent.c#4 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/Makefile.inc#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_reg.S#2 integrate ... //depot/projects/ia64/lib/libc/sys/Makefile.inc#3 integrate ... //depot/projects/ia64/lib/libc/sys/accept.2#3 integrate ... //depot/projects/ia64/lib/libc/sys/chflags.2#2 integrate ... //depot/projects/ia64/lib/libc/sys/listen.2#2 integrate ... //depot/projects/ia64/lib/libpam/modules/modules.inc#8 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ftpusers/Makefile#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.8#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#5 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_unix/Makefile#6 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.c#11 integrate ... //depot/projects/ia64/lib/libradius/Makefile#2 integrate ... //depot/projects/ia64/lib/libradius/libradius.3#2 integrate ... //depot/projects/ia64/lib/libradius/radlib.c#2 integrate ... //depot/projects/ia64/lib/libradius/radlib_private.h#2 integrate ... //depot/projects/ia64/lib/libradius/radlib_vs.h#1 branch ... //depot/projects/ia64/lib/libutil/Makefile#3 integrate ... //depot/projects/ia64/lib/libutil/libutil.h#3 integrate ... //depot/projects/ia64/lib/libutil/pw_copy.c#2 delete ... //depot/projects/ia64/lib/libutil/pw_util.c#2 integrate ... //depot/projects/ia64/lib/libypclnt/ypclnt.h#2 integrate ... //depot/projects/ia64/lib/libypclnt/ypclnt_passwd.c#3 integrate ... //depot/projects/ia64/libexec/rlogind/pathnames.h#2 delete ... //depot/projects/ia64/libexec/rlogind/rlogind.c#3 integrate ... //depot/projects/ia64/libexec/rshd/rshd.c#3 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#4 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#7 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#25 integrate ... //depot/projects/ia64/release/picobsd/tinyware/passwd/Makefile#1 branch ... //depot/projects/ia64/release/picobsd/tinyware/passwd/passwd.c#1 branch ... //depot/projects/ia64/sbin/ipfw/ipfw.c#4 integrate ... //depot/projects/ia64/sbin/nextboot/nextboot.8#2 integrate ... //depot/projects/ia64/sbin/restore/tape.c#5 integrate ... //depot/projects/ia64/sbin/savecore/savecore.c#13 integrate ... //depot/projects/ia64/sbin/sysctl/sysctl.c#6 integrate ... //depot/projects/ia64/sbin/tunefs/tunefs.8#4 integrate ... //depot/projects/ia64/share/Makefile#2 integrate ... //depot/projects/ia64/share/examples/pppd/ppp.deny.sample#2 integrate ... //depot/projects/ia64/share/man/man4/vinum.4#5 integrate ... //depot/projects/ia64/share/man/man4/wi.4tbl#2 delete ... //depot/projects/ia64/share/man/man4/wi.4tl#2 delete ... //depot/projects/ia64/share/man/man7/release.7#8 integrate ... //depot/projects/ia64/share/man/man8/man8.i386/MAKEDEV.8#3 integrate ... //depot/projects/ia64/share/man/man9/acl.9#4 integrate ... //depot/projects/ia64/share/misc/pci_vendors#8 integrate ... //depot/projects/ia64/share/mk/bsd.cpu.mk#3 integrate ... //depot/projects/ia64/share/mk/bsd.dep.mk#6 integrate ... //depot/projects/ia64/share/mk/bsd.lib.mk#9 integrate ... //depot/projects/ia64/share/mk/bsd.man.mk#4 integrate ... //depot/projects/ia64/share/mk/bsd.prog.mk#9 integrate ... //depot/projects/ia64/share/mk/bsd.subdir.mk#4 integrate ... //depot/projects/ia64/share/mk/bsd.sys.mk#6 integrate ... //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#7 integrate ... //depot/projects/ia64/sys/alpha/include/ansi.h#7 integrate ... //depot/projects/ia64/sys/alpha/include/atomic.h#2 integrate ... //depot/projects/ia64/sys/alpha/include/stdarg.h#2 integrate ... //depot/projects/ia64/sys/alpha/include/varargs.h#2 integrate ... //depot/projects/ia64/sys/arm/include/ansi.h#5 integrate ... //depot/projects/ia64/sys/boot/Makefile#3 integrate ... //depot/projects/ia64/sys/boot/alpha/boot1/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/alpha/cdboot/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/alpha/libalpha/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/alpha/loader/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/alpha/netboot/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/arc/lib/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/arc/loader/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/common/load_elf.c#7 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/Makefile#4 integrate ... //depot/projects/ia64/sys/boot/efi/loader/Makefile#13 integrate ... //depot/projects/ia64/sys/boot/ficl/Makefile#3 integrate ... //depot/projects/ia64/sys/boot/forth/loader.4th.8#2 integrate ... //depot/projects/ia64/sys/boot/forth/loader.conf.5#4 integrate ... //depot/projects/ia64/sys/boot/i386/Makefile#3 integrate ... //depot/projects/ia64/sys/boot/i386/Makefile.inc#2 integrate ... //depot/projects/ia64/sys/boot/i386/boot2/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/i386/kgzldr/Makefile#4 integrate ... //depot/projects/ia64/sys/boot/i386/libi386/Makefile#3 integrate ... //depot/projects/ia64/sys/boot/i386/loader/Makefile#4 integrate ... //depot/projects/ia64/sys/boot/ia64/libski/Makefile#5 integrate ... //depot/projects/ia64/sys/boot/ia64/skiload/Makefile#10 integrate ... //depot/projects/ia64/sys/boot/pc98/boot2/Makefile#3 integrate ... //depot/projects/ia64/sys/boot/pc98/kgzldr/Makefile#4 integrate ... //depot/projects/ia64/sys/boot/pc98/libpc98/Makefile#3 integrate ... //depot/projects/ia64/sys/boot/pc98/loader/Makefile#4 integrate ... //depot/projects/ia64/sys/boot/powerpc/loader/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/sparc64/boot1/Makefile#4 integrate ... //depot/projects/ia64/sys/boot/sparc64/loader/Makefile#4 integrate ... //depot/projects/ia64/sys/conf/NOTES#8 integrate ... //depot/projects/ia64/sys/conf/files#20 integrate ... //depot/projects/ia64/sys/conf/options#12 integrate ... //depot/projects/ia64/sys/ddb/db_elf.c#1 branch ... //depot/projects/ia64/sys/ddb/db_kld.c#2 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi.c#10 integrate ... //depot/projects/ia64/sys/dev/aic7xxx/aicasm/Makefile#6 integrate ... //depot/projects/ia64/sys/dev/ar/if_ar.c#3 integrate ... //depot/projects/ia64/sys/dev/drm/drm_drv.h#2 integrate ... //depot/projects/ia64/sys/dev/drm/drm_os_freebsd.h#2 integrate ... //depot/projects/ia64/sys/dev/ichsmb/ichsmb_pci.c#2 integrate ... //depot/projects/ia64/sys/dev/sio/sio_isa.c#7 integrate ... //depot/projects/ia64/sys/dev/usb/ufm.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/ugen.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/ulpt.c#4 integrate ... //depot/projects/ia64/sys/dev/usb/urio.c#5 integrate ... //depot/projects/ia64/sys/dev/usb/usb.c#7 integrate ... //depot/projects/ia64/sys/dev/usb/usb_port.h#7 integrate ... //depot/projects/ia64/sys/dev/usb/usbdi.c#7 integrate ... //depot/projects/ia64/sys/dev/usb/usbdi.h#5 integrate ... //depot/projects/ia64/sys/dev/wi/wi_hostap.c#6 integrate ... //depot/projects/ia64/sys/i386/conf/NOTES#16 integrate ... //depot/projects/ia64/sys/i386/include/ansi.h#7 integrate ... //depot/projects/ia64/sys/i386/include/stdarg.h#3 integrate ... //depot/projects/ia64/sys/i386/include/varargs.h#2 integrate ... //depot/projects/ia64/sys/ia64/ia64/swtch.s#8 integrate ... //depot/projects/ia64/sys/ia64/include/pcb.h#4 integrate ... //depot/projects/ia64/sys/ia64/include/reg.h#5 integrate ... //depot/projects/ia64/sys/ia64/include/stdarg.h#3 integrate ... //depot/projects/ia64/sys/ia64/include/varargs.h#2 integrate ... //depot/projects/ia64/sys/kern/init_sysent.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#20 integrate ... //depot/projects/ia64/sys/kern/kern_exit.c#13 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#15 integrate ... //depot/projects/ia64/sys/kern/kern_sig.c#14 integrate ... //depot/projects/ia64/sys/kern/kern_subr.c#3 integrate ... //depot/projects/ia64/sys/kern/kern_switch.c#4 integrate ... //depot/projects/ia64/sys/kern/subr_log.c#3 integrate ... //depot/projects/ia64/sys/kern/subr_mbuf.c#5 integrate ... //depot/projects/ia64/sys/kern/subr_witness.c#12 integrate ... //depot/projects/ia64/sys/kern/sys_generic.c#10 integrate ... //depot/projects/ia64/sys/kern/sys_pipe.c#13 integrate ... //depot/projects/ia64/sys/kern/sys_process.c#9 integrate ... //depot/projects/ia64/sys/kern/syscalls.c#7 integrate ... //depot/projects/ia64/sys/kern/syscalls.master#7 integrate ... //depot/projects/ia64/sys/kern/tty.c#10 integrate ... //depot/projects/ia64/sys/kern/uipc_socket.c#11 integrate ... //depot/projects/ia64/sys/kern/uipc_socket2.c#9 integrate ... //depot/projects/ia64/sys/kern/vfs_subr.c#11 integrate ... //depot/projects/ia64/sys/kern/vfs_syscalls.c#16 integrate ... //depot/projects/ia64/sys/net/bpf.c#8 integrate ... //depot/projects/ia64/sys/net/bridge.c#6 integrate ... //depot/projects/ia64/sys/net/if_dl.h#3 integrate ... //depot/projects/ia64/sys/net/if_iso88025subr.c#3 integrate ... //depot/projects/ia64/sys/net/if_media.h#5 integrate ... //depot/projects/ia64/sys/net/if_tap.c#9 integrate ... //depot/projects/ia64/sys/net/if_tun.c#6 integrate ... //depot/projects/ia64/sys/net/if_var.h#6 integrate ... //depot/projects/ia64/sys/net/iso88025.h#2 integrate ... //depot/projects/ia64/sys/netatm/atm_cm.c#6 integrate ... //depot/projects/ia64/sys/netatm/atm_cm.h#4 integrate ... //depot/projects/ia64/sys/netatm/atm_socket.c#4 integrate ... //depot/projects/ia64/sys/netatm/atm_subr.c#8 integrate ... //depot/projects/ia64/sys/netatm/atm_var.h#6 integrate ... //depot/projects/ia64/sys/netgraph/ng_ether.c#4 integrate ... //depot/projects/ia64/sys/netinet/icmp6.h#4 integrate ... //depot/projects/ia64/sys/netinet/if_ether.c#7 integrate ... //depot/projects/ia64/sys/netinet/ip_fw.c#7 integrate ... //depot/projects/ia64/sys/netinet/ip_fw.h#5 integrate ... //depot/projects/ia64/sys/netinet/ip_input.c#8 integrate ... //depot/projects/ia64/sys/netinet/ip_output.c#9 integrate ... //depot/projects/ia64/sys/netinet6/icmp6.c#5 integrate ... //depot/projects/ia64/sys/netinet6/mld6.c#2 integrate ... //depot/projects/ia64/sys/pci/if_dc.c#11 integrate ... //depot/projects/ia64/sys/pci/if_dcreg.h#4 integrate ... //depot/projects/ia64/sys/pci/if_rl.c#10 integrate ... //depot/projects/ia64/sys/pci/if_rlreg.h#5 integrate ... //depot/projects/ia64/sys/powerpc/include/ansi.h#7 integrate ... //depot/projects/ia64/sys/powerpc/include/param.h#3 integrate ... //depot/projects/ia64/sys/powerpc/include/pte.h#4 integrate ... //depot/projects/ia64/sys/powerpc/include/spr.h#2 integrate ... //depot/projects/ia64/sys/powerpc/include/stdarg.h#2 integrate ... //depot/projects/ia64/sys/powerpc/include/trap.h#3 integrate ... //depot/projects/ia64/sys/powerpc/include/varargs.h#2 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/copyinout.c#3 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#9 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/swtch.s#6 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/trap.c#9 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/trap_subr.S#2 integrate ... //depot/projects/ia64/sys/sparc64/include/ansi.h#7 integrate ... //depot/projects/ia64/sys/sparc64/include/proc.h#6 integrate ... //depot/projects/ia64/sys/sparc64/include/reg.h#5 integrate ... //depot/projects/ia64/sys/sparc64/include/stdarg.h#2 integrate ... //depot/projects/ia64/sys/sparc64/include/varargs.h#2 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/exception.s#8 integrate ... //depot/projects/ia64/sys/sys/filedesc.h#8 integrate ... //depot/projects/ia64/sys/sys/jail.h#5 integrate ... //depot/projects/ia64/sys/sys/proc.h#15 integrate ... //depot/projects/ia64/sys/sys/stat.h#4 integrate ... //depot/projects/ia64/sys/sys/sun_disklabel.h#1 branch ... //depot/projects/ia64/sys/sys/syscall.h#7 integrate ... //depot/projects/ia64/sys/sys/syscall.mk#7 integrate ... //depot/projects/ia64/sys/sys/sysproto.h#8 integrate ... //depot/projects/ia64/sys/sys/uio.h#3 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_readwrite.c#5 integrate ... //depot/projects/ia64/sys/vm/vm_fault.c#10 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#16 integrate ... //depot/projects/ia64/sys/vm/vm_map.h#10 integrate ... //depot/projects/ia64/sys/vm/vm_object.c#10 integrate ... //depot/projects/ia64/sys/vm/vm_object.h#4 integrate ... //depot/projects/ia64/sys/vm/vnode_pager.c#9 integrate ... //depot/projects/ia64/usr.bin/at/at.c#5 integrate ... //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#12 integrate ... //depot/projects/ia64/usr.bin/chpass/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/chpass/chpass.c#6 integrate ... //depot/projects/ia64/usr.bin/chpass/chpass.h#4 integrate ... //depot/projects/ia64/usr.bin/chpass/edit.c#4 integrate ... //depot/projects/ia64/usr.bin/chpass/field.c#4 integrate ... //depot/projects/ia64/usr.bin/chpass/pathnames.h#2 delete ... //depot/projects/ia64/usr.bin/chpass/pw_copy.c#4 delete ... //depot/projects/ia64/usr.bin/chpass/pw_copy.h#5 delete ... //depot/projects/ia64/usr.bin/chpass/pw_yp.c#6 delete ... //depot/projects/ia64/usr.bin/chpass/pw_yp.h#3 delete ... //depot/projects/ia64/usr.bin/chpass/util.c#4 integrate ... //depot/projects/ia64/usr.bin/doscmd/AsyncIO.c#3 integrate ... //depot/projects/ia64/usr.bin/doscmd/cpu.c#4 integrate ... //depot/projects/ia64/usr.bin/ee/ee.c#2 integrate ... //depot/projects/ia64/usr.bin/fstat/fstat.1#5 integrate ... //depot/projects/ia64/usr.bin/ipcs/ipcs.1#3 integrate ... //depot/projects/ia64/usr.bin/mesg/mesg.1#3 integrate ... //depot/projects/ia64/usr.bin/mesg/mesg.c#3 integrate ... //depot/projects/ia64/usr.bin/nfsstat/nfsstat.1#2 integrate ... //depot/projects/ia64/usr.bin/nice/nice.1#3 integrate ... //depot/projects/ia64/usr.bin/nice/nice.c#5 integrate ... //depot/projects/ia64/usr.bin/passwd/extern.h#3 delete ... //depot/projects/ia64/usr.bin/passwd/local_passwd.c#4 delete ... //depot/projects/ia64/usr.bin/passwd/yp_passwd.c#4 delete ... //depot/projects/ia64/usr.bin/rlogin/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/rlogin/rlogin.c#6 integrate ... //depot/projects/ia64/usr.bin/rpcgen/rpc_svcout.c#3 integrate ... //depot/projects/ia64/usr.bin/rsh/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/rsh/pathnames.h#2 delete ... //depot/projects/ia64/usr.bin/rsh/rsh.c#5 integrate ... //depot/projects/ia64/usr.bin/sed/main.c#4 integrate ... //depot/projects/ia64/usr.bin/sed/sed.1#3 integrate ... //depot/projects/ia64/usr.bin/symorder/symorder.1#2 integrate ... //depot/projects/ia64/usr.bin/systat/systat.1#3 integrate ... //depot/projects/ia64/usr.bin/vmstat/vmstat.8#2 integrate ... //depot/projects/ia64/usr.bin/w/uptime.1#2 integrate ... //depot/projects/ia64/usr.bin/w/w.1#2 integrate ... //depot/projects/ia64/usr.bin/who/who.1#2 integrate ... //depot/projects/ia64/usr.bin/who/who.c#4 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.c#11 integrate ... //depot/projects/ia64/usr.sbin/Makefile#13 integrate ... //depot/projects/ia64/usr.sbin/arp/arp.c#7 integrate ... //depot/projects/ia64/usr.sbin/cdcontrol/cdcontrol.1#3 integrate ... //depot/projects/ia64/usr.sbin/cdcontrol/cdcontrol.c#4 integrate ... //depot/projects/ia64/usr.sbin/getextattr/getextattr.8#3 integrate ... //depot/projects/ia64/usr.sbin/inetd/inetd.c#2 integrate ... //depot/projects/ia64/usr.sbin/iostat/iostat.8#2 integrate ... //depot/projects/ia64/usr.sbin/kernbb/kernbb.8#2 integrate ... //depot/projects/ia64/usr.sbin/mtree/mtree.8#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/Makefile#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/create/perform.c#7 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/create/pkg_create.1#4 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/perform.c#4 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/info/show.c#6 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/deps.c#4 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/lib.h#3 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/lib/plist.c#5 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/update/Makefile#2 delete ... //depot/projects/ia64/usr.sbin/pkg_install/update/pkg_update.1#2 delete ... //depot/projects/ia64/usr.sbin/pkg_install/update/pkg_update.pl#2 delete ... //depot/projects/ia64/usr.sbin/ppp/auth.h#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/bundle.c#6 integrate ... //depot/projects/ia64/usr.sbin/ppp/bundle.h#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/chap.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/mp.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/pap.c#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/ppp.8.m4#8 integrate ... //depot/projects/ia64/usr.sbin/ppp/radius.c#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/radius.h#3 integrate ... //depot/projects/ia64/usr.sbin/pppd/options.c#2 integrate ... //depot/projects/ia64/usr.sbin/pstat/pstat.8#3 integrate ... //depot/projects/ia64/usr.sbin/rarpd/rarpd.c#3 integrate ... //depot/projects/ia64/usr.sbin/rpc.yppasswdd/Makefile#2 integrate ... //depot/projects/ia64/usr.sbin/rpc.yppasswdd/pw_copy.c#3 delete ... //depot/projects/ia64/usr.sbin/rpc.yppasswdd/pw_util.c#3 delete ... //depot/projects/ia64/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h#3 integrate ... //depot/projects/ia64/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 4:55: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EE0837B400; Fri, 10 May 2002 04:54:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9C2A137B40B for ; Fri, 10 May 2002 04:54:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4ABssq11750 for perforce@freebsd.org; Fri, 10 May 2002 04:54:54 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 04:54:54 -0700 (PDT) Message-Id: <200205101154.g4ABssq11750@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11103 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11103 Change 11103 by peter@peter_daintree on 2002/05/10 04:54:46 Nuke, totally obsolete now. Affected files ... ... //depot/projects/ia64/doinc.sh#4 delete ... //depot/projects/ia64/dolibs.sh#4 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 4:55:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 918FA37B40A; Fri, 10 May 2002 04:54:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6855737B40A for ; Fri, 10 May 2002 04:54:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4ABss511741 for perforce@freebsd.org; Fri, 10 May 2002 04:54:54 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 04:54:54 -0700 (PDT) Message-Id: <200205101154.g4ABss511741@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11102 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11102 Change 11102 by peter@peter_daintree on 2002/05/10 04:54:13 Diff reduction (post-gcc-3.1 import) Affected files ... ... //depot/projects/ia64/Makefile.inc1#24 edit Differences ... ==== //depot/projects/ia64/Makefile.inc1#24 (text+ko) ==== @@ -203,7 +203,7 @@ WMAKEENV= ${CROSSENV} \ DESTDIR=${WORLDTMP} \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ - PATH=${TMPPATH}:${OBJFORMAT_PATH} + PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 # install stage @@ -626,12 +626,8 @@ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif -.if !defined(NO_GCC) -_cc_tools= gnu/usr.bin/cc/cc_tools -.endif - build-tools: -.for _tool in bin/csh bin/sh ${_games} ${_cc_tools} ${_fortran} \ +.for _tool in bin/csh bin/sh ${_games} gnu/usr.bin/cc/cc_tools ${_fortran} \ ${_perl} ${_libroken4} ${_libkrb5} lib/libncurses ${_share} \ usr.bin/awk usr.bin/file usr.sbin/sysinstall cd ${.CURDIR}/${_tool}; ${MAKE} build-tools @@ -772,9 +768,7 @@ .else _startup_libs= lib/csu/${MACHINE_ARCH} .endif -.if !defined(NO_GCC) _startup_libs+= gnu/lib/csu gnu/lib/libgcc -.endif _prebuild_libs= To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 4:59:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6CC337B408; Fri, 10 May 2002 04:59:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1A1E137B400 for ; Fri, 10 May 2002 04:59:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4ABwxv13192 for perforce@freebsd.org; Fri, 10 May 2002 04:58:59 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 04:58:59 -0700 (PDT) Message-Id: <200205101158.g4ABwxv13192@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11104 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11104 Change 11104 by peter@peter_daintree on 2002/05/10 04:58:47 Diff reduction (hopefully, this isn't correct :-) Affected files ... ... //depot/projects/ia64/gnu/usr.bin/Makefile#11 edit Differences ... ==== //depot/projects/ia64/gnu/usr.bin/Makefile#11 (text+ko) ==== @@ -7,10 +7,6 @@ SUBDIR+=gperf groff .endif -.if !defined(NO_BINUTILS) -SUBDIR+=binutils -.endif - .if !defined(NO_CVS) SUBDIR+=cvs .endif @@ -21,7 +17,7 @@ .endif .endif -.if !defined(NO_GCC) && ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64" +.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64" SUBDIR+=cc .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 5: 0:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BAA437B409; Fri, 10 May 2002 05:00:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6D0CA37B406 for ; Fri, 10 May 2002 05:00:01 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AC01313621 for perforce@freebsd.org; Fri, 10 May 2002 05:00:01 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 05:00:01 -0700 (PDT) Message-Id: <200205101200.g4AC01313621@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11105 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11105 Change 11105 by peter@peter_daintree on 2002/05/10 04:59:18 Diff reduction Affected files ... ... //depot/projects/ia64/usr.bin/Makefile#22 edit Differences ... ==== //depot/projects/ia64/usr.bin/Makefile#22 (text+ko) ==== @@ -239,7 +239,7 @@ .if ${MACHINE_ARCH} != "sparc64" && ${MACHINE_ARCH} != "ia64" SUBDIR+=xlint .endif -.if !defined(NO_CXX) && ${MACHINE_ARCH} != "sparc64" +.if ${MACHINE_ARCH} != "sparc64" SUBDIR+=getconf .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 5:14: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92AD537B400; Fri, 10 May 2002 05:13:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from gate.qubesoft.com (gate.qubesoft.com [212.113.16.243]) by hub.freebsd.org (Postfix) with ESMTP id E1CCA37B408; Fri, 10 May 2002 05:13:45 -0700 (PDT) Received: from bluebottle.qubesoft.com (bluebottle [192.168.1.2]) by gate.qubesoft.com (8.11.6/8.11.3) with ESMTP id g4ACDcL07201; Fri, 10 May 2002 13:13:39 +0100 (BST) (envelope-from dfr@nlsystems.com) Received: from doug01 (dhcp112.qubesoft.com [192.168.1.112]) by bluebottle.qubesoft.com (8.11.4/8.11.4) with SMTP id g4ACDbS25363; Fri, 10 May 2002 13:13:38 +0100 (BST) (envelope-from dfr@nlsystems.com) Message-ID: <03ea01c1f81c$3e9b1c50$7001a8c0@doug01> From: "Doug Rabson" To: "Peter Wemm" , "Perforce Change Reviews" References: <200205101140.g4ABeDw99838@freefall.freebsd.org> Subject: Re: PERFORCE change 11101 for review Date: Fri, 10 May 2002 13:14:32 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2600.0000 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11101 > > Change 11101 by peter@peter_daintree on 2002/05/10 04:39:45 > > IFC @11100 - gcc-3.1 - yeah! Woohoo! To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 5:31:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48D7C37B405; Fri, 10 May 2002 05:31:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 75A5337B401 for ; Fri, 10 May 2002 05:31:40 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4ACVeD28213 for perforce@freebsd.org; Fri, 10 May 2002 05:31:40 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 05:31:40 -0700 (PDT) Message-Id: <200205101231.g4ACVeD28213@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11107 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11107 Change 11107 by peter@peter_ia64 on 2002/05/10 05:31:09 add ia64 target Affected files ... ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile.tgt#4 edit Differences ... ==== //depot/projects/ia64/gnu/usr.bin/cc/Makefile.tgt#4 (text+ko) ==== @@ -8,6 +8,8 @@ GCC_CPU= arm .elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86-64" GCC_CPU= i386 +.elif ${TARGET_ARCH} == "ia64" +GCC_CPU= ia64 .elif ${TARGET_ARCH} == "powerpc" GCC_CPU= rs6000 .elif ${TARGET_ARCH} == "sparc64" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 5:33:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D935937B401; Fri, 10 May 2002 05:33:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5979E37B406 for ; Fri, 10 May 2002 05:33:43 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4ACXhs28799 for perforce@freebsd.org; Fri, 10 May 2002 05:33:43 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 05:33:43 -0700 (PDT) Message-Id: <200205101233.g4ACXhs28799@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11108 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11108 Change 11108 by peter@peter_ia64 on 2002/05/10 05:33:26 Let gcc use the per-arch settings for sjlj. For ia64, this forced override breaks the build. All our platforms still have it off by default though.. but ia64 breaks if we explicitly force it. Affected files ... ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#7 edit Differences ... ==== //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#7 (text+ko) ==== @@ -167,7 +167,9 @@ echo '#ifndef POSIX' >> ${.TARGET} echo '# define POSIX' >> ${.TARGET} echo '#endif' >> ${.TARGET} +.if ${TARGET_ARCH} != "ia64" echo '#define CONFIG_SJLJ_EXCEPTIONS 0' >> ${.TARGET} +.endif tm_p.h: echo '#include "${GCC_CPU}/${GCC_CPU}-protos.h"' >> ${.TARGET} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 5:36:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B501937B425; Fri, 10 May 2002 05:36:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 297CF37B41F for ; Fri, 10 May 2002 05:35:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4ACZjR29407 for perforce@freebsd.org; Fri, 10 May 2002 05:35:45 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 05:35:45 -0700 (PDT) Message-Id: <200205101235.g4ACZjR29407@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11109 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11109 Change 11109 by peter@peter_ia64 on 2002/05/10 05:34:45 We seem to be in business on ia64! :-) Affected files ... ... //depot/projects/ia64/gnu/usr.bin/Makefile#12 edit Differences ... ==== //depot/projects/ia64/gnu/usr.bin/Makefile#12 (text+ko) ==== @@ -17,7 +17,7 @@ .endif .endif -.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64" +.if ${MACHINE_ARCH} != "sparc64" SUBDIR+=cc .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 5:41:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF7FA37B40C; Fri, 10 May 2002 05:41:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CDF5737B401 for ; Fri, 10 May 2002 05:41:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4ACfru39757 for perforce@freebsd.org; Fri, 10 May 2002 05:41:53 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 05:41:53 -0700 (PDT) Message-Id: <200205101241.g4ACfru39757@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11110 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11110 Change 11110 by peter@peter_ia64 on 2002/05/10 05:41:39 Fix warning: cast to pointer from different sized integer. This is nasty on ia64. Affected files ... ... //depot/projects/ia64/lib/libc/stdlib/malloc.c#9 edit Differences ... ==== //depot/projects/ia64/lib/libc/stdlib/malloc.c#9 (text+ko) ==== @@ -95,7 +95,7 @@ #endif /* __FOOCPU__ && __BAROS__ */ #ifndef ZEROSIZEPTR -#define ZEROSIZEPTR ((void *)(1 << (malloc_pageshift - 1))) +#define ZEROSIZEPTR ((void *)(uintptr_t)(1 << (malloc_pageshift - 1))) #endif /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 7:12:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA9FB37B41A; Fri, 10 May 2002 07:12:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fw.wemm.org (12-232-135-171.client.attbi.com [12.232.135.171]) by hub.freebsd.org (Postfix) with ESMTP id 09CF337B411 for ; Fri, 10 May 2002 07:12:28 -0700 (PDT) Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by fw.wemm.org (8.11.6/8.11.6) with ESMTP id g4AECN442126 for ; Fri, 10 May 2002 07:12:23 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 232673808; Fri, 10 May 2002 07:12:22 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: "Doug Rabson" Cc: "Perforce Change Reviews" Subject: Re: PERFORCE change 11101 for review In-Reply-To: <03ea01c1f81c$3e9b1c50$7001a8c0@doug01> Date: Fri, 10 May 2002 07:12:22 -0700 From: Peter Wemm Message-Id: <20020510141222.232673808@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG "Doug Rabson" wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11101 > > > > Change 11101 by peter@peter_daintree on 2002/05/10 04:39:45 > > > > IFC @11100 - gcc-3.1 - yeah! > > Woohoo! There's still some very strange stuff going on. I haven't ruled out some systematic contamination from a previous bad compile on my box, but something looks like it is not right yet. If you see function calls to __builtin_expect or __builtin_stdarg_start, you're seeing what I have run into. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 7:23: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2BF037B403; Fri, 10 May 2002 07:22:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from gate.qubesoft.com (gate.qubesoft.com [212.113.16.243]) by hub.freebsd.org (Postfix) with ESMTP id 4A97237B400 for ; Fri, 10 May 2002 07:22:53 -0700 (PDT) Received: from bluebottle.qubesoft.com (bluebottle [192.168.1.2]) by gate.qubesoft.com (8.11.6/8.11.3) with ESMTP id g4AEMoL08058; Fri, 10 May 2002 15:22:51 +0100 (BST) (envelope-from dfr@nlsystems.com) Received: from doug01 (dhcp112.qubesoft.com [192.168.1.112]) by bluebottle.qubesoft.com (8.11.4/8.11.4) with SMTP id g4AEMjS35125; Fri, 10 May 2002 15:22:49 +0100 (BST) (envelope-from dfr@nlsystems.com) Message-ID: <048301c1f82e$4bf647a0$7001a8c0@doug01> From: "Doug Rabson" To: "Peter Wemm" Cc: "Perforce Change Reviews" References: <20020510141222.232673808@overcee.wemm.org> Subject: Re: PERFORCE change 11101 for review Date: Fri, 10 May 2002 15:23:40 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2600.0000 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG > "Doug Rabson" wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11101 > > > > > > Change 11101 by peter@peter_daintree on 2002/05/10 04:39:45 > > > > > > IFC @11100 - gcc-3.1 - yeah! > > > > Woohoo! > > There's still some very strange stuff going on. I haven't ruled out some > systematic contamination from a previous bad compile on my box, but > something looks like it is not right yet. If you see function calls to > __builtin_expect or __builtin_stdarg_start, you're seeing what I have run > into. I probably won't have time to look at this for a few days anyway. My weekend is taken up with family stuff and I want to spend time on merging imgact_ia32 with imgact_elf32 again. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 8:14:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AD0237B401; Fri, 10 May 2002 08:14:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C0DE537B404 for ; Fri, 10 May 2002 08:14:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AFEOV06131 for perforce@freebsd.org; Fri, 10 May 2002 08:14:24 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 08:14:24 -0700 (PDT) Message-Id: <200205101514.g4AFEOV06131@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11118 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11118 Change 11118 by peter@peter_ia64 on 2002/05/10 08:13:37 use the correct crt*.asm files. Affected files ... ... //depot/projects/ia64/gnu/lib/csu/Makefile#4 edit Differences ... ==== //depot/projects/ia64/gnu/lib/csu/Makefile#4 (text+ko) ==== @@ -6,7 +6,13 @@ CCDIR= ${.CURDIR}/../../usr.bin/cc .include "${CCDIR}/Makefile.tgt" +.PATH: ${GCCDIR}/config/${GCC_CPU} + +.if ${TARGET_ARCH} == "ia64" +SRCS= crtbegin.asm crtend.asm +.else SRCS= crtstuff.c tconfig.h +.endif OBJS= crtbegin.o crtend.o SOBJS= crtbegin.So crtend.So CFLAGS+= -DIN_GCC -DHAVE_LD_EH_FRAME_HDR @@ -19,7 +25,6 @@ NOLIB= true .if ${TARGET_ARCH} == "sparc64" -.PATH: ${GCCDIR}/config/${GCC_CPU} TGTOBJS= crtfastmath.o SRCS+= crtfastmath.c .endif @@ -28,7 +33,26 @@ crtbegin.o crtbegin.So crtend.o crtend.So: ${SRCS} +.if ${TARGET_ARCH} == "ia64" +depend: + crtbegin.o: + ${CC} -x assembler-with-cpp \ + -c -o ${.TARGET} ${.ALLSRC:M*crtbegin*} + +crtbegin.So: + ${CC} -x assembler-with-cpp -DSHARED \ + -c -o ${.TARGET} ${.ALLSRC:M*crtbegin*} + +crtend.o: + ${CC} -x assembler-with-cpp \ + -c -o ${.TARGET} ${.ALLSRC:M*crtend*} + +crtend.So: + ${CC} -x assembler-with-cpp -DSHARED \ + -c -o ${.TARGET} ${.ALLSRC:M*crtend*} +.else +crtbegin.o: ${CC} ${CFLAGS} -g0 -DCRT_BEGIN \ -c -o ${.TARGET} ${.ALLSRC:M*crtstuff*} @@ -43,6 +67,7 @@ crtend.So: ${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \ -c -o ${.TARGET} ${.ALLSRC:M*crtstuff*} +.endif CLEANFILES= tconfig.h tconfig.h: ${CCDIR}/cc_tools/Makefile To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 8:17:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11AC237B406; Fri, 10 May 2002 08:17:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 65E0B37B403 for ; Fri, 10 May 2002 08:17:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AFHXB06776 for perforce@freebsd.org; Fri, 10 May 2002 08:17:33 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 08:17:33 -0700 (PDT) Message-Id: <200205101517.g4AFHXB06776@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11119 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11119 Change 11119 by peter@peter_ia64 on 2002/05/10 08:16:32 Set gas/gld mode. Otherwise gcc generates a dumbed-down syntax for the Intel assembler, and happens to do silly things like declare externs for builtin functions referenced in headers. (__builtin_expect, __builtin_stdarg_start, __swbuf, etc) Affected files ... ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#8 edit Differences ... ==== //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#8 (text+ko) ==== @@ -142,6 +142,7 @@ echo 'union tree_node;' >> ${.TARGET} echo 'typedef union tree_node *tree;' >> ${.TARGET} echo '' >> ${.TARGET} + echo '#define TARGET_CPU_DEFAULT (MASK_GNU_AS|MASK_GNU_LD)' >> ${.TARGET} echo '#include "ansidecl.h"' >> ${.TARGET} echo '#include "${GCC_CPU}/${GCC_CPU}.h"' >> ${.TARGET} .if ${TARGET_ARCH} == "i386" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 8:32:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56B5437B405; Fri, 10 May 2002 08:30:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E790E37B403 for ; Fri, 10 May 2002 08:30:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AFUn510685 for perforce@freebsd.org; Fri, 10 May 2002 08:30:49 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Fri, 10 May 2002 08:30:49 -0700 (PDT) Message-Id: <200205101530.g4AFUn510685@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11120 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11120 Change 11120 by mini@mini_stylus on 2002/05/10 08:30:36 Give UMA control over thread allocation and caching: - Use uma init/fini/ctor/dtor functions. - Instead of keeping a PCPU list of zombie threads to be reaped at earliest convenvience, keep a single "spare" thread in the KSE. - When abandoning a thread (in thread_exit()), push the thread into its KSE's spare thread slot, and free the thread that is already there (if any). - When performing an upcall, pull the spare thread (if available) before allocating a new thread from uma. This is especially useful in msleep(), where not blocking again is highly preferable. - When pulling the KSE spare thread, allocate a new spare thread for the KSE before returning to userland for the upcall. Affected files ... ... //depot/projects/kse/sys/kern/kern_exit.c#46 edit ... //depot/projects/kse/sys/kern/kern_synch.c#59 edit ... //depot/projects/kse/sys/kern/kern_thread.c#45 edit ... //depot/projects/kse/sys/kern/subr_pcpu.c#7 edit ... //depot/projects/kse/sys/kern/subr_trap.c#53 edit ... //depot/projects/kse/sys/sys/pcpu.h#11 edit ... //depot/projects/kse/sys/sys/proc.h#98 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_exit.c#46 (text+ko) ==== @@ -600,7 +600,6 @@ mtx_unlock_spin(&sched_lock); } - thread_reap(); /* check for zombie threads */ td->td_retval[0] = p->p_pid; #ifdef COMPAT_43 if (compat) @@ -699,6 +698,10 @@ p->p_procsig = NULL; } + /* Free the KSE spare thread */ + if (p->p_kse.ke_tdspare != NULL) + thread_free(p->p_kse.ke_tdspare); + /* * Give vm and machine-dependent layer a chance * to free anything that cpu_exit couldn't ==== //depot/projects/kse/sys/kern/kern_synch.c#59 (text+ko) ==== @@ -461,9 +461,11 @@ */ if (TAILQ_FIRST(&td->td_ksegrp->kg_runq) == NULL) { /* don't recurse here! */ + mtx_lock_spin(&sched_lock); td->td_flags |= TDF_INMSLEEP; thread_schedule_upcall(td, td->td_kse); td->td_flags &= ~TDF_INMSLEEP; + mtx_unlock_spin(&sched_lock); } } } ==== //depot/projects/kse/sys/kern/kern_thread.c#45 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -56,22 +57,12 @@ * Thread related storage */ static uma_zone_t thread_zone; - -/* The cache of available threads */ -static tdlist_head_t free_threads; - static int allocated_threads; static int active_threads; static int cached_threads; -#define DEFAULT_THREAD_CACHE_SIZE 64; -static int thread_cache_size = DEFAULT_THREAD_CACHE_SIZE; - SYSCTL_NODE(_kern, OID_AUTO, threads, CTLFLAG_RW, 0, "thread allocation"); -SYSCTL_INT(_kern_threads, OID_AUTO, cachesize, CTLFLAG_RW, - &thread_cache_size, 0, "Size of thread cache."); - SYSCTL_INT(_kern_threads, OID_AUTO, active, CTLFLAG_RD, &active_threads, 0, "Number of active threads in system."); @@ -79,88 +70,182 @@ &cached_threads, 0, "Number of threads in thread cache."); SYSCTL_INT(_kern_threads, OID_AUTO, allocated, CTLFLAG_RD, - &allocated_threads, 0, "Number of threads in allocated from zone."); + &allocated_threads, 0, "Number of threads in zone."); +#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) /* - * Initialize global thread allocation resources + * Pepare a thread for use. */ -void -threadinit(void) +static void +thread_ctor(void *mem, int size, void *arg) { + struct thread *td; + + KASSERT((size == sizeof(struct thread)), + ("size mismatch: %d != %d\n", size, sizeof(struct thread))); - thread_zone = uma_zcreate("THREAD", sizeof (struct thread), NULL, - NULL, NULL, NULL, UMA_ALIGN_CACHE, 0); - TAILQ_INIT(&free_threads); + td = (struct thread *)mem; + bzero(&td->td_startzero, + (unsigned)RANGEOF(struct thread, td_startzero, td_endzero)); + td->td_state = TDS_NEW; + td->td_flags |= TDF_UNBOUND; + cached_threads--; /* XXXSMP */ + active_threads++; /* XXXSMP */ } -/* - * Called from thread-reap() to dissociate the zombie threads. - * We cache it if we need to or if we have enough of them, - * we can pull it apart and free it. +/* + * Reclaim a thread after use. */ -void -thread_free(struct thread *td) +static void +thread_dtor(void *mem, int size, void *arg) { + struct thread *td; + + KASSERT((size == sizeof(struct thread)), + ("size mismatch: %d != %d\n", size, sizeof(struct thread))); + + td = (struct thread *)mem; -#ifdef INVARIANTS - if (td == NULL) - return; +#ifdef INVARIANTS + /* Verify that this thread is in a safe state to free. */ + switch (td->td_state) { + case TDS_SLP: + case TDS_MTX: + case TDS_RUNQ: + /* + * We must never unlink a thread that is in one of + * these states, because it is currently active. + */ + panic("bad state for thread unlinking"); + break; + case TDS_UNQUEUED: + case TDS_NEW: + case TDS_RUNNING: + case TDS_SURPLUS: + break; + default: + panic("bad thread state"); + } #endif - active_threads--; - if (cached_threads < thread_cache_size) { - TAILQ_INSERT_HEAD(&free_threads, td, td_plist); - cached_threads++; /* XXXSMP */ - } else { - /* free tha pages from the stack object etc. */ - allocated_threads--; - pmap_dispose_thread(td); + mtx_lock_spin(&sched_lock); + + mtx_unlock_spin(&sched_lock); + + /* Update counters. */ + active_threads--; /* XXXSMP */ + cached_threads++; /* XXXSMP */ +} + +/* + * Initialize type-stable parts of a thread (when newly created). + */ +static void +thread_init(void *mem, int size) +{ + struct thread *td; + + KASSERT((size == sizeof(struct thread)), + ("size mismatch: %d != %d\n", size, sizeof(struct thread))); + + td = (struct thread *)mem; + pmap_new_thread(td); + cpu_thread_setup(td); + cached_threads++; /* XXXSMP */ + allocated_threads++; /* XXXSMP */ +} + +/* + * Tear down type-stable parts of a thread (just before being discarded). + */ +static void +thread_fini(void *mem, int size) +{ + struct thread *td; + + KASSERT((size == sizeof(struct thread)), + ("size mismatch: %d != %d\n", size, sizeof(struct thread))); + + td = (struct thread *)mem; + pmap_dispose_thread(td); + vm_object_deallocate(td->td_kstack_obj); + cached_threads--; /* XXXSMP */ + allocated_threads--; /* XXXSMP */ +} + +/* + * Unlink thread from its process, and reassign its KSE to another thread. + */ +static void +thread_unlink(struct thread *td) +{ + struct proc *p; + struct ksegrp *kg; + struct kse *ke; + + p = td->td_proc; + kg = td->td_ksegrp; + ke = td->td_kse; -#if 0 - /* Free the object itslef */ - /* As zones are type stable this can be skipped for now */ - vm_object_deallocate(td->td_kstack_obj); - td->td_kstack_obj = NULL; -#endif + /* Reassign this thread's KSE. */ + if (ke != NULL) { + ke->ke_thread = NULL; + td->td_kse = NULL; + ke->ke_state = KES_UNQUEUED; + kse_reassign(ke); + } - /* put the thread back in the zone */ - uma_zfree(thread_zone, td); + /* Unlink this thread from its proc. */ + if (p != NULL) { + TAILQ_REMOVE(&p->p_threads, td, td_plist); + if (kg != NULL) + TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); + p->p_numthreads--; + if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { + if (p->p_numthreads == + ((p->p_flag & P_SINGLE_EXIT) ? 1 : (p->p_suspcount + 1))) { + setrunqueue(p->p_singlethread); + p->p_singlethread = NULL; + } + } } + if (kg != NULL) + kg->kg_numthreads--; + td->td_state = TDS_SURPLUS; + td->td_proc = NULL; + td->td_ksegrp = NULL; + td->td_last_kse = NULL; +} + +/* + * Initialize global thread allocation resources. + */ +void +threadinit(void) +{ + + thread_zone = uma_zcreate("THREAD", sizeof (struct thread), + thread_ctor, thread_dtor, thread_init, thread_fini, + UMA_ALIGN_CACHE, 0); } -#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) -/* - * Try get a new thread from the cache, but if that fails, - * create one from the zone as per normal +/* + * Allocate a thread. */ struct thread * thread_alloc(void) { - struct thread *td; + return (uma_zalloc(thread_zone, M_WAITOK)); +} - thread_reap(); /* recover any partly deallocated threads */ - if (cached_threads) { - td = TAILQ_FIRST(&free_threads); - TAILQ_REMOVE(&free_threads, td, td_plist); - cached_threads--; /* XXXSMP */ - /* Probably should clean up stuff here */ - } else { - /* allocate the thread structure itself */ - td = uma_zalloc(thread_zone, M_WAITOK); - - allocated_threads++; - pmap_new_thread(td); - cpu_thread_setup(td); - } - /* may need to set some stuff here.. re state? */ - /* Make sure the zero'd section is in fact zero'd */ - bzero(&td->td_startzero, - (unsigned) RANGEOF(struct thread, td_startzero, td_endzero)); - td->td_state = TDS_NEW; - td->td_flags |= TDF_UNBOUND; - active_threads++; - return (td); +/* + * Deallocate a thread. + */ +void +thread_free(struct thread *td) +{ + uma_zfree(thread_zone, td); } int @@ -190,22 +275,36 @@ } -/* - * Put the half dead thread on a per CPU list of threads that need - * to be reaped. +/* + * Discard the current thread and exit from its context. + * + * Because we can't free a thread while we're operating under its context, + * push the current thread into our KSE's ke_tdspare slot, freeing the + * thread that might be there currently. Because we know that only this + * processor will run our KSE, we needn't worry about someone else grabbing + * our context before we do a cpu_throw. */ void thread_exit(void) { - struct thread *td = curthread; + struct thread *td; + struct kse *ke; + td = curthread; + ke = td->td_kse; CTR1(KTR_PROC, "thread_exit: thread %p", td); KASSERT(!mtx_owned(&Giant), ("dying thread owns giant")); - cpu_thread_exit(td); - td->td_state = TDS_SURPLUS; - td->td_nextzombie = PCPU_GET(freethread); - PCPU_SET(freethread, td); - thread_unlink(td); /* reassignes kse detach it from it's process etc. */ + + if (ke->ke_tdspare != NULL) { + mtx_unlock_spin(&sched_lock); + mtx_lock(&Giant); + thread_free(ke->ke_tdspare); + mtx_unlock(&Giant); + mtx_lock_spin(&sched_lock); + } + cpu_thread_exit(td); /* XXXSMP */ + thread_unlink(td); + ke->ke_tdspare = td; cpu_throw(); } @@ -232,71 +331,6 @@ td->td_kse = NULL; } - -void -thread_unlink(struct thread *td) -{ - struct proc *p = td->td_proc; - struct ksegrp *kg = td->td_ksegrp; - struct kse *ke = td->td_kse; /* may be NULL */ - - if (ke) { - ke->ke_thread = NULL; - td->td_kse = NULL; - ke->ke_state = KES_UNQUEUED; - kse_reassign(ke); - } - - switch(td->td_state) { - case TDS_SLP: /* we must never get to unlink a thread */ - case TDS_MTX: /* that is in one of these states as to */ - case TDS_RUNQ: /* do so might leak all sorts of stuff */ - panic ("bad state for thread unlinking"); - break; - case TDS_UNQUEUED: - case TDS_NEW: - break; - case TDS_RUNNING: - break; - case TDS_SURPLUS: - break; - default: - panic("bad thread state"); - } - TAILQ_REMOVE(&p->p_threads, td, td_plist); - TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); - p->p_numthreads--; - if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { - if (p->p_numthreads == - ((p->p_flag & P_SINGLE_EXIT) ? 1 : (p->p_suspcount + 1))){ - setrunqueue(p->p_singlethread); - p->p_singlethread = NULL; - } - } - kg->kg_numthreads--; - td->td_state = TDS_SURPLUS; - td->td_proc = NULL; - td->td_ksegrp = NULL; - td->td_last_kse = NULL; -} -/* - * reap any zombie threads for this Processor. - */ -void -thread_reap(void) -{ - struct thread *td_reaped, *td_next; - - if ((td_reaped = PCPU_GET(freethread))) { - PCPU_SET(freethread, NULL); - while (td_reaped) { - td_next = td_reaped->td_nextzombie; - thread_free(td_reaped); - td_reaped = td_next; - } - } -} - /* * set up the upcall pcb in either a given thread or a new one * if none given. Use the upcall for the given KSE @@ -307,18 +341,24 @@ { struct thread *td2; - td2 = thread_alloc(); - if (td2) { - CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", - td, td->td_proc->p_pid, td->td_proc->p_comm); - thread_link(td2, ke->ke_ksegrp); - cpu_set_upcall(td2, ke->ke_pcb); - td2->td_ucred = crhold(td->td_ucred); - td2->td_kse = NULL; /* back as it was */ - td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; - td2->td_priority = td->td_priority; - setrunqueue(td2); + mtx_assert(&sched_lock, MA_OWNED); + if (ke->ke_tdspare != NULL) { + td2 = ke->ke_tdspare; + ke->ke_tdspare = NULL; + } else { + mtx_unlock_spin(&sched_lock); + td2 = thread_alloc(); + mtx_lock_spin(&sched_lock); } + CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", + td, td->td_proc->p_pid, td->td_proc->p_comm); + thread_link(td2, ke->ke_ksegrp); + cpu_set_upcall(td2, ke->ke_pcb); + td2->td_ucred = crhold(td->td_ucred); + td2->td_kse = NULL; /* back as it was */ + td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; + td2->td_priority = td->td_priority; + setrunqueue(td2); return (td2); } ==== //depot/projects/kse/sys/kern/subr_pcpu.c#7 (text+ko) ==== @@ -119,12 +119,6 @@ td->td_proc->p_comm); else db_printf("none\n"); - db_printf("freethread = "); - td = pc->pc_freethread; - if (td != NULL) - db_printf("%p: next: %p\n", td, td->td_nextzombie); - else - db_printf("none\n"); db_printf("curpcb = %p\n", pc->pc_curpcb); db_printf("fpcurthread = "); td = pc->pc_fpcurthread; ==== //depot/projects/kse/sys/kern/subr_trap.c#53 (text+ko) ==== @@ -116,9 +116,16 @@ * We also need to check to see if we have to exit or wait * due to a single threading requirement. */ - PROC_LOCK(p); - thread_suspend_check(0); /* Can suspend or kill */ - PROC_UNLOCK(p); + if (p->p_flag & P_KSES) { + PROC_LOCK(p); + thread_suspend_check(0); /* Can suspend or kill */ + PROC_UNLOCK(p); + if (ke->ke_tdspare == NULL) { + mtx_lock(&Giant); + ke->ke_tdspare = thread_alloc(); + mtx_unlock(&Giant); + } + } if (td->td_flags & TDF_UNBOUND) { /* maybe this should be in a separate function */ /* ==== //depot/projects/kse/sys/sys/pcpu.h#11 (text+ko) ==== @@ -53,7 +53,6 @@ struct thread *pc_curthread; /* Current thread */ struct thread *pc_idlethread; /* Idle thread */ struct thread *pc_fpcurthread; /* Fp state owner */ - struct thread *pc_freethread; /* thread we are freeing */ struct pcb *pc_curpcb; /* Current pcb */ struct bintime pc_switchtime; int pc_switchticks; ==== //depot/projects/kse/sys/sys/proc.h#98 (text+ko) ==== @@ -270,7 +270,6 @@ int td_flags; /* (j) TDF_* flags. */ struct kse *td_last_kse; /* Where it wants to be if possible. */ struct kse *td_kse; /* Current KSE if running. */ - struct thread *td_nextzombie; /* PCPU chain of zombie threads */ int td_dupfd; /* (k) Ret value from fdopen. XXX */ void *td_wchan; /* (j) Sleep address. */ const char *td_wmesg; /* (j) Reason for sleep. */ @@ -360,6 +359,7 @@ KES_RUNNING } ke_state; /* (j) S* process status. */ void *ke_mailbox; /* the userland mailbox address */ + struct thread *ke_tdspare; /* spare thread for upcalls */ #define ke_endzero ke_dummy #define ke_startcopy ke_endzero @@ -797,8 +797,8 @@ int cpu_coredump(struct thread *, struct vnode *, struct ucred *); /* new in KSE */ -struct thread *thread_alloc(void); -void thread_free(struct thread *td); +struct thread *thread_alloc(void); +void thread_free(struct thread *td); int cpu_export_context(struct thread *td); void cpu_free_kse_mdstorage(struct kse *kse); void cpu_save_upcall(struct thread *td, struct kse *newkse); @@ -814,14 +814,12 @@ void thread_exit(void) __dead2; int thread_export_context(struct thread *td); void thread_link(struct thread *td, struct ksegrp *kg); -void thread_reap(void); struct thread *thread_schedule_upcall(struct thread *td, struct kse *ke); int thread_single(int how); #define SNGLE_WAIT 0 /* values for 'how' */ #define SNGLE_EXIT 1 void thread_single_end(void); int thread_suspend_check(int how); -void thread_unlink(struct thread *td); void thread_unsuspend(struct proc *p); #endif /* _KERNEL */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 8:52:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01AFA37B40C; Fri, 10 May 2002 08:52:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fw.wemm.org (12-232-135-171.client.attbi.com [12.232.135.171]) by hub.freebsd.org (Postfix) with ESMTP id CAAD137B401 for ; Fri, 10 May 2002 08:52:11 -0700 (PDT) Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by fw.wemm.org (8.11.6/8.11.6) with ESMTP id g4AFqB442455 for ; Fri, 10 May 2002 08:52:11 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 16BEC3808; Fri, 10 May 2002 08:52:11 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: "Doug Rabson" , "Perforce Change Reviews" Subject: Re: PERFORCE change 11101 for review In-Reply-To: <20020510141222.232673808@overcee.wemm.org> Date: Fri, 10 May 2002 08:52:11 -0700 From: Peter Wemm Message-Id: <20020510155211.16BEC3808@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Peter Wemm wrote: > "Doug Rabson" wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11101 > > > > > > Change 11101 by peter@peter_daintree on 2002/05/10 04:39:45 > > > > > > IFC @11100 - gcc-3.1 - yeah! > > > > Woohoo! > > There's still some very strange stuff going on. I haven't ruled out some > systematic contamination from a previous bad compile on my box, but > something looks like it is not right yet. If you see function calls to > __builtin_expect or __builtin_stdarg_start, you're seeing what I have run > into. I think I've got it now. It was running in Intel ASM mode (vs. GAS mode) and doing some special (broken) things. Among other things, it was emitting extern references for __builtin functions.. I guess time (hour or two) will tell if that's all (make world is running). Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 9:18:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8485037B401; Fri, 10 May 2002 09:18:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from smtp.enternet.hu (smtp.enternet.hu [62.112.192.21]) by hub.freebsd.org (Postfix) with ESMTP id 8D4CF37B403; Fri, 10 May 2002 09:18:30 -0700 (PDT) Received: from elischer.org (3e70d2af.dialin.enternet.hu [62.112.210.175]) by smtp.enternet.hu (8.11.6/8.11.6) with ESMTP id g4AGGXr51050; Fri, 10 May 2002 18:16:33 +0200 (CEST) (envelope-from julian@elischer.org) Message-ID: <3CDBF27F.76C5AE0E@elischer.org> Date: Fri, 10 May 2002 09:17:03 -0700 From: Julian Elischer X-Mailer: Mozilla 4.7 [en] (X11; U; FreeBSD 5.0-CURRENT i386) X-Accept-Language: en, hu MIME-Version: 1.0 To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11012 for review References: <200205081533.g48FX3q20811@freefall.freebsd.org> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jonathan Mini wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11012 > > Change 11012 by mini@mini_stylus on 2002/05/08 08:32:05 > > - pass thread's instead of proc's to CURSIG() and issignal() > - mark a thread TDS_UNQUEUED when blocking it while its parent > handles its signal (via ptrace(2)). > > This make gdb work properly again, and fixed ptrace(2) on normal > processes. This will probably mean that what we have is capable of almost being committed. You and jhb said that the thread allocator could be rewritten using the new uma mechanisms. if that is done, then we could check in what we have minus some changes that are dependent on comments from others.. (I think DES would like to have a go at the ptrace changes) Is the system stable with only non KSE processes? If we could generate good diffs it would help others to look and comment. julian To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 9:28:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0519537B404; Fri, 10 May 2002 09:27:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from k6.locore.ca (k6.locore.ca [198.96.117.170]) by hub.freebsd.org (Postfix) with ESMTP id E8C7D37B400; Fri, 10 May 2002 09:27:39 -0700 (PDT) Received: (from jake@localhost) by k6.locore.ca (8.11.6/8.11.6) id g4AGbGA15862; Fri, 10 May 2002 12:37:16 -0400 (EDT) (envelope-from jake) Date: Fri, 10 May 2002 12:37:16 -0400 From: Jake Burkholder To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11120 for review Message-ID: <20020510123716.D2566@locore.ca> References: <200205101530.g4AFUn510685@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200205101530.g4AFUn510685@freefall.freebsd.org>; from mini@freebsd.org on Fri, May 10, 2002 at 08:30:49AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Apparently, On Fri, May 10, 2002 at 08:30:49AM -0700, Jonathan Mini said words to the effect of; > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11120 > > Change 11120 by mini@mini_stylus on 2002/05/10 08:30:36 > > Give UMA control over thread allocation and caching: > > - Use uma init/fini/ctor/dtor functions. > - Instead of keeping a PCPU list of zombie threads to be > reaped at earliest convenvience, keep a single "spare" > thread in the KSE. > - When abandoning a thread (in thread_exit()), push the > thread into its KSE's spare thread slot, and free the > thread that is already there (if any). > - When performing an upcall, pull the spare thread (if > available) before allocating a new thread from uma. This > is especially useful in msleep(), where not blocking again > is highly preferable. > - When pulling the KSE spare thread, allocate a new spare > thread for the KSE before returning to userland for the > upcall. I'm not sure that using the uma callouts for all of this is safe. > #endif > > - active_threads--; > - if (cached_threads < thread_cache_size) { > - TAILQ_INSERT_HEAD(&free_threads, td, td_plist); > - cached_threads++; /* XXXSMP */ > - } else { > - /* free tha pages from the stack object etc. */ > - allocated_threads--; > - pmap_dispose_thread(td); > + mtx_lock_spin(&sched_lock); > + > + mtx_unlock_spin(&sched_lock); ??? > + > + /* Update counters. */ > + active_threads--; /* XXXSMP */ > + cached_threads++; /* XXXSMP */ > +} > + > +/* > + * Initialize type-stable parts of a thread (when newly created). > + */ > +static void > +thread_init(void *mem, int size) > +{ > + struct thread *td; > + > + KASSERT((size == sizeof(struct thread)), > + ("size mismatch: %d != %d\n", size, sizeof(struct thread))); > + > + td = (struct thread *)mem; > + pmap_new_thread(td); > + cpu_thread_setup(td); > + cached_threads++; /* XXXSMP */ > + allocated_threads++; /* XXXSMP */ > +} > + > +/* > + * Tear down type-stable parts of a thread (just before being discarded). > + */ > +static void > +thread_fini(void *mem, int size) > +{ > + struct thread *td; > + > + KASSERT((size == sizeof(struct thread)), > + ("size mismatch: %d != %d\n", size, sizeof(struct thread))); > + > + td = (struct thread *)mem; > + pmap_dispose_thread(td); > + vm_object_deallocate(td->td_kstack_obj); > + cached_threads--; /* XXXSMP */ > + allocated_threads--; /* XXXSMP */ > +} These pmap and vm_object calls might sleep, and are called with the uma zone locked. > + > +/* > + * Unlink thread from its process, and reassign its KSE to another thread. > + */ > +static void > +thread_unlink(struct thread *td) > +{ > + struct proc *p; > + struct ksegrp *kg; > + struct kse *ke; > + > + p = td->td_proc; > + kg = td->td_ksegrp; > + ke = td->td_kse; > > -#if 0 > - /* Free the object itslef */ > - /* As zones are type stable this can be skipped for now */ > - vm_object_deallocate(td->td_kstack_obj); > - td->td_kstack_obj = NULL; > -#endif > + /* Reassign this thread's KSE. */ > + if (ke != NULL) { > + ke->ke_thread = NULL; > + td->td_kse = NULL; > + ke->ke_state = KES_UNQUEUED; > + kse_reassign(ke); > + } Almost all of the new code you added looks like its indented 4 spaces, which should be tabs :) > > - /* put the thread back in the zone */ > - uma_zfree(thread_zone, td); > + /* Unlink this thread from its proc. */ > + if (p != NULL) { > + TAILQ_REMOVE(&p->p_threads, td, td_plist); > + if (kg != NULL) > + TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); > + p->p_numthreads--; > + if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { > + if (p->p_numthreads == > + ((p->p_flag & P_SINGLE_EXIT) ? 1 : (p->p_suspcount + 1))) { > + setrunqueue(p->p_singlethread); > + p->p_singlethread = NULL; > + } > + } > } > + if (kg != NULL) > + kg->kg_numthreads--; > + td->td_state = TDS_SURPLUS; > + td->td_proc = NULL; > + td->td_ksegrp = NULL; > + td->td_last_kse = NULL; > +} > + > +/* > + * Initialize global thread allocation resources. > + */ > +void > +threadinit(void) > +{ > + > + thread_zone = uma_zcreate("THREAD", sizeof (struct thread), > + thread_ctor, thread_dtor, thread_init, thread_fini, > + UMA_ALIGN_CACHE, 0); > } > > -#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) > -/* > - * Try get a new thread from the cache, but if that fails, > - * create one from the zone as per normal > +/* > + * Allocate a thread. > */ > struct thread * > thread_alloc(void) > { > - struct thread *td; > + return (uma_zalloc(thread_zone, M_WAITOK)); > +} > > - thread_reap(); /* recover any partly deallocated threads */ > - if (cached_threads) { > - td = TAILQ_FIRST(&free_threads); > - TAILQ_REMOVE(&free_threads, td, td_plist); > - cached_threads--; /* XXXSMP */ > - /* Probably should clean up stuff here */ > - } else { > - /* allocate the thread structure itself */ > - td = uma_zalloc(thread_zone, M_WAITOK); > - > - allocated_threads++; > - pmap_new_thread(td); > - cpu_thread_setup(td); > - } > - /* may need to set some stuff here.. re state? */ > - /* Make sure the zero'd section is in fact zero'd */ > - bzero(&td->td_startzero, > - (unsigned) RANGEOF(struct thread, td_startzero, td_endzero)); > - td->td_state = TDS_NEW; > - td->td_flags |= TDF_UNBOUND; > - active_threads++; > - return (td); > +/* > + * Deallocate a thread. > + */ > +void > +thread_free(struct thread *td) > +{ > + uma_zfree(thread_zone, td); > } > > int > @@ -190,22 +275,36 @@ > } > > > -/* > - * Put the half dead thread on a per CPU list of threads that need > - * to be reaped. > +/* > + * Discard the current thread and exit from its context. > + * > + * Because we can't free a thread while we're operating under its context, > + * push the current thread into our KSE's ke_tdspare slot, freeing the > + * thread that might be there currently. Because we know that only this > + * processor will run our KSE, we needn't worry about someone else grabbing > + * our context before we do a cpu_throw. > */ > void > thread_exit(void) > { > - struct thread *td = curthread; > + struct thread *td; > + struct kse *ke; > > + td = curthread; > + ke = td->td_kse; > CTR1(KTR_PROC, "thread_exit: thread %p", td); > KASSERT(!mtx_owned(&Giant), ("dying thread owns giant")); > - cpu_thread_exit(td); > - td->td_state = TDS_SURPLUS; > - td->td_nextzombie = PCPU_GET(freethread); > - PCPU_SET(freethread, td); > - thread_unlink(td); /* reassignes kse detach it from it's process etc. */ > + > + if (ke->ke_tdspare != NULL) { > + mtx_unlock_spin(&sched_lock); > + mtx_lock(&Giant); > + thread_free(ke->ke_tdspare); > + mtx_unlock(&Giant); > + mtx_lock_spin(&sched_lock); > + } > + cpu_thread_exit(td); /* XXXSMP */ > + thread_unlink(td); > + ke->ke_tdspare = td; > cpu_throw(); > } > > @@ -232,71 +331,6 @@ > td->td_kse = NULL; > } > > - > -void > -thread_unlink(struct thread *td) > -{ > - struct proc *p = td->td_proc; > - struct ksegrp *kg = td->td_ksegrp; > - struct kse *ke = td->td_kse; /* may be NULL */ > - > - if (ke) { > - ke->ke_thread = NULL; > - td->td_kse = NULL; > - ke->ke_state = KES_UNQUEUED; > - kse_reassign(ke); > - } > - > - switch(td->td_state) { > - case TDS_SLP: /* we must never get to unlink a thread */ > - case TDS_MTX: /* that is in one of these states as to */ > - case TDS_RUNQ: /* do so might leak all sorts of stuff */ > - panic ("bad state for thread unlinking"); > - break; > - case TDS_UNQUEUED: > - case TDS_NEW: > - break; > - case TDS_RUNNING: > - break; > - case TDS_SURPLUS: > - break; > - default: > - panic("bad thread state"); > - } > - TAILQ_REMOVE(&p->p_threads, td, td_plist); > - TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); > - p->p_numthreads--; > - if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { > - if (p->p_numthreads == > - ((p->p_flag & P_SINGLE_EXIT) ? 1 : (p->p_suspcount + 1))){ > - setrunqueue(p->p_singlethread); > - p->p_singlethread = NULL; > - } > - } > - kg->kg_numthreads--; > - td->td_state = TDS_SURPLUS; > - td->td_proc = NULL; > - td->td_ksegrp = NULL; > - td->td_last_kse = NULL; > -} > -/* > - * reap any zombie threads for this Processor. > - */ > -void > -thread_reap(void) > -{ > - struct thread *td_reaped, *td_next; > - > - if ((td_reaped = PCPU_GET(freethread))) { > - PCPU_SET(freethread, NULL); > - while (td_reaped) { > - td_next = td_reaped->td_nextzombie; > - thread_free(td_reaped); > - td_reaped = td_next; > - } > - } > -} > - > /* > * set up the upcall pcb in either a given thread or a new one > * if none given. Use the upcall for the given KSE > @@ -307,18 +341,24 @@ > { > struct thread *td2; > > - td2 = thread_alloc(); > - if (td2) { > - CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", > - td, td->td_proc->p_pid, td->td_proc->p_comm); > - thread_link(td2, ke->ke_ksegrp); > - cpu_set_upcall(td2, ke->ke_pcb); > - td2->td_ucred = crhold(td->td_ucred); > - td2->td_kse = NULL; /* back as it was */ > - td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; > - td2->td_priority = td->td_priority; > - setrunqueue(td2); > + mtx_assert(&sched_lock, MA_OWNED); > + if (ke->ke_tdspare != NULL) { > + td2 = ke->ke_tdspare; > + ke->ke_tdspare = NULL; > + } else { > + mtx_unlock_spin(&sched_lock); > + td2 = thread_alloc(); > + mtx_lock_spin(&sched_lock); > } > + CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", > + td, td->td_proc->p_pid, td->td_proc->p_comm); > + thread_link(td2, ke->ke_ksegrp); > + cpu_set_upcall(td2, ke->ke_pcb); > + td2->td_ucred = crhold(td->td_ucred); > + td2->td_kse = NULL; /* back as it was */ > + td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; > + td2->td_priority = td->td_priority; > + setrunqueue(td2); > return (td2); > } > > > ==== //depot/projects/kse/sys/kern/subr_pcpu.c#7 (text+ko) ==== > > @@ -119,12 +119,6 @@ > td->td_proc->p_comm); > else > db_printf("none\n"); > - db_printf("freethread = "); > - td = pc->pc_freethread; > - if (td != NULL) > - db_printf("%p: next: %p\n", td, td->td_nextzombie); > - else > - db_printf("none\n"); > db_printf("curpcb = %p\n", pc->pc_curpcb); > db_printf("fpcurthread = "); > td = pc->pc_fpcurthread; > > ==== //depot/projects/kse/sys/kern/subr_trap.c#53 (text+ko) ==== > > @@ -116,9 +116,16 @@ > * We also need to check to see if we have to exit or wait > * due to a single threading requirement. > */ > - PROC_LOCK(p); > - thread_suspend_check(0); /* Can suspend or kill */ > - PROC_UNLOCK(p); > + if (p->p_flag & P_KSES) { > + PROC_LOCK(p); > + thread_suspend_check(0); /* Can suspend or kill */ > + PROC_UNLOCK(p); > + if (ke->ke_tdspare == NULL) { > + mtx_lock(&Giant); > + ke->ke_tdspare = thread_alloc(); > + mtx_unlock(&Giant); > + } > + } > if (td->td_flags & TDF_UNBOUND) { > /* maybe this should be in a separate function */ > /* > > ==== //depot/projects/kse/sys/sys/pcpu.h#11 (text+ko) ==== > > @@ -53,7 +53,6 @@ > struct thread *pc_curthread; /* Current thread */ > struct thread *pc_idlethread; /* Idle thread */ > struct thread *pc_fpcurthread; /* Fp state owner */ > - struct thread *pc_freethread; /* thread we are freeing */ > struct pcb *pc_curpcb; /* Current pcb */ > struct bintime pc_switchtime; > int pc_switchticks; > > ==== //depot/projects/kse/sys/sys/proc.h#98 (text+ko) ==== > > @@ -270,7 +270,6 @@ > int td_flags; /* (j) TDF_* flags. */ > struct kse *td_last_kse; /* Where it wants to be if possible. */ > struct kse *td_kse; /* Current KSE if running. */ > - struct thread *td_nextzombie; /* PCPU chain of zombie threads */ > int td_dupfd; /* (k) Ret value from fdopen. XXX */ > void *td_wchan; /* (j) Sleep address. */ > const char *td_wmesg; /* (j) Reason for sleep. */ > @@ -360,6 +359,7 @@ > KES_RUNNING > } ke_state; /* (j) S* process status. */ > void *ke_mailbox; /* the userland mailbox address */ > + struct thread *ke_tdspare; /* spare thread for upcalls */ > #define ke_endzero ke_dummy > > #define ke_startcopy ke_endzero > @@ -797,8 +797,8 @@ > int cpu_coredump(struct thread *, struct vnode *, struct ucred *); > > /* new in KSE */ > -struct thread *thread_alloc(void); > -void thread_free(struct thread *td); > +struct thread *thread_alloc(void); > +void thread_free(struct thread *td); > int cpu_export_context(struct thread *td); > void cpu_free_kse_mdstorage(struct kse *kse); > void cpu_save_upcall(struct thread *td, struct kse *newkse); > @@ -814,14 +814,12 @@ > void thread_exit(void) __dead2; > int thread_export_context(struct thread *td); > void thread_link(struct thread *td, struct ksegrp *kg); > -void thread_reap(void); > struct thread *thread_schedule_upcall(struct thread *td, struct kse *ke); > int thread_single(int how); > #define SNGLE_WAIT 0 /* values for 'how' */ > #define SNGLE_EXIT 1 > void thread_single_end(void); > int thread_suspend_check(int how); > -void thread_unlink(struct thread *td); > void thread_unsuspend(struct proc *p); > > #endif /* _KERNEL */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 9:41:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3414B37B40D; Fri, 10 May 2002 09:41:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id 2DD9737B408 for ; Fri, 10 May 2002 09:41:22 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 2D4E7A900; Fri, 10 May 2002 09:43:10 -0700 (PDT) Date: Fri, 10 May 2002 09:43:10 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11012 for review Message-ID: <20020510094310.H43682@stylus.haikugeek.com> References: <200205081533.g48FX3q20811@freefall.freebsd.org> <3CDBF27F.76C5AE0E@elischer.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <3CDBF27F.76C5AE0E@elischer.org>; from julian@elischer.org on Fri, May 10, 2002 at 09:17:03AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > Jonathan Mini wrote: > > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11012 > > > > Change 11012 by mini@mini_stylus on 2002/05/08 08:32:05 > > > > - pass thread's instead of proc's to CURSIG() and issignal() > > - mark a thread TDS_UNQUEUED when blocking it while its parent > > handles its signal (via ptrace(2)). > > > > This make gdb work properly again, and fixed ptrace(2) on normal > > processes. > > This will probably mean that what we have is capable of almost being committed. I think we are pretty close. Some locking problems appear when the ksetest program is run a large (100+ or so) times, those should probably be fixed first. > You and jhb said that the thread allocator could be rewritten using the new > uma mechanisms. if that is done, then we could check in what we have > minus some changes that are dependent on comments from others.. That is done, and checked in. There are a few problems with it still. > (I think DES would like to have a go at the ptrace changes) Sure. Also, gdb doesn't work too well on threaded apps, but I think that is expected at this point. > Is the system stable with only non KSE processes? I haven't noticed any problems with non-KSE processes, however I haven't done any real testing. > If we could generate good diffs it would help > others to look and comment. Yeah. Other than the cleanups I've mentioned above (some locking, and the uma stuff needs a second pass), my next goal is to get clean diffs so that we can start the review process. -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 9:42:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C04C837B400; Fri, 10 May 2002 09:40:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8807937B401 for ; Fri, 10 May 2002 09:40:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AGdKS38784 for perforce@freebsd.org; Fri, 10 May 2002 09:39:20 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Fri, 10 May 2002 09:39:20 -0700 (PDT) Message-Id: <200205101639.g4AGdKS38784@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11123 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11123 Change 11123 by jake@jake_sparc64 on 2002/05/10 09:38:50 Integ@11117 Affected files ... ... //depot/projects/sparc64/MAINTAINERS#5 integrate ... //depot/projects/sparc64/Makefile#4 integrate ... //depot/projects/sparc64/Makefile.inc1#13 integrate ... //depot/projects/sparc64/UPDATING#7 integrate ... //depot/projects/sparc64/bin/Makefile.inc#2 integrate ... //depot/projects/sparc64/bin/ps/fmt.c#3 integrate ... //depot/projects/sparc64/bin/ps/ps.1#3 integrate ... //depot/projects/sparc64/bin/rcp/pathnames.h#2 delete ... //depot/projects/sparc64/bin/rcp/rcp.c#2 integrate ... //depot/projects/sparc64/contrib/amd/amq/amq.c#3 integrate ... //depot/projects/sparc64/contrib/amd/hlfsd/hlfsd.h#3 integrate ... //depot/projects/sparc64/contrib/gcc/BUGS#2 delete ... //depot/projects/sparc64/contrib/gcc/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/gcc/ChangeLog.lib#1 branch ... //depot/projects/sparc64/contrib/gcc/FREEBSD-libiberty#2 integrate ... //depot/projects/sparc64/contrib/gcc/FREEBSD-upgrade#2 integrate ... //depot/projects/sparc64/contrib/gcc/FSFChangeLog.10#1 branch ... //depot/projects/sparc64/contrib/gcc/FSFChangeLog.11#1 branch ... //depot/projects/sparc64/contrib/gcc/INSTALL#2 delete ... //depot/projects/sparc64/contrib/gcc/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/gcc/NEWS#2 delete ... //depot/projects/sparc64/contrib/gcc/PROBLEMS#2 delete ... //depot/projects/sparc64/contrib/gcc/PROJECTS#2 delete ... //depot/projects/sparc64/contrib/gcc/README#2 delete ... //depot/projects/sparc64/contrib/gcc/README-bugs#2 delete ... //depot/projects/sparc64/contrib/gcc/README.DWARF#2 delete ... //depot/projects/sparc64/contrib/gcc/README.TRAD#2 delete ... //depot/projects/sparc64/contrib/gcc/TESTS.FLUNK#2 delete ... //depot/projects/sparc64/contrib/gcc/alias.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/ansidecl.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/assert.h#2 delete ... //depot/projects/sparc64/contrib/gcc/attribs.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/basic-block.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/bb-reorder.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/build-make#2 delete ... //depot/projects/sparc64/contrib/gcc/builtins.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-common.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-common.def#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-common.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-decl.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-format.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-iterate.c#2 delete ... //depot/projects/sparc64/contrib/gcc/c-lang.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-lex.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-objc-common.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-parse.gperf#2 delete ... //depot/projects/sparc64/contrib/gcc/c-parse.in#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-pragma.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-pragma.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-semantics.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-tree.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-typeck.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/calls.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cccp.c#2 delete ... //depot/projects/sparc64/contrib/gcc/cexp.y#2 delete ... //depot/projects/sparc64/contrib/gcc/cfg.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cfganal.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cfgcleanup.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cfgrtl.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/choose-temp.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/collect2.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/combine.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/concat.c#1 branch ... //depot/projects/sparc64/contrib/gcc/config.gcc#2 integrate ... //depot/projects/sparc64/contrib/gcc/config.in#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/alpha-protos.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/alpha.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/alpha.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/alpha.md#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/elf.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/freebsd.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/linux.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/netbsd-elf.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/alpha/netbsd.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/osf.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/t-crtbe#2 delete ... //depot/projects/sparc64/contrib/gcc/config/alpha/t-vms#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/vms-tramp.asm#2 delete ... //depot/projects/sparc64/contrib/gcc/config/alpha/vms.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/x-alpha#2 delete ... //depot/projects/sparc64/contrib/gcc/config/alpha/x-vms#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/alpha/xm-alpha.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/alpha/xm-freebsd.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/alpha/xm-openbsd.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/alpha/xm-vms.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/arm/aof.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/arm/aout.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/arm/arm.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/arm/arm.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/arm/arm.md#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/arm/coff.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/arm/elf.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/arm/linux-elf.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/arm/netbsd.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/arm/rtems-elf.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/float-sparc.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/config-nt.sed#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/cygwin.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/dgux.c#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/djgpp-rtems.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/freebsd.h#5 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/gnu.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/i386-interix.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/i386-protos.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/i386.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/i386.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/i386.md#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/libgcc-x86_64-glibc.ver#1 branch ... //depot/projects/sparc64/contrib/gcc/config/i386/linux-aout.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/linux-oldld.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/linux.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/linux64.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/netbsd-elf.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/netbsd.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/os2.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/perform.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/rtems.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/rtemself.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/sco.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/sco4.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/sco4dbx.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/sco5.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/sco5gas.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/scodbx.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/sol2.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/t-i386bare#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/t-interix#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/t-linux64#1 branch ... //depot/projects/sparc64/contrib/gcc/config/i386/t-rtems-i386#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/t-vsta#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/t-winnt#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/win-nt.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-aix#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-cygwin#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-dgux#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-djgpp#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-isc#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-isc3#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-ncr3000#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-next#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-osf1elf#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-osfrose#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-sco#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-sco4#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-sco5#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-sysv3#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x-vsta#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/x86-64.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-aix.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-bsd386.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-dgux.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-dos.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-freebsd.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-gnu.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-i386.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-isc.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-linux.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-lynx.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-next.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-openbsd.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-os2.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-osf.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-osf1elf.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-sco.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-sco5.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-sun.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-sysv3.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-sysv4.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-uwin.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/i386/xm-winnt.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/ia64/aix.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/ia64/elf.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/ia64/freebsd.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/ia64/hpux.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/ia64/ia64-protos.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/ia64/ia64.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/ia64/ia64.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/ia64/ia64.md#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/ia64/linux.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/ia64/sysv4.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/ia64/unwind-ia64.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/libgcc-glibc.ver#1 branch ... //depot/projects/sparc64/contrib/gcc/config/netbsd.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/aix.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/aix43.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/aix51.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/altivec.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/crtsavres.asm#1 branch ... //depot/projects/sparc64/contrib/gcc/config/rs6000/darwin.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/eabi.asm#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/gnu.h#1 branch ... //depot/projects/sparc64/contrib/gcc/config/rs6000/linux64.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/netbsd.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/ppc-asm.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/rs6000.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/rs6000.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/rs6000.md#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/rtems.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/sysv4.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/t-aix43#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/t-linux64#1 branch ... //depot/projects/sparc64/contrib/gcc/config/rs6000/t-ppccomm#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rs6000/xcoff.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/rtems.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/aout.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/crtfastmath.c#1 branch ... //depot/projects/sparc64/contrib/gcc/config/sparc/elf.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/freebsd.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/gmon-sol2.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/libgcc-sparc-glibc.ver#1 branch ... //depot/projects/sparc64/contrib/gcc/config/sparc/linux-aout.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/linux.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/linux64.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/lite.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/litecoff.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/liteelf.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/netbsd-elf.h#1 branch ... //depot/projects/sparc64/contrib/gcc/config/sparc/netbsd.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/pbd.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/rtems.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/rtemself.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/sol2-64.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/sol2-bi.h#1 branch ... //depot/projects/sparc64/contrib/gcc/config/sparc/sol2-gas-bi.h#1 branch ... //depot/projects/sparc64/contrib/gcc/config/sparc/sol2-gld-bi.h#1 branch ... //depot/projects/sparc64/contrib/gcc/config/sparc/sol2-gld.h#1 branch ... //depot/projects/sparc64/contrib/gcc/config/sparc/sol2-sld-64.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/sparc/sol2-sld.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/sparc/sol2.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/sol27-sld.h#1 branch ... //depot/projects/sparc64/contrib/gcc/config/sparc/sp64-aout.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/sp64-elf.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/sp86x-aout.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/sp86x-elf.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/sparc-protos.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/sparc.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/sparc.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/sparc.md#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/splet.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/t-crtfm#1 branch ... //depot/projects/sparc64/contrib/gcc/config/sparc/t-elf#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/t-linux64#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/t-netbsd64#1 branch ... //depot/projects/sparc64/contrib/gcc/config/sparc/t-sol2-64#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/t-sp64#2 delete ... //depot/projects/sparc64/contrib/gcc/config/sparc/t-sunos40#2 delete ... //depot/projects/sparc64/contrib/gcc/config/sparc/vxsim.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/vxsparc64.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/sparc/x-sysv4#2 delete ... //depot/projects/sparc64/contrib/gcc/config/sparc/xm-linux.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/sparc/xm-lynx.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/sparc/xm-openbsd.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/sparc/xm-pbd.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/sparc/xm-sol2.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/sparc/xm-sp64.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/sparc/xm-sparc.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/sparc/xm-sysv4-64.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/sparc/xm-sysv4.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/t-slibgcc-elf-ver#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/t-slibgcc-nolc-override#1 branch ... //depot/projects/sparc64/contrib/gcc/config/t-slibgcc-sld#2 integrate ... //depot/projects/sparc64/contrib/gcc/config/x-linux#2 delete ... //depot/projects/sparc64/contrib/gcc/config/x-linux-aout#2 delete ... //depot/projects/sparc64/contrib/gcc/config/x-lynx#2 delete ... //depot/projects/sparc64/contrib/gcc/config/x-svr4#2 delete ... //depot/projects/sparc64/contrib/gcc/config/xm-alloca.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/xm-freebsd.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/xm-gnu.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/xm-interix.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/xm-linux.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/xm-lynx.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/xm-openbsd.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/xm-siglist.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/xm-std32.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/xm-svr3.h#2 delete ... //depot/projects/sparc64/contrib/gcc/config/xm-svr4.h#2 delete ... //depot/projects/sparc64/contrib/gcc/configure#2 integrate ... //depot/projects/sparc64/contrib/gcc/configure.in#2 integrate ... //depot/projects/sparc64/contrib/gcc/configure.lang#2 delete ... //depot/projects/sparc64/contrib/gcc/cp-demangle.c#1 branch ... //depot/projects/sparc64/contrib/gcc/cp/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/Make-lang.in#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/Makefile.in#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/NEWS#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/call.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/cfns.h#1 branch ... //depot/projects/sparc64/contrib/gcc/cp/class.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/cp-tree.def#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/cp-tree.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/cvt.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/decl.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/decl2.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/dump.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/errfn.c#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/error.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/exception.cc#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/friend.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/g++spec.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/gxx.gperf#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/gxxint.texi#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/inc/exception#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/inc/new#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/inc/new.h#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/inc/typeinfo#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/init.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/input.c#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/lang-specs.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/lex.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/mangle.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/method.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/new.cc#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/new1.cc#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/new2.cc#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/parse.y#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/pt.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/search.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/semantics.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/sig.c#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/spew.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/tinfo.cc#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/tinfo.h#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/tinfo2.cc#2 delete ... //depot/projects/sparc64/contrib/gcc/cp/tree.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/typeck.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/typeck2.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cp/xref.c#2 delete ... //depot/projects/sparc64/contrib/gcc/cplus-dem.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cpp.texi#2 delete ... //depot/projects/sparc64/contrib/gcc/cppalloc.c#2 delete ... //depot/projects/sparc64/contrib/gcc/cppexp.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cpphash.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cpphash.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/cppinit.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cpplex.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cpplib.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cpplib.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/cppmacro.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cppmain.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cppulp.c#2 delete ... //depot/projects/sparc64/contrib/gcc/cross-make#2 delete ... //depot/projects/sparc64/contrib/gcc/crtstuff.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cse.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/cselib.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/dbxout.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/defaults.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/demangle.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/df.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/c-tree.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/contrib.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/contribute.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/cpp.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/cppenv.texi#1 branch ... //depot/projects/sparc64/contrib/gcc/doc/cppopts.texi#1 branch ... //depot/projects/sparc64/contrib/gcc/doc/extend.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/frontends.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/gcc.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/include/texinfo.tex#1 branch ... //depot/projects/sparc64/contrib/gcc/doc/install.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/invoke.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/md.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/passes.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/rtl.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/sourcebuild.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/standards.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doc/tm.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/doprint.c#2 delete ... //depot/projects/sparc64/contrib/gcc/dostage2#2 delete ... //depot/projects/sparc64/contrib/gcc/dostage3#2 delete ... //depot/projects/sparc64/contrib/gcc/dwarf2.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/dwarf2out.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/dwarfout.h#2 delete ... //depot/projects/sparc64/contrib/gcc/dyn-string.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/dyn-string.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/eh-common.h#2 delete ... //depot/projects/sparc64/contrib/gcc/emit-rtl.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/except.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/except.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/exgettext#2 delete ... //depot/projects/sparc64/contrib/gcc/explow.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/expmed.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/expr.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/expr.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/extend.texi#2 delete ... //depot/projects/sparc64/contrib/gcc/f/BUGS#2 delete ... //depot/projects/sparc64/contrib/gcc/f/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/INSTALL#2 delete ... //depot/projects/sparc64/contrib/gcc/f/Make-lang.in#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/Makefile.in#2 delete ... //depot/projects/sparc64/contrib/gcc/f/NEWS#2 delete ... //depot/projects/sparc64/contrib/gcc/f/assert.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/bad.def#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/bugs.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/com.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/config.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/convert.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/data.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/expr.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/ffe.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/flags.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/g77.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/g77install.texi#2 delete ... //depot/projects/sparc64/contrib/gcc/f/glimits.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/hconfig.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/implic.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/input.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/intdoc.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/intdoc.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/intrin.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/intrin.def#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/invoke.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/lex.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/news.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/output.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/proj.c#2 delete ... //depot/projects/sparc64/contrib/gcc/f/proj.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/root.texi#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/rtl.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/stb.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/ste.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/stu.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/system.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/target.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/target.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/f/tconfig.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/tm.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/toplev.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/tree.j#2 delete ... //depot/projects/sparc64/contrib/gcc/f/version.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/fibheap.c#1 branch ... //depot/projects/sparc64/contrib/gcc/fibheap.h#1 branch ... //depot/projects/sparc64/contrib/gcc/final.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/fixcpp#2 delete ... //depot/projects/sparc64/contrib/gcc/fixinc-nt.sed#2 delete ... //depot/projects/sparc64/contrib/gcc/fixincludes#2 delete ... //depot/projects/sparc64/contrib/gcc/flags.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/flow.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/fold-const.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/frame.c#2 delete ... //depot/projects/sparc64/contrib/gcc/frame.h#2 delete ... //depot/projects/sparc64/contrib/gcc/function.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/function.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/gansidecl.h#2 delete ... //depot/projects/sparc64/contrib/gcc/gcc.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/gcc.texi#2 delete ... //depot/projects/sparc64/contrib/gcc/gccbug.in#1 branch ... //depot/projects/sparc64/contrib/gcc/gcov.texi#2 delete ... //depot/projects/sparc64/contrib/gcc/gcse.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/genattrtab.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/genemit.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/genextract.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/genflags.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/genoutput.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/genrecog.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/getopt.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/getopt.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/getopt1.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/getpwd.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/ggc-common.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/ginclude/math-3300.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/math-68881.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/ppc-asm.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/proto.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-alpha.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-arc.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-c4x.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-clipper.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-h8300.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-i860.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-i960.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-m32r.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-m88k.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-mips.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-mn10200.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-mn10300.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-pa.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-ppc.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-pyr.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-sh.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-sparc.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-spur.h#2 delete ... //depot/projects/sparc64/contrib/gcc/ginclude/va-v850.h#2 delete ... //depot/projects/sparc64/contrib/gcc/gthr-dce.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/gthr-posix.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/gthr-rtems.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/gthr-solaris.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/gthr-win32.h#1 branch ... //depot/projects/sparc64/contrib/gcc/haifa-sched.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/hashtab.c#1 branch ... //depot/projects/sparc64/contrib/gcc/hashtab.h#1 branch ... //depot/projects/sparc64/contrib/gcc/hex.c#1 branch ... //depot/projects/sparc64/contrib/gcc/hooks.c#1 branch ... //depot/projects/sparc64/contrib/gcc/hooks.h#1 branch ... //depot/projects/sparc64/contrib/gcc/hwint.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/ifcvt.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/install.texi#2 delete ... //depot/projects/sparc64/contrib/gcc/integrate.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/invoke.texi#2 delete ... //depot/projects/sparc64/contrib/gcc/jump.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/just-fixinc#2 delete ... //depot/projects/sparc64/contrib/gcc/langhooks-def.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/langhooks.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/langhooks.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/lbasename.c#1 branch ... //depot/projects/sparc64/contrib/gcc/libfuncs.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/libgcc1-test.c#2 delete ... //depot/projects/sparc64/contrib/gcc/libgcc1.c#2 delete ... //depot/projects/sparc64/contrib/gcc/libiberty.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/listing#2 delete ... //depot/projects/sparc64/contrib/gcc/local-alloc.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/longlong.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/loop.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/loop.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/machmode.def#2 integrate ... //depot/projects/sparc64/contrib/gcc/machmode.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/make-temp-file.c#1 branch ... //depot/projects/sparc64/contrib/gcc/makefile.vms#2 delete ... //depot/projects/sparc64/contrib/gcc/md.texi#2 delete ... //depot/projects/sparc64/contrib/gcc/md5.c#1 branch ... //depot/projects/sparc64/contrib/gcc/md5.h#1 branch ... //depot/projects/sparc64/contrib/gcc/mkconfig.sh#2 integrate ... //depot/projects/sparc64/contrib/gcc/mklibgcc.in#2 integrate ... //depot/projects/sparc64/contrib/gcc/mkmap-symver.awk#2 integrate ... //depot/projects/sparc64/contrib/gcc/objc/Makefile.in#2 delete ... //depot/projects/sparc64/contrib/gcc/objc/lang-specs.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/objc/objc-act.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/objc/objc-lang.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/objc/objc.gperf#2 delete ... //depot/projects/sparc64/contrib/gcc/obstack.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/obstack.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/optabs.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/output.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/partition.c#1 branch ... //depot/projects/sparc64/contrib/gcc/partition.h#1 branch ... //depot/projects/sparc64/contrib/gcc/patch-apollo-includes#2 delete ... //depot/projects/sparc64/contrib/gcc/pcp.h#2 delete ... //depot/projects/sparc64/contrib/gcc/pexecute.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/predict.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/print-tree.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/protoize.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/pself.c#2 delete ... //depot/projects/sparc64/contrib/gcc/pself1.c#2 delete ... //depot/projects/sparc64/contrib/gcc/pself2.c#2 delete ... //depot/projects/sparc64/contrib/gcc/pself3.c#2 delete ... //depot/projects/sparc64/contrib/gcc/pself4.c#2 delete ... //depot/projects/sparc64/contrib/gcc/pself5.c#2 delete ... //depot/projects/sparc64/contrib/gcc/recog.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/reg-stack.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/regclass.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/regmove.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/regrename.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/reload.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/reload1.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/reorg.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/resource.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/rtl.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/rtl.def#2 integrate ... //depot/projects/sparc64/contrib/gcc/rtl.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/rtl.texi#2 delete ... //depot/projects/sparc64/contrib/gcc/rtlanal.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/sched-deps.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/sched-int.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/sched-rgn.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/sched.c#2 delete ... //depot/projects/sparc64/contrib/gcc/sibcall.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/simplify-rtx.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/splay-tree.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/splay-tree.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/ssa-ccp.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/stmt.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/stor-layout.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/stupid.c#2 delete ... //depot/projects/sparc64/contrib/gcc/symcat.h#1 branch ... //depot/projects/sparc64/contrib/gcc/system.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/target-def.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/target.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/tm.texi#2 delete ... //depot/projects/sparc64/contrib/gcc/toplev.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/tradcif.y#2 integrate ... //depot/projects/sparc64/contrib/gcc/tradcpp.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/tradcpp.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/tree-dump.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/tree-inline.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/tree.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/tree.def#2 integrate ... //depot/projects/sparc64/contrib/gcc/tree.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/unprotoize.c#2 delete ... //depot/projects/sparc64/contrib/gcc/unroll.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/unwind-dw2-fde-glibc.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/varasm.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/version.c#2 integrate ... //depot/projects/sparc64/contrib/gcc/vmsdbgout.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/libf2c/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/libf2c/aclocal.m4#1 branch ... //depot/projects/sparc64/contrib/libf2c/configure#2 integrate ... //depot/projects/sparc64/contrib/libf2c/configure.in#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libF77/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libF77/Version.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libF77/configure#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libF77/configure.in#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/Version.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/backspace.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/config.h.in#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/configure#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/configure.in#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/dfe.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/due.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/endfile.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/err.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/fio.h#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/ftell_.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/inquire.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/open.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/rdfmt.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/rewind.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/sfe.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/sue.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libI77/wsfe.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libU77/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libU77/Version.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libU77/config.hin#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libU77/configure#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libU77/configure.in#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libU77/date_.c#2 integrate ... //depot/projects/sparc64/contrib/libf2c/libU77/vxtidate_.c#2 integrate ... //depot/projects/sparc64/contrib/libobjc/ChangeLog#2 integrate ... //depot/projects/sparc64/contrib/libobjc/Makefile.in#2 integrate ... //depot/projects/sparc64/contrib/libobjc/Object.m#2 integrate ... //depot/projects/sparc64/contrib/libobjc/THREADS#2 integrate ... //depot/projects/sparc64/contrib/libobjc/aclocal.m4#1 branch ... //depot/projects/sparc64/contrib/libobjc/class.c#2 integrate ... //depot/projects/sparc64/contrib/libobjc/config.h.in#1 branch ... //depot/projects/sparc64/contrib/libobjc/configure#2 integrate ... //depot/projects/sparc64/contrib/libobjc/configure.in#2 integrate ... //depot/projects/sparc64/contrib/libobjc/encoding.c#2 integrate ... //depot/projects/sparc64/contrib/libobjc/gc.c#2 integrate ... //depot/projects/sparc64/contrib/libobjc/init.c#2 integrate ... //depot/projects/sparc64/contrib/libobjc/libobjc.def#2 integrate ... //depot/projects/sparc64/contrib/libobjc/objc/hash.h#2 integrate ... //depot/projects/sparc64/contrib/libobjc/objc/objc-api.h#2 integrate ... //depot/projects/sparc64/contrib/libobjc/objc/thr.h#2 integrate ... //depot/projects/sparc64/contrib/libobjc/sarray.c#2 integrate ... //depot/projects/sparc64/contrib/libobjc/sendmsg.c#2 integrate ... //depot/projects/sparc64/contrib/libobjc/thr-objc.c#1 branch ... //depot/projects/sparc64/contrib/libobjc/thr-posix.c#2 integrate ... //depot/projects/sparc64/contrib/libobjc/thr-rtems.c#1 branch ... //depot/projects/sparc64/contrib/libobjc/thr.c#2 integrate ... //depot/projects/sparc64/crypto/kerberosIV/appl/bsd/pathnames.h#1 branch ... //depot/projects/sparc64/crypto/telnet/libtelnet/sra.c#2 integrate ... //depot/projects/sparc64/etc/defaults/pccard.conf#3 integrate ... //depot/projects/sparc64/etc/ftpusers#2 integrate ... //depot/projects/sparc64/etc/mail/README#4 integrate ... //depot/projects/sparc64/etc/pam.d/login#4 integrate ... //depot/projects/sparc64/etc/pam.d/other#4 integrate ... //depot/projects/sparc64/etc/pam.d/sshd#5 integrate ... //depot/projects/sparc64/etc/periodic/daily/440.status-mailq#3 integrate ... //depot/projects/sparc64/etc/periodic/security/100.chksetuid#2 integrate ... //depot/projects/sparc64/etc/rc#8 integrate ... //depot/projects/sparc64/games/atc/input.c#2 integrate ... //depot/projects/sparc64/games/atc/log.c#2 integrate ... //depot/projects/sparc64/games/atc/update.c#2 integrate ... //depot/projects/sparc64/games/larn/global.c#2 integrate ... //depot/projects/sparc64/games/larn/header.h#2 integrate ... //depot/projects/sparc64/games/larn/help.c#2 integrate ... //depot/projects/sparc64/games/larn/io.c#2 integrate ... //depot/projects/sparc64/games/larn/main.c#2 integrate ... //depot/projects/sparc64/games/larn/nap.c#2 integrate ... //depot/projects/sparc64/games/larn/object.c#2 integrate ... //depot/projects/sparc64/games/larn/scores.c#2 integrate ... //depot/projects/sparc64/games/larn/signal.c#2 integrate ... //depot/projects/sparc64/games/larn/tok.c#2 integrate ... //depot/projects/sparc64/gnu/lib/Makefile#8 integrate ... //depot/projects/sparc64/gnu/lib/csu/Makefile#4 integrate ... //depot/projects/sparc64/gnu/lib/libgcc/Makefile#4 integrate ... //depot/projects/sparc64/gnu/lib/libiberty/Makefile#2 integrate ... //depot/projects/sparc64/gnu/lib/libobjc/Makefile#2 integrate ... //depot/projects/sparc64/gnu/lib/libstdc++/Makefile#2 integrate ... //depot/projects/sparc64/gnu/lib/libstdc++/config.h#1 branch ... //depot/projects/sparc64/gnu/lib/libsupc++/Makefile#1 branch ... //depot/projects/sparc64/gnu/usr.bin/Makefile#16 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/Makefile#4 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/Makefile.fe#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/Makefile.inc#5 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/Makefile.tgt#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/c++/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/c++filt/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc1/Makefile#5 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc1obj/Makefile#5 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc1plus/Makefile#5 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc_drv/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc_fbsd/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc_int/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc_tools/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc_tools/auto-host.h#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#4 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cccp/Makefile#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/collect2/Makefile#4 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cpp/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cpp0/Makefile#1 branch ... //depot/projects/sparc64/gnu/usr.bin/cc/doc/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/f77/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/f771/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/f77doc/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/gcov/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/protoize/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/tradcpp0/Makefile#1 branch ... //depot/projects/sparc64/include/paths.h#3 integrate ... //depot/projects/sparc64/kerberos5/lib/libsl/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/usr.bin/krb5-config/Makefile#2 integrate ... //depot/projects/sparc64/lib/csu/common/crtbrand.c#2 integrate ... //depot/projects/sparc64/lib/csu/sparc64/Makefile#7 integrate ... //depot/projects/sparc64/lib/libc/gen/getbootfile.3#3 integrate ... //depot/projects/sparc64/lib/libc/gen/getpwent.c#5 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/Makefile.inc#7 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_reg.S#5 integrate ... //depot/projects/sparc64/lib/libc/stdlib/malloc.c#9 integrate ... //depot/projects/sparc64/lib/libc/sys/Makefile.inc#3 integrate ... //depot/projects/sparc64/lib/libc/sys/accept.2#5 integrate ... //depot/projects/sparc64/lib/libc/sys/chflags.2#3 integrate ... //depot/projects/sparc64/lib/libc/sys/listen.2#4 integrate ... //depot/projects/sparc64/lib/libpam/modules/modules.inc#6 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_ftpusers/Makefile#1 branch ... //depot/projects/sparc64/lib/libpam/modules/pam_ftpusers/pam_ftpusers.8#1 branch ... //depot/projects/sparc64/lib/libpam/modules/pam_ftpusers/pam_ftpusers.c#1 branch ... //depot/projects/sparc64/lib/libpam/modules/pam_lastlog/pam_lastlog.8#3 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#4 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_unix/Makefile#5 integrate ... //depot/projects/sparc64/lib/libpam/modules/pam_unix/pam_unix.c#7 integrate ... //depot/projects/sparc64/lib/libradius/Makefile#2 integrate ... //depot/projects/sparc64/lib/libradius/libradius.3#2 integrate ... //depot/projects/sparc64/lib/libradius/radlib.c#2 integrate ... //depot/projects/sparc64/lib/libradius/radlib_private.h#2 integrate ... //depot/projects/sparc64/lib/libradius/radlib_vs.h#1 branch ... //depot/projects/sparc64/lib/libutil/Makefile#2 integrate ... //depot/projects/sparc64/lib/libutil/libutil.h#3 integrate ... //depot/projects/sparc64/lib/libutil/pw_copy.c#2 delete ... //depot/projects/sparc64/lib/libutil/pw_util.c#2 integrate ... //depot/projects/sparc64/lib/libypclnt/ypclnt.h#2 integrate ... //depot/projects/sparc64/lib/libypclnt/ypclnt_passwd.c#3 integrate ... //depot/projects/sparc64/libexec/rlogind/pathnames.h#2 delete ... //depot/projects/sparc64/libexec/rlogind/rlogind.c#2 integrate ... //depot/projects/sparc64/libexec/rshd/rshd.c#2 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#4 integrate ... //depot/projects/sparc64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#5 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#7 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 integrate ... //depot/projects/sparc64/release/picobsd/tinyware/passwd/Makefile#1 branch ... //depot/projects/sparc64/release/picobsd/tinyware/passwd/passwd.c#1 branch ... //depot/projects/sparc64/sbin/ipfw/ipfw.c#2 integrate ... //depot/projects/sparc64/sbin/mount_std/mount_std.c#5 integrate ... //depot/projects/sparc64/sbin/nextboot/nextboot.8#2 integrate ... //depot/projects/sparc64/sbin/restore/tape.c#4 integrate ... //depot/projects/sparc64/sbin/savecore/Makefile#3 integrate ... //depot/projects/sparc64/sbin/savecore/savecore.8#2 integrate ... //depot/projects/sparc64/sbin/savecore/savecore.c#9 integrate ... //depot/projects/sparc64/sbin/sysctl/sysctl.c#3 integrate ... //depot/projects/sparc64/sbin/tunefs/tunefs.8#3 integrate ... //depot/projects/sparc64/share/Makefile#4 integrate ... //depot/projects/sparc64/share/examples/pppd/ppp.deny.sample#2 integrate ... //depot/projects/sparc64/share/man/man4/vinum.4#4 integrate ... //depot/projects/sparc64/share/man/man4/wi.4#3 integrate ... //depot/projects/sparc64/share/man/man4/wi.4tbl#2 delete ... //depot/projects/sparc64/share/man/man4/wi.4tl#2 delete ... //depot/projects/sparc64/share/man/man7/release.7#6 integrate ... //depot/projects/sparc64/share/man/man8/man8.i386/MAKEDEV.8#2 integrate ... //depot/projects/sparc64/share/man/man9/acl.9#2 integrate ... //depot/projects/sparc64/share/misc/pci_vendors#4 integrate ... //depot/projects/sparc64/share/mk/bsd.cpu.mk#3 integrate ... //depot/projects/sparc64/share/mk/bsd.dep.mk#7 integrate ... //depot/projects/sparc64/share/mk/bsd.kern.mk#2 integrate ... //depot/projects/sparc64/share/mk/bsd.lib.mk#12 integrate ... //depot/projects/sparc64/share/mk/bsd.man.mk#5 integrate ... //depot/projects/sparc64/share/mk/bsd.prog.mk#11 integrate ... //depot/projects/sparc64/share/mk/bsd.subdir.mk#5 integrate ... //depot/projects/sparc64/share/mk/bsd.sys.mk#6 integrate ... //depot/projects/sparc64/sys/alpha/alpha/mp_machdep.c#15 integrate ... //depot/projects/sparc64/sys/alpha/include/ansi.h#12 integrate ... //depot/projects/sparc64/sys/alpha/include/atomic.h#2 integrate ... //depot/projects/sparc64/sys/alpha/include/stdarg.h#2 integrate ... //depot/projects/sparc64/sys/alpha/include/varargs.h#2 integrate ... //depot/projects/sparc64/sys/arm/include/ansi.h#8 integrate ... //depot/projects/sparc64/sys/boot/Makefile#5 integrate ... //depot/projects/sparc64/sys/boot/alpha/boot1/Makefile#2 integrate ... //depot/projects/sparc64/sys/boot/alpha/cdboot/Makefile#3 integrate ... //depot/projects/sparc64/sys/boot/alpha/libalpha/Makefile#3 integrate ... //depot/projects/sparc64/sys/boot/alpha/loader/Makefile#2 integrate ... //depot/projects/sparc64/sys/boot/alpha/netboot/Makefile#2 integrate ... //depot/projects/sparc64/sys/boot/arc/lib/Makefile#3 integrate ... //depot/projects/sparc64/sys/boot/arc/loader/Makefile#2 integrate ... //depot/projects/sparc64/sys/boot/common/load_elf.c#13 integrate ... //depot/projects/sparc64/sys/boot/efi/libefi/Makefile#6 integrate ... //depot/projects/sparc64/sys/boot/efi/loader/Makefile#8 integrate ... //depot/projects/sparc64/sys/boot/ficl/Makefile#3 integrate ... //depot/projects/sparc64/sys/boot/forth/loader.4th.8#3 integrate ... //depot/projects/sparc64/sys/boot/forth/loader.conf.5#4 integrate ... //depot/projects/sparc64/sys/boot/i386/Makefile#3 integrate ... //depot/projects/sparc64/sys/boot/i386/Makefile.inc#2 integrate ... //depot/projects/sparc64/sys/boot/i386/boot2/Makefile#2 integrate ... //depot/projects/sparc64/sys/boot/i386/kgzldr/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/i386/libi386/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/i386/loader/Makefile#7 integrate ... //depot/projects/sparc64/sys/boot/ia64/libski/Makefile#5 integrate ... //depot/projects/sparc64/sys/boot/ia64/skiload/Makefile#6 integrate ... //depot/projects/sparc64/sys/boot/pc98/boot2/Makefile#3 integrate ... //depot/projects/sparc64/sys/boot/pc98/kgzldr/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/pc98/libpc98/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/pc98/loader/Makefile#6 integrate ... //depot/projects/sparc64/sys/boot/powerpc/loader/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/sparc64/boot1/Makefile#9 integrate ... //depot/projects/sparc64/sys/boot/sparc64/loader/Makefile#21 integrate ... //depot/projects/sparc64/sys/conf/NOTES#8 integrate ... //depot/projects/sparc64/sys/conf/files#57 integrate ... //depot/projects/sparc64/sys/conf/options#28 integrate ... //depot/projects/sparc64/sys/ddb/db_elf.c#1 branch ... //depot/projects/sparc64/sys/ddb/db_kld.c#2 integrate ... //depot/projects/sparc64/sys/dev/acpica/acpi.c#26 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aicasm/Makefile#6 integrate ... //depot/projects/sparc64/sys/dev/ar/if_ar.c#3 integrate ... //depot/projects/sparc64/sys/dev/drm/drm_drv.h#2 integrate ... //depot/projects/sparc64/sys/dev/drm/drm_os_freebsd.h#2 integrate ... //depot/projects/sparc64/sys/dev/ichsmb/ichsmb_pci.c#2 integrate ... //depot/projects/sparc64/sys/dev/mii/acphy.c#6 integrate ... //depot/projects/sparc64/sys/dev/mii/amphy.c#5 integrate ... //depot/projects/sparc64/sys/dev/mii/brgphy.c#8 integrate ... //depot/projects/sparc64/sys/dev/mii/dcphy.c#6 integrate ... //depot/projects/sparc64/sys/dev/mii/e1000phy.c#4 integrate ... //depot/projects/sparc64/sys/dev/mii/lxtphy.c#5 integrate ... //depot/projects/sparc64/sys/dev/mii/mii_physubr.c#5 integrate ... //depot/projects/sparc64/sys/dev/mii/miivar.h#5 integrate ... //depot/projects/sparc64/sys/dev/mii/mlphy.c#5 integrate ... //depot/projects/sparc64/sys/dev/mii/nsgphy.c#5 integrate ... //depot/projects/sparc64/sys/dev/mii/nsphy.c#5 integrate ... //depot/projects/sparc64/sys/dev/mii/qsphy.c#6 integrate ... //depot/projects/sparc64/sys/dev/mii/rlphy.c#7 integrate ... //depot/projects/sparc64/sys/dev/mii/tdkphy.c#6 integrate ... //depot/projects/sparc64/sys/dev/mii/tlphy.c#5 integrate ... //depot/projects/sparc64/sys/dev/mii/xmphy.c#5 integrate ... //depot/projects/sparc64/sys/dev/nge/if_nge.c#11 integrate ... //depot/projects/sparc64/sys/dev/sio/sio_isa.c#9 integrate ... //depot/projects/sparc64/sys/dev/sound/pci/ich.c#13 integrate ... //depot/projects/sparc64/sys/dev/syscons/syscons.c#12 integrate ... //depot/projects/sparc64/sys/dev/usb/ufm.c#4 integrate ... //depot/projects/sparc64/sys/dev/usb/ugen.c#10 integrate ... //depot/projects/sparc64/sys/dev/usb/ulpt.c#8 integrate ... //depot/projects/sparc64/sys/dev/usb/urio.c#8 integrate ... //depot/projects/sparc64/sys/dev/usb/usb.c#12 integrate ... //depot/projects/sparc64/sys/dev/usb/usb_port.h#10 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdi.c#9 integrate ... //depot/projects/sparc64/sys/dev/usb/usbdi.h#6 integrate ... //depot/projects/sparc64/sys/dev/wi/wi_hostap.c#5 integrate ... //depot/projects/sparc64/sys/i386/conf/NOTES#40 integrate ... //depot/projects/sparc64/sys/i386/i386/i386dump.c#2 integrate ... //depot/projects/sparc64/sys/i386/include/ansi.h#12 integrate ... //depot/projects/sparc64/sys/i386/include/stdarg.h#4 integrate ... //depot/projects/sparc64/sys/i386/include/varargs.h#2 integrate ... //depot/projects/sparc64/sys/i386/isa/ipl.s#6 integrate ... //depot/projects/sparc64/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#6 integrate ... //depot/projects/sparc64/sys/ia64/ia64/pmap.c#28 integrate ... //depot/projects/sparc64/sys/ia64/ia64/sal.c#7 integrate ... //depot/projects/sparc64/sys/ia64/ia64/swtch.s#11 integrate ... //depot/projects/sparc64/sys/ia64/ia64/vm_machdep.c#15 integrate ... //depot/projects/sparc64/sys/ia64/include/mca.h#2 integrate ... //depot/projects/sparc64/sys/ia64/include/md_var.h#7 integrate ... //depot/projects/sparc64/sys/ia64/include/pcb.h#4 integrate ... //depot/projects/sparc64/sys/ia64/include/reg.h#5 integrate ... //depot/projects/sparc64/sys/ia64/include/stdarg.h#3 integrate ... //depot/projects/sparc64/sys/ia64/include/varargs.h#2 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/cd9660_bmap.c#2 integrate ... //depot/projects/sparc64/sys/isofs/cd9660/cd9660_util.c#2 integrate ... //depot/projects/sparc64/sys/kern/init_sysent.c#19 integrate ... //depot/projects/sparc64/sys/kern/kern_clock.c#16 integrate ... //depot/projects/sparc64/sys/kern/kern_descrip.c#24 integrate ... //depot/projects/sparc64/sys/kern/kern_exit.c#25 integrate ... //depot/projects/sparc64/sys/kern/kern_proc.c#20 integrate ... //depot/projects/sparc64/sys/kern/kern_sig.c#28 integrate ... //depot/projects/sparc64/sys/kern/kern_subr.c#7 integrate ... //depot/projects/sparc64/sys/kern/kern_switch.c#10 integrate ... //depot/projects/sparc64/sys/kern/subr_log.c#5 integrate ... //depot/projects/sparc64/sys/kern/subr_mbuf.c#10 integrate ... //depot/projects/sparc64/sys/kern/subr_witness.c#25 integrate ... //depot/projects/sparc64/sys/kern/sys_generic.c#15 integrate ... //depot/projects/sparc64/sys/kern/sys_pipe.c#20 integrate ... //depot/projects/sparc64/sys/kern/sys_process.c#20 integrate ... //depot/projects/sparc64/sys/kern/syscalls.c#18 integrate ... //depot/projects/sparc64/sys/kern/syscalls.master#17 integrate ... //depot/projects/sparc64/sys/kern/tty.c#17 integrate ... //depot/projects/sparc64/sys/kern/uipc_socket.c#19 integrate ... //depot/projects/sparc64/sys/kern/uipc_socket2.c#15 integrate ... //depot/projects/sparc64/sys/kern/vfs_bio.c#23 integrate ... //depot/projects/sparc64/sys/kern/vfs_subr.c#23 integrate ... //depot/projects/sparc64/sys/kern/vfs_syscalls.c#30 integrate ... //depot/projects/sparc64/sys/net/bpf.c#13 integrate ... //depot/projects/sparc64/sys/net/bridge.c#12 integrate ... //depot/projects/sparc64/sys/net/if_dl.h#3 integrate ... //depot/projects/sparc64/sys/net/if_iso88025subr.c#5 integrate ... //depot/projects/sparc64/sys/net/if_media.h#5 integrate ... //depot/projects/sparc64/sys/net/if_spppsubr.c#8 integrate ... //depot/projects/sparc64/sys/net/if_tap.c#11 integrate ... //depot/projects/sparc64/sys/net/if_tun.c#9 integrate ... //depot/projects/sparc64/sys/net/if_var.h#12 integrate ... //depot/projects/sparc64/sys/net/iso88025.h#2 integrate ... //depot/projects/sparc64/sys/netatm/atm_cm.c#6 integrate ... //depot/projects/sparc64/sys/netatm/atm_cm.h#4 integrate ... //depot/projects/sparc64/sys/netatm/atm_socket.c#4 integrate ... //depot/projects/sparc64/sys/netatm/atm_subr.c#9 integrate ... //depot/projects/sparc64/sys/netatm/atm_var.h#8 integrate ... //depot/projects/sparc64/sys/netgraph/ng_ether.c#6 integrate ... //depot/projects/sparc64/sys/netinet/icmp6.h#4 integrate ... //depot/projects/sparc64/sys/netinet/if_ether.c#13 integrate ... //depot/projects/sparc64/sys/netinet/ip_dummynet.h#5 integrate ... //depot/projects/sparc64/sys/netinet/ip_fw.c#14 integrate ... //depot/projects/sparc64/sys/netinet/ip_fw.h#7 integrate ... //depot/projects/sparc64/sys/netinet/ip_input.c#18 integrate ... //depot/projects/sparc64/sys/netinet/ip_output.c#18 integrate ... //depot/projects/sparc64/sys/netinet6/icmp6.c#6 integrate ... //depot/projects/sparc64/sys/netinet6/mld6.c#2 integrate ... //depot/projects/sparc64/sys/pci/if_dc.c#17 integrate ... //depot/projects/sparc64/sys/pci/if_dcreg.h#7 integrate ... //depot/projects/sparc64/sys/pci/if_rl.c#11 integrate ... //depot/projects/sparc64/sys/pci/if_rlreg.h#6 integrate ... //depot/projects/sparc64/sys/powerpc/include/ansi.h#12 integrate ... //depot/projects/sparc64/sys/powerpc/include/param.h#4 integrate ... //depot/projects/sparc64/sys/powerpc/include/pte.h#4 integrate ... //depot/projects/sparc64/sys/powerpc/include/spr.h#2 integrate ... //depot/projects/sparc64/sys/powerpc/include/stdarg.h#4 integrate ... //depot/projects/sparc64/sys/powerpc/include/trap.h#3 integrate ... //depot/projects/sparc64/sys/powerpc/include/varargs.h#2 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/copyinout.c#3 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/machdep.c#23 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/pmap.c#20 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/swtch.s#11 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/trap.c#14 integrate ... //depot/projects/sparc64/sys/powerpc/powerpc/trap_subr.S#2 integrate ... //depot/projects/sparc64/sys/sparc64/include/ansi.h#13 integrate ... //depot/projects/sparc64/sys/sparc64/include/proc.h#12 integrate ... //depot/projects/sparc64/sys/sparc64/include/reg.h#14 integrate ... //depot/projects/sparc64/sys/sparc64/include/stdarg.h#2 integrate ... //depot/projects/sparc64/sys/sparc64/include/varargs.h#2 integrate ... //depot/projects/sparc64/sys/sparc64/sparc64/exception.s#73 integrate ... //depot/projects/sparc64/sys/sys/buf.h#13 integrate ... //depot/projects/sparc64/sys/sys/filedesc.h#13 integrate ... //depot/projects/sparc64/sys/sys/jail.h#6 integrate ... //depot/projects/sparc64/sys/sys/kerneldump.h#2 integrate ... //depot/projects/sparc64/sys/sys/proc.h#34 integrate ... //depot/projects/sparc64/sys/sys/stat.h#4 integrate ... //depot/projects/sparc64/sys/sys/syscall.h#18 integrate ... //depot/projects/sparc64/sys/sys/syscall.mk#18 integrate ... //depot/projects/sparc64/sys/sys/sysproto.h#20 integrate ... //depot/projects/sparc64/sys/sys/time.h#9 integrate ... //depot/projects/sparc64/sys/sys/uio.h#6 integrate ... //depot/projects/sparc64/sys/tools/vnode_if.awk#4 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_extern.h#4 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_inode.c#5 integrate ... //depot/projects/sparc64/sys/ufs/ufs/ufs_readwrite.c#7 integrate ... //depot/projects/sparc64/sys/vm/uma_core.c#10 integrate ... //depot/projects/sparc64/sys/vm/vm_fault.c#13 integrate ... //depot/projects/sparc64/sys/vm/vm_map.c#17 integrate ... //depot/projects/sparc64/sys/vm/vm_map.h#12 integrate ... //depot/projects/sparc64/sys/vm/vm_mmap.c#15 integrate ... //depot/projects/sparc64/sys/vm/vm_object.c#11 integrate ... //depot/projects/sparc64/sys/vm/vm_object.h#5 integrate ... //depot/projects/sparc64/sys/vm/vm_swap.c#8 integrate ... //depot/projects/sparc64/sys/vm/vnode_pager.c#14 integrate ... //depot/projects/sparc64/tools/regression/usr.bin/make/Makefile#2 integrate ... //depot/projects/sparc64/tools/regression/usr.bin/make/regress.sysvmatch.out#1 branch ... //depot/projects/sparc64/usr.bin/at/at.c#2 integrate ... //depot/projects/sparc64/usr.bin/at/at.man#2 integrate ... //depot/projects/sparc64/usr.bin/calendar/calendars/calendar.freebsd#6 integrate ... //depot/projects/sparc64/usr.bin/chpass/Makefile#3 integrate ... //depot/projects/sparc64/usr.bin/chpass/chpass.c#6 integrate ... //depot/projects/sparc64/usr.bin/chpass/chpass.h#4 integrate ... //depot/projects/sparc64/usr.bin/chpass/field.c#4 integrate ... //depot/projects/sparc64/usr.bin/chpass/pathnames.h#2 delete ... //depot/projects/sparc64/usr.bin/chpass/pw_copy.c#4 delete ... //depot/projects/sparc64/usr.bin/chpass/pw_copy.h#5 delete ... //depot/projects/sparc64/usr.bin/chpass/pw_yp.c#5 delete ... //depot/projects/sparc64/usr.bin/chpass/pw_yp.h#2 delete ... //depot/projects/sparc64/usr.bin/chpass/util.c#4 integrate ... //depot/projects/sparc64/usr.bin/doscmd/AsyncIO.c#2 integrate ... //depot/projects/sparc64/usr.bin/doscmd/cpu.c#2 integrate ... //depot/projects/sparc64/usr.bin/ee/ee.c#2 integrate ... //depot/projects/sparc64/usr.bin/fstat/fstat.1#5 integrate ... //depot/projects/sparc64/usr.bin/ipcs/ipcs.1#3 integrate ... //depot/projects/sparc64/usr.bin/make/str.c#4 integrate ... //depot/projects/sparc64/usr.bin/mesg/mesg.1#2 integrate ... //depot/projects/sparc64/usr.bin/mesg/mesg.c#3 integrate ... //depot/projects/sparc64/usr.bin/nfsstat/nfsstat.1#2 integrate ... //depot/projects/sparc64/usr.bin/nice/nice.1#3 integrate ... //depot/projects/sparc64/usr.bin/nice/nice.c#3 integrate ... //depot/projects/sparc64/usr.bin/passwd/extern.h#3 delete ... //depot/projects/sparc64/usr.bin/passwd/local_passwd.c#4 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 9:43:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79AFA37B40C; Fri, 10 May 2002 09:43:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5065637B435 for ; Fri, 10 May 2002 09:43:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AGhbK42620 for perforce@freebsd.org; Fri, 10 May 2002 09:43:37 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Fri, 10 May 2002 09:43:37 -0700 (PDT) Message-Id: <200205101643.g4AGhbK42620@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11124 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11124 Change 11124 by mini@mini_stylus on 2002/05/10 09:43:14 Don't lock and then immediately unlock sched_lock. This is an editing nit that shouldn't have gotten submitted in the first place. Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#46 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#46 (text+ko) ==== @@ -129,10 +129,6 @@ } #endif - mtx_lock_spin(&sched_lock); - - mtx_unlock_spin(&sched_lock); - /* Update counters. */ active_threads--; /* XXXSMP */ cached_threads++; /* XXXSMP */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 9:48:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15F8537B408; Fri, 10 May 2002 09:47:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 25D5137B403 for ; Fri, 10 May 2002 09:47:43 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AGlgD46250 for perforce@freebsd.org; Fri, 10 May 2002 09:47:42 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Fri, 10 May 2002 09:47:42 -0700 (PDT) Message-Id: <200205101647.g4AGlgD46250@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11125 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11125 Change 11125 by jake@jake_sparc64 on 2002/05/10 09:47:35 More of 11117. Affected files ... ... //depot/projects/sparc64/usr.bin/chpass/edit.c#4 integrate Differences ... ==== //depot/projects/sparc64/usr.bin/chpass/edit.c#4 (text+ko) ==== @@ -1,6 +1,13 @@ /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. + * Copyright (c) 2002 Networks Associates Technology, Inc. + * All rights reserved. + * + * Portions of this software were developed for the FreeBSD Project by + * ThinkSec AS and NAI Labs, the Security Research Division of Network + * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -38,7 +45,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/chpass/edit.c,v 1.21 2002/03/30 13:44:45 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/chpass/edit.c,v 1.22 2002/05/08 00:54:28 des Exp $"); #include #include @@ -46,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -55,39 +61,42 @@ #include #include -#include +#include #include "chpass.h" -#ifdef YP -#include "pw_yp.h" -#endif /* YP */ -extern char *tempname; +static int display(const char *tfn, struct passwd *pw); +static struct passwd *verify(const char *tfn, struct passwd *pw); -void -edit(struct passwd *pw) +struct passwd * +edit(const char *tfn, struct passwd *pw) { - struct stat begin, end; - char *begin_sum, *end_sum; + struct passwd *npw; + char *line; + size_t len; + if (display(tfn, pw) == -1) + return (NULL); for (;;) { - if (stat(tempname, &begin)) - pw_error(tempname, 1, 1); - begin_sum = MD5File(tempname, (char *)NULL); - pw_edit(1); - if (stat(tempname, &end)) - pw_error(tempname, 1, 1); - end_sum = MD5File(tempname, (char *)NULL); - if ((begin.st_mtime == end.st_mtime) && - (strcmp(begin_sum, end_sum) == 0)) { - warnx("no changes made"); - pw_error(NULL, 0, 0); + switch (pw_edit(1)) { + case -1: + return (NULL); + case 0: + return (pw_dup(pw)); + default: + break; + } + if ((npw = verify(tfn, pw)) != NULL) + return (npw); + free(npw); + printf("re-edit the password file? "); + fflush(stdout); + if ((line = fgetln(stdin, &len)) == NULL) { + warn("fgetln()"); + return (NULL); } - free(begin_sum); - free(end_sum); - if (verify(pw)) - break; - pw_prompt(); + if (len > 0 && (*line == 'N' || *line == 'n')) + return (NULL); } } @@ -96,23 +105,20 @@ * print out the file for the user to edit; strange side-effect: * set conditional flag if the user gets to edit the shell. */ -void -display(int fd, struct passwd *pw) +static int +display(const char *tfn, struct passwd *pw) { FILE *fp; char *bp, *p; - if (!(fp = fdopen(fd, "w"))) - pw_error(tempname, 1, 1); + if ((fp = fopen(tfn, "w")) == NULL) { + warn("%s", tfn); + return (-1); + } (void)fprintf(fp, -#ifdef YP - "#Changing %s information for %s.\n", _use_yp ? "NIS" : "user database", pw->pw_name); - if (!uid && (!_use_yp || suser_override)) { -#else - "#Changing user database information for %s.\n", pw->pw_name); - if (!uid) { -#endif /* YP */ + "#Changing user information for %s.\n", pw->pw_name); + if (master_mode) { (void)fprintf(fp, "Login: %s\n", pw->pw_name); (void)fprintf(fp, "Password: %s\n", pw->pw_passwd); (void)fprintf(fp, "Uid [#]: %lu\n", (unsigned long)pw->pw_uid); @@ -135,7 +141,8 @@ * necklace, but there's not much else to do. */ #else - else if ((!list[E_SHELL].restricted && ok_shell(pw->pw_shell)) || !uid) + else if ((!list[E_SHELL].restricted && ok_shell(pw->pw_shell)) || + master_mode) /* * If change not restrict (table.c) and standard shell * OR if root, then allow editing of shell. @@ -150,120 +157,133 @@ p = strsep(&bp, ","); p = strdup(p ? p : ""); list[E_NAME].save = p; - if (!list[E_NAME].restricted || !uid) + if (!list[E_NAME].restricted || master_mode) (void)fprintf(fp, "Full Name: %s\n", p); - p = strsep(&bp, ","); + p = strsep(&bp, ","); p = strdup(p ? p : ""); list[E_LOCATE].save = p; - if (!list[E_LOCATE].restricted || !uid) + if (!list[E_LOCATE].restricted || master_mode) (void)fprintf(fp, "Office Location: %s\n", p); - p = strsep(&bp, ","); + p = strsep(&bp, ","); p = strdup(p ? p : ""); list[E_BPHONE].save = p; - if (!list[E_BPHONE].restricted || !uid) + if (!list[E_BPHONE].restricted || master_mode) (void)fprintf(fp, "Office Phone: %s\n", p); - p = strsep(&bp, ","); + p = strsep(&bp, ","); p = strdup(p ? p : ""); list[E_HPHONE].save = p; - if (!list[E_HPHONE].restricted || !uid) + if (!list[E_HPHONE].restricted || master_mode) (void)fprintf(fp, "Home Phone: %s\n", p); bp = strdup(bp ? bp : ""); list[E_OTHER].save = bp; - if (!list[E_OTHER].restricted || !uid) + if (!list[E_OTHER].restricted || master_mode) (void)fprintf(fp, "Other information: %s\n", bp); - (void)fchown(fd, getuid(), getgid()); + (void)fchown(fileno(fp), getuid(), getgid()); (void)fclose(fp); + return (0); } -int -verify(struct passwd *pw) +static struct passwd * +verify(const char *tfn, struct passwd *pw) { + struct passwd *npw; ENTRY *ep; - char *p; + char *buf, *p, *val; struct stat sb; FILE *fp; - int len, line; - static char buf[LINE_MAX]; + int line; + size_t len; - if (!(fp = fopen(tempname, "r"))) - pw_error(tempname, 1, 1); - if (fstat(fileno(fp), &sb)) - pw_error(tempname, 1, 1); + if ((pw = pw_dup(pw)) == NULL) + return (NULL); + if ((fp = fopen(tfn, "r")) == NULL || + fstat(fileno(fp), &sb) == -1) { + warn("%s", tfn); + free(pw); + return (NULL); + } if (sb.st_size == 0) { warnx("corrupted temporary file"); - goto bad; + fclose(fp); + free(pw); + return (NULL); } - line = 0; - while (fgets(buf, sizeof(buf), fp)) { - line++; - if (!buf[0] || buf[0] == '#') + val = NULL; + for (line = 1; (buf = fgetln(fp, &len)) != NULL; ++line) { + if (*buf == '\0' || *buf == '#') continue; - if (!(p = strchr(buf, '\n'))) { - warnx("line %d too long", line); - goto bad; - } - *p = '\0'; + while (len > 0 && isspace(buf[len - 1])) + --len; for (ep = list;; ++ep) { if (!ep->prompt) { - warnx("unrecognized field on line %d", line); + warnx("%s: unrecognized field on line %d", + tfn, line); + goto bad; + } + if (ep->len > len) + continue; + if (strncasecmp(buf, ep->prompt, ep->len) != 0) + continue; + if (ep->restricted && !master_mode) { + warnx("%s: you may not change the %s field", + tfn, ep->prompt); + goto bad; + } + for (p = buf; p < buf + len && *p != ':'; ++p) + /* nothing */ ; + if (*p != ':') { + warnx("%s: line %d corrupted", tfn, line); goto bad; } - if (!strncasecmp(buf, ep->prompt, ep->len)) { - if (ep->restricted && uid) { - warnx( - "you may not change the %s field", - ep->prompt); - goto bad; - } - if (!(p = strchr(buf, ':'))) { - warnx("line %d corrupted", line); - goto bad; - } - while (isspace(*++p)); - if (ep->except && strpbrk(p, ep->except)) { - warnx( - "illegal character in the \"%s\" field", - ep->prompt); - goto bad; - } - if ((ep->func)(p, pw, ep)) { -bad: (void)fclose(fp); - return (0); - } - break; + while (++p < buf + len && isspace(*p)) + /* nothing */ ; + free(val); + asprintf(&val, "%.*s", (int)(buf + len - p), p); + if (val == NULL) + goto bad; + if (ep->except && strpbrk(val, ep->except)) { + warnx("%s: invalid character in \"%s\" field '%s'", + tfn, ep->prompt, val); + goto bad; } + if ((ep->func)(val, pw, ep)) + goto bad; + break; } } - (void)fclose(fp); + free(val); + fclose(fp); /* Build the gecos field. */ - len = strlen(list[E_NAME].save) + strlen(list[E_BPHONE].save) + - strlen(list[E_HPHONE].save) + strlen(list[E_LOCATE].save) + - strlen(list[E_OTHER].save) + 5; - if (!(p = malloc(len))) - err(1, NULL); - (void)sprintf(pw->pw_gecos = p, "%s,%s,%s,%s,%s", list[E_NAME].save, - list[E_LOCATE].save, list[E_BPHONE].save, list[E_HPHONE].save, - list[E_OTHER].save); - - while ((len = strlen(pw->pw_gecos)) && pw->pw_gecos[len - 1] == ',') - pw->pw_gecos[len - 1] = '\0'; - - if ((size_t)snprintf(buf, sizeof(buf), - "%s:%s:%lu:%lu:%s:%ld:%ld:%s:%s:%s", - pw->pw_name, pw->pw_passwd, (unsigned long)pw->pw_uid, - (unsigned long)pw->pw_gid, pw->pw_class, (long)pw->pw_change, - (long)pw->pw_expire, pw->pw_gecos, pw->pw_dir, - pw->pw_shell) >= sizeof(buf)) { - warnx("entries too long"); - free(p); - return (0); + len = asprintf(&p, "%s,%s,%s,%s,%s", list[E_NAME].save, + list[E_LOCATE].save, list[E_BPHONE].save, + list[E_HPHONE].save, list[E_OTHER].save); + if (p == NULL) { + warn("asprintf()"); + free(pw); + return (NULL); } + while (len > 0 && p[len - 1] == ',') + p[--len] = '\0'; + pw->pw_gecos = p; + buf = pw_make(pw); + free(pw); free(p); - return (__pw_scan(buf, pw, _PWSCAN_WARN|_PWSCAN_MASTER)); + if (buf == NULL) { + warn("pw_make()"); + return (NULL); + } + npw = pw_scan(buf, PWSCAN_WARN|PWSCAN_MASTER); + free(buf); + return (npw); +bad: + free(pw); + free(val); + fclose(fp); + return (NULL); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 9:48:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 611C637B405; Fri, 10 May 2002 09:48:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id 74C4837B401 for ; Fri, 10 May 2002 09:48:51 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 402ACA900; Fri, 10 May 2002 09:50:40 -0700 (PDT) Date: Fri, 10 May 2002 09:50:40 -0700 From: Jonathan Mini To: Jake Burkholder Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11120 for review Message-ID: <20020510095040.I43682@stylus.haikugeek.com> References: <200205101530.g4AFUn510685@freefall.freebsd.org> <20020510123716.D2566@locore.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <20020510123716.D2566@locore.ca>; from jake@locore.ca on Fri, May 10, 2002 at 12:37:16PM -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jake Burkholder [jake@locore.ca] wrote : > Apparently, On Fri, May 10, 2002 at 08:30:49AM -0700, > Jonathan Mini said words to the effect of; > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11120 > > > > Change 11120 by mini@mini_stylus on 2002/05/10 08:30:36 > > > > Give UMA control over thread allocation and caching: > > > > [ ... ] > > I'm not sure that using the uma callouts for all of this is safe. What specifically do you think is dangerous? > > + mtx_lock_spin(&sched_lock); > > + > > + mtx_unlock_spin(&sched_lock); > > ??? *rofl* I can't believe that. Already fixed. Dunce cap for me. ;) > > + td = (struct thread *)mem; > > + pmap_dispose_thread(td); > > + vm_object_deallocate(td->td_kstack_obj); > > + cached_threads--; /* XXXSMP */ > > + allocated_threads--; /* XXXSMP */ > > +} > > These pmap and vm_object calls might sleep, and are called with the uma > zone locked. > Hmm, that's not good. > Almost all of the new code you added looks like its indented 4 spaces, > which should be tabs :) From style(9): Indentation is an 8 character tab. Second level indents are four spaces. .. I must have misread that. What are second level indents, then? -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 9:49:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 383A437B409; Fri, 10 May 2002 09:49:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0243237B407 for ; Fri, 10 May 2002 09:49:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AGnjI48281 for perforce@freebsd.org; Fri, 10 May 2002 09:49:45 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Fri, 10 May 2002 09:49:45 -0700 (PDT) Message-Id: <200205101649.g4AGnjI48281@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11126 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11126 Change 11126 by jake@jake_sparc64 on 2002/05/10 09:49:09 Don't know what this is all about. Affected files ... ... //depot/projects/sparc64/contrib/gcc/crtstuff.c#3 edit Differences ... ==== //depot/projects/sparc64/contrib/gcc/crtstuff.c#3 (text+ko) ==== @@ -57,8 +57,8 @@ /* We include auto-host.h here to get HAVE_GAS_HIDDEN. This is supposedly valid even though this is a "target" file. */ -/* #include "auto-host.h" */ -/* #include "tconfig.h" */ +#include "auto-host.h" +#include "tconfig.h" #include "tsystem.h" #include "unwind-dw2-fde.h" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 9:56:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D0E337B408; Fri, 10 May 2002 09:55:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from k6.locore.ca (k6.locore.ca [198.96.117.170]) by hub.freebsd.org (Postfix) with ESMTP id DD06737B403; Fri, 10 May 2002 09:55:57 -0700 (PDT) Received: (from jake@localhost) by k6.locore.ca (8.11.6/8.11.6) id g4AH5YO16008; Fri, 10 May 2002 13:05:34 -0400 (EDT) (envelope-from jake) Date: Fri, 10 May 2002 13:05:34 -0400 From: Jake Burkholder To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11120 for review Message-ID: <20020510130534.E2566@locore.ca> References: <200205101530.g4AFUn510685@freefall.freebsd.org> <20020510123716.D2566@locore.ca> <20020510095040.I43682@stylus.haikugeek.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20020510095040.I43682@stylus.haikugeek.com>; from mini@freebsd.org on Fri, May 10, 2002 at 09:50:40AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Apparently, On Fri, May 10, 2002 at 09:50:40AM -0700, Jonathan Mini said words to the effect of; > Jake Burkholder [jake@locore.ca] wrote : > > > Apparently, On Fri, May 10, 2002 at 08:30:49AM -0700, > > Jonathan Mini said words to the effect of; > > > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11120 > > > > > > Change 11120 by mini@mini_stylus on 2002/05/10 08:30:36 > > > > > > Give UMA control over thread allocation and caching: > > > > > > [ ... ] > > > > I'm not sure that using the uma callouts for all of this is safe. > > What specifically do you think is dangerous? Sleeping with a mutex held. > > > > + mtx_lock_spin(&sched_lock); > > > + > > > + mtx_unlock_spin(&sched_lock); > > > > ??? > > *rofl* I can't believe that. Already fixed. Dunce cap for me. ;) > > > > + td = (struct thread *)mem; > > > + pmap_dispose_thread(td); > > > + vm_object_deallocate(td->td_kstack_obj); > > > + cached_threads--; /* XXXSMP */ > > > + allocated_threads--; /* XXXSMP */ > > > +} > > > > These pmap and vm_object calls might sleep, and are called with the uma > > zone locked. > > > > Hmm, that's not good. > > > Almost all of the new code you added looks like its indented 4 spaces, > > which should be tabs :) > > >From style(9): > > Indentation is an 8 character tab. Second level indents are four spaces. > > .. I must have misread that. What are second level indents, then? Second level indent is for wrapping lines that spill over 78 columns. ie (contrived examples that don't actually wrap): if (foo && bar) { ^^^^ <-- this is second level baz(); } or x = y + z; ^^^ <-- and so is this but: if (foo) bar(); ^^^^ <-- this is not Hope this helps. > > > -- > Jonathan Mini > http://www.haikugeek.com > > "He who is not aware of his ignorance will be only misled by his knowledge." > -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 9:58:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0935537B40A; Fri, 10 May 2002 09:57:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3D4AE37B409 for ; Fri, 10 May 2002 09:57:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AGvu851969 for perforce@freebsd.org; Fri, 10 May 2002 09:57:56 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 09:57:56 -0700 (PDT) Message-Id: <200205101657.g4AGvu851969@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11127 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11127 Change 11127 by peter@peter_ia64 on 2002/05/10 09:56:57 This is a bit brutal, but the current Makefile doesn't actually assemble the lib1asmfucs stuff. Most of this is moving around so that the .if defined(FOO) stuff could see the definitions. Unfortunately, bmake is very order sensitive for macros. _exit and __main are still empty, as are some of the fix* entries. Affected files ... ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#5 edit Differences ... ==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#5 (text+ko) ==== @@ -43,35 +43,8 @@ CFLAGS+= -I${.CURDIR}/../../usr.bin/cc/cc_tools \ -I${GCCDIR}/config -I${GCCDIR} -I. LDFLAGS= -nostdlib - -# Remove any objects from LIB2FUNCS and LIB2_DIVMOD_FUNCS that are -# defined as optimized assembly code in LIB1ASMFUNCS. -.if defined(LIB1ASMFUNCS) -.for sym in ${LIB1ASMFUNCS} -LIB2FUNCS_1= ${LIB2FUNCS_1:S/${sym}//g} -LIB2FUNCS_2= ${LIB2FUNCS_2:S/${sym}//g} -LIB2_DIVMOD_FUNCS= ${LIB2_DIVMOD_FUNCS:S/${sym}//g} -.endfor -.endif - -SYMS= ${LIB1ASMFUNCS} \ - ${LIB2FUNCS_1} \ - ${LIB2FUNCS_2} \ - ${LIB2_DIVMOD_FUNCS} -.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64" -SYMS+= ${FPBIT_FUNCS} ${DPBIT_FUNCS} -.endif -SYMS_ST= ${LIB2FUNCS_ST} \ - ${LIB2ADD_ST} -OBJS_T= ${SYMS:S/$/.o/} ${SYMS_ST:S/$/.o/} -OBJS_P= ${SYMS:S/$/.po/} ${SYMS_ST:S/$/.po/} -OBJS_S= ${SYMS:S/$/.So/} -OBJS= ${SYMS:S/$/.o/} -STATICOBJS= ${SYMS_ST:S/$/.o/} -SRCS= ${LIB2ADD} ${LIB2ADDEH} +OBJS= - - #--------------------------------------------------------------------------- # # When upgrading GCC, get the following defintions straight from Makefile.in @@ -161,6 +134,39 @@ OBJS+= dp-bit.o fp-bit.o .endif +# Remove any objects from LIB2FUNCS and LIB2_DIVMOD_FUNCS that are +# defined as optimized assembly code in LIB1ASMFUNCS. +.if defined(LIB1ASMFUNCS) +.for sym in ${LIB1ASMFUNCS} +LIB2FUNCS_1:= ${LIB2FUNCS_1:S/${sym}//g} +LIB2FUNCS_2:= ${LIB2FUNCS_2:S/${sym}//g} +LIB2_DIVMOD_FUNCS:= ${LIB2_DIVMOD_FUNCS:S/${sym}//g} +.endfor +.endif + +#----------------------------------------------------------------------- + +SYMS= ${LIB2FUNCS_1} \ + ${LIB2FUNCS_2} \ + ${LIB2_DIVMOD_FUNCS} +.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64" +SYMS+= ${FPBIT_FUNCS} ${DPBIT_FUNCS} +.endif +SYMS_ST= ${LIB2FUNCS_ST} \ + ${LIB2ADD_ST} +OBJS_T= ${SYMS:S/$/.o/} ${SYMS_ST:S/$/.o/} +OBJS_P= ${SYMS:S/$/.po/} ${SYMS_ST:S/$/.po/} +OBJS_S= ${SYMS:S/$/.So/} +ASM_T= ${LIB1ASMFUNCS:S/$/.o/} +ASM_P= ${LIB1ASMFUNCS:S/$/.po/} +ASM_S= ${LIB1ASMFUNCS:S/$/.So/} +OBJS+= ${SYMS:S/$/.o/} ${LIB1ASMFUNCS:S/$/.o/} +STATICOBJS= ${SYMS_ST:S/$/.o/} +SRCS= ${LIB2ADD} ${LIB2ADDEH} + + +#----------------------------------------------------------------------- + dp-bit.o: config/fp-bit.c ${XCC} -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*} @@ -209,4 +215,25 @@ @mv ${.TARGET}.tmp ${.TARGET} .endif +.if defined(LIB1ASMSRC) +${ASM_T}: ${LIB1ASMSRC} + ${XCC} -x assembler-with-cpp -c ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${GCCDIR}/config/${LIB1ASMSRC} + @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} + +.if !defined(NOPIC) +${ASM_S}: ${LIB1ASMSRC} + ${XCC} -x assembler-with-cpp -c ${PICFLAG} ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${GCCDIR}/config/${LIB1ASMSRC} + @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} +.endif + +.if !defined(NOPROFILE) +${ASM_P}: ${LIB1ASMSRC} + ${XCC} -x assembler-with-cpp -c -p ${CFLAGS} -DL${.PREFIX} -o ${.TARGET} ${GCCDIR}/config/${TARGET_ARCH}/${LIB1ASMSRC} + @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} +.endif +.endif + .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 10:16:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8793B37B407; Fri, 10 May 2002 10:15:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id E089C37B404; Fri, 10 May 2002 10:15:40 -0700 (PDT) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.3/8.12.3) with SMTP id g4AHFLb5092963; Fri, 10 May 2002 13:15:21 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Fri, 10 May 2002 13:15:20 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Jake Burkholder Cc: Jonathan Mini , Perforce Change Reviews Subject: Re: PERFORCE change 11120 for review In-Reply-To: <20020510123716.D2566@locore.ca> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I actually also was curious about the locking environment UMA provides when initializing and destroying memory slabs... A lot of "common" cleanup will involve locking -- removing things from chains, freeing allocated references to other types of objects, etc. If UMA locks are held at that point, that may cause problems. It could be that for destructors, UMA needs a worker thread iterating on a work list that doesn't require held locks during destruction to avoid locking incidentals. Or at the very least, someone needs to document what locks are held :-). Robert N M Watson FreeBSD Core Team, TrustedBSD Project robert@fledge.watson.org NAI Labs, Safeport Network Services On Fri, 10 May 2002, Jake Burkholder wrote: > Apparently, On Fri, May 10, 2002 at 08:30:49AM -0700, > Jonathan Mini said words to the effect of; > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11120 > > > > Change 11120 by mini@mini_stylus on 2002/05/10 08:30:36 > > > > Give UMA control over thread allocation and caching: > > > > - Use uma init/fini/ctor/dtor functions. > > - Instead of keeping a PCPU list of zombie threads to be > > reaped at earliest convenvience, keep a single "spare" > > thread in the KSE. > > - When abandoning a thread (in thread_exit()), push the > > thread into its KSE's spare thread slot, and free the > > thread that is already there (if any). > > - When performing an upcall, pull the spare thread (if > > available) before allocating a new thread from uma. This > > is especially useful in msleep(), where not blocking again > > is highly preferable. > > - When pulling the KSE spare thread, allocate a new spare > > thread for the KSE before returning to userland for the > > upcall. > > I'm not sure that using the uma callouts for all of this is safe. > > > #endif > > > > - active_threads--; > > - if (cached_threads < thread_cache_size) { > > - TAILQ_INSERT_HEAD(&free_threads, td, td_plist); > > - cached_threads++; /* XXXSMP */ > > - } else { > > - /* free tha pages from the stack object etc. */ > > - allocated_threads--; > > - pmap_dispose_thread(td); > > + mtx_lock_spin(&sched_lock); > > + > > + mtx_unlock_spin(&sched_lock); > > ??? > > > + > > + /* Update counters. */ > > + active_threads--; /* XXXSMP */ > > + cached_threads++; /* XXXSMP */ > > +} > > + > > +/* > > + * Initialize type-stable parts of a thread (when newly created). > > + */ > > +static void > > +thread_init(void *mem, int size) > > +{ > > + struct thread *td; > > + > > + KASSERT((size == sizeof(struct thread)), > > + ("size mismatch: %d != %d\n", size, sizeof(struct thread))); > > + > > + td = (struct thread *)mem; > > + pmap_new_thread(td); > > + cpu_thread_setup(td); > > + cached_threads++; /* XXXSMP */ > > + allocated_threads++; /* XXXSMP */ > > +} > > + > > +/* > > + * Tear down type-stable parts of a thread (just before being discarded). > > + */ > > +static void > > +thread_fini(void *mem, int size) > > +{ > > + struct thread *td; > > + > > + KASSERT((size == sizeof(struct thread)), > > + ("size mismatch: %d != %d\n", size, sizeof(struct thread))); > > + > > + td = (struct thread *)mem; > > + pmap_dispose_thread(td); > > + vm_object_deallocate(td->td_kstack_obj); > > + cached_threads--; /* XXXSMP */ > > + allocated_threads--; /* XXXSMP */ > > +} > > These pmap and vm_object calls might sleep, and are called with the uma > zone locked. > > > + > > +/* > > + * Unlink thread from its process, and reassign its KSE to another thread. > > + */ > > +static void > > +thread_unlink(struct thread *td) > > +{ > > + struct proc *p; > > + struct ksegrp *kg; > > + struct kse *ke; > > + > > + p = td->td_proc; > > + kg = td->td_ksegrp; > > + ke = td->td_kse; > > > > -#if 0 > > - /* Free the object itslef */ > > - /* As zones are type stable this can be skipped for now */ > > - vm_object_deallocate(td->td_kstack_obj); > > - td->td_kstack_obj = NULL; > > -#endif > > + /* Reassign this thread's KSE. */ > > + if (ke != NULL) { > > + ke->ke_thread = NULL; > > + td->td_kse = NULL; > > + ke->ke_state = KES_UNQUEUED; > > + kse_reassign(ke); > > + } > > Almost all of the new code you added looks like its indented 4 spaces, > which should be tabs :) > > > > > - /* put the thread back in the zone */ > > - uma_zfree(thread_zone, td); > > + /* Unlink this thread from its proc. */ > > + if (p != NULL) { > > + TAILQ_REMOVE(&p->p_threads, td, td_plist); > > + if (kg != NULL) > > + TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); > > + p->p_numthreads--; > > + if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { > > + if (p->p_numthreads == > > + ((p->p_flag & P_SINGLE_EXIT) ? 1 : (p->p_suspcount + 1))) { > > + setrunqueue(p->p_singlethread); > > + p->p_singlethread = NULL; > > + } > > + } > > } > > + if (kg != NULL) > > + kg->kg_numthreads--; > > + td->td_state = TDS_SURPLUS; > > + td->td_proc = NULL; > > + td->td_ksegrp = NULL; > > + td->td_last_kse = NULL; > > +} > > + > > +/* > > + * Initialize global thread allocation resources. > > + */ > > +void > > +threadinit(void) > > +{ > > + > > + thread_zone = uma_zcreate("THREAD", sizeof (struct thread), > > + thread_ctor, thread_dtor, thread_init, thread_fini, > > + UMA_ALIGN_CACHE, 0); > > } > > > > -#define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) > > -/* > > - * Try get a new thread from the cache, but if that fails, > > - * create one from the zone as per normal > > +/* > > + * Allocate a thread. > > */ > > struct thread * > > thread_alloc(void) > > { > > - struct thread *td; > > + return (uma_zalloc(thread_zone, M_WAITOK)); > > +} > > > > - thread_reap(); /* recover any partly deallocated threads */ > > - if (cached_threads) { > > - td = TAILQ_FIRST(&free_threads); > > - TAILQ_REMOVE(&free_threads, td, td_plist); > > - cached_threads--; /* XXXSMP */ > > - /* Probably should clean up stuff here */ > > - } else { > > - /* allocate the thread structure itself */ > > - td = uma_zalloc(thread_zone, M_WAITOK); > > - > > - allocated_threads++; > > - pmap_new_thread(td); > > - cpu_thread_setup(td); > > - } > > - /* may need to set some stuff here.. re state? */ > > - /* Make sure the zero'd section is in fact zero'd */ > > - bzero(&td->td_startzero, > > - (unsigned) RANGEOF(struct thread, td_startzero, td_endzero)); > > - td->td_state = TDS_NEW; > > - td->td_flags |= TDF_UNBOUND; > > - active_threads++; > > - return (td); > > +/* > > + * Deallocate a thread. > > + */ > > +void > > +thread_free(struct thread *td) > > +{ > > + uma_zfree(thread_zone, td); > > } > > > > int > > @@ -190,22 +275,36 @@ > > } > > > > > > -/* > > - * Put the half dead thread on a per CPU list of threads that need > > - * to be reaped. > > +/* > > + * Discard the current thread and exit from its context. > > + * > > + * Because we can't free a thread while we're operating under its context, > > + * push the current thread into our KSE's ke_tdspare slot, freeing the > > + * thread that might be there currently. Because we know that only this > > + * processor will run our KSE, we needn't worry about someone else grabbing > > + * our context before we do a cpu_throw. > > */ > > void > > thread_exit(void) > > { > > - struct thread *td = curthread; > > + struct thread *td; > > + struct kse *ke; > > > > + td = curthread; > > + ke = td->td_kse; > > CTR1(KTR_PROC, "thread_exit: thread %p", td); > > KASSERT(!mtx_owned(&Giant), ("dying thread owns giant")); > > - cpu_thread_exit(td); > > - td->td_state = TDS_SURPLUS; > > - td->td_nextzombie = PCPU_GET(freethread); > > - PCPU_SET(freethread, td); > > - thread_unlink(td); /* reassignes kse detach it from it's process etc. */ > > + > > + if (ke->ke_tdspare != NULL) { > > + mtx_unlock_spin(&sched_lock); > > + mtx_lock(&Giant); > > + thread_free(ke->ke_tdspare); > > + mtx_unlock(&Giant); > > + mtx_lock_spin(&sched_lock); > > + } > > + cpu_thread_exit(td); /* XXXSMP */ > > + thread_unlink(td); > > + ke->ke_tdspare = td; > > cpu_throw(); > > } > > > > @@ -232,71 +331,6 @@ > > td->td_kse = NULL; > > } > > > > - > > -void > > -thread_unlink(struct thread *td) > > -{ > > - struct proc *p = td->td_proc; > > - struct ksegrp *kg = td->td_ksegrp; > > - struct kse *ke = td->td_kse; /* may be NULL */ > > - > > - if (ke) { > > - ke->ke_thread = NULL; > > - td->td_kse = NULL; > > - ke->ke_state = KES_UNQUEUED; > > - kse_reassign(ke); > > - } > > - > > - switch(td->td_state) { > > - case TDS_SLP: /* we must never get to unlink a thread */ > > - case TDS_MTX: /* that is in one of these states as to */ > > - case TDS_RUNQ: /* do so might leak all sorts of stuff */ > > - panic ("bad state for thread unlinking"); > > - break; > > - case TDS_UNQUEUED: > > - case TDS_NEW: > > - break; > > - case TDS_RUNNING: > > - break; > > - case TDS_SURPLUS: > > - break; > > - default: > > - panic("bad thread state"); > > - } > > - TAILQ_REMOVE(&p->p_threads, td, td_plist); > > - TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); > > - p->p_numthreads--; > > - if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { > > - if (p->p_numthreads == > > - ((p->p_flag & P_SINGLE_EXIT) ? 1 : (p->p_suspcount + 1))){ > > - setrunqueue(p->p_singlethread); > > - p->p_singlethread = NULL; > > - } > > - } > > - kg->kg_numthreads--; > > - td->td_state = TDS_SURPLUS; > > - td->td_proc = NULL; > > - td->td_ksegrp = NULL; > > - td->td_last_kse = NULL; > > -} > > -/* > > - * reap any zombie threads for this Processor. > > - */ > > -void > > -thread_reap(void) > > -{ > > - struct thread *td_reaped, *td_next; > > - > > - if ((td_reaped = PCPU_GET(freethread))) { > > - PCPU_SET(freethread, NULL); > > - while (td_reaped) { > > - td_next = td_reaped->td_nextzombie; > > - thread_free(td_reaped); > > - td_reaped = td_next; > > - } > > - } > > -} > > - > > /* > > * set up the upcall pcb in either a given thread or a new one > > * if none given. Use the upcall for the given KSE > > @@ -307,18 +341,24 @@ > > { > > struct thread *td2; > > > > - td2 = thread_alloc(); > > - if (td2) { > > - CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", > > - td, td->td_proc->p_pid, td->td_proc->p_comm); > > - thread_link(td2, ke->ke_ksegrp); > > - cpu_set_upcall(td2, ke->ke_pcb); > > - td2->td_ucred = crhold(td->td_ucred); > > - td2->td_kse = NULL; /* back as it was */ > > - td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; > > - td2->td_priority = td->td_priority; > > - setrunqueue(td2); > > + mtx_assert(&sched_lock, MA_OWNED); > > + if (ke->ke_tdspare != NULL) { > > + td2 = ke->ke_tdspare; > > + ke->ke_tdspare = NULL; > > + } else { > > + mtx_unlock_spin(&sched_lock); > > + td2 = thread_alloc(); > > + mtx_lock_spin(&sched_lock); > > } > > + CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", > > + td, td->td_proc->p_pid, td->td_proc->p_comm); > > + thread_link(td2, ke->ke_ksegrp); > > + cpu_set_upcall(td2, ke->ke_pcb); > > + td2->td_ucred = crhold(td->td_ucred); > > + td2->td_kse = NULL; /* back as it was */ > > + td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; > > + td2->td_priority = td->td_priority; > > + setrunqueue(td2); > > return (td2); > > } > > > > > > ==== //depot/projects/kse/sys/kern/subr_pcpu.c#7 (text+ko) ==== > > > > @@ -119,12 +119,6 @@ > > td->td_proc->p_comm); > > else > > db_printf("none\n"); > > - db_printf("freethread = "); > > - td = pc->pc_freethread; > > - if (td != NULL) > > - db_printf("%p: next: %p\n", td, td->td_nextzombie); > > - else > > - db_printf("none\n"); > > db_printf("curpcb = %p\n", pc->pc_curpcb); > > db_printf("fpcurthread = "); > > td = pc->pc_fpcurthread; > > > > ==== //depot/projects/kse/sys/kern/subr_trap.c#53 (text+ko) ==== > > > > @@ -116,9 +116,16 @@ > > * We also need to check to see if we have to exit or wait > > * due to a single threading requirement. > > */ > > - PROC_LOCK(p); > > - thread_suspend_check(0); /* Can suspend or kill */ > > - PROC_UNLOCK(p); > > + if (p->p_flag & P_KSES) { > > + PROC_LOCK(p); > > + thread_suspend_check(0); /* Can suspend or kill */ > > + PROC_UNLOCK(p); > > + if (ke->ke_tdspare == NULL) { > > + mtx_lock(&Giant); > > + ke->ke_tdspare = thread_alloc(); > > + mtx_unlock(&Giant); > > + } > > + } > > if (td->td_flags & TDF_UNBOUND) { > > /* maybe this should be in a separate function */ > > /* > > > > ==== //depot/projects/kse/sys/sys/pcpu.h#11 (text+ko) ==== > > > > @@ -53,7 +53,6 @@ > > struct thread *pc_curthread; /* Current thread */ > > struct thread *pc_idlethread; /* Idle thread */ > > struct thread *pc_fpcurthread; /* Fp state owner */ > > - struct thread *pc_freethread; /* thread we are freeing */ > > struct pcb *pc_curpcb; /* Current pcb */ > > struct bintime pc_switchtime; > > int pc_switchticks; > > > > ==== //depot/projects/kse/sys/sys/proc.h#98 (text+ko) ==== > > > > @@ -270,7 +270,6 @@ > > int td_flags; /* (j) TDF_* flags. */ > > struct kse *td_last_kse; /* Where it wants to be if possible. */ > > struct kse *td_kse; /* Current KSE if running. */ > > - struct thread *td_nextzombie; /* PCPU chain of zombie threads */ > > int td_dupfd; /* (k) Ret value from fdopen. XXX */ > > void *td_wchan; /* (j) Sleep address. */ > > const char *td_wmesg; /* (j) Reason for sleep. */ > > @@ -360,6 +359,7 @@ > > KES_RUNNING > > } ke_state; /* (j) S* process status. */ > > void *ke_mailbox; /* the userland mailbox address */ > > + struct thread *ke_tdspare; /* spare thread for upcalls */ > > #define ke_endzero ke_dummy > > > > #define ke_startcopy ke_endzero > > @@ -797,8 +797,8 @@ > > int cpu_coredump(struct thread *, struct vnode *, struct ucred *); > > > > /* new in KSE */ > > -struct thread *thread_alloc(void); > > -void thread_free(struct thread *td); > > +struct thread *thread_alloc(void); > > +void thread_free(struct thread *td); > > int cpu_export_context(struct thread *td); > > void cpu_free_kse_mdstorage(struct kse *kse); > > void cpu_save_upcall(struct thread *td, struct kse *newkse); > > @@ -814,14 +814,12 @@ > > void thread_exit(void) __dead2; > > int thread_export_context(struct thread *td); > > void thread_link(struct thread *td, struct ksegrp *kg); > > -void thread_reap(void); > > struct thread *thread_schedule_upcall(struct thread *td, struct kse *ke); > > int thread_single(int how); > > #define SNGLE_WAIT 0 /* values for 'how' */ > > #define SNGLE_EXIT 1 > > void thread_single_end(void); > > int thread_suspend_check(int how); > > -void thread_unlink(struct thread *td); > > void thread_unsuspend(struct proc *p); > > > > #endif /* _KERNEL */ > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 10:28: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FBB037B400; Fri, 10 May 2002 10:27:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail16.speakeasy.net [216.254.0.216]) by hub.freebsd.org (Postfix) with ESMTP id 2134B37B410 for ; Fri, 10 May 2002 10:27:12 -0700 (PDT) Received: (qmail 18401 invoked from network); 10 May 2002 17:27:10 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail16.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 10 May 2002 17:27:10 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g4AHR9F43149; Fri, 10 May 2002 13:27:09 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200205101530.g4AFUn510685@freefall.freebsd.org> Date: Fri, 10 May 2002 13:27:00 -0400 (EDT) From: John Baldwin To: Jonathan Mini Subject: RE: PERFORCE change 11120 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 10-May-2002 Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11120 > > Change 11120 by mini@mini_stylus on 2002/05/10 08:30:36 > > Give UMA control over thread allocation and caching: > > - Use uma init/fini/ctor/dtor functions. > - Instead of keeping a PCPU list of zombie threads to be > reaped at earliest convenvience, keep a single "spare" > thread in the KSE. > - When abandoning a thread (in thread_exit()), push the > thread into its KSE's spare thread slot, and free the > thread that is already there (if any). > - When performing an upcall, pull the spare thread (if > available) before allocating a new thread from uma. This > is especially useful in msleep(), where not blocking again > is highly preferable. > - When pulling the KSE spare thread, allocate a new spare > thread for the KSE before returning to userland for the > upcall. Yay! Good stuff baka. Thanks. > +/* > + * Allocate a thread. > */ > struct thread * > thread_alloc(void) > { > - struct thread *td; > + return (uma_zalloc(thread_zone, M_WAITOK)); > +} > > - thread_reap(); /* recover any partly deallocated threads */ > - if (cached_threads) { > - td = TAILQ_FIRST(&free_threads); > - TAILQ_REMOVE(&free_threads, td, td_plist); > - cached_threads--; /* XXXSMP */ > - /* Probably should clean up stuff here */ > - } else { > - /* allocate the thread structure itself */ > - td = uma_zalloc(thread_zone, M_WAITOK); > - > - allocated_threads++; > - pmap_new_thread(td); > - cpu_thread_setup(td); > - } > - /* may need to set some stuff here.. re state? */ > - /* Make sure the zero'd section is in fact zero'd */ > - bzero(&td->td_startzero, > - (unsigned) RANGEOF(struct thread, td_startzero, td_endzero)); > - td->td_state = TDS_NEW; > - td->td_flags |= TDF_UNBOUND; > - active_threads++; > - return (td); > +/* > + * Deallocate a thread. > + */ > +void > +thread_free(struct thread *td) > +{ > + uma_zfree(thread_zone, td); > } > > int > @@ -190,22 +275,36 @@ > } > > > -/* > - * Put the half dead thread on a per CPU list of threads that need > - * to be reaped. > +/* > + * Discard the current thread and exit from its context. > + * > + * Because we can't free a thread while we're operating under its context, > + * push the current thread into our KSE's ke_tdspare slot, freeing the > + * thread that might be there currently. Because we know that only this > + * processor will run our KSE, we needn't worry about someone else grabbing > + * our context before we do a cpu_throw. > */ > void > thread_exit(void) > { > - struct thread *td = curthread; > + struct thread *td; > + struct kse *ke; > > + td = curthread; > + ke = td->td_kse; > CTR1(KTR_PROC, "thread_exit: thread %p", td); > KASSERT(!mtx_owned(&Giant), ("dying thread owns giant")); > - cpu_thread_exit(td); > - td->td_state = TDS_SURPLUS; > - td->td_nextzombie = PCPU_GET(freethread); > - PCPU_SET(freethread, td); > - thread_unlink(td); /* reassignes kse detach it from it's process etc. */ > + > + if (ke->ke_tdspare != NULL) { > + mtx_unlock_spin(&sched_lock); > + mtx_lock(&Giant); > + thread_free(ke->ke_tdspare); > + mtx_unlock(&Giant); > + mtx_lock_spin(&sched_lock); > + } > + cpu_thread_exit(td); /* XXXSMP */ > + thread_unlink(td); > + ke->ke_tdspare = td; > cpu_throw(); > } > > @@ -232,71 +331,6 @@ > td->td_kse = NULL; > } > > - > -void > -thread_unlink(struct thread *td) > -{ > - struct proc *p = td->td_proc; > - struct ksegrp *kg = td->td_ksegrp; > - struct kse *ke = td->td_kse; /* may be NULL */ > - > - if (ke) { > - ke->ke_thread = NULL; > - td->td_kse = NULL; > - ke->ke_state = KES_UNQUEUED; > - kse_reassign(ke); > - } > - > - switch(td->td_state) { > - case TDS_SLP: /* we must never get to unlink a thread */ > - case TDS_MTX: /* that is in one of these states as to */ > - case TDS_RUNQ: /* do so might leak all sorts of stuff */ > - panic ("bad state for thread unlinking"); > - break; > - case TDS_UNQUEUED: > - case TDS_NEW: > - break; > - case TDS_RUNNING: > - break; > - case TDS_SURPLUS: > - break; > - default: > - panic("bad thread state"); > - } > - TAILQ_REMOVE(&p->p_threads, td, td_plist); > - TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); > - p->p_numthreads--; > - if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { > - if (p->p_numthreads == > - ((p->p_flag & P_SINGLE_EXIT) ? 1 : (p->p_suspcount + 1))){ > - setrunqueue(p->p_singlethread); > - p->p_singlethread = NULL; > - } > - } > - kg->kg_numthreads--; > - td->td_state = TDS_SURPLUS; > - td->td_proc = NULL; > - td->td_ksegrp = NULL; > - td->td_last_kse = NULL; > -} > -/* > - * reap any zombie threads for this Processor. > - */ > -void > -thread_reap(void) > -{ > - struct thread *td_reaped, *td_next; > - > - if ((td_reaped = PCPU_GET(freethread))) { > - PCPU_SET(freethread, NULL); > - while (td_reaped) { > - td_next = td_reaped->td_nextzombie; > - thread_free(td_reaped); > - td_reaped = td_next; > - } > - } > -} > - > /* > * set up the upcall pcb in either a given thread or a new one > * if none given. Use the upcall for the given KSE > @@ -307,18 +341,24 @@ > { > struct thread *td2; > > - td2 = thread_alloc(); > - if (td2) { > - CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", > - td, td->td_proc->p_pid, td->td_proc->p_comm); > - thread_link(td2, ke->ke_ksegrp); > - cpu_set_upcall(td2, ke->ke_pcb); > - td2->td_ucred = crhold(td->td_ucred); > - td2->td_kse = NULL; /* back as it was */ > - td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; > - td2->td_priority = td->td_priority; > - setrunqueue(td2); > + mtx_assert(&sched_lock, MA_OWNED); > + if (ke->ke_tdspare != NULL) { > + td2 = ke->ke_tdspare; > + ke->ke_tdspare = NULL; > + } else { > + mtx_unlock_spin(&sched_lock); > + td2 = thread_alloc(); > + mtx_lock_spin(&sched_lock); > } > + CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", > + td, td->td_proc->p_pid, td->td_proc->p_comm); > + thread_link(td2, ke->ke_ksegrp); > + cpu_set_upcall(td2, ke->ke_pcb); > + td2->td_ucred = crhold(td->td_ucred); > + td2->td_kse = NULL; /* back as it was */ > + td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; > + td2->td_priority = td->td_priority; > + setrunqueue(td2); > return (td2); > } > > > ==== //depot/projects/kse/sys/kern/subr_pcpu.c#7 (text+ko) ==== > > @@ -119,12 +119,6 @@ > td->td_proc->p_comm); > else > db_printf("none\n"); > - db_printf("freethread = "); > - td = pc->pc_freethread; > - if (td != NULL) > - db_printf("%p: next: %p\n", td, td->td_nextzombie); > - else > - db_printf("none\n"); > db_printf("curpcb = %p\n", pc->pc_curpcb); > db_printf("fpcurthread = "); > td = pc->pc_fpcurthread; > > ==== //depot/projects/kse/sys/kern/subr_trap.c#53 (text+ko) ==== > > @@ -116,9 +116,16 @@ > * We also need to check to see if we have to exit or wait > * due to a single threading requirement. > */ > - PROC_LOCK(p); > - thread_suspend_check(0); /* Can suspend or kill */ > - PROC_UNLOCK(p); > + if (p->p_flag & P_KSES) { > + PROC_LOCK(p); > + thread_suspend_check(0); /* Can suspend or kill */ > + PROC_UNLOCK(p); > + if (ke->ke_tdspare == NULL) { > + mtx_lock(&Giant); > + ke->ke_tdspare = thread_alloc(); > + mtx_unlock(&Giant); > + } > + } > if (td->td_flags & TDF_UNBOUND) { > /* maybe this should be in a separate function */ > /* > > ==== //depot/projects/kse/sys/sys/pcpu.h#11 (text+ko) ==== > > @@ -53,7 +53,6 @@ > struct thread *pc_curthread; /* Current thread */ > struct thread *pc_idlethread; /* Idle thread */ > struct thread *pc_fpcurthread; /* Fp state owner */ > - struct thread *pc_freethread; /* thread we are freeing */ > struct pcb *pc_curpcb; /* Current pcb */ > struct bintime pc_switchtime; > int pc_switchticks; > > ==== //depot/projects/kse/sys/sys/proc.h#98 (text+ko) ==== > > @@ -270,7 +270,6 @@ > int td_flags; /* (j) TDF_* flags. */ > struct kse *td_last_kse; /* Where it wants to be if possible. */ > struct kse *td_kse; /* Current KSE if running. */ > - struct thread *td_nextzombie; /* PCPU chain of zombie threads */ > int td_dupfd; /* (k) Ret value from fdopen. XXX */ > void *td_wchan; /* (j) Sleep address. */ > const char *td_wmesg; /* (j) Reason for sleep. */ > @@ -360,6 +359,7 @@ > KES_RUNNING > } ke_state; /* (j) S* process status. */ > void *ke_mailbox; /* the userland mailbox address */ > + struct thread *ke_tdspare; /* spare thread for upcalls */ > #define ke_endzero ke_dummy > > #define ke_startcopy ke_endzero > @@ -797,8 +797,8 @@ > int cpu_coredump(struct thread *, struct vnode *, struct ucred *); > > /* new in KSE */ > -struct thread *thread_alloc(void); > -void thread_free(struct thread *td); > +struct thread *thread_alloc(void); > +void thread_free(struct thread *td); > int cpu_export_context(struct thread *td); > void cpu_free_kse_mdstorage(struct kse *kse); > void cpu_save_upcall(struct thread *td, struct kse *newkse); > @@ -814,14 +814,12 @@ > void thread_exit(void) __dead2; > int thread_export_context(struct thread *td); > void thread_link(struct thread *td, struct ksegrp *kg); > -void thread_reap(void); > struct thread *thread_schedule_upcall(struct thread *td, struct kse *ke); > int thread_single(int how); > #define SNGLE_WAIT 0 /* values for 'how' */ > #define SNGLE_EXIT 1 > void thread_single_end(void); > int thread_suspend_check(int how); > -void thread_unlink(struct thread *td); > void thread_unsuspend(struct proc *p); > > #endif /* _KERNEL */ -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 12:36:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21B0937B403; Fri, 10 May 2002 12:36:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 20CC637B401 for ; Fri, 10 May 2002 12:36:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AJa9l94358 for perforce@freebsd.org; Fri, 10 May 2002 12:36:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 10 May 2002 12:36:09 -0700 (PDT) Message-Id: <200205101936.g4AJa9l94358@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11133 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11133 Change 11133 by rwatson@rwatson_curry on 2002/05/10 12:35:16 - Update the list of options to reflect recent changes to modules - Mention SEBSD, and that it will become a module sometime - Talk about loader.conf to load modules - Update the list of known broken options - Remove the proc0/proc1 issue from the issues list, we fixed it Affected files ... ... //depot/projects/trustedbsd/mac/MACREADME#16 edit Differences ... ==== //depot/projects/trustedbsd/mac/MACREADME#16 (text+ko) ==== @@ -7,10 +7,6 @@ Add the following to your kernel configuration: options MAC -options MAC_BIBA # Biba support -options MAC_MLS # MLS support -options MAC_TE # TE support -options MAC_BSDEXTENDED # BSD/extended MAC policy support Rebuild and reinstall world and kernel. Make sure that login.conf is in sync with that provided in the MAC repository, and that login.conf.db @@ -21,16 +17,40 @@ integrating MAC into the VFS name lookup code. These warnings will be resolved prior to 5.0-RELEASE. +There are a variety of MAC modules installed in /boot/kernel following +an installkernel. Some must be loaded prior to boot in the loader; +others may be loaded when needed before or after the boot. The +following loader.conf lines are currently relevant: + +babyaudit_load="NO" # Baby auditing module +mac_biba_load="NO" # Biba MAC policy (boot only) +mac_bsdextended_load="NO" # BSD/extended MAC policy +mac_ifoff="NO" # Interface silencing policy +mac_mls_load="NO" # MLS MAC policy (boot only) +mac_none_load="NO" # Null MAC policy +mac_seeotheruids_load="NO" # UID visbility MAC policy +mac_te_load="NO" # Type Enforcement policy (boot only) + +To include support for SEBSD, a port of the NSA FLASK and SELinux TE +implementations, add the following kernel option: + +options SEBSD + +This will be available as a module also in due course. + Kernel options known not to work with MAC ----------------------------------------- -options INET6 -options IPSEC -options NCP -options NETATM -options NETGRAPH -options NETSMB -options NFSSERVER +options INET6 # Mostly works +options IPSEC # Sort of works +options NCP # Might work +options NETATALK # Might work +options NETATM # Also might work +options NETGRAPH # Probably doesn't work +options NETSMB # Could well work +options NFSSERVER # Probably doesn't work +options NWFS # Probably doesn't work +options SMPFS # Probably doesn't work Using those options may result in incorrect security behavior, memory corruption, or a kernel panic. They do not work with MAC at this time. @@ -100,7 +120,4 @@ Things that look like they should work but don't ------------------------------------------------ -mac_create_proc0() has no effect, as it uses the same credentials as -mac_create_proc1(), which is called after mac_create_proc0(). To fix -this, those credentials must be divorced prior to running -mac_create_proc1(). +Nothing on this list right now. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 12:59:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CC8337B405; Fri, 10 May 2002 12:59:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from finntroll.newgold.net (durham-ar1-4-64-252-019.durham.dsl-verizon.net [4.64.252.19]) by hub.freebsd.org (Postfix) with SMTP id 5F80A37B407 for ; Fri, 10 May 2002 12:59:07 -0700 (PDT) Received: (qmail 11146 invoked by uid 1001); 10 May 2002 19:59:15 -0000 Date: Fri, 10 May 2002 19:59:14 +0000 From: "J. Mallett" To: Robert Watson Cc: Jake Burkholder , Jonathan Mini , Perforce Change Reviews Subject: Re: PERFORCE change 11120 for review Message-ID: <20020510195914.GD20619@FreeBSD.ORG> References: <20020510123716.D2566@locore.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.27i Organisation: The FreeBSD Project Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, May 10, 2002 at 01:15:20PM -0400, Robert Watson wrote: > I actually also was curious about the locking environment UMA provides > when initializing and destroying memory slabs... A lot of "common" > cleanup will involve locking -- removing things from chains, freeing > allocated references to other types of objects, etc. If UMA locks are > held at that point, that may cause problems. It could be that for > destructors, UMA needs a worker thread iterating on a work list that > doesn't require held locks during destruction to avoid locking > incidentals. Or at the very least, someone needs to document what locks > are held :-). Is there any reason to not atomic-set a "dead" flag and have a thread cleanup those allocations? -- jmallett@FreeBSD.org | C, MIPS, POSIX, UNIX, BSD, IRC Geek. http://www.FreeBSD.org | The Power to Serve "I've never tried to give my life meaning by demeaning you." To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 13:14:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C1C337B40D; Fri, 10 May 2002 13:14:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 637A737B406 for ; Fri, 10 May 2002 13:13:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AKDuS00851 for perforce@freebsd.org; Fri, 10 May 2002 13:13:56 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 10 May 2002 13:13:56 -0700 (PDT) Message-Id: <200205102013.g4AKDuS00851@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11135 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11135 Change 11135 by peter@peter_overcee on 2002/05/10 13:13:22 IFC @11134 Affected files ... ... //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/Makefile#13 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile.tgt#5 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#9 integrate ... //depot/projects/ia64/lib/libc/stdlib/malloc.c#10 integrate ... //depot/projects/ia64/sys/alpha/pci/irongate_pci.c#3 integrate ... //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#9 integrate ... //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#5 integrate ... //depot/projects/ia64/sys/isa/fd.c#5 integrate ... //depot/projects/ia64/sys/isa/fdreg.h#3 integrate ... //depot/projects/ia64/sys/net/if_spppsubr.c#5 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#10 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#10 integrate ... //depot/projects/ia64/sys/sys/proc.h#16 integrate ... //depot/projects/ia64/usr.bin/xargs/Makefile#3 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.c#12 integrate Differences ... ==== //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#2 (text+ko) ==== @@ -18,6 +18,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.2 2002/05/10 19:05:07 obrien Exp $ */ + /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify their commonalities. @@ -48,6 +50,10 @@ || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") \ || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker")) + +#ifndef FREEBSD_NATIVE /* these bits are here to reduce merge diffs, but I don't want to acutally use the bits right now */ + + #if FBSD_MAJOR == 6 #define FBSD_CPP_PREDEFINES \ "-D__FreeBSD__=6 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" @@ -73,11 +79,24 @@ "-D__FreeBSD__ -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" #endif + +#else /* FREEBSD_NATIVE */ +/* Place spaces around this string. We depend on string splicing to produce + the final CPP_PREDEFINES value. */ + +#define FBSD_CPP_PREDEFINES \ + "-D__FreeBSD__=5 -D__FreeBSD_cc_version=500003 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" +#endif /* ! FREEBSD_NATIVE */ + + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC option `-posix', and PIC issues. */ #define FBSD_CPP_SPEC " \ %(cpp_cpu) \ + %{!maout: -D__ELF__} \ + %{munderscores: -D__UNDERSCORES__} \ + %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ %{posix:-D_POSIX_SOURCE}" @@ -129,7 +148,8 @@ %{pg: -lc_p} \ }" #else -#if FBSD_MAJOR >= 5 +#include +#if __FreeBSD_version >= 500016 #define FBSD_LIB_SPEC " \ %{!shared: \ %{!pg: %{pthread:-lc_r} -lc} \ ==== //depot/projects/ia64/gnu/usr.bin/Makefile#13 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.64 2002/05/10 00:50:43 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.65 2002/05/10 17:30:42 obrien Exp $ -SUBDIR= awk bc binutils cpio dc dialog diff diff3 \ +SUBDIR= awk bc binutils cc cpio dc dialog diff diff3 \ grep gzip man patch ptx rcs sdiff send-pr sort tar texinfo .if ${CXX:T} != "c++" @@ -17,10 +17,6 @@ .endif .endif -.if ${MACHINE_ARCH} != "sparc64" -SUBDIR+=cc -.endif - .if !defined(NOPERL) && !defined(NO_PERL) && exists(${.CURDIR}/perl) SUBDIR+=perl .endif ==== //depot/projects/ia64/gnu/usr.bin/cc/Makefile.tgt#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.3 2002/05/10 08:54:43 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.4 2002/05/10 17:23:04 obrien Exp $ TARGET_ARCH?= ${MACHINE_ARCH} ==== //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.59 2002/05/10 10:21:19 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.60 2002/05/10 17:42:19 obrien Exp $ # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk ==== //depot/projects/ia64/lib/libc/stdlib/malloc.c#10 (text+ko) ==== @@ -9,7 +9,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.68 2002/04/24 16:49:36 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.69 2002/05/10 12:50:59 peter Exp $"); /* * Defining EXTRA_SANITY will enable extra checks which are related ==== //depot/projects/ia64/sys/alpha/pci/irongate_pci.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/pci/irongate_pci.c,v 1.7 2002/02/28 18:18:41 gallatin Exp $ + * $FreeBSD: src/sys/alpha/pci/irongate_pci.c,v 1.8 2002/05/10 16:56:14 gallatin Exp $ */ #include @@ -132,7 +132,7 @@ irongate_check_abort(); \ return ~0; \ } \ - data = ##op##(va); \ + data = op(va); \ if (irongate_check_abort()) \ return ~0; \ return data; \ @@ -144,7 +144,7 @@ irongate_clear_abort(); \ if (badaddr((caddr_t)va, width)) \ return; \ - ##op##(va, data); \ + op(va, data); \ irongate_check_abort(); \ } while (0) ==== //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.38 2002/04/29 20:00:39 rwatson Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.39 2002/05/10 15:41:14 mux Exp $ */ /* @@ -276,7 +276,7 @@ *vpp = NULLVP; - if (nameiop == RENAME) + if ((flags & ISLASTCN) && nameiop == RENAME) return (EOPNOTSUPP); if (dvp->v_type != VDIR) @@ -290,7 +290,7 @@ return (error); if (cnp->cn_namelen == 1 && *pname == '.') { - if (nameiop != LOOKUP) + if ((flags & ISLASTCN) && nameiop != LOOKUP) return (EINVAL); *vpp = dvp; VREF(dvp); @@ -298,7 +298,7 @@ } if (flags & ISDOTDOT) { - if (nameiop != LOOKUP) + if ((flags & ISLASTCN) && nameiop != LOOKUP) return (EINVAL); VOP_UNLOCK(dvp, 0, td); de = TAILQ_FIRST(&dd->de_dlist); /* "." */ ==== //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ * * $Id$ * - * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.7 2002/04/28 11:47:10 gj Exp $ + * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.8 2002/05/10 12:04:04 gj Exp $ * * *---------------------------------------------------------------------------*/ @@ -953,8 +953,8 @@ bus_space_handle_t bhandle = rman_get_bushandle(sc->sc_resources.io_base[0]); bus_space_tag_t btag = rman_get_bustag(sc->sc_resources.io_base[0]); - /* could be wrong */ - bus_space_write_1(btag, bhandle, STAT0_OFFSET, 0x07); + /* could be still be wrong, but seems to prevent hangs */ + bus_space_write_1(btag, bhandle, STAT0_OFFSET, 0x00); } static void ==== //depot/projects/ia64/sys/isa/fd.c#5 (text+ko) ==== @@ -50,7 +50,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $FreeBSD: src/sys/isa/fd.c,v 1.228 2002/04/02 18:29:43 joerg Exp $ + * $FreeBSD: src/sys/isa/fd.c,v 1.229 2002/05/10 17:56:39 joerg Exp $ */ #include "opt_fdc.h" @@ -563,13 +563,15 @@ return fdc_err(fdc, "Enable FIFO failed\n"); /* If command is invalid, return */ - j = 100000; + j = FDSTS_TIMEOUT; while ((i = fdsts_rd(fdc) & (NE7_DIO | NE7_RQM)) - != NE7_RQM && j-- > 0) + != NE7_RQM && j-- > 0) { if (i == (NE7_DIO | NE7_RQM)) { fdc_reset(fdc); return FD_FAILED; } + DELAY(1); + } if (j<0 || fd_cmd(fdc, 3, 0, (fifo_threshold - 1) & 0xf, 0, 0) < 0) { @@ -1473,11 +1475,13 @@ static int fd_in(struct fdc_data *fdc, int *ptr) { - int i, j = 100000; + int i, j = FDSTS_TIMEOUT; while ((i = fdsts_rd(fdc) & (NE7_DIO|NE7_RQM)) - != (NE7_DIO|NE7_RQM) && j-- > 0) + != (NE7_DIO|NE7_RQM) && j-- > 0) { if (i == NE7_RQM) return fdc_err(fdc, "ready for output in input\n"); + DELAY(1); + } if (j <= 0) return fdc_err(fdc, bootverbose? "input ready timeout\n": 0); #ifdef FDC_DEBUG @@ -1499,13 +1503,15 @@ int i; /* Check that the direction bit is set */ - i = 100000; - while ((fdsts_rd(fdc) & NE7_DIO) && i-- > 0); + i = FDSTS_TIMEOUT; + while ((fdsts_rd(fdc) & NE7_DIO) && i-- > 0) + DELAY(1); if (i <= 0) return fdc_err(fdc, "direction bit not set\n"); /* Check that the floppy controller is ready for a command */ - i = 100000; - while ((fdsts_rd(fdc) & NE7_RQM) == 0 && i-- > 0); + i = FDSTS_TIMEOUT; + while ((fdsts_rd(fdc) & NE7_RQM) == 0 && i-- > 0) + DELAY(1); if (i <= 0) return fdc_err(fdc, bootverbose? "output ready timeout\n": 0); ==== //depot/projects/ia64/sys/isa/fdreg.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)fdreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/isa/fdreg.h,v 1.15 2001/12/15 19:07:58 joerg Exp $ + * $FreeBSD: src/sys/isa/fdreg.h,v 1.16 2002/05/10 17:56:39 joerg Exp $ */ /* @@ -69,3 +69,15 @@ #define FDI_DCHG 0x80 /* diskette has been changed */ /* requires drive and motor being selected */ /* is cleared by any step pulse to drive */ + +/* + * Timeout value for the PIO loops to wait until the FDC main status + * register matches our expextations (request for master, direction + * bit). This is the number of cycles to loop while waiting, with a + * 1-microsecond (in theory) DELAY() in each cycle. In particular on + * slower hardware, it could take a fair amount more to execute. Of + * course, as soon as the FDC main status register indicates the correct + * bits are set, the loop will terminate, so this is merely a safety + * measure to avoid looping forever in case of broken hardware. + */ +#define FDSTS_TIMEOUT 200 ==== //depot/projects/ia64/sys/net/if_spppsubr.c#5 (text+ko) ==== @@ -17,7 +17,7 @@ * * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997 * - * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.93 2002/05/01 04:18:36 obrien Exp $ + * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.94 2002/05/10 12:48:09 joerg Exp $ */ #include @@ -5145,8 +5145,8 @@ sp->confflags |= CONF_ENABLE_IPV6; else sp->confflags &= ~CONF_ENABLE_IPV6; +#endif break; -#endif default: rv = EINVAL; ==== //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#10 (text+ko) ==== @@ -56,7 +56,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.28 2002/04/09 11:18:46 phk Exp $"; + "$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.29 2002/05/10 14:19:44 benno Exp $"; #endif /* not lint */ #include "opt_ddb.h" @@ -349,6 +349,7 @@ bcopy(&decrint, (void *)EXC_DECR, (size_t)&decrsize); bcopy(&dsitrap, (void *)EXC_DSI, (size_t)&dsisize); bcopy(&isitrap, (void *)EXC_ISI, (size_t)&isisize); + bcopy(&trapcode, (void *)EXC_SC, (size_t)&trapsize); /* * Start initializing proc0 and thread0. ==== //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#10 (text+ko) ==== @@ -92,7 +92,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.34 2002/05/10 06:27:08 benno Exp $"; + "$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.35 2002/05/10 14:21:48 benno Exp $"; #endif /* not lint */ /* @@ -774,14 +774,28 @@ vm_offset_t pmap_addr_hint(vm_object_t object, vm_offset_t va, vm_size_t size) { - TODO; - return (0); + + return (va); } void -pmap_change_wiring(pmap_t pmap, vm_offset_t va, boolean_t wired) +pmap_change_wiring(pmap_t pm, vm_offset_t va, boolean_t wired) { - TODO; + struct pvo_entry *pvo; + + pvo = pmap_pvo_find_va(pm, va & ~ADDR_POFF, NULL); + + if (pvo != NULL) { + if (wired) { + if ((pvo->pvo_vaddr & PVO_WIRED) == 0) + pm->pm_stats.wired_count++; + pvo->pvo_vaddr |= PVO_WIRED; + } else { + if ((pvo->pvo_vaddr & PVO_WIRED) != 0) + pm->pm_stats.wired_count--; + pvo->pvo_vaddr &= ~PVO_WIRED; + } + } } void @@ -934,9 +948,16 @@ } vm_offset_t -pmap_extract(pmap_t pmap, vm_offset_t va) +pmap_extract(pmap_t pm, vm_offset_t va) { - TODO; + struct pvo_entry *pvo; + + pvo = pmap_pvo_find_va(pm, va & ~ADDR_POFF, NULL); + + if (pvo != NULL) { + return ((pvo->pvo_pte.pte_lo & PTE_RPGN) | (va & ADDR_POFF)); + } + return (0); } @@ -975,8 +996,11 @@ boolean_t pmap_is_modified(vm_page_t m) { - TODO; - return (0); + + if (m->flags & PG_FICTITIOUS) + return (FALSE); + + return (pmap_query_bit(m, PTE_CHG)); } void ==== //depot/projects/ia64/sys/sys/proc.h#16 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.219 2002/05/09 04:13:41 mini Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.220 2002/05/10 14:28:05 jhb Exp $ */ #ifndef _SYS_PROC_H_ @@ -451,7 +451,7 @@ u_short p_acflag; /* (c) Accounting flags. */ struct rusage *p_ru; /* (a) Exit information. XXX */ struct proc *p_peers; /* (c) */ - struct proc *p_leader; /* (c) */ + struct proc *p_leader; /* (b) */ void *p_emuldata; /* (c) Emulator state data. */ }; ==== //depot/projects/ia64/usr.bin/xargs/Makefile#3 (text+ko) ==== @@ -1,8 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $FreeBSD: src/usr.bin/xargs/Makefile,v 1.3 2002/04/19 23:46:45 jmallett Exp $ +# $FreeBSD: src/usr.bin/xargs/Makefile,v 1.4 2002/05/10 13:06:34 ru Exp $ PROG= xargs SRCS= xargs.c strnsubst.c WARNS?= 4 +.if defined(BOOTSTRAPPING) +CFLAGS+=-DBOOTSTRAPPING +.endif + .include ==== //depot/projects/ia64/usr.bin/xargs/xargs.c#12 (text+ko) ==== @@ -49,14 +49,16 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/xargs/xargs.c,v 1.34 2002/05/06 03:38:28 jmallett Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/xargs/xargs.c,v 1.35 2002/05/10 13:06:34 ru Exp $"); #include #include #include #include +#ifndef BOOTSTRAPPING #include +#endif #include #include #include @@ -536,7 +538,13 @@ (void)fprintf(stderr, "?..."); (void)fflush(stderr); if ((response = fgetln(ttyfp, &rsize)) == NULL || - regcomp(&cre, nl_langinfo(YESEXPR), REG_BASIC) != 0) { + regcomp(&cre, +#ifdef BOOTSTRAPPING + "^[yY]", +#else + nl_langinfo(YESEXPR), +#endif + REG_BASIC) != 0) { (void)fclose(ttyfp); return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 13:24:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D2B337B400; Fri, 10 May 2002 13:24:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from smtp.enternet.hu (smtp.enternet.hu [62.112.192.21]) by hub.freebsd.org (Postfix) with ESMTP id D346B37B406; Fri, 10 May 2002 13:24:01 -0700 (PDT) Received: from elischer.org (3e70d297.dialin.enternet.hu [62.112.210.151]) by smtp.enternet.hu (8.11.6/8.11.6) with ESMTP id g4AKLwr59571; Fri, 10 May 2002 22:21:58 +0200 (CEST) (envelope-from julian@elischer.org) Message-ID: <3CDC2BB5.366A7BF0@elischer.org> Date: Fri, 10 May 2002 13:21:09 -0700 From: Julian Elischer X-Mailer: Mozilla 4.7 [en] (X11; U; FreeBSD 5.0-CURRENT i386) X-Accept-Language: en, hu MIME-Version: 1.0 To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11120 for review References: <200205101530.g4AFUn510685@freefall.freebsd.org> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jonathan Mini wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11120 > > Change 11120 by mini@mini_stylus on 2002/05/10 08:30:36 > > Give UMA control over thread allocation and caching: > > - Use uma init/fini/ctor/dtor functions. good > - Instead of keeping a PCPU list of zombie threads to be > reaped at earliest convenvience, keep a single "spare" > thread in the KSE. clever.. not sure it isn't too clever.. but looks good. > - When abandoning a thread (in thread_exit()), push the > thread into its KSE's spare thread slot, and free the > thread that is already there (if any). I assume there will only be a spare thread at other times in KSE type processes. > - When performing an upcall, pull the spare thread (if > available) before allocating a new thread from uma. This > is especially useful in msleep(), where not blocking again > is highly preferable. > - When pulling the KSE spare thread, allocate a new spare > thread for the KSE before returning to userland for the > upcall. I presume only for KSE mode processes. i.e. for KSE mode processes there is always a spare thread available unless we have just used it and have not yet returned to userland. I can see some holes may need patching but should work.. > > + /* Reassign this thread's KSE. */ > + if (ke != NULL) { > + ke->ke_thread = NULL; WHOA! just because ke == td->td_kse doesn't mean that ke->ke_thread == td UNLESS you can guarantee that thread unlink is always run with td == curthread or td->td_state == TDS_RUNNING. > + td->td_kse = NULL; > + ke->ke_state = KES_UNQUEUED; > + kse_reassign(ke); > + } > > - /* put the thread back in the zone */ > - uma_zfree(thread_zone, td); > + /* Unlink this thread from its proc. */ > + if (p != NULL) { > + TAILQ_REMOVE(&p->p_threads, td, td_plist); > + if (kg != NULL) > + TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); > + p->p_numthreads--; what of the kg->kg_numthreads.. > + if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { > + if (p->p_numthreads == > + ((p->p_flag & P_SINGLE_EXIT) ? 1 : (p->p_suspcount + 1))) { > + setrunqueue(p->p_singlethread); > + p->p_singlethread = NULL; > + } > + } > } > + if (kg != NULL) > + kg->kg_numthreads--; move this up? > + td->td_state = TDS_SURPLUS; > + td->td_proc = NULL; > + td->td_ksegrp = NULL; > + td->td_last_kse = NULL; > +} > + > +/* > + * Initialize global thread allocation resources. > + */ > +void > +threadinit(void) > +{ > + > + thread_zone = uma_zcreate("THREAD", sizeof (struct thread), > + thread_ctor, thread_dtor, thread_init, thread_fini, > + UMA_ALIGN_CACHE, 0); > } > plus other comments already noted by others.. (tabbing and sleeping with locks) -- +------------------------------------+ ______ _ __ | __--_|\ Julian Elischer | \ U \/ / hard at work in | / \ julian@elischer.org +------>x USA \ a very strange | ( OZ ) \___ ___ | country ! +- X_.---._/ presently in San Francisco \_/ \\ v To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 15:49:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5F9137B409; Fri, 10 May 2002 15:49:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1B89837B407 for ; Fri, 10 May 2002 15:49:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4AMn7b19649 for perforce@freebsd.org; Fri, 10 May 2002 15:49:07 -0700 (PDT) (envelope-from amigus@tislabs.com) Date: Fri, 10 May 2002 15:49:07 -0700 (PDT) Message-Id: <200205102249.g4AMn7b19649@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@tislabs.com using -f From: Adam Migus Subject: PERFORCE change 11139 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11139 Change 11139 by amigus@amigus_vmganyopa on 2002/05/10 15:48:53 Implemented setsockopt(), SO_LABEL and SO_PEERLABEL (SOL_SOCKET). Note that it now returns EPERM if suser_cred() fails. Once I figure out where else EPERM gets returned I'll update the [gs]etsockopt() man page to reflect that. Also fixed a white space bug in socket.h. I will also remove the now redunant __mac_get_peer() syscall. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#20 edit ... //depot/projects/trustedbsd/mac/sys/sys/socket.h#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#20 (text+ko) ==== @@ -1154,6 +1154,9 @@ struct linger l; struct timeval tv; u_long val; +#ifdef MAC + struct mac label, *labelp; +#endif /* MAC */ error = 0; if (sopt->sopt_level != SOL_SOCKET) { @@ -1277,6 +1280,29 @@ break; } break; +#ifdef MAC + case SO_LABEL: + case SO_PEERLABEL: + if(sopt->sopt_td != NULL) + error = suser_cred(sopt->sopt_td->td_ucred, 0); + if(error) + goto bad; + + error = sooptcopyin(sopt, &label, sizeof label, + sizeof label); + if (error) + goto bad; + + error = mac_validate_label(&label); + if (error) + goto bad; + + labelp = (sopt->sopt_name == SO_LABEL ? + &so->so_label : &so->so_peerlabel); + bcopy(&label, labelp, sizeof label); + + break; +#endif /* MAC */ default: error = ENOPROTOOPT; break; ==== //depot/projects/trustedbsd/mac/sys/sys/socket.h#6 (text+ko) ==== @@ -96,8 +96,8 @@ #define SO_ERROR 0x1007 /* get error status and clear */ #define SO_TYPE 0x1008 /* get socket type */ /*efine SO_PRIVSTATE 0x1009 get/deny privileged state */ -#define SO_LABEL 0x1010 /* sockets MAC label */ -#define SO_PEERLABEL 0x1011 /* sockets peer MAC label */ +#define SO_LABEL 0x1010 /* sockets MAC label */ +#define SO_PEERLABEL 0x1011 /* sockets peer MAC label */ /* * Structure used for manipulating linger option. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 19:12:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5EDD37B40A; Fri, 10 May 2002 19:11:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F1E0937B405 for ; Fri, 10 May 2002 19:11:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4B2BCS53330 for perforce@freebsd.org; Fri, 10 May 2002 19:11:12 -0700 (PDT) (envelope-from chris@freebsd.org) Date: Fri, 10 May 2002 19:11:12 -0700 (PDT) Message-Id: <200205110211.g4B2BCS53330@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 11143 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11143 Change 11143 by chris@chris_holly on 2002/05/10 19:10:51 Integrate. This is where we'll keep the doc changes that really cannot be committed to the main FreeBSD repo on account of their documenting software/features that in some cases may not exist yet. Affected files ... ... //depot/projects/trustedbsd/doc/Makefile#1 branch ... //depot/projects/trustedbsd/doc/README#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/Makefile#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/Makefile#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/Makefile.inc#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/faq/Makefile#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/faq/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/Makefile#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/backups/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/sound/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/1.png#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/10.png#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/2.png#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/3.png#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/4.png#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/5.png#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/6.png#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/7.png#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/8.png#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/images/callouts/9.png#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/catalog#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/teams.ent#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/translators.ent#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/Makefile#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/Makefile#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/Makefile.inc#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/new-users/Makefile#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/share/sgml/catalog#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#1 branch ... //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/Makefile.inc#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/console-server/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/console-server/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/console-server/itgastyle.css#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/console-server/tk0231-9-1.png#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributing/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributing/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/euro/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/euro/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/fonts/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/fonts/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hubs/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hubs/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/java-tomcat/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/java-tomcat/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/laptop/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/laptop/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/mh/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/mh/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/multi-os/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/new-users/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/new-users/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/su.c#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/programming-tools/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/programming-tools/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pxe/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pxe/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/branches.ascii#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/branches.pic#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/extra.css#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/solid-state/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/ad0b4aft.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/ad2b4aft.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/arch.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vm-design/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vm-design/fig1.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vm-design/fig2.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vm-design/fig3.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vm-design/fig4.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/Makefile.inc#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/bibliography/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/bibliography/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/08-01.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/08-02.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/08-03.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/08-04.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/08-05.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/08-06.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/design-44bsd/fig1.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/design-44bsd/fig2.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/isa/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/jail/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/kobj/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/locking/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/pci/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/layers.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/sain.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/sainfill.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/sainlsb.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/sainmsb.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/sainserv.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/serv.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/serv2.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sockets/slayers.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sound/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/sysinit/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/usb/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/vm/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/natd.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/appendix.decl#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/backups/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/backups/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/chapter.decl#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/chapters.ent#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/contrib/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/adduser1.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/adduser2.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/adduser3.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/boot-mgr.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/console-saver1.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/console-saver2.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/console-saver3.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/console-saver4.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/desktop.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.eps#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-auto.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-ed1.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-ed2.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-fs.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-root1.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-root2.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-root3.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/dist-set.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/dist-set2.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/docmenu1.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/ed0-conf.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/ed0-conf2.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/edit-inetd-conf.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/fdisk-drive1.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/fdisk-drive2.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/fdisk-edit1.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/fdisk-edit2.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/ftp-anon1.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/ftp-anon2.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/hdwrconf.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/keymap.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/main-doc.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/main-keymap.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/main-options.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/main-std.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/main1.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mainexit.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/media.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mouse1.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mouse2.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mouse3.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mouse4.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mouse5.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/mouse6.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/nfs-server-edit.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/options.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/pkg-cat.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/pkg-confirm.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/pkg-install.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/pkg-sel.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/probstart.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/security.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/sysinstall-exit.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/timezone1.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/timezone2.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/timezone3.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/userconfig.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/userconfig2.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/xf86setup.scr#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelopts/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelopts/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/README#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ache.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/addkey.sh#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/alex.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/anders.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/andreas.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/asami.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ben.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/benno.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/billf.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/bmah.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/brian.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/brooks.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/bsd.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/cjc.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/clive.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/core-secretary.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/cshumway.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dannyboy.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dcs.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dd.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/demon.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/des.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dfr.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dinoex.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dwmalone.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/fanf.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/fjoe.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ghelmer.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/gioria.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/green.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/gshapiro.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/gsutter.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/guido.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ijliao.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/imp.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jdp.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jedgar.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jesper.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jhay.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jim.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jkh.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jkoshy.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jmb.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jmg.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/joe.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/joerg.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ken.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/keramida.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/keyring.pl#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/knu.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/kris.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/kuriyama.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/lioux.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/luoqi.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/marcel.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/marcus.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/markp.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/matusita.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/max.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/mbr.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/mi.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/mikeh.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/mp.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/murray.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/mux.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/nate.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/nectar.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/netchild.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/nik.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/nsouch.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/nyan.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/obrien.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/patrick.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/petef.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/peter.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/phantom.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/phk.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/pirzyk.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/rich.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/roam.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/roberto.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ru.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/sanpei.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/schweikh.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/security-officer.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/sobomax.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/tmm.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/tobez.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/trevor.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ue.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/vanilla.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/wilko.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/will.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/wollman.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/wosch.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/policies/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/policies/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/sound/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/sound/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/users/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/ppp-primer/Makefile#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/ppp-primer/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/1.png#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/10.png#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/2.png#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/3.png#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/4.png#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/5.png#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/6.png#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/7.png#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/8.png#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/images/callouts/9.png#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/authors.ent#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/catalog#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/teams.ent#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/Makefile#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/admin.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/applications.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/includes.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/install.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/misc.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/network.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/preface.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/serial.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/FAQ/x.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/Makefile#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/Makefile#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/Makefile.inc#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/faq/Makefile#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/faq/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/Makefile#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/authors.ent#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/share/sgml/catalog#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#1 branch ... //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/Makefile.inc#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/euro/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/mh/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/Makefile.inc#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/acknowledgments.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/admin.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/applications.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/commercial.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/hackers.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/hardware.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/includes.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/install.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/kernelconfig.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/misc.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/network.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/preface.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/serial.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/troubleshoot.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/faq/x.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/backups/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/contrib/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/hw/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/in-progress.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/internals/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/kernelopts/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/policies/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/quotas/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/staff/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/todo.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/catalog#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#1 branch ... //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/Makefile#1 branch ... //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/Makefile#1 branch ... //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/Makefile.inc#1 branch ... //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#1 branch ... //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/new-users/Makefile#1 branch ... //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/sgml/catalog#1 branch ... //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#1 branch ... //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#1 branch ... //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/sgml/translators.ent#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/Makefile.inc#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/contributing/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/contributing/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/contributors/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/contributors/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/diskless-x/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/diskless-x/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/fonts/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/fonts/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/ipsec-must/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/ipsec-must/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/multi-os/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/multi-os/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/zip-drive/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/zip-drive/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/Makefile.inc#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/design-44bsd/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/design-44bsd/fig1.eps#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/design-44bsd/fig2.eps#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/design-44bsd/freebsd.dsl#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/faq/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/faq/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/chapter.decl#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/chapters.ent#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/see-also/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/structure/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/stylesheets/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/tools/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/fdp-primer/writing-style/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/advanced-networking/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/advanced-networking/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/advanced-networking/isdn-bus.eps#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/advanced-networking/natd.eps#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/appendix.decl#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/authors.ent#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/backups/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/backups/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/basics/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/basics/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/bibliography/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/boot/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/boot/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/chapter.decl#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/chapters.ent#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/colophon.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/config/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/config/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/contrib/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/cutting-edge/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/disks/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/disks/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/eresources/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/eresources/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/hw/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/install/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/install/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/internals/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/introduction/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/introduction/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/jauthors.ent#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/jcontrib/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/kernelconfig/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/kerneldebug/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/kerneldebug/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/kernelopts/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/kernelopts/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/l10n/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/l10n/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/linuxemu/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/linuxemu/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/mail/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/mail/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/mirrors/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/newsgroups.ent#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/pgpkeys/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/policies/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/policies/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/ports/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/ports/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/ppp-and-slip/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/ppp-and-slip/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/printing/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/printing/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/security/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/security/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/serialcomms/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/sound/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/sound/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/staff/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/staff/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/users/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/users/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/x11/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/x11/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/porters-handbook/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/porters-handbook/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/porters-handbook/freebsd.dsl#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/ppp-primer/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/ppp-primer/book.sgml#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/Makefile.inc#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/Makefile#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/a2p.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/addftinfo.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/addr2line.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/afmtodit.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/apply.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/apropos.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ar.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/as.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/at.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/basename.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/bc.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/bdes.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/biff.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/brandelf.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/builtin.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/bzip2.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/c89.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/calendar.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cap_mkdb.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cat.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/catman.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cccp.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cdcontrol.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/checknr.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chflags.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chgrp.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chio.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chkey.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chmod.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chpass.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ci.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ckdist.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cksum.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cmp.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/co.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/col.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/colcrt.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/colldef.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/colrm.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/column.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/comm.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/compile_et.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/compress.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cp.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cpio.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/crontab.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/crunchgen.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/crunchide.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ctags.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ctm.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ctm_rmail.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cu.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cursor.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cut.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cvs.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/date.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dc.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dd.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/df.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dialog.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/diff.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/diff3.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dig.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dnskeygen.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dnsquery.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/domainname.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/doscmd.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dtmfdecode.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/du.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/echo.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ed.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ee.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/enigma.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/eqn.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/expand.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/expr.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/f77.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/false.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fdformat.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fdwrite.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fetch.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/file.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/file2c.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/find.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/finger.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fmt.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fold.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fontedit.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/from.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fstat.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fsync.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ftp.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/g711conv.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gasp.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gawk.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gcc.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gcore.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gdb.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gdbserver.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gencat.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/getNAME.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/getopt.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gperf.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gprof.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grep.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grn.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grodvi.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/groff.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grog.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grolbp.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grolj4.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grops.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/grotty.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/groups.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gzexe.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gzip.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/h2ph.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/head.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/hexdump.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/host.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/hostname.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/hpftodit.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/id.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ident.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/indent.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/indxbib.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/info.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/install-info.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/install.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/intro.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipcrm.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipcs.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipftest.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipnat.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipresend.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipsend.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/iptest.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/join.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/jot.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kbdcontrol.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kbdmap.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kcon.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kdump.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kenv.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/key.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/keyinfo.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/keyinit.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/keylogin.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/keylogout.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kill.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/killall.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ktrace.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lam.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/last.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lastcomm.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ld.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ldd.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/leave.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/less.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lesskey.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lex.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/limits.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lint.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lkbib.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ln.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/loadfont.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/locate.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lock.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lockf.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/logger.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/login.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/logname.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/look.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lookbib.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lorder.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lp.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lpq.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lpr.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lprm.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lptest.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ls.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lsvfs.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/m4.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mail.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mailq.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/make.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/makeinfo.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/makewhatis.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/man.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/manpath.1#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mcon.1#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 19:58:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1833437B40B; Fri, 10 May 2002 19:58:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 312E137B40A for ; Fri, 10 May 2002 19:58:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4B2wBR79494 for perforce@freebsd.org; Fri, 10 May 2002 19:58:11 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Date: Fri, 10 May 2002 19:58:11 -0700 (PDT) Message-Id: <200205110258.g4B2wBR79494@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 11145 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11145 Change 11145 by amigus@amigus_vmganyopa on 2002/05/10 19:57:54 - removed __mac_get_peer() and updated libc and man pages to reflect that. - made __mac_[gs]et_fd() not handle sockets and updated man pages to reflect that also mentioning that the correct way to set and get labels on sockets is [gs]etsockopt(). - fixed declaration of mac_get_fd() (it was mac_from_fd()) in sys/mac.h NOTE: currently setsockopt() only checks suser_cred() for permission to set the label. I will fix it so that it acutally consults the installed MAC policies soon... Affected files ... ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.3#5 edit ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.3#5 edit ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#4 edit ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.3#4 edit ... //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#17 edit ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#140 edit ... //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#17 edit ... //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#15 edit ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#21 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#99 edit ... //depot/projects/trustedbsd/mac/sys/sys/syscall.h#18 edit ... //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#18 edit ... //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#19 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.3#5 (text+ko) ==== @@ -77,18 +77,6 @@ and may be used to retrieve the MAC label associated with a named file. -.It Fn mac_get_socket -This function is described in -.Xr mac_get 3 , -and may be used to retrieve the -MAC label associated with -a specific socket descriptor. -.It Fn mac_get_peer -This function is described in -.Xr mac_get 3 , -and may be used to retrieve the -MAC label associated with -a the peer of a specific socket descriptor. .It Fn mac_get_proc This function is described in .Xr mac_get 3 , ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.3#5 (text+ko) ==== @@ -37,8 +37,6 @@ .Sh NAME .Nm mac_get_file , .Nm mac_get_fd , -.Nm mac_get_socket , -.Nm mac_get_peer , .Nm mac_get_proc .Nd get the label of a file, socket, socket peer or process .Sh SYNOPSIS @@ -48,10 +46,6 @@ .Ft mac_t .Fn mac_get_fd "int fd" .Ft mac_t -.Fn mac_get_socket "int s" -.Ft mac_t -.Fn mac_get_peer "int s" -.Ft mac_t .Fn mac_get_proc .Sh DESCRIPTION The @@ -64,18 +58,10 @@ .Fa path_p or the file descriptor specified by .Fa fd , -respectively. -The -.Fn mac_get_socket -and -.Fn mac_get_peer -functions return the MAC label associated -with the socket descriptor and it's peer -specified by -.Fa s , -respectively. Note: mac_get_peer is currently only -valid for TCP STREAM and UNIX DOMAIN -sockets. +respectively. Note this function will +fail on socket descriptors. For information on +getting MAC labels on socket descriptors see +.Xr getsockopt 2 . The .Fn mac_get_proc function returns a MAC label associated ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#4 (text+ko) ==== @@ -99,45 +99,3 @@ return (label); } - -mac_t -mac_get_peer(int s) -{ - struct mac *label; - int error; - - label = (mac_t) malloc(sizeof(*label)); - if (label == NULL) { - errno = ENOMEM; - return (NULL); - } - - error = __mac_get_peer(s, label); - if (error) { - mac_free(label); - return (NULL); - } - - return (label); -} - -mac_t -mac_get_socket(int s) -{ - struct mac *label; - int error; - - label = (mac_t) malloc(sizeof(*label)); - if (label == NULL) { - errno = ENOMEM; - return (NULL); - } - - error = __mac_get_fd(s, label); - if (error) { - mac_free(label); - return (NULL); - } - - return (label); -} ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.3#4 (text+ko) ==== @@ -61,7 +61,10 @@ .Fa path_p , or to the file descriptor .Fa fd , -respectively. +respectively. Note this function will +fail on socket descriptors. For information on +setting MAC labels on socket descriptors see +.Xr setsockopt 2 . The .Fn mac_set_proc function associates the MAC label ==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#17 (text+ko) ==== @@ -414,5 +414,4 @@ { SYF_MPSAFE | AS(__mac_set_file_args), (sy_call_t *)__mac_set_file }, /* 389 = __mac_set_file */ { AS(kenv_args), (sy_call_t *)kenv }, /* 390 = kenv */ { 0, (sy_call_t *)nosys }, /* 391 = lchflags */ - { SYF_MPSAFE | AS(__mac_get_peer_args), (sy_call_t *)__mac_get_peer }, /* 392 = __mac_get_peer */ }; ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#140 (text+ko) ==== @@ -44,7 +44,6 @@ */ #include "opt_mac.h" - #include #include #include @@ -1668,7 +1667,6 @@ { struct file *fp; struct mac label; - struct socket *so; struct vnode *vp; int error; @@ -1679,11 +1677,6 @@ goto out; switch (fp->f_type) { - case DTYPE_SOCKET: - so = (struct socket *)fp->f_data; - label = so->so_label; - break; - case DTYPE_FIFO: case DTYPE_VNODE: vp = (struct vnode *)fp->f_data; @@ -1710,41 +1703,6 @@ * MPSAFE */ int -__mac_get_peer(struct thread *td, struct __mac_get_peer_args *uap) -{ - struct file *fp; - struct socket *so; - struct mac label; - int error; - - mtx_lock(&Giant); - - error = fget(td, SCARG(uap, fd), &fp); - if (error) - goto out2; - - if(fp->f_type != DTYPE_SOCKET) { - error = EINVAL; - goto out; - } - else { - so = (struct socket *)fp->f_data; - label = so->so_peerlabel; - } - - if (error == 0) - error = copyout(&label, SCARG(uap, mac_p), sizeof(label)); -out: - fdrop(fp, td); -out2: - mtx_unlock(&Giant); - return (error); -} - -/* - * MPSAFE - */ -int __mac_get_file(struct thread *td, struct __mac_get_file_args *uap) { struct nameidata nd; @@ -1779,7 +1737,6 @@ struct file *fp; struct mac newlabel; struct mount *mp; - struct socket *so; struct vnode *vp; int error; @@ -1793,18 +1750,6 @@ goto out2; switch (fp->f_type) { - case DTYPE_SOCKET: - so = (struct socket *)fp->f_data; - - error = mac_cred_check_relabel_socket(td->td_ucred, so, - &newlabel); - if (error) - goto out2; - - mac_relabel_socket(td->td_ucred, so, &newlabel); - - break; - case DTYPE_FIFO: case DTYPE_VNODE: vp = (struct vnode *)fp->f_data; ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#17 (text+ko) ==== @@ -399,5 +399,4 @@ "__mac_set_file", /* 389 = __mac_set_file */ "kenv", /* 390 = kenv */ "#391", /* 391 = lchflags */ - "__mac_get_peer", /* 392 = __mac_get_peer */ }; ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#15 (text+ko) ==== @@ -561,5 +561,4 @@ 389 MSTD BSD { int __mac_set_file(const char *path_p, struct mac *mac_p); } 390 STD BSD { int kenv(int what, const char *name, char *value, \ int len); } -391 UNIMPL BSD lchflags -392 MSTD BSD { int __mac_get_peer(int fd, struct mac *mac_p); }+391 UNIMPL BSD lchflags ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#21 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#99 (text+ko) ==== @@ -171,10 +171,8 @@ int mac_equal(const mac_t labela, const mac_t _labelb); int mac_free(void *_buf_p); mac_t mac_from_text(const char *_text_p); -mac_t mac_from_fd(int _fildes); +mac_t mac_get_fd(int _fildes); mac_t mac_get_file(const char *_path_p); -mac_t mac_get_socket(int s); -mac_t mac_get_peer(int s); mac_t mac_get_proc(void); mac_t mac_glb(const mac_t _labela, const mac_t _labelb); mac_t mac_lub(const mac_t _labela, const mac_t _labelb); ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.h#18 (text+ko) ==== @@ -310,5 +310,4 @@ #define SYS___mac_set_fd 388 #define SYS___mac_set_file 389 #define SYS_kenv 390 -#define SYS___mac_get_peer 392 -#define SYS_MAXSYSCALL 393 +#define SYS_MAXSYSCALL 392 ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#18 (text+ko) ==== @@ -259,5 +259,4 @@ __mac_get_file.o \ __mac_set_fd.o \ __mac_set_file.o \ - kenv.o \ - __mac_get_peer.o + kenv.o ==== //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#19 (text+ko) ==== @@ -1134,10 +1134,6 @@ char value_l_[PADL_(char *)]; char * value; char value_r_[PADR_(char *)]; char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)]; }; -struct __mac_get_peer_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; -}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1394,7 +1390,6 @@ int __mac_set_fd(struct thread *, struct __mac_set_fd_args *); int __mac_set_file(struct thread *, struct __mac_set_file_args *); int kenv(struct thread *, struct kenv_args *); -int __mac_get_peer(struct thread *, struct __mac_get_peer_args *); #ifdef COMPAT_43 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 22:33:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65B3637B40A; Fri, 10 May 2002 22:33:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7EB7C37B406 for ; Fri, 10 May 2002 22:33:30 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4B5XUw00836 for perforce@freebsd.org; Fri, 10 May 2002 22:33:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 10 May 2002 22:33:30 -0700 (PDT) Message-Id: <200205110533.g4B5XUw00836@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11151 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11151 Change 11151 by rwatson@rwatson_paprika on 2002/05/10 22:33:08 Hook ugidfw(8) up to the build process; this may have been lost during some or another integ, or just never been attached. This tool allows you to manage the mac_bsdextended ruleset for file access. Affected files ... ... //depot/projects/trustedbsd/mac/usr.sbin/Makefile#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/Makefile#7 (text+ko) ==== @@ -111,6 +111,7 @@ traceroute6 \ trpt \ tzsetup \ + ugidfw \ usbd \ usbdevs \ vidcontrol \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 22:38:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB23E37B408; Fri, 10 May 2002 22:38:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2B4EE37B405 for ; Fri, 10 May 2002 22:38:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4B5cb601082 for perforce@freebsd.org; Fri, 10 May 2002 22:38:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 10 May 2002 22:38:37 -0700 (PDT) Message-Id: <200205110538.g4B5cb601082@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11152 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11152 Change 11152 by rwatson@rwatson_paprika on 2002/05/10 22:37:49 Move printf() on module load outside of the region where the list lock is held. Introduce a new printf on unload of a module. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#141 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#141 (text+ko) ==== @@ -564,13 +564,15 @@ mpc->mpc_field_off = -1; mpc->mpc_runtime_flags |= MPC_RUNTIME_FLAG_REGISTERED; LIST_INSERT_HEAD(&mac_policy_list, mpc, mpc_list); - printf("Security policy: %s (%s)\n", mpc->mpc_fullname, mpc->mpc_name); /* Per-policy initialization. */ if (mpc->mpc_ops.mpo_init != NULL) (*(mpc->mpc_ops.mpo_init))(mpc); MAC_POLICY_LIST_UNLOCK(); + printf("Security policy loaded: %s (%s)\n", mpc->mpc_fullname, + mpc->mpc_name); + return (0); } @@ -594,6 +596,9 @@ LIST_REMOVE(mpc, mpc_list); MAC_POLICY_LIST_UNLOCK(); + printf("Security policy unload: %s (%s)\n", mpc->mpc_fullname, + mpc->mpc_name); + return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 22:39:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02AA337B403; Fri, 10 May 2002 22:39:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CB75C37B407 for ; Fri, 10 May 2002 22:39:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4B5dc801196 for perforce@freebsd.org; Fri, 10 May 2002 22:39:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 10 May 2002 22:39:38 -0700 (PDT) Message-Id: <200205110539.g4B5dc801196@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11153 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11153 Change 11153 by rwatson@rwatson_paprika on 2002/05/10 22:39:20 Document the fact that under RELENG_4, /etc/security is a file, and that mergemaster gets confused if asked to upgrade a file to a directory. Probably, we should fix mergemaster. Affected files ... ... //depot/projects/trustedbsd/mac/MACREADME#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/MACREADME#17 (text+ko) ==== @@ -120,4 +120,10 @@ Things that look like they should work but don't ------------------------------------------------ -Nothing on this list right now. +Under RELENG_4, /etc/security is a file; in the TrustedBSD MAC branch, +it's a directory. If you're upgrading from RELENG_4, + + rm -f /etc/security + +before running mergemaster, as mergemaster gets confused if a +file is replaced with a directory. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 10 22:44:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD80D37B406; Fri, 10 May 2002 22:44:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DFFC137B401 for ; Fri, 10 May 2002 22:44:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4B5ij801583 for perforce@freebsd.org; Fri, 10 May 2002 22:44:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 10 May 2002 22:44:45 -0700 (PDT) Message-Id: <200205110544.g4B5ij801583@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11155 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11155 Change 11155 by rwatson@rwatson_paprika on 2002/05/10 22:43:48 Document some useful recovery procedures if your extended attribute file gets toasted, or if the label format changes out from under you. Fear the voice of experience. Affected files ... ... //depot/projects/trustedbsd/mac/MACREADME#18 edit Differences ... ==== //depot/projects/trustedbsd/mac/MACREADME#18 (text+ko) ==== @@ -105,7 +105,10 @@ gate label set requests, and the resulting labels on disk may be invalid, resulting in a panic. Instead, make sure to reinitialize all of the "freebsd.mac" attributes to their default (with extattrctl(8)) -before starting them again on the new kernel. +before starting them again on the new kernel. Using the +security.mac.debug_label_fallback tunable/sysctl will permit the +MAC framework to ignore certain classes of poorly initialized labels, +but not all. Don't downgrade a UFS-based filesystem from multilevel to singlelevel, and then back to multilevel without a reboot. The label cache can @@ -127,3 +130,15 @@ before running mergemaster, as mergemaster gets confused if a file is replaced with a directory. + +Things to try if things go wrong +-------------------------------- + +- If your filesystems are multilevel and you toast the label data + (or get caught up in a label format upgrade), set + security.mac.debug_label_fallback (tunable or sysctl) to 1, + and on discovery of a corrupted label, the MAC framework will + fall backi to the per-mount label. Boot the system and delete + or upgrade the extended attribute backing files to the new + format. Alternatively, boot the system and remove the + multilevel flags from /etc/fstab. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 11 13:32:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0973237B405; Sat, 11 May 2002 13:32:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0566637B400 for ; Sat, 11 May 2002 13:32:30 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4BKWTf38439 for perforce@freebsd.org; Sat, 11 May 2002 13:32:29 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sat, 11 May 2002 13:32:29 -0700 (PDT) Message-Id: <200205112032.g4BKWTf38439@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11170 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11170 Change 11170 by jake@jake_sparc64 on 2002/05/11 13:32:15 Reduce diffs. Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#2 edit ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_emul.c#3 edit ... //depot/projects/sparc64/lib/libc/sparc64/sys/sigcode.S#2 edit ... //depot/projects/sparc64/lib/libstand/sparc64/_setjmp.S#3 edit ... //depot/projects/sparc64/sys/sparc64/include/emul.h#3 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/mem.c#5 edit Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c,v 1.1 2002/04/29 18:14:44 jake Exp $"); #include ==== //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_emul.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_emul.c,v 1.1 2002/04/27 21:56:28 jake Exp $"); #include #include ==== //depot/projects/sparc64/lib/libc/sparc64/sys/sigcode.S#2 (text+ko) ==== @@ -25,6 +25,7 @@ */ #include +__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/sigcode.S,v 1.1 2002/04/29 18:14:44 jake Exp $"); #include "assym.s" ==== //depot/projects/sparc64/lib/libstand/sparc64/_setjmp.S#3 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: Header: _setjmp.s,v 1.1 91/07/06 16:45:53 torek Exp + * $Header: _setjmp.s,v 1.1 91/07/06 16:45:53 torek Exp */ #if defined(LIBC_SCCS) && !defined(lint) @@ -45,12 +45,8 @@ #endif #endif /* LIBC_SCCS and not lint */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD$" -#endif /* SYSLIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libstand/sparc64/_setjmp.S,v 1.1 2002/04/13 22:09:53 obrien Exp $"); #define _JB_FP 0x0 #define _JB_PC 0x8 ==== //depot/projects/sparc64/sys/sparc64/include/emul.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * 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. * - * $FreeBSD$ + * $FreeBSD: src/sys/sparc64/include/emul.h,v 1.1 2002/04/09 01:42:19 jake Exp $ */ #ifndef _MACHINE_EMUL_H_ ==== //depot/projects/sparc64/sys/sparc64/sparc64/mem.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 * from: FreeBSD: src/sys/i386/i386/mem.c,v 1.94 2001/09/26 * - * $FreeBSD$ + * $FreeBSD: src/sys/sparc64/sparc64/mem.c,v 1.1 2002/03/09 22:33:16 tmm Exp $ */ /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 11 13:34:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93E9C37B406; Sat, 11 May 2002 13:34:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C221A37B403 for ; Sat, 11 May 2002 13:34:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4BKYWM38675 for perforce@freebsd.org; Sat, 11 May 2002 13:34:32 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sat, 11 May 2002 13:34:32 -0700 (PDT) Message-Id: <200205112034.g4BKYWM38675@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11171 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11171 Change 11171 by jake@jake_sparc64 on 2002/05/11 13:34:25 Further diff reduction. Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_qp.c#2 edit Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_qp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.1 2002/04/28 02:36:36 jake Exp $"); #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 11 14:11:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14DA437B404; Sat, 11 May 2002 14:11:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 32BFE37B401 for ; Sat, 11 May 2002 14:11:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4BLBXo44717 for perforce@freebsd.org; Sat, 11 May 2002 14:11:33 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 11 May 2002 14:11:33 -0700 (PDT) Message-Id: <200205112111.g4BLBXo44717@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11173 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11173 Change 11173 by marcel@marcel_nfs on 2002/05/11 14:10:33 Now that I got a clean machine check for a corrected memory error, add the record for future reference and add the code to dump it. I choose to create a subdirectory "records" to avoid polluting the source directory itself. The mca.log file will be moved or split or both. Affected files ... ... //depot/projects/ia64/sbin/mca/mca.c#3 edit ... //depot/projects/ia64/sbin/mca/records/corrected_memory_error#1 add ... //depot/projects/ia64/sys/ia64/include/mca.h#4 edit Differences ... ==== //depot/projects/ia64/sbin/mca/mca.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #ifdef __ia64__ #include #else -#include "/sys/ia64/include/mca.h" +#include "../../sys/ia64/include/mca.h" #endif #include @@ -119,15 +119,20 @@ { printf(" <%s-%d>\n", what, idx); if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_INFO) - printf(" info=%016llx\n", cpu_mod->cpu_mod_info); + printf(" info=%016llx\n", + (long long)cpu_mod->cpu_mod_info); if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_REQID) - printf(" requester=%016llx\n", cpu_mod->cpu_mod_reqid); + printf(" requester=%016llx\n", + (long long)cpu_mod->cpu_mod_reqid); if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_RSPID) - printf(" responder=%016llx\n", cpu_mod->cpu_mod_rspid); + printf(" responder=%016llx\n", + (long long)cpu_mod->cpu_mod_rspid); if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_TGTID) - printf(" target=%016llx\n", cpu_mod->cpu_mod_tgtid); + printf(" target=%016llx\n", + (long long)cpu_mod->cpu_mod_tgtid); if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_IP) - printf(" ip=%016llx\n", cpu_mod->cpu_mod_ip); + printf(" ip=%016llx\n", + (long long)cpu_mod->cpu_mod_ip); printf(" \n", what, idx); } @@ -167,7 +172,8 @@ cpuid = (struct mca_cpu_cpuid*)mod; for (i = 0; i < 6; i++) - printf(" cpuid%d=%016llx\n", i, cpuid->cpuid[i]); + printf(" cpuid%d=%016llx\n", i, + (long long)cpuid->cpuid[i]); psi = (struct mca_cpu_psi*)(cpuid + 1); /* TODO: Dump PSI */ @@ -176,9 +182,48 @@ } static void -show_memory(void) +show_memory(struct mca_mem_record *mem) { - printf(" # MEMORY\n"); + printf(" \n"); + + if (mem->mem_flags & MCA_MEM_FLAGS_STATUS) + printf(" status=%016llx\n", (long long)mem->mem_status); + if (mem->mem_flags & MCA_MEM_FLAGS_ADDR) + printf(" address=%016llx\n", (long long)mem->mem_addr); + if (mem->mem_flags & MCA_MEM_FLAGS_ADDRMASK) + printf(" mask=%016llx\n", (long long)mem->mem_addrmask); + if (mem->mem_flags & MCA_MEM_FLAGS_NODE) + printf(" node=0x%04x\n", mem->mem_node); + if (mem->mem_flags & MCA_MEM_FLAGS_CARD) + printf(" card=0x%04x\n", mem->mem_card); + if (mem->mem_flags & MCA_MEM_FLAGS_MODULE) + printf(" module=0x%04x\n", mem->mem_module); + if (mem->mem_flags & MCA_MEM_FLAGS_BANK) + printf(" bank=0x%04x\n", mem->mem_bank); + if (mem->mem_flags & MCA_MEM_FLAGS_DEVICE) + printf(" device=0x04x\n", mem->mem_device); + if (mem->mem_flags & MCA_MEM_FLAGS_ROW) + printf(" row=0x%04x\n", mem->mem_row); + if (mem->mem_flags & MCA_MEM_FLAGS_COLUMN) + printf(" column=0x%04x\n", mem->mem_column); + if (mem->mem_flags & MCA_MEM_FLAGS_BITPOS) + printf(" bit=0x%04x\n", mem->mem_bitpos); + if (mem->mem_flags & MCA_MEM_FLAGS_REQID) + printf(" requester=%016llx\n", + (long long)mem->mem_reqid); + if (mem->mem_flags & MCA_MEM_FLAGS_RSPID) + printf(" responder=%016llx\n", + (long long)mem->mem_rspid); + if (mem->mem_flags & MCA_MEM_FLAGS_TGTID) + printf(" target=%016llx\n", (long long)mem->mem_tgtid); + + if (mem->mem_flags & MCA_MEM_FLAGS_BUSDATA) + printf(" status=%016llx\n", (long long)mem->mem_busdata); + if (mem->mem_flags & MCA_MEM_FLAGS_PLATFORM_ID) + printf(" platform=%s\n", guid(&mem->mem_platform)); + /* TODO: Dump OEM data */ + + printf(" \n"); } static void @@ -229,7 +274,7 @@ if (!memcmp(&sh->sh_guid, &guid_cpu, sizeof(guid_cpu))) show_cpu((struct mca_cpu_record*)(sh + 1)); else if (!memcmp(&sh->sh_guid, &guid_memory, sizeof(guid_memory))) - show_memory(); + show_memory((struct mca_mem_record*)(sh + 1)); else if (!memcmp(&sh->sh_guid, &guid_sel, sizeof(guid_sel))) show_sel(); else if (!memcmp(&sh->sh_guid, &guid_pci_bus, sizeof(guid_pci_bus))) ==== //depot/projects/ia64/sys/ia64/include/mca.h#4 (text+ko) ==== @@ -129,6 +129,45 @@ uint64_t cpu_psi_fr[256]; /* 16 bytes per register! */ }; +struct mca_mem_record { + uint64_t mem_flags; +#define MCA_MEM_FLAGS_STATUS (1ULL << 0) +#define MCA_MEM_FLAGS_ADDR (1ULL << 1) +#define MCA_MEM_FLAGS_ADDRMASK (1ULL << 2) +#define MCA_MEM_FLAGS_NODE (1ULL << 3) +#define MCA_MEM_FLAGS_CARD (1ULL << 4) +#define MCA_MEM_FLAGS_MODULE (1ULL << 5) +#define MCA_MEM_FLAGS_BANK (1ULL << 6) +#define MCA_MEM_FLAGS_DEVICE (1ULL << 7) +#define MCA_MEM_FLAGS_ROW (1ULL << 8) +#define MCA_MEM_FLAGS_COLUMN (1ULL << 9) +#define MCA_MEM_FLAGS_BITPOS (1ULL << 10) +#define MCA_MEM_FLAGS_REQID (1ULL << 11) +#define MCA_MEM_FLAGS_RSPID (1ULL << 12) +#define MCA_MEM_FLAGS_TGTID (1ULL << 13) +#define MCA_MEM_FLAGS_BUSDATA (1ULL << 14) +#define MCA_MEM_FLAGS_PLATFORM_ID (1ULL << 15) +#define MCA_MEM_FLAGS_OEM_DATA (1ULL << 16) + uint64_t mem_status; + uint64_t mem_addr; + uint64_t mem_addrmask; + uint16_t mem_node; + uint16_t mem_card; + uint16_t mem_module; + uint16_t mem_bank; + uint16_t mem_device; + uint16_t mem_row; + uint16_t mem_column; + uint16_t mem_bitpos; + uint64_t mem_reqid; + uint64_t mem_rspid; + uint64_t mem_tgtid; + uint64_t mem_busdata; + struct mca_guid mem_platform; /* XXX not really a GUID. */ + uint16_t mem_oem_length; /* Size of OEM data. */ + /* N bytes of OEM platform data */ +}; + #define MCA_GUID_CPU \ {0xe429faf1,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} #define MCA_GUID_MEMORY \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 11 14:20:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 143FB37B403; Sat, 11 May 2002 14:20:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 831BD37B400 for ; Sat, 11 May 2002 14:20:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4BLKic45471 for perforce@freebsd.org; Sat, 11 May 2002 14:20:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 11 May 2002 14:20:44 -0700 (PDT) Message-Id: <200205112120.g4BLKic45471@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11174 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11174 Change 11174 by marcel@marcel_nfs on 2002/05/11 14:19:51 Add a MCA record for a fatal processor error. This one happens to be for an AP. Pulled from the mca.log file in the parent directory. Affected files ... ... //depot/projects/ia64/sbin/mca/records/fatal_processor_error#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 11 14:30:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE52037B403; Sat, 11 May 2002 14:29:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3402837B401 for ; Sat, 11 May 2002 14:29:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4BLTui45989 for perforce@freebsd.org; Sat, 11 May 2002 14:29:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 11 May 2002 14:29:56 -0700 (PDT) Message-Id: <200205112129.g4BLTui45989@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11176 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11176 Change 11176 by marcel@marcel_nfs on 2002/05/11 14:29:35 Add a fatal error that involves multiple devices. I don't know the exact condition that causes these multi-device errors, but I know I got less of them after moving my SCSI controller to a different slot. This record has been extracted from the mca.log file in the parent directory. Affected files ... ... //depot/projects/ia64/sbin/mca/records/fatal_multi_device_error#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 11 14:35: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B457B37B406; Sat, 11 May 2002 14:35:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B263E37B405 for ; Sat, 11 May 2002 14:35:02 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4BLZ2Y46458 for perforce@freebsd.org; Sat, 11 May 2002 14:35:02 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 11 May 2002 14:35:02 -0700 (PDT) Message-Id: <200205112135.g4BLZ2Y46458@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11177 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11177 Change 11177 by marcel@marcel_nfs on 2002/05/11 14:34:43 Remove this bit-bucket. It's more useful to create seperate files for seperate records and/or record types. Duplicate or equivalent records have been removed. The unique records have been moved to the records subdirectory. Affected files ... ... //depot/projects/ia64/sbin/mca/mca.log#2 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 11 14:57:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6921F37B407; Sat, 11 May 2002 14:56:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8C72237B406 for ; Sat, 11 May 2002 14:56:31 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4BLuUF48440 for perforce@freebsd.org; Sat, 11 May 2002 14:56:30 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sat, 11 May 2002 14:56:30 -0700 (PDT) Message-Id: <200205112156.g4BLuUF48440@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11183 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11183 Change 11183 by jake@jake_sparc64 on 2002/05/11 14:56:05 Integ@11178 Affected files ... ... //depot/projects/sparc64/UPDATING#8 integrate ... //depot/projects/sparc64/bin/cp/cp.c#2 integrate ... //depot/projects/sparc64/bin/dd/args.c#2 integrate ... //depot/projects/sparc64/bin/expr/expr.1#4 integrate ... //depot/projects/sparc64/bin/expr/expr.y#4 integrate ... //depot/projects/sparc64/bin/ln/ln.c#2 integrate ... //depot/projects/sparc64/bin/test/test.c#3 integrate ... //depot/projects/sparc64/contrib/gcc/config/freebsd-spec.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/version.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#8 integrate ... //depot/projects/sparc64/crypto/telnet/telnet/commands.c#2 integrate ... //depot/projects/sparc64/crypto/telnet/telnet/network.c#2 integrate ... //depot/projects/sparc64/crypto/telnet/telnet/sys_bsd.c#2 integrate ... //depot/projects/sparc64/crypto/telnet/telnet/terminal.c#2 integrate ... //depot/projects/sparc64/crypto/telnet/telnet/utilities.c#2 integrate ... //depot/projects/sparc64/games/robots/flush_in.c#2 integrate ... //depot/projects/sparc64/games/robots/move_robs.c#2 integrate ... //depot/projects/sparc64/games/robots/play_level.c#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/Makefile#17 integrate ... //depot/projects/sparc64/gnu/usr.bin/awk/Makefile#2 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/Makefile#5 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/Makefile.tgt#3 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/cc_tools/Makefile#4 integrate ... //depot/projects/sparc64/gnu/usr.bin/cc/tradcpp0/Makefile#2 integrate ... //depot/projects/sparc64/kerberos5/usr.bin/k5su/Makefile#3 integrate ... //depot/projects/sparc64/lib/Makefile#4 integrate ... //depot/projects/sparc64/lib/csu/alpha/Makefile#4 integrate ... //depot/projects/sparc64/lib/csu/i386-elf/Makefile#5 integrate ... //depot/projects/sparc64/lib/csu/ia64/Makefile#4 integrate ... //depot/projects/sparc64/lib/csu/powerpc/Makefile#4 integrate ... //depot/projects/sparc64/lib/csu/sparc64/Makefile#8 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_qp.c#3 integrate ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c#3 integrate ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_emul.c#4 integrate ... //depot/projects/sparc64/lib/libc/sparc64/sys/sigcode.S#3 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/Makefile.inc#2 integrate ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_autoinit.c#1 branch ... //depot/projects/sparc64/lib/libc_r/uthread/uthread_autoinit.cc#2 delete ... //depot/projects/sparc64/lib/libradius/radlib.h#2 integrate ... //depot/projects/sparc64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#12 integrate ... //depot/projects/sparc64/release/picobsd/dial/floppy.tree/etc/mfs.rc#2 integrate ... //depot/projects/sparc64/release/picobsd/mfs_tree/etc/rc.network#2 integrate ... //depot/projects/sparc64/release/picobsd/net/floppy.tree/etc/rc.network#2 integrate ... //depot/projects/sparc64/release/picobsd/router/floppy.tree/etc/mfs.rc#2 integrate ... //depot/projects/sparc64/sbin/dumpon/dumpon.c#6 integrate ... //depot/projects/sparc64/sbin/ifconfig/ifconfig.8#3 integrate ... //depot/projects/sparc64/sbin/mount/mount.8#3 integrate ... //depot/projects/sparc64/share/examples/IPv6/USAGE#2 integrate ... //depot/projects/sparc64/share/examples/isdn/FAQ#2 integrate ... //depot/projects/sparc64/share/man/man4/uplcom.4#2 integrate ... //depot/projects/sparc64/share/mk/bsd.cpu.mk#4 integrate ... //depot/projects/sparc64/sys/alpha/include/atomic.h#3 integrate ... //depot/projects/sparc64/sys/alpha/pci/irongate_pci.c#3 integrate ... //depot/projects/sparc64/sys/boot/alpha/libalpha/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/arc/lib/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/efi/libefi/Makefile#7 integrate ... //depot/projects/sparc64/sys/boot/ficl/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/i386/btx/lib/Makefile#2 integrate ... //depot/projects/sparc64/sys/boot/i386/libi386/Makefile#5 integrate ... //depot/projects/sparc64/sys/boot/ia64/libski/Makefile#6 integrate ... //depot/projects/sparc64/sys/boot/ofw/libofw/Makefile#5 integrate ... //depot/projects/sparc64/sys/boot/ofw/libofw/devicename.c#7 integrate ... //depot/projects/sparc64/sys/boot/ofw/libofw/libofw.h#6 integrate ... //depot/projects/sparc64/sys/boot/ofw/libofw/ofw_disk.c#8 integrate ... //depot/projects/sparc64/sys/boot/pc98/btx/lib/Makefile#2 integrate ... //depot/projects/sparc64/sys/boot/pc98/libpc98/Makefile#5 integrate ... //depot/projects/sparc64/sys/compat/linux/linux_mib.c#5 integrate ... //depot/projects/sparc64/sys/conf/kern.post.mk#14 integrate ... //depot/projects/sparc64/sys/dev/aic7xxx/aic7xxx_freebsd.h#3 delete ... //depot/projects/sparc64/sys/dev/bktr/bktr_card.h#2 integrate ... //depot/projects/sparc64/sys/fs/devfs/devfs_vnops.c#13 integrate ... //depot/projects/sparc64/sys/isa/fd.c#10 integrate ... //depot/projects/sparc64/sys/isa/fdreg.h#3 integrate ... //depot/projects/sparc64/sys/net/iso88025.h#3 integrate ... //depot/projects/sparc64/sys/sparc64/include/instr.h#9 integrate ... //depot/projects/sparc64/sys/sys/cdefs.h#11 integrate ... //depot/projects/sparc64/sys/sys/sun_disklabel.h#2 integrate ... //depot/projects/sparc64/usr.bin/awk/Makefile#5 integrate ... //depot/projects/sparc64/usr.bin/passwd/passwd.c#5 integrate ... //depot/projects/sparc64/usr.bin/uudecode/uudecode.c#5 integrate ... //depot/projects/sparc64/usr.bin/uuencode/uuencode.c#3 integrate ... //depot/projects/sparc64/usr.bin/xinstall/xinstall.c#5 integrate ... //depot/projects/sparc64/usr.sbin/faithd/README#3 integrate ... //depot/projects/sparc64/usr.sbin/mrouted/mrouted.8#2 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/add/extract.c#3 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/add/pkg_add.1#3 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/create/perform.c#6 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/create/pl.c#3 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/delete/perform.c#3 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/info/show.c#5 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/deps.c#4 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/file.c#3 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/match.c#3 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/pen.c#3 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/lib/plist.c#4 integrate ... //depot/projects/sparc64/usr.sbin/pkg_install/sign/pgp_sign.c#3 integrate ... //depot/projects/sparc64/usr.sbin/ppp/chap_ms.c#2 integrate ... //depot/projects/sparc64/usr.sbin/ppp/mppe.c#5 integrate ... //depot/projects/sparc64/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#3 integrate ... //depot/projects/sparc64/usr.sbin/rpc.yppasswdd/yppasswdd_server.c#3 integrate Differences ... ==== //depot/projects/sparc64/UPDATING#8 (text+ko) ==== @@ -22,6 +22,11 @@ integrity. Re-enabling write caching can substantially improve performance. +20020510: + Due to the way CVS works, it may not properly update src/contrib/gcc + to the 3.1 sources. The easiest fix is to `rm -rf' src/contrib/gcc + and then do a cvs update. + 20020421: When exec'ing set[ug]id executables, the kernel now ensures that the stdio file descriptors (0..2) are open. See FreeBSD-SA-02:23.stdio. @@ -1025,4 +1030,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.204 2002/05/06 09:40:52 dd Exp $ +$FreeBSD: src/UPDATING,v 1.205 2002/05/10 22:56:59 obrien Exp $ ==== //depot/projects/sparc64/bin/cp/cp.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/cp/cp.c,v 1.32 2002/02/22 21:24:14 markm Exp $"; + "$FreeBSD: src/bin/cp/cp.c,v 1.33 2002/05/11 00:21:00 alfred Exp $"; #endif /* not lint */ /* @@ -272,6 +272,7 @@ badcp = rval = 1; continue; default: + ; } /* ==== //depot/projects/sparc64/bin/dd/args.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ static char sccsid[] = "@(#)args.c 8.3 (Berkeley) 4/2/94"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/dd/args.c,v 1.31 2002/02/22 20:51:00 markm Exp $"; + "$FreeBSD: src/bin/dd/args.c,v 1.32 2002/05/11 03:12:02 jedgar Exp $"; #endif /* not lint */ #include @@ -372,6 +372,7 @@ mult = sizeof(int); break; default: + ; } if (mult != 0) { ==== //depot/projects/sparc64/bin/expr/expr.1#4 (text+ko) ==== @@ -28,9 +28,9 @@ .\" (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/bin/expr/expr.1,v 1.17 2002/04/22 21:23:09 wollman Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.19 2002/05/11 03:08:12 wollman Exp $ .\" -.Dd March 22, 2002 +.Dd May 10, 2002 .Dt EXPR 1 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd evaluate expression .Sh SYNOPSIS .Nm -.Op Fl \&- +.Op Fl e .Ar expression .Sh DESCRIPTION The @@ -50,15 +50,25 @@ All operators and operands must be passed as separate arguments. Several of the operators have special meaning to command interpreters and must therefore be quoted appropriately. +All integer operands are interpreted in base 10. .Pp -Arithmetic operations are performed using signed integer math, -in the largest integral type available in the C language. The +Arithmetic operations are performed using signed integer math. +If the +.Fl e +flag is specified, arithmetic uses the C +.Ql intmax_t +data type (the largest integral type available), and .Nm -utility will detect arithmetic overflow and division by zero, and -returns with an exit status of 2 in those cases. If a numeric operand -is specified which is so large as to overflow conversion to an integer, -it is parsed as a string instead. All numeric operands are interpreted -in base 10. +will detect arithmetic overflow and return an error indication. +If a numeric operand is specified which is so large as to overflow +conversion to an integer, it is parsed as a string instead. +If +.Fl e +is not specified, arithmetic operations and parsing of integer +arguments will overflow silently according to the rules of the C +standard, using the +.Ql long +data type. .Pp Operators are listed below in order of increasing precedence; all are left-associative. @@ -129,6 +139,20 @@ will not permit this syntax. See the examples below for portable ways to guarantee the correct interpretation. +The +.Ev EXPR_COMPAT +variable is intended for use as a transition and debugging aid, when +.Nm +is used in complex scripts which cannot easily be recast to avoid the +non-portable usage. +Defining +.Ev EXPR_COMPAT +also implicitly enables the +.Fl e +option, since this matches the historic behavior of +.Nm +in +.Fx . .Pp The .Nm @@ -151,6 +175,8 @@ will emulate historic .Nm implementations which did not obey the Utility Syntax Guidelines. +Implies +.Fl e . .El .Sh EXAMPLES .Bl -bullet @@ -174,7 +200,7 @@ More generally, parenthesize possibly-negative values: .Dl a=$(expr \e( $a \e) + 1) .It -The following example prints the filename portion of a pathname stored +This example prints the filename portion of a pathname stored in variable .Va a . Since @@ -231,9 +257,6 @@ provided that the .Ev EXPR_COMPAT environment variable is not defined. -.Tn POSIX -does not specify whether arithmetic overflow is detected, nor does it specify -the possible range of integer arguments to -.Nm , -so a portable application must assume that the range is small and that -overflow may not be detected. +The +.Fl e +flag is an extension. ==== //depot/projects/sparc64/bin/expr/expr.y#4 (text+ko) ==== @@ -4,7 +4,7 @@ * * Largely rewritten by J.T. Conklin (jtc@wimsey.com) * - * $FreeBSD: src/bin/expr/expr.y,v 1.20 2002/04/22 21:23:09 wollman Exp $ + * $FreeBSD: src/bin/expr/expr.y,v 1.22 2002/05/11 03:08:12 wollman Exp $ */ #include @@ -70,6 +70,7 @@ int yylex(void); int yyparse(void); +static int eflag; char **av; %} @@ -154,7 +155,10 @@ * non-digits MUST NOT be considered integers. strtoimax() will * figure this out for us. */ - (void)strtoimax(s, &ep, 10); + if (eflag) + (void)strtoimax(s, &ep, 10); + else + (void)strtol(s, &ep, 10); if (*ep != '\0') vp->type = string; @@ -186,9 +190,13 @@ /* vp->type == numeric_string, make it numeric */ errno = 0; - i = strtoimax(vp->u.s, (char **)NULL, 10); - if (errno == ERANGE) - err(ERR_EXIT, NULL); + if (eflag) { + i = strtoimax(vp->u.s, (char **)NULL, 10); + if (errno == ERANGE) + err(ERR_EXIT, NULL); + } else { + i = strtol(vp->u.s, (char **)NULL, 10); + } free (vp->u.s); vp->u.i = i; @@ -272,11 +280,17 @@ setlocale (LC_ALL, ""); if (getenv("EXPR_COMPAT") != NULL) { av = argv + 1; + eflag = 1; } else { - while ((c = getopt(argc, argv, "")) != -1) + while ((c = getopt(argc, argv, "e")) != -1) switch (c) { + case 'e': + eflag = 1; + break; + default: - fprintf(stderr,"usage: expr [--] expression\n"); + fprintf(stderr, + "usage: expr [-e] expression\n"); exit(ERR_EXIT); } av = argv + optind; @@ -327,7 +341,7 @@ struct val * op_eq(struct val *a, struct val *b) { - struct val *r; + struct val *r; if (isstring (a) || isstring (b)) { to_string (a); @@ -447,6 +461,7 @@ int chk_plus(intmax_t a, intmax_t b, intmax_t r) { + /* sum of two positive numbers must be positive */ if (a > 0 && b > 0 && r <= 0) return 1; @@ -462,14 +477,18 @@ { struct val *r; - if (!to_integer (a) || !to_integer (b)) { + if (!to_integer(a) || !to_integer(b)) { errx(ERR_EXIT, "non-numeric argument"); } - r = make_integer (/*(intmax_t)*/(a->u.i + b->u.i)); - if (chk_plus (a->u.i, b->u.i, r->u.i)) { - errx(ERR_EXIT, "overflow"); - } + if (eflag) { + r = make_integer(a->u.i + b->u.i); + if (chk_plus(a->u.i, b->u.i, r->u.i)) { + errx(ERR_EXIT, "overflow"); + } + } else + r = make_integer((long)a->u.i + (long)b->u.i); + free_value (a); free_value (b); return r; @@ -478,6 +497,7 @@ int chk_minus(intmax_t a, intmax_t b, intmax_t r) { + /* special case subtraction of INTMAX_MIN */ if (b == INTMAX_MIN) { if (a >= 0) @@ -494,14 +514,18 @@ { struct val *r; - if (!to_integer (a) || !to_integer (b)) { + if (!to_integer(a) || !to_integer(b)) { errx(ERR_EXIT, "non-numeric argument"); } - r = make_integer (/*(intmax_t)*/(a->u.i - b->u.i)); - if (chk_minus (a->u.i, b->u.i, r->u.i)) { - errx(ERR_EXIT, "overflow"); - } + if (eflag) { + r = make_integer(a->u.i - b->u.i); + if (chk_minus(a->u.i, b->u.i, r->u.i)) { + errx(ERR_EXIT, "overflow"); + } + } else + r = make_integer((long)a->u.i - (long)b->u.i); + free_value (a); free_value (b); return r; @@ -524,14 +548,18 @@ { struct val *r; - if (!to_integer (a) || !to_integer (b)) { + if (!to_integer(a) || !to_integer(b)) { errx(ERR_EXIT, "non-numeric argument"); } - r = make_integer (/*(intmax_t)*/(a->u.i * b->u.i)); - if (chk_times (a->u.i, b->u.i, r->u.i)) { - errx(ERR_EXIT, "overflow"); - } + if (eflag) { + r = make_integer(a->u.i * b->u.i); + if (chk_times(a->u.i, b->u.i, r->u.i)) { + errx(ERR_EXIT, "overflow"); + } + } else + r = make_integer((long)a->u.i * (long)b->u.i); + free_value (a); free_value (b); return (r); @@ -553,7 +581,7 @@ { struct val *r; - if (!to_integer (a) || !to_integer (b)) { + if (!to_integer(a) || !to_integer(b)) { errx(ERR_EXIT, "non-numeric argument"); } @@ -561,10 +589,14 @@ errx(ERR_EXIT, "division by zero"); } - r = make_integer (/*(intmax_t)*/(a->u.i / b->u.i)); - if (chk_div (a->u.i, b->u.i)) { - errx(ERR_EXIT, "overflow"); - } + if (eflag) { + r = make_integer(a->u.i / b->u.i); + if (chk_div(a->u.i, b->u.i)) { + errx(ERR_EXIT, "overflow"); + } + } else + r = make_integer((long)a->u.i / (long)b->u.i); + free_value (a); free_value (b); return r; @@ -575,7 +607,7 @@ { struct val *r; - if (!to_integer (a) || !to_integer (b)) { + if (!to_integer(a) || !to_integer(b)) { errx(ERR_EXIT, "non-numeric argument"); } @@ -583,8 +615,12 @@ errx(ERR_EXIT, "division by zero"); } - r = make_integer (/*(intmax_t)*/(a->u.i % b->u.i)); - /* chk_rem necessary ??? */ + if (eflag) + r = make_integer(a->u.i % b->u.i); + /* chk_rem necessary ??? */ + else + r = make_integer((long)a->u.i % (long)b->u.i); + free_value (a); free_value (b); return r; ==== //depot/projects/sparc64/bin/ln/ln.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/ln/ln.c,v 1.24 2002/02/22 21:06:53 markm Exp $"; + "$FreeBSD: src/bin/ln/ln.c,v 1.25 2002/05/11 00:45:01 jedgar Exp $"; #endif /* not lint */ #include @@ -132,6 +132,7 @@ case 2: /* ln target source */ exit(linkit(argv[0], argv[1], 0)); default: + ; } /* ln target1 target2 directory */ sourcedir = argv[argc - 1]; ==== //depot/projects/sparc64/bin/test/test.c#3 (text+ko) ==== @@ -12,7 +12,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/bin/test/test.c,v 1.44 2002/03/28 16:30:42 ache Exp $"; + "$FreeBSD: src/bin/test/test.c,v 1.47 2002/05/11 01:25:54 alfred Exp $"; #endif /* not lint */ #include @@ -35,8 +35,7 @@ #else #include -static void error(const char *, ...) __attribute__((__noreturn__)) - __printf0like(1, 2); +static void error(const char *, ...) __dead2 __printf0like(1, 2); static void error(const char *msg, ...) ==== //depot/projects/sparc64/contrib/gcc/config/freebsd-spec.h#2 (text+ko) ==== @@ -18,6 +18,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.2 2002/05/10 19:05:07 obrien Exp $ */ + /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify their commonalities. @@ -48,6 +50,10 @@ || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") \ || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker")) + +#ifndef FREEBSD_NATIVE /* these bits are here to reduce merge diffs, but I don't want to acutally use the bits right now */ + + #if FBSD_MAJOR == 6 #define FBSD_CPP_PREDEFINES \ "-D__FreeBSD__=6 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" @@ -73,11 +79,24 @@ "-D__FreeBSD__ -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" #endif + +#else /* FREEBSD_NATIVE */ +/* Place spaces around this string. We depend on string splicing to produce + the final CPP_PREDEFINES value. */ + +#define FBSD_CPP_PREDEFINES \ + "-D__FreeBSD__=5 -D__FreeBSD_cc_version=500003 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" +#endif /* ! FREEBSD_NATIVE */ + + /* Provide a CPP_SPEC appropriate for FreeBSD. We just deal with the GCC option `-posix', and PIC issues. */ #define FBSD_CPP_SPEC " \ %(cpp_cpu) \ + %{!maout: -D__ELF__} \ + %{munderscores: -D__UNDERSCORES__} \ + %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \ %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} \ %{posix:-D_POSIX_SOURCE}" @@ -129,7 +148,8 @@ %{pg: -lc_p} \ }" #else -#if FBSD_MAJOR >= 5 +#include +#if __FreeBSD_version >= 500016 #define FBSD_LIB_SPEC " \ %{!shared: \ %{!pg: %{pthread:-lc_r} -lc} \ ==== //depot/projects/sparc64/contrib/gcc/version.c#3 (text+ko) ==== @@ -1,4 +1,6 @@ +/* $FreeBSD: src/contrib/gcc/version.c,v 1.2 2002/05/11 00:25:50 obrien Exp $ */ + #include "ansidecl.h" #include "version.h" -const char *const version_string = "3.1 20020509 (prerelease)"; +const char *const version_string = "3.1 [FreeBSD] 20020509 (prerelease)"; ==== //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#8 (text+ko) ==== @@ -31,12 +31,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#7 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#8 $ */ #include #include +#include #include #include ==== //depot/projects/sparc64/crypto/telnet/telnet/commands.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.25 2001/12/03 17:42:02 jhay Exp $"); +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.26 2002/05/11 03:19:44 alfred Exp $"); #ifndef lint static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; @@ -81,7 +81,7 @@ #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN 256 -#endif MAXHOSTNAMELEN +#endif typedef int (*intrtn_t)(int, char **); ==== //depot/projects/sparc64/crypto/telnet/telnet/network.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.5 2001/11/30 21:06:36 markm Exp $"); +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.6 2002/05/11 03:19:44 alfred Exp $"); #ifndef lint static const char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93"; @@ -44,6 +44,7 @@ #include #include +#include #include #include ==== //depot/projects/sparc64/crypto/telnet/telnet/sys_bsd.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ #include #include -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.9 2001/12/09 09:53:27 jkh Exp $"); +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.10 2002/05/11 03:19:44 alfred Exp $"); #ifndef lint static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95"; @@ -654,9 +654,9 @@ (void) signal(SIGTSTP, SIG_DFL); # ifndef SOLARIS (void) sigsetmask(sigblock(0) & ~(1<<(SIGTSTP-1))); -# else SOLARIS +# else /* SOLARIS */ (void) sigrelse(SIGTSTP); -# endif SOLARIS +# endif /* SOLARIS */ #endif /* SIGTSTP */ #ifndef USE_TERMIO ltc = oltc; ==== //depot/projects/sparc64/crypto/telnet/telnet/terminal.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.5 2001/11/30 21:06:36 markm Exp $"); +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.6 2002/05/11 03:19:44 alfred Exp $"); #ifndef lint static const char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95"; @@ -42,6 +42,8 @@ #include #include +#include + #include "ring.h" #include "externs.h" ==== //depot/projects/sparc64/crypto/telnet/telnet/utilities.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.6 2001/11/30 21:06:36 markm Exp $"); +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.7 2002/05/11 03:19:44 alfred Exp $"); #ifndef lint static const char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95"; @@ -47,6 +47,7 @@ #include #include #include +#include #include #include "general.h" ==== //depot/projects/sparc64/games/robots/flush_in.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)flush_in.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$FreeBSD: src/games/robots/flush_in.c,v 1.2 1999/11/30 03:49:17 billf Exp $"; + "$FreeBSD: src/games/robots/flush_in.c,v 1.3 2002/05/11 04:40:13 alfred Exp $"; #endif /* not lint */ # include @@ -49,7 +49,7 @@ { # ifdef TIOCFLUSH ioctl(fileno(stdin), TIOCFLUSH, NULL); -# else TIOCFLUSH +# else /* TIOCFLUSH */ crmode(); -# endif TIOCFLUSH +# endif /* TIOCFLUSH */ } ==== //depot/projects/sparc64/games/robots/move_robs.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)move_robs.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$FreeBSD: src/games/robots/move_robs.c,v 1.4 1999/11/30 03:49:19 billf Exp $"; + "$FreeBSD: src/games/robots/move_robs.c,v 1.5 2002/05/11 04:40:13 alfred Exp $"; #endif /* not lint */ # include "robots.h" @@ -62,7 +62,7 @@ addch(inch()); move(Max.y, Max.x); addch(inch()); -# endif DEBUG +# endif /* DEBUG */ for (rp = Robots; rp < &Robots[MAXROBOTS]; rp++) { if (rp->y < 0) continue; @@ -123,7 +123,7 @@ move(Max.y, Max.x); addch(inch()); standend(); -# endif DEBUG +# endif /* DEBUG */ if (Real_time) alarm(3); } ==== //depot/projects/sparc64/games/robots/play_level.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)play_level.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$FreeBSD: src/games/robots/play_level.c,v 1.4 1999/11/30 03:49:20 billf Exp $"; + "$FreeBSD: src/games/robots/play_level.c,v 1.5 2002/05/11 04:40:13 alfred Exp $"; #endif /* not lint */ # include "robots.h" @@ -67,7 +67,7 @@ move(Max.y, Max.x); addch(inch()); standend(); -# endif DEBUG +# endif /* DEBUG */ setjmp(End_move); flush_in(); while (!Dead && Num_robots > 0) { ==== //depot/projects/sparc64/gnu/usr.bin/Makefile#17 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.64 2002/05/10 00:50:43 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.65 2002/05/10 17:30:42 obrien Exp $ -SUBDIR= awk bc binutils cpio dc dialog diff diff3 \ +SUBDIR= awk bc binutils cc cpio dc dialog diff diff3 \ grep gzip man patch ptx rcs sdiff send-pr sort tar texinfo .if ${CXX:T} != "c++" @@ -17,10 +17,6 @@ .endif .endif -.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64" -SUBDIR+=cc -.endif - .if !defined(NOPERL) && !defined(NO_PERL) && exists(${.CURDIR}/perl) SUBDIR+=perl .endif ==== //depot/projects/sparc64/gnu/usr.bin/awk/Makefile#2 (text+ko) ==== @@ -1,22 +1,15 @@ # Makefile copyright James Raynard (jraynard@freebsd.org) 1997 # -# $FreeBSD: src/gnu/usr.bin/awk/Makefile,v 1.20 2002/03/05 19:40:25 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/awk/Makefile,v 1.21 2002/05/10 20:36:21 obrien Exp $ .include "${.CURDIR}/../Makefile.inc" .PATH: ${.CURDIR}/../../../contrib/awk -.if ${MACHINE_ARCH} == "sparc64" PROG= gawk -.else -PROG= awk -.endif SRCS= array.c awkgram.y builtin.c eval.c field.c gawkmisc.c io.c main.c \ msg.c node.c re.c version.c dfa.c getopt.c getopt1.c ext.c profile.c MAN= doc/gawk.1 -.if ${MACHINE_ARCH} != "sparc64" -MLINKS= gawk.1 awk.1 -.endif YFLAGS= ==== //depot/projects/sparc64/gnu/usr.bin/cc/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.28 2002/05/10 08:54:43 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile,v 1.29 2002/05/11 04:51:45 obrien Exp $ # The order of some of these are rather important. Some depend on previous # subdirs. @@ -12,7 +12,7 @@ .if !defined(NO_CXX) SUBDIR+= cc1plus c++ c++filt doc .if !defined(NO_COLLECT2) -SUBDIR+= collect2 +#SUBDIR+= collect2 .endif .endif ==== //depot/projects/sparc64/gnu/usr.bin/cc/Makefile.tgt#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.3 2002/05/10 08:54:43 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.4 2002/05/10 17:23:04 obrien Exp $ TARGET_ARCH?= ${MACHINE_ARCH} @@ -8,6 +8,8 @@ GCC_CPU= arm .elif ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "x86-64" GCC_CPU= i386 +.elif ${TARGET_ARCH} == "ia64" +GCC_CPU= ia64 .elif ${TARGET_ARCH} == "powerpc" GCC_CPU= rs6000 .elif ${TARGET_ARCH} == "sparc64" ==== //depot/projects/sparc64/gnu/usr.bin/cc/cc_tools/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.59 2002/05/10 10:21:19 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.60 2002/05/10 17:42:19 obrien Exp $ # # This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk @@ -167,7 +167,9 @@ echo '#ifndef POSIX' >> ${.TARGET} echo '# define POSIX' >> ${.TARGET} echo '#endif' >> ${.TARGET} +.if ${TARGET_ARCH} != "ia64" echo '#define CONFIG_SJLJ_EXCEPTIONS 0' >> ${.TARGET} +.endif tm_p.h: echo '#include "${GCC_CPU}/${GCC_CPU}-protos.h"' >> ${.TARGET} ==== //depot/projects/sparc64/gnu/usr.bin/cc/tradcpp0/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/tradcpp0/Makefile,v 1.2 2002/05/10 08:54:50 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/tradcpp0/Makefile,v 1.4 2002/05/11 00:15:45 obrien Exp $ .include "../Makefile.inc" ==== //depot/projects/sparc64/kerberos5/usr.bin/k5su/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/k5su/Makefile,v 1.4 2002/04/26 17:55:26 ru Exp $ +# $FreeBSD: src/kerberos5/usr.bin/k5su/Makefile,v 1.5 2002/05/11 14:05:07 nectar Exp $ PROG= k5su SRCS= su.c asn1_err.h krb5_err.h heim_err.h k524_err.h @@ -22,7 +22,7 @@ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} -BINMODE=4555 +#BINMODE=4555 INSTALLFLAGS=-fschg .include ==== //depot/projects/sparc64/lib/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.135 2002/04/14 22:27:12 des Exp $ +# $FreeBSD: src/lib/Makefile,v 1.136 2002/05/11 17:51:04 obrien Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -39,7 +39,7 @@ _csu=csu .endif -.if ${MACHINE_ARCH} == "i386" +.if ${OBJFORMAT} == "aout" && ${MACHINE_ARCH} == "i386" _libgnumalloc= libgnumalloc _libresolv= libresolv .endif ==== //depot/projects/sparc64/lib/csu/alpha/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/csu/alpha/Makefile,v 1.17 2002/03/29 22:43:40 markm Exp $ +# $FreeBSD: src/lib/csu/alpha/Makefile,v 1.18 2002/05/11 17:45:02 obrien Exp $ .PATH: ${.CURDIR}/../common @@ -8,10 +8,7 @@ CFLAGS+= -Wall -Wno-unused \ -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include -NOMAN= true -NOPIC= true -NOPROFILE= true -INTERNALLIB= true +NOLIB= true all: ${OBJS} ${SOBJS} ==== //depot/projects/sparc64/lib/csu/i386-elf/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/csu/i386-elf/Makefile,v 1.11 2002/04/29 13:07:20 bde Exp $ +# $FreeBSD: src/lib/csu/i386-elf/Makefile,v 1.12 2002/05/11 17:45:02 obrien Exp $ .PATH: ${.CURDIR}/../common @@ -9,10 +9,7 @@ -I${.CURDIR}/../common \ -I${.CURDIR}/../../libc/include LDFLAGS+= -elf -NOMAN= true -NOPIC= true -NOPROFILE= true -INTERNALLIB= true +NOLIB= true all: ${OBJS} ${SOBJS} ==== //depot/projects/sparc64/lib/csu/ia64/Makefile#4 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 11 15: 2: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 264B437B409; Sat, 11 May 2002 15:01:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 374C137B404 for ; Sat, 11 May 2002 15:01:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4BM1bZ50562 for perforce@freebsd.org; Sat, 11 May 2002 15:01:37 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sat, 11 May 2002 15:01:37 -0700 (PDT) Message-Id: <200205112201.g4BM1bZ50562@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11184 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11184 Change 11184 by jake@jake_sparc64 on 2002/05/11 15:00:51 Integ@11182 Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#13 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_explode.c#8 integrate ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_emul.c#5 integrate ... //depot/projects/sparc64/sys/alpha/alpha/alphadump.c#1 branch ... //depot/projects/sparc64/sys/boot/i386/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/i386/boot2/Makefile#3 integrate ... //depot/projects/sparc64/sys/boot/i386/boot2/boot2.c#8 integrate ... //depot/projects/sparc64/sys/conf/files.alpha#14 integrate ... //depot/projects/sparc64/sys/sparc64/conf/SUN4U#29 edit ... //depot/projects/sparc64/sys/sys/kerneldump.h#3 integrate Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#13 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.5 2002/04/27 21:56:28 jake Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.6 2002/05/11 21:20:04 jake Exp $"); #include ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_explode.c#8 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_explode.c,v 1.4 2002/04/27 21:56:28 jake Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_explode.c,v 1.5 2002/05/11 21:20:04 jake Exp $"); /* * FPU subroutines: `explode' the machine's `packed binary' format numbers ==== //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_emul.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_emul.c,v 1.1 2002/04/27 21:56:28 jake Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_emul.c,v 1.2 2002/05/11 21:20:05 jake Exp $"); #include #include ==== //depot/projects/sparc64/sys/boot/i386/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.15 2002/05/10 00:52:00 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.16 2002/05/11 21:41:03 peter Exp $ -SUBDIR= mbr boot0 btx cdboot kgzldr libi386 loader +SUBDIR= mbr boot0 btx boot2 cdboot kgzldr libi386 loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr ==== //depot/projects/sparc64/sys/boot/i386/boot2/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.24 2002/05/10 04:05:42 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.25 2002/05/11 21:39:59 peter Exp $ PROG= boot2 NOMAN= @@ -48,6 +48,12 @@ boot1.o: boot1.s ${AS} ${AFLAGS} --defsym FLAGS=${B1FLAGS} ${.IMPSRC} -o ${.TARGET} +boot2.o: boot2.c + ${CC} ${CFLAGS} -S -o boot2.s.tmp ${.IMPSRC} + sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s + rm -f boot2.s.tmp + ${AS} ${AFLAGS} -o boot2.o boot2.s + boot2.h: boot1.out ${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \ { x = $$1 - ORG1; printf("#define XREADORG 0x7%x\n", x) }' \ ==== //depot/projects/sparc64/sys/boot/i386/boot2/boot2.c#8 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.39 2002/04/11 09:21:10 pb Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.41 2002/05/11 21:49:39 peter Exp $ */ #include @@ -154,7 +154,6 @@ static int dskread(void *, unsigned, unsigned); static int printf(const char *,...); static int putchar(int); -static void *memcpy(void *, const void *, size_t); static uint32_t memsize(int); static int drvread(void *, unsigned, unsigned); static int keyhit(unsigned); @@ -162,6 +161,8 @@ static int xgetc(int); static int getc(int); +#define memcpy __builtin_memcpy + static inline void readfile(const char *fname, void *buf, size_t size) { @@ -743,17 +744,6 @@ return xputc(c); } -static void * -memcpy(void *dst, const void *src, size_t size) -{ - const char *s; - char *d; - - for (d = dst, s = src; size; size--) - *d++ = *s++; - return dst; -} - static uint32_t memsize(int type) { ==== //depot/projects/sparc64/sys/conf/files.alpha#14 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.84 2002/04/15 23:28:09 obrien Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.85 2002/05/11 21:53:46 gallatin Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -31,6 +31,7 @@ clean "atkbdmap.h" # alpha/alpha/alpha-gdbstub.c optional ddb +alpha/alpha/alphadump.c standard alpha/alpha/api_up1000.c optional api_up1000 alpha/alpha/atomic.s standard alpha/alpha/autoconf.c standard ==== //depot/projects/sparc64/sys/sparc64/conf/SUN4U#29 (text+ko) ==== @@ -65,3 +65,9 @@ options KTR_COMPILE=0xffffffff options KTR_ENTRIES=8192 options KTR_MASK=0 + +#options NFS_ROOT +#options BOOTP +#options BOOTP_NFSROOT +#options BOOTP_NFSV3 +#options BOOTP_COMPAT ==== //depot/projects/sparc64/sys/sys/kerneldump.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/kerneldump.h,v 1.4 2002/05/05 13:47:21 mux Exp $ + * $FreeBSD: src/sys/sys/kerneldump.h,v 1.5 2002/05/11 21:53:46 gallatin Exp $ */ #ifndef _SYS_KERNELDUMP_H @@ -65,6 +65,7 @@ uint32_t version; #define KERNELDUMPVERSION 1 uint32_t architectureversion; +#define KERNELDUMP_ALPHA_VERSION 1 #define KERNELDUMP_I386_VERSION 1 #define KERNELDUMP_IA64_VERSION 1 uint64_t dumplength; /* excl headers */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 11 17:57:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1047037B408; Sat, 11 May 2002 17:57:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2E18937B406 for ; Sat, 11 May 2002 17:57:15 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4C0vEl79631 for perforce@freebsd.org; Sat, 11 May 2002 17:57:14 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Date: Sat, 11 May 2002 17:57:14 -0700 (PDT) Message-Id: <200205120057.g4C0vEl79631@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 11192 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11192 Change 11192 by amigus@amigus_vmganyopa on 2002/05/11 17:56:32 Added MAC policy check on setsockopt() operations. Note that there's an suser_cred() check that might go away pretty soon when I start playing with labels in apache2. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#142 edit ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#22 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#100 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#142 (text+ko) ==== @@ -1605,6 +1605,23 @@ return (error); } +int +mac_setsockopt_label_set(struct ucred *cred, struct socket *so, + struct mac *label) +{ + int error; + + if (!mac_label_valid(label)) + return (EINVAL); + + MAC_CHECK(cred_check_relabel_socket, cred, so, label); + if (error) + return (error); + + MAC_PERFORM(relabel_socket, cred, so, label); + + return (0); +} /* * MPSAFE ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#22 (text+ko) ==== @@ -1155,7 +1155,7 @@ struct timeval tv; u_long val; #ifdef MAC - struct mac label, *labelp; + struct mac label; #endif /* MAC */ error = 0; @@ -1282,24 +1282,21 @@ break; #ifdef MAC case SO_LABEL: - case SO_PEERLABEL: + /* + * XXX: This will probably have to be removed soon. + */ if(sopt->sopt_td != NULL) error = suser_cred(sopt->sopt_td->td_ucred, 0); if(error) goto bad; error = sooptcopyin(sopt, &label, sizeof label, - sizeof label); + sizeof label); if (error) goto bad; - error = mac_validate_label(&label); - if (error) - goto bad; - - labelp = (sopt->sopt_name == SO_LABEL ? - &so->so_label : &so->so_peerlabel); - bcopy(&label, labelp, sizeof label); + error = mac_setsockopt_label_set( + sopt->sopt_td->td_ucred, so, &label); break; #endif /* MAC */ ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#100 (text+ko) ==== @@ -290,6 +290,8 @@ struct ifnet *ifnet); int mac_ioctl_ifnet_set(struct ucred *cred, struct ifreq *ifr, struct ifnet *ifnet); +int mac_setsockopt_label_set(struct ucred *cred, struct socket *so, + struct mac *label); /* Label creation events. */ void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 12 9:26:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91A4337B404; Sun, 12 May 2002 09:26:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BE9CF37B408 for ; Sun, 12 May 2002 09:26:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4CGQgP20962 for perforce@freebsd.org; Sun, 12 May 2002 09:26:42 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 May 2002 09:26:42 -0700 (PDT) Message-Id: <200205121626.g4CGQgP20962@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11215 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11215 Change 11215 by rwatson@rwatson_tislabs on 2002/05/12 09:25:50 Export include files from sys/security/mac_biba and sys/security/mac_mls also. Currently none there, but there will be. Affected files ... ... //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#7 edit ... //depot/projects/trustedbsd/mac/include/Makefile#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#7 (text+ko) ==== @@ -122,8 +122,12 @@ security lomac .. + mac_biba + ... mac_bsdextended .. + mac_mls + ... .. sys .. ==== //depot/projects/trustedbsd/mac/include/Makefile#10 (text+ko) ==== @@ -43,8 +43,8 @@ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ - security/lomac security/mac_bsdextended \ - ufs/ffs ufs/ufs + security/lomac security/mac_biba security/mac_bsdextended \ + security/mac_mls ufs/ffs ufs/ufs # For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/* # are taken care of To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 12 9:31: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E92D37B40D; Sun, 12 May 2002 09:30:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F0DFD37B404 for ; Sun, 12 May 2002 09:30:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4CGUld21357 for perforce@freebsd.org; Sun, 12 May 2002 09:30:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 May 2002 09:30:47 -0700 (PDT) Message-Id: <200205121630.g4CGUld21357@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11216 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11216 Change 11216 by rwatson@rwatson_curry on 2002/05/12 09:29:49 Create two new include files, one for the Biba policy specifically, and one for the MLS policy specifically. Put exportable #define's associated with each policy in those files. No structures here until we get dynamic labeling. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.h#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 12 9:31: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FB9337B406; Sun, 12 May 2002 09:30:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3838A37B405 for ; Sun, 12 May 2002 09:30:48 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4CGUlk21362 for perforce@freebsd.org; Sun, 12 May 2002 09:30:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 May 2002 09:30:48 -0700 (PDT) Message-Id: <200205121630.g4CGUlk21362@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11217 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11217 Change 11217 by rwatson@rwatson_curry on 2002/05/12 09:30:27 Remove per-policy #define's for Biba and MLS from mac.h, update the policy implementations to #include their per-policy include files to get the definitions back. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#36 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#30 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#101 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#36 (text+ko) ==== @@ -63,6 +63,8 @@ #include #include +#include + SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, biba, CTLFLAG_RW, 0, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#30 (text+ko) ==== @@ -63,6 +63,8 @@ #include #include +#include + SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, mls, CTLFLAG_RW, 0, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#101 (text+ko) ==== @@ -56,7 +56,8 @@ * Structures and constants associated with a Biba Integrity policy. * mac_biba represents a Biba label, with mb_type determining its properties, * and mb_grade represents the hierarchal grade if valid for the current - * mb_type. + * mb_type. These structures will move to mac_biba.h once we have dymamic + * labels. */ struct mac_biba_element { u_short mbe_type; @@ -75,24 +76,12 @@ struct mac_biba_element mb_rangelow, mb_rangehigh; }; -#define MAC_BIBA_FLAG_SINGLE 0x00000001 /* mb_single initialized */ -#define MAC_BIBA_FLAG_RANGE 0x00000002 /* mb_range* initialized */ -#define MAC_BIBA_FLAGS_BOTH (MAC_BIBA_FLAG_SINGLE | MAC_BIBA_FLAG_RANGE) - -#define MAC_BIBA_TYPE_UNDEF 0 /* Undefined */ -#define MAC_BIBA_TYPE_GRADE 1 /* Hierarchal grade with mb_grade. */ -#define MAC_BIBA_TYPE_LOW 2 /* Dominated by any - * MAC_BIBA_TYPE_LABEL. */ -#define MAC_BIBA_TYPE_HIGH 3 /* Dominates any - * MAC_BIBA_TYPE_LABEL. */ -#define MAC_BIBA_TYPE_EQUAL 4 /* Equivilent to any - * MAC_BIBA_TYPE_LABEL. */ - /* * Structures and constants associated with a Multi-Level Security policy. * mac_mls represents an MLS label, with mm_type determining its properties, * and mm_level represents the hierarchal sensitivity level if valid for the - * current mm_type. + * current mm_type. These structures will move to mac_mls.h once we have + * dynamic labels. */ struct mac_mls_element { u_short mme_type; @@ -111,19 +100,6 @@ struct mac_mls_element mm_rangelow, mm_rangehigh; }; -#define MAC_MLS_FLAG_SINGLE 0x00000001 /* mm_single initialized */ -#define MAC_MLS_FLAG_RANGE 0x00000002 /* mm_range* initialized */ -#define MAC_MLS_FLAGS_BOTH (MAC_MLS_FLAG_SINGLE | MAC_MLS_FLAG_RANGE) - -#define MAC_MLS_TYPE_UNDEF 0 /* Undefined */ -#define MAC_MLS_TYPE_LEVEL 1 /* Hierarchal level with mm_level. */ -#define MAC_MLS_TYPE_LOW 2 /* Dominated by any - * MAC_MLS_TYPE_LABEL. */ -#define MAC_MLS_TYPE_HIGH 3 /* Dominates any - * MAC_MLS_TYPE_LABEL. */ -#define MAC_MLS_TYPE_EQUAL 4 /* Equivilent to any - * MAC_MLS_TYPE_LABEL. */ - /* * Structures and constants associated with a Type Enforcement policy. * mac_te represents a Type Enforcement label. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 12 9:31:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A5EA37B409; Sun, 12 May 2002 09:31:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D760D37B403 for ; Sun, 12 May 2002 09:31:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4CGVnU21428 for perforce@freebsd.org; Sun, 12 May 2002 09:31:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 12 May 2002 09:31:49 -0700 (PDT) Message-Id: <200205121631.g4CGVnU21428@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11218 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11218 Change 11218 by rwatson@rwatson_curry on 2002/05/12 09:30:57 Have per-policy userland code for Biba and MLS include per-policy include files. If I botched installation of these include files, then this is broken. Hopefully it's not. :-) Affected files ... ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_biba.c#4 edit ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_mls.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_biba.c#4 (text+ko) ==== @@ -40,6 +40,8 @@ #include #include +#include + #include #include #include ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_mls.c#3 (text+ko) ==== @@ -40,6 +40,8 @@ #include #include +#include + #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 12 11:11:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5468B37B40A; Sun, 12 May 2002 11:11:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9E11737B408 for ; Sun, 12 May 2002 11:11:51 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4CIBpd35131 for perforce@freebsd.org; Sun, 12 May 2002 11:11:51 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 12 May 2002 11:11:51 -0700 (PDT) Message-Id: <200205121811.g4CIBpd35131@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11223 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11223 Change 11223 by jake@jake_sparc64 on 2002/05/12 11:11:10 Enable KTR_TRAP. Affected files ... ... //depot/projects/sparc64/sys/sparc64/conf/SUN4U#30 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/conf/SUN4U#30 (text+ko) ==== @@ -64,7 +64,7 @@ options KTR options KTR_COMPILE=0xffffffff options KTR_ENTRIES=8192 -options KTR_MASK=0 +options KTR_MASK=KTR_TRAP #options NFS_ROOT #options BOOTP To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 12 21: 4:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 941E137B404; Sun, 12 May 2002 21:04:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8E2BC37B405 for ; Sun, 12 May 2002 21:04:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4D44MM25696 for perforce@freebsd.org; Sun, 12 May 2002 21:04:22 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 12 May 2002 21:04:22 -0700 (PDT) Message-Id: <200205130404.g4D44MM25696@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11246 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11246 Change 11246 by jake@jake_sparc64 on 2002/05/12 21:03:32 Fix IF_SEXT(val, 32). The constants need to have type long to handle size > 16. Affected files ... ... //depot/projects/sparc64/sys/sparc64/include/instr.h#10 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/include/instr.h#10 (text+ko) ==== @@ -148,7 +148,8 @@ /* Sign-extend a field of width W */ #define IF_SEXT(x, w) \ - (((x) & (1 << ((w) - 1))) != 0 ? (-1L - ((x) ^ ((1 << (w)) - 1))) : (x)) + (((x) & (1L << ((w) - 1))) != 0 ? \ + (-1L - ((x) ^ ((1L << (w)) - 1))) : (x)) #if 0 /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 12 21:17:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7D7B37B404; Sun, 12 May 2002 21:17:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E11F237B401 for ; Sun, 12 May 2002 21:17:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4D4Hdu30300 for perforce@freebsd.org; Sun, 12 May 2002 21:17:39 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 12 May 2002 21:17:39 -0700 (PDT) Message-Id: <200205130417.g4D4Hdu30300@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11247 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11247 Change 11247 by jake@jake_sparc64 on 2002/05/12 21:16:46 Add code to handle alignment fixups in userland. Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/sys/Makefile.inc#17 edit ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap.c#9 edit ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_align.c#1 add ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_private.h#8 edit ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_setup.c#8 edit Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/sys/Makefile.inc#17 (text+ko) ==== @@ -2,6 +2,7 @@ SRCS+= __sparc_sigtramp_setup.c \ __sparc_utrap.c \ + __sparc_utrap_align.c \ __sparc_utrap_emul.c \ __sparc_utrap_fp_disabled.S \ __sparc_utrap_gen.S \ ==== //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap.c#9 (text+ko) ==== @@ -91,6 +91,7 @@ sig = __emul_insn(uf); break; case UT_MEM_ADDRESS_NOT_ALIGNED: + sig = __unaligned_fixup(uf); break; default: break; ==== //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_private.h#8 (text+ko) ==== @@ -55,6 +55,7 @@ void __emul_store_reg(struct utrapframe *uf, int reg, u_long val); u_long __emul_f3_op2(struct utrapframe *uf, u_int insn); u_long __emul_f3_memop_addr(struct utrapframe *uf, u_int insn); +int __unaligned_fixup(struct utrapframe *uf); void __sparc_utrap(struct utrapframe *); ==== //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_setup.c#8 (text+ko) ==== @@ -41,9 +41,7 @@ { UT_FP_EXCEPTION_IEEE_754, __sparc_utrap_gen, NULL, NULL, NULL }, { UT_FP_EXCEPTION_OTHER, __sparc_utrap_gen, NULL, NULL, NULL }, { UT_ILLEGAL_INSTRUCTION, __sparc_utrap_gen, NULL, NULL, NULL }, -#if 0 { UT_MEM_ADDRESS_NOT_ALIGNED, __sparc_utrap_gen, NULL, NULL, NULL }, -#endif }; static const struct sparc_utrap_install_args uia[] = { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 13 15:45:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 266D337B407; Mon, 13 May 2002 15:45:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4D80537B400 for ; Mon, 13 May 2002 15:45:40 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4DMjev02166 for perforce@freebsd.org; Mon, 13 May 2002 15:45:40 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 13 May 2002 15:45:40 -0700 (PDT) Message-Id: <200205132245.g4DMjev02166@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11284 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11284 Change 11284 by jake@jake_sparc64 on 2002/05/13 15:45:32 Bah. Get the byte order right for unaligned stores. Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_align.c#2 edit Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_align.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ int i; for (i = 0; i < size; i++) - p[i] = val >> (i * 8); + p[i] = val >> ((size - i - 1) * 8); } int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 13 19:28:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9BA837B407; Mon, 13 May 2002 19:28:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id C60E337B401 for ; Mon, 13 May 2002 19:28:03 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 67ACBA900; Mon, 13 May 2002 19:28:51 -0700 (PDT) Date: Mon, 13 May 2002 19:28:51 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11120 for review Message-ID: <20020513192851.N43682@stylus.haikugeek.com> References: <200205101530.g4AFUn510685@freefall.freebsd.org> <3CDC2BB5.366A7BF0@elischer.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <3CDC2BB5.366A7BF0@elischer.org>; from julian@elischer.org on Fri, May 10, 2002 at 01:21:09PM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > Jonathan Mini wrote: > > > - When abandoning a thread (in thread_exit()), push the > > thread into its KSE's spare thread slot, and free the > > thread that is already there (if any). > > I assume there will only be a spare thread at other times in KSE type processes. Yes, except in the exit scenario for a normal process. In this case, we have this: - exit1() -> exit_thread() - exit_thread() pushes current thread to "spare" slot, and mi_throw()'s. - wait1() gets called later, and frees the thread in the spare slot as it cleans up the process. > > - When performing an upcall, pull the spare thread (if > > available) before allocating a new thread from uma. This > > is especially useful in msleep(), where not blocking again > > is highly preferable. > > - When pulling the KSE spare thread, allocate a new spare > > thread for the KSE before returning to userland for the > > upcall. > > I presume only for KSE mode processes. > i.e. for KSE mode processes there is always a spare thread available > unless we have just used it and have not yet returned to userland. > I can see some holes may need patching but should work.. That is exactly what we're doing here. The problem lies in that its theoretically possible for a KSE to schedule an upcall, but another (higher priority) process runs on that CPU that needs to schedule an upcall via the same KSE as well, and must allocate a thread from UMA, which could block. John and I talked about this, and he feels that in that case (which is an edge case to begin with), it'll be ok to block because the system will be really starved anyways. > [ ... lots of nits ... ] I'll look over and respond to the nits later. -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 14 7:11: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B73337B400; Tue, 14 May 2002 07:10:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7640737B406 for ; Tue, 14 May 2002 07:10:48 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4EEAmT65647 for perforce@freebsd.org; Tue, 14 May 2002 07:10:48 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Tue, 14 May 2002 07:10:48 -0700 (PDT) Message-Id: <200205141410.g4EEAmT65647@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11314 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11314 Change 11314 by jake@jake_sparc64 on 2002/05/14 07:09:47 Remove sysctl -a from random seeding. Its broken. Affected files ... ... //depot/projects/sparc64/etc/rc#9 edit Differences ... ==== //depot/projects/sparc64/etc/rc#9 (text+ko) ==== @@ -175,7 +175,7 @@ # harvesting rate up # Entropy below is not great, # but better than nothing. -( ps -fauxww; sysctl -a; date; df -ib; dmesg; ps -fauxww; ) \ +( ps -fauxww; date; df -ib; dmesg; ps -fauxww; ) \ | dd of=/dev/random bs=8k 2>/dev/null cat /bin/ls | dd of=/dev/random bs=8k 2>/dev/null To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 14 7:41:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D89D437B40A; Tue, 14 May 2002 07:39:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 49F4237B41D for ; Tue, 14 May 2002 07:38:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4EEcM275699 for perforce@freebsd.org; Tue, 14 May 2002 07:38:22 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Tue, 14 May 2002 07:38:22 -0700 (PDT) Message-Id: <200205141438.g4EEcM275699@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 11317 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11317 Change 11317 by cvance@cvance_korben on 2002/05/14 07:37:37 Make SEBSD a kernel module: Remove option from MAC and entries in conf/files Add sys/modules/sebsd/Makefile Uncomment entry in sample loader.conf Remove conf/options entry Don't include opt_mac.h anymore (unused) Affected files ... ... //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#8 edit ... //depot/projects/trustedbsd/mac/sys/conf/files#29 edit ... //depot/projects/trustedbsd/mac/sys/conf/options#18 edit ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#28 edit ... //depot/projects/trustedbsd/mac/sys/modules/Makefile#19 edit ... //depot/projects/trustedbsd/mac/sys/modules/sebsd/Makefile#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#8 (text+ko) ==== @@ -269,7 +269,7 @@ mac_none_load="NO" # Null MAC policy mac_seeotheruids_load="NO" # UID visbility MAC policy mac_te_load="NO" # Type Enforcement policy -#sebsd_load="NO" # Security-Enhanced BSD module +sebsd_load="NO" # Security-Enhanced BSD module ############################################################## ### Module loading syntax example ########################## ==== //depot/projects/trustedbsd/mac/sys/conf/files#29 (text+ko) ==== @@ -1299,20 +1299,6 @@ posix4/posix4_mib.c standard security/mac_none/mac_none.c optional mac_none -security/sebsd/sebsd.c optional sebsd -security/sebsd/sebsd_sysctl.c optional sebsd -security/sebsd/avc/avc.c optional sebsd -security/sebsd/ss/avtab.c optional sebsd -security/sebsd/ss/ebitmap.c optional sebsd -security/sebsd/ss/hashtab.c optional sebsd -security/sebsd/ss/init.c optional sebsd -security/sebsd/ss/policydb.c optional sebsd -security/sebsd/ss/queue.c optional sebsd -security/sebsd/ss/services.c optional sebsd -security/sebsd/ss/sidtab.c optional sebsd -security/sebsd/ss/symtab.c optional sebsd -security/sebsd/ss/fileutils.c optional sebsd - ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_alloc.c optional ifs ufs/ffs/ffs_balloc.c optional ffs ==== //depot/projects/trustedbsd/mac/sys/conf/options#18 (text+ko) ==== @@ -108,7 +108,6 @@ CAPABILITIES opt_cap.h MAC opt_mac.h MAC_NONE opt_dontuse.h -SEBSD opt_dontuse.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#28 (text+ko) ==== @@ -32,7 +32,6 @@ options MAC options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART -options SEBSD options INET #InterNETworking options INET6 #IPv6 communications protocols ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#19 (text+ko) ==== @@ -78,6 +78,7 @@ ${_random} \ rl \ rp \ + sebsd \ sf \ sis \ sk \ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#6 (text+ko) ==== @@ -34,7 +34,6 @@ * $FreeBSD$ */ -#include "opt_mac.h" #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 14 8:15:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C539E37B405; Tue, 14 May 2002 08:14:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1EB6737B403 for ; Tue, 14 May 2002 08:14:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4EFE0i81943 for perforce@freebsd.org; Tue, 14 May 2002 08:14:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 14 May 2002 08:14:00 -0700 (PDT) Message-Id: <200205141514.g4EFE0i81943@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11318 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11318 Change 11318 by rwatson@rwatson_curry on 2002/05/14 08:12:41 Integ TrustedBSD MAC branch to base@10755, which is from May 2 and pre-new-gcc. There may be some potential mismerges to fix in kern_exec and kern_fork due to restructuring of that code in the main tree. Affected files ... ... //depot/projects/trustedbsd/mac/Makefile#7 integrate ... //depot/projects/trustedbsd/mac/Makefile.inc1#13 integrate ... //depot/projects/trustedbsd/mac/bin/ps/fmt.c#4 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/freebsd.h#5 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/abi64.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/bsd-4.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/bsd-5.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/cross64.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/dec-bsd.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/dec-osf1.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/ecoff.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/ecoffl.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/elf.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/elf64.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/elfl.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/elfl64.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/elflorion.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/elforion.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/gnu.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/iris3.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/iris4.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/iris4loser.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/iris5.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/iris5gas.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/iris6.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/linux.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/mips-5.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/mips.c#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/mips.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/mips.md#3 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/mips16.S#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/netbsd.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/news4.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/news5.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/nws3250v4.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/osfrose.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/r3900.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/rtems64.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/sni-gas.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/sni-svr4.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/svr3-4.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/svr3-5.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/svr4-4.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/svr4-5.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/svr4-t.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-bsd#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-bsd-gas#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-cross64#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-ecoff#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-elf#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-iris6#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-mips#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-mips-gas#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-osfrose#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-r3900#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-svr3#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-svr3-gas#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-svr4#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/t-svr4-gas#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/vxworks.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-dec-osf1#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-iris#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-iris3#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-iris6#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-mips#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-netbsd#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-nws3250v4#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-osfrose#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-sni-svr4#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-sony#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/x-sysv#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-iris3.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-iris4.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-iris5.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-iris6.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-mips.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-news.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-nws3250v4.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-sysv.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/config/mips/xm-sysv4.h#2 delete ... //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/g++spec.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/integrate.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc.295/stmt.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd.h#3 integrate ... //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#6 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/MANIFEST#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_data.3#2 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#6 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#6 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#6 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam.h#6 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_configure.c#2 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dynamic.c#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_impl.h#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_load.c#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_nullconv.c#1 branch ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_end.c#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_authtok.c#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_start.c#5 integrate ... //depot/projects/trustedbsd/mac/contrib/openpam/misc/gendoc.pl#5 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/ssh_config#4 integrate ... //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config#5 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/gdm#3 integrate ... //depot/projects/trustedbsd/mac/etc/pam.d/rexecd#1 branch ... //depot/projects/trustedbsd/mac/etc/pam.d/xdm#3 integrate ... //depot/projects/trustedbsd/mac/etc/periodic/daily/460.status-mail-rejects#2 integrate ... //depot/projects/trustedbsd/mac/etc/periodic/monthly/200.accounting#3 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#12 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes-o.real#4 integrate ... //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#6 integrate ... //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/freebsd-native.h#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc/stdtime/localtime.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_cancel.c#4 integrate ... //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_poll.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_readv.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_select.c#3 integrate ... //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_wait4.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_writev.c#2 integrate ... //depot/projects/trustedbsd/mac/lib/libpam/libpam/Makefile#10 integrate ... //depot/projects/trustedbsd/mac/libexec/rexecd/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/libexec/rexecd/rexecd.c#4 integrate ... //depot/projects/trustedbsd/mac/release/Makefile#16 integrate ... //depot/projects/trustedbsd/mac/release/alpha/drivers.conf#2 integrate ... //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 integrate ... //depot/projects/trustedbsd/mac/release/i386/drivers.conf#2 integrate ... //depot/projects/trustedbsd/mac/release/pc98/drivers.conf#4 integrate ... //depot/projects/trustedbsd/mac/release/scripts/base-install.sh#2 integrate ... //depot/projects/trustedbsd/mac/release/scripts/bin-install.sh#3 delete ... //depot/projects/trustedbsd/mac/release/scripts/doFS.sh#5 integrate ... //depot/projects/trustedbsd/mac/release/scripts/driver-remove.pl#3 integrate ... //depot/projects/trustedbsd/mac/sbin/fdisk/fdisk.c#7 integrate ... //depot/projects/trustedbsd/mac/sbin/fsck_ffs/fsutil.c#4 integrate ... //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass5.c#4 integrate ... //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#6 integrate ... //depot/projects/trustedbsd/mac/sbin/mount_std/mount_std.c#4 integrate ... //depot/projects/trustedbsd/mac/sbin/nfsd/nfsd.c#3 integrate ... //depot/projects/trustedbsd/mac/sbin/restore/tape.c#5 integrate ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#5 integrate ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile.asm#1 branch ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile.inc#4 integrate ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/bf-586.s#1 branch ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/bf-686.s#1 branch ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/bn-586.s#1 branch ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/cast-586.s#1 branch ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/co-586.s#1 branch ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/crypt586.s#1 branch ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/des-586.s#1 branch ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/md5-586.s#1 branch ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/rc4-586.s#1 branch ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/rc5-586.s#1 branch ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/rmd-586.s#1 branch ... //depot/projects/trustedbsd/mac/secure/lib/libcrypto/i386/sha1-586.s#1 branch ... //depot/projects/trustedbsd/mac/share/man/man4/em.4#6 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/wi.4#2 integrate ... //depot/projects/trustedbsd/mac/share/man/man4/wi.4tbl#1 branch ... //depot/projects/trustedbsd/mac/share/man/man4/wi.4tl#1 branch ... //depot/projects/trustedbsd/mac/share/man/man5/drivers.conf.5#2 integrate ... //depot/projects/trustedbsd/mac/share/man/man7/release.7#3 integrate ... //depot/projects/trustedbsd/mac/share/man/man9/Makefile#16 integrate ... //depot/projects/trustedbsd/mac/share/man/man9/zone.9#5 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/alpha/clock.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/alpha/mem.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#9 integrate ... //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/conf/NOTES#6 integrate ... //depot/projects/trustedbsd/mac/sys/conf/files#30 integrate ... //depot/projects/trustedbsd/mac/sys/conf/files.powerpc#4 integrate ... //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#7 integrate ... //depot/projects/trustedbsd/mac/sys/conf/kern.pre.mk#7 integrate ... //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aac/aac_cam.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_timer.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aicasm/Makefile#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/drm/drm_fops.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/isp/isp.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/dev/md/md.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/acphy.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/mii/qsphy.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/dev/my/if_my.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/ac97_if.m#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/feeder_if.m#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/mixer_if.m#2 integrate ... //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/dev/usb/usbdi.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/dev/wi/wi_hostap.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/fs/deadfs/dead_vnops.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vnops.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.h#7 integrate ... //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/i386/acpica/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/sys/i386/acpica/genwakecode.pl#2 delete ... //depot/projects/trustedbsd/mac/sys/i386/acpica/genwakecode.sh#1 branch ... //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#11 integrate ... //depot/projects/trustedbsd/mac/sys/i386/conf/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#17 integrate ... //depot/projects/trustedbsd/mac/sys/i386/conf/makeLINT.pl#2 delete ... //depot/projects/trustedbsd/mac/sys/i386/conf/makeLINT.sed#1 branch ... //depot/projects/trustedbsd/mac/sys/i386/conf/makeLINT.sh#1 branch ... //depot/projects/trustedbsd/mac/sys/i386/i386/mp_clock.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/i386/isa/clock.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/i386/isa/loran.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/clock.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/exception.s#7 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#15 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/mca.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/mp_machdep.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/include/ansi.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/ia64/include/frame.h#2 integrate ... //depot/projects/trustedbsd/mac/sys/kern/init_main.c#20 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#15 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_environment.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#18 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#13 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#10 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#18 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_tc.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/kern/makeobjops.pl#3 delete ... //depot/projects/trustedbsd/mac/sys/kern/subr_hints.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_log.c#2 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#15 integrate ... //depot/projects/trustedbsd/mac/sys/kern/sys_generic.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/kern/tty.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#23 integrate ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#17 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#13 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vfs_init.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vnode_if.pl#3 delete ... //depot/projects/trustedbsd/mac/sys/modules/drm/mga/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/sys/modules/drm/r128/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/sys/modules/drm/radeon/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/sys/net/bpf.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/net/if_spppsubr.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/net/if_tap.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/net/if_tun.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/net/rtsock.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_cm.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_cm.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_subr.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/netatm/atm_var.h#6 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/accf_data.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/accf_http.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#14 integrate ... //depot/projects/trustedbsd/mac/sys/netkey/keysock.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC#10 integrate ... //depot/projects/trustedbsd/mac/sys/pc98/pc98/clock.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/pci/if_dc.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/clock.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#7 integrate ... //depot/projects/trustedbsd/mac/sys/sys/malloc.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/sys/param.h#9 integrate ... //depot/projects/trustedbsd/mac/sys/sys/proc.h#14 integrate ... //depot/projects/trustedbsd/mac/sys/sys/signalvar.h#6 integrate ... //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#14 integrate ... //depot/projects/trustedbsd/mac/sys/sys/time.h#6 integrate ... //depot/projects/trustedbsd/mac/sys/sys/timepps.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/sys/timetc.h#7 integrate ... //depot/projects/trustedbsd/mac/sys/sys/user.h#6 integrate ... //depot/projects/trustedbsd/mac/sys/tools/makeobjops.awk#1 branch ... //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#3 integrate ... //depot/projects/trustedbsd/mac/sys/ufs/ufs/extattr.h#3 integrate ... //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#14 integrate ... //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#33 integrate ... //depot/projects/trustedbsd/mac/sys/vm/uma.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/vm/uma_dbg.c#1 branch ... //depot/projects/trustedbsd/mac/sys/vm/uma_dbg.h#1 branch ... //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_map.h#7 integrate ... //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#8 integrate ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.I.out#2 integrate ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.R.out#1 branch ... //depot/projects/trustedbsd/mac/tools/regression/usr.bin/xargs/regress.sh#3 integrate ... //depot/projects/trustedbsd/mac/tools/tools/vop_table/vop_table.tcl#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/Makefile#9 integrate ... //depot/projects/trustedbsd/mac/usr.bin/csplit/Makefile#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/csplit/csplit.1#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/csplit/csplit.c#1 branch ... //depot/projects/trustedbsd/mac/usr.bin/m4/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/eval.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/expr.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/gnum4.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/look.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/main.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/misc.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/pathnames.h#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/m4/trace.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/truss/alpha-fbsd.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/xargs/strnsubst.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.bin/xargs/xargs.1#3 integrate ... //depot/projects/trustedbsd/mac/usr.bin/xargs/xargs.c#7 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/Makefile#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/crunchide.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/exec_aout.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/extern.h#2 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/create/perform.c#6 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/main.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/show.c#3 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ppp/command.c#6 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ppp/fsm.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/ppp/lcp.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/Makefile#6 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dist.c#7 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/media.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/package.c#4 integrate ... //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/sysinstall.h#6 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.252 2002/04/29 15:22:01 ru Exp $ +# $FreeBSD: src/Makefile,v 1.253 2002/04/30 11:50:01 ru Exp $ # # The user-driven targets are: # @@ -83,13 +83,13 @@ # order, but that's not important. # TGTS= all all-man buildkernel buildworld checkdpadd clean \ - cleandepend cleandir depend distribute distribworld everything \ + cleandepend cleandir depend distribute distributeworld everything \ hierarchy includes install installcheck installkernel \ reinstallkernel installmost installworld libraries lint \ mk most obj objlink regress rerelease tags update .ORDER: buildworld installworld -.ORDER: buildworld distribworld +.ORDER: buildworld distributeworld .ORDER: buildkernel installkernel .ORDER: buildkernel reinstallkernel ==== //depot/projects/trustedbsd/mac/Makefile.inc1#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.262 2002/04/29 15:22:01 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.266 2002/04/30 23:29:00 bde Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -57,9 +57,6 @@ .if exists(${.CURDIR}/bin) SUBDIR+= bin .endif -.if exists(${.CURDIR}/etc) -SUBDIR+= etc -.endif .if exists(${.CURDIR}/games) && !defined(NOGAMES) SUBDIR+= games .endif @@ -96,6 +93,11 @@ SUBDIR+= usr.sbin .endif +# etc must be last for "distribute" to work +.if exists(${.CURDIR}/etc) +SUBDIR+= etc +.endif + # These are last, since it is nice to at least get the base system # rebuilt before you do them. .if defined(LOCAL_DIRS) @@ -353,14 +355,14 @@ # # Installs everything compiled by a 'buildworld'. # -installworld: installcheck +distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} for prog in [ awk cat chflags chmod chown date echo egrep find grep \ - ln make makewhatis mkdir mtree mv perl rm sed sh sysctl \ + ln make makewhatis mkdir mtree mv perl pwd_mkdb rm sed sh sysctl \ test true uname wc zic; do \ cp `which $$prog` ${INSTALLTMP}; \ done - cd ${.CURDIR}; ${IMAKE} reinstall + cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} rm -rf ${INSTALLTMP} # @@ -388,14 +390,11 @@ cd ${.CURDIR}/share/man; ${MAKE} makedb .endif -# -# distribworld -# -# Front-end to distribute to make sure the search path contains -# the object directory. Needed for miniperl. -# -distribworld: - cd ${.CURDIR}; PATH=${TMPPATH} ${MAKE} -f Makefile.inc1 distribute +redistribute: + @echo "--------------------------------------------------------------" + @echo ">>> Distributing everything.." + @echo "--------------------------------------------------------------" + cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 distribute # # buildkernel and installkernel @@ -646,7 +645,8 @@ cross-tools: .for _tool in ${_btxld} ${_elf2exe} \ - gnu/usr.bin/binutils usr.bin/objformat gnu/usr.bin/cc ${_xlint} + gnu/usr.bin/binutils usr.bin/objformat usr.sbin/crunch/crunchide \ + gnu/usr.bin/cc ${_xlint} cd ${.CURDIR}/${_tool}; \ ${MAKE} obj; \ ${MAKE} depend; \ @@ -666,19 +666,22 @@ includes: cd ${.CURDIR}/include; ${MAKE} -B all install cd ${.CURDIR}/gnu/include; ${MAKE} install + cd ${.CURDIR}/gnu/lib/csu; ${MAKE} beforeinstall + cd ${.CURDIR}/gnu/lib/libdialog; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libobjc; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libreadline/readline; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libregex; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/lib/libstdc++; ${MAKE} beforeinstall - cd ${.CURDIR}/gnu/lib/libdialog; ${MAKE} beforeinstall cd ${.CURDIR}/gnu/usr.bin/cc/cc1plus; ${MAKE} beforeinstall -.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) -.if exists(${.CURDIR}/secure/lib/libcrypto) - cd ${.CURDIR}/secure/lib/libcrypto; ${MAKE} beforeinstall -.endif -.if exists(${.CURDIR}/secure/lib/libssl) - cd ${.CURDIR}/secure/lib/libssl; ${MAKE} beforeinstall -.endif +.if exists(${.CURDIR}/kerberos5) && !defined(NOCRYPT) && \ + defined(MAKE_KERBEROS5) + cd ${.CURDIR}/kerberos5/lib/libasn1; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libhdb; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkadm5clnt; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkadm5srv; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkafs5; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libkrb5; ${MAKE} beforeinstall + cd ${.CURDIR}/kerberos5/lib/libsl; ${MAKE} beforeinstall .endif .if exists(${.CURDIR}/kerberosIV) && !defined(NOCRYPT) && \ defined(MAKE_KERBEROS4) @@ -693,26 +696,16 @@ .else cd ${.CURDIR}/lib/libtelnet; ${MAKE} beforeinstall .endif -.if exists(${.CURDIR}/kerberos5) && !defined(NOCRYPT) && \ - defined(MAKE_KERBEROS5) - cd ${.CURDIR}/kerberos5/lib/libasn1; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libhdb; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkadm5clnt; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkadm5srv; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkafs5; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libkrb5; ${MAKE} beforeinstall - cd ${.CURDIR}/kerberos5/lib/libsl; ${MAKE} beforeinstall -.endif .if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}) cd ${.CURDIR}/lib/csu/${MACHINE_ARCH}; ${MAKE} beforeinstall .endif - cd ${.CURDIR}/gnu/lib/csu; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libalias; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libatm; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libdevstat; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libc; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcalendar; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcam; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libcom_err; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libdevstat; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libdisk; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libedit; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libfetch; ${MAKE} beforeinstall @@ -720,25 +713,32 @@ cd ${.CURDIR}/lib/libkvm; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libmd; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libmp; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/msun; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libncp; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libncurses; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libnetgraph; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libopie; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libpam/libpam; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libpcap; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libradius; ${MAKE} beforeinstall cd ${.CURDIR}/lib/librpcsvc; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libpam/libpam; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libsbuf; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libstand; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libtacplus; ${MAKE} beforeinstall - cd ${.CURDIR}/lib/libcom_err; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libusbhid; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libutil; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libvgl; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libwrap; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libypclnt; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libz; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/msun; ${MAKE} beforeinstall +.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/secure/lib/libcrypto) + cd ${.CURDIR}/secure/lib/libcrypto; ${MAKE} beforeinstall +.endif +.if exists(${.CURDIR}/secure/lib/libssl) + cd ${.CURDIR}/secure/lib/libssl; ${MAKE} beforeinstall +.endif +.endif cd ${.CURDIR}/usr.bin/lex; ${MAKE} beforeinstall # ==== //depot/projects/trustedbsd/mac/bin/ps/fmt.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.17 2002/02/03 14:43:04 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.18 2002/05/02 05:46:37 jmallett Exp $"); #if 0 #ifndef lint @@ -72,8 +72,8 @@ if (buf == NULL) { if ((arg_max = sysconf(_SC_ARG_MAX)) == -1) errx(1, "sysconf _SC_ARG_MAX failed"); - if ((buf = malloc((u_int)(4 * arg_max) + 1)) == NULL) - errx(1, "malloc failed"); + if ((buf = malloc((size_t)(4 * arg_max) + 1)) == NULL) + err(1, "malloc"); } if (*argv == 0) { ==== //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/freebsd.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* Definitions for Intel 386 running FreeBSD with either a.out or ELF format - Copyright (C) 1996-2000 Free Software Foundation, Inc. + Copyright (C) 1996, 2000, 2002 Free Software Foundation, Inc. Contributed by Eric Youngdale. Modified for stabs-in-ELF by H.J. Lu. Adapted from GNU/Linux version by John Polstra. @@ -23,7 +23,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.43 2002/04/24 04:21:41 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc.295/config/i386/freebsd.h,v 1.44 2002/05/01 19:20:37 obrien Exp $ */ #undef CPP_PREDEFINES #define CPP_PREDEFINES \ @@ -38,7 +38,7 @@ #undef ASM_SPEC #define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" -#undef ASM_FINAL_SPEC +#undef ASM_FINAL_SPEC #define ASM_FINAL_SPEC "%|" /* Provide a LINK_SPEC appropriate for FreeBSD. Here we provide support @@ -49,9 +49,6 @@ have the time to search for those flags. I am sure how to add support for -soname shared_object_name. H.J. - I took out %{v:%{!V:-V}}. It is too much :-(. They can use - -Wl,-V. - When the -shared link option is used a final link is not being done. */ @@ -64,14 +61,19 @@ %{assert*} %{R*}} \ %{!maout: \ %{Wl,*:%*} \ + %{v:-V} \ %{assert*} %{R*} %{rpath*} %{defsym*} \ %{shared:-Bshareable %{h*} %{soname*}} \ - %{symbolic:-Bsymbolic} \ %{!shared: \ %{!static: \ %{rdynamic: -export-dynamic} \ %{!dynamic-linker: -dynamic-linker /usr/libexec/ld-elf.so.1}} \ - %{static:-Bstatic}}}" + %{static:-Bstatic}} \ + %{symbolic:-Bsymbolic}}" + +/* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical + crtbegin.o file (see crtstuff.c) which provides part of the support for + getting C++ file-scope static object constructed before entering `main'. */ #undef STARTFILE_SPEC #define STARTFILE_SPEC "\ @@ -86,10 +88,12 @@ %{!pg: \ %{p:gcrt1.o%s} \ %{!p:crt1.o%s}}} \ - crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}" + crti.o%s \ + %{!shared:crtbegin.o%s} \ + %{shared:crtbeginS.o%s}}" /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. Here we tack on our - own magical crtend.o file (compare w/crtstuff.c) which provides part of the + own magical crtend.o file (see crtstuff.c) which provides part of the support for getting C++ file-scope static object constructed before entering `main', followed by the normal "finalizer" file, `crtn.o'. */ @@ -102,20 +106,23 @@ /************************[ Target stuff ]***********************************/ -/* Define the actual types of some ANSI-mandated types. +/* Define the actual types of some ANSI-mandated types. Needs to agree with . GCC defaults come from c-decl.c, c-common.c, and config//.h. */ -#undef SIZE_TYPE +#undef SIZE_TYPE #define SIZE_TYPE "unsigned int" - -#undef PTRDIFF_TYPE + +#undef PTRDIFF_TYPE #define PTRDIFF_TYPE "int" +#undef WCHAR_TYPE_SIZE +#define WCHAR_TYPE_SIZE BITS_PER_WORD + /* This is the pseudo-op used to generate a 32-bit word of data with a specific value in some section. */ -#undef INT_ASM_OP +#undef INT_ASM_OP #define INT_ASM_OP ".long" /* Biggest alignment supported by the object file format of this @@ -151,27 +158,23 @@ #define TARGET_DEFAULT \ (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387) -/* Prefix for internally generated assembler labels. If we aren't using - underscores, we are using prefix `.'s to identify labels that should - be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ -#undef LPREFIX -#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") +/* Don't default to pcc-struct-return, we want to retain compatibility with + older gcc versions AND pcc-struct-return is nonreentrant. + (even though the SVR4 ABI for the i386 says that records and unions are + returned in memory). */ + +#undef DEFAULT_PCC_STRUCT_RETURN +#define DEFAULT_PCC_STRUCT_RETURN 0 /* The a.out tools do not support "linkonce" sections. */ #undef SUPPORTS_ONE_ONLY #define SUPPORTS_ONE_ONLY TARGET_ELF -/* Enable alias attribute support. */ -#undef SET_ASM_OP -#define SET_ASM_OP ".set" - -/* The a.out tools do not support "Lscope" .stabs symbols. */ -#undef NO_DBX_FUNCTION_END -#define NO_DBX_FUNCTION_END TARGET_AOUT - -/* In ELF, the function stabs come first, before the relative offsets. */ -#undef DBX_FUNCTION_FIRST -#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF +/* Prefix for internally generated assembler labels. If we aren't using + underscores, we are using prefix `.'s to identify labels that should + be ignored, as in `i386/gas.h' --karl@cs.umb.edu */ +#undef LPREFIX +#define LPREFIX ((TARGET_UNDERSCORES) ? "L" : ".L") /* supply our own hook for calling __main() from main() */ #undef INVOKE__main @@ -255,11 +258,19 @@ /************************[ Assembler stuff ]********************************/ +/* Override the default comment-starter of "/" from unix.h. */ +#undef ASM_COMMENT_START +#define ASM_COMMENT_START "#" + #undef ASM_APP_ON #define ASM_APP_ON "#APP\n" #undef ASM_APP_OFF -#define ASM_APP_OFF "#NO_APP\n" +#define ASM_APP_OFF "#NO_APP\n" + +/* Enable alias attribute support. */ +#undef SET_ASM_OP +#define SET_ASM_OP ".set" /* This is how to begin an assembly language file. The .file command should always begin the output. @@ -274,8 +285,8 @@ } while (0) /* This is how to store into the string BUF - the symbol_ref name of an internal numbered label where - PREFIX is the class of label and NUM is the number within the class. + the symbol_ref name of an internal numbered label where + PREFIX is the class of label and NUM is the number within the class. This is suitable for output with `assemble_name'. */ #undef ASM_GENERATE_INTERNAL_LABEL #define ASM_GENERATE_INTERNAL_LABEL(BUF, PREFIX, NUMBER) \ @@ -405,7 +416,6 @@ } \ } while (0) - #undef ASM_OUTPUT_SOURCE_LINE #define ASM_OUTPUT_SOURCE_LINE(FILE, LINE) \ do { \ @@ -503,10 +513,10 @@ } while (0) /* Switch into a generic section. - + We make the section read-only and executable for a function decl, read-only for a const data decl, and writable for a non-const data decl. - + If the section has already been defined, we must not emit the attributes here. The SVR4 assembler does not recognize section redefinitions. @@ -666,13 +676,21 @@ some don't. *OLD* GAS requires the %cl argument, so override i386/unix.h. */ - + #undef AS3_SHIFT_DOUBLE #define AS3_SHIFT_DOUBLE(a,b,c,d) AS3 (a,b,c,d) /************************[ Debugger stuff ]*********************************/ +/* The a.out tools do not support "Lscope" .stabs symbols. */ +#undef NO_DBX_FUNCTION_END +#define NO_DBX_FUNCTION_END TARGET_AOUT + +/* In ELF, the function stabs come first, before the relative offsets. */ +#undef DBX_FUNCTION_FIRST +#define DBX_CHECK_FUNCTION_FIRST TARGET_ELF + /* Copy this from the svr4 specifications... */ /* Define the register numbers to be used in Dwarf debugging information. The SVR4 reference port C compiler uses the following register numbers ==== //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/g++spec.c#2 (text+ko) ==== @@ -18,6 +18,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc.295/cp/g++spec.c,v 1.3 2002/05/01 20:04:18 obrien Exp $ */ + #include "config.h" #include "system.h" @@ -31,10 +33,16 @@ #ifndef MATH_LIBRARY #define MATH_LIBRARY "-lm" #endif +#ifndef MATH_LIBRARY_PROFILE +#define MATH_LIBRARY_PROFILE "-lm" +#endif #ifndef LIBSTDCXX #define LIBSTDCXX "-lstdc++" #endif +#ifndef LIBSTDCXX_PROFILE +#define LIBSTDCXX_PROFILE "-lstdc++" +#endif void lang_specific_driver (fn, in_argc, in_argv, in_added_libraries) @@ -45,6 +53,9 @@ { int i, j; + /* If non-zero, the user gave us the `-p' or `-pg' flag. */ + int saw_profile_flag = 0; + /* If non-zero, the user gave us the `-v' flag. */ int saw_verbose_flag = 0; @@ -135,6 +146,8 @@ } else if (strcmp (argv[i], "-lc") == 0) args[i] |= WITHLIBC; + else if (strcmp (argv[i], "-pg") == 0 || strcmp (argv[i], "-p") == 0) + saw_profile_flag++; else if (strcmp (argv[i], "-v") == 0) { saw_verbose_flag = 1; @@ -236,14 +249,14 @@ /* Add `-lstdc++' if we haven't already done so. */ if (library) { - arglist[j++] = LIBSTDCXX; + arglist[j++] = saw_profile_flag ? LIBSTDCXX_PROFILE : LIBSTDCXX; added_libraries++; } if (saw_math) arglist[j++] = saw_math; else if (library && need_math) { - arglist[j++] = MATH_LIBRARY; + arglist[j++] = saw_profile_flag ? MATH_LIBRARY_PROFILE : MATH_LIBRARY; added_libraries++; } if (saw_libc) ==== //depot/projects/trustedbsd/mac/contrib/gcc.295/integrate.c#2 (text+ko) ==== @@ -19,6 +19,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc.295/integrate.c,v 1.2 2002/05/01 19:40:55 obrien Exp $ */ + #include "config.h" #include "system.h" @@ -1608,6 +1610,20 @@ if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_NEEDS_CONTEXT) static_chain_value = lookup_static_chain (fndecl); + /* If the inline function has these flags sets, that means that + coresponding global flags should be set for this function. */ + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_CALLS_SETJMP) + current_function_calls_setjmp = 1; + + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_CALLS_LONGJMP) + current_function_calls_longjmp = 1; + + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_HAS_NONLOCAL_LABEL) + current_function_has_nonlocal_label = 1; + + if (FUNCTION_FLAGS (header) & FUNCTION_FLAGS_USES_CONST_POOL) + current_function_uses_const_pool = 1; + if (GET_CODE (parm_insns) == NOTE && NOTE_LINE_NUMBER (parm_insns) > 0) { ==== //depot/projects/trustedbsd/mac/contrib/gcc.295/stmt.c#2 (text+ko) ==== @@ -19,6 +19,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc.295/stmt.c,v 1.2 2002/05/01 19:40:55 obrien Exp $ */ + /* This file handles the generation of rtl code from tree structure above the level of expressions, using subroutines in exp*.c and emit-rtl.c. @@ -4027,6 +4029,10 @@ cleanup = protect_with_terminate (cleanup); expand_eh_region_end (cleanup); } + else + { + do_pending_stack_adjust(); + } } if (reachable) ==== //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* Base configuration file for all FreeBSD targets. - Copyright (C) 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU CC. @@ -21,116 +21,72 @@ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify their commonalities. - Adapted from /usr/src/contrib/gcc/config/i386/freebsd.h, - /usr/src/contrib/gcc/config/svr4.h & - egcs/gcc/config/i386/freebsd-elf.h by - David O'Brien . */ + Adapted from gcc/config/i386/freebsd-elf.h by + David O'Brien . + Further work by David O'Brien and + Loren J. Rittle . */ -/* $FreeBSD: src/contrib/gcc/config/freebsd.h,v 1.36 2001/05/14 22:45:26 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd.h,v 1.37 2002/04/30 17:22:42 obrien Exp $ */ - -/* Cpp, assembler, linker, library, and startfile spec's. */ +/* In case we need to know. */ +#define USING_CONFIG_FREEBSD 1 /* This defines which switch letters take arguments. On FreeBSD, most of the normal cases (defined in gcc.c) apply, and we also have -h* and -z* options (for the linker) (coming from SVR4). We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */ -#define FBSD_SWITCH_TAKES_ARG(CHAR) \ - (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ - || (CHAR) == 'h' \ - || (CHAR) == 'z' /* ignored by ld */ \ - || (CHAR) == 'R') - #undef SWITCH_TAKES_ARG #define SWITCH_TAKES_ARG(CHAR) (FBSD_SWITCH_TAKES_ARG(CHAR)) -/* This defines which multi-letter switches take arguments. */ - -#define FBSD_WORD_SWITCH_TAKES_ARG(STR) \ - (DEFAULT_WORD_SWITCH_TAKES_ARG (STR) \ - || !strcmp ((STR), "rpath") || !strcmp ((STR), "rpath-link") \ - || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") \ - || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker")) - #undef WORD_SWITCH_TAKES_ARG #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) -/* Place spaces around this string. We depend on string splicing to produce - the final CPP_PREDEFINES value. */ - -#define FBSD_CPP_PREDEFINES \ - " -D__FreeBSD__=5 -D__FreeBSD_cc_version=500002 -Dunix -Asystem(unix) -Asystem(FreeBSD) " - -#define FBSD_CPP_SPEC " \ - %(cpp_cpu) \ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 14 8:16:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADF6A37B405; Tue, 14 May 2002 08:16:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8DE6637B403 for ; Tue, 14 May 2002 08:16:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4EFGPh82903 for perforce@freebsd.org; Tue, 14 May 2002 08:16:25 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Tue, 14 May 2002 08:16:25 -0700 (PDT) Message-Id: <200205141516.g4EFGPh82903@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11319 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11319 Change 11319 by jake@jake_sparc64 on 2002/05/14 08:15:28 Make read only etc work again. Affected files ... ... //depot/projects/sparc64/etc/rc.diskless1#3 edit Differences ... ==== //depot/projects/sparc64/etc/rc.diskless1#3 (text+ko) ==== @@ -125,7 +125,7 @@ # if the info is available via dhcp/kenv # build the resolv.conf # -if [ ! -e /etc/resolv.conf ]; then +if [ -d /conf/default/etc -a ! -e /etc/resolv.conf ]; then echo domain `kenv dhcp.domain-name` > /etc/resolv.conf set `kenv dhcp.domain-name-servers` To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 14 8:22:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D02CE37B40C; Tue, 14 May 2002 08:22:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0844D37B409 for ; Tue, 14 May 2002 08:22:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4EFMbJ85328 for perforce@freebsd.org; Tue, 14 May 2002 08:22:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 14 May 2002 08:22:37 -0700 (PDT) Message-Id: <200205141522.g4EFMbJ85328@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11320 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11320 Change 11320 by rwatson@rwatson_curry on 2002/05/14 08:21:40 Re-insert trash_mem() call in the slab case, but do it before preserving the memory type so as (in theory) not to break the invariants checking. Don't remember if the new UMA code has memory trashing; if it does we can probably remove our custom MAC branch memory trashing. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#10 (text+ko) ==== @@ -255,6 +255,7 @@ addr, mem); if (!(slab->us_flags & UMA_SLAB_MALLOC)) { + trash_mem(addr, size); #ifdef INVARIANTS struct malloc_type **mtp = addr; #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 14 8:23:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E43F737B409; Tue, 14 May 2002 08:23:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2F88537B401 for ; Tue, 14 May 2002 08:23:40 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4EFNei85420 for perforce@freebsd.org; Tue, 14 May 2002 08:23:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 14 May 2002 08:23:40 -0700 (PDT) Message-Id: <200205141523.g4EFNei85420@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11321 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11321 Change 11321 by rwatson@rwatson_curry on 2002/05/14 08:22:54 Fix mis-merge: code that moved in the main tree to another location wasn't removed from the old location in our tree. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#11 (text+ko) ==== @@ -556,18 +556,6 @@ VREF(p2->p_textvp); if (p2->p_textdvp) VREF(p2->p_textdvp); - - if (flags & RFCFDG) - fd = fdinit(td); - else if (flags & RFFDG) { - FILEDESC_LOCK(p1->p_fd); - fd = fdcopy(td); - FILEDESC_UNLOCK(p1->p_fd); - } else - fd = fdshare(p1); - sx_xlock(&proctree_lock); - PGRP_LOCK(p1->p_pgrp); - PROC_LOCK(p2); p2->p_fd = fd; PROC_UNLOCK(p1); PROC_UNLOCK(p2); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 14 9:53:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33AD137B406; Tue, 14 May 2002 09:53:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38]) by hub.freebsd.org (Postfix) with ESMTP id 1692937B400; Tue, 14 May 2002 09:53:11 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc51.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020514164021.DUOJ29832.rwcrmhc51.attbi.com@InterJet.elischer.org>; Tue, 14 May 2002 16:40:21 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id JAA39789; Tue, 14 May 2002 09:39:29 -0700 (PDT) Date: Tue, 14 May 2002 09:39:28 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11120 for review In-Reply-To: <20020513192851.N43682@stylus.haikugeek.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG am on end of long piece of wet string in Hungary back in real world after 21st.. chat thenn.. in themean while, work to get diffs working and push peter/john for a commit.. Julian On Mon, 13 May 2002, Jonathan Mini wrote: > Julian Elischer [julian@elischer.org] wrote : > > > Jonathan Mini wrote: > > > > > - When abandoning a thread (in thread_exit()), push the > > > thread into its KSE's spare thread slot, and free the > > > thread that is already there (if any). > > > > I assume there will only be a spare thread at other times in KSE type processes. > > Yes, except in the exit scenario for a normal process. In this case, we have > this: > > - exit1() -> exit_thread() > - exit_thread() pushes current thread to "spare" slot, and > mi_throw()'s. > - wait1() gets called later, and frees the thread in the spare > slot as it cleans up the process. > > > > - When performing an upcall, pull the spare thread (if > > > available) before allocating a new thread from uma. This > > > is especially useful in msleep(), where not blocking again > > > is highly preferable. > > > - When pulling the KSE spare thread, allocate a new spare > > > thread for the KSE before returning to userland for the > > > upcall. > > > > I presume only for KSE mode processes. > > i.e. for KSE mode processes there is always a spare thread available > > unless we have just used it and have not yet returned to userland. > > I can see some holes may need patching but should work.. > > That is exactly what we're doing here. The problem lies in that its > theoretically possible for a KSE to schedule an upcall, but another > (higher priority) process runs on that CPU that needs to schedule an upcall > via the same KSE as well, and must allocate a thread from UMA, which could > block. > > John and I talked about this, and he feels that in that case (which is an > edge case to begin with), it'll be ok to block because the system will > be really starved anyways. > > > [ ... lots of nits ... ] > > I'll look over and respond to the nits later. > > -- > Jonathan Mini > http://www.haikugeek.com > > "He who is not aware of his ignorance will be only misled by his knowledge." > -- Richard Whatley > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 14 11:17:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AFB837B406; Tue, 14 May 2002 11:17:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 77E3037B405 for ; Tue, 14 May 2002 11:17:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4EIHO111230 for perforce@freebsd.org; Tue, 14 May 2002 11:17:24 -0700 (PDT) (envelope-from des@freebsd.org) Date: Tue, 14 May 2002 11:17:24 -0700 (PDT) Message-Id: <200205141817.g4EIHO111230@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 11326 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11326 Change 11326 by des@des.at.des.thinksec.com on 2002/05/14 11:17:11 Add openpam_nullconv(3) Affected files ... ... //depot/projects/openpam/doc/man/Makefile#7 edit ... //depot/projects/openpam/doc/man/openpam_nullconv.3#1 add Differences ... ==== //depot/projects/openpam/doc/man/Makefile#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/doc/man/Makefile#6 $ +# $P4: //depot/projects/openpam/doc/man/Makefile#7 $ # MAN = @@ -39,6 +39,7 @@ MAN += openpam_free_data.3 MAN += openpam_get_option.3 MAN += openpam_log.3 +MAN += openpam_nullconv.3 MAN += openpam_restore_cred.3 MAN += openpam_set_option.3 MAN += openpam_ttyconv.3 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 14 11:41: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7ECAC37B404; Tue, 14 May 2002 11:40:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EBAAE37B407 for ; Tue, 14 May 2002 11:40:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4EIerr14886 for perforce@freebsd.org; Tue, 14 May 2002 11:40:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 14 May 2002 11:40:53 -0700 (PDT) Message-Id: <200205141840.g4EIerr14886@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11329 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11329 Change 11329 by rwatson@rwatson_tislabs on 2002/05/14 11:40:47 Strategic diff reduction: mac.h no longer required to include mbuf.h. Affected files ... ... //depot/projects/trustedbsd/mac/sys/netinet/in.c#6 edit ... //depot/projects/trustedbsd/mac/sys/netinet/in_gif.c#5 edit ... //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/in.c#6 (text+ko) ==== @@ -35,7 +35,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet/in_gif.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.c#11 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 14 11:47:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9368D37B405; Tue, 14 May 2002 11:47:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9483837B403 for ; Tue, 14 May 2002 11:47:02 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4EIl2815405 for perforce@freebsd.org; Tue, 14 May 2002 11:47:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 14 May 2002 11:47:02 -0700 (PDT) Message-Id: <200205141847.g4EIl2815405@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11331 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11331 Change 11331 by rwatson@rwatson_tislabs on 2002/05/14 11:46:19 Strategic diff reduction: mac.h no longer explicitly needed just to include mbuf.h. Affected files ... ... //depot/projects/trustedbsd/mac/sys/netinet/in_proto.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet/in_rmx.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet/ip_ecn.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet/ip_encap.c#5 edit ... //depot/projects/trustedbsd/mac/sys/netinet/ip_flow.c#3 edit ... //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.c#9 edit ... //depot/projects/trustedbsd/mac/sys/netinet/tcp_timer.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet/tcp_usrreq.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/in_proto.c#4 (text+ko) ==== @@ -41,7 +41,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet/in_rmx.c#4 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.c#4 (text+ko) ==== @@ -60,7 +60,6 @@ #include #include #include -#include #include #include /* XXX */ #include ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_ecn.c#4 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_encap.c#5 (text+ko) ==== @@ -65,7 +65,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_flow.c#3 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.c#9 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_timer.c#4 (text+ko) ==== @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_usrreq.c#7 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include #ifdef INET6 #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 14 12: 4:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1C7437B401; Tue, 14 May 2002 12:04:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3E01937B409 for ; Tue, 14 May 2002 12:04:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4EJ4OQ16610 for perforce@freebsd.org; Tue, 14 May 2002 12:04:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 14 May 2002 12:04:24 -0700 (PDT) Message-Id: <200205141904.g4EJ4OQ16610@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11333 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11333 Change 11333 by rwatson@rwatson_tislabs on 2002/05/14 12:03:36 Sync MAC to GENERIC. The only difference appeared to be the $FreeBSD$, interestingly. :-) Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#29 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#29 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.340 2002/04/27 01:31:16 scottl Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.341 2002/05/03 17:59:22 jmallett Exp $ machine i386 cpu I486_CPU To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 14 14:52:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0219E37B407; Tue, 14 May 2002 14:52:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id DEF2137B405 for ; Tue, 14 May 2002 14:52:14 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 9C451A900; Tue, 14 May 2002 14:52:47 -0700 (PDT) Date: Tue, 14 May 2002 14:52:47 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11120 for review Message-ID: <20020514145247.O43682@stylus.haikugeek.com> References: <20020513192851.N43682@stylus.haikugeek.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from julian@elischer.org on Tue, May 14, 2002 at 09:39:28AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > am on end of long piece of wet string in Hungary > back in real world after 21st.. > chat thenn.. > in themean while, work to get diffs working and push peter/john for a > commit.. *nods* Will do. -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 14 19:44:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF38337B40A; Tue, 14 May 2002 19:42:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 572B037B409 for ; Tue, 14 May 2002 19:42:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4F2gr627245 for perforce@freebsd.org; Tue, 14 May 2002 19:42:53 -0700 (PDT) (envelope-from chris@freebsd.org) Date: Tue, 14 May 2002 19:42:53 -0700 (PDT) Message-Id: <200205150242.g4F2gr627245@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 11347 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11347 Change 11347 by chris@chris_holly on 2002/05/14 19:42:28 Integ. Affected files ... ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/laptop/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/mh/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#2 integrate ... //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/md5.1#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/accept.2#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/listen.2#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/release.7#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/MAKEDEV.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/jail.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mtree.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/newsyslog.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/vinum.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ypbind.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/zic.8#2 integrate ... //depot/projects/trustedbsd/doc/share/sgml/man-refs.ent#2 integrate Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#2 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.114 2002/05/09 00:24:17 obrien Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.121 2002/05/13 22:00:39 imp Exp $ 1999 @@ -151,7 +151,7 @@ Committers are encouraged to seek review for their work as part of the normal development process, regardless of the area of the - tree where the work is occuring. + tree where the work is occurring. @@ -498,18 +498,18 @@ U - The file was updated with no trouble. + The file was updated without trouble. P - The file was updated with no trouble (you will only see + The file was updated without trouble (you will only see this when working against a remote repo). M - The file had been modified, and was merged with no + The file had been modified, and was merged without conflicts. @@ -611,6 +611,11 @@ + + Uses the context diff format. + + + Shows missing or added files. @@ -620,7 +625,7 @@ You always want to use , since unified diffs are much easier to read than almost any other - diff format (in some circumstances, context diffs may be + diff format (in some circumstances, context diffs generated with the option may be better, but they are much bulkier). A unified diff consists of a series of hunks. Each hunk begins with a line that starts with two @ signs and specifies where in the @@ -635,7 +640,7 @@ with or as in checkout or update, or even view the diffs between two arbitrary versions - (with no regard for what you have locally) by specifying + (without regard for what you have locally) by specifying two versions with or . @@ -755,7 +760,7 @@ and also makes it harder to understand just what functional changes were made. In the case of documentation files, it can make the job of the translation teams more complicated, - as it becomes difficult for them to detemrine exactly what + as it becomes difficult for them to determine exactly what content changes need to be translated. Avoid committing changes to multiple files in one go @@ -779,7 +784,7 @@ Also, ALWAYS specify which files to commit explicitly on the command line, so you do not accidentally commit other files than the ones you intended - cvs commit - with no arguments will commit every modification in your + without any arguments will commit every modification in your current working directory and every subdirectory. @@ -935,7 +940,7 @@ This includes all of the commit messages as well as any other mail addressed to the &a.committers; and &a.developers;. Really large mailboxes which have taken up permanent residence on - hub often get accidently truncated + hub often get accidentally truncated without warning, so forward it or read it and you will not lose it. @@ -1319,7 +1324,7 @@ developers is all committers. This list was created to be a forum for the committers community issues. Examples are Core - voting, announcements, etc. This listis + voting, announcements, etc. This list is not intended as a place for code reviews or a replacement for the &a.arch; or the &a.audit;. In fact using it as such hurts the FreeBSD Project as it gives a sense of a @@ -1483,24 +1488,22 @@ As noted, breaking some of these rules can be grounds for suspension or, upon repeated offense, permanent removal of - commit privileges. Three or more members of core - acting in unison, + commit privileges. Individual members of core have the power to temporarily suspend commit privileges until core as a whole has the chance to review the issue. In case of an emergency (a committer doing damage to the repository), a temporary suspension may also - be done by the repository meisters or any other member of core - who may happen to be awake at the time. Only core as a whole - has the authority to suspend commit privileges for any - significant length of time or to remove them permanently, the - latter generally only being done after consultation with - committers. This rule does not exist to set core up as a bunch + be done by the repository meisters. + Only a 2/3 majority of core + has the authority to suspend commit privileges for longer + than a week or to remove them permanently. + This rule does not exist to set core up as a bunch of cruel dictators who can dispose of committers as casually as empty soda cans, but to give the project a kind of safety fuse. - If someone is seriously out of control, it is important to be + If someone is out of control, it is important to be able to deal with this immediately rather than be paralyzed by debate. In all cases, a committer whose privileges are - suspended or revoked is entitled to a hearing, + suspended or revoked is entitled to a hearing by core, the total duration of the suspension being determined at that time. A committer whose privileges are suspended may also request a review of the decision after 30 days and every 30 days @@ -2228,6 +2231,27 @@ wra(i)th. + + + + What is the proper procedure for updating the checksum + for a port's distfile when the file changes without a + version change? + + + + When the checksum for a port's distfile is updated due + to the author updating the file without changing the port's + revision, the commit message should include a summary of + the relevant diffs between the original and new distfile to + ensure that the distfile has not been corrupted or + maliciously altered. If the current version of the port + has been in the ports tree for a while, a copy of the old + distfile will usually be available on the ftp servers; + otherwise the author or maintainer should be contacted to + find out why the distfile has changed. + + ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#2 (text+ko) ==== @@ -18,7 +18,7 @@ Contributors to FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.179 2002/05/10 13:55:30 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.181 2002/05/13 02:06:25 tjr Exp $ This article lists individuals and organizations who have @@ -1819,6 +1819,7 @@ &a.ade;, &a.asami;, + &a.knu;, &a.kris;, &a.sobomax;, &a.steve;, @@ -5789,6 +5790,10 @@ + Peter Avalos pavalos@theshell.com + + + Peter Childs pjchilds@imforei.apana.org.au ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/laptop/article.sgml#2 (text+ko) ==== @@ -16,7 +16,7 @@ FreeBSD on Laptops - $FreeBSD: doc/en_US.ISO8859-1/articles/laptop/article.sgml,v 1.6 2002/04/13 23:10:30 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/laptop/article.sgml,v 1.8 2002/05/14 20:58:51 trhodes Exp $ FreeBSD works fine on most laptops, with a few caveats. @@ -24,7 +24,7 @@ to different hardware requirements from desktops, are discussed below. - + FreeBSD is often thought of as a server operating system, but it works just fine on the desktop, and if you want to use it on @@ -39,143 +39,146 @@ Microsoft Windows). This article aims to discuss some of these issues. - - XFree86 + + XFree86 - Recent versions of XFree86 work with most display adapters - available on laptops these days. Acceleration may not be - supported, but a generic SVGA configuration should work. + Recent versions of XFree86 work with most display adapters + available on laptops these days. Acceleration may not be + supported, but a generic SVGA configuration should work. - Check your laptop documentation for which card you have, - and check in the XFree86 documentation (or setup program) - to see whether it is specifically supported. If it is not, use - a generic device (do not go for a name which just looks - similar). In XFree86 version 4, you can try your luck - with the command XFree86 -configure - which auto-detects a lot of configurations. + Check your laptop documentation for which card you have, + and check in the XFree86 documentation (or setup program) + to see whether it is specifically supported. If it is not, use + a generic device (do not go for a name which just looks + similar). In XFree86 version 4, you can try your luck + with the command XFree86 -configure + which auto-detects a lot of configurations. - The problem often is configuring the monitor. Common - resources for XFree86 focus on CRT monitors; getting a - suitable modeline for an LCD display may be tricky. You may - be lucky and not need to specify a modeline, or just need to - specify suitable HorizSync and VertRefresh ranges. If that - does not work, the best option is to check web resources - devoted to configuring X on laptops (these are often - linux-oriented sites but it does not matter because both systems - use XFree86) and copy a modeline posted by someone for similar - hardware. + The problem often is configuring the monitor. Common + resources for XFree86 focus on CRT monitors; getting a + suitable modeline for an LCD display may be tricky. You may + be lucky and not need to specify a modeline, or just need to + specify suitable HorizSync and VertRefresh ranges. If that + does not work, the best option is to check web resources + devoted to configuring X on laptops (these are often + linux-oriented sites but it does not matter because both systems + use XFree86) and copy a modeline posted by someone for similar + hardware. - Most laptops come with two buttons on their pointing - devices, which is rather problematic in X (since the middle - button is commonly used to paste text); you can map a - simultaneous left-right click in your X configuration to - a middle button click with the line + Most laptops come with two buttons on their pointing + devices, which is rather problematic in X (since the middle + button is commonly used to paste text); you can map a + simultaneous left-right click in your X configuration to + a middle button click with the line - -Option "Emulate3Buttons" - + + Option "Emulate3Buttons" + - in the XF86Config file in the InputDevice section (for XFree86 - version 4; for version 3, put just the line Emulate3Buttons, - without the quotes, in the Pointer section.) - + in the XF86Config file in the InputDevice + section (for XFree86 version 4; for version 3, put just the line + Emulate3Buttons, without the quotes, in the + Pointer section.) + - - Modems - - Laptops usually come with internal (on-board) modems. - Unfortunately, this almost always means they are winmodems whose - functionality is implemented in software, for which only windows - drivers are normally available (though a few drivers are beginning - to show up for other operating systems). Otherwise, you - need to buy an external modem: the most compact option is - probably a PC-Card (PCMCIA) modem, discussed below, but - serial or USB modems may be cheaper. Generally, regular - modems (non-winmodems) should work fine. - + + Modems + + Laptops usually come with internal (on-board) modems. + Unfortunately, this almost always means they are + winmodems whose + functionality is implemented in software, for which only windows + drivers are normally available (though a few drivers are beginning + to show up for other operating systems). Otherwise, you + need to buy an external modem: the most compact option is + probably a PC Card (PCMCIA) modem, discussed below, but + serial or USB modems may be cheaper. Generally, regular + modems (non-winmodems) should work fine. + - + - - PCMCIA (PC-card) devices + + PCMCIA (PC Card) devices - Most laptops come with PCMCIA (also called PC-card) - slots; these are supported fine under FreeBSD. Look through - your boot-up messages (using dmesg) and see whether these were - detected correctly (they should appear as - pccard0, - pccard1 etc on devices like - pcic0). + Most laptops come with PCMCIA (also called PC Card) + slots; these are supported fine under FreeBSD. Look through + your boot-up messages (using dmesg) and see whether these were + detected correctly (they should appear as + pccard0, + pccard1 etc on devices like + pcic0). - FreeBSD currently supports 16-bit PCMCIA cards, but not - 32-bit (CardBus) cards. A database of supported cards is in - the file /etc/defaults/pccard.conf. Look - through it, and preferably buy cards listed there. Cards not - listed may also work as generic devices: in particular most - modems (16-bit) should work fine, provided they are not - winmodems (these do exist even as PC-cards, so watch out). If - your card is recognised as a generic modem, note that the - default pccard.conf file specifies a delay time of 10 seconds - (to avoid freezes on certain modems); this may well be - over-cautious for your modem, so you may want to play with it, - reducing it or removing it totally. + FreeBSD currently supports 16-bit PCMCIA cards, but not + 32-bit (CardBus) cards. A database of supported + cards is in the file /etc/defaults/pccard.conf. + Look through it, and preferably buy cards listed there. Cards not + listed may also work as generic devices: in + particular most modems (16-bit) should work fine, provided they + are not winmodems (these do exist even as PC Cards, so watch out). + If your card is recognised as a generic modem, note that the + default pccard.conf file specifies a delay time of 10 seconds + (to avoid freezes on certain modems); this may well be + over-cautious for your modem, so you may want to play with it, + reducing it or removing it totally. - Some parts of pccard.conf may need editing. Check the irq - line, and be sure to remove any number already being used: in - particular, if you have an on board sound card, remove irq 5 - (otherwise you may experience hangs when you insert a card). - Check also the available memory slots; if your card is not - being detected, try changing it to one of the other allowed - values (listed in the man page &man.pccardc.8;). - + Some parts of pccard.conf may need + editing. Check the irq line, and be sure to remove any number + already being used: in particular, if you have an on board sound + card, remove irq 5 (otherwise you may experience hangs when you + insert a card). Check also the available memory slots; if your + card is not being detected, try changing it to one of the other + allowed values (listed in the man page &man.pccardc.8;). + - If it is not running already, start the pccardd daemon. - (To enable it at boot time, add - pccard_enable="YES" to - /etc/rc.conf). Now your cards should be - detected when you insert and remove them, and you should get - log messages about new devices being enabled. + If it is not running already, start the pccardd daemon. + (To enable it at boot time, add + pccard_enable="YES" to + /etc/rc.conf). Now your cards should be + detected when you insert and remove them, and you should get + log messages about new devices being enabled. - There have been major changes to the pccard code - (including ISA routing of interrupts, for machines whose - PCIBIOS FreeBSD can not seem to use) before the FreeBSD 4.4 - release. If you have problems, try upgrading your system. + There have been major changes to the pccard code + (including ISA routing of interrupts, for machines whose + PCIBIOS FreeBSD can not seem to use) before the FreeBSD 4.4 + release. If you have problems, try upgrading your system. - + - + - Power management + Power management - Unfortunately, this is not very reliably supported under - FreeBSD. If you are lucky, some functions may work reliably; - or they may not work at all. + Unfortunately, this is not very reliably supported under + FreeBSD. If you are lucky, some functions may work reliably; + or they may not work at all. - To enable this, you may need to compile a kernel with - power management support (device apm0) or - add the option enable apm0 to /boot/loader.conf, and - also enable the apm daemon at boot time (line - apm_enable="YES" in - /etc/rc.conf). The apm commands are - listed in the &man.apm.8; manpage. For instance, - apm -b gives you battery status (or 255 if - not supported), apm -Z puts the laptop on - standby, apm -z (or zzz) suspends it. To - shutdown and power off the machine, use shutdown -p. - Again, some or all of these functions may not work very well - or at all. You may find that laptop suspension/standby works - in console mode but not under X (that is, the screen does not - come on again; in that case, switch to a virtual console - (using Ctrl-Alt-F1 or another function key) and then execute - the apm command. - + To enable this, you may need to compile a kernel with + power management support (device apm0) or + add the option enable apm0 to + /boot/loader.conf, and + also enable the apm daemon at boot time (line + apm_enable="YES" in + /etc/rc.conf). The apm commands are + listed in the &man.apm.8; manpage. For instance, + apm -b gives you battery status (or 255 if + not supported), apm -Z puts the laptop on + standby, apm -z (or zzz) suspends it. To + shutdown and power off the machine, use shutdown -p. + Again, some or all of these functions may not work very well + or at all. You may find that laptop suspension/standby works + in console mode but not under X (that is, the screen does not + come on again; in that case, switch to a virtual console + (using Ctrl-Alt-F1 or another function key) and then execute + the apm command. + - The X window system (XFree86) also includes display power - management (look at the &man.xset.1; man page, and search for - dpms there). You may want to investigate this. However, this, - too, works inconsistently on laptops: it - often turns off the display but does not turn off the - backlight. + The X window system (XFree86) also includes display power + management (look at the &man.xset.1; man page, and search for + dpms there). You may want to investigate this. However, this, + too, works inconsistently on laptops: it + often turns off the display but does not turn off the + backlight. - + ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/mh/article.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -46,7 +46,7 @@ email MH has done an excellent job keeping the configuration of each of these tools consistent and uniform. In fact, if you are not quite sure how something is supposed to work or what the - arguments for some command are supposed to be then you can + arguments for some command are supposed to be, then you can generally guess and be right. Each MH command is consistent about how it handles reading the configuration files and how it takes arguments on the command line. One useful thing to @@ -73,7 +73,7 @@ This primer is not a full comprehensive explanation of how MH works. This is just intended to get you started on the road to happier, faster mail reading. You should read the man pages - for the various commands. Also you might want to read the comp.mail.mh newsgroup. Also you can read the FAQ @@ -88,7 +88,7 @@ show, scan, next, prev, rmm, rmf, and msgchk. One of the best things about MH is the - consistent interface between programs. A few things to keep in + consistent interface between programs. One thing to keep in mind when using these commands is how to specify message lists. In the case of inc this does not really make any sense but with commands like show it is useful to @@ -112,7 +112,7 @@ return you will be well on your way to getting started with MH. The first time you run inc it will setup your account to use all the MH defaults and ask you - about creating a Mail directory. If you have mail waiting to + about creating a Mail directory under your HOME directory. If you have mail waiting to be downloaded you will see something that looks like: @@ -144,7 +144,7 @@ plain POP3 for downloading your email. MH has support for a few different dialects of POP. More than likely you will never ever need to use them though. While you can do more complex - things with inc such as audit files and scan format files this + things with inc such as audit files and scan format files this will get you going. The msgchk command is used to get information @@ -340,7 +340,7 @@ Whenever you create a new folder a new directory is going to be created underneath your MH Mail directory, and messages in that folder are going to be stored in that - directory. When new email comes in that new email is thrown + directory. When a new email message comes, it is thrown into your inbox directory with a file name that is equivalent to the message number. So even if you did not have any of the MH tools to read your email you could still use @@ -449,7 +449,7 @@ - find emails with a matching dat + find emails with a matching date @@ -513,7 +513,7 @@ not cc'd on freebsd-questions) and the subject is pci. It should look through your folder and find all messages sent to the freebsd-hackers list that are not cc'd - to the freebsd-questions list that contain something on pci in + to the freebsd-questions list and contain pci in the subject line. Ordinarily you might have to worry about something called operator precedence. Remember in math how you evaluate from left to right and you do multiplication and @@ -599,10 +599,10 @@ Subject: headers already in it. You are then sent into your editor where you fill in the header information and then type the body of your message below the dashed lines in the message. - Then to the whatnow program. When you are at the + When you leave the editor, the whatnow program is run. When you are at the What now? prompt you can tell it to send, list, edit, - edit, push, and quit. Most + push, and quit. Most of these commands are self-explanatory. So the message sending process involves copying a component file, editing your email, and then telling the whatnow program what to do with @@ -654,8 +654,9 @@ will see the What now? prompt and you can type in send or s and hit return. Then the FreeBSD core team will receive - their just rewards. As I mentioned earlier you can also use - other commands, for example quit if you do not want + their just rewards. As I mentioned earlier, you can also use + other commands at the What now? prompt. + For example you can use quit, if you do not want to send the message. The forw command is stunningly similar. The @@ -669,8 +670,8 @@ exactly the same as comp. You go through the exact same message sending process. - The repl command will reply to whatever your - current message is, unless you give it a different message to + The repl command will reply to the + current message, unless you give it a different message to reply to. repl will do its best to go ahead and fill in some of the email headers already. So you will notice that the To: header already has the address of the ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#2 (text+ko) ==== @@ -47,7 +47,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.23 2002/04/25 19:37:13 bmah Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.25 2002/05/13 23:12:59 brian Exp $ This paper describes the approach used by the FreeBSD release engineering team to make production quality releases @@ -134,15 +134,15 @@ available to keep systems on the RELENG_4_3 and RELENG_4_4 branches updated. - Section 2 discusses the + discusses the different phases of the release engineering process leading up to - the actual system build and section - 3 describes the actual build process. Section 4 describes how the base - release may be extended by third parties and section 5 details some of the + the actual system build and + describes the actual build process. describes how the base + release may be extended by third parties and details some of the lessons learned through the release of FreeBSD 4.4. Finally, - section 6 presents future directions + presents future directions of development. @@ -610,7 +610,7 @@ manifest can be created with a simple command: - /stage/cdrom&prompt.root; find . -type f | sed -e 's/\^.\///' | sort > filename.txt + /stage/cdrom&prompt.root; find . -type f | sed -e 's/^\.\///' | sort > filename.txt The specific requirements of each CD are outlined below. ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#2 (text+ko) ==== @@ -23,7 +23,7 @@ The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.437 2002/05/06 14:43:30 mwlucas Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.439 2002/05/14 03:30:14 bmah Exp $ 1995 @@ -3816,9 +3816,9 @@ You have asked mail to the domain (e.g., domain.net) to be forwarded to a specific host (in this case, relay.domain.net) by using an MX record, but the relay machine does not recognize - itself as domain.net. Add domain.net to /etc/sendmail.cw + itself as domain.net. Add domain.net to /etc/mail/local-host-names (if you are using FEATURE(use_cw_file)) or add "Cw domain.net" - to /etc/sendmail.cf. + to /etc/mail/sendmail.cf. The current version of the - Tweaking /etc/sendmail.cf manually is + Tweaking /etc/mail/sendmail.cf manually is considered something for purists. Sendmail version 8 comes with a new approach of generating config files via some &man.m4.1; @@ -7169,7 +7169,7 @@ the branch will be renamed to 4.6-STABLE. For more information on version numbers and the - various CVS branches, refer the + various CVS branches, refer to the Release Engineering article. ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -561,7 +561,7 @@ CTM, on the other hand, does not interactively compare the sources you have with those on the master - archive or otherwise pull them across.. Instead, a script which + archive or otherwise pull them across. Instead, a script which identifies changes in files since its previous run is executed several times a day on the master CTM machine, any detected changes being compressed, stamped with a sequence-number and encoded for @@ -683,7 +683,7 @@ - Update <filename>/etc/group</filename> + Update the files of <filename>/etc</filename> The /etc directory contains a large part of your system's configuration information, as well as scripts @@ -697,13 +697,13 @@ There have been occasions when the installation part of make world has expected certain usernames or groups to exist. When performing an upgrade it is likely that these - groups did not exist. This caused problems when upgrading. + users or groups did not exist. This caused problems when upgrading. - The most recent example of this is when the ppp subsystem were installed using a - non-existent (for them) group name. + A recent example of this is when the + smmsp user was added. Users had the + installation process fail for them when + mtree was trying to create + /var/spool/clientmqueue. The solution is to examine /usr/src/etc/group and compare its list of @@ -713,6 +713,18 @@ the same GID but a different name to those in /usr/src/etc/group. + Since 4.6-RELEASE you can run &man.mergemaster.8; in + pre-buildworld mode by providing the option. + This will compare only those files that are essential for the success + of buildworld or + installworld. If your old version of + mergemaster does not support , + use the new version in the source tree when running for the first + time: + + &prompt.root; cd /usr/src/usr.sbin/mergemaster +&prompt.root; ./mergemaster.sh -p + If you are feeling particularly paranoid, you can check your system to see which files are owned by the group you are @@ -930,7 +942,7 @@ &prompt.root; make buildworld - It is now possible to specify a -j option to + It is now possible to specify a option to make which will cause it to spawn several simultaneous processes. This is most useful on multi-CPU machines. However, since much of the compiling process is IO bound rather @@ -962,7 +974,7 @@ Many factors influence the build time, but currently a 500 MHz - Pentium 3 with 128 MB of RAM takes about 2 hours to build + Pentium III with 128 MB of RAM takes about 2 hours to build the &os.stable; tree, with no tricks or shortcuts used during the process. A &os.current; tree will take somewhat longer. @@ -1099,7 +1111,7 @@ merge the temporary file with the currently installed file, or view the &man.diff.1; results again. - Choosing to delete the temporary will tell &man.mergemaster.8; that we + Choosing to delete the temporary file will tell &man.mergemaster.8; that we wish to keep our current file unchanged, and to delete the one that is new. This option is not the most recommended one, unless you see no reason to change the current file. You can get help at any time by @@ -1418,7 +1430,7 @@ There is no easy answer to this one, as it depends on the - nature of the change. For example, if you just ran CVSup, and + nature of the change. For example, if you just ran CVSup, and it has shown the following files as being updated, src/games/cribbage/instr.c @@ -1500,7 +1512,7 @@ corners. If you want to live dangerously then make the world, passing - the NOCLEAN definition to make, like + the NOCLEAN definition to make, like this: &prompt.root; make -DNOCLEAN world @@ -1552,23 +1564,6 @@ - NFS - - - Can I use one machine as a - - - - This is a fairly easy task, and can save hours of compile - time for many machines. Simply run the - buildworld on a central - machine, and then NFS mount /usr/src and - /usr/obj on the remote machine and - installworld there. - - - How can I speed up making the world? @@ -1601,11 +1596,11 @@ Also in /etc/make.conf, set - CFLAGS to something like -O - -pipe. The optimization -O2 is much + CFLAGS to something like . The optimization is much slower, and the optimization difference between - -O and -O2 is normally - negligible. -pipe lets the compiler use + and is normally + negligible. lets the compiler use pipes rather than temporary files for communication, which saves disk access (at the expense of memory). @@ -1711,6 +1706,10 @@ Tracking for multiple machines + + NFS + installing multiple machines + If you have multiple machines that you want to track the same source tree, then having all of them download sources and ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -899,7 +899,7 @@ A collapsible list of all the drivers that are currently marked as active, subdivided into groups such as Storage, and Network. Each - driver is shown as a description, its two three letter driver + driver is shown as a description, its two or three letter driver name, and the IRQ and memory port used by that driver. In addition, if an active driver conflicts with another active driver then CONF is shown next to the driver name. @@ -2212,7 +2212,7 @@ Choosing the right amount of swap space can be a bit of an art. A good rule of thumb is that your swap space should be two or three times as much as the - available physical memory (RAM). So if you have + available physical memory (RAM). You should also have at least 64MB of swap, so if you have less than 32MB of RAM in your computer then set the swap amount to 64MB. @@ -2921,7 +2921,7 @@ The IP address to be used for this interface was - (192.168.0.1). + 192.168.0.1 @@ -2959,7 +2959,7 @@ Choosing [ Yes ] and pressing Enter will bring the machine up on the network and be ready for use after leaving - leaving the installation. + the installation. @@ -2999,7 +2999,7 @@ Select [ Yes ] if you wish to configure these services during install. An additional - confirmation will display. + confirmation will display: User Confirmation Requested The Internet Super Server (inetd) allows a number of simple Internet @@ -3072,7 +3072,7 @@ To allow anonymous FTP, use the arrow keys to select [ Yes ] and press Enter. - The following screens (or similar) will display: + The following screen (or similar) will display:
Default Anonymous FTP Configuration @@ -3137,7 +3137,7 @@ This is a text editor called ee. Use the instructions to change the message or change the message later using a text editor of your choice. Note the file name/location - at the bottom. + at the bottom of the editor screen. Press Esc and a pop-up menu will default to a) leave editor. Press @@ -3165,7 +3165,7 @@ Enter. If [ Yes ] is chosen, a message will - pop-up indicating that the exports file must be created. + pop-up indicating that the exports file must be created. Message Operating as an NFS server means that you must first configure an @@ -3175,10 +3175,10 @@ [ OK ] Press Enter to continue. A text editor will - start allowing the exports file to be created and edited. + start allowing the exports file to be created and edited.
- Editing the Exports File + Editing <filename>exports</filename> @@ -3189,7 +3189,7 @@ Use the instructions to add the actual exported filesystems now or later using a text editor of your choice. Note the - filename/location at the bottom of the editor screen. + file name/location at the bottom of the editor screen. Press Esc and a pop-up menu will default to a) leave editor. Press @@ -3411,12 +3411,12 @@
- A commonly used option is the screensaver. Use the arrow keys >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 15 1: 4:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C65337B407; Wed, 15 May 2002 01:04:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 74E1A37B406 for ; Wed, 15 May 2002 01:04:28 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4F84SV74054 for perforce@freebsd.org; Wed, 15 May 2002 01:04:28 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Date: Wed, 15 May 2002 01:04:28 -0700 (PDT) Message-Id: <200205150804.g4F84SV74054@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 11354 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11354 Change 11354 by amigus@amigus_vmganyopa on 2002/05/15 01:04:03 Declaration after instruction fixed. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#11 (text+ko) ==== @@ -255,10 +255,10 @@ addr, mem); if (!(slab->us_flags & UMA_SLAB_MALLOC)) { - trash_mem(addr, size); #ifdef INVARIANTS struct malloc_type **mtp = addr; #endif + trash_mem(addr, size); size = slab->us_zone->uz_size; #ifdef INVARIANTS /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 15 8:36:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86FEF37B40C; Wed, 15 May 2002 08:36:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9F5DE37B403 for ; Wed, 15 May 2002 08:36:50 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4FFaol53321 for perforce@freebsd.org; Wed, 15 May 2002 08:36:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 15 May 2002 08:36:50 -0700 (PDT) Message-Id: <200205151536.g4FFaol53321@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11361 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11361 Change 11361 by rwatson@rwatson_tislabs on 2002/05/15 08:35:57 Include per-policy constant include files to correct build problems. mac_constant.c will eventually go away. Affected files ... ... //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_constant.c#12 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_constant.c#12 (text+ko) ==== @@ -41,6 +41,9 @@ #include #include +#include +#include + /* * The following label defines "system high", used by the TrustedBSD * userland Trusted Code Base (TCB). It is assigned during the install To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 15 11:39:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0856137B407; Wed, 15 May 2002 11:39:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3739737B406 for ; Wed, 15 May 2002 11:39:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4FId0n83607 for perforce@freebsd.org; Wed, 15 May 2002 11:39:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 15 May 2002 11:39:00 -0700 (PDT) Message-Id: <200205151839.g4FId0n83607@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11368 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11368 Change 11368 by rwatson@rwatson_tislabs on 2002/05/15 11:38:43 Integ merge-o. Kept a proc lock release where I shouldn't have in the setuid/domain transition case. Remove the proc_lock so that the later debugging lock assertion doesn't cause a panic. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#19 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#19 (text+ko) ==== @@ -385,7 +385,6 @@ if (credential_changing && ((imgp->vp->v_mount->mnt_flag & MNT_NOSUID) == 0) && ((p->p_flag & P_TRACED) == 0)) { - PROC_UNLOCK(p); /* * Turn off syscall tracing for set-id programs, except for * root. Record any set-id flags first to make sure that To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 15 18:56: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F172937B404; Wed, 15 May 2002 18:56:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2401637B401 for ; Wed, 15 May 2002 18:56:02 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4G1u1H49694 for perforce@freebsd.org; Wed, 15 May 2002 18:56:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 15 May 2002 18:56:01 -0700 (PDT) Message-Id: <200205160156.g4G1u1H49694@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11380 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11380 Change 11380 by rwatson@rwatson_curry on 2002/05/15 18:55:50 With the introduction of vfs_nmount(), there were two points where struct mount was initialized. We called mac_init_mount() only at the old location. This fixes unmount of various filesystems now updated to use nmount. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#42 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#42 (text+ko) ==== @@ -528,6 +528,9 @@ mp->mnt_stat.f_owner = td->td_ucred->cr_uid; strncpy(mp->mnt_stat.f_mntonname, fspath, MNAMELEN); mp->mnt_iosize_max = DFLTPHYS; +#ifdef MAC + mac_init_mount(mp); +#endif VOP_UNLOCK(vp, 0, td); mp->mnt_opt = optlist; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 15 19: 3:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E409237B408; Wed, 15 May 2002 19:03:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2E5DA37B407 for ; Wed, 15 May 2002 19:03:11 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4G23Bu50822 for perforce@freebsd.org; Wed, 15 May 2002 19:03:11 -0700 (PDT) (envelope-from chris@freebsd.org) Date: Wed, 15 May 2002 19:03:11 -0700 (PDT) Message-Id: <200205160203.g4G23Bu50822@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 11381 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11381 Change 11381 by chris@chris_holly on 2002/05/15 19:02:13 Add in the `rough draft' of the DocBook LOMAC article. This has not been fully cleaned up or fleshed out yet. Affected files ... ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/Makefile#2 edit ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/lomac/Makefile#1 add ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/lomac/article.sgml#1 add Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/Makefile#2 (text+ko) ==== @@ -18,6 +18,7 @@ SUBDIR+= hubs SUBDIR+= ipsec-must SUBDIR+= laptop +SUBDIR+= lomac SUBDIR+= java-tomcat SUBDIR+= mh SUBDIR+= multi-os To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 16 9:38:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8F5D37B40D; Thu, 16 May 2002 09:38:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9C06637B40A for ; Thu, 16 May 2002 09:38:17 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4GGcHH00411 for perforce@freebsd.org; Thu, 16 May 2002 09:38:17 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Thu, 16 May 2002 09:38:17 -0700 (PDT) Message-Id: <200205161638.g4GGcHH00411@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 11396 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11396 Change 11396 by cvance@cvance_korben on 2002/05/16 09:37:35 Sync back up with SELinux: - allow empty policy statements (also allows m4 macros to be terminated with a ';') - allow nested lists in {} Affected files ... ... //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/policy_parse.y#2 edit ... //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/policy_scan.l#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/policy_parse.y#2 (text+ko) ==== @@ -211,6 +211,7 @@ ; te_rbac_decl : te_decl | rbac_decl + | ';' ; rbac_decl : role_type_def | role_dominance @@ -461,7 +462,7 @@ ; names : identifier { if (insert_separator(0)) return -1; } - | '{' identifier_list '}' + | nested_id_set { if (insert_separator(0)) return -1; } | asterisk { if (insert_id("*", 0)) return -1; @@ -469,7 +470,7 @@ | tilde identifier { if (insert_id("~", 0)) return -1; if (insert_separator(0)) return -1; } - | tilde '{' identifier_list '}' + | tilde nested_id_set { if (insert_id("~", 0)) return -1; if (insert_separator(0)) return -1; } ; @@ -494,6 +495,12 @@ identifier_list : identifier | identifier_list identifier ; +nested_id_set : '{' nested_id_list '}' + ; +nested_id_list : nested_id_element | nested_id_list nested_id_element + ; +nested_id_element : identifier | nested_id_set + ; identifier : IDENTIFIER { if (insert_id(yytext,0)) return -1; } ; ==== //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/policy_scan.l#2 (text+ko) ==== @@ -102,7 +102,7 @@ T1 { return(T1); } t2 | T2 { return(T2); } -"/"({letter}|{digit}|_|"/")* { return(PATH); } +"/"({letter}|{digit}|_|"."|"/")* { return(PATH); } {letter}({letter}|{digit}|_)* { return(IDENTIFIER); } {digit}{digit}* { return(NUMBER); } #[^\n]* { /* delete comments */ } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 16 9:43:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 503C737B40C; Thu, 16 May 2002 09:43:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1BA4C37B406 for ; Thu, 16 May 2002 09:43:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4GGhNL00896 for perforce@freebsd.org; Thu, 16 May 2002 09:43:23 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Thu, 16 May 2002 09:43:23 -0700 (PDT) Message-Id: <200205161643.g4GGhNL00896@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 11397 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11397 Change 11397 by cvance@cvance_korben on 2002/05/16 09:43:14 Cleanup compiler warning on use of strdup() Affected files ... ... //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/checkpolicy.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/checkpolicy.c#2 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 16 16:12:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C152037B401; Thu, 16 May 2002 16:12:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id ED06437B404 for ; Thu, 16 May 2002 16:12:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4GNCM759787 for perforce@freebsd.org; Thu, 16 May 2002 16:12:22 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Thu, 16 May 2002 16:12:22 -0700 (PDT) Message-Id: <200205162312.g4GNCM759787@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11412 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11412 Change 11412 by mini@mini_stylus on 2002/05/16 16:11:57 Properly indent my last changes. Affected files ... ... //depot/projects/kse/sys/kern/kern_exit.c#47 edit ... //depot/projects/kse/sys/kern/kern_synch.c#60 edit ... //depot/projects/kse/sys/kern/kern_thread.c#47 edit ... //depot/projects/kse/sys/kern/subr_pcpu.c#8 edit ... //depot/projects/kse/sys/kern/subr_trap.c#54 edit ... //depot/projects/kse/sys/sys/pcpu.h#12 edit ... //depot/projects/kse/sys/sys/proc.h#99 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_exit.c#47 (text+ko) ==== @@ -700,7 +700,7 @@ /* Free the KSE spare thread */ if (p->p_kse.ke_tdspare != NULL) - thread_free(p->p_kse.ke_tdspare); + thread_free(p->p_kse.ke_tdspare); /* * Give vm and machine-dependent layer a chance ==== //depot/projects/kse/sys/kern/kern_synch.c#60 (text+ko) ==== ==== //depot/projects/kse/sys/kern/kern_thread.c#47 (text+ko) ==== @@ -90,8 +90,8 @@ (unsigned)RANGEOF(struct thread, td_startzero, td_endzero)); td->td_state = TDS_NEW; td->td_flags |= TDF_UNBOUND; - cached_threads--; /* XXXSMP */ - active_threads++; /* XXXSMP */ + cached_threads--; /* XXXSMP */ + active_threads++; /* XXXSMP */ } /* @@ -118,7 +118,7 @@ * these states, because it is currently active. */ panic("bad state for thread unlinking"); - break; + /* NOTREACHED */ case TDS_UNQUEUED: case TDS_NEW: case TDS_RUNNING: @@ -126,12 +126,13 @@ break; default: panic("bad thread state"); + /* NOTREACHED */ } #endif /* Update counters. */ - active_threads--; /* XXXSMP */ - cached_threads++; /* XXXSMP */ + active_threads--; /* XXXSMP */ + cached_threads++; /* XXXSMP */ } /* @@ -186,28 +187,29 @@ /* Reassign this thread's KSE. */ if (ke != NULL) { - ke->ke_thread = NULL; - td->td_kse = NULL; - ke->ke_state = KES_UNQUEUED; - kse_reassign(ke); + ke->ke_thread = NULL; + td->td_kse = NULL; + ke->ke_state = KES_UNQUEUED; + kse_reassign(ke); } /* Unlink this thread from its proc. */ if (p != NULL) { - TAILQ_REMOVE(&p->p_threads, td, td_plist); - if (kg != NULL) - TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); - p->p_numthreads--; - if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { - if (p->p_numthreads == - ((p->p_flag & P_SINGLE_EXIT) ? 1 : (p->p_suspcount + 1))) { - setrunqueue(p->p_singlethread); - p->p_singlethread = NULL; + TAILQ_REMOVE(&p->p_threads, td, td_plist); + if (kg != NULL) + TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); + p->p_numthreads--; + if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { + if (p->p_numthreads == + ((p->p_flag & P_SINGLE_EXIT) ? 1 : + (p->p_suspcount + 1))) { + setrunqueue(p->p_singlethread); + p->p_singlethread = NULL; + } } - } } if (kg != NULL) - kg->kg_numthreads--; + kg->kg_numthreads--; td->td_state = TDS_SURPLUS; td->td_proc = NULL; td->td_ksegrp = NULL; @@ -292,16 +294,17 @@ KASSERT(!mtx_owned(&Giant), ("dying thread owns giant")); if (ke->ke_tdspare != NULL) { - mtx_unlock_spin(&sched_lock); - mtx_lock(&Giant); - thread_free(ke->ke_tdspare); - mtx_unlock(&Giant); - mtx_lock_spin(&sched_lock); + mtx_unlock_spin(&sched_lock); + mtx_lock(&Giant); + thread_free(ke->ke_tdspare); + mtx_unlock(&Giant); + mtx_lock_spin(&sched_lock); } cpu_thread_exit(td); /* XXXSMP */ thread_unlink(td); ke->ke_tdspare = td; cpu_throw(); + /* NOTREACHED */ } /* @@ -339,12 +342,12 @@ mtx_assert(&sched_lock, MA_OWNED); if (ke->ke_tdspare != NULL) { - td2 = ke->ke_tdspare; - ke->ke_tdspare = NULL; + td2 = ke->ke_tdspare; + ke->ke_tdspare = NULL; } else { - mtx_unlock_spin(&sched_lock); - td2 = thread_alloc(); - mtx_lock_spin(&sched_lock); + mtx_unlock_spin(&sched_lock); + td2 = thread_alloc(); + mtx_lock_spin(&sched_lock); } CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", td, td->td_proc->p_pid, td->td_proc->p_comm); ==== //depot/projects/kse/sys/kern/subr_pcpu.c#8 (text+ko) ==== ==== //depot/projects/kse/sys/kern/subr_trap.c#54 (text+ko) ==== @@ -117,14 +117,14 @@ * due to a single threading requirement. */ if (p->p_flag & P_KSES) { - PROC_LOCK(p); - thread_suspend_check(0); /* Can suspend or kill */ - PROC_UNLOCK(p); - if (ke->ke_tdspare == NULL) { - mtx_lock(&Giant); - ke->ke_tdspare = thread_alloc(); - mtx_unlock(&Giant); - } + PROC_LOCK(p); + thread_suspend_check(0); /* Can suspend or kill */ + PROC_UNLOCK(p); + if (ke->ke_tdspare == NULL) { + mtx_lock(&Giant); + ke->ke_tdspare = thread_alloc(); + mtx_unlock(&Giant); + } } if (td->td_flags & TDF_UNBOUND) { /* maybe this should be in a separate function */ ==== //depot/projects/kse/sys/sys/pcpu.h#12 (text+ko) ==== ==== //depot/projects/kse/sys/sys/proc.h#99 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 16 20:32:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6C0B37B404; Thu, 16 May 2002 20:31:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D3E7637B407 for ; Thu, 16 May 2002 20:31:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4H3Uu100497 for perforce@freebsd.org; Thu, 16 May 2002 20:30:56 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 16 May 2002 20:30:56 -0700 (PDT) Message-Id: <200205170330.g4H3Uu100497@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11421 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11421 Change 11421 by peter@peter_daintree on 2002/05/16 20:30:20 IFC @11420 (note: gcc Makefiles not cleanly merged yet) Affected files ... ... //depot/projects/ia64/MAINTAINERS#5 integrate ... //depot/projects/ia64/Makefile#8 integrate ... //depot/projects/ia64/Makefile.inc1#25 integrate ... //depot/projects/ia64/UPDATING#11 integrate ... //depot/projects/ia64/bin/cp/cp.c#4 integrate ... //depot/projects/ia64/bin/dd/args.c#3 integrate ... //depot/projects/ia64/bin/df/Makefile#3 integrate ... //depot/projects/ia64/bin/df/df.c#5 integrate ... //depot/projects/ia64/bin/expr/expr.1#4 integrate ... //depot/projects/ia64/bin/expr/expr.y#5 integrate ... //depot/projects/ia64/bin/ln/ln.1#2 integrate ... //depot/projects/ia64/bin/ln/ln.c#3 integrate ... //depot/projects/ia64/bin/ln/symlink.7#2 integrate ... //depot/projects/ia64/bin/ls/ls.1#7 integrate ... //depot/projects/ia64/bin/ls/ls.c#4 integrate ... //depot/projects/ia64/bin/ls/print.c#4 integrate ... //depot/projects/ia64/bin/mv/mv.1#3 integrate ... //depot/projects/ia64/bin/pax/ar_subs.c#3 integrate ... //depot/projects/ia64/bin/pax/buf_subs.c#3 integrate ... //depot/projects/ia64/bin/pax/cache.h#2 integrate ... //depot/projects/ia64/bin/pax/file_subs.c#3 integrate ... //depot/projects/ia64/bin/pax/ftree.c#3 integrate ... //depot/projects/ia64/bin/pax/options.c#4 integrate ... //depot/projects/ia64/bin/pax/pat_rep.c#3 integrate ... //depot/projects/ia64/bin/pax/pax.1#3 integrate ... //depot/projects/ia64/bin/pax/pax.c#3 integrate ... //depot/projects/ia64/bin/pax/pax.h#2 integrate ... //depot/projects/ia64/bin/pax/tables.h#2 integrate ... //depot/projects/ia64/bin/pax/tar.1#3 integrate ... //depot/projects/ia64/bin/pax/tar.c#3 integrate ... //depot/projects/ia64/bin/ps/ps.1#7 integrate ... //depot/projects/ia64/bin/rm/rm.1#3 integrate ... //depot/projects/ia64/bin/rm/rm.c#4 integrate ... //depot/projects/ia64/bin/sh/error.c#3 integrate ... //depot/projects/ia64/bin/test/test.c#7 integrate ... //depot/projects/ia64/contrib/bind/CHANGES#3 integrate ... //depot/projects/ia64/contrib/bind/README#3 integrate ... //depot/projects/ia64/contrib/bind/Version#3 integrate ... //depot/projects/ia64/contrib/bind/bin/dig/dig.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/dnsquery/dnsquery.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/host/host.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/named.conf#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/named.h#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/ns_config.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/ns_defs.h#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/ns_forw.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/ns_func.h#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/ns_lexer.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/ns_main.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/ns_maint.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/ns_notify.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/ns_parser.y#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/ns_req.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/ns_resp.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/named/ns_xfr.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/nslookup/commands.l#2 integrate ... //depot/projects/ia64/contrib/bind/bin/nslookup/getinfo.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/nslookup/list.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/nslookup/main.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/nslookup/res.h#3 integrate ... //depot/projects/ia64/contrib/bind/bin/nslookup/send.c#3 integrate ... //depot/projects/ia64/contrib/bind/bin/nslookup/subr.c#3 integrate ... //depot/projects/ia64/contrib/bind/doc/html/docdef.html#2 integrate ... //depot/projects/ia64/contrib/bind/doc/html/logging.html#2 integrate ... //depot/projects/ia64/contrib/bind/doc/html/options.html#2 integrate ... //depot/projects/ia64/contrib/bind/doc/html/server.html#2 integrate ... //depot/projects/ia64/contrib/bind/doc/html/zone.html#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/dig.1#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/dnskeygen.1#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/dnsquery.1#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/getaddrinfo.3#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/gethostbyname.3#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/getipnodebyname.3#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/getnameinfo.3#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/getnetent.3#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/host.1#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/hostname.7#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/inet_cidr.3#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/mailaddr.7#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/mkdep.1#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/named-bootconf.8#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/named-xfer.8#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/named.8#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/named.conf.5#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/ndc.8#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/nslookup.8#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/nsupdate.8#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/resolver.3#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/resolver.5#2 integrate ... //depot/projects/ia64/contrib/bind/doc/man/tsig.3#2 integrate ... //depot/projects/ia64/contrib/bind/include/arpa/nameser.h#3 integrate ... //depot/projects/ia64/contrib/bind/include/resolv.h#3 integrate ... //depot/projects/ia64/contrib/bind/lib/irs/dns_ho.c#3 integrate ... //depot/projects/ia64/contrib/bind/lib/irs/dns_nw.c#3 integrate ... //depot/projects/ia64/contrib/bind/lib/irs/getaddrinfo.c#3 integrate ... //depot/projects/ia64/contrib/bind/lib/irs/getnameinfo.c#3 integrate ... //depot/projects/ia64/contrib/bind/lib/nameser/ns_sign.c#3 integrate ... //depot/projects/ia64/contrib/bind/lib/resolv/res_findzonecut.c#3 integrate ... //depot/projects/ia64/contrib/bind/lib/resolv/res_send.c#3 integrate ... //depot/projects/ia64/contrib/bind/lib/resolv/res_update.c#3 integrate ... //depot/projects/ia64/contrib/bind/port/freebsd/Makefile.set#3 integrate ... //depot/projects/ia64/contrib/bind/port/freebsd/include/port_after.h#3 integrate ... //depot/projects/ia64/contrib/cvs/man/cvs.1#2 integrate ... //depot/projects/ia64/contrib/gcc/c-common.h#3 integrate ... //depot/projects/ia64/contrib/gcc/c-decl.c#5 integrate ... //depot/projects/ia64/contrib/gcc/c-format.c#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#9 integrate ... //depot/projects/ia64/contrib/gcc/cppinit.c#5 integrate ... //depot/projects/ia64/contrib/gcc/gcc.c#5 integrate ... //depot/projects/ia64/contrib/gcc/make-temp-file.c#2 integrate ... //depot/projects/ia64/contrib/gcc/version.c#5 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#10 integrate ... //depot/projects/ia64/contrib/perl5/AUTHORS#3 delete ... //depot/projects/ia64/contrib/perl5/Artistic#2 delete ... //depot/projects/ia64/contrib/perl5/Changes#3 delete ... //depot/projects/ia64/contrib/perl5/Changes5.000#2 delete ... //depot/projects/ia64/contrib/perl5/Changes5.001#2 delete ... //depot/projects/ia64/contrib/perl5/Changes5.002#2 delete ... //depot/projects/ia64/contrib/perl5/Changes5.003#2 delete ... //depot/projects/ia64/contrib/perl5/Changes5.004#3 delete ... //depot/projects/ia64/contrib/perl5/Changes5.005#2 delete ... //depot/projects/ia64/contrib/perl5/Configure#3 delete ... //depot/projects/ia64/contrib/perl5/Copying#2 delete ... //depot/projects/ia64/contrib/perl5/EXTERN.h#3 delete ... //depot/projects/ia64/contrib/perl5/INSTALL#3 delete ... //depot/projects/ia64/contrib/perl5/INTERN.h#3 delete ... //depot/projects/ia64/contrib/perl5/MANIFEST#3 delete ... //depot/projects/ia64/contrib/perl5/Makefile.SH#3 delete ... //depot/projects/ia64/contrib/perl5/Policy_sh.SH#3 delete ... //depot/projects/ia64/contrib/perl5/Porting/Contract#3 delete ... //depot/projects/ia64/contrib/perl5/Porting/Glossary#3 delete ... //depot/projects/ia64/contrib/perl5/Porting/config.sh#3 delete ... //depot/projects/ia64/contrib/perl5/Porting/config_H#3 delete ... //depot/projects/ia64/contrib/perl5/Porting/findvars#2 delete ... //depot/projects/ia64/contrib/perl5/Porting/fixCORE#2 delete ... //depot/projects/ia64/contrib/perl5/Porting/fixvars#2 delete ... //depot/projects/ia64/contrib/perl5/Porting/genlog#3 delete ... //depot/projects/ia64/contrib/perl5/Porting/makerel#3 delete ... //depot/projects/ia64/contrib/perl5/Porting/p4d2p#2 delete ... //depot/projects/ia64/contrib/perl5/Porting/p4desc#3 delete ... //depot/projects/ia64/contrib/perl5/Porting/patching.pod#3 delete ... //depot/projects/ia64/contrib/perl5/Porting/patchls#2 delete ... //depot/projects/ia64/contrib/perl5/Porting/pumpkin.pod#3 delete ... //depot/projects/ia64/contrib/perl5/Porting/repository.pod#2 delete ... //depot/projects/ia64/contrib/perl5/README#3 delete ... //depot/projects/ia64/contrib/perl5/README.Y2K#3 delete ... //depot/projects/ia64/contrib/perl5/README.threads#2 delete ... //depot/projects/ia64/contrib/perl5/Todo#3 delete ... //depot/projects/ia64/contrib/perl5/Todo-5.6#3 delete ... //depot/projects/ia64/contrib/perl5/XSUB.h#2 delete ... //depot/projects/ia64/contrib/perl5/av.c#3 delete ... //depot/projects/ia64/contrib/perl5/av.h#3 delete ... //depot/projects/ia64/contrib/perl5/bytecode.pl#3 delete ... //depot/projects/ia64/contrib/perl5/cc_runtime.h#2 delete ... //depot/projects/ia64/contrib/perl5/cflags.SH#3 delete ... //depot/projects/ia64/contrib/perl5/config_h.SH#3 delete ... //depot/projects/ia64/contrib/perl5/configpm#3 delete ... //depot/projects/ia64/contrib/perl5/configure.com#3 delete ... //depot/projects/ia64/contrib/perl5/configure.gnu#3 delete ... //depot/projects/ia64/contrib/perl5/cop.h#3 delete ... //depot/projects/ia64/contrib/perl5/cv.h#3 delete ... //depot/projects/ia64/contrib/perl5/deb.c#3 delete ... //depot/projects/ia64/contrib/perl5/doio.c#3 delete ... //depot/projects/ia64/contrib/perl5/doop.c#3 delete ... //depot/projects/ia64/contrib/perl5/dosish.h#3 delete ... //depot/projects/ia64/contrib/perl5/dump.c#3 delete ... //depot/projects/ia64/contrib/perl5/eg/ADB#2 delete ... //depot/projects/ia64/contrib/perl5/eg/README#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/RunMeFirst#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/caution.xbm#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/clickable_image.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/cookie.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/crash.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/customize.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/diff_upload.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/dna_small_gif.uu#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/file_upload.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/frameset.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/index.html#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/internal_links.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/javascript.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/monty.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/multiple_forms.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/nph-clock.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/nph-multipart.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/popup.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/save_state.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/tryit.cgi#2 delete ... //depot/projects/ia64/contrib/perl5/eg/cgi/wilogo_gif.uu#2 delete ... //depot/projects/ia64/contrib/perl5/eg/changes#2 delete ... //depot/projects/ia64/contrib/perl5/eg/client#2 delete ... //depot/projects/ia64/contrib/perl5/eg/down#2 delete ... //depot/projects/ia64/contrib/perl5/eg/dus#2 delete ... //depot/projects/ia64/contrib/perl5/eg/findcp#2 delete ... //depot/projects/ia64/contrib/perl5/eg/findtar#2 delete ... //depot/projects/ia64/contrib/perl5/eg/g/gcp#2 delete ... //depot/projects/ia64/contrib/perl5/eg/g/gcp.man#2 delete ... //depot/projects/ia64/contrib/perl5/eg/g/ged#2 delete ... //depot/projects/ia64/contrib/perl5/eg/g/ghosts#2 delete ... //depot/projects/ia64/contrib/perl5/eg/g/gsh#2 delete ... //depot/projects/ia64/contrib/perl5/eg/g/gsh.man#2 delete ... //depot/projects/ia64/contrib/perl5/eg/muck#2 delete ... //depot/projects/ia64/contrib/perl5/eg/muck.man#2 delete ... //depot/projects/ia64/contrib/perl5/eg/myrup#2 delete ... //depot/projects/ia64/contrib/perl5/eg/nih#2 delete ... //depot/projects/ia64/contrib/perl5/eg/relink#2 delete ... //depot/projects/ia64/contrib/perl5/eg/rename#2 delete ... //depot/projects/ia64/contrib/perl5/eg/rmfrom#2 delete ... //depot/projects/ia64/contrib/perl5/eg/scan/scan_df#2 delete ... //depot/projects/ia64/contrib/perl5/eg/scan/scan_last#2 delete ... //depot/projects/ia64/contrib/perl5/eg/scan/scan_messages#2 delete ... //depot/projects/ia64/contrib/perl5/eg/scan/scan_passwd#2 delete ... //depot/projects/ia64/contrib/perl5/eg/scan/scan_ps#2 delete ... //depot/projects/ia64/contrib/perl5/eg/scan/scan_sudo#2 delete ... //depot/projects/ia64/contrib/perl5/eg/scan/scan_suid#2 delete ... //depot/projects/ia64/contrib/perl5/eg/scan/scanner#2 delete ... //depot/projects/ia64/contrib/perl5/eg/server#2 delete ... //depot/projects/ia64/contrib/perl5/eg/shmkill#2 delete ... //depot/projects/ia64/contrib/perl5/eg/sysvipc/README#2 delete ... //depot/projects/ia64/contrib/perl5/eg/sysvipc/ipcmsg#2 delete ... //depot/projects/ia64/contrib/perl5/eg/sysvipc/ipcsem#2 delete ... //depot/projects/ia64/contrib/perl5/eg/sysvipc/ipcshm#2 delete ... //depot/projects/ia64/contrib/perl5/eg/travesty#2 delete ... //depot/projects/ia64/contrib/perl5/eg/unuc#2 delete ... //depot/projects/ia64/contrib/perl5/eg/uudecode#2 delete ... //depot/projects/ia64/contrib/perl5/eg/van/empty#2 delete ... //depot/projects/ia64/contrib/perl5/eg/van/unvanish#2 delete ... //depot/projects/ia64/contrib/perl5/eg/van/vanexp#2 delete ... //depot/projects/ia64/contrib/perl5/eg/van/vanish#2 delete ... //depot/projects/ia64/contrib/perl5/eg/who#2 delete ... //depot/projects/ia64/contrib/perl5/eg/wrapsuid#2 delete ... //depot/projects/ia64/contrib/perl5/embed.h#3 delete ... //depot/projects/ia64/contrib/perl5/embed.pl#3 delete ... //depot/projects/ia64/contrib/perl5/embedvar.h#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Asmdata.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Assembler.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Bblock.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Bytecode.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/C.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/CC.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Concise.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Debug.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Deparse.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Disassembler.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Lint.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Showlex.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Stackobj.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Stash.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Terse.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/Xref.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/assemble#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/cc_harness#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/disassemble#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/B/makeliblinks#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/Makefile.PL#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/NOTES#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/O.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/README#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/TESTS#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/Todo#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/defsubs_h.PL#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/ramblings/cc.notes#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/ramblings/curcop.runtime#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/ramblings/flip-flop#3 delete ... //depot/projects/ia64/contrib/perl5/ext/B/ramblings/magic#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/ramblings/reg.alloc#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/ramblings/runtime.porting#2 delete ... //depot/projects/ia64/contrib/perl5/ext/B/typemap#2 delete ... //depot/projects/ia64/contrib/perl5/ext/ByteLoader/ByteLoader.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/ByteLoader/ByteLoader.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/ByteLoader/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/ByteLoader/bytecode.h#3 delete ... //depot/projects/ia64/contrib/perl5/ext/ByteLoader/byterun.c#3 delete ... //depot/projects/ia64/contrib/perl5/ext/ByteLoader/byterun.h#3 delete ... //depot/projects/ia64/contrib/perl5/ext/ByteLoader/hints/sunos.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DB_File/Changes#3 delete ... //depot/projects/ia64/contrib/perl5/ext/DB_File/DB_File.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/DB_File/DB_File.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/DB_File/DB_File_BS#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DB_File/Makefile.PL#3 delete ... //depot/projects/ia64/contrib/perl5/ext/DB_File/dbinfo#3 delete ... //depot/projects/ia64/contrib/perl5/ext/DB_File/hints/dynixptx.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DB_File/hints/sco.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DB_File/typemap#3 delete ... //depot/projects/ia64/contrib/perl5/ext/DB_File/version.c#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Data/Dumper/Changes#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Data/Dumper/Dumper.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Data/Dumper/Dumper.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Data/Dumper/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Data/Dumper/Todo#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Devel/DProf/Changes#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Devel/DProf/DProf.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Devel/DProf/DProf.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Devel/DProf/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Devel/DProf/Todo#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Devel/Peek/Changes#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Devel/Peek/Makefile.PL#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Devel/Peek/Peek.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Devel/Peek/Peek.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/DynaLoader_pm.PL#3 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/README#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/XSLoader_pm.PL#3 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dl_aix.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dl_beos.xs#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dl_dld.xs#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dl_dllload.xs#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dl_dlopen.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dl_dyld.xs#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dl_hpux.xs#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dl_mac.xs#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dl_mpeix.xs#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dl_next.xs#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dl_none.xs#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dl_vmesa.xs#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dl_vms.xs#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/dlutils.c#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/hints/aix.pl#3 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/hints/linux.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/hints/netbsd.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/DynaLoader/hints/openbsd.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Errno/ChangeLog#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Errno/Errno_pm.PL#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Errno/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Fcntl/Fcntl.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Fcntl/Fcntl.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Fcntl/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/File/Glob/Changes#3 delete ... //depot/projects/ia64/contrib/perl5/ext/File/Glob/Glob.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/File/Glob/Glob.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/File/Glob/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/File/Glob/TODO#2 delete ... //depot/projects/ia64/contrib/perl5/ext/File/Glob/bsd_glob.c#3 delete ... //depot/projects/ia64/contrib/perl5/ext/File/Glob/bsd_glob.h#3 delete ... //depot/projects/ia64/contrib/perl5/ext/GDBM_File/GDBM_File.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/GDBM_File/GDBM_File.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/GDBM_File/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/GDBM_File/hints/sco.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/GDBM_File/typemap#3 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/ChangeLog#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/IO.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/IO.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/README#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/lib/IO/Dir.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/lib/IO/File.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/lib/IO/Handle.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/lib/IO/Pipe.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/lib/IO/Poll.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/lib/IO/Seekable.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/lib/IO/Select.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/lib/IO/Socket.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/lib/IO/Socket/INET.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/lib/IO/Socket/UNIX.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/poll.c#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IO/poll.h#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IPC/SysV/ChangeLog#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IPC/SysV/MANIFEST#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IPC/SysV/Makefile.PL#3 delete ... //depot/projects/ia64/contrib/perl5/ext/IPC/SysV/Msg.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IPC/SysV/README#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IPC/SysV/Semaphore.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IPC/SysV/SysV.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IPC/SysV/SysV.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/IPC/SysV/hints/cygwin.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IPC/SysV/hints/next_3.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IPC/SysV/t/msg.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/IPC/SysV/t/sem.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/NDBM_File/Makefile.PL#3 delete ... //depot/projects/ia64/contrib/perl5/ext/NDBM_File/NDBM_File.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/NDBM_File/NDBM_File.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/NDBM_File/hints/cygwin.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/NDBM_File/hints/dec_osf.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/NDBM_File/hints/dynixptx.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/NDBM_File/hints/sco.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/NDBM_File/hints/solaris.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/NDBM_File/hints/svr4.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/NDBM_File/typemap#3 delete ... //depot/projects/ia64/contrib/perl5/ext/ODBM_File/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/ODBM_File/ODBM_File.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/ODBM_File/ODBM_File.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/ODBM_File/hints/cygwin.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/ODBM_File/hints/dec_osf.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/ODBM_File/hints/hpux.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/ODBM_File/hints/sco.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/ODBM_File/hints/solaris.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/ODBM_File/hints/svr4.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/ODBM_File/hints/ultrix.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/ODBM_File/typemap#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Opcode/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Opcode/Opcode.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Opcode/Opcode.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Opcode/Safe.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Opcode/ops.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/Makefile.PL#3 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/POSIX.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/POSIX.pod#3 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/POSIX.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/hints/bsdos.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/hints/dynixptx.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/hints/freebsd.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/hints/linux.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/hints/mint.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/hints/netbsd.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/hints/next_3.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/hints/openbsd.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/hints/sunos_4.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/hints/svr4.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/POSIX/typemap#3 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/SDBM_File.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/SDBM_File.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/CHANGES#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/COMPARE#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/README#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/README.too#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/biblio#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/dba.c#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/dbd.c#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/dbe.1#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/dbe.c#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/dbm.c#3 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/dbm.h#3 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/dbu.c#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/grind#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/hash.c#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/linux.patches#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/makefile.sdbm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/pair.c#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/pair.h#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/readme.ms#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/sdbm.3#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/sdbm.c#3 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/sdbm.h#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/tune.h#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/sdbm/util.c#2 delete ... //depot/projects/ia64/contrib/perl5/ext/SDBM_File/typemap#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Socket/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Socket/Socket.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Socket/Socket.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Sys/Hostname/Hostname.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Sys/Hostname/Hostname.xs#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Sys/Hostname/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Sys/Syslog/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Sys/Syslog/Syslog.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Sys/Syslog/Syslog.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/Notes#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/README#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/Thread.pm#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/Thread.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/Thread/Queue.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/Thread/Semaphore.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/Thread/Signal.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/Thread/Specific.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/create.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/die.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/die2.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/io.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/join.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/join2.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/list.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/lock.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/queue.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/specific.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/sync.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/sync2.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/typemap#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/unsync.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/unsync2.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/unsync3.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/Thread/unsync4.t#2 delete ... //depot/projects/ia64/contrib/perl5/ext/attrs/Makefile.PL#2 delete ... //depot/projects/ia64/contrib/perl5/ext/attrs/attrs.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/attrs/attrs.xs#2 delete ... //depot/projects/ia64/contrib/perl5/ext/re/Makefile.PL#3 delete ... //depot/projects/ia64/contrib/perl5/ext/re/hints/aix.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/re/hints/mpeix.pl#2 delete ... //depot/projects/ia64/contrib/perl5/ext/re/re.pm#2 delete ... //depot/projects/ia64/contrib/perl5/ext/re/re.xs#3 delete ... //depot/projects/ia64/contrib/perl5/ext/util/make_ext#2 delete ... //depot/projects/ia64/contrib/perl5/ext/util/mkbootstrap#2 delete ... //depot/projects/ia64/contrib/perl5/fakethr.h#2 delete ... //depot/projects/ia64/contrib/perl5/form.h#3 delete ... //depot/projects/ia64/contrib/perl5/global.sym#3 delete ... //depot/projects/ia64/contrib/perl5/globals.c#3 delete ... //depot/projects/ia64/contrib/perl5/globvar.sym#2 delete ... //depot/projects/ia64/contrib/perl5/gv.c#3 delete ... //depot/projects/ia64/contrib/perl5/gv.h#3 delete ... //depot/projects/ia64/contrib/perl5/h2pl/README#2 delete ... //depot/projects/ia64/contrib/perl5/h2pl/cbreak.pl#2 delete ... //depot/projects/ia64/contrib/perl5/h2pl/cbreak2.pl#2 delete ... //depot/projects/ia64/contrib/perl5/h2pl/eg/sizeof.ph#2 delete ... //depot/projects/ia64/contrib/perl5/h2pl/eg/sys/errno.pl#2 delete ... //depot/projects/ia64/contrib/perl5/h2pl/eg/sys/ioctl.pl#2 delete ... //depot/projects/ia64/contrib/perl5/h2pl/eg/sysexits.pl#2 delete ... //depot/projects/ia64/contrib/perl5/h2pl/getioctlsizes#2 delete ... //depot/projects/ia64/contrib/perl5/h2pl/mksizes#2 delete ... //depot/projects/ia64/contrib/perl5/h2pl/mkvars#2 delete ... //depot/projects/ia64/contrib/perl5/h2pl/tcbreak#2 delete ... //depot/projects/ia64/contrib/perl5/h2pl/tcbreak2#2 delete ... //depot/projects/ia64/contrib/perl5/handy.h#3 delete ... //depot/projects/ia64/contrib/perl5/hints/3b1.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/3b1cc#2 delete ... //depot/projects/ia64/contrib/perl5/hints/README.hints#3 delete ... //depot/projects/ia64/contrib/perl5/hints/aix.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/altos486.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/amigaos.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/apollo.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/aux_3.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/beos.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/broken-db.msg#2 delete ... //depot/projects/ia64/contrib/perl5/hints/bsdos.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/convexos.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/cxux.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/cygwin.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/darwin.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/dcosx.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/dec_osf.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/dgux.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/dos_djgpp.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/dynix.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/dynixptx.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/epix.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/esix4.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/fps.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/freebsd.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/genix.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/gnu.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/greenhills.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/hpux.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/i386.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/irix_4.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/irix_5.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/irix_6.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/irix_6_0.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/irix_6_1.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/isc.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/isc_2.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/linux.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/lynxos.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/machten.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/machten_2.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/mint.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/mips.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/mpc.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/mpeix.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/ncr_tower.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/netbsd.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/newsos4.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/next_3.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/next_3_0.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/next_4.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/nonstopux.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/openbsd.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/opus.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/os2.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/os390.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/posix-bc.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/powerux.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/qnx.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/rhapsody.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/sco.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/sco_2_3_0.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/sco_2_3_1.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/sco_2_3_2.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/sco_2_3_3.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/sco_2_3_4.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/solaris_2.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/stellar.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/sunos_4_0.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/sunos_4_1.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/svr4.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/svr5.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/ti1500.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/titanos.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/ultrix_4.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/umips.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/unicos.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/unicosmk.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/unisysdynix.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/utekv.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/uts.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hints/uwin.sh#2 delete ... //depot/projects/ia64/contrib/perl5/hints/vmesa.sh#3 delete ... //depot/projects/ia64/contrib/perl5/hv.c#3 delete ... //depot/projects/ia64/contrib/perl5/hv.h#3 delete ... //depot/projects/ia64/contrib/perl5/installhtml#3 delete ... //depot/projects/ia64/contrib/perl5/installman#3 delete ... //depot/projects/ia64/contrib/perl5/installperl#3 delete ... //depot/projects/ia64/contrib/perl5/intrpvar.h#3 delete ... //depot/projects/ia64/contrib/perl5/iperlsys.h#3 delete ... //depot/projects/ia64/contrib/perl5/keywords.h#2 delete ... //depot/projects/ia64/contrib/perl5/keywords.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/AnyDBM_File.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/AutoLoader.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/AutoSplit.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Benchmark.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/CPAN.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/CPAN/FirstTime.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/CPAN/Nox.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Carp.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Carp/Heavy.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Class/Struct.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Cwd.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/DB.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Devel/SelfStubber.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/DirHandle.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Dumpvalue.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/English.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Env.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Exporter.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Exporter/Heavy.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/Command.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/Embed.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/Install.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/Installed.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/Liblist.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/MM_Cygwin.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/MM_OS2.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/MM_Unix.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/MM_VMS.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/MM_Win32.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/MakeMaker.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/Manifest.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/Mkbootstrap.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/Mksymlists.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/Packlist.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/inst#2 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/testlib.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/typemap#3 delete ... //depot/projects/ia64/contrib/perl5/lib/ExtUtils/xsubpp#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Fatal.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Basename.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/File/CheckTree.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Compare.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Copy.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/File/DosGlob.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Find.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Path.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Spec.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Spec/Epoc.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Spec/Functions.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Spec/Mac.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Spec/OS2.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Spec/Unix.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Spec/VMS.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Spec/Win32.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/File/Temp.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/File/stat.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/FileCache.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/FileHandle.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/FindBin.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Getopt/Long.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Getopt/Std.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/I18N/Collate.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/IPC/Open2.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/IPC/Open3.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Math/BigFloat.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Math/BigInt.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Math/Complex.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Math/Trig.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Net/Ping.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Net/hostent.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Net/netent.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Net/protoent.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Net/servent.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/Checker.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/Find.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/Functions.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/Html.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/InputObjects.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/LaTeX.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/Man.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/ParseUtils.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/Parser.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/Plainer.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/Select.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/Text.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/Text/Color.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/Text/Overstrike.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/Text/Termcap.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Pod/Usage.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Search/Dict.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/SelectSaver.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/SelfLoader.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Shell.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Symbol.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Term/ANSIColor.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Term/Cap.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Term/Complete.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Term/ReadLine.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Test.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Test/Harness.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Text/Abbrev.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Text/ParseWords.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Text/Soundex.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Text/Tabs.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Text/Wrap.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Tie/Array.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Tie/Handle.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Tie/Hash.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Tie/RefHash.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Tie/Scalar.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Tie/SubstrHash.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/Time/Local.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Time/gmtime.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Time/localtime.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Time/tm.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/UNIVERSAL.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/User/grent.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/User/pwent.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/Win32.pod#2 delete ... //depot/projects/ia64/contrib/perl5/lib/abbrev.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/assert.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/attributes.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/autouse.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/base.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/bigfloat.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/bigint.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/bigrat.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/blib.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/bytes.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/bytes_heavy.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/cacheout.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/charnames.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/chat2.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/complete.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/constant.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/ctime.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/diagnostics.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/dotsh.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/dumpvar.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/exceptions.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/fastcwd.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/fields.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/filetest.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/find.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/finddepth.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/flush.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/ftp.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/getcwd.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/getopt.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/getopts.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/hostname.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/importenv.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/integer.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/less.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/lib.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/locale.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/look.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/newgetopt.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/open.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/open2.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/open3.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/overload.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/perl5db.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/pwd.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/shellwords.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/sigtrap.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/stat.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/strict.pm#3 delete ... //depot/projects/ia64/contrib/perl5/lib/subs.pm#2 delete ... //depot/projects/ia64/contrib/perl5/lib/syslog.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/tainted.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/termcap.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/timelocal.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/ArabLink.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/ArabLnkGrp.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/ArabShap.txt#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/BidiMirr.txt#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Bidirectional.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Block.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Blocks.txt#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/CaseFold.txt#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Category.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/CombiningClass.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/CompExcl.txt#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Decomposition.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/EAWidth.txt#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/AlphabeticPresentationForms.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Arabic.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/ArabicPresentationForms-A.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/ArabicPresentationForms-B.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Armenian.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Arrows.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/BasicLatin.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Bengali.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/BlockElements.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Bopomofo.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/BopomofoExtended.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/BoxDrawing.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/BraillePatterns.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/CJKCompatibility.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/CJKCompatibilityForms.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/CJKCompatibilityIdeographs.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/CJKRadicalsSupplement.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/CJKSymbolsandPunctuation.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/CJKUnifiedIdeographs.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/CJKUnifiedIdeographsExtensionA.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Cherokee.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/CombiningDiacriticalMarks.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/CombiningHalfMarks.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/CombiningMarksforSymbols.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/ControlPictures.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/CurrencySymbols.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Cyrillic.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Devanagari.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Dingbats.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/EnclosedAlphanumerics.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/EnclosedCJKLettersandMonths.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Ethiopic.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/GeneralPunctuation.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/GeometricShapes.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Georgian.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Greek.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/GreekExtended.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Gujarati.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Gurmukhi.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/HalfwidthandFullwidthForms.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/HangulCompatibilityJamo.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/HangulJamo.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/HangulSyllables.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Hebrew.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/HighPrivateUseSurrogates.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/HighSurrogates.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Hiragana.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/IPAExtensions.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/IdeographicDescriptionCharacters.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Kanbun.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/KangxiRadicals.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Kannada.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Katakana.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Khmer.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Lao.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Latin-1Supplement.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/LatinExtended-A.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/LatinExtended-B.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/LatinExtendedAdditional.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/LetterlikeSymbols.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/LowSurrogates.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Malayalam.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/MathematicalOperators.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/MiscellaneousSymbols.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/MiscellaneousTechnical.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Mongolian.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Myanmar.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/NumberForms.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Ogham.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/OpticalCharacterRecognition.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Oriya.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/PrivateUse.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Runic.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Sinhala.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/SmallFormVariants.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/SpacingModifierLetters.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Specials.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/SuperscriptsandSubscripts.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Syriac.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Tamil.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Telugu.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Thaana.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Thai.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/Tibetan.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/UnifiedCanadianAboriginalSyllabics.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/YiRadicals.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/In/YiSyllables.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Index.txt#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/ASCII.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Alnum.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Alpha.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiAL.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiAN.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiB.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiBN.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiCS.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiEN.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiES.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiET.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiL.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiLRE.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiLRO.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiNSM.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiON.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiPDF.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiR.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiRLE.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiRLO.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiS.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/BidiWS.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Blank.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/C.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Cc.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Cf.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Cn.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Cntrl.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Co.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Cs.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCcircle.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCcompat.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCfinal.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCfont.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCfraction.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCinitial.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCisolated.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCmedial.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCnarrow.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCnoBreak.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCsmall.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCsquare.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCsub.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCsuper.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCvertical.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DCwide.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DecoCanon.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/DecoCompat.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Digit.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Graph.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/L.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkAI.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkAL.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkB2.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkBA.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkBB.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkBK.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkCB.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkCL.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkCM.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkCR.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkEX.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkGL.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkHY.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkID.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkIN.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkIS.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkLF.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkNS.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkNU.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkOP.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkPO.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkPR.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkQU.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkSA.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkSG.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkSP.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkSY.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkXX.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/LbrkZW.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Ll.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Lm.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Lo.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Lower.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Lt.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Lu.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/M.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Mc.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Me.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Mirrored.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Mn.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/N.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Nd.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Nl.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/No.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/P.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Pc.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Pd.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Pe.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Pf.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Pi.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Po.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Print.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Ps.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Punct.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/S.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Sc.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Sk.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Sm.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/So.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/Space.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/SpacePerl.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/SylA.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/SylAA.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/SylAAI.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/SylAI.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/SylC.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/SylE.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/SylEE.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/SylI.pl#3 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/SylII.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/SylN.pl#2 delete ... //depot/projects/ia64/contrib/perl5/lib/unicode/Is/SylO.pl#3 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 16 21:12:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF14837B409; Thu, 16 May 2002 21:12:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3817E37B401 for ; Thu, 16 May 2002 21:12:03 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4H4C3g23183 for perforce@freebsd.org; Thu, 16 May 2002 21:12:03 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 16 May 2002 21:12:03 -0700 (PDT) Message-Id: <200205170412.g4H4C3g23183@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11424 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11424 Change 11424 by peter@peter_daintree on 2002/05/16 21:11:37 revert mismerged chunk Affected files ... ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#7 edit Differences ... ==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#7 (text+ko) ==== @@ -134,37 +134,6 @@ OBJS+= dp-bit.o fp-bit.o .endif -# Remove any objects from LIB2FUNCS and LIB2_DIVMOD_FUNCS that are -# defined as optimized assembly code in LIB1ASMFUNCS. -.if defined(LIB1ASMFUNCS) -.for sym in ${LIB1ASMFUNCS} -LIB2FUNCS_1:= ${LIB2FUNCS_1:S/${sym}//g} -LIB2FUNCS_2:= ${LIB2FUNCS_2:S/${sym}//g} -LIB2_DIVMOD_FUNCS:= ${LIB2_DIVMOD_FUNCS:S/${sym}//g} -.endfor -.endif - -#----------------------------------------------------------------------- - -SYMS= ${LIB2FUNCS_1} \ - ${LIB2FUNCS_2} \ - ${LIB2_DIVMOD_FUNCS} -.if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64" -SYMS+= ${FPBIT_FUNCS} ${DPBIT_FUNCS} -.endif -SYMS_ST= ${LIB2FUNCS_ST} \ - ${LIB2ADD_ST} -OBJS_T= ${SYMS:S/$/.o/} ${SYMS_ST:S/$/.o/} -OBJS_P= ${SYMS:S/$/.po/} ${SYMS_ST:S/$/.po/} -OBJS_S= ${SYMS:S/$/.So/} -ASM_T= ${LIB1ASMFUNCS:S/$/.o/} -ASM_P= ${LIB1ASMFUNCS:S/$/.po/} -ASM_S= ${LIB1ASMFUNCS:S/$/.So/} -OBJS+= ${SYMS:S/$/.o/} ${LIB1ASMFUNCS:S/$/.o/} -STATICOBJS= ${SYMS_ST:S/$/.o/} -SRCS= ${LIB2ADD} ${LIB2ADDEH} - - #----------------------------------------------------------------------- dp-bit.o: config/fp-bit.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 16 21:15:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F81E37B409; Thu, 16 May 2002 21:15:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5242737B404 for ; Thu, 16 May 2002 21:15:07 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4H4F7A23374 for perforce@freebsd.org; Thu, 16 May 2002 21:15:07 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 16 May 2002 21:15:07 -0700 (PDT) Message-Id: <200205170415.g4H4F7A23374@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11425 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11425 Change 11425 by peter@peter_daintree on 2002/05/16 21:14:56 revert no longer needed chunk Affected files ... ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#8 edit Differences ... ==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#8 (text+ko) ==== @@ -43,7 +43,6 @@ CFLAGS+= -I${.CURDIR}/../../usr.bin/cc/cc_tools \ -I${GCCDIR}/config -I${GCCDIR} -I. LDFLAGS= -nostdlib -OBJS= #--------------------------------------------------------------------------- # To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 16 21:42: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30C6037B40B; Thu, 16 May 2002 21:41:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id 48AD637B406 for ; Thu, 16 May 2002 21:41:55 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 3A929A900; Thu, 16 May 2002 21:41:47 -0700 (PDT) Date: Thu, 16 May 2002 21:41:47 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11120 for review Message-ID: <20020516214147.B25907@stylus.haikugeek.com> References: <200205101530.g4AFUn510685@freefall.freebsd.org> <3CDC2BB5.366A7BF0@elischer.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <3CDC2BB5.366A7BF0@elischer.org>; from julian@elischer.org on Fri, May 10, 2002 at 01:21:09PM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > > + /* Reassign this thread's KSE. */ > > + if (ke != NULL) { > > + ke->ke_thread = NULL; > > WHOA! just because ke == td->td_kse doesn't mean that > ke->ke_thread == td > > UNLESS you can guarantee that thread unlink is always run with td == curthread > or td->td_state == TDS_RUNNING. thread_unlink() (quoted above) is only called from thread_exit(). thread_exit() exits the currently scheduled thread, so td == curthread and td->td_state == TDS_RUNNING. We're safe both ways. > > + p->p_numthreads--; > > what of the kg->kg_numthreads.. Ten lines down, is : > > + if (kg != NULL) > > + kg->kg_numthreads--; > > move this up? To before the proc is unlinked? Why? > plus other comments already noted by others.. > (tabbing and sleeping with locks) The tabbing is fixed. As for sleeping with locks in UMA functions, Jeff said that it is ok to sleep for a short time, but long-term sleeps aren't such a good idea (makes sense). The only problem he foresaw was that the init/fini functions could be called by the pager daemon, but I don't see any problem there either. Somebody, please correct me if I'm wrong. -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 16 21:50:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0DE037B40E; Thu, 16 May 2002 21:50:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 19AFA37B40D for ; Thu, 16 May 2002 21:50:51 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4H4opj25931 for perforce@freebsd.org; Thu, 16 May 2002 21:50:51 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Date: Thu, 16 May 2002 21:50:51 -0700 (PDT) Message-Id: <200205170450.g4H4opj25931@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 11427 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11427 Change 11427 by amigus@amigus_vmganyopa on 2002/05/16 21:50:44 Added forgotten peer label initialize calls. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#143 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#143 (text+ko) ==== @@ -867,6 +867,7 @@ { mac_init_label(&socket->so_label); + mac_init_label(&socket->so_peerlabel); atomic_add_int(&nmacsockets, 1); } @@ -875,6 +876,7 @@ { mac_destroy_label(&socket->so_label); + mac_destroy_label(&socket->so_peerlabel); atomic_subtract_int(&nmacsockets, 1); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 16 22:14:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A65F737B403; Thu, 16 May 2002 22:14:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from evilpete.dyndns.org (12-232-26-46.client.attbi.com [12.232.26.46]) by hub.freebsd.org (Postfix) with ESMTP id 90FFE37B40D; Thu, 16 May 2002 22:14:36 -0700 (PDT) Received: from overcee.wemm.org ([10.0.0.3]) by evilpete.dyndns.org (8.11.6/8.11.6) with ESMTP id g4H5ES107077; Thu, 16 May 2002 22:14:36 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 1701B380A; Thu, 16 May 2002 22:14:28 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Jonathan Mini Cc: Julian Elischer , jhb@freebsd.org, Perforce Change Reviews Subject: Re: PERFORCE change 11120 for review In-Reply-To: <20020516214147.B25907@stylus.haikugeek.com> Date: Thu, 16 May 2002 22:14:28 -0700 From: Peter Wemm Message-Id: <20020517051428.1701B380A@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jonathan Mini wrote: > Julian Elischer [julian@elischer.org] wrote : > > plus other comments already noted by others.. > > (tabbing and sleeping with locks) > > The tabbing is fixed. As for sleeping with locks in UMA functions, Jeff > said that it is ok to sleep for a short time, but long-term sleeps aren't > such a good idea (makes sense). > > The only problem he foresaw was that the init/fini functions could be called > by the pager daemon, but I don't see any problem there either. Somewhere along the way we were planning to put in code that checked for things that *might* call tsleep() and trap mutexes being held. I dont know if the UMA stuff calls tsleep (directly or indirectly) or not, but it was my understanding that it is a Bad Idea(TM) to call anything that can tsleep with a mutex held. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 16 22:59:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A629437B40B; Thu, 16 May 2002 22:59:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id 4016137B40C; Thu, 16 May 2002 22:59:07 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 6378FA900; Thu, 16 May 2002 22:58:58 -0700 (PDT) Date: Thu, 16 May 2002 22:58:58 -0700 From: Jonathan Mini To: Peter Wemm Cc: Julian Elischer , jhb@freebsd.org, Perforce Change Reviews Subject: Re: PERFORCE change 11120 for review Message-ID: <20020516225858.D25907@stylus.haikugeek.com> References: <20020516214147.B25907@stylus.haikugeek.com> <20020517051428.1701B380A@overcee.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <20020517051428.1701B380A@overcee.wemm.org>; from peter@wemm.org on Thu, May 16, 2002 at 10:14:28PM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Peter Wemm [peter@wemm.org] wrote : > Jonathan Mini wrote: > > > The only problem he foresaw was that the init/fini functions could be called > > by the pager daemon, but I don't see any problem there either. > > Somewhere along the way we were planning to put in code that checked for > things that *might* call tsleep() and trap mutexes being held. I dont know > if the UMA stuff calls tsleep (directly or indirectly) or not, but it was > my understanding that it is a Bad Idea(TM) to call anything that can tsleep > with a mutex held. > I think maybe you misunderstand. The problem isn't that the pager calls the uma init/fini functions, but rather that *my* init/fini functions may block inside the VM. -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 16 23: 3:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E15F337B404; Thu, 16 May 2002 23:03:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A128137B409 for ; Thu, 16 May 2002 23:03:19 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4H63Jh35360 for perforce@freebsd.org; Thu, 16 May 2002 23:03:19 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 16 May 2002 23:03:19 -0700 (PDT) Message-Id: <200205170603.g4H63Jh35360@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11430 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11430 Change 11430 by peter@peter_daintree on 2002/05/16 23:02:20 final chunk reverted Affected files ... ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#9 edit Differences ... ==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#9 (text+ko) ==== @@ -133,8 +133,6 @@ OBJS+= dp-bit.o fp-bit.o .endif -#----------------------------------------------------------------------- - dp-bit.o: config/fp-bit.c ${XCC} -c ${CFLAGS} -o ${.TARGET} ${.ALLSRC:M*fp-bit*} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 16 23:11:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A102137B411; Thu, 16 May 2002 23:11:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from evilpete.dyndns.org (12-232-26-46.client.attbi.com [12.232.26.46]) by hub.freebsd.org (Postfix) with ESMTP id 26E1F37B403; Thu, 16 May 2002 23:09:05 -0700 (PDT) Received: from overcee.wemm.org ([10.0.0.3]) by evilpete.dyndns.org (8.11.6/8.11.6) with ESMTP id g4H68v107252; Thu, 16 May 2002 23:09:04 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id CF499380A; Thu, 16 May 2002 23:08:56 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Jonathan Mini Cc: Julian Elischer , jhb@freebsd.org, Perforce Change Reviews Subject: Re: PERFORCE change 11120 for review In-Reply-To: <20020516225858.D25907@stylus.haikugeek.com> Date: Thu, 16 May 2002 23:08:56 -0700 From: Peter Wemm Message-Id: <20020517060856.CF499380A@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jonathan Mini wrote: > Peter Wemm [peter@wemm.org] wrote : > > > Jonathan Mini wrote: > > > > > The only problem he foresaw was that the init/fini functions could be cal led > > > by the pager daemon, but I don't see any problem there either. > > > > Somewhere along the way we were planning to put in code that checked for > > things that *might* call tsleep() and trap mutexes being held. I dont know > > if the UMA stuff calls tsleep (directly or indirectly) or not, but it was > > my understanding that it is a Bad Idea(TM) to call anything that can tsleep > > with a mutex held. > > > > I think maybe you misunderstand. The problem isn't that the pager calls the > uma init/fini functions, but rather that *my* init/fini functions may block > inside the VM. Ah. Thanks for the clarification. If that block within VM is a tsleep block instead of a mutex block then we probably do have problems.. Assuming uma calls your init/fini functions with some of its locks held. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 16 23:36:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB64E37B404; Thu, 16 May 2002 23:36:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A6AB737B433 for ; Thu, 16 May 2002 23:35:59 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4H6Zx643816 for perforce@freebsd.org; Thu, 16 May 2002 23:35:59 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 16 May 2002 23:35:59 -0700 (PDT) Message-Id: <200205170635.g4H6Zx643816@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11432 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11432 Change 11432 by peter@peter_ia64 on 2002/05/16 23:35:46 Restore LIB1ASMFUNCS handling. We still need this. Affected files ... ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#10 edit Differences ... ==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#10 (text+ko) ==== @@ -167,8 +167,7 @@ ASM_P= ${LIB1ASMFUNCS:S/$/.po/} ASM_S= ${LIB1ASMFUNCS:S/$/.So/} -SYMS= ${LIB1ASMFUNCS} \ - ${LIB2FUNCS_1} \ +SYMS= ${LIB2FUNCS_1} \ ${LIB2FUNCS_2} \ ${LIB2_DIVMOD_FUNCS} .if ${TARGET_ARCH} == "arm" || ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64" @@ -179,7 +178,7 @@ OBJS_T= ${SYMS:S/$/.o/} ${SYMS_ST:S/$/.o/} OBJS_P= ${SYMS:S/$/.po/} ${SYMS_ST:S/$/.po/} OBJS_S= ${SYMS:S/$/.So/} -OBJS= ${SYMS:S/$/.o/} +OBJS= ${SYMS:S/$/.o/} ${LIB1ASMFUNCS:S/$/.o/} STATICOBJS= ${SYMS_ST:S/$/.o/} SRCS= ${LIB2ADD} ${LIB2ADDEH} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 17 0:12: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1827237B406; Fri, 17 May 2002 00:10:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 228B337B405 for ; Fri, 17 May 2002 00:10:43 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4H7Agh50138 for perforce@freebsd.org; Fri, 17 May 2002 00:10:42 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 17 May 2002 00:10:42 -0700 (PDT) Message-Id: <200205170710.g4H7Agh50138@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11434 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11434 Change 11434 by peter@peter_overcee on 2002/05/17 00:10:13 IFC @11433 (pre gcc syncup) Affected files ... ... //depot/projects/ia64/gnu/lib/csu/Makefile#6 integrate ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#11 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile.powerpc#5 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h#4 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile#6 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/c++filt/Makefile#4 integrate ... //depot/projects/ia64/lib/libc/powerpc/SYS.h#2 integrate ... //depot/projects/ia64/sys/alpha/include/atomic.h#4 integrate ... //depot/projects/ia64/usr.bin/find/function.c#8 integrate ... //depot/projects/ia64/usr.bin/finger/util.c#5 integrate ... //depot/projects/ia64/usr.bin/hexdump/conv.c#4 integrate ... //depot/projects/ia64/usr.bin/hexdump/display.c#5 integrate ... //depot/projects/ia64/usr.bin/hexdump/hexdump.1#3 integrate ... //depot/projects/ia64/usr.bin/hexdump/hexdump.h#4 integrate ... //depot/projects/ia64/usr.bin/hexdump/hexsyntax.c#2 integrate ... //depot/projects/ia64/usr.bin/hexdump/od.1#3 integrate ... //depot/projects/ia64/usr.bin/hexdump/odsyntax.c#3 integrate ... //depot/projects/ia64/usr.bin/hexdump/parse.c#4 integrate ... //depot/projects/ia64/usr.bin/last/last.c#4 integrate ... //depot/projects/ia64/usr.bin/paste/paste.c#5 integrate ... //depot/projects/ia64/usr.bin/tset/map.c#4 integrate ... //depot/projects/ia64/usr.bin/tsort/tsort.c#4 integrate ... //depot/projects/ia64/usr.sbin/rpcbind/check_bound.c#2 integrate ... //depot/projects/ia64/usr.sbin/rpcbind/rpcb_svc_4.c#2 integrate ... //depot/projects/ia64/usr.sbin/rpcbind/rpcb_svc_com.c#2 integrate ... //depot/projects/ia64/usr.sbin/rpcbind/rpcbind.c#2 integrate Differences ... ==== //depot/projects/ia64/gnu/lib/csu/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.10 2002/05/14 01:00:25 obrien Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.11 2002/05/17 03:04:47 obrien Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc .PATH: ${GCCDIR} @@ -23,6 +23,11 @@ CRTS_CFLAGS= -DCRTSTUFFS_O ${PICFLAG} MKDEPCMD= CC="${CC}" MKDEP_CPP_OPTS="-M -DCRT_BEGIN" mkdep +.if ${TARGET_ARCH} == "powerpc" +.PATH: ${GCCDIR}/config/${GCC_CPU} +TGTOBJS= crtsavres.o +SRCS+= crtsavres.asm +.endif .if ${TARGET_ARCH} == "sparc64" TGTOBJS= crtfastmath.o SRCS+= crtfastmath.c ==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.40 2002/05/12 14:05:58 obrien Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.42 2002/05/17 04:18:33 obrien Exp $ .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" @@ -44,6 +44,8 @@ -I${GCCDIR}/config -I${GCCDIR} -I. LDFLAGS= -nostdlib +OBJS= # added to below in various ways depending on TARGET_ARCH + #--------------------------------------------------------------------------- # # When upgrading GCC, get the following defintions straight from Makefile.in @@ -116,9 +118,9 @@ .if ${TARGET_ARCH} == "powerpc" # from config/rs6000/t-ppccomm -LIB2FUNCS_EXTRA = tramp.S +LIB2FUNCS_EXTRA = tramp.asm # This one can't end up in shared libgcc -LIB2FUNCS_STATIC_EXTRA = eabi.S +LIB2FUNCS_STATIC_EXTRA = eabi.asm # We want fine grained libraries, so use the new code to build the # floating point emulation libraries. OBJS+= dp-bit.o fp-bit.o @@ -175,10 +177,10 @@ .endif SYMS_ST= ${LIB2FUNCS_ST} \ ${LIB2ADD_ST} +OBJS+= ${SYMS:S/$/.o/} ${LIB1ASMFUNCS:S/$/.o/} OBJS_T= ${SYMS:S/$/.o/} ${SYMS_ST:S/$/.o/} OBJS_P= ${SYMS:S/$/.po/} ${SYMS_ST:S/$/.po/} OBJS_S= ${SYMS:S/$/.So/} -OBJS= ${SYMS:S/$/.o/} ${LIB1ASMFUNCS:S/$/.o/} STATICOBJS= ${SYMS_ST:S/$/.o/} SRCS= ${LIB2ADD} ${LIB2ADDEH} ==== //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile.powerpc#5 (text+ko) ==== @@ -1,111 +1,29 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.powerpc,v 1.10 2002/03/29 00:41:01 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile.powerpc,v 1.11 2002/05/17 03:10:33 obrien Exp $ TARGET_TUPLE?= powerpc-unknown-freebsd .if ${TARGET_ARCH} == "powerpc" NATIVE_EMULATION= elf32ppc HOST= ${TARGET_TUPLE} -CFLAGS+= -DDEFAULT_EMULATION=\"elf_powerpc\" +CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\" CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\" _powerpc_path= \"${TOOLS_PREFIX}/usr/lib\" .else _powerpc_path= \"/usr/cross/powerpc-freebsd/usr/lib\" .endif -EMS+= ${NATIVE_EMULATION} \ - ppcmacos \ - ppcnw \ - ppcpe \ - aixrs6 \ - rs6000lynx +EMS+= ${NATIVE_EMULATION} LDSCRIPTS+= ${NATIVE_EMULATION}.x \ ${NATIVE_EMULATION}.xbn \ ${NATIVE_EMULATION}.xn \ ${NATIVE_EMULATION}.xr \ ${NATIVE_EMULATION}.xs \ ${NATIVE_EMULATION}.xu \ - ${NATIVE_EMULATION}.xc \ - ${NATIVE_EMULATION}.xsc \ - ppcmacos.x \ - ppcmacos.xbn \ - ppcmacos.xn \ - ppcmacos.xr \ - ppcmacos.xu \ - ppcmacos.xc \ - ppcmacos.xsc \ - ppcnw.x \ - ppcnw.xbn \ - ppcnw.xn \ - ppcnw.xr \ - ppcnw.xu \ - ppcnw.xc \ - ppcnw.xsc \ - ppcpe.x \ - ppcpe.xbn \ - ppcpe.xn \ - ppcpe.xr \ - ppcpe.xu \ - ppcpe.xc \ - ppcpe.xsc \ - aixrs6.x \ - aixrs6.xbn \ - aixrs6.xn \ - aixrs6.xr \ - aixrs6.xu \ - aixrs6.xc \ - aixrs6.xsc \ - rs6000lynx.x \ - rs6000lynx.xbn \ - rs6000lynx.xn \ - rs6000lynx.xr \ - rs6000lynx.xu \ - rs6000lynx.xc \ - rs6000lynx.xsc -SRCS+= e${NATIVE_EMULATION}.c \ - eppcmacos.c \ - eppcnw.c \ - eppcpe.c \ - eaixrs6.c \ - ers6000lynx.c -CLEANFILES+= e${NATIVE_EMULATION}.c \ - eppcmacos.c \ - eppcnw.c \ - eppcpe.c \ - eaixrs6.c \ - ers6000lynx.c + ${NATIVE_EMULATION}.xsc +SRCS+= e${NATIVE_EMULATION}.c +CLEANFILES+= e${NATIVE_EMULATION}.c -e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em scripttempl/elfppc.sc \ - genscripts.sh stringify.sed - sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \ - ${_powerpc_path} ${HOST} ${TARGET_TUPLE} \ - ${TARGET_TUPLE} ${NATIVE_EMULATION} "" ${NATIVE_EMULATION} - -eppcmacos.c: emulparams/ppcmacos.sh emultempl/aix.em scripttempl/aix.sc \ - genscripts.sh stringify.sed - sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \ - /usr/cross/powerpc_macos/usr/lib ${HOST} \ - ${TARGET_TUPLE}macos \ - ${TARGET_TUPLE}macos ppcmacos "" ppcmacos - -eppcnw.c: emulparams/ppcnw.sh emultempl/elf32.em scripttempl/nw.sc \ - genscripts.sh stringify.sed - sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \ - /usr/cross/powerpc_nw/usr/lib ${HOST} ${TARGET_TUPLE}nw \ - ${TARGET_TUPLE}nw ppcnw "" ppcnw - -eppcpe.c: emulparams/ppcpe.sh emultempl/pe.em scripttempl/ppcpe.sc \ - genscripts.sh stringify.sed - sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \ - /usr/cross/powerpc_pe/usr/lib ${HOST} ${TARGET_TUPLE}pe \ - ${TARGET_TUPLE}pe ppcpe "" ppcpe - -eaixrs6.c: emulparams/aixrs6.sh emultempl/aix.em scripttempl/aix.sc \ - genscripts.sh stringify.sed - sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \ - /usr/cross/rs6000-lynx/lib ${HOST} aixcoff-rs6000 \ - aixcoff-rs6000 aixrs6 "" aixrs6 - -ers6000lynx.c: emulparams/rs6000lynx.sh emultempl/aix.em scripttempl/aix.sc \ - genscripts.sh stringify.sed - sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \ - /usr/cross/rs6000-lynx/lib ${HOST} aixcoff-rs6000 \ - aixcoff-rs6000 rs6000lynx "" rs6000lynx +e${NATIVE_EMULATION}.c: emulparams/${NATIVE_EMULATION}.sh emultempl/elf32.em \ + scripttempl/elfppc.sc genscripts.sh stringify.sed + sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_powerpc_path} \ + ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \ + ${NATIVE_EMULATION} "" ${NATIVE_EMULATION} ${TARGET_TUPLE} ==== //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile.powerpc#2 (text+ko) ==== @@ -1,21 +1,17 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc,v 1.3 2001/10/14 00:58:59 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.powerpc,v 1.4 2002/05/17 03:43:47 obrien Exp $ -SRCS+= cofflink.c \ +SRCS+= \ cpu-powerpc.c \ + cpu-rs6000.c \ + elf32.c \ + elf32-gen.c \ elf32-ppc.c \ elf32-target.h \ - elf32.c \ elflink.c \ - pe-ppc.c \ - pei-ppc.c \ ppcboot.c \ - xcofflink.c + #xcofflink.c VECS+= bfd_elf32_powerpc_vec \ bfd_elf32_powerpcle_vec \ - bfd_powerpc_pe_vec \ - bfd_powerpc_pei_vec \ - bfd_powerpcle_pe_vec \ - bfd_powerpcle_pei_vec \ ppcboot_vec .if ${TARGET_ARCH} == "powerpc" @@ -23,10 +19,6 @@ .endif CFLAGS+= -DHAVE_bfd_elf32_powerpc_vec \ -DHAVE_bfd_elf32_powerpcle_vec \ - -DHAVE_bfd_powerpc_pe_vec \ - -DHAVE_bfd_powerpc_pei_vec \ - -DHAVE_bfd_powerpcle_pe_vec \ - -DHAVE_bfd_powerpcle_pei_vec \ -DHAVE_ppcboot_vec CLEANFILES+= elf32-target.h ==== //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h#4 (text+ko) ==== @@ -1,15 +1,14 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h,v 1.3 2002/03/20 23:05:16 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/libbfd/powerpc/bfd.h,v 1.4 2002/05/17 03:43:09 obrien Exp $ */ /* DO NOT EDIT! -*- buffer-read-only: t -*- This file is automatically - generated from "bfd-in.h", " ", "init.c", " ", "opncls.c", - " ", "libbfd.c", " ", "section.c", " ", "archures.c ", "reloc.c ", - "syms.c ", "bfd.c ", "archive.c ", "corefile.c ", "targets.c " - and "format.c ". + generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c", + "section.c", "archures.c", "reloc.c", "syms.c", "bfd.c", "archive.c", + "corefile.c", "targets.c" and "format.c". Run "make headers" in your build bfd/ to regenerate. */ /* Main header file for the bfd library -- portable access to object files. Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001 + 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by Cygnus Support. @@ -36,9 +35,6 @@ extern "C" { #endif -/* FreeBSD does not adhere to the System V ABI. */ -#define ELF_DYNAMIC_INTERPRETER "/usr/libexec/ld-elf.so.1" - #include "ansidecl.h" #include "symcat.h" #if defined (__STDC__) || defined (ALMOST_STDC) || defined (HAVE_STRINGIZE) @@ -87,7 +83,7 @@ #endif #endif -/* forward declaration */ +/* Forward declaration. */ typedef struct _bfd bfd; /* To squelch erroneous compiler warnings ("illegal pointer @@ -104,8 +100,16 @@ /* Yup, SVR4 has a "typedef enum boolean" in -fnf */ /* It gets worse if the host also defines a true/false enum... -sts */ /* And even worse if your compiler has built-in boolean types... -law */ +/* And even worse if your compiler provides a stdbool.h that conflicts + with these definitions... gcc 2.95 and later do. If so, it must + be included first. -drow */ #if defined (__GNUG__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 6)) #define TRUE_FALSE_ALREADY_DEFINED +#else +#if defined (__bool_true_false_are_defined) +/* We have . */ +#define TRUE_FALSE_ALREADY_DEFINED +#endif #endif #ifdef MPW /* Pre-emptive strike - get the file with the enum. */ @@ -207,15 +211,17 @@ typedef unsigned int flagword; /* 32 bits of flags */ typedef unsigned char bfd_byte; -/** File formats */ +/* File formats. */ -typedef enum bfd_format { - bfd_unknown = 0, /* file format is unknown */ - bfd_object, /* linker/assember/compiler output */ - bfd_archive, /* object archive file */ - bfd_core, /* core dump */ - bfd_type_end} /* marks the end; don't use it! */ - bfd_format; +typedef enum bfd_format +{ + bfd_unknown = 0, /* File format is unknown. */ + bfd_object, /* Linker/assember/compiler output. */ + bfd_archive, /* Object archive file. */ + bfd_core, /* Core dump. */ + bfd_type_end /* Marks the end; don't use it! */ +} +bfd_format; /* Values that may appear in the flags field of a BFD. These also appear in the object_flags field of the bfd_target structure, where @@ -274,7 +280,7 @@ memory. If this is set, iostream points to a bfd_in_memory struct. */ #define BFD_IN_MEMORY 0x800 -/* symbols and relocation */ +/* Symbols and relocation. */ /* A count of carsyms (canonical archive symbols). */ typedef unsigned long symindex; @@ -298,33 +304,40 @@ #define bfd_asymbol_flavour(x) (bfd_asymbol_bfd(x)->xvec->flavour) /* A canonical archive symbol. */ -/* This is a type pun with struct ranlib on purpose! */ -typedef struct carsym { +/* This is a type pun with struct ranlib on purpose! */ +typedef struct carsym +{ char *name; - file_ptr file_offset; /* look here to find the file */ -} carsym; /* to make these you call a carsymogen */ + file_ptr file_offset; /* Look here to find the file. */ +} +carsym; /* To make these you call a carsymogen. */ /* Used in generating armaps (archive tables of contents). - Perhaps just a forward definition would do? */ -struct orl { /* output ranlib */ - char **name; /* symbol name */ - union { + Perhaps just a forward definition would do? */ +struct orl /* Output ranlib. */ +{ + char **name; /* Symbol name. */ + union + { file_ptr pos; bfd *abfd; - } u; /* bfd* or file position */ - int namidx; /* index into string table */ + } u; /* bfd* or file position. */ + int namidx; /* Index into string table. */ }; -/* Linenumber stuff */ -typedef struct lineno_cache_entry { - unsigned int line_number; /* Linenumber from start of function*/ - union { - struct symbol_cache_entry *sym; /* Function name */ - bfd_vma offset; /* Offset into section */ +/* Linenumber stuff. */ +typedef struct lineno_cache_entry +{ + unsigned int line_number; /* Linenumber from start of function. */ + union + { + struct symbol_cache_entry *sym; /* Function name. */ + bfd_vma offset; /* Offset into section. */ } u; -} alent; +} +alent; -/* object and core file sections */ +/* Object and core file sections. */ #define align_power(addr, align) \ ( ((addr) + ((1<<(align))-1)) & (-1 << (align))) @@ -463,7 +476,7 @@ #define COFF_SWAP_TABLE (PTR) &bfd_coff_std_swap_table -/* User program access to BFD facilities */ +/* User program access to BFD facilities. */ /* Direct I/O routines, for programs which know more about the object file than BFD does. Use higher level routines if possible. */ @@ -679,6 +692,9 @@ extern boolean bfd_m68k_elf32_create_embedded_relocs PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *, char **)); +extern boolean bfd_mips_elf32_create_embedded_relocs + PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *, + char **)); /* SunOS shared library support routines for the linker. */ @@ -704,7 +720,8 @@ struct _bfd_window_internal; typedef struct _bfd_window_internal bfd_window_internal; -typedef struct _bfd_window { +typedef struct _bfd_window +{ /* What the user asked for. */ PTR data; bfd_size_type size; @@ -715,7 +732,8 @@ application; don't want to give the same region back when the application wants two writable copies! */ struct _bfd_window_internal *i; -} bfd_window; +} +bfd_window; extern void bfd_init_window PARAMS ((bfd_window *)); extern void bfd_free_window PARAMS ((bfd_window *)); @@ -992,25 +1010,20 @@ { /* The name of the section; the name isn't a copy, the pointer is the same as that passed to bfd_make_section. */ - const char *name; /* A unique sequence number. */ - int id; /* Which section in the bfd; 0..n-1 as sections are created in a bfd. */ - int index; /* The next section in the list belonging to the BFD, or NULL. */ - struct sec *next; /* The field flags contains attributes of the section. Some flags are read in from the object file, and some are synthesized from other information. */ - flagword flags; #define SEC_NO_FLAGS 0x000 @@ -1219,25 +1232,21 @@ backend can assign addresses (for example, in <>, where the default address for <<.data>> is dependent on the specific target and various flags). */ - bfd_vma vma; /* The load address of the section - where it would be in a rom image; really only used for writing section header - information. */ - + information. */ bfd_vma lma; /* The size of the section in octets, as it will be output. Contains a value even if the section has no contents (e.g., the size of <<.bss>>). This will be filled in after relocation. */ - bfd_size_type _cooked_size; /* The original size on disk of the section, in octets. Normally this value is the same as the size, but if some relaxing has been done, then this value will be bigger. */ - bfd_size_type _raw_size; /* If this section is going to be output, then this value is the @@ -1247,49 +1256,39 @@ 100th octet (8-bit quantity) in the output section, this value would be 100. However, if the target byte size is 16 bits (bfd_octets_per_byte is "2"), this value would be 50. */ - bfd_vma output_offset; /* The output section through which to map on output. */ - struct sec *output_section; /* The alignment requirement of the section, as an exponent of 2 - e.g., 3 aligns to 2^3 (or 8). */ - unsigned int alignment_power; /* If an input section, a pointer to a vector of relocation records for the data in this section. */ - struct reloc_cache_entry *relocation; /* If an output section, a pointer to a vector of pointers to relocation records for the data in this section. */ - struct reloc_cache_entry **orelocation; - /* The number of relocation records in one of the above */ - + /* The number of relocation records in one of the above. */ unsigned reloc_count; /* Information below is back end specific - and not always used or updated. */ /* File position of section data. */ - file_ptr filepos; /* File position of relocation info. */ - file_ptr rel_filepos; /* File position of line data. */ - file_ptr line_filepos; /* Pointer to data for applications. */ - PTR userdata; /* If the SEC_IN_MEMORY flag is set, this points to the actual @@ -1297,48 +1296,40 @@ unsigned char *contents; /* Attached line number information. */ - alent *lineno; /* Number of line number records. */ - unsigned int lineno_count; /* Entity size for merging purposes. */ - unsigned int entsize; /* Optional information about a COMDAT entry; NULL if not COMDAT. */ - struct bfd_comdat_info *comdat; /* When a section is being output, this value changes as more linenumbers are written out. */ - file_ptr moving_line_filepos; /* What the section number is in the target world. */ - int target_index; PTR used_by_bfd; /* If this is a constructor section then here is a list of the relocations created to relocate items within it. */ - struct relent_chain *constructor_chain; /* The BFD which owns the section. */ - bfd *owner; - /* A symbol which points at this section only */ + /* A symbol which points at this section only. */ struct symbol_cache_entry *symbol; struct symbol_cache_entry **symbol_ptr_ptr; struct bfd_link_order *link_order_head; struct bfd_link_order *link_order_tail; -} asection ; +} asection; /* These sections are global, and are managed by BFD. The application and target back end are not permitted to change the values in @@ -1350,18 +1341,18 @@ #define BFD_COM_SECTION_NAME "*COM*" #define BFD_IND_SECTION_NAME "*IND*" -/* the absolute section */ +/* The absolute section. */ extern const asection bfd_abs_section; #define bfd_abs_section_ptr ((asection *) &bfd_abs_section) #define bfd_is_abs_section(sec) ((sec) == bfd_abs_section_ptr) -/* Pointer to the undefined section */ +/* Pointer to the undefined section. */ extern const asection bfd_und_section; #define bfd_und_section_ptr ((asection *) &bfd_und_section) #define bfd_is_und_section(sec) ((sec) == bfd_und_section_ptr) -/* Pointer to the common section */ +/* Pointer to the common section. */ extern const asection bfd_com_section; #define bfd_com_section_ptr ((asection *) &bfd_com_section) -/* Pointer to the indirect section */ +/* Pointer to the indirect section. */ extern const asection bfd_ind_section; #define bfd_ind_section_ptr ((asection *) &bfd_ind_section) #define bfd_is_ind_section(sec) ((sec) == bfd_ind_section_ptr) @@ -1463,8 +1454,8 @@ enum bfd_architecture { - bfd_arch_unknown, /* File arch not known */ - bfd_arch_obscure, /* Arch known, not one of these */ + bfd_arch_unknown, /* File arch not known. */ + bfd_arch_obscure, /* Arch known, not one of these. */ bfd_arch_m68k, /* Motorola 68xxx */ #define bfd_mach_m68000 1 #define bfd_mach_m68008 2 @@ -1486,7 +1477,7 @@ available to machines with higher numbers. The exception is the "ca", which is incompatible with all other machines except - "core". */ + "core". */ #define bfd_mach_i960_core 1 #define bfd_mach_i960_ka_sa 2 @@ -1497,6 +1488,8 @@ #define bfd_mach_i960_jx 7 #define bfd_mach_i960_hx 8 + bfd_arch_or32, /* OpenRISC 32 */ + bfd_arch_a29k, /* AMD 29000 */ bfd_arch_sparc, /* SPARC */ #define bfd_mach_sparc 1 @@ -1504,12 +1497,12 @@ #define bfd_mach_sparc_sparclet 2 #define bfd_mach_sparc_sparclite 3 #define bfd_mach_sparc_v8plus 4 -#define bfd_mach_sparc_v8plusa 5 /* with ultrasparc add'ns */ +#define bfd_mach_sparc_v8plusa 5 /* with ultrasparc add'ns. */ #define bfd_mach_sparc_sparclite_le 6 #define bfd_mach_sparc_v9 7 -#define bfd_mach_sparc_v9a 8 /* with ultrasparc add'ns */ -#define bfd_mach_sparc_v8plusb 9 /* with cheetah add'ns */ -#define bfd_mach_sparc_v9b 10 /* with cheetah add'ns */ +#define bfd_mach_sparc_v9a 8 /* with ultrasparc add'ns. */ +#define bfd_mach_sparc_v8plusb 9 /* with cheetah add'ns. */ +#define bfd_mach_sparc_v9b 10 /* with cheetah add'ns. */ /* Nonzero if MACH has the v9 instruction set. */ #define bfd_mach_sparc_v9_p(mach) \ ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9b \ @@ -1557,6 +1550,7 @@ bfd_arch_pdp11, /* DEC PDP-11 */ bfd_arch_powerpc, /* PowerPC */ #define bfd_mach_ppc 0 +#define bfd_mach_ppc64 1 #define bfd_mach_ppc_403 403 #define bfd_mach_ppc_403gc 4030 #define bfd_mach_ppc_505 505 @@ -1598,11 +1592,12 @@ #define bfd_mach_sh3_dsp 0x3d #define bfd_mach_sh3e 0x3e #define bfd_mach_sh4 0x40 +#define bfd_mach_sh5 0x50 bfd_arch_alpha, /* Dec Alpha */ #define bfd_mach_alpha_ev4 0x10 #define bfd_mach_alpha_ev5 0x20 #define bfd_mach_alpha_ev6 0x30 - bfd_arch_arm, /* Advanced Risc Machines ARM */ + bfd_arch_arm, /* Advanced Risc Machines ARM. */ #define bfd_mach_arm_2 1 #define bfd_mach_arm_2a 2 #define bfd_mach_arm_3 3 @@ -1628,7 +1623,7 @@ #define bfd_mach_arc_7 2 #define bfd_mach_arc_8 3 bfd_arch_m32r, /* Mitsubishi M32R/D */ -#define bfd_mach_m32r 0 /* backwards compatibility */ +#define bfd_mach_m32r 0 /* For backwards compatibility. */ #define bfd_mach_m32rx 'x' bfd_arch_mn10200, /* Matsushita MN10200 */ bfd_arch_mn10300, /* Matsushita MN10300 */ @@ -1641,7 +1636,7 @@ #define bfd_mach_ia64_elf64 0 #define bfd_mach_ia64_elf32 1 bfd_arch_pj, - bfd_arch_avr, /* Atmel AVR microcontrollers */ + bfd_arch_avr, /* Atmel AVR microcontrollers. */ #define bfd_mach_avr1 1 #define bfd_mach_avr2 2 #define bfd_mach_avr3 3 @@ -1652,7 +1647,7 @@ #define bfd_mach_s390_esa 0 #define bfd_mach_s390_esame 1 bfd_arch_openrisc, /* OpenRISC */ - bfd_arch_mmix, /* Donald Knuth's educational processor */ + bfd_arch_mmix, /* Donald Knuth's educational processor. */ bfd_arch_xstormy16, #define bfd_mach_xstormy16 0 bfd_arch_last @@ -1677,7 +1672,9 @@ boolean (*scan) PARAMS ((const struct bfd_arch_info *, const char *)); const struct bfd_arch_info *next; -} bfd_arch_info_type; +} +bfd_arch_info_type; + const char * bfd_printable_name PARAMS ((bfd *abfd)); @@ -1727,25 +1724,25 @@ typedef enum bfd_reloc_status { - /* No errors detected */ + /* No errors detected. */ bfd_reloc_ok, - /* The relocation was performed, but there was an overflow. */ + /* The relocation was performed, but there was an overflow. */ bfd_reloc_overflow, - /* The address to relocate was not within the section supplied. */ + /* The address to relocate was not within the section supplied. */ bfd_reloc_outofrange, - /* Used by special functions */ + /* Used by special functions. */ bfd_reloc_continue, - /* Unsupported relocation size requested. */ + /* Unsupported relocation size requested. */ bfd_reloc_notsupported, - /* Unused */ + /* Unused. */ bfd_reloc_other, - /* The symbol to relocate against was undefined. */ + /* The symbol to relocate against was undefined. */ bfd_reloc_undefined, /* The relocation was performed, but may not be ok - presently @@ -1759,34 +1756,36 @@ typedef struct reloc_cache_entry { - /* A pointer into the canonical table of pointers */ + /* A pointer into the canonical table of pointers. */ struct symbol_cache_entry **sym_ptr_ptr; - /* offset in section */ + /* offset in section. */ bfd_size_type address; - /* addend for relocation value */ + /* addend for relocation value. */ bfd_vma addend; - /* Pointer to how to perform the required relocation */ + /* Pointer to how to perform the required relocation. */ reloc_howto_type *howto; -} arelent; +} +arelent; + enum complain_overflow { - /* Do not complain on overflow. */ + /* Do not complain on overflow. */ complain_overflow_dont, /* Complain if the bitfield overflows, whether it is considered - as signed or unsigned. */ + as signed or unsigned. */ complain_overflow_bitfield, /* Complain if the value overflows when considered as signed - number. */ + number. */ complain_overflow_signed, /* Complain if the value overflows when considered as an - unsigned number. */ + unsigned number. */ complain_overflow_unsigned }; @@ -1878,6 +1877,7 @@ empty (e.g., m88k bcs); this flag signals the fact. */ boolean pcrel_offset; }; + #define HOWTO(C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC) \ { (unsigned) C, R, S, B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC } #define NEWHOWTO(FUNCTION, NAME, SIZE, REL, IN) \ @@ -1902,6 +1902,7 @@ } \ } \ } + unsigned int bfd_get_reloc_size PARAMS ((reloc_howto_type *)); @@ -1909,7 +1910,9 @@ { arelent relent; struct relent_chain *next; -} arelent_chain; +} +arelent_chain; + bfd_reloc_status_type bfd_check_overflow PARAMS ((enum complain_overflow how, unsigned int bitsize, @@ -1936,7 +1939,7 @@ _dummy_first_bfd_reloc_code_real, -/* Basic absolute relocations of N bits. */ +/* Basic absolute relocations of N bits. */ BFD_RELOC_64, BFD_RELOC_32, BFD_RELOC_26, @@ -1949,7 +1952,7 @@ of the relocation itself; sometimes they are relative to the start of the section containing the relocation. It depends on the specific target. -The 24-bit relocation is used in some Intel 960 configurations. */ +The 24-bit relocation is used in some Intel 960 configurations. */ BFD_RELOC_64_PCREL, BFD_RELOC_32_PCREL, BFD_RELOC_24_PCREL, @@ -1957,7 +1960,7 @@ BFD_RELOC_12_PCREL, BFD_RELOC_8_PCREL, -/* For ELF. */ +/* For ELF. */ BFD_RELOC_32_GOT_PCREL, BFD_RELOC_16_GOT_PCREL, BFD_RELOC_8_GOT_PCREL, @@ -1980,12 +1983,12 @@ BFD_RELOC_HI16_S_PLTOFF, BFD_RELOC_8_PLTOFF, -/* Relocations used by 68K ELF. */ +/* Relocations used by 68K ELF. */ BFD_RELOC_68K_GLOB_DAT, BFD_RELOC_68K_JMP_SLOT, BFD_RELOC_68K_RELATIVE, -/* Linkage-table relative. */ +/* Linkage-table relative. */ BFD_RELOC_32_BASEREL, BFD_RELOC_16_BASEREL, BFD_RELOC_LO16_BASEREL, @@ -1994,7 +1997,7 @@ BFD_RELOC_8_BASEREL, BFD_RELOC_RVA, -/* Absolute 8-bit relocation, but used to form an address like 0xFFnn. */ +/* Absolute 8-bit relocation, but used to form an address like 0xFFnn. */ BFD_RELOC_8_FFnn, /* These PC-relative relocations are stored as word displacements -- @@ -2002,28 +2005,28 @@ displacement (<<32_PCREL_S2>> -- 32 bits, shifted 2) is used on the SPARC. (SPARC tools generally refer to this as <>.) The signed 16-bit displacement is used on the MIPS, and the 23-bit -displacement is used on the Alpha. */ +displacement is used on the Alpha. */ BFD_RELOC_32_PCREL_S2, BFD_RELOC_16_PCREL_S2, BFD_RELOC_23_PCREL_S2, /* High 22 bits and low 10 bits of 32-bit value, placed into lower bits of -the target word. These are used on the SPARC. */ +the target word. These are used on the SPARC. */ BFD_RELOC_HI22, BFD_RELOC_LO10, /* For systems that allocate a Global Pointer register, these are displacements off that register. These relocation types are handled specially, because the value the register will have is -decided relatively late. */ +decided relatively late. */ BFD_RELOC_GPREL16, BFD_RELOC_GPREL32, -/* Reloc types used for i960/b.out. */ +/* Reloc types used for i960/b.out. */ BFD_RELOC_I960_CALLJ, /* SPARC ELF relocations. There is probably some overlap with other -relocation types already defined. */ +relocation types already defined. */ BFD_RELOC_NONE, BFD_RELOC_SPARC_WDISP22, BFD_RELOC_SPARC22, @@ -2042,11 +2045,11 @@ BFD_RELOC_SPARC_UA32, BFD_RELOC_SPARC_UA64, -/* I think these are specific to SPARC a.out (e.g., Sun 4). */ +/* I think these are specific to SPARC a.out (e.g., Sun 4). */ BFD_RELOC_SPARC_BASE13, BFD_RELOC_SPARC_BASE22, -/* SPARC64 relocations */ +/* SPARC64 relocations */ #define BFD_RELOC_SPARC_64 BFD_RELOC_64 BFD_RELOC_SPARC_10, BFD_RELOC_SPARC_11, @@ -2072,7 +2075,7 @@ BFD_RELOC_SPARC_L44, BFD_RELOC_SPARC_REGISTER, -/* SPARC little endian relocation */ +/* SPARC little endian relocation */ BFD_RELOC_SPARC_REV32, /* Alpha ECOFF and ELF relocations. Some of these treat the symbol or @@ -2080,18 +2083,18 @@ For GPDISP_HI16 ("gpdisp") relocations, the symbol is ignored when writing; when reading, it will be the absolute section symbol. The addend is the displacement in bytes of the "lda" instruction from -the "ldah" instruction (which is at the address of this reloc). */ +the "ldah" instruction (which is at the address of this reloc). */ BFD_RELOC_ALPHA_GPDISP_HI16, /* For GPDISP_LO16 ("ignore") relocations, the symbol is handled as with GPDISP_HI16 relocs. The addend is ignored when writing the relocations out, and is filled in with the file's GP value on -reading, for convenience. */ +reading, for convenience. */ BFD_RELOC_ALPHA_GPDISP_LO16, /* The ELF GPDISP relocation is exactly the same as the GPDISP_HI16 relocation except that there is no accompanying GPDISP_LO16 -relocation. */ +relocation. */ BFD_RELOC_ALPHA_GPDISP, /* The Alpha LITERAL/LITUSE relocs are produced by a symbol reference; @@ -2116,61 +2119,66 @@ of instruction using the register: 1 - "memory" fmt insn 2 - byte-manipulation (byte offset reg) -3 - jsr (target of branch) */ +3 - jsr (target of branch) */ BFD_RELOC_ALPHA_LITERAL, BFD_RELOC_ALPHA_ELF_LITERAL, BFD_RELOC_ALPHA_LITUSE, /* The HINT relocation indicates a value that should be filled into the "hint" field of a jmp/jsr/ret instruction, for possible branch- -prediction logic which may be provided on some processors. */ +prediction logic which may be provided on some processors. */ BFD_RELOC_ALPHA_HINT, /* The LINKAGE relocation outputs a linkage pair in the object file, -which is filled by the linker. */ +which is filled by the linker. */ BFD_RELOC_ALPHA_LINKAGE, >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 17 0:25:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 419F137B40B; Fri, 17 May 2002 00:25:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AD97E37B405 for ; Fri, 17 May 2002 00:25:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4H7P0u51275 for perforce@freebsd.org; Fri, 17 May 2002 00:25:00 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 17 May 2002 00:25:00 -0700 (PDT) Message-Id: <200205170725.g4H7P0u51275@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11435 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11435 Change 11435 by peter@peter_ia64 on 2002/05/17 00:24:27 Checkpoint.. this seems to work and might be commitable Affected files ... ... //depot/projects/ia64/gnu/lib/csu/Makefile#7 edit Differences ... ==== //depot/projects/ia64/gnu/lib/csu/Makefile#7 (text+ko) ==== @@ -9,9 +9,14 @@ .PATH: ${GCCDIR}/config/${GCC_CPU} .if ${TARGET_ARCH} == "ia64" -SRCS= crtbegin.asm crtend.asm -.else -SRCS= crtstuff.c tconfig.h +BEGINSRC= crtbegin.asm +ENDSRC= crtend.asm +CFLAGS+= -x assembler-with-cpp # Ugly hack +.endif +.if !defined(BEGINSRC) && !defined(ENDSRC) +SRCS= crtstuff.c # for 'make depend' +BEGINSRC= crtstuff.c +ENDSRC= crtstuff.c .endif OBJS= crtbegin.o crtend.o SOBJS= crtbegin.So crtend.So @@ -20,11 +25,10 @@ -fno-exceptions -fno-omit-frame-pointer CFLAGS+= -I${GCCDIR}/config -I${GCCDIR} -I. \ -I${CCDIR}/cc_tools -CRTS_CFLAGS= -DCRTSTUFFS_O ${PICFLAG} +CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG} MKDEPCMD= CC="${CC}" MKDEP_CPP_OPTS="-M -DCRT_BEGIN" mkdep .if ${TARGET_ARCH} == "powerpc" -.PATH: ${GCCDIR}/config/${GCC_CPU} TGTOBJS= crtsavres.o SRCS+= crtsavres.asm .endif @@ -35,45 +39,26 @@ all: ${OBJS} ${SOBJS} ${TGTOBJS} +beforedepend: tconfig.h +${OBJS} ${SOBJS} ${TGTOBJS}: tconfig.h + CLEANFILES= ${OBJS} ${SOBJS} ${TGTOBJS} -crtbegin.o crtbegin.So crtend.o crtend.So: ${SRCS} - -.if ${TARGET_ARCH} == "ia64" -depend: - -crtbegin.o: - ${CC} -x assembler-with-cpp \ - -c -o ${.TARGET} ${.ALLSRC:M*crtbegin*} - -crtbegin.So: - ${CC} -x assembler-with-cpp -DSHARED \ - -c -o ${.TARGET} ${.ALLSRC:M*crtbegin*} - -crtend.o: - ${CC} -x assembler-with-cpp \ - -c -o ${.TARGET} ${.ALLSRC:M*crtend*} - -crtend.So: - ${CC} -x assembler-with-cpp -DSHARED \ - -c -o ${.TARGET} ${.ALLSRC:M*crtend*} -.else -crtbegin.o: +crtbegin.o: ${BEGINSRC} ${CC} ${CFLAGS} -g0 -DCRT_BEGIN \ - -c -o ${.TARGET} ${.ALLSRC:M*crtstuff*} + -c -o ${.TARGET} ${.ALLSRC:M*.c} ${.ALLSRC:M*.asm} -crtbegin.So: +crtbegin.So: ${BEGINSRC} ${CC} ${CFLAGS} -g0 -DCRT_BEGIN ${CRTS_CFLAGS} \ - -c -o ${.TARGET} ${.ALLSRC:M*crtstuff*} + -c -o ${.TARGET} ${.ALLSRC:M*.c} ${.ALLSRC:M*.asm} -crtend.o: +crtend.o: ${ENDSRC} ${CC} ${CFLAGS} -g0 -DCRT_END \ - -c -o ${.TARGET} ${.ALLSRC:M*crtstuff*} + -c -o ${.TARGET} ${.ALLSRC:M*.c} ${.ALLSRC:M*.asm} -crtend.So: +crtend.So: ${ENDSRC} ${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \ - -c -o ${.TARGET} ${.ALLSRC:M*crtstuff*} -.endif + -c -o ${.TARGET} ${.ALLSRC:M*.c} ${.ALLSRC:M*.asm} CLEANFILES+= tconfig.h tconfig.h: ${CCDIR}/cc_tools/Makefile To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 17 0:28:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 847D737B40F; Fri, 17 May 2002 00:28:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 13F4137B413 for ; Fri, 17 May 2002 00:28:04 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4H7S4b51525 for perforce@freebsd.org; Fri, 17 May 2002 00:28:04 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 17 May 2002 00:28:04 -0700 (PDT) Message-Id: <200205170728.g4H7S4b51525@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11436 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11436 Change 11436 by peter@peter_ia64 on 2002/05/17 00:27:34 This is really it this time. The tconfig.h hackery is OBE and no longer needed. Affected files ... ... //depot/projects/ia64/gnu/lib/csu/Makefile#8 edit Differences ... ==== //depot/projects/ia64/gnu/lib/csu/Makefile#8 (text+ko) ==== @@ -14,7 +14,7 @@ CFLAGS+= -x assembler-with-cpp # Ugly hack .endif .if !defined(BEGINSRC) && !defined(ENDSRC) -SRCS= crtstuff.c # for 'make depend' +SRCS= crtstuff.c tconfig.h BEGINSRC= crtstuff.c ENDSRC= crtstuff.c .endif @@ -39,9 +39,6 @@ all: ${OBJS} ${SOBJS} ${TGTOBJS} -beforedepend: tconfig.h -${OBJS} ${SOBJS} ${TGTOBJS}: tconfig.h - CLEANFILES= ${OBJS} ${SOBJS} ${TGTOBJS} crtbegin.o: ${BEGINSRC} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 17 1:14:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FBEA37B400; Fri, 17 May 2002 01:14:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2D90C37B408 for ; Fri, 17 May 2002 01:14:01 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4H8E0U61350 for perforce@freebsd.org; Fri, 17 May 2002 01:14:00 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 17 May 2002 01:14:00 -0700 (PDT) Message-Id: <200205170814.g4H8E0U61350@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11440 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11440 Change 11440 by peter@peter_overcee on 2002/05/17 01:13:48 IFC @11438 (gcc/csu Makefile committed to cvs) Affected files ... ... //depot/projects/ia64/gnu/lib/csu/Makefile#9 integrate ... //depot/projects/ia64/usr.bin/hexdump/conv.c#5 integrate ... //depot/projects/ia64/usr.bin/hexdump/display.c#6 integrate ... //depot/projects/ia64/usr.bin/hexdump/od.1#4 integrate ... //depot/projects/ia64/usr.bin/hexdump/odsyntax.c#4 integrate ... //depot/projects/ia64/usr.bin/hexdump/parse.c#5 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.c#13 integrate Differences ... ==== //depot/projects/ia64/gnu/lib/csu/Makefile#9 (text+ko) ==== @@ -1,23 +1,12 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.11 2002/05/17 03:04:47 obrien Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.12 2002/05/17 07:55:08 peter Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc -.PATH: ${GCCDIR} - CCDIR= ${.CURDIR}/../../usr.bin/cc .include "${CCDIR}/Makefile.tgt" -.PATH: ${GCCDIR}/config/${GCC_CPU} +.PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR} -.if ${TARGET_ARCH} == "ia64" -BEGINSRC= crtbegin.asm -ENDSRC= crtend.asm -CFLAGS+= -x assembler-with-cpp # Ugly hack -.endif -.if !defined(BEGINSRC) && !defined(ENDSRC) SRCS= crtstuff.c tconfig.h -BEGINSRC= crtstuff.c -ENDSRC= crtstuff.c -.endif OBJS= crtbegin.o crtend.o SOBJS= crtbegin.So crtend.So CFLAGS+= -DIN_GCC -DHAVE_LD_EH_FRAME_HDR @@ -28,6 +17,12 @@ CRTS_CFLAGS= -DCRTSTUFFS_O -DSHARED ${PICFLAG} MKDEPCMD= CC="${CC}" MKDEP_CPP_OPTS="-M -DCRT_BEGIN" mkdep +.if ${TARGET_ARCH} == "ia64" +BEGINSRC= crtbegin.asm +ENDSRC= crtend.asm +CFLAGS+= -x assembler-with-cpp # Ugly hack +.undef SRCS # hack for 'make depend' +.endif .if ${TARGET_ARCH} == "powerpc" TGTOBJS= crtsavres.o SRCS+= crtsavres.asm @@ -36,6 +31,8 @@ TGTOBJS= crtfastmath.o SRCS+= crtfastmath.c .endif +BEGINSRC?= crtstuff.c +ENDSRC?= crtstuff.c all: ${OBJS} ${SOBJS} ${TGTOBJS} @@ -43,19 +40,19 @@ crtbegin.o: ${BEGINSRC} ${CC} ${CFLAGS} -g0 -DCRT_BEGIN \ - -c -o ${.TARGET} ${.ALLSRC:M*.c} ${.ALLSRC:M*.asm} + -c -o ${.TARGET} ${.ALLSRC} crtbegin.So: ${BEGINSRC} ${CC} ${CFLAGS} -g0 -DCRT_BEGIN ${CRTS_CFLAGS} \ - -c -o ${.TARGET} ${.ALLSRC:M*.c} ${.ALLSRC:M*.asm} + -c -o ${.TARGET} ${.ALLSRC} crtend.o: ${ENDSRC} ${CC} ${CFLAGS} -g0 -DCRT_END \ - -c -o ${.TARGET} ${.ALLSRC:M*.c} ${.ALLSRC:M*.asm} + -c -o ${.TARGET} ${.ALLSRC} crtend.So: ${ENDSRC} ${CC} ${CFLAGS} -g0 -DCRT_END ${CRTS_CFLAGS} \ - -c -o ${.TARGET} ${.ALLSRC:M*.c} ${.ALLSRC:M*.asm} + -c -o ${.TARGET} ${.ALLSRC} CLEANFILES+= tconfig.h tconfig.h: ${CCDIR}/cc_tools/Makefile ==== //depot/projects/ia64/usr.bin/hexdump/conv.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ static const char sccsid[] = "@(#)conv.c 8.1 (Berkeley) 6/6/93"; #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/usr.bin/hexdump/conv.c,v 1.4 2002/05/17 05:20:30 tjr Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/hexdump/conv.c,v 1.5 2002/05/17 07:14:55 tjr Exp $"); #include @@ -57,8 +57,6 @@ goto strpr; /* case '\a': */ case '\007': - if (odmode) /* od didn't know about \a */ - break; str = "\\a"; goto strpr; case '\b': @@ -77,8 +75,6 @@ str = "\\t"; goto strpr; case '\v': - if (odmode) - break; str = "\\v"; goto strpr; default: ==== //depot/projects/ia64/usr.bin/hexdump/display.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$FreeBSD: src/usr.bin/hexdump/display.c,v 1.14 2002/05/17 06:32:00 tjr Exp $"; + "$FreeBSD: src/usr.bin/hexdump/display.c,v 1.15 2002/05/17 07:14:55 tjr Exp $"; #endif /* not lint */ #include @@ -150,9 +150,11 @@ bcopy(bp, &f8, sizeof(f8)); (void)printf(pr->fmt, f8); break; - case sizeof(long double): - bcopy(bp, &ldbl, sizeof(ldbl)); - (void)printf(pr->fmt, ldbl); + default: + if (pr->bcnt == sizeof(long double)) { + bcopy(bp, &ldbl, sizeof(ldbl)); + (void)printf(pr->fmt, ldbl); + } break; } break; @@ -259,6 +261,8 @@ * block and set the end flag. */ if (!length || (ateof && !next((char **)NULL))) { + if (odmode && address < skip) + errx(1, "cannot skip past end of input"); if (need == blocksize) return((u_char *)NULL); if (vflag != ALL && ==== //depot/projects/ia64/usr.bin/hexdump/od.1#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)od.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/hexdump/od.1,v 1.12 2002/05/17 05:20:30 tjr Exp $ +.\" $FreeBSD: src/usr.bin/hexdump/od.1,v 1.13 2002/05/17 07:14:55 tjr Exp $ .\" -.Dd May 27, 1994 +.Dd April 17, 2002 .Os .Dt OD 1 .Sh NAME @@ -40,7 +40,11 @@ .Nd octal, decimal, hex, ASCII dump .Sh SYNOPSIS .Nm -.Op Fl aBbcDdeFfHhIiLlOovXx +.Op Fl aBbcDdeFfHhIiLlOosvXx +.Op Fl A Ar base +.Op Fl j Ar skip +.Op Fl N Ar length +.Op Fl t Ar type .Sm off .Oo .Op Cm \&+ @@ -49,32 +53,183 @@ .Op Cm Bb .Oc .Sm on -.Ar file +.Op Ar .Sh DESCRIPTION The -.Nm hexdump -utility, if called as -.Nm , -provides compatibility for the options listed above. +.Nm +utility is a filter which displays the specified files, or standard +input if no files are specified, in a user specified format. +.Pp +The options are as follows: +.Bl -tag -width Fl +.It Fl A Ar base +Specify the input address base. +.Ar base +may be one of +.Ql d , +.Ql o , +.Ql x +or +.Ql n , +which specify decimal, octal, hexadecimal +addresses or no address, respectively. +.It Fl a +Output named characters. +Equivalent to +.Fl t Ar a . +.It Fl B , Fl o +Output octal shorts. +Equivalent to +.Fl t Ar o2 . +.It Fl b +Output octal bytes. +Equivalent to +.Fl t Ar o1 . +.It Fl c +Output C-style escaped characters. +Equivalent to +.Fl t Ar c . +.It Fl D +Output unsigned decimal ints. +Equivalent to +.Fl t Ar u4 . +.It Fl e , Fl F +Output double-precision floating point numbers. +Equivalent to +.Fl t Ar fD . +.It Fl f +Output single-precision floating point numbers. +Equivalent to +.Fl t Ar fF . +.It Fl H , Fl X +Output hexadecimal ints. +Equivalent to +.Fl t Ar x4 . +.It Fl h , Fl x +Output hexadecimal shorts. +Equivalent to +.Fl t Ar x2 . +.It Fl I , Fl L , Fl l +Output signed decimal longs. +Equivalent to +.Fl t Ar dL . +.It Fl i +Output signed decimal ints. +Equivalent to +.Fl t Ar dI . +.It Fl j Ar skip +Skip +.Ar skip +bytes of the combined input before dumping. The number may be followed by one +of +.Ql b , +.Ql k +or +.Ql m +which specify the units of the number as blocks (512 bytes), kilobytes and +megabytes, respectively. +.It Fl N Ar length +Dump at most +.Ar length +bytes of input. +.It Fl O +Output octal ints. +Equivalent to +.Fl t Ar o4 . +.It Fl s +Output signed decimal shorts. +Equivalent to +.Fl t Ar d2 . +.It Fl t Ar type +Specify the output format. +.Ar type +is a string containing one or more of the following kinds of type specifiers: +.Bl -tag -width indent +.It Cm a +Named characters +.Pq Sq ASCII . +Control characters are displayed using the following names: +.Bl -column \&000_nu \&001_so \&002_st \&003_et \&004_eo +.It "\&000\ nul\t001\ soh\t002\ stx\t003\ etx\t004\ eot\t005\ enq +.It "\&006\ ack\t007\ bel\t008\ bs\t009\ ht\t00A\ nl\t00B\ vt +.It "\&00C\ ff\t00D\ cr\t00E\ so\t00F\ si\t010\ dle\t011\ dc1 +.It "\&012\ dc2\t013\ dc3\t014\ dc4\t015\ nak\t016\ syn\t017\ etb +.It "\&018\ can\t019\ em\t01A\ sub\t01B\ esc\t01C\ fs\t01D\ gs +.It "\&01E\ rs\t01F\ us\t020\ sp\t0FF\ del +.El +.It Cm c +Characters in the default character set. Non-printing characters are +represented as 3-digit octal character codes, except the following +characters, which are represented as C escapes: +.Bl -column carriage-return \er +.It NUL Ta \e0 +.It alert Ta \ea +.It backspace Ta \eb +.It newline Ta \en +.It carriage-return Ta \er +.It tab Ta \et +.It vertical tab Ta \ev +.El +.It Cm [d|o|u|x][C|S|I|L| Ns Ar n Ns ] +Signed decimal +.Pq Ql d , +octal +.Pq Ql o , +unsigned decimal +.Pq Ql u +or +hexadecimal +.Pq Ql x . +Followed by an optional size specifier, which may be either +.Ql C +.Pq "char" , +.Ql S +.Pq "short" , +.Ql I +.Pq "int" , +.Ql L +.Pq "long" , +or a byte count as a decimal integer. +.It Cm f[F|D|L| Ns Ar n Ns ] +Floating-point number. +Followed by an optional size specifier, which may be either +.Ql F +.Pq "float" , +.Ql D +.Pq "double" +or +.Ql L +.Pq "long double" . +.El +.It Fl v +Write all input data, instead of replacing lines of duplicate values with a +.Ql * . +.El +.Pp +Multiple options that specify output format may be used; the output will +contain one line for each format. .Pp -It does not provide compatibility for the +If no output format is specified, +.Fl t Ar oS +is assumed. +.Sh DIAGNOSTICS +.Ex -std +.Sh COMPATIBILITY +The traditional .Fl s -option (see -.Xr strings 1 ) -or the -.Fl P , -.Fl p , -or -.Fl w -options, nor is compatibility provided for the ``label'' component -of the offset syntax. +option to extract string constants is not supported; consider using +.Xr strings 1 +instead. .Sh SEE ALSO .Xr hexdump 1 , .Xr strings 1 -.Sh BUGS -Quite a few. +.Sh STANDARDS +The +.Nm +utility conforms to +.St -p1003.1-2001 . .Sh HISTORY -A +An .Nm command appeared in .At v1 . ==== //depot/projects/ia64/usr.bin/hexdump/odsyntax.c#4 (text+ko) ==== @@ -36,114 +36,143 @@ static char sccsid[] = "@(#)odsyntax.c 8.2 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.12 2002/05/17 06:32:00 tjr Exp $"; + "$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.13 2002/05/17 07:14:55 tjr Exp $"; #endif /* not lint */ #include #include #include +#include +#include #include #include +#include #include #include "hexdump.h" +#define PADDING " " + int odmode; +static void odadd(const char *); +static void odformat(const char *); +static const char *odformatfp(char, const char *); +static const char *odformatint(char, const char *); static void odoffset(int, char ***); -static void odprecede(void); +static void odusage(void); void oldsyntax(argc, argvp) int argc; char ***argvp; { + static char empty[] = "", padding[] = PADDING; int ch; - char **argv; + char **argv, *end; + + /* Add initial (default) address format. -A may change it later. */ +#define TYPE_OFFSET 7 + add("\"%07.7_Ao\n\""); + add("\"%07.7_ao \""); odmode = 1; argv = *argvp; - while ((ch = getopt(argc, argv, "aBbcDdeFfHhIiLlOoPpswvXx")) != -1) + while ((ch = getopt(argc, argv, "A:aBbcDdeFfHhIij:LlN:Oost:vXx")) != -1) switch (ch) { + case 'A': + switch (*optarg) { + case 'd': case 'o': case 'x': + fshead->nextfu->fmt[TYPE_OFFSET] = *optarg; + fshead->nextfs->nextfu->fmt[TYPE_OFFSET] = + *optarg; + break; + case 'n': + fshead->nextfu->fmt = empty; + fshead->nextfs->nextfu->fmt = padding; + break; + default: + errx(1, "%s: invalid address base", optarg); + } + break; case 'a': - odprecede(); - add("16/1 \"%3_u \" \"\\n\""); + odformat("a"); break; case 'B': case 'o': - odprecede(); - add("8/2 \" %06o \" \"\\n\""); + odformat("o2"); break; case 'b': - odprecede(); - add("16/1 \"%03o \" \"\\n\""); + odformat("o1"); break; case 'c': - odprecede(); - add("16/1 \"%3_c \" \"\\n\""); + odformat("c"); break; case 'd': - odprecede(); - add("8/2 \" %05u \" \"\\n\""); + odformat("u2"); break; case 'D': - odprecede(); - add("4/4 \" %010u \" \"\\n\""); + odformat("u4"); break; case 'e': /* undocumented in od */ case 'F': - odprecede(); - add("2/8 \" %21.14e \" \"\\n\""); + odformat("fD"); break; - case 'f': - odprecede(); - add("4/4 \" %14.7e \" \"\\n\""); + odformat("fF"); break; case 'H': case 'X': - odprecede(); - add("4/4 \" %08x \" \"\\n\""); + odformat("x4"); break; case 'h': case 'x': - odprecede(); - add("8/2 \" %04x \" \"\\n\""); + odformat("x2"); break; case 'I': case 'L': case 'l': - odprecede(); - add("4/4 \" %11d \" \"\\n\""); + odformat("dL"); break; case 'i': - odprecede(); - add("8/2 \" %6d \" \"\\n\""); + odformat("dI"); + break; + case 'j': + errno = 0; + skip = strtoll(optarg, &end, 0); + if (*end == 'b') + skip *= 512; + else if (*end == 'k') + skip *= 1024; + else if (*end == 'm') + skip *= 1048576L; + if (errno != 0 || skip < 0 || strlen(end) > 1) + errx(1, "%s: invalid skip amount", optarg); + break; + case 'N': + if ((length = atoi(optarg)) <= 0) + errx(1, "%s: invalid length", optarg); break; case 'O': - odprecede(); - add("4/4 \" %011o \" \"\\n\""); + odformat("o4"); + break; + case 's': + odformat("d2"); + break; + case 't': + odformat(optarg); break; case 'v': vflag = ALL; break; - case 'P': - case 'p': - case 's': - case 'w': case '?': default: - if (ch != '?') - warnx("hexdump(1) compatibility doesn't support the -%c option%s", - ch, ch == 's' ? "; see strings(1)" : ""); - usage(); + odusage(); } - if (!fshead) { - add("\"%07.7_Ao\n\""); - add("\"%07.7_ao \" 8/2 \"%06o \" \"\\n\""); - } + if (fshead->nextfs->nextfs == NULL) + odformat("oS"); argc -= optind; *argvp += optind; @@ -153,6 +182,17 @@ } static void +odusage(void) +{ + + fprintf(stderr, +"usage: od [-aBbcDdeFfHhIiLlOosvXx] [-A base] [-j skip] [-N length] [-t type]\n"); + fprintf(stderr, +" [[+]offset[.][Bb]] [file ...]\n"); + exit(1); +} + +static void odoffset(argc, argvp) int argc; char ***argvp; @@ -237,7 +277,6 @@ * If the offset uses a non-octal base, the base of the offset * is changed as well. This isn't pretty, but it's easy. */ -#define TYPE_OFFSET 7 if (base == 16) { fshead->nextfu->fmt[TYPE_OFFSET] = 'x'; fshead->nextfs->nextfu->fmt[TYPE_OFFSET] = 'x'; @@ -251,14 +290,157 @@ } static void -odprecede() +odformat(const char *fmt) +{ + char fchar; + + while (*fmt != '\0') { + switch ((fchar = *fmt++)) { + case 'a': + odadd("16/1 \"%3_u \" \"\\n\""); + break; + case 'c': + odadd("16/1 \"%3_c \" \"\\n\""); + break; + case 'o': case 'u': case 'd': case 'x': + fmt = odformatint(fchar, fmt); + break; + case 'f': + fmt = odformatfp(fchar, fmt); + break; + default: + errx(1, "%c: unrecognised format character", fchar); + } + } +} + +static const char * +odformatfp(char fchar __unused, const char *fmt) +{ + size_t isize; + int digits; + char *end, *hdfmt; + + isize = sizeof(double); + switch (*fmt) { + case 'F': + isize = sizeof(float); + fmt++; + break; + case 'D': + isize = sizeof(double); + fmt++; + break; + case 'L': + isize = sizeof(long double); + fmt++; + break; + default: + if (isdigit((unsigned char)*fmt)) { + errno = 0; + isize = (size_t)strtoul(fmt, &end, 10); + if (errno != 0 || isize == 0) + errx(1, "%s: invalid size", fmt); + fmt = (const char *)end; + } + } + switch (isize) { + case sizeof(float): + digits = FLT_DIG; + break; + case sizeof(double): + digits = DBL_DIG; + break; + default: + if (isize == sizeof(long double)) + digits = LDBL_DIG; + else + errx(1, "unsupported floating point size %lu", + (u_long)isize); + } + + asprintf(&hdfmt, "%lu/%lu \" %%%d.%de \" \"\\n\"", + 16UL / (u_long)isize, (u_long)isize, digits + 8, digits); + if (hdfmt == NULL) + err(1, NULL); + odadd(hdfmt); + free(hdfmt); + + return (fmt); +} + +static const char * +odformatint(char fchar, const char *fmt) +{ + unsigned long long n; + size_t isize; + int digits; + char *end, *hdfmt; + + isize = sizeof(int); + switch (*fmt) { + case 'C': + isize = sizeof(char); + fmt++; + break; + case 'I': + isize = sizeof(int); + fmt++; + break; + case 'L': + isize = sizeof(long); + fmt++; + break; + case 'S': + isize = sizeof(short); + fmt++; + break; + default: + if (isdigit((unsigned char)*fmt)) { + errno = 0; + isize = (size_t)strtoul(fmt, &end, 10); + if (errno != 0 || isize == 0) + errx(1, "%s: invalid size", fmt); + if (isize != sizeof(char) && isize != sizeof(short) && + isize != sizeof(int) && isize != sizeof(long)) + errx(1, "unsupported int size %lu", + (u_long)isize); + fmt = (const char *)end; + } + } + + /* + * Calculate the maximum number of digits we need to + * fit the number. Overestimate for decimal with log + * base 8. We need one extra space for signed numbers + * to store the sign. + */ + n = (1ULL << (8 * isize)) - 1; + digits = 0; + while (n != 0) { + digits++; + n >>= (fchar == 'x') ? 4 : 3; + } + if (fchar == 'd') + digits++; + asprintf(&hdfmt, "%lu/%lu \"%%%s%d%c \" \"\\n\"", + 16UL / (u_long)isize, (u_long)isize, + (fchar == 'd' || fchar == 'u') ? "" : "0", digits, fchar); + if (hdfmt == NULL) + err(1, NULL); + odadd(hdfmt); + free(hdfmt); + + return (fmt); +} + +static void +odadd(const char *fmt) { - static int first = 1; + static int needpad; - if (first) { - first = 0; - add("\"%07.7_Ao\n\""); - add("\"%07.7_ao \""); - } else - add("\" \""); + if (needpad) + add("\""PADDING"\""); + add(fmt); + needpad = 1; } ==== //depot/projects/ia64/usr.bin/hexdump/parse.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)parse.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$FreeBSD: src/usr.bin/hexdump/parse.c,v 1.8 2002/05/17 06:12:25 tjr Exp $"; + "$FreeBSD: src/usr.bin/hexdump/parse.c,v 1.9 2002/05/17 07:14:55 tjr Exp $"; #endif /* not lint */ #include @@ -313,15 +313,16 @@ case 4: pr->bcnt = 4; break; - case sizeof(long double): - cs[2] = '\0'; - cs[1] = cs[0]; - cs[0] = 'L'; - pr->bcnt = sizeof(long double); - break; default: - p1[1] = '\0'; - badcnt(p1); + if (fu->bcnt == sizeof(long double)) { + cs[2] = '\0'; + cs[1] = cs[0]; + cs[0] = 'L'; + pr->bcnt = sizeof(long double); + } else { + p1[1] = '\0'; + badcnt(p1); + } } break; case 's': ==== //depot/projects/ia64/usr.bin/xargs/xargs.c#13 (text+ko) ==== @@ -49,7 +49,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/xargs/xargs.c,v 1.35 2002/05/10 13:06:34 ru Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/xargs/xargs.c,v 1.36 2002/05/17 07:55:24 jmallett Exp $"); #include #include @@ -393,7 +393,7 @@ repls = Rflag; - if (repls == 0) { + if (argc == 0 || repls == 0) { *xp = NULL; run(argv); return; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 17 2:48:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47E7C37B406; Fri, 17 May 2002 02:48:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4220337B401 for ; Fri, 17 May 2002 02:47:59 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4H9lxf74691 for perforce@freebsd.org; Fri, 17 May 2002 02:47:59 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Fri, 17 May 2002 02:47:59 -0700 (PDT) Message-Id: <200205170947.g4H9lxf74691@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11442 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11442 Change 11442 by peter@peter_overcee on 2002/05/17 02:47:29 IFC @11441 (sync up libgcc/Makefile with cvs too) Affected files ... ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#12 integrate ... //depot/projects/ia64/usr.bin/hexdump/odsyntax.c#5 integrate Differences ... ==== //depot/projects/ia64/gnu/lib/libgcc/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.42 2002/05/17 04:18:33 obrien Exp $ +# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.43 2002/05/17 08:59:13 peter Exp $ .include "${.CURDIR}/../../usr.bin/cc/Makefile.tgt" ==== //depot/projects/ia64/usr.bin/hexdump/odsyntax.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)odsyntax.c 8.2 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.13 2002/05/17 07:14:55 tjr Exp $"; + "$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.14 2002/05/17 08:54:32 tjr Exp $"; #endif /* not lint */ #include @@ -423,9 +423,9 @@ } if (fchar == 'd') digits++; - asprintf(&hdfmt, "%lu/%lu \"%%%s%d%c \" \"\\n\"", - 16UL / (u_long)isize, (u_long)isize, - (fchar == 'd' || fchar == 'u') ? "" : "0", digits, fchar); + asprintf(&hdfmt, "%lu/%lu \"%*s%%%s%d%c\" \"\\n\"", + 16UL / (u_long)isize, (u_long)isize, (int)(4 * isize - digits), + "", (fchar == 'd' || fchar == 'u') ? "" : "0", digits, fchar); if (hdfmt == NULL) err(1, NULL); odadd(hdfmt); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 17 7: 3:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A43237B411; Fri, 17 May 2002 07:02:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by hub.freebsd.org (Postfix) with ESMTP id 7BEED37B412 for ; Fri, 17 May 2002 07:02:19 -0700 (PDT) Received: (qmail 3740 invoked from network); 17 May 2002 14:02:19 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 17 May 2002 14:02:19 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g4HE2IF75719; Fri, 17 May 2002 10:02:18 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20020517060856.CF499380A@overcee.wemm.org> Date: Fri, 17 May 2002 10:02:08 -0400 (EDT) From: John Baldwin To: Peter Wemm Subject: Re: PERFORCE change 11120 for review Cc: Perforce Change Reviews Cc: Perforce Change Reviews , Julian Elischer , Jonathan Mini Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 17-May-2002 Peter Wemm wrote: > Jonathan Mini wrote: >> Peter Wemm [peter@wemm.org] wrote : >> >> > Jonathan Mini wrote: >> > >> > > The only problem he foresaw was that the init/fini functions could be >> > > cal > led >> > > by the pager daemon, but I don't see any problem there either. >> > >> > Somewhere along the way we were planning to put in code that checked for >> > things that *might* call tsleep() and trap mutexes being held. I dont >> > know >> > if the UMA stuff calls tsleep (directly or indirectly) or not, but it was >> > my understanding that it is a Bad Idea(TM) to call anything that can >> > tsleep >> > with a mutex held. >> > >> >> I think maybe you misunderstand. The problem isn't that the pager calls the >> uma init/fini functions, but rather that *my* init/fini functions may block >> inside the VM. > > Ah. Thanks for the clarification. If that block within VM is a tsleep block > instead of a mutex block then we probably do have problems.. Assuming uma > calls your init/fini functions with some of its locks held. Yes, I think that is the problem. I think it has to do with setting up/tearing down the thread stacks. If uma could do this w/o holding the zone locks that would probably be sufficient. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 17 16: 3: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDAB337B408; Fri, 17 May 2002 16:01:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 225F637B403 for ; Fri, 17 May 2002 16:01:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4HN1OH04259 for perforce@freebsd.org; Fri, 17 May 2002 16:01:24 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Fri, 17 May 2002 16:01:24 -0700 (PDT) Message-Id: <200205172301.g4HN1OH04259@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11456 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11456 Change 11456 by jake@jake_sparc64 on 2002/05/17 16:00:46 Integ@11455. I think this breaks world. Affected files ... ... //depot/projects/sparc64/MAINTAINERS#6 integrate ... //depot/projects/sparc64/Makefile#5 integrate ... //depot/projects/sparc64/Makefile.inc1#14 integrate ... //depot/projects/sparc64/UPDATING#9 integrate ... //depot/projects/sparc64/bin/cp/cp.c#3 integrate ... //depot/projects/sparc64/bin/df/Makefile#2 integrate ... //depot/projects/sparc64/bin/df/df.c#3 integrate ... //depot/projects/sparc64/bin/ln/ln.1#2 integrate ... //depot/projects/sparc64/bin/ln/symlink.7#2 integrate ... //depot/projects/sparc64/bin/ls/ls.1#4 integrate ... //depot/projects/sparc64/bin/ls/ls.c#2 integrate ... //depot/projects/sparc64/bin/ls/print.c#2 integrate ... //depot/projects/sparc64/bin/mv/mv.1#3 integrate ... //depot/projects/sparc64/bin/mv/mv.c#3 integrate ... //depot/projects/sparc64/bin/mv/pathnames.h#2 integrate ... //depot/projects/sparc64/bin/pax/ar_subs.c#2 integrate ... //depot/projects/sparc64/bin/pax/buf_subs.c#2 integrate ... //depot/projects/sparc64/bin/pax/cache.h#2 integrate ... //depot/projects/sparc64/bin/pax/file_subs.c#2 integrate ... //depot/projects/sparc64/bin/pax/ftree.c#2 integrate ... //depot/projects/sparc64/bin/pax/options.c#3 integrate ... //depot/projects/sparc64/bin/pax/pat_rep.c#2 integrate ... //depot/projects/sparc64/bin/pax/pax.1#3 integrate ... //depot/projects/sparc64/bin/pax/pax.c#2 integrate ... //depot/projects/sparc64/bin/pax/pax.h#2 integrate ... //depot/projects/sparc64/bin/pax/tables.h#2 integrate ... //depot/projects/sparc64/bin/pax/tar.1#3 integrate ... //depot/projects/sparc64/bin/pax/tar.c#2 integrate ... //depot/projects/sparc64/bin/ps/ps.1#4 integrate ... //depot/projects/sparc64/bin/rm/rm.1#2 integrate ... //depot/projects/sparc64/bin/rm/rm.c#2 integrate ... //depot/projects/sparc64/bin/sh/error.c#2 integrate ... //depot/projects/sparc64/contrib/bind/CHANGES#2 integrate ... //depot/projects/sparc64/contrib/bind/README#2 integrate ... //depot/projects/sparc64/contrib/bind/Version#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/dig/dig.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/dnsquery/dnsquery.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/host/host.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/named.conf#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/named.h#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/ns_config.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/ns_defs.h#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/ns_forw.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/ns_func.h#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/ns_lexer.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/ns_main.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/ns_maint.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/ns_notify.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/ns_parser.y#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/ns_req.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/ns_resp.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/named/ns_xfr.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/nslookup/commands.l#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/nslookup/getinfo.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/nslookup/list.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/nslookup/main.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/nslookup/res.h#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/nslookup/send.c#2 integrate ... //depot/projects/sparc64/contrib/bind/bin/nslookup/subr.c#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/html/docdef.html#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/html/logging.html#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/html/options.html#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/html/server.html#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/html/zone.html#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/dig.1#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/dnskeygen.1#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/dnsquery.1#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/getaddrinfo.3#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/gethostbyname.3#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/getipnodebyname.3#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/getnameinfo.3#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/getnetent.3#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/host.1#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/hostname.7#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/inet_cidr.3#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/mailaddr.7#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/mkdep.1#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/named-bootconf.8#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/named-xfer.8#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/named.8#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/named.conf.5#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/ndc.8#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/nslookup.8#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/nsupdate.8#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/resolver.3#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/resolver.5#2 integrate ... //depot/projects/sparc64/contrib/bind/doc/man/tsig.3#2 integrate ... //depot/projects/sparc64/contrib/bind/include/arpa/nameser.h#2 integrate ... //depot/projects/sparc64/contrib/bind/include/resolv.h#2 integrate ... //depot/projects/sparc64/contrib/bind/lib/irs/dns_ho.c#2 integrate ... //depot/projects/sparc64/contrib/bind/lib/irs/dns_nw.c#2 integrate ... //depot/projects/sparc64/contrib/bind/lib/irs/getaddrinfo.c#2 integrate ... //depot/projects/sparc64/contrib/bind/lib/irs/getnameinfo.c#2 integrate ... //depot/projects/sparc64/contrib/bind/lib/nameser/ns_sign.c#2 integrate ... //depot/projects/sparc64/contrib/bind/lib/resolv/res_findzonecut.c#2 integrate ... //depot/projects/sparc64/contrib/bind/lib/resolv/res_send.c#2 integrate ... //depot/projects/sparc64/contrib/bind/lib/resolv/res_update.c#2 integrate ... //depot/projects/sparc64/contrib/bind/port/freebsd/Makefile.set#2 integrate ... //depot/projects/sparc64/contrib/bind/port/freebsd/include/port_after.h#2 integrate ... //depot/projects/sparc64/contrib/cvs/man/cvs.1#2 integrate ... //depot/projects/sparc64/contrib/gcc/c-common.h#3 integrate ... //depot/projects/sparc64/contrib/gcc/c-decl.c#3 integrate ... //depot/projects/sparc64/contrib/gcc/c-format.c#3 integrate ... //depot/projects/sparc64/contrib/gcc/config/i386/freebsd.h#6 integrate ... //depot/projects/sparc64/contrib/gcc/cp/cfns.h#2 integrate ... //depot/projects/sparc64/contrib/gcc/cppinit.c#3 integrate ... //depot/projects/sparc64/contrib/gcc/gcc.c#3 integrate ... //depot/projects/sparc64/contrib/gcc/make-temp-file.c#2 integrate ... //depot/projects/sparc64/contrib/perl5/AUTHORS#3 delete ... //depot/projects/sparc64/contrib/perl5/Artistic#2 delete ... //depot/projects/sparc64/contrib/perl5/Changes#3 delete ... //depot/projects/sparc64/contrib/perl5/Changes5.000#2 delete ... //depot/projects/sparc64/contrib/perl5/Changes5.001#2 delete ... //depot/projects/sparc64/contrib/perl5/Changes5.002#2 delete ... //depot/projects/sparc64/contrib/perl5/Changes5.003#2 delete ... //depot/projects/sparc64/contrib/perl5/Changes5.004#3 delete ... //depot/projects/sparc64/contrib/perl5/Changes5.005#2 delete ... //depot/projects/sparc64/contrib/perl5/Configure#3 delete ... //depot/projects/sparc64/contrib/perl5/Copying#2 delete ... //depot/projects/sparc64/contrib/perl5/EXTERN.h#3 delete ... //depot/projects/sparc64/contrib/perl5/INSTALL#3 delete ... //depot/projects/sparc64/contrib/perl5/INTERN.h#3 delete ... //depot/projects/sparc64/contrib/perl5/MANIFEST#3 delete ... //depot/projects/sparc64/contrib/perl5/Makefile.SH#3 delete ... //depot/projects/sparc64/contrib/perl5/Policy_sh.SH#3 delete ... //depot/projects/sparc64/contrib/perl5/Porting/Contract#3 delete ... //depot/projects/sparc64/contrib/perl5/Porting/Glossary#3 delete ... //depot/projects/sparc64/contrib/perl5/Porting/config.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/Porting/config_H#3 delete ... //depot/projects/sparc64/contrib/perl5/Porting/findvars#2 delete ... //depot/projects/sparc64/contrib/perl5/Porting/fixCORE#2 delete ... //depot/projects/sparc64/contrib/perl5/Porting/fixvars#2 delete ... //depot/projects/sparc64/contrib/perl5/Porting/genlog#3 delete ... //depot/projects/sparc64/contrib/perl5/Porting/makerel#3 delete ... //depot/projects/sparc64/contrib/perl5/Porting/p4d2p#2 delete ... //depot/projects/sparc64/contrib/perl5/Porting/p4desc#3 delete ... //depot/projects/sparc64/contrib/perl5/Porting/patching.pod#3 delete ... //depot/projects/sparc64/contrib/perl5/Porting/patchls#2 delete ... //depot/projects/sparc64/contrib/perl5/Porting/pumpkin.pod#3 delete ... //depot/projects/sparc64/contrib/perl5/Porting/repository.pod#2 delete ... //depot/projects/sparc64/contrib/perl5/README#3 delete ... //depot/projects/sparc64/contrib/perl5/README.Y2K#3 delete ... //depot/projects/sparc64/contrib/perl5/README.threads#2 delete ... //depot/projects/sparc64/contrib/perl5/Todo#3 delete ... //depot/projects/sparc64/contrib/perl5/Todo-5.6#3 delete ... //depot/projects/sparc64/contrib/perl5/XSUB.h#2 delete ... //depot/projects/sparc64/contrib/perl5/av.c#3 delete ... //depot/projects/sparc64/contrib/perl5/av.h#3 delete ... //depot/projects/sparc64/contrib/perl5/bytecode.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/cc_runtime.h#2 delete ... //depot/projects/sparc64/contrib/perl5/cflags.SH#3 delete ... //depot/projects/sparc64/contrib/perl5/config_h.SH#3 delete ... //depot/projects/sparc64/contrib/perl5/configpm#3 delete ... //depot/projects/sparc64/contrib/perl5/configure.com#3 delete ... //depot/projects/sparc64/contrib/perl5/configure.gnu#3 delete ... //depot/projects/sparc64/contrib/perl5/cop.h#3 delete ... //depot/projects/sparc64/contrib/perl5/cv.h#3 delete ... //depot/projects/sparc64/contrib/perl5/deb.c#3 delete ... //depot/projects/sparc64/contrib/perl5/doio.c#3 delete ... //depot/projects/sparc64/contrib/perl5/doop.c#3 delete ... //depot/projects/sparc64/contrib/perl5/dosish.h#3 delete ... //depot/projects/sparc64/contrib/perl5/dump.c#3 delete ... //depot/projects/sparc64/contrib/perl5/eg/ADB#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/README#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/RunMeFirst#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/caution.xbm#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/clickable_image.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/cookie.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/crash.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/customize.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/diff_upload.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/dna_small_gif.uu#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/file_upload.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/frameset.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/index.html#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/internal_links.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/javascript.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/monty.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/multiple_forms.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/nph-clock.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/nph-multipart.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/popup.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/save_state.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/tryit.cgi#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/cgi/wilogo_gif.uu#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/changes#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/client#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/down#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/dus#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/findcp#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/findtar#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/g/gcp#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/g/gcp.man#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/g/ged#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/g/ghosts#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/g/gsh#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/g/gsh.man#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/muck#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/muck.man#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/myrup#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/nih#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/relink#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/rename#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/rmfrom#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/scan/scan_df#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/scan/scan_last#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/scan/scan_messages#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/scan/scan_passwd#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/scan/scan_ps#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/scan/scan_sudo#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/scan/scan_suid#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/scan/scanner#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/server#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/shmkill#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/sysvipc/README#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/sysvipc/ipcmsg#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/sysvipc/ipcsem#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/sysvipc/ipcshm#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/travesty#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/unuc#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/uudecode#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/van/empty#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/van/unvanish#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/van/vanexp#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/van/vanish#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/who#2 delete ... //depot/projects/sparc64/contrib/perl5/eg/wrapsuid#2 delete ... //depot/projects/sparc64/contrib/perl5/embed.h#3 delete ... //depot/projects/sparc64/contrib/perl5/embed.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/embedvar.h#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Asmdata.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Assembler.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Bblock.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Bytecode.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/C.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/CC.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Concise.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Debug.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Deparse.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Disassembler.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Lint.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Showlex.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Stackobj.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Stash.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Terse.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/Xref.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/assemble#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/cc_harness#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/disassemble#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/B/makeliblinks#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/Makefile.PL#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/NOTES#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/O.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/README#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/TESTS#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/Todo#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/defsubs_h.PL#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/ramblings/cc.notes#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/ramblings/curcop.runtime#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/ramblings/flip-flop#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/ramblings/magic#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/ramblings/reg.alloc#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/ramblings/runtime.porting#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/B/typemap#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/ByteLoader/ByteLoader.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/ByteLoader/ByteLoader.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/ByteLoader/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/ByteLoader/bytecode.h#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/ByteLoader/byterun.c#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/ByteLoader/byterun.h#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/ByteLoader/hints/sunos.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/Changes#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/DB_File.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/DB_File.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/DB_File_BS#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/Makefile.PL#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/dbinfo#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/hints/dynixptx.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/hints/sco.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/typemap#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/DB_File/version.c#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Data/Dumper/Changes#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Data/Dumper/Dumper.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Data/Dumper/Dumper.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Data/Dumper/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Data/Dumper/Todo#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Devel/DProf/Changes#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Devel/DProf/DProf.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Devel/DProf/DProf.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Devel/DProf/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Devel/DProf/Todo#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Devel/Peek/Changes#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Devel/Peek/Makefile.PL#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Devel/Peek/Peek.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Devel/Peek/Peek.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/DynaLoader_pm.PL#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/README#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/XSLoader_pm.PL#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_aix.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_beos.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_dld.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_dllload.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_dlopen.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_dyld.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_hpux.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_mac.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_mpeix.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_next.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_none.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_vmesa.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dl_vms.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/dlutils.c#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/hints/aix.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/hints/linux.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/hints/netbsd.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/DynaLoader/hints/openbsd.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Errno/ChangeLog#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Errno/Errno_pm.PL#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Errno/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Fcntl/Fcntl.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Fcntl/Fcntl.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Fcntl/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/File/Glob/Changes#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/File/Glob/Glob.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/File/Glob/Glob.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/File/Glob/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/File/Glob/TODO#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/File/Glob/bsd_glob.c#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/File/Glob/bsd_glob.h#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/GDBM_File/GDBM_File.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/GDBM_File/GDBM_File.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/GDBM_File/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/GDBM_File/hints/sco.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/GDBM_File/typemap#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/ChangeLog#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/IO.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/IO.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/README#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Dir.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/File.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Handle.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Pipe.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Poll.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Seekable.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Select.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Socket.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Socket/INET.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/lib/IO/Socket/UNIX.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/poll.c#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IO/poll.h#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/ChangeLog#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/MANIFEST#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/Makefile.PL#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/Msg.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/README#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/Semaphore.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/SysV.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/SysV.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/hints/cygwin.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/hints/next_3.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/t/msg.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/IPC/SysV/t/sem.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/Makefile.PL#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/NDBM_File.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/NDBM_File.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/hints/cygwin.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/hints/dec_osf.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/hints/dynixptx.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/hints/sco.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/hints/solaris.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/hints/svr4.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/NDBM_File/typemap#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/ODBM_File.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/ODBM_File.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/hints/cygwin.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/hints/dec_osf.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/hints/hpux.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/hints/sco.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/hints/solaris.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/hints/svr4.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/hints/ultrix.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/ODBM_File/typemap#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Opcode/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Opcode/Opcode.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Opcode/Opcode.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Opcode/Safe.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Opcode/ops.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/Makefile.PL#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/POSIX.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/POSIX.pod#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/POSIX.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/hints/bsdos.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/hints/dynixptx.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/hints/freebsd.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/hints/linux.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/hints/mint.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/hints/netbsd.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/hints/next_3.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/hints/openbsd.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/hints/sunos_4.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/hints/svr4.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/POSIX/typemap#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/SDBM_File.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/SDBM_File.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/CHANGES#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/COMPARE#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/README#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/README.too#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/biblio#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/dba.c#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/dbd.c#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/dbe.1#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/dbe.c#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/dbm.c#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/dbm.h#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/dbu.c#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/grind#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/hash.c#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/linux.patches#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/makefile.sdbm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/pair.c#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/pair.h#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/readme.ms#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/sdbm.3#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/sdbm.c#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/sdbm.h#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/tune.h#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/sdbm/util.c#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/SDBM_File/typemap#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Socket/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Socket/Socket.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Socket/Socket.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Sys/Hostname/Hostname.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Sys/Hostname/Hostname.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Sys/Hostname/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Sys/Syslog/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Sys/Syslog/Syslog.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Sys/Syslog/Syslog.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/Notes#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/README#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/Thread.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/Thread.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/Thread/Queue.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/Thread/Semaphore.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/Thread/Signal.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/Thread/Specific.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/create.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/die.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/die2.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/io.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/join.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/join2.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/list.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/lock.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/queue.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/specific.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/sync.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/sync2.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/typemap#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/unsync.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/unsync2.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/unsync3.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/Thread/unsync4.t#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/attrs/Makefile.PL#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/attrs/attrs.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/attrs/attrs.xs#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/re/Makefile.PL#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/re/hints/aix.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/re/hints/mpeix.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/re/re.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/re/re.xs#3 delete ... //depot/projects/sparc64/contrib/perl5/ext/util/make_ext#2 delete ... //depot/projects/sparc64/contrib/perl5/ext/util/mkbootstrap#2 delete ... //depot/projects/sparc64/contrib/perl5/fakethr.h#2 delete ... //depot/projects/sparc64/contrib/perl5/form.h#3 delete ... //depot/projects/sparc64/contrib/perl5/global.sym#3 delete ... //depot/projects/sparc64/contrib/perl5/globals.c#3 delete ... //depot/projects/sparc64/contrib/perl5/globvar.sym#2 delete ... //depot/projects/sparc64/contrib/perl5/gv.c#3 delete ... //depot/projects/sparc64/contrib/perl5/gv.h#3 delete ... //depot/projects/sparc64/contrib/perl5/h2pl/README#2 delete ... //depot/projects/sparc64/contrib/perl5/h2pl/cbreak.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/h2pl/cbreak2.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/h2pl/eg/sizeof.ph#2 delete ... //depot/projects/sparc64/contrib/perl5/h2pl/eg/sys/errno.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/h2pl/eg/sys/ioctl.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/h2pl/eg/sysexits.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/h2pl/getioctlsizes#2 delete ... //depot/projects/sparc64/contrib/perl5/h2pl/mksizes#2 delete ... //depot/projects/sparc64/contrib/perl5/h2pl/mkvars#2 delete ... //depot/projects/sparc64/contrib/perl5/h2pl/tcbreak#2 delete ... //depot/projects/sparc64/contrib/perl5/h2pl/tcbreak2#2 delete ... //depot/projects/sparc64/contrib/perl5/handy.h#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/3b1.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/3b1cc#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/README.hints#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/aix.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/altos486.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/amigaos.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/apollo.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/aux_3.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/beos.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/broken-db.msg#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/bsdos.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/convexos.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/cxux.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/cygwin.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/darwin.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/dcosx.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/dec_osf.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/dgux.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/dos_djgpp.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/dynix.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/dynixptx.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/epix.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/esix4.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/fps.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/freebsd.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/genix.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/gnu.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/greenhills.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/hpux.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/i386.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/irix_4.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/irix_5.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/irix_6.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/irix_6_0.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/irix_6_1.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/isc.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/isc_2.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/linux.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/lynxos.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/machten.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/machten_2.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/mint.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/mips.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/mpc.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/mpeix.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/ncr_tower.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/netbsd.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/newsos4.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/next_3.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/next_3_0.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/next_4.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/nonstopux.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/openbsd.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/opus.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/os2.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/os390.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/posix-bc.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/powerux.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/qnx.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/rhapsody.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/sco.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/sco_2_3_0.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/sco_2_3_1.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/sco_2_3_2.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/sco_2_3_3.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/sco_2_3_4.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/solaris_2.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/stellar.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/sunos_4_0.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/sunos_4_1.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/svr4.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/svr5.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/ti1500.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/titanos.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/ultrix_4.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/umips.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/unicos.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/unicosmk.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/unisysdynix.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/utekv.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/uts.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hints/uwin.sh#2 delete ... //depot/projects/sparc64/contrib/perl5/hints/vmesa.sh#3 delete ... //depot/projects/sparc64/contrib/perl5/hv.c#3 delete ... //depot/projects/sparc64/contrib/perl5/hv.h#3 delete ... //depot/projects/sparc64/contrib/perl5/installhtml#3 delete ... //depot/projects/sparc64/contrib/perl5/installman#3 delete ... //depot/projects/sparc64/contrib/perl5/installperl#3 delete ... //depot/projects/sparc64/contrib/perl5/intrpvar.h#3 delete ... //depot/projects/sparc64/contrib/perl5/iperlsys.h#3 delete ... //depot/projects/sparc64/contrib/perl5/keywords.h#2 delete ... //depot/projects/sparc64/contrib/perl5/keywords.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/AnyDBM_File.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/AutoLoader.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/AutoSplit.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Benchmark.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/CPAN.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/CPAN/FirstTime.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/CPAN/Nox.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Carp.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Carp/Heavy.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Class/Struct.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Cwd.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/DB.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Devel/SelfStubber.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/DirHandle.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Dumpvalue.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/English.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Env.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Exporter.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Exporter/Heavy.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Command.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Embed.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Install.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Installed.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Liblist.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/MM_Cygwin.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/MM_OS2.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/MM_Unix.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/MM_VMS.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/MM_Win32.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/MakeMaker.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Manifest.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Mkbootstrap.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Mksymlists.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/Packlist.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/inst#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/testlib.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/typemap#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/ExtUtils/xsubpp#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Fatal.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Basename.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/CheckTree.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Compare.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Copy.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/DosGlob.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Find.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Path.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/Epoc.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/Functions.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/Mac.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/OS2.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/Unix.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/VMS.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Spec/Win32.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/Temp.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/File/stat.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/FileCache.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/FileHandle.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/FindBin.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Getopt/Long.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Getopt/Std.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/I18N/Collate.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/IPC/Open2.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/IPC/Open3.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Math/BigFloat.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Math/BigInt.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Math/Complex.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Math/Trig.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Net/Ping.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Net/hostent.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Net/netent.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Net/protoent.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Net/servent.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Checker.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Find.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Functions.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Html.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/InputObjects.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/LaTeX.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Man.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/ParseUtils.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Parser.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Plainer.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Select.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Text.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Text/Color.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Text/Overstrike.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Text/Termcap.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Pod/Usage.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Search/Dict.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/SelectSaver.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/SelfLoader.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Shell.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Symbol.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Term/ANSIColor.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Term/Cap.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Term/Complete.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Term/ReadLine.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Test.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Test/Harness.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Text/Abbrev.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Text/ParseWords.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Text/Soundex.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Text/Tabs.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Text/Wrap.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Tie/Array.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Tie/Handle.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Tie/Hash.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Tie/RefHash.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Tie/Scalar.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Tie/SubstrHash.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/Time/Local.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Time/gmtime.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Time/localtime.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Time/tm.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/UNIVERSAL.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/User/grent.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/User/pwent.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/Win32.pod#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/abbrev.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/assert.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/attributes.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/autouse.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/base.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/bigfloat.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/bigint.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/bigrat.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/blib.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/bytes.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/bytes_heavy.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/cacheout.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/charnames.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/chat2.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/complete.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/constant.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/ctime.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/diagnostics.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/dotsh.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/dumpvar.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/exceptions.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/fastcwd.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/fields.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/filetest.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/find.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/finddepth.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/flush.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/ftp.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/getcwd.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/getopt.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/getopts.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/hostname.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/importenv.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/integer.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/less.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/lib.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/locale.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/look.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/newgetopt.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/open.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/open2.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/open3.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/overload.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/perl5db.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/pwd.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/shellwords.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/sigtrap.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/stat.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/strict.pm#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/subs.pm#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/syslog.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/tainted.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/termcap.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/timelocal.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/ArabLink.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/ArabLnkGrp.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/ArabShap.txt#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/BidiMirr.txt#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Bidirectional.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Block.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Blocks.txt#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/CaseFold.txt#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Category.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/CombiningClass.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/CompExcl.txt#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Decomposition.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/EAWidth.txt#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/AlphabeticPresentationForms.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Arabic.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/ArabicPresentationForms-A.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/ArabicPresentationForms-B.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Armenian.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Arrows.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/BasicLatin.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Bengali.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/BlockElements.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Bopomofo.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/BopomofoExtended.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/BoxDrawing.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/BraillePatterns.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKCompatibility.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKCompatibilityForms.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKCompatibilityIdeographs.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKRadicalsSupplement.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKSymbolsandPunctuation.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKUnifiedIdeographs.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CJKUnifiedIdeographsExtensionA.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Cherokee.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CombiningDiacriticalMarks.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CombiningHalfMarks.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CombiningMarksforSymbols.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/ControlPictures.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/CurrencySymbols.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Cyrillic.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Devanagari.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Dingbats.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/EnclosedAlphanumerics.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/EnclosedCJKLettersandMonths.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Ethiopic.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/GeneralPunctuation.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/GeometricShapes.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Georgian.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Greek.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/GreekExtended.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Gujarati.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Gurmukhi.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/HalfwidthandFullwidthForms.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/HangulCompatibilityJamo.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/HangulJamo.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/HangulSyllables.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Hebrew.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/HighPrivateUseSurrogates.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/HighSurrogates.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Hiragana.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/IPAExtensions.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/IdeographicDescriptionCharacters.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Kanbun.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/KangxiRadicals.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Kannada.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Katakana.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Khmer.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Lao.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Latin-1Supplement.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/LatinExtended-A.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/LatinExtended-B.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/LatinExtendedAdditional.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/LetterlikeSymbols.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/LowSurrogates.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Malayalam.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/MathematicalOperators.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/MiscellaneousSymbols.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/MiscellaneousTechnical.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Mongolian.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Myanmar.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/NumberForms.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Ogham.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/OpticalCharacterRecognition.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Oriya.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/PrivateUse.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Runic.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Sinhala.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/SmallFormVariants.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/SpacingModifierLetters.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Specials.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/SuperscriptsandSubscripts.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Syriac.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Tamil.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Telugu.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Thaana.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Thai.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/Tibetan.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/UnifiedCanadianAboriginalSyllabics.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/YiRadicals.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/In/YiSyllables.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Index.txt#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/ASCII.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Alnum.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Alpha.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiAL.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiAN.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiB.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiBN.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiCS.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiEN.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiES.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiET.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiL.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiLRE.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiLRO.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiNSM.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiON.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiPDF.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiR.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiRLE.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiRLO.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiS.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/BidiWS.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Blank.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/C.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Cc.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Cf.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Cn.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Cntrl.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Co.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Cs.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCcircle.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCcompat.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCfinal.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCfont.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCfraction.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCinitial.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCisolated.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCmedial.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCnarrow.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCnoBreak.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCsmall.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCsquare.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCsub.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCsuper.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCvertical.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DCwide.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DecoCanon.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/DecoCompat.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Digit.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Graph.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/L.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkAI.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkAL.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkB2.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkBA.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkBB.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkBK.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkCB.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkCL.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkCM.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkCR.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkEX.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkGL.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkHY.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkID.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkIN.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkIS.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkLF.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkNS.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkNU.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkOP.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkPO.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkPR.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkQU.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkSA.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkSG.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkSP.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkSY.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkXX.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/LbrkZW.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Ll.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Lm.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Lo.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Lower.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Lt.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Lu.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/M.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Mc.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Me.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Mirrored.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Mn.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/N.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Nd.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Nl.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/No.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/P.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Pc.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Pd.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Pe.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Pf.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Pi.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Po.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Print.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Ps.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Punct.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/S.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Sc.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Sk.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Sm.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/So.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/Space.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SpacePerl.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylA.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylAA.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylAAI.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylAI.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylC.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylE.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylEE.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylI.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylII.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylN.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylO.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylOO.pl#2 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylU.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylV.pl#3 delete ... //depot/projects/sparc64/contrib/perl5/lib/unicode/Is/SylWA.pl#3 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 17 16:15:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEDF737B409; Fri, 17 May 2002 16:14:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8EF3737B404 for ; Fri, 17 May 2002 16:14:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4HNE8h21577 for perforce@freebsd.org; Fri, 17 May 2002 16:14:08 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Fri, 17 May 2002 16:14:08 -0700 (PDT) Message-Id: <200205172314.g4HNE8h21577@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 11457 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11457 Change 11457 by jhb@jhb_laptop on 2002/05/17 16:13:52 IFC. The ppc trap code has completely changed back to being NetBSD code instead of FreeBSD code. It doesn't call userret() or cred_free_thread() or anything, so I've given up trying to keep it up to date with changes to other archs. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/clock.c#6 integrate ... //depot/projects/smpng/sys/alpha/alpha/dump_machdep.c#1 branch ... //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#16 integrate ... //depot/projects/smpng/sys/alpha/alpha/trap.c#32 integrate ... //depot/projects/smpng/sys/alpha/conf/GENERIC#18 integrate ... //depot/projects/smpng/sys/alpha/include/ansi.h#12 integrate ... //depot/projects/smpng/sys/alpha/include/atomic.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/param.h#3 integrate ... //depot/projects/smpng/sys/alpha/include/stdarg.h#2 integrate ... //depot/projects/smpng/sys/alpha/include/varargs.h#2 integrate ... //depot/projects/smpng/sys/alpha/pci/irongate_pci.c#3 integrate ... //depot/projects/smpng/sys/arm/include/ansi.h#9 integrate ... //depot/projects/smpng/sys/arm/include/param.h#2 integrate ... //depot/projects/smpng/sys/boot/Makefile#5 integrate ... //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/alpha/boot1/sys.c#4 integrate ... //depot/projects/smpng/sys/boot/alpha/cdboot/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/alpha/libalpha/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/alpha/loader/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/alpha/netboot/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/arc/lib/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/arc/loader/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/common/load_elf.c#5 integrate ... //depot/projects/smpng/sys/boot/efi/include/efiprot.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/Makefile#6 integrate ... //depot/projects/smpng/sys/boot/efi/loader/Makefile#8 integrate ... //depot/projects/smpng/sys/boot/ficl/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/ficl/alpha/sysdep.h#3 integrate ... //depot/projects/smpng/sys/boot/ficl/i386/sysdep.h#3 integrate ... //depot/projects/smpng/sys/boot/ficl/ia64/sysdep.h#3 integrate ... //depot/projects/smpng/sys/boot/forth/loader.4th.8#3 integrate ... //depot/projects/smpng/sys/boot/forth/loader.conf.5#4 integrate ... //depot/projects/smpng/sys/boot/i386/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/i386/Makefile.inc#2 integrate ... //depot/projects/smpng/sys/boot/i386/boot2/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#9 integrate ... //depot/projects/smpng/sys/boot/i386/btx/lib/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/i386/kgzldr/Makefile#5 integrate ... //depot/projects/smpng/sys/boot/i386/libi386/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/i386/libi386/bioscd.c#3 integrate ... //depot/projects/smpng/sys/boot/i386/loader/Makefile#7 integrate ... //depot/projects/smpng/sys/boot/ia64/libski/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/ia64/skiload/Makefile#6 integrate ... //depot/projects/smpng/sys/boot/ofw/libofw/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#3 integrate ... //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#4 integrate ... //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#4 integrate ... //depot/projects/smpng/sys/boot/pc98/Makefile.inc#2 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#3 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/asm.h#2 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/boot.h#2 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/disk.c#2 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/io.c#3 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/start.S#2 integrate ... //depot/projects/smpng/sys/boot/pc98/btx/lib/Makefile#2 integrate ... //depot/projects/smpng/sys/boot/pc98/kgzldr/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/pc98/libpc98/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/pc98/loader/Makefile#6 integrate ... //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#3 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#6 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/main.c#7 integrate ... //depot/projects/smpng/sys/coda/README#2 integrate ... //depot/projects/smpng/sys/coda/cnode.h#2 integrate ... //depot/projects/smpng/sys/coda/coda_io.h#2 integrate ... //depot/projects/smpng/sys/coda/coda_namecache.c#4 integrate ... //depot/projects/smpng/sys/coda/coda_namecache.h#2 integrate ... //depot/projects/smpng/sys/coda/coda_pioctl.h#2 integrate ... //depot/projects/smpng/sys/coda/coda_psdev.c#7 integrate ... //depot/projects/smpng/sys/coda/coda_subr.c#5 integrate ... //depot/projects/smpng/sys/coda/coda_vfsops.c#8 integrate ... //depot/projects/smpng/sys/coda/coda_vnops.c#7 integrate ... //depot/projects/smpng/sys/coda/coda_vnops.h#5 integrate ... //depot/projects/smpng/sys/compat/linux/linux_mib.c#5 integrate ... //depot/projects/smpng/sys/conf/NOTES#9 integrate ... //depot/projects/smpng/sys/conf/files#38 integrate ... //depot/projects/smpng/sys/conf/files.alpha#14 integrate ... //depot/projects/smpng/sys/conf/files.i386#22 integrate ... //depot/projects/smpng/sys/conf/files.ia64#15 integrate ... //depot/projects/smpng/sys/conf/files.powerpc#8 integrate ... //depot/projects/smpng/sys/conf/kern.post.mk#10 integrate ... //depot/projects/smpng/sys/conf/kern.pre.mk#11 integrate ... //depot/projects/smpng/sys/conf/kmod.mk#10 integrate ... //depot/projects/smpng/sys/conf/options#22 integrate ... //depot/projects/smpng/sys/conf/options.alpha#6 integrate ... //depot/projects/smpng/sys/conf/options.i386#14 integrate ... //depot/projects/smpng/sys/conf/options.pc98#15 integrate ... //depot/projects/smpng/sys/ddb/db_elf.c#1 branch ... //depot/projects/smpng/sys/ddb/db_kld.c#2 integrate ... //depot/projects/smpng/sys/dev/aac/aac.c#14 integrate ... //depot/projects/smpng/sys/dev/aac/aac_cam.c#3 integrate ... //depot/projects/smpng/sys/dev/aac/aac_pci.c#14 integrate ... //depot/projects/smpng/sys/dev/aac/aacreg.h#8 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi.c#26 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#5 integrate ... //depot/projects/smpng/sys/dev/ar/if_ar.c#4 integrate ... //depot/projects/smpng/sys/dev/asr/asr.c#12 integrate ... //depot/projects/smpng/sys/dev/asr/dptalign.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/dptsig.h#4 integrate ... //depot/projects/smpng/sys/dev/asr/i2oadptr.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/i2obscsi.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/i2odep.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/i2odpt.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/i2oexec.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/i2omsg.h#4 integrate ... //depot/projects/smpng/sys/dev/asr/i2otypes.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/i2outil.h#3 integrate ... //depot/projects/smpng/sys/dev/asr/osd_defs.h#4 integrate ... //depot/projects/smpng/sys/dev/asr/osd_unix.h#4 integrate ... //depot/projects/smpng/sys/dev/asr/osd_util.h#4 integrate ... //depot/projects/smpng/sys/dev/asr/sys_info.h#4 integrate ... //depot/projects/smpng/sys/dev/bktr/CHANGELOG.TXT#2 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_card.h#2 integrate ... //depot/projects/smpng/sys/dev/ccd/ccd.c#14 integrate ... //depot/projects/smpng/sys/dev/drm/drm_drv.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/drm_fops.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#2 integrate ... //depot/projects/smpng/sys/dev/em/if_em.c#7 integrate ... //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#2 integrate ... //depot/projects/smpng/sys/dev/iir/iir.c#3 integrate ... //depot/projects/smpng/sys/dev/md/md.c#19 integrate ... //depot/projects/smpng/sys/dev/mii/acphy.c#6 integrate ... //depot/projects/smpng/sys/dev/mii/amphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/brgphy.c#8 integrate ... //depot/projects/smpng/sys/dev/mii/dcphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/e1000phy.c#4 integrate ... //depot/projects/smpng/sys/dev/mii/lxtphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/mii_physubr.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/miivar.h#5 integrate ... //depot/projects/smpng/sys/dev/mii/mlphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/nsgphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/nsphy.c#5 integrate ... //depot/projects/smpng/sys/dev/mii/qsphy.c#6 integrate ... //depot/projects/smpng/sys/dev/mii/rlphy.c#7 integrate ... //depot/projects/smpng/sys/dev/mii/tdkphy.c#6 integrate ... //depot/projects/smpng/sys/dev/mii/tlphy.c#6 integrate ... //depot/projects/smpng/sys/dev/mii/xmphy.c#5 integrate ... //depot/projects/smpng/sys/dev/my/if_my.c#4 integrate ... //depot/projects/smpng/sys/dev/nge/if_nge.c#13 integrate ... //depot/projects/smpng/sys/dev/sio/sio_isa.c#9 integrate ... //depot/projects/smpng/sys/dev/sound/pci/ich.c#14 integrate ... //depot/projects/smpng/sys/dev/syscons/syscons.c#19 integrate ... //depot/projects/smpng/sys/dev/usb/ufm.c#2 integrate ... //depot/projects/smpng/sys/dev/usb/ugen.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/ulpt.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/urio.c#8 integrate ... //depot/projects/smpng/sys/dev/usb/usb.c#14 integrate ... //depot/projects/smpng/sys/dev/usb/usb_port.h#11 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.c#10 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.h#8 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumhdr.h#3 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumio.c#7 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumobj.h#3 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#5 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.c#6 integrate ... //depot/projects/smpng/sys/fs/deadfs/dead_vnops.c#3 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#5 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#15 integrate ... //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#6 integrate ... //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#12 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#11 integrate ... //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#10 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_fat.c#5 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#10 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfsmount.h#4 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#11 integrate ... //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#7 integrate ... //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#4 integrate ... //depot/projects/smpng/sys/fs/nwfs/nwfs_mount.h#2 integrate ... //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#6 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#13 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#11 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#15 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs.h#3 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs_smb.c#4 integrate ... //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#10 integrate ... //depot/projects/smpng/sys/fs/udf/udf_vnops.c#3 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_alloc.c#5 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_balloc.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_bmap.c#1 branch ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_extern.h#5 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_fs.h#4 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_ihash.c#1 branch ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#5 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode_cnv.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_linux_balloc.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_linux_ialloc.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#6 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_mount.h#1 branch ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_readwrite.c#3 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#5 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#14 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#8 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/fs.h#3 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/inode.h#1 branch ... //depot/projects/smpng/sys/gnu/i386/fpemul/polynomial.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/reg_div.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/reg_round.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/reg_u_add.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/reg_u_div.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/reg_u_mul.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/reg_u_sub.s#2 integrate ... //depot/projects/smpng/sys/gnu/i386/fpemul/wm_sqrt.s#2 integrate ... //depot/projects/smpng/sys/i386/acpica/genwakecode.pl#2 delete ... //depot/projects/smpng/sys/i386/conf/GENERIC#20 integrate ... //depot/projects/smpng/sys/i386/conf/Makefile#4 integrate ... //depot/projects/smpng/sys/i386/conf/NOTES#36 integrate ... //depot/projects/smpng/sys/i386/conf/makeLINT.pl#2 delete ... //depot/projects/smpng/sys/i386/conf/makeLINT.sed#1 branch ... //depot/projects/smpng/sys/i386/i386/bios.c#10 integrate ... //depot/projects/smpng/sys/i386/i386/dump_machdep.c#1 branch ... //depot/projects/smpng/sys/i386/i386/i386dump.c#3 delete ... //depot/projects/smpng/sys/i386/i386/machdep.c#38 integrate ... //depot/projects/smpng/sys/i386/include/ansi.h#12 integrate ... //depot/projects/smpng/sys/i386/include/param.h#5 integrate ... //depot/projects/smpng/sys/i386/include/stdarg.h#4 integrate ... //depot/projects/smpng/sys/i386/include/varargs.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/ipl.s#7 integrate ... //depot/projects/smpng/sys/i386/isa/wt.c#4 integrate ... //depot/projects/smpng/sys/i386/isa/wtreg.h#2 integrate ... //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#5 integrate ... //depot/projects/smpng/sys/ia64/acpica/madt.c#5 integrate ... //depot/projects/smpng/sys/ia64/ia64/clock.c#7 integrate ... //depot/projects/smpng/sys/ia64/ia64/dump_machdep.c#1 branch ... //depot/projects/smpng/sys/ia64/ia64/ia64dump.c#5 delete ... //depot/projects/smpng/sys/ia64/ia64/interrupt.c#11 integrate ... //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#14 integrate ... //depot/projects/smpng/sys/ia64/ia64/pmap.c#30 integrate ... //depot/projects/smpng/sys/ia64/ia64/sal.c#7 integrate ... //depot/projects/smpng/sys/ia64/ia64/swtch.s#10 integrate ... //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#13 integrate ... //depot/projects/smpng/sys/ia64/include/asm.h#5 integrate ... //depot/projects/smpng/sys/ia64/include/cpu.h#8 integrate ... //depot/projects/smpng/sys/ia64/include/ieeefp.h#3 integrate ... //depot/projects/smpng/sys/ia64/include/mca.h#2 integrate ... //depot/projects/smpng/sys/ia64/include/md_var.h#7 integrate ... //depot/projects/smpng/sys/ia64/include/param.h#5 integrate ... //depot/projects/smpng/sys/ia64/include/pcb.h#4 integrate ... //depot/projects/smpng/sys/ia64/include/reg.h#5 integrate ... //depot/projects/smpng/sys/ia64/include/smp.h#5 integrate ... //depot/projects/smpng/sys/ia64/include/stdarg.h#3 integrate ... //depot/projects/smpng/sys/ia64/include/varargs.h#2 integrate ... //depot/projects/smpng/sys/isa/fd.c#12 integrate ... //depot/projects/smpng/sys/isa/fdreg.h#3 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_bmap.c#2 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_lookup.c#5 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_util.c#2 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#13 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#4 integrate ... //depot/projects/smpng/sys/kern/init_main.c#18 integrate ... //depot/projects/smpng/sys/kern/init_sysent.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_acct.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_acl.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_clock.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#27 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#39 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#29 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#62 integrate ... //depot/projects/smpng/sys/kern/kern_shutdown.c#23 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#36 integrate ... //depot/projects/smpng/sys/kern/kern_subr.c#10 integrate ... //depot/projects/smpng/sys/kern/kern_switch.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_tc.c#11 integrate ... //depot/projects/smpng/sys/kern/makeobjops.pl#5 delete ... //depot/projects/smpng/sys/kern/subr_diskslice.c#9 integrate ... //depot/projects/smpng/sys/kern/subr_log.c#5 integrate ... //depot/projects/smpng/sys/kern/subr_mbuf.c#14 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#49 integrate ... //depot/projects/smpng/sys/kern/sys_generic.c#13 integrate ... //depot/projects/smpng/sys/kern/sys_pipe.c#17 integrate ... //depot/projects/smpng/sys/kern/sys_process.c#17 integrate ... //depot/projects/smpng/sys/kern/syscalls.c#14 integrate ... //depot/projects/smpng/sys/kern/syscalls.master#13 integrate ... //depot/projects/smpng/sys/kern/tty.c#21 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#21 integrate ... //depot/projects/smpng/sys/kern/uipc_socket2.c#14 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#23 integrate ... //depot/projects/smpng/sys/kern/vfs_bio.c#21 integrate ... //depot/projects/smpng/sys/kern/vfs_cache.c#12 integrate ... //depot/projects/smpng/sys/kern/vfs_cluster.c#9 integrate ... //depot/projects/smpng/sys/kern/vfs_init.c#6 integrate ... //depot/projects/smpng/sys/kern/vfs_lookup.c#10 integrate ... //depot/projects/smpng/sys/kern/vfs_subr.c#25 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#37 integrate ... //depot/projects/smpng/sys/kern/vfs_vnops.c#25 integrate ... //depot/projects/smpng/sys/kern/vnode_if.src#6 integrate ... //depot/projects/smpng/sys/modules/Makefile#27 integrate ... //depot/projects/smpng/sys/modules/ext2fs/Makefile#3 integrate ... //depot/projects/smpng/sys/net/bpf.c#15 integrate ... //depot/projects/smpng/sys/net/bridge.c#10 integrate ... //depot/projects/smpng/sys/net/if_dl.h#3 integrate ... //depot/projects/smpng/sys/net/if_ethersubr.c#16 integrate ... //depot/projects/smpng/sys/net/if_iso88025subr.c#5 integrate ... //depot/projects/smpng/sys/net/if_media.h#5 integrate ... //depot/projects/smpng/sys/net/if_spppsubr.c#8 integrate ... //depot/projects/smpng/sys/net/if_tap.c#14 integrate ... //depot/projects/smpng/sys/net/if_tun.c#13 integrate ... //depot/projects/smpng/sys/net/if_var.h#11 integrate ... //depot/projects/smpng/sys/net/iso88025.h#2 integrate ... //depot/projects/smpng/sys/net/zlib.h#2 integrate ... //depot/projects/smpng/sys/netatm/atm_cm.c#5 integrate ... //depot/projects/smpng/sys/netatm/atm_cm.h#4 integrate ... //depot/projects/smpng/sys/netatm/atm_socket.c#4 integrate ... //depot/projects/smpng/sys/netatm/atm_subr.c#9 integrate ... //depot/projects/smpng/sys/netatm/atm_var.h#7 integrate ... //depot/projects/smpng/sys/netgraph/ng_ether.c#6 integrate ... //depot/projects/smpng/sys/netgraph/ng_pppoe.c#7 integrate ... //depot/projects/smpng/sys/netgraph/ng_pppoe.h#3 integrate ... //depot/projects/smpng/sys/netinet/icmp6.h#4 integrate ... //depot/projects/smpng/sys/netinet/if_ether.c#13 integrate ... //depot/projects/smpng/sys/netinet/igmp.c#4 integrate ... //depot/projects/smpng/sys/netinet/in.h#13 integrate ... //depot/projects/smpng/sys/netinet/ip_dummynet.c#7 integrate ... //depot/projects/smpng/sys/netinet/ip_dummynet.h#5 integrate ... //depot/projects/smpng/sys/netinet/ip_fw.c#14 integrate ... //depot/projects/smpng/sys/netinet/ip_fw.h#7 integrate ... //depot/projects/smpng/sys/netinet/ip_input.c#18 integrate ... //depot/projects/smpng/sys/netinet/ip_output.c#22 integrate ... //depot/projects/smpng/sys/netinet/tcp_syncache.c#10 integrate ... //depot/projects/smpng/sys/netinet6/icmp6.c#6 integrate ... //depot/projects/smpng/sys/netinet6/ipcomp_core.c#3 integrate ... //depot/projects/smpng/sys/netinet6/mld6.c#2 integrate ... //depot/projects/smpng/sys/netncp/ncp_lib.h#3 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#13 integrate ... //depot/projects/smpng/sys/nfsserver/nfs.h#6 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_serv.c#17 integrate ... //depot/projects/smpng/sys/pc98/conf/GENERIC#20 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#34 integrate ... //depot/projects/smpng/sys/pc98/pc98/fd.c#11 integrate ... //depot/projects/smpng/sys/pc98/pc98/syscons.c#16 integrate ... //depot/projects/smpng/sys/pci/if_dc.c#16 integrate ... //depot/projects/smpng/sys/pci/if_dcreg.h#7 integrate ... //depot/projects/smpng/sys/pci/if_rl.c#12 integrate ... //depot/projects/smpng/sys/pci/if_rlreg.h#6 integrate ... //depot/projects/smpng/sys/pci/if_vr.c#6 integrate ... //depot/projects/smpng/sys/powerpc/include/ansi.h#12 integrate ... //depot/projects/smpng/sys/powerpc/include/asm.h#3 integrate ... //depot/projects/smpng/sys/powerpc/include/float.h#1 branch ... //depot/projects/smpng/sys/powerpc/include/fpu.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/ieeefp.h#1 branch ... //depot/projects/smpng/sys/powerpc/include/param.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/pcb.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/pcpu.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/pte.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/spr.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/stdarg.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/trap.h#3 integrate ... //depot/projects/smpng/sys/powerpc/include/varargs.h#2 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#3 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/fpu.c#1 branch ... //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#23 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#17 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/sigcode.S#2 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/swtch.s#11 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#18 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#2 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_util.c#9 integrate ... //depot/projects/smpng/sys/security/lomac/lomacfs_vnops.c#5 integrate ... //depot/projects/smpng/sys/sparc64/conf/GENERIC#13 integrate ... //depot/projects/smpng/sys/sparc64/include/ansi.h#13 integrate ... //depot/projects/smpng/sys/sparc64/include/endian.h#9 integrate ... //depot/projects/smpng/sys/sparc64/include/instr.h#4 integrate ... //depot/projects/smpng/sys/sparc64/include/param.h#10 integrate ... //depot/projects/smpng/sys/sparc64/include/proc.h#9 integrate ... //depot/projects/smpng/sys/sparc64/include/reg.h#10 integrate ... //depot/projects/smpng/sys/sparc64/include/stdarg.h#2 integrate ... //depot/projects/smpng/sys/sparc64/include/varargs.h#2 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/dump_machdep.c#1 branch ... //depot/projects/smpng/sys/sparc64/sparc64/exception.s#18 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/trap.c#33 integrate ... //depot/projects/smpng/sys/sys/acl.h#6 integrate ... //depot/projects/smpng/sys/sys/bio.h#8 integrate ... //depot/projects/smpng/sys/sys/blist.h#2 integrate ... //depot/projects/smpng/sys/sys/buf.h#10 integrate ... //depot/projects/smpng/sys/sys/cdefs.h#12 integrate ... //depot/projects/smpng/sys/sys/consio.h#5 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#16 integrate ... //depot/projects/smpng/sys/sys/errno.h#6 integrate ... //depot/projects/smpng/sys/sys/extattr.h#4 integrate ... //depot/projects/smpng/sys/sys/filedesc.h#12 integrate ... //depot/projects/smpng/sys/sys/jail.h#6 integrate ... //depot/projects/smpng/sys/sys/kernel.h#15 integrate ... //depot/projects/smpng/sys/sys/kerneldump.h#4 integrate ... //depot/projects/smpng/sys/sys/mount.h#11 integrate ... //depot/projects/smpng/sys/sys/mtio.h#3 integrate ... //depot/projects/smpng/sys/sys/namei.h#7 integrate ... //depot/projects/smpng/sys/sys/param.h#23 integrate ... //depot/projects/smpng/sys/sys/proc.h#48 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#19 integrate ... //depot/projects/smpng/sys/sys/stat.h#4 integrate ... //depot/projects/smpng/sys/sys/sun_disklabel.h#1 branch ... //depot/projects/smpng/sys/sys/syscall.h#14 integrate ... //depot/projects/smpng/sys/sys/syscall.mk#14 integrate ... //depot/projects/smpng/sys/sys/sysctl.h#9 integrate ... //depot/projects/smpng/sys/sys/sysproto.h#16 integrate ... //depot/projects/smpng/sys/sys/time.h#8 integrate ... //depot/projects/smpng/sys/sys/timetc.h#8 integrate ... //depot/projects/smpng/sys/sys/types.h#13 integrate ... //depot/projects/smpng/sys/sys/uio.h#6 integrate ... //depot/projects/smpng/sys/sys/unpcb.h#4 integrate ... //depot/projects/smpng/sys/sys/user.h#11 integrate ... //depot/projects/smpng/sys/sys/vnode.h#18 integrate ... //depot/projects/smpng/sys/tools/vnode_if.awk#2 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#11 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#4 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#6 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#12 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#12 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_subr.c#3 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#23 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#5 integrate ... //depot/projects/smpng/sys/ufs/ffs/fs.h#6 integrate ... //depot/projects/smpng/sys/ufs/ifs/ifs_vnops.c#6 integrate ... //depot/projects/smpng/sys/ufs/ufs/README.acls#3 integrate ... //depot/projects/smpng/sys/ufs/ufs/README.extattr#3 integrate ... //depot/projects/smpng/sys/ufs/ufs/dinode.h#3 integrate ... //depot/projects/smpng/sys/ufs/ufs/extattr.h#4 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#8 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#3 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#15 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#5 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#6 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#9 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#12 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_readwrite.c#8 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#10 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#14 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#4 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#13 integrate ... //depot/projects/smpng/sys/vm/vm_fault.c#10 integrate ... //depot/projects/smpng/sys/vm/vm_map.c#13 integrate ... //depot/projects/smpng/sys/vm/vm_map.h#8 integrate ... //depot/projects/smpng/sys/vm/vm_mmap.c#16 integrate ... //depot/projects/smpng/sys/vm/vm_object.c#11 integrate ... //depot/projects/smpng/sys/vm/vm_object.h#5 integrate ... //depot/projects/smpng/sys/vm/vm_swap.c#12 integrate ... //depot/projects/smpng/sys/vm/vnode_pager.c#14 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.29 2002/04/30 19:34:28 phk Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.30 2002/05/16 21:21:16 trhodes Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* @@ -482,7 +482,7 @@ struct timespec ts; if (base < 5*SECYR) { - printf("WARNING: preposterous time in file system"); + printf("WARNING: preposterous time in filesystem"); /* read the system clock anyway */ base = 6*SECYR + 186*SECDAY + SECDAY/2; badbase = 1; @@ -509,7 +509,7 @@ if (ct.year < 70 || ct.mon < 1 || ct.mon > 12 || ct.day < 1 || ct.day > 31 || ct.hour > 23 || ct.min > 59 || ct.sec > 59) { /* - * Believe the time in the file system for lack of + * Believe the time in the filesystem for lack of * anything better, resetting the TODR. */ s = splclock(); ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#16 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.38 2002/04/04 21:03:13 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.39 2002/05/08 23:12:00 mjacob Exp $ */ #include @@ -532,7 +532,7 @@ static void release_aps(void *dummy __unused) { - if (bootverbose) + if (bootverbose && mp_ncpus > 1) printf("%s: releasing secondary CPUs\n", __func__); atomic_store_rel_int(&aps_ready, 1); ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#32 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.92 2002/04/27 09:34:15 alc Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.93 2002/05/16 00:03:32 gallatin Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -968,6 +968,11 @@ extern int alpha_unaligned_print, alpha_unaligned_fix; extern int alpha_unaligned_sigbus; +struct unaligned_fixup_data { + const char *type; /* opcode name */ + int size; /* size, 0 if fixup not supported */ +}; + int unaligned_fixup(va, opcode, reg, td) unsigned long va, opcode, reg; @@ -979,10 +984,11 @@ struct proc *p; unsigned long *regptr, longdata, uac; int intdata; /* signed to get extension when storing */ - struct { - const char *type; /* opcode name */ - int size; /* size, 0 if fixup not supported */ - } tab[0x10] = { + u_int16_t worddata; /* unsigned to _avoid_ extension */ + const struct unaligned_fixup_data tab_0c[0x2] = { + { "ldwu", 2 }, { "stw", 2 }, + }; + const struct unaligned_fixup_data tab_20[0x10] = { #ifdef FIX_UNALIGNED_VAX_FP { "ldf", 4 }, { "ldg", 8 }, #else @@ -1022,9 +1028,12 @@ * Find out which opcode it is. Arrange to have the opcode * printed if it's an unknown opcode. */ - if (opcode >= 0x20 && opcode <= 0x2f) { - type = tab[opcode - 0x20].type; - size = tab[opcode - 0x20].size; + if (opcode >= 0x0c && opcode <= 0x0d) { + type = tab_0c[opcode - 0x0c].type; + size = tab_0c[opcode - 0x0c].size; + } else if (opcode >= 0x20 && opcode <= 0x2f) { + type = tab_20[opcode - 0x20].type; + size = tab_20[opcode - 0x20].size; } else { type = "0x%lx"; size = 0; @@ -1067,6 +1076,15 @@ signal = SIGBUS; if (dofix && size != 0) { switch (opcode) { + case 0x0c: /* ldwu */ + /* XXX ONLY WORKS ON LITTLE-ENDIAN ALPHA */ + unaligned_load_integer(worddata); + break; + + case 0x0d: /* stw */ + /* XXX ONLY WORKS ON LITTLE-ENDIAN ALPHA */ + unaligned_store_integer(worddata); + break; #ifdef FIX_UNALIGNED_VAX_FP case 0x20: /* ldf */ unaligned_load_floating(intdata, Ffloat_to_reg); ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#18 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.137 2002/04/18 03:44:44 rwatson Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.138 2002/05/03 17:59:21 jmallett Exp $ machine alpha cpu EV4 @@ -74,7 +74,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detects deadlocks and cycles +#options WITNESS #Enable checks to detect deadlocks and cycles # To make an SMP kernel, the next line is needed options SMP # Symmetric MultiProcessor Kernel ==== //depot/projects/smpng/sys/alpha/include/ansi.h#12 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.27 2002/04/10 15:58:11 mike Exp $ + * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.29 2002/05/10 02:21:05 obrien Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -72,7 +72,7 @@ #define _BSD_OFF_T_ long /* file offset */ #define _BSD_PID_T_ int /* process [group] */ -#if defined(__GNUC__) && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 95) +#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) #define _BSD_VA_LIST_ __builtin_va_list /* internally known to gcc */ #else typedef struct { ==== //depot/projects/smpng/sys/alpha/include/atomic.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.11 2001/06/22 21:13:20 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.14 2002/05/17 05:45:39 jhb Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -367,7 +367,7 @@ "3:\tbr 1b\n" /* try again */ ".previous\n" : "=&r" (ret), "=m" (*p) - : "r" (cmpval), "r" (newval), "m" (*p) + : "r" ((long)(int)cmpval), "r" (newval), "m" (*p) : "memory"); return ret; ==== //depot/projects/smpng/sys/alpha/include/param.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.26 2001/09/12 22:00:06 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.28 2002/05/14 20:35:25 phk Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /* @@ -116,16 +116,6 @@ #define KERNBASE 0xfffffc0000300000LL /* start of kernel virtual */ #define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT) -#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */ -#define DEV_BSIZE (1<> (PAGE_SHIFT - DEV_BSHIFT)) - -/* pages to bytes */ -#define ctob(x) ((x) << PAGE_SHIFT) -#define btoc(x) (((x) + PAGE_MASK) >> PAGE_SHIFT) - -/* - * btodb() is messy and perhaps slow because `bytes' may be an off_t. We - * want to shift an unsigned type to avoid sign extension and we don't - * want to widen `bytes' unnecessarily. Assume that the result fits in - * a daddr_t. - */ -#define btodb(bytes) /* calculates (bytes / DEV_BSIZE) */ \ - (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT) -#define dbtob(db) /* calculates (db * DEV_BSIZE) */ \ - ((off_t)(db) << DEV_BSHIFT) - -/* * Mach derived conversion macros */ #define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) ==== //depot/projects/smpng/sys/alpha/include/stdarg.h#2 (text+ko) ==== @@ -1,7 +1,5 @@ -/* $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.2 1999/08/28 00:38:52 peter Exp $ */ -/* From: NetBSD: stdarg.h,v 1.7 1997/04/06 08:47:44 cgd Exp */ - /*- + * Copyright (c) 2002 David E. O'Brien. All rights reserved. * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * @@ -34,6 +32,8 @@ * SUCH DAMAGE. * * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 + * $NetBSD: stdarg.h,v 1.7 1997/04/06 08:47:44 cgd Exp $ + * $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.3 2002/05/10 01:59:29 obrien Exp $ */ #ifndef _ALPHA_STDARG_H_ @@ -41,13 +41,26 @@ #include +typedef _BSD_VA_LIST_ va_list; + +#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) + +#define va_start(ap, last) \ + __builtin_stdarg_start((ap), (last)) + +#define va_arg(ap, type) \ + __builtin_va_arg((ap), type) + +#define va_end(ap) \ + __builtin_va_end(ap) + +#else /* ! __GNUC__ post GCC 2.95 */ + #ifdef __lint__ #define __builtin_saveregs() (0) #define __builtin_classify_type(t) (0) #endif -typedef _BSD_VA_LIST_ va_list; - #define __va_size(type) \ (((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long)) @@ -65,4 +78,6 @@ #define va_end(ap) ((void)0) +#endif /* __GNUC__ post GCC 2.95 */ + #endif /* !_ALPHA_STDARG_H_ */ ==== //depot/projects/smpng/sys/alpha/include/varargs.h#2 (text+ko) ==== @@ -1,7 +1,5 @@ -/* $FreeBSD: src/sys/alpha/include/varargs.h,v 1.2 1999/08/28 00:38:53 peter Exp $ */ -/* From: NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp */ - /*- + * Copyright (c) 2002 David E. O'Brien. All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * (c) UNIX System Laboratories, Inc. @@ -39,11 +37,28 @@ * SUCH DAMAGE. * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 + * $NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp $ + * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.3 2002/05/10 01:59:29 obrien Exp $ */ #ifndef _ALPHA_VARARGS_H_ #define _ALPHA_VARARGS_H_ +#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) + +#include + +typedef _BSD_VA_LIST_ va_list; +typedef int __builtin_va_alist_t __attribute__((__mode__(__word__))); + +#define va_alist __builtin_va_alist +#define va_dcl __builtin_va_alist_t __builtin_va_alist; ... +#define va_start(ap) __builtin_varargs_start(ap) +#define va_arg(ap, type) __builtin_va_arg((ap), type) +#define va_end(ap) __builtin_va_end(ap) + +#else /* ! __GNUC__ post GCC 2.95 */ + #include #if __GNUC__ == 1 @@ -59,4 +74,6 @@ #define va_start(ap) \ ((ap) = *(va_list *)__builtin_saveregs(), (ap).__pad = 0) +#endif /* __GNUC__ post GCC 2.95 */ + #endif /* !_ALPHA_VARARGS_H_ */ ==== //depot/projects/smpng/sys/alpha/pci/irongate_pci.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/pci/irongate_pci.c,v 1.7 2002/02/28 18:18:41 gallatin Exp $ + * $FreeBSD: src/sys/alpha/pci/irongate_pci.c,v 1.8 2002/05/10 16:56:14 gallatin Exp $ */ #include @@ -132,7 +132,7 @@ irongate_check_abort(); \ return ~0; \ } \ - data = ##op##(va); \ + data = op(va); \ if (irongate_check_abort()) \ return ~0; \ return data; \ @@ -144,7 +144,7 @@ irongate_clear_abort(); \ if (badaddr((caddr_t)va, width)) \ return; \ - ##op##(va, data); \ + op(va, data); \ irongate_check_abort(); \ } while (0) ==== //depot/projects/smpng/sys/arm/include/ansi.h#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/ansi.h,v 1.16 2002/03/24 11:25:45 obrien Exp $ + * $FreeBSD: src/sys/arm/include/ansi.h,v 1.17 2002/05/10 02:20:33 obrien Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -69,7 +69,7 @@ #define _BSD_OFF_T_ __int64_t /* file offset */ #define _BSD_PID_T_ int /* process [group] */ -#if defined(__GNUC__) && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 95) +#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) #define _BSD_VA_LIST_ __builtin_va_list /* internally known to gcc */ #else #define _BSD_VA_LIST_ char * /* va_list */ ==== //depot/projects/smpng/sys/arm/include/param.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: src/sys/arm/include/param.h,v 1.1 2001/01/04 05:23:06 obrien Exp $ + * $FreeBSD: src/sys/arm/include/param.h,v 1.3 2002/05/14 20:35:27 phk Exp $ */ /* @@ -100,62 +100,10 @@ #define KERNBASE 0x100000 /* start of kernel virtual */ #define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT) -#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */ -#define DEV_BSIZE (1 << DEV_BSHIFT) - -#ifndef BLKDEV_IOSIZE -#define BLKDEV_IOSIZE PAGE_SIZE /* default block device I/O size */ -#endif -#define DFLTPHYS (64 * 1024) /* default max raw I/O transfer size */ -#define MAXPHYS (128 * 1024) /* max raw I/O transfer size */ -#define MAXDUMPPGS (DFLTPHYS/PAGE_SIZE) - #define UPAGES 2 /* pages of u-area */ #define USPACE (UPAGES * PAGE_SIZE) /* total size of u-area */ /* - * Constants related to network buffer management. - * MCLBYTES must be no larger than PAGE_SIZE. - */ -#ifndef MSIZE -#define MSIZE 256 /* size of an mbuf */ -#endif /* MSIZE */ - -#ifndef MCLSHIFT -#define MCLSHIFT 11 /* convert bytes to mbuf clusters */ -#endif /* MCLSHIFT */ -#define MCLBYTES (1 << MCLSHIFT) /* size of an mbuf cluster */ - -/* - * Some macros for units conversion - */ - -/* pages ("clicks") to bytes */ -#define ctob(x) ((x) << PAGE_SHIFT) - -/* bytes to clicks */ -#define btoc(x) (((unsigned)(x) + PAGE_MASK) >> PAGE_SHIFT) - -/* pages ("clicks") to disk blocks */ -#define ctod(x) ((x) << (PAGE_SHIFT - DEV_BSHIFT)) -#define dtoc(x) ((x) >> (PAGE_SHIFT - DEV_BSHIFT)) - -/* bytes to disk blocks */ -/* - * btodb() is messy and perhaps slow because `bytes' may be an off_t. We - * want to shift an unsigned type to avoid sign extension and we don't - * want to widen `bytes' unnecessarily. Assume that the result fits in - * a daddr_t. - */ -#define btodb(bytes) /* calculates (bytes / DEV_BSIZE) */ \ - (sizeof (bytes) > sizeof(long) \ - ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \ - : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT)) - -#define dbtob(db) /* calculates (db * DEV_BSIZE) */ \ - ((off_t)(db) << DEV_BSHIFT) - -/* * Mach derived conversion macros */ #define trunc_page(x) ((x) & ~PAGE_MASK) ==== //depot/projects/smpng/sys/boot/Makefile#5 (text+ko) ==== @@ -1,7 +1,9 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.12 2002/03/28 01:37:10 obrien Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.13 2002/05/09 20:33:22 obrien Exp $ # Build the add-in FORTH interpreter +.if ${MACHINE_ARCH} != "sparc64" SUBDIR+= ficl +.endif # Build OpenFirmware library .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" ==== //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $ -# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.11 2000/07/21 22:36:42 jhb Exp $ +# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.12 2002/05/10 09:26:27 obrien Exp $ .include <../Makefile.inc> @@ -8,12 +8,12 @@ .PATH: ${.CURDIR}/../libalpha SRCS= start.S boot1.c sys.c -CFLAGS+= -mno-fp-regs +CFLAGS+= -ffreestanding -mno-fp-regs +CFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -DMINIMAL +CFLAGS+= -DBOOT1 CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} CFLAGS+= -I${LIBSTANDDIR} CFLAGS+= -I${.CURDIR}/.. -CFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -DMINIMAL -CFLAGS+= -DBOOT1 NOMAN=1 STRIP= BINDIR?= /boot ==== //depot/projects/smpng/sys/boot/alpha/boot1/sys.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * * from: Mach, Revision 2.2 92/04/04 11:36:34 rpd * fromL Id: sys.c,v 1.21 1997/06/09 05:10:56 bde Exp - * $FreeBSD: src/sys/boot/alpha/boot1/sys.c,v 1.6 2002/01/18 21:54:02 iedowse Exp $ + * $FreeBSD: src/sys/boot/alpha/boot1/sys.c,v 1.8 2002/05/16 21:21:46 trhodes Exp $ */ #include @@ -37,6 +37,7 @@ #include #include +#include #define COMPAT_UFS @@ -185,7 +186,7 @@ #define max(a, b) ((a) > (b) ? (a) : (b)) /* - * Sanity checks for old file systems. + * Sanity checks for old filesystems. * * XXX - goes away some day. */ ==== //depot/projects/smpng/sys/boot/alpha/cdboot/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/alpha/cdboot/Makefile,v 1.6 2001/08/10 22:31:05 obrien Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 17 16:21:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DA4E37B401; Fri, 17 May 2002 16:21:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7A8C537B40D for ; Fri, 17 May 2002 16:21:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4HNLPG23836 for perforce@freebsd.org; Fri, 17 May 2002 16:21:25 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Fri, 17 May 2002 16:21:25 -0700 (PDT) Message-Id: <200205172321.g4HNLPG23836@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11458 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11458 Change 11458 by jake@jake_sparc64 on 2002/05/17 16:21:16 Remove fsblks. Affected files ... ... //depot/projects/sparc64/sys/boot/sparc64/boot1/boot1.c#4 edit Differences ... ==== //depot/projects/sparc64/sys/boot/sparc64/boot1/boot1.c#4 (text+ko) ==== @@ -54,7 +54,6 @@ static struct fs fs; static ino_t inomap; static char blkbuf[BSIZEMAX]; -static unsigned int fsblks; static uint32_t fs_off; @@ -409,7 +408,6 @@ printf("mount: not ufs\n"); return (-1); } - fsblks = fs.fs_bsize >> DEV_BSHIFT; return (0); } @@ -504,7 +502,7 @@ return (0); if (inomap != inode) { if (dskread(blkbuf, fsbtodb(&fs, ino_to_fsba(&fs, inode)), - fsblks)) + fs.fs_bsize >> DEV_BSHIFT)) return (-1); bcopy(blkbuf + ((inode % INOPB(&fs)) * sizeof(din)), &din, sizeof(din)); @@ -523,7 +521,7 @@ else { if (indmap != din.di_ib[0]) { if (dskread(indbuf, fsbtodb(&fs, din.di_ib[0]), - fsblks)) + fs.fs_bsize >> DEV_BSHIFT)) return (-1); indmap = din.di_ib[0]; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 17 16:33: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F84937B409; Fri, 17 May 2002 16:32:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5A02337B407 for ; Fri, 17 May 2002 16:32:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4HNWdU24448 for perforce@freebsd.org; Fri, 17 May 2002 16:32:39 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Fri, 17 May 2002 16:32:39 -0700 (PDT) Message-Id: <200205172332.g4HNWdU24448@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11459 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11459 Change 11459 by jake@jake_sparc64 on 2002/05/17 16:32:15 Inline the load function. Affected files ... ... //depot/projects/sparc64/sys/boot/sparc64/boot1/boot1.c#5 edit Differences ... ==== //depot/projects/sparc64/sys/boot/sparc64/boot1/boot1.c#5 (text+ko) ==== @@ -347,6 +347,10 @@ main(int ac, char **av) { const char *path; + Elf64_Ehdr eh; + Elf64_Phdr ph; + caddr_t p; + ino_t ino; int i; path = _PATH_LOADER; @@ -369,10 +373,29 @@ " Boot loader: %s\n", bootpath, path); if (mount(bootpath) == -1) - panic("mount"); - - load(path); - return (1); + panic("main: can't mount %s", bootpath); + if ((ino = lookup(path)) == 0) + panic("main: file %s not found", path); + if (fsread(ino, &eh, sizeof(eh)) != sizeof(eh)) + panic("main: can't read elf header"); + if (!IS_ELF(eh)) + panic("main: not an elf file"); + for (i = 0; i < eh.e_phnum; i++) { + fs_off = eh.e_phoff + i * eh.e_phentsize; + if (fsread(ino, &ph, sizeof(ph)) != sizeof(ph)) + panic("main: can't read program header %d", i); + if (ph.p_type != PT_LOAD) + continue; + fs_off = ph.p_offset; + p = (caddr_t)ph.p_vaddr; + if (fsread(ino, p, ph.p_filesz) != ph.p_filesz) + panic("main: can't read contents of section %d", i); + if (ph.p_filesz != ph.p_memsz) + bzero(p + ph.p_filesz, ph.p_memsz - ph.p_filesz); + } + ofw_close(bootdev); + (*(void (*)())eh.e_entry)(0, 0, 0, 0, ofw); + panic("main"); } static void @@ -411,48 +434,6 @@ return (0); } -static void -load(const char *fname) -{ - Elf64_Ehdr eh; - Elf64_Phdr ph; - caddr_t p; - ino_t ino; - int i; - - if ((ino = lookup(fname)) == 0) { - printf("File %s not found\n", fname); - return; - } - if (fsread(ino, &eh, sizeof(eh)) != sizeof(eh)) { - printf("Can't read elf header\n"); - return; - } - if (!IS_ELF(eh)) { - printf("Not an ELF file\n"); - return; - } - for (i = 0; i < eh.e_phnum; i++) { - fs_off = eh.e_phoff + i * eh.e_phentsize; - if (fsread(ino, &ph, sizeof(ph)) != sizeof(ph)) { - printf("Can't read program header %d\n", i); - return; - } - if (ph.p_type != PT_LOAD) - continue; - fs_off = ph.p_offset; - p = (caddr_t)ph.p_vaddr; - if (fsread(ino, p, ph.p_filesz) != ph.p_filesz) { - printf("Can't read content of section %d\n", i); - return; - } - if (ph.p_filesz != ph.p_memsz) - bzero(p + ph.p_filesz, ph.p_memsz - ph.p_filesz); - } - ofw_close(bootdev); - (*(void (*)(int, int, int, int, ofwfp_t))eh.e_entry)(0, 0, 0, 0, ofw); -} - static ino_t lookup(const char *path) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 1:31:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8059C37B40A; Sat, 18 May 2002 01:31:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 966DF37B406 for ; Sat, 18 May 2002 01:31:38 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4I8Vcl15485 for perforce@freebsd.org; Sat, 18 May 2002 01:31:38 -0700 (PDT) (envelope-from dfr@freebsd.org) Date: Sat, 18 May 2002 01:31:38 -0700 (PDT) Message-Id: <200205180831.g4I8Vcl15485@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson Subject: PERFORCE change 11470 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11470 Change 11470 by dfr@dfr_home on 2002/05/18 01:30:39 Add declarations of suword32 and suword64. Add implementations of one or the other (or both) to all the platforms. Similar for fuword32 and fuword64. Affected files ... ... //depot/projects/ia64/sys/alpha/alpha/support.s#3 edit ... //depot/projects/ia64/sys/i386/i386/support.s#4 edit ... //depot/projects/ia64/sys/ia64/ia64/trap.c#25 edit ... //depot/projects/ia64/sys/powerpc/powerpc/copyinout.c#4 edit ... //depot/projects/ia64/sys/sparc64/sparc64/support.s#5 edit ... //depot/projects/ia64/sys/sys/systm.h#11 edit Differences ... ==== //depot/projects/ia64/sys/alpha/alpha/support.s#3 (text+ko) ==== @@ -65,6 +65,7 @@ */ LEAF(suword, 1) + XLEAF(suword64, 1) LDGP(pv) ldiq t0, VM_MAXUSER_ADDRESS /* verify address validity */ @@ -110,6 +111,7 @@ END(subyte) LEAF(fuword, 1) + XLEAF(fuword64, 1) LDGP(pv) ldiq t0, VM_MAXUSER_ADDRESS /* verify address validity */ ==== //depot/projects/ia64/sys/i386/i386/support.s#4 (text+ko) ==== @@ -1189,6 +1189,9 @@ movl $0,PCB_ONFAULT(%ecx) ret +ENTRY(fuword32) + jmp fuword + /* * These two routines are called from the profiling code, potentially * at interrupt time. If they fail, that's okay, good things will @@ -1286,6 +1289,9 @@ movl %eax,PCB_ONFAULT(%ecx) ret +ENTRY(suword32) + jmp suword + /* * susword - MP SAFE (if not I386_CPU) */ ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#25 (text+ko) ==== @@ -926,8 +926,6 @@ #include -extern long fuword32(const void *base); - static void ia32_syscall(struct trapframe *framep) { ==== //depot/projects/ia64/sys/powerpc/powerpc/copyinout.c#4 (text+ko) ==== @@ -265,6 +265,13 @@ } int +suword32(void *addr, u_int32_t word) +{ + return (suword(addr, word)); +} + + +int fubyte(const void *addr) { struct thread *td; @@ -314,3 +321,9 @@ td->td_pcb->pcb_onfault = NULL; return (val); } + +u_int32_t +fuword32(const void *addr) +{ + return (fuword(addr)); +} ==== //depot/projects/ia64/sys/sparc64/sparc64/support.s#5 (text+ko) ==== @@ -512,6 +512,18 @@ END(fuword) /* + * u_int64_t fuword64(const void *base) + */ +ENTRY(fuword64) +#if KTR_COMPILE & KTR_CT1 + CATR(KTR_CT1, "fuword64: base=%#lx", %g1, %g2, %g3, 7, 8, 9) + stx %o0, [%g1 + KTR_PARM1] +9: +#endif + FU_BYTES(ldxa, 8, .Lfsfault) +END(fuword64) + +/* * int subyte(const void *base, int byte) */ ENTRY(subyte) @@ -571,6 +583,18 @@ SU_BYTES(stxa, 8, .Lfsfault) END(suword) +/* + * int suword64(const void *base, u_int64_t word) + */ +ENTRY(suword64) +#if KTR_COMPILE & KTR_CT1 + CATR(KTR_CT1, "suword64: base=%#lx", %g1, %g2, %g3, 7, 8, 9) + stx %o0, [%g1 + KTR_PARM1] +9: +#endif + SU_BYTES(stxa, 8, .Lfsfault) +END(suword64) + .align 16 .Lfsalign: #if KTR_COMPILE & KTR_CT1 ==== //depot/projects/ia64/sys/sys/systm.h#11 (text+ko) ==== @@ -180,8 +180,12 @@ int fubyte(const void *base); int subyte(void *base, int byte); int suibyte(void *base, int byte); +int32_t fuword32(const void *base); +int64_t fuword64(const void *base); long fuword(const void *base); int suword(void *base, long word); +int suword32(void *base, int32_t word); +int suword64(void *base, int64_t word); int fusword(void *base); int susword(void *base, int word); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 4:40:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3D3537B401; Sat, 18 May 2002 04:40:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from sccrmhc03.attbi.com (sccrmhc03.attbi.com [204.127.202.63]) by hub.freebsd.org (Postfix) with ESMTP id A215D37B40F; Sat, 18 May 2002 04:40:14 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc03.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020518114013.BRPL19355.sccrmhc03.attbi.com@InterJet.elischer.org>; Sat, 18 May 2002 11:40:13 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id EAA60572; Sat, 18 May 2002 04:25:50 -0700 (PDT) Date: Sat, 18 May 2002 04:25:48 -0700 (PDT) From: Julian Elischer To: John Baldwin Cc: Peter Wemm , Perforce Change Reviews , Perforce Change Reviews , Jonathan Mini Subject: Re: PERFORCE change 11120 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 17 May 2002, John Baldwin wrote: > Yes, I think that is the problem. I think it has to do with setting > up/tearing down the thread stacks. If uma could do this w/o holding > the zone locks that would probably be sufficient. The old analogy to this problem was one of the reasons that I used the thread_reap() command an allowed them to be torn down at a known safe time.. (for setting up I actually punted a but by having some spare threads around....) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 6: 4:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D15937B405; Sat, 18 May 2002 06:03:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by hub.freebsd.org (Postfix) with ESMTP id 12D7437B40D for ; Sat, 18 May 2002 06:03:50 -0700 (PDT) Received: (qmail 3178 invoked from network); 18 May 2002 13:03:49 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail14.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 18 May 2002 13:03:49 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g4ID3lF82134; Sat, 18 May 2002 09:03:47 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Sat, 18 May 2002 09:03:35 -0400 (EDT) From: John Baldwin To: Julian Elischer Subject: Re: PERFORCE change 11120 for review Cc: Jonathan Mini Cc: Jonathan Mini , Perforce Change Reviews , Peter Wemm Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 18-May-2002 Julian Elischer wrote: > > > On Fri, 17 May 2002, John Baldwin wrote: > >> Yes, I think that is the problem. I think it has to do with setting >> up/tearing down the thread stacks. If uma could do this w/o holding >> the zone locks that would probably be sufficient. > > The old analogy to this problem was one of the reasons that I used > the thread_reap() command an allowed them to be torn down > at a known safe time.. The fini() call out should be a safe time, I think the locking in uma just needs to be adjusted to ensure it is safe. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 12:44:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F85337B411; Sat, 18 May 2002 12:44:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id 361E937B40A; Sat, 18 May 2002 12:44:20 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 99967A900; Sat, 18 May 2002 12:43:39 -0700 (PDT) Date: Sat, 18 May 2002 12:43:39 -0700 From: Jonathan Mini To: John Baldwin Cc: Julian Elischer , Perforce Change Reviews , Peter Wemm , Jeff Roberson Subject: Re: PERFORCE change 11120 for review Message-ID: <20020518124339.F25907@stylus.haikugeek.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from jhb@FreeBSD.org on Sat, May 18, 2002 at 09:03:35AM -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin [jhb@FreeBSD.org] wrote : > > On Fri, 17 May 2002, John Baldwin wrote: > > > >> Yes, I think that is the problem. I think it has to do with setting > >> up/tearing down the thread stacks. If uma could do this w/o holding > >> the zone locks that would probably be sufficient. > > > > The old analogy to this problem was one of the reasons that I used > > the thread_reap() command an allowed them to be torn down > > at a known safe time.. > > The fini() call out should be a safe time, I think the locking in uma > just needs to be adjusted to ensure it is safe. I think Jeff agrees as well. Jeff, are you reading this thread? -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 13:41:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFBF837B40E; Sat, 18 May 2002 13:40:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 61C5F37B408 for ; Sat, 18 May 2002 13:40:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4IKeSk33962 for perforce@freebsd.org; Sat, 18 May 2002 13:40:28 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 18 May 2002 13:40:28 -0700 (PDT) Message-Id: <200205182040.g4IKeSk33962@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11484 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11484 Change 11484 by peter@peter_overcee on 2002/05/18 13:39:55 Forced resync to try and get the file types in sync. Affected files ... ... //depot/projects/sparc64/contrib/openpam/CREDITS#2 integrate ... //depot/projects/sparc64/contrib/openpam/HISTORY#8 integrate ... //depot/projects/sparc64/contrib/openpam/INSTALL#5 integrate ... //depot/projects/sparc64/contrib/openpam/LICENSE#5 integrate ... //depot/projects/sparc64/contrib/openpam/MANIFEST#8 integrate ... //depot/projects/sparc64/contrib/openpam/Makefile#5 integrate ... //depot/projects/sparc64/contrib/openpam/README#6 integrate ... //depot/projects/sparc64/contrib/openpam/RELNOTES#8 integrate ... //depot/projects/sparc64/contrib/openpam/bin/Makefile#5 integrate ... //depot/projects/sparc64/contrib/openpam/bin/su/Makefile#5 integrate ... //depot/projects/sparc64/contrib/openpam/bin/su/su.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/Makefile#5 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_borrow_cred.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_free_data.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_restore_cred.3#4 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#9 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#9 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setenv.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#9 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_strerror.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_verror.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vinfo.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vprompt.3#8 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#9 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/openpam_version.h#2 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_appl.h#5 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_constants.h#7 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_modules.h#6 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_types.h#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/Makefile#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_configure.c#3 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_dispatch.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_dynamic.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_findenv.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_free_data.c#2 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_get_option.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_impl.h#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_load.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_log.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_nullconv.c#2 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_restore_cred.c#2 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_set_option.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_static.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_ttyconv.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_acct_mgmt.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate_secondary.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_chauthtok.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_close_session.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_end.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_error.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#9 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_data.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_item.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_mapped_authtok.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_mapped_username.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_user.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_getenv.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_getenvlist.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_info.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_open_session.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_prompt.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_putenv.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_data.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_item.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_mapped_authtok.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_mapped_username.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_setcred.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_setenv.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_acct_mgmt.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_authenticate.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_chauthtok.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_close_session.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_get_mapped_username.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_open_session.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_set_mapped_username.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_setcred.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_start.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_strerror.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_verror.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_vinfo.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_vprompt.c#6 integrate ... //depot/projects/sparc64/contrib/openpam/misc/gendoc.pl#6 integrate ... //depot/projects/sparc64/contrib/openpam/modules/Makefile#5 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_deny/Makefile#5 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_deny/pam_deny.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_dummy/Makefile#5 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_dummy/pam_dummy.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_permit/Makefile#5 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_permit/pam_permit.c#5 integrate Differences ... ==== //depot/projects/sparc64/contrib/openpam/CREDITS#2 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/HISTORY#8 (text+ko) ==== @@ -152,4 +152,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/sparc64/contrib/openpam/HISTORY#7 $ +$P4: //depot/projects/sparc64/contrib/openpam/HISTORY#8 $ ==== //depot/projects/sparc64/contrib/openpam/INSTALL#5 (text+ko) ==== @@ -22,4 +22,4 @@ Change into the top-level OpenPAM directory and run 'make install'. -$P4: //depot/projects/sparc64/contrib/openpam/INSTALL#4 $ +$P4: //depot/projects/sparc64/contrib/openpam/INSTALL#5 $ ==== //depot/projects/sparc64/contrib/openpam/LICENSE#5 (text+ko) ==== @@ -31,4 +31,4 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$P4: //depot/projects/sparc64/contrib/openpam/LICENSE#4 $ +$P4: //depot/projects/sparc64/contrib/openpam/LICENSE#5 $ ==== //depot/projects/sparc64/contrib/openpam/MANIFEST#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/sparc64/contrib/openpam/MANIFEST#7 $ +# $P4: //depot/projects/sparc64/contrib/openpam/MANIFEST#8 $ # CREDITS HISTORY ==== //depot/projects/sparc64/contrib/openpam/Makefile#5 (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/sparc64/contrib/openpam/Makefile#4 $ +# $P4: //depot/projects/sparc64/contrib/openpam/Makefile#5 $ # SUBDIR = ==== //depot/projects/sparc64/contrib/openpam/README#6 (text+ko) ==== @@ -23,4 +23,4 @@ Please direct bug reports and inquiries to openpam@thinksec.com. -$P4: //depot/projects/sparc64/contrib/openpam/README#5 $ +$P4: //depot/projects/sparc64/contrib/openpam/README#6 $ ==== //depot/projects/sparc64/contrib/openpam/RELNOTES#8 (text+ko) ==== @@ -15,4 +15,4 @@ - The documentation is still incomplete. -$P4: //depot/projects/sparc64/contrib/openpam/RELNOTES#7 $ +$P4: //depot/projects/sparc64/contrib/openpam/RELNOTES#8 $ ==== //depot/projects/sparc64/contrib/openpam/bin/Makefile#5 (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/sparc64/contrib/openpam/bin/Makefile#4 $ +# $P4: //depot/projects/sparc64/contrib/openpam/bin/Makefile#5 $ # SUBDIR = ==== //depot/projects/sparc64/contrib/openpam/bin/su/Makefile#5 (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/sparc64/contrib/openpam/bin/su/Makefile#4 $ +# $P4: //depot/projects/sparc64/contrib/openpam/bin/su/Makefile#5 $ # PROG = su ==== //depot/projects/sparc64/contrib/openpam/bin/su/su.c#5 (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/sparc64/contrib/openpam/bin/su/su.c#4 $ + * $P4: //depot/projects/sparc64/contrib/openpam/bin/su/su.c#5 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/doc/Makefile#5 (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/sparc64/contrib/openpam/doc/Makefile#4 $ +# $P4: //depot/projects/sparc64/contrib/openpam/doc/Makefile#5 $ # SUBDIR = ==== //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#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/sparc64/contrib/openpam/doc/man/Makefile#5 $ +# $P4: //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#6 $ # MAN = ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_borrow_cred.3#4 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_free_data.3#4 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#8 (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/sparc64/contrib/openpam/doc/man/openpam_get_option.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#8 $ .\" .Dd May 2, 2002 .Dt OPENPAM_GET_OPTION 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#8 (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/sparc64/contrib/openpam/doc/man/openpam_log.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#8 $ .\" .Dd May 2, 2002 .Dt OPENPAM_LOG 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_restore_cred.3#4 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#8 (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/sparc64/contrib/openpam/doc/man/openpam_set_option.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#8 $ .\" .Dd May 2, 2002 .Dt OPENPAM_SET_OPTION 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#8 (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/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#8 $ .\" .Dd May 2, 2002 .Dt OPENPAM_TTYCONV 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#8 (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/sparc64/contrib/openpam/doc/man/pam.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#8 $ .\" .Dd May 2, 2002 .Dt PAM 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#8 (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/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_ACCT_MGMT 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#8 (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/sparc64/contrib/openpam/doc/man/pam_authenticate.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_AUTHENTICATE 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#8 (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/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_CHAUTHTOK 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#8 (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/sparc64/contrib/openpam/doc/man/pam_close_session.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_CLOSE_SESSION 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#8 (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/sparc64/contrib/openpam/doc/man/pam_end.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_END 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#8 (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/sparc64/contrib/openpam/doc/man/pam_error.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_ERROR 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#9 (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/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#8 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#9 $ .\" .Dd May 2, 2002 .Dt PAM_GET_AUTHTOK 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#8 (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/sparc64/contrib/openpam/doc/man/pam_get_data.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_GET_DATA 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#8 (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/sparc64/contrib/openpam/doc/man/pam_get_item.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_GET_ITEM 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#8 (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/sparc64/contrib/openpam/doc/man/pam_get_user.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_GET_USER 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#8 (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/sparc64/contrib/openpam/doc/man/pam_getenv.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_GETENV 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#9 (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/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#8 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#9 $ .\" .Dd May 2, 2002 .Dt PAM_GETENVLIST 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#8 (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/sparc64/contrib/openpam/doc/man/pam_info.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_INFO 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#8 (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/sparc64/contrib/openpam/doc/man/pam_open_session.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_OPEN_SESSION 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#8 (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/sparc64/contrib/openpam/doc/man/pam_prompt.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_PROMPT 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#8 (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/sparc64/contrib/openpam/doc/man/pam_putenv.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_PUTENV 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#8 (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/sparc64/contrib/openpam/doc/man/pam_set_data.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SET_DATA 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#8 (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/sparc64/contrib/openpam/doc/man/pam_set_item.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SET_ITEM 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#8 (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/sparc64/contrib/openpam/doc/man/pam_setcred.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SETCRED 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_setenv.3#8 (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/sparc64/contrib/openpam/doc/man/pam_setenv.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_setenv.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SETENV 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#8 (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/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SM_ACCT_MGMT 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#8 (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/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SM_AUTHENTICATE 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#8 (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/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SM_CHAUTHTOK 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#8 (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/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SM_CLOSE_SESSION 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#8 (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/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SM_OPEN_SESSION 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#8 (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/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SM_SETCRED 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#9 (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/sparc64/contrib/openpam/doc/man/pam_start.3#8 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#9 $ .\" .Dd May 2, 2002 .Dt PAM_START 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_strerror.3#8 (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/sparc64/contrib/openpam/doc/man/pam_strerror.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_strerror.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_STRERROR 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_verror.3#8 (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/sparc64/contrib/openpam/doc/man/pam_verror.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_verror.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_VERROR 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_vinfo.3#8 (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/sparc64/contrib/openpam/doc/man/pam_vinfo.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_vinfo.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_VINFO 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_vprompt.3#8 (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/sparc64/contrib/openpam/doc/man/pam_vprompt.3#7 $ +.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_vprompt.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_VPROMPT 3 ==== //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#9 (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/sparc64/contrib/openpam/include/security/openpam.h#8 $ + * $P4: //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#9 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED ==== //depot/projects/sparc64/contrib/openpam/include/security/openpam_version.h#2 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/include/security/pam_appl.h#5 (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/sparc64/contrib/openpam/include/security/pam_appl.h#4 $ + * $P4: //depot/projects/sparc64/contrib/openpam/include/security/pam_appl.h#5 $ */ #ifndef _PAM_APPL_H_INCLUDED ==== //depot/projects/sparc64/contrib/openpam/include/security/pam_constants.h#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/sparc64/contrib/openpam/include/security/pam_constants.h#6 $ + * $P4: //depot/projects/sparc64/contrib/openpam/include/security/pam_constants.h#7 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED ==== //depot/projects/sparc64/contrib/openpam/include/security/pam_modules.h#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/sparc64/contrib/openpam/include/security/pam_modules.h#5 $ + * $P4: //depot/projects/sparc64/contrib/openpam/include/security/pam_modules.h#6 $ */ #ifndef _PAM_MODULES_H_INCLUDED ==== //depot/projects/sparc64/contrib/openpam/include/security/pam_types.h#5 (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/sparc64/contrib/openpam/include/security/pam_types.h#4 $ + * $P4: //depot/projects/sparc64/contrib/openpam/include/security/pam_types.h#5 $ */ #ifndef _PAM_TYPES_H_INCLUDED ==== //depot/projects/sparc64/contrib/openpam/lib/Makefile#8 (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/sparc64/contrib/openpam/lib/Makefile#7 $ +# $P4: //depot/projects/sparc64/contrib/openpam/lib/Makefile#8 $ # LIB = pam ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_borrow_cred.c#2 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_configure.c#3 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_dispatch.c#5 (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/sparc64/contrib/openpam/lib/openpam_dispatch.c#4 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_dispatch.c#5 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_dynamic.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/sparc64/contrib/openpam/lib/openpam_dynamic.c#6 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_dynamic.c#7 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_findenv.c#5 (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/sparc64/contrib/openpam/lib/openpam_findenv.c#4 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_findenv.c#5 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_free_data.c#2 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_get_option.c#5 (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/sparc64/contrib/openpam/lib/openpam_get_option.c#4 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_get_option.c#5 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_impl.h#8 (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/sparc64/contrib/openpam/lib/openpam_impl.h#7 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_impl.h#8 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_load.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/sparc64/contrib/openpam/lib/openpam_load.c#5 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_load.c#6 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_log.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/sparc64/contrib/openpam/lib/openpam_log.c#5 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_log.c#6 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_nullconv.c#2 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_restore_cred.c#2 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_set_option.c#5 (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/sparc64/contrib/openpam/lib/openpam_set_option.c#4 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_set_option.c#5 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_static.c#5 (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/sparc64/contrib/openpam/lib/openpam_static.c#4 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_static.c#5 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_ttyconv.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/sparc64/contrib/openpam/lib/openpam_ttyconv.c#5 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_ttyconv.c#6 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_acct_mgmt.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/sparc64/contrib/openpam/lib/pam_acct_mgmt.c#5 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_acct_mgmt.c#6 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate.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/sparc64/contrib/openpam/lib/pam_authenticate.c#6 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate.c#7 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate_secondary.c#5 (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/sparc64/contrib/openpam/lib/pam_authenticate_secondary.c#4 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate_secondary.c#5 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_chauthtok.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/sparc64/contrib/openpam/lib/pam_chauthtok.c#6 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_chauthtok.c#7 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_close_session.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/sparc64/contrib/openpam/lib/pam_close_session.c#5 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_close_session.c#6 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_end.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/sparc64/contrib/openpam/lib/pam_end.c#5 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_end.c#6 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_error.c#5 (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/sparc64/contrib/openpam/lib/pam_error.c#4 $ + * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_error.c#5 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 13:43:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B1D937B40B; Sat, 18 May 2002 13:42:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7F8B037B405 for ; Sat, 18 May 2002 13:42:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4IKgWn34469 for perforce@freebsd.org; Sat, 18 May 2002 13:42:32 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 18 May 2002 13:42:32 -0700 (PDT) Message-Id: <200205182042.g4IKgWn34469@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11485 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11485 Change 11485 by peter@peter_overcee on 2002/05/18 13:42:06 Bah, get a bigger hammer, The last try didn't work. Affected files ... ... //depot/projects/sparc64/contrib/openpam/CREDITS#3 edit ... //depot/projects/sparc64/contrib/openpam/HISTORY#9 edit ... //depot/projects/sparc64/contrib/openpam/INSTALL#6 edit ... //depot/projects/sparc64/contrib/openpam/LICENSE#6 edit ... //depot/projects/sparc64/contrib/openpam/MANIFEST#9 edit ... //depot/projects/sparc64/contrib/openpam/Makefile#6 edit ... //depot/projects/sparc64/contrib/openpam/README#7 edit ... //depot/projects/sparc64/contrib/openpam/RELNOTES#9 edit ... //depot/projects/sparc64/contrib/openpam/bin/Makefile#6 edit ... //depot/projects/sparc64/contrib/openpam/bin/su/Makefile#6 edit ... //depot/projects/sparc64/contrib/openpam/bin/su/su.c#6 edit ... //depot/projects/sparc64/contrib/openpam/doc/Makefile#6 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#7 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_borrow_cred.3#5 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_free_data.3#5 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_restore_cred.3#5 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#10 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#10 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setenv.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#10 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_strerror.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_verror.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vinfo.3#9 edit ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vprompt.3#9 edit ... //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#10 edit ... //depot/projects/sparc64/contrib/openpam/include/security/openpam_version.h#3 edit ... //depot/projects/sparc64/contrib/openpam/include/security/pam_appl.h#6 edit ... //depot/projects/sparc64/contrib/openpam/include/security/pam_constants.h#8 edit ... //depot/projects/sparc64/contrib/openpam/include/security/pam_modules.h#7 edit ... //depot/projects/sparc64/contrib/openpam/include/security/pam_types.h#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/Makefile#9 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_borrow_cred.c#3 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_configure.c#4 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_dispatch.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_dynamic.c#8 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_findenv.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_free_data.c#3 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_get_option.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_impl.h#9 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_load.c#7 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_log.c#7 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_nullconv.c#3 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_restore_cred.c#3 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_set_option.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_static.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/openpam_ttyconv.c#7 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_acct_mgmt.c#7 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate.c#8 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate_secondary.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_chauthtok.c#8 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_close_session.c#7 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_end.c#7 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_error.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#10 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_data.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_item.c#7 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_mapped_authtok.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_mapped_username.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_user.c#7 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_getenv.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_getenvlist.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_info.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_open_session.c#7 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_prompt.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_putenv.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_data.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_item.c#7 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_mapped_authtok.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_mapped_username.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_setcred.c#7 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_setenv.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_acct_mgmt.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_authenticate.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_chauthtok.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_close_session.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_get_mapped_username.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_open_session.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_set_mapped_username.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_setcred.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_start.c#8 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_strerror.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_verror.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_vinfo.c#6 edit ... //depot/projects/sparc64/contrib/openpam/lib/pam_vprompt.c#7 edit ... //depot/projects/sparc64/contrib/openpam/misc/gendoc.pl#7 edit ... //depot/projects/sparc64/contrib/openpam/modules/Makefile#6 edit ... //depot/projects/sparc64/contrib/openpam/modules/pam_deny/Makefile#6 edit ... //depot/projects/sparc64/contrib/openpam/modules/pam_deny/pam_deny.c#6 edit ... //depot/projects/sparc64/contrib/openpam/modules/pam_dummy/Makefile#6 edit ... //depot/projects/sparc64/contrib/openpam/modules/pam_dummy/pam_dummy.c#6 edit ... //depot/projects/sparc64/contrib/openpam/modules/pam_permit/Makefile#6 edit ... //depot/projects/sparc64/contrib/openpam/modules/pam_permit/pam_permit.c#6 edit Differences ... ==== //depot/projects/sparc64/contrib/openpam/CREDITS#3 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/HISTORY#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/INSTALL#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/LICENSE#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/MANIFEST#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/Makefile#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/README#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/RELNOTES#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/bin/Makefile#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/bin/su/Makefile#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/bin/su/su.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/Makefile#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_borrow_cred.3#5 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_free_data.3#5 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_restore_cred.3#5 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#10 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#10 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_setenv.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#10 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_strerror.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_verror.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_vinfo.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_vprompt.3#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#10 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/include/security/openpam_version.h#3 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/include/security/pam_appl.h#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/include/security/pam_constants.h#8 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/include/security/pam_modules.h#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/include/security/pam_types.h#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/Makefile#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_borrow_cred.c#3 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_configure.c#4 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_dispatch.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_dynamic.c#8 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_findenv.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_free_data.c#3 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_get_option.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_impl.h#9 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_load.c#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_log.c#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_nullconv.c#3 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_restore_cred.c#3 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_set_option.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_static.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_ttyconv.c#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_acct_mgmt.c#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate.c#8 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate_secondary.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_chauthtok.c#8 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_close_session.c#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_end.c#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_error.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#10 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_get_data.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_get_item.c#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_get_mapped_authtok.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_get_mapped_username.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_get_user.c#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_getenv.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_getenvlist.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_info.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_open_session.c#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_prompt.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_putenv.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_set_data.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_set_item.c#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_set_mapped_authtok.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_set_mapped_username.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_setcred.c#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_setenv.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_sm_acct_mgmt.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_sm_authenticate.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_sm_chauthtok.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_sm_close_session.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_sm_get_mapped_username.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_sm_open_session.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_sm_set_mapped_username.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_sm_setcred.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_start.c#8 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_strerror.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_verror.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_vinfo.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/pam_vprompt.c#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/misc/gendoc.pl#7 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/modules/Makefile#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/modules/pam_deny/Makefile#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/modules/pam_deny/pam_deny.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/modules/pam_dummy/Makefile#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/modules/pam_dummy/pam_dummy.c#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/modules/pam_permit/Makefile#6 (text/text+ko) ==== ==== //depot/projects/sparc64/contrib/openpam/modules/pam_permit/pam_permit.c#6 (text/text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 13:49:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 708E237B40E; Sat, 18 May 2002 13:48:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2717137B412 for ; Sat, 18 May 2002 13:48:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4IKme935154 for perforce@freebsd.org; Sat, 18 May 2002 13:48:40 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 18 May 2002 13:48:40 -0700 (PDT) Message-Id: <200205182048.g4IKme935154@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11486 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11486 Change 11486 by peter@peter_overcee on 2002/05/18 13:47:56 Really sync up. Grrr. Affected files ... ... //depot/projects/sparc64/contrib/openpam/CREDITS#4 integrate ... //depot/projects/sparc64/contrib/openpam/HISTORY#10 integrate ... //depot/projects/sparc64/contrib/openpam/INSTALL#7 integrate ... //depot/projects/sparc64/contrib/openpam/LICENSE#7 integrate ... //depot/projects/sparc64/contrib/openpam/MANIFEST#10 integrate ... //depot/projects/sparc64/contrib/openpam/Makefile#7 integrate ... //depot/projects/sparc64/contrib/openpam/README#8 integrate ... //depot/projects/sparc64/contrib/openpam/RELNOTES#10 integrate ... //depot/projects/sparc64/contrib/openpam/bin/Makefile#7 integrate ... //depot/projects/sparc64/contrib/openpam/bin/su/Makefile#7 integrate ... //depot/projects/sparc64/contrib/openpam/bin/su/su.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/Makefile#7 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#8 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_borrow_cred.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_free_data.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_restore_cred.3#6 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#11 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#11 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_setenv.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#11 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_strerror.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_verror.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vinfo.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/doc/man/pam_vprompt.3#10 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#11 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/openpam_version.h#4 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_appl.h#7 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_constants.h#9 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_modules.h#8 integrate ... //depot/projects/sparc64/contrib/openpam/include/security/pam_types.h#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/Makefile#10 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_borrow_cred.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_configure.c#5 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_dispatch.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_dynamic.c#9 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_findenv.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_free_data.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_get_option.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_impl.h#10 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_load.c#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_log.c#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_nullconv.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_restore_cred.c#4 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_set_option.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_static.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/openpam_ttyconv.c#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_acct_mgmt.c#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate.c#9 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate_secondary.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_chauthtok.c#9 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_close_session.c#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_end.c#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_error.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#11 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_data.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_item.c#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_mapped_authtok.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_mapped_username.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_get_user.c#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_getenv.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_getenvlist.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_info.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_open_session.c#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_prompt.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_putenv.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_data.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_item.c#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_mapped_authtok.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_set_mapped_username.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_setcred.c#8 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_setenv.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_acct_mgmt.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_authenticate.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_chauthtok.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_close_session.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_get_mapped_username.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_open_session.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_set_mapped_username.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_sm_setcred.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_start.c#9 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_strerror.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_verror.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_vinfo.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/lib/pam_vprompt.c#8 integrate ... //depot/projects/sparc64/contrib/openpam/misc/gendoc.pl#8 integrate ... //depot/projects/sparc64/contrib/openpam/modules/Makefile#7 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_deny/Makefile#7 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_deny/pam_deny.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_dummy/Makefile#7 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_dummy/pam_dummy.c#7 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_permit/Makefile#7 integrate ... //depot/projects/sparc64/contrib/openpam/modules/pam_permit/pam_permit.c#7 integrate Differences ... ==== //depot/projects/sparc64/contrib/openpam/CREDITS#4 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/HISTORY#10 (text) ==== @@ -152,4 +152,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/sparc64/contrib/openpam/HISTORY#8 $ +$P4: //depot/projects/openpam/HISTORY#11 $ ==== //depot/projects/sparc64/contrib/openpam/INSTALL#7 (text) ==== @@ -22,4 +22,4 @@ Change into the top-level OpenPAM directory and run 'make install'. -$P4: //depot/projects/sparc64/contrib/openpam/INSTALL#5 $ +$P4: //depot/projects/openpam/INSTALL#2 $ ==== //depot/projects/sparc64/contrib/openpam/LICENSE#7 (text) ==== @@ -31,4 +31,4 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$P4: //depot/projects/sparc64/contrib/openpam/LICENSE#5 $ +$P4: //depot/projects/openpam/LICENSE#4 $ ==== //depot/projects/sparc64/contrib/openpam/MANIFEST#10 (text) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/sparc64/contrib/openpam/MANIFEST#8 $ +# $P4: //depot/projects/openpam/MANIFEST#8 $ # CREDITS HISTORY ==== //depot/projects/sparc64/contrib/openpam/Makefile#7 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/sparc64/contrib/openpam/Makefile#5 $ +# $P4: //depot/projects/openpam/Makefile#6 $ # SUBDIR = ==== //depot/projects/sparc64/contrib/openpam/README#8 (text) ==== @@ -23,4 +23,4 @@ Please direct bug reports and inquiries to openpam@thinksec.com. -$P4: //depot/projects/sparc64/contrib/openpam/README#6 $ +$P4: //depot/projects/openpam/README#3 $ ==== //depot/projects/sparc64/contrib/openpam/RELNOTES#10 (text) ==== @@ -15,4 +15,4 @@ - The documentation is still incomplete. -$P4: //depot/projects/sparc64/contrib/openpam/RELNOTES#8 $ +$P4: //depot/projects/openpam/RELNOTES#10 $ ==== //depot/projects/sparc64/contrib/openpam/bin/Makefile#7 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/sparc64/contrib/openpam/bin/Makefile#5 $ +# $P4: //depot/projects/openpam/bin/Makefile#5 $ # SUBDIR = ==== //depot/projects/sparc64/contrib/openpam/bin/su/Makefile#7 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/sparc64/contrib/openpam/bin/su/Makefile#5 $ +# $P4: //depot/projects/openpam/bin/su/Makefile#4 $ # PROG = su ==== //depot/projects/sparc64/contrib/openpam/bin/su/su.c#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/bin/su/su.c#5 $ + * $P4: //depot/projects/openpam/bin/su/su.c#5 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/doc/Makefile#7 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/sparc64/contrib/openpam/doc/Makefile#5 $ +# $P4: //depot/projects/openpam/doc/Makefile#3 $ # SUBDIR = ==== //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#8 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/sparc64/contrib/openpam/doc/man/Makefile#6 $ +# $P4: //depot/projects/openpam/doc/man/Makefile#6 $ # MAN = ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_borrow_cred.3#6 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_free_data.3#6 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_get_option.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#8 $ .\" .Dd May 2, 2002 .Dt OPENPAM_GET_OPTION 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_log.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#9 $ .\" .Dd May 2, 2002 .Dt OPENPAM_LOG 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_restore_cred.3#6 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_set_option.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#8 $ .\" .Dd May 2, 2002 .Dt OPENPAM_SET_OPTION 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/openpam_ttyconv.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#9 $ .\" .Dd May 2, 2002 .Dt OPENPAM_TTYCONV 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.3#14 $ .\" .Dd May 2, 2002 .Dt PAM 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_acct_mgmt.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_ACCT_MGMT 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_authenticate.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_AUTHENTICATE 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_chauthtok.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_CHAUTHTOK 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_close_session.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_CLOSE_SESSION 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_end.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_END 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_error.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_ERROR 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_authtok.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#14 $ .\" .Dd May 2, 2002 .Dt PAM_GET_AUTHTOK 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_data.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_GET_DATA 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_item.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#13 $ .\" .Dd May 2, 2002 .Dt PAM_GET_ITEM 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_get_user.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#13 $ .\" .Dd May 2, 2002 .Dt PAM_GET_USER 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenv.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_GETENV 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_getenvlist.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#13 $ .\" .Dd May 2, 2002 .Dt PAM_GETENVLIST 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_info.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_INFO 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_open_session.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_OPEN_SESSION 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_prompt.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#13 $ .\" .Dd May 2, 2002 .Dt PAM_PROMPT 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_putenv.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_PUTENV 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_data.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_SET_DATA 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_set_item.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_SET_ITEM 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_setcred.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#13 $ .\" .Dd May 2, 2002 .Dt PAM_SETCRED 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_setenv.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_setenv.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_SETENV 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SM_ACCT_MGMT 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_authenticate.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SM_AUTHENTICATE 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_chauthtok.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SM_CHAUTHTOK 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_close_session.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SM_CLOSE_SESSION 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_open_session.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SM_OPEN_SESSION 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_sm_setcred.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#8 $ .\" .Dd May 2, 2002 .Dt PAM_SM_SETCRED 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#11 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_start.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#13 $ .\" .Dd May 2, 2002 .Dt PAM_START 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_strerror.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_strerror.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#12 $ .\" .Dd May 2, 2002 .Dt PAM_STRERROR 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_verror.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_verror.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#10 $ .\" .Dd May 2, 2002 .Dt PAM_VERROR 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_vinfo.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_vinfo.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#10 $ .\" .Dd May 2, 2002 .Dt PAM_VINFO 3 ==== //depot/projects/sparc64/contrib/openpam/doc/man/pam_vprompt.3#10 (text) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/sparc64/contrib/openpam/doc/man/pam_vprompt.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#10 $ .\" .Dd May 2, 2002 .Dt PAM_VPROMPT 3 ==== //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#11 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/include/security/openpam.h#9 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#19 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED ==== //depot/projects/sparc64/contrib/openpam/include/security/openpam_version.h#4 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/include/security/pam_appl.h#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/include/security/pam_appl.h#5 $ + * $P4: //depot/projects/openpam/include/security/pam_appl.h#9 $ */ #ifndef _PAM_APPL_H_INCLUDED ==== //depot/projects/sparc64/contrib/openpam/include/security/pam_constants.h#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/include/security/pam_constants.h#7 $ + * $P4: //depot/projects/openpam/include/security/pam_constants.h#14 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED ==== //depot/projects/sparc64/contrib/openpam/include/security/pam_modules.h#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/include/security/pam_modules.h#6 $ + * $P4: //depot/projects/openpam/include/security/pam_modules.h#7 $ */ #ifndef _PAM_MODULES_H_INCLUDED ==== //depot/projects/sparc64/contrib/openpam/include/security/pam_types.h#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/include/security/pam_types.h#5 $ + * $P4: //depot/projects/openpam/include/security/pam_types.h#5 $ */ #ifndef _PAM_TYPES_H_INCLUDED ==== //depot/projects/sparc64/contrib/openpam/lib/Makefile#10 (text) ==== @@ -31,7 +31,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/sparc64/contrib/openpam/lib/Makefile#8 $ +# $P4: //depot/projects/openpam/lib/Makefile#15 $ # LIB = pam ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_borrow_cred.c#4 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_configure.c#5 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_dispatch.c#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_dispatch.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#14 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_dynamic.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_dynamic.c#7 $ + * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#5 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_findenv.c#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_findenv.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_findenv.c#7 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_free_data.c#4 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_get_option.c#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_get_option.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_get_option.c#3 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_impl.h#10 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_impl.h#8 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#14 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_load.c#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_load.c#6 $ + * $P4: //depot/projects/openpam/lib/openpam_load.c#13 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_log.c#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_log.c#6 $ + * $P4: //depot/projects/openpam/lib/openpam_log.c#13 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_nullconv.c#4 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_restore_cred.c#4 (text) ==== ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_set_option.c#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_set_option.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_set_option.c#4 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_static.c#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_static.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_static.c#4 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/openpam_ttyconv.c#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/openpam_ttyconv.c#6 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#10 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_acct_mgmt.c#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_acct_mgmt.c#6 $ + * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#8 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate.c#10 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate_secondary.c#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_authenticate_secondary.c#5 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate_secondary.c#5 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_chauthtok.c#9 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_chauthtok.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#11 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_close_session.c#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_close_session.c#6 $ + * $P4: //depot/projects/openpam/lib/pam_close_session.c#8 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_end.c#8 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_end.c#6 $ + * $P4: //depot/projects/openpam/lib/pam_end.c#9 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_error.c#7 (text) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/sparc64/contrib/openpam/lib/pam_error.c#5 $ + * $P4: //depot/projects/openpam/lib/pam_error.c#6 $ */ #include ==== //depot/projects/sparc64/contrib/openpam/lib/pam_get_authtok.c#11 (text) ==== @@ -31,7 +31,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 14:40:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EE2737B406; Sat, 18 May 2002 14:40:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7A9E237B403 for ; Sat, 18 May 2002 14:40:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4ILekC44665 for perforce@freebsd.org; Sat, 18 May 2002 14:40:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 18 May 2002 14:40:46 -0700 (PDT) Message-Id: <200205182140.g4ILekC44665@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11489 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11489 Change 11489 by rwatson@rwatson_curry on 2002/05/18 14:39:55 No longer grab Giant for __mac_get_proc(), since it's not required for copyout(), and we use thread-local data as the source. With a move to flexible policy handling here, Giant might be needed again. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#144 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#144 (text+ko) ==== @@ -1633,10 +1633,8 @@ { int error; - mtx_lock(&Giant); error = copyout(&td->td_ucred->cr_label, SCARG(uap, mac_p), sizeof(td->td_ucred->cr_label)); - mtx_unlock(&Giant); return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 14:54:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A007237B404; Sat, 18 May 2002 14:54:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 123E937B409 for ; Sat, 18 May 2002 14:54:03 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4ILs2046258 for perforce@freebsd.org; Sat, 18 May 2002 14:54:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 18 May 2002 14:54:02 -0700 (PDT) Message-Id: <200205182154.g4ILs2046258@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11490 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11490 Change 11490 by rwatson@rwatson_curry on 2002/05/18 14:53:42 Re-structure __mac_set_proc() so that it does process locking, and grabs Giant a little later. This actually appears to simplify things a bit, interestingly. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#145 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#145 (text+ko) ==== @@ -1641,7 +1641,6 @@ /* * MPSAFE - * XXX Proc Locking */ int __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap) @@ -1650,35 +1649,34 @@ struct mac newlabel; int error; - mtx_lock(&Giant); - oldcred = td->td_proc->p_ucred; - newcred = crdup(td->td_proc->p_ucred); - if (newcred == NULL) { - error = ENOMEM; - goto out; - } - + newcred = crget(); error = copyin(SCARG(uap, mac_p), &newlabel, sizeof(newlabel)); - if (error) { + if (error) { crfree(newcred); - goto out; + return (error); } + mtx_lock(&Giant); + PROC_LOCK(td->td_proc); + oldcred = td->td_proc->p_ucred; + error = mac_cred_check_relabel_subject(oldcred, &newlabel); if (error) { + PROC_UNLOCK(td->td_proc); crfree(newcred); - goto out; + mtx_unlock(&Giant); + return (error); } setsugid(td->td_proc); mac_relabel_subject(newcred, &newlabel); td->td_proc->p_ucred = newcred; + + PROC_UNLOCK(td->td_proc); crfree(oldcred); - -out: mtx_unlock(&Giant); - return (error); + return (0); } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 17: 3:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60F6237B401; Sat, 18 May 2002 17:03:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A632E37B410 for ; Sat, 18 May 2002 17:03:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4J03fL80392 for perforce@freebsd.org; Sat, 18 May 2002 17:03:41 -0700 (PDT) (envelope-from chris@freebsd.org) Date: Sat, 18 May 2002 17:03:41 -0700 (PDT) Message-Id: <200205190003.g4J03fL80392@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 11494 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11494 Change 11494 by chris@chris_holly on 2002/05/18 17:03:04 Remove bogons from tidy(1)-related hackery. Affected files ... ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/lomac/article.sgml#2 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/lomac/article.sgml#2 (text+ko) ==== @@ -1,6 +1,4 @@ - +
LOMAC Operations Manual To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 18:59:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDFC037B411; Sat, 18 May 2002 18:58:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 235BF37B40B for ; Sat, 18 May 2002 18:58:05 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4J1w4o03148 for perforce@freebsd.org; Sat, 18 May 2002 18:58:04 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Sat, 18 May 2002 18:58:04 -0700 (PDT) Message-Id: <200205190158.g4J1w4o03148@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 11499 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11499 Change 11499 by jhb@jhb_laptop on 2002/05/18 18:57:23 IFC - get my p_canfoo() commit. Affected files ... ... //depot/projects/smpng/sys/boot/i386/libi386/biospnp.c#2 integrate ... //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#17 integrate ... //depot/projects/smpng/sys/compat/linux/linux_ipc.c#7 integrate ... //depot/projects/smpng/sys/conf/NOTES#10 integrate ... //depot/projects/smpng/sys/conf/files#39 integrate ... //depot/projects/smpng/sys/conf/options#23 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs.c#4 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#11 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#9 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_fpregs.c#9 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_mem.c#8 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_regs.c#9 integrate ... //depot/projects/smpng/sys/fs/procfs/procfs_status.c#12 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#16 integrate ... //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#14 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_alloc.c#6 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_balloc.c#3 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_bmap.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_extern.h#6 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_ihash.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#6 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#6 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#15 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#9 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/inode.h#2 integrate ... //depot/projects/smpng/sys/kern/kern_event.c#11 integrate ... //depot/projects/smpng/sys/kern/kern_ktrace.c#23 integrate ... //depot/projects/smpng/sys/kern/kern_physio.c#2 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#30 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#63 integrate ... //depot/projects/smpng/sys/kern/kern_resource.c#24 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#37 integrate ... //depot/projects/smpng/sys/kern/subr_blist.c#2 integrate ... //depot/projects/smpng/sys/kern/sys_process.c#18 integrate ... //depot/projects/smpng/sys/nfsclient/bootp_subr.c#10 integrate ... //depot/projects/smpng/sys/posix4/p1003_1b.c#5 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_lkm.c#3 integrate ... //depot/projects/smpng/sys/sys/blist.h#3 integrate ... //depot/projects/smpng/sys/sys/proc.h#49 integrate ... //depot/projects/smpng/sys/sys/types.h#14 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#13 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#24 integrate ... //depot/projects/smpng/sys/ufs/ifs/README#2 delete ... //depot/projects/smpng/sys/ufs/ifs/ifs_extern.h#3 delete ... //depot/projects/smpng/sys/ufs/ifs/ifs_lookup.c#4 delete ... //depot/projects/smpng/sys/ufs/ifs/ifs_subr.c#3 delete ... //depot/projects/smpng/sys/ufs/ifs/ifs_vfsops.c#7 delete ... //depot/projects/smpng/sys/ufs/ifs/ifs_vnops.c#7 delete ... //depot/projects/smpng/sys/ufs/ufs/inode.h#3 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#4 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#13 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_readwrite.c#9 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#11 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#15 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#5 integrate ... //depot/projects/smpng/sys/vm/vm_map.c#14 integrate ... //depot/projects/smpng/sys/vm/vm_mmap.c#17 integrate ... //depot/projects/smpng/sys/vm/vm_object.c#12 integrate Differences ... ==== //depot/projects/smpng/sys/boot/i386/libi386/biospnp.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.5 2000/08/03 09:14:01 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.6 2002/05/18 09:12:32 phk Exp $ */ /* @@ -263,7 +263,7 @@ switch(*p) { case 'w': - i = va_arg(ap, u_int16_t); + i = va_arg(ap, uint); *(u_int16_t *)argp = i; argp += sizeof(u_int16_t); break; ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#17 (text+ko) ==== @@ -38,7 +38,7 @@ * * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 * - * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.51 2002/04/13 23:09:41 jhb Exp $ + * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.52 2002/05/19 00:14:47 jhb Exp $ */ #include @@ -673,7 +673,7 @@ */ PROC_LOCK(p); - if (p->p_args && (ps_argsopen || !p_cansee(td->td_proc, p))) { + if (p->p_args && (ps_argsopen || !p_cansee(td, p))) { sbuf_bcpy(sb, p->p_args->ar_args, p->p_args->ar_length); PROC_UNLOCK(p); } else if (p != td->td_proc) { ==== //depot/projects/smpng/sys/compat/linux/linux_ipc.c#7 (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. * - * $FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.28 2001/10/28 09:28:57 mr Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.29 2002/05/18 07:53:56 marcel Exp $ */ #include @@ -358,7 +358,7 @@ bsd_args.msqid = args->msqid; bsd_args.msgp = args->msgp; bsd_args.msgsz = args->msgsz; - bsd_args.msgtyp = 0; /* XXX - args->msgtyp; */ + bsd_args.msgtyp = args->msgtyp; bsd_args.msgflg = args->msgflg; return msgrcv(td, &bsd_args); } ==== //depot/projects/smpng/sys/conf/NOTES#10 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1031 2002/05/16 21:23:39 trhodes Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1032 2002/05/19 00:11:07 rwatson Exp $ # # @@ -592,9 +592,6 @@ # options NODEVFS #disable devices filesystem # The xFS_ROOT options REQUIRE the associated ``options xFS'' options NFS_ROOT #NFS usable as root device -# This code enables IFS, an FFS which exports inodes as the namespace. -# You can find details in src/sys/ufs/ifs/README . -options IFS # Soft updates is a technique for improving filesystem speed and # making abrupt shutdown less risky. ==== //depot/projects/smpng/sys/conf/files#39 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.634 2002/05/16 21:23:39 trhodes Exp $ +# $FreeBSD: src/sys/conf/files,v 1.635 2002/05/19 00:11:07 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1299,49 +1299,25 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard ufs/ffs/ffs_alloc.c optional ffs -ufs/ffs/ffs_alloc.c optional ifs ufs/ffs/ffs_balloc.c optional ffs -ufs/ffs/ffs_balloc.c optional ifs ufs/ffs/ffs_inode.c optional ffs -ufs/ffs/ffs_inode.c optional ifs ufs/ffs/ffs_snapshot.c optional ffs -ufs/ffs/ffs_snapshot.c optional ifs ufs/ffs/ffs_softdep.c optional softupdates ffs -ufs/ffs/ffs_softdep.c optional softupdates ifs ufs/ffs/ffs_softdep_stub.c optional ffs -ufs/ffs/ffs_softdep_stub.c optional ifs ufs/ffs/ffs_subr.c optional ffs -ufs/ffs/ffs_subr.c optional ifs ufs/ffs/ffs_tables.c optional ffs -ufs/ffs/ffs_tables.c optional ifs ufs/ffs/ffs_vfsops.c optional ffs -ufs/ffs/ffs_vfsops.c optional ifs ufs/ffs/ffs_vnops.c optional ffs -ufs/ffs/ffs_vnops.c optional ifs ufs/ufs/ufs_acl.c optional ffs -ufs/ufs/ufs_acl.c optional ifs ufs/ufs/ufs_bmap.c optional ffs -ufs/ufs/ufs_bmap.c optional ifs ufs/ufs/ufs_dirhash.c optional ffs -ufs/ufs/ufs_dirhash.c optional ifs ufs/ufs/ufs_extattr.c optional ffs -ufs/ufs/ufs_extattr.c optional ifs ufs/ufs/ufs_ihash.c optional ffs -ufs/ufs/ufs_ihash.c optional ifs ufs/ufs/ufs_inode.c optional ffs -ufs/ufs/ufs_inode.c optional ifs ufs/ufs/ufs_lookup.c optional ffs -ufs/ufs/ufs_lookup.c optional ifs ufs/ufs/ufs_quota.c optional ffs -ufs/ufs/ufs_quota.c optional ifs ufs/ufs/ufs_vfsops.c optional ffs -ufs/ufs/ufs_vfsops.c optional ifs ufs/ufs/ufs_vnops.c optional ffs -ufs/ufs/ufs_vnops.c optional ifs -ufs/ifs/ifs_lookup.c optional ifs -ufs/ifs/ifs_vfsops.c optional ifs -ufs/ifs/ifs_vnops.c optional ifs -ufs/ifs/ifs_subr.c optional ifs vm/default_pager.c standard vm/device_pager.c standard vm/phys_pager.c standard ==== //depot/projects/smpng/sys/conf/options#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.316 2002/05/16 21:23:40 trhodes Exp $ +# $FreeBSD: src/sys/conf/options,v 1.317 2002/05/19 00:11:07 rwatson Exp $ # # On the handling of kernel options # @@ -134,7 +134,6 @@ # Broken - ffs_snapshot() dependency from ufs_lookup() :-( FFS opt_ffs_broken_fixme.h -IFS opt_ffs_broken_fixme.h # These static filesystems has one slightly bogus static dependency in # sys/i386/i386/autoconf.c. If any of these filesystems are ==== //depot/projects/smpng/sys/fs/procfs/procfs.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95 * - * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.4 2002/02/18 21:41:11 des Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.5 2002/05/19 00:14:47 jhb Exp $ */ #include @@ -107,6 +107,7 @@ vap->va_mode = 0600; /* p is locked by caller */ + PROC_LOCK_ASSERT(p, MA_OWNED); vap->va_uid = p->p_ucred->cr_uid; vap->va_gid = p->p_ucred->cr_gid; @@ -130,8 +131,9 @@ int procfs_candebug(PFS_VIS_ARGS) { + PROC_LOCK_ASSERT(p, MA_OWNED); return ((p->p_flag & P_SYSTEM) == 0 && - p_candebug(td->td_proc, p) == 0); + p_candebug(td, p) == 0); } /* ==== //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#11 (text+ko) ==== @@ -38,7 +38,7 @@ * * From: * $Id: procfs_ctl.c,v 3.2 1993/12/15 09:40:17 jsp Exp $ - * $FreeBSD: src/sys/fs/procfs/procfs_ctl.c,v 1.39 2002/04/13 23:19:13 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_ctl.c,v 1.40 2002/05/19 00:14:47 jhb Exp $ */ #include @@ -122,7 +122,7 @@ if (op == PROCFS_CTL_ATTACH) { sx_xlock(&proctree_lock); PROC_LOCK(p); - if ((error = p_candebug(td->td_proc, p)) != 0) + if ((error = p_candebug(td, p)) != 0) goto out; if (p->p_flag & P_TRACED) { error = EBUSY; @@ -165,7 +165,7 @@ */ PROC_LOCK(p); if (op != PROCFS_CTL_DETACH && - ((error = p_candebug(td->td_proc, p)))) { + ((error = p_candebug(td, p)))) { PROC_UNLOCK(p); return (error); } ==== //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#9 (text+ko) ==== @@ -44,7 +44,7 @@ * * From: * $Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $ - * $FreeBSD: src/sys/fs/procfs/procfs_dbregs.c,v 1.19 2002/04/13 23:14:08 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_dbregs.c,v 1.20 2002/05/19 00:14:47 jhb Exp $ */ #include @@ -69,7 +69,7 @@ int kl; PROC_LOCK(p); - if (p_candebug(td->td_proc, p) != 0) { + if (p_candebug(td, p) != 0) { PROC_UNLOCK(p); return (EPERM); } ==== //depot/projects/smpng/sys/fs/procfs/procfs_fpregs.c#9 (text+ko) ==== @@ -38,7 +38,7 @@ * * From: * $Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $ - * $FreeBSD: src/sys/fs/procfs/procfs_fpregs.c,v 1.25 2002/04/13 23:14:08 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_fpregs.c,v 1.26 2002/05/19 00:14:47 jhb Exp $ */ #include @@ -63,7 +63,7 @@ int kl; PROC_LOCK(p); - if (p_candebug(td->td_proc, p)) { + if (p_candebug(td, p)) { PROC_UNLOCK(p); return (EPERM); } ==== //depot/projects/smpng/sys/fs/procfs/procfs_mem.c#8 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)procfs_mem.c 8.5 (Berkeley) 6/15/94 * - * $FreeBSD: src/sys/fs/procfs/procfs_mem.c,v 1.57 2002/04/21 15:35:54 bde Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_mem.c,v 1.58 2002/05/19 00:14:47 jhb Exp $ */ #include @@ -66,7 +66,7 @@ return (0); PROC_LOCK(p); - error = p_candebug(td->td_proc, p); + error = p_candebug(td, p); PROC_UNLOCK(p); if (error == 0) error = proc_rwmem(p, uio); ==== //depot/projects/smpng/sys/fs/procfs/procfs_regs.c#9 (text+ko) ==== @@ -38,7 +38,7 @@ * * From: * $Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $ - * $FreeBSD: src/sys/fs/procfs/procfs_regs.c,v 1.24 2002/04/13 23:14:08 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_regs.c,v 1.25 2002/05/19 00:14:47 jhb Exp $ */ #include @@ -63,7 +63,7 @@ int kl; PROC_LOCK(p); - if (p_candebug(td->td_proc, p)) { + if (p_candebug(td, p)) { PROC_UNLOCK(p); return (EPERM); } ==== //depot/projects/smpng/sys/fs/procfs/procfs_status.c#12 (text+ko) ==== @@ -38,7 +38,7 @@ * * From: * $Id: procfs_status.c,v 3.1 1993/12/15 09:40:17 jsp Exp $ - * $FreeBSD: src/sys/fs/procfs/procfs_status.c,v 1.43 2002/04/13 23:09:41 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_status.c,v 1.44 2002/05/19 00:14:47 jhb Exp $ */ #include @@ -182,7 +182,7 @@ */ PROC_LOCK(p); - if (p->p_args && (ps_argsopen || !p_cansee(td->td_proc, p))) { + if (p->p_args && (ps_argsopen || !p_cansee(td, p))) { sbuf_bcpy(sb, p->p_args->ar_args, p->p_args->ar_length); PROC_UNLOCK(p); return (0); ==== //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#16 (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. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.26 2002/05/03 14:58:25 des Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.27 2002/05/19 00:14:48 jhb Exp $ */ #include @@ -86,7 +86,7 @@ if (pid != NO_PID) { if ((proc = pfind(pid)) == NULL) PFS_RETURN (0); - if (p_cansee(td->td_proc, proc) != 0 || + if (p_cansee(td, proc) != 0 || (pn->pn_vis != NULL && !(pn->pn_vis)(td, proc, pn))) r = 0; /* ==== //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 - * $FreeBSD: src/sys/fs/specfs/spec_vnops.c,v 1.169 2002/04/16 17:11:33 jhb Exp $ + * $FreeBSD: src/sys/fs/specfs/spec_vnops.c,v 1.170 2002/05/18 09:32:56 phk Exp $ */ #include @@ -686,18 +686,6 @@ * VOP_STRATEGY. XXX */ offset = IDX_TO_OFF(ap->a_m[0]->pindex) + ap->a_offset; - -#define DADDR_T_BIT (sizeof(daddr_t)*8) -#define OFFSET_MAX ((1LL << (DADDR_T_BIT + DEV_BSHIFT)) - 1) - - if (offset < 0 || offset > OFFSET_MAX) { - /* XXX still no %q in kernel. */ - printf("spec_getpages: preposterous offset 0x%x%08x\n", - (u_int)((u_quad_t)offset >> 32), - (u_int)(offset & 0xffffffff)); - return (VM_PAGER_ERROR); - } - blkno = btodb(offset); /* ==== //depot/projects/smpng/sys/gnu/ext2fs/ext2_alloc.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.8 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_alloc.c,v 1.35 2002/05/16 19:43:28 iedowse Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_alloc.c,v 1.37 2002/05/18 21:33:07 iedowse Exp $ */ #include @@ -96,13 +96,13 @@ int ext2_alloc(ip, lbn, bpref, size, cred, bnp) struct inode *ip; - daddr_t lbn, bpref; + int32_t lbn, bpref; int size; struct ucred *cred; - daddr_t *bnp; + int32_t *bnp; { struct ext2_sb_info *fs; - daddr_t bno; + int32_t bno; *bnp = 0; fs = ip->i_e2fs; @@ -150,11 +150,11 @@ &ip->i_prealloc_count, &ip->i_prealloc_block); else - bno = (daddr_t)ext2_new_block(ITOV(ip)->v_mount, + bno = (int32_t)ext2_new_block(ITOV(ip)->v_mount, bpref, 0, 0); } #else - bno = (daddr_t)ext2_new_block(ITOV(ip)->v_mount, bpref, 0, 0); + bno = (int32_t)ext2_new_block(ITOV(ip)->v_mount, bpref, 0, 0); #endif if (bno > 0) { @@ -212,9 +212,9 @@ struct inode *ip; struct vnode *vp; struct buf *sbp, *ebp; - daddr_t *bap, *sbap, *ebap; + int32_t *bap, *sbap, *ebap; struct cluster_save *buflist; - daddr_t start_lbn, end_lbn, soff, eoff, newblk, blkno; + int32_t start_lbn, end_lbn, soff, eoff, newblk, blkno; struct indir start_ap[NIADDR + 1], end_ap[NIADDR + 1], *idp; int i, len, start_lvl, end_lvl, pref, ssize; @@ -257,7 +257,7 @@ brelse(sbp); return (ENOSPC); } - sbap = (daddr_t *)sbp->b_data; + sbap = (int32_t *)sbp->b_data; soff = idp->in_off; } /* @@ -277,12 +277,12 @@ ssize = len - (idp->in_off + 1); if (bread(vp, idp->in_lbn, (int)fs->s_blocksize, NOCRED, &ebp)) goto fail; - ebap = (daddr_t *)ebp->b_data; + ebap = (int32_t *)ebp->b_data; } /* * Search the block map looking for an allocation of the desired size. */ - if ((newblk = (daddr_t)ext2_hashalloc(ip, dtog(fs, pref), (long)pref, + if ((newblk = (int32_t)ext2_hashalloc(ip, dtog(fs, pref), (long)pref, len, (u_long (*)())ext2_clusteralloc)) == 0) goto fail; /* @@ -432,13 +432,13 @@ * of the above. Then, blocknr tells us the number of the block * that will hold the pointer */ -daddr_t +int32_t ext2_blkpref(ip, lbn, indx, bap, blocknr) struct inode *ip; - daddr_t lbn; + int32_t lbn; int indx; - daddr_t *bap; - daddr_t blocknr; + int32_t *bap; + int32_t blocknr; { int tmp; @@ -460,7 +460,7 @@ follow the rule that a block should be allocated near its inode */ return blocknr ? blocknr : - (daddr_t)(ip->i_block_group * + (int32_t)(ip->i_block_group * EXT2_BLOCKS_PER_GROUP(ip->i_e2fs)) + ip->i_e2fs->s_es->s_first_data_block; } @@ -473,7 +473,7 @@ void ext2_blkfree(ip, bno, size) struct inode *ip; - daddr_t bno; + int32_t bno; long size; { struct ext2_sb_info *fs; @@ -502,7 +502,7 @@ pip = VTOI(pvp); fs = pip->i_e2fs; - if ((u_int)ino >= fs->s_inodes_per_group * fs->s_groups_count) + if ((u_int)ino > fs->s_inodes_per_group * fs->s_groups_count) panic("ext2_vfree: range: dev = (%d, %d), ino = %d, fs = %s", major(pip->i_dev), minor(pip->i_dev), ino, fs->fs_fsmnt); ==== //depot/projects/smpng/sys/gnu/ext2fs/ext2_balloc.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)ffs_balloc.c 8.4 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_balloc.c,v 1.16 2002/05/16 19:43:28 iedowse Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_balloc.c,v 1.17 2002/05/18 19:12:38 iedowse Exp $ */ #include @@ -62,18 +62,18 @@ int ext2_balloc(ip, bn, size, cred, bpp, flags) struct inode *ip; - daddr_t bn; + int32_t bn; int size; struct ucred *cred; struct buf **bpp; int flags; { struct ext2_sb_info *fs; - daddr_t nb; + int32_t nb; struct buf *bp, *nbp; struct vnode *vp = ITOV(ip); struct indir indirs[NIADDR + 2]; - daddr_t newb, lbn, *bap, pref; + int32_t newb, lbn, *bap, pref; int osize, nsize, num, i, error; /* ext2_debug("ext2_balloc called (%d, %d, %d)\n", @@ -174,7 +174,7 @@ nb = ip->i_ib[indirs[0].in_off]; if (nb == 0) { #if 0 - pref = ext2_blkpref(ip, lbn, 0, (daddr_t *)0, 0); + pref = ext2_blkpref(ip, lbn, 0, (int32_t *)0, 0); #else /* see the comment by ext2_blkpref. What we do here is to pretend that it'd be good for a block holding indirect @@ -218,7 +218,7 @@ brelse(bp); return (error); } - bap = (daddr_t *)bp->b_data; + bap = (int32_t *)bp->b_data; nb = bap[indirs[i].in_off]; if (i == num) break; @@ -238,7 +238,7 @@ pref = ext2_blkpref(ip, lbn, indirs[i].in_off, bap, bp->b_lblkno); #else - pref = ext2_blkpref(ip, lbn, 0, (daddr_t *)0, 0); + pref = ext2_blkpref(ip, lbn, 0, (int32_t *)0, 0); #endif if ((error = ext2_alloc(ip, lbn, pref, (int)fs->s_blocksize, cred, &newb)) != 0) { ==== //depot/projects/smpng/sys/gnu/ext2fs/ext2_bmap.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_bmap.c,v 1.51 2002/05/14 17:14:01 iedowse Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_bmap.c,v 1.52 2002/05/18 19:12:38 iedowse Exp $ */ #include @@ -69,7 +69,7 @@ int *a_runb; } */ *ap; { - daddr_t blkno; + int32_t blkno; int error; /* @@ -104,8 +104,8 @@ int ext2_bmaparray(vp, bn, bnp, runp, runb) struct vnode *vp; - daddr_t bn; - daddr_t *bnp; + int32_t bn; + int32_t *bnp; int *runp; int *runb; { @@ -115,7 +115,7 @@ struct mount *mp; struct vnode *devvp; struct indir a[NIADDR+1], *ap; - daddr_t daddr; + int32_t daddr; long metalbn; int error, num, maxrun = 0; int *nump; @@ -148,7 +148,7 @@ if (*bnp == 0) { *bnp = -1; } else if (runp) { - daddr_t bnb = bn; + int32_t bnb = bn; for (++bn; bn < NDADDR && *runp < maxrun && is_sequential(ump, ip->i_db[bn - 1], ip->i_db[bn]); ++bn, ++*runp); @@ -205,19 +205,19 @@ } } - daddr = ((daddr_t *)bp->b_data)[ap->in_off]; + daddr = ((int32_t *)bp->b_data)[ap->in_off]; if (num == 1 && daddr && runp) { for (bn = ap->in_off + 1; bn < MNINDIR(ump) && *runp < maxrun && is_sequential(ump, - ((daddr_t *)bp->b_data)[bn - 1], - ((daddr_t *)bp->b_data)[bn]); + ((int32_t *)bp->b_data)[bn - 1], + ((int32_t *)bp->b_data)[bn]); ++bn, ++*runp); bn = ap->in_off; if (runb && bn) { for(--bn; bn >= 0 && *runb < maxrun && - is_sequential(ump, ((daddr_t *)bp->b_data)[bn], - ((daddr_t *)bp->b_data)[bn+1]); + is_sequential(ump, ((int32_t *)bp->b_data)[bn], + ((int32_t *)bp->b_data)[bn+1]); --bn, ++*runb); } } @@ -255,7 +255,7 @@ int ext2_getlbns(vp, bn, ap, nump) struct vnode *vp; - daddr_t bn; + int32_t bn; struct indir *ap; int *nump; { ==== //depot/projects/smpng/sys/gnu/ext2fs/ext2_extern.h#6 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)ffs_extern.h 8.3 (Berkeley) 4/16/94 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_extern.h,v 1.27 2002/05/16 19:07:59 iedowse Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_extern.h,v 1.29 2002/05/18 22:18:17 iedowse Exp $ */ #ifndef _SYS_GNU_EXT2FS_EXT2_EXTERN_H_ @@ -51,17 +51,17 @@ struct vnode; int ext2_alloc(struct inode *, - daddr_t, daddr_t, int, struct ucred *, daddr_t *); + int32_t, int32_t, int, struct ucred *, int32_t *); int ext2_balloc(struct inode *, - daddr_t, int, struct ucred *, struct buf **, int); + int32_t, int, struct ucred *, struct buf **, int); int ext2_blkatoff(struct vnode *, off_t, char **, struct buf **); -void ext2_blkfree(struct inode *, daddr_t, long); -daddr_t ext2_blkpref(struct inode *, daddr_t, int, daddr_t *, daddr_t); +void ext2_blkfree(struct inode *, int32_t, long); +int32_t ext2_blkpref(struct inode *, int32_t, int, int32_t *, int32_t); int ext2_bmap(struct vop_bmap_args *); -int ext2_bmaparray(struct vnode *, daddr_t, daddr_t *, int *, int *); +int ext2_bmaparray(struct vnode *, int32_t, int32_t *, int *, int *); void ext2_dirbad(struct inode *ip, doff_t offset, char *how); void ext2_ei2i(struct ext2_inode *, struct inode *); -int ext2_getlbns(struct vnode *, daddr_t, struct indir *, int *); +int ext2_getlbns(struct vnode *, int32_t, struct indir *, int *); void ext2_i2ei(struct inode *, struct ext2_inode *); int ext2_ihashget(dev_t, ino_t, int, struct vnode **); void ext2_ihashinit(void); @@ -69,10 +69,11 @@ struct vnode * ext2_ihashlookup(dev_t, ino_t); void ext2_ihashrem(struct inode *); +void ext2_ihashuninit(void); void ext2_itimes(struct vnode *vp); int ext2_reallocblks(struct vop_reallocblks_args *); int ext2_reclaim(struct vop_reclaim_args *); -void ext2_setblock(struct ext2_sb_info *, u_char *, daddr_t); +void ext2_setblock(struct ext2_sb_info *, u_char *, int32_t); int ext2_truncate(struct vnode *, off_t, int, struct ucred *, struct thread *); int ext2_update(struct vnode *, int); int ext2_valloc(struct vnode *, int, struct ucred *, struct vnode **); ==== //depot/projects/smpng/sys/gnu/ext2fs/ext2_ihash.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_ihash.c,v 1.33 2002/05/14 17:14:01 iedowse Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_ihash.c,v 1.34 2002/05/18 22:18:17 iedowse Exp $ */ #include @@ -62,11 +62,28 @@ ext2_ihashinit() { + KASSERT(ihashtbl == NULL, ("ext2_ihashinit called twice")); ihashtbl = hashinit(desiredvnodes, M_EXT2IHASH, &ihash); mtx_init(&ext2_ihash_mtx, "ext2 ihash", NULL, MTX_DEF); } /* + * Destroy the inode hash table. + */ +void +ext2_ihashuninit() +{ + struct ihashhead *hp; + + for (hp = ihashtbl; hp < &ihashtbl[ihash]; hp++) + if (!LIST_EMPTY(hp)) + panic("ext2_ihashuninit: ihash not empty"); + free(ihashtbl, M_EXT2IHASH); + ihashtbl = NULL; + mtx_destroy(&ext2_ihash_mtx); +} + +/* * Use the device/inum pair to find the incore inode, and return a pointer * to it. If it is in core, return it, even if it is locked. */ ==== //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)ffs_inode.c 8.5 (Berkeley) 12/30/93 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_inode.c,v 1.34 2002/05/16 19:43:28 iedowse Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_inode.c,v 1.35 2002/05/18 19:12:38 iedowse Exp $ */ #include @@ -58,7 +58,7 @@ #include #include -static int ext2_indirtrunc(struct inode *, daddr_t, daddr_t, daddr_t, int, +static int ext2_indirtrunc(struct inode *, int32_t, int32_t, int32_t, int, long *); /* @@ -124,10 +124,10 @@ struct thread *td; { struct vnode *ovp = vp; - daddr_t lastblock; + int32_t lastblock; struct inode *oip; - daddr_t bn, lbn, lastiblock[NIADDR], indir_lbn[NIADDR]; - daddr_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR]; + int32_t bn, lbn, lastiblock[NIADDR], indir_lbn[NIADDR]; + int32_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR]; struct ext2_sb_info *fs; struct buf *bp; int offset, size, level; @@ -360,15 +360,15 @@ static int ext2_indirtrunc(ip, lbn, dbn, lastbn, level, countp) struct inode *ip; - daddr_t lbn, lastbn; - daddr_t dbn; + int32_t lbn, lastbn; + int32_t dbn; int level; long *countp; { struct buf *bp; struct ext2_sb_info *fs = ip->i_e2fs; struct vnode *vp; - daddr_t *bap, *copy, nb, nlbn, last; + int32_t *bap, *copy, nb, nlbn, last; long blkcount, factor; int i, nblocks, blocksreleased = 0; int error = 0, allerror = 0; @@ -411,11 +411,11 @@ return (error); } - bap = (daddr_t *)bp->b_data; - MALLOC(copy, daddr_t *, fs->s_blocksize, M_TEMP, M_WAITOK); + bap = (int32_t *)bp->b_data; + MALLOC(copy, int32_t *, fs->s_blocksize, M_TEMP, M_WAITOK); bcopy((caddr_t)bap, (caddr_t)copy, (u_int)fs->s_blocksize); bzero((caddr_t)&bap[last + 1], - (u_int)(NINDIR(fs) - (last + 1)) * sizeof (daddr_t)); + (u_int)(NINDIR(fs) - (last + 1)) * sizeof (int32_t)); if (last == -1) bp->b_flags |= B_INVAL; error = bwrite(bp); @@ -433,7 +433,7 @@ continue; if (level > SINGLE) { if ((error = ext2_indirtrunc(ip, nlbn, - fsbtodb(fs, nb), (daddr_t)-1, level - 1, &blkcount)) != 0) + fsbtodb(fs, nb), (int32_t)-1, level - 1, &blkcount)) != 0) allerror = error; blocksreleased += blkcount; } ==== //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)ffs_subr.c 8.2 (Berkeley) 9/21/93 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_subr.c,v 1.24 2002/05/16 19:43:28 iedowse Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_subr.c,v 1.25 2002/05/18 19:12:38 iedowse Exp $ */ #include @@ -76,7 +76,7 @@ struct inode *ip; struct ext2_sb_info *fs; struct buf *bp; - daddr_t lbn; + int32_t lbn; int bsize, error; ip = VTOI(vp); @@ -102,7 +102,7 @@ struct inode *ip; { struct buf *ebp, *ep; - daddr_t start, last; + int32_t start, last; struct vnode *vp; ebp = &buf[nbuf]; ==== //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#15 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.94 2002/05/16 19:43:28 iedowse Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.96 2002/05/18 22:18:17 iedowse Exp $ */ #include @@ -75,6 +75,7 @@ static int ext2_sbupdate(struct ext2mount *, int); static int ext2_statfs(struct mount *, struct statfs *, struct thread *); static int ext2_sync(struct mount *, int, struct ucred *, struct thread *); +static int ext2_uninit(struct vfsconf *); static int ext2_unmount(struct mount *, int, struct thread *); static int ext2_vget(struct mount *, ino_t, int, struct vnode **); static int ext2_vptofh(struct vnode *, struct fid *); @@ -95,7 +96,7 @@ vfs_stdcheckexp, ext2_vptofh, ext2_init, - vfs_stduninit, + ext2_uninit, vfs_stdextattrctl, }; @@ -1116,7 +1117,7 @@ ufhp = (struct ufid *)fhp; fs = VFSTOEXT2(mp)->um_e2fs; if (ufhp->ufid_ino < ROOTINO || - ufhp->ufid_ino >= fs->s_groups_count * fs->s_es->s_inodes_per_group) + ufhp->ufid_ino > fs->s_groups_count * fs->s_es->s_inodes_per_group) return (ESTALE); error = VFS_VGET(mp, ufhp->ufid_ino, LK_EXCLUSIVE, &nvp); @@ -1207,12 +1208,15 @@ static int ext2_init(struct vfsconf *vfsp) { - static int done; - if (done) - return (0); - done = 1; ext2_ihashinit(); + return (0); +} +static int +ext2_uninit(struct vfsconf *vfsp) +{ + + ext2_ihashuninit(); return (0); } ==== //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#9 (text+ko) ==== @@ -43,7 +43,7 @@ * * @(#)ufs_vnops.c 8.7 (Berkeley) 2/3/94 * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/gnu/ext2fs/ext2_vnops.c,v 1.64 2002/05/16 19:43:28 iedowse Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/ext2_vnops.c,v 1.65 2002/05/18 19:12:38 iedowse Exp $ */ #include "opt_suiddir.h" @@ -1556,7 +1556,7 @@ struct buf *bp = ap->a_bp; struct vnode *vp = ap->a_vp; struct inode *ip; - daddr_t blkno; + int32_t blkno; int error; ip = VTOI(vp); ==== //depot/projects/smpng/sys/gnu/ext2fs/inode.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)inode.h 8.9 (Berkeley) 5/14/95 - * $FreeBSD: src/sys/gnu/ext2fs/inode.h,v 1.37 2002/05/14 17:14:01 iedowse Exp $ + * $FreeBSD: src/sys/gnu/ext2fs/inode.h,v 1.38 2002/05/18 19:12:38 iedowse Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 20:11:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D58E37B412; Sat, 18 May 2002 20:11:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.chesapeake.net (chesapeake.net [205.130.220.14]) by hub.freebsd.org (Postfix) with ESMTP id 09ABB37B40C; Sat, 18 May 2002 20:11:35 -0700 (PDT) Received: from localhost (jroberson@localhost) by mail.chesapeake.net (8.11.6/8.11.6) with ESMTP id g4J3BYn68453; Sat, 18 May 2002 23:11:34 -0400 (EDT) (envelope-from jroberson@chesapeake.net) Date: Sat, 18 May 2002 23:11:34 -0400 (EDT) From: Jeff Roberson To: Jonathan Mini Cc: John Baldwin , Julian Elischer , Perforce Change Reviews , Peter Wemm , Jeff Roberson Subject: Re: PERFORCE change 11120 for review In-Reply-To: <20020518124339.F25907@stylus.haikugeek.com> Message-ID: <20020518230944.I49505-100000@mail.chesapeake.net> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, 18 May 2002, Jonathan Mini wrote: > John Baldwin [jhb@FreeBSD.org] wrote : > > > > On Fri, 17 May 2002, John Baldwin wrote: > > > > > >> Yes, I think that is the problem. I think it has to do with setting > > >> up/tearing down the thread stacks. If uma could do this w/o holding > > >> the zone locks that would probably be sufficient. > > > > > > The old analogy to this problem was one of the reasons that I used > > > the thread_reap() command an allowed them to be torn down > > > at a known safe time.. > > > > The fini() call out should be a safe time, I think the locking in uma > > just needs to be adjusted to ensure it is safe. > > I think Jeff agrees as well. > > Jeff, are you reading this thread? The fini call happens w/o the zone lock being held. The init could be called w/o the zone lock being held as well if this is important. I haven't seen this whole thread though. What is the issue? And what is the desired behavior? Thanks, Jeff To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 20:21:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F96E37B400; Sat, 18 May 2002 20:21:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by hub.freebsd.org (Postfix) with ESMTP id 0813637B40F for ; Sat, 18 May 2002 20:21:21 -0700 (PDT) Received: (qmail 25644 invoked from network); 19 May 2002 03:21:15 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail14.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 19 May 2002 03:21:15 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g4J3KNF84319; Sat, 18 May 2002 23:20:24 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20020518230944.I49505-100000@mail.chesapeake.net> Date: Sat, 18 May 2002 23:20:13 -0400 (EDT) From: John Baldwin To: Jeff Roberson Subject: Re: PERFORCE change 11120 for review Cc: Jeff Roberson , Peter Wemm , Perforce Change Reviews , Julian Elischer , Jonathan Mini Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 19-May-2002 Jeff Roberson wrote: > On Sat, 18 May 2002, Jonathan Mini wrote: > >> John Baldwin [jhb@FreeBSD.org] wrote : >> >> > > On Fri, 17 May 2002, John Baldwin wrote: >> > > >> > >> Yes, I think that is the problem. I think it has to do with setting >> > >> up/tearing down the thread stacks. If uma could do this w/o holding >> > >> the zone locks that would probably be sufficient. >> > > >> > > The old analogy to this problem was one of the reasons that I used >> > > the thread_reap() command an allowed them to be torn down >> > > at a known safe time.. >> > >> > The fini() call out should be a safe time, I think the locking in uma >> > just needs to be adjusted to ensure it is safe. >> >> I think Jeff agrees as well. >> >> Jeff, are you reading this thread? > > The fini call happens w/o the zone lock being held. The init could be > called w/o the zone lock being held as well if this is important. I > haven't seen this whole thread though. What is the issue? And what is the > desired behavior? Yes, having init() called w/o it would be good since I think init() is the one that can actually block. For threads the init/fini setup and teardown thread stacks and the actual operation to do a thread stack teardown/setup can block so we need to not hold any locks when we do that. > Thanks, > Jeff -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 20:32:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 203DE37B404; Sat, 18 May 2002 20:32:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.chesapeake.net (chesapeake.net [205.130.220.14]) by hub.freebsd.org (Postfix) with ESMTP id 7BC4437B404; Sat, 18 May 2002 20:32:13 -0700 (PDT) Received: from localhost (jroberson@localhost) by mail.chesapeake.net (8.11.6/8.11.6) with ESMTP id g4J3WBR76845; Sat, 18 May 2002 23:32:11 -0400 (EDT) (envelope-from jroberson@chesapeake.net) Date: Sat, 18 May 2002 23:32:11 -0400 (EDT) From: Jeff Roberson To: John Baldwin Cc: Jeff Roberson , Peter Wemm , Perforce Change Reviews , Julian Elischer , Jonathan Mini Subject: Re: PERFORCE change 11120 for review In-Reply-To: Message-ID: <20020518233041.X49505-100000@mail.chesapeake.net> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, 18 May 2002, John Baldwin wrote: > > Yes, having init() called w/o it would be good since I think init() is > the one that can actually block. For threads the init/fini setup > and teardown thread stacks and the actual operation to do a thread stack > teardown/setup can block so we need to not hold any locks when we do > that. > Why are we blocking in init? Is this a tsleep() block or short term lock block? It may add a few lock/unlock calls to uma but that should be ok since it's on a per slab basis. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 20:37:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A406537B40B; Sat, 18 May 2002 20:37:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail16.speakeasy.net [216.254.0.216]) by hub.freebsd.org (Postfix) with ESMTP id 67E6437B40D for ; Sat, 18 May 2002 20:37:18 -0700 (PDT) Received: (qmail 29072 invoked from network); 19 May 2002 03:37:17 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail16.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 19 May 2002 03:37:17 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g4J3bDF84402; Sat, 18 May 2002 23:37:13 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20020518233041.X49505-100000@mail.chesapeake.net> Date: Sat, 18 May 2002 23:37:03 -0400 (EDT) From: John Baldwin To: Jeff Roberson Subject: Re: PERFORCE change 11120 for review Cc: Jonathan Mini , Julian Elischer , Perforce Change Reviews , Peter Wemm , Jeff Roberson Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 19-May-2002 Jeff Roberson wrote: > On Sat, 18 May 2002, John Baldwin wrote: > >> >> Yes, having init() called w/o it would be good since I think init() is >> the one that can actually block. For threads the init/fini setup >> and teardown thread stacks and the actual operation to do a thread stack >> teardown/setup can block so we need to not hold any locks when we do >> that. >> > > Why are we blocking in init? Is this a tsleep() block or short term lock > block? It may add a few lock/unlock calls to uma but that should be ok > since it's on a per slab basis. We are allocating a thread stack to attach to the thread structures (IIRC). Jonathan would know the details better. Perhaps we need a slightly different paradigm where we use a zone of thread stacks the init and fini of thread structures use, but I'm not sure. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 20:58:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D06D137B407; Sat, 18 May 2002 20:58:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id C1F3437B40A; Sat, 18 May 2002 20:58:32 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 406E2A900; Sat, 18 May 2002 20:57:49 -0700 (PDT) Date: Sat, 18 May 2002 20:57:49 -0700 From: Jonathan Mini To: John Baldwin Cc: Jeff Roberson , Julian Elischer , Perforce Change Reviews , Peter Wemm , Jeff Roberson Subject: Re: PERFORCE change 11120 for review Message-ID: <20020518205749.G25907@stylus.haikugeek.com> References: <20020518233041.X49505-100000@mail.chesapeake.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from jhb@FreeBSD.org on Sat, May 18, 2002 at 11:37:03PM -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin [jhb@FreeBSD.org] wrote : > On 19-May-2002 Jeff Roberson wrote: > > On Sat, 18 May 2002, John Baldwin wrote: > > > >> > >> Yes, having init() called w/o it would be good since I think init() is > >> the one that can actually block. For threads the init/fini setup > >> and teardown thread stacks and the actual operation to do a thread stack > >> teardown/setup can block so we need to not hold any locks when we do > >> that. > >> > > > > Why are we blocking in init? Is this a tsleep() block or short term lock > > block? It may add a few lock/unlock calls to uma but that should be ok > > since it's on a per slab basis. > > We are allocating a thread stack to attach to the thread structures (IIRC). > Jonathan would know the details better. That is correct. We must allocate a kernel stack for the thread as well as map the pages in and wire them down. The pages are unwired when the process is swapped, IIRC. > Perhaps we need a slightly different paradigm where we use a zone of > thread stacks the init and fini of thread structures use, but I'm not > sure. Such a solition had not occured to me. However, this only makes the problem more rare. The vm_object would still be created and mapped within a thread_init(), and freed in a thread_fini(). The only thing that would change is that we'd go through the UMA code again before it happens. -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 21: 0:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BF2237B405; Sat, 18 May 2002 21:00:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id 766E437B403; Sat, 18 May 2002 21:00:08 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 25C08A900; Sat, 18 May 2002 20:59:25 -0700 (PDT) Date: Sat, 18 May 2002 20:59:25 -0700 From: Jonathan Mini To: Jeff Roberson Cc: John Baldwin , Julian Elischer , Perforce Change Reviews , Peter Wemm , Jeff Roberson Subject: Re: PERFORCE change 11120 for review Message-ID: <20020518205925.H25907@stylus.haikugeek.com> References: <20020518124339.F25907@stylus.haikugeek.com> <20020518230944.I49505-100000@mail.chesapeake.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <20020518230944.I49505-100000@mail.chesapeake.net>; from jroberson@chesapeake.net on Sat, May 18, 2002 at 11:11:34PM -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jeff Roberson [jroberson@chesapeake.net] wrote : > The fini call happens w/o the zone lock being held. In that case, we haven't any problems with the fini call, except that it might be called from the page daemon. Is that a problem? -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 21: 3:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3A9337B41D; Sat, 18 May 2002 21:03:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.chesapeake.net (chesapeake.net [205.130.220.14]) by hub.freebsd.org (Postfix) with ESMTP id A35A637B407; Sat, 18 May 2002 21:03:22 -0700 (PDT) Received: from localhost (jroberson@localhost) by mail.chesapeake.net (8.11.6/8.11.6) with ESMTP id g4J43LF90917; Sun, 19 May 2002 00:03:21 -0400 (EDT) (envelope-from jroberson@chesapeake.net) Date: Sun, 19 May 2002 00:03:21 -0400 (EDT) From: Jeff Roberson To: Jonathan Mini Cc: John Baldwin , Julian Elischer , Perforce Change Reviews , Peter Wemm , Jeff Roberson Subject: Re: PERFORCE change 11120 for review In-Reply-To: <20020518205925.H25907@stylus.haikugeek.com> Message-ID: <20020519000301.K49505-100000@mail.chesapeake.net> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, 18 May 2002, Jonathan Mini wrote: > Jeff Roberson [jroberson@chesapeake.net] wrote : > > > The fini call happens w/o the zone lock being held. > > In that case, we haven't any problems with the fini call, except that it > might be called from the page daemon. Is that a problem? > In all likelyhood it will *only* be called from the page daemon. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 21:27:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 110F337B40E; Sat, 18 May 2002 21:25:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AF1F937B40D for ; Sat, 18 May 2002 21:25:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4J4Pct27716 for perforce@freebsd.org; Sat, 18 May 2002 21:25:38 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 18 May 2002 21:25:38 -0700 (PDT) Message-Id: <200205190425.g4J4Pct27716@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11512 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11512 Change 11512 by peter@peter_daintree on 2002/05/18 21:24:43 IFC @11510 (I'm doing this to resync the labels etc) Affected files ... ... //depot/projects/kse/bin/ps/fmt.c#4 integrate ... //depot/projects/kse/bin/ps/ps.1#7 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/nm.h#2 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/version.c#2 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/i386/version.c#2 integrate ... //depot/projects/kse/lib/libkvm/kvm_powerpc.c#1 branch ... //depot/projects/kse/sys/alpha/alpha/clock.c#5 integrate ... //depot/projects/kse/sys/alpha/alpha/dump_machdep.c#1 branch ... //depot/projects/kse/sys/alpha/alpha/mp_machdep.c#15 integrate ... //depot/projects/kse/sys/alpha/alpha/trap.c#22 integrate ... //depot/projects/kse/sys/alpha/include/ansi.h#10 integrate ... //depot/projects/kse/sys/alpha/include/atomic.h#2 integrate ... //depot/projects/kse/sys/alpha/include/param.h#6 integrate ... //depot/projects/kse/sys/alpha/include/stdarg.h#2 integrate ... //depot/projects/kse/sys/alpha/include/varargs.h#2 integrate ... //depot/projects/kse/sys/alpha/pci/irongate_pci.c#3 integrate ... //depot/projects/kse/sys/arm/include/ansi.h#7 integrate ... //depot/projects/kse/sys/arm/include/param.h#2 integrate ... //depot/projects/kse/sys/boot/Makefile#5 integrate ... //depot/projects/kse/sys/boot/alpha/boot1/Makefile#2 integrate ... //depot/projects/kse/sys/boot/alpha/boot1/sys.c#4 integrate ... //depot/projects/kse/sys/boot/alpha/cdboot/Makefile#3 integrate ... //depot/projects/kse/sys/boot/alpha/libalpha/Makefile#3 integrate ... //depot/projects/kse/sys/boot/alpha/loader/Makefile#2 integrate ... //depot/projects/kse/sys/boot/alpha/netboot/Makefile#2 integrate ... //depot/projects/kse/sys/boot/arc/lib/Makefile#3 integrate ... //depot/projects/kse/sys/boot/arc/loader/Makefile#2 integrate ... //depot/projects/kse/sys/boot/common/load_elf.c#4 integrate ... //depot/projects/kse/sys/boot/efi/include/efi.h#3 integrate ... //depot/projects/kse/sys/boot/efi/include/efi_nii.h#2 integrate ... //depot/projects/kse/sys/boot/efi/include/efiapi.h#4 integrate ... //depot/projects/kse/sys/boot/efi/include/eficon.h#2 integrate ... //depot/projects/kse/sys/boot/efi/include/efidebug.h#2 integrate ... //depot/projects/kse/sys/boot/efi/include/efidef.h#2 integrate ... //depot/projects/kse/sys/boot/efi/include/efidevp.h#2 integrate ... //depot/projects/kse/sys/boot/efi/include/efifpswa.h#2 integrate ... //depot/projects/kse/sys/boot/efi/include/efifs.h#2 integrate ... //depot/projects/kse/sys/boot/efi/include/efinet.h#2 integrate ... //depot/projects/kse/sys/boot/efi/include/efipart.h#2 integrate ... //depot/projects/kse/sys/boot/efi/include/efiprot.h#2 integrate ... //depot/projects/kse/sys/boot/efi/include/efipxebc.h#2 integrate ... //depot/projects/kse/sys/boot/efi/include/efiser.h#2 integrate ... //depot/projects/kse/sys/boot/efi/include/i386/efibind.h#2 integrate ... //depot/projects/kse/sys/boot/efi/include/ia64/efibind.h#3 integrate ... //depot/projects/kse/sys/boot/efi/libefi/Makefile#6 integrate ... //depot/projects/kse/sys/boot/efi/loader/Makefile#7 integrate ... //depot/projects/kse/sys/boot/ficl/Makefile#3 integrate ... //depot/projects/kse/sys/boot/ficl/alpha/sysdep.h#3 integrate ... //depot/projects/kse/sys/boot/ficl/i386/sysdep.h#3 integrate ... //depot/projects/kse/sys/boot/ficl/ia64/sysdep.h#3 integrate ... //depot/projects/kse/sys/boot/forth/loader.4th.8#3 integrate ... //depot/projects/kse/sys/boot/forth/loader.conf.5#4 integrate ... //depot/projects/kse/sys/boot/i386/Makefile#3 integrate ... //depot/projects/kse/sys/boot/i386/Makefile.inc#2 integrate ... //depot/projects/kse/sys/boot/i386/boot2/Makefile#2 integrate ... //depot/projects/kse/sys/boot/i386/boot2/boot2.c#9 integrate ... //depot/projects/kse/sys/boot/i386/btx/lib/Makefile#2 integrate ... //depot/projects/kse/sys/boot/i386/kgzldr/Makefile#3 integrate ... //depot/projects/kse/sys/boot/i386/libi386/Makefile#4 integrate ... //depot/projects/kse/sys/boot/i386/libi386/bioscd.c#3 integrate ... //depot/projects/kse/sys/boot/i386/libi386/biospnp.c#2 integrate ... //depot/projects/kse/sys/boot/i386/loader/Makefile#8 integrate ... //depot/projects/kse/sys/boot/ia64/libski/Makefile#5 integrate ... //depot/projects/kse/sys/boot/ia64/skiload/Makefile#5 integrate ... //depot/projects/kse/sys/boot/ofw/libofw/Makefile#4 integrate ... //depot/projects/kse/sys/boot/ofw/libofw/devicename.c#3 integrate ... //depot/projects/kse/sys/boot/ofw/libofw/libofw.h#3 integrate ... //depot/projects/kse/sys/boot/ofw/libofw/ofw_disk.c#4 integrate ... //depot/projects/kse/sys/boot/pc98/Makefile.inc#2 integrate ... //depot/projects/kse/sys/boot/pc98/boot2/Makefile#3 integrate ... //depot/projects/kse/sys/boot/pc98/boot2/asm.h#2 integrate ... //depot/projects/kse/sys/boot/pc98/boot2/boot.h#2 integrate ... //depot/projects/kse/sys/boot/pc98/boot2/disk.c#2 integrate ... //depot/projects/kse/sys/boot/pc98/boot2/io.c#2 integrate ... //depot/projects/kse/sys/boot/pc98/boot2/start.S#2 integrate ... //depot/projects/kse/sys/boot/pc98/btx/lib/Makefile#2 integrate ... //depot/projects/kse/sys/boot/pc98/kgzldr/Makefile#3 integrate ... //depot/projects/kse/sys/boot/pc98/libpc98/Makefile#4 integrate ... //depot/projects/kse/sys/boot/pc98/loader/Makefile#6 integrate ... //depot/projects/kse/sys/boot/powerpc/loader/Makefile#4 integrate ... //depot/projects/kse/sys/boot/sparc64/boot1/Makefile#4 integrate ... //depot/projects/kse/sys/boot/sparc64/boot1/boot1.c#3 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/Makefile#6 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/main.c#6 integrate ... //depot/projects/kse/sys/coda/README#2 integrate ... //depot/projects/kse/sys/coda/cnode.h#2 integrate ... //depot/projects/kse/sys/coda/coda_io.h#2 integrate ... //depot/projects/kse/sys/coda/coda_namecache.c#3 integrate ... //depot/projects/kse/sys/coda/coda_namecache.h#2 integrate ... //depot/projects/kse/sys/coda/coda_pioctl.h#2 integrate ... //depot/projects/kse/sys/coda/coda_psdev.c#9 integrate ... //depot/projects/kse/sys/coda/coda_subr.c#5 integrate ... //depot/projects/kse/sys/coda/coda_vfsops.c#9 integrate ... //depot/projects/kse/sys/coda/coda_vnops.c#9 integrate ... //depot/projects/kse/sys/coda/coda_vnops.h#6 integrate ... //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#16 integrate ... //depot/projects/kse/sys/compat/linux/linux_ipc.c#8 integrate ... //depot/projects/kse/sys/compat/linux/linux_mib.c#7 integrate ... //depot/projects/kse/sys/conf/Makefile.ia64#15 integrate ... //depot/projects/kse/sys/conf/NOTES#4 integrate ... //depot/projects/kse/sys/conf/files#32 integrate ... //depot/projects/kse/sys/conf/files.alpha#14 integrate ... //depot/projects/kse/sys/conf/files.i386#21 integrate ... //depot/projects/kse/sys/conf/files.ia64#13 integrate ... //depot/projects/kse/sys/conf/files.powerpc#6 integrate ... //depot/projects/kse/sys/conf/kern.post.mk#9 integrate ... //depot/projects/kse/sys/conf/kern.pre.mk#11 integrate ... //depot/projects/kse/sys/conf/kmod.mk#10 integrate ... //depot/projects/kse/sys/conf/options#15 integrate ... //depot/projects/kse/sys/conf/options.alpha#7 integrate ... //depot/projects/kse/sys/conf/options.i386#17 integrate ... //depot/projects/kse/sys/conf/options.pc98#16 integrate ... //depot/projects/kse/sys/ddb/db_elf.c#1 branch ... //depot/projects/kse/sys/ddb/db_kld.c#2 integrate ... //depot/projects/kse/sys/dev/aac/aac_pci.c#14 integrate ... //depot/projects/kse/sys/dev/aac/aacreg.h#9 integrate ... //depot/projects/kse/sys/dev/acpica/acpi.c#22 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/Makefile#4 integrate ... //depot/projects/kse/sys/dev/ar/if_ar.c#3 integrate ... //depot/projects/kse/sys/dev/asr/asr.c#9 integrate ... //depot/projects/kse/sys/dev/asr/dptalign.h#3 integrate ... //depot/projects/kse/sys/dev/asr/dptsig.h#4 integrate ... //depot/projects/kse/sys/dev/asr/i2oadptr.h#3 integrate ... //depot/projects/kse/sys/dev/asr/i2obscsi.h#3 integrate ... //depot/projects/kse/sys/dev/asr/i2odep.h#3 integrate ... //depot/projects/kse/sys/dev/asr/i2odpt.h#3 integrate ... //depot/projects/kse/sys/dev/asr/i2oexec.h#3 integrate ... //depot/projects/kse/sys/dev/asr/i2omsg.h#4 integrate ... //depot/projects/kse/sys/dev/asr/i2otypes.h#3 integrate ... //depot/projects/kse/sys/dev/asr/i2outil.h#3 integrate ... //depot/projects/kse/sys/dev/asr/osd_defs.h#4 integrate ... //depot/projects/kse/sys/dev/asr/osd_unix.h#4 integrate ... //depot/projects/kse/sys/dev/asr/osd_util.h#4 integrate ... //depot/projects/kse/sys/dev/asr/sys_info.h#4 integrate ... //depot/projects/kse/sys/dev/bktr/CHANGELOG.TXT#2 integrate ... //depot/projects/kse/sys/dev/bktr/bktr_card.h#2 integrate ... //depot/projects/kse/sys/dev/ccd/ccd.c#12 integrate ... //depot/projects/kse/sys/dev/drm/drm_drv.h#2 integrate ... //depot/projects/kse/sys/dev/drm/drm_os_freebsd.h#2 integrate ... //depot/projects/kse/sys/dev/ichsmb/ichsmb_pci.c#2 integrate ... //depot/projects/kse/sys/dev/iir/iir.c#3 integrate ... //depot/projects/kse/sys/dev/mii/acphy.c#5 integrate ... //depot/projects/kse/sys/dev/mii/amphy.c#5 integrate ... //depot/projects/kse/sys/dev/mii/brgphy.c#6 integrate ... //depot/projects/kse/sys/dev/mii/dcphy.c#5 integrate ... //depot/projects/kse/sys/dev/mii/e1000phy.c#4 integrate ... //depot/projects/kse/sys/dev/mii/lxtphy.c#5 integrate ... //depot/projects/kse/sys/dev/mii/mii_physubr.c#5 integrate ... //depot/projects/kse/sys/dev/mii/miivar.h#5 integrate ... //depot/projects/kse/sys/dev/mii/mlphy.c#5 integrate ... //depot/projects/kse/sys/dev/mii/nsgphy.c#5 integrate ... //depot/projects/kse/sys/dev/mii/nsphy.c#5 integrate ... //depot/projects/kse/sys/dev/mii/qsphy.c#5 integrate ... //depot/projects/kse/sys/dev/mii/rlphy.c#7 integrate ... //depot/projects/kse/sys/dev/mii/tdkphy.c#6 integrate ... //depot/projects/kse/sys/dev/mii/tlphy.c#5 integrate ... //depot/projects/kse/sys/dev/mii/xmphy.c#5 integrate ... //depot/projects/kse/sys/dev/nge/if_nge.c#9 integrate ... //depot/projects/kse/sys/dev/sio/sio_isa.c#8 integrate ... //depot/projects/kse/sys/dev/sound/pci/ich.c#14 integrate ... //depot/projects/kse/sys/dev/syscons/syscons.c#14 integrate ... //depot/projects/kse/sys/dev/usb/ufm.c#2 integrate ... //depot/projects/kse/sys/dev/usb/ugen.c#11 integrate ... //depot/projects/kse/sys/dev/usb/ulpt.c#10 integrate ... //depot/projects/kse/sys/dev/usb/urio.c#10 integrate ... //depot/projects/kse/sys/dev/usb/usb.c#15 integrate ... //depot/projects/kse/sys/dev/usb/usb_port.h#10 integrate ... //depot/projects/kse/sys/dev/usb/usbdi.c#9 integrate ... //depot/projects/kse/sys/dev/usb/usbdi.h#6 integrate ... //depot/projects/kse/sys/dev/vinum/vinumhdr.h#3 integrate ... //depot/projects/kse/sys/dev/vinum/vinumio.c#6 integrate ... //depot/projects/kse/sys/dev/vinum/vinumobj.h#3 integrate ... //depot/projects/kse/sys/dev/vinum/vinumrequest.c#5 integrate ... //depot/projects/kse/sys/dev/wi/wi_hostap.c#2 integrate ... //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#12 integrate ... //depot/projects/kse/sys/fs/hpfs/hpfs_vfsops.c#10 integrate ... //depot/projects/kse/sys/fs/hpfs/hpfs_vnops.c#10 integrate ... //depot/projects/kse/sys/fs/msdosfs/msdosfs_fat.c#3 integrate ... //depot/projects/kse/sys/fs/msdosfs/msdosfs_lookup.c#5 integrate ... //depot/projects/kse/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate ... //depot/projects/kse/sys/fs/msdosfs/msdosfsmount.h#4 integrate ... //depot/projects/kse/sys/fs/ntfs/ntfs_vfsops.c#11 integrate ... //depot/projects/kse/sys/fs/ntfs/ntfs_vnops.c#8 integrate ... //depot/projects/kse/sys/fs/nullfs/null_vnops.c#6 integrate ... //depot/projects/kse/sys/fs/nwfs/nwfs_mount.h#2 integrate ... //depot/projects/kse/sys/fs/nwfs/nwfs_vfsops.c#6 integrate ... //depot/projects/kse/sys/fs/procfs/procfs.c#3 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_ctl.c#21 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_dbregs.c#14 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_fpregs.c#14 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_mem.c#7 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_regs.c#14 integrate ... //depot/projects/kse/sys/fs/procfs/procfs_status.c#14 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs_vnops.c#14 integrate ... //depot/projects/kse/sys/fs/smbfs/smbfs.h#3 integrate ... //depot/projects/kse/sys/fs/smbfs/smbfs_smb.c#4 integrate ... //depot/projects/kse/sys/fs/smbfs/smbfs_vfsops.c#9 integrate ... //depot/projects/kse/sys/fs/specfs/spec_vnops.c#13 integrate ... //depot/projects/kse/sys/fs/udf/udf_vnops.c#3 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_alloc.c#3 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_balloc.c#2 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_bmap.c#1 branch ... //depot/projects/kse/sys/gnu/ext2fs/ext2_extern.h#5 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_fs.h#4 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_ihash.c#1 branch ... //depot/projects/kse/sys/gnu/ext2fs/ext2_inode.c#5 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_inode_cnv.c#2 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_linux_balloc.c#2 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_linux_ialloc.c#2 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_lookup.c#5 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_mount.h#1 branch ... //depot/projects/kse/sys/gnu/ext2fs/ext2_readwrite.c#4 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_subr.c#3 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_vfsops.c#9 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_vnops.c#5 integrate ... //depot/projects/kse/sys/gnu/ext2fs/fs.h#4 integrate ... //depot/projects/kse/sys/gnu/ext2fs/inode.h#1 branch ... //depot/projects/kse/sys/gnu/i386/fpemul/polynomial.s#2 integrate ... //depot/projects/kse/sys/gnu/i386/fpemul/reg_div.s#2 integrate ... //depot/projects/kse/sys/gnu/i386/fpemul/reg_round.s#2 integrate ... //depot/projects/kse/sys/gnu/i386/fpemul/reg_u_add.s#2 integrate ... //depot/projects/kse/sys/gnu/i386/fpemul/reg_u_div.s#2 integrate ... //depot/projects/kse/sys/gnu/i386/fpemul/reg_u_mul.s#2 integrate ... //depot/projects/kse/sys/gnu/i386/fpemul/reg_u_sub.s#2 integrate ... //depot/projects/kse/sys/gnu/i386/fpemul/wm_sqrt.s#2 integrate ... //depot/projects/kse/sys/i386/conf/NOTES#33 integrate ... //depot/projects/kse/sys/i386/i386/bios.c#10 integrate ... //depot/projects/kse/sys/i386/i386/dump_machdep.c#1 branch ... //depot/projects/kse/sys/i386/i386/i386dump.c#3 delete ... //depot/projects/kse/sys/i386/i386/machdep.c#47 integrate ... //depot/projects/kse/sys/i386/include/ansi.h#10 integrate ... //depot/projects/kse/sys/i386/include/param.h#10 integrate ... //depot/projects/kse/sys/i386/include/stdarg.h#4 integrate ... //depot/projects/kse/sys/i386/include/varargs.h#2 integrate ... //depot/projects/kse/sys/i386/isa/ipl.s#7 integrate ... //depot/projects/kse/sys/i386/isa/wt.c#5 integrate ... //depot/projects/kse/sys/i386/isa/wtreg.h#2 integrate ... //depot/projects/kse/sys/i386/linux/linux_dummy.c#6 integrate ... //depot/projects/kse/sys/i386/linux/linux_proto.h#9 integrate ... //depot/projects/kse/sys/i386/linux/linux_ptrace.c#1 branch ... //depot/projects/kse/sys/i386/linux/linux_syscall.h#7 integrate ... //depot/projects/kse/sys/i386/linux/linux_sysent.c#7 integrate ... //depot/projects/kse/sys/i386/linux/syscalls.master#7 integrate ... //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#5 integrate ... //depot/projects/kse/sys/ia64/acpica/madt.c#5 integrate ... //depot/projects/kse/sys/ia64/conf/GENERIC#12 integrate ... //depot/projects/kse/sys/ia64/ia64/clock.c#8 integrate ... //depot/projects/kse/sys/ia64/ia64/dump_machdep.c#1 branch ... //depot/projects/kse/sys/ia64/ia64/ia64dump.c#4 delete ... //depot/projects/kse/sys/ia64/ia64/interrupt.c#11 integrate ... //depot/projects/kse/sys/ia64/ia64/mp_machdep.c#12 integrate ... //depot/projects/kse/sys/ia64/ia64/pmap.c#24 integrate ... //depot/projects/kse/sys/ia64/ia64/sal.c#7 integrate ... //depot/projects/kse/sys/ia64/ia64/swtch.s#17 integrate ... //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#18 integrate ... //depot/projects/kse/sys/ia64/include/asm.h#4 integrate ... //depot/projects/kse/sys/ia64/include/cpu.h#7 integrate ... //depot/projects/kse/sys/ia64/include/ieeefp.h#3 integrate ... //depot/projects/kse/sys/ia64/include/mca.h#2 integrate ... //depot/projects/kse/sys/ia64/include/md_var.h#8 integrate ... //depot/projects/kse/sys/ia64/include/param.h#6 integrate ... //depot/projects/kse/sys/ia64/include/pcb.h#4 integrate ... //depot/projects/kse/sys/ia64/include/reg.h#6 integrate ... //depot/projects/kse/sys/ia64/include/smp.h#5 integrate ... //depot/projects/kse/sys/ia64/include/stdarg.h#3 integrate ... //depot/projects/kse/sys/ia64/include/varargs.h#2 integrate ... //depot/projects/kse/sys/isa/fd.c#9 integrate ... //depot/projects/kse/sys/isa/fdreg.h#3 integrate ... //depot/projects/kse/sys/isofs/cd9660/cd9660_bmap.c#2 integrate ... //depot/projects/kse/sys/isofs/cd9660/cd9660_lookup.c#6 integrate ... //depot/projects/kse/sys/isofs/cd9660/cd9660_util.c#2 integrate ... //depot/projects/kse/sys/isofs/cd9660/cd9660_vfsops.c#8 integrate ... //depot/projects/kse/sys/isofs/cd9660/cd9660_vnops.c#5 integrate ... //depot/projects/kse/sys/kern/init_main.c#40 integrate ... //depot/projects/kse/sys/kern/init_sysent.c#17 integrate ... //depot/projects/kse/sys/kern/kern_acct.c#13 integrate ... //depot/projects/kse/sys/kern/kern_acl.c#14 integrate ... //depot/projects/kse/sys/kern/kern_clock.c#19 integrate ... //depot/projects/kse/sys/kern/kern_descrip.c#29 integrate ... //depot/projects/kse/sys/kern/kern_event.c#11 integrate ... //depot/projects/kse/sys/kern/kern_exit.c#48 integrate ... //depot/projects/kse/sys/kern/kern_ktrace.c#11 integrate ... //depot/projects/kse/sys/kern/kern_physio.c#2 integrate ... //depot/projects/kse/sys/kern/kern_proc.c#59 integrate ... //depot/projects/kse/sys/kern/kern_prot.c#26 integrate ... //depot/projects/kse/sys/kern/kern_resource.c#20 integrate ... //depot/projects/kse/sys/kern/kern_shutdown.c#28 integrate ... //depot/projects/kse/sys/kern/kern_sig.c#48 integrate ... //depot/projects/kse/sys/kern/kern_subr.c#12 integrate ... //depot/projects/kse/sys/kern/kern_switch.c#43 integrate ... //depot/projects/kse/sys/kern/subr_blist.c#2 integrate ... //depot/projects/kse/sys/kern/subr_diskslice.c#8 integrate ... //depot/projects/kse/sys/kern/subr_log.c#6 integrate ... //depot/projects/kse/sys/kern/subr_mbuf.c#11 integrate ... //depot/projects/kse/sys/kern/subr_witness.c#23 integrate ... //depot/projects/kse/sys/kern/sys_generic.c#24 integrate ... //depot/projects/kse/sys/kern/sys_pipe.c#12 integrate ... //depot/projects/kse/sys/kern/sys_process.c#25 integrate ... //depot/projects/kse/sys/kern/syscalls.c#17 integrate ... //depot/projects/kse/sys/kern/syscalls.master#16 integrate ... //depot/projects/kse/sys/kern/tty.c#23 integrate ... //depot/projects/kse/sys/kern/uipc_socket.c#15 integrate ... //depot/projects/kse/sys/kern/uipc_socket2.c#14 integrate ... //depot/projects/kse/sys/kern/vfs_bio.c#17 integrate ... //depot/projects/kse/sys/kern/vfs_cache.c#13 integrate ... //depot/projects/kse/sys/kern/vfs_cluster.c#7 integrate ... //depot/projects/kse/sys/kern/vfs_init.c#5 integrate ... //depot/projects/kse/sys/kern/vfs_lookup.c#8 integrate ... //depot/projects/kse/sys/kern/vfs_subr.c#31 integrate ... //depot/projects/kse/sys/kern/vfs_syscalls.c#26 integrate ... //depot/projects/kse/sys/kern/vfs_vnops.c#25 integrate ... //depot/projects/kse/sys/kern/vnode_if.src#7 integrate ... //depot/projects/kse/sys/modules/Makefile#26 integrate ... //depot/projects/kse/sys/modules/ext2fs/Makefile#3 integrate ... //depot/projects/kse/sys/modules/linux/Makefile#7 integrate ... //depot/projects/kse/sys/net/bpf.c#12 integrate ... //depot/projects/kse/sys/net/bridge.c#9 integrate ... //depot/projects/kse/sys/net/if_dl.h#4 integrate ... //depot/projects/kse/sys/net/if_ethersubr.c#13 integrate ... //depot/projects/kse/sys/net/if_iso88025subr.c#5 integrate ... //depot/projects/kse/sys/net/if_media.h#5 integrate ... //depot/projects/kse/sys/net/if_spppsubr.c#8 integrate ... //depot/projects/kse/sys/net/if_tap.c#12 integrate ... //depot/projects/kse/sys/net/if_tun.c#12 integrate ... //depot/projects/kse/sys/net/if_var.h#12 integrate ... //depot/projects/kse/sys/net/iso88025.h#3 integrate ... //depot/projects/kse/sys/net/zlib.h#3 integrate ... //depot/projects/kse/sys/netatm/atm_cm.c#5 integrate ... //depot/projects/kse/sys/netatm/atm_cm.h#4 integrate ... //depot/projects/kse/sys/netatm/atm_socket.c#4 integrate ... //depot/projects/kse/sys/netatm/atm_subr.c#8 integrate ... //depot/projects/kse/sys/netatm/atm_var.h#7 integrate ... //depot/projects/kse/sys/netgraph/ng_ether.c#7 integrate ... //depot/projects/kse/sys/netgraph/ng_pppoe.c#6 integrate ... //depot/projects/kse/sys/netgraph/ng_pppoe.h#3 integrate ... //depot/projects/kse/sys/netinet/icmp6.h#4 integrate ... //depot/projects/kse/sys/netinet/if_ether.c#11 integrate ... //depot/projects/kse/sys/netinet/igmp.c#4 integrate ... //depot/projects/kse/sys/netinet/in.h#9 integrate ... //depot/projects/kse/sys/netinet/ip_dummynet.c#6 integrate ... //depot/projects/kse/sys/netinet/ip_dummynet.h#5 integrate ... //depot/projects/kse/sys/netinet/ip_fw.c#15 integrate ... //depot/projects/kse/sys/netinet/ip_fw.h#7 integrate ... //depot/projects/kse/sys/netinet/ip_input.c#19 integrate ... //depot/projects/kse/sys/netinet/ip_output.c#21 integrate ... //depot/projects/kse/sys/netinet/tcp_syncache.c#15 integrate ... //depot/projects/kse/sys/netinet6/icmp6.c#5 integrate ... //depot/projects/kse/sys/netinet6/ipcomp_core.c#3 integrate ... //depot/projects/kse/sys/netinet6/mld6.c#2 integrate ... //depot/projects/kse/sys/netncp/ncp_lib.h#3 integrate ... //depot/projects/kse/sys/nfsclient/bootp_subr.c#8 integrate ... //depot/projects/kse/sys/nfsclient/nfs_vfsops.c#11 integrate ... //depot/projects/kse/sys/nfsserver/nfs.h#8 integrate ... //depot/projects/kse/sys/nfsserver/nfs_serv.c#12 integrate ... //depot/projects/kse/sys/pc98/i386/machdep.c#27 integrate ... //depot/projects/kse/sys/pc98/pc98/fd.c#9 integrate ... //depot/projects/kse/sys/pc98/pc98/syscons.c#11 integrate ... //depot/projects/kse/sys/pci/if_dc.c#16 integrate ... //depot/projects/kse/sys/pci/if_dcreg.h#7 integrate ... //depot/projects/kse/sys/pci/if_rl.c#9 integrate ... //depot/projects/kse/sys/pci/if_rlreg.h#5 integrate ... //depot/projects/kse/sys/pci/if_vr.c#5 integrate ... //depot/projects/kse/sys/posix4/p1003_1b.c#8 integrate ... //depot/projects/kse/sys/powerpc/include/ansi.h#10 integrate ... //depot/projects/kse/sys/powerpc/include/asm.h#3 integrate ... //depot/projects/kse/sys/powerpc/include/float.h#1 branch ... //depot/projects/kse/sys/powerpc/include/fpu.h#2 integrate ... //depot/projects/kse/sys/powerpc/include/ieeefp.h#1 branch ... //depot/projects/kse/sys/powerpc/include/param.h#4 integrate ... //depot/projects/kse/sys/powerpc/include/pcb.h#4 integrate ... //depot/projects/kse/sys/powerpc/include/pcpu.h#4 integrate ... //depot/projects/kse/sys/powerpc/include/psl.h#2 integrate ... //depot/projects/kse/sys/powerpc/include/pte.h#4 integrate ... //depot/projects/kse/sys/powerpc/include/spr.h#2 integrate ... //depot/projects/kse/sys/powerpc/include/stdarg.h#3 integrate ... //depot/projects/kse/sys/powerpc/include/trap.h#3 integrate ... //depot/projects/kse/sys/powerpc/include/varargs.h#2 integrate ... //depot/projects/kse/sys/powerpc/powerpc/copyinout.c#3 integrate ... //depot/projects/kse/sys/powerpc/powerpc/fpu.c#1 branch ... //depot/projects/kse/sys/powerpc/powerpc/machdep.c#18 integrate ... //depot/projects/kse/sys/powerpc/powerpc/pmap.c#15 integrate ... //depot/projects/kse/sys/powerpc/powerpc/sigcode.S#2 integrate ... //depot/projects/kse/sys/powerpc/powerpc/swtch.s#12 integrate ... //depot/projects/kse/sys/powerpc/powerpc/trap.c#12 integrate ... //depot/projects/kse/sys/powerpc/powerpc/trap_subr.S#2 integrate ... //depot/projects/kse/sys/security/lomac/kernel_lkm.c#3 integrate ... //depot/projects/kse/sys/security/lomac/kernel_util.c#7 integrate ... //depot/projects/kse/sys/security/lomac/lomacfs_vnops.c#5 integrate ... //depot/projects/kse/sys/sparc64/conf/GENERIC#11 integrate ... //depot/projects/kse/sys/sparc64/include/ansi.h#11 integrate ... //depot/projects/kse/sys/sparc64/include/endian.h#8 integrate ... //depot/projects/kse/sys/sparc64/include/instr.h#4 integrate ... //depot/projects/kse/sys/sparc64/include/param.h#11 integrate ... //depot/projects/kse/sys/sparc64/include/proc.h#11 integrate ... //depot/projects/kse/sys/sparc64/include/reg.h#11 integrate ... //depot/projects/kse/sys/sparc64/include/stdarg.h#2 integrate ... //depot/projects/kse/sys/sparc64/include/varargs.h#2 integrate ... //depot/projects/kse/sys/sparc64/sparc64/dump_machdep.c#1 branch ... //depot/projects/kse/sys/sparc64/sparc64/exception.s#21 integrate ... //depot/projects/kse/sys/sparc64/sparc64/trap.c#26 integrate ... //depot/projects/kse/sys/sys/acl.h#6 integrate ... //depot/projects/kse/sys/sys/bio.h#6 integrate ... //depot/projects/kse/sys/sys/blist.h#2 integrate ... //depot/projects/kse/sys/sys/buf.h#14 integrate ... //depot/projects/kse/sys/sys/cdefs.h#13 integrate ... //depot/projects/kse/sys/sys/consio.h#4 integrate ... //depot/projects/kse/sys/sys/disklabel.h#10 integrate ... //depot/projects/kse/sys/sys/errno.h#6 integrate ... //depot/projects/kse/sys/sys/extattr.h#4 integrate ... //depot/projects/kse/sys/sys/filedesc.h#14 integrate ... //depot/projects/kse/sys/sys/jail.h#6 integrate ... //depot/projects/kse/sys/sys/kernel.h#10 integrate ... //depot/projects/kse/sys/sys/kerneldump.h#3 integrate ... //depot/projects/kse/sys/sys/mount.h#9 integrate ... //depot/projects/kse/sys/sys/mtio.h#3 integrate ... //depot/projects/kse/sys/sys/namei.h#8 integrate ... //depot/projects/kse/sys/sys/param.h#19 integrate ... //depot/projects/kse/sys/sys/proc.h#100 integrate ... //depot/projects/kse/sys/sys/stat.h#4 integrate ... //depot/projects/kse/sys/sys/sun_disklabel.h#1 branch ... //depot/projects/kse/sys/sys/syscall.h#17 integrate ... //depot/projects/kse/sys/sys/syscall.mk#17 integrate ... //depot/projects/kse/sys/sys/sysctl.h#9 integrate ... //depot/projects/kse/sys/sys/sysproto.h#21 integrate ... //depot/projects/kse/sys/sys/time.h#8 integrate ... //depot/projects/kse/sys/sys/types.h#14 integrate ... //depot/projects/kse/sys/sys/uio.h#7 integrate ... //depot/projects/kse/sys/sys/unpcb.h#4 integrate ... //depot/projects/kse/sys/sys/vnode.h#24 integrate ... //depot/projects/kse/sys/tools/vnode_if.awk#2 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_alloc.c#10 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_balloc.c#5 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_inode.c#9 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_snapshot.c#12 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_softdep.c#12 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_subr.c#3 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_vfsops.c#18 integrate ... //depot/projects/kse/sys/ufs/ffs/fs.h#7 integrate ... //depot/projects/kse/sys/ufs/ifs/README#2 delete ... //depot/projects/kse/sys/ufs/ifs/ifs_extern.h#4 delete ... //depot/projects/kse/sys/ufs/ifs/ifs_lookup.c#5 delete ... //depot/projects/kse/sys/ufs/ifs/ifs_subr.c#3 delete ... //depot/projects/kse/sys/ufs/ifs/ifs_vfsops.c#7 delete ... //depot/projects/kse/sys/ufs/ifs/ifs_vnops.c#4 delete ... //depot/projects/kse/sys/ufs/ufs/README.acls#3 integrate ... //depot/projects/kse/sys/ufs/ufs/README.extattr#3 integrate ... //depot/projects/kse/sys/ufs/ufs/dinode.h#3 integrate ... //depot/projects/kse/sys/ufs/ufs/extattr.h#6 integrate ... //depot/projects/kse/sys/ufs/ufs/inode.h#3 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_acl.c#9 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_bmap.c#3 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_dirhash.c#9 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_extattr.c#12 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_extern.h#5 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_inode.c#6 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_lookup.c#10 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_quota.c#9 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_readwrite.c#8 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_vfsops.c#7 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_vnops.c#13 integrate ... //depot/projects/kse/sys/ufs/ufs/ufsmount.h#5 integrate ... //depot/projects/kse/sys/vm/uma_core.c#5 integrate ... //depot/projects/kse/sys/vm/vm_fault.c#10 integrate ... //depot/projects/kse/sys/vm/vm_map.c#16 integrate ... //depot/projects/kse/sys/vm/vm_map.h#10 integrate ... //depot/projects/kse/sys/vm/vm_mmap.c#13 integrate ... //depot/projects/kse/sys/vm/vm_object.c#9 integrate ... //depot/projects/kse/sys/vm/vm_object.h#4 integrate ... //depot/projects/kse/sys/vm/vm_swap.c#8 integrate ... //depot/projects/kse/sys/vm/vnode_pager.c#13 integrate ... //depot/projects/kse/usr.bin/gcore/gcore.1#2 integrate ... //depot/projects/kse/usr.bin/gcore/gcore.c#6 integrate ... //depot/projects/kse/usr.bin/w/uptime.1#2 integrate ... //depot/projects/kse/usr.bin/w/w.1#2 integrate Differences ... ==== //depot/projects/kse/bin/ps/fmt.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.17 2002/02/03 14:43:04 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.19 2002/05/05 04:42:50 jmallett Exp $"); #if 0 #ifndef lint @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -64,7 +65,8 @@ static char * shquote(char **argv) { - static long arg_max = -1; + long arg_max; + static size_t buf_size; size_t len; char **p, *dst, *src; static char *buf = NULL; @@ -72,7 +74,10 @@ if (buf == NULL) { if ((arg_max = sysconf(_SC_ARG_MAX)) == -1) errx(1, "sysconf _SC_ARG_MAX failed"); - if ((buf = malloc((u_int)(4 * arg_max) + 1)) == NULL) + if (arg_max >= LONG_MAX / 4 || 4 * arg_max + 1 > SIZE_MAX) + errx(1, "sysconf _SC_ARG_MAX preposterously large"); + buf_size = 4 * arg_max + 1; + if ((buf = malloc(buf_size)) == NULL) errx(1, "malloc failed"); } @@ -84,12 +89,12 @@ for (p = argv; (src = *p++) != 0; ) { if (*src == 0) continue; - len = (size_t)(4 * arg_max - (dst - buf)) / 4; + len = (buf_size - 1 - (dst - buf)) / 4; strvisx(dst, src, strlen(src) < len ? strlen(src) : len, VIS_NL | VIS_CSTYLE); while (*dst) dst++; - if ((4 * arg_max - (dst - buf)) / 4 > 0) + if ((buf_size - 1 - (dst - buf)) / 4 > 0) *dst++ = ' '; } /* Chop off trailing space */ ==== //depot/projects/kse/bin/ps/ps.1#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.42 2002/02/21 18:27:16 dillon Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.46 2002/05/16 11:51:05 joe Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -54,7 +54,9 @@ .Nm .Op Fl L .Sh DESCRIPTION -.Nm Ps +The +.Nm +utility displays a header line followed by lines containing information about your processes that have controlling terminals. This information is sorted by controlling terminal, then by process @@ -71,7 +73,7 @@ controlling terminal, cpu time (including both user and system time), state, and associated command. .Pp -The process file system (see +The process filesystem (see .Xr procfs 5 ) should be mounted when .Nm @@ -82,7 +84,7 @@ .It Fl a Display information about other users' processes as well as your own. This can be disabled by setting the -.Va kern.ps_showallprocs +.Va security.bsd.see_other_uids sysctl to zero. .It Fl c Change the ``command'' column output to just contain the executable name, @@ -117,7 +119,7 @@ .Tn ID . .It Fl N Extract the name list from the specified system instead of the default -.Pa /kernel . +.Pa /boot/kernel/kernel . .It Fl O Add the information associated with the space or comma separated list of keywords specified, after the process @@ -347,7 +349,9 @@ has a parent that has not yet waited for the process (in other words, a zombie) is listed as ``'', and a process which is blocked while trying to exit is listed as ``''. -.Nm Ps +The +.Nm +utility makes an educated guess as to the file name and arguments given when the process was created by examining memory or the swap area. The method is inherently somewhat unreliable and in any event a process @@ -514,7 +518,7 @@ /dev name database .It Pa /var/db/kvm_kernel.db system namelist database -.It Pa /kernel +.It Pa /boot/kernel/kernel default system namelist .It Pa /proc the mount point of ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/nm.h#2 (text+ko) ==== @@ -23,6 +23,10 @@ extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. This routine returns true on success */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/alpha/nm.h,v 1.3 2002/04/11 20:42:13 obrien Exp $ */ + +#include + #define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) extern int get_longjmp_target PARAMS ((CORE_ADDR *)); @@ -36,7 +40,7 @@ extern CORE_ADDR alpha_u_regs_offset(); #define U_REGS_OFFSET alpha_u_regs_offset() -#define PTRACE_ARG3_TYPE char* +#define PTRACE_ARG3_TYPE caddr_t /* ptrace transfers longs, the ptrace man page is lying. */ ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/version.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ -char *version = "4.18"; +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/alpha/version.c,v 1.2 2002/05/14 18:17:59 mp Exp $ */ +char *version = "4.18 (FreeBSD)"; char *host_name = "alpha-unknown-freebsd"; char *target_name = "alpha-unknown-freebsd"; ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/i386/version.c#2 (text+ko) ==== @@ -1,3 +1,4 @@ -char *version = "4.18"; +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/i386/version.c,v 1.5 2002/05/14 18:17:59 mp Exp $ */ +char *version = "4.18 (FreeBSD)"; char *host_name = "i386-unknown-freebsd"; char *target_name = "i386-unknown-freebsd"; ==== //depot/projects/kse/sys/alpha/alpha/clock.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.29 2002/04/30 19:34:28 phk Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.30 2002/05/16 21:21:16 trhodes Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* @@ -482,7 +482,7 @@ struct timespec ts; if (base < 5*SECYR) { - printf("WARNING: preposterous time in file system"); + printf("WARNING: preposterous time in filesystem"); /* read the system clock anyway */ base = 6*SECYR + 186*SECDAY + SECDAY/2; badbase = 1; @@ -509,7 +509,7 @@ if (ct.year < 70 || ct.mon < 1 || ct.mon > 12 || ct.day < 1 || ct.day > 31 || ct.hour > 23 || ct.min > 59 || ct.sec > 59) { /* - * Believe the time in the file system for lack of + * Believe the time in the filesystem for lack of * anything better, resetting the TODR. */ s = splclock(); ==== //depot/projects/kse/sys/alpha/alpha/mp_machdep.c#15 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.38 2002/04/04 21:03:13 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.39 2002/05/08 23:12:00 mjacob Exp $ */ #include @@ -532,7 +532,7 @@ static void release_aps(void *dummy __unused) { - if (bootverbose) + if (bootverbose && mp_ncpus > 1) printf("%s: releasing secondary CPUs\n", __func__); atomic_store_rel_int(&aps_ready, 1); ==== //depot/projects/kse/sys/alpha/alpha/trap.c#22 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.92 2002/04/27 09:34:15 alc Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.93 2002/05/16 00:03:32 gallatin Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -962,6 +962,11 @@ extern int alpha_unaligned_print, alpha_unaligned_fix; extern int alpha_unaligned_sigbus; +struct unaligned_fixup_data { + const char *type; /* opcode name */ + int size; /* size, 0 if fixup not supported */ +}; + int unaligned_fixup(va, opcode, reg, td) unsigned long va, opcode, reg; @@ -973,10 +978,11 @@ struct proc *p; unsigned long *regptr, longdata, uac; int intdata; /* signed to get extension when storing */ - struct { - const char *type; /* opcode name */ - int size; /* size, 0 if fixup not supported */ - } tab[0x10] = { + u_int16_t worddata; /* unsigned to _avoid_ extension */ + const struct unaligned_fixup_data tab_0c[0x2] = { + { "ldwu", 2 }, { "stw", 2 }, + }; + const struct unaligned_fixup_data tab_20[0x10] = { #ifdef FIX_UNALIGNED_VAX_FP { "ldf", 4 }, { "ldg", 8 }, #else @@ -1016,9 +1022,12 @@ * Find out which opcode it is. Arrange to have the opcode * printed if it's an unknown opcode. */ - if (opcode >= 0x20 && opcode <= 0x2f) { - type = tab[opcode - 0x20].type; - size = tab[opcode - 0x20].size; + if (opcode >= 0x0c && opcode <= 0x0d) { + type = tab_0c[opcode - 0x0c].type; + size = tab_0c[opcode - 0x0c].size; + } else if (opcode >= 0x20 && opcode <= 0x2f) { + type = tab_20[opcode - 0x20].type; + size = tab_20[opcode - 0x20].size; } else { type = "0x%lx"; size = 0; @@ -1061,6 +1070,15 @@ signal = SIGBUS; if (dofix && size != 0) { switch (opcode) { + case 0x0c: /* ldwu */ + /* XXX ONLY WORKS ON LITTLE-ENDIAN ALPHA */ + unaligned_load_integer(worddata); + break; + + case 0x0d: /* stw */ + /* XXX ONLY WORKS ON LITTLE-ENDIAN ALPHA */ + unaligned_store_integer(worddata); + break; #ifdef FIX_UNALIGNED_VAX_FP case 0x20: /* ldf */ unaligned_load_floating(intdata, Ffloat_to_reg); ==== //depot/projects/kse/sys/alpha/include/ansi.h#10 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.27 2002/04/10 15:58:11 mike Exp $ + * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.29 2002/05/10 02:21:05 obrien Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -72,7 +72,7 @@ #define _BSD_OFF_T_ long /* file offset */ #define _BSD_PID_T_ int /* process [group] */ -#if defined(__GNUC__) && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ > 95) +#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) #define _BSD_VA_LIST_ __builtin_va_list /* internally known to gcc */ #else typedef struct { ==== //depot/projects/kse/sys/alpha/include/atomic.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.11 2001/06/22 21:13:20 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.14 2002/05/17 05:45:39 jhb Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -367,7 +367,7 @@ "3:\tbr 1b\n" /* try again */ ".previous\n" : "=&r" (ret), "=m" (*p) - : "r" (cmpval), "r" (newval), "m" (*p) + : "r" ((long)(int)cmpval), "r" (newval), "m" (*p) : "memory"); return ret; ==== //depot/projects/kse/sys/alpha/include/param.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.26 2001/09/12 22:00:06 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.28 2002/05/14 20:35:25 phk Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /* @@ -116,16 +116,6 @@ #define KERNBASE 0xfffffc0000300000LL /* start of kernel virtual */ #define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT) -#define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */ -#define DEV_BSIZE (1<> (PAGE_SHIFT - DEV_BSHIFT)) - -/* pages to bytes */ -#define ctob(x) ((x) << PAGE_SHIFT) -#define btoc(x) (((x) + PAGE_MASK) >> PAGE_SHIFT) - -/* - * btodb() is messy and perhaps slow because `bytes' may be an off_t. We - * want to shift an unsigned type to avoid sign extension and we don't - * want to widen `bytes' unnecessarily. Assume that the result fits in - * a daddr_t. - */ -#define btodb(bytes) /* calculates (bytes / DEV_BSIZE) */ \ - (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT) -#define dbtob(db) /* calculates (db * DEV_BSIZE) */ \ - ((off_t)(db) << DEV_BSHIFT) - -/* * Mach derived conversion macros */ #define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) ==== //depot/projects/kse/sys/alpha/include/stdarg.h#2 (text+ko) ==== @@ -1,7 +1,5 @@ -/* $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.2 1999/08/28 00:38:52 peter Exp $ */ -/* From: NetBSD: stdarg.h,v 1.7 1997/04/06 08:47:44 cgd Exp */ - /*- + * Copyright (c) 2002 David E. O'Brien. All rights reserved. * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * @@ -34,6 +32,8 @@ * SUCH DAMAGE. * * @(#)stdarg.h 8.1 (Berkeley) 6/10/93 + * $NetBSD: stdarg.h,v 1.7 1997/04/06 08:47:44 cgd Exp $ + * $FreeBSD: src/sys/alpha/include/stdarg.h,v 1.3 2002/05/10 01:59:29 obrien Exp $ */ #ifndef _ALPHA_STDARG_H_ @@ -41,13 +41,26 @@ #include +typedef _BSD_VA_LIST_ va_list; + +#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) + +#define va_start(ap, last) \ + __builtin_stdarg_start((ap), (last)) + +#define va_arg(ap, type) \ + __builtin_va_arg((ap), type) + +#define va_end(ap) \ + __builtin_va_end(ap) + +#else /* ! __GNUC__ post GCC 2.95 */ + #ifdef __lint__ #define __builtin_saveregs() (0) #define __builtin_classify_type(t) (0) #endif -typedef _BSD_VA_LIST_ va_list; - #define __va_size(type) \ (((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long)) @@ -65,4 +78,6 @@ #define va_end(ap) ((void)0) +#endif /* __GNUC__ post GCC 2.95 */ + #endif /* !_ALPHA_STDARG_H_ */ ==== //depot/projects/kse/sys/alpha/include/varargs.h#2 (text+ko) ==== @@ -1,7 +1,5 @@ -/* $FreeBSD: src/sys/alpha/include/varargs.h,v 1.2 1999/08/28 00:38:53 peter Exp $ */ -/* From: NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp */ - /*- + * Copyright (c) 2002 David E. O'Brien. All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * (c) UNIX System Laboratories, Inc. @@ -39,11 +37,28 @@ * SUCH DAMAGE. * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 + * $NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp $ + * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.3 2002/05/10 01:59:29 obrien Exp $ */ #ifndef _ALPHA_VARARGS_H_ #define _ALPHA_VARARGS_H_ +#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) + +#include + +typedef _BSD_VA_LIST_ va_list; +typedef int __builtin_va_alist_t __attribute__((__mode__(__word__))); + +#define va_alist __builtin_va_alist +#define va_dcl __builtin_va_alist_t __builtin_va_alist; ... +#define va_start(ap) __builtin_varargs_start(ap) +#define va_arg(ap, type) __builtin_va_arg((ap), type) +#define va_end(ap) __builtin_va_end(ap) + +#else /* ! __GNUC__ post GCC 2.95 */ + #include #if __GNUC__ == 1 @@ -59,4 +74,6 @@ #define va_start(ap) \ ((ap) = *(va_list *)__builtin_saveregs(), (ap).__pad = 0) +#endif /* __GNUC__ post GCC 2.95 */ + #endif /* !_ALPHA_VARARGS_H_ */ ==== //depot/projects/kse/sys/alpha/pci/irongate_pci.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/pci/irongate_pci.c,v 1.7 2002/02/28 18:18:41 gallatin Exp $ + * $FreeBSD: src/sys/alpha/pci/irongate_pci.c,v 1.8 2002/05/10 16:56:14 gallatin Exp $ */ #include @@ -132,7 +132,7 @@ irongate_check_abort(); \ return ~0; \ } \ - data = ##op##(va); \ + data = op(va); \ if (irongate_check_abort()) \ return ~0; \ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 22:10:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9949E37B40E; Sat, 18 May 2002 22:10:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E026437B409 for ; Sat, 18 May 2002 22:10:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4J5Af639599 for perforce@freebsd.org; Sat, 18 May 2002 22:10:41 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 18 May 2002 22:10:41 -0700 (PDT) Message-Id: <200205190510.g4J5Af639599@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11515 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11515 Change 11515 by peter@peter_ia64 on 2002/05/18 22:09:57 Wind up x86 userland space to 4GB - PAGE_SIZE. It appears that we sneak the gdt and ldt into the page after IA32_USRSTACK. There is nothing magical about the 3GB address. In fact, it is something that we would dearly love to get rid of on i386. :-) Affected files ... ... //depot/projects/ia64/sys/ia64/ia32/ia32_util.h#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia32/ia32_util.h#2 (text+ko) ==== @@ -49,7 +49,7 @@ int ps_nenvstr; /* the number of environment strings */ }; -#define IA32_USRSTACK (3L*1024*1024*1024) +#define IA32_USRSTACK (4L*1024*1024*1024 - PAGE_SIZE) #define IA32_PS_STRINGS (IA32_USRSTACK - sizeof(struct ia32_ps_strings)) static __inline caddr_t stackgap_init(void); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 22:22:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1173A37B401; Sat, 18 May 2002 22:19:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3D15937B40D for ; Sat, 18 May 2002 22:19:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4J5Jrj40369 for perforce@freebsd.org; Sat, 18 May 2002 22:19:53 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 18 May 2002 22:19:53 -0700 (PDT) Message-Id: <200205190519.g4J5Jrj40369@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11516 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11516 Change 11516 by peter@peter_daintree on 2002/05/18 22:18:56 IFC @11514 Affected files ... ... //depot/projects/ia64/MAINTAINERS#6 integrate ... //depot/projects/ia64/Makefile.inc1#26 integrate ... //depot/projects/ia64/bin/cp/cp.c#5 integrate ... //depot/projects/ia64/bin/df/df.c#6 integrate ... //depot/projects/ia64/bin/ls/extern.h#3 integrate ... //depot/projects/ia64/bin/ls/ls.1#8 integrate ... //depot/projects/ia64/bin/ls/ls.c#5 integrate ... //depot/projects/ia64/bin/ls/ls.h#4 integrate ... //depot/projects/ia64/bin/ls/print.c#5 integrate ... //depot/projects/ia64/bin/mv/mv.c#4 integrate ... //depot/projects/ia64/bin/mv/pathnames.h#2 integrate ... //depot/projects/ia64/bin/pwd/pwd.1#5 integrate ... //depot/projects/ia64/bin/pwd/pwd.c#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/cfns.h#2 integrate ... //depot/projects/ia64/etc/periodic/daily/450.status-security#4 integrate ... //depot/projects/ia64/etc/periodic/monthly/200.accounting#4 integrate ... //depot/projects/ia64/etc/periodic/security/100.chksetuid#3 integrate ... //depot/projects/ia64/etc/periodic/security/200.chkmounts#3 integrate ... //depot/projects/ia64/etc/periodic/security/500.ipfwdenied#2 integrate ... //depot/projects/ia64/etc/periodic/security/550.ipfwlimit#3 integrate ... //depot/projects/ia64/etc/periodic/security/600.ip6fwdenied#2 integrate ... //depot/projects/ia64/etc/periodic/security/650.ip6fwlimit#3 integrate ... //depot/projects/ia64/etc/periodic/security/700.kernelmsg#2 integrate ... //depot/projects/ia64/include/paths.h#5 integrate ... //depot/projects/ia64/lib/libc/sys/quotactl.2#3 integrate ... //depot/projects/ia64/release/Makefile.inc.docports#3 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 integrate ... //depot/projects/ia64/sbin/dump/pathnames.h#2 integrate ... //depot/projects/ia64/sbin/shutdown/pathnames.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/include/efi.h#4 integrate ... //depot/projects/ia64/sys/boot/efi/include/efi_nii.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/include/efiapi.h#6 integrate ... //depot/projects/ia64/sys/boot/efi/include/eficon.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/include/efidebug.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/include/efidef.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/include/efidevp.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/include/efifpswa.h#5 integrate ... //depot/projects/ia64/sys/boot/efi/include/efifs.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/include/efinet.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/include/efipart.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/include/efiprot.h#3 integrate ... //depot/projects/ia64/sys/boot/efi/include/efipxebc.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/include/efiser.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/include/i386/efibind.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/include/ia64/efibind.h#3 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/copy.c#2 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/elf_freebsd.c#4 integrate ... //depot/projects/ia64/sys/boot/i386/libi386/biospnp.c#2 integrate ... //depot/projects/ia64/sys/boot/ia64/libski/copy.c#2 integrate ... //depot/projects/ia64/sys/boot/ia64/libski/elf_freebsd.c#5 integrate ... //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#8 integrate ... //depot/projects/ia64/sys/compat/linux/linux_ipc.c#2 integrate ... //depot/projects/ia64/sys/conf/Makefile.ia64#12 integrate ... //depot/projects/ia64/sys/conf/NOTES#10 integrate ... //depot/projects/ia64/sys/conf/files#22 integrate ... //depot/projects/ia64/sys/conf/files.i386#10 integrate ... //depot/projects/ia64/sys/conf/options#14 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs.c#3 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_ctl.c#6 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_dbregs.c#5 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_fpregs.c#5 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_mem.c#5 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_regs.c#5 integrate ... //depot/projects/ia64/sys/fs/procfs/procfs_status.c#7 integrate ... //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate ... //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#5 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_alloc.c#6 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_balloc.c#3 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_bmap.c#2 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_extern.h#5 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_ihash.c#2 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_inode.c#5 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_subr.c#6 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_vfsops.c#10 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/ext2_vnops.c#7 integrate ... //depot/projects/ia64/sys/gnu/ext2fs/inode.h#2 integrate ... //depot/projects/ia64/sys/i386/linux/linux_dummy.c#2 integrate ... //depot/projects/ia64/sys/i386/linux/linux_proto.h#3 integrate ... //depot/projects/ia64/sys/i386/linux/linux_ptrace.c#1 branch ... //depot/projects/ia64/sys/i386/linux/linux_syscall.h#3 integrate ... //depot/projects/ia64/sys/i386/linux/linux_sysent.c#3 integrate ... //depot/projects/ia64/sys/i386/linux/syscalls.master#2 integrate ... //depot/projects/ia64/sys/ia64/acpica/madt.c#8 integrate ... //depot/projects/ia64/sys/ia64/conf/GENERIC#11 integrate ... //depot/projects/ia64/sys/ia64/ia64/dump_machdep.c#2 integrate ... //depot/projects/ia64/sys/ia64/ia64/interrupt.c#9 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#37 integrate ... //depot/projects/ia64/sys/ia64/ia64/mem.c#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#14 integrate ... //depot/projects/ia64/sys/ia64/ia64/trap.c#26 integrate ... //depot/projects/ia64/sys/ia64/ia64/unwind.c#4 integrate ... //depot/projects/ia64/sys/ia64/include/cpu.h#6 integrate ... //depot/projects/ia64/sys/ia64/include/cpufunc.h#6 integrate ... //depot/projects/ia64/sys/ia64/include/db_machdep.h#5 integrate ... //depot/projects/ia64/sys/ia64/include/ia64_cpu.h#5 integrate ... //depot/projects/ia64/sys/ia64/include/param.h#4 integrate ... //depot/projects/ia64/sys/ia64/include/pcb.h#5 integrate ... //depot/projects/ia64/sys/ia64/include/vmparam.h#4 integrate ... //depot/projects/ia64/sys/kern/kern_event.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_ktrace.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_physio.c#2 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#16 integrate ... //depot/projects/ia64/sys/kern/kern_prot.c#15 integrate ... //depot/projects/ia64/sys/kern/kern_resource.c#9 integrate ... //depot/projects/ia64/sys/kern/kern_sig.c#16 integrate ... //depot/projects/ia64/sys/kern/subr_blist.c#2 integrate ... //depot/projects/ia64/sys/kern/sys_process.c#10 integrate ... //depot/projects/ia64/sys/modules/Makefile#13 integrate ... //depot/projects/ia64/sys/modules/linux/Makefile#4 integrate ... //depot/projects/ia64/sys/nfsclient/bootp_subr.c#5 integrate ... //depot/projects/ia64/sys/posix4/p1003_1b.c#3 integrate ... //depot/projects/ia64/sys/powerpc/include/psl.h#2 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/trap.c#11 integrate ... //depot/projects/ia64/sys/security/lomac/kernel_lkm.c#3 integrate ... //depot/projects/ia64/sys/sys/blist.h#3 integrate ... //depot/projects/ia64/sys/sys/proc.h#17 integrate ... //depot/projects/ia64/sys/sys/types.h#11 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#9 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#13 integrate ... //depot/projects/ia64/sys/ufs/ifs/README#2 delete ... //depot/projects/ia64/sys/ufs/ifs/ifs_extern.h#2 delete ... //depot/projects/ia64/sys/ufs/ifs/ifs_lookup.c#3 delete ... //depot/projects/ia64/sys/ufs/ifs/ifs_subr.c#3 delete ... //depot/projects/ia64/sys/ufs/ifs/ifs_vfsops.c#5 delete ... //depot/projects/ia64/sys/ufs/ifs/ifs_vnops.c#6 delete ... //depot/projects/ia64/sys/ufs/ufs/inode.h#2 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_bmap.c#4 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_dirhash.c#6 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_readwrite.c#7 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_vfsops.c#6 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#11 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufsmount.h#4 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#18 integrate ... //depot/projects/ia64/sys/vm/vm_mmap.c#7 integrate ... //depot/projects/ia64/sys/vm/vm_object.c#12 integrate ... //depot/projects/ia64/tools/regression/usr.bin/uuencode/regress.base64.out#2 integrate ... //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#13 integrate ... //depot/projects/ia64/usr.bin/elf2aout/elf2aout.c#4 integrate ... //depot/projects/ia64/usr.bin/ldd/ldd.c#6 integrate ... //depot/projects/ia64/usr.bin/tee/tee.c#5 integrate ... //depot/projects/ia64/usr.bin/uuencode/uuencode.c#5 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/index.c#4 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#6 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.29 2002/05/12 13:41:28 ru Exp $ +$FreeBSD: src/MAINTAINERS,v 1.30 2002/05/18 07:59:51 markm Exp $ subsystem login notes ----------------------------- @@ -11,8 +11,6 @@ NEWCARD imp Pre-commit review requested. OLDCARD imp Pre-commit review requested. wi imp Pre-commit review requested. -perl5 markm This is about to be deleted. - HARD LOCK! No commits at all! telnet markm commits _must_ be made to src/crypto/telnet first, only then to "base" telnet via "make unifdef" ==== //depot/projects/ia64/Makefile.inc1#26 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.278 2002/05/16 08:55:59 markm Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.281 2002/05/18 18:23:04 obrien Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -572,7 +572,7 @@ .if exists(${.CURDIR}/games) && !defined(NOGAMES) _strfile= games/fortune/strfile .endif -.if ${CXX} != "c++" +.if ${CXX:T} != "c++" _cxx_consumers= gnu/usr.bin/gperf gnu/usr.bin/groff .endif ==== //depot/projects/ia64/bin/cp/cp.c#5 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)cp.c 8.2 (Berkeley) 4/1/94"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/cp/cp.c,v 1.33 2002/05/11 00:21:00 alfred Exp $"; + "$FreeBSD: src/bin/cp/cp.c,v 1.35 2002/05/17 12:24:19 ache Exp $"; #endif /* not lint */ /* @@ -99,7 +99,7 @@ { struct stat to_stat, tmp_stat; enum op type; - int Hflag, Lflag, Pflag, ch, fts_options, r; + int Hflag, Lflag, Pflag, ch, fts_options, r, have_trailing_slash; char *target; Hflag = Lflag = Pflag = 0; @@ -179,7 +179,9 @@ *to.p_end++ = '.'; *to.p_end = 0; } - STRIP_TRAILING_SLASH(to); + have_trailing_slash = (to.p_end[-1] == '/'); + if (have_trailing_slash) + STRIP_TRAILING_SLASH(to); to.target_end = to.p_end; /* Set end of argument list for fts(3). */ @@ -229,6 +231,14 @@ type = FILE_TO_FILE; } else type = FILE_TO_FILE; + + if (have_trailing_slash && type == FILE_TO_FILE) { + if (r == -1) + errx(1, "directory %s does not exist", + to.p_path); + else + errx(1, "%s is not a directory", to.p_path); + } } else /* * Case (2). Target is a directory. ==== //depot/projects/ia64/bin/df/df.c#6 (text+ko) ==== @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)df.c 8.9 (Berkeley) 5/8/95"; #else static const char rcsid[] = - "$FreeBSD: src/bin/df/df.c,v 1.38 2002/05/12 19:24:09 phk Exp $"; + "$FreeBSD: src/bin/df/df.c,v 1.39 2002/05/18 21:10:40 iedowse Exp $"; #endif #endif /* not lint */ @@ -203,11 +203,9 @@ rv = 0; if (!*argv) { mntsize = regetmntinfo(&mntbuf, mntsize, vfslist); - if (vfslist != NULL) { - bzero(&maxwidths, sizeof(maxwidths)); - for (i = 0; i < mntsize; i++) - update_maxwidths(&maxwidths, &mntbuf[i]); - } + bzero(&maxwidths, sizeof(maxwidths)); + for (i = 0; i < mntsize; i++) + update_maxwidths(&maxwidths, &mntbuf[i]); for (i = 0; i < mntsize; i++) { if (aflag || (mntbuf[i].f_flags & MNT_IGNORE) == 0) prtstat(&mntbuf[i], &maxwidths); ==== //depot/projects/ia64/bin/ls/extern.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/extern.h,v 1.18 2002/02/03 19:11:32 markm Exp $ + * $FreeBSD: src/bin/ls/extern.h,v 1.19 2002/05/19 02:51:36 tjr Exp $ */ int acccmp(const FTSENT *, const FTSENT *); @@ -46,6 +46,7 @@ void printcol(DISPLAY *); void printlong(DISPLAY *); void printscol(DISPLAY *); +void printstream(DISPLAY *); void usage(void); size_t len_octal(const char *, int); int prn_octal(const char *); ==== //depot/projects/ia64/bin/ls/ls.1#8 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.65 2002/05/16 01:57:08 trhodes Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.66 2002/05/19 02:51:36 tjr Exp $ .\" .Dd December 29, 2002 .Dt LS 1 @@ -43,7 +43,7 @@ .Nd list directory contents .Sh SYNOPSIS .Nm -.Op Fl ABCFGHLPRTWZabcdfghiklnoqrstuw1 +.Op Fl ABCFGHLPRTWZabcdfghiklmnopqrstuwx1 .Op Ar .Sh DESCRIPTION For each operand that names a @@ -192,6 +192,8 @@ (See below.) If the output is to a terminal, a total sum for all the file sizes is output on a line before the long listing. +.It Fl m +Stream output format; list files across the page, separated by commas. .It Fl n Display user and group IDs numerically rather than converting to a user or group name in a long @@ -201,6 +203,10 @@ Include the file flags in a long .Pq Fl l output. +.It Fl p +Write a slash +.Pq Ql / +after each filename if that file is a directory. .It Fl q Force printing of non-graphic characters in file names as the character @@ -232,6 +238,11 @@ Force raw printing of non-printable characters. This is the default when output is not to a terminal. +.It Fl x +The same as +.Fl C , +except that the multi-column output is produced with entries sorted +across, rather than down, the columns. .It Fl 1 (The numeric digit .Dq one . ) @@ -242,7 +253,7 @@ .El .Pp The -.Fl 1 , C , +.Fl 1 , C , x , and .Fl l options all override each other; the last one specified determines @@ -274,7 +285,9 @@ lists one entry per line to standard output; the exceptions are to terminals or when the .Fl C -option is specified. +or +.Fl x +options are specified. .Pp File information is displayed with one or more .Ao blank Ac Ns s @@ -481,7 +494,8 @@ many pathname text columns to display based on the width provided. (See -.Fl C . ) +.Fl C and +.Fl x . ) .It Ev LANG The locale to use when determining the order of day and month in the long .Fl l @@ -619,17 +633,16 @@ .Xr termcap 5 , .Xr symlink 7 , .Xr sticky 8 +.Sh STANDARDS +The +.Nm +utility conforms to +.St -p1003.1-2001 . .Sh HISTORY An .Nm command appeared in .At v1 . -.Sh STANDARDS -The -.Nm -utility is expected to be a superset of the -.St -p1003.2 -specification. .Sh BUGS To maintain backward compatibility, the relationships between the many options are quite complex. ==== //depot/projects/ia64/bin/ls/ls.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.59 2002/05/15 18:53:56 billf Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.60 2002/05/19 02:51:36 tjr Exp $"); #ifndef lint static const char copyright[] = @@ -113,7 +113,10 @@ int f_sectime; /* print the real time for all files */ static int f_singlecol; /* use single column output */ int f_size; /* list size in short listing */ + int f_slash; /* similar to f_type, but only for dirs */ + int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ + int f_stream; /* stream the output, seperate with commas */ static int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -167,15 +170,17 @@ f_listdot = 1; fts_options = FTS_PHYSICAL; - while ((ch = getopt(argc, argv, "1ABCFGHLPRTWZabcdfghiklnoqrstuw")) != -1) { + while ((ch = getopt(argc, argv, "1ABCFGHLPRTWZabcdfghiklmnopqrstuwx")) + != -1) { switch (ch) { /* - * The -1, -C and -l options all override each other so shell - * aliasing works right. + * The -1, -C, -x and -l options all override each other so + * shell aliasing works right. */ case '1': f_singlecol = 1; f_longform = 0; + f_stream = 0; break; case 'B': f_nonprint = 0; @@ -183,12 +188,18 @@ f_octal_escape = 0; break; case 'C': - f_longform = f_singlecol = 0; + f_sortacross = f_longform = f_singlecol = 0; break; case 'l': f_longform = 1; f_singlecol = 0; + f_stream = 0; break; + case 'x': + f_sortacross = 1; + f_longform = 0; + f_singlecol = 0; + break; /* The -c and -u options override each other. */ case 'c': f_statustime = 1; @@ -200,6 +211,7 @@ break; case 'F': f_type = 1; + f_slash = 0; break; case 'H': fts_options |= FTS_COMFOLLOW; @@ -244,12 +256,21 @@ case 'k': f_kblocks = 1; break; + case 'm': + f_stream = 1; + f_singlecol = 0; + f_longform = 0; + break; case 'n': f_numericonly = 1; break; case 'o': f_flags = 1; break; + case 'p': + f_slash = 1; + f_type = 1; + break; case 'q': f_nonprint = 1; f_octal = 0; @@ -390,6 +411,8 @@ printfcn = printscol; else if (f_longform) printfcn = printlong; + else if (f_stream) + printfcn = printstream; else printfcn = printcol; ==== //depot/projects/ia64/bin/ls/ls.h#4 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.17 2002/02/03 19:11:32 markm Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.18 2002/05/19 02:51:36 tjr Exp $ */ #define NO_PRINT 1 @@ -53,6 +53,8 @@ extern int f_nonprint; /* show unprintables as ? */ extern int f_sectime; /* print the real time for all files */ extern int f_size; /* list size in short listing */ +extern int f_slash; /* append a '/' if the file is a directory */ +extern int f_sortacross; /* sort across rows, not down columns */ extern int f_statustime; /* use time of last mode change */ extern int f_notabs; /* don't use tab-separated multi-col output */ extern int f_type; /* add type character for non-regular files */ ==== //depot/projects/ia64/bin/ls/print.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.54 2002/05/15 18:53:56 billf Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.55 2002/05/19 02:51:36 tjr Exp $"); #if 0 #ifndef lint @@ -223,6 +223,31 @@ } void +printstream(DISPLAY *dp) +{ + FTSENT *p; + extern int termwidth; + int chcnt; + + for (p = dp->list, chcnt = 0; p; p = p->fts_link) { + if (p->fts_number == NO_PRINT) + continue; + if (strlen(p->fts_name) + chcnt + + (p->fts_link ? 2 : 0) >= (unsigned)termwidth) { + putchar('\n'); + chcnt = 0; + } + chcnt += printaname(p, dp->s_inode, dp->s_block); + if (p->fts_link) { + printf(", "); + chcnt += 2; + } + } + if (chcnt) + putchar('\n'); +} + +void printcol(DISPLAY *dp) { extern int termwidth; @@ -282,15 +307,26 @@ if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size)) (void)printf("total %lu\n", howmany(dp->btotal, blocksize)); + + if (f_sortacross) + base = 0; for (row = 0; row < numrows; ++row) { endcol = colwidth; - for (base = row, chcnt = col = 0; col < numcols; ++col) { + if (!f_sortacross) + base = row; + for (col = 0, chcnt = 0; col < numcols; ++col) { chcnt += printaname(array[base], dp->s_inode, dp->s_block); - if ((base += numrows) >= num) + if (f_sortacross) + base++; + else + base += numrows; + if (base >= num) break; while ((cnt = ((chcnt + tabwidth) & ~(tabwidth - 1))) <= endcol) { + if (f_sortacross && col + 1 >= numcols) + break; (void)putchar(f_notabs ? ' ' : '\t'); chcnt = cnt; } @@ -364,6 +400,15 @@ static int printtype(u_int mode) { + + if (f_slash) { + if ((mode & S_IFMT) == S_IFDIR) { + (void)putchar('/'); + return (1); + } + return (0); + } + switch (mode & S_IFMT) { case S_IFDIR: (void)putchar('/'); ==== //depot/projects/ia64/bin/mv/mv.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.36 2002/03/22 19:52:59 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.37 2002/05/17 11:38:48 jmallett Exp $"); #include #include @@ -59,6 +59,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/ia64/bin/mv/pathnames.h#2 (text+ko) ==== @@ -31,8 +31,7 @@ * SUCH DAMAGE. * * @(#)pathnames.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/mv/pathnames.h,v 1.5 1999/08/27 23:14:37 peter Exp $ + * $FreeBSD: src/bin/mv/pathnames.h,v 1.6 2002/05/17 11:38:48 jmallett Exp $ */ #define _PATH_RM "/bin/rm" -#define _PATH_CP "/bin/cp" ==== //depot/projects/ia64/bin/pwd/pwd.1#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.18 2002/04/16 20:06:27 charnier Exp $ +.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.20 2002/05/18 13:52:07 tjr Exp $ .\" .Dd February 4, 2002 .Dt PWD 1 @@ -43,7 +43,7 @@ .Nd return working directory name .Sh SYNOPSIS .Nm -.Op Fl L | P +.Op Fl LP .Sh DESCRIPTION The .Nm ==== //depot/projects/ia64/bin/pwd/pwd.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)pwd.c 8.3 (Berkeley) 4/1/94"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/pwd/pwd.c,v 1.17 2002/02/11 18:38:54 mike Exp $"; + "$FreeBSD: src/bin/pwd/pwd.c,v 1.19 2002/05/18 13:52:07 tjr Exp $"; #endif /* not lint */ #include @@ -61,18 +61,18 @@ int main(int argc, char *argv[]) { - int Lflag, Pflag; + int physical; int ch; char *p; - Lflag = Pflag = 0; + physical = 1; while ((ch = getopt(argc, argv, "LP")) != -1) switch (ch) { case 'L': - Lflag = 1; + physical = 0; break; case 'P': - Pflag = 1; + physical = 1; break; case '?': default: @@ -81,13 +81,18 @@ argc -= optind; argv += optind; - if (argc != 0 || (Lflag && Pflag)) + if (argc != 0) usage(); - p = Lflag ? getcwd_logical() : getcwd(NULL, 0); - if (p == NULL) + /* + * If we're trying to find the logical current directory and that + * fails, behave as if -P was specified. + */ + if ((!physical && (p = getcwd_logical()) != NULL) || + (p = getcwd(NULL, 0)) != NULL) + printf("%s\n", p); + else err(1, "."); - (void)printf("%s\n", p); exit(0); } @@ -96,7 +101,7 @@ usage(void) { - (void)fprintf(stderr, "usage: pwd [-L | -P]\n"); + (void)fprintf(stderr, "usage: pwd [-LP]\n"); exit(1); } ==== //depot/projects/ia64/contrib/gcc/cp/cfns.h#2 (text+ko) ==== @@ -1,5 +1,6 @@ -/* C code produced by gperf version 2.7 */ -/* Command-line: gperf -o -C -E -k 1-6,$ -j1 -D -N libc_name_p ../../../egcs-CVS20000404/gcc/cp/cfns.gperf */ +/* C code produced by gperf version 2.7.2 */ +/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p /FBSD/src/gnu/usr.bin/cc/cc1plus/../../../../contrib/gcc/cp/cfns.gperf */ +/* $FreeBSD: src/contrib/gcc/cp/cfns.h,v 1.2 2002/05/17 19:22:31 obrien Exp $ */ #ifdef __GNUC__ __inline #endif @@ -12,6 +13,10 @@ #ifdef __GNUC__ __inline +#else +#ifdef __cplusplus +inline +#endif #endif static unsigned int hash (str, len) ==== //depot/projects/ia64/etc/periodic/daily/450.status-security#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/450.status-security,v 1.9 2001/12/07 23:57:38 cjc Exp $ +# $FreeBSD: src/etc/periodic/daily/450.status-security,v 1.10 2002/05/17 11:31:45 brian Exp $ # # If there is a global system configuration file, suck it in. @@ -32,7 +32,7 @@ esac periodic security - rc=$?;; + rc=3;; *) rc=0;; esac ==== //depot/projects/ia64/etc/periodic/monthly/200.accounting#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/periodic/monthly/200.accounting,v 1.8 2002/04/30 17:07:32 brian Exp $ +# $FreeBSD: src/etc/periodic/monthly/200.accounting,v 1.9 2002/05/17 14:05:08 brian Exp $ # # If there is a global system configuration file, suck it in. @@ -11,6 +11,8 @@ source_periodic_confs fi +oldmask=$(umask) +umask 066 case "$monthly_accounting_enable" in [Yy][Ee][Ss]) W=/var/log/wtmp @@ -45,4 +47,5 @@ *) rc=0;; esac +umask $oldmask exit $rc ==== //depot/projects/ia64/etc/periodic/security/100.chksetuid#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.2 2002/05/05 00:59:37 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.3 2002/05/17 11:34:12 brian Exp $ # # If there is a global system configuration file, suck it in. @@ -35,7 +35,7 @@ source_periodic_confs fi -TMP=/var/run/_secure.$$ +TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" rc=0 ==== //depot/projects/ia64/etc/periodic/security/200.chkmounts#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.2 2001/12/14 22:25:04 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.3 2002/05/17 11:34:12 brian Exp $ # # Show changes in the way filesystems are mounted @@ -38,7 +38,7 @@ source_periodic_confs fi -TMP=/var/run/_secure.$$ +TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" ignore="${daily_status_security_chkmounts_ignore}" rc=0 ==== //depot/projects/ia64/etc/periodic/security/500.ipfwdenied#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.1 2001/12/07 23:57:38 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.2 2002/05/17 11:34:12 brian Exp $ # # Show denied packets @@ -39,7 +39,7 @@ source_periodic_confs fi -TMP=/var/run/_secure.$$ +TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" rc=0 ==== //depot/projects/ia64/etc/periodic/security/550.ipfwlimit#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.2 2001/12/14 08:58:21 ru Exp $ +# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.3 2002/05/17 11:34:12 brian Exp $ # # Show ipfw rules which have reached the log limit @@ -38,7 +38,7 @@ source_periodic_confs fi -TMP=/var/run/_secure.$$ +TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` rc=0 case "$daily_status_security_ipfwlimit_enable" in ==== //depot/projects/ia64/etc/periodic/security/600.ip6fwdenied#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.1 2001/12/07 23:57:38 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.2 2002/05/17 11:34:12 brian Exp $ # # Show IPv6 denied packets @@ -38,7 +38,7 @@ source_periodic_confs fi -TMP=/var/run/_secure.$$ +TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" rc=0 ==== //depot/projects/ia64/etc/periodic/security/650.ip6fwlimit#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.2 2001/12/14 08:58:21 ru Exp $ +# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.3 2002/05/17 11:34:12 brian Exp $ # # Show ip6fw rules which have reached the log limit @@ -38,7 +38,7 @@ source_periodic_confs fi -TMP=/var/run/_secure.$$ +TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` rc=0 case "$daily_status_security_ip6fwlimit_enable" in ==== //depot/projects/ia64/etc/periodic/security/700.kernelmsg#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.1 2001/12/07 23:57:38 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.3 2002/05/17 13:38:36 brian Exp $ # # Show kernel log messages @@ -38,13 +38,13 @@ source_periodic_confs fi -TMP=/var/run/_secure.$$ +TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" rc=0 case "$daily_status_security_kernelmsg_enable" in [Yy][Ee][Ss]) - if dmesg -a 2>/dev/null > ${TMP}; then + if dmesg 2>/dev/null > ${TMP}; then if [ ! -f ${LOG}/dmesg.today ]; then rc=1 echo "" ==== //depot/projects/ia64/include/paths.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.15 2002/05/08 00:37:50 des Exp $ + * $FreeBSD: src/include/paths.h,v 1.16 2002/05/17 11:47:09 jmallett Exp $ */ #ifndef _PATHS_H_ @@ -73,6 +73,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "don't use _PATH_UNIX" #define _PATH_VI "/usr/bin/vi" +#define _PATH_WALL "/usr/bin/wall" /* Provide trailing slash, since mostly used for building pathnames. */ #define _PATH_DEV "/dev/" ==== //depot/projects/ia64/lib/libc/sys/quotactl.2#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)quotactl.2 8.2 (Berkeley) 3/10/95 -.\" $FreeBSD: src/lib/libc/sys/quotactl.2,v 1.18 2002/05/14 07:27:20 roam Exp $ +.\" $FreeBSD: src/lib/libc/sys/quotactl.2,v 1.19 2002/05/17 16:39:21 roam Exp $ .\" .Dd March 5, 1999 .Dt QUOTACTL 2 @@ -166,10 +166,11 @@ .It Bq Er EINVAL .Fa Cmd or the command type is invalid. +In .Dv Q_GETQUOTA -returns -.Er EINVAL -if quotas are not currently enabled for this filesystem. +and +.Dv Q_SETQUOTA , +quotas are not currently enabled for this filesystem. .It Bq Er EACCES In .Dv Q_QUOTAON , ==== //depot/projects/ia64/release/Makefile.inc.docports#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile.inc.docports,v 1.9 2002/03/17 15:40:01 jhay Exp $ +# $FreeBSD: src/release/Makefile.inc.docports,v 1.10 2002/05/17 19:01:21 bmah Exp $ # # List of (dependent) ports that are minimally required to be # checked out from CVS in order to get ${DOCPORTS} built and >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 22:31:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 078CA37B409; Sat, 18 May 2002 22:31:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by hub.freebsd.org (Postfix) with ESMTP id 6A9B237B403; Sat, 18 May 2002 22:31:27 -0700 (PDT) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.11.6/8.11.4) with ESMTP id g4J5VRJ26020; Sat, 18 May 2002 22:31:27 -0700 (PDT) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.3/8.12.3) with ESMTP id g4J5VoBL029049; Sat, 18 May 2002 22:31:50 -0700 (PDT) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.3/8.12.3/Submit) id g4J5VoMC029048; Sat, 18 May 2002 22:31:50 -0700 (PDT) Date: Sat, 18 May 2002 22:31:50 -0700 From: Marcel Moolenaar To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11516 for review Message-ID: <20020519053150.GB29029@dhcp01.pn.xcllnt.net> References: <200205190519.g4J5Jrj40369@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200205190519.g4J5Jrj40369@freefall.freebsd.org> User-Agent: Mutt/1.3.99i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, May 18, 2002 at 10:19:53PM -0700, Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11516 > > Change 11516 by peter@peter_daintree on 2002/05/18 22:18:56 > > IFC @11514 I'll check p4 based builds. The param.h change probably breaks the ia32 code -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 22:41:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 366D937B410; Sat, 18 May 2002 22:41:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 57AF737B408 for ; Sat, 18 May 2002 22:41:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4J5fKu43799 for perforce@freebsd.org; Sat, 18 May 2002 22:41:20 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 18 May 2002 22:41:20 -0700 (PDT) Message-Id: <200205190541.g4J5fKu43799@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11517 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11517 Change 11517 by peter@peter_ia64 on 2002/05/18 22:40:54 fix a C++ comment Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/ski.c#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/ski.c#2 (text+ko) ==== @@ -61,7 +61,7 @@ return ret0; } -extern u_int64_t ski_fake_pal[]; // *not* a function decl +extern u_int64_t ski_fake_pal[]; /* *not* a function decl */ extern void ia64_ski_init(void); extern u_int64_t ia64_pal_entry; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 22:50:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D957D37B409; Sat, 18 May 2002 22:50:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1D61637B405 for ; Sat, 18 May 2002 22:50:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4J5oWF44482 for perforce@freebsd.org; Sat, 18 May 2002 22:50:32 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 18 May 2002 22:50:32 -0700 (PDT) Message-Id: <200205190550.g4J5oWF44482@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11519 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11519 Change 11519 by peter@peter_ia64 on 2002/05/18 22:50:14 fix duplicate suword32 etc declarations. Affected files ... ... //depot/projects/ia64/sys/ia64/ia32/ia32_misc.c#2 edit ... //depot/projects/ia64/sys/ia64/ia32/imgact_ia32.c#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia32/ia32_misc.c#2 (text+ko) ==== @@ -1161,9 +1161,6 @@ /* * MPSAFE */ -extern long fuword32(const void *base); -extern void suword32(void *base, u_int32_t v); - int ia32_sysctl(struct thread *td, struct ia32_sysctl_args *uap) { ==== //depot/projects/ia64/sys/ia64/ia32/imgact_ia32.c#3 (text+ko) ==== @@ -73,8 +73,6 @@ __ElfType(Brandinfo); __ElfType(Auxargs); -extern int suword32(void *p, u_int32_t v); - static int ia32_check_header(const Elf32_Ehdr *hdr); static int ia32_freebsd_fixup(register_t **stack_base, struct image_params *imgp); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 22:52:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C664837B40A; Sat, 18 May 2002 22:52:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 036B937B406 for ; Sat, 18 May 2002 22:52:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4J5qYF44818 for perforce@freebsd.org; Sat, 18 May 2002 22:52:34 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 18 May 2002 22:52:34 -0700 (PDT) Message-Id: <200205190552.g4J5qYF44818@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11520 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11520 Change 11520 by peter@peter_ia64 on 2002/05/18 22:52:01 add #include to make this compile again Affected files ... ... //depot/projects/ia64/sys/ia64/ia32/imgact_ia32.c#4 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia32/imgact_ia32.c#4 (text+ko) ==== @@ -67,6 +67,7 @@ #include #include #include +#include #define OLD_EI_BRAND 8 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 22:53:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F45237B40F; Sat, 18 May 2002 22:53:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from evilpete.dyndns.org (12-232-26-46.client.attbi.com [12.232.26.46]) by hub.freebsd.org (Postfix) with ESMTP id 40FB437B40D for ; Sat, 18 May 2002 22:53:20 -0700 (PDT) Received: from overcee.wemm.org ([10.0.0.3]) by evilpete.dyndns.org (8.11.6/8.11.6) with ESMTP id g4J5rE118654 for ; Sat, 18 May 2002 22:53:14 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 8121E39F9; Sat, 18 May 2002 22:53:14 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Marcel Moolenaar Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11516 for review In-Reply-To: <20020519053150.GB29029@dhcp01.pn.xcllnt.net> Date: Sat, 18 May 2002 22:53:14 -0700 From: Peter Wemm Message-Id: <20020519055314.8121E39F9@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Marcel Moolenaar wrote: > On Sat, May 18, 2002 at 10:19:53PM -0700, Peter Wemm wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11516 > > > > Change 11516 by peter@peter_daintree on 2002/05/18 22:18:56 > > > > IFC @11514 > > I'll check p4 based builds. The param.h change probably breaks > the ia32 code That's ok, it isn't that easy to make us cry. :-) Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 23:25:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FA3437B409; Sat, 18 May 2002 23:25:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 766B637B40B for ; Sat, 18 May 2002 23:25:15 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4J6PFT53264 for perforce@freebsd.org; Sat, 18 May 2002 23:25:15 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 18 May 2002 23:25:15 -0700 (PDT) Message-Id: <200205190625.g4J6PFT53264@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11523 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11523 Change 11523 by peter@peter_ia64 on 2002/05/18 23:24:26 add boot_serial and boot_multicons variables since the machine at work has got a keyboard plugged in and I'll be damned if I want to go and drive in and unplug it. And I keep missing the boot prompt and getting no console on the serial port. Grrr. Affected files ... ... //depot/projects/ia64/sys/boot/efi/libefi/bootinfo.c#5 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/libefi/bootinfo.c#5 (text+ko) ==== @@ -55,6 +55,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 23:26:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11AFA37B410; Sat, 18 May 2002 23:26:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3D57F37B404 for ; Sat, 18 May 2002 23:26:17 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4J6QG553350 for perforce@freebsd.org; Sat, 18 May 2002 23:26:16 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 18 May 2002 23:26:16 -0700 (PDT) Message-Id: <200205190626.g4J6QG553350@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11524 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11524 Change 11524 by peter@peter_ia64 on 2002/05/18 23:25:49 allow the contigmalloc for user area/kernel stack to come from anywhere, based on dfr's email on the subject quite some time ago. Next stop: move the user page[s] back to a vm object since it doesn't need to be contig at all. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#20 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#20 (text+ko) ==== @@ -716,16 +716,10 @@ struct user *up; /* - * Use contigmalloc for user area so that we can use a region - * 7 address for it which makes it impossible to accidentally - * lose when recording a trapframe. + * contigmalloc is no longer needed here. */ - up = contigmalloc(UAREA_PAGES * PAGE_SIZE, M_PMAP, - M_WAITOK, - 0ul, - 256*1024*1024 - 1, - PAGE_SIZE, - 256*1024*1024); + up = contigmalloc(UAREA_PAGES * PAGE_SIZE, M_PMAP, M_WAITOK, + 0ul, ~0ul, PAGE_SIZE, 0ul); if (up == NULL) panic("pmap_new_proc: could not contigmalloc %d pages\n", @@ -773,16 +767,11 @@ vm_offset_t *ks; /* - * Use contigmalloc for user area so that we can use a region - * 7 address for it which makes it impossible to accidentally - * lose when recording a trapframe. + * Use contigmalloc for the kernel stack so that the pages + * can be used via physical addressing in the exception code. */ - ks = contigmalloc(KSTACK_PAGES * PAGE_SIZE, M_PMAP, - M_WAITOK, - 0ul, - 256*1024*1024 - 1, - PAGE_SIZE, - 256*1024*1024); + ks = contigmalloc(KSTACK_PAGES * PAGE_SIZE, M_PMAP, M_WAITOK, + 0ul, ~0ul, PAGE_SIZE, 0ul); if (ks == NULL) panic("pmap_new_thread: could not contigmalloc %d pages\n", To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 23:57: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00A5B37B406; Sat, 18 May 2002 23:56:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9859837B401 for ; Sat, 18 May 2002 23:56:55 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4J6utt58554 for perforce@freebsd.org; Sat, 18 May 2002 23:56:55 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 18 May 2002 23:56:55 -0700 (PDT) Message-Id: <200205190656.g4J6utt58554@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11528 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11528 Change 11528 by peter@peter_ia64 on 2002/05/18 23:56:09 Marcel reminded me about this one. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#15 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#15 (text+ko) ==== @@ -215,11 +215,7 @@ * recording a trapframe. */ ks = contigmalloc(KSTACK_PAGES * PAGE_SIZE, M_TEMP, - M_WAITOK, - 0ul, - 256*1024*1024 - 1, - PAGE_SIZE, - 256*1024*1024); + M_WAITOK, 0ul, ~0ul, PAGE_SIZE, 0ul); ap_stack = IA64_PHYS_TO_RR7(ia64_tpa((u_int64_t)ks)); ap_pcpu = pc; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 18 23:58:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBD3137B40A; Sat, 18 May 2002 23:57:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2231037B404 for ; Sat, 18 May 2002 23:56:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4J6utc58559 for perforce@freebsd.org; Sat, 18 May 2002 23:56:55 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sat, 18 May 2002 23:56:55 -0700 (PDT) Message-Id: <200205190656.g4J6utc58559@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11529 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11529 Change 11529 by peter@peter_daintree on 2002/05/18 23:56:53 IFC @11527 Affected files ... ... //depot/projects/ia64/bin/sh/error.c#4 integrate ... //depot/projects/ia64/bin/sh/eval.c#3 integrate ... //depot/projects/ia64/bin/sh/jobs.c#3 integrate ... //depot/projects/ia64/bin/sh/nodetypes#2 integrate ... //depot/projects/ia64/bin/sh/parser.c#3 integrate ... //depot/projects/ia64/bin/sh/redir.c#3 integrate ... //depot/projects/ia64/bin/sh/sh.1#4 integrate ... //depot/projects/ia64/bin/sh/show.c#3 integrate ... //depot/projects/ia64/sys/dev/acpica/Osd/OsdInterrupt.c#4 integrate ... //depot/projects/ia64/sys/dev/acpica/Osd/OsdSchedule.c#6 integrate ... //depot/projects/ia64/sys/dev/acpica/Osd/OsdSynch.c#4 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi.c#11 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_button.c#4 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_cpu.c#4 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#5 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_lid.c#4 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#4 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_powerres.c#3 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#3 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_thermal.c#5 integrate ... //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#6 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/feeder.c#3 integrate ... //depot/projects/ia64/sys/dev/sound/pcm/sound.c#5 integrate ... //depot/projects/ia64/sys/i386/acpica/acpi_wakeup.c#6 integrate ... //depot/projects/ia64/sys/ia64/ia64/ski.c#3 integrate ... //depot/projects/ia64/sys/ia64/include/mca.h#5 integrate Differences ... ==== //depot/projects/ia64/bin/sh/error.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)error.c 8.2 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/error.c,v 1.19 2002/05/16 01:57:20 trhodes Exp $"; + "$FreeBSD: src/bin/sh/error.c,v 1.20 2002/05/19 06:03:05 tjr Exp $"; #endif /* not lint */ /* @@ -247,6 +247,7 @@ #ifdef ELIBACC { ELIBACC, E_EXEC, "shared library missing" }, #endif + { EEXIST, E_CREAT, "file exists" }, { 0, 0, NULL }, }; ==== //depot/projects/ia64/bin/sh/eval.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/eval.c,v 1.31 2002/02/02 06:50:46 imp Exp $"; + "$FreeBSD: src/bin/sh/eval.c,v 1.32 2002/05/19 06:03:05 tjr Exp $"; #endif /* not lint */ #include @@ -448,6 +448,7 @@ case NTO: case NFROMTO: case NAPPEND: + case NCLOBBER: expandarg(redir->nfile.fname, &fn, EXP_TILDE | EXP_REDIR); redir->nfile.expfname = fn.list->text; break; ==== //depot/projects/ia64/bin/sh/jobs.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)jobs.c 8.5 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/jobs.c,v 1.32 2002/02/02 06:50:46 imp Exp $"; + "$FreeBSD: src/bin/sh/jobs.c,v 1.33 2002/05/19 06:03:05 tjr Exp $"; #endif /* not lint */ #include @@ -1057,6 +1057,8 @@ p = ">>"; i = 1; goto redir; case NTOFD: p = ">&"; i = 1; goto redir; + case NCLOBBER: + p = ">|"; i = 1; goto redir; case NFROM: p = "<"; i = 0; goto redir; case NFROMTO: ==== //depot/projects/ia64/bin/sh/nodetypes#2 (text+ko) ==== @@ -34,7 +34,7 @@ # SUCH DAMAGE. # # @(#)nodetypes 8.2 (Berkeley) 5/4/95 -# $FreeBSD: src/bin/sh/nodetypes,v 1.7 2000/10/03 23:13:14 brian Exp $ +# $FreeBSD: src/bin/sh/nodetypes,v 1.8 2002/05/19 06:03:05 tjr Exp $ # This file describes the nodes used in parse trees. Unindented lines # contain a node type followed by a structure tag. Subsequent indented @@ -120,6 +120,7 @@ NFROM nfile # fd< fname NFROMTO nfile # fd<> fname NAPPEND nfile # fd>> fname +NCLOBBER nfile # fd>| fname type int next nodeptr # next redirection in list fd int # file descriptor being redirected ==== //depot/projects/ia64/bin/sh/parser.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/parser.c,v 1.38 2002/02/02 06:50:47 imp Exp $"; + "$FreeBSD: src/bin/sh/parser.c,v 1.39 2002/05/19 06:03:05 tjr Exp $"; #endif /* not lint */ #include @@ -1145,6 +1145,8 @@ np->type = NAPPEND; else if (c == '&') np->type = NTOFD; + else if (c == '|') + np->type = NCLOBBER; else { np->type = NTO; pungetc(); ==== //depot/projects/ia64/bin/sh/redir.c#3 (text+ko) ==== @@ -39,10 +39,11 @@ static char sccsid[] = "@(#)redir.c 8.2 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/redir.c,v 1.17 2002/02/02 06:50:47 imp Exp $"; + "$FreeBSD: src/bin/sh/redir.c,v 1.18 2002/05/19 06:03:05 tjr Exp $"; #endif /* not lint */ #include +#include #include #include #include @@ -62,6 +63,7 @@ #include "output.h" #include "memalloc.h" #include "error.h" +#include "options.h" #define EMPTY -2 /* marks an unused slot in redirtab */ @@ -161,6 +163,7 @@ STATIC void openredirect(union node *redir, char memory[10]) { + struct stat sb; int fd = redir->nfile.fd; char *fname; int f; @@ -207,6 +210,9 @@ goto movefd; case NTO: fname = redir->nfile.expfname; + if (Cflag && stat(fname, &sb) != -1 && S_ISREG(sb.st_mode)) + error("cannot create %s: %s", fname, + errmsg(EEXIST, E_CREAT)); #ifdef O_CREAT if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0) error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); @@ -215,6 +221,11 @@ error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); #endif goto movefd; + case NCLOBBER: + fname = redir->nfile.expfname; + if ((f = open(fname, O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0) + error("cannot create %s: %s", fname, errmsg(errno, E_CREAT)); + goto movefd; case NAPPEND: fname = redir->nfile.expfname; #ifdef O_APPEND ==== //depot/projects/ia64/bin/sh/sh.1#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.58 2001/11/20 18:41:01 knu Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.59 2002/05/19 06:03:05 tjr Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -195,7 +195,6 @@ .It Fl C Li noclobber Do not overwrite existing files with .Dq Li > . -(UNIMPLEMENTED) .It Fl E Li emacs Enable the builtin .Xr emacs 1 ==== //depot/projects/ia64/bin/sh/show.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)show.c 8.3 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/show.c,v 1.15 2002/02/02 06:50:47 imp Exp $"; + "$FreeBSD: src/bin/sh/show.c,v 1.16 2002/05/19 06:03:05 tjr Exp $"; #endif /* not lint */ #include @@ -142,6 +142,7 @@ case NTO: s = ">"; dftfd = 1; break; case NAPPEND: s = ">>"; dftfd = 1; break; case NTOFD: s = ">&"; dftfd = 1; break; + case NCLOBBER: s = ">|"; dftfd = 1; break; case NFROM: s = "<"; dftfd = 0; break; case NFROMTO: s = "<>"; dftfd = 0; break; case NFROMFD: s = "<&"; dftfd = 0; break; ==== //depot/projects/ia64/sys/dev/acpica/Osd/OsdInterrupt.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.10 2002/02/23 05:31:38 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.11 2002/05/19 06:16:47 peter Exp $ */ /* @@ -55,7 +55,7 @@ { struct acpi_softc *sc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if ((sc = devclass_get_softc(devclass_find("acpi"), 0)) == NULL) panic("can't find ACPI device to register interrupt"); @@ -101,7 +101,7 @@ { struct acpi_softc *sc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if ((InterruptNumber < 0) || (InterruptNumber > 255)) return_ACPI_STATUS(AE_BAD_PARAMETER); ==== //depot/projects/ia64/sys/dev/acpica/Osd/OsdSchedule.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.19 2002/04/04 21:03:13 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.20 2002/05/19 06:16:47 peter Exp $ */ /* @@ -164,7 +164,7 @@ struct acpi_task *at; int pri; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (Function == NULL) return_ACPI_STATUS(AE_BAD_PARAMETER); @@ -207,7 +207,7 @@ OSD_EXECUTION_CALLBACK Function; void *Context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); at = (struct acpi_task *)arg; atq = NULL; @@ -248,7 +248,7 @@ int timo; static int dummy; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); timo = (Seconds * hz) + Milliseconds * hz / 1000; if (timo == 0) @@ -260,7 +260,7 @@ void AcpiOsStall (UINT32 Microseconds) { - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); DELAY(Microseconds); return_VOID; ==== //depot/projects/ia64/sys/dev/acpica/Osd/OsdSynch.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.12 2002/04/04 21:03:14 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdSynch.c,v 1.13 2002/05/19 06:16:47 peter Exp $ */ /* @@ -74,7 +74,7 @@ #ifndef ACPI_NO_SEMAPHORES struct acpi_semaphore *as; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (OutHandle == NULL) return(AE_BAD_PARAMETER); @@ -108,7 +108,7 @@ #ifndef ACPI_NO_SEMAPHORES struct acpi_semaphore *as = (struct acpi_semaphore *)Handle; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "destroyed semaphore %p\n", as)); mtx_destroy(&as->as_mtx); @@ -133,7 +133,7 @@ int rv, tmo; struct timeval timeouttv, currenttv, timelefttv; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (as == NULL) return_ACPI_STATUS(AE_BAD_PARAMETER); @@ -288,7 +288,7 @@ #ifndef ACPI_NO_SEMAPHORES struct acpi_semaphore *as = (struct acpi_semaphore *)Handle; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (as == NULL) return_ACPI_STATUS(AE_BAD_PARAMETER); ==== //depot/projects/ia64/sys/dev/acpica/acpi.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.62 2002/05/09 21:13:37 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.63 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" @@ -213,7 +213,7 @@ char *debugpoint; #endif - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if(!cold){ printf("Don't load this driver from userland!!\n"); @@ -296,7 +296,7 @@ ACPI_STATUS status; int error; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (power_pm_get_type() != POWER_PM_TYPE_NONE && power_pm_get_type() != POWER_PM_TYPE_ACPI) { @@ -330,7 +330,7 @@ char *debugpoint; #endif - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_LOCK; sc = device_get_softc(dev); bzero(sc, sizeof(*sc)); @@ -732,7 +732,7 @@ ACPI_STATUS error; u_int32_t pnpid; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); pnpid = 0; ACPI_LOCK; @@ -757,7 +757,7 @@ int result; u_int32_t pnpid; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* * ISA-style drivers attached to ACPI may persist and @@ -792,7 +792,7 @@ static char *scopes[] = {"\\_PR_", "\\_TZ_", "\\_SI", "\\_SB_", NULL}; int i; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; /* @@ -842,7 +842,7 @@ ACPI_OBJECT_TYPE type; device_t child, bus = (device_t)context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* * Skip this device if we think we'll have trouble with it. @@ -1312,7 +1312,7 @@ UINT8 TypeA; UINT8 TypeB; - ACPI_FUNCTION_TRACE_U32(__func__, state); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); ACPI_ASSERTLOCK; if (sc->acpi_sstate != ACPI_STATE_S0) @@ -1411,7 +1411,7 @@ ACPI_STATUS status; u_int32_t flags; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; flags = ACPI_NO_ADDRESS_SPACE_INIT | ACPI_NO_HARDWARE_INIT | @@ -1431,7 +1431,7 @@ { ACPI_STATUS status; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; if (sc->acpi_enabled) { @@ -1453,7 +1453,7 @@ static void acpi_system_eventhandler_sleep(void *arg, int state) { - ACPI_FUNCTION_TRACE_U32(__func__, state); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); ACPI_LOCK; if (state >= ACPI_STATE_S0 && state <= ACPI_S_STATES_MAX) @@ -1465,7 +1465,7 @@ static void acpi_system_eventhandler_wakeup(void *arg, int state) { - ACPI_FUNCTION_TRACE_U32(__func__, state); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); /* Well, what to do? :-) */ @@ -1483,7 +1483,7 @@ { struct acpi_softc *sc = (struct acpi_softc *)context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); EVENTHANDLER_INVOKE(acpi_sleep_event, sc->acpi_power_button_sx); @@ -1495,7 +1495,7 @@ { struct acpi_softc *sc = (struct acpi_softc *)context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); EVENTHANDLER_INVOKE(acpi_wakeup_event, sc->acpi_power_button_sx); @@ -1507,7 +1507,7 @@ { struct acpi_softc *sc = (struct acpi_softc *)context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); EVENTHANDLER_INVOKE(acpi_sleep_event, sc->acpi_sleep_button_sx); @@ -1519,7 +1519,7 @@ { struct acpi_softc *sc = (struct acpi_softc *)context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); EVENTHANDLER_INVOKE(acpi_wakeup_event, sc->acpi_sleep_button_sx); ==== //depot/projects/ia64/sys/dev/acpica/acpi_button.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.8 2002/02/23 05:22:49 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_button.c,v 1.9 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" @@ -103,7 +103,7 @@ struct acpi_button_softc *sc; ACPI_STATUS status; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); sc->button_dev = dev; @@ -123,7 +123,7 @@ struct acpi_button_softc *sc; struct acpi_softc *acpi_sc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_button_softc *)arg; acpi_sc = acpi_device_get_parent_softc(sc->button_dev); @@ -154,7 +154,7 @@ struct acpi_button_softc *sc; struct acpi_softc *acpi_sc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_button_softc *)arg; acpi_sc = acpi_device_get_parent_softc(sc->button_dev); @@ -188,7 +188,7 @@ { struct acpi_button_softc *sc = (struct acpi_button_softc *)context; - ACPI_FUNCTION_TRACE_U32(__func__, notify); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, notify); switch (notify) { case ACPI_NOTIFY_BUTTON_PRESSED_FOR_SLEEP: ==== //depot/projects/ia64/sys/dev/acpica/acpi_cpu.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.12 2002/03/04 18:45:46 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.13 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" @@ -144,7 +144,7 @@ u_int32_t duty_end; int rid; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; ==== //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.24 2002/02/23 05:26:31 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.25 2002/05/19 06:16:45 peter Exp $ */ /****************************************************************************** * @@ -322,7 +322,7 @@ static void acpi_ec_identify(driver_t driver, device_t bus) { - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* XXX implement - need an ACPI 2.0 system to test this */ @@ -358,7 +358,7 @@ ACPI_STATUS Status; int errval = 0; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* * Fetch/initialise softc @@ -457,7 +457,7 @@ ACPI_STATUS Status; char qxx[5]; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); for (;;) { @@ -548,7 +548,7 @@ EcSpaceSetup(ACPI_HANDLE Region, UINT32 Function, void *Context, void **RegionContext) { - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* * Just pass the context through, there's nothing to do here. @@ -567,7 +567,7 @@ EC_REQUEST EcRequest; int i; - ACPI_FUNCTION_TRACE_U32(__func__, (UINT32)Address); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, (UINT32)Address); if ((Address > 0xFF) || (width % 8 != 0) || (Value == NULL) || (Context == NULL)) return_ACPI_STATUS(AE_BAD_PARAMETER); @@ -615,7 +615,7 @@ EC_STATUS EcStatus; int i; - ACPI_FUNCTION_TRACE_U32(__func__, (UINT32)Event); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, (UINT32)Event); /* XXX this should test whether interrupts are available some other way */ if(cold) ==== //depot/projects/ia64/sys/dev/acpica/acpi_lid.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.9 2002/02/23 05:26:45 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_lid.c,v 1.10 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" @@ -92,7 +92,7 @@ { struct acpi_lid_softc *sc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); sc->lid_dev = dev; @@ -111,7 +111,7 @@ struct acpi_lid_softc *sc; struct acpi_softc *acpi_sc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = (struct acpi_lid_softc *)arg; @@ -148,7 +148,7 @@ { struct acpi_lid_softc *sc = (struct acpi_lid_softc *)context; - ACPI_FUNCTION_TRACE_U32(__func__, notify); + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, notify); switch (notify) { case ACPI_NOTIFY_STATUS_CHANGED: ==== //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.20 2002/03/21 02:02:31 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.21 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" #include @@ -128,7 +128,7 @@ ACPI_STATUS status; int result; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); sc = device_get_softc(dev); sc->ap_dev = dev; @@ -310,7 +310,7 @@ int i; uintptr_t up; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); crsbuf.Pointer = NULL; prsbuf.Pointer = NULL; ==== //depot/projects/ia64/sys/dev/acpica/acpi_powerres.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.11 2002/02/23 05:28:08 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_powerres.c,v 1.12 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" /* XXX trim includes */ @@ -148,7 +148,7 @@ ACPI_OBJECT *obj; struct acpi_powerresource *rp, *srp; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); rp = NULL; buf.Pointer = NULL; @@ -212,7 +212,7 @@ { struct acpi_powerresource *rp; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); rp = NULL; @@ -243,7 +243,7 @@ { struct acpi_powerconsumer *pc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* check to see whether we know about this consumer already */ if ((pc = acpi_pwr_find_consumer(consumer)) != NULL) @@ -274,7 +274,7 @@ { struct acpi_powerconsumer *pc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* find the consumer */ if ((pc = acpi_pwr_find_consumer(consumer)) == NULL) @@ -307,7 +307,7 @@ char *method_name, *reslist_name; int res_changed; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* find the consumer */ if ((pc = acpi_pwr_find_consumer(consumer)) == NULL) { @@ -482,7 +482,7 @@ ACPI_HANDLE res; ACPI_STATUS status; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* check the object type */ if (obj->Type != ACPI_TYPE_STRING) { @@ -540,7 +540,7 @@ ACPI_STATUS status; int cur; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* * Sweep the list forwards turning things on. @@ -620,7 +620,7 @@ { struct acpi_powerresource *rp; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); TAILQ_FOREACH(rp, &acpi_powerresources, ap_link) if (rp->ap_resource == res) @@ -636,7 +636,7 @@ { struct acpi_powerconsumer *pc; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); TAILQ_FOREACH(pc, &acpi_powerconsumers, ac_link) if (pc->ac_consumer == consumer) ==== //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.13 2002/02/23 05:28:22 msmith Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.14 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" @@ -65,7 +65,7 @@ ACPI_STATUS status; void *context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); /* * Special-case some devices that abuse _PRS/_CRS to mean ==== //depot/projects/ia64/sys/dev/acpica/acpi_thermal.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.24 2002/03/04 18:45:46 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.25 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" @@ -172,7 +172,7 @@ int error; char oidname[8]; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_LOCK; @@ -288,7 +288,7 @@ int i; char nbuf[8]; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -380,7 +380,7 @@ struct timespec curtime; ACPI_STATUS status; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -499,7 +499,7 @@ { int i; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -531,7 +531,7 @@ { ACPI_HANDLE cooler; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -571,7 +571,7 @@ ACPI_HANDLE cooler; ACPI_STATUS status; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -613,7 +613,7 @@ acpi_tz_getparam(struct acpi_tz_softc *sc, char *node, int *data) { - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -683,7 +683,7 @@ { struct acpi_tz_softc *sc = (struct acpi_tz_softc *)context; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_ASSERTLOCK; @@ -781,7 +781,7 @@ device_t *devs; int devcount, i; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); devs = NULL; ==== //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.18 2002/04/30 19:34:30 phk Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.19 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" #include @@ -147,7 +147,7 @@ char desc[40]; int rid, i, j; - ACPI_FUNCTION_TRACE(__func__); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); if (acpi_disabled("timer")) return_VOID; ==== //depot/projects/ia64/sys/dev/sound/pcm/feeder.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.21 2002/01/26 22:13:24 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder.c,v 1.22 2002/05/19 06:31:56 peter Exp $"); MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); @@ -273,9 +273,9 @@ SLIST_FOREACH(fte, &feedertab, link) { if (fte->desc == NULL) - goto no; + continue; if (fte->desc->type != FEEDER_FMT) - goto no; + continue; if (fte->desc->in == source->desc->out) { try = feeder_create(fte->feederclass, fte->desc); if (try) { @@ -286,7 +286,6 @@ feeder_destroy(try); } } -no: } /* printf("giving up %s...\n", source->class->name); */ ==== //depot/projects/ia64/sys/dev/sound/pcm/sound.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.72 2002/04/28 22:59:45 cg Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/sound.c,v 1.73 2002/05/19 06:31:56 peter Exp $"); struct snddev_channel { SLIST_ENTRY(snddev_channel) link; @@ -280,10 +280,9 @@ err = vchan_destroy(c); if (err) device_printf(d->dev, "vchan_destroy(%s) == %d\n", c->name, err); - goto restart; + break; /* restart */ } } -restart: } } } >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 0:10:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F7E137B40F; Sun, 19 May 2002 00:10:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6A6A237B40E for ; Sun, 19 May 2002 00:10:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4J7AC863904 for perforce@freebsd.org; Sun, 19 May 2002 00:10:12 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 19 May 2002 00:10:12 -0700 (PDT) Message-Id: <200205190710.g4J7AC863904@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11530 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11530 Change 11530 by peter@peter_ia64 on 2002/05/19 00:10:10 remove hack now that dev/acpica/* is gcc-3.1 safe. (This file is still on the vendor branch in cvs) Affected files ... ... //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h#5 edit Differences ... ==== //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h#5 (text+ko) ==== @@ -472,8 +472,7 @@ #define ACPI_FUNCTION_NAME(a) ACPI_DEBUG_PRINT_INFO _Dbg; \ _Dbg.ComponentId = _COMPONENT; \ - _Dbg.ProcName = \ - (NATIVE_CHAR *)(uintptr_t)a; \ + _Dbg.ProcName = a; \ _Dbg.ModuleName = _THIS_MODULE; #define ACPI_FUNCTION_TRACE(a) ACPI_FUNCTION_NAME(a)\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 1:40:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9771E37B412; Sun, 19 May 2002 01:40:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from sccrmhc03.attbi.com (sccrmhc03.attbi.com [204.127.202.63]) by hub.freebsd.org (Postfix) with ESMTP id 215A237B401; Sun, 19 May 2002 01:40:16 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc03.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020519084015.ZFKI19355.sccrmhc03.attbi.com@InterJet.elischer.org>; Sun, 19 May 2002 08:40:15 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id BAA65132; Sun, 19 May 2002 01:35:24 -0700 (PDT) Date: Sun, 19 May 2002 01:35:22 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Jeff Roberson , John Baldwin , Perforce Change Reviews , Peter Wemm , Jeff Roberson Subject: Re: PERFORCE change 11120 for review In-Reply-To: <20020518205925.H25907@stylus.haikugeek.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, 18 May 2002, Jonathan Mini wrote: > Jeff Roberson [jroberson@chesapeake.net] wrote : > > > The fini call happens w/o the zone lock being held. > > In that case, we haven't any problems with the fini call, except that it > might be called from the page daemon. Is that a problem? > uh, it might? (don't have the source on me at the moment) > -- > Jonathan Mini > http://www.haikugeek.com > > "He who is not aware of his ignorance will be only misled by his knowledge." > -- Richard Whatley > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 1:40:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63A8D37B40C; Sun, 19 May 2002 01:40:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from sccrmhc03.attbi.com (sccrmhc03.attbi.com [204.127.202.63]) by hub.freebsd.org (Postfix) with ESMTP id D483837B40E; Sun, 19 May 2002 01:40:22 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc03.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020519084022.ZFLA19355.sccrmhc03.attbi.com@InterJet.elischer.org>; Sun, 19 May 2002 08:40:22 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id BAA65134; Sun, 19 May 2002 01:38:08 -0700 (PDT) Date: Sun, 19 May 2002 01:38:08 -0700 (PDT) From: Julian Elischer To: Jeff Roberson Cc: Jonathan Mini , John Baldwin , Perforce Change Reviews , Peter Wemm , Jeff Roberson Subject: Re: PERFORCE change 11120 for review In-Reply-To: <20020519000301.K49505-100000@mail.chesapeake.net> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, 19 May 2002, Jeff Roberson wrote: > > On Sat, 18 May 2002, Jonathan Mini wrote: > > > Jeff Roberson [jroberson@chesapeake.net] wrote : > > > > > The fini call happens w/o the zone lock being held. > > > > In that case, we haven't any problems with the fini call, except that it > > might be called from the page daemon. Is that a problem? > > > In all likelyhood it will *only* be called from the page daemon. > Are you saying that discarding excess items occurs 'offline' and is done by the paging daemon? i.e. the dissassociation of the thread and its stack doesn't happen in teh calling coext of the uma_zfree(). (?) (no source here) julian > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 10:24: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23C8D37B405; Sun, 19 May 2002 10:23:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 521A137B406 for ; Sun, 19 May 2002 10:23:58 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4JHNwk74620 for perforce@freebsd.org; Sun, 19 May 2002 10:23:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 19 May 2002 10:23:58 -0700 (PDT) Message-Id: <200205191723.g4JHNwk74620@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 11544 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11544 Change 11544 by rwatson@rwatson_curry on 2002/05/19 10:23:13 Cache td->td_proc in local variable p. Insert a neglected crcopy() from the new crget/crcopy credential update approach. This removes crashes/panics due to bogus credential data. I think. :-) Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#146 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#146 (text+ko) ==== @@ -1646,6 +1646,7 @@ __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap) { struct ucred *newcred, *oldcred; + struct proc *p; struct mac newlabel; int error; @@ -1656,24 +1657,26 @@ return (error); } + p = td->td_proc; mtx_lock(&Giant); - PROC_LOCK(td->td_proc); - oldcred = td->td_proc->p_ucred; + PROC_LOCK(p); + oldcred = p->p_ucred; error = mac_cred_check_relabel_subject(oldcred, &newlabel); if (error) { - PROC_UNLOCK(td->td_proc); + PROC_UNLOCK(p); crfree(newcred); mtx_unlock(&Giant); return (error); } - setsugid(td->td_proc); + setsugid(p); + crcopy(newcred, oldcred); mac_relabel_subject(newcred, &newlabel); - td->td_proc->p_ucred = newcred; + p->p_ucred = newcred; - PROC_UNLOCK(td->td_proc); + PROC_UNLOCK(p); crfree(oldcred); mtx_unlock(&Giant); return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 15:34:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21DF537B40D; Sun, 19 May 2002 15:34:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9EF7937B413 for ; Sun, 19 May 2002 15:34:17 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4JMYH229990 for perforce@freebsd.org; Sun, 19 May 2002 15:34:17 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 19 May 2002 15:34:17 -0700 (PDT) Message-Id: <200205192234.g4JMYH229990@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11557 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11557 Change 11557 by marcel@marcel_vaio on 2002/05/19 15:34:05 Sync-up with trap.c rev 1.54 and remove the workaround in procfs_map.c. One diff less... Affected files ... ... //depot/projects/ia64/sys/fs/procfs/procfs_map.c#4 edit ... //depot/projects/ia64/sys/ia64/ia64/trap.c#27 edit Differences ... ==== //depot/projects/ia64/sys/fs/procfs/procfs_map.c#4 (text+ko) ==== @@ -109,13 +109,11 @@ resident = 0; addr = entry->start; -#ifndef __ia64__ /* This explodes for some reason */ while (addr < entry->end) { if (pmap_extract( pmap, addr)) resident++; addr += PAGE_SIZE; } -#endif for (lobj = tobj = obj; tobj; tobj = tobj->backing_object) lobj = tobj; ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#27 (text+ko) ==== @@ -519,58 +519,43 @@ case IA64_VEC_INST_ACCESS_RIGHTS: case IA64_VEC_DATA_ACCESS_RIGHTS: { - vm_offset_t va = framep->tf_cr_ifa; - struct vmspace *vm = NULL; + vm_offset_t va; + struct vmspace *vm; vm_map_t map; - vm_prot_t ftype = 0; + vm_prot_t ftype; int rv; + rv = 0; + va = framep->tf_cr_ifa; + /* - * If it was caused by fuswintr or suswintr, - * just punt. Note that we check the faulting - * address against the address accessed by - * [fs]uswintr, in case another fault happens - * when they are running. + * If it was caused by fuswintr or suswintr, just punt. Note + * that we check the faulting address against the address + * accessed by [fs]uswintr, in case another fault happens when + * they are running. */ - if (!user && - td != NULL && - td->td_pcb->pcb_onfault == (unsigned long)fswintrberr && - td->td_pcb->pcb_accessaddr == va) { + if (!user && td != NULL && td->td_pcb->pcb_accessaddr == va && + td->td_pcb->pcb_onfault == (unsigned long)fswintrberr) { framep->tf_cr_iip = td->td_pcb->pcb_onfault; framep->tf_cr_ipsr &= ~IA64_PSR_RI; td->td_pcb->pcb_onfault = 0; goto out; } - /* - * It is only a kernel address space fault iff: - * 1. !user and - * 2. pcb_onfault not set or - * 3. pcb_onfault set but kernel space data fault - * The last can occur during an exec() copyin where the - * argument space is lazy-allocated. - * - * For the purposes of the Linux emulator, we allow - * kernel accesses to a small region of the - * user stack which the emulator uses to - * translate syscall arguments. - */ - if (!user - && ((va >= VM_MIN_KERNEL_ADDRESS) - || (td == NULL) - || (td->td_pcb->pcb_onfault == 0))) { - if (va >= trunc_page(PS_STRINGS - - szsigcode - - SPARE_USRSPACE) - && va < round_page(PS_STRINGS - - szsigcode)) { - vm = p->p_vmspace; - map = &vm->vm_map; - } else { - map = kernel_map; - } + va = trunc_page((vm_offset_t)va); + + if (va >= VM_MIN_KERNEL_ADDRESS) { + /* + * Don't allow user-mode faults for kernel virtual + * addresses + */ + if (user) + goto no_fault_in; + map = kernel_map; } else { - vm = p->p_vmspace; + vm = (p != NULL) ? p->p_vmspace : NULL; + if (vm == NULL) + goto no_fault_in; map = &vm->vm_map; } @@ -580,51 +565,47 @@ ftype = VM_PROT_WRITE; else ftype = VM_PROT_READ; - - va = trunc_page((vm_offset_t)va); if (map != kernel_map) { /* - * Keep swapout from messing with us - * during this critical time. + * Keep swapout from messing with us during this + * critical time. */ PROC_LOCK(p); ++p->p_lock; PROC_UNLOCK(p); /* Fault in the user page: */ - rv = vm_fault(map, va, ftype, - (ftype & VM_PROT_WRITE) - ? VM_FAULT_DIRTY - : VM_FAULT_NORMAL); + rv = vm_fault(map, va, ftype, (ftype & VM_PROT_WRITE) + ? VM_FAULT_DIRTY : VM_FAULT_NORMAL); PROC_LOCK(p); --p->p_lock; PROC_UNLOCK(p); } else { /* - * Don't have to worry about process - * locking or stacks in the kernel. + * Don't have to worry about process locking or + * stacks in the kernel. */ rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL); } + if (rv == KERN_SUCCESS) goto out; + no_fault_in: if (!user) { - /* Check for copyin/copyout fault */ - if (td != NULL && - td->td_pcb->pcb_onfault != 0) { - framep->tf_cr_iip = - td->td_pcb->pcb_onfault; + /* Check for copyin/copyout fault. */ + if (td != NULL && td->td_pcb->pcb_onfault != 0) { + framep->tf_cr_iip = td->td_pcb->pcb_onfault; framep->tf_cr_ipsr &= ~IA64_PSR_RI; td->td_pcb->pcb_onfault = 0; goto out; } goto dopanic; } - ucode = va; - i = SIGSEGV; + ucode = va; + i = (rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV; break; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 15:43:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29ED237B406; Sun, 19 May 2002 15:43:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id 1163937B403; Sun, 19 May 2002 15:43:42 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 66C27A900; Sun, 19 May 2002 15:42:36 -0700 (PDT) Date: Sun, 19 May 2002 15:42:36 -0700 From: Jonathan Mini To: Julian Elischer Cc: Jeff Roberson , John Baldwin , Perforce Change Reviews , Peter Wemm , Jeff Roberson Subject: Re: PERFORCE change 11120 for review Message-ID: <20020519154236.I25907@stylus.haikugeek.com> References: <20020519000301.K49505-100000@mail.chesapeake.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from julian@elischer.org on Sun, May 19, 2002 at 01:38:08AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > > > On Sun, 19 May 2002, Jeff Roberson wrote: > > > > > On Sat, 18 May 2002, Jonathan Mini wrote: > > > > > Jeff Roberson [jroberson@chesapeake.net] wrote : > > > > > > > The fini call happens w/o the zone lock being held. > > > > > > In that case, we haven't any problems with the fini call, except that it > > > might be called from the page daemon. Is that a problem? > > > > > In all likelyhood it will *only* be called from the page daemon. > > > > Are you saying that discarding excess items occurs 'offline' > and is done by the paging daemon? > i.e. the dissassociation of the thread and its stack > doesn't happen in teh calling coext of the uma_zfree(). (?) > (no source here) > That's correct. The thread and its stack aren't actually deallocated until UMA frees the slab that the thread is on. UMA does this on a high/low water system, and will also allocate new slabs before all available threads are allocated. -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 16:17:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3172437B400; Sun, 19 May 2002 16:17:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5864237B404 for ; Sun, 19 May 2002 16:17:09 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4JNH9U37592 for perforce@freebsd.org; Sun, 19 May 2002 16:17:09 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 19 May 2002 16:17:09 -0700 (PDT) Message-Id: <200205192317.g4JNH9U37592@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11558 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11558 Change 11558 by jake@jake_sparc64 on 2002/05/19 16:16:51 These shouldn't be here. Affected files ... ... //depot/projects/sparc64/lib/csu/sparc64/crtbegin.c#2 delete ... //depot/projects/sparc64/lib/csu/sparc64/crtend.c#2 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 16:35:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 236F137B412; Sun, 19 May 2002 16:35:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4C55037B40F for ; Sun, 19 May 2002 16:35:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4JNZWs39321 for perforce@freebsd.org; Sun, 19 May 2002 16:35:32 -0700 (PDT) (envelope-from tmm@freebsd.org) Date: Sun, 19 May 2002 16:35:32 -0700 (PDT) Message-Id: <200205192335.g4JNZWs39321@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 11560 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11560 Change 11560 by tmm@tmm_sparc64 on 2002/05/19 16:35:28 Remove this leftover from past PCI hacks. Affected files ... ... //depot/projects/sparc64/sys/dev/pci/pcib.h#2 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 16:50:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D352037B40C; Sun, 19 May 2002 16:50:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1CEDF37B414 for ; Sun, 19 May 2002 16:50:51 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4JNopk40635 for perforce@freebsd.org; Sun, 19 May 2002 16:50:51 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sun, 19 May 2002 16:50:51 -0700 (PDT) Message-Id: <200205192350.g4JNopk40635@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11562 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11562 Change 11562 by mini@mini_stylus on 2002/05/19 16:50:14 - Don't indent a line differently for no reason. - Intent a comment the same as the code around it. Affected files ... ... //depot/projects/kse/sys/compat/svr4/svr4_misc.c#13 edit Differences ... ==== //depot/projects/kse/sys/compat/svr4/svr4_misc.c#13 (text+ko) ==== @@ -1372,10 +1372,10 @@ nprocs--; return 0; } -/* XXXKSE this needs clarification */ + /* XXXKSE this needs clarification */ if (P_SHOULDSTOP(q) && ((q->p_flag & P_WAITED) == 0) && (q->p_flag & P_TRACED || - (SCARG(uap, options) & (SVR4_WSTOPPED|SVR4_WCONTINUED)))) { + (SCARG(uap, options) & (SVR4_WSTOPPED|SVR4_WCONTINUED)))) { mtx_unlock_spin(&sched_lock); DPRINTF(("jobcontrol %d\n", q->p_pid)); if (((SCARG(uap, options) & SVR4_WNOWAIT)) == 0) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 17:31:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2342E37B401; Sun, 19 May 2002 17:31:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 435D337B41B for ; Sun, 19 May 2002 17:30:40 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4K0UeN48652 for perforce@freebsd.org; Sun, 19 May 2002 17:30:40 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sun, 19 May 2002 17:30:40 -0700 (PDT) Message-Id: <200205200030.g4K0UeN48652@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11564 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11564 Change 11564 by mini@mini_stylus on 2002/05/19 17:29:42 Remove #if 0'd code that we are still trying to keep from bitrot that not only wouldn't work, but wouldn't compile either. Affected files ... ... //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#5 edit Differences ... ==== //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#5 (text+ko) ==== @@ -91,25 +91,10 @@ error = EINVAL; break; } -#if 0 - mtx_lock_spin(&sched_lock); - p->p_step = 0; - if (P_SHOULDSTOP(p)) { - p->p_xstat = sig; - p->flag &= ~(P_STOPPED_TRACE|P_STOPPED_SGNL): - setrunnable(&p->p_thread); - mtx_unlock_spin(&sched_lock); - } else { - mtx_unlock_spin(&sched_lock); - if (sig) - psignal(p, sig); - } -#else if (sig) psignal(p, sig); p->p_step = 0; wakeup(&p->p_step); -#endif break; default: error = (ENOTTY); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 18: 0:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43DC637B410; Sun, 19 May 2002 18:00:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0B7DA37B406 for ; Sun, 19 May 2002 18:00:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4K10FD53492 for perforce@freebsd.org; Sun, 19 May 2002 18:00:15 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sun, 19 May 2002 18:00:15 -0700 (PDT) Message-Id: <200205200100.g4K10FD53492@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11565 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11565 Change 11565 by mini@mini_stylus on 2002/05/19 17:59:40 Rearrange so that the default case is the last, and add break statements to the end of each case group. Affected files ... ... //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#17 edit Differences ... ==== //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#17 (text+ko) ==== @@ -552,7 +552,7 @@ mtx_lock_spin(&sched_lock); td2 = FIRST_THREAD_IN_PROC(p); /* XXXKSE pretend only one thread */ - + if (P_SHOULDSTOP(p)) { state = "T (stopped)"; } else { @@ -566,13 +566,6 @@ break; } switch(td2->td_state) { - default: - case TDS_NEW: - case TDS_UNQUEUED: - case TDS_IWAIT: - case TDS_SURPLUS: - state = "? (unknown)"; - break; case TDS_SLP: case TDS_MTX: state = "S (sleeping)"; @@ -581,6 +574,13 @@ case TDS_RUNNING: state = "R (running)"; break; + case TDS_NEW: + case TDS_UNQUEUED: + case TDS_IWAIT: + case TDS_SURPLUS: + default: + state = "? (unknown)"; + break; } break; case PRS_WAIT: @@ -591,6 +591,7 @@ break; default: state = "? (unknown)"; + break; } } mtx_unlock_spin(&sched_lock); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 18: 3:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D54737B411; Sun, 19 May 2002 18:03:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0B94337B40C for ; Sun, 19 May 2002 18:03:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4K13Ju54315 for perforce@freebsd.org; Sun, 19 May 2002 18:03:19 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sun, 19 May 2002 18:03:19 -0700 (PDT) Message-Id: <200205200103.g4K13Ju54315@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11566 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11566 Change 11566 by mini@mini_stylus on 2002/05/19 18:02:27 Whitespace changes. Indent the case statements a la style(9). Affected files ... ... //depot/projects/kse/sys/ddb/db_ps.c#20 edit Differences ... ==== //depot/projects/kse/sys/ddb/db_ps.c#20 (text+ko) ==== @@ -105,10 +105,18 @@ else state = "Normal"; break; - case PRS_NEW: state = "New"; break; - case PRS_WAIT: state = "Wait"; break; - case PRS_ZOMBIE: state = "Zombie"; break; - default: state = "Unknown"; break; + case PRS_NEW: + state = "New"; + break; + case PRS_WAIT: + state = "Wait"; + break; + case PRS_ZOMBIE: + state = "Zombie"; + break; + default: + state = "Unknown"; + break; } db_printf("%5d %8p %8p %4d %5d %5d %07x %s", p->p_pid, (volatile void *)p, (void *)p->p_uarea, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 18: 3:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A183E37B40C; Sun, 19 May 2002 18:03:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4B4BE37B40F for ; Sun, 19 May 2002 18:03:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4K13Km54325 for perforce@freebsd.org; Sun, 19 May 2002 18:03:20 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sun, 19 May 2002 18:03:20 -0700 (PDT) Message-Id: <200205200103.g4K13Km54325@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11567 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11567 Change 11567 by mini@mini_stylus on 2002/05/19 18:03:10 Clarify comments. Affected files ... ... //depot/projects/kse/sys/i386/i386/swtch.s#33 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/swtch.s#33 (text+ko) ==== @@ -65,17 +65,19 @@ /* * cpu_throw() + * + * This is the second half of cpu_swtch(). It is used when the current + * thread is either a dummy or slated to die, and we no longer care + * about its state. */ ENTRY(cpu_throw) jmp sw1 /* - * cpu_switch: - * Save all the state of the current thread and select and load the state - * of the next thread to run. - * Cpu_throw() is just the 2nd part of cpu_swtch() It is used when - * The current thread is either a dummy or is slated to die, so we don't - * want to save it's state. + * cpu_switch() + * + * Save the current thread state, then select the next thread to run + * and load its state. */ ENTRY(cpu_switch) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 18: 7:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED42637B40D; Sun, 19 May 2002 18:07:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1368737B40C for ; Sun, 19 May 2002 18:07:26 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4K17Pn59457 for perforce@freebsd.org; Sun, 19 May 2002 18:07:25 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sun, 19 May 2002 18:07:25 -0700 (PDT) Message-Id: <200205200107.g4K17Pn59457@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11570 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11570 Change 11570 by mini@mini_stylus on 2002/05/19 18:06:24 - Remove whitespace nit not present in -CURRENT. - 'Not reached' -> 'NOTREACHED' Affected files ... ... //depot/projects/kse/sys/i386/i386/trap.c#38 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#38 (text+ko) ==== @@ -260,14 +260,14 @@ td->td_frame = &frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - + /* * First check that we shouldn't just abort. * But check if the are the single thread first! */ if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { thread_exit(); - /* Not reached */ + /* NOTREACHED */ } switch (type) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 18:14:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A9BE37B40C; Sun, 19 May 2002 18:13:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E4FCD37B41B for ; Sun, 19 May 2002 18:13:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4K1DY160929 for perforce@freebsd.org; Sun, 19 May 2002 18:13:34 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 19 May 2002 18:13:34 -0700 (PDT) Message-Id: <200205200113.g4K1DY160929@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11572 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11572 Change 11572 by jake@jake_sparc64 on 2002/05/19 18:13:24 De-inline the tlb functions. These were so big that gcc3.1 refused to inline them anyway. Affected files ... ... //depot/projects/sparc64/sys/conf/files.sparc64#35 edit ... //depot/projects/sparc64/sys/sparc64/include/tlb.h#35 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/tlb.c#1 add Differences ... ==== //depot/projects/sparc64/sys/conf/files.sparc64#35 (text+ko) ==== @@ -79,6 +79,7 @@ sparc64/sparc64/sys_machdep.c standard sparc64/sparc64/swtch.s standard sparc64/sparc64/tick.c standard +sparc64/sparc64/tlb.c standard sparc64/sparc64/trap.c standard sparc64/sparc64/tsb.c standard sparc64/sparc64/vm_machdep.c standard ==== //depot/projects/sparc64/sys/sparc64/include/tlb.h#35 (text+ko) ==== @@ -83,106 +83,9 @@ extern int kernel_tlb_slots; extern struct tte *kernel_ttes; -/* - * Some tlb operations must be atomic, so no interrupt or trap can be allowed - * while they are in progress. Traps should not happen, but interrupts need to - * be explicitely disabled. critical_enter() cannot be used here, since it only - * disables soft interrupts. - */ - -static __inline void -tlb_context_demap(struct pmap *pm) -{ - void *cookie; - u_long s; - - /* - * It is important that we are not interrupted or preempted while - * doing the IPIs. The interrupted CPU may hold locks, and since - * it will wait for the CPU that sent the IPI, this can lead - * to a deadlock when an interrupt comes in on that CPU and it's - * handler tries to grab one of that locks. This will only happen for - * spin locks, but these IPI types are delivered even if normal - * interrupts are disabled, so the lock critical section will not - * protect the target processor from entering the IPI handler with - * the lock held. - */ - critical_enter(); - cookie = ipi_tlb_context_demap(pm); - if (pm->pm_active & PCPU_GET(cpumask)) { - KASSERT(pm->pm_context[PCPU_GET(cpuid)] != -1, - ("tlb_context_demap: inactive pmap?")); - s = intr_disable(); - stxa(TLB_DEMAP_PRIMARY | TLB_DEMAP_CONTEXT, ASI_DMMU_DEMAP, 0); - stxa(TLB_DEMAP_PRIMARY | TLB_DEMAP_CONTEXT, ASI_IMMU_DEMAP, 0); - membar(Sync); - intr_restore(s); - } - ipi_wait(cookie); - critical_exit(); -} - -static __inline void -tlb_page_demap(u_int tlb, struct pmap *pm, vm_offset_t va) -{ - u_long flags; - void *cookie; - u_long s; - - critical_enter(); - cookie = ipi_tlb_page_demap(tlb, pm, va); - if (pm->pm_active & PCPU_GET(cpumask)) { - KASSERT(pm->pm_context[PCPU_GET(cpuid)] != -1, - ("tlb_page_demap: inactive pmap?")); - if (pm == kernel_pmap) - flags = TLB_DEMAP_NUCLEUS | TLB_DEMAP_PAGE; - else - flags = TLB_DEMAP_PRIMARY | TLB_DEMAP_PAGE; - - s = intr_disable(); - if (tlb & TLB_DTLB) { - stxa(TLB_DEMAP_VA(va) | flags, ASI_DMMU_DEMAP, 0); - membar(Sync); - } - if (tlb & TLB_ITLB) { - stxa(TLB_DEMAP_VA(va) | flags, ASI_IMMU_DEMAP, 0); - membar(Sync); - } - intr_restore(s); - } - ipi_wait(cookie); - critical_exit(); -} - -static __inline void -tlb_range_demap(struct pmap *pm, vm_offset_t start, vm_offset_t end) -{ - vm_offset_t va; - void *cookie; - u_long flags; - u_long s; - - critical_enter(); - cookie = ipi_tlb_range_demap(pm, start, end); - if (pm->pm_active & PCPU_GET(cpumask)) { - KASSERT(pm->pm_context[PCPU_GET(cpuid)] != -1, - ("tlb_range_demap: inactive pmap?")); - if (pm == kernel_pmap) - flags = TLB_DEMAP_NUCLEUS | TLB_DEMAP_PAGE; - else - flags = TLB_DEMAP_PRIMARY | TLB_DEMAP_PAGE; - - s = intr_disable(); - for (va = start; va < end; va += PAGE_SIZE) { - stxa(TLB_DEMAP_VA(va) | flags, ASI_DMMU_DEMAP, 0); - stxa(TLB_DEMAP_VA(va) | flags, ASI_IMMU_DEMAP, 0); - membar(Sync); - } - intr_restore(s); - } - ipi_wait(cookie); - critical_exit(); -} +void tlb_context_demap(struct pmap *pm); +void tlb_page_demap(u_int tlb, struct pmap *pm, vm_offset_t va); +void tlb_range_demap(struct pmap *pm, vm_offset_t start, vm_offset_t end); #define tlb_tte_demap(tte, pm) \ tlb_page_demap(TD_GET_TLB((tte).tte_data), pm, \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 18:14:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A394937B40D; Sun, 19 May 2002 18:13:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6EBE337B40F for ; Sun, 19 May 2002 18:13:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4K1DXM60924 for perforce@freebsd.org; Sun, 19 May 2002 18:13:33 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sun, 19 May 2002 18:13:33 -0700 (PDT) Message-Id: <200205200113.g4K1DXM60924@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11571 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11571 Change 11571 by mini@mini_stylus on 2002/05/19 18:13:08 Diff reduction against -CURRENT: Don't rename a label. Affected files ... ... //depot/projects/kse/sys/i386/i386/trap.c#39 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#39 (text+ko) ==== @@ -286,7 +286,7 @@ #ifdef DEV_NPX ucode = npxtrap(); if (ucode == -1) - goto out; + goto userout; #else ucode = code; #endif @@ -336,7 +336,7 @@ } #endif if (i == -1) - goto out; + goto userout; if (i == 0) goto user; @@ -361,7 +361,7 @@ lastalert = time_second; } mtx_unlock(&Giant); - goto out; + goto userout; #else /* !POWERFAIL_NMI */ /* machine/parity/power fail/"kitchen sink" faults */ /* XXX Giant */ @@ -376,7 +376,7 @@ kdb_trap (type, 0, &frame); } #endif /* DDB */ - goto out; + goto userout; } else if (panic_on_nmi) panic("NMI indicates hardware failure"); break; @@ -397,7 +397,7 @@ #ifdef DEV_NPX /* transparent fault (due to context switch "late") */ if (npxdna()) - goto out; + goto userout; #endif if (!pmath_emulate) { i = SIGFPE; @@ -409,7 +409,7 @@ mtx_unlock(&Giant); if (i == 0) { if (!(frame.tf_eflags & PSL_T)) - goto out; + goto userout; frame.tf_eflags &= ~PSL_T; i = SIGTRAP; } @@ -434,7 +434,7 @@ switch (type) { case T_PAGEFLT: /* page fault */ (void) trap_pfault(&frame, FALSE, eva); - goto out; + goto userout; case T_DNA: #ifdef DEV_NPX @@ -444,7 +444,7 @@ * registered such use. */ if (npxdna()) - goto out; + goto userout; #endif break; @@ -464,7 +464,7 @@ * returns to original process */ vm86_trap((struct vm86frame *)&frame); - goto out; + goto userout; } if (type == T_STKFLT) break; @@ -492,7 +492,7 @@ PROC_LOCK(p); psignal(p, SIGBUS); PROC_UNLOCK(p); - goto out; + goto userout; } /* @@ -507,25 +507,25 @@ */ if (frame.tf_eip == (int)doreti_iret) { frame.tf_eip = (int)doreti_iret_fault; - goto out; + goto userout; } if (frame.tf_eip == (int)doreti_popl_ds) { frame.tf_eip = (int)doreti_popl_ds_fault; - goto out; + goto userout; } if (frame.tf_eip == (int)doreti_popl_es) { frame.tf_eip = (int)doreti_popl_es_fault; - goto out; + goto userout; } if (frame.tf_eip == (int)doreti_popl_fs) { frame.tf_eip = (int)doreti_popl_fs_fault; - goto out; + goto userout; } if (PCPU_GET(curpcb) != NULL && PCPU_GET(curpcb)->pcb_onfault != NULL) { frame.tf_eip = (int)PCPU_GET(curpcb)->pcb_onfault; - goto out; + goto userout; } break; @@ -541,7 +541,7 @@ */ if (frame.tf_eflags & PSL_NT) { frame.tf_eflags &= ~PSL_NT; - goto out; + goto userout; } break; @@ -553,7 +553,7 @@ * silently until the syscall handler has * saved the flags. */ - goto out; + goto userout; } if (frame.tf_eip == (int)IDTVEC(lcall_syscall) + 1) { /* @@ -561,7 +561,7 @@ * flags. Stop single stepping it. */ frame.tf_eflags &= ~PSL_T; - goto out; + goto userout; } /* * Ignore debug register trace traps due to @@ -580,7 +580,7 @@ * processor doesn't */ load_dr6(rdr6() & 0xfffffff0); - goto out; + goto userout; } /* * Fall through (TRCTRAP kernel mode, kernel address) @@ -593,7 +593,7 @@ #ifdef DDB /* XXX Giant */ if (kdb_trap (type, 0, &frame)) - goto out; + goto userout; #endif break; @@ -607,7 +607,7 @@ lastalert = time_second; } mtx_unlock(&Giant); - goto out; + goto userout; #else /* !POWERFAIL_NMI */ /* XXX Giant */ /* machine/parity/power fail/"kitchen sink" faults */ @@ -622,16 +622,16 @@ kdb_trap (type, 0, &frame); } #endif /* DDB */ - goto out; + goto userout; } else if (panic_on_nmi == 0) - goto out; + goto userout; /* FALL THROUGH */ #endif /* POWERFAIL_NMI */ #endif /* DEV_ISA */ } trap_fatal(&frame, eva); - goto out; + goto userout; } /* Translate fault for emulators (e.g. Linux) */ @@ -653,7 +653,7 @@ user: userret(td, &frame, sticks); mtx_assert(&Giant, MA_NOTOWNED); -out: +userout: return; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 18:14:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6A0437B404; Sun, 19 May 2002 18:14:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0B67C37B401 for ; Sun, 19 May 2002 18:14:36 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4K1EZ861112 for perforce@freebsd.org; Sun, 19 May 2002 18:14:35 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 19 May 2002 18:14:35 -0700 (PDT) Message-Id: <200205200114.g4K1EZ861112@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11573 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11573 Change 11573 by jake@jake_sparc64 on 2002/05/19 18:14:08 Forward declare struct thread. Affected files ... ... //depot/projects/sparc64/sys/sys/smp.h#7 edit Differences ... ==== //depot/projects/sparc64/sys/sys/smp.h#7 (text+ko) ==== @@ -48,6 +48,8 @@ * cpu_mp_announce() will be called so that machine dependent messages about * the MP support may be output to the console if desired. */ +struct thread; + void cpu_mp_announce(void); int cpu_mp_probe(void); void cpu_mp_start(void); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 18:15:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2290837B400; Sun, 19 May 2002 18:15:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C6C4F37B412 for ; Sun, 19 May 2002 18:15:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4K1Fb561410 for perforce@freebsd.org; Sun, 19 May 2002 18:15:37 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 19 May 2002 18:15:37 -0700 (PDT) Message-Id: <200205200115.g4K1Fb561410@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11574 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11574 Change 11574 by jake@jake_sparc64 on 2002/05/19 18:15:09 Forward declare struct trapframe. Affected files ... ... //depot/projects/sparc64/sys/sparc64/include/intr_machdep.h#19 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/include/intr_machdep.h#19 (text+ko) ==== @@ -47,6 +47,8 @@ #define PIL_FAST 13 /* fast interrupts */ #define PIL_TICK 14 +struct trapframe; + typedef void ih_func_t(struct trapframe *); typedef void iv_func_t(void *); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 18:21:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 193B537B410; Sun, 19 May 2002 18:21:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0039437B40C for ; Sun, 19 May 2002 18:21:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4K1Lje65269 for perforce@freebsd.org; Sun, 19 May 2002 18:21:45 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sun, 19 May 2002 18:21:45 -0700 (PDT) Message-Id: <200205200121.g4K1Lje65269@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11576 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11576 Change 11576 by mini@mini_stylus on 2002/05/19 18:21:16 Whitespace and comment fixup. Affected files ... ... //depot/projects/kse/sys/i386/i386/trap.c#40 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#40 (text+ko) ==== @@ -949,22 +949,21 @@ if (td->td_ucred != p->p_ucred) cred_update_thread(td); if (p->p_flag & P_KSES) { - /* + /* * If we are doing a syscall in a KSE environment, - * Then note where our mailbox is. - * There is always the possibility we could do this - * lazily, in sleep() but for now I'll do it every time. + * note where our mailbox is. There is always the + * possibility that we could do this lazily (in sleep()), + * but for now do it every time. */ error = copyin((caddr_t)td->td_kse->ke_mailbox + offsetof(struct kse_mailbox, current_thread), &td->td_mailbox, sizeof(void *)); if (error || td->td_mailbox == NULL) { - td->td_mailbox = NULL; /* single thread it.. */ + td->td_mailbox = NULL; /* single thread it.. */ td->td_flags &= ~TDF_UNBOUND; } else { td->td_flags |= TDF_UNBOUND; } - } params = (caddr_t)frame.tf_esp + sizeof(int); code = frame.tf_eax; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 18:23:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99E5237B413; Sun, 19 May 2002 18:21:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BDA2037B407 for ; Sun, 19 May 2002 18:21:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4K1Ljs65264 for perforce@freebsd.org; Sun, 19 May 2002 18:21:45 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Sun, 19 May 2002 18:21:45 -0700 (PDT) Message-Id: <200205200121.g4K1Ljs65264@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11575 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11575 Change 11575 by jake@jake_sparc64 on 2002/05/19 18:20:46 Add SMP aware cache primitives for invalidating a single physical page from the icache and/or dcache. Hopefully this will improve stability for SMP. Affected files ... ... //depot/projects/sparc64/sys/sparc64/include/cache.h#12 edit ... //depot/projects/sparc64/sys/sparc64/include/smp.h#15 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/cache.c#18 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/genassym.c#68 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/machdep.c#79 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/mp_exception.s#9 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/mp_machdep.c#15 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/pmap.c#86 edit ... //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#54 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/include/cache.h#12 (text+ko) ==== @@ -103,25 +103,48 @@ void ecache_inval_phys(vm_offset_t, vm_offset_t); #endif +void dcache_page_inval(vm_offset_t pa); +void icache_page_inval(vm_offset_t pa); + +#define DC_TAG_SHIFT 2 +#define DC_VALID_SHIFT 0 + +#define DC_TAG_BITS 28 +#define DC_VALID_BITS 2 + +#define DC_TAG_MASK ((1 << DC_TAG_BITS) - 1) +#define DC_VALID_MASK ((1 << DC_VALID_BITS) - 1) + +#define IC_TAG_SHIFT 7 +#define IC_VALID_SHIFT 36 + +#define IC_TAG_BITS 28 +#define IC_VALID_BITS 1 + +#define IC_TAG_MASK ((1 << IC_TAG_BITS) - 1) +#define IC_VALID_MASK ((1 << IC_VALID_BITS) - 1) + /* * Cache control information. */ struct cacheinfo { - int c_enabled; /* true => cache is enabled */ - int ic_size; /* instruction cache */ - int ic_set; - int ic_l2set; - int ic_assoc; - int ic_linesize; - int dc_size; /* data cache */ - int dc_l2size; - int dc_assoc; - int dc_linesize; - int ec_size; /* external cache info */ - int ec_assoc; - int ec_l2set; - int ec_linesize; - int ec_l2linesize; + u_int c_enabled; /* true => cache is enabled */ + u_int ic_size; /* instruction cache */ + u_int ic_set; + u_int ic_l2set; + u_int ic_assoc; + u_int ic_linesize; + u_int dc_size; /* data cache */ + u_int dc_l2size; + u_int dc_assoc; + u_int dc_linesize; + u_int ec_size; /* external cache info */ + u_int ec_assoc; + u_int ec_l2set; + u_int ec_linesize; + u_int ec_l2linesize; }; +extern struct cacheinfo cache; + #endif /* !_MACHINE_CACHE_H_ */ ==== //depot/projects/sparc64/sys/sparc64/include/smp.h#15 (text+ko) ==== @@ -57,6 +57,11 @@ struct tte csa_ttes[PCPU_PAGES]; }; +struct ipi_cache_args { + u_int ica_mask; + u_long ica_pa; +}; + struct ipi_tlb_args { u_int ita_mask; u_long ita_tlb; @@ -80,6 +85,7 @@ vm_offset_t mp_tramp_alloc(void); +extern struct ipi_cache_args ipi_cache_args; extern struct ipi_level_args ipi_level_args; extern struct ipi_tlb_args ipi_tlb_args; @@ -91,6 +97,8 @@ extern void mp_startup(void); +extern char tl_ipi_dcache_page_inval[]; +extern char tl_ipi_icache_page_inval[]; extern char tl_ipi_level[]; extern char tl_ipi_test[]; extern char tl_ipi_tlb_context_demap[]; @@ -99,6 +107,36 @@ #ifdef SMP +static __inline void * +ipi_dcache_page_inval(vm_offset_t pa) +{ + struct ipi_cache_args *ica; + + if (smp_cpus == 1) + return (NULL); + ica = &ipi_cache_args; + ica->ica_mask = all_cpus; + ica->ica_pa = pa; + cpu_ipi_selected(all_cpus, 0, (u_long)tl_ipi_dcache_page_inval, + (u_long)ica); + return (&ica->ica_mask); +} + +static __inline void * +ipi_icache_page_inval(vm_offset_t pa) +{ + struct ipi_cache_args *ica; + + if (smp_cpus == 1) + return (NULL); + ica = &ipi_cache_args; + ica->ica_mask = all_cpus; + ica->ica_pa = pa; + cpu_ipi_selected(all_cpus, 0, (u_long)tl_ipi_icache_page_inval, + (u_long)ica); + return (&ica->ica_mask); +} + #ifdef _MACHINE_PMAP_H_ static __inline void * @@ -174,6 +212,18 @@ #else static __inline void * +ipi_dcache_page_inval(vm_offset_t pa) +{ + return (NULL); +} + +static __inline void * +ipi_icache_page_inval(vm_offset_t pa) +{ + return (NULL); +} + +static __inline void * ipi_tlb_context_demap(struct pmap *pm) { return (NULL); ==== //depot/projects/sparc64/sys/sparc64/sparc64/cache.c#18 (text+ko) ==== @@ -152,6 +152,7 @@ #include #include +#include #include #include @@ -163,12 +164,12 @@ #include #include #include +#include #include #include #include -static struct cacheinfo cache; -extern vm_offset_t cache_tmp_va; +struct cacheinfo cache; /* Read to %g0, needed for E$ access. */ #define CDIAG_RDG0(asi, addr) \ @@ -215,6 +216,64 @@ cache.c_enabled = 1; /* enable cache flushing */ } +void +dcache_page_inval(vm_offset_t pa) +{ + u_long target; + void *cookie; + u_long addr; + u_long tag; + + KASSERT((pa & PAGE_MASK) == 0, + ("dcache_page_inval: pa not page aligned")); + + if (!cache.c_enabled) + return; + target = pa >> (PAGE_SHIFT - DC_TAG_SHIFT); + critical_enter(); + cookie = ipi_dcache_page_inval(pa); + for (addr = 0; addr < cache.dc_size; addr += cache.dc_linesize) { + tag = ldxa(addr, ASI_DCACHE_TAG); + if (((tag >> DC_VALID_SHIFT) & DC_VALID_MASK) == 0) + continue; + tag &= DC_TAG_MASK << DC_TAG_SHIFT; + if (tag == target) + stxa_sync(addr, ASI_DCACHE_TAG, tag); + } + ipi_wait(cookie); + critical_exit(); +} + +void +icache_page_inval(vm_offset_t pa) +{ + register u_long tag __asm("%g1"); + u_long target; + void *cookie; + u_long addr; + + KASSERT((pa & PAGE_MASK) == 0, + ("icache_page_inval: pa not page aligned")); + + if (!cache.c_enabled) + return; + target = pa >> (PAGE_SHIFT - IC_TAG_SHIFT); + critical_enter(); + cookie = ipi_icache_page_inval(pa); + for (addr = 0; addr < cache.ic_size; addr += cache.ic_linesize) { + __asm __volatile("ldda [%1] %2, %%g0" /*, %g1 */ + : "=r" (tag) : "r" (addr), "n" (ASI_ICACHE_TAG)); + if (((tag >> IC_VALID_SHIFT) & IC_VALID_MASK) == 0) + continue; + tag &= IC_TAG_MASK << IC_TAG_SHIFT; + if (tag == target) + stxa_sync(addr, ASI_ICACHE_TAG, tag); + } + ipi_wait(cookie); + critical_exit(); +} + + /* Flush a range of addresses from I$ using the flush instruction. */ void icache_flush(vm_offset_t start, vm_offset_t end) ==== //depot/projects/sparc64/sys/sparc64/sparc64/genassym.c#68 (text+ko) ==== @@ -63,6 +63,7 @@ #include #include #include +#include #include #include #include @@ -120,6 +121,22 @@ ASSYM(CSA_VER, offsetof(struct cpu_start_args, csa_ver)); ASSYM(CSA_TTES, offsetof(struct cpu_start_args, csa_ttes)); +ASSYM(DC_TAG_SHIFT, DC_TAG_SHIFT); +ASSYM(DC_TAG_MASK, DC_TAG_MASK); +ASSYM(DC_VALID_SHIFT, DC_VALID_SHIFT); +ASSYM(DC_VALID_MASK, DC_VALID_MASK); +ASSYM(IC_TAG_SHIFT, IC_TAG_SHIFT); +ASSYM(IC_TAG_MASK, IC_TAG_MASK); +ASSYM(IC_VALID_SHIFT, IC_VALID_SHIFT); +ASSYM(IC_VALID_MASK, IC_VALID_MASK); + +ASSYM(DC_SIZE, offsetof(struct cacheinfo, dc_size)); +ASSYM(DC_LINESIZE, offsetof(struct cacheinfo, dc_linesize)); +ASSYM(IC_SIZE, offsetof(struct cacheinfo, ic_size)); +ASSYM(IC_LINESIZE, offsetof(struct cacheinfo, ic_linesize)); + +ASSYM(ICA_PA, offsetof(struct ipi_cache_args, ica_pa)); + ASSYM(KTR_PROC, KTR_PROC); ASSYM(KTR_TRAP, KTR_TRAP); ASSYM(KTR_SMP, KTR_SMP); ==== //depot/projects/sparc64/sys/sparc64/sparc64/machdep.c#79 (text+ko) ==== @@ -86,7 +86,6 @@ #include -#include #include #include #include @@ -95,6 +94,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/sparc64/sys/sparc64/sparc64/mp_exception.s#9 (text+ko) ==== @@ -44,6 +44,86 @@ nop /* + * Invalidate a phsyical page in the data cache. + */ +ENTRY(tl_ipi_dcache_page_inval) +#if KTR_COMPILE & KTR_SMP + CATR(KTR_SMP, "ipi_dcache_page_inval: pa=%#lx" + , %g1, %g2, %g3, 7, 8, 9) + ldx [%g5 + ICA_PA], %g2 + stx %g2, [%g1 + KTR_PARM1] +9: +#endif + + ldx [%g5 + ICA_PA], %g6 + srlx %g6, PAGE_SHIFT - DC_TAG_SHIFT, %g6 + + SET(cache, %g3, %g2) + lduw [%g2 + DC_SIZE], %g3 + lduw [%g2 + DC_LINESIZE], %g4 + sub %g3, %g4, %g2 + +1: ldxa [%g2] ASI_DCACHE_TAG, %g1 + srlx %g1, DC_VALID_SHIFT, %g3 + andcc %g3, DC_VALID_MASK, %g0 + bz,pt %xcc, 2f + set DC_TAG_MASK, %g3 + sllx %g3, DC_TAG_SHIFT, %g3 + and %g1, %g3, %g1 + cmp %g1, %g6 + bne,a,pt %xcc, 2f + nop + stxa %g1, [%g2] ASI_DCACHE_TAG + membar #Sync + +2: brgz,pt %g2, 1b + sub %g2, %g4, %g2 + + IPI_WAIT(%g5, %g1, %g2, %g3) + retry +END(tl_ipi_dcache_page_inval) + +/* + * Invalidate a phsyical page in the instruction cache. + */ +ENTRY(tl_ipi_icache_page_inval) +#if KTR_COMPILE & KTR_SMP + CATR(KTR_SMP, "ipi_icache_page_inval: pa=%#lx" + , %g1, %g2, %g3, 7, 8, 9) + ldx [%g5 + ICA_PA], %g2 + stx %g2, [%g1 + KTR_PARM1] +9: +#endif + + ldx [%g5 + ICA_PA], %g6 + srlx %g6, PAGE_SHIFT - IC_TAG_SHIFT, %g6 + + SET(cache, %g3, %g2) + lduw [%g2 + IC_SIZE], %g3 + lduw [%g2 + IC_LINESIZE], %g4 + sub %g3, %g4, %g2 + +1: ldda [%g2] ASI_ICACHE_TAG, %g0 /*, %g1 */ + srlx %g1, IC_VALID_SHIFT, %g3 + andcc %g3, IC_VALID_MASK, %g0 + bz,pt %xcc, 2f + set IC_TAG_MASK, %g3 + sllx %g3, IC_TAG_SHIFT, %g3 + and %g1, %g3, %g1 + cmp %g1, %g6 + bne,a,pt %xcc, 2f + nop + stxa %g1, [%g2] ASI_ICACHE_TAG + membar #Sync + +2: brgz,pt %g2, 1b + sub %g2, %g4, %g2 + + IPI_WAIT(%g5, %g1, %g2, %g3) + retry +END(tl_ipi_icache_page_inval) + +/* * Trigger a softint at the desired level. */ ENTRY(tl_ipi_level) ==== //depot/projects/sparc64/sys/sparc64/sparc64/mp_machdep.c#15 (text+ko) ==== @@ -95,6 +95,7 @@ * kernel. */ struct cpu_start_args cpu_start_args = { 0, -1, -1, 0, 0 }; +struct ipi_cache_args ipi_cache_args; struct ipi_tlb_args ipi_tlb_args; vm_offset_t mp_tramp; ==== //depot/projects/sparc64/sys/sparc64/sparc64/pmap.c#86 (text+ko) ==== @@ -658,7 +658,7 @@ if (m->md.vcolor != col) { /* XXXSMP */ PMAP_STATS_INC(pmap_nvdflush); - dcache_inval_phys(pa, pa + PAGE_SIZE - 1); + dcache_page_inval(pa); } m->md.vcolor = col; m->md.flags &= ~MPF_VIRGIN; @@ -687,7 +687,7 @@ } } /* XXXSMP */ - dcache_inval_phys(pa, pa + PAGE_SIZE - 1); + dcache_page_inval(pa); return (0); } @@ -1542,7 +1542,7 @@ PMAP_STATS_INC(pmap_niflush); if (pm == kernel_pmap) PMAP_STATS_INC(pmap_niflush_k); - icache_inval_phys(pa, pa + PAGE_SIZE - 1); + icache_page_inval(pa); m->md.flags |= MPF_IFLUSHED; } } @@ -1655,7 +1655,7 @@ vm_offset_t pa = VM_PAGE_TO_PHYS(m); CTR1(KTR_PMAP, "pmap_zero_page: pa=%#lx", pa); - dcache_inval_phys(pa, pa + PAGE_SIZE - 1); + dcache_page_inval(pa); aszero(ASI_PHYS_USE_EC, pa, PAGE_SIZE); } @@ -1667,7 +1667,7 @@ CTR3(KTR_PMAP, "pmap_zero_page_area: pa=%#lx off=%#x size=%#x", pa, off, size); KASSERT(off + size <= PAGE_SIZE, ("pmap_zero_page_area: bad off/size")); - dcache_inval_phys(pa + off, pa + off + size - 1); + dcache_page_inval(pa); aszero(ASI_PHYS_USE_EC, pa + off, size); } @@ -1681,7 +1681,7 @@ vm_offset_t dst = VM_PAGE_TO_PHYS(mdst); CTR2(KTR_PMAP, "pmap_copy_page: src=%#lx dst=%#lx", src, dst); - dcache_inval_phys(dst, dst + PAGE_SIZE - 1); + dcache_page_inval(dst); ascopy(ASI_PHYS_USE_EC, src, dst, PAGE_SIZE); } @@ -1776,8 +1776,7 @@ if ((tp->tte_data & TD_EXEC) != 0) { PMAP_STATS_INC(pmap_niflush); PMAP_STATS_INC(pmap_pgval_niflush); - icache_inval_phys(VM_PAGE_TO_PHYS(m), - VM_PAGE_TO_PHYS(m) + PAGE_SIZE - 1); + icache_page_inval(VM_PAGE_TO_PHYS(m)); m->md.flags |= MPF_IFLUSHED; break; } ==== //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#54 (text+ko) ==== @@ -507,7 +507,7 @@ VMMD_STATS_INC(niorncflush); #endif /* XXX: use dcache_inval()? */ - dcache_inval_phys(pa, pa + PAGE_SIZE - 1); + dcache_page_inval(pa); } } break; @@ -559,8 +559,7 @@ if ((m[i]->md.flags & MPF_NC) != 0) VMMD_STATS_INC(niowncflush); #endif - dcache_inval_phys(pa, - pa + PAGE_SIZE - 1); + dcache_page_inval(pa); m[i]->md.flags |= MPF_VMIO_DONE; } /* @@ -577,8 +576,7 @@ */ VMMD_STATS_INC(niowflush); VMMD_STATS_INC(niowmflush); - dcache_inval_phys(pa, - pa + PAGE_SIZE - 1); + dcache_page_inval(pa); m[i]->md.vcolor = -1; m[i]->md.flags = MPF_VMIO_DONE; } else if ((m[i]->md.flags & MPF_VMIO_DONE) == 0) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 18:40:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68C4337B411; Sun, 19 May 2002 18:40:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6AD0F37B40D for ; Sun, 19 May 2002 18:40:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4K1e8f67066 for perforce@freebsd.org; Sun, 19 May 2002 18:40:08 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sun, 19 May 2002 18:40:08 -0700 (PDT) Message-Id: <200205200140.g4K1e8f67066@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11577 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11577 Change 11577 by mini@mini_stylus on 2002/05/19 18:39:33 Comment and whitespace fixups. Affected files ... ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#41 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#41 (text+ko) ==== @@ -279,7 +279,7 @@ * before freeing them? (not done here) */ kmem_free(kernel_map, (vm_offset_t)pcb->pcb_ext, - ctob(IOPAGES + 1)); + ctob(IOPAGES + 1)); pcb->pcb_ext = 0; } if (pcb->pcb_flags & PCB_DBREGS) { @@ -294,10 +294,10 @@ void cpu_thread_setup(struct thread *td) { + td->td_pcb = (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; td->td_frame = (struct trapframe *)((caddr_t)td->td_pcb - 16) - 1; - } struct md_store { @@ -309,16 +309,16 @@ cpu_save_upcall(struct thread *td, struct kse *newkse) { - /* Point the pcb to the top of the stack */ + /* Point the pcb to the top of the stack. */ newkse->ke_mdstorage = malloc(sizeof(struct md_store), M_TEMP, M_WAITOK); - /* note: use of M_WAITOK means it will not fail */ + /* Note: use of M_WAITOK means it won't fail. */ newkse->ke_pcb = &(((struct md_store *)(newkse->ke_mdstorage))->mds_pcb); newkse->ke_frame = &(((struct md_store *)(newkse->ke_mdstorage))->mds_frame); - /* Copy the upcall pcb . Kernel mode & fp regs are here.*/ + /* Copy the upcall pcb. Kernel mode & fp regs are here. */ bcopy(td->td_pcb, newkse->ke_pcb, sizeof(struct pcb)); /* This copies most of the user mode register values. */ @@ -332,19 +332,19 @@ td->td_flags |= TDF_UPCALLING; - /* Point the pcb to the top of the stack */ + /* Point the pcb to the top of the stack. */ pcb2 = td->td_pcb; /* - * Copy the upcall pcb. This loads kernel regs. - * those not loaded individually below get their default - * valuse here. - * XXXKSE I think it might be an idea - * to simply skip this as I think the values - * of the other registers may be unimportant. + * Copy the upcall pcb. This loads kernel regs. + * Those not loaded individually below get their default + * values here. + * + * XXXKSE It might be a good idea to simply skip this as + * the values of the other registers may be unimportant. * This would remove any requirement for knowing the KSE - * at this time. (see the matching comment below for - * more analysis). (need a good safe default) + * at this time (see the matching comment below for + * more analysis) (need a good safe default). */ bcopy(pcb, pcb2, sizeof(*pcb2)); @@ -353,7 +353,7 @@ * The -16 is so we can expand the trapframe if we go to vm86. * Don't forget to set this stack value into whatever supplies * the address for the fault handlers. - * The contects are filled in at the time we actually DO the + * The contexts are filled in at the time we actually DO the * upcall as only then do we know which KSE we got. */ td->td_frame = (struct trapframe *)((caddr_t)pcb2 - 16) - 1; @@ -375,7 +375,7 @@ * pcb2->pcb_savefpu: cloned above. * pcb2->pcb_flags: cloned above. * pcb2->pcb_onfault: cloned above (always NULL here?). - * pcb2->pcb_gs: cloned above. XXXKSE ??? + * pcb2->pcb_gs: cloned above. XXXKSE ??? * pcb2->pcb_ext: cleared below. */ pcb2->pcb_ext = NULL; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 19 18:45:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67A3837B410; Sun, 19 May 2002 18:45:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0E7A237B41F for ; Sun, 19 May 2002 18:45:15 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4K1jEd67995 for perforce@freebsd.org; Sun, 19 May 2002 18:45:14 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sun, 19 May 2002 18:45:14 -0700 (PDT) Message-Id: <200205200145.g4K1jEd67995@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11578 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11578 Change 11578 by mini@mini_stylus on 2002/05/19 18:44:29 Don't initialize in declarations. Affected files ... ... //depot/projects/kse/sys/i386/i386/trap.c#41 edit ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#42 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#41 (text+ko) ==== ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#42 (text+ko) ==== @@ -257,8 +257,9 @@ void cpu_exit(struct thread *td) { - struct mdproc *mdp = &td->td_proc->p_md; + struct mdproc *mdp; + mdp = &td->td_proc->p_md; if (mdp->md_ldt) user_ldt_free(td); reset_dbregs(); @@ -413,11 +414,14 @@ int cpu_export_context(struct thread *td) { - struct trapframe *frame = td->td_frame; - struct thread_mailbox *tm = td->td_mailbox; - struct trapframe *uframe = &tm->ctx.tfrm.tf_tf; + struct trapframe *frame; + struct thread_mailbox *tm; + struct trapframe *uframe; int error; + frame = td->td_frame; + tm = td->td_mailbox; + uframe = &tm->ctx.tfrm.tf_tf; error = copyout(frame, uframe, sizeof(*frame)); /* * "What about the fp regs?" I hear you ask.... XXXKSE To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 20 11:28: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E48337B407; Mon, 20 May 2002 11:27:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EDAF837B40B for ; Mon, 20 May 2002 11:27:57 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4KIRva52284 for perforce@freebsd.org; Mon, 20 May 2002 11:27:57 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Mon, 20 May 2002 11:27:57 -0700 (PDT) Message-Id: <200205201827.g4KIRva52284@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 11611 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11611 Change 11611 by jake@jake_sparc64 on 2002/05/20 11:27:29 Add a bandaid so sysctl kern.malloc works. Affected files ... ... //depot/projects/sparc64/sys/kern/kern_malloc.c#10 edit Differences ... ==== //depot/projects/sparc64/sys/kern/kern_malloc.c#10 (text+ko) ==== @@ -526,7 +526,7 @@ p += len; first = 1; - for (i = 0; i < 8 * sizeof(type->ks_size); i++) + for (i = 0; i < 32 /* 8 * sizeof(type->ks_size) */; i++) if (type->ks_size & (1 << i)) { if (first) len = snprintf(p, curline, " "); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 20 20:32:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82BC937B407; Mon, 20 May 2002 20:30:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 18B0A37B415 for ; Mon, 20 May 2002 20:30:19 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4L3UIT50010 for perforce@freebsd.org; Mon, 20 May 2002 20:30:18 -0700 (PDT) (envelope-from chris@freebsd.org) Date: Mon, 20 May 2002 20:30:18 -0700 (PDT) Message-Id: <200205210330.g4L3UIT50010@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 11659 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11659 Change 11659 by chris@chris_holly on 2002/05/20 20:29:54 Now that I've finally begun to learn to use xemacs and the PSGML tools, let's start by properly indenting this file. More fix-em-up's to come. Affected files ... ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/lomac/article.sgml#3 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/lomac/article.sgml#3 (text+ko) ==== @@ -2,693 +2,693 @@
LOMAC Operations Manual - + Fraser - + Tim - - + + - + Costello - + Chris - - + + - + Not yet published - + LOMAC is a loadable kernel module-based security extension - available on a number of UNIX kernels. LOMAC provides Low - Water-Mark Mandatory Access Control functionality to protect the - integrity of processes and data from viruses, Trojan horses, - malicious remote users, and compromised root daemons. LOMAC is - designed to be largely invisible to users, and largely painless - to administrators. - + available on a number of UNIX kernels. LOMAC provides Low + Water-Mark Mandatory Access Control functionality to protect the + integrity of processes and data from viruses, Trojan horses, + malicious remote users, and compromised root daemons. LOMAC is + designed to be largely invisible to users, and largely painless + to administrators. + This is the operations manual for LOMAC. It describes LOMAC - and the protection LOMAC provides. Please note that the FreeBSD - version of LOMAC is still under development. Although enough - functionality exists to provide some useful protection, some - features and fixes remain to be implemented. The FreeBSD version - of LOMAC should be used for experimental purposes only at this - time. + and the protection LOMAC provides. Please note that the FreeBSD + version of LOMAC is still under development. Although enough + functionality exists to provide some useful protection, some + features and fixes remain to be implemented. The FreeBSD version + of LOMAC should be used for experimental purposes only at this + time. - + Introduction - + MAC - + Several projects have demonstrated that kernel-resident - Mandatory Access Control (MAC) mechanisms can protect the integrity of Free UNIX systems from - malicious code and users. However, implementations of these - mechanisms have traditionally required invasive kernel - modifications, sometimes coupled with supporting modifications of - user-space utilities, as well. This requirement has hindered the - adoption of MAC mechanisms in the mainstream Free UNIX community. - Adoption has been further discouraged by the difficulty of starting - small and evolving towards a complete MAC solution - in general, - the complete set of extensive modifications must be made before MAC - can provide any useful protection. - + Mandatory Access Control (MAC) mechanisms can protect the integrity of Free UNIX systems from + malicious code and users. However, implementations of these + mechanisms have traditionally required invasive kernel + modifications, sometimes coupled with supporting modifications of + user-space utilities, as well. This requirement has hindered the + adoption of MAC mechanisms in the mainstream Free UNIX community. + Adoption has been further discouraged by the difficulty of starting + small and evolving towards a complete MAC solution - in general, + the complete set of extensive modifications must be made before MAC + can provide any useful protection. + LOMAC is an attempt to make an easily-adoptable form of MAC - integrity protection available to the Free UNIX community without - the discouraging necessity of kernel modifications. LOMAC - implements a simple form of MAC integrity protection based on - Biba's Low Water-Mark model in a Loadable Kernel Module (LKM) - - K. J. Biba, "Integrity Considerations for Secure Computer - Systems," Electronic Systems Division, Hanscom Air Force Base, - Bedford, MA, April 1977, pages 27-31.BIB77 - - - - T. Fraser "LOMAC: Low Water-Mark Integrity Protection for - COTS Environments", Proceedings of the 2000 IEEE Symposium on - Security and Privacy, 2000. - - - - T. Fraser, "LOMAC: MAC You Can Live With", Proceedings of - the FREENIX Track: USENIX Annual Technical Conference, Boston, - Massachusetts, June, 2001. - - - Although it trades off some of the advanced MAC features found in - traditional MAC implementations, LOMAC provides useful integrity - protection without any modifications to the kernel, applications, - or their existing configurations. LOMAC is designed to be - compatible with existing software, and ships with a - one-size-fits-all default configuration. LOMAC may be used to - harden cur rently-deployed FreeBSD systems simply by loading the - LKM into the kernel shortly after boot time. - + integrity protection available to the Free UNIX community without + the discouraging necessity of kernel modifications. LOMAC + implements a simple form of MAC integrity protection based on + Biba's Low Water-Mark model in a Loadable Kernel Module (LKM) + + K. J. Biba, "Integrity Considerations for Secure Computer + Systems," Electronic Systems Division, Hanscom Air Force Base, + Bedford, MA, April 1977, pages 27-31.BIB77 + + + + T. Fraser "LOMAC: Low Water-Mark Integrity Protection for + COTS Environments", Proceedings of the 2000 IEEE Symposium on + Security and Privacy, 2000. + + + + T. Fraser, "LOMAC: MAC You Can Live With", Proceedings of + the FREENIX Track: USENIX Annual Technical Conference, Boston, + Massachusetts, June, 2001. + + + Although it trades off some of the advanced MAC features found in + traditional MAC implementations, LOMAC provides useful integrity + protection without any modifications to the kernel, applications, + or their existing configurations. LOMAC is designed to be + compatible with existing software, and ships with a + one-size-fits-all default configuration. LOMAC may be used to + harden cur rently-deployed FreeBSD systems simply by loading the + LKM into the kernel shortly after boot time. + Once loaded, LOMAC divides the system into two conceptual - levels of integrity: high and low. The high side contains all - process and files that should be protected from malicious code and - remote users, including the system binaries (/bin, - /lib) and configuration files (/etc). - The low side contains the processes that interact with remote - users (remote login sessions, httpd) and the files they download - from the net (mail attachments). Low files may contain viruses or - Trojan Horses. Low processes take input from remote users that may - cause buffer overflows. During run-time, LOMAC protects high files - and processes by preventing low processes from modifying or - signalling them. Thanks to is generic default configuration, LOMAC - handles the division of the system into high and low parts - automatically, without administrative direction. - + levels of integrity: high and low. The high side contains all + process and files that should be protected from malicious code and + remote users, including the system binaries (/bin, + /lib) and configuration files (/etc). + The low side contains the processes that interact with remote + users (remote login sessions, httpd) and the files they download + from the net (mail attachments). Low files may contain viruses or + Trojan Horses. Low processes take input from remote users that may + cause buffer overflows. During run-time, LOMAC protects high files + and processes by preventing low processes from modifying or + signalling them. Thanks to is generic default configuration, LOMAC + handles the division of the system into high and low parts + automatically, without administrative direction. + LOMAC does not override the existing FreeBSD protection - mechanisms. Instead, its permission checks are done in addition to - the existing ones - the kernel permits an operation only if both - the existing mechanisms and LOMAC decide it should permit it. - Unlike the existing FreeBSD protection mechanisms, LOMAC makes - decisions based solely on integrity level, not on user identity. - With LOMAC, a low-level root process is just as powerless as a - low-level non-root process. Since LOMAC automatically places all - network servers in the low part of the system, this fact prevents - compromised root-privileged network servers from harming the - high-integrity part of the system. + mechanisms. Instead, its permission checks are done in addition to + the existing ones - the kernel permits an operation only if both + the existing mechanisms and LOMAC decide it should permit it. + Unlike the existing FreeBSD protection mechanisms, LOMAC makes + decisions based solely on integrity level, not on user identity. + With LOMAC, a low-level root process is just as powerless as a + low-level non-root process. Since LOMAC automatically places all + network servers in the low part of the system, this fact prevents + compromised root-privileged network servers from harming the + high-integrity part of the system. - + A Short Tour - + This section introduces LOMAC's major features. You may - follow these steps the first time you boot with LOMAC running to - ensure that your installation is correct. - + follow these steps the first time you boot with LOMAC running to + ensure that your installation is correct. + Log in as root, from the system console. - + Check to make sure that the LOMAC LKM is loaded: - + ::prompt.root; - /sbin/kldstat | grep lomac.ko - - 5 1 0xc13e0000 c000 lomac.ko + /sbin/kldstat | grep lomac.ko + + 5 1 0xc13e0000 c000 lomac.ko - + Look at the levels of your processes: - + ::prompt.root; - ps - - PID LVL TT STAT TIME COMMAND 251 2 v6 Is 0:00.37 login -p root - 650 2 v6 S 0:00.56 -csh (csh) 665 2 v6 R+ 0:00.05 ./ps - + ps + + PID LVL TT STAT TIME COMMAND 251 2 v6 Is 0:00.37 login -p root + 650 2 v6 S 0:00.56 -csh (csh) 665 2 v6 R+ 0:00.05 ./ps + Note that all your processes are running at level - 2—LOMAC's highest level of privilege. + 2—LOMAC's highest level of privilege. - - + + Look at the levels of your files. (-Z shows levels.) - + ::prompt.root; - ls -lZ - - total 62 -rw-r--r-- 2 root wheel 2 802 Apr 21 2001 .cshrc - -rw------- 1 root wheel 2 2973 Oct 12 09:41 .history -rw-r--r-- - 1 root wheel 2 142 Apr 21 2001 .klogin -rw-r--r-- 1 root wheel - 2 297 Apr 21 2001 .login - + ls -lZ + + total 62 -rw-r--r-- 2 root wheel 2 802 Apr 21 2001 .cshrc + -rw------- 1 root wheel 2 2973 Oct 12 09:41 .history -rw-r--r-- + 1 root wheel 2 142 Apr 21 2001 .klogin -rw-r--r-- 1 root wheel + 2 297 Apr 21 2001 .login + Note that all your files are also at level 2. Level-2 - files are high-integrity—LOMAC assumes that they contain - no viruses or Trojan horses at boot time, and limits the - behavior of processes during run-time to keep them that - way. + files are high-integrity—LOMAC assumes that they contain + no viruses or Trojan horses at boot time, and limits the + behavior of processes during run-time to keep them that + way. - + Look at the levels of a normal user's files. I'll use the - user tfraser in the example; you'll have to use one of your own - users. - + user tfraser in the example; you'll have to use one of your own + users. + ::prompt.root; - ls -laZ /home/tfraser - - total 47 drwxr-xr-x 8 tfraser staff 1 1024 Oct 25 14:30 . - drwxr-xr-x 4 root wheel 2 512 Aug 27 10:47 .. -rw------- 1 - tfraser staff 1 114 Aug 27 11:11 .Xauthority -rw------- 1 - tfraser staff 1 42 Oct 4 10:17 .bash_history - + ls -laZ /home/tfraser + + total 47 drwxr-xr-x 8 tfraser staff 1 1024 Oct 25 14:30 . + drwxr-xr-x 4 root wheel 2 512 Aug 27 10:47 .. -rw------- 1 + tfraser staff 1 114 Aug 27 11:11 .Xauthority -rw------- 1 + tfraser staff 1 42 Oct 4 10:17 .bash_history + Note that while - /home - - is level 2 (high integrity), all of the user's files are level - 1 (low integrity). LOMAC assumes that any of the user's files - may be Trojan horses or contain viruses. + /home + + is level 2 (high integrity), all of the user's files are level + 1 (low integrity). LOMAC assumes that any of the user's files + may be Trojan horses or contain viruses. - + Examine one of the user's files with less, and put less - in the background with ctrl-Z. Then run ps to look at your - processes. - + in the background with ctrl-Z. Then run ps to look at your + processes. + ::prompt.root; - less /home/tfraser/.bash_history - - <output not included in document to save space> - ^Z - - Suspended ::prompt.root; - ps - - PID LVL TT STAT TIME COMMAND 251 2 v6 Is 0:00.37 login -p root - 650 2 v6 S 0:01.28 -csh (csh) 733 1 v6 T 0:00.08 less - /home/tfraser/.bash_history 735 2 v6 R+ 0:00.05 ./ps - + less /home/tfraser/.bash_history + + <output not included in document to save space> + ^Z + + Suspended ::prompt.root; + ps + + PID LVL TT STAT TIME COMMAND 251 2 v6 Is 0:00.37 login -p root + 650 2 v6 S 0:01.28 -csh (csh) 733 1 v6 T 0:00.08 less + /home/tfraser/.bash_history 735 2 v6 R+ 0:00.05 ./ps + Note that, although your shell (csh in my case) is still - at level 2, the process running less is at level 1. Here's why: - Processes generally inherit the level of their parent. So, any - process you start with your level-2 shell will initially - execute at level 2. The less process was no exception - it - began running at level 2. However, the less process went on to - read the user's .cshrc file. This file is a level-1 file - it - contains low-integrity data. Whenever LOMAC sees a level-2 - process read a level-1 file, LOMAC "demotes" the process. That - is, it reduces the process to level 1. - + at level 2, the process running less is at level 1. Here's why: + Processes generally inherit the level of their parent. So, any + process you start with your level-2 shell will initially + execute at level 2. The less process was no exception - it + began running at level 2. However, the less process went on to + read the user's .cshrc file. This file is a level-1 file - it + contains low-integrity data. Whenever LOMAC sees a level-2 + process read a level-1 file, LOMAC "demotes" the process. That + is, it reduces the process to level 1. + Level-2 processes have maximum privileges (like "root" in - standard UNIX). Level-1 processes have greatly reduced - privileges. For example, they cannot write to level-2 files, or - signal level-2 processes. When a level-2 process reads a - level-1 file, it puts itself at risk. The file may be a Trojan - horse or may contain data designed to cause buffer overflows. - Because of this risk, LOMAC demotes level-2 processes that read - level-1 files to level 1. Once at level 1, these processes have - insufficient privilege to harm level-2 processes and - files. - + standard UNIX). Level-1 processes have greatly reduced + privileges. For example, they cannot write to level-2 files, or + signal level-2 processes. When a level-2 process reads a + level-1 file, it puts itself at risk. The file may be a Trojan + horse or may contain data designed to cause buffer overflows. + Because of this risk, LOMAC demotes level-2 processes that read + level-1 files to level 1. Once at level 1, these processes have + insufficient privilege to harm level-2 processes and + files. + Many cautious UNIX administrators avoid putting "." in - their PATH environment variable, in order to avoid executing - some Trojan horses. In standard UNIX, a malicious user might - give an attack program the same name as a commonly-used command - like ls. If the administrator, running as root, were to cd to - the malicious user's directory and type ls, if the "." preceded + their PATH environment variable, in order to avoid executing + some Trojan horses. In standard UNIX, a malicious user might + give an attack program the same name as a commonly-used command + like ls. If the administrator, running as root, were to cd to + the malicious user's directory and type ls, if the "." preceded + + /bin + + in their path, they would accidentally execute the malicious + ls + + rather than + /bin/ls + + . This act would effectively execute the malicious user's + Trojan horse program with root privileges, perhaps to modify + the login program or The passwd file. - /bin - - in their path, they would accidentally execute the malicious - ls - - rather than - /bin/ls - - . This act would effectively execute the malicious user's - Trojan horse program with root privileges, perhaps to modify - the login program or The passwd file. - This precaution is not required in a system running - LOMAC. LOMAC considers the execution of a program to be - equivalent to a read (since the process reads the program file - in order to execute it). Since all non-root user's files are at - level 1, LOMAC would demote the process executing the Trojan - ls, just as it demoted less in our example, above. Once at - level 1, LOMAC would prevent the Trojan ls from modifying - level-2 files such as the login program or the passwd - file. - + LOMAC. LOMAC considers the execution of a program to be + equivalent to a read (since the process reads the program file + in order to execute it). Since all non-root user's files are at + level 1, LOMAC would demote the process executing the Trojan + ls, just as it demoted less in our example, above. Once at + level 1, LOMAC would prevent the Trojan ls from modifying + level-2 files such as the login program or the passwd + file. + Demotion is a key part of the LOMAC's integrity - protection scheme. Now that we've demonstrated how it works, - we're now done with less. Quit the less program. - + protection scheme. Now that we've demonstrated how it works, + we're now done with less. Quit the less program. + ::prompt.root; - fg - - <output not included in document to save space> - q + fg + + <output not included in document to save space> + q - + Create a test file. We'll use this test file to - demonstrate LOMAC's integrity protection later on. # cat > - /root/foo This file contains test data. ^D + demonstrate LOMAC's integrity protection later on. # cat > + /root/foo This file contains test data. ^D - + tail -f /var/log/messages Leave this running while you - continue the tour. It's output will contain LOMAC log messages - as we proceed. + continue the tour. It's output will contain LOMAC log messages + as we proceed. - + Switch to another virtual console and log in as a normal - user. Once logged in, examine the levels of your - processes: - + user. Once logged in, examine the levels of your + processes: + ::prompt.user; - ps - - PID LVL TT STAT TIME COMMAND 742 1 v7 S 0:00.48 -tcsh (tcsh) - 750 1 v7 R+ 0:00.05 ps - + ps + + PID LVL TT STAT TIME COMMAND 742 1 v7 S 0:00.48 -tcsh (tcsh) + 750 1 v7 R+ 0:00.05 ps + Note that as a normal user, all of your processes are at - level 1. Why? Switch back to the virtual console where you are - logged in as root. You should see a log message similar - to: - + level 1. Why? Switch back to the virtual console where you are + logged in as root. You should see a log message similar + to: + Oct 25 14:44:54 myhost /boot/kernel/kernel: - LOMAC: level-2 subject p252g252u1002:login demoted to level 1 - after reading under "/usr/home" - + LOMAC: level-2 subject p252g252u1002:login demoted to level 1 + after reading under "/usr/home" + All the getty programs that handle logins run at level 2. - When a user attempts to log in, they run the login program, - which also runs at level 2. Upon supplying the proper password, - the login program starts a shell for the user (tcsh in this - case). The shell starts at level 2, but LOMAC demotes it to - level 1 when it reads the user's .cshrc file, just as it - demoted the less program, above. Once the user's shell is - running at level 1, all of the programs subsequently executed - by the user will run at level 1, also. - + When a user attempts to log in, they run the login program, + which also runs at level 2. Upon supplying the proper password, + the login program starts a shell for the user (tcsh in this + case). The shell starts at level 2, but LOMAC demotes it to + level 1 when it reads the user's .cshrc file, just as it + demoted the less program, above. Once the user's shell is + running at level 1, all of the programs subsequently executed + by the user will run at level 1, also. + Our root shell from the start of the tour remains at - level-2 because LOMAC has set all of root's files at level 2. A - level-2 process may read level-2 files without being demoted. - The user's shell is demoted because it reads the user's level-1 - files. LOMAC does not assign levels to processes based on the - user's root/non-root identity. LOMAC assigns levels to files by - starting the first process (init) at level 2, allowing child - processes to inherit their parent's level, and by demoting - processes that read level-1 files. LOMAC does not pay any - attention to user identity. Consequently, LOMAC is not - vulnerable to any of the traditional attacks on UNIX security - that involve obtaining root identity. + level-2 because LOMAC has set all of root's files at level 2. A + level-2 process may read level-2 files without being demoted. + The user's shell is demoted because it reads the user's level-1 + files. LOMAC does not assign levels to processes based on the + user's root/non-root identity. LOMAC assigns levels to files by + starting the first process (init) at level 2, allowing child + processes to inherit their parent's level, and by demoting + processes that read level-1 files. LOMAC does not pay any + attention to user identity. Consequently, LOMAC is not + vulnerable to any of the traditional attacks on UNIX security + that involve obtaining root identity. - + Test the above assertion that LOMAC does not give any - extra privileges to processes with root identity. Switch back - to the normal user's shell and become root. - + extra privileges to processes with root identity. Switch back + to the normal user's shell and become root. + ::prompt.user; - su - - Password: ::prompt.root; - ps - - PID LVL TT STAT TIME COMMAND 252 1 v7 Is 0:00.39 login -p - tfraser 751 1 v7 I 0:00.18 su 752 1 v7 S 0:00.43 _su (csh) 755 - 1 v7 R+ 0:00.05 ps - + su + + Password: ::prompt.root; + ps + + PID LVL TT STAT TIME COMMAND 252 1 v7 Is 0:00.39 login -p + tfraser 751 1 v7 I 0:00.18 su 752 1 v7 S 0:00.43 _su (csh) 755 + 1 v7 R+ 0:00.05 ps + Note that, despite the su, your shell is still at level - 1. LOMAC never increases the level of a process. Now attempt to - delete the /root/foo file you created earlier. - + 1. LOMAC never increases the level of a process. Now attempt to + delete the /root/foo file you created earlier. + ::prompt.root; - ls -lZ /root/foo - - -rw-r--r-- 1 root wheel 2 30 Oct 25 14:44 /root/foo - ::prompt.root; - rm /root/foo - - rm: /root/foo: Operation not permitted - + ls -lZ /root/foo + + -rw-r--r-- 1 root wheel 2 30 Oct 25 14:44 /root/foo + ::prompt.root; + rm /root/foo + + rm: /root/foo: Operation not permitted + Even though you are root, LOMAC will not allow a level-1 - process (rm in this case) to delete a level-2 file. You should - see a log message similar to this one in on the root virtual - console that is tailing /var/log/messages: - + process (rm in this case) to delete a level-2 file. You should + see a log message similar to this one in on the root virtual + console that is tailing /var/log/messages: + Oct 25 14:50:52 myhost /boot/kernel/kernel: - LOMAC: level-1 proc p763g763u0:rm denied delete to level-2 - object under "/" - + LOMAC: level-1 proc p763g763u0:rm denied delete to level-2 + object under "/" + This concludes the short tour. - + LOMAC and Network Applications - + This section explains how LOMAC uses its demotion behavior to - ensure that all remote users and servers that serve remote users - (httpd, ftpd, etc.) run at level 1. At this level, malicious remote - users and compromised network servers can do little harm to the - level-2 part of the system, even if they have root privilege. It - also discusses a few of the finer points concerning LOMAC's - protection scheme not already covered in the SHORT TOUR section, - above. The basic elements of LOMAC's integrity protection scheme - are summarized here: - + ensure that all remote users and servers that serve remote users + (httpd, ftpd, etc.) run at level 1. At this level, malicious remote + users and compromised network servers can do little harm to the + level-2 part of the system, even if they have root privilege. It + also discusses a few of the finer points concerning LOMAC's + protection scheme not already covered in the SHORT TOUR section, + above. The basic elements of LOMAC's integrity protection scheme + are summarized here: + LOMAC assigns every process, or named filesystem object - (file, named pipe, or bound UNIX-domain socket) a level: either - 1 (low integrity) or 2 (high integrity). + (file, named pipe, or bound UNIX-domain socket) a level: either + 1 (low integrity) or 2 (high integrity). - + LOMAC assigns levels to filesystem objects based on their - location in the filesystem namespace. The mapping between names - and levels constitutes most of LOMAC's "default policy", and is - presently hardcoded into the LKM. Once assigned, the levels of - filesystem objects never change. + location in the filesystem namespace. The mapping between names + and levels constitutes most of LOMAC's "default policy", and is + presently hardcoded into the LKM. Once assigned, the levels of + filesystem objects never change. - + The first process (init) starts at level 2. All child - processes inherit the level of their parent. Only when a - level-2 process reads from a level-1 object does LOMAC demote - the process to level 1. + processes inherit the level of their parent. Only when a + level-2 process reads from a level-1 object does LOMAC demote + the process to level 1. - + Level-1 processes have insufficient privilege to write to - level-2 objects or signal level-2 processes. This protects the - level-2 part of the system from malicious interference. + level-2 objects or signal level-2 processes. This protects the + level-2 part of the system from malicious interference. - + The combination of LOMAC's demotion behavior and its - restrictions on the privileges of level-1 processes prevent - malicious level-1 users from harming the level-2 part of the - system, even in cases where level-2 administrators accidentally - execute malicious user's Trojan horses. + restrictions on the privileges of level-1 processes prevent + malicious level-1 users from harming the level-2 part of the + system, even in cases where level-2 administrators accidentally + execute malicious user's Trojan horses. - + In UNIX, network servers are generally started automatically - by the init process, or by one of its children. With LOMAC, this - arrangement guarantees that network servers inherit the init - process's level of 2. In addition to demoting level-2 processes - upon reading level-1 files, LOMAC also demotes level-2 processes - when they read from a network interface. Consequently, LOMAC - demotes network server as soon as they read their first client - request from the network. Just as LOMAC assigns appropriate levels - to user shells based on their file-reading behavior, not their - user's identity, this scheme allows LOMAC to demote network servers - without initially knowing which programs are network servers: LOMAC - simply allows the init program to start all of its servers at level - 2, and subsequently demotes those servers which read from a network - interface. - + by the init process, or by one of its children. With LOMAC, this + arrangement guarantees that network servers inherit the init + process's level of 2. In addition to demoting level-2 processes + upon reading level-1 files, LOMAC also demotes level-2 processes + when they read from a network interface. Consequently, LOMAC + demotes network server as soon as they read their first client + request from the network. Just as LOMAC assigns appropriate levels + to user shells based on their file-reading behavior, not their + user's identity, this scheme allows LOMAC to demote network servers + without initially knowing which programs are network servers: LOMAC + simply allows the init program to start all of its servers at level + 2, and subsequently demotes those servers which read from a network + interface. + LOMAC uses the same strategy to ensure that remote users run - at level 1: it demotes the remote login (telnetd, rlogind) servers - when they receive their first login request, as described above. - LOMAC's ability to automatically determine the proper levels for - users and servers during runtime is the feature which allows it to - avoid site-specific configuration and ship with a one-size-fits-all - default policy. - + at level 1: it demotes the remote login (telnetd, rlogind) servers + when they receive their first login request, as described above. + LOMAC's ability to automatically determine the proper levels for + users and servers during runtime is the feature which allows it to + avoid site-specific configuration and ship with a one-size-fits-all + default policy. + Here is an example of an httpd server before it reads its - first request. Note that the httpd server is comprised of 5 - processes, all at level 2. - + first request. Note that the httpd server is comprised of 5 + processes, all at level 2. + ::prompt.root; - ps -U nobody - - PID LVL TT STAT TIME COMMAND 369 2 ?? I 0:00.03 - /usr/local/sbin/httpd 370 2 ?? I 0:00.03 /usr/local/sbin/httpd 371 - 2 ?? I 0:00.03 /usr/local/sbin/httpd 372 2 ?? I 0:00.03 - /usr/local/sbin/httpd 373 2 ?? I 0:00.03 - /usr/local/sbin/httpd - + ps -U nobody + + PID LVL TT STAT TIME COMMAND 369 2 ?? I 0:00.03 + /usr/local/sbin/httpd 370 2 ?? I 0:00.03 /usr/local/sbin/httpd 371 + 2 ?? I 0:00.03 /usr/local/sbin/httpd 372 2 ?? I 0:00.03 + /usr/local/sbin/httpd 373 2 ?? I 0:00.03 + /usr/local/sbin/httpd + After httpd reads its first request from the network, you - should see a message similar to this one in - /var/log/messages: - + should see a message similar to this one in + /var/log/messages: + Oct 25 16:16:24 myhost /boot/kernel/kernel: LOMAC: - level-2 subject p369g368u65534:httpd demoted to level 1 after - reading from the network - + level-2 subject p369g368u65534:httpd demoted to level 1 after + reading from the network + And running ps again will produce: - + PID LVL TT STAT TIME COMMAND 369 1 ?? S 0:00.30 - /usr/local/sbin/httpd 370 2 ?? I 0:00.03 /usr/local/sbin/httpd 371 - 2 ?? I 0:00.03 /usr/local/sbin/httpd 372 2 ?? I 0:00.03 - /usr/local/sbin/httpd 373 2 ?? I 0:00.03 /usr/local/sbin/httpd 1572 - 2 ?? S 0:00.06 /usr/local/sbin/httpd - + /usr/local/sbin/httpd 370 2 ?? I 0:00.03 /usr/local/sbin/httpd 371 + 2 ?? I 0:00.03 /usr/local/sbin/httpd 372 2 ?? I 0:00.03 + /usr/local/sbin/httpd 373 2 ?? I 0:00.03 /usr/local/sbin/httpd 1572 + 2 ?? S 0:00.06 /usr/local/sbin/httpd + LOMAC demoted httpd process 369 as soon as it read its first - client request. + client request. - + LOMAC and Traditional UNIX Access Control - + LOMAC does not override the existing FreeBSD protection - mechanisms. Instead, its permission checks are done in addition to - the existing ones—the kernel permits an operation only if - both the existing mechanisms and LOMAC decide the kernel should - permit it. - + mechanisms. Instead, its permission checks are done in addition to + the existing ones—the kernel permits an operation only if + both the existing mechanisms and LOMAC decide the kernel should + permit it. + There are three main differences between the integrity - protection scheme implemented by LOMAC and traditional UNIX - security mechanisms: - + protection scheme implemented by LOMAC and traditional UNIX + security mechanisms: + Traditional UNIX provides mechanisms by which processes - can increase their privileges by changing their effective - identities. Although UNIX systems can be configured to prevent - malicious users from exploiting these mechanisms in most cases, - they can also be misconfigured, and good configurations can be - foiled by bugs in user-space application programs. LOMAC - provides no mechanism to allow a process to increase its - level. + can increase their privileges by changing their effective + identities. Although UNIX systems can be configured to prevent + malicious users from exploiting these mechanisms in most cases, + they can also be misconfigured, and good configurations can be + foiled by bugs in user-space application programs. LOMAC + provides no mechanism to allow a process to increase its + level. - + Traditional UNIX access control mechanisms are not - designed to prevent the flow of potentially dangerous data from - low-integrity objects to high-integrity objects. That is, from - files owned by one user to those owned by another - even to - those owned by root. The Trojan ls scenario in the SHORT TOUR - section describes one wellknown example of this vulnerability, - and how LOMAC counters it. + designed to prevent the flow of potentially dangerous data from + low-integrity objects to high-integrity objects. That is, from + files owned by one user to those owned by another - even to + those owned by root. The Trojan ls scenario in the SHORT TOUR + section describes one wellknown example of this vulnerability, + and how LOMAC counters it. - + Although many enhancements now exist, in its most basic - form traditional UNIX depends on easily defeated authentication - mechanisms to establish appropriate initial privilege levels. - LOMAC assigns privilege levels to processes based on their - reading behavior. As described above, the effect of LOMAC's - policy is to give the highest level of privilege only local - administrative users, and the lowest level of privilege to all - others, regardless of identity. LOMAC does not consider user - identity; consequently, it does not depend on - authentication. + form traditional UNIX depends on easily defeated authentication + mechanisms to establish appropriate initial privilege levels. + LOMAC assigns privilege levels to processes based on their + reading behavior. As described above, the effect of LOMAC's + policy is to give the highest level of privilege only local + administrative users, and the lowest level of privilege to all + others, regardless of identity. LOMAC does not consider user + identity; consequently, it does not depend on + authentication. - + Limits of LOMAC's Protection - + LOMAC embodies a trade-off between quality of MAC protection - and compatibility. LOMAC's primary goal is to remain compatible - with existing software while providing some useful MAC integrity - protection. The Low Water-Mark MAC model supports this - compatibility-first requirement. However, it the quality of - protection it provides is not as great as that provided by more - modern, less compatible, models. This issue is discussed at length - in - - - . This section presents the two well-known primary - quality-of-protection drawbacks of the Low Water-Mark model: its - enforcement of the principle of least privilege, and its reliance - on trusted applications. - - + and compatibility. LOMAC's primary goal is to remain compatible + with existing software while providing some useful MAC integrity + protection. The Low Water-Mark MAC model supports this + compatibility-first requirement. However, it the quality of + protection it provides is not as great as that provided by more + modern, less compatible, models. This issue is discussed at length + in + > + + . This section presents the two well-known primary + quality-of-protection drawbacks of the Low Water-Mark model: its + enforcement of the principle of least privilege, and its reliance + on trusted applications. + + The first drawback of the Low Water-Mark MAC scheme concerns - the Principle of Least Privilege, which holds that a good MAC - scheme should grant a subject the minimum set of privileges needed - to do its job [SAL75]. Constraining a subject in this way minimizes - the amount of damage the subject can cause should it become - compromised. Low Water-Mark provides weaker constraints than some - more modern models. The LOMAC AND NETWORK APPLICATIONS section - describes how LOMAC protects the level-2 part of the system by - demoting network servers to level 1. Although LOMAC will prevent a - compromised level-1 network server from harming the level-2 part of - the system, LOMAC will not prevent such a server from doing harm in - the level-1 remainder of the system. A compromised root-privileged - network server could, for example, send kill signals to another - level-1 server. - - + the Principle of Least Privilege, which holds that a good MAC + scheme should grant a subject the minimum set of privileges needed + to do its job [SAL75]. Constraining a subject in this way minimizes + the amount of damage the subject can cause should it become + compromised. Low Water-Mark provides weaker constraints than some + more modern models. The LOMAC AND NETWORK APPLICATIONS section + describes how LOMAC protects the level-2 part of the system by + demoting network servers to level 1. Although LOMAC will prevent a + compromised level-1 network server from harming the level-2 part of >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 21 10:43:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E68CA37B406; Tue, 21 May 2002 10:43:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1311237B400 for ; Tue, 21 May 2002 10:43:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4LHhe017780 for perforce@freebsd.org; Tue, 21 May 2002 10:43:40 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 21 May 2002 10:43:40 -0700 (PDT) Message-Id: <200205211743.g4LHhe017780@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 11669 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11669 Change 11669 by jhb@jhb_laptop on 2002/05/21 10:42:54 IFC commits from yesterday. Affected files ... ... //depot/projects/smpng/sys/kern/kern_malloc.c#12 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#50 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#14 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_malloc.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/kern/kern_malloc.c,v 1.108 2002/05/02 09:07:03 jeff Exp $ + * $FreeBSD: src/sys/kern/kern_malloc.c,v 1.110 2002/05/20 18:29:37 jake Exp $ */ #include "opt_vm.h" @@ -157,11 +157,9 @@ if (size == 0) Debugger("zero size malloc"); #endif -#if defined(INVARIANTS) - if (flags == M_WAITOK) + if (!(flags & M_NOWAIT)) KASSERT(curthread->td_intr_nesting_level == 0, ("malloc(M_WAITOK) in interrupt context")); -#endif if (size <= KMEM_ZMAX) { if (size & KMEM_ZMASK) size = (size & ~KMEM_ZMASK) + KMEM_ZBASE; @@ -526,7 +524,7 @@ p += len; first = 1; - for (i = 0; i < 8 * sizeof(type->ks_size); i++) + for (i = 0; i < 32 /* 8 * sizeof(type->ks_size) */; i++) if (type->ks_size & (1 << i)) { if (first) len = snprintf(p, curline, " "); ==== //depot/projects/smpng/sys/kern/subr_witness.c#50 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/subr_witness.c,v 1.114 2002/05/06 19:31:28 alfred Exp $ + * $FreeBSD: src/sys/kern/subr_witness.c,v 1.116 2002/05/20 19:16:22 jhb Exp $ */ /* @@ -878,14 +878,9 @@ struct thread *td; int i, n; - if (witness_dead || panicstr != NULL) + if (witness_cold || witness_dead || panicstr != NULL) return (0); - KASSERT(!witness_cold, ("%s: witness_cold", __func__)); n = 0; - /* - * Preemption bad because we need PCPU_PTR(spinlocks) to not change. - */ - critical_enter(); td = curthread; lock_list = &td->td_sleeplocks; again: @@ -912,7 +907,11 @@ lock1->li_lock->lo_name, lock1->li_file, lock1->li_line); } - if (lock_list == &td->td_sleeplocks) { + if (lock_list == &td->td_sleeplocks && PCPU_GET(spinlocks) != NULL) { + /* + * Since we already hold a spinlock preemption is + * already blocked. + */ lock_list = PCPU_PTR(spinlocks); goto again; } @@ -920,7 +919,6 @@ if (witness_ddb && n) Debugger(__func__); #endif /* DDB */ - critical_exit(); return (n); } @@ -1346,15 +1344,9 @@ * out from under us. It is probably best to just not try to handle * threads on other CPU's for now. */ - if (td == curthread) { - /* - * Preemption bad because we need PCPU_PTR(spinlocks) to not - * change. - */ - critical_enter(); + if (td == curthread && PCPU_GET(spinlocks) != NULL) nheld += witness_list_locks(PCPU_PTR(spinlocks)); - critical_exit(); - } + return (nheld); } ==== //depot/projects/smpng/sys/vm/uma_core.c#14 (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/sys/vm/uma_core.c,v 1.24 2002/05/13 05:08:18 jeff Exp $ + * $FreeBSD: src/sys/vm/uma_core.c,v 1.25 2002/05/20 17:54:48 jhb Exp $ * */ @@ -66,6 +66,7 @@ #include #include #include +#include #include #include @@ -1317,6 +1318,12 @@ printf("Allocating one item from %s(%p)\n", zone->uz_name, zone); #endif + if (!(flags & M_NOWAIT)) { + KASSERT(curthread->td_intr_nesting_level == 0, + ("malloc(M_WAITOK) in interrupt context")); + WITNESS_SLEEP(1, NULL); + } + zalloc_restart: cpu = PCPU_GET(cpuid); CPU_LOCK(zone, cpu); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 21 12:38:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 974DF37B40A; Tue, 21 May 2002 12:38:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BD8E137B401 for ; Tue, 21 May 2002 12:38:02 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4LJc2u39808 for perforce@freebsd.org; Tue, 21 May 2002 12:38:02 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 21 May 2002 12:38:02 -0700 (PDT) Message-Id: <200205211938.g4LJc2u39808@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 11673 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11673 Change 11673 by jhb@jhb_laptop on 2002/05/21 12:37:34 Integrate from jhb_lock: - Adaptive mutexes. - Optimize spinlocks to critical sections for UP kernels. - cpu_pause() support for i386. Affected files ... ... //depot/projects/smpng/sys/conf/NOTES#11 integrate ... //depot/projects/smpng/sys/conf/options#24 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#29 integrate ... //depot/projects/smpng/sys/sys/mutex.h#27 integrate Differences ... ==== //depot/projects/smpng/sys/conf/NOTES#11 (text+ko) ==== @@ -120,6 +120,11 @@ # Mandatory: options SMP # Symmetric MultiProcessor Kernel +# ADAPTIVE_MUTEXES changes the behavior of blocking mutexes to spin +# if the thread that currently owns the mutex is executing on another +# CPU. +options ADAPTIVE_MUTEXES + # SMP Debugging Options: # # MUTEX_DEBUG enables various extra assertions in the mutex code. ==== //depot/projects/smpng/sys/conf/options#24 (text+ko) ==== @@ -57,6 +57,7 @@ # Miscellaneous options. GEOM opt_geom.h +ADAPTIVE_MUTEXES COMPAT_43 opt_compat.h COMPAT_SUNOS opt_compat.h COMPILING_LINT opt_global.h ==== //depot/projects/smpng/sys/kern/kern_mutex.c#29 (text+ko) ==== @@ -34,6 +34,7 @@ * Machine independent bits of mutex implementation. */ +#include "opt_adaptive_mutexes.h" #include "opt_ddb.h" #include @@ -394,7 +395,11 @@ { MPASS(curthread != NULL); +#if defined(SMP) || LOCK_DEBUG > 0 _get_spin_lock(m, curthread, opts, file, line); +#else + critical_enter(); +#endif LOCK_LOG_LOCK("LOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); WITNESS_LOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); @@ -409,7 +414,11 @@ WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); +#if defined(SMP) || LOCK_DEBUG > 0 _rel_spin_lock(m); +#else + critical_exit(); +#endif } /* @@ -451,6 +460,9 @@ _mtx_lock_sleep(struct mtx *m, int opts, const char *file, int line) { struct thread *td = curthread; +#if defined(SMP) && defined(ADAPTIVE_MUTEXES) + struct thread *owner; +#endif if ((m->mtx_lock & MTX_FLAGMASK) == (uintptr_t)td) { m->mtx_recurse++; @@ -506,6 +518,22 @@ continue; } +#if defined(SMP) && defined(ADAPTIVE_MUTEXES) + /* + * If the current owner of the lock is executing on another + * CPU, spin instead of blocking. + */ + owner = (struct thread *)(v & MTX_FLAGMASK); + if (m != &Giant && owner->td_kse != NULL && + owner->td_kse->ke_oncpu != NOCPU) { + mtx_unlock_spin(&sched_lock); +#ifdef __i386__ + cpu_pause(); +#endif + continue; + } +#endif /* SMP && ADAPTIVE_MUTEXES */ + /* * We definitely must sleep for this lock. */ @@ -594,6 +622,9 @@ /* Give interrupts a chance while we spin. */ critical_exit(); while (m->mtx_lock != MTX_UNOWNED) { +#ifdef __i386__ + cpu_pause(); +#endif if (i++ < 10000000) continue; if (i++ < 60000000) @@ -643,6 +674,15 @@ CTR1(KTR_LOCK, "_mtx_unlock_sleep: %p contested", m); td1 = TAILQ_FIRST(&m->mtx_blocked); +#if defined(SMP) && defined(ADAPTIVE_MUTEXES) + if (td1 == NULL) { + _release_lock_quick(m); + if (LOCK_LOG_TEST(&m->mtx_object, opts)) + CTR1(KTR_LOCK, "_mtx_unlock_sleep: %p no sleepers", m); + mtx_unlock_spin(&sched_lock); + return; + } +#endif MPASS(td->td_proc->p_magic == P_MAGIC); MPASS(td1->td_proc->p_magic == P_MAGIC); ==== //depot/projects/smpng/sys/sys/mutex.h#27 (text+ko) ==== @@ -258,16 +258,21 @@ _mtx_lock_spin_flags((m), (opts), LOCK_FILE, LOCK_LINE) #define mtx_unlock_spin_flags(m, opts) \ _mtx_unlock_spin_flags((m), (opts), LOCK_FILE, LOCK_LINE) -#else +#else /* LOCK_DEBUG == 0 */ #define mtx_lock_flags(m, opts) \ _get_sleep_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) #define mtx_unlock_flags(m, opts) \ _rel_sleep_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) +#ifdef SMP #define mtx_lock_spin_flags(m, opts) \ _get_spin_lock((m), curthread, (opts), LOCK_FILE, LOCK_LINE) #define mtx_unlock_spin_flags(m, opts) \ _rel_spin_lock((m)) -#endif +#else /* SMP */ +#define mtx_lock_spin_flags(m, opts) critical_enter() +#define mtx_unlock_spin_flags(m, opts) critical_exit() +#endif /* SMP */ +#endif /* LOCK_DEBUG */ #define mtx_trylock_flags(m, opts) \ _mtx_trylock((m), (opts), LOCK_FILE, LOCK_LINE) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 21 13:16:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C421737B40F; Tue, 21 May 2002 13:16:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EFCC537B40C for ; Tue, 21 May 2002 13:16:50 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4LKGod47453 for perforce@freebsd.org; Tue, 21 May 2002 13:16:50 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 21 May 2002 13:16:50 -0700 (PDT) Message-Id: <200205212016.g4LKGod47453@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 11676 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11676 Change 11676 by jhb@jhb_laptop on 2002/05/21 13:16:35 Whoops, forgot to bring in actual implementation of cpu_pause(). Affected files ... ... //depot/projects/smpng/sys/i386/include/cpufunc.h#15 integrate Differences ... ==== //depot/projects/smpng/sys/i386/include/cpufunc.h#15 (text+ko) ==== @@ -560,6 +560,12 @@ __asm __volatile("movl %0,%%dr7" : : "r" (sel)); } +static __inline void +cpu_pause(void) +{ + __asm __volatile("pause"); +} + static __inline register_t intr_disable(void) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 21 14: 3:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0220337B40D; Tue, 21 May 2002 14:03:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3245037B40B for ; Tue, 21 May 2002 14:03:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4LL3qE52477 for perforce@freebsd.org; Tue, 21 May 2002 14:03:52 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 21 May 2002 14:03:52 -0700 (PDT) Message-Id: <200205212103.g4LL3qE52477@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 11681 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11681 Change 11681 by jhb@jhb_laptop on 2002/05/21 14:03:44 IFC my locking changes. Affected files ... ... //depot/projects/smpng/sys/conf/NOTES#12 integrate ... //depot/projects/smpng/sys/conf/options#25 integrate ... //depot/projects/smpng/sys/i386/include/cpufunc.h#16 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#30 integrate ... //depot/projects/smpng/sys/sys/mutex.h#28 integrate Differences ... ==== //depot/projects/smpng/sys/conf/NOTES#12 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1032 2002/05/19 00:11:07 rwatson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1033 2002/05/21 20:47:10 jhb Exp $ # # ==== //depot/projects/smpng/sys/conf/options#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.317 2002/05/19 00:11:07 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.318 2002/05/21 20:47:10 jhb Exp $ # # On the handling of kernel options # ==== //depot/projects/smpng/sys/i386/include/cpufunc.h#16 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.120 2002/04/10 21:18:46 dwmalone Exp $ + * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.121 2002/05/21 20:21:53 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/kern/kern_mutex.c#30 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.90 2002/04/04 20:52:27 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.92 2002/05/21 20:47:11 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/sys/mutex.h#28 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/sys/mutex.h,v 1.55 2002/04/04 20:52:27 jhb Exp $ + * $FreeBSD: src/sys/sys/mutex.h,v 1.56 2002/05/21 20:34:28 jhb Exp $ */ #ifndef _SYS_MUTEX_H_ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 21 14:10:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85F2337B401; Tue, 21 May 2002 14:10:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2FE8637B407 for ; Tue, 21 May 2002 14:10:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4LLA0F56843 for perforce@freebsd.org; Tue, 21 May 2002 14:10:00 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 21 May 2002 14:10:00 -0700 (PDT) Message-Id: <200205212110.g4LLA0F56843@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 11683 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11683 Change 11683 by jhb@jhb_laptop on 2002/05/21 14:09:42 - Add more cpu_pause()s where needed. - Fixup whitespace in spin mutex panic case. - We don't need to increment 'i' twice in the case where we are starting to DELAY(). Affected files ... ... //depot/projects/smpng/sys/kern/kern_mutex.c#31 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#31 (text+ko) ==== @@ -488,6 +488,9 @@ */ if ((v = m->mtx_lock) == MTX_UNOWNED) { mtx_unlock_spin(&sched_lock); +#ifdef __i386__ + cpu_pause(); +#endif continue; } @@ -515,6 +518,9 @@ !atomic_cmpset_ptr(&m->mtx_lock, (void *)v, (void *)(v | MTX_CONTESTED))) { mtx_unlock_spin(&sched_lock); +#ifdef __i386__ + cpu_pause(); +#endif continue; } @@ -622,20 +628,24 @@ /* Give interrupts a chance while we spin. */ critical_exit(); while (m->mtx_lock != MTX_UNOWNED) { + if (i++ < 10000000) { #ifdef __i386__ - cpu_pause(); + cpu_pause(); #endif - if (i++ < 10000000) continue; - if (i++ < 60000000) + } + if (i < 60000000) DELAY(1); #ifdef DDB else if (!db_active) #else else #endif - panic("spin lock %s held by %p for > 5 seconds", - m->mtx_object.lo_name, (void *)m->mtx_lock); + panic("spin lock %s held by %p for > 5 seconds", + m->mtx_object.lo_name, (void *)m->mtx_lock); +#ifdef __i386__ + cpu_pause(); +#endif } critical_enter(); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 21 14:53:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A985E37B40E; Tue, 21 May 2002 14:53:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BA7F337B40C for ; Tue, 21 May 2002 14:53:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4LLrsJ61868 for perforce@freebsd.org; Tue, 21 May 2002 14:53:54 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 21 May 2002 14:53:54 -0700 (PDT) Message-Id: <200205212153.g4LLrsJ61868@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 11688 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11688 Change 11688 by jhb@jhb_laptop on 2002/05/21 14:53:38 Integ misc. cleanups. Affected files ... ... //depot/projects/smpng/sys/kern/kern_mutex.c#32 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#32 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.92 2002/05/21 20:47:11 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.94 2002/05/21 21:27:05 jhb Exp $ */ /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 21 19:22:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BD0137B406; Tue, 21 May 2002 19:22:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A19EA37B409 for ; Tue, 21 May 2002 19:22:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4M2MPM09898 for perforce@freebsd.org; Tue, 21 May 2002 19:22:25 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Tue, 21 May 2002 19:22:25 -0700 (PDT) Message-Id: <200205220222.g4M2MPM09898@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11693 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11693 Change 11693 by marcel@marcel_vaio on 2002/05/21 19:22:11 Add PCI bus and PCI device records and dump them. This completes dumping of error records I've seen so far (with the exception of PCI bus records). The mca(8) tool only needs a manpage and possibly the ability to clear a record in the sysctl tree to make it committable. This commit also contains some minor renaming and a typo fix. Affected files ... ... //depot/projects/ia64/sbin/mca/mca.c#4 edit ... //depot/projects/ia64/sys/ia64/include/mca.h#6 edit Differences ... ==== //depot/projects/ia64/sbin/mca/mca.c#4 (text+ko) ==== @@ -119,19 +119,19 @@ { printf(" <%s-%d>\n", what, idx); if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_INFO) - printf(" info=%016llx\n", + printf(" info=0x%016llx\n", (long long)cpu_mod->cpu_mod_info); if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_REQID) - printf(" requester=%016llx\n", + printf(" requester=0x%016llx\n", (long long)cpu_mod->cpu_mod_reqid); if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_RSPID) - printf(" responder=%016llx\n", + printf(" responder=0x%016llx\n", (long long)cpu_mod->cpu_mod_rspid); if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_TGTID) - printf(" target=%016llx\n", + printf(" target=0x%016llx\n", (long long)cpu_mod->cpu_mod_tgtid); if (cpu_mod->cpu_mod_flags & MCA_CPU_MOD_FLAGS_IP) - printf(" ip=%016llx\n", + printf(" ip=0x%016llx\n", (long long)cpu_mod->cpu_mod_ip); printf(" \n", what, idx); } @@ -147,11 +147,11 @@ printf(" \n"); if (cpu->cpu_flags & MCA_CPU_FLAGS_ERRMAP) - printf(" errmap=%016llx\n", (long long)cpu->cpu_errmap); + printf(" errmap=0x%016llx\n", (long long)cpu->cpu_errmap); if (cpu->cpu_flags & MCA_CPU_FLAGS_STATE) - printf(" state=%016llx\n", (long long)cpu->cpu_state); + printf(" state=0x%016llx\n", (long long)cpu->cpu_state); if (cpu->cpu_flags & MCA_CPU_FLAGS_CR_LID) - printf(" cr_lid=%016llx\n", (long long)cpu->cpu_cr_lid); + printf(" cr_lid=0x%016llx\n", (long long)cpu->cpu_cr_lid); mod = (struct mca_cpu_mod*)(cpu + 1); n = MCA_CPU_FLAGS_CACHE(cpu->cpu_flags); @@ -172,7 +172,7 @@ cpuid = (struct mca_cpu_cpuid*)mod; for (i = 0; i < 6; i++) - printf(" cpuid%d=%016llx\n", i, + printf(" cpuid%d=0x%016llx\n", i, (long long)cpuid->cpuid[i]); psi = (struct mca_cpu_psi*)(cpuid + 1); @@ -187,11 +187,11 @@ printf(" \n"); if (mem->mem_flags & MCA_MEM_FLAGS_STATUS) - printf(" status=%016llx\n", (long long)mem->mem_status); + printf(" status=0x%016llx\n", (long long)mem->mem_status); if (mem->mem_flags & MCA_MEM_FLAGS_ADDR) - printf(" address=%016llx\n", (long long)mem->mem_addr); + printf(" address=0x%016llx\n", (long long)mem->mem_addr); if (mem->mem_flags & MCA_MEM_FLAGS_ADDRMASK) - printf(" mask=%016llx\n", (long long)mem->mem_addrmask); + printf(" mask=0x%016llx\n", (long long)mem->mem_addrmask); if (mem->mem_flags & MCA_MEM_FLAGS_NODE) printf(" node=0x%04x\n", mem->mem_node); if (mem->mem_flags & MCA_MEM_FLAGS_CARD) @@ -201,7 +201,7 @@ if (mem->mem_flags & MCA_MEM_FLAGS_BANK) printf(" bank=0x%04x\n", mem->mem_bank); if (mem->mem_flags & MCA_MEM_FLAGS_DEVICE) - printf(" device=0x04x\n", mem->mem_device); + printf(" device=0x%04x\n", mem->mem_device); if (mem->mem_flags & MCA_MEM_FLAGS_ROW) printf(" row=0x%04x\n", mem->mem_row); if (mem->mem_flags & MCA_MEM_FLAGS_COLUMN) @@ -209,18 +209,19 @@ if (mem->mem_flags & MCA_MEM_FLAGS_BITPOS) printf(" bit=0x%04x\n", mem->mem_bitpos); if (mem->mem_flags & MCA_MEM_FLAGS_REQID) - printf(" requester=%016llx\n", + printf(" requester=0x%016llx\n", (long long)mem->mem_reqid); if (mem->mem_flags & MCA_MEM_FLAGS_RSPID) - printf(" responder=%016llx\n", + printf(" responder=0x%016llx\n", (long long)mem->mem_rspid); if (mem->mem_flags & MCA_MEM_FLAGS_TGTID) - printf(" target=%016llx\n", (long long)mem->mem_tgtid); - + printf(" target=0x%016llx\n", + (long long)mem->mem_tgtid); if (mem->mem_flags & MCA_MEM_FLAGS_BUSDATA) - printf(" status=%016llx\n", (long long)mem->mem_busdata); - if (mem->mem_flags & MCA_MEM_FLAGS_PLATFORM_ID) - printf(" platform=%s\n", guid(&mem->mem_platform)); + printf(" status=0x%016llx\n", + (long long)mem->mem_busdata); + if (mem->mem_flags & MCA_MEM_FLAGS_OEM_ID) + printf(" oem=%s\n", guid(&mem->mem_oem_id)); /* TODO: Dump OEM data */ printf(" \n"); @@ -233,9 +234,40 @@ } static void -show_pci_bus(void) +show_pci_bus(struct mca_pcibus_record *pcibus) { - printf(" # PCI BUS\n"); + printf(" \n"); + + if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_STATUS) + printf(" status=0x%016llx\n", + (long long)pcibus->pcibus_status); + if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_ERROR) + printf(" error=0x%04x\n", pcibus->pcibus_error); + if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_BUS) + printf(" bus=0x%04x\n", pcibus->pcibus_bus); + if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_ADDR) + printf(" address=0x%016llx\n", + (long long)pcibus->pcibus_addr); + if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_DATA) + printf(" data=0x%016llx\n", + (long long)pcibus->pcibus_data); + if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_CMD) + printf(" cmd=0x%016llx\n", + (long long)pcibus->pcibus_cmd); + if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_REQID) + printf(" requester=0x%016llx\n", + (long long)pcibus->pcibus_reqid); + if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_RSPID) + printf(" responder=0x%016llx\n", + (long long)pcibus->pcibus_rspid); + if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_TGTID) + printf(" target=0x%016llx\n", + (long long)pcibus->pcibus_tgtid); + if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_OEM_ID) + printf(" oem=%s\n", guid(&pcibus->pcibus_oem_id)); + /* TODO: Dump OEM data */ + + printf(" \n"); } static void @@ -245,9 +277,33 @@ } static void -show_pci_dev(void) +show_pci_dev(struct mca_pcidev_record *pcidev) { - printf(" # PCI DEV\n"); + printf(" \n"); + + if (pcidev->pcidev_flags & MCA_PCIDEV_FLAGS_STATUS) + printf(" status=0x%016llx\n", + (long long)pcidev->pcidev_status); + if (pcidev->pcidev_flags & MCA_PCIDEV_FLAGS_INFO) { + printf(" vendor=0x%04x\n", + pcidev->pcidev_info.info_vendor); + printf(" device=0x%04x\n", + pcidev->pcidev_info.info_device); + printf(" class=0x%06x\n", + MCA_PCIDEV_INFO_CLASS(pcidev->pcidev_info.info_ccfn)); + printf(" function=0x%02x\n", + MCA_PCIDEV_INFO_FUNCTION(pcidev->pcidev_info.info_ccfn)); + printf(" slot=0x%02x\n", + pcidev->pcidev_info.info_slot); + printf(" bus=0x%04x\n", + pcidev->pcidev_info.info_bus); + printf(" segment=0x%04x\n", + pcidev->pcidev_info.info_segment); + } + /* TODO: dump registers */ + /* TODO: Dump OEM data */ + + printf(" \n"); } static void @@ -278,11 +334,11 @@ else if (!memcmp(&sh->sh_guid, &guid_sel, sizeof(guid_sel))) show_sel(); else if (!memcmp(&sh->sh_guid, &guid_pci_bus, sizeof(guid_pci_bus))) - show_pci_bus(); + show_pci_bus((struct mca_pcibus_record*)(sh + 1)); else if (!memcmp(&sh->sh_guid, &guid_smbios, sizeof(guid_smbios))) show_smbios(); else if (!memcmp(&sh->sh_guid, &guid_pci_dev, sizeof(guid_pci_dev))) - show_pci_dev(); + show_pci_dev((struct mca_pcidev_record*)(sh + 1)); else if (!memcmp(&sh->sh_guid, &guid_generic, sizeof(guid_generic))) show_generic(); ==== //depot/projects/ia64/sys/ia64/include/mca.h#6 (text+ko) ==== @@ -86,13 +86,13 @@ uint64_t cpu_errmap; uint64_t cpu_state; uint64_t cpu_cr_lid; - /* Nx cpu_mod (cache) */ - /* Nx cpu_mod (TLB) */ - /* Nx cpu_mod (bus) */ - /* Nx cpu_mod (reg) */ - /* Nx cpu_mod (MS) */ - /* cpu_cpuid */ - /* cpu_psi */ + /* Nx cpu_mod (cache). */ + /* Nx cpu_mod (TLB). */ + /* Nx cpu_mod (bus). */ + /* Nx cpu_mod (reg). */ + /* Nx cpu_mod (MS). */ + /* cpu_cpuid. */ + /* cpu_psi. */ }; struct mca_cpu_cpuid { @@ -146,7 +146,7 @@ #define MCA_MEM_FLAGS_RSPID (1ULL << 12) #define MCA_MEM_FLAGS_TGTID (1ULL << 13) #define MCA_MEM_FLAGS_BUSDATA (1ULL << 14) -#define MCA_MEM_FLAGS_PLATFORM_ID (1ULL << 15) +#define MCA_MEM_FLAGS_OEM_ID (1ULL << 15) #define MCA_MEM_FLAGS_OEM_DATA (1ULL << 16) uint64_t mem_status; uint64_t mem_addr; @@ -163,9 +163,69 @@ uint64_t mem_rspid; uint64_t mem_tgtid; uint64_t mem_busdata; - struct mca_guid mem_platform; /* XXX not really a GUID. */ + struct mca_guid mem_oem_id; /* XXX not really a GUID. */ uint16_t mem_oem_length; /* Size of OEM data. */ - /* N bytes of OEM platform data */ + /* N bytes of OEM platform data. */ +}; + +struct mca_pcibus_record { + uint64_t pcibus_flags; +#define MCA_PCIBUS_FLAGS_STATUS (1ULL << 0) +#define MCA_PCIBUS_FLAGS_ERROR (1ULL << 1) +#define MCA_PCIBUS_FLAGS_BUS (1ULL << 2) +#define MCA_PCIBUS_FLAGS_ADDR (1ULL << 3) +#define MCA_PCIBUS_FLAGS_DATA (1ULL << 4) +#define MCA_PCIBUS_FLAGS_CMD (1ULL << 5) +#define MCA_PCIBUS_FLAGS_REQID (1ULL << 6) +#define MCA_PCIBUS_FLAGS_RSPID (1ULL << 7) +#define MCA_PCIBUS_FLAGS_TGTID (1ULL << 8) +#define MCA_PCIBUS_FLAGS_OEM_ID (1ULL << 9) +#define MCA_PCIBUS_FLAGS_OEM_DATA (1ULL << 10) + uint64_t pcibus_status; + uint16_t pcibus_error; + uint16_t pcibus_bus; + uint32_t __reserved; + uint64_t pcibus_addr; + uint64_t pcibus_data; + uint64_t pcibus_cmd; + uint64_t pcibus_reqid; + uint64_t pcibus_rspid; + uint64_t pcibus_tgtid; + struct mca_guid pcibus_oem_id; /* XXX not really a GUID. */ + uint16_t pcibus_oem_length; /* Size of OEM data. */ + /* N bytes of OEM platform data. */ +}; + +struct mca_pcidev_record { + uint64_t pcidev_flags; +#define MCA_PCIDEV_FLAGS_STATUS (1ULL << 0) +#define MCA_PCIDEV_FLAGS_INFO (1ULL << 1) +#define MCA_PCIDEV_FLAGS_REG_MEM (1ULL << 2) +#define MCA_PCIDEV_FLAGS_REG_IO (1ULL << 3) +#define MCA_PCIDEV_FLAGS_REG_DATA (1ULL << 4) +#define MCA_PCIDEV_FLAGS_OEM_DATA (1ULL << 5) + uint64_t pcidev_status; + struct { + uint16_t info_vendor; + uint16_t info_device; + uint32_t info_ccfn; /* Class code & funct. nr. */ +#define MCA_PCIDEV_INFO_CLASS(x) ((x) & 0xffffff) +#define MCA_PCIDEV_INFO_FUNCTION(x) (((x) >> 24) & 0xff) + uint8_t info_slot; + uint8_t info_bus; + uint8_t info_segment; + uint8_t __res0; + uint32_t __res1; + } pcidev_info; + uint32_t pcidev_reg_mem; + uint32_t pcidev_reg_io; + /* Nx pcidev_reg. */ + /* M bytes of OEM platform data. */ +}; + +struct mca_pcidev_reg { + uint64_t pcidev_reg_addr; + uint64_t pcidev_reg_data; }; #define MCA_GUID_CPU \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 21 21: 3:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99E6837B409; Tue, 21 May 2002 21:03:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3280637B40F for ; Tue, 21 May 2002 21:03:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4M43im22285 for perforce@freebsd.org; Tue, 21 May 2002 21:03:44 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 21 May 2002 21:03:44 -0700 (PDT) Message-Id: <200205220403.g4M43im22285@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 11695 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11695 Change 11695 by jhb@jhb_laptop on 2002/05/21 21:03:05 IFC cpu_pause() changes. Affected files ... ... //depot/projects/smpng/sys/kern/kern_mutex.c#33 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#33 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.94 2002/05/21 21:27:05 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.95 2002/05/21 22:26:35 jhb Exp $ */ /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 22 17:54:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1417937B401; Wed, 22 May 2002 17:53:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E1CFB37B40F for ; Wed, 22 May 2002 17:52:57 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4N0qvg61955 for perforce@freebsd.org; Wed, 22 May 2002 17:52:57 -0700 (PDT) (envelope-from chris@freebsd.org) Date: Wed, 22 May 2002 17:52:57 -0700 (PDT) Message-Id: <200205230052.g4N0qvg61955@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 11752 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11752 Change 11752 by chris@chris_holly on 2002/05/22 17:52:40 Re-wrap paragraphs, add an "XXX" or two. Affected files ... ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/lomac/article.sgml#4 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/lomac/article.sgml#4 (text+ko) ==== @@ -27,19 +27,19 @@ LOMAC is a loadable kernel module-based security extension available on a number of UNIX kernels. LOMAC provides Low - Water-Mark Mandatory Access Control functionality to protect the - integrity of processes and data from viruses, Trojan horses, - malicious remote users, and compromised root daemons. LOMAC is - designed to be largely invisible to users, and largely painless - to administrators. + Water-Mark Mandatory Access Control functionality to protect + the integrity of processes and data from viruses, Trojan + horses, malicious remote users, and compromised root daemons. + LOMAC is designed to be largely invisible to users, and + largely painless to administrators. - This is the operations manual for LOMAC. It describes LOMAC - and the protection LOMAC provides. Please note that the FreeBSD - version of LOMAC is still under development. Although enough - functionality exists to provide some useful protection, some - features and fixes remain to be implemented. The FreeBSD version - of LOMAC should be used for experimental purposes only at this - time. + This is the operations manual for LOMAC. It describes + LOMAC and the protection LOMAC provides. Please note that the + FreeBSD version of LOMAC is still under development. Although + enough functionality exists to provide some useful protection, + some features and fixes remain to be implemented. The FreeBSD + version of LOMAC should be used for experimental purposes only + at this time. @@ -51,75 +51,78 @@ Several projects have demonstrated that kernel-resident - Mandatory Access Control (MAC) mechanisms can protect the integrity of Free UNIX systems from - malicious code and users. However, implementations of these - mechanisms have traditionally required invasive kernel - modifications, sometimes coupled with supporting modifications of - user-space utilities, as well. This requirement has hindered the - adoption of MAC mechanisms in the mainstream Free UNIX community. - Adoption has been further discouraged by the difficulty of starting - small and evolving towards a complete MAC solution - in general, - the complete set of extensive modifications must be made before MAC + Mandatory Access Control (MAC) mechanisms can + protect the integrity of Free UNIX systems from malicious code + and users. However, implementations of these mechanisms have + traditionally required invasive kernel modifications, sometimes + coupled with supporting modifications of user-space utilities, + as well. This requirement has hindered the adoption of MAC + mechanisms in the mainstream Free UNIX community. Adoption has + been further discouraged by the difficulty of starting small and + evolving towards a complete MAC solution - in general, the + complete set of extensive modifications must be made before MAC can provide any useful protection. LOMAC is an attempt to make an easily-adoptable form of MAC - integrity protection available to the Free UNIX community without - the discouraging necessity of kernel modifications. LOMAC - implements a simple form of MAC integrity protection based on - Biba's Low Water-Mark model in a Loadable Kernel Module (LKM) - - K. J. Biba, "Integrity Considerations for Secure Computer - Systems," Electronic Systems Division, Hanscom Air Force Base, - Bedford, MA, April 1977, pages 27-31.BIB77 - + integrity protection available to the Free UNIX community + without the discouraging necessity of kernel modifications. + LOMAC implements a simple form of MAC integrity protection based + on Biba's Low Water-Mark model in a Loadable Kernel Module (LKM) - - T. Fraser "LOMAC: Low Water-Mark Integrity Protection for - COTS Environments", Proceedings of the 2000 IEEE Symposium on - Security and Privacy, 2000. + + K. J. Biba, "Integrity Considerations for Secure + Computer Systems," Electronic Systems Division, Hanscom Air + Force Base, Bedford, MA, April 1977, pages + 27-31.BIB77 - - T. Fraser, "LOMAC: MAC You Can Live With", Proceedings of - the FREENIX Track: USENIX Annual Technical Conference, Boston, - Massachusetts, June, 2001. + + T. Fraser "LOMAC: Low Water-Mark Integrity Protection + for COTS Environments", Proceedings of the 2000 IEEE + Symposium on Security and Privacy, 2000. - Although it trades off some of the advanced MAC features found in - traditional MAC implementations, LOMAC provides useful integrity - protection without any modifications to the kernel, applications, - or their existing configurations. LOMAC is designed to be - compatible with existing software, and ships with a - one-size-fits-all default configuration. LOMAC may be used to - harden cur rently-deployed FreeBSD systems simply by loading the - LKM into the kernel shortly after boot time. + + T. Fraser, "LOMAC: MAC You Can Live With", Proceedings + of the FREENIX Track: USENIX Annual Technical Conference, + Boston, Massachusetts, June, 2001. + Although it trades off some of the advanced MAC + features found in traditional MAC implementations, LOMAC + provides useful integrity protection without any modifications + to the kernel, applications, or their existing configurations. + LOMAC is designed to be compatible with existing software, and + ships with a one-size-fits-all default configuration. LOMAC may + be used to harden cur rently-deployed FreeBSD systems simply by + loading the LKM into the kernel shortly after boot time. Once loaded, LOMAC divides the system into two conceptual levels of integrity: high and low. The high side contains all - process and files that should be protected from malicious code and - remote users, including the system binaries (/bin, - /lib) and configuration files (/etc). - The low side contains the processes that interact with remote - users (remote login sessions, httpd) and the files they download - from the net (mail attachments). Low files may contain viruses or - Trojan Horses. Low processes take input from remote users that may - cause buffer overflows. During run-time, LOMAC protects high files - and processes by preventing low processes from modifying or - signalling them. Thanks to is generic default configuration, LOMAC - handles the division of the system into high and low parts + process and files that should be protected from malicious code + and remote users, including the system binaries + (/bin, /lib) and + configuration files (/etc). The low side + contains the processes that interact with remote users (remote + login sessions, httpd) and the files they download from the net + (mail attachments). Low files may contain viruses or Trojan + Horses. Low processes take input from remote users that may + cause buffer overflows. During run-time, LOMAC protects high + files and processes by preventing low processes from modifying + or signalling them. Thanks to is generic default configuration, + LOMAC handles the division of the system into high and low parts automatically, without administrative direction. LOMAC does not override the existing FreeBSD protection - mechanisms. Instead, its permission checks are done in addition to - the existing ones - the kernel permits an operation only if both - the existing mechanisms and LOMAC decide it should permit it. - Unlike the existing FreeBSD protection mechanisms, LOMAC makes - decisions based solely on integrity level, not on user identity. - With LOMAC, a low-level root process is just as powerless as a - low-level non-root process. Since LOMAC automatically places all - network servers in the low part of the system, this fact prevents - compromised root-privileged network servers from harming the - high-integrity part of the system. + mechanisms. Instead, its permission checks are done in addition + to the existing ones - the kernel permits an operation only if + both the existing mechanisms and LOMAC decide it should permit + it. Unlike the existing FreeBSD protection mechanisms, LOMAC + makes decisions based solely on integrity level, not on user + identity. With LOMAC, a low-level root process is just as + powerless as a low-level non-root process. Since LOMAC + automatically places all network servers in the low part of the + system, this fact prevents compromised root-privileged network + servers from harming the high-integrity part of the + system. @@ -137,20 +140,16 @@ Check to make sure that the LOMAC LKM is loaded: - ::prompt.root; - /sbin/kldstat | grep lomac.ko - - 5 1 0xc13e0000 c000 lomac.ko + &prompt.root; /sbin/kldstat | grep + lomac.ko 5 1 0xc13e0000 c000 lomac.ko Look at the levels of your processes: - ::prompt.root; - ps - - PID LVL TT STAT TIME COMMAND 251 2 v6 Is 0:00.37 login -p root - 650 2 v6 S 0:00.56 -csh (csh) 665 2 v6 R+ 0:00.05 ./ps + &prompt.root; ps PID LVL TT + STAT TIME COMMAND 251 2 v6 Is 0:00.37 login -p root 650 2 v6 + S 0:00.56 -csh (csh) 665 2 v6 R+ 0:00.05 ./ps Note that all your processes are running at level 2—LOMAC's highest level of privilege. @@ -158,42 +157,38 @@ - Look at the levels of your files. (-Z shows levels.) + Look at the levels of your files. (-Z + shows levels.) - ::prompt.root; - ls -lZ - - total 62 -rw-r--r-- 2 root wheel 2 802 Apr 21 2001 .cshrc - -rw------- 1 root wheel 2 2973 Oct 12 09:41 .history -rw-r--r-- - 1 root wheel 2 142 Apr 21 2001 .klogin -rw-r--r-- 1 root wheel - 2 297 Apr 21 2001 .login + &prompt.root; ls -lZ total 62 + -rw-r--r-- 2 root wheel 2 802 Apr 21 2001 .cshrc -rw------- + 1 root wheel 2 2973 Oct 12 09:41 .history -rw-r--r-- 1 root + wheel 2 142 Apr 21 2001 .klogin -rw-r--r-- 1 root wheel 2 + 297 Apr 21 2001 .login Note that all your files are also at level 2. Level-2 - files are high-integrity—LOMAC assumes that they contain - no viruses or Trojan horses at boot time, and limits the - behavior of processes during run-time to keep them that + files are high-integrity—LOMAC assumes that they + contain no viruses or Trojan horses at boot time, and limits + the behavior of processes during run-time to keep them that way. - Look at the levels of a normal user's files. I'll use the - user tfraser in the example; you'll have to use one of your own - users. + Look at the levels of a normal user's files. I'll use + the user tfraser in the example; you'll have to use one of + your own users. - ::prompt.root; - ls -laZ /home/tfraser - - total 47 drwxr-xr-x 8 tfraser staff 1 1024 Oct 25 14:30 . - drwxr-xr-x 4 root wheel 2 512 Aug 27 10:47 .. -rw------- 1 - tfraser staff 1 114 Aug 27 11:11 .Xauthority -rw------- 1 - tfraser staff 1 42 Oct 4 10:17 .bash_history + &prompt.root; ls -laZ + /home/tfraser total 47 drwxr-xr-x 8 tfraser + staff 1 1024 Oct 25 14:30 . drwxr-xr-x 4 root wheel 2 512 + Aug 27 10:47 .. -rw------- 1 tfraser staff 1 114 Aug 27 + 11:11 .Xauthority -rw------- 1 tfraser staff 1 42 Oct 4 + 10:17 .bash_history - Note that while - /home - - is level 2 (high integrity), all of the user's files are level - 1 (low integrity). LOMAC assumes that any of the user's files - may be Trojan horses or contain viruses. + Note that while /home is level 2 + (high integrity), all of the user's files are level 1 (low + integrity). LOMAC assumes that any of the user's files may + be Trojan horses or contain viruses. @@ -201,91 +196,80 @@ in the background with ctrl-Z. Then run ps to look at your processes. - ::prompt.root; - less /home/tfraser/.bash_history - - <output not included in document to save space> - ^Z - - Suspended ::prompt.root; - ps - - PID LVL TT STAT TIME COMMAND 251 2 v6 Is 0:00.37 login -p root - 650 2 v6 S 0:01.28 -csh (csh) 733 1 v6 T 0:00.08 less - /home/tfraser/.bash_history 735 2 v6 R+ 0:00.05 ./ps + &prompt.root; less + /home/tfraser/.bash_history <output not + included in document to save space> + ^Z Suspended &prompt.root; + ps PID LVL TT STAT TIME COMMAND 251 2 + v6 Is 0:00.37 login -p root 650 2 v6 S 0:01.28 -csh (csh) + 733 1 v6 T 0:00.08 less /home/tfraser/.bash_history 735 2 v6 + R+ 0:00.05 ./ps Note that, although your shell (csh in my case) is still - at level 2, the process running less is at level 1. Here's why: - Processes generally inherit the level of their parent. So, any - process you start with your level-2 shell will initially - execute at level 2. The less process was no exception - it - began running at level 2. However, the less process went on to - read the user's .cshrc file. This file is a level-1 file - it - contains low-integrity data. Whenever LOMAC sees a level-2 - process read a level-1 file, LOMAC "demotes" the process. That - is, it reduces the process to level 1. + at level 2, the process running less is at level 1. Here's + why: Processes generally inherit the level of their parent. + So, any process you start with your level-2 shell will + initially execute at level 2. The less process was no + exception - it began running at level 2. However, the less + process went on to read the user's .cshrc file. This file is + a level-1 file - it contains low-integrity data. Whenever + LOMAC sees a level-2 process read a level-1 file, LOMAC + "demotes" the process. That is, it reduces the process to + level 1. - Level-2 processes have maximum privileges (like "root" in - standard UNIX). Level-1 processes have greatly reduced - privileges. For example, they cannot write to level-2 files, or - signal level-2 processes. When a level-2 process reads a - level-1 file, it puts itself at risk. The file may be a Trojan - horse or may contain data designed to cause buffer overflows. - Because of this risk, LOMAC demotes level-2 processes that read - level-1 files to level 1. Once at level 1, these processes have - insufficient privilege to harm level-2 processes and - files. + Level-2 processes have maximum privileges (like "root" + in standard UNIX). Level-1 processes have greatly reduced + privileges. For example, they cannot write to level-2 files, + or signal level-2 processes. When a level-2 process reads a + level-1 file, it puts itself at risk. The file may be a + Trojan horse or may contain data designed to cause buffer + overflows. Because of this risk, LOMAC demotes level-2 + processes that read level-1 files to level 1. Once at level + 1, these processes have insufficient privilege to harm + level-2 processes and files. Many cautious UNIX administrators avoid putting "." in their PATH environment variable, in order to avoid executing some Trojan horses. In standard UNIX, a malicious user might - give an attack program the same name as a commonly-used command - like ls. If the administrator, running as root, were to cd to - the malicious user's directory and type ls, if the "." preceded - - /bin - - in their path, they would accidentally execute the malicious - ls - - rather than - /bin/ls - - . This act would effectively execute the malicious user's - Trojan horse program with root privileges, perhaps to modify - the login program or The passwd file. + give an attack program the same name as a commonly-used + command like ls. If the administrator, running as root, were + to cd to the malicious user's directory and type ls, if the + "." preceded /bin in their path, they + would accidentally execute the malicious + ls rather than + /bin/ls . This act would effectively + execute the malicious user's Trojan horse program with root + privileges, perhaps to modify the login program or The + passwd file. This precaution is not required in a system running LOMAC. LOMAC considers the execution of a program to be - equivalent to a read (since the process reads the program file - in order to execute it). Since all non-root user's files are at - level 1, LOMAC would demote the process executing the Trojan - ls, just as it demoted less in our example, above. Once at - level 1, LOMAC would prevent the Trojan ls from modifying - level-2 files such as the login program or the passwd - file. + equivalent to a read (since the process reads the program + file in order to execute it). Since all non-root user's + files are at level 1, LOMAC would demote the process + executing the Trojan ls, just as it demoted less in our + example, above. Once at level 1, LOMAC would prevent the + Trojan ls from modifying level-2 files such as the login + program or the passwd file. Demotion is a key part of the LOMAC's integrity protection scheme. Now that we've demonstrated how it works, we're now done with less. Quit the less program. - ::prompt.root; - fg - - <output not included in document to save space> - q + &prompt.root; fg <output not + included in document to save space> q Create a test file. We'll use this test file to - demonstrate LOMAC's integrity protection later on. # cat > - /root/foo This file contains test data. ^D + demonstrate LOMAC's integrity protection later on. # cat + > /root/foo This file contains test data. ^D tail -f /var/log/messages Leave this running while you - continue the tour. It's output will contain LOMAC log messages - as we proceed. + continue the tour. It's output will contain LOMAC log + messages as we proceed. @@ -293,77 +277,69 @@ user. Once logged in, examine the levels of your processes: - ::prompt.user; - ps - - PID LVL TT STAT TIME COMMAND 742 1 v7 S 0:00.48 -tcsh (tcsh) - 750 1 v7 R+ 0:00.05 ps + &prompt.user; ps PID LVL TT + STAT TIME COMMAND 742 1 v7 S 0:00.48 -tcsh (tcsh) 750 1 v7 + R+ 0:00.05 ps Note that as a normal user, all of your processes are at - level 1. Why? Switch back to the virtual console where you are - logged in as root. You should see a log message similar + level 1. Why? Switch back to the virtual console where you + are logged in as root. You should see a log message similar to: Oct 25 14:44:54 myhost /boot/kernel/kernel: - LOMAC: level-2 subject p252g252u1002:login demoted to level 1 - after reading under "/usr/home" + LOMAC: level-2 subject p252g252u1002:login demoted to level + 1 after reading under "/usr/home" - All the getty programs that handle logins run at level 2. - When a user attempts to log in, they run the login program, - which also runs at level 2. Upon supplying the proper password, - the login program starts a shell for the user (tcsh in this - case). The shell starts at level 2, but LOMAC demotes it to - level 1 when it reads the user's .cshrc file, just as it - demoted the less program, above. Once the user's shell is - running at level 1, all of the programs subsequently executed - by the user will run at level 1, also. + All the getty programs that handle logins run at level + 2. When a user attempts to log in, they run the login + program, which also runs at level 2. Upon supplying the + proper password, the login program starts a shell for the + user (tcsh in this case). The shell starts at level 2, but + LOMAC demotes it to level 1 when it reads the user's .cshrc + file, just as it demoted the less program, above. Once the + user's shell is running at level 1, all of the programs + subsequently executed by the user will run at level 1, + also. Our root shell from the start of the tour remains at - level-2 because LOMAC has set all of root's files at level 2. A - level-2 process may read level-2 files without being demoted. - The user's shell is demoted because it reads the user's level-1 - files. LOMAC does not assign levels to processes based on the - user's root/non-root identity. LOMAC assigns levels to files by - starting the first process (init) at level 2, allowing child - processes to inherit their parent's level, and by demoting - processes that read level-1 files. LOMAC does not pay any - attention to user identity. Consequently, LOMAC is not - vulnerable to any of the traditional attacks on UNIX security - that involve obtaining root identity. + level-2 because LOMAC has set all of root's files at level + 2. A level-2 process may read level-2 files without being + demoted. The user's shell is demoted because it reads the + user's level-1 files. LOMAC does not assign levels to + processes based on the user's root/non-root identity. LOMAC + assigns levels to files by starting the first process (init) + at level 2, allowing child processes to inherit their + parent's level, and by demoting processes that read level-1 + files. LOMAC does not pay any attention to user identity. + Consequently, LOMAC is not vulnerable to any of the + traditional attacks on UNIX security that involve obtaining + root identity. Test the above assertion that LOMAC does not give any - extra privileges to processes with root identity. Switch back - to the normal user's shell and become root. + extra privileges to processes with root identity. Switch + back to the normal user's shell and become root. - ::prompt.user; - su - - Password: ::prompt.root; - ps - - PID LVL TT STAT TIME COMMAND 252 1 v7 Is 0:00.39 login -p - tfraser 751 1 v7 I 0:00.18 su 752 1 v7 S 0:00.43 _su (csh) 755 - 1 v7 R+ 0:00.05 ps + &prompt.user; su Password: + &prompt.root; ps PID LVL TT STAT + TIME COMMAND 252 1 v7 Is 0:00.39 login -p tfraser 751 1 v7 I + 0:00.18 su 752 1 v7 S 0:00.43 _su (csh) 755 1 v7 R+ 0:00.05 + ps Note that, despite the su, your shell is still at level - 1. LOMAC never increases the level of a process. Now attempt to - delete the /root/foo file you created earlier. + 1. LOMAC never increases the level of a process. Now attempt + to delete the /root/foo file you created earlier. - ::prompt.root; - ls -lZ /root/foo - + &prompt.root; ls -lZ /root/foo -rw-r--r-- 1 root wheel 2 30 Oct 25 14:44 /root/foo - ::prompt.root; - rm /root/foo - - rm: /root/foo: Operation not permitted + &prompt.root; rm /root/foo rm: + /root/foo: Operation not permitted Even though you are root, LOMAC will not allow a level-1 - process (rm in this case) to delete a level-2 file. You should - see a log message similar to this one in on the root virtual - console that is tailing /var/log/messages: + process (rm in this case) to delete a level-2 file. You + should see a log message similar to this one in on the root + virtual console that is tailing /var/log/messages: Oct 25 14:50:52 myhost /boot/kernel/kernel: LOMAC: level-1 proc p763g763u0:rm denied delete to level-2 @@ -377,50 +353,52 @@ LOMAC and Network Applications - This section explains how LOMAC uses its demotion behavior to - ensure that all remote users and servers that serve remote users - (httpd, ftpd, etc.) run at level 1. At this level, malicious remote - users and compromised network servers can do little harm to the - level-2 part of the system, even if they have root privilege. It - also discusses a few of the finer points concerning LOMAC's - protection scheme not already covered in the SHORT TOUR section, - above. The basic elements of LOMAC's integrity protection scheme - are summarized here: + This section explains how LOMAC uses its demotion behavior + to ensure that all remote users and servers that serve remote + users (httpd, ftpd, etc.) run at level 1. At this level, + malicious remote users and compromised network servers can do + little harm to the level-2 part of the system, even if they have + root privilege. It also discusses a few of the finer points + concerning LOMAC's protection scheme not already covered in the + SHORT TOUR section, above. The basic elements of LOMAC's + integrity protection scheme are summarized here: LOMAC assigns every process, or named filesystem object - (file, named pipe, or bound UNIX-domain socket) a level: either - 1 (low integrity) or 2 (high integrity). + (file, named pipe, or bound UNIX-domain socket) a level: + either 1 (low integrity) or 2 (high integrity). - LOMAC assigns levels to filesystem objects based on their - location in the filesystem namespace. The mapping between names - and levels constitutes most of LOMAC's "default policy", and is - presently hardcoded into the LKM. Once assigned, the levels of - filesystem objects never change. + LOMAC assigns levels to filesystem objects based on + their location in the filesystem namespace. The mapping + between names and levels constitutes most of LOMAC's + "default policy", and is presently hardcoded into the LKM. + Once assigned, the levels of filesystem objects never + change. The first process (init) starts at level 2. All child processes inherit the level of their parent. Only when a - level-2 process reads from a level-1 object does LOMAC demote - the process to level 1. + level-2 process reads from a level-1 object does LOMAC + demote the process to level 1. - Level-1 processes have insufficient privilege to write to - level-2 objects or signal level-2 processes. This protects the - level-2 part of the system from malicious interference. + Level-1 processes have insufficient privilege to write + to level-2 objects or signal level-2 processes. This + protects the level-2 part of the system from malicious + interference. The combination of LOMAC's demotion behavior and its restrictions on the privileges of level-1 processes prevent malicious level-1 users from harming the level-2 part of the - system, even in cases where level-2 administrators accidentally - execute malicious user's Trojan horses. + system, even in cases where level-2 administrators + accidentally execute malicious user's Trojan horses. @@ -431,34 +409,31 @@ upon reading level-1 files, LOMAC also demotes level-2 processes when they read from a network interface. Consequently, LOMAC demotes network server as soon as they read their first client - request from the network. Just as LOMAC assigns appropriate levels - to user shells based on their file-reading behavior, not their - user's identity, this scheme allows LOMAC to demote network servers - without initially knowing which programs are network servers: LOMAC - simply allows the init program to start all of its servers at level - 2, and subsequently demotes those servers which read from a network - interface. + request from the network. Just as LOMAC assigns appropriate + levels to user shells based on their file-reading behavior, not + their user's identity, this scheme allows LOMAC to demote + network servers without initially knowing which programs are + network servers: LOMAC simply allows the init program to start + all of its servers at level 2, and subsequently demotes those + servers which read from a network interface. LOMAC uses the same strategy to ensure that remote users run - at level 1: it demotes the remote login (telnetd, rlogind) servers - when they receive their first login request, as described above. - LOMAC's ability to automatically determine the proper levels for - users and servers during runtime is the feature which allows it to - avoid site-specific configuration and ship with a one-size-fits-all - default policy. + at level 1: it demotes the remote login (telnetd, rlogind) + servers when they receive their first login request, as + described above. LOMAC's ability to automatically determine the + proper levels for users and servers during runtime is the + feature which allows it to avoid site-specific configuration and + ship with a one-size-fits-all default policy. Here is an example of an httpd server before it reads its first request. Note that the httpd server is comprised of 5 processes, all at level 2. - ::prompt.root; - ps -U nobody - - PID LVL TT STAT TIME COMMAND 369 2 ?? I 0:00.03 - /usr/local/sbin/httpd 370 2 ?? I 0:00.03 /usr/local/sbin/httpd 371 - 2 ?? I 0:00.03 /usr/local/sbin/httpd 372 2 ?? I 0:00.03 - /usr/local/sbin/httpd 373 2 ?? I 0:00.03 - /usr/local/sbin/httpd + &prompt.root; ps -U nobody PID LVL + TT STAT TIME COMMAND 369 2 ?? I 0:00.03 /usr/local/sbin/httpd + 370 2 ?? I 0:00.03 /usr/local/sbin/httpd 371 2 ?? I 0:00.03 + /usr/local/sbin/httpd 372 2 ?? I 0:00.03 /usr/local/sbin/httpd + 373 2 ?? I 0:00.03 /usr/local/sbin/httpd After httpd reads its first request from the network, you should see a message similar to this one in @@ -471,10 +446,10 @@ And running ps again will produce: PID LVL TT STAT TIME COMMAND 369 1 ?? S 0:00.30 - /usr/local/sbin/httpd 370 2 ?? I 0:00.03 /usr/local/sbin/httpd 371 - 2 ?? I 0:00.03 /usr/local/sbin/httpd 372 2 ?? I 0:00.03 - /usr/local/sbin/httpd 373 2 ?? I 0:00.03 /usr/local/sbin/httpd 1572 - 2 ?? S 0:00.06 /usr/local/sbin/httpd + /usr/local/sbin/httpd 370 2 ?? I 0:00.03 /usr/local/sbin/httpd + 371 2 ?? I 0:00.03 /usr/local/sbin/httpd 372 2 ?? I 0:00.03 + /usr/local/sbin/httpd 373 2 ?? I 0:00.03 /usr/local/sbin/httpd + 1572 2 ?? S 0:00.06 /usr/local/sbin/httpd LOMAC demoted httpd process 369 as soon as it read its first client request. @@ -484,10 +459,10 @@ LOMAC and Traditional UNIX Access Control LOMAC does not override the existing FreeBSD protection - mechanisms. Instead, its permission checks are done in addition to - the existing ones—the kernel permits an operation only if - both the existing mechanisms and LOMAC decide the kernel should - permit it. + mechanisms. Instead, its permission checks are done in addition + to the existing ones—the kernel permits an operation only + if both the existing mechanisms and LOMAC decide the kernel + should permit it. There are three main differences between the integrity protection scheme implemented by LOMAC and traditional UNIX @@ -497,35 +472,35 @@ Traditional UNIX provides mechanisms by which processes can increase their privileges by changing their effective - identities. Although UNIX systems can be configured to prevent - malicious users from exploiting these mechanisms in most cases, - they can also be misconfigured, and good configurations can be - foiled by bugs in user-space application programs. LOMAC - provides no mechanism to allow a process to increase its - level. + identities. Although UNIX systems can be configured to + prevent malicious users from exploiting these mechanisms in + most cases, they can also be misconfigured, and good + configurations can be foiled by bugs in user-space + application programs. LOMAC provides no mechanism to allow a + process to increase its level. Traditional UNIX access control mechanisms are not - designed to prevent the flow of potentially dangerous data from - low-integrity objects to high-integrity objects. That is, from - files owned by one user to those owned by another - even to - those owned by root. The Trojan ls scenario in the SHORT TOUR - section describes one wellknown example of this vulnerability, - and how LOMAC counters it. + designed to prevent the flow of potentially dangerous data + from low-integrity objects to high-integrity objects. That + is, from files owned by one user to those owned by another - + even to those owned by root. The Trojan ls scenario in the + SHORT TOUR section describes one wellknown example of this + vulnerability, and how LOMAC counters it. Although many enhancements now exist, in its most basic - form traditional UNIX depends on easily defeated authentication - mechanisms to establish appropriate initial privilege levels. - LOMAC assigns privilege levels to processes based on their - reading behavior. As described above, the effect of LOMAC's - policy is to give the highest level of privilege only local - administrative users, and the lowest level of privilege to all - others, regardless of identity. LOMAC does not consider user - identity; consequently, it does not depend on - authentication. + form traditional UNIX depends on easily defeated + authentication mechanisms to establish appropriate initial + privilege levels. LOMAC assigns privilege levels to + processes based on their reading behavior. As described + above, the effect of LOMAC's policy is to give the highest + level of privilege only local administrative users, and the + lowest level of privilege to all others, regardless of + identity. LOMAC does not consider user identity; + consequently, it does not depend on authentication. @@ -539,30 +514,28 @@ protection. The Low Water-Mark MAC model supports this compatibility-first requirement. However, it the quality of protection it provides is not as great as that provided by more - modern, less compatible, models. This issue is discussed at length - in - > - - . This section presents the two well-known primary - quality-of-protection drawbacks of the Low Water-Mark model: its - enforcement of the principle of least privilege, and its reliance - on trusted applications. + modern, less compatible, models. This issue is discussed at + length in . This section presents the two + well-known primary quality-of-protection drawbacks of the Low + Water-Mark model: its enforcement of the principle of least + privilege, and its reliance on trusted + applications. The first drawback of the Low Water-Mark MAC scheme concerns the Principle of Least Privilege, which holds that a good MAC - scheme should grant a subject the minimum set of privileges needed - to do its job [SAL75]. Constraining a subject in this way minimizes - the amount of damage the subject can cause should it become - compromised. Low Water-Mark provides weaker constraints than some - more modern models. The LOMAC AND NETWORK APPLICATIONS section - describes how LOMAC protects the level-2 part of the system by - demoting network servers to level 1. Although LOMAC will prevent a - compromised level-1 network server from harming the level-2 part of - the system, LOMAC will not prevent such a server from doing harm in - the level-1 remainder of the system. A compromised root-privileged - network server could, for example, send kill signals to another - level-1 server. + scheme should grant a subject the minimum set of privileges + needed to do its job [SAL75]. Constraining a subject in this way + minimizes the amount of damage the subject can cause should it + become compromised. Low Water-Mark provides weaker constraints + than some more modern models. The LOMAC AND NETWORK APPLICATIONS + section describes how LOMAC protects the level-2 part of the + system by demoting network servers to level 1. Although LOMAC + will prevent a compromised level-1 network server from harming + the level-2 part of the system, LOMAC will not prevent such a + server from doing harm in the level-1 remainder of the system. A + compromised root-privileged network server could, for example, + send kill signals to another level-1 server. The second drawback of the Low Water-Mark MAC scheme is its @@ -570,37 +543,33 @@ hierarchical models like Low Water-Mark [BOE85]. The dhclient(8) client-side DHCP agent is a good example of LOMAC's reliance on trusted applications: As described in the LOMAC AND NETWORK - APPLICATIONS section, LOMAC protects the integrity of the level-2 - part of the system by demoting all applications which read from the - network to level 1. Once demoted, these applications can no longer - modify level-2 files. Although this demotion and confinement - prevents potentially-compromised network applications provides - useful protection, it also prevents applications like dhclient from - operating properly. + APPLICATIONS section, LOMAC protects the integrity of the + level-2 part of the system by demoting all applications which + read from the network to level 1. Once demoted, these + applications can no longer modify level-2 files. Although this + demotion and confinement prevents potentially-compromised + network applications provides useful protection, it also + prevents applications like dhclient from operating + properly. The dhclient application reads DHCP information from the - network and attempts to update the host's - /etc - - configuration files, accordingly. This is exactly the kind of - potentially-dangerous behavior that is prohibited by LOMAC; a - dhclient that LOMAC has demoted to level 1 cannot modify - /etc - - configuration files. Although dangerous, dhclient's behavior is - required for the proper operation of some systems. + network and attempts to update the host's + /etc configuration files, accordingly. This + is exactly the kind of potentially-dangerous behavior that is + prohibited by LOMAC; a dhclient that LOMAC has demoted to level + 1 cannot modify /etc configuration files. + Although dangerous, dhclient's behavior is required for the + proper operation of some systems. LOMAC must provide an exception to its policy in order to allow dhclient to run, and "trust" dhclient not to abuse this - exceptional privilege. LOMAC sets the special "NONETDEMOTE" flag on - all processes running the dhclient program. LOMAC will not demote a - process with this flag set when that process reads from the - network. This exception allows a level-2 dhclient to stay at level - 2 after reading DHCP information from the network, permitting it to - modify - /etc - - configuration files as it chooses. + exceptional privilege. LOMAC sets the special "NONETDEMOTE" flag + on all processes running the dhclient program. LOMAC will not + demote a process with this flag set when that process reads from + the network. This exception allows a level-2 dhclient to stay at + level 2 after reading DHCP information from the network, + permitting it to modify /etc configuration + files as it chooses. The FreeBSD version of LOMAC presently two flags for processes, each implementing a specific flavor of trust: @@ -630,65 +599,49 @@ Note that, although these flags allow level-2 processes to - escape demotion, they do not allow a level-1 process to raise its - level to 2. LOMAC does not provide any such promotion + escape demotion, they do not allow a level-1 process to raise + its level to 2. LOMAC does not provide any such promotion mechanism. - LOMAC will set a process's - NONETDEMOTE - - or - NODEMOTE - - flag when that process executes a particular program, such as - dhclient. In addition, once a process has one of these flags set, - any children it subsequently creates will have the same flag set. - LOMAC maintains a short list mapping programs to process trust - flags. Eventually, that list will be shown here. However, since the - FreeBSD version of LOMAC is still under development, the membership - of the list is still fluid. The best reference is the LOMAC source - code, specifically - policy_plm.h - - . + LOMAC will set a process's NONETDEMOTE + or NODEMOTE flag when that process executes + a particular program, such as dhclient. In addition, once a + process has one of these flags set, any children it subsequently + creates will have the same flag set. LOMAC maintains a short + list mapping programs to process trust flags. Eventually, that + list will be shown here. However, since the FreeBSD version of + LOMAC is still under development, the membership of the list is + still fluid. The best reference is the LOMAC source code, + specifically policy_plm.h . - If you create symlinks to - env - - named - env-nonetdemote - - and - env-nodemote - - , executing env through these symlinks will cause env and its child - processes to run with the - NONETDEMOTE - - and - NODEMOTE - - flags, respectively. This feature may be an aid to administration, - particularly when downloading and installing new software. + If you create symlinks to env named + env-nonetdemote and + env-nodemote , executing env through these + symlinks will cause env and its child processes to run with the + NONETDEMOTE and + NODEMOTE flags, respectively. This feature + may be an aid to administration, particularly when downloading + and installing new software. SEE ALSO - + + sec-arch(7), security(7) [BIB77] K. J. Biba, "Integrity Considerations for Secure Computer Systems," Electronic Systems Division, Hanscom Air Force Base, Bedford, MA, April 1977, pages 27-31. [BOE85] W. E. Boebert and R. Y. Kain, "A Practical - Alternative to Hierarchical Integrity Policies," Proceedings of the - 8th National Computer Security Conference, 1985. LWM and Trust: - pages 19-20. Assured Pipelines: pages 20-25. [FRA01] T. Fraser, - "LOMAC: MAC You Can Live With", Proceedings of the FREENIX Track: - USENIX Annual Technical Conference, Boston, Massachusetts, June, - 2001. [SAL75] J. H. Saltzer and M. D. Schroeder, "The Protection of - Information in Computer Systems," Proceedings of the IEEE Vol. - 63(9), September 1975, pages 1278-1308. Also summarized in Dorothy - E. Denning, "Cryptography and Data Security," Addison-Wesley, 1982, - page 206. + Alternative to Hierarchical Integrity Policies," Proceedings of + the 8th National Computer Security Conference, 1985. LWM and + Trust: pages 19-20. Assured Pipelines: pages 20-25. [FRA01] T. + Fraser, "LOMAC: MAC You Can Live With", Proceedings of the + FREENIX Track: USENIX Annual Technical Conference, Boston, + Massachusetts, June, 2001. [SAL75] J. H. Saltzer and M. D. + Schroeder, "The Protection of Information in Computer Systems," + Proceedings of the IEEE Vol. 63(9), September 1975, pages + 1278-1308. Also summarized in Dorothy E. Denning, "Cryptography + and Data Security," Addison-Wesley, 1982, page 206.
To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 22 18:58: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51DD037B406; Wed, 22 May 2002 18:57:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3043D37B405 for ; Wed, 22 May 2002 18:57:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4N1vFg73803 for perforce@freebsd.org; Wed, 22 May 2002 18:57:15 -0700 (PDT) (envelope-from chris@freebsd.org) Date: Wed, 22 May 2002 18:57:15 -0700 (PDT) Message-Id: <200205230157.g4N1vFg73803@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 11755 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11755 Change 11755 by chris@chris_holly on 2002/05/22 18:56:55 Mark up some more usernames, filenames and applications. Re-format screen/program listings. Other clean-ups. Re-wrap paragraphs. Affected files ... ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/lomac/article.sgml#5 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/lomac/article.sgml#5 (text+ko) ==== @@ -1,3 +1,40 @@ + +
@@ -29,9 +66,10 @@ available on a number of UNIX kernels. LOMAC provides Low Water-Mark Mandatory Access Control functionality to protect the integrity of processes and data from viruses, Trojan - horses, malicious remote users, and compromised root daemons. - LOMAC is designed to be largely invisible to users, and - largely painless to administrators. + horses, malicious remote users, and compromised + root daemons. LOMAC is designed to be + largely invisible to users, and largely painless to + administrators. This is the operations manual for LOMAC. It describes LOMAC and the protection LOMAC provides. Please note that the @@ -102,30 +140,32 @@ (/bin, /lib) and configuration files (/etc). The low side contains the processes that interact with remote users (remote - login sessions, httpd) and the files they download from the net - (mail attachments). Low files may contain viruses or Trojan - Horses. Low processes take input from remote users that may - cause buffer overflows. During run-time, LOMAC protects high - files and processes by preventing low processes from modifying - or signalling them. Thanks to is generic default configuration, - LOMAC handles the division of the system into high and low parts - automatically, without administrative direction. + login sessions, httpd) and the files + they download from the net (mail attachments). Low files may + contain viruses or Trojan Horses. Low processes take input from + remote users that may cause buffer overflows. During run-time, + LOMAC protects high files and processes by preventing low + processes from modifying or signalling them. Thanks to is + generic default configuration, LOMAC handles the division of the + system into high and low parts automatically, without + administrative direction. LOMAC does not override the existing FreeBSD protection mechanisms. Instead, its permission checks are done in addition - to the existing ones - the kernel permits an operation only if - both the existing mechanisms and LOMAC decide it should permit - it. Unlike the existing FreeBSD protection mechanisms, LOMAC - makes decisions based solely on integrity level, not on user - identity. With LOMAC, a low-level root process is just as - powerless as a low-level non-root process. Since LOMAC - automatically places all network servers in the low part of the - system, this fact prevents compromised root-privileged network - servers from harming the high-integrity part of the + to the existing ones—the kernel permits an operation only + if both the existing mechanisms and LOMAC decide it should + permit it. Unlike the existing FreeBSD protection mechanisms, + LOMAC makes decisions based solely on integrity level, not on + user identity. With LOMAC, a low-level root + process is just as powerless as a low-level + non-root process. Since LOMAC automatically + places all network servers in the low part of the system, this + fact prevents compromised root-privileged + network servers from harming the high-integrity part of the system. - + A Short Tour This section introduces LOMAC's major features. You may @@ -134,25 +174,28 @@ - Log in as root, from the system console. + Log in as root, from the system + console. Check to make sure that the LOMAC LKM is loaded: - - &prompt.root; /sbin/kldstat | grep - lomac.ko 5 1 0xc13e0000 c000 lomac.ko + + # /sbin/kldstat | grep lomac.ko +5 1 0xc13e0000 c000 lomac.ko Look at the levels of your processes: - &prompt.root; ps PID LVL TT - STAT TIME COMMAND 251 2 v6 Is 0:00.37 login -p root 650 2 v6 - S 0:00.56 -csh (csh) 665 2 v6 R+ 0:00.05 ./ps + # ps + PID LVL TT STAT TIME COMMAND + 251 2 v6 Is 0:00.37 login -p root + 650 2 v6 S 0:00.56 -csh (csh) + 665 2 v6 R+ 0:00.05 ./ps Note that all your processes are running at level - 2—LOMAC's highest level of privilege. + 2—LOMAC's highest level of privilege. @@ -160,14 +203,16 @@ Look at the levels of your files. (-Z shows levels.) - &prompt.root; ls -lZ total 62 - -rw-r--r-- 2 root wheel 2 802 Apr 21 2001 .cshrc -rw------- - 1 root wheel 2 2973 Oct 12 09:41 .history -rw-r--r-- 1 root - wheel 2 142 Apr 21 2001 .klogin -rw-r--r-- 1 root wheel 2 - 297 Apr 21 2001 .login + # ls -lZ +total 62 +-rw-r--r-- 2 root wheel 2 802 Apr 21 2001 .cshrc +-rw------- 1 root wheel 2 2973 Oct 12 09:41 .history +-rw-r--r-- 1 root wheel 2 142 Apr 21 2001 .klogin +-rw-r--r-- 1 root wheel 2 297 Apr 21 2001 .login +... Note that all your files are also at level 2. Level-2 - files are high-integrity—LOMAC assumes that they + files are high-integrity—LOMAC assumes that they contain no viruses or Trojan horses at boot time, and limits the behavior of processes during run-time to keep them that way. @@ -178,12 +223,12 @@ the user tfraser in the example; you'll have to use one of your own users. - &prompt.root; ls -laZ - /home/tfraser total 47 drwxr-xr-x 8 tfraser - staff 1 1024 Oct 25 14:30 . drwxr-xr-x 4 root wheel 2 512 - Aug 27 10:47 .. -rw------- 1 tfraser staff 1 114 Aug 27 - 11:11 .Xauthority -rw------- 1 tfraser staff 1 42 Oct 4 - 10:17 .bash_history + # ls -laZ /home/tfraser +total 47 +drwxr-xr-x 8 tfraser staff 1 1024 Oct 25 14:30 . +drwxr-xr-x 4 root wheel 2 512 Aug 27 10:47 .. +-rw------- 1 tfraser staff 1 114 Aug 27 11:11 .Xauthority +-rw------- 1 tfraser staff 1 42 Oct 4 10:17 .bash_history Note that while /home is level 2 (high integrity), all of the user's files are level 1 (low @@ -196,80 +241,90 @@ in the background with ctrl-Z. Then run ps to look at your processes. - &prompt.root; less - /home/tfraser/.bash_history <output not - included in document to save space> - ^Z Suspended &prompt.root; - ps PID LVL TT STAT TIME COMMAND 251 2 - v6 Is 0:00.37 login -p root 650 2 v6 S 0:01.28 -csh (csh) - 733 1 v6 T 0:00.08 less /home/tfraser/.bash_history 735 2 v6 - R+ 0:00.05 ./ps + # less /home/tfraser/.bash_history +<output not included in document to save space> +^Z +Suspended +# ps + PID LVL TT STAT TIME COMMAND + 251 2 v6 Is 0:00.37 login -p root + 650 2 v6 S 0:01.28 -csh (csh) + 733 1 v6 T 0:00.08 less /home/tfraser/.bash_history + 735 2 v6 R+ 0:00.05 ./ps - Note that, although your shell (csh in my case) is still - at level 2, the process running less is at level 1. Here's - why: Processes generally inherit the level of their parent. - So, any process you start with your level-2 shell will - initially execute at level 2. The less process was no - exception - it began running at level 2. However, the less - process went on to read the user's .cshrc file. This file is - a level-1 file - it contains low-integrity data. Whenever - LOMAC sees a level-2 process read a level-1 file, LOMAC - "demotes" the process. That is, it reduces the process to - level 1. + Note that, although your shell + (csh in my case) is still at + level 2, the process running less is at level 1. Here's why: + Processes generally inherit the level of their parent. So, + any process you start with your level-2 shell will initially + execute at level 2. The less process was no exception - it + began running at level 2. However, the less process went on + to read the user's .cshrc file. This + file is a level-1 file—it contains low-integrity data. + Whenever LOMAC sees a level-2 process read a level-1 file, + LOMAC "demotes" the process. That is, it reduces the process + to level 1. - Level-2 processes have maximum privileges (like "root" - in standard UNIX). Level-1 processes have greatly reduced - privileges. For example, they cannot write to level-2 files, - or signal level-2 processes. When a level-2 process reads a - level-1 file, it puts itself at risk. The file may be a - Trojan horse or may contain data designed to cause buffer - overflows. Because of this risk, LOMAC demotes level-2 - processes that read level-1 files to level 1. Once at level - 1, these processes have insufficient privilege to harm - level-2 processes and files. + Level-2 processes have maximum privileges (like + root in standard UNIX). Level-1 + processes have greatly reduced privileges. For example, they + cannot write to level-2 files, or signal level-2 processes. + When a level-2 process reads a level-1 file, it puts itself + at risk. The file may be a Trojan horse or may contain data + designed to cause buffer overflows. Because of this risk, + LOMAC demotes level-2 processes that read level-1 files to + level 1. Once at level 1, these processes have insufficient + privilege to harm level-2 processes and files. Many cautious UNIX administrators avoid putting "." in their PATH environment variable, in order to avoid executing some Trojan horses. In standard UNIX, a malicious user might give an attack program the same name as a commonly-used - command like ls. If the administrator, running as root, were - to cd to the malicious user's directory and type ls, if the - "." preceded /bin in their path, they - would accidentally execute the malicious + command like ls. If the administrator, running as + root, were to cd to the malicious + user's directory and type ls, if the "." preceded + /bin in their path, they would + accidentally execute the malicious ls rather than - /bin/ls . This act would effectively - execute the malicious user's Trojan horse program with root - privileges, perhaps to modify the login program or The - passwd file. + /bin/ls. This act would effectively + execute the malicious user's Trojan horse program with + root privileges, perhaps to modify the + login program or the passwd + file. This precaution is not required in a system running LOMAC. LOMAC considers the execution of a program to be equivalent to a read (since the process reads the program - file in order to execute it). Since all non-root user's - files are at level 1, LOMAC would demote the process - executing the Trojan ls, just as it demoted less in our - example, above. Once at level 1, LOMAC would prevent the - Trojan ls from modifying level-2 files such as the login - program or the passwd file. + file in order to execute it). Since all + non-root user's files are at level 1, + LOMAC would demote the process executing the Trojan ls, just + as it demoted less in our example, above. Once at level 1, + LOMAC would prevent the Trojan ls from modifying level-2 + files such as the login program or the passwd file. Demotion is a key part of the LOMAC's integrity protection scheme. Now that we've demonstrated how it works, we're now done with less. Quit the less program. - &prompt.root; fg <output not - included in document to save space> q + # fg +<output not included in document to save space> +q Create a test file. We'll use this test file to - demonstrate LOMAC's integrity protection later on. # cat - > /root/foo This file contains test data. ^D + demonstrate LOMAC's integrity protection later on. + + # cat > /root/foo +This file contains test data. +^D - tail -f /var/log/messages Leave this running while you - continue the tour. It's output will contain LOMAC log - messages as we proceed. + tail -f /var/log/messages + + Leave this running while you continue the tour. It's + output will contain LOMAC log messages as we proceed. @@ -277,15 +332,16 @@ user. Once logged in, examine the levels of your processes: - &prompt.user; ps PID LVL TT - STAT TIME COMMAND 742 1 v7 S 0:00.48 -tcsh (tcsh) 750 1 v7 - R+ 0:00.05 ps + $ ps + PID LVL TT STAT TIME COMMAND + 742 1 v7 S 0:00.48 -tcsh (tcsh) + 750 1 v7 R+ 0:00.05 ps Note that as a normal user, all of your processes are at level 1. Why? Switch back to the virtual console where you - are logged in as root. You should see a log message similar - to: - + are logged in as root. You should see a + log message similar to: + Oct 25 14:44:54 myhost /boot/kernel/kernel: LOMAC: level-2 subject p252g252u1002:login demoted to level 1 after reading under "/usr/home" @@ -294,52 +350,63 @@ 2. When a user attempts to log in, they run the login program, which also runs at level 2. Upon supplying the proper password, the login program starts a shell for the - user (tcsh in this case). The shell starts at level 2, but - LOMAC demotes it to level 1 when it reads the user's .cshrc - file, just as it demoted the less program, above. Once the - user's shell is running at level 1, all of the programs + user (tcsh in this case). The + shell starts at level 2, but LOMAC demotes it to level 1 + when it reads the user's .cshrc file, + just as it demoted the less program, above. Once the user's + shell is running at level 1, all of the programs subsequently executed by the user will run at level 1, also. - Our root shell from the start of the tour remains at - level-2 because LOMAC has set all of root's files at level - 2. A level-2 process may read level-2 files without being - demoted. The user's shell is demoted because it reads the - user's level-1 files. LOMAC does not assign levels to - processes based on the user's root/non-root identity. LOMAC - assigns levels to files by starting the first process (init) - at level 2, allowing child processes to inherit their - parent's level, and by demoting processes that read level-1 - files. LOMAC does not pay any attention to user identity. - Consequently, LOMAC is not vulnerable to any of the - traditional attacks on UNIX security that involve obtaining - root identity. + Our root shell from the start of + the tour remains at level-2 because LOMAC has set all of + root's files at level 2. A level-2 + process may read level-2 files without being demoted. The + user's shell is demoted because it reads the user's level-1 + files. LOMAC does not assign levels to processes based on + the user's + root/non-root + identity. LOMAC assigns levels to files by starting the + first process (init) at level 2, allowing child processes to + inherit their parent's level, and by demoting processes that + read level-1 files. LOMAC does not pay any attention to user + identity. Consequently, LOMAC is not vulnerable to any of + the traditional attacks on UNIX security that involve + obtaining root identity. Test the above assertion that LOMAC does not give any - extra privileges to processes with root identity. Switch - back to the normal user's shell and become root. + extra privileges to processes with root + identity. Switch back to the normal user's shell and become + root. - &prompt.user; su Password: - &prompt.root; ps PID LVL TT STAT - TIME COMMAND 252 1 v7 Is 0:00.39 login -p tfraser 751 1 v7 I - 0:00.18 su 752 1 v7 S 0:00.43 _su (csh) 755 1 v7 R+ 0:00.05 - ps + &prompt.user; su +Password: +# ps + PID LVL TT STAT TIME COMMAND + 252 1 v7 Is 0:00.39 login -p tfraser + 751 1 v7 I 0:00.18 su + 752 1 v7 S 0:00.43 _su (csh) + 755 1 v7 R+ 0:00.05 ps - Note that, despite the su, your shell is still at level - 1. LOMAC never increases the level of a process. Now attempt - to delete the /root/foo file you created earlier. + Note that, despite the su, your shell + is still at level 1. LOMAC never increases the level of a + process. Now attempt to delete the + /root/foo file you created + earlier. - &prompt.root; ls -lZ /root/foo - -rw-r--r-- 1 root wheel 2 30 Oct 25 14:44 /root/foo - &prompt.root; rm /root/foo rm: - /root/foo: Operation not permitted + # ls -lZ /root/foo +-rw-r--r-- 1 root wheel 2 30 Oct 25 14:44 /root/foo +# rm /root/foo +rm: /root/foo: Operation not permitted - Even though you are root, LOMAC will not allow a level-1 - process (rm in this case) to delete a level-2 file. You - should see a log message similar to this one in on the root - virtual console that is tailing /var/log/messages: + Even though you are root, LOMAC + will not allow a level-1 process (rm in + this case) to delete a level-2 file. You should see a log + message similar to this one in on the + root virtual console that is tailing + /var/log/messages: Oct 25 14:50:52 myhost /boot/kernel/kernel: LOMAC: level-1 proc p763g763u0:rm denied delete to level-2 @@ -355,12 +422,14 @@ This section explains how LOMAC uses its demotion behavior to ensure that all remote users and servers that serve remote - users (httpd, ftpd, etc.) run at level 1. At this level, - malicious remote users and compromised network servers can do - little harm to the level-2 part of the system, even if they have - root privilege. It also discusses a few of the finer points - concerning LOMAC's protection scheme not already covered in the - SHORT TOUR section, above. The basic elements of LOMAC's + users (httpd, + ftpd, etc.) run at level 1. At this + level, malicious remote users and compromised network servers + can do little harm to the level-2 part of the system, even if + they have root privilege. It also discusses + a few of the finer points concerning LOMAC's protection scheme + not already covered in the Short + Tour section, above. The basic elements of LOMAC's integrity protection scheme are summarized here: @@ -429,11 +498,13 @@ first request. Note that the httpd server is comprised of 5 processes, all at level 2. - &prompt.root; ps -U nobody PID LVL - TT STAT TIME COMMAND 369 2 ?? I 0:00.03 /usr/local/sbin/httpd - 370 2 ?? I 0:00.03 /usr/local/sbin/httpd 371 2 ?? I 0:00.03 - /usr/local/sbin/httpd 372 2 ?? I 0:00.03 /usr/local/sbin/httpd - 373 2 ?? I 0:00.03 /usr/local/sbin/httpd + # ps -U nobody + PID LVL TT STAT TIME COMMAND + 369 2 ?? I 0:00.03 /usr/local/sbin/httpd + 370 2 ?? I 0:00.03 /usr/local/sbin/httpd + 371 2 ?? I 0:00.03 /usr/local/sbin/httpd + 372 2 ?? I 0:00.03 /usr/local/sbin/httpd + 373 2 ?? I 0:00.03 /usr/local/sbin/httpd After httpd reads its first request from the network, you should see a message similar to this one in @@ -445,12 +516,14 @@ And running ps again will produce: - PID LVL TT STAT TIME COMMAND 369 1 ?? S 0:00.30 - /usr/local/sbin/httpd 370 2 ?? I 0:00.03 /usr/local/sbin/httpd - 371 2 ?? I 0:00.03 /usr/local/sbin/httpd 372 2 ?? I 0:00.03 - /usr/local/sbin/httpd 373 2 ?? I 0:00.03 /usr/local/sbin/httpd - 1572 2 ?? S 0:00.06 /usr/local/sbin/httpd - + PID LVL TT STAT TIME COMMAND + 369 1 ?? S 0:00.30 /usr/local/sbin/httpd + 370 2 ?? I 0:00.03 /usr/local/sbin/httpd + 371 2 ?? I 0:00.03 /usr/local/sbin/httpd + 372 2 ?? I 0:00.03 /usr/local/sbin/httpd + 373 2 ?? I 0:00.03 /usr/local/sbin/httpd + 1572 2 ?? S 0:00.06 /usr/local/sbin/httpd + LOMAC demoted httpd process 369 as soon as it read its first client request. @@ -485,9 +558,10 @@ designed to prevent the flow of potentially dangerous data from low-integrity objects to high-integrity objects. That is, from files owned by one user to those owned by another - - even to those owned by root. The Trojan ls scenario in the - SHORT TOUR section describes one wellknown example of this - vulnerability, and how LOMAC counters it. + even to those owned by root. The Trojan + ls scenario in the Short + Tour section describes one well-known example of + this vulnerability, and how LOMAC counters it. @@ -534,8 +608,9 @@ will prevent a compromised level-1 network server from harming the level-2 part of the system, LOMAC will not prevent such a server from doing harm in the level-1 remainder of the system. A - compromised root-privileged network server could, for example, - send kill signals to another level-1 server. + compromised root-privileged network server + could, for example, send kill signals to another level-1 + server. The second drawback of the Low Water-Mark MAC scheme is its @@ -612,7 +687,7 @@ list will be shown here. However, since the FreeBSD version of LOMAC is still under development, the membership of the list is still fluid. The best reference is the LOMAC source code, - specifically policy_plm.h . + specifically policy_plm.h. If you create symlinks to env named env-nonetdemote and To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 22 18:59:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8E4737B408; Wed, 22 May 2002 18:59:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from holly.dyndns.org (adsl-208-191-149-232.dsl.hstntx.swbell.net [208.191.149.232]) by hub.freebsd.org (Postfix) with ESMTP id A0D3437B401 for ; Wed, 22 May 2002 18:59:17 -0700 (PDT) Received: (from chris@localhost) by holly.dyndns.org (8.11.6/8.9.3) id g4N1xau16666 for perforce@freebsd.org; Wed, 22 May 2002 20:59:37 -0500 (CDT) (envelope-from chris) Date: Wed, 22 May 2002 20:59:35 -0500 From: Chris Costello To: Perforce Change Reviews Subject: Re: PERFORCE change 11755 for review Message-ID: <20020522205935.A2519@holly.calldei.com> Reply-To: chris@freebsd.org References: <200205230157.g4N1vFg73803@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200205230157.g4N1vFg73803@freefall.freebsd.org>; from chris@freebsd.org on Wed, May 22, 2002 at 06:57:15PM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wednesday, May 22, 2002, Chris Costello wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11755 > > Change 11755 by chris@chris_holly on 2002/05/22 18:56:55 > > Mark up some more usernames, filenames and applications. > Re-format screen/program listings. > Other clean-ups. > Re-wrap paragraphs. Also add a copyright notice, of course. -- +-------------------+---------------------------------------------+ | Chris Costello | NyQuil: | | chris@FreeBSD.org | The stuffy, sneezy, | | | why-the-hell-is-the-room-spinning medicine. | +-------------------+---------------------------------------------+ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 22 19: 2:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BB0D37B403; Wed, 22 May 2002 19:02:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B54F537B416 for ; Wed, 22 May 2002 19:02:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4N22MN76062 for perforce@freebsd.org; Wed, 22 May 2002 19:02:22 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Wed, 22 May 2002 19:02:22 -0700 (PDT) Message-Id: <200205230202.g4N22MN76062@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11757 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11757 Change 11757 by mini@mini_stylus on 2002/05/22 19:02:18 Indent properly. Affected files ... ... //depot/projects/kse/sys/i386/include/kse.h#3 edit Differences ... ==== //depot/projects/kse/sys/i386/include/kse.h#3 (text+ko) ==== @@ -33,15 +33,15 @@ #include #include -union kse_td_ctx{ +union kse_td_ctx { struct { - int if_onstack; - struct intrframe if_if; + int if_onstack; + struct intrframe if_if; } intrfrm; struct { - int tf_onstack; - int tf_gs; - struct trapframe tf_tf; + int tf_onstack; + int tf_gs; + struct trapframe tf_tf; } tfrm; mcontext_t mcontext; }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 22 19:10:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC11937B413; Wed, 22 May 2002 19:10:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DCFAC37B40B for ; Wed, 22 May 2002 19:10:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4N2AWw82362 for perforce@freebsd.org; Wed, 22 May 2002 19:10:32 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Wed, 22 May 2002 19:10:32 -0700 (PDT) Message-Id: <200205230210.g4N2AWw82362@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11758 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11758 Change 11758 by mini@mini_stylus on 2002/05/22 19:09:41 Revert change 11564: des would like to keep this #if 0'd code. However, change the code so that it at least compiles and looks somewhat like it would need to in order to function. Affected files ... ... //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#6 edit Differences ... ==== //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#6 (text+ko) ==== @@ -91,10 +91,26 @@ error = EINVAL; break; } +#if 0 + mtx_lock_spin(&sched_lock); + p->p_step = 0; + if (P_SHOULDSTOP(p)) { + p->p_xstat = sig; + p->p_flag &= ~(P_STOPPED_TRACE|P_STOPPED_SGNL); + FOREACH_THREAD_IN_PROC(p, td) + setrunnable(td); /* XXX Totally bogus */ + mtx_unlock_spin(&sched_lock); + } else { + mtx_unlock_spin(&sched_lock); + if (sig) + psignal(p, sig); + } +#else if (sig) psignal(p, sig); p->p_step = 0; wakeup(&p->p_step); +#endif break; default: error = (ENOTTY); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 22 19:21:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E94E537B403; Wed, 22 May 2002 19:20:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 140DC37B41F for ; Wed, 22 May 2002 19:20:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4N2Kp283440 for perforce@freebsd.org; Wed, 22 May 2002 19:20:51 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Wed, 22 May 2002 19:20:51 -0700 (PDT) Message-Id: <200205230220.g4N2Kp283440@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11759 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11759 Change 11759 by mini@mini_stylus on 2002/05/22 19:20:51 Pointy hat to me, I seem to have selected the wrong label. userout -> out, which is what we use in -CURRENT (and makes more sense anyways). Affected files ... ... //depot/projects/kse/sys/i386/i386/trap.c#42 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#42 (text+ko) ==== @@ -286,7 +286,7 @@ #ifdef DEV_NPX ucode = npxtrap(); if (ucode == -1) - goto userout; + goto out; #else ucode = code; #endif @@ -336,7 +336,7 @@ } #endif if (i == -1) - goto userout; + goto out; if (i == 0) goto user; @@ -361,7 +361,7 @@ lastalert = time_second; } mtx_unlock(&Giant); - goto userout; + goto out; #else /* !POWERFAIL_NMI */ /* machine/parity/power fail/"kitchen sink" faults */ /* XXX Giant */ @@ -376,7 +376,7 @@ kdb_trap (type, 0, &frame); } #endif /* DDB */ - goto userout; + goto out; } else if (panic_on_nmi) panic("NMI indicates hardware failure"); break; @@ -397,7 +397,7 @@ #ifdef DEV_NPX /* transparent fault (due to context switch "late") */ if (npxdna()) - goto userout; + goto out; #endif if (!pmath_emulate) { i = SIGFPE; @@ -409,7 +409,7 @@ mtx_unlock(&Giant); if (i == 0) { if (!(frame.tf_eflags & PSL_T)) - goto userout; + goto out; frame.tf_eflags &= ~PSL_T; i = SIGTRAP; } @@ -434,7 +434,7 @@ switch (type) { case T_PAGEFLT: /* page fault */ (void) trap_pfault(&frame, FALSE, eva); - goto userout; + goto out; case T_DNA: #ifdef DEV_NPX @@ -444,7 +444,7 @@ * registered such use. */ if (npxdna()) - goto userout; + goto out; #endif break; @@ -464,7 +464,7 @@ * returns to original process */ vm86_trap((struct vm86frame *)&frame); - goto userout; + goto out; } if (type == T_STKFLT) break; @@ -492,7 +492,7 @@ PROC_LOCK(p); psignal(p, SIGBUS); PROC_UNLOCK(p); - goto userout; + goto out; } /* @@ -507,25 +507,25 @@ */ if (frame.tf_eip == (int)doreti_iret) { frame.tf_eip = (int)doreti_iret_fault; - goto userout; + goto out; } if (frame.tf_eip == (int)doreti_popl_ds) { frame.tf_eip = (int)doreti_popl_ds_fault; - goto userout; + goto out; } if (frame.tf_eip == (int)doreti_popl_es) { frame.tf_eip = (int)doreti_popl_es_fault; - goto userout; + goto out; } if (frame.tf_eip == (int)doreti_popl_fs) { frame.tf_eip = (int)doreti_popl_fs_fault; - goto userout; + goto out; } if (PCPU_GET(curpcb) != NULL && PCPU_GET(curpcb)->pcb_onfault != NULL) { frame.tf_eip = (int)PCPU_GET(curpcb)->pcb_onfault; - goto userout; + goto out; } break; @@ -541,7 +541,7 @@ */ if (frame.tf_eflags & PSL_NT) { frame.tf_eflags &= ~PSL_NT; - goto userout; + goto out; } break; @@ -553,7 +553,7 @@ * silently until the syscall handler has * saved the flags. */ - goto userout; + goto out; } if (frame.tf_eip == (int)IDTVEC(lcall_syscall) + 1) { /* @@ -561,7 +561,7 @@ * flags. Stop single stepping it. */ frame.tf_eflags &= ~PSL_T; - goto userout; + goto out; } /* * Ignore debug register trace traps due to @@ -580,7 +580,7 @@ * processor doesn't */ load_dr6(rdr6() & 0xfffffff0); - goto userout; + goto out; } /* * Fall through (TRCTRAP kernel mode, kernel address) @@ -593,7 +593,7 @@ #ifdef DDB /* XXX Giant */ if (kdb_trap (type, 0, &frame)) - goto userout; + goto out; #endif break; @@ -607,7 +607,7 @@ lastalert = time_second; } mtx_unlock(&Giant); - goto userout; + goto out; #else /* !POWERFAIL_NMI */ /* XXX Giant */ /* machine/parity/power fail/"kitchen sink" faults */ @@ -622,16 +622,16 @@ kdb_trap (type, 0, &frame); } #endif /* DDB */ - goto userout; + goto out; } else if (panic_on_nmi == 0) - goto userout; + goto out; /* FALL THROUGH */ #endif /* POWERFAIL_NMI */ #endif /* DEV_ISA */ } trap_fatal(&frame, eva); - goto userout; + goto out; } /* Translate fault for emulators (e.g. Linux) */ @@ -653,7 +653,7 @@ user: userret(td, &frame, sticks); mtx_assert(&Giant, MA_NOTOWNED); -userout: +out: return; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 22 22: 6:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10D6137B405; Wed, 22 May 2002 22:04:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DB5FD37B40D for ; Wed, 22 May 2002 22:04:19 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4N54J914922 for perforce@freebsd.org; Wed, 22 May 2002 22:04:19 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Wed, 22 May 2002 22:04:19 -0700 (PDT) Message-Id: <200205230504.g4N54J914922@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11779 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11779 Change 11779 by mini@mini_stylus on 2002/05/22 22:03:18 Many whitespace nits and comment fixups. Affected files ... ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#43 edit ... //depot/projects/kse/sys/i386/include/pcb_ext.h#7 edit ... //depot/projects/kse/sys/kern/init_main.c#41 edit ... //depot/projects/kse/sys/kern/kern_condvar.c#33 edit ... //depot/projects/kse/sys/kern/kern_exec.c#26 edit ... //depot/projects/kse/sys/kern/kern_exit.c#49 edit ... //depot/projects/kse/sys/kern/kern_fork.c#68 edit ... //depot/projects/kse/sys/kern/kern_idle.c#13 edit ... //depot/projects/kse/sys/kern/kern_proc.c#60 edit ... //depot/projects/kse/sys/kern/kern_sig.c#49 edit ... //depot/projects/kse/sys/kern/kern_switch.c#44 edit ... //depot/projects/kse/sys/kern/kern_synch.c#61 edit ... //depot/projects/kse/sys/kern/kern_thread.c#48 edit ... //depot/projects/kse/sys/kern/subr_trap.c#55 edit ... //depot/projects/kse/sys/kern/sys_process.c#26 edit ... //depot/projects/kse/sys/sys/kse.h#7 edit ... //depot/projects/kse/sys/sys/proc.h#101 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#43 (text+ko) ==== @@ -262,7 +262,7 @@ mdp = &td->td_proc->p_md; if (mdp->md_ldt) user_ldt_free(td); - reset_dbregs(); + reset_dbregs(); } void @@ -274,7 +274,7 @@ #endif if (pcb->pcb_ext != 0) { /* XXXKSE XXXSMP not SMP SAFE.. what locks do we have? */ - /*if (pcb->pcb_ext->refcount-- == 1) ?? */ + /* if (pcb->pcb_ext->refcount-- == 1) ?? */ /* * XXX do we need to move the TSS off the allocated pages * before freeing them? (not done here) @@ -424,7 +424,7 @@ uframe = &tm->ctx.tfrm.tf_tf; error = copyout(frame, uframe, sizeof(*frame)); /* - * "What about the fp regs?" I hear you ask.... XXXKSE + * "What about the fp regs?" I hear you ask.... XXXKSE * Don't know where gs and "onstack" come from. * May need to fiddle a few other values too. */ ==== //depot/projects/kse/sys/i386/include/pcb_ext.h#7 (text+ko) ==== @@ -41,7 +41,7 @@ struct i386tss ext_tss; /* per-process i386tss */ caddr_t ext_iomap; /* i/o permission bitmap */ struct vm86_kernel ext_vm86; /* vm86 area */ - int refcount; + int refcount; }; #ifdef _KERNEL ==== //depot/projects/kse/sys/kern/init_main.c#41 (text+ko) ==== @@ -338,10 +338,9 @@ ke->ke_oncpu = 0; ke->ke_state = KES_RUNNING; ke->ke_thread = td; - /* proc_linkup puts it in the idle queue, that's not what we want */ + /* proc_linkup puts it in the idle queue, that's not what we want. */ TAILQ_REMOVE(&kg->kg_iq, ke, ke_kgrlist); kg->kg_idle_kses--; - p->p_peers = 0; p->p_leader = p; @@ -671,7 +670,7 @@ td = FIRST_THREAD_IN_PROC(initproc); mtx_lock_spin(&sched_lock); - setrunqueue(td); /* XXXKSE */ + setrunqueue(td); /* XXXKSE */ mtx_unlock_spin(&sched_lock); } SYSINIT(kickinit, SI_SUB_KTHREAD_INIT, SI_ORDER_FIRST, kick_init, NULL) ==== //depot/projects/kse/sys/kern/kern_condvar.c#33 (text+ko) ==== @@ -109,32 +109,31 @@ * Common code for cv_wait* functions. All require sched_lock. */ -/* - * decide if we need to queue an upcall - * Copied from msleep().. maybe make this a common function. +/* + * Decide if we need to queue an upcall. + * This is copied from msleep(), perhaps this should be a common function. */ static void cv_check_upcall(struct thread *td) { /* - * If we are capable of async syscalls, and there isn't already - * another one ready to return, then start a new thread - * and queue it ready to run. Note there is danger here as we need - * to make sure that we don't sleep getting it - * (recursign might be bad). Hense the TDF_INMSLEEP flag. + * If we are capable of async syscalls and there isn't already + * another one ready to return, start a new thread + * and queue it as ready to run. Note that there is danger here + * because we need to make sure that we don't sleep allocating + * the thread (recursion here might be bad). + * Hence the TDF_INMSLEEP flag. */ - if ((td->td_proc->p_flag & P_KSES) && - td->td_mailbox && + if ((td->td_proc->p_flag & P_KSES) && td->td_mailbox && (td->td_flags & TDF_INMSLEEP) == 0) { - /* - * If we have no queued work to do, then - * upcall to the UTS to see if it has more to do. - * We don't need to upcall now, just make it and - * queue it. + /* + * If we have no queued work to do, + * upcall to the UTS to see if it has more work. + * We don't need to upcall now, just queue it. */ if (TAILQ_FIRST(&td->td_ksegrp->kg_runq) == NULL) { - /* don't recurse here! */ + /* Don't recurse here! */ td->td_flags |= TDF_INMSLEEP; thread_schedule_upcall(td, td->td_kse); td->td_flags &= ~TDF_INMSLEEP; @@ -186,7 +185,7 @@ if (sig != 0) { if (td->td_wchan != NULL) cv_waitq_remove(td); - td->td_state = TDS_RUNNING; /* XXXKSE */ + td->td_state = TDS_RUNNING; /* XXXKSE */ } else if (td->td_wchan != NULL) { cv_switch(td); } @@ -322,7 +321,7 @@ PROC_LOCK(p); if (sig == 0) - sig = CURSIG(td); /* XXXKSE */ + sig = CURSIG(td); /* XXXKSE */ if (sig != 0) { if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) rval = EINTR; @@ -611,7 +610,7 @@ td->td_flags &= ~TDF_TIMEOUT; setrunqueue(td); } else if (td->td_wchan != NULL) { - if (td->td_state == TDS_SLP) /* XXXKSE */ + if (td->td_state == TDS_SLP) /* XXXKSE */ setrunnable(td); else cv_waitq_remove(td); @@ -621,10 +620,9 @@ mtx_unlock_spin(&sched_lock); } -/* - * For now only abort interruptable waits - * others will have to either complete on their own - * or have a timeout. +/* + * For now only abort interruptable waits. + * The others will have to either complete on their own or have a timeout. */ void cv_abort(struct thread *td) @@ -634,7 +632,7 @@ td->td_proc->p_pid, td->td_proc->p_comm); mtx_lock_spin(&sched_lock); - if ((td->td_flags & (TDF_SINTR| TDF_TIMEOUT)) == TDF_SINTR) { + if ((td->td_flags & (TDF_SINTR|TDF_TIMEOUT)) == TDF_SINTR) { if (td->td_wchan != NULL) { if (td->td_state == TDS_SLP) { setrunnable(td); @@ -646,4 +644,3 @@ mtx_unlock_spin(&sched_lock); } - ==== //depot/projects/kse/sys/kern/kern_exec.c#26 (text+ko) ==== @@ -153,12 +153,12 @@ if ((p->p_flag & P_KSES) && thread_single(SNGLE_EXIT)) { PROC_UNLOCK(p); mtx_unlock(&Giant); - return (ERESTART); /* try again later */ + return (ERESTART); /* Try again later. */ } - /* If we get here all other threads are dead */ + /* If we get here all other threads are dead. */ p->p_flag |= P_INEXEC; PROC_UNLOCK(p); - + /* * Initialize part of the common data */ ==== //depot/projects/kse/sys/kern/kern_exit.c#49 (text+ko) ==== @@ -145,43 +145,41 @@ PROC_LOCK(p); if (p->p_flag & P_KSES) { /* - * first kill off the other threads. This requires + * First kill off the other threads. This requires * Some co-operation from other parts of the kernel * so it may not be instant. - */ + */ thread_suspend_check(0); /* * Here is a trick.. * We need to free up our KSE to process other threads - * so we can safely set the UNBOUND flag, - * whether or not we have a mailbox, as we are NEVER - * going to return to the user anyhow. - * The flag will not already be set if we are exiting - * because of a signal or a pagefault or similar. - * (or even an exit(2) from the UTS) + * so that we can safely set the UNBOUND flag + * (whether or not we have a mailbox) as we are NEVER + * going to return to the user. + * The flag will not be set yet if we are exiting + * because of a signal, pagefault, or similar + * (or even an exit(2) from the UTS). */ td->td_flags |= TDF_UNBOUND; if (thread_single(SNGLE_EXIT)) { - /* Can't happen ?? Maybe it can XXXKSE*/ + /* This can't happen.. maybe it can XXXKSE */ panic ("Exit: Single threading fouled up"); } - /* All other activity in this process is now stopped */ - /* remove excess KSEs and KSEGRPS */ + /* All other activity in this process is now stopped. */ + /* Remove excess KSEs and KSEGRPS. */ /* ... */ - /* turn off threading support */ + /* Turn off threading support. */ p->p_flag &= ~P_KSES; } /* * With this state set: - * Any thread entering the kernel from userspace - * will thread_exit() in trap(). - * Any thread attempting to sleep will return immediatly + * Any thread entering the kernel from userspace will thread_exit() + * in trap(). Any thread attempting to sleep will return immediatly * with EINTR or EWOULDBLOCK, which will hopefully force them - * to back out to userland, freeing resources as they go, - * and anything attempting to return to userland will - * thread_exit() from userret(). - * thread_exit() will do a wakeup on p->p_numthreads if - * it transitions to 1. Well it's done in thread_unlink() but... + * to back out to userland, freeing resources as they go, and + * anything attempting to return to userland will thread_exit() + * from userret(). thread_exit() will do a wakeup on p->p_numthreads + * if it transitions to 1. */ p->p_flag |= P_WEXIT; @@ -698,7 +696,7 @@ p->p_procsig = NULL; } - /* Free the KSE spare thread */ + /* Free the KSE spare thread. */ if (p->p_kse.ke_tdspare != NULL) thread_free(p->p_kse.ke_tdspare); ==== //depot/projects/kse/sys/kern/kern_fork.c#68 (text+ko) ==== @@ -287,11 +287,10 @@ * need to either be suspended or in the kernel, * where they will try restart in the parent and will * be aborted in the child. - * (it is possible we could restart them there as well!) - */ + */ PROC_LOCK(p1); if (thread_single(SNGLE_WAIT)) { - /* abort.. someone else is single threading before us */ + /* Abort.. someone else is single threading before us */ PROC_UNLOCK(p1); return (ERESTART); } @@ -501,20 +500,20 @@ * XXXKSE Theoretically only the running thread would get copied * Others in the kernel would be 'aborted' in the child. * i.e return E*something* - * On SMP we would have to stop them running on + * On SMP we would have to stop them running on * other CPUs! (set a flag in the proc that stops * all returns to userland until completed) * This is wrong but ok for 1:1. */ proc_linkup(p2, kg2, ke2, td2); - /* Set up the thread as an active thread. As if runnable */ + /* Set up the thread as an active thread (as if runnable). */ ke2->ke_thread = td2; td2->td_kse = ke2; TAILQ_REMOVE(&kg2->kg_iq, ke2, ke_kgrlist); ke2->ke_state = KES_UNQUEUED; kg2->kg_idle_kses--; - td2->td_flags &= ~TDF_UNBOUND; /* for the rest of this sycall */ + td2->td_flags &= ~TDF_UNBOUND; /* For the rest of this sycall. */ /* note.. XXXKSE no pcb or u-area yet */ @@ -833,7 +832,7 @@ td->td_kse->ke_oncpu = PCPU_GET(cpuid); p->p_state = PRS_NORMAL; - td->td_state = TDS_RUNNING; /* already done in switch() on 386 */ + td->td_state = TDS_RUNNING; /* Already done in switch() on 386. */ /* * Finish setting up thread glue. We need to initialize * the thread into a td_critnest=1 state. Some platforms ==== //depot/projects/kse/sys/kern/kern_idle.c#13 (text+ko) ==== @@ -60,7 +60,7 @@ panic("idle_setup: kthread_create error %d\n", error); p->p_flag |= P_NOLOAD; - FIRST_THREAD_IN_PROC(p)->td_state = TDS_RUNQ; /* XXXKSE */ + FIRST_THREAD_IN_PROC(p)->td_state = TDS_RUNQ; /* XXXKSE */ #ifdef SMP } #endif @@ -104,7 +104,7 @@ mtx_lock_spin(&sched_lock); curthread->td_proc->p_stats->p_ru.ru_nvcsw++; - curthread->td_state = TDS_RUNQ; /*pretend we are on the runq */ + curthread->td_state = TDS_RUNQ; /* Pretend we are on the runq */ mi_switch(); mtx_unlock_spin(&sched_lock); } ==== //depot/projects/kse/sys/kern/kern_proc.c#60 (text+ko) ==== @@ -208,38 +208,27 @@ p = td->td_proc; PROC_LOCK(p); /* - * If we have no KSE mode set, just set it, - * and skip KSE and KSEGRP creation. - * You cannot request a new group with the first one - * as you are effectively getting one. - * go directly to saving the upcall info. + * If we have no KSE mode set, just set it, and skip KSE and KSEGRP + * creation. You cannot request a new group with the first one as + * you are effectively getting one. Instead, go directly to saving + * the upcall info. */ if (td->td_proc->p_flag & P_KSES) { return (EINVAL); /* XXX */ /* - * If newgroup then create the new group. + * If newgroup then create the new group. * Check we have the resources for this. */ - - /* - * Copy lots of fields from the current KSEGRP. - */ - + /* Copy lots of fields from the current KSEGRP. */ + /* Create the new KSE */ + /* Copy lots of fields from the current KSE. */ + } else { /* - * Create the new KSE - */ - - /* - * Copy lots of fields from the current KSE. - */ - - } else { - /* * We are switching to KSEs so just * use the preallocated ones for this call. * XXXKSE if we have to initialise any fields for KSE - * mode operation, then do it here. + * mode operation, do it here. */ newkse = td->td_kse; } @@ -248,24 +237,25 @@ */ PROC_UNLOCK(p); mtx_lock_spin(&sched_lock); - mi_switch(); /* save current registers to PCB */ + mi_switch(); /* Save current registers to PCB. */ mtx_unlock_spin(&sched_lock); PROC_LOCK(p); cpu_save_upcall(td, newkse); newkse->ke_mailbox = uap->mbx; PROC_UNLOCK(p); - td->td_retval[0] = 1; /* note that we are the returning syscall */ - td->td_retval[1] = 0; /* note that we are the returning syscall */ + /* Note that we are the returning syscall */ + td->td_retval[0] = 1; + td->td_retval[1] = 0; if (td->td_proc->p_flag & P_KSES) { thread_schedule_upcall(td, newkse); } else { /* - * Don't set this til we are truely - * ready because things will start acting differently. - * Return to the upcall code for the first time. - * Assuming we set up the mailboxes right, - * all syscalls after this will be asynchronous. + * Don't set this untill we are truely ready, because + * things will start acting differently. Return to the + * upcall code for the first time. Assuming we set up + * the mailboxes right, all syscalls after this will be + * asynchronous. */ td->td_proc->p_flag |= P_KSES; } @@ -729,14 +719,14 @@ if (!(p->p_flag & P_KSES)) { if (td->td_wmesg != NULL) strncpy(kp->ki_wmesg, td->td_wmesg, - sizeof(kp->ki_wmesg) - 1); + sizeof(kp->ki_wmesg) - 1); if (td->td_state == TDS_MTX) { kp->ki_kiflag |= KI_MTXBLOCK; strncpy(kp->ki_mtxname, td->td_mtxname, sizeof(kp->ki_mtxname) - 1); } } - kp->ki_stat = p->p_state; /* XXXKSE Doesn't MAP */ + kp->ki_stat = p->p_state; /* XXXKSE Doesn't MAP */ kp->ki_sflag = p->p_sflag; kp->ki_swtime = p->p_swtime; kp->ki_traceflag = p->p_traceflag; ==== //depot/projects/kse/sys/kern/kern_sig.c#49 (text+ko) ==== @@ -1310,29 +1310,29 @@ /* * Some signals have a process-wide effect and a per-thread * component. Most processing occurs when the process next - * tries to cross the user boundary, however there is - * sometimes something that needs to be done immediatly, such as - * waking up the threads so that it can cross the user boundary. + * tries to cross the user boundary, however there are some + * times when processing needs to be done immediatly, such as + * waking up threads so that they can cross the user boundary. * We try do the per-process part here. */ if (P_SHOULDSTOP(p)) { /* - * The process is in stopped mode. All the threads should be - * either winding down, or already on the suspended queue. + * The process is in stopped mode. All the threads should be + * either winding down or already on the suspended queue. */ if (p->p_flag & P_TRACED) { /* * The traced process is already stopped, * so no further action is necessary. - * No signal can restart us, + * No signal can restart us. */ goto out; } if (sig == SIGKILL) { /* - * Kill signal always sets processes running. - * They actually die elsewhere. + * SIGKILL sets process running. + * It will die elsewhere. * All threads must be restarted. */ p->p_flag &= ~P_STOPPED; @@ -1342,15 +1342,12 @@ if (prop & SA_CONT) { /* * If SIGCONT is default (or ignored), we continue the - * process but don't leave the signal in p_siglist, as - * it has no further action. - * If SIGCONT is held, we continue - * the process and leave the signal in - * p_siglist. - * If the process catches SIGCONT, let it - * handle the signal itself. - * If it isn't waiting on - * an event, then it goes back to run state. + * process but don't leave the signal in p_siglist as + * it has no further action. If SIGCONT is held, we + * continue the process and leave the signal in + * p_siglist. If the process catches SIGCONT, let it + * handle the signal itself. If it isn't waiting on + * an event, it goes back to run state. * Otherwise, process goes back to sleep state. */ p->p_flag &= ~P_STOPPED_SGNL; @@ -1363,7 +1360,7 @@ * It would seem that the answer would be to * run an upcall in the next KSE to run, and * deliver the signal that way. In a NON KSE - * process, we need to make sure that the + * process, we need to make sure that the * single thread is runnable asap. * XXXKSE for now however, make them all run. */ @@ -1373,15 +1370,15 @@ * The signal is not ignored or caught. */ mtx_lock_spin(&sched_lock); - thread_unsuspend(p); /* checks if should do it */ + thread_unsuspend(p); /* Checks if should do it. */ mtx_unlock_spin(&sched_lock); goto out; } if (prop & SA_STOP) { /* - * Already stopped, don't need to stop again. - * (If we did the shell could get confused.) + * Already stopped, don't need to stop again + * (If we did the shell could get confused). */ SIGDELSET(p->p_siglist, sig); goto out; @@ -1389,9 +1386,9 @@ /* * All other kinds of signals: - * If a thread is sleeping interruptibly, then simulate a - * wakeup so that when it is continued, it will be made - * runnable and can look at the signal. But don't make + * If a thread is sleeping interruptibly, simulate a + * wakeup so that when it is continued it will be made + * runnable and can look at the signal. However, don't make * the process runnable, leave it stopped. * It may run a bit until it hits a thread_suspend_check(). * @@ -1447,24 +1444,18 @@ stop(p); mtx_unlock_spin(&sched_lock); goto out; - } else { + } else goto allrunfast; - } /* NOTREACHED */ } else { - /* not in "NORMAL" state. discard the signal. */ + /* Not in "NORMAL" state. discard the signal. */ SIGDELSET(p->p_siglist, sig); goto out; } /* - * The process is not stopped so we need to apply the signal to all the + * The process is not stopped so we need to apply the signal to all the * running threads. - * XXXKSE - * For now there is one thread per proc. - * We may not want to do if for each thread, - * but we don't yet know when we do and when we don't. - * We'll fix it later. */ allrunfast: @@ -1478,7 +1469,7 @@ mtx_assert(&sched_lock, MA_NOTOWNED); } -/* +/* * The force of a signal has been directed against a single * thread. We need to see what we can do about knocking it * out of any sleep it may be in etc. @@ -1492,7 +1483,7 @@ prop = sigprop(sig); /* - * bring the priority of a process up if we want it to get + * Bring the priority of a process up if we want it to get * killed in this lifetime. * XXXKSE we should shift the priority to the thread. */ @@ -1524,9 +1515,9 @@ goto out; } /* - * Process is sleeping and traced... make it runnable + * Process is sleeping and traced. Make it runnable * so it can discover the signal in issignal() and stop - * for the parent. + * for its parent. */ if (p->p_flag & P_TRACED) { p->p_flag &= ~P_STOPPED_TRACE; ==== //depot/projects/kse/sys/kern/kern_switch.c#44 (text+ko) ==== @@ -48,9 +48,9 @@ ************************************************************************/ /* - * Select the KSE that will be run next. - * from that find the thread, and remove it from the KSEGRP's run queue. - * If there is thread clustering, this will be what does it. + * Select the KSE that will be run next. From that find the thread, and x + * remove it from the KSEGRP's run queue. If there is thread clustering, + * this will be what does it. */ struct thread * choosethread(void) @@ -70,7 +70,7 @@ CTR2(KTR_RUNQ, "choosethread: td=%p pri=%d", td, td->td_priority); } else { - /* pretend the idle thread was on the run queue */ + /* Pretend the idle thread was on the run queue. */ td = PCPU_GET(idlethread); td->td_state = TDS_RUNQ; CTR1(KTR_RUNQ, "choosethread: td=%p (idle)", td); @@ -79,8 +79,8 @@ } /* - * Given a KSE (now surplus), either assign a new runable thread to it, - * and put it in the run queue, or put it in the ksegrp's idle KSE list. + * Given a KSE (now surplus), either assign a new runable thread to it + * (and put it in the run queue) or put it in the ksegrp's idle KSE list. */ void kse_reassign(struct kse *ke) @@ -91,7 +91,7 @@ ke->ke_state = KES_IDLE; /* temp state */ if ((td = kg->kg_last_assigned)) { - /* If there is a 'last assigned' then see what's next */ + /* If there is a 'last assigned' then see what's next. */ td = TAILQ_NEXT(td, td_runq); } else { td = TAILQ_FIRST(&kg->kg_runq); @@ -101,7 +101,7 @@ kg->kg_last_assigned = td; td->td_kse = ke; ke->ke_thread = td; - runq_add(&runq, ke); + runq_add(&runq, ke); CTR2(KTR_RUNQ, "kse_reassign: ke%p -> td%p", ke, td); } else { ke->ke_state = KES_IDLE; @@ -148,7 +148,7 @@ return runq_check(&runq); } -/* +/* * Remove a thread from it's KSEGRP's run queue. * This in turn may remove it from a KSE if it was already assigned * to one, possibly causing a new thread to be assigned to the KSE @@ -163,19 +163,20 @@ if (td->td_state != TDS_RUNQ) { panic("remrunqueue: Bad state on run queue"); + /* NOTREACHED */ return; } kg = td->td_ksegrp; ke = td->td_kse; /* - * If it's a bound thread/KSE pair, tka the shortcut. All non-KSE + * If it's a bound thread/KSE pair, take the shortcut. All non-KSE * threads are BOUND. */ CTR1(KTR_RUNQ, "remrunqueue: td%p", td); td->td_state = TDS_UNQUEUED; kg->kg_runnable--; if ((td->td_flags & TDF_UNBOUND) == 0) { - /* bring it's kse with it */ + /* Bring its kse with it. */ runq_remove(&runq, ke); ke->ke_state = KES_UNQUEUED; return; @@ -183,16 +184,16 @@ if (ke) { /* * This thread has been assigned to a KSE. - * so we need to dissociate it and try assign the - * KSE to the next available thread, then we should + * We need to dissociate it and try assign the + * KSE to the next available thread. Then, we should * see if we need to move the KSE in the run queues. */ td2 = kg->kg_last_assigned; if ((td3 = TAILQ_NEXT(td2, td_runq))) { /* - * give the next unassigned thread to the KSE - * so the number of runnable kSEs remains - * constant + * Give the next unassigned thread to the KSE + * so the number of runnable KSEs remains + * constant. */ td3->td_kse = ke; ke->ke_thread = td3; @@ -201,8 +202,8 @@ } else { /* * There is no unassigned thread. - * If we were the last assigned one - * then adjust the last assigned pointer back + * If we were the last assigned one, + * adjust the last assigned pointer back * one, which may result in NULL. */ if (td == td2) { @@ -215,7 +216,7 @@ kg->kg_last_assigned = TAILQ_PREV(td, threadlist_head, td_runq); } - ke->ke_state = KES_IDLE; + ke->ke_state = KES_IDLE; TAILQ_INSERT_HEAD(&kg->kg_iq, ke, ke_kgrlist); kg->kg_idle_kses++; } @@ -243,8 +244,8 @@ runq_add(&runq, td->td_kse); return; } - /* - * first add the thread to the ksegrp's run queue at + /* + * First add the thread to the ksegrp's run queue at * the appropriate place. */ TAILQ_FOREACH(td2, &kg->kg_runq, td_runq) { @@ -258,15 +259,15 @@ TAILQ_INSERT_TAIL(&kg->kg_runq, td, td_runq); } - /* + /* * The following could be achieved by simply doing: * td->td_kse = NULL; kse_reassign(ke); * but I felt that I'd try do it inline here. * All this work may not be worth it. */ if ((ke = td->td_kse)) { /* XXXKSE */ - /* - * We have a KSE already, see if we can keep it, + /* + * We have a KSE already. See whether we can keep it * or if we need to give it to someone else. * Either way it will need to be inserted into * the runq. kse_reassign() will do this as will runq_add(). @@ -283,7 +284,7 @@ return; } - /* + /* * Give it to the correct thread, * which may be (often is) us, but may not be. */ @@ -291,16 +292,16 @@ kse_reassign(ke); return; } - /* + /* * There are two cases where KSE adjustment is needed. * Usurpation of an already assigned KSE, and assignment * of a previously IDLE KSE. */ if (kg->kg_idle_kses) { - /* + /* * If there are unassigned KSEs then we definitly - * will be assigned one from the idle KSE list. Then - * if we are the last, we should get the "last + * will be assigned one from the idle KSE list. + * If we are the last, we should get the "last * assigned" pointer set to us as well. */ ke = TAILQ_FIRST(&kg->kg_iq); @@ -316,14 +317,12 @@ } else if (kg->kg_last_assigned && (kg->kg_last_assigned->td_priority > td->td_priority)) { /* - * If there was NO last-assigned then all the KSEs - * are actually out running as we speak, - * If there is a last assigned, but we didn't see it - * Then we must be inserting before it, - * So take the KSE from the last assigned, - * and back it up one entry. Then assign the KSE to - * the new thread and adjust it's priority. - * so do nothing. + * If there were none last-assigned, all KSEs + * are actually out running as we speak. + * If there was a last assigned, but we didn't see it, + * we must be inserting before it, so take the KSE from + * the last assigned, and back it up one entry. Then, + * assign the KSE to the new thread and adjust it's priority. */ td2 = kg->kg_last_assigned; ke = td2->td_kse; ==== //depot/projects/kse/sys/kern/kern_synch.c#61 (text+ko) ==== @@ -441,11 +441,12 @@ KASSERT(timo != 0 || mtx_owned(&Giant) || mtx != NULL, ("sleeping without a mutex")); /* - * If we are capable of async syscalls, and there isn't already - * another one ready to return, then start a new thread - * and queue it ready to run. Note there is danger here as we need - * to make sure that we don't sleep getting it - * (recursign might be bad). Hense the TDF_INMSLEEP flag. + * If we are capable of async syscalls and there isn't already + * another one ready to return, start a new thread + * and queue it as ready to run. Note that there is danger here + * because we need to make sure that we don't sleep allocating + * the thread (recursion here might be bad). + * Hence the TDF_INMSLEEP flag. */ if (p->p_flag & P_KSES) { /* Just don't bother if we are exiting @@ -453,14 +454,14 @@ if ((p->p_flag & P_WEXIT) && catch && p->p_singlethread != td) return (EINTR); if (td->td_mailbox && (!(td->td_flags & TDF_INMSLEEP))) { - /* + /* * If we have no queued work to do, then * upcall to the UTS to see if it has more to do. * We don't need to upcall now, just make it and * queue it. */ if (TAILQ_FIRST(&td->td_ksegrp->kg_runq) == NULL) { - /* don't recurse here! */ + /* Don't recurse here! */ mtx_lock_spin(&sched_lock); td->td_flags |= TDF_INMSLEEP; thread_schedule_upcall(td, td->td_kse); @@ -628,20 +629,19 @@ } /* - * Abort a thread, as if an interrupt had occured. - * Only abort interruptable waits (unfortunatly it - * is only safe to abort these. - * This is about identical to cv_abort(). + * Abort a thread, as if an interrupt had occured. Only abort + * interruptable waits (unfortunatly it isn't only safe to abort others). + * This is about identical to cv_abort(). * Think about merging them? - * Also whatever the signal code does... + * Also, whatever the signal code does... */ void -abortsleep(struct thread *td) +abortsleep(struct thread *td) { mtx_lock_spin(&sched_lock); /* - * If the TDF_TIMEOUT flag is set, then just leave. A + * If the TDF_TIMEOUT flag is set, just leave. A * timeout is scheduled anyhow. */ if ((td->td_flags & (TDF_TIMEOUT | TDF_SINTR)) == TDF_SINTR) { @@ -649,7 +649,10 @@ if (td->td_state == TDS_SLP) { /* XXXKSE */ setrunnable(td); } else { - /* probably in a suspended state.. um.. dunno XXXKSE */ + /* + * Probably in a suspended state.. + * um.. dunno XXXKSE + */ unsleep(td); } } @@ -842,24 +845,22 @@ ke->ke_oncpu = NOCPU; ke->ke_flags &= ~KEF_NEEDRESCHED; /* - * At the last moment, if this KSE is not on the run queue - * then it needs to be freed correctly, and the thread - * treated accordingly. + * At the last moment: if this KSE is not on the run queue, + * it needs to be freed correctly and the thread treated accordingly. */ if (td->td_state == TDS_RUNNING) { - /* put us back on the run queue (kse and all) */ + /* Put us back on the run queue (kse and all). */ setrunqueue(td); } else if ((td->td_flags & TDF_UNBOUND) && (td->td_state != TDS_RUNQ)) { /* - * We will not be on the run queue - * someone else can use the KSE if they need it. + * We will not be on the run queue. + * Someone else can use the KSE if they need it. */ td->td_kse = NULL; kse_reassign(ke); } cpu_switch(); td->td_kse->ke_oncpu = PCPU_GET(cpuid); - /* td->td_state = TDS_RUNNING; */ /* already done in switch on 386 */ sched_lock.mtx_recurse = sched_nest; sched_lock.mtx_lock = (uintptr_t)td; CTR3(KTR_PROC, "mi_switch: new thread %p (pid %d, %s)", td, p->p_pid, ==== //depot/projects/kse/sys/kern/kern_thread.c#48 (text+ko) ==== @@ -51,10 +51,8 @@ #include #include -/*static MALLOC_DEFINE(M_PROC, "proc", "Proc structures"); */ - /* - * Thread related storage + * Thread related storage. */ static uma_zone_t thread_zone; static int allocated_threads; @@ -246,6 +244,9 @@ uma_zfree(thread_zone, td); } +/* + * Store the thread context in the UTS's mailbox. + */ int thread_export_context(struct thread *td) { @@ -255,14 +256,14 @@ void *addr2; int error; - /* Export the register contents. */ + /* Export the register contents. */ error = cpu_export_context(td); addr1 = (caddr_t)ke->ke_mailbox + offsetof(struct kse_mailbox, completed_threads); addr2 = (caddr_t)td->td_mailbox + offsetof(struct thread_mailbox , next_completed); - /* Then link it into it's KSE's list of completed threads */ + /* Then link it into it's KSE's list of completed threads. */ if (!error) error = copyin( addr1, &td2_mbx, sizeof(void *)); if (!error) @@ -308,8 +309,10 @@ } /* - * Note that we do not link to the proc's ucred here - * The thread is linked as if running but no KSE assigned + * Link a thread to a process. + * + * Note that we do not link to the proc's ucred here. + * The thread is linked as if running but no KSE assigned. */ void thread_link(struct thread *td, struct ksegrp *kg) @@ -331,7 +334,7 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 22 22: 6:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F29D937B40B; Wed, 22 May 2002 22:06:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BB85C37B401 for ; Wed, 22 May 2002 22:06:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4N56Mw18963 for perforce@freebsd.org; Wed, 22 May 2002 22:06:22 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Wed, 22 May 2002 22:06:22 -0700 (PDT) Message-Id: <200205230506.g4N56Mw18963@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11780 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11780 Change 11780 by mini@mini_stylus on 2002/05/22 22:05:58 Remove extraneous braces. Affected files ... ... //depot/projects/kse/sys/kern/kern_condvar.c#34 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_condvar.c#34 (text+ko) ==== @@ -634,11 +634,10 @@ mtx_lock_spin(&sched_lock); if ((td->td_flags & (TDF_SINTR|TDF_TIMEOUT)) == TDF_SINTR) { if (td->td_wchan != NULL) { - if (td->td_state == TDS_SLP) { + if (td->td_state == TDS_SLP) setrunnable(td); - } else { + else cv_waitq_remove(td); - } } } mtx_unlock_spin(&sched_lock); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 22 22: 7:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6788837B40A; Wed, 22 May 2002 22:07:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9F36937B40E for ; Wed, 22 May 2002 22:07:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4N57OK19085 for perforce@freebsd.org; Wed, 22 May 2002 22:07:24 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Wed, 22 May 2002 22:07:24 -0700 (PDT) Message-Id: <200205230507.g4N57OK19085@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11782 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11782 Change 11782 by mini@mini_stylus on 2002/05/22 22:07:13 Diff reduction: don't change the label "runfast" to "allrunfast." Affected files ... ... //depot/projects/kse/sys/kern/kern_sig.c#50 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_sig.c#50 (text+ko) ==== @@ -1336,7 +1336,7 @@ * All threads must be restarted. */ p->p_flag &= ~P_STOPPED; - goto allrunfast; + goto runfast; } if (prop & SA_CONT) { @@ -1364,7 +1364,7 @@ * single thread is runnable asap. * XXXKSE for now however, make them all run. */ - goto allrunfast; + goto runfast; } /* * The signal is not ignored or caught. @@ -1426,7 +1426,7 @@ */ if (prop & SA_STOP) { if (action != SIG_DFL) - goto allrunfast; + goto runfast; /* * If a child holding parent blocked, @@ -1445,7 +1445,7 @@ mtx_unlock_spin(&sched_lock); goto out; } else - goto allrunfast; + goto runfast; /* NOTREACHED */ } else { /* Not in "NORMAL" state. discard the signal. */ @@ -1458,7 +1458,7 @@ * running threads. */ -allrunfast: +runfast: FOREACH_THREAD_IN_PROC(p, td) tdsignal(td, sig, action); mtx_lock_spin(&sched_lock); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 22 22:23: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93E0C37B406; Wed, 22 May 2002 22:22:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 794AF37B413 for ; Wed, 22 May 2002 22:22:43 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4N5MhD20753 for perforce@freebsd.org; Wed, 22 May 2002 22:22:43 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Wed, 22 May 2002 22:22:43 -0700 (PDT) Message-Id: <200205230522.g4N5MhD20753@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11783 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11783 Change 11783 by mini@mini_stylus on 2002/05/22 22:22:28 Don't initialize local variables in their declaration. Affected files ... ... //depot/projects/kse/sys/kern/kern_sig.c#51 edit ... //depot/projects/kse/sys/kern/kern_switch.c#45 edit ... //depot/projects/kse/sys/kern/kern_thread.c#49 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_sig.c#51 (text+ko) ==== @@ -1588,10 +1588,11 @@ issignal(td) struct thread *td; { - struct proc *p = td->td_proc; + struct proc *p; sigset_t mask; register int sig, prop; + p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); for (;;) { int traced = (p->p_flag & P_TRACED) || (p->p_stops & S_SIG); ==== //depot/projects/kse/sys/kern/kern_switch.c#45 (text+ko) ==== @@ -228,12 +228,13 @@ setrunqueue(struct thread *td) { struct kse *ke; - struct ksegrp *kg = td->td_ksegrp; + struct ksegrp *kg; struct thread *td2; CTR1(KTR_RUNQ, "setrunqueue: td%p", td); KASSERT((td->td_state != TDS_RUNQ), ("setrunqueue: bad thread state")); td->td_state = TDS_RUNQ; + kg = td->td_ksegrp; kg->kg_runnable++; if ((td->td_flags & TDF_UNBOUND) == 0) { /* ==== //depot/projects/kse/sys/kern/kern_thread.c#49 (text+ko) ==== @@ -250,7 +250,7 @@ int thread_export_context(struct thread *td) { - struct kse *ke = td->td_kse; + struct kse *ke; void *td2_mbx; void *addr1; void *addr2; @@ -259,6 +259,7 @@ /* Export the register contents. */ error = cpu_export_context(td); + ke = td->td_kse; addr1 = (caddr_t)ke->ke_mailbox + offsetof(struct kse_mailbox, completed_threads); addr2 = (caddr_t)td->td_mailbox @@ -317,8 +318,9 @@ void thread_link(struct thread *td, struct ksegrp *kg) { - struct proc *p = kg->kg_proc; + struct proc *p; + p = kg->kg_proc; td->td_state = TDS_NEW; td->td_proc = p; td->td_ksegrp = kg; @@ -380,10 +382,12 @@ int thread_single(int how) { - struct thread *td = curthread; + struct thread *td; struct thread *td2; - struct proc *p = td->td_proc; + struct proc *p; + td = curthread; + p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); KASSERT((td != NULL), ("curthread is NULL")); @@ -469,6 +473,8 @@ struct thread *td = curthread; struct proc *p = td->td_proc; + td = curthread; + p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); while (P_SHOULDSTOP(p)) { if (how && (td != p->p_singlethread)) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 23 10: 0:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E117337B403; Thu, 23 May 2002 10:00:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39]) by hub.freebsd.org (Postfix) with ESMTP id 88CB937B40C; Thu, 23 May 2002 10:00:13 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc53.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020523170013.LHQZ11659.rwcrmhc53.attbi.com@InterJet.elischer.org>; Thu, 23 May 2002 17:00:13 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id JAA88030; Thu, 23 May 2002 09:58:02 -0700 (PDT) Date: Thu, 23 May 2002 09:58:01 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11780 for review In-Reply-To: <200205230506.g4N56Mw18963@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I'm a great believer in always having the braces.. but, style(9) wins I guess. On Wed, 22 May 2002, Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11780 > > Change 11780 by mini@mini_stylus on 2002/05/22 22:05:58 > > Remove extraneous braces. > > Affected files ... > > ... //depot/projects/kse/sys/kern/kern_condvar.c#34 edit > > Differences ... > > ==== //depot/projects/kse/sys/kern/kern_condvar.c#34 (text+ko) ==== > > @@ -634,11 +634,10 @@ > mtx_lock_spin(&sched_lock); > if ((td->td_flags & (TDF_SINTR|TDF_TIMEOUT)) == TDF_SINTR) { > if (td->td_wchan != NULL) { > - if (td->td_state == TDS_SLP) { > + if (td->td_state == TDS_SLP) > setrunnable(td); > - } else { > + else > cv_waitq_remove(td); > - } > } > } > mtx_unlock_spin(&sched_lock); > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 23 10: 3: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E62437B411; Thu, 23 May 2002 10:03:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from 12-234-96-171.client.attbi.com (12-234-96-171.client.attbi.com [12.234.96.171]) by hub.freebsd.org (Postfix) with ESMTP id 6A85D37B400 for ; Thu, 23 May 2002 10:02:59 -0700 (PDT) Received: by 12-234-96-171.client.attbi.com (Postfix, from userid 1000) id 66C41A900; Thu, 23 May 2002 10:00:54 -0700 (PDT) Date: Thu, 23 May 2002 10:00:54 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11780 for review Message-ID: <20020523100054.S25907@stylus.haikugeek.com> References: <200205230506.g4N56Mw18963@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from julian@elischer.org on Thu, May 23, 2002 at 09:58:01AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > I'm a great believer in always having the braces.. > but, style(9) wins I guess. As am I. -- Jonathan Mini http://www.haikugeek.com "He who is not aware of his ignorance will be only misled by his knowledge." -- Richard Whatley To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 23 11:38:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BE6B37B400; Thu, 23 May 2002 11:38:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8983D37B414 for ; Thu, 23 May 2002 11:38:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4NIcCd73361 for perforce@freebsd.org; Thu, 23 May 2002 11:38:12 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Thu, 23 May 2002 11:38:12 -0700 (PDT) Message-Id: <200205231838.g4NIcCd73361@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 11791 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11791 Change 11791 by jhb@jhb_laptop on 2002/05/23 11:37:37 Put cred_free_thread() under INVARIANTS for ia32 syscalls. Affected files ... ... //depot/projects/smpng/sys/ia64/ia64/trap.c#31 edit Differences ... ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#31 (text+ko) ==== @@ -1099,7 +1099,7 @@ */ STOPEVENT(p, S_SCX, code); -#ifdef DIAGNOSTIC +#ifdef INVARIANTS cred_free_thread(td); #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 24 1:33:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2ED0A37B40B; Fri, 24 May 2002 01:33:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3897437B405 for ; Fri, 24 May 2002 01:33:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4O8XWI26514 for perforce@freebsd.org; Fri, 24 May 2002 01:33:32 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Fri, 24 May 2002 01:33:32 -0700 (PDT) Message-Id: <200205240833.g4O8XWI26514@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 11824 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11824 Change 11824 by mini@mini_stylus on 2002/05/24 01:33:30 Since CURSIG isn't a macro, change its name to cursig. We're already modifying all references to it anyways. Suggested by: peter Affected files ... ... //depot/projects/kse/sys/kern/kern_condvar.c#35 edit ... //depot/projects/kse/sys/kern/kern_sig.c#52 edit ... //depot/projects/kse/sys/kern/kern_synch.c#62 edit ... //depot/projects/kse/sys/kern/subr_trap.c#56 edit ... //depot/projects/kse/sys/sys/signalvar.h#12 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_condvar.c#35 (text+ko) ==== @@ -167,17 +167,17 @@ /* * We put ourselves on the sleep queue and start our timeout before - * calling CURSIG, as we could stop there, and a wakeup or a SIGCONT (or + * calling cursig, as we could stop there, and a wakeup or a SIGCONT (or * both) could occur while we were stopped. A SIGCONT would cause us to * be marked as TDS_SLP without resuming us, thus we must be ready for - * sleep when CURSIG is called. If the wakeup happens while we're - * stopped, td->td_wchan will be 0 upon return from CURSIG. + * sleep when cursig is called. If the wakeup happens while we're + * stopped, td->td_wchan will be 0 upon return from cursig. */ td->td_flags |= TDF_SINTR; mtx_unlock_spin(&sched_lock); p = td->td_proc; PROC_LOCK(p); - sig = CURSIG(td); /* XXXKSE */ + sig = cursig(td); /* XXXKSE */ if (thread_suspend_check(1)) sig = SIGSTOP; mtx_lock_spin(&sched_lock); @@ -321,7 +321,7 @@ PROC_LOCK(p); if (sig == 0) - sig = CURSIG(td); /* XXXKSE */ + sig = cursig(td); /* XXXKSE */ if (sig != 0) { if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) rval = EINTR; @@ -481,7 +481,7 @@ PROC_LOCK(p); if (sig == 0) - sig = CURSIG(td); + sig = cursig(td); if (sig != 0) { if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) rval = EINTR; ==== //depot/projects/kse/sys/kern/kern_sig.c#52 (text+ko) ==== @@ -172,7 +172,7 @@ * MP SAFE. */ int -CURSIG(struct thread *td) +cursig(struct thread *td) { struct proc *p = td->td_proc; @@ -1578,10 +1578,10 @@ * Stop signals with default action are processed immediately, then cleared; * they aren't returned. This is checked after each entry to the system for * a syscall or trap (though this can usually be done without calling issignal - * by checking the pending signal masks in the CURSIG macro.) The normal call + * by checking the pending signal masks in cursig.) The normal call * sequence is * - * while (sig = CURSIG(curthread)) + * while (sig = cursig(curthread)) * postsig(sig); */ int ==== //depot/projects/kse/sys/kern/kern_synch.c#62 (text+ko) ==== @@ -512,8 +512,8 @@ * before calling thread_suspend_check, as we could stop there, and * a wakeup or a SIGCONT (or both) could occur while we were stopped. * without resuming us, thus we must be ready for sleep - * when CURSIG is called. If the wakeup happens while we're - * stopped, td->td_wchan will be 0 upon return from CURSIG. + * when cursig is called. If the wakeup happens while we're + * stopped, td->td_wchan will be 0 upon return from cursig. */ if (catch) { CTR3(KTR_PROC, "msleep caught: thread %p (pid %d, %s)", td, @@ -521,7 +521,7 @@ td->td_flags |= TDF_SINTR; mtx_unlock_spin(&sched_lock); PROC_LOCK(p); - sig = CURSIG(td); + sig = cursig(td); if (thread_suspend_check(1)) { sig = EINTR; rval = EINTR; @@ -568,8 +568,8 @@ if (rval == 0 && catch) { PROC_LOCK(p); - /* XXX: shouldn't we always be calling CURSIG() */ - if (sig != 0 || (sig = CURSIG(td))) { + /* XXX: shouldn't we always be calling cursig() */ + if (sig != 0 || (sig = cursig(td))) { if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) rval = EINTR; else ==== //depot/projects/kse/sys/kern/subr_trap.c#56 (text+ko) ==== @@ -350,7 +350,7 @@ if (sflag & PS_NEEDSIGCHK) { mtx_lock(&Giant); PROC_LOCK(p); - while ((sig = CURSIG(td)) != 0) + while ((sig = cursig(td)) != 0) postsig(sig); PROC_UNLOCK(p); mtx_unlock(&Giant); ==== //depot/projects/kse/sys/sys/signalvar.h#12 (text+ko) ==== @@ -234,7 +234,7 @@ /* * Machine-independent functions: */ -int CURSIG(struct thread *td); +int cursig(struct thread *td); void execsigs(struct proc *p); void gsignal(int pgid, int sig); int issignal(struct thread *p); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 24 5:28: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59FA237B408; Fri, 24 May 2002 05:27:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 743DE37B401 for ; Fri, 24 May 2002 05:27:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4OCRsu70423 for perforce@freebsd.org; Fri, 24 May 2002 05:27:54 -0700 (PDT) (envelope-from des@freebsd.org) Date: Fri, 24 May 2002 05:27:54 -0700 (PDT) Message-Id: <200205241227.g4OCRsu70423@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 11828 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11828 Change 11828 by des@des.at.des.thinksec.com on 2002/05/24 05:27:09 GCC 3 is upon us. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/bin/su/su.c#6 edit ... //depot/projects/openpam/include/security/openpam.h#20 edit ... //depot/projects/openpam/lib/pam_get_authtok.c#18 edit Differences ... ==== //depot/projects/openpam/bin/su/su.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/bin/su/su.c#5 $ + * $P4: //depot/projects/openpam/bin/su/su.c#6 $ */ #include @@ -40,6 +40,7 @@ #include #include #include +#include #include #include ==== //depot/projects/openpam/include/security/openpam.h#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/include/security/openpam.h#19 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#20 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED @@ -137,9 +137,12 @@ const char *_fmt, ...); -#if defined(__STDC__) && (__STDC_VERSION__ >= 199901L) -#define openpam_log(lvl, fmt, ...) \ - _openpam_log((lvl), __func__, fmt, __VA_ARGS__) +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) +#define openpam_log(lvl, ...) \ + _openpam_log((lvl), __func__, __VA_ARGS__) +#elif defined(__GNUC__) && (__GNUC__ >= 3) +#define openpam_log(lvl, ...) \ + _openpam_log((lvl), __func__, __VA_ARGS__) #elif defined(__GNUC__) && (__GNUC__ >= 2) && (__GNUC_MINOR__ >= 95) #define openpam_log(lvl, fmt...) \ _openpam_log((lvl), __func__, ##fmt) ==== //depot/projects/openpam/lib/pam_get_authtok.c#18 (text+ko) ==== @@ -31,12 +31,13 @@ * 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#17 $ + * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#18 $ */ #include #include +#include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 24 5:38: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AB2537B400; Fri, 24 May 2002 05:37:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8217137B406 for ; Fri, 24 May 2002 05:37:09 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4OCb9v71909 for perforce@freebsd.org; Fri, 24 May 2002 05:37:09 -0700 (PDT) (envelope-from des@freebsd.org) Date: Fri, 24 May 2002 05:37:09 -0700 (PDT) Message-Id: <200205241237.g4OCb9v71909@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 11829 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11829 Change 11829 by des@des.at.des.thinksec.com on 2002/05/24 05:36:40 Regenerate. Affected files ... ... //depot/projects/openpam/doc/man/Makefile#8 edit ... //depot/projects/openpam/doc/man/openpam_borrow_cred.3#5 edit ... //depot/projects/openpam/doc/man/openpam_free_data.3#5 edit ... //depot/projects/openpam/doc/man/openpam_get_option.3#9 edit ... //depot/projects/openpam/doc/man/openpam_log.3#10 edit ... //depot/projects/openpam/doc/man/openpam_nullconv.3#2 edit ... //depot/projects/openpam/doc/man/openpam_restore_cred.3#5 edit ... //depot/projects/openpam/doc/man/openpam_set_option.3#9 edit ... //depot/projects/openpam/doc/man/openpam_ttyconv.3#10 edit ... //depot/projects/openpam/doc/man/pam.3#15 edit ... //depot/projects/openpam/doc/man/pam_acct_mgmt.3#13 edit ... //depot/projects/openpam/doc/man/pam_authenticate.3#13 edit ... //depot/projects/openpam/doc/man/pam_chauthtok.3#13 edit ... //depot/projects/openpam/doc/man/pam_close_session.3#13 edit ... //depot/projects/openpam/doc/man/pam_end.3#13 edit ... //depot/projects/openpam/doc/man/pam_error.3#13 edit ... //depot/projects/openpam/doc/man/pam_get_authtok.3#15 edit ... //depot/projects/openpam/doc/man/pam_get_data.3#13 edit ... //depot/projects/openpam/doc/man/pam_get_item.3#14 edit ... //depot/projects/openpam/doc/man/pam_get_user.3#14 edit ... //depot/projects/openpam/doc/man/pam_getenv.3#13 edit ... //depot/projects/openpam/doc/man/pam_getenvlist.3#14 edit ... //depot/projects/openpam/doc/man/pam_info.3#13 edit ... //depot/projects/openpam/doc/man/pam_open_session.3#13 edit ... //depot/projects/openpam/doc/man/pam_prompt.3#14 edit ... //depot/projects/openpam/doc/man/pam_putenv.3#13 edit ... //depot/projects/openpam/doc/man/pam_set_data.3#13 edit ... //depot/projects/openpam/doc/man/pam_set_item.3#13 edit ... //depot/projects/openpam/doc/man/pam_setcred.3#14 edit ... //depot/projects/openpam/doc/man/pam_setenv.3#13 edit ... //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#9 edit ... //depot/projects/openpam/doc/man/pam_sm_authenticate.3#9 edit ... //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#9 edit ... //depot/projects/openpam/doc/man/pam_sm_close_session.3#9 edit ... //depot/projects/openpam/doc/man/pam_sm_open_session.3#9 edit ... //depot/projects/openpam/doc/man/pam_sm_setcred.3#9 edit ... //depot/projects/openpam/doc/man/pam_start.3#14 edit ... //depot/projects/openpam/doc/man/pam_strerror.3#13 edit ... //depot/projects/openpam/doc/man/pam_verror.3#11 edit ... //depot/projects/openpam/doc/man/pam_vinfo.3#11 edit ... //depot/projects/openpam/doc/man/pam_vprompt.3#11 edit Differences ... ==== //depot/projects/openpam/doc/man/Makefile#8 (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/doc/man/Makefile#7 $ +# $P4: //depot/projects/openpam/doc/man/Makefile#8 $ # MAN = ==== //depot/projects/openpam/doc/man/openpam_borrow_cred.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#4 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_borrow_cred.3#5 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt OPENPAM_BORROW_CRED 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_free_data.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#4 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_free_data.3#5 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt OPENPAM_FREE_DATA 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_get_option.3#9 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_get_option.3#9 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt OPENPAM_GET_OPTION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_log.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_log.3#10 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt OPENPAM_LOG 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_nullconv.3#2 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_nullconv.3#1 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_nullconv.3#2 $ .\" -.Dd May 14, 2002 +.Dd May 24, 2002 .Dt OPENPAM_NULLCONV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_restore_cred.3#5 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#4 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_restore_cred.3#5 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt OPENPAM_RESTORE_CRED 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_set_option.3#9 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_set_option.3#9 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt OPENPAM_SET_OPTION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/openpam_ttyconv.3#10 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#9 $ +.\" $P4: //depot/projects/openpam/doc/man/openpam_ttyconv.3#10 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt OPENPAM_TTYCONV 3 .Os .Sh NAME @@ -47,7 +47,19 @@ .Ft int .Fn openpam_ttyconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data" .Sh DESCRIPTION -No description available. +The +.Nm +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. +.Pp +The +.Nm +function allows the application to specify a +timeout for user input by setting the global variable +.Va openpam_ttyconv_timeout +to the length of the timeout in seconds. +.Pp .Sh RETURN VALUES The .Nm @@ -61,8 +73,11 @@ System error. .El .Sh SEE ALSO +.Xr openpam_nullconv 3 , .Xr pam 3 , -.Xr pam_strerror 3 +.Xr pam_prompt 3 , +.Xr pam_strerror 3 , +.Xr pam_vprompt 3 .Sh STANDARDS The .Nm ==== //depot/projects/openpam/doc/man/pam.3#15 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam.3#14 $ +.\" $P4: //depot/projects/openpam/doc/man/pam.3#15 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_acct_mgmt.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_acct_mgmt.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_authenticate.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_authenticate.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_chauthtok.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_chauthtok.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_close_session.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_close_session.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_end.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_end.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_END 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_error.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_error.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_ERROR 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_authtok.3#15 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#14 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_authtok.3#15 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_GET_AUTHTOK 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_data.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_data.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_GET_DATA 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_item.3#14 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#13 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_item.3#14 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_GET_ITEM 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_get_user.3#14 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#13 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_get_user.3#14 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_GET_USER 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_getenv.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenv.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_GETENV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_getenvlist.3#14 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#13 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_getenvlist.3#14 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_GETENVLIST 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_info.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_info.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_INFO 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_open_session.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_open_session.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_prompt.3#14 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#13 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_prompt.3#14 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_PROMPT 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_putenv.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_putenv.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_PUTENV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_set_data.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_data.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_SET_DATA 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_set_item.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_set_item.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_SET_ITEM 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_setcred.3#14 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#13 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setcred.3#14 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_setenv.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_setenv.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_SETENV 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#9 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#9 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_SM_ACCT_MGMT 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_authenticate.3#9 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_authenticate.3#9 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_SM_AUTHENTICATE 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#9 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#9 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_SM_CHAUTHTOK 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_close_session.3#9 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_close_session.3#9 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_SM_CLOSE_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_open_session.3#9 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_open_session.3#9 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_SM_OPEN_SESSION 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_sm_setcred.3#9 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#8 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_sm_setcred.3#9 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_SM_SETCRED 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_start.3#14 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#13 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_start.3#14 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_START 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_strerror.3#13 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#12 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_strerror.3#13 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_STRERROR 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_verror.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_verror.3#11 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_VERROR 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_vinfo.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vinfo.3#11 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_VINFO 3 .Os .Sh NAME ==== //depot/projects/openpam/doc/man/pam_vprompt.3#11 (text+ko) ==== @@ -31,9 +31,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#10 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_vprompt.3#11 $ .\" -.Dd May 2, 2002 +.Dd May 24, 2002 .Dt PAM_VPROMPT 3 .Os .Sh NAME To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 24 5:49:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94ACE37B408; Fri, 24 May 2002 05:49:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3C98337B404 for ; Fri, 24 May 2002 05:49:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4OCnYi74907 for perforce@freebsd.org; Fri, 24 May 2002 05:49:34 -0700 (PDT) (envelope-from des@freebsd.org) Date: Fri, 24 May 2002 05:49:34 -0700 (PDT) Message-Id: <200205241249.g4OCnYi74907@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 11830 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11830 Change 11830 by des@des.at.des.thinksec.com on 2002/05/24 05:49:02 Add openpam_nullconv.3 Affected files ... ... //depot/projects/openpam/MANIFEST#9 edit Differences ... ==== //depot/projects/openpam/MANIFEST#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#8 $ +# $P4: //depot/projects/openpam/MANIFEST#9 $ # CREDITS HISTORY @@ -18,6 +18,7 @@ doc/man/openpam_free_data.3 doc/man/openpam_get_option.3 doc/man/openpam_log.3 +doc/man/openpam_nullconv.3 doc/man/openpam_restore_cred.3 doc/man/openpam_set_option.3 doc/man/openpam_ttyconv.3 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 24 5:49:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AEB437B40B; Fri, 24 May 2002 05:49:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9186337B408 for ; Fri, 24 May 2002 05:49:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4OCnYT74914 for perforce@freebsd.org; Fri, 24 May 2002 05:49:34 -0700 (PDT) (envelope-from des@freebsd.org) Date: Fri, 24 May 2002 05:49:34 -0700 (PDT) Message-Id: <200205241249.g4OCnYT74914@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 11831 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11831 Change 11831 by des@des.at.des.thinksec.com on 2002/05/24 05:49:23 Roll OpenPAM Cinquefoil. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/HISTORY#12 edit ... //depot/projects/openpam/RELNOTES#11 edit ... //depot/projects/openpam/include/security/openpam_version.h#4 edit Differences ... ==== //depot/projects/openpam/HISTORY#12 (text+ko) ==== @@ -1,4 +1,14 @@ ============================================================================ +OpenPAM Cinquefoil 2002-05-24 + + - BUGFIX: Various warnings uncovered by gcc 3.1. + + - ENHANCE: Add a null conversation function, openpam_nullconv(3). + + - BUGFIX: Initialize the "other" chain to all zeroes. + + - ENHANCE: Document openpam_ttyconv(3). +============================================================================ OpenPAM Cinnamon 2002-05-02 - ENHANCE: Add a null conversation function, openpam_nullconv(). @@ -152,4 +162,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#11 $ +$P4: //depot/projects/openpam/HISTORY#12 $ ==== //depot/projects/openpam/RELNOTES#11 (text+ko) ==== @@ -1,18 +1,13 @@ - Release notes for OpenPAM Cinnamon - ================================== + Release notes for OpenPAM Cinquefoil + ==================================== The library itself is complete. Documentation exists in the form of -man pages for the library functions, though a few pages are still -incomplete. +man pages for the library functions. -This release is incorporated into FreeBSD-CURRENT as of 2002-05-02. +This release is incorporated into FreeBSD-CURRENT as of 2002-05-24. It has also been successfully built on NetBSD, and should build with minimal or no changes on OpenBSD. It has not been tested on any other OS. -Known issues: - - - The documentation is still incomplete. - -$P4: //depot/projects/openpam/RELNOTES#10 $ +$P4: //depot/projects/openpam/RELNOTES#11 $ ==== //depot/projects/openpam/include/security/openpam_version.h#4 (text+ko) ==== @@ -31,14 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam_version.h#3 $ + * $P4: //depot/projects/openpam/include/security/openpam_version.h#4 $ */ #ifndef _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM -#define _OPENPAM_VERSION 20020502 -#define _OPENPAM_RELEASE "Cinnamon" +#define _OPENPAM_VERSION 20020524 +#define _OPENPAM_RELEASE "Cinquefoil" #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 24 5:59: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5835037B404; Fri, 24 May 2002 05:59:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9CD5737B403 for ; Fri, 24 May 2002 05:59:01 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4OCx1776294 for perforce@freebsd.org; Fri, 24 May 2002 05:59:01 -0700 (PDT) (envelope-from tmm@freebsd.org) Date: Fri, 24 May 2002 05:59:01 -0700 (PDT) Message-Id: <200205241259.g4OCx1776294@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 11833 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11833 Change 11833 by tmm@tmm_sparc64 on 2002/05/24 05:58:57 printf() -> device_printf() for some debug output. Affected files ... ... //depot/projects/sparc64/sys/dev/gem/if_gem.c#15 edit Differences ... ==== //depot/projects/sparc64/sys/dev/gem/if_gem.c#15 (text+ko) ==== @@ -275,12 +275,12 @@ */ if (sc->sc_phys[1]) { #ifdef GEM_DEBUG - printf("using external phy\n"); + device_printf(sc->sc_dev, "using external phy\n"); #endif sc->sc_mif_config |= GEM_MIF_CONFIG_PHY_SEL; } else { #ifdef GEM_DEBUG - printf("using internal phy\n"); + device_printf(sc->sc_dev, "using internal phy\n"); #endif sc->sc_mif_config &= ~GEM_MIF_CONFIG_PHY_SEL; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 24 6: 5:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3569A37B40C; Fri, 24 May 2002 06:05:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6099237B408 for ; Fri, 24 May 2002 06:05:09 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4OD59U83298 for perforce@freebsd.org; Fri, 24 May 2002 06:05:09 -0700 (PDT) (envelope-from des@freebsd.org) Date: Fri, 24 May 2002 06:05:09 -0700 (PDT) Message-Id: <200205241305.g4OD59U83298@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 11834 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11834 Change 11834 by des@des.at.des.thinksec.com on 2002/05/24 06:04:27 Conditionalize debugging messages in !STDC, !GNUC case. Affected files ... ... //depot/projects/openpam/lib/openpam_log.c#14 edit Differences ... ==== //depot/projects/openpam/lib/openpam_log.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/openpam_log.c#13 $ + * $P4: //depot/projects/openpam/lib/openpam_log.c#14 $ */ #include @@ -106,6 +106,9 @@ switch (level) { case PAM_LOG_DEBUG: +#ifndef DEBUG + return; +#endif priority = LOG_DEBUG; break; case PAM_LOG_VERBOSE: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 24 7:25:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB8E337B4AC; Fri, 24 May 2002 07:25:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0B8FC37B49D for ; Fri, 24 May 2002 07:24:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4OEOip98129 for perforce@freebsd.org; Fri, 24 May 2002 07:24:44 -0700 (PDT) (envelope-from tmm@freebsd.org) Date: Fri, 24 May 2002 07:24:44 -0700 (PDT) Message-Id: <200205241424.g4OEOip98129@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 11835 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11835 Change 11835 by tmm@tmm_sparc64 on 2002/05/24 07:24:15 Update. Affected files ... ... //depot/projects/sparc64/sys/sparc64/conf/BLADE100#5 edit Differences ... ==== //depot/projects/sparc64/sys/sparc64/conf/BLADE100#5 (text+ko) ==== @@ -44,7 +44,7 @@ #options NFSSERVER #Network File System options NFS_ROOT #NFS usable as root device, NFS required #options MSDOSFS #MSDOS Filesystem -#options CD9660 #ISO 9660 Filesystem +options CD9660 #ISO 9660 Filesystem options PSEUDOFS options PROCFS #Process filesystem #options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] @@ -72,7 +72,7 @@ # (default 9600) # Debugging for use in -current -#options DDB +options DDB options DIAGNOSTIC options INVARIANTS options INVARIANT_SUPPORT @@ -108,8 +108,7 @@ device ata device atadisk # ATA disk drives device atapicd # ATAPI CDROM drives -options ATA_ENABLE_BUSMASTER # Force busmaster support if available -options ATA_STATIC_ID # Static device numbering +#options ATA_STATIC_ID # Static device numbering #options ATA_DEBUG #options ATAPI_DEBUG #options ACD_DEBUG @@ -130,10 +129,10 @@ # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support device gem # Sun GEM/Sun ERI/Apple HMAC -device hme # Sun HME +#device hme # Sun HME # Pseudo devices - the number indicates how many units to allocate. -#device random # Entropy device +device random # Entropy device device loop # Network loopback device ether # Ethernet support #device sl # Kernel SLIP @@ -168,4 +167,5 @@ device "mk48txx" # Mostek MK48T02, MK48T08, MK48T59 clock # Tempary things until things are farther along. +makeoptions NO_WERROR=true makeoptions NO_MODULES=true To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 24 16: 6:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D63137B408; Fri, 24 May 2002 16:06:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9739737B409 for ; Fri, 24 May 2002 16:06:18 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4ON6If09777 for perforce@freebsd.org; Fri, 24 May 2002 16:06:18 -0700 (PDT) (envelope-from tmm@freebsd.org) Date: Fri, 24 May 2002 16:06:18 -0700 (PDT) Message-Id: <200205242306.g4ON6If09777@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 11841 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11841 Change 11841 by tmm@tmm_sparc64 on 2002/05/24 16:05:45 There's probably not much point in having the pipe implementation hoard KVM for bad times. Well sharpened hat to: tmm Affected files ... ... //depot/projects/sparc64/sys/kern/sys_pipe.c#21 edit Differences ... ==== //depot/projects/sparc64/sys/kern/sys_pipe.c#21 (text+ko) ==== @@ -701,7 +701,7 @@ vm_offset_t kva = wpipe->pipe_map.bkva; wpipe->pipe_map.bkva = wpipe->pipe_map.kva = 0; kmem_free(kernel_map, kva, - wpipe->pipe_buffer.size + PAGE_SIZE); + wpipe->pipe_buffer.size + PAGE_SIZE + VCOLPAD); amountpipekva -= wpipe->pipe_buffer.size + PAGE_SIZE; } } @@ -1290,7 +1290,7 @@ amountpipekva -= cpipe->pipe_buffer.size + PAGE_SIZE; kmem_free(kernel_map, cpipe->pipe_map.bkva, - cpipe->pipe_buffer.size + PAGE_SIZE); + cpipe->pipe_buffer.size + PAGE_SIZE + VCOLPAD); cpipe->pipe_map.cnt = 0; cpipe->pipe_map.bkva = cpipe->pipe_map.kva = 0; cpipe->pipe_map.pos = 0; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 25 5:40:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D98B37B409; Sat, 25 May 2002 05:39:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1C83E37B405 for ; Sat, 25 May 2002 05:39:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4PCdsE61031 for perforce@freebsd.org; Sat, 25 May 2002 05:39:54 -0700 (PDT) (envelope-from dfr@freebsd.org) Date: Sat, 25 May 2002 05:39:54 -0700 (PDT) Message-Id: <200205251239.g4PCdsE61031@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson Subject: PERFORCE change 11864 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11864 Change 11864 by dfr@dfr_home on 2002/05/25 05:38:56 Updates to ELF image activater to allow the ia32 emulation to use the system's ELF32 activater instead of rolling its own. It should also be possible to use the ELF32 activater to run ia64 ILP32 binaries. Affected files ... ... //depot/projects/ia64/sys/conf/files.ia64#8 edit ... //depot/projects/ia64/sys/i386/i386/elf_machdep.c#3 edit ... //depot/projects/ia64/sys/ia64/ia32/ia32_misc.c#3 edit ... //depot/projects/ia64/sys/ia64/ia32/ia32_sysvec.c#1 add ... //depot/projects/ia64/sys/ia64/ia32/imgact_ia32.c#5 delete ... //depot/projects/ia64/sys/ia64/ia32/imgact_ia32.h#2 delete ... //depot/projects/ia64/sys/ia64/ia64/elf_machdep.c#5 edit ... //depot/projects/ia64/sys/kern/imgact_elf.c#6 edit ... //depot/projects/ia64/sys/powerpc/powerpc/elf_machdep.c#3 edit ... //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#3 edit ... //depot/projects/ia64/sys/sys/imgact_elf.h#4 edit ... //depot/projects/ia64/sys/sys/sysent.h#7 edit Differences ... ==== //depot/projects/ia64/sys/conf/files.ia64#8 (text+ko) ==== @@ -24,7 +24,7 @@ ia64/acpica/madt.c optional acpica ia64/ia32/ia32_misc.c optional ia32 ia64/ia32/ia32_sysent.c optional ia32 -ia64/ia32/imgact_ia32.c optional ia32 +ia64/ia32/ia32_sysvec.c optional ia32 ia64/ia64/ia64-gdbstub.c optional ddb ia64/ia64/autoconf.c standard ia64/ia64/busdma_machdep.c standard ==== //depot/projects/ia64/sys/i386/i386/elf_machdep.c#3 (text+ko) ==== @@ -30,6 +30,39 @@ #include #include +struct sysentvec elf32_freebsd_sysvec = { + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf32_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, + "FreeBSD ELF32", + __elfN(coredump), + NULL, + MINSIGSTKSZ +}; + +static Elf32_Brandinfo freebsd_brand_info = { + ELFOSABI_FREEBSD, + EM_386, + "FreeBSD", + "", + "/usr/libexec/ld-elf.so.1", + &elf32_freebsd_sysvec + }; + +SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf32_insert_brand_entry, + &freebsd_brand_info); + /* Process one elf relocation with addend. */ int elf_reloc(linker_file_t lf, const void *data, int type) ==== //depot/projects/ia64/sys/ia64/ia32/ia32_misc.c#3 (text+ko) ==== ==== //depot/projects/ia64/sys/ia64/ia64/elf_machdep.c#5 (text+ko) ==== @@ -34,7 +34,45 @@ #include #include #include +#include +#include +#include +#include #include +#include + +struct sysentvec elf64_freebsd_sysvec = { + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf64_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, + "FreeBSD ELF64", + __elfN(coredump), + NULL, + MINSIGSTKSZ +}; + +static Elf64_Brandinfo freebsd_brand_info = { + ELFOSABI_FREEBSD, + EM_IA_64, + "FreeBSD", + "", + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec + }; + +SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_info); Elf_Addr link_elf_get_gp(linker_file_t); ==== //depot/projects/ia64/sys/kern/imgact_elf.c#6 (text+ko) ==== @@ -71,14 +71,12 @@ __ElfType(Auxargs); static int __elfN(check_header)(const Elf_Ehdr *hdr); -static int __elfN(freebsd_fixup)(register_t **stack_base, - struct image_params *imgp); static int __elfN(load_file)(struct proc *p, const char *file, u_long *addr, - u_long *entry); + u_long *entry, size_t pagesize); static int __elfN(load_section)(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, - vm_prot_t prot); + vm_prot_t prot, size_t pagesize); static int __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp); static int elf_trace = 0; @@ -88,45 +86,14 @@ SYSCTL_INT(_debug, OID_AUTO, elf64_trace, CTLFLAG_RW, &elf_trace, 0, ""); #endif -struct sysentvec __elfN(freebsd_sysvec) = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - 0, - 0, - 0, - 0, - __elfN(freebsd_fixup), - sendsig, - sigcode, - &szsigcode, - 0, - "FreeBSD ELF", - __elfN(coredump), - NULL, - MINSIGSTKSZ -}; +static Elf_Brandinfo *elf_brand_list[MAX_BRANDS]; -static Elf_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - "FreeBSD", - "", - "/usr/libexec/ld-elf.so.1", - &__elfN(freebsd_sysvec) - }; -static Elf_Brandinfo *elf_brand_list[MAX_BRANDS] = { - &freebsd_brand_info, - NULL, NULL, NULL, - NULL, NULL, NULL, NULL - }; - int __elfN(insert_brand_entry)(Elf_Brandinfo *entry) { int i; - for (i=1; ie_ident[EI_CLASS] != ELF_TARG_CLASS || hdr->e_ident[EI_DATA] != ELF_TARG_DATA || hdr->e_ident[EI_VERSION] != EV_CURRENT) return ENOEXEC; - if (!ELF_MACHINE_OK(hdr->e_machine)) + /* + * Make sure we have at least one brand for this machine. + */ + + for (i=0; imachine == hdr->e_machine) + break; + } + if (i == MAX_BRANDS) return ENOEXEC; if (hdr->e_version != ELF_TARG_VER) @@ -190,7 +167,136 @@ } static int -__elfN(load_section)(struct proc *p, struct vmspace *vmspace, struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot) +__elfN(map_partial)(vm_map_t map, vm_object_t object, vm_ooffset_t offset, + vm_offset_t start, vm_offset_t end, vm_prot_t prot, + vm_prot_t max) +{ + int error, rv; + vm_offset_t off; + vm_offset_t data_buf = 0; + + /* + * Create the page if it doesn't exist yet. Ignore errors. + */ + vm_map_lock(map); + vm_map_insert(map, NULL, 0, trunc_page(start), round_page(end), + max, max, 0); + vm_map_unlock(map); + + /* + * Find the page from the underlying object. + */ + if (object) { + vm_object_reference(object); + rv = vm_map_find(exec_map, + object, + trunc_page(offset), + &data_buf, + PAGE_SIZE, + TRUE, + VM_PROT_READ, + VM_PROT_ALL, + MAP_COPY_ON_WRITE | MAP_PREFAULT_PARTIAL); + if (rv != KERN_SUCCESS) { + vm_object_deallocate(object); + return rv; + } + + off = offset - trunc_page(offset); + error = copyout((caddr_t)data_buf+off, (caddr_t)start, end - start); + vm_map_remove(exec_map, data_buf, data_buf + PAGE_SIZE); + if (error) { + return KERN_FAILURE; + } + } + + return KERN_SUCCESS; +} + +static int +__elfN(map_insert)(vm_map_t map, vm_object_t object, vm_ooffset_t offset, + vm_offset_t start, vm_offset_t end, vm_prot_t prot, + vm_prot_t max, int cow) +{ + int rv; + + if (start != trunc_page(start)) { + rv = __elfN(map_partial)(map, object, offset, + start, round_page(start), prot, max); + if (rv) + return rv; + offset += round_page(start) - start; + start = round_page(start); + } + if (end != round_page(end)) { + rv = __elfN(map_partial)(map, object, + offset + trunc_page(end) - start, + trunc_page(end), end, prot, max); + if (rv) + return rv; + end = trunc_page(end); + } + if (end > start) { + if (offset & PAGE_MASK) { + vm_offset_t data_buf, off; + vm_size_t sz; + int error; + + /* + * The mapping is not page aligned. This means we have + * to copy the data. Sigh. + */ + rv = vm_map_find(map, 0, 0, + &start, end - start, + FALSE, prot, max, 0); + if (rv) + return rv; + while (start < end) { + vm_object_reference(object); + rv = vm_map_find(exec_map, + object, + trunc_page(offset), + &data_buf, + 2*PAGE_SIZE, + TRUE, + VM_PROT_READ, + VM_PROT_ALL, + (MAP_COPY_ON_WRITE + | MAP_PREFAULT_PARTIAL)); + if (rv != KERN_SUCCESS) { + vm_object_deallocate(object); + return rv; + } + off = offset - trunc_page(offset); + sz = end - start; + if (sz > PAGE_SIZE) + sz = PAGE_SIZE; + error = copyout((caddr_t)data_buf+off, + (caddr_t)start, sz); + vm_map_remove(exec_map, data_buf, + data_buf + 2*PAGE_SIZE); + if (error) { + return KERN_FAILURE; + } + start += sz; + } + rv = KERN_SUCCESS; + } else { + vm_map_lock(map); + rv = vm_map_insert(map, object, offset, start, end, + prot, max, cow); + vm_map_unlock(map); + } + return rv; + } else { + return KERN_SUCCESS; + } +} + +static int +__elfN(load_section)(struct proc *p, struct vmspace *vmspace, + struct vnode *vp, vm_offset_t offset, caddr_t vmaddr, + size_t memsz, size_t filsz, vm_prot_t prot, size_t pagesize) { size_t map_len; vm_offset_t map_addr; @@ -220,8 +326,11 @@ return (ENOEXEC); } - map_addr = trunc_page((vm_offset_t)vmaddr); - file_addr = trunc_page(offset); +#define trunc_page_ps(va, ps) ((va) & ~(ps - 1)) +#define round_page_ps(va, ps) (((va) + (ps - 1)) & ~(ps - 1)) + + map_addr = trunc_page_ps((vm_offset_t)vmaddr, pagesize); + file_addr = trunc_page_ps(offset, pagesize); /* * We have two choices. We can either clear the data in the last page @@ -230,14 +339,13 @@ * choose the second.. */ if (memsz > filsz) - map_len = trunc_page(offset+filsz) - file_addr; + map_len = trunc_page_ps(offset+filsz, pagesize) - file_addr; else - map_len = round_page(offset+filsz) - file_addr; + map_len = round_page_ps(offset+filsz, pagesize) - file_addr; if (map_len != 0) { vm_object_reference(object); - vm_map_lock(&vmspace->vm_map); - rv = vm_map_insert(&vmspace->vm_map, + rv = __elfN(map_insert)(&vmspace->vm_map, object, file_addr, /* file offset */ map_addr, /* virtual start */ @@ -245,7 +353,6 @@ prot, VM_PROT_ALL, MAP_COPY_ON_WRITE | MAP_PREFAULT); - vm_map_unlock(&vmspace->vm_map); if (rv != KERN_SUCCESS) { vm_object_deallocate(object); return EINVAL; @@ -264,23 +371,22 @@ * segment in the file is extended to provide bss. It's a neat idea * to try and save a page, but it's a pain in the behind to implement. */ - copy_len = (offset + filsz) - trunc_page(offset + filsz); - map_addr = trunc_page((vm_offset_t)vmaddr + filsz); - map_len = round_page((vm_offset_t)vmaddr + memsz) - map_addr; + copy_len = (offset + filsz) - trunc_page_ps(offset + filsz, pagesize); + map_addr = trunc_page_ps((vm_offset_t)vmaddr + filsz, pagesize); + map_len = round_page_ps((vm_offset_t)vmaddr + memsz, pagesize) - map_addr; /* This had damn well better be true! */ if (map_len != 0) { - vm_map_lock(&vmspace->vm_map); - rv = vm_map_insert(&vmspace->vm_map, NULL, 0, - map_addr, map_addr + map_len, - VM_PROT_ALL, VM_PROT_ALL, 0); - vm_map_unlock(&vmspace->vm_map); + rv = __elfN(map_insert)(&vmspace->vm_map, NULL, 0, + map_addr, map_addr + map_len, + VM_PROT_ALL, VM_PROT_ALL, 0); if (rv != KERN_SUCCESS) { return EINVAL; } } if (copy_len != 0) { + vm_offset_t off; vm_object_reference(object); rv = vm_map_find(exec_map, object, @@ -297,7 +403,10 @@ } /* send the page fragment to user space */ - error = copyout((caddr_t)data_buf, (caddr_t)map_addr, copy_len); + off = trunc_page_ps(offset + filsz, pagesize) + - trunc_page(offset + filsz); + error = copyout((caddr_t)data_buf+off, (caddr_t)map_addr, + copy_len); vm_map_remove(exec_map, data_buf, data_buf + PAGE_SIZE); if (error) { return (error); @@ -326,7 +435,8 @@ * the entry point for the loaded file. */ static int -__elfN(load_file)(struct proc *p, const char *file, u_long *addr, u_long *entry) +__elfN(load_file)(struct proc *p, const char *file, u_long *addr, + u_long *entry, size_t pagesize) { struct { struct nameidata nd; @@ -434,7 +544,7 @@ (caddr_t)(uintptr_t)phdr[i].p_vaddr + rbase, phdr[i].p_memsz, - phdr[i].p_filesz, prot)) != 0) + phdr[i].p_filesz, prot, pagesize)) != 0) goto fail; /* * Establish the base address if this is the @@ -475,6 +585,7 @@ u_long text_size = 0, data_size = 0; u_long text_addr = 0, data_addr = 0; u_long addr, entry = 0, proghdr = 0; + vm_offset_t maxuser, usrstack, pagesize; int error, i; const char *interp = NULL; Elf_Brandinfo *brand_info; @@ -517,8 +628,38 @@ if ((error = exec_extract_strings(imgp)) != 0) goto fail; - exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, - USRSTACK); + /* + * Tentatively identify the brand based on the machine so that + * we can figure out VM ranges and page sizes. + */ + brand_info = NULL; + for (i = 0; i < MAX_BRANDS; i++) { + Elf_Brandinfo *bi = elf_brand_list[i]; + + if (bi != NULL && + hdr->e_machine == bi->machine && + (hdr->e_ident[EI_OSABI] == bi->brand + || 0 == + strncmp((const char *)&hdr->e_ident[OLD_EI_BRAND], + bi->compat_3_brand, strlen(bi->compat_3_brand)))) { + brand_info = bi; + break; + } + } + + pagesize = PAGE_SIZE; + maxuser = VM_MAXUSER_ADDRESS; + usrstack = USRSTACK; + if (brand_info) { + if (brand_info->sysvec->sv_pagesize) + pagesize = brand_info->sysvec->sv_pagesize; + if (brand_info->sysvec->sv_maxuser) + maxuser = brand_info->sysvec->sv_maxuser; + if (brand_info->sysvec->sv_usrstack) + usrstack = brand_info->sysvec->sv_usrstack; + } + + exec_new_vmspace(imgp, VM_MIN_ADDRESS, maxuser, usrstack); vmspace = imgp->proc->p_vmspace; @@ -540,7 +681,7 @@ phdr[i].p_offset, (caddr_t)(uintptr_t)phdr[i].p_vaddr, phdr[i].p_memsz, - phdr[i].p_filesz, prot)) != 0) + phdr[i].p_filesz, prot, pagesize)) != 0) goto fail; /* @@ -602,6 +743,7 @@ Elf_Brandinfo *bi = elf_brand_list[i]; if (bi != NULL && + hdr->e_machine == bi->machine && (hdr->e_ident[EI_OSABI] == bi->brand || 0 == strncmp((const char *)&hdr->e_ident[OLD_EI_BRAND], @@ -618,6 +760,7 @@ Elf_Brandinfo *bi = elf_brand_list[i]; if (bi != NULL && + hdr->e_machine == bi->machine && strcmp(interp, bi->interp_path) == 0) { brand_info = bi; break; @@ -630,7 +773,9 @@ for (i = 0; i < MAX_BRANDS; i++) { Elf_Brandinfo *bi = elf_brand_list[i]; - if (bi != NULL && fallback_elf_brand == bi->brand) { + if (bi != NULL && + hdr->e_machine == bi->machine && + fallback_elf_brand == bi->brand) { brand_info = bi; break; } @@ -650,10 +795,11 @@ snprintf(path, MAXPATHLEN, "%s%s", brand_info->emul_path, interp); if ((error = __elfN(load_file)(imgp->proc, path, &addr, - &imgp->entry_addr)) != 0) { + &imgp->entry_addr, + pagesize)) != 0) { if ((error = __elfN(load_file) (imgp->proc, interp, &addr, - &imgp->entry_addr)) != 0) { + &imgp->entry_addr, pagesize)) != 0) { uprintf("ELF interpreter %s not found\n", path); free(path, M_TEMP); goto fail; @@ -683,7 +829,13 @@ return error; } -static int +#if __ELF_WORD_SIZE == 32 +#define suword suword32 +#else +#define suword suword64 +#endif + +int __elfN(freebsd_fixup)(register_t **stack_base, struct image_params *imgp) { Elf_Auxargs *args = (Elf_Auxargs *)imgp->auxargs; ==== //depot/projects/ia64/sys/powerpc/powerpc/elf_machdep.c#3 (text+ko) ==== @@ -36,6 +36,39 @@ #include #include +struct sysentvec elf32_freebsd_sysvec = { + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf32_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, + "FreeBSD ELF32", + __elfN(coredump), + NULL, + MINSIGSTKSZ +}; + +static Elf32_Brandinfo freebsd_brand_info = { + ELFOSABI_FREEBSD, + EM_PPC, + "FreeBSD", + "", + "/usr/libexec/ld-elf.so.1", + &elf32_freebsd_sysvec + }; + +SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf32_insert_brand_entry, + &freebsd_brand_info); + /* Process one elf relocation with addend. */ int elf_reloc(linker_file_t lf, const void *data, int type) ==== //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#3 (text+ko) ==== @@ -46,6 +46,39 @@ #include "linker_if.h" +struct sysentvec elf64_freebsd_sysvec = { + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf64_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, + "FreeBSD ELF64", + __elfN(coredump), + NULL, + MINSIGSTKSZ +}; + +static Elf64_Brandinfo freebsd_brand_info = { + ELFOSABI_FREEBSD, + EM_SPARCV9, + "FreeBSD", + "", + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec + }; + +SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_info); + /* * The following table holds for each relocation type: * - the width in bits of the memory location the relocation ==== //depot/projects/ia64/sys/sys/imgact_elf.h#4 (text+ko) ==== @@ -59,6 +59,7 @@ typedef struct { int brand; + int machine; const char *compat_3_brand; /* pre Binutils 2.10 method (FBSD 3) */ const char *emul_path; const char *interp_path; @@ -70,6 +71,7 @@ int elf32_brand_inuse(Elf32_Brandinfo *entry); int elf32_insert_brand_entry(Elf32_Brandinfo *entry); int elf32_remove_brand_entry(Elf32_Brandinfo *entry); +int elf32_freebsd_fixup(register_t **, struct image_params *); int elf32_coredump(struct thread *, struct vnode *, off_t); #else /* !(ELF_TARG_CLASS == ELFCLASS32) */ @@ -92,6 +94,7 @@ typedef struct { int brand; + int machine; const char *compat_3_brand; /* pre Binutils 2.10 method (FBSD 3) */ const char *emul_path; const char *interp_path; @@ -103,6 +106,7 @@ int elf64_brand_inuse(Elf64_Brandinfo *entry); int elf64_insert_brand_entry(Elf64_Brandinfo *entry); int elf64_remove_brand_entry(Elf64_Brandinfo *entry); +int elf64_freebsd_fixup(register_t **, struct image_params *); int elf64_coredump(struct thread *, struct vnode *, off_t); #endif /* ELF_TARG_CLASS == ELFCLASS32 */ ==== //depot/projects/ia64/sys/sys/sysent.h#7 (text+ko) ==== @@ -79,6 +79,9 @@ /* function to dump core, or NULL */ int (*sv_imgact_try)(struct image_params *); int sv_minsigstksz; /* minimum signal stack size */ + int sv_pagesize; /* pagesize override */ + vm_offset_t sv_maxuser; /* VM_MAXUSER_ADDRESS override */ + vm_offset_t sv_usrstack; /* USRSTACK override */ register_t *(*sv_copyout_strings)(struct image_params *); void (*sv_setregs)(struct thread *, u_long, u_long, u_long); }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 25 16:41:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E797737B40B; Sat, 25 May 2002 16:41:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 893B337B401 for ; Sat, 25 May 2002 16:41:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4PNfbE84397 for perforce@freebsd.org; Sat, 25 May 2002 16:41:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 25 May 2002 16:41:37 -0700 (PDT) Message-Id: <200205252341.g4PNfbE84397@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11883 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11883 Change 11883 by marcel@marcel_vaio on 2002/05/25 16:40:36 Include Affected files ... ... //depot/projects/ia64/sys/ia64/ia32/ia32_sysvec.c#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia32/ia32_sysvec.c#2 (text+ko) ==== @@ -64,6 +64,7 @@ #include #include #include +#include #include static register_t *ia32_copyout_strings(struct image_params *imgp); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 25 16:46:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1062337B405; Sat, 25 May 2002 16:46:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 323EE37B401 for ; Sat, 25 May 2002 16:46:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4PNkh984650 for perforce@freebsd.org; Sat, 25 May 2002 16:46:43 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 25 May 2002 16:46:43 -0700 (PDT) Message-Id: <200205252346.g4PNkh984650@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11884 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11884 Change 11884 by marcel@marcel_vaio on 2002/05/25 16:46:31 Alternate change number: ddbcfc53-7038-11d6-f3bf-00022d09712b Implement syscall uuidgen() for generating UUIDs. The syscall takes a pointer P and a number N and stores N UUIDs in the buffer pointed to by P. XXX this syscall has no manpage yet. Affected files ... ... //depot/projects/ia64/sys/conf/files#23 edit ... //depot/projects/ia64/sys/kern/init_sysent.c#8 edit ... //depot/projects/ia64/sys/kern/kern_uuid.c#1 add ... //depot/projects/ia64/sys/kern/syscalls.c#8 edit ... //depot/projects/ia64/sys/kern/syscalls.master#8 edit ... //depot/projects/ia64/sys/sys/syscall.h#8 edit ... //depot/projects/ia64/sys/sys/syscall.mk#8 edit ... //depot/projects/ia64/sys/sys/sysproto.h#9 edit ... //depot/projects/ia64/sys/sys/uuid.h#1 add Differences ... ==== //depot/projects/ia64/sys/conf/files#23 (text+ko) ==== @@ -864,6 +864,7 @@ kern/kern_tc.c standard kern/kern_time.c standard kern/kern_timeout.c standard +kern/kern_uuid.c standard kern/kern_xxx.c standard kern/link_elf.c standard kern/md5c.c standard ==== //depot/projects/ia64/sys/kern/init_sysent.c#8 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.122 2002/05/05 23:47:41 mux Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.111 2002/05/05 23:37:44 mux Exp */ @@ -414,4 +414,5 @@ { 0, (sy_call_t *)nosys }, /* 389 = __mac_set_file */ { AS(kenv_args), (sy_call_t *)kenv }, /* 390 = kenv */ { AS(lchflags_args), (sy_call_t *)lchflags }, /* 391 = lchflags */ + { AS(uuidgen_args), (sy_call_t *)uuidgen }, /* 392 = uuidgen */ }; ==== //depot/projects/ia64/sys/kern/syscalls.c#8 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.109 2002/05/05 23:47:41 mux Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.111 2002/05/05 23:37:44 mux Exp */ @@ -399,4 +399,5 @@ "#389", /* 389 = __mac_set_file */ "kenv", /* 390 = kenv */ "lchflags", /* 391 = lchflags */ + "uuidgen", /* 392 = uuidgen */ }; ==== //depot/projects/ia64/sys/kern/syscalls.master#8 (text+ko) ==== @@ -562,3 +562,4 @@ 390 STD BSD { int kenv(int what, const char *name, char *value, \ int len); } 391 STD BSD { int lchflags(const char *path, int flags); } +392 STD BSD { int uuidgen(void *store, int count); } ==== //depot/projects/ia64/sys/sys/syscall.h#8 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.108 2002/05/05 23:47:41 mux Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.111 2002/05/05 23:37:44 mux Exp */ @@ -305,4 +305,5 @@ #define SYS_kse_yield 383 #define SYS_kenv 390 #define SYS_lchflags 391 -#define SYS_MAXSYSCALL 392 +#define SYS_uuidgen 392 +#define SYS_MAXSYSCALL 393 ==== //depot/projects/ia64/sys/sys/syscall.mk#8 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.63 2002/05/05 23:47:41 mux Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.111 2002/05/05 23:37:44 mux Exp MIASM = \ syscall.o \ @@ -254,4 +254,5 @@ thread_wakeup.o \ kse_yield.o \ kenv.o \ - lchflags.o + lchflags.o \ + uuidgen.o ==== //depot/projects/ia64/sys/sys/sysproto.h#9 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.100 2002/05/05 23:47:41 mux Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.111 2002/05/05 23:37:44 mux Exp */ @@ -1115,6 +1115,10 @@ char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; +struct uuidgen_args { + char store_l_[PADL_(void *)]; void * store; char store_r_[PADR_(void *)]; + char count_l_[PADL_(int)]; int count; char count_r_[PADR_(int)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1366,6 +1370,7 @@ int kse_yield(struct thread *, struct kse_yield_args *); int kenv(struct thread *, struct kenv_args *); int lchflags(struct thread *, struct lchflags_args *); +int uuidgen(struct thread *, struct uuidgen_args *); #ifdef COMPAT_43 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 25 17: 1: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DCB637B40B; Sat, 25 May 2002 17:01:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CF66137B406 for ; Sat, 25 May 2002 17:01:01 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4Q011H85968 for perforce@freebsd.org; Sat, 25 May 2002 17:01:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 25 May 2002 17:01:01 -0700 (PDT) Message-Id: <200205260001.g4Q011H85968@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11885 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11885 Change 11885 by marcel@marcel_vaio on 2002/05/25 17:00:54 Implementation of the uuidgen tool. It allows generating multiple UUIDs at the same time. I have no idea if there's such a thing as standard options or features for this monkey. We'll see... XXX The manpage references the non-existing uuidgen(2) manpage :-) Affected files ... ... //depot/projects/ia64/usr.bin/Makefile#24 edit ... //depot/projects/ia64/usr.bin/uuidgen/Makefile#1 add ... //depot/projects/ia64/usr.bin/uuidgen/uuidgen.1#1 add ... //depot/projects/ia64/usr.bin/uuidgen/uuidgen.c#1 add Differences ... ==== //depot/projects/ia64/usr.bin/Makefile#24 (text+ko) ==== @@ -171,6 +171,7 @@ users \ uudecode \ uuencode \ + uuidgen \ vgrind \ vi \ vis \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 25 17:23:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AC2637B404; Sat, 25 May 2002 17:23:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9D09937B403 for ; Sat, 25 May 2002 17:23:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4Q0NTp92073 for perforce@freebsd.org; Sat, 25 May 2002 17:23:29 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 25 May 2002 17:23:29 -0700 (PDT) Message-Id: <200205260023.g4Q0NTp92073@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11887 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11887 Change 11887 by marcel@marcel_vaio on 2002/05/25 17:23:06 Rough sketch for a GPT tool. The comments in gpt.c should give an indication of where I'm heading. Currently, the only thing the tool does is migrate MBR based FreeBSD slices into GPT based slices. The operation is non-destructive at the moment, meaning that the MBR is not replaced by a protected MBR. Technically speaking this yields an invalid result, but I like to be able to use my disk for a while and EFI doesn't complain (not yet at least :-) Yes, the GPT partition is seen and accepted by EFI, as the following sequence of actions will demonstrate: The first time this tool is run, it migrates a pure MBR medium into one that is GPT based (only FreeBSD slice): \begin{verbatim} itanium% sudo ./gpt -v da0 gpt: /dev/da0: mediasize=9186603008; sectorsize=512; blocks=17942584 gpt: /dev/da0: found MBR at sector 0 Before image: MBR start=0, blocks=1 (unused) start=1, blocks=62 MBR part start=63, blocks=208782 MBR part start=208845, blocks=17719695 (unused) start=17928540, blocks=14044 After image: MBR start=0, blocks=1 GPT header start=1, blocks=1 GPT table start=2, blocks=16 (unused) start=18, blocks=45 MBR part start=63, blocks=208782 MBR part start=208845, blocks=17719695 (unused) start=17928540, blocks=14027 Backup table start=17942567, blocks=16 Backup header start=17942583, blocks=1 \end{verbatim} Running the gpt tool a second time shows that the second partition (the FreeBSD slice) exists in the GPT: \begin{verbatim} itanium% sudo ./gpt -v da0 gpt: /dev/da0: mediasize=9186603008; sectorsize=512; blocks=17942584 gpt: /dev/da0: found MBR at sector 0 gpt: /dev/da0: found GPT at sector 1 gpt: warning: part(208845,17719695) mirrored gpt: /dev/da0: found GPT at sector 17942583 Before image: MBR start=0, blocks=1 GPT header start=1, blocks=1 GPT table start=2, blocks=16 (unused) start=18, blocks=45 MBR part start=63, blocks=208782 GPT part start=208845, blocks=17719695 (unused) start=17928540, blocks=14027 Backup table start=17942567, blocks=16 Backup header start=17942583, blocks=1 gpt: /dev/da0: error: device already contains a GPT \end{verbatim} After rebooting, EFI shows this: \begin{verbatim} Shell> map Device mapping table blk0 : Acpi(PNP0A03,0)/Pci(3|1)/Ata(Primary,Master) blk1 : VenHw(Unknown Device:80) blk2 : VenHw(Unknown Device:80)/HD(Part1,Sig0AF29492-702F-11D6-8117-00D0B7ABFBAB) blk3 : Acpi(PNP0A03,0)/Pci(3|1)/Ata(Primary,Slave) Shell> \end{verbatim} This is the FreeBSD slice... Exposed bugs: The UUID printed by EFI does not match the UUID printed by uuidgen(1). The clock sequence is byte-swapped. Below how uuidgen prints the UUID: 0af293d7-702f-11d6-1781-00d0b7abfbab I expect a bogon in uuidgen... Affected files ... ... //depot/projects/ia64/sbin/Makefile#11 edit ... //depot/projects/ia64/sbin/gpt/Makefile#1 add ... //depot/projects/ia64/sbin/gpt/gpt.c#1 add ... //depot/projects/ia64/sbin/gpt/gpt.h#1 add ... //depot/projects/ia64/sbin/gpt/map.c#1 add ... //depot/projects/ia64/sbin/gpt/map.h#1 add ... //depot/projects/ia64/sbin/gpt/mkdisk.sh#1 add Differences ... ==== //depot/projects/ia64/sbin/Makefile#11 (text+ko) ==== @@ -100,6 +100,7 @@ .if ${MACHINE_ARCH} == "ia64" SUBDIR+=fdisk \ + gpt \ mca .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 25 17:28:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F5DC37B406; Sat, 25 May 2002 17:28:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D1E9E37B404 for ; Sat, 25 May 2002 17:28:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4Q0Sb392384 for perforce@freebsd.org; Sat, 25 May 2002 17:28:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 25 May 2002 17:28:37 -0700 (PDT) Message-Id: <200205260028.g4Q0Sb392384@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11888 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11888 Change 11888 by marcel@marcel_vaio on 2002/05/25 17:27:48 Properly deal with byte-order the timestamp is little-endian, whereas the clock sequence is big-endian. Make this work on BE machines as well. Affected files ... ... //depot/projects/ia64/usr.bin/uuidgen/uuidgen.c#2 edit Differences ... ==== //depot/projects/ia64/usr.bin/uuidgen/uuidgen.c#2 (text+ko) ==== @@ -47,8 +47,9 @@ void uuid_print(uuid_t *uuid) { - printf("%08x-%04x-%04x-%04x-", uuid->time_low, uuid->time_med, - uuid->time_hi, uuid->seq); + printf("%08x-%04x-%04x-%04x-", le32toh(uuid->time_low), + le16toh(uuid->time_med), le16toh(uuid->time_hi), + be16toh(uuid->seq)); printf("%02x%02x%02x%02x%02x%02x\n", uuid->node[0], uuid->node[1], uuid->node[2], uuid->node[3], uuid->node[4], uuid->node[5]); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 25 23:21:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E597D37B405; Sat, 25 May 2002 23:21:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AC4F237B40E for ; Sat, 25 May 2002 23:21:11 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4Q6LBe54397 for perforce@freebsd.org; Sat, 25 May 2002 23:21:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 25 May 2002 23:21:11 -0700 (PDT) Message-Id: <200205260621.g4Q6LBe54397@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11895 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11895 Change 11895 by marcel@marcel_vaio on 2002/05/25 23:20:39 I overlooked a sentence in the EFI spec that says that there must be a minimum of 16KB for the GPT entries. This boils down to 128 entries. So, bump up our default maximum to the EFI minimum. Note that we deliberately don't enforce this minimum at the moment. There may not be enough free space on a MBR disk to migrate it to a GPT disk with entries for 128 partitions... Affected files ... ... //depot/projects/ia64/sbin/gpt/gpt.c#2 edit Differences ... ==== //depot/projects/ia64/sbin/gpt/gpt.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * Possible options: * -r readonly mode (maybe default and have -w?) * -v be verbose - * -p n make room for n partitions (default 64?) + * -p n make room for n partitions (default 128 - minimum) * -f x read commands from file x. * * Possible usages: @@ -562,7 +562,7 @@ } } if (!maxparts) - maxparts = 64; + maxparts = 128; argc -= optind; argv += optind; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 25 23:41:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C13437B401; Sat, 25 May 2002 23:41:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A68FE37B406 for ; Sat, 25 May 2002 23:41:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4Q6fgZ58054 for perforce@freebsd.org; Sat, 25 May 2002 23:41:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 25 May 2002 23:41:42 -0700 (PDT) Message-Id: <200205260641.g4Q6fgZ58054@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11896 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11896 Change 11896 by marcel@marcel_vaio on 2002/05/25 23:40:42 Properly write the unicode name in the GPT entry. Internally we use 32-bit wide characters. The GPT entry uses 16-bit characters. Use 'short' as the base type for the name array and add a simple conversion function 'unicode16()' to map from wchar_t to short. I believe the unicode characters fit in 16 bit integrals, so I don't expect to loose information when we truncate... Affected files ... ... //depot/projects/ia64/sbin/gpt/gpt.c#3 edit ... //depot/projects/ia64/sbin/gpt/gpt.h#2 edit Differences ... ==== //depot/projects/ia64/sbin/gpt/gpt.c#3 (text+ko) ==== @@ -160,6 +160,15 @@ } static void +unicode16(short *dst, const wchar_t *src, size_t len) +{ + while (len-- && *src != 0) + *dst++ = *src++; + if (len) + *dst = 0; +} + +static void usage(void) { @@ -504,7 +513,7 @@ size = (size << 16) + mbr->mbr_part[i].part_size_lo; ent->ent_lba_start = start; ent->ent_lba_end = start + size - 1LL; - strcpy(ent->ent_name, "FreeBSD slice"); + unicode16(ent->ent_name, L"FreeBSD slice", 36); ent++; } ent = tbl->map_data; ==== //depot/projects/ia64/sbin/gpt/gpt.h#2 (text+ko) ==== @@ -55,7 +55,7 @@ uint64_t ent_lba_end; uint64_t ent_attr; #define GPT_ENT_ATTR_PLATFORM (1ULL << 0) - char ent_name[72]; /* UNICODE!!! */ + short ent_name[36]; /* UNICODE!!! */ }; #define GPT_ENT_TYPE_UNUSED \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat May 25 23:54:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9986A37B40B; Sat, 25 May 2002 23:53:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A09A537B408 for ; Sat, 25 May 2002 23:53:58 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4Q6rw259170 for perforce@freebsd.org; Sat, 25 May 2002 23:53:58 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 25 May 2002 23:53:58 -0700 (PDT) Message-Id: <200205260653.g4Q6rw259170@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11899 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11899 Change 11899 by marcel@marcel_nfs on 2002/05/25 23:53:50 Fix format string warnings when compiling on ia64 (off_t arg with %llu format and the likes). Affected files ... ... //depot/projects/ia64/sbin/gpt/gpt.c#4 edit ... //depot/projects/ia64/sbin/gpt/map.c#2 edit Differences ... ==== //depot/projects/ia64/sbin/gpt/gpt.c#4 (text+ko) ==== @@ -223,7 +223,8 @@ } if (verbose) warnx("%s: mediasize=%llu; sectorsize=%u; blocks=%llu", - device_name, mediasz, secsz, mediasz / secsz); + device_name, (long long)mediasz, secsz, + (long long)(mediasz / secsz)); map_init(mediasz / secsz); @@ -297,7 +298,7 @@ if (crc32(hdr, hdr->hdr_size) != crc) { if (verbose) warnx("%s: Bad CRC in GPT header at sector %llu", - device_name, lba); + device_name, (long long)lba); goto fail_hdr; } @@ -310,12 +311,13 @@ if (crc32(ent, tblsz) != hdr->hdr_crc_table) { if (verbose) warnx("%s: Bad CRC in GPT table at sector %llu", - device_name, hdr->hdr_lba_table); + device_name, (long long)hdr->hdr_lba_table); goto fail_ent; } if (verbose) - warnx("%s: found GPT at sector %llu", device_name, lba); + warnx("%s: found GPT at sector %llu", device_name, + (long long)lba); m = map_add(lba, 1, (lba == 1) ? MAP_TYPE_GPT : MAP_TYPE_TPG, hdr); if (m == NULL) @@ -440,7 +442,8 @@ } /* Don't create more than maxparts entries. */ - if ((blocks - 1) * secsz > maxparts * sizeof(struct gpt_ent)) { + if ((uint64_t)(blocks - 1) * secsz > + maxparts * sizeof(struct gpt_ent)) { blocks = (maxparts * sizeof(struct gpt_ent)) / secsz; if ((maxparts * sizeof(struct gpt_ent)) % secsz) blocks++; ==== //depot/projects/ia64/sbin/gpt/map.c#2 (text+ko) ==== @@ -70,7 +70,7 @@ if (n->map_start == start && n->map_size == size) { if (n->map_type != MAP_TYPE_UNUSED) warnx("warning: part(%llu,%llu) mirrored", - start, size); + (long long)start, (long long)size); n->map_type = type; n->map_data = data; return (n); @@ -78,7 +78,8 @@ if (n->map_type != MAP_TYPE_UNUSED) { warnx("error: part(%llu,%llu) overlaps part(%llu,%llu)", - start, size, n->map_start, n->map_size); + (long long)start, (long long)size, (long long)n->map_start, + (long long)n->map_size); return (0); } @@ -201,7 +202,8 @@ printf("GPT part\t"); break; } - printf("start=%llu, blocks=%llu\n", m->map_start, m->map_size); + printf("start=%llu, blocks=%llu\n", (long long)m->map_start, + (long long)m->map_size); m = m->map_next; } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 26 8:57:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 108D937B409; Sun, 26 May 2002 08:57:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3161237B408 for ; Sun, 26 May 2002 08:57:17 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4QFvGf60844 for perforce@freebsd.org; Sun, 26 May 2002 08:57:16 -0700 (PDT) (envelope-from dfr@freebsd.org) Date: Sun, 26 May 2002 08:57:16 -0700 (PDT) Message-Id: <200205261557.g4QFvGf60844@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson Subject: PERFORCE change 11910 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11910 Change 11910 by dfr@dfr_home on 2002/05/26 08:56:56 Move the declaration of ElfN_Hashelt to elfN.h to make it easier to include without forcing the choice of either elf32 or elf64 on platforms which can support both. Affected files ... ... //depot/projects/ia64/sys/alpha/include/elf.h#3 edit ... //depot/projects/ia64/sys/i386/include/elf.h#3 edit ... //depot/projects/ia64/sys/ia64/include/elf.h#4 edit ... //depot/projects/ia64/sys/kern/link_elf.c#6 edit ... //depot/projects/ia64/sys/powerpc/include/elf.h#3 edit ... //depot/projects/ia64/sys/sparc64/include/elf.h#3 edit ... //depot/projects/ia64/sys/sys/elf32.h#2 edit ... //depot/projects/ia64/sys/sys/elf64.h#2 edit ... //depot/projects/ia64/sys/sys/elf_generic.h#3 edit Differences ... ==== //depot/projects/ia64/sys/alpha/include/elf.h#3 (text+ko) ==== @@ -60,15 +60,6 @@ __ElfType(Auxinfo); -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf64_Off Elf64_Hashelt; - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ ==== //depot/projects/ia64/sys/i386/include/elf.h#3 (text+ko) ==== @@ -60,15 +60,6 @@ __ElfType(Auxinfo); -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf32_Off Elf32_Hashelt; - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ ==== //depot/projects/ia64/sys/ia64/include/elf.h#4 (text+ko) ==== @@ -69,16 +69,6 @@ } a_un; } Elf64_Auxinfo; -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf32_Off Elf32_Hashelt; -typedef Elf64_Half Elf64_Hashelt; - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ ==== //depot/projects/ia64/sys/kern/link_elf.c#6 (text+ko) ==== @@ -62,8 +62,6 @@ #include "linker_if.h" -__ElfType(Hashelt); - typedef struct elf_file { struct linker_file lf; /* Common fields */ int preloaded; /* Was file pre-loaded */ ==== //depot/projects/ia64/sys/powerpc/include/elf.h#3 (text+ko) ==== @@ -63,15 +63,6 @@ __ElfType(Auxinfo); -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf32_Off Elf32_Hashelt; - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ ==== //depot/projects/ia64/sys/sparc64/include/elf.h#3 (text+ko) ==== @@ -57,15 +57,6 @@ __ElfType(Auxinfo); -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf64_Half Elf64_Hashelt; - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ ==== //depot/projects/ia64/sys/sys/elf32.h#2 (text+ko) ==== @@ -41,6 +41,7 @@ typedef int32_t Elf32_Sword; typedef u_int32_t Elf32_Word; typedef u_int32_t Elf32_Size; +typedef Elf32_Off Elf32_Hashelt; /* * ELF header. ==== //depot/projects/ia64/sys/sys/elf64.h#2 (text+ko) ==== @@ -44,6 +44,19 @@ typedef u_int16_t Elf64_Quarter; /* + * Types of dynamic symbol hash table bucket and chain elements. + * + * This is inconsistent among 64 bit architectures, so a machine dependent + * typedef is required. + */ + +#ifdef __alpha__ +typedef Elf64_Off Elf64_Hashelt; +#else +typedef Elf64_Half Elf64_Hashelt; +#endif + +/* * ELF header. */ ==== //depot/projects/ia64/sys/sys/elf_generic.h#3 (text+ko) ==== @@ -61,6 +61,7 @@ __ElfType(Sword); __ElfType(Word); __ElfType(Size); +__ElfType(Hashelt); __ElfType(Ehdr); __ElfType(Shdr); __ElfType(Phdr); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 26 11:44:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0736637B406; Sun, 26 May 2002 11:43:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3A3B037B403 for ; Sun, 26 May 2002 11:43:04 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4QIg2e90107 for perforce@freebsd.org; Sun, 26 May 2002 11:42:02 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 26 May 2002 11:42:02 -0700 (PDT) Message-Id: <200205261842.g4QIg2e90107@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11917 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11917 Change 11917 by peter@peter_daintree on 2002/05/26 11:41:16 IFC @11916 Affected files ... ... //depot/projects/ia64/MAINTAINERS#7 integrate ... //depot/projects/ia64/Makefile#9 integrate ... //depot/projects/ia64/Makefile.inc1#27 integrate ... //depot/projects/ia64/UPDATING#12 integrate ... //depot/projects/ia64/bin/ln/symlink.7#3 integrate ... //depot/projects/ia64/bin/sh/cd.c#4 integrate ... //depot/projects/ia64/bin/sh/expand.c#3 integrate ... //depot/projects/ia64/bin/sh/jobs.c#4 integrate ... //depot/projects/ia64/bin/sh/options.c#4 integrate ... //depot/projects/ia64/bin/sh/sh.1#5 integrate ... //depot/projects/ia64/contrib/bind/bin/nslookup/getinfo.c#4 integrate ... //depot/projects/ia64/contrib/diff/diff.c#2 integrate ... //depot/projects/ia64/contrib/gcc/c-format.c#4 integrate ... //depot/projects/ia64/contrib/gcc/config/rs6000/sysv4.h#3 integrate ... //depot/projects/ia64/contrib/gcc/cp/cfns.h#3 integrate ... //depot/projects/ia64/contrib/gdb/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/gdb/config-ml.in#2 integrate ... //depot/projects/ia64/contrib/gdb/config.guess#2 integrate ... //depot/projects/ia64/contrib/gdb/config.sub#2 integrate ... //depot/projects/ia64/contrib/gdb/configure#2 integrate ... //depot/projects/ia64/contrib/gdb/configure.in#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ChangeLog#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-97#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-98#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-99#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/MAINTAINERS#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/NEWS#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/README#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/TODO#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/acinclude.m4#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/aclocal.m4#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/annotate.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/annotate.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/arc-tdep.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/arch-utils.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/arch-utils.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/arm-linux-nat.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/arm-linux-tdep.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/ax-gdb.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ax-gdb.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ax-general.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ax.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/bcache.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/bcache.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/blockframe.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/breakpoint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/breakpoint.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/buildsym.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/buildsym.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/c-lang.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/c-lang.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/c-typeprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/c-valprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/call-cmds.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ch-exp.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ch-lang.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ch-lang.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ch-typeprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ch-valprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/cli-out.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/cli-out.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/command.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/command.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/complaints.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/complaints.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config.in#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-linux.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-osf2.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-osf3.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-linux.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-osf.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-osf2.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-osf3.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/alpha/tm-alphalinux.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/alpha/xm-alphalinux.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/alpha/xm-alphaosf.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/arm.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/arm.mt#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/embed.mt#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/linux.mh#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/linux.mt#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/nm-arm.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/nm-linux.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-arm.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-embed.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-linux.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-wince.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/wince.mt#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/xm-arm.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/arm/xm-linux.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/embed.mt#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/go32.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/go32.mt#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386dgux.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386gnu.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386sol2.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386v4.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386v42mp.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/linux.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/linux.mt#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nbsd.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nbsd.mt#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/ncr3000.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-fbsd.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-gnu.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-go32.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386aix.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386bsd.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386lynx.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386mach.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386sco.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386sco4.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386sco5.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386sol2.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386v.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386v4.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386v42mp.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-linux.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-m3.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-nbsd.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-ptx4.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-sun386.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-symmetry.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-cygwin.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-fbsd.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-go32.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386aix.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386bsd.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386gnu.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386lynx.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386m3.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386mk.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386nw.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386os9k.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386sco5.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386sol2.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386v.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386v4.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386v42mp.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-linux.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-nbsd.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-ptx.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-ptx4.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-sun386.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-symmetry.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-vxworks.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/vxworks.mt#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-cygwin.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-go32.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386aix.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386bsd.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386gnu.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386lynx.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386m3.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386mach.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386mk.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386sco.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386v.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386v32.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386v4.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-linux.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-nbsd.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-ptx.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-ptx4.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-sun386.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-symmetry.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-windows.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/ia64/linux.mh#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/ia64/linux.mt#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/ia64/nm-linux.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/ia64/tm-ia64.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/ia64/tm-linux.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/ia64/xm-linux.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/mips/tm-tx39.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/mips/tm-tx39l.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/mips/tm-vr4100.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/mips/tm-vr4xxx.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/mips/tm-vr4xxxel.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/mips/tm-vr5000.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/mips/tm-vr5000el.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/mips/tm-wince.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/mips/vr4xxx.mt#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/mips/vr4xxxel.mt#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/mips/wince.mt#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/linux.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/linux.mt#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/macos.mh#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/macos.mt#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nm-aix.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nm-linux.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nm-macos.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nm-solaris.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/solaris.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-cygwin.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-linux.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-macos.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-aix.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-nw.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-sim.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-solaris.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-vxworks.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/vxworks.mt#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-aix.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-cygwin.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-linux.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-mpw.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-solaris.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/linux.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsd.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsd.mt#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsdelf.mh#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-linux.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-nbsd.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-nbsdelf.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sparclynx.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sun4os4.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sun4sol2.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4sol2.mh#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-linux.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-nbsd.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sp64.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sp64sim.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparc.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclet.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclite.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclynx.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-spc-em.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sun4os4.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sun4sol2.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-vxsparc.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-linux.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-nbsd.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-sparc.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-sparclynx.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-sun4os4.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-sun4sol2.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/configure#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/configure.host#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/configure.in#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/configure.tgt#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/core-aout.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/corefile.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/corelow.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/cp-valprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/dcache.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/dcache.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/dink32-rom.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/doc/ChangeLog#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/doc/GDBvn.texi#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/doc/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/doc/agentexpr.texi#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/doc/all-cfg.texi#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/doc/annotate.texi#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/doc/configure#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/doc/configure.in#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/doc/gdb.texinfo#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/doc/gdbgui.texinfo#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/doc/gdbint.texinfo#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/doc/stabs.texinfo#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/dwarf2read.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/dwarfread.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/elfread.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/environ.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/environ.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/eval.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/event-loop.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/event-loop.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/event-top.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/event-top.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/exec.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/expprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/expression.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/f-lang.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/f-lang.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/f-typeprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/f-valprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/findvar.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/fork-child.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/frame.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdb-events.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/gdb-events.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/gdb-events.sh#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/gdb-stabs.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdb_proc_service.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/gdb_regex.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/gdb_stat.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdb_string.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdb_thread_db.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/gdb_wait.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/gdbarch.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbarch.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbarch.sh#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/gdbcmd.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbcore.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbinit.in#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbserver/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbserver/configure#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/gdbserver/configure.in#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbserver/low-linux.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbserver/low-nbsd.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/gdbserver/low-sim.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbserver/low-sparc.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbserver/remote-utils.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbserver/server.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbserver/server.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbthread.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbtypes.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gdbtypes.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gnu-regex.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/gnu-regex.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/hp-psymtab-read.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/hp-symtab-read.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/hpread.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/hpux-thread.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/i386-linux-nat.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/i386-linux-tdep.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/i386b-nat.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/i386nbsd-nat.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/i387-tdep.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ia64-linux-nat.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/ia64-tdep.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/inf-loop.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/inf-loop.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/infcmd.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/inferior.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/inflow.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/infptrace.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/infrun.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/inftarg.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/infttrace.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/jv-exp.tab.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/jv-exp.y#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/jv-lang.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/jv-lang.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/jv-typeprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/jv-valprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/kod.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/kod.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/language.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/language.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/lin-thread.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/linux-thread.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/m2-exp.y#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/m2-lang.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/m2-lang.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/m2-typeprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/m2-valprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/maint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/mdebugread.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/mem-break.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/minsyms.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/mipsread.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/nlm/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/nlmread.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/objfiles.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ocd.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ocd.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/parse.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/parser-defs.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ppc-bdm.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ppc-linux-nat.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/ppc-linux-tdep.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/printcmd.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/proc-api.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/proc-events.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/proc-flags.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/proc-utils.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/proc-why.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/remote-rdi.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/remote-utils.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/remote-utils.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/remote.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/reply_mig_hack.awk#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/scm-exp.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/scm-lang.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/scm-lang.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/scm-tags.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/scm-valprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ser-pipe.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/ser-tcp.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ser-unix.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ser-unix.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/serial.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/serial.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/signals.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/sol-thread.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/solib.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/source.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/source.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/stabsread.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/stabsread.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/stack.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/symfile.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/symfile.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/symmisc.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/symtab.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/terminal.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/top.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tracepoint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tracepoint.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/ChangeLog#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tui-file.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/tui/tui-file.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/tui/tui.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tui.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiCommand.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiCommand.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiData.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiData.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiDataWin.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiDataWin.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiDisassem.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiDisassem.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiGeneralWin.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiGeneralWin.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiIO.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiIO.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiLayout.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiLayout.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiRegs.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiRegs.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiSource.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiSource.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiSourceWin.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiSourceWin.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiStack.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiStack.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiWin.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/tui/tuiWin.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/typeprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/typeprint.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/ui-file.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/ui-file.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/ui-out.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/ui-out.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/utils.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/valarith.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/valops.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/valprint.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/valprint.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/value.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/values.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/varobj.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/varobj.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/version.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/wrapper.c#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/wrapper.h#2 delete ... //depot/projects/ia64/contrib/gdb/gdb/xcoffsolib.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/INSTALL#2 integrate ... //depot/projects/ia64/contrib/ncurses/MANIFEST#2 integrate ... //depot/projects/ia64/contrib/ncurses/Makefile.glibc#2 integrate ... //depot/projects/ia64/contrib/ncurses/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/NEWS#2 integrate ... //depot/projects/ia64/contrib/ncurses/aclocal.m4#2 integrate ... //depot/projects/ia64/contrib/ncurses/c++/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/c++/cursesf.cc#2 integrate ... //depot/projects/ia64/contrib/ncurses/c++/cursesf.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/c++/cursesm.cc#2 integrate ... //depot/projects/ia64/contrib/ncurses/c++/cursesmain.cc#2 integrate ... //depot/projects/ia64/contrib/ncurses/c++/cursesp.cc#2 integrate ... //depot/projects/ia64/contrib/ncurses/c++/cursesp.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/c++/cursesw.cc#2 integrate ... //depot/projects/ia64/contrib/ncurses/c++/cursesw.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/c++/demo.cc#2 integrate ... //depot/projects/ia64/contrib/ncurses/c++/edit_cfg.sh#2 integrate ... //depot/projects/ia64/contrib/ncurses/c++/etip.h.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/config.guess#2 integrate ... //depot/projects/ia64/contrib/ncurses/config.sub#2 integrate ... //depot/projects/ia64/contrib/ncurses/configure#2 integrate ... //depot/projects/ia64/contrib/ncurses/configure.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/dist.mk#2 integrate ... //depot/projects/ia64/contrib/ncurses/doc/html/ncurses-intro.html#2 integrate ... //depot/projects/ia64/contrib/ncurses/form/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/form/form.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/include/Caps#2 integrate ... //depot/projects/ia64/contrib/ncurses/include/Caps.aix4#1 branch ... //depot/projects/ia64/contrib/ncurses/include/Caps.keys#1 branch ... //depot/projects/ia64/contrib/ncurses/include/Caps.osf1r5#1 branch ... //depot/projects/ia64/contrib/ncurses/include/Caps.uwin#1 branch ... //depot/projects/ia64/contrib/ncurses/include/MKkey_defs.sh#1 branch ... //depot/projects/ia64/contrib/ncurses/include/MKterm.h.awk.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/include/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/include/curses.h.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/include/curses.tail#1 branch ... //depot/projects/ia64/contrib/ncurses/include/curses.wide#1 branch ... //depot/projects/ia64/contrib/ncurses/include/edit_cfg.sh#2 integrate ... //depot/projects/ia64/contrib/ncurses/include/nc_alloc.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/include/ncurses_defs#2 integrate ... //depot/projects/ia64/contrib/ncurses/include/ncurses_dll.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/include/tic.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/MKterminfo.sh#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_add_wch.3x#1 branch ... //depot/projects/ia64/contrib/ncurses/man/curs_add_wchstr.3x#1 branch ... //depot/projects/ia64/contrib/ncurses/man/curs_addstr.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_addwstr.3x#1 branch ... //depot/projects/ia64/contrib/ncurses/man/curs_attr.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_bkgd.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_bkgrnd.3x#1 branch ... //depot/projects/ia64/contrib/ncurses/man/curs_border.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_border_set.3x#1 branch ... //depot/projects/ia64/contrib/ncurses/man/curs_color.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_extend.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_get_wch.3x#1 branch ... //depot/projects/ia64/contrib/ncurses/man/curs_get_wstr.3x#1 branch ... //depot/projects/ia64/contrib/ncurses/man/curs_getcchar.3x#1 branch ... //depot/projects/ia64/contrib/ncurses/man/curs_getch.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_getstr.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_in_wch.3x#1 branch ... //depot/projects/ia64/contrib/ncurses/man/curs_in_wchstr.3x#1 branch ... //depot/projects/ia64/contrib/ncurses/man/curs_ins_wch.3x#1 branch ... //depot/projects/ia64/contrib/ncurses/man/curs_ins_wstr.3x#1 branch ... //depot/projects/ia64/contrib/ncurses/man/curs_insstr.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_instr.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_inwstr.3x#1 branch ... //depot/projects/ia64/contrib/ncurses/man/curs_kernel.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_mouse.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_move.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_outopts.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_overlay.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_print.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_refresh.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_scroll.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_termattrs.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_termcap.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_terminfo.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_trace.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/curs_util.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/default_colors.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/define_key.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/form.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/form_driver.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/form_field_attributes.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/form_field_buffer.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/form_field_info.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/form_field_just.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/form_field_new.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/form_field_validation.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/form_fieldtype.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/form_new_page.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/infocmp.1m#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/keybound.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/keyok.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/man_db.renames#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/menu.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/menu_attributes.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/menu_driver.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/menu_format.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/menu_pattern.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/menu_spacing.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/mitem_value.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/ncurses.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/resizeterm.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/term.5#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/term.7#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/terminfo.tail#2 integrate ... //depot/projects/ia64/contrib/ncurses/man/wresize.3x#2 integrate ... //depot/projects/ia64/contrib/ncurses/menu/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/menu/menu.priv.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/menu/mf_common.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/misc/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/misc/run_tic.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/misc/terminfo.src#2 integrate ... //depot/projects/ia64/contrib/ncurses/mk-0th.awk#2 integrate ... //depot/projects/ia64/contrib/ncurses/mk-1st.awk#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_addstr.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_bkgd.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_box.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_chgat.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_clrbot.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_clreol.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_color.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_delch.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_erase.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_hline.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_inchstr.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_insch.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_insdel.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_insstr.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_instr.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_mvwin.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_pad.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_printw.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_redrawln.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_refresh.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_scanw.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_scroll.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkclear.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_slkset.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_vline.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_winch.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/lib_window.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/safe_sprintf.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/sigaction.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/tries.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/vsscanf.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/base/wresize.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/curses.priv.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/fifo_defs.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/llib-lncurses#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/llib-lncursesw#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/modules#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/MKfallback.sh#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/MKkeys_list.sh#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/access.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/alloc_entry.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/captoinfo.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/comp_error.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/comp_expand.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/comp_scan.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/keys.list#2 delete ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#3 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_kernel.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_napms.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_print.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_termname.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/read_termcap.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/trace/varargs.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/trace/visbuf.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/tty/hashmap.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tty/lib_tstp.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tty/lib_vidattr.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_box_set.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_cchar.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_erasewchar.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_get_wch.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_hline_set.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_in_wch.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_ins_nwstr.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_ins_wch.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_inwstr.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_vline_set.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_wacs.c#1 branch ... //depot/projects/ia64/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#1 branch ... //depot/projects/ia64/contrib/ncurses/panel/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/panel/panel.priv.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/progs/MKtermsort.sh#2 integrate ... //depot/projects/ia64/contrib/ncurses/progs/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/progs/dump_entry.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/progs/infocmp.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/progs/progs.priv.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/progs/tic.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/progs/toe.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/progs/tput.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/progs/tset.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/tack/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/tack/ansi.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/tack/charset.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/tack/edit.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/tack/init.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/tack/output.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/tack/sync.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/tack/sysdep.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/tack/tack.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/tack/tack.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/Makefile.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/blue.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/bs.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/cardfile.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/configure#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/configure.in#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/ditto.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/dots.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/filter.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/firework.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/firstlast.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/gdc.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/hanoi.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/hashtest.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/keynames.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/knight.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/lrtest.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/ncurses.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/newdemo.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/railroad.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/rain.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/tclock.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/test.priv.h#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/testaddch.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/testcurs.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/testscanw.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/view.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/worm.c#2 integrate ... //depot/projects/ia64/contrib/ncurses/test/xmas.c#2 integrate ... //depot/projects/ia64/contrib/openpam/HISTORY#10 integrate ... //depot/projects/ia64/contrib/openpam/MANIFEST#10 integrate ... //depot/projects/ia64/contrib/openpam/RELNOTES#10 integrate ... //depot/projects/ia64/contrib/openpam/bin/su/su.c#7 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/Makefile#8 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#6 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#6 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_nullconv.3#1 branch ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#6 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#11 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#11 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#11 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#10 integrate ... //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#10 integrate ... //depot/projects/ia64/contrib/openpam/include/security/openpam.h#13 integrate ... //depot/projects/ia64/contrib/openpam/include/security/openpam_version.h#2 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#8 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_nullconv.c#2 integrate ... //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#8 integrate ... //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#11 integrate ... //depot/projects/ia64/contrib/openpam/misc/gendoc.pl#8 integrate ... //depot/projects/ia64/etc/defaults/pccard.conf#8 integrate ... //depot/projects/ia64/etc/defaults/rc.conf#12 integrate ... //depot/projects/ia64/etc/mail/Makefile#9 integrate ... //depot/projects/ia64/etc/mail/README#6 integrate ... //depot/projects/ia64/etc/mtree/BSD.usr.dist#11 integrate ... //depot/projects/ia64/etc/mtree/README#2 integrate ... //depot/projects/ia64/etc/newsyslog.conf#5 integrate ... //depot/projects/ia64/etc/rc.shutdown#5 integrate ... //depot/projects/ia64/etc/sendmail/Makefile#7 integrate ... //depot/projects/ia64/etc/sendmail/freebsd.mc#6 integrate ... //depot/projects/ia64/games/cribbage/deck.h#2 integrate ... //depot/projects/ia64/games/hack/alloc.c#2 integrate ... //depot/projects/ia64/games/hack/config.h#2 integrate ... //depot/projects/ia64/games/hack/def.monst.h#2 integrate ... //depot/projects/ia64/games/hack/def.rm.h#2 integrate ... //depot/projects/ia64/games/hack/def.wseg.h#2 integrate ... //depot/projects/ia64/games/hack/hack.Decl.c#2 integrate ... //depot/projects/ia64/games/hack/hack.bones.c#2 integrate ... //depot/projects/ia64/games/hack/hack.c#2 integrate ... //depot/projects/ia64/games/hack/hack.cmd.c#2 integrate ... //depot/projects/ia64/games/hack/hack.do.c#2 integrate ... //depot/projects/ia64/games/hack/hack.do_wear.c#2 integrate ... //depot/projects/ia64/games/hack/hack.dog.c#2 integrate ... //depot/projects/ia64/games/hack/hack.eat.c#2 integrate ... //depot/projects/ia64/games/hack/hack.end.c#2 integrate ... //depot/projects/ia64/games/hack/hack.fight.c#2 integrate ... //depot/projects/ia64/games/hack/hack.h#2 integrate ... //depot/projects/ia64/games/hack/hack.invent.c#2 integrate ... //depot/projects/ia64/games/hack/hack.ioctl.c#3 integrate ... //depot/projects/ia64/games/hack/hack.lev.c#2 integrate ... //depot/projects/ia64/games/hack/hack.makemon.c#2 integrate ... //depot/projects/ia64/games/hack/hack.mhitu.c#2 integrate ... //depot/projects/ia64/games/hack/hack.mklev.c#2 integrate ... //depot/projects/ia64/games/hack/hack.mkobj.c#2 integrate ... //depot/projects/ia64/games/hack/hack.mkshop.c#2 integrate ... //depot/projects/ia64/games/hack/hack.mon.c#2 integrate ... //depot/projects/ia64/games/hack/hack.monst.c#2 integrate ... //depot/projects/ia64/games/hack/hack.pager.c#2 integrate ... //depot/projects/ia64/games/hack/hack.pri.c#2 integrate ... //depot/projects/ia64/games/hack/hack.read.c#2 integrate ... //depot/projects/ia64/games/hack/hack.save.c#2 integrate ... //depot/projects/ia64/games/hack/hack.shk.c#2 integrate ... //depot/projects/ia64/games/hack/hack.trap.c#2 integrate ... //depot/projects/ia64/games/hack/hack.tty.c#2 integrate ... //depot/projects/ia64/games/hack/hack.u_init.c#2 integrate ... //depot/projects/ia64/games/hack/hack.unix.c#2 integrate ... //depot/projects/ia64/games/hack/hack.vault.c#2 integrate ... //depot/projects/ia64/games/hack/hack.version.c#2 integrate ... //depot/projects/ia64/games/hack/hack.worm.c#2 integrate ... //depot/projects/ia64/games/hack/hack.zap.c#2 integrate ... //depot/projects/ia64/gnu/Makefile#2 integrate ... //depot/projects/ia64/gnu/lib/csu/Makefile#10 integrate ... //depot/projects/ia64/gnu/lib/libgcc/Makefile#13 integrate ... //depot/projects/ia64/gnu/usr.bin/Makefile#15 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/as/powerpc-freebsd/itbl-cpu.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/as/powerpc-freebsd/targ-cpu.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/as/x86-64-freebsd/Makefile#1 branch ... //depot/projects/ia64/gnu/usr.bin/binutils/as/x86-64-freebsd/config.h#1 branch ... //depot/projects/ia64/gnu/usr.bin/binutils/as/x86-64-freebsd/itbl-cpu.h#1 branch ... //depot/projects/ia64/gnu/usr.bin/binutils/as/x86-64-freebsd/targ-cpu.h#1 branch ... //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile#5 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile.alpha#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/gdb/Makefile.i386#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/gdb/alpha/freebsd-nat-stubs.c#1 branch ... //depot/projects/ia64/gnu/usr.bin/binutils/gdb/alpha/nm.h#3 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/gdb/alpha/tm.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/gdb/config.h#2 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile.x86-64#1 branch ... //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile.x86-64#1 branch ... //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/x86-64/bfd.h#1 branch ... //depot/projects/ia64/gnu/usr.bin/cc/cc1plus/Makefile#7 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/Makefile#11 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/auto-host.h#4 integrate ... //depot/projects/ia64/gnu/usr.bin/man/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/man/manpath/manpath.config#3 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/inp.c#3 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/pch.c#4 integrate ... //depot/projects/ia64/gnu/usr.bin/patch/util.c#3 integrate ... //depot/projects/ia64/gnu/usr.bin/ptx/COPYING#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/ChangeLog#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/Makefile#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/NEWS#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/README#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/THANKS#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/TODO#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/alloca.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/argmatch.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/bumpalloc.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/check-out#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/config.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/diacrit.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/diacrit.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/doc/Makefile#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/doc/ptx.texinfo#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/error.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/README#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/ajay/Makefile#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/ajay/README#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/ajay/footer.tex#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/ajay/header.tex#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/ajay/tip.forgptx#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/ajay/x.pl#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/ignore/README#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/ignore/bix#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/ignore/eign#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/include.pl#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/latex/Makefile#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/latex/README#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/latex/latex.tex#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/latex/table.tex#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/luke/README#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/examples/luke/xxroff.sh#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/getopt.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/getopt.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/getopt1.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/mkinstalldirs#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/ptx.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/ptx/xmalloc.c#2 delete ... //depot/projects/ia64/gnu/usr.sbin/Makefile#2 delete ... //depot/projects/ia64/gnu/usr.sbin/Makefile.inc#2 delete ... //depot/projects/ia64/include/pthread_np.h#3 integrate ... //depot/projects/ia64/lib/Makefile#11 integrate ... //depot/projects/ia64/lib/libc/alpha/sys/Makefile.inc#3 integrate ... //depot/projects/ia64/lib/libc/gen/Makefile.inc#7 integrate ... //depot/projects/ia64/lib/libc/gen/msgctl.c#3 delete ... //depot/projects/ia64/lib/libc/gen/msgget.c#3 delete ... //depot/projects/ia64/lib/libc/gen/msgrcv.c#3 delete ... //depot/projects/ia64/lib/libc/gen/msgsnd.c#3 delete ... //depot/projects/ia64/lib/libc/gen/semconfig.c#3 delete ... //depot/projects/ia64/lib/libc/gen/semctl.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/semget.c#3 delete ... //depot/projects/ia64/lib/libc/gen/semop.c#3 delete ... //depot/projects/ia64/lib/libc/gen/shmat.c#3 delete ... //depot/projects/ia64/lib/libc/gen/shmctl.c#3 delete ... //depot/projects/ia64/lib/libc/gen/shmdt.c#3 delete ... //depot/projects/ia64/lib/libc/gen/shmget.c#3 delete ... //depot/projects/ia64/lib/libc/i386/sys/Makefile.inc#3 integrate ... //depot/projects/ia64/lib/libc/ia64/sys/Makefile.inc#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/sys/Makefile.inc#6 integrate ... //depot/projects/ia64/lib/libc/stdio/mktemp.c#3 integrate ... //depot/projects/ia64/lib/libc/stdlib/strtod.c#8 integrate ... //depot/projects/ia64/lib/libc/sys/jail.2#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#7 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_cancel.c#4 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_cond.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_exit.c#4 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#5 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_multi_np.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_mutex.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_priority_queue.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_resume_np.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_sig.c#4 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_single_np.c#2 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_spinlock.c#3 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_suspend_np.c#2 integrate ... //depot/projects/ia64/lib/libcompat/4.1/cftime.3#2 integrate ... //depot/projects/ia64/lib/libform/Makefile#2 integrate ... //depot/projects/ia64/lib/libkvm/kvm_sparc64.c#3 integrate ... //depot/projects/ia64/lib/libmenu/Makefile#2 integrate ... //depot/projects/ia64/lib/libncurses/Makefile#3 integrate ... //depot/projects/ia64/lib/libncurses/ncurses_cfg.h#2 integrate ... //depot/projects/ia64/lib/libpam/libpam/Makefile#14 integrate ... //depot/projects/ia64/lib/libpam/modules/modules.inc#10 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_echo/Makefile#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_echo/pam_echo.8#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_echo/pam_echo.c#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_exec/Makefile#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_exec/pam_exec.8#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_exec/pam_exec.c#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#6 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_rhosts/pam_rhosts.c#2 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.c#12 integrate ... //depot/projects/ia64/lib/libpanel/Makefile#3 integrate ... //depot/projects/ia64/lib/libstand/ext2fs.c#2 integrate ... //depot/projects/ia64/lib/libstand/ufs.c#5 integrate ... //depot/projects/ia64/lib/msun/src/math_private.h#5 integrate ... //depot/projects/ia64/libexec/rtld-elf/ia64/reloc.c#5 integrate ... //depot/projects/ia64/release/Makefile#12 integrate ... //depot/projects/ia64/release/Makefile.inc.docports#4 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#8 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#28 integrate ... //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/errata/article.sgml#2 integrate ... //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/installation/Makefile#1 branch ... //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/installation/Makefile.inc#1 branch ... //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile#1 branch ... //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/installation/alpha/article.sgml#1 branch ... //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/installation/common/abstract.sgml#1 branch ... //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/installation/common/artheader.sgml#1 branch ... //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/installation/common/install.ent#1 branch ... //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/installation/common/layout.sgml#1 branch ... //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile#1 branch ... //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/installation/i386/article.sgml#1 branch ... //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml#4 integrate ... //depot/projects/ia64/release/i386/dokern.sh#5 integrate ... //depot/projects/ia64/release/scripts/catpages-make.sh#3 integrate ... //depot/projects/ia64/release/scripts/driver-copy2.awk#1 branch ... //depot/projects/ia64/release/scripts/driver-copy2.pl#3 delete ... //depot/projects/ia64/release/scripts/driver-remove.awk#1 branch ... //depot/projects/ia64/release/scripts/driver-remove.pl#4 delete ... //depot/projects/ia64/release/scripts/manpages-make.sh#3 integrate ... //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#10 integrate ... //depot/projects/ia64/sbin/Makefile#12 integrate ... //depot/projects/ia64/sbin/disklabel/disklabel.c#10 integrate ... //depot/projects/ia64/sbin/fsck_ifs/Makefile#3 delete ... //depot/projects/ia64/sbin/fsck_ifs/dir.c#3 delete ... //depot/projects/ia64/sbin/fsck_ifs/fsck.h#4 delete ... //depot/projects/ia64/sbin/fsck_ifs/fsck_ifs.8#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 26 12: 1:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8494B37B406; Sun, 26 May 2002 12:01:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AD31C37B404 for ; Sun, 26 May 2002 12:01:26 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4QJ1Qf03697 for perforce@freebsd.org; Sun, 26 May 2002 12:01:26 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 26 May 2002 12:01:26 -0700 (PDT) Message-Id: <200205261901.g4QJ1Qf03697@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11918 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11918 Change 11918 by peter@peter_daintree on 2002/05/26 12:01:04 These should be no longer needed. Affected files ... ... //depot/projects/ia64/sys/boot/common/load_elf.c#8 edit ... //depot/projects/ia64/usr.sbin/kldxref/ef.h#4 edit Differences ... ==== //depot/projects/ia64/sys/boot/common/load_elf.c#8 (text+ko) ==== @@ -42,7 +42,6 @@ #define COPYOUT(s,d,l) archsw.arch_copyout((vm_offset_t)(s), d, l) -__ElfType(Hashelt); typedef struct elf_file { Elf_Phdr *ph; ==== //depot/projects/ia64/usr.sbin/kldxref/ef.h#4 (text+ko) ==== @@ -3,8 +3,6 @@ #ifndef _EF_H_ #define _EF_H_ -__ElfType(Hashelt); - #define EFT_KLD 1 #define EFT_KERNEL 2 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 26 12:12:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE87237B408; Sun, 26 May 2002 12:12:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2ABFA37B406 for ; Sun, 26 May 2002 12:12:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4QJCed09589 for perforce@freebsd.org; Sun, 26 May 2002 12:12:40 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Sun, 26 May 2002 12:12:40 -0700 (PDT) Message-Id: <200205261912.g4QJCed09589@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 11920 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11920 Change 11920 by peter@peter_daintree on 2002/05/26 12:11:46 Not sure what to do with this. __ElfType(Hashelt) is no longer needed, but the __ElfType(Auxinfo) appears to be. ia64/include/elf.h has removed it but all the other platforms have it still. Affected files ... ... //depot/projects/ia64/libexec/rtld-elf/rtld.h#3 edit Differences ... ==== //depot/projects/ia64/libexec/rtld-elf/rtld.h#3 (text+ko) ==== @@ -38,8 +38,9 @@ #include "rtld_machdep.h" -__ElfType(Hashelt); -__ElfType(Auxinfo); +#ifdef __ia64__ +__ElfType(Auxinfo); /* XXX needed for ia64, breaks other platforms */ +#endif #ifndef STANDARD_LIBRARY_PATH #define STANDARD_LIBRARY_PATH "/usr/lib/elf:/usr/lib" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 26 13:57: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B66AE37B401; Sun, 26 May 2002 13:56:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B4EF737B405 for ; Sun, 26 May 2002 13:56:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4QKulc25372 for perforce@freebsd.org; Sun, 26 May 2002 13:56:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 26 May 2002 13:56:47 -0700 (PDT) Message-Id: <200205262056.g4QKulc25372@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11924 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11924 Change 11924 by marcel@marcel_nfs on 2002/05/26 13:55:58 o Migrate EFI partitions along with FreeBSD partitions. The EFI shell maps the GPT based system partition: Shell> map Device mapping table fs0 : VenHw(Unknown Device:80)/HD(Part1,Sig27A9B525-70AE-11D6-8F67-00D0B7ABFBAB) blk0 : Acpi(PNP0A03,0)/Pci(3|1)/Ata(Primary,Master) blk1 : VenHw(Unknown Device:80) blk2 : VenHw(Unknown Device:80)/HD(Part1,Sig27A9B525-70AE-11D6-8F67-00D0B7ABFBAB) blk3 : VenHw(Unknown Device:80)/HD(Part2,Sig27A9B55D-70AE-11D6-8F67-00D0B7ABFBAB) blk4 : Acpi(PNP0A03,0)/Pci(3|1)/Ata(Primary,Slave) While here, fix a couple of nits: o Respect the GPT entry size recorded in the GPT header when we scan the GPT table. o Rename maxparts to parts. Only migration will (probably) treat it as a maximum. Everywhere else it should (is expected to) be treated as *the* number of partitions. Time to create a GEOM class... Affected files ... ... //depot/projects/ia64/sbin/gpt/gpt.c#5 edit Differences ... ==== //depot/projects/ia64/sbin/gpt/gpt.c#5 (text+ko) ==== @@ -93,7 +93,7 @@ off_t mediasz; -u_int maxparts; +u_int parts; u_int secsz; int readonly, verbose; @@ -172,7 +172,7 @@ usage(void) { - fprintf(stderr, "usage: gpt [-rv] [-p maxparts] device\n"); + fprintf(stderr, "usage: gpt [-rv] [-p nparts] device\n"); exit(1); } @@ -195,7 +195,7 @@ return (-1); found: - fd = open(device_name, ((readonly) ? O_RDONLY : O_RDWR)|O_EXCL); + fd = open(device_name, (readonly) ? O_RDONLY : O_RDWR|O_EXCL); if (fd == -1) return (-1); @@ -281,6 +281,7 @@ { struct gpt_ent *ent; struct gpt_hdr *hdr; + char *p; map_t *m; size_t blocks, tblsz; unsigned int i; @@ -304,11 +305,13 @@ tblsz = hdr->hdr_entries * hdr->hdr_entsz; blocks = tblsz / secsz + ((tblsz % secsz) ? 1 : 0); - ent = gpt_read(fd, hdr->hdr_lba_table, blocks); - if (ent == NULL) + + /* Use generic pointer to deal with hdr->hdr_entsz != sizeof(*ent). */ + p = gpt_read(fd, hdr->hdr_lba_table, blocks); + if (p == NULL) return (-1); - if (crc32(ent, tblsz) != hdr->hdr_crc_table) { + if (crc32(p, tblsz) != hdr->hdr_crc_table) { if (verbose) warnx("%s: Bad CRC in GPT table at sector %llu", device_name, (long long)hdr->hdr_lba_table); @@ -323,7 +326,7 @@ if (m == NULL) return (-1); m = map_add(hdr->hdr_lba_table, blocks, (lba == 1) - ? MAP_TYPE_GPT_TBL : MAP_TYPE_TPG_TBL, ent); + ? MAP_TYPE_GPT_TBL : MAP_TYPE_TPG_TBL, p); if (m == NULL) return (-1); @@ -332,10 +335,12 @@ for (i = 0; i < hdr->hdr_entries; i++) { uuid_t unused = GPT_ENT_TYPE_UNUSED; - if (!memcmp(&ent[i].ent_type, &unused, sizeof(uuid_t))) + + ent = (void*)(p + i * hdr->hdr_entsz); + if (!memcmp(&ent->ent_type, &unused, sizeof(uuid_t))) continue; - m = map_add(ent[i].ent_lba_start, - ent[i].ent_lba_end - ent[i].ent_lba_start + 1LL, + m = map_add(ent->ent_lba_start, + ent->ent_lba_end - ent->ent_lba_start + 1LL, MAP_TYPE_GPT_PART, NULL); if (m == NULL) return (-1); @@ -343,7 +348,7 @@ return (0); fail_ent: - free(ent); + free(p); fail_hdr: free(hdr); @@ -441,11 +446,10 @@ return; } - /* Don't create more than maxparts entries. */ - if ((uint64_t)(blocks - 1) * secsz > - maxparts * sizeof(struct gpt_ent)) { - blocks = (maxparts * sizeof(struct gpt_ent)) / secsz; - if ((maxparts * sizeof(struct gpt_ent)) % secsz) + /* Don't create more than parts entries. */ + if ((uint64_t)(blocks - 1) * secsz > parts * sizeof(struct gpt_ent)) { + blocks = (parts * sizeof(struct gpt_ent)) / secsz; + if ((parts * sizeof(struct gpt_ent)) % secsz) blocks++; blocks++; /* Don't forget the header itself */ } @@ -491,8 +495,8 @@ uuidgen(&hdr->hdr_uuid, 1); hdr->hdr_lba_table = tbl->map_start; hdr->hdr_entries = (blocks * secsz) / sizeof(struct gpt_ent); - if (hdr->hdr_entries > maxparts) - hdr->hdr_entries = maxparts; + if (hdr->hdr_entries > parts) + hdr->hdr_entries = parts; hdr->hdr_entsz = sizeof(struct gpt_ent); ent = tbl->map_data; @@ -505,8 +509,16 @@ case 165: { /* FreeBSD */ uuid_t freebsd_slice = GPT_ENT_TYPE_FREEBSD_SLICE; ent->ent_type = freebsd_slice; + unicode16(ent->ent_name, + L"FreeBSD disklabel partition", 36); break; } + case 239: { /* EFI */ + uuid_t efi_slice = GPT_ENT_TYPE_EFI; + ent->ent_type = efi_slice; + unicode16(ent->ent_name, L"EFI system partition", 36); + break; + } default: continue; } @@ -516,7 +528,6 @@ size = (size << 16) + mbr->mbr_part[i].part_size_lo; ent->ent_lba_start = start; ent->ent_lba_end = start + size - 1LL; - unicode16(ent->ent_name, L"FreeBSD slice", 36); ent++; } ent = tbl->map_data; @@ -557,10 +568,10 @@ while ((ch = getopt(argc, argv, "p:rv")) != -1) { switch(ch) { case 'p': - if (maxparts > 0) + if (parts > 0) usage(); - maxparts = strtol(optarg, &p, 10); - if (*p != 0 || maxparts < 1) + parts = strtol(optarg, &p, 10); + if (*p != 0 || parts < 1) usage(); break; case 'r': @@ -573,8 +584,8 @@ usage(); } } - if (!maxparts) - maxparts = 128; + if (!parts) + parts = 128; argc -= optind; argv += optind; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 26 14:11:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 075A437B401; Sun, 26 May 2002 14:11:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by hub.freebsd.org (Postfix) with ESMTP id 8316C37B405; Sun, 26 May 2002 14:11:53 -0700 (PDT) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.11.6/8.11.4) with ESMTP id g4QLBrJ54519; Sun, 26 May 2002 14:11:53 -0700 (PDT) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.3/8.12.3) with ESMTP id g4QLBtxF000796; Sun, 26 May 2002 14:11:55 -0700 (PDT) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.3/8.12.3/Submit) id g4QLBtHi000795; Sun, 26 May 2002 14:11:55 -0700 (PDT) (envelope-from marcel) Date: Sun, 26 May 2002 14:11:54 -0700 From: Marcel Moolenaar To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 11920 for review Message-ID: <20020526211154.GA724@dhcp01.pn.xcllnt.net> References: <200205261912.g4QJCed09589@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200205261912.g4QJCed09589@freefall.freebsd.org> User-Agent: Mutt/1.3.99i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, May 26, 2002 at 12:12:40PM -0700, Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11920 > > Change 11920 by peter@peter_daintree on 2002/05/26 12:11:46 > > Not sure what to do with this. __ElfType(Hashelt) is no longer > needed, but the __ElfType(Auxinfo) appears to be. > ia64/include/elf.h has removed it but all the other platforms have > it still. We probably want to revert the removal from , unless there's a bigger picture I don't see. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 26 16: 1:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E968D37B878; Sun, 26 May 2002 16:00:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from anchor-post-33.mail.demon.net (anchor-post-33.mail.demon.net [194.217.242.91]) by hub.freebsd.org (Postfix) with ESMTP id 7D8C237B7EC; Sun, 26 May 2002 15:58:51 -0700 (PDT) Received: from mailgate.nlsystems.com ([62.49.251.130] helo=herring.nlsystems.com) by anchor-post-33.mail.demon.net with esmtp (Exim 3.35 #1) id 17C6yQ-00011i-0X; Sun, 26 May 2002 23:58:50 +0100 Received: from herring.nlsystems.com (localhost [127.0.0.1]) by herring.nlsystems.com (8.12.3/8.11.2) with ESMTP id g4QMwnCs087197; Sun, 26 May 2002 23:58:49 +0100 (BST) (envelope-from dfr@herring.nlsystems.com) Received: (from dfr@localhost) by herring.nlsystems.com (8.12.3/8.12.3/Submit) id g4QMwnE9087196; Sun, 26 May 2002 23:58:49 +0100 (BST) Content-Type: text/plain; charset="iso-8859-1" From: Doug Rabson To: Peter Wemm , Perforce Change Reviews Subject: Re: PERFORCE change 11920 for review Date: Sun, 26 May 2002 23:58:49 +0100 User-Agent: KMail/1.4.1 References: <200205261912.g4QJCed09589@freefall.freebsd.org> In-Reply-To: <200205261912.g4QJCed09589@freefall.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-Id: <200205262358.49443.dfr@nlsystems.com> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sunday 26 May 2002 8:12 pm, Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=3D11920 > > Change 11920 by peter@peter_daintree on 2002/05/26 12:11:46 > > =09Not sure what to do with this. __ElfType(Hashelt) is no longer > =09needed, but the __ElfType(Auxinfo) appears to be. > =09ia64/include/elf.h has removed it but all the other platforms have > =09it still. I'm still thinking about this. It seems that rtld is the only thing using= =20 ElfN_Auxinfo these days... --=20 Doug Rabson=09=09=09=09Mail: dfr@nlsystems.com =09=09=09=09=09Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 26 16: 1:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C45A537B422; Sun, 26 May 2002 16:01:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from anchor-post-30.mail.demon.net (anchor-post-30.mail.demon.net [194.217.242.88]) by hub.freebsd.org (Postfix) with ESMTP id AA49137B65F; Sun, 26 May 2002 16:01:20 -0700 (PDT) Received: from mailgate.nlsystems.com ([62.49.251.130] helo=herring.nlsystems.com) by anchor-post-30.mail.demon.net with esmtp (Exim 3.35 #1) id 17C70l-0002II-0U; Mon, 27 May 2002 00:01:15 +0100 Received: from herring.nlsystems.com (localhost [127.0.0.1]) by herring.nlsystems.com (8.12.3/8.11.2) with ESMTP id g4QN19Cs087238; Mon, 27 May 2002 00:01:09 +0100 (BST) (envelope-from dfr@herring.nlsystems.com) Received: (from dfr@localhost) by herring.nlsystems.com (8.12.3/8.12.3/Submit) id g4QN18It087237; Mon, 27 May 2002 00:01:08 +0100 (BST) Content-Type: text/plain; charset="iso-8859-1" From: Doug Rabson To: Marcel Moolenaar , Peter Wemm Subject: Re: PERFORCE change 11920 for review Date: Mon, 27 May 2002 00:01:08 +0100 User-Agent: KMail/1.4.1 Cc: Perforce Change Reviews References: <200205261912.g4QJCed09589@freefall.freebsd.org> <20020526211154.GA724@dhcp01.pn.xcllnt.net> In-Reply-To: <20020526211154.GA724@dhcp01.pn.xcllnt.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-Id: <200205270001.08623.dfr@nlsystems.com> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sunday 26 May 2002 10:11 pm, Marcel Moolenaar wrote: > On Sun, May 26, 2002 at 12:12:40PM -0700, Peter Wemm wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=3D11920 > > > > Change 11920 by peter@peter_daintree on 2002/05/26 12:11:46 > > > > =09Not sure what to do with this. __ElfType(Hashelt) is no longer > > =09needed, but the __ElfType(Auxinfo) appears to be. > > =09ia64/include/elf.h has removed it but all the other platforms have > > =09it still. > > We probably want to revert the removal from , unless > there's a bigger picture I don't see. The main issue is to prevent from fixing the word size (3= 2 or=20 64) so that we can use both elf32 and elf64 in the kernel. Since the kern= el=20 doesn't use Auxinfo, we can probably leave the _ElfType(Auxinfo) in there= =2E It=20 just puts off the problem until we want to build an ILP32 userland though= =2E --=20 Doug Rabson=09=09=09=09Mail: dfr@nlsystems.com =09=09=09=09=09Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 26 19:10:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A57A437B400; Sun, 26 May 2002 19:10:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B021937B401 for ; Sun, 26 May 2002 19:10:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4R2AKH92318 for perforce@freebsd.org; Sun, 26 May 2002 19:10:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 26 May 2002 19:10:20 -0700 (PDT) Message-Id: <200205270210.g4R2AKH92318@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11947 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11947 Change 11947 by marcel@marcel_vaio on 2002/05/26 19:09:19 o Add a GEOM class to handle GPT disks. o Add a copy of gpt.h from sbin/gpt to sys/sys and made the following changes: - Rename GPT_ENT_TYPE_FREEBSD_SLICE to GPT_ENT_TYPE_FREEBSD - Fix the byte-order bug in the clock sequence field of the FreeBSD specific UUIDs. These UUIDs were created with a broken uuidgen. The copy in sbin/gpt is going away. The GPT class detects the partitions correctly and you can mount and boot from them, but only if you axe out the MBR class first. As a short-term hack, I'll probably make the MBR class back off when it detects the GPT signature in the second sector, but the right thing to do is to have the MBR class back off when it sees a protective MBR. The GPT class must then back off if there's a MBR that's not a protective MBR. Affected files ... ... //depot/projects/ia64/sys/conf/files#25 edit ... //depot/projects/ia64/sys/geom/geom_gpt.c#1 add ... //depot/projects/ia64/sys/sys/gpt.h#1 add Differences ... ==== //depot/projects/ia64/sys/conf/files#25 (text+ko) ==== @@ -723,6 +723,7 @@ geom/geom_dump.c optional geom geom/geom_enc.c optional geom geom/geom_event.c optional geom +geom/geom_gpt.c optional geom geom/geom_io.c optional geom geom/geom_kern.c optional geom geom/geom_mbr.c optional geom To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 26 20:11:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BF3937B405; Sun, 26 May 2002 20:11:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9AC4D37B400 for ; Sun, 26 May 2002 20:11:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4R3BYH02497 for perforce@freebsd.org; Sun, 26 May 2002 20:11:34 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 26 May 2002 20:11:34 -0700 (PDT) Message-Id: <200205270311.g4R3BYH02497@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11949 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11949 Change 11949 by marcel@marcel_nfs on 2002/05/26 20:10:41 o Include gpt.h from /usr/include/sys. o Nuke private copy of gpt.h. Affected files ... ... //depot/projects/ia64/sbin/gpt/gpt.c#6 edit ... //depot/projects/ia64/sbin/gpt/gpt.h#3 delete Differences ... ==== //depot/projects/ia64/sbin/gpt/gpt.c#6 (text+ko) ==== @@ -57,6 +57,7 @@ #include #include #include +#include #include #include @@ -66,7 +67,6 @@ #include #include -#include "gpt.h" #include "map.h" struct mbr { @@ -507,8 +507,8 @@ for (i = 0; i < 4; i++) { switch (mbr->mbr_part[i].part_typ) { case 165: { /* FreeBSD */ - uuid_t freebsd_slice = GPT_ENT_TYPE_FREEBSD_SLICE; - ent->ent_type = freebsd_slice; + uuid_t freebsd = GPT_ENT_TYPE_FREEBSD; + ent->ent_type = freebsd; unicode16(ent->ent_name, L"FreeBSD disklabel partition", 36); break; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun May 26 20:15:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEE9437B404; Sun, 26 May 2002 20:15:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EF9E037B403 for ; Sun, 26 May 2002 20:15:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4R3Fdd02740 for perforce@freebsd.org; Sun, 26 May 2002 20:15:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 26 May 2002 20:15:39 -0700 (PDT) Message-Id: <200205270315.g4R3Fdd02740@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11950 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11950 Change 11950 by marcel@marcel_vaio on 2002/05/26 20:15:26 Back-off when when the second sector contains the GPT signature. This is a short-term hack to allow both a valid MBR and a valid GPT to coexist. We're booting GPT partitions now! Affected files ... ... //depot/projects/ia64/sys/geom/geom_mbr.c#7 edit Differences ... ==== //depot/projects/ia64/sys/geom/geom_mbr.c#7 (text+ko) ==== @@ -61,6 +61,8 @@ #define MBR_CLASS_NAME "MBR" #define MBREXT_CLASS_NAME "MBREXT" +#define GPT_HACK 1 + static void g_dec_dos_partition(u_char *ptr, struct dos_partition *d) { @@ -197,13 +199,27 @@ if (!error && sectorsize != 512) break; gsp->frontstuff = sectorsize * fwsectors; - buf = g_read_data(cp, 0, sectorsize, &error); +#if GPT_HACK + /* + * XXX: GPT hack: Read the second sector as well and back-off + * if it has the GPT signature. + */ + buf = g_read_data(cp, 0, 2 * sectorsize, &error); +#else + buf = g_read_data(cp, 0, 2 * sectorsize, &error); +#endif if (buf == NULL || error != 0) break; if (buf[0x1fe] != 0x55 && buf[0x1ff] != 0xaa) { g_free(buf); break; } +#if GPT_HACK + if (!memcmp(buf + 512, "EFI PART", 8)) { + g_free(buf); + break; + } +#endif for (i = 0; i < NDOSPART; i++) g_dec_dos_partition( buf + DOSPARTOFF + i * sizeof(struct dos_partition), To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 27 0:29:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51C4437B40A; Mon, 27 May 2002 00:29:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8101737B407 for ; Mon, 27 May 2002 00:29:21 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4R7TLe46864 for perforce@freebsd.org; Mon, 27 May 2002 00:29:21 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Mon, 27 May 2002 00:29:21 -0700 (PDT) Message-Id: <200205270729.g4R7TLe46864@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11962 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11962 Change 11962 by marcel@marcel_vaio on 2002/05/27 00:29:11 Add a manpage for the uuidgen syscall. Affected files ... ... //depot/projects/ia64/lib/libc/sys/Makefile.inc#4 edit ... //depot/projects/ia64/lib/libc/sys/uuidgen.2#1 add Differences ... ==== //depot/projects/ia64/lib/libc/sys/Makefile.inc#4 (text+ko) ==== @@ -81,7 +81,7 @@ sigstack.2 sigsuspend.2 socket.2 socketpair.2 stat.2 statfs.2 \ swapon.2 symlink.2 sync.2 sysarch.2 syscall.2 \ truncate.2 umask.2 undelete.2 \ - unlink.2 utimes.2 vfork.2 wait.2 write.2 + unlink.2 utimes.2 uuidgen.2 vfork.2 wait.2 write.2 .if !defined(NO_P1003_1B) MAN+= sched_get_priority_max.2 sched_setparam.2 \ sched_setscheduler.2 sched_yield.2 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 27 9:24:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64C7F37B405; Mon, 27 May 2002 09:23:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3022837B404 for ; Mon, 27 May 2002 09:23:43 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4RGNgh75915 for perforce@freebsd.org; Mon, 27 May 2002 09:23:42 -0700 (PDT) (envelope-from des@freebsd.org) Date: Mon, 27 May 2002 09:23:42 -0700 (PDT) Message-Id: <200205271623.g4RGNgh75915@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 11976 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11976 Change 11976 by des@des.at.des.thinksec.com on 2002/05/27 09:23:03 Revamp the man page generation process. Delete the generated man pages as they are now regenerated automatically by the distribution script. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/MANIFEST#10 edit ... //depot/projects/openpam/dist.sh#4 edit ... //depot/projects/openpam/doc/man/Makefile#9 edit ... //depot/projects/openpam/doc/man/openpam_borrow_cred.3#6 delete ... //depot/projects/openpam/doc/man/openpam_free_data.3#6 delete ... //depot/projects/openpam/doc/man/openpam_get_option.3#10 delete ... //depot/projects/openpam/doc/man/openpam_log.3#11 delete ... //depot/projects/openpam/doc/man/openpam_nullconv.3#3 delete ... //depot/projects/openpam/doc/man/openpam_restore_cred.3#6 delete ... //depot/projects/openpam/doc/man/openpam_set_option.3#10 delete ... //depot/projects/openpam/doc/man/openpam_ttyconv.3#11 delete ... //depot/projects/openpam/doc/man/pam.3#16 delete ... //depot/projects/openpam/doc/man/pam_acct_mgmt.3#14 delete ... //depot/projects/openpam/doc/man/pam_authenticate.3#14 delete ... //depot/projects/openpam/doc/man/pam_chauthtok.3#14 delete ... //depot/projects/openpam/doc/man/pam_close_session.3#14 delete ... //depot/projects/openpam/doc/man/pam_end.3#14 delete ... //depot/projects/openpam/doc/man/pam_error.3#14 delete ... //depot/projects/openpam/doc/man/pam_get_authtok.3#16 delete ... //depot/projects/openpam/doc/man/pam_get_data.3#14 delete ... //depot/projects/openpam/doc/man/pam_get_item.3#15 delete ... //depot/projects/openpam/doc/man/pam_get_user.3#15 delete ... //depot/projects/openpam/doc/man/pam_getenv.3#14 delete ... //depot/projects/openpam/doc/man/pam_getenvlist.3#15 delete ... //depot/projects/openpam/doc/man/pam_info.3#14 delete ... //depot/projects/openpam/doc/man/pam_open_session.3#14 delete ... //depot/projects/openpam/doc/man/pam_prompt.3#15 delete ... //depot/projects/openpam/doc/man/pam_putenv.3#14 delete ... //depot/projects/openpam/doc/man/pam_set_data.3#14 delete ... //depot/projects/openpam/doc/man/pam_set_item.3#14 delete ... //depot/projects/openpam/doc/man/pam_setcred.3#15 delete ... //depot/projects/openpam/doc/man/pam_setenv.3#14 delete ... //depot/projects/openpam/doc/man/pam_sm_acct_mgmt.3#10 delete ... //depot/projects/openpam/doc/man/pam_sm_authenticate.3#10 delete ... //depot/projects/openpam/doc/man/pam_sm_chauthtok.3#10 delete ... //depot/projects/openpam/doc/man/pam_sm_close_session.3#10 delete ... //depot/projects/openpam/doc/man/pam_sm_open_session.3#10 delete ... //depot/projects/openpam/doc/man/pam_sm_setcred.3#10 delete ... //depot/projects/openpam/doc/man/pam_start.3#15 delete ... //depot/projects/openpam/doc/man/pam_strerror.3#14 delete ... //depot/projects/openpam/doc/man/pam_verror.3#12 delete ... //depot/projects/openpam/doc/man/pam_vinfo.3#12 delete ... //depot/projects/openpam/doc/man/pam_vprompt.3#12 delete ... //depot/projects/openpam/misc/gendoc.pl#15 edit Differences ... ==== //depot/projects/openpam/MANIFEST#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#9 $ +# $P4: //depot/projects/openpam/MANIFEST#10 $ # CREDITS HISTORY @@ -14,6 +14,7 @@ bin/su/su.c doc/Makefile doc/man/Makefile +doc/man/openpam.3 doc/man/openpam_borrow_cred.3 doc/man/openpam_free_data.3 doc/man/openpam_get_option.3 @@ -22,7 +23,6 @@ doc/man/openpam_restore_cred.3 doc/man/openpam_set_option.3 doc/man/openpam_ttyconv.3 -doc/man/pam.3 doc/man/pam_acct_mgmt.3 doc/man/pam_authenticate.3 doc/man/pam_chauthtok.3 ==== //depot/projects/openpam/dist.sh#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $P4: //depot/projects/openpam/dist.sh#3 $ +# $P4: //depot/projects/openpam/dist.sh#4 $ # set -e @@ -8,10 +8,14 @@ release=$(date '+%Y%m%d') distname="openpam-${release}" +make cleandir +make cleandir +(cd doc/man && make openpam.3) install -d -m 0755 "${distname}" grep -v '^#' MANIFEST | while read file; do install -d -m 0755 "${distname}/$(dirname ${file})" install -c -m 0644 "${file}" "${distname}/${file}" done -tar zcf "/tmp/${distname}.tar.gz" "${distname}" +tar zcf "${distname}.tar.gz" "${distname}" rm -rf "${distname}" +make cleandir ==== //depot/projects/openpam/doc/man/Makefile#9 (text+ko) ==== @@ -31,52 +31,64 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/doc/man/Makefile#8 $ +# $P4: //depot/projects/openpam/doc/man/Makefile#9 $ # -MAN = -MAN += openpam_borrow_cred.3 -MAN += openpam_free_data.3 -MAN += openpam_get_option.3 -MAN += openpam_log.3 -MAN += openpam_nullconv.3 -MAN += openpam_restore_cred.3 -MAN += openpam_set_option.3 -MAN += openpam_ttyconv.3 -MAN += pam.3 -MAN += pam_acct_mgmt.3 -MAN += pam_authenticate.3 -MAN += pam_chauthtok.3 -MAN += pam_close_session.3 -MAN += pam_end.3 -MAN += pam_error.3 -MAN += pam_get_authtok.3 -MAN += pam_get_data.3 -MAN += pam_get_item.3 -MAN += pam_get_user.3 -MAN += pam_getenv.3 -MAN += pam_getenvlist.3 -MAN += pam_info.3 -MAN += pam_open_session.3 -MAN += pam_prompt.3 -MAN += pam_putenv.3 -MAN += pam_set_data.3 -MAN += pam_set_item.3 -MAN += pam_setcred.3 -MAN += pam_setenv.3 -MAN += pam_sm_acct_mgmt.3 -MAN += pam_sm_authenticate.3 -MAN += pam_sm_chauthtok.3 -MAN += pam_sm_close_session.3 -MAN += pam_sm_open_session.3 -MAN += pam_sm_setcred.3 -MAN += pam_start.3 -MAN += pam_strerror.3 -MAN += pam_verror.3 -MAN += pam_vinfo.3 -MAN += pam_vprompt.3 +GENDOC = ${.CURDIR}/../../misc/gendoc.pl + +CMAN = +CMAN += openpam_borrow_cred.3 +CMAN += openpam_free_data.3 +CMAN += openpam_get_option.3 +CMAN += openpam_log.3 +CMAN += openpam_nullconv.3 +CMAN += openpam_restore_cred.3 +CMAN += openpam_set_option.3 +CMAN += openpam_ttyconv.3 +CMAN += pam_acct_mgmt.3 +CMAN += pam_authenticate.3 +CMAN += pam_chauthtok.3 +CMAN += pam_close_session.3 +CMAN += pam_end.3 +CMAN += pam_error.3 +CMAN += pam_get_authtok.3 +CMAN += pam_get_data.3 +CMAN += pam_get_item.3 +CMAN += pam_get_user.3 +CMAN += pam_getenv.3 +CMAN += pam_getenvlist.3 +CMAN += pam_info.3 +CMAN += pam_open_session.3 +CMAN += pam_prompt.3 +CMAN += pam_putenv.3 +CMAN += pam_set_data.3 +CMAN += pam_set_item.3 +CMAN += pam_setcred.3 +CMAN += pam_setenv.3 +CMAN += pam_sm_acct_mgmt.3 +CMAN += pam_sm_authenticate.3 +CMAN += pam_sm_chauthtok.3 +CMAN += pam_sm_close_session.3 +CMAN += pam_sm_open_session.3 +CMAN += pam_sm_setcred.3 +CMAN += pam_start.3 +CMAN += pam_strerror.3 +CMAN += pam_verror.3 +CMAN += pam_vinfo.3 +CMAN += pam_vprompt.3 + +MAN = ${CMAN} +MAN += openpam.3 +MLINKS = openpam.3 pam.3 + +CLEANFILES += ${CMAN} openpam.3 + +.for man in ${CMAN} +${man}: ${.CURDIR}/../../lib/${man:R}.c ${GENDOC} + perl -w ${GENDOC} ${.CURDIR}/../../lib/${man:R}.c +.endfor -generate: - (cd ${.CURDIR} && perl -w ../../misc/gendoc.pl ../../lib/*.c >pam.3) +openpam.3: ${CMAN} ${GENDOC} + perl -w ${GENDOC} -s ${CMAN} .include ==== //depot/projects/openpam/misc/gendoc.pl#15 (text+ko) ==== @@ -32,14 +32,51 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/misc/gendoc.pl#14 $ +# $P4: //depot/projects/openpam/misc/gendoc.pl#15 $ # use strict; use Fcntl; +use Getopt::Std; use POSIX qw(strftime); use vars qw($COPYRIGHT $TODAY %FUNCTIONS %PAMERR); +$COPYRIGHT = ".\\\"- +.\\\" Copyright (c) 2002 Networks Associates Technology, Inc. +.\\\" All rights reserved. +.\\\" +.\\\" This software was developed for the FreeBSD Project by ThinkSec AS and +.\\\" NAI Labs, the Security Research Division of Network Associates, Inc. +.\\\" under DARPA/SPAWAR contract N66001-01-C-8035 (\"CBOSS\"), as part of the +.\\\" DARPA CHATS research program. +.\\\" +.\\\" Redistribution and use in source and binary forms, with or without +.\\\" modification, are permitted provided that the following conditions +.\\\" are met: +.\\\" 1. Redistributions of source code must retain the above copyright +.\\\" notice, this list of conditions and the following disclaimer. +.\\\" 2. Redistributions in binary form must reproduce the above copyright +.\\\" notice, this list of conditions and the following disclaimer in the +.\\\" documentation and/or other materials provided with the distribution. +.\\\" 3. The name of the author may not be used to endorse or promote +.\\\" products derived from this software without specific prior written +.\\\" permission. +.\\\" +.\\\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\\\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\\\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\\\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\\\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\\\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\\\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\\\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. +.\\\" +.\\\" \$" . "P4" . "\$ +.\\\""; + %PAMERR = ( PAM_SUCCESS => "Success", PAM_OPEN_ERR => "Failed to load module", @@ -91,7 +128,7 @@ if ($fn !~ m,\.c$,) { warn("$fn: not C source, ignoring\n"); - return; + return undef; } sysopen(FILE, $fn, O_RDONLY) @@ -99,19 +136,14 @@ $source = join('', ); close(FILE); - return if ($source =~ m/^ \* NOPARSE\s*$/m); + return undef + if ($source =~ m/^ \* NOPARSE\s*$/m); - if (!defined($COPYRIGHT) && $source =~ m,^(/\*-\n.*?)\s*\*/,s) { - $COPYRIGHT = $1; - $COPYRIGHT =~ s,^.\*,.\\\",gm; - $COPYRIGHT =~ s,(\$(?:)P4).*?\$,$1\$,; - $COPYRIGHT .= "\n.\\\""; - } $func = $fn; $func =~ s,^(?:.*/)?([^/]+)\.c$,$1,; if ($source !~ m,\n \* ([\S ]+)\n \*/\n\n([\S ]+)\n$func\((.*?)\)\n\{,s) { warn("$fn: can't find $func\n"); - return; + return undef; } ($descr, $type, $args) = ($1, $2, $3); $descr =~ s,^([A-Z][a-z]),lc($1),e; @@ -231,6 +263,7 @@ } $FUNCTIONS{$func} = { + 'source' => $fn, 'name' => $func, 'descr' => $descr, 'type' => $type, @@ -249,6 +282,8 @@ if ($source !~ m/^ \* XSSO \d/m) { $FUNCTIONS{$func}->{'openpam'} = 1; } + expand_errors($FUNCTIONS{$func}); + return $FUNCTIONS{$func}; } sub expand_errors($); @@ -256,6 +291,8 @@ my $func = shift; # Ref to function hash my %errors; + my $ref; + my $fn; if (defined($func->{'recursed'})) { warn("$func->{'name'}(): loop in error spec\n"); @@ -273,11 +310,17 @@ } elsif (m/^!(PAM_[A-Z_]+)$/) { # treat negations separately } elsif (m/^=([a-z_]+)$/) { - if (!defined($FUNCTIONS{$1})) { - warn("$func->{'name'}(): reference to unknown $1()\n"); + $ref = $1; + if (!defined($FUNCTIONS{$ref})) { + $fn = $func->{'source'}; + $fn =~ s/$func->{'name'}/$ref/; + parse_source($fn); + } + if (!defined($FUNCTIONS{$ref})) { + warn("$func->{'name'}(): reference to unknown $ref()\n"); next; } - foreach (expand_errors($FUNCTIONS{$1})) { + foreach (@{$FUNCTIONS{$ref}->{'errors'}}) { $errors{$_} = 1; } } else { @@ -290,7 +333,7 @@ } } delete($func->{'recursed'}); - return (sort(keys(%errors))); + $func->{'errors'} = [ sort(keys(%errors)) ]; } sub gendoc($) { @@ -332,7 +375,7 @@ function returns one of the following values: .Bl -tag -width 18n "; - my @errors = expand_errors($func); + my @errors = @{$func->{'errors'}}; warn("$func->{'name'}(): no error specification\n") unless(@errors); foreach (@errors) { @@ -387,33 +430,59 @@ } } +sub readproto($) { + my $fn = shift; # File name + + local *FILE; + my %func; + + sysopen(FILE, $fn, O_RDONLY) + or die("$fn: open(): $!\n"); + while () { + if (m/^\.Nm ((?:open)?pam_.*?)\s*$/) { + $func{'Nm'} = $func{'Nm'} || $1; + } elsif (m/^\.Ft (\S.*?)\s*$/) { + $func{'Ft'} = $func{'Ft'} || $1; + } elsif (m/^\.Fn (\S.*?)\s*$/) { + $func{'Fn'} = $func{'Fn'} || $1; + } + } + close(FILE); + if ($func{'Nm'}) { + $FUNCTIONS{$func{'Nm'}} = \%func; + } else { + warn("No function found\n"); + } +} + sub gensummary() { + local *FILE; my $func; - print "$COPYRIGHT + sysopen(FILE, "openpam.3", O_RDWR|O_CREAT|O_TRUNC) + or die("openpam.3: $!\n"); + + print FILE "$COPYRIGHT .Dd $TODAY .Dt PAM 3 .Os .Sh NAME "; - my @funcs = sort(keys(%FUNCTIONS)); - while ($func = shift(@funcs)) { - next if (defined($FUNCTIONS{$func}->{'nolist'})); - print ".Nm $func". (@funcs ? " ,\n" : "\n"); + foreach $func (sort(keys(%FUNCTIONS))) { + print FILE ".Nm $FUNCTIONS{$func}->{'Nm'}\n"; } - print ".Nd Pluggable Authentication Modules Library + print FILE ".Nd Pluggable Authentication Modules Library .Sh LIBRARY .Lb libpam .Sh SYNOPSIS .In security/pam_appl.h "; foreach $func (sort(keys(%FUNCTIONS))) { - next if (defined($FUNCTIONS{$func}->{'nolist'})); - print ".Ft $FUNCTIONS{$func}->{'type'}\n"; - print ".Fn $func $FUNCTIONS{$func}->{'args'}\n"; + print FILE ".Ft $FUNCTIONS{$func}->{'Ft'}\n"; + print FILE ".Fn $FUNCTIONS{$func}->{'Fn'}\n"; } - print ".Sh DESCRIPTION + print FILE ".Sh DESCRIPTION .Sh RETURN VALUES The following return codes are defined in the .In security/pam_constants.h @@ -421,16 +490,15 @@ .Bl -tag -width 18n "; foreach (sort(keys(%PAMERR))) { - print ".It Bq Er $_\n$PAMERR{$_}.\n"; + print FILE ".It Bq Er $_\n$PAMERR{$_}.\n"; } - print ".El + print FILE ".El .Sh SEE ALSO "; foreach $func (sort(keys(%FUNCTIONS))) { - next if (defined($FUNCTIONS{$func}->{'nolist'})); - print ".Xr $func 3 ,\n"; + print FILE ".Xr $func 3 ,\n"; } - print ".Xr pam.conf 5 + print FILE ".Xr pam.conf 5 .Sh STANDARDS .Rs .%T \"X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules\" @@ -443,17 +511,34 @@ N66001-01-C-8035 .Pq Dq CBOSS , as part of the DARPA CHATS research program. -" +"; + close(FILE); +} + +sub usage() { + + print(STDERR "usage: gendoc [-s] source [...]\n"); + exit(1); } MAIN:{ + my %opts; + + usage() + unless (@ARGV && getopts("s", \%opts)); $TODAY = strftime("%B %e, %Y", localtime(time())); $TODAY =~ s,\s+, ,g; - foreach my $fn (@ARGV) { - parse_source($fn); + if ($opts{'s'}) { + foreach my $fn (@ARGV) { + readproto($fn); + } + gensummary(); + } else { + foreach my $fn (@ARGV) { + my $func = parse_source($fn); + gendoc($func) + if (defined($func)); + } } - foreach my $func (values(%FUNCTIONS)) { - gendoc($func); - } - gensummary(); + exit(0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 27 14:12:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2094A37B403; Mon, 27 May 2002 14:12:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 443D737B401 for ; Mon, 27 May 2002 14:12:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4RLCZY29808 for perforce@freebsd.org; Mon, 27 May 2002 14:12:35 -0700 (PDT) (envelope-from chris@freebsd.org) Date: Mon, 27 May 2002 14:12:35 -0700 (PDT) Message-Id: <200205272112.g4RLCZY29808@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 11987 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11987 Change 11987 by chris@chris_holly on 2002/05/27 14:11:44 Fix affiliations Remove some redundant language Re-copy in the man page's SEE ALSO section for a more readable citation reference (commented out) Affected files ... ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/lomac/article.sgml#6 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/lomac/article.sgml#6 (text+ko) ==== @@ -35,7 +35,12 @@ $FreeBSD$ --> - + +%man +]> +
LOMAC Operations Manual @@ -46,7 +51,9 @@ Tim - + + NAI Labs CBOSS Project + @@ -54,8 +61,9 @@ Chris - + + Safeport Network Services, TrustedBSD Project + @@ -68,7 +76,7 @@ the integrity of processes and data from viruses, Trojan horses, malicious remote users, and compromised root daemons. LOMAC is designed to be - largely invisible to users, and largely painless to + virtually invisible to users, and largely painless to administrators. This is the operations manual for LOMAC. It describes @@ -198,7 +206,6 @@ 2—LOMAC's highest level of privilege. - Look at the levels of your files. (-Z shows levels.) @@ -698,25 +705,33 @@ may be an aid to administration, particularly when downloading and installing new software. - - - SEE ALSO + + - - sec-arch(7), security(7) [BIB77] K. J. Biba, "Integrity - Considerations for Secure Computer Systems," Electronic Systems - Division, Hanscom Air Force Base, Bedford, MA, April 1977, pages - 27-31. [BOE85] W. E. Boebert and R. Y. Kain, "A Practical - Alternative to Hierarchical Integrity Policies," Proceedings of - the 8th National Computer Security Conference, 1985. LWM and - Trust: pages 19-20. Assured Pipelines: pages 20-25. [FRA01] T. - Fraser, "LOMAC: MAC You Can Live With", Proceedings of the - FREENIX Track: USENIX Annual Technical Conference, Boston, - Massachusetts, June, 2001. [SAL75] J. H. Saltzer and M. D. - Schroeder, "The Protection of Information in Computer Systems," - Proceedings of the IEEE Vol. 63(9), September 1975, pages - 1278-1308. Also summarized in Dorothy E. Denning, "Cryptography - and Data Security," Addison-Wesley, 1982, page 206. -
To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 27 16: 0:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AE7C37B405; Mon, 27 May 2002 15:59:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6C60237B400 for ; Mon, 27 May 2002 15:59:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4RMxjY43483 for perforce@freebsd.org; Mon, 27 May 2002 15:59:45 -0700 (PDT) (envelope-from des@freebsd.org) Date: Mon, 27 May 2002 15:59:45 -0700 (PDT) Message-Id: <200205272259.g4RMxjY43483@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 11991 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11991 Change 11991 by des@des.at.des.thinksec.com on 2002/05/27 15:58:47 Split the summar page in two (one for the standard API, one for extensions). Also add a page about the conversation system, and remove that information from the pam_start page. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/MANIFEST#11 edit ... //depot/projects/openpam/doc/man/Makefile#10 edit ... //depot/projects/openpam/doc/man/openpam.man#1 add ... //depot/projects/openpam/doc/man/pam.man#1 add ... //depot/projects/openpam/doc/man/pam_conv.3#1 add ... //depot/projects/openpam/lib/pam_start.c#15 edit ... //depot/projects/openpam/misc/gendoc.pl#16 edit Differences ... ==== //depot/projects/openpam/MANIFEST#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#10 $ +# $P4: //depot/projects/openpam/MANIFEST#11 $ # CREDITS HISTORY @@ -15,6 +15,7 @@ doc/Makefile doc/man/Makefile doc/man/openpam.3 +doc/man/openpam.man doc/man/openpam_borrow_cred.3 doc/man/openpam_free_data.3 doc/man/openpam_get_option.3 @@ -23,10 +24,13 @@ doc/man/openpam_restore_cred.3 doc/man/openpam_set_option.3 doc/man/openpam_ttyconv.3 +doc/man/pam.3 +doc/man/pam.man doc/man/pam_acct_mgmt.3 doc/man/pam_authenticate.3 doc/man/pam_chauthtok.3 doc/man/pam_close_session.3 +doc/man/pam_conv.3 doc/man/pam_end.3 doc/man/pam_error.3 doc/man/pam_get_authtok.3 ==== //depot/projects/openpam/doc/man/Makefile#10 (text+ko) ==== @@ -31,64 +31,75 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/doc/man/Makefile#9 $ +# $P4: //depot/projects/openpam/doc/man/Makefile#10 $ # GENDOC = ${.CURDIR}/../../misc/gendoc.pl -CMAN = -CMAN += openpam_borrow_cred.3 -CMAN += openpam_free_data.3 -CMAN += openpam_get_option.3 -CMAN += openpam_log.3 -CMAN += openpam_nullconv.3 -CMAN += openpam_restore_cred.3 -CMAN += openpam_set_option.3 -CMAN += openpam_ttyconv.3 -CMAN += pam_acct_mgmt.3 -CMAN += pam_authenticate.3 -CMAN += pam_chauthtok.3 -CMAN += pam_close_session.3 -CMAN += pam_end.3 -CMAN += pam_error.3 -CMAN += pam_get_authtok.3 -CMAN += pam_get_data.3 -CMAN += pam_get_item.3 -CMAN += pam_get_user.3 -CMAN += pam_getenv.3 -CMAN += pam_getenvlist.3 -CMAN += pam_info.3 -CMAN += pam_open_session.3 -CMAN += pam_prompt.3 -CMAN += pam_putenv.3 -CMAN += pam_set_data.3 -CMAN += pam_set_item.3 -CMAN += pam_setcred.3 -CMAN += pam_setenv.3 -CMAN += pam_sm_acct_mgmt.3 -CMAN += pam_sm_authenticate.3 -CMAN += pam_sm_chauthtok.3 -CMAN += pam_sm_close_session.3 -CMAN += pam_sm_open_session.3 -CMAN += pam_sm_setcred.3 -CMAN += pam_start.3 -CMAN += pam_strerror.3 -CMAN += pam_verror.3 -CMAN += pam_vinfo.3 -CMAN += pam_vprompt.3 +# Standard PAM API +PMAN = +PMAN += pam_acct_mgmt.3 +PMAN += pam_authenticate.3 +PMAN += pam_chauthtok.3 +PMAN += pam_close_session.3 +PMAN += pam_end.3 +PMAN += pam_get_data.3 +PMAN += pam_get_item.3 +PMAN += pam_get_user.3 +PMAN += pam_getenv.3 +PMAN += pam_getenvlist.3 +PMAN += pam_open_session.3 +PMAN += pam_putenv.3 +PMAN += pam_set_data.3 +PMAN += pam_set_item.3 +PMAN += pam_setcred.3 +PMAN += pam_start.3 +PMAN += pam_strerror.3 + +# Standard module API +MMAN = +MMAN += pam_sm_acct_mgmt.3 +MMAN += pam_sm_authenticate.3 +MMAN += pam_sm_chauthtok.3 +MMAN += pam_sm_close_session.3 +MMAN += pam_sm_open_session.3 +MMAN += pam_sm_setcred.3 + +# OpenPAM extensions +OMAN = +OMAN += openpam_borrow_cred.3 +OMAN += openpam_free_data.3 +OMAN += openpam_get_option.3 +OMAN += openpam_log.3 +OMAN += openpam_nullconv.3 +OMAN += openpam_restore_cred.3 +OMAN += openpam_set_option.3 +OMAN += openpam_ttyconv.3 +OMAN += pam_error.3 +OMAN += pam_get_authtok.3 +OMAN += pam_info.3 +OMAN += pam_prompt.3 +OMAN += pam_setenv.3 +OMAN += pam_verror.3 +OMAN += pam_vinfo.3 +OMAN += pam_vprompt.3 -MAN = ${CMAN} +MAN = ${PMAN} ${OMAN} ${MMAN} MAN += openpam.3 -MLINKS = openpam.3 pam.3 +MAN += pam.3 +MAN += pam_conv.3 -CLEANFILES += ${CMAN} openpam.3 +CLEANFILES += ${PMAN} ${OMAN} ${MMAN} openpam.3 pam.3 -.for man in ${CMAN} +.for man in ${PMAN} ${OMAN} ${MMAN} ${man}: ${.CURDIR}/../../lib/${man:R}.c ${GENDOC} perl -w ${GENDOC} ${.CURDIR}/../../lib/${man:R}.c .endfor -openpam.3: ${CMAN} ${GENDOC} - perl -w ${GENDOC} -s ${CMAN} +openpam.3: ${OMAN} ${GENDOC} openpam.man + perl -w ${GENDOC} -o ${OMAN} <${.CURDIR}/openpam.man + +pam.3: ${PMAN} ${GENDOC} pam.man + perl -w ${GENDOC} -p ${PMAN} <${.CURDIR}/pam.man .include ==== //depot/projects/openpam/lib/pam_start.c#15 (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_start.c#14 $ + * $P4: //depot/projects/openpam/lib/pam_start.c#15 $ */ #include @@ -98,14 +98,7 @@ * It is stored in the =PAM_USER item in the created context. * * The =pam_conv argument points to a =struct pam_conv describing the - * conversation function to use. - * This structure is defined as follows: - * - * struct pam_conv { - * int (*conv)(int, const struct pam_message **, - * struct pam_response **, void *); - * void *appdata_ptr; - * }; + * conversation function to use; see =pam_conv for details. * * >pam_get_item * >pam_set_item ==== //depot/projects/openpam/misc/gendoc.pl#16 (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#15 $ +# $P4: //depot/projects/openpam/misc/gendoc.pl#16 $ # use strict; @@ -455,51 +455,77 @@ } } -sub gensummary() { +sub gensummary($) { + my $page = shift; # Which page to produce local *FILE; + my $upage; my $func; + my %xref; - sysopen(FILE, "openpam.3", O_RDWR|O_CREAT|O_TRUNC) - or die("openpam.3: $!\n"); + sysopen(FILE, "$page.3", O_RDWR|O_CREAT|O_TRUNC) + or die("$page.3: $!\n"); + $upage = uc($page); print FILE "$COPYRIGHT .Dd $TODAY -.Dt PAM 3 +.Dt $upage 3 .Os .Sh NAME "; - foreach $func (sort(keys(%FUNCTIONS))) { - print FILE ".Nm $FUNCTIONS{$func}->{'Nm'}\n"; + my @funcs = sort(keys(%FUNCTIONS)); + while ($func = shift(@funcs)) { + print FILE ".Nm $FUNCTIONS{$func}->{'Nm'}"; + print FILE " ," + if (@funcs); + print FILE "\n"; } print FILE ".Nd Pluggable Authentication Modules Library .Sh LIBRARY .Lb libpam -.Sh SYNOPSIS -.In security/pam_appl.h -"; +.Sh SYNOPSIS\n"; + if ($page eq 'pam') { + print FILE ".In security/pam_appl.h\n"; + } else { + print FILE ".In security/openpam.h\n"; + } foreach $func (sort(keys(%FUNCTIONS))) { print FILE ".Ft $FUNCTIONS{$func}->{'Ft'}\n"; print FILE ".Fn $FUNCTIONS{$func}->{'Fn'}\n"; } - print FILE ".Sh DESCRIPTION -.Sh RETURN VALUES -The following return codes are defined in the -.In security/pam_constants.h -header: + while () { + if (m/^\.Xr (\S+)\s*(\d)\s*$/) { + $xref{$1} = $2; + } + print FILE $_; + } + + if ($page eq 'pam') { + print FILE ".Sh RETURN VALUES +The following return codes are defined by +.Aq Pa security/pam_constants.h : .Bl -tag -width 18n "; - foreach (sort(keys(%PAMERR))) { - print FILE ".It Bq Er $_\n$PAMERR{$_}.\n"; + foreach (sort(keys(%PAMERR))) { + print FILE ".It Bq Er $_\n$PAMERR{$_}.\n"; + } + print FILE ".El\n"; } - print FILE ".El -.Sh SEE ALSO + print FILE ".Sh SEE ALSO "; - foreach $func (sort(keys(%FUNCTIONS))) { - print FILE ".Xr $func 3 ,\n"; + print FILE ".Xr openpam 3\n" + if ($page eq 'pam'); + foreach $func (keys(%FUNCTIONS)) { + $xref{$func} = 3; + } + my @refs = sort(keys(%xref)); + while ($_ = shift(@refs)) { + print FILE ".Xr $_ $xref{$_}"; + print FILE " ," + if (@refs); + print FILE "\n"; } - print FILE ".Xr pam.conf 5 -.Sh STANDARDS + print FILE ".Sh STANDARDS .Rs .%T \"X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules\" .%D \"June 1997\" @@ -525,14 +551,17 @@ my %opts; usage() - unless (@ARGV && getopts("s", \%opts)); + unless (@ARGV && getopts("op", \%opts)); $TODAY = strftime("%B %e, %Y", localtime(time())); $TODAY =~ s,\s+, ,g; - if ($opts{'s'}) { + if ($opts{'o'} || $opts{'p'}) { foreach my $fn (@ARGV) { readproto($fn); } - gensummary(); + gensummary('openpam') + if ($opts{'o'}); + gensummary('pam') + if ($opts{'p'}); } else { foreach my $fn (@ARGV) { my $func = parse_source($fn); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 27 19:43:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48CC237B401; Mon, 27 May 2002 19:43:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0D23C37B400 for ; Mon, 27 May 2002 19:43:18 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4S2hHw86540 for perforce@freebsd.org; Mon, 27 May 2002 19:43:17 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Mon, 27 May 2002 19:43:17 -0700 (PDT) Message-Id: <200205280243.g4S2hHw86540@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11995 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11995 Change 11995 by marcel@marcel_vaio on 2002/05/27 19:42:30 Round of cleanups: o Give uuidgen() the correct prototype in syscalls.master o Define struct uuid according to DCE 1.1 in sys/uuid.h o Use struct uuid instead of uuid_t. The latter is defined in sys/uuid.h but should not be used in kernel land. o Add snprintf_uuid(), printf_uuid() and sbuf_printf_uuid() to kern_uuid.c for use in the kernel (currently geom_gpt.c). o Rename the non-standard struct uuid in kern/kern_uuid.c to struct uuid_private and give it a slightly better definition for better byte-order handling. See below. o In sys/gpt.h, fix the broken uuid definitions to match the now compliant struct uuid definition. See below. o In usr.bin/uuidgen/uuidgen.c catch up with struct uuid change. A note about byte-order: The standard failed to provide a non-conflicting and unambiguous definition for the binary representation. My initial implementation always wrote the timestamp as a 64-bit little-endian (2s-complement) integral. The clock sequence was always written as a 16-bit big-endian (2s-complement) integral. After a good nights sleep and couple of Pan Galactic Gargle Blasters (not necessarily in that order :-) I reread the spec and came to the conclusion that the time fields are always written in the native by order, provided the the low, mid and hi chopping still occurs. The spec mentions that you "might need to swap bytes if you talk to a machine that has a different byte-order". The clock sequence is always written in big-endian order (as is the IEEE 802 address) because its division is resulting in bytes, making the ordering unambiguous. Note that the change is mostly a no-op, but it did expose the broken UUIDs in sys/gpt.h. The clock-sequence was defined as a 16-bit integral, but in such a way that it was only valid when written as big-endian. This was not the case. Strangely enough EFI still matched its UUID, even though it was wrong. Maybe they mask out the clock sequence? We at least don't, so I had to repartition my disk to be able to find the slice again... Affected files ... ... //depot/projects/ia64/sys/geom/geom_gpt.c#2 edit ... //depot/projects/ia64/sys/kern/kern_uuid.c#2 edit ... //depot/projects/ia64/sys/kern/syscalls.master#9 edit ... //depot/projects/ia64/sys/sys/gpt.h#2 edit ... //depot/projects/ia64/sys/sys/sysproto.h#10 edit ... //depot/projects/ia64/sys/sys/uuid.h#2 edit ... //depot/projects/ia64/usr.bin/uuidgen/uuidgen.c#3 edit Differences ... ==== //depot/projects/ia64/sys/geom/geom_gpt.c#2 (text+ko) ==== @@ -158,7 +158,7 @@ static int g_gpt_start(struct bio *bp) { - uuid_t freebsd = GPT_ENT_TYPE_FREEBSD; + struct uuid freebsd = GPT_ENT_TYPE_FREEBSD; struct g_provider *pp = bp->bio_to; struct g_geom *gp = pp->geom; struct g_slicer *gsp = gp->softc; @@ -178,7 +178,7 @@ * emulate a MBR class :-/ */ type = (memcmp(&gs->part[pp->index]->ent_type, &freebsd, - sizeof(uuid_t))) ? 0 : 165; + sizeof(freebsd))) ? 0 : 165; return ((g_haveattr_int(bp, "MBR::type", type)) ? 1 : 0); } @@ -188,18 +188,15 @@ { struct g_slicer *gsp = gp->softc; struct g_gpt_softc *gs = gsp->softc; - uuid_t *uuid; + struct uuid *uuid; g_slice_dumpconf(sb, indent, gp, cp, pp); if (pp != NULL) { uuid = &gs->part[pp->index]->ent_type; - sbuf_printf(sb, -"%s%08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x\n", - indent, le32toh(uuid->time_low), le16toh(uuid->time_med), - le16toh(uuid->time_hi), be16toh(uuid->seq), uuid->node[0], - uuid->node[1], uuid->node[2], uuid->node[3], uuid->node[4], - uuid->node[5]); + sbuf_printf(sb, "%s", indent); + sbuf_printf_uuid(sb, uuid); + sbuf_printf(sb, "\n"); } } @@ -279,11 +276,11 @@ gsp->frontstuff = hdr->hdr_lba_start * secsz; for (i = 0; i < hdr->hdr_entries; i++) { - uuid_t unused = GPT_ENT_TYPE_UNUSED; + struct uuid unused = GPT_ENT_TYPE_UNUSED; if (i >= GPT_MAX_SLICES) break; ent = (void*)(buf + i * hdr->hdr_entsz); - if (!memcmp(&ent->ent_type, &unused, sizeof(uuid_t))) + if (!memcmp(&ent->ent_type, &unused, sizeof(unused))) continue; gs->part[i] = g_malloc(hdr->hdr_entsz, M_WAITOK); if (gs->part[i] == NULL) ==== //depot/projects/ia64/sys/kern/kern_uuid.c#2 (text+ko) ==== @@ -31,8 +31,10 @@ #include #include #include +#include #include #include +#include #include #include @@ -41,26 +43,33 @@ /* * See also: * http://www.opengroup.org/dce/info/draft-leach-uuids-guids-01.txt + * http://www.opengroup.org/onlinepubs/009629399/apdxa.htm + * + * Note that the generator state is itself an UUID, but the time and clock + * sequence fields are written in the native byte order. */ -#define IEEE_ADDR_LEN 6 +CTASSERT(sizeof(struct uuid) == 16); -union ieee_addr { - uint16_t word[IEEE_ADDR_LEN >> 1]; - uint8_t byte[IEEE_ADDR_LEN]; +/* We use an alternative, more convenient representation in the generator. */ +struct uuid_private { + union { + uint64_t ll; /* internal. */ + struct { + uint32_t low; + uint16_t mid; + uint16_t hi; + } x; + } time; + uint16_t seq; /* Big-endian. */ + uint16_t node[UUID_NODE_LEN>>1]; }; -struct uuid { - uint64_t time; - uint16_t seq; - union ieee_addr node; -}; +CTASSERT(sizeof(struct uuid_private) == 16); -CTASSERT(sizeof(struct uuid) == 16); +static struct uuid_private uuid_last; -static struct uuid uuid_last; -static struct mtx uuid_mutex; - +static struct mtx uuid_mutex; MTX_SYSINIT(uuid_lock, &uuid_mutex, "UUID generator mutex lock", MTX_DEF); /* @@ -74,13 +83,14 @@ * scan and safely return the MAC address we returned before. */ static void -uuid_node(union ieee_addr *addr) +uuid_node(uint16_t *node) { struct ifnet *ifp; struct ifaddr *ifa; struct sockaddr_dl *sdl; int i; + /* XXX: lock ifnet. */ TAILQ_FOREACH(ifp, &ifnet, if_link) { /* Walk the address list */ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { @@ -88,15 +98,17 @@ if (sdl != NULL && sdl->sdl_family == AF_LINK && sdl->sdl_type == IFT_ETHER) { /* Got a MAC address. */ - bcopy(LLADDR(sdl), addr->byte, IEEE_ADDR_LEN); + bcopy(LLADDR(sdl), node, UUID_NODE_LEN); + /* XXX: unlock ifnet. */ return; } } } + /* XXX: unlock ifnet. */ - for (i = 0; i < 3; i++) - addr->word[i] = (uint16_t)arc4random(); - addr->byte[0] |= 0x80; + for (i = 0; i < (UUID_NODE_LEN>>1); i++) + node[i] = (uint16_t)arc4random(); + *((uint8_t*)node) |= 0x80; } /* @@ -119,14 +131,14 @@ #ifndef _SYS_SYSPROTO_H_ struct uuidgen_args { - void *store; + struct uuid *store; int count; }; #endif int uuidgen(struct thread *td, struct uuidgen_args *uap) { - struct uuid uuid; + struct uuid_private uuid; uint64_t time; int error; @@ -139,39 +151,72 @@ if (uap->count < 1 || uap->count > 2048) return (EINVAL); - /* XXX validate accessibility to the whole of the UUID store? */ + /* XXX: pre-validate accessibility to the whole of the UUID store? */ mtx_lock(&uuid_mutex); - uuid_node(&uuid.node); + uuid_node(uuid.node); time = uuid_time(); - if (uuid_last.time == 0LL || - uuid_last.node.word[0] != uuid.node.word[0] || - uuid_last.node.word[1] != uuid.node.word[1] || - uuid_last.node.word[2] != uuid.node.word[2]) + if (uuid_last.time.ll == 0LL || uuid_last.node[0] != uuid.node[0] || + uuid_last.node[1] != uuid.node[1] || + uuid_last.node[2] != uuid.node[2]) uuid.seq = (uint16_t)arc4random() & 0x3fff; - else if (uuid_last.time >= time) + else if (uuid_last.time.ll >= time) uuid.seq = (uuid_last.seq + 1) & 0x3fff; else uuid.seq = uuid_last.seq; uuid_last = uuid; - uuid_last.time = (time + uap->count - 1) & ((1LL << 60) - 1LL); + uuid_last.time.ll = (time + uap->count - 1) & ((1LL << 60) - 1LL); mtx_unlock(&uuid_mutex); /* Set sequence and variant and deal with byte order. */ uuid.seq = htobe16(uuid.seq | 0x8000); - /* XXX this should copyout larger chunks at a time. */ + /* XXX: this should copyout larger chunks at a time. */ do { - uuid.time = htole64((time++ & ((1LL << 60) - 1LL)) | - (1LL << 60)); + /* Set time and version (=1) and deal with byte order. */ + uuid.time.x.low = (uint32_t)time; + uuid.time.x.mid = (uint16_t)(time >> 32); + uuid.time.x.hi = ((uint16_t)(time >> 48) & 0xfff) | (1 << 12); error = copyout(&uuid, uap->store, sizeof(uuid)); - uap->store = (struct uuid*)(uap->store) + 1; + uap->store++; uap->count--; + time++; } while (uap->count > 0 && !error); return (error); } + +int +snprintf_uuid(char *buf, size_t sz, struct uuid *uuid) +{ + struct uuid_private *id; + int cnt; + + id = (struct uuid_private *)uuid; + cnt = snprintf(buf, sz, "%08x-%04x-%04x-%04x-%04x%04x%04x", + id->time.x.low, id->time.x.mid, id->time.x.hi, be16toh(id->seq), + be16toh(id->node[0]), be16toh(id->node[1]), be16toh(id->node[2])); + return (cnt); +} + +int +printf_uuid(struct uuid *uuid) +{ + char buf[38]; + + snprintf_uuid(buf, sizeof(buf), uuid); + return (printf("%s", buf)); +} + +int +sbuf_printf_uuid(struct sbuf *sb, struct uuid *uuid) +{ + char buf[38]; + + snprintf_uuid(buf, sizeof(buf), uuid); + return (sbuf_printf(sb, "%s", buf)); +} ==== //depot/projects/ia64/sys/kern/syscalls.master#9 (text+ko) ==== @@ -562,4 +562,4 @@ 390 STD BSD { int kenv(int what, const char *name, char *value, \ int len); } 391 STD BSD { int lchflags(const char *path, int flags); } -392 STD BSD { int uuidgen(void *store, int count); } +392 STD BSD { int uuidgen(struct uuid *store, int count); } ==== //depot/projects/ia64/sys/sys/gpt.h#2 (text+ko) ==== @@ -41,7 +41,7 @@ uint64_t hdr_lba_alt; uint64_t hdr_lba_start; uint64_t hdr_lba_end; - uuid_t hdr_uuid; + struct uuid hdr_uuid; uint64_t hdr_lba_table; uint32_t hdr_entries; uint32_t hdr_entsz; @@ -49,8 +49,8 @@ }; struct gpt_ent { - uuid_t ent_type; - uuid_t ent_uuid; + struct uuid ent_type; + struct uuid ent_uuid; uint64_t ent_lba_start; uint64_t ent_lba_end; uint64_t ent_attr; @@ -59,20 +59,20 @@ }; #define GPT_ENT_TYPE_UNUSED \ - {0x00000000,0x0000,0x0000,0x0000,{0x00,0x00,0x00,0x00,0x00,0x00}} + {0x00000000,0x0000,0x0000,0x00,0x00,{0x00,0x00,0x00,0x00,0x00,0x00}} #define GPT_ENT_TYPE_EFI \ - {0xc12a7328,0xf81f,0x11d2,0xba4b,{0x00,0xa0,0xc9,0x3e,0xc9,0x3b}} + {0xc12a7328,0xf81f,0x11d2,0xba,0x4b,{0x00,0xa0,0xc9,0x3e,0xc9,0x3b}} #define GPT_ENT_TYPE_MBR \ - {0x024dee41,0x33e7,0x11d3,0x9d69,{0x00,0x08,0xc7,0x81,0xf3,0x9f}} + {0x024dee41,0x33e7,0x11d3,0x9d,0x69,{0x00,0x08,0xc7,0x81,0xf3,0x9f}} #define GPT_ENT_TYPE_FREEBSD \ - {0x516e7cb4,0x6ecf,0x11d6,0x8ff8,{0x00,0x02,0x2d,0x09,0x71,0x2b}} + {0x516e7cb4,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}} #define GPT_ENT_TYPE_FREEBSD_SWAP \ - {0x516e7cb5,0x6ecf,0x11d6,0x8ff8,{0x00,0x02,0x2d,0x09,0x71,0x2b}} + {0x516e7cb5,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}} #define GPT_ENT_TYPE_FREEBSD_UFS \ - {0x516e7cb6,0x6ecf,0x11d6,0x8ff8,{0x00,0x02,0x2d,0x09,0x71,0x2b}} + {0x516e7cb6,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}} #define GPT_ENT_TYPE_FREEBSD_UFS2 \ - {0x516e7cb7,0x6ecf,0x11d6,0x8ff8,{0x00,0x02,0x2d,0x09,0x71,0x2b}} + {0x516e7cb7,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}} #define GPT_ENT_TYPE_FREEBSD_VINUM \ - {0x516e7cb8,0x6ecf,0x11d6,0x8ff8,{0x00,0x02,0x2d,0x09,0x71,0x2b}} + {0x516e7cb8,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}} #endif /* _SYS_GPT_H_ */ ==== //depot/projects/ia64/sys/sys/sysproto.h#10 (text+ko) ==== @@ -1116,7 +1116,7 @@ char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; struct uuidgen_args { - char store_l_[PADL_(void *)]; void * store; char store_r_[PADR_(void *)]; + char store_l_[PADL_(struct uuid *)]; struct uuid * store; char store_r_[PADR_(struct uuid *)]; char count_l_[PADL_(int)]; int count; char count_r_[PADR_(int)]; }; int nosys(struct thread *, struct nosys_args *); ==== //depot/projects/ia64/sys/sys/uuid.h#2 (text+ko) ==== @@ -26,22 +26,43 @@ * $FreeBSD$ */ +#ifndef _SYS_UUID_H_ +#define _SYS_UUID_H_ + +/* Length of a node address (an IEEE 802 address). */ +#define _UUID_NODE_LEN 6 + /* * See also: - * http://www.opengroup.org/dce/info/draft-leach-uuids-guids-01.txt + * http://www.opengroup.org/dce/info/draft-leach-uuids-guids-01.txt + * http://www.opengroup.org/onlinepubs/009629399/apdxa.htm + * + * A DCE 1.1 compatible source representation of UUIDs. */ +struct uuid { + uint32_t time_low; + uint16_t time_mid; + uint16_t time_hi_and_version; + uint8_t clock_seq_hi_and_reserved; + uint8_t clock_seq_low; + uint8_t node[_UUID_NODE_LEN]; +}; -#ifndef _SYS_UUID_H_ -#define _SYS_UUID_H_ +#ifdef _KERNEL + +#define UUID_NODE_LEN _UUID_NODE_LEN + +int snprintf_uuid(char *, size_t, struct uuid *); +int printf_uuid(struct uuid *); +int sbuf_printf_uuid(struct sbuf *, struct uuid *); + +#else /* _KERNEL */ + +/* XXX namespace pollution? */ +typedef struct uuid uuid_t; -typedef struct { - uint32_t time_low; - uint16_t time_med; - uint16_t time_hi; - uint16_t seq; /* Big-endian. */ - uint8_t node[6]; -} uuid_t; +int uuidgen(struct uuid *, int); -int uuidgen(uuid_t *store, int count); +#endif /* _KERNEL */ #endif /* _SYS_UUID_H_ */ ==== //depot/projects/ia64/usr.bin/uuidgen/uuidgen.c#3 (text+ko) ==== @@ -47,9 +47,9 @@ void uuid_print(uuid_t *uuid) { - printf("%08x-%04x-%04x-%04x-", le32toh(uuid->time_low), - le16toh(uuid->time_med), le16toh(uuid->time_hi), - be16toh(uuid->seq)); + printf("%08x-%04x-%04x-%02x%02x-", uuid->time_low, uuid->time_mid, + uuid->time_hi_and_version, uuid->clock_seq_hi_and_reserved, + uuid->clock_seq_low); printf("%02x%02x%02x%02x%02x%02x\n", uuid->node[0], uuid->node[1], uuid->node[2], uuid->node[3], uuid->node[4], uuid->node[5]); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon May 27 21:44: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2D6037B401; Mon, 27 May 2002 21:43:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0968237B404 for ; Mon, 27 May 2002 21:43:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4S4hil07721 for perforce@freebsd.org; Mon, 27 May 2002 21:43:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Mon, 27 May 2002 21:43:44 -0700 (PDT) Message-Id: <200205280443.g4S4hil07721@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 11997 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11997 Change 11997 by marcel@marcel_nfs on 2002/05/27 21:43:09 Remove MCA specific GUID structures and definitions and switch to using . Replace GUID with UUID to be consistent. In sbin/mca/mca.c, print the UUID in its string representation, not its C declaration. Affected files ... ... //depot/projects/ia64/sbin/mca/mca.c#5 edit ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#39 edit ... //depot/projects/ia64/sys/ia64/ia64/mca.c#3 edit ... //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#16 edit ... //depot/projects/ia64/sys/ia64/include/mca.h#8 edit ... //depot/projects/ia64/sys/sys/uuid.h#3 edit Differences ... ==== //depot/projects/ia64/sbin/mca/mca.c#5 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include #include +#include /* * Hack to make this compile on non-ia64 machines. @@ -77,16 +78,14 @@ } static const char * -guid(struct mca_guid *g) +uuid(struct uuid *id) { static char buffer[64]; - char sub[32]; - sprintf(sub, "{%02x,%02x,%02x,%02x,%02x,%02x,%02x,%02x}", - g->data4[0], g->data4[1], g->data4[2], g->data4[3], - g->data4[4], g->data4[5], g->data4[6], g->data4[7]); - sprintf(buffer, "{%08lx,%04x,%04x,%s}", (long)g->data1, - g->data2, g->data3, sub); + sprintf(buffer, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + id->time_low, id->time_mid, id->time_hi_and_version, + id->clock_seq_hi_and_reserved, id->clock_seq_low, id->node[0], + id->node[1], id->node[2], id->node[3], id->node[4], id->node[5]); return (buffer); } @@ -109,7 +108,7 @@ BCD(rh->rh_time[MCA_RH_TIME_MIN]), BCD(rh->rh_time[MCA_RH_TIME_SEC])); if (rh->rh_flags & MCA_RH_FLAGS_PLATFORM_ID) - printf(" platform=%s\n", guid(&rh->rh_platform)); + printf(" platform=%s\n", uuid(&rh->rh_platform)); printf(" \n"); return (rh->rh_length); } @@ -221,7 +220,7 @@ printf(" status=0x%016llx\n", (long long)mem->mem_busdata); if (mem->mem_flags & MCA_MEM_FLAGS_OEM_ID) - printf(" oem=%s\n", guid(&mem->mem_oem_id)); + printf(" oem=%s\n", uuid(&mem->mem_oem_id)); /* TODO: Dump OEM data */ printf(" \n"); @@ -264,7 +263,7 @@ printf(" target=0x%016llx\n", (long long)pcibus->pcibus_tgtid); if (pcibus->pcibus_flags & MCA_PCIBUS_FLAGS_OEM_ID) - printf(" oem=%s\n", guid(&pcibus->pcibus_oem_id)); + printf(" oem=%s\n", uuid(&pcibus->pcibus_oem_id)); /* TODO: Dump OEM data */ printf(" \n"); @@ -315,31 +314,31 @@ static size_t show_section(struct mca_section_header *sh) { - static struct mca_guid guid_cpu = MCA_GUID_CPU; - static struct mca_guid guid_memory = MCA_GUID_MEMORY; - static struct mca_guid guid_sel = MCA_GUID_SEL; - static struct mca_guid guid_pci_bus = MCA_GUID_PCI_BUS; - static struct mca_guid guid_smbios = MCA_GUID_SMBIOS; - static struct mca_guid guid_pci_dev = MCA_GUID_PCI_DEV; - static struct mca_guid guid_generic = MCA_GUID_GENERIC; + static struct uuid uuid_cpu = MCA_UUID_CPU; + static struct uuid uuid_memory = MCA_UUID_MEMORY; + static struct uuid uuid_sel = MCA_UUID_SEL; + static struct uuid uuid_pci_bus = MCA_UUID_PCI_BUS; + static struct uuid uuid_smbios = MCA_UUID_SMBIOS; + static struct uuid uuid_pci_dev = MCA_UUID_PCI_DEV; + static struct uuid uuid_generic = MCA_UUID_GENERIC; printf("
\n"); - printf(" guid=%s\n", guid(&sh->sh_guid)); + printf(" uuid=%s\n", uuid(&sh->sh_uuid)); printf(" revision=%d.%d\n", BCD(sh->sh_major), BCD(sh->sh_minor)); - if (!memcmp(&sh->sh_guid, &guid_cpu, sizeof(guid_cpu))) - show_cpu((struct mca_cpu_record*)(sh + 1)); - else if (!memcmp(&sh->sh_guid, &guid_memory, sizeof(guid_memory))) - show_memory((struct mca_mem_record*)(sh + 1)); - else if (!memcmp(&sh->sh_guid, &guid_sel, sizeof(guid_sel))) + if (!memcmp(&sh->sh_uuid, &uuid_cpu, sizeof(uuid_cpu))) + show_cpu((void*)(sh + 1)); + else if (!memcmp(&sh->sh_uuid, &uuid_memory, sizeof(uuid_memory))) + show_memory((void*)(sh + 1)); + else if (!memcmp(&sh->sh_uuid, &uuid_sel, sizeof(uuid_sel))) show_sel(); - else if (!memcmp(&sh->sh_guid, &guid_pci_bus, sizeof(guid_pci_bus))) - show_pci_bus((struct mca_pcibus_record*)(sh + 1)); - else if (!memcmp(&sh->sh_guid, &guid_smbios, sizeof(guid_smbios))) + else if (!memcmp(&sh->sh_uuid, &uuid_pci_bus, sizeof(uuid_pci_bus))) + show_pci_bus((void*)(sh + 1)); + else if (!memcmp(&sh->sh_uuid, &uuid_smbios, sizeof(uuid_smbios))) show_smbios(); - else if (!memcmp(&sh->sh_guid, &guid_pci_dev, sizeof(guid_pci_dev))) - show_pci_dev((struct mca_pcidev_record*)(sh + 1)); - else if (!memcmp(&sh->sh_guid, &guid_generic, sizeof(guid_generic))) + else if (!memcmp(&sh->sh_uuid, &uuid_pci_dev, sizeof(uuid_pci_dev))) + show_pci_dev((void*)(sh + 1)); + else if (!memcmp(&sh->sh_uuid, &uuid_generic, sizeof(uuid_generic))) show_generic(); printf("
\n"); ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#39 (text+ko) ==== @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/ia64/sys/ia64/ia64/mca.c#3 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#16 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include ==== //depot/projects/ia64/sys/ia64/include/mca.h#8 (text+ko) ==== @@ -29,13 +29,6 @@ #ifndef _MACHINE_MCA_H_ #define _MACHINE_MCA_H_ -struct mca_guid { - uint32_t data1; - uint16_t data2; - uint16_t data3; - uint8_t data4[8]; -}; - struct mca_record_header { uint64_t rh_seqnr; /* Record id. */ uint8_t rh_major; /* BCD (=02). */ @@ -55,11 +48,11 @@ #define MCA_RH_TIME_MON 5 #define MCA_RH_TIME_YEAR 6 #define MCA_RH_TIME_CENT 7 - struct mca_guid rh_platform; /* XXX not really a GUID. */ + struct uuid rh_platform; }; struct mca_section_header { - struct mca_guid sh_guid; + struct uuid sh_uuid; uint8_t sh_major; /* BCD (=02). */ uint8_t sh_minor; /* BCD (=00). */ uint8_t sh_flags; @@ -163,7 +156,7 @@ uint64_t mem_rspid; uint64_t mem_tgtid; uint64_t mem_busdata; - struct mca_guid mem_oem_id; /* XXX not really a GUID. */ + struct uuid mem_oem_id; uint16_t mem_oem_length; /* Size of OEM data. */ /* N bytes of OEM platform data. */ }; @@ -191,7 +184,7 @@ uint64_t pcibus_reqid; uint64_t pcibus_rspid; uint64_t pcibus_tgtid; - struct mca_guid pcibus_oem_id; /* XXX not really a GUID. */ + struct uuid pcibus_oem_id; uint16_t pcibus_oem_length; /* Size of OEM data. */ /* N bytes of OEM platform data. */ }; @@ -228,20 +221,20 @@ uint64_t pcidev_reg_data; }; -#define MCA_GUID_CPU \ - {0xe429faf1,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_MEMORY \ - {0xe429faf2,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_SEL \ - {0xe429faf3,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_PCI_BUS \ - {0xe429faf4,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_SMBIOS \ - {0xe429faf5,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_PCI_DEV \ - {0xe429faf6,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_GENERIC \ - {0xe429faf7,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_CPU \ + {0xe429faf1,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_MEMORY \ + {0xe429faf2,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_SEL \ + {0xe429faf3,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_PCI_BUS \ + {0xe429faf4,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_SMBIOS \ + {0xe429faf5,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_PCI_DEV \ + {0xe429faf6,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_GENERIC \ + {0xe429faf7,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} #ifdef _KERNEL ==== //depot/projects/ia64/sys/sys/uuid.h#3 (text+ko) ==== @@ -52,6 +52,8 @@ #define UUID_NODE_LEN _UUID_NODE_LEN +struct sbuf; + int snprintf_uuid(char *, size_t, struct uuid *); int printf_uuid(struct uuid *); int sbuf_printf_uuid(struct sbuf *, struct uuid *); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 28 2:13: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD6DB37B40C; Tue, 28 May 2002 02:12:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 58D6337B419 for ; Tue, 28 May 2002 02:12:43 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4S9Cgc63347 for perforce@freebsd.org; Tue, 28 May 2002 02:12:42 -0700 (PDT) (envelope-from dfr@freebsd.org) Date: Tue, 28 May 2002 02:12:42 -0700 (PDT) Message-Id: <200205280912.g4S9Cgc63347@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson Subject: PERFORCE change 12010 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12010 Change 12010 by dfr@dfr_home on 2002/05/28 02:12:38 Put the __ElfType(Auxinfo) statement back. On further reflection, this is harmless since we define both Elf32_Auxinfo and Elf64_Auxinfo on ia64. Affected files ... ... //depot/projects/ia64/sys/ia64/include/elf.h#5 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/elf.h#5 (text+ko) ==== @@ -69,6 +69,8 @@ } a_un; } Elf64_Auxinfo; +__ElfType(Auxinfo); + /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 28 15: 9:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75D3737B400; Tue, 28 May 2002 15:07:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DEC6237B403 for ; Tue, 28 May 2002 15:07:18 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4SM7GB31940 for perforce@freebsd.org; Tue, 28 May 2002 15:07:16 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Tue, 28 May 2002 15:07:16 -0700 (PDT) Message-Id: <200205282207.g4SM7GB31940@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12028 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12028 Change 12028 by julian@julian_ref on 2002/05/28 15:06:31 Integrate to change 12027 Affected files ... ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#4 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.alpha#3 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.i386#3 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/freebsd-nat-stubs.c#1 branch ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/nm.h#3 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/tm.h#2 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/config.h#2 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c#9 integrate ... //depot/projects/kse/lib/libkvm/kvm.c#6 integrate ... //depot/projects/kse/lib/libkvm/kvm_sparc64.c#3 integrate ... //depot/projects/kse/sys/alpha/alpha/clock.c#6 integrate ... //depot/projects/kse/sys/alpha/alpha/support.s#6 integrate ... //depot/projects/kse/sys/alpha/include/runq.h#1 branch ... //depot/projects/kse/sys/boot/efi/libefi/copy.c#3 integrate ... //depot/projects/kse/sys/boot/efi/libefi/elf_freebsd.c#7 integrate ... //depot/projects/kse/sys/boot/ficl/sparc64/sysdep.c#1 branch ... //depot/projects/kse/sys/boot/ficl/sparc64/sysdep.h#1 branch ... //depot/projects/kse/sys/boot/forth/loader.4th#3 integrate ... //depot/projects/kse/sys/boot/forth/loader.conf#9 integrate ... //depot/projects/kse/sys/boot/forth/support.4th#3 integrate ... //depot/projects/kse/sys/boot/ia64/libski/copy.c#2 integrate ... //depot/projects/kse/sys/boot/ia64/libski/elf_freebsd.c#6 integrate ... //depot/projects/kse/sys/boot/pc98/boot2/Makefile#4 integrate ... //depot/projects/kse/sys/boot/pc98/boot2/serial_16550.S#4 integrate ... //depot/projects/kse/sys/boot/pc98/kgzldr/crt.s#2 integrate ... //depot/projects/kse/sys/boot/pc98/libpc98/Makefile#5 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_da.c#19 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_filio.c#6 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_ioctl.c#6 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_misc.c#14 integrate ... //depot/projects/kse/sys/conf/Makefile.sparc64#14 integrate ... //depot/projects/kse/sys/conf/NOTES#5 integrate ... //depot/projects/kse/sys/conf/files#33 integrate ... //depot/projects/kse/sys/conf/files.pc98#23 integrate ... //depot/projects/kse/sys/conf/files.sparc64#15 integrate ... //depot/projects/kse/sys/conf/kern.post.mk#10 integrate ... //depot/projects/kse/sys/conf/options#16 integrate ... //depot/projects/kse/sys/conf/options.pc98#17 integrate ... //depot/projects/kse/sys/crypto/rijndael/rijndael-api-fst.c#2 integrate ... //depot/projects/kse/sys/dev/aac/aac_debug.c#8 integrate ... //depot/projects/kse/sys/dev/aac/aacvar.h#11 integrate ... //depot/projects/kse/sys/dev/acpica/Osd/OsdInterrupt.c#5 integrate ... //depot/projects/kse/sys/dev/acpica/Osd/OsdSchedule.c#9 integrate ... //depot/projects/kse/sys/dev/acpica/Osd/OsdSynch.c#5 integrate ... //depot/projects/kse/sys/dev/acpica/acpi.c#23 integrate ... //depot/projects/kse/sys/dev/acpica/acpi_button.c#5 integrate ... //depot/projects/kse/sys/dev/acpica/acpi_cpu.c#10 integrate ... //depot/projects/kse/sys/dev/acpica/acpi_ec.c#11 integrate ... //depot/projects/kse/sys/dev/acpica/acpi_lid.c#5 integrate ... //depot/projects/kse/sys/dev/acpica/acpi_pcib.c#8 integrate ... //depot/projects/kse/sys/dev/acpica/acpi_powerres.c#8 integrate ... //depot/projects/kse/sys/dev/acpica/acpi_resource.c#10 integrate ... //depot/projects/kse/sys/dev/acpica/acpi_thermal.c#11 integrate ... //depot/projects/kse/sys/dev/acpica/acpi_timer.c#8 integrate ... //depot/projects/kse/sys/dev/aha/aha.c#2 integrate ... //depot/projects/kse/sys/dev/ahb/ahb.c#2 integrate ... //depot/projects/kse/sys/dev/ata/ata-disk.c#20 integrate ... //depot/projects/kse/sys/dev/ata/atapi-cd.c#16 integrate ... //depot/projects/kse/sys/dev/ata/atapi-fd.c#9 integrate ... //depot/projects/kse/sys/dev/bktr/bktr_core.c#5 integrate ... //depot/projects/kse/sys/dev/ccd/ccd.c#13 integrate ... //depot/projects/kse/sys/dev/em/if_em_phy.c#4 integrate ... //depot/projects/kse/sys/dev/gem/if_gem.c#4 integrate ... //depot/projects/kse/sys/dev/md/md.c#18 integrate ... //depot/projects/kse/sys/dev/ppbus/pps.c#8 integrate ... //depot/projects/kse/sys/dev/sound/pcm/feeder.c#5 integrate ... //depot/projects/kse/sys/dev/sound/pcm/sound.c#11 integrate ... //depot/projects/kse/sys/dev/twe/twe_freebsd.c#7 integrate ... //depot/projects/kse/sys/dev/usb/if_aue.c#11 integrate ... //depot/projects/kse/sys/dev/usb/if_auereg.h#4 integrate ... //depot/projects/kse/sys/dev/usb/ohci.c#16 integrate ... //depot/projects/kse/sys/dev/usb/uhci.c#18 integrate ... //depot/projects/kse/sys/dev/usb/usb_mem.h#2 integrate ... //depot/projects/kse/sys/dev/usb/usbdevs#18 integrate ... //depot/projects/kse/sys/dev/usb/usbdevs.h#18 integrate ... //depot/projects/kse/sys/dev/usb/usbdevs_data.h#18 integrate ... //depot/projects/kse/sys/dev/usb/usbdi.c#10 integrate ... //depot/projects/kse/sys/dev/vinum/vinumconfig.c#6 integrate ... //depot/projects/kse/sys/dev/vinum/vinumioctl.c#8 integrate ... //depot/projects/kse/sys/dev/vinum/vinumrequest.c#6 integrate ... //depot/projects/kse/sys/dev/vinum/vinumrevive.c#4 integrate ... //depot/projects/kse/sys/dev/vinum/vinumstate.c#2 integrate ... //depot/projects/kse/sys/dev/wi/wi_hostap.c#3 integrate ... //depot/projects/kse/sys/dev/wi/wi_hostap.h#2 integrate ... //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#12 integrate ... //depot/projects/kse/sys/fs/nullfs/null.h#2 integrate ... //depot/projects/kse/sys/fs/nullfs/null_vfsops.c#5 integrate ... //depot/projects/kse/sys/fs/nullfs/null_vnops.c#7 integrate ... //depot/projects/kse/sys/fs/portalfs/portal_vnops.c#9 integrate ... //depot/projects/kse/sys/fs/unionfs/union.h#5 integrate ... //depot/projects/kse/sys/fs/unionfs/union_vfsops.c#9 integrate ... //depot/projects/kse/sys/geom/geom.h#5 integrate ... //depot/projects/kse/sys/geom/geom_aes.c#1 branch ... //depot/projects/kse/sys/geom/geom_bsd.c#5 integrate ... //depot/projects/kse/sys/geom/geom_dev.c#5 integrate ... //depot/projects/kse/sys/geom/geom_disk.c#5 integrate ... //depot/projects/kse/sys/geom/geom_dump.c#5 integrate ... //depot/projects/kse/sys/geom/geom_event.c#4 integrate ... //depot/projects/kse/sys/geom/geom_gpt.c#1 branch ... //depot/projects/kse/sys/geom/geom_io.c#4 integrate ... //depot/projects/kse/sys/geom/geom_mbr.c#4 integrate ... //depot/projects/kse/sys/geom/geom_pc98.c#3 integrate ... //depot/projects/kse/sys/geom/geom_slice.c#5 integrate ... //depot/projects/kse/sys/geom/geom_subr.c#5 integrate ... //depot/projects/kse/sys/geom/geom_sunlabel.c#3 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_mount.h#2 integrate ... //depot/projects/kse/sys/gnu/ext2fs/ext2_vfsops.c#10 integrate ... //depot/projects/kse/sys/i386/acpica/acpi_wakeup.c#5 integrate ... //depot/projects/kse/sys/i386/conf/GENERIC#17 integrate ... //depot/projects/kse/sys/i386/i386/support.s#7 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate ... //depot/projects/kse/sys/i386/include/bus_pc98.h#6 integrate ... //depot/projects/kse/sys/i386/include/cpufunc.h#10 integrate ... //depot/projects/kse/sys/i386/include/runq.h#1 branch ... //depot/projects/kse/sys/i386/isa/rc.c#6 integrate ... //depot/projects/kse/sys/i386/linux/linux_ptrace.c#2 integrate ... //depot/projects/kse/sys/i4b/capi/iavc/iavc_isa.c#5 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_ctl.c#5 integrate ... //depot/projects/kse/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#4 integrate ... //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate ... //depot/projects/kse/sys/ia64/acpica/madt.c#6 integrate ... //depot/projects/kse/sys/ia64/conf/GENERIC#13 integrate ... //depot/projects/kse/sys/ia64/ia64/interrupt.c#12 integrate ... //depot/projects/kse/sys/ia64/ia64/machdep.c#32 integrate ... //depot/projects/kse/sys/ia64/ia64/mem.c#7 integrate ... //depot/projects/kse/sys/ia64/ia64/mp_machdep.c#13 integrate ... //depot/projects/kse/sys/ia64/ia64/ski.c#3 integrate ... //depot/projects/kse/sys/ia64/ia64/trap.c#19 integrate ... //depot/projects/kse/sys/ia64/ia64/unwind.c#4 integrate ... //depot/projects/kse/sys/ia64/include/atomic.h#2 integrate ... //depot/projects/kse/sys/ia64/include/cpu.h#8 integrate ... //depot/projects/kse/sys/ia64/include/cpufunc.h#8 integrate ... //depot/projects/kse/sys/ia64/include/db_machdep.h#6 integrate ... //depot/projects/kse/sys/ia64/include/ia64_cpu.h#9 integrate ... //depot/projects/kse/sys/ia64/include/mca.h#3 integrate ... //depot/projects/kse/sys/ia64/include/param.h#7 integrate ... //depot/projects/kse/sys/ia64/include/pcb.h#5 integrate ... //depot/projects/kse/sys/ia64/include/reg.h#7 integrate ... //depot/projects/kse/sys/ia64/include/runq.h#1 branch ... //depot/projects/kse/sys/ia64/include/vmparam.h#3 integrate ... //depot/projects/kse/sys/isofs/cd9660/cd9660_vnops.c#6 integrate ... //depot/projects/kse/sys/kern/init_sysent.c#18 integrate ... //depot/projects/kse/sys/kern/kern_descrip.c#30 integrate ... //depot/projects/kse/sys/kern/kern_exit.c#50 integrate ... //depot/projects/kse/sys/kern/kern_malloc.c#11 integrate ... //depot/projects/kse/sys/kern/kern_mutex.c#26 integrate ... //depot/projects/kse/sys/kern/kern_switch.c#46 integrate ... //depot/projects/kse/sys/kern/kern_synch.c#63 integrate ... //depot/projects/kse/sys/kern/kern_uuid.c#1 branch ... //depot/projects/kse/sys/kern/subr_witness.c#24 integrate ... //depot/projects/kse/sys/kern/sys_socket.c#7 integrate ... //depot/projects/kse/sys/kern/syscalls.c#18 integrate ... //depot/projects/kse/sys/kern/syscalls.master#17 integrate ... //depot/projects/kse/sys/kern/tty.c#24 integrate ... //depot/projects/kse/sys/kern/uipc_domain.c#4 integrate ... //depot/projects/kse/sys/kern/uipc_mbuf2.c#4 integrate ... //depot/projects/kse/sys/kern/uipc_socket.c#16 integrate ... //depot/projects/kse/sys/kern/uipc_socket2.c#15 integrate ... //depot/projects/kse/sys/kern/uipc_syscalls.c#14 integrate ... //depot/projects/kse/sys/kern/uipc_usrreq.c#18 integrate ... //depot/projects/kse/sys/kern/vfs_aio.c#26 integrate ... //depot/projects/kse/sys/kern/vfs_syscalls.c#27 integrate ... //depot/projects/kse/sys/net/if.c#17 integrate ... //depot/projects/kse/sys/net/if.h#10 integrate ... //depot/projects/kse/sys/net/if_disc.c#4 integrate ... //depot/projects/kse/sys/net/if_ef.c#5 integrate ... //depot/projects/kse/sys/net/if_faith.c#10 integrate ... //depot/projects/kse/sys/net/if_gif.c#11 integrate ... //depot/projects/kse/sys/net/if_loop.c#8 integrate ... //depot/projects/kse/sys/net/if_stf.c#12 integrate ... //depot/projects/kse/sys/net/if_vlan.c#8 integrate ... //depot/projects/kse/sys/net/raw_cb.c#3 integrate ... //depot/projects/kse/sys/net/raw_usrreq.c#7 integrate ... //depot/projects/kse/sys/net/rtsock.c#15 integrate ... //depot/projects/kse/sys/netatalk/aarp.c#2 integrate ... //depot/projects/kse/sys/netatalk/ddp_input.c#4 integrate ... //depot/projects/kse/sys/netatalk/ddp_usrreq.c#8 integrate ... //depot/projects/kse/sys/netatm/atm_aal5.c#6 integrate ... //depot/projects/kse/sys/netatm/atm_socket.c#5 integrate ... //depot/projects/kse/sys/netatm/ipatm/ipatm_if.c#4 integrate ... //depot/projects/kse/sys/netatm/ipatm/ipatm_load.c#3 integrate ... //depot/projects/kse/sys/netatm/ipatm/ipatm_var.h#3 integrate ... //depot/projects/kse/sys/netatm/ipatm/ipatm_vcm.c#3 integrate ... //depot/projects/kse/sys/netatm/sigpvc/sigpvc_if.c#4 integrate ... //depot/projects/kse/sys/netatm/sigpvc/sigpvc_subr.c#2 integrate ... //depot/projects/kse/sys/netatm/spans/spans_arp.c#4 integrate ... //depot/projects/kse/sys/netatm/spans/spans_cls.c#4 integrate ... //depot/projects/kse/sys/netatm/spans/spans_if.c#4 integrate ... //depot/projects/kse/sys/netatm/spans/spans_msg.c#4 integrate ... //depot/projects/kse/sys/netatm/spans/spans_proto.c#4 integrate ... //depot/projects/kse/sys/netatm/spans/spans_subr.c#2 integrate ... //depot/projects/kse/sys/netatm/spans/spans_var.h#4 integrate ... //depot/projects/kse/sys/netgraph/ng_base.c#6 integrate ... //depot/projects/kse/sys/netgraph/ng_ksocket.c#14 integrate ... //depot/projects/kse/sys/netgraph/ng_parse.c#7 integrate ... //depot/projects/kse/sys/netgraph/ng_socket.c#10 integrate ... //depot/projects/kse/sys/netinet/accf_data.c#3 integrate ... //depot/projects/kse/sys/netinet/accf_http.c#3 integrate ... //depot/projects/kse/sys/netinet/if_atm.c#3 integrate ... //depot/projects/kse/sys/netinet/in_pcb.c#14 integrate ... //depot/projects/kse/sys/netinet/ip_divert.c#11 integrate ... //depot/projects/kse/sys/netinet/ip_input.c#20 integrate ... //depot/projects/kse/sys/netinet/ip_mroute.c#9 integrate ... //depot/projects/kse/sys/netinet/ip_output.c#22 integrate ... //depot/projects/kse/sys/netinet/raw_ip.c#12 integrate ... //depot/projects/kse/sys/netinet/tcp_input.c#18 integrate ... //depot/projects/kse/sys/netinet/tcp_output.c#6 integrate ... //depot/projects/kse/sys/netinet/tcp_subr.c#11 integrate ... //depot/projects/kse/sys/netinet/tcp_timer.c#4 integrate ... //depot/projects/kse/sys/netinet/tcp_usrreq.c#8 integrate ... //depot/projects/kse/sys/netinet/udp_usrreq.c#12 integrate ... //depot/projects/kse/sys/netinet6/icmp6.c#6 integrate ... //depot/projects/kse/sys/netinet6/in6.h#6 integrate ... //depot/projects/kse/sys/netinet6/in6_pcb.c#12 integrate ... //depot/projects/kse/sys/netinet6/in6_src.c#7 integrate ... //depot/projects/kse/sys/netinet6/ip6_input.c#9 integrate ... //depot/projects/kse/sys/netinet6/ip6_mroute.c#6 integrate ... //depot/projects/kse/sys/netinet6/raw_ip6.c#10 integrate ... //depot/projects/kse/sys/netinet6/udp6_usrreq.c#10 integrate ... //depot/projects/kse/sys/netipx/ipx_pcb.c#6 integrate ... //depot/projects/kse/sys/netipx/ipx_usrreq.c#7 integrate ... //depot/projects/kse/sys/netipx/spx_usrreq.c#8 integrate ... //depot/projects/kse/sys/netkey/key.c#13 integrate ... //depot/projects/kse/sys/netkey/keysock.c#8 integrate ... //depot/projects/kse/sys/netnatm/natm.c#6 integrate ... //depot/projects/kse/sys/netncp/ncp_sock.c#2 integrate ... //depot/projects/kse/sys/netns/idp_usrreq.c#3 integrate ... //depot/projects/kse/sys/netns/ns.c#2 integrate ... //depot/projects/kse/sys/netns/ns_pcb.c#3 integrate ... //depot/projects/kse/sys/netns/spp_usrreq.c#2 integrate ... //depot/projects/kse/sys/netsmb/smb_iod.c#5 integrate ... //depot/projects/kse/sys/netsmb/smb_trantcp.c#7 integrate ... //depot/projects/kse/sys/nfsclient/bootp_subr.c#9 integrate ... //depot/projects/kse/sys/nfsclient/nfs_socket.c#11 integrate ... //depot/projects/kse/sys/nfsserver/nfs_srvsock.c#6 integrate ... //depot/projects/kse/sys/powerpc/include/cpu.h#9 integrate ... //depot/projects/kse/sys/powerpc/include/frame.h#5 integrate ... //depot/projects/kse/sys/powerpc/include/powerpc.h#3 integrate ... //depot/projects/kse/sys/powerpc/include/runq.h#1 branch ... //depot/projects/kse/sys/powerpc/powerpc/copyinout.c#4 integrate ... //depot/projects/kse/sys/powerpc/powerpc/machdep.c#19 integrate ... //depot/projects/kse/sys/powerpc/powerpc/ofw_machdep.c#3 integrate ... //depot/projects/kse/sys/powerpc/powerpc/pmap.c#16 integrate ... //depot/projects/kse/sys/powerpc/powerpc/trap.c#13 integrate ... //depot/projects/kse/sys/powerpc/powerpc/trap_subr.S#3 integrate ... //depot/projects/kse/sys/powerpc/powerpc/vm_machdep.c#11 integrate ... //depot/projects/kse/sys/security/lomac/kernel_interface.c#3 integrate ... //depot/projects/kse/sys/security/lomac/kernel_socket.c#7 integrate ... //depot/projects/kse/sys/sparc64/include/asmacros.h#10 integrate ... //depot/projects/kse/sys/sparc64/include/cache.h#5 integrate ... //depot/projects/kse/sys/sparc64/include/intr_machdep.h#8 integrate ... //depot/projects/kse/sys/sparc64/include/pcpu.h#5 integrate ... //depot/projects/kse/sys/sparc64/include/runq.h#1 branch ... //depot/projects/kse/sys/sparc64/include/smp.h#7 integrate ... //depot/projects/kse/sys/sparc64/include/tlb.h#10 integrate ... //depot/projects/kse/sys/sparc64/include/tsb.h#9 integrate ... //depot/projects/kse/sys/sparc64/include/tte.h#9 integrate ... //depot/projects/kse/sys/sparc64/sparc64/cache.c#5 integrate ... //depot/projects/kse/sys/sparc64/sparc64/exception.s#22 integrate ... //depot/projects/kse/sys/sparc64/sparc64/genassym.c#24 integrate ... //depot/projects/kse/sys/sparc64/sparc64/intr_machdep.c#11 integrate ... //depot/projects/kse/sys/sparc64/sparc64/machdep.c#30 integrate ... //depot/projects/kse/sys/sparc64/sparc64/mp_exception.s#3 integrate ... //depot/projects/kse/sys/sparc64/sparc64/mp_machdep.c#7 integrate ... //depot/projects/kse/sys/sparc64/sparc64/nexus.c#4 integrate ... //depot/projects/kse/sys/sparc64/sparc64/pmap.c#26 integrate ... //depot/projects/kse/sys/sparc64/sparc64/pv.c#12 integrate ... //depot/projects/kse/sys/sparc64/sparc64/support.s#11 integrate ... //depot/projects/kse/sys/sparc64/sparc64/tlb.c#1 branch ... //depot/projects/kse/sys/sparc64/sparc64/tsb.c#12 integrate ... //depot/projects/kse/sys/sys/cdefs.h#14 integrate ... //depot/projects/kse/sys/sys/eventhandler.h#6 integrate ... //depot/projects/kse/sys/sys/gpt.h#1 branch ... //depot/projects/kse/sys/sys/iconv.h#3 integrate ... //depot/projects/kse/sys/sys/mount.h#10 integrate ... //depot/projects/kse/sys/sys/mutex.h#20 integrate ... //depot/projects/kse/sys/sys/runq.h#6 integrate ... //depot/projects/kse/sys/sys/smp.h#7 integrate ... //depot/projects/kse/sys/sys/socketvar.h#18 integrate ... //depot/projects/kse/sys/sys/syscall.h#18 integrate ... //depot/projects/kse/sys/sys/syscall.mk#18 integrate ... //depot/projects/kse/sys/sys/sysproto.h#22 integrate ... //depot/projects/kse/sys/sys/systm.h#23 integrate ... //depot/projects/kse/sys/sys/tty.h#7 integrate ... //depot/projects/kse/sys/sys/uuid.h#1 branch ... //depot/projects/kse/sys/sys/wait.h#3 integrate ... //depot/projects/kse/sys/vm/uma_core.c#6 integrate ... //depot/projects/kse/sys/vm/vm_contig.c#6 integrate ... //depot/projects/kse/sys/vm/vm_fault.c#11 integrate ... //depot/projects/kse/sys/vm/vm_kern.h#2 integrate ... //depot/projects/kse/sys/vm/vm_map.c#17 integrate ... //depot/projects/kse/sys/vm/vm_map.h#11 integrate ... //depot/projects/kse/sys/vm/vm_mmap.c#14 integrate ... //depot/projects/kse/sys/vm/vm_page.h#7 integrate Differences ... ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#4 (text+ko) ==== @@ -1,13 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.54 2002/03/23 17:15:48 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.56 2002/05/19 18:25:40 obrien Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils -.if ${MACHINE_ARCH} == "i386" -CFLAGS+= -Dprint_insn_i386=print_insn_i386_att -.endif - PROG= gdb XSRCS= annotate.c ax-general.c ax-gdb.c bcache.c blockframe.c \ breakpoint.c buildsym.c c-exp.y c-lang.c c-typeprint.c \ @@ -29,13 +25,15 @@ SRCS= init.c ${XSRCS} SRCS+= wait.h -.if exists(${.CURDIR}/Makefile.${MACHINE_ARCH}) -.include "${.CURDIR}/Makefile.${MACHINE_ARCH}" +.if exists(${.CURDIR}/Makefile.${TARGET_ARCH}) +.include "${.CURDIR}/Makefile.${TARGET_ARCH}" .endif WARNS= 0 -#CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils -CFLAGS+= -I${.CURDIR}/${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +CFLAGS+= -DCROSS_COMPILE=1 +.endif +CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd CFLAGS+= -I${GDBDIR}/gdb ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.alpha#3 (text+ko) ==== @@ -1,13 +1,16 @@ -# -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.4 2002/03/16 19:33:22 obrien Exp $ -# +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.5 2002/05/18 04:59:56 obrien Exp $ + +.PATH: ${.CURDIR}/alpha -XSRCS+= freebsd-nat.c alpha-tdep.c kvm-fbsd.c +.if ${TARGET_ARCH} == ${MACHINE_ARCH} +XSRCS+= freebsd-nat.c +.else +XSRCS+= freebsd-nat-stubs.c +.endif +XSRCS+= alpha-tdep.c kvm-fbsd.c LDADD+= -lkvm findvar%UAfix.c: findvar.c sed -e \ 's,char registers[REGISTER_BYTES + /* SLOP */ 256];,char registers[REGISTER_BYTES + /* SLOP */ 256] __attribute__ ((aligned (8)));,g' \ ${.ALLSRC} >${.TARGET} - -.PATH: ${.CURDIR}/alpha ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.i386#3 (text+ko) ==== @@ -1,8 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.3 2002/03/16 19:33:22 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.4 2002/05/18 04:59:56 obrien Exp $ + +.PATH: ${.CURDIR}/i386 + +XSRCS+= freebsd-nat.c i386-tdep.c i387-tdep.c kvm-fbsd.c -XSRCS+= freebsd-nat.c i386-tdep.c i387-tdep.c kvm-fbsd.c +CFLAGS+= -Dprint_insn_i386=print_insn_i386_att findvar%UAfix.c: findvar.c ln -sf ${.ALLSRC} ${.TARGET} - -.PATH: ${.CURDIR}/i386 ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/nm.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. This routine returns true on success */ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/alpha/nm.h,v 1.3 2002/04/11 20:42:13 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/alpha/nm.h,v 1.4 2002/05/18 04:59:56 obrien Exp $ */ #include @@ -57,11 +57,10 @@ /* Support for shared libraries. */ #include "solib.h" +#include "elf/common.h" -#ifdef __ELF__ #define SVR4_SHARED_LIBS #define TARGET_ELF64 -#endif /* This is a lie. It's actually in stdio.h. */ ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/tm.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/alpha/tm.h,v 1.3 2000/04/29 09:03:48 dfr Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/alpha/tm.h,v 1.4 2002/05/18 04:59:56 obrien Exp $ */ /* Definitions to make GDB run on an Alpha box under FreeBSD. The definitions here are used when the _target_ system is running Linux. Copyright 1996 Free Software Foundation, Inc. @@ -27,6 +27,9 @@ #define S0_REGNUM (T7_REGNUM+1) #endif +#ifndef VM_MIN_ADDRESS +#define VM_MIN_ADDRESS (0) +#endif /* Number of traps that happen between exec'ing the shell to run an inferior, and when we finally get to the inferior code. This is 2 ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/config.h#2 (text+ko) ==== @@ -1,3 +1,5 @@ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/config.h,v 1.4 2002/05/18 04:59:56 obrien Exp $ */ + /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -319,7 +321,9 @@ /* #undef HAVE_PRRUN_T */ /* Define if has gregset_t. */ +#ifndef CROSS_COMPILE #define HAVE_GREGSET_T 1 +#endif /* Define if has fpregset_t. */ #define HAVE_FPREGSET_T 1 ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c#9 (text+ko) ==== @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c,v 1.35 2002/02/08 04:17:33 peter Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c,v 1.36 2002/05/27 13:08:08 bde Exp $ */ #include "defs.h" @@ -607,7 +607,7 @@ } physrd (cfd, ksym_lookup ("IdlePTD") - KERNOFF, (char*)&sbr, sizeof sbr); - printf ("IdlePTD at phsyical address 0x%08lx\n", (unsigned long)sbr); + printf ("IdlePTD at physical address 0x%08lx\n", (unsigned long)sbr); curpcb = kvtophys(cfd, pcpu + PCPU_OFFSET (curpcb)); physrd (cfd, curpcb, (char*)&curpcb, sizeof curpcb); ==== //depot/projects/kse/lib/libkvm/kvm.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.21 2002/03/21 23:52:45 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm.c,v 1.22 2002/05/28 17:01:04 alfred Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -81,11 +81,7 @@ return (kd->errbuf); } -#if __STDC__ #include -#else -#include -#endif /* * Report an error using printf style arguments. "program" is kd->program @@ -94,22 +90,11 @@ * generate tons of error messages when trying to access bogus pointers). */ void -#if __STDC__ _kvm_err(kvm_t *kd, const char *program, const char *fmt, ...) -#else -_kvm_err(kd, program, fmt, va_alist) - kvm_t *kd; - char *program, *fmt; - va_dcl -#endif { va_list ap; -#ifdef __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif if (program != NULL) { (void)fprintf(stderr, "%s: ", program); (void)vfprintf(stderr, fmt, ap); @@ -122,23 +107,12 @@ } void -#if __STDC__ _kvm_syserr(kvm_t *kd, const char *program, const char *fmt, ...) -#else -_kvm_syserr(kd, program, fmt, va_alist) - kvm_t *kd; - char *program, *fmt; - va_dcl -#endif { va_list ap; int n; -#if __STDC__ va_start(ap, fmt); -#else - va_start(ap); -#endif if (program != NULL) { (void)fprintf(stderr, "%s: ", program); (void)vfprintf(stderr, fmt, ap); ==== //depot/projects/kse/lib/libkvm/kvm_sparc64.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc64.c,v 1.2 2001/12/29 06:43:36 jake Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_sparc64.c,v 1.3 2002/05/21 02:22:49 jake Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -138,10 +138,10 @@ _kvm_syserr(kd, kd->program, "_kvm_vatop: read"); goto invalid; } - if (!tte_match(tte, va)) + if (!tte_match(&tte, va)) goto invalid; - *pa = TD_PA(tte.tte_data) + offset; + *pa = TTE_GET_PA(&tte) + offset; return (PAGE_SIZE - offset); invalid: ==== //depot/projects/kse/sys/alpha/alpha/clock.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.30 2002/05/16 21:21:16 trhodes Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.31 2002/05/26 11:23:00 des Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* @@ -210,6 +210,8 @@ out: #ifdef EVCNT_COUNTERS evcnt_attach(dev, "intr", &clock_intr_evcnt); +#else + /* nothing */ ; #endif } ==== //depot/projects/kse/sys/alpha/alpha/support.s#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.9 2001/12/11 23:33:38 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.10 2002/05/26 16:03:12 dfr Exp $ */ /* @@ -65,6 +65,7 @@ */ LEAF(suword, 1) + XLEAF(suword64, 1) LDGP(pv) ldiq t0, VM_MAXUSER_ADDRESS /* verify address validity */ @@ -110,6 +111,7 @@ END(subyte) LEAF(fuword, 1) + XLEAF(fuword64, 1) LDGP(pv) ldiq t0, VM_MAXUSER_ADDRESS /* verify address validity */ ==== //depot/projects/kse/sys/boot/efi/libefi/copy.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/libefi/copy.c,v 1.3 2001/09/14 08:26:00 dfr Exp $"; + "$FreeBSD: src/sys/boot/efi/libefi/copy.c,v 1.4 2002/05/19 04:42:18 marcel Exp $"; #endif /* not lint */ /* @@ -37,6 +37,7 @@ #include #include #include +#include int efi_copyin(void *src, vm_offset_t dest, size_t len) ==== //depot/projects/kse/sys/boot/efi/libefi/elf_freebsd.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/libefi/elf_freebsd.c,v 1.7 2002/04/19 06:43:09 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/efi/libefi/elf_freebsd.c,v 1.8 2002/05/19 04:42:18 marcel Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -83,7 +83,9 @@ #include #include #include +#include #include +#include #include #include ==== //depot/projects/kse/sys/boot/forth/loader.4th#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/sys/boot/forth/loader.4th,v 1.23 2001/12/11 00:49:34 jhb Exp $ +\ $FreeBSD: src/sys/boot/forth/loader.4th,v 1.24 2002/05/24 02:28:58 gordon Exp $ s" arch-alpha" environment? [if] [if] s" loader_version" environment? [if] @@ -134,6 +134,7 @@ : start ( -- ) ( throws: abort & user-defined ) s" /boot/defaults/loader.conf" initialize include_conf_files + include_nextboot_file \ Will *NOT* try to load kernel and modules if no configuration file \ was succesfully loaded! any_conf_read? if @@ -151,6 +152,7 @@ : initialize ( -- flag ) s" /boot/defaults/loader.conf" initialize include_conf_files + include_nextboot_file any_conf_read? ; ==== //depot/projects/kse/sys/boot/forth/loader.conf#9 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.58 2002/04/26 22:31:18 wes Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.59 2002/05/24 02:28:58 gordon Exp $ ############################################################## ### Basic configuration options ############################ @@ -22,7 +22,9 @@ userconfig_script_name="/boot/kernel.conf" userconfig_script_type="userconfig_script" -loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local /boot/nextboot.conf" +loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local" +nextboot_conf="/boot/nextboot.conf" +nextboot_enable="NO" verbose_loading="NO" # Set to YES for verbose loader output ==== //depot/projects/kse/sys/boot/forth/support.4th#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/sys/boot/forth/support.4th,v 1.14 2001/12/11 00:49:34 jhb Exp $ +\ $FreeBSD: src/sys/boot/forth/support.4th,v 1.15 2002/05/24 02:28:58 gordon Exp $ \ Loader.rc support functions: \ @@ -208,10 +208,12 @@ \ Global variables string conf_files +string nextboot_conf_file string password create module_options sizeof module.next allot 0 module_options ! create last_module_option sizeof module.next allot 0 last_module_option ! 0 value verbose? +0 value nextboot? \ Support string functions @@ -660,6 +662,14 @@ s" loader_conf_files" assignment_type? ; +: nextboot_flag? + s" nextboot_enable" assignment_type? +; + +: nextboot_conf? + s" nextboot_conf" assignment_type? +; + : verbose_flag? s" verbose_loading" assignment_type? ; @@ -713,6 +723,19 @@ conf_files .len ! conf_files .addr ! ; +: set_nextboot_conf + nextboot_conf_file .addr @ ?dup if + free-memory + then + value_buffer .addr @ c@ [char] " = if + value_buffer .addr @ char+ value_buffer .len @ 2 chars - + else + value_buffer .addr @ value_buffer .len @ + then + strdup + nextboot_conf_file .len ! nextboot_conf_file .addr ! +; + : append_to_module_options_list ( addr -- ) module_options @ 0= if dup module_options ! @@ -863,6 +886,10 @@ then ; +: set_nextboot_flag + yes_value? to nextboot? +; + : set_verbose yes_value? to verbose? ; @@ -890,6 +917,8 @@ : process_assignment name_buffer .len @ 0= if exit then loader_conf_files? if set_conf_files exit then + nextboot_flag? if set_nextboot_flag exit then + nextboot_conf? if set_nextboot_conf exit then verbose_flag? if set_verbose exit then execute? if execute_command exit then password? if set_password exit then @@ -939,6 +968,19 @@ repeat ; +: peek_file + 0 to end_of_file? + reset_line_reading + O_RDONLY fopen fd ! + fd @ -1 = if open_error throw then + reset_assignment_buffers + read_line + get_assignment + ['] process_assignment catch + ['] free_buffers catch + fd @ fclose +; + only forth also support-functions definitions \ Interface to loading conf files @@ -1101,6 +1143,29 @@ repeat ; +: get_nextboot_conf_file ( -- addr len ) + nextboot_conf_file .addr @ nextboot_conf_file .len @ strdup +; + +: rewrite_nextboot_file ( -- ) + get_nextboot_conf_file + O_WRONLY fopen fd ! + fd @ -1 = if open_error throw then + fd @ s' nextboot_enable="NO" ' fwrite + fd @ fclose +; + +: include_nextboot_file + get_nextboot_conf_file + ['] peek_file catch + nextboot? if + get_nextboot_conf_file + ['] load_conf catch + process_conf_errors + ['] rewrite_nextboot_file catch + then +; + \ Module loading functions : load_module? ==== //depot/projects/kse/sys/boot/ia64/libski/copy.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/libski/copy.c,v 1.1 2001/09/12 08:34:26 dfr Exp $"; + "$FreeBSD: src/sys/boot/ia64/libski/copy.c,v 1.2 2002/05/19 04:42:18 marcel Exp $"; #endif /* not lint */ /* @@ -37,6 +37,7 @@ #include #include +#include int ski_copyin(void *src, vm_offset_t dest, size_t len) ==== //depot/projects/kse/sys/boot/ia64/libski/elf_freebsd.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/ia64/libski/elf_freebsd.c,v 1.5 2002/03/30 23:52:34 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/ia64/libski/elf_freebsd.c,v 1.6 2002/05/19 04:42:18 marcel Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -83,6 +83,8 @@ #include #include #include +#include +#include #include "bootstrap.h" #include "libski.h" ==== //depot/projects/kse/sys/boot/pc98/boot2/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.8 2002/05/14 12:34:03 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.9 2002/05/26 10:11:17 n_hibma Exp $ # PROG= boot @@ -27,7 +27,7 @@ # feature not implemented BOOT_COMCONSOLE_SPEED?=9600 -CFLAGS+= -DCONSPEED=${BOOT_COMCONSOLE_SPEED} +CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} # Enable code to take the default boot string from a fixed location on the # disk. See nextboot(8) and README.386BSD for more info. ==== //depot/projects/kse/sys/boot/pc98/boot2/serial_16550.S#4 (text+ko) ==== @@ -24,7 +24,7 @@ * the rights to redistribute these changes. * * from: Mach, Revision 2.2 92/04/04 11:34:26 rpd - * $FreeBSD: src/sys/boot/pc98/boot2/serial_16550.S,v 1.3 2002/02/01 14:48:44 nyan Exp $ + * $FreeBSD: src/sys/boot/pc98/boot2/serial_16550.S,v 1.4 2002/05/26 10:11:17 n_hibma Exp $ */ /* @@ -80,7 +80,7 @@ * BIOS support is duplicated here. * * The base address and speed for the i/o port are passed from the - * Makefile in the COMCONSOLE and CONSPEED preprocessor macros. The + * Makefile in the COMCONSOLE and COMSPEED preprocessor macros. The * line control parameters are currently hard-coded to 8 bits, no * parity, 1 stop bit (8N1). This can be changed in init_serial(). */ @@ -143,7 +143,7 @@ /* * void init_serial(void); - * Initialize port COMCONSOLE to speed CONSPEED, line settings 8N1. + * Initialize port COMCONSOLE to speed COMSPEED, line settings 8N1. */ ENTRY(init_serial) movl $COMCONSOLE + 3, %edx # line control reg @@ -151,10 +151,10 @@ outb %al, %dx # enable DLAB subl $3, %edx # divisor latch, low byte - movb (1843200 / (16*(CONSPEED))) & 0xff, %al + movb (1843200 / (16*(COMSPEED))) & 0xff, %al outb %al, %dx incl %edx # divisor latch, high byte - movb (1843200 / (16*(CONSPEED))) >> 8, %al + movb (1843200 / (16*(COMSPEED))) >> 8, %al outb %al, %dx incl %edx # fifo control register (if any) ==== //depot/projects/kse/sys/boot/pc98/kgzldr/crt.s#2 (text+ko) ==== @@ -24,7 +24,7 @@ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # From: btx.s 1.10 1999/02/25 16:27:41 rnordier -# $FreeBSD: src/sys/boot/pc98/kgzldr/crt.s,v 1.1 2002/01/18 09:00:38 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/kgzldr/crt.s,v 1.2 2002/05/21 12:53:48 nyan Exp $ # # Screen defaults and assumptions. @@ -72,14 +72,14 @@ addl $0x2000,%ecx movb %ah,(%edi,%ecx,1) # Write attr addw $0x02,%dx - jmp putchr.3 -putchr.2: movw %dx,%ax + jmp crt_putchr.3 +crt_putchr.2: movw %dx,%ax movb $SCR_COL*2,%dl div %dl incb %al mul %dl movw %ax,%dx -putchr.3: cmpw $SCR_ROW*SCR_COL*2,%dx +crt_putchr.3: cmpw $SCR_ROW*SCR_COL*2,%dx .else xchgl %eax,%ecx # Save char movb $SCR_COL,%al # Columns per row ==== //depot/projects/kse/sys/boot/pc98/libpc98/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.11 2002/05/13 11:09:07 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.12 2002/05/21 09:44:52 nyan Exp $ # LIB= pc98 INTERNALLIB= true @@ -11,21 +11,12 @@ time.c vidconsole.c CFLAGS+= -ffreestanding -CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ - -I${.CURDIR}/../../i386/libi386 \ - -I${.CURDIR}/../../../contrib/dev/acpica \ - -I${.CURDIR}/../../.. -I. -CFLAGS+= -DPC98 - BOOT_COMCONSOLE_PORT?= 0x238 CFLAGS+= -DCOMPORT=${BOOT_COMCONSOLE_PORT} BOOT_COMCONSOLE_SPEED?= 9600 CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} -# the location of libstand -CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ - .ifdef(BOOT_BIOSDISK_DEBUG) # Make the disk code more talkative CFLAGS+= -DDISK_DEBUG @@ -34,6 +25,14 @@ # Include simple terminal emulation (cons25-compatible) CFLAGS+= -DTERM_EMU +CFLAGS+= -DPC98 +CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ + -I${.CURDIR}/../../i386/libi386 \ + -I${.CURDIR}/../../../contrib/dev/acpica \ + -I${.CURDIR}/../../.. -I. +# the location of libstand >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue May 28 20: 1: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5907337B406; Tue, 28 May 2002 19:59:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CF97F37B403 for ; Tue, 28 May 2002 19:59:17 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4T2xFP83172 for perforce@freebsd.org; Tue, 28 May 2002 19:59:15 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 28 May 2002 19:59:15 -0700 (PDT) Message-Id: <200205290259.g4T2xFP83172@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 12035 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12035 Change 12035 by peter@peter_daintree on 2002/05/28 19:58:55 IFC @12034 (brings in c++, uuidgen, and gpt stuff) Affected files ... ... //depot/projects/ia64/Makefile.inc1#28 integrate ... //depot/projects/ia64/contrib/libstdc++/ChangeLog#4 integrate ... //depot/projects/ia64/contrib/libstdc++/ChangeLog-2000#1 branch ... //depot/projects/ia64/contrib/libstdc++/ChangeLog-2001#1 branch ... //depot/projects/ia64/contrib/libstdc++/Makefile.am#1 branch ... //depot/projects/ia64/contrib/libstdc++/Makefile.in#3 integrate ... //depot/projects/ia64/contrib/libstdc++/README#1 branch ... //depot/projects/ia64/contrib/libstdc++/acconfig.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/acinclude.m4#1 branch ... //depot/projects/ia64/contrib/libstdc++/aclocal.m4#1 branch ... //depot/projects/ia64/contrib/libstdc++/config.h.in#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/alpha/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/alpha/bits/cpu_limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/arm/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/cris/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/cris/bits/cpu_limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/generic/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/generic/bits/cpu_limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/generic/bits/limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/i386/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/i386/bits/cpu_limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/i486/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/ia64/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/ia64/bits/cpu_limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/m68k/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/m68k/bits/cpu_limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/mips/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/mmix/bits/cpu_limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/powerpc/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/powerpc/bits/cpu_limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/s390/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/s390/bits/cpu_limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/sparc/sparc32/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/sparc/sparc64/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/x86-64/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/cpu/x86-64/bits/cpu_limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/io/basic_file_libio.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/io/basic_file_libio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/io/basic_file_stdio.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/io/basic_file_stdio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/io/c_io_libio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/io/c_io_libio_codecvt.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/io/c_io_stdio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/linker-map.dummy#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/linker-map.gnu#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/generic/c_locale.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/generic/c_locale.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/generic/codecvt_specializations.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/generic/collate_members.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/generic/ctype_members.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/generic/messages_members.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/generic/messages_members.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/generic/monetary_members.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/generic/numeric_members.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/generic/time_members.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/c_locale.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/c_locale.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/collate_members.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/ctype_members.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/messages_members.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/messages_members.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/monetary_members.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/numeric_members.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/time_members.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/ieee_1003.1-2001/c_locale.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/ieee_1003.1-2001/c_locale.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/ieee_1003.1-2001/codecvt_specializations.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/ieee_1003.1-2001/messages_members.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/locale/ieee_1003.1-2001/messages_members.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/aix/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/aix/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/aix/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/aix/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/aix/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/bsd/freebsd/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/bsd/freebsd/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/bsd/netbsd/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/bsd/netbsd/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/djgpp/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/djgpp/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/djgpp/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/djgpp/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/generic/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/generic/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/generic/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/generic/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/gnu-linux/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/gnu-linux/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/gnu-linux/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/gnu-linux/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/hpux/bits/cpu_limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/hpux/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/hpux/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/hpux/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/hpux/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix5.2/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix5.2/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix6.5/bits/atomicity.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix6.5/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/mingw32/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/mingw32/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/mingw32/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/mingw32/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/newlib/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/newlib/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/newlib/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/newlib/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/osf/osf5.0/bits/cpu_limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.5/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.6/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_inline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.7/bits/ctype_noninline.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.7/bits/os_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/configure#1 branch ... //depot/projects/ia64/contrib/libstdc++/configure.host#1 branch ... //depot/projects/ia64/contrib/libstdc++/configure.in#3 integrate ... //depot/projects/ia64/contrib/libstdc++/configure.target#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/Makefile.am#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/Makefile.in#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/algo.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/algobase.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/alloc.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/backward_warning.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/bvector.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/complex.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/defalloc.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/deque.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/fstream.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/function.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/hash_map.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/hash_set.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/hashtable.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/heap.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/iomanip.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/iostream.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/istream.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/iterator.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/list.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/map.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/multimap.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/multiset.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/new.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/ostream.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/pair.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/queue.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/rope.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/set.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/slist.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/stack.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/stream.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/streambuf.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/strstream#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/strstream.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/tempbuf.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/tree.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/backward/vector.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/basic_ios.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/basic_ios.tcc#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/basic_string.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/basic_string.tcc#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/boost_concept_check.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/c++config#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/char_traits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/codecvt.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/concept_check.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/cpp_type_traits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/fpos.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/fstream.tcc#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/functexcept.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/generic_shadow.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/gslice.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/gslice_array.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/indirect_array.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/ios_base.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/istream.tcc#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/locale_facets.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/locale_facets.tcc#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/localefwd.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/mask_array.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/ostream.tcc#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/pthread_allocimpl.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/slice.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/slice_array.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/sstream.tcc#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_algo.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_algobase.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_alloc.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_bvector.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_construct.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_deque.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_function.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_heap.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_iterator.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_iterator_base_funcs.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_iterator_base_types.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_list.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_map.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_multimap.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_multiset.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_numeric.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_pair.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_pthread_alloc.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_queue.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_raw_storage_iter.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_relops.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_set.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_stack.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_tempbuf.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_threads.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_tree.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_uninitialized.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stl_vector.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stream_iterator.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/streambuf.tcc#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/streambuf_iterator.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/stringfwd.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/type_traits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/valarray_array.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/valarray_array.tcc#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/bits/valarray_meta.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_cassert.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_cctype.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_cerrno.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_cfloat.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_ciso646.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_climits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_clocale.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_cmath.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_csetjmp.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_csignal.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_cstdarg.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_cstddef.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_cstdio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_cstdlib.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_cstring.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_ctime.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_cwchar.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c/std_cwctype.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/assert.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cassert.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cctype.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cerrno.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cfloat.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_climits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_clocale.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cmath.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_csetjmp.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_csignal.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cstdarg.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cstddef.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cstdio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cstdlib.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cstring.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_ctime.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cwchar.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/std_cwctype.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_fcntl.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_features.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_iconv.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_iolibio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_langinfo.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_libio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_libioP.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_pthread.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/bits/wrap_unistd.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/ctype.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/errno.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/fcntl.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/features.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/float.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/iconv.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/iolibio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/langinfo.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/libio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/libioP.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/locale.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/math.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/pthread.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/setjmp.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/signal.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/stdarg.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/stddef.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/stdio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/stdlib.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/string.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/sys/cdefs.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/time.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/unistd.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/wchar.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_shadow/wctype.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/cmath.tcc#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cassert.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cctype.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cerrno.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cfloat.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_ciso646.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_climits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_clocale.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cmath.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_csetjmp.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_csignal.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cstdarg.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cstddef.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cstdio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cstdlib.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cstring.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_ctime.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cwchar.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cwctype.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/algorithm#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/enc_filebuf.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/functional#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/hash_map#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/hash_set#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/iterator#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/memory#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/numeric#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/rb_tree#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/rope#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/ropeimpl.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/slist#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/stdio_filebuf.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/stl_hash_fun.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/stl_hashtable.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/ext/stl_rope.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_algorithm.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_bitset.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_complex.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_deque.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_fstream.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_functional.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_iomanip.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_ios.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_iosfwd.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_iostream.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_istream.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_iterator.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_limits.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_list.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_locale.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_map.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_memory.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_numeric.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_ostream.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_queue.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_set.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_sstream.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_stack.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_stdexcept.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_streambuf.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_string.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_utility.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_valarray.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/include/std/std_vector.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/ChangeLog#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/Makefile.am#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/Makefile.in#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/_G_config.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/filedoalloc.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/fileops.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/genops.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/iofclose.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/iofopen.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/iofwide.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/iolibio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/libio.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/libioP.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/stdfiles.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/stdio.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/wfiledoalloc.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/wfileops.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libio/wgenops.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libmath/Makefile.am#1 branch ... //depot/projects/ia64/contrib/libstdc++/libmath/Makefile.in#1 branch ... //depot/projects/ia64/contrib/libstdc++/libmath/copysignf.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libmath/mathconf.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/libmath/nan.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libmath/signbit.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libmath/signbitf.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libmath/signbitl.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libmath/stubs.c#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/Makefile.am#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/Makefile.in#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/cxxabi.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/del_op.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/del_opnt.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/del_opv.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/del_opvnt.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/eh_alloc.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/eh_aux_runtime.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/eh_catch.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/eh_exception.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/eh_globals.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/eh_personality.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/eh_terminate.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/eh_throw.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/eh_type.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/exception#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/exception_defines.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/new#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/new_handler.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/new_op.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/new_opnt.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/new_opv.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/new_opvnt.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/pure.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/tinfo.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/tinfo.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/tinfo2.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/typeinfo#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/unwind-cxx.h#1 branch ... //depot/projects/ia64/contrib/libstdc++/libsupc++/vec.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/mkcheck.in#1 branch ... //depot/projects/ia64/contrib/libstdc++/mkcshadow#1 branch ... //depot/projects/ia64/contrib/libstdc++/mkinclosure#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/Makefile.am#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/Makefile.in#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/bitset.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/cmath.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/codecvt.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/complex_io.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/concept-inst.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/ext-inst.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/functexcept.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/globals.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/ios.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/limits.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/locale-inst.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/locale.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/localename.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/misc-inst.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/stdexcept.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/stl-inst.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/string-inst.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/strstream.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/valarray-inst.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/vterminate.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/src/wstring-inst.cc#1 branch ... //depot/projects/ia64/contrib/libstdc++/testsuite_flags.in#1 branch ... //depot/projects/ia64/crypto/telnet/telnetd/sys_term.c#5 integrate ... //depot/projects/ia64/etc/mtree/BSD.include.dist#4 integrate ... //depot/projects/ia64/games/cribbage/cribbage.h#3 integrate ... //depot/projects/ia64/games/mille/comp.c#2 integrate ... //depot/projects/ia64/games/mille/end.c#3 integrate ... //depot/projects/ia64/games/mille/extern.c#2 integrate ... //depot/projects/ia64/games/mille/init.c#2 integrate ... //depot/projects/ia64/games/mille/mille.c#3 integrate ... //depot/projects/ia64/games/mille/mille.h#3 integrate ... //depot/projects/ia64/games/mille/misc.c#2 integrate ... //depot/projects/ia64/games/mille/move.c#3 integrate ... //depot/projects/ia64/games/mille/print.c#3 integrate ... //depot/projects/ia64/games/mille/roll.c#2 integrate ... //depot/projects/ia64/games/mille/save.c#3 integrate ... //depot/projects/ia64/games/mille/types.c#2 integrate ... //depot/projects/ia64/games/mille/varpush.c#2 integrate ... //depot/projects/ia64/games/quiz/quiz.c#3 integrate ... //depot/projects/ia64/games/snake/snake/move.c#3 integrate ... //depot/projects/ia64/games/snake/snake/snake.h#2 integrate ... //depot/projects/ia64/gnu/lib/Makefile#8 integrate ... //depot/projects/ia64/gnu/lib/libstdc++/Makefile#4 integrate ... //depot/projects/ia64/gnu/lib/libstdc++/_G_config.h#2 delete ... //depot/projects/ia64/gnu/lib/libstdc++/alpha.map#1 branch ... //depot/projects/ia64/gnu/lib/libstdc++/c++config.h#1 branch ... //depot/projects/ia64/gnu/lib/libstdc++/configs.map#1 branch ... //depot/projects/ia64/gnu/lib/libstdc++/i386.map#1 branch ... //depot/projects/ia64/gnu/lib/libstdc++/ia64.map#1 branch ... //depot/projects/ia64/gnu/lib/libstdc++/includes.map#1 branch ... //depot/projects/ia64/gnu/lib/libstdc++/powerpc.map#1 branch ... //depot/projects/ia64/gnu/lib/libstdc++/sparc64.map#1 branch ... //depot/projects/ia64/gnu/lib/libsupc++/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/Makefile#16 integrate ... //depot/projects/ia64/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c#4 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/auto-host.h#5 integrate ... //depot/projects/ia64/include/arpa/nameser_compat.h#2 integrate ... //depot/projects/ia64/include/rpcsvc/pmap_prot.x#2 integrate ... //depot/projects/ia64/lib/libc/compat-43/gethostid.c#3 integrate ... //depot/projects/ia64/lib/libc/compat-43/killpg.c#3 integrate ... //depot/projects/ia64/lib/libc/compat-43/sethostid.c#3 integrate ... //depot/projects/ia64/lib/libc/compat-43/setpgrp.c#3 integrate ... //depot/projects/ia64/lib/libc/compat-43/setrgid.c#3 integrate ... //depot/projects/ia64/lib/libc/compat-43/setruid.c#3 integrate ... //depot/projects/ia64/lib/libc/db/test/dbtest.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/exec.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/getosreldate.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/semctl.c#4 integrate ... //depot/projects/ia64/lib/libc/gen/sethostname.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/syslog.c#5 integrate ... //depot/projects/ia64/lib/libc/gen/termios.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/vis.c#3 integrate ... //depot/projects/ia64/lib/libc/net/nsdispatch.c#4 integrate ... //depot/projects/ia64/lib/libc/stdio/asprintf.c#3 integrate ... //depot/projects/ia64/lib/libc/stdio/fprintf.c#3 integrate ... //depot/projects/ia64/lib/libc/stdio/fscanf.c#3 integrate ... //depot/projects/ia64/lib/libc/stdio/funopen.c#3 integrate ... //depot/projects/ia64/lib/libc/stdio/fvwrite.h#3 integrate ... //depot/projects/ia64/lib/libc/stdio/mktemp.c#4 integrate ... //depot/projects/ia64/lib/libc/stdio/printf.c#3 integrate ... //depot/projects/ia64/lib/libc/stdio/scanf.c#3 integrate ... //depot/projects/ia64/lib/libc/stdio/snprintf.c#3 integrate ... //depot/projects/ia64/lib/libc/stdio/sprintf.c#3 integrate ... //depot/projects/ia64/lib/libc/stdio/sscanf.c#3 integrate ... //depot/projects/ia64/lib/libc/stdio/vfprintf.c#7 integrate ... //depot/projects/ia64/lib/libc/stdio/vfscanf.c#5 integrate ... //depot/projects/ia64/lib/libc/stdlib/strfmon.c#4 integrate ... //depot/projects/ia64/lib/libc/stdlib/strtod.c#9 integrate ... //depot/projects/ia64/lib/libc/stdlib/system.3#2 integrate ... //depot/projects/ia64/lib/libc/stdtime/localtime.c#4 integrate ... //depot/projects/ia64/lib/libc/stdtime/private.h#3 integrate ... //depot/projects/ia64/lib/libc/stdtime/strftime.c#3 integrate ... //depot/projects/ia64/lib/libc/sys/Makefile.inc#5 integrate ... //depot/projects/ia64/lib/libc/sys/uuidgen.2#2 integrate ... //depot/projects/ia64/lib/libcompat/4.1/ascftime.c#2 integrate ... //depot/projects/ia64/lib/libcompat/4.1/cftime.c#2 integrate ... //depot/projects/ia64/lib/libcompat/4.1/getpw.c#2 integrate ... //depot/projects/ia64/lib/libkvm/kvm.c#4 integrate ... //depot/projects/ia64/lib/libpam/modules/modules.inc#11 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ksu/Makefile#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_ksu/pam_ksu.8#1 branch ... //depot/projects/ia64/lib/libpam/modules/pam_ksu/pam_ksu.c#1 branch ... //depot/projects/ia64/lib/msun/bsdsrc/mathimpl.h#2 integrate ... //depot/projects/ia64/lib/msun/src/e_acos.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_acosf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_acosh.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_acoshf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_asin.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_asinf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_atan2.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_atan2f.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_atanh.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_atanhf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_cosh.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_coshf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_exp.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_expf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_fmod.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_fmodf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_gamma.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_gamma_r.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_gammaf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_gammaf_r.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_hypot.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_hypotf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_j0.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_j0f.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_j1.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_j1f.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_jn.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_jnf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_lgamma.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_lgamma_r.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_lgammaf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_lgammaf_r.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_log.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_log10.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_log10f.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_logf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_pow.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_powf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_rem_pio2.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_rem_pio2f.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_remainder.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_remainderf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_scalb.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_scalbf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_sinh.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_sinhf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_sqrt.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_sqrtf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/k_cos.c#2 integrate ... //depot/projects/ia64/lib/msun/src/k_cosf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/k_rem_pio2.c#2 integrate ... //depot/projects/ia64/lib/msun/src/k_rem_pio2f.c#2 integrate ... //depot/projects/ia64/lib/msun/src/k_sin.c#2 integrate ... //depot/projects/ia64/lib/msun/src/k_sinf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/k_standard.c#2 integrate ... //depot/projects/ia64/lib/msun/src/k_tan.c#2 integrate ... //depot/projects/ia64/lib/msun/src/k_tanf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_asinh.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_asinhf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_atan.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_atanf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_cbrt.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_cbrtf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_ceil.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_ceilf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_copysign.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_copysignf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_cos.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_cosf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_erf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_erff.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_expm1.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_expm1f.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_fabs.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_fabsf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_finite.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_finitef.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_floor.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_floorf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_frexp.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_frexpf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_ilogb.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_ilogbf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_isnan.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_isnanf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_ldexp.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_ldexpf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_log1p.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_log1pf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_logb.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_logbf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_matherr.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_modf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_modff.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_nextafter.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_nextafterf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_rint.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_rintf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_scalbn.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_scalbnf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_significand.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_significandf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_sin.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_sinf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_tan.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_tanf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_tanh.c#2 integrate ... //depot/projects/ia64/lib/msun/src/s_tanhf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_acos.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_acosf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_acosh.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_acoshf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_asin.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_asinf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_atan2.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_atan2f.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_atanh.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_atanhf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_cosh.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_coshf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_exp.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_expf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_fmod.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_fmodf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_gamma.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_gamma_r.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_gammaf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_gammaf_r.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_hypot.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_hypotf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_j0.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_j0f.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_j1.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_j1f.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_jn.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_jnf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_lgamma.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_lgamma_r.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_lgammaf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_lgammaf_r.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_log.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_log10.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_log10f.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_logf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_pow.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_powf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_remainder.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_remainderf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_scalb.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_scalbf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_sinh.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_sinhf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_sqrt.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_sqrtf.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_y0.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_y0f.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_y1.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_y1f.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_yn.c#2 integrate ... //depot/projects/ia64/lib/msun/src/w_ynf.c#2 integrate ... //depot/projects/ia64/libexec/bootpd/bootpd.c#3 integrate ... //depot/projects/ia64/libexec/bootpd/bootpgw/bootpgw.c#2 integrate ... //depot/projects/ia64/libexec/bootpd/dovend.c#3 integrate ... //depot/projects/ia64/libexec/bootpd/dovend.h#2 integrate ... //depot/projects/ia64/libexec/bootpd/dumptab.c#2 integrate ... //depot/projects/ia64/libexec/bootpd/getether.h#2 integrate ... //depot/projects/ia64/libexec/bootpd/getif.h#2 integrate ... //depot/projects/ia64/libexec/bootpd/hash.c#2 integrate ... //depot/projects/ia64/libexec/bootpd/hash.h#2 integrate ... //depot/projects/ia64/libexec/bootpd/hwaddr.h#2 integrate ... //depot/projects/ia64/libexec/bootpd/lookup.h#2 integrate ... //depot/projects/ia64/libexec/bootpd/readfile.c#2 integrate ... //depot/projects/ia64/libexec/bootpd/readfile.h#2 integrate ... //depot/projects/ia64/libexec/bootpd/report.c#2 integrate ... //depot/projects/ia64/libexec/bootpd/report.h#3 integrate ... //depot/projects/ia64/libexec/bootpd/tools/bootpef/bootpef.c#2 integrate ... //depot/projects/ia64/libexec/bootpd/tools/bootptest/bootptest.h#2 integrate ... //depot/projects/ia64/libexec/ftpd/ftpd.c#4 integrate ... //depot/projects/ia64/libexec/rtld-aout/rtld.c#3 integrate ... //depot/projects/ia64/libexec/telnetd/sys_term.c#5 integrate ... //depot/projects/ia64/release/Makefile#13 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.sgml#6 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#5 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/Makefile#3 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#4 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#2 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/sparc64/install.sgml#5 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/readme/article.sgml#4 integrate ... //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#8 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#29 integrate ... //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#11 integrate ... //depot/projects/ia64/sbin/reboot/reboot.c#3 integrate ... //depot/projects/ia64/sbin/savecore/savecore.c#14 integrate ... //depot/projects/ia64/share/examples/etc/make.conf#11 integrate ... //depot/projects/ia64/share/man/Makefile#4 integrate ... //depot/projects/ia64/share/man/man5/make.conf.5#11 integrate ... //depot/projects/ia64/share/man/man7/tuning.7#8 integrate ... //depot/projects/ia64/sys/boot/sparc64/loader/Makefile#5 integrate ... //depot/projects/ia64/sys/conf/NOTES#12 integrate ... //depot/projects/ia64/sys/conf/files#26 integrate ... //depot/projects/ia64/sys/conf/options#16 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-cd.c#10 integrate ... //depot/projects/ia64/sys/dev/usb/if_aue.c#11 integrate ... //depot/projects/ia64/sys/dev/usb/if_auereg.h#6 integrate ... //depot/projects/ia64/sys/dev/usb/ohci.c#9 integrate ... //depot/projects/ia64/sys/dev/usb/uhci.c#8 integrate ... //depot/projects/ia64/sys/dev/usb/usb_mem.h#3 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs#14 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs.h#13 integrate ... //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#13 integrate ... //depot/projects/ia64/sys/dev/usb/usbdi.c#9 integrate ... //depot/projects/ia64/sys/geom/geom_gpt.c#3 integrate ... //depot/projects/ia64/sys/geom/geom_mbr.c#8 integrate ... //depot/projects/ia64/sys/kern/init_sysent.c#9 integrate ... //depot/projects/ia64/sys/kern/kern_uuid.c#3 integrate ... //depot/projects/ia64/sys/kern/syscalls.c#9 integrate ... //depot/projects/ia64/sys/kern/syscalls.master#10 integrate ... //depot/projects/ia64/sys/kern/tty.c#12 integrate ... //depot/projects/ia64/sys/kern/vfs_syscalls.c#19 integrate ... //depot/projects/ia64/sys/nfsclient/nfs_socket.c#5 integrate ... //depot/projects/ia64/sys/powerpc/include/cpu.h#6 integrate ... //depot/projects/ia64/sys/powerpc/include/frame.h#4 integrate ... //depot/projects/ia64/sys/powerpc/include/powerpc.h#3 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/copyinout.c#6 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#12 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/ofw_machdep.c#3 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#11 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/trap.c#13 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/trap_subr.S#4 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#5 integrate ... //depot/projects/ia64/sys/sys/gpt.h#3 integrate ... //depot/projects/ia64/sys/sys/syscall.h#9 integrate ... //depot/projects/ia64/sys/sys/syscall.mk#9 integrate ... //depot/projects/ia64/sys/sys/sysproto.h#11 integrate ... //depot/projects/ia64/sys/sys/tty.h#4 integrate ... //depot/projects/ia64/sys/sys/uuid.h#4 integrate ... //depot/projects/ia64/sys/sys/wait.h#3 integrate ... //depot/projects/ia64/sys/vm/vm_page.h#5 integrate ... //depot/projects/ia64/tools/make_libdeps.sh#2 integrate ... //depot/projects/ia64/usr.bin/Makefile#26 integrate ... //depot/projects/ia64/usr.bin/comm/comm.1#3 integrate ... //depot/projects/ia64/usr.bin/comm/comm.c#6 integrate ... //depot/projects/ia64/usr.bin/ctags/ctags.c#5 integrate ... //depot/projects/ia64/usr.bin/cut/cut.c#3 integrate ... //depot/projects/ia64/usr.bin/ee/ee.c#3 integrate ... //depot/projects/ia64/usr.bin/ee/new_curse.c#2 integrate ... //depot/projects/ia64/usr.bin/hexdump/parse.c#6 integrate ... //depot/projects/ia64/usr.bin/login/login.c#9 integrate ... //depot/projects/ia64/usr.bin/newgrp/Makefile#1 branch ... //depot/projects/ia64/usr.bin/newgrp/newgrp.1#1 branch ... //depot/projects/ia64/usr.bin/newgrp/newgrp.c#1 branch ... //depot/projects/ia64/usr.bin/nl/nl.1#3 integrate ... //depot/projects/ia64/usr.bin/nl/nl.c#3 integrate ... //depot/projects/ia64/usr.bin/split/split.1#3 integrate ... //depot/projects/ia64/usr.bin/split/split.c#5 integrate ... //depot/projects/ia64/usr.bin/su/su.c#3 integrate ... //depot/projects/ia64/usr.bin/uuidgen/Makefile#2 integrate ... //depot/projects/ia64/usr.bin/uuidgen/uuidgen.1#2 integrate ... //depot/projects/ia64/usr.bin/uuidgen/uuidgen.c#4 integrate ... //depot/projects/ia64/usr.bin/who/who.c#5 integrate ... //depot/projects/ia64/usr.sbin/Makefile#15 integrate ... //depot/projects/ia64/usr.sbin/boot0cfg/boot0cfg.8#4 integrate ... //depot/projects/ia64/usr.sbin/lpr/chkprintcap/skimprintcap.c#2 integrate ... //depot/projects/ia64/usr.sbin/lpr/common_source/common.c#3 integrate ... //depot/projects/ia64/usr.sbin/lpr/lpd/printjob.c#6 integrate ... //depot/projects/ia64/usr.sbin/lpr/lpd/recvjob.c#3 integrate ... //depot/projects/ia64/usr.sbin/mergemaster/mergemaster.sh#5 integrate ... //depot/projects/ia64/usr.sbin/mtree/create.c#2 integrate ... //depot/projects/ia64/usr.sbin/pcvt/fontedit/fontedit.c#2 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/version/test-pkg_version.sh#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/bundle.c#7 integrate ... //depot/projects/ia64/usr.sbin/ppp/command.c#9 integrate ... //depot/projects/ia64/usr.sbin/ppp/id.c#3 integrate ... //depot/projects/ia64/usr.sbin/ppp/physical.c#4 integrate ... //depot/projects/ia64/usr.sbin/pstat/Makefile#3 integrate ... //depot/projects/ia64/usr.sbin/pstat/pstat.c#4 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/dist.c#8 integrate ... //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.8#3 integrate ... //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.c#4 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#28 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.283 2002/05/25 13:29:46 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.286 2002/05/29 00:48:14 peter Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -230,8 +230,8 @@ usr/share/groff_font/devutf8 \ usr/share/tmac/mdoc usr/share/tmac/mm -INCDIRS= arpa dev fs g++/std isc isofs libmilter objc openssl \ - protocols readline rpc rpcsvc security ufs +INCDIRS= arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \ + objc openssl protocols readline rpc rpcsvc security ufs # # buildworld @@ -358,7 +358,7 @@ distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} for prog in [ awk cat chflags chmod chown date echo egrep find grep \ - ln make makewhatis mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + ln make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc zic; do \ cp `which $$prog` ${INSTALLTMP}; \ done @@ -572,13 +572,11 @@ .if exists(${.CURDIR}/games) && !defined(NOGAMES) _strfile= games/fortune/strfile .endif -.if ${CXX:T} != "c++" _cxx_consumers= gnu/usr.bin/gperf gnu/usr.bin/groff -.endif bootstrap-tools: .for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef \ - usr.bin/rpcgen usr.bin/xargs usr.bin/xinstall \ + usr.bin/makewhatis usr.bin/rpcgen usr.bin/xargs usr.bin/xinstall \ usr.sbin/config usr.sbin/kbdcontrol \ ${_cxx_consumers} gnu/usr.bin/texinfo cd ${.CURDIR}/${_tool}; \ ==== //depot/projects/ia64/contrib/libstdc++/ChangeLog#4 (text+ko) ==== @@ -1,1421 +1,2447 @@ -Fri Mar 16 12:46:19 GMT 2001 Bernd Schmidt (bernds@redhat.com) +2002-05-09 Jakub Jelinek - * gcc-2.95.3 Released. + * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init): Append all + multilib dirs containing libgcc_s*.so.1 below gcc object dir to + LD_LIBRARY_PATH. -2001-01-01 Bernd Schmidt +2002-05-08 Alexandre Oliva - 1999-12-07 Martin v. Löwis - * stl_deque.h (_Deque_base::const_iterator): Change third - template argument to pointer type. - Reported by Carlo Wood + * configure.in (ORIGINAL_LD_FOR_MULTILIBS): Preserve LD at + script entry, and set LD to it when configuring multilibs. + * configure: Rebuilt. - 1999-11-10 Benjamin Kosnik - Matthias Klose - * stl_rope.h: Fix initialization order. - * stl_deque.h: Use static_casts(signed_type). +2002-05-06 Phil Edwards -2000-11-24 Magnus Fromreide + * docs/html/documentation.html: Fix broken link. - * sstream: Backport libstdc++-V3 sstream to V2. +2002-05-03 Benjamin Kosnik -2000-04-24 Magnus Fromreide + PR libstdc++/6549. + * include/bits/fstream.tcc (filebuf::_M_underflow_common): Revert. + * testsuite/27_io/narrow_stream_objects.cc (test07): Add. - * sstream: New file. - * Makefile.in (HEADERS): Add it. +2002-05-02 Phil Edwards -2000-03-12 Gabriel Dos Reis + * docs/html/faq/index.html: Update list in #4.1. + * docs/html/faq/index.txt: Regenerated. - * std/bastring.h (basic_string<>::push_back): Define. +2002-05-01 Phil Edwards -Tue Mar 7 21:37:56 2000 Jeffrey A Law (law@cygnus.com) + * include/std/std_bitset.h: Fix doxygen comments. + * docs/html/documentation.html: Minor tweaks for 3.1. + * docs/html/27_io/howto.html: Likewise. + * docs/html/ext/howto.html: Likewise, mention stdio_filebuf. + * docs/html/faq/index.html: Likewise. + * docs/html/faq/index.txt: Regenerated. - 1999-11-19 Gabriel Dos Reis - * std/valarray_meta.h (_DEFINE_EXPR_UNARY_FUNCTION): Don't forget - to define tanh. +2002-05-01 Benjamin Kosnik - 1999-11-05 Gabriel Dos Reis - * std/valarray_meta.h (_DEFINE_EXPR_UNARY_FUNCTION): When - building meta-expressions don't forget to take the contained - closures. + PR libstdc++/6533 + * include/bits/streambuf_iterator.h (istreambuf_iterator::_M_get): New. + (istreambuf_iterator::equal): Use it. + (istreambuf_iterator::operator*): Use it. - 1999-10-19 Gabriel Dos Reis - * std/valarray_meta.h: (_BinClos::_BinClos): Fix typo. +2002-05-01 Paolo Carlini + + PR libstdc++/6513 + * include/bits/stl_uninitialized.h + (uninitialized_copy(_InputIter, _InputIter, _ForwardIter)): + Fix typo in 2001-07-17 commit: typedef _ValueType to + iterator_traits<_ForwardIter> not <_InputIter>. + * testsuite/23_containers/vector_ctor.cc: Add test04. - 1999-09-17 Gabriel Dos Reis - * std/complext.cc (pow): Don't expect floating point promotion - in presence of template argument deduction. There is no such - thing. +2002-04-30 John David Anglin -2000-02-06 Gabriel Dos Reis - * std/valarray_array.h (__valarray_copy): Fix typo. + PR libstdc++/6501 + * include/c_std/std_cctype.h: Include bits/c++config.h. + * config/os/hpux/bits/os_defines.h (_SB_CTYPE_MACROS): Define. -1999-12-14 Martin v. Löwis - * std/bastring.h (basic_string::basic_string): Rename parameters - to avoid shadow warnings. - * std/bastring.cc (alloc): Likewise. +2002-04-30 Benjamin Kosnik -Sun Oct 24 23:54:10 PDT 1999 Jeff Law (law@cygnus.com) + * include/ext/stdio_filebuf.h: New file. + * include/ext/enc_filebuf.h: New file. + * config/io/basic_file_stdio.h (__basic_file::sys_open): Add fd ctor. + * config/io/basic_file_stdio.cc: Same. + * include/bits/fstream.tcc (filebuf::_M_allocate_internal_buffer): + Remove _M_unbuf hacks. + (filebuf::_M_destroy_internal_buffer): Same. + (filebuf::filebuf(cfile, openmode, int_type): Remove definition. + (filebuf::fd): Remove. + * include/std/std_fstream.h (filebuf::_M_unbuf): Remove. + (filebuf::filebuf(__c_file*, openmode, int_type)): Remove. + (filebuf::fd): Remove. + * src/ios.cc (ios_base::_S_ios_create): Change to use specialized + filebufs. + (ios_base::_S_ios_destroy): Same. + * src/misc-inst.cc (file_filebuf): Add instantiation. + * include/Makefile.am (ext_headers): Add ext_filebuf.h, + stdio_filebuf.h. * include/Makefile.in: Regenerate. + +2002-04-30 Benjamin Kosnik - * gcc-2.95.2 Released. + PR libstdc++/6511 + * config/os/solaris/solaris2.7/bits/ctype_noninline.h: Fix typo. + +2002-04-29 Benjamin Kosnik >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 0:10:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7569537B40A; Wed, 29 May 2002 00:10:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4107137B417 for ; Wed, 29 May 2002 00:10:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4T7AZm39141 for perforce@freebsd.org; Wed, 29 May 2002 00:10:35 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Wed, 29 May 2002 00:10:35 -0700 (PDT) Message-Id: <200205290710.g4T7AZm39141@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 12049 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12049 Change 12049 by marcel@marcel_vaio on 2002/05/29 00:10:10 IFC $FreeBSD$ expansion. Affected files ... ... //depot/projects/ia64/lib/libc/sys/uuidgen.2#3 edit Differences ... ==== //depot/projects/ia64/lib/libc/sys/uuidgen.2#3 (text+ko) ==== @@ -22,7 +22,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$ +.\" $FreeBSD: src/lib/libc/sys/uuidgen.2,v 1.1 2002/05/28 06:16:06 marcel Exp $ .\" .Dd May 26, 2002 .Dt UUIDGEN 2 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 0:16:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCDF337B407; Wed, 29 May 2002 00:16:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0488C37B40A for ; Wed, 29 May 2002 00:16:43 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4T7Ggp39541 for perforce@freebsd.org; Wed, 29 May 2002 00:16:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Wed, 29 May 2002 00:16:42 -0700 (PDT) Message-Id: <200205290716.g4T7Ggp39541@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 12050 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12050 Change 12050 by marcel@marcel_vaio on 2002/05/29 00:15:51 IFC geom_gpt.c depends on option GEOM_GPT Affected files ... ... //depot/projects/ia64/sys/conf/files#27 edit Differences ... ==== //depot/projects/ia64/sys/conf/files#27 (text+ko) ==== @@ -723,7 +723,7 @@ geom/geom_dump.c optional geom geom/geom_enc.c optional geom geom/geom_event.c optional geom -geom/geom_gpt.c optional geom +geom/geom_gpt.c optional geom geom_gpt geom/geom_io.c optional geom geom/geom_kern.c optional geom geom/geom_mbr.c optional geom To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 0:20: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BFFA37B403; Wed, 29 May 2002 00:19:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1D26137B40F for ; Wed, 29 May 2002 00:19:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4T7Jk539673 for perforce@freebsd.org; Wed, 29 May 2002 00:19:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Wed, 29 May 2002 00:19:46 -0700 (PDT) Message-Id: <200205290719.g4T7Jk539673@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 12051 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12051 Change 12051 by marcel@marcel_vaio on 2002/05/29 00:19:07 IFC geom_gpt.c depends on option GEOM_GPT Affected files ... ... //depot/projects/ia64/sys/geom/geom_gpt.c#4 edit ... //depot/projects/ia64/sys/geom/geom_mbr.c#9 edit Differences ... ==== //depot/projects/ia64/sys/geom/geom_gpt.c#4 (text+ko) ==== @@ -1,13 +1,9 @@ /*- + * Copyright (c) 2002 Marcel Moolenaar * Copyright (c) 2002 Poul-Henning Kamp * Copyright (c) 2002 Networks Associates Technology, Inc. * All rights reserved. * - * This software was developed for the FreeBSD Project by Poul-Henning Kamp - * and NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -32,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/geom/geom_gpt.c,v 1.1 2002/05/28 09:04:48 marcel Exp $ */ /* @@ -65,8 +61,6 @@ #include #include -#define GPT_CLASS_NAME "GPT" - /* * XXX: GEOM is not dynamic enough. We are forced to use a compile-time * limit. The minimum number of partitions (128) as required by EFI is @@ -311,7 +305,7 @@ } static struct g_class g_gpt_class = { - GPT_CLASS_NAME, + "GPT", g_gpt_taste, NULL, G_CLASS_INITSTUFF ==== //depot/projects/ia64/sys/geom/geom_mbr.c#9 (text+ko) ==== @@ -63,8 +63,6 @@ #define MBR_CLASS_NAME "MBR" #define MBREXT_CLASS_NAME "MBREXT" -#define GPT_HACK 1 - static void g_dec_dos_partition(u_char *ptr, struct dos_partition *d) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 1: 9:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67A9837B401; Wed, 29 May 2002 01:07:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id ACEAC37B412 for ; Wed, 29 May 2002 01:07:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4T87jv47741 for perforce@freebsd.org; Wed, 29 May 2002 01:07:45 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 29 May 2002 01:07:45 -0700 (PDT) Message-Id: <200205290807.g4T87jv47741@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 12053 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12053 Change 12053 by peter@peter_daintree on 2002/05/29 01:07:38 IFC @12052 Affected files ... ... //depot/projects/ia64/Makefile.inc1#29 integrate ... //depot/projects/ia64/share/man/man4/Makefile#10 integrate ... //depot/projects/ia64/share/man/man4/disc.4#1 branch ... //depot/projects/ia64/share/man/man4/faith.4#2 integrate ... //depot/projects/ia64/share/man/man4/stf.4#3 integrate ... //depot/projects/ia64/share/man/man4/vlan.4#4 integrate ... //depot/projects/ia64/share/man/tools/M.folio#2 delete ... //depot/projects/ia64/share/man/tools/M.tabs#2 delete ... //depot/projects/ia64/share/man/tools/README#2 delete ... //depot/projects/ia64/share/man/tools/TOOLKIT#2 delete ... //depot/projects/ia64/share/man/tools/badcref3#2 delete ... //depot/projects/ia64/share/man/tools/break#2 delete ... //depot/projects/ia64/share/man/tools/ckcrefs#2 delete ... //depot/projects/ia64/share/man/tools/ckfrefs#2 delete ... //depot/projects/ia64/share/man/tools/cknames#2 delete ... //depot/projects/ia64/share/man/tools/ckso#2 delete ... //depot/projects/ia64/share/man/tools/ckspell#2 delete ... //depot/projects/ia64/share/man/tools/ignore#2 delete ... //depot/projects/ia64/share/man/tools/line.c#2 delete ... //depot/projects/ia64/share/man/tools/list#2 delete ... //depot/projects/ia64/share/man/tools/mcmp#2 delete ... //depot/projects/ia64/share/man/tools/mgrep#2 delete ... //depot/projects/ia64/share/man/tools/missing#2 delete ... //depot/projects/ia64/share/man/tools/mklinks#2 delete ... //depot/projects/ia64/share/man/tools/mroff#2 delete ... //depot/projects/ia64/share/man/tools/newsp.errs#2 delete ... //depot/projects/ia64/share/man/tools/noso.c#2 delete ... //depot/projects/ia64/share/man/tools/pages.c#2 delete ... //depot/projects/ia64/share/man/tools/pgcnt#2 delete ... //depot/projects/ia64/share/man/tools/prnames#2 delete ... //depot/projects/ia64/share/man/tools/prsynops#2 delete ... //depot/projects/ia64/share/man/tools/sp.ignore#2 delete ... //depot/projects/ia64/share/man/tools/tocrc#2 delete ... //depot/projects/ia64/sys/boot/sparc64/loader/locore.S#2 integrate ... //depot/projects/ia64/sys/boot/sparc64/loader/main.c#5 integrate ... //depot/projects/ia64/sys/boot/sparc64/loader/metadata.c#4 integrate ... //depot/projects/ia64/sys/conf/files.sparc64#11 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#40 integrate ... //depot/projects/ia64/sys/ia64/ia64/mca.c#4 integrate ... //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#17 integrate ... //depot/projects/ia64/sys/ia64/include/mca.h#9 integrate ... //depot/projects/ia64/sys/modules/Makefile#14 integrate ... //depot/projects/ia64/sys/sparc64/include/metadata.h#2 integrate ... //depot/projects/ia64/sys/sparc64/include/pmap.h#4 integrate ... //depot/projects/ia64/sys/sparc64/include/pv.h#5 integrate ... //depot/projects/ia64/sys/sparc64/include/tlb.h#6 integrate ... //depot/projects/ia64/sys/sparc64/include/tsb.h#4 integrate ... //depot/projects/ia64/sys/sparc64/include/tte.h#4 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#10 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#15 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#12 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/pv.c#7 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/trap.c#10 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/tsb.c#5 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#7 integrate ... //depot/projects/ia64/sys/sys/gpt.h#4 integrate ... //depot/projects/ia64/usr.bin/su/su.c#4 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#29 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.286 2002/05/29 00:48:14 peter Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.287 2002/05/29 03:59:20 peter Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -572,7 +572,11 @@ .if exists(${.CURDIR}/games) && !defined(NOGAMES) _strfile= games/fortune/strfile .endif +# This horrible kludge should be deleted in about 2 weeks, say July 9, 2002 +_cxx_version!= ${CXX} -v 2>&1 | awk '$$0 ~ /^gcc version/ {print $$3}' +.if ${CXX:T} != "c++" || ${_cxx_version} != "3.1" || exists(/usr/lib/libstdc++.so.4) _cxx_consumers= gnu/usr.bin/gperf gnu/usr.bin/groff +.endif bootstrap-tools: .for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef \ ==== //depot/projects/ia64/share/man/man4/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.155 2002/05/20 18:50:58 will Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.156 2002/05/29 06:59:30 brooks Exp $ MAN= aac.4 \ acpi.4 \ @@ -32,6 +32,7 @@ dc.4 \ ddb.4 \ de.4 \ + disc.4 \ divert.4 \ dpt.4 \ dummynet.4 \ ==== //depot/projects/ia64/share/man/man4/faith.4#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/faith.4,v 1.11 2001/09/25 18:40:52 brooks Exp $ +.\" $FreeBSD: src/share/man/man4/faith.4,v 1.12 2002/05/29 06:55:06 brooks Exp $ .\" .Dd April 10, 1999 .Dt FAITH 4 @@ -45,6 +45,18 @@ like .Xr faithd 8 . .Pp +Each +.Nm +interface is created at runtime using interface cloning. +This is +most easily done with the +.Xr ifconfig 8 +.Cm create +command or using the +.Va cloned_interfaces +variable in +.Xr rc.conf 5 . +.Pp Special action will be taken when IPv6 TCP traffic is seen on a router, and routing table suggests to route it to .Nm ==== //depot/projects/ia64/share/man/man4/stf.4#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/stf.4,v 1.10 2002/01/21 12:09:13 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/stf.4,v 1.11 2002/05/29 06:55:06 brooks Exp $ .\" $KAME: stf.4,v 1.35 2001/05/02 06:24:49 itojun Exp $ .\" .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -57,6 +57,18 @@ .Dq 6to4 router in the specification). .Pp +Each +.Nm +interface is created at runtime using interface cloning. +This is +most easily done with the +.Xr ifconfig 8 +.Cm create +command or using the +.Va cloned_interfaces +variable in +.Xr rc.conf 5 . +.Pp Due to the way 6to4 protocol is specified, .Nm interface requires certain configuration to work properly. ==== //depot/projects/ia64/share/man/man4/vlan.4#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.7 2002/01/16 16:33:57 ambrisko Exp $ +.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.8 2002/05/29 06:55:06 brooks Exp $ .\" .Dd July 25, 2001 .Dt VLAN 4 @@ -43,6 +43,18 @@ network interfaces, which allows routing/bridging between multiple VLANs through a single switch trunk port. .Pp +Each +.Nm +interface is created at runtime using interface cloning. +This is +most easily done with the +.Xr ifconfig 8 +.Cm create +command or using the +.Va cloned_interfaces +variable in +.Xr rc.conf 5 . +.Pp To function, a .Nm interface must be assigned a parent interface and ==== //depot/projects/ia64/sys/boot/sparc64/loader/locore.S#2 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/boot/sparc64/loader/locore.S,v 1.5 2002/04/02 17:10:15 tmm Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/locore.S,v 1.6 2002/05/29 05:49:58 jake Exp $ */ #define LOCORE @@ -92,7 +92,6 @@ ENTRY(itlb_enter) rdpr %pstate, %o4 wrpr %o4, PSTATE_IE, %pstate - sllx %o0, PAGE_SHIFT, %o0 mov AA_IMMU_TAR, %o3 stxa %o0, [%o3] ASI_IMMU stxa %o1, [%g0] ASI_ITLB_DATA_IN_REG @@ -103,7 +102,6 @@ ENTRY(dtlb_enter) rdpr %pstate, %o4 wrpr %o4, PSTATE_IE, %pstate - sllx %o0, PAGE_SHIFT, %o0 mov AA_DMMU_TAR, %o3 stxa %o0, [%o3] ASI_DMMU stxa %o1, [%g0] ASI_DTLB_DATA_IN_REG ==== //depot/projects/ia64/sys/boot/sparc64/loader/main.c#5 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.10 2002/05/16 21:21:59 trhodes Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.11 2002/05/29 05:49:58 jake Exp $ */ /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -63,8 +63,8 @@ char __progname[] = "FreeBSD/sparc64 loader"; -struct tte *dtlb_store; -struct tte *itlb_store; +struct tlb_entry *dtlb_store; +struct tlb_entry *itlb_store; int dtlb_slot; int itlb_slot; @@ -240,7 +240,7 @@ mmu_mapin(vm_offset_t va, vm_size_t len) { vm_offset_t pa, mva; - struct tte tte; + u_long data; if (va + len > curkva) curkva = va + len; @@ -275,13 +275,16 @@ panic("mmu_mapin: out of dtlb_slots"); if (itlb_slot >= itlb_slot_max) panic("mmu_mapin: out of itlb_slots"); - tte.tte_vpn = TV_VPN(va); - tte.tte_data = TD_V | TD_4M | TD_PA(pa) | TD_L | TD_CP | + data = TD_V | TD_4M | TD_PA(pa) | TD_L | TD_CP | TD_CV | TD_P | TD_W; - dtlb_store[dtlb_slot++] = tte; - itlb_store[itlb_slot++] = tte; - dtlb_enter(tte.tte_vpn, tte.tte_data); - itlb_enter(tte.tte_vpn, tte.tte_data); + dtlb_store[dtlb_slot].te_pa = pa; + dtlb_store[dtlb_slot].te_va = va; + itlb_store[itlb_slot].te_pa = pa; + itlb_store[itlb_slot].te_va = va; + dtlb_slot++; + itlb_slot++; + dtlb_enter(va, data); + itlb_enter(va, data); pa = (vm_offset_t)-1; } len -= len > PAGE_SIZE_4M ? PAGE_SIZE_4M : len; ==== //depot/projects/ia64/sys/boot/sparc64/loader/metadata.c#4 (text+ko) ==== @@ -24,22 +24,21 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.29 - * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.4 2002/04/02 17:10:15 tmm Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.5 2002/05/29 05:49:58 jake Exp $ */ #include #include #include #include -#include #include #include "bootstrap.h" #include "libofw.h" -extern struct tte *dtlb_store; -extern struct tte *itlb_store; +extern struct tlb_entry *dtlb_store; +extern struct tlb_entry *itlb_store; extern int dtlb_slot; extern int itlb_slot; @@ -318,10 +317,10 @@ file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); file_addmetadata(kfp, MODINFOMD_DTLB_SLOTS, sizeof dtlb_slots, &dtlb_slots); file_addmetadata(kfp, MODINFOMD_ITLB_SLOTS, sizeof itlb_slots, &itlb_slots); - file_addmetadata(kfp, MODINFOMD_DTLB, dtlb_slots * sizeof(struct tte), - dtlb_store); - file_addmetadata(kfp, MODINFOMD_ITLB, itlb_slots * sizeof(struct tte), - itlb_store); + file_addmetadata(kfp, MODINFOMD_DTLB, + dtlb_slots * sizeof(*dtlb_store), dtlb_store); + file_addmetadata(kfp, MODINFOMD_ITLB, + itlb_slots * sizeof(*itlb_store), itlb_store); *modulep = addr; size = md_copymodules(0); ==== //depot/projects/ia64/sys/conf/files.sparc64#11 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.19 2002/05/20 16:10:17 jake Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.20 2002/05/29 06:08:45 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -56,7 +56,6 @@ sparc64/sparc64/ofw_bus.c standard sparc64/sparc64/ofw_machdep.c standard sparc64/sparc64/pmap.c standard -sparc64/sparc64/pv.c standard sparc64/sparc64/rwindow.c standard sparc64/sparc64/sparcbus_if.m standard sparc64/sparc64/support.s standard ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#40 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.104 2002/05/20 05:41:20 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.105 2002/05/29 05:19:07 marcel Exp $ */ #include "opt_compat.h" ==== //depot/projects/ia64/sys/ia64/ia64/mca.c#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/sys/ia64/ia64/mca.c,v 1.2 2002/05/01 22:10:03 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/mca.c,v 1.3 2002/05/29 05:19:07 marcel Exp $ */ #include ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#17 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.38 2002/05/19 04:42:19 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.39 2002/05/29 05:19:07 marcel Exp $ */ #include ==== //depot/projects/ia64/sys/ia64/include/mca.h#9 (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/sys/ia64/include/mca.h,v 1.4 2002/05/22 02:25:06 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/mca.h,v 1.5 2002/05/29 05:19:07 marcel Exp $ */ #ifndef _MACHINE_MCA_H_ ==== //depot/projects/ia64/sys/modules/Makefile#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.243 2002/05/19 03:59:06 marcel Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.245 2002/05/29 05:09:51 marcel Exp $ .if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) _random= random @@ -102,7 +102,6 @@ usb \ uscanner \ uvscom \ - vinum \ vpo \ vr \ vx \ @@ -161,6 +160,7 @@ stg \ streams \ vesa \ + vinum \ wi \ xe .endif @@ -168,7 +168,6 @@ .if ${MACHINE_ARCH} == "ia64" SUBDIR+=aic \ arcnet \ - bktr \ ciss \ cm \ coff \ @@ -189,7 +188,8 @@ .if ${MACHINE} == "pc98" SUBDIR+=pmc \ - snc + snc \ + vinum .endif .if ${MACHINE_ARCH} == "alpha" @@ -200,7 +200,8 @@ lomac \ osf1 \ sound \ - sppp + sppp \ + vinum .endif .if defined(WANT_EXT2FS_MODULE) ==== //depot/projects/ia64/sys/sparc64/include/metadata.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/metadata.h,v 1.2 2002/02/23 17:43:44 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/metadata.h,v 1.3 2002/05/29 05:49:59 jake Exp $ */ #ifndef _MACHINE_METADATA_H_ @@ -37,6 +37,11 @@ #define MODINFOMD_DTLB 0x1006 #define MODINFOMD_ITLB 0x1007 +struct tlb_entry { + vm_offset_t te_pa; + vm_offset_t te_va; +}; + #define MD_FETCH(mdp, info, type) ({ \ type *__p; \ __p = (type *)preload_search_info((mdp), MODINFO_METADATA | (info)); \ ==== //depot/projects/ia64/sys/sparc64/include/pmap.h#4 (text+ko) ==== @@ -37,7 +37,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 - * $FreeBSD: src/sys/sparc64/include/pmap.h,v 1.16 2002/04/29 07:43:15 peter Exp $ + * $FreeBSD: src/sys/sparc64/include/pmap.h,v 1.20 2002/05/29 06:12:12 jake Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -52,21 +52,19 @@ #define PMAP_CONTEXT_MAX 8192 +#define PG_UNCACHEABLE (1<<0) + #define pmap_resident_count(pm) (pm->pm_stats.resident_count) -struct pv_entry; - typedef struct pmap *pmap_t; -typedef struct pv_entry *pv_entry_t; struct md_page { - TAILQ_HEAD(, pv_entry) pv_list; - int pv_list_count; + STAILQ_HEAD(, tte) tte_list; int colors[DCACHE_COLORS]; + int flags; }; struct pmap { - TAILQ_HEAD(,pv_entry) pm_pvlist; struct tte *pm_tsb; vm_object_t pm_tsb_obj; u_int pm_active; @@ -74,14 +72,6 @@ struct pmap_statistics pm_stats; }; -struct pv_entry { - TAILQ_ENTRY(pv_entry) pv_list; - TAILQ_ENTRY(pv_entry) pv_plist; - pmap_t pv_pmap; - vm_offset_t pv_va; - vm_page_t pv_m; -}; - void pmap_bootstrap(vm_offset_t ekva); void pmap_context_rollover(void); vm_offset_t pmap_kextract(vm_offset_t va); @@ -91,8 +81,17 @@ int pmap_cache_enter(vm_page_t m, vm_offset_t va); void pmap_cache_remove(vm_page_t m, vm_offset_t va); +int pmap_remove_tte(struct pmap *pm1, struct pmap *pm2, struct tte *tp, + vm_offset_t va); +int pmap_protect_tte(struct pmap *pm1, struct pmap *pm2, struct tte *tp, + vm_offset_t va); + void pmap_map_tsb(void); +void pmap_remove_all(vm_page_t m); + +void pmap_clear_write(vm_page_t m); + #define vtophys(va) pmap_kextract(((vm_offset_t) (va))) extern vm_offset_t avail_start; ==== //depot/projects/ia64/sys/sparc64/include/pv.h#5 (text+ko) ==== @@ -34,26 +34,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/pv.h,v 1.6 2002/03/21 02:30:26 jeff Exp $ + * $FreeBSD: src/sys/sparc64/include/pv.h,v 1.7 2002/05/29 05:56:05 jake Exp $ */ #ifndef _MACHINE_PV_H_ #define _MACHINE_PV_H_ -extern uma_zone_t pvzone; -extern struct vm_object pvzone_obj; -extern int pv_entry_count; -extern int pv_entry_max; -extern int pv_entry_high_water; -extern struct pv_entry *pvinit; +struct tte; -void *pv_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); -pv_entry_t pv_alloc(void); -void pv_free(pv_entry_t pv); - -void pv_insert(pmap_t pm, vm_page_t m, vm_offset_t va); -pv_entry_t pv_lookup(pmap_t pm, vm_page_t m, vm_offset_t va); -void pv_remove(pmap_t pm, vm_page_t m, vm_offset_t va); +void pv_insert(pmap_t pm, vm_page_t m, struct tte *tp); +void pv_remove(pmap_t pm, vm_page_t m, struct tte *tp); int pv_page_exists(pmap_t pm, vm_page_t m); void pv_remove_all(vm_page_t m); ==== //depot/projects/ia64/sys/sparc64/include/tlb.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/tlb.h,v 1.18 2002/05/21 00:29:02 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/tlb.h,v 1.19 2002/05/29 05:49:59 jake Exp $ */ #ifndef _MACHINE_TLB_H_ @@ -80,8 +80,10 @@ #define MMU_SFSR_W (1L << MMU_SFSR_W_SHIFT) +struct tlb_entry; + extern int kernel_tlb_slots; -extern struct tte *kernel_ttes; +extern struct tlb_entry *kernel_tlbs; void tlb_context_demap(struct pmap *pm); void tlb_page_demap(u_int tlb, struct pmap *pm, vm_offset_t va); ==== //depot/projects/ia64/sys/sparc64/include/tsb.h#4 (text+ko) ==== @@ -26,13 +26,13 @@ * SUCH DAMAGE. * * from: BSDI: pmap.v9.h,v 1.10.2.6 1999/08/23 22:18:44 cp Exp - * $FreeBSD: src/sys/sparc64/include/tsb.h,v 1.13 2002/05/21 02:15:37 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/tsb.h,v 1.14 2002/05/29 06:08:44 jake Exp $ */ #ifndef _MACHINE_TSB_H_ #define _MACHINE_TSB_H_ -#define TSB_PAGES_SHIFT (2) +#define TSB_PAGES_SHIFT (1) #define TSB_PAGES (1 << TSB_PAGES_SHIFT) #define TSB_BSHIFT (TSB_PAGES_SHIFT + PAGE_SHIFT) #define TSB_BSIZE (1UL << TSB_BSHIFT) ==== //depot/projects/ia64/sys/sparc64/include/tte.h#4 (text+ko) ==== @@ -26,13 +26,13 @@ * SUCH DAMAGE. * * from: BSDI: pmap.v9.h,v 1.10.2.6 1999/08/23 22:18:44 cp Exp - * $FreeBSD: src/sys/sparc64/include/tte.h,v 1.10 2002/05/21 00:29:02 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/tte.h,v 1.11 2002/05/29 05:56:05 jake Exp $ */ #ifndef _MACHINE_TTE_H_ #define _MACHINE_TTE_H_ -#define TTE_SHIFT (4) +#define TTE_SHIFT (5) #define TD_SIZE_SHIFT (61) #define TD_SOFT2_SHIFT (50) @@ -98,10 +98,16 @@ (((tp)->tte_data & TD_EXEC) ? (TLB_DTLB | TLB_ITLB) : TLB_DTLB) #define TTE_GET_VA(tp) \ ((tp)->tte_vpn << PAGE_SHIFT) +#define TTE_GET_PMAP(tp) \ + ((tp)->tte_pmap) +#define TTE_ZERO(tp) \ + bzero(tp, sizeof(*tp)) struct tte { u_long tte_vpn; u_long tte_data; + STAILQ_ENTRY(tte) tte_link; + struct pmap *tte_pmap; }; static __inline int ==== //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#10 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.33 2002/05/25 02:39:28 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.34 2002/05/29 06:08:44 jake Exp $ */ #include @@ -61,7 +61,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#15 (text+ko) ==== @@ -37,7 +37,7 @@ * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 * from: FreeBSD: src/sys/i386/i386/machdep.c,v 1.477 2001/08/27 - * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.51 2002/05/25 02:39:28 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.52 2002/05/29 05:49:59 jake Exp $ */ #include "opt_ddb.h" @@ -107,7 +107,7 @@ typedef int ofw_vec_t(void *); -struct tte *kernel_ttes; +struct tlb_entry *kernel_tlbs; int kernel_tlb_slots; int physmem; @@ -229,7 +229,7 @@ end = MD_FETCH(kmdp, MODINFOMD_KERNEND, vm_offset_t); kernel_tlb_slots = MD_FETCH(kmdp, MODINFOMD_DTLB_SLOTS, int); - kernel_ttes = (struct tte *)preload_search_info(kmdp, + kernel_tlbs = (void *)preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_DTLB); } } ==== //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.53 2002/05/21 02:14:11 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.58 2002/05/29 06:12:13 jake Exp $ */ /* @@ -94,7 +94,7 @@ #include #include #include -#include +#include #include #include #include @@ -172,10 +172,6 @@ */ #define PMAP_TSB_THRESH ((TSB_SIZE / 2) * PAGE_SIZE) -/* Callbacks for tsb_foreach. */ -static tsb_callback_t pmap_remove_tte; -static tsb_callback_t pmap_protect_tte; - #ifdef PMAP_STATS static long pmap_enter_nupdate; static long pmap_enter_nreplace; @@ -310,8 +306,8 @@ * pmap_kextract() will work for them. */ for (i = 0; i < kernel_tlb_slots; i++) { - va = TTE_GET_VA(&kernel_ttes[i]); - pa = TTE_GET_PA(&kernel_ttes[i]); + pa = kernel_tlbs[i].te_pa; + va = kernel_tlbs[i].te_va; for (off = 0; off < PAGE_SIZE_4M; off += PAGE_SIZE) { tp = tsb_kvtotte(va + off); tp->tte_vpn = TV_VPN(va + off); @@ -396,7 +392,6 @@ for (i = 0; i < MAXCPU; i++) pm->pm_context[i] = TLB_CTX_KERNEL; pm->pm_active = ~0; - TAILQ_INIT(&pm->pm_pvlist); /* XXX flush all non-locked tlb entries */ } @@ -521,8 +516,8 @@ vm_page_t m; m = &vm_page_array[i]; - TAILQ_INIT(&m->md.pv_list); - m->md.pv_list_count = 0; + STAILQ_INIT(&m->md.tte_list); + m->md.flags = 0; } for (i = 0; i < translations_size; i++) { @@ -536,10 +531,6 @@ panic("pmap_init: vm_map_find"); } - pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); - uma_zone_set_allocf(pvzone, pv_allocf); - uma_prealloc(pvzone, vm_page_array_size); pmap_initialized = TRUE; } @@ -551,13 +542,6 @@ void pmap_init2(void) { - int shpgperproc; - - shpgperproc = PMAP_SHPGPERPROC; - TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + vm_page_array_size; - pv_entry_high_water = 9 * (pv_entry_max / 10); - uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); } /* @@ -597,10 +581,7 @@ pmap_cache_enter(vm_page_t m, vm_offset_t va) { struct tte *tp; - vm_offset_t pa; - pv_entry_t pv; - int c; - int i; + int c, i; CTR2(KTR_PMAP, "pmap_cache_enter: m=%p va=%#lx", m, va); PMAP_STATS_INC(pmap_ncache_enter); @@ -619,21 +600,21 @@ return (0); } CTR0(KTR_PMAP, "pmap_cache_enter: marking uncacheable"); - TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - if ((tp = tsb_tte_lookup(pv->pv_pmap, pv->pv_va)) != NULL) { - atomic_clear_long(&tp->tte_data, TD_CV); - tlb_page_demap(TLB_DTLB | TLB_ITLB, pv->pv_pmap, - pv->pv_va); - } + STAILQ_FOREACH(tp, &m->md.tte_list, tte_link) { + tp->tte_data &= ~TD_CV; + tlb_page_demap(TLB_DTLB | TLB_ITLB, TTE_GET_PMAP(tp), + TTE_GET_VA(tp)); } - pa = VM_PAGE_TO_PHYS(m); - dcache_page_inval(pa); + dcache_page_inval(VM_PAGE_TO_PHYS(m)); + m->md.flags |= PG_UNCACHEABLE; return (0); } void pmap_cache_remove(vm_page_t m, vm_offset_t va) { + struct tte *tp; + int c, i; CTR3(KTR_PMAP, "pmap_cache_remove: m=%p va=%#lx c=%d", m, va, m->md.colors[DCACHE_COLOR(va)]); @@ -641,6 +622,18 @@ ("pmap_cache_remove: no mappings %d <= 0", m->md.colors[DCACHE_COLOR(va)])); m->md.colors[DCACHE_COLOR(va)]--; + for (i = 0, c = 0; i < DCACHE_COLORS; i++) { + if (m->md.colors[i] != 0) + c++; + } + if (c != 1 || (m->md.flags & PG_UNCACHEABLE) == 0) + return; + STAILQ_FOREACH(tp, &m->md.tte_list, tte_link) { + tp->tte_data |= TD_CV; + tlb_page_demap(TLB_DTLB | TLB_ITLB, TTE_GET_PMAP(tp), + TTE_GET_VA(tp)); + } + m->md.flags &= ~PG_UNCACHEABLE; } /* @@ -649,14 +642,31 @@ void pmap_kenter(vm_offset_t va, vm_offset_t pa) { + vm_offset_t ova; struct tte *tp; + vm_page_t om; + vm_page_t m; + u_long data; tp = tsb_kvtotte(va); + m = PHYS_TO_VM_PAGE(pa); CTR4(KTR_PMAP, "pmap_kenter: va=%#lx pa=%#lx tp=%p data=%#lx", va, pa, tp, tp->tte_data); + if ((tp->tte_data & TD_V) != 0) { + om = PHYS_TO_VM_PAGE(TTE_GET_PA(tp)); + ova = TTE_GET_VA(tp); + STAILQ_REMOVE(&om->md.tte_list, tp, tte, tte_link); + pmap_cache_remove(om, ova); + if (va != ova) + tlb_page_demap(TLB_DTLB, kernel_pmap, ova); + } + data = TD_V | TD_8K | TD_PA(pa) | TD_REF | TD_SW | TD_CP | TD_P | TD_W; + if (pmap_cache_enter(m, va) != 0) + data |= TD_CV; tp->tte_vpn = TV_VPN(va); - tp->tte_data = TD_V | TD_8K | TD_PA(pa) | TD_REF | TD_SW | TD_CP | - TD_CV | TD_P | TD_W; + tp->tte_data = data; + STAILQ_INSERT_TAIL(&m->md.tte_list, tp, tte_link); + tp->tte_pmap = kernel_pmap; } /* @@ -696,13 +706,15 @@ pmap_kremove(vm_offset_t va) { struct tte *tp; + vm_page_t m; tp = tsb_kvtotte(va); CTR3(KTR_PMAP, "pmap_kremove: va=%#lx tp=%p data=%#lx", va, tp, tp->tte_data); - atomic_clear_long(&tp->tte_data, TD_V); - tp->tte_vpn = 0; - tp->tte_data = 0; + m = PHYS_TO_VM_PAGE(TTE_GET_PA(tp)); + STAILQ_REMOVE(&m->md.tte_list, tp, tte, tte_link); + pmap_cache_remove(m, va); + TTE_ZERO(tp); } /* @@ -1100,7 +1112,6 @@ pm->pm_active = 0; pm->pm_tsb = NULL; pm->pm_tsb_obj = NULL; - TAILQ_INIT(&pm->pm_pvlist); bzero(&pm->pm_stats, sizeof(pm->pm_stats)); } @@ -1148,7 +1159,6 @@ for (i = 0; i < MAXCPU; i++) pm->pm_context[i] = -1; pm->pm_active = 0; - TAILQ_INIT(&pm->pm_pvlist); bzero(&pm->pm_stats, sizeof(pm->pm_stats)); } @@ -1173,8 +1183,6 @@ pm->pm_context[PCPU_GET(cpuid)], pm->pm_tsb); obj = pm->pm_tsb_obj; KASSERT(obj->ref_count == 1, ("pmap_release: tsbobj ref count != 1")); - KASSERT(TAILQ_EMPTY(&pm->pm_pvlist), - ("pmap_release: leaking pv entries")); KASSERT(pmap_resident_count(pm) == 0, ("pmap_release: resident pages %ld != 0", pmap_resident_count(pm))); @@ -1206,32 +1214,16 @@ void pmap_collect(void) { - static int warningdone; - vm_page_t m; - int i; - - if (pmap_pagedaemon_waken == 0) - return; - if (warningdone++ < 5) - printf("pmap_collect: collecting pv entries -- suggest" - "increasing PMAP_SHPGPERPROC\n"); - for (i = 0; i < vm_page_array_size; i++) { - m = &vm_page_array[i]; - if (m->wire_count || m->hold_count || m->busy || - (m->flags & (PG_BUSY | PG_UNMANAGED))) - continue; - pv_remove_all(m); - } - pmap_pagedaemon_waken = 0; } -static int +int pmap_remove_tte(struct pmap *pm, struct pmap *pm2, struct tte *tp, vm_offset_t va) { vm_page_t m; m = PHYS_TO_VM_PAGE(TTE_GET_PA(tp)); + STAILQ_REMOVE(&m->md.tte_list, tp, tte, tte_link); if ((tp->tte_data & TD_WIRED) != 0) pm->pm_stats.wired_count--; if ((tp->tte_data & TD_PV) != 0) { @@ -1240,12 +1232,12 @@ vm_page_dirty(m); if ((tp->tte_data & TD_REF) != 0) vm_page_flag_set(m, PG_REFERENCED); - pv_remove(pm, m, va); - pmap_cache_remove(m, va); + if (STAILQ_EMPTY(&m->md.tte_list)) + vm_page_flag_clear(m, PG_MAPPED | PG_WRITEABLE); + pm->pm_stats.resident_count--; } - atomic_clear_long(&tp->tte_data, TD_V); - tp->tte_vpn = 0; - tp->tte_data = 0; + pmap_cache_remove(m, va); + TTE_ZERO(tp); if (PMAP_REMOVE_DONE(pm)) return (0); return (1); @@ -1278,7 +1270,41 @@ } } -static int +void +pmap_remove_all(vm_page_t m) +{ + struct pmap *pm; + struct tte *tpn; + struct tte *tp; + vm_offset_t va; + + KASSERT((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0, + ("pv_remove_all: illegal for unmanaged page %#lx", + VM_PAGE_TO_PHYS(m))); + for (tp = STAILQ_FIRST(&m->md.tte_list); tp != NULL; tp = tpn) { + tpn = STAILQ_NEXT(tp, tte_link); + if ((tp->tte_data & TD_PV) == 0) + continue; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 1:10:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E53A37B405; Wed, 29 May 2002 01:10:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from evilpete.dyndns.org (12-232-26-46.client.attbi.com [12.232.26.46]) by hub.freebsd.org (Postfix) with ESMTP id 2015237B401; Wed, 29 May 2002 01:10:35 -0700 (PDT) Received: from overcee.wemm.org ([10.0.0.3]) by evilpete.dyndns.org (8.11.6/8.11.6) with ESMTP id g4T8AY162953; Wed, 29 May 2002 01:10:34 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 36CFA380A; Wed, 29 May 2002 01:10:34 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Marcel Moolenaar Cc: Perforce Change Reviews Subject: Re: PERFORCE change 12050 for review In-Reply-To: <200205290716.g4T7Ggp39541@freefall.freebsd.org> Date: Wed, 29 May 2002 01:10:34 -0700 From: Peter Wemm Message-Id: <20020529081034.36CFA380A@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Sorry about this mismerge. I had my hands full when I managed to panic my desktop 4 times in a row at work this evening. Whee! It was especially fun when I was ssh'ing to boxes for c++ test bulds. :-] Marcel Moolenaar wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12050 > > Change 12050 by marcel@marcel_vaio on 2002/05/29 00:15:51 > > IFC geom_gpt.c depends on option GEOM_GPT > > Affected files ... > > ... //depot/projects/ia64/sys/conf/files#27 edit > > Differences ... > > ==== //depot/projects/ia64/sys/conf/files#27 (text+ko) ==== > > @@ -723,7 +723,7 @@ > geom/geom_dump.c optional geom > geom/geom_enc.c optional geom > geom/geom_event.c optional geom > -geom/geom_gpt.c optional geom > +geom/geom_gpt.c optional geom geom_gpt > geom/geom_io.c optional geom > geom/geom_kern.c optional geom > geom/geom_mbr.c optional geom > Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 1:11:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C401B37B406; Wed, 29 May 2002 01:11:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 02A5737B405 for ; Wed, 29 May 2002 01:11:51 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4T8BoG48685 for perforce@freebsd.org; Wed, 29 May 2002 01:11:50 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 29 May 2002 01:11:50 -0700 (PDT) Message-Id: <200205290811.g4T8BoG48685@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 12054 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12054 Change 12054 by peter@peter_daintree on 2002/05/29 01:11:14 Revert - no longer needed now that ia64/include/elf.h defines this. Affected files ... ... //depot/projects/ia64/libexec/rtld-elf/rtld.h#4 edit Differences ... ==== //depot/projects/ia64/libexec/rtld-elf/rtld.h#4 (text+ko) ==== @@ -38,10 +38,6 @@ #include "rtld_machdep.h" -#ifdef __ia64__ -__ElfType(Auxinfo); /* XXX needed for ia64, breaks other platforms */ -#endif - #ifndef STANDARD_LIBRARY_PATH #define STANDARD_LIBRARY_PATH "/usr/lib/elf:/usr/lib" #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 1:19:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 476C937B41A; Wed, 29 May 2002 01:19:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DF93237B40C for ; Wed, 29 May 2002 01:18:59 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4T8Ix849158 for perforce@freebsd.org; Wed, 29 May 2002 01:18:59 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 29 May 2002 01:18:59 -0700 (PDT) Message-Id: <200205290818.g4T8Ix849158@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 12055 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12055 Change 12055 by peter@peter_daintree on 2002/05/29 01:18:40 Fix a bit more that got out of sync. Affected files ... ... //depot/projects/ia64/sys/kern/kern_uuid.c#4 edit ... //depot/projects/ia64/usr.bin/uuidgen/Makefile#3 edit ... //depot/projects/ia64/usr.bin/uuidgen/uuidgen.1#3 edit ... //depot/projects/ia64/usr.bin/uuidgen/uuidgen.c#5 edit Differences ... ==== //depot/projects/ia64/sys/kern/kern_uuid.c#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$ + * $FreeBSD: src/sys/kern/kern_uuid.c,v 1.1 2002/05/28 06:16:07 marcel Exp $ */ #include ==== //depot/projects/ia64/usr.bin/uuidgen/Makefile#3 (text+ko) ==== @@ -1,5 +1,6 @@ -# $FreeBSD$ +# $FreeBSD: src/usr.bin/uuidgen/Makefile,v 1.1 2002/05/28 06:16:08 marcel Exp $ PROG= uuidgen +WARNS?= 4 .include ==== //depot/projects/ia64/usr.bin/uuidgen/uuidgen.1#3 (text+ko) ==== @@ -22,7 +22,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$ +.\" $FreeBSD: src/usr.bin/uuidgen/uuidgen.1,v 1.1 2002/05/28 06:16:08 marcel Exp $ .\" .Dd May 23, 2002 .Dt UUIDGEN 1 ==== //depot/projects/ia64/usr.bin/uuidgen/uuidgen.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/usr.bin/uuidgen/uuidgen.c,v 1.1 2002/05/28 06:16:08 marcel Exp $"); #include #include @@ -39,13 +39,14 @@ #include static void -usage() +usage(void) { (void)fprintf(stderr, "usage: uuidgen [-1] [-n count]\n"); exit(1); } -void uuid_print(uuid_t *uuid) +static void +uuid_print(uuid_t *uuid) { printf("%08x-%04x-%04x-%02x%02x-", uuid->time_low, uuid->time_mid, uuid->time_hi_and_version, uuid->clock_seq_hi_and_reserved, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 1:21: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89C8B37B408; Wed, 29 May 2002 01:21:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CDE1337B407 for ; Wed, 29 May 2002 01:21:02 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4T8L2A49756 for perforce@freebsd.org; Wed, 29 May 2002 01:21:02 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 29 May 2002 01:21:02 -0700 (PDT) Message-Id: <200205290821.g4T8L2A49756@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 12056 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12056 Change 12056 by peter@peter_daintree on 2002/05/29 01:20:34 Oops, missed this one too. Have I mentioned that I will be more careful next time with the forced integrates? :-] Affected files ... ... //depot/projects/ia64/sys/sys/uuid.h#5 edit Differences ... ==== //depot/projects/ia64/sys/sys/uuid.h#5 (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$ + * $FreeBSD: src/sys/sys/uuid.h,v 1.1 2002/05/28 06:16:07 marcel Exp $ */ #ifndef _SYS_UUID_H_ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 1:30:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BE6E37B404; Wed, 29 May 2002 01:30:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E141F37B403 for ; Wed, 29 May 2002 01:30:14 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4T8UE150466 for perforce@freebsd.org; Wed, 29 May 2002 01:30:14 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 29 May 2002 01:30:14 -0700 (PDT) Message-Id: <200205290830.g4T8UE150466@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 12058 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12058 Change 12058 by peter@peter_daintree on 2002/05/29 01:29:50 This is still needed to be excluded on sparc64. Affected files ... ... //depot/projects/ia64/lib/Makefile#12 edit Differences ... ==== //depot/projects/ia64/lib/Makefile#12 (text+ko) ==== @@ -39,7 +39,7 @@ _csu=csu .endif -.if !defined(NOLIBC_R) +.if !defined(NOLIBC_R) && ${MACHINE_ARCH} != sparc64 _libc_r= libc_r .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 1:32:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3F9A37B405; Wed, 29 May 2002 01:32:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2E4D937B40C for ; Wed, 29 May 2002 01:32:19 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4T8WIg50990 for perforce@freebsd.org; Wed, 29 May 2002 01:32:18 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 29 May 2002 01:32:18 -0700 (PDT) Message-Id: <200205290832.g4T8WIg50990@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 12059 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12059 Change 12059 by peter@peter_daintree on 2002/05/29 01:31:17 revert. This problem was probably a cross or early toolchain wart. Affected files ... ... //depot/projects/ia64/contrib/opie/libopie/writerec.c#4 edit Differences ... ==== //depot/projects/ia64/contrib/opie/libopie/writerec.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ #include #include "opie.h" -static char *__opienone = "****************"; +char *__opienone = "****************"; int __opiewriterec FUNCTION((opie), struct opie *opie) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 1:33:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A42037B407; Wed, 29 May 2002 01:33:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CA14C37B406 for ; Wed, 29 May 2002 01:33:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4T8XKl51051 for perforce@freebsd.org; Wed, 29 May 2002 01:33:20 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 29 May 2002 01:33:20 -0700 (PDT) Message-Id: <200205290833.g4T8XKl51051@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 12060 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12060 Change 12060 by peter@peter_daintree on 2002/05/29 01:33:01 Somehow, I do not think we are quite ready for processes that have terrabytes of VM yet. I know we can *do* it, but it is not exactly usable. Affected files ... ... //depot/projects/ia64/contrib/top/utils.c#4 edit Differences ... ==== //depot/projects/ia64/contrib/top/utils.c#4 (text+ko) ==== @@ -464,11 +464,6 @@ { amt = (amt + 512) / 1024; tag = 'G'; - if (amt >= 10000) - { - amt = (amt + 512) / 1024; - tag = 'T'; - } } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 1:37:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB8E937B405; Wed, 29 May 2002 01:37:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1983C37B404 for ; Wed, 29 May 2002 01:37:26 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4T8bPx51289 for perforce@freebsd.org; Wed, 29 May 2002 01:37:25 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 29 May 2002 01:37:25 -0700 (PDT) Message-Id: <200205290837.g4T8bPx51289@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 12061 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12061 Change 12061 by peter@peter_daintree on 2002/05/29 01:37:05 revert to freebsd. Affected files ... ... //depot/projects/ia64/usr.bin/ncal/Makefile#5 edit Differences ... ==== //depot/projects/ia64/usr.bin/ncal/Makefile#5 (text+ko) ==== @@ -8,6 +8,5 @@ LINKS= ${BINDIR}/ncal ${BINDIR}/cal MLINKS= ncal.1 cal.1 -WARNS?= 1 .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 1:42:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AD9537B401; Wed, 29 May 2002 01:42:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id ABB3C37B403 for ; Wed, 29 May 2002 01:42:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4T8gWg52004 for perforce@freebsd.org; Wed, 29 May 2002 01:42:32 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 29 May 2002 01:42:32 -0700 (PDT) Message-Id: <200205290842.g4T8gWg52004@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 12062 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12062 Change 12062 by peter@peter_daintree on 2002/05/29 01:42:13 IFC @12061 (the most impressed IFC to date :-) Affected files ... ... //depot/projects/ia64/sys/vm/uma_dbg.c#5 integrate Differences ... ==== //depot/projects/ia64/sys/vm/uma_dbg.c#5 (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/sys/vm/uma_dbg.c,v 1.4 2002/05/02 09:07:04 jeff Exp $ + * $FreeBSD: src/sys/vm/uma_dbg.c,v 1.5 2002/05/29 08:25:13 peter Exp $ * */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 7:29:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 952BD37B403; Wed, 29 May 2002 07:29:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8F39237B400 for ; Wed, 29 May 2002 07:29:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4TETgb19707 for perforce@freebsd.org; Wed, 29 May 2002 07:29:42 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Wed, 29 May 2002 07:29:42 -0700 (PDT) Message-Id: <200205291429.g4TETgb19707@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12066 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12066 Change 12066 by jhb@jhb_laptop on 2002/05/29 07:28:41 Spin w/o holding sched_lock until mtx_lock changes when we are adaptively spinning. Affected files ... ... //depot/projects/smpng/sys/kern/kern_mutex.c#34 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#34 (text+ko) ==== @@ -533,9 +533,11 @@ if (m != &Giant && owner->td_kse != NULL && owner->td_kse->ke_oncpu != NOCPU) { mtx_unlock_spin(&sched_lock); + while (mtx_owner(m) == owner) { #ifdef __i386__ - cpu_pause(); + cpu_pause(); #endif + } continue; } #endif /* SMP && ADAPTIVE_MUTEXES */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 7:34:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 847E737B409; Wed, 29 May 2002 07:34:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from angelica.unixdaemons.com (angelica.unixdaemons.com [209.148.64.135]) by hub.freebsd.org (Postfix) with ESMTP id BA5F237B405; Wed, 29 May 2002 07:34:33 -0700 (PDT) Received: from angelica.unixdaemons.com (bmilekic@localhost.unixdaemons.com [127.0.0.1]) by angelica.unixdaemons.com (8.12.3/8.12.1) with ESMTP id g4TEYSMR068522; Wed, 29 May 2002 10:34:28 -0400 (EDT) X-Authentication-Warning: angelica.unixdaemons.com: Host bmilekic@localhost.unixdaemons.com [127.0.0.1] claimed to be angelica.unixdaemons.com Received: (from bmilekic@localhost) by angelica.unixdaemons.com (8.12.3/8.12.1/Submit) id g4TEYSZo068521; Wed, 29 May 2002 10:34:28 -0400 (EDT) (envelope-from bmilekic) Date: Wed, 29 May 2002 10:34:28 -0400 From: Bosko Milekic To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 12066 for review Message-ID: <20020529103428.A68375@unixdaemons.com> References: <200205291429.g4TETgb19707@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <200205291429.g4TETgb19707@freefall.freebsd.org>; from jhb@freebsd.org on Wed, May 29, 2002 at 07:29:42AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG This is a great change. How soon will we see it in CVS? On Wed, May 29, 2002 at 07:29:42AM -0700, John Baldwin wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12066 > > Change 12066 by jhb@jhb_laptop on 2002/05/29 07:28:41 > > Spin w/o holding sched_lock until mtx_lock changes when we are > adaptively spinning. > > Affected files ... > > ... //depot/projects/smpng/sys/kern/kern_mutex.c#34 edit > > Differences ... > > ==== //depot/projects/smpng/sys/kern/kern_mutex.c#34 (text+ko) ==== > > @@ -533,9 +533,11 @@ > if (m != &Giant && owner->td_kse != NULL && > owner->td_kse->ke_oncpu != NOCPU) { > mtx_unlock_spin(&sched_lock); > + while (mtx_owner(m) == owner) { > #ifdef __i386__ > - cpu_pause(); > + cpu_pause(); > #endif > + } > continue; > } > #endif /* SMP && ADAPTIVE_MUTEXES */ > -- Bosko Milekic bmilekic@unixdaemons.com bmilekic@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 7:40:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 388D337B401; Wed, 29 May 2002 07:40:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by hub.freebsd.org (Postfix) with ESMTP id 119D837B400 for ; Wed, 29 May 2002 07:40:07 -0700 (PDT) Received: (qmail 9343 invoked from network); 29 May 2002 14:40:05 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 29 May 2002 14:40:05 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g4TEeJF27951; Wed, 29 May 2002 10:40:19 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20020529103428.A68375@unixdaemons.com> Date: Wed, 29 May 2002 10:39:45 -0400 (EDT) From: John Baldwin To: Bosko Milekic Subject: Re: PERFORCE change 12066 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 29-May-2002 Bosko Milekic wrote: > > This is a great change. How soon will we see it in CVS? When it's tested. I really try to avoid committing untested stuff, but sometimes it is tempting for simple stuff like this. > On Wed, May 29, 2002 at 07:29:42AM -0700, John Baldwin wrote: >> http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12066 >> >> Change 12066 by jhb@jhb_laptop on 2002/05/29 07:28:41 >> >> Spin w/o holding sched_lock until mtx_lock changes when we are >> adaptively spinning. >> >> Affected files ... >> >> ... //depot/projects/smpng/sys/kern/kern_mutex.c#34 edit >> >> Differences ... >> >> ==== //depot/projects/smpng/sys/kern/kern_mutex.c#34 (text+ko) ==== >> >> @@ -533,9 +533,11 @@ >> if (m != &Giant && owner->td_kse != NULL && >> owner->td_kse->ke_oncpu != NOCPU) { >> mtx_unlock_spin(&sched_lock); >> + while (mtx_owner(m) == owner) { >> #ifdef __i386__ >> - cpu_pause(); >> + cpu_pause(); >> #endif >> + } >> continue; >> } >> #endif /* SMP && ADAPTIVE_MUTEXES */ >> > > -- > Bosko Milekic > bmilekic@unixdaemons.com > bmilekic@FreeBSD.org > -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 11:52:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DC9437B404; Wed, 29 May 2002 11:52:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4073637B408 for ; Wed, 29 May 2002 11:52:27 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4TIqRW69276 for perforce@freebsd.org; Wed, 29 May 2002 11:52:27 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 29 May 2002 11:52:27 -0700 (PDT) Message-Id: <200205291852.g4TIqRW69276@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 12085 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12085 Change 12085 by peter@peter_daintree on 2002/05/29 11:52:10 Revert changes here. It was wishful thinking as the nested data tlb faults tell me. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#18 edit ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#21 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#18 (text+ko) ==== @@ -216,7 +216,11 @@ * recording a trapframe. */ ks = contigmalloc(KSTACK_PAGES * PAGE_SIZE, M_TEMP, - M_WAITOK, 0ul, ~0ul, PAGE_SIZE, 0ul); + M_WAITOK, + 0ul, + 256*1024*1024 - 1, + PAGE_SIZE, + 256*1024*1024); ap_stack = IA64_PHYS_TO_RR7(ia64_tpa((u_int64_t)ks)); ap_pcpu = pc; ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#21 (text+ko) ==== @@ -716,10 +716,16 @@ struct user *up; /* - * contigmalloc is no longer needed here. + * Use contigmalloc for user area so that we can use a region + * 7 address for it which makes it impossible to accidentally + * lose when recording a trapframe. */ - up = contigmalloc(UAREA_PAGES * PAGE_SIZE, M_PMAP, M_WAITOK, - 0ul, ~0ul, PAGE_SIZE, 0ul); + up = contigmalloc(UAREA_PAGES * PAGE_SIZE, M_PMAP, + M_WAITOK, + 0ul, + 256*1024*1024 - 1, + PAGE_SIZE, + 256*1024*1024); if (up == NULL) panic("pmap_new_proc: could not contigmalloc %d pages\n", @@ -767,11 +773,16 @@ vm_offset_t *ks; /* - * Use contigmalloc for the kernel stack so that the pages - * can be used via physical addressing in the exception code. + * Use contigmalloc for user area so that we can use a region + * 7 address for it which makes it impossible to accidentally + * lose when recording a trapframe. */ - ks = contigmalloc(KSTACK_PAGES * PAGE_SIZE, M_PMAP, M_WAITOK, - 0ul, ~0ul, PAGE_SIZE, 0ul); + ks = contigmalloc(KSTACK_PAGES * PAGE_SIZE, M_PMAP, + M_WAITOK, + 0ul, + 256*1024*1024 - 1, + PAGE_SIZE, + 256*1024*1024); if (ks == NULL) panic("pmap_new_thread: could not contigmalloc %d pages\n", To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 12:36:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A06637B409; Wed, 29 May 2002 12:36:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 99DC637B403 for ; Wed, 29 May 2002 12:36:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4TJaMK79460 for perforce@freebsd.org; Wed, 29 May 2002 12:36:22 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 29 May 2002 12:36:22 -0700 (PDT) Message-Id: <200205291936.g4TJaMK79460@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12090 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12090 Change 12090 by julian@julian_ref on 2002/05/29 12:35:49 Patch (with duct tape) a bit of the worst libkvm broken-ness. Affected files ... ... //depot/projects/kse/lib/libkvm/kvm_proc.c#12 edit ... //depot/projects/kse/sys/sys/proc.h#102 edit Differences ... ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#12 (text+ko) ==== @@ -325,10 +325,24 @@ kp->ki_estcpu = proc.p_ksegrp.kg_estcpu; /* XXXKSE */ kp->ki_slptime = proc.p_kse.ke_slptime; /* XXXKSE */ kp->ki_swtime = proc.p_swtime; - kp->ki_flag = proc.p_flag; + kp->ki_flag = proc.p_flag; /* WILDLY INNACURATE XXXKSE */ kp->ki_sflag = proc.p_sflag; kp->ki_wchan = mainthread.td_wchan; /* XXXKSE */ kp->ki_traceflag = proc.p_traceflag; + if (proc.p_state == PRS_NORMAL) { /* XXXKSE very aproximate */ + if ((mainthread.td_state == TDS_RUN) || + (mainthread.td_state == TDS_RUNNING) { + kp->ki_stat = SRUN; + } else if (mainthread.td_state == TDS_SLEEP) { + kp->ki_stat = SSLEEP; + } else if (P_SHOULDSTOP(&proc)) { + kp->ki_stat = SSTOP; + } + } else (proc.p_state == PRS_ZOMBIE) { + kp->ki_stat = SZOMB; + } else { + kp->ki_stat = SIDL; + } kp->ki_stat = proc.p_state; kp->ki_pri.pri_class = proc.p_ksegrp.kg_pri_class; /* XXXKSE */ kp->ki_pri.pri_user = proc.p_ksegrp.kg_user_pri; /* XXXKSE */ ==== //depot/projects/kse/sys/sys/proc.h#102 (text+ko) ==== @@ -523,9 +523,6 @@ #define P_KTHREAD 0x00004 /* Kernel thread. (*)*/ #define P_NOLOAD 0x00008 /* Ignore during load avg calculations. */ #define P_PPWAIT 0x00010 /* Parent is waiting for child to exec/exit. */ -/*#define P_SPARE 0x00020 *//* SPARE */ -/*#define P_SPARE 0x00040 *//* SPARE */ -/*#define P_SPARE 0x00080 *//* SPARE */ #define P_SUGID 0x00100 /* Had set id privileges since last exec. */ #define P_SYSTEM 0x00200 /* System proc: no sigs, stats or swapping. */ #define P_WAITED 0x01000 /* Someone is waiting for us */ @@ -560,6 +557,14 @@ #define PS_SWAPPING 0x00200 /* Process is being swapped. */ #define PS_NEEDSIGCHK 0x02000 /* Process may need signal delivery. */ +#ifndef _KERNEL /* Only usable by libkvm for legacy apps */ +#define SIDL 1 /* Process being created by fork. */ +#define SRUN 2 /* Currently runnable. */ +#define SSLEEP 3 /* Sleeping on an address. */ +#define SSTOP 4 /* Process debugging or suspension. */ +#define SZOMB 5 /* Awaiting collection by parent. */ +#endif + #define P_MAGIC 0xbeefface #ifdef _KERNEL To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 12:44:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33F1037B401; Wed, 29 May 2002 12:44:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by hub.freebsd.org (Postfix) with ESMTP id DE23537B403 for ; Wed, 29 May 2002 12:44:42 -0700 (PDT) Received: (from marcel@localhost) by kayak.xcllnt.net (8.11.6/8.11.4) id g4TJifG65025; Wed, 29 May 2002 12:44:41 -0700 (PDT) (envelope-from marcel) Date: Wed, 29 May 2002 12:44:41 -0700 From: Marcel Moolenaar To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 12050 for review Message-ID: <20020529124441.A64995@kayak.xcllnt.net> References: <200205290716.g4T7Ggp39541@freefall.freebsd.org> <20020529081034.36CFA380A@overcee.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020529081034.36CFA380A@overcee.wemm.org> User-Agent: Mutt/1.3.22.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, May 29, 2002 at 01:10:34AM -0700, Peter Wemm wrote: > Sorry about this mismerge. I had my hands full when I managed to panic my > desktop 4 times in a row at work this evening. Whee! It was especially > fun when I was ssh'ing to boxes for c++ test bulds. :-] No problem. With the automaticly updated diff (excellent idea, BTW!) it's easy enough to detect and fix. So, don't worry about it if you're busy doing something else... -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 12:49:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98D8737B40A; Wed, 29 May 2002 12:49:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EC99C37B404 for ; Wed, 29 May 2002 12:49:43 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4TJnhg80790 for perforce@freebsd.org; Wed, 29 May 2002 12:49:43 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 29 May 2002 12:49:43 -0700 (PDT) Message-Id: <200205291949.g4TJnhg80790@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12093 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12093 Change 12093 by julian@julian_ref on 2002/05/29 12:48:42 More patches to libkvm Affected files ... ... //depot/projects/kse/lib/libkvm/kvm_proc.c#13 edit Differences ... ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#13 (text+ko) ==== @@ -337,13 +337,16 @@ kp->ki_stat = SSLEEP; } else if (P_SHOULDSTOP(&proc)) { kp->ki_stat = SSTOP; + } else if (td->td_state == TDS_MTX) { + kp->ki_stat = SMTX; + } else { + kp->ki_stat = SWAIT; } } else (proc.p_state == PRS_ZOMBIE) { kp->ki_stat = SZOMB; } else { kp->ki_stat = SIDL; } - kp->ki_stat = proc.p_state; kp->ki_pri.pri_class = proc.p_ksegrp.kg_pri_class; /* XXXKSE */ kp->ki_pri.pri_user = proc.p_ksegrp.kg_user_pri; /* XXXKSE */ kp->ki_pri.pri_level = mainthread.td_priority; /* XXXKSE */ @@ -758,7 +761,7 @@ if (sysctl(mib, 4, &newkp, &len, NULL, 0) == -1) return (0); return (curkp->ki_pid == newkp.ki_pid && - (newkp.ki_stat != PRS_ZOMBIE || curkp->ki_stat == PRS_ZOMBIE)); + (newkp.ki_stat != SZOMB || curkp->ki_stat == SZOMB)); } static char ** @@ -785,7 +788,7 @@ /* * Pointers are stored at the top of the user stack. */ - if (kp->ki_stat == PRS_ZOMBIE || + if (kp->ki_stat == SZOMB || kvm_uread(kd, kp, ps_strings, (char *)&arginfo, sizeof(arginfo)) != sizeof(arginfo)) return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 12:52:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C15B37B401; Wed, 29 May 2002 12:52:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0B9EB37B412 for ; Wed, 29 May 2002 12:51:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4TJplr81442 for perforce@freebsd.org; Wed, 29 May 2002 12:51:47 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 29 May 2002 12:51:47 -0700 (PDT) Message-Id: <200205291951.g4TJplr81442@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12095 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12095 Change 12095 by julian@julian_ref on 2002/05/29 12:51:08 Report process status as if we were an old-type process (no threads) Need a new API/ABI for threaded processes. Affected files ... ... //depot/projects/kse/sys/kern/kern_proc.c#61 edit ... //depot/projects/kse/sys/sys/proc.h#103 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_proc.c#61 (text+ko) ==== @@ -726,7 +726,26 @@ sizeof(kp->ki_mtxname) - 1); } } - kp->ki_stat = p->p_state; /* XXXKSE Doesn't MAP */ + + if (p->p_state == PRS_NORMAL) { /* XXXKSE very aproximate */ + if ((td->td_state == TDS_RUN) || + (td->td_state == TDS_RUNNING) { + kp->ki_stat = SRUN; + } else if (td->td_state == TDS_SLEEP) { + kp->ki_stat = SSLEEP; + } else if (P_SHOULDSTOP(p)) { + kp->ki_stat = SSTOP; + } else if (td->td_state == TDS_MTX) { + kp->ki_stat = SMTX; + } else { + kp->ki_stat = SWAIT; + } + } else (p->p_state == PRS_ZOMBIE) { + kp->ki_stat = SZOMB; + } else { + kp->ki_stat = SIDL; + } + kp->ki_sflag = p->p_sflag; kp->ki_swtime = p->p_swtime; kp->ki_traceflag = p->p_traceflag; ==== //depot/projects/kse/sys/sys/proc.h#103 (text+ko) ==== @@ -563,6 +563,8 @@ #define SSLEEP 3 /* Sleeping on an address. */ #define SSTOP 4 /* Process debugging or suspension. */ #define SZOMB 5 /* Awaiting collection by parent. */ +#define SWAIT 6 /* Waiting for interrupt. */ +#define SMTX 7 /* Blocked on a mutex. */ #endif #define P_MAGIC 0xbeefface To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 13: 0:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B485637B400; Wed, 29 May 2002 13:00:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EF7AC37B41C for ; Wed, 29 May 2002 12:59:57 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4TJxvF82251 for perforce@freebsd.org; Wed, 29 May 2002 12:59:57 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 29 May 2002 12:59:57 -0700 (PDT) Message-Id: <200205291959.g4TJxvF82251@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12097 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12097 Change 12097 by julian@julian_ref on 2002/05/29 12:59:46 oops, successfully cut-n-pasted the same typo to 2 places Affected files ... ... //depot/projects/kse/lib/libkvm/kvm_proc.c#14 edit ... //depot/projects/kse/sys/kern/kern_proc.c#62 edit Differences ... ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#14 (text+ko) ==== @@ -331,7 +331,7 @@ kp->ki_traceflag = proc.p_traceflag; if (proc.p_state == PRS_NORMAL) { /* XXXKSE very aproximate */ if ((mainthread.td_state == TDS_RUN) || - (mainthread.td_state == TDS_RUNNING) { + (mainthread.td_state == TDS_RUNNING)) { kp->ki_stat = SRUN; } else if (mainthread.td_state == TDS_SLEEP) { kp->ki_stat = SSLEEP; ==== //depot/projects/kse/sys/kern/kern_proc.c#62 (text+ko) ==== @@ -729,7 +729,7 @@ if (p->p_state == PRS_NORMAL) { /* XXXKSE very aproximate */ if ((td->td_state == TDS_RUN) || - (td->td_state == TDS_RUNNING) { + (td->td_state == TDS_RUNNING)) { kp->ki_stat = SRUN; } else if (td->td_state == TDS_SLEEP) { kp->ki_stat = SSLEEP; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 14:19:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D87237B40B; Wed, 29 May 2002 14:19:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0CA0337B40A for ; Wed, 29 May 2002 14:19:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4TLJcx00699 for perforce@freebsd.org; Wed, 29 May 2002 14:19:38 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 29 May 2002 14:19:38 -0700 (PDT) Message-Id: <200205292119.g4TLJcx00699@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12104 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12104 Change 12104 by julian@julian_ref on 2002/05/29 14:18:48 fix a comment Affected files ... ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#44 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#44 (text+ko) ==== @@ -394,7 +394,7 @@ frame = td->td_frame; frame->tf_eax = retval; /* Child returns zero */ - frame->tf_edx = aux; /* I dunno */ + frame->tf_edx = aux; /* for 64 bit or multiple values */ if (success) frame->tf_eflags &= ~PSL_C; /* success */ else To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 14:22:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6D5B37B406; Wed, 29 May 2002 14:22:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2636F37B405 for ; Wed, 29 May 2002 14:22:43 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4TLMg801353 for perforce@freebsd.org; Wed, 29 May 2002 14:22:42 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 29 May 2002 14:22:42 -0700 (PDT) Message-Id: <200205292122.g4TLMg801353@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12105 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12105 Change 12105 by julian@julian_ref on 2002/05/29 14:21:49 remove unused field Affected files ... ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#45 edit ... //depot/projects/kse/sys/i386/include/pcb_ext.h#8 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#45 (text+ko) ==== @@ -274,7 +274,7 @@ #endif if (pcb->pcb_ext != 0) { /* XXXKSE XXXSMP not SMP SAFE.. what locks do we have? */ - /* if (pcb->pcb_ext->refcount-- == 1) ?? */ + /* if (pcb->pcb_ext->ext_refcount-- == 1) ?? */ /* * XXX do we need to move the TSS off the allocated pages * before freeing them? (not done here) ==== //depot/projects/kse/sys/i386/include/pcb_ext.h#8 (text+ko) ==== @@ -41,7 +41,6 @@ struct i386tss ext_tss; /* per-process i386tss */ caddr_t ext_iomap; /* i/o permission bitmap */ struct vm86_kernel ext_vm86; /* vm86 area */ - int refcount; }; #ifdef _KERNEL To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 15:55:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C5B337B409; Wed, 29 May 2002 15:55:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2399637B408 for ; Wed, 29 May 2002 15:55:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4TMtaW14655 for perforce@freebsd.org; Wed, 29 May 2002 15:55:36 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 29 May 2002 15:55:36 -0700 (PDT) Message-Id: <200205292255.g4TMtaW14655@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12110 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12110 Change 12110 by julian@julian_ref on 2002/05/29 15:54:58 various cleanups suggested by jhb Affected files ... ... //depot/projects/kse/sys/kern/kern_sig.c#53 edit ... //depot/projects/kse/sys/kern/kern_switch.c#47 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_sig.c#53 (text+ko) ==== @@ -84,7 +84,7 @@ static int sig_ffs(sigset_t *set); static int sigprop(int sig); static void stop(struct proc *); - +static void tdsignal(struct thread *td, int sig, sig_t action); static int filt_sigattach(struct knote *kn); static void filt_sigdetach(struct knote *kn); static int filt_signal(struct knote *kn, long hint); @@ -168,6 +168,7 @@ * Determine signal that should be delivered to process p, the current * process, 0 if none. If there is a pending stop signal with default * action, the process stops in issignal(). + * XXXKSE the check for a pending stop is not done under KSE * * MP SAFE. */ @@ -1228,9 +1229,6 @@ mtx_unlock(&Giant); } -static void -tdsignal(struct thread *td, int sig, sig_t action); - /* * Send the signal to the process. If the signal has an action, the action * is usually performed by the target process rather than the caller; we add @@ -1701,7 +1699,6 @@ PROC_LOCK(p->p_pptr); if ((p->p_pptr->p_procsig->ps_flag & PS_NOCLDSTOP) == 0) { - PROC_LOCK(p->p_pptr); psignal(p->p_pptr, SIGCHLD); } PROC_UNLOCK(p->p_pptr); ==== //depot/projects/kse/sys/kern/kern_switch.c#47 (text+ko) ==== @@ -44,7 +44,7 @@ static struct runq runq; SYSINIT(runq, SI_SUB_RUN_QUEUE, SI_ORDER_FIRST, runq_init, &runq) -static void readjustrunqueue(struct runq *rq, struct kse *ke); +static void runq_readjust(struct runq *rq, struct kse *ke); /************************************************************************ * Functions that manipulate runnability from a thread perspective. * ************************************************************************/ @@ -200,7 +200,7 @@ td3->td_kse = ke; ke->ke_thread = td3; kg->kg_last_assigned = td3; - readjustrunqueue(&runq, ke); + runq_readjust(&runq, ke); } else { /* * There is no unassigned thread. @@ -334,7 +334,7 @@ td2->td_kse = NULL; td->td_kse = ke; ke->ke_thread = td; - readjustrunqueue(&runq, ke); + runq_readjust(&runq, ke); } } @@ -561,7 +561,7 @@ } static void -readjustrunqueue(struct runq *rq, struct kse *ke) +runq_readjust(struct runq *rq, struct kse *ke) { if (ke->ke_rqindex != (ke->ke_thread->td_priority / RQ_PPQ)) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed May 29 19:34:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DEE737B40A; Wed, 29 May 2002 19:33:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7FFC037B403 for ; Wed, 29 May 2002 19:32:59 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4U2Wxj55021 for perforce@freebsd.org; Wed, 29 May 2002 19:32:59 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 29 May 2002 19:32:59 -0700 (PDT) Message-Id: <200205300232.g4U2Wxj55021@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12115 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12115 Change 12115 by julian@julian_ref on 2002/05/29 19:32:13 MFC to 12114 Affected files ... ... //depot/projects/kse/sys/boot/common/loader.8#11 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/Makefile#7 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/locore.S#2 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/main.c#7 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/metadata.c#4 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_da.c#20 integrate ... //depot/projects/kse/sys/conf/files#34 integrate ... //depot/projects/kse/sys/conf/files.sparc64#16 integrate ... //depot/projects/kse/sys/dev/wi/if_wi.c#22 integrate ... //depot/projects/kse/sys/geom/geom_gpt.c#2 integrate ... //depot/projects/kse/sys/i386/conf/GENERIC#18 integrate ... //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#9 integrate ... //depot/projects/kse/sys/ia64/ia64/machdep.c#33 integrate ... //depot/projects/kse/sys/ia64/ia64/mca.c#2 integrate ... //depot/projects/kse/sys/ia64/ia64/mp_machdep.c#14 integrate ... //depot/projects/kse/sys/ia64/include/mca.h#4 integrate ... //depot/projects/kse/sys/kern/kern_condvar.c#36 integrate ... //depot/projects/kse/sys/kern/kern_intr.c#23 integrate ... //depot/projects/kse/sys/kern/kern_sig.c#54 integrate ... //depot/projects/kse/sys/kern/kern_synch.c#64 integrate ... //depot/projects/kse/sys/kern/subr_trap.c#57 integrate ... //depot/projects/kse/sys/libkern/crc32.c#1 branch ... //depot/projects/kse/sys/modules/Makefile#27 integrate ... //depot/projects/kse/sys/net/zlib.h#4 integrate ... //depot/projects/kse/sys/netncp/ncp_sock.c#3 integrate ... //depot/projects/kse/sys/sparc64/conf/GENERIC#12 integrate ... //depot/projects/kse/sys/sparc64/include/intr_machdep.h#9 integrate ... //depot/projects/kse/sys/sparc64/include/metadata.h#3 integrate ... //depot/projects/kse/sys/sparc64/include/pmap.h#13 integrate ... //depot/projects/kse/sys/sparc64/include/pv.h#6 integrate ... //depot/projects/kse/sys/sparc64/include/tlb.h#11 integrate ... //depot/projects/kse/sys/sparc64/include/tsb.h#10 integrate ... //depot/projects/kse/sys/sparc64/include/tte.h#10 integrate ... //depot/projects/kse/sys/sparc64/sparc64/genassym.c#25 integrate ... //depot/projects/kse/sys/sparc64/sparc64/machdep.c#31 integrate ... //depot/projects/kse/sys/sparc64/sparc64/mp_machdep.c#8 integrate ... //depot/projects/kse/sys/sparc64/sparc64/pmap.c#27 integrate ... //depot/projects/kse/sys/sparc64/sparc64/pv.c#13 integrate ... //depot/projects/kse/sys/sparc64/sparc64/trap.c#27 integrate ... //depot/projects/kse/sys/sparc64/sparc64/tsb.c#13 integrate ... //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#23 integrate ... //depot/projects/kse/sys/sys/gpt.h#2 integrate ... //depot/projects/kse/sys/sys/param.h#20 integrate ... //depot/projects/kse/sys/sys/signalvar.h#13 integrate ... //depot/projects/kse/sys/sys/systm.h#24 integrate ... //depot/projects/kse/sys/vm/uma_dbg.c#3 integrate Differences ... ==== //depot/projects/kse/sys/boot/common/loader.8#11 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.41 2002/03/15 15:12:10 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.42 2002/05/29 22:57:18 schweikh Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -54,7 +54,7 @@ The smaller one is a set of commands designed for direct use by the casual user, called "builtin commands" for historical reasons. -The main drive behind these commands is user-friendlyness. +The main drive behind these commands is user-friendliness. The bigger component is an .Tn ANS Forth compatible Forth interpreter based on ficl, by @@ -96,7 +96,7 @@ will be read for historical reasons. These files are processed through the .Ic include -command, which read all of them into memory before processing them, +command, which reads all of them into memory before processing them, making disk changes possible. .Pp At this point, if an @@ -323,7 +323,7 @@ .Ic autoboot will be automatically attempted after processing .Pa /boot/loader.rc , -though explict +though explicit .Ic autoboot Ns 's will be processed normally, defaulting to 10 seconds delay. .It Va boot_askname @@ -365,13 +365,13 @@ Define the number of lines on the screen, to be used by the pager. .It Va module_path Sets the list of directories which will be searched in for modules -named in a load command or implicitly required by a dependancy. +named in a load command or implicitly required by a dependency. The default value for this variable is .Dq Li /;/boot;/modules . .It Va num_ide_disks Sets the number of IDE disks as a work around for some problems in finding the root disk at boot. -This has been deprecated in favour of +This has been deprecated in favor of .Va root_disk_unit . .It Va prompt Value of @@ -517,7 +517,7 @@ .It \e\e will be replaced with a single \e . .It -In any other occurance, backslash will just be removed. +In any other occurrence, backslash will just be removed. .El .It Every string between non-escaped quotes or double-quotes will be treated @@ -527,7 +527,7 @@ .Li $VARIABLE or .Li ${VARIABLE} -with the value of the environemnt variable +with the value of the environment variable .Va VARIABLE . .It Passes multiple space-delimited arguments to the builtin command called. @@ -575,7 +575,7 @@ .Ef \&! This is particular annoying for programs that want or need to treat exceptions. -In this case, it is recommended the use of a proxy. +In this case, it is recommended to use a proxy. For example: .Dl : (boot) boot ; .Sh FICL ==== //depot/projects/kse/sys/boot/sparc64/loader/Makefile#7 (text+ko) ==== @@ -1,12 +1,15 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.7 2002/05/10 09:26:35 obrien Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.8 2002/05/28 23:09:59 jake Exp $ BASE= loader PROG= ${BASE} +STRIP= NEWVERSWHAT= "bootstrap loader" sparc64 BINDIR?= /boot INSTALLFLAGS= -b +NOFORTH= yes -CFLAGS= -mno-app-regs +# Architecture-specific loader code +SRCS= locore.S main.c metadata.c LOADER_DISK_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes @@ -34,8 +37,16 @@ CFLAGS+= -DLOADER_TFTP_SUPPORT .endif -# Architecture-specific loader code -SRCS= locore.S main.c metadata.c +.if !defined(NOFORTH) +# Enable BootForth +BOOT_FORTH= yes +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/sparc64 +.if exists(${.OBJDIR}/../../ficl/libficl.a) +LIBFICL= ${.OBJDIR}/../../ficl/libficl.a +.else +LIBFICL= ${.CURDIR}/../../ficl/libficl.a +.endif +.endif # Always add MI sources .PATH: ${.CURDIR}/../../common @@ -43,11 +54,14 @@ CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I${.CURDIR}/../../.. -I. -CLEANFILES+= ${PROG}.help +CLEANFILES+= vers.c vers.o ${BASE}.help CFLAGS+= -ffreestanding LDFLAGS= -nostdlib -static -LDADD= ${LIBSTAND} ${LIBOFW} + +# Openfirmware standalone support library +LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a +CFLAGS+= -I${.CURDIR}/../../ofw/libofw/ # where to get libstand from #XXX need a better way to do this @@ -58,37 +72,36 @@ LIBSTAND= -lstand .endif .endif -LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ -CFLAGS+= -I${.CURDIR}/../../ofw/libofw/ + +LDADD= ${LIBSTAND} ${LIBOFW} + +vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version + sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} + ${CC} -c vers.c ${BASE}.help: help.common help.sparc64 cat ${.ALLSRC} | \ awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} -beforeinstall: ${PROG}.help -.if exists(${DESTDIR}/boot/loader) - mv ${DESTDIR}/boot/loader ${DESTDIR}/boot/loader.old -.endif -#.if exists(${.OBJDIR}/loader.help) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot -#.else -# ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ -# ${.CURDIR}/${BASE}.help ${DESTDIR}/boot -#.endif +.PATH: ${.CURDIR}/../../forth +FILES= ${BASE}.help loader.4th support.4th loader.conf +FILESDIR_loader.conf= /boot/defaults + .if !exists(${DESTDIR}/boot/loader.rc) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot +FILES+= loader.rc .endif - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/support.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.conf ${DESTDIR}/boot/defaults # There are no things relevant to all boot parts of FreeBSD/sparc64 yet. #.include <${.CURDIR}/../Makefile.inc> .include + +.if exists(${.CURDIR}/../../../sparc64/include) +beforedepend ${OBJS}: machine + +machine: + ln -sf ${.CURDIR}/../../../sparc64/include machine +.endif + +CLEANFILES+= machine ==== //depot/projects/kse/sys/boot/sparc64/loader/locore.S#2 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/boot/sparc64/loader/locore.S,v 1.5 2002/04/02 17:10:15 tmm Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/locore.S,v 1.6 2002/05/29 05:49:58 jake Exp $ */ #define LOCORE @@ -92,7 +92,6 @@ ENTRY(itlb_enter) rdpr %pstate, %o4 wrpr %o4, PSTATE_IE, %pstate - sllx %o0, PAGE_SHIFT, %o0 mov AA_IMMU_TAR, %o3 stxa %o0, [%o3] ASI_IMMU stxa %o1, [%g0] ASI_ITLB_DATA_IN_REG @@ -103,7 +102,6 @@ ENTRY(dtlb_enter) rdpr %pstate, %o4 wrpr %o4, PSTATE_IE, %pstate - sllx %o0, PAGE_SHIFT, %o0 mov AA_DMMU_TAR, %o3 stxa %o0, [%o3] ASI_DMMU stxa %o1, [%g0] ASI_DTLB_DATA_IN_REG ==== //depot/projects/kse/sys/boot/sparc64/loader/main.c#7 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.10 2002/05/16 21:21:59 trhodes Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.12 2002/05/29 19:38:49 jake Exp $ */ /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -30,7 +31,6 @@ #include #include #include -#include #include #include @@ -63,8 +63,8 @@ char __progname[] = "FreeBSD/sparc64 loader"; -struct tte *dtlb_store; -struct tte *itlb_store; +struct tlb_entry *dtlb_store; +struct tlb_entry *itlb_store; int dtlb_slot; int itlb_slot; @@ -240,7 +240,7 @@ mmu_mapin(vm_offset_t va, vm_size_t len) { vm_offset_t pa, mva; - struct tte tte; + u_long data; if (va + len > curkva) curkva = va + len; @@ -275,13 +275,16 @@ panic("mmu_mapin: out of dtlb_slots"); if (itlb_slot >= itlb_slot_max) panic("mmu_mapin: out of itlb_slots"); - tte.tte_vpn = TV_VPN(va); - tte.tte_data = TD_V | TD_4M | TD_PA(pa) | TD_L | TD_CP | + data = TD_V | TD_4M | TD_PA(pa) | TD_L | TD_CP | TD_CV | TD_P | TD_W; - dtlb_store[dtlb_slot++] = tte; - itlb_store[itlb_slot++] = tte; - dtlb_enter(tte.tte_vpn, tte.tte_data); - itlb_enter(tte.tte_vpn, tte.tte_data); + dtlb_store[dtlb_slot].te_pa = pa; + dtlb_store[dtlb_slot].te_va = va; + itlb_store[itlb_slot].te_pa = pa; + itlb_store[itlb_slot].te_va = va; + dtlb_slot++; + itlb_slot++; + dtlb_enter(va, data); + itlb_enter(va, data); pa = (vm_offset_t)-1; } len -= len > PAGE_SIZE_4M ? PAGE_SIZE_4M : len; ==== //depot/projects/kse/sys/boot/sparc64/loader/metadata.c#4 (text+ko) ==== @@ -24,22 +24,21 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.29 - * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.4 2002/04/02 17:10:15 tmm Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.5 2002/05/29 05:49:58 jake Exp $ */ #include #include #include #include -#include #include #include "bootstrap.h" #include "libofw.h" -extern struct tte *dtlb_store; -extern struct tte *itlb_store; +extern struct tlb_entry *dtlb_store; +extern struct tlb_entry *itlb_store; extern int dtlb_slot; extern int itlb_slot; @@ -318,10 +317,10 @@ file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); file_addmetadata(kfp, MODINFOMD_DTLB_SLOTS, sizeof dtlb_slots, &dtlb_slots); file_addmetadata(kfp, MODINFOMD_ITLB_SLOTS, sizeof itlb_slots, &itlb_slots); - file_addmetadata(kfp, MODINFOMD_DTLB, dtlb_slots * sizeof(struct tte), - dtlb_store); - file_addmetadata(kfp, MODINFOMD_ITLB, itlb_slots * sizeof(struct tte), - itlb_store); + file_addmetadata(kfp, MODINFOMD_DTLB, + dtlb_slots * sizeof(*dtlb_store), dtlb_store); + file_addmetadata(kfp, MODINFOMD_ITLB, + itlb_slots * sizeof(*itlb_store), itlb_store); *modulep = addr; size = md_copymodules(0); ==== //depot/projects/kse/sys/cam/scsi/scsi_da.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.103 2002/05/19 21:59:28 dillon Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.104 2002/05/29 20:25:59 dillon Exp $ */ #ifdef _KERNEL @@ -376,6 +376,13 @@ }, { /* + * Minolta Dimage E203 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "MINOLTA", "DiMAGE E203", "*"}, + /*quirks*/ DA_Q_NO_6_BYTE|DA_Q_NO_SYNC_CACHE + }, + { + /* * DIVA USB Mp3 Player. * Doesn't work correctly with 6 byte reads/writes. */ ==== //depot/projects/kse/sys/conf/files#34 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.638 2002/05/28 09:04:48 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.641 2002/05/29 21:58:56 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -966,6 +966,7 @@ libkern/strtoul.c standard libkern/strtouq.c standard libkern/strvalid.c standard +libkern/crc32.c standard net/bpf.c standard net/bpf_filter.c optional bpf bpf.h standard \ ==== //depot/projects/kse/sys/conf/files.sparc64#16 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.19 2002/05/20 16:10:17 jake Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.20 2002/05/29 06:08:45 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -56,7 +56,6 @@ sparc64/sparc64/ofw_bus.c standard sparc64/sparc64/ofw_machdep.c standard sparc64/sparc64/pmap.c standard -sparc64/sparc64/pv.c standard sparc64/sparc64/rwindow.c standard sparc64/sparc64/sparcbus_if.m standard sparc64/sparc64/support.s standard ==== //depot/projects/kse/sys/dev/wi/if_wi.c#22 (text+ko) ==== @@ -103,7 +103,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.104 2002/04/29 06:55:46 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.105 2002/05/29 20:24:09 phk Exp $"; #endif static void wi_intr(void *); @@ -2042,61 +2042,6 @@ return; } -static u_int32_t crc32_tab[] = { - 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, - 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, - 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, - 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, - 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, - 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, - 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, - 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, - 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, - 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, - 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, - 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, - 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, - 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, - 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, - 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, - 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, - 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, - 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, - 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, - 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, - 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, - 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, - 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, - 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, - 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, - 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, - 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, - 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, - 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, - 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, - 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, - 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, - 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, - 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, - 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, - 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, - 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, - 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, - 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, - 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, - 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, - 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, - 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, - 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, - 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, - 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, - 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, - 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, - 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, - 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, - 0x2d02ef8dL -}; - #define RC4STATE 256 #define RC4KEYLEN 16 #define RC4SWAP(x,y) \ ==== //depot/projects/kse/sys/geom/geom_gpt.c#2 (text+ko) ==== @@ -28,13 +28,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_gpt.c,v 1.1 2002/05/28 09:04:48 marcel Exp $ + * $FreeBSD: src/sys/geom/geom_gpt.c,v 1.2 2002/05/29 20:24:09 phk Exp $ */ -/* - * CRC32 code derived from work by Gary S. Brown. - */ - #include #ifndef _KERNEL #include @@ -72,67 +68,6 @@ struct gpt_ent *part[GPT_MAX_SLICES]; }; -static uint32_t crc32_tab[] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - -static uint32_t -crc32(const void *buf, size_t size) -{ - const uint8_t *p; - uint32_t crc; - - p = buf; - crc = ~0U; - - while (size--) - crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8); - - return crc ^ ~0U; -} - static int is_gpt_hdr(struct gpt_hdr *hdr) { ==== //depot/projects/kse/sys/i386/conf/GENERIC#18 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.343 2002/05/22 19:00:48 obrien Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.344 2002/05/29 18:42:26 obrien Exp $ machine i386 cpu I486_CPU @@ -166,7 +166,7 @@ # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') -device em # Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'') +device em # Intel PRO/1000 adapter Gigabit Ethernet Card device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') ==== //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#9 (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. * - * $FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.84 2002/04/24 15:30:11 imp Exp $ + * $FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.85 2002/05/29 16:16:16 brooks Exp $ * */ @@ -408,6 +408,14 @@ (pci_get_slot(*childp) == device) && (pci_get_intpin(*childp) == matchpin)) { irq = pci_get_irq(*childp); + /* + * Some BIOS writers seem to want to ignore the spec and put + * 0 in the intline rather than 255 to indicate none. Once + * we've found one that matches, we break because there can + * be no others (which is why test looks a little odd). + */ + if (irq == 0) + irq = 255; if (irq != 255) PRVERB(("pci_cfgintr_search: linked (%x) to configured irq %d at %d:%d:%d\n", pe->pe_intpin[pin - 1].link, irq, ==== //depot/projects/kse/sys/ia64/ia64/machdep.c#33 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.104 2002/05/20 05:41:20 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.105 2002/05/29 05:19:07 marcel Exp $ */ #include "opt_compat.h" @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/kse/sys/ia64/ia64/mca.c#2 (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/sys/ia64/ia64/mca.c,v 1.2 2002/05/01 22:10:03 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/mca.c,v 1.3 2002/05/29 05:19:07 marcel Exp $ */ #include @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/kse/sys/ia64/ia64/mp_machdep.c#14 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.38 2002/05/19 04:42:19 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.39 2002/05/29 05:19:07 marcel Exp $ */ #include @@ -37,6 +37,7 @@ #include #include #include +#include #include #include ==== //depot/projects/kse/sys/ia64/include/mca.h#4 (text+ko) ==== @@ -23,19 +23,12 @@ * (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/ia64/include/mca.h,v 1.4 2002/05/22 02:25:06 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/mca.h,v 1.5 2002/05/29 05:19:07 marcel Exp $ */ #ifndef _MACHINE_MCA_H_ #define _MACHINE_MCA_H_ -struct mca_guid { - uint32_t data1; - uint16_t data2; - uint16_t data3; - uint8_t data4[8]; -}; - struct mca_record_header { uint64_t rh_seqnr; /* Record id. */ uint8_t rh_major; /* BCD (=02). */ @@ -55,11 +48,11 @@ #define MCA_RH_TIME_MON 5 #define MCA_RH_TIME_YEAR 6 #define MCA_RH_TIME_CENT 7 - struct mca_guid rh_platform; /* XXX not really a GUID. */ + struct uuid rh_platform; }; struct mca_section_header { - struct mca_guid sh_guid; + struct uuid sh_uuid; uint8_t sh_major; /* BCD (=02). */ uint8_t sh_minor; /* BCD (=00). */ uint8_t sh_flags; @@ -163,7 +156,7 @@ uint64_t mem_rspid; uint64_t mem_tgtid; uint64_t mem_busdata; - struct mca_guid mem_oem_id; /* XXX not really a GUID. */ + struct uuid mem_oem_id; uint16_t mem_oem_length; /* Size of OEM data. */ /* N bytes of OEM platform data. */ }; @@ -191,7 +184,7 @@ uint64_t pcibus_reqid; uint64_t pcibus_rspid; uint64_t pcibus_tgtid; - struct mca_guid pcibus_oem_id; /* XXX not really a GUID. */ + struct uuid pcibus_oem_id; uint16_t pcibus_oem_length; /* Size of OEM data. */ /* N bytes of OEM platform data. */ }; @@ -228,20 +221,20 @@ uint64_t pcidev_reg_data; }; -#define MCA_GUID_CPU \ - {0xe429faf1,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_MEMORY \ - {0xe429faf2,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_SEL \ - {0xe429faf3,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_PCI_BUS \ - {0xe429faf4,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_SMBIOS \ - {0xe429faf5,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_PCI_DEV \ - {0xe429faf6,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_GENERIC \ - {0xe429faf7,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_CPU \ + {0xe429faf1,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_MEMORY \ + {0xe429faf2,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_SEL \ + {0xe429faf3,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_PCI_BUS \ + {0xe429faf4,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_SMBIOS \ + {0xe429faf5,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_PCI_DEV \ + {0xe429faf6,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_GENERIC \ + {0xe429faf7,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} #ifdef _KERNEL ==== //depot/projects/kse/sys/kern/kern_condvar.c#36 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_condvar.c,v 1.20 2002/04/23 19:50:22 hsu Exp $ + * $FreeBSD: src/sys/kern/kern_condvar.c,v 1.21 2002/05/29 23:44:31 julian Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/kse/sys/kern/kern_intr.c#23 (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/sys/kern/kern_intr.c,v 1.74 2002/04/11 21:03:35 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_intr.c,v 1.75 2002/05/29 20:40:50 julian Exp $ * */ ==== //depot/projects/kse/sys/kern/kern_sig.c#54 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.165 2002/05/19 00:14:49 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.166 2002/05/29 23:44:31 julian Exp $ */ #include "opt_compat.h" ==== //depot/projects/kse/sys/kern/kern_synch.c#64 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.173 2002/05/23 04:14:18 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.174 2002/05/29 23:44:31 julian Exp $ */ #include "opt_ddb.h" ==== //depot/projects/kse/sys/kern/subr_trap.c#57 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/kern/subr_trap.c,v 1.215 2002/04/04 17:49:47 bde Exp $ + * $FreeBSD: src/sys/kern/subr_trap.c,v 1.216 2002/05/29 23:44:32 julian Exp $ */ #ifdef __i386__ ==== //depot/projects/kse/sys/modules/Makefile#27 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.243 2002/05/19 03:59:06 marcel Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.245 2002/05/29 05:09:51 marcel Exp $ .if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) _random= random @@ -102,7 +102,6 @@ usb \ uscanner \ uvscom \ - vinum \ vpo \ vr \ vx \ @@ -161,6 +160,7 @@ stg \ streams \ vesa \ + vinum \ wi \ xe .endif @@ -168,7 +168,6 @@ .if ${MACHINE_ARCH} == "ia64" SUBDIR+=aic \ arcnet \ - bktr \ ciss \ cm \ coff \ @@ -189,7 +188,8 @@ .if ${MACHINE} == "pc98" SUBDIR+=pmc \ - snc + snc \ + vinum .endif .if ${MACHINE_ARCH} == "alpha" @@ -200,7 +200,8 @@ lomac \ osf1 \ sound \ - sppp + sppp \ + vinum .endif .if defined(WANT_EXT2FS_MODULE) ==== //depot/projects/kse/sys/net/zlib.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/zlib.h,v 1.8 2002/05/16 21:28:17 trhodes Exp $ */ +/* $FreeBSD: src/sys/net/zlib.h,v 1.9 2002/05/29 20:24:09 phk Exp $ */ /* * This file is derived from zlib.h and zconf.h from the zlib-1.0.4 @@ -88,8 +88,10 @@ # define compress z_compress # define uncompress z_uncompress # define adler32 z_adler32 +#if 0 # define crc32 z_crc32 # define get_crc_table z_get_crc_table +#endif # define Byte z_Byte # define uInt z_uInt @@ -958,6 +960,7 @@ if (adler != original_adler) error(); */ +#if 0 extern uLong EXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); /* Update a running crc with the bytes buf[0..len-1] and return the updated @@ -973,6 +976,7 @@ } if (crc != original_crc) error(); */ +#endif /* various hacks, don't look :) */ ==== //depot/projects/kse/sys/netncp/ncp_sock.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netncp/ncp_sock.c,v 1.8 2002/05/20 05:41:07 tanimura Exp $ + * $FreeBSD: src/sys/netncp/ncp_sock.c,v 1.9 2002/05/29 23:44:32 julian Exp $ * * Low level socket routines */ @@ -249,7 +249,7 @@ PROC_UNLOCK(p); done_noproclock: if (error == ERESTART) { -/* printf("Signal: %x", CURSIG(p));*/ +/* printf("Signal: %x", cursig(p));*/ error = 0; } return (error); ==== //depot/projects/kse/sys/sparc64/conf/GENERIC#12 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.17 2002/05/12 18:10:48 jake Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.18 2002/05/29 19:22:17 jake Exp $ machine sparc64 cpu SUN4U @@ -207,4 +207,3 @@ #options BOOTP_NFSROOT >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 30 15:14:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F8EE37B40A; Thu, 30 May 2002 15:13:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 99ABF37B409 for ; Thu, 30 May 2002 15:13:27 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4UMDOY48256 for perforce@freebsd.org; Thu, 30 May 2002 15:13:24 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Thu, 30 May 2002 15:13:24 -0700 (PDT) Message-Id: <200205302213.g4UMDOY48256@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12160 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12160 Change 12160 by jhb@jhb_laptop on 2002/05/30 15:12:38 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/clock.c#7 integrate ... //depot/projects/smpng/sys/alpha/alpha/support.s#4 integrate ... //depot/projects/smpng/sys/alpha/include/elf.h#4 integrate ... //depot/projects/smpng/sys/alpha/include/runq.h#1 branch ... //depot/projects/smpng/sys/boot/common/loader.8#12 integrate ... //depot/projects/smpng/sys/boot/efi/include/efi.h#3 integrate ... //depot/projects/smpng/sys/boot/efi/include/efi_nii.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/include/efiapi.h#4 integrate ... //depot/projects/smpng/sys/boot/efi/include/eficon.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/include/efidebug.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/include/efidef.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/include/efidevp.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/include/efifpswa.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/include/efifs.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/include/efinet.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/include/efipart.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/include/efiprot.h#3 integrate ... //depot/projects/smpng/sys/boot/efi/include/efipxebc.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/include/efiser.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/include/i386/efibind.h#2 integrate ... //depot/projects/smpng/sys/boot/efi/include/ia64/efibind.h#3 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/copy.c#3 integrate ... //depot/projects/smpng/sys/boot/efi/libefi/elf_freebsd.c#7 integrate ... //depot/projects/smpng/sys/boot/ficl/sparc64/sysdep.c#1 branch ... //depot/projects/smpng/sys/boot/ficl/sparc64/sysdep.h#1 branch ... //depot/projects/smpng/sys/boot/forth/loader.4th#3 integrate ... //depot/projects/smpng/sys/boot/forth/loader.4th.8#4 integrate ... //depot/projects/smpng/sys/boot/forth/loader.conf#9 integrate ... //depot/projects/smpng/sys/boot/forth/support.4th#3 integrate ... //depot/projects/smpng/sys/boot/ia64/libski/copy.c#2 integrate ... //depot/projects/smpng/sys/boot/ia64/libski/elf_freebsd.c#4 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#4 integrate ... //depot/projects/smpng/sys/boot/pc98/boot2/serial_16550.S#4 integrate ... //depot/projects/smpng/sys/boot/pc98/kgzldr/crt.s#2 integrate ... //depot/projects/smpng/sys/boot/pc98/libpc98/Makefile#5 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#7 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/locore.S#2 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/main.c#8 integrate ... //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#5 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_da.c#22 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_exec.h#4 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#4 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#6 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#16 integrate ... //depot/projects/smpng/sys/conf/Makefile.ia64#18 integrate ... //depot/projects/smpng/sys/conf/Makefile.sparc64#15 integrate ... //depot/projects/smpng/sys/conf/NOTES#13 integrate ... //depot/projects/smpng/sys/conf/files#40 integrate ... //depot/projects/smpng/sys/conf/files.i386#23 integrate ... //depot/projects/smpng/sys/conf/files.pc98#23 integrate ... //depot/projects/smpng/sys/conf/files.sparc64#15 integrate ... //depot/projects/smpng/sys/conf/kern.post.mk#11 integrate ... //depot/projects/smpng/sys/conf/options#26 integrate ... //depot/projects/smpng/sys/conf/options.pc98#16 integrate ... //depot/projects/smpng/sys/crypto/rijndael/rijndael-api-fst.c#2 integrate ... //depot/projects/smpng/sys/dev/aac/aac_debug.c#7 integrate ... //depot/projects/smpng/sys/dev/aac/aacvar.h#12 integrate ... //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#6 integrate ... //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#15 integrate ... //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#7 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi.c#27 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_button.c#6 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#11 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#12 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#5 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#9 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_powerres.c#9 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_resource.c#9 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#13 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#9 integrate ... //depot/projects/smpng/sys/dev/aha/aha.c#2 integrate ... //depot/projects/smpng/sys/dev/ahb/ahb.c#2 integrate ... //depot/projects/smpng/sys/dev/ata/ata-disk.c#19 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-cd.c#23 integrate ... //depot/projects/smpng/sys/dev/ata/atapi-fd.c#8 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_core.c#4 integrate ... //depot/projects/smpng/sys/dev/cardbus/cardbus.c#7 integrate ... //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#5 integrate ... //depot/projects/smpng/sys/dev/ccd/ccd.c#15 integrate ... //depot/projects/smpng/sys/dev/ct/ct_machdep.h#3 integrate ... //depot/projects/smpng/sys/dev/em/if_em_phy.c#4 integrate ... //depot/projects/smpng/sys/dev/exca/exca.c#2 integrate ... //depot/projects/smpng/sys/dev/gem/if_gem.c#5 integrate ... //depot/projects/smpng/sys/dev/joy/joy.c#3 integrate ... //depot/projects/smpng/sys/dev/md/md.c#20 integrate ... //depot/projects/smpng/sys/dev/ncv/ncr53c500var.h#4 integrate ... //depot/projects/smpng/sys/dev/nsp/nspvar.h#4 integrate ... //depot/projects/smpng/sys/dev/pccard/card_if.m#5 integrate ... //depot/projects/smpng/sys/dev/pccard/pccard.c#9 integrate ... //depot/projects/smpng/sys/dev/pccard/pccard_common.c#1 branch ... //depot/projects/smpng/sys/dev/pccard/pccardvar.h#8 integrate ... //depot/projects/smpng/sys/dev/pccbb/pccbb.c#14 integrate ... //depot/projects/smpng/sys/dev/pcic/i82365_isa.c#2 integrate ... //depot/projects/smpng/sys/dev/ppbus/pps.c#7 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#4 integrate ... //depot/projects/smpng/sys/dev/sound/pcm/sound.c#11 integrate ... //depot/projects/smpng/sys/dev/stg/tmc18c30var.h#4 integrate ... //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#7 integrate ... //depot/projects/smpng/sys/dev/usb/if_aue.c#14 integrate ... //depot/projects/smpng/sys/dev/usb/if_auereg.h#4 integrate ... //depot/projects/smpng/sys/dev/usb/ohci.c#16 integrate ... //depot/projects/smpng/sys/dev/usb/uhci.c#18 integrate ... //depot/projects/smpng/sys/dev/usb/usb_mem.h#2 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs#19 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs.h#20 integrate ... //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#20 integrate ... //depot/projects/smpng/sys/dev/usb/usbdi.c#11 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#6 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#6 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#6 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumrevive.c#4 integrate ... //depot/projects/smpng/sys/dev/vinum/vinumstate.c#2 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#35 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.c#7 integrate ... //depot/projects/smpng/sys/dev/wi/wi_hostap.h#4 integrate ... //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#13 integrate ... //depot/projects/smpng/sys/fs/nullfs/null.h#2 integrate ... //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#4 integrate ... //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#5 integrate ... //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#8 integrate ... //depot/projects/smpng/sys/fs/unionfs/union.h#4 integrate ... //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#10 integrate ... //depot/projects/smpng/sys/geom/geom.h#7 integrate ... //depot/projects/smpng/sys/geom/geom_aes.c#1 branch ... //depot/projects/smpng/sys/geom/geom_bsd.c#8 integrate ... //depot/projects/smpng/sys/geom/geom_dev.c#7 integrate ... //depot/projects/smpng/sys/geom/geom_disk.c#8 integrate ... //depot/projects/smpng/sys/geom/geom_dump.c#5 integrate ... //depot/projects/smpng/sys/geom/geom_event.c#6 integrate ... //depot/projects/smpng/sys/geom/geom_gpt.c#1 branch ... //depot/projects/smpng/sys/geom/geom_io.c#7 integrate ... //depot/projects/smpng/sys/geom/geom_mbr.c#6 integrate ... //depot/projects/smpng/sys/geom/geom_pc98.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_slice.c#6 integrate ... //depot/projects/smpng/sys/geom/geom_subr.c#6 integrate ... //depot/projects/smpng/sys/geom/geom_sunlabel.c#6 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_mount.h#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#16 integrate ... //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#8 integrate ... //depot/projects/smpng/sys/i386/conf/GENERIC#21 integrate ... //depot/projects/smpng/sys/i386/i386/support.s#5 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate ... //depot/projects/smpng/sys/i386/include/bus_pc98.h#5 integrate ... //depot/projects/smpng/sys/i386/include/cpufunc.h#17 integrate ... //depot/projects/smpng/sys/i386/include/elf.h#4 integrate ... //depot/projects/smpng/sys/i386/include/runq.h#1 branch ... //depot/projects/smpng/sys/i386/isa/rc.c#10 integrate ... //depot/projects/smpng/sys/i386/linux/linux_dummy.c#6 integrate ... //depot/projects/smpng/sys/i386/linux/linux_proto.h#8 integrate ... //depot/projects/smpng/sys/i386/linux/linux_ptrace.c#1 branch ... //depot/projects/smpng/sys/i386/linux/linux_syscall.h#7 integrate ... //depot/projects/smpng/sys/i386/linux/linux_sysent.c#7 integrate ... //depot/projects/smpng/sys/i386/linux/syscalls.master#7 integrate ... //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#9 integrate ... //depot/projects/smpng/sys/i4b/capi/iavc/iavc_isa.c#6 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ctl.c#4 integrate ... //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#5 integrate ... //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate ... //depot/projects/smpng/sys/ia64/acpica/madt.c#6 integrate ... //depot/projects/smpng/sys/ia64/conf/GENERIC#16 integrate ... //depot/projects/smpng/sys/ia64/ia64/dump_machdep.c#2 integrate ... //depot/projects/smpng/sys/ia64/ia64/interrupt.c#12 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#39 integrate ... //depot/projects/smpng/sys/ia64/ia64/mca.c#3 integrate ... //depot/projects/smpng/sys/ia64/ia64/mem.c#7 integrate ... //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#15 integrate ... //depot/projects/smpng/sys/ia64/ia64/ski.c#2 integrate ... //depot/projects/smpng/sys/ia64/ia64/trap.c#32 integrate ... //depot/projects/smpng/sys/ia64/ia64/unwind.c#4 integrate ... //depot/projects/smpng/sys/ia64/include/atomic.h#2 integrate ... //depot/projects/smpng/sys/ia64/include/cpu.h#9 integrate ... //depot/projects/smpng/sys/ia64/include/cpufunc.h#13 integrate ... //depot/projects/smpng/sys/ia64/include/db_machdep.h#6 integrate ... //depot/projects/smpng/sys/ia64/include/elf.h#6 integrate ... //depot/projects/smpng/sys/ia64/include/ia64_cpu.h#9 integrate ... //depot/projects/smpng/sys/ia64/include/mca.h#3 integrate ... //depot/projects/smpng/sys/ia64/include/param.h#6 integrate ... //depot/projects/smpng/sys/ia64/include/pcb.h#5 integrate ... //depot/projects/smpng/sys/ia64/include/reg.h#6 integrate ... //depot/projects/smpng/sys/ia64/include/runq.h#1 branch ... //depot/projects/smpng/sys/ia64/include/vmparam.h#3 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vnops.c#5 integrate ... //depot/projects/smpng/sys/kern/init_sysent.c#15 integrate ... //depot/projects/smpng/sys/kern/kern_condvar.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#28 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#40 integrate ... //depot/projects/smpng/sys/kern/kern_intr.c#18 integrate ... //depot/projects/smpng/sys/kern/kern_lock.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#35 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#38 integrate ... //depot/projects/smpng/sys/kern/kern_switch.c#15 integrate ... //depot/projects/smpng/sys/kern/kern_synch.c#24 integrate ... //depot/projects/smpng/sys/kern/kern_tc.c#12 integrate ... //depot/projects/smpng/sys/kern/kern_uuid.c#1 branch ... //depot/projects/smpng/sys/kern/subr_trap.c#33 integrate ... //depot/projects/smpng/sys/kern/sys_process.c#19 integrate ... //depot/projects/smpng/sys/kern/sys_socket.c#7 integrate ... //depot/projects/smpng/sys/kern/syscalls.c#15 integrate ... //depot/projects/smpng/sys/kern/syscalls.master#14 integrate ... //depot/projects/smpng/sys/kern/tty.c#22 integrate ... //depot/projects/smpng/sys/kern/uipc_domain.c#4 integrate ... //depot/projects/smpng/sys/kern/uipc_mbuf2.c#4 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#22 integrate ... //depot/projects/smpng/sys/kern/uipc_socket2.c#15 integrate ... //depot/projects/smpng/sys/kern/uipc_syscalls.c#18 integrate ... //depot/projects/smpng/sys/kern/uipc_usrreq.c#19 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#24 integrate ... //depot/projects/smpng/sys/kern/vfs_syscalls.c#38 integrate ... //depot/projects/smpng/sys/libkern/crc32.c#1 branch ... //depot/projects/smpng/sys/modules/Makefile#28 integrate ... //depot/projects/smpng/sys/modules/linux/Makefile#7 integrate ... //depot/projects/smpng/sys/modules/oldcard/Makefile#3 integrate ... //depot/projects/smpng/sys/net/if.c#24 integrate ... //depot/projects/smpng/sys/net/if.h#9 integrate ... //depot/projects/smpng/sys/net/if_disc.c#4 integrate ... //depot/projects/smpng/sys/net/if_ef.c#5 integrate ... //depot/projects/smpng/sys/net/if_faith.c#10 integrate ... //depot/projects/smpng/sys/net/if_gif.c#9 integrate ... //depot/projects/smpng/sys/net/if_loop.c#9 integrate ... //depot/projects/smpng/sys/net/if_stf.c#13 integrate ... //depot/projects/smpng/sys/net/if_vlan.c#10 integrate ... //depot/projects/smpng/sys/net/raw_cb.c#3 integrate ... //depot/projects/smpng/sys/net/raw_usrreq.c#8 integrate ... //depot/projects/smpng/sys/net/rtsock.c#18 integrate ... //depot/projects/smpng/sys/net/zlib.h#3 integrate ... //depot/projects/smpng/sys/netatalk/aarp.c#2 integrate ... //depot/projects/smpng/sys/netatalk/ddp_input.c#4 integrate ... //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#10 integrate ... //depot/projects/smpng/sys/netatm/atm_aal5.c#6 integrate ... //depot/projects/smpng/sys/netatm/atm_socket.c#5 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_if.c#4 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_load.c#3 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_var.h#3 integrate ... //depot/projects/smpng/sys/netatm/ipatm/ipatm_vcm.c#3 integrate ... //depot/projects/smpng/sys/netatm/sigpvc/sigpvc_if.c#4 integrate ... //depot/projects/smpng/sys/netatm/sigpvc/sigpvc_subr.c#2 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_arp.c#4 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_cls.c#4 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_if.c#4 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_msg.c#4 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_proto.c#4 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_subr.c#2 integrate ... //depot/projects/smpng/sys/netatm/spans/spans_var.h#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_base.c#8 integrate ... //depot/projects/smpng/sys/netgraph/ng_ksocket.c#12 integrate ... //depot/projects/smpng/sys/netgraph/ng_parse.c#6 integrate ... //depot/projects/smpng/sys/netgraph/ng_socket.c#12 integrate ... //depot/projects/smpng/sys/netinet/accf_data.c#4 integrate ... //depot/projects/smpng/sys/netinet/accf_http.c#4 integrate ... //depot/projects/smpng/sys/netinet/if_atm.c#3 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.c#24 integrate ... //depot/projects/smpng/sys/netinet/ip_divert.c#15 integrate ... //depot/projects/smpng/sys/netinet/ip_input.c#19 integrate ... //depot/projects/smpng/sys/netinet/ip_mroute.c#12 integrate ... //depot/projects/smpng/sys/netinet/ip_output.c#23 integrate ... //depot/projects/smpng/sys/netinet/raw_ip.c#18 integrate ... //depot/projects/smpng/sys/netinet/tcp_input.c#18 integrate ... //depot/projects/smpng/sys/netinet/tcp_output.c#7 integrate ... //depot/projects/smpng/sys/netinet/tcp_subr.c#19 integrate ... //depot/projects/smpng/sys/netinet/tcp_timer.c#4 integrate ... //depot/projects/smpng/sys/netinet/tcp_usrreq.c#11 integrate ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#20 integrate ... //depot/projects/smpng/sys/netinet6/icmp6.c#7 integrate ... //depot/projects/smpng/sys/netinet6/in6.h#6 integrate ... //depot/projects/smpng/sys/netinet6/in6_pcb.c#14 integrate ... //depot/projects/smpng/sys/netinet6/in6_src.c#8 integrate ... //depot/projects/smpng/sys/netinet6/ip6_input.c#15 integrate ... //depot/projects/smpng/sys/netinet6/ip6_mroute.c#7 integrate ... //depot/projects/smpng/sys/netinet6/raw_ip6.c#11 integrate ... //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#13 integrate ... //depot/projects/smpng/sys/netipx/ipx_pcb.c#7 integrate ... //depot/projects/smpng/sys/netipx/ipx_usrreq.c#8 integrate ... //depot/projects/smpng/sys/netipx/spx_usrreq.c#5 integrate ... //depot/projects/smpng/sys/netkey/key.c#12 integrate ... //depot/projects/smpng/sys/netkey/keysock.c#8 integrate ... //depot/projects/smpng/sys/netnatm/natm.c#6 integrate ... //depot/projects/smpng/sys/netncp/ncp_sock.c#2 integrate ... //depot/projects/smpng/sys/netns/idp_usrreq.c#3 integrate ... //depot/projects/smpng/sys/netns/ns.c#2 integrate ... //depot/projects/smpng/sys/netns/ns_pcb.c#3 integrate ... //depot/projects/smpng/sys/netns/spp_usrreq.c#2 integrate ... //depot/projects/smpng/sys/netsmb/smb_iod.c#6 integrate ... //depot/projects/smpng/sys/netsmb/smb_trantcp.c#9 integrate ... //depot/projects/smpng/sys/nfsclient/bootp_subr.c#11 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_socket.c#9 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#7 integrate ... //depot/projects/smpng/sys/pccard/pccard_nbk.c#7 integrate ... //depot/projects/smpng/sys/powerpc/include/cpu.h#10 integrate ... //depot/projects/smpng/sys/powerpc/include/elf.h#4 integrate ... //depot/projects/smpng/sys/powerpc/include/frame.h#5 integrate ... //depot/projects/smpng/sys/powerpc/include/powerpc.h#3 integrate ... //depot/projects/smpng/sys/powerpc/include/psl.h#2 integrate ... //depot/projects/smpng/sys/powerpc/include/runq.h#1 branch ... //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#4 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#24 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/ofw_machdep.c#3 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#18 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#19 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#3 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#13 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_interface.c#3 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_mmap.c#9 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_socket.c#9 integrate ... //depot/projects/smpng/sys/sparc64/conf/GENERIC#14 integrate ... //depot/projects/smpng/sys/sparc64/include/asmacros.h#10 integrate ... //depot/projects/smpng/sys/sparc64/include/cache.h#5 integrate ... //depot/projects/smpng/sys/sparc64/include/elf.h#7 integrate ... //depot/projects/smpng/sys/sparc64/include/intr_machdep.h#9 integrate ... //depot/projects/smpng/sys/sparc64/include/metadata.h#3 integrate ... //depot/projects/smpng/sys/sparc64/include/pcpu.h#5 integrate ... //depot/projects/smpng/sys/sparc64/include/pmap.h#12 integrate ... //depot/projects/smpng/sys/sparc64/include/pv.h#7 integrate ... //depot/projects/smpng/sys/sparc64/include/runq.h#1 branch ... //depot/projects/smpng/sys/sparc64/include/smp.h#7 integrate ... //depot/projects/smpng/sys/sparc64/include/tlb.h#11 integrate ... //depot/projects/smpng/sys/sparc64/include/tsb.h#7 integrate ... //depot/projects/smpng/sys/sparc64/include/tte.h#8 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/cache.c#6 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/exception.s#19 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#20 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#15 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#28 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.s#3 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#8 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/nexus.c#4 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#23 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pv.c#12 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/support.s#12 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#1 branch ... //depot/projects/smpng/sys/sparc64/sparc64/trap.c#34 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#12 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#20 integrate ... //depot/projects/smpng/sys/sys/cdefs.h#13 integrate ... //depot/projects/smpng/sys/sys/elf32.h#2 integrate ... //depot/projects/smpng/sys/sys/elf64.h#2 integrate ... //depot/projects/smpng/sys/sys/elf_generic.h#2 integrate ... //depot/projects/smpng/sys/sys/eventhandler.h#6 integrate ... //depot/projects/smpng/sys/sys/gpt.h#1 branch ... //depot/projects/smpng/sys/sys/iconv.h#3 integrate ... //depot/projects/smpng/sys/sys/lockmgr.h#6 integrate ... //depot/projects/smpng/sys/sys/mount.h#12 integrate ... //depot/projects/smpng/sys/sys/param.h#24 integrate ... //depot/projects/smpng/sys/sys/runq.h#4 integrate ... //depot/projects/smpng/sys/sys/signalvar.h#9 integrate ... //depot/projects/smpng/sys/sys/smp.h#6 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#20 integrate ... //depot/projects/smpng/sys/sys/syscall.h#15 integrate ... //depot/projects/smpng/sys/sys/syscall.mk#15 integrate ... //depot/projects/smpng/sys/sys/sysproto.h#17 integrate ... //depot/projects/smpng/sys/sys/systm.h#30 integrate ... //depot/projects/smpng/sys/sys/tty.h#7 integrate ... //depot/projects/smpng/sys/sys/uuid.h#1 branch ... //depot/projects/smpng/sys/sys/wait.h#3 integrate ... //depot/projects/smpng/sys/vm/uma_dbg.c#2 integrate ... //depot/projects/smpng/sys/vm/vm_contig.c#5 integrate ... //depot/projects/smpng/sys/vm/vm_fault.c#11 integrate ... //depot/projects/smpng/sys/vm/vm_kern.h#2 integrate ... //depot/projects/smpng/sys/vm/vm_map.c#15 integrate ... //depot/projects/smpng/sys/vm/vm_map.h#9 integrate ... //depot/projects/smpng/sys/vm/vm_mmap.c#18 integrate ... //depot/projects/smpng/sys/vm/vm_page.h#8 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/clock.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.30 2002/05/16 21:21:16 trhodes Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.31 2002/05/26 11:23:00 des Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* @@ -210,6 +210,8 @@ out: #ifdef EVCNT_COUNTERS evcnt_attach(dev, "intr", &clock_intr_evcnt); +#else + /* nothing */ ; #endif } ==== //depot/projects/smpng/sys/alpha/alpha/support.s#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.9 2001/12/11 23:33:38 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.10 2002/05/26 16:03:12 dfr Exp $ */ /* @@ -65,6 +65,7 @@ */ LEAF(suword, 1) + XLEAF(suword64, 1) LDGP(pv) ldiq t0, VM_MAXUSER_ADDRESS /* verify address validity */ @@ -110,6 +111,7 @@ END(subyte) LEAF(fuword, 1) + XLEAF(fuword64, 1) LDGP(pv) ldiq t0, VM_MAXUSER_ADDRESS /* verify address validity */ ==== //depot/projects/smpng/sys/alpha/include/elf.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/elf.h,v 1.12 2001/10/10 23:06:48 ps Exp $ + * $FreeBSD: src/sys/alpha/include/elf.h,v 1.13 2002/05/30 08:32:18 dfr Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -60,17 +60,6 @@ __ElfType(Auxinfo); -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf64_Off Elf64_Hashelt; - -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ ==== //depot/projects/smpng/sys/boot/common/loader.8#12 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.41 2002/03/15 15:12:10 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.42 2002/05/29 22:57:18 schweikh Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -54,7 +54,7 @@ The smaller one is a set of commands designed for direct use by the casual user, called "builtin commands" for historical reasons. -The main drive behind these commands is user-friendlyness. +The main drive behind these commands is user-friendliness. The bigger component is an .Tn ANS Forth compatible Forth interpreter based on ficl, by @@ -96,7 +96,7 @@ will be read for historical reasons. These files are processed through the .Ic include -command, which read all of them into memory before processing them, +command, which reads all of them into memory before processing them, making disk changes possible. .Pp At this point, if an @@ -323,7 +323,7 @@ .Ic autoboot will be automatically attempted after processing .Pa /boot/loader.rc , -though explict +though explicit .Ic autoboot Ns 's will be processed normally, defaulting to 10 seconds delay. .It Va boot_askname @@ -365,13 +365,13 @@ Define the number of lines on the screen, to be used by the pager. .It Va module_path Sets the list of directories which will be searched in for modules -named in a load command or implicitly required by a dependancy. +named in a load command or implicitly required by a dependency. The default value for this variable is .Dq Li /;/boot;/modules . .It Va num_ide_disks Sets the number of IDE disks as a work around for some problems in finding the root disk at boot. -This has been deprecated in favour of +This has been deprecated in favor of .Va root_disk_unit . .It Va prompt Value of @@ -517,7 +517,7 @@ .It \e\e will be replaced with a single \e . .It -In any other occurance, backslash will just be removed. +In any other occurrence, backslash will just be removed. .El .It Every string between non-escaped quotes or double-quotes will be treated @@ -527,7 +527,7 @@ .Li $VARIABLE or .Li ${VARIABLE} -with the value of the environemnt variable +with the value of the environment variable .Va VARIABLE . .It Passes multiple space-delimited arguments to the builtin command called. @@ -575,7 +575,7 @@ .Ef \&! This is particular annoying for programs that want or need to treat exceptions. -In this case, it is recommended the use of a proxy. +In this case, it is recommended to use a proxy. For example: .Dl : (boot) boot ; .Sh FICL ==== //depot/projects/smpng/sys/boot/efi/include/efi.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/include/efi.h,v 1.2 2001/11/19 07:09:47 peter Exp $ */ +/* $FreeBSD: src/sys/boot/efi/include/efi.h,v 1.3 2002/05/19 03:17:20 marcel Exp $ */ /*++ Copyright (c) 1998 Intel Corporation @@ -17,13 +17,12 @@ --*/ -// -// Build flags on input -// EFI32 -// EFI_DEBUG - Enable debugging code -// EFI_NT_EMULATOR - Building for running under NT -// - +/* + * Build flags on input + * EFI32 + * EFI_DEBUG - Enable debugging code + * EFI_NT_EMULATOR - Building for running under NT + */ #ifndef _EFI_INCLUDE_ #define _EFI_INCLUDE_ ==== //depot/projects/smpng/sys/boot/efi/include/efi_nii.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/include/efi_nii.h,v 1.1 2001/06/09 16:49:49 dfr Exp $ */ +/* $FreeBSD: src/sys/boot/efi/include/efi_nii.h,v 1.2 2002/05/19 03:17:20 marcel Exp $ */ #ifndef _EFI_NII_H #define _EFI_NII_H @@ -29,47 +29,54 @@ typedef struct { + /* Revision of the network interface identifier protocol interface. */ UINT64 Revision; - // Revision of the network interface identifier protocol interface. + /* + * Address of the first byte of the identifying structure for this + * network interface. This is set to zero if there is no structure. + * For PXE/UNDI this is the first byte of the !PXE structure. + */ UINT64 ID; - // Address of the first byte of the identifying structure for this - // network interface. This is set to zero if there is no structure. - // - // For PXE/UNDI this is the first byte of the !PXE structure. + /* + * Address of the UNrelocated driver/ROM image. This is set + * to zero if there is no driver/ROM image. + * For 16-bit UNDI, this is the first byte of the option ROM in + * upper memory. + * For 32/64-bit S/W UNDI, this is the first byte of the EFI ROM + * image. + * For H/W UNDI, this is set to zero. + */ UINT64 ImageAddr; - // Address of the UNrelocated driver/ROM image. This is set - // to zero if there is no driver/ROM image. - // - // For 16-bit UNDI, this is the first byte of the option ROM in - // upper memory. - // - // For 32/64-bit S/W UNDI, this is the first byte of the EFI ROM - // image. - // - // For H/W UNDI, this is set to zero. + /* + * Size of the UNrelocated driver/ROM image of this network interface. + * This is set to zero if there is no driver/ROM image. + */ UINT32 ImageSize; - // Size of the UNrelocated driver/ROM image of this network interface. - // This is set to zero if there is no driver/ROM image. + /* + * 4 char ASCII string to go in class identifier (option 60) in DHCP + * and Boot Server discover packets. + * For EfiNetworkInterfaceUndi this field is "UNDI". + * For EfiNetworkInterfaceSnp this field is "SNPN". + */ CHAR8 StringId[4]; - // 4 char ASCII string to go in class identifier (option 60) in DHCP - // and Boot Server discover packets. - // For EfiNetworkInterfaceUndi this field is "UNDI". - // For EfiNetworkInterfaceSnp this field is "SNPN". + /* + * Information to be placed into the PXE DHCP and Discover packets. + * This is the network interface type and version number that will + * be placed into DHCP option 94 (client network interface identifier). + */ UINT8 Type; UINT8 MajorVer; UINT8 MinorVer; - // Information to be placed into the PXE DHCP and Discover packets. - // This is the network interface type and version number that will - // be placed into DHCP option 94 (client network interface identifier). + BOOLEAN Ipv6Supported; - UINT8 IfNum; // interface number to be used with pxeid structure + UINT8 IfNum; /* interface number to be used with pxeid structure */ } EFI_NETWORK_INTERFACE_IDENTIFIER_INTERFACE; extern EFI_GUID NetworkInterfaceIdentifierProtocol; -#endif // _EFI_NII_H +#endif /* _EFI_NII_H */ ==== //depot/projects/smpng/sys/boot/efi/include/efiapi.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.3 2002/03/19 10:50:09 peter Exp $ */ +/* $FreeBSD: src/sys/boot/efi/include/efiapi.h,v 1.4 2002/05/19 03:17:20 marcel Exp $ */ #ifndef _EFI_API_H #define _EFI_API_H @@ -21,22 +21,22 @@ --*/ -// -// EFI Specification Revision -// +/* + * EFI Specification Revision + */ #define EFI_SPECIFICATION_MAJOR_REVISION 1 #define EFI_SPECIFICATION_MINOR_REVISION 02 -// -// Declare forward referenced data structures -// +/* + * Declare forward referenced data structures + */ INTERFACE_DECL(_EFI_SYSTEM_TABLE); -// -// EFI Memory -// +/* + * EFI Memory + */ typedef EFI_STATUS @@ -92,8 +92,8 @@ #define EFI_OPTIONAL_PTR 0x00000001 -#define EFI_INTERNAL_FNC 0x00000002 // Pointer to internal runtime fnc -#define EFI_INTERNAL_PTR 0x00000004 // Pointer to internal runtime data +#define EFI_INTERNAL_FNC 0x00000002 /* Pointer to internal runtime fnc */ +#define EFI_INTERNAL_PTR 0x00000004 /* Pointer to internal runtime data */ typedef @@ -104,9 +104,9 @@ ); -// -// EFI Events -// +/* + * EFI Events + */ @@ -181,9 +181,9 @@ IN EFI_EVENT Event ); -// -// Task priority level -// +/* + * Task priority level + */ #define TPL_APPLICATION 4 #define TPL_CALLBACK 8 @@ -203,19 +203,19 @@ ); -// -// EFI platform varibles -// +/* + * EFI platform varibles + */ #define EFI_GLOBAL_VARIABLE \ { 0x8BE4DF61, 0x93CA, 0x11d2, 0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C } -// Variable attributes +/* Variable attributes */ #define EFI_VARIABLE_NON_VOLATILE 0x00000001 #define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x00000002 #define EFI_VARIABLE_RUNTIME_ACCESS 0x00000004 -// Variable size limitation +/* Variable size limitation */ #define EFI_MAXIMUM_VARIABLE_SIZE 1024 typedef @@ -248,14 +248,14 @@ ); -// -// EFI Time -// +/* + * EFI Time + */ typedef struct { - UINT32 Resolution; // 1e-6 parts per million - UINT32 Accuracy; // hertz - BOOLEAN SetsToZero; // Set clears sub-second time + UINT32 Resolution; /* 1e-6 parts per million */ + UINT32 Accuracy; /* hertz */ + BOOLEAN SetsToZero; /* Set clears sub-second time */ } EFI_TIME_CAPABILITIES; @@ -288,12 +288,12 @@ ); -// -// Image functions -// +/* + * Image functions + */ -// PE32+ Subsystem type for EFI images +/* PE32+ Subsystem type for EFI images */ #if !defined(IMAGE_SUBSYSTEM_EFI_APPLICATION) #define IMAGE_SUBSYSTEM_EFI_APPLICATION 10 @@ -301,7 +301,7 @@ #define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12 #endif -// PE32+ Machine type for EFI images +/* PE32+ Machine type for EFI images */ #if !defined(EFI_IMAGE_MACHINE_IA32) #define EFI_IMAGE_MACHINE_IA32 0x014c @@ -311,7 +311,7 @@ #define EFI_IMAGE_MACHINE_IA64 0x0200 #endif -// Image Entry prototype +/* Image Entry prototype */ typedef EFI_STATUS @@ -355,7 +355,7 @@ ); -// Image handle +/* Image handle */ #define LOADED_IMAGE_PROTOCOL \ { 0x5B1B31A1, 0x9562, 0x11d2, 0x8E, 0x3F, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B } @@ -365,22 +365,22 @@ EFI_HANDLE ParentHandle; struct _EFI_SYSTEM_TABLE *SystemTable; - // Source location of image + /* Source location of image */ EFI_HANDLE DeviceHandle; EFI_DEVICE_PATH *FilePath; VOID *Reserved; - // Images load options + /* Images load options */ UINT32 LoadOptionsSize; VOID *LoadOptions; - // Location of where image was loaded + /* Location of where image was loaded */ VOID *ImageBase; UINT64 ImageSize; EFI_MEMORY_TYPE ImageCodeType; EFI_MEMORY_TYPE ImageDataType; - // If the driver image supports a dynamic unload request + /* If the driver image supports a dynamic unload request */ EFI_IMAGE_UNLOAD Unload; } EFI_LOADED_IMAGE; @@ -393,9 +393,9 @@ IN UINTN MapKey ); -// -// Misc -// +/* + * Misc + */ typedef @@ -440,9 +440,9 @@ OUT UINT32 *HighCount ); -// -// Protocol handler functions -// +/* + * Protocol handler functions + */ typedef enum { EFI_NATIVE_INTERFACE, @@ -528,9 +528,9 @@ VOID ); -// -// Standard EFI table header -// +/* + * Standard EFI table header + */ typedef struct _EFI_TABLE_HEARDER { UINT64 Signature; @@ -541,9 +541,9 @@ } EFI_TABLE_HEADER; -// -// EFI Runtime Serivces Table -// +/* + * EFI Runtime Serivces Table + */ #define EFI_RUNTIME_SERVICES_SIGNATURE 0x56524553544e5552 #define EFI_RUNTIME_SERVICES_REVISION (EFI_SPECIFICATION_MAJOR_REVISION<<16) | (EFI_SPECIFICATION_MINOR_REVISION) @@ -551,33 +551,25 @@ typedef struct { EFI_TABLE_HEADER Hdr; - // - // Time services - // + /* Time services */ EFI_GET_TIME GetTime; EFI_SET_TIME SetTime; EFI_GET_WAKEUP_TIME GetWakeupTime; EFI_SET_WAKEUP_TIME SetWakeupTime; - // - // Virtual memory services - // + /* Virtual memory services */ EFI_SET_VIRTUAL_ADDRESS_MAP SetVirtualAddressMap; EFI_CONVERT_POINTER ConvertPointer; - // - // Variable serviers - // + /* Variable serviers */ EFI_GET_VARIABLE GetVariable; EFI_GET_NEXT_VARIABLE_NAME GetNextVariableName; EFI_SET_VARIABLE SetVariable; - // - // Misc - // + /* Misc */ EFI_GET_NEXT_HIGH_MONO_COUNT GetNextHighMonotonicCount; EFI_RESET_SYSTEM ResetSystem; @@ -585,9 +577,9 @@ } EFI_RUNTIME_SERVICES; -// -// EFI Boot Services Table -// +/* + * EFI Boot Services Table + */ #define EFI_BOOT_SERVICES_SIGNATURE 0x56524553544f4f42 #define EFI_BOOT_SERVICES_REVISION (EFI_SPECIFICATION_MAJOR_REVISION<<16) | (EFI_SPECIFICATION_MINOR_REVISION) @@ -596,16 +588,12 @@ EFI_TABLE_HEADER Hdr; - // - // Task priority functions - // + /* Task priority functions */ EFI_RAISE_TPL RaiseTPL; EFI_RESTORE_TPL RestoreTPL; - // - // Memory functions - // + /* Memory functions */ EFI_ALLOCATE_PAGES AllocatePages; EFI_FREE_PAGES FreePages; @@ -613,9 +601,7 @@ EFI_ALLOCATE_POOL AllocatePool; EFI_FREE_POOL FreePool; - // - // Event & timer functions - // + /* Event & timer functions */ EFI_CREATE_EVENT CreateEvent; EFI_SET_TIMER SetTimer; @@ -624,9 +610,7 @@ EFI_CLOSE_EVENT CloseEvent; EFI_CHECK_EVENT CheckEvent; - // - // Protocol handler functions - // + /* Protocol handler functions */ EFI_INSTALL_PROTOCOL_INTERFACE InstallProtocolInterface; EFI_REINSTALL_PROTOCOL_INTERFACE ReinstallProtocolInterface; @@ -638,9 +622,7 @@ EFI_LOCATE_DEVICE_PATH LocateDevicePath; EFI_INSTALL_CONFIGURATION_TABLE InstallConfigurationTable; - // - // Image functions - // + /* Image functions */ EFI_IMAGE_LOAD LoadImage; EFI_IMAGE_START StartImage; @@ -648,9 +630,7 @@ EFI_IMAGE_UNLOAD UnloadImage; EFI_EXIT_BOOT_SERVICES ExitBootServices; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 30 19:51:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D73137B400; Thu, 30 May 2002 19:51:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9206337B404 for ; Thu, 30 May 2002 19:51:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4V2pCb96636 for perforce@freebsd.org; Thu, 30 May 2002 19:51:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 30 May 2002 19:51:12 -0700 (PDT) Message-Id: <200205310251.g4V2pCb96636@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12169 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12169 Change 12169 by rwatson@rwatson_curry on 2002/05/30 19:51:06 Enable mac_biba in the default build. It mostly works still. Affected files ... ... //depot/projects/trustedbsd/mac/sys/modules/Makefile#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#21 (text+ko) ==== @@ -49,6 +49,7 @@ libmchain \ lnc \ lpt \ + mac_biba \ mac_bsdextended \ mac_ifoff \ mac_none \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 30 19:51:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4E1537B407; Thu, 30 May 2002 19:50:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A797A37B401 for ; Thu, 30 May 2002 19:50:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4V2o9n95854 for perforce@freebsd.org; Thu, 30 May 2002 19:50:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 30 May 2002 19:50:09 -0700 (PDT) Message-Id: <200205310250.g4V2o9n95854@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12168 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12168 Change 12168 by rwatson@rwatson_curry on 2002/05/30 19:49:24 Integrate support for dynamic labeling from the green_mac branch. Things might still work, mostly. HEADS UP: Currently MLS and TE are broken. Biba mostly works. We'll fix that in the next day or two, but caution is required if tracking trustedbsd_mac. Affected files ... ... //depot/projects/trustedbsd/mac/sys/Makefile#3 integrate ... //depot/projects/trustedbsd/mac/sys/conf/files#31 integrate ... //depot/projects/trustedbsd/mac/sys/fs/deadfs/dead_vnops.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#5 integrate ... //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#16 integrate ... //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.h#6 integrate ... //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#4 integrate ... //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.h#8 integrate ... //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#30 integrate ... //depot/projects/trustedbsd/mac/sys/kern/init_main.c#21 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#20 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#147 integrate ... //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#19 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#11 integrate ... //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#16 integrate ... //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#6 integrate ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#24 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#23 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#19 integrate ... //depot/projects/trustedbsd/mac/sys/kern/vnode_if.src#7 integrate ... //depot/projects/trustedbsd/mac/sys/modules/Makefile#20 integrate ... //depot/projects/trustedbsd/mac/sys/modules/mac_test/Makefile#1 branch ... //depot/projects/trustedbsd/mac/sys/net/bpfdesc.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/net/if_loop.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/net/if_var.h#9 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#13 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#12 integrate ... //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#4 integrate ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_input.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#37 integrate ... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#29 integrate ... //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#8 integrate ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#31 integrate ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#27 integrate ... //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#9 integrate ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#31 integrate ... //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#1 branch ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#7 integrate ... //depot/projects/trustedbsd/mac/sys/sys/imgact.h#5 integrate ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#102 integrate ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#63 integrate ... //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#6 integrate ... //depot/projects/trustedbsd/mac/sys/sys/mount.h#12 integrate ... //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#15 integrate ... //depot/projects/trustedbsd/mac/sys/sys/ucred.h#10 integrate ... //depot/projects/trustedbsd/mac/sys/sys/vnode.h#25 integrate ... //depot/projects/trustedbsd/mac/sys/ufs/ufs/inode.h#6 integrate ... //depot/projects/trustedbsd/mac/sys/ufs/ufs/mac.h#3 delete ... //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_mac.c#7 delete ... //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#34 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/Makefile#3 (text+ko) ==== @@ -8,6 +8,31 @@ SUBDIR+=modules .endif +.for arch in alpha ia64 powerpc sparc64 +.if ${MACHINE_ARCH} != "${arch}" +SKIPARCHS+= ${arch} +.endif +.endfor +.if ${MACHINE_ARCH} == "i386" +SKIPARCHS+= pc98 +.elif ${MACHINE_ARCH} == "pc98" +.else +SKIPARCHS+= i386 +SKIPARCHS+= pc98 +.endif +SKIPPATTERN:=\./boot +.for arch in ${SKIPARCHS} +SKIPPATTERN:=${SKIPPATTERN}|\./${arch} +.endfor +ctags: + rm -f ${.CURDIR}/tags + touch ${.CURDIR}/tags + cd ${.CURDIR}; \ + find -E . -type d -mindepth 1 -maxdepth 1 \ + ! -regex "${SKIPPATTERN}" | \ + xargs -J {} find {} -name "*.[lych]" | \ + xargs ctags -a -f ${.CURDIR}/tags + HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` .include ==== //depot/projects/trustedbsd/mac/sys/conf/files#31 (text+ko) ==== @@ -1341,7 +1341,6 @@ ufs/ufs/ufs_lookup.c optional ext2fs ufs/ufs/ufs_lookup.c optional ffs ufs/ufs/ufs_lookup.c optional ifs -ufs/ufs/ufs_mac.c optional ffs ufs/ufs/ufs_quota.c optional ext2fs ufs/ufs/ufs_quota.c optional ffs ufs/ufs/ufs_quota.c optional ifs ==== //depot/projects/trustedbsd/mac/sys/fs/deadfs/dead_vnops.c#6 (text+ko) ==== @@ -58,9 +58,6 @@ static int dead_print(struct vop_print_args *); static int dead_read(struct vop_read_args *); static int dead_write(struct vop_write_args *); -#ifdef MAC -static int dead_getlabel(struct vop_getlabel_args *); -#endif /* MAC */ vop_t **dead_vnodeop_p; static struct vnodeopv_entry_desc dead_vnodeop_entries[] = { @@ -70,9 +67,6 @@ { &vop_bmap_desc, (vop_t *) dead_bmap }, { &vop_create_desc, (vop_t *) vop_panic }, { &vop_getattr_desc, (vop_t *) vop_ebadf }, -#ifdef MAC - { &vop_getlabel_desc, (vop_t *) dead_getlabel }, -#endif /* MAC */ { &vop_inactive_desc, (vop_t *) vop_null }, { &vop_ioctl_desc, (vop_t *) dead_ioctl }, { &vop_link_desc, (vop_t *) vop_panic }, @@ -290,25 +284,3 @@ { return (POLLHUP); } - -#ifdef MAC -/* - * We'll always need to fall back to some kind of default MAC label for - * some things even if an object gets revoked, so return an empty one - * if so. - */ -static int -dead_getlabel(ap) - struct vop_getlabel_args *ap; -{ - - /* - * Using rootvnode here to inherit a label from is probably totally - * bogus. Since this vnode is dead, I suppose we can choose to not - * care. - */ - mac_create_vnode_from_vnode(ap->a_cred, rootvnode, ap->a_vp, - ap->a_label); - return (0); -} -#endif /* MAC */ ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs.h#4 (text+ko) ==== @@ -78,7 +78,7 @@ mode_t de_mode; uid_t de_uid; gid_t de_gid; - struct mac de_label; + struct label de_label; struct timespec de_atime; struct timespec de_mtime; struct timespec de_ctime; ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#5 (text+ko) ==== @@ -209,6 +209,9 @@ vfs_timestamp(&de->de_ctime); de->de_mtime = de->de_atime = de->de_ctime; de->de_links = 1; +#ifdef MAC + mac_init_devfsdirent(de); +#endif return (de); } @@ -256,6 +259,9 @@ if (de->de_vnode) de->de_vnode->v_data = NULL; TAILQ_REMOVE(&dd->de_dlist, de, de_list); +#ifdef MAC + mac_destroy_devfsdirent(de); +#endif FREE(de, M_DEVFS); } @@ -329,7 +335,7 @@ de = devfs_vmkdir(s, q - s, dd); #ifdef MAC mac_create_devfs_directory(s, q - s, - &de->de_label); + de); #endif de->de_inode = dm->dm_inode++; TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); @@ -357,7 +363,7 @@ de->de_dirent->d_type = DT_CHR; } #ifdef MAC - mac_create_devfs_device(dev, &de->de_label); + mac_create_devfs_device(dev, de); #endif *dep = de; de->de_dir = dd; ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#7 (text+ko) ==== @@ -96,7 +96,7 @@ fmp->dm_rootdir = devfs_vmkdir("(root)", 6, NULL); fmp->dm_rootdir->de_inode = 2; #ifdef MAC - mac_create_devfs_directory("", 0, &fmp->dm_rootdir->de_label); + mac_create_devfs_directory("", 0, fmp->dm_rootdir); #endif fmp->dm_basedir = fmp->dm_rootdir; ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#16 (text+ko) ==== @@ -64,9 +64,6 @@ static int devfs_access(struct vop_access_args *ap); static int devfs_getattr(struct vop_getattr_args *ap); -#ifdef MAC -static int devfs_getlabel(struct vop_getlabel_args *ap); -#endif static int devfs_lookupx(struct vop_lookup_args *ap); static int devfs_mknod(struct vop_mknod_args *ap); static int devfs_pathconf(struct vop_pathconf_args *ap); @@ -75,6 +72,9 @@ static int devfs_readdir(struct vop_readdir_args *ap); static int devfs_readlink(struct vop_readlink_args *ap); static int devfs_reclaim(struct vop_reclaim_args *ap); +#ifdef MAC +static int devfs_refreshlabel(struct vop_refreshlabel_args *ap); +#endif static int devfs_remove(struct vop_remove_args *ap); static int devfs_revoke(struct vop_revoke_args *ap); static int devfs_setattr(struct vop_setattr_args *ap); @@ -163,6 +163,9 @@ vp->v_data = de; de->de_vnode = vp; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); +#ifdef MAC + mac_create_devfs_vnode(de, vp); +#endif *vpp = vp; return (0); } @@ -254,26 +257,7 @@ return (error); } -#ifdef MAC static int -devfs_getlabel(ap) - struct vop_getlabel_args /* { - struct vnode *a_vp; - struct mac *a_label; - struct ucred *a_cred; - struct thread *a_td; - } */ *ap; -{ - - bzero(ap->a_label, sizeof(*ap->a_label)); - mac_copy_label(&((struct devfs_dirent *) ap->a_vp->v_data)->de_label, - ap->a_label); - - return (0); -} -#endif - -static int devfs_lookupx(ap) struct vop_lookup_args /* { struct vnode * a_dvp; @@ -661,7 +645,21 @@ return (0); } +#ifdef MAC static int +devfs_refreshlabel(ap) + struct vop_refreshlabel_args /* { + struct vnode *a_vp; + struct ucred *a_cred; + } */ *ap; +{ + + /* Labels are always in sync. */ + return (0); +} +#endif + +static int devfs_remove(ap) struct vop_remove_args /* { struct vnode *a_dvp; @@ -681,6 +679,9 @@ TAILQ_REMOVE(&dd->de_dlist, de, de_list); if (de->de_vnode) de->de_vnode->v_data = NULL; +#ifdef MAC + mac_destroy_devfsdirent(de); +#endif FREE(de, M_DEVFS); } else { de->de_flags |= DE_WHITEOUT; @@ -811,17 +812,15 @@ struct thread *a_td; } */ *ap; { + struct vnode *vp; struct devfs_dirent *de; - int error; - de = ap->a_vp->v_data; + vp = ap->a_vp; + de = vp->v_data; - error = VOP_ACCESS(ap->a_vp, VADMIN, ap->a_cred, ap->a_td); - if (error) - return (error); + mac_relabel_vnode(ap->a_cred, vp, ap->a_label); + mac_update_devfsdirent_from_vnode(de, vp); - mac_copy_label(ap->a_label, &de->de_label); - return (0); } #endif @@ -859,8 +858,8 @@ TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); devfs_allocv(de, ap->a_dvp->v_mount, ap->a_vpp, 0); #ifdef MAC - mac_create_vnode_from_vnode(ap->a_cnp->cn_cred, ap->a_dvp, *ap->a_vpp, - &de->de_label); + mac_create_vnode_from_vnode(ap->a_cnp->cn_cred, ap->a_dvp, *ap->a_vpp); + mac_update_devfsdirent_from_vnode(de, *ap->a_vpp); #endif /* MAC */ lockmgr(&dmp->dm_lock, LK_RELEASE, 0, curthread); return (0); @@ -871,9 +870,6 @@ { &vop_default_desc, (vop_t *) vop_defaultop }, { &vop_access_desc, (vop_t *) devfs_access }, { &vop_getattr_desc, (vop_t *) devfs_getattr }, -#ifdef MAC - { &vop_getlabel_desc, (vop_t *) devfs_getlabel }, -#endif { &vop_islocked_desc, (vop_t *) vop_stdislocked }, { &vop_lock_desc, (vop_t *) vop_stdlock }, { &vop_lookup_desc, (vop_t *) devfs_lookup }, @@ -885,6 +881,9 @@ { &vop_readlink_desc, (vop_t *) devfs_readlink }, { &vop_reclaim_desc, (vop_t *) devfs_reclaim }, { &vop_remove_desc, (vop_t *) devfs_remove }, +#ifdef MAC + { &vop_refreshlabel_desc, (vop_t *) devfs_refreshlabel }, +#endif { &vop_revoke_desc, (vop_t *) devfs_revoke }, { &vop_setattr_desc, (vop_t *) devfs_setattr }, #ifdef MAC @@ -904,14 +903,14 @@ { &vop_default_desc, (vop_t *) spec_vnoperate }, { &vop_access_desc, (vop_t *) devfs_access }, { &vop_getattr_desc, (vop_t *) devfs_getattr }, -#ifdef MAC - { &vop_getlabel_desc, (vop_t *) devfs_getlabel }, -#endif { &vop_islocked_desc, (vop_t *) vop_stdislocked }, { &vop_lock_desc, (vop_t *) vop_stdlock }, { &vop_pathconf_desc, (vop_t *) devfs_pathconf }, { &vop_print_desc, (vop_t *) devfs_print }, { &vop_reclaim_desc, (vop_t *) devfs_reclaim }, +#ifdef MAC + { &vop_refreshlabel_desc, (vop_t *) devfs_refreshlabel }, +#endif { &vop_remove_desc, (vop_t *) devfs_remove }, { &vop_revoke_desc, (vop_t *) devfs_revoke }, { &vop_setattr_desc, (vop_t *) devfs_setattr }, ==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.c#6 (text+ko) ==== @@ -151,7 +151,7 @@ dir = pfs_create_dir(root, "pid", &procfs_attr, NULL, PFS_PROCDEP); - dir->pn_getlabel = &procfs_piddir_getlabel; + dir->pn_refreshlabel = &procfs_piddir_refreshlabel; pfs_create_file(dir, "cmdline", &procfs_doproccmdline, NULL, NULL, PFS_RD); pfs_create_file(dir, "ctl", &procfs_doprocctl, ==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.h#6 (text+ko) ==== @@ -62,7 +62,7 @@ int procfs_attr(PFS_ATTR_ARGS); /* MAC */ -int procfs_piddir_getlabel(PFS_GETLABEL_ARGS); +int procfs_piddir_refreshlabel(PFS_REFRESHLABEL_ARGS); /* Visibility */ int procfs_notsystem(PFS_VIS_ARGS); ==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#4 (text+ko) ==== @@ -52,18 +52,17 @@ #include int -procfs_piddir_getlabel(PFS_GETLABEL_ARGS) +procfs_piddir_refreshlabel(PFS_REFRESHLABEL_ARGS) { #ifdef MAC - bzero(label, sizeof(*label)); - if (p == NULL) { - *label = vp->v_mount->mnt_label; - return (0); + if (p == NULL) + mac_update_vnode_from_mount(vp, vp->v_mount); + else { + PROC_LOCK(p); + mac_update_procfsvnode_from_subject(vp, p->p_ucred); + PROC_UNLOCK(p); } - PROC_LOCK(p); - *label = p->p_ucred->cr_label; - PROC_UNLOCK(p); return (0); #else ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.h#8 (text+ko) ==== @@ -147,11 +147,11 @@ /* * Getlabel callback */ -#define PFS_GETLABEL_ARGS \ +#define PFS_REFRESHLABEL_ARGS \ struct thread *td, struct proc *p, struct vnode *vp, \ - struct pfs_node *pn, struct mac *label, struct ucred *cred + struct pfs_node *pn, struct ucred *cred struct mac; -typedef int (*pfs_getlabel_t)(PFS_GETLABEL_ARGS); +typedef int (*pfs_refreshlabel_t)(PFS_REFRESHLABEL_ARGS); /* * Last-close callback @@ -194,7 +194,7 @@ pfs_attr_t pn_attr; pfs_vis_t pn_vis; pfs_getextattr_t pn_getextattr; - pfs_getlabel_t pn_getlabel; + pfs_refreshlabel_t pn_refreshlabel; void *pn_data; int pn_flags; ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#12 (text+ko) ==== @@ -293,50 +293,7 @@ PFS_RETURN (error); } -#ifdef MAC /* - * Perform getlabel - */ -static int -pfs_getlabel(struct vop_getlabel_args *va) -{ - struct vnode *vn = va->a_vp; - struct pfs_vdata *pvd = (struct pfs_vdata *)vn->v_data; - struct pfs_node *pn = pvd->pvd_pn; - struct proc *proc = NULL; - int error; - - PFS_TRACE((pd->pn_name)); - - if (pn->pn_getlabel == NULL) - PFS_RETURN (vop_stdgetlabel(va)); - - /* - * This is necessary because either process' privileges may - * have changed since the last open() call. - */ - if (!pfs_visible(curthread, pn, pvd->pvd_pid)) - PFS_RETURN (EIO); - - /* XXX duplicate bits of pfs_visible() */ - if (pvd->pvd_pid != NO_PID) { - if ((proc = pfind(pvd->pvd_pid)) == NULL) - PFS_RETURN (EIO); - _PHOLD(proc); - PROC_UNLOCK(proc); - } - - error = (pn->pn_getlabel)(curthread, proc, vn, pn, va->a_label, - va->a_cred); - - if (proc != NULL) - PRELE(proc); - - PFS_RETURN (error); -} -#endif - -/* * Look up a file or directory * * XXX NOTE! pfs_lookup() has been hooked into vop_lookup_desc! This @@ -754,7 +711,51 @@ return (pfs_vncache_free(va->a_vp)); } +#ifdef MAC /* + * Refresh the vnode label as appropriate for the pseudo-file system. + */ +static int +pfs_refreshlabel(struct vop_refreshlabel_args *va) +{ + struct vnode *vn = va->a_vp; + struct pfs_vdata *pvd = (struct pfs_vdata *)vn->v_data; + struct pfs_node *pn = pvd->pvd_pn; + struct proc *proc = NULL; + int error; + + PFS_TRACE((pd->pn_name)); + + if (pn->pn_refreshlabel == NULL) { + mac_update_vnode_from_mount(vn, vn->v_mount); + return (0); + } + + /* + * This is necessary because either process' privileges may + * have changed since the last open() call. + */ + if (!pfs_visible(curthread, pn, pvd->pvd_pid)) + PFS_RETURN (EIO); + + /* XXX duplicate bits of pfs_visible() */ + if (pvd->pvd_pid != NO_PID) { + if ((proc = pfind(pvd->pvd_pid)) == NULL) + PFS_RETURN (EIO); + _PHOLD(proc); + PROC_UNLOCK(proc); + } + + error = (pn->pn_refreshlabel)(curthread, proc, vn, pn, va->a_cred); + + if (proc != NULL) + PRELE(proc); + + PFS_RETURN (error); +} +#endif + +/* * Set attributes */ static int @@ -836,9 +837,6 @@ { &vop_create_desc, (vop_t *)vop_eopnotsupp }, { &vop_getattr_desc, (vop_t *)pfs_getattr }, { &vop_getextattr_desc, (vop_t *)pfs_getextattr }, -#ifdef MAC - { &vop_getlabel_desc, (vop_t *)pfs_getlabel }, -#endif { &vop_ioctl_desc, (vop_t *)pfs_ioctl }, { &vop_link_desc, (vop_t *)vop_eopnotsupp }, { &vop_lookup_desc, (vop_t *)pfs_lookup }, @@ -849,6 +847,9 @@ { &vop_readdir_desc, (vop_t *)pfs_readdir }, { &vop_readlink_desc, (vop_t *)pfs_readlink }, { &vop_reclaim_desc, (vop_t *)pfs_reclaim }, +#ifdef MAC + { &vop_refreshlabel_desc, (vop_t *)pfs_refreshlabel }, +#endif { &vop_remove_desc, (vop_t *)vop_eopnotsupp }, { &vop_rename_desc, (vop_t *)vop_eopnotsupp }, { &vop_rmdir_desc, (vop_t *)vop_eopnotsupp }, ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#30 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/kern/init_main.c#21 (text+ko) ==== @@ -507,7 +507,6 @@ FILEDESC_UNLOCK(p->p_fd); VOP_UNLOCK(rootvnode, 0, td); #ifdef MAC - mac_create_mount(td->td_ucred, TAILQ_FIRST(&mountlist)); mac_create_root_mount(td->td_ucred, TAILQ_FIRST(&mountlist)); #endif /* MAC */ ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#20 (text+ko) ==== @@ -216,7 +216,7 @@ * Check file permissions (also 'opens' file, caches various * relevant file attributes (et al) in imgp "atomically" with * the open() with respects to the local system.) - * XXX: Pass back MAC label here? + * XXX: Hold the MAC label by not unlocking so it can't change? */ error = exec_check_permissions(imgp); if (error) { @@ -374,8 +374,9 @@ credential_changing |= ((attr.va_mode & VSGID) && oldcred->cr_gid != attr.va_gid); #ifdef MAC - credential_changing |= mac_execve_will_transition(oldcred, - &imgp->label); + vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); + credential_changing |= mac_execve_will_transition(oldcred, imgp->vp); + VOP_UNLOCK(imgp->vp, 0, td); #endif /* @@ -409,7 +410,9 @@ if (attr.va_mode & VSGID) change_egid(newcred, attr.va_gid); #ifdef MAC - mac_execve_transition(oldcred, newcred, &imgp->label); + vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); + mac_execve_transition(oldcred, newcred, imgp->vp); + VOP_UNLOCK(imgp->vp, 0, td); #endif setugidsafety(td); /* @@ -513,6 +516,25 @@ vrele(tracevp); pargs_drop(oldargs); + /* + * Free any resources malloc'd earlier that we didn't use. + */ + if (newcred == NULL) + crfree(oldcred); + else + crfree(newcred); + KASSERT(newargs == NULL, ("leaking p_args")); + /* + * Handle deferred decrement of ref counts. + */ + if (textvp != NULL) + vrele(textvp); + if (textdvp != NULL) + vrele(textdvp); + if (tracevp != NULL) + vrele(tracevp); + pargs_drop(oldargs); + exec_fail_dealloc: /* @@ -889,9 +911,6 @@ struct vnode *vp = imgp->vp; struct vattr *attr = imgp->attr; struct thread *td; -#ifdef MAC - struct mac *label = &imgp->label; -#endif int error; td = curthread; /* XXXKSE */ @@ -928,14 +947,11 @@ #ifdef MAC /* - * Retrieve the MAC label on the file to be executed, check that - * we can execute it, and hold onto the label for use later for - * MAC models support subject domain transitions at execve()-time. + * Check that we can execute the file, and hold onto the lock so + * that the label is retained for use later for MAC models that + * support subject domain transitions at execve()-time. */ - error = VOP_GETLABEL(vp, label, curthread->td_ucred, curthread); - if (error) - return (error); - error = mac_cred_canexec(curthread->td_ucred, label); + error = mac_cred_canexec(curthread->td_ucred, imgp->vp); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#147 (text+ko) ==== @@ -45,6 +45,7 @@ #include "opt_mac.h" #include +#include #include #include #include @@ -64,11 +65,16 @@ #include #include +#include + #include #include #include #include +#include +#include + #ifdef MAC SYSCTL_DECL(_security); @@ -90,12 +96,11 @@ #error "MAC_MAX_POLICIES too large" #endif static unsigned int mac_max_policies = MAC_MAX_POLICIES; -static unsigned int mac_policies_free = (1 << MAC_MAX_POLICIES) - 1; +static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1; SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD, &mac_max_policies, 0, ""); -struct maclabels { - void *labels[MAC_MAX_POLICIES]; -}; + +static int mac_late = 0; static int mac_late = 0; @@ -124,6 +129,7 @@ &mac_label_size, 0, "Pre-compiled MAC label size"); static int error_select(int error1, int error2); +static int mac_externalize(struct label *label, struct mac *mac); static int mac_policy_register(struct mac_policy_conf *mpc); static int mac_policy_unregister(struct mac_policy_conf *mpc); @@ -212,6 +218,9 @@ MAC_POLICY_LIST_UNBUSY(); \ } while (0) +MALLOC_DEFINE(M_TMPLABEL, "tmplabel", "temporary user-label copied storage"); +const size_t maxlabelsize = 65536; + /* * Initialize the MAC subsystem, including appropriate SMP locks. */ @@ -281,27 +290,20 @@ for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) { switch (mpe->mpe_constant) { + case MAC_OP_LAST: + /* + * Doesn't actually happen, but this allows checking + * that all enumerated values are handled. + */ + break; case MAC_DESTROY: - mpc->mpc_ops.mpo_destroy = mpe->mpe_function; + mpc->mpc_ops.mpo_destroy = + mpe->mpe_function; break; case MAC_INIT: - mpc->mpc_ops.mpo_init = mpe->mpe_function; - break; - case MAC_COPY_LABEL: - mpc->mpc_ops.mpo_copy_label = mpe->mpe_function; - break; - case MAC_DOMINATE: - mpc->mpc_ops.mpo_dominate = mpe->mpe_function; - break; - case MAC_EQUAL: - mpc->mpc_ops.mpo_equal = mpe->mpe_function; - break; - case MAC_PRINT_LABEL: - mpc->mpc_ops.mpo_print_label = mpe->mpe_function; + mpc->mpc_ops.mpo_init = + mpe->mpe_function; break; - case MAC_VALIDATE_LABEL: - mpc->mpc_ops.mpo_validate_label = mpe->mpe_function; - break; case MAC_CREATE_DEVFS_DEVICE: mpc->mpc_ops.mpo_create_devfs_device = mpe->mpe_function; @@ -310,16 +312,43 @@ mpc->mpc_ops.mpo_create_devfs_directory = mpe->mpe_function; break; + case MAC_CREATE_DEVFS_VNODE: + mpc->mpc_ops.mpo_create_devfs_vnode = + mpe->mpe_function; + break; case MAC_CREATE_VNODE_FROM_VNODE: mpc->mpc_ops.mpo_create_vnode_from_vnode = mpe->mpe_function; break; + case MAC_CREATE_VNODE_FROM_EXPORTED: + mpc->mpc_ops.mpo_create_vnode_from_exported = + mpe->mpe_function; + break; case MAC_CREATE_MOUNT: mpc->mpc_ops.mpo_create_mount = mpe->mpe_function; break; case MAC_CREATE_ROOT_MOUNT: mpc->mpc_ops.mpo_create_root_mount = mpe->mpe_function; break; + case MAC_RELABEL_VNODE: + mpc->mpc_ops.mpo_relabel_vnode = mpe->mpe_function; + break; + case MAC_UPDATE_DEVFSDIRENT_FROM_VNODE: + mpc->mpc_ops.mpo_update_devfsdirent_from_vnode = + mpe->mpe_function; + break; + case MAC_UPDATE_PROCFSVNODE_FROM_SUBJECT: + mpc->mpc_ops.mpo_update_procfsvnode_from_subject = + mpe->mpe_function; + break; + case MAC_UPDATE_VNODE_FROM_EXTERNALIZED: + mpc->mpc_ops.mpo_update_vnode_from_externalized = + mpe->mpe_function; + break; + case MAC_UPDATE_VNODE_FROM_MOUNT: + mpc->mpc_ops.mpo_update_vnode_from_mount = + mpe->mpe_function; + break; case MAC_CREATE_MBUF_FROM_SOCKET: mpc->mpc_ops.mpo_create_mbuf_from_socket = mpe->mpe_function; @@ -343,21 +372,23 @@ mpe->mpe_function; break; case MAC_CREATE_BPFDESC: - mpc->mpc_ops.mpo_create_bpfdesc = mpe->mpe_function; + mpc->mpc_ops.mpo_create_bpfdesc = + mpe->mpe_function; break; - case MAC_CREATE_IFNET: - mpc->mpc_ops.mpo_create_ifnet = mpe->mpe_function; + case MAC_CREATE_DATAGRAM_FROM_IPQ: + mpc->mpc_ops.mpo_create_datagram_from_ipq = + mpe->mpe_function; break; - case MAC_CREATE_MBUF_DATAGRAM_FROM_MBUF_FRAGMENTQUEUE: - mpc->mpc_ops.mpo_create_mbuf_datagram_from_mbuf_fragmentqueue = + case MAC_CREATE_FRAGMENT_FROM_DATAGRAM: + mpc->mpc_ops.mpo_create_fragment_from_datagram = mpe->mpe_function; break; - case MAC_CREATE_MBUF_FRAGMENT_FROM_MBUF: - mpc->mpc_ops.mpo_create_mbuf_fragment_from_mbuf = + case MAC_CREATE_IFNET: + mpc->mpc_ops.mpo_create_ifnet = mpe->mpe_function; break; - case MAC_CREATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT: - mpc->mpc_ops.mpo_create_mbuf_fragmentqueue_from_mbuf_fragment = + case MAC_CREATE_IPQ_FROM_FRAGMENT: + mpc->mpc_ops.mpo_create_ipq_from_fragment = mpe->mpe_function; break; case MAC_CREATE_MBUF_FROM_MBUF: @@ -384,15 +415,15 @@ mpc->mpc_ops.mpo_create_mbuf_netlayer_from_mbuf = mpe->mpe_function; break; - case MAC_MBUF_FRAGMENT_MATCHES_MBUF_FRAGMENTQUEUE: - mpc->mpc_ops.mpo_mbuf_fragment_matches_mbuf_fragmentqueue = + case MAC_FRAGMENT_MATCHES_IPQ: + mpc->mpc_ops.mpo_fragment_matches_ipq = mpe->mpe_function; break; case MAC_RELABEL_IFNET: mpc->mpc_ops.mpo_relabel_ifnet = mpe->mpe_function; break; - case MAC_UPDATE_MBUF_FRAGMENTQUEUE_FROM_MBUF_FRAGMENT: - mpc->mpc_ops.mpo_update_mbuf_fragmentqueue_from_mbuf_fragment = + case MAC_UPDATE_IPQ_FROM_FRAGMENT: + mpc->mpc_ops.mpo_update_ipq_from_fragment = mpe->mpe_function; break; case MAC_CREATE_SUBJECT: @@ -450,10 +481,6 @@ mpc->mpc_ops.mpo_cred_check_debug_proc = mpe->mpe_function; break; - case MAC_CRED_CHECK_EXEC_FILE: - mpc->mpc_ops.mpo_cred_check_exec_file = - mpe->mpe_function; - break; case MAC_CRED_CHECK_CHDIR_VNODE: mpc->mpc_ops.mpo_cred_check_chdir_vnode = mpe->mpe_function; @@ -534,10 +561,100 @@ mpc->mpc_ops.mpo_socket_check_receive_mbuf = mpe->mpe_function; break; + case MAC_INIT_BPFDESC: + mpc->mpc_ops.mpo_init_bpfdesc = + mpe->mpe_function; + break; + case MAC_INIT_DEVFSDIRENT: + mpc->mpc_ops.mpo_init_devfsdirent = + mpe->mpe_function; + break; + case MAC_INIT_IFNET: + mpc->mpc_ops.mpo_init_ifnet = + mpe->mpe_function; + break; + case MAC_INIT_IPQ: + mpc->mpc_ops.mpo_init_ipq = + mpe->mpe_function; + break; + case MAC_INIT_MBUF: + mpc->mpc_ops.mpo_init_mbuf = + mpe->mpe_function; + break; + case MAC_INIT_MOUNT: + mpc->mpc_ops.mpo_init_mount = + mpe->mpe_function; + break; + case MAC_INIT_SOCKET: + mpc->mpc_ops.mpo_init_socket = + mpe->mpe_function; + break; + case MAC_INIT_SUBJECT: + mpc->mpc_ops.mpo_init_subject = + mpe->mpe_function; + break; + case MAC_INIT_TEMP: + mpc->mpc_ops.mpo_init_temp = + mpe->mpe_function; + break; + case MAC_INIT_VNODE: + mpc->mpc_ops.mpo_init_vnode = + mpe->mpe_function; + break; + case MAC_DESTROY_BPFDESC: + mpc->mpc_ops.mpo_destroy_bpfdesc = + mpe->mpe_function; + break; + case MAC_DESTROY_DEVFSDIRENT: + mpc->mpc_ops.mpo_destroy_devfsdirent = + mpe->mpe_function; + break; + case MAC_DESTROY_IFNET: + mpc->mpc_ops.mpo_destroy_ifnet = + mpe->mpe_function; + break; + case MAC_DESTROY_IPQ: + mpc->mpc_ops.mpo_destroy_ipq = + mpe->mpe_function; + break; + case MAC_DESTROY_MBUF: + mpc->mpc_ops.mpo_destroy_mbuf = + mpe->mpe_function; + break; + case MAC_DESTROY_MOUNT: + mpc->mpc_ops.mpo_destroy_mount = + mpe->mpe_function; + break; + case MAC_DESTROY_SOCKET: + mpc->mpc_ops.mpo_destroy_socket = + mpe->mpe_function; + break; + case MAC_DESTROY_SUBJECT: + mpc->mpc_ops.mpo_destroy_subject = + mpe->mpe_function; + break; + case MAC_DESTROY_TEMP: + mpc->mpc_ops.mpo_destroy_temp = + mpe->mpe_function; + break; + case MAC_DESTROY_VNODE: + mpc->mpc_ops.mpo_destroy_vnode = + mpe->mpe_function; + break; + case MAC_EXTERNALIZE: + mpc->mpc_ops.mpo_externalize = + mpe->mpe_function; + break; + case MAC_INTERNALIZE: >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 30 20: 7:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D05637B401; Thu, 30 May 2002 20:07:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8C9F237B400 for ; Thu, 30 May 2002 20:07:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4V37W702088 for perforce@freebsd.org; Thu, 30 May 2002 20:07:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 30 May 2002 20:07:32 -0700 (PDT) Message-Id: <200205310307.g4V37W702088@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12170 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12170 Change 12170 by rwatson@rwatson_curry on 2002/05/30 20:06:45 Remove various merge-o's. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#148 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#148 (text+ko) ==== @@ -102,8 +102,6 @@ static int mac_late = 0; -static int mac_late = 0; - static int mac_enforce_fs = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_fs, CTLFLAG_RW, &mac_enforce_fs, 0, "Enforce MAC policy on file system objects"); @@ -1446,23 +1444,6 @@ } int -mac_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, - int attrnamespace, const char *name, struct uio *uio) -{ - struct mac label; - int error; - - ASSERT_VOP_LOCKED(vp, "mac_cred_check_getextattr_vnode"); - - error = VOP_GETLABEL(vp, &label, cred, curthread); - if (error) - return (error); - MAC_CHECK(cred_check_getextattr_vnode, cred, vp, &label, attrnamespace, - name, uio); - return (error); -} - -int mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode) { int error; @@ -1525,23 +1506,6 @@ } int -mac_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, - int attrnamespace, const char *name, struct uio *uio) -{ - struct mac label; - int error; - - ASSERT_VOP_LOCKED(vp, "mac_cred_check_setextattr_vnode"); - - error = VOP_GETLABEL(vp, &label, cred, curthread); - if (error) - return (error); - MAC_CHECK(cred_check_setextattr_vnode, cred, vp, &label, attrnamespace, - name, uio); - return (error); -} - -int mac_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp, u_long flags) { @@ -1728,14 +1692,6 @@ newsocket, &newsocket->so_label); } -void -mac_create_socket_from_socket(struct socket *oldsocket, - struct socket *newsocket) -{ - - MAC_PERFORM(create_socket_from_socket, oldsocket, newsocket); -} - static void mac_relabel_socket(struct ucred *cred, struct socket *socket, struct label *newlabel) @@ -2237,8 +2193,6 @@ crfree(oldcred); mac_destroy_temp(&intlabel); - -out: mtx_unlock(&Giant); return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 30 20: 8:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9199A37B403; Thu, 30 May 2002 20:08:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 477EC37B401 for ; Thu, 30 May 2002 20:08:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4V38YC02144 for perforce@freebsd.org; Thu, 30 May 2002 20:08:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 30 May 2002 20:08:34 -0700 (PDT) Message-Id: <200205310308.g4V38YC02144@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12171 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12171 Change 12171 by rwatson@rwatson_curry on 2002/05/30 20:07:46 Remove merge-o. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#38 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#38 (text+ko) ==== @@ -419,7 +419,6 @@ SLOT(fslabel) = NULL; } -#if 0 static void mac_biba_destroy_socket(struct socket *socket, struct label *label, struct label *peerlabel) @@ -430,7 +429,6 @@ biba_free(SLOT(peerlabel)); SLOT(peerlabel) = NULL; } -#endif static void mac_biba_destroy_subject(struct ucred *ucred, struct label *label) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 30 20: 9:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCAA037B405; Thu, 30 May 2002 20:09:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E31DE37B400 for ; Thu, 30 May 2002 20:09:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4V39ZA02215 for perforce@freebsd.org; Thu, 30 May 2002 20:09:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 30 May 2002 20:09:35 -0700 (PDT) Message-Id: <200205310309.g4V39ZA02215@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12172 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12172 Change 12172 by rwatson@rwatson_curry on 2002/05/30 20:08:53 Correct merge-o. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#28 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#28 (text+ko) ==== @@ -345,14 +345,6 @@ } static void -mac_none_create_socket_from_socket(struct socket *oldsocket, - struct socket *newsocket) -{ - - /* Initialize socket here. */ -} - -static void mac_none_relabel_socket(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 30 22:57:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DC8837B404; Thu, 30 May 2002 22:57:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9D05437B401 for ; Thu, 30 May 2002 22:57:02 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4V5v2E25112 for perforce@freebsd.org; Thu, 30 May 2002 22:57:02 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Thu, 30 May 2002 22:57:02 -0700 (PDT) Message-Id: <200205310557.g4V5v2E25112@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12179 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12179 Change 12179 by julian@julian_ref on 2002/05/30 22:56:19 Use fuword and suword instead of copyin/copyout when setting up thread completion mailboxes. needs fptr and sptr, which I will add soon. Affected files ... ... //depot/projects/kse/sys/i386/i386/trap.c#43 edit ... //depot/projects/kse/sys/kern/kern_thread.c#50 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#43 (text+ko) ==== @@ -955,10 +955,10 @@ * possibility that we could do this lazily (in sleep()), * but for now do it every time. */ - error = copyin((caddr_t)td->td_kse->ke_mailbox + - offsetof(struct kse_mailbox, current_thread), - &td->td_mailbox, sizeof(void *)); - if (error || td->td_mailbox == NULL) { + td->td_mailbox = fuword((caddr_t)td->td_kse->ke_mailbox + + offsetof(struct kse_mailbox, current_thread)); + if ((td->td_mailbox == NULL) || + (td->td_mailbox == (viod *)-1)) { td->td_mailbox = NULL; /* single thread it.. */ td->td_flags &= ~TDF_UNBOUND; } else { ==== //depot/projects/kse/sys/kern/kern_thread.c#50 (text+ko) ==== @@ -251,7 +251,7 @@ thread_export_context(struct thread *td) { struct kse *ke; - void *td2_mbx; + uint td2_mbx; /* XXXKSE */ void *addr1; void *addr2; int error; @@ -266,11 +266,17 @@ + offsetof(struct thread_mailbox , next_completed); /* Then link it into it's KSE's list of completed threads. */ if (!error) - error = copyin( addr1, &td2_mbx, sizeof(void *)); + error = td2_mbx = fuword(addr1); + if (error == -1) + error = EFAULT; + else + error = 0; if (!error) - error = copyout(&td2_mbx, addr2, sizeof(void *)); + error = suword(addr2, td2_mbx); if (!error) - error = copyout(&td->td_mailbox, addr1, sizeof(void *)); + error = suword(addr1, (uint)td->td_mailbox); + if (error == -1) + error = EFAULT; return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 30 23: 1:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A87D037B406; Thu, 30 May 2002 23:01:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EDEE137B401 for ; Thu, 30 May 2002 23:01:07 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4V617J26052 for perforce@freebsd.org; Thu, 30 May 2002 23:01:07 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Thu, 30 May 2002 23:01:07 -0700 (PDT) Message-Id: <200205310601.g4V617J26052@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12180 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12180 Change 12180 by julian@julian_ref on 2002/05/30 23:00:46 spell void "void" and not "viod" Affected files ... ... //depot/projects/kse/sys/i386/i386/trap.c#44 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#44 (text+ko) ==== @@ -958,7 +958,7 @@ td->td_mailbox = fuword((caddr_t)td->td_kse->ke_mailbox + offsetof(struct kse_mailbox, current_thread)); if ((td->td_mailbox == NULL) || - (td->td_mailbox == (viod *)-1)) { + (td->td_mailbox == (void *)-1)) { td->td_mailbox = NULL; /* single thread it.. */ td->td_flags &= ~TDF_UNBOUND; } else { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 30 23: 7:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F27E537B40A; Thu, 30 May 2002 23:07:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2944F37B409 for ; Thu, 30 May 2002 23:07:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4V67FD30601 for perforce@freebsd.org; Thu, 30 May 2002 23:07:15 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Thu, 30 May 2002 23:07:15 -0700 (PDT) Message-Id: <200205310607.g4V67FD30601@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12182 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12182 Change 12182 by julian@julian_ref on 2002/05/30 23:06:44 use suword instead of copyout() in another place. Affected files ... ... //depot/projects/kse/sys/kern/subr_trap.c#58 edit Differences ... ==== //depot/projects/kse/sys/kern/subr_trap.c#58 (text+ko) ==== @@ -226,10 +226,8 @@ * We might as well do it here. */ td->td_flags &= ~TDF_UPCALLING; /* Hmmmm. */ - error = copyout(&dummy, /* NULL */ - (caddr_t)td->td_kse->ke_mailbox + - offsetof(struct kse_mailbox, current_thread), - sizeof(void *)); + error = suword((caddr_t)td->td_kse->ke_mailbox + + offsetof(struct kse_mailbox, current_thread), 0); } /* * Stop any chance that we may be separated from To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 30 23:13: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 327B437B423; Thu, 30 May 2002 23:12:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7523337B4E1 for ; Thu, 30 May 2002 23:10:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4V6AKK31160 for perforce@freebsd.org; Thu, 30 May 2002 23:10:20 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Thu, 30 May 2002 23:10:20 -0700 (PDT) Message-Id: <200205310610.g4V6AKK31160@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12183 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12183 Change 12183 by julian@julian_ref on 2002/05/30 23:09:42 fix real braino Affected files ... ... //depot/projects/kse/sys/kern/kern_intr.c#24 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_intr.c#24 (text+ko) ==== @@ -391,7 +391,7 @@ setrunqueue(td); if (do_switch && (curthread->td_critnest == 1) && - (curthread->td_proc->p_state == TDS_RUNNING)) { + (curthread->td_state == TDS_RUNNING)) { if (curthread != PCPU_GET(idlethread)) setrunqueue(curthread); curthread->td_proc->p_stats->p_ru.ru_nivcsw++; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 30 23:14:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CF5537B407; Thu, 30 May 2002 23:14:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 99EF937B407 for ; Thu, 30 May 2002 23:14:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4V6EP131613 for perforce@freebsd.org; Thu, 30 May 2002 23:14:25 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Thu, 30 May 2002 23:14:25 -0700 (PDT) Message-Id: <200205310614.g4V6EP131613@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12184 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12184 Change 12184 by julian@julian_ref on 2002/05/30 23:14:14 remove completely bogus comment. Add another.. Affected files ... ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#46 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#46 (text+ko) ==== @@ -310,16 +310,17 @@ cpu_save_upcall(struct thread *td, struct kse *newkse) { - /* Point the pcb to the top of the stack. */ newkse->ke_mdstorage = malloc(sizeof(struct md_store), M_TEMP, M_WAITOK); /* Note: use of M_WAITOK means it won't fail. */ + /* set up shortcuts in MI section */ newkse->ke_pcb = &(((struct md_store *)(newkse->ke_mdstorage))->mds_pcb); newkse->ke_frame = &(((struct md_store *)(newkse->ke_mdstorage))->mds_frame); /* Copy the upcall pcb. Kernel mode & fp regs are here. */ + /* XXXKSE this may be un-needed */ bcopy(td->td_pcb, newkse->ke_pcb, sizeof(struct pcb)); /* This copies most of the user mode register values. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu May 30 23:30:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0ACE537B433; Thu, 30 May 2002 23:29:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5DAEB37B41D for ; Thu, 30 May 2002 23:29:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4V6TiO32911 for perforce@freebsd.org; Thu, 30 May 2002 23:29:44 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Thu, 30 May 2002 23:29:44 -0700 (PDT) Message-Id: <200205310629.g4V6TiO32911@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12185 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12185 Change 12185 by julian@julian_ref on 2002/05/30 23:29:36 compiles now, but would be better if there was a fpointer() and fpointer() (like suword() etc.) Affected files ... ... //depot/projects/kse/sys/i386/i386/trap.c#45 edit ... //depot/projects/kse/sys/kern/kern_thread.c#51 edit ... //depot/projects/kse/sys/kern/subr_trap.c#59 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#45 (text+ko) ==== @@ -955,8 +955,8 @@ * possibility that we could do this lazily (in sleep()), * but for now do it every time. */ - td->td_mailbox = fuword((caddr_t)td->td_kse->ke_mailbox + - offsetof(struct kse_mailbox, current_thread)); + td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox + + offsetof(struct kse_mailbox, current_thread)); if ((td->td_mailbox == NULL) || (td->td_mailbox == (void *)-1)) { td->td_mailbox = NULL; /* single thread it.. */ ==== //depot/projects/kse/sys/kern/kern_thread.c#51 (text+ko) ==== @@ -265,12 +265,13 @@ addr2 = (caddr_t)td->td_mailbox + offsetof(struct thread_mailbox , next_completed); /* Then link it into it's KSE's list of completed threads. */ - if (!error) + if (!error) { error = td2_mbx = fuword(addr1); if (error == -1) error = EFAULT; else error = 0; + } if (!error) error = suword(addr2, td2_mbx); if (!error) ==== //depot/projects/kse/sys/kern/subr_trap.c#59 (text+ko) ==== @@ -199,7 +199,6 @@ * This is NOT just an 'else' clause for the above test... */ if (td->td_flags & TDF_UPCALLING) { - void *dummy = NULL; CTR3(KTR_PROC, "userret: upcall thread %p (pid %d, %s)", td, p->p_pid, p->p_comm); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 6:41:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E11E37B403; Fri, 31 May 2002 06:41:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A4CFA37B403 for ; Fri, 31 May 2002 06:41:51 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4VDfpM19055 for perforce@freebsd.org; Fri, 31 May 2002 06:41:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 31 May 2002 06:41:51 -0700 (PDT) Message-Id: <200205311341.g4VDfpM19055@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12195 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12195 Change 12195 by rwatson@rwatson_curry on 2002/05/31 06:40:52 Merge-o: resource freeing block got duplicated since it was present in both branches, and p4 "did the right thing" :-) Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#21 (text+ko) ==== @@ -516,25 +516,6 @@ vrele(tracevp); pargs_drop(oldargs); - /* - * Free any resources malloc'd earlier that we didn't use. - */ - if (newcred == NULL) - crfree(oldcred); - else - crfree(newcred); - KASSERT(newargs == NULL, ("leaking p_args")); - /* - * Handle deferred decrement of ref counts. - */ - if (textvp != NULL) - vrele(textvp); - if (textdvp != NULL) - vrele(textdvp); - if (tracevp != NULL) - vrele(tracevp); - pargs_drop(oldargs); - exec_fail_dealloc: /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 6:48:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44C5937B400; Fri, 31 May 2002 06:48:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4E64637B40D for ; Fri, 31 May 2002 06:48:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4VDm0e19531 for perforce@freebsd.org; Fri, 31 May 2002 06:48:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 31 May 2002 06:48:00 -0700 (PDT) Message-Id: <200205311348.g4VDm0e19531@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12197 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12197 Change 12197 by rwatson@rwatson_curry on 2002/05/31 06:47:16 Missing unlock of Giant if internalize fails (which it doesn't) Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#149 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#149 (text+ko) ==== @@ -2171,6 +2171,7 @@ error = mac_internalize(&intlabel, &extmac); if (error) { crfree(newcred); + mtx_unlock(&Giant); return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 6:49: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C314337B401; Fri, 31 May 2002 06:49:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id DB23E37B400 for ; Fri, 31 May 2002 06:49:01 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4VDn1C19659 for perforce@freebsd.org; Fri, 31 May 2002 06:49:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 31 May 2002 06:49:01 -0700 (PDT) Message-Id: <200205311349.g4VDn1C19659@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12198 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12198 Change 12198 by rwatson@rwatson_curry on 2002/05/31 06:48:28 Missed in merge from green_mac. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#8 (text+ko) ==== @@ -69,7 +69,8 @@ * been mounted; policy is located on root partition. */ static void -sebsd_create_root_mount(struct ucred *cred, struct mount *mp) +sebsd_create_root_mount(struct ucred *cred, struct mount *mp, + struct mount *mntlabel, struct mount *fslabel) { if (security_init()) { panic("SEBSD: couldn't read policy file"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 9:43:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE18237B403; Fri, 31 May 2002 09:43:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8572D37B406 for ; Fri, 31 May 2002 09:43:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4VGhXu48813 for perforce@freebsd.org; Fri, 31 May 2002 09:43:33 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 31 May 2002 09:43:33 -0700 (PDT) Message-Id: <200205311643.g4VGhXu48813@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12202 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12202 Change 12202 by julian@julian_ref on 2002/05/31 09:43:28 fix braino Affected files ... ... //depot/projects/kse/sys/kern/kern_proc.c#63 edit ... //depot/projects/kse/sys/sys/proc.h#104 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_proc.c#63 (text+ko) ==== @@ -717,9 +717,10 @@ } td = FIRST_THREAD_IN_PROC(p); if (!(p->p_flag & P_KSES)) { - if (td->td_wmesg != NULL) + if (td->td_wmesg != NULL) { strncpy(kp->ki_wmesg, td->td_wmesg, sizeof(kp->ki_wmesg) - 1); + } if (td->td_state == TDS_MTX) { kp->ki_kiflag |= KI_MTXBLOCK; strncpy(kp->ki_mtxname, td->td_mtxname, @@ -728,10 +729,10 @@ } if (p->p_state == PRS_NORMAL) { /* XXXKSE very aproximate */ - if ((td->td_state == TDS_RUN) || + if ((td->td_state == TDS_RUNQ) || (td->td_state == TDS_RUNNING)) { kp->ki_stat = SRUN; - } else if (td->td_state == TDS_SLEEP) { + } else if (td->td_state == TDS_SLP) { kp->ki_stat = SSLEEP; } else if (P_SHOULDSTOP(p)) { kp->ki_stat = SSTOP; @@ -740,7 +741,7 @@ } else { kp->ki_stat = SWAIT; } - } else (p->p_state == PRS_ZOMBIE) { + } else if (p->p_state == PRS_ZOMBIE) { kp->ki_stat = SZOMB; } else { kp->ki_stat = SIDL; ==== //depot/projects/kse/sys/sys/proc.h#104 (text+ko) ==== @@ -557,7 +557,7 @@ #define PS_SWAPPING 0x00200 /* Process is being swapped. */ #define PS_NEEDSIGCHK 0x02000 /* Process may need signal delivery. */ -#ifndef _KERNEL /* Only usable by libkvm for legacy apps */ +/* used only in legacy conversion code */ #define SIDL 1 /* Process being created by fork. */ #define SRUN 2 /* Currently runnable. */ #define SSLEEP 3 /* Sleeping on an address. */ @@ -565,7 +565,6 @@ #define SZOMB 5 /* Awaiting collection by parent. */ #define SWAIT 6 /* Waiting for interrupt. */ #define SMTX 7 /* Blocked on a mutex. */ -#endif #define P_MAGIC 0xbeefface To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 9:50:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29D5C37B401; Fri, 31 May 2002 09:50:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from k6.locore.ca (k6.locore.ca [198.96.117.170]) by hub.freebsd.org (Postfix) with ESMTP id AC14B37B407; Fri, 31 May 2002 09:50:48 -0700 (PDT) Received: (from jake@localhost) by k6.locore.ca (8.11.6/8.11.6) id g4VH6uh42649; Fri, 31 May 2002 13:06:57 -0400 (EDT) (envelope-from jake) Date: Fri, 31 May 2002 13:06:56 -0400 From: Jake Burkholder To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 12179 for review Message-ID: <20020531130656.T62759@locore.ca> References: <200205310557.g4V5v2E25112@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200205310557.g4V5v2E25112@freefall.freebsd.org>; from julian@freebsd.org on Thu, May 30, 2002 at 10:57:02PM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Apparently, On Thu, May 30, 2002 at 10:57:02PM -0700, Julian Elischer said words to the effect of; > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12179 > > Change 12179 by julian@julian_ref on 2002/05/30 22:56:19 > > Use fuword and suword instead of copyin/copyout > when setting up thread completion mailboxes. > needs fptr and sptr, which I will add soon. Please do not add these without discussing it first. fuword and suword take a long as their argument/return value, which works fine. > > Affected files ... > > ... //depot/projects/kse/sys/i386/i386/trap.c#43 edit > ... //depot/projects/kse/sys/kern/kern_thread.c#50 edit > > Differences ... > > ==== //depot/projects/kse/sys/i386/i386/trap.c#43 (text+ko) ==== > > @@ -955,10 +955,10 @@ > * possibility that we could do this lazily (in sleep()), > * but for now do it every time. > */ > - error = copyin((caddr_t)td->td_kse->ke_mailbox + > - offsetof(struct kse_mailbox, current_thread), > - &td->td_mailbox, sizeof(void *)); > - if (error || td->td_mailbox == NULL) { > + td->td_mailbox = fuword((caddr_t)td->td_kse->ke_mailbox + > + offsetof(struct kse_mailbox, current_thread)); > + if ((td->td_mailbox == NULL) || > + (td->td_mailbox == (viod *)-1)) { > td->td_mailbox = NULL; /* single thread it.. */ > td->td_flags &= ~TDF_UNBOUND; > } else { > > ==== //depot/projects/kse/sys/kern/kern_thread.c#50 (text+ko) ==== > > @@ -251,7 +251,7 @@ > thread_export_context(struct thread *td) > { > struct kse *ke; > - void *td2_mbx; > + uint td2_mbx; /* XXXKSE */ sigh. sizeof(uint) != sizeof(void *). Use uintptr_t. > void *addr1; > void *addr2; > int error; > @@ -266,11 +266,17 @@ > + offsetof(struct thread_mailbox , next_completed); > /* Then link it into it's KSE's list of completed threads. */ > if (!error) > - error = copyin( addr1, &td2_mbx, sizeof(void *)); > + error = td2_mbx = fuword(addr1); > + if (error == -1) > + error = EFAULT; > + else > + error = 0; > if (!error) > - error = copyout(&td2_mbx, addr2, sizeof(void *)); > + error = suword(addr2, td2_mbx); > if (!error) > - error = copyout(&td->td_mailbox, addr1, sizeof(void *)); > + error = suword(addr1, (uint)td->td_mailbox); > + if (error == -1) > + error = EFAULT; > return (error); > } > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 10: 7: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EDA737B404; Fri, 31 May 2002 10:07:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6CFEA37B403 for ; Fri, 31 May 2002 10:07:02 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4VH72155195 for perforce@freebsd.org; Fri, 31 May 2002 10:07:02 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 31 May 2002 10:07:02 -0700 (PDT) Message-Id: <200205311707.g4VH72155195@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12203 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12203 Change 12203 by julian@julian_ref on 2002/05/31 10:06:56 fix the userland as well (copy-and-paste error) Affected files ... ... //depot/projects/kse/lib/libkvm/kvm_proc.c#15 edit Differences ... ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#15 (text+ko) ==== @@ -330,10 +330,10 @@ kp->ki_wchan = mainthread.td_wchan; /* XXXKSE */ kp->ki_traceflag = proc.p_traceflag; if (proc.p_state == PRS_NORMAL) { /* XXXKSE very aproximate */ - if ((mainthread.td_state == TDS_RUN) || + if ((mainthread.td_state == TDS_RUNQ) || (mainthread.td_state == TDS_RUNNING)) { kp->ki_stat = SRUN; - } else if (mainthread.td_state == TDS_SLEEP) { + } else if (mainthread.td_state == TDS_SLP) { kp->ki_stat = SSLEEP; } else if (P_SHOULDSTOP(&proc)) { kp->ki_stat = SSTOP; @@ -342,7 +342,7 @@ } else { kp->ki_stat = SWAIT; } - } else (proc.p_state == PRS_ZOMBIE) { + } else if (proc.p_state == PRS_ZOMBIE) { kp->ki_stat = SZOMB; } else { kp->ki_stat = SIDL; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 10:23:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46E2637B40B; Fri, 31 May 2002 10:23:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7390037B407 for ; Fri, 31 May 2002 10:23:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4VHNMR56902 for perforce@freebsd.org; Fri, 31 May 2002 10:23:22 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 31 May 2002 10:23:22 -0700 (PDT) Message-Id: <200205311723.g4VHNMR56902@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12204 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12204 Change 12204 by julian@julian_ref on 2002/05/31 10:22:47 Change type of a pointer variable Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#52 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#52 (text+ko) ==== @@ -251,7 +251,7 @@ thread_export_context(struct thread *td) { struct kse *ke; - uint td2_mbx; /* XXXKSE */ + uintptr_t td2_mbx; void *addr1; void *addr2; int error; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 10:40:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4EF537B400; Fri, 31 May 2002 10:40:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc54.attbi.com (rwcrmhc54.attbi.com [216.148.227.87]) by hub.freebsd.org (Postfix) with ESMTP id 45B5337B405; Fri, 31 May 2002 10:40:11 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc54.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020531174010.RRHU13253.rwcrmhc54.attbi.com@InterJet.elischer.org>; Fri, 31 May 2002 17:40:10 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id KAA29025; Fri, 31 May 2002 10:23:20 -0700 (PDT) Date: Fri, 31 May 2002 10:23:19 -0700 (PDT) From: Julian Elischer To: Jake Burkholder Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 12179 for review In-Reply-To: <20020531130656.T62759@locore.ca> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 31 May 2002, Jake Burkholder wrote: > Apparently, On Thu, May 30, 2002 at 10:57:02PM -0700, > Julian Elischer said words to the effect of; > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12179 > > > > Change 12179 by julian@julian_ref on 2002/05/30 22:56:19 > > > > Use fuword and suword instead of copyin/copyout > > when setting up thread completion mailboxes. > > needs fptr and sptr, which I will add soon. > > Please do not add these without discussing it first. fuword and > suword take a long as their argument/return value, which works > fine. except that you have to cast the results.. It'd be nice if there was one guaranteed to return a (void *) preferably at a second argument so that a success value can be given as well. (I decided not to add it myself unilaterally but rather to lobby for it amongst types such as yourself..) There is no guarantee that on every imaginable architecture that the same long<->pointer conversion is correct, and anyhow the casting is wrong.. it wouldn't take much to make a retval = fptr(addr, &target) call. > > > > > Affected files ... > > > > ... //depot/projects/kse/sys/i386/i386/trap.c#43 edit > > ... //depot/projects/kse/sys/kern/kern_thread.c#50 edit > > > > Differences ... > > > > ==== //depot/projects/kse/sys/i386/i386/trap.c#43 (text+ko) ==== > > > > @@ -955,10 +955,10 @@ > > * possibility that we could do this lazily (in sleep()), > > * but for now do it every time. > > */ > > - error = copyin((caddr_t)td->td_kse->ke_mailbox + > > - offsetof(struct kse_mailbox, current_thread), > > - &td->td_mailbox, sizeof(void *)); > > - if (error || td->td_mailbox == NULL) { > > + td->td_mailbox = fuword((caddr_t)td->td_kse->ke_mailbox + > > + offsetof(struct kse_mailbox, current_thread)); > > + if ((td->td_mailbox == NULL) || > > + (td->td_mailbox == (viod *)-1)) { > > td->td_mailbox = NULL; /* single thread it.. */ > > td->td_flags &= ~TDF_UNBOUND; > > } else { > > > > ==== //depot/projects/kse/sys/kern/kern_thread.c#50 (text+ko) ==== > > > > @@ -251,7 +251,7 @@ > > thread_export_context(struct thread *td) > > { > > struct kse *ke; > > - void *td2_mbx; > > + uint td2_mbx; /* XXXKSE */ > > sigh. sizeof(uint) != sizeof(void *). Use uintptr_t. That's one reason the XXXKSE is there.. I wasn't sure what to use... I'll fix it now.. > > > void *addr1; > > void *addr2; > > int error; > > @@ -266,11 +266,17 @@ > > + offsetof(struct thread_mailbox , next_completed); > > /* Then link it into it's KSE's list of completed threads. */ > > if (!error) > > - error = copyin( addr1, &td2_mbx, sizeof(void *)); > > + error = td2_mbx = fuword(addr1); > > + if (error == -1) > > + error = EFAULT; > > + else > > + error = 0; > > if (!error) > > - error = copyout(&td2_mbx, addr2, sizeof(void *)); > > + error = suword(addr2, td2_mbx); > > if (!error) > > - error = copyout(&td->td_mailbox, addr1, sizeof(void *)); > > + error = suword(addr1, (uint)td->td_mailbox); > > + if (error == -1) > > + error = EFAULT; > > return (error); > > } > > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 10:48: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95AB837B406; Fri, 31 May 2002 10:47:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from srv1.cosmo-project.de (srv1.cosmo-project.de [213.83.6.106]) by hub.freebsd.org (Postfix) with ESMTP id 5742037B409; Fri, 31 May 2002 10:47:52 -0700 (PDT) Received: from cicely5.cicely.de (cicely5.cicely.de [IPv6:3ffe:400:8d0:301:200:92ff:fe9b:20e7]) (authenticated bits=0) by srv1.cosmo-project.de (8.12.3/8.12.3) with ESMTP id g4VHliHc056261 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=OK); Fri, 31 May 2002 19:47:45 +0200 (CEST) (envelope-from ticso@cicely5.cicely.de) Received: from cicely5.cicely.de (localhost [IPv6:::1]) by cicely5.cicely.de (8.12.1/8.12.1) with ESMTP id g4VHlnSA016456 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Fri, 31 May 2002 19:47:49 +0200 (CEST)?g (envelope-from ticso@cicely5.cicely.de) Received: (from ticso@localhost) by cicely5.cicely.de (8.12.1/8.12.1/Submit) id g4VHln6U016455; Fri, 31 May 2002 19:47:49 +0200 (CEST)?g (envelope-from ticso) Date: Fri, 31 May 2002 19:47:49 +0200 From: Bernd Walter To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 12204 for review Message-ID: <20020531174748.GA16281@cicely5.cicely.de> Reply-To: ticso@cicely.de References: <200205311723.g4VHNMR56902@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200205311723.g4VHNMR56902@freefall.freebsd.org> User-Agent: Mutt/1.3.26i X-Operating-System: FreeBSD cicely5.cicely.de 5.0-CURRENT i386 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, May 31, 2002 at 10:23:22AM -0700, Julian Elischer wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12204 > > Change 12204 by julian@julian_ref on 2002/05/31 10:22:47 > > Change type of a pointer variable > > Affected files ... > > ... //depot/projects/kse/sys/kern/kern_thread.c#52 edit > > Differences ... > > ==== //depot/projects/kse/sys/kern/kern_thread.c#52 (text+ko) ==== > > @@ -251,7 +251,7 @@ > thread_export_context(struct thread *td) > { > struct kse *ke; > - uint td2_mbx; /* XXXKSE */ > + uintptr_t td2_mbx; > void *addr1; > void *addr2; > int error; Don't forget the (uint) cast later in the same function. -- B.Walter COSMO-Project http://www.cosmo-project.de ticso@cicely.de Usergroup info@cosmo-project.de To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 11: 1:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E3D837B40A; Fri, 31 May 2002 11:00:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39]) by hub.freebsd.org (Postfix) with ESMTP id 0960137B411; Fri, 31 May 2002 11:00:27 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc53.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020531180026.PKGC11659.rwcrmhc53.attbi.com@InterJet.elischer.org>; Fri, 31 May 2002 18:00:26 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id KAA29135; Fri, 31 May 2002 10:54:14 -0700 (PDT) Date: Fri, 31 May 2002 10:54:14 -0700 (PDT) From: Julian Elischer To: ticso@cicely.de Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 12204 for review In-Reply-To: <20020531174748.GA16281@cicely5.cicely.de> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG no that cast is to unsigned int as that is what suword() takes as an argument.. I would rather have a sptr() and fptr() set that is guaranteed to be correct. comments from others? On Fri, 31 May 2002, Bernd Walter wrote: > On Fri, May 31, 2002 at 10:23:22AM -0700, Julian Elischer wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12204 > > > > Change 12204 by julian@julian_ref on 2002/05/31 10:22:47 > > > > Change type of a pointer variable > > > > Affected files ... > > > > ... //depot/projects/kse/sys/kern/kern_thread.c#52 edit > > > > Differences ... > > > > ==== //depot/projects/kse/sys/kern/kern_thread.c#52 (text+ko) ==== > > > > @@ -251,7 +251,7 @@ > > thread_export_context(struct thread *td) > > { > > struct kse *ke; > > - uint td2_mbx; /* XXXKSE */ > > + uintptr_t td2_mbx; > > void *addr1; > > void *addr2; > > int error; > > Don't forget the (uint) cast later in the same function. > > -- > B.Walter COSMO-Project http://www.cosmo-project.de > ticso@cicely.de Usergroup info@cosmo-project.de > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 11: 4:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38F9637B409; Fri, 31 May 2002 11:04:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6C4F837B407 for ; Fri, 31 May 2002 11:04:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4VI4MV61411 for perforce@freebsd.org; Fri, 31 May 2002 11:04:22 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Fri, 31 May 2002 11:04:22 -0700 (PDT) Message-Id: <200205311804.g4VI4MV61411@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12211 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12211 Change 12211 by jhb@jhb_laptop on 2002/05/31 11:04:11 Reinstate this diff now that ppc trap is FreeBSD-ish again. (Thanks Benno!) Affected files ... ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#20 edit Differences ... ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#20 (text+ko) ==== @@ -269,9 +269,9 @@ userret(td, frame, sticks); mtx_assert(&Giant, MA_NOTOWNED); -#ifdef DIAGNOSTIC +#ifdef INARIANTS cred_free_thread(td); -#endif /* DIAGNOSTIC */ +#endif /* INVARIANTS */ } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 11: 7:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0D1D37B400; Fri, 31 May 2002 11:07:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from srv1.cosmo-project.de (srv1.cosmo-project.de [213.83.6.106]) by hub.freebsd.org (Postfix) with ESMTP id 85CB937B410; Fri, 31 May 2002 11:07:18 -0700 (PDT) Received: from cicely5.cicely.de (cicely5.cicely.de [IPv6:3ffe:400:8d0:301:200:92ff:fe9b:20e7]) (authenticated bits=0) by srv1.cosmo-project.de (8.12.3/8.12.3) with ESMTP id g4VI7CHc056484 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=OK); Fri, 31 May 2002 20:07:13 +0200 (CEST) (envelope-from ticso@cicely5.cicely.de) Received: from cicely5.cicely.de (localhost [IPv6:::1]) by cicely5.cicely.de (8.12.1/8.12.1) with ESMTP id g4VI7GSA016609 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Fri, 31 May 2002 20:07:17 +0200 (CEST)?g (envelope-from ticso@cicely5.cicely.de) Received: (from ticso@localhost) by cicely5.cicely.de (8.12.1/8.12.1/Submit) id g4VI7Gqe016608; Fri, 31 May 2002 20:07:16 +0200 (CEST)?g (envelope-from ticso) Date: Fri, 31 May 2002 20:07:16 +0200 From: Bernd Walter To: Julian Elischer Cc: ticso@cicely.de, Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 12204 for review Message-ID: <20020531180715.GB16281@cicely5.cicely.de> Reply-To: ticso@cicely.de References: <20020531174748.GA16281@cicely5.cicely.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.26i X-Operating-System: FreeBSD cicely5.cicely.de 5.0-CURRENT i386 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, May 31, 2002 at 10:54:14AM -0700, Julian Elischer wrote: > no that cast is to unsigned int as that is what suword() takes > as an argument.. It takes an unsigned long and will spite a compile time warning on alpha because of casting the 64 bit pointer td->td_mailbox into a 32 bit value. > I would rather have a sptr() and fptr() set that is guaranteed to be > correct. > > comments from others? > > > On Fri, 31 May 2002, Bernd Walter wrote: > > > On Fri, May 31, 2002 at 10:23:22AM -0700, Julian Elischer wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12204 > > > > > > Change 12204 by julian@julian_ref on 2002/05/31 10:22:47 > > > > > > Change type of a pointer variable > > > > > > Affected files ... > > > > > > ... //depot/projects/kse/sys/kern/kern_thread.c#52 edit > > > > > > Differences ... > > > > > > ==== //depot/projects/kse/sys/kern/kern_thread.c#52 (text+ko) ==== > > > > > > @@ -251,7 +251,7 @@ > > > thread_export_context(struct thread *td) > > > { > > > struct kse *ke; > > > - uint td2_mbx; /* XXXKSE */ > > > + uintptr_t td2_mbx; > > > void *addr1; > > > void *addr2; > > > int error; > > > > Don't forget the (uint) cast later in the same function. -- B.Walter COSMO-Project http://www.cosmo-project.de ticso@cicely.de Usergroup info@cosmo-project.de To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 11: 8:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC81937B414; Fri, 31 May 2002 11:08:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from tesla.distributel.net (nat.MTL.distributel.NET [66.38.181.24]) by hub.freebsd.org (Postfix) with ESMTP id 6F68737B427; Fri, 31 May 2002 11:07:48 -0700 (PDT) Received: (from bmilekic@localhost) by tesla.distributel.net (8.11.6/8.11.6) id g4VI71p70923; Fri, 31 May 2002 14:07:01 -0400 (EDT) (envelope-from bmilekic@unixdaemons.com) Date: Fri, 31 May 2002 14:07:01 -0400 From: Bosko Milekic To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 12211 for review Message-ID: <20020531140701.A70905@unixdaemons.com> References: <200205311804.g4VI4MV61411@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <200205311804.g4VI4MV61411@freefall.freebsd.org>; from jhb@freebsd.org on Fri, May 31, 2002 at 11:04:22AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, May 31, 2002 at 11:04:22AM -0700, John Baldwin wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12211 > > Change 12211 by jhb@jhb_laptop on 2002/05/31 11:04:11 > > Reinstate this diff now that ppc trap is FreeBSD-ish again. > (Thanks Benno!) > > Affected files ... > > ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#20 edit > > Differences ... > > ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#20 (text+ko) ==== > > @@ -269,9 +269,9 @@ > > userret(td, frame, sticks); > mtx_assert(&Giant, MA_NOTOWNED); > -#ifdef DIAGNOSTIC > +#ifdef INARIANTS Typo. :-) > cred_free_thread(td); > -#endif /* DIAGNOSTIC */ > +#endif /* INVARIANTS */ > } > > static void > -- Bosko Milekic bmilekic@unixdaemons.com bmilekic@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 11:13:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67FE637B409; Fri, 31 May 2002 11:13:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E7CF537B405 for ; Fri, 31 May 2002 11:13:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4VIDYV66327 for perforce@freebsd.org; Fri, 31 May 2002 11:13:34 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Fri, 31 May 2002 11:13:34 -0700 (PDT) Message-Id: <200205311813.g4VIDYV66327@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12213 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12213 Change 12213 by jhb@jhb_laptop on 2002/05/31 11:13:06 I can't type. Affected files ... ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#21 edit Differences ... ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#21 (text+ko) ==== @@ -269,7 +269,7 @@ userret(td, frame, sticks); mtx_assert(&Giant, MA_NOTOWNED); -#ifdef INARIANTS +#ifdef INVARIANTS cred_free_thread(td); #endif /* INVARIANTS */ } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 11:41:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F257737B400; Fri, 31 May 2002 11:41:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D8ED437B403 for ; Fri, 31 May 2002 11:41:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4VIf8b69580 for perforce@freebsd.org; Fri, 31 May 2002 11:41:08 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 31 May 2002 11:41:08 -0700 (PDT) Message-Id: <200205311841.g4VIf8b69580@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12215 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12215 Change 12215 by julian@julian_ref on 2002/05/31 11:40:39 change uint to u_long for compatibility reasons Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#53 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#53 (text+ko) ==== @@ -275,7 +275,7 @@ if (!error) error = suword(addr2, td2_mbx); if (!error) - error = suword(addr1, (uint)td->td_mailbox); + error = suword(addr1, (u_long)td->td_mailbox); if (error == -1) error = EFAULT; return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 11:46:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB65837B406; Fri, 31 May 2002 11:46:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C758537B401 for ; Fri, 31 May 2002 11:46:15 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4VIkFF70049 for perforce@freebsd.org; Fri, 31 May 2002 11:46:15 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 31 May 2002 11:46:15 -0700 (PDT) Message-Id: <200205311846.g4VIkFF70049@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12217 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12217 Change 12217 by julian@julian_ref on 2002/05/31 11:45:55 these prototypes are for userland and in fact should be deleted as soon as I check they are ok in userland Affected files ... ... //depot/projects/kse/sys/sys/kse.h#8 edit Differences ... ==== //depot/projects/kse/sys/sys/kse.h#8 (text+ko) ==== @@ -73,8 +73,10 @@ /* some provisional sycalls: */ +#ifndef _KERNEL int kse_new(struct kse_mailbox *mbx, int new_grp_flag); int kse_exit(void); int thread_wakeup(struct thread_mailbox *tmbx); int kse_wakeup(void); #endif +#endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 13:29:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E64DD37B408; Fri, 31 May 2002 13:29:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2AB8B37B407 for ; Fri, 31 May 2002 13:29:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4VKTOZ88153 for perforce@freebsd.org; Fri, 31 May 2002 13:29:24 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Fri, 31 May 2002 13:29:24 -0700 (PDT) Message-Id: <200205312029.g4VKTOZ88153@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 12221 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12221 Change 12221 by marcel@marcel_vaio on 2002/05/31 13:28:31 Make libstdc++ buildable on ia64: o IFC (1.32) o Add CFLAGS+=-I${GCCDIR}/config/${MACHINE_ARCH} so that we can find ia64intrin.h, which is included by atomicity.h. Affected files ... ... //depot/projects/ia64/gnu/lib/libstdc++/Makefile#5 edit Differences ... ==== //depot/projects/ia64/gnu/lib/libstdc++/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.30 2002/05/29 00:45:51 peter Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.32 2002/05/30 17:23:26 obrien Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ @@ -6,7 +6,7 @@ .PATH: ${SRCDIR}/src ${SRCDIR}/libmath ${SRCDIR}/config/io \ ${SRCDIR}/config/locale/generic ${SRCDIR} ${SRCDIR}/std \ - ${SUPDIR} + ${SUPDIR} ${GCCDIR} SUBDIR= doc @@ -16,6 +16,7 @@ CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} +CFLAGS+= -I${GCCDIR}/config/${MACHINE_ARCH} CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections -Wno-deprecated #LDFLAGS+= -Wl,-version-info,4:0:0 -Wl,--version-script=${SRCDIR}/src/linker.map @@ -42,7 +43,7 @@ pure.cc tinfo.cc tinfo2.cc vec.cc # from libiberty: -SRCS+= ${GCCDIR}/cp-demangle.c ${GCCDIR}/dyn-string.c +SRCS+= cp-demangle.c dyn-string.c strstream-fixed.cc: ${SRCDIR}/src/strstream.cc sed -e 's,^#include ,#include ,g' \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 15: 8:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89F3337B406; Fri, 31 May 2002 15:08:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AF4B437B404 for ; Fri, 31 May 2002 15:08:26 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g4VM8Q506888 for perforce@freebsd.org; Fri, 31 May 2002 15:08:26 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 31 May 2002 15:08:26 -0700 (PDT) Message-Id: <200205312208.g4VM8Q506888@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12226 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12226 Change 12226 by julian@julian_ref on 2002/05/31 15:07:26 Alpha additions (incomplete) coutesy of Bernd Walter Affected files ... ... //depot/projects/kse/sys/alpha/alpha/genassym.c#15 edit ... //depot/projects/kse/sys/alpha/alpha/swtch.s#11 edit ... //depot/projects/kse/sys/alpha/alpha/trap.c#23 edit ... //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#22 edit ... //depot/projects/kse/sys/alpha/include/kse.h#1 add ... //depot/projects/kse/sys/i386/include/kse.h#4 edit ... //depot/projects/kse/sys/kern/kern_thread.c#54 edit Differences ... ==== //depot/projects/kse/sys/alpha/alpha/genassym.c#15 (text+ko) ==== @@ -80,6 +80,8 @@ ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_KSE, offsetof(struct thread, td_kse)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); +ASSYM(TD_STATE, offsetof(struct thread, td_state)); +ASSYM(TDS_RUNNING, TDS_RUNNING); ASSYM(KE_FLAGS, offsetof(struct kse, ke_flags)); ==== //depot/projects/kse/sys/alpha/alpha/swtch.s#11 (text+ko) ==== @@ -127,6 +127,9 @@ mov v0, s2 /* s2 = new thread */ ldq s3, TD_MD_PCBPADDR(s2) /* s3 = new pcbpaddr */ + ldiq t0, TDS_RUNNING + stl t0, TD_STATE(s2) + /* * Check to see if we're switching to ourself. If we are, * don't bother loading the new context. ==== //depot/projects/kse/sys/alpha/alpha/trap.c#23 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -299,6 +300,10 @@ td->td_frame = framep; if (td->td_ucred != p->p_ucred) cred_update_thread(td); + if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + thread_exit(); + /* NOTREACHED */ + } } else { sticks = 0; /* XXX bogus -Wuninitialized warning */ KASSERT(cold || td->td_ucred != NULL, @@ -659,6 +664,23 @@ sticks = td->td_kse->ke_sticks; if (td->td_ucred != p->p_ucred) cred_update_thread(td); + if (p->p_flag & P_KSES) { + /* + * If we are doing a syscall in a KSE environment, + * note where our mailbox is. There is always the + * possibility that we could do this lazily (in sleep()), + * but for now do it every time. + */ + td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox + + offsetof(struct kse_mailbox, current_thread)); + if ((td->td_mailbox == NULL) || + (td->td_mailbox == (void *)-1)) { + td->td_mailbox = NULL; /* single thread it.. */ + td->td_flags &= ~TDF_UNBOUND; + } else { + td->td_flags |= TDF_UNBOUND; + } + } #ifdef DIAGNOSTIC alpha_fpstate_check(td); ==== //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#22 (text+ko) ==== @@ -240,11 +240,63 @@ * from proc0. */ void -cpu_exit(td) - register struct thread *td; +cpu_exit(struct thread *td) +{ + /* KSEXXX */ + alpha_fpstate_drop(td); +} + +void +cpu_thread_exit(struct thread *td) +{ + /* KSEXXX */ +} + +void +cpu_thread_setup(struct thread *td) +{ + /* KSEXXX */ +} + +/* KSEXXX */ +struct md_store { + struct pcb mds_pcb; + struct trapframe mds_frame; +}; + +void +cpu_save_upcall(struct thread *td, struct kse *newkse) +{ + /* KSEXXX */ +} + +void +cpu_set_upcall(struct thread *td, void *pcb) +{ + /* KSEXXX */ +} + +/* + * Set the return value for returning upcalls. + * We should be able to do this ahead of time in cpu_save_upcall(). + * doing it once there instead of N times in the upcall path + */ +void +cpu_set_retval(struct thread *td, int retval, int aux, int success) +{ + /* KSEXXX */ +} + +void +cpu_free_kse_mdstorage(struct kse *kse) { + /* KSEXXX */ +} - alpha_fpstate_drop(td); +int +cpu_export_context(struct thread *td) +{ + /* KSEXXX */ } void ==== //depot/projects/kse/sys/i386/include/kse.h#4 (text+ko) ==== @@ -34,15 +34,6 @@ #include union kse_td_ctx { - struct { - int if_onstack; - struct intrframe if_if; - } intrfrm; - struct { - int tf_onstack; - int tf_gs; - struct trapframe tf_tf; - } tfrm; mcontext_t mcontext; }; ==== //depot/projects/kse/sys/kern/kern_thread.c#54 (text+ko) ==== @@ -269,7 +269,7 @@ error = td2_mbx = fuword(addr1); if (error == -1) error = EFAULT; - else + else error = 0; } if (!error) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 17:49:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41E3A37B400; Fri, 31 May 2002 17:48:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E24EB37B405 for ; Fri, 31 May 2002 17:48:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g510miP32394 for perforce@freebsd.org; Fri, 31 May 2002 17:48:44 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Fri, 31 May 2002 17:48:44 -0700 (PDT) Message-Id: <200206010048.g510miP32394@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 12233 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12233 Change 12233 by marcel@marcel_vaio on 2002/05/31 17:48:20 Flesh it out some more. This includes: o Picked a generic usage model, similar to cvs: gpt [generic-options] [command-options] o Give each command its own source file. This probably is a bit excessive, but helps keep things clean while the tool expands. Implement the following commands: destroy clear the primary and secundary GPT sectors with the option to leave the secundairy. migrate what it did before, but less hacky. recover dummy. Next on the list. Restore primary GPT from secundairy. show Print the image map of the device. o Cleanups, renaming and other "productizing" actions. Affected files ... ... //depot/projects/ia64/sbin/gpt/Makefile#2 edit ... //depot/projects/ia64/sbin/gpt/destroy.c#1 add ... //depot/projects/ia64/sbin/gpt/gpt.c#7 edit ... //depot/projects/ia64/sbin/gpt/gpt.h#4 add ... //depot/projects/ia64/sbin/gpt/map.c#3 edit ... //depot/projects/ia64/sbin/gpt/map.h#2 edit ... //depot/projects/ia64/sbin/gpt/migrate.c#1 add ... //depot/projects/ia64/sbin/gpt/recover.c#1 add ... //depot/projects/ia64/sbin/gpt/show.c#1 add Differences ... ==== //depot/projects/ia64/sbin/gpt/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= gpt -SRCS= gpt.c map.c +SRCS= destroy.c gpt.c map.c migrate.c recover.c show.c WARNS= 4 NOMAN= not yet ==== //depot/projects/ia64/sbin/gpt/gpt.c#7 (text+ko) ==== @@ -26,29 +26,6 @@ * CRC32 code derived from work by Gary S. Brown. */ -/* - * Possible options: - * -r readonly mode (maybe default and have -w?) - * -v be verbose - * -p n make room for n partitions (default 128 - minimum) - * -f x read commands from file x. - * - * Possible usages: - * gpt da2 write device layout (media map) - * gpt /dev/ad0 migrate migrate MBR to GPT - * gpt md1 create create GPT (no partitions) - * gpt md1 add ... create partitions - * gpt ad5 relocate ... move partitions (useful?) - * gpt fd0 resize ... resize partitions (useful?) - * gpt ~/foo validate extensive validation - * - * Other random ideas: - * Have a disktab like "database" to hold UUIDs, capabilities and - * other things that we don't like to hardcode. This allows us to - * create an entry "FreeBSD" and use that instead of the UUID - * when creating a FreeBSD partition. - */ - #include __FBSDID("$FreeBSD$"); @@ -62,33 +39,15 @@ #include #include #include +#include #include #include #include #include #include "map.h" +#include "gpt.h" -struct mbr { - uint16_t mbr_code[223]; - struct { - uint8_t part_flag; /* bootstrap flags */ - uint8_t part_shd; /* starting head */ - uint8_t part_ssect; /* starting sector */ - uint8_t part_scyl; /* starting cylinder */ - uint8_t part_typ; /* partition type */ - uint8_t part_ehd; /* end head */ - uint8_t part_esect; /* end sector */ - uint8_t part_ecyl; /* end cylinder */ - uint16_t part_start_lo; /* absolute starting ... */ - uint16_t part_start_hi; /* ... sector number */ - uint16_t part_size_lo; /* partition size ... */ - uint16_t part_size_hi; /* ... in sectors */ - } mbr_part[4]; - uint16_t mbr_sig; -#define MBR_SIG 0xAA55 -}; - char device_name[MAXPATHLEN]; off_t mediasz; @@ -144,7 +103,7 @@ 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; -static uint32_t +uint32_t crc32(const void *buf, size_t size) { const uint8_t *p; @@ -159,7 +118,7 @@ return crc ^ ~0U; } -static void +void unicode16(short *dst, const wchar_t *src, size_t len) { while (len-- && *src != 0) @@ -168,80 +127,19 @@ *dst = 0; } -static void -usage(void) +static char * +uuid_string(uuid_t *uuid) { + static char buf[48]; - fprintf(stderr, "usage: gpt [-rv] [-p nparts] device\n"); - exit(1); -} - -static int -gpt_open(const char *dev) -{ - struct stat sb; - int fd; - - if (!stat(dev, &sb)) { - strlcpy(device_name, dev, sizeof(device_name)); - goto found; - } - - snprintf(device_name, sizeof(device_name), "/dev/%s", dev); - if (!stat(device_name, &sb)) - goto found; - - strlcpy(device_name, dev, sizeof(device_name)); - return (-1); - - found: - fd = open(device_name, (readonly) ? O_RDONLY : O_RDWR|O_EXCL); - if (fd == -1) - return (-1); - - if ((sb.st_mode & S_IFMT) != S_IFREG) { - if (ioctl(fd, DIOCGSECTORSIZE, &secsz) == -1 || - ioctl(fd, DIOCGMEDIASIZE, &mediasz) == -1) - goto close; - } else { - secsz = 512; /* Fixed size for files. */ - if (sb.st_size % secsz) { - errno = EINVAL; - goto close; - } - mediasz = sb.st_size; - } - /* - * We require an absolute minimum of 6 sectors. One for the MBR, - * 2 for the GPT header, 2 for the GPT table and one to hold some - * user data. Let's catch this extreme border case here so that - * we don't have to worry about it later. - */ - if (mediasz / secsz < 6) { - errno = ENODEV; - goto close; - } - if (verbose) - warnx("%s: mediasize=%llu; sectorsize=%u; blocks=%llu", - device_name, (long long)mediasz, secsz, - (long long)(mediasz / secsz)); - - map_init(mediasz / secsz); - - return (fd); - - close: - close(fd); - return (-1); + sprintf(buf, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + uuid->time_low, uuid->time_mid, uuid->time_hi_and_version, + uuid->clock_seq_hi_and_reserved, uuid->clock_seq_low, + uuid->node[0], uuid->node[1], uuid->node[2], uuid->node[3], + uuid->node[4], uuid->node[5]); + return buf; } -static void -gpt_close(int fd) -{ - /* XXX post processing? */ - close(fd); -} - static void* gpt_read(int fd, off_t lba, size_t count) { @@ -262,7 +160,7 @@ return (NULL); } -static int +int gpt_write(int fd, map_t *map) { off_t ofs; @@ -279,6 +177,7 @@ static int gpt_gpt(int fd, off_t lba) { + off_t size; struct gpt_ent *ent; struct gpt_hdr *hdr; char *p; @@ -318,15 +217,17 @@ goto fail_ent; } - if (verbose) - warnx("%s: found GPT at sector %llu", device_name, - (long long)lba); + if (verbose > 1) + warnx("%s: %s GPT at sector %llu", device_name, + (lba == 1) ? "Pri" : "Sec", (long long)lba); - m = map_add(lba, 1, (lba == 1) ? MAP_TYPE_GPT : MAP_TYPE_TPG, hdr); + m = map_add(lba, 1, (lba == 1) + ? MAP_TYPE_PRI_GPT_HDR : MAP_TYPE_SEC_GPT_HDR, hdr); if (m == NULL) return (-1); + m = map_add(hdr->hdr_lba_table, blocks, (lba == 1) - ? MAP_TYPE_GPT_TBL : MAP_TYPE_TPG_TBL, p); + ? MAP_TYPE_PRI_GPT_TBL : MAP_TYPE_SEC_GPT_TBL, p); if (m == NULL) return (-1); @@ -339,9 +240,15 @@ ent = (void*)(p + i * hdr->hdr_entsz); if (!memcmp(&ent->ent_type, &unused, sizeof(uuid_t))) continue; - m = map_add(ent->ent_lba_start, - ent->ent_lba_end - ent->ent_lba_start + 1LL, - MAP_TYPE_GPT_PART, NULL); + + size = ent->ent_lba_end - ent->ent_lba_start + 1LL; + + if (verbose > 2) + warnx( + "%s: GPT partition: type=%s, start=%llu, size=%llu", + device_name, uuid_string(&ent->ent_type), + (long long)ent->ent_lba_start, (long long)size); + m = map_add(ent->ent_lba_start, size, MAP_TYPE_GPT_PART, NULL); if (m == NULL) return (-1); } @@ -355,42 +262,97 @@ return (0); } -static int -gpt_map(int fd) +int +gpt_open(const char *dev) { + struct stat sb; struct mbr *mbr; map_t *m; uint32_t size, start; unsigned int i; + int fd; + + if (!stat(dev, &sb)) { + strlcpy(device_name, dev, sizeof(device_name)); + goto found; + } + + snprintf(device_name, sizeof(device_name), "/dev/%s", dev); + if (!stat(device_name, &sb)) + goto found; + + strlcpy(device_name, dev, sizeof(device_name)); + return (-1); + + found: + fd = open(device_name, (readonly) ? O_RDONLY : O_RDWR|O_EXCL); + if (fd == -1) + return (-1); + if ((sb.st_mode & S_IFMT) != S_IFREG) { + if (ioctl(fd, DIOCGSECTORSIZE, &secsz) == -1 || + ioctl(fd, DIOCGMEDIASIZE, &mediasz) == -1) + goto close; + } else { + secsz = 512; /* Fixed size for files. */ + if (sb.st_size % secsz) { + errno = EINVAL; + goto close; + } + mediasz = sb.st_size; + } + /* + * We require an absolute minimum of 6 sectors. One for the MBR, + * 2 for the GPT header, 2 for the GPT table and one to hold some + * user data. Let's catch this extreme border case here so that + * we don't have to worry about it later. + */ + if (mediasz / secsz < 6) { + errno = ENODEV; + goto close; + } + + if (verbose) + warnx("%s: mediasize=%llu; sectorsize=%u; blocks=%llu", + device_name, (long long)mediasz, secsz, + (long long)(mediasz / secsz)); + + map_init(mediasz / secsz); + + /* * MBR */ mbr = gpt_read(fd, 0LL, 1); if (mbr == NULL) - return (-1); + goto close; if (mbr->mbr_sig == MBR_SIG) { - if (verbose) - warnx("%s: found MBR at sector 0", device_name); + if (verbose > 1) + warnx("%s: MBR at sector 0", device_name); m = map_add(0LL, 1LL, MAP_TYPE_MBR, mbr); if (m == NULL) - return (-1); + goto close; for (i = 0; i < 4; i++) { start = mbr->mbr_part[i].part_start_hi; start = (start << 16) + mbr->mbr_part[i].part_start_lo; size = mbr->mbr_part[i].part_size_hi; size = (size << 16) + mbr->mbr_part[i].part_size_lo; if (start != 0 || size != 0) { + if (verbose > 2) + warnx( + "%s: MBR partition: type=%d, start=%llu, size=%llu", device_name, + mbr->mbr_part[i].part_typ, + (long long)start, (long long)size); m = map_add(start, size, MAP_TYPE_MBR_PART, NULL); if (m == NULL) - return (-1); + goto close; } } } else { if (verbose) - warnx("%s: no MBR on this device", device_name); + warnx("%s: MBR not found", device_name); free(mbr); } @@ -398,173 +360,74 @@ * GPT */ if (gpt_gpt(fd, 1LL) == -1) - return (-1); + goto close; if (gpt_gpt(fd, mediasz / secsz - 1LL) == -1) - return (-1); - return (0); + goto close; + + return (fd); + + close: + close(fd); + return (-1); } -static void -gpt_migrate(int fd) +void +gpt_close(int fd) { - off_t blocks, last; - map_t *gpt, *tpg; - map_t *tbl, *lbt; - map_t *map; - struct gpt_hdr *hdr; - struct gpt_ent *ent; - struct mbr *mbr; - uint32_t start, size; - unsigned int i; + /* XXX post processing? */ + close(fd); +} - last = mediasz / secsz - 1LL; +static struct { + int (*fptr)(int, char *[]); + const char *name; +} cmdsw[] = { + { NULL, "add" }, + { NULL, "create" }, + { NULL, "delete" }, + { cmd_destroy, "destroy" }, + { NULL, "help" }, + { cmd_migrate, "migrate" }, + { cmd_recover, "recover" }, + { NULL, "rename" }, + { cmd_show, "show" }, + { NULL, "verify" }, + { NULL, NULL } +}; - map = map_find(MAP_TYPE_MBR); - if (map == NULL || map_find(MAP_TYPE_MBR_PART) == NULL) { - warnx("%s: error: no partitions to convert", - device_name); - return; - } +static void +usage(void) +{ - mbr = map->map_data; + fprintf(stderr, + "usage: %s [-rv] [-p nparts] command [options] device\n", + getprogname()); + exit(1); +} - if (verbose) { - printf("\tBefore image:\n"); - map_dump(); - putchar('\n'); - } +static void +prefix(const char *cmd) +{ + char *pfx; + const char *prg; - if (map_find(MAP_TYPE_GPT) != NULL || map_find(MAP_TYPE_TPG) != NULL) { - warnx("%s: error: device already contains a GPT", device_name); + prg = getprogname(); + pfx = malloc(strlen(prg) + strlen(cmd) + 2); + /* Don't bother failing. It's not important */ + if (pfx == NULL) return; - } - /* Get the amount of free space after the MBR */ - blocks = map_unused(1LL, 0LL); - if (blocks == 0LL) { - warnx("%s: error: no room for the GPT header", device_name); - return; - } - - /* Don't create more than parts entries. */ - if ((uint64_t)(blocks - 1) * secsz > parts * sizeof(struct gpt_ent)) { - blocks = (parts * sizeof(struct gpt_ent)) / secsz; - if ((parts * sizeof(struct gpt_ent)) % secsz) - blocks++; - blocks++; /* Don't forget the header itself */ - } - - /* Never cross the median of the device. */ - if ((blocks + 1LL) > ((last + 1LL) >> 1)) - blocks = ((last + 1LL) >> 1) - 1LL; - - /* - * Get the amount of free space at the end of the device and - * calculate the size for the GPT structures. - */ - map = map_last(); - if (map->map_type != MAP_TYPE_UNUSED) { - warnx("%s: error: no room for the backup header", device_name); - return; - } - - if (map->map_size < blocks) - blocks = map->map_size; - if (blocks == 1LL) { - warnx("%s: error: no room for the GPT table", device_name); - return; - } - - blocks--; /* Number of blocks in the GPT table. */ - gpt = map_add(1LL, 1LL, MAP_TYPE_GPT, calloc(1, secsz)); - tbl = map_add(2LL, blocks, MAP_TYPE_GPT_TBL, calloc(blocks, secsz)); - if (gpt == NULL || tbl == NULL) - return; - - lbt = map_add(last - blocks, blocks, MAP_TYPE_TPG_TBL, tbl->map_data); - tpg = map_add(last, 1LL, MAP_TYPE_TPG, calloc(1, secsz)); - - hdr = gpt->map_data; - memcpy(hdr->hdr_sig, GPT_HDR_SIG, sizeof(hdr->hdr_sig)); - hdr->hdr_revision = GPT_HDR_REVISION; - hdr->hdr_size = sizeof(struct gpt_hdr); - hdr->hdr_lba_self = gpt->map_start; - hdr->hdr_lba_alt = tpg->map_start; - hdr->hdr_lba_start = tbl->map_start + blocks; - hdr->hdr_lba_end = lbt->map_start - 1LL; - uuidgen(&hdr->hdr_uuid, 1); - hdr->hdr_lba_table = tbl->map_start; - hdr->hdr_entries = (blocks * secsz) / sizeof(struct gpt_ent); - if (hdr->hdr_entries > parts) - hdr->hdr_entries = parts; - hdr->hdr_entsz = sizeof(struct gpt_ent); - - ent = tbl->map_data; - for (i = 0; i < hdr->hdr_entries; i++) - uuidgen(&ent[i].ent_uuid, 1); - - /* Mirror partitions. */ - for (i = 0; i < 4; i++) { - switch (mbr->mbr_part[i].part_typ) { - case 165: { /* FreeBSD */ - uuid_t freebsd = GPT_ENT_TYPE_FREEBSD; - ent->ent_type = freebsd; - unicode16(ent->ent_name, - L"FreeBSD disklabel partition", 36); - break; - } - case 239: { /* EFI */ - uuid_t efi_slice = GPT_ENT_TYPE_EFI; - ent->ent_type = efi_slice; - unicode16(ent->ent_name, L"EFI system partition", 36); - break; - } - default: - continue; - } - start = mbr->mbr_part[i].part_start_hi; - start = (start << 16) + mbr->mbr_part[i].part_start_lo; - size = mbr->mbr_part[i].part_size_hi; - size = (size << 16) + mbr->mbr_part[i].part_size_lo; - ent->ent_lba_start = start; - ent->ent_lba_end = start + size - 1LL; - ent++; - } - ent = tbl->map_data; - - hdr->hdr_crc_table = crc32(ent, hdr->hdr_entries * hdr->hdr_entsz); - hdr->hdr_crc_self = crc32(hdr, hdr->hdr_size); - - gpt_write(fd, gpt); - gpt_write(fd, tbl); - - /* - * Create backup GPT. - */ - memcpy(tpg->map_data, gpt->map_data, secsz); - hdr = tpg->map_data; - hdr->hdr_lba_self = tpg->map_start; - hdr->hdr_lba_alt = gpt->map_start; - hdr->hdr_lba_table = lbt->map_start; - hdr->hdr_crc_self = 0; /* Don't ever forget this! */ - hdr->hdr_crc_self = crc32(hdr, hdr->hdr_size); - - gpt_write(fd, lbt); - gpt_write(fd, tpg); - - if (verbose) { - printf("\tAfter image:\n"); - map_dump(); - putchar('\n'); - } + sprintf(pfx, "%s %s", prg, cmd); + setprogname(pfx); } int -main(int argc, char **argv) +main(int argc, char *argv[]) { - char *p; - int ch, fd; + char *cmd, *p; + int ch, i; + /* Get the generic options */ while ((ch = getopt(argc, argv, "p:rv")) != -1) { switch(ch) { case 'p': @@ -578,7 +441,7 @@ readonly = 1; break; case 'v': - verbose = 1; + verbose++; break; default: usage(); @@ -586,26 +449,16 @@ } if (!parts) parts = 128; - argc -= optind; - argv += optind; - if (argc != 1) + if (argc == optind) usage(); - fd = gpt_open(argv[0]); - if (fd == -1) - err(1, "unable to open device '%s'", device_name); + cmd = argv[optind++]; + for (i = 0; cmdsw[i].name != NULL && strcmp(cmd, cmdsw[i].name); i++); - if (gpt_map(fd) == -1) - err(1, "unable to map device"); + if (cmdsw[i].fptr == NULL) + errx(1, "unknown command: %s", cmd); - /* - * XXX Must be one of many useful things we can do. Not just - * the only thing :-) - */ - gpt_migrate(fd); - - gpt_close(fd); - - return (0); + prefix(cmd); + return ((*cmdsw[i].fptr)(argc, argv)); } ==== //depot/projects/ia64/sbin/gpt/map.c#3 (text+ko) ==== @@ -33,6 +33,7 @@ #include "map.h" +static int lbawidth; static map_t *mediamap; static map_t * @@ -69,7 +70,7 @@ if (n->map_start == start && n->map_size == size) { if (n->map_type != MAP_TYPE_UNUSED) - warnx("warning: part(%llu,%llu) mirrored", + warnx("warning: partition(%llu,%llu) mirrored", (long long)start, (long long)size); n->map_type = type; n->map_data = data; @@ -77,9 +78,10 @@ } if (n->map_type != MAP_TYPE_UNUSED) { - warnx("error: part(%llu,%llu) overlaps part(%llu,%llu)", - (long long)start, (long long)size, (long long)n->map_start, - (long long)n->map_size); + warnx( + "error: partition(%llu,%llu) overlaps partition(%llu,%llu)", + (long long)start, (long long)size, + (long long)n->map_start, (long long)n->map_size); return (0); } @@ -172,38 +174,46 @@ void map_dump(void) { + off_t end; map_t *m; + printf(" %*s", lbawidth, "start"); + printf(" %*s", lbawidth, "end"); + printf(" %*s", lbawidth, "size"); + printf(" %s\n", "contents"); + m = mediamap; while (m != NULL) { + end = m->map_start + m->map_size - 1; + printf(" %*llu", lbawidth, (long long)m->map_start); + printf(" %*llu", lbawidth, (long long)end); + printf(" %*llu", lbawidth, (long long)m->map_size); + + putchar(' '); putchar(' '); switch (m->map_type) { - case MAP_TYPE_UNUSED: - printf(" (unused)\t"); - break; case MAP_TYPE_MBR: - printf("MBR\t\t"); + printf("MBR"); break; - case MAP_TYPE_GPT: - printf("GPT header\t"); + case MAP_TYPE_PRI_GPT_HDR: + printf("Pri GPT header"); break; - case MAP_TYPE_TPG: - printf("Backup header\t"); + case MAP_TYPE_SEC_GPT_HDR: + printf("Sec GPT header"); break; - case MAP_TYPE_GPT_TBL: - printf("GPT table\t"); + case MAP_TYPE_PRI_GPT_TBL: + printf("Pri GPT table"); break; - case MAP_TYPE_TPG_TBL: - printf("Backup table\t"); + case MAP_TYPE_SEC_GPT_TBL: + printf("Sec GPT table"); break; case MAP_TYPE_MBR_PART: - printf("MBR part\t"); + printf("MBR partition"); break; case MAP_TYPE_GPT_PART: - printf("GPT part\t"); + printf("GPT partition"); break; } - printf("start=%llu, blocks=%llu\n", (long long)m->map_start, - (long long)m->map_size); + putchar('\n'); m = m->map_next; } } @@ -211,5 +221,10 @@ void map_init(off_t size) { + char buf[32]; + mediamap = mkmap(0LL, size, MAP_TYPE_UNUSED); + lbawidth = sprintf(buf, "%llu", (long long)size); + if (lbawidth < 5) + lbawidth = 5; } ==== //depot/projects/ia64/sbin/gpt/map.h#2 (text+ko) ==== @@ -38,10 +38,10 @@ #define MAP_TYPE_UNUSED 0 #define MAP_TYPE_MBR 1 #define MAP_TYPE_MBR_PART 2 -#define MAP_TYPE_GPT 3 -#define MAP_TYPE_TPG 4 /* GPT mirror header. */ -#define MAP_TYPE_GPT_TBL 5 -#define MAP_TYPE_TPG_TBL 6 /* GPT mirror table. */ +#define MAP_TYPE_PRI_GPT_HDR 3 +#define MAP_TYPE_SEC_GPT_HDR 4 +#define MAP_TYPE_PRI_GPT_TBL 5 +#define MAP_TYPE_SEC_GPT_TBL 6 #define MAP_TYPE_GPT_PART 7 void *map_data; } map_t; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 18: 3:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C85737B405; Fri, 31 May 2002 18:03:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9383A37B403 for ; Fri, 31 May 2002 18:03:02 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g51132t33985 for perforce@freebsd.org; Fri, 31 May 2002 18:03:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 31 May 2002 18:03:02 -0700 (PDT) Message-Id: <200206010103.g51132t33985@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12234 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12234 Change 12234 by rwatson@rwatson_curry on 2002/05/31 18:02:08 Define and employe mac_biba_valid() to validate labels from various suspect sources (largely user processes :-) Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#39 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#39 (text+ko) ==== @@ -215,6 +215,72 @@ return (mac_biba_equal_element(&a->mb_single, &b->mb_single)); } +static int +mac_biba_valid(struct mac_biba *mac_biba) +{ + + if (mac_biba->mb_flags & MAC_BIBA_FLAG_SINGLE) { + switch (mac_biba->mb_single.mbe_type) { + case MAC_BIBA_TYPE_GRADE: + break; + + case MAC_BIBA_TYPE_EQUAL: + case MAC_BIBA_TYPE_HIGH: + case MAC_BIBA_TYPE_LOW: + if (mac_biba->mb_single.mbe_grade != 0) + return (EINVAL); + break; + + default: + return (EINVAL); + } + } else { + if (mac_biba->mb_single.mbe_type != MAC_BIBA_TYPE_UNDEF) + return (EINVAL); + } + + if (mac_biba->mb_flags & MAC_BIBA_FLAG_RANGE) { + switch (mac_biba->mb_rangelow.mbe_type) { + case MAC_BIBA_TYPE_GRADE: + break; + + case MAC_BIBA_TYPE_EQUAL: + case MAC_BIBA_TYPE_HIGH: + case MAC_BIBA_TYPE_LOW: + if (mac_biba->mb_rangelow.mbe_grade != 0) + return (EINVAL); + break; + + default: + return (EINVAL); + } + + switch (mac_biba->mb_rangehigh.mbe_type) { + case MAC_BIBA_TYPE_GRADE: + break; + + case MAC_BIBA_TYPE_EQUAL: + case MAC_BIBA_TYPE_HIGH: + case MAC_BIBA_TYPE_LOW: + if (mac_biba->mb_rangehigh.mbe_grade != 0) + return (EINVAL); + break; + + default: + return (EINVAL); + } + if (!mac_biba_dominate_element(&mac_biba->mb_rangehigh, + &mac_biba->mb_rangelow)) + return (EINVAL); + } else { + if (mac_biba->mb_rangelow.mbe_type != MAC_BIBA_TYPE_UNDEF || + mac_biba->mb_rangehigh.mbe_type != MAC_BIBA_TYPE_UNDEF) + return (EINVAL); + } + + return (0); +} + static void mac_biba_set_range(struct mac_biba *mac_biba, u_short typelow, u_short gradelow, u_short typehigh, u_short gradehigh) @@ -475,10 +541,14 @@ mac_biba_internalize(struct label *label, struct mac *extmac) { struct mac_biba *mac_biba; + int error; + + mac_biba = SLOT(label); - /* XXX: validity check here. */ + error = mac_biba_valid(mac_biba); + if (error) + return (error); - mac_biba = SLOT(label); *mac_biba = extmac->m_biba; return (0); @@ -1006,10 +1076,13 @@ struct label *ifnetlabel, struct label *newlabel) { struct mac_biba *new; + int error; new = SLOT(newlabel); - /* XXX: validity check */ + error = mac_biba_valid(new); + if (error) + return (error); if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAGS_BOTH) return (EINVAL); @@ -1022,10 +1095,13 @@ struct label *socketlabel, struct label *newlabel) { struct mac_biba *new; + int error; new = SLOT(newlabel); - /* XXX: validity check */ + error = mac_biba_valid(new); + if (error) + return (error); if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) return (EINVAL); @@ -1039,10 +1115,13 @@ mac_biba_cred_check_relabel_subject(struct ucred *cred, struct label *newlabel) { struct mac_biba *new; + int error; new = SLOT(newlabel); - /* XXX: validity check */ + error = mac_biba_valid(new); + if (error) + return (error); if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAGS_BOTH) return (EINVAL); @@ -1060,12 +1139,15 @@ struct label *vnodelabel, struct label *newlabel) { struct mac_biba *old, *new, *subj; + int error; old = SLOT(vnodelabel); new = SLOT(newlabel); subj = SLOT(&cred->cr_label); - /* XXX: validity check */ + error = mac_biba_valid(new); + if (error) + return (error); if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) return (EINVAL); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 18: 5:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3703237B407; Fri, 31 May 2002 18:05:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 72ADC37B406 for ; Fri, 31 May 2002 18:05:05 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g51155B34947 for perforce@freebsd.org; Fri, 31 May 2002 18:05:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 31 May 2002 18:05:05 -0700 (PDT) Message-Id: <200206010105.g51155B34947@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12235 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12235 Change 12235 by rwatson@rwatson_curry on 2002/05/31 18:04:54 Most of the calls to _valid() at the XXX locations in the old MAC code aren't actually needed, since almost all of those instances are called on now-internalized labels generated by mac_internalize() which also does validity checking. Eliminate many redundant label checks. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#40 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#40 (text+ko) ==== @@ -1080,10 +1080,6 @@ new = SLOT(newlabel); - error = mac_biba_valid(new); - if (error) - return (error); - if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAGS_BOTH) return (EINVAL); @@ -1099,10 +1095,6 @@ new = SLOT(newlabel); - error = mac_biba_valid(new); - if (error) - return (error); - if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) return (EINVAL); @@ -1119,10 +1111,6 @@ new = SLOT(newlabel); - error = mac_biba_valid(new); - if (error) - return (error); - if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAGS_BOTH) return (EINVAL); @@ -1145,10 +1133,6 @@ new = SLOT(newlabel); subj = SLOT(&cred->cr_label); - error = mac_biba_valid(new); - if (error) - return (error); - if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) return (EINVAL); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 18: 7:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 798FF37B407; Fri, 31 May 2002 18:07:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5524337B403 for ; Fri, 31 May 2002 18:07:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g51178X38185 for perforce@freebsd.org; Fri, 31 May 2002 18:07:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 31 May 2002 18:07:08 -0700 (PDT) Message-Id: <200206010107.g51178X38185@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12236 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12236 Change 12236 by rwatson@rwatson_curry on 2002/05/31 18:06:31 GC unused error variables. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#41 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#41 (text+ko) ==== @@ -1076,7 +1076,6 @@ struct label *ifnetlabel, struct label *newlabel) { struct mac_biba *new; - int error; new = SLOT(newlabel); @@ -1091,7 +1090,6 @@ struct label *socketlabel, struct label *newlabel) { struct mac_biba *new; - int error; new = SLOT(newlabel); @@ -1107,7 +1105,6 @@ mac_biba_cred_check_relabel_subject(struct ucred *cred, struct label *newlabel) { struct mac_biba *new; - int error; new = SLOT(newlabel); @@ -1127,7 +1124,6 @@ struct label *vnodelabel, struct label *newlabel) { struct mac_biba *old, *new, *subj; - int error; old = SLOT(vnodelabel); new = SLOT(newlabel); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 19:38:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C13337B404; Fri, 31 May 2002 19:38:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6AC1137B403 for ; Fri, 31 May 2002 19:38:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g512cdc50441 for perforce@freebsd.org; Fri, 31 May 2002 19:38:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 31 May 2002 19:38:39 -0700 (PDT) Message-Id: <200206010238.g512cdc50441@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12239 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12239 Change 12239 by rwatson@rwatson_curry on 2002/05/31 19:37:39 Export 'struct label' to userland for the time-being: this is required because userland applications try to interpret structures such as 'struct ucred' (which are kernel-only) without defining _KERNEL. This might fix the build. Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#103 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#103 (text+ko) ==== @@ -175,6 +175,12 @@ int __mac_set_proc(struct mac *_mac_p); #else /* _KERNEL */ +#endif /* _KERNEL */ + +/* + * XXX: This shouldn't be exported to userland, but is because of ucred.h + * and various other messes. + */ #define MAC_MAX_POLICIES 8 @@ -186,6 +192,8 @@ } l_perpolicy[MAC_MAX_POLICIES]; }; +#ifdef _KERNEL + /* * Policy flags exported to consumers of MAC APIs. Probably, this shouldn't * be done. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri May 31 21: 7:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B67937B406; Fri, 31 May 2002 21:07:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AAD0837B401 for ; Fri, 31 May 2002 21:07:36 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5147a666551 for perforce@freebsd.org; Fri, 31 May 2002 21:07:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 31 May 2002 21:07:36 -0700 (PDT) Message-Id: <200206010407.g5147a666551@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12244 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12244 Change 12244 by rwatson@rwatson_curry on 2002/05/31 21:07:24 #ifdef _KERNEL 'struct ipq', since it's used in the kernel fragment reassembly code. Once you slap stuff like 'struct label' into ipq, you don't want it exported to userland. Affected files ... ... //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#5 (text+ko) ==== @@ -50,6 +50,7 @@ struct in_addr ih_dst; /* destination internet address */ }; +#ifdef _KERNEL /* * Ip reassembly queue structure. Each fragment * being reassembled is attached to one of these structures. @@ -69,6 +70,7 @@ #endif struct label ipq_label; /* MAC label */ }; +#endif /* _KERNEL */ /* * Structure stored in mbuf in inpcb.ip_options To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 1 9:44:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 500EA37B406; Sat, 1 Jun 2002 09:44:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from evilpete.dyndns.org (12-232-26-46.client.attbi.com [12.232.26.46]) by hub.freebsd.org (Postfix) with ESMTP id ED6D737B400; Sat, 1 Jun 2002 09:44:33 -0700 (PDT) Received: from overcee.wemm.org ([10.0.0.3]) by evilpete.dyndns.org (8.11.6/8.11.6) with ESMTP id g51GiX180063; Sat, 1 Jun 2002 09:44:33 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 39F2D380A; Sat, 1 Jun 2002 09:44:33 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Julian Elischer Cc: Jake Burkholder , Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 12179 for review In-Reply-To: Date: Sat, 01 Jun 2002 09:44:33 -0700 From: Peter Wemm Message-Id: <20020601164433.39F2D380A@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer wrote: > > > On Fri, 31 May 2002, Jake Burkholder wrote: > > > Apparently, On Thu, May 30, 2002 at 10:57:02PM -0700, > > Julian Elischer said words to the effect of; > > > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12179 > > > > > > Change 12179 by julian@julian_ref on 2002/05/30 22:56:19 > > > > > > Use fuword and suword instead of copyin/copyout > > > when setting up thread completion mailboxes. > > > needs fptr and sptr, which I will add soon. > > > > Please do not add these without discussing it first. fuword and > > suword take a long as their argument/return value, which works > > fine. > > except that you have to cast the results.. > It'd be nice if there was one guaranteed to return a (void *) > preferably at a second argument so that a success value can be given as > well. > (I decided not to add it myself unilaterally but rather to lobby for it > amongst types such as yourself..) > > There is no guarantee that on every imaginable architecture > that the same long<->pointer conversion is correct, and anyhow the casting > is wrong.. it wouldn't take much to make a retval = fptr(addr, &target) > call. It breaks on x86 where you can configure long to be 64 bit but pointers are 32 bit still. suword() would trash stuff in that case. dfr has added suword32/64 and friends. I'd like suptr/fuptr or something like that as well. The *ptr version would accept/return a void *. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 1 11:52: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A89437B404; Sat, 1 Jun 2002 11:52:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CA88537B400 for ; Sat, 1 Jun 2002 11:51:59 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g51IpxX18025 for perforce@freebsd.org; Sat, 1 Jun 2002 11:51:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Jun 2002 11:51:59 -0700 (PDT) Message-Id: <200206011851.g51IpxX18025@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12268 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12268 Change 12268 by rwatson@rwatson_curry on 2002/06/01 11:51:52 Always mount the root file system as biba/high. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#42 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#42 (text+ko) ==== @@ -627,8 +627,13 @@ mac_biba_create_root_mount(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel) { + struct mac_biba *mac_biba; - mac_biba_create_mount(cred, mp, mntlabel, fslabel); + /* Always mount root as high integrity. */ + mac_biba = SLOT(fslabel); + mac_biba_set_single(mac_biba, MAC_BIBA_TYPE_HIGH, 0); + mac_biba = SLOT(mntlabel); + mac_biba_set_single(mac_biba, MAC_BIBA_TYPE_HIGH, 0); } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 1 13:35:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 579F137B407; Sat, 1 Jun 2002 13:35:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7E15D37B401 for ; Sat, 1 Jun 2002 13:35:07 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g51KZ7h59378 for perforce@freebsd.org; Sat, 1 Jun 2002 13:35:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Jun 2002 13:35:07 -0700 (PDT) Message-Id: <200206012035.g51KZ7h59378@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12274 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12274 Change 12274 by rwatson@rwatson_curry on 2002/06/01 13:34:40 Correct various comments. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#43 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#43 (text+ko) ==== @@ -39,7 +39,7 @@ /* * Developed by the TrustedBSD Project. - * Generic mandatory access module that does nothing. + * Biba fixed label mandatory integrity policy. */ #include @@ -1101,8 +1101,6 @@ if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) return (EINVAL); - /* XXX: Check should be "is single in cred range" */ - return (suser_cred(cred, 0)); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 1 17: 5:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D97AB37B40A; Sat, 1 Jun 2002 17:05:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EB55537B409 for ; Sat, 1 Jun 2002 17:05:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5205PP50615 for perforce@freebsd.org; Sat, 1 Jun 2002 17:05:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Jun 2002 17:05:25 -0700 (PDT) Message-Id: <200206020005.g5205PP50615@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12282 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12282 Change 12282 by rwatson@rwatson_curry on 2002/06/01 17:04:27 Generally improve access control for relabeling operations. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#44 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#44 (text+ko) ==== @@ -157,6 +157,16 @@ } static int +mac_biba_range_in_range(struct mac_biba *rangea, struct mac_biba *rangeb) +{ + + return (mac_biba_dominate_element(&rangea->mb_rangehigh, + &rangeb->mb_rangehigh) && + mac_biba_dominate_element(&rangeb->mb_rangelow, + &rangea->mb_rangelow)); +} + +static int mac_biba_single_in_range(struct mac_biba *single, struct mac_biba *range) { @@ -216,6 +226,13 @@ } static int +mac_biba_high_single(struct mac_biba *mac_biba) +{ + + return (mac_biba->mb_single.mbe_type == MAC_BIBA_TYPE_HIGH); +} + +static int mac_biba_valid(struct mac_biba *mac_biba) { @@ -996,8 +1013,7 @@ dest = SLOT(&cred->cr_label); mac_biba_set_single(dest, MAC_BIBA_TYPE_EQUAL, 0); - mac_biba_set_range(dest, MAC_BIBA_TYPE_EQUAL, 0, - MAC_BIBA_TYPE_EQUAL, 0); + mac_biba_set_range(dest, MAC_BIBA_TYPE_LOW, 0, MAC_BIBA_TYPE_HIGH, 0); } static void @@ -1080,13 +1096,19 @@ mac_biba_cred_check_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel) { - struct mac_biba *new; + struct mac_biba *subj, *new; + subj = SLOT(&cred->cr_label); new = SLOT(newlabel); if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAGS_BOTH) return (EINVAL); + /* + * XXX: Only Biba HIGH subjects may relabel interfaces. */ + if (!mac_biba_high_single(subj)) + return (EPERM); + return (suser_cred(cred, 0)); } @@ -1094,32 +1116,64 @@ mac_biba_cred_check_relabel_socket(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { - struct mac_biba *new; + struct mac_biba *subj, *obj, *new; new = SLOT(newlabel); + subj = SLOT(&cred->cr_label); + obj = SLOT(socketlabel); if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) return (EINVAL); - return (suser_cred(cred, 0)); + /* + * To relabel a socket, the old socket label must be in the subject + * range. + */ + if (!mac_biba_single_in_range(obj, subj)) + return (EPERM); + + /* + * To relabel a socket, the new socket label must be in the subject + * range. + */ + if (!mac_biba_single_in_range(new, subj)) + return (EPERM); + + /* + * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + */ + + return (0); } static int mac_biba_cred_check_relabel_subject(struct ucred *cred, struct label *newlabel) { - struct mac_biba *new; + struct mac_biba *subj, *new; + subj = SLOT(&cred->cr_label); new = SLOT(newlabel); if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAGS_BOTH) return (EINVAL); /* - * XXX: check that new single is in old range, new range is in old - * range, or that privilege is present. + * The new single must be in the old range. + */ + if (!mac_biba_single_in_range(new, subj)) + return (EPERM); + + /* + * The new range must be in the old range. + */ + if (!mac_biba_range_in_range(new, subj)) + return (EPERM); + + /* + * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. */ - return (suser_cred(cred, 0)); + return (0); } static int @@ -1136,8 +1190,21 @@ return (EINVAL); /* - * XXX: check that old is in cred label range, that new is in cred - * label range, or that privilege is held. + * To relabel a vnode, the old vnode label must be in the subject + * range. + */ + if (!mac_biba_single_in_range(old, subj)) + return (EPERM); + + /* + * To relabel a vnode, the new vnode label must be in the subject + * range. + */ + if (!mac_biba_single_in_range(new, subj)) + return (EPERM); + + /* + * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. */ return (suser_cred(cred, 0)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 1 18: 2:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A54D637B400; Sat, 1 Jun 2002 18:02:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AFE8837B406 for ; Sat, 1 Jun 2002 18:02:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5212Yu56700 for perforce@freebsd.org; Sat, 1 Jun 2002 18:02:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Jun 2002 18:02:34 -0700 (PDT) Message-Id: <200206020102.g5212Yu56700@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12283 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12283 Change 12283 by rwatson@rwatson_curry on 2002/06/01 18:02:25 mac_partition, a simple jail-like model that isolates clusters of processes. Until we have a flexible user API for managing arbitrary mac labels, "borrow" the sebsd psid for externalized labels. Unlike other labeled policies, this uses the label entry as a 'long' rather than a 'void *'. Affected files ... ... //depot/projects/trustedbsd/mac/sys/modules/Makefile#22 edit ... //depot/projects/trustedbsd/mac/sys/modules/mac_partition/Makefile#1 add ... //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#1 add Differences ... ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#22 (text+ko) ==== @@ -53,6 +53,7 @@ mac_bsdextended \ mac_ifoff \ mac_none \ + mac_partition \ mac_seeotheruids \ mac_test \ md \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 1 20: 9:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F17437B408; Sat, 1 Jun 2002 20:09:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C0A6D37B408 for ; Sat, 1 Jun 2002 20:09:06 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g52396J78851 for perforce@freebsd.org; Sat, 1 Jun 2002 20:09:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Jun 2002 20:09:06 -0700 (PDT) Message-Id: <200206020309.g52396J78851@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12285 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12285 Change 12285 by rwatson@rwatson_curry on 2002/06/01 20:08:16 Implement socket receiving mbuf security check. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#45 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#45 (text+ko) ==== @@ -1621,8 +1621,15 @@ mac_biba_socket_check_receive_mbuf(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { + struct mac_biba *p, *s; - return (0); + if (!mac_biba_enabled) + return (0); + + p = SLOT(mbuflabel); + s = SLOT(socketlabel); + + return (mac_biba_equal_single(p, s) ? 0 : EACCES); } static struct mac_policy_op_entry mac_biba_ops[] = To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 1 20:42:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D83837B409; Sat, 1 Jun 2002 20:42:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 423AA37B408 for ; Sat, 1 Jun 2002 20:42:48 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g523gmH82300 for perforce@freebsd.org; Sat, 1 Jun 2002 20:42:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Jun 2002 20:42:48 -0700 (PDT) Message-Id: <200206020342.g523gmH82300@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12287 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12287 Change 12287 by rwatson@rwatson_curry on 2002/06/01 20:42:01 Reconnect MLS to the build. Affected files ... ... //depot/projects/trustedbsd/mac/sys/modules/Makefile#23 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#23 (text+ko) ==== @@ -52,6 +52,7 @@ mac_biba \ mac_bsdextended \ mac_ifoff \ + mac_mls \ mac_none \ mac_partition \ mac_seeotheruids \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 1 20:44: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E754C37B401; Sat, 1 Jun 2002 20:42:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0725B37B407 for ; Sat, 1 Jun 2002 20:42:48 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g523glD82295 for perforce@freebsd.org; Sat, 1 Jun 2002 20:42:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 Jun 2002 20:42:47 -0700 (PDT) Message-Id: <200206020342.g523glD82295@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12286 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12286 Change 12286 by rwatson@rwatson_curry on 2002/06/01 20:41:47 Convert MLS to the new world order, largely based on the Biba work. Some XXX's still, and a panic in the statfs code on NFS boxes for some reason. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#32 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#32 (text+ko) ==== @@ -34,11 +34,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD$ */ + /* * Developed by the TrustedBSD Project. - * Multi-Level Security Policy. + * MLS fixed label mandatory confidentiality policy. */ #include @@ -58,991 +59,1644 @@ #include #include +#include + #include #include #include #include +#include +#include + #include SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, mls, CTLFLAG_RW, 0, - "TrustedBSD Multi-Level Security sensitivity policy controls"); + "TrustedBSD mac_mls policy controls"); -static int mac_mls_enabled = 1; +static int mac_mls_enabled = 0; SYSCTL_INT(_security_mac_mls, OID_AUTO, enabled, CTLFLAG_RW, - &mac_mls_enabled, 0, "Enforce MLS sensitivity policy"); -TUNABLE_INT("security.mac.mls.enabled", &mac_mls_enabled); + &mac_mls_enabled, 0, "Enforce MAC/MLS policy"); + +static int destroyed_not_inited; +SYSCTL_INT(_security_mac_mls, OID_AUTO, destroyed_not_inited, CTLFLAG_RD, + &destroyed_not_inited, 0, "Count of labels destroyed but not inited"); + +static int slot; +#define SLOT(l) ((struct mac_mls *)LABEL_TO_SLOT((l), slot).l_ptr) + +MALLOC_DEFINE(M_MACMLS, "mls label", "MAC/MLS labels"); + +static struct mac_mls * +mls_alloc(int how) +{ + struct mac_mls *mac_mls; + + mac_mls = malloc(sizeof(struct mac_mls), M_MACMLS, M_ZERO | how); + + return (mac_mls); +} + +static void +mls_free(struct mac_mls *mac_mls) +{ + + if (mac_mls != NULL) + free(mac_mls, M_MACMLS); + else + atomic_add_int(&destroyed_not_inited, 1); +} static int -mac_mls_element_dominate(struct mac_mls_element *labela, - struct mac_mls_element *labelb) +mac_mls_dominate_element(struct mac_mls_element *a, + struct mac_mls_element *b) { - switch (labela->mme_type) { - case MAC_MLS_TYPE_LEVEL: - switch (labelb->mme_type) { + switch(a->mme_type) { + case MAC_MLS_TYPE_EQUAL: + case MAC_MLS_TYPE_HIGH: + return (1); + + case MAC_MLS_TYPE_LOW: + switch (b->mme_type) { case MAC_MLS_TYPE_LEVEL: - return (labela->mme_level >= labelb->mme_level); - case MAC_MLS_TYPE_LOW: - return (1); case MAC_MLS_TYPE_HIGH: return (0); + case MAC_MLS_TYPE_EQUAL: + case MAC_MLS_TYPE_LOW: return (1); + default: - panic("mac_mls_element_dominate(): Unknown " - "labelb mme_type (%d)\n", labelb->mme_type); + panic("mac_mls_dominate_element: b->mme_type invalid"); } - case MAC_MLS_TYPE_LOW: - switch (labelb->mme_type) { - case MAC_MLS_TYPE_LEVEL: - return (0); + + case MAC_MLS_TYPE_LEVEL: + switch (b->mme_type) { + case MAC_MLS_TYPE_EQUAL: case MAC_MLS_TYPE_LOW: return (1); + case MAC_MLS_TYPE_HIGH: return (0); - case MAC_MLS_TYPE_EQUAL: - return (1); + + case MAC_MLS_TYPE_LEVEL: + return (a->mme_level >= b->mme_level); + default: - panic("mac_mls_element_dominate(): Unknown " - "labelb mme_type (%d)\n", labelb->mme_type); + panic("mac_mls_dominate_element: b->mme_type invalid"); } - case MAC_MLS_TYPE_HIGH: - return (1); - case MAC_MLS_TYPE_EQUAL: - return (1); + default: - panic("mac_mls_element_dominate(): Unknown labela " - "mme_type (%d)\n", labela->mme_type); + panic("mac_mls_dominate_element: a->mme_type invalid"); } + + return (0); } static int -mac_mls_single_dominate(struct mac *labela, struct mac *labelb) +mac_mls_range_in_range(struct mac_mls *rangea, struct mac_mls *rangeb) { - KASSERT((labela->m_mls.mm_flags & MAC_MLS_FLAG_SINGLE) != 0, - ("mac_mls_single_dominate: labela does not have valid single")); - KASSERT((labelb->m_mls.mm_flags & MAC_MLS_FLAG_SINGLE) != 0, - ("mac_mls_single_dominate: labelb does not have valid single")); - - return (mac_mls_element_dominate(&labela->m_mls.mm_single, - &labelb->m_mls.mm_single)); + return (mac_mls_dominate_element(&rangea->mm_rangehigh, + &rangeb->mm_rangehigh) && + mac_mls_dominate_element(&rangeb->mm_rangelow, + &rangea->mm_rangelow)); } -/* - * Syntactic checks of label: 0 for success, else an errno. - */ static int -mac_mls_element_valid(struct mac_mls_element *element) +mac_mls_single_in_range(struct mac_mls *single, struct mac_mls *range) { - switch(element->mme_type) { - case MAC_MLS_TYPE_LEVEL: - break; - case MAC_MLS_TYPE_HIGH: - case MAC_MLS_TYPE_LOW: - case MAC_MLS_TYPE_EQUAL: - if (element->mme_level != 0) - return (EINVAL); - break; - default: - return (EINVAL); - } - return (0); + return (mac_mls_dominate_element(&range->mm_rangehigh, + &single->mm_single) && + mac_mls_dominate_element(&single->mm_single, + &range->mm_rangelow)); + + return (1); } static int -mac_mls_label_valid(struct mac *label) +mac_mls_dominate_single(struct mac_mls *a, struct mac_mls *b) { - int error; + KASSERT((a->mm_flags & MAC_MLS_FLAG_SINGLE) != 0, + ("mac_mls_dominate_single: a not single")); + KASSERT((b->mm_flags & MAC_MLS_FLAG_SINGLE) != 0, + ("mac_mls_dominate_single: b not single")); - if ((label->m_mls.mm_flags & ~MAC_MLS_FLAGS_BOTH) != 0) - return (EINVAL); - if (label->m_mls.mm_flags & MAC_MLS_FLAG_SINGLE) { - error = mac_mls_element_valid(&label->m_mls.mm_single); - if (error) - return (error); - } - if (label->m_mls.mm_flags & MAC_MLS_FLAG_RANGE) { - error = mac_mls_element_valid(&label->m_mls.mm_rangelow); - if (error) - return (error); - error = mac_mls_element_valid(&label->m_mls.mm_rangehigh); - if (error) - return (error); - if (!(mac_mls_element_dominate(&label->m_mls.mm_rangehigh, - &label->m_mls.mm_rangelow))) - return (EINVAL); - } - return (0); + return (mac_mls_dominate_element(&a->mm_single, &b->mm_single)); } static int -mac_mls_element_equal(struct mac_mls_element *labela, - struct mac_mls_element *labelb) +mac_mls_equal_element(struct mac_mls_element *a, struct mac_mls_element *b) { - return (mac_mls_element_dominate(labela, labelb) && - mac_mls_element_dominate(labelb, labela)); + if (a->mme_type == MAC_MLS_TYPE_EQUAL || + b->mme_type == MAC_MLS_TYPE_EQUAL) + return (1); + + return (a->mme_type == b->mme_type && a->mme_level == b->mme_level); } static int -mac_mls_single_equal(struct mac *labela, struct mac *labelb) +mac_mls_equal_range(struct mac_mls *a, struct mac_mls *b) { - KASSERT((labela->m_mls.mm_flags & MAC_MLS_FLAG_SINGLE) != 0, - ("mac_mls_single_equal: labela does not have valid single")); - KASSERT((labelb->m_mls.mm_flags & MAC_MLS_FLAG_SINGLE) != 0, - ("mac_mls_single_equal: labelb does not have valid single")); + KASSERT((a->mm_flags & MAC_MLS_FLAG_RANGE) != 0, + ("mac_mls_equal_range: a not range")); + KASSERT((b->mm_flags & MAC_MLS_FLAG_RANGE) != 0, + ("mac_mls_equal_range: b not range")); - return (mac_mls_element_equal(&labela->m_mls.mm_single, - &labelb->m_mls.mm_single)); + return (mac_mls_equal_element(&a->mm_rangelow, &b->mm_rangelow) && + mac_mls_equal_element(&a->mm_rangehigh, &b->mm_rangehigh)); } static int -mac_mls_equal(struct mac *labela, struct mac *labelb) +mac_mls_equal_single(struct mac_mls *a, struct mac_mls *b) { - int single_match, rangelow_match, rangehigh_match; + + KASSERT((a->mm_flags & MAC_MLS_FLAG_SINGLE) != 0, + ("mac_mls_equal_single: a not single")); + KASSERT((b->mm_flags & MAC_MLS_FLAG_SINGLE) != 0, + ("mac_mls_equal_single: b not single")); - single_match = mac_mls_element_equal(&labela->m_mls.mm_single, - &labelb->m_mls.mm_single); - rangelow_match = mac_mls_element_equal(&labela->m_mls.mm_rangelow, - &labelb->m_mls.mm_rangelow); - rangehigh_match = mac_mls_element_equal(&labela->m_mls.mm_rangehigh, - &labelb->m_mls.mm_rangehigh); - return (single_match && rangelow_match && rangehigh_match); + return (mac_mls_equal_element(&a->mm_single, &b->mm_single)); } static int -mac_mls_single_in_range(struct mac *labelsingle, struct mac *labelrange) +mac_mls_valid(struct mac_mls *mac_mls) { - int between = 1; + + if (mac_mls->mm_flags & MAC_MLS_FLAG_SINGLE) { + switch (mac_mls->mm_single.mme_type) { + case MAC_MLS_TYPE_LEVEL: + break; + + case MAC_MLS_TYPE_EQUAL: + case MAC_MLS_TYPE_HIGH: + case MAC_MLS_TYPE_LOW: + if (mac_mls->mm_single.mme_level != 0) + return (EINVAL); + break; + + default: + return (EINVAL); + } + } else { + if (mac_mls->mm_single.mme_type != MAC_MLS_TYPE_UNDEF) + return (EINVAL); + } + + if (mac_mls->mm_flags & MAC_MLS_FLAG_RANGE) { + switch (mac_mls->mm_rangelow.mme_type) { + case MAC_MLS_TYPE_LEVEL: + break; + + case MAC_MLS_TYPE_EQUAL: + case MAC_MLS_TYPE_HIGH: + case MAC_MLS_TYPE_LOW: + if (mac_mls->mm_rangelow.mme_level != 0) + return (EINVAL); + break; + + default: + return (EINVAL); + } + + switch (mac_mls->mm_rangehigh.mme_type) { + case MAC_MLS_TYPE_LEVEL: + break; + + case MAC_MLS_TYPE_EQUAL: + case MAC_MLS_TYPE_HIGH: + case MAC_MLS_TYPE_LOW: + if (mac_mls->mm_rangehigh.mme_level != 0) + return (EINVAL); + break; + + default: + return (EINVAL); + } + if (!mac_mls_dominate_element(&mac_mls->mm_rangehigh, + &mac_mls->mm_rangelow)) + return (EINVAL); + } else { + if (mac_mls->mm_rangelow.mme_type != MAC_MLS_TYPE_UNDEF || + mac_mls->mm_rangehigh.mme_type != MAC_MLS_TYPE_UNDEF) + return (EINVAL); + } - between &= mac_mls_element_dominate(&labelrange->m_mls.mm_rangehigh, - &labelsingle->m_mls.mm_single); - between &= mac_mls_element_dominate(&labelsingle->m_mls.mm_single, - &labelrange->m_mls.mm_rangelow); - return (between); + return (0); } static void -mac_mls_init_label(struct mac *label) +mac_mls_set_range(struct mac_mls *mac_mls, u_short typelow, + u_short levellow, u_short typehigh, u_short levelhigh) { - bzero(&label->m_mls, sizeof(label->m_mls)); + mac_mls->mm_rangelow.mme_type = typelow; + mac_mls->mm_rangelow.mme_level = levellow; + mac_mls->mm_rangehigh.mme_type = typehigh; + mac_mls->mm_rangehigh.mme_level = levelhigh; } static void -mac_mls_set_single(struct mac *label, u_short type, u_short level) +mac_mls_set_single(struct mac_mls *mac_mls, u_short type, u_short level) { - label->m_mls.mm_single.mme_type = type; - label->m_mls.mm_single.mme_level = level; - label->m_mls.mm_flags |= MAC_MLS_FLAG_SINGLE; + mac_mls->mm_single.mme_type = type; + mac_mls->mm_single.mme_level = level; + mac_mls->mm_flags |= MAC_MLS_FLAG_SINGLE; } static void -mac_mls_set_range(struct mac *label, u_short typelow, u_short levellow, - u_short typehigh, u_short levelhigh) +mac_mls_copy_range(struct mac_mls *labelfrom, struct mac_mls *labelto) { + KASSERT((labelfrom->mm_flags & MAC_MLS_FLAG_RANGE) != 0, + ("mac_mls_copy_range: labelfrom not range")); - label->m_mls.mm_rangelow.mme_type = typelow; - label->m_mls.mm_rangelow.mme_level = levellow; - label->m_mls.mm_rangehigh.mme_type = typehigh; - label->m_mls.mm_rangehigh.mme_level = levelhigh; - label->m_mls.mm_flags |= MAC_MLS_FLAG_RANGE; + labelto->mm_rangelow = labelfrom->mm_rangelow; + labelto->mm_rangehigh = labelfrom->mm_rangehigh; + labelto->mm_flags |= MAC_MLS_FLAG_RANGE; } static void -mac_mls_copy_label(struct mac *labelfrom, struct mac *labelto) +mac_mls_copy_single(struct mac_mls *labelfrom, struct mac_mls *labelto) { - bcopy(&labelfrom->m_mls, &labelto->m_mls, sizeof(labelto->m_mls)); + KASSERT((labelfrom->mm_flags & MAC_MLS_FLAG_SINGLE) != 0, + ("mac_mls_copy_single: labelfrom not single")); + + labelto->mm_single = labelfrom->mm_single; + labelto->mm_flags |= MAC_MLS_FLAG_SINGLE; } static void -mac_mls_copy_single(struct mac *labelfrom, struct mac *labelto) +mac_mls_copy_single_to_range(struct mac_mls *labelfrom, + struct mac_mls *labelto) { - KASSERT((labelfrom->m_mls.mm_flags & MAC_MLS_FLAG_SINGLE) != 0, - ("mac_mls_copy_single: labelfrom not single")); + KASSERT((labelfrom->mm_flags & MAC_MLS_FLAG_SINGLE) != 0, + ("mac_mls_copy_single_to_range: labelfrom not single")); + + labelto->mm_rangelow = labelfrom->mm_single; + labelto->mm_rangehigh = labelfrom->mm_single; + labelto->mm_flags |= MAC_MLS_FLAG_RANGE; +} + +/* + * Policy module operations. + */ +static void +mac_mls_destroy(struct mac_policy_conf *conf) +{ - bcopy(&labelfrom->m_mls.mm_single, &labelto->m_mls.mm_single, - sizeof(labelto->m_mls.mm_single)); - labelto->m_mls.mm_flags |= MAC_MLS_FLAG_SINGLE; } -#if 0 static void -mac_mls_copy_range(struct mac *labelfrom, struct mac *labelto) +mac_mls_init(struct mac_policy_conf *conf) { - bcopy(&labelfrom->m_mls.mm_rangelow, &labelto->m_mls.mm_rangelow, - sizeof(labelto->m_mls.mm_rangelow)); - bcopy(&labelfrom->m_mls.mm_rangehigh, &labelto->m_mls.mm_rangehigh, - sizeof(labelto->m_mls.mm_rangehigh)); - labelto->m_mls.mm_flags |= MAC_MLS_FLAG_RANGE; } -#endif /* - * Initialize system processes as MAC_MLS_TYPE_EQUAL so that they can - * access any system resource with impunity. + * Label operations. */ static void -mac_mls_create_proc0(struct ucred *cred) +mac_mls_init_bpfdesc(struct bpf_d *bpf_d, struct label *label) +{ + + SLOT(label) = mls_alloc(M_WAITOK); +} + +static void +mac_mls_init_devfsdirent(struct devfs_dirent *devfs_dirent, + struct label *label) { - mac_mls_init_label(&cred->cr_label); - mac_mls_set_single(&cred->cr_label, MAC_MLS_TYPE_EQUAL, 0); - mac_mls_set_range(&cred->cr_label, MAC_MLS_TYPE_LOW, 0, - MAC_MLS_TYPE_HIGH, 0); + SLOT(label) = mls_alloc(M_WAITOK); } -/* - * Initialize user processes as MAC_MLS_TYPE_LOW to allow the user boot - * sequence to rely on low-sensitivity objects. - */ static void -mac_mls_create_proc1(struct ucred *cred) +mac_mls_init_ifnet(struct ifnet *ifnet, struct label *label) { - mac_mls_init_label(&cred->cr_label); - mac_mls_set_single(&cred->cr_label, MAC_MLS_TYPE_LOW, 0); - mac_mls_set_range(&cred->cr_label, MAC_MLS_TYPE_LOW, 0, - MAC_MLS_TYPE_HIGH, 0); + SLOT(label) = mls_alloc(M_WAITOK); } static void -mac_mls_create_subject(struct ucred *cred_parent, struct ucred *cred_child) +mac_mls_init_ipq(struct ipq *ipq, struct label *label) { - mac_mls_copy_label(&cred_parent->cr_label, &cred_child->cr_label); + SLOT(label) = mls_alloc(M_WAITOK); } static int -mac_mls_cred_check_relabel_subject(struct ucred *cred, struct mac *newlabel) +mac_mls_init_mbuf(struct mbuf *mbuf, int how, struct label *label) { - int error, privilege_needed; - error = mac_mls_label_valid(newlabel); - if (error) - return (error); - /* Require both range and single entries for subjects. */ - if ((newlabel->m_mls.mm_flags & MAC_MLS_FLAGS_BOTH) != - MAC_MLS_FLAGS_BOTH) - return (EINVAL); - /* - * Accept the change if: - * o Range is the same as current range. - * o Single is in the current range. - */ - privilege_needed = 0; - if (!mac_mls_element_equal(&cred->cr_label.m_mls.mm_rangehigh, - &newlabel->m_mls.mm_rangehigh)) - privilege_needed = 1; - if (!mac_mls_element_equal(&cred->cr_label.m_mls.mm_rangelow, - &newlabel->m_mls.mm_rangelow)) - privilege_needed = 1; - if (!mac_mls_single_in_range(newlabel, &cred->cr_label)) - privilege_needed = 1; - if (privilege_needed) { - error = suser_cred(cred, 0); - if (error) - return (error); - } + + SLOT(label) = mls_alloc(how); + if (SLOT(label) == NULL) + return (ENOMEM); + return (0); } -static int -mac_mls_cred_check_relabel_vnode(struct ucred *cred, struct vnode *vp, - struct mac *oldlabel, struct mac *newlabel) +static void +mac_mls_init_mount(struct mount *mount, struct label *mntlabel, + struct label *fslabel) +{ + + SLOT(mntlabel) = mls_alloc(M_WAITOK); + SLOT(fslabel) = mls_alloc(M_WAITOK); +} + +static void +mac_mls_init_socket(struct socket *socket, struct label *label, + struct label *peerlabel) +{ + + SLOT(label) = mls_alloc(M_WAITOK); + SLOT(peerlabel) = mls_alloc(M_WAITOK); +} + +static void +mac_mls_init_subject(struct ucred *ucred, struct label *label) +{ + + SLOT(label) = mls_alloc(M_WAITOK); +} + +static void +mac_mls_init_temp(struct label *label) +{ + + SLOT(label) = mls_alloc(M_WAITOK); +} + +static void +mac_mls_init_vnode(struct vnode *vp, struct label *label) +{ + + SLOT(label) = mls_alloc(M_WAITOK); +} + +static void +mac_mls_destroy_bpfdesc(struct bpf_d *bpf_d, struct label *label) +{ + + mls_free(SLOT(label)); + SLOT(label) = NULL; +} + +static void +mac_mls_destroy_devfsdirent(struct devfs_dirent *devfs_dirent, + struct label *label) +{ + + mls_free(SLOT(label)); + SLOT(label) = NULL; +} + +static void +mac_mls_destroy_ifnet(struct ifnet *ifnet, struct label *label) +{ + + mls_free(SLOT(label)); + SLOT(label) = NULL; +} + +static void +mac_mls_destroy_ipq(struct ipq *ipq, struct label *label) +{ + + mls_free(SLOT(label)); + SLOT(label) = NULL; +} + +static void +mac_mls_destroy_mbuf(struct mbuf *mbuf, struct label *label) { - int error, privilege_needed; - error = mac_mls_label_valid(newlabel); - if (error) - return (error); - /* Only single labels for vnodes. */ - if ((newlabel->m_mls.mm_flags & MAC_MLS_FLAGS_BOTH) != - MAC_MLS_FLAG_SINGLE) - return (EINVAL); - /* - * Accept the change if: - * o Old label is in the current subject range. - * o New label is in the current subject range. - */ - privilege_needed = 0; - if (!(mac_mls_single_in_range(oldlabel, &cred->cr_label))) - privilege_needed = 1; - if (!(mac_mls_single_in_range(newlabel, &cred->cr_label))) - privilege_needed = 1; - if (privilege_needed) { - error = suser_cred(cred, 0); - if (error) - return (error); - } - return (0); + mls_free(SLOT(label)); + SLOT(label) = NULL; } static void -mac_mls_relabel_subject(struct ucred *cred, struct mac *newlabel) +mac_mls_destroy_mount(struct mount *mount, struct label *mntlabel, + struct label *fslabel) { - mac_mls_copy_label(newlabel, &cred->cr_label); + mls_free(SLOT(mntlabel)); + SLOT(mntlabel) = NULL; + mls_free(SLOT(fslabel)); + SLOT(fslabel) = NULL; } -static int -mac_mls_ifnet_check_send_mbuf(struct ifnet *ifnet, struct mbuf *m) +static void +mac_mls_destroy_socket(struct socket *socket, struct label *label, + struct label *peerlabel) { - if (!mac_mls_enabled) - return (0); - if (mac_mls_single_in_range(&m->m_pkthdr.label, &ifnet->if_label)) - return (0); - else - return (EPERM); + mls_free(SLOT(label)); + SLOT(label) = NULL; + mls_free(SLOT(peerlabel)); + SLOT(peerlabel) = NULL; } -static int -mac_mls_bpfdesc_check_receive_from_ifnet(struct bpf_d *bpf_d, - struct ifnet *ifnet) +static void +mac_mls_destroy_subject(struct ucred *ucred, struct label *label) { - if (!mac_mls_enabled) - return (0); - if (mac_mls_single_equal(&bpf_d->bd_label, &ifnet->if_label)) - return (0); - else - return (EPERM); + mls_free(SLOT(label)); + SLOT(label) = NULL; } -static int -mac_mls_socket_check_receive_mbuf(struct socket *so, struct mbuf *m) +static void +mac_mls_destroy_temp(struct label *label) { - if (!mac_mls_enabled) - return (0); - if (mac_mls_single_equal(&so->so_label, &m->m_pkthdr.label)) - return (0); - else - return (EPERM); + mls_free(SLOT(label)); + SLOT(label) = NULL; } static void -mac_mls_create_ifnet(struct ifnet *ifnet) +mac_mls_destroy_vnode(struct vnode *vp, struct label *label) +{ + + mls_free(SLOT(label)); + SLOT(label) = NULL; +} + +static int +mac_mls_externalize(struct label *label, struct mac *extmac) { - int interface_label_type; + struct mac_mls *mac_mls; + + mac_mls = SLOT(label); + + if (mac_mls == NULL) { + printf("mac_mls_externalize: NULL pointer\n"); + return (0); + } + + extmac->m_mls = *mac_mls; - if (ifnet->if_type == IFT_LOOP) - interface_label_type = MAC_MLS_TYPE_EQUAL; - else - interface_label_type = MAC_MLS_TYPE_LOW; - mac_mls_init_label(&ifnet->if_label); - mac_mls_set_single(&ifnet->if_label, interface_label_type, 0); - mac_mls_set_range(&ifnet->if_label, interface_label_type, 0, - interface_label_type, 0); + return (0); } static int -mac_mls_cred_check_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, - struct mac *newlabel) +mac_mls_internalize(struct label *label, struct mac *extmac) { + struct mac_mls *mac_mls; int error; - error = mac_mls_label_valid(newlabel); + mac_mls = SLOT(label); + + error = mac_mls_valid(mac_mls); if (error) return (error); - /* Require both single and range for interfaces. */ - if ((newlabel->m_mls.mm_flags & MAC_MLS_FLAGS_BOTH) != - MAC_MLS_FLAGS_BOTH) - return (EINVAL); - return (suser_cred(cred, 0)); + + *mac_mls = extmac->m_mls; + + return (0); } +/* + * Labeling event operations: file system objects, and things that look + * a lot like file system objects. + */ static void -mac_mls_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, - struct mac *newlabel) +mac_mls_create_devfs_device(dev_t dev, struct devfs_dirent *devfs_dirent, + struct label *label) { + struct mac_mls *mac_mls; + int mls_type; - mac_mls_copy_label(newlabel, &ifnet->if_label); + mac_mls = SLOT(label); + if (strcmp(dev->si_name, "null") == 0 || + strcmp(dev->si_name, "zero") == 0 || + strcmp(dev->si_name, "random") == 0 || + strncmp(dev->si_name, "fd/", strlen("fd/")) == 0) + mls_type = MAC_MLS_TYPE_EQUAL; + else if (strcmp(dev->si_name, "kmem") == 0 || + strcmp(dev->si_name, "mem") == 0) + mls_type = MAC_MLS_TYPE_HIGH; + else + mls_type = MAC_MLS_TYPE_LOW; + mac_mls_set_single(mac_mls, mls_type, 0); } static void -mac_mls_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d) +mac_mls_create_devfs_directory(char *dirname, int dirnamelen, + struct devfs_dirent *devfs_dirent, struct label *label) { + struct mac_mls *mac_mls; - mac_mls_init_label(&bpf_d->bd_label); - mac_mls_copy_single(&cred->cr_label, &bpf_d->bd_label); + mac_mls = SLOT(label); + mac_mls_set_single(mac_mls, MAC_MLS_TYPE_HIGH, 0); } static void -mac_mls_create_mbuf_datagram_from_mbuf_fragmentqueue( - struct mbuf *fragmentqueue, struct mbuf *datagram) +mac_mls_create_devfs_vnode(struct devfs_dirent *devfs_dirent, + struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { + struct mac_mls *source, *dest; - mac_mls_init_label(&datagram->m_pkthdr.label); - mac_mls_copy_single(&fragmentqueue->m_pkthdr.label, - &datagram->m_pkthdr.label); + source = SLOT(direntlabel); + dest = SLOT(vnodelabel); + mac_mls_copy_single(source, dest); } static void -mac_mls_create_mbuf_fragment_from_mbuf(struct mbuf *mbuf, - struct mbuf *fragment) +mac_mls_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, + struct label *parentlabel, struct vnode *child, + struct label *childlabel) { + struct mac_mls *source, *dest; - mac_mls_init_label(&fragment->m_pkthdr.label); - mac_mls_copy_single(&mbuf->m_pkthdr.label, &fragment->m_pkthdr.label); + source = SLOT(&cred->cr_label); + dest = SLOT(childlabel); + + mac_mls_copy_single(source, dest); } static void -mac_mls_create_mbuf_fragmentqueue_from_mbuf_fragment(struct mbuf *fragment, - struct mbuf *fragmentqueue) +mac_mls_create_mount(struct ucred *cred, struct mount *mp, + struct label *mntlabel, struct label *fslabel) { + struct mac_mls *source, *dest; - mac_mls_init_label(&fragmentqueue->m_pkthdr.label); - mac_mls_copy_single(&fragment->m_pkthdr.label, - &fragmentqueue->m_pkthdr.label); + source = SLOT(&cred->cr_label); + dest = SLOT(mntlabel); + mac_mls_copy_single(source, dest); + dest = SLOT(fslabel); + mac_mls_copy_single(source, dest); } static void -mac_mls_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf) +mac_mls_create_root_mount(struct ucred *cred, struct mount *mp, + struct label *mntlabel, struct label *fslabel) { + struct mac_mls *mac_mls; - mac_mls_init_label(&newmbuf->m_pkthdr.label); - mac_mls_copy_single(&oldmbuf->m_pkthdr.label, - &newmbuf->m_pkthdr.label); + /* Always mount root as high integrity. */ + mac_mls = SLOT(fslabel); + mac_mls_set_single(mac_mls, MAC_MLS_TYPE_LOW, 0); + mac_mls = SLOT(mntlabel); + mac_mls_set_single(mac_mls, MAC_MLS_TYPE_LOW, 0); } static void -mac_mls_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct mbuf *mbuf) +mac_mls_relabel_vnode(struct ucred *cred, struct vnode *vp, + struct label *vnodelabel, struct label *label) { + struct mac_mls *source, *dest; - mac_mls_init_label(&mbuf->m_pkthdr.label); - mac_mls_set_single(&mbuf->m_pkthdr.label, MAC_MLS_TYPE_EQUAL, 0); + source = SLOT(label); + dest = SLOT(vnodelabel); + + mac_mls_copy_single(source, dest); } static void -mac_mls_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *m) +mac_mls_update_devfsdirent_from_vnode(struct devfs_dirent *devfs_dirent, + struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { + struct mac_mls *source, *dest; - mac_mls_init_label(&m->m_pkthdr.label); - mac_mls_copy_single(&ifnet->if_label, &m->m_pkthdr.label); + source = SLOT(vnodelabel); + dest = SLOT(direntlabel); + + mac_mls_copy_single(source, dest); } static void -mac_mls_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, - struct ifnet *ifnet, struct mbuf *newmbuf) +mac_mls_update_procfsvnode_from_subject(struct vnode *vp, + struct label *vnodelabel, struct ucred *cred) { + struct mac_mls *source, *dest; - mac_mls_init_label(&newmbuf->m_pkthdr.label); - mac_mls_copy_single(&oldmbuf->m_pkthdr.label, - &newmbuf->m_pkthdr.label); + source = SLOT(&cred->cr_label); + dest = SLOT(vnodelabel); + + /* + * Only copy the single, not the range, since vnodes only have + * a single. + */ + mac_mls_copy_single(source, dest); } static void -mac_mls_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, - struct mbuf *newmbuf) +mac_mls_update_vnode_from_externalized(struct vnode *vp, + struct label *vnodelabel, struct mac *extmac) { + struct mac_mls *source, *dest; - mac_mls_init_label(&newmbuf->m_pkthdr.label); - mac_mls_copy_single(&oldmbuf->m_pkthdr.label, - &newmbuf->m_pkthdr.label); + /* XXX: Validity check. */ + source = &extmac->m_mls; + dest = SLOT(vnodelabel); + + mac_mls_copy_single(source, dest); } -static int -mac_mls_mbuf_fragment_matches_mbuf_fragmentqueue(struct mbuf *fragment, - struct mbuf *fragmentqueue) +static void +mac_mls_update_vnode_from_mount(struct vnode *vp, struct label *vnodelabel, + struct mount *mp, struct label *fslabel) { + struct mac_mls *source, *dest; + + source = SLOT(fslabel); + dest = SLOT(vnodelabel); - return (mac_mls_single_equal(&fragment->m_pkthdr.label, - &fragmentqueue->m_pkthdr.label)); + mac_mls_copy_single(source, dest); } +/* + * Labeling event operations: IPC object. + */ static void -mac_mls_create_mbuf_from_socket(struct socket *so, struct mbuf *m) +mac_mls_create_mbuf_from_socket(struct socket *so, struct label *socketlabel, + struct mbuf *m, struct label *mbuflabel) { + struct mac_mls *source, *dest; + + source = SLOT(socketlabel); + dest = SLOT(mbuflabel); - mac_mls_init_label(&m->m_pkthdr.label); - mac_mls_copy_single(&so->so_label, &m->m_pkthdr.label); + mac_mls_copy_single(source, dest); } >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 1 21:25:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCD7637B408; Sat, 1 Jun 2002 21:25:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CFCDC37B407 for ; Sat, 1 Jun 2002 21:25:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g524Pdb89752 for perforce@freebsd.org; Sat, 1 Jun 2002 21:25:39 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Date: Sat, 1 Jun 2002 21:25:39 -0700 (PDT) Message-Id: <200206020425.g524Pdb89752@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 12288 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12288 Change 12288 by amigus@amigus_vmganyopa on 2002/06/01 21:25:01 This comment belonged to an already removed suser_cred() check. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#25 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#25 (text+ko) ==== @@ -1282,9 +1282,6 @@ break; #ifdef MAC case SO_LABEL: - /* - * XXX: This will probably have to be removed soon. - */ error = sooptcopyin(sopt, &extmac, sizeof extmac, sizeof extmac); if (error) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 2 22:32:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CE4F37B407; Sun, 2 Jun 2002 22:32:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8160437B401 for ; Sun, 2 Jun 2002 22:32:06 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g535W6667707 for perforce@freebsd.org; Sun, 2 Jun 2002 22:32:06 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 2 Jun 2002 22:32:06 -0700 (PDT) Message-Id: <200206030532.g535W6667707@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 12315 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12315 Change 12315 by marcel@marcel_vaio on 2002/06/02 22:31:39 Enhance the migrate command some more: o Add option -s to migrate a FreeBSD slice to a FreeBSD disklabel partition (as was done until now). o Turn the MBR into a Protective MBR unless -k (keep) is given. o Create GPT-based partitions by migrating FreeBSD disklabels into GPT partitions. This is the default now. Affected files ... ... //depot/projects/ia64/sbin/gpt/gpt.c#8 edit ... //depot/projects/ia64/sbin/gpt/gpt.h#5 edit ... //depot/projects/ia64/sbin/gpt/map.c#4 edit ... //depot/projects/ia64/sbin/gpt/migrate.c#2 edit ... //depot/projects/ia64/sbin/gpt/mkdisk.sh#2 edit Differences ... ==== //depot/projects/ia64/sbin/gpt/gpt.c#8 (text+ko) ==== @@ -140,7 +140,7 @@ return buf; } -static void* +void* gpt_read(int fd, off_t lba, size_t count) { off_t ofs; @@ -344,10 +344,12 @@ "%s: MBR partition: type=%d, start=%llu, size=%llu", device_name, mbr->mbr_part[i].part_typ, (long long)start, (long long)size); - m = map_add(start, size, MAP_TYPE_MBR_PART, - NULL); - if (m == NULL) - goto close; + if (mbr->mbr_part[i].part_typ != 0xee) { + m = map_add(start, size, + MAP_TYPE_MBR_PART, NULL); + if (m == NULL) + goto close; + } } } } else { ==== //depot/projects/ia64/sbin/gpt/gpt.h#5 (text+ko) ==== @@ -58,6 +58,7 @@ uint32_t crc32(const void *, size_t); void gpt_close(int); int gpt_open(const char *); +void* gpt_read(int, off_t, size_t); int gpt_write(int, map_t *); void unicode16(short *, const wchar_t *, size_t); ==== //depot/projects/ia64/sbin/gpt/map.c#4 (text+ko) ==== ==== //depot/projects/ia64/sbin/gpt/migrate.c#2 (text+ko) ==== @@ -27,6 +27,7 @@ */ #include +#include #include #include @@ -40,17 +41,69 @@ #include "map.h" #include "gpt.h" -int keep; +int keep, slice; static void usage_migrate(void) { fprintf(stderr, - "usage: %s [-k] device\n", getprogname()); + "usage: %s [-ks] device\n", getprogname()); exit(1); } +static struct gpt_ent* +migrate_disklabel(int fd, off_t start, struct gpt_ent *ent) +{ + char *buf; + struct disklabel *dl; + int i; + + buf = gpt_read(fd, start + LABELSECTOR, 1); + dl = (void*)(buf + LABELOFFSET); + + if (dl->d_magic != DISKMAGIC || dl->d_magic2 != DISKMAGIC) { + warnx("%s: warning: FreeBSD slice without disklabel", + device_name); + return (ent); + } + + for (i = 0; i < dl->d_npartitions; i++) { + switch (dl->d_partitions[i].p_fstype) { + case FS_SWAP: { + uuid_t swap = GPT_ENT_TYPE_FREEBSD_SWAP; + ent->ent_type = swap; + unicode16(ent->ent_name, + L"FreeBSD swap partition", 36); + break; + } + case FS_BSDFFS: { + uuid_t ufs = GPT_ENT_TYPE_FREEBSD_UFS; + ent->ent_type = ufs; + unicode16(ent->ent_name, + L"FreeBSD UFS partition", 36); + break; + } + case FS_VINUM: { + uuid_t vinum = GPT_ENT_TYPE_FREEBSD_VINUM; + ent->ent_type = vinum; + unicode16(ent->ent_name, + L"FreeBSD vinum partition", 36); + break; + } + default: + continue; + } + + ent->ent_lba_start = dl->d_partitions[i].p_offset; + ent->ent_lba_end = ent->ent_lba_start + + dl->d_partitions[i].p_size - 1LL; + ent++; + } + + return (ent); +} + static void migrate(int fd) { @@ -75,12 +128,6 @@ mbr = map->map_data; - if (verbose) { - printf("\tBefore image:\n"); - map_dump(); - putchar('\n'); - } - if (map_find(MAP_TYPE_PRI_GPT_HDR) != NULL || map_find(MAP_TYPE_SEC_GPT_HDR) != NULL) { warnx("%s: error: device already contains a GPT", device_name); @@ -159,30 +206,37 @@ /* Mirror partitions. */ for (i = 0; i < 4; i++) { + start = mbr->mbr_part[i].part_start_hi; + start = (start << 16) + mbr->mbr_part[i].part_start_lo; + size = mbr->mbr_part[i].part_size_hi; + size = (size << 16) + mbr->mbr_part[i].part_size_lo; + switch (mbr->mbr_part[i].part_typ) { case 165: { /* FreeBSD */ - uuid_t freebsd = GPT_ENT_TYPE_FREEBSD; - ent->ent_type = freebsd; - unicode16(ent->ent_name, - L"FreeBSD disklabel partition", 36); + if (slice) { + uuid_t freebsd = GPT_ENT_TYPE_FREEBSD; + ent->ent_type = freebsd; + ent->ent_lba_start = start; + ent->ent_lba_end = start + size - 1LL; + unicode16(ent->ent_name, + L"FreeBSD disklabel partition", 36); + ent++; + } else + ent = migrate_disklabel(fd, start, ent); break; } case 239: { /* EFI */ uuid_t efi_slice = GPT_ENT_TYPE_EFI; ent->ent_type = efi_slice; + ent->ent_lba_start = start; + ent->ent_lba_end = start + size - 1LL; unicode16(ent->ent_name, L"EFI system partition", 36); + ent++; break; } default: continue; } - start = mbr->mbr_part[i].part_start_hi; - start = (start << 16) + mbr->mbr_part[i].part_start_lo; - size = mbr->mbr_part[i].part_size_hi; - size = (size << 16) + mbr->mbr_part[i].part_size_lo; - ent->ent_lba_start = start; - ent->ent_lba_end = start + size - 1LL; - ent++; } ent = tbl->map_data; @@ -206,10 +260,29 @@ gpt_write(fd, lbt); gpt_write(fd, tpg); - if (verbose) { - printf("\tAfter image:\n"); - map_dump(); - putchar('\n'); + if (!keep) { + map = map_find(MAP_TYPE_MBR); + mbr = map->map_data; + /* + * Turn the MBR into a Protective MBR. + */ + bzero(mbr->mbr_part, sizeof(mbr->mbr_part)); + mbr->mbr_part[0].part_shd = 0xff; + mbr->mbr_part[0].part_ssect = 0xff; + mbr->mbr_part[0].part_scyl = 0xff; + mbr->mbr_part[0].part_typ = 0xee; + mbr->mbr_part[0].part_ehd = 0xff; + mbr->mbr_part[0].part_esect = 0xff; + mbr->mbr_part[0].part_ecyl = 0xff; + mbr->mbr_part[0].part_start_lo = 1; + if (mediasz > 0xffffffff) { + mbr->mbr_part[0].part_size_lo = 0xffff; + mbr->mbr_part[0].part_size_hi = 0xffff; + } else { + mbr->mbr_part[0].part_size_lo = mediasz & 0xffff; + mbr->mbr_part[0].part_size_hi = mediasz >> 16; + } + gpt_write(fd, map); } } @@ -219,11 +292,14 @@ int ch, fd; /* Get the migrate options */ - while ((ch = getopt(argc, argv, "k")) != -1) { + while ((ch = getopt(argc, argv, "ks")) != -1) { switch(ch) { case 'k': keep = 1; break; + case 's': + slice = 1; + break; default: usage_migrate(); } ==== //depot/projects/ia64/sbin/gpt/mkdisk.sh#2 (text+ko) ==== @@ -1,9 +1,10 @@ #!/bin/sh -dd if=/dev/zero of=disk count=4096 +dd if=/dev/zero of=disk count=125307 sudo mdconfig -a -t vnode -f disk -u 4 sudo fdisk -f - md4 <; Mon, 3 Jun 2002 04:48:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g53BmsO31383 for perforce@freebsd.org; Mon, 3 Jun 2002 04:48:54 -0700 (PDT) (envelope-from tmm@freebsd.org) Date: Mon, 3 Jun 2002 04:48:54 -0700 (PDT) Message-Id: <200206031148.g53BmsO31383@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f From: Thomas Moestl Subject: PERFORCE change 12319 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12319 Change 12319 by tmm@tmm_sparc64 on 2002/06/03 04:48:51 Make this compile and fix a warning in the !GEM_DEBUG case. The GEMTR macros used for this are a bit clumsy, but I want to keep the traces in for a while without them getting in the way. Don't define GEM_DEBUG by default any more. Affected files ... ... //depot/projects/sparc64/sys/dev/gem/if_gem.c#16 edit Differences ... ==== //depot/projects/sparc64/sys/dev/gem/if_gem.c#16 (text+ko) ==== @@ -32,8 +32,6 @@ * Driver for Sun GEM ethernet controllers. */ -#define GEM_DEBUG - #include #include #include @@ -106,8 +104,20 @@ printf x #include #define KTR_GEM KTR_CT2 +#define GEMTR0(s) CTR0(KTR_GEM, s) +#define GEMTR1(s, a1) CTR1(KTR_GEM, s, a1) +#define GEMTR2(s, a1, a2) CTR2(KTR_GEM, s, a1, a2) +#define GEMTR3(s, a1, a2, a3) CTR3(KTR_GEM, s, a1, a2, a3) +#define GEMTR4(s, a1, a2, a3, a4) CTR4(KTR_GEM, s, a1, a2, a3, a4) +#define GEMTR5(s, a1, a2, a3, a4, a5) CTR5(KTR_GEM, s, a1, a2, a3, a4, a5) #else #define DPRINTF(sc, x) /* nothing */ +#define GEMTR0(s) +#define GEMTR1(s, a1) +#define GEMTR2(s, a1, a2) +#define GEMTR3(s, a1, a2, a3) +#define GEMTR4(s, a1, a2, a3, a4) +#define GEMTR5(s, a1, a2, a3, a4, a5) #endif #define GEM_NSEGS GEM_NTXSEGS @@ -399,7 +409,7 @@ "%lx, addr %#lx (%#lx)\n", seg, tx->txd_nexttx, segs[seg].ds_len, segs[seg].ds_addr, GEM_DMA_WRITE(tx->txd_sc, segs[seg].ds_addr))); - CTR5(KTR_GEM, "txdma_cb: mapping seg %d (txd %d), len " + GEMTR5("txdma_cb: mapping seg %d (txd %d), len " "%lx, addr %#lx (%#lx)", seg, tx->txd_nexttx, segs[seg].ds_len, segs[seg].ds_addr, GEM_DMA_WRITE(tx->txd_sc, segs[seg].ds_addr)); @@ -413,12 +423,12 @@ GEM_DMA_WRITE(tx->txd_sc, segs[seg].ds_addr); flags = segs[seg].ds_len & GEM_TD_BUFSIZE; if ((tx->txd_flags & GTXD_FIRST) != 0 && seg == 0) { - CTR2(KTR_GEM, "txdma_cb: start of packet at seg %d, " + GEMTR2("txdma_cb: start of packet at seg %d, " "tx %d", seg, tx->txd_nexttx); flags |= GEM_TD_START_OF_PACKET; } if ((tx->txd_flags & GTXD_LAST) != 0 && seg == nsegs - 1) { - CTR2(KTR_GEM, "txdma_cb: end of packet at seg %d, " + GEMTR2("txdma_cb: end of packet at seg %d, " "tx %d", seg, tx->txd_nexttx); flags |= GEM_TD_END_OF_PACKET; } @@ -470,7 +480,7 @@ s = splnet(); DPRINTF(sc, ("%s: gem_reset\n", device_get_name(sc->sc_dev))); - CTR1(KTR_GEM, "%s: gem_reset", device_get_name(sc->sc_dev)); + GEMTR1("%s: gem_reset", device_get_name(sc->sc_dev)); gem_reset_rx(sc); gem_reset_tx(sc); @@ -516,7 +526,7 @@ struct gem_txsoft *txs; DPRINTF(sc, ("%s: gem_stop\n", device_get_name(sc->sc_dev))); - CTR1(KTR_GEM, "%s: gem_stop", device_get_name(sc->sc_dev)); + GEMTR1("%s: gem_stop", device_get_name(sc->sc_dev)); callout_stop(&sc->sc_tick_ch); @@ -768,7 +778,7 @@ s = splnet(); DPRINTF(sc, ("%s: gem_init: calling stop\n", device_get_name(sc->sc_dev))); - CTR1(KTR_GEM, "%s: gem_init: calling stop", device_get_name(sc->sc_dev)); + GEMTR1("%s: gem_init: calling stop", device_get_name(sc->sc_dev)); /* * Initialization sequence. The numbered steps below correspond * to the sequence outlined in section 6.3.5.1 in the Ethernet @@ -780,7 +790,7 @@ gem_stop(&sc->sc_arpcom.ac_if, 0); gem_reset(sc); DPRINTF(sc, ("%s: gem_init: restarting\n", device_get_name(sc->sc_dev))); - CTR1(KTR_GEM, "%s: gem_init: restarting", device_get_name(sc->sc_dev)); + GEMTR1("%s: gem_init: restarting", device_get_name(sc->sc_dev)); /* Re-initialize the MIF */ gem_mifinit(sc); @@ -810,7 +820,7 @@ bus_space_write_4(t, h, GEM_RX_RING_PTR_LO, GEM_CDRXADDR(sc, 0)); DPRINTF(sc, ("loading rx ring %lx, tx ring %lx, cddma %lx\n", GEM_CDRXADDR(sc, 0), GEM_CDTXADDR(sc, 0), sc->sc_cddma)); - CTR3(KTR_GEM, "loading rx ring %lx, tx ring %lx, cddma %lx", + GEMTR3("loading rx ring %lx, tx ring %lx, cddma %lx", GEM_CDRXADDR(sc, 0), GEM_CDTXADDR(sc, 0), sc->sc_cddma); /* step 8. Global Configuration & Interrupt Mask */ @@ -949,7 +959,7 @@ txs->txs_firstdesc = txj->txj_nexttx; txs->txs_lastdesc = txd.txd_lasttx; txs->txs_ndescs = txd.txd_nsegs; - CTR3(KTR_GEM, "load_mbuf: setting firstdesc=%d, lastdesc=%d, " + GEMTR3("load_mbuf: setting firstdesc=%d, lastdesc=%d, " "ndescs=%d", txs->txs_firstdesc, txs->txs_lastdesc, txs->txs_ndescs); STAILQ_REMOVE_HEAD(&sc->sc_txfreeq, txs_q); @@ -962,7 +972,7 @@ return (0); fail: - CTR1(KTR_GEM, "gem_dmamap_load_mbuf failed (%d)", error); + GEMTR1("gem_dmamap_load_mbuf failed (%d)", error); gem_dmamap_unload_mbuf(sc, txj); return (error); } @@ -1088,7 +1098,10 @@ struct gem_softc *sc = (struct gem_softc *)ifp->if_softc; struct mbuf *m0 = NULL, *m; struct gem_txjob txj; - int firsttx, ofree, seg, ntx, txmfail; + int firsttx, ofree, ntx, txmfail; +#ifdef GEM_DEBUG + int seg; +#endif if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING) return; @@ -1102,7 +1115,7 @@ DPRINTF(sc, ("%s: gem_start: txfree %d, txnext %d\n", device_get_name(sc->sc_dev), ofree, firsttx)); - CTR3(KTR_GEM, "%s: gem_start: txfree %d, txnext %d", + GEMTR3("%s: gem_start: txfree %d, txnext %d", device_get_name(sc->sc_dev), ofree, firsttx); txj.txj_nexttx = firsttx; @@ -1236,7 +1249,7 @@ if (ntx > 0) { DPRINTF(sc, ("%s: packets enqueued, IC on %d, OWN on %d\n", device_get_name(sc->sc_dev), txj.txj_lasttx, firsttx)); - CTR3(KTR_GEM, "%s: packets enqueued, IC on %d, OWN on %d", + GEMTR3("%s: packets enqueued, IC on %d, OWN on %d", device_get_name(sc->sc_dev), txj.txj_lasttx, firsttx); /* * The entire packet chain is set up. @@ -1244,7 +1257,7 @@ */ DPRINTF(sc, ("%s: gem_start: kicking tx %d\n", device_get_name(sc->sc_dev), txj.txj_nexttx)); - CTR3(KTR_GEM, "%s: gem_start: kicking tx %d=%d", + GEMTR3("%s: gem_start: kicking tx %d=%d", device_get_name(sc->sc_dev), txj.txj_nexttx, sc->sc_txnext); bus_space_write_4(sc->sc_bustag, sc->sc_h, GEM_TX_KICK, @@ -1254,7 +1267,7 @@ ifp->if_timer = 5; DPRINTF(sc, ("%s: gem_start: watchdog %d\n", device_get_name(sc->sc_dev), ifp->if_timer)); - CTR2(KTR_GEM, "%s: gem_start: watchdog %d", + GEMTR2("%s: gem_start: watchdog %d", device_get_name(sc->sc_dev), ifp->if_timer); } } @@ -1274,7 +1287,7 @@ DPRINTF(sc, ("%s: gem_tint\n", device_get_name(sc->sc_dev))); - CTR1(KTR_GEM, "%s: gem_tint", device_get_name(sc->sc_dev)); + GEMTR1("%s: gem_tint", device_get_name(sc->sc_dev)); /* * Unload collision counters @@ -1329,7 +1342,7 @@ DPRINTF(sc, ("gem_tint: txs->txs_lastdesc = %d, txlast = %d\n", txs->txs_lastdesc, txlast)); - CTR3(KTR_GEM, "gem_tint: txs->txs_firstdesc = %d, " + GEMTR3("gem_tint: txs->txs_firstdesc = %d, " "txs->txs_lastdesc = %d, txlast = %d", txs->txs_firstdesc, txs->txs_lastdesc, txlast); if (txs->txs_firstdesc <= txs->txs_lastdesc) { @@ -1344,7 +1357,7 @@ } DPRINTF(sc, ("gem_tint: releasing a desc\n")); - CTR0(KTR_GEM, "gem_tint: releasing a desc"); + GEMTR0("gem_tint: releasing a desc"); STAILQ_REMOVE_HEAD(&sc->sc_txdirtyq, txs_q); sc->sc_txfree += txs->txs_ndescs; @@ -1371,7 +1384,7 @@ bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_DATA_PTR_LO), bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_COMPLETION))); - CTR3(KTR_GEM, "gem_tint: GEM_TX_STATE_MACHINE %x " + GEMTR3("gem_tint: GEM_TX_STATE_MACHINE %x " "GEM_TX_DATA_PTR %llx " "GEM_TX_COMPLETION %x", bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_STATE_MACHINE), @@ -1387,7 +1400,7 @@ DPRINTF(sc, ("%s: gem_tint: watchdog %d\n", device_get_name(sc->sc_dev), ifp->if_timer)); - CTR2(KTR_GEM, "%s: gem_tint: watchdog %d", + GEMTR2("%s: gem_tint: watchdog %d", device_get_name(sc->sc_dev), ifp->if_timer); /* Freed some descriptors, so reset IFF_OACTIVE and restart. */ @@ -1421,13 +1434,13 @@ callout_stop(&sc->sc_rx_ch); DPRINTF(sc, ("%s: gem_rint\n", device_get_name(sc->sc_dev))); - CTR1(KTR_GEM, "%s: gem_rint", device_get_name(sc->sc_dev)); + GEMTR1("%s: gem_rint", device_get_name(sc->sc_dev)); /* * XXXX Read the lastrx only once at the top for speed. */ DPRINTF(sc, ("gem_rint: sc->rxptr %d, complete %d\n", sc->sc_rxptr, bus_space_read_4(t, h, GEM_RX_COMPLETION))); - CTR2(KTR_GEM, "gem_rint: sc->rxptr %d, complete %d", + GEMTR2("gem_rint: sc->rxptr %d, complete %d", sc->sc_rxptr, bus_space_read_4(t, h, GEM_RX_COMPLETION)); for (i = sc->sc_rxptr; i != bus_space_read_4(t, h, GEM_RX_COMPLETION); i = GEM_NEXTRX(i)) { @@ -1507,7 +1520,7 @@ DPRINTF(sc, ("gem_rint: done sc->rxptr %d, complete %d\n", sc->sc_rxptr, bus_space_read_4(t, h, GEM_RX_COMPLETION))); - CTR2(KTR_GEM, "gem_rint: done sc->rxptr %d, complete %d", + GEMTR2("gem_rint: done sc->rxptr %d, complete %d", sc->sc_rxptr, bus_space_read_4(t, h, GEM_RX_COMPLETION)); } @@ -1592,7 +1605,7 @@ DPRINTF(sc, ("%s: gem_intr: cplt %x, status %x\n", device_get_name(sc->sc_dev), (status>>19), (u_int)status)); - CTR3(KTR_GEM, "%s: gem_intr: cplt %x, status %x", + GEMTR3("%s: gem_intr: cplt %x, status %x", device_get_name(sc->sc_dev), (status>>19), (u_int)status); @@ -1634,12 +1647,12 @@ bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_RX_CONFIG), bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_RX_STATUS), bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_RX_CONFIG))); - CTR3(KTR_GEM, "gem_watchdog: GEM_RX_CONFIG %x GEM_MAC_RX_STATUS %x " + GEMTR3("gem_watchdog: GEM_RX_CONFIG %x GEM_MAC_RX_STATUS %x " "GEM_MAC_RX_CONFIG %x", bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_RX_CONFIG), bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_RX_STATUS), bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_RX_CONFIG)); - CTR3(KTR_GEM, "gem_watchdog: GEM_TX_CONFIG %x GEM_MAC_TX_STATUS %x " + GEMTR3("gem_watchdog: GEM_TX_CONFIG %x GEM_MAC_TX_STATUS %x " "GEM_MAC_TX_CONFIG %x", bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_CONFIG), bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_MAC_TX_STATUS), To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 3 9:45:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7B0437B404; Mon, 3 Jun 2002 09:43:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 19AE337B400 for ; Mon, 3 Jun 2002 09:43:03 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g53GgwU95449 for perforce@freebsd.org; Mon, 3 Jun 2002 09:42:58 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 3 Jun 2002 09:42:58 -0700 (PDT) Message-Id: <200206031642.g53GgwU95449@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 12325 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12325 Change 12325 by peter@peter_overcee on 2002/06/03 09:42:24 IFC @12324 Affected files ... ... //depot/projects/ia64/MAINTAINERS#8 integrate ... //depot/projects/ia64/Makefile#10 integrate ... //depot/projects/ia64/Makefile.inc1#30 integrate ... //depot/projects/ia64/UPDATING#13 integrate ... //depot/projects/ia64/bin/dd/dd.1#3 integrate ... //depot/projects/ia64/bin/expr/expr.1#5 integrate ... //depot/projects/ia64/bin/kill/kill.1#2 integrate ... //depot/projects/ia64/bin/ln/ln.c#4 integrate ... //depot/projects/ia64/bin/ln/symlink.7#4 integrate ... //depot/projects/ia64/bin/ls/ls.1#9 integrate ... //depot/projects/ia64/bin/rm/rm.c#5 integrate ... //depot/projects/ia64/bin/sh/histedit.c#3 integrate ... //depot/projects/ia64/bin/sh/jobs.c#5 integrate ... //depot/projects/ia64/bin/sh/jobs.h#3 integrate ... //depot/projects/ia64/bin/sh/main.c#3 integrate ... //depot/projects/ia64/bin/sh/sh.1#6 integrate ... //depot/projects/ia64/bin/sh/var.c#3 integrate ... //depot/projects/ia64/bin/sh/var.h#3 integrate ... //depot/projects/ia64/bin/sync/sync.8#2 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/i386.h#4 integrate ... //depot/projects/ia64/crypto/heimdal/lib/des/COPYRIGHT#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/ChangeLog#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/DES.pm#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/DES.pod#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/DES.xs#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/FILES#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/INSTALL#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/Imakefile#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/KERBEROS#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/MODES.DES#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/Makefile.PL#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/Makefile.am#3 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/Makefile.in#3 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/Makefile.ssl#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/Makefile.uni#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/PC1#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/PC2#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/README#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/VERSION#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/asm/des-som2.pl#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/asm/des-som3.pl#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/asm/des586.pl#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/asm/des686.pl#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/asm/desboth.pl#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/asm/dx86-cpp.s#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/asm/dx86unix.cpp#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/asm/readme#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/asm/win32.asm#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/asm/win32.uu#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/asm/x86ms.pl#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/asm/x86unix.pl#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/cbc3_enc.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/cbc_cksm.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/cbc_enc.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/cfb64ede.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/cfb64enc.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/cfb_enc.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des.1#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des.def#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des.doc#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des.dsp#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des.mak#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des.man#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des.org#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des.pl#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des_crypt.3#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des_crypt.man#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des_enc.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des_locl.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des_locl.org#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des_opts.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/des_ver.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/destest.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/dllmain.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/doIP#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/doPC1#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/doPC2#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/ecb3_enc.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/ecb_enc.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/ede_enc.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/enc_read.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/enc_writ.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/fcrypt.c#3 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/hash.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/key_par.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/makefile.bc#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/md4.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/md4.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/md5.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/md5.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/md5crypt_test.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/mdtest.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/ncbc_enc.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/ofb64ede.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/ofb64enc.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/ofb_enc.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/passwd_dialog.aps#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/passwd_dialog.clw#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/passwd_dialog.rc#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/passwd_dialog.res#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/passwd_dlg.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/passwd_dlg.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/pcbc_enc.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/podd.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/qud_cksm.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/rand_key.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/read_pwd.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/resource.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/rnd_keys.c#3 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/rpc_des.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/rpc_enc.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/rpw.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/set_key.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/sha.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/sha.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/shifts.pl#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/sk.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/speed.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/spr.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/str2key.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/supp.c#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/t/perl#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/t/test#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/testdes.pl#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/times#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/typemap#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/version.h#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/vms.com#2 delete ... //depot/projects/ia64/crypto/heimdal/lib/des/xcbc_enc.c#2 delete ... //depot/projects/ia64/etc/defaults/pccard.conf#9 integrate ... //depot/projects/ia64/games/fortune/unstr/unstr.c#3 integrate ... //depot/projects/ia64/games/larn/diag.c#2 integrate ... //depot/projects/ia64/games/sail/sail.6#2 integrate ... //depot/projects/ia64/gnu/lib/libdialog/gauge.c#3 integrate ... //depot/projects/ia64/gnu/lib/libdialog/notify.c#2 integrate ... //depot/projects/ia64/gnu/lib/libstdc++/Makefile#6 integrate ... //depot/projects/ia64/gnu/lib/libstdc++/alpha.map#2 delete ... //depot/projects/ia64/gnu/lib/libstdc++/configs.map#2 delete ... //depot/projects/ia64/gnu/lib/libstdc++/doc/Makefile#2 integrate ... //depot/projects/ia64/gnu/lib/libstdc++/i386.map#2 delete ... //depot/projects/ia64/gnu/lib/libstdc++/ia64.map#2 delete ... //depot/projects/ia64/gnu/lib/libstdc++/includes.map#2 delete ... //depot/projects/ia64/gnu/lib/libstdc++/powerpc.map#2 delete ... //depot/projects/ia64/gnu/lib/libstdc++/sparc64.map#2 delete ... //depot/projects/ia64/gnu/usr.bin/groff/contrib/mm/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/gzip/match.S#2 integrate ... //depot/projects/ia64/include/dlfcn.h#4 integrate ... //depot/projects/ia64/include/stdlib.h#8 integrate ... //depot/projects/ia64/lib/compat/compat21/libg++.so.3.0.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat22/libxpg4.so.2.0.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libalias.so.3.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libcurses.so.2.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libdialog.so.3.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libedit.so.2.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libf2c.so.2.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libfetch.so.1.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libftpio.so.4.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libg++.so.4.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libhistory.so.3.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libmytinfo.so.2.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libncurses.so.3.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libperl.so.3.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libreadline.so.3.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libss.so.2.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libstdc++.so.2.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libtermcap.so.2.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libutil.so.2.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libvgl.so.1.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libwrap.so.2.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat3x.i386/libxpg4.so.2.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat4x.alpha/Makefile#4 integrate ... //depot/projects/ia64/lib/compat/compat4x.alpha/libfetch.so.2.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat4x.alpha/libusb.so.0.bz2.uu#1 branch ... //depot/projects/ia64/lib/compat/compat4x.i386/Makefile#4 integrate ... //depot/projects/ia64/lib/compat/compat4x.i386/libfetch.so.2.gz.uu#2 integrate ... //depot/projects/ia64/lib/compat/compat4x.i386/libusb.so.0.bz2.uu#1 branch ... //depot/projects/ia64/lib/libalias/alias_nbt.c#2 integrate ... //depot/projects/ia64/lib/libc/gen/Makefile.inc#8 integrate ... //depot/projects/ia64/lib/libc/gen/dlfunc.c#1 branch ... //depot/projects/ia64/lib/libc/gen/dlopen.3#3 integrate ... //depot/projects/ia64/lib/libc/gmon/gmon.c#4 integrate ... //depot/projects/ia64/lib/libc/i386/stdlib/div.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/stdlib/ldiv.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/string/bzero.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/string/ffs.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/string/index.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/string/memchr.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/string/rindex.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/string/strcat.S#4 integrate ... //depot/projects/ia64/lib/libc/i386/string/strchr.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/string/strcmp.S#4 integrate ... //depot/projects/ia64/lib/libc/i386/string/strcpy.S#4 integrate ... //depot/projects/ia64/lib/libc/i386/string/strlen.S#3 integrate ... //depot/projects/ia64/lib/libc/i386/string/strrchr.S#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap.3#3 integrate ... //depot/projects/ia64/lib/libc/stdio/fgets.3#3 integrate ... //depot/projects/ia64/lib/libc/stdio/getc.3#3 integrate ... //depot/projects/ia64/lib/libc/stdio/scanf.3#5 integrate ... //depot/projects/ia64/lib/libc/stdlib/malloc.3#6 integrate ... //depot/projects/ia64/lib/libc/stdlib/malloc.c#11 integrate ... //depot/projects/ia64/lib/libc/stdtime/strftime.3#2 integrate ... //depot/projects/ia64/lib/libc/sys/accept.2#4 integrate ... //depot/projects/ia64/lib/libc/sys/chflags.2#3 integrate ... //depot/projects/ia64/lib/libc/sys/listen.2#3 integrate ... //depot/projects/ia64/lib/libc/sys/uuidgen.2#4 integrate ... //depot/projects/ia64/lib/libc/sys/wait.2#2 integrate ... //depot/projects/ia64/lib/libdisk/create_chunk.c#4 integrate ... //depot/projects/ia64/lib/libncp/ncp_mod.h#2 integrate ... //depot/projects/ia64/lib/libncurses/Makefile#4 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ksu/pam_ksu.8#2 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#7 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_passwdqc/pam_passwdqc.8#3 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_rhosts/pam_rhosts.8#2 integrate ... //depot/projects/ia64/lib/libradius/libradius.3#3 integrate ... //depot/projects/ia64/lib/libstand/libstand.3#2 integrate ... //depot/projects/ia64/lib/libusbhid/usbhid.3#2 integrate ... //depot/projects/ia64/lib/libutil/login.c#4 integrate ... //depot/projects/ia64/lib/libvgl/bitmap.c#2 integrate ... //depot/projects/ia64/lib/libvgl/keyboard.c#2 integrate ... //depot/projects/ia64/lib/libvgl/main.c#2 integrate ... //depot/projects/ia64/lib/libvgl/mouse.c#2 integrate ... //depot/projects/ia64/lib/libvgl/simple.c#2 integrate ... //depot/projects/ia64/lib/libvgl/text.c#2 integrate ... //depot/projects/ia64/lib/libvgl/vgl.h#2 integrate ... //depot/projects/ia64/libexec/fingerd/fingerd.c#3 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/Makefile#3 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#9 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#14 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#4 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/pc98/Makefile#1 branch ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/pc98/article.sgml#1 branch ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/pc98/proc-pc98.sgml#1 branch ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/Makefile#3 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/pc98/Makefile#1 branch ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/pc98/article.sgml#1 branch ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/Makefile#3 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#30 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/pc98/Makefile#1 branch ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/pc98/article.sgml#1 branch ... //depot/projects/ia64/release/doc/share/examples/Makefile.relnotesng#3 integrate ... //depot/projects/ia64/sbin/atacontrol/atacontrol.8#6 integrate ... //depot/projects/ia64/sbin/camcontrol/modeedit.c#3 integrate ... //depot/projects/ia64/sbin/disklabel/disklabel.c#11 integrate ... //depot/projects/ia64/sbin/dump/dump.8#5 integrate ... //depot/projects/ia64/sbin/fdisk/fdisk.8#3 integrate ... //depot/projects/ia64/sbin/ffsinfo/ffsinfo.8#5 integrate ... //depot/projects/ia64/sbin/ip6fw/ip6fw.8#3 integrate ... //depot/projects/ia64/sbin/mount_nwfs/mount_nwfs.8#4 integrate ... //depot/projects/ia64/sbin/mount_udf/mount_udf.8#2 integrate ... //depot/projects/ia64/sbin/nfsiod/nfsiod.8#3 integrate ... //depot/projects/ia64/sbin/reboot/boot_i386.8#6 integrate ... //depot/projects/ia64/sbin/reboot/reboot.8#4 integrate ... //depot/projects/ia64/sbin/route/route.c#6 integrate ... //depot/projects/ia64/sbin/savecore/savecore.8#3 integrate ... //depot/projects/ia64/sbin/savecore/savecore.c#15 integrate ... //depot/projects/ia64/sbin/tunefs/tunefs.8#5 integrate ... //depot/projects/ia64/share/examples/libvgl/demo.c#2 integrate ... //depot/projects/ia64/share/man/man4/ccd.4#3 integrate ... //depot/projects/ia64/share/man/man4/disc.4#2 integrate ... //depot/projects/ia64/share/man/man4/ed.4#5 integrate ... //depot/projects/ia64/share/man/man4/ef.4#3 integrate ... //depot/projects/ia64/share/man/man4/em.4#6 integrate ... //depot/projects/ia64/share/man/man4/man4.i386/tx.4#4 integrate ... //depot/projects/ia64/share/man/man4/man4.i386/viapm.4#3 integrate ... //depot/projects/ia64/share/man/man4/rl.4#3 integrate ... //depot/projects/ia64/share/man/man4/spic.4#2 integrate ... //depot/projects/ia64/share/man/man4/ucom.4#2 integrate ... //depot/projects/ia64/share/man/man4/uhid.4#2 integrate ... //depot/projects/ia64/share/man/man4/uhidev.4#2 integrate ... //depot/projects/ia64/share/man/man4/ulpt.4#2 integrate ... //depot/projects/ia64/share/man/man4/umodem.4#2 integrate ... //depot/projects/ia64/share/man/man4/uplcom.4#3 integrate ... //depot/projects/ia64/share/man/man4/uvscom.4#2 integrate ... //depot/projects/ia64/share/man/man4/vinum.4#7 integrate ... //depot/projects/ia64/share/man/man4/wi.4#4 integrate ... //depot/projects/ia64/share/man/man5/a.out.5#3 integrate ... //depot/projects/ia64/share/man/man5/drivers.conf.5#4 integrate ... //depot/projects/ia64/share/man/man5/make.conf.5#12 integrate ... //depot/projects/ia64/share/man/man5/moduli.5#3 integrate ... //depot/projects/ia64/share/man/man7/hier.7#10 integrate ... //depot/projects/ia64/share/man/man7/stdint.7#3 integrate ... //depot/projects/ia64/share/man/man8/picobsd.8#8 integrate ... //depot/projects/ia64/share/man/man9/VOP_ATTRIB.9#6 integrate ... //depot/projects/ia64/share/man/man9/acl.9#6 integrate ... //depot/projects/ia64/share/man/man9/mtx_pool.9#2 integrate ... //depot/projects/ia64/share/man/man9/mutex.9#5 integrate ... //depot/projects/ia64/share/man/man9/selrecord.9#2 integrate ... //depot/projects/ia64/share/man/man9/sx.9#6 integrate ... //depot/projects/ia64/share/man/man9/zone.9#6 integrate ... //depot/projects/ia64/share/man/tools/.param#2 delete ... //depot/projects/ia64/share/misc/iso3166#3 integrate ... //depot/projects/ia64/share/mk/Makefile#5 integrate ... //depot/projects/ia64/share/mk/bsd.cpu.mk#5 integrate ... //depot/projects/ia64/share/mk/bsd.files.mk#1 branch ... //depot/projects/ia64/share/mk/bsd.lib.mk#12 integrate ... //depot/projects/ia64/share/mk/bsd.prog.mk#11 integrate ... //depot/projects/ia64/share/mk/bsd.subdir.mk#6 integrate ... //depot/projects/ia64/share/zoneinfo/zone.tab#5 integrate ... //depot/projects/ia64/sys/alpha/include/elf.h#4 integrate ... //depot/projects/ia64/sys/alpha/linux/linux_dummy.c#2 integrate ... //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#4 integrate ... //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#3 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1.h#2 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#5 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_sysvec.c#3 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_util.h#3 integrate ... //depot/projects/ia64/sys/boot/common/loader.8#6 integrate ... //depot/projects/ia64/sys/boot/forth/loader.4th.8#3 integrate ... //depot/projects/ia64/sys/boot/sparc64/loader/main.c#6 integrate ... //depot/projects/ia64/sys/cam/scsi/scsi_da.c#14 integrate ... //depot/projects/ia64/sys/compat/linux/linux_file.c#3 integrate ... //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#8 integrate ... //depot/projects/ia64/sys/compat/linux/linux_ipc.c#3 integrate ... //depot/projects/ia64/sys/compat/linux/linux_misc.c#10 integrate ... //depot/projects/ia64/sys/compat/linux/linux_signal.c#3 integrate ... //depot/projects/ia64/sys/compat/linux/linux_socket.c#3 integrate ... //depot/projects/ia64/sys/compat/linux/linux_socket.h#2 integrate ... //depot/projects/ia64/sys/compat/linux/linux_stats.c#3 integrate ... //depot/projects/ia64/sys/compat/svr4/imgact_svr4.c#4 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_exec.h#3 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_filio.c#4 integrate ... //depot/projects/ia64/sys/compat/svr4/svr4_ioctl.c#5 integrate ... //depot/projects/ia64/sys/conf/NOTES#13 integrate ... //depot/projects/ia64/sys/conf/files#28 integrate ... //depot/projects/ia64/sys/conf/options#17 integrate ... //depot/projects/ia64/sys/dev/awi/awi.c#5 integrate ... //depot/projects/ia64/sys/dev/awi/awivar.h#3 integrate ... //depot/projects/ia64/sys/dev/cardbus/cardbus.c#5 integrate ... //depot/projects/ia64/sys/dev/cardbus/cardbus_cis.c#5 integrate ... //depot/projects/ia64/sys/dev/ct/ct_machdep.h#3 integrate ... //depot/projects/ia64/sys/dev/drm/drm_dma.h#2 integrate ... //depot/projects/ia64/sys/dev/drm/drm_os_freebsd.h#3 integrate ... //depot/projects/ia64/sys/dev/drm/drm_scatter.h#2 integrate ... //depot/projects/ia64/sys/dev/drm/gamma_drv.h#2 integrate ... //depot/projects/ia64/sys/dev/drm/mga_dma.c#2 integrate ... //depot/projects/ia64/sys/dev/drm/mga_drv.h#2 integrate ... //depot/projects/ia64/sys/dev/drm/mga_state.c#2 integrate ... //depot/projects/ia64/sys/dev/drm/r128_cce.c#2 integrate ... //depot/projects/ia64/sys/dev/drm/r128_drv.h#2 integrate ... //depot/projects/ia64/sys/dev/drm/r128_state.c#2 integrate ... //depot/projects/ia64/sys/dev/drm/radeon_cp.c#2 integrate ... //depot/projects/ia64/sys/dev/drm/radeon_drv.h#2 integrate ... //depot/projects/ia64/sys/dev/drm/radeon_state.c#2 integrate ... //depot/projects/ia64/sys/dev/ep/if_ep_pccard.c#4 integrate ... //depot/projects/ia64/sys/dev/exca/exca.c#2 integrate ... //depot/projects/ia64/sys/dev/hea/eni.c#4 integrate ... //depot/projects/ia64/sys/dev/hea/eni.h#2 integrate ... //depot/projects/ia64/sys/dev/hea/eni_buffer.c#5 integrate ... //depot/projects/ia64/sys/dev/hea/hea_freebsd.c#1 branch ... //depot/projects/ia64/sys/dev/hea/hea_freebsd.h#1 branch ... //depot/projects/ia64/sys/dev/hea/hea_pci.c#1 branch ... //depot/projects/ia64/sys/dev/joy/joy.c#3 integrate ... //depot/projects/ia64/sys/dev/joy/joy_isa.c#2 integrate ... //depot/projects/ia64/sys/dev/joy/joy_pccard.c#2 integrate ... //depot/projects/ia64/sys/dev/joy/joyvar.h#2 integrate ... //depot/projects/ia64/sys/dev/lmc/if_lmc.c#3 integrate ... //depot/projects/ia64/sys/dev/lmc/if_lmc_common.c#2 integrate ... //depot/projects/ia64/sys/dev/lmc/if_lmc_fbsd3.c#2 integrate ... //depot/projects/ia64/sys/dev/lmc/if_lmc_media.c#2 integrate ... //depot/projects/ia64/sys/dev/lmc/if_lmcioctl.h#2 integrate ... //depot/projects/ia64/sys/dev/lmc/if_lmcvar.h#2 integrate ... //depot/projects/ia64/sys/dev/my/if_my.c#6 integrate ... //depot/projects/ia64/sys/dev/ncv/ncr53c500var.h#4 integrate ... //depot/projects/ia64/sys/dev/nsp/nspvar.h#4 integrate ... //depot/projects/ia64/sys/dev/pccard/card_if.m#3 integrate ... //depot/projects/ia64/sys/dev/pccard/pccard.c#4 integrate ... //depot/projects/ia64/sys/dev/pccard/pccard_common.c#1 branch ... //depot/projects/ia64/sys/dev/pccard/pccardvar.h#5 integrate ... //depot/projects/ia64/sys/dev/pccbb/pccbb.c#8 integrate ... //depot/projects/ia64/sys/dev/pci/pci.c#6 integrate ... //depot/projects/ia64/sys/dev/pci/pcivar.h#3 integrate ... //depot/projects/ia64/sys/dev/pcic/i82365_isa.c#2 integrate ... //depot/projects/ia64/sys/dev/pdq/if_fea.c#4 integrate ... //depot/projects/ia64/sys/dev/pdq/if_fpa.c#3 integrate ... //depot/projects/ia64/sys/dev/pdq/pdq_freebsd.h#2 integrate ... //depot/projects/ia64/sys/dev/pdq/pdqvar.h#3 integrate ... //depot/projects/ia64/sys/dev/ray/if_ray.c#2 integrate ... //depot/projects/ia64/sys/dev/stg/tmc18c30var.h#4 integrate ... //depot/projects/ia64/sys/dev/usb/udbp.c#3 integrate ... //depot/projects/ia64/sys/dev/usb/udbp.h#2 integrate ... //depot/projects/ia64/sys/dev/usb/urio.c#6 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi.c#18 integrate ... //depot/projects/ia64/sys/dev/wl/if_wl.c#4 integrate ... //depot/projects/ia64/sys/dev/wl/if_wl.h#2 integrate ... //depot/projects/ia64/sys/dev/xe/if_xe_pccard.c#2 integrate ... //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#10 integrate ... //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#10 integrate ... //depot/projects/ia64/sys/fs/portalfs/portal_vnops.c#5 integrate ... //depot/projects/ia64/sys/geom/geom_gpt.c#5 integrate ... //depot/projects/ia64/sys/i386/conf/GENERIC#13 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_isc.c#2 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_sysi86.c#3 integrate ... //depot/projects/ia64/sys/i386/ibcs2/ibcs2_xenix.c#3 integrate ... //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#6 integrate ... //depot/projects/ia64/sys/i386/include/asmacros.h#3 integrate ... //depot/projects/ia64/sys/i386/include/elf.h#4 integrate ... //depot/projects/ia64/sys/i386/include/floatingpoint.h#2 integrate ... //depot/projects/ia64/sys/i386/include/if_wl_wavelan.h#2 integrate ... //depot/projects/ia64/sys/i386/isa/ic/lemac.h#2 integrate ... //depot/projects/ia64/sys/i386/isa/if_le.c#4 integrate ... //depot/projects/ia64/sys/i386/isa/scd.c#4 integrate ... //depot/projects/ia64/sys/i386/linux/imgact_linux.c#4 integrate ... //depot/projects/ia64/sys/i386/linux/linux_dummy.c#3 integrate ... //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#9 integrate ... //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#6 integrate ... //depot/projects/ia64/sys/i4b/driver/i4b_ing.c#5 integrate ... //depot/projects/ia64/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate ... //depot/projects/ia64/sys/ia64/include/elf.h#6 integrate ... //depot/projects/ia64/sys/kern/imgact_elf.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_condvar.c#6 integrate ... //depot/projects/ia64/sys/kern/kern_descrip.c#23 integrate ... //depot/projects/ia64/sys/kern/kern_exit.c#15 integrate ... //depot/projects/ia64/sys/kern/kern_intr.c#9 integrate ... //depot/projects/ia64/sys/kern/kern_lock.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_malloc.c#12 integrate ... //depot/projects/ia64/sys/kern/kern_sig.c#17 integrate ... //depot/projects/ia64/sys/kern/kern_synch.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_tc.c#10 integrate ... //depot/projects/ia64/sys/kern/subr_prf.c#9 integrate ... //depot/projects/ia64/sys/kern/subr_trap.c#7 integrate ... //depot/projects/ia64/sys/kern/sys_socket.c#6 integrate ... //depot/projects/ia64/sys/kern/tty.c#13 integrate ... //depot/projects/ia64/sys/kern/uipc_domain.c#7 integrate ... //depot/projects/ia64/sys/kern/uipc_mbuf.c#5 integrate ... //depot/projects/ia64/sys/kern/uipc_socket.c#13 integrate ... //depot/projects/ia64/sys/kern/uipc_socket2.c#11 integrate ... //depot/projects/ia64/sys/kern/uipc_syscalls.c#10 integrate ... //depot/projects/ia64/sys/kern/uipc_usrreq.c#13 integrate ... //depot/projects/ia64/sys/kern/vfs_aio.c#15 integrate ... //depot/projects/ia64/sys/libkern/crc32.c#1 branch ... //depot/projects/ia64/sys/modules/Makefile#15 integrate ... //depot/projects/ia64/sys/modules/hea/Makefile#1 branch ... //depot/projects/ia64/sys/modules/oldcard/Makefile#3 integrate ... //depot/projects/ia64/sys/net/raw_cb.c#4 integrate ... //depot/projects/ia64/sys/net/raw_usrreq.c#6 integrate ... //depot/projects/ia64/sys/net/route.c#4 integrate ... //depot/projects/ia64/sys/net/rtsock.c#8 integrate ... //depot/projects/ia64/sys/net/zlib.h#3 integrate ... //depot/projects/ia64/sys/netatalk/ddp_input.c#5 integrate ... //depot/projects/ia64/sys/netatalk/ddp_usrreq.c#7 integrate ... //depot/projects/ia64/sys/netatm/atm_aal5.c#6 integrate ... //depot/projects/ia64/sys/netatm/atm_socket.c#6 integrate ... //depot/projects/ia64/sys/netgraph/ng_async.c#4 integrate ... //depot/projects/ia64/sys/netgraph/ng_async.h#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_base.c#6 integrate ... //depot/projects/ia64/sys/netgraph/ng_bpf.c#3 integrate ... //depot/projects/ia64/sys/netgraph/ng_bpf.h#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_bridge.c#4 integrate ... //depot/projects/ia64/sys/netgraph/ng_bridge.h#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_cisco.c#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_cisco.h#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_eiface.c#3 integrate ... //depot/projects/ia64/sys/netgraph/ng_eiface.h#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_etf.c#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_etf.h#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_iface.c#3 integrate ... //depot/projects/ia64/sys/netgraph/ng_ksocket.c#6 integrate ... //depot/projects/ia64/sys/netgraph/ng_ksocket.h#3 integrate ... //depot/projects/ia64/sys/netgraph/ng_message.h#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_one2many.c#3 integrate ... //depot/projects/ia64/sys/netgraph/ng_one2many.h#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_parse.c#5 integrate ... //depot/projects/ia64/sys/netgraph/ng_parse.h#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_ppp.c#5 integrate ... //depot/projects/ia64/sys/netgraph/ng_ppp.h#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_pppoe.c#5 integrate ... //depot/projects/ia64/sys/netgraph/ng_pppoe.h#4 integrate ... //depot/projects/ia64/sys/netgraph/ng_pptpgre.c#4 integrate ... //depot/projects/ia64/sys/netgraph/ng_pptpgre.h#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_sample.c#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_sample.h#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_socket.c#7 integrate ... //depot/projects/ia64/sys/netgraph/ng_tee.c#3 integrate ... //depot/projects/ia64/sys/netgraph/ng_tee.h#2 integrate ... //depot/projects/ia64/sys/netgraph/ng_vjc.c#3 integrate ... //depot/projects/ia64/sys/netgraph/ng_vjc.h#2 integrate ... //depot/projects/ia64/sys/netinet/accf_data.c#5 integrate ... //depot/projects/ia64/sys/netinet/accf_http.c#5 integrate ... //depot/projects/ia64/sys/netinet/in_pcb.c#14 integrate ... //depot/projects/ia64/sys/netinet/ip_divert.c#10 integrate ... //depot/projects/ia64/sys/netinet/ip_input.c#11 integrate ... //depot/projects/ia64/sys/netinet/ip_mroute.c#9 integrate ... //depot/projects/ia64/sys/netinet/raw_ip.c#11 integrate ... //depot/projects/ia64/sys/netinet/tcp_input.c#13 integrate ... //depot/projects/ia64/sys/netinet/tcp_output.c#6 integrate ... //depot/projects/ia64/sys/netinet/tcp_subr.c#11 integrate ... //depot/projects/ia64/sys/netinet/tcp_timer.c#4 integrate ... //depot/projects/ia64/sys/netinet/tcp_usrreq.c#7 integrate ... //depot/projects/ia64/sys/netinet/udp_usrreq.c#11 integrate ... //depot/projects/ia64/sys/netinet6/icmp6.c#7 integrate ... //depot/projects/ia64/sys/netinet6/in6_pcb.c#8 integrate ... //depot/projects/ia64/sys/netinet6/in6_src.c#5 integrate ... //depot/projects/ia64/sys/netinet6/ip6_input.c#8 integrate ... //depot/projects/ia64/sys/netinet6/ip6_mroute.c#6 integrate ... //depot/projects/ia64/sys/netinet6/raw_ip6.c#6 integrate ... //depot/projects/ia64/sys/netinet6/udp6_usrreq.c#8 integrate ... //depot/projects/ia64/sys/netipx/ipx_pcb.c#5 integrate ... //depot/projects/ia64/sys/netipx/ipx_usrreq.c#6 integrate ... //depot/projects/ia64/sys/netipx/spx_usrreq.c#5 integrate ... //depot/projects/ia64/sys/netkey/keysock.c#8 integrate ... //depot/projects/ia64/sys/netnatm/natm.c#7 integrate ... //depot/projects/ia64/sys/netncp/ncp_sock.c#3 integrate ... //depot/projects/ia64/sys/netns/idp_usrreq.c#4 integrate ... //depot/projects/ia64/sys/netns/ns.c#3 integrate ... //depot/projects/ia64/sys/netns/ns_pcb.c#4 integrate ... //depot/projects/ia64/sys/netns/spp_usrreq.c#3 integrate ... //depot/projects/ia64/sys/netsmb/smb_trantcp.c#8 integrate ... //depot/projects/ia64/sys/nfsclient/bootp_subr.c#7 integrate ... //depot/projects/ia64/sys/nfsclient/nfs_socket.c#6 integrate ... //depot/projects/ia64/sys/nfsserver/nfs_srvsock.c#5 integrate ... //depot/projects/ia64/sys/pc98/pc98/pmc.c#3 integrate ... //depot/projects/ia64/sys/pccard/pccard_nbk.c#3 integrate ... //depot/projects/ia64/sys/pci/dc21040reg.h#2 integrate ... //depot/projects/ia64/sys/pci/if_de.c#3 integrate ... //depot/projects/ia64/sys/pci/if_devar.h#3 integrate ... //depot/projects/ia64/sys/powerpc/include/elf.h#4 integrate ... //depot/projects/ia64/sys/security/lomac/kernel_interface.c#4 integrate ... //depot/projects/ia64/sys/security/lomac/kernel_log.c#4 integrate ... //depot/projects/ia64/sys/security/lomac/kernel_mmap.c#6 integrate ... //depot/projects/ia64/sys/security/lomac/kernel_socket.c#6 integrate ... //depot/projects/ia64/sys/sparc64/conf/GENERIC#12 integrate ... //depot/projects/ia64/sys/sparc64/include/elf.h#4 integrate ... //depot/projects/ia64/sys/sparc64/include/intr_machdep.h#4 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/mp_machdep.c#7 integrate ... //depot/projects/ia64/sys/sys/elf32.h#3 integrate ... //depot/projects/ia64/sys/sys/elf64.h#3 integrate ... //depot/projects/ia64/sys/sys/elf_generic.h#4 integrate ... //depot/projects/ia64/sys/sys/gpt.h#5 integrate ... //depot/projects/ia64/sys/sys/imgact_elf.h#5 integrate ... //depot/projects/ia64/sys/sys/joystick.h#2 integrate ... //depot/projects/ia64/sys/sys/lockmgr.h#4 integrate ... //depot/projects/ia64/sys/sys/mbuf.h#4 integrate ... //depot/projects/ia64/sys/sys/param.h#12 integrate ... //depot/projects/ia64/sys/sys/proc.h#18 integrate ... //depot/projects/ia64/sys/sys/signalvar.h#7 integrate ... //depot/projects/ia64/sys/sys/socket.h#5 integrate ... //depot/projects/ia64/sys/sys/socketvar.h#15 integrate ... //depot/projects/ia64/sys/sys/systm.h#13 integrate ... //depot/projects/ia64/sys/sys/vmmeter.h#2 integrate ... //depot/projects/ia64/sys/sys/wait.h#4 integrate ... //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#14 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_acl.c#4 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_extern.h#6 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_ihash.c#4 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#20 integrate ... //depot/projects/ia64/sys/vm/vm_map.h#12 integrate ... //depot/projects/ia64/sys/vm/vm_mmap.c#9 integrate ... //depot/projects/ia64/sys/vm/vm_object.c#13 integrate ... //depot/projects/ia64/sys/vm/vm_object.h#5 integrate ... //depot/projects/ia64/sys/vm/vm_swap.c#8 integrate ... //depot/projects/ia64/tools/install.sh#2 integrate ... //depot/projects/ia64/usr.bin/Makefile#27 integrate ... //depot/projects/ia64/usr.bin/asa/asa.1#2 integrate ... //depot/projects/ia64/usr.bin/at/at.man#7 integrate ... //depot/projects/ia64/usr.bin/brandelf/brandelf.c#4 integrate ... //depot/projects/ia64/usr.bin/catman/catman.1#2 integrate ... //depot/projects/ia64/usr.bin/compress/compress.1#5 integrate ... //depot/projects/ia64/usr.bin/csplit/csplit.1#3 integrate ... //depot/projects/ia64/usr.bin/ctags/C.c#6 integrate ... //depot/projects/ia64/usr.bin/ctags/ctags.1#4 integrate ... //depot/projects/ia64/usr.bin/ctags/ctags.c#6 integrate ... //depot/projects/ia64/usr.bin/ctags/fortran.c#6 integrate ... //depot/projects/ia64/usr.bin/ctags/lisp.c#4 integrate ... //depot/projects/ia64/usr.bin/ctags/tree.c#5 integrate ... //depot/projects/ia64/usr.bin/cut/cut.1#3 integrate ... //depot/projects/ia64/usr.bin/find/find.1#7 integrate ... //depot/projects/ia64/usr.bin/find/find.c#5 integrate ... //depot/projects/ia64/usr.bin/find/find.h#4 integrate ... //depot/projects/ia64/usr.bin/find/function.c#9 integrate ... //depot/projects/ia64/usr.bin/gencat/gencat.c#3 integrate ... //depot/projects/ia64/usr.bin/gprof/aout.c#3 integrate ... //depot/projects/ia64/usr.bin/gprof/arcs.c#3 integrate ... //depot/projects/ia64/usr.bin/gprof/dfn.c#2 integrate ... //depot/projects/ia64/usr.bin/gprof/gprof.c#4 integrate ... //depot/projects/ia64/usr.bin/gprof/gprof.h#4 integrate ... //depot/projects/ia64/usr.bin/gprof/lookup.c#2 integrate ... //depot/projects/ia64/usr.bin/gprof/printgprof.c#3 integrate ... //depot/projects/ia64/usr.bin/hexdump/od.1#5 integrate ... //depot/projects/ia64/usr.bin/kenv/kenv.1#3 integrate ... //depot/projects/ia64/usr.bin/killall/killall.1#5 integrate ... //depot/projects/ia64/usr.bin/ktrdump/ktrdump.8#2 integrate ... //depot/projects/ia64/usr.bin/m4/m4.1#4 integrate ... //depot/projects/ia64/usr.bin/make/dir.c#5 integrate ... //depot/projects/ia64/usr.bin/make/make.1#4 integrate ... //depot/projects/ia64/usr.bin/msgs/msgs.1#4 integrate ... //depot/projects/ia64/usr.bin/mt/mt.1#4 integrate ... //depot/projects/ia64/usr.bin/ncal/ncal.1#3 integrate ... //depot/projects/ia64/usr.bin/netstat/route.c#3 integrate ... //depot/projects/ia64/usr.bin/newgrp/newgrp.1#2 integrate ... //depot/projects/ia64/usr.bin/nice/nice.1#5 integrate ... //depot/projects/ia64/usr.bin/pathchk/pathchk.1#2 integrate ... //depot/projects/ia64/usr.bin/printf/printf.1#5 integrate ... //depot/projects/ia64/usr.bin/quota/quota.c#4 integrate ... //depot/projects/ia64/usr.bin/renice/renice.8#4 integrate ... //depot/projects/ia64/usr.bin/sccs/pathnames.h#2 integrate ... //depot/projects/ia64/usr.bin/sed/compile.c#6 integrate ... //depot/projects/ia64/usr.bin/sed/sed.1#4 integrate ... //depot/projects/ia64/usr.bin/split/split.1#4 integrate ... //depot/projects/ia64/usr.bin/tabs/tabs.1#2 integrate ... //depot/projects/ia64/usr.bin/tftp/tftp.1#4 integrate ... //depot/projects/ia64/usr.bin/time/time.1#2 integrate ... //depot/projects/ia64/usr.bin/tput/tput.c#5 integrate ... //depot/projects/ia64/usr.bin/tty/tty.c#4 integrate ... //depot/projects/ia64/usr.bin/uac/uac.c#2 integrate ... //depot/projects/ia64/usr.bin/unifdef/unifdef.1#4 integrate ... //depot/projects/ia64/usr.bin/uniq/uniq.1#3 integrate ... //depot/projects/ia64/usr.bin/uniq/uniq.c#5 integrate ... //depot/projects/ia64/usr.bin/uuidgen/uuidgen.1#4 integrate ... //depot/projects/ia64/usr.bin/what/what.1#2 integrate ... //depot/projects/ia64/usr.bin/what/what.c#4 integrate ... //depot/projects/ia64/usr.bin/which/which.1#3 integrate ... //depot/projects/ia64/usr.bin/who/who.1#3 integrate ... //depot/projects/ia64/usr.bin/write/write.c#5 integrate ... //depot/projects/ia64/usr.bin/xargs/strnsubst.c#4 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.1#6 integrate ... //depot/projects/ia64/usr.bin/xargs/xargs.c#14 integrate ... //depot/projects/ia64/usr.bin/yacc/yacc.1#4 integrate ... //depot/projects/ia64/usr.sbin/IPXrouted/sap_output.c#2 integrate ... //depot/projects/ia64/usr.sbin/IPXrouted/trace.c#2 integrate ... //depot/projects/ia64/usr.sbin/Makefile#16 integrate ... //depot/projects/ia64/usr.sbin/cdcontrol/cdcontrol.1#4 integrate ... //depot/projects/ia64/usr.sbin/chown/chown.8#3 integrate ... //depot/projects/ia64/usr.sbin/chown/chown.c#3 integrate ... //depot/projects/ia64/usr.sbin/crunch/crunchgen/crunchgen.1#4 integrate ... //depot/projects/ia64/usr.sbin/devinfo/devinfo.8#2 integrate ... //depot/projects/ia64/usr.sbin/faithd/faithd.8#4 integrate ... //depot/projects/ia64/usr.sbin/kbdcontrol/kbdcontrol.c#3 integrate ... //depot/projects/ia64/usr.sbin/kbdcontrol/lex.h#2 integrate ... //depot/projects/ia64/usr.sbin/kbdcontrol/lex.l#2 integrate ... //depot/projects/ia64/usr.sbin/lpr/lpr/printcap.5#3 integrate ... //depot/projects/ia64/usr.sbin/lptcontrol/lptcontrol.c#2 integrate ... //depot/projects/ia64/usr.sbin/named/Makefile#3 integrate ... //depot/projects/ia64/usr.sbin/ntp/doc/ntpd.8#2 integrate ... //depot/projects/ia64/usr.sbin/pciconf/pciconf.8#4 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/create/pkg_create.1#6 integrate ... //depot/projects/ia64/usr.sbin/pkg_install/version/pkg_version.pl#2 integrate ... //depot/projects/ia64/usr.sbin/ppp/radius.c#4 integrate ... //depot/projects/ia64/usr.sbin/rtadvd/config.c#2 integrate ... //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.c#2 integrate ... //depot/projects/ia64/usr.sbin/rtadvd/rtadvd.h#2 integrate ... //depot/projects/ia64/usr.sbin/sliplogin/pathnames.h#2 integrate ... //depot/projects/ia64/usr.sbin/sliplogin/sliplogin.c#2 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/disks.c#3 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/label.c#4 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/menus.c#11 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/modules.c#2 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.8#3 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#8 integrate ... //depot/projects/ia64/usr.sbin/sysinstall/tcpip.c#4 integrate ... //depot/projects/ia64/usr.sbin/vidcontrol/decode.c#2 integrate ... //depot/projects/ia64/usr.sbin/vidcontrol/vidcontrol.c#3 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.31 2002/05/20 13:08:32 rwatson Exp $ +$FreeBSD: src/MAINTAINERS,v 1.33 2002/05/30 16:50:27 billf Exp $ subsystem login notes ----------------------------- @@ -44,7 +44,7 @@ isp(4) mjacob {isp_freebsd.?,isp_pci.c}: heads-up on changes please. All other files need pre-commit with mjacob as they're shared with five other platforms. -tdfx(4) cokane Just keep me informed of changes, try not to break it. +tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. Keep in sync with -STABLE. @@ -65,3 +65,5 @@ libz peter Try not to break it. pppd/chat peter Try not to break it. share/mk ru Recommends pre-commit review. +m4 jmallett Pre-commit review required. +ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org ==== //depot/projects/ia64/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.257 2002/05/24 16:08:13 ru Exp $ +# $FreeBSD: src/Makefile,v 1.259 2002/06/03 14:49:34 ru Exp $ # # The user-driven targets are: # @@ -99,7 +99,7 @@ _worldtmp _bootstrap-tools _cleanobj _obj _build-tools \ _cross-tools _includes _libraries _depend -BITGTS= includes +BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} .ORDER: buildworld installworld @@ -149,7 +149,7 @@ .endif @echo @echo "--------------------------------------------------------------" - @printf ">>> ${OBJFORMAT} make world completed on `LC_ALL=C date`\n (started ${STARTTIME})\n" + @printf ">>> ${OBJFORMAT} make world completed on `LC_ALL=C date`\n (started ${STARTTIME})\n" @echo "--------------------------------------------------------------" # ==== //depot/projects/ia64/Makefile.inc1#30 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.287 2002/05/29 03:59:20 peter Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.289 2002/05/31 13:04:09 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -574,13 +574,17 @@ .endif # This horrible kludge should be deleted in about 2 weeks, say July 9, 2002 _cxx_version!= ${CXX} -v 2>&1 | awk '$$0 ~ /^gcc version/ {print $$3}' -.if ${CXX:T} != "c++" || ${_cxx_version} != "3.1" || exists(/usr/lib/libstdc++.so.4) +_cc_version!= ${CC} -v 2>&1 | awk '$$0 ~ /^gcc version/ {print $$3}' +.if ${CXX:T} != "c++" || \ + (${_cxx_version} == ${_cc_version} && ${_cxx_version} != "3.1") || \ + exists(/usr/lib/libstdc++.so.4) _cxx_consumers= gnu/usr.bin/gperf gnu/usr.bin/groff .endif bootstrap-tools: .for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef \ - usr.bin/makewhatis usr.bin/rpcgen usr.bin/xargs usr.bin/xinstall \ + usr.bin/makewhatis usr.bin/rpcgen usr.bin/uudecode \ + usr.bin/xargs usr.bin/xinstall \ usr.sbin/config usr.sbin/kbdcontrol \ ${_cxx_consumers} gnu/usr.bin/texinfo cd ${.CURDIR}/${_tool}; \ ==== //depot/projects/ia64/UPDATING#13 (text+ko) ==== @@ -22,14 +22,6 @@ integrity. Re-enabling write caching can substantially improve performance. -20020520: - Due to a compiler upgrade, the set of warnings has changed, - resulting in new compile failures when -Werror is set - inappropriately. While the set of warnings is adjusted and - fixed, it is recommended that you place "NO_WERROR=yes" on - the make line for buildworld/buildkernel, or in /etc/make.conf - if appropriate. - 20020511: The k5su utility installed as part of Kerberos 5 is no longer installed with the set-user-ID bit set by default. Add @@ -1041,4 +1033,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.208 2002/05/20 13:06:24 rwatson Exp $ +$FreeBSD: src/UPDATING,v 1.209 2002/06/03 00:21:13 rwatson Exp $ ==== //depot/projects/ia64/bin/dd/dd.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.19 2002/03/31 20:49:37 keramida Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.20 2002/05/29 14:01:27 ru Exp $ .\" .Dd January 13, 1994 .Dt DD 1 @@ -57,8 +57,7 @@ and truncated input records to the standard error output. .Pp The following operands are available: -.\" XXX -.Bl -tag -width of=file +.Bl -tag -width ".Cm of Ns = Ns Ar file" .It Cm bs Ns = Ns Ar n Set both input and output block size to .Ar n ==== //depot/projects/ia64/bin/expr/expr.1#5 (text+ko) ==== @@ -28,7 +28,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/bin/expr/expr.1,v 1.19 2002/05/11 03:08:12 wollman Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.20 2002/05/29 15:18:35 ru Exp $ .\" .Dd May 10, 2002 .Dt EXPR 1 @@ -56,7 +56,7 @@ If the .Fl e flag is specified, arithmetic uses the C -.Ql intmax_t +.Vt intmax_t data type (the largest integral type available), and .Nm will detect arithmetic overflow and return an error indication. @@ -67,7 +67,7 @@ is not specified, arithmetic operations and parsing of integer arguments will overflow silently according to the rules of the C standard, using the -.Ql long +.Vt long data type. .Pp Operators are listed below in order of increasing precedence; all @@ -126,11 +126,11 @@ variable is defined in the process environment, this version of .Nm adheres to the -.Tn POSIX +\*[Px] Utility Syntax Guidelines, which require that a leading argument beginning with a minus sign be considered an option to the program. The standard -.Ql \&-- +.Fl Fl syntax may be used to prevent this interpretation. However, many historic implementations of .Nm , @@ -168,7 +168,7 @@ New applications are advised to use shell arithmetic rather than .Nm . .Sh ENVIRONMENT -.Bl -tag -compact -width EXPR_COMPAT +.Bl -tag -width ".Ev EXPR_COMPAT" .It Ev EXPR_COMPAT If set, .Nm @@ -185,7 +185,7 @@ .Xr sh 1 syntax) adds one to the variable .Va a : -.Dl a=$(expr $a + 1) +.Dl "a=$(expr $a + 1)" .It This will fail if the value of .Va a @@ -195,10 +195,10 @@ from being interpreted as options to the .Nm command, one might rearrange the expression: -.Dl a=$(expr 1 + $a) +.Dl "a=$(expr 1 + $a)" .It More generally, parenthesize possibly-negative values: -.Dl a=$(expr \e( $a \e) + 1) +.Dl "a=$(expr \e( $a \e) + 1)" .It This example prints the filename portion of a pathname stored in variable @@ -211,7 +211,7 @@ The .Li // characters resolve this ambiguity. -.Dl expr \*q//$a\*q \&: '.*/\e(.*\e)' +.Dl "expr \*q//$a\*q \&: '.*/\e(.*\e)'" .El .Pp The following examples output the number of characters in variable @@ -228,11 +228,11 @@ command conforms to .St -p1003.1-2001 , this is simple: -.Dl expr -- \*q$a\*q \&: \*q.*\*q +.Dl "expr -- \*q$a\*q \&: \*q.*\*q" .It For portability to older systems, however, a more complicated command is required: -.Dl expr \e( \*qX$a\*q \&: \*q.*\*q \e) - 1 +.Dl "expr \e( \*qX$a\*q \&: \*q.*\*q \e) - 1" .El .Sh DIAGNOSTICS The ==== //depot/projects/ia64/bin/kill/kill.1#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)kill.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/kill/kill.1,v 1.12 2000/11/20 11:39:36 ru Exp $ +.\" $FreeBSD: src/bin/kill/kill.1,v 1.14 2002/06/03 14:59:49 tjr Exp $ .\" .Dd April 28, 1995 .Dt KILL 1 @@ -133,7 +133,7 @@ A .Nm command appeared in -.At v6 . +.At v3 . .Sh BUGS A replacement for the command .Dq Li kill 0 ==== //depot/projects/ia64/bin/ln/ln.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/ln/ln.c,v 1.25 2002/05/11 00:45:01 jedgar Exp $"; + "$FreeBSD: src/bin/ln/ln.c,v 1.26 2002/05/30 00:57:38 tjr Exp $"; #endif /* not lint */ #include @@ -85,11 +85,14 @@ else ++p; if (strcmp(p, "link") == 0) { - if (argc == 3) { - linkf = link; - exit(linkit(argv[1], argv[2], 0)); - } else + while (getopt(argc, argv, "") != -1) + usage(); + argc -= optind; + argv += optind; + if (argc != 2) usage(); + linkf = link; + exit(linkit(argv[0], argv[1], 0)); } while ((ch = getopt(argc, argv, "fhinsv")) != -1) ==== //depot/projects/ia64/bin/ln/symlink.7#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/ln/symlink.7,v 1.23 2002/05/26 12:51:38 tjr Exp $ +.\" $FreeBSD: src/bin/ln/symlink.7,v 1.24 2002/05/29 15:06:24 ru Exp $ .\" .Dd March 31, 1994 .Dt SYMLINK 7 @@ -135,13 +135,13 @@ system call. The flags, access permissions, owner/group and modification time of an existing symbolic link can be changed by means of the -.Xr lchflags 2 +.Xr lchflags 2 , .Xr lchmod 2 , .Xr lchown 2 , and -.Xr lutimes 2 , +.Xr lutimes 2 system calls, respectively. -Of these only the flags are used by the system; +Of these, only the flags are used by the system; the access permissions and ownership are ignored. .Pp The ==== //depot/projects/ia64/bin/ls/ls.1#9 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.66 2002/05/19 02:51:36 tjr Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.67 2002/05/29 15:09:49 ru Exp $ .\" .Dd December 29, 2002 .Dt LS 1 @@ -142,7 +142,7 @@ (lowercase letter .Dq ell ) option, display complete time information for the file, including -month, day, hour, minute, second, and year. +month, day, hour, minute, second, and year. .It Fl W Display whiteouts when scanning directories. .It Fl Z @@ -494,7 +494,8 @@ many pathname text columns to display based on the width provided. (See -.Fl C and +.Fl C +and .Fl x . ) .It Ev LANG The locale to use when determining the order of day and month in the long >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 3 11:39:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFCA837B400; Mon, 3 Jun 2002 11:39:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E7FC237B404 for ; Mon, 3 Jun 2002 11:39:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g53IdN721188 for perforce@freebsd.org; Mon, 3 Jun 2002 11:39:23 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 3 Jun 2002 11:39:23 -0700 (PDT) Message-Id: <200206031839.g53IdN721188@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12326 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12326 Change 12326 by julian@julian_ref on 2002/06/03 11:39:10 add a comment describing what we are trying to do. Affected files ... ... //depot/projects/kse/sys/kern/kern_switch.c#48 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_switch.c#48 (text+ko) ==== @@ -26,6 +26,69 @@ * $FreeBSD: src/sys/kern/kern_switch.c,v 1.27 2002/05/25 01:12:23 jake Exp $ */ +/*** + +Here is the logic.. + +If there are N processors, then there are at most N KSEs (kernel +schedulable entities) working to process threads that belong to a +KSEGOUP (kg). If there are X of these KSEs actually running at the +moment in question, then there are at most M (N-X) of these KSEs on +the run queue, as running KSEs are not on the queue. + +Runnable threads are queued off the KSEGROUP in priority order. +If there are M or more threads runnable, the top M threads +(by priority) are 'preassigned' to the M KSEs not running. The KSEs take +their priority from those threads and are put on the run queue. + +The last thread that had a priority high enough to have a KSE associated +with it, AND IS ON THE RUN QUEUE is pointed to by +kg->kg_last_assigned. If no threads queued off the KSEGROUP have KSEs +assigned as all the available KSEs are activly running, or because there +are no threads queued, that pointer is NULL. + +When a KSE is removed from the run queue to become runnable, We know +it was associated with the highest priority thread in the queue (at the head +of the queue). If it is also the last assigned, that pointer must be +removed from it. Since it was the last assigned, we know there were no more +KSEs available, (M was 1 and is now 0) and since we are not FREEING our KSE +but using it, we know there are STILL no more KSEs available, we can prove +that the next thread in the ksegrp list will not have a KSE to assign to +it, so we can show that the pointer must be made 'invalid' because there +are now NO threads on the list that are assigned a KSE. + +The pointer exists so that when a new threasd is made runnable, it can +have it's priority compared with the last assigned thread to see if +it should 'steal' it's KSE or not.. i.e. is it 'earlier' +on the list than that thread or later.. If it's earlier, then th e KSE is +removed from the last assigned (which is now not assigned a KSE) +and reassigned to the new thread, which is placed earlier in the list. +The pointer is then backed up to the previous thread (which may or may not +be the new thread. + +When a thread sleeps or is removed, the KSE becomes available and if there +are queued threads that are not assigned KSEs, the highest priority one of +them is assigned the KSE, which is then placed back on the run queue at +the approipriate place, and the kg->kg_last_assigned pointer is adjusted down +to point to it. + +The following diagram shows 2 KSEs and 3 threads from a single process. + + RUNQ: --->KSE---KSE--... (KSEs queued at priorities from threads) + \ \____ + \ \ + KSEGROUP---thread--thread--thread (queued in priority order) + \ / + \_______________/ + (last_assigned) + +The result of this scheme is that the M available KSEs are always +queued at the priorities they have inherrited from the M highest priority +threads for that KSEGROUP. If this situation changes, the KSEs are +reassigned to keep this true. + +*/ + #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 3 11:56: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAD1A37B403; Mon, 3 Jun 2002 11:55:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0375237B400 for ; Mon, 3 Jun 2002 11:55:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g53IthD23171 for perforce@freebsd.org; Mon, 3 Jun 2002 11:55:43 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 3 Jun 2002 11:55:43 -0700 (PDT) Message-Id: <200206031855.g53IthD23171@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12327 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12327 Change 12327 by julian@julian_ref on 2002/06/03 11:55:08 Discover typos immediatly after checkin Affected files ... ... //depot/projects/kse/sys/kern/kern_switch.c#49 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_switch.c#49 (text+ko) ==== @@ -47,24 +47,24 @@ assigned as all the available KSEs are activly running, or because there are no threads queued, that pointer is NULL. -When a KSE is removed from the run queue to become runnable, We know +When a KSE is removed from the run queue to become runnable, we know it was associated with the highest priority thread in the queue (at the head -of the queue). If it is also the last assigned, that pointer must be -removed from it. Since it was the last assigned, we know there were no more -KSEs available, (M was 1 and is now 0) and since we are not FREEING our KSE +of the queue). If it is also the last assigned we know M was 1 and must +now be 0. Since the thread is no longer queued that pointer must be +removed from it. Since we know there were no more KSEs available, +(M was 1 and is now 0) and since we are not FREEING our KSE but using it, we know there are STILL no more KSEs available, we can prove that the next thread in the ksegrp list will not have a KSE to assign to -it, so we can show that the pointer must be made 'invalid' because there -are now NO threads on the list that are assigned a KSE. +it, so we can show that the pointer must be made 'invalid' (NULL). -The pointer exists so that when a new threasd is made runnable, it can -have it's priority compared with the last assigned thread to see if -it should 'steal' it's KSE or not.. i.e. is it 'earlier' -on the list than that thread or later.. If it's earlier, then th e KSE is +The pointer exists so that when a new thread is made runnable, it can +have its priority compared with the last assigned thread to see if +it should 'steal' its KSE or not.. i.e. is it 'earlier' +on the list than that thread or later.. If it's earlier, then the KSE is removed from the last assigned (which is now not assigned a KSE) and reassigned to the new thread, which is placed earlier in the list. The pointer is then backed up to the previous thread (which may or may not -be the new thread. +be the new thread). When a thread sleeps or is removed, the KSE becomes available and if there are queued threads that are not assigned KSEs, the highest priority one of @@ -214,7 +214,7 @@ } /* - * Remove a thread from it's KSEGRP's run queue. + * Remove a thread from its KSEGRP's run queue. * This in turn may remove it from a KSE if it was already assigned * to one, possibly causing a new thread to be assigned to the KSE * and the KSE getting a new priority (unless it's a BOUND threa/KSE pair). @@ -388,7 +388,7 @@ * If there was a last assigned, but we didn't see it, * we must be inserting before it, so take the KSE from * the last assigned, and back it up one entry. Then, - * assign the KSE to the new thread and adjust it's priority. + * assign the KSE to the new thread and adjust its priority. */ td2 = kg->kg_last_assigned; ke = td2->td_kse; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 3 12:18:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1FF237B408; Mon, 3 Jun 2002 12:18:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 63D4737B403 for ; Mon, 3 Jun 2002 12:18:11 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g53JIBH29249 for perforce@freebsd.org; Mon, 3 Jun 2002 12:18:11 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 3 Jun 2002 12:18:11 -0700 (PDT) Message-Id: <200206031918.g53JIBH29249@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12328 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12328 Change 12328 by julian@julian_ref on 2002/06/03 12:18:09 When zapping the thread, deallocate the vm object too Affected files ... ... //depot/projects/kse/sys/i386/i386/pmap.c#33 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/pmap.c#33 (text+ko) ==== @@ -1126,6 +1126,8 @@ td->td_kstack_obj = NULL; vm_object_deallocate(ksobj); } + vm_object_deallocate(ksobj); + td->td_kstack_obj = NULL; /* play it safe */ } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 3 12:24:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 444CE37B407; Mon, 3 Jun 2002 12:24:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 21FC337B404 for ; Mon, 3 Jun 2002 12:24:19 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g53JOIV29975 for perforce@freebsd.org; Mon, 3 Jun 2002 12:24:18 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 3 Jun 2002 12:24:18 -0700 (PDT) Message-Id: <200206031924.g53JOIV29975@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12329 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12329 Change 12329 by julian@julian_ref on 2002/06/03 12:23:35 (combined with last commit) free vm obj in the right place Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#55 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#55 (text+ko) ==== @@ -164,7 +164,6 @@ td = (struct thread *)mem; pmap_dispose_thread(td); - vm_object_deallocate(td->td_kstack_obj); cached_threads--; /* XXXSMP */ allocated_threads--; /* XXXSMP */ } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 3 12:49: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EEEB37B407; Mon, 3 Jun 2002 12:48:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 774A937B405 for ; Mon, 3 Jun 2002 12:48:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g53JmnZ32562 for perforce@freebsd.org; Mon, 3 Jun 2002 12:48:49 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 3 Jun 2002 12:48:49 -0700 (PDT) Message-Id: <200206031948.g53JmnZ32562@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12331 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12331 Change 12331 by julian@julian_ref on 2002/06/03 12:48:07 free the KV address space teh thread was using for its stack (does this happpen for the proc u-area yet?) Affected files ... ... //depot/projects/kse/sys/i386/i386/pmap.c#34 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/pmap.c#34 (text+ko) ==== @@ -1093,14 +1093,19 @@ { int i; vm_object_t ksobj; - vm_offset_t ks; + vm_offset_t ks, ks2; vm_page_t m; pt_entry_t *ptek, oldpte; ksobj = td->td_kstack_obj; ks = td->td_kstack; ptek = vtopte(ks); +#ifdef KSTACK_GUARD + ks -= PAGE_SIZE; + for (i = 1; i < (KSTACK_PAGES + 1); i++) { +#else for (i = 0; i < KSTACK_PAGES; i++) { +#endif m = vm_page_lookup(ksobj, i); if (m == NULL) panic("pmap_dispose_thread: kstack already missing?"); @@ -1116,6 +1121,15 @@ #ifdef I386_CPU invltlb(); #endif + /* + * Free the space that this stack was mapped to in the kernel + * address map. + */ +#ifdef KSTACK_GUARD + kmem_free(kernel_map, ks, (KSTACK_PAGES + 1) * PAGE_SIZE); +#else + kmem_free(kernel_map, ks, KSTACK_PAGES * PAGE_SIZE); +#endif /* * If the thread got swapped out some of its KSTACK might have gotten To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 3 12:49:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDF3737B407; Mon, 3 Jun 2002 12:49:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 24D9937B406 for ; Mon, 3 Jun 2002 12:49:51 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g53Jnow32689 for perforce@freebsd.org; Mon, 3 Jun 2002 12:49:50 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 3 Jun 2002 12:49:50 -0700 (PDT) Message-Id: <200206031949.g53Jnow32689@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12332 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12332 Change 12332 by julian@julian_ref on 2002/06/03 12:49:32 grumble.. compile before comitting .. Affected files ... ... //depot/projects/kse/sys/i386/i386/pmap.c#35 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/pmap.c#35 (text+ko) ==== @@ -1093,7 +1093,7 @@ { int i; vm_object_t ksobj; - vm_offset_t ks, ks2; + vm_offset_t ks; vm_page_t m; pt_entry_t *ptek, oldpte; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 3 14:37:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1927737B408; Mon, 3 Jun 2002 14:37:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 46A1137B401 for ; Mon, 3 Jun 2002 14:37:01 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g53Lb1N51509 for perforce@freebsd.org; Mon, 3 Jun 2002 14:37:01 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 3 Jun 2002 14:37:01 -0700 (PDT) Message-Id: <200206032137.g53Lb1N51509@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12334 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12334 Change 12334 by julian@julian_ref on 2002/06/03 14:36:14 re-add a union entry to make it compile again under 386. alpha version not yet correct. Affected files ... ... //depot/projects/kse/sys/alpha/include/kse.h#2 edit ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#47 edit ... //depot/projects/kse/sys/i386/include/kse.h#5 edit ... //depot/projects/kse/sys/kern/kern_thread.c#56 edit Differences ... ==== //depot/projects/kse/sys/alpha/include/kse.h#2 (text+ko) ==== @@ -30,10 +30,19 @@ #ifndef MACHINE_KSE_H #define MACHINE_KSE_H +#ifdef _KERNEL #include +#endif #include union kse_td_ctx { +#ifdef _KERNEL + struct { + int tf_onstack; + int tf_gs; + struct trapframe tf_tf; + } tfrm; +#endif mcontext_t mcontext; }; ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#47 (text+ko) ==== ==== //depot/projects/kse/sys/i386/include/kse.h#5 (text+ko) ==== @@ -30,10 +30,19 @@ #ifndef MACHINE_KSE_H #define MACHINE_KSE_H +#ifdef _KERNEL #include +#endif #include union kse_td_ctx { +#ifdef _KERNEL + struct { + int tf_onstack; + int tf_gs; + struct trapframe tf_tf; + } tfrm; +#endif mcontext_t mcontext; }; ==== //depot/projects/kse/sys/kern/kern_thread.c#56 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 3 14:42:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A3B437B401; Mon, 3 Jun 2002 14:42:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7CABC37B409 for ; Mon, 3 Jun 2002 14:42:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g53Lg8q52366 for perforce@freebsd.org; Mon, 3 Jun 2002 14:42:08 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 3 Jun 2002 14:42:08 -0700 (PDT) Message-Id: <200206032142.g53Lg8q52366@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12336 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12336 Change 12336 by julian@julian_ref on 2002/06/03 14:41:50 Additions to Alpha support from: Bernd Walter Affected files ... ... //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#23 edit Differences ... ==== //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#23 (text+ko) ==== @@ -242,23 +242,26 @@ void cpu_exit(struct thread *td) { - /* KSEXXX */ + alpha_fpstate_drop(td); } void cpu_thread_exit(struct thread *td) { - /* KSEXXX */ + + return; } void cpu_thread_setup(struct thread *td) { - /* KSEXXX */ + + td->td_pcb = + (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; + td->td_frame = (struct trapframe *)((caddr_t)td->td_pcb) - 1; } -/* KSEXXX */ struct md_store { struct pcb mds_pcb; struct trapframe mds_frame; @@ -267,13 +270,72 @@ void cpu_save_upcall(struct thread *td, struct kse *newkse) { - /* KSEXXX */ + + newkse->ke_mdstorage = malloc(sizeof(struct md_store), M_TEMP, + M_WAITOK); + /* Note: use of M_WAITOK means it won't fail. */ + /* set up shortcuts in MI section */ + newkse->ke_pcb = + &(((struct md_store *)(newkse->ke_mdstorage))->mds_pcb); + newkse->ke_frame = + &(((struct md_store *)(newkse->ke_mdstorage))->mds_frame); + + /* Copy the upcall pcb. Kernel mode & fp regs are here. */ + /* XXXKSE this may be un-needed */ + bcopy(td->td_pcb, newkse->ke_pcb, sizeof(struct pcb)); + + /* This copies most of the user mode register values. */ + bcopy(td->td_frame, newkse->ke_frame, sizeof(struct trapframe)); } void cpu_set_upcall(struct thread *td, void *pcb) { - /* KSEXXX */ + struct pcb *pcb2; + + td->td_flags |= TDF_UPCALLING; + + /* Point the pcb to the top of the stack. */ + pcb2 = td->td_pcb; + + /* + * Copy the upcall pcb. This loads kernel regs. + * Those not loaded individually below get their default + * values here. + * + * XXXKSE It might be a good idea to simply skip this as + * the values of the other registers may be unimportant. + * This would remove any requirement for knowing the KSE + * at this time (see the matching comment below for + * more analysis) (need a good safe default). + */ + bcopy(pcb, pcb2, sizeof(*pcb2)); + + /* + * Create a new fresh stack for the new thread. + * Don't forget to set this stack value into whatever supplies + * the address for the fault handlers. + * The contexts are filled in at the time we actually DO the + * upcall as only then do we know which KSE we got. + */ + td->td_frame = (struct trapframe *)((caddr_t)pcb2) - 1; + + /* + * Arrange for continuation at fork_return(), which + * will return to exception_return(). Note that the child + * process doesn't stay in the kernel for long! + */ + pcb2->pcb_hw.apcb_ksp = (u_int64_t)td->td_frame; + pcb2->pcb_context[0] = (u_int64_t)fork_return; /* s0: a0 */ + pcb2->pcb_context[1] = (u_int64_t)exception_return; /* s1: ra */ + pcb2->pcb_context[2] = (u_long)td; /* s2: a1 */ + pcb2->pcb_context[7] = (u_int64_t)fork_trampoline; /* ra: magic*/ +#ifdef SMP + /* + * We start off at a nesting level of 1 within the kernel. + */ + td->td_md.md_kernnest = 1; +#endif } /* @@ -284,19 +346,46 @@ void cpu_set_retval(struct thread *td, int retval, int aux, int success) { - /* KSEXXX */ + struct trapframe *frame; + + frame = td->td_frame; + frame->tf_regs[FRAME_V0] = (u_int64_t)retval; + frame->tf_regs[FRAME_A3] = (success) ? 0 : ~0; + frame->tf_regs[FRAME_A4] = (u_int64_t)aux; } void cpu_free_kse_mdstorage(struct kse *kse) { - /* KSEXXX */ + + free(kse->ke_mdstorage, M_TEMP); + kse->ke_mdstorage = NULL; + kse->ke_pcb = NULL; + kse->ke_frame = NULL; } int cpu_export_context(struct thread *td) { - /* KSEXXX */ + /* XXXKSE */ +#if 0 + struct trapframe *frame; + struct thread_mailbox *tm; + struct trapframe *uframe; + int error; + + frame = td->td_frame; + tm = td->td_mailbox; + uframe = &tm->ctx.tfrm.tf_tf; + error = copyout(frame, uframe, sizeof(*frame)); + /* + * "What about the fp regs?" I hear you ask.... XXXKSE + * Don't know where gs and "onstack" come from. + * May need to fiddle a few other values too. + */ + return (error); +#endif + return (0); } void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 4 7:23:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AA2537B408; Tue, 4 Jun 2002 07:22:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 223BF37B411 for ; Tue, 4 Jun 2002 07:22:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g54ELtE30271 for perforce@freebsd.org; Tue, 4 Jun 2002 07:21:55 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 4 Jun 2002 07:21:55 -0700 (PDT) Message-Id: <200206041421.g54ELtE30271@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12354 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12354 Change 12354 by jhb@jhb_laptop on 2002/06/04 07:20:54 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/linux/linux_dummy.c#5 integrate ... //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#6 integrate ... //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#4 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1.h#2 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#9 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_sysvec.c#3 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_util.h#4 integrate ... //depot/projects/smpng/sys/compat/linux/linux_file.c#10 integrate ... //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#14 integrate ... //depot/projects/smpng/sys/compat/linux/linux_ipc.c#8 integrate ... //depot/projects/smpng/sys/compat/linux/linux_misc.c#23 integrate ... //depot/projects/smpng/sys/compat/linux/linux_signal.c#5 integrate ... //depot/projects/smpng/sys/compat/linux/linux_socket.c#6 integrate ... //depot/projects/smpng/sys/compat/linux/linux_socket.h#2 integrate ... //depot/projects/smpng/sys/compat/linux/linux_stats.c#6 integrate ... //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#5 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#5 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#7 integrate ... //depot/projects/smpng/sys/conf/NOTES#14 integrate ... //depot/projects/smpng/sys/conf/files#41 integrate ... //depot/projects/smpng/sys/conf/files.i386#24 integrate ... //depot/projects/smpng/sys/conf/files.pc98#24 integrate ... //depot/projects/smpng/sys/conf/options#27 integrate ... //depot/projects/smpng/sys/dev/awi/awi.c#8 integrate ... //depot/projects/smpng/sys/dev/awi/awivar.h#3 integrate ... //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#6 integrate ... //depot/projects/smpng/sys/dev/ct/ct_machdep.h#4 integrate ... //depot/projects/smpng/sys/dev/drm/drm_dma.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#3 integrate ... //depot/projects/smpng/sys/dev/drm/drm_scatter.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/gamma_drv.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/mga_dma.c#2 integrate ... //depot/projects/smpng/sys/dev/drm/mga_drv.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/mga_state.c#2 integrate ... //depot/projects/smpng/sys/dev/drm/r128_cce.c#2 integrate ... //depot/projects/smpng/sys/dev/drm/r128_drv.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/r128_state.c#2 integrate ... //depot/projects/smpng/sys/dev/drm/radeon_cp.c#2 integrate ... //depot/projects/smpng/sys/dev/drm/radeon_drv.h#2 integrate ... //depot/projects/smpng/sys/dev/drm/radeon_state.c#2 integrate ... //depot/projects/smpng/sys/dev/em/README#1 branch ... //depot/projects/smpng/sys/dev/em/if_em.c#8 integrate ... //depot/projects/smpng/sys/dev/em/if_em.h#5 integrate ... //depot/projects/smpng/sys/dev/em/if_em_hw.c#1 branch ... //depot/projects/smpng/sys/dev/em/if_em_hw.h#1 branch ... //depot/projects/smpng/sys/dev/em/if_em_osdep.h#4 integrate ... //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#4 integrate ... //depot/projects/smpng/sys/dev/exca/exca.c#3 integrate ... //depot/projects/smpng/sys/dev/hea/eni.c#4 integrate ... //depot/projects/smpng/sys/dev/hea/eni.h#2 integrate ... //depot/projects/smpng/sys/dev/hea/eni_buffer.c#5 integrate ... //depot/projects/smpng/sys/dev/hea/hea_freebsd.c#1 branch ... //depot/projects/smpng/sys/dev/hea/hea_freebsd.h#1 branch ... //depot/projects/smpng/sys/dev/hea/hea_pci.c#1 branch ... //depot/projects/smpng/sys/dev/joy/joy.c#4 integrate ... //depot/projects/smpng/sys/dev/joy/joy_isa.c#2 integrate ... //depot/projects/smpng/sys/dev/joy/joy_pccard.c#2 integrate ... //depot/projects/smpng/sys/dev/joy/joyvar.h#2 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmc.c#4 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmc_common.c#2 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmc_fbsd3.c#2 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmc_media.c#2 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmcioctl.h#2 integrate ... //depot/projects/smpng/sys/dev/lmc/if_lmcvar.h#2 integrate ... //depot/projects/smpng/sys/dev/md/md.c#21 integrate ... //depot/projects/smpng/sys/dev/my/if_my.c#5 integrate ... //depot/projects/smpng/sys/dev/ncv/ncr53c500var.h#5 integrate ... //depot/projects/smpng/sys/dev/nsp/nspvar.h#5 integrate ... //depot/projects/smpng/sys/dev/pci/pci.c#12 integrate ... //depot/projects/smpng/sys/dev/pci/pcivar.h#5 integrate ... //depot/projects/smpng/sys/dev/pdq/if_fea.c#4 integrate ... //depot/projects/smpng/sys/dev/pdq/if_fpa.c#3 integrate ... //depot/projects/smpng/sys/dev/pdq/pdq_freebsd.h#2 integrate ... //depot/projects/smpng/sys/dev/pdq/pdqvar.h#3 integrate ... //depot/projects/smpng/sys/dev/ray/if_ray.c#2 integrate ... //depot/projects/smpng/sys/dev/stg/tmc18c30var.h#5 integrate ... //depot/projects/smpng/sys/dev/usb/udbp.c#4 integrate ... //depot/projects/smpng/sys/dev/usb/udbp.h#2 integrate ... //depot/projects/smpng/sys/dev/usb/urio.c#9 integrate ... //depot/projects/smpng/sys/dev/wl/if_wl.c#7 integrate ... //depot/projects/smpng/sys/dev/wl/if_wl.h#2 integrate ... //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#2 integrate ... //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#16 integrate ... //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#14 integrate ... //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#9 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc.c#4 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#6 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.c#6 integrate ... //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#8 integrate ... //depot/projects/smpng/sys/i386/include/asmacros.h#3 integrate ... //depot/projects/smpng/sys/i386/include/floatingpoint.h#2 integrate ... //depot/projects/smpng/sys/i386/include/if_wl_wavelan.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/ic/lemac.h#2 integrate ... //depot/projects/smpng/sys/i386/isa/if_le.c#5 integrate ... //depot/projects/smpng/sys/i386/isa/scd.c#5 integrate ... //depot/projects/smpng/sys/i386/linux/imgact_linux.c#4 integrate ... //depot/projects/smpng/sys/i386/linux/linux_dummy.c#7 integrate ... //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#18 integrate ... //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#10 integrate ... //depot/projects/smpng/sys/i4b/driver/i4b_ing.c#6 integrate ... //depot/projects/smpng/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate ... //depot/projects/smpng/sys/ia64/ia32/imgact_ia32.c#2 integrate ... //depot/projects/smpng/sys/ia64/ia32/imgact_ia32.h#2 integrate ... //depot/projects/smpng/sys/kern/imgact_elf.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_descrip.c#29 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#41 integrate ... //depot/projects/smpng/sys/kern/kern_malloc.c#13 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#39 integrate ... //depot/projects/smpng/sys/kern/subr_prf.c#15 integrate ... //depot/projects/smpng/sys/kern/sys_socket.c#8 integrate ... //depot/projects/smpng/sys/kern/tty.c#23 integrate ... //depot/projects/smpng/sys/kern/uipc_domain.c#5 integrate ... //depot/projects/smpng/sys/kern/uipc_mbuf.c#6 integrate ... //depot/projects/smpng/sys/kern/uipc_socket.c#23 integrate ... //depot/projects/smpng/sys/kern/uipc_socket2.c#16 integrate ... //depot/projects/smpng/sys/kern/uipc_syscalls.c#19 integrate ... //depot/projects/smpng/sys/kern/uipc_usrreq.c#20 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#25 integrate ... //depot/projects/smpng/sys/modules/Makefile#29 integrate ... //depot/projects/smpng/sys/modules/em/Makefile#2 integrate ... //depot/projects/smpng/sys/modules/hea/Makefile#1 branch ... //depot/projects/smpng/sys/net/raw_cb.c#4 integrate ... //depot/projects/smpng/sys/net/raw_usrreq.c#9 integrate ... //depot/projects/smpng/sys/net/route.c#6 integrate ... //depot/projects/smpng/sys/net/rtsock.c#19 integrate ... //depot/projects/smpng/sys/netatalk/ddp_input.c#5 integrate ... //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#11 integrate ... //depot/projects/smpng/sys/netatm/atm_aal5.c#7 integrate ... //depot/projects/smpng/sys/netatm/atm_socket.c#6 integrate ... //depot/projects/smpng/sys/netgraph/ng_async.c#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_async.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_base.c#9 integrate ... //depot/projects/smpng/sys/netgraph/ng_bpf.c#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_bpf.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_bridge.c#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_bridge.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_cisco.c#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_cisco.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_eiface.c#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_eiface.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_etf.c#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_etf.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_iface.c#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_ksocket.c#13 integrate ... //depot/projects/smpng/sys/netgraph/ng_ksocket.h#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_message.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_one2many.c#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_one2many.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_parse.c#7 integrate ... //depot/projects/smpng/sys/netgraph/ng_parse.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_ppp.c#5 integrate ... //depot/projects/smpng/sys/netgraph/ng_ppp.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_pppoe.c#8 integrate ... //depot/projects/smpng/sys/netgraph/ng_pppoe.h#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_pptpgre.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_sample.c#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_sample.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_socket.c#13 integrate ... //depot/projects/smpng/sys/netgraph/ng_tee.c#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_tee.h#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_vjc.c#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_vjc.h#2 integrate ... //depot/projects/smpng/sys/netinet/accf_data.c#5 integrate ... //depot/projects/smpng/sys/netinet/accf_http.c#5 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.c#25 integrate ... //depot/projects/smpng/sys/netinet/ip_divert.c#16 integrate ... //depot/projects/smpng/sys/netinet/ip_input.c#20 integrate ... //depot/projects/smpng/sys/netinet/ip_mroute.c#13 integrate ... //depot/projects/smpng/sys/netinet/raw_ip.c#19 integrate ... //depot/projects/smpng/sys/netinet/tcp_input.c#19 integrate ... //depot/projects/smpng/sys/netinet/tcp_output.c#8 integrate ... //depot/projects/smpng/sys/netinet/tcp_subr.c#20 integrate ... //depot/projects/smpng/sys/netinet/tcp_timer.c#5 integrate ... //depot/projects/smpng/sys/netinet/tcp_usrreq.c#12 integrate ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#21 integrate ... //depot/projects/smpng/sys/netinet6/icmp6.c#8 integrate ... //depot/projects/smpng/sys/netinet6/in6_pcb.c#15 integrate ... //depot/projects/smpng/sys/netinet6/in6_src.c#9 integrate ... //depot/projects/smpng/sys/netinet6/ip6_input.c#16 integrate ... //depot/projects/smpng/sys/netinet6/ip6_mroute.c#8 integrate ... //depot/projects/smpng/sys/netinet6/raw_ip6.c#12 integrate ... //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#14 integrate ... //depot/projects/smpng/sys/netipx/ipx_pcb.c#8 integrate ... //depot/projects/smpng/sys/netipx/ipx_usrreq.c#9 integrate ... //depot/projects/smpng/sys/netipx/spx_usrreq.c#6 integrate ... //depot/projects/smpng/sys/netkey/keysock.c#9 integrate ... //depot/projects/smpng/sys/netnatm/natm.c#7 integrate ... //depot/projects/smpng/sys/netncp/ncp_sock.c#3 integrate ... //depot/projects/smpng/sys/netns/idp_usrreq.c#4 integrate ... //depot/projects/smpng/sys/netns/ns.c#3 integrate ... //depot/projects/smpng/sys/netns/ns_pcb.c#4 integrate ... //depot/projects/smpng/sys/netns/spp_usrreq.c#3 integrate ... //depot/projects/smpng/sys/netsmb/smb_trantcp.c#10 integrate ... //depot/projects/smpng/sys/nfsclient/bootp_subr.c#12 integrate ... //depot/projects/smpng/sys/nfsclient/nfs_socket.c#10 integrate ... //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#8 integrate ... //depot/projects/smpng/sys/pc98/pc98/pmc.c#4 integrate ... //depot/projects/smpng/sys/pci/dc21040reg.h#2 integrate ... //depot/projects/smpng/sys/pci/if_de.c#3 integrate ... //depot/projects/smpng/sys/pci/if_devar.h#3 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_interface.c#4 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_log.c#5 integrate ... //depot/projects/smpng/sys/security/lomac/kernel_socket.c#10 integrate ... //depot/projects/smpng/sys/sys/gpt.h#2 integrate ... //depot/projects/smpng/sys/sys/imgact_elf.h#4 integrate ... //depot/projects/smpng/sys/sys/joystick.h#2 integrate ... //depot/projects/smpng/sys/sys/mbuf.h#8 integrate ... //depot/projects/smpng/sys/sys/param.h#25 integrate ... //depot/projects/smpng/sys/sys/proc.h#50 integrate ... //depot/projects/smpng/sys/sys/socket.h#6 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#21 integrate ... //depot/projects/smpng/sys/sys/vmmeter.h#2 integrate ... //depot/projects/smpng/sys/sys/wait.h#4 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#25 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#9 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#6 integrate ... //depot/projects/smpng/sys/ufs/ufs/ufs_ihash.c#6 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#15 integrate ... //depot/projects/smpng/sys/vm/vm_map.c#16 integrate ... //depot/projects/smpng/sys/vm/vm_map.h#10 integrate ... //depot/projects/smpng/sys/vm/vm_object.c#13 integrate ... //depot/projects/smpng/sys/vm/vm_object.h#6 integrate ... //depot/projects/smpng/sys/vm/vm_swap.c#13 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/linux/linux_dummy.c#5 (text+ko) ==== @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -26,7 +26,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/alpha/linux/linux_dummy.c,v 1.34 2001/10/16 06:15:35 marcel Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.35 2002/06/02 20:05:40 schweikh Exp $ */ #include ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#6 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -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. * - * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.81 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.82 2002/06/02 20:05:40 schweikh Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#4 (text+ko) ==== @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +30,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/alpha/osf1/imgact_osf1.c,v 1.10 2002/02/07 22:29:41 peter Exp $ + * $FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.11 2002/06/02 20:05:41 schweikh Exp $ */ #include ==== //depot/projects/smpng/sys/alpha/osf1/osf1.h#2 (text+ko) ==== @@ -11,7 +11,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -24,7 +24,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/alpha/osf1/osf1.h,v 1.4 2000/11/09 08:25:45 marcel Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1.h,v 1.5 2002/06/02 20:05:41 schweikh Exp $ */ extern struct sysent osf1_sysent[]; ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#9 (text+ko) ==== @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +30,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/alpha/osf1/osf1_signal.c,v 1.17 2002/04/05 00:52:15 alc Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.18 2002/06/02 20:05:41 schweikh Exp $ */ #include ==== //depot/projects/smpng/sys/alpha/osf1/osf1_sysvec.c#3 (text+ko) ==== @@ -15,7 +15,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -28,7 +28,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/alpha/osf1/osf1_sysvec.c,v 1.6 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.7 2002/06/02 20:05:41 schweikh Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/smpng/sys/alpha/osf1/osf1_util.h#4 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -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. * - * $FreeBSD: src/sys/alpha/osf1/osf1_util.h,v 1.3 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_util.h,v 1.4 2002/06/02 20:05:41 schweikh Exp $ */ #include ==== //depot/projects/smpng/sys/compat/linux/linux_file.c#10 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -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. * - * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.63 2002/02/27 18:31:36 jhb Exp $ + * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.64 2002/06/02 20:05:41 schweikh Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#14 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -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. * - * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.84 2002/02/20 17:06:37 alfred Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.85 2002/06/02 20:05:41 schweikh Exp $ */ #include ==== //depot/projects/smpng/sys/compat/linux/linux_ipc.c#8 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -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. * - * $FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.29 2002/05/18 07:53:56 marcel Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.30 2002/06/02 20:05:42 schweikh Exp $ */ #include ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#23 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -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. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.121 2002/05/01 02:17:33 peter Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.122 2002/06/02 20:05:42 schweikh Exp $ */ #include "opt_compat.h" ==== //depot/projects/smpng/sys/compat/linux/linux_signal.c#5 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -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. * - * $FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.33 2002/04/04 17:49:45 bde Exp $ + * $FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.34 2002/06/02 20:05:42 schweikh Exp $ */ #include ==== //depot/projects/smpng/sys/compat/linux/linux_socket.c#6 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -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. * - * $FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.31 2001/11/17 18:43:13 dillon Exp $ + * $FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.32 2002/06/02 20:05:42 schweikh Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/smpng/sys/compat/linux/linux_socket.h#2 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -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. * - * $FreeBSD: src/sys/compat/linux/linux_socket.h,v 1.1 2000/12/19 00:24:25 assar Exp $ + * $FreeBSD: src/sys/compat/linux/linux_socket.h,v 1.2 2002/06/02 20:05:42 schweikh Exp $ */ #ifndef _LINUX_SOCKET_H_ ==== //depot/projects/smpng/sys/compat/linux/linux_stats.c#6 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -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. * - * $FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.40 2002/01/14 00:13:42 alfred Exp $ + * $FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.41 2002/06/02 20:05:42 schweikh Exp $ */ #include ==== //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#5 (text+ko) ==== @@ -16,7 +16,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -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/compat/svr4/imgact_svr4.c,v 1.14 2002/03/20 05:41:37 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.15 2002/06/02 20:05:43 schweikh Exp $ */ #include ==== //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#5 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.14 2002/05/20 05:41:03 tanimura Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.15 2002/05/31 11:52:29 tanimura Exp $ */ #include @@ -116,17 +116,15 @@ if (fp->f_type == DTYPE_SOCKET) { so = (struct socket *)fp->f_data; - SOCK_LOCK(so); + DPRINTF(("fd %d is a socket\n", SCARG(uap, fd))); + if (so->so_state & SS_ASYNC) { + DPRINTF(("fd %d is an ASYNC socket!\n", SCARG(uap, fd))); + } + DPRINTF(("Here are its flags: 0x%x\n", so->so_state)); +#if defined(GROTTY_READ_HACK) so_state = so->so_state; -#if defined(GROTTY_READ_HACK) so->so_state &= ~SS_NBIO; #endif - SOCK_UNLOCK(so); - DPRINTF(("fd %d is a socket\n", SCARG(uap, fd))); - if (so_state & SS_ASYNC) { - DPRINTF(("fd %d is an ASYNC socket!\n", SCARG(uap, fd))); - } - DPRINTF(("Here are its flags: 0x%x\n", so_state)); } rv = read(td, &ra); @@ -142,9 +140,7 @@ #if defined(GROTTY_READ_HACK) if (so) { /* We've already checked to see if this is a socket */ - SOCK_LOCK(so); so->so_state = so_state; - SOCK_UNLOCK(so); } #endif fdrop(fp, td); ==== //depot/projects/smpng/sys/compat/svr4/svr4_ioctl.c#7 (text+ko) ==== @@ -25,16 +25,14 @@ * (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/compat/svr4/svr4_ioctl.c,v 1.13 2002/05/20 05:41:03 tanimura Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.14 2002/05/31 11:52:29 tanimura Exp $ */ #include -#include +#include #include #include -#include -#include -#include +#include #include #include #include @@ -95,7 +93,6 @@ char c; int num; int argsiz; - int sostate; svr4_decode_cmd(SCARG(uap, com), dir, &c, &num, &argsiz); @@ -116,10 +113,7 @@ #if defined(DEBUG_SVR4) if (fp->f_type == DTYPE_SOCKET) { struct socket *so = (struct socket *)fp->f_data; - SOCK_LOCK(so); - sostate = so->so_state; - SOCK_UNLOCK(so); - DPRINTF(("<<< IN: so_state = 0x%x\n", sostate)); + DPRINTF(("<<< IN: so_state = 0x%x\n", so->so_state)); } #endif @@ -164,10 +158,7 @@ struct socket *so; so = (struct socket *)fp->f_data; - SOCK_LOCK(so); - sostate = so->so_state; - SOCK_UNLOCK(so); - DPRINTF((">>> OUT: so_state = 0x%x\n", sostate)); + DPRINTF((">>> OUT: so_state = 0x%x\n", so->so_state)); } #endif error = (*fun)(fp, td, retval, SCARG(uap, fd), cmd, SCARG(uap, data)); ==== //depot/projects/smpng/sys/conf/NOTES#14 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1034 2002/05/28 09:04:48 marcel Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1035 2002/05/31 06:28:13 brooks Exp $ # # @@ -418,7 +418,7 @@ device fddi #Generic FDDI device arcnet #Generic Arcnet device sppp #Generic Synchronous PPP -device loop 1 #Network loopback device +device loop #Network loopback device device bpf #Berkeley packet filter device disc #Discard device (ds0, ds1, etc) device tap #Virtual Ethernet driver ==== //depot/projects/smpng/sys/conf/files#41 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.642 2002/05/30 17:37:34 takawata Exp $ +# $FreeBSD: src/sys/conf/files,v 1.643 2002/06/03 09:14:12 mdodd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -357,6 +357,8 @@ dev/hea/eni_receive.c optional hea dev/hea/eni_transmit.c optional hea dev/hea/eni_vcm.c optional hea +dev/hea/hea_pci.c optional hea pci +dev/hea/hea_freebsd.c optional hea dev/hfa/fore_buffer.c optional hfa dev/hfa/fore_command.c optional hfa dev/hfa/fore_globals.c optional hfa ==== //depot/projects/smpng/sys/conf/files.i386#24 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.400 2002/05/19 01:27:14 marcel Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.401 2002/06/03 22:30:35 pdeuskar Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -106,8 +106,7 @@ dev/ed/if_ed_isa.c optional ed isa dev/eisa/eisaconf.c optional eisa dev/em/if_em.c optional em -dev/em/if_em_fxhw.c optional em -dev/em/if_em_phy.c optional em +dev/em/if_em_hw.c optional em dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash ==== //depot/projects/smpng/sys/conf/files.pc98#24 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.232 2002/05/21 04:13:08 non Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.233 2002/06/03 22:30:35 pdeuskar Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -104,8 +104,7 @@ dev/ct/ct_isa.c optional ct isa dev/ed/if_ed_cbus.c optional ed isa dev/em/if_em.c optional em -dev/em/if_em_fxhw.c optional em -dev/em/if_em_phy.c optional em +dev/em/if_em_hw.c optional em dev/fb/fb.c optional fb dev/fb/fb.c optional gdc dev/fb/splash.c optional splash ==== //depot/projects/smpng/sys/conf/options#27 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.319 2002/05/28 09:04:48 marcel Exp $ +# $FreeBSD: src/sys/conf/options,v 1.320 2002/06/02 04:32:52 alfred Exp $ # # On the handling of kernel options # @@ -265,7 +265,6 @@ ETHER_SNAP opt_ef.h MROUTING opt_mrouting.h INET opt_inet.h -SOMAXCONN opt_inet.h INET6 opt_inet6.h IPSEC opt_ipsec.h IPSEC_ESP opt_ipsec.h ==== //depot/projects/smpng/sys/dev/awi/awi.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awi.c,v 1.19 2002/04/19 22:28:09 imp Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awi.c,v 1.20 2002/05/31 03:27:34 imp Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -86,14 +86,6 @@ */ #include "opt_inet.h" -#if defined(__FreeBSD__) && __FreeBSD__ >= 4 -#define NBPFILTER 1 -#elif defined(__FreeBSD__) && __FreeBSD__ >= 3 -#include "bpf.h" -#define NBPFILTER NBPF -#else -#include "bpfilter.h" -#endif #include #include @@ -134,6 +126,15 @@ #endif #endif +#if defined(__FreeBSD__) && __FreeBSD_version >= 400000 +#define NBPFILTER 1 +#elif defined(__FreeBSD__) && __FreeBSD_version >= 300000 +#include "bpf.h" +#define NBPFILTER NBPF +#else +#include "bpfilter.h" +#endif + #if NBPFILTER > 0 #include #include @@ -464,7 +465,7 @@ u_int8_t tmpstr[IEEE80211_NWID_LEN*2]; #ifdef __FreeBSD_version #if __FreeBSD_version < 500028 - struct proc *mythread = curproc; /* Little lie */ + struct proc *mythread = curproc; /* name a white lie */ #else struct thread *mythread = curthread; #endif ==== //depot/projects/smpng/sys/dev/awi/awivar.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awivar.h,v 1.12 2000/07/21 04:48:56 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awivar.h,v 1.7 2002/03/20 02:02:35 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awivar.h,v 1.8 2002/05/31 03:27:34 imp Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -95,7 +95,7 @@ void *sc_ih; /* interrupt handler */ #endif #ifdef __FreeBSD__ -#if __FreeBSD__ >= 4 +#if __FreeBSD_version >= 40000 struct { char dv_xname[64]; /*XXX*/ } sc_dev; ==== //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.19 2002/05/30 17:37:38 takawata Exp $ + * $FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.20 2002/06/01 16:20:27 alfred Exp $ */ /* @@ -586,8 +586,8 @@ static int barsort(const void *a, const void *b) { - return ((*(const struct resource_list_entry **)b)->count - - (*(const struct resource_list_entry **)a)->count); + return ((*(const struct resource_list_entry * const *)b)->count - + (*(const struct resource_list_entry * const *)a)->count); } static int ==== //depot/projects/smpng/sys/dev/ct/ct_machdep.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ct/ct_machdep.h,v 1.4 2002/05/30 07:30:42 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/ct/ct_machdep.h,v 1.5 2002/06/01 08:29:12 ru Exp $ */ /* $NecBSD: ct_machdep.h,v 1.4.12.2 2001/06/20 06:13:34 honda Exp $ */ /* $NetBSD$ */ @@ -208,7 +208,7 @@ CT_BUS_WEIGHT(chp) } -#if defined(__i386__) +#if defined(__i386__) && 0 #define SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) #else /* !__i386__ */ #define SOFT_INTR_REQUIRED(slp) ==== //depot/projects/smpng/sys/dev/drm/drm_dma.h#2 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_dma.h,v 1.2 2002/04/29 00:25:10 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_dma.h,v 1.3 2002/05/31 23:19:50 anholt Exp $ */ #ifdef __FreeBSD__ @@ -573,7 +573,7 @@ dev->irq = irq; DRM_OS_UNLOCK; - DRM_DEBUG( "%s: irq=%d\n", __FUNCTION__, irq ); + DRM_DEBUG( "%s: irq=%d\n", __func__, irq ); dev->context_flag = 0; dev->interrupt_flag = 0; @@ -642,7 +642,7 @@ if ( !irq ) return DRM_OS_ERR(EINVAL); - DRM_DEBUG( "%s: irq=%d\n", __FUNCTION__, irq ); + DRM_DEBUG( "%s: irq=%d\n", __func__, irq ); DRIVER_UNINSTALL(); ==== //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.4 2002/05/06 23:34:13 bde Exp $ + * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.5 2002/05/31 23:19:50 anholt Exp $ */ #include @@ -119,7 +119,7 @@ #define DRM_OS_READMEMORYBARRIER \ { \ int xchangeDummy; \ - DRM_DEBUG("%s\n", __FUNCTION__); \ + DRM_DEBUG("%s\n", __func__); \ __asm__ volatile(" push %%eax ; xchg %%eax, %0 ; pop %%eax" : : "m" (xchangeDummy)); \ __asm__ volatile(" push %%eax ; push %%ebx ; push %%ecx ; push %%edx ;" \ " movl $0,%%eax ; cpuid ; pop %%edx ; pop %%ecx ; pop %%ebx ;" \ @@ -242,18 +242,19 @@ /* Macros to make printf easier */ #define DRM_ERROR(fmt, arg...) \ - printf("error: " "[" DRM_NAME ":" __FUNCTION__ "] *ERROR* " fmt , ##arg) + printf("error: [" DRM_NAME ":%s] *ERROR* " fmt , \ + __func__, ##arg) #define DRM_MEM_ERROR(area, fmt, arg...) \ - printf("error: " "[" DRM_NAME ":" __FUNCTION__ ":%s] *ERROR* " fmt , \ - DRM(mem_stats)[area].name , ##arg) + printf("error: [" DRM_NAME ":%s:%s] *ERROR* " fmt , \ + __func__, DRM(mem_stats)[area].name , ##arg) #define DRM_INFO(fmt, arg...) printf("info: " "[" DRM_NAME "] " fmt , ##arg) #if DRM_DEBUG_CODE -#define DRM_DEBUG(fmt, arg...) \ - do { \ - if (DRM(flags) & DRM_FLAG_DEBUG) \ - printf("[" DRM_NAME ":" __FUNCTION__ "] " fmt , \ - ##arg); \ +#define DRM_DEBUG(fmt, arg...) \ + do { \ + if (DRM(flags) & DRM_FLAG_DEBUG) \ + printf("[" DRM_NAME ":%s] " fmt , \ + __func__, ##arg); \ } while (0) #else #define DRM_DEBUG(fmt, arg...) do { } while (0) ==== //depot/projects/smpng/sys/dev/drm/drm_scatter.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * Authors: * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_scatter.h,v 1.2 2002/04/29 00:25:10 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_scatter.h,v 1.3 2002/05/31 23:19:50 anholt Exp $ */ #define __NO_VERSION__ @@ -72,7 +72,7 @@ pmd_t *pmd; pte_t *pte; - DRM_DEBUG( "%s\n", __FUNCTION__ ); + DRM_DEBUG( "%s\n", __func__ ); if ( dev->sg ) return DRM_OS_ERR(EINVAL); ==== //depot/projects/smpng/sys/dev/drm/gamma_drv.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Authors: * Rickard E. (Rik) Faith * - * $FreeBSD: src/sys/dev/drm/gamma_drv.h,v 1.2 2002/04/29 00:25:10 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/gamma_drv.h,v 1.3 2002/05/31 23:19:50 anholt Exp $ */ #ifndef _GAMMA_DRV_H_ @@ -47,7 +47,7 @@ if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) || \ dev->lock.pid != DRM_OS_CURRENTPID ) { \ DRM_ERROR( "%s called without lock held\n", \ - __FUNCTION__ ); \ + __func__ ); \ return DRM_OS_ERR(EINVAL); \ } \ } while (0) ==== //depot/projects/smpng/sys/dev/drm/mga_dma.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 4 7:42:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9496C37B409; Tue, 4 Jun 2002 07:39:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 370AD37B421 for ; Tue, 4 Jun 2002 07:38:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g54EcYd32175 for perforce@freebsd.org; Tue, 4 Jun 2002 07:38:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 4 Jun 2002 07:38:34 -0700 (PDT) Message-Id: <200206041438.g54EcYd32175@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12358 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12358 Change 12358 by rwatson@rwatson_curry on 2002/06/04 07:37:41 Fixes to mountpoint labeling and handling -- due to changes brought in from the main tree, it was possible for kernel-mounted filesystems to not have 'mac_create_mount' called on them. Reorder mounting and labeling code a bit, and attempt to prevent leaking struct mount labels in failure modes not previously handled. This prevents a panic on statfs of devfs. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#43 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#43 (text+ko) ==== @@ -530,6 +530,7 @@ mp->mnt_iosize_max = DFLTPHYS; #ifdef MAC mac_init_mount(mp); + mac_create_mount(td->td_ucred, mp); #endif VOP_UNLOCK(vp, 0, td); @@ -550,6 +551,9 @@ else { mp->mnt_vfc->vfc_refcount--; vfs_unbusy(mp, td); +#ifdef MAC + mac_destroy_mount(mp); +#endif free((caddr_t)mp, M_MOUNT); } vput(vp); @@ -883,6 +887,7 @@ mp->mnt_iosize_max = DFLTPHYS; #ifdef MAC mac_init_mount(mp); + mac_create_mount(td->td_ucred, mp); #endif VOP_UNLOCK(vp, 0, td); update: @@ -901,6 +906,9 @@ else { mp->mnt_vfc->vfc_refcount--; vfs_unbusy(mp, td); +#ifdef MAC + mac_destroy_mount(mp); +#endif free((caddr_t)mp, M_MOUNT); } vput(vp); @@ -947,10 +955,6 @@ vrele(vp); return (error); } -#ifdef MAC - if (error == 0) - mac_create_mount(td->td_ucred, mp); -#endif /* MAC */ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); /* * Put the new filesystem on the mount list after root. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 4 8:48: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D2C737B403; Tue, 4 Jun 2002 08:48:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 596AD37B401 for ; Tue, 4 Jun 2002 08:48:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g54Fm0443612 for perforce@freebsd.org; Tue, 4 Jun 2002 08:48:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 4 Jun 2002 08:48:00 -0700 (PDT) Message-Id: <200206041548.g54Fm0443612@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12360 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12360 Change 12360 by rwatson@rwatson_curry on 2002/06/04 08:47:52 In mac_{biba,mls}_cred_check_rename_to_vnode(), don't dereference the target vnode label unless the vnode is non-NULL. This covers the "are you allowed to overwrite file (x) in a rename", which only applies if there is a target file to overwrite. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#46 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#33 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#46 (text+ko) ==== @@ -1406,10 +1406,12 @@ if (!mac_biba_dominate_single(subj, obj)) return (EACCES); - obj = SLOT(label); + if (vp != NULL) { + obj = SLOT(label); - if (!mac_biba_dominate_single(subj, obj)) - return (EACCES); + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + } return (0); } ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#33 (text+ko) ==== @@ -1399,10 +1399,12 @@ if (!mac_mls_dominate_single(obj, subj)) return (EACCES); - obj = SLOT(label); + if (vp != NULL) { + obj = SLOT(label); - if (!mac_mls_dominate_single(obj, subj)) - return (EACCES); + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + } return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 4 10:46:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2099A37B404; Tue, 4 Jun 2002 10:46:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BCABE37B400 for ; Tue, 4 Jun 2002 10:46:28 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g54HkS563688 for perforce@freebsd.org; Tue, 4 Jun 2002 10:46:28 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 4 Jun 2002 10:46:28 -0700 (PDT) Message-Id: <200206041746.g54HkS563688@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12362 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12362 Change 12362 by jhb@jhb_laptop on 2002/06/04 10:45:42 - Add a thread_runnable() macro to make some code more readable and make the KSE diff easier. - Fix the adaptive mutex spin optimization. We need to stop spinning not just when mtx_owner(m) changes, but also if the owner stops running. Affected files ... ... //depot/projects/smpng/sys/kern/kern_mutex.c#36 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#36 (text+ko) ==== @@ -70,6 +70,9 @@ #define mtx_owner(m) (mtx_unowned((m)) ? NULL \ : (struct thread *)((m)->mtx_lock & MTX_FLAGMASK)) +#define thread_runnable(td) \ + ((td)->td_kse != NULL && (td)->td_kse->ke_oncpu != NOCPU) + /* * Lock classes for sleep and spin mutexes. */ @@ -129,7 +132,7 @@ * If lock holder is actually running, just bump priority. */ /* XXXKSE this test is not sufficient */ - if (td->td_kse && (td->td_kse->ke_oncpu != NOCPU)) { + if (thread_runnable(td)) { MPASS(td->td_proc->p_stat == SRUN || td->td_proc->p_stat == SZOMB || td->td_proc->p_stat == SSTOP); @@ -531,10 +534,10 @@ * CPU, spin instead of blocking. */ owner = (struct thread *)(v & MTX_FLAGMASK); - if (m != &Giant && owner->td_kse != NULL && - owner->td_kse->ke_oncpu != NOCPU) { + if (m != &Giant && thread_runnable(owner)) { mtx_unlock_spin(&sched_lock); - while (mtx_owner(m) == owner) { + while (mtx_owner(m) == owner && + thread_runnable(owner)) { #ifdef __i386__ ia32_pause(); #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 4 14:20:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B847237B406; Tue, 4 Jun 2002 14:20:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88]) by hub.freebsd.org (Postfix) with ESMTP id D9E8B37B405; Tue, 4 Jun 2002 14:20:23 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc52.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020604212023.WRRH2751.rwcrmhc52.attbi.com@InterJet.elischer.org>; Tue, 4 Jun 2002 21:20:23 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id OAA49358; Tue, 4 Jun 2002 14:14:41 -0700 (PDT) Date: Tue, 4 Jun 2002 14:14:40 -0700 (PDT) From: Julian Elischer To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 12362 for review In-Reply-To: <200206041746.g54HkS563688@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, 4 Jun 2002, John Baldwin wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12362 > > Change 12362 by jhb@jhb_laptop on 2002/06/04 10:45:42 > > - Add a thread_runnable() macro to make some code more readable > and make the KSE diff easier. > - Fix the adaptive mutex spin optimization. We need to stop > spinning not just when mtx_owner(m) changes, but also if the > owner stops running. > > Affected files ... > > ... //depot/projects/smpng/sys/kern/kern_mutex.c#36 edit > > Differences ... > > ==== //depot/projects/smpng/sys/kern/kern_mutex.c#36 (text+ko) ==== > > @@ -70,6 +70,9 @@ > #define mtx_owner(m) (mtx_unowned((m)) ? NULL \ > : (struct thread *)((m)->mtx_lock & MTX_FLAGMASK)) > > +#define thread_runnable(td) \ > + ((td)->td_kse != NULL && (td)->td_kse->ke_oncpu != NOCPU) > + this actually checks for "thread_running" not "thread_runnable". Since you are mentioning KSE diffs, in KSE this test is performed by: if (td->td_state == TDS_RUNNING) and if you want to check for both running and runnable, you need: if ((td->td_state == TDS_RUNNING) || (td->td_state == TDS_RUNQ)) > /* > * Lock classes for sleep and spin mutexes. > */ > @@ -129,7 +132,7 @@ > * If lock holder is actually running, just bump priority. > */ > /* XXXKSE this test is not sufficient */ > - if (td->td_kse && (td->td_kse->ke_oncpu != NOCPU)) { > + if (thread_runnable(td)) { > MPASS(td->td_proc->p_stat == SRUN > || td->td_proc->p_stat == SZOMB > || td->td_proc->p_stat == SSTOP); > @@ -531,10 +534,10 @@ > * CPU, spin instead of blocking. > */ > owner = (struct thread *)(v & MTX_FLAGMASK); > - if (m != &Giant && owner->td_kse != NULL && > - owner->td_kse->ke_oncpu != NOCPU) { > + if (m != &Giant && thread_runnable(owner)) { > mtx_unlock_spin(&sched_lock); > - while (mtx_owner(m) == owner) { > + while (mtx_owner(m) == owner && > + thread_runnable(owner)) { > #ifdef __i386__ > ia32_pause(); > #endif > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 4 15:11:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDD9737B40E; Tue, 4 Jun 2002 15:10:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by hub.freebsd.org (Postfix) with ESMTP id EE12937B412 for ; Tue, 4 Jun 2002 15:09:46 -0700 (PDT) Received: (qmail 19339 invoked from network); 4 Jun 2002 22:09:43 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 4 Jun 2002 22:09:43 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g54M9fF54603; Tue, 4 Jun 2002 18:09:41 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Tue, 04 Jun 2002 18:09:36 -0400 (EDT) From: John Baldwin To: Julian Elischer Subject: Re: PERFORCE change 12362 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 04-Jun-2002 Julian Elischer wrote: > > > On Tue, 4 Jun 2002, John Baldwin wrote: > >> http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12362 >> >> Change 12362 by jhb@jhb_laptop on 2002/06/04 10:45:42 >> >> - Add a thread_runnable() macro to make some code more readable >> and make the KSE diff easier. >> - Fix the adaptive mutex spin optimization. We need to stop >> spinning not just when mtx_owner(m) changes, but also if the >> owner stops running. >> >> Affected files ... >> >> ... //depot/projects/smpng/sys/kern/kern_mutex.c#36 edit >> >> Differences ... >> >> ==== //depot/projects/smpng/sys/kern/kern_mutex.c#36 (text+ko) ==== >> >> @@ -70,6 +70,9 @@ >> #define mtx_owner(m) (mtx_unowned((m)) ? NULL \ >> : (struct thread *)((m)->mtx_lock & MTX_FLAGMASK)) >> >> +#define thread_runnable(td) \ >> + ((td)->td_kse != NULL && (td)->td_kse->ke_oncpu != NOCPU) >> + > > this actually checks for "thread_running" not "thread_runnable". > Since you are mentioning KSE diffs, in KSE this test is performed by: Duh, good point. I'll fix. > if (td->td_state == TDS_RUNNING) > > and if you want to check for both running and runnable, you need: > > if ((td->td_state == TDS_RUNNING) || (td->td_state == TDS_RUNQ)) > > >> /* >> * Lock classes for sleep and spin mutexes. >> */ >> @@ -129,7 +132,7 @@ >> * If lock holder is actually running, just bump priority. >> */ >> /* XXXKSE this test is not sufficient */ >> - if (td->td_kse && (td->td_kse->ke_oncpu != NOCPU)) { >> + if (thread_runnable(td)) { >> MPASS(td->td_proc->p_stat == SRUN >> || td->td_proc->p_stat == SZOMB >> || td->td_proc->p_stat == SSTOP); >> @@ -531,10 +534,10 @@ >> * CPU, spin instead of blocking. >> */ >> owner = (struct thread *)(v & MTX_FLAGMASK); >> - if (m != &Giant && owner->td_kse != NULL && >> - owner->td_kse->ke_oncpu != NOCPU) { >> + if (m != &Giant && thread_runnable(owner)) { >> mtx_unlock_spin(&sched_lock); >> - while (mtx_owner(m) == owner) { >> + while (mtx_owner(m) == owner && >> + thread_runnable(owner)) { >> #ifdef __i386__ >> ia32_pause(); >> #endif >> > -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 4 15:14:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08A3E37B405; Tue, 4 Jun 2002 15:14:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 011CE37B401 for ; Tue, 4 Jun 2002 15:14:04 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g54ME3g14208 for perforce@freebsd.org; Tue, 4 Jun 2002 15:14:03 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Tue, 4 Jun 2002 15:14:03 -0700 (PDT) Message-Id: <200206042214.g54ME3g14208@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12372 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12372 Change 12372 by jhb@jhb_laptop on 2002/06/04 15:13:31 IFC. Affected files ... ... //depot/projects/smpng/sys/cam/scsi/scsi_all.c#9 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_all.h#3 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#37 integrate ... //depot/projects/smpng/sys/sparc64/include/tsb.h#8 integrate Differences ... ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.33 2002/04/23 06:14:10 marcel Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.34 2002/06/04 17:41:47 mjacob Exp $ */ #include @@ -2582,6 +2582,34 @@ timeout); } +/* + * Prevent or allow the user to remove the media + */ +void +scsi_prevent(struct ccb_scsiio *csio, u_int32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + u_int8_t tag_action, u_int8_t action, + u_int8_t sense_len, u_int32_t timeout) +{ + struct scsi_prevent *scsi_cmd; + + cam_fill_csio(csio, + retries, + cbfcnp, + /*flags*/CAM_DIR_NONE, + tag_action, + /*data_ptr*/NULL, + /*dxfer_len*/0, + sense_len, + sizeof(*scsi_cmd), + timeout); + + scsi_cmd = (struct scsi_prevent *)&csio->cdb_io.cdb_bytes; + bzero(scsi_cmd, sizeof(*scsi_cmd)); + scsi_cmd->opcode = PREVENT_ALLOW; + scsi_cmd->how = action; +} + /* XXX allow specification of address and PMI bit and LBA */ void scsi_read_capacity(struct ccb_scsiio *csio, u_int32_t retries, @@ -2608,32 +2636,28 @@ scsi_cmd->opcode = READ_CAPACITY; } -/* - * Prevent or allow the user to remove the media - */ void -scsi_prevent(struct ccb_scsiio *csio, u_int32_t retries, - void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, u_int8_t action, - u_int8_t sense_len, u_int32_t timeout) +scsi_report_luns(struct ccb_scsiio *csio, u_int32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + u_int8_t tag_action, struct scsi_report_luns_data *rpl_buf, + u_int32_t alloc_len, u_int8_t sense_len, u_int32_t timeout) { - struct scsi_prevent *scsi_cmd; + struct scsi_report_luns *scsi_cmd; cam_fill_csio(csio, retries, cbfcnp, - /*flags*/CAM_DIR_NONE, + /*flags*/CAM_DIR_IN, tag_action, - /*data_ptr*/NULL, - /*dxfer_len*/0, + /*data_ptr*/(u_int8_t *)rpl_buf, + /*dxfer_len*/alloc_len, sense_len, sizeof(*scsi_cmd), timeout); - - scsi_cmd = (struct scsi_prevent *)&csio->cdb_io.cdb_bytes; + scsi_cmd = (struct scsi_report_luns *)&csio->cdb_io.cdb_bytes; bzero(scsi_cmd, sizeof(*scsi_cmd)); - scsi_cmd->opcode = PREVENT_ALLOW; - scsi_cmd->how = action; + scsi_cmd->opcode = REPORT_LUNS; + scsi_ulto4b(alloc_len, scsi_cmd->addr); } /* ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.h#3 (text+ko) ==== @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.18 2001/08/27 01:29:30 kbyanc Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.19 2002/06/04 17:41:47 mjacob Exp $ */ /* @@ -505,6 +505,7 @@ #define LOG_SENSE 0x4d #define MODE_SELECT_10 0x55 #define MODE_SENSE_10 0x5A +#define REPORT_LUNS 0xA0 #define MOVE_MEDIUM 0xa5 #define READ_12 0xa8 #define WRITE_12 0xaa @@ -675,6 +676,29 @@ u_int8_t length[4]; }; +struct scsi_report_luns +{ + u_int8_t opcode; + u_int8_t byte2; + u_int8_t unused[3]; + u_int8_t addr[4]; + u_int8_t control; +}; + +struct scsi_report_luns_data { + u_int8_t length[4]; /* length of LUN inventory, in bytes */ + u_int8_t reserved[4]; /* unused */ + /* + * LUN inventory- we only support the type zero form for now. + */ + struct { + u_int8_t lundata[8]; + } luns[1]; +}; +#define RPL_LUNDATA_ATYP_MASK 0xc0 /* MBZ for type 0 lun */ +#define RPL_LUNDATA_T0LUN 1 /* @ lundata[1] */ + + struct scsi_sense_data { u_int8_t error_code; @@ -753,6 +777,8 @@ #define SCSI_DEFAULT_DENSITY 0x00 /* use 'default' density */ #define SCSI_SAME_DENSITY 0x7f /* use 'same' density- >= SCSI-2 only */ + + /* * Status Byte */ @@ -943,16 +969,23 @@ u_int32_t param_len, u_int8_t sense_len, u_int32_t timeout); +void scsi_prevent(struct ccb_scsiio *csio, u_int32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + u_int8_t tag_action, u_int8_t action, + u_int8_t sense_len, u_int32_t timeout); + void scsi_read_capacity(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, - struct scsi_read_capacity_data *rcap_buf, + struct scsi_read_capacity_data *, u_int8_t sense_len, u_int32_t timeout); -void scsi_prevent(struct ccb_scsiio *csio, u_int32_t retries, - void (*cbfcnp)(struct cam_periph *, union ccb *), - u_int8_t tag_action, u_int8_t action, - u_int8_t sense_len, u_int32_t timeout); +void scsi_report_luns(struct ccb_scsiio *csio, u_int32_t retries, + void (*cbfcnp)(struct cam_periph *, + union ccb *), u_int8_t tag_action, + struct scsi_report_luns_data *, + u_int32_t alloc_len, u_int8_t sense_len, + u_int32_t timeout); void scsi_synchronize_cache(struct ccb_scsiio *csio, u_int32_t retries, ==== //depot/projects/smpng/sys/kern/kern_mutex.c#37 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.98 2002/05/23 03:08:42 des Exp $ + * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.100 2002/06/04 21:53:48 jhb Exp $ */ /* ==== //depot/projects/smpng/sys/sparc64/include/tsb.h#8 (text+ko) ==== @@ -26,13 +26,13 @@ * SUCH DAMAGE. * * from: BSDI: pmap.v9.h,v 1.10.2.6 1999/08/23 22:18:44 cp Exp - * $FreeBSD: src/sys/sparc64/include/tsb.h,v 1.14 2002/05/29 06:08:44 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/tsb.h,v 1.15 2002/06/04 19:40:45 jake Exp $ */ #ifndef _MACHINE_TSB_H_ #define _MACHINE_TSB_H_ -#define TSB_PAGES_SHIFT (1) +#define TSB_PAGES_SHIFT (4) #define TSB_PAGES (1 << TSB_PAGES_SHIFT) #define TSB_BSHIFT (TSB_PAGES_SHIFT + PAGE_SHIFT) #define TSB_BSIZE (1UL << TSB_BSHIFT) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 5 12:35:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D46A437B403; Wed, 5 Jun 2002 12:34:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AFFC837B407 for ; Wed, 5 Jun 2002 12:34:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g55JYXD45150 for perforce@freebsd.org; Wed, 5 Jun 2002 12:34:33 -0700 (PDT) (envelope-from green@freebsd.org) Date: Wed, 5 Jun 2002 12:34:33 -0700 (PDT) Message-Id: <200206051934.g55JYXD45150@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 12404 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12404 Change 12404 by green@green_laptop_2 on 2002/06/05 12:34:14 Update mac_te to work with reality. Some newer hooks added aren't yet implemented. Affected files ... ... //depot/projects/trustedbsd/mac/sys/modules/Makefile#24 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#32 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#24 (text+ko) ==== @@ -56,6 +56,7 @@ mac_none \ mac_partition \ mac_seeotheruids \ + mac_te \ mac_test \ md \ mii \ ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#32 (text+ko) ==== @@ -76,6 +76,10 @@ &mac_te_enabled, 0, "Enforce Type Enforcement policy"); TUNABLE_INT("security.mac.te.enabled", &mac_te_enabled); +static int destroyed_not_inited; +SYSCTL_INT(_security_mac_te, OID_AUTO, destroyed_not_inited, CTLFLAG_RD, + &destroyed_not_inited, 0, "Count of labels destroyed but not inited"); + static int mac_te_debug_checks = 0; SYSCTL_INT(_security_mac_te, OID_AUTO, debug_checks, CTLFLAG_RW, &mac_te_debug_checks, 0, "printf frequently for access checks"); @@ -87,6 +91,11 @@ TUNABLE_INT("security.mac.te.debug_transitions", &mac_te_debug_transitions); +static int labelslot; +#define SLOT(l) ((struct mac_te *)LABEL_TO_SLOT((l), labelslot).l_ptr) + +static MALLOC_DEFINE(M_MACTE, "te label", "MAC/TE labels"); + struct te_rule { struct mac_te tr_subject; struct mac_te tr_object; @@ -161,6 +170,192 @@ static const int te_transition_policy_num = sizeof(te_transition_policy) / sizeof(te_transition_policy[0]); +static struct mac_te * +te_alloc(int how) +{ + + return (malloc(sizeof(struct mac_te), M_MACTE, M_ZERO | how)); +} + +static void +te_free(struct mac_te *tep) +{ + + if (tep != NULL) + free(tep, M_MACTE); + else + atomic_add_int(&destroyed_not_inited, 1); +} + +/* + * Label operations. + */ +static void +mac_te_init_bpfdesc(struct bpf_d *bpf_d, struct label *label) +{ + + SLOT(label) = te_alloc(M_WAITOK); +} + +static void +mac_te_init_devfsdirent(struct devfs_dirent *devfs_dirent, + struct label *label) +{ + + SLOT(label) = te_alloc(M_WAITOK); +} + +static void +mac_te_init_ifnet(struct ifnet *ifnet, struct label *label) +{ + + SLOT(label) = te_alloc(M_WAITOK); +} + +static void +mac_te_init_ipq(struct ipq *ipq, struct label *label) +{ + + SLOT(label) = te_alloc(M_WAITOK); +} + +static int +mac_te_init_mbuf(struct mbuf *mbuf, int how, struct label *label) +{ + + SLOT(label) = te_alloc(how); + if (SLOT(label) == NULL) + return (ENOMEM); + + return (0); +} + +static void +mac_te_init_mount(struct mount *mount, struct label *mntlabel, + struct label *fslabel) +{ + + SLOT(mntlabel) = te_alloc(M_WAITOK); + SLOT(fslabel) = te_alloc(M_WAITOK); +} + +static void +mac_te_init_socket(struct socket *socket, struct label *label, + struct label *peerlabel) +{ + + SLOT(label) = te_alloc(M_WAITOK); + SLOT(peerlabel) = te_alloc(M_WAITOK); +} + +static void +mac_te_init_subject(struct ucred *ucred, struct label *label) +{ + + SLOT(label) = te_alloc(M_WAITOK); +} + +static void +mac_te_init_temp(struct label *label) +{ + + SLOT(label) = te_alloc(M_WAITOK); +} + +static void +mac_te_init_vnode(struct vnode *vp, struct label *label) +{ + + SLOT(label) = te_alloc(M_WAITOK); +} + +static void +mac_te_destroy_bpfdesc(struct bpf_d *bpf_d, struct label *label) +{ + + te_free(SLOT(label)); + SLOT(label) = NULL; +} + +static void +mac_te_destroy_devfsdirent(struct devfs_dirent *devfs_dirent, + struct label *label) +{ + + te_free(SLOT(label)); + SLOT(label) = NULL; +} + +static void +mac_te_destroy_ifnet(struct ifnet *ifnet, struct label *label) +{ + + te_free(SLOT(label)); + SLOT(label) = NULL; +} + +static void +mac_te_destroy_ipq(struct ipq *ipq, struct label *label) +{ + + te_free(SLOT(label)); + SLOT(label) = NULL; +} + +static void +mac_te_destroy_mbuf(struct mbuf *mbuf, struct label *label) +{ + + te_free(SLOT(label)); + SLOT(label) = NULL; +} + +static void +mac_te_destroy_mount(struct mount *mount, struct label *mntlabel, + struct label *fslabel) +{ + + te_free(SLOT(mntlabel)); + SLOT(mntlabel) = NULL; + te_free(SLOT(fslabel)); + SLOT(fslabel) = NULL; +} + +static void +mac_te_destroy_socket(struct socket *socket, struct label *label, + struct label *peerlabel) +{ + + te_free(SLOT(label)); + SLOT(label) = NULL; + te_free(SLOT(peerlabel)); + SLOT(peerlabel) = NULL; +} + +static void +mac_te_destroy_subject(struct ucred *ucred, struct label *label) +{ + + te_free(SLOT(label)); + SLOT(label) = NULL; +} + +static void +mac_te_destroy_temp(struct label *label) +{ + + te_free(SLOT(label)); + SLOT(label) = NULL; +} + +static void +mac_te_destroy_vnode(struct vnode *vp, struct label *label) +{ + + te_free(SLOT(label)); + SLOT(label) = NULL; +} + static const char * mac_te_classop_to_string(int object_class, int operation) { @@ -234,19 +429,19 @@ * Syntactic check of label: 0 for success, else an errno. */ static int -mac_te_label_valid(struct mac *label) +mac_te_label_valid(const struct mac_te *label) { int i; /* Check that it's a properly terminated string. */ for (i = 0; i < MAC_TE_TYPE_MAXLEN + 1; i++) { - if (label->m_te.mt_type[i] == '\0') + if (label->mt_type[i] == '\0') break; } if (i == MAC_TE_TYPE_MAXLEN + 1) return (EINVAL); /* Check that it's a non-nul string. */ - if (strlen(label->m_te.mt_type) == 0) + if (strlen(label->mt_type) == 0) return (EINVAL); else return (0); @@ -267,14 +462,14 @@ } static int -mac_te_equal(struct mac *labela, struct mac *labelb) +mac_te_equal(struct label *labela, struct label *labelb) { - return (mac_te_label_equal(&labela->m_te, &labelb->m_te)); + return (mac_te_label_equal(SLOT(labela), SLOT(labelb))); } static int -mac_te_check(struct mac *subject, struct mac *object, int object_class, +mac_te_check(struct mac_te *subject, struct mac_te *object, int object_class, int operation) { int match; @@ -293,42 +488,42 @@ te_policy[rule].tr_operation == MAC_TE_OPERATION_ANY)); match = (match && mac_te_label_equal(&te_policy[rule].tr_subject, - &subject->m_te)); + subject)); match = (match && mac_te_label_equal(&te_policy[rule].tr_object, - &object->m_te)); + object)); if (match) { if (mac_te_debug_checks) printf("%s %s %s success\n", - subject->m_te.mt_type, + subject->mt_type, mac_te_classop_to_string(object_class, - operation), object->m_te.mt_type); + operation), object->mt_type); return (0); } } if (mac_te_debug_checks) - printf("%s %s %s fail\n", subject->m_te.mt_type, + printf("%s %s %s fail\n", subject->mt_type, mac_te_classop_to_string(object_class, operation), - object->m_te.mt_type); + object->mt_type); return (EACCES); } static void -mac_te_init_label_as(struct mac *label, char *type) +mac_te_init_label_as(struct mac_te *telabel, char *type) { - bzero(&label->m_te.mt_type, MAC_TE_TYPE_MAXLEN+1); - strncpy(label->m_te.mt_type, type, MAC_TE_TYPE_MAXLEN); + bzero(&telabel->mt_type, MAC_TE_TYPE_MAXLEN+1); + strncpy(telabel->mt_type, type, MAC_TE_TYPE_MAXLEN); } static void -mac_te_init_label(struct mac *label) +mac_te_init_label(struct mac_te *telabel) { - mac_te_init_label_as(label, MAC_TE_TYPE_UNINITIALIZED); + mac_te_init_label_as(telabel, MAC_TE_TYPE_UNINITIALIZED); } static void @@ -340,42 +535,39 @@ } static void -mac_te_copy_label(struct mac *labelfrom, struct mac *labelto) +mac_te_copy_label(struct mac_te *tefrom, struct mac_te *teto) { - mac_te_copy_label_teonly(&labelfrom->m_te, &labelto->m_te); + mac_te_copy_label_teonly(tefrom, teto); } static void mac_te_create_proc0(struct ucred *cred) { - mac_te_init_label_as(&cred->cr_label, MAC_TE_TYPE_KPROC); + mac_te_init_label_as(SLOT(&cred->cr_label), MAC_TE_TYPE_KPROC); } static void mac_te_create_proc1(struct ucred *cred) { - mac_te_init_label_as(&cred->cr_label, MAC_TE_TYPE_INIT); + mac_te_init_label_as(SLOT(&cred->cr_label), MAC_TE_TYPE_INIT); } static void mac_te_create_subject(struct ucred *cred_parent, struct ucred *cred_child) { - mac_te_copy_label(&cred_parent->cr_label, &cred_child->cr_label); + mac_te_copy_label(SLOT(&cred_parent->cr_label), + SLOT(&cred_child->cr_label)); } static int -mac_te_cred_check_relabel_subject(struct ucred *cred, struct mac *newlabel) +mac_te_cred_check_relabel_subject(struct ucred *cred, struct label *newlabel) { int error, privilege_needed; - error = mac_te_label_valid(newlabel); - if (error) - return (error); - /* Allow no-op updates without privilege. */ privilege_needed = 0; if (!mac_te_equal(&cred->cr_label, newlabel)) @@ -392,14 +584,10 @@ static int mac_te_cred_check_relabel_vnode(struct ucred *cred, struct vnode *vp, - struct mac *oldlabel, struct mac *newlabel) + struct label *oldlabel, struct label *newlabel) { int error, privilege_needed; - error = mac_te_label_valid(newlabel); - if (error) - return (error); - /* Allow no-op updates without privilege. */ privilege_needed = 0; if (!mac_te_equal(&cred->cr_label, newlabel)) @@ -415,14 +603,15 @@ } static void -mac_te_relabel_subject(struct ucred *cred, struct mac *newlabel) +mac_te_relabel_subject(struct ucred *cred, struct label *newlabel) { - mac_te_copy_label(newlabel, &cred->cr_label); + mac_te_copy_label(SLOT(newlabel), SLOT(&cred->cr_label)); } static int -mac_te_ifnet_check_send_mbuf(struct ifnet *ifnet, struct mbuf *m) +mac_te_ifnet_check_send_mbuf(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *m, struct label *mbuflabel) { /* @@ -430,45 +619,41 @@ * mbuf as an object. Since sockets are objects, this is * probably wrong. */ - return (mac_te_check(&ifnet->if_label, &m->m_pkthdr.label, + return (mac_te_check(SLOT(ifnetlabel), SLOT(mbuflabel), MAC_TE_CLASS_MBUF, MAC_TE_OPERATION_MBUF_SEND)); } static int mac_te_cred_check_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, - struct mac *newlabel) + struct label *newlabel) { - int error; - - error = mac_te_label_valid(newlabel); - if (error) - return (error); return (suser_cred(cred, 0)); } static void mac_te_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, - struct mac *newlabel) + struct label *ifnetlabel, struct label *newlabel) { - mac_te_copy_label(newlabel, &ifnet->if_label); + mac_te_copy_label(SLOT(newlabel), SLOT(ifnetlabel)); } static int mac_te_bpfdesc_check_receive_from_ifnet(struct bpf_d *bpf_d, - struct ifnet *ifnet) + struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel) { if (!mac_te_enabled) return (0); - return (mac_te_check(&bpf_d->bd_label, &ifnet->if_label, + return (mac_te_check(SLOT(bpflabel), SLOT(ifnetlabel), MAC_TE_CLASS_BPF, MAC_TE_OPERATION_BPF_RECEIVE)); } static int -mac_te_socket_check_receive_mbuf(struct socket *so, struct mbuf *m) +mac_te_socket_check_receive_mbuf(struct socket *so, struct label *socketlabel, + struct mbuf *m, struct label *mbuflabel) { /* @@ -476,180 +661,185 @@ * mbuf as an object. Since sockets are objects, this is * probably wrong. */ - return (mac_te_check(&so->so_label, &m->m_pkthdr.label, + return (mac_te_check(SLOT(socketlabel), SLOT(mbuflabel), MAC_TE_CLASS_MBUF, MAC_TE_OPERATION_MBUF_RECEIVE)); } static void -mac_te_create_ifnet(struct ifnet *ifnet) +mac_te_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel) { if (ifnet->if_type == IFT_LOOP) { - mac_te_init_label_as(&ifnet->if_label, MAC_TE_TYPE_EQUAL); + mac_te_init_label_as(SLOT(ifnetlabel), MAC_TE_TYPE_EQUAL); } else { - mac_te_init_label(&ifnet->if_label); + mac_te_init_label(SLOT(ifnetlabel)); } } static void -mac_te_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d) +mac_te_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d, + struct label *bdlabel) { - mac_te_copy_label(&cred->cr_label, &bpf_d->bd_label); + mac_te_copy_label(SLOT(&cred->cr_label), SLOT(bdlabel)); } static void -mac_te_create_object(struct ucred *cred, struct mac *label) +mac_te_create_object(struct ucred *cred, struct label *label) { - mac_te_copy_label(&cred->cr_label, label); + mac_te_copy_label(SLOT(&cred->cr_label), SLOT(label)); } static void -mac_te_create_object_from_object(struct mac *oldlabel, struct mac *newlabel) +mac_te_create_object_from_object(struct label *oldlabel, struct label *newlabel) { - mac_te_copy_label(oldlabel, newlabel); + mac_te_copy_label(SLOT(oldlabel), SLOT(newlabel)); } static void -mac_te_create_mbuf_datagram_from_mbuf_fragmentqueue(struct mbuf *fragmentqueue, - struct mbuf *datagram) +mac_te_create_datagram_from_ipq(struct mbuf *ipq, struct label *ipqlabel, + struct mbuf *datagram, struct label *datagramlabel) { - mac_te_copy_label(&fragmentqueue->m_pkthdr.label, - &datagram->m_pkthdr.label); + mac_te_copy_label(SLOT(ipqlabel), SLOT(datagramlabel)); } static void -mac_te_create_mbuf_fragment_from_mbuf(struct mbuf *mbuf, struct mbuf *fragment) +mac_te_create_fragment_from_datagram(struct mbuf *datagram, + struct label *datagramlabel, struct mbuf *fragment, + struct label *fragmentlabel) { - mac_te_init_label(&fragment->m_pkthdr.label); - mac_te_copy_label(&mbuf->m_pkthdr.label, &fragment->m_pkthdr.label); + mac_te_init_label(SLOT(fragmentlabel)); + mac_te_copy_label(SLOT(datagramlabel), SLOT(fragmentlabel)); } static void -mac_te_create_mbuf_fragmentqueue_from_mbuf_fragment(struct mbuf *fragment, - struct mbuf *fragmentqueue) +mac_te_create_ipq_from_fragment(struct mbuf *fragment, + struct label *fragmentlabel, struct mbuf *ipq, struct label *ipqlabel) { - mac_te_copy_label(&fragment->m_pkthdr.label, - &fragmentqueue->m_pkthdr.label); + mac_te_copy_label(SLOT(fragmentlabel), SLOT(ipqlabel)); } static void -mac_te_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf) +mac_te_create_mbuf_from_mbuf(struct mbuf *oldmbuf, + struct label *oldmbuflabel, struct mbuf *newmbuf, + struct label *newmbuflabel) { - mac_te_copy_label(&oldmbuf->m_pkthdr.label, &newmbuf->m_pkthdr.label); + mac_te_copy_label(SLOT(oldmbuflabel), SLOT(newmbuflabel)); } static void -mac_te_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, struct mbuf *mbuf) +mac_te_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, + struct label *iflabel, struct mbuf *mbuf, struct label *mblabel) { - mac_te_init_label_as(&mbuf->m_pkthdr.label, MAC_TE_TYPE_EQUAL); + mac_te_init_label_as(SLOT(mblabel), MAC_TE_TYPE_EQUAL); } static void -mac_te_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *m) +mac_te_create_mbuf_from_ifnet(struct ifnet *ifnet, struct label *iflabel, + struct mbuf *m, struct label *mlabel) { - mac_te_copy_label(&ifnet->if_label, &m->m_pkthdr.label); + mac_te_copy_label(SLOT(iflabel), SLOT(mlabel)); } static void mac_te_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, - struct ifnet *ifnet, struct mbuf *newmbuf) + struct label *oldmblabel, struct ifnet *ifnet, struct label *iflabel, + struct mbuf *newmbuf, struct label *nmblabel) { - mac_te_copy_label(&oldmbuf->m_pkthdr.label, &newmbuf->m_pkthdr.label); + mac_te_copy_label(SLOT(oldmblabel), SLOT(nmblabel)); } static void mac_te_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, - struct mbuf *newmbuf) + struct label *oldmblabel, struct mbuf *newmbuf, struct label *nmblabel) { - mac_te_copy_label(&oldmbuf->m_pkthdr.label, &newmbuf->m_pkthdr.label); + mac_te_copy_label(SLOT(oldmblabel), SLOT(nmblabel)); } static int -mac_te_mbuf_fragment_matches_mbuf_fragmentqueue(struct mbuf *fragment, - struct mbuf *fragmentqueue) +mac_te_fragment_matches_ipq(struct mbuf *fragment, + struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { - return (mac_te_equal(&fragment->m_pkthdr.label, - &fragmentqueue->m_pkthdr.label)); + return (mac_te_equal(fragmentlabel, ipqlabel)); } static void -mac_te_create_mbuf_from_socket(struct socket *so, struct mbuf *m) +mac_te_create_mbuf_from_socket(struct socket *so, struct label *solabel, + struct mbuf *m, struct label *mlabel) { - mac_te_copy_label(&so->so_label, &m->m_pkthdr.label); + mac_te_copy_label(SLOT(solabel), SLOT(mlabel)); } static void -mac_te_create_socket(struct ucred *cred, struct socket *socket) +mac_te_create_socket(struct ucred *cred, struct socket *socket, + struct label *solabel) { - mac_te_create_object(cred, &socket->so_label); + mac_te_create_object(cred, solabel); mac_te_create_object(cred, &socket->so_peerlabel); } static void mac_te_create_socket_from_socket(struct socket *oldsocket, - struct socket *newsocket) + struct label *oldlabel, struct socket *newsocket, struct label *newlabel) { - mac_te_create_object_from_object(&oldsocket->so_label, - &newsocket->so_label); + mac_te_create_object_from_object(oldlabel, newlabel); mac_te_create_object_from_object(&oldsocket->so_peerlabel, &newsocket->so_peerlabel); } static void mac_te_relabel_socket(struct ucred *cred, struct socket *socket, - struct mac *newlabel) + struct label *oldlabel, struct label *newlabel) { - mac_te_copy_label(newlabel, &socket->so_label); + mac_te_copy_label(SLOT(newlabel), SLOT(oldlabel)); } static void -mac_te_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) +mac_te_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mlabel, + struct socket *socket, struct label *sopeerlabel) { - mac_te_copy_label(&mbuf->m_pkthdr.label, &socket->so_peerlabel); + mac_te_copy_label(SLOT(mlabel), SLOT(sopeerlabel)); } static void mac_te_set_socket_peer_from_socket(struct socket *oldsocket, - struct socket *newsocket) + struct label *oldlabel, struct socket *newsocket, + struct label *newpeerlabel) { - mac_te_copy_label(&oldsocket->so_label, &newsocket->so_peerlabel); + mac_te_copy_label(SLOT(oldlabel), SLOT(newpeerlabel)); } static void -mac_te_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *mbuf) +mac_te_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct label *bdlabel, + struct mbuf *mbuf, struct label *mblabel) { - mac_te_copy_label(&bpf_d->bd_label, &mbuf->m_pkthdr.label); + mac_te_copy_label(SLOT(bdlabel), SLOT(mblabel)); } static int mac_te_cred_check_relabel_socket(struct ucred *cred, struct socket *socket, - struct mac *newlabel) + struct label *newlabel) { int error; - error = mac_te_label_valid(newlabel); - if (error) - return (error); - error = suser_cred(cred, 0); if (error) return (error); @@ -659,39 +849,45 @@ static void mac_te_create_mount(struct ucred *cred, struct mount *mp, - struct mac *mntlabel, struct mac *fslabel) + struct label *mntlabel, struct label *fslabel) { /* mac_te_create_object(cred, label); */ - mac_te_init_label_as(mntlabel, MAC_TE_TYPE_FS); - mac_te_init_label_as(fslabel, MAC_TE_TYPE_FS); + mac_te_init_label_as(SLOT(mntlabel), MAC_TE_TYPE_FS); + mac_te_init_label_as(SLOT(fslabel), MAC_TE_TYPE_FS); } static void mac_te_create_root_mount(struct ucred *cred, struct mount *mp, - struct mac *mntlabel, struct mac *fslabel) + struct label *mntlabel, struct label *fslabel) { - mac_te_init_label_as(mntlabel, MAC_TE_TYPE_ROOTFS); - mac_te_init_label_as(fslabel, MAC_TE_TYPE_FS); + mac_te_init_label_as(SLOT(mntlabel), MAC_TE_TYPE_ROOTFS); + mac_te_init_label_as(SLOT(fslabel), MAC_TE_TYPE_FS); } -static void -mac_te_print_label(struct mac *label) +static int +mac_te_internalize(struct label *label, const struct mac *extlabel) { + int error; - printf("Type Enforcement: type==%s\n", label->m_te.mt_type); + error = mac_te_label_valid(&extlabel->m_te); + if (error == 0) + *SLOT(label) = extlabel->m_te; + return (error); } static int -mac_te_validate_label(struct mac *label) +mac_te_externalize(struct label *label, struct mac *extlabel) { - return (mac_te_label_valid(label)); + extlabel->m_te = *SLOT(label); + return (0); } static void -mac_te_create_devfs_device(dev_t dev, struct mac *devicelabel) +mac_te_create_devfs_device(dev_t dev, struct devfs_dirent *de, + struct label *devicelabel) { char *te_type; @@ -706,20 +902,20 @@ else te_type = MAC_TE_TYPE_DEVICE; - mac_te_init_label_as(devicelabel, te_type); + mac_te_init_label_as(SLOT(devicelabel), te_type); } static void mac_te_create_devfs_directory(char *dirname, int dirnamelen, - struct mac *dirlabel) + struct devfs_dirent *de, struct label *dirlabel) { - mac_te_init_label_as(dirlabel, MAC_TE_TYPE_FS); + mac_te_init_label_as(SLOT(dirlabel), MAC_TE_TYPE_FS); } static void mac_te_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, - struct mac *parentlabel, struct vnode *child, struct mac *childlabel) + struct label *parentlabel, struct vnode *child, struct label *childlabel) { mac_te_create_object(cred, childlabel); @@ -727,11 +923,14 @@ static int mac_te_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, - struct mac *filelabel, mode_t acc_mode) + struct label *filelabel, mode_t acc_mode) { + struct mac_te *subj, *obj; int object_class, operation; int error; + subj = SLOT(&cred->cr_label); + obj = SLOT(filelabel); /* * Treat all vnode types as files, for the time being, except * for directories. @@ -754,8 +953,7 @@ default: panic("mac_te_vaccess: invalid object_class"); } - error = mac_te_check(&cred->cr_label, filelabel, object_class, - operation); + error = mac_te_check(subj, obj, object_class, operation); if (error) return (error); } @@ -770,8 +968,7 @@ default: panic("mac_te_vaccess: invalid object_class"); } - error = mac_te_check(&cred->cr_label, filelabel, object_class, - operation); + error = mac_te_check(subj, obj, object_class, operation); if (error) return (error); } @@ -786,8 +983,7 @@ default: panic("mac_te_vaccess: invalid object_class"); } - error = mac_te_check(&cred->cr_label, filelabel, object_class, - operation); + error = mac_te_check(subj, obj, object_class, operation); if (error) return (error); } @@ -798,15 +994,16 @@ mac_te_cred_check_see_cred(struct ucred *u1, struct ucred *u2) { - return (mac_te_check(&u1->cr_label, &u2->cr_label, MAC_TE_CLASS_PROC, - MAC_TE_OPERATION_PROC_SEE)); + return (mac_te_check(SLOT(&u1->cr_label), SLOT(&u2->cr_label), + MAC_TE_CLASS_PROC, MAC_TE_OPERATION_PROC_SEE)); } static int -mac_te_cred_check_see_socket(struct ucred *cred, struct socket *socket) +mac_te_cred_check_see_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel) { - return (mac_te_check(&cred->cr_label, &socket->so_label, + return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_SEE)); } @@ -814,207 +1011,195 @@ mac_te_cred_check_signal_proc(struct ucred *cred, struct proc *proc, int signum) { - return (mac_te_check(&cred->cr_label, &proc->p_ucred->cr_label, - MAC_TE_CLASS_PROC, MAC_TE_OPERATION_PROC_SIGNAL)); + return (mac_te_check(SLOT(&cred->cr_label), + SLOT(&proc->p_ucred->cr_label), MAC_TE_CLASS_PROC, + MAC_TE_OPERATION_PROC_SIGNAL)); } static int mac_te_cred_check_sched_proc(struct ucred *cred, struct proc *proc) { - return (mac_te_check(&cred->cr_label, &proc->p_ucred->cr_label, - MAC_TE_CLASS_PROC, MAC_TE_OPERATION_PROC_SCHED)); + return (mac_te_check(SLOT(&cred->cr_label), + SLOT(&proc->p_ucred->cr_label), MAC_TE_CLASS_PROC, + MAC_TE_OPERATION_PROC_SCHED)); } static int mac_te_cred_check_debug_proc(struct ucred *cred, struct proc *proc) { - return (mac_te_check(&cred->cr_label, &proc->p_ucred->cr_label, - MAC_TE_CLASS_PROC, MAC_TE_OPERATION_PROC_DEBUG)); + return (mac_te_check(SLOT(&cred->cr_label), + SLOT(&proc->p_ucred->cr_label), MAC_TE_CLASS_PROC, + MAC_TE_OPERATION_PROC_DEBUG)); } static int mac_te_cred_check_exec_vnode(struct ucred *cred, struct vnode *vp, - struct mac *label) + struct label *label) { - return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, - MAC_TE_OPERATION_FILE_EXEC)); + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_EXEC)); } static int mac_te_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, - struct mac *label, int attrnamespace, const char *name, struct uio *uio) + struct label *label, int attrnamespace, const char *name, struct uio *uio) { switch (vp->v_type) { case VDIR: - return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, - MAC_TE_OPERATION_DIR_GETEXTATTR)); + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_DIR_GETEXTATTR)); default: - return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, - MAC_TE_OPERATION_FILE_GETEXTATTR)); + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_GETEXTATTR)); } } static int -mac_te_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, - struct mac *label, int attrnamespace, const char *name, struct uio *uio) -{ - - switch (vp->v_type) { - case VDIR: - return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, - MAC_TE_OPERATION_DIR_GETEXTATTR)); - default: - return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, - MAC_TE_OPERATION_FILE_GETEXTATTR)); - } -} - -static int mac_te_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp, - struct mac *label) + struct label *label) { - return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, - MAC_TE_OPERATION_FILE_ADMIN)); + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_ADMIN)); } static int mac_te_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp, - struct mac *dlabel) + struct label *dlabel) { - return (mac_te_check(&cred->cr_label, dlabel, MAC_TE_CLASS_DIR, - MAC_TE_OPERATION_DIR_LOOKUP)); + return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_LOOKUP)); } static int mac_te_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, - struct mac *label, int attrnamespace, const char *name, struct uio *uio) + struct label *label, int attrnamespace, const char *name, struct uio *uio) { switch (vp->v_type) { case VDIR: - return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, - MAC_TE_OPERATION_DIR_SETEXTATTR)); + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_SETEXTATTR)); default: - return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, - MAC_TE_OPERATION_FILE_SETEXTATTR)); + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_SETEXTATTR)); } } static int mac_te_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp, - struct mac *label, u_long flags) + struct label *label, u_long flags) { switch (vp->v_type) { case VDIR: - return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, - MAC_TE_OPERATION_DIR_ADMIN)); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 6 8:17:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23F3F37B403; Thu, 6 Jun 2002 08:17:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A600C37B405 for ; Thu, 6 Jun 2002 08:17:27 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g56FHRk65330 for perforce@freebsd.org; Thu, 6 Jun 2002 08:17:27 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Thu, 6 Jun 2002 08:17:27 -0700 (PDT) Message-Id: <200206061517.g56FHRk65330@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12427 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12427 Change 12427 by jhb@jhb_laptop on 2002/06/06 08:17:18 Don't call printf while holding a spin lock. Hopefully this will fix the SMP hang with witness when exiting single user mode. Actually, since the text that was printed was "de" before the hang, I'm fairly sure this will fix the problem in question. Affected files ... ... //depot/projects/smpng/sys/kern/subr_witness.c#51 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#51 (text+ko) ==== @@ -383,9 +383,9 @@ mtx_lock_spin(&w_mtx); MPASS(w->w_refcount > 0); w->w_refcount--; + mtx_unlock_spin(&w_mtx); if (w->w_refcount == 0) printf("dead witness: %s\n", w->w_name); - mtx_unlock_spin(&w_mtx); } mtx_lock(&all_mtx); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 6 12:19:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 747F737B408; Thu, 6 Jun 2002 12:17:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0727E37B406 for ; Thu, 6 Jun 2002 12:17:31 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g56JHUR08515 for perforce@freebsd.org; Thu, 6 Jun 2002 12:17:30 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Thu, 6 Jun 2002 12:17:30 -0700 (PDT) Message-Id: <200206061917.g56JHUR08515@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12446 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12446 Change 12446 by jhb@jhb_laptop on 2002/06/06 12:16:34 IFC. Affected files ... ... //depot/projects/smpng/sys/boot/common/ufsread.c#1 branch ... //depot/projects/smpng/sys/boot/i386/boot2/Makefile#5 integrate ... //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#10 integrate ... //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#5 integrate ... //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#4 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_all.c#10 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_iu.h#1 branch ... //depot/projects/smpng/sys/cam/scsi/scsi_message.h#2 integrate ... //depot/projects/smpng/sys/conf/NOTES#15 integrate ... //depot/projects/smpng/sys/conf/files#42 integrate ... //depot/projects/smpng/sys/conf/options#28 integrate ... //depot/projects/smpng/sys/ddb/ddb.h#4 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#1 branch ... //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#1 branch ... //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#1 branch ... //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#1 branch ... //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.seq#1 branch ... //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_inline.h#1 branch ... //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#1 branch ... //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#1 branch ... //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#1 branch ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.c#4 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.h#4 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_gram.y#4 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#3 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_scan.l#5 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#4 integrate ... //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#4 integrate ... //depot/projects/smpng/sys/dev/fxp/if_fxp.c#14 integrate ... //depot/projects/smpng/sys/dev/hme/if_hmereg.h#2 integrate ... //depot/projects/smpng/sys/dev/pci/pcireg.h#2 integrate ... //depot/projects/smpng/sys/dev/syscons/syscons.c#20 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#14 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#12 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_fileno.c#5 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#9 integrate ... //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#17 integrate ... //depot/projects/smpng/sys/geom/geom.h#8 integrate ... //depot/projects/smpng/sys/geom/geom_bsd.c#9 integrate ... //depot/projects/smpng/sys/geom/geom_mbr.c#7 integrate ... //depot/projects/smpng/sys/geom/geom_subr.c#7 integrate ... //depot/projects/smpng/sys/geom/geom_sunlabel.c#7 integrate ... //depot/projects/smpng/sys/i386/conf/GENERIC#22 integrate ... //depot/projects/smpng/sys/kern/kern_mutex.c#38 integrate ... //depot/projects/smpng/sys/kern/subr_diskslice.c#10 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#52 integrate ... //depot/projects/smpng/sys/kern/vfs_bio.c#22 integrate ... //depot/projects/smpng/sys/kern/vfs_subr.c#26 integrate ... //depot/projects/smpng/sys/netgraph/ng_cisco.c#4 integrate ... //depot/projects/smpng/sys/netgraph/ng_ether.c#7 integrate ... //depot/projects/smpng/sys/netgraph/ng_lmi.c#2 integrate ... //depot/projects/smpng/sys/netgraph/ng_pppoe.c#9 integrate ... //depot/projects/smpng/sys/netgraph/ng_pptpgre.c#5 integrate ... //depot/projects/smpng/sys/netgraph/ng_rfc1490.c#3 integrate ... //depot/projects/smpng/sys/netgraph/ng_socket.c#14 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#29 integrate ... //depot/projects/smpng/sys/sys/wait.h#5 integrate ... //depot/projects/smpng/sys/vm/vm_mmap.c#19 integrate Differences ... ==== //depot/projects/smpng/sys/boot/i386/boot2/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.27 2002/05/13 16:16:00 ru Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.29 2002/06/05 12:30:41 phk Exp $ PROG= boot2 NOMAN= @@ -30,6 +30,7 @@ CFLAGS= -elf -ffreestanding -Os -fno-builtin \ -fno-guess-branch-probability \ -mrtd \ + -I${.CURDIR}/../../common \ -I${.CURDIR}/../btx/lib -I. \ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ @@ -48,7 +49,7 @@ boot1.o: boot1.s ${AS} ${AFLAGS} --defsym FLAGS=${B1FLAGS} ${.IMPSRC} -o ${.TARGET} -boot2.o: boot2.c +boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c ${CC} ${CFLAGS} -S -o boot2.s.tmp ${.IMPSRC} sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s rm -f boot2.s.tmp ==== //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#10 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.41 2002/05/11 21:49:39 peter Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.42 2002/06/05 11:10:38 phk Exp $ */ #include @@ -25,9 +25,6 @@ #include #include -#include -#include - #include #include @@ -71,22 +68,6 @@ #define V86_CY(x) ((x) & 1) #define V86_ZR(x) ((x) & 0x40) -/* - * We use 4k `virtual' blocks for filesystem data, whatever the actual - * filesystem block size. FFS blocks are always a multiple of 4k. - */ -#define VBLKSIZE 4096 -#define VBLKMASK (VBLKSIZE - 1) -#define DBPERVBLK (VBLKSIZE / DEV_BSIZE) -#define IPERVBLK (VBLKSIZE / sizeof(struct dinode)) -#define INDIRPERVBLK (VBLKSIZE / sizeof(ufs_daddr_t)) -#define INO_TO_VBA(fs, x) (fsbtodb(fs, ino_to_fsba(fs, x)) + \ - (ino_to_fsbo(fs, x) / IPERVBLK) * DBPERVBLK) -#define INO_TO_VBO(fs, x) (ino_to_fsbo(fs, x) % IPERVBLK) -#define FS_TO_VBA(fs, fsb, off) (fsbtodb(fs, fsb) + \ - ((off) / VBLKSIZE) * DBPERVBLK) -#define FS_TO_VBO(fs, fsb, off) ((off) & VBLKMASK) - #define DRV_HARD 0x80 #define DRV_MASK 0x7f @@ -96,14 +77,6 @@ #define TYPE_FD 3 #define TYPE_DA 4 -/* Buffers that must not span a 64k boundary. */ -static struct dmadat { - char blkbuf[VBLKSIZE]; /* filesystem blocks */ - ufs_daddr_t indbuf[VBLKSIZE / sizeof(ufs_daddr_t)]; /* indir blocks */ - char sbbuf[SBSIZE]; /* superblock */ - char secbuf[DEV_BSIZE]; /* for MBR/disklabel */ -} *dmadat; - extern uint32_t _end; static const char optstr[NOPT] = "DhaCcdgmnPprsv"; @@ -135,14 +108,11 @@ unsigned part; unsigned start; int init; - int meta; } dsk; static char cmd[512]; static char kname[1024]; static uint32_t opts; static struct bootinfo bootinfo; -static int ls; -static uint32_t fs_off; static uint8_t ioctrl = IO_KEYBOARD; void exit(int); @@ -179,31 +149,8 @@ return (u_char)*s1 - (u_char)*s2; } -static inline int -fsfind(const char *name, ino_t * ino) -{ - char buf[DEV_BSIZE]; - struct dirent *d; - char *s; - ssize_t n; +#include "ufsread.c" - fs_off = 0; - while ((n = fsread(*ino, buf, DEV_BSIZE)) > 0) - for (s = buf; s < buf + DEV_BSIZE;) { - d = (void *)s; - if (ls) - printf("%s ", d->d_name); - else if (!strcmp(name, d->d_name)) { - *ino = d->d_fileno; - return d->d_type; - } - s += d->d_reclen; - } - if (n != -1 && ls) - putchar('\n'); - return 0; -} - static inline int getchar(void) { @@ -505,7 +452,7 @@ dsk.drive = (dsk.type == TYPE_WD || dsk.type == TYPE_AD || dsk.type == TYPE_DA ? DRV_HARD : 0) + drv; - dsk.meta = 0; + dsk_meta = 0; fsread(0, NULL, 0); } if ((i = p - arg - !*(p - 1))) { @@ -519,34 +466,6 @@ return 0; } -static ino_t -lookup(const char *path) -{ - char name[MAXNAMLEN + 1]; - const char *s; - ino_t ino; - ssize_t n; - int dt; - - ino = ROOTINO; - dt = DT_DIR; - for (;;) { - if (*path == '/') - path++; - if (!*path) - break; - for (s = path; *s && *s != '/'; s++); - if ((n = s - path) > MAXNAMLEN) - return 0; - ls = *path == '?' && n == 1 && !*s; - memcpy(name, path, n); - name[n] = 0; - if ((dt = fsfind(name, &ino)) <= 0) - break; - path = s; - } - return dt == DT_REG ? ino : 0; -} static int xfsread(ino_t inode, void *buf, size_t nbyte) { @@ -557,83 +476,6 @@ return 0; } -static ssize_t -fsread(ino_t inode, void *buf, size_t nbyte) -{ - static struct dinode din; - static ino_t inomap; - static daddr_t blkmap, indmap; - char *blkbuf; - ufs_daddr_t *indbuf; - struct fs *fs; - char *s; - ufs_daddr_t lbn, addr; - daddr_t vbaddr; - size_t n, nb, off, vboff; - - blkbuf = dmadat->blkbuf; - indbuf = dmadat->indbuf; - fs = (struct fs *)dmadat->sbbuf; - if (!dsk.meta) { - inomap = 0; - if (dskread(fs, SBOFF / DEV_BSIZE, SBSIZE / DEV_BSIZE)) - return -1; - if (fs->fs_magic != FS_MAGIC) { - printf("Not ufs\n"); - return -1; - } - dsk.meta++; - } - if (!inode) - return 0; - if (inomap != inode) { - if (dskread(blkbuf, INO_TO_VBA(fs, inode), DBPERVBLK)) - return -1; - din = ((struct dinode *)blkbuf)[INO_TO_VBO(fs, inode)]; - inomap = inode; - fs_off = 0; - blkmap = indmap = 0; - } - s = buf; - if (nbyte > (n = din.di_size - fs_off)) - nbyte = n; - nb = nbyte; - while (nb) { - lbn = lblkno(fs, fs_off); - off = blkoff(fs, fs_off); - if (lbn < NDADDR) - addr = din.di_db[lbn]; - else { - vbaddr = FS_TO_VBA(fs, din.di_ib[0], sizeof(indbuf[0]) * - ((lbn - NDADDR) % NINDIR(fs))); - if (indmap != vbaddr) { - if (dskread(indbuf, vbaddr, DBPERVBLK)) - return -1; - indmap = vbaddr; - } - addr = indbuf[(lbn - NDADDR) % INDIRPERVBLK]; - } - vbaddr = FS_TO_VBA(fs, addr, off); - vboff = FS_TO_VBO(fs, addr, off); - n = dblksize(fs, &din, lbn) - (off & ~VBLKMASK); - if (n > VBLKSIZE) - n = VBLKSIZE; - if (blkmap != vbaddr) { - if (dskread(blkbuf, vbaddr, n >> DEV_BSHIFT)) - return -1; - blkmap = vbaddr; - } - n -= vboff; - if (n > nb) - n = nb; - memcpy(s, blkbuf + vboff, n); - s += n; - fs_off += n; - nb -= n; - } - return nbyte; -} - static int dskread(void *buf, unsigned lba, unsigned nblk) { @@ -642,7 +484,7 @@ char *sec; unsigned sl, i; - if (!dsk.meta) { + if (!dsk_meta) { sec = dmadat->secbuf; dsk.start = 0; if (drvread(sec, DOSBBSECTOR, 1)) ==== //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.6 2002/05/10 09:26:35 obrien Exp $ +# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.8 2002/06/05 12:30:45 phk Exp $ PROG= boot1 SRCS= _start.S boot1.c @@ -9,7 +9,7 @@ BOOTBLOCKBASE= 0x4000 -CFLAGS= -ffreestanding -mcmodel=medlow -Os -I../.. -I../../common +CFLAGS= -ffreestanding -mcmodel=medlow -Os -I../.. -I../../common -I${.CURDIR}/../../common boot1.elf: _start.o boot1.o ${LD} -N -Ttext ${BOOTBLOCKBASE} -o ${.TARGET} ${.ALLSRC} @@ -17,6 +17,8 @@ boot1.aout: boot1.elf elf2aout -o ${.TARGET} ${.ALLSRC} +boot1.o: ${.CURDIR}/../../common/ufsread.c + # Construct boot1. disklabel expects it to contain zeroed-out space for the # label, and to be of the correct size. boot1: boot1.aout ==== //depot/projects/smpng/sys/boot/sparc64/boot1/boot1.c#4 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/sparc64/boot1/boot1.c,v 1.11 2002/05/13 05:09:34 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/boot1/boot1.c,v 1.14 2002/06/05 12:12:25 phk Exp $"); #include #include @@ -27,9 +27,6 @@ #include #include -#include -#include - #define _PATH_LOADER "/boot/loader" #define _PATH_KERNEL "/boot/kernel/kernel" @@ -62,8 +59,6 @@ static void exit(int) __dead2; static void load(const char *); -static ino_t lookup(const char *); -static ssize_t fsread(ino_t, void *, size_t); static int dskread(void *, u_int64_t, int); static void usage(void); @@ -296,13 +291,19 @@ } static void -bcopy(const void *dst, void *src, size_t len) +bcopy(const void *src, void *dst, size_t len) { - const char *d = dst; - char *s = src; + const char *s = src; + char *d = dst; while (len-- != 0) - *s++ = *d++; + *d++ = *s++; +} + +static void +memcpy(void *dst, const void *src, size_t len) +{ + bcopy(src, dst, len); } static void @@ -322,28 +323,8 @@ return ((u_char)*s1 - (u_char)*s2); } -static int -fsfind(const char *name, ino_t * ino) -{ - char buf[DEV_BSIZE]; - struct dirent *d; - char *s; - ssize_t n; +#include "ufsread.c" - fs_off = 0; - while ((n = fsread(*ino, buf, DEV_BSIZE)) > 0) { - for (s = buf; s < buf + DEV_BSIZE;) { - d = (void *)s; - if (!strcmp(name, d->d_name)) { - *ino = d->d_fileno; - return (d->d_type); - } - s += d->d_reclen; - } - } - return (0); -} - int main(int ac, char **av) { @@ -391,25 +372,21 @@ ofw_exit(); } +static struct dmadat __dmadat; + static int mount(const char *device) { + dmadat = &__dmadat; if ((bootdev = ofw_open(device)) == -1) { printf("mount: can't open device\n"); return (-1); } - if (dskread(blkbuf, SBOFF / DEV_BSIZE, SBSIZE / DEV_BSIZE)) { + if (fsread(0, NULL, 0)) { printf("mount: can't read superblock\n"); return (-1); } - inomap = 0; - bcopy(blkbuf, &fs, sizeof(fs)); - if (fs.fs_magic != FS_MAGIC) { - printf("mount: not ufs\n"); - return (-1); - } - fsblks = fs.fs_bsize >> DEV_BSHIFT; return (0); } @@ -455,100 +432,6 @@ (*(void (*)(int, int, int, int, ofwfp_t))eh.e_entry)(0, 0, 0, 0, ofw); } -static ino_t -lookup(const char *path) -{ - char name[MAXNAMLEN + 1]; - const char *s; - ino_t ino; - ssize_t n; - int dt; - - ino = ROOTINO; - dt = DT_DIR; - name[0] = '/'; - name[1] = '\0'; - for (;;) { - if (*path == '/') - path++; - if (!*path) - break; - for (s = path; *s && *s != '/'; s++) - ; - if ((n = s - path) > MAXNAMLEN) - return (0); - bcopy(path, name, n); - name[n] = 0; - if (dt != DT_DIR) { - printf("%s: not a directory.\n", name); - return (0); - } - if ((dt = fsfind(name, &ino)) <= 0) - break; - path = s; - } - return (dt == DT_REG ? ino : 0); -} - -static ssize_t -fsread(ino_t inode, void *buf, size_t nbyte) -{ - static struct dinode din; - static ufs_daddr_t indbuf[BSIZEMAX / sizeof(ufs_daddr_t)]; - static ufs_daddr_t blkmap, indmap; - char *s; - ufs_daddr_t lbn, addr; - size_t n, nb, off; - - if (!inode) - return (0); - if (inomap != inode) { - if (dskread(blkbuf, fsbtodb(&fs, ino_to_fsba(&fs, inode)), - fsblks)) - return (-1); - bcopy(blkbuf + ((inode % INOPB(&fs)) * sizeof(din)), &din, - sizeof(din)); - inomap = inode; - fs_off = 0; - blkmap = indmap = 0; - } - s = buf; - if (nbyte > (n = din.di_size - fs_off)) - nbyte = n; - nb = nbyte; - while (nb) { - lbn = lblkno(&fs, fs_off); - if (lbn < NDADDR) - addr = din.di_db[lbn]; - else { - if (indmap != din.di_ib[0]) { - if (dskread(indbuf, fsbtodb(&fs, din.di_ib[0]), - fsblks)) - return (-1); - indmap = din.di_ib[0]; - } - addr = indbuf[(lbn - NDADDR) % NINDIR(&fs)]; - } - n = dblksize(&fs, &din, lbn); - if (blkmap != addr) { - if (dskread(blkbuf, fsbtodb(&fs, addr), - n >> DEV_BSHIFT)) { - return (-1); - } - blkmap = addr; - } - off = blkoff(&fs, fs_off); - n -= off; - if (n > nb) - n = nb; - bcopy(blkbuf + off, s, n); - s += n; - fs_off += n; - nb -= n; - } - return (nbyte); -} - static int dskread(void *buf, u_int64_t lba, int nblk) { ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.34 2002/06/04 17:41:47 mjacob Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.35 2002/06/05 19:10:57 gibbs Exp $ */ #include @@ -2256,12 +2256,13 @@ */ static struct { u_int period_factor; - u_int period; /* in 10ths of ns */ + u_int period; /* in 100ths of ns */ } scsi_syncrates[] = { - { 0x09, 125 }, /* FAST-80 */ - { 0x0a, 250 }, /* FAST-40 40MHz */ - { 0x0b, 303 }, /* FAST-40 33MHz */ - { 0x0c, 500 } /* FAST-20 */ + { 0x08, 625 }, /* FAST-160 */ + { 0x09, 1250 }, /* FAST-80 */ + { 0x0a, 2500 }, /* FAST-40 40MHz */ + { 0x0b, 3030 }, /* FAST-40 33MHz */ + { 0x0c, 5000 } /* FAST-20 */ }; /* @@ -2280,7 +2281,7 @@ if (period_factor == scsi_syncrates[i].period_factor) { /* Period in kHz */ - return (10000000 / scsi_syncrates[i].period); + return (100000000 / scsi_syncrates[i].period); } } ==== //depot/projects/smpng/sys/cam/scsi/scsi_message.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* * This file is in the public domain. - * $FreeBSD: src/sys/cam/scsi/scsi_message.h,v 1.5 2000/10/31 18:00:23 gibbs Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_message.h,v 1.6 2002/06/05 19:05:01 gibbs Exp $ */ /* Messages (1 byte) */ /* I/T (M)andatory or (O)ptional */ @@ -17,7 +17,7 @@ #define MSG_NOOP 0x08 /* M/M */ #define MSG_PARITY_ERROR 0x09 /* M/M */ #define MSG_LINK_CMD_COMPLETE 0x0a /* O/O */ -#define MSG_LINK_CMD_COMPLETEF 0x0b /* O/O */ +#define MSG_LINK_CMD_COMPLETEF 0x0b /* O/O */ /* Obsolete */ #define MSG_BUS_DEV_RESET 0x0c /* O/M */ #define MSG_TARGET_RESET 0x0c /* O/M */ /* SPI3 Terminology */ #define MSG_ABORT_TAG 0x0d /* O/O */ @@ -58,8 +58,13 @@ #define MSG_EXT_WDTR_BUS_16_BIT 0x01 #define MSG_EXT_WDTR_BUS_32_BIT 0x02 /* Deprecated in SPI3 */ -#define MSG_EXT_PPR 0x04 /* SPI3 */ -#define MSG_EXT_PPR_LEN 0x06 -#define MSG_EXT_PPR_QAS_REQ 0x04 -#define MSG_EXT_PPR_DT_REQ 0x02 -#define MSG_EXT_PPR_IU_REQ 0x01 +#define MSG_EXT_PPR 0x04 /* SPI3/SPI4 */ +#define MSG_EXT_PPR_LEN 0x06 +#define MSG_EXT_PPR_PCOMP_EN 0x80 +#define MSG_EXT_PPR_RTI 0x40 +#define MSG_EXT_PPR_RD_STRM 0x20 +#define MSG_EXT_PPR_WR_FLOW 0x10 +#define MSG_EXT_PPR_HOLD_MCS 0x08 +#define MSG_EXT_PPR_QAS_REQ 0x04 +#define MSG_EXT_PPR_DT_REQ 0x02 +#define MSG_EXT_PPR_IU_REQ 0x01 ==== //depot/projects/smpng/sys/conf/NOTES#15 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1035 2002/05/31 06:28:13 brooks Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1036 2002/06/06 16:35:55 gibbs Exp $ # # @@ -1139,6 +1139,7 @@ # ahb: Adaptec 174x EISA controllers # ahc: Adaptec 274x/284x/2910/293x/294x/394x/3950x/3960x/398X/4944/ # 19160x/29160x, aic7770/aic78xx +# ahd: Adaptec 29320/39320 Controllers. # aic: Adaptec 6260/6360, APA-1460 (PC Card), NEC PC9801-100 (C-BUS) # amd: Support for the AMD 53C974 SCSI host adapter chip as found on devices # such as the Tekram DC-390(T). @@ -1176,6 +1177,7 @@ hint.aic.0.at="isa" device ahb device ahc +device ahd device amd device isp hint.isp.0.disable="1" @@ -1223,6 +1225,13 @@ # Bitmap of units to enable targetmode operations. options AHC_TMODE_ENABLE +# Compile in aic79xx debugging code. +options AHD_DEBUG + +# Aic79xx driver debugging options. +# See sys/dev/aic79xx/aic79xx.h +options AHD_DEBUG_OPTS=0xFFFFFFFF + # The adw driver will attempt to use memory mapped I/O for all PCI # controllers that have it configured only if this option is set. options ADW_ALLOW_MEMIO ==== //depot/projects/smpng/sys/conf/files#42 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.643 2002/06/03 09:14:12 mdodd Exp $ +# $FreeBSD: src/sys/conf/files,v 1.644 2002/06/06 16:35:55 gibbs Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -14,6 +14,11 @@ no-obj no-implicit-rule before-depend \ clean "aic7xxx_seq.h aic7xxx_reg.h" \ dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" +aic79xx_{seq,reg}.h optional ahd pci \ + compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h $S/dev/aic7xxx/aic79xx.seq" \ + no-obj no-implicit-rule before-depend \ + clean "aic79xx_seq.h aic79xx_reg.h" \ + dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" kern/device_if.m standard kern/bus_if.m standard kern/clock_if.m optional genclock @@ -243,6 +248,10 @@ dev/aic7xxx/aic7xxx_93cx6.c optional ahc dev/aic7xxx/aic7xxx_osm.c optional ahc dev/aic7xxx/aic7xxx_pci.c optional ahc pci +dev/aic7xxx/ahd_pci.c optional ahd pci +dev/aic7xxx/aic79xx.c optional ahd pci +dev/aic7xxx/aic79xx_osm.c optional ahd pci +dev/aic7xxx/aic79xx_pci.c optional ahd pci dev/amr/amr.c optional amr dev/amr/amr_disk.c optional amr dev/amr/amr_pci.c optional amr ==== //depot/projects/smpng/sys/conf/options#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.320 2002/06/02 04:32:52 alfred Exp $ +# $FreeBSD: src/sys/conf/options,v 1.321 2002/06/06 16:35:55 gibbs Exp $ # # On the handling of kernel options # @@ -52,6 +52,12 @@ AHC_DEBUG_SEQUENCER opt_aic7xxx.h # Enable diagnostic sequencer code +# Adaptec aic79xx SCSI controller options +AHD_DEBUG opt_aic79xx.h # Compile in aic79xx debugging code. + +AHD_DEBUG_OPTS opt_aic79xx.h # Aic79xx driver debugging options. + # See sys/dev/aic79xx/aic79xx.h + ADW_ALLOW_MEMIO opt_adw.h # Allow PCI devices to use memory # mapped I/O ==== //depot/projects/smpng/sys/ddb/ddb.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/ddb.h,v 1.27 2002/03/23 11:53:03 bde Exp $ + * $FreeBSD: src/sys/ddb/ddb.h,v 1.28 2002/06/05 19:00:02 gibbs Exp $ */ /* @@ -43,18 +43,18 @@ char *modif); #define DB_COMMAND(cmd_name, func_name) \ - DB_SET(cmd_name, func_name, db_cmd_set) + DB_SET(cmd_name, func_name, db_cmd_set, 0, NULL) #define DB_SHOW_COMMAND(cmd_name, func_name) \ - DB_SET(cmd_name, func_name, db_show_cmd_set) + DB_SET(cmd_name, func_name, db_show_cmd_set, 0, NULL) -#define DB_SET(cmd_name, func_name, set) \ +#define DB_SET(cmd_name, func_name, set, flag, more) \ static db_cmdfcn_t func_name; \ \ static const struct command __CONCAT(func_name,_cmd) = { \ __STRING(cmd_name), \ func_name, \ - 0, \ - 0, \ + flag, \ + more \ }; \ TEXT_SET(set, __CONCAT(func_name,_cmd)); \ \ ==== //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.c#4 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#14 $ + * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#17 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.c,v 1.33 2002/04/24 16:24:43 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.c,v 1.34 2002/06/05 22:51:54 gibbs Exp $ */ #include #include @@ -288,9 +288,9 @@ { (void)fprintf(stderr, -"usage: %-16s [-nostdinc] [-I-] [-I directory] [-o output_file] - [-r register_output_file] [-l program_list_file] - input_file\n", +"usage: %-16s [-nostdinc] [-I-] [-I directory] [-o output_file]\n" +" [-r register_output_file] [-l program_list_file]\n" +" input_file\n", appname); exit(EX_USAGE); } @@ -335,11 +335,11 @@ instrcount = 0; fprintf(ofile, -"/* - * DO NOT EDIT - This file is automatically generated - * from the following source files: - * -%s */\n", versions); +"/*\n" +" * DO NOT EDIT - This file is automatically generated\n" +" * from the following source files:\n" +" *\n" +"%s */\n", versions); fprintf(ofile, "static uint8_t seqprog[] = {\n"); for (cur_instr = STAILQ_FIRST(&seq_program); @@ -374,13 +374,13 @@ cur_node != NULL; cur_node = SLIST_NEXT(cur_node,links)) { fprintf(ofile, -"static int aic_patch%d_func(%s); - -static int -aic_patch%d_func(%s) -{ - return (%s); -}\n\n", +"static int aic_patch%d_func(%s);\n" +"\n" +"static int\n" +"aic_patch%d_func(%s)\n" +"{\n" +" return (%s);\n" +"}\n\n", cur_node->symbol->info.condinfo->func_num, patch_arg_list, cur_node->symbol->info.condinfo->func_num, @@ -389,44 +389,44 @@ } fprintf(ofile, -"typedef int patch_func_t (%s); -static struct patch { - patch_func_t *patch_func; - uint32_t begin :10, - skip_instr :10, - skip_patch :12; -} patches[] = {\n", patch_arg_list); +"typedef int patch_func_t (%s);\n" +"static struct patch {\n" +" patch_func_t *patch_func;\n" +" uint32_t begin :10,\n" +" skip_instr :10,\n" +" skip_patch :12;\n" +"} patches[] = {\n", patch_arg_list); - for(cur_patch = STAILQ_FIRST(&patches); - cur_patch != NULL; - cur_patch = STAILQ_NEXT(cur_patch,links)) { + for (cur_patch = STAILQ_FIRST(&patches); + cur_patch != NULL; + cur_patch = STAILQ_NEXT(cur_patch,links)) { fprintf(ofile, "%s\t{ aic_patch%d_func, %d, %d, %d }", cur_patch == STAILQ_FIRST(&patches) ? "" : ",\n", cur_patch->patch_func, cur_patch->begin, cur_patch->skip_instr, cur_patch->skip_patch); } - fprintf(ofile, "\n};\n"); + fprintf(ofile, "\n};\n\n"); fprintf(ofile, -"static struct cs { - u_int16_t begin; - u_int16_t end; -} critical_sections[] = {\n"); +"static struct cs {\n" +" u_int16_t begin;\n" +" u_int16_t end;\n" +"} critical_sections[] = {\n"); - for(cs = TAILQ_FIRST(&cs_tailq); - cs != NULL; - cs = TAILQ_NEXT(cs, links)) { + for (cs = TAILQ_FIRST(&cs_tailq); + cs != NULL; + cs = TAILQ_NEXT(cs, links)) { fprintf(ofile, "%s\t{ %d, %d }", cs == TAILQ_FIRST(&cs_tailq) ? "" : ",\n", cs->begin_addr, cs->end_addr); } - fprintf(ofile, "\n};\n"); + fprintf(ofile, "\n};\n\n"); fprintf(ofile, -"static const int num_critical_sections = sizeof(critical_sections) - / sizeof(*critical_sections);\n"); +"static const int num_critical_sections = sizeof(critical_sections)\n" +" / sizeof(*critical_sections);\n"); fprintf(stderr, "%s: %d instructions used\n", appname, instrcount); } @@ -569,9 +569,9 @@ /* Now output the listing */ cur_patch = STAILQ_FIRST(&patches); - for(cur_instr = STAILQ_FIRST(&seq_program); - cur_instr != NULL; - cur_instr = STAILQ_NEXT(cur_instr, links), instrcount++) { + for (cur_instr = STAILQ_FIRST(&seq_program); + cur_instr != NULL; + cur_instr = STAILQ_NEXT(cur_instr, links), instrcount++) { if (check_patch(&cur_patch, instrcount, &skip_addr, func_values) == 0) { ==== //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.h#4 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.h#9 $ + * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.h#10 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.14 2002/04/24 16:24:43 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.h,v 1.15 2002/06/05 22:51:54 gibbs Exp $ */ #ifdef __linux__ ==== //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_gram.y#4 (text+ko) ==== @@ -38,9 +38,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_gram.y#14 $ + * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_gram.y#15 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_gram.y,v 1.16 2002/04/24 16:24:43 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_gram.y,v 1.17 2002/06/05 22:51:54 gibbs Exp $ */ #include ==== //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#3 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_insformat.h#8 $ + * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_insformat.h#9 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_insformat.h,v 1.5 2002/04/24 16:24:43 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_insformat.h,v 1.6 2002/06/05 22:51:54 gibbs Exp $ */ struct ins_format1 { ==== //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_scan.l#5 (text+ko) ==== @@ -38,9 +38,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#10 $ + * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#11 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_scan.l,v 1.17 2002/04/24 16:24:43 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_scan.l,v 1.18 2002/06/05 22:51:54 gibbs Exp $ */ #include ==== //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#4 (text+ko) ==== @@ -36,9 +36,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 6 13:14:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C07F837B400; Thu, 6 Jun 2002 13:13:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5C8AB37B40A for ; Thu, 6 Jun 2002 13:12:54 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g56KClC19632 for perforce@freebsd.org; Thu, 6 Jun 2002 13:12:47 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Thu, 6 Jun 2002 13:12:47 -0700 (PDT) Message-Id: <200206062012.g56KClC19632@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12454 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12454 Change 12454 by julian@julian_ref on 2002/06/06 13:12:14 IFC .. not tested Affected files ... ... //depot/projects/kse/bin/ps/fmt.c#5 integrate ... //depot/projects/kse/bin/ps/keyword.c#6 integrate ... //depot/projects/kse/bin/ps/print.c#10 integrate ... //depot/projects/kse/bin/ps/ps.1#8 integrate ... //depot/projects/kse/bin/ps/ps.c#8 integrate ... //depot/projects/kse/sys/alpha/include/elf.h#3 integrate ... //depot/projects/kse/sys/alpha/linux/linux_dummy.c#5 integrate ... //depot/projects/kse/sys/alpha/linux/linux_sysvec.c#6 integrate ... //depot/projects/kse/sys/alpha/osf1/imgact_osf1.c#5 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1.h#2 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_signal.c#7 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_sysvec.c#3 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_util.h#4 integrate ... //depot/projects/kse/sys/boot/common/ufsread.c#1 branch ... //depot/projects/kse/sys/boot/forth/loader.4th.8#4 integrate ... //depot/projects/kse/sys/boot/i386/boot2/Makefile#3 integrate ... //depot/projects/kse/sys/boot/i386/boot2/boot2.c#10 integrate ... //depot/projects/kse/sys/boot/sparc64/boot1/Makefile#5 integrate ... //depot/projects/kse/sys/boot/sparc64/boot1/boot1.c#4 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_all.c#9 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_all.h#3 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_iu.h#1 branch ... //depot/projects/kse/sys/cam/scsi/scsi_message.h#2 integrate ... //depot/projects/kse/sys/compat/linux/linux_file.c#13 integrate ... //depot/projects/kse/sys/compat/linux/linux_ioctl.c#14 integrate ... //depot/projects/kse/sys/compat/linux/linux_ipc.c#9 integrate ... //depot/projects/kse/sys/compat/linux/linux_misc.c#16 integrate ... //depot/projects/kse/sys/compat/linux/linux_signal.c#6 integrate ... //depot/projects/kse/sys/compat/linux/linux_socket.c#7 integrate ... //depot/projects/kse/sys/compat/linux/linux_socket.h#2 integrate ... //depot/projects/kse/sys/compat/linux/linux_stats.c#8 integrate ... //depot/projects/kse/sys/compat/svr4/imgact_svr4.c#5 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_exec.h#5 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_filio.c#7 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_ioctl.c#7 integrate ... //depot/projects/kse/sys/conf/NOTES#6 integrate ... //depot/projects/kse/sys/conf/files#35 integrate ... //depot/projects/kse/sys/conf/files.i386#22 integrate ... //depot/projects/kse/sys/conf/files.pc98#24 integrate ... //depot/projects/kse/sys/conf/options#17 integrate ... //depot/projects/kse/sys/ddb/ddb.h#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/ahd_pci.c#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx.c#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx.h#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx.reg#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx.seq#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx_inline.h#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx_osm.c#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx_osm.h#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aic79xx_pci.c#1 branch ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm.c#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm.h#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_gram.y#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_scan.l#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#3 integrate ... //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#4 integrate ... //depot/projects/kse/sys/dev/awi/awi.c#6 integrate ... //depot/projects/kse/sys/dev/awi/awivar.h#3 integrate ... //depot/projects/kse/sys/dev/cardbus/cardbus.c#8 integrate ... //depot/projects/kse/sys/dev/cardbus/cardbus_cis.c#6 integrate ... //depot/projects/kse/sys/dev/ct/ct_machdep.h#3 integrate ... //depot/projects/kse/sys/dev/drm/drm_dma.h#2 integrate ... //depot/projects/kse/sys/dev/drm/drm_os_freebsd.h#3 integrate ... //depot/projects/kse/sys/dev/drm/drm_scatter.h#2 integrate ... //depot/projects/kse/sys/dev/drm/gamma_drv.h#2 integrate ... //depot/projects/kse/sys/dev/drm/mga_dma.c#2 integrate ... //depot/projects/kse/sys/dev/drm/mga_drv.h#2 integrate ... //depot/projects/kse/sys/dev/drm/mga_state.c#2 integrate ... //depot/projects/kse/sys/dev/drm/r128_cce.c#2 integrate ... //depot/projects/kse/sys/dev/drm/r128_drv.h#2 integrate ... //depot/projects/kse/sys/dev/drm/r128_state.c#2 integrate ... //depot/projects/kse/sys/dev/drm/radeon_cp.c#2 integrate ... //depot/projects/kse/sys/dev/drm/radeon_drv.h#2 integrate ... //depot/projects/kse/sys/dev/drm/radeon_state.c#2 integrate ... //depot/projects/kse/sys/dev/em/README#1 branch ... //depot/projects/kse/sys/dev/em/if_em.c#7 integrate ... //depot/projects/kse/sys/dev/em/if_em.h#5 integrate ... //depot/projects/kse/sys/dev/em/if_em_hw.c#1 branch ... //depot/projects/kse/sys/dev/em/if_em_hw.h#1 branch ... //depot/projects/kse/sys/dev/em/if_em_osdep.h#4 integrate ... //depot/projects/kse/sys/dev/ep/if_ep_pccard.c#3 integrate ... //depot/projects/kse/sys/dev/exca/exca.c#3 integrate ... //depot/projects/kse/sys/dev/fxp/if_fxp.c#13 integrate ... //depot/projects/kse/sys/dev/hea/eni.c#5 integrate ... //depot/projects/kse/sys/dev/hea/eni.h#2 integrate ... //depot/projects/kse/sys/dev/hea/eni_buffer.c#5 integrate ... //depot/projects/kse/sys/dev/hea/hea_freebsd.c#1 branch ... //depot/projects/kse/sys/dev/hea/hea_freebsd.h#1 branch ... //depot/projects/kse/sys/dev/hea/hea_pci.c#1 branch ... //depot/projects/kse/sys/dev/hme/if_hmereg.h#2 integrate ... //depot/projects/kse/sys/dev/joy/joy.c#3 integrate ... //depot/projects/kse/sys/dev/joy/joy_isa.c#2 integrate ... //depot/projects/kse/sys/dev/joy/joy_pccard.c#2 integrate ... //depot/projects/kse/sys/dev/joy/joyvar.h#2 integrate ... //depot/projects/kse/sys/dev/lmc/if_lmc.c#4 integrate ... //depot/projects/kse/sys/dev/lmc/if_lmc_common.c#2 integrate ... //depot/projects/kse/sys/dev/lmc/if_lmc_fbsd3.c#2 integrate ... //depot/projects/kse/sys/dev/lmc/if_lmc_media.c#2 integrate ... //depot/projects/kse/sys/dev/lmc/if_lmcioctl.h#2 integrate ... //depot/projects/kse/sys/dev/lmc/if_lmcvar.h#2 integrate ... //depot/projects/kse/sys/dev/md/md.c#19 integrate ... //depot/projects/kse/sys/dev/my/if_my.c#4 integrate ... //depot/projects/kse/sys/dev/ncv/ncr53c500var.h#4 integrate ... //depot/projects/kse/sys/dev/nsp/nspvar.h#4 integrate ... //depot/projects/kse/sys/dev/pccard/card_if.m#4 integrate ... //depot/projects/kse/sys/dev/pccard/pccard.c#11 integrate ... //depot/projects/kse/sys/dev/pccard/pccard_common.c#1 branch ... //depot/projects/kse/sys/dev/pccard/pccardvar.h#7 integrate ... //depot/projects/kse/sys/dev/pccbb/pccbb.c#16 integrate ... //depot/projects/kse/sys/dev/pci/pci.c#12 integrate ... //depot/projects/kse/sys/dev/pci/pcireg.h#2 integrate ... //depot/projects/kse/sys/dev/pci/pcivar.h#6 integrate ... //depot/projects/kse/sys/dev/pcic/i82365_isa.c#2 integrate ... //depot/projects/kse/sys/dev/pdq/if_fea.c#3 integrate ... //depot/projects/kse/sys/dev/pdq/if_fpa.c#3 integrate ... //depot/projects/kse/sys/dev/pdq/pdq_freebsd.h#2 integrate ... //depot/projects/kse/sys/dev/pdq/pdqvar.h#3 integrate ... //depot/projects/kse/sys/dev/ray/if_ray.c#2 integrate ... //depot/projects/kse/sys/dev/stg/tmc18c30var.h#4 integrate ... //depot/projects/kse/sys/dev/syscons/syscons.c#15 integrate ... //depot/projects/kse/sys/dev/usb/udbp.c#3 integrate ... //depot/projects/kse/sys/dev/usb/udbp.h#2 integrate ... //depot/projects/kse/sys/dev/usb/urio.c#11 integrate ... //depot/projects/kse/sys/dev/wl/if_wl.c#6 integrate ... //depot/projects/kse/sys/dev/wl/if_wl.h#2 integrate ... //depot/projects/kse/sys/dev/xe/if_xe_pccard.c#2 integrate ... //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#13 integrate ... //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#13 integrate ... //depot/projects/kse/sys/fs/portalfs/portal_vnops.c#10 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs.c#11 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs.h#12 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs_fileno.c#5 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs_vncache.c#11 integrate ... //depot/projects/kse/sys/fs/pseudofs/pseudofs_vnops.c#15 integrate ... //depot/projects/kse/sys/geom/geom.h#6 integrate ... //depot/projects/kse/sys/geom/geom_bsd.c#6 integrate ... //depot/projects/kse/sys/geom/geom_gpt.c#3 integrate ... //depot/projects/kse/sys/geom/geom_mbr.c#5 integrate ... //depot/projects/kse/sys/geom/geom_subr.c#6 integrate ... //depot/projects/kse/sys/geom/geom_sunlabel.c#4 integrate ... //depot/projects/kse/sys/i386/conf/GENERIC#19 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_isc.c#4 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_sysi86.c#6 integrate ... //depot/projects/kse/sys/i386/ibcs2/ibcs2_xenix.c#5 integrate ... //depot/projects/kse/sys/i386/ibcs2/imgact_coff.c#11 integrate ... //depot/projects/kse/sys/i386/include/asmacros.h#3 integrate ... //depot/projects/kse/sys/i386/include/elf.h#3 integrate ... //depot/projects/kse/sys/i386/include/floatingpoint.h#2 integrate ... //depot/projects/kse/sys/i386/include/if_wl_wavelan.h#2 integrate ... //depot/projects/kse/sys/i386/isa/ic/lemac.h#2 integrate ... //depot/projects/kse/sys/i386/isa/if_le.c#5 integrate ... //depot/projects/kse/sys/i386/isa/scd.c#6 integrate ... //depot/projects/kse/sys/i386/linux/imgact_linux.c#5 integrate ... //depot/projects/kse/sys/i386/linux/linux_dummy.c#7 integrate ... //depot/projects/kse/sys/i386/linux/linux_sysvec.c#17 integrate ... //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#10 integrate ... //depot/projects/kse/sys/i4b/driver/i4b_ing.c#5 integrate ... //depot/projects/kse/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate ... //depot/projects/kse/sys/ia64/ia32/imgact_ia32.c#2 integrate ... //depot/projects/kse/sys/ia64/ia32/imgact_ia32.h#2 integrate ... //depot/projects/kse/sys/ia64/include/elf.h#5 integrate ... //depot/projects/kse/sys/kern/imgact_elf.c#18 integrate ... //depot/projects/kse/sys/kern/kern_descrip.c#31 integrate ... //depot/projects/kse/sys/kern/kern_exit.c#51 integrate ... //depot/projects/kse/sys/kern/kern_lock.c#13 integrate ... //depot/projects/kse/sys/kern/kern_malloc.c#12 integrate ... //depot/projects/kse/sys/kern/kern_mutex.c#27 integrate ... //depot/projects/kse/sys/kern/kern_sig.c#55 integrate ... //depot/projects/kse/sys/kern/kern_tc.c#9 integrate ... //depot/projects/kse/sys/kern/subr_diskslice.c#9 integrate ... //depot/projects/kse/sys/kern/subr_prf.c#14 integrate ... //depot/projects/kse/sys/kern/subr_witness.c#25 integrate ... //depot/projects/kse/sys/kern/sys_socket.c#8 integrate ... //depot/projects/kse/sys/kern/tty.c#25 integrate ... //depot/projects/kse/sys/kern/uipc_domain.c#5 integrate ... //depot/projects/kse/sys/kern/uipc_mbuf.c#7 integrate ... //depot/projects/kse/sys/kern/uipc_socket.c#17 integrate ... //depot/projects/kse/sys/kern/uipc_socket2.c#16 integrate ... //depot/projects/kse/sys/kern/uipc_syscalls.c#15 integrate ... //depot/projects/kse/sys/kern/uipc_usrreq.c#19 integrate ... //depot/projects/kse/sys/kern/vfs_aio.c#27 integrate ... //depot/projects/kse/sys/kern/vfs_bio.c#18 integrate ... //depot/projects/kse/sys/kern/vfs_subr.c#32 integrate ... //depot/projects/kse/sys/modules/Makefile#28 integrate ... //depot/projects/kse/sys/modules/em/Makefile#2 integrate ... //depot/projects/kse/sys/modules/hea/Makefile#1 branch ... //depot/projects/kse/sys/modules/oldcard/Makefile#3 integrate ... //depot/projects/kse/sys/net/raw_cb.c#4 integrate ... //depot/projects/kse/sys/net/raw_usrreq.c#8 integrate ... //depot/projects/kse/sys/net/route.c#5 integrate ... //depot/projects/kse/sys/net/rtsock.c#16 integrate ... //depot/projects/kse/sys/netatalk/ddp_input.c#5 integrate ... //depot/projects/kse/sys/netatalk/ddp_usrreq.c#9 integrate ... //depot/projects/kse/sys/netatm/atm_aal5.c#7 integrate ... //depot/projects/kse/sys/netatm/atm_socket.c#6 integrate ... //depot/projects/kse/sys/netgraph/ng_async.c#4 integrate ... //depot/projects/kse/sys/netgraph/ng_async.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_base.c#7 integrate ... //depot/projects/kse/sys/netgraph/ng_bpf.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_bpf.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_bridge.c#4 integrate ... //depot/projects/kse/sys/netgraph/ng_bridge.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_cisco.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_cisco.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_eiface.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_eiface.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_etf.c#2 integrate ... //depot/projects/kse/sys/netgraph/ng_etf.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_ether.c#8 integrate ... //depot/projects/kse/sys/netgraph/ng_iface.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_ksocket.c#15 integrate ... //depot/projects/kse/sys/netgraph/ng_ksocket.h#4 integrate ... //depot/projects/kse/sys/netgraph/ng_lmi.c#2 integrate ... //depot/projects/kse/sys/netgraph/ng_message.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_one2many.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_one2many.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_parse.c#8 integrate ... //depot/projects/kse/sys/netgraph/ng_parse.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_ppp.c#5 integrate ... //depot/projects/kse/sys/netgraph/ng_ppp.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_pppoe.c#7 integrate ... //depot/projects/kse/sys/netgraph/ng_pppoe.h#4 integrate ... //depot/projects/kse/sys/netgraph/ng_pptpgre.c#5 integrate ... //depot/projects/kse/sys/netgraph/ng_pptpgre.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_rfc1490.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_sample.c#2 integrate ... //depot/projects/kse/sys/netgraph/ng_sample.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_socket.c#11 integrate ... //depot/projects/kse/sys/netgraph/ng_tee.c#5 integrate ... //depot/projects/kse/sys/netgraph/ng_tee.h#2 integrate ... //depot/projects/kse/sys/netgraph/ng_vjc.c#3 integrate ... //depot/projects/kse/sys/netgraph/ng_vjc.h#2 integrate ... //depot/projects/kse/sys/netinet/accf_data.c#4 integrate ... //depot/projects/kse/sys/netinet/accf_http.c#4 integrate ... //depot/projects/kse/sys/netinet/in_pcb.c#15 integrate ... //depot/projects/kse/sys/netinet/ip_divert.c#12 integrate ... //depot/projects/kse/sys/netinet/ip_input.c#21 integrate ... //depot/projects/kse/sys/netinet/ip_mroute.c#10 integrate ... //depot/projects/kse/sys/netinet/raw_ip.c#13 integrate ... //depot/projects/kse/sys/netinet/tcp_input.c#19 integrate ... //depot/projects/kse/sys/netinet/tcp_output.c#7 integrate ... //depot/projects/kse/sys/netinet/tcp_subr.c#12 integrate ... //depot/projects/kse/sys/netinet/tcp_timer.c#5 integrate ... //depot/projects/kse/sys/netinet/tcp_usrreq.c#9 integrate ... //depot/projects/kse/sys/netinet/udp_usrreq.c#13 integrate ... //depot/projects/kse/sys/netinet6/icmp6.c#7 integrate ... //depot/projects/kse/sys/netinet6/in6_pcb.c#13 integrate ... //depot/projects/kse/sys/netinet6/in6_src.c#8 integrate ... //depot/projects/kse/sys/netinet6/ip6_input.c#10 integrate ... //depot/projects/kse/sys/netinet6/ip6_mroute.c#7 integrate ... //depot/projects/kse/sys/netinet6/raw_ip6.c#11 integrate ... //depot/projects/kse/sys/netinet6/udp6_usrreq.c#11 integrate ... //depot/projects/kse/sys/netipx/ipx_pcb.c#7 integrate ... //depot/projects/kse/sys/netipx/ipx_usrreq.c#8 integrate ... //depot/projects/kse/sys/netipx/spx_usrreq.c#9 integrate ... //depot/projects/kse/sys/netkey/keysock.c#9 integrate ... //depot/projects/kse/sys/netnatm/natm.c#7 integrate ... //depot/projects/kse/sys/netncp/ncp_sock.c#4 integrate ... //depot/projects/kse/sys/netns/idp_usrreq.c#4 integrate ... //depot/projects/kse/sys/netns/ns.c#3 integrate ... //depot/projects/kse/sys/netns/ns_pcb.c#4 integrate ... //depot/projects/kse/sys/netns/spp_usrreq.c#3 integrate ... //depot/projects/kse/sys/netsmb/smb_trantcp.c#8 integrate ... //depot/projects/kse/sys/nfsclient/bootp_subr.c#10 integrate ... //depot/projects/kse/sys/nfsclient/nfs_socket.c#12 integrate ... //depot/projects/kse/sys/nfsserver/nfs_srvsock.c#7 integrate ... //depot/projects/kse/sys/pc98/pc98/pmc.c#3 integrate ... //depot/projects/kse/sys/pccard/pccard_nbk.c#6 integrate ... //depot/projects/kse/sys/pci/dc21040reg.h#2 integrate ... //depot/projects/kse/sys/pci/if_de.c#3 integrate ... //depot/projects/kse/sys/pci/if_devar.h#3 integrate ... //depot/projects/kse/sys/powerpc/include/elf.h#3 integrate ... //depot/projects/kse/sys/security/lomac/kernel_interface.c#4 integrate ... //depot/projects/kse/sys/security/lomac/kernel_log.c#4 integrate ... //depot/projects/kse/sys/security/lomac/kernel_mmap.c#6 integrate ... //depot/projects/kse/sys/security/lomac/kernel_socket.c#8 integrate ... //depot/projects/kse/sys/sparc64/include/elf.h#7 integrate ... //depot/projects/kse/sys/sparc64/include/tsb.h#11 integrate ... //depot/projects/kse/sys/sparc64/sparc64/machdep.c#32 integrate ... //depot/projects/kse/sys/sys/elf32.h#2 integrate ... //depot/projects/kse/sys/sys/elf64.h#2 integrate ... //depot/projects/kse/sys/sys/elf_generic.h#2 integrate ... //depot/projects/kse/sys/sys/gpt.h#3 integrate ... //depot/projects/kse/sys/sys/imgact_elf.h#7 integrate ... //depot/projects/kse/sys/sys/joystick.h#2 integrate ... //depot/projects/kse/sys/sys/lockmgr.h#7 integrate ... //depot/projects/kse/sys/sys/mbuf.h#8 integrate ... //depot/projects/kse/sys/sys/param.h#21 integrate ... //depot/projects/kse/sys/sys/proc.h#105 integrate ... //depot/projects/kse/sys/sys/socket.h#6 integrate ... //depot/projects/kse/sys/sys/socketvar.h#19 integrate ... //depot/projects/kse/sys/sys/vmmeter.h#2 integrate ... //depot/projects/kse/sys/sys/wait.h#4 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_vfsops.c#19 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_acl.c#10 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_extern.h#6 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_ihash.c#7 integrate ... //depot/projects/kse/sys/vm/uma_core.c#7 integrate ... //depot/projects/kse/sys/vm/vm_map.c#18 integrate ... //depot/projects/kse/sys/vm/vm_map.h#12 integrate ... //depot/projects/kse/sys/vm/vm_mmap.c#15 integrate ... //depot/projects/kse/sys/vm/vm_object.c#10 integrate ... //depot/projects/kse/sys/vm/vm_object.h#5 integrate ... //depot/projects/kse/sys/vm/vm_swap.c#9 integrate Differences ... ==== //depot/projects/kse/bin/ps/fmt.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.19 2002/05/05 04:42:50 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.22 2002/06/05 01:36:30 jmallett Exp $"); #if 0 #ifndef lint @@ -58,10 +58,6 @@ static char *cmdpart(char *); static char *shquote(char **); -/* - * XXX - * This is a stub until marc does the real one. - */ static char * shquote(char **argv) { @@ -81,18 +77,18 @@ errx(1, "malloc failed"); } - if (*argv == 0) { - buf[0] = 0; + if (*argv == NULL) { + buf[0] = '\0'; return (buf); } dst = buf; - for (p = argv; (src = *p++) != 0; ) { - if (*src == 0) + for (p = argv; (src = *p++) != NULL; ) { + if (*src == '\0') continue; len = (buf_size - 1 - (dst - buf)) / 4; strvisx(dst, src, strlen(src) < len ? strlen(src) : len, VIS_NL | VIS_CSTYLE); - while (*dst) + while (*dst != '\0') dst++; if ((buf_size - 1 - (dst - buf)) / 4 > 0) *dst++ = ' '; @@ -129,7 +125,7 @@ } cp = malloc(len); if (cp == NULL) - return (NULL); + errx(1, "malloc failed"); if (ap == NULL) sprintf(cp, " (%.*s)", (int)maxlen, cmd); else if (strncmp(cmdpart(argv[0]), cmd, maxlen) != 0) ==== //depot/projects/kse/bin/ps/keyword.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.38 2002/02/21 18:27:16 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.44 2002/06/06 18:04:46 jmallett Exp $"); #if 0 #ifndef lint @@ -87,6 +87,8 @@ {"acflg", "", "acflag", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"blocked", "", "sigmask", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"caught", "", "sigcatch", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, + {"comm", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0, + CHAR, NULL, 0}, {"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0, CHAR, NULL, 0}, {"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d", @@ -233,20 +235,25 @@ static struct varent *vtail; char *tempstr, *tempstr1; -#define FMTSEP " \t,\n" tempstr1 = tempstr = strdup(p); while (tempstr && *tempstr) { char *cp; VAR *v; struct varent *vent; - while ((cp = strsep(&tempstr, FMTSEP)) != NULL && *cp == '\0') + /* + * Seperate the format by commas. + */ + while ((cp = strsep(&tempstr, ",")) != NULL && *cp == '\0') /* void */; if (cp == NULL || !(v = findvar(cp))) continue; if ((vent = malloc(sizeof(struct varent))) == NULL) - err(1, NULL); - vent->var = v; + errx(1, "malloc failed"); + vent->var = malloc(sizeof(*vent->var)); + if (vent->var == NULL) + errx(1, "malloc failed"); + memcpy(vent->var, v, sizeof(*vent->var)); vent->next = NULL; if (vhead == NULL) vhead = vtail = vent; @@ -285,7 +292,7 @@ warnx("%s: keyword not found", p); eval = 1; } else if (hp) - v->header = hp; + v->header = strdup(hp); return (v); } ==== //depot/projects/kse/bin/ps/print.c#10 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.59 2002/02/22 23:31:57 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.61 2002/06/05 18:11:25 jmallett Exp $"); #if 0 #ifndef lint @@ -108,11 +108,11 @@ } if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL) - err(1, NULL); + errx(1, "malloc failed"); strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH); if (k->ki_env) { if ((vis_env = malloc(strlen(k->ki_env) * 4 + 1)) == NULL) - err(1, NULL); + errx(1, "malloc failed"); strvis(vis_env, k->ki_env, VIS_TAB | VIS_NL | VIS_NOSLASH); } else vis_env = NULL; @@ -618,7 +618,8 @@ printval(char *bp, VAR *v) { static char ofmt[32] = "%"; - char *fcp, *cp; + const char *fcp; + char *cp; cp = ofmt + 1; fcp = v->fmt; ==== //depot/projects/kse/bin/ps/ps.1#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.46 2002/05/16 11:51:05 joe Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.48 2002/06/06 18:10:12 jmallett Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -370,8 +370,8 @@ percentage memory usage (alias pmem) .It acflag accounting flag (alias acflg) -.It command -command and arguments +.It comm +command and arguments (alias command) .It cpu short-term cpu usage factor (for scheduling) .It flags @@ -506,6 +506,16 @@ .It xstat exit or stop status (valid only for stopped or zombie process) .El +.Sh ENVIRONMENT +The following environment variables affect the execution of +.Nm : +.Bl -tag -width ".Ev COLUMNS" +.It Ev COLUMNS +If set, specifies the user's preferred output width in column positions. +By default, +.Nm +attempts to automatically determine the terminal width. +.El .Sh FILES .Bl -tag -width /var/db/kvm_kernel.db -compact .It Pa /dev/kmem ==== //depot/projects/kse/bin/ps/ps.c#8 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.50 2002/04/07 04:59:13 jedgar Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.53 2002/06/05 18:11:25 jmallett Exp $"); #ifndef lint static const char copyright[] = @@ -101,13 +101,13 @@ static void usage(void); static uid_t *getuids(const char *, int *); -static char dfmt[] = "pid tt state time command"; -static char jfmt[] = "user pid ppid pgid jobc state tt time command"; -static char lfmt[] = "uid pid ppid cpu pri nice vsz rss mwchan state tt time command"; +static char dfmt[] = "pid,tt,state,time,command"; +static char jfmt[] = "user,pid,ppid,pgid,jobc,state,tt,time,command"; +static char lfmt[] = "uid,pid,ppid,cpu,pri,nice,vsz,rss,mwchan,state,tt,time,command"; static char o1[] = "pid"; -static char o2[] = "tt state time command"; -static char ufmt[] = "user pid %cpu %mem vsz rss tt state start time command"; -static char vfmt[] = "pid state time sl re pagein vsz rss lim tsiz %cpu %mem command"; +static char o2[] = "tt,state,time,command"; +static char ufmt[] = "user,pid,%cpu,%mem,vsz,rss,tt,state,start,time,command"; +static char vfmt[] = "pid,state,time,sl,re,pagein,vsz,rss,lim,tsiz,%cpu,%mem,command"; static char Zfmt[] = "lvl"; static kvm_t *kd; @@ -123,12 +123,15 @@ uid_t *uids; int all, ch, flag, i, _fmt, lineno, nentries, dropgid; int prtheader, wflag, what, xflg, uid, nuids; + char *cols; char errbuf[_POSIX2_LINE_MAX]; const char *nlistf, *memf; (void) setlocale(LC_ALL, ""); - if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && + if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0') + termwidth = atoi(cols); + else if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && ioctl(STDERR_FILENO, TIOCGWINSZ, (char *)&ws) == -1 && ioctl(STDIN_FILENO, TIOCGWINSZ, (char *)&ws) == -1) || ws.ws_col == 0) @@ -308,7 +311,7 @@ /* XXX - should be cleaner */ if (!all && ttydev == NODEV && pid == -1 && !nuids) { if ((uids = malloc(sizeof (*uids))) == NULL) - err(1, "malloc"); + errx(1, "malloc failed"); nuids = 1; *uids = getuid(); } @@ -340,7 +343,7 @@ if ((kp = kvm_getprocs(kd, what, flag, &nentries)) == 0 || nentries < 0) errx(1, "%s", kvm_geterr(kd)); if ((kinfo = malloc(nentries * sizeof(*kinfo))) == NULL) - err(1, NULL); + errx(1, "malloc failed"); for (i = nentries; --i >= 0; ++kp) { kinfo[i].ki_p = kp; if (needuser) @@ -421,7 +424,7 @@ moreuids = realloc(uids, alloc * sizeof (*uids)); if (moreuids == NULL) { free(uids); - err(1, "realloc"); + errx(1, "realloc failed"); } uids = moreuids; } @@ -497,8 +500,6 @@ const char *s; s = fmt_argv((*fn)(kd, ki->ki_p, termwidth), comm, maxlen); - if (s == NULL) - err(1, NULL); return (s); } @@ -575,7 +576,7 @@ len = strlen(s); if ((newopts = ns = malloc(len + 2)) == NULL) - err(1, NULL); + errx(1, "malloc failed"); /* * options begin with '-' */ ==== //depot/projects/kse/sys/alpha/include/elf.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/elf.h,v 1.12 2001/10/10 23:06:48 ps Exp $ + * $FreeBSD: src/sys/alpha/include/elf.h,v 1.13 2002/05/30 08:32:18 dfr Exp $ */ #ifndef _MACHINE_ELF_H_ @@ -60,17 +60,6 @@ __ElfType(Auxinfo); -/* - * Types of dynamic symbol hash table bucket and chain elements. - * - * This is inconsistent among 64 bit architectures, so a machine dependent - * typedef is required. - */ - -typedef Elf64_Off Elf64_Hashelt; - -__ElfType(Hashelt); - /* Values for a_type. */ #define AT_NULL 0 /* Terminates the vector. */ #define AT_IGNORE 1 /* Ignored entry. */ ==== //depot/projects/kse/sys/alpha/linux/linux_dummy.c#5 (text+ko) ==== @@ -13,7 +13,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -26,7 +26,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/alpha/linux/linux_dummy.c,v 1.34 2001/10/16 06:15:35 marcel Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.35 2002/06/02 20:05:40 schweikh Exp $ */ #include ==== //depot/projects/kse/sys/alpha/linux/linux_sysvec.c#6 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -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. * - * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.81 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.82 2002/06/02 20:05:40 schweikh Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/kse/sys/alpha/osf1/imgact_osf1.c#5 (text+ko) ==== @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +30,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/alpha/osf1/imgact_osf1.c,v 1.10 2002/02/07 22:29:41 peter Exp $ + * $FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.11 2002/06/02 20:05:41 schweikh Exp $ */ #include ==== //depot/projects/kse/sys/alpha/osf1/osf1.h#2 (text+ko) ==== @@ -11,7 +11,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -24,7 +24,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/alpha/osf1/osf1.h,v 1.4 2000/11/09 08:25:45 marcel Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1.h,v 1.5 2002/06/02 20:05:41 schweikh Exp $ */ extern struct sysent osf1_sysent[]; ==== //depot/projects/kse/sys/alpha/osf1/osf1_signal.c#7 (text+ko) ==== @@ -17,7 +17,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +30,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/alpha/osf1/osf1_signal.c,v 1.17 2002/04/05 00:52:15 alc Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.18 2002/06/02 20:05:41 schweikh Exp $ */ #include ==== //depot/projects/kse/sys/alpha/osf1/osf1_sysvec.c#3 (text+ko) ==== @@ -15,7 +15,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -28,7 +28,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/alpha/osf1/osf1_sysvec.c,v 1.6 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.7 2002/06/02 20:05:41 schweikh Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/kse/sys/alpha/osf1/osf1_util.h#4 (text+ko) ==== @@ -12,7 +12,7 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. The name of the author may not be used to endorse or promote products - * derived from this software withough specific prior written permission + * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -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. * - * $FreeBSD: src/sys/alpha/osf1/osf1_util.h,v 1.3 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_util.h,v 1.4 2002/06/02 20:05:41 schweikh Exp $ */ #include ==== //depot/projects/kse/sys/boot/forth/loader.4th.8#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/sys/boot/forth/loader.4th.8,v 1.11 2002/05/09 11:47:42 joe Exp $ +.\" $FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.12 2002/05/30 09:24:01 schweikh Exp $ .\" .Dd April 25, 1999 .Dt LOADER.4TH 8 @@ -39,7 +39,7 @@ .Pa /boot/loader.rc includes .Nm -and uses one of it's commands to automatically read and process +and uses one of its commands to automatically read and process the standard .Xr loader.conf 5 files. Other commands exists to help the user specify alternate @@ -59,7 +59,7 @@ .Pp .Dl include loader.4th .Pp -This line is present on the default +This line is present in the default .Pa /boot/loader.rc file, so it isn't needed (and should not be re-issued) in a normal setup. .Pp @@ -92,7 +92,7 @@ all other .Xr loader.conf 5 files specified in it, and then proceeds to boot as specified in them. This -is command used on the default +is the command used in the default .Pa /boot/loader.rc file, and it uses the .Pa autoboot @@ -112,12 +112,12 @@ and all other .Xr loader.conf 5 files specified in it. Returns a flag on the stack to indicate -if any configuration file was succesfully loaded. +if any configuration file was successfully loaded. .Pp .It Ic read-conf Ar filename Reads and processes a .Xr loader.conf 5 -file. Does not proceeds to boot. +file. Does not proceed to boot. .Pp .It Ic enable-module Ar module Enables the loading of @@ -173,7 +173,7 @@ start .Ed .Pp -Loads a different kernel with the standard configuration: +Load a different kernel with the standard configuration: .Pp .Bd -literal -offset indent -compact set kernel="/boot/kernel.old/kernel" @@ -181,7 +181,7 @@ boot-conf .Ed .Pp -Reads an additional configuration file and then proceeds to boot: +Read an additional configuration file and then proceed to boot: .Pp .Bd -literal -offset indent -compact unload @@ -190,7 +190,7 @@ .Ed .Pp Disable the loading of the splash screen module and bitmap and then -proceeds to boot: +proceed to boot: .Pp .Bd -literal -offset indent -compact unload @@ -210,4 +210,4 @@ was written by .An Daniel C. Sobral Aq dcs@FreeBSD.org . .Sh BUGS -A british espionage series. +A British espionage series. ==== //depot/projects/kse/sys/boot/i386/boot2/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.27 2002/05/13 16:16:00 ru Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.29 2002/06/05 12:30:41 phk Exp $ PROG= boot2 NOMAN= @@ -30,6 +30,7 @@ CFLAGS= -elf -ffreestanding -Os -fno-builtin \ -fno-guess-branch-probability \ -mrtd \ + -I${.CURDIR}/../../common \ -I${.CURDIR}/../btx/lib -I. \ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ @@ -48,7 +49,7 @@ boot1.o: boot1.s ${AS} ${AFLAGS} --defsym FLAGS=${B1FLAGS} ${.IMPSRC} -o ${.TARGET} -boot2.o: boot2.c +boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c ${CC} ${CFLAGS} -S -o boot2.s.tmp ${.IMPSRC} sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s rm -f boot2.s.tmp ==== //depot/projects/kse/sys/boot/i386/boot2/boot2.c#10 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.41 2002/05/11 21:49:39 peter Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.42 2002/06/05 11:10:38 phk Exp $ */ #include @@ -25,9 +25,6 @@ #include #include -#include -#include - #include #include @@ -71,22 +68,6 @@ #define V86_CY(x) ((x) & 1) #define V86_ZR(x) ((x) & 0x40) -/* - * We use 4k `virtual' blocks for filesystem data, whatever the actual - * filesystem block size. FFS blocks are always a multiple of 4k. - */ -#define VBLKSIZE 4096 -#define VBLKMASK (VBLKSIZE - 1) -#define DBPERVBLK (VBLKSIZE / DEV_BSIZE) -#define IPERVBLK (VBLKSIZE / sizeof(struct dinode)) -#define INDIRPERVBLK (VBLKSIZE / sizeof(ufs_daddr_t)) -#define INO_TO_VBA(fs, x) (fsbtodb(fs, ino_to_fsba(fs, x)) + \ - (ino_to_fsbo(fs, x) / IPERVBLK) * DBPERVBLK) -#define INO_TO_VBO(fs, x) (ino_to_fsbo(fs, x) % IPERVBLK) -#define FS_TO_VBA(fs, fsb, off) (fsbtodb(fs, fsb) + \ - ((off) / VBLKSIZE) * DBPERVBLK) -#define FS_TO_VBO(fs, fsb, off) ((off) & VBLKMASK) - #define DRV_HARD 0x80 #define DRV_MASK 0x7f @@ -96,14 +77,6 @@ #define TYPE_FD 3 #define TYPE_DA 4 -/* Buffers that must not span a 64k boundary. */ -static struct dmadat { - char blkbuf[VBLKSIZE]; /* filesystem blocks */ - ufs_daddr_t indbuf[VBLKSIZE / sizeof(ufs_daddr_t)]; /* indir blocks */ - char sbbuf[SBSIZE]; /* superblock */ - char secbuf[DEV_BSIZE]; /* for MBR/disklabel */ -} *dmadat; - extern uint32_t _end; static const char optstr[NOPT] = "DhaCcdgmnPprsv"; @@ -135,14 +108,11 @@ unsigned part; unsigned start; int init; - int meta; } dsk; static char cmd[512]; static char kname[1024]; static uint32_t opts; static struct bootinfo bootinfo; -static int ls; -static uint32_t fs_off; static uint8_t ioctrl = IO_KEYBOARD; void exit(int); @@ -179,31 +149,8 @@ return (u_char)*s1 - (u_char)*s2; } -static inline int -fsfind(const char *name, ino_t * ino) -{ - char buf[DEV_BSIZE]; - struct dirent *d; - char *s; - ssize_t n; +#include "ufsread.c" - fs_off = 0; - while ((n = fsread(*ino, buf, DEV_BSIZE)) > 0) - for (s = buf; s < buf + DEV_BSIZE;) { - d = (void *)s; - if (ls) - printf("%s ", d->d_name); - else if (!strcmp(name, d->d_name)) { - *ino = d->d_fileno; - return d->d_type; - } - s += d->d_reclen; - } - if (n != -1 && ls) - putchar('\n'); - return 0; -} - static inline int getchar(void) { @@ -505,7 +452,7 @@ dsk.drive = (dsk.type == TYPE_WD || dsk.type == TYPE_AD || >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 6 13:24:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3944537B403; Thu, 6 Jun 2002 13:24:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 404CC37B406 for ; Thu, 6 Jun 2002 13:24:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g56KO8w23719 for perforce@freebsd.org; Thu, 6 Jun 2002 13:24:08 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Thu, 6 Jun 2002 13:24:08 -0700 (PDT) Message-Id: <200206062024.g56KO8w23719@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12455 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12455 Change 12455 by jhb@jhb_laptop on 2002/06/06 13:23:48 Change the all locks list from a STAILQ to a TAILQ. This bloats struct lock_object by another pointer (though all of lock_object should be conditional on LOCK_DEBUG anyways) in exchange for an O(1) TAILQ_REMOVE() in witness_destroy() (called for every mtx_destroy() and sx_destroy()) instead of an O(n) STAILQ_REMOVE. Suggested by: iedowse Affected files ... ... //depot/projects/smpng/sys/kern/subr_witness.c#53 edit ... //depot/projects/smpng/sys/sys/_lock.h#8 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#53 (text+ko) ==== @@ -241,14 +241,14 @@ /* * List of all locks in the system. */ -STAILQ_HEAD(, lock_object) all_locks = STAILQ_HEAD_INITIALIZER(all_locks); +TAILQ_HEAD(, lock_object) all_locks = TAILQ_HEAD_INITIALIZER(all_locks); static struct mtx all_mtx = { { &lock_class_mtx_sleep, /* mtx_object.lo_class */ "All locks list", /* mtx_object.lo_name */ "All locks list", /* mtx_object.lo_type */ LO_INITIALIZED, /* mtx_object.lo_flags */ - { NULL }, /* mtx_object.lo_list */ + { NULL, NULL }, /* mtx_object.lo_list */ NULL }, /* mtx_object.lo_witness */ MTX_UNOWNED, 0, /* mtx_lock, mtx_recurse */ TAILQ_HEAD_INITIALIZER(all_mtx.mtx_blocked), @@ -285,7 +285,7 @@ mtx_assert(&Giant, MA_NOTOWNED); CTR1(KTR_WITNESS, "%s: initializing witness", __func__); - STAILQ_INSERT_HEAD(&all_locks, &all_mtx.mtx_object, lo_list); + TAILQ_INSERT_HEAD(&all_locks, &all_mtx.mtx_object, lo_list); mtx_init(&w_mtx, "witness lock", NULL, MTX_SPIN | MTX_QUIET | MTX_NOWITNESS); for (i = 0; i < WITNESS_COUNT; i++) @@ -313,7 +313,7 @@ /* Iterate through all locks and add them to witness. */ mtx_lock(&all_mtx); - STAILQ_FOREACH(lock, &all_locks, lo_list) { + TAILQ_FOREACH(lock, &all_locks, lo_list) { if (lock->lo_flags & LO_WITNESS) lock->lo_witness = enroll(lock->lo_type, lock->lo_class); @@ -352,7 +352,7 @@ class->lc_name, lock->lo_name); mtx_lock(&all_mtx); - STAILQ_INSERT_TAIL(&all_locks, lock, lo_list); + TAILQ_INSERT_TAIL(&all_locks, lock, lo_list); lock->lo_flags |= LO_INITIALIZED; lock_cur_cnt++; if (lock_cur_cnt > lock_max_cnt) @@ -390,7 +390,7 @@ mtx_lock(&all_mtx); lock_cur_cnt--; - STAILQ_REMOVE(&all_locks, lock, lock_object, lo_list); + TAILQ_REMOVE(&all_locks, lock, lo_list); lock->lo_flags &= ~LO_INITIALIZED; mtx_unlock(&all_mtx); } ==== //depot/projects/smpng/sys/sys/_lock.h#8 (text+ko) ==== @@ -36,7 +36,7 @@ const char *lo_name; /* Individual lock name. */ const char *lo_type; /* General lock type. */ u_int lo_flags; - STAILQ_ENTRY(lock_object) lo_list; /* List of all locks in system. */ + TAILQ_ENTRY(lock_object) lo_list; /* List of all locks in system. */ struct witness *lo_witness; }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 7 4:38:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7684E37B401; Fri, 7 Jun 2002 04:38:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1E8FA37B40C for ; Fri, 7 Jun 2002 04:37:58 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g57Bbwa79143 for perforce@freebsd.org; Fri, 7 Jun 2002 04:37:58 -0700 (PDT) (envelope-from des@freebsd.org) Date: Fri, 7 Jun 2002 04:37:58 -0700 (PDT) Message-Id: <200206071137.g57Bbwa79143@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12486 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12486 Change 12486 by des@des.at.aes.thinksec.com on 2002/06/07 04:37:44 Make this actually work... Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/bin/su/su.c#7 edit Differences ... ==== //depot/projects/openpam/bin/su/su.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/bin/su/su.c#6 $ + * $P4: //depot/projects/openpam/bin/su/su.c#7 $ */ #include @@ -41,11 +41,14 @@ #include #include #include +#include #include #include #include -#include +#include /* for openpam_ttyconv() */ + +extern char **environ; static pam_handle_t *pamh; static struct pam_conv pamc; @@ -58,24 +61,14 @@ exit(1); } -static int -check(const char *func, int pam_err) -{ - - if (pam_err == PAM_SUCCESS || pam_err == PAM_NEW_AUTHTOK_REQD) - return pam_err; - openlog("su", LOG_CONS, LOG_AUTH); - syslog(LOG_ERR, "%s(): %s", func, pam_strerror(pamh, pam_err)); - errx(1, "Sorry."); -} - int main(int argc, char *argv[]) { char hostname[MAXHOSTNAMELEN]; const char *user, *tty; + char **args, **pam_envlist, **pam_env; struct passwd *pwd; - int o, status; + int o, pam_err, status; pid_t pid; while ((o = getopt(argc, argv, "h")) != -1) @@ -94,52 +87,93 @@ /* set some items */ gethostname(hostname, sizeof(hostname)); - check("pam_set_item", pam_set_item(pamh, PAM_RHOST, hostname)); + if ((pam_err = pam_set_item(pamh, PAM_RHOST, hostname)) != PAM_SUCCESS) + goto pamerr; user = getlogin(); - check("pam_set_item", pam_set_item(pamh, PAM_RUSER, user)); + if ((pam_err = pam_set_item(pamh, PAM_RUSER, user)) != PAM_SUCCESS) + goto pamerr; tty = ttyname(STDERR_FILENO); - check("pam_set_item", pam_set_item(pamh, PAM_TTY, tty)); + if ((pam_err = pam_set_item(pamh, PAM_TTY, tty)) != PAM_SUCCESS) + goto pamerr; /* authenticate the applicant */ - check("pam_authenticate", pam_authenticate(pamh, 0)); - if (check("pam_acct_mgmt", pam_acct_mgmt(pamh, 0)) == - PAM_NEW_AUTHTOK_REQD) - check("pam_chauthtok", - pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK)); + if ((pam_err = pam_authenticate(pamh, 0)) != PAM_SUCCESS) + goto pamerr; + if ((pam_err = pam_acct_mgmt(pamh, 0)) == PAM_NEW_AUTHTOK_REQD) + pam_err = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); + if (pam_err != PAM_SUCCESS) + goto pamerr; /* establish the requested credentials */ - check("pam_setcred", pam_setcred(pamh, PAM_ESTABLISH_CRED)); + if ((pam_err = pam_setcred(pamh, PAM_ESTABLISH_CRED)) != PAM_SUCCESS) + goto pamerr; /* authentication succeeded; open a session */ - check("pam_open_session", pam_open_session(pamh, 0)); + if ((pam_err = pam_open_session(pamh, 0)) != PAM_SUCCESS) + goto pamerr; + + /* get mapped user name; PAM may have changed it */ + pam_err = pam_get_item(pamh, PAM_USER, (const void **)&user); + if (pam_err != PAM_SUCCESS || (pwd = getpwnam(user)) == NULL) + goto pamerr; + + /* set uid and groups */ + if (initgroups(pwd->pw_name, pwd->pw_gid) == -1) { + warn("initgroups()"); + goto err; + } + if (setgid(pwd->pw_gid) == -1) { + warn("setgid()"); + goto err; + } + if (setuid(pwd->pw_uid) == -1) { + warn("setuid()"); + goto err; + } - if (initgroups(pwd->pw_name, pwd->pw_gid) == -1) - err(1, "initgroups()"); - if (setuid(pwd->pw_uid) == -1) - err(1, "setuid()"); + /* export PAM environment */ + if ((pam_envlist = pam_getenvlist(pamh)) != NULL) { + for (pam_env = pam_envlist; *pam_env != NULL; ++pam_env) { + putenv(*pam_env); + free(*pam_env); + } + free(pam_envlist); + } - /* XXX export environment variables */ + /* build argument list */ + if ((args = calloc(argc + 2, sizeof *args)) == NULL) { + warn("calloc()"); + goto err; + } + *args = pwd->pw_shell; + memcpy(args + 1, argv, argc * sizeof *args); + /* fork and exec */ switch ((pid = fork())) { case -1: - err(1, "fork()"); + warn("fork()"); + goto err; case 0: /* child: start a shell */ - *argv = pwd->pw_shell; - execvp(*argv, argv); - err(1, "execvp()"); + execve(*args, args, environ); + warn("execve()"); + _exit(1); default: /* parent: wait for child to exit */ waitpid(pid, &status, 0); - if (WIFEXITED(status)) - status = WEXITSTATUS(status); - else - status = 1; + + /* close the session and release PAM resources */ + pam_err = pam_close_session(pamh, 0); + pam_end(pamh, pam_err); + + exit(WEXITSTATUS(status)); } - /* close the session and release PAM resources */ - check("pam_close_session", pam_close_session(pamh, 0)); - check("pam_end", pam_end(pamh, 0)); - - exit(status); +pamerr: + pam_end(pamh, pam_err); + fprintf(stderr, "Sorry\n"); + exit(1); +err: + pam_end(pamh, pam_err); + exit(1); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 7 5:51:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B39837B404; Fri, 7 Jun 2002 05:51:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9A7EC37B401 for ; Fri, 7 Jun 2002 05:51:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g57Cpb598646 for perforce@freebsd.org; Fri, 7 Jun 2002 05:51:37 -0700 (PDT) (envelope-from des@freebsd.org) Date: Fri, 7 Jun 2002 05:51:37 -0700 (PDT) Message-Id: <200206071251.g57Cpb598646@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12489 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12489 Change 12489 by des@des.at.aes.thinksec.com on 2002/06/07 05:50:58 A working bare-bones pam_unix module (authentication only). Should work with Linux-PAM, though I've only tested it with OpenPAM. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/modules/Makefile#6 edit ... //depot/projects/openpam/modules/pam_unix/Makefile#1 add ... //depot/projects/openpam/modules/pam_unix/pam_unix.c#1 add Differences ... ==== //depot/projects/openpam/modules/Makefile#6 (text+ko) ==== @@ -31,12 +31,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/modules/Makefile#5 $ +# $P4: //depot/projects/openpam/modules/Makefile#6 $ # SUBDIR = SUBDIR += pam_deny SUBDIR += pam_dummy SUBDIR += pam_permit +SUBDIR += pam_unix .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 7 7:22:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E562D37B403; Fri, 7 Jun 2002 07:22:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4C01137B412 for ; Fri, 7 Jun 2002 07:22:28 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g57EMSw16255 for perforce@freebsd.org; Fri, 7 Jun 2002 07:22:28 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Fri, 7 Jun 2002 07:22:28 -0700 (PDT) Message-Id: <200206071422.g57EMSw16255@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12492 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12492 Change 12492 by jhb@jhb_laptop on 2002/06/07 07:22:04 - If a witness was never used (no locks it was attached to were ever acquired, thus, w_file == NULL) then return it to the free list when it becomes dead. - Rate limit the dead witness message to one message per witness object so we don't spam the console. Affected files ... ... //depot/projects/smpng/sys/kern/subr_witness.c#54 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#54 (text+ko) ==== @@ -98,6 +98,7 @@ u_char w_Giant_squawked:1; u_char w_other_squawked:1; u_char w_same_squawked:1; + u_char w_dead_squawked:1; }; struct witness_child_list_entry { @@ -369,6 +370,7 @@ witness_destroy(struct lock_object *lock) { struct witness *w; + int print; if (witness_cold) panic("lock (%s) %s destroyed while witness_cold", @@ -383,8 +385,21 @@ mtx_lock_spin(&w_mtx); MPASS(w->w_refcount > 0); w->w_refcount--; + print = 0; + if (w->w_refcount == 0) { + /* + * If no locks for this witness were ever acquired, + * then return the witness to the free list. + */ + if (w->w_file == NULL) + witness_free(w); + else if (w->w_dead_squawked == 0) { + w->w_dead_squawked = 1; + print = 1; + } + } mtx_unlock_spin(&w_mtx); - if (w->w_refcount == 0) + if (print) printf("dead witness: %s\n", w->w_name); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 7 7:42:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B7F637B403; Fri, 7 Jun 2002 07:39:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EE99E37B413 for ; Fri, 7 Jun 2002 07:38:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g57EcnZ17666 for perforce@freebsd.org; Fri, 7 Jun 2002 07:38:49 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Fri, 7 Jun 2002 07:38:49 -0700 (PDT) Message-Id: <200206071438.g57EcnZ17666@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12495 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12495 Change 12495 by jhb@jhb_laptop on 2002/06/07 07:38:02 IFC ktrace breakage. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/trap.c#33 integrate ... //depot/projects/smpng/sys/boot/ofw/libofw/ofw_net.c#5 integrate ... //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#5 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#7 integrate ... //depot/projects/smpng/sys/conf/NOTES#16 integrate ... //depot/projects/smpng/sys/conf/files#43 integrate ... //depot/projects/smpng/sys/conf/options#29 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#7 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#7 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#5 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.c#8 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.h#6 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#5 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#8 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.c#7 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.c#6 integrate ... //depot/projects/smpng/sys/contrib/ipfilter/netinet/ipl.h#5 integrate ... //depot/projects/smpng/sys/dev/hea/eni.h#3 integrate ... //depot/projects/smpng/sys/dev/hea/hea_freebsd.c#2 integrate ... //depot/projects/smpng/sys/dev/hea/hea_pci.c#2 integrate ... //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.c#2 integrate ... //depot/projects/smpng/sys/dev/hfa/hfa_pci.c#2 integrate ... //depot/projects/smpng/sys/i386/i386/trap.c#38 integrate ... //depot/projects/smpng/sys/ia64/ia64/ski.c#3 integrate ... //depot/projects/smpng/sys/ia64/ia64/trap.c#33 integrate ... //depot/projects/smpng/sys/kern/kern_condvar.c#14 integrate ... //depot/projects/smpng/sys/kern/kern_exec.c#37 integrate ... //depot/projects/smpng/sys/kern/kern_exit.c#42 integrate ... //depot/projects/smpng/sys/kern/kern_fork.c#40 integrate ... //depot/projects/smpng/sys/kern/kern_ktrace.c#24 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#31 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#40 integrate ... //depot/projects/smpng/sys/kern/kern_synch.c#25 integrate ... //depot/projects/smpng/sys/kern/subr_trap.c#34 integrate ... //depot/projects/smpng/sys/kern/subr_witness.c#55 integrate ... //depot/projects/smpng/sys/kern/sys_generic.c#14 integrate ... //depot/projects/smpng/sys/kern/uipc_syscalls.c#20 integrate ... //depot/projects/smpng/sys/kern/vfs_lookup.c#11 integrate ... //depot/projects/smpng/sys/netatm/atm_if.h#4 integrate ... //depot/projects/smpng/sys/netatm/atm_ioctl.h#3 integrate ... //depot/projects/smpng/sys/powerpc/powerpc/trap.c#22 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/trap.c#35 integrate ... //depot/projects/smpng/sys/sys/_lock.h#9 integrate ... //depot/projects/smpng/sys/sys/kernel.h#16 integrate ... //depot/projects/smpng/sys/sys/ktrace.h#6 integrate ... //depot/projects/smpng/sys/sys/proc.h#51 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#26 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#33 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.93 2002/05/16 00:03:32 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.94 2002/06/07 05:47:34 jhb Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -715,18 +715,17 @@ break; } +#ifdef KTRACE + if (KTRPOINT(td, KTR_SYSCALL)) + ktrsyscall(code, (callp->sy_narg & SYF_ARGMASK), args + hidden); +#endif /* * Try to run the syscall without the MP lock if the syscall * is MP safe */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) { + if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_lock(&Giant); - } -#ifdef KTRACE - if (KTRPOINT(p, KTR_SYSCALL)) { - ktrsyscall(p->p_tracep, code, (callp->sy_narg & SYF_ARGMASK), args + hidden); - } -#endif + if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = 0; @@ -761,20 +760,17 @@ } userret(td, framep, sticks); -#ifdef KTRACE - if (KTRPOINT(p, KTR_SYSRET)) { - ktrsysret(p->p_tracep, code, error, td->td_retval[0]); - } -#endif /* - * Release Giant if we had to get it. Don't use mtx_owned(), - * we want to catch broken syscalls. + * Release Giant if we had to get it. */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) { + if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); - } +#ifdef KTRACE + if (KTRPOINT(td, KTR_SYSRET)) + ktrsysret(code, error, td->td_retval[0]); +#endif /* * This works because errno is findable through the * register set. If we ever support an emulation where this ==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_net.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/ofw_net.c,v 1.5 2002/02/23 04:31:30 jake Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/ofw_net.c,v 1.6 2002/06/07 11:49:33 benno Exp $ */ #include @@ -210,7 +210,8 @@ #endif #ifndef __sparc64__ - if (OF_call_method("dma-alloc", netinstance, 1, 1, NULL, &dmabuf) + dmabuf = NULL; + if (OF_call_method("dma-alloc", netinstance, 1, 1, (64 * 1024), &dmabuf) < 0) { printf("Failed to allocate DMA buffer (got %08x).\n", dmabuf); goto punt; ==== //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.8 2002/05/10 09:26:34 obrien Exp $ +# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.9 2002/06/07 11:49:56 benno Exp $ BASE= loader PROG= ${BASE} @@ -58,12 +58,12 @@ # where to get libstand from #XXX need a better way to do this LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a -#.if !exists(${LIBSTAND}) -#LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a -#.if !exists(${LIBSTAND}) -#LIBSTAND= -lstand -#.endif -#.endif +.if !exists(${LIBSTAND}) +LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a +.if !exists(${LIBSTAND}) +LIBSTAND= -lstand +.endif +.endif CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ # OpenFirmware is expecting ELF components ==== //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#7 (text+ko) ==== @@ -27,7 +27,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/compat/svr4/svr4_stream.c,v 1.28 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.29 2002/06/07 05:36:16 jhb Exp $ */ /* @@ -227,7 +227,7 @@ if (error == 0) { ktruio.uio_iov = ktriov; ktruio.uio_resid = td->td_retval[0]; - ktrgenio(td->td_proc->p_tracep, s, UIO_WRITE, &ktruio, error); + ktrgenio(s, UIO_WRITE, &ktruio, error); } FREE(ktriov, M_TEMP); } @@ -299,7 +299,7 @@ if (error == 0) { ktruio.uio_iov = ktriov; ktruio.uio_resid = len - auio.uio_resid; - ktrgenio(td->td_proc->p_tracep, s, UIO_READ, &ktruio, error); + ktrgenio(s, UIO_READ, &ktruio, error); } FREE(ktriov, M_TEMP); } ==== //depot/projects/smpng/sys/conf/NOTES#16 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1036 2002/06/06 16:35:55 gibbs Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1038 2002/06/07 05:32:58 jhb Exp $ # # @@ -216,9 +216,16 @@ options GDB_REMOTE_CHAT # -# KTRACE enables the system-call tracing facility ktrace(2). +# KTRACE enables the system-call tracing facility ktrace(2). To be more +# SMP-friendly, KTRACE uses a worker thread to process most trace events +# asynchronously to the thread generating the event. This requires a +# pre-allocated store of objects representing trace events. The +# KTRACE_REQUEST_POOL option specifies the initial size of this store. +# The size of the pool can be adjusted both at boottime and runtime via +# the kern.ktrace_request_pool tunable and sysctl. # options KTRACE #kernel tracing +options KTRACE_REQUEST_POOL=101 # # KTR is a kernel tracing mechanism imported from BSD/OS. Currently it @@ -554,8 +561,8 @@ options ATM_SIGPVC #SIGPVC signalling manager options ATM_SPANS #SPANS signalling manager options ATM_UNI #UNI signalling manager -# Broken: -##device hea #Efficient ENI-155p ATM PCI + +device hea #Efficient ENI-155p ATM PCI device hfa #FORE PCA-200E ATM PCI ==== //depot/projects/smpng/sys/conf/files#43 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.644 2002/06/06 16:35:55 gibbs Exp $ +# $FreeBSD: src/sys/conf/files,v 1.645 2002/06/07 02:04:09 mdodd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -358,14 +358,14 @@ dev/gem/if_gem_pci.c optional gem pci dev/gx/if_gx.c optional gx dev/hea/eni.c optional hea nowerror -dev/hea/eni_buffer.c optional hea +dev/hea/eni_buffer.c optional hea nowerror dev/hea/eni_globals.c optional hea dev/hea/eni_if.c optional hea dev/hea/eni_init.c optional hea dev/hea/eni_intr.c optional hea dev/hea/eni_receive.c optional hea dev/hea/eni_transmit.c optional hea -dev/hea/eni_vcm.c optional hea +dev/hea/eni_vcm.c optional hea nowerror dev/hea/hea_pci.c optional hea pci dev/hea/hea_freebsd.c optional hea dev/hfa/fore_buffer.c optional hfa ==== //depot/projects/smpng/sys/conf/options#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.321 2002/06/06 16:35:55 gibbs Exp $ +# $FreeBSD: src/sys/conf/options,v 1.322 2002/06/07 05:32:59 jhb Exp $ # # On the handling of kernel options # @@ -77,6 +77,7 @@ NODEVFS opt_devfs.h HW_WDOG KTRACE +KTRACE_REQUEST_POOL opt_ktrace.h # Size of ktrace request pool LIBICONV MD_ROOT opt_md.h MD_ROOT_SIZE opt_md.h ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#7 (text+ko) ==== @@ -99,7 +99,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.30 2002/04/27 16:56:25 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.31 2002/06/07 08:56:30 darrenr Exp $"; #endif #ifndef _KERNEL @@ -1517,7 +1517,7 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $Id: fil.c,v 2.35.2.60 2002/04/26 10:20:34 darrenr Exp $ + * $Id: fil.c,v 2.35.2.61 2002/06/05 08:18:09 darrenr Exp $ */ /* * Copy data from an mbuf chain starting "off" bytes from the beginning, @@ -1632,7 +1632,6 @@ fgp = &ipfgroups[0][set]; else return NULL; - num &= 0xffff; while ((fg = *fgp)) if (fg->fg_num == num) ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_auth.c#7 (text+ko) ==== @@ -105,7 +105,7 @@ #if !defined(lint) /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.11.2.12 2001/07/18 14:57:08 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.28 2002/04/25 03:31:39 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.29 2002/06/07 08:56:30 darrenr Exp $"; #endif @@ -613,7 +613,10 @@ } else faep = &fae->fae_next; } - ipauth = &fae_list->fae_fr; + if (fae_list != NULL) + ipauth = &fae_list->fae_fr; + else + ipauth = NULL; for (frp = &fr_authlist; (fr = *frp); ) { if (fr->fr_ref == 1) { ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#5 (text+ko) ==== @@ -5,7 +5,7 @@ * * @(#)ip_compat.h 1.8 1/14/96 * $Id: ip_compat.h,v 2.26.2.9 2001/01/14 14:58:01 darrenr Exp $ - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.17 2002/04/27 16:56:25 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_compat.h,v 1.18 2002/06/07 08:56:30 darrenr Exp $ */ #ifndef __IP_COMPAT_H__ @@ -214,7 +214,11 @@ #if defined(__FreeBSD__) && (defined(KERNEL) || defined(_KERNEL)) # include # ifndef __FreeBSD_version -# include +# ifdef IPFILTER_LKM +# include +# else +# include +# endif # endif # ifdef IPFILTER_LKM # define ACTUALLY_LKM_NOT_KERNEL ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.c#8 (text+ko) ==== @@ -124,7 +124,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; /* static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.42.2.34 2001/07/23 13:49:57 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.32 2002/04/25 03:31:39 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.33 2002/06/07 08:56:30 darrenr Exp $"; #endif extern struct protosw inetsw[]; @@ -649,6 +649,9 @@ unit = dev; #endif + if (fr_running == 0 && (cmd != SIOCFRENB || unit != IPL_LOGIPF)) + return ENODEV; + SPL_NET(s); if (unit == IPL_LOGNAT) { @@ -893,7 +896,8 @@ * Check that the group number does exist and that if a head group * has been specified, doesn't exist. */ - if ((req != SIOCZRLST) && fp->fr_grhead && + if ((req != SIOCZRLST) && ((req == SIOCINAFR) || (req == SIOCINIFR) || + (req == SIOCADAFR) || (req == SIOCADIFR)) && fp->fr_grhead && fr_findgroup((u_int)fp->fr_grhead, fp->fr_flags, unit, set, NULL)) return EEXIST; if ((req != SIOCZRLST) && fp->fr_group && @@ -1227,13 +1231,18 @@ struct mbuf **mp; { struct mbuf *m = *mp; - char *dpsave; - int error; + int error, hlen; + fr_info_t frn; ip_t *ip; - dpsave = fin->fin_dp; + bzero((char *)&frn, sizeof(frn)); + frn.fin_ifp = fin->fin_ifp; + frn.fin_v = fin->fin_v; + frn.fin_out = fin->fin_out; + frn.fin_mp = fin->fin_mp; ip = mtod(m, ip_t *); + hlen = sizeof(*ip); ip->ip_v = fin->fin_v; if (ip->ip_v == 4) { @@ -1248,21 +1257,24 @@ ip->ip_ttl = ip_defttl; # endif ip->ip_sum = 0; - fin->fin_dp = (char *)(ip + 1); + frn.fin_dp = (char *)(ip + 1); } # ifdef USE_INET6 else if (ip->ip_v == 6) { ip6_t *ip6 = (ip6_t *)ip; + hlen = sizeof(*ip6); ip6->ip6_hlim = 127; - fin->fin_dp = (char *)(ip6 + 1); + frn.fin_dp = (char *)(ip6 + 1); } # endif # ifdef IPSEC m->m_pkthdr.rcvif = NULL; # endif - error = ipfr_fastroute(m, mp, fin, NULL); - fin->fin_dp = dpsave; + + fr_makefrip(hlen, ip, &frn); + + error = ipfr_fastroute(m, mp, &frn, NULL); return error; } @@ -1569,6 +1581,9 @@ /* * Route packet. */ +#ifdef __sgi + ROUTE_RDLOCK(); +#endif bzero((caddr_t)ro, sizeof (*ro)); dst = (struct sockaddr_in *)&ro->ro_dst; dst->sin_family = AF_INET; @@ -1605,6 +1620,11 @@ # else rtalloc(ro); # endif + +#ifdef __sgi + ROUTE_UNLOCK(); +#endif + if (!ifp) { if (!fr || !(fr->fr_flags & FR_FASTROUTE)) { error = -2; @@ -2104,7 +2124,7 @@ fr_info_t *fin; int dst; { - verbose("- ICMP UNREACHABLE RST sent\n"); + verbose("- ICMP UNREACHABLE sent\n"); return 0; } ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.h#6 (text+ko) ==== @@ -5,7 +5,7 @@ * * @(#)ip_fil.h 1.35 6/5/96 * $Id: ip_fil.h,v 2.29.2.4 2000/11/12 11:54:53 darrenr Exp $ - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.h,v 1.22 2002/04/25 03:31:39 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.h,v 1.23 2002/06/07 08:56:30 darrenr Exp $ */ #ifndef __IP_FIL_H__ @@ -510,6 +510,7 @@ extern int send_icmp_err __P((ip_t *, int, fr_info_t *, int)); extern int ipf_log __P((void)); extern struct ifnet *get_unit __P((char *, int)); +extern int mbuflen __P((mb_t *)); # if defined(__NetBSD__) || defined(__OpenBSD__) || \ (_BSDI_VERSION >= 199701) || (__FreeBSD_version >= 300000) extern int iplioctl __P((dev_t, u_long, caddr_t, int)); ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#5 (text+ko) ==== @@ -2,7 +2,7 @@ * Simple FTP transparent proxy for in-kernel use. For use with the NAT * code. * - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c,v 1.20 2002/04/27 16:56:25 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c,v 1.21 2002/06/07 08:56:30 darrenr Exp $ */ #if SOLARIS && defined(_KERNEL) extern kmutex_t ipf_rw; @@ -766,10 +766,10 @@ i = 0; sel = nat->nat_aps->aps_sel[1 - rv]; if (rv) { - if (nat->nat_aps->aps_ackmin[sel] > ntohl(tcp->th_seq)) + if (nat->nat_aps->aps_ackmin[sel] < ntohl(tcp->th_seq)) i = nat->nat_aps->aps_ackoff[sel]; } else { - if (nat->nat_aps->aps_seqmin[sel] > ntohl(tcp->th_seq)) + if (nat->nat_aps->aps_seqmin[sel] < ntohl(tcp->th_seq)) i = nat->nat_aps->aps_seqoff[sel]; } /* @@ -781,6 +781,10 @@ f->ftps_seq = ntohl(tcp->th_seq); else { inc = ntohl(tcp->th_seq) - f->ftps_seq; + if (inc < 0) + inc = -inc; + if (i < 0) + i = -i; if (inc > i) { return APR_ERR(1); } ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#8 (text+ko) ==== @@ -111,7 +111,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed"; /* static const char rcsid[] = "@(#)$Id: ip_nat.c,v 2.37.2.44 2001/07/21 07:17:22 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.30 2002/04/27 16:56:25 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.31 2002/06/07 08:56:30 darrenr Exp $"; #endif nat_t **nat_table[2] = { NULL, NULL }, @@ -471,8 +471,12 @@ } for (np = &nat_list; (n = *np); np = &n->in_next) if (!bcmp((char *)&nat->in_flags, (char *)&n->in_flags, - IPN_CMPSIZ)) + IPN_CMPSIZ)) { + if (n->in_redir == NAT_REDIRECT && + n->in_pnext != nat->in_pnext) + continue; break; + } } switch (cmd) ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.c#7 (text+ko) ==== @@ -77,7 +77,7 @@ #if !defined(lint) /* static const char rcsid[] = "@(#)$Id: ip_proxy.c,v 2.9.2.6 2001/07/15 22:06:15 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.c,v 1.18 2002/04/27 16:56:25 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.c,v 1.19 2002/06/07 08:56:30 darrenr Exp $"; #endif #if defined(_KERNEL) && (SOLARIS || defined(__sgi)) @@ -123,7 +123,7 @@ ippr_ipsec_match }, #endif #ifdef IPF_NETBIOS_PROXY - { NULL, "netbios", (char)IPPROTO_TCP, 0, 0, ippr_netbios_init, NULL, + { NULL, "netbios", (char)IPPROTO_UDP, 0, 0, ippr_netbios_init, NULL, NULL, NULL, NULL, ippr_netbios_out, NULL }, #endif #ifdef IPF_H323_PROXY @@ -422,11 +422,14 @@ int sel, ch = 0, out, nlen; u_32_t seq1, seq2; tcphdr_t *tcp; + short inc2; tcp = (tcphdr_t *)fin->fin_dp; out = fin->fin_out; nlen = ip->ip_len; nlen -= (ip->ip_hl << 2) + (tcp->th_off << 2); + inc2 = inc; + inc = (int)inc2; if (out != 0) { seq1 = (u_32_t)ntohl(tcp->th_seq); ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.c#6 (text+ko) ==== @@ -95,7 +95,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ip_state.c 1.8 6/5/96 (C) 1993-2000 Darren Reed"; /* static const char rcsid[] = "@(#)$Id: ip_state.c,v 2.30.2.38 2001/07/23 13:49:46 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_state.c,v 1.27 2002/04/27 16:56:25 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_state.c,v 1.28 2002/06/07 08:56:30 darrenr Exp $"; #endif #ifndef MIN @@ -577,9 +577,9 @@ register u_int hv; struct icmp *ic; ipstate_t ips; + int out, ws; u_int pass; void *ifp; - int out; if (fr_state_lock || (fin->fin_off != 0) || (fin->fin_fl & FI_SHORT) || (fin->fin_misc & FM_BADSTATE)) @@ -693,8 +693,11 @@ is->is_maxsend = is->is_send; if ((tcp->th_flags & TH_SYN) && - ((tcp->th_off << 2) >= (sizeof(*tcp) + 4))) - is->is_swscale = fr_tcpoptions(tcp); + ((tcp->th_off << 2) >= (sizeof(*tcp) + 4))) { + ws = fr_tcpoptions(tcp); + if (ws >= 0) + is->is_swscale = ws; + } } is->is_maxdwin = 1; @@ -902,6 +905,7 @@ fdata->td_wscale = wscale; else if (wscale == -2) fdata->td_wscale = tdata->td_wscale = 0; + win <<= fdata->td_wscale; if ((fdata->td_end == 0) && (!is->is_fsm || ((tcp->th_flags & TH_OPENING) == TH_OPENING))) { @@ -910,7 +914,9 @@ */ fdata->td_end = end; fdata->td_maxwin = 1; - fdata->td_maxend = end + 1; + fdata->td_maxend = end + win; + if (win == 0) + fdata->td_maxend++; } if (!(tcp->th_flags & TH_ACK)) { /* Pretend an ack was sent */ @@ -924,7 +930,6 @@ if (seq == end) seq = end = fdata->td_end; - win <<= fdata->td_wscale; maxwin = tdata->td_maxwin; ackskew = tdata->td_end - ack; @@ -1459,7 +1464,7 @@ rev = fin->fin_rev; if (is->is_frage[rev] != 0) is->is_age = is->is_frage[rev]; - else if (fin->fin_rev) + else if (rev != 0) is->is_age = fr_icmpacktimeout; else is->is_age = fr_icmptimeout; ==== //depot/projects/smpng/sys/contrib/ipfilter/netinet/ipl.h#5 (text+ko) ==== @@ -4,12 +4,12 @@ * See the IPFILTER.LICENCE file for details on licencing. * * @(#)ipl.h 1.21 6/5/96 - * $FreeBSD: src/sys/contrib/ipfilter/netinet/ipl.h,v 1.18 2002/04/27 16:56:25 darrenr Exp $ + * $FreeBSD: src/sys/contrib/ipfilter/netinet/ipl.h,v 1.19 2002/06/07 08:56:30 darrenr Exp $ */ #ifndef __IPL_H__ #define __IPL_H__ -#define IPL_VERSION "IP Filter: v3.4.27" +#define IPL_VERSION "IP Filter: v3.4.28" #endif ==== //depot/projects/smpng/sys/dev/hea/eni.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni.h,v 1.4 2002/06/03 09:16:51 mdodd Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni.h,v 1.5 2002/06/07 05:23:01 mdodd Exp $ * */ @@ -478,6 +478,10 @@ Eni_stats eu_stats; /* Statistics */ + int eu_type; +#define TYPE_UNKNOWN 0 +#define TYPE_ENI 1 +#define TYPE_ADP 2 }; typedef struct eni_unit Eni_unit; ==== //depot/projects/smpng/sys/dev/hea/hea_freebsd.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/hea/hea_freebsd.c,v 1.1 2002/06/03 09:16:52 mdodd Exp $ + * $FreeBSD: src/sys/dev/hea/hea_freebsd.c,v 1.3 2002/06/07 05:23:01 mdodd Exp $ */ /* @@ -163,14 +163,15 @@ */ eup->eu_unit = device_get_unit(dev); eup->eu_mtu = ENI_IFF_MTU; - eup->eu_pcitag = dev; + eup->eu_vcc_pool = &eni_vcc_pool; + eup->eu_nif_pool = &eni_nif_pool; eup->eu_ioctl = eni_atm_ioctl; eup->eu_instvcc = eni_instvcc; eup->eu_openvcc = eni_openvcc; eup->eu_closevcc = eni_closevcc; eup->eu_output = eni_output; - eup->eu_vcc_pool = &eni_vcc_pool; - eup->eu_nif_pool = &eni_nif_pool; + + eup->eu_pcitag = dev; /* * Map memory structures into adapter space @@ -202,25 +203,44 @@ goto fail; } - /* - * Read the contents of the SEEPROM - */ - eni_read_seeprom(eup); - /* - * Copy MAC address to PIF and config structures - */ - bcopy((caddr_t)&eup->eu_seeprom[SEPROM_MAC_OFF], - (caddr_t)&eup->eu_pif.pif_macaddr, - sizeof(struct mac_addr)); + if (eup->eu_type == TYPE_ADP) { + int i; +#define MID_ADPMACOFF 0xffc0 /* mac address offset (adaptec only) */ + + for (i = 0; i < sizeof(struct mac_addr); i++) { + eup->eu_pif.pif_macaddr.ma_data[i] = + bus_space_read_1(rman_get_bustag(sc->mem), + rman_get_bushandle(sc->mem), + MID_ADPMACOFF + i); + } + + } else + if (eup->eu_type == TYPE_ENI) { + /* + * Read the contents of the SEEPROM + */ + eni_read_seeprom(eup); + + /* + * Copy MAC address to PIF and config structures + */ + bcopy((caddr_t)&eup->eu_seeprom[SEPROM_MAC_OFF], + (caddr_t)&eup->eu_pif.pif_macaddr, + sizeof(struct mac_addr)); + /* + * Copy serial number into config space + */ + eup->eu_config.ac_serial = + ntohl(*(u_long *)&eup->eu_seeprom[SEPROM_SN_OFF]); + } else { + device_printf(dev, "Unknown adapter type!\n"); + error = ENXIO; + goto fail; + } + eup->eu_config.ac_macaddr = eup->eu_pif.pif_macaddr; /* - * Copy serial number into config space - */ - eup->eu_config.ac_serial = - ntohl(*(u_long *)&eup->eu_seeprom[SEPROM_SN_OFF]); - - /* * Setup some of the adapter configuration */ /* ==== //depot/projects/smpng/sys/dev/hea/hea_pci.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/hea/hea_pci.c,v 1.1 2002/06/03 09:16:52 mdodd Exp $ + * $FreeBSD: src/sys/dev/hea/hea_pci.c,v 1.3 2002/06/07 05:23:01 mdodd Exp $ */ /* @@ -97,15 +97,27 @@ static int hea_pci_probe(device_t); static int hea_pci_attach(device_t); -#define ENI_VENDORID 0x111A -#define ENI_DEVICEID 0x0002 +#define ENI_VENDORID 0x111A +#define ENI_DEVICEID_ENI155PF 0x0000 +#define ENI_DEVICEID_ENI155PA 0x0002 + +#define ADP_VENDORID 0x9004 +#define ADP_DEVICEID_AIC5900 0x5900 +#define ADP_DEVICEID_AIC5905 0x5905 struct hea_pci_type { u_int16_t vid; u_int16_t did; char * name; } hea_pci_devs[] = { - { ENI_VENDORID, ENI_DEVICEID, "Efficent Networks ENI ATM Adapter" }, + { ENI_VENDORID, ENI_DEVICEID_ENI155PF, + "Efficient Networks 155P-MF1 (FPGA) ATM Adapter" }, + { ENI_VENDORID, ENI_DEVICEID_ENI155PA, + "Efficient Networks 155P-MF1 (ASIC) ATM Adapter" }, + { ADP_VENDORID, ADP_DEVICEID_AIC5900, + "ANA-5910/5930/5940 ATM155 & 25 LAN Adapter" }, + { ADP_VENDORID, ADP_DEVICEID_AIC5905, + "ANA-5910A/5930A/5940A ATM Adapter" }, { 0, 0, NULL }, }; @@ -191,6 +203,18 @@ eup->eu_config.ac_bustype = BUS_PCI; eup->eu_config.ac_busslot = (pci_get_bus(dev) << 8)| pci_get_slot(dev); + switch (pci_get_vendor(dev)) { + case ENI_VENDORID: + eup->eu_type = TYPE_ENI; + break; + case ADP_VENDORID: + eup->eu_type = TYPE_ADP; + break; + default: + eup->eu_type = TYPE_UNKNOWN; + break; + } + error = hea_attach(dev); if (error) { device_printf(dev, "hea_attach() failed.\n"); @@ -198,8 +222,8 @@ } return (0); + fail: - hea_detach(dev); return (error); ==== //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/hfa/hfa_freebsd.c,v 1.1 2002/04/17 00:24:48 mdodd Exp $ + * $FreeBSD: src/sys/dev/hfa/hfa_freebsd.c,v 1.2 2002/06/07 01:55:42 mdodd Exp $ */ /* @@ -176,6 +176,7 @@ fup->fu_openvcc = fore_openvcc; fup->fu_closevcc = fore_closevcc; fup->fu_output = fore_output; + callout_handle_init(&fup->fu_thandle); /* ==== //depot/projects/smpng/sys/dev/hfa/hfa_pci.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/hfa/hfa_pci.c,v 1.1 2002/04/17 00:24:48 mdodd Exp $ + * $FreeBSD: src/sys/dev/hfa/hfa_pci.c,v 1.2 2002/06/07 01:55:42 mdodd Exp $ */ /* @@ -128,25 +128,15 @@ fup = &sc->fup; error = 0; - switch (pci_get_device(dev)) { - case FORE_PCA200EPC_ID: - fup->fu_config.ac_device = DEV_FORE_PCA200E; - break; - default: - fup->fu_config.ac_device = DEV_UNKNOWN; - break; - } + pci_enable_busmaster(dev); + pci_enable_io(dev, SYS_RES_MEMORY); - pci_enable_busmaster(dev); command = pci_read_config(dev, PCIR_COMMAND, 2); if ((command & PCIM_CMD_BUSMASTEREN) == 0) { device_printf(dev, "Unable to enable PCI busmastering.\n"); error = ENXIO; goto fail; } - - pci_enable_io(dev, SYS_RES_MEMORY); - command = pci_read_config(dev, PCIR_COMMAND, 2); if ((command & PCIM_CMD_MEMEN) == 0) { device_printf(dev, "Unable to enable PCI memory resources.\n"); error = ENXIO; @@ -192,6 +182,15 @@ fup->fu_config.ac_bustype = BUS_PCI; fup->fu_config.ac_busslot = (pci_get_bus(dev) << 8)| pci_get_slot(dev); + switch (pci_get_device(dev)) { + case FORE_PCA200EPC_ID: + fup->fu_config.ac_device = DEV_FORE_PCA200E; + break; + default: + fup->fu_config.ac_device = DEV_UNKNOWN; + break; + } + error = hfa_attach(dev); if (error) { device_printf(dev, "hfa_attach() failed.\n"); ==== //depot/projects/smpng/sys/i386/i386/trap.c#38 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.223 2002/04/27 17:07:15 alc Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.224 2002/06/07 05:47:34 jhb Exp $ */ /* @@ -912,7 +912,6 @@ struct trapframe frame; { caddr_t params; - int i; struct sysent *callp; struct thread *td = curthread; struct proc *p = td->td_proc; @@ -985,38 +984,32 @@ /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware */ - if (params && (i = narg * sizeof(int)) && - (error = copyin(params, (caddr_t)args, (u_int)i))) { + if (params != NULL && narg != 0) + error = copyin(params, (caddr_t)args, + (u_int)(narg * sizeof(int))); + else + error = 0; + #ifdef KTRACE - if (KTRPOINT(p, KTR_SYSCALL)) - ktrsyscall(p->p_tracep, code, narg, args); + if (KTRPOINT(td, KTR_SYSCALL)) + ktrsyscall(code, narg, args); #endif - goto bad; - } /* * Try to run the syscall without Giant if the syscall * is MP safe. */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) { + if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_lock(&Giant); - } -#ifdef KTRACE - /* - * We have to obtain Giant no matter what if - * we are ktracing - */ - if (KTRPOINT(p, KTR_SYSCALL)) { >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 7 9: 6:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8984237B40D; Fri, 7 Jun 2002 09:06:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 895FC37B409 for ; Fri, 7 Jun 2002 09:06:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g57G6qR35265 for perforce@freebsd.org; Fri, 7 Jun 2002 09:06:52 -0700 (PDT) (envelope-from des@freebsd.org) Date: Fri, 7 Jun 2002 09:06:52 -0700 (PDT) Message-Id: <200206071606.g57G6qR35265@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12504 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12504 Change 12504 by des@des.at.aes.thinksec.com on 2002/06/07 09:06:45 Start a new paragraph after a list. Affected files ... ... //depot/projects/openpam/misc/gendoc.pl#17 edit Differences ... ==== //depot/projects/openpam/misc/gendoc.pl#17 (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#16 $ +# $P4: //depot/projects/openpam/misc/gendoc.pl#17 $ # use strict; @@ -188,7 +188,7 @@ if ($inliteral) { $man .= "\0\n"; } elsif ($inlist) { - $man .= ".El\n"; + $man .= ".El\n.Pp\n"; $inlist = 0; } else { $man .= ".Pp\n"; @@ -214,7 +214,7 @@ $man .= "$_\n"; next; } elsif ($inlist && m/^\S/) { - $man .= ".El\n"; + $man .= ".El\n.Pp\n"; $inlist = 0; } elsif ($inliteral && m/^\S/) { $man .= ".Ed\n"; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 7 9:25:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDB3937B406; Fri, 7 Jun 2002 09:23:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B58EF37B40A for ; Fri, 7 Jun 2002 09:23:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g57GNCX40963 for perforce@freebsd.org; Fri, 7 Jun 2002 09:23:12 -0700 (PDT) (envelope-from des@freebsd.org) Date: Fri, 7 Jun 2002 09:23:12 -0700 (PDT) Message-Id: <200206071623.g57GNCX40963@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12505 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12505 Change 12505 by des@des.at.aes.thinksec.com on 2002/06/07 09:22:57 DBA update and minor whitespace fixes. Affected files ... ... //depot/projects/openpam/CREDITS#2 edit ... //depot/projects/openpam/LICENSE#5 edit ... //depot/projects/openpam/Makefile#7 edit ... //depot/projects/openpam/bin/Makefile#6 edit ... //depot/projects/openpam/bin/su/Makefile#5 edit ... //depot/projects/openpam/bin/su/su.c#8 edit ... //depot/projects/openpam/doc/Makefile#4 edit ... //depot/projects/openpam/doc/man/Makefile#11 edit ... //depot/projects/openpam/doc/man/pam_conv.3#2 edit ... //depot/projects/openpam/include/security/openpam.h#21 edit ... //depot/projects/openpam/include/security/openpam_version.h#5 edit ... //depot/projects/openpam/include/security/pam_appl.h#10 edit ... //depot/projects/openpam/include/security/pam_constants.h#15 edit ... //depot/projects/openpam/include/security/pam_modules.h#8 edit ... //depot/projects/openpam/include/security/pam_types.h#6 edit ... //depot/projects/openpam/lib/Makefile#16 edit ... //depot/projects/openpam/lib/openpam_borrow_cred.c#2 edit ... //depot/projects/openpam/lib/openpam_configure.c#4 edit ... //depot/projects/openpam/lib/openpam_dispatch.c#15 edit ... //depot/projects/openpam/lib/openpam_dynamic.c#6 edit ... //depot/projects/openpam/lib/openpam_findenv.c#8 edit ... //depot/projects/openpam/lib/openpam_free_data.c#2 edit ... //depot/projects/openpam/lib/openpam_get_option.c#4 edit ... //depot/projects/openpam/lib/openpam_impl.h#15 edit ... //depot/projects/openpam/lib/openpam_load.c#14 edit ... //depot/projects/openpam/lib/openpam_log.c#15 edit ... //depot/projects/openpam/lib/openpam_nullconv.c#3 edit ... //depot/projects/openpam/lib/openpam_restore_cred.c#2 edit ... //depot/projects/openpam/lib/openpam_set_option.c#5 edit ... //depot/projects/openpam/lib/openpam_static.c#5 edit ... //depot/projects/openpam/lib/openpam_ttyconv.c#12 edit ... //depot/projects/openpam/lib/pam_acct_mgmt.c#9 edit ... //depot/projects/openpam/lib/pam_authenticate.c#11 edit ... //depot/projects/openpam/lib/pam_authenticate_secondary.c#6 edit ... //depot/projects/openpam/lib/pam_chauthtok.c#12 edit ... //depot/projects/openpam/lib/pam_close_session.c#9 edit ... //depot/projects/openpam/lib/pam_end.c#10 edit ... //depot/projects/openpam/lib/pam_error.c#7 edit ... //depot/projects/openpam/lib/pam_get_authtok.c#19 edit ... //depot/projects/openpam/lib/pam_get_data.c#8 edit ... //depot/projects/openpam/lib/pam_get_item.c#12 edit ... //depot/projects/openpam/lib/pam_get_mapped_authtok.c#6 edit ... //depot/projects/openpam/lib/pam_get_mapped_username.c#6 edit ... //depot/projects/openpam/lib/pam_get_user.c#12 edit ... //depot/projects/openpam/lib/pam_getenv.c#7 edit ... //depot/projects/openpam/lib/pam_getenvlist.c#9 edit ... //depot/projects/openpam/lib/pam_info.c#7 edit ... //depot/projects/openpam/lib/pam_open_session.c#9 edit ... //depot/projects/openpam/lib/pam_prompt.c#7 edit ... //depot/projects/openpam/lib/pam_putenv.c#8 edit ... //depot/projects/openpam/lib/pam_set_data.c#10 edit ... //depot/projects/openpam/lib/pam_set_item.c#14 edit ... //depot/projects/openpam/lib/pam_set_mapped_authtok.c#6 edit ... //depot/projects/openpam/lib/pam_set_mapped_username.c#6 edit ... //depot/projects/openpam/lib/pam_setcred.c#10 edit ... //depot/projects/openpam/lib/pam_setenv.c#7 edit ... //depot/projects/openpam/lib/pam_sm_acct_mgmt.c#4 edit ... //depot/projects/openpam/lib/pam_sm_authenticate.c#4 edit ... //depot/projects/openpam/lib/pam_sm_authenticate_secondary.c#4 edit ... //depot/projects/openpam/lib/pam_sm_chauthtok.c#5 edit ... //depot/projects/openpam/lib/pam_sm_close_session.c#4 edit ... //depot/projects/openpam/lib/pam_sm_get_mapped_authtok.c#4 edit ... //depot/projects/openpam/lib/pam_sm_get_mapped_username.c#4 edit ... //depot/projects/openpam/lib/pam_sm_open_session.c#4 edit ... //depot/projects/openpam/lib/pam_sm_set_mapped_authtok.c#4 edit ... //depot/projects/openpam/lib/pam_sm_set_mapped_username.c#4 edit ... //depot/projects/openpam/lib/pam_sm_setcred.c#4 edit ... //depot/projects/openpam/lib/pam_start.c#16 edit ... //depot/projects/openpam/lib/pam_strerror.c#10 edit ... //depot/projects/openpam/lib/pam_verror.c#6 edit ... //depot/projects/openpam/lib/pam_vinfo.c#6 edit ... //depot/projects/openpam/lib/pam_vprompt.c#7 edit ... //depot/projects/openpam/misc/gendoc.pl#18 edit ... //depot/projects/openpam/modules/Makefile#7 edit ... //depot/projects/openpam/modules/pam_deny/Makefile#5 edit ... //depot/projects/openpam/modules/pam_deny/pam_deny.c#7 edit ... //depot/projects/openpam/modules/pam_dummy/Makefile#4 edit ... //depot/projects/openpam/modules/pam_dummy/pam_dummy.c#5 edit ... //depot/projects/openpam/modules/pam_permit/Makefile#5 edit ... //depot/projects/openpam/modules/pam_permit/pam_permit.c#7 edit ... //depot/projects/openpam/modules/pam_unix/Makefile#2 edit ... //depot/projects/openpam/modules/pam_unix/pam_unix.c#2 edit Differences ... ==== //depot/projects/openpam/CREDITS#2 (text+ko) ==== @@ -1,8 +1,8 @@ -The OpenPAM library was developed for the FreeBSD Project by ThinkSec -AS and NAI Labs, the Security Research Division of Network Associates, -Inc. under DARPA/SPAWAR contract N66001-01-C-8035 (``CBOSS''), as -part of the DARPA CHATS research program. +The OpenPAM library was developed for the FreeBSD Project by ThinkSec AS +and Network Associates Laboratories, the Security Research Division of +Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 +(``CBOSS''), as part of the DARPA CHATS research program. Principal design and development by: @@ -21,4 +21,4 @@ Solar Designer Takanori Saneto -$P4: //depot/projects/openpam/CREDITS#1 $ +$P4: //depot/projects/openpam/CREDITS#2 $ ==== //depot/projects/openpam/LICENSE#5 (text+ko) ==== @@ -3,9 +3,9 @@ All rights reserved. This software was developed for the FreeBSD Project by ThinkSec AS and -NAI Labs, the Security Research Division of Network Associates, Inc. -under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the -DARPA CHATS research program. +Network Associates Laboratories, the Security Research Division of +Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 +("CBOSS"), as part of the DARPA CHATS research program. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -31,4 +31,4 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$P4: //depot/projects/openpam/LICENSE#4 $ +$P4: //depot/projects/openpam/LICENSE#5 $ ==== //depot/projects/openpam/Makefile#7 (text+ko) ==== @@ -2,10 +2,11 @@ # Copyright (c) 2002 Networks Associates Technology, Inc. # All rights reserved. # -# This software was developed for the FreeBSD Project by ThinkSec AS and -# NAI Labs, the Security Research Division of Network Associates, Inc. -# under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the -# DARPA CHATS research program. +# This software was developed for the FreeBSD Project by ThinkSec AS +# and Network Associates Laboratories, the Security Research Division +# of Network Associates, Inc. under DARPA/SPAWAR contract +# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research +# program. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -31,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/Makefile#6 $ +# $P4: //depot/projects/openpam/Makefile#7 $ # SUBDIR = ==== //depot/projects/openpam/bin/Makefile#6 (text+ko) ==== @@ -2,10 +2,11 @@ # Copyright (c) 2002 Networks Associates Technology, Inc. # All rights reserved. # -# This software was developed for the FreeBSD Project by ThinkSec AS and -# NAI Labs, the Security Research Division of Network Associates, Inc. -# under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the -# DARPA CHATS research program. +# This software was developed for the FreeBSD Project by ThinkSec AS +# and Network Associates Laboratories, the Security Research Division +# of Network Associates, Inc. under DARPA/SPAWAR contract +# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research +# program. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -31,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/bin/Makefile#5 $ +# $P4: //depot/projects/openpam/bin/Makefile#6 $ # SUBDIR = ==== //depot/projects/openpam/bin/su/Makefile#5 (text+ko) ==== @@ -2,10 +2,11 @@ # Copyright (c) 2002 Networks Associates Technology, Inc. # All rights reserved. # -# This software was developed for the FreeBSD Project by ThinkSec AS and -# NAI Labs, the Security Research Division of Network Associates, Inc. -# under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the -# DARPA CHATS research program. +# This software was developed for the FreeBSD Project by ThinkSec AS +# and Network Associates Laboratories, the Security Research Division +# of Network Associates, Inc. under DARPA/SPAWAR contract +# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research +# program. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -31,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/bin/su/Makefile#4 $ +# $P4: //depot/projects/openpam/bin/su/Makefile#5 $ # PROG = su ==== //depot/projects/openpam/bin/su/su.c#8 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/bin/su/su.c#7 $ + * $P4: //depot/projects/openpam/bin/su/su.c#8 $ */ #include ==== //depot/projects/openpam/doc/Makefile#4 (text+ko) ==== @@ -2,10 +2,11 @@ # Copyright (c) 2002 Networks Associates Technology, Inc. # All rights reserved. # -# This software was developed for the FreeBSD Project by ThinkSec AS and -# NAI Labs, the Security Research Division of Network Associates, Inc. -# under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the -# DARPA CHATS research program. +# This software was developed for the FreeBSD Project by ThinkSec AS +# and Network Associates Laboratories, the Security Research Division +# of Network Associates, Inc. under DARPA/SPAWAR contract +# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research +# program. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -31,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/doc/Makefile#3 $ +# $P4: //depot/projects/openpam/doc/Makefile#4 $ # SUBDIR = ==== //depot/projects/openpam/doc/man/Makefile#11 (text+ko) ==== @@ -2,10 +2,11 @@ # Copyright (c) 2002 Networks Associates Technology, Inc. # All rights reserved. # -# This software was developed for the FreeBSD Project by ThinkSec AS and -# NAI Labs, the Security Research Division of Network Associates, Inc. -# under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the -# DARPA CHATS research program. +# This software was developed for the FreeBSD Project by ThinkSec AS +# and Network Associates Laboratories, the Security Research Division +# of Network Associates, Inc. under DARPA/SPAWAR contract +# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research +# program. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -31,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/openpam/doc/man/Makefile#10 $ +# $P4: //depot/projects/openpam/doc/man/Makefile#11 $ # GENDOC = ${.CURDIR}/../../misc/gendoc.pl ==== //depot/projects/openpam/doc/man/pam_conv.3#2 (text+ko) ==== @@ -3,9 +3,9 @@ .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by ThinkSec AS and -.\" NAI Labs, the Security Research Division of Network Associates, Inc. -.\" under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the -.\" DARPA CHATS research program. +.\" Network Associates Laboratories, the Security Research Division of +.\" Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 +.\" ("CBOSS"), as part of the DARPA CHATS research program. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#1 $ +.\" $P4: //depot/projects/openpam/doc/man/pam_conv.3#2 $ .\" .Dd May 27, 2002 .Dt PAM_CONV 3 @@ -45,25 +45,25 @@ .In security/pam_appl.h .Bd -literal struct pam_message { - int msg_style; - char *msg; + int msg_style; + char *msg; }; struct pam_response { - char *resp; - int resp_retcode; + char *resp; + int resp_retcode; }; struct pam_conv { - int (*conv)(int, const struct pam_message **, - struct pam_response **, void *); - void *appdata_ptr; + int (*conv)(int, const struct pam_message **, + struct pam_response **, void *); + void *appdata_ptr; }; .Ed .Sh DESCRIPTION The PAM library uses an application-defined callback to communicate -with the user. -This callback is specified by the +with the user. +This callback is specified by the .Vt struct pam_conv passed to .Fn pam_start @@ -76,7 +76,7 @@ The conversation function's first argument specifies the number of messages (up to .Dv PAM_NUM_MSG ) -to process. +to process. The second argument is a pointer to a contiguous array of .Vt struct pam_message containing the actual messages. @@ -111,7 +111,7 @@ On success, the conversation function should allocate and fill a contiguous array of .Vt struct pam_response , -one for each message that was passed in. +one for each message that was passed in. A pointer to the user's response to each message (or .Dv NULL in the case of informational or error messages) should be stored in @@ -125,7 +125,7 @@ .Pp The .Va resp_retcode -member of +member of .Vt struct pam_response is unused and should be set to zero. .Pp @@ -137,7 +137,7 @@ It is the conversation function's responsibility to ensure that it is legal to do so. .Pp -The +The .Va appdata_ptr member of .Vt struct pam_conv @@ -175,8 +175,8 @@ .Re .Sh AUTHORS The OpenPAM library and this manual page were developed for the -FreeBSD Project by ThinkSec AS and NAI Labs, the Security Research -Division of Network Associates, Inc. under DARPA/SPAWAR contract -N66001-01-C-8035 +FreeBSD Project by ThinkSec AS and Network Associates Laboratories, +the 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. ==== //depot/projects/openpam/include/security/openpam.h#21 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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#20 $ + * $P4: //depot/projects/openpam/include/security/openpam.h#21 $ */ #ifndef _SECURITY_OPENPAM_H_INCLUDED ==== //depot/projects/openpam/include/security/openpam_version.h#5 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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_version.h#4 $ + * $P4: //depot/projects/openpam/include/security/openpam_version.h#5 $ */ #ifndef _OPENPAM_VERSION_H_INCLUDED ==== //depot/projects/openpam/include/security/pam_appl.h#10 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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/pam_appl.h#9 $ + * $P4: //depot/projects/openpam/include/security/pam_appl.h#10 $ */ #ifndef _PAM_APPL_H_INCLUDED ==== //depot/projects/openpam/include/security/pam_constants.h#15 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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/pam_constants.h#14 $ + * $P4: //depot/projects/openpam/include/security/pam_constants.h#15 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED ==== //depot/projects/openpam/include/security/pam_modules.h#8 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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/pam_modules.h#7 $ + * $P4: //depot/projects/openpam/include/security/pam_modules.h#8 $ */ #ifndef _PAM_MODULES_H_INCLUDED ==== //depot/projects/openpam/include/security/pam_types.h#6 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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/pam_types.h#5 $ + * $P4: //depot/projects/openpam/include/security/pam_types.h#6 $ */ #ifndef _PAM_TYPES_H_INCLUDED ==== //depot/projects/openpam/lib/Makefile#16 (text+ko) ==== @@ -3,9 +3,9 @@ # All rights reserved. # # This software was developed for the FreeBSD Project by ThinkSec AS and -# NAI Labs, the Security Research Division of Network Associates, Inc. -# under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the -# DARPA CHATS research program. +# Network Associates Laboratories, the Security Research Division of +# Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 +# ("CBOSS"), as part of the DARPA CHATS research program. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -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/Makefile#15 $ +# $P4: //depot/projects/openpam/lib/Makefile#16 $ # LIB = pam ==== //depot/projects/openpam/lib/openpam_borrow_cred.c#2 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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#1 $ + * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#2 $ */ #include ==== //depot/projects/openpam/lib/openpam_configure.c#4 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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_configure.c#3 $ + * $P4: //depot/projects/openpam/lib/openpam_configure.c#4 $ */ #include ==== //depot/projects/openpam/lib/openpam_dispatch.c#15 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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_dispatch.c#14 $ + * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#15 $ */ #include ==== //depot/projects/openpam/lib/openpam_dynamic.c#6 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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_dynamic.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#6 $ */ #include ==== //depot/projects/openpam/lib/openpam_findenv.c#8 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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_findenv.c#7 $ + * $P4: //depot/projects/openpam/lib/openpam_findenv.c#8 $ */ #include ==== //depot/projects/openpam/lib/openpam_free_data.c#2 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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#1 $ + * $P4: //depot/projects/openpam/lib/openpam_free_data.c#2 $ */ #include ==== //depot/projects/openpam/lib/openpam_get_option.c#4 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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_get_option.c#3 $ + * $P4: //depot/projects/openpam/lib/openpam_get_option.c#4 $ */ #include ==== //depot/projects/openpam/lib/openpam_impl.h#15 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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_impl.h#14 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#15 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED ==== //depot/projects/openpam/lib/openpam_load.c#14 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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_load.c#13 $ + * $P4: //depot/projects/openpam/lib/openpam_load.c#14 $ */ #include ==== //depot/projects/openpam/lib/openpam_log.c#15 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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#14 $ + * $P4: //depot/projects/openpam/lib/openpam_log.c#15 $ */ #include ==== //depot/projects/openpam/lib/openpam_nullconv.c#3 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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#2 $ + * $P4: //depot/projects/openpam/lib/openpam_nullconv.c#3 $ */ #include ==== //depot/projects/openpam/lib/openpam_restore_cred.c#2 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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#1 $ + * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#2 $ */ #include ==== //depot/projects/openpam/lib/openpam_set_option.c#5 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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_set_option.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_set_option.c#5 $ */ #include ==== //depot/projects/openpam/lib/openpam_static.c#5 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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_static.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_static.c#5 $ */ #include ==== //depot/projects/openpam/lib/openpam_ttyconv.c#12 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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#11 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#12 $ */ #include ==== //depot/projects/openpam/lib/pam_acct_mgmt.c#9 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -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_acct_mgmt.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#9 $ */ #include ==== //depot/projects/openpam/lib/pam_authenticate.c#11 (text+ko) ==== @@ -3,9 +3,9 @@ * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and - * NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. + * Network Associates Laboratories, the Security Research Division of + * Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 + * ("CBOSS"), as part of the DARPA CHATS research program. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 7 22:48:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB08037B403; Fri, 7 Jun 2002 22:48:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2AD0137B400 for ; Fri, 7 Jun 2002 22:48:04 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g585m4H81929 for perforce@freebsd.org; Fri, 7 Jun 2002 22:48:04 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Fri, 7 Jun 2002 22:48:04 -0700 (PDT) Message-Id: <200206080548.g585m4H81929@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12537 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12537 Change 12537 by jhb@jhb_laptop on 2002/06/07 22:47:07 Bah, I can't stick a witness on the free list unless I remove it from the all list and the type list. Unfortunately, these removals are O(n), so I might should just go ahead and make these lists TAILQ's. Affected files ... ... //depot/projects/smpng/sys/kern/subr_witness.c#56 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#56 (text+ko) ==== @@ -391,9 +391,16 @@ * If no locks for this witness were ever acquired, * then return the witness to the free list. */ - if (w->w_file == NULL) + if (w->w_file == NULL) { + if (w->w_class->lc_flags & LC_SLEEPLOCK) + STAILQ_REMOVE(&w_sleep, w, witness, + w_typelist); + else + STAILQ_REMOVE(&w_spin, w, witness, + w_typelist); + STAILQ_REMOVE(&w_all, w, witness, w_list); witness_free(w); - else if (w->w_dead_squawked == 0) { + } else if (w->w_dead_squawked == 0) { w->w_dead_squawked = 1; print = 1; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 8 14: 0:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D18737B401; Sat, 8 Jun 2002 14:00:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CB3FC37B404 for ; Sat, 8 Jun 2002 14:00:06 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g58L06c55531 for perforce@freebsd.org; Sat, 8 Jun 2002 14:00:06 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Date: Sat, 8 Jun 2002 14:00:06 -0700 (PDT) Message-Id: <200206082100.g58L06c55531@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 12573 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12573 Change 12573 by amigus@amigus_vmganyopa on 2002/06/08 13:59:18 I think these were backwards. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#47 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#34 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#47 (text+ko) ==== @@ -160,10 +160,10 @@ mac_biba_range_in_range(struct mac_biba *rangea, struct mac_biba *rangeb) { - return (mac_biba_dominate_element(&rangea->mb_rangehigh, - &rangeb->mb_rangehigh) && - mac_biba_dominate_element(&rangeb->mb_rangelow, - &rangea->mb_rangelow)); + return (mac_biba_dominate_element(&rangeb->mb_rangehigh, + &rangea->mb_rangehigh) && + mac_biba_dominate_element(&rangea->mb_rangelow, + &rangeb->mb_rangelow)); } static int ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#34 (text+ko) ==== @@ -160,10 +160,10 @@ mac_mls_range_in_range(struct mac_mls *rangea, struct mac_mls *rangeb) { - return (mac_mls_dominate_element(&rangea->mm_rangehigh, - &rangeb->mm_rangehigh) && - mac_mls_dominate_element(&rangeb->mm_rangelow, - &rangea->mm_rangelow)); + return (mac_mls_dominate_element(&rangeb->mm_rangehigh, + &rangea->mm_rangehigh) && + mac_mls_dominate_element(&rangea->mm_rangelow, + &rangeb->mm_rangelow)); } static int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 8 15:12:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 569B237B423; Sat, 8 Jun 2002 15:11:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 02D6D37B412 for ; Sat, 8 Jun 2002 15:11:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g58MBYd70857 for perforce@freebsd.org; Sat, 8 Jun 2002 15:11:34 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Date: Sat, 8 Jun 2002 15:11:34 -0700 (PDT) Message-Id: <200206082211.g58MBYd70857@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 12579 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12579 Change 12579 by amigus@amigus_vmganyopa on 2002/06/08 15:11:31 Temporary fix to allow suid programs to work. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#48 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#35 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#48 (text+ko) ==== @@ -1158,6 +1158,14 @@ return (EINVAL); /* + * XXX: Allow processes with root privilege to set labels outside + * their range, so suid things like "su" work. This WILL go away + * when we figure out the 'correct' solution... + */ + if (!suser_cred(cred, 0)) + return (0); + + /* * The new single must be in the old range. */ if (!mac_biba_single_in_range(new, subj)) ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#35 (text+ko) ==== @@ -1151,6 +1151,14 @@ return (EINVAL); /* + * XXX: Allow processes with root privilege to set labels outside + * their range, so suid things like "su" work. This WILL go away + * when we figure out the 'correct' solution... + */ + if (!suser_cred(cred, 0)) + return (0); + + /* * The new single must be in the old range. */ if (!mac_mls_single_in_range(new, subj)) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 8 17:19:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0545837B405; Sat, 8 Jun 2002 17:19:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3AAA537B400 for ; Sat, 8 Jun 2002 17:19:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g590JAK92614 for perforce@freebsd.org; Sat, 8 Jun 2002 17:19:10 -0700 (PDT) (envelope-from jhb@freebsd.org) Date: Sat, 8 Jun 2002 17:19:10 -0700 (PDT) Message-Id: <200206090019.g590JAK92614@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 12583 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12583 Change 12583 by jhb@jhb_laptop on 2002/06/08 17:18:47 Let witness complain about unlocking an unowned mutex before mtx_assert() since witness gives more informative information. Affected files ... ... //depot/projects/smpng/sys/kern/kern_mutex.c#39 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#39 (text+ko) ==== @@ -333,7 +333,6 @@ { MPASS(curthread != NULL); - mtx_assert(m, MA_OWNED); #ifdef MUTEX_PROFILING if (m->acqtime != 0) { static const char *unknown = "(unknown)"; @@ -391,6 +390,7 @@ WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); + mtx_assert(m, MA_OWNED); _rel_sleep_lock(m, curthread, opts, file, line); } @@ -414,10 +414,10 @@ { MPASS(curthread != NULL); - mtx_assert(m, MA_OWNED); WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); + mtx_assert(m, MA_OWNED); #if defined(SMP) || LOCK_DEBUG > 0 _rel_spin_lock(m); #else To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 9 17:51:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE6F837B408; Sun, 9 Jun 2002 17:51:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D7B9137B406 for ; Sun, 9 Jun 2002 17:51:28 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5A0pSr58651 for perforce@freebsd.org; Sun, 9 Jun 2002 17:51:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 9 Jun 2002 17:51:28 -0700 (PDT) Message-Id: <200206100051.g5A0pSr58651@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12625 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12625 Change 12625 by rwatson@rwatson_curry on 2002/06/09 17:50:50 More into the mix: enable UFS_ACL by default in the MAC kernel. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#31 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#31 (text+ko) ==== @@ -30,6 +30,7 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options MAC +options UFS_ACL options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 9 23:49:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7780537B400; Sun, 9 Jun 2002 23:49:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 439A637B404 for ; Sun, 9 Jun 2002 23:49:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5A6niM20387 for perforce@freebsd.org; Sun, 9 Jun 2002 23:49:44 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sun, 9 Jun 2002 23:49:44 -0700 (PDT) Message-Id: <200206100649.g5A6niM20387@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12640 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12640 Change 12640 by julian@julian_jules1 on 2002/06/09 23:48:50 slight cleanup of KSE singlethreading. Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#57 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#57 (text+ko) ==== @@ -446,7 +446,9 @@ * Wake us up when everyone else has suspended. * (or died) */ + TAILQ_INSERT_TAIL(&p->p_suspended, td, td_runq); td->td_state = TDS_SUSPENDED; + p->p_suspcount++; mtx_lock_spin(&sched_lock); mtx_unlock(&Giant); PROC_UNLOCK(p); @@ -517,8 +519,13 @@ mtx_unlock(&Giant); thread_exit(); } - /* One for us and one for the single waiter. */ - if (p->p_numthreads == (p->p_suspcount + 2)) { + /* + * Just an optimised version of thread_unsuspend(). + */ + if (p->p_numthreads == (p->p_suspcount + 1)) { + TAILQ_REMOVE(&p->p_suspended, + p->p_singlethread, td_runq); + p->p_suspcount--; setrunqueue(p->p_singlethread); p->p_singlethread = NULL; } @@ -563,7 +570,9 @@ setrunqueue(td); } } else if ((P_SHOULDSTOP(p) == P_STOPPED_SNGL) && - (p->p_numthreads == (p->p_suspcount + 1))) { + (p->p_numthreads == p->p_suspcount)) { + TAILQ_REMOVE(&p->p_suspended, p->p_singlethread, td_runq); + p->p_suspcount--; /* * Stopping everything also did the job for the single * threading request. Now we've downgraded to single-threaded, @@ -583,7 +592,7 @@ td = curthread; p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); - p->p_flag &= P_STOPPED_SNGL; + p->p_flag &= ~P_STOPPED_SNGL; thread_unsuspend(p); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 10 0:12:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BB4537B40A; Mon, 10 Jun 2002 00:12:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8C8DE37B407 for ; Mon, 10 Jun 2002 00:12:11 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5A7CBr27283 for perforce@freebsd.org; Mon, 10 Jun 2002 00:12:11 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 10 Jun 2002 00:12:11 -0700 (PDT) Message-Id: <200206100712.g5A7CBr27283@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12642 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12642 Change 12642 by julian@julian_jules1 on 2002/06/10 00:11:18 slight tidying Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#58 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#58 (text+ko) ==== @@ -571,13 +571,13 @@ } } else if ((P_SHOULDSTOP(p) == P_STOPPED_SNGL) && (p->p_numthreads == p->p_suspcount)) { - TAILQ_REMOVE(&p->p_suspended, p->p_singlethread, td_runq); - p->p_suspcount--; /* * Stopping everything also did the job for the single * threading request. Now we've downgraded to single-threaded, * let it continue. */ + TAILQ_REMOVE(&p->p_suspended, p->p_singlethread, td_runq); + p->p_suspcount--; setrunqueue(p->p_singlethread); p->p_singlethread = NULL; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 10 0:19:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC9A737B413; Mon, 10 Jun 2002 00:19:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8859137B410 for ; Mon, 10 Jun 2002 00:19:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5A7JKS27862 for perforce@freebsd.org; Mon, 10 Jun 2002 00:19:20 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 10 Jun 2002 00:19:20 -0700 (PDT) Message-Id: <200206100719.g5A7JKS27862@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12643 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12643 Change 12643 by julian@julian_jules1 on 2002/06/10 00:18:57 Duh.. don't clear the single-threading pointer until we finish single-threading. Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#59 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#59 (text+ko) ==== @@ -527,7 +527,6 @@ p->p_singlethread, td_runq); p->p_suspcount--; setrunqueue(p->p_singlethread); - p->p_singlethread = NULL; } } /* @@ -579,7 +578,6 @@ TAILQ_REMOVE(&p->p_suspended, p->p_singlethread, td_runq); p->p_suspcount--; setrunqueue(p->p_singlethread); - p->p_singlethread = NULL; } } @@ -593,6 +591,7 @@ p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); p->p_flag &= ~P_STOPPED_SNGL; + p->p_singlethread = NULL; thread_unsuspend(p); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 10 8:20:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 799CC37B406; Mon, 10 Jun 2002 08:20:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 96CA837B40C for ; Mon, 10 Jun 2002 08:20:09 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5AFK9G59867 for perforce@freebsd.org; Mon, 10 Jun 2002 08:20:09 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 10 Jun 2002 08:20:09 -0700 (PDT) Message-Id: <200206101520.g5AFK9G59867@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12655 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12655 Change 12655 by julian@julian_jules1 on 2002/06/10 08:19:58 more fixes to suspension Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#60 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#60 (text+ko) ==== @@ -196,14 +196,19 @@ if (kg != NULL) TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); p->p_numthreads--; +#if 0 if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { - if (p->p_numthreads == - ((p->p_flag & P_SINGLE_EXIT) ? 1 : - (p->p_suspcount + 1))) { + if (p->p_numthreads == ((p->p_flag & P_SINGLE_EXIT) ? + 1 : p->p_suspcount)) { + TAILQ_REMOVE(&p->p_suspended, + p->p_singlethread, td_runq); setrunqueue(p->p_singlethread); - p->p_singlethread = NULL; + p->suspcount--; } } +#else + thread_unsuspend(p); /* see if it is there yet */ +#endif } if (kg != NULL) kg->kg_numthreads--; @@ -434,6 +439,7 @@ break; /* etc. XXXKSE */ default: + ; } } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 10 18:14:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2FF537B409; Mon, 10 Jun 2002 18:14:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C634037B40A for ; Mon, 10 Jun 2002 18:14:21 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5B1ELB77145 for perforce@freebsd.org; Mon, 10 Jun 2002 18:14:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 10 Jun 2002 18:14:21 -0700 (PDT) Message-Id: <200206110114.g5B1ELB77145@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12677 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12677 Change 12677 by rwatson@rwatson_paprika on 2002/06/10 18:14:21 When VAPPEND was introduced, the ACL evaluation code wasn't updated to map ACL_WRITE into VAPPEND rights. Fix that. Submitted in large part by: ilmar Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#7 (text+ko) ==== @@ -90,7 +90,7 @@ */ #ifndef CAPABILITIES if (suser_cred(cred, PRISON_ROOT) == 0) - cap_granted = (VEXEC | VREAD | VWRITE | VADMIN); + cap_granted = (VEXEC | VREAD | VWRITE | VADMIN | VAPPEND); else cap_granted = 0; #else @@ -110,9 +110,9 @@ PRISON_ROOT)) cap_granted |= VREAD; - if ((acc_mode & VWRITE) && !cap_check(cred, NULL, CAP_DAC_WRITE, - PRISON_ROOT)) - cap_granted |= VWRITE; + if (((acc_mode & VWRITE) || (acc_mode & VAPPEND)) && + !cap_check(cred, NULL, CAP_DAC_WRITE, PRISON_ROOT)) + cap_granted |= (VWRITE | VAPPEND); if ((acc_mode & VADMIN) && !cap_check(cred, NULL, CAP_FOWNER, PRISON_ROOT)) @@ -138,7 +138,7 @@ if (acl->acl_entry[i].ae_perm & ACL_READ) dac_granted |= VREAD; if (acl->acl_entry[i].ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); if ((acc_mode & dac_granted) == acc_mode) return (0); if ((acc_mode & (dac_granted | cap_granted)) == @@ -190,9 +190,9 @@ if (acl_mask->ae_perm & ACL_READ) acl_mask_granted |= VREAD; if (acl_mask->ae_perm & ACL_WRITE) - acl_mask_granted |= VWRITE; + acl_mask_granted |= (VWRITE | VAPPEND); } else - acl_mask_granted = VEXEC | VREAD | VWRITE; + acl_mask_granted = VEXEC | VREAD | VWRITE | VAPPEND; /* * Iterate through user ACL entries. Do checks twice, first @@ -214,7 +214,7 @@ if (acl->acl_entry[i].ae_perm & ACL_READ) dac_granted |= VREAD; if (acl->acl_entry[i].ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); dac_granted &= acl_mask_granted; if ((acc_mode & dac_granted) == acc_mode) return (0); @@ -247,7 +247,7 @@ if (acl->acl_entry[i].ae_perm & ACL_READ) dac_granted |= VREAD; if (acl->acl_entry[i].ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); dac_granted &= acl_mask_granted; if ((acc_mode & dac_granted) == acc_mode) @@ -265,7 +265,7 @@ if (acl->acl_entry[i].ae_perm & ACL_READ) dac_granted |= VREAD; if (acl->acl_entry[i].ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); dac_granted &= acl_mask_granted; if ((acc_mode & dac_granted) == acc_mode) @@ -295,7 +295,7 @@ if (acl->acl_entry[i].ae_perm & ACL_READ) dac_granted |= VREAD; if (acl->acl_entry[i].ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); dac_granted &= acl_mask_granted; if ((acc_mode & (dac_granted | cap_granted)) != @@ -316,7 +316,7 @@ if (acl->acl_entry[i].ae_perm & ACL_READ) dac_granted |= VREAD; if (acl->acl_entry[i].ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); dac_granted &= acl_mask_granted; if ((acc_mode & (dac_granted | cap_granted)) != @@ -347,7 +347,7 @@ if (acl_other->ae_perm & ACL_READ) dac_granted |= VREAD; if (acl_other->ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); if ((acc_mode & dac_granted) == acc_mode) return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 10 18:15:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A836F37B40F; Mon, 10 Jun 2002 18:15:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7F3C837B404 for ; Mon, 10 Jun 2002 18:15:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5B1FNZ77304 for perforce@freebsd.org; Mon, 10 Jun 2002 18:15:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 10 Jun 2002 18:15:23 -0700 (PDT) Message-Id: <200206110115.g5B1FNZ77304@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12678 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12678 Change 12678 by rwatson@rwatson_paprika on 2002/06/10 18:14:48 Add some comments in places we'll need checks in the future. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#44 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#44 (text+ko) ==== @@ -1655,6 +1655,9 @@ return (error); NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, SCARG(uap, path), td); +#ifdef MAC + /* XXXMAC: MAC check for chroot here. */ +#endif if ((error = change_dir(&nd, td)) != 0) return (error); NDFREE(&nd, NDF_ONLY_PNBUF); @@ -2232,6 +2235,11 @@ return (error); goto restart; } +#ifdef MAC + /* + * XXXMAC: Need some or another MAC check here. + */ +#endif VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); error = VOP_WHITEOUT(nd.ni_dvp, &nd.ni_cnd, DELETE); NDFREE(&nd, NDF_ONLY_PNBUF); @@ -2873,6 +2881,11 @@ return (error); NDFREE(&nd, NDF_ONLY_PNBUF); vp = nd.ni_vp; +#ifdef MAC + /* + * XXXMAC: need some or another MAC check here. + */ +#endif if (vp->v_type != VLNK) error = EINVAL; else { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 10 18:16: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99FA137B411; Mon, 10 Jun 2002 18:15:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CE19537B407 for ; Mon, 10 Jun 2002 18:15:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5B1FNl77309 for perforce@freebsd.org; Mon, 10 Jun 2002 18:15:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 10 Jun 2002 18:15:23 -0700 (PDT) Message-Id: <200206110115.g5B1FNl77309@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12679 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12679 Change 12679 by rwatson@rwatson_paprika on 2002/06/10 18:15:13 Add mac check entry points for bind, connect, and listen. Fix mac_enable_fs checking for many vnode operations. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#150 edit ... //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#10 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#104 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#64 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#150 (text+ko) ==== @@ -448,6 +448,14 @@ mpc->mpc_ops.mpo_bpfdesc_check_receive_from_ifnet = mpe->mpe_function; break; + case MAC_CRED_CHECK_BIND_SOCKET: + mpc->mpc_ops.mpo_cred_check_bind_socket = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_CONNECT_SOCKET: + mpc->mpc_ops.mpo_cred_check_connect_socket = + mpe->mpe_function; + break; case MAC_CRED_CHECK_SEE_CRED: mpc->mpc_ops.mpo_cred_check_see_cred = mpe->mpe_function; @@ -499,6 +507,10 @@ mpc->mpc_ops.mpo_cred_check_getextattr_vnode = mpe->mpe_function; break; + case MAC_CRED_CHECK_LISTEN_SOCKET: + mpc->mpc_ops.mpo_cred_check_listen_socket = + mpe->mpe_function; + break; case MAC_CRED_CHECK_OPEN_VNODE: mpc->mpc_ops.mpo_cred_check_open_vnode = mpe->mpe_function; @@ -996,7 +1008,7 @@ { int error; - if (!mac_enforce_process) + if (!mac_enforce_process && !mac_enforce_fs) return (0); error = vn_refreshlabel(vp, cred); @@ -1402,6 +1414,9 @@ ASSERT_VOP_LOCKED(dvp, "mac_cred_check_chdir_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(dvp, cred); if (error) return (error); @@ -1418,6 +1433,9 @@ ASSERT_VOP_LOCKED(dvp, "mac_cred_check_create_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(dvp, cred); if (error) return (error); @@ -1434,6 +1452,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_getextattr_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1444,17 +1465,34 @@ } int +mac_cred_check_listen_socket(struct ucred *cred, struct socket *socket) +{ + int error; + + if (!mac_enforce_socket) + return (0); + + MAC_CHECK(cred_check_listen_socket, cred, socket, &socket->so_label); + return (error); +} + +int mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode) { int error; ASSERT_VOP_LOCKED(vp, "mac_cred_check_open_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); MAC_CHECK(cred_check_open_vnode, cred, vp, &vp->v_label, acc_mode); + if (error) + printf("mac_cred_check_open_vnode returns %d\n", error); return (error); } @@ -1465,6 +1503,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_revoke_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1480,6 +1521,9 @@ ASSERT_VOP_LOCKED(dvp, "mac_cred_check_search_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(dvp, cred); if (error) return (error); @@ -1496,6 +1540,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_setextattr_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1512,6 +1559,10 @@ int error; ASSERT_VOP_LOCKED(vp, "mac_cred_check_setflags_vnode"); + + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1528,6 +1579,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_setmode_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1544,6 +1598,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_setowner_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1560,6 +1617,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_setutimes_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1578,6 +1638,9 @@ ASSERT_VOP_LOCKED(dvp, "mac_cred_check_delete_vnode"); ASSERT_VOP_LOCKED(vp, "mac_cred_check_delete_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(dvp, cred); if (error) return (error); @@ -1599,6 +1662,9 @@ ASSERT_VOP_LOCKED(dvp, "mac_cred_check_rename_from_vnode"); ASSERT_VOP_LOCKED(vp, "mac_cred_check_rename_from_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(dvp, cred); if (error) return (error); @@ -1620,6 +1686,9 @@ ASSERT_VOP_LOCKED(dvp, "mac_cred_check_rename_to_vnode"); ASSERT_VOP_LOCKED(vp, "mac_cred_check_rename_to_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(dvp, cred); if (error) return (error); @@ -1640,6 +1709,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_stat_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1881,6 +1953,36 @@ } int +mac_cred_check_bind_socket(struct ucred *ucred, struct socket *socket, + struct sockaddr *sockaddr) +{ + int error; + + if (!mac_enforce_socket) + return (0); + + MAC_CHECK(cred_check_bind_socket, ucred, socket, &socket->so_label, + sockaddr); + + return (error); +} + +int +mac_cred_check_connect_socket(struct ucred *cred, struct socket *socket, + struct sockaddr *sockaddr) +{ + int error; + + if (!mac_enforce_socket) + return (0); + + MAC_CHECK(cred_check_connect_socket, cred, socket, &socket->so_label, + sockaddr); + + return (error); +} + +int mac_socket_can_receive(struct socket *socket, struct mbuf *mbuf) { int error; ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#10 (text+ko) ==== @@ -39,6 +39,7 @@ #include "opt_compat.h" #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -178,6 +179,13 @@ goto done2; if ((error = getsockaddr(&sa, uap->name, uap->namelen)) != 0) goto done1; +#ifdef MAC + error = mac_cred_check_bind_socket(td->td_ucred, so, sa); + if (error) { + FREE(sa, M_SONAME); + goto done1; + } +#endif error = sobind(so, sa, td); FREE(sa, M_SONAME); done1: @@ -204,7 +212,15 @@ mtx_lock(&Giant); if ((error = fgetsock(td, uap->s, &so, NULL)) == 0) { +#ifdef MAC + error = mac_cred_check_listen_socket(td->td_ucred, so); + if (error) + goto done; +#endif error = solisten(so, uap->backlog, td); +#ifdef MAC +done: +#endif fputsock(so); } mtx_unlock(&Giant); @@ -439,6 +455,11 @@ error = getsockaddr(&sa, uap->name, uap->namelen); if (error) goto done1; +#ifdef MAC + error = mac_cred_check_connect_socket(td->td_ucred, so, sa); + if (error) + goto bad; +#endif error = soconnect(so, sa, td); if (error) goto bad; ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#104 (text+ko) ==== @@ -218,6 +218,7 @@ struct mbuf; struct mount; struct proc; +struct sockaddr; struct socket; struct timespec; struct ucred; @@ -255,11 +256,17 @@ /* Authorizational event hooks. */ int mac_bpfdesc_check_receive_from_ifnet(struct bpf_d *bpf_d, struct ifnet *ifnet); +int mac_cred_check_bind_socket(struct ucred *cred, struct socket *so, + struct sockaddr *sa); int mac_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp); +int mac_cred_check_connect_socket(struct ucred *cred, struct socket *so, + struct sockaddr *sa); int mac_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct vattr *vap); int mac_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio); +int mac_cred_check_listen_socket(struct ucred *cred, + struct socket *socket); int mac_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp); int mac_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#64 (text+ko) ==== @@ -222,6 +222,12 @@ int (*mpo_bpfdesc_check_receive_from_ifnet)(struct bpf_d *bpf_d, struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel); + int (*mpo_cred_check_bind_socket)(struct ucred *cred, + struct socket *socket, struct label *socketlabel, + struct sockaddr *sockaddr); + int (*mpo_cred_check_connect_socket)(struct ucred *cred, + struct socket *socket, struct label *socketlabel, + struct sockaddr *sockaddr); int (*mpo_cred_check_see_cred)(struct ucred *u1, struct ucred *u2); int (*mpo_cred_check_see_socket)(struct ucred *cred, struct socket *socket, struct label *socketlabel); @@ -253,6 +259,8 @@ int (*mpo_cred_check_getextattr_vnode)(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio); + int (*mpo_cred_check_listen_socket)(struct ucred *cred, + struct socket *socket, struct label *socketlabel); int (*mpo_cred_check_open_vnode)(struct ucred *cred, struct vnode *vp, struct label *label, mode_t acc_mode); @@ -360,6 +368,7 @@ MAC_CREATE_PROC1, MAC_RELABEL_SUBJECT, MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, + MAC_CRED_CHECK_BIND_SOCKET, MAC_CRED_CHECK_SEE_CRED, MAC_CRED_CHECK_SEE_SOCKET, MAC_CRED_CHECK_RELABEL_IFNET, @@ -369,10 +378,12 @@ MAC_CRED_CHECK_STATFS, MAC_CRED_CHECK_DEBUG_PROC, MAC_CRED_CHECK_CHDIR_VNODE, + MAC_CRED_CHECK_CONNECT_SOCKET, MAC_CRED_CHECK_CREATE_VNODE, MAC_CRED_CHECK_DELETE_VNODE, MAC_CRED_CHECK_EXEC_VNODE, MAC_CRED_CHECK_GETEXTATTR_VNODE, + MAC_CRED_CHECK_LISTEN_SOCKET, MAC_CRED_CHECK_OPEN_VNODE, MAC_CRED_CHECK_RENAME_FROM_VNODE, MAC_CRED_CHECK_RENAME_TO_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 10 20:39:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1553B37B40B; Mon, 10 Jun 2002 20:37:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B731137B407 for ; Mon, 10 Jun 2002 20:37:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5B3bFg00575 for perforce@freebsd.org; Mon, 10 Jun 2002 20:37:15 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 10 Jun 2002 20:37:15 -0700 (PDT) Message-Id: <200206110337.g5B3bFg00575@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12682 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12682 Change 12682 by julian@julian_jules1 on 2002/06/10 20:36:40 MFC: The automatic part is done. not to make it compile/run. Affected files ... ... //depot/projects/kse/bin/ps/Makefile#5 integrate ... //depot/projects/kse/bin/ps/extern.h#6 integrate ... //depot/projects/kse/bin/ps/fmt.c#6 integrate ... //depot/projects/kse/bin/ps/keyword.c#7 integrate ... //depot/projects/kse/bin/ps/nlist.c#3 integrate ... //depot/projects/kse/bin/ps/print.c#11 integrate ... //depot/projects/kse/bin/ps/ps.1#9 integrate ... //depot/projects/kse/bin/ps/ps.c#9 integrate ... //depot/projects/kse/sys/alpha/alpha/trap.c#24 integrate ... //depot/projects/kse/sys/boot/ofw/libofw/ofw_net.c#5 integrate ... //depot/projects/kse/sys/boot/powerpc/loader/Makefile#5 integrate ... //depot/projects/kse/sys/cam/cam_periph.c#2 integrate ... //depot/projects/kse/sys/compat/svr4/svr4_stream.c#9 integrate ... //depot/projects/kse/sys/conf/NOTES#7 integrate ... //depot/projects/kse/sys/conf/files#36 integrate ... //depot/projects/kse/sys/conf/files.sparc64#17 integrate ... //depot/projects/kse/sys/conf/options#18 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/fil.c#6 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_auth.c#6 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_fil.c#8 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_fil.h#6 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#4 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_nat.c#7 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_proxy.c#5 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_state.c#5 integrate ... //depot/projects/kse/sys/contrib/ipfilter/netinet/ipl.h#4 integrate ... //depot/projects/kse/sys/dev/ata/ata-all.c#19 integrate ... //depot/projects/kse/sys/dev/hea/eni.h#3 integrate ... //depot/projects/kse/sys/dev/hea/hea_freebsd.c#2 integrate ... //depot/projects/kse/sys/dev/hea/hea_pci.c#2 integrate ... //depot/projects/kse/sys/dev/hfa/hfa_freebsd.c#2 integrate ... //depot/projects/kse/sys/dev/hfa/hfa_pci.c#2 integrate ... //depot/projects/kse/sys/dev/md/md.c#20 integrate ... //depot/projects/kse/sys/dev/pci/pcivar.h#7 integrate ... //depot/projects/kse/sys/dev/sound/isa/ad1816.c#5 integrate ... //depot/projects/kse/sys/geom/geom.h#7 integrate ... //depot/projects/kse/sys/geom/geom_aes.c#2 integrate ... //depot/projects/kse/sys/geom/geom_bsd.c#7 integrate ... //depot/projects/kse/sys/geom/geom_dev.c#6 integrate ... //depot/projects/kse/sys/geom/geom_disk.c#6 integrate ... //depot/projects/kse/sys/geom/geom_event.c#5 integrate ... //depot/projects/kse/sys/geom/geom_gpt.c#4 integrate ... //depot/projects/kse/sys/geom/geom_mbr.c#6 integrate ... //depot/projects/kse/sys/geom/geom_pc98.c#4 integrate ... //depot/projects/kse/sys/geom/geom_slice.c#6 integrate ... //depot/projects/kse/sys/geom/geom_subr.c#7 integrate ... //depot/projects/kse/sys/geom/geom_sunlabel.c#5 integrate ... //depot/projects/kse/sys/i386/i386/trap.c#46 integrate ... //depot/projects/kse/sys/ia64/ia64/ski.c#4 integrate ... //depot/projects/kse/sys/ia64/ia64/trap.c#20 integrate ... //depot/projects/kse/sys/kern/kern_condvar.c#37 integrate ... //depot/projects/kse/sys/kern/kern_exec.c#27 integrate ... //depot/projects/kse/sys/kern/kern_exit.c#52 integrate ... //depot/projects/kse/sys/kern/kern_fork.c#69 integrate ... //depot/projects/kse/sys/kern/kern_ktrace.c#12 integrate ... //depot/projects/kse/sys/kern/kern_proc.c#64 integrate ... //depot/projects/kse/sys/kern/kern_sig.c#56 integrate ... //depot/projects/kse/sys/kern/kern_synch.c#65 integrate ... //depot/projects/kse/sys/kern/subr_kobj.c#2 integrate ... //depot/projects/kse/sys/kern/subr_trap.c#60 integrate ... //depot/projects/kse/sys/kern/subr_witness.c#26 integrate ... //depot/projects/kse/sys/kern/sys_generic.c#25 integrate ... //depot/projects/kse/sys/kern/uipc_syscalls.c#16 integrate ... //depot/projects/kse/sys/kern/vfs_lookup.c#9 integrate ... //depot/projects/kse/sys/netatm/atm_if.h#4 integrate ... //depot/projects/kse/sys/netatm/atm_ioctl.h#3 integrate ... //depot/projects/kse/sys/netgraph/ng_ppp.c#6 integrate ... //depot/projects/kse/sys/netinet/in.c#11 integrate ... //depot/projects/kse/sys/netinet/in_pcb.c#16 integrate ... //depot/projects/kse/sys/netinet/in_pcb.h#11 integrate ... //depot/projects/kse/sys/netinet/ip_divert.c#13 integrate ... //depot/projects/kse/sys/netinet/raw_ip.c#14 integrate ... //depot/projects/kse/sys/netinet/tcp_input.c#20 integrate ... //depot/projects/kse/sys/netinet/tcp_subr.c#13 integrate ... //depot/projects/kse/sys/netinet/tcp_syncache.c#16 integrate ... //depot/projects/kse/sys/netinet/tcp_timer.c#6 integrate ... //depot/projects/kse/sys/netinet/tcp_usrreq.c#10 integrate ... //depot/projects/kse/sys/netinet/tcp_var.h#8 integrate ... //depot/projects/kse/sys/netinet/udp_usrreq.c#14 integrate ... //depot/projects/kse/sys/netinet6/in6_pcb.c#14 integrate ... //depot/projects/kse/sys/netns/spp_usrreq.c#4 integrate ... //depot/projects/kse/sys/powerpc/powerpc/trap.c#14 integrate ... //depot/projects/kse/sys/sparc64/conf/GENERIC#13 integrate ... //depot/projects/kse/sys/sparc64/include/fp.h#10 integrate ... //depot/projects/kse/sys/sparc64/include/smp.h#8 integrate ... //depot/projects/kse/sys/sparc64/include/tlb.h#12 integrate ... //depot/projects/kse/sys/sparc64/sparc64/machdep.c#33 integrate ... //depot/projects/kse/sys/sparc64/sparc64/mp_exception.s#4 integrate ... //depot/projects/kse/sys/sparc64/sparc64/mp_machdep.c#9 integrate ... //depot/projects/kse/sys/sparc64/sparc64/pmap.c#28 integrate ... //depot/projects/kse/sys/sparc64/sparc64/tlb.c#2 integrate ... //depot/projects/kse/sys/sparc64/sparc64/trap.c#28 integrate ... //depot/projects/kse/sys/sys/_lock.h#6 integrate ... //depot/projects/kse/sys/sys/_mutex.h#7 integrate ... //depot/projects/kse/sys/sys/kernel.h#11 integrate ... //depot/projects/kse/sys/sys/kobj.h#2 integrate ... //depot/projects/kse/sys/sys/ktrace.h#3 integrate ... //depot/projects/kse/sys/sys/proc.h#106 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_vfsops.c#20 integrate ... //depot/projects/kse/sys/vm/uma_core.c#8 integrate ... //depot/projects/kse/sys/vm/vm_map.c#19 integrate ... //depot/projects/kse/sys/vm/vm_map.h#13 integrate ... //depot/projects/kse/usr.bin/w/pr_time.c#3 integrate ... //depot/projects/kse/usr.bin/w/proc_compare.c#6 integrate ... //depot/projects/kse/usr.bin/w/w.c#7 integrate Differences ... ==== //depot/projects/kse/bin/ps/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ps/Makefile,v 1.19 2002/02/04 03:06:50 kris Exp $ +# $FreeBSD: src/bin/ps/Makefile,v 1.20 2002/06/07 00:01:00 jmallett Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= ps @@ -10,8 +10,6 @@ # on large systems. # CFLAGS+=-DLAZY_PS -NO_WERROR=1 -WFORMAT=0 DPADD= ${LIBM} ${LIBKVM} LDADD= -lm -lkvm #BINGRP= kmem ==== //depot/projects/kse/bin/ps/extern.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.19 2002/02/23 21:00:14 bde Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.24 2002/06/08 06:49:15 bde Exp $ */ struct kinfo; @@ -41,13 +41,16 @@ extern fixpt_t ccpu; extern int cflag, eval, fscale, mempages, nlistread, rawcpu; +extern time_t now; extern int sumrusage, termwidth, totwidth; extern VARENT *vhead; __BEGIN_DECLS +void arguments(KINFO *, VARENT *); void command(KINFO *, VARENT *); void cputime(KINFO *, VARENT *); int donlist(void); +void elapsed(KINFO *, VARENT *); const char *fmt_argv(char **, char *, size_t); double getpcpu(const KINFO *); void kvar(KINFO *, VARENT *); @@ -65,8 +68,10 @@ void pri(KINFO *, VARENT *); void printheader(void); void priorityr(KINFO *, VARENT *); +void rgroupname(KINFO *, VARENT *); void runame(KINFO *, VARENT *); void rvar(KINFO *, VARENT *); +int s_rgroupname(KINFO *); int s_runame(KINFO *); int s_uname(KINFO *); void showkey(void); ==== //depot/projects/kse/bin/ps/fmt.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.22 2002/06/05 01:36:30 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/fmt.c,v 1.24 2002/06/07 01:14:05 jmallett Exp $"); #if 0 #ifndef lint ==== //depot/projects/kse/bin/ps/keyword.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.44 2002/06/06 18:04:46 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.48 2002/06/08 18:11:52 jmallett Exp $"); #if 0 #ifndef lint @@ -85,15 +85,18 @@ {"acflag", "ACFLG", NULL, 0, kvar, NULL, 3, KOFF(ki_acflag), USHORT, "x", 0}, {"acflg", "", "acflag", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, + {"args", "COMMAND", NULL, COMM|LJUST|USER, arguments, NULL, 16, 0, + CHAR, NULL, 0}, {"blocked", "", "sigmask", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"caught", "", "sigcatch", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, - {"comm", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0, + {"comm", "COMMAND", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR, + NULL, 0}, + {"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0, CHAR, NULL, 0}, - {"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, - 0, CHAR, NULL, 0}, {"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d", 0}, {"cputime", "", "time", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, + {"etime", "ELAPSED", NULL, USER, elapsed, NULL, 9, 0, CHAR, NULL, 0}, {"f", "F", NULL, 0, kvar, NULL, 7, KOFF(ki_flag), INT, "x", 0}, {"flags", "", "f", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"ignored", "", "sigignore", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -154,6 +157,8 @@ 0}, {"rgid", "RGID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_rgid), UINT, UIDFMT, 0}, + {"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname, + USERLEN, 0, CHAR, NULL, 0}, {"rss", "RSS", NULL, 0, kvar, NULL, 4, KOFF(ki_rssize), UINT, "d", 0}, {"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR, @@ -235,6 +240,7 @@ static struct varent *vtail; char *tempstr, *tempstr1; +#define FMTSEP " \t,\n" tempstr1 = tempstr = strdup(p); while (tempstr && *tempstr) { char *cp; @@ -242,10 +248,18 @@ struct varent *vent; /* - * Seperate the format by commas. + * If an item contains an equals sign, it specifies a column + * header, may contain embedded separator characters and + * is always the last item. */ - while ((cp = strsep(&tempstr, ",")) != NULL && *cp == '\0') - /* void */; + if (tempstr[strcspn(tempstr, "="FMTSEP)] != '=') + while ((cp = strsep(&tempstr, FMTSEP)) != NULL && + *cp == '\0') + /* void */; + else { + cp = tempstr; + tempstr = NULL; + } if (cp == NULL || !(v = findvar(cp))) continue; if ((vent = malloc(sizeof(struct varent))) == NULL) ==== //depot/projects/kse/bin/ps/nlist.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ps/nlist.c,v 1.16 2002/02/03 14:43:04 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/nlist.c,v 1.17 2002/06/06 20:59:15 jmallett Exp $"); #if 0 #ifndef lint @@ -59,13 +59,13 @@ size_t oldlen; oldlen = sizeof(ccpu); - if (sysctlbyname("kern.ccpu", &ccpu, &oldlen, NULL, 0) < 0) + if (sysctlbyname("kern.ccpu", &ccpu, &oldlen, NULL, 0) == -1) return (1); oldlen = sizeof(fscale); - if (sysctlbyname("kern.fscale", &fscale, &oldlen, NULL, 0) < 0) + if (sysctlbyname("kern.fscale", &fscale, &oldlen, NULL, 0) == -1) return (1); oldlen = sizeof(mempages); - if (sysctlbyname("hw.availpages", &mempages, &oldlen, NULL, 0) < 0) + if (sysctlbyname("hw.availpages", &mempages, &oldlen, NULL, 0) == -1) return (1); nlistread = 1; return (0); ==== //depot/projects/kse/bin/ps/print.c#11 (text+ko) ==== @@ -33,7 +33,7 @@ #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.61 2002/06/05 18:11:25 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.66 2002/06/07 00:00:29 jmallett Exp $"); #if 0 #ifndef lint @@ -91,6 +91,36 @@ } void +arguments(KINFO *k, VARENT *ve) +{ + VAR *v; + int left; + char *cp, *vis_args; + + v = ve->var; + + if ((vis_args = malloc(strlen(k->ki_args) * 4 + 1)) == NULL) + errx(1, "malloc failed"); + strvis(vis_args, k->ki_args, VIS_TAB | VIS_NL | VIS_NOSLASH); + + if (ve->next == NULL) { + /* last field */ + if (termwidth == UNLIMITED) { + (void)printf("%s", vis_args); + } else { + left = termwidth - (totwidth - v->width); + if (left < 1) /* already wrapped, just use std width */ + left = v->width; + for (cp = vis_args; --left >= 0 && *cp != '\0';) + (void)putchar(*cp++); + } + } else { + (void)printf("%-*.*s", v->width, v->width, vis_args); + } + free(vis_args); +} + +void command(KINFO *k, VARENT *ve) { VAR *v; @@ -250,8 +280,7 @@ VAR *v; v = ve->var; - (void)printf("%-*s", - (int)v->width, user_from_uid(k->ki_p->ki_uid, 0)); + (void)printf("%-*s", v->width, user_from_uid(k->ki_p->ki_uid, 0)); } int @@ -261,13 +290,27 @@ } void +rgroupname(KINFO *k, VARENT *ve) +{ + VAR *v; + + v = ve->var; + (void)printf("%-*s", v->width, group_from_gid(k->ki_p->ki_rgid, 0)); +} + +int +s_rgroupname(KINFO *k) +{ + return (strlen(group_from_gid(k->ki_p->ki_rgid, 0))); +} + +void runame(KINFO *k, VARENT *ve) { VAR *v; v = ve->var; - (void)printf("%-*s", - (int)v->width, user_from_uid(k->ki_p->ki_ruid, 0)); + (void)printf("%-*s", v->width, user_from_uid(k->ki_p->ki_ruid, 0)); } int @@ -333,7 +376,6 @@ started(KINFO *k, VARENT *ve) { VAR *v; - static time_t now; time_t then; struct tm *tp; char buf[100]; @@ -350,8 +392,6 @@ then = k->ki_p->ki_start.tv_sec; tp = localtime(&then); - if (!now) - (void)time(&now); if (now - k->ki_p->ki_start.tv_sec < 24 * 3600) { (void)strftime(buf, sizeof(buf) - 1, use_ampm ? "%l:%M%p" : "%k:%M ", tp); @@ -492,6 +532,21 @@ (void)printf("%*s", v->width, obuff); } +void +elapsed(KINFO *k, VARENT *ve) +{ + VAR *v; + time_t secs; + char obuff[128]; + + v = ve->var; + + secs = now - k->ki_p->ki_start.tv_sec; + (void)snprintf(obuff, sizeof(obuff), "%3ld:%02ld", (long)secs/60, + (long)secs%60); + (void)printf("%*s", v->width, obuff); +} + double getpcpu(const KINFO *k) { @@ -688,5 +743,5 @@ VAR *v; v = ve->var; - (void)printf("%-*d", (int)v->width, get_lattr(k->ki_p->ki_pid)); + (void)printf("%-*d", v->width, get_lattr(k->ki_p->ki_pid)); } ==== //depot/projects/kse/bin/ps/ps.1#9 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.48 2002/06/06 18:10:12 jmallett Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.55 2002/06/10 22:48:51 jmallett Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -130,8 +130,11 @@ This causes the printed header to use the specified string instead of the standard header. .It Fl o -Display information associated with the space or comma separated list -of keywords specified. +Display information associated with the space or comma separated +list of keywords specified. +Multiple keywords may also be given in the form of more than one +.Fl o +option. Keywords may be appended with an equals (``='') sign and a string. This causes the printed header to use the specified string instead of the standard header. @@ -370,10 +373,16 @@ percentage memory usage (alias pmem) .It acflag accounting flag (alias acflg) +.It args +command and arguments .It comm -command and arguments (alias command) +command +.It command +command and arguments .It cpu short-term cpu usage factor (for scheduling) +.It etime +elapsed running time .It flags the process flags, in hexadecimal (alias f) .It inblk @@ -438,6 +447,8 @@ .It rgid real group .Tn ID +.It rgroup +group name (from rgid) .It rlink reverse link on run queue, or 0 .It rss @@ -544,6 +555,11 @@ .Xr pstat 8 , .Xr sysctl 8 , .Xr mutex 9 +.Sh HISTORY +The +.Nm +command appeared in +.At v4 . .Sh BUGS Since .Nm ==== //depot/projects/kse/bin/ps/ps.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.53 2002/06/05 18:11:25 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.54 2002/06/06 21:21:25 jmallett Exp $"); #ifndef lint static const char copyright[] = @@ -81,6 +81,8 @@ int termwidth; /* width of screen (0 == infinity) */ int totwidth; /* calculated width of requested variables */ +time_t now; /* current time(3) value */ + static int needuser, needcomm, needenv; #if defined(LAZY_PS) static int forceuread=0; @@ -128,6 +130,8 @@ const char *nlistf, *memf; (void) setlocale(LC_ALL, ""); + /* Set the time to what it is right now. */ + time(&now); if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0') termwidth = atoi(cols); ==== //depot/projects/kse/sys/alpha/alpha/trap.c#24 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.93 2002/05/16 00:03:32 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.94 2002/06/07 05:47:34 jhb Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -734,18 +734,17 @@ break; } +#ifdef KTRACE + if (KTRPOINT(td, KTR_SYSCALL)) + ktrsyscall(code, (callp->sy_narg & SYF_ARGMASK), args + hidden); +#endif /* * Try to run the syscall without the MP lock if the syscall * is MP safe */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) { + if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_lock(&Giant); - } -#ifdef KTRACE - if (KTRPOINT(p, KTR_SYSCALL)) { - ktrsyscall(p->p_tracep, code, (callp->sy_narg & SYF_ARGMASK), args + hidden); - } -#endif + if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = 0; @@ -780,20 +779,17 @@ } userret(td, framep, sticks); -#ifdef KTRACE - if (KTRPOINT(p, KTR_SYSRET)) { - ktrsysret(p->p_tracep, code, error, td->td_retval[0]); - } -#endif /* - * Release Giant if we had to get it. Don't use mtx_owned(), - * we want to catch broken syscalls. + * Release Giant if we had to get it. */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) { + if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); - } +#ifdef KTRACE + if (KTRPOINT(td, KTR_SYSRET)) + ktrsysret(code, error, td->td_retval[0]); +#endif /* * This works because errno is findable through the * register set. If we ever support an emulation where this ==== //depot/projects/kse/sys/boot/ofw/libofw/ofw_net.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/ofw_net.c,v 1.5 2002/02/23 04:31:30 jake Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/ofw_net.c,v 1.6 2002/06/07 11:49:33 benno Exp $ */ #include @@ -210,7 +210,8 @@ #endif #ifndef __sparc64__ - if (OF_call_method("dma-alloc", netinstance, 1, 1, NULL, &dmabuf) + dmabuf = NULL; + if (OF_call_method("dma-alloc", netinstance, 1, 1, (64 * 1024), &dmabuf) < 0) { printf("Failed to allocate DMA buffer (got %08x).\n", dmabuf); goto punt; ==== //depot/projects/kse/sys/boot/powerpc/loader/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.8 2002/05/10 09:26:34 obrien Exp $ +# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.9 2002/06/07 11:49:56 benno Exp $ BASE= loader PROG= ${BASE} @@ -58,12 +58,12 @@ # where to get libstand from #XXX need a better way to do this LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a -#.if !exists(${LIBSTAND}) -#LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a -#.if !exists(${LIBSTAND}) -#LIBSTAND= -lstand -#.endif -#.endif +.if !exists(${LIBSTAND}) +LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a +.if !exists(${LIBSTAND}) +LIBSTAND= -lstand +.endif +.endif CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ # OpenFirmware is expecting ELF components ==== //depot/projects/kse/sys/cam/cam_periph.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.c,v 1.38 2001/07/30 00:44:32 mjacob Exp $ + * $FreeBSD: src/sys/cam/cam_periph.c,v 1.39 2002/06/07 23:51:30 mjacob Exp $ */ #include @@ -1253,6 +1253,10 @@ } *timeout = 0; error = ERESTART; + if (bootverbose) { + xpt_print_path(ccb->ccb_h.path); + printf("Queue Full\n"); + } break; } /* FALLTHROUGH */ @@ -1262,6 +1266,10 @@ * Restart the queue after either another * command completes or a 1 second timeout. */ + if (bootverbose) { + xpt_print_path(ccb->ccb_h.path); + printf("Device Busy\n"); + } if (ccb->ccb_h.retry_count > 0) { ccb->ccb_h.retry_count--; error = ERESTART; @@ -1273,9 +1281,13 @@ } break; case SCSI_STATUS_RESERV_CONFLICT: + xpt_print_path(ccb->ccb_h.path); + printf("Reservation Conflict\n"); error = EIO; break; default: + xpt_print_path(ccb->ccb_h.path); + printf("SCSI Status 0x%x\n", ccb->csio.scsi_status); error = EIO; break; } @@ -1374,7 +1386,7 @@ error = 0; break; case SS_RETRY: - action_string = "Retrying Command"; + action_string = "Retrying Command (per Sense Data)"; error = ERESTART; break; case SS_FAIL: @@ -1482,11 +1494,10 @@ sense_error_done: if ((err_action & SSQ_PRINT_SENSE) != 0 && (ccb->ccb_h.status & CAM_AUTOSNS_VALID) != 0) { -#if 0 - scsi_sense_print(&print_ccb->csio); -#endif cam_error_print(print_ccb, CAM_ESF_ALL, CAM_EPF_ALL); xpt_print_path(ccb->ccb_h.path); + if (bootverbose) + scsi_sense_print(&print_ccb->csio); printf("%s\n", action_string); } } @@ -1505,7 +1516,7 @@ const char *action_string; cam_status status; int frozen; - int error; + int error, printed = 0; int openings; u_int32_t relsim_flags; u_int32_t timeout; @@ -1535,10 +1546,36 @@ error = EIO; /* we have to kill the command */ break; case CAM_REQ_CMP_ERR: + if (bootverbose && printed == 0) { + xpt_print_path(ccb->ccb_h.path); + printf("Request completed with CAM_REQ_CMP_ERR\n"); + printed++; + } case CAM_CMD_TIMEOUT: + if (bootverbose && printed == 0) { + xpt_print_path(ccb->ccb_h.path); + printf("Command timed out"); + printed++; + } case CAM_UNEXP_BUSFREE: + if (bootverbose && printed == 0) { + xpt_print_path(ccb->ccb_h.path); + printf("Unexpected Bus Free"); + printed++; + } case CAM_UNCOR_PARITY: + if (bootverbose && printed == 0) { + xpt_print_path(ccb->ccb_h.path); + printf("Uncorrected Parity Error"); + printed++; + } case CAM_DATA_RUN_ERR: + if (bootverbose && printed == 0) { + xpt_print_path(ccb->ccb_h.path); + printf("Data Overrun"); + printed++; + } + error = EIO; /* we have to kill the command */ /* decrement the number of retries */ if (ccb->ccb_h.retry_count > 0) { ccb->ccb_h.retry_count--; @@ -1563,6 +1600,11 @@ ccb->ccb_h.retry_count--; error = ERESTART; + if (bootverbose && printed == 0) { + xpt_print_path(ccb->ccb_h.path); + printf("Selection Timeout"); + printed++; + } /* * Wait a second to give the device @@ -1607,10 +1649,23 @@ * these events and should be unconditionally * retried. */ + if (bootverbose && printed == 0) { + xpt_print_path(ccb->ccb_h.path); + if (status == CAM_BDR_SENT) + printf("Bus Device Reset sent\n"); + else + printf("Bus Reset issued\n"); + printed++; + } /* FALLTHROUGH */ case CAM_REQUEUE_REQ: /* Unconditional requeue */ error = ERESTART; + if (bootverbose && printed == 0) { + xpt_print_path(ccb->ccb_h.path); + printf("Request Requeued\n"); + printed++; + } break; case CAM_RESRC_UNAVAIL: case CAM_BUSY: @@ -1620,6 +1675,11 @@ if (ccb->ccb_h.retry_count > 0) { ccb->ccb_h.retry_count--; error = ERESTART; + if (bootverbose && printed == 0) { + xpt_print_path(ccb->ccb_h.path); + printf("CAM Status 0x%x\n", status); + printed++; + } } else { error = EIO; action_string = "Retries Exhausted"; ==== //depot/projects/kse/sys/compat/svr4/svr4_stream.c#9 (text+ko) ==== @@ -27,7 +27,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/compat/svr4/svr4_stream.c,v 1.28 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.29 2002/06/07 05:36:16 jhb Exp $ */ /* @@ -227,7 +227,7 @@ if (error == 0) { ktruio.uio_iov = ktriov; ktruio.uio_resid = td->td_retval[0]; - ktrgenio(td->td_proc->p_tracep, s, UIO_WRITE, &ktruio, error); + ktrgenio(s, UIO_WRITE, &ktruio, error); } FREE(ktriov, M_TEMP); } @@ -299,7 +299,7 @@ if (error == 0) { ktruio.uio_iov = ktriov; ktruio.uio_resid = len - auio.uio_resid; - ktrgenio(td->td_proc->p_tracep, s, UIO_READ, &ktruio, error); + ktrgenio(s, UIO_READ, &ktruio, error); } FREE(ktriov, M_TEMP); } ==== //depot/projects/kse/sys/conf/NOTES#7 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1036 2002/06/06 16:35:55 gibbs Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1039 2002/06/10 18:49:37 phk Exp $ # # @@ -102,7 +102,6 @@ options GEOM # Use the GEOMetry system for # disk-I/O transformations. -options GEOM_GPT # Include support for GPT disks. # # The root device and filesystem type can be compiled in; @@ -216,9 +215,16 @@ options GDB_REMOTE_CHAT # -# KTRACE enables the system-call tracing facility ktrace(2). +# KTRACE enables the system-call tracing facility ktrace(2). To be more +# SMP-friendly, KTRACE uses a worker thread to process most trace events +# asynchronously to the thread generating the event. This requires a +# pre-allocated store of objects representing trace events. The +# KTRACE_REQUEST_POOL option specifies the initial size of this store. +# The size of the pool can be adjusted both at boottime and runtime via +# the kern.ktrace_request_pool tunable and sysctl. # options KTRACE #kernel tracing +options KTRACE_REQUEST_POOL=101 # # KTR is a kernel tracing mechanism imported from BSD/OS. Currently it @@ -554,8 +560,8 @@ options ATM_SIGPVC #SIGPVC signalling manager options ATM_SPANS #SPANS signalling manager options ATM_UNI #UNI signalling manager -# Broken: -##device hea #Efficient ENI-155p ATM PCI + +device hea #Efficient ENI-155p ATM PCI device hfa #FORE PCA-200E ATM PCI ==== //depot/projects/kse/sys/conf/files#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.644 2002/06/06 16:35:55 gibbs Exp $ +# $FreeBSD: src/sys/conf/files,v 1.646 2002/06/10 18:49:37 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -358,14 +358,14 @@ dev/gem/if_gem_pci.c optional gem pci dev/gx/if_gx.c optional gx dev/hea/eni.c optional hea nowerror -dev/hea/eni_buffer.c optional hea +dev/hea/eni_buffer.c optional hea nowerror dev/hea/eni_globals.c optional hea dev/hea/eni_if.c optional hea dev/hea/eni_init.c optional hea dev/hea/eni_intr.c optional hea dev/hea/eni_receive.c optional hea dev/hea/eni_transmit.c optional hea -dev/hea/eni_vcm.c optional hea +dev/hea/eni_vcm.c optional hea nowerror dev/hea/hea_pci.c optional hea pci dev/hea/hea_freebsd.c optional hea dev/hfa/fore_buffer.c optional hfa @@ -732,7 +732,7 @@ geom/geom_dump.c optional geom geom/geom_enc.c optional geom geom/geom_event.c optional geom -geom/geom_gpt.c optional geom geom_gpt +geom/geom_gpt.c optional geom geom/geom_io.c optional geom geom/geom_kern.c optional geom geom/geom_mbr.c optional geom ==== //depot/projects/kse/sys/conf/files.sparc64#17 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.20 2002/05/29 06:08:45 jake Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.21 2002/06/08 07:17:18 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -41,8 +41,6 @@ sparc64/sparc64/eeprom.c optional eeprom sparc64/sparc64/eeprom_ebus.c optional eeprom ebus sparc64/sparc64/eeprom_sbus.c optional eeprom sbus -sparc64/sparc64/emul.c standard -sparc64/sparc64/fp.c standard sparc64/sparc64/identcpu.c standard sparc64/sparc64/in_cksum.c optional inet sparc64/sparc64/intr_machdep.c standard ==== //depot/projects/kse/sys/conf/options#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.321 2002/06/06 16:35:55 gibbs Exp $ +# $FreeBSD: src/sys/conf/options,v 1.324 2002/06/10 18:49:38 phk Exp $ # # On the handling of kernel options # @@ -63,8 +63,7 @@ # Miscellaneous options. GEOM opt_geom.h -GEOM_GPT opt_geom.h # Add support for GUID Partition - # Tables (GPTs). + ADAPTIVE_MUTEXES COMPAT_43 opt_compat.h COMPAT_SUNOS opt_compat.h @@ -77,6 +76,7 @@ NODEVFS opt_devfs.h HW_WDOG KTRACE +KTRACE_REQUEST_POOL opt_ktrace.h LIBICONV MD_ROOT opt_md.h MD_ROOT_SIZE opt_md.h ==== //depot/projects/kse/sys/contrib/ipfilter/netinet/fil.c#6 (text+ko) ==== @@ -99,7 +99,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.30 2002/04/27 16:56:25 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.31 2002/06/07 08:56:30 darrenr Exp $"; #endif #ifndef _KERNEL @@ -1517,7 +1517,7 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $Id: fil.c,v 2.35.2.60 2002/04/26 10:20:34 darrenr Exp $ + * $Id: fil.c,v 2.35.2.61 2002/06/05 08:18:09 darrenr Exp $ */ /* * Copy data from an mbuf chain starting "off" bytes from the beginning, @@ -1632,7 +1632,6 @@ fgp = &ipfgroups[0][set]; else return NULL; - num &= 0xffff; while ((fg = *fgp)) if (fg->fg_num == num) ==== //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_auth.c#6 (text+ko) ==== @@ -105,7 +105,7 @@ #if !defined(lint) /* static const char rcsid[] = "@(#)$Id: ip_auth.c,v 2.11.2.12 2001/07/18 14:57:08 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.28 2002/04/25 03:31:39 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.29 2002/06/07 08:56:30 darrenr Exp $"; #endif @@ -613,7 +613,10 @@ } else faep = &fae->fae_next; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 10 23:30:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 231BB37B406; Mon, 10 Jun 2002 23:30:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4895037B400 for ; Mon, 10 Jun 2002 23:30:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5B6UnI30250 for perforce@freebsd.org; Mon, 10 Jun 2002 23:30:49 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Mon, 10 Jun 2002 23:30:49 -0700 (PDT) Message-Id: <200206110630.g5B6UnI30250@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12687 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12687 Change 12687 by julian@julian_jules1 on 2002/06/10 23:29:52 catch a case of the old p_stat that slipped past previous checks Affected files ... ... //depot/projects/kse/sys/i386/linux/linux_ptrace.c#3 edit Differences ... ==== //depot/projects/kse/sys/i386/linux/linux_ptrace.c#3 (text+ko) ==== @@ -409,7 +409,7 @@ } /* not currently stopped */ - if (p->p_stat != SSTOP || (p->p_flag & P_WAITED) == 0) { + if ((p->p_flag & (P_TRACED|P_WAITED)) == 0) { error = EBUSY; goto fail; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 11 2: 6: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A81937B40E; Tue, 11 Jun 2002 02:05:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2FE2F37B407 for ; Tue, 11 Jun 2002 02:05:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5B95tK60826 for perforce@freebsd.org; Tue, 11 Jun 2002 02:05:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 11 Jun 2002 02:05:55 -0700 (PDT) Message-Id: <200206110905.g5B95tK60826@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12692 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12692 Change 12692 by rwatson@rwatson_paprika on 2002/06/11 02:04:56 Synchronize mac_none and mac_test regarding recently added socket entry points. Reminded by: amigus Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#29 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#29 (text+ko) ==== @@ -525,6 +525,22 @@ } static int +mac_none_cred_check_bind_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int +mac_none_cred_check_connect_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int mac_none_cred_check_see_cred(struct ucred *u1, struct ucred *u2) { @@ -626,6 +642,14 @@ } static int +mac_none_cred_check_listen_socket(struct ucred *cred, struct vnode *vp, + struct label *socketlabel) +{ + + return (0); +} + +static int mac_none_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) { @@ -872,6 +896,10 @@ (macop_t)mac_none_relabel_subject }, { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, (macop_t)mac_none_bpfdesc_check_receive_from_ifnet }, + { MAC_CRED_CHECK_BIND_SOCKET, + (macop_t)mac_none_cred_check_bind_socket }, + { MAC_CRED_CHECK_CONNECT_SOCKET, + (macop_t)mac_none_cred_check_connect_socket }, { MAC_CRED_CHECK_SEE_CRED, (macop_t)mac_none_cred_check_see_cred }, { MAC_CRED_CHECK_SEE_SOCKET, @@ -898,6 +926,8 @@ (macop_t)mac_none_cred_check_exec_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_none_cred_check_getextattr_vnode }, + { MAC_CRED_CHECK_LISTEN_SOCKET, + (macop_t)mac_none_cred_check_listen_socket }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_none_cred_check_open_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#2 (text+ko) ==== @@ -718,6 +718,22 @@ } static int +mac_test_cred_check_bind_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int +mac_test_cred_check_connect_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int mac_test_cred_check_see_cred(struct ucred *u1, struct ucred *u2) { @@ -819,6 +835,14 @@ } static int +mac_test_cred_check_listen_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int mac_test_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) { @@ -1063,6 +1087,10 @@ (macop_t)mac_test_relabel_subject }, { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, (macop_t)mac_test_bpfdesc_check_receive_from_ifnet }, + { MAC_CRED_CHECK_BIND_SOCKET, + (macop_t)mac_test_cred_check_bind_socket }, + { MAC_CRED_CHECK_CONNECT_SOCKET, + (macop_t)mac_test_cred_check_connect_socket }, { MAC_CRED_CHECK_SEE_CRED, (macop_t)mac_test_cred_check_see_cred }, { MAC_CRED_CHECK_SEE_SOCKET, @@ -1089,6 +1117,8 @@ (macop_t)mac_test_cred_check_exec_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_test_cred_check_getextattr_vnode }, + { MAC_CRED_CHECK_LISTEN_SOCKET, + (macop_t)mac_test_cred_check_listen_socket }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_test_cred_check_open_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 9: 7:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 850B037B406; Wed, 12 Jun 2002 09:07:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 91EC037B408 for ; Wed, 12 Jun 2002 09:07:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CG7f866706 for perforce@freebsd.org; Wed, 12 Jun 2002 09:07:41 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 12 Jun 2002 09:07:41 -0700 (PDT) Message-Id: <200206121607.g5CG7f866706@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12753 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12753 Change 12753 by des@des.at.des.thinksec.com on 2002/06/12 09:07:05 Don't treat PAM_NEW_AUTHTOK_REQD as an error. Try to emulate Solaris more closely. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/openpam/lib/openpam_dispatch.c#16 edit Differences ... ==== //depot/projects/openpam/lib/openpam_dispatch.c#16 (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_dispatch.c#15 $ + * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#16 $ */ #include @@ -109,20 +109,16 @@ if (r == PAM_IGNORE) continue; - if (r == PAM_SUCCESS) { + if (r == PAM_SUCCESS || r == PAM_NEW_AUTHTOK_REQD) { /* * For pam_setcred() and pam_chauthtok() with the * PAM_PRELIM_CHECK flag, treat "sufficient" as * "optional". - * - * Note that Solaris libpam does not terminate - * the chain here if a required module has - * previously failed. I'm not sure why. */ - if (chain->flag == PAM_SUFFICIENT && + if (chain->flag == PAM_SUFFICIENT && !fail && primitive != PAM_SM_SETCRED && - (primitive != PAM_SM_CHAUTHTOK || - !(flags & PAM_PRELIM_CHECK))) + !(primitive == PAM_SM_CHAUTHTOK && + (flags & PAM_PRELIM_CHECK))) break; continue; } @@ -153,7 +149,7 @@ } } - if (!fail) + if (!fail && err != PAM_NEW_AUTHTOK_REQD) err = PAM_SUCCESS; openpam_log(PAM_LOG_DEBUG, "returning: %s", pam_strerror(pamh, err)); return (err); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 10:37:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F25D37B409; Wed, 12 Jun 2002 10:37:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A02E137B404 for ; Wed, 12 Jun 2002 10:37:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CHbTJ80373 for perforce@freebsd.org; Wed, 12 Jun 2002 10:37:29 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 12 Jun 2002 10:37:29 -0700 (PDT) Message-Id: <200206121737.g5CHbTJ80373@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12756 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12756 Change 12756 by des@des.at.des.thinksec.com on 2002/06/12 10:36:43 Beginnings of a Cryptoki (aka PKCS#11) library, which we will need to support smart card readers and cryptographic tokens. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/cryptoki/Makefile#1 add ... //depot/projects/cryptoki/lib/Makefile#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 10:41:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06D9A37B410; Wed, 12 Jun 2002 10:41:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 027D037B40F for ; Wed, 12 Jun 2002 10:41:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CHfYH81120 for perforce@freebsd.org; Wed, 12 Jun 2002 10:41:34 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 12 Jun 2002 10:41:34 -0700 (PDT) Message-Id: <200206121741.g5CHfYH81120@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12757 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12757 Change 12757 by des@des.at.des.thinksec.com on 2002/06/12 10:41:16 PKCS#11 documentation lifted from RSA Security's FTP site. Affected files ... ... //depot/projects/cryptoki/doc/README#1 add ... //depot/projects/cryptoki/doc/pkcs-11/pkcs11Conformance.pdf#1 add ... //depot/projects/cryptoki/doc/pkcs-11/v211/cryptoki.h#1 add ... //depot/projects/cryptoki/doc/pkcs-11/v211/pkcs-11v2-11r1.pdf#1 add ... //depot/projects/cryptoki/doc/pkcs-11/v211/pkcs11.h#1 add ... //depot/projects/cryptoki/doc/pkcs-11/v211/pkcs11f.h#1 add ... //depot/projects/cryptoki/doc/pkcs-11/v211/pkcs11t.h#1 add ... //depot/projects/cryptoki/doc/pkcs-11/v211/pkcs11v2-11.pdf#1 add ... //depot/projects/cryptoki/doc/pkcs-11/v211/pkcs11v2-11d1.pdf#1 add ... //depot/projects/cryptoki/doc/pkcs-11/v211/pkcs11v2-11d2.pdf#1 add ... //depot/projects/cryptoki/doc/pkcs-11/v211/pkcs11v2-11d3.pdf#1 add ... //depot/projects/cryptoki/doc/pkcs-11/v211/v2-11_changes.pdf#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 10:52:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA8EA37B411; Wed, 12 Jun 2002 10:51:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4E8BD37B40E for ; Wed, 12 Jun 2002 10:51:48 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CHpmc82147 for perforce@freebsd.org; Wed, 12 Jun 2002 10:51:48 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 12 Jun 2002 10:51:48 -0700 (PDT) Message-Id: <200206121751.g5CHpmc82147@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12758 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12758 Change 12758 by julian@julian_jules1 on 2002/06/12 10:50:48 MFC Affected files ... ... //depot/projects/kse/sys/boot/alpha/boot1/Makefile#3 integrate ... //depot/projects/kse/sys/boot/alpha/boot1/boot1.c#2 integrate ... //depot/projects/kse/sys/boot/alpha/boot1/sys.c#5 delete ... //depot/projects/kse/sys/compat/svr4/svr4_stream.c#10 integrate ... //depot/projects/kse/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate ... //depot/projects/kse/sys/dev/hea/eni.c#6 integrate ... //depot/projects/kse/sys/i386/i386/trap.c#47 integrate ... //depot/projects/kse/sys/kern/kern_tc.c#10 integrate ... //depot/projects/kse/sys/kern/sys_generic.c#26 integrate ... //depot/projects/kse/sys/netinet/in_pcb.c#17 integrate ... //depot/projects/kse/sys/netinet/ip_divert.c#14 integrate ... //depot/projects/kse/sys/netinet/raw_ip.c#15 integrate ... //depot/projects/kse/sys/netinet/tcp_subr.c#14 integrate ... //depot/projects/kse/sys/netinet/udp_usrreq.c#15 integrate ... //depot/projects/kse/sys/netinet6/in6_pcb.c#15 integrate ... //depot/projects/kse/sys/sys/socket.h#7 integrate ... //depot/projects/kse/sys/sys/systm.h#25 integrate ... //depot/projects/kse/sys/vm/vm_map.c#20 integrate Differences ... ==== //depot/projects/kse/sys/boot/alpha/boot1/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $ -# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.12 2002/05/10 09:26:27 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.13 2002/06/11 06:56:31 phk Exp $ .include <../Makefile.inc> @@ -7,7 +7,7 @@ .PATH: ${.CURDIR}/../libalpha -SRCS= start.S boot1.c sys.c +SRCS= start.S boot1.c CFLAGS+= -ffreestanding -mno-fp-regs CFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -DMINIMAL CFLAGS+= -DBOOT1 ==== //depot/projects/kse/sys/boot/alpha/boot1/boot1.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.9 2000/10/25 23:24:43 dfr Exp $ + * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.11 2002/06/11 10:19:59 phk Exp $ * From $NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ */ @@ -32,18 +32,42 @@ #include #include +#include +#include #include #include #define DEBUGxx +void puts(const char *s); +void puthex(u_long v); +static int dskread(void *, u_int64_t, size_t); + +#define printf(...) \ +while (0) + +#define memcpy(dst, src, len) \ +bcopy(src, dst, len) + +#include "ufsread.c" + extern end[]; int errno; char *heap = (char*) end; void +bcopy(const void *src, void *dst, size_t len) +{ + const char *s; + char *d; + + for (d = dst, s = src; len; len--) + *d++ = *s++; +} + +void putchar(int c) { if (c == '\n') @@ -70,21 +94,7 @@ putchar(*s++); } -void * -malloc(size_t size) -{ - char *p = heap; - size = (size + 7) & ~7; - heap += size; - return p; -} - void -free(void * p) -{ -} - -void panic(const char *message, ...) { puts(message); @@ -124,6 +134,7 @@ int digit; char hex[] = "0123456789abcdef"; + puts("0x"); if (!v) { puts("0"); return; @@ -138,11 +149,11 @@ #endif -void -devread(char *buf, int block, size_t size) +int +dskread(void *buf, u_int64_t block, size_t size) { #ifdef DEBUG - puts("devread("); + puts("dskread("); puthex((u_long)buf); puts(","); puthex(block); @@ -151,7 +162,8 @@ puts(")\n"); #endif - prom_read(prom_fd, size, buf, block); + prom_read(prom_fd, size * DEV_BSIZE, buf, block); + return (0); } static inline void @@ -189,17 +201,22 @@ return; } +static struct dmadat __dmadat; + static inline void loadfile(char *name, char *addr) { int n; char *p; + ino_t ino; puts("Loading "); puts(name); puts("\n"); - if (openrd(name)) { + dmadat = &__dmadat; + + if (devopen() || (ino = lookup(name)) == 0) { puts("Can't open file "); puts(name); puts("\n"); @@ -208,10 +225,16 @@ p = addr; do { - n = readit(p, 1024); + n = fsread(ino, p, VBLKSIZE); + if (n < 0) { + puts("Can't read file "); + puts(name); + puts("\n"); + halt(); + } p += n; twiddle(); - } while (n > 0); + } while (n == VBLKSIZE); devclose(); } ==== //depot/projects/kse/sys/compat/svr4/svr4_stream.c#10 (text+ko) ==== @@ -27,7 +27,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/compat/svr4/svr4_stream.c,v 1.29 2002/06/07 05:36:16 jhb Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.30 2002/06/11 21:14:02 alfred Exp $ */ /* @@ -199,7 +199,7 @@ control = 0; } #ifdef KTRACE - if (KTRPOINT(td->td_proc, KTR_GENIO)) { + if (KTRPOINT(td, KTR_GENIO)) { int iovlen = auio.uio_iovcnt * sizeof (struct iovec); MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK); @@ -277,7 +277,7 @@ } } #ifdef KTRACE - if (KTRPOINT(td->td_proc, KTR_GENIO)) { + if (KTRPOINT(td, KTR_GENIO)) { int iovlen = auio.uio_iovcnt * sizeof (struct iovec); MALLOC(ktriov, struct iovec *, iovlen, M_TEMP, M_WAITOK); ==== //depot/projects/kse/sys/contrib/dev/acpica/acpica_prep.sh#2 (text+ko) ==== @@ -1,15 +1,20 @@ #!/bin/sh -# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.1 2002/02/08 02:16:45 msmith Exp $ +# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.2 2002/06/12 14:55:19 iwasaki Exp $ # # Unpack an ACPI CA drop and restructure it to fit the FreeBSD layout # +if [ ! $# -eq 1 ]; then + echo "usage: $0 acpica_archive" + exit +fi + src=$1 wrk=./_acpi_ca_unpack dst=./acpi_ca_destination # files to remove -stripdirs="compiler" +stripdirs="compiler generate" stripfiles="osunixxf.c 16bit.h Makefile a16find.c a16utils.asm a16utils.obj\ acintel.h aclinux.h acmsvc.h acwin.h acwin64.h getopt.c" @@ -39,4 +44,4 @@ # post-clean echo post-clean -rm -rf ${wrk}+rm -rf ${wrk} ==== //depot/projects/kse/sys/dev/hea/eni.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.20 2002/06/03 09:16:51 mdodd Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.21 2002/06/11 21:22:32 alfred Exp $ * */ @@ -35,10 +35,6 @@ * */ -#ifdef COMPILING_LINT -#warning "The eni driver is broken and is not compiled with LINT" -#else - #include #include #include @@ -70,7 +66,7 @@ #include #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.20 2002/06/03 09:16:51 mdodd Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.21 2002/06/11 21:22:32 alfred Exp $"); #endif /* @@ -697,4 +693,3 @@ } #endif /* BSD < 199506 */ #endif -#endif ==== //depot/projects/kse/sys/i386/i386/trap.c#47 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.224 2002/06/07 05:47:34 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.225 2002/06/12 13:30:52 bde Exp $ */ /* @@ -191,7 +191,16 @@ #endif atomic_add_int(&cnt.v_trap, 1); + type = frame.tf_trapno; +#ifdef DDB + if (db_active) { + eva = (type == T_PAGEFLT ? rcr2() : 0); + trap_fatal(&frame, eva); + goto out; + } +#endif + if ((frame.tf_eflags & PSL_I) == 0) { /* * Buggy application or kernel code has disabled @@ -200,7 +209,6 @@ * interrupts disabled until they are accidentally * enabled later. */ - type = frame.tf_trapno; if (ISPL(frame.tf_cs) == SEL_UPL || (frame.tf_eflags & PSL_VM)) printf( "pid %ld (%s): trap %d with interrupts disabled\n", @@ -223,7 +231,6 @@ } eva = 0; - type = frame.tf_trapno; code = frame.tf_err; if (type == T_PAGEFLT) { /* ==== //depot/projects/kse/sys/kern/kern_tc.c#10 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/kern/kern_tc.c,v 1.135 2002/05/30 16:26:39 phk Exp $ + * $FreeBSD: src/sys/kern/kern_tc.c,v 1.136 2002/06/11 19:47:44 kbyanc Exp $ */ #include "opt_ntp.h" @@ -88,7 +88,7 @@ #define TC_STATS(foo) \ static u_int foo; \ - SYSCTL_INT(_kern_timecounter, OID_AUTO, foo, CTLFLAG_RD, &foo, 0, "") \ + SYSCTL_UINT(_kern_timecounter, OID_AUTO, foo, CTLFLAG_RD, &foo, 0, "") \ struct __hack TC_STATS(nbinuptime); TC_STATS(nnanouptime); TC_STATS(nmicrouptime); ==== //depot/projects/kse/sys/kern/sys_generic.c#26 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/sys_generic.c,v 1.100 2002/06/07 05:36:16 jhb Exp $ + * $FreeBSD: src/sys/kern/sys_generic.c,v 1.101 2002/06/12 02:08:18 kbyanc Exp $ */ #include "opt_ktrace.h" @@ -713,8 +713,8 @@ */ struct mtx sellock; struct cv selwait; -int nselcoll; /* Select collisions since boot */ -SYSCTL_INT(_kern, OID_AUTO, nselcoll, CTLFLAG_RD, &nselcoll, 0, ""); +u_int nselcoll; /* Select collisions since boot */ +SYSCTL_UINT(_kern, OID_AUTO, nselcoll, CTLFLAG_RD, &nselcoll, 0, ""); /* * Select system call. @@ -744,8 +744,8 @@ fd_mask s_selbits[howmany(2048, NFDBITS)]; fd_mask *ibits[3], *obits[3], *selbits, *sbp; struct timeval atv, rtv, ttv; - int ncoll, error, timo; - u_int nbufbytes, ncpbytes, nfdbits; + int error, timo; + u_int ncoll, nbufbytes, ncpbytes, nfdbits; if (uap->nd < 0) return (EINVAL); @@ -955,8 +955,8 @@ caddr_t bits; char smallbits[32 * sizeof(struct pollfd)]; struct timeval atv, rtv, ttv; - int ncoll, error = 0, timo; - u_int nfds; + int error = 0, timo; + u_int ncoll, nfds; size_t ni; nfds = SCARG(uap, nfds); ==== //depot/projects/kse/sys/netinet/in_pcb.c#17 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.106 2002/06/10 20:05:36 hsu Exp $ + * $FreeBSD: src/sys/netinet/in_pcb.c,v 1.107 2002/06/12 03:08:08 hsu Exp $ */ #include "opt_ipsec.h" @@ -704,15 +704,13 @@ struct inpcbinfo *pcbinfo; struct ifnet *ifp; { - struct inpcb *head; struct inpcb *inp; struct ip_moptions *imo; int i, gap; /* why no splnet here? XXX */ INP_INFO_RLOCK(pcbinfo); - head = LIST_FIRST(pcbinfo->listhead); - for (inp = head; inp != NULL; inp = LIST_NEXT(inp, inp_list)) { + LIST_FOREACH(inp, pcbinfo->listhead, inp_list) { INP_LOCK(inp); imo = inp->inp_moptions; if ((inp->inp_vflag & INP_IPV4) && @@ -741,7 +739,7 @@ } INP_UNLOCK(inp); } - INP_INFO_RLOCK(pcbinfo); + INP_INFO_RUNLOCK(pcbinfo); } /* ==== //depot/projects/kse/sys/netinet/ip_divert.c#14 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.62 2002/06/10 20:05:37 hsu Exp $ + * $FreeBSD: src/sys/netinet/ip_divert.c,v 1.64 2002/06/11 10:58:57 hsu Exp $ */ #include "opt_inet.h" @@ -114,6 +114,7 @@ void div_init(void) { + INP_INFO_LOCK_INIT(&divcbinfo, "div"); LIST_INIT(&divcb); divcbinfo.listhead = &divcb; /* @@ -533,7 +534,7 @@ * the pcbinfo for in_setpeeraddr to lock. */ static int -dip_sockaddr(struct socket *so, struct sockaddr **nam) +div_sockaddr(struct socket *so, struct sockaddr **nam) { return (in_setsockaddr(so, nam, &divcbinfo)); } @@ -543,7 +544,7 @@ * the pcbinfo for in_setpeeraddr to lock. */ static int -dip_peeraddr(struct socket *so, struct sockaddr **nam) +div_peeraddr(struct socket *so, struct sockaddr **nam) { return (in_setpeeraddr(so, nam, &divcbinfo)); } ==== //depot/projects/kse/sys/netinet/raw_ip.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 - * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.96 2002/06/10 20:05:37 hsu Exp $ + * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.97 2002/06/11 10:58:57 hsu Exp $ */ #include "opt_inet6.h" @@ -96,6 +96,7 @@ void rip_init() { + INP_INFO_LOCK_INIT(&ripcbinfo, "rip"); LIST_INIT(&ripcb); ripcbinfo.listhead = &ripcb; /* ==== //depot/projects/kse/sys/netinet/tcp_subr.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.130 2002/06/10 20:05:37 hsu Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.131 2002/06/12 03:11:06 hsu Exp $ */ #include "opt_compat.h" @@ -853,12 +853,9 @@ for (inp = LIST_FIRST(tcbinfo.listhead), i = 0; inp && i < n; inp = LIST_NEXT(inp, inp_list)) { INP_LOCK(inp); - if (inp->inp_gencnt <= gencnt) { - if (cr_canseesocket(req->td->td_ucred, - inp->inp_socket)) - continue; + if (inp->inp_gencnt <= gencnt && + cr_canseesocket(req->td->td_ucred, inp->inp_socket) == 0) inp_list[i++] = inp; - } INP_UNLOCK(inp); } INP_INFO_RUNLOCK(&tcbinfo); ==== //depot/projects/kse/sys/netinet/udp_usrreq.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.111 2002/06/10 20:05:38 hsu Exp $ + * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.112 2002/06/12 15:21:41 hsu Exp $ */ #include "opt_ipsec.h" @@ -337,15 +337,13 @@ * for a broadcast or multicast datgram.) */ udpstat.udps_noportbcast++; - INP_INFO_RUNLOCK(&udbinfo); - goto bad; + goto badheadlocked; } #ifdef IPSEC /* check AH/ESP integrity. */ if (ipsec4_in_reject_so(m, last->inp_socket)) { ipsecstat.in_polvio++; - INP_INFO_RUNLOCK(&udbinfo); - goto bad; + goto badheadlocked; } #endif /*IPSEC*/ INP_UNLOCK(last); @@ -358,7 +356,6 @@ */ inp = in_pcblookup_hash(&udbinfo, ip->ip_src, uh->uh_sport, ip->ip_dst, uh->uh_dport, 1, m->m_pkthdr.rcvif); - INP_INFO_RUNLOCK(&udbinfo); if (inp == NULL) { if (log_in_vain) { char buf[4*sizeof "123"]; @@ -372,27 +369,27 @@ udpstat.udps_noport++; if (m->m_flags & (M_BCAST | M_MCAST)) { udpstat.udps_noportbcast++; - goto bad; + goto badheadlocked; } if (badport_bandlim(BANDLIM_ICMP_UNREACH) < 0) - goto bad; + goto badheadlocked; if (blackhole) - goto bad; + goto badheadlocked; *ip = save_ip; ip->ip_len += iphlen; icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_PORT, 0, 0); INP_INFO_RUNLOCK(&udbinfo); return; } + INP_LOCK(inp); + INP_INFO_RUNLOCK(&udbinfo); #ifdef IPSEC if (ipsec4_in_reject_so(m, inp->inp_socket)) { ipsecstat.in_polvio++; - INP_INFO_RUNLOCK(&udbinfo); goto bad; } #endif /*IPSEC*/ - INP_LOCK(inp); /* * Construct sockaddr format source address. * Stuff source address and datagram in user buffer. @@ -429,6 +426,9 @@ sorwakeup(inp->inp_socket); INP_UNLOCK(inp); return; + +badheadlocked: + INP_INFO_RUNLOCK(&udbinfo); bad: if (inp) INP_UNLOCK(inp); ==== //depot/projects/kse/sys/netinet6/in6_pcb.c#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.29 2002/06/10 20:05:46 hsu Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.30 2002/06/12 06:01:22 hsu Exp $ */ /* $KAME: in6_pcb.c,v 1.31 2001/05/21 05:45:10 jinmei Exp $ */ /* @@ -622,6 +622,7 @@ ip_freemoptions(inp->inp_moptions); inp->inp_vflag = 0; + INP_LOCK_DESTROY(inp); uma_zfree(ipi->ipi_zone, inp); } ==== //depot/projects/kse/sys/sys/socket.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)socket.h 8.4 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/sys/socket.h,v 1.61 2002/06/02 04:32:52 alfred Exp $ + * $FreeBSD: src/sys/sys/socket.h,v 1.62 2002/06/11 18:23:11 wollman Exp $ */ #ifndef _SYS_SOCKET_H_ @@ -95,7 +95,6 @@ #define SO_RCVTIMEO 0x1006 /* receive timeout */ #define SO_ERROR 0x1007 /* get error status and clear */ #define SO_TYPE 0x1008 /* get socket type */ -/*efine SO_PRIVSTATE 0x1009 get/deny privileged state */ /* * Structure used for manipulating linger option. ==== //depot/projects/kse/sys/sys/systm.h#25 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.174 2002/05/29 20:24:09 phk Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.175 2002/06/12 02:08:17 kbyanc Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -57,7 +57,7 @@ extern int nswap; /* size of swap space */ -extern int nselcoll; /* select collisions since boot */ +extern u_int nselcoll; /* select collisions since boot */ extern struct mtx sellock; /* select lock variable */ extern struct cv selwait; /* select conditional variable */ ==== //depot/projects/kse/sys/vm/vm_map.c#20 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.c,v 1.247 2002/06/10 06:11:45 alc Exp $ + * $FreeBSD: src/sys/vm/vm_map.c,v 1.250 2002/06/12 08:15:52 alc Exp $ */ /* @@ -429,11 +429,13 @@ static __inline int vm_map_unlock_and_wait(vm_map_t map, boolean_t user_wait) { + int retval; - GIANT_REQUIRED; + mtx_lock(&Giant); vm_map_unlock(map); - - return (tsleep(&map->root, PVM, "vmmapw", 0)); + retval = tsleep(&map->root, PVM, "vmmapw", 0); + mtx_unlock(&Giant); + return (retval); } /* @@ -1650,7 +1652,7 @@ */ } vm_map_lock(map); - if (last_timestamp+1 != map->timestamp) { + if (last_timestamp + 1 != map->timestamp) { /* * Look again for the entry because the map was * modified while it was unlocked. @@ -1704,7 +1706,7 @@ else rv = vm_fault_wire(map, saved_start, saved_end); vm_map_lock(map); - if (last_timestamp+1 != map->timestamp) { + if (last_timestamp + 1 != map->timestamp) { /* * Look again for the entry because the map was * modified while it was unlocked. The entry @@ -1719,14 +1721,24 @@ else first_entry = NULL; entry = tmp_entry; - while (entry->end < saved_end) + while (entry->end < saved_end) { + if (rv != KERN_SUCCESS) { + KASSERT(entry->wired_count == 1, + ("vm_map_wire: bad count")); + entry->wired_count = -1; + } entry = entry->next; + } } last_timestamp = map->timestamp; if (rv != KERN_SUCCESS) { + KASSERT(entry->wired_count == 1, + ("vm_map_wire: bad count")); /* - * XXX + * Assign an out-of-range value to represent + * the failure to wire this entry. */ + entry->wired_count = -1; end = entry->end; goto done; } @@ -1757,6 +1769,12 @@ if (rv == KERN_SUCCESS) { if (user_wire) entry->eflags |= MAP_ENTRY_USER_WIRED; + } else if (entry->wired_count == -1) { + /* + * Wiring failed on this entry. Thus, unwiring is + * unnecessary. + */ + entry->wired_count = 0; } else { if (!user_wire || (entry->wired_count == 1 && (entry->eflags & MAP_ENTRY_USER_WIRED) == 0)) @@ -2374,6 +2392,37 @@ vm_offset_t s, e; vm_pindex_t offidxstart, offidxend, count; + /* + * Wait for wiring or unwiring of an entry to complete. + */ + if ((entry->eflags & MAP_ENTRY_IN_TRANSITION) != 0) { + unsigned int last_timestamp; + vm_offset_t saved_start; + vm_map_entry_t tmp_entry; + + saved_start = entry->start; + entry->eflags |= MAP_ENTRY_NEEDS_WAKEUP; + last_timestamp = map->timestamp; + (void) vm_map_unlock_and_wait(map, FALSE); + vm_map_lock(map); + if (last_timestamp + 1 != map->timestamp) { + /* + * Look again for the entry because the map was + * modified while it was unlocked. + * Specifically, the entry may have been + * clipped, merged, or deleted. + */ + if (!vm_map_lookup_entry(map, saved_start, + &tmp_entry)) + entry = tmp_entry->next; + else { + entry = tmp_entry; + vm_map_clip_start(map, entry, + saved_start); + } + } + continue; + } vm_map_clip_end(map, entry, end); s = entry->start; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 12:15:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8809137B40F; Wed, 12 Jun 2002 12:15:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7736B37B40A for ; Wed, 12 Jun 2002 12:15:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CJFX499928 for perforce@freebsd.org; Wed, 12 Jun 2002 12:15:33 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 12 Jun 2002 12:15:33 -0700 (PDT) Message-Id: <200206121915.g5CJFX499928@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12761 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12761 Change 12761 by julian@julian_ref on 2002/06/12 12:15:17 fix compiler warning Affected files ... ... //depot/projects/kse/sys/kern/kern_synch.c#66 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_synch.c#66 (text+ko) ==== @@ -883,6 +883,7 @@ case PRS_ZOMBIE: panic("setrunnable(1)"); default: + ; } switch (td->td_state) { case 0: @@ -971,6 +972,7 @@ goto nextproc; nrun++; /* XXXKSE */ default: + ; } nextproc: continue; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 12:21:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF7C537B407; Wed, 12 Jun 2002 12:21:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7CC6137B40F for ; Wed, 12 Jun 2002 12:21:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CJLgq00924 for perforce@freebsd.org; Wed, 12 Jun 2002 12:21:42 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 12 Jun 2002 12:21:42 -0700 (PDT) Message-Id: <200206121921.g5CJLgq00924@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12762 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12762 Change 12762 by julian@julian_ref on 2002/06/12 12:21:09 fix warning Affected files ... ... //depot/projects/kse/sys/vm/vm_meter.c#13 edit Differences ... ==== //depot/projects/kse/sys/vm/vm_meter.c#13 (text+ko) ==== @@ -149,6 +149,7 @@ totalp->t_sl++; continue; default: + ; } } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 12:53:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C358737B406; Wed, 12 Jun 2002 12:53:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A3BD537B410 for ; Wed, 12 Jun 2002 12:53:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CJrOi03901 for perforce@freebsd.org; Wed, 12 Jun 2002 12:53:24 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 12 Jun 2002 12:53:24 -0700 (PDT) Message-Id: <200206121953.g5CJrOi03901@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12764 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12764 Change 12764 by des@des.at.des.thinksec.com on 2002/06/12 12:52:31 Use RSA's reference headers with our own cryptoki.h wrapper header, modeled on PKCS#11 section 8.3.3. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/cryptoki/include/Makefile#1 add ... //depot/projects/cryptoki/include/cryptoki.h#1 add ... //depot/projects/cryptoki/include/pkcs11.h#1 add ... //depot/projects/cryptoki/include/pkcs11f.h#1 add ... //depot/projects/cryptoki/include/pkcs11t.h#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 12:53:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D6A837B40D; Wed, 12 Jun 2002 12:53:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E185537B40E for ; Wed, 12 Jun 2002 12:53:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CJrOv03906 for perforce@freebsd.org; Wed, 12 Jun 2002 12:53:24 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 12 Jun 2002 12:53:24 -0700 (PDT) Message-Id: <200206121953.g5CJrOv03906@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12765 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12765 Change 12765 by des@des.at.des.thinksec.com on 2002/06/12 12:52:42 Install headers. Affected files ... ... //depot/projects/cryptoki/Makefile#2 edit Differences ... ==== //depot/projects/cryptoki/Makefile#2 (text+ko) ==== @@ -32,10 +32,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/cryptoki/Makefile#1 $ +# $P4: //depot/projects/cryptoki/Makefile#2 $ # SUBDIR = +SUBDIR += include SUBDIR += lib .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 13:12: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0605537B407; Wed, 12 Jun 2002 13:12:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from k6.locore.ca (k6.locore.ca [198.96.117.170]) by hub.freebsd.org (Postfix) with ESMTP id 95C8437B400; Wed, 12 Jun 2002 13:12:03 -0700 (PDT) Received: (from jake@localhost) by k6.locore.ca (8.11.6/8.11.6) id g5CKEFd04979; Wed, 12 Jun 2002 16:14:15 -0400 (EDT) (envelope-from jake) Date: Wed, 12 Jun 2002 16:14:15 -0400 From: Jake Burkholder To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 12762 for review Message-ID: <20020612161415.A257@locore.ca> References: <200206121921.g5CJLgq00924@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200206121921.g5CJLgq00924@freefall.freebsd.org>; from julian@freebsd.org on Wed, Jun 12, 2002 at 12:21:42PM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Apparently, On Wed, Jun 12, 2002 at 12:21:42PM -0700, Julian Elischer said words to the effect of; > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12762 > > Change 12762 by julian@julian_ref on 2002/06/12 12:21:09 > > fix warning FYI, the preferred way to fix these is to put a break instead of a null statement. > > Affected files ... > > ... //depot/projects/kse/sys/vm/vm_meter.c#13 edit > > Differences ... > > ==== //depot/projects/kse/sys/vm/vm_meter.c#13 (text+ko) ==== > > @@ -149,6 +149,7 @@ > totalp->t_sl++; > continue; > default: > + ; > } > } > } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 13:16:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D9F237B408; Wed, 12 Jun 2002 13:15:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 35B6837B401 for ; Wed, 12 Jun 2002 13:15:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CKFp109984 for perforce@freebsd.org; Wed, 12 Jun 2002 13:15:51 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 12 Jun 2002 13:15:51 -0700 (PDT) Message-Id: <200206122015.g5CKFp109984@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12767 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12767 Change 12767 by des@des.at.des.thinksec.com on 2002/06/12 13:15:25 Add skeletons for all functions prototyped in . Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/cryptoki/lib/C_CancelFunction.c#1 add ... //depot/projects/cryptoki/lib/C_CloseAllSessions.c#1 add ... //depot/projects/cryptoki/lib/C_CloseSession.c#1 add ... //depot/projects/cryptoki/lib/C_CopyObject.c#1 add ... //depot/projects/cryptoki/lib/C_CreateObject.c#1 add ... //depot/projects/cryptoki/lib/C_Decrypt.c#1 add ... //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#1 add ... //depot/projects/cryptoki/lib/C_DecryptFinal.c#1 add ... //depot/projects/cryptoki/lib/C_DecryptInit.c#1 add ... //depot/projects/cryptoki/lib/C_DecryptUpdate.c#1 add ... //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#1 add ... //depot/projects/cryptoki/lib/C_DeriveKey.c#1 add ... //depot/projects/cryptoki/lib/C_DestroyObject.c#1 add ... //depot/projects/cryptoki/lib/C_Digest.c#1 add ... //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#1 add ... //depot/projects/cryptoki/lib/C_DigestFinal.c#1 add ... //depot/projects/cryptoki/lib/C_DigestInit.c#1 add ... //depot/projects/cryptoki/lib/C_DigestKey.c#1 add ... //depot/projects/cryptoki/lib/C_DigestUpdate.c#1 add ... //depot/projects/cryptoki/lib/C_Encrypt.c#1 add ... //depot/projects/cryptoki/lib/C_EncryptFinal.c#1 add ... //depot/projects/cryptoki/lib/C_EncryptInit.c#1 add ... //depot/projects/cryptoki/lib/C_EncryptUpdate.c#1 add ... //depot/projects/cryptoki/lib/C_Finalize.c#1 add ... //depot/projects/cryptoki/lib/C_FindObjects.c#1 add ... //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#1 add ... //depot/projects/cryptoki/lib/C_FindObjectsInit.c#1 add ... //depot/projects/cryptoki/lib/C_GenerateKey.c#1 add ... //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#1 add ... //depot/projects/cryptoki/lib/C_GenerateRandom.c#1 add ... //depot/projects/cryptoki/lib/C_GetAttributeValue.c#1 add ... //depot/projects/cryptoki/lib/C_GetFunctionList.c#1 add ... //depot/projects/cryptoki/lib/C_GetFunctionStatus.c#1 add ... //depot/projects/cryptoki/lib/C_GetInfo.c#1 add ... //depot/projects/cryptoki/lib/C_GetMechanismInfo.c#1 add ... //depot/projects/cryptoki/lib/C_GetMechanismList.c#1 add ... //depot/projects/cryptoki/lib/C_GetObjectSize.c#1 add ... //depot/projects/cryptoki/lib/C_GetOperationState.c#1 add ... //depot/projects/cryptoki/lib/C_GetSessionInfo.c#1 add ... //depot/projects/cryptoki/lib/C_GetSlotInfo.c#1 add ... //depot/projects/cryptoki/lib/C_GetSlotList.c#1 add ... //depot/projects/cryptoki/lib/C_GetTokenInfo.c#1 add ... //depot/projects/cryptoki/lib/C_InitPIN.c#1 add ... //depot/projects/cryptoki/lib/C_InitToken.c#1 add ... //depot/projects/cryptoki/lib/C_Initialize.c#1 add ... //depot/projects/cryptoki/lib/C_Login.c#1 add ... //depot/projects/cryptoki/lib/C_Logout.c#1 add ... //depot/projects/cryptoki/lib/C_OpenSession.c#1 add ... //depot/projects/cryptoki/lib/C_SeedRandom.c#1 add ... //depot/projects/cryptoki/lib/C_SetAttributeValue.c#1 add ... //depot/projects/cryptoki/lib/C_SetOperationState.c#1 add ... //depot/projects/cryptoki/lib/C_SetPIN.c#1 add ... //depot/projects/cryptoki/lib/C_Sign.c#1 add ... //depot/projects/cryptoki/lib/C_SignEncryptUpdate.c#1 add ... //depot/projects/cryptoki/lib/C_SignFinal.c#1 add ... //depot/projects/cryptoki/lib/C_SignInit.c#1 add ... //depot/projects/cryptoki/lib/C_SignRecover.c#1 add ... //depot/projects/cryptoki/lib/C_SignRecoverInit.c#1 add ... //depot/projects/cryptoki/lib/C_SignUpdate.c#1 add ... //depot/projects/cryptoki/lib/C_UnwrapKey.c#1 add ... //depot/projects/cryptoki/lib/C_Verify.c#1 add ... //depot/projects/cryptoki/lib/C_VerifyFinal.c#1 add ... //depot/projects/cryptoki/lib/C_VerifyInit.c#1 add ... //depot/projects/cryptoki/lib/C_VerifyRecover.c#1 add ... //depot/projects/cryptoki/lib/C_VerifyRecoverInit.c#1 add ... //depot/projects/cryptoki/lib/C_VerifyUpdate.c#1 add ... //depot/projects/cryptoki/lib/C_WaitForSlotEvent.c#1 add ... //depot/projects/cryptoki/lib/C_WrapKey.c#1 add ... //depot/projects/cryptoki/lib/Makefile#2 edit Differences ... ==== //depot/projects/cryptoki/lib/Makefile#2 (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/cryptoki/lib/Makefile#1 $ +# $P4: //depot/projects/cryptoki/lib/Makefile#2 $ # LIB = cryptoki @@ -40,8 +40,75 @@ WARNS ?= 4 CFLAGS += -I${.CURDIR}/../include -CFLAGS += -DLIB_MAJ=${SHLIB_MAJOR} SRCS = +SRCS += C_CancelFunction.c +SRCS += C_CloseAllSessions.c +SRCS += C_CloseSession.c +SRCS += C_CopyObject.c +SRCS += C_CreateObject.c +SRCS += C_Decrypt.c +SRCS += C_DecryptDigestUpdate.c +SRCS += C_DecryptFinal.c +SRCS += C_DecryptInit.c +SRCS += C_DecryptUpdate.c +SRCS += C_DecryptVerifyUpdate.c +SRCS += C_DeriveKey.c +SRCS += C_DestroyObject.c +SRCS += C_Digest.c +SRCS += C_DigestEncryptUpdate.c +SRCS += C_DigestFinal.c +SRCS += C_DigestInit.c +SRCS += C_DigestKey.c +SRCS += C_DigestUpdate.c +SRCS += C_Encrypt.c +SRCS += C_EncryptFinal.c +SRCS += C_EncryptInit.c +SRCS += C_EncryptUpdate.c +SRCS += C_Finalize.c +SRCS += C_FindObjects.c +SRCS += C_FindObjectsFinal.c +SRCS += C_FindObjectsInit.c +SRCS += C_GenerateKey.c +SRCS += C_GenerateKeyPair.c +SRCS += C_GenerateRandom.c +SRCS += C_GetAttributeValue.c +SRCS += C_GetFunctionList.c +SRCS += C_GetFunctionStatus.c +SRCS += C_GetInfo.c +SRCS += C_GetMechanismInfo.c +SRCS += C_GetMechanismList.c +SRCS += C_GetObjectSize.c +SRCS += C_GetOperationState.c +SRCS += C_GetSessionInfo.c +SRCS += C_GetSlotInfo.c +SRCS += C_GetSlotList.c +SRCS += C_GetTokenInfo.c +SRCS += C_InitPIN.c +SRCS += C_InitToken.c +SRCS += C_Initialize.c +SRCS += C_Login.c +SRCS += C_Logout.c +SRCS += C_OpenSession.c +SRCS += C_SeedRandom.c +SRCS += C_SetAttributeValue.c +SRCS += C_SetOperationState.c +SRCS += C_SetPIN.c +SRCS += C_Sign.c +SRCS += C_SignEncryptUpdate.c +SRCS += C_SignFinal.c +SRCS += C_SignInit.c +SRCS += C_SignRecover.c +SRCS += C_SignRecoverInit.c +SRCS += C_SignUpdate.c +SRCS += C_UnwrapKey.c +SRCS += C_Verify.c +SRCS += C_VerifyFinal.c +SRCS += C_VerifyInit.c +SRCS += C_VerifyRecover.c +SRCS += C_VerifyRecoverInit.c +SRCS += C_VerifyUpdate.c +SRCS += C_WaitForSlotEvent.c +SRCS += C_WrapKey.c .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 13:16:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A16F037B400; Wed, 12 Jun 2002 13:16:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D5FEB37B405 for ; Wed, 12 Jun 2002 13:16:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CKGru10115 for perforce@freebsd.org; Wed, 12 Jun 2002 13:16:53 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 12 Jun 2002 13:16:53 -0700 (PDT) Message-Id: <200206122016.g5CKGru10115@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12768 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12768 Change 12768 by des@des.at.des.thinksec.com on 2002/06/12 13:15:58 Perl script that was used to generate the function skeletons. Affected files ... ... //depot/projects/cryptoki/misc/mkc.pl#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 13:20:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C26137B412; Wed, 12 Jun 2002 13:20:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88]) by hub.freebsd.org (Postfix) with ESMTP id 62F4B37B413; Wed, 12 Jun 2002 13:20:10 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc52.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020612202010.CSWB2751.rwcrmhc52.attbi.com@InterJet.elischer.org>; Wed, 12 Jun 2002 20:20:10 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id NAA90472; Wed, 12 Jun 2002 13:18:32 -0700 (PDT) Date: Wed, 12 Jun 2002 13:18:31 -0700 (PDT) From: Julian Elischer To: Jake Burkholder Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 12762 for review In-Reply-To: <20020612161415.A257@locore.ca> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG ok, thanks. I'll (re)fix them. On Wed, 12 Jun 2002, Jake Burkholder wrote: > Apparently, On Wed, Jun 12, 2002 at 12:21:42PM -0700, > Julian Elischer said words to the effect of; > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12762 > > > > Change 12762 by julian@julian_ref on 2002/06/12 12:21:09 > > > > fix warning > > FYI, the preferred way to fix these is to put a break instead > of a null statement. > > > > > Affected files ... > > > > ... //depot/projects/kse/sys/vm/vm_meter.c#13 edit > > > > Differences ... > > > > ==== //depot/projects/kse/sys/vm/vm_meter.c#13 (text+ko) ==== > > > > @@ -149,6 +149,7 @@ > > totalp->t_sl++; > > continue; > > default: > > + ; > > } > > } > > } > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 13:22:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE29E37B40A; Wed, 12 Jun 2002 13:22:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 63BC237B403 for ; Wed, 12 Jun 2002 13:22:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CKM0j10836 for perforce@freebsd.org; Wed, 12 Jun 2002 13:22:00 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 12 Jun 2002 13:22:00 -0700 (PDT) Message-Id: <200206122022.g5CKM0j10836@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12769 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12769 Change 12769 by julian@julian_ref on 2002/06/12 13:21:44 refix error message fixes.. courtesy of advice from Jake. Affected files ... ... //depot/projects/kse/sys/kern/kern_synch.c#67 edit ... //depot/projects/kse/sys/vm/vm_meter.c#14 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_synch.c#67 (text+ko) ==== @@ -883,7 +883,7 @@ case PRS_ZOMBIE: panic("setrunnable(1)"); default: - ; + break; } switch (td->td_state) { case 0: @@ -972,7 +972,7 @@ goto nextproc; nrun++; /* XXXKSE */ default: - ; + break; } nextproc: continue; ==== //depot/projects/kse/sys/vm/vm_meter.c#14 (text+ko) ==== @@ -149,7 +149,7 @@ totalp->t_sl++; continue; default: - ; + break; } } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 13:26:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AA5937B40B; Wed, 12 Jun 2002 13:25:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9D53237B409 for ; Wed, 12 Jun 2002 13:25:04 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CKP4t11045 for perforce@freebsd.org; Wed, 12 Jun 2002 13:25:04 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 12 Jun 2002 13:25:04 -0700 (PDT) Message-Id: <200206122025.g5CKP4t11045@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12770 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12770 Change 12770 by des@des.at.des.thinksec.com on 2002/06/12 13:24:05 Avoid warnings from unimplemented functions. Affected files ... ... //depot/projects/cryptoki/lib/C_CancelFunction.c#2 edit ... //depot/projects/cryptoki/lib/C_CloseAllSessions.c#2 edit ... //depot/projects/cryptoki/lib/C_CloseSession.c#2 edit ... //depot/projects/cryptoki/lib/C_CopyObject.c#2 edit ... //depot/projects/cryptoki/lib/C_CreateObject.c#2 edit ... //depot/projects/cryptoki/lib/C_Decrypt.c#2 edit ... //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#2 edit ... //depot/projects/cryptoki/lib/C_DecryptFinal.c#2 edit ... //depot/projects/cryptoki/lib/C_DecryptInit.c#2 edit ... //depot/projects/cryptoki/lib/C_DecryptUpdate.c#2 edit ... //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#2 edit ... //depot/projects/cryptoki/lib/C_DeriveKey.c#2 edit ... //depot/projects/cryptoki/lib/C_DestroyObject.c#2 edit ... //depot/projects/cryptoki/lib/C_Digest.c#2 edit ... //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#2 edit ... //depot/projects/cryptoki/lib/C_DigestFinal.c#2 edit ... //depot/projects/cryptoki/lib/C_DigestInit.c#2 edit ... //depot/projects/cryptoki/lib/C_DigestKey.c#2 edit ... //depot/projects/cryptoki/lib/C_DigestUpdate.c#2 edit ... //depot/projects/cryptoki/lib/C_Encrypt.c#2 edit ... //depot/projects/cryptoki/lib/C_EncryptFinal.c#2 edit ... //depot/projects/cryptoki/lib/C_EncryptInit.c#2 edit ... //depot/projects/cryptoki/lib/C_EncryptUpdate.c#2 edit ... //depot/projects/cryptoki/lib/C_Finalize.c#2 edit ... //depot/projects/cryptoki/lib/C_FindObjects.c#2 edit ... //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#2 edit ... //depot/projects/cryptoki/lib/C_FindObjectsInit.c#2 edit ... //depot/projects/cryptoki/lib/C_GenerateKey.c#2 edit ... //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#2 edit ... //depot/projects/cryptoki/lib/C_GenerateRandom.c#2 edit ... //depot/projects/cryptoki/lib/C_GetAttributeValue.c#2 edit ... //depot/projects/cryptoki/lib/C_GetFunctionList.c#2 edit ... //depot/projects/cryptoki/lib/C_GetFunctionStatus.c#2 edit ... //depot/projects/cryptoki/lib/C_GetInfo.c#2 edit ... //depot/projects/cryptoki/lib/C_GetMechanismInfo.c#2 edit ... //depot/projects/cryptoki/lib/C_GetMechanismList.c#2 edit ... //depot/projects/cryptoki/lib/C_GetObjectSize.c#2 edit ... //depot/projects/cryptoki/lib/C_GetOperationState.c#2 edit ... //depot/projects/cryptoki/lib/C_GetSessionInfo.c#2 edit ... //depot/projects/cryptoki/lib/C_GetSlotInfo.c#2 edit ... //depot/projects/cryptoki/lib/C_GetSlotList.c#2 edit ... //depot/projects/cryptoki/lib/C_GetTokenInfo.c#2 edit ... //depot/projects/cryptoki/lib/C_InitPIN.c#2 edit ... //depot/projects/cryptoki/lib/C_InitToken.c#2 edit ... //depot/projects/cryptoki/lib/C_Initialize.c#2 edit ... //depot/projects/cryptoki/lib/C_Login.c#2 edit ... //depot/projects/cryptoki/lib/C_Logout.c#2 edit ... //depot/projects/cryptoki/lib/C_OpenSession.c#2 edit ... //depot/projects/cryptoki/lib/C_SeedRandom.c#2 edit ... //depot/projects/cryptoki/lib/C_SetAttributeValue.c#2 edit ... //depot/projects/cryptoki/lib/C_SetOperationState.c#2 edit ... //depot/projects/cryptoki/lib/C_SetPIN.c#2 edit ... //depot/projects/cryptoki/lib/C_Sign.c#2 edit ... //depot/projects/cryptoki/lib/C_SignEncryptUpdate.c#2 edit ... //depot/projects/cryptoki/lib/C_SignFinal.c#2 edit ... //depot/projects/cryptoki/lib/C_SignInit.c#2 edit ... //depot/projects/cryptoki/lib/C_SignRecover.c#2 edit ... //depot/projects/cryptoki/lib/C_SignRecoverInit.c#2 edit ... //depot/projects/cryptoki/lib/C_SignUpdate.c#2 edit ... //depot/projects/cryptoki/lib/C_UnwrapKey.c#2 edit ... //depot/projects/cryptoki/lib/C_Verify.c#2 edit ... //depot/projects/cryptoki/lib/C_VerifyFinal.c#2 edit ... //depot/projects/cryptoki/lib/C_VerifyInit.c#2 edit ... //depot/projects/cryptoki/lib/C_VerifyRecover.c#2 edit ... //depot/projects/cryptoki/lib/C_VerifyRecoverInit.c#2 edit ... //depot/projects/cryptoki/lib/C_VerifyUpdate.c#2 edit ... //depot/projects/cryptoki/lib/C_WaitForSlotEvent.c#2 edit ... //depot/projects/cryptoki/lib/C_WrapKey.c#2 edit ... //depot/projects/cryptoki/misc/mkc.pl#2 edit Differences ... ==== //depot/projects/cryptoki/lib/C_CancelFunction.c#2 (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/cryptoki/lib/C_CancelFunction.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_CancelFunction.c#2 $ */ #include @@ -40,5 +40,6 @@ C_CancelFunction(CK_SESSION_HANDLE hSession) { + (void)hSession; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_CloseAllSessions.c#2 (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/cryptoki/lib/C_CloseAllSessions.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_CloseAllSessions.c#2 $ */ #include @@ -40,5 +40,6 @@ C_CloseAllSessions(CK_SLOT_ID slotID) { + (void)slotID; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_CloseSession.c#2 (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/cryptoki/lib/C_CloseSession.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_CloseSession.c#2 $ */ #include @@ -40,5 +40,6 @@ C_CloseSession(CK_SESSION_HANDLE hSession) { + (void)hSession; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_CopyObject.c#2 (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/cryptoki/lib/C_CopyObject.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_CopyObject.c#2 $ */ #include @@ -44,5 +44,10 @@ CK_OBJECT_HANDLE_PTR phNewObject) { + (void)hSession; + (void)hObject; + (void)pTemplate; + (void)ulCount; + (void)phNewObject; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_CreateObject.c#2 (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/cryptoki/lib/C_CreateObject.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_CreateObject.c#2 $ */ #include @@ -43,5 +43,9 @@ CK_OBJECT_HANDLE_PTR phObject) { + (void)hSession; + (void)pTemplate; + (void)ulCount; + (void)phObject; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_Decrypt.c#2 (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/cryptoki/lib/C_Decrypt.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_Decrypt.c#2 $ */ #include @@ -44,5 +44,10 @@ CK_ULONG_PTR pulDataLen) { + (void)hSession; + (void)pEncryptedData; + (void)ulEncryptedDataLen; + (void)pData; + (void)pulDataLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#2 (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/cryptoki/lib/C_DecryptDigestUpdate.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#2 $ */ #include @@ -44,5 +44,10 @@ CK_ULONG_PTR pulPartLen) { + (void)hSession; + (void)pEncryptedPart; + (void)ulEncryptedPartLen; + (void)pPart; + (void)pulPartLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_DecryptFinal.c#2 (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/cryptoki/lib/C_DecryptFinal.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptFinal.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_ULONG_PTR pulLastPartLen) { + (void)hSession; + (void)pLastPart; + (void)pulLastPartLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_DecryptInit.c#2 (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/cryptoki/lib/C_DecryptInit.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptInit.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_OBJECT_HANDLE hKey) { + (void)hSession; + (void)pMechanism; + (void)hKey; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_DecryptUpdate.c#2 (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/cryptoki/lib/C_DecryptUpdate.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptUpdate.c#2 $ */ #include @@ -44,5 +44,10 @@ CK_ULONG_PTR pulPartLen) { + (void)hSession; + (void)pEncryptedPart; + (void)ulEncryptedPartLen; + (void)pPart; + (void)pulPartLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#2 (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/cryptoki/lib/C_DecryptVerifyUpdate.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#2 $ */ #include @@ -44,5 +44,10 @@ CK_ULONG_PTR pulPartLen) { + (void)hSession; + (void)pEncryptedPart; + (void)ulEncryptedPartLen; + (void)pPart; + (void)pulPartLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_DeriveKey.c#2 (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/cryptoki/lib/C_DeriveKey.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_DeriveKey.c#2 $ */ #include @@ -45,5 +45,11 @@ CK_OBJECT_HANDLE_PTR phKey) { + (void)hSession; + (void)pMechanism; + (void)hBaseKey; + (void)pTemplate; + (void)ulAttributeCount; + (void)phKey; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_DestroyObject.c#2 (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/cryptoki/lib/C_DestroyObject.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_DestroyObject.c#2 $ */ #include @@ -41,5 +41,7 @@ CK_OBJECT_HANDLE hObject) { + (void)hSession; + (void)hObject; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_Digest.c#2 (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/cryptoki/lib/C_Digest.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_Digest.c#2 $ */ #include @@ -44,5 +44,10 @@ CK_ULONG_PTR pulDigestLen) { + (void)hSession; + (void)pData; + (void)ulDataLen; + (void)pDigest; + (void)pulDigestLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#2 (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/cryptoki/lib/C_DigestEncryptUpdate.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#2 $ */ #include @@ -44,5 +44,10 @@ CK_ULONG_PTR pulEncryptedPartLen) { + (void)hSession; + (void)pPart; + (void)ulPartLen; + (void)pEncryptedPart; + (void)pulEncryptedPartLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_DigestFinal.c#2 (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/cryptoki/lib/C_DigestFinal.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestFinal.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_ULONG_PTR pulDigestLen) { + (void)hSession; + (void)pDigest; + (void)pulDigestLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_DigestInit.c#2 (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/cryptoki/lib/C_DigestInit.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestInit.c#2 $ */ #include @@ -41,5 +41,7 @@ CK_MECHANISM_PTR pMechanism) { + (void)hSession; + (void)pMechanism; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_DigestKey.c#2 (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/cryptoki/lib/C_DigestKey.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestKey.c#2 $ */ #include @@ -41,5 +41,7 @@ CK_OBJECT_HANDLE hKey) { + (void)hSession; + (void)hKey; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_DigestUpdate.c#2 (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/cryptoki/lib/C_DigestUpdate.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestUpdate.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_ULONG ulPartLen) { + (void)hSession; + (void)pPart; + (void)ulPartLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_Encrypt.c#2 (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/cryptoki/lib/C_Encrypt.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_Encrypt.c#2 $ */ #include @@ -44,5 +44,10 @@ CK_ULONG_PTR pulEncryptedDataLen) { + (void)hSession; + (void)pData; + (void)ulDataLen; + (void)pEncryptedData; + (void)pulEncryptedDataLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_EncryptFinal.c#2 (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/cryptoki/lib/C_EncryptFinal.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_EncryptFinal.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_ULONG_PTR pulLastEncryptedPartLen) { + (void)hSession; + (void)pLastEncryptedPart; + (void)pulLastEncryptedPartLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_EncryptInit.c#2 (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/cryptoki/lib/C_EncryptInit.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_EncryptInit.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_OBJECT_HANDLE hKey) { + (void)hSession; + (void)pMechanism; + (void)hKey; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_EncryptUpdate.c#2 (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/cryptoki/lib/C_EncryptUpdate.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_EncryptUpdate.c#2 $ */ #include @@ -44,5 +44,10 @@ CK_ULONG_PTR pulEncryptedPartLen) { + (void)hSession; + (void)pPart; + (void)ulPartLen; + (void)pEncryptedPart; + (void)pulEncryptedPartLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_Finalize.c#2 (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/cryptoki/lib/C_Finalize.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_Finalize.c#2 $ */ #include @@ -40,5 +40,6 @@ C_Finalize(CK_VOID_PTR pReserved) { + (void)pReserved; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_FindObjects.c#2 (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/cryptoki/lib/C_FindObjects.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_FindObjects.c#2 $ */ #include @@ -43,5 +43,9 @@ CK_ULONG_PTR pulObjectCount) { + (void)hSession; + (void)phObject; + (void)ulMaxObjectCount; + (void)pulObjectCount; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#2 (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/cryptoki/lib/C_FindObjectsFinal.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#2 $ */ #include @@ -40,5 +40,6 @@ C_FindObjectsFinal(CK_SESSION_HANDLE hSession) { + (void)hSession; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_FindObjectsInit.c#2 (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/cryptoki/lib/C_FindObjectsInit.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_FindObjectsInit.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_ULONG ulCount) { + (void)hSession; + (void)pTemplate; + (void)ulCount; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GenerateKey.c#2 (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/cryptoki/lib/C_GenerateKey.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GenerateKey.c#2 $ */ #include @@ -44,5 +44,10 @@ CK_OBJECT_HANDLE_PTR phKey) { + (void)hSession; + (void)pMechanism; + (void)pTemplate; + (void)ulCount; + (void)phKey; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#2 (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/cryptoki/lib/C_GenerateKeyPair.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#2 $ */ #include @@ -47,5 +47,13 @@ CK_OBJECT_HANDLE_PTR phPrivateKey) { + (void)hSession; + (void)pMechanism; + (void)pPublicKeyTemplate; + (void)ulPublicKeyAttributeCount; + (void)pPrivateKeyTemplate; + (void)ulPrivateKeyAttributeCount; + (void)phPublicKey; + (void)phPrivateKey; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GenerateRandom.c#2 (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/cryptoki/lib/C_GenerateRandom.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GenerateRandom.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_ULONG ulRandomLen) { + (void)hSession; + (void)RandomData; + (void)ulRandomLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetAttributeValue.c#2 (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/cryptoki/lib/C_GetAttributeValue.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GetAttributeValue.c#2 $ */ #include @@ -43,5 +43,9 @@ CK_ULONG ulCount) { + (void)hSession; + (void)hObject; + (void)pTemplate; + (void)ulCount; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetFunctionList.c#2 (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/cryptoki/lib/C_GetFunctionList.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GetFunctionList.c#2 $ */ #include @@ -40,5 +40,6 @@ C_GetFunctionList(CK_FUNCTION_LIST_PTR_PTR ppFunctionList) { + (void)ppFunctionList; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetFunctionStatus.c#2 (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/cryptoki/lib/C_GetFunctionStatus.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GetFunctionStatus.c#2 $ */ #include @@ -40,5 +40,6 @@ C_GetFunctionStatus(CK_SESSION_HANDLE hSession) { + (void)hSession; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetInfo.c#2 (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/cryptoki/lib/C_GetInfo.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GetInfo.c#2 $ */ #include @@ -40,5 +40,6 @@ C_GetInfo(CK_INFO_PTR pInfo) { + (void)pInfo; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetMechanismInfo.c#2 (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/cryptoki/lib/C_GetMechanismInfo.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GetMechanismInfo.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_MECHANISM_INFO_PTR pInfo) { + (void)slotID; + (void)type; + (void)pInfo; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetMechanismList.c#2 (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/cryptoki/lib/C_GetMechanismList.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GetMechanismList.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_ULONG_PTR pulCount) { + (void)slotID; + (void)pMechanismList; + (void)pulCount; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetObjectSize.c#2 (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/cryptoki/lib/C_GetObjectSize.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GetObjectSize.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_ULONG_PTR pulSize) { + (void)hSession; + (void)hObject; + (void)pulSize; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetOperationState.c#2 (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/cryptoki/lib/C_GetOperationState.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GetOperationState.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_ULONG_PTR pulOperationStateLen) { + (void)hSession; + (void)pOperationState; + (void)pulOperationStateLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetSessionInfo.c#2 (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/cryptoki/lib/C_GetSessionInfo.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GetSessionInfo.c#2 $ */ #include @@ -41,5 +41,7 @@ CK_SESSION_INFO_PTR pInfo) { + (void)hSession; + (void)pInfo; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetSlotInfo.c#2 (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/cryptoki/lib/C_GetSlotInfo.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GetSlotInfo.c#2 $ */ #include @@ -41,5 +41,7 @@ CK_SLOT_INFO_PTR pInfo) { + (void)slotID; + (void)pInfo; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetSlotList.c#2 (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/cryptoki/lib/C_GetSlotList.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GetSlotList.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_ULONG_PTR pulCount) { + (void)tokenPresent; + (void)pSlotList; + (void)pulCount; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetTokenInfo.c#2 (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/cryptoki/lib/C_GetTokenInfo.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_GetTokenInfo.c#2 $ */ #include @@ -41,5 +41,7 @@ CK_TOKEN_INFO_PTR pInfo) { + (void)slotID; + (void)pInfo; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_InitPIN.c#2 (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/cryptoki/lib/C_InitPIN.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_InitPIN.c#2 $ */ #include @@ -42,5 +42,8 @@ CK_ULONG ulPinLen) { + (void)hSession; + (void)pPin; + (void)ulPinLen; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_InitToken.c#2 (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/cryptoki/lib/C_InitToken.c#1 $ + * $P4: //depot/projects/cryptoki/lib/C_InitToken.c#2 $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 14: 5:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA80937B40B; Wed, 12 Jun 2002 14:05:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E04E537B406 for ; Wed, 12 Jun 2002 14:05:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CL5rH19241 for perforce@freebsd.org; Wed, 12 Jun 2002 14:05:53 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 12 Jun 2002 14:05:53 -0700 (PDT) Message-Id: <200206122105.g5CL5rH19241@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12771 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12771 Change 12771 by julian@julian_jules1 on 2002/06/12 14:05:33 update to catch up to -current Affected files ... ... //depot/projects/kse/sys/kern/kern_switch.c#50 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_switch.c#50 (text+ko) ==== @@ -520,8 +520,8 @@ if (ke->ke_state == KES_ONRUNQ) return; #if defined(INVARIANTS) && defined(DIAGNOSTIC) - KASSERT(runq_find(rq, ke) == 0, - ("runq_add: proc %p (%s) already in run queue", ke, + KASSERT(ke->ke_state != KES_ONRUNQ, + ("runq_add: kse %p (%s) already in run queue", ke, ke->ke_proc->p_comm)); #endif pri = ke->ke_thread->td_priority / RQ_PPQ; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 14: 8: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9436C37B404; Wed, 12 Jun 2002 14:07:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C362E37B400 for ; Wed, 12 Jun 2002 14:07:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CL7u219639 for perforce@freebsd.org; Wed, 12 Jun 2002 14:07:56 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 12 Jun 2002 14:07:56 -0700 (PDT) Message-Id: <200206122107.g5CL7u219639@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12773 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12773 Change 12773 by des@des.at.des.thinksec.com on 2002/06/12 14:07:48 Paste-o, this is version 1.0. Affected files ... ... //depot/projects/cryptoki/lib/Makefile#3 edit Differences ... ==== //depot/projects/cryptoki/lib/Makefile#3 (text+ko) ==== @@ -31,11 +31,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/cryptoki/lib/Makefile#2 $ +# $P4: //depot/projects/cryptoki/lib/Makefile#3 $ # LIB = cryptoki -SHLIB_MAJOR = 2 +SHLIB_MAJOR = 1 SHLIB_MINOR = 0 WARNS ?= 4 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 14:11: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2287C37B407; Wed, 12 Jun 2002 14:10:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A4ACD37B401 for ; Wed, 12 Jun 2002 14:09:59 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CL9xa19896 for perforce@freebsd.org; Wed, 12 Jun 2002 14:09:59 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 12 Jun 2002 14:09:59 -0700 (PDT) Message-Id: <200206122109.g5CL9xa19896@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12774 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12774 Change 12774 by des@des.at.des.thinksec.com on 2002/06/12 14:09:10 Start implementing the basics.o Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/cryptoki/lib/C_Finalize.c#3 edit ... //depot/projects/cryptoki/lib/C_GetFunctionList.c#3 edit ... //depot/projects/cryptoki/lib/C_GetInfo.c#3 edit ... //depot/projects/cryptoki/lib/C_Initialize.c#3 edit ... //depot/projects/cryptoki/lib/cryptoki_impl.h#1 add Differences ... ==== //depot/projects/cryptoki/lib/C_Finalize.c#3 (text+ko) ==== @@ -31,15 +31,21 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Finalize.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_Finalize.c#3 $ */ #include +#include "cryptoki_impl.h" + CK_RV C_Finalize(CK_VOID_PTR pReserved) { - (void)pReserved; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pReserved != NULL_PTR) + return (CKR_ARGUMENTS_BAD); + _ck_Initialized = FALSE; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetFunctionList.c#3 (text+ko) ==== @@ -31,15 +31,89 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetFunctionList.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GetFunctionList.c#3 $ */ #include +CK_FUNCTION_LIST _ck_FunctionList = { + { 2, 11 }, + C_Initialize, + C_Finalize, + C_GetInfo, + C_GetFunctionList, + C_GetSlotList, + C_GetSlotInfo, + C_GetTokenInfo, + C_GetMechanismList, + C_GetMechanismInfo, + C_InitToken, + C_InitPIN, + C_SetPIN, + C_OpenSession, + C_CloseSession, + C_CloseAllSessions, + C_GetSessionInfo, + C_GetOperationState, + C_SetOperationState, + C_Login, + C_Logout, + C_CreateObject, + C_CopyObject, + C_DestroyObject, + C_GetObjectSize, + C_GetAttributeValue, + C_SetAttributeValue, + C_FindObjectsInit, + C_FindObjects, + C_FindObjectsFinal, + C_EncryptInit, + C_Encrypt, + C_EncryptUpdate, + C_EncryptFinal, + C_DecryptInit, + C_Decrypt, + C_DecryptUpdate, + C_DecryptFinal, + C_DigestInit, + C_Digest, + C_DigestUpdate, + C_DigestKey, + C_DigestFinal, + C_SignInit, + C_Sign, + C_SignUpdate, + C_SignFinal, + C_SignRecoverInit, + C_SignRecover, + C_VerifyInit, + C_Verify, + C_VerifyUpdate, + C_VerifyFinal, + C_VerifyRecoverInit, + C_VerifyRecover, + C_DigestEncryptUpdate, + C_DecryptDigestUpdate, + C_SignEncryptUpdate, + C_DecryptVerifyUpdate, + C_GenerateKey, + C_GenerateKeyPair, + C_WrapKey, + C_UnwrapKey, + C_DeriveKey, + C_SeedRandom, + C_GenerateRandom, + C_GetFunctionStatus, + C_CancelFunction, + C_WaitForSlotEvent, +}; + CK_RV C_GetFunctionList(CK_FUNCTION_LIST_PTR_PTR ppFunctionList) { - (void)ppFunctionList; + if (ppFunctionList == NULL) + return (CKR_ARGUMENTS_BAD); + *ppFunctionList = &_ck_FunctionList; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetInfo.c#3 (text+ko) ==== @@ -31,15 +31,25 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetInfo.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GetInfo.c#3 $ */ #include +#include "cryptoki_impl.h" + +CK_INFO _ck_Info = { + { 2, 11 }, + "FreeBSD ", + 0, + "libcryptoki ", + { 1, 0 }, +}; + CK_RV C_GetInfo(CK_INFO_PTR pInfo) { - (void)pInfo; + *pInfo = _ck_Info; return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_Initialize.c#3 (text+ko) ==== @@ -31,15 +31,36 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Initialize.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_Initialize.c#3 $ */ #include +#include "cryptoki_impl.h" + +int _ck_Initialized; + +CK_CREATEMUTEX _ck_CreateMutex; +CK_DESTROYMUTEX _ck_DestroyMutex; +CK_LOCKMUTEX _ck_LockMutex; +CK_UNLOCKMUTEX _ck_UnlockMutex; + CK_RV C_Initialize(CK_VOID_PTR pInitArgs) { - (void)pInitArgs; + if (_ck_Initialized) + return (CKR_CRYPTOKI_ALREADY_INITIALIZED); + if (pInitArgs != NULL_PTR) { + CK_C_INITIALIZE_ARGS_PTR pArgs = pInitArgs; + + _ck_CreateMutex = pArgs->CreateMutex; + _ck_DestroyMutex = pArgs->DestroyMutex; + _ck_LockMutex = pArgs->LockMutex; + _ck_UnlockMutex = pArgs->UnlockMutex; + /* should check that they're either all set or all clear */ + } + + _ck_Initialized = TRUE; return (CKR_OK); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 14:13: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CF0E37B406; Wed, 12 Jun 2002 14:13:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BF31337B405 for ; Wed, 12 Jun 2002 14:13:03 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CLD3Q20598 for perforce@freebsd.org; Wed, 12 Jun 2002 14:13:03 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 12 Jun 2002 14:13:03 -0700 (PDT) Message-Id: <200206122113.g5CLD3Q20598@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12775 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12775 Change 12775 by des@des.at.des.thinksec.com on 2002/06/12 14:12:28 s/NULL/NULL_PTR/ (for a moment there I almost though I was writing C) Affected files ... ... //depot/projects/cryptoki/lib/C_GetFunctionList.c#4 edit Differences ... ==== //depot/projects/cryptoki/lib/C_GetFunctionList.c#4 (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/cryptoki/lib/C_GetFunctionList.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_GetFunctionList.c#4 $ */ #include @@ -112,7 +112,7 @@ C_GetFunctionList(CK_FUNCTION_LIST_PTR_PTR ppFunctionList) { - if (ppFunctionList == NULL) + if (ppFunctionList == NULL_PTR) return (CKR_ARGUMENTS_BAD); *ppFunctionList = &_ck_FunctionList; return (CKR_OK); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 14:15:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D428737B405; Wed, 12 Jun 2002 14:14:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9814F37B405 for ; Wed, 12 Jun 2002 14:14:05 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5CLE5620654 for perforce@freebsd.org; Wed, 12 Jun 2002 14:14:05 -0700 (PDT) (envelope-from des@freebsd.org) Date: Wed, 12 Jun 2002 14:14:05 -0700 (PDT) Message-Id: <200206122114.g5CLE5620654@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12776 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12776 Change 12776 by des@des.at.des.thinksec.com on 2002/06/12 14:13:30 Closer reading of PKCS#11 shows that CKR_FUNCTION_NOT_SUPPORTED is intended for precisely this purpose. Affected files ... ... //depot/projects/cryptoki/lib/C_CancelFunction.c#3 edit ... //depot/projects/cryptoki/lib/C_CloseAllSessions.c#3 edit ... //depot/projects/cryptoki/lib/C_CloseSession.c#3 edit ... //depot/projects/cryptoki/lib/C_CopyObject.c#3 edit ... //depot/projects/cryptoki/lib/C_CreateObject.c#3 edit ... //depot/projects/cryptoki/lib/C_Decrypt.c#3 edit ... //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#3 edit ... //depot/projects/cryptoki/lib/C_DecryptFinal.c#3 edit ... //depot/projects/cryptoki/lib/C_DecryptInit.c#3 edit ... //depot/projects/cryptoki/lib/C_DecryptUpdate.c#3 edit ... //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#3 edit ... //depot/projects/cryptoki/lib/C_DeriveKey.c#3 edit ... //depot/projects/cryptoki/lib/C_DestroyObject.c#3 edit ... //depot/projects/cryptoki/lib/C_Digest.c#3 edit ... //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#3 edit ... //depot/projects/cryptoki/lib/C_DigestFinal.c#3 edit ... //depot/projects/cryptoki/lib/C_DigestInit.c#3 edit ... //depot/projects/cryptoki/lib/C_DigestKey.c#3 edit ... //depot/projects/cryptoki/lib/C_DigestUpdate.c#3 edit ... //depot/projects/cryptoki/lib/C_Encrypt.c#3 edit ... //depot/projects/cryptoki/lib/C_EncryptFinal.c#3 edit ... //depot/projects/cryptoki/lib/C_EncryptInit.c#3 edit ... //depot/projects/cryptoki/lib/C_EncryptUpdate.c#3 edit ... //depot/projects/cryptoki/lib/C_FindObjects.c#3 edit ... //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#3 edit ... //depot/projects/cryptoki/lib/C_FindObjectsInit.c#3 edit ... //depot/projects/cryptoki/lib/C_GenerateKey.c#3 edit ... //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#3 edit ... //depot/projects/cryptoki/lib/C_GenerateRandom.c#3 edit ... //depot/projects/cryptoki/lib/C_GetAttributeValue.c#3 edit ... //depot/projects/cryptoki/lib/C_GetFunctionStatus.c#3 edit ... //depot/projects/cryptoki/lib/C_GetMechanismInfo.c#3 edit ... //depot/projects/cryptoki/lib/C_GetMechanismList.c#3 edit ... //depot/projects/cryptoki/lib/C_GetObjectSize.c#3 edit ... //depot/projects/cryptoki/lib/C_GetOperationState.c#3 edit ... //depot/projects/cryptoki/lib/C_GetSessionInfo.c#3 edit ... //depot/projects/cryptoki/lib/C_GetSlotInfo.c#3 edit ... //depot/projects/cryptoki/lib/C_GetSlotList.c#3 edit ... //depot/projects/cryptoki/lib/C_GetTokenInfo.c#3 edit ... //depot/projects/cryptoki/lib/C_InitPIN.c#3 edit ... //depot/projects/cryptoki/lib/C_InitToken.c#3 edit ... //depot/projects/cryptoki/lib/C_Login.c#3 edit ... //depot/projects/cryptoki/lib/C_Logout.c#3 edit ... //depot/projects/cryptoki/lib/C_OpenSession.c#3 edit ... //depot/projects/cryptoki/lib/C_SeedRandom.c#3 edit ... //depot/projects/cryptoki/lib/C_SetAttributeValue.c#3 edit ... //depot/projects/cryptoki/lib/C_SetOperationState.c#3 edit ... //depot/projects/cryptoki/lib/C_SetPIN.c#3 edit ... //depot/projects/cryptoki/lib/C_Sign.c#3 edit ... //depot/projects/cryptoki/lib/C_SignEncryptUpdate.c#3 edit ... //depot/projects/cryptoki/lib/C_SignFinal.c#3 edit ... //depot/projects/cryptoki/lib/C_SignInit.c#3 edit ... //depot/projects/cryptoki/lib/C_SignRecover.c#3 edit ... //depot/projects/cryptoki/lib/C_SignRecoverInit.c#3 edit ... //depot/projects/cryptoki/lib/C_SignUpdate.c#3 edit ... //depot/projects/cryptoki/lib/C_UnwrapKey.c#3 edit ... //depot/projects/cryptoki/lib/C_Verify.c#3 edit ... //depot/projects/cryptoki/lib/C_VerifyFinal.c#3 edit ... //depot/projects/cryptoki/lib/C_VerifyInit.c#3 edit ... //depot/projects/cryptoki/lib/C_VerifyRecover.c#3 edit ... //depot/projects/cryptoki/lib/C_VerifyRecoverInit.c#3 edit ... //depot/projects/cryptoki/lib/C_VerifyUpdate.c#3 edit ... //depot/projects/cryptoki/lib/C_WaitForSlotEvent.c#3 edit ... //depot/projects/cryptoki/lib/C_WrapKey.c#3 edit Differences ... ==== //depot/projects/cryptoki/lib/C_CancelFunction.c#3 (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/cryptoki/lib/C_CancelFunction.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_CancelFunction.c#3 $ */ #include @@ -41,5 +41,5 @@ { (void)hSession; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_CloseAllSessions.c#3 (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/cryptoki/lib/C_CloseAllSessions.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_CloseAllSessions.c#3 $ */ #include @@ -41,5 +41,5 @@ { (void)slotID; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_CloseSession.c#3 (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/cryptoki/lib/C_CloseSession.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_CloseSession.c#3 $ */ #include @@ -41,5 +41,5 @@ { (void)hSession; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_CopyObject.c#3 (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/cryptoki/lib/C_CopyObject.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_CopyObject.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)pTemplate; (void)ulCount; (void)phNewObject; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_CreateObject.c#3 (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/cryptoki/lib/C_CreateObject.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_CreateObject.c#3 $ */ #include @@ -47,5 +47,5 @@ (void)pTemplate; (void)ulCount; (void)phObject; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_Decrypt.c#3 (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/cryptoki/lib/C_Decrypt.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_Decrypt.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)ulEncryptedDataLen; (void)pData; (void)pulDataLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#3 (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/cryptoki/lib/C_DecryptDigestUpdate.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)ulEncryptedPartLen; (void)pPart; (void)pulPartLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DecryptFinal.c#3 (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/cryptoki/lib/C_DecryptFinal.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptFinal.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)hSession; (void)pLastPart; (void)pulLastPartLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DecryptInit.c#3 (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/cryptoki/lib/C_DecryptInit.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptInit.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)hSession; (void)pMechanism; (void)hKey; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DecryptUpdate.c#3 (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/cryptoki/lib/C_DecryptUpdate.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptUpdate.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)ulEncryptedPartLen; (void)pPart; (void)pulPartLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#3 (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/cryptoki/lib/C_DecryptVerifyUpdate.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)ulEncryptedPartLen; (void)pPart; (void)pulPartLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DeriveKey.c#3 (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/cryptoki/lib/C_DeriveKey.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_DeriveKey.c#3 $ */ #include @@ -51,5 +51,5 @@ (void)pTemplate; (void)ulAttributeCount; (void)phKey; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DestroyObject.c#3 (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/cryptoki/lib/C_DestroyObject.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_DestroyObject.c#3 $ */ #include @@ -43,5 +43,5 @@ (void)hSession; (void)hObject; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_Digest.c#3 (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/cryptoki/lib/C_Digest.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_Digest.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)ulDataLen; (void)pDigest; (void)pulDigestLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#3 (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/cryptoki/lib/C_DigestEncryptUpdate.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)ulPartLen; (void)pEncryptedPart; (void)pulEncryptedPartLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DigestFinal.c#3 (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/cryptoki/lib/C_DigestFinal.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestFinal.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)hSession; (void)pDigest; (void)pulDigestLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DigestInit.c#3 (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/cryptoki/lib/C_DigestInit.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestInit.c#3 $ */ #include @@ -43,5 +43,5 @@ (void)hSession; (void)pMechanism; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DigestKey.c#3 (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/cryptoki/lib/C_DigestKey.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestKey.c#3 $ */ #include @@ -43,5 +43,5 @@ (void)hSession; (void)hKey; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DigestUpdate.c#3 (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/cryptoki/lib/C_DigestUpdate.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestUpdate.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)hSession; (void)pPart; (void)ulPartLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_Encrypt.c#3 (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/cryptoki/lib/C_Encrypt.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_Encrypt.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)ulDataLen; (void)pEncryptedData; (void)pulEncryptedDataLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_EncryptFinal.c#3 (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/cryptoki/lib/C_EncryptFinal.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_EncryptFinal.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)hSession; (void)pLastEncryptedPart; (void)pulLastEncryptedPartLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_EncryptInit.c#3 (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/cryptoki/lib/C_EncryptInit.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_EncryptInit.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)hSession; (void)pMechanism; (void)hKey; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_EncryptUpdate.c#3 (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/cryptoki/lib/C_EncryptUpdate.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_EncryptUpdate.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)ulPartLen; (void)pEncryptedPart; (void)pulEncryptedPartLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_FindObjects.c#3 (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/cryptoki/lib/C_FindObjects.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_FindObjects.c#3 $ */ #include @@ -47,5 +47,5 @@ (void)phObject; (void)ulMaxObjectCount; (void)pulObjectCount; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#3 (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/cryptoki/lib/C_FindObjectsFinal.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#3 $ */ #include @@ -41,5 +41,5 @@ { (void)hSession; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_FindObjectsInit.c#3 (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/cryptoki/lib/C_FindObjectsInit.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_FindObjectsInit.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)hSession; (void)pTemplate; (void)ulCount; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GenerateKey.c#3 (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/cryptoki/lib/C_GenerateKey.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GenerateKey.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)pTemplate; (void)ulCount; (void)phKey; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#3 (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/cryptoki/lib/C_GenerateKeyPair.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#3 $ */ #include @@ -55,5 +55,5 @@ (void)ulPrivateKeyAttributeCount; (void)phPublicKey; (void)phPrivateKey; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GenerateRandom.c#3 (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/cryptoki/lib/C_GenerateRandom.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GenerateRandom.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)hSession; (void)RandomData; (void)ulRandomLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GetAttributeValue.c#3 (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/cryptoki/lib/C_GetAttributeValue.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GetAttributeValue.c#3 $ */ #include @@ -47,5 +47,5 @@ (void)hObject; (void)pTemplate; (void)ulCount; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GetFunctionStatus.c#3 (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/cryptoki/lib/C_GetFunctionStatus.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GetFunctionStatus.c#3 $ */ #include @@ -41,5 +41,5 @@ { (void)hSession; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GetMechanismInfo.c#3 (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/cryptoki/lib/C_GetMechanismInfo.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GetMechanismInfo.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)slotID; (void)type; (void)pInfo; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GetMechanismList.c#3 (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/cryptoki/lib/C_GetMechanismList.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GetMechanismList.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)slotID; (void)pMechanismList; (void)pulCount; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GetObjectSize.c#3 (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/cryptoki/lib/C_GetObjectSize.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GetObjectSize.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)hSession; (void)hObject; (void)pulSize; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GetOperationState.c#3 (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/cryptoki/lib/C_GetOperationState.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GetOperationState.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)hSession; (void)pOperationState; (void)pulOperationStateLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GetSessionInfo.c#3 (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/cryptoki/lib/C_GetSessionInfo.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GetSessionInfo.c#3 $ */ #include @@ -43,5 +43,5 @@ (void)hSession; (void)pInfo; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GetSlotInfo.c#3 (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/cryptoki/lib/C_GetSlotInfo.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GetSlotInfo.c#3 $ */ #include @@ -43,5 +43,5 @@ (void)slotID; (void)pInfo; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GetSlotList.c#3 (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/cryptoki/lib/C_GetSlotList.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GetSlotList.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)tokenPresent; (void)pSlotList; (void)pulCount; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GetTokenInfo.c#3 (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/cryptoki/lib/C_GetTokenInfo.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_GetTokenInfo.c#3 $ */ #include @@ -43,5 +43,5 @@ (void)slotID; (void)pInfo; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_InitPIN.c#3 (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/cryptoki/lib/C_InitPIN.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_InitPIN.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)hSession; (void)pPin; (void)ulPinLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_InitToken.c#3 (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/cryptoki/lib/C_InitToken.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_InitToken.c#3 $ */ #include @@ -47,5 +47,5 @@ (void)pPin; (void)ulPinLen; (void)pLabel; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_Login.c#3 (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/cryptoki/lib/C_Login.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_Login.c#3 $ */ #include @@ -47,5 +47,5 @@ (void)userType; (void)pPin; (void)ulPinLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_Logout.c#3 (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/cryptoki/lib/C_Logout.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_Logout.c#3 $ */ #include @@ -41,5 +41,5 @@ { (void)hSession; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_OpenSession.c#3 (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/cryptoki/lib/C_OpenSession.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_OpenSession.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)pApplication; (void)Notify; (void)phSession; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_SeedRandom.c#3 (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/cryptoki/lib/C_SeedRandom.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_SeedRandom.c#3 $ */ #include @@ -45,5 +45,5 @@ (void)hSession; (void)pSeed; (void)ulSeedLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_SetAttributeValue.c#3 (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/cryptoki/lib/C_SetAttributeValue.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_SetAttributeValue.c#3 $ */ #include @@ -47,5 +47,5 @@ (void)hObject; (void)pTemplate; (void)ulCount; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_SetOperationState.c#3 (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/cryptoki/lib/C_SetOperationState.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_SetOperationState.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)ulOperationStateLen; (void)hEncryptionKey; (void)hAuthenticationKey; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_SetPIN.c#3 (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/cryptoki/lib/C_SetPIN.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_SetPIN.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)ulOldLen; (void)pNewPin; (void)ulNewLen; - return (CKR_OK); + return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_Sign.c#3 (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/cryptoki/lib/C_Sign.c#2 $ + * $P4: //depot/projects/cryptoki/lib/C_Sign.c#3 $ */ #include @@ -49,5 +49,5 @@ (void)ulDataLen; (void)pSignature; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 17: 8:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3D8337B405; Wed, 12 Jun 2002 17:08:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E2EF237B404 for ; Wed, 12 Jun 2002 17:08:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5D08iZ50628 for perforce@freebsd.org; Wed, 12 Jun 2002 17:08:44 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 12 Jun 2002 17:08:44 -0700 (PDT) Message-Id: <200206130008.g5D08iZ50628@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12785 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12785 Change 12785 by julian@julian_jules1 on 2002/06/12 17:08:09 safety save Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#61 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#61 (text+ko) ==== @@ -303,6 +303,8 @@ td = curthread; ke = td->td_kse; + PROC_LOCK_ASSERT(td->td_proc, MA_UNOWNED); + PROC_LOCK(td->td_proc); CTR1(KTR_PROC, "thread_exit: thread %p", td); KASSERT(!mtx_owned(&Giant), ("dying thread owns giant")); @@ -315,6 +317,7 @@ } cpu_thread_exit(td); /* XXXSMP */ thread_unlink(td); + PROC_UNLOCK(td->td_proc); ke->ke_tdspare = td; cpu_throw(); /* NOTREACHED */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 17:42:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4903337B404; Wed, 12 Jun 2002 17:42:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9E67837B401 for ; Wed, 12 Jun 2002 17:42:26 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5D0gQg54148 for perforce@freebsd.org; Wed, 12 Jun 2002 17:42:26 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 12 Jun 2002 17:42:26 -0700 (PDT) Message-Id: <200206130042.g5D0gQg54148@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12788 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12788 Change 12788 by julian@julian_jules1 on 2002/06/12 17:42:10 because jhb says to. Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#62 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#62 (text+ko) ==== @@ -303,7 +303,6 @@ td = curthread; ke = td->td_kse; - PROC_LOCK_ASSERT(td->td_proc, MA_UNOWNED); PROC_LOCK(td->td_proc); CTR1(KTR_PROC, "thread_exit: thread %p", td); KASSERT(!mtx_owned(&Giant), ("dying thread owns giant")); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 19:30:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77FF837B417; Wed, 12 Jun 2002 19:29:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0405637B411 for ; Wed, 12 Jun 2002 19:29:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5D2Tfb71880 for perforce@freebsd.org; Wed, 12 Jun 2002 19:29:41 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 12 Jun 2002 19:29:41 -0700 (PDT) Message-Id: <200206130229.g5D2Tfb71880@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12794 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12794 Change 12794 by julian@julian_jules1 on 2002/06/12 19:29:39 thread exit cleanup Affected files ... ... //depot/projects/kse/sys/i386/i386/trap.c#48 edit ... //depot/projects/kse/sys/kern/init_sysent.c#19 edit ... //depot/projects/kse/sys/kern/kern_exit.c#53 edit ... //depot/projects/kse/sys/kern/kern_proc.c#65 edit ... //depot/projects/kse/sys/kern/kern_thread.c#63 edit ... //depot/projects/kse/sys/kern/subr_trap.c#61 edit ... //depot/projects/kse/sys/kern/syscalls.c#19 edit ... //depot/projects/kse/sys/kern/syscalls.master#18 edit ... //depot/projects/kse/sys/sys/proc.h#107 edit ... //depot/projects/kse/sys/sys/syscall.h#19 edit ... //depot/projects/kse/sys/sys/syscall.mk#19 edit ... //depot/projects/kse/sys/sys/sysproto.h#23 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#48 (text+ko) ==== @@ -273,6 +273,7 @@ * But check if the are the single thread first! */ if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + PROC_LOCK(p); thread_exit(); /* NOTREACHED */ } ==== //depot/projects/kse/sys/kern/init_sysent.c#19 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.123 2002/05/28 06:16:07 marcel Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.112 2002/05/28 05:58:06 marcel Exp */ @@ -405,7 +405,7 @@ { 0, (sy_call_t *)kse_wakeup }, /* 380 = kse_wakeup */ { AS(kse_new_args), (sy_call_t *)kse_new }, /* 381 = kse_new */ { AS(thread_wakeup_args), (sy_call_t *)thread_wakeup }, /* 382 = thread_wakeup */ - { 0, (sy_call_t *)kse_yield }, /* 383 = kse_yield */ + { SYF_MPSAFE | 0, (sy_call_t *)kse_yield }, /* 383 = kse_yield */ { 0, (sy_call_t *)nosys }, /* 384 = __mac_get_proc */ { 0, (sy_call_t *)nosys }, /* 385 = __mac_set_proc */ { 0, (sy_call_t *)nosys }, /* 386 = __mac_get_fd */ ==== //depot/projects/kse/sys/kern/kern_exit.c#53 (text+ko) ==== @@ -485,8 +485,6 @@ wakeup(p->p_pptr); PROC_UNLOCK(p->p_pptr); - PROC_UNLOCK(p); - cnt.v_swtch++; binuptime(PCPU_PTR(switchtime)); PCPU_SET(switchticks, ticks); @@ -605,6 +603,7 @@ mtx_unlock_spin(&sched_lock); } + thread_reap(); /* check for zombie threads */ td->td_retval[0] = p->p_pid; #ifdef COMPAT_43 if (compat) ==== //depot/projects/kse/sys/kern/kern_proc.c#65 (text+ko) ==== @@ -187,8 +187,8 @@ kse_yield(struct thread *td, struct kse_yield_args *uap) { + PROC_LOCK(td->td_proc); mtx_lock_spin(&sched_lock); - mtx_unlock(&Giant); thread_exit(); /* NOTREACHED */ return(0); ==== //depot/projects/kse/sys/kern/kern_thread.c#63 (text+ko) ==== @@ -72,6 +72,11 @@ #define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) +tdlist_head_t zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads); +struct mtx zombie_thread_lock; +MTX_SYSINIT(zombie_thread_lock", zombie_thread_lock, + "zombie_thread_lock", MTX_SPIN); + /* * Pepare a thread for use. */ @@ -231,11 +236,43 @@ } /* + * Stash an embarasingly esxtra thread into the zombie thread queue. + */ +void +thread_stash(struct thread *td) +{ + mtx_lock_spin(&zombie_thread_lock); + TAILQ_INSERT_HEAD(&zombie_threads, td, td_runq); + mtx_unlock_spin(&zombie_thread_lock); +} + +/* + * reap any zombie threads for this Processor. + */ +void +thread_reap(void) +{ + struct thread *td_reaped, *td_next; + + mtx_lock_spin(&zombie_thread_lock); + td_reaped = TAILQ_FIRST(&zombie_threads); + while (td_reaped) { + td_next = TAILQ_NEXT(td_reaped, td_runq); + TAILQ_REMOVE(&zombie_threads, td_reaped, td_runq); + thread_free(td_reaped); + td_reaped = td_next; + } + mtx_unlock_spin(&zombie_thread_lock); + +} + +/* * Allocate a thread. */ struct thread * thread_alloc(void) { + thread_reap(); /* check if any zombies to get */ return (uma_zalloc(thread_zone, M_WAITOK)); } @@ -300,24 +337,22 @@ { struct thread *td; struct kse *ke; + struct proc *p; + p = td->td_proc; td = curthread; ke = td->td_kse; - PROC_LOCK(td->td_proc); + PROC_LOCK_ASSERT(p, MA_OWNED); CTR1(KTR_PROC, "thread_exit: thread %p", td); KASSERT(!mtx_owned(&Giant), ("dying thread owns giant")); if (ke->ke_tdspare != NULL) { - mtx_unlock_spin(&sched_lock); - mtx_lock(&Giant); - thread_free(ke->ke_tdspare); - mtx_unlock(&Giant); - mtx_lock_spin(&sched_lock); + thread_stash(ke->ke_tdspare); } cpu_thread_exit(td); /* XXXSMP */ thread_unlink(td); - PROC_UNLOCK(td->td_proc); ke->ke_tdspare = td; + PROC_UNLOCK(p); cpu_throw(); /* NOTREACHED */ } @@ -521,7 +556,6 @@ * this thread should just suicide. */ if (p->p_flag & P_SINGLE_EXIT) { - PROC_UNLOCK(p); mtx_lock_spin(&sched_lock); while (mtx_owned(&Giant)) mtx_unlock(&Giant); ==== //depot/projects/kse/sys/kern/subr_trap.c#61 (text+ko) ==== @@ -182,6 +182,7 @@ * to be returned? * For now, just let another KSE run (easiest). */ + PROC_LOCK(p); mtx_lock_spin(&sched_lock); thread_exit(); /* Abandon current thread. */ /* NOTREACHED */ ==== //depot/projects/kse/sys/kern/syscalls.c#19 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.110 2002/05/28 06:16:07 marcel Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.112 2002/05/28 05:58:06 marcel Exp */ ==== //depot/projects/kse/sys/kern/syscalls.master#18 (text+ko) ==== @@ -552,7 +552,7 @@ 381 STD BSD { int kse_new(struct kse_mailbox * mbx, \ int new_grp_flag); } 382 STD BSD { int thread_wakeup(struct thread_mailbox *tmbx); } -383 STD BSD { int kse_yield(void); } +383 MSTD BSD { int kse_yield(void); } 384 UNIMPL BSD __mac_get_proc 385 UNIMPL BSD __mac_set_proc 386 UNIMPL BSD __mac_get_fd ==== //depot/projects/kse/sys/sys/proc.h#107 (text+ko) ==== @@ -822,11 +822,13 @@ void thread_exit(void) __dead2; int thread_export_context(struct thread *td); void thread_link(struct thread *td, struct ksegrp *kg); +void thread_reap(void); struct thread *thread_schedule_upcall(struct thread *td, struct kse *ke); int thread_single(int how); #define SNGLE_WAIT 0 /* values for 'how' */ #define SNGLE_EXIT 1 void thread_single_end(void); +void thread_stash(struct thread *td); int thread_suspend_check(int how); void thread_unsuspend(struct proc *p); ==== //depot/projects/kse/sys/sys/syscall.h#19 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.109 2002/05/28 06:16:07 marcel Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.112 2002/05/28 05:58:06 marcel Exp */ ==== //depot/projects/kse/sys/sys/syscall.mk#19 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.64 2002/05/28 06:16:07 marcel Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.112 2002/05/28 05:58:06 marcel Exp MIASM = \ syscall.o \ ==== //depot/projects/kse/sys/sys/sysproto.h#23 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.101 2002/05/28 06:16:07 marcel Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.112 2002/05/28 05:58:06 marcel Exp */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 19:34:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D1FD37B40A; Wed, 12 Jun 2002 19:34:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 76F5D37B40B for ; Wed, 12 Jun 2002 19:34:48 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5D2Ym872812 for perforce@freebsd.org; Wed, 12 Jun 2002 19:34:48 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 12 Jun 2002 19:34:48 -0700 (PDT) Message-Id: <200206130234.g5D2Ym872812@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12795 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12795 Change 12795 by julian@julian_ref on 2002/06/12 19:34:00 fix typo Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#64 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#64 (text+ko) ==== @@ -74,7 +74,7 @@ tdlist_head_t zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads); struct mtx zombie_thread_lock; -MTX_SYSINIT(zombie_thread_lock", zombie_thread_lock, +MTX_SYSINIT(zombie_thread_lock, zombie_thread_lock, "zombie_thread_lock", MTX_SPIN); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 12 19:38: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8DB037B401; Wed, 12 Jun 2002 19:37:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 942B937B40F for ; Wed, 12 Jun 2002 19:37:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5D2bq773060 for perforce@freebsd.org; Wed, 12 Jun 2002 19:37:52 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 12 Jun 2002 19:37:52 -0700 (PDT) Message-Id: <200206130237.g5D2bq773060@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12796 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12796 Change 12796 by julian@julian_ref on 2002/06/12 19:37:42 fix braino Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#65 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#65 (text+ko) ==== @@ -74,7 +74,7 @@ tdlist_head_t zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads); struct mtx zombie_thread_lock; -MTX_SYSINIT(zombie_thread_lock, zombie_thread_lock, +MTX_SYSINIT(zombie_thread_lock, &zombie_thread_lock, "zombie_thread_lock", MTX_SPIN); /* @@ -339,8 +339,8 @@ struct kse *ke; struct proc *p; + td = curthread; p = td->td_proc; - td = curthread; ke = td->td_kse; PROC_LOCK_ASSERT(p, MA_OWNED); CTR1(KTR_PROC, "thread_exit: thread %p", td); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 2: 1:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68AE237B47D; Thu, 13 Jun 2002 01:59:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id ADC4637B4AC for ; Thu, 13 Jun 2002 01:58:48 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5D8wev36297 for perforce@freebsd.org; Thu, 13 Jun 2002 01:58:40 -0700 (PDT) (envelope-from green@freebsd.org) Date: Thu, 13 Jun 2002 01:58:40 -0700 (PDT) Message-Id: <200206130858.g5D8wev36297@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 12807 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12807 Change 12807 by green@green_laptop_1 on 2002/06/13 01:58:16 Fix a stale variable name bug breaking the build. Affected files ... ... //depot/projects/kse/lib/libkvm/kvm_proc.c#16 edit Differences ... ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#16 (text+ko) ==== @@ -337,7 +337,7 @@ kp->ki_stat = SSLEEP; } else if (P_SHOULDSTOP(&proc)) { kp->ki_stat = SSTOP; - } else if (td->td_state == TDS_MTX) { + } else if (mainthread.td_state == TDS_MTX) { kp->ki_stat = SMTX; } else { kp->ki_stat = SWAIT; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 6:44:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81F2E37B40D; Thu, 13 Jun 2002 06:44:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8533037B448 for ; Thu, 13 Jun 2002 06:44:40 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5DDdif99281 for perforce@freebsd.org; Thu, 13 Jun 2002 06:39:44 -0700 (PDT) (envelope-from des@freebsd.org) Date: Thu, 13 Jun 2002 06:39:44 -0700 (PDT) Message-Id: <200206131339.g5DDdif99281@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12815 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12815 Change 12815 by des@des.at.des.thinksec.com on 2002/06/13 06:39:38 Sample configuration file. Affected files ... ... //depot/projects/cryptoki/etc/Makefile#1 add ... //depot/projects/cryptoki/etc/cryptoki.conf#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 7:27:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0B8F37B4F5; Thu, 13 Jun 2002 07:26:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0E10137B4B5 for ; Thu, 13 Jun 2002 07:25:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5DEPfU08847 for perforce@freebsd.org; Thu, 13 Jun 2002 07:25:41 -0700 (PDT) (envelope-from des@freebsd.org) Date: Thu, 13 Jun 2002 07:25:41 -0700 (PDT) Message-Id: <200206131425.g5DEPfU08847@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12818 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12818 Change 12818 by des@des.at.des.thinksec.com on 2002/06/13 07:25:21 Sample PKCS#11 application: list slots and the tokens they contain. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/cryptoki/bin/Makefile#1 add ... //depot/projects/cryptoki/bin/Makefile.inc#1 add ... //depot/projects/cryptoki/bin/slots/Makefile#1 add ... //depot/projects/cryptoki/bin/slots/slots.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 7:29:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 213E937B414; Thu, 13 Jun 2002 07:28:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 20F5737B616 for ; Thu, 13 Jun 2002 07:27:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5DERiS09134 for perforce@freebsd.org; Thu, 13 Jun 2002 07:27:44 -0700 (PDT) (envelope-from des@freebsd.org) Date: Thu, 13 Jun 2002 07:27:44 -0700 (PDT) Message-Id: <200206131427.g5DERiS09134@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12819 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12819 Change 12819 by des@des.at.des.thinksec.com on 2002/06/13 07:27:00 Read configuration file every time C_Initialize() is called. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/cryptoki/lib/C_Initialize.c#4 edit ... //depot/projects/cryptoki/lib/Makefile#4 edit ... //depot/projects/cryptoki/lib/_ck_configure.c#1 add ... //depot/projects/cryptoki/lib/cryptoki_impl.h#2 edit Differences ... ==== //depot/projects/cryptoki/lib/C_Initialize.c#4 (text+ko) ==== @@ -31,19 +31,19 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Initialize.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_Initialize.c#4 $ */ #include #include "cryptoki_impl.h" -int _ck_Initialized; +int _ck_Initialized; -CK_CREATEMUTEX _ck_CreateMutex; -CK_DESTROYMUTEX _ck_DestroyMutex; -CK_LOCKMUTEX _ck_LockMutex; -CK_UNLOCKMUTEX _ck_UnlockMutex; +CK_CREATEMUTEX _ck_CreateMutex; +CK_DESTROYMUTEX _ck_DestroyMutex; +CK_LOCKMUTEX _ck_LockMutex; +CK_UNLOCKMUTEX _ck_UnlockMutex; CK_RV C_Initialize(CK_VOID_PTR pInitArgs) @@ -60,6 +60,8 @@ _ck_UnlockMutex = pArgs->UnlockMutex; /* should check that they're either all set or all clear */ } + if (_ck_configure() == -1) + return (CKR_GENERAL_ERROR); _ck_Initialized = TRUE; return (CKR_OK); ==== //depot/projects/cryptoki/lib/Makefile#4 (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/cryptoki/lib/Makefile#3 $ +# $P4: //depot/projects/cryptoki/lib/Makefile#4 $ # LIB = cryptoki @@ -42,6 +42,7 @@ CFLAGS += -I${.CURDIR}/../include SRCS = +SRCS += _ck_configure.c SRCS += C_CancelFunction.c SRCS += C_CloseAllSessions.c SRCS += C_CloseSession.c ==== //depot/projects/cryptoki/lib/cryptoki_impl.h#2 (text+ko) ==== @@ -31,19 +31,48 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/cryptoki_impl.h#1 $ + * $P4: //depot/projects/cryptoki/lib/cryptoki_impl.h#2 $ */ #ifndef _CRYPTOKI_IMPL_H_INCLUDED #define _CRYPTOKI_IMPL_H_INCLUDED +/* C_Initialize.c */ extern int _ck_Initialized; - extern CK_CREATEMUTEX _ck_CreateMutex; extern CK_DESTROYMUTEX _ck_DestroyMutex; extern CK_LOCKMUTEX _ck_LockMutex; extern CK_UNLOCKMUTEX _ck_UnlockMutex; +/* C_GetInfo.c */ extern CK_INFO _ck_Info; +/* C_GetFunctionList.c */ +extern CK_FUNCTION_LIST _ck_FunctionList; + +/* C_GetSlotList.c */ +typedef struct _ck_slot _ck_slot; +typedef _ck_slot *_ck_slot_ptr; +struct _ck_slot { + CK_ULONG cks_id; + char cks_dev[64]; + enum { + serial, + parallel, + ugen, + } cks_type; + enum { + autodetect, + tzero, + tone, + apdu, + } cks_protocol; +}; + +extern CK_ULONG _ck_NumSlots; +extern _ck_slot_ptr _ck_Slots; + + +int _ck_configure(void); + #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 7:30: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A24337B4BD; Thu, 13 Jun 2002 07:29:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AB4AF37B4A6 for ; Thu, 13 Jun 2002 07:28:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5DESkE09164 for perforce@freebsd.org; Thu, 13 Jun 2002 07:28:46 -0700 (PDT) (envelope-from des@freebsd.org) Date: Thu, 13 Jun 2002 07:28:46 -0700 (PDT) Message-Id: <200206131428.g5DESkE09164@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12820 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12820 Change 12820 by des@des.at.des.thinksec.com on 2002/06/13 07:28:00 Implement C_GetSlotList.c and C_GetSlotInfo.c (the latter isn't completely done) Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/cryptoki/lib/C_GetSlotInfo.c#4 edit ... //depot/projects/cryptoki/lib/C_GetSlotList.c#4 edit Differences ... ==== //depot/projects/cryptoki/lib/C_GetSlotInfo.c#4 (text+ko) ==== @@ -31,17 +31,26 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetSlotInfo.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_GetSlotInfo.c#4 $ */ +#include + #include +#include "cryptoki_impl.h" + CK_RV C_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo) { - (void)slotID; - (void)pInfo; - return (CKR_FUNCTION_NOT_SUPPORTED); + if (pInfo == NULL_PTR || slotID > _ck_NumSlots) + return (CKR_ARGUMENTS_BAD); + memset(pInfo, 0, sizeof *pInfo); + memset(pInfo->slotDescription, ' ', sizeof pInfo->slotDescription); + strncpy(pInfo->slotDescription, _ck_Slots[slotID].cks_dev, + strlen(_ck_Slots[slotID].cks_dev)); + memset(pInfo->manufacturerID, ' ', sizeof pInfo->manufacturerID); + return (CKR_OK); } ==== //depot/projects/cryptoki/lib/C_GetSlotList.c#4 (text+ko) ==== @@ -31,19 +31,40 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GetSlotList.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_GetSlotList.c#4 $ */ #include +#include "cryptoki_impl.h" + +CK_ULONG _ck_NumSlots; +_ck_slot_ptr _ck_Slots; + CK_RV C_GetSlotList(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, CK_ULONG_PTR pulCount) { + CK_SLOT_INFO Slot; + CK_ULONG id, n; + CK_RV rv; - (void)tokenPresent; - (void)pSlotList; - (void)pulCount; - return (CKR_FUNCTION_NOT_SUPPORTED); + if (pulCount == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + for (id = n = 0; id < _ck_NumSlots; ++id) { + if (tokenPresent) + C_GetSlotInfo(id, &Slot); + if (!tokenPresent || (Slot.flags & CKF_TOKEN_PRESENT) != 0) { + if (pSlotList != NULL_PTR && n < *pulCount) + pSlotList[n] = id; + ++n; + } + } + if (pSlotList != NULL_PTR && n > *pulCount) + rv = CKR_BUFFER_TOO_SMALL; + else + rv = CKR_OK; + *pulCount = n; + return (rv); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 7:30:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B49237B41F; Thu, 13 Jun 2002 07:29:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C7DFE37B622 for ; Thu, 13 Jun 2002 07:28:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5DESkl09169 for perforce@freebsd.org; Thu, 13 Jun 2002 07:28:46 -0700 (PDT) (envelope-from des@freebsd.org) Date: Thu, 13 Jun 2002 07:28:46 -0700 (PDT) Message-Id: <200206131428.g5DESkl09169@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12821 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12821 Change 12821 by des@des.at.des.thinksec.com on 2002/06/13 07:28:21 Connect etc and bin to the build. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/cryptoki/Makefile#3 edit Differences ... ==== //depot/projects/cryptoki/Makefile#3 (text+ko) ==== @@ -32,11 +32,13 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/cryptoki/Makefile#2 $ +# $P4: //depot/projects/cryptoki/Makefile#3 $ # SUBDIR = +SUBDIR += etc SUBDIR += include SUBDIR += lib +SUBDIR += bin .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 8:43: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EFEA37B447; Thu, 13 Jun 2002 08:42:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D1B1937B42C for ; Thu, 13 Jun 2002 08:42:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5DFg4B22397 for perforce@freebsd.org; Thu, 13 Jun 2002 08:42:04 -0700 (PDT) (envelope-from des@freebsd.org) Date: Thu, 13 Jun 2002 08:42:04 -0700 (PDT) Message-Id: <200206131542.g5DFg4B22397@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12824 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12824 Change 12824 by des@des.at.des.thinksec.com on 2002/06/13 08:41:03 All the slot types we (plan to) support are hardware slots. Note that USB slots are *not* automatically removable in the PKCS#11 sense. If my interpretation of PKCS#11 is correct, USB key storage tokens are considered "fixed" devices because you can't dissociate the token from the reader. Affected files ... ... //depot/projects/cryptoki/lib/C_GetSlotInfo.c#5 edit Differences ... ==== //depot/projects/cryptoki/lib/C_GetSlotInfo.c#5 (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/cryptoki/lib/C_GetSlotInfo.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_GetSlotInfo.c#5 $ */ #include @@ -52,5 +52,12 @@ strncpy(pInfo->slotDescription, _ck_Slots[slotID].cks_dev, strlen(_ck_Slots[slotID].cks_dev)); memset(pInfo->manufacturerID, ' ', sizeof pInfo->manufacturerID); + switch (_ck_Slots[slotID].cks_type) { + case serial: + case parallel: + case ugen: + pInfo->flags |= CKF_HW_SLOT; + break; + } return (CKR_OK); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 8:46:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A945337B43E; Thu, 13 Jun 2002 08:46:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 31E4637B41A for ; Thu, 13 Jun 2002 08:46:01 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5DFj9E22711 for perforce@freebsd.org; Thu, 13 Jun 2002 08:45:09 -0700 (PDT) (envelope-from des@freebsd.org) Date: Thu, 13 Jun 2002 08:45:09 -0700 (PDT) Message-Id: <200206131545.g5DFj9E22711@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12826 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12826 Change 12826 by des@des.at.des.thinksec.com on 2002/06/13 08:44:41 Show (most) token characteristics as well as slot characteristics. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/cryptoki/bin/slots/slots.c#2 edit Differences ... ==== //depot/projects/cryptoki/bin/slots/slots.c#2 (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/cryptoki/bin/slots/slots.c#1 $ + * $P4: //depot/projects/cryptoki/bin/slots/slots.c#2 $ */ #include @@ -45,48 +45,135 @@ static int a_flag; /* show all slots */ static int v_flag; /* verbose */ +#define TERMINATE(str) \ + terminate(str, sizeof str) +#define PRINT_FLAG(flags, flag) \ + do { if ((flags) & flag) printf(" %s", #flag); } while (0) + +static void +terminate(char *str, size_t len) +{ + int n; + + for (n = len - 1; n >= 0; --n) + if (isspace(str[n])) + str[n] = '\0'; + else + break; +} + static void +show_token(CK_SLOT_ID ulSlotID) +{ + CK_TOKEN_INFO TokenInfo; + CK_RV rv; + + rv = C_GetTokenInfo(ulSlotID, &TokenInfo); + switch (rv) { + case CKR_OK: + break; + case CKR_FUNCTION_NOT_SUPPORTED: /* XXX */ + case CKR_TOKEN_NOT_PRESENT: + printf(" (no token)"); + return; + case CKR_TOKEN_NOT_RECOGNIZED: + printf(" (unrecognized token)"); + return; + default: + errx(1, "C_GetTokenInfo(%lu): 0x%x", ulSlotID, rv); + } + TERMINATE(TokenInfo.label); + TERMINATE(TokenInfo.manufacturerID); + TERMINATE(TokenInfo.model); + TERMINATE(TokenInfo.serialNumber); + if (v_flag) { + printf(" token label: %.*s\n", + (int)(sizeof TokenInfo.label), + TokenInfo.label); + printf(" token manufacturer: %.*s\n", + (int)(sizeof TokenInfo.manufacturerID), + TokenInfo.manufacturerID); + printf(" token model: %.*s\n", + (int)(sizeof TokenInfo.model), + TokenInfo.model); + printf(" token hardware version: %d.%d\n", + TokenInfo.hardwareVersion.major, + TokenInfo.hardwareVersion.minor); + printf(" token firmware version: %d.%d\n", + TokenInfo.firmwareVersion.major, + TokenInfo.firmwareVersion.minor); + printf(" token serial number: %.*s\n", + (int)(sizeof TokenInfo.serialNumber), + TokenInfo.serialNumber); + printf(" token flags:"); + PRINT_FLAG(TokenInfo.flags, CKF_RNG); + PRINT_FLAG(TokenInfo.flags, CKF_WRITE_PROTECTED); + PRINT_FLAG(TokenInfo.flags, CKF_LOGIN_REQUIRED); + PRINT_FLAG(TokenInfo.flags, CKF_USER_PIN_INITIALIZED); + PRINT_FLAG(TokenInfo.flags, CKF_RESTORE_KEY_NOT_NEEDED); + PRINT_FLAG(TokenInfo.flags, CKF_CLOCK_ON_TOKEN); + PRINT_FLAG(TokenInfo.flags, CKF_PROTECTED_AUTHENTICATION_PATH); + PRINT_FLAG(TokenInfo.flags, CKF_DUAL_CRYPTO_OPERATIONS); + PRINT_FLAG(TokenInfo.flags, CKF_TOKEN_INITIALIZED); + PRINT_FLAG(TokenInfo.flags, CKF_SECONDARY_AUTHENTICATION); + PRINT_FLAG(TokenInfo.flags, CKF_USER_PIN_COUNT_LOW); + PRINT_FLAG(TokenInfo.flags, CKF_USER_PIN_FINAL_TRY); + PRINT_FLAG(TokenInfo.flags, CKF_USER_PIN_LOCKED); + PRINT_FLAG(TokenInfo.flags, CKF_USER_PIN_TO_BE_CHANGED); + PRINT_FLAG(TokenInfo.flags, CKF_SO_PIN_COUNT_LOW); + PRINT_FLAG(TokenInfo.flags, CKF_SO_PIN_FINAL_TRY); + PRINT_FLAG(TokenInfo.flags, CKF_SO_PIN_LOCKED); + PRINT_FLAG(TokenInfo.flags, CKF_SO_PIN_TO_BE_CHANGED); + printf("\n"); + if (TokenInfo.flags & CKF_CLOCK_ON_TOKEN) + printf(" token wall time: %.*s UTC", + (int)(sizeof TokenInfo.utcTime), + TokenInfo.utcTime); + } else { + printf(" \"%.*s\"", + (int)(sizeof TokenInfo.label), + TokenInfo.label); + } +} + +static void show_slot(CK_SLOT_ID ulSlotID) { CK_SLOT_INFO SlotInfo; CK_RV rv; - int n; rv = C_GetSlotInfo(ulSlotID, &SlotInfo); if (rv != CKR_OK) errx(1, "C_GetSlotInfo(%lu): 0x%x", ulSlotID, rv); - for (n = (sizeof SlotInfo.slotDescription) - 1; n >= 0; --n) - if (isspace(SlotInfo.slotDescription[n])) - SlotInfo.slotDescription[n] = '\0'; - else - break; - for (n = (sizeof SlotInfo.manufacturerID) - 1; n >= 0; --n) - if (isspace(SlotInfo.manufacturerID[n])) - SlotInfo.manufacturerID[n] = '\0'; - else - break; - printf("Slot %lu:\n", ulSlotID); - printf(" decription: %s\n", SlotInfo.slotDescription); - printf(" manufacturer: %s\n", SlotInfo.manufacturerID); + TERMINATE(SlotInfo.slotDescription); + TERMINATE(SlotInfo.manufacturerID); if (v_flag) { - printf(" flags:"); - if (SlotInfo.flags & CKF_TOKEN_PRESENT) - printf(" CKF_TOKEN_PRESENT"); - if (SlotInfo.flags & CKF_REMOVABLE_DEVICE) - printf(" CKF_REMOVABLE_DEVICE"); - if (SlotInfo.flags & CKF_HW_SLOT) - printf(" CKF_HW_SLOT"); - printf("\n"); - printf(" hardware version: %d.%d\n", + printf("Slot %lu:\n", ulSlotID); + printf(" decription: %.*s\n", + (int)(sizeof SlotInfo.slotDescription), + SlotInfo.slotDescription); + printf(" manufacturer: %.*s\n", + (int)(sizeof SlotInfo.manufacturerID), + SlotInfo.manufacturerID); + printf(" hardware version: %d.%d\n", SlotInfo.hardwareVersion.major, SlotInfo.hardwareVersion.major); - printf(" firmware version: %d.%d\n", + printf(" firmware version: %d.%d\n", SlotInfo.firmwareVersion.major, SlotInfo.firmwareVersion.major); + printf(" flags:"); + PRINT_FLAG(SlotInfo.flags, CKF_TOKEN_PRESENT); + PRINT_FLAG(SlotInfo.flags, CKF_REMOVABLE_DEVICE); + PRINT_FLAG(SlotInfo.flags, CKF_HW_SLOT); + printf("\n"); + } else { + printf("%.*s (%.*s):", + (int)(sizeof SlotInfo.slotDescription), + SlotInfo.slotDescription, + (int)(sizeof SlotInfo.manufacturerID), + SlotInfo.manufacturerID); } - if (SlotInfo.flags & CKF_TOKEN_PRESENT) { - /* print token information */ - } + show_token(ulSlotID); printf("\n"); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 9:48:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 607D837B43D; Thu, 13 Jun 2002 09:48:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6AB0137B409 for ; Thu, 13 Jun 2002 09:48:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5DGiLB33869 for perforce@freebsd.org; Thu, 13 Jun 2002 09:44:21 -0700 (PDT) (envelope-from green@freebsd.org) Date: Thu, 13 Jun 2002 09:44:21 -0700 (PDT) Message-Id: <200206131644.g5DGiLB33869@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 12831 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12831 Change 12831 by green@green_laptop_1 on 2002/06/13 09:44:08 The zombie_thread_lock can't be a MTX_SPIN if you want to sleep with it held. Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#66 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#66 (text+ko) ==== @@ -75,7 +75,7 @@ tdlist_head_t zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads); struct mtx zombie_thread_lock; MTX_SYSINIT(zombie_thread_lock, &zombie_thread_lock, - "zombie_thread_lock", MTX_SPIN); + "zombie_thread_lock", MTX_DEF); /* * Pepare a thread for use. @@ -241,9 +241,9 @@ void thread_stash(struct thread *td) { - mtx_lock_spin(&zombie_thread_lock); + mtx_lock(&zombie_thread_lock); TAILQ_INSERT_HEAD(&zombie_threads, td, td_runq); - mtx_unlock_spin(&zombie_thread_lock); + mtx_unlock(&zombie_thread_lock); } /* @@ -254,7 +254,7 @@ { struct thread *td_reaped, *td_next; - mtx_lock_spin(&zombie_thread_lock); + mtx_lock(&zombie_thread_lock); td_reaped = TAILQ_FIRST(&zombie_threads); while (td_reaped) { td_next = TAILQ_NEXT(td_reaped, td_runq); @@ -262,7 +262,7 @@ thread_free(td_reaped); td_reaped = td_next; } - mtx_unlock_spin(&zombie_thread_lock); + mtx_unlock(&zombie_thread_lock); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 9:54: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3A2937B49A; Thu, 13 Jun 2002 09:53:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by hub.freebsd.org (Postfix) with ESMTP id A195137B48C for ; Thu, 13 Jun 2002 09:53:32 -0700 (PDT) Received: (qmail 24293 invoked from network); 13 Jun 2002 16:53:31 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 13 Jun 2002 16:53:31 -0000 Received: from laptop.baldwin.cx ([206.187.69.208]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g5DGrTQ89983; Thu, 13 Jun 2002 12:53:29 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200206131644.g5DGiLB33869@freefall.freebsd.org> Date: Thu, 13 Jun 2002 12:53:23 -0400 (EDT) From: John Baldwin To: Brian Feldman Subject: RE: PERFORCE change 12831 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 13-Jun-2002 Brian Feldman wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12831 > > Change 12831 by green@green_laptop_1 on 2002/06/13 09:44:08 > > The zombie_thread_lock can't be a MTX_SPIN if you want to sleep with > it held. EEK!! Don't do this! It _has_ to be a spin lock. What you probably need to do, is drop it around thread_free(). -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 11: 1: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B5AF37B407; Thu, 13 Jun 2002 11:00:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0D06A37B430 for ; Thu, 13 Jun 2002 11:00:55 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5DI0tp46864 for perforce@freebsd.org; Thu, 13 Jun 2002 11:00:55 -0700 (PDT) (envelope-from green@freebsd.org) Date: Thu, 13 Jun 2002 11:00:55 -0700 (PDT) Message-Id: <200206131800.g5DI0tp46864@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 12837 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12837 Change 12837 by green@green_laptop_1 on 2002/06/13 11:00:16 Make zombie_thread_lock back into a spin lock and remove the condition where it could sleep; then, make the kernel actually able to boot by adding it to witness's lock order list!!! Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#67 edit ... //depot/projects/kse/sys/kern/subr_witness.c#27 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#67 (text+ko) ==== @@ -75,7 +75,7 @@ tdlist_head_t zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads); struct mtx zombie_thread_lock; MTX_SYSINIT(zombie_thread_lock, &zombie_thread_lock, - "zombie_thread_lock", MTX_DEF); + "zombie_thread_lock", MTX_SPIN); /* * Pepare a thread for use. @@ -241,9 +241,9 @@ void thread_stash(struct thread *td) { - mtx_lock(&zombie_thread_lock); + mtx_lock_spin(&zombie_thread_lock); TAILQ_INSERT_HEAD(&zombie_threads, td, td_runq); - mtx_unlock(&zombie_thread_lock); + mtx_unlock_spin(&zombie_thread_lock); } /* @@ -252,18 +252,17 @@ void thread_reap(void) { - struct thread *td_reaped, *td_next; + struct thread *td_reaped; - mtx_lock(&zombie_thread_lock); - td_reaped = TAILQ_FIRST(&zombie_threads); - while (td_reaped) { - td_next = TAILQ_NEXT(td_reaped, td_runq); + mtx_lock_spin(&zombie_thread_lock); + while (!TAILQ_EMPTY(&zombie_threads)) { + td_reaped = TAILQ_FIRST(&zombie_threads); TAILQ_REMOVE(&zombie_threads, td_reaped, td_runq); + mtx_unlock_spin(&zombie_thread_lock); thread_free(td_reaped); - td_reaped = td_next; + mtx_lock_spin(&zombie_thread_lock); } - mtx_unlock(&zombie_thread_lock); - + mtx_unlock_spin(&zombie_thread_lock); } /* ==== //depot/projects/kse/sys/kern/subr_witness.c#27 (text+ko) ==== @@ -225,6 +225,7 @@ #endif { "clk", &lock_class_mtx_spin }, { "mutex profiling lock", &lock_class_mtx_spin }, + { "zombie_thread_lock", &lock_class_mtx_spin }, { NULL, NULL }, { NULL, NULL } }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 11:41:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5861237B426; Thu, 13 Jun 2002 11:41:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from sccrmhc01.attbi.com (sccrmhc01.attbi.com [204.127.202.61]) by hub.freebsd.org (Postfix) with ESMTP id C6A9737B40D; Thu, 13 Jun 2002 11:41:32 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc01.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020613184008.GPNQ1024.sccrmhc01.attbi.com@InterJet.elischer.org>; Thu, 13 Jun 2002 18:40:08 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id LAA95048; Thu, 13 Jun 2002 11:30:12 -0700 (PDT) Date: Thu, 13 Jun 2002 11:30:11 -0700 (PDT) From: Julian Elischer To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 12837 for review In-Reply-To: <200206131800.g5DI0tp46864@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG thanks.. I had to rush off last night after jhb and I added that and we didn't have time to test it yet.. On Thu, 13 Jun 2002, Brian Feldman wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12837 > > Change 12837 by green@green_laptop_1 on 2002/06/13 11:00:16 > > Make zombie_thread_lock back into a spin lock and remove the > condition where it could sleep; then, make the kernel actually > able to boot by adding it to witness's lock order list!!! > > Affected files ... > > ... //depot/projects/kse/sys/kern/kern_thread.c#67 edit > ... //depot/projects/kse/sys/kern/subr_witness.c#27 edit > > Differences ... > > ==== //depot/projects/kse/sys/kern/kern_thread.c#67 (text+ko) ==== > > @@ -75,7 +75,7 @@ > tdlist_head_t zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads); > struct mtx zombie_thread_lock; > MTX_SYSINIT(zombie_thread_lock, &zombie_thread_lock, > - "zombie_thread_lock", MTX_DEF); > + "zombie_thread_lock", MTX_SPIN); > > /* > * Pepare a thread for use. > @@ -241,9 +241,9 @@ > void > thread_stash(struct thread *td) > { > - mtx_lock(&zombie_thread_lock); > + mtx_lock_spin(&zombie_thread_lock); > TAILQ_INSERT_HEAD(&zombie_threads, td, td_runq); > - mtx_unlock(&zombie_thread_lock); > + mtx_unlock_spin(&zombie_thread_lock); > } > > /* > @@ -252,18 +252,17 @@ > void > thread_reap(void) > { > - struct thread *td_reaped, *td_next; > + struct thread *td_reaped; > > - mtx_lock(&zombie_thread_lock); > - td_reaped = TAILQ_FIRST(&zombie_threads); > - while (td_reaped) { > - td_next = TAILQ_NEXT(td_reaped, td_runq); > + mtx_lock_spin(&zombie_thread_lock); > + while (!TAILQ_EMPTY(&zombie_threads)) { > + td_reaped = TAILQ_FIRST(&zombie_threads); > TAILQ_REMOVE(&zombie_threads, td_reaped, td_runq); > + mtx_unlock_spin(&zombie_thread_lock); > thread_free(td_reaped); > - td_reaped = td_next; > + mtx_lock_spin(&zombie_thread_lock); > } > - mtx_unlock(&zombie_thread_lock); > - > + mtx_unlock_spin(&zombie_thread_lock); > } > > /* > > ==== //depot/projects/kse/sys/kern/subr_witness.c#27 (text+ko) ==== > > @@ -225,6 +225,7 @@ > #endif > { "clk", &lock_class_mtx_spin }, > { "mutex profiling lock", &lock_class_mtx_spin }, > + { "zombie_thread_lock", &lock_class_mtx_spin }, > { NULL, NULL }, > { NULL, NULL } > }; > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 14:55: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDCD037B420; Thu, 13 Jun 2002 14:54:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AFBC237B40E for ; Thu, 13 Jun 2002 14:54:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5DLsdI94708 for perforce@freebsd.org; Thu, 13 Jun 2002 14:54:39 -0700 (PDT) (envelope-from green@freebsd.org) Date: Thu, 13 Jun 2002 14:54:39 -0700 (PDT) Message-Id: <200206132154.g5DLsdI94708@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 12848 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12848 Change 12848 by green@green_laptop_1 on 2002/06/13 14:54:02 Readd the rest of the ^T status display. Affected files ... ... //depot/projects/kse/sys/kern/tty.c#26 edit Differences ... ==== //depot/projects/kse/sys/kern/tty.c#26 (text+ko) ==== @@ -2411,6 +2411,9 @@ pgtok(vmspace_resident_count(pick->p_vmspace)))); mtx_unlock_spin(&sched_lock); + ttyprintf(tp, " cmd: %s %d [%s] ", pick->p_comm, + pick->p_pid, stmp); + /* Print user time. */ ttyprintf(tp, "%ld.%02ldu ", utime.tv_sec, utime.tv_usec / 10000); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 15:52: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B832037B404; Thu, 13 Jun 2002 15:52:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 88DF637B410; Thu, 13 Jun 2002 15:51:59 -0700 (PDT) Received: from localhost (green@localhost) by green.bikeshed.org (8.11.6/8.11.6) with ESMTP id g5DMpxX56277; Thu, 13 Jun 2002 18:51:59 -0400 (EDT) (envelope-from green@green.bikeshed.org) Message-Id: <200206132251.g5DMpxX56277@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 12837 for review In-Reply-To: Your message of "Thu, 13 Jun 2002 11:00:55 PDT." <200206131800.g5DI0tp46864@freefall.freebsd.org> From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 13 Jun 2002 18:51:59 -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Brian Feldman wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12837 > > Change 12837 by green@green_laptop_1 on 2002/06/13 11:00:16 > > Make zombie_thread_lock back into a spin lock and remove the > condition where it could sleep; then, make the kernel actually > able to boot by adding it to witness's lock order list!!! I'm still having some problems, though. Try this test case: #include #include #include #include #include #include #include int main() { pid_t forkedpid, wpid; int status; forkedpid = fork(); if (forkedpid == 0) { printf("child %d pausing\n", (int)getpid()); sleep(1); printf("child %d raising TSTP\n", (int)getpid()); raise(SIGTSTP); printf("child %d raising STOP\n", (int)getpid()); raise(SIGSTOP); printf("child %d exiting\n", (int)getpid()); exit(0); } printf("parent %d waiting for child %d\n", (int)getpid(), (int)forkedpid); wpid = waitpid(forkedpid, &status, 0); if (wpid == -1) err(1, "waitpid"); printf("child wait code: %#x\n", status); kill(forkedpid, SIGKILL); exit(0); } -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 16:43:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC40737B415; Thu, 13 Jun 2002 16:43:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by hub.freebsd.org (Postfix) with ESMTP id 341D537B406 for ; Thu, 13 Jun 2002 16:43:08 -0700 (PDT) Received: by flood.ping.uio.no (Postfix, from userid 2602) id B19B65362; Fri, 14 Jun 2002 01:43:05 +0200 (CEST) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: Perforce Change Reviews Subject: Re: PERFORCE change 12856 for review References: <200206132341.g5DNf7N15681@freefall.freebsd.org> From: Dag-Erling Smorgrav Date: 14 Jun 2002 01:43:03 +0200 In-Reply-To: <200206132341.g5DNf7N15681@freefall.freebsd.org> Message-ID: Lines: 9 User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/21.2 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Dag-Erling Smorgrav writes: > Implement session handle {,de}allocation. Add argument checks to > most functions, to the extend possible at this time. extent, even. DES -- Dag-Erling Smorgrav - des@ofug.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 16:44:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DBA037B404; Thu, 13 Jun 2002 16:41:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 458F137B428 for ; Thu, 13 Jun 2002 16:41:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5DNf7N15681 for perforce@freebsd.org; Thu, 13 Jun 2002 16:41:07 -0700 (PDT) (envelope-from des@freebsd.org) Date: Thu, 13 Jun 2002 16:41:07 -0700 (PDT) Message-Id: <200206132341.g5DNf7N15681@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12856 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12856 Change 12856 by des@des.at.des.thinksec.com on 2002/06/13 16:41:07 Implement session handle {,de}allocation. Add argument checks to most functions, to the extend possible at this time. Sponsored by: DARPA, NAI Labs Affected files ... ... //depot/projects/cryptoki/lib/C_CancelFunction.c#4 edit ... //depot/projects/cryptoki/lib/C_CloseAllSessions.c#4 edit ... //depot/projects/cryptoki/lib/C_CloseSession.c#4 edit ... //depot/projects/cryptoki/lib/C_CopyObject.c#4 edit ... //depot/projects/cryptoki/lib/C_CreateObject.c#4 edit ... //depot/projects/cryptoki/lib/C_Decrypt.c#4 edit ... //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#4 edit ... //depot/projects/cryptoki/lib/C_DecryptFinal.c#4 edit ... //depot/projects/cryptoki/lib/C_DecryptInit.c#4 edit ... //depot/projects/cryptoki/lib/C_DecryptUpdate.c#4 edit ... //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#4 edit ... //depot/projects/cryptoki/lib/C_DeriveKey.c#4 edit ... //depot/projects/cryptoki/lib/C_DestroyObject.c#4 edit ... //depot/projects/cryptoki/lib/C_Digest.c#4 edit ... //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#4 edit ... //depot/projects/cryptoki/lib/C_DigestFinal.c#4 edit ... //depot/projects/cryptoki/lib/C_DigestInit.c#4 edit ... //depot/projects/cryptoki/lib/C_DigestKey.c#4 edit ... //depot/projects/cryptoki/lib/C_DigestUpdate.c#4 edit ... //depot/projects/cryptoki/lib/C_Encrypt.c#4 edit ... //depot/projects/cryptoki/lib/C_EncryptFinal.c#4 edit ... //depot/projects/cryptoki/lib/C_EncryptInit.c#4 edit ... //depot/projects/cryptoki/lib/C_EncryptUpdate.c#4 edit ... //depot/projects/cryptoki/lib/C_Finalize.c#4 edit ... //depot/projects/cryptoki/lib/C_FindObjects.c#4 edit ... //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#4 edit ... //depot/projects/cryptoki/lib/C_FindObjectsInit.c#4 edit ... //depot/projects/cryptoki/lib/C_GenerateKey.c#4 edit ... //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#4 edit ... //depot/projects/cryptoki/lib/C_GenerateRandom.c#4 edit ... //depot/projects/cryptoki/lib/C_GetAttributeValue.c#4 edit ... //depot/projects/cryptoki/lib/C_GetFunctionList.c#5 edit ... //depot/projects/cryptoki/lib/C_GetFunctionStatus.c#4 edit ... //depot/projects/cryptoki/lib/C_GetInfo.c#4 edit ... //depot/projects/cryptoki/lib/C_GetMechanismInfo.c#4 edit ... //depot/projects/cryptoki/lib/C_GetMechanismList.c#4 edit ... //depot/projects/cryptoki/lib/C_GetObjectSize.c#4 edit ... //depot/projects/cryptoki/lib/C_GetOperationState.c#4 edit ... //depot/projects/cryptoki/lib/C_GetSessionInfo.c#4 edit ... //depot/projects/cryptoki/lib/C_GetSlotInfo.c#6 edit ... //depot/projects/cryptoki/lib/C_GetSlotList.c#5 edit ... //depot/projects/cryptoki/lib/C_GetTokenInfo.c#4 edit ... //depot/projects/cryptoki/lib/C_InitPIN.c#4 edit ... //depot/projects/cryptoki/lib/C_InitToken.c#4 edit ... //depot/projects/cryptoki/lib/C_Initialize.c#5 edit ... //depot/projects/cryptoki/lib/C_Login.c#4 edit ... //depot/projects/cryptoki/lib/C_Logout.c#4 edit ... //depot/projects/cryptoki/lib/C_OpenSession.c#4 edit ... //depot/projects/cryptoki/lib/C_SeedRandom.c#4 edit ... //depot/projects/cryptoki/lib/C_SetAttributeValue.c#4 edit ... //depot/projects/cryptoki/lib/C_SetOperationState.c#4 edit ... //depot/projects/cryptoki/lib/C_SetPIN.c#4 edit ... //depot/projects/cryptoki/lib/C_Sign.c#4 edit ... //depot/projects/cryptoki/lib/C_SignEncryptUpdate.c#4 edit ... //depot/projects/cryptoki/lib/C_SignFinal.c#4 edit ... //depot/projects/cryptoki/lib/C_SignInit.c#4 edit ... //depot/projects/cryptoki/lib/C_SignRecover.c#4 edit ... //depot/projects/cryptoki/lib/C_SignRecoverInit.c#4 edit ... //depot/projects/cryptoki/lib/C_SignUpdate.c#4 edit ... //depot/projects/cryptoki/lib/C_UnwrapKey.c#4 edit ... //depot/projects/cryptoki/lib/C_Verify.c#4 edit ... //depot/projects/cryptoki/lib/C_VerifyFinal.c#4 edit ... //depot/projects/cryptoki/lib/C_VerifyInit.c#4 edit ... //depot/projects/cryptoki/lib/C_VerifyRecover.c#4 edit ... //depot/projects/cryptoki/lib/C_VerifyRecoverInit.c#4 edit ... //depot/projects/cryptoki/lib/C_VerifyUpdate.c#4 edit ... //depot/projects/cryptoki/lib/C_WaitForSlotEvent.c#4 edit ... //depot/projects/cryptoki/lib/C_WrapKey.c#4 edit ... //depot/projects/cryptoki/lib/Makefile#5 edit ... //depot/projects/cryptoki/lib/_ck_session_delete.c#1 add ... //depot/projects/cryptoki/lib/_ck_session_find.c#1 add ... //depot/projects/cryptoki/lib/_ck_session_new.c#1 add ... //depot/projects/cryptoki/lib/cryptoki_impl.h#3 edit Differences ... ==== //depot/projects/cryptoki/lib/C_CancelFunction.c#4 (text+ko) ==== @@ -31,15 +31,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_CancelFunction.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_CancelFunction.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_CancelFunction(CK_SESSION_HANDLE hSession) { + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); (void)hSession; - return (CKR_FUNCTION_NOT_SUPPORTED); + return (CKR_FUNCTION_NOT_PARALLEL); } ==== //depot/projects/cryptoki/lib/C_CloseAllSessions.c#4 (text+ko) ==== @@ -31,15 +31,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_CloseAllSessions.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_CloseAllSessions.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_CloseAllSessions(CK_SLOT_ID slotID) { - (void)slotID; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (slotID > _ck_NumSlots) + return (CKR_ARGUMENTS_BAD); return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_CloseSession.c#4 (text+ko) ==== @@ -31,15 +31,19 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_CloseSession.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_CloseSession.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_CloseSession(CK_SESSION_HANDLE hSession) { + _ck_session_ptr pSession; - (void)hSession; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_CopyObject.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_CopyObject.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_CopyObject.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_CopyObject(CK_SESSION_HANDLE hSession, @@ -43,10 +43,15 @@ CK_ULONG ulCount, CK_OBJECT_HANDLE_PTR phNewObject) { + _ck_session_ptr pSession; - (void)hSession; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pTemplate == NULL_PTR || phNewObject == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)hObject; - (void)pTemplate; (void)ulCount; (void)phNewObject; return (CKR_FUNCTION_NOT_SUPPORTED); ==== //depot/projects/cryptoki/lib/C_CreateObject.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_CreateObject.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_CreateObject.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_CreateObject(CK_SESSION_HANDLE hSession, @@ -42,10 +42,14 @@ CK_ULONG ulCount, CK_OBJECT_HANDLE_PTR phObject) { + _ck_session_ptr pSession; - (void)hSession; - (void)pTemplate; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pTemplate == NULL_PTR || phObject == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)ulCount; - (void)phObject; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_Decrypt.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Decrypt.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_Decrypt.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_Decrypt(CK_SESSION_HANDLE hSession, @@ -43,11 +43,15 @@ CK_BYTE_PTR pData, CK_ULONG_PTR pulDataLen) { + _ck_session_ptr pSession; - (void)hSession; - (void)pEncryptedData; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pEncryptedData == NULL_PTR || pData == NULL_PTR || + pulDataLen == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)ulEncryptedDataLen; - (void)pData; - (void)pulDataLen; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptDigestUpdate.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_DecryptDigestUpdate(CK_SESSION_HANDLE hSession, @@ -43,11 +43,15 @@ CK_BYTE_PTR pPart, CK_ULONG_PTR pulPartLen) { + _ck_session_ptr pSession; - (void)hSession; - (void)pEncryptedPart; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pEncryptedPart == NULL_PTR || pPart == NULL_PTR || + pulPartLen == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)ulEncryptedPartLen; - (void)pPart; - (void)pulPartLen; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DecryptFinal.c#4 (text+ko) ==== @@ -31,19 +31,23 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DecryptFinal.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptFinal.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_DecryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pLastPart, CK_ULONG_PTR pulLastPartLen) { + _ck_session_ptr pSession; - (void)hSession; - (void)pLastPart; - (void)pulLastPartLen; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pLastPart == NULL_PTR || pulLastPartLen == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DecryptInit.c#4 (text+ko) ==== @@ -31,19 +31,24 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DecryptInit.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptInit.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_DecryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_OBJECT_HANDLE hKey) { + _ck_session_ptr pSession; - (void)hSession; - (void)pMechanism; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pMechanism == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)hKey; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DecryptUpdate.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DecryptUpdate.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptUpdate.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_DecryptUpdate(CK_SESSION_HANDLE hSession, @@ -43,11 +43,15 @@ CK_BYTE_PTR pPart, CK_ULONG_PTR pulPartLen) { + _ck_session_ptr pSession; - (void)hSession; - (void)pEncryptedPart; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pEncryptedPart == NULL_PTR || pPart == NULL_PTR || + pulPartLen == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)ulEncryptedPartLen; - (void)pPart; - (void)pulPartLen; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_DecryptVerifyUpdate.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_DecryptVerifyUpdate(CK_SESSION_HANDLE hSession, @@ -43,11 +43,15 @@ CK_BYTE_PTR pPart, CK_ULONG_PTR pulPartLen) { + _ck_session_ptr pSession; - (void)hSession; - (void)pEncryptedPart; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pEncryptedPart == NULL_PTR || pPart == NULL_PTR || + pulPartLen == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)ulEncryptedPartLen; - (void)pPart; - (void)pulPartLen; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DeriveKey.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DeriveKey.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_DeriveKey.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_DeriveKey(CK_SESSION_HANDLE hSession, @@ -44,12 +44,16 @@ CK_ULONG ulAttributeCount, CK_OBJECT_HANDLE_PTR phKey) { + _ck_session_ptr pSession; - (void)hSession; - (void)pMechanism; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pMechanism == NULL_PTR || pTemplate == NULL_PTR || + phKey == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)hBaseKey; - (void)pTemplate; (void)ulAttributeCount; - (void)phKey; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DestroyObject.c#4 (text+ko) ==== @@ -31,17 +31,21 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DestroyObject.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_DestroyObject.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject) { + _ck_session_ptr pSession; - (void)hSession; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)hObject; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_Digest.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Digest.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_Digest.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_Digest(CK_SESSION_HANDLE hSession, @@ -43,11 +43,15 @@ CK_BYTE_PTR pDigest, CK_ULONG_PTR pulDigestLen) { + _ck_session_ptr pSession; - (void)hSession; - (void)pData; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pData == NULL_PTR || pDigest == NULL_PTR || + pulDigestLen == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)ulDataLen; - (void)pDigest; - (void)pulDigestLen; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestEncryptUpdate.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_DigestEncryptUpdate(CK_SESSION_HANDLE hSession, @@ -43,11 +43,15 @@ CK_BYTE_PTR pEncryptedPart, CK_ULONG_PTR pulEncryptedPartLen) { + _ck_session_ptr pSession; - (void)hSession; - (void)pPart; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pPart == NULL_PTR || pEncryptedPart == NULL_PTR || + pulEncryptedPartLen == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)ulPartLen; - (void)pEncryptedPart; - (void)pulEncryptedPartLen; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DigestFinal.c#4 (text+ko) ==== @@ -31,19 +31,23 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DigestFinal.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestFinal.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_DigestFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pDigest, CK_ULONG_PTR pulDigestLen) { + _ck_session_ptr pSession; - (void)hSession; - (void)pDigest; - (void)pulDigestLen; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pDigest == NULL_PTR || pulDigestLen == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DigestInit.c#4 (text+ko) ==== @@ -31,17 +31,22 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DigestInit.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestInit.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism) { + _ck_session_ptr pSession; - (void)hSession; - (void)pMechanism; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pMechanism == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_DigestKey.c#4 (text+ko) ==== @@ -31,16 +31,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DigestKey.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestKey.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_DigestKey(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hKey) { + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); (void)hSession; (void)hKey; return (CKR_FUNCTION_NOT_SUPPORTED); ==== //depot/projects/cryptoki/lib/C_DigestUpdate.c#4 (text+ko) ==== @@ -31,19 +31,24 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_DigestUpdate.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_DigestUpdate.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_DigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_ULONG ulPartLen) { + _ck_session_ptr pSession; - (void)hSession; - (void)pPart; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pPart == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)ulPartLen; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_Encrypt.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Encrypt.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_Encrypt.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_Encrypt(CK_SESSION_HANDLE hSession, @@ -43,11 +43,15 @@ CK_BYTE_PTR pEncryptedData, CK_ULONG_PTR pulEncryptedDataLen) { + _ck_session_ptr pSession; - (void)hSession; - (void)pData; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pData == NULL_PTR || pEncryptedData == NULL_PTR || + pulEncryptedDataLen == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)ulDataLen; - (void)pEncryptedData; - (void)pulEncryptedDataLen; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_EncryptFinal.c#4 (text+ko) ==== @@ -31,19 +31,24 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_EncryptFinal.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_EncryptFinal.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_EncryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pLastEncryptedPart, CK_ULONG_PTR pulLastEncryptedPartLen) { + _ck_session_ptr pSession; - (void)hSession; - (void)pLastEncryptedPart; - (void)pulLastEncryptedPartLen; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pLastEncryptedPart == NULL_PTR || + pulLastEncryptedPartLen == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_EncryptInit.c#4 (text+ko) ==== @@ -31,19 +31,24 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_EncryptInit.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_EncryptInit.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_EncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism, CK_OBJECT_HANDLE hKey) { + _ck_session_ptr pSession; - (void)hSession; - (void)pMechanism; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pMechanism == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)hKey; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_EncryptUpdate.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_EncryptUpdate.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_EncryptUpdate.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_EncryptUpdate(CK_SESSION_HANDLE hSession, @@ -43,11 +43,15 @@ CK_BYTE_PTR pEncryptedPart, CK_ULONG_PTR pulEncryptedPartLen) { + _ck_session_ptr pSession; - (void)hSession; - (void)pPart; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pPart == NULL_PTR || pEncryptedPart == NULL_PTR || + pulEncryptedPartLen == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)ulPartLen; - (void)pEncryptedPart; - (void)pulEncryptedPartLen; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_Finalize.c#4 (text+ko) ==== @@ -31,11 +31,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_Finalize.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_Finalize.c#4 $ */ -#include - #include "cryptoki_impl.h" CK_RV ==== //depot/projects/cryptoki/lib/C_FindObjects.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_FindObjects.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_FindObjects.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_FindObjects(CK_SESSION_HANDLE hSession, @@ -42,10 +42,14 @@ CK_ULONG ulMaxObjectCount, CK_ULONG_PTR pulObjectCount) { + _ck_session_ptr pSession; - (void)hSession; - (void)phObject; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (phObject == NULL_PTR || pulObjectCount == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)ulMaxObjectCount; - (void)pulObjectCount; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#4 (text+ko) ==== @@ -31,15 +31,19 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_FindObjectsFinal.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_FindObjectsFinal(CK_SESSION_HANDLE hSession) { + _ck_session_ptr pSession; - (void)hSession; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_FindObjectsInit.c#4 (text+ko) ==== @@ -31,19 +31,24 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_FindObjectsInit.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_FindObjectsInit.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_FindObjectsInit(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulCount) { + _ck_session_ptr pSession; - (void)hSession; - (void)pTemplate; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pTemplate == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)ulCount; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GenerateKey.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GenerateKey.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_GenerateKey.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_GenerateKey(CK_SESSION_HANDLE hSession, @@ -43,11 +43,15 @@ CK_ULONG ulCount, CK_OBJECT_HANDLE_PTR phKey) { + _ck_session_ptr pSession; - (void)hSession; - (void)pMechanism; - (void)pTemplate; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pMechanism == NULL_PTR || pTemplate == NULL_PTR || + phKey == NULL_PTR) + return (CKR_ARGUMENTS_BAD); + if ((pSession = _ck_session_find(hSession)) == NULL_PTR) + return (CKR_SESSION_CLOSED); (void)ulCount; - (void)phKey; return (CKR_FUNCTION_NOT_SUPPORTED); } ==== //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#4 (text+ko) ==== @@ -31,10 +31,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#3 $ + * $P4: //depot/projects/cryptoki/lib/C_GenerateKeyPair.c#4 $ */ -#include +#include "cryptoki_impl.h" CK_RV C_GenerateKeyPair(CK_SESSION_HANDLE hSession, @@ -46,14 +46,17 @@ CK_OBJECT_HANDLE_PTR phPublicKey, CK_OBJECT_HANDLE_PTR phPrivateKey) { + _ck_session_ptr pSession; - (void)hSession; - (void)pMechanism; - (void)pPublicKeyTemplate; + if (!_ck_Initialized) + return (CKR_CRYPTOKI_NOT_INITIALIZED); + if (pMechanism == NULL_PTR || pPublicKeyTemplate == NULL_PTR || + pPrivateKeyTemplate == NULL_PTR || phPublicKey == NULL_PTR || >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 16:51:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8533437B442; Thu, 13 Jun 2002 16:51:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 68F8737B421 for ; Thu, 13 Jun 2002 16:51:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5DNpLH17271 for perforce@freebsd.org; Thu, 13 Jun 2002 16:51:21 -0700 (PDT) (envelope-from des@freebsd.org) Date: Thu, 13 Jun 2002 16:51:21 -0700 (PDT) Message-Id: <200206132351.g5DNpLH17271@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 12859 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12859 Change 12859 by des@des.at.des.thinksec.com on 2002/06/13 16:50:43 Forgotten in previous commit: gather globals in a single file. Affected files ... ... //depot/projects/cryptoki/lib/_ck_global.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 18:48:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C263F37B400; Thu, 13 Jun 2002 18:48:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 90AF337B416 for ; Thu, 13 Jun 2002 18:48:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E1mk536809 for perforce@freebsd.org; Thu, 13 Jun 2002 18:48:46 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Thu, 13 Jun 2002 18:48:46 -0700 (PDT) Message-Id: <200206140148.g5E1mk536809@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12865 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12865 Change 12865 by julian@julian_jules1 on 2002/06/13 18:48:14 Even non KSE threads need to check for suspended state Affected files ... ... //depot/projects/kse/sys/kern/subr_trap.c#62 edit Differences ... ==== //depot/projects/kse/sys/kern/subr_trap.c#62 (text+ko) ==== @@ -114,10 +114,10 @@ * We also need to check to see if we have to exit or wait due to a * single threading requirement. */ + PROC_LOCK(p); + thread_suspend_check(0); /* Can suspend or kill */ + PROC_UNLOCK(p); if (p->p_flag & P_KSES) { - PROC_LOCK(p); - thread_suspend_check(0); /* Can suspend or kill */ - PROC_UNLOCK(p); if (ke->ke_tdspare == NULL) { mtx_lock(&Giant); ke->ke_tdspare = thread_alloc(); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 23:15:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D2D637B400; Thu, 13 Jun 2002 23:14:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2FF3337B404 for ; Thu, 13 Jun 2002 23:14:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E6E9S88373 for perforce@freebsd.org; Thu, 13 Jun 2002 23:14:09 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Thu, 13 Jun 2002 23:14:09 -0700 (PDT) Message-Id: <200206140614.g5E6E9S88373@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12877 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12877 Change 12877 by julian@julian_jules1 on 2002/06/13 23:13:31 Desperatly chase -current Affected files ... ... //depot/projects/kse/sys/conf/files#37 integrate ... //depot/projects/kse/sys/conf/files.i386#23 integrate ... //depot/projects/kse/sys/conf/files.pc98#25 integrate ... //depot/projects/kse/sys/conf/options#19 integrate ... //depot/projects/kse/sys/dev/pccbb/pccbb.c#17 integrate ... //depot/projects/kse/sys/dev/pccbb/pccbbvar.h#6 integrate ... //depot/projects/kse/sys/fs/nullfs/null.h#3 integrate ... //depot/projects/kse/sys/fs/nullfs/null_subr.c#4 integrate ... //depot/projects/kse/sys/fs/nullfs/null_vfsops.c#6 integrate ... //depot/projects/kse/sys/fs/nullfs/null_vnops.c#8 integrate ... //depot/projects/kse/sys/i4b/capi/iavc/iavc_card.c#2 integrate ... //depot/projects/kse/sys/i4b/capi/iavc/iavc_lli.c#3 integrate ... //depot/projects/kse/sys/i4b/capi/iavc/iavc_pci.c#5 integrate ... //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 integrate ... //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 integrate ... //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 integrate ... //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#4 integrate ... //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 integrate ... //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#3 integrate ... //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 integrate ... //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#6 integrate ... //depot/projects/kse/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate ... //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate ... //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate ... //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate ... //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_pci.c#3 integrate ... //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#4 integrate ... //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#2 integrate ... //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#2 integrate ... //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#2 integrate ... //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate ... //depot/projects/kse/sys/kern/init_sysent.c#20 integrate ... //depot/projects/kse/sys/kern/kern_acl.c#15 integrate ... //depot/projects/kse/sys/kern/kern_cap.c#7 delete ... //depot/projects/kse/sys/kern/subr_mbuf.c#12 integrate ... //depot/projects/kse/sys/kern/syscalls.c#20 integrate ... //depot/projects/kse/sys/kern/syscalls.master#19 integrate ... //depot/projects/kse/sys/netatm/uni/sscf_uni.c#4 integrate ... //depot/projects/kse/sys/netatm/uni/sscf_uni_lower.c#2 integrate ... //depot/projects/kse/sys/netatm/uni/sscop.c#4 integrate ... //depot/projects/kse/sys/netatm/uni/sscop_lower.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/sscop_var.h#3 integrate ... //depot/projects/kse/sys/netatm/uni/uniarp.c#4 integrate ... //depot/projects/kse/sys/netatm/uni/uniarp_cache.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/uniarp_timer.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/uniarp_vcm.c#2 integrate ... //depot/projects/kse/sys/netatm/uni/uniip.c#4 integrate ... //depot/projects/kse/sys/netatm/uni/uniip_var.h#3 integrate ... //depot/projects/kse/sys/netatm/uni/unisig_decode.c#4 integrate ... //depot/projects/kse/sys/netatm/uni/unisig_if.c#4 integrate ... //depot/projects/kse/sys/netatm/uni/unisig_msg.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/unisig_subr.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/unisig_util.c#3 integrate ... //depot/projects/kse/sys/netatm/uni/unisig_var.h#3 integrate ... //depot/projects/kse/sys/netatm/uni/unisig_vc_state.c#4 integrate ... //depot/projects/kse/sys/netinet/tcp_output.c#8 integrate ... //depot/projects/kse/sys/netinet/tcp_syncache.c#17 integrate ... //depot/projects/kse/sys/netinet/tcp_usrreq.c#11 integrate ... //depot/projects/kse/sys/netinet/tcp_var.h#9 integrate ... //depot/projects/kse/sys/pccard/pcic_pci.c#24 integrate ... //depot/projects/kse/sys/sparc64/pci/ofw_pci.c#4 integrate ... //depot/projects/kse/sys/sparc64/pci/ofw_pci.h#3 integrate ... //depot/projects/kse/sys/sparc64/pci/psycho.c#7 integrate ... //depot/projects/kse/sys/sparc64/pci/psychoreg.h#4 integrate ... //depot/projects/kse/sys/sys/capability.h#9 delete ... //depot/projects/kse/sys/sys/syscall.h#20 integrate ... //depot/projects/kse/sys/sys/syscall.mk#20 integrate ... //depot/projects/kse/sys/sys/sysproto.h#24 integrate Differences ... ==== //depot/projects/kse/sys/conf/files#37 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.646 2002/06/10 18:49:37 phk Exp $ +# $FreeBSD: src/sys/conf/files,v 1.648 2002/06/13 23:19:34 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -774,7 +774,7 @@ # # isdn4bsd AVM B1/T1 CAPI driver # -i4b/capi/iavc/iavc_pci.c count iavc +i4b/capi/iavc/iavc_pci.c count iavc pci i4b/capi/iavc/iavc_isa.c optional iavc i4b/capi/iavc/iavc_lli.c optional iavc i4b/capi/iavc/iavc_card.c optional iavc @@ -831,7 +831,6 @@ kern/init_sysent.c standard kern/kern_acct.c standard kern/kern_acl.c standard -kern/kern_cap.c standard kern/kern_clock.c standard kern/kern_condvar.c standard kern/kern_conf.c standard ==== //depot/projects/kse/sys/conf/files.i386#23 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.401 2002/06/03 22:30:35 pdeuskar Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.402 2002/06/13 06:04:25 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -338,7 +338,7 @@ i4b/layer1/isic/i4b_drn_ngo.c optional isic i4b/layer1/isic/i4b_dynalink.c optional isic i4b/layer1/isic/i4b_elsa_qs1i.c optional isic -i4b/layer1/isic/i4b_elsa_qs1p.c optional isic +i4b/layer1/isic/i4b_elsa_qs1p.c optional isic pci i4b/layer1/isic/i4b_elsa_pcc16.c optional isic i4b/layer1/isic/i4b_hscx.c optional isic i4b/layer1/isic/i4b_isac.c optional isic @@ -358,25 +358,25 @@ # # isdn4bsd, iwic # -i4b/layer1/iwic/i4b_iwic_pci.c count iwic -i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic -i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic +i4b/layer1/iwic/i4b_iwic_pci.c count iwic pci +i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic pci # # isdn4bsd, ifpi # -i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi -i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi +i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi pci +i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi pci # # isdn4bsd, ifpi2 # -i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 +i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci # # isdn4bsd, ifpnp # ==== //depot/projects/kse/sys/conf/files.pc98#25 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.233 2002/06/03 22:30:35 pdeuskar Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.234 2002/06/13 06:04:25 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -308,7 +308,7 @@ i4b/layer1/isic/i4b_drn_ngo.c optional isic i4b/layer1/isic/i4b_dynalink.c optional isic i4b/layer1/isic/i4b_elsa_qs1i.c optional isic -i4b/layer1/isic/i4b_elsa_qs1p.c optional isic +i4b/layer1/isic/i4b_elsa_qs1p.c optional isic pci i4b/layer1/isic/i4b_elsa_pcc16.c optional isic i4b/layer1/isic/i4b_hscx.c optional isic i4b/layer1/isic/i4b_isac.c optional isic @@ -328,25 +328,25 @@ # # isdn4bsd, iwic # -i4b/layer1/iwic/i4b_iwic_pci.c count iwic -i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic -i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic +i4b/layer1/iwic/i4b_iwic_pci.c count iwic pci +i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic pci # # isdn4bsd, ifpi # -i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi -i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi +i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi pci +i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi pci # # isdn4bsd, ifpi2 # -i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 +i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci # # isdn4bsd, ifpnp # ==== //depot/projects/kse/sys/conf/options#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.324 2002/06/10 18:49:38 phk Exp $ +# $FreeBSD: src/sys/conf/options,v 1.325 2002/06/13 22:41:23 rwatson Exp $ # # On the handling of kernel options # @@ -115,7 +115,6 @@ _KPOSIX_VERSION opt_posix.h # TrustedBSD and POSIX.1e Kernel Options -CAPABILITIES opt_cap.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h ==== //depot/projects/kse/sys/dev/pccbb/pccbb.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.46 2002/05/30 17:37:44 takawata Exp $ + * $FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.47 2002/06/13 07:19:31 imp Exp $ */ /* @@ -75,6 +75,8 @@ #include #include +#include +#include #include #include #include @@ -558,6 +560,7 @@ uint32_t sockbase; mtx_init(&sc->mtx, device_get_nameunit(brdev), "pccbb", MTX_DEF); + cv_init(&sc->cv, "pccbb cv"); sc->chipset = pccbb_chipset(pci_get_devid(brdev), NULL); sc->dev = brdev; sc->cbdev = NULL; @@ -599,6 +602,7 @@ device_printf(brdev, "Could not grab register memory\n"); mtx_destroy(&sc->mtx); + cv_destroy(&sc->cv); return (ENOMEM); } pci_write_config(brdev, CBBR_SOCKBASE, @@ -608,6 +612,7 @@ } else { device_printf(brdev, "Could not map register memory\n"); mtx_destroy(&sc->mtx); + cv_destroy(&sc->cv); return (ENOMEM); } } @@ -644,6 +649,7 @@ bus_release_resource(brdev, SYS_RES_MEMORY, CBBR_SOCKBASE, sc->base_res); mtx_destroy(&sc->mtx); + cv_destroy(&sc->cv); return (ENOMEM); } @@ -654,6 +660,7 @@ bus_release_resource(brdev, SYS_RES_MEMORY, CBBR_SOCKBASE, sc->base_res); mtx_destroy(&sc->mtx); + cv_destroy(&sc->cv); return (ENOMEM); } @@ -715,6 +722,7 @@ bus_release_resource(brdev, SYS_RES_MEMORY, CBBR_SOCKBASE, sc->base_res); mtx_destroy(&sc->mtx); + cv_destroy(&sc->cv); return (0); } @@ -888,7 +896,6 @@ * if there's a card already inserted, we do the * right thing. */ - mtx_lock(&sc->mtx); if (sc->flags & PCCBB_KTHREAD_DONE) break; @@ -897,19 +904,19 @@ pccbb_insert(sc); else pccbb_removal(sc); - mtx_unlock(&sc->mtx); /* * Wait until it has been 1s since the last time we * get an interrupt. We handle the rest of the interrupt * at the top of the loop. */ - tsleep (sc, PWAIT, "pccbbev", 0); + mtx_lock(&sc->mtx); + cv_wait(&sc->cv, &sc->mtx); do { - err = tsleep (sc, PWAIT, "pccbbev", 1 * hz); + err = cv_timedwait(&sc->cv, &sc->mtx, 1 * hz); } while (err != EWOULDBLOCK && (sc->flags & PCCBB_KTHREAD_DONE) == 0); + mtx_unlock(&sc->mtx); } - mtx_unlock(&sc->mtx); sc->flags &= ~PCCBB_KTHREAD_RUNNING; /* * XXX I think there's a race here. If we wakeup in the other @@ -1008,7 +1015,7 @@ if (sockevent & CBB_SOCKET_EVENT_CD) { mtx_lock(&sc->mtx); - wakeup(sc); + cv_signal(&sc->cv); mtx_unlock(&sc->mtx); } if (sockevent & CBB_SOCKET_EVENT_CSTS) { ==== //depot/projects/kse/sys/dev/pccbb/pccbbvar.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pccbb/pccbbvar.h,v 1.10 2002/02/17 03:11:11 imp Exp $ + * $FreeBSD: src/sys/dev/pccbb/pccbbvar.h,v 1.11 2002/06/13 07:19:31 imp Exp $ */ /* @@ -62,7 +62,8 @@ bus_space_handle_t bsh; u_int8_t secbus; u_int8_t subbus; - struct mtx mtx; + struct mtx mtx; + struct cv cv; u_int32_t flags; #define PCCBB_16BIT_CARD 0x02000000 #define PCCBB_KTHREAD_RUNNING 0x04000000 ==== //depot/projects/kse/sys/fs/nullfs/null.h#3 (text+ko) ==== @@ -35,7 +35,7 @@ * * @(#)null.h 8.3 (Berkeley) 8/20/94 * - * $FreeBSD: src/sys/fs/nullfs/null.h,v 1.16 2002/05/23 23:07:27 mux Exp $ + * $FreeBSD: src/sys/fs/nullfs/null.h,v 1.18 2002/06/13 21:49:09 semenu Exp $ */ struct null_mount { @@ -59,7 +59,8 @@ int nullfs_init(struct vfsconf *vfsp); int nullfs_uninit(struct vfsconf *vfsp); -int null_node_create(struct mount *mp, struct vnode *target, struct vnode **vpp); +int null_nodeget(struct mount *mp, struct vnode *target, struct vnode **vpp); +void null_hashrem(struct null_node *xp); int null_bypass(struct vop_generic_args *ap); #ifdef DIAGNOSTIC @@ -70,7 +71,6 @@ #endif extern vop_t **null_vnodeop_p; -extern struct lock null_hashlock; #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_NULLFSNODE); ==== //depot/projects/kse/sys/fs/nullfs/null_subr.c#4 (text+ko) ==== @@ -35,13 +35,14 @@ * * @(#)null_subr.c 8.7 (Berkeley) 5/14/95 * - * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.32 2001/09/12 08:37:19 julian Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_subr.c,v 1.35 2002/06/13 21:49:09 semenu Exp $ */ #include #include #include #include +#include #include #include #include @@ -65,15 +66,13 @@ static LIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl; static u_long null_node_hash; -struct lock null_hashlock; +struct mtx null_hashmtx; static MALLOC_DEFINE(M_NULLFSHASH, "NULLFS hash", "NULLFS hash table"); MALLOC_DEFINE(M_NULLFSNODE, "NULLFS node", "NULLFS vnode private part"); -static int null_node_alloc(struct mount *mp, struct vnode *lowervp, - struct vnode **vpp); -static struct vnode * - null_node_find(struct mount *mp, struct vnode *lowervp); +static struct vnode * null_hashget(struct vnode *); +static struct vnode * null_hashins(struct null_node *); /* * Initialise cache headers @@ -85,7 +84,7 @@ NULLFSDEBUG("nullfs_init\n"); /* printed during system boot */ null_node_hashtbl = hashinit(NNULLNODECACHE, M_NULLFSHASH, &null_node_hash); - lockinit(&null_hashlock, PVFS, "nullhs", 0, 0); + mtx_init(&null_hashmtx, "nullhs", NULL, MTX_DEF); return (0); } @@ -94,10 +93,8 @@ struct vfsconf *vfsp; { - if (null_node_hashtbl) { - lockdestroy(&null_hashlock); - free(null_node_hashtbl, M_NULLFSHASH); - } + mtx_destroy(&null_hashmtx); + free(null_node_hashtbl, M_NULLFSHASH); return (0); } @@ -106,8 +103,7 @@ * Lower vnode should be locked on entry and will be left locked on exit. */ static struct vnode * -null_node_find(mp, lowervp) - struct mount *mp; +null_hashget(lowervp) struct vnode *lowervp; { struct thread *td = curthread; /* XXX */ @@ -123,51 +119,93 @@ */ hd = NULL_NHASH(lowervp); loop: - lockmgr(&null_hashlock, LK_EXCLUSIVE, NULL, td); + mtx_lock(&null_hashmtx); LIST_FOREACH(a, hd, null_hash) { - if (a->null_lowervp == lowervp && NULLTOV(a)->v_mount == mp) { + if (a->null_lowervp == lowervp) { vp = NULLTOV(a); - lockmgr(&null_hashlock, LK_RELEASE, NULL, td); + mtx_lock(&vp->v_interlock); + mtx_unlock(&null_hashmtx); /* * We need vget for the VXLOCK * stuff, but we don't want to lock * the lower node. */ - if (vget(vp, LK_EXCLUSIVE | LK_CANRECURSE, td)) { - printf ("null_node_find: vget failed.\n"); + if (vget(vp, LK_EXCLUSIVE | LK_THISLAYER | LK_INTERLOCK, td)) goto loop; - }; - /* - * Now we got both vnodes locked, so release the - * lower one. - */ - VOP_UNLOCK(lowervp, 0, td); + return (vp); } } - lockmgr(&null_hashlock, LK_RELEASE, NULL, td); + mtx_unlock(&null_hashmtx); + return (NULLVP); +} + +/* + * Act like null_hashget, but add passed null_node to hash if no existing + * node found. + */ +static struct vnode * +null_hashins(xp) + struct null_node *xp; +{ + struct thread *td = curthread; /* XXX */ + struct null_node_hashhead *hd; + struct null_node *oxp; + struct vnode *ovp; + + hd = NULL_NHASH(xp->null_lowervp); +loop: + mtx_lock(&null_hashmtx); + LIST_FOREACH(oxp, hd, null_hash) { + if (oxp->null_lowervp == xp->null_lowervp) { + ovp = NULLTOV(oxp); + mtx_lock(&ovp->v_interlock); + mtx_unlock(&null_hashmtx); + if (vget(ovp, LK_EXCLUSIVE | LK_THISLAYER | LK_INTERLOCK, td)) + goto loop; - return NULLVP; + return (ovp); + } + } + LIST_INSERT_HEAD(hd, xp, null_hash); + mtx_unlock(&null_hashmtx); + return (NULLVP); } - /* - * Make a new null_node node. - * Vp is the alias vnode, lofsvp is the lower vnode. - * Maintain a reference to (lowervp). + * Make a new or get existing nullfs node. + * Vp is the alias vnode, lowervp is the lower vnode. + * + * The lowervp assumed to be locked and having "spare" reference. This routine + * vrele lowervp if nullfs node was taken from hash. Otherwise it "transfers" + * the caller's "spare" reference to created nullfs vnode. */ -static int -null_node_alloc(mp, lowervp, vpp) +int +null_nodeget(mp, lowervp, vpp) struct mount *mp; struct vnode *lowervp; struct vnode **vpp; { struct thread *td = curthread; /* XXX */ - struct null_node_hashhead *hd; struct null_node *xp; - struct vnode *othervp, *vp; + struct vnode *vp; int error; + /* Lookup the hash firstly */ + *vpp = null_hashget(lowervp); + if (*vpp != NULL) { + vrele(lowervp); + return (0); + } + + /* + * We do not serialize vnode creation, instead we will check for + * duplicates later, when adding new vnode to hash. + * + * Note that duplicate can only appear in hash if the lowervp is + * locked LK_SHARED. + */ + /* * Do the MALLOC before the getnewvnode since doing so afterward * might cause a bogus v_data pointer to get dereferenced @@ -176,31 +214,20 @@ MALLOC(xp, struct null_node *, sizeof(struct null_node), M_NULLFSNODE, M_WAITOK); - error = getnewvnode(VT_NULL, mp, null_vnodeop_p, vpp); + error = getnewvnode(VT_NULL, mp, null_vnodeop_p, &vp); if (error) { FREE(xp, M_NULLFSNODE); return (error); } - vp = *vpp; + + xp->null_vnode = vp; + xp->null_lowervp = lowervp; vp->v_type = lowervp->v_type; - xp->null_vnode = vp; vp->v_data = xp; - xp->null_lowervp = lowervp; - /* - * Before we insert our new node onto the hash chains, - * check to see if someone else has beaten us to it. - * (We could have slept in MALLOC.) - */ - othervp = null_node_find(mp, lowervp); - if (othervp) { - vp->v_data = NULL; - FREE(xp, M_NULLFSNODE); - vp->v_type = VBAD; /* node is discarded */ - vrele(vp); - *vpp = othervp; - return 0; - }; + + /* Though v_lock is inited by getnewvnode(), we want our own wmesg */ + lockinit(&vp->v_lock, PVFS, "nunode", VLKTIMEOUT, LK_NOPAUSE); /* * From NetBSD: @@ -211,79 +238,49 @@ * NULL, then we copy that up and manually lock the new vnode. */ - lockmgr(&null_hashlock, LK_EXCLUSIVE, NULL, td); vp->v_vnlock = lowervp->v_vnlock; error = VOP_LOCK(vp, LK_EXCLUSIVE | LK_THISLAYER, td); if (error) - panic("null_node_alloc: can't lock new vnode\n"); + panic("null_nodeget: can't lock new vnode\n"); + + /* + * Atomically insert our new node into the hash or vget existing + * if someone else has beaten us to it. + */ + *vpp = null_hashins(xp); + if (*vpp != NULL) { + vrele(lowervp); + VOP_UNLOCK(vp, LK_THISLAYER, td); + vp->v_vnlock = NULL; + xp->null_lowervp = NULL; + vrele(vp); + return (0); + } + /* + * XXX We take extra vref just to workaround UFS's XXX: + * UFS can vrele() vnode in VOP_CLOSE() in some cases. Luckily, this + * can only happen if v_usecount == 1. To workaround, we just don't + * let v_usecount be 1, it will be 2 or more. + */ VREF(lowervp); - hd = NULL_NHASH(lowervp); - LIST_INSERT_HEAD(hd, xp, null_hash); - lockmgr(&null_hashlock, LK_RELEASE, NULL, td); - return 0; + + *vpp = vp; + + return (0); } - /* - * Try to find an existing null_node vnode refering to the given underlying - * vnode (which should be locked). If no vnode found, create a new null_node - * vnode which contains a reference to the lower vnode. + * Remove node from hash. */ -int -null_node_create(mp, lowervp, newvpp) - struct mount *mp; - struct vnode *lowervp; - struct vnode **newvpp; +void +null_hashrem(xp) + struct null_node *xp; { - struct vnode *aliasvp; - aliasvp = null_node_find(mp, lowervp); - if (aliasvp) { - /* - * null_node_find has taken another reference - * to the alias vnode. - */ - vrele(lowervp); -#ifdef NULLFS_DEBUG - vprint("null_node_create: exists", aliasvp); -#endif - } else { - int error; - - /* - * Get new vnode. - */ - NULLFSDEBUG("null_node_create: create new alias vnode\n"); - - /* - * Make new vnode reference the null_node. - */ - error = null_node_alloc(mp, lowervp, &aliasvp); - if (error) - return error; - - /* - * aliasvp is already VREF'd by getnewvnode() - */ - } - -#ifdef DIAGNOSTIC - if (lowervp->v_usecount < 1) { - /* Should never happen... */ - vprint ("null_node_create: alias ", aliasvp); - vprint ("null_node_create: lower ", lowervp); - panic ("null_node_create: lower has 0 usecount."); - }; -#endif - -#ifdef NULLFS_DEBUG - vprint("null_node_create: alias", aliasvp); - vprint("null_node_create: lower", lowervp); -#endif - - *newvpp = aliasvp; - return (0); + mtx_lock(&null_hashmtx); + LIST_REMOVE(xp, null_hash); + mtx_unlock(&null_hashmtx); } #ifdef DIAGNOSTIC ==== //depot/projects/kse/sys/fs/nullfs/null_vfsops.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ * @(#)null_vfsops.c 8.2 (Berkeley) 1/21/94 * * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92 - * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.52 2002/05/23 23:07:27 mux Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vfsops.c,v 1.53 2002/06/13 21:49:09 semenu Exp $ */ /* @@ -169,7 +169,7 @@ * Save reference. Each mount also holds * a reference on the root vnode. */ - error = null_node_create(mp, lowerrootvp, &vp); + error = null_nodeget(mp, lowerrootvp, &vp); /* * Unlock the node (either the lower or the alias) */ @@ -354,7 +354,7 @@ if (error) return (error); - return (null_node_create(mp, *vpp, vpp)); + return (null_nodeget(mp, *vpp, vpp)); } static int @@ -368,7 +368,7 @@ if (error) return (error); - return (null_node_create(mp, *vpp, vpp)); + return (null_nodeget(mp, *vpp, vpp)); } static int ==== //depot/projects/kse/sys/fs/nullfs/null_vnops.c#8 (text+ko) ==== @@ -40,7 +40,7 @@ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * - * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.53 2002/05/21 18:07:33 semenu Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.56 2002/06/13 21:49:09 semenu Exp $ */ /* @@ -346,7 +346,7 @@ vppp = VOPARG_OFFSETTO(struct vnode***, descp->vdesc_vpp_offset,ap); if (*vppp) - error = null_node_create(old_vps[0]->v_mount, **vppp, *vppp); + error = null_nodeget(old_vps[0]->v_mount, **vppp, *vppp); } out: @@ -400,9 +400,12 @@ VREF(dvp); vrele(lvp); } else { - error = null_node_create(dvp->v_mount, lvp, &vp); - if (error == 0) - *ap->a_vpp = vp; + error = null_nodeget(dvp->v_mount, lvp, &vp); + if (error) { + /* XXX Cleanup needed... */ + panic("null_nodeget failed"); + } + *ap->a_vpp = vp; } } return (error); @@ -706,6 +709,11 @@ * There is no way to tell that someone issued remove/rmdir operation * on the underlying filesystem. For now we just have to release lowevrp * as soon as possible. + * + * Note, we can't release any resources nor remove vnode from hash before + * appropriate VXLOCK stuff is is done because other process can find this + * vnode in hash during inactivation and may be sitting in vget() and waiting + * for null_inactive to unlock vnode. Thus we will do all those in VOP_RECLAIM. */ static int null_inactive(ap) @@ -715,19 +723,21 @@ } */ *ap; { struct vnode *vp = ap->a_vp; + struct thread *td = ap->a_td; + + VOP_UNLOCK(vp, 0, td); /* * If this is the last reference, then free up the vnode * so as not to tie up the lower vnodes. */ - if (vp->v_usecount == 0) - vrecycle(vp, NULL, ap->a_td); + vrecycle(vp, NULL, td); + return (0); } /* - * We can free memory in null_inactive, but we do this - * here. (Possible to guard vp->v_data to point somewhere) + * Now, the VXLOCK is in force and we're free to destroy the null vnode. */ static int null_reclaim(ap) @@ -736,32 +746,19 @@ struct thread *a_td; } */ *ap; { - struct thread *td = ap->a_td; struct vnode *vp = ap->a_vp; struct null_node *xp = VTONULL(vp); struct vnode *lowervp = xp->null_lowervp; - void *vdata; - lockmgr(&null_hashlock, LK_EXCLUSIVE, NULL, td); - LIST_REMOVE(xp, null_hash); - lockmgr(&null_hashlock, LK_RELEASE, NULL, td); + if (lowervp) { + null_hashrem(xp); - xp->null_lowervp = NULLVP; - if (vp->v_vnlock != NULL) { - vp->v_vnlock = &vp->v_lock; /* we no longer share the lock */ - } else - VOP_UNLOCK(vp, LK_THISLAYER, td); + vrele(lowervp); + vrele(lowervp); + } - /* - * Now it is safe to drop references to the lower vnode. - * VOP_INACTIVE() will be called by vrele() if necessary. - */ - vput(lowervp); - vrele (lowervp); - - vdata = vp->v_data; vp->v_data = NULL; - FREE(vdata, M_NULLFSNODE); + FREE(xp, M_NULLFSNODE); return (0); } ==== //depot/projects/kse/sys/i4b/capi/iavc/iavc_card.c#2 (text+ko) ==== @@ -25,12 +25,11 @@ * capi/iavc/iavc_card.c * The AVM ISDN controllers' card specific support routines. * - * $FreeBSD: src/sys/i4b/capi/iavc/iavc_card.c,v 1.1 2001/05/25 08:39:32 hm Exp $ + * $FreeBSD: src/sys/i4b/capi/iavc/iavc_card.c,v 1.2 2002/06/13 06:04:25 brooks Exp $ */ #include "iavc.h" #include "i4bcapi.h" -#include "pci.h" #if (NIAVC > 0) && (NI4BCAPI > 0) ==== //depot/projects/kse/sys/i4b/capi/iavc/iavc_lli.c#3 (text+ko) ==== @@ -25,12 +25,11 @@ * capi/iavc/iavc_lli.c * The AVM ISDN controllers' Low Level Interface. * - * $FreeBSD: src/sys/i4b/capi/iavc/iavc_lli.c,v 1.3 2002/03/17 09:33:13 hm Exp $ + * $FreeBSD: src/sys/i4b/capi/iavc/iavc_lli.c,v 1.4 2002/06/13 06:04:25 brooks Exp $ */ #include "iavc.h" #include "i4bcapi.h" -#include "pci.h" #if (NIAVC > 0) && (NI4BCAPI > 0) ==== //depot/projects/kse/sys/i4b/capi/iavc/iavc_pci.c#5 (text+ko) ==== @@ -25,14 +25,13 @@ * capi/iavc/iavc_pci.c * The AVM ISDN controllers' PCI bus attachment handling. * - * $FreeBSD: src/sys/i4b/capi/iavc/iavc_pci.c,v 1.4 2002/04/04 21:03:20 jhb Exp $ + * $FreeBSD: src/sys/i4b/capi/iavc/iavc_pci.c,v 1.5 2002/06/13 06:04:25 brooks Exp $ */ #include "iavc.h" #include "i4bcapi.h" -#include "pci.h" -#if (NIAVC > 0) && (NI4BCAPI > 0) && (NPCI > 0) +#if (NIAVC > 0) && (NI4BCAPI > 0) #include #include ==== //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 (text+ko) ==== @@ -29,16 +29,15 @@ * * $Id: i4b_ifpi_isac.c,v 1.3 2000/05/29 15:41:41 hm Exp $ * - * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.4 2000/10/30 14:49:22 hm Exp $ + * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.5 2002/06/13 06:04:26 brooks Exp $ * * last edit-date: [Mon May 29 15:22:52 2000] * *---------------------------------------------------------------------------*/ #include "ifpi.h" -#include "pci.h" -#if (NIFPI > 0) && (NPCI > 0) +#if (NIFPI > 0) #include "opt_i4b.h" ==== //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 (text+ko) ==== @@ -29,16 +29,15 @@ * * $Id: i4b_ifpi_l1.c,v 1.4 2000/06/02 16:14:36 hm Exp $ * - * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c,v 1.4 2000/10/30 14:49:22 hm Exp $ + * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c,v 1.5 2002/06/13 06:04:26 brooks Exp $ * * last edit-date: [Fri Jun 2 14:54:30 2000] * *---------------------------------------------------------------------------*/ #include "ifpi.h" -#include "pci.h" -#if (NIFPI > 0) && (NPCI > 0) +#if (NIFPI > 0) #include #include ==== //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 (text+ko) ==== @@ -29,16 +29,15 @@ * * $Id: i4b_ifpi_l1fsm.c,v 1.4 2000/05/29 15:41:41 hm Exp $ * - * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c,v 1.4 2000/10/30 14:49:22 hm Exp $ + * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c,v 1.5 2002/06/13 06:04:26 brooks Exp $ * * last edit-date: [Mon May 29 15:23:15 2000] * >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 23:35:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A7DF37B483; Thu, 13 Jun 2002 23:34:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5ED1637B406 for ; Thu, 13 Jun 2002 23:34:35 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E6YZL90616 for perforce@freebsd.org; Thu, 13 Jun 2002 23:34:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 13 Jun 2002 23:34:35 -0700 (PDT) Message-Id: <200206140634.g5E6YZL90616@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12879 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12879 Change 12879 by rwatson@rwatson_paprika on 2002/06/13 23:34:18 Some preparation for committing: clean out unused cruft. Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#105 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#105 (text+ko) ==== @@ -201,13 +201,6 @@ extern int mac_debug_label_fallback; /* - * Dispositions for network interfaces with regards to MAC. - */ -#define MAC_IFNET_DISABLED 0x0000000 /* Interface ignores MAC. */ -#define MAC_IFNET_SINGLE 0x0000001 /* Interface is single-level. */ -#define MAC_IFNET_MULTI 0x0000002 /* Interface is multi-level. */ - -/* * Kernel functions to manage and evaluate labels. */ struct bpf_d; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 23:37:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB0A137B423; Thu, 13 Jun 2002 23:37:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 79C5137B405 for ; Thu, 13 Jun 2002 23:37:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E6bdh90806 for perforce@freebsd.org; Thu, 13 Jun 2002 23:37:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 13 Jun 2002 23:37:39 -0700 (PDT) Message-Id: <200206140637.g5E6bdh90806@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12880 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12880 Change 12880 by rwatson@rwatson_paprika on 2002/06/13 23:37:20 Some kernel options in NOTES that aren't anymore. Affected files ... ... //depot/projects/trustedbsd/mac/sys/conf/NOTES#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/NOTES#7 (text+ko) ==== @@ -702,11 +702,6 @@ # Support for Mandatory Access Control (MAC) options MAC -options MAC_BIBA -options MAC_MLS -options MAC_NONE -options MAC_TE -options SEBSD #Warning, won't boot without a policy ##################################################################### To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 13 23:53: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C3D837B422; Thu, 13 Jun 2002 23:52:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4767D37B41E for ; Thu, 13 Jun 2002 23:52:58 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E6qwC92505 for perforce@freebsd.org; Thu, 13 Jun 2002 23:52:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 13 Jun 2002 23:52:58 -0700 (PDT) Message-Id: <200206140652.g5E6qwC92505@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12881 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12881 Change 12881 by rwatson@rwatson_paprika on 2002/06/13 23:52:28 Make kern_mac.c depend on options MAC, as we don't need the hooks if we aren't options MAC. Affected files ... ... //depot/projects/trustedbsd/mac/sys/conf/files#32 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/files#32 (text+ko) ==== @@ -838,7 +838,7 @@ kern/kern_linker.c standard kern/kern_lock.c standard kern/kern_lockf.c standard -kern/kern_mac.c standard +kern/kern_mac.c optional mac kern/kern_malloc.c standard kern/kern_mib.c standard kern/kern_module.c standard To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 0: 3:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 276EA37B42B; Fri, 14 Jun 2002 00:03:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 05C8837B427 for ; Fri, 14 Jun 2002 00:03:11 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E73AI93735 for perforce@freebsd.org; Fri, 14 Jun 2002 00:03:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 00:03:10 -0700 (PDT) Message-Id: <200206140703.g5E73AI93735@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12882 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12882 Change 12882 by rwatson@rwatson_paprika on 2002/06/14 00:02:25 Fix botched integ. Affected files ... ... //depot/projects/trustedbsd/mac/sys/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/Makefile#4 (text+ko) ==== @@ -8,31 +8,6 @@ SUBDIR+=modules .endif -.for arch in alpha ia64 powerpc sparc64 -.if ${MACHINE_ARCH} != "${arch}" -SKIPARCHS+= ${arch} -.endif -.endfor -.if ${MACHINE_ARCH} == "i386" -SKIPARCHS+= pc98 -.elif ${MACHINE_ARCH} == "pc98" -.else -SKIPARCHS+= i386 -SKIPARCHS+= pc98 -.endif -SKIPPATTERN:=\./boot -.for arch in ${SKIPARCHS} -SKIPPATTERN:=${SKIPPATTERN}|\./${arch} -.endfor -ctags: - rm -f ${.CURDIR}/tags - touch ${.CURDIR}/tags - cd ${.CURDIR}; \ - find -E . -type d -mindepth 1 -maxdepth 1 \ - ! -regex "${SKIPPATTERN}" | \ - xargs -J {} find {} -name "*.[lych]" | \ - xargs ctags -a -f ${.CURDIR}/tags - HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 0:26:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48F9637B436; Fri, 14 Jun 2002 00:26:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EC78C37B434 for ; Fri, 14 Jun 2002 00:26:39 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E7QdL01055 for perforce@freebsd.org; Fri, 14 Jun 2002 00:26:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 00:26:39 -0700 (PDT) Message-Id: <200206140726.g5E7QdL01055@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12886 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12886 Change 12886 by rwatson@rwatson_paprika on 2002/06/14 00:26:30 Diff reduction. Affected files ... ... //depot/projects/trustedbsd/mac/sys/compat/pecoff/imgact_pecoff.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/compat/pecoff/imgact_pecoff.c#7 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 0:27:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6723137B42F; Fri, 14 Jun 2002 00:27:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8B1C737B42A for ; Fri, 14 Jun 2002 00:27:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E7RfR01093 for perforce@freebsd.org; Fri, 14 Jun 2002 00:27:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 00:27:41 -0700 (PDT) Message-Id: <200206140727.g5E7RfR01093@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12887 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12887 Change 12887 by rwatson@rwatson_paprika on 2002/06/14 00:27:26 Diff reduce. Affected files ... ... //depot/projects/trustedbsd/mac/sys/compat/svr4/imgact_svr4.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/imgact_svr4.c#4 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 0:30:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F24337B41A; Fri, 14 Jun 2002 00:30:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7A26B37B410 for ; Fri, 14 Jun 2002 00:29:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E7Tij01437 for perforce@freebsd.org; Fri, 14 Jun 2002 00:29:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 00:29:44 -0700 (PDT) Message-Id: <200206140729.g5E7Tij01437@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12888 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12888 Change 12888 by rwatson@rwatson_paprika on 2002/06/14 00:28:55 Diff reduce. Affected files ... ... //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_sysvec.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_sysvec.c#5 (text+ko) ==== @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 0:31:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 132C337B414; Fri, 14 Jun 2002 00:31:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9318337B40A for ; Fri, 14 Jun 2002 00:30:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E7Uj102098 for perforce@freebsd.org; Fri, 14 Jun 2002 00:30:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 00:30:45 -0700 (PDT) Message-Id: <200206140730.g5E7Uj102098@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12889 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12889 Change 12889 by rwatson@rwatson_paprika on 2002/06/14 00:30:19 Diff reduce. Affected files ... ... //depot/projects/trustedbsd/mac/sys/contrib/dev/oltr/if_oltr.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/contrib/dev/oltr/if_oltr.c#3 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 0:32: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED0CA37B400; Fri, 14 Jun 2002 00:31:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4508137B445 for ; Fri, 14 Jun 2002 00:31:48 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E7VmI02206 for perforce@freebsd.org; Fri, 14 Jun 2002 00:31:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 00:31:48 -0700 (PDT) Message-Id: <200206140731.g5E7VmI02206@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12890 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12890 Change 12890 by rwatson@rwatson_paprika on 2002/06/14 00:31:31 Diff reduce. opt_mac no longer needed here since deadfs no longer speaks MAC. Affected files ... ... //depot/projects/trustedbsd/mac/sys/fs/deadfs/dead_vnops.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/deadfs/dead_vnops.c#7 (text+ko) ==== @@ -34,8 +34,6 @@ * $FreeBSD: src/sys/fs/deadfs/dead_vnops.c,v 1.33 2002/05/02 19:13:44 phk Exp $ */ -#include "opt_mac.h" - #include #include #include @@ -43,7 +41,6 @@ #include #include #include -#include static int chkvnlock(struct vnode *); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 0:40:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0CB237B40C; Fri, 14 Jun 2002 00:40:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3CA1F37B41B for ; Fri, 14 Jun 2002 00:40:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E7dwP02765 for perforce@freebsd.org; Fri, 14 Jun 2002 00:39:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 00:39:58 -0700 (PDT) Message-Id: <200206140739.g5E7dwP02765@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12891 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12891 Change 12891 by rwatson@rwatson_paprika on 2002/06/14 00:39:02 Diff reduce. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/i386/in_cksum.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/i386/in_cksum.c#4 (text+ko) ==== @@ -40,7 +40,6 @@ */ #include #include -#include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 0:41: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD43537B432; Fri, 14 Jun 2002 00:40:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CB42937B432 for ; Fri, 14 Jun 2002 00:40:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E7dwX02770 for perforce@freebsd.org; Fri, 14 Jun 2002 00:39:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 00:39:58 -0700 (PDT) Message-Id: <200206140739.g5E7dwX02770@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12892 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12892 Change 12892 by rwatson@rwatson_paprika on 2002/06/14 00:39:26 Diff reduce. Affected files ... ... //depot/projects/trustedbsd/mac/sys/coda/coda_fbsd.c#4 edit ... //depot/projects/trustedbsd/mac/sys/coda/coda_namecache.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/coda/coda_fbsd.c#4 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/coda/coda_namecache.c#3 (text+ko) ==== @@ -82,7 +82,6 @@ #include #include #include -#include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 0:41:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 103C837B41F; Fri, 14 Jun 2002 00:41:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E93BE37B400 for ; Fri, 14 Jun 2002 00:41:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E7f0n03157 for perforce@freebsd.org; Fri, 14 Jun 2002 00:41:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 00:41:00 -0700 (PDT) Message-Id: <200206140741.g5E7f0n03157@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12893 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12893 Change 12893 by rwatson@rwatson_paprika on 2002/06/14 00:40:49 Diff reduce. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/ibcs2/imgact_coff.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/ibcs2/imgact_coff.c#7 (text+ko) ==== @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 0:52:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99C5F37B401; Fri, 14 Jun 2002 00:52:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A9C6537B415 for ; Fri, 14 Jun 2002 00:52:14 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E7qEF04391 for perforce@freebsd.org; Fri, 14 Jun 2002 00:52:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 00:52:14 -0700 (PDT) Message-Id: <200206140752.g5E7qEF04391@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12895 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12895 Change 12895 by rwatson@rwatson_paprika on 2002/06/14 00:51:13 Diff reduce. Affected files ... ... //depot/projects/trustedbsd/mac/sys/i386/linux/imgact_linux.c#4 edit ... //depot/projects/trustedbsd/mac/sys/i386/linux/linux_sysvec.c#8 edit ... //depot/projects/trustedbsd/mac/sys/kern/imgact_elf.c#6 edit ... //depot/projects/trustedbsd/mac/sys/kern/imgact_gzip.c#5 edit ... //depot/projects/trustedbsd/mac/sys/kern/imgact_shell.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/linux/imgact_linux.c#4 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/i386/linux/linux_sysvec.c#8 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/imgact_elf.c#6 (text+ko) ==== @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/imgact_gzip.c#5 (text+ko) ==== @@ -23,7 +23,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/imgact_shell.c#4 (text+ko) ==== @@ -27,7 +27,6 @@ */ #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 0:53:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADFD937B407; Fri, 14 Jun 2002 00:53:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E281937B41B for ; Fri, 14 Jun 2002 00:53:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E7rGO04566 for perforce@freebsd.org; Fri, 14 Jun 2002 00:53:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 00:53:16 -0700 (PDT) Message-Id: <200206140753.g5E7rGO04566@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12896 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12896 Change 12896 by rwatson@rwatson_paprika on 2002/06/14 00:52:46 Diff reduce. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/subr_mchain.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/subr_mchain.c#6 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 0:56:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28B8F37B423; Fri, 14 Jun 2002 00:56:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 33BC737B40B for ; Fri, 14 Jun 2002 00:56:04 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E7sHp04595 for perforce@freebsd.org; Fri, 14 Jun 2002 00:54:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 00:54:17 -0700 (PDT) Message-Id: <200206140754.g5E7sHp04595@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12897 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12897 Change 12897 by rwatson@rwatson_paprika on 2002/06/14 00:53:58 Fix botched integ. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#17 (text+ko) ==== @@ -380,8 +380,14 @@ w = lock->lo_witness; if (w != NULL) { mtx_lock_spin(&w_mtx); - MPASS(w->w_refcount > 0); w->w_refcount--; + if (w->w_refcount == 0) { + CTR2(KTR_WITNESS, + "%s: marking witness %s as dead", __func__, w->w_name); + w->w_name = "(dead)"; + w->w_file = "(dead)"; + w->w_line = 0; + } mtx_unlock_spin(&w_mtx); } @@ -444,7 +450,7 @@ */ prnt("\nLocks which were never acquired:\n"); STAILQ_FOREACH(w, &w_all, w_list) { - if (w->w_file != NULL || w->w_refcount == 0) + if (w->w_file != NULL) continue; prnt("%s\n", w->w_name); } @@ -932,8 +938,7 @@ return (NULL); mtx_lock_spin(&w_mtx); STAILQ_FOREACH(w, &w_all, w_list) { - if (w->w_name == description || (w->w_refcount > 0 && - strcmp(description, w->w_name) == 0)) { + if (strcmp(description, w->w_name) == 0) { w->w_refcount++; mtx_unlock_spin(&w_mtx); if (lock_class != w->w_class) @@ -1145,13 +1150,10 @@ prnt("%-2d", level); for (i = 0; i < level; i++) prnt(" "); - if (parent->w_refcount > 0) { - prnt("%s", parent->w_name); - if (parent->w_file != NULL) - prnt(" -- last acquired @ %s:%d\n", parent->w_file, - parent->w_line); - } else - prnt("(dead)\n"); + prnt("%s", parent->w_name); + if (parent->w_file != NULL) + prnt(" -- last acquired @ %s:%d\n", parent->w_file, + parent->w_line); for (wcl = parent->w_children; wcl != NULL; wcl = wcl->wcl_next) for (i = 0; i < wcl->wcl_count; i++) witness_displaydescendants(prnt, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 0:58:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B139A37B413; Fri, 14 Jun 2002 00:58:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BC7E137B422 for ; Fri, 14 Jun 2002 00:58:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E7uKi04786 for perforce@freebsd.org; Fri, 14 Jun 2002 00:56:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 00:56:20 -0700 (PDT) Message-Id: <200206140756.g5E7uKi04786@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12898 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12898 Change 12898 by rwatson@rwatson_paprika on 2002/06/14 00:56:08 Diff reduce. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/sys_socket.c#6 edit ... //depot/projects/trustedbsd/mac/sys/kern/uipc_accf.c#3 edit ... //depot/projects/trustedbsd/mac/sys/kern/uipc_domain.c#5 edit ... //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf2.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sys_socket.c#6 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_accf.c#3 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_domain.c#5 (text+ko) ==== @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf2.c#5 (text+ko) ==== @@ -71,7 +71,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 1: 8:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37FF737B41A; Fri, 14 Jun 2002 01:07:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BE89A37B416 for ; Fri, 14 Jun 2002 01:07:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E87Ym09935 for perforce@freebsd.org; Fri, 14 Jun 2002 01:07:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 01:07:34 -0700 (PDT) Message-Id: <200206140807.g5E87Ym09935@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12900 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12900 Change 12900 by rwatson@rwatson_paprika on 2002/06/14 01:07:06 Diff reduce. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/vfs_export.c#6 edit ... //depot/projects/trustedbsd/mac/sys/net/bpf_filter.c#5 edit ... //depot/projects/trustedbsd/mac/sys/net/bridge.c#7 edit ... //depot/projects/trustedbsd/mac/sys/net/if.h#12 edit ... //depot/projects/trustedbsd/mac/sys/net/if_disc.c#4 edit ... //depot/projects/trustedbsd/mac/sys/net/if_ef.c#5 edit ... //depot/projects/trustedbsd/mac/sys/net/if_faith.c#10 edit ... //depot/projects/trustedbsd/mac/sys/net/if_media.c#4 edit ... //depot/projects/trustedbsd/mac/sys/net/if_mib.c#3 edit ... //depot/projects/trustedbsd/mac/sys/net/if_sl.c#8 edit ... //depot/projects/trustedbsd/mac/sys/net/if_tap.c#8 edit ... //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#8 edit ... //depot/projects/trustedbsd/mac/sys/net/intrq.c#4 edit ... //depot/projects/trustedbsd/mac/sys/net/net_osdep.c#4 edit ... //depot/projects/trustedbsd/mac/sys/net/ppp_tty.c#6 edit ... //depot/projects/trustedbsd/mac/sys/net/route.c#5 edit ... //depot/projects/trustedbsd/mac/sys/net/slcompress.c#3 edit ... //depot/projects/trustedbsd/mac/sys/netatalk/ddp_usrreq.c#6 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_UI.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_async.c#5 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_base.c#6 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_bpf.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_bridge.c#5 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_cisco.c#3 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_echo.c#3 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_eiface.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_ether.c#5 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_frame_relay.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_gif.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_gif_demux.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_hole.c#3 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_iface.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_ip_input.c#3 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_ksocket.c#9 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_lmi.c#3 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_mppc.c#6 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_one2many.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_ppp.c#6 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_pppoe.c#5 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_pptpgre.c#5 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_rfc1490.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_sample.c#3 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_split.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_tee.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_tty.c#6 edit ... //depot/projects/trustedbsd/mac/sys/netgraph/ng_vjc.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_export.c#6 (text+ko) ==== @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/bpf_filter.c#5 (text+ko) ==== @@ -66,7 +66,6 @@ #endif #ifdef _KERNEL -#include #include #endif #include ==== //depot/projects/trustedbsd/mac/sys/net/bridge.c#7 (text+ko) ==== @@ -89,7 +89,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/if.h#12 (text+ko) ==== @@ -37,11 +37,6 @@ #ifndef _NET_IF_H_ #define _NET_IF_H_ -/* - * XXX: this include of sys/mac.h is needed for ifreq to be defined, but - * may need to go away someday. - */ -#include #include /* ==== //depot/projects/trustedbsd/mac/sys/net/if_disc.c#4 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/if_ef.c#5 (text+ko) ==== @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/if_faith.c#10 (text+ko) ==== @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/if_media.c#4 (text+ko) ==== @@ -47,7 +47,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/if_mib.c#3 (text+ko) ==== @@ -30,7 +30,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/if_sl.c#8 (text+ko) ==== @@ -70,7 +70,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/if_tap.c#8 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#8 (text+ko) ==== @@ -58,7 +58,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/intrq.c#4 (text+ko) ==== @@ -27,7 +27,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/net_osdep.c#4 (text+ko) ==== @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/ppp_tty.c#6 (text+ko) ==== @@ -79,7 +79,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/route.c#5 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/net/slcompress.c#3 (text+ko) ==== @@ -44,7 +44,6 @@ */ #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/netatalk/ddp_usrreq.c#6 (text+ko) ==== @@ -7,7 +7,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_UI.c#4 (text+ko) ==== @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_async.c#5 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_base.c#6 (text+ko) ==== @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_bpf.c#4 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_bridge.c#5 (text+ko) ==== @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_cisco.c#3 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_echo.c#3 (text+ko) ==== @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_eiface.c#4 (text+ko) ==== @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_ether.c#5 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_frame_relay.c#4 (text+ko) ==== @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_gif.c#4 (text+ko) ==== @@ -70,7 +70,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_gif_demux.c#4 (text+ko) ==== @@ -77,7 +77,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_hole.c#3 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_iface.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_ip_input.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_ksocket.c#9 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_lmi.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_mppc.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_one2many.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_ppp.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_pppoe.c#5 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_pptpgre.c#5 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_rfc1490.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_sample.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_split.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_tee.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_tty.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_vjc.c#4 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 1:39:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8949337B416; Fri, 14 Jun 2002 01:38:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2B12837B40F for ; Fri, 14 Jun 2002 01:38:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E8cB512980 for perforce@freebsd.org; Fri, 14 Jun 2002 01:38:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 01:38:11 -0700 (PDT) Message-Id: <200206140838.g5E8cB512980@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12901 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12901 Change 12901 by rwatson@rwatson_paprika on 2002/06/14 01:37:34 Diff reduce. Affected files ... ... //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.c#10 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/ah_core.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/ah_input.c#6 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/ah_output.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/dest6.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/esp_core.c#5 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/esp_input.c#6 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/esp_output.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/frag6.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/in6_cksum.c#3 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/in6_gif.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/in6_ifattach.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/in6_pcb.c#8 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/in6_proto.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/in6_rmx.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/in6_src.c#5 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_forward.c#6 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_fw.c#7 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_input.c#8 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/ip6_output.c#7 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_core.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_input.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_output.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/ipsec.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/mld6.c#3 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/nd6_nbr.c#5 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/nd6_rtr.c#5 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/route6.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/scope6.c#4 edit ... //depot/projects/trustedbsd/mac/sys/netinet6/udp6_output.c#5 edit ... //depot/projects/trustedbsd/mac/sys/netsmb/smb_dev.c#6 edit ... //depot/projects/trustedbsd/mac/sys/netsmb/smb_trantcp.c#9 edit ... //depot/projects/trustedbsd/mac/sys/nfsclient/bootp_subr.c#7 edit ... //depot/projects/trustedbsd/mac/sys/nfsclient/krpc_subr.c#5 edit ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_lock.c#6 edit ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_nfsiod.c#5 edit ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#8 edit ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_subs.c#7 edit ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#10 edit ... //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#5 edit ... //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#10 edit ... //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvcache.c#3 edit ... //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#5 edit ... //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsubs.c#7 edit ... //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_syscalls.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.c#10 (text+ko) ==== @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/ah_core.c#4 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/ah_input.c#6 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/ah_output.c#4 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/dest6.c#4 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/esp_core.c#5 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/esp_input.c#6 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/esp_output.c#4 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/frag6.c#4 (text+ko) ==== @@ -32,7 +32,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_cksum.c#3 (text+ko) ==== @@ -66,7 +66,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_gif.c#4 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_ifattach.c#4 (text+ko) ==== @@ -31,7 +31,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_pcb.c#8 (text+ko) ==== @@ -72,7 +72,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_proto.c#4 (text+ko) ==== @@ -75,7 +75,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_rmx.c#4 (text+ko) ==== @@ -80,7 +80,6 @@ #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/in6_src.c#5 (text+ko) ==== @@ -70,7 +70,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/ip6_forward.c#6 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/ip6_fw.c#7 (text+ko) ==== @@ -64,7 +64,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/ip6_input.c#8 (text+ko) ==== @@ -73,7 +73,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/ip6_output.c#7 (text+ko) ==== @@ -72,7 +72,6 @@ #include "opt_pfil_hooks.h" #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_core.c#4 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_input.c#4 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/ipcomp_output.c#4 (text+ko) ==== @@ -39,7 +39,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/ipsec.c#4 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/mld6.c#3 (text+ko) ==== @@ -74,7 +74,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/nd6_nbr.c#5 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/nd6_rtr.c#5 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/route6.c#4 (text+ko) ==== @@ -34,7 +34,6 @@ #include "opt_inet6.h" #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/scope6.c#4 (text+ko) ==== @@ -31,7 +31,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netinet6/udp6_output.c#5 (text+ko) ==== @@ -70,7 +70,6 @@ #include "opt_inet6.h" #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netsmb/smb_dev.c#6 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include #include /* Must come after sys/malloc.h */ -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netsmb/smb_trantcp.c#9 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/nfsclient/bootp_subr.c#7 (text+ko) ==== @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/nfsclient/krpc_subr.c#5 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_lock.c#6 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include /* for hz */ #include -#include #include #include /* for hz */ /* Must come after sys/malloc.h */ #include ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_nfsiod.c#5 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#8 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_subs.c#7 (text+ko) ==== @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#10 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#5 (text+ko) ==== @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#10 (text+ko) ==== @@ -82,7 +82,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvcache.c#3 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include /* for dup_sockaddr */ ==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#5 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsubs.c#7 (text+ko) ==== @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_syscalls.c#6 (text+ko) ==== @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 1:44:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 756B237B406; Fri, 14 Jun 2002 01:44:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 938F237B41F for ; Fri, 14 Jun 2002 01:44:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E8iKE13895 for perforce@freebsd.org; Fri, 14 Jun 2002 01:44:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 01:44:20 -0700 (PDT) Message-Id: <200206140844.g5E8iKE13895@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12903 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12903 Change 12903 by rwatson@rwatson_paprika on 2002/06/14 01:43:22 Diff reduce. Affected files ... ... //depot/projects/trustedbsd/mac/sys/pci/if_dc.c#12 edit ... //depot/projects/trustedbsd/mac/sys/pci/if_mn.c#3 edit ... //depot/projects/trustedbsd/mac/sys/pci/if_pcn.c#6 edit ... //depot/projects/trustedbsd/mac/sys/pci/if_rl.c#9 edit ... //depot/projects/trustedbsd/mac/sys/pci/if_sf.c#6 edit ... //depot/projects/trustedbsd/mac/sys/pci/if_sis.c#10 edit ... //depot/projects/trustedbsd/mac/sys/pci/if_sk.c#7 edit ... //depot/projects/trustedbsd/mac/sys/pci/if_ste.c#6 edit ... //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#9 edit ... //depot/projects/trustedbsd/mac/sys/pci/if_tl.c#6 edit ... //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#6 edit ... //depot/projects/trustedbsd/mac/sys/pci/if_wb.c#6 edit ... //depot/projects/trustedbsd/mac/sys/pci/if_xl.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/pci/if_dc.c#12 (text+ko) ==== @@ -92,7 +92,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/pci/if_mn.c#3 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/pci/if_pcn.c#6 (text+ko) ==== @@ -58,7 +58,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/pci/if_rl.c#9 (text+ko) ==== @@ -86,7 +86,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/pci/if_sf.c#6 (text+ko) ==== @@ -82,7 +82,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/pci/if_sis.c#10 (text+ko) ==== @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/pci/if_sk.c#7 (text+ko) ==== @@ -71,7 +71,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/pci/if_ste.c#6 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#9 (text+ko) ==== @@ -81,7 +81,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/pci/if_tl.c#6 (text+ko) ==== @@ -181,7 +181,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#6 (text+ko) ==== @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/pci/if_wb.c#6 (text+ko) ==== @@ -88,7 +88,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/pci/if_xl.c#7 (text+ko) ==== @@ -103,7 +103,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 1:45:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E63B37B409; Fri, 14 Jun 2002 01:45:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6830F37B414 for ; Fri, 14 Jun 2002 01:45:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E8jM514029 for perforce@freebsd.org; Fri, 14 Jun 2002 01:45:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 01:45:22 -0700 (PDT) Message-Id: <200206140845.g5E8jM514029@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12904 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12904 Change 12904 by rwatson@rwatson_paprika on 2002/06/14 01:44:34 Maybe mac.h does belong here. Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#7 (text+ko) ==== @@ -37,9 +37,6 @@ #ifndef _SYS_MBUF_H_ #define _SYS_MBUF_H_ -/* - * XXX: This probably needs to go. - */ #include /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 1:52:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95D3737B41E; Fri, 14 Jun 2002 01:52:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B868D37B40D for ; Fri, 14 Jun 2002 01:52:31 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E8qVI15018 for perforce@freebsd.org; Fri, 14 Jun 2002 01:52:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 01:52:31 -0700 (PDT) Message-Id: <200206140852.g5E8qVI15018@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12906 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12906 Change 12906 by rwatson@rwatson_paprika on 2002/06/14 01:52:01 We don't plan to put struct mac in struct xucred, so remove already disabled changes. Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/ucred.h#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/ucred.h#11 (text+ko) ==== @@ -74,9 +74,6 @@ short cr_ngroups; /* number of groups */ gid_t cr_groups[NGROUPS]; /* groups */ void *_cr_unused1; /* compatibility with old ucred */ -#if 0 - struct mac cr_label; /* mandatory access control label */ -#endif }; #define XUCRED_VERSION 0 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 1:54:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63B4637B415; Fri, 14 Jun 2002 01:54:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 97F1237B408 for ; Fri, 14 Jun 2002 01:54:34 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5E8sYd15175 for perforce@freebsd.org; Fri, 14 Jun 2002 01:54:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 01:54:34 -0700 (PDT) Message-Id: <200206140854.g5E8sYd15175@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12907 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12907 Change 12907 by rwatson@rwatson_paprika on 2002/06/14 01:53:42 Whitespace cleanup. Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/socket.h#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/socket.h#7 (text+ko) ==== @@ -96,8 +96,8 @@ #define SO_ERROR 0x1007 /* get error status and clear */ #define SO_TYPE 0x1008 /* get socket type */ /*efine SO_PRIVSTATE 0x1009 get/deny privileged state */ -#define SO_LABEL 0x1010 /* sockets MAC label */ -#define SO_PEERLABEL 0x1011 /* sockets peer MAC label */ +#define SO_LABEL 0x1010 /* sockets MAC label */ +#define SO_PEERLABEL 0x1011 /* sockets peer MAC label */ /* * Structure used for manipulating linger option. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 3:43: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F344F37B413; Fri, 14 Jun 2002 03:42:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F1B7537B405 for ; Fri, 14 Jun 2002 03:42:45 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5EAgj035717 for perforce@freebsd.org; Fri, 14 Jun 2002 03:42:45 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 14 Jun 2002 03:42:45 -0700 (PDT) Message-Id: <200206141042.g5EAgj035717@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12911 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12911 Change 12911 by julian@julian_jules1 on 2002/06/14 03:42:10 Start changing the API a bit. Affected files ... ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#48 edit ... //depot/projects/kse/sys/kern/kern_proc.c#66 edit ... //depot/projects/kse/sys/sys/kse.h#9 edit ... //depot/projects/kse/sys/sys/proc.h#108 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#48 (text+ko) ==== @@ -309,6 +309,7 @@ void cpu_save_upcall(struct thread *td, struct kse *newkse) { + struct trapframe *tf newkse->ke_mdstorage = malloc(sizeof(struct md_store), M_TEMP, M_WAITOK); @@ -318,13 +319,21 @@ &(((struct md_store *)(newkse->ke_mdstorage))->mds_pcb); newkse->ke_frame = &(((struct md_store *)(newkse->ke_mdstorage))->mds_frame); + tf = newkse->ke_frame /* Copy the upcall pcb. Kernel mode & fp regs are here. */ /* XXXKSE this may be un-needed */ bcopy(td->td_pcb, newkse->ke_pcb, sizeof(struct pcb)); /* This copies most of the user mode register values. */ - bcopy(td->td_frame, newkse->ke_frame, sizeof(struct trapframe)); + bzero(newkse->ke_frame, sizeof(struct trapframe)); + tf->tf_edi = 0; + tf->tf_esi = 0; /* trampoline arg */ + tf->tf_ebp = 0; + tf->tf_esp = (int) newkse->ke_stackbase + newkse->ke_stacksize - 16; + tf->tf_ebx = 0; /* trampoline arg */ + tf->tf_eip = (int)newkse->ke_upcall; + /* } void ==== //depot/projects/kse/sys/kern/kern_proc.c#66 (text+ko) ==== @@ -201,6 +201,10 @@ } +/* + * No new KSEG: first call: use current KSE, don't schedule an upcall + * All other situations, do alloate a new KSE and schedule an upcall on it. + */ /* struct kse_new_args { struct kse_mailbox *mbx; int new_grp_flag; @@ -210,8 +214,12 @@ { struct kse *newkse; struct proc *p; + struct kse_mailbox mbx; + int err; p = td->td_proc; + if ((err = copyin(uap->mbx, &mbx, sizeof(mbx)))) + return (err); PROC_LOCK(p); /* * If we have no KSE mode set, just set it, and skip KSE and KSEGRP @@ -219,7 +227,7 @@ * you are effectively getting one. Instead, go directly to saving * the upcall info. */ - if (td->td_proc->p_flag & P_KSES) { + if ((td->td_proc->p_flag & P_KSES) || (uap->new_grp_flag)) { return (EINVAL); /* XXX */ /* @@ -246,20 +254,23 @@ mi_switch(); /* Save current registers to PCB. */ mtx_unlock_spin(&sched_lock); PROC_LOCK(p); + newkse->ke_upcall = mbx.kmbx_upcall; + newkse->ke_stackbase = mbx.kmbx_stackbase; + newkse->ke_stacksize = mbx.kmbx_stacksize; + newkse->ke_mailbox = uap->mbx; cpu_save_upcall(td, newkse); - newkse->ke_mailbox = uap->mbx; PROC_UNLOCK(p); /* Note that we are the returning syscall */ td->td_retval[0] = 1; td->td_retval[1] = 0; - if (td->td_proc->p_flag & P_KSES) { + if ((td->td_proc->p_flag & P_KSES) || (uap->new_grp_flag)) { thread_schedule_upcall(td, newkse); } else { /* - * Don't set this untill we are truely ready, because + * Don't set this until we are truely ready, because * things will start acting differently. Return to the - * upcall code for the first time. Assuming we set up + * calling code for the first time. Assuming we set up * the mailboxes right, all syscalls after this will be * asynchronous. */ ==== //depot/projects/kse/sys/sys/kse.h#9 (text+ko) ==== @@ -38,7 +38,8 @@ * the userland and the kernel when running a KSE-based threading system. * The only programs that should see this file are the UTS and the kernel. */ - +struct kse_mailbox; +typedef void kse_fn_t(struct kse_mailbox *mbx) /* * Each userland thread has one of these buried in it's * Thread control structure somewhere. @@ -58,10 +59,13 @@ */ struct kse_mailbox { - struct thread_mailbox *current_thread; - struct thread_mailbox *completed_threads; - unsigned int flags; - void *UTS_handle; /* The UTS can use this for anything */ + kse_fn_t *kmbx_upcall; + caddr_t kmbx_stackbase; + unsigned long int kmbx_stacksize; + struct thread_mailbox *kmbx_current_thread; + struct thread_mailbox *kmbx_completed_threads; + unsigned int kmbx_flags; + void *kmbx_UTS_handle; /* UTS can use this for anything */ }; #define KEMBXF_CRITICAL 0x00000001 ==== //depot/projects/kse/sys/sys/proc.h#108 (text+ko) ==== @@ -368,6 +368,9 @@ u_char ke_dummy; /* */ #define ke_endcopy ke_mdstorage + void *ke_upcall; + void *ke_stackbase; + u_long *ke_stacksize; void *ke_mdstorage; /* where we store the pcb and frame */ struct pcb *ke_pcb; /* the pcb saved for the upcalls */ struct trapframe *ke_frame; /* the upcall trapframe */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 9:34:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EFEA37B431; Fri, 14 Jun 2002 09:34:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail15.speakeasy.net [216.254.0.215]) by hub.freebsd.org (Postfix) with ESMTP id 8237537B409 for ; Fri, 14 Jun 2002 09:34:34 -0700 (PDT) Received: (qmail 19703 invoked from network); 14 Jun 2002 16:34:30 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail15.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 14 Jun 2002 16:34:30 -0000 Received: from laptop.baldwin.cx ([206.187.69.204]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g5EGYJb93935; Fri, 14 Jun 2002 12:34:19 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200206140754.g5E7sHp04595@freefall.freebsd.org> Date: Fri, 14 Jun 2002 12:34:17 -0400 (EDT) From: John Baldwin To: Robert Watson Subject: RE: PERFORCE change 12897 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 14-Jun-2002 Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12897 > > Change 12897 by rwatson@rwatson_paprika on 2002/06/14 00:53:58 > > Fix botched integ. Actually, except for the first hunk this looks to be all botches. :-/ > Affected files ... > > ... //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#17 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#17 (text+ko) ==== > > @@ -380,8 +380,14 @@ > w = lock->lo_witness; > if (w != NULL) { > mtx_lock_spin(&w_mtx); > - MPASS(w->w_refcount > 0); > w->w_refcount--; > + if (w->w_refcount == 0) { > + CTR2(KTR_WITNESS, > + "%s: marking witness %s as dead", __func__, w->w_name); > + w->w_name = "(dead)"; > + w->w_file = "(dead)"; > + w->w_line = 0; > + } > mtx_unlock_spin(&w_mtx); > } > > @@ -444,7 +450,7 @@ > */ > prnt("\nLocks which were never acquired:\n"); > STAILQ_FOREACH(w, &w_all, w_list) { > - if (w->w_file != NULL || w->w_refcount == 0) > + if (w->w_file != NULL) > continue; > prnt("%s\n", w->w_name); > } > @@ -932,8 +938,7 @@ > return (NULL); > mtx_lock_spin(&w_mtx); > STAILQ_FOREACH(w, &w_all, w_list) { > - if (w->w_name == description || (w->w_refcount > 0 && > - strcmp(description, w->w_name) == 0)) { > + if (strcmp(description, w->w_name) == 0) { > w->w_refcount++; > mtx_unlock_spin(&w_mtx); > if (lock_class != w->w_class) > @@ -1145,13 +1150,10 @@ > prnt("%-2d", level); > for (i = 0; i < level; i++) > prnt(" "); > - if (parent->w_refcount > 0) { > - prnt("%s", parent->w_name); > - if (parent->w_file != NULL) > - prnt(" -- last acquired @ %s:%d\n", parent->w_file, > - parent->w_line); > - } else > - prnt("(dead)\n"); > + prnt("%s", parent->w_name); > + if (parent->w_file != NULL) > + prnt(" -- last acquired @ %s:%d\n", parent->w_file, > + parent->w_line); > for (wcl = parent->w_children; wcl != NULL; wcl = wcl->wcl_next) > for (i = 0; i < wcl->wcl_count; i++) > witness_displaydescendants(prnt, -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 11:24: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7754237B40F; Fri, 14 Jun 2002 11:23:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id BFF6A37B410; Fri, 14 Jun 2002 11:23:54 -0700 (PDT) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.3/8.12.3) with SMTP id g5EINRb5062975; Fri, 14 Jun 2002 14:23:28 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Fri, 14 Jun 2002 14:23:27 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: John Baldwin Cc: Perforce Change Reviews Subject: RE: PERFORCE change 12897 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 14 Jun 2002, John Baldwin wrote: > On 14-Jun-2002 Robert Watson wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12897 > > > > Change 12897 by rwatson@rwatson_paprika on 2002/06/14 00:53:58 > > > > Fix botched integ. > > Actually, except for the first hunk this looks to be all botches. :-/ Not sure I follow -- I simply merged whatever was in trustedbsd_base into trustedbsd_mac, but the stuff in trustedbsd_base is still pre-gcc changes. Did I mess up somewhere? :-) Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 11:45:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2128637B416; Fri, 14 Jun 2002 11:45:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4C60E37B414 for ; Fri, 14 Jun 2002 11:45:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5EIjip32953 for perforce@freebsd.org; Fri, 14 Jun 2002 11:45:44 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 14 Jun 2002 11:45:44 -0700 (PDT) Message-Id: <200206141845.g5EIjip32953@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12930 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12930 Change 12930 by julian@julian_jules1 on 2002/06/14 11:45:26 fix braino Affected files ... ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#49 edit ... //depot/projects/kse/sys/sys/kse.h#10 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#49 (text+ko) ==== @@ -333,7 +333,6 @@ tf->tf_esp = (int) newkse->ke_stackbase + newkse->ke_stacksize - 16; tf->tf_ebx = 0; /* trampoline arg */ tf->tf_eip = (int)newkse->ke_upcall; - /* } void ==== //depot/projects/kse/sys/sys/kse.h#10 (text+ko) ==== @@ -39,7 +39,8 @@ * The only programs that should see this file are the UTS and the kernel. */ struct kse_mailbox; -typedef void kse_fn_t(struct kse_mailbox *mbx) +typedef void kse_fn_t(struct kse_mailbox *mbx); + /* * Each userland thread has one of these buried in it's * Thread control structure somewhere. @@ -52,7 +53,6 @@ union kse_td_ctx ctx; /* thread's saved context goes here. */ }; - /* * You need to supply one of these as the argument to the * kse_new() system call. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 11:52:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F6BF37B408; Fri, 14 Jun 2002 11:52:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail17.speakeasy.net [216.254.0.217]) by hub.freebsd.org (Postfix) with ESMTP id B3AE937B407 for ; Fri, 14 Jun 2002 11:52:13 -0700 (PDT) Received: (qmail 21287 invoked from network); 14 Jun 2002 18:52:13 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail17.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 14 Jun 2002 18:52:13 -0000 Received: from laptop.baldwin.cx ([206.187.69.204]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g5EIprb94512; Fri, 14 Jun 2002 14:51:54 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Fri, 14 Jun 2002 14:51:41 -0400 (EDT) From: John Baldwin To: Robert Watson Subject: RE: PERFORCE change 12897 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 14-Jun-2002 Robert Watson wrote: > > On Fri, 14 Jun 2002, John Baldwin wrote: > >> On 14-Jun-2002 Robert Watson wrote: >> > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12897 >> > >> > Change 12897 by rwatson@rwatson_paprika on 2002/06/14 00:53:58 >> > >> > Fix botched integ. >> >> Actually, except for the first hunk this looks to be all botches. :-/ > > Not sure I follow -- I simply merged whatever was in trustedbsd_base into > trustedbsd_mac, but the stuff in trustedbsd_base is still pre-gcc changes. > Did I mess up somewhere? :-) Oh, hmm, nm then. The w_refcount == 0 stuff is in current -current. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 12: 2:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9908537B40E; Fri, 14 Jun 2002 12:02:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C42E537B433 for ; Fri, 14 Jun 2002 12:02:04 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5EJ24e34791 for perforce@freebsd.org; Fri, 14 Jun 2002 12:02:04 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 14 Jun 2002 12:02:04 -0700 (PDT) Message-Id: <200206141902.g5EJ24e34791@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12931 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12931 Change 12931 by julian@julian_ref on 2002/06/14 12:01:06 fix more typos Affected files ... ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#50 edit ... //depot/projects/kse/sys/sys/proc.h#109 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#50 (text+ko) ==== @@ -309,7 +309,7 @@ void cpu_save_upcall(struct thread *td, struct kse *newkse) { - struct trapframe *tf + struct trapframe *tf; newkse->ke_mdstorage = malloc(sizeof(struct md_store), M_TEMP, M_WAITOK); @@ -319,7 +319,7 @@ &(((struct md_store *)(newkse->ke_mdstorage))->mds_pcb); newkse->ke_frame = &(((struct md_store *)(newkse->ke_mdstorage))->mds_frame); - tf = newkse->ke_frame + tf = newkse->ke_frame; /* Copy the upcall pcb. Kernel mode & fp regs are here. */ /* XXXKSE this may be un-needed */ @@ -330,7 +330,7 @@ tf->tf_edi = 0; tf->tf_esi = 0; /* trampoline arg */ tf->tf_ebp = 0; - tf->tf_esp = (int) newkse->ke_stackbase + newkse->ke_stacksize - 16; + tf->tf_esp = (int)newkse->ke_stackbase + newkse->ke_stacksize - 16; tf->tf_ebx = 0; /* trampoline arg */ tf->tf_eip = (int)newkse->ke_upcall; } ==== //depot/projects/kse/sys/sys/proc.h#109 (text+ko) ==== @@ -370,7 +370,7 @@ void *ke_upcall; void *ke_stackbase; - u_long *ke_stacksize; + u_long ke_stacksize; void *ke_mdstorage; /* where we store the pcb and frame */ struct pcb *ke_pcb; /* the pcb saved for the upcalls */ struct trapframe *ke_frame; /* the upcall trapframe */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 12:17:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22B0437B410; Fri, 14 Jun 2002 12:17:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3288F37B417 for ; Fri, 14 Jun 2002 12:17:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5EJHMu40219 for perforce@freebsd.org; Fri, 14 Jun 2002 12:17:22 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 14 Jun 2002 12:17:22 -0700 (PDT) Message-Id: <200206141917.g5EJHMu40219@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12933 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12933 Change 12933 by julian@julian_ref on 2002/06/14 12:17:03 at least it compiles now.... Affected files ... ... //depot/projects/kse/sys/i386/i386/trap.c#49 edit ... //depot/projects/kse/sys/kern/kern_proc.c#67 edit ... //depot/projects/kse/sys/kern/kern_thread.c#68 edit ... //depot/projects/kse/sys/kern/subr_trap.c#63 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#49 (text+ko) ==== @@ -963,7 +963,7 @@ * but for now do it every time. */ td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox - + offsetof(struct kse_mailbox, current_thread)); + + offsetof(struct kse_mailbox, kmbx_current_thread)); if ((td->td_mailbox == NULL) || (td->td_mailbox == (void *)-1)) { td->td_mailbox = NULL; /* single thread it.. */ ==== //depot/projects/kse/sys/kern/kern_proc.c#67 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/kse/sys/kern/kern_thread.c#68 (text+ko) ==== @@ -301,7 +301,7 @@ ke = td->td_kse; addr1 = (caddr_t)ke->ke_mailbox - + offsetof(struct kse_mailbox, completed_threads); + + offsetof(struct kse_mailbox, kmbx_completed_threads); addr2 = (caddr_t)td->td_mailbox + offsetof(struct thread_mailbox , next_completed); /* Then link it into it's KSE's list of completed threads. */ ==== //depot/projects/kse/sys/kern/subr_trap.c#63 (text+ko) ==== @@ -227,7 +227,8 @@ */ td->td_flags &= ~TDF_UPCALLING; /* Hmmmm. */ error = suword((caddr_t)td->td_kse->ke_mailbox + - offsetof(struct kse_mailbox, current_thread), 0); + offsetof(struct kse_mailbox, kmbx_current_thread), + 0); } /* * Stop any chance that we may be separated from To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 13:39:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E7F437B404; Fri, 14 Jun 2002 13:39:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8615B37B432 for ; Fri, 14 Jun 2002 13:39:06 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5EKd6t52939 for perforce@freebsd.org; Fri, 14 Jun 2002 13:39:06 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 14 Jun 2002 13:39:06 -0700 (PDT) Message-Id: <200206142039.g5EKd6t52939@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12939 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12939 Change 12939 by julian@julian_ref on 2002/06/14 13:38:57 try make the test program compile Affected files ... ... //depot/projects/kse/bin/ksetest/kse_threads_test.c#7 edit ... //depot/projects/kse/sys/sys/kse.h#11 edit Differences ... ==== //depot/projects/kse/bin/ksetest/kse_threads_test.c#7 (text+ko) ==== @@ -19,7 +19,7 @@ }; struct per_kse { - struct kse_mailbox *mbox; + struct kse_mailbox mbox; struct user_thread *curthread; }; /************************************************************* @@ -52,7 +52,7 @@ /************************************************************* * Globals **************************************************************/ -struct per_kse first_kse; /* for NOW cheat and make it global */ +struct per_kse *first_kse; /* for NOW cheat and make it global */ TAILQ_HEAD(, user_thread) runqueue = TAILQ_HEAD_INITIALIZER(runqueue); /************************************************************* * Implementation parameters @@ -87,30 +87,21 @@ * and there-after, returned to by the upcall many times. **************************************************************/ void -UTS(struct _jmp_buf *jb1, struct per_kse *ksedata, int newgroup) +UTS(struct kse_mailbox *ke_mbox) { - struct kse_mailbox ke_mbox; struct user_thread *thread; struct thread_mailbox *completed; + struct per_kse *ksedata = ke_mbox->kmbx_UTS_handle; int done = 0; - /* Let the caller know where our mailbox is */ - bzero(&ke_mbox, sizeof(ke_mbox)); - ksedata->mbox = &ke_mbox; - ke_mbox.UTS_handle = ksedata; - if( kse_new(&ke_mbox, newgroup)) { /* initial call returns */ - _longjmp(jb1, 1); /* go back to caller's stack and caller */ - /* NOTREACHED */ - } - /**********************************/ /* UTS upcall starts running here. */ /**********************************/ /**********************************/ /* If there are returned syscall threads, put them on the run queue */ - if ((completed = ke_mbox.completed_threads)) { - ke_mbox.completed_threads = NULL; + if ((completed = ke_mbox->kmbx_completed_threads)) { + ke_mbox->kmbx_completed_threads = NULL; while (completed) { thread = completed->UTS_handle; completed = completed->next_completed; @@ -121,7 +112,7 @@ /* find highest priority thread and load it */ if ((thread = select_thread())) { ksedata->curthread = thread; - ke_mbox.current_thread = &thread->mbox; + ke_mbox->kmbx_current_thread = &thread->mbox; /* loads context similar to longjmp() */ loadthread(&thread->mbox.ctx.tfrm.tf_tf); @@ -141,22 +132,19 @@ jmp_buf jb1; jmp_buf jb2; struct kse_mailbox *mboxaddr; - int i; + struct per_kse *user_UTS_info; + int err; newstack = malloc(K_STACKSIZE); - if (_setjmp(jb1) == 0) { - if (_setjmp(jb2) == 0) { - jb2[0]._jb[2] = (int)&newstack[K_STACKSIZE - 16]; - _longjmp(jb2, 1); - } - /* running with a different SP */ - { - /* Get all the rest set up. */ - UTS(&jb1[0], ksedata, newgroup); - /* NOTREACHED */ - } - } - return(0); + user_UTS_info = malloc(sizeof (struct per_kse)); + bzero(user_UTS_info, sizeof (struct per_kse)); + mboxaddr = &user_UTS_info->mbox; + mboxaddr->kmbx_stackbase = newstack; + mboxaddr->kmbx_stacksize = K_STACKSIZE; + mboxaddr->kmbx_upcall = &UTS; + mboxaddr->kmbx_UTS_handle = newstack; + err = kse_new(mboxaddr, newgroup); + return(err); } @@ -264,10 +252,10 @@ runq_insert( makethread(&thread2_code, 0, NULL)); /* and one which we will run ourself */ - first_kse.curthread = makethread(&thread3_code, 0, NULL); + first_kse->curthread = makethread(&thread3_code, 0, NULL); /* start two KSEs in different KSEGRPs */ - if (startkse(&first_kse)) { + if (startkse(first_kse)) { perror("failed to start KSE"); exit(1); } @@ -277,7 +265,7 @@ /* we are a thread, start the ball rolling */ /* let the kernel know we are it */ - first_kse.mbox->current_thread = &first_kse.curthread->mbox; + first_kse->mbox.kmbx_current_thread = &first_kse->curthread->mbox; thread3_code(NULL); return 0; } ==== //depot/projects/kse/sys/sys/kse.h#11 (text+ko) ==== @@ -32,6 +32,7 @@ #ifndef SYS_KSE_H #define SYS_KSE_H +#define _KERNEL #include /* * This file defines the structures needed for communication between @@ -59,8 +60,10 @@ */ struct kse_mailbox { + /*void (*kmbx_upcall)(struct kse_mailbox *mbx); */ kse_fn_t *kmbx_upcall; - caddr_t kmbx_stackbase; +int x; + char *kmbx_stackbase; unsigned long int kmbx_stacksize; struct thread_mailbox *kmbx_current_thread; struct thread_mailbox *kmbx_completed_threads; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 14:13:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E497E37B41F; Fri, 14 Jun 2002 14:13:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id EE46837B405 for ; Fri, 14 Jun 2002 14:13:43 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5EL9hs59474 for perforce@freebsd.org; Fri, 14 Jun 2002 14:09:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 14:09:43 -0700 (PDT) Message-Id: <200206142109.g5EL9hs59474@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12941 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12941 Change 12941 by rwatson@rwatson_paprika on 2002/06/14 14:08:44 Remove more cruft left over from earlier iterations. Affected files ... ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#106 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#106 (text+ko) ==== @@ -129,15 +129,6 @@ #define MAC_FLAG_INITIALIZED 0x00000001 /* Is initialized. */ -/* - * Network interface description structure for MAC. - */ -struct mac_ifnet_spec { - int mis_type; /* not used yet */ - struct mac mis_label_outgoing; /* mbuf must match */ - struct mac mis_label_incoming; /* default on mbuf */ -}; - #ifndef _KERNEL /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 15:29:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8B1D37B41B; Fri, 14 Jun 2002 15:29:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AEC0A37B426 for ; Fri, 14 Jun 2002 15:29:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5EMTNB74736 for perforce@freebsd.org; Fri, 14 Jun 2002 15:29:23 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Date: Fri, 14 Jun 2002 15:29:23 -0700 (PDT) Message-Id: <200206142229.g5EMTNB74736@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bmilekic@freebsd.org using -f From: Bosko Milekic Subject: PERFORCE change 12944 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12944 Change 12944 by bmilekic@bmilekic_freefall on 2002/06/14 15:28:47 IFC. Affected files ... ... //depot/projects/interrupt/sys/Makefile#2 integrate Differences ... ==== //depot/projects/interrupt/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.25 2000/08/24 18:53:09 peter Exp $ +# $FreeBSD: src/sys/Makefile,v 1.26 2002/04/26 17:55:21 ru Exp $ # The boot loader SUBDIR= boot @@ -8,11 +8,6 @@ SUBDIR+=modules .endif -afterdistribute: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${MACHINE}/conf/GENERIC.hints \ - ${DESTDIR}/boot/device.hints - HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 15:30: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A49B37B40C; Fri, 14 Jun 2002 15:28:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 069CF37B407 for ; Fri, 14 Jun 2002 15:28:22 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5EMSLY74695 for perforce@freebsd.org; Fri, 14 Jun 2002 15:28:21 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Date: Fri, 14 Jun 2002 15:28:21 -0700 (PDT) Message-Id: <200206142228.g5EMSLY74695@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bmilekic@freebsd.org using -f From: Bosko Milekic Subject: PERFORCE change 12943 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12943 Change 12943 by bmilekic@bmilekic_freefall on 2002/06/14 15:28:10 IFC. Affected files ... ... //depot/projects/interrupt/sys/alpha/alpha/api_up1000.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/autoconf.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/busdma_machdep.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/clock.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/cpuconf.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/critical.c#1 branch ... //depot/projects/interrupt/sys/alpha/alpha/db_disasm.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/db_instruction.h#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/db_interface.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/db_trace.c#3 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_1000a.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_2100_a50.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_2100_a500.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_axppci_33.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_eb164.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_eb64plus.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_kn20aa.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_kn300.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_st550.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dec_st6600.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/dump_machdep.c#1 branch ... //depot/projects/interrupt/sys/alpha/alpha/elf_machdep.c#3 integrate ... //depot/projects/interrupt/sys/alpha/alpha/exception.s#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/genassym.c#3 integrate ... //depot/projects/interrupt/sys/alpha/alpha/interrupt.c#5 integrate ... //depot/projects/interrupt/sys/alpha/alpha/machdep.c#4 integrate ... //depot/projects/interrupt/sys/alpha/alpha/mem.c#3 integrate ... //depot/projects/interrupt/sys/alpha/alpha/mp_machdep.c#4 integrate ... //depot/projects/interrupt/sys/alpha/alpha/pal.s#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/pmap.c#4 integrate ... //depot/projects/interrupt/sys/alpha/alpha/prom.c#3 integrate ... //depot/projects/interrupt/sys/alpha/alpha/prom_disp.s#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/promcons.c#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/support.s#2 integrate ... //depot/projects/interrupt/sys/alpha/alpha/sys_machdep.c#4 integrate ... //depot/projects/interrupt/sys/alpha/alpha/trap.c#5 integrate ... //depot/projects/interrupt/sys/alpha/alpha/vm_machdep.c#3 integrate ... //depot/projects/interrupt/sys/alpha/conf/GENERIC#3 integrate ... //depot/projects/interrupt/sys/alpha/conf/SIMOS#2 integrate ... //depot/projects/interrupt/sys/alpha/include/ansi.h#3 integrate ... //depot/projects/interrupt/sys/alpha/include/asm.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/atomic.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/bootinfo.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/clock.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/cpu.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/cpuconf.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/cpufunc.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/critical.h#1 branch ... //depot/projects/interrupt/sys/alpha/include/db_machdep.h#3 integrate ... //depot/projects/interrupt/sys/alpha/include/elf.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/endian.h#5 integrate ... //depot/projects/interrupt/sys/alpha/include/float.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/md_var.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/param.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/pmap.h#3 integrate ... //depot/projects/interrupt/sys/alpha/include/proc.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/profile.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/prom.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/reg.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/runq.h#1 branch ... //depot/projects/interrupt/sys/alpha/include/stdarg.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/sysarch.h#2 integrate ... //depot/projects/interrupt/sys/alpha/include/varargs.h#2 integrate ... //depot/projects/interrupt/sys/alpha/isa/isa_dma.c#2 integrate ... //depot/projects/interrupt/sys/alpha/linux/linux_dummy.c#2 integrate ... //depot/projects/interrupt/sys/alpha/linux/linux_proto.h#3 integrate ... //depot/projects/interrupt/sys/alpha/linux/linux_sysvec.c#3 integrate ... //depot/projects/interrupt/sys/alpha/mcbus/mcbus.c#2 integrate ... //depot/projects/interrupt/sys/alpha/mcbus/mcbusvar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/mcbus/mcpcia.c#3 integrate ... //depot/projects/interrupt/sys/alpha/mcbus/mcpciavar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/imgact_osf1.c#3 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1.h#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_ioctl.c#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_misc.c#4 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_mount.c#3 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_proto.h#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_signal.c#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_signal.h#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_sysvec.c#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_util.h#2 integrate ... //depot/projects/interrupt/sys/alpha/pci/cia.c#2 integrate ... //depot/projects/interrupt/sys/alpha/pci/irongate_pci.c#3 integrate ... //depot/projects/interrupt/sys/alpha/pci/lca.c#2 integrate ... //depot/projects/interrupt/sys/alpha/pci/lca_pci.c#3 integrate ... //depot/projects/interrupt/sys/alpha/pci/t2.c#2 integrate ... //depot/projects/interrupt/sys/alpha/pci/t2_pci.c#3 integrate ... //depot/projects/interrupt/sys/alpha/pci/tsunami.c#2 integrate ... //depot/projects/interrupt/sys/alpha/pci/tsunami_pci.c#3 integrate ... //depot/projects/interrupt/sys/alpha/tc/am7990.c#3 integrate ... //depot/projects/interrupt/sys/alpha/tc/am7990var.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/ascvar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/esp.c#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/if_le_dec.c#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/if_le_ioasic.c#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/if_levar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/ioasic.c#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/ioasicvar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/sticvar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/tc.c#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/tcds.c#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/tcdsreg.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/tcdsvar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tc/tcvar.h#2 integrate ... //depot/projects/interrupt/sys/alpha/tlsb/zs_tlsb.c#2 integrate Differences ... ==== //depot/projects/interrupt/sys/alpha/alpha/api_up1000.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.4 2001/02/02 01:48:40 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.5 2002/03/20 18:58:44 obrien Exp $ */ #include "opt_ddb.h" @@ -52,12 +52,12 @@ #endif static int comcnrate = CONSPEED; -void api_up1000_init __P((void)); -static void api_up1000_cons_init __P((void)); +void api_up1000_init(void); +static void api_up1000_cons_init(void); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void api_up1000_init() ==== //depot/projects/interrupt/sys/alpha/alpha/autoconf.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.49 2001/10/24 17:42:01 jlemon Exp $ + * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.51 2002/03/31 07:15:24 phk Exp $ */ #include "opt_bootp.h" @@ -58,11 +58,11 @@ #include #include -static void configure __P((void *)); +static void configure(void *); SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL) -static void configure_finish __P((void)); -static void configure_start __P((void)); +static void configure_finish(void); +static void configure_start(void); #ifdef DEV_ISA #include @@ -71,9 +71,6 @@ extern int nfs_diskless_valid; /* XXX use include file */ -dev_t rootdev = NODEV; -dev_t dumpdev = NODEV; - static void configure_start() { ==== //depot/projects/interrupt/sys/alpha/alpha/busdma_machdep.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.22 2002/01/05 08:47:09 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.23 2002/04/04 21:03:13 jhb Exp $ */ #include @@ -600,7 +600,7 @@ count = 0; if (total_bpages == 0) { - mtx_init(&bounce_lock, "BouncePage", MTX_DEF); + mtx_init(&bounce_lock, "BouncePage", NULL, MTX_DEF); STAILQ_INIT(&bounce_page_list); STAILQ_INIT(&bounce_map_waitinglist); STAILQ_INIT(&bounce_map_callbacklist); ==== //depot/projects/interrupt/sys/alpha/alpha/clock.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.27 2001/11/03 17:22:50 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/clock.c,v 1.31 2002/05/26 11:23:00 des Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* @@ -124,9 +124,6 @@ "alpha" /* name */ }; -SYSCTL_OPAQUE(_debug, OID_AUTO, alpha_timecounter, CTLFLAG_RD, - &alpha_timecounter, sizeof(alpha_timecounter), "S,timecounter", ""); - static struct timecounter i8254_timecounter = { i8254_get_timecount, /* get_timecount */ 0, /* no poll_pps */ @@ -135,9 +132,6 @@ "i8254" /* name */ }; -SYSCTL_OPAQUE(_debug, OID_AUTO, i8254_timecounter, CTLFLAG_RD, - &i8254_timecounter, sizeof(i8254_timecounter), "S,timecounter", ""); - /* Values for timerX_state: */ #define RELEASED 0 #define RELEASE_PENDING 1 @@ -216,6 +210,8 @@ out: #ifdef EVCNT_COUNTERS evcnt_attach(dev, "intr", &clock_intr_evcnt); +#else + /* nothing */ ; #endif } @@ -286,7 +282,7 @@ } stathz = hz / 8; - platform.clockintr = (void (*) __P((void *))) handleclock; + platform.clockintr = (void (*)(void *)) handleclock; /* * Get the clock started. @@ -488,7 +484,7 @@ struct timespec ts; if (base < 5*SECYR) { - printf("WARNING: preposterous time in file system"); + printf("WARNING: preposterous time in filesystem"); /* read the system clock anyway */ base = 6*SECYR + 186*SECDAY + SECDAY/2; badbase = 1; @@ -515,7 +511,7 @@ if (ct.year < 70 || ct.mon < 1 || ct.mon > 12 || ct.day < 1 || ct.day > 31 || ct.hour > 23 || ct.min > 59 || ct.sec > 59) { /* - * Believe the time in the file system for lack of + * Believe the time in the filesystem for lack of * anything better, resetting the TODR. */ s = splclock(); ==== //depot/projects/interrupt/sys/alpha/alpha/cpuconf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.12 2000/12/08 22:11:07 msmith Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.13 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: cpuconf.c,v 1.10 1998/03/20 21:48:21 thorpej Exp $ */ /* @@ -40,91 +40,91 @@ #include "opt_cpu.h" #ifdef DEC_3000_500 -extern void dec_3000_500_init __P((int)); +extern void dec_3000_500_init(int); #else #define dec_3000_500_init platform_not_configured #endif #ifdef DEC_3000_300 -extern void dec_3000_300_init __P((int)); +extern void dec_3000_300_init(int); #else #define dec_3000_300_init platform_not_configured #endif #ifdef DEC_AXPPCI_33 -extern void dec_axppci_33_init __P((int)); +extern void dec_axppci_33_init(int); #else #define dec_axppci_33_init platform_not_configured #endif #ifdef DEC_KN8AE -extern void dec_kn8ae_init __P((int)); +extern void dec_kn8ae_init(int); #else #define dec_kn8ae_init platform_not_configured #endif #ifdef DEC_2100_A50 -extern void dec_2100_a50_init __P((int)); +extern void dec_2100_a50_init(int); #else #define dec_2100_a50_init platform_not_configured #endif #ifdef DEC_KN20AA -extern void dec_kn20aa_init __P((int)); +extern void dec_kn20aa_init(int); #else #define dec_kn20aa_init platform_not_configured #endif #ifdef DEC_EB64PLUS -extern void dec_eb64plus_init __P((int)); +extern void dec_eb64plus_init(int); #else #define dec_eb64plus_init platform_not_configured #endif #ifdef DEC_EB164 -extern void dec_eb164_init __P((int)); +extern void dec_eb164_init(int); #else #define dec_eb164_init platform_not_configured #endif #ifdef DEC_KN300 -extern void dec_kn300_init __P((int)); +extern void dec_kn300_init(int); #else #define dec_kn300_init platform_not_configured #endif #ifdef AVALON_A12 -extern void avalon_a12_init __P((int)); +extern void avalon_a12_init(int); #else #define avalon_a12_init platform_not_configured #endif #ifdef DEC_ST550 -extern void st550_init __P((int)); +extern void st550_init(int); #else #define st550_init platform_not_configured #endif #ifdef DEC_ST6600 -extern void st6600_init __P((int)); +extern void st6600_init(int); #else #define st6600_init platform_not_configured #endif #ifdef DEC_1000A -extern void dec_1000a_init __P((int)); +extern void dec_1000a_init(int); #else #define dec_1000a_init platform_not_configured #endif #ifdef DEC_2100_A500 -extern void dec_2100_a500_init __P((int)); +extern void dec_2100_a500_init(int); #else #define dec_2100_a500_init platform_not_configured #endif #ifdef API_UP1000 -extern void api_up1000_init __P((int)); +extern void api_up1000_init(int); #else #define api_up1000_init platform_not_configured #endif ==== //depot/projects/interrupt/sys/alpha/alpha/db_disasm.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.5 2000/09/11 05:28:52 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.6 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $ */ /* @@ -188,7 +188,7 @@ { NULL, -1 }, }; -static const char *pal_opname __P((int)); +static const char *pal_opname(int); static const char * pal_opname(op) @@ -244,7 +244,7 @@ arit_c0, arit_c2, 0, 0, arit_c9, arit_cB, arit_cD, arit_cF }; -static __inline const char *arit_name __P((int)); +static __inline const char *arit_name(int); static __inline const char * arit_name(op) int op; @@ -285,7 +285,7 @@ "andnot", "ornot", "xornot", 0 }; -static __inline const char *logical_name __P((int)); +static __inline const char *logical_name(int); static __inline const char * logical_name(op) int op; @@ -334,7 +334,7 @@ /* 7 */ { 0, "inswh", "inslh", "insqh" }, }; -static __inline const char *bitop_name __P((int)); +static __inline const char *bitop_name(int); static __inline const char * bitop_name(op) int op; @@ -364,7 +364,7 @@ "mull", "mulq", "mull/v", "mulq/v" }; -static __inline const char *mul_name __P((int)); +static __inline const char *mul_name(int); static __inline const char * mul_name(op) int op; @@ -389,7 +389,7 @@ "drain_t", 0, "mb", 0, "fetch", "fetch_m", "rpcc", "rc" }; -static __inline const char *special_name __P((int)); +static __inline const char *special_name(int); static __inline const char * special_name(op) int op; @@ -424,7 +424,7 @@ "maxuw4", "maxsb8", "maxsw4", }; -static __inline const char *intmisc_name __P((int)); +static __inline const char *intmisc_name(int); static __inline const char * intmisc_name(op) int op; @@ -445,7 +445,7 @@ return (unk); } -static const char *float_name __P((const struct tbl[], int, const char *type)); +static const char *float_name(const struct tbl[], int, const char *type); static const char * float_name(tbl, op, type) @@ -795,7 +795,7 @@ static int regcount; /* how many regs used in this inst */ static int regnum[3]; /* which regs used in this inst */ -static const char *register_name __P((int)); +static const char *register_name(int); static const char * register_name (ireg) @@ -816,7 +816,7 @@ * (optional) alternate format. Return address of start of * next instruction. */ -int alpha_print_instruction __P((db_addr_t, alpha_instruction, boolean_t)); +int alpha_print_instruction(db_addr_t, alpha_instruction, boolean_t); db_addr_t db_disasm(loc, altfmt) ==== //depot/projects/interrupt/sys/alpha/alpha/db_instruction.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.4 2001/03/05 21:21:01 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_instruction.h,v 1.5 2002/04/13 22:21:28 obrien Exp $ */ /* $NetBSD: db_instruction.h,v 1.4 1997/09/16 22:53:32 thorpej Exp $ */ /* @@ -172,7 +172,7 @@ } alpha_instruction; -#endif !defined(ASSEMBLER) +#endif /* !defined(ASSEMBLER) */ /* * ==== //depot/projects/interrupt/sys/alpha/alpha/db_interface.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: db_interface.c,v 1.2 1997/09/16 19:07:19 thorpej Exp $ */ -/* $FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.24 2001/12/18 00:27:14 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.26 2002/03/21 06:14:57 imp Exp $ */ /* * Mach Operating System @@ -81,7 +81,7 @@ static jmp_buf *db_nofault = 0; extern jmp_buf db_jmpbuf; -extern void gdb_handle_exception __P((db_regs_t *, int, int)); +extern void gdb_handle_exception(db_regs_t *, int, int); #if 0 extern char *trap_type[]; @@ -90,8 +90,8 @@ int db_active; -void ddbprinttrap __P((unsigned long, unsigned long, unsigned long, - unsigned long)); +void ddbprinttrap(unsigned long, unsigned long, unsigned long, + unsigned long); struct db_variable db_regs[] = { { "v0", &ddb_regs.tf_regs[FRAME_V0], FCN_NULL }, @@ -155,7 +155,7 @@ db_regs_t *regs; { int ddb_mode = !(boothowto & RB_GDB); - critical_t s; + register_t s; /* * Don't bother checking for usermode, since a benign entry @@ -192,7 +192,7 @@ ddb_regs = *regs; - s = cpu_critical_enter(); + s = intr_disable(); #ifdef SMP #ifdef DIAGNOSTIC @@ -219,7 +219,7 @@ restart_cpus(stopped_cpus); #endif - cpu_critical_exit(s); + intr_restore(s); *regs = ddb_regs; ==== //depot/projects/interrupt/sys/alpha/alpha/db_trace.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.11 2002/02/07 20:58:42 julian Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.12 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */ /*- @@ -97,9 +97,9 @@ }; -int db_md_set_watchpoint __P((db_expr_t addr, db_expr_t size)); -int db_md_clr_watchpoint __P((db_expr_t addr, db_expr_t size)); -void db_md_list_watchpoints __P((void)); +int db_md_set_watchpoint(db_expr_t addr, db_expr_t size); +int db_md_clr_watchpoint(db_expr_t addr, db_expr_t size); +void db_md_list_watchpoints(void); /* ==== //depot/projects/interrupt/sys/alpha/alpha/dec_1000a.c#2 (text+ko) ==== @@ -70,7 +70,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin * - * $FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.11 2001/06/01 17:38:57 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.12 2002/03/20 18:58:44 obrien Exp $ */ #include "opt_ddb.h" @@ -99,23 +99,23 @@ #endif static int comcnrate = CONSPEED; -void dec_1000a_init __P((int)); -static void dec_1000a_cons_init __P((void)); +void dec_1000a_init(int); +static void dec_1000a_cons_init(void); -static void dec_1000_intr_map __P((void *)); -static void dec_1000_intr_disable __P((int)); -static void dec_1000_intr_enable __P((int)); -static void dec_1000_intr_init __P((void)); +static void dec_1000_intr_map(void *); +static void dec_1000_intr_disable(int); +static void dec_1000_intr_enable(int); +static void dec_1000_intr_init(void); -static void dec_1000a_intr_map __P((void *)); -static void dec_1000a_intr_disable __P((int)); -static void dec_1000a_intr_enable __P((int)); -static void dec_1000a_intr_init __P((void)); +static void dec_1000a_intr_map(void *); +static void dec_1000a_intr_disable(int); +static void dec_1000a_intr_enable(int); +static void dec_1000a_intr_init(void); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); static const struct alpha_variation_table dec_1000_variations[] = { ==== //depot/projects/interrupt/sys/alpha/alpha/dec_2100_a50.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: dec_2100_a50.c,v 1.39 1998/04/17 02:45:19 mjacob Exp $ */ -/* $FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.11 2001/06/01 17:38:57 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.12 2002/03/20 18:58:44 obrien Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -56,16 +56,16 @@ #endif static int comcnrate = CONSPEED; -void dec_2100_a50_init __P((void)); -static void dec_2100_a50_cons_init __P((void)); -static void dec_2100_a50_intr_map __P((void *)); -void sio_intr_establish __P((int)); -void sio_intr_disestablish __P((int)); -void sio_intr_setup __P((void)); +void dec_2100_a50_init(void); +static void dec_2100_a50_cons_init(void); +static void dec_2100_a50_intr_map(void *); +void sio_intr_establish(int); +void sio_intr_disestablish(int); +void sio_intr_setup(void); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); const struct alpha_variation_table dec_2100_a50_variations[] = { { SV_ST_AVANTI, "AlphaStation 400 4/233 (\"Avanti\")" }, ==== //depot/projects/interrupt/sys/alpha/alpha/dec_2100_a500.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.10 2001/10/20 01:27:23 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.11 2002/03/20 18:58:44 obrien Exp $ */ #include "opt_ddb.h" @@ -49,13 +49,13 @@ #endif static int comcnrate = CONSPEED; -void dec_2100_a500_init __P((int)); -static void dec_2100_a500_cons_init __P((void)); -static void dec_2100_a500_intr_init __P((void )); +void dec_2100_a500_init(int); +static void dec_2100_a500_cons_init(void); +static void dec_2100_a500_intr_init(void ); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void dec_2100_a500_init(cputype) ==== //depot/projects/interrupt/sys/alpha/alpha/dec_axppci_33.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.12 2001/06/01 17:38:57 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.15 2002/04/17 15:32:11 ticso Exp $ */ /* $NetBSD: dec_axppci_33.c,v 1.38 1998/07/07 08:49:12 ross Exp $ */ /* @@ -53,13 +53,13 @@ #endif static int comcnrate = CONSPEED; -void dec_axppci_33_init __P((void)); -static void dec_axppci_33_cons_init __P((void)); -static void dec_axppci_33_intr_map __P((void *)); +void dec_axppci_33_init(void); +static void dec_axppci_33_cons_init(void); +static int dec_axppci_33_intr_route (device_t, device_t, int); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); const struct alpha_variation_table dec_axppci_33_variations[] = { { 0, "Alpha PC AXPpci33 (\"NoName\")" }, @@ -93,7 +93,8 @@ platform.iobus = "lca"; platform.cons_init = dec_axppci_33_cons_init; - platform.pci_intr_map = dec_axppci_33_intr_map; + platform.pci_intr_route = dec_axppci_33_intr_route; + platform.pci_intr_map = NULL; lca_init(); @@ -167,16 +168,13 @@ #define SIO_PCIREG_PIRQ_RTCTRL 0x60 /* PIRQ0 Route Control */ -void -dec_axppci_33_intr_map(void *arg) +static int +dec_axppci_33_intr_route(device_t pcib, device_t dev, int pin) { - pcicfgregs *cfg; int pirq; u_int32_t pirqreg; u_int8_t pirqline; - cfg = (pcicfgregs *)arg; - #ifndef DIAGNOSTIC pirq = 0; /* XXX gcc -Wuninitialized */ #endif @@ -185,23 +183,22 @@ * Slot->interrupt translation. Taken from NetBSD. */ - if (cfg->intpin == 0) { + if (pin == 0) { /* No IRQ used. */ - return; + return -1; } - if (cfg->intpin > 4) { - printf("dec_axppci_33_intr_map: bad interrupt pin %d\n", - cfg->intpin); - return; + if (pin > 4) { + printf("dec_axppci_33_intr_route: bad interrupt pin %d\n", pin); + return -1; } - switch (cfg->slot) { + switch (pci_get_slot(dev)) { case 6: /* NCR SCSI */ pirq = 3; break; case 11: /* slot 1 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 0; @@ -214,14 +211,14 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map: bogus PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route: bogus PCI pin %d\n", + pin); #endif }; break; case 12: /* slot 2 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 1; @@ -234,14 +231,14 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map: bogus PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route: bogus PCI pin %d\n", + pin); #endif }; break; case 8: /* slot 3 */ - switch (cfg->intpin) { + switch (pin) { case 1: case 4: pirq = 2; @@ -254,33 +251,24 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - panic("dec_axppci_33_intr_map bogus: PCI pin %d\n", - cfg->intpin); + panic("dec_axppci_33_intr_route bogus: PCI pin %d\n", + pin); #endif }; break; default: - printf("dec_axppci_33_intr_map: weird device number %d\n", - cfg->slot); - return; + printf("dec_axppci_33_intr_route: weird device number %d\n", + pci_get_slot(dev)); + return -1; } pirqreg = lca_pcib_read_config(0, 0, 7, 0, SIO_PCIREG_PIRQ_RTCTRL, 4); -#if 0 - printf("dec_axppci_33_intr_map: device %d pin %c: pirq %d, reg = %x\n", - device, '@' + cfg->intpin, pirq, pirqreg); -#endif pirqline = (pirqreg >> (pirq * 8)) & 0xff; if ((pirqline & 0x80) != 0) panic("bad pirqline %d",pirqline); pirqline &= 0xf; -#if 0 - printf("dec_axppci_33_intr_map: device %d pin %c: mapped to line %d\n", - device, '@' + cfg->intpin, pirqline); -#endif - - cfg->intline = pirqline; + return(pirqline); } ==== //depot/projects/interrupt/sys/alpha/alpha/dec_eb164.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.14 2001/06/01 17:38:57 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.15 2002/03/20 18:58:44 obrien Exp $ */ /* $NetBSD: dec_eb164.c,v 1.26 1998/04/17 02:45:19 mjacob Exp $ */ /* @@ -52,17 +52,17 @@ #endif static int comcnrate = CONSPEED; -void dec_eb164_init __P((void)); -static void dec_eb164_cons_init __P((void)); +void dec_eb164_init(void); +static void dec_eb164_cons_init(void); static void eb164_intr_init(void); extern void eb164_intr_enable(int irq); extern void eb164_intr_disable(int irq); extern void eb164_intr_enable_icsr(int irq); extern void eb164_intr_disable_icsr(int irq); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); void dec_eb164_init() ==== //depot/projects/interrupt/sys/alpha/alpha/dec_eb64plus.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.9 2001/06/01 17:38:57 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.11 2002/03/29 23:05:05 wilko Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -31,21 +31,20 @@ */ /* - * Port to based on NetBSD/axp by Wilko Bulte * FreeBSD version based on: * NetBSD: dec_eb64plus.c,v 1.15 1998/11/19 02:20:07 ross Exp * - * Some info on the Aspen Alpine as this might be hard to come by: + * Some info on the Aspen Alpine which might be hard to come by: * - Hardware is close enough to the DEC EB64+ design to allow it to run - * the EB64+ SRM console f/w - * - 3 PCI slots, closest to the SIMMs: Alpine calls this slot C - * the middle one Alpine calls this slot B - * the 3rd one is Alpine calls this slot A - * (A, B, C is silkscreened on the PCB) + * the EB64+ SRM console firmware + * - 3 PCI slots, closest to the SIMMs: Alpine calls this one slot C + * the middle one Alpine calls slot B + * the 3rd one Alpine calls slot A + * (A, B, C are silkscreened on the PCB) * - embedded NCR810, located at PCI slot 5 * - 3 ISA slots, hanging off an Intel 82378IB PCI-ISA bridge at PCI slot 8 - * - embedded floppy, PC keyboard interface, PS/2 mouse interface, 2x serial - * ports and a parallel port. All of this hiding after the ISA bridge + * - embedded floppy, PC keyboard interface, PS/2 mouse interface, 2 serial + * ports and a parallel port. All of this hanging off the ISA bridge */ #include "opt_ddb.h" @@ -73,9 +72,9 @@ #endif static int comcnrate = CONSPEED; -void dec_eb64plus_init __P((void)); -static void dec_eb64plus_cons_init __P((void)); -static void dec_eb64plus_intr_init __P((void)); +void dec_eb64plus_init(void); +static void dec_eb64plus_cons_init(void); +static void dec_eb64plus_intr_init(void); extern void eb64plus_intr_enable(int irq); /* ../pci/pci_eb64plus_intr.s */ extern void eb64plus_intr_disable(int irq); /* ../pci/pci_eb64plus_intr.s */ @@ -83,8 +82,8 @@ extern const char * bootdev_protocol(void); extern int bootdev_boot_dev_type(void); -extern int siocnattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int sccnattach(void); const struct alpha_variation_table dec_eb64plus_variations[] = { { 0, "DEC EB64-plus" }, ==== //depot/projects/interrupt/sys/alpha/alpha/dec_kn20aa.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: dec_kn20aa.c,v 1.38 1998/04/17 02:45:19 mjacob Exp $ */ -/* $FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.12 2001/06/01 17:38:58 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.13 2002/03/20 18:58:44 obrien Exp $ */ /* * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University. @@ -54,19 +54,19 @@ #endif static int comcnrate = CONSPEED; -void dec_kn20aa_init __P((void)); -static void dec_kn20aa_cons_init __P((void)); -static void dec_kn20aa_intr_init __P((void)); -static void dec_kn20aa_intr_map __P((void *)); -static void dec_kn20aa_intr_disable __P((int)); -static void dec_kn20aa_intr_enable __P((int)); +void dec_kn20aa_init(void); +static void dec_kn20aa_cons_init(void); +static void dec_kn20aa_intr_init(void); +static void dec_kn20aa_intr_map(void *); +static void dec_kn20aa_intr_disable(int); +static void dec_kn20aa_intr_enable(int); -extern int siocnattach __P((int, int)); -extern int siogdbattach __P((int, int)); -extern int sccnattach __P((void)); +extern int siocnattach(int, int); +extern int siogdbattach(int, int); +extern int sccnattach(void); #if 0 -static void dec_kn20aa_device_register __P((struct device *, void *)); +static void dec_kn20aa_device_register(struct device *, void *); #endif const struct alpha_variation_table dec_kn20aa_variations[] = { ==== //depot/projects/interrupt/sys/alpha/alpha/dec_kn300.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.6 2001/10/11 21:48:02 mjacob Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 15:34:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A44B237B419; Fri, 14 Jun 2002 15:33:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9AE2A37B41B for ; Fri, 14 Jun 2002 15:33:30 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5EMXSX75373 for perforce@freebsd.org; Fri, 14 Jun 2002 15:33:28 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Date: Fri, 14 Jun 2002 15:33:28 -0700 (PDT) Message-Id: <200206142233.g5EMXSX75373@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bmilekic@freebsd.org using -f From: Bosko Milekic Subject: PERFORCE change 12945 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12945 Change 12945 by bmilekic@bmilekic_freefall on 2002/06/14 15:32:50 Integrate + merge changes to have this work with critical section changes. Affected files ... ... //depot/projects/interrupt/sys/i386/Makefile#2 edit ... //depot/projects/interrupt/sys/i386/acpica/OsdEnvironment.c#2 edit ... //depot/projects/interrupt/sys/i386/acpica/acpi_machdep.c#2 edit ... //depot/projects/interrupt/sys/i386/acpica/acpi_wakecode.S#2 edit ... //depot/projects/interrupt/sys/i386/apm/apm.h#2 edit ... //depot/projects/interrupt/sys/i386/compile/.cvsignore#2 edit ... //depot/projects/interrupt/sys/i386/conf/GENERIC.hints#2 edit ... //depot/projects/interrupt/sys/i386/conf/NEWCARD.hints#2 edit ... //depot/projects/interrupt/sys/i386/conf/gethints.pl#2 edit ... //depot/projects/interrupt/sys/i386/i386/atomic.c#2 edit ... //depot/projects/interrupt/sys/i386/i386/bioscall.s#2 edit ... //depot/projects/interrupt/sys/i386/i386/i386-gdbstub.c#3 edit ... //depot/projects/interrupt/sys/i386/i386/in_cksum.c#2 edit ... //depot/projects/interrupt/sys/i386/i386/k6_mem.c#2 edit ... //depot/projects/interrupt/sys/i386/i386/locore.s#4 edit ... //depot/projects/interrupt/sys/i386/i386/math_emu.h#2 edit ... //depot/projects/interrupt/sys/i386/i386/math_emulate.c#2 edit ... //depot/projects/interrupt/sys/i386/i386/mpboot.s#2 edit ... //depot/projects/interrupt/sys/i386/i386/nexus.c#3 edit ... //depot/projects/interrupt/sys/i386/i386/symbols.raw#2 edit ... //depot/projects/interrupt/sys/i386/i386/vm86bios.s#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/Makefile#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/coff.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_dirent.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_errno.c#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_errno.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_fcntl.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_ioctl.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_ipc.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_mount.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_msg.c#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_other.c#3 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_poll.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_stat.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_statfs.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_stropts.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_syscall.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_sysent.c#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_termios.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_time.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_types.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_unistd.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_ustat.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_util.c#3 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_utime.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_utsname.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/syscalls.conf#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/syscalls.isc#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/syscalls.isc.conf#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/syscalls.master#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/syscalls.xenix#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/syscalls.xenix.conf#2 edit ... //depot/projects/interrupt/sys/i386/include/_inttypes.h#2 edit ... //depot/projects/interrupt/sys/i386/include/apic.h#2 edit ... //depot/projects/interrupt/sys/i386/include/apm_segments.h#2 edit ... //depot/projects/interrupt/sys/i386/include/asc_ioctl.h#2 edit ... //depot/projects/interrupt/sys/i386/include/atomic.h#4 edit ... //depot/projects/interrupt/sys/i386/include/bootinfo.h#2 edit ... //depot/projects/interrupt/sys/i386/include/bus.h#3 edit ... //depot/projects/interrupt/sys/i386/include/bus_at386.h#3 edit ... //depot/projects/interrupt/sys/i386/include/bus_dma.h#2 edit ... //depot/projects/interrupt/sys/i386/include/bus_memio.h#2 edit ... //depot/projects/interrupt/sys/i386/include/bus_pio.h#2 edit ... //depot/projects/interrupt/sys/i386/include/cdk.h#2 edit ... //depot/projects/interrupt/sys/i386/include/comstats.h#2 edit ... //depot/projects/interrupt/sys/i386/include/cputypes.h#2 edit ... //depot/projects/interrupt/sys/i386/include/cronyx.h#2 edit ... //depot/projects/interrupt/sys/i386/include/db_machdep.h#2 edit ... //depot/projects/interrupt/sys/i386/include/exec.h#2 edit ... //depot/projects/interrupt/sys/i386/include/float.h#2 edit ... //depot/projects/interrupt/sys/i386/include/gsc.h#2 edit ... //depot/projects/interrupt/sys/i386/include/ieeefp.h#2 edit ... //depot/projects/interrupt/sys/i386/include/iic.h#2 edit ... //depot/projects/interrupt/sys/i386/include/ioctl_bt848.h#2 edit ... //depot/projects/interrupt/sys/i386/include/ioctl_ctx.h#2 edit ... //depot/projects/interrupt/sys/i386/include/ioctl_meteor.h#2 edit ... //depot/projects/interrupt/sys/i386/include/limits.h#2 edit ... //depot/projects/interrupt/sys/i386/include/mpapic.h#2 edit ... //depot/projects/interrupt/sys/i386/include/mtpr.h#2 edit ... //depot/projects/interrupt/sys/i386/include/nexusvar.h#2 edit ... //depot/projects/interrupt/sys/i386/include/pc/bios.h#2 edit ... //depot/projects/interrupt/sys/i386/include/pc/display.h#2 edit ... //depot/projects/interrupt/sys/i386/include/pc/msdos.h#2 edit ... //depot/projects/interrupt/sys/i386/include/pc/vesa.h#2 edit ... //depot/projects/interrupt/sys/i386/include/pcaudioio.h#2 edit ... //depot/projects/interrupt/sys/i386/include/pci_cfgreg.h#2 edit ... //depot/projects/interrupt/sys/i386/include/pcvt_ioctl.h#2 edit ... //depot/projects/interrupt/sys/i386/include/pecoff_machdep.h#2 edit ... //depot/projects/interrupt/sys/i386/include/privatespace.h#2 edit ... //depot/projects/interrupt/sys/i386/include/psl.h#2 edit ... //depot/projects/interrupt/sys/i386/include/ptrace.h#3 edit ... //depot/projects/interrupt/sys/i386/include/reloc.h#2 edit ... //depot/projects/interrupt/sys/i386/include/resource.h#2 edit ... //depot/projects/interrupt/sys/i386/include/setjmp.h#2 edit ... //depot/projects/interrupt/sys/i386/include/sigframe.h#3 edit ... //depot/projects/interrupt/sys/i386/include/signal.h#3 edit ... //depot/projects/interrupt/sys/i386/include/smb.h#2 edit ... //depot/projects/interrupt/sys/i386/include/smptests.h#4 edit ... //depot/projects/interrupt/sys/i386/include/speaker.h#2 edit ... //depot/projects/interrupt/sys/i386/include/specialreg.h#2 edit ... //depot/projects/interrupt/sys/i386/include/spigot.h#2 edit ... //depot/projects/interrupt/sys/i386/include/trap.h#2 edit ... //depot/projects/interrupt/sys/i386/include/tss.h#2 edit ... //depot/projects/interrupt/sys/i386/include/ucontext.h#2 edit ... //depot/projects/interrupt/sys/i386/include/vmparam.h#2 edit ... //depot/projects/interrupt/sys/i386/include/wtio.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/README.le#2 edit ... //depot/projects/interrupt/sys/i386/isa/README.stl#2 edit ... //depot/projects/interrupt/sys/i386/isa/apic_ipl.s#3 edit ... //depot/projects/interrupt/sys/i386/isa/asc.c#3 edit ... //depot/projects/interrupt/sys/i386/isa/ascreg.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/bs/bshw.lst#2 edit ... //depot/projects/interrupt/sys/i386/isa/cronyx.c#2 edit ... //depot/projects/interrupt/sys/i386/isa/ctxreg.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/cxreg.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/cyreg.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/elink.c#2 edit ... //depot/projects/interrupt/sys/i386/isa/gpib.c#2 edit ... //depot/projects/interrupt/sys/i386/isa/gpib.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/gpibreg.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/gsc.c#2 edit ... //depot/projects/interrupt/sys/i386/isa/gscreg.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/ic/am7990.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/ic/cd1400.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/ic/cd180.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/ic/if_wl_i82586.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/ic/mb86960.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/ic/scd1400.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/if_elreg.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/if_rdpreg.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/isa.c#3 edit ... //depot/projects/interrupt/sys/i386/isa/isa.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/isa_compat.c#2 edit ... //depot/projects/interrupt/sys/i386/isa/ithread.c#5 edit ... //depot/projects/interrupt/sys/i386/isa/lptreg.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/matcd/TODO#2 edit ... //depot/projects/interrupt/sys/i386/isa/matcd/audio.c#2 edit ... //depot/projects/interrupt/sys/i386/isa/matcd/creative.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/matcd/matcddrv.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/matcd/options.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/mca_machdep.c#2 edit ... //depot/projects/interrupt/sys/i386/isa/mca_machdep.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/mcdreg.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_conf.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_hdr.h#3 edit ... //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_kbd.c#2 edit ... //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_kbd.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_out.c#3 edit ... //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_sup.c#3 edit ... //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_tbl.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_vtf.c#2 edit ... //depot/projects/interrupt/sys/i386/isa/pmtimer.c#2 edit ... //depot/projects/interrupt/sys/i386/isa/prof_machdep.c#2 edit ... //depot/projects/interrupt/sys/i386/isa/rcreg.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/scdreg.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/timerreg.h#2 edit ... //depot/projects/interrupt/sys/i386/isa/tw.c#2 edit ... //depot/projects/interrupt/sys/i386/isa/vector.s#2 edit ... //depot/projects/interrupt/sys/i386/isa/vesa.c#2 edit ... //depot/projects/interrupt/sys/i386/linux/Makefile#2 edit ... //depot/projects/interrupt/sys/i386/linux/linux_genassym.c#2 edit ... //depot/projects/interrupt/sys/i386/linux/linux_locore.s#2 edit ... //depot/projects/interrupt/sys/i386/linux/syscalls.conf#2 edit ... //depot/projects/interrupt/sys/i386/svr4/svr4_genassym.c#2 edit ... //depot/projects/interrupt/sys/i386/svr4/svr4_locore.s#2 edit ... //depot/projects/interrupt/sys/kern/Make.tags.inc#3 edit ... //depot/projects/interrupt/sys/kern/Makefile#2 edit ... //depot/projects/interrupt/sys/kern/device_if.m#2 edit ... //depot/projects/interrupt/sys/kern/genassym.sh#3 edit ... //depot/projects/interrupt/sys/kern/imgact_shell.c#2 edit ... //depot/projects/interrupt/sys/kern/kern_cap.c#3 edit ... //depot/projects/interrupt/sys/kern/kern_idle.c#3 edit ... //depot/projects/interrupt/sys/kern/kern_kthread.c#3 edit ... //depot/projects/interrupt/sys/kern/kern_poll.c#4 edit ... //depot/projects/interrupt/sys/kern/link_aout.c#3 edit ... //depot/projects/interrupt/sys/kern/linker_if.m#2 edit ... //depot/projects/interrupt/sys/kern/md4c.c#2 edit ... //depot/projects/interrupt/sys/kern/md5c.c#2 edit ... //depot/projects/interrupt/sys/kern/subr_devstat.c#3 edit ... //depot/projects/interrupt/sys/kern/subr_module.c#2 edit ... //depot/projects/interrupt/sys/kern/subr_pcpu.c#2 edit ... //depot/projects/interrupt/sys/kern/subr_power.c#3 edit ... //depot/projects/interrupt/sys/kern/subr_scanf.c#2 edit ... //depot/projects/interrupt/sys/kern/tty_conf.c#2 edit ... //depot/projects/interrupt/sys/kern/uipc_accf.c#2 edit ... //depot/projects/interrupt/sys/kern/uipc_proto.c#2 edit ... //depot/projects/interrupt/sys/sys/_posix.h#2 edit ... //depot/projects/interrupt/sys/sys/_timespec.h#2 edit ... //depot/projects/interrupt/sys/sys/agpio.h#2 edit ... //depot/projects/interrupt/sys/sys/aio.h#2 edit ... //depot/projects/interrupt/sys/sys/assym.h#2 edit ... //depot/projects/interrupt/sys/sys/bus_private.h#2 edit ... //depot/projects/interrupt/sys/sys/capability.h#2 edit ... //depot/projects/interrupt/sys/sys/ccdvar.h#2 edit ... //depot/projects/interrupt/sys/sys/cdrio.h#3 edit ... //depot/projects/interrupt/sys/sys/chio.h#2 edit ... //depot/projects/interrupt/sys/sys/clist.h#2 edit ... //depot/projects/interrupt/sys/sys/copyright.h#2 edit ... //depot/projects/interrupt/sys/sys/ctype.h#2 edit ... //depot/projects/interrupt/sys/sys/dataacq.h#2 edit ... //depot/projects/interrupt/sys/sys/device_port.h#2 edit ... //depot/projects/interrupt/sys/sys/devicestat.h#2 edit ... //depot/projects/interrupt/sys/sys/digiio.h#2 edit ... //depot/projects/interrupt/sys/sys/dir.h#2 edit ... //depot/projects/interrupt/sys/sys/dirent.h#2 edit ... //depot/projects/interrupt/sys/sys/dkstat.h#2 edit ... //depot/projects/interrupt/sys/sys/dmap.h#2 edit ... //depot/projects/interrupt/sys/sys/dvdio.h#3 edit ... //depot/projects/interrupt/sys/sys/elf_common.h#2 edit ... //depot/projects/interrupt/sys/sys/eventvar.h#2 edit ... //depot/projects/interrupt/sys/sys/fdcio.h#2 edit ... //depot/projects/interrupt/sys/sys/filio.h#2 edit ... //depot/projects/interrupt/sys/sys/fnv_hash.h#2 edit ... //depot/projects/interrupt/sys/sys/gmon.h#3 edit ... //depot/projects/interrupt/sys/sys/ioctl.h#3 edit ... //depot/projects/interrupt/sys/sys/ioctl_compat.h#2 edit ... //depot/projects/interrupt/sys/sys/kbio.h#2 edit ... //depot/projects/interrupt/sys/sys/kse.h#2 edit ... //depot/projects/interrupt/sys/sys/mchain.h#4 edit ... //depot/projects/interrupt/sys/sys/md4.h#2 edit ... //depot/projects/interrupt/sys/sys/mdioctl.h#2 edit ... //depot/projects/interrupt/sys/sys/pciio.h#2 edit ... //depot/projects/interrupt/sys/sys/pioctl.h#2 edit ... //depot/projects/interrupt/sys/sys/pipe.h#3 edit ... //depot/projects/interrupt/sys/sys/power.h#3 edit ... //depot/projects/interrupt/sys/sys/priority.h#2 edit ... //depot/projects/interrupt/sys/sys/procfs.h#2 edit ... //depot/projects/interrupt/sys/sys/ptio.h#2 edit ... //depot/projects/interrupt/sys/sys/random.h#3 edit ... //depot/projects/interrupt/sys/sys/reboot.h#2 edit ... //depot/projects/interrupt/sys/sys/rman.h#2 edit ... //depot/projects/interrupt/sys/sys/sbuf.h#2 edit ... //depot/projects/interrupt/sys/sys/select.h#2 edit ... //depot/projects/interrupt/sys/sys/sema.h#2 edit ... //depot/projects/interrupt/sys/sys/snoop.h#2 edit ... //depot/projects/interrupt/sys/sys/sockio.h#3 edit ... //depot/projects/interrupt/sys/sys/syslimits.h#2 edit ... //depot/projects/interrupt/sys/sys/taskqueue.h#2 edit ... //depot/projects/interrupt/sys/sys/timers.h#2 edit ... //depot/projects/interrupt/sys/sys/timespec.h#2 edit ... //depot/projects/interrupt/sys/sys/ttychars.h#2 edit ... //depot/projects/interrupt/sys/sys/ttycom.h#2 edit ... //depot/projects/interrupt/sys/sys/ttydefaults.h#2 edit ... //depot/projects/interrupt/sys/sys/ttydev.h#2 edit ... //depot/projects/interrupt/sys/sys/ucontext.h#2 edit ... //depot/projects/interrupt/sys/sys/unistd.h#2 edit ... //depot/projects/interrupt/sys/sys/utsname.h#2 edit ... //depot/projects/interrupt/sys/sys/vnioctl.h#2 edit ... //depot/projects/interrupt/sys/sys/xrpuio.h#2 edit Differences ... ==== //depot/projects/interrupt/sys/i386/Makefile#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/acpica/OsdEnvironment.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/acpica/acpi_machdep.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/acpica/acpi_wakecode.S#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/apm/apm.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/compile/.cvsignore#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/conf/GENERIC.hints#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/conf/NEWCARD.hints#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/conf/gethints.pl#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/i386/atomic.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/i386/bioscall.s#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/i386/i386-gdbstub.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/i386/in_cksum.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/i386/k6_mem.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/i386/locore.s#4 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/i386/math_emu.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/i386/math_emulate.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/i386/mpboot.s#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/i386/nexus.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/i386/symbols.raw#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/i386/vm86bios.s#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/Makefile#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/coff.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_dirent.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_errno.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_errno.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_fcntl.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_ioctl.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_ipc.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_mount.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_msg.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_other.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_poll.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_stat.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_statfs.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_stropts.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_syscall.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_sysent.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_termios.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_time.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_types.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_unistd.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_ustat.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_util.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_utime.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_utsname.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/syscalls.conf#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/syscalls.isc#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/syscalls.isc.conf#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/syscalls.master#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/syscalls.xenix#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/ibcs2/syscalls.xenix.conf#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/_inttypes.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/apic.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/apm_segments.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/asc_ioctl.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/atomic.h#4 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/bootinfo.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/bus.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/bus_at386.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/bus_dma.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/bus_memio.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/bus_pio.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/cdk.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/comstats.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/cputypes.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/cronyx.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/db_machdep.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/exec.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/float.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/gsc.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/ieeefp.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/iic.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/ioctl_bt848.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/ioctl_ctx.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/ioctl_meteor.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/limits.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/mpapic.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/mtpr.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/nexusvar.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/pc/bios.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/pc/display.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/pc/msdos.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/pc/vesa.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/pcaudioio.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/pci_cfgreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/pcvt_ioctl.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/pecoff_machdep.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/privatespace.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/psl.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/ptrace.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/reloc.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/resource.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/setjmp.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/sigframe.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/signal.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/smb.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/smptests.h#4 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/speaker.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/specialreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/spigot.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/trap.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/tss.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/ucontext.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/vmparam.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/include/wtio.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/README.le#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/README.stl#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/apic_ipl.s#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/asc.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/ascreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/bs/bshw.lst#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/cronyx.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/ctxreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/cxreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/cyreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/elink.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/gpib.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/gpib.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/gpibreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/gsc.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/gscreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/ic/am7990.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/ic/cd1400.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/ic/cd180.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/ic/if_wl_i82586.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/ic/mb86960.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/ic/scd1400.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/if_elreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/if_rdpreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/isa.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/isa.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/isa_compat.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/ithread.c#5 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/lptreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/matcd/TODO#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/matcd/audio.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/matcd/creative.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/matcd/matcddrv.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/matcd/options.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/mca_machdep.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/mca_machdep.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/mcdreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_conf.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_hdr.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_kbd.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_kbd.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_out.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_sup.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_tbl.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/pcvt/pcvt_vtf.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/pmtimer.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/prof_machdep.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/rcreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/scdreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/timerreg.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/tw.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/vector.s#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/isa/vesa.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/linux/Makefile#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/linux/linux_genassym.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/linux/linux_locore.s#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/linux/syscalls.conf#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/svr4/svr4_genassym.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/i386/svr4/svr4_locore.s#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/Make.tags.inc#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/Makefile#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/device_if.m#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/genassym.sh#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/imgact_shell.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/kern_cap.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/kern_idle.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/kern_kthread.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/kern_poll.c#4 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/link_aout.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/linker_if.m#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/md4c.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/md5c.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/subr_devstat.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/subr_module.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/subr_pcpu.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/subr_power.c#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/subr_scanf.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/tty_conf.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/uipc_accf.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/kern/uipc_proto.c#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/_posix.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/_timespec.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/agpio.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/aio.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/assym.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/bus_private.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/capability.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/ccdvar.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/cdrio.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/chio.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/clist.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/copyright.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/ctype.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/dataacq.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/device_port.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/devicestat.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/digiio.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/dir.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/dirent.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/dkstat.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/dmap.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/dvdio.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/elf_common.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/eventvar.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/fdcio.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/filio.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/fnv_hash.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/gmon.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/ioctl.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/ioctl_compat.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/kbio.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/kse.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/mchain.h#4 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/md4.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/mdioctl.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/pciio.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/pioctl.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/pipe.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/power.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/priority.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/procfs.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/ptio.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/random.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/reboot.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/rman.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/sbuf.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/select.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/sema.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/snoop.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/sockio.h#3 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/syslimits.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/taskqueue.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/timers.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/timespec.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/ttychars.h#2 (text+ko) ==== ==== //depot/projects/interrupt/sys/sys/ttycom.h#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 16: 2:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41AD837B417; Fri, 14 Jun 2002 15:59:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2AD6D37B403 for ; Fri, 14 Jun 2002 15:59:55 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5EMx5b77383 for perforce@freebsd.org; Fri, 14 Jun 2002 15:59:05 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Date: Fri, 14 Jun 2002 15:59:05 -0700 (PDT) Message-Id: <200206142259.g5EMx5b77383@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bmilekic@freebsd.org using -f From: Bosko Milekic Subject: PERFORCE change 12947 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12947 Change 12947 by bmilekic@bmilekic_freefall on 2002/06/14 15:58:45 Integrate and random mucking trying to get interrupt working with new critical code. Affected files ... ... //depot/projects/interrupt/sys/arm/include/ansi.h#2 integrate ... //depot/projects/interrupt/sys/arm/include/param.h#2 integrate ... //depot/projects/interrupt/sys/arm/include/types.h#2 integrate ... //depot/projects/interrupt/sys/boot/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/alpha/boot1/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/alpha/boot1/boot1.c#2 integrate ... //depot/projects/interrupt/sys/boot/alpha/boot1/sys.c#3 delete ... //depot/projects/interrupt/sys/boot/alpha/cdboot/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/alpha/libalpha/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/alpha/loader/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/alpha/netboot/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/arc/lib/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/arc/loader/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/common/Makefile.inc#2 integrate ... //depot/projects/interrupt/sys/boot/common/interp_forth.c#2 integrate ... //depot/projects/interrupt/sys/boot/common/isapnp.h#2 integrate ... //depot/projects/interrupt/sys/boot/common/load_elf.c#2 integrate ... //depot/projects/interrupt/sys/boot/common/loader.8#4 integrate ... //depot/projects/interrupt/sys/boot/common/module.c#2 integrate ... //depot/projects/interrupt/sys/boot/common/ufsread.c#1 branch ... //depot/projects/interrupt/sys/boot/efi/Makefile.inc#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/efi.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/efi_nii.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/efiapi.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/eficon.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/efidebug.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/efidef.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/efidevp.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/efifpswa.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/efifs.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/efinet.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/efipart.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/efiprot.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/efipxebc.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/efiser.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/i386/efibind.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/include/ia64/efibind.h#2 integrate ... //depot/projects/interrupt/sys/boot/efi/libefi/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 integrate ... //depot/projects/interrupt/sys/boot/efi/libefi/arch/ia64/start.S#2 integrate ... //depot/projects/interrupt/sys/boot/efi/libefi/copy.c#2 integrate ... //depot/projects/interrupt/sys/boot/efi/libefi/efifs.c#2 integrate ... //depot/projects/interrupt/sys/boot/efi/libefi/efinet.c#2 integrate ... //depot/projects/interrupt/sys/boot/efi/libefi/elf_freebsd.c#2 integrate ... //depot/projects/interrupt/sys/boot/efi/loader/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/efi/loader/conf.c#2 integrate ... //depot/projects/interrupt/sys/boot/efi/loader/main.c#2 integrate ... //depot/projects/interrupt/sys/boot/efi/loader/version#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/alpha/sysdep.h#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/dict.c#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/ficl.c#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/ficl.h#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/fileaccess.c#1 branch ... //depot/projects/interrupt/sys/boot/ficl/float.c#1 branch ... //depot/projects/interrupt/sys/boot/ficl/i386/sysdep.h#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/ia64/sysdep.h#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/loader.c#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/math64.c#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/math64.h#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/prefix.c#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/search.c#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/softwords/ficlclass.fr#1 branch ... //depot/projects/interrupt/sys/boot/ficl/softwords/fileaccess.fr#1 branch ... //depot/projects/interrupt/sys/boot/ficl/softwords/forml.fr#1 branch ... //depot/projects/interrupt/sys/boot/ficl/softwords/ifbrack.fr#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/softwords/marker.fr#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/softwords/oo.fr#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/softwords/prefix.fr#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/softwords/softcore.fr#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/sparc64/sysdep.c#1 branch ... //depot/projects/interrupt/sys/boot/ficl/sparc64/sysdep.h#1 branch ... //depot/projects/interrupt/sys/boot/ficl/stack.c#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/testmain.c#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/tools.c#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/vm.c#2 integrate ... //depot/projects/interrupt/sys/boot/ficl/words.c#2 integrate ... //depot/projects/interrupt/sys/boot/forth/loader.4th#2 integrate ... //depot/projects/interrupt/sys/boot/forth/loader.4th.8#2 integrate ... //depot/projects/interrupt/sys/boot/forth/loader.conf#4 integrate ... //depot/projects/interrupt/sys/boot/forth/loader.conf.5#3 integrate ... //depot/projects/interrupt/sys/boot/forth/support.4th#2 integrate ... //depot/projects/interrupt/sys/boot/i386/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/i386/Makefile.inc#2 integrate ... //depot/projects/interrupt/sys/boot/i386/boot2/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/i386/boot2/boot2.c#4 integrate ... //depot/projects/interrupt/sys/boot/i386/btx/lib/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/i386/kgzldr/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/i386/libi386/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/i386/libi386/bioscd.c#2 integrate ... //depot/projects/interrupt/sys/boot/i386/libi386/biospnp.c#2 integrate ... //depot/projects/interrupt/sys/boot/i386/loader/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/i386/loader/conf.c#2 integrate ... //depot/projects/interrupt/sys/boot/ia64/Makefile.inc#1 branch ... //depot/projects/interrupt/sys/boot/ia64/libski/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/ia64/libski/copy.c#2 integrate ... //depot/projects/interrupt/sys/boot/ia64/libski/elf_freebsd.c#2 integrate ... //depot/projects/interrupt/sys/boot/ia64/skiload/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/ia64/skiload/version#2 integrate ... //depot/projects/interrupt/sys/boot/ofw/libofw/Makefile#3 integrate ... //depot/projects/interrupt/sys/boot/ofw/libofw/devicename.c#2 integrate ... //depot/projects/interrupt/sys/boot/ofw/libofw/libofw.h#2 integrate ... //depot/projects/interrupt/sys/boot/ofw/libofw/ofw_disk.c#3 integrate ... //depot/projects/interrupt/sys/boot/ofw/libofw/ofw_net.c#3 integrate ... //depot/projects/interrupt/sys/boot/pc98/Makefile.inc#2 integrate ... //depot/projects/interrupt/sys/boot/pc98/boot2/Makefile#3 integrate ... //depot/projects/interrupt/sys/boot/pc98/boot2/asm.h#2 integrate ... //depot/projects/interrupt/sys/boot/pc98/boot2/boot.h#2 integrate ... //depot/projects/interrupt/sys/boot/pc98/boot2/disk.c#2 integrate ... //depot/projects/interrupt/sys/boot/pc98/boot2/io.c#2 integrate ... //depot/projects/interrupt/sys/boot/pc98/boot2/serial_16550.S#3 integrate ... //depot/projects/interrupt/sys/boot/pc98/boot2/start.S#2 integrate ... //depot/projects/interrupt/sys/boot/pc98/btx/lib/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/pc98/kgzldr/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/pc98/kgzldr/crt.s#2 integrate ... //depot/projects/interrupt/sys/boot/pc98/libpc98/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/pc98/loader/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/powerpc/loader/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/sparc64/Makefile#1 branch ... //depot/projects/interrupt/sys/boot/sparc64/boot1/Makefile#2 integrate ... //depot/projects/interrupt/sys/boot/sparc64/boot1/_start.S#1 branch ... //depot/projects/interrupt/sys/boot/sparc64/boot1/boot1.c#2 integrate ... //depot/projects/interrupt/sys/boot/sparc64/bootblock/Makefile#2 delete ... //depot/projects/interrupt/sys/boot/sparc64/bootblock/bootblock.c#3 delete ... //depot/projects/interrupt/sys/boot/sparc64/loader/Makefile#3 integrate ... //depot/projects/interrupt/sys/boot/sparc64/loader/help.sparc64#1 branch ... //depot/projects/interrupt/sys/boot/sparc64/loader/locore.S#1 branch ... //depot/projects/interrupt/sys/boot/sparc64/loader/locore.s#3 delete ... //depot/projects/interrupt/sys/boot/sparc64/loader/main.c#4 integrate ... //depot/projects/interrupt/sys/boot/sparc64/loader/metadata.c#3 integrate ... //depot/projects/interrupt/sys/cam/cam_periph.c#2 integrate ... //depot/projects/interrupt/sys/cam/cam_xpt.c#2 integrate ... //depot/projects/interrupt/sys/cam/scsi/scsi_all.c#4 integrate ... //depot/projects/interrupt/sys/cam/scsi/scsi_all.h#2 integrate ... //depot/projects/interrupt/sys/cam/scsi/scsi_da.c#4 integrate ... //depot/projects/interrupt/sys/cam/scsi/scsi_iu.h#1 branch ... //depot/projects/interrupt/sys/cam/scsi/scsi_low.c#2 integrate ... //depot/projects/interrupt/sys/cam/scsi/scsi_low.h#2 integrate ... //depot/projects/interrupt/sys/cam/scsi/scsi_low_pisa.h#2 integrate ... //depot/projects/interrupt/sys/cam/scsi/scsi_message.h#2 integrate ... //depot/projects/interrupt/sys/coda/README#2 integrate ... //depot/projects/interrupt/sys/coda/cnode.h#2 integrate ... //depot/projects/interrupt/sys/coda/coda_fbsd.c#2 integrate ... //depot/projects/interrupt/sys/coda/coda_io.h#2 integrate ... //depot/projects/interrupt/sys/coda/coda_namecache.c#2 integrate ... //depot/projects/interrupt/sys/coda/coda_namecache.h#2 integrate ... //depot/projects/interrupt/sys/coda/coda_pioctl.h#2 integrate ... //depot/projects/interrupt/sys/coda/coda_psdev.c#2 integrate ... //depot/projects/interrupt/sys/coda/coda_subr.c#2 integrate ... //depot/projects/interrupt/sys/coda/coda_venus.c#3 integrate ... //depot/projects/interrupt/sys/coda/coda_vfsops.c#3 integrate ... //depot/projects/interrupt/sys/coda/coda_vnops.c#3 integrate ... //depot/projects/interrupt/sys/coda/coda_vnops.h#2 integrate ... //depot/projects/interrupt/sys/compat/linprocfs/linprocfs.c#4 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_file.c#4 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_getcwd.c#3 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_ioctl.c#3 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_ipc.c#2 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_ipc.h#2 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_mib.c#2 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_mib.h#2 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_misc.c#4 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_signal.c#2 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_signal.h#2 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_socket.c#2 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_socket.h#2 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_stats.c#3 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_uid16.c#3 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_util.h#3 integrate ... //depot/projects/interrupt/sys/compat/pecoff/imgact_pecoff.c#4 integrate ... //depot/projects/interrupt/sys/compat/svr4/imgact_svr4.c#2 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_exec.h#2 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_fcntl.c#4 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_filio.c#3 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_ioctl.c#3 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_ioctl.h#2 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_ipc.c#2 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_misc.c#4 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_proto.h#2 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_resource.c#2 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_signal.c#2 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_signal.h#2 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_socket.h#2 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_sockio.c#2 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_stat.c#3 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_stream.c#3 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_stropts.h#2 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_sysvec.c#3 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_termios.c#2 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_ttold.c#2 integrate ... //depot/projects/interrupt/sys/compat/svr4/svr4_util.h#2 integrate ... //depot/projects/interrupt/sys/conf/Makefile.ia64#3 integrate ... //depot/projects/interrupt/sys/conf/Makefile.powerpc#3 integrate ... //depot/projects/interrupt/sys/conf/Makefile.sparc64#4 integrate ... //depot/projects/interrupt/sys/conf/NOTES#1 branch ... //depot/projects/interrupt/sys/conf/files#6 integrate ... //depot/projects/interrupt/sys/conf/files.alpha#5 integrate ... //depot/projects/interrupt/sys/conf/files.i386#5 integrate ... //depot/projects/interrupt/sys/conf/files.ia64#4 integrate ... //depot/projects/interrupt/sys/conf/files.pc98#6 integrate ... //depot/projects/interrupt/sys/conf/files.powerpc#3 integrate ... //depot/projects/interrupt/sys/conf/files.sparc64#5 integrate ... //depot/projects/interrupt/sys/conf/kern.post.mk#4 integrate ... //depot/projects/interrupt/sys/conf/kern.pre.mk#4 integrate ... //depot/projects/interrupt/sys/conf/kmod.mk#4 integrate ... //depot/projects/interrupt/sys/conf/kmod_syms.awk#2 integrate ... //depot/projects/interrupt/sys/conf/majors#4 integrate ... //depot/projects/interrupt/sys/conf/options#4 integrate ... //depot/projects/interrupt/sys/conf/options.alpha#3 integrate ... //depot/projects/interrupt/sys/conf/options.i386#4 integrate ... //depot/projects/interrupt/sys/conf/options.ia64#2 integrate ... //depot/projects/interrupt/sys/conf/options.pc98#4 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/acconfig.h#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/acdebug.h#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/acdos16.h#1 branch ... //depot/projects/interrupt/sys/contrib/dev/acpica/acefi.h#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/acenv.h#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/acevents.h#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/acgcc.h#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/acpiosxf.h#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/actypes.h#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/acutils.h#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/dbexec.c#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/dbinput.c#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/dswload.c#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/evevent.c#4 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/evmisc.c#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/evrgnini.c#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/evsci.c#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/exprep.c#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/exregion.c#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/exresnte.c#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/nssearch.c#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/utdebug.c#3 integrate ... //depot/projects/interrupt/sys/contrib/dev/fla/fla.c#2 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#2 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/fil.c#3 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_fil.c#3 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#1 branch ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_nat.c#3 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#1 branch ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/ipl.h#2 integrate ... //depot/projects/interrupt/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate ... //depot/projects/interrupt/sys/crypto/blowfish/blowfish.h#3 integrate ... //depot/projects/interrupt/sys/crypto/cast128/cast128.h#2 integrate ... //depot/projects/interrupt/sys/crypto/des/des.h#3 integrate ... //depot/projects/interrupt/sys/crypto/des/podd.h#2 integrate ... //depot/projects/interrupt/sys/crypto/des/sk.h#2 integrate ... //depot/projects/interrupt/sys/crypto/md5.c#2 integrate ... //depot/projects/interrupt/sys/crypto/md5.h#2 integrate ... //depot/projects/interrupt/sys/crypto/rijndael/rijndael-api-fst.c#2 integrate ... //depot/projects/interrupt/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate ... //depot/projects/interrupt/sys/crypto/sha1.c#2 integrate ... //depot/projects/interrupt/sys/crypto/sha1.h#2 integrate ... //depot/projects/interrupt/sys/crypto/sha2/sha2.h#2 integrate ... //depot/projects/interrupt/sys/ddb/db_access.h#2 integrate ... //depot/projects/interrupt/sys/ddb/db_break.c#2 integrate ... //depot/projects/interrupt/sys/ddb/db_break.h#2 integrate ... //depot/projects/interrupt/sys/ddb/db_command.c#3 integrate ... //depot/projects/interrupt/sys/ddb/db_command.h#2 integrate ... //depot/projects/interrupt/sys/ddb/db_elf.c#1 branch ... //depot/projects/interrupt/sys/ddb/db_examine.c#2 integrate ... //depot/projects/interrupt/sys/ddb/db_expr.c#2 integrate ... //depot/projects/interrupt/sys/ddb/db_input.c#3 integrate ... //depot/projects/interrupt/sys/ddb/db_kld.c#2 integrate ... //depot/projects/interrupt/sys/ddb/db_lex.c#3 integrate ... //depot/projects/interrupt/sys/ddb/db_lex.h#2 integrate ... //depot/projects/interrupt/sys/ddb/db_output.c#2 integrate ... //depot/projects/interrupt/sys/ddb/db_output.h#2 integrate ... //depot/projects/interrupt/sys/ddb/db_ps.c#3 integrate ... //depot/projects/interrupt/sys/ddb/db_run.c#2 integrate ... //depot/projects/interrupt/sys/ddb/db_sym.c#2 integrate ... //depot/projects/interrupt/sys/ddb/db_sym.h#2 integrate ... //depot/projects/interrupt/sys/ddb/db_variables.c#2 integrate ... //depot/projects/interrupt/sys/ddb/db_variables.h#2 integrate ... //depot/projects/interrupt/sys/ddb/db_watch.c#2 integrate ... //depot/projects/interrupt/sys/ddb/ddb.h#2 integrate ... //depot/projects/interrupt/sys/dev/aac/aac.c#3 integrate ... //depot/projects/interrupt/sys/dev/aac/aac_cam.c#1 branch ... //depot/projects/interrupt/sys/dev/aac/aac_cam.h#1 branch ... //depot/projects/interrupt/sys/dev/aac/aac_debug.c#2 integrate ... //depot/projects/interrupt/sys/dev/aac/aac_disk.c#2 integrate ... //depot/projects/interrupt/sys/dev/aac/aac_pci.c#3 integrate ... //depot/projects/interrupt/sys/dev/aac/aacreg.h#3 integrate ... //depot/projects/interrupt/sys/dev/aac/aacvar.h#3 integrate ... //depot/projects/interrupt/sys/dev/acpica/Osd/OsdHardware.c#2 integrate ... //depot/projects/interrupt/sys/dev/acpica/Osd/OsdInterrupt.c#3 integrate ... //depot/projects/interrupt/sys/dev/acpica/Osd/OsdMemory.c#4 integrate ... //depot/projects/interrupt/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate ... //depot/projects/interrupt/sys/dev/acpica/Osd/OsdSynch.c#3 integrate ... //depot/projects/interrupt/sys/dev/acpica/acpi.c#3 integrate ... //depot/projects/interrupt/sys/dev/acpica/acpi_button.c#3 integrate ... //depot/projects/interrupt/sys/dev/acpica/acpi_cpu.c#4 integrate ... //depot/projects/interrupt/sys/dev/acpica/acpi_ec.c#3 integrate ... //depot/projects/interrupt/sys/dev/acpica/acpi_lid.c#3 integrate ... //depot/projects/interrupt/sys/dev/acpica/acpi_pcib.c#3 integrate ... //depot/projects/interrupt/sys/dev/acpica/acpi_powerres.c#3 integrate ... //depot/projects/interrupt/sys/dev/acpica/acpi_resource.c#3 integrate ... //depot/projects/interrupt/sys/dev/acpica/acpi_thermal.c#4 integrate ... //depot/projects/interrupt/sys/dev/acpica/acpi_timer.c#3 integrate ... //depot/projects/interrupt/sys/dev/acpica/acpivar.h#4 integrate ... //depot/projects/interrupt/sys/dev/aha/aha.c#2 integrate ... //depot/projects/interrupt/sys/dev/ahb/ahb.c#2 integrate ... //depot/projects/interrupt/sys/dev/aic/aic.c#4 integrate ... //depot/projects/interrupt/sys/dev/aic/aic_cbus.c#2 integrate ... //depot/projects/interrupt/sys/dev/aic/aic_isa.c#2 integrate ... //depot/projects/interrupt/sys/dev/aic/aicvar.h#3 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/ahc_eisa.c#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/ahc_pci.c#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/ahd_pci.c#1 branch ... //depot/projects/interrupt/sys/dev/aic7xxx/aic7770.c#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aic79xx.c#1 branch ... //depot/projects/interrupt/sys/dev/aic7xxx/aic79xx.h#1 branch ... //depot/projects/interrupt/sys/dev/aic7xxx/aic79xx.reg#1 branch ... //depot/projects/interrupt/sys/dev/aic7xxx/aic79xx.seq#1 branch ... //depot/projects/interrupt/sys/dev/aic7xxx/aic79xx_inline.h#1 branch ... //depot/projects/interrupt/sys/dev/aic7xxx/aic79xx_osm.c#1 branch ... //depot/projects/interrupt/sys/dev/aic7xxx/aic79xx_osm.h#1 branch ... //depot/projects/interrupt/sys/dev/aic7xxx/aic79xx_pci.c#1 branch ... //depot/projects/interrupt/sys/dev/aic7xxx/aic7xxx.c#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aic7xxx.h#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aic7xxx.reg#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aic7xxx.seq#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aic7xxx_freebsd.c#2 delete ... //depot/projects/interrupt/sys/dev/aic7xxx/aic7xxx_freebsd.h#2 delete ... //depot/projects/interrupt/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aicasm/Makefile#3 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aicasm/aicasm.h#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#1 branch ... //depot/projects/interrupt/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#1 branch ... //depot/projects/interrupt/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate ... //depot/projects/interrupt/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate ... //depot/projects/interrupt/sys/dev/amr/amr.c#2 integrate ... //depot/projects/interrupt/sys/dev/an/if_an.c#4 integrate ... //depot/projects/interrupt/sys/dev/an/if_an_isa.c#2 integrate ... //depot/projects/interrupt/sys/dev/an/if_an_pci.c#2 integrate ... //depot/projects/interrupt/sys/dev/an/if_anreg.h#2 integrate ... //depot/projects/interrupt/sys/dev/ar/if_ar.c#2 integrate ... //depot/projects/interrupt/sys/dev/asr/asr.c#3 integrate ... //depot/projects/interrupt/sys/dev/asr/dptalign.h#2 integrate ... //depot/projects/interrupt/sys/dev/asr/dptsig.h#2 integrate ... //depot/projects/interrupt/sys/dev/asr/i2oadptr.h#2 integrate ... //depot/projects/interrupt/sys/dev/asr/i2obscsi.h#2 integrate ... //depot/projects/interrupt/sys/dev/asr/i2odep.h#2 integrate ... //depot/projects/interrupt/sys/dev/asr/i2odpt.h#2 integrate ... //depot/projects/interrupt/sys/dev/asr/i2oexec.h#2 integrate ... //depot/projects/interrupt/sys/dev/asr/i2omsg.h#2 integrate ... //depot/projects/interrupt/sys/dev/asr/i2otypes.h#2 integrate ... //depot/projects/interrupt/sys/dev/asr/i2outil.h#2 integrate ... //depot/projects/interrupt/sys/dev/asr/osd_defs.h#2 integrate ... //depot/projects/interrupt/sys/dev/asr/osd_unix.h#2 integrate ... //depot/projects/interrupt/sys/dev/asr/osd_util.h#2 integrate ... //depot/projects/interrupt/sys/dev/asr/sys_info.h#2 integrate ... //depot/projects/interrupt/sys/dev/ata/ata-all.c#6 integrate ... //depot/projects/interrupt/sys/dev/ata/ata-all.h#4 integrate ... //depot/projects/interrupt/sys/dev/ata/ata-disk.c#6 integrate ... //depot/projects/interrupt/sys/dev/ata/ata-disk.h#4 integrate ... //depot/projects/interrupt/sys/dev/ata/ata-dma.c#5 integrate ... //depot/projects/interrupt/sys/dev/ata/ata-isa.c#3 integrate ... //depot/projects/interrupt/sys/dev/ata/ata-pci.c#5 integrate ... //depot/projects/interrupt/sys/dev/ata/ata-raid.c#6 integrate ... //depot/projects/interrupt/sys/dev/ata/ata-raid.h#6 integrate ... //depot/projects/interrupt/sys/dev/ata/atapi-all.c#5 integrate ... //depot/projects/interrupt/sys/dev/ata/atapi-all.h#3 integrate ... //depot/projects/interrupt/sys/dev/ata/atapi-cd.c#5 integrate ... //depot/projects/interrupt/sys/dev/ata/atapi-cd.h#3 integrate ... //depot/projects/interrupt/sys/dev/ata/atapi-fd.c#4 integrate ... //depot/projects/interrupt/sys/dev/ata/atapi-tape.c#5 integrate ... //depot/projects/interrupt/sys/dev/awi/am79c930.c#2 integrate ... //depot/projects/interrupt/sys/dev/awi/am79c930var.h#2 integrate ... //depot/projects/interrupt/sys/dev/awi/awi.c#2 integrate ... //depot/projects/interrupt/sys/dev/awi/awi_wep.c#2 integrate ... //depot/projects/interrupt/sys/dev/awi/awi_wicfg.c#2 integrate ... //depot/projects/interrupt/sys/dev/awi/awivar.h#2 integrate ... //depot/projects/interrupt/sys/dev/bge/if_bge.c#3 integrate ... //depot/projects/interrupt/sys/dev/bge/if_bgereg.h#3 integrate ... //depot/projects/interrupt/sys/dev/bktr/CHANGELOG.TXT#2 integrate ... //depot/projects/interrupt/sys/dev/bktr/bktr_card.h#2 integrate ... //depot/projects/interrupt/sys/dev/bktr/bktr_core.c#3 integrate ... //depot/projects/interrupt/sys/dev/bktr/bktr_i2c.c#2 integrate ... //depot/projects/interrupt/sys/dev/bktr/bktr_i2c.h#2 integrate ... //depot/projects/interrupt/sys/dev/bktr/bktr_os.c#2 integrate ... //depot/projects/interrupt/sys/dev/bktr/bktr_reg.h#2 integrate ... //depot/projects/interrupt/sys/dev/cardbus/cardbus.c#6 integrate ... //depot/projects/interrupt/sys/dev/cardbus/cardbus_cis.c#5 integrate ... //depot/projects/interrupt/sys/dev/ccd/ccd.c#4 integrate ... //depot/projects/interrupt/sys/dev/ciss/ciss.c#2 integrate ... //depot/projects/interrupt/sys/dev/cm/if_cm_isa.c#2 integrate ... //depot/projects/interrupt/sys/dev/cm/smc90cx6.c#2 integrate ... //depot/projects/interrupt/sys/dev/cm/smc90cx6var.h#2 integrate ... //depot/projects/interrupt/sys/dev/cnw/if_cnw.c#3 integrate ... //depot/projects/interrupt/sys/dev/ct/bshw_machdep.c#2 integrate ... //depot/projects/interrupt/sys/dev/ct/bshwvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/ct/ct.c#2 integrate ... //depot/projects/interrupt/sys/dev/ct/ct_isa.c#2 integrate ... //depot/projects/interrupt/sys/dev/ct/ct_machdep.h#2 integrate ... //depot/projects/interrupt/sys/dev/ct/ctvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/dgb/dgb.c#3 integrate ... //depot/projects/interrupt/sys/dev/digi/CX.c#2 integrate ... //depot/projects/interrupt/sys/dev/digi/CX_PCI.c#2 integrate ... //depot/projects/interrupt/sys/dev/digi/EPCX.c#2 integrate ... //depot/projects/interrupt/sys/dev/digi/EPCX_PCI.c#2 integrate ... //depot/projects/interrupt/sys/dev/digi/Xe.c#2 integrate ... //depot/projects/interrupt/sys/dev/digi/Xem.c#2 integrate ... //depot/projects/interrupt/sys/dev/digi/Xr.c#2 integrate ... //depot/projects/interrupt/sys/dev/digi/digi.c#4 integrate ... //depot/projects/interrupt/sys/dev/digi/digi.h#3 integrate ... //depot/projects/interrupt/sys/dev/digi/digi_isa.c#3 integrate ... //depot/projects/interrupt/sys/dev/drm/drm.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drmP.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_agpsupport.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_auth.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_bufs.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_context.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_dma.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_drawable.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_drv.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_fops.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_init.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_ioctl.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_linux.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_lists.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_lock.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_memory.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_os_freebsd.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_scatter.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_sysctl.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/drm_vm.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/gamma.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/gamma_dma.c#1 branch ... //depot/projects/interrupt/sys/dev/drm/gamma_drv.c#1 branch ... //depot/projects/interrupt/sys/dev/drm/gamma_drv.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/i810_drm.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/mga.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/mga_dma.c#1 branch ... //depot/projects/interrupt/sys/dev/drm/mga_drm.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/mga_drv.c#1 branch ... //depot/projects/interrupt/sys/dev/drm/mga_drv.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/mga_state.c#1 branch ... //depot/projects/interrupt/sys/dev/drm/mga_ucode.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/mga_warp.c#1 branch ... //depot/projects/interrupt/sys/dev/drm/r128.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/r128_cce.c#1 branch ... //depot/projects/interrupt/sys/dev/drm/r128_drm.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/r128_drv.c#1 branch ... //depot/projects/interrupt/sys/dev/drm/r128_drv.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/r128_state.c#1 branch ... //depot/projects/interrupt/sys/dev/drm/radeon.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/radeon_cp.c#1 branch ... //depot/projects/interrupt/sys/dev/drm/radeon_drm.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/radeon_drv.c#1 branch ... //depot/projects/interrupt/sys/dev/drm/radeon_drv.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/radeon_state.c#1 branch ... //depot/projects/interrupt/sys/dev/drm/sis_drm.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/tdfx.h#1 branch ... //depot/projects/interrupt/sys/dev/drm/tdfx_drv.c#1 branch ... //depot/projects/interrupt/sys/dev/ed/if_ed.c#2 integrate ... //depot/projects/interrupt/sys/dev/ed/if_ed_cbus.c#2 integrate ... //depot/projects/interrupt/sys/dev/ed/if_ed_isa.c#2 integrate ... //depot/projects/interrupt/sys/dev/ed/if_ed_pccard.c#3 integrate ... //depot/projects/interrupt/sys/dev/ed/if_ed_pci.c#2 integrate ... //depot/projects/interrupt/sys/dev/ed/if_edvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/eisa/eisaconf.c#2 integrate ... //depot/projects/interrupt/sys/dev/eisa/eisaconf.h#2 integrate ... //depot/projects/interrupt/sys/dev/em/README#1 branch ... //depot/projects/interrupt/sys/dev/em/if_em.c#3 integrate ... //depot/projects/interrupt/sys/dev/em/if_em.h#3 integrate ... //depot/projects/interrupt/sys/dev/em/if_em_fxhw.c#3 integrate ... //depot/projects/interrupt/sys/dev/em/if_em_fxhw.h#3 integrate ... //depot/projects/interrupt/sys/dev/em/if_em_hw.c#1 branch ... //depot/projects/interrupt/sys/dev/em/if_em_hw.h#1 branch ... //depot/projects/interrupt/sys/dev/em/if_em_osdep.h#3 integrate ... //depot/projects/interrupt/sys/dev/em/if_em_phy.c#3 integrate ... //depot/projects/interrupt/sys/dev/em/if_em_phy.h#3 integrate ... //depot/projects/interrupt/sys/dev/en/midway.c#2 integrate ... //depot/projects/interrupt/sys/dev/en/midwayvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/ep/if_ep.c#3 integrate ... //depot/projects/interrupt/sys/dev/ep/if_ep_eisa.c#2 integrate ... //depot/projects/interrupt/sys/dev/ep/if_ep_pccard.c#2 integrate ... //depot/projects/interrupt/sys/dev/ex/if_ex.c#2 integrate ... //depot/projects/interrupt/sys/dev/ex/if_ex_isa.c#2 integrate ... //depot/projects/interrupt/sys/dev/ex/if_ex_pccard.c#2 integrate ... //depot/projects/interrupt/sys/dev/exca/exca.c#2 integrate ... //depot/projects/interrupt/sys/dev/fb/fb.c#2 integrate ... //depot/projects/interrupt/sys/dev/fb/fbreg.h#2 integrate ... //depot/projects/interrupt/sys/dev/fb/gfb.c#2 integrate ... //depot/projects/interrupt/sys/dev/fb/tga.c#2 integrate ... //depot/projects/interrupt/sys/dev/fb/vga.c#2 integrate ... //depot/projects/interrupt/sys/dev/fxp/if_fxp.c#3 integrate ... //depot/projects/interrupt/sys/dev/fxp/if_fxpvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/gem/if_gem.c#2 integrate ... //depot/projects/interrupt/sys/dev/gem/if_gem_pci.c#3 integrate ... //depot/projects/interrupt/sys/dev/gem/if_gemvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/gfb/gfb_pci.c#2 integrate ... //depot/projects/interrupt/sys/dev/gx/if_gx.c#2 integrate ... //depot/projects/interrupt/sys/dev/gx/if_gxvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/hea/eni.c#2 integrate ... //depot/projects/interrupt/sys/dev/hea/eni.h#2 integrate ... //depot/projects/interrupt/sys/dev/hea/eni_buffer.c#3 integrate ... //depot/projects/interrupt/sys/dev/hea/eni_if.c#2 integrate ... //depot/projects/interrupt/sys/dev/hea/eni_intr.c#2 integrate ... //depot/projects/interrupt/sys/dev/hea/eni_receive.c#2 integrate ... //depot/projects/interrupt/sys/dev/hea/eni_transmit.c#2 integrate ... //depot/projects/interrupt/sys/dev/hea/eni_var.h#2 integrate ... //depot/projects/interrupt/sys/dev/hea/eni_vcm.c#3 integrate ... //depot/projects/interrupt/sys/dev/hea/hea_freebsd.c#1 branch ... //depot/projects/interrupt/sys/dev/hea/hea_freebsd.h#1 branch ... //depot/projects/interrupt/sys/dev/hea/hea_pci.c#1 branch ... //depot/projects/interrupt/sys/dev/hfa/fore_buffer.c#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_command.c#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_include.h#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_init.c#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_load.c#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_output.c#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_receive.c#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_slave.h#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/hfa_eisa.c#1 branch ... //depot/projects/interrupt/sys/dev/hfa/hfa_freebsd.c#1 branch ... //depot/projects/interrupt/sys/dev/hfa/hfa_freebsd.h#1 branch ... //depot/projects/interrupt/sys/dev/hfa/hfa_pci.c#1 branch ... //depot/projects/interrupt/sys/dev/hfa/hfa_sbus.c#1 branch ... //depot/projects/interrupt/sys/dev/hme/if_hme.c#3 integrate ... //depot/projects/interrupt/sys/dev/hme/if_hme_pci.c#3 integrate ... //depot/projects/interrupt/sys/dev/hme/if_hme_sbus.c#2 integrate ... //depot/projects/interrupt/sys/dev/hme/if_hmereg.h#2 integrate ... //depot/projects/interrupt/sys/dev/hme/if_hmevar.h#2 integrate ... //depot/projects/interrupt/sys/dev/ichsmb/ichsmb.c#2 integrate ... //depot/projects/interrupt/sys/dev/ichsmb/ichsmb_pci.c#2 integrate ... //depot/projects/interrupt/sys/dev/ida/ida.c#2 integrate ... //depot/projects/interrupt/sys/dev/ida/ida_disk.c#2 integrate ... //depot/projects/interrupt/sys/dev/iicbus/if_ic.c#2 integrate ... //depot/projects/interrupt/sys/dev/iicbus/iic.c#2 integrate ... //depot/projects/interrupt/sys/dev/iicbus/iicbb.c#2 integrate ... //depot/projects/interrupt/sys/dev/iicbus/iicbb_if.m#2 integrate ... //depot/projects/interrupt/sys/dev/iicbus/iicbus.c#2 integrate ... //depot/projects/interrupt/sys/dev/iicbus/iiconf.c#2 integrate ... //depot/projects/interrupt/sys/dev/iicbus/iiconf.h#2 integrate ... //depot/projects/interrupt/sys/dev/iicbus/iicsmb.c#2 integrate ... //depot/projects/interrupt/sys/dev/iir/iir.c#2 integrate ... //depot/projects/interrupt/sys/dev/iir/iir.h#3 integrate ... //depot/projects/interrupt/sys/dev/iir/iir_ctrl.c#2 integrate ... //depot/projects/interrupt/sys/dev/iir/iir_pci.c#2 integrate ... //depot/projects/interrupt/sys/dev/isp/isp.c#4 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_freebsd.c#3 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_freebsd.h#3 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_inline.h#3 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_pci.c#3 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_target.h#3 integrate ... //depot/projects/interrupt/sys/dev/isp/ispmbox.h#3 integrate ... //depot/projects/interrupt/sys/dev/isp/ispvar.h#3 integrate ... //depot/projects/interrupt/sys/dev/ispfw/ispfw.c#2 integrate ... //depot/projects/interrupt/sys/dev/joy/joy.c#2 integrate ... //depot/projects/interrupt/sys/dev/joy/joy_isa.c#2 integrate ... //depot/projects/interrupt/sys/dev/joy/joy_pccard.c#2 integrate ... //depot/projects/interrupt/sys/dev/joy/joyvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/kbd/atkbd.c#2 integrate ... //depot/projects/interrupt/sys/dev/kbd/atkbdc.c#2 integrate ... //depot/projects/interrupt/sys/dev/lge/if_lge.c#2 integrate ... //depot/projects/interrupt/sys/dev/lmc/if_lmc.c#2 integrate ... //depot/projects/interrupt/sys/dev/lmc/if_lmc_common.c#2 integrate ... //depot/projects/interrupt/sys/dev/lmc/if_lmc_fbsd3.c#2 integrate ... //depot/projects/interrupt/sys/dev/lmc/if_lmc_media.c#2 integrate ... //depot/projects/interrupt/sys/dev/lmc/if_lmcioctl.h#2 integrate ... //depot/projects/interrupt/sys/dev/lmc/if_lmcvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/lnc/if_lnc.c#3 integrate ... //depot/projects/interrupt/sys/dev/lnc/if_lncvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/md/md.c#5 integrate ... //depot/projects/interrupt/sys/dev/mii/acphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/amphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/brgphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/dcphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/e1000phy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/exphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/inphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/lxtphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/mii.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/mii.h#2 integrate ... //depot/projects/interrupt/sys/dev/mii/mii_physubr.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/miidevs#2 integrate ... //depot/projects/interrupt/sys/dev/mii/miidevs.h#2 integrate ... //depot/projects/interrupt/sys/dev/mii/miivar.h#2 integrate ... //depot/projects/interrupt/sys/dev/mii/mlphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/nsgphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/nsgphyreg.h#2 integrate ... //depot/projects/interrupt/sys/dev/mii/nsphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/pnaphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/pnphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/qsphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/rlphy.c#3 integrate ... //depot/projects/interrupt/sys/dev/mii/tdkphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/tlphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/ukphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/ukphy_subr.c#2 integrate ... //depot/projects/interrupt/sys/dev/mii/xmphy.c#2 integrate ... //depot/projects/interrupt/sys/dev/mk48txx/mk48txx.c#1 branch ... //depot/projects/interrupt/sys/dev/mk48txx/mk48txxreg.h#1 branch ... //depot/projects/interrupt/sys/dev/mlx/mlx.c#2 integrate ... //depot/projects/interrupt/sys/dev/mly/mly.c#2 integrate ... //depot/projects/interrupt/sys/dev/my/if_my.c#1 branch ... //depot/projects/interrupt/sys/dev/my/if_myreg.h#1 branch ... //depot/projects/interrupt/sys/dev/ncv/ncr53c500.c#2 integrate ... //depot/projects/interrupt/sys/dev/ncv/ncr53c500_pccard.c#2 integrate ... //depot/projects/interrupt/sys/dev/ncv/ncr53c500var.h#2 integrate ... //depot/projects/interrupt/sys/dev/nge/if_nge.c#3 integrate ... //depot/projects/interrupt/sys/dev/nge/if_ngereg.h#2 integrate ... //depot/projects/interrupt/sys/dev/nmdm/nmdm.c#4 integrate ... //depot/projects/interrupt/sys/dev/nsp/nsp.c#2 integrate ... //depot/projects/interrupt/sys/dev/nsp/nsp_pccard.c#2 integrate ... //depot/projects/interrupt/sys/dev/nsp/nspvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/null/null.c#2 integrate ... //depot/projects/interrupt/sys/dev/ofw/ofw_console.c#2 integrate ... //depot/projects/interrupt/sys/dev/ofw/ofw_disk.c#1 branch ... //depot/projects/interrupt/sys/dev/pccard/card_if.m#3 integrate ... //depot/projects/interrupt/sys/dev/pccard/pccard.c#4 integrate ... //depot/projects/interrupt/sys/dev/pccard/pccard_cis.c#4 integrate ... //depot/projects/interrupt/sys/dev/pccard/pccard_common.c#1 branch ... //depot/projects/interrupt/sys/dev/pccard/pccarddevs#3 integrate ... //depot/projects/interrupt/sys/dev/pccard/pccarddevs.h#3 integrate ... //depot/projects/interrupt/sys/dev/pccard/pccardvar.h#3 integrate ... //depot/projects/interrupt/sys/dev/pccbb/pccbb.c#3 integrate ... //depot/projects/interrupt/sys/dev/pccbb/pccbbreg.h#3 integrate ... //depot/projects/interrupt/sys/dev/pci/pci.c#4 integrate ... //depot/projects/interrupt/sys/dev/pci/pci_pci.c#3 integrate ... //depot/projects/interrupt/sys/dev/pci/pcireg.h#2 integrate ... //depot/projects/interrupt/sys/dev/pci/pcivar.h#3 integrate ... //depot/projects/interrupt/sys/dev/pcic/i82365_isa.c#2 integrate ... //depot/projects/interrupt/sys/dev/pdq/if_fea.c#2 integrate ... //depot/projects/interrupt/sys/dev/pdq/if_fpa.c#2 integrate ... //depot/projects/interrupt/sys/dev/pdq/pdq.c#2 integrate ... //depot/projects/interrupt/sys/dev/pdq/pdq_freebsd.h#1 branch ... //depot/projects/interrupt/sys/dev/pdq/pdq_ifsubr.c#3 integrate ... //depot/projects/interrupt/sys/dev/pdq/pdqreg.h#2 integrate ... //depot/projects/interrupt/sys/dev/pdq/pdqvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/ppbus/if_plip.c#2 integrate ... //depot/projects/interrupt/sys/dev/ppbus/lpbb.c#2 integrate ... //depot/projects/interrupt/sys/dev/ppbus/lpt.c#2 integrate ... //depot/projects/interrupt/sys/dev/ppbus/pcfclock.c#2 integrate ... //depot/projects/interrupt/sys/dev/ppbus/ppb_msq.c#2 integrate ... //depot/projects/interrupt/sys/dev/ppbus/ppi.c#2 integrate ... //depot/projects/interrupt/sys/dev/ppbus/pps.c#2 integrate ... //depot/projects/interrupt/sys/dev/ppbus/vpo.c#2 integrate ... //depot/projects/interrupt/sys/dev/puc/puc.c#3 integrate ... //depot/projects/interrupt/sys/dev/puc/pucdata.c#3 integrate ... //depot/projects/interrupt/sys/dev/random/harvest.c#3 integrate ... //depot/projects/interrupt/sys/dev/random/randomdev.c#4 integrate ... //depot/projects/interrupt/sys/dev/random/yarrow.c#3 integrate ... //depot/projects/interrupt/sys/dev/ray/if_ray.c#2 integrate ... //depot/projects/interrupt/sys/dev/rp/rp.c#3 integrate ... //depot/projects/interrupt/sys/dev/sbni/if_sbni.c#2 integrate ... //depot/projects/interrupt/sys/dev/se/se_console.c#1 branch ... //depot/projects/interrupt/sys/dev/se/sereg.h#1 branch ... //depot/projects/interrupt/sys/dev/si/si.c#2 integrate ... //depot/projects/interrupt/sys/dev/sio/sio.c#3 integrate ... //depot/projects/interrupt/sys/dev/sio/sio_isa.c#4 integrate ... //depot/projects/interrupt/sys/dev/sio/sio_pccard.c#3 integrate ... //depot/projects/interrupt/sys/dev/sio/sio_pci.c#3 integrate ... //depot/projects/interrupt/sys/dev/sio/sio_puc.c#3 integrate ... //depot/projects/interrupt/sys/dev/sio/siovar.h#3 integrate ... //depot/projects/interrupt/sys/dev/smbus/smb.c#2 integrate ... //depot/projects/interrupt/sys/dev/smbus/smbconf.c#2 integrate ... //depot/projects/interrupt/sys/dev/smbus/smbconf.h#2 integrate ... //depot/projects/interrupt/sys/dev/smbus/smbus.c#2 integrate ... //depot/projects/interrupt/sys/dev/snc/dp83932.c#2 integrate ... //depot/projects/interrupt/sys/dev/snc/dp83932subr.c#2 integrate ... //depot/projects/interrupt/sys/dev/snc/dp83932subr.h#2 integrate ... //depot/projects/interrupt/sys/dev/snc/dp83932var.h#2 integrate ... //depot/projects/interrupt/sys/dev/snc/if_snc_cbus.c#2 integrate ... //depot/projects/interrupt/sys/dev/snc/if_sncvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/snp/snp.c#3 integrate ... //depot/projects/interrupt/sys/dev/sound/isa/ad1816.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/isa/emu8000.c#3 integrate ... //depot/projects/interrupt/sys/dev/sound/isa/gusmidi.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/isa/mpu.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/isa/mss.c#3 integrate ... //depot/projects/interrupt/sys/dev/sound/isa/opl.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/isa/sbc.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/isa/uartsio.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/midi/midi.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/midi/midi.h#2 integrate ... //depot/projects/interrupt/sys/dev/sound/midi/sequencer.c#3 integrate ... //depot/projects/interrupt/sys/dev/sound/midi/timer.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pci/cmi.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pci/csamidi.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pci/ds1.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pci/emu10k1.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pci/es137x.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pci/ich.c#3 integrate ... //depot/projects/interrupt/sys/dev/sound/pci/maestro.c#3 integrate ... //depot/projects/interrupt/sys/dev/sound/pci/t4dwave.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pcm/ac97.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pcm/ac97.h#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pcm/ac97_if.m#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pcm/channel.c#4 integrate ... //depot/projects/interrupt/sys/dev/sound/pcm/feeder.c#3 integrate ... //depot/projects/interrupt/sys/dev/sound/pcm/feeder_fmt.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pcm/feeder_if.m#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pcm/mixer.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pcm/mixer_if.m#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pcm/sndstat.c#2 integrate ... //depot/projects/interrupt/sys/dev/sound/pcm/sound.c#3 integrate ... //depot/projects/interrupt/sys/dev/sound/pcm/sound.h#3 integrate ... //depot/projects/interrupt/sys/dev/sr/if_sr.c#2 integrate ... //depot/projects/interrupt/sys/dev/stg/tmc18c30.c#2 integrate ... //depot/projects/interrupt/sys/dev/stg/tmc18c30_isa.c#2 integrate ... //depot/projects/interrupt/sys/dev/stg/tmc18c30_pccard.c#2 integrate ... //depot/projects/interrupt/sys/dev/stg/tmc18c30var.h#2 integrate ... //depot/projects/interrupt/sys/dev/streams/streams.c#4 integrate ... //depot/projects/interrupt/sys/dev/sym/sym_hipd.c#2 integrate ... //depot/projects/interrupt/sys/dev/syscons/apm/apm_saver.c#2 integrate ... //depot/projects/interrupt/sys/dev/syscons/dragon/dragon_saver.c#1 branch ... //depot/projects/interrupt/sys/dev/syscons/fire/fire_saver.c#2 integrate ... //depot/projects/interrupt/sys/dev/syscons/logo/logo_saver.c#2 integrate ... //depot/projects/interrupt/sys/dev/syscons/rain/rain_saver.c#2 integrate ... //depot/projects/interrupt/sys/dev/syscons/scgfbrndr.c#3 integrate ... //depot/projects/interrupt/sys/dev/syscons/syscons.c#3 integrate ... //depot/projects/interrupt/sys/dev/syscons/syscons.h#2 integrate ... //depot/projects/interrupt/sys/dev/syscons/sysmouse.c#2 integrate ... //depot/projects/interrupt/sys/dev/syscons/warp/warp_saver.c#2 integrate ... //depot/projects/interrupt/sys/dev/tdfx/tdfx_pci.c#3 integrate ... //depot/projects/interrupt/sys/dev/twe/twe_freebsd.c#3 integrate ... //depot/projects/interrupt/sys/dev/tx/if_tx.c#1 branch ... //depot/projects/interrupt/sys/dev/tx/if_txreg.h#1 branch ... //depot/projects/interrupt/sys/dev/tx/if_txvar.h#1 branch ... //depot/projects/interrupt/sys/dev/txp/if_txp.c#2 integrate ... //depot/projects/interrupt/sys/dev/usb/devlist2h.awk#2 integrate ... //depot/projects/interrupt/sys/dev/usb/hid.c#2 integrate ... //depot/projects/interrupt/sys/dev/usb/hid.h#2 integrate ... //depot/projects/interrupt/sys/dev/usb/if_aue.c#2 integrate ... //depot/projects/interrupt/sys/dev/usb/if_auereg.h#2 integrate ... //depot/projects/interrupt/sys/dev/usb/if_cue.c#2 integrate ... //depot/projects/interrupt/sys/dev/usb/if_cuereg.h#2 integrate ... //depot/projects/interrupt/sys/dev/usb/if_kue.c#2 integrate ... //depot/projects/interrupt/sys/dev/usb/if_kuereg.h#2 integrate ... //depot/projects/interrupt/sys/dev/usb/ohci.c#4 integrate ... //depot/projects/interrupt/sys/dev/usb/ohcireg.h#3 integrate ... //depot/projects/interrupt/sys/dev/usb/ohcivar.h#3 integrate ... //depot/projects/interrupt/sys/dev/usb/ucom.c#1 branch ... //depot/projects/interrupt/sys/dev/usb/ucomvar.h#1 branch ... //depot/projects/interrupt/sys/dev/usb/udbp.c#2 integrate ... //depot/projects/interrupt/sys/dev/usb/udbp.h#2 integrate ... //depot/projects/interrupt/sys/dev/usb/ufm.c#3 integrate ... //depot/projects/interrupt/sys/dev/usb/ugen.c#4 integrate ... //depot/projects/interrupt/sys/dev/usb/ugraphire_rdesc.h#1 branch ... //depot/projects/interrupt/sys/dev/usb/uhci.c#4 integrate ... //depot/projects/interrupt/sys/dev/usb/uhcireg.h#3 integrate ... //depot/projects/interrupt/sys/dev/usb/uhcivar.h#3 integrate ... //depot/projects/interrupt/sys/dev/usb/uhid.c#4 integrate ... //depot/projects/interrupt/sys/dev/usb/uhub.c#3 integrate ... //depot/projects/interrupt/sys/dev/usb/ukbd.c#2 integrate ... //depot/projects/interrupt/sys/dev/usb/ulpt.c#4 integrate ... //depot/projects/interrupt/sys/dev/usb/umass.c#3 integrate ... //depot/projects/interrupt/sys/dev/usb/umodem.c#4 integrate ... //depot/projects/interrupt/sys/dev/usb/ums.c#4 integrate ... //depot/projects/interrupt/sys/dev/usb/uplcom.c#1 branch ... //depot/projects/interrupt/sys/dev/usb/urio.c#3 integrate ... //depot/projects/interrupt/sys/dev/usb/usb.c#4 integrate ... //depot/projects/interrupt/sys/dev/usb/usb_ethersubr.c#2 integrate ... //depot/projects/interrupt/sys/dev/usb/usb_ethersubr.h#2 integrate ... //depot/projects/interrupt/sys/dev/usb/usb_mem.h#2 integrate ... //depot/projects/interrupt/sys/dev/usb/usb_port.h#4 integrate ... //depot/projects/interrupt/sys/dev/usb/usb_quirks.c#2 integrate ... //depot/projects/interrupt/sys/dev/usb/usb_subr.c#3 integrate ... //depot/projects/interrupt/sys/dev/usb/usbdevs#3 integrate ... //depot/projects/interrupt/sys/dev/usb/usbdevs.h#3 integrate ... //depot/projects/interrupt/sys/dev/usb/usbdevs_data.h#3 integrate ... //depot/projects/interrupt/sys/dev/usb/usbdi.c#3 integrate ... //depot/projects/interrupt/sys/dev/usb/usbdi.h#3 integrate ... //depot/projects/interrupt/sys/dev/usb/usbdi_util.c#2 integrate ... //depot/projects/interrupt/sys/dev/usb/usbdi_util.h#2 integrate ... //depot/projects/interrupt/sys/dev/usb/usbdivar.h#3 integrate ... //depot/projects/interrupt/sys/dev/usb/uvscom.c#1 branch ... //depot/projects/interrupt/sys/dev/vinum/vinum.c#2 integrate ... //depot/projects/interrupt/sys/dev/vinum/vinumconfig.c#3 integrate ... //depot/projects/interrupt/sys/dev/vinum/vinumext.h#2 integrate ... //depot/projects/interrupt/sys/dev/vinum/vinumhdr.h#2 integrate ... //depot/projects/interrupt/sys/dev/vinum/vinumio.c#2 integrate ... //depot/projects/interrupt/sys/dev/vinum/vinumioctl.c#3 integrate ... //depot/projects/interrupt/sys/dev/vinum/vinumobj.h#2 integrate ... //depot/projects/interrupt/sys/dev/vinum/vinumrequest.c#4 integrate ... //depot/projects/interrupt/sys/dev/vinum/vinumrevive.c#4 integrate ... //depot/projects/interrupt/sys/dev/vinum/vinumstate.c#2 integrate ... //depot/projects/interrupt/sys/dev/vx/if_vx.c#3 integrate ... //depot/projects/interrupt/sys/dev/vx/if_vx_eisa.c#2 integrate ... //depot/projects/interrupt/sys/dev/vx/if_vxreg.h#2 integrate ... //depot/projects/interrupt/sys/dev/wi/if_wavelan_ieee.h#2 integrate ... //depot/projects/interrupt/sys/dev/wi/if_wi.c#7 integrate ... //depot/projects/interrupt/sys/dev/wi/if_wi_pccard.c#1 branch ... //depot/projects/interrupt/sys/dev/wi/if_wi_pci.c#1 branch ... //depot/projects/interrupt/sys/dev/wi/if_wireg.h#4 integrate ... //depot/projects/interrupt/sys/dev/wi/if_wivar.h#1 branch ... //depot/projects/interrupt/sys/dev/wi/wi_hostap.c#1 branch ... //depot/projects/interrupt/sys/dev/wi/wi_hostap.h#1 branch ... //depot/projects/interrupt/sys/dev/wl/if_wl.c#3 integrate ... //depot/projects/interrupt/sys/dev/wl/if_wl.h#2 integrate ... //depot/projects/interrupt/sys/dev/xe/if_xe_pccard.c#2 integrate ... //depot/projects/interrupt/sys/fs/deadfs/dead_vnops.c#2 integrate ... //depot/projects/interrupt/sys/fs/devfs/devfs.h#2 integrate ... //depot/projects/interrupt/sys/fs/devfs/devfs_vfsops.c#2 integrate ... //depot/projects/interrupt/sys/fs/devfs/devfs_vnops.c#3 integrate ... //depot/projects/interrupt/sys/fs/fdescfs/fdesc.h#2 integrate ... //depot/projects/interrupt/sys/fs/fdescfs/fdesc_vfsops.c#3 integrate ... //depot/projects/interrupt/sys/fs/fdescfs/fdesc_vnops.c#3 integrate ... //depot/projects/interrupt/sys/fs/fifofs/fifo.h#2 integrate ... //depot/projects/interrupt/sys/fs/fifofs/fifo_vnops.c#4 integrate ... //depot/projects/interrupt/sys/fs/hpfs/hpfs.h#2 integrate ... //depot/projects/interrupt/sys/fs/hpfs/hpfs_hash.c#2 integrate ... //depot/projects/interrupt/sys/fs/hpfs/hpfs_subr.c#2 integrate ... //depot/projects/interrupt/sys/fs/hpfs/hpfs_vfsops.c#3 integrate ... //depot/projects/interrupt/sys/fs/hpfs/hpfs_vnops.c#4 integrate ... //depot/projects/interrupt/sys/fs/msdosfs/denode.h#2 integrate ... //depot/projects/interrupt/sys/fs/msdosfs/direntry.h#2 integrate ... //depot/projects/interrupt/sys/fs/msdosfs/fat.h#2 integrate ... //depot/projects/interrupt/sys/fs/msdosfs/msdosfs_conv.c#2 integrate ... //depot/projects/interrupt/sys/fs/msdosfs/msdosfs_denode.c#2 integrate ... //depot/projects/interrupt/sys/fs/msdosfs/msdosfs_fat.c#3 integrate ... //depot/projects/interrupt/sys/fs/msdosfs/msdosfs_lookup.c#2 integrate ... //depot/projects/interrupt/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate ... //depot/projects/interrupt/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate ... //depot/projects/interrupt/sys/fs/msdosfs/msdosfsmount.h#2 integrate ... //depot/projects/interrupt/sys/fs/ntfs/ntfs_ihash.c#2 integrate ... //depot/projects/interrupt/sys/fs/ntfs/ntfs_ihash.h#2 integrate ... //depot/projects/interrupt/sys/fs/ntfs/ntfs_subr.c#2 integrate ... //depot/projects/interrupt/sys/fs/ntfs/ntfs_subr.h#2 integrate ... //depot/projects/interrupt/sys/fs/ntfs/ntfs_vfsops.c#3 integrate ... //depot/projects/interrupt/sys/fs/ntfs/ntfs_vnops.c#2 integrate ... //depot/projects/interrupt/sys/fs/nullfs/null.h#2 integrate ... //depot/projects/interrupt/sys/fs/nullfs/null_vfsops.c#2 integrate ... //depot/projects/interrupt/sys/fs/nullfs/null_vnops.c#2 integrate ... //depot/projects/interrupt/sys/fs/nwfs/nwfs_mount.h#2 integrate ... //depot/projects/interrupt/sys/fs/nwfs/nwfs_vfsops.c#3 integrate ... //depot/projects/interrupt/sys/fs/portalfs/portal_vfsops.c#3 integrate ... //depot/projects/interrupt/sys/fs/portalfs/portal_vnops.c#4 integrate ... //depot/projects/interrupt/sys/fs/procfs/procfs.c#3 integrate ... //depot/projects/interrupt/sys/fs/procfs/procfs.h#2 integrate ... //depot/projects/interrupt/sys/fs/procfs/procfs_ctl.c#3 integrate ... //depot/projects/interrupt/sys/fs/procfs/procfs_dbregs.c#3 integrate ... //depot/projects/interrupt/sys/fs/procfs/procfs_fpregs.c#3 integrate ... //depot/projects/interrupt/sys/fs/procfs/procfs_ioctl.c#3 integrate ... //depot/projects/interrupt/sys/fs/procfs/procfs_mem.c#2 integrate ... //depot/projects/interrupt/sys/fs/procfs/procfs_regs.c#3 integrate ... //depot/projects/interrupt/sys/fs/procfs/procfs_status.c#3 integrate ... //depot/projects/interrupt/sys/fs/pseudofs/pseudofs.c#2 integrate ... //depot/projects/interrupt/sys/fs/pseudofs/pseudofs.h#3 integrate ... //depot/projects/interrupt/sys/fs/pseudofs/pseudofs_fileno.c#2 integrate ... //depot/projects/interrupt/sys/fs/pseudofs/pseudofs_vncache.c#2 integrate ... //depot/projects/interrupt/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate ... //depot/projects/interrupt/sys/fs/smbfs/smbfs.h#2 integrate ... //depot/projects/interrupt/sys/fs/smbfs/smbfs_io.c#3 integrate ... //depot/projects/interrupt/sys/fs/smbfs/smbfs_smb.c#2 integrate ... //depot/projects/interrupt/sys/fs/smbfs/smbfs_vfsops.c#3 integrate ... //depot/projects/interrupt/sys/fs/smbfs/smbfs_vnops.c#3 integrate ... //depot/projects/interrupt/sys/fs/specfs/spec_vnops.c#5 integrate ... //depot/projects/interrupt/sys/fs/udf/ecma167-udf.h#1 branch ... //depot/projects/interrupt/sys/fs/udf/osta.c#1 branch ... //depot/projects/interrupt/sys/fs/udf/osta.h#1 branch ... //depot/projects/interrupt/sys/fs/udf/udf.h#1 branch ... //depot/projects/interrupt/sys/fs/udf/udf_mount.h#1 branch ... //depot/projects/interrupt/sys/fs/udf/udf_vfsops.c#1 branch ... //depot/projects/interrupt/sys/fs/udf/udf_vnops.c#1 branch ... //depot/projects/interrupt/sys/fs/umapfs/umap.h#2 integrate ... //depot/projects/interrupt/sys/fs/umapfs/umap_subr.c#2 integrate ... //depot/projects/interrupt/sys/fs/umapfs/umap_vfsops.c#2 integrate ... //depot/projects/interrupt/sys/fs/umapfs/umap_vnops.c#2 integrate ... //depot/projects/interrupt/sys/fs/unionfs/union.h#2 integrate ... //depot/projects/interrupt/sys/fs/unionfs/union_subr.c#4 integrate ... //depot/projects/interrupt/sys/fs/unionfs/union_vfsops.c#4 integrate ... //depot/projects/interrupt/sys/fs/unionfs/union_vnops.c#3 integrate ... //depot/projects/interrupt/sys/geom/geom.h#2 integrate ... //depot/projects/interrupt/sys/geom/geom_aes.c#1 branch ... //depot/projects/interrupt/sys/geom/geom_bsd.c#2 integrate ... //depot/projects/interrupt/sys/geom/geom_dev.c#2 integrate ... //depot/projects/interrupt/sys/geom/geom_disk.c#2 integrate ... //depot/projects/interrupt/sys/geom/geom_dump.c#2 integrate ... //depot/projects/interrupt/sys/geom/geom_enc.c#1 branch ... //depot/projects/interrupt/sys/geom/geom_event.c#2 integrate ... //depot/projects/interrupt/sys/geom/geom_gpt.c#1 branch ... //depot/projects/interrupt/sys/geom/geom_int.h#1 branch ... //depot/projects/interrupt/sys/geom/geom_io.c#2 integrate ... //depot/projects/interrupt/sys/geom/geom_kern.c#2 integrate ... //depot/projects/interrupt/sys/geom/geom_mbr.c#2 integrate ... //depot/projects/interrupt/sys/geom/geom_mbrext.c#2 delete ... //depot/projects/interrupt/sys/geom/geom_pc98.c#1 branch ... //depot/projects/interrupt/sys/geom/geom_slice.c#2 integrate ... //depot/projects/interrupt/sys/geom/geom_slice.h#2 integrate ... //depot/projects/interrupt/sys/geom/geom_subr.c#2 integrate ... //depot/projects/interrupt/sys/geom/geom_sunlabel.c#2 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_alloc.c#2 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_balloc.c#2 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_bmap.c#1 branch ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_extern.h#2 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_fs.h#2 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_ihash.c#1 branch ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_inode.c#2 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_inode_cnv.c#2 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_linux_balloc.c#2 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_linux_ialloc.c#2 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_lookup.c#2 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_mount.h#1 branch ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_readwrite.c#2 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_subr.c#3 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_vfsops.c#4 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/ext2_vnops.c#2 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/fs.h#2 integrate ... //depot/projects/interrupt/sys/gnu/ext2fs/inode.h#1 branch ... //depot/projects/interrupt/sys/gnu/i386/fpemul/polynomial.s#2 integrate ... //depot/projects/interrupt/sys/gnu/i386/fpemul/reg_div.s#2 integrate ... //depot/projects/interrupt/sys/gnu/i386/fpemul/reg_round.s#2 integrate ... //depot/projects/interrupt/sys/gnu/i386/fpemul/reg_u_add.s#2 integrate ... //depot/projects/interrupt/sys/gnu/i386/fpemul/reg_u_div.s#2 integrate ... //depot/projects/interrupt/sys/gnu/i386/fpemul/reg_u_mul.s#2 integrate ... //depot/projects/interrupt/sys/gnu/i386/fpemul/reg_u_sub.s#2 integrate ... //depot/projects/interrupt/sys/gnu/i386/fpemul/wm_sqrt.s#2 integrate ... //depot/projects/interrupt/sys/i386/acpica/Makefile#2 edit ... //depot/projects/interrupt/sys/i386/acpica/acpi_wakeup.c#2 edit ... //depot/projects/interrupt/sys/i386/acpica/genwakecode.pl#2 delete ... //depot/projects/interrupt/sys/i386/acpica/genwakecode.sh#1 add ... //depot/projects/interrupt/sys/i386/apm/apm.c#3 edit ... //depot/projects/interrupt/sys/i386/conf/GENERIC#3 edit ... //depot/projects/interrupt/sys/i386/conf/Makefile#2 edit ... //depot/projects/interrupt/sys/i386/conf/NEWCARD#4 edit ... //depot/projects/interrupt/sys/i386/conf/NOTES#5 edit ... //depot/projects/interrupt/sys/i386/conf/makeLINT.pl#2 delete ... //depot/projects/interrupt/sys/i386/conf/makeLINT.sed#1 add ... //depot/projects/interrupt/sys/i386/conf/makeLINT.sh#1 add ... //depot/projects/interrupt/sys/i386/i386/autoconf.c#4 edit ... //depot/projects/interrupt/sys/i386/i386/bios.c#4 edit ... //depot/projects/interrupt/sys/i386/i386/busdma_machdep.c#2 edit ... //depot/projects/interrupt/sys/i386/i386/critical.c#1 add ... //depot/projects/interrupt/sys/i386/i386/db_disasm.c#2 edit ... //depot/projects/interrupt/sys/i386/i386/db_interface.c#3 edit ... //depot/projects/interrupt/sys/i386/i386/db_trace.c#3 edit ... //depot/projects/interrupt/sys/i386/i386/dump_machdep.c#1 add ... //depot/projects/interrupt/sys/i386/i386/elf_machdep.c#2 edit ... //depot/projects/interrupt/sys/i386/i386/exception.s#7 edit ... //depot/projects/interrupt/sys/i386/i386/genassym.c#5 edit ... //depot/projects/interrupt/sys/i386/i386/i686_mem.c#2 edit ... //depot/projects/interrupt/sys/i386/i386/identcpu.c#4 edit ... //depot/projects/interrupt/sys/i386/i386/initcpu.c#3 edit ... //depot/projects/interrupt/sys/i386/i386/machdep.c#6 edit ... //depot/projects/interrupt/sys/i386/i386/mem.c#3 edit ... //depot/projects/interrupt/sys/i386/i386/mp_clock.c#2 edit ... //depot/projects/interrupt/sys/i386/i386/mp_machdep.c#5 edit ... //depot/projects/interrupt/sys/i386/i386/mpapic.c#4 edit ... //depot/projects/interrupt/sys/i386/i386/perfmon.c#2 edit ... //depot/projects/interrupt/sys/i386/i386/pmap.c#4 edit ... //depot/projects/interrupt/sys/i386/i386/support.s#4 edit ... //depot/projects/interrupt/sys/i386/i386/swtch.s#4 edit ... //depot/projects/interrupt/sys/i386/i386/sys_machdep.c#3 edit ... //depot/projects/interrupt/sys/i386/i386/trap.c#6 edit ... //depot/projects/interrupt/sys/i386/i386/vm86.c#2 edit ... //depot/projects/interrupt/sys/i386/i386/vm_machdep.c#3 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_fcntl.c#3 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_ioctl.c#4 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_ipc.c#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_isc.c#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_misc.c#3 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_proto.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_signal.c#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_signal.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_socksys.c#3 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_socksys.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_stat.c#4 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_sysi86.c#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_sysvec.c#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_util.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_xenix.c#3 edit ... //depot/projects/interrupt/sys/i386/ibcs2/ibcs2_xenix.h#2 edit ... //depot/projects/interrupt/sys/i386/ibcs2/imgact_coff.c#4 edit >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 17:17:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD72637B442; Fri, 14 Jun 2002 17:16:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6032237B48D for ; Fri, 14 Jun 2002 17:16:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5F0FS795389 for perforce@freebsd.org; Fri, 14 Jun 2002 17:15:28 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 14 Jun 2002 17:15:28 -0700 (PDT) Message-Id: <200206150015.g5F0FS795389@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12950 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12950 Change 12950 by julian@julian_jules1 on 2002/06/14 17:15:07 The upcall needs an argument now. Affected files ... ... //depot/projects/kse/sys/i386/i386/pmap.c#36 edit ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#51 edit ... //depot/projects/kse/sys/kern/subr_trap.c#64 edit ... //depot/projects/kse/sys/sys/kse.h#12 edit ... //depot/projects/kse/sys/sys/proc.h#110 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/pmap.c#36 (text+ko) ==== @@ -1130,16 +1130,6 @@ #else kmem_free(kernel_map, ks, KSTACK_PAGES * PAGE_SIZE); #endif - - /* - * If the thread got swapped out some of its KSTACK might have gotten - * swapped. Just get rid of the object to clean up the swap use - * proactively. NOTE! might block waiting for paging I/O to complete. - */ - if (ksobj->type == OBJT_SWAP) { - td->td_kstack_obj = NULL; - vm_object_deallocate(ksobj); - } vm_object_deallocate(ksobj); td->td_kstack_obj = NULL; /* play it safe */ } ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#51 (text+ko) ==== @@ -391,11 +391,13 @@ pcb2->pcb_ext = NULL; } +#if 0 /* * Set the return value for returning upcalls. * We should be able to do this ahead of time in cpu_save_upcall(). * doing it once there instead of N times in the upcall path */ + void cpu_set_retval(struct thread *td, int retval, int aux, int success) { @@ -409,6 +411,15 @@ else frame->tf_eflags |= PSL_C; /* error */ } +#endif + +void +cpu_set_args(struct thread *td, struct *kse) +{ + char * sp = ke->ke_frame->tf_esp; + + suword(ke->ke_frame->tf_esp - sizeof(void *), ke->ke_mailbox); +} void cpu_free_kse_mdstorage(struct kse *kse) ==== //depot/projects/kse/sys/kern/subr_trap.c#64 (text+ko) ==== @@ -213,10 +213,10 @@ bcopy(ke->ke_frame, frame, sizeof(struct trapframe)); /* - * Decide what we are returning to the user - * upcall returns 0, no error, (no aux?). + * Decide what we are sending to the user + * upcall sets one argument. The address of the mbox. */ - cpu_set_retval(td, 0, 1, 1); + cpu_set_args(td, ke); /* * There is no more work to do and we are going to ride ==== //depot/projects/kse/sys/sys/kse.h#12 (text+ko) ==== @@ -60,9 +60,7 @@ */ struct kse_mailbox { - /*void (*kmbx_upcall)(struct kse_mailbox *mbx); */ kse_fn_t *kmbx_upcall; -int x; char *kmbx_stackbase; unsigned long int kmbx_stacksize; struct thread_mailbox *kmbx_current_thread; ==== //depot/projects/kse/sys/sys/proc.h#110 (text+ko) ==== @@ -813,7 +813,7 @@ int cpu_export_context(struct thread *td); void cpu_free_kse_mdstorage(struct kse *kse); void cpu_save_upcall(struct thread *td, struct kse *newkse); -void cpu_set_retval(struct thread *, int, int, int); +void cpu_set_args(struct thread *, struct kse *); void cpu_set_upcall(struct thread *td, void *pcb); void cpu_thread_exit(struct thread *); void cpu_thread_setup(struct thread *td); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 17:38: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F059F37B410; Fri, 14 Jun 2002 17:37:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0BF0337B40F for ; Fri, 14 Jun 2002 17:37:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5F0bt398096 for perforce@freebsd.org; Fri, 14 Jun 2002 17:37:55 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 14 Jun 2002 17:37:55 -0700 (PDT) Message-Id: <200206150037.g5F0bt398096@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12951 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12951 Change 12951 by julian@julian_jules1 on 2002/06/14 17:37:39 hey, stacks grow down on i386! Affected files ... ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#52 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#52 (text+ko) ==== @@ -414,11 +414,9 @@ #endif void -cpu_set_args(struct thread *td, struct *kse) +cpu_set_args(struct thread *td, struct kse *ke) { - char * sp = ke->ke_frame->tf_esp; - - suword(ke->ke_frame->tf_esp - sizeof(void *), ke->ke_mailbox); + suword(ke->ke_frame->tf_esp + sizeof(void *), ke->ke_mailbox); } void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 17:41: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAD4A37B40F; Fri, 14 Jun 2002 17:41:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 269D837B40C for ; Fri, 14 Jun 2002 17:41:00 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5F0exx98544 for perforce@freebsd.org; Fri, 14 Jun 2002 17:40:59 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 14 Jun 2002 17:40:59 -0700 (PDT) Message-Id: <200206150040.g5F0exx98544@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12952 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12952 Change 12952 by julian@julian_jules1 on 2002/06/14 17:40:37 sigh Affected files ... ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#53 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#53 (text+ko) ==== @@ -416,7 +416,8 @@ void cpu_set_args(struct thread *td, struct kse *ke) { - suword(ke->ke_frame->tf_esp + sizeof(void *), ke->ke_mailbox); + suword((uint)ke->ke_frame->tf_esp + sizeof(void *), + (uint)ke->ke_mailbox); } void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 17:43:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F45D37B412; Fri, 14 Jun 2002 17:43:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0D1D237B40F for ; Fri, 14 Jun 2002 17:43:03 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5F0h2t98915 for perforce@freebsd.org; Fri, 14 Jun 2002 17:43:02 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 14 Jun 2002 17:43:02 -0700 (PDT) Message-Id: <200206150043.g5F0h2t98915@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12953 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12953 Change 12953 by julian@julian_jules1 on 2002/06/14 17:42:34 sigh sigh Affected files ... ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#54 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#54 (text+ko) ==== @@ -416,8 +416,8 @@ void cpu_set_args(struct thread *td, struct kse *ke) { - suword((uint)ke->ke_frame->tf_esp + sizeof(void *), - (uint)ke->ke_mailbox); + suword((void *)(ke->ke_frame->tf_esp + sizeof(void *)), + (int)ke->ke_mailbox); } void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 18:34:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A026237B405; Fri, 14 Jun 2002 18:34:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 91EAA37B422 for ; Fri, 14 Jun 2002 18:34:04 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5F1Y4R07781 for perforce@freebsd.org; Fri, 14 Jun 2002 18:34:04 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Date: Fri, 14 Jun 2002 18:34:04 -0700 (PDT) Message-Id: <200206150134.g5F1Y4R07781@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 12955 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12955 Change 12955 by amigus@amigus_euromede on 2002/06/14 18:33:16 Biba now (again) labels network interfaces at low integrity by default. You can either set security.mac.biba.trust_all_interfaces=1 or list the interfaces you want to trust in security.mac.biba.trusted_interfaces as a comma separated list in /boot/loader.conf to set them to high. This code silently ignores mistakes. If you don't like this, let me know. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#49 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#49 (text+ko) ==== @@ -84,6 +84,17 @@ SYSCTL_INT(_security_mac_biba, OID_AUTO, destroyed_not_inited, CTLFLAG_RD, &destroyed_not_inited, 0, "Count of labels destroyed but not inited"); +static int trust_all_interfaces = 0; +SYSCTL_INT(_security_mac_biba, OID_AUTO, trust_all_interfaces, CTLFLAG_RD, + &trust_all_interfaces, 0, "Consider all interfaces 'trusted' by MAC/Biba"); +TUNABLE_INT("security.mac.biba.trust_all_interfaces", &trust_all_interfaces); + +static char trusted_interfaces[128]; +SYSCTL_STRING(_security_mac_biba, OID_AUTO, trusted_interfaces, CTLFLAG_RD, + trusted_interfaces, 0, "Interfaces considered 'trusted' by MAC/Biba"); +TUNABLE_STR("security.mac.biba.trusted_interfaces", trusted_interfaces, + sizeof(trusted_interfaces)); + static int slot; #define SLOT(l) ((struct mac_biba *)LABEL_TO_SLOT((l), slot).l_ptr) @@ -816,12 +827,54 @@ static void mac_biba_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel) { + char tifname[IFNAMSIZ], ifname[IFNAMSIZ], *p, *q; + char tiflist[sizeof(trusted_interfaces)]; struct mac_biba *dest; + int len, grade; dest = SLOT(ifnetlabel); - mac_biba_set_single(dest, MAC_BIBA_TYPE_HIGH, 0); - mac_biba_set_range(dest, MAC_BIBA_TYPE_LOW, 0, MAC_BIBA_TYPE_HIGH, 0); + if (ifnet->if_type == IFT_LOOP) { + grade = MAC_BIBA_TYPE_EQUAL; + goto set; + } + + if (trust_all_interfaces) { + grade = MAC_BIBA_TYPE_HIGH; + goto set; + } + + grade = MAC_BIBA_TYPE_LOW; + + if (trusted_interfaces[0] == '\0' || + !strvalid(trusted_interfaces, sizeof(trusted_interfaces))) + goto set; + + for (p = trusted_interfaces, q = tiflist; *p != '\0'; p++, q++) + if(*p != ' ' && *p != '\t') + *q = *p; + + snprintf(ifname, IFNAMSIZ, "%s%d", ifnet->if_name, ifnet->if_unit); + + for (p = q = tiflist;; p++) { + if (*p == ',' || *p == '\0') { + len = p - q; + if (len < IFNAMSIZ) { + bzero(tifname, sizeof(tifname)); + bcopy(q, tifname, len); + if (strcmp(tifname, ifname) == 0) { + grade = MAC_BIBA_TYPE_HIGH; + break; + } + } + if (*p == '\0') + break; + q = p + 1; + } + } +set: + mac_biba_set_single(dest, grade, 0); + mac_biba_set_range(dest, grade, 0, grade, 0); } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 18:43:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BEDB37B416; Fri, 14 Jun 2002 18:43:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 86CDC37B410 for ; Fri, 14 Jun 2002 18:43:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5F1hGq08806 for perforce@freebsd.org; Fri, 14 Jun 2002 18:43:16 -0700 (PDT) (envelope-from jake@freebsd.org) Date: Fri, 14 Jun 2002 18:43:16 -0700 (PDT) Message-Id: <200206150143.g5F1hGq08806@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 12957 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12957 Change 12957 by jake@jake_k7 on 2002/06/14 18:42:17 Compile on sparc64. Affected files ... ... //depot/projects/kse/sys/sparc64/include/kse.h#1 add ... //depot/projects/kse/sys/sparc64/sparc64/genassym.c#26 edit ... //depot/projects/kse/sys/sparc64/sparc64/swtch.s#17 edit ... //depot/projects/kse/sys/sparc64/sparc64/trap.c#29 edit ... //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#24 edit Differences ... ==== //depot/projects/kse/sys/sparc64/sparc64/genassym.c#26 (text+ko) ==== @@ -232,6 +232,8 @@ ASSYM(TD_KSTACK, offsetof(struct thread, td_kstack)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); +ASSYM(TD_STATE, offsetof(struct thread, td_state)); +ASSYM(TDS_RUNNING, TDS_RUNNING); ASSYM(PCB_SIZEOF, sizeof(struct pcb)); ASSYM(PCB_FPSTATE, offsetof(struct pcb, pcb_fpstate)); ==== //depot/projects/kse/sys/sparc64/sparc64/swtch.s#17 (text+ko) ==== @@ -109,6 +109,9 @@ stx %o0, [PCPU(CURTHREAD)] stx %o1, [PCPU(CURPCB)] + mov TDS_RUNNING, %o2 + stw %o2, [%o0 + TD_STATE] + SET(sched_lock, %o3, %o2) stx %o0, [%o2 + MTX_LOCK] ==== //depot/projects/kse/sys/sparc64/sparc64/trap.c#29 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -190,6 +191,10 @@ td->td_frame = tf; if (td->td_ucred != p->p_ucred) cred_update_thread(td); + if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + thread_exit(); + /* NOTREACHED */ + } } else { sticks = 0; if ((type & ~T_KERNEL) != T_BREAKPOINT) @@ -528,6 +533,23 @@ td->td_frame = tf; if (td->td_ucred != p->p_ucred) cred_update_thread(td); + if (p->p_flag & P_KSES) { + /* + * If we are doing a syscall in a KSE environment, + * note where our mailbox is. There is always the + * possibility that we could do this lazily (in sleep()), + * but for now do it every time. + */ + td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox + + offsetof(struct kse_mailbox, kmbx_current_thread)); + if ((td->td_mailbox == NULL) || + (td->td_mailbox == (void *)-1)) { + td->td_mailbox = NULL; /* single thread it.. */ + td->td_flags &= ~TDF_UNBOUND; + } else { + td->td_flags |= TDF_UNBOUND; + } + } code = tf->tf_global[1]; /* ==== //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#24 (text+ko) ==== @@ -86,6 +86,42 @@ } } +void +cpu_thread_exit(struct thread *td) +{ +} + +void +cpu_thread_setup(struct thread *td) +{ +} + +void +cpu_save_upcall(struct thread *td, struct kse *newkse) +{ +} + +void +cpu_set_upcall(struct thread *td, void *pcb) +{ +} + +void +cpu_set_args(struct thread *td, struct kse *ke) +{ +} + +void +cpu_free_kse_mdstorage(struct kse *ke) +{ +} + +int +cpu_export_context(struct thread *td) +{ + return (0); +} + /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 19: 3:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1F5A37B41F; Fri, 14 Jun 2002 19:03:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 75CB937B411 for ; Fri, 14 Jun 2002 19:03:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5F23fE10726 for perforce@freebsd.org; Fri, 14 Jun 2002 19:03:41 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 14 Jun 2002 19:03:41 -0700 (PDT) Message-Id: <200206150203.g5F23fE10726@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12958 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12958 Change 12958 by julian@julian_jules1 on 2002/06/14 19:02:43 debugging Affected files ... ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#55 edit ... //depot/projects/kse/sys/kern/kern_proc.c#68 edit ... //depot/projects/kse/sys/kern/subr_trap.c#65 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#55 (text+ko) ==== @@ -379,6 +379,7 @@ pcb2->pcb_esp = (int)td->td_frame - sizeof(void *); /* trampoline arg */ pcb2->pcb_ebx = (int)td; /* trampoline arg */ pcb2->pcb_eip = (int)fork_trampoline; + pcb2->pcb_psl &= ~(PSL_I); /* interrupts must be disabled */ /* * If we didn't copy the pcb, we'd need to do the following registers: * pcb2->pcb_dr*: cloned above. ==== //depot/projects/kse/sys/kern/kern_proc.c#68 (text+ko) ==== @@ -201,7 +201,6 @@ return(ENOSYS); } - /* * No new KSEG: first call: use current KSE, don't schedule an upcall * All other situations, do alloate a new KSE and schedule an upcall on it. ==== //depot/projects/kse/sys/kern/subr_trap.c#65 (text+ko) ==== @@ -202,6 +202,7 @@ if (td->td_flags & TDF_UPCALLING) { CTR3(KTR_PROC, "userret: upcall thread %p (pid %d, %s)", td, p->p_pid, p->p_comm); +printf("Upcalling!\n"); /* * Make sure that it has the correct frame loaded. * While we know that we are on the same KSEGRP @@ -229,6 +230,8 @@ error = suword((caddr_t)td->td_kse->ke_mailbox + offsetof(struct kse_mailbox, kmbx_current_thread), 0); +printf("suword mailbox to 0 error: %d, frame= %p, eip=%p, esp=%p\n", error, +frame, frame->tf_eip, frame->tf_esp); } /* * Stop any chance that we may be separated from To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 19: 5:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82DBA37B42C; Fri, 14 Jun 2002 19:05:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 958AE37B43C for ; Fri, 14 Jun 2002 19:05:44 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5F25iO14831 for perforce@freebsd.org; Fri, 14 Jun 2002 19:05:44 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Fri, 14 Jun 2002 19:05:44 -0700 (PDT) Message-Id: <200206150205.g5F25iO14831@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 12959 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12959 Change 12959 by julian@julian_jules1 on 2002/06/14 19:05:06 add debug stuff Affected files ... ... //depot/projects/kse/sys/i386/i386/trap.c#50 edit ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#56 edit ... //depot/projects/kse/sys/kern/kern_proc.c#69 edit ... //depot/projects/kse/sys/kern/kern_thread.c#69 edit ... //depot/projects/kse/sys/kern/subr_trap.c#66 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#50 (text+ko) ==== @@ -964,6 +964,7 @@ */ td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox + offsetof(struct kse_mailbox, kmbx_current_thread)); +printf("is KSE mode in syscall(): %p\n", td->td_mailbox); if ((td->td_mailbox == NULL) || (td->td_mailbox == (void *)-1)) { td->td_mailbox = NULL; /* single thread it.. */ ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#56 (text+ko) ==== ==== //depot/projects/kse/sys/kern/kern_proc.c#69 (text+ko) ==== ==== //depot/projects/kse/sys/kern/kern_thread.c#69 (text+ko) ==== @@ -405,6 +405,7 @@ td, td->td_proc->p_pid, td->td_proc->p_comm); thread_link(td2, ke->ke_ksegrp); cpu_set_upcall(td2, ke->ke_pcb); +printf("thread_schedule_upcall: Scheduled td %p kse %p\n", td2, ke); td2->td_ucred = crhold(td->td_ucred); td2->td_kse = NULL; /* Back as it was. */ td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; ==== //depot/projects/kse/sys/kern/subr_trap.c#66 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 14 22:26: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F38037B401; Fri, 14 Jun 2002 22:24:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7087337B40E for ; Fri, 14 Jun 2002 22:24:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5F5Mmc46247 for perforce@freebsd.org; Fri, 14 Jun 2002 22:22:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 14 Jun 2002 22:22:48 -0700 (PDT) Message-Id: <200206150522.g5F5Mmc46247@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 12965 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12965 Change 12965 by rwatson@rwatson_paprika on 2002/06/14 22:21:29 Integ of trustedbsd_base. Scary. Affected files ... ... //depot/projects/trustedbsd/base/MAINTAINERS#4 integrate ... //depot/projects/trustedbsd/base/Makefile#8 integrate ... //depot/projects/trustedbsd/base/Makefile.inc1#16 integrate ... //depot/projects/trustedbsd/base/UPDATING#14 integrate ... //depot/projects/trustedbsd/base/bin/Makefile.inc#5 integrate ... //depot/projects/trustedbsd/base/bin/cat/cat.c#4 integrate ... //depot/projects/trustedbsd/base/bin/cp/cp.c#7 integrate ... //depot/projects/trustedbsd/base/bin/date/netdate.c#4 integrate ... //depot/projects/trustedbsd/base/bin/dd/args.c#6 integrate ... //depot/projects/trustedbsd/base/bin/dd/dd.1#3 integrate ... //depot/projects/trustedbsd/base/bin/dd/misc.c#3 integrate ... //depot/projects/trustedbsd/base/bin/df/Makefile#3 integrate ... //depot/projects/trustedbsd/base/bin/df/df.c#7 integrate ... //depot/projects/trustedbsd/base/bin/expr/expr.1#4 integrate ... //depot/projects/trustedbsd/base/bin/expr/expr.y#5 integrate ... //depot/projects/trustedbsd/base/bin/kill/kill.1#2 integrate ... //depot/projects/trustedbsd/base/bin/kill/kill.c#3 integrate ... //depot/projects/trustedbsd/base/bin/ln/ln.1#2 integrate ... //depot/projects/trustedbsd/base/bin/ln/ln.c#4 integrate ... //depot/projects/trustedbsd/base/bin/ln/symlink.7#2 integrate ... //depot/projects/trustedbsd/base/bin/ls/extern.h#4 integrate ... //depot/projects/trustedbsd/base/bin/ls/ls.1#9 integrate ... //depot/projects/trustedbsd/base/bin/ls/ls.c#6 integrate ... //depot/projects/trustedbsd/base/bin/ls/ls.h#5 integrate ... //depot/projects/trustedbsd/base/bin/ls/print.c#6 integrate ... //depot/projects/trustedbsd/base/bin/mv/mv.1#3 integrate ... //depot/projects/trustedbsd/base/bin/mv/mv.c#5 integrate ... //depot/projects/trustedbsd/base/bin/mv/pathnames.h#2 integrate ... //depot/projects/trustedbsd/base/bin/pax/ar_subs.c#3 integrate ... //depot/projects/trustedbsd/base/bin/pax/buf_subs.c#3 integrate ... //depot/projects/trustedbsd/base/bin/pax/cache.h#2 integrate ... //depot/projects/trustedbsd/base/bin/pax/file_subs.c#3 integrate ... //depot/projects/trustedbsd/base/bin/pax/ftree.c#3 integrate ... //depot/projects/trustedbsd/base/bin/pax/options.c#4 integrate ... //depot/projects/trustedbsd/base/bin/pax/pat_rep.c#3 integrate ... //depot/projects/trustedbsd/base/bin/pax/pax.1#3 integrate ... //depot/projects/trustedbsd/base/bin/pax/pax.c#3 integrate ... //depot/projects/trustedbsd/base/bin/pax/pax.h#2 integrate ... //depot/projects/trustedbsd/base/bin/pax/tables.h#2 integrate ... //depot/projects/trustedbsd/base/bin/pax/tar.1#3 integrate ... //depot/projects/trustedbsd/base/bin/pax/tar.c#3 integrate ... //depot/projects/trustedbsd/base/bin/ps/Makefile#5 integrate ... //depot/projects/trustedbsd/base/bin/ps/extern.h#5 integrate ... //depot/projects/trustedbsd/base/bin/ps/fmt.c#5 integrate ... //depot/projects/trustedbsd/base/bin/ps/keyword.c#6 integrate ... //depot/projects/trustedbsd/base/bin/ps/nlist.c#3 integrate ... //depot/projects/trustedbsd/base/bin/ps/print.c#6 integrate ... //depot/projects/trustedbsd/base/bin/ps/ps.1#7 integrate ... //depot/projects/trustedbsd/base/bin/ps/ps.c#8 integrate ... //depot/projects/trustedbsd/base/bin/pwd/pwd.1#5 integrate ... //depot/projects/trustedbsd/base/bin/pwd/pwd.c#5 integrate ... //depot/projects/trustedbsd/base/bin/rcp/pathnames.h#2 delete ... //depot/projects/trustedbsd/base/bin/rcp/rcp.c#3 integrate ... //depot/projects/trustedbsd/base/bin/realpath/realpath.c#2 integrate ... //depot/projects/trustedbsd/base/bin/rm/rm.1#3 integrate ... //depot/projects/trustedbsd/base/bin/rm/rm.c#5 integrate ... //depot/projects/trustedbsd/base/bin/sh/alias.c#3 integrate ... //depot/projects/trustedbsd/base/bin/sh/cd.c#4 integrate ... //depot/projects/trustedbsd/base/bin/sh/error.c#3 integrate ... //depot/projects/trustedbsd/base/bin/sh/eval.c#3 integrate ... //depot/projects/trustedbsd/base/bin/sh/exec.c#4 integrate ... //depot/projects/trustedbsd/base/bin/sh/expand.c#3 integrate ... //depot/projects/trustedbsd/base/bin/sh/histedit.c#3 integrate ... //depot/projects/trustedbsd/base/bin/sh/jobs.c#3 integrate ... //depot/projects/trustedbsd/base/bin/sh/jobs.h#3 integrate ... //depot/projects/trustedbsd/base/bin/sh/main.c#3 integrate ... //depot/projects/trustedbsd/base/bin/sh/nodetypes#2 integrate ... //depot/projects/trustedbsd/base/bin/sh/options.c#4 integrate ... //depot/projects/trustedbsd/base/bin/sh/output.c#3 integrate ... //depot/projects/trustedbsd/base/bin/sh/output.h#4 integrate ... //depot/projects/trustedbsd/base/bin/sh/parser.c#3 integrate ... //depot/projects/trustedbsd/base/bin/sh/redir.c#5 integrate ... //depot/projects/trustedbsd/base/bin/sh/sh.1#3 integrate ... //depot/projects/trustedbsd/base/bin/sh/show.c#3 integrate ... //depot/projects/trustedbsd/base/bin/sh/var.c#3 integrate ... //depot/projects/trustedbsd/base/bin/sh/var.h#3 integrate ... //depot/projects/trustedbsd/base/bin/sleep/sleep.1#2 integrate ... //depot/projects/trustedbsd/base/bin/sync/sync.8#2 integrate ... //depot/projects/trustedbsd/base/bin/test/test.c#8 integrate ... //depot/projects/trustedbsd/base/contrib/amd/amq/amq.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/amd/hlfsd/hlfsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/CHANGES#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/README#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/Version#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/dig/dig.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/dnsquery/dnsquery.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/host/host.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/named.conf#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/named.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_config.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_defs.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_forw.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_func.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_lexer.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_main.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_maint.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_notify.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_parser.y#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_req.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_resp.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_xfr.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/commands.l#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/getinfo.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/list.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/main.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/res.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/send.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/subr.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/html/docdef.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/html/logging.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/html/options.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/html/server.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/html/zone.html#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/dig.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/dnskeygen.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/dnsquery.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/getaddrinfo.3#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/gethostbyname.3#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/getipnodebyname.3#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/getnameinfo.3#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/getnetent.3#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/host.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/hostname.7#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/inet_cidr.3#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/mailaddr.7#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/mkdep.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/named-bootconf.8#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/named-xfer.8#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/named.8#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/named.conf.5#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/ndc.8#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/nslookup.8#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/nsupdate.8#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/resolver.3#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/resolver.5#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/doc/man/tsig.3#2 integrate ... //depot/projects/trustedbsd/base/contrib/bind/include/arpa/nameser.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/include/resolv.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_ho.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_nw.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getaddrinfo.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/lib/irs/getnameinfo.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_sign.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_findzonecut.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_send.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_update.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/Makefile.set#3 integrate ... //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/include/port_after.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/cvs/man/cvs.1#2 integrate ... //depot/projects/trustedbsd/base/contrib/diff/diff.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/BUGS#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog.lib#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/FREEBSD-libiberty#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/FREEBSD-upgrade#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/FSFChangeLog.10#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/FSFChangeLog.11#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/INSTALL#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/Makefile.in#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/NEWS#5 delete ... //depot/projects/trustedbsd/base/contrib/gcc/PROBLEMS#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/PROJECTS#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/README#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/README-bugs#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/README.DWARF#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/README.TRAD#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/TESTS.FLUNK#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/alias.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/ansidecl.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/assert.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/attribs.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/basic-block.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/bb-reorder.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/build-make#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/builtins.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-common.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-common.def#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-common.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-decl.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-format.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-iterate.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/c-lang.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-lex.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-objc-common.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-parse.gperf#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/c-parse.in#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-pragma.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-pragma.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-semantics.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-tree.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/c-typeck.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/calls.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cccp.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cexp.y#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cfg.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cfganal.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cfgcleanup.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cfgrtl.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/choose-temp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/collect2.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/combine.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/concat.c#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config.gcc#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config.in#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha-protos.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.md#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/elf.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/freebsd.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/linux.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/netbsd-elf.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/netbsd.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/osf.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-crtbe#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/t-vms#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms-tramp.asm#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/vms.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/x-alpha#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/x-vms#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/xm-alpha.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/xm-freebsd.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/xm-openbsd.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/xm-vms.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/arm/aof.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/arm/aout.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.md#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/arm/coff.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/arm/elf.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/arm/linux-elf.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/arm/netbsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/arm/rtems-elf.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/float-sparc.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd-spec.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/config-nt.sed#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/cygwin.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/dgux.c#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/djgpp-rtems.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#8 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/gnu.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-interix.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-protos.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.md#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/libgcc-x86_64-glibc.ver#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/linux-aout.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/linux-oldld.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/linux.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/linux64.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/netbsd-elf.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/netbsd.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/os2.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/perform.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/rtems.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/rtemself.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sco.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sco4.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sco4dbx.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sco5.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sco5gas.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/scodbx.h#5 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/sol2.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-i386bare#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-interix#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-linux64#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-rtems-i386#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-vsta#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/t-winnt#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/win-nt.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-aix#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-cygwin#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-dgux#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-djgpp#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-isc#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-isc3#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-ncr3000#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-next#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-osf1elf#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-osfrose#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-sco#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-sco4#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-sco5#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-sysv3#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x-vsta#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/x86-64.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-aix.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-bsd386.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-dgux.h#3 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-dos.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-freebsd.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-gnu.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-i386.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-isc.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-linux.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-lynx.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-next.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-openbsd.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-os2.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-osf.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-osf1elf.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-sco.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-sco5.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-sun.h#3 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-sysv3.h#3 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-sysv4.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-uwin.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/i386/xm-winnt.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/aix.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/elf.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/freebsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/hpux.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64-protos.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/ia64.md#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/linux.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/sysv4.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/unwind-ia64.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/libgcc-glibc.ver#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/netbsd.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix43.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix51.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/altivec.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/crtsavres.asm#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/darwin.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/eabi.asm#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/gnu.h#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux64.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/netbsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/ppc-asm.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.md#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rtems.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sysv4.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-aix43#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-linux64#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/t-ppccomm#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/xcoff.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/rtems.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/aout.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/crtfastmath.c#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/elf.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/freebsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/gmon-sol2.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/libgcc-sparc-glibc.ver#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/linux-aout.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/linux.h#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/linux64.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/lite.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/litecoff.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/liteelf.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/netbsd-elf.h#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/netbsd.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/pbd.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/rtems.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/rtemself.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-64.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-bi.h#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-gas-bi.h#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-gld-bi.h#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-gld.h#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-sld-64.h#5 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2-sld.h#3 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol27-sld.h#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sp64-aout.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sp64-elf.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sp86x-aout.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sp86x-elf.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc-protos.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.md#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/splet.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-crtfm#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-elf#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-linux64#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-netbsd64#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-sol2-64#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-sp64#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-sunos40#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/vxsim.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/vxsparc64.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/x-sysv4#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/xm-linux.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/xm-lynx.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/xm-openbsd.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/xm-pbd.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/xm-sol2.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/xm-sp64.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/xm-sparc.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/xm-sysv4-64.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/xm-sysv4.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-elf-ver#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-nolc-override#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/config/t-slibgcc-sld#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/config/x-linux#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/x-linux-aout#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/x-lynx#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/x-svr4#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/xm-alloca.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/xm-freebsd.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/xm-gnu.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/xm-interix.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/xm-linux.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/xm-lynx.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/xm-openbsd.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/xm-siglist.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/xm-std32.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/xm-svr3.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/config/xm-svr4.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/configure#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/configure.in#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/configure.lang#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp-demangle.c#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/Make-lang.in#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/Makefile.in#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/NEWS#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/call.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/cfns.h#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/cp/class.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-tree.def#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-tree.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/cvt.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/decl.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/decl2.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/dump.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/errfn.c#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/error.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/exception.cc#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/friend.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/g++spec.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/gxx.gperf#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/gxxint.texi#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/inc/exception#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/inc/new#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/inc/new.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/inc/typeinfo#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/init.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/input.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/lang-specs.h#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/lex.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/mangle.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/method.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/new.cc#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/new1.cc#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/new2.cc#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/parse.y#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/pt.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/search.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/semantics.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/sig.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/spew.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/tinfo.cc#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/tinfo.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/tinfo2.cc#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cp/tree.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck2.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cp/xref.c#5 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cplus-dem.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cpp.texi#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cppalloc.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cppexp.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cpphash.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cpphash.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cppinit.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cpplex.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cpplib.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cpplib.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cppmacro.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cppmain.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cppulp.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/cross-make#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/crtstuff.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cse.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/cselib.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/dbxout.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/defaults.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/demangle.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/df.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/c-tree.texi#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/contrib.texi#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/contribute.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/cpp.texi#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/cppenv.texi#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/doc/cppopts.texi#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/doc/extend.texi#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/frontends.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/gcc.texi#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/include/texinfo.tex#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/doc/install.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/invoke.texi#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/md.texi#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/passes.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/rtl.texi#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/sourcebuild.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/standards.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doc/tm.texi#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/doprint.c#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/dostage2#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/dostage3#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/dwarf2.h#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/dwarf2out.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/dwarfout.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/dyn-string.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/dyn-string.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/eh-common.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/emit-rtl.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/except.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/except.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/exgettext#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/explow.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/expmed.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/expr.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/expr.h#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/extend.texi#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/BUGS#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/ChangeLog#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/INSTALL#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/Make-lang.in#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/Makefile.in#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/NEWS#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/assert.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/bad.def#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/bugs.texi#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/com.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/config.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/convert.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/data.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/expr.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/ffe.texi#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/flags.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/g77.texi#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/g77install.texi#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/g77spec.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/glimits.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/hconfig.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/implic.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/input.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/intdoc.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/intdoc.texi#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/intrin.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/intrin.def#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/invoke.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/lex.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/news.texi#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/output.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/proj.c#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/proj.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/root.texi#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/rtl.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/stb.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/ste.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/stu.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/system.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/target.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/target.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/f/tconfig.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/tm.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/toplev.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/tree.j#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/f/version.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/fibheap.c#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/fibheap.h#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/final.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/fixcpp#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/fixinc-nt.sed#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/fixincludes#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/flags.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/flow.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/fold-const.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/frame.c#3 delete ... //depot/projects/trustedbsd/base/contrib/gcc/frame.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/function.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/function.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/gansidecl.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/gcc.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/gcc.texi#3 delete ... //depot/projects/trustedbsd/base/contrib/gcc/gccbug.in#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/gcov.texi#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/gcse.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/genattrtab.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/genemit.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/genextract.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/genflags.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/genoutput.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/genrecog.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/getopt.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/getopt.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/getopt1.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/getpwd.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/ggc-common.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/math-3300.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/math-68881.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/ppc-asm.h#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/proto.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-alpha.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-arc.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-c4x.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-clipper.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-h8300.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-i860.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-i960.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-m32r.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-m88k.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-mips.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-mn10200.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-mn10300.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-pa.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-ppc.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-pyr.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-sh.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-sparc.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-spur.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/ginclude/va-v850.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/gthr-dce.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/gthr-posix.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/gthr-rtems.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/gthr-solaris.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/gthr-win32.h#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/haifa-sched.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/hashtab.c#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/hashtab.h#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/hex.c#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/hooks.c#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/hooks.h#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/hwint.h#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/ifcvt.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/install.texi#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/integrate.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/invoke.texi#3 delete ... //depot/projects/trustedbsd/base/contrib/gcc/jump.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/just-fixinc#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/langhooks-def.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/langhooks.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/langhooks.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/lbasename.c#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/libfuncs.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/libgcc1-test.c#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/libgcc1.c#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/libiberty.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/listing#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/local-alloc.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/longlong.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/loop.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/loop.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/machmode.def#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/machmode.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/make-temp-file.c#1 branch ... //depot/projects/trustedbsd/base/contrib/gcc/makefile.vms#4 delete ... //depot/projects/trustedbsd/base/contrib/gcc/md.texi#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/md5.c#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/md5.h#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/mkconfig.sh#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/mklibgcc.in#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/mkmap-symver.awk#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/objc/Makefile.in#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/objc/lang-specs.h#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/objc/objc-act.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/objc/objc-lang.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/objc/objc.gperf#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/obstack.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/obstack.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/optabs.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/output.h#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/partition.c#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/partition.h#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/patch-apollo-includes#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/pcp.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/pexecute.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/predict.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/print-tree.c#3 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/protoize.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/pself.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/pself1.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/pself2.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/pself3.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/pself4.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/pself5.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/recog.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/reg-stack.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/regclass.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/regmove.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/regrename.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/reload.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/reload1.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/reorg.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/resource.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/rtl.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/rtl.def#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/rtl.h#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/rtl.texi#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/rtlanal.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/sched-deps.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/sched-int.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/sched-rgn.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/sched.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/sibcall.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/simplify-rtx.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/splay-tree.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/splay-tree.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/ssa-ccp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/stmt.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/stor-layout.c#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/stupid.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/symcat.h#3 branch ... //depot/projects/trustedbsd/base/contrib/gcc/system.h#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/target-def.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/target.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/tm.texi#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/toplev.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/tradcif.y#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/tradcpp.c#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/tradcpp.h#4 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/tree-dump.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/tree-inline.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/tree.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/tree.def#5 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/tree.h#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/unprotoize.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gcc/unroll.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/unwind-dw2-fde-glibc.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/varasm.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/version.c#6 integrate ... //depot/projects/trustedbsd/base/contrib/gcc/vmsdbgout.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/Makefile.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/config-ml.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/config.guess#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/config.sub#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/configure#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/configure.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/ChangeLog#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/ChangeLog-97#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/ChangeLog-98#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/ChangeLog-99#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/MAINTAINERS#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/Makefile.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/NEWS#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/README#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/TODO#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/acinclude.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/aclocal.m4#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/annotate.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/annotate.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/arc-tdep.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/arch-utils.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/arch-utils.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/arm-linux-nat.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/arm-linux-tdep.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/ax-gdb.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/ax-gdb.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/ax-general.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/ax.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/bcache.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/bcache.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/blockframe.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/breakpoint.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/breakpoint.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/buildsym.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/buildsym.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/c-lang.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/c-lang.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/c-typeprint.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/c-valprint.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/call-cmds.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/ch-exp.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/ch-lang.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/ch-lang.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/ch-typeprint.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/ch-valprint.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/cli-out.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/cli-out.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/command.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/command.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/complaints.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/complaints.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/alpha/alpha-linux.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/alpha/alpha-osf2.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/alpha/alpha-osf3.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/alpha/nm-linux.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/alpha/nm-osf.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/alpha/nm-osf2.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/alpha/nm-osf3.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/alpha/tm-alphalinux.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/alpha/xm-alphalinux.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/alpha/xm-alphaosf.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/arm.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/arm.mt#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/embed.mt#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/linux.mh#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/linux.mt#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/nm-arm.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/nm-linux.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/tm-arm.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/tm-embed.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/tm-linux.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/tm-wince.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/wince.mt#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/xm-arm.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/xm-linux.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/embed.mt#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/go32.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/go32.mt#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/i386dgux.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/i386gnu.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/i386sol2.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/i386v4.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/i386v42mp.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/linux.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/linux.mt#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nbsd.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nbsd.mt#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/ncr3000.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-fbsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-gnu.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-go32.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-i386aix.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-i386bsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-i386lynx.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-i386mach.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-i386sco.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-i386sco4.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-i386sco5.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-i386sol2.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-i386v.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-i386v4.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-i386v42mp.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-linux.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-m3.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-nbsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-ptx4.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-sun386.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/nm-symmetry.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-cygwin.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-fbsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-go32.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386aix.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386bsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386gnu.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386lynx.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386m3.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386mk.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386nw.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386os9k.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386sco5.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386sol2.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386v.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386v4.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-i386v42mp.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-linux.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-nbsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-ptx.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-ptx4.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-sun386.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-symmetry.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-vxworks.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/vxworks.mt#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-cygwin.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-go32.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-i386aix.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-i386bsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-i386gnu.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-i386lynx.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-i386m3.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-i386mach.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-i386mk.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-i386sco.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-i386v.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-i386v32.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-i386v4.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-linux.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-nbsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-ptx.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-ptx4.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-sun386.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-symmetry.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/xm-windows.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/ia64/linux.mh#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/ia64/linux.mt#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/ia64/nm-linux.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/ia64/tm-ia64.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/ia64/tm-linux.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/ia64/xm-linux.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/mips/tm-tx39.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/mips/tm-tx39l.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/mips/tm-vr4100.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/mips/tm-vr4xxx.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/mips/tm-vr4xxxel.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/mips/tm-vr5000.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/mips/tm-vr5000el.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/mips/tm-wince.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/mips/vr4xxx.mt#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/mips/vr4xxxel.mt#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/mips/wince.mt#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/linux.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/linux.mt#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/macos.mh#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/macos.mt#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/nm-aix.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/nm-linux.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/nm-macos.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/nm-solaris.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/solaris.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-cygwin.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-linux.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-macos.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-ppc-aix.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-ppc-nw.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-ppc-sim.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-solaris.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-vxworks.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/vxworks.mt#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/xm-aix.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/xm-cygwin.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/xm-linux.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/xm-mpw.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/xm-solaris.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/linux.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nbsd.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nbsd.mt#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nbsdelf.mh#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nm-linux.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nm-nbsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nm-nbsdelf.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nm-sparclynx.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nm-sun4os4.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nm-sun4sol2.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/sun4sol2.mh#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-linux.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-nbsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sp64.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sp64sim.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sparc.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sparclet.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sparclite.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sparclynx.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-spc-em.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sun4os4.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sun4sol2.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-vxsparc.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/xm-linux.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/xm-nbsd.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/xm-sparc.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/xm-sparclynx.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/xm-sun4os4.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/xm-sun4sol2.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/configure#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/configure.host#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/configure.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/configure.tgt#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/core-aout.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/corefile.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/corelow.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/cp-valprint.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/dcache.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/dcache.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/dink32-rom.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/doc/ChangeLog#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/doc/GDBvn.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/doc/Makefile.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/doc/agentexpr.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/doc/all-cfg.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/doc/annotate.texi#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/doc/configure#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/doc/configure.in#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/doc/gdb.texinfo#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/doc/gdbgui.texinfo#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/doc/gdbint.texinfo#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/doc/stabs.texinfo#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/dwarf2read.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/dwarfread.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/elfread.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/environ.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/environ.h#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/eval.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/event-loop.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/event-loop.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/event-top.c#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/event-top.h#2 delete ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/exec.c#2 integrate ... //depot/projects/trustedbsd/base/contrib/gdb/gdb/expprint.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 15 4:43:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D9BD37B40B; Sat, 15 Jun 2002 04:43:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8381637B409 for ; Sat, 15 Jun 2002 04:43:04 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5FBh4A56645 for perforce@freebsd.org; Sat, 15 Jun 2002 04:43:04 -0700 (PDT) (envelope-from ticso@freebsd.org) Date: Sat, 15 Jun 2002 04:43:04 -0700 (PDT) Message-Id: <200206151143.g5FBh4A56645@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter Subject: PERFORCE change 12976 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12976 Change 12976 by ticso@ticso-cicely5 on 2002/06/15 04:42:16 partly catchup alpha MI part with i386 Affected files ... ... //depot/projects/kse/sys/alpha/alpha/pmap.c#28 edit ... //depot/projects/kse/sys/alpha/alpha/trap.c#25 edit ... //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#24 edit ... //depot/projects/kse/sys/kern/subr_trap.c#67 edit Differences ... ==== //depot/projects/kse/sys/alpha/alpha/pmap.c#28 (text+ko) ==== @@ -1151,7 +1151,12 @@ ksobj = td->td_kstack_obj; ks = td->td_kstack; ptek = vtopte(ks); +#ifdef KSTACK_GUARD + ks -= PAGE_SIZE; + for (i = 1; i < (KSTACK_PAGES + 1); i++) { +#else for (i = 0; i < KSTACK_PAGES; i++) { +#endif m = vm_page_lookup(ksobj, i); if (m == NULL) panic("pmap_dispose_thread: kstack already missing?"); @@ -1164,14 +1169,16 @@ } /* - * If the thread got swapped out some of its KSTACK might have gotten - * swapped. Just get rid of the object to clean up the swap use - * proactively. NOTE! might block waiting for paging I/O to complete. + * Free the space that this stack was mapped to in the kernel + * address map. */ - if (ksobj->type == OBJT_SWAP) { - td->td_kstack_obj = NULL; - vm_object_deallocate(ksobj); - } +#ifdef KSTACK_GUARD + kmem_free(kernel_map, ks, (KSTACK_PAGES + 1) * PAGE_SIZE); +#else + kmem_free(kernel_map, ks, KSTACK_PAGES * PAGE_SIZE); +#endif + td->td_kstack_obj = NULL; + vm_object_deallocate(ksobj); } /* ==== //depot/projects/kse/sys/alpha/alpha/trap.c#25 (text+ko) ==== @@ -301,6 +301,7 @@ if (td->td_ucred != p->p_ucred) cred_update_thread(td); if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + PROC_LOCK(p); thread_exit(); /* NOTREACHED */ } @@ -672,7 +673,7 @@ * but for now do it every time. */ td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox - + offsetof(struct kse_mailbox, current_thread)); + + offsetof(struct kse_mailbox, kmbx_current_thread)); if ((td->td_mailbox == NULL) || (td->td_mailbox == (void *)-1)) { td->td_mailbox = NULL; /* single thread it.. */ ==== //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#24 (text+ko) ==== @@ -338,11 +338,13 @@ #endif } +#if 0 /* * Set the return value for returning upcalls. * We should be able to do this ahead of time in cpu_save_upcall(). * doing it once there instead of N times in the upcall path */ + void cpu_set_retval(struct thread *td, int retval, int aux, int success) { @@ -353,6 +355,16 @@ frame->tf_regs[FRAME_A3] = (success) ? 0 : ~0; frame->tf_regs[FRAME_A4] = (u_int64_t)aux; } +#endif + +void +cpu_set_args(struct thread *td, struct kse *ke) +{ +/* XXX + suword((void *)(ke->ke_frame->tf_esp + sizeof(void *)), + (int)ke->ke_mailbox); +*/ +} void cpu_free_kse_mdstorage(struct kse *kse) ==== //depot/projects/kse/sys/kern/subr_trap.c#67 (text+ko) ==== @@ -230,8 +230,10 @@ error = suword((caddr_t)td->td_kse->ke_mailbox + offsetof(struct kse_mailbox, kmbx_current_thread), 0); +#ifdef __i386__ printf("suword mailbox to 0 error: %d, frame= %p, eip=%p, esp=%p\n", error, frame, frame->tf_eip, frame->tf_esp); +#endif } /* * Stop any chance that we may be separated from To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 17 17:55:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40F4A37B417; Mon, 17 Jun 2002 17:54:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7B5B337B437 for ; Mon, 17 Jun 2002 17:53:59 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5I0qmZ74546 for perforce@freebsd.org; Mon, 17 Jun 2002 17:52:48 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Mon, 17 Jun 2002 17:52:48 -0700 (PDT) Message-Id: <200206180052.g5I0qmZ74546@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13095 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13095 Change 13095 by peter@peter_daintree on 2002/06/17 17:52:30 IFC @13094 Affected files ... ... //depot/projects/ia64/MAINTAINERS#9 integrate ... //depot/projects/ia64/Makefile.inc1#31 integrate ... //depot/projects/ia64/UPDATING#14 integrate ... //depot/projects/ia64/bin/cat/cat.c#3 integrate ... //depot/projects/ia64/bin/cp/cp.c#6 integrate ... //depot/projects/ia64/bin/date/netdate.c#3 integrate ... //depot/projects/ia64/bin/dd/misc.c#3 integrate ... //depot/projects/ia64/bin/kill/kill.1#3 integrate ... //depot/projects/ia64/bin/kill/kill.c#3 integrate ... //depot/projects/ia64/bin/ls/ls.c#6 integrate ... //depot/projects/ia64/bin/mv/mv.c#5 integrate ... //depot/projects/ia64/bin/ps/Makefile#5 integrate ... //depot/projects/ia64/bin/ps/extern.h#4 integrate ... //depot/projects/ia64/bin/ps/fmt.c#5 integrate ... //depot/projects/ia64/bin/ps/keyword.c#4 integrate ... //depot/projects/ia64/bin/ps/nlist.c#3 integrate ... //depot/projects/ia64/bin/ps/print.c#4 integrate ... //depot/projects/ia64/bin/ps/ps.1#8 integrate ... //depot/projects/ia64/bin/ps/ps.c#5 integrate ... //depot/projects/ia64/bin/realpath/realpath.c#2 integrate ... //depot/projects/ia64/bin/sh/alias.c#3 integrate ... //depot/projects/ia64/bin/sh/exec.c#4 integrate ... //depot/projects/ia64/bin/sh/jobs.c#6 integrate ... //depot/projects/ia64/bin/sh/output.c#3 integrate ... //depot/projects/ia64/bin/sh/output.h#3 integrate ... //depot/projects/ia64/bin/sh/sh.1#7 integrate ... //depot/projects/ia64/bin/sh/var.c#4 integrate ... //depot/projects/ia64/bin/sleep/sleep.1#2 integrate ... //depot/projects/ia64/contrib/gcc/builtins.c#3 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#10 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/i386.c#4 integrate ... //depot/projects/ia64/contrib/gcc/config/i386/i386.h#5 integrate ... //depot/projects/ia64/contrib/gcc/f/g77spec.c#3 integrate ... //depot/projects/ia64/contrib/gcc/gcc.c#6 integrate ... //depot/projects/ia64/contrib/gnu-sort/ABOUT-NLS#1 branch ... //depot/projects/ia64/contrib/gnu-sort/AUTHORS#1 branch ... //depot/projects/ia64/contrib/gnu-sort/COPYING#1 branch ... //depot/projects/ia64/contrib/gnu-sort/ChangeLog#1 branch ... //depot/projects/ia64/contrib/gnu-sort/FREEBSD-upgrade#1 branch ... //depot/projects/ia64/contrib/gnu-sort/INSTALL#1 branch ... //depot/projects/ia64/contrib/gnu-sort/NEWS#1 branch ... //depot/projects/ia64/contrib/gnu-sort/README#1 branch ... //depot/projects/ia64/contrib/gnu-sort/README-alpha#1 branch ... //depot/projects/ia64/contrib/gnu-sort/THANKS#1 branch ... //depot/projects/ia64/contrib/gnu-sort/TODO#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/argmatch.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/argmatch.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/closeout.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/dup-safer.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/error.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/error.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/fopen-safer.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/getopt.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/getopt.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/getopt1.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/hard-locale.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/hard-locale.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/human.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/human.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/long-options.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/long-options.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/memcoll.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/memcoll.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/pathmax.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/physmem.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/physmem.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/posixver.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/posixver.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/quote.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/quote.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/quotearg.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/quotearg.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/stdio-safer.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/unistd-safer.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/version-etc.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/version-etc.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/xalloc.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/xmalloc.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/xmemcoll.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/xmemcoll.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/xstrtol.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/xstrtol.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/xstrtoul.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/lib/xstrtoumax.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/man/sort.1#1 branch ... //depot/projects/ia64/contrib/gnu-sort/src/sort.c#1 branch ... //depot/projects/ia64/contrib/gnu-sort/src/sys2.h#1 branch ... //depot/projects/ia64/contrib/gnu-sort/src/system.h#1 branch ... //depot/projects/ia64/contrib/ipfilter/BSD/Makefile#4 integrate ... //depot/projects/ia64/contrib/ipfilter/FreeBSD-4.0/kinstall#4 integrate ... //depot/projects/ia64/contrib/ipfilter/HISTORY#4 integrate ... //depot/projects/ia64/contrib/ipfilter/ip_sfil.c#4 integrate ... //depot/projects/ia64/contrib/ipfilter/ipf.c#4 integrate ... //depot/projects/ia64/contrib/ipfilter/ipfs.c#4 integrate ... //depot/projects/ia64/contrib/ipfilter/ipmon.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/ipnat.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/ipsend/ip_var.h#2 integrate ... //depot/projects/ia64/contrib/ipfilter/ipt.c#4 integrate ... //depot/projects/ia64/contrib/ipfilter/man/ipftest.1#2 integrate ... //depot/projects/ia64/contrib/ipfilter/man/ipnat.5#4 integrate ... //depot/projects/ia64/contrib/ipfilter/mlf_ipl.c#4 integrate ... //depot/projects/ia64/contrib/ipfilter/parse.c#3 integrate ... //depot/projects/ia64/contrib/ipfilter/printnat.c#4 integrate ... //depot/projects/ia64/contrib/ipfilter/test/Makefile#5 integrate ... //depot/projects/ia64/contrib/ipfilter/test/dotest6#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/i12#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/expected/in1#2 integrate ... //depot/projects/ia64/contrib/ipfilter/test/expected/ni3#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/input/ipv6.1#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/input/ni3#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/i12#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/ipv6.1#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/ni3.ipf#1 branch ... //depot/projects/ia64/contrib/ipfilter/test/regress/ni3.nat#1 branch ... //depot/projects/ia64/contrib/lukemftp/ChangeLog#2 integrate ... //depot/projects/ia64/contrib/lukemftp/INSTALL#2 integrate ... //depot/projects/ia64/contrib/lukemftp/THANKS#2 integrate ... //depot/projects/ia64/contrib/lukemftp/acconfig.h#2 integrate ... //depot/projects/ia64/contrib/lukemftp/config.h.in#2 integrate ... //depot/projects/ia64/contrib/lukemftp/configure#2 integrate ... //depot/projects/ia64/contrib/lukemftp/configure.in#2 integrate ... //depot/projects/ia64/contrib/lukemftp/lukemftp.h#2 integrate ... //depot/projects/ia64/contrib/lukemftp/src/cmds.c#2 integrate ... //depot/projects/ia64/contrib/lukemftp/src/cmdtab.c#2 integrate ... //depot/projects/ia64/contrib/lukemftp/src/domacro.c#2 integrate ... //depot/projects/ia64/contrib/lukemftp/src/extern.h#2 integrate ... //depot/projects/ia64/contrib/lukemftp/src/fetch.c#3 integrate ... //depot/projects/ia64/contrib/lukemftp/src/ftp.1#3 integrate ... //depot/projects/ia64/contrib/lukemftp/src/ftp.c#3 integrate ... //depot/projects/ia64/contrib/lukemftp/src/ftp.cat1#1 branch ... //depot/projects/ia64/contrib/lukemftp/src/ftp_var.h#3 integrate ... //depot/projects/ia64/contrib/lukemftp/src/main.c#3 integrate ... //depot/projects/ia64/contrib/lukemftp/src/ruserpass.c#2 integrate ... //depot/projects/ia64/contrib/lukemftp/src/util.c#2 integrate ... //depot/projects/ia64/contrib/lukemftp/src/version.h#2 integrate ... //depot/projects/ia64/contrib/lukemftp/todo#2 integrate ... //depot/projects/ia64/contrib/sendmail/FAQ#3 integrate ... //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#8 integrate ... //depot/projects/ia64/contrib/sendmail/INSTALL#4 integrate ... //depot/projects/ia64/contrib/sendmail/KNOWNBUGS#5 integrate ... //depot/projects/ia64/contrib/sendmail/LICENSE#4 integrate ... //depot/projects/ia64/contrib/sendmail/Makefile#4 integrate ... //depot/projects/ia64/contrib/sendmail/PGPKEYS#4 integrate ... //depot/projects/ia64/contrib/sendmail/README#4 integrate ... //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#5 integrate ... //depot/projects/ia64/contrib/sendmail/cf/README#5 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/Makefile#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/README#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/chez.cs.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/clientproto.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cs-hpux10.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cs-hpux9.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cs-osf1.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cs-solaris2.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cs-sunos4.1.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cs-ultrix4.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/cyrusproto.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-bsd4.4.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-hpux10.mc#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-hpux9.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-linux.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-mpeix.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-nextstep3.3.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-osf1.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-solaris.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-sunos4.1.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/generic-ultrix4.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/huginn.cs.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/knecht.mc#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/mail.cs.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/mail.eecs.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/mailspool.cs.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/python.cs.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/s2k-osf1.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/s2k-ultrix4.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/submit.mc#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/tcpproto.mc#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/ucbarpa.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/ucbvax.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/uucpproto.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/cf/vangogh.cs.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/domain/Berkeley.EDU.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/domain/berkeley-only.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/domain/generic.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/accept_unqualified_senders.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/access_db.m4#5 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/allmasquerade.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/always_add_domain.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/authinfo.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/bestmx_is_local.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/bitdomain.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/blacklist_recipients.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/compat_check.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/delay_checks.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/dnsbl.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/domaintable.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/enhdnsbl.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/generics_entire_domain.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/genericstable.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/ldap_routing.m4#5 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/limited_masquerade.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/local_lmtp.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/local_no_masquerade.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/local_procmail.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/lookupdotdomain.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/loose_relay_check.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/mailertable.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/masquerade_entire_domain.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/masquerade_envelope.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/msp.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/no_default_msa.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/nocanonify.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/nodns.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/notsticky.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/nouucp.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/nullclient.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/preserve_local_plus_detail.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/preserve_luser_host.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/promiscuous_relay.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/queuegroup.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/redirect.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/relay_based_on_MX.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/relay_entire_domain.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/relay_hosts_only.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/relay_local_from.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/relay_mail_from.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/smrsh.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/stickyhost.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/use_ct_file.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/use_cw_file.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/uucpdomain.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/virtuser_entire_domain.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/feature/virtusertable.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/hack/cssubdomain.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/m4/cf.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/m4/cfhead.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#5 integrate ... //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#5 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/cyrus.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/cyrusv2.m4#1 branch ... //depot/projects/ia64/contrib/sendmail/cf/mailer/fax.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/local.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/mail11.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/phquery.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/pop.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/procmail.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/qpage.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/smtp.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/usenet.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/mailer/uucp.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/a-ux.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/aix3.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/aix4.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/aix5.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/altos.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/amdahl-uts.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/bsd4.3.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/bsd4.4.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/bsdi.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/bsdi1.0.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/bsdi2.0.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/darwin.m4#5 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/dgux.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/domainos.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/dynix3.2.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/freebsd4.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/freebsd5.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/gnu.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/hpux10.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/hpux11.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/hpux9.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/irix4.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/irix5.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/irix6.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/isc4.1.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/linux.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/maxion.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/mklinux.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/mpeix.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/nextstep.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/openbsd.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/osf1.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/powerux.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/ptx2.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/qnx.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/riscos4.5.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/sco-uw-2.1.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/sco3.2.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/sinix.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/solaris2.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/solaris2.ml.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/solaris2.pre5.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/solaris8.m4#4 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/sunos3.5.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/sunos4.1.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/svr4.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/ultrix4.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/unixware7.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/unknown.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/ostype/uxpds.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/sendmail.schema#3 integrate ... //depot/projects/ia64/contrib/sendmail/cf/sh/makeinfo.sh#3 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/README#3 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/bsdi.mc#3 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/buildvirtuser#5 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/dnsblaccess.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/link_hash.sh#4 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/qtool.8#5 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/qtool.pl#5 integrate ... //depot/projects/ia64/contrib/sendmail/contrib/smcontrol.pl#3 integrate ... //depot/projects/ia64/contrib/sendmail/doc/op/Makefile#4 integrate ... //depot/projects/ia64/contrib/sendmail/doc/op/op.me#5 integrate ... //depot/projects/ia64/contrib/sendmail/editmap/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/editmap/editmap.8#3 integrate ... //depot/projects/ia64/contrib/sendmail/editmap/editmap.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/libmilter/mfapi.h#5 integrate ... //depot/projects/ia64/contrib/sendmail/include/libmilter/mfdef.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/libmilter/milter.h#5 integrate ... //depot/projects/ia64/contrib/sendmail/include/libsmdb/smdb.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/sendmail/mailstats.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/sendmail/pathnames.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/sendmail/sendmail.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/assert.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/bitops.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/cdefs.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/cf.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/clock.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/conf.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/config.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/debug.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/errstring.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/exc.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/fdset.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/gen.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/heap.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/io.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/ldap.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/limits.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/mbdb.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_aix.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_freebsd.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_hp.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_irix.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_linux.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_mpeix.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_next.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_openbsd.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_openunix.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_osf1.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_sunos.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_ultrix.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_unixware.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/path.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/rpool.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/setjmp.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/shm.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/signal.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/string.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/sysexits.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/test.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/types.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/varargs.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/include/sm/xtrap.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/README#4 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/comm.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/docs/index.html#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/docs/overview.html#3 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/docs/sample.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_addheader.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_chgheader.html#2 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/engine.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/handler.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/libmilter.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/main.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/signal.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/sm_gethost.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libmilter/smfi.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/README#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/assert.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/assert.html#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/b-strcmp.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/b-strl.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/cdefs.html#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/cf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/clock.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/clrerr.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/config.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/debug.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/debug.html#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/errstring.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/exc.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/exc.html#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fclose.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/feof.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/ferror.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fflush.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fget.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/findfp.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/flags.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fopen.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fpos.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fprintf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fpurge.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fput.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fread.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fscanf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fseek.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fvwrite.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fvwrite.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fwalk.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/fwrite.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/gen.html#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/get.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/glue.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/heap.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/heap.html#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/index.html#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/io.html#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/ldap.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/local.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/makebuf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/match.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/mbdb.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/mpeix.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/niprop.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/path.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/put.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/refill.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/rewind.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/rpool.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/rpool.html#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/setvbuf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/shm.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/signal.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/smstdio.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/snprintf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/sscanf.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/stdio.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strcasecmp.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strdup.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strerror.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strexit.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/string.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/stringf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strio.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strl.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strrevcmp.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/strto.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/syslogio.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-cf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-event.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-exc.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-float.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-fopen.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-heap.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-match.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-path.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-rpool.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-scanf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-shm.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-smstdio.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-string.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-strio.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-strl.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-strrevcmp.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/t-types.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/test.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/ungetc.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vasprintf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vfprintf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vfscanf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vprintf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vsnprintf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vsprintf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/vsscanf.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/wbuf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/wsetup.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsm/xtrap.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsmdb/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsmdb/smdb.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/libsmdb/smdb1.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/libsmdb/smdb2.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsmdb/smndbm.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/cf.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/debug.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/err.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/lockfile.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/safefile.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/libsmutil/snprintf.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/mail.local/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/mail.local/README#4 integrate ... //depot/projects/ia64/contrib/sendmail/mail.local/mail.local.8#4 integrate ... //depot/projects/ia64/contrib/sendmail/mail.local/mail.local.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/mailstats/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/mailstats/mailstats.8#5 integrate ... //depot/projects/ia64/contrib/sendmail/mailstats/mailstats.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/makemap/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/makemap/makemap.8#4 integrate ... //depot/projects/ia64/contrib/sendmail/makemap/makemap.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/praliases/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/praliases/praliases.8#4 integrate ... //depot/projects/ia64/contrib/sendmail/praliases/praliases.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/rmail/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/rmail/rmail.8#4 integrate ... //depot/projects/ia64/contrib/sendmail/rmail/rmail.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/smrsh/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/smrsh/README#4 integrate ... //depot/projects/ia64/contrib/sendmail/smrsh/smrsh.8#4 integrate ... //depot/projects/ia64/contrib/sendmail/smrsh/smrsh.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/Makefile.m4#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/README#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/SECURITY#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/TRACEFLAGS#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/TUNING#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/alias.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/aliases#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/aliases.5#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/arpadate.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/bf.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/bf.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/collect.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/conf.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/conf.h#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/control.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/convtime.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/daemon.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/deliver.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/domain.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/envelope.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/err.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/helpfile#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/macro.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/mailq.1#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/main.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/map.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/mci.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/milter.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/mime.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/newaliases.1#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/parseaddr.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/queue.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/readcf.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/recipient.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/sasl.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/savemail.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/sendmail.8#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/sendmail.h#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/sfsasl.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/sfsasl.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/shmticklib.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/sm_resolve.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/sm_resolve.h#3 integrate ... //depot/projects/ia64/contrib/sendmail/src/srvrsmtp.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/stab.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/stats.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/statusd_shm.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/sysexits.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/timers.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/timers.h#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/tls.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/trace.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/udb.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/src/usersmtp.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/util.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/src/version.c#5 integrate ... //depot/projects/ia64/contrib/sendmail/test/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/test/README#3 integrate ... //depot/projects/ia64/contrib/sendmail/test/Results#4 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_dropgid.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_exclopen.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_pathconf.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_seteuid.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_setgid.c#3 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_setreuid.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_setuid.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/test/t_snprintf.c#4 integrate ... //depot/projects/ia64/contrib/sendmail/vacation/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/vacation/vacation.1#5 integrate ... //depot/projects/ia64/contrib/sendmail/vacation/vacation.c#5 integrate ... //depot/projects/ia64/contrib/tar/ABOUT-NLS#1 branch ... //depot/projects/ia64/contrib/tar/AUTHORS#1 branch ... //depot/projects/ia64/contrib/tar/COPYING#1 branch ... //depot/projects/ia64/contrib/tar/ChangeLog#1 branch ... //depot/projects/ia64/contrib/tar/ChangeLog.1#1 branch ... //depot/projects/ia64/contrib/tar/FREEBSD-Xlist#1 branch ... //depot/projects/ia64/contrib/tar/FREEBSD-upgrade#1 branch ... //depot/projects/ia64/contrib/tar/INSTALL#1 branch ... //depot/projects/ia64/contrib/tar/NEWS#1 branch ... //depot/projects/ia64/contrib/tar/PORTS#1 branch ... //depot/projects/ia64/contrib/tar/README#1 branch ... //depot/projects/ia64/contrib/tar/README-alpha#1 branch ... //depot/projects/ia64/contrib/tar/THANKS#1 branch ... //depot/projects/ia64/contrib/tar/TODO#1 branch ... //depot/projects/ia64/contrib/tar/doc/fdl.texi#1 branch ... //depot/projects/ia64/contrib/tar/doc/freemanuals.texi#1 branch ... //depot/projects/ia64/contrib/tar/doc/getdate.texi#1 branch ... //depot/projects/ia64/contrib/tar/doc/header.texi#1 branch ... //depot/projects/ia64/contrib/tar/doc/tar.texi#1 branch ... //depot/projects/ia64/contrib/tar/doc/version.texi#1 branch ... //depot/projects/ia64/contrib/tar/lib/addext.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/alloca.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/argmatch.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/argmatch.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/backupfile.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/backupfile.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/basename.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/dirname.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/dirname.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/error.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/error.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/exclude.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/exclude.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/fileblocks.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/fnmatch.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/fnmatch.hin#1 branch ... //depot/projects/ia64/contrib/tar/lib/ftruncate.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/full-write.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/full-write.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/getdate.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/getdate.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/getline.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/getline.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/getopt.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/getopt.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/getopt1.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/getstr.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/getstr.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/hash.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/hash.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/human.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/human.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/lchown.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/lchown.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/malloc.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/memset.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/mktime.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/modechange.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/modechange.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/msleep.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/prepargs.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/prepargs.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/print-copyr.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/print-copyr.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/quote.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/quote.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/quotearg.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/quotearg.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/readutmp.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/realloc.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/rename.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/rmdir.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/safe-read.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/safe-read.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/save-cwd.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/save-cwd.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/savedir.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/savedir.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/stpcpy.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/strcasecmp.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/strncasecmp.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/strstr.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/strtoimax.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/strtol.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/strtoll.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/strtoul.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/strtoull.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/strtoumax.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/unicodeio.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/unicodeio.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/utime.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/waitpid.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/xalloc.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/xgetcwd.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/xmalloc.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/xstrdup.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/xstrtoimax.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/xstrtol.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/xstrtol.h#1 branch ... //depot/projects/ia64/contrib/tar/lib/xstrtoul.c#1 branch ... //depot/projects/ia64/contrib/tar/lib/xstrtoumax.c#1 branch ... //depot/projects/ia64/contrib/tar/src/arith.h#1 branch ... //depot/projects/ia64/contrib/tar/src/buffer.c#1 branch ... //depot/projects/ia64/contrib/tar/src/common.h#1 branch ... //depot/projects/ia64/contrib/tar/src/compare.c#1 branch ... //depot/projects/ia64/contrib/tar/src/create.c#1 branch ... //depot/projects/ia64/contrib/tar/src/delete.c#1 branch ... //depot/projects/ia64/contrib/tar/src/extract.c#1 branch ... //depot/projects/ia64/contrib/tar/src/incremen.c#1 branch ... //depot/projects/ia64/contrib/tar/src/list.c#1 branch ... //depot/projects/ia64/contrib/tar/src/mangle.c#1 branch ... //depot/projects/ia64/contrib/tar/src/misc.c#1 branch ... //depot/projects/ia64/contrib/tar/src/names.c#1 branch ... //depot/projects/ia64/contrib/tar/src/rmt.c#1 branch ... //depot/projects/ia64/contrib/tar/src/rmt.h#1 branch ... //depot/projects/ia64/contrib/tar/src/rtapelib.c#1 branch ... //depot/projects/ia64/contrib/tar/src/system.h#1 branch ... //depot/projects/ia64/contrib/tar/src/tar.c#1 branch ... //depot/projects/ia64/contrib/tar/src/tar.h#1 branch ... //depot/projects/ia64/contrib/tar/src/update.c#1 branch ... //depot/projects/ia64/contrib/tcpdump/interface.h#2 integrate ... //depot/projects/ia64/contrib/top/username.c#2 integrate ... //depot/projects/ia64/etc/Makefile#11 integrate ... //depot/projects/ia64/etc/defaults/rc.conf#13 integrate ... //depot/projects/ia64/etc/mtree/BSD.root.dist#3 integrate ... //depot/projects/ia64/etc/rc#14 integrate ... //depot/projects/ia64/etc/rc.d/DAEMON#2 integrate ... //depot/projects/ia64/etc/rc.d/LOGIN#2 integrate ... //depot/projects/ia64/etc/rc.d/Makefile#2 integrate ... //depot/projects/ia64/etc/rc.d/NETWORK#2 delete ... //depot/projects/ia64/etc/rc.d/NETWORKING#1 branch ... //depot/projects/ia64/etc/rc.d/SERVERS#2 integrate ... //depot/projects/ia64/etc/rc.d/abi#1 branch ... //depot/projects/ia64/etc/rc.d/accounting#2 integrate ... //depot/projects/ia64/etc/rc.d/addswap#1 branch ... //depot/projects/ia64/etc/rc.d/adjkerntz#1 branch ... //depot/projects/ia64/etc/rc.d/altqd#1 branch ... //depot/projects/ia64/etc/rc.d/amd#2 integrate ... //depot/projects/ia64/etc/rc.d/apmd#2 integrate ... //depot/projects/ia64/etc/rc.d/atm1#1 branch ... //depot/projects/ia64/etc/rc.d/atm2.sh#1 branch ... //depot/projects/ia64/etc/rc.d/atm3.sh#1 branch ... //depot/projects/ia64/etc/rc.d/bgfsck#1 branch ... //depot/projects/ia64/etc/rc.d/bootconf.sh#2 integrate ... //depot/projects/ia64/etc/rc.d/bootparams#2 integrate ... //depot/projects/ia64/etc/rc.d/ccd#2 integrate ... //depot/projects/ia64/etc/rc.d/cleanvar#1 branch ... //depot/projects/ia64/etc/rc.d/cleartmp#2 integrate ... //depot/projects/ia64/etc/rc.d/cron#2 integrate ... //depot/projects/ia64/etc/rc.d/devdb#1 branch ... //depot/projects/ia64/etc/rc.d/devfs#1 branch ... //depot/projects/ia64/etc/rc.d/dhclient#2 integrate ... //depot/projects/ia64/etc/rc.d/dhcpd#2 integrate ... //depot/projects/ia64/etc/rc.d/dhcrelay#2 integrate ... //depot/projects/ia64/etc/rc.d/diskless#1 branch ... //depot/projects/ia64/etc/rc.d/dmesg#2 integrate ... //depot/projects/ia64/etc/rc.d/dumpon#1 branch ... //depot/projects/ia64/etc/rc.d/fsck#2 integrate ... //depot/projects/ia64/etc/rc.d/inetd#2 integrate ... //depot/projects/ia64/etc/rc.d/initdiskless#1 branch ... //depot/projects/ia64/etc/rc.d/initrandom#1 branch ... //depot/projects/ia64/etc/rc.d/ip6fw#1 branch ... //depot/projects/ia64/etc/rc.d/ipfilter#2 integrate ... //depot/projects/ia64/etc/rc.d/ipfw#1 branch ... //depot/projects/ia64/etc/rc.d/ipmon#2 integrate ... //depot/projects/ia64/etc/rc.d/ipnat#2 integrate ... //depot/projects/ia64/etc/rc.d/ipsec#2 integrate ... //depot/projects/ia64/etc/rc.d/ipxrouted#1 branch ... //depot/projects/ia64/etc/rc.d/isdnd#2 integrate ... //depot/projects/ia64/etc/rc.d/kadmind#1 branch ... //depot/projects/ia64/etc/rc.d/kdc#2 integrate ... //depot/projects/ia64/etc/rc.d/kerberos#1 branch ... //depot/projects/ia64/etc/rc.d/keyserv#1 branch ... //depot/projects/ia64/etc/rc.d/ldconfig#2 integrate ... //depot/projects/ia64/etc/rc.d/lkm1#2 integrate ... //depot/projects/ia64/etc/rc.d/lkm2#2 integrate ... //depot/projects/ia64/etc/rc.d/lkm3#2 integrate ... //depot/projects/ia64/etc/rc.d/local#2 integrate ... //depot/projects/ia64/etc/rc.d/localdaemons#1 branch ... //depot/projects/ia64/etc/rc.d/lomac#1 branch ... //depot/projects/ia64/etc/rc.d/lpd#2 integrate ... //depot/projects/ia64/etc/rc.d/mopd#2 integrate ... //depot/projects/ia64/etc/rc.d/motd#2 integrate ... //depot/projects/ia64/etc/rc.d/mountall#2 integrate ... //depot/projects/ia64/etc/rc.d/mountcritlocal#2 integrate ... //depot/projects/ia64/etc/rc.d/mountcritremote#2 integrate ... //depot/projects/ia64/etc/rc.d/mountd#2 integrate ... //depot/projects/ia64/etc/rc.d/moused#1 branch ... //depot/projects/ia64/etc/rc.d/mroute6d#1 branch ... //depot/projects/ia64/etc/rc.d/mrouted#2 integrate ... //depot/projects/ia64/etc/rc.d/msgs#1 branch ... //depot/projects/ia64/etc/rc.d/named#2 integrate ... //depot/projects/ia64/etc/rc.d/network1#1 branch ... //depot/projects/ia64/etc/rc.d/network2#1 branch ... //depot/projects/ia64/etc/rc.d/network3#1 branch ... //depot/projects/ia64/etc/rc.d/network_ipv6#1 branch ... //depot/projects/ia64/etc/rc.d/newsyslog#2 integrate ... //depot/projects/ia64/etc/rc.d/nfsclient#1 branch ... //depot/projects/ia64/etc/rc.d/nfsd#2 integrate ... //depot/projects/ia64/etc/rc.d/nfslocking#2 integrate ... //depot/projects/ia64/etc/rc.d/nfsserver#1 branch ... //depot/projects/ia64/etc/rc.d/ntpd#2 integrate ... //depot/projects/ia64/etc/rc.d/ntpdate#2 integrate ... //depot/projects/ia64/etc/rc.d/othermta#1 branch ... //depot/projects/ia64/etc/rc.d/pccard#1 branch ... //depot/projects/ia64/etc/rc.d/poffd#2 integrate ... //depot/projects/ia64/etc/rc.d/postfix#2 integrate ... //depot/projects/ia64/etc/rc.d/ppp#2 integrate ... //depot/projects/ia64/etc/rc.d/ppp-user#1 branch ... //depot/projects/ia64/etc/rc.d/pppoed#1 branch ... //depot/projects/ia64/etc/rc.d/pwcheck#2 integrate ... //depot/projects/ia64/etc/rc.d/quota#2 integrate ... //depot/projects/ia64/etc/rc.d/racoon#2 integrate ... //depot/projects/ia64/etc/rc.d/raidframe#2 integrate ... //depot/projects/ia64/etc/rc.d/random#1 branch ... //depot/projects/ia64/etc/rc.d/rarpd#2 integrate ... //depot/projects/ia64/etc/rc.d/rbootd#2 integrate ... //depot/projects/ia64/etc/rc.d/root#2 integrate ... //depot/projects/ia64/etc/rc.d/route6d#2 integrate ... //depot/projects/ia64/etc/rc.d/routed#2 integrate ... //depot/projects/ia64/etc/rc.d/rpcbind#2 integrate ... //depot/projects/ia64/etc/rc.d/rtadvd#2 integrate ... //depot/projects/ia64/etc/rc.d/rtsold#2 integrate ... //depot/projects/ia64/etc/rc.d/rwho#2 integrate ... //depot/projects/ia64/etc/rc.d/savecore#2 integrate ... //depot/projects/ia64/etc/rc.d/screenblank#2 integrate ... //depot/projects/ia64/etc/rc.d/securelevel#3 integrate ... //depot/projects/ia64/etc/rc.d/sendmail#2 integrate ... //depot/projects/ia64/etc/rc.d/serial#1 branch ... //depot/projects/ia64/etc/rc.d/sppp#1 branch ... //depot/projects/ia64/etc/rc.d/sshd#2 integrate ... //depot/projects/ia64/etc/rc.d/swap1#2 integrate ... //depot/projects/ia64/etc/rc.d/swap2#2 integrate ... //depot/projects/ia64/etc/rc.d/syscons#1 branch ... //depot/projects/ia64/etc/rc.d/sysctl#3 integrate ... //depot/projects/ia64/etc/rc.d/sysdb#2 integrate ... //depot/projects/ia64/etc/rc.d/syslogd#2 integrate ... //depot/projects/ia64/etc/rc.d/timed#2 integrate ... //depot/projects/ia64/etc/rc.d/ttys#2 integrate ... //depot/projects/ia64/etc/rc.d/usbd#1 branch ... //depot/projects/ia64/etc/rc.d/vinum#1 branch ... //depot/projects/ia64/etc/rc.d/virecover#2 integrate ... //depot/projects/ia64/etc/rc.d/wscons#3 integrate ... //depot/projects/ia64/etc/rc.d/xfs#2 integrate ... //depot/projects/ia64/etc/rc.d/ypbind#2 integrate ... //depot/projects/ia64/etc/rc.d/yppasswdd#2 integrate ... //depot/projects/ia64/etc/rc.d/ypserv#2 integrate ... //depot/projects/ia64/etc/rc.d/ypset#1 branch ... //depot/projects/ia64/etc/rc.d/ypupdated#1 branch ... //depot/projects/ia64/etc/rc.d/ypxfrd#1 branch ... //depot/projects/ia64/etc/rc.shutdown#6 integrate ... //depot/projects/ia64/etc/rc.subr#3 integrate ... //depot/projects/ia64/etc/rc.syscons#3 integrate ... //depot/projects/ia64/games/cribbage/instr.c#2 integrate ... //depot/projects/ia64/games/sail/pl_1.c#2 integrate ... //depot/projects/ia64/gnu/Makefile#3 integrate ... //depot/projects/ia64/gnu/include/Makefile#3 delete ... //depot/projects/ia64/gnu/lib/libdialog/raw_popen.c#2 integrate ... //depot/projects/ia64/gnu/lib/libdialog/textbox.c#2 integrate ... //depot/projects/ia64/gnu/usr.bin/Makefile#17 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile#7 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/Makefile.inc#6 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/c++/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc_fbsd/Makefile#4 delete ... //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/freebsd-native.h#7 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cpp/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/f77/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/include/Makefile#1 branch ... //depot/projects/ia64/gnu/usr.bin/sort/COPYING#4 delete ... //depot/projects/ia64/gnu/usr.bin/sort/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/sort/config.h#4 integrate ... //depot/projects/ia64/gnu/usr.bin/sort/error.c#4 delete ... //depot/projects/ia64/gnu/usr.bin/sort/error.h#4 delete ... //depot/projects/ia64/gnu/usr.bin/sort/getopt.c#4 delete ... //depot/projects/ia64/gnu/usr.bin/sort/getopt.h#4 delete ... //depot/projects/ia64/gnu/usr.bin/sort/getopt1.c#4 delete ... //depot/projects/ia64/gnu/usr.bin/sort/libintl.h#1 branch ... //depot/projects/ia64/gnu/usr.bin/sort/long-options.c#4 delete ... //depot/projects/ia64/gnu/usr.bin/sort/long-options.h#4 delete ... //depot/projects/ia64/gnu/usr.bin/sort/sort.1#4 delete ... //depot/projects/ia64/gnu/usr.bin/sort/sort.c#5 delete ... //depot/projects/ia64/gnu/usr.bin/sort/system.h#4 delete ... //depot/projects/ia64/gnu/usr.bin/sort/unlocked-io.h#1 branch ... //depot/projects/ia64/gnu/usr.bin/sort/version.c#4 delete ... //depot/projects/ia64/gnu/usr.bin/sort/version.h#4 delete ... //depot/projects/ia64/gnu/usr.bin/sort/xstrtod.c#4 delete ... //depot/projects/ia64/gnu/usr.bin/sort/xstrtod.h#4 delete ... //depot/projects/ia64/gnu/usr.bin/tar/COPYING#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/ChangeLog#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/tar/Makefile.gnu#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/README#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/buffer.c#3 delete ... //depot/projects/ia64/gnu/usr.bin/tar/config.h#1 branch ... //depot/projects/ia64/gnu/usr.bin/tar/create.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/diffarch.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/doc/Makefile#1 branch ... //depot/projects/ia64/gnu/usr.bin/tar/extract.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/getdate.y#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/getoldopt.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/getopt.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/getopt.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/getopt1.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/getpagesize.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/gnu.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/list.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/localedir.h#1 branch ... //depot/projects/ia64/gnu/usr.bin/tar/mangle.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/msd_dir.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/names.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/open3.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/pathmax.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/port.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/port.h#4 delete ... //depot/projects/ia64/gnu/usr.bin/tar/prepend_args.c#3 delete ... //depot/projects/ia64/gnu/usr.bin/tar/prepend_args.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/rmt.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/rtapelib.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/tar.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/tar.h#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/update.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/tar/version.c#2 delete ... //depot/projects/ia64/gnu/usr.bin/texinfo/info/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/texinfo/install-info/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/texinfo/makeinfo/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/texinfo/texindex/Makefile#2 integrate ... //depot/projects/ia64/include/Makefile#12 integrate ... //depot/projects/ia64/include/histedit.h#2 integrate ... //depot/projects/ia64/include/pwd.h#6 integrate ... //depot/projects/ia64/include/time.h#4 integrate ... //depot/projects/ia64/include/timeconv.h#1 branch ... //depot/projects/ia64/include/unistd.h#7 integrate ... //depot/projects/ia64/lib/libc/gen/Makefile.inc#9 integrate ... //depot/projects/ia64/lib/libc/gen/pselect.3#1 branch ... //depot/projects/ia64/lib/libc/net/rcmdsh.3#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/Makefile.inc#3 integrate ... //depot/projects/ia64/lib/libc/posix1e/cap.3#4 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_clear.3#2 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_clear.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_cmp.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_copy.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_copy_ext.3#2 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_copy_int.3#2 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_dup.3#2 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_dup.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_free.3#2 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_free.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_from_text.3#2 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_get_fd.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_get_file.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_get_flag.3#2 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_get_flag.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_get_proc.3#2 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_get_proc.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_init.3#2 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_init.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_set_fd.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_set_file.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_set_flag.3#2 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_set_flag.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_set_proc.3#2 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_set_proc.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_text.c#3 delete ... //depot/projects/ia64/lib/libc/posix1e/cap_to_text.3#2 delete ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate ... //depot/projects/ia64/lib/libc/stdio/printf.3#6 integrate ... //depot/projects/ia64/lib/libc/stdlib/malloc.3#7 integrate ... //depot/projects/ia64/lib/libc/stdtime/time32.c#4 integrate ... //depot/projects/ia64/lib/libc_r/uthread/Makefile.inc#3 integrate ... //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#8 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_cap_get_fd.c#3 delete ... //depot/projects/ia64/lib/libc_r/uthread/uthread_cap_set_fd.c#3 delete ... //depot/projects/ia64/lib/libedit/el.c#2 integrate ... //depot/projects/ia64/lib/libfetch/Makefile#4 integrate ... //depot/projects/ia64/lib/libfetch/common.c#3 integrate ... //depot/projects/ia64/lib/libfetch/common.h#4 integrate ... //depot/projects/ia64/lib/libfetch/fetch.c#4 integrate ... //depot/projects/ia64/lib/libfetch/ftp.c#5 integrate ... //depot/projects/ia64/lib/libfetch/http.c#5 integrate ... //depot/projects/ia64/lib/libpam/modules/pam_ksu/Makefile#2 integrate ... //depot/projects/ia64/lib/libradius/libradius.3#4 integrate ... //depot/projects/ia64/lib/libradius/radlib.c#3 integrate ... //depot/projects/ia64/lib/libradius/radlib.h#3 integrate ... //depot/projects/ia64/lib/libstand/stand.h#6 integrate ... //depot/projects/ia64/lib/libutil/realhostname.c#2 integrate ... //depot/projects/ia64/lib/msun/src/e_pow.c#3 integrate ... //depot/projects/ia64/lib/msun/src/e_powf.c#3 integrate ... //depot/projects/ia64/libexec/rtld-elf/Makefile#2 integrate ... //depot/projects/ia64/libexec/rtld-elf/i386/reloc.c#2 integrate ... //depot/projects/ia64/release/Makefile#14 integrate ... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#31 integrate ... //depot/projects/ia64/release/scripts/chkINDEX#1 branch ... //depot/projects/ia64/release/scripts/mkpkghier#1 branch ... //depot/projects/ia64/sbin/Makefile#13 integrate ... //depot/projects/ia64/sbin/atm/atm/atm_print.c#3 integrate ... //depot/projects/ia64/sbin/atm/atm/atm_subr.c#3 integrate ... //depot/projects/ia64/sbin/disklabel/disklabel.c#12 integrate ... //depot/projects/ia64/sbin/dump/dump.h#6 integrate ... //depot/projects/ia64/sbin/dump/tape.c#5 integrate ... //depot/projects/ia64/sbin/dump/traverse.c#5 integrate ... //depot/projects/ia64/sbin/ifconfig/ifconfig.8#7 integrate ... //depot/projects/ia64/sbin/ifconfig/ifconfig.c#6 integrate ... //depot/projects/ia64/sbin/kldload/kldload.8#3 integrate ... //depot/projects/ia64/sbin/mount_udf/mount_udf.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 18 0:25:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F4E337B40F; Tue, 18 Jun 2002 00:25:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 674DA37B40C for ; Tue, 18 Jun 2002 00:25:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5I7PCQ51323 for perforce@freebsd.org; Tue, 18 Jun 2002 00:25:12 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Tue, 18 Jun 2002 00:25:12 -0700 (PDT) Message-Id: <200206180725.g5I7PCQ51323@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13103 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13103 Change 13103 by julian@julian_ref on 2002/06/18 00:24:27 Start cleaning up the mess I made when I changed APIs. still doesn't quite work, but I've tracked down a lot of brainos including a couple I haven't fixed yet. Affected files ... ... //depot/projects/kse/sys/alpha/alpha/trap.c#26 edit ... //depot/projects/kse/sys/i386/i386/swtch.s#34 edit ... //depot/projects/kse/sys/i386/i386/trap.c#51 edit ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#57 edit ... //depot/projects/kse/sys/kern/init_main.c#42 edit ... //depot/projects/kse/sys/kern/kern_exit.c#54 edit ... //depot/projects/kse/sys/kern/kern_fork.c#70 edit ... //depot/projects/kse/sys/kern/kern_proc.c#70 edit ... //depot/projects/kse/sys/kern/kern_thread.c#70 edit ... //depot/projects/kse/sys/sparc64/sparc64/trap.c#30 edit Differences ... ==== //depot/projects/kse/sys/alpha/alpha/trap.c#26 (text+ko) ==== @@ -301,6 +301,7 @@ if (td->td_ucred != p->p_ucred) cred_update_thread(td); if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + mtx_lock_spin(&sched_lock); PROC_LOCK(p); thread_exit(); /* NOTREACHED */ ==== //depot/projects/kse/sys/i386/i386/swtch.s#34 (text+ko) ==== @@ -317,12 +317,14 @@ #ifdef INVARIANTS badsw2: + pushal pushl $sw0_2 call panic sw0_2: .asciz "cpu_switch: not TDS_RUNQ" badsw3: + pushal pushl $sw0_3 call panic ==== //depot/projects/kse/sys/i386/i386/trap.c#51 (text+ko) ==== @@ -270,9 +270,10 @@ /* * First check that we shouldn't just abort. - * But check if the are the single thread first! + * But check if we are the single thread first! */ if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + mtx_lock_spin(&sched_lock); PROC_LOCK(p); thread_exit(); /* NOTREACHED */ ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#57 (text+ko) ==== @@ -325,8 +325,11 @@ /* XXXKSE this may be un-needed */ bcopy(td->td_pcb, newkse->ke_pcb, sizeof(struct pcb)); - /* This copies most of the user mode register values. */ - bzero(newkse->ke_frame, sizeof(struct trapframe)); + /* + * This initialises most of the user mode register values + * to good values. Eventually set them explicitly to know values + */ + bcopy(td->td_frame, newkse->ke_frame, sizeof(struct trapframe)); tf->tf_edi = 0; tf->tf_esi = 0; /* trampoline arg */ tf->tf_ebp = 0; ==== //depot/projects/kse/sys/kern/init_main.c#42 (text+ko) ==== @@ -323,6 +323,12 @@ p->p_sysent = &aout_sysvec; #endif + /* + * proc_linkup was already done in init_i386() or alphainit() etc. + * because the earlier code needed to follow td->td_proc. Otherwise + * I would have done it here.. maybe this means this should be + * done earlier too. + */ ke = &proc0.p_kse; /* XXXKSE */ kg = &proc0.p_ksegrp; /* XXXKSE */ p->p_flag = P_SYSTEM; ==== //depot/projects/kse/sys/kern/kern_exit.c#54 (text+ko) ==== @@ -547,6 +547,8 @@ register int nfound; register struct proc *p, *q, *t; int status, error; + struct kse *ke; + struct ksegrp *kg; q = td->td_proc; if (uap->pid == 0) { @@ -603,7 +605,6 @@ mtx_unlock_spin(&sched_lock); } - thread_reap(); /* check for zombie threads */ td->td_retval[0] = p->p_pid; #ifdef COMPAT_43 if (compat) @@ -700,9 +701,20 @@ p->p_procsig = NULL; } - /* Free the KSE spare thread. */ - if (p->p_kse.ke_tdspare != NULL) - thread_free(p->p_kse.ke_tdspare); + /* + * There should only be one KSE/KSEGRP but + * do it right anyhow. + */ + FOREACH_KSEGRP_IN_PROC(p, kg) { + FOREACH_KSE_IN_GROUP(kg, ke) { + /* Free the KSE spare thread. */ + if (ke->ke_tdspare != NULL) { + thread_free(ke->ke_tdspare); + p->p_kse.ke_tdspare = NULL; + } + } + } + thread_reap(); /* check for zombie threads */ /* * Give vm and machine-dependent layer a chance ==== //depot/projects/kse/sys/kern/kern_fork.c#70 (text+ko) ==== @@ -513,7 +513,7 @@ TAILQ_REMOVE(&kg2->kg_iq, ke2, ke_kgrlist); ke2->ke_state = KES_UNQUEUED; kg2->kg_idle_kses--; - td2->td_flags &= ~TDF_UNBOUND; /* For the rest of this sycall. */ + td2->td_flags &= ~TDF_UNBOUND; /* For the rest of this syscall. */ /* note.. XXXKSE no pcb or u-area yet */ ==== //depot/projects/kse/sys/kern/kern_proc.c#70 (text+ko) ==== @@ -218,8 +218,10 @@ int err; p = td->td_proc; +printf("got here 0\n"); if ((err = copyin(uap->mbx, &mbx, sizeof(mbx)))) return (err); +printf("got here 1\n"); PROC_LOCK(p); /* * If we have no KSE mode set, just set it, and skip KSE and KSEGRP @@ -246,6 +248,7 @@ */ newkse = td->td_kse; } +printf("got here 2\n"); /* * Fill out the KSE-mode specific fields of the new kse. */ @@ -261,7 +264,7 @@ cpu_save_upcall(td, newkse); PROC_UNLOCK(p); /* Note that we are the returning syscall */ - td->td_retval[0] = 1; + td->td_retval[0] = 0; td->td_retval[1] = 0; if ((td->td_proc->p_flag & P_KSES) || (uap->new_grp_flag)) { ==== //depot/projects/kse/sys/kern/kern_thread.c#70 (text+ko) ==== @@ -254,15 +254,21 @@ { struct thread *td_reaped; - mtx_lock_spin(&zombie_thread_lock); - while (!TAILQ_EMPTY(&zombie_threads)) { - td_reaped = TAILQ_FIRST(&zombie_threads); - TAILQ_REMOVE(&zombie_threads, td_reaped, td_runq); + /* + * don't even bother to lock if none at this instant + * We really don't care about the next instant.. + */ + if (!TAILQ_EMPTY(&zombie_threads)) { + mtx_lock_spin(&zombie_thread_lock); + while (!TAILQ_EMPTY(&zombie_threads)) { + td_reaped = TAILQ_FIRST(&zombie_threads); + TAILQ_REMOVE(&zombie_threads, td_reaped, td_runq); + mtx_unlock_spin(&zombie_thread_lock); + thread_free(td_reaped); + mtx_lock_spin(&zombie_thread_lock); + } mtx_unlock_spin(&zombie_thread_lock); - thread_free(td_reaped); - mtx_lock_spin(&zombie_thread_lock); } - mtx_unlock_spin(&zombie_thread_lock); } /* @@ -347,9 +353,10 @@ if (ke->ke_tdspare != NULL) { thread_stash(ke->ke_tdspare); + ke->ke_tdspare = NULL; } cpu_thread_exit(td); /* XXXSMP */ - thread_unlink(td); + thread_unlink(td); /* Remember that this reassigns the KSE */ ke->ke_tdspare = td; PROC_UNLOCK(p); cpu_throw(); @@ -405,7 +412,8 @@ td, td->td_proc->p_pid, td->td_proc->p_comm); thread_link(td2, ke->ke_ksegrp); cpu_set_upcall(td2, ke->ke_pcb); -printf("thread_schedule_upcall: Scheduled td %p kse %p\n", td2, ke); +printf("thread_schedule_upcall: Scheduled td %p, my td %p, kse %p\n", +td2, td, ke); td2->td_ucred = crhold(td->td_ucred); td2->td_kse = NULL; /* Back as it was. */ td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; ==== //depot/projects/kse/sys/sparc64/sparc64/trap.c#30 (text+ko) ==== @@ -192,6 +192,7 @@ if (td->td_ucred != p->p_ucred) cred_update_thread(td); if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + mtx_lock_spin(&sched_lock); thread_exit(); /* NOTREACHED */ } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 18 6:47:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65D8D37B405; Tue, 18 Jun 2002 06:45:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7890137B400 for ; Tue, 18 Jun 2002 06:45:57 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5IDjuK24651 for perforce@freebsd.org; Tue, 18 Jun 2002 06:45:56 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Date: Tue, 18 Jun 2002 06:45:56 -0700 (PDT) Message-Id: <200206181345.g5IDjuK24651@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bmilekic@freebsd.org using -f From: Bosko Milekic Subject: PERFORCE change 13113 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13113 Change 13113 by bmilekic@bmilekic_angela on 2002/06/18 06:45:41 IFC. Affected files ... ... //depot/projects/interrupt/sys/alpha/conf/GENERIC#4 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_misc.c#5 integrate ... //depot/projects/interrupt/sys/conf/files#7 integrate ... //depot/projects/interrupt/sys/conf/files.i386#6 integrate ... //depot/projects/interrupt/sys/conf/files.pc98#7 integrate ... //depot/projects/interrupt/sys/conf/files.sparc64#6 integrate ... //depot/projects/interrupt/sys/conf/kern.pre.mk#5 integrate ... //depot/projects/interrupt/sys/conf/kmod.mk#5 integrate ... //depot/projects/interrupt/sys/conf/options#5 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate ... //depot/projects/interrupt/sys/dev/drm/drm_os_freebsd.h#2 integrate ... //depot/projects/interrupt/sys/dev/hea/eni.c#3 integrate ... //depot/projects/interrupt/sys/dev/hea/eni.h#3 integrate ... //depot/projects/interrupt/sys/dev/hea/eni_globals.c#2 integrate ... //depot/projects/interrupt/sys/dev/hea/eni_var.h#3 integrate ... //depot/projects/interrupt/sys/dev/hea/hea_freebsd.c#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_globals.c#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_include.h#3 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_load.c#3 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_var.h#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/hfa_freebsd.c#2 integrate ... //depot/projects/interrupt/sys/dev/isp/isp.c#5 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_freebsd.c#4 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_freebsd.h#4 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_inline.h#4 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_ioctl.h#3 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_pci.c#4 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_target.c#3 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_target.h#4 integrate ... //depot/projects/interrupt/sys/dev/isp/ispmbox.h#4 integrate ... //depot/projects/interrupt/sys/dev/isp/ispvar.h#4 integrate ... //depot/projects/interrupt/sys/dev/md/md.c#6 integrate ... //depot/projects/interrupt/sys/dev/pccbb/pccbb.c#4 integrate ... //depot/projects/interrupt/sys/dev/pccbb/pccbbvar.h#3 integrate ... //depot/projects/interrupt/sys/dev/puc/pucdata.c#4 integrate ... //depot/projects/interrupt/sys/dev/puc/pucvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/sio/sio_ebus.c#1 branch ... //depot/projects/interrupt/sys/dev/usb/uhub.c#4 integrate ... //depot/projects/interrupt/sys/dev/usb/umass.c#4 integrate ... //depot/projects/interrupt/sys/dev/usb/usb_subr.c#4 integrate ... //depot/projects/interrupt/sys/dev/wi/if_wi_pci.c#2 integrate ... //depot/projects/interrupt/sys/fs/nullfs/null.h#3 integrate ... //depot/projects/interrupt/sys/fs/nullfs/null_subr.c#2 integrate ... //depot/projects/interrupt/sys/fs/nullfs/null_vfsops.c#3 integrate ... //depot/projects/interrupt/sys/fs/nullfs/null_vnops.c#3 integrate ... //depot/projects/interrupt/sys/fs/udf/udf_mount.h#2 delete ... //depot/projects/interrupt/sys/fs/udf/udf_vfsops.c#2 integrate ... //depot/projects/interrupt/sys/fs/unionfs/union.h#3 integrate ... //depot/projects/interrupt/sys/fs/unionfs/union_vfsops.c#5 integrate ... //depot/projects/interrupt/sys/i386/i386/pmap.c#5 integrate ... //depot/projects/interrupt/sys/i386/i386/trap.c#7 integrate ... //depot/projects/interrupt/sys/i4b/capi/iavc/iavc_card.c#2 integrate ... //depot/projects/interrupt/sys/i4b/capi/iavc/iavc_lli.c#3 integrate ... //depot/projects/interrupt/sys/i4b/capi/iavc/iavc_pci.c#3 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate ... //depot/projects/interrupt/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/itjc/i4b_itjc_pci.c#3 integrate ... //depot/projects/interrupt/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#3 integrate ... //depot/projects/interrupt/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate ... //depot/projects/interrupt/sys/kern/init_sysent.c#5 integrate ... //depot/projects/interrupt/sys/kern/kern_acl.c#5 integrate ... //depot/projects/interrupt/sys/kern/subr_mbuf.c#4 integrate ... //depot/projects/interrupt/sys/kern/syscalls.c#5 integrate ... //depot/projects/interrupt/sys/kern/syscalls.master#5 integrate ... //depot/projects/interrupt/sys/kern/uipc_socket2.c#4 integrate ... //depot/projects/interrupt/sys/kern/vfs_subr.c#6 integrate ... //depot/projects/interrupt/sys/modules/sppp/Makefile#3 integrate ... //depot/projects/interrupt/sys/net/rtsock.c#5 integrate ... //depot/projects/interrupt/sys/netatm/atm_cm.c#3 integrate ... //depot/projects/interrupt/sys/netatm/atm_device.c#4 integrate ... //depot/projects/interrupt/sys/netatm/atm_if.c#3 integrate ... //depot/projects/interrupt/sys/netatm/atm_if.h#3 integrate ... //depot/projects/interrupt/sys/netatm/atm_subr.c#4 integrate ... //depot/projects/interrupt/sys/netatm/atm_sys.h#3 integrate ... //depot/projects/interrupt/sys/netatm/atm_var.h#4 integrate ... //depot/projects/interrupt/sys/netatm/uni/sscf_uni.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/sscf_uni_lower.c#2 integrate ... //depot/projects/interrupt/sys/netatm/uni/sscop.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/sscop_lower.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/sscop_var.h#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/uniarp.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/uniarp_cache.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/uniarp_timer.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/uniarp_vcm.c#2 integrate ... //depot/projects/interrupt/sys/netatm/uni/uniip.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/uniip_var.h#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_decode.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_if.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_msg.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_subr.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_util.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_var.h#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_vc_state.c#3 integrate ... //depot/projects/interrupt/sys/netinet/accf_data.c#3 integrate ... //depot/projects/interrupt/sys/netinet/accf_http.c#3 integrate ... //depot/projects/interrupt/sys/netinet/in_pcb.c#5 integrate ... //depot/projects/interrupt/sys/netinet/in_pcb.h#4 integrate ... //depot/projects/interrupt/sys/netinet/tcp_input.c#5 integrate ... //depot/projects/interrupt/sys/netinet/tcp_output.c#3 integrate ... //depot/projects/interrupt/sys/netinet/tcp_subr.c#5 integrate ... //depot/projects/interrupt/sys/netinet/tcp_syncache.c#6 integrate ... //depot/projects/interrupt/sys/netinet/tcp_usrreq.c#4 integrate ... //depot/projects/interrupt/sys/netinet/tcp_var.h#3 integrate ... //depot/projects/interrupt/sys/netinet/udp_usrreq.c#4 integrate ... //depot/projects/interrupt/sys/netinet/udp_var.h#3 integrate ... //depot/projects/interrupt/sys/netinet6/in6_pcb.c#4 integrate ... //depot/projects/interrupt/sys/netinet6/in6_pcb.h#3 integrate ... //depot/projects/interrupt/sys/netinet6/raw_ip6.c#4 integrate ... //depot/projects/interrupt/sys/netinet6/udp6_usrreq.c#5 integrate ... //depot/projects/interrupt/sys/netkey/keysock.c#4 integrate ... //depot/projects/interrupt/sys/pccard/pcic_pci.c#4 integrate ... //depot/projects/interrupt/sys/sparc64/conf/GENERIC#4 integrate ... //depot/projects/interrupt/sys/sparc64/include/vmparam.h#3 integrate ... //depot/projects/interrupt/sys/sparc64/pci/ofw_pci.c#4 integrate ... //depot/projects/interrupt/sys/sparc64/pci/ofw_pci.h#3 integrate ... //depot/projects/interrupt/sys/sparc64/pci/psycho.c#5 integrate ... //depot/projects/interrupt/sys/sparc64/pci/psychoreg.h#4 integrate ... //depot/projects/interrupt/sys/sparc64/sparc64/pmap.c#6 integrate ... //depot/projects/interrupt/sys/sys/_sigset.h#1 branch ... //depot/projects/interrupt/sys/sys/_types.h#2 integrate ... //depot/projects/interrupt/sys/sys/file.h#4 integrate ... //depot/projects/interrupt/sys/sys/malloc.h#4 integrate ... //depot/projects/interrupt/sys/sys/mount.h#4 integrate ... //depot/projects/interrupt/sys/sys/select.h#3 integrate ... //depot/projects/interrupt/sys/sys/signal.h#4 integrate ... //depot/projects/interrupt/sys/sys/socket.h#4 integrate ... //depot/projects/interrupt/sys/sys/socketvar.h#4 integrate ... //depot/projects/interrupt/sys/sys/statvfs.h#1 branch ... //depot/projects/interrupt/sys/sys/syscall.h#5 integrate ... //depot/projects/interrupt/sys/sys/syscall.mk#5 integrate ... //depot/projects/interrupt/sys/sys/sysproto.h#5 integrate ... //depot/projects/interrupt/sys/sys/time.h#4 integrate ... //depot/projects/interrupt/sys/sys/types.h#5 integrate ... //depot/projects/interrupt/sys/vm/uma.h#2 integrate ... //depot/projects/interrupt/sys/vm/uma_core.c#2 integrate ... //depot/projects/interrupt/sys/vm/uma_int.h#2 integrate ... //depot/projects/interrupt/sys/vm/vm_contig.c#4 integrate ... //depot/projects/interrupt/sys/vm/vm_fault.c#5 integrate ... //depot/projects/interrupt/sys/vm/vm_glue.c#5 integrate ... //depot/projects/interrupt/sys/vm/vm_kern.c#4 integrate ... //depot/projects/interrupt/sys/vm/vm_map.c#6 integrate ... //depot/projects/interrupt/sys/vm/vm_map.h#5 integrate ... //depot/projects/interrupt/sys/vm/vm_mmap.c#6 integrate Differences ... ==== //depot/projects/interrupt/sys/alpha/conf/GENERIC#4 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.139 2002/06/14 20:20:13 mjacob Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.140 2002/06/16 06:48:42 mjacob Exp $ machine alpha cpu EV4 @@ -97,7 +97,6 @@ device ahc # AHA2940 and onboard AIC7xxx devices #device esp # 53C94 & friends, not CAM-ified device isp # Qlogic family -device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') ==== //depot/projects/interrupt/sys/compat/linux/linux_misc.c#5 (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. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.122 2002/06/02 20:05:42 schweikh Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.123 2002/06/14 07:24:01 rwatson Exp $ */ #include "opt_compat.h" @@ -302,6 +302,10 @@ if (error) goto cleanup; + /* + * XXX: This should use vn_open() so that it is properly authorized, + * and to reduce code redundancy all over the place here. + */ error = VOP_OPEN(vp, FREAD, td->td_ucred, td); if (error) goto cleanup; ==== //depot/projects/interrupt/sys/conf/files#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.646 2002/06/10 18:49:37 phk Exp $ +# $FreeBSD: src/sys/conf/files,v 1.649 2002/06/17 05:40:40 jhay Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -774,7 +774,7 @@ # # isdn4bsd AVM B1/T1 CAPI driver # -i4b/capi/iavc/iavc_pci.c count iavc +i4b/capi/iavc/iavc_pci.c count iavc pci i4b/capi/iavc/iavc_isa.c optional iavc i4b/capi/iavc/iavc_lli.c optional iavc i4b/capi/iavc/iavc_card.c optional iavc @@ -831,7 +831,6 @@ kern/init_sysent.c standard kern/kern_acct.c standard kern/kern_acl.c standard -kern/kern_cap.c standard kern/kern_clock.c standard kern/kern_condvar.c standard kern/kern_conf.c standard @@ -1016,6 +1015,7 @@ net/rtsock.c standard net/slcompress.c optional ppp net/slcompress.c optional sl +net/slcompress.c optional sppp net/zlib.c optional ppp_deflate net/zlib.c optional ipsec netatalk/aarp.c optional netatalk ==== //depot/projects/interrupt/sys/conf/files.i386#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.401 2002/06/03 22:30:35 pdeuskar Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.402 2002/06/13 06:04:25 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -338,7 +338,7 @@ i4b/layer1/isic/i4b_drn_ngo.c optional isic i4b/layer1/isic/i4b_dynalink.c optional isic i4b/layer1/isic/i4b_elsa_qs1i.c optional isic -i4b/layer1/isic/i4b_elsa_qs1p.c optional isic +i4b/layer1/isic/i4b_elsa_qs1p.c optional isic pci i4b/layer1/isic/i4b_elsa_pcc16.c optional isic i4b/layer1/isic/i4b_hscx.c optional isic i4b/layer1/isic/i4b_isac.c optional isic @@ -358,25 +358,25 @@ # # isdn4bsd, iwic # -i4b/layer1/iwic/i4b_iwic_pci.c count iwic -i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic -i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic +i4b/layer1/iwic/i4b_iwic_pci.c count iwic pci +i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic pci # # isdn4bsd, ifpi # -i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi -i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi +i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi pci +i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi pci # # isdn4bsd, ifpi2 # -i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 +i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci # # isdn4bsd, ifpnp # ==== //depot/projects/interrupt/sys/conf/files.pc98#7 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.233 2002/06/03 22:30:35 pdeuskar Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.234 2002/06/13 06:04:25 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -308,7 +308,7 @@ i4b/layer1/isic/i4b_drn_ngo.c optional isic i4b/layer1/isic/i4b_dynalink.c optional isic i4b/layer1/isic/i4b_elsa_qs1i.c optional isic -i4b/layer1/isic/i4b_elsa_qs1p.c optional isic +i4b/layer1/isic/i4b_elsa_qs1p.c optional isic pci i4b/layer1/isic/i4b_elsa_pcc16.c optional isic i4b/layer1/isic/i4b_hscx.c optional isic i4b/layer1/isic/i4b_isac.c optional isic @@ -328,25 +328,25 @@ # # isdn4bsd, iwic # -i4b/layer1/iwic/i4b_iwic_pci.c count iwic -i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic -i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic +i4b/layer1/iwic/i4b_iwic_pci.c count iwic pci +i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic pci # # isdn4bsd, ifpi # -i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi -i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi +i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi pci +i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi pci # # isdn4bsd, ifpi2 # -i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 +i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci # # isdn4bsd, ifpnp # ==== //depot/projects/interrupt/sys/conf/files.sparc64#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.21 2002/06/08 07:17:18 jake Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.22 2002/06/18 01:14:54 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -12,6 +12,12 @@ crypto/des/des_enc.c optional ipsec ipsec_esp dev/ofw/ofw_console.c optional ofw_console dev/ofw/openfirm.c standard +dev/sio/sio.c optional sio +dev/sio/sio_ebus.c optional sio ebus +dev/sio/sio_isa.c optional sio isa +dev/sio/sio_pccard.c optional sio card +dev/sio/sio_pccard.c optional sio pccard +dev/sio/sio_pci.c optional sio pci libkern/ffs.c standard kern/subr_diskmbr.c standard kern/syscalls.c optional ktr ==== //depot/projects/interrupt/sys/conf/kern.pre.mk#5 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kenrels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.12 2002/05/12 15:51:38 bde Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.13 2002/06/16 10:42:05 mux Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -38,7 +38,7 @@ INCLUDES+= -I/usr/include .endif -COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -ffreestanding -include opt_global.h +COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common # XXX LOCORE means "don't declare C stuff" not "for locore.s". ==== //depot/projects/interrupt/sys/conf/kmod.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.124 2002/05/14 07:49:12 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.125 2002/06/17 20:01:06 n_hibma Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -278,7 +278,7 @@ .if !target(load) load: ${PROG} - ${KMODLOAD} -v ${.CURDIR}/${KMOD}.ko + ${KMODLOAD} -v ${.OBJDIR}/${KMOD}.ko .endif .if !target(unload) ==== //depot/projects/interrupt/sys/conf/options#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.324 2002/06/10 18:49:38 phk Exp $ +# $FreeBSD: src/sys/conf/options,v 1.325 2002/06/13 22:41:23 rwatson Exp $ # # On the handling of kernel options # @@ -115,7 +115,6 @@ _KPOSIX_VERSION opt_posix.h # TrustedBSD and POSIX.1e Kernel Options -CAPABILITIES opt_cap.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h ==== //depot/projects/interrupt/sys/contrib/dev/acpica/acpica_prep.sh#2 (text+ko) ==== @@ -1,15 +1,20 @@ #!/bin/sh -# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.1 2002/02/08 02:16:45 msmith Exp $ +# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.2 2002/06/12 14:55:19 iwasaki Exp $ # # Unpack an ACPI CA drop and restructure it to fit the FreeBSD layout # +if [ ! $# -eq 1 ]; then + echo "usage: $0 acpica_archive" + exit +fi + src=$1 wrk=./_acpi_ca_unpack dst=./acpi_ca_destination # files to remove -stripdirs="compiler" +stripdirs="compiler generate" stripfiles="osunixxf.c 16bit.h Makefile a16find.c a16utils.asm a16utils.obj\ acintel.h aclinux.h acmsvc.h acwin.h acwin64.h getopt.c" @@ -39,4 +44,4 @@ # post-clean echo post-clean -rm -rf ${wrk}+rm -rf ${wrk} ==== //depot/projects/interrupt/sys/dev/drm/drm_os_freebsd.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.5 2002/05/31 23:19:50 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.6 2002/06/16 21:50:42 des Exp $ */ #include @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/interrupt/sys/dev/hea/eni.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.21 2002/06/11 21:22:32 alfred Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.22 2002/06/14 16:59:37 arr Exp $ * */ @@ -66,7 +66,7 @@ #include #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.21 2002/06/11 21:22:32 alfred Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.22 2002/06/14 16:59:37 arr Exp $"); #endif /* @@ -415,8 +415,8 @@ eup->eu_openvcc = eni_openvcc; eup->eu_closevcc = eni_closevcc; eup->eu_output = eni_output; - eup->eu_vcc_pool = &eni_vcc_pool; - eup->eu_nif_pool = &eni_nif_pool; + eup->eu_vcc_zone = eni_vcc_zone; + eup->eu_nif_zone = eni_nif_zone; /* * Enable Memory Mapping / Bus Mastering ==== //depot/projects/interrupt/sys/dev/hea/eni.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni.h,v 1.5 2002/06/07 05:23:01 mdodd Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni.h,v 1.6 2002/06/14 16:59:37 arr Exp $ * */ @@ -491,8 +491,8 @@ #define eu_mtu eu_cmn.cu_mtu #define eu_open_vcc eu_cmn.cu_open_vcc #define eu_vcc eu_cmn.cu_vcc -#define eu_vcc_pool eu_cmn.cu_vcc_pool -#define eu_nif_pool eu_cmn.cu_nif_pool +#define eu_vcc_zone eu_cmn.cu_vcc_zone +#define eu_nif_zone eu_cmn.cu_nif_zone #define eu_ioctl eu_cmn.cu_ioctl #define eu_instvcc eu_cmn.cu_instvcc #define eu_openvcc eu_cmn.cu_openvcc ==== //depot/projects/interrupt/sys/dev/hea/eni_globals.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.8 2000/10/27 21:32:06 phk Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.9 2002/06/14 16:59:37 arr Exp $ * */ @@ -53,8 +53,10 @@ #include #include +#include + #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.8 2000/10/27 21:32:06 phk Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.9 2002/06/14 16:59:37 arr Exp $"); #endif /* @@ -98,17 +100,5 @@ /* * Storage pools */ -struct sp_info eni_nif_pool = { - "eni nif pool", /* si_name */ - sizeof(struct atm_nif), /* si_blksiz */ - 5, /* si_blkcnt */ - 52 /* si_maxallow */ -}; - -struct sp_info eni_vcc_pool = { - "eni vcc pool", /* si_name */ - sizeof(Eni_vcc), /* si_blksiz */ - 10, /* si_blkcnt */ - 100 /* si_maxallow */ -}; - +uma_zone_t eni_nif_zone; +uma_zone_t eni_vcc_zone; ==== //depot/projects/interrupt/sys/dev/hea/eni_var.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni_var.h,v 1.3 2002/03/20 02:07:22 alfred Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni_var.h,v 1.4 2002/06/14 16:59:37 arr Exp $ * */ @@ -79,7 +79,7 @@ */ extern Eni_unit *eni_units[]; extern struct stack_defn *eni_services; -extern struct sp_info eni_nif_pool; -extern struct sp_info eni_vcc_pool; +extern uma_zone_t eni_nif_zone; +extern uma_zone_t eni_vcc_zone; #endif /* _ENI_ENI_VAR_H */ ==== //depot/projects/interrupt/sys/dev/hea/hea_freebsd.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/hea/hea_freebsd.c,v 1.3 2002/06/07 05:23:01 mdodd Exp $ + * $FreeBSD: src/sys/dev/hea/hea_freebsd.c,v 1.4 2002/06/14 16:59:37 arr Exp $ */ /* @@ -158,13 +158,25 @@ eup = &sc->eup; error = 0; + eni_vcc_zone = uma_zcreate("eni vcc", sizeof(Eni_vcc), NULL, + NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + if (eni_vcc_zone == NULL) + panic("hea_attach: uma_zcreate vcc"); + uma_zone_set_max(eni_vcc_zone, 100); + + eni_nif_zone = uma_zcreate("eni nif", sizeof(struct atm_nif), NULL, + NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + if (eni_nif_zone == NULL) + panic("hea_attach: uma_zcreate nif"); + uma_zone_set_max(eni_nif_zone, 52); + /* * Start initializing it */ eup->eu_unit = device_get_unit(dev); eup->eu_mtu = ENI_IFF_MTU; - eup->eu_vcc_pool = &eni_vcc_pool; - eup->eu_nif_pool = &eni_nif_pool; + eup->eu_vcc_zone = eni_vcc_zone; + eup->eu_nif_zone = eni_nif_zone; eup->eu_ioctl = eni_atm_ioctl; eup->eu_instvcc = eni_instvcc; eup->eu_openvcc = eni_openvcc; @@ -329,6 +341,9 @@ hea_free(dev); + uma_zdestroy(eni_vcc_zone); + uma_zdestroy(eni_nif_zone); + return (error); } ==== //depot/projects/interrupt/sys/dev/hfa/fore_globals.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.9 2000/10/30 20:37:00 phk Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.10 2002/06/14 16:59:37 arr Exp $ * */ @@ -57,8 +57,10 @@ #include #include +#include + #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.9 2000/10/30 20:37:00 phk Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.10 2002/06/14 16:59:37 arr Exp $"); #endif /* @@ -104,20 +106,8 @@ /* * Storage pools */ -struct sp_info fore_nif_pool = { - "fore nif pool", /* si_name */ - sizeof(struct atm_nif), /* si_blksiz */ - 5, /* si_blkcnt */ - 52 /* si_maxallow */ -}; - -struct sp_info fore_vcc_pool = { - "fore vcc pool", /* si_name */ - sizeof(Fore_vcc), /* si_blksiz */ - 10, /* si_blkcnt */ - 100 /* si_maxallow */ -}; - +uma_zone_t fore_nif_zone; +uma_zone_t fore_vcc_zone; /* * Watchdog timer ==== //depot/projects/interrupt/sys/dev/hfa/fore_include.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_include.h,v 1.5 2002/03/20 02:07:23 alfred Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_include.h,v 1.6 2002/06/14 16:59:37 arr Exp $ * */ @@ -101,8 +101,8 @@ extern Fore_unit *fore_units[]; extern int fore_nunits; extern struct stack_defn *fore_services; -extern struct sp_info fore_nif_pool; -extern struct sp_info fore_vcc_pool; +extern uma_zone_t fore_nif_zone; +extern uma_zone_t fore_vcc_zone; extern struct atm_time fore_timer; #endif /* _FORE_INCLUDE_H */ ==== //depot/projects/interrupt/sys/dev/hfa/fore_load.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.25 2002/04/16 01:38:31 arr Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.26 2002/06/14 16:59:37 arr Exp $ * */ @@ -67,7 +67,7 @@ #include #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.25 2002/04/16 01:38:31 arr Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.26 2002/06/14 16:59:37 arr Exp $"); #endif static int fore_probe(device_t); @@ -225,8 +225,8 @@ fup->fu_unit = unit; fup->fu_mtu = FORE_IFF_MTU; fup->fu_pcitag = config_id; - fup->fu_vcc_pool = &fore_vcc_pool; - fup->fu_nif_pool = &fore_nif_pool; + fup->fu_vcc_zone = fore_vcc_zone; + fup->fu_nif_zone = &fore_nif_zone; fup->fu_ioctl = fore_atm_ioctl; fup->fu_instvcc = fore_instvcc; fup->fu_openvcc = fore_openvcc; ==== //depot/projects/interrupt/sys/dev/hfa/fore_var.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_var.h,v 1.5 2001/01/17 01:08:49 peter Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_var.h,v 1.6 2002/06/14 16:59:37 arr Exp $ * */ @@ -237,8 +237,8 @@ #define fu_vcc fu_cmn.cu_vcc #define fu_intrpri fu_cmn.cu_intrpri #define fu_savepri fu_cmn.cu_savepri -#define fu_vcc_pool fu_cmn.cu_vcc_pool -#define fu_nif_pool fu_cmn.cu_nif_pool +#define fu_vcc_zone fu_cmn.cu_vcc_zone +#define fu_nif_zone fu_cmn.cu_nif_zone #define fu_ioctl fu_cmn.cu_ioctl #define fu_instvcc fu_cmn.cu_instvcc #define fu_openvcc fu_cmn.cu_openvcc ==== //depot/projects/interrupt/sys/dev/hfa/hfa_freebsd.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/hfa/hfa_freebsd.c,v 1.2 2002/06/07 01:55:42 mdodd Exp $ + * $FreeBSD: src/sys/dev/hfa/hfa_freebsd.c,v 1.3 2002/06/14 16:59:37 arr Exp $ */ /* @@ -169,8 +169,8 @@ */ fup->fu_unit = device_get_unit(dev); fup->fu_mtu = FORE_IFF_MTU; - fup->fu_vcc_pool = &fore_vcc_pool; - fup->fu_nif_pool = &fore_nif_pool; + fup->fu_vcc_zone = fore_vcc_zone; + fup->fu_nif_zone = fore_nif_zone; fup->fu_ioctl = fore_atm_ioctl; fup->fu_instvcc = fore_instvcc; fup->fu_openvcc = fore_openvcc; @@ -377,6 +377,19 @@ error = EINVAL; break; } + + fore_nif_zone = uma_zcreate("fore nif", sizeof(struct atm_nif), NULL, + NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + if (fore_nif_zone == NULL) + panic("hfa_modevent:uma_zcreate nif"); + uma_zone_set_max(fore_nif_zone, 52); + + fore_vcc_zone = uma_zcreate("fore vcc", sizeof(Fore_vcc), NULL, + NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + if (fore_vcc_zone == NULL) + panic("hfa_modevent: uma_zcreate vcc"); + uma_zone_set_max(fore_vcc_zone, 100); + /* * Initialize DMA mapping */ @@ -399,6 +412,9 @@ */ atm_untimeout(&fore_timer); + uma_zdestroy(fore_nif_zone); + uma_zdestroy(fore_vcc_zone); + break; default: break; ==== //depot/projects/interrupt/sys/dev/isp/isp.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.93 2002/05/01 21:58:36 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.94 2002/06/16 05:18:22 mjacob Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -161,7 +161,7 @@ { mbreg_t mbs; u_int16_t code_org; - int loops, i, touched, dodnld = 1; + int loops, i, dodnld = 1; char *btype = "????"; isp->isp_state = ISP_NILSTATE; @@ -184,7 +184,7 @@ * case, we don't really use this yet, but we may in * the future. */ - if ((touched = isp->isp_touched) == 0) { + if (isp->isp_touched == 0) { /* * First see whether or not we're sitting in the ISP PROM. * If we've just been reset, we'll have the string "ISP " @@ -676,8 +676,10 @@ mbs.param[0] = MBOX_EXEC_FIRMWARE; mbs.param[1] = code_org; isp_mboxcmd(isp, &mbs, MBLOGNONE); - /* give it a chance to start */ - USEC_SLEEP(isp, 500); + /* + * Give it a chance to start. + */ + USEC_DELAY(500); if (IS_SCSI(isp)) { /* @@ -789,19 +791,21 @@ * because we may be called again after firmware has been loaded once * and released. */ - if (touched == 0) { - if (IS_SCSI(isp)) { - if (dodnld) { + if (IS_SCSI(isp)) { + if (dodnld) { + if (IS_ULTRA2(isp) || IS_ULTRA3(isp)) { isp->isp_maxluns = 32; } else { isp->isp_maxluns = 8; } } else { - if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_SCCLUN) { - isp->isp_maxluns = 16384; - } else { - isp->isp_maxluns = 16; - } + isp->isp_maxluns = 8; + } + } else { + if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_SCCLUN) { + isp->isp_maxluns = 16384; + } else { + isp->isp_maxluns = 16; } } } @@ -1177,7 +1181,6 @@ */ fcp->isp_fwoptions |= ICBOPT_PDBCHANGE_AE; - /* * Make sure that target role reflects into fwoptions. */ @@ -2411,7 +2414,13 @@ rs0 = (sns_ga_nxt_rsp_t *) ((u_int8_t *)fcp->isp_scratch+0x100); isp_get_ga_nxt_response(isp, rs0, rs1); if (rs1->snscb_cthdr.ct_response != FS_ACC) { - isp_prt(isp, ISP_LOGWARN, swrej, "GA_NXT", + int level; + if (rs1->snscb_cthdr.ct_reason == 9 && + rs1->snscb_cthdr.ct_explanation == 7) + level = ISP_LOGDEBUG0; + else + level = ISP_LOGWARN; + isp_prt(isp, level, swrej, "GA_NXT", rs1->snscb_cthdr.ct_reason, rs1->snscb_cthdr.ct_explanation, portid); FC_SCRATCH_RELEASE(isp); @@ -2424,6 +2433,10 @@ (((u_int32_t) rs1->snscb_port_id[2])); /* + * XXX: We should check to make sure that this entry + * XXX: supports the type(s) we are interested in. + */ + /* * Okay, we now have information about a fabric object. * If it is the type we're interested in, tell the outer layers * about it. The outer layer needs to know: Port ID, WWNN, @@ -2556,7 +2569,13 @@ rs0 = (sns_gid_ft_rsp_t *) ((u_int8_t *)fcp->isp_scratch+IGPOFF); isp_get_gid_ft_response(isp, rs0, rs1, NGENT); if (rs1->snscb_cthdr.ct_response != FS_ACC) { - isp_prt(isp, ISP_LOGWARN, swrej, "GID_FT", + int level; + if (rs1->snscb_cthdr.ct_reason == 9 && + rs1->snscb_cthdr.ct_explanation == 7) + level = ISP_LOGDEBUG0; + else + level = ISP_LOGWARN; + isp_prt(isp, level, swrej, "GID_FT", rs1->snscb_cthdr.ct_reason, rs1->snscb_cthdr.ct_explanation, 0); FC_SCRATCH_RELEASE(isp); @@ -2791,6 +2810,12 @@ } FC_SCRATCH_RELEASE(isp); + /* + * XXX: Workaround for some bogus fabric registrants + */ + if (ftype) { + (void) isp_scan_fabric(isp, 0); + } fcp->isp_loopstate = LOOP_FSCAN_DONE; return (0); } @@ -3023,7 +3048,7 @@ return (CMD_RQLATER); } if (fcp->isp_fwstate != FW_READY || - fcp->isp_loopstate < LOOP_PDB_RCVD) { + fcp->isp_loopstate < LOOP_FSCAN_DONE) { return (CMD_RQLATER); } } @@ -3199,7 +3224,7 @@ XS_SETERR(xs, HBA_NOERROR); isp_prt(isp, ISP_LOGDEBUG2, "START cmd for %d.%d.%d cmd 0x%x datalen %ld", - XS_CHANNEL(xs), target, XS_LUN(xs), XS_CDBP(xs)[0], + XS_CHANNEL(xs), XS_TGT(xs), XS_LUN(xs), XS_CDBP(xs)[0], (long) XS_XFRLEN(xs)); ISP_ADD_REQUEST(isp, nxti); isp->isp_nactive++; @@ -3665,11 +3690,15 @@ * Only whine if this isn't the expected fallout of * aborting the command. */ - if (sp->req_header.rqs_entry_type != RQSTYPE_RESPONSE || - ts != RQCS_ABORTED) { + if (sp->req_header.rqs_entry_type != RQSTYPE_RESPONSE) { + isp_prt(isp, ISP_LOGERR, + "cannot find handle 0x%x (type 0x%x)", >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 18 13:56: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09A2037B40A; Tue, 18 Jun 2002 13:55:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3655537B409 for ; Tue, 18 Jun 2002 13:55:58 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5IKtwK01433 for perforce@freebsd.org; Tue, 18 Jun 2002 13:55:58 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 18 Jun 2002 13:55:58 -0700 (PDT) Message-Id: <200206182055.g5IKtwK01433@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13120 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13120 Change 13120 by peter@peter_ia64 on 2002/06/18 13:55:07 Sync with -current Affected files ... ... //depot/projects/ia64/gnu/lib/libstdc++/Makefile#7 edit Differences ... ==== //depot/projects/ia64/gnu/lib/libstdc++/Makefile#7 (text+ko) ==== @@ -16,7 +16,6 @@ CFLAGS+= -DIN_GLIBCPP_V3 -DHAVE_CONFIG_H CFLAGS+= -I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -CFLAGS+= -I${GCCDIR}/config/${MACHINE_ARCH} CXXFLAGS+= -fno-implicit-templates -ffunction-sections -fdata-sections -Wno-deprecated #LDFLAGS+= -Wl,-version-info,4:0:0 -Wl,--version-script=${SRCDIR}/src/linker.map To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 18 14: 4:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 010AE37B404; Tue, 18 Jun 2002 14:03:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A538037B400 for ; Tue, 18 Jun 2002 14:03:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5IL3Av02348 for perforce@freebsd.org; Tue, 18 Jun 2002 14:03:10 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 18 Jun 2002 14:03:10 -0700 (PDT) Message-Id: <200206182103.g5IL3Av02348@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13121 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13121 Change 13121 by peter@peter_daintree on 2002/06/18 14:02:52 IFC @13120 Affected files ... ... //depot/projects/ia64/contrib/gcc.295/BUGS#2 delete ... //depot/projects/ia64/contrib/gcc.295/COPYING#2 delete ... //depot/projects/ia64/contrib/gcc.295/COPYING.LIB#2 delete ... //depot/projects/ia64/contrib/gcc.295/ChangeLog#3 delete ... //depot/projects/ia64/contrib/gcc.295/FREEBSD-Xlist#2 delete ... //depot/projects/ia64/contrib/gcc.295/FSFChangeLog#2 delete ... //depot/projects/ia64/contrib/gcc.295/INSTALL#2 delete ... //depot/projects/ia64/contrib/gcc.295/LANGUAGES#2 delete ... //depot/projects/ia64/contrib/gcc.295/Makefile.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/NEWS#3 delete ... //depot/projects/ia64/contrib/gcc.295/ONEWS#2 delete ... //depot/projects/ia64/contrib/gcc.295/PROBLEMS#2 delete ... //depot/projects/ia64/contrib/gcc.295/PROJECTS#2 delete ... //depot/projects/ia64/contrib/gcc.295/README#2 delete ... //depot/projects/ia64/contrib/gcc.295/README-bugs#2 delete ... //depot/projects/ia64/contrib/gcc.295/README-fixinc#2 delete ... //depot/projects/ia64/contrib/gcc.295/README.DWARF#2 delete ... //depot/projects/ia64/contrib/gcc.295/README.TRAD#2 delete ... //depot/projects/ia64/contrib/gcc.295/README.g77#2 delete ... //depot/projects/ia64/contrib/gcc.295/SERVICE#2 delete ... //depot/projects/ia64/contrib/gcc.295/TESTS.FLUNK#2 delete ... //depot/projects/ia64/contrib/gcc.295/acconfig.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/aclocal.m4#2 delete ... //depot/projects/ia64/contrib/gcc.295/alias.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/ansidecl.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/assert.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/basic-block.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/bitmap.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/bitmap.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/build-make#2 delete ... //depot/projects/ia64/contrib/gcc.295/c-aux-info.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/c-common.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/c-convert.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/c-decl.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/c-iterate.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/c-lang.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/c-lex.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/c-lex.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/c-parse.gperf#2 delete ... //depot/projects/ia64/contrib/gcc.295/c-parse.in#3 delete ... //depot/projects/ia64/contrib/gcc.295/c-pragma.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/c-pragma.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/c-tree.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/c-typeck.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/caller-save.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/calls.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cccp.1#2 delete ... //depot/projects/ia64/contrib/gcc.295/cccp.c#4 delete ... //depot/projects/ia64/contrib/gcc.295/cexp.y#2 delete ... //depot/projects/ia64/contrib/gcc.295/choose-temp.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/collect2.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/collect2.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/combine.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/conditions.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config.guess#2 delete ... //depot/projects/ia64/contrib/gcc.295/config.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/config.sub#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/README#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/alpha-interix.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/alpha.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/alpha.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/alpha.md#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/alpha32.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/config-nt.sed#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/crtbegin.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/crtend.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/elf.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/freebsd.h#3 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/lib1funcs.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/linux-ecoff.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/linux-elf.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/linux.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/netbsd-elf.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/netbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/openbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/osf.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/osf12.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/osf2or3.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/t-crtbe#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/t-ieee#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/t-interix#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/t-vms#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/va_list.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/vms-tramp.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/vms.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/vxworks.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/win-nt.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/x-alpha#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/xm-alpha-interix.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/xm-alpha.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/xm-freebsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/xm-openbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/xm-vms.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/alpha/xm-winnt.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/aoutos.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/dbx.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/dbxcoff.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/dbxelf.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/elfos.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/float-i128.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/float-i32.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/float-i386.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/float-i64.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/float-m68k.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/float-sh.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/float-vax.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/fp-bit.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/freebsd.h#3 delete ... //depot/projects/ia64/contrib/gcc.295/config/gnu.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/gofast.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/386bsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/aix386.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/aix386ng.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/att.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/bsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/bsd386.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/config-nt.sed#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/crtdll.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/cygwin.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/cygwin.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/dgux.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/dgux.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/djgpp-rtems.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/djgpp.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/freebsd-aout.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/freebsd.h#6 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/freebsd.h.fixed#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/gas.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/gmon-sol2.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/gnu.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/gstabs.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/i386-aout.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/i386-coff.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/i386-interix.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/i386.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/i386.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/i386.md#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/interix.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/isc.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/isccoff.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/iscdbx.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/linux-aout.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/linux-oldld.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/linux.h#3 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/lynx-ng.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/lynx.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/mach.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/mingw32.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/moss.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/netbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/next.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/openbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/os2.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/osf1-ci.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/osf1-cn.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/osf1elf.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/osf1elfgdb.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/osfelf.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/osfrose.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/perform.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/ptx4-i.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/rtems.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/rtemself.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sco.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sco4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sco4dbx.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sco5.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sco5gas.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/scodbx.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/seq-gas.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/seq-sysv3.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/seq2-sysv3.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sequent.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sol2-c1.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sol2-ci.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sol2-cn.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sol2-gc1.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sol2.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sol2gas.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sun.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sun386.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/svr3.ifile#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/svr3dbx.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/svr3gas.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/svr3z.ifile#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sysv3.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sysv4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/sysv5.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-crtpic#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-crtstuff#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-cygwin#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-dgux#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-djgpp#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-i386bare#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-interix#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-mingw32#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-next#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-osf#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-osf1elf#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-sco5#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-sco5gas#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-sol2#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-svr3dbx#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-udk#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-uwin#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-vsta#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/t-winnt#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/udk.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/unix.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/uwin.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/uwin.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/v3gas.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/vsta.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/vxi386.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/win-nt.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/win32.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/winnt.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-aix#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-cygwin#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-dgux#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-djgpp#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-isc#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-isc3#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-ncr3000#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-next#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-osf1elf#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-osfrose#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-sco#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-sco4#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-sco5#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-sysv3#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/x-vsta#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-aix.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-bsd386.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-cygwin.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-dgux.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-djgpp.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-dos.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-freebsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-gnu.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-i386-interix.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-i386.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-isc.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-linux.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-lynx.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-mingw32.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-next.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-openbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-os2.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-osf.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-osf1elf.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-sco.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-sco5.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-sun.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-sysv3.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-sysv4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-uwin.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-vsta.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/i386/xm-winnt.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/interix.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/libgloss.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/linux-aout.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/linux.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/lynx-ng.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/lynx.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/netbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/nextstep.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/nextstep.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/nextstep21.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/openbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/psos.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/ptx4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/aout.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/bsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/elf.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/gmon-sol2.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/hal.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/lb1spc.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/lb1spl.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/linux-aout.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/linux.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/linux64.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/lite.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/litecoff.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/lynx-ng.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/lynx.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/netbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/openbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/pbd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/rtems.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sol2-c1.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sol2-ci.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sol2-cn.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sol2-g1.asm#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sol2-sld-64.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sol2-sld.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sol2.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sp64-aout.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sp64-elf.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sparc.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sparc.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sparc.md#3 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/splet.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sun4gas.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sun4o3.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sunos4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/sysv4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/t-elf#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/t-halos#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/t-linux64#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/t-sol2#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/t-sol2-64#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/t-sp64#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/t-sparcbare#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/t-sparclite#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/t-splet#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/t-sunos40#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/t-sunos41#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/t-vxsparc#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/vxsim.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/vxsparc.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/x-sysv4#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/xm-linux.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/xm-lynx.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/xm-openbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/xm-pbd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/xm-sol2.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/xm-sp64.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/xm-sparc.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/xm-sysv4-64.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/sparc/xm-sysv4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/svr3.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/svr4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/t-freebsd#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/t-gnu#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/t-install-cpp#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/t-libc-ok#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/t-linux#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/t-linux-aout#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/t-linux-gnulibc1#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/t-netbsd#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/t-openbsd#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/t-openbsd-thread#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/t-rtems#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/t-svr4#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/tm-dwarf2.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/x-interix#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/x-linux#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/x-linux-aout#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/x-lynx#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/x-svr4#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/xm-alloca.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/xm-freebsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/xm-gnu.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/xm-interix.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/xm-linux.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/xm-lynx.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/xm-openbsd.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/xm-siglist.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/xm-std32.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/xm-svr3.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/config/xm-svr4.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/configure#2 delete ... //depot/projects/ia64/contrib/gcc.295/configure.frag#2 delete ... //depot/projects/ia64/contrib/gcc.295/configure.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/configure.lang#2 delete ... //depot/projects/ia64/contrib/gcc.295/convert.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/convert.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/ChangeLog#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/Make-lang.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/Makefile.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/NEWS#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/call.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/class.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/config-lang.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/cp-tree.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/cp-tree.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/cvt.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/decl.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/decl.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/decl2.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/errfn.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/error.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/except.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/exception.cc#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/expr.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/friend.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/g++.1#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/g++spec.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/cp/gxx.gperf#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/gxxint.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/inc/exception#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/inc/new#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/inc/new.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/inc/typeinfo#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/init.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/input.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/lang-options.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/lang-specs.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/lex.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/lex.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/method.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/mpw-config.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/mpw-make.sed#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/new.cc#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/new1.cc#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/new2.cc#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/parse.y#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/pt.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/ptree.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/repo.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/rtti.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/search.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/semantics.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/sig.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/spew.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/tinfo.cc#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/tinfo.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/tinfo2.cc#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/tree.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/typeck.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/typeck2.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cp/xref.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cplus-dem.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cpp.1#2 delete ... //depot/projects/ia64/contrib/gcc.295/cpp.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/cpp.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/cppalloc.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cpperror.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cppexp.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cppfiles.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cpphash.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cpphash.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/cppinit.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cpplib.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cpplib.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/cppmain.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cppspec.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cppulp.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/cross-make#2 delete ... //depot/projects/ia64/contrib/gcc.295/crtstuff.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/cse.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/cstamp-h.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/dbxout.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/dbxout.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/dbxstclass.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/defaults.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/demangle.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/doprint.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/doschk.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/dostage2#2 delete ... //depot/projects/ia64/contrib/gcc.295/dostage3#2 delete ... //depot/projects/ia64/contrib/gcc.295/dwarf.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/dwarf2.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/dwarf2out.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/dwarf2out.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/dwarfout.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/dwarfout.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/dyn-string.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/dyn-string.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/eh-common.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/emit-rtl.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/enquire.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/except.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/except.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/exgettext#2 delete ... //depot/projects/ia64/contrib/gcc.295/explow.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/expmed.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/expr.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/expr.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/extend.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/BUGS#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/ChangeLog#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/INSTALL#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/Make-lang.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/Makefile.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/NEWS#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/README#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/RELEASE-PREP#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/ansify.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/assert.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/bad.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/bad.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/bad.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/bit.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/bit.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/bld-op.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/bld.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/bld.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/bugs.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/bugs0.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/com-rt.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/com.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/com.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/config-lang.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/config.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/convert.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/data.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/data.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/equiv.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/equiv.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/expr.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/expr.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/ffe.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/fini.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/flags.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/g77.1#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/g77.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/g77install.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/g77spec.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/glimits.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/global.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/global.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/hconfig.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/implic.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/implic.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/info-b.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/info-k.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/info-w.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/info.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/info.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/input.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/intdoc.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/intdoc.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/intdoc.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/intrin.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/intrin.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/intrin.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/lab.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/lab.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/lang-options.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/lang-specs.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/lex.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/lex.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/malloc.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/malloc.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/name.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/name.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/news.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/news0.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/output.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/parse.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/proj.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/proj.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/root.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/rtl.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/src.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/src.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/st.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/st.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/sta.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/sta.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stb.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stb.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stc.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stc.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/std.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/std.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/ste.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/ste.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/storag.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/storag.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stp.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stp.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/str-1t.fin#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/str-2t.fin#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/str-fo.fin#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/str-io.fin#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/str-nq.fin#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/str-op.fin#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/str-ot.fin#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/str.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/str.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/sts.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/sts.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stt.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stt.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stu.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stu.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stv.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stv.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stw.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/stw.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/symbol.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/symbol.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/symbol.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/system.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/target.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/target.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/tconfig.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/tm.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/top.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/top.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/toplev.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/tree.j#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/type.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/type.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/version.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/f/version.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/where.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/f/where.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/final.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/fix-header.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/fixcpp#2 delete ... //depot/projects/ia64/contrib/gcc.295/fixinc-nt.sed#2 delete ... //depot/projects/ia64/contrib/gcc.295/fixincludes#2 delete ... //depot/projects/ia64/contrib/gcc.295/fixproto#2 delete ... //depot/projects/ia64/contrib/gcc.295/flags.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/floatlib.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/flow.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/fold-const.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/fp-test.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/frame.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/frame.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/function.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/function.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/future.options#2 delete ... //depot/projects/ia64/contrib/gcc.295/gansidecl.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/gbl-ctors.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/gcc.1#3 delete ... //depot/projects/ia64/contrib/gcc.295/gcc.c#4 delete ... //depot/projects/ia64/contrib/gcc.295/gcc.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/gccspec.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/gcov-io.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/gcov.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/gcov.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/gcse.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/gen-protos.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/genattr.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/genattrtab.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/gencheck.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/gencodes.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/genconfig.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/genemit.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/genextract.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/genflags.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/gengenrtl.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/genmultilib#2 delete ... //depot/projects/ia64/contrib/gcc.295/genopinit.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/genoutput.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/genpeep.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/genrecog.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/getopt.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/getopt.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/getopt1.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/getpwd.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/iso646.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/math-3300.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/math-68881.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/ppc-asm.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/proto.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/stdarg.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/stdbool.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/stddef.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-alpha.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-arc.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-c4x.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-clipper.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-h8300.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-i860.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-i960.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-m32r.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-m88k.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-mips.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-mn10200.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-mn10300.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-pa.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-ppc.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-pyr.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-sh.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-sparc.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-spur.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/va-v850.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/ginclude/varargs.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/glimits.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/global.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/gmon.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/graph.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/gstab.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/gsyms.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/gsyslimits.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/gthr-dce.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/gthr-posix.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/gthr-single.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/gthr-solaris.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/gthr-vxworks.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/gthr.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/haifa-sched.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/halfpic.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/halfpic.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/hard-reg-set.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/hash.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/hash.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/hwint.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/input.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/install.texi#3 delete ... //depot/projects/ia64/contrib/gcc.295/integrate.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/integrate.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/intl.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/intl.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/invoke.texi#3 delete ... //depot/projects/ia64/contrib/gcc.295/jump.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/just-fixinc#3 delete ... //depot/projects/ia64/contrib/gcc.295/lcm.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/libgcc1-test.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/libgcc1.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/libgcc2.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/libiberty.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/limitx.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/limity.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/listing#2 delete ... //depot/projects/ia64/contrib/gcc.295/local-alloc.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/longlong.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/loop.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/loop.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/machmode.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/machmode.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/makefile.vms#2 delete ... //depot/projects/ia64/contrib/gcc.295/mbchar.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/mbchar.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/md.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/mips-tdump.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/mips-tfile.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/move-if-change#2 delete ... //depot/projects/ia64/contrib/gcc.295/objc/Make-lang.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/objc/Makefile.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/objc/README#2 delete ... //depot/projects/ia64/contrib/gcc.295/objc/config-lang.in#2 delete ... //depot/projects/ia64/contrib/gcc.295/objc/lang-specs.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/objc/objc-act.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/objc/objc-act.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/objc/objc-tree.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/objc/objc.gperf#2 delete ... //depot/projects/ia64/contrib/gcc.295/obstack.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/obstack.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/optabs.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/output.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/patch-apollo-includes#2 delete ... //depot/projects/ia64/contrib/gcc.295/pcp.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/pexecute.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/prefix.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/prefix.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/print-rtl.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/print-tree.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/profile.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/protoize.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/pself.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/pself1.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/pself2.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/pself3.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/pself4.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/pself5.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/real.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/real.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/recog.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/recog.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/reg-stack.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/regclass.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/regmove.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/regs.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/reload.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/reload.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/reload1.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/reorg.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/resource.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/resource.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/rtl.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/rtl.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/rtl.h#3 delete ... //depot/projects/ia64/contrib/gcc.295/rtl.texi#2 delete ... //depot/projects/ia64/contrib/gcc.295/rtlanal.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/sbitmap.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/sbitmap.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/scan-decls.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/scan-types.sh#2 delete ... //depot/projects/ia64/contrib/gcc.295/scan.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/scan.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/sched.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/sdbout.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/sdbout.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/sort-protos#2 delete ... //depot/projects/ia64/contrib/gcc.295/splay-tree.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/splay-tree.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/stab.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/stack.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/stmt.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/stor-layout.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/stupid.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/sys-protos.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/sys-types.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/system.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/tlink.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/tm.texi#3 delete ... //depot/projects/ia64/contrib/gcc.295/toplev.c#4 delete ... //depot/projects/ia64/contrib/gcc.295/toplev.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/tree.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/tree.def#2 delete ... //depot/projects/ia64/contrib/gcc.295/tree.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/typeclass.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/unprotoize.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/unroll.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/varasm.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/varray.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/varray.h#2 delete ... //depot/projects/ia64/contrib/gcc.295/version.c#3 delete ... //depot/projects/ia64/contrib/gcc.295/xcoffout.c#2 delete ... //depot/projects/ia64/contrib/gcc.295/xcoffout.h#2 delete ... //depot/projects/ia64/contrib/groff/tmac/doc-common#3 integrate ... //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#3 integrate ... //depot/projects/ia64/contrib/libio.295/ChangeLog#2 delete ... //depot/projects/ia64/contrib/libio.295/FREEBSD-upgrade#2 delete ... //depot/projects/ia64/contrib/libio.295/Makefile.in#2 delete ... //depot/projects/ia64/contrib/libio.295/NEWS#2 delete ... //depot/projects/ia64/contrib/libio.295/PlotFile.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/PlotFile.h#2 delete ... //depot/projects/ia64/contrib/libio.295/README#2 delete ... //depot/projects/ia64/contrib/libio.295/SFile.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/SFile.h#2 delete ... //depot/projects/ia64/contrib/libio.295/builtinbuf.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/builtinbuf.h#2 delete ... //depot/projects/ia64/contrib/libio.295/cleanup.c#2 delete ... //depot/projects/ia64/contrib/libio.295/config.shared#2 delete ... //depot/projects/ia64/contrib/libio.295/config/hpux.mt#2 delete ... //depot/projects/ia64/contrib/libio.295/config/isc.mt#2 delete ... //depot/projects/ia64/contrib/libio.295/config/linux.mt#2 delete ... //depot/projects/ia64/contrib/libio.295/config/linuxaxp1-libc-lock.h#2 delete ... //depot/projects/ia64/contrib/libio.295/config/linuxaxp1-stdio-lock.h#2 delete ... //depot/projects/ia64/contrib/libio.295/config/linuxaxp1.mt#2 delete ... //depot/projects/ia64/contrib/libio.295/config/linuxlibc1.mt#2 delete ... //depot/projects/ia64/contrib/libio.295/config/mn10200.mt#2 delete ... //depot/projects/ia64/contrib/libio.295/config/mtsafe.mt#2 delete ... //depot/projects/ia64/contrib/libio.295/config/netware.mt#2 delete ... //depot/projects/ia64/contrib/libio.295/config/sco4.mt#2 delete ... //depot/projects/ia64/contrib/libio.295/configure.in#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/Makefile.in#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/README#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/altbytes#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/byteflip.c#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/case.c#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/case.h#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/configure.in#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/dbz.1#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/dbz.3z#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/dbz.c#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/dbz.h#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/dbzmain.c#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/fake.c#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/firstlast25#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/getmap#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/random.c#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/revbytes#2 delete ... //depot/projects/ia64/contrib/libio.295/dbz/stdio.h#2 delete ... //depot/projects/ia64/contrib/libio.295/depend#2 delete ... //depot/projects/ia64/contrib/libio.295/editbuf.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/editbuf.h#2 delete ... //depot/projects/ia64/contrib/libio.295/filebuf.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/filedoalloc.c#2 delete ... //depot/projects/ia64/contrib/libio.295/fileops.c#2 delete ... //depot/projects/ia64/contrib/libio.295/floatconv.c#2 delete ... //depot/projects/ia64/contrib/libio.295/floatio.h#2 delete ... //depot/projects/ia64/contrib/libio.295/fstream.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/fstream.h#2 delete ... //depot/projects/ia64/contrib/libio.295/gen-params#2 delete ... //depot/projects/ia64/contrib/libio.295/genops.c#2 delete ... //depot/projects/ia64/contrib/libio.295/include/empty.h#2 delete ... //depot/projects/ia64/contrib/libio.295/indstream.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/indstream.h#2 delete ... //depot/projects/ia64/contrib/libio.295/ioassign.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/ioextend.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/iofclose.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iofdopen.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iofeof.c#2 delete ... //depot/projects/ia64/contrib/libio.295/ioferror.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iofflush.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iofflush_u.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iofgetpos.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iofgets.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iofopen.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iofprintf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iofputs.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iofread.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iofscanf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iofsetpos.c#2 delete ... //depot/projects/ia64/contrib/libio.295/ioftell.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iofwrite.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iogetc.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iogetdelim.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iogetline.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iogets.c#2 delete ... //depot/projects/ia64/contrib/libio.295/ioignore.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iolibio.h#2 delete ... //depot/projects/ia64/contrib/libio.295/iomanip.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/iomanip.h#2 delete ... //depot/projects/ia64/contrib/libio.295/iopadn.c#2 delete ... //depot/projects/ia64/contrib/libio.295/ioperror.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iopopen.c#2 delete ... //depot/projects/ia64/contrib/libio.295/ioprims.c#2 delete ... //depot/projects/ia64/contrib/libio.295/ioprintf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/ioputc.c#2 delete ... //depot/projects/ia64/contrib/libio.295/ioputs.c#2 delete ... //depot/projects/ia64/contrib/libio.295/ioscanf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/ioseekoff.c#2 delete ... //depot/projects/ia64/contrib/libio.295/ioseekpos.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iosetbuffer.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iosetvbuf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iosprintf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iosscanf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iostdio.h#2 delete ... //depot/projects/ia64/contrib/libio.295/iostream.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/iostream.h#2 delete ... //depot/projects/ia64/contrib/libio.295/iostream.texi#2 delete ... //depot/projects/ia64/contrib/libio.295/iostreamP.h#2 delete ... //depot/projects/ia64/contrib/libio.295/iostrerror.c#2 delete ... //depot/projects/ia64/contrib/libio.295/ioungetc.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iovfprintf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iovfscanf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iovsprintf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/iovsscanf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/isgetline.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/isgetsb.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/isscan.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/istream.h#2 delete ... //depot/projects/ia64/contrib/libio.295/libio.h#2 delete ... //depot/projects/ia64/contrib/libio.295/libioP.h#2 delete ... //depot/projects/ia64/contrib/libio.295/osform.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/ostream.h#2 delete ... //depot/projects/ia64/contrib/libio.295/outfloat.c#2 delete ... //depot/projects/ia64/contrib/libio.295/parsestream.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/parsestream.h#2 delete ... //depot/projects/ia64/contrib/libio.295/peekc.c#2 delete ... //depot/projects/ia64/contrib/libio.295/pfstream.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/pfstream.h#2 delete ... //depot/projects/ia64/contrib/libio.295/procbuf.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/procbuf.h#2 delete ... //depot/projects/ia64/contrib/libio.295/sbform.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/sbgetline.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/sbscan.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/stdfiles.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/ChangeLog#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/Makefile.in#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/clearerr.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/clearerr_u.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/configure.in#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/fdopen.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/feof.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/feof_u.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/ferror.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/ferror_u.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/fgetc.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/fileno.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/fputc.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/fputc_u.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/freopen.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/fseek.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/getc.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/getc_u.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/getchar.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/getchar_u.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/getline.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/getw.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/obprintf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/popen.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/putc.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/putc_u.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/putchar.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/putchar_u.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/putw.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/rewind.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/setbuf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/setfileno.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/setlinebuf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/snprintf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/stdio.h#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/vasprintf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/vfprintf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/vfscanf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/vprintf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/vscanf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdio/vsnprintf.c#2 delete ... //depot/projects/ia64/contrib/libio.295/stdiostream.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/stdiostream.h#2 delete ... //depot/projects/ia64/contrib/libio.295/stdstrbufs.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/stdstreams.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/stream.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/stream.h#2 delete ... //depot/projects/ia64/contrib/libio.295/streambuf.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/streambuf.h#2 delete ... //depot/projects/ia64/contrib/libio.295/strfile.h#2 delete ... //depot/projects/ia64/contrib/libio.295/strops.c#2 delete ... //depot/projects/ia64/contrib/libio.295/strstream.cc#2 delete ... //depot/projects/ia64/contrib/libio.295/strstream.h#2 delete ... //depot/projects/ia64/contrib/libio.295/tests/ChangeLog#2 delete ... //depot/projects/ia64/contrib/libio.295/tests/Makefile.in#2 delete ... //depot/projects/ia64/contrib/libio.295/tests/configure.in#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 18 18:13:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D965037B403; Tue, 18 Jun 2002 18:13:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 19AB137B400 for ; Tue, 18 Jun 2002 18:13:18 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5J1DHH53692 for perforce@freebsd.org; Tue, 18 Jun 2002 18:13:17 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Tue, 18 Jun 2002 18:13:17 -0700 (PDT) Message-Id: <200206190113.g5J1DHH53692@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13129 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13129 Change 13129 by julian@julian_ref on 2002/06/18 18:12:51 working on cleaning up a twisty maze of little passages, no wait.. maybe it was a maze of twisty.... Affected files ... ... //depot/projects/kse/sys/kern/kern_switch.c#51 edit ... //depot/projects/kse/sys/kern/kern_thread.c#71 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_switch.c#51 (text+ko) ==== @@ -146,23 +146,31 @@ /* * Given a KSE (now surplus), either assign a new runable thread to it * (and put it in the run queue) or put it in the ksegrp's idle KSE list. + * Assumes the kse is not linked to any threads any more. (has been cleaned). */ void kse_reassign(struct kse *ke) { - struct ksegrp *kg = ke->ke_ksegrp; + struct ksegrp *kg; struct thread *td; - struct proc *p; + + kg = ke->ke_ksegrp; - ke->ke_state = KES_IDLE; /* temp state */ + /* + * Find the first unassigned thread + * If there is a 'last assigned' then see what's next. + * otherwise look at what is first. + */ if ((td = kg->kg_last_assigned)) { - /* If there is a 'last assigned' then see what's next. */ td = TAILQ_NEXT(td, td_runq); } else { td = TAILQ_FIRST(&kg->kg_runq); } + + /* + * If we found one assign it the kse, otherwise idle the kse. + */ if (td) { - p = ke->ke_proc; kg->kg_last_assigned = td; td->td_kse = ke; ke->ke_thread = td; ==== //depot/projects/kse/sys/kern/kern_thread.c#71 (text+ko) ==== @@ -174,56 +174,6 @@ } /* - * Unlink thread from its process, and reassign its KSE to another thread. - */ -static void -thread_unlink(struct thread *td) -{ - struct proc *p; - struct ksegrp *kg; - struct kse *ke; - - p = td->td_proc; - kg = td->td_ksegrp; - ke = td->td_kse; - - /* Reassign this thread's KSE. */ - if (ke != NULL) { - ke->ke_thread = NULL; - td->td_kse = NULL; - ke->ke_state = KES_UNQUEUED; - kse_reassign(ke); - } - - /* Unlink this thread from its proc. */ - if (p != NULL) { - TAILQ_REMOVE(&p->p_threads, td, td_plist); - if (kg != NULL) - TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); - p->p_numthreads--; -#if 0 - if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { - if (p->p_numthreads == ((p->p_flag & P_SINGLE_EXIT) ? - 1 : p->p_suspcount)) { - TAILQ_REMOVE(&p->p_suspended, - p->p_singlethread, td_runq); - setrunqueue(p->p_singlethread); - p->suspcount--; - } - } -#else - thread_unsuspend(p); /* see if it is there yet */ -#endif - } - if (kg != NULL) - kg->kg_numthreads--; - td->td_state = TDS_SURPLUS; - td->td_proc = NULL; - td->td_ksegrp = NULL; - td->td_last_kse = NULL; -} - -/* * Initialize global thread allocation resources. */ void @@ -343,10 +293,14 @@ struct thread *td; struct kse *ke; struct proc *p; + struct ksegrp *kg; td = curthread; + kg = td->td_ksegrp; p = td->td_proc; ke = td->td_kse; + + mtx_assert(&sched_lock, MA_OWNED); PROC_LOCK_ASSERT(p, MA_OWNED); CTR1(KTR_PROC, "thread_exit: thread %p", td); KASSERT(!mtx_owned(&Giant), ("dying thread owns giant")); @@ -356,7 +310,43 @@ ke->ke_tdspare = NULL; } cpu_thread_exit(td); /* XXXSMP */ - thread_unlink(td); /* Remember that this reassigns the KSE */ + + /* Reassign this thread's KSE. */ + if (ke != NULL) { + ke->ke_thread = NULL; + td->td_kse = NULL; + ke->ke_state = KES_UNQUEUED; + kse_reassign(ke); + } + + /* Unlink this thread from its proc. and the kseg */ + if (p != NULL) { + TAILQ_REMOVE(&p->p_threads, td, td_plist); + p->p_numthreads--; + if (kg != NULL) { + TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); + kg->kg_numthreads--; + } +#if 0 + if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { + if (p->p_numthreads == ((p->p_flag & P_SINGLE_EXIT) ? + 1 : p->p_suspcount)) { + TAILQ_REMOVE(&p->p_suspended, + p->p_singlethread, td_runq); + setrunqueue(p->p_singlethread); + p->suspcount--; + } + } +#else + thread_unsuspend(p); /* see if it is there yet */ +#endif + } + if (kg != NULL) + kg->kg_numthreads--; + td->td_state = TDS_SURPLUS; + td->td_proc = NULL; + td->td_ksegrp = NULL; + td->td_last_kse = NULL; ke->ke_tdspare = td; PROC_UNLOCK(p); cpu_throw(); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 18 23:13:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF12D37B409; Tue, 18 Jun 2002 23:13:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2DC2137B403 for ; Tue, 18 Jun 2002 23:13:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5J6DMD03368 for perforce@freebsd.org; Tue, 18 Jun 2002 23:13:22 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Tue, 18 Jun 2002 23:13:22 -0700 (PDT) Message-Id: <200206190613.g5J6DMD03368@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13135 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13135 Change 13135 by julian@julian_jules1 on 2002/06/18 23:13:11 More cleaning up of thread suspension code. Affected files ... ... //depot/projects/kse/sys/kern/kern_exit.c#55 edit ... //depot/projects/kse/sys/kern/kern_fork.c#71 edit ... //depot/projects/kse/sys/sys/proc.h#111 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_exit.c#55 (text+ko) ==== @@ -148,9 +148,8 @@ PROC_LOCK(p); if (p->p_flag & P_KSES) { /* - * First kill off the other threads. This requires - * Some co-operation from other parts of the kernel - * so it may not be instant. + * First check if some other thread got here before us.. + * if so, act apropriatly, (exit or suspend); */ thread_suspend_check(0); /* @@ -164,15 +163,33 @@ * (or even an exit(2) from the UTS). */ td->td_flags |= TDF_UNBOUND; + + /* + * Kill off the other threads. This requires + * Some co-operation from other parts of the kernel + * so it may not be instant. + * With this state set: + * Any thread entering the kernel from userspace will + * thread_exit() in trap(). Any thread attempting to + * sleep will return immediatly + * with EINTR or EWOULDBLOCK, which will hopefully force them + * to back out to userland, freeing resources as they go, and + * anything attempting to return to userland will thread_exit() + * from userret(). thread_exit() will unsuspend us + * when the last other thread exits. + */ if (thread_single(SNGLE_EXIT)) { - /* This can't happen.. maybe it can XXXKSE */ panic ("Exit: Single threading fouled up"); } - /* All other activity in this process is now stopped. */ - /* Remove excess KSEs and KSEGRPS. */ - /* ... */ - /* Turn off threading support. */ + /* + * All other activity in this process is now stopped. + * Remove excess KSEs and KSEGRPS. XXXKSE (when we have them) + * ... + * Turn off threading support. + */ p->p_flag &= ~P_KSES; + td->td_flags &= ~TDF_UNBOUND; + thread_single_end(); /* Don't need this any more. */ } /* * With this state set: ==== //depot/projects/kse/sys/kern/kern_fork.c#71 (text+ko) ==== @@ -289,7 +289,7 @@ * be aborted in the child. */ PROC_LOCK(p1); - if (thread_single(SNGLE_WAIT)) { + if (thread_single(SNGLE_NO_EXIT)) { /* Abort.. someone else is single threading before us */ PROC_UNLOCK(p1); return (ERESTART); ==== //depot/projects/kse/sys/sys/proc.h#111 (text+ko) ==== @@ -828,7 +828,7 @@ void thread_reap(void); struct thread *thread_schedule_upcall(struct thread *td, struct kse *ke); int thread_single(int how); -#define SNGLE_WAIT 0 /* values for 'how' */ +#define SNGLE_NO_EXIT 0 /* values for 'how' */ #define SNGLE_EXIT 1 void thread_single_end(void); void thread_stash(struct thread *td); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 18 23:21:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5665E37B405; Tue, 18 Jun 2002 23:21:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8200C37B400 for ; Tue, 18 Jun 2002 23:21:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5J6LXi04319 for perforce@freebsd.org; Tue, 18 Jun 2002 23:21:33 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Tue, 18 Jun 2002 23:21:33 -0700 (PDT) Message-Id: <200206190621.g5J6LXi04319@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13136 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13136 Change 13136 by julian@julian_jules1 on 2002/06/18 23:20:34 hey I forgot to check this out.. thus it wasn't checked in.. DOH! Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#72 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#72 (text+ko) ==== @@ -327,22 +327,20 @@ TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); kg->kg_numthreads--; } -#if 0 + /* + * The test below is NOT true if we are the + * sole exiting thread. P_STOPPED_SNGL is unset + * in exit1() after it is the only survivor. + */ if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { - if (p->p_numthreads == ((p->p_flag & P_SINGLE_EXIT) ? - 1 : p->p_suspcount)) { + if (p->p_numthreads == p->p_suspcount) { TAILQ_REMOVE(&p->p_suspended, p->p_singlethread, td_runq); setrunqueue(p->p_singlethread); p->suspcount--; } } -#else - thread_unsuspend(p); /* see if it is there yet */ -#endif } - if (kg != NULL) - kg->kg_numthreads--; td->td_state = TDS_SURPLUS; td->td_proc = NULL; td->td_ksegrp = NULL; @@ -426,7 +424,7 @@ * any sleeping threads that are interruptable. (PCATCH). */ int -thread_single(int how) +thread_single(int force_exit) { struct thread *td; struct thread *td2; @@ -447,20 +445,19 @@ return (1); } - if (how == SNGLE_WAIT) + if (force_exit == SNGLE_EXIT) + p->p_flag |= P_SINGLE_EXIT; + else p->p_flag &= ~P_SINGLE_EXIT; - else - p->p_flag |= P_SINGLE_EXIT; p->p_flag |= P_STOPPED_SNGL; p->p_singlethread = td; - while (p->p_numthreads != - ((how == SNGLE_WAIT) ? (p->p_suspcount + 1) : 1 )) { + while ((p->p_numthreads - p->p_suspcount) != 1) { FOREACH_THREAD_IN_PROC(p, td2) { if (td2 == td) continue; switch(td2->td_state) { case TDS_SUSPENDED: - if (how != SNGLE_WAIT) { + if (force_exit == SNGLE_EXIT) { TAILQ_REMOVE(&p->p_suspended, td, td_runq); setrunqueue(td); /* Should suicide. */ @@ -504,20 +501,38 @@ /* * Called in from locations that can safely check to see * whether we have to suspend or at least throttle for a - * single-thread event (e.g. fork), - * Such locations include userret(). The thread must be able to - * return 0 (caller may continue), or 1 (caller must abort). - * The 'how' argument tells the function if it may do a thread_exit() - * or suspend, or whether the caller must abort and back out instead. + * single-thread event (e.g. fork). + * + * Such locations include userret(). + * If the "return_instead" argument is non zero, the thread must be able to + * accept 0 (caller may continue), or 1 (caller must abort) as a result. + * + * The 'return_instead' argument tells the function if it may do a + * thread_exit() or suspend, or whether the caller must abort and back + * out instead. + * + * If the thread that set the single_threading request has set the + * P_SINGLE_EXIT bit in the process flags then this call will never return + * if 'return_instead' is false, but will exit. + * + * P_SINGLE_EXIT | return_instead == 0| return_instead != 0 + *---------------+--------------------+--------------------- + * 0 | returns 0 | returns 0 or 1 + * | when ST ends | immediatly + *---------------+--------------------+--------------------- + * 1 | thread exits | returns 1 + * | | immediatly * 0 = thread_exit() or suspension ok, * other = return error instead of stopping the thread. * * While a full suspension is under effect, even a single threading - * thread will be suspended. (if that makes sense). It may not even - * be possible, but best to define the semantics of what it would mean. + * thread would be suspended if it made this call (but it shouldn't). + * This call should only be made from places where + * thread_exit() would be safe as that may be the outcome unless + * return_instead is set. */ int -thread_suspend_check(int how) +thread_suspend_check(int return_instead) { struct thread *td = curthread; struct proc *p = td->td_proc; @@ -526,12 +541,10 @@ p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); while (P_SHOULDSTOP(p)) { - if (how && (td != p->p_singlethread)) { - return (1); - } if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { KASSERT(p->p_singlethread != NULL, ("singlethread not set")); + /* * The only suspension in action is * a single-threading. Treat it ever @@ -539,36 +552,27 @@ * in a special situation. */ if (p->p_singlethread == td) { - break; /* Exempt from stopping. */ + return (0); /* Exempt from stopping. */ } - /* - * We are called from somewhere that doesn't want - * us to sleep or exit, but to return an error - * instead. - */ - if (how) { - return (1); - } - /* - * If the process is waiting for us to exit, - * this thread should just suicide. - */ - if (p->p_flag & P_SINGLE_EXIT) { - mtx_lock_spin(&sched_lock); - while (mtx_owned(&Giant)) - mtx_unlock(&Giant); - thread_exit(); - } - /* - * Just an optimised version of thread_unsuspend(). - */ - if (p->p_numthreads == (p->p_suspcount + 1)) { - TAILQ_REMOVE(&p->p_suspended, - p->p_singlethread, td_runq); - p->p_suspcount--; - setrunqueue(p->p_singlethread); - } + + } + + if (return_instead) { + return (1); + } + + /* + * If the process is waiting for us to exit, + * this thread should just suicide. + * Assumes that P_SINGLE_EXIT implies P_STOPPED_SNGL. + */ + if ((p->p_flag & P_SINGLE_EXIT) && (p->p_singlethread != td) { + mtx_lock_spin(&sched_lock); + while (mtx_owned(&Giant)) + mtx_unlock(&Giant); + thread_exit(); } + /* * When a thread suspends, it just * moves to the processes's suspend queue @@ -606,6 +610,7 @@ if (!P_SHOULDSTOP(p)) { while (( td = TAILQ_FIRST(&p->p_suspended))) { TAILQ_REMOVE(&p->p_suspended, td, td_runq); + p->p_suspcount--; setrunqueue(td); } } else if ((P_SHOULDSTOP(p) == P_STOPPED_SNGL) && To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 18 23:54:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B1DA37B405; Tue, 18 Jun 2002 23:54:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7DBC137B40D for ; Tue, 18 Jun 2002 23:54:15 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5J6sFZ08276 for perforce@freebsd.org; Tue, 18 Jun 2002 23:54:15 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Tue, 18 Jun 2002 23:54:15 -0700 (PDT) Message-Id: <200206190654.g5J6sFZ08276@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13139 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13139 Change 13139 by julian@julian_jules1 on 2002/06/18 23:53:49 typos Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#73 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#73 (text+ko) ==== @@ -337,7 +337,7 @@ TAILQ_REMOVE(&p->p_suspended, p->p_singlethread, td_runq); setrunqueue(p->p_singlethread); - p->suspcount--; + p->p_suspcount--; } } } @@ -566,7 +566,7 @@ * this thread should just suicide. * Assumes that P_SINGLE_EXIT implies P_STOPPED_SNGL. */ - if ((p->p_flag & P_SINGLE_EXIT) && (p->p_singlethread != td) { + if ((p->p_flag & P_SINGLE_EXIT) && (p->p_singlethread != td)) { mtx_lock_spin(&sched_lock); while (mtx_owned(&Giant)) mtx_unlock(&Giant); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 18 23:54:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D55937B40B; Tue, 18 Jun 2002 23:54:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3664C37B40C for ; Tue, 18 Jun 2002 23:54:15 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5J6sE308271 for perforce@freebsd.org; Tue, 18 Jun 2002 23:54:14 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 18 Jun 2002 23:54:14 -0700 (PDT) Message-Id: <200206190654.g5J6sE308271@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13138 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13138 Change 13138 by peter@peter_ia64 on 2002/06/18 23:53:23 Use the canonical uarea management. (cut/pasted from sparc64) We dont need the contigmalloc slowdown for this - that was needed for the kernel stack only. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#22 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#22 (text+ko) ==== @@ -713,26 +713,55 @@ void pmap_new_proc(struct proc *p) { - struct user *up; + vm_page_t ma[UAREA_PAGES]; + vm_object_t upobj; + vm_offset_t up; + vm_page_t m; + u_int i; + + /* + * Allocate object for the upages. + */ + upobj = p->p_upages_obj; + if (upobj == NULL) { + upobj = vm_object_allocate(OBJT_DEFAULT, UAREA_PAGES); + p->p_upages_obj = upobj; + } /* - * Use contigmalloc for user area so that we can use a region - * 7 address for it which makes it impossible to accidentally - * lose when recording a trapframe. + * Get a kernel virtual address for the U area for this process. */ - up = contigmalloc(UAREA_PAGES * PAGE_SIZE, M_PMAP, - M_WAITOK, - 0ul, - 256*1024*1024 - 1, - PAGE_SIZE, - 256*1024*1024); + up = (vm_offset_t)p->p_uarea; + if (up == 0) { + up = kmem_alloc_nofault(kernel_map, UAREA_PAGES * PAGE_SIZE); + if (up == 0) + panic("pmap_new_proc: upage allocation failed"); + p->p_uarea = (struct user *)up; + } + + for (i = 0; i < UAREA_PAGES; i++) { + /* + * Get a uarea page. + */ + m = vm_page_grab(upobj, i, VM_ALLOC_NORMAL | VM_ALLOC_RETRY); + ma[i] = m; + + /* + * Wire the page. + */ + m->wire_count++; + cnt.v_wire_count++; + + vm_page_wakeup(m); + vm_page_flag_clear(m, PG_ZERO); + vm_page_flag_set(m, PG_MAPPED | PG_WRITEABLE); + m->valid = VM_PAGE_BITS_ALL; + } - if (up == NULL) - panic("pmap_new_proc: could not contigmalloc %d pages\n", - UAREA_PAGES); - p->p_md.md_uservirt = up; - p->p_uarea = (struct user *) - IA64_PHYS_TO_RR7(ia64_tpa((u_int64_t) up)); + /* + * Enter the pages into the kernel address space. + */ + pmap_qenter(up, ma, UAREA_PAGES); } /* @@ -742,9 +771,32 @@ void pmap_dispose_proc(struct proc *p) { - contigfree(p->p_md.md_uservirt, UAREA_PAGES * PAGE_SIZE, M_PMAP); - p->p_md.md_uservirt = 0; - p->p_uarea = 0; + vm_object_t upobj; + vm_offset_t up; + vm_page_t m; + int i; + + upobj = p->p_upages_obj; + up = (vm_offset_t)p->p_uarea; + for (i = 0; i < UAREA_PAGES; i++) { + m = vm_page_lookup(upobj, i); + if (m == NULL) + panic("pmap_dispose_proc: upage already missing?"); + vm_page_busy(m); + vm_page_unwire(m, 0); + vm_page_free(m); + } + pmap_qremove(up, UAREA_PAGES); + + /* + * If the process got swapped out some of its UPAGES might have gotten + * swapped. Just get rid of the object to clean up the swap use + * proactively. NOTE! might block waiting for paging I/O to complete. + */ + if (upobj->type == OBJT_SWAP) { + p->p_upages_obj = NULL; + vm_object_deallocate(upobj); + } } /* @@ -753,6 +805,21 @@ void pmap_swapout_proc(struct proc *p) { + vm_object_t upobj; + vm_offset_t up; + vm_page_t m; + int i; + + upobj = p->p_upages_obj; + up = (vm_offset_t)p->p_uarea; + for (i = 0; i < UAREA_PAGES; i++) { + m = vm_page_lookup(upobj, i); + if (m == NULL) + panic("pmap_swapout_proc: upage already missing?"); + vm_page_dirty(m); + vm_page_unwire(m, 0); + } + pmap_qremove(up, UAREA_PAGES); } /* @@ -761,6 +828,30 @@ void pmap_swapin_proc(struct proc *p) { + vm_page_t ma[UAREA_PAGES]; + vm_object_t upobj; + vm_offset_t up; + vm_page_t m; + int rv; + int i; + + upobj = p->p_upages_obj; + up = (vm_offset_t)p->p_uarea; + for (i = 0; i < UAREA_PAGES; i++) { + m = vm_page_grab(upobj, i, VM_ALLOC_NORMAL | VM_ALLOC_RETRY); + if (m->valid != VM_PAGE_BITS_ALL) { + rv = vm_pager_get_pages(upobj, &m, 1, 0); + if (rv != VM_PAGER_OK) + panic("pmap_swapin_proc: cannot get upage"); + m = vm_page_lookup(upobj, i); + m->valid = VM_PAGE_BITS_ALL; + } + ma[i] = m; + vm_page_wire(m); + vm_page_wakeup(m); + vm_page_flag_set(m, PG_MAPPED | PG_WRITEABLE); + } + pmap_qenter(up, ma, UAREA_PAGES); } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 18 23:55:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A5F237B40E; Tue, 18 Jun 2002 23:55:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1B32537B413 for ; Tue, 18 Jun 2002 23:55:17 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5J6tGJ08537 for perforce@freebsd.org; Tue, 18 Jun 2002 23:55:16 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 18 Jun 2002 23:55:16 -0700 (PDT) Message-Id: <200206190655.g5J6tGJ08537@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13140 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13140 Change 13140 by peter@peter_ia64 on 2002/06/18 23:54:16 Catch up with kern/syscalls.master (Oh boy, this is going to get old FAST!) Affected files ... ... //depot/projects/ia64/sys/ia64/ia32/syscalls.master#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia32/syscalls.master#3 (text+ko) ==== @@ -480,7 +480,7 @@ struct sigaction32 *act, \ struct sigaction32 *oact); } 343 MNOPROTO POSIX { int sigpending(sigset_t *set); } -344 NOPROTO BSD { int sigreturn(const struct __ucontext *sigcntxp); } +344 MNOPROTO BSD { int sigreturn(const struct __ucontext *sigcntxp); } 345 UNIMPL NOHIDE sigtimedwait 346 UNIMPL NOHIDE sigwaitinfo 347 MNOPROTO BSD { int __acl_get_file(const char *path, \ @@ -517,13 +517,13 @@ const struct kevent *changelist, int nchanges, \ struct kevent *eventlist, int nevents, \ const struct timespec *timeout); } -364 NOPROTO BSD { int __cap_get_proc(struct cap *cap_p); } -365 NOPROTO BSD { int __cap_set_proc(struct cap *cap_p); } -366 NOPROTO BSD { int __cap_get_fd(int fd, struct cap *cap_p); } -367 NOPROTO BSD { int __cap_get_file(const char *path_p, struct cap *cap_p); } -368 NOPROTO BSD { int __cap_set_fd(int fd, struct cap *cap_p); } -369 NOPROTO BSD { int __cap_set_file(const char *path_p, struct cap *cap_p); } -370 UNIMPL NOHIDE +364 UNIMPL NOHIDE __cap_get_proc +365 UNIMPL NOHIDE __cap_set_proc +366 UNIMPL NOHIDE __cap_get_fd +367 UNIMPL NOHIDE __cap_get_file +368 UNIMPL NOHIDE __cap_set_fd +369 UNIMPL NOHIDE __cap_set_file +370 UNIMPL NOHIDE lkmressys 371 NOPROTO BSD { int extattr_set_fd(int fd, int attrnamespace, \ const char *attrname, void *data, \ size_t nbytes); } @@ -549,3 +549,7 @@ 387 UNIMPL BSD __mac_get_file 388 UNIMPL BSD __mac_set_fd 389 UNIMPL BSD __mac_set_file +390 NOPROTO BSD { int kenv(int what, const char *name, char *value, \ + int len); } +391 NOPROTO BSD { int lchflags(const char *path, int flags); } +392 NOPROTO BSD { int uuidgen(struct uuid *store, int count); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 18 23:56:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7885D37B40D; Tue, 18 Jun 2002 23:56:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C136437B40B for ; Tue, 18 Jun 2002 23:56:18 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5J6uIx08784 for perforce@freebsd.org; Tue, 18 Jun 2002 23:56:18 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 18 Jun 2002 23:56:18 -0700 (PDT) Message-Id: <200206190656.g5J6uIx08784@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13141 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13141 Change 13141 by peter@peter_ia64 on 2002/06/18 23:56:03 Pass the real PS_STRINGS in %ebx for x86. Affected files ... ... //depot/projects/ia64/sys/ia64/ia32/ia32_sysvec.c#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia32/ia32_sysvec.c#3 (text+ko) ==== @@ -354,7 +354,7 @@ ia64_set_eflag(PSL_USER); /* PS_STRINGS value for BSD/OS binaries. It is 0 for non-BSD/OS. */ - frame->tf_r[FRAME_R11] = ps_strings; + frame->tf_r[FRAME_R11] = IA32_PS_STRINGS; /* * XXX - Linux emulator To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 18 23:57:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C54C537B410; Tue, 18 Jun 2002 23:57:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 80AFE37B40B for ; Tue, 18 Jun 2002 23:57:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5J6vKq09024 for perforce@freebsd.org; Tue, 18 Jun 2002 23:57:20 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Tue, 18 Jun 2002 23:57:20 -0700 (PDT) Message-Id: <200206190657.g5J6vKq09024@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13142 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13142 Change 13142 by peter@peter_ia64 on 2002/06/18 23:56:31 Regenerate Affected files ... ... //depot/projects/ia64/sys/ia64/ia32/ia32_syscall.h#3 edit ... //depot/projects/ia64/sys/ia64/ia32/ia32_sysent.c#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia32/ia32_syscall.h#3 (text+ko) ==== @@ -271,12 +271,6 @@ #define IA32_SYS_getresgid 361 #define IA32_SYS_kqueue 362 #define IA32_SYS_kevent 363 -#define IA32_SYS___cap_get_proc 364 -#define IA32_SYS___cap_set_proc 365 -#define IA32_SYS___cap_get_fd 366 -#define IA32_SYS___cap_get_file 367 -#define IA32_SYS___cap_set_fd 368 -#define IA32_SYS___cap_set_file 369 #define IA32_SYS_extattr_set_fd 371 #define IA32_SYS_extattr_get_fd 372 #define IA32_SYS_extattr_delete_fd 373 @@ -288,4 +282,7 @@ #define IA32_SYS_kse_new 381 #define IA32_SYS_thread_wakeup 382 #define IA32_SYS_kse_yield 383 -#define IA32_SYS_MAXSYSCALL 390 +#define IA32_SYS_kenv 390 +#define IA32_SYS_lchflags 391 +#define IA32_SYS_uuidgen 392 +#define IA32_SYS_MAXSYSCALL 393 ==== //depot/projects/ia64/sys/ia64/ia32/ia32_sysent.c#3 (text+ko) ==== @@ -361,7 +361,7 @@ { SYF_MPSAFE | AS(sigsuspend_args), (sy_call_t *)sigsuspend }, /* 341 = sigsuspend */ { AS(ia32_sigaction_args), (sy_call_t *)ia32_sigaction }, /* 342 = ia32_sigaction */ { SYF_MPSAFE | AS(sigpending_args), (sy_call_t *)sigpending }, /* 343 = sigpending */ - { AS(sigreturn_args), (sy_call_t *)sigreturn }, /* 344 = sigreturn */ + { SYF_MPSAFE | AS(sigreturn_args), (sy_call_t *)sigreturn }, /* 344 = sigreturn */ { 0, (sy_call_t *)nosys }, /* 345 = sigtimedwait */ { 0, (sy_call_t *)nosys }, /* 346 = sigwaitinfo */ { SYF_MPSAFE | AS(__acl_get_file_args), (sy_call_t *)__acl_get_file }, /* 347 = __acl_get_file */ @@ -381,13 +381,13 @@ { SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid }, /* 361 = getresgid */ { SYF_MPSAFE | 0, (sy_call_t *)kqueue }, /* 362 = kqueue */ { SYF_MPSAFE | AS(kevent_args), (sy_call_t *)kevent }, /* 363 = kevent */ - { AS(__cap_get_proc_args), (sy_call_t *)__cap_get_proc }, /* 364 = __cap_get_proc */ - { AS(__cap_set_proc_args), (sy_call_t *)__cap_set_proc }, /* 365 = __cap_set_proc */ - { AS(__cap_get_fd_args), (sy_call_t *)__cap_get_fd }, /* 366 = __cap_get_fd */ - { AS(__cap_get_file_args), (sy_call_t *)__cap_get_file }, /* 367 = __cap_get_file */ - { AS(__cap_set_fd_args), (sy_call_t *)__cap_set_fd }, /* 368 = __cap_set_fd */ - { AS(__cap_set_file_args), (sy_call_t *)__cap_set_file }, /* 369 = __cap_set_file */ - { 0, (sy_call_t *)nosys }, /* 370 = */ + { 0, (sy_call_t *)nosys }, /* 364 = __cap_get_proc */ + { 0, (sy_call_t *)nosys }, /* 365 = __cap_set_proc */ + { 0, (sy_call_t *)nosys }, /* 366 = __cap_get_fd */ + { 0, (sy_call_t *)nosys }, /* 367 = __cap_get_file */ + { 0, (sy_call_t *)nosys }, /* 368 = __cap_set_fd */ + { 0, (sy_call_t *)nosys }, /* 369 = __cap_set_file */ + { 0, (sy_call_t *)nosys }, /* 370 = lkmressys */ { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd }, /* 371 = extattr_set_fd */ { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd }, /* 372 = extattr_get_fd */ { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd }, /* 373 = extattr_delete_fd */ @@ -407,4 +407,7 @@ { 0, (sy_call_t *)nosys }, /* 387 = __mac_get_file */ { 0, (sy_call_t *)nosys }, /* 388 = __mac_set_fd */ { 0, (sy_call_t *)nosys }, /* 389 = __mac_set_file */ + { AS(kenv_args), (sy_call_t *)kenv }, /* 390 = kenv */ + { AS(lchflags_args), (sy_call_t *)lchflags }, /* 391 = lchflags */ + { AS(uuidgen_args), (sy_call_t *)uuidgen }, /* 392 = uuidgen */ }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 0: 0:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFE3337B406; Wed, 19 Jun 2002 00:00:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9ADDA37B40E for ; Wed, 19 Jun 2002 00:00:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5J70O209509 for perforce@freebsd.org; Wed, 19 Jun 2002 00:00:24 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 19 Jun 2002 00:00:24 -0700 (PDT) Message-Id: <200206190700.g5J70O209509@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13143 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13143 Change 13143 by peter@peter_ia64 on 2002/06/19 00:00:08 Do not pass 4K page offsets into VM. This causes the pmap_protect: unaligned addresses panics. XXX This is inadequate. We need to raise permissions here, not change them according to rounding. However, it seems to work because we load data after text, which raises the last parts to read/write. (MAP_PRIVATE makes this harmless) Affected files ... ... //depot/projects/ia64/sys/kern/imgact_elf.c#8 edit Differences ... ==== //depot/projects/ia64/sys/kern/imgact_elf.c#8 (text+ko) ==== @@ -414,10 +414,11 @@ } /* - * set it to the specified protection + * set it to the specified protection. + * XXX had better undo the damage from pasting over the cracks here! */ - vm_map_protect(&vmspace->vm_map, map_addr, map_addr + map_len, prot, - FALSE); + vm_map_protect(&vmspace->vm_map, trunc_page(map_addr), + round_page(map_addr + map_len), prot, FALSE); return error; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 0: 1: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D27937B404; Wed, 19 Jun 2002 00:00:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CFA8C37B411 for ; Wed, 19 Jun 2002 00:00:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5J70OO09514 for perforce@freebsd.org; Wed, 19 Jun 2002 00:00:24 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 19 Jun 2002 00:00:24 -0700 (PDT) Message-Id: <200206190700.g5J70OO09514@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13144 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13144 Change 13144 by julian@julian_jules1 on 2002/06/19 00:00:10 Debug stuff Affected files ... ... //depot/projects/kse/sys/kern/subr_trap.c#68 edit Differences ... ==== //depot/projects/kse/sys/kern/subr_trap.c#68 (text+ko) ==== @@ -230,10 +230,12 @@ error = suword((caddr_t)td->td_kse->ke_mailbox + offsetof(struct kse_mailbox, kmbx_current_thread), 0); +#if 0 #ifdef __i386__ -printf("suword mailbox to 0 error: %d, frame= %p, eip=%p, esp=%p\n", error, +printf("suword mailbox to 0 error: %d, frame= %p, eip=%d, esp=%d\n", error, frame, frame->tf_eip, frame->tf_esp); #endif +#endif } /* * Stop any chance that we may be separated from To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 0: 3:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0475237B40F; Wed, 19 Jun 2002 00:03:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D08CF37B40E for ; Wed, 19 Jun 2002 00:03:28 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5J73S510534 for perforce@freebsd.org; Wed, 19 Jun 2002 00:03:28 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 19 Jun 2002 00:03:28 -0700 (PDT) Message-Id: <200206190703.g5J73S510534@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13145 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13145 Change 13145 by peter@peter_ia64 on 2002/06/19 00:02:56 Fix up the mess that was made of the arguments being passed to the elf executable. This makes dynamic binaries work again, and stops static binaries sometimes being unable to find their args and environment. I do not know why this suddenly broke, but it broke completely for me at the last integ. It was always broken though. The fix was to use target-specific types for the stack size so that we didn't decrement the stack by 64 bits on the 32 bit elf targets and didn't space the ELF AT_* args by 64 bits as well. Affected files ... ... //depot/projects/ia64/sys/kern/imgact_elf.c#9 edit Differences ... ==== //depot/projects/ia64/sys/kern/imgact_elf.c#9 (text+ko) ==== @@ -832,17 +832,21 @@ #if __ELF_WORD_SIZE == 32 #define suword suword32 +#define stacktype u_int32_t #else #define suword suword64 +#define stacktype u_int64_t #endif int __elfN(freebsd_fixup)(register_t **stack_base, struct image_params *imgp) { Elf_Auxargs *args = (Elf_Auxargs *)imgp->auxargs; - register_t *pos; + stacktype *base; + stacktype *pos; - pos = *stack_base + (imgp->argc + imgp->envc + 2); + base = (stacktype *)*stack_base; + pos = base + (imgp->argc + imgp->envc + 2); if (args->trace) { AUXARGS_ENTRY(pos, AT_DEBUG, 1); @@ -862,8 +866,9 @@ free(imgp->auxargs, M_TEMP); imgp->auxargs = NULL; - (*stack_base)--; - suword(*stack_base, (long) imgp->argc); + base--; + suword(base, (long) imgp->argc); + *stack_base = (register_t *)base; return 0; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 0: 6:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7538D37B401; Wed, 19 Jun 2002 00:04:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 9C78A37B404 for ; Wed, 19 Jun 2002 00:04:32 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5J74U310720 for perforce@freebsd.org; Wed, 19 Jun 2002 00:04:30 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 19 Jun 2002 00:04:30 -0700 (PDT) Message-Id: <200206190704.g5J74U310720@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13146 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13146 Change 13146 by julian@julian_jules1 on 2002/06/19 00:04:26 MFC.. I'm impressed.. No conflicts in all those files! Affected files ... ... //depot/projects/kse/sys/alpha/conf/GENERIC#13 integrate ... //depot/projects/kse/sys/alpha/osf1/osf1_misc.c#12 integrate ... //depot/projects/kse/sys/compat/linux/linux_misc.c#17 integrate ... //depot/projects/kse/sys/conf/files#38 integrate ... //depot/projects/kse/sys/conf/files.sparc64#18 integrate ... //depot/projects/kse/sys/conf/kern.pre.mk#12 integrate ... //depot/projects/kse/sys/conf/kmod.mk#11 integrate ... //depot/projects/kse/sys/conf/options#20 integrate ... //depot/projects/kse/sys/conf/options.i386#18 integrate ... //depot/projects/kse/sys/conf/options.ia64#7 integrate ... //depot/projects/kse/sys/conf/options.pc98#18 integrate ... //depot/projects/kse/sys/dev/drm/drm_os_freebsd.h#4 integrate ... //depot/projects/kse/sys/dev/em/if_em_fxhw.c#4 delete ... //depot/projects/kse/sys/dev/em/if_em_fxhw.h#4 delete ... //depot/projects/kse/sys/dev/em/if_em_phy.c#5 delete ... //depot/projects/kse/sys/dev/em/if_em_phy.h#4 delete ... //depot/projects/kse/sys/dev/hea/eni.c#7 integrate ... //depot/projects/kse/sys/dev/hea/eni.h#4 integrate ... //depot/projects/kse/sys/dev/hea/eni_globals.c#2 integrate ... //depot/projects/kse/sys/dev/hea/eni_var.h#3 integrate ... //depot/projects/kse/sys/dev/hea/hea_freebsd.c#3 integrate ... //depot/projects/kse/sys/dev/hfa/fore_globals.c#2 integrate ... //depot/projects/kse/sys/dev/hfa/fore_include.h#3 integrate ... //depot/projects/kse/sys/dev/hfa/fore_load.c#5 integrate ... //depot/projects/kse/sys/dev/hfa/fore_var.h#2 integrate ... //depot/projects/kse/sys/dev/hfa/hfa_freebsd.c#3 integrate ... //depot/projects/kse/sys/dev/isp/isp.c#20 integrate ... //depot/projects/kse/sys/dev/isp/isp_freebsd.c#13 integrate ... //depot/projects/kse/sys/dev/isp/isp_freebsd.h#11 integrate ... //depot/projects/kse/sys/dev/isp/isp_inline.h#8 integrate ... //depot/projects/kse/sys/dev/isp/isp_ioctl.h#7 integrate ... //depot/projects/kse/sys/dev/isp/isp_pci.c#11 integrate ... //depot/projects/kse/sys/dev/isp/isp_target.c#6 integrate ... //depot/projects/kse/sys/dev/isp/isp_target.h#6 integrate ... //depot/projects/kse/sys/dev/isp/ispmbox.h#13 integrate ... //depot/projects/kse/sys/dev/isp/ispvar.h#12 integrate ... //depot/projects/kse/sys/dev/md/md.c#21 integrate ... //depot/projects/kse/sys/dev/puc/pucdata.c#5 integrate ... //depot/projects/kse/sys/dev/puc/pucvar.h#2 integrate ... //depot/projects/kse/sys/dev/sio/sio.c#15 integrate ... //depot/projects/kse/sys/dev/sio/sio_ebus.c#1 branch ... //depot/projects/kse/sys/dev/sio/sioreg.h#6 integrate ... //depot/projects/kse/sys/dev/usb/uhub.c#10 integrate ... //depot/projects/kse/sys/dev/usb/umass.c#12 integrate ... //depot/projects/kse/sys/dev/usb/usb_subr.c#9 integrate ... //depot/projects/kse/sys/dev/wi/if_wi_pci.c#4 integrate ... //depot/projects/kse/sys/fs/udf/udf_mount.h#2 delete ... //depot/projects/kse/sys/fs/udf/udf_vfsops.c#2 integrate ... //depot/projects/kse/sys/fs/unionfs/union.h#6 integrate ... //depot/projects/kse/sys/fs/unionfs/union_vfsops.c#10 integrate ... //depot/projects/kse/sys/i386/i386/pmap.c#37 integrate ... //depot/projects/kse/sys/kern/kern_exec.c#28 integrate ... //depot/projects/kse/sys/kern/kern_prot.c#27 integrate ... //depot/projects/kse/sys/kern/uipc_socket2.c#17 integrate ... //depot/projects/kse/sys/kern/vfs_subr.c#33 integrate ... //depot/projects/kse/sys/modules/netgraph/device/Makefile#1 branch ... //depot/projects/kse/sys/modules/sppp/Makefile#3 integrate ... //depot/projects/kse/sys/net/rtsock.c#17 integrate ... //depot/projects/kse/sys/netatm/atm_cm.c#6 integrate ... //depot/projects/kse/sys/netatm/atm_device.c#4 integrate ... //depot/projects/kse/sys/netatm/atm_if.c#5 integrate ... //depot/projects/kse/sys/netatm/atm_if.h#5 integrate ... //depot/projects/kse/sys/netatm/atm_subr.c#9 integrate ... //depot/projects/kse/sys/netatm/atm_sys.h#4 integrate ... //depot/projects/kse/sys/netatm/atm_var.h#8 integrate ... //depot/projects/kse/sys/netgraph/ng_device.c#1 branch ... //depot/projects/kse/sys/netgraph/ng_device.h#1 branch ... //depot/projects/kse/sys/netinet/accf_data.c#5 integrate ... //depot/projects/kse/sys/netinet/accf_http.c#5 integrate ... //depot/projects/kse/sys/netinet/in_pcb.c#18 integrate ... //depot/projects/kse/sys/netinet/in_pcb.h#12 integrate ... //depot/projects/kse/sys/netinet/tcp_input.c#21 integrate ... //depot/projects/kse/sys/netinet/tcp_subr.c#15 integrate ... //depot/projects/kse/sys/netinet/tcp_var.h#10 integrate ... //depot/projects/kse/sys/netinet/udp_usrreq.c#16 integrate ... //depot/projects/kse/sys/netinet/udp_var.h#4 integrate ... //depot/projects/kse/sys/netinet6/in6_pcb.c#16 integrate ... //depot/projects/kse/sys/netinet6/in6_pcb.h#6 integrate ... //depot/projects/kse/sys/netinet6/raw_ip6.c#12 integrate ... //depot/projects/kse/sys/netinet6/udp6_usrreq.c#12 integrate ... //depot/projects/kse/sys/netkey/keysock.c#10 integrate ... //depot/projects/kse/sys/pc98/pc98/sio.c#15 integrate ... //depot/projects/kse/sys/sparc64/conf/GENERIC#14 integrate ... //depot/projects/kse/sys/sparc64/include/vmparam.h#9 integrate ... //depot/projects/kse/sys/sparc64/sparc64/pmap.c#29 integrate ... //depot/projects/kse/sys/sys/_sigset.h#1 branch ... //depot/projects/kse/sys/sys/_types.h#3 integrate ... //depot/projects/kse/sys/sys/file.h#11 integrate ... //depot/projects/kse/sys/sys/malloc.h#8 integrate ... //depot/projects/kse/sys/sys/mount.h#11 integrate ... //depot/projects/kse/sys/sys/select.h#2 integrate ... //depot/projects/kse/sys/sys/signal.h#6 integrate ... //depot/projects/kse/sys/sys/socket.h#8 integrate ... //depot/projects/kse/sys/sys/socketvar.h#20 integrate ... //depot/projects/kse/sys/sys/statvfs.h#1 branch ... //depot/projects/kse/sys/sys/time.h#9 integrate ... //depot/projects/kse/sys/sys/types.h#15 integrate ... //depot/projects/kse/sys/sys/ucred.h#10 integrate ... //depot/projects/kse/sys/vm/uma.h#5 integrate ... //depot/projects/kse/sys/vm/uma_core.c#9 integrate ... //depot/projects/kse/sys/vm/uma_int.h#4 integrate ... //depot/projects/kse/sys/vm/vm_contig.c#7 integrate ... //depot/projects/kse/sys/vm/vm_fault.c#12 integrate ... //depot/projects/kse/sys/vm/vm_glue.c#31 integrate ... //depot/projects/kse/sys/vm/vm_kern.c#6 integrate ... //depot/projects/kse/sys/vm/vm_map.c#21 integrate ... //depot/projects/kse/sys/vm/vm_map.h#14 integrate ... //depot/projects/kse/sys/vm/vm_mmap.c#16 integrate ... //depot/projects/kse/sys/vm/vm_object.c#11 integrate Differences ... ==== //depot/projects/kse/sys/alpha/conf/GENERIC#13 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.138 2002/05/03 17:59:21 jmallett Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.140 2002/06/16 06:48:42 mjacob Exp $ machine alpha cpu EV4 @@ -130,7 +130,7 @@ # real time clock device mcclock -# Serial (COM) ports +# Serial (COM) ports (required) device sio # 8250, 16[45]50 based serial ports # Parallel port ==== //depot/projects/kse/sys/alpha/osf1/osf1_misc.c#12 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.30 2002/04/13 23:11:22 jhb Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.31 2002/06/19 06:39:25 alfred Exp $ */ @@ -1056,17 +1056,20 @@ struct proc *p; int error; uid_t uid; + struct uidinfo *uip; struct ucred *newcred, *oldcred; p = td->td_proc; uid = SCARG(uap, uid); newcred = crget(); + uip = uifind(uid); PROC_LOCK(p); oldcred = p->p_ucred; if ((error = suser_cred(p->p_ucred, PRISON_ROOT)) != 0 && uid != oldcred->cr_ruid && uid != oldcred->cr_svuid) { PROC_UNLOCK(p); + uifree(uip); crfree(newcred); return (error); } @@ -1074,7 +1077,7 @@ crcopy(newcred, oldcred); if (error == 0) { if (uid != oldcred->cr_ruid) { - change_ruid(newcred, uid); + change_ruid(newcred, uip); setsugid(p); } if (oldcred->cr_svuid != uid) { @@ -1083,11 +1086,12 @@ } } if (newcred->cr_uid != uid) { - change_euid(newcred, uid); + change_euid(newcred, uip); setsugid(p); } p->p_ucred = newcred; PROC_UNLOCK(p); + uifree(uip); crfree(oldcred); return (0); } ==== //depot/projects/kse/sys/compat/linux/linux_misc.c#17 (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. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.122 2002/06/02 20:05:42 schweikh Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.123 2002/06/14 07:24:01 rwatson Exp $ */ #include "opt_compat.h" @@ -302,6 +302,10 @@ if (error) goto cleanup; + /* + * XXX: This should use vn_open() so that it is properly authorized, + * and to reduce code redundancy all over the place here. + */ error = VOP_OPEN(vp, FREAD, td->td_ucred, td); if (error) goto cleanup; ==== //depot/projects/kse/sys/conf/files#38 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.648 2002/06/13 23:19:34 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.650 2002/06/18 21:32:33 julian Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1016,6 +1016,7 @@ net/rtsock.c standard net/slcompress.c optional ppp net/slcompress.c optional sl +net/slcompress.c optional sppp net/zlib.c optional ppp_deflate net/zlib.c optional ipsec netatalk/aarp.c optional netatalk @@ -1112,6 +1113,7 @@ net/bpf_filter.c optional netgraph_bpf netgraph/ng_bridge.c optional netgraph_bridge netgraph/ng_cisco.c optional netgraph_cisco +netgraph/ng_device.c optional netgraph_device netgraph/ng_echo.c optional netgraph_echo netgraph/ng_ether.c optional netgraph_ether netgraph/ng_frame_relay.c optional netgraph_frame_relay ==== //depot/projects/kse/sys/conf/files.sparc64#18 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.21 2002/06/08 07:17:18 jake Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.22 2002/06/18 01:14:54 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -12,6 +12,12 @@ crypto/des/des_enc.c optional ipsec ipsec_esp dev/ofw/ofw_console.c optional ofw_console dev/ofw/openfirm.c standard +dev/sio/sio.c optional sio +dev/sio/sio_ebus.c optional sio ebus +dev/sio/sio_isa.c optional sio isa +dev/sio/sio_pccard.c optional sio card +dev/sio/sio_pccard.c optional sio pccard +dev/sio/sio_pci.c optional sio pci libkern/ffs.c standard kern/subr_diskmbr.c standard kern/syscalls.c optional ktr ==== //depot/projects/kse/sys/conf/kern.pre.mk#12 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kenrels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.12 2002/05/12 15:51:38 bde Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.13 2002/06/16 10:42:05 mux Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -38,7 +38,7 @@ INCLUDES+= -I/usr/include .endif -COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -ffreestanding -include opt_global.h +COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common # XXX LOCORE means "don't declare C stuff" not "for locore.s". ==== //depot/projects/kse/sys/conf/kmod.mk#11 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.124 2002/05/14 07:49:12 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.125 2002/06/17 20:01:06 n_hibma Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -278,7 +278,7 @@ .if !target(load) load: ${PROG} - ${KMODLOAD} -v ${.CURDIR}/${KMOD}.ko + ${KMODLOAD} -v ${.OBJDIR}/${KMOD}.ko .endif .if !target(unload) ==== //depot/projects/kse/sys/conf/options#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.325 2002/06/13 22:41:23 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.326 2002/06/18 21:30:36 n_hibma Exp $ # # On the handling of kernel options # @@ -69,10 +69,12 @@ COMPAT_SUNOS opt_compat.h COMPILING_LINT opt_global.h CY_PCI_FASTINTR +CONSPEED opt_comconsole.h DDB DDB_NOKLDSYM opt_ddb.h DDB_UNATTENDED opt_ddb.h GDB_REMOTE_CHAT opt_ddb.h +GDBSPEED opt_ddb.h NODEVFS opt_devfs.h HW_WDOG KTRACE ==== //depot/projects/kse/sys/conf/options.i386#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.170 2002/05/16 21:23:40 trhodes Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.171 2002/06/18 21:30:36 n_hibma Exp $ # Options specific to the i386 platform kernels DISABLE_PSE @@ -14,7 +14,6 @@ POWERFAIL_NMI opt_trap.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h -CONSPEED opt_comconsole.h I586_PMC_GUPROF opt_i586_guprof.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h ==== //depot/projects/kse/sys/conf/options.ia64#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.ia64,v 1.10 2002/04/14 04:33:41 peter Exp $ +# $FreeBSD: src/sys/conf/options.ia64,v 1.11 2002/06/18 21:30:37 n_hibma Exp $ # Options specific to the ia64 platform kernels ITANIUM opt_global.h @@ -15,8 +15,6 @@ SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h -CONSPEED opt_comconsole.h - MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h SC_DEBUG_LEVEL opt_syscons.h ==== //depot/projects/kse/sys/conf/options.pc98#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.145 2002/05/19 13:18:10 nyan Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.146 2002/06/18 21:30:37 n_hibma Exp $ # Options specific to the pc98 platform kernels DISABLE_PSE @@ -14,7 +14,6 @@ POWERFAIL_NMI opt_trap.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h -CONSPEED opt_comconsole.h I586_PMC_GUPROF opt_i586_guprof.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h ==== //depot/projects/kse/sys/dev/drm/drm_os_freebsd.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.5 2002/05/31 23:19:50 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.6 2002/06/16 21:50:42 des Exp $ */ #include @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/kse/sys/dev/hea/eni.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.21 2002/06/11 21:22:32 alfred Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.22 2002/06/14 16:59:37 arr Exp $ * */ @@ -66,7 +66,7 @@ #include #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.21 2002/06/11 21:22:32 alfred Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.22 2002/06/14 16:59:37 arr Exp $"); #endif /* @@ -415,8 +415,8 @@ eup->eu_openvcc = eni_openvcc; eup->eu_closevcc = eni_closevcc; eup->eu_output = eni_output; - eup->eu_vcc_pool = &eni_vcc_pool; - eup->eu_nif_pool = &eni_nif_pool; + eup->eu_vcc_zone = eni_vcc_zone; + eup->eu_nif_zone = eni_nif_zone; /* * Enable Memory Mapping / Bus Mastering ==== //depot/projects/kse/sys/dev/hea/eni.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni.h,v 1.5 2002/06/07 05:23:01 mdodd Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni.h,v 1.6 2002/06/14 16:59:37 arr Exp $ * */ @@ -491,8 +491,8 @@ #define eu_mtu eu_cmn.cu_mtu #define eu_open_vcc eu_cmn.cu_open_vcc #define eu_vcc eu_cmn.cu_vcc -#define eu_vcc_pool eu_cmn.cu_vcc_pool -#define eu_nif_pool eu_cmn.cu_nif_pool +#define eu_vcc_zone eu_cmn.cu_vcc_zone +#define eu_nif_zone eu_cmn.cu_nif_zone #define eu_ioctl eu_cmn.cu_ioctl #define eu_instvcc eu_cmn.cu_instvcc #define eu_openvcc eu_cmn.cu_openvcc ==== //depot/projects/kse/sys/dev/hea/eni_globals.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.8 2000/10/27 21:32:06 phk Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.9 2002/06/14 16:59:37 arr Exp $ * */ @@ -53,8 +53,10 @@ #include #include +#include + #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.8 2000/10/27 21:32:06 phk Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.9 2002/06/14 16:59:37 arr Exp $"); #endif /* @@ -98,17 +100,5 @@ /* * Storage pools */ -struct sp_info eni_nif_pool = { - "eni nif pool", /* si_name */ - sizeof(struct atm_nif), /* si_blksiz */ - 5, /* si_blkcnt */ - 52 /* si_maxallow */ -}; - -struct sp_info eni_vcc_pool = { - "eni vcc pool", /* si_name */ - sizeof(Eni_vcc), /* si_blksiz */ - 10, /* si_blkcnt */ - 100 /* si_maxallow */ -}; - +uma_zone_t eni_nif_zone; +uma_zone_t eni_vcc_zone; ==== //depot/projects/kse/sys/dev/hea/eni_var.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni_var.h,v 1.3 2002/03/20 02:07:22 alfred Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni_var.h,v 1.4 2002/06/14 16:59:37 arr Exp $ * */ @@ -79,7 +79,7 @@ */ extern Eni_unit *eni_units[]; extern struct stack_defn *eni_services; -extern struct sp_info eni_nif_pool; -extern struct sp_info eni_vcc_pool; +extern uma_zone_t eni_nif_zone; +extern uma_zone_t eni_vcc_zone; #endif /* _ENI_ENI_VAR_H */ ==== //depot/projects/kse/sys/dev/hea/hea_freebsd.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/hea/hea_freebsd.c,v 1.3 2002/06/07 05:23:01 mdodd Exp $ + * $FreeBSD: src/sys/dev/hea/hea_freebsd.c,v 1.4 2002/06/14 16:59:37 arr Exp $ */ /* @@ -158,13 +158,25 @@ eup = &sc->eup; error = 0; + eni_vcc_zone = uma_zcreate("eni vcc", sizeof(Eni_vcc), NULL, + NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + if (eni_vcc_zone == NULL) + panic("hea_attach: uma_zcreate vcc"); + uma_zone_set_max(eni_vcc_zone, 100); + + eni_nif_zone = uma_zcreate("eni nif", sizeof(struct atm_nif), NULL, + NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + if (eni_nif_zone == NULL) + panic("hea_attach: uma_zcreate nif"); + uma_zone_set_max(eni_nif_zone, 52); + /* * Start initializing it */ eup->eu_unit = device_get_unit(dev); eup->eu_mtu = ENI_IFF_MTU; - eup->eu_vcc_pool = &eni_vcc_pool; - eup->eu_nif_pool = &eni_nif_pool; + eup->eu_vcc_zone = eni_vcc_zone; + eup->eu_nif_zone = eni_nif_zone; eup->eu_ioctl = eni_atm_ioctl; eup->eu_instvcc = eni_instvcc; eup->eu_openvcc = eni_openvcc; @@ -329,6 +341,9 @@ hea_free(dev); + uma_zdestroy(eni_vcc_zone); + uma_zdestroy(eni_nif_zone); + return (error); } ==== //depot/projects/kse/sys/dev/hfa/fore_globals.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.9 2000/10/30 20:37:00 phk Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.10 2002/06/14 16:59:37 arr Exp $ * */ @@ -57,8 +57,10 @@ #include #include +#include + #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.9 2000/10/30 20:37:00 phk Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.10 2002/06/14 16:59:37 arr Exp $"); #endif /* @@ -104,20 +106,8 @@ /* * Storage pools */ -struct sp_info fore_nif_pool = { - "fore nif pool", /* si_name */ - sizeof(struct atm_nif), /* si_blksiz */ - 5, /* si_blkcnt */ - 52 /* si_maxallow */ -}; - -struct sp_info fore_vcc_pool = { - "fore vcc pool", /* si_name */ - sizeof(Fore_vcc), /* si_blksiz */ - 10, /* si_blkcnt */ - 100 /* si_maxallow */ -}; - +uma_zone_t fore_nif_zone; +uma_zone_t fore_vcc_zone; /* * Watchdog timer ==== //depot/projects/kse/sys/dev/hfa/fore_include.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_include.h,v 1.5 2002/03/20 02:07:23 alfred Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_include.h,v 1.6 2002/06/14 16:59:37 arr Exp $ * */ @@ -101,8 +101,8 @@ extern Fore_unit *fore_units[]; extern int fore_nunits; extern struct stack_defn *fore_services; -extern struct sp_info fore_nif_pool; -extern struct sp_info fore_vcc_pool; +extern uma_zone_t fore_nif_zone; +extern uma_zone_t fore_vcc_zone; extern struct atm_time fore_timer; #endif /* _FORE_INCLUDE_H */ ==== //depot/projects/kse/sys/dev/hfa/fore_load.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.25 2002/04/16 01:38:31 arr Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.26 2002/06/14 16:59:37 arr Exp $ * */ @@ -67,7 +67,7 @@ #include #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.25 2002/04/16 01:38:31 arr Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.26 2002/06/14 16:59:37 arr Exp $"); #endif static int fore_probe(device_t); @@ -225,8 +225,8 @@ fup->fu_unit = unit; fup->fu_mtu = FORE_IFF_MTU; fup->fu_pcitag = config_id; - fup->fu_vcc_pool = &fore_vcc_pool; - fup->fu_nif_pool = &fore_nif_pool; + fup->fu_vcc_zone = fore_vcc_zone; + fup->fu_nif_zone = &fore_nif_zone; fup->fu_ioctl = fore_atm_ioctl; fup->fu_instvcc = fore_instvcc; fup->fu_openvcc = fore_openvcc; ==== //depot/projects/kse/sys/dev/hfa/fore_var.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_var.h,v 1.5 2001/01/17 01:08:49 peter Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_var.h,v 1.6 2002/06/14 16:59:37 arr Exp $ * */ @@ -237,8 +237,8 @@ #define fu_vcc fu_cmn.cu_vcc #define fu_intrpri fu_cmn.cu_intrpri #define fu_savepri fu_cmn.cu_savepri -#define fu_vcc_pool fu_cmn.cu_vcc_pool -#define fu_nif_pool fu_cmn.cu_nif_pool +#define fu_vcc_zone fu_cmn.cu_vcc_zone +#define fu_nif_zone fu_cmn.cu_nif_zone #define fu_ioctl fu_cmn.cu_ioctl #define fu_instvcc fu_cmn.cu_instvcc #define fu_openvcc fu_cmn.cu_openvcc ==== //depot/projects/kse/sys/dev/hfa/hfa_freebsd.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/hfa/hfa_freebsd.c,v 1.2 2002/06/07 01:55:42 mdodd Exp $ + * $FreeBSD: src/sys/dev/hfa/hfa_freebsd.c,v 1.3 2002/06/14 16:59:37 arr Exp $ */ /* @@ -169,8 +169,8 @@ */ fup->fu_unit = device_get_unit(dev); fup->fu_mtu = FORE_IFF_MTU; - fup->fu_vcc_pool = &fore_vcc_pool; - fup->fu_nif_pool = &fore_nif_pool; + fup->fu_vcc_zone = fore_vcc_zone; + fup->fu_nif_zone = fore_nif_zone; fup->fu_ioctl = fore_atm_ioctl; fup->fu_instvcc = fore_instvcc; fup->fu_openvcc = fore_openvcc; @@ -377,6 +377,19 @@ error = EINVAL; break; } + + fore_nif_zone = uma_zcreate("fore nif", sizeof(struct atm_nif), NULL, + NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + if (fore_nif_zone == NULL) + panic("hfa_modevent:uma_zcreate nif"); + uma_zone_set_max(fore_nif_zone, 52); + + fore_vcc_zone = uma_zcreate("fore vcc", sizeof(Fore_vcc), NULL, + NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + if (fore_vcc_zone == NULL) + panic("hfa_modevent: uma_zcreate vcc"); + uma_zone_set_max(fore_vcc_zone, 100); + /* * Initialize DMA mapping */ @@ -399,6 +412,9 @@ */ atm_untimeout(&fore_timer); + uma_zdestroy(fore_nif_zone); + uma_zdestroy(fore_vcc_zone); + break; default: break; ==== //depot/projects/kse/sys/dev/isp/isp.c#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.93 2002/05/01 21:58:36 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.94 2002/06/16 05:18:22 mjacob Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -161,7 +161,7 @@ { mbreg_t mbs; u_int16_t code_org; - int loops, i, touched, dodnld = 1; + int loops, i, dodnld = 1; char *btype = "????"; isp->isp_state = ISP_NILSTATE; @@ -184,7 +184,7 @@ * case, we don't really use this yet, but we may in * the future. */ - if ((touched = isp->isp_touched) == 0) { + if (isp->isp_touched == 0) { /* * First see whether or not we're sitting in the ISP PROM. * If we've just been reset, we'll have the string "ISP " @@ -676,8 +676,10 @@ mbs.param[0] = MBOX_EXEC_FIRMWARE; mbs.param[1] = code_org; isp_mboxcmd(isp, &mbs, MBLOGNONE); - /* give it a chance to start */ - USEC_SLEEP(isp, 500); + /* + * Give it a chance to start. + */ + USEC_DELAY(500); if (IS_SCSI(isp)) { /* @@ -789,19 +791,21 @@ * because we may be called again after firmware has been loaded once * and released. */ - if (touched == 0) { - if (IS_SCSI(isp)) { - if (dodnld) { + if (IS_SCSI(isp)) { + if (dodnld) { + if (IS_ULTRA2(isp) || IS_ULTRA3(isp)) { isp->isp_maxluns = 32; } else { isp->isp_maxluns = 8; } } else { - if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_SCCLUN) { - isp->isp_maxluns = 16384; - } else { - isp->isp_maxluns = 16; - } + isp->isp_maxluns = 8; + } + } else { + if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_SCCLUN) { + isp->isp_maxluns = 16384; + } else { + isp->isp_maxluns = 16; } } } @@ -1177,7 +1181,6 @@ */ fcp->isp_fwoptions |= ICBOPT_PDBCHANGE_AE; - /* * Make sure that target role reflects into fwoptions. */ @@ -2411,7 +2414,13 @@ rs0 = (sns_ga_nxt_rsp_t *) ((u_int8_t *)fcp->isp_scratch+0x100); isp_get_ga_nxt_response(isp, rs0, rs1); if (rs1->snscb_cthdr.ct_response != FS_ACC) { - isp_prt(isp, ISP_LOGWARN, swrej, "GA_NXT", + int level; + if (rs1->snscb_cthdr.ct_reason == 9 && + rs1->snscb_cthdr.ct_explanation == 7) + level = ISP_LOGDEBUG0; + else + level = ISP_LOGWARN; + isp_prt(isp, level, swrej, "GA_NXT", rs1->snscb_cthdr.ct_reason, rs1->snscb_cthdr.ct_explanation, portid); FC_SCRATCH_RELEASE(isp); @@ -2424,6 +2433,10 @@ (((u_int32_t) rs1->snscb_port_id[2])); /* + * XXX: We should check to make sure that this entry + * XXX: supports the type(s) we are interested in. + */ + /* * Okay, we now have information about a fabric object. * If it is the type we're interested in, tell the outer layers * about it. The outer layer needs to know: Port ID, WWNN, @@ -2556,7 +2569,13 @@ rs0 = (sns_gid_ft_rsp_t *) ((u_int8_t *)fcp->isp_scratch+IGPOFF); isp_get_gid_ft_response(isp, rs0, rs1, NGENT); if (rs1->snscb_cthdr.ct_response != FS_ACC) { - isp_prt(isp, ISP_LOGWARN, swrej, "GID_FT", + int level; + if (rs1->snscb_cthdr.ct_reason == 9 && + rs1->snscb_cthdr.ct_explanation == 7) + level = ISP_LOGDEBUG0; + else + level = ISP_LOGWARN; + isp_prt(isp, level, swrej, "GID_FT", rs1->snscb_cthdr.ct_reason, rs1->snscb_cthdr.ct_explanation, 0); FC_SCRATCH_RELEASE(isp); @@ -2791,6 +2810,12 @@ } FC_SCRATCH_RELEASE(isp); + /* + * XXX: Workaround for some bogus fabric registrants + */ + if (ftype) { + (void) isp_scan_fabric(isp, 0); + } fcp->isp_loopstate = LOOP_FSCAN_DONE; return (0); } @@ -3023,7 +3048,7 @@ return (CMD_RQLATER); } if (fcp->isp_fwstate != FW_READY || - fcp->isp_loopstate < LOOP_PDB_RCVD) { + fcp->isp_loopstate < LOOP_FSCAN_DONE) { return (CMD_RQLATER); } } @@ -3199,7 +3224,7 @@ XS_SETERR(xs, HBA_NOERROR); isp_prt(isp, ISP_LOGDEBUG2, "START cmd for %d.%d.%d cmd 0x%x datalen %ld", - XS_CHANNEL(xs), target, XS_LUN(xs), XS_CDBP(xs)[0], + XS_CHANNEL(xs), XS_TGT(xs), XS_LUN(xs), XS_CDBP(xs)[0], (long) XS_XFRLEN(xs)); ISP_ADD_REQUEST(isp, nxti); isp->isp_nactive++; @@ -3665,11 +3690,15 @@ * Only whine if this isn't the expected fallout of * aborting the command. */ - if (sp->req_header.rqs_entry_type != RQSTYPE_RESPONSE || - ts != RQCS_ABORTED) { + if (sp->req_header.rqs_entry_type != RQSTYPE_RESPONSE) { + isp_prt(isp, ISP_LOGERR, + "cannot find handle 0x%x (type 0x%x)", + sp->req_handle, + sp->req_header.rqs_entry_type); + } else if (ts != RQCS_ABORTED) { isp_prt(isp, ISP_LOGERR, - "cannot find handle 0x%x in xflist", - sp->req_handle); + "cannot find handle 0x%x (status 0x%x)", + sp->req_handle, ts); } WRITE_RESPONSE_QUEUE_OUT_POINTER(isp, optr); continue; @@ -3839,6 +3868,7 @@ static int isp_parse_async(struct ispsoftc *isp, u_int16_t mbox) { + int rval = 0; int bus; if (IS_DUALBUS(isp)) { @@ -3852,14 +3882,17 @@ case ASYNC_BUS_RESET: isp->isp_sendmarker |= (1 << bus); #ifdef ISP_TARGET_MODE - isp_target_async(isp, bus, mbox); + if (isp_target_async(isp, bus, mbox)) + rval = -1; #endif isp_async(isp, ISPASYNC_BUS_RESET, &bus); break; case ASYNC_SYSTEM_ERROR: isp_async(isp, ISPASYNC_FW_CRASH, NULL); - /* no point continuing after this */ - return (-1); + isp_reinit(isp); + isp_async(isp, ISPASYNC_FW_RESTARTED, NULL); + rval = -1; + break; case ASYNC_RQS_XFER_ERR: isp_prt(isp, ISP_LOGERR, "Request Queue Transfer Error"); @@ -3883,7 +3916,8 @@ "timeout initiated SCSI bus reset of bus %d", bus); isp->isp_sendmarker |= (1 << bus); #ifdef ISP_TARGET_MODE - isp_target_async(isp, bus, mbox); + if (isp_target_async(isp, bus, mbox)) + rval = -1; #endif break; @@ -3891,7 +3925,8 @@ isp_prt(isp, ISP_LOGINFO, "device reset on bus %d", bus); isp->isp_sendmarker |= (1 << bus); #ifdef ISP_TARGET_MODE - isp_target_async(isp, bus, mbox); + if (isp_target_async(isp, bus, mbox)) + rval = -1; #endif break; @@ -3977,19 +4012,19 @@ break; case ASYNC_CTIO_DONE: + { #ifdef ISP_TARGET_MODE - /* - * Bus gets overloaded with the handle. Dual bus - * cards don't put bus# into the handle. - */ - isp_target_async(isp, ((ISP_READ(isp, OUTMAILBOX2) << 16) | - ISP_READ(isp, OUTMAILBOX1)), mbox); + int handle = + (ISP_READ(isp, OUTMAILBOX2) << 16) | + (ISP_READ(isp, OUTMAILBOX1)); + if (isp_target_async(isp, handle, mbox)) + rval = -1; #else isp_prt(isp, ISP_LOGINFO, "Fast Posting CTIO done"); #endif isp->isp_fphccmplt++; /* count it as a fast posting intr */ - return (0); - + break; + } case ASYNC_LIP_F8: case ASYNC_LIP_OCCURRED: FCPARAM(isp)->isp_lipseq = @@ -4000,7 +4035,8 @@ isp_mark_getpdb_all(isp); isp_async(isp, ISPASYNC_LIP, NULL); #ifdef ISP_TARGET_MODE - isp_target_async(isp, bus, mbox); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 0:32:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C332D37B414; Wed, 19 Jun 2002 00:32:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 26B1D37B413 for ; Wed, 19 Jun 2002 00:32:06 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5J7W5m23890 for perforce@freebsd.org; Wed, 19 Jun 2002 00:32:05 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 19 Jun 2002 00:32:05 -0700 (PDT) Message-Id: <200206190732.g5J7W5m23890@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13147 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13147 Change 13147 by peter@peter_ia64 on 2002/06/19 00:31:39 Sigh, the x86 cvsup binary immediately tries to execute its data segment. This hack doesn't deserve to see the light of day, and doesn't solve all the M3 runtime problems. But it might come in handy some day. Affected files ... ... //depot/projects/ia64/sys/kern/imgact_elf.c#10 edit Differences ... ==== //depot/projects/ia64/sys/kern/imgact_elf.c#10 (text+ko) ==== @@ -676,6 +676,15 @@ if (phdr[i].p_flags & PF_R) prot |= VM_PROT_READ; +#if defined(__ia64__) && __ELF_WORD_SIZE == 32 && defined(IA32_ME_HARDER) + /* + * Some x86 binaries assume read == executable, + * notably the M3 runtime and therefore cvsup + */ + if (prot & VM_PROT_READ) + prot |= VM_PROT_EXECUTE; +#endif + if ((error = __elfN(load_section) (imgp->proc, vmspace, imgp->vp, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 12: 3: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B342437B400; Wed, 19 Jun 2002 12:00:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E9DF937B40D for ; Wed, 19 Jun 2002 12:00:23 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5JJ0MT67475 for perforce@freebsd.org; Wed, 19 Jun 2002 12:00:22 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 19 Jun 2002 12:00:22 -0700 (PDT) Message-Id: <200206191900.g5JJ0MT67475@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13166 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13166 Change 13166 by julian@julian_ref on 2002/06/19 12:00:04 MFC Affected files ... ... //depot/projects/kse/bin/ksetest/kse_threads_test.c#8 edit ... //depot/projects/kse/sys/dev/ata/ata-dma.c#21 integrate ... //depot/projects/kse/sys/dev/ata/ata-pci.c#22 integrate ... //depot/projects/kse/sys/dev/ata/atapi-fd.c#10 integrate ... //depot/projects/kse/sys/dev/ata/atapi-fd.h#4 integrate ... //depot/projects/kse/sys/dev/wi/if_wi.c#23 integrate ... //depot/projects/kse/sys/dev/wi/if_wireg.h#10 integrate ... //depot/projects/kse/sys/dev/wi/if_wivar.h#4 integrate ... //depot/projects/kse/sys/kern/sys_generic.c#27 integrate ... //depot/projects/kse/sys/pc98/conf/GENERIC#16 integrate ... //depot/projects/kse/sys/pc98/pc98/fd.c#10 integrate ... //depot/projects/kse/sys/pc98/pc98/sio.c#16 integrate ... //depot/projects/kse/sys/sys/disklabel.h#11 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_readwrite.c#9 integrate Differences ... ==== //depot/projects/kse/bin/ksetest/kse_threads_test.c#8 (text+ko) ==== ==== //depot/projects/kse/sys/dev/ata/ata-dma.c#21 (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. * - * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.98 2002/04/26 22:48:20 mike Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.99 2002/06/19 12:26:20 sos Exp $ */ #include @@ -1027,8 +1027,8 @@ } break; + case 0x0d30105a: /* Promise OEM ATA100 controllers */ case 0x4d30105a: /* Promise Ultra/FastTrak 100 controllers */ - case 0x0d30105a: /* Promise OEM ATA100 controllers */ if (!ATAPI_DEVICE(atadev) && udmamode >= 5 && !(pci_read_config(parent, 0x50, 2) & (channel ? 1<<11 : 1<<10))) { error = ata_command(atadev, ATA_C_SETFEATURES, 0, @@ -1044,6 +1044,7 @@ } /* FALLTHROUGH */ + case 0x0d38105a: /* Promise FastTrak 66 controllers */ case 0x4d38105a: /* Promise Ultra/FastTrak 66 controllers */ if (!ATAPI_DEVICE(atadev) && udmamode >= 4 && !(pci_read_config(parent, 0x50, 2) & (channel ? 1<<11 : 1<<10))) { @@ -1398,9 +1399,10 @@ } break; + case 0x0d38105a: /* Promise Fasttrak 66 */ case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */ + case 0x0d30105a: /* Promise OEM ATA 100 */ case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */ - case 0x0d30105a: /* Promise OEM ATA 100 */ switch (mode) { default: case ATA_PIO0: t->pa = 15; t->pb = 31; t->mb = 7; t->mc = 15; break; ==== //depot/projects/kse/sys/dev/ata/ata-pci.c#22 (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. * - * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.41 2002/04/16 08:30:51 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.42 2002/06/19 12:26:20 sos Exp $ */ #include "opt_ata.h" @@ -243,6 +243,7 @@ case 0x4d33105a: return "Promise ATA33 controller"; + case 0x0d38105a: case 0x4d38105a: return "Promise ATA66 controller"; @@ -404,9 +405,10 @@ (pci_read_config(dev, 0x53, 1) & ~0x01) | 0x02, 1); break; - case 0x4d38105a: /* Promise 66 & 100 (before TX2) need the clock changed */ + case 0x0d30105a: /* Promise 66 & 100 (before TX2) need the clock changed */ case 0x4d30105a: - case 0x0d30105a: + case 0x0d38105a: + case 0x4d38105a: ATA_OUTB(controller->bmio, 0x11, ATA_INB(controller->bmio, 0x11)|0x0a); /* FALLTHROUGH */ @@ -565,9 +567,10 @@ break; case 0x4d33105a: /* Promise Ultra/Fasttrak 33 */ + case 0x0d38105a: /* Promise Fasttrak 66 */ case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */ + case 0x0d30105a: /* Promise OEM ATA100 */ case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */ - case 0x0d30105a: /* Promise OEM ATA100 */ if (!(ATA_INL(ch->r_bmio, (ch->unit ? 0x14 : 0x1c)) & (ch->unit ? 0x00004000 : 0x00000400))) return 1; ==== //depot/projects/kse/sys/dev/ata/atapi-fd.c#10 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.72 2002/05/25 11:18:02 bde Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.73 2002/06/19 12:41:05 sos Exp $ */ #include @@ -69,7 +69,6 @@ /* prototypes */ static int afd_sense(struct afd_softc *); static void afd_describe(struct afd_softc *); -static int afd_partial_done(struct atapi_request *); static int afd_done(struct atapi_request *); static int afd_eject(struct afd_softc *, int); static int afd_start_stop(struct afd_softc *, int); @@ -101,17 +100,20 @@ return 0; } - if (!strncmp(atadev->param->model, "IOMEGA ZIP", 10)) - fdp->transfersize = 64; - devstat_add_entry(&fdp->stats, "afd", fdp->lun, DEV_BSIZE, DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_DIRECT | DEVSTAT_TYPE_IF_IDE, DEVSTAT_PRIORITY_WFD); dev = disk_create(fdp->lun, &fdp->disk, 0, &afd_cdevsw, &afddisk_cdevsw); dev->si_drv1 = fdp; - dev->si_iosize_max = 252 * DEV_BSIZE; fdp->dev = dev; + + if (!strncmp(atadev->param->model, "IOMEGA ZIP", 10) || + !strncmp(atadev->param->model, "IOMEGA Clik!", 12)) + fdp->dev->si_iosize_max = 64 * DEV_BSIZE; + else + fdp->dev->si_iosize_max = 252 * DEV_BSIZE; + afd_describe(fdp); atadev->flags |= ATA_D_MEDIA_CHANGED; atadev->driver = fdp; @@ -147,7 +149,6 @@ /* The IOMEGA Clik! doesn't support reading the cap page, fake it */ if (!strncmp(fdp->device->param->model, "IOMEGA Clik!", 12)) { - fdp->transfersize = 64; fdp->cap.transfer_rate = 500; fdp->cap.heads = 1; fdp->cap.sectors = 2; @@ -189,8 +190,6 @@ fdp->cap.cylinders, fdp->cap.heads, fdp->cap.sectors, fdp->cap.sector_size); ata_prtdev(fdp->device, "%dKB/s,", fdp->cap.transfer_rate / 8); - if (fdp->transfersize) - printf(" transfer limit %d blks,", fdp->transfersize); printf(" %s\n", ata_mode2str(fdp->device->mode)); if (fdp->cap.medium_type) { ata_prtdev(fdp->device, "Medium: "); @@ -294,6 +293,13 @@ return; } + /* if it's a null transfer, return immediatly. */ + if (bp->bio_bcount == 0) { + bp->bio_resid = 0; + biodone(bp); + return; + } + s = splbio(); bioqdisksort(&fdp->queue, bp); splx(s); @@ -324,7 +330,7 @@ lba = bp->bio_pblkno; count = bp->bio_bcount / fdp->cap.sector_size; data_ptr = bp->bio_data; - bp->bio_resid = 0; + bp->bio_resid = bp->bio_bcount; bzero(ccb, sizeof(ccb)); @@ -333,26 +339,6 @@ else ccb[0] = ATAPI_WRITE_BIG; - devstat_start_transaction(&fdp->stats); - - while (fdp->transfersize && (count > fdp->transfersize)) { - ccb[2] = lba>>24; - ccb[3] = lba>>16; - ccb[4] = lba>>8; - ccb[5] = lba; - ccb[7] = fdp->transfersize>>8; - ccb[8] = fdp->transfersize; - - atapi_queue_cmd(fdp->device, ccb, data_ptr, - fdp->transfersize * fdp->cap.sector_size, - (bp->bio_cmd == BIO_READ) ? ATPR_F_READ : 0, 30, - afd_partial_done, bp); - - count -= fdp->transfersize; - lba += fdp->transfersize; - data_ptr += fdp->transfersize * fdp->cap.sector_size; - } - ccb[2] = lba>>24; ccb[3] = lba>>16; ccb[4] = lba>>8; @@ -360,25 +346,14 @@ ccb[7] = count>>8; ccb[8] = count; + devstat_start_transaction(&fdp->stats); + atapi_queue_cmd(fdp->device, ccb, data_ptr, count * fdp->cap.sector_size, (bp->bio_cmd == BIO_READ) ? ATPR_F_READ : 0, 30, afd_done, bp); } static int -afd_partial_done(struct atapi_request *request) -{ - struct bio *bp = request->driver; - - if (request->error) { - bp->bio_error = request->error; - bp->bio_flags |= BIO_ERROR; - } - bp->bio_resid += request->bytecount; - return 0; -} - -static int afd_done(struct atapi_request *request) { struct bio *bp = request->driver; @@ -389,7 +364,7 @@ bp->bio_flags |= BIO_ERROR; } else - bp->bio_resid += (bp->bio_bcount - request->donecount); + bp->bio_resid = bp->bio_bcount - request->donecount; biofinish(bp, &fdp->stats, 0); return 0; } ==== //depot/projects/kse/sys/dev/ata/atapi-fd.h#4 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-fd.h,v 1.16 2002/02/04 19:23:40 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-fd.h,v 1.17 2002/06/19 12:41:05 sos Exp $ */ /* ATAPI Rewriteable drive Capabilities and Mechanical Status Page */ @@ -71,7 +71,6 @@ struct afd_softc { struct ata_device *device; /* device softc */ int lun; /* logical device unit */ - int transfersize; /* max size of each transfer */ struct bio_queue_head queue; /* queue of i/o requests */ struct afd_cappage cap; /* capabilities page info */ struct disk disk; /* virtual drives */ ==== //depot/projects/kse/sys/dev/wi/if_wi.c#23 (text+ko) ==== @@ -103,7 +103,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.105 2002/05/29 20:24:09 phk Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.106 2002/06/19 17:37:34 imp Exp $"; #endif static void wi_intr(void *); @@ -313,6 +313,39 @@ sc->wi_channel = gen.wi_val; /* + * Set flags based on firmware version. + */ + switch (sc->sc_firmware_type) { + case WI_LUCENT: + sc->wi_flags |= WI_FLAGS_HAS_ROAMING; + if (sc->sc_sta_firmware_ver >= 60000) + sc->wi_flags |= WI_FLAGS_HAS_MOR; + if (sc->sc_sta_firmware_ver >= 60006) { + sc->wi_flags |= WI_FLAGS_HAS_IBSS; + sc->wi_flags |= WI_FLAGS_HAS_CREATE_IBSS; + } + sc->wi_ibss_port = htole16(1); + break; + case WI_INTERSIL: + sc->wi_flags |= WI_FLAGS_HAS_ROAMING; + if (sc->sc_sta_firmware_ver >= 800) { + sc->wi_flags |= WI_FLAGS_HAS_IBSS; + sc->wi_flags |= WI_FLAGS_HAS_CREATE_IBSS; + } + sc->wi_ibss_port = htole16(0); + break; + case WI_SYMBOL: + sc->wi_flags |= WI_FLAGS_HAS_DIVERSITY; + if (sc->sc_sta_firmware_ver >= 20000) + sc->wi_flags |= WI_FLAGS_HAS_IBSS; + /* Older Symbol firmware does not support IBSS creation. */ + if (sc->sc_sta_firmware_ver >= 25000) + sc->wi_flags |= WI_FLAGS_HAS_CREATE_IBSS; + sc->wi_ibss_port = htole16(4); + break; + } + + /* * Find out if we support WEP on this card. */ gen.wi_type = WI_RID_WEP_AVAIL; @@ -326,10 +359,13 @@ /* * Find supported rates. */ - gen.wi_type = WI_RID_TX_RATE; + gen.wi_type = WI_RID_DATA_RATES; gen.wi_len = 2; - wi_read_record(sc, &gen); - sc->wi_supprates = gen.wi_val; + if (wi_read_record(sc, &gen)) + sc->wi_supprates = WI_SUPPRATES_1M | WI_SUPPRATES_2M | + WI_SUPPRATES_5M | WI_SUPPRATES_11M; + else + sc->wi_supprates = gen.wi_val; bzero((char *)&sc->wi_stats, sizeof(sc->wi_stats)); @@ -337,36 +373,76 @@ wi_stop(sc); ifmedia_init(&sc->ifmedia, 0, wi_media_change, wi_media_status); - /* XXX: Should read from card capabilities */ #define ADD(m, c) ifmedia_add(&sc->ifmedia, (m), (c), NULL) - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, - IFM_IEEE80211_ADHOC, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, 0, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, - IFM_IEEE80211_ADHOC, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, 0, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, - IFM_IEEE80211_ADHOC, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, 0, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, - IFM_IEEE80211_ADHOC, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, 0, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, - IFM_IEEE80211_ADHOC, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, 0, 0), 0); - if (sc->sc_firmware_type == WI_INTERSIL) { + if (sc->wi_supprates & WI_SUPPRATES_1M) { + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, 0, 0), 0); ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, - IFM_IEEE80211_HOSTAP, 0), 0); + IFM_IEEE80211_ADHOC, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, + IFM_IEEE80211_IBSS, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_CREATE_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, + IFM_IEEE80211_IBSSMASTER, 0), 0); + if (sc->sc_firmware_type == WI_INTERSIL) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, + IFM_IEEE80211_HOSTAP, 0), 0); + } + if (sc->wi_supprates & WI_SUPPRATES_2M) { + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, 0, 0), 0); ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, - IFM_IEEE80211_HOSTAP, 0), 0); + IFM_IEEE80211_ADHOC, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, + IFM_IEEE80211_IBSS, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_CREATE_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, + IFM_IEEE80211_IBSSMASTER, 0), 0); + if (sc->sc_firmware_type == WI_INTERSIL) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, + IFM_IEEE80211_HOSTAP, 0), 0); + } + if (sc->wi_supprates & WI_SUPPRATES_5M) { + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, 0, 0), 0); ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, - IFM_IEEE80211_HOSTAP, 0), 0); + IFM_IEEE80211_ADHOC, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, + IFM_IEEE80211_IBSS, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_CREATE_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, + IFM_IEEE80211_IBSSMASTER, 0), 0); + if (sc->sc_firmware_type == WI_INTERSIL) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, + IFM_IEEE80211_HOSTAP, 0), 0); + } + if (sc->wi_supprates & WI_SUPPRATES_11M) { + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, 0, 0), 0); ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, + IFM_IEEE80211_ADHOC, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, + IFM_IEEE80211_IBSS, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_CREATE_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, + IFM_IEEE80211_IBSSMASTER, 0), 0); + if (sc->sc_firmware_type == WI_INTERSIL) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, + IFM_IEEE80211_HOSTAP, 0), 0); + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_MANUAL, 0, 0), 0); + } + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, IFM_IEEE80211_ADHOC, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, IFM_IEEE80211_IBSS, + 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_CREATE_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, + IFM_IEEE80211_IBSSMASTER, 0), 0); + if (sc->sc_firmware_type == WI_INTERSIL) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, IFM_IEEE80211_HOSTAP, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, - IFM_IEEE80211_HOSTAP, 0), 0); - } -#undef ADD + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, 0, 0), 0); +#undef ADD ifmedia_set(&sc->ifmedia, IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, 0, 0)); @@ -1065,7 +1141,15 @@ for (i = 0; i < ltv->wi_len - 1; i++) ptr[i] = CSR_READ_2(sc, WI_DATA1); - if (sc->sc_firmware_type != WI_LUCENT) { + if (ltv->wi_type == WI_RID_PORTTYPE && sc->wi_ptype == WI_PORTTYPE_IBSS + && ltv->wi_val == sc->wi_ibss_port) { + /* + * Convert vendor IBSS port type to WI_PORTTYPE_IBSS. + * Since Lucent uses port type 1 for BSS *and* IBSS we + * have to rely on wi_ptype to distinguish this for us. + */ + ltv->wi_val = htole16(WI_PORTTYPE_IBSS); + } else if (sc->sc_firmware_type != WI_LUCENT) { switch (oltv->wi_type) { case WI_RID_TX_RATE: case WI_RID_CUR_TX_RATE: @@ -1116,7 +1200,14 @@ int i; struct wi_ltv_gen p2ltv; - if (sc->sc_firmware_type != WI_LUCENT) { + if (ltv->wi_type == WI_RID_PORTTYPE && + le16toh(ltv->wi_val) == WI_PORTTYPE_IBSS) { + /* Convert WI_PORTTYPE_IBSS to vendor IBSS port type. */ + p2ltv.wi_type = WI_RID_PORTTYPE; + p2ltv.wi_len = 2; + p2ltv.wi_val = sc->wi_ibss_port; + ltv = &p2ltv; + } else if (sc->sc_firmware_type != WI_LUCENT) { switch (ltv->wi_type) { case WI_RID_TX_RATE: p2ltv.wi_type = WI_RID_TX_RATE; @@ -1935,12 +2026,12 @@ /* Program max data length. */ WI_SETVAL(WI_RID_MAX_DATALEN, sc->wi_max_data_len); + /* Set the port type. */ + WI_SETVAL(WI_RID_PORTTYPE, sc->wi_ptype); + /* Enable/disable IBSS creation. */ WI_SETVAL(WI_RID_CREATE_IBSS, sc->wi_create_ibss); - /* Set the port type. */ - WI_SETVAL(WI_RID_PORTTYPE, sc->wi_ptype); - /* Program the RTS/CTS threshold. */ WI_SETVAL(WI_RID_RTS_THRESH, sc->wi_rts_thresh); @@ -2725,13 +2816,37 @@ struct wi_softc *sc = ifp->if_softc; int otype = sc->wi_ptype; int orate = sc->wi_tx_rate; + int ocreate_ibss = sc->wi_create_ibss; + + if ((sc->ifmedia.ifm_cur->ifm_media & IFM_IEEE80211_HOSTAP) && + sc->sc_firmware_type != WI_INTERSIL) + return (EINVAL); - if ((sc->ifmedia.ifm_cur->ifm_media & IFM_IEEE80211_ADHOC) != 0) + sc->wi_create_ibss = 0; + + switch (sc->ifmedia.ifm_cur->ifm_media & IFM_OMASK) { + case 0: + sc->wi_ptype = WI_PORTTYPE_BSS; + break; + case IFM_IEEE80211_ADHOC: sc->wi_ptype = WI_PORTTYPE_ADHOC; - else if ((sc->ifmedia.ifm_cur->ifm_media & IFM_IEEE80211_HOSTAP) != 0) + break; + case IFM_IEEE80211_HOSTAP: sc->wi_ptype = WI_PORTTYPE_AP; - else - sc->wi_ptype = WI_PORTTYPE_BSS; + break; + case IFM_IEEE80211_IBSSMASTER: + case IFM_IEEE80211_IBSSMASTER|IFM_IEEE80211_IBSS: + if (!(sc->wi_flags & WI_FLAGS_HAS_CREATE_IBSS)) + return (EINVAL); + sc->wi_create_ibss = 1; + /* FALLTHROUGH */ + case IFM_IEEE80211_IBSS: + sc->wi_ptype = WI_PORTTYPE_IBSS; + break; + default: + /* Invalid combination. */ + return (EINVAL); + } switch (IFM_SUBTYPE(sc->ifmedia.ifm_cur->ifm_media)) { case IFM_IEEE80211_DS1: @@ -2751,7 +2866,7 @@ break; } - if (otype != sc->wi_ptype || + if (ocreate_ibss != sc->wi_create_ibss || otype != sc->wi_ptype || orate != sc->wi_tx_rate) wi_init(sc); @@ -2772,6 +2887,12 @@ imr->ifm_active |= IFM_IEEE80211_ADHOC; else if (sc->wi_ptype == WI_PORTTYPE_AP) imr->ifm_active |= IFM_IEEE80211_HOSTAP; + else if (sc->wi_ptype == WI_PORTTYPE_IBSS) { + if (sc->wi_create_ibss) + imr->ifm_active |= IFM_IEEE80211_IBSSMASTER; + else + imr->ifm_active |= IFM_IEEE80211_IBSS; + } wreq.wi_type = WI_RID_CUR_TX_RATE; wreq.wi_len = WI_MAX_DATALEN; if (wi_read_record(sc, (struct wi_ltv_gen *)&wreq) == 0) { @@ -2795,7 +2916,8 @@ } imr->ifm_status = IFM_AVALID; - if (sc->wi_ptype == WI_PORTTYPE_ADHOC) + if (sc->wi_ptype == WI_PORTTYPE_ADHOC || + sc->wi_ptype == WI_PORTTYPE_IBSS) /* * XXX: It would be nice if we could give some actually * useful status like whether we joined another IBSS or ==== //depot/projects/kse/sys/dev/wi/if_wireg.h#10 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/wi/if_wireg.h,v 1.31 2002/04/11 07:21:16 imp Exp $ + * $FreeBSD: src/sys/dev/wi/if_wireg.h,v 1.32 2002/06/19 17:37:34 imp Exp $ */ #define WI_DELAY 5 @@ -497,10 +497,10 @@ * (Only PRISM2; not 802.11 compliant mode, testing use only) * 6 == HOST AP (Only PRISM2) */ -#define WI_PORTTYPE_IBSS 0x0 #define WI_PORTTYPE_BSS 0x1 #define WI_PORTTYPE_WDS 0x2 #define WI_PORTTYPE_ADHOC 0x3 +#define WI_PORTTYPE_IBSS 0x4 #define WI_PORTTYPE_AP 0x6 /* ==== //depot/projects/kse/sys/dev/wi/if_wivar.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/wi/if_wivar.h,v 1.8 2002/04/26 23:11:23 imp Exp $ + * $FreeBSD: src/sys/dev/wi/if_wivar.h,v 1.9 2002/06/19 17:37:34 imp Exp $ */ #define WICACHE /* turn on signal strength cache code */ @@ -123,6 +123,15 @@ int wi_tx_data_id; int wi_tx_mgmt_id; int wi_gone; + int wi_flags; +#define WI_FLAGS_ATTACHED 0x01 +#define WI_FLAGS_INITIALIZED 0x02 +#define WI_FLAGS_HAS_WEP 0x04 +#define WI_FLAGS_HAS_IBSS 0x08 +#define WI_FLAGS_HAS_CREATE_IBSS 0x10 +#define WI_FLAGS_HAS_MOR 0x20 +#define WI_FLAGS_HAS_ROAMING 0x30 +#define WI_FLAGS_HAS_DIVERSITY 0x40 int wi_if_flags; u_int16_t wi_procframe; u_int16_t wi_ptype; @@ -159,6 +168,7 @@ struct wihap_info wi_hostap_info; u_int32_t wi_icv; int wi_icv_flag; + int wi_ibss_port; struct callout_handle wi_stat_ch; #if __FreeBSD_version >= 500000 struct mtx wi_mtx; ==== //depot/projects/kse/sys/kern/sys_generic.c#27 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/sys_generic.c,v 1.101 2002/06/12 02:08:18 kbyanc Exp $ + * $FreeBSD: src/sys/kern/sys_generic.c,v 1.102 2002/06/19 08:37:02 phk Exp $ */ #include "opt_ktrace.h" @@ -646,28 +646,6 @@ *(caddr_t *)data = uap->data; } -#ifdef __alpha__ - { - int annoy = 1; - - if (com == DIOCGDINFO_ALPHAHACK) - com = DIOCGDINFO; - else if (com == DIOCSDINFO_ALPHAHACK) - com = DIOCSDINFO; - else if (com == DIOCWDINFO_ALPHAHACK) - com = DIOCWDINFO; - else if (com == DIOCGDVIRGIN_ALPHAHACK) - com = DIOCGDVIRGIN; - else - annoy = 0; - if (annoy) { - uprintf("Recompile this program, it uses obsolete ioctls.\n"); - printf("Program using uses obsolete ioctls used, recompile.\n"); - tsleep(&annoy, PPAUSE, "syncer", 15 * hz); - } - } -#endif - switch (com) { case FIONBIO: ==== //depot/projects/kse/sys/pc98/conf/GENERIC#16 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.203 2002/05/03 17:59:23 jmallett Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.204 2002/06/19 13:47:53 nyan Exp $ machine pc98 #cpu I386_CPU #Do not enable with other cpu types @@ -64,6 +64,7 @@ options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +options ALT_BREAK_TO_DEBUGGER # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel @@ -160,6 +161,7 @@ # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') +device em # Intel PRO/1000 adapter Gigabit Ethernet Card device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') ==== //depot/projects/kse/sys/pc98/pc98/fd.c#10 (text+ko) ==== @@ -50,7 +50,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.118 2002/05/14 12:30:52 nyan Exp $ + * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.119 2002/06/19 13:17:43 nyan Exp $ */ #include "opt_fdc.h" @@ -1899,26 +1899,29 @@ /* * FDC IO functions, take care of the main status register, timeout * in case the desired status bits are never set. + * + * These PIO loops initially start out with short delays between + * each iteration in the expectation that the required condition + * is usually met quickly, so it can be handled immediately. After + * about 1 ms, stepping is increased to achieve a better timing + * accuracy in the calls to DELAY(). */ static int fd_in(struct fdc_data *fdc, int *ptr) { - int i, j = FDSTS_TIMEOUT; - while ((i = fdsts_rd(fdc) & (NE7_DIO|NE7_RQM)) - != (NE7_DIO|NE7_RQM) && j-- > 0) { + int i, j, step; + + for (j = 0, step = 1; + (i = fdsts_rd(fdc) & (NE7_DIO|NE7_RQM)) != (NE7_DIO|NE7_RQM) && + j < FDSTS_TIMEOUT; + j += step) { if (i == NE7_RQM) return (fdc_err(fdc, "ready for output in input\n")); - /* - * After (maybe) 1 msec of waiting, back off to larger - * stepping to get the timing more accurate. - */ - if (FDSTS_TIMEOUT - j > 1000) { - DELAY(1000); - j -= 999; - } else - DELAY(1); + if (j == 1000) + step = 1000; + DELAY(step); } - if (j <= 0) + if (j >= FDSTS_TIMEOUT) return (fdc_err(fdc, bootverbose? "input ready timeout\n": 0)); #ifdef FDC_DEBUG i = fddata_rd(fdc); @@ -1936,36 +1939,19 @@ int out_fdc(struct fdc_data *fdc, int x) { - int i; + int i, j, step; - /* Check that the direction bit is set */ - i = FDSTS_TIMEOUT; - while ((fdsts_rd(fdc) & NE7_DIO) && i-- > 0) - /* - * After (maybe) 1 msec of waiting, back off to larger - * stepping to get the timing more accurate. - */ - if (FDSTS_TIMEOUT - i > 1000) { - DELAY(1000); - i -= 999; - } else - DELAY(1); - if (i <= 0) - return (fdc_err(fdc, "direction bit not set\n")); - - /* Check that the floppy controller is ready for a command */ - i = FDSTS_TIMEOUT; - while ((fdsts_rd(fdc) & NE7_RQM) == 0 && i-- > 0) - /* - * After (maybe) 1 msec of waiting, back off to larger - * stepping to get the timing more accurate. - */ - if (FDSTS_TIMEOUT - i > 1000) { - DELAY(1000); - i -= 999; - } else - DELAY(1); - if (i <= 0) + for (j = 0, step = 1; + (i = fdsts_rd(fdc) & (NE7_DIO|NE7_RQM)) != NE7_RQM && + j < FDSTS_TIMEOUT; + j += step) { + if (i == (NE7_DIO|NE7_RQM)) + return (fdc_err(fdc, "ready for input in output\n")); + if (j == 1000) + step = 1000; + DELAY(step); + } + if (j >= FDSTS_TIMEOUT) return (fdc_err(fdc, bootverbose? "output ready timeout\n": 0)); /* Send the command and return */ ==== //depot/projects/kse/sys/pc98/pc98/sio.c#16 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.173 2002/06/18 21:30:36 n_hibma Exp $ + * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.174 2002/06/19 13:20:20 nyan Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -435,9 +435,7 @@ &gdbdefaultrate, GDBSPEED, ""); static u_int com_events; /* input chars + weighted output completions */ static Port_t siocniobase; -#ifndef __alpha__ -static int siocnunit; -#endif +static int siocnunit = -1; static Port_t siogdbiobase; static int siogdbunit = -1; static void *sio_slow_ih; @@ -4416,6 +4414,7 @@ int s; struct siocnstate sp; Port_t iobase; + speed_t speed; if (minor(dev) == siocnunit) { iobase = siocniobase; @@ -4445,12 +4444,20 @@ { int c; Port_t iobase; + speed_t speed; int s; struct siocnstate sp; - iobase = siogdbiobase; + if (minor(dev) == siocnunit) { + iobase = siocniobase; + speed = comdefaultrate; + } else { + iobase = siogdbiobase; + speed = gdbdefaultrate; + } + s = spltty(); - siocnopen(&sp, iobase, gdbdefaultrate); + siocnopen(&sp, iobase, speed); while (!(inb(iobase + com_lsr) & LSR_RXRDY)) ; c = inb(iobase + com_data); @@ -4463,11 +4470,21 @@ siogdbputc(c) int c; { + Port_t iobase; + speed_t speed; int s; struct siocnstate sp; + if (minor(dev) == siocnunit) { + iobase = siocniobase; + speed = comdefaultrate; + } else { + iobase = siogdbiobase; + speed = gdbdefaultrate; + } + s = spltty(); - siocnopen(&sp, siogdbiobase, gdbdefaultrate); + siocnopen(&sp, iobase, speed); siocntxwait(siogdbiobase); outb(siogdbiobase + com_data, c); siocnclose(&sp, siogdbiobase); ==== //depot/projects/kse/sys/sys/disklabel.h#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)disklabel.h 8.2 (Berkeley) 7/10/94 - * $FreeBSD: src/sys/sys/disklabel.h,v 1.85 2002/05/16 21:28:26 trhodes Exp $ + * $FreeBSD: src/sys/sys/disklabel.h,v 1.86 2002/06/19 08:36:59 phk Exp $ */ #ifndef _SYS_DISKLABEL_H_ @@ -358,20 +358,6 @@ #define DIOCWLABEL _IOW('d', 109, int) /* write en/disable label */ -#ifdef __alpha__ -struct disklabel_alphahack { - struct disklabel dl; - char pad[4]; -}; -#define DIOCGDINFO_ALPHAHACK _IOR('d', 101, struct disklabel_alphahack)/* get */ -#define DIOCSDINFO_ALPHAHACK _IOW('d', 102, struct disklabel_alphahack)/* set */ -#define DIOCWDINFO_ALPHAHACK _IOW('d', 103, struct disklabel_alphahack)/* set, update disk */ -#define DIOCGDVIRGIN_ALPHAHACK _IOR('d', 105, struct disklabel_alphahack)/* get virgin label */ -#ifdef CTASSERT -CTASSERT(sizeof(struct disklabel_alphahack) == 280); -#endif -#endif - #ifdef _KERNEL /* ==== //depot/projects/kse/sys/ufs/ufs/ufs_readwrite.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_readwrite.c 8.11 (Berkeley) 5/8/95 - * $FreeBSD: src/sys/ufs/ufs/ufs_readwrite.c,v 1.89 2002/05/17 18:59:53 phk Exp $ + * $FreeBSD: src/sys/ufs/ufs/ufs_readwrite.c,v 1.90 2002/06/19 09:39:41 dillon Exp $ */ #define BLKSIZE(a, b, c) blksize(a, b, c) @@ -491,23 +491,27 @@ vnode_pager_setsize(vp, uio->uio_offset + xfersize); /* - * Avoid a data-consistency race between write() and mmap() - * by ensuring that newly allocated blocks are zerod. The - * race can occur even in the case where the write covers - * the entire block. + * We must perform a read-before-write if the transfer size + * does not cover the entire buffer. */ - flags |= B_CLRBUF; -#if 0 if (fs->fs_bsize > xfersize) flags |= B_CLRBUF; else flags &= ~B_CLRBUF; -#endif /* XXX is uio->uio_offset the right thing here? */ error = UFS_BALLOC(vp, uio->uio_offset, xfersize, ap->a_cred, flags, &bp); if (error != 0) break; + /* + * If the buffer is not valid we have to clear out any + * garbage data from the pages instantiated for the buffer. + * If we do not, a failed uiomove() during a write can leave + * the prior contents of the pages exposed to a userland + * mmap(). XXX deal with uiomove() errors a better way. + */ + if ((bp->b_flags & B_CACHE) == 0 && fs->fs_bsize <= xfersize) + vfs_bio_clrbuf(bp); if (ioflag & IO_DIRECT) bp->b_flags |= B_DIRECT; if (ioflag & IO_NOWDRAIN) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 13:37:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B04A37B40A; Wed, 19 Jun 2002 13:37:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 11FC237B407 for ; Wed, 19 Jun 2002 13:37:25 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5JKbOJ92925 for perforce@freebsd.org; Wed, 19 Jun 2002 13:37:24 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 19 Jun 2002 13:37:24 -0700 (PDT) Message-Id: <200206192037.g5JKbOJ92925@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13170 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13170 Change 13170 by julian@julian_ref on 2002/06/19 13:36:35 this test program matches the new API/ABI Affected files ... ... //depot/projects/kse/bin/ksetest/kse_threads_test.c#9 edit Differences ... ==== //depot/projects/kse/bin/ksetest/kse_threads_test.c#9 (text+ko) ==== @@ -1,3 +1,4 @@ +#define _KERNEL #include #include @@ -52,7 +53,7 @@ /************************************************************* * Globals **************************************************************/ -struct per_kse *first_kse; /* for NOW cheat and make it global */ +struct per_kse first_kse; /* for NOW cheat and make it global */ TAILQ_HEAD(, user_thread) runqueue = TAILQ_HEAD_INITIALIZER(runqueue); /************************************************************* * Implementation parameters @@ -91,7 +92,7 @@ { struct user_thread *thread; struct thread_mailbox *completed; - struct per_kse *ksedata = ke_mbox->kmbx_UTS_handle; + struct per_kse *ksedata; int done = 0; /**********************************/ @@ -99,6 +100,7 @@ /**********************************/ /**********************************/ + ksedata = ke_mbox->kmbx_UTS_handle; /* If there are returned syscall threads, put them on the run queue */ if ((completed = ke_mbox->kmbx_completed_threads)) { ke_mbox->kmbx_completed_threads = NULL; @@ -136,13 +138,11 @@ int err; newstack = malloc(K_STACKSIZE); - user_UTS_info = malloc(sizeof (struct per_kse)); - bzero(user_UTS_info, sizeof (struct per_kse)); - mboxaddr = &user_UTS_info->mbox; + mboxaddr = &ksedata->mbox; mboxaddr->kmbx_stackbase = newstack; mboxaddr->kmbx_stacksize = K_STACKSIZE; mboxaddr->kmbx_upcall = &UTS; - mboxaddr->kmbx_UTS_handle = newstack; + mboxaddr->kmbx_UTS_handle = ksedata; err = kse_new(mboxaddr, newgroup); return(err); } @@ -252,10 +252,10 @@ runq_insert( makethread(&thread2_code, 0, NULL)); /* and one which we will run ourself */ - first_kse->curthread = makethread(&thread3_code, 0, NULL); + first_kse.curthread = makethread(&thread3_code, 0, NULL); /* start two KSEs in different KSEGRPs */ - if (startkse(first_kse)) { + if (startkse(&first_kse)) { perror("failed to start KSE"); exit(1); } @@ -265,7 +265,7 @@ /* we are a thread, start the ball rolling */ /* let the kernel know we are it */ - first_kse->mbox.kmbx_current_thread = &first_kse->curthread->mbox; + first_kse.mbox.kmbx_current_thread = &first_kse.curthread->mbox; thread3_code(NULL); return 0; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 14:21:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B77D37B400; Wed, 19 Jun 2002 14:21:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C655F37B401 for ; Wed, 19 Jun 2002 14:21:19 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5JLLJO04046 for perforce@freebsd.org; Wed, 19 Jun 2002 14:21:19 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 19 Jun 2002 14:21:19 -0700 (PDT) Message-Id: <200206192121.g5JLLJO04046@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13174 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13174 Change 13174 by julian@julian_ref on 2002/06/19 14:20:26 Remove debugging cruft Affected files ... ... //depot/projects/kse/sys/i386/i386/trap.c#52 edit ... //depot/projects/kse/sys/kern/kern_proc.c#71 edit ... //depot/projects/kse/sys/kern/kern_thread.c#74 edit ... //depot/projects/kse/sys/kern/subr_trap.c#69 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#52 (text+ko) ==== @@ -965,7 +965,6 @@ */ td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox + offsetof(struct kse_mailbox, kmbx_current_thread)); -printf("is KSE mode in syscall(): %p\n", td->td_mailbox); if ((td->td_mailbox == NULL) || (td->td_mailbox == (void *)-1)) { td->td_mailbox = NULL; /* single thread it.. */ ==== //depot/projects/kse/sys/kern/kern_proc.c#71 (text+ko) ==== @@ -218,10 +218,8 @@ int err; p = td->td_proc; -printf("got here 0\n"); if ((err = copyin(uap->mbx, &mbx, sizeof(mbx)))) return (err); -printf("got here 1\n"); PROC_LOCK(p); /* * If we have no KSE mode set, just set it, and skip KSE and KSEGRP @@ -248,7 +246,6 @@ */ newkse = td->td_kse; } -printf("got here 2\n"); /* * Fill out the KSE-mode specific fields of the new kse. */ ==== //depot/projects/kse/sys/kern/kern_thread.c#74 (text+ko) ==== @@ -400,8 +400,6 @@ td, td->td_proc->p_pid, td->td_proc->p_comm); thread_link(td2, ke->ke_ksegrp); cpu_set_upcall(td2, ke->ke_pcb); -printf("thread_schedule_upcall: Scheduled td %p, my td %p, kse %p\n", -td2, td, ke); td2->td_ucred = crhold(td->td_ucred); td2->td_kse = NULL; /* Back as it was. */ td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; ==== //depot/projects/kse/sys/kern/subr_trap.c#69 (text+ko) ==== @@ -202,7 +202,6 @@ if (td->td_flags & TDF_UPCALLING) { CTR3(KTR_PROC, "userret: upcall thread %p (pid %d, %s)", td, p->p_pid, p->p_comm); -printf("Upcalling!\n"); /* * Make sure that it has the correct frame loaded. * While we know that we are on the same KSEGRP @@ -230,12 +229,6 @@ error = suword((caddr_t)td->td_kse->ke_mailbox + offsetof(struct kse_mailbox, kmbx_current_thread), 0); -#if 0 -#ifdef __i386__ -printf("suword mailbox to 0 error: %d, frame= %p, eip=%d, esp=%d\n", error, -frame, frame->tf_eip, frame->tf_esp); -#endif -#endif } /* * Stop any chance that we may be separated from To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 16: 1:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3022737B412; Wed, 19 Jun 2002 16:00:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 414F937B414 for ; Wed, 19 Jun 2002 16:00:20 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5JN0Jh19981 for perforce@freebsd.org; Wed, 19 Jun 2002 16:00:19 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 19 Jun 2002 16:00:19 -0700 (PDT) Message-Id: <200206192300.g5JN0Jh19981@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13176 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13176 Change 13176 by julian@julian_ref on 2002/06/19 15:59:38 MFC Affected files ... ... //depot/projects/kse/sys/cam/scsi/scsi_sa.c#6 integrate ... //depot/projects/kse/sys/kern/kern_linker.c#16 integrate ... //depot/projects/kse/sys/kern/kern_switch.c#52 edit ... //depot/projects/kse/sys/sys/un.h#7 integrate ... //depot/projects/kse/sys/vm/uma.h#6 integrate ... //depot/projects/kse/sys/vm/uma_core.c#10 integrate ... //depot/projects/kse/sys/vm/vm_kern.c#7 integrate Differences ... ==== //depot/projects/kse/sys/cam/scsi/scsi_sa.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.81 2001/09/14 19:00:51 mjacob Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.82 2002/06/19 20:44:48 robert Exp $ * * Implementation of SCSI Sequential Access Peripheral driver for CAM. * @@ -2298,7 +2298,7 @@ saerror(union ccb *ccb, u_int32_t cflgs, u_int32_t sflgs) { static const char *toobig = - "%d-byte tape record bigger than suplied buffer\n"; + "%d-byte tape record bigger than supplied buffer\n"; struct cam_periph *periph; struct sa_softc *softc; struct ccb_scsiio *csio; ==== //depot/projects/kse/sys/kern/kern_linker.c#16 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_linker.c,v 1.89 2002/04/26 09:52:54 brian Exp $ + * $FreeBSD: src/sys/kern/kern_linker.c,v 1.90 2002/06/19 21:25:59 arr Exp $ */ #include "opt_ddb.h" @@ -68,22 +68,27 @@ linker_file_t linker_kernel_file; -static struct lock lock; /* lock for the file list */ +static struct mtx kld_mtx; /* kernel linker mutex */ + static linker_class_list_t classes; static linker_file_list_t linker_files; static int next_file_id = 1; +static int linker_no_more_classes = 0; #define LINKER_GET_NEXT_FILE_ID(a) do { \ linker_file_t lftmp; \ \ retry: \ + mtx_lock(&kld_mtx); \ TAILQ_FOREACH(lftmp, &linker_files, link) { \ if (next_file_id == lftmp->id) { \ next_file_id++; \ + mtx_unlock(&kld_mtx); \ goto retry; \ } \ } \ (a) = next_file_id; \ + mtx_unlock(&kld_mtx); /* Hold for safe read of id variable */ \ } while(0) @@ -115,17 +120,32 @@ linker_init(void *arg) { - lockinit(&lock, PVM, "klink", 0, 0); + mtx_init(&kld_mtx, "kernel linker", NULL, MTX_DEF); TAILQ_INIT(&classes); TAILQ_INIT(&linker_files); } SYSINIT(linker, SI_SUB_KLD, SI_ORDER_FIRST, linker_init, 0) +static void +linker_stop_class_add(void *arg) +{ + + linker_no_more_classes = 1; +} + +SYSINIT(linker_class, SI_SUB_KLD, SI_ORDER_ANY, linker_stop_class_add, NULL) + int linker_add_class(linker_class_t lc) { + /* + * We disallow any class registration passt SI_ORDER_ANY + * of SI_SUB_KLD. + */ + if (linker_no_more_classes == 1) + return (EPERM); kobj_class_compile((kobj_class_t) lc); TAILQ_INSERT_TAIL(&classes, lc, link); return (0); @@ -315,6 +335,12 @@ } lf = NULL; foundfile = 0; + + /* + * We do not need to protect (lock) classes here because there is + * no class registration past startup (SI_SUB_KLD, SI_ORDER_ANY) + * and there is no class deregistration mechanism at this time. + */ TAILQ_FOREACH(lc, &classes, link) { KLD_DPF(FILE, ("linker_load_file: trying to load %s\n", filename)); @@ -374,14 +400,14 @@ goto out; sprintf(koname, "%s.ko", filename); - lockmgr(&lock, LK_SHARED, 0, curthread); + mtx_lock(&kld_mtx); TAILQ_FOREACH(lf, &linker_files, link) { if (strcmp(lf->filename, koname) == 0) break; if (strcmp(lf->filename, filename) == 0) break; } - lockmgr(&lock, LK_RELEASE, 0, curthread); + mtx_unlock(&kld_mtx); out: if (koname) free(koname, M_LINKER); @@ -392,12 +418,12 @@ linker_find_file_by_id(int fileid) { linker_file_t lf = 0; - - lockmgr(&lock, LK_SHARED, 0, curthread); + + mtx_lock(&kld_mtx); TAILQ_FOREACH(lf, &linker_files, link) if (lf->id == fileid) break; - lockmgr(&lock, LK_RELEASE, 0, curthread); + mtx_unlock(&kld_mtx); return (lf); } @@ -411,7 +437,6 @@ filename = linker_basename(pathname); KLD_DPF(FILE, ("linker_make_file: new file, filename=%s\n", filename)); - lockmgr(&lock, LK_EXCLUSIVE, 0, curthread); lf = (linker_file_t)kobj_create((kobj_class_t)lc, M_LINKER, M_WAITOK); if (lf == NULL) goto out; @@ -424,9 +449,10 @@ lf->deps = NULL; STAILQ_INIT(&lf->common); TAILQ_INIT(&lf->modules); + mtx_lock(&kld_mtx); TAILQ_INSERT_TAIL(&linker_files, lf, link); + mtx_unlock(&kld_mtx); out: - lockmgr(&lock, LK_RELEASE, 0, curthread); return (lf); } @@ -445,7 +471,6 @@ return (EPERM); KLD_DPF(FILE, ("linker_file_unload: lf->refs=%d\n", file->refs)); - lockmgr(&lock, LK_EXCLUSIVE, 0, curthread); if (file->refs == 1) { KLD_DPF(FILE, ("linker_file_unload: file is unloading," " informing modules\n")); @@ -464,7 +489,6 @@ if ((error = module_unload(mod)) != 0) { KLD_DPF(FILE, ("linker_file_unload: module %x" " vetoes unload\n", mod)); - lockmgr(&lock, LK_RELEASE, 0, curthread); goto out; } else MOD_XLOCK; @@ -474,7 +498,6 @@ } file->refs--; if (file->refs > 0) { - lockmgr(&lock, LK_RELEASE, 0, curthread); goto out; } for (ml = TAILQ_FIRST(&found_modules); ml; ml = nextml) { @@ -491,8 +514,9 @@ linker_file_sysuninit(file); linker_file_unregister_sysctls(file); } + mtx_lock(&kld_mtx); TAILQ_REMOVE(&linker_files, file, link); - lockmgr(&lock, LK_RELEASE, 0, curthread); + mtx_unlock(&kld_mtx); if (file->deps) { for (i = 0; i < file->ndeps; i++) @@ -828,10 +852,12 @@ mtx_lock(&Giant); if (SCARG(uap, fileid) == 0) { + mtx_lock(&kld_mtx); if (TAILQ_FIRST(&linker_files)) td->td_retval[0] = TAILQ_FIRST(&linker_files)->id; else td->td_retval[0] = 0; + mtx_unlock(&kld_mtx); goto out; } lf = linker_find_file_by_id(SCARG(uap, fileid)); @@ -963,6 +989,7 @@ } else error = ENOENT; } else { + mtx_lock(&kld_mtx); TAILQ_FOREACH(lf, &linker_files, link) { if (LINKER_LOOKUP_SYMBOL(lf, symstr, &sym) == 0 && LINKER_SYMBOL_VALUES(lf, sym, &symval) == 0) { @@ -973,6 +1000,7 @@ break; } } + mtx_unlock(&kld_mtx); if (lf == NULL) error = ENOENT; } @@ -1767,12 +1795,16 @@ linker_file_t lf; int error; + mtx_lock(&kld_mtx); TAILQ_FOREACH(lf, &linker_files, link) { error = LINKER_EACH_FUNCTION_NAME(lf, sysctl_kern_function_list_iterate, req); - if (error) + if (error) { + mtx_unlock(&kld_mtx); return (error); + } } + mtx_unlock(&kld_mtx); return (SYSCTL_OUT(req, "", 1)); } ==== //depot/projects/kse/sys/kern/kern_switch.c#52 (text+ko) ==== @@ -225,7 +225,7 @@ * Remove a thread from its KSEGRP's run queue. * This in turn may remove it from a KSE if it was already assigned * to one, possibly causing a new thread to be assigned to the KSE - * and the KSE getting a new priority (unless it's a BOUND threa/KSE pair). + * and the KSE getting a new priority (unless it's a BOUND thread/KSE pair). */ void remrunqueue(struct thread *td) @@ -525,6 +525,7 @@ mtx_assert(&sched_lock, MA_OWNED); KASSERT((ke->ke_thread != NULL), ("runq_add: No thread on KSE")); + KASSERT((ke->ke_thread->td_kse != NULL), ("runq_add: No KSE on thread")); if (ke->ke_state == KES_ONRUNQ) return; #if defined(INVARIANTS) && defined(DIAGNOSTIC) @@ -593,6 +594,10 @@ } ke->ke_state = KES_RUNNING; + KASSERT((ke->ke_thread != NULL), + ("runq_choose: No thread on KSE")); + KASSERT((ke->ke_thread->td_kse != NULL), + ("runq_choose: No KSE on thread")); return (ke); } CTR1(KTR_RUNQ, "runq_choose: idleproc pri=%d", pri); ==== //depot/projects/kse/sys/sys/un.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)un.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/un.h,v 1.23 2002/04/20 02:26:43 mike Exp $ + * $FreeBSD: src/sys/sys/un.h,v 1.24 2002/06/19 19:05:41 mike Exp $ */ #ifndef _SYS_UN_H_ @@ -49,7 +49,7 @@ * Definitions for UNIX IPC domain. */ struct sockaddr_un { - u_char sun_len; /* sockaddr len including null */ + unsigned char sun_len; /* sockaddr len including null */ sa_family_t sun_family; /* AF_UNIX */ char sun_path[104]; /* path name (gag) */ }; ==== //depot/projects/kse/sys/vm/uma.h#6 (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/sys/vm/uma.h,v 1.8 2002/06/17 22:02:41 jeff Exp $ + * $FreeBSD: src/sys/vm/uma.h,v 1.9 2002/06/19 20:49:44 jeff Exp $ * */ @@ -402,7 +402,6 @@ */ #define UMA_SLAB_BOOT 0x01 /* Slab alloced from boot pages */ #define UMA_SLAB_KMEM 0x02 /* Slab alloced from kmem_map */ -#define UMA_SLAB_KMAP 0x04 /* Slab alloced from kernel_map */ #define UMA_SLAB_PRIV 0x08 /* Slab alloced from priv allocator */ #define UMA_SLAB_OFFP 0x10 /* Slab is managed separately */ #define UMA_SLAB_MALLOC 0x20 /* Slab is a large malloc slab */ ==== //depot/projects/kse/sys/vm/uma_core.c#10 (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/sys/vm/uma_core.c,v 1.29 2002/06/17 23:53:58 jeff Exp $ + * $FreeBSD: src/sys/vm/uma_core.c,v 1.30 2002/06/19 20:49:44 jeff Exp $ * */ @@ -697,6 +697,18 @@ } } + /* + * This reproduces the old vm_zone behavior of zero filling pages the + * first time they are added to a zone. + * + * Malloced items are zeroed in uma_zalloc. + */ + + if ((zone->uz_flags & UMA_ZFLAG_MALLOC) == 0) + wait |= M_ZERO; + else + wait &= ~M_ZERO; + if (booted || (zone->uz_flags & UMA_ZFLAG_PRIVALLOC)) { mtx_lock(&Giant); mem = zone->uz_allocf(zone, @@ -794,18 +806,8 @@ { void *p; /* Returned page */ - /* - * XXX The original zone allocator did this, but I don't think it's - * necessary in current. - */ - - if (lockstatus(&kernel_map->lock, NULL)) { - *pflag = UMA_SLAB_KMEM; - p = (void *) kmem_malloc(kmem_map, bytes, wait); - } else { - *pflag = UMA_SLAB_KMAP; - p = (void *) kmem_alloc(kernel_map, bytes); - } + *pflag = UMA_SLAB_KMEM; + p = (void *) kmem_malloc(kmem_map, bytes, wait); return (p); } @@ -874,10 +876,9 @@ page_free(void *mem, int size, u_int8_t flags) { vm_map_t map; + if (flags & UMA_SLAB_KMEM) map = kmem_map; - else if (flags & UMA_SLAB_KMAP) - map = kernel_map; else panic("UMA: page_free used with invalid flags %d\n", flags); @@ -1620,8 +1621,9 @@ ZONE_UNLOCK(zone); /* Only construct at this time if we're not filling a bucket */ - if (bucket == NULL && zone->uz_ctor != NULL) { - zone->uz_ctor(item, zone->uz_size, udata); + if (bucket == NULL) { + if (zone->uz_ctor != NULL) + zone->uz_ctor(item, zone->uz_size, udata); if (flags & M_ZERO) bzero(item, zone->uz_size); } ==== //depot/projects/kse/sys/vm/vm_kern.c#7 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_kern.c,v 1.78 2002/06/14 18:21:00 alc Exp $ + * $FreeBSD: src/sys/vm/vm_kern.c,v 1.79 2002/06/19 20:47:18 jeff Exp $ */ /* @@ -347,6 +347,7 @@ VM_PROT_ALL, VM_PROT_ALL, 0); for (i = 0; i < size; i += PAGE_SIZE) { + int pflags; /* * Note: if M_NOWAIT specified alone, allocate from * interrupt-safe queues only (just the free list). If @@ -356,10 +357,15 @@ * are not allowed to mess with the cache queue. */ retry: - m = vm_page_alloc(kmem_object, OFF_TO_IDX(offset + i), - ((flags & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) ? - VM_ALLOC_INTERRUPT : - VM_ALLOC_SYSTEM); + if ((flags & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) + pflags = VM_ALLOC_INTERRUPT; + else + pflags = VM_ALLOC_SYSTEM; + + if (flags & M_ZERO) + pflags |= VM_ALLOC_ZERO; + + m = vm_page_alloc(kmem_object, OFF_TO_IDX(offset + i), pflags); /* * Ran out of space, free everything up and return. Don't need To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 18:18:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BAC437B40F; Wed, 19 Jun 2002 18:18:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B3AAE37B41A for ; Wed, 19 Jun 2002 18:18:07 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5K1I6H46486 for perforce@freebsd.org; Wed, 19 Jun 2002 18:18:06 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 19 Jun 2002 18:18:06 -0700 (PDT) Message-Id: <200206200118.g5K1I6H46486@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13180 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13180 Change 13180 by peter@peter_ia64 on 2002/06/19 18:17:24 GRRRRR. I've had it with this and the people that ask about it. (I'll commit it shortly, but I can test it here easiest) Affected files ... ... //depot/projects/ia64/sys/netinet/if_ether.c#9 edit Differences ... ==== //depot/projects/ia64/sys/netinet/if_ether.c#9 (text+ko) ==== @@ -102,7 +102,7 @@ static LIST_HEAD(, llinfo_arp) llinfo_arp; struct ifqueue arpintrq; -static int arp_inuse, arp_allocated; +static int arp_inuse, arp_allocated, arpinit_done; static int arp_maxtries = 5; static int useloopback = 1; /* use loopback interface for local traffic */ @@ -162,13 +162,10 @@ register struct sockaddr *gate = rt->rt_gateway; register struct llinfo_arp *la = (struct llinfo_arp *)rt->rt_llinfo; static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK}; - static int arpinit_done; if (!arpinit_done) { arpinit_done = 1; - LIST_INIT(&llinfo_arp); timeout(arptimer, (caddr_t)0, hz); - register_netisr(NETISR_ARP, arpintr); } if (rt->rt_flags & RTF_GATEWAY) return; @@ -494,6 +491,10 @@ register struct arphdr *ar; int s; + if (!arpinit_done) { + arpinit_done = 1; + timeout(arptimer, (caddr_t)0, hz); + } while (arpintrq.ifq_head) { s = splimp(); IF_DEQUEUE(&arpintrq, m); @@ -943,6 +944,8 @@ arpintrq.ifq_maxlen = 50; mtx_init(&arpintrq.ifq_mtx, "arp_inq", NULL, MTX_DEF); + LIST_INIT(&llinfo_arp); + register_netisr(NETISR_ARP, arpintr); } SYSINIT(arp, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, arp_init, 0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 18:34:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8466F37B403; Wed, 19 Jun 2002 18:34:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id ED7C037B412 for ; Wed, 19 Jun 2002 18:34:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5K1YTG49194 for perforce@freebsd.org; Wed, 19 Jun 2002 18:34:29 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Wed, 19 Jun 2002 18:34:29 -0700 (PDT) Message-Id: <200206200134.g5K1YTG49194@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13182 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13182 Change 13182 by julian@julian_ref on 2002/06/19 18:33:42 try MFC jeff's latest patch.. Affected files ... ... //depot/projects/kse/sys/netinet/if_ether.c#12 integrate ... //depot/projects/kse/sys/vm/vm_kern.c#8 integrate Differences ... ==== //depot/projects/kse/sys/netinet/if_ether.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/if_ether.c,v 1.94 2002/05/15 01:03:32 kbyanc Exp $ + * $FreeBSD: src/sys/netinet/if_ether.c,v 1.95 2002/06/20 01:27:40 peter Exp $ */ /* @@ -102,7 +102,7 @@ static LIST_HEAD(, llinfo_arp) llinfo_arp; struct ifqueue arpintrq; -static int arp_inuse, arp_allocated; +static int arp_inuse, arp_allocated, arpinit_done; static int arp_maxtries = 5; static int useloopback = 1; /* use loopback interface for local traffic */ @@ -162,13 +162,10 @@ register struct sockaddr *gate = rt->rt_gateway; register struct llinfo_arp *la = (struct llinfo_arp *)rt->rt_llinfo; static struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK}; - static int arpinit_done; if (!arpinit_done) { arpinit_done = 1; - LIST_INIT(&llinfo_arp); timeout(arptimer, (caddr_t)0, hz); - register_netisr(NETISR_ARP, arpintr); } if (rt->rt_flags & RTF_GATEWAY) return; @@ -494,6 +491,10 @@ register struct arphdr *ar; int s; + if (!arpinit_done) { + arpinit_done = 1; + timeout(arptimer, (caddr_t)0, hz); + } while (arpintrq.ifq_head) { s = splimp(); IF_DEQUEUE(&arpintrq, m); @@ -943,6 +944,8 @@ arpintrq.ifq_maxlen = 50; mtx_init(&arpintrq.ifq_mtx, "arp_inq", NULL, MTX_DEF); + LIST_INIT(&llinfo_arp); + register_netisr(NETISR_ARP, arpintr); } SYSINIT(arp, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, arp_init, 0); ==== //depot/projects/kse/sys/vm/vm_kern.c#8 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_kern.c,v 1.79 2002/06/19 20:47:18 jeff Exp $ + * $FreeBSD: src/sys/vm/vm_kern.c,v 1.80 2002/06/19 23:49:57 jeff Exp $ */ /* @@ -312,6 +312,7 @@ vm_map_entry_t entry; vm_offset_t addr; vm_page_t m; + int pflags; GIANT_REQUIRED; @@ -346,25 +347,26 @@ vm_map_insert(map, kmem_object, offset, addr, addr + size, VM_PROT_ALL, VM_PROT_ALL, 0); + /* + * Note: if M_NOWAIT specified alone, allocate from + * interrupt-safe queues only (just the free list). If + * M_USE_RESERVE is also specified, we can also + * allocate from the cache. Neither of the latter two + * flags may be specified from an interrupt since interrupts + * are not allowed to mess with the cache queue. + */ + + if ((flags & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) + pflags = VM_ALLOC_INTERRUPT; + else + pflags = VM_ALLOC_SYSTEM; + + if (flags & M_ZERO) + pflags |= VM_ALLOC_ZERO; + + for (i = 0; i < size; i += PAGE_SIZE) { - int pflags; - /* - * Note: if M_NOWAIT specified alone, allocate from - * interrupt-safe queues only (just the free list). If - * M_USE_RESERVE is also specified, we can also - * allocate from the cache. Neither of the latter two - * flags may be specified from an interrupt since interrupts - * are not allowed to mess with the cache queue. - */ retry: - if ((flags & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) - pflags = VM_ALLOC_INTERRUPT; - else - pflags = VM_ALLOC_SYSTEM; - - if (flags & M_ZERO) - pflags |= VM_ALLOC_ZERO; - m = vm_page_alloc(kmem_object, OFF_TO_IDX(offset + i), pflags); /* @@ -395,6 +397,8 @@ vm_map_unlock(map); goto bad; } + if (flags & M_ZERO && (m->flags & PG_ZERO) == 0) + vm_page_zero_fill(m); vm_page_flag_clear(m, PG_ZERO); m->valid = VM_PAGE_BITS_ALL; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 22:37:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15BDE37B40D; Wed, 19 Jun 2002 22:37:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F24D737B409 for ; Wed, 19 Jun 2002 22:37:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5K5bOr92302 for perforce@freebsd.org; Wed, 19 Jun 2002 22:37:24 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 19 Jun 2002 22:37:24 -0700 (PDT) Message-Id: <200206200537.g5K5bOr92302@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13187 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13187 Change 13187 by peter@peter_ia64 on 2002/06/19 22:37:19 Do the pread/pwrite emulation treatment on lseek/truncate/ ftruncate/sendfile. sendfile isn't complete - it copyin/out's an off_t through a pointer. lseek() requires special treatment to expand the retval since register_t *td_retval is different on x86 and ia64. p4's internal diff now works again. (yay!) Affected files ... ... //depot/projects/ia64/sys/ia64/ia32/ia32_misc.c#4 edit ... //depot/projects/ia64/sys/ia64/ia32/ia32_proto.h#3 edit ... //depot/projects/ia64/sys/ia64/ia32/ia32_syscall.h#4 edit ... //depot/projects/ia64/sys/ia64/ia32/ia32_sysent.c#4 edit ... //depot/projects/ia64/sys/ia64/ia32/syscalls.master#4 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia32/ia32_misc.c#4 (text+ko) ==== @@ -1039,6 +1039,63 @@ return (pwrite(td, &ap)); } +int +ia32_lseek(struct thread *td, struct ia32_lseek_args *uap) +{ + int error; + struct lseek_args ap; + off_t pos; + + SCARG(&ap, fd) = SCARG(uap, fd); + SCARG(&ap, offset) = (SCARG(uap, offsetlo) + | ((off_t)SCARG(uap, offsethi) << 32)); + SCARG(&ap, whence) = SCARG(uap, whence); + error = lseek(td, &ap); + /* Expand the quad return into two parts for eax and edx */ + pos = *(off_t *)(td->td_retval); + td->td_retval[0] = pos & 0xffffffff; /* %eax */ + td->td_retval[1] = pos >> 32; /* %edx */ + return error; +} + +int +ia32_truncate(struct thread *td, struct ia32_truncate_args *uap) +{ + struct truncate_args ap; + + SCARG(&ap, path) = SCARG(uap, path); + SCARG(&ap, length) = (SCARG(uap, lengthlo) + | ((off_t)SCARG(uap, lengthhi) << 32)); + return (truncate(td, &ap)); +} + +int +ia32_ftruncate(struct thread *td, struct ia32_ftruncate_args *uap) +{ + struct ftruncate_args ap; + + SCARG(&ap, fd) = SCARG(uap, fd); + SCARG(&ap, length) = (SCARG(uap, lengthlo) + | ((off_t)SCARG(uap, lengthhi) << 32)); + return (ftruncate(td, &ap)); +} + +int +ia32_sendfile(struct thread *td, struct ia32_sendfile_args *uap) +{ + struct sendfile_args ap; + + SCARG(&ap, fd) = SCARG(uap, fd); + SCARG(&ap, s) = SCARG(uap, s); + SCARG(&ap, offset) = (SCARG(uap, offsetlo) + | ((off_t)SCARG(uap, offsethi) << 32)); + SCARG(&ap, nbytes) = SCARG(uap, nbytes); /* XXX check */ + SCARG(&ap, hdtr) = SCARG(uap, hdtr); /* XXX check */ + SCARG(&ap, sbytes) = SCARG(uap, sbytes); /* XXX FIXME!! */ + SCARG(&ap, flags) = SCARG(uap, flags); + return (sendfile(td, &ap)); +} + struct stat32 { udev_t st_dev; ino_t st_ino; ==== //depot/projects/ia64/sys/ia64/ia32/ia32_proto.h#3 (text+ko) ==== @@ -170,6 +170,25 @@ char poslo_l_[PADL_(u_int32_t)]; u_int32_t poslo; char poslo_r_[PADR_(u_int32_t)]; char poshi_l_[PADL_(u_int32_t)]; u_int32_t poshi; char poshi_r_[PADR_(u_int32_t)]; }; +struct ia32_lseek_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; + char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; + char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)]; +}; +struct ia32_truncate_args { + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)]; + char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)]; +}; +struct ia32_ftruncate_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)]; + char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)]; + char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)]; +}; struct ia32_sysctl_args { char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)]; char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)]; @@ -178,6 +197,16 @@ char new_l_[PADL_(void *)]; void * new; char new_r_[PADR_(void *)]; char newlen_l_[PADL_(u_int32_t)]; u_int32_t newlen; char newlen_r_[PADR_(u_int32_t)]; }; +struct ia32_sendfile_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)]; + char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)]; + char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)]; + char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)]; + char hdtr_l_[PADL_(struct sf_hdtr *)]; struct sf_hdtr * hdtr; char hdtr_r_[PADR_(struct sf_hdtr *)]; + char sbytes_l_[PADL_(off_t *)]; off_t * sbytes; char sbytes_r_[PADR_(off_t *)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; +}; struct ia32_sigaction_args { char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; char act_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * act; char act_r_[PADR_(struct sigaction32 *)]; @@ -210,7 +239,11 @@ int ia32_fstat(struct thread *, struct ia32_fstat_args *); int ia32_lstat(struct thread *, struct ia32_lstat_args *); int ia32_mmap(struct thread *, struct ia32_mmap_args *); +int ia32_lseek(struct thread *, struct ia32_lseek_args *); +int ia32_truncate(struct thread *, struct ia32_truncate_args *); +int ia32_ftruncate(struct thread *, struct ia32_ftruncate_args *); int ia32_sysctl(struct thread *, struct ia32_sysctl_args *); +int ia32_sendfile(struct thread *, struct ia32_sendfile_args *); int ia32_sigaction(struct thread *, struct ia32_sigaction_args *); #ifdef COMPAT_43 ==== //depot/projects/ia64/sys/ia64/ia32/ia32_syscall.h#4 (text+ko) ==== @@ -127,8 +127,8 @@ #define IA32_SYS_setreuid 126 #define IA32_SYS_setregid 127 #define IA32_SYS_rename 128 -#define IA32_SYS_truncate 129 -#define IA32_SYS_ftruncate 130 + /* 129 is obsolete otruncate */ + /* 130 is obsolete ftruncate */ #define IA32_SYS_flock 131 #define IA32_SYS_mkfifo 132 #define IA32_SYS_sendto 133 @@ -177,9 +177,9 @@ #define IA32_SYS_getdirentries 196 #define IA32_SYS_ia32_mmap 197 #define IA32_SYS___syscall 198 -#define IA32_SYS_lseek 199 -#define IA32_SYS_truncate 200 -#define IA32_SYS_ftruncate 201 +#define IA32_SYS_ia32_lseek 199 +#define IA32_SYS_ia32_truncate 200 +#define IA32_SYS_ia32_ftruncate 201 #define IA32_SYS_ia32_sysctl 202 #define IA32_SYS_mlock 203 #define IA32_SYS_munlock 204 @@ -247,7 +247,7 @@ #define IA32_SYS_sched_get_priority_min 333 #define IA32_SYS_sched_rr_get_interval 334 #define IA32_SYS_utrace 335 -#define IA32_SYS_sendfile 336 +#define IA32_SYS_ia32_sendfile 336 #define IA32_SYS_kldsym 337 #define IA32_SYS_jail 338 #define IA32_SYS_sigprocmask 340 ==== //depot/projects/ia64/sys/ia64/ia32/ia32_sysent.c#4 (text+ko) ==== @@ -146,8 +146,8 @@ { SYF_MPSAFE | AS(setreuid_args), (sy_call_t *)setreuid }, /* 126 = setreuid */ { SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid }, /* 127 = setregid */ { AS(rename_args), (sy_call_t *)rename }, /* 128 = rename */ - { AS(truncate_args), (sy_call_t *)truncate }, /* 129 = truncate */ - { AS(ftruncate_args), (sy_call_t *)ftruncate }, /* 130 = ftruncate */ + { 0, (sy_call_t *)nosys }, /* 129 = obsolete otruncate */ + { 0, (sy_call_t *)nosys }, /* 130 = obsolete ftruncate */ { SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock }, /* 131 = flock */ { AS(mkfifo_args), (sy_call_t *)mkfifo }, /* 132 = mkfifo */ { SYF_MPSAFE | AS(sendto_args), (sy_call_t *)sendto }, /* 133 = sendto */ @@ -216,9 +216,9 @@ { AS(getdirentries_args), (sy_call_t *)getdirentries }, /* 196 = getdirentries */ { AS(ia32_mmap_args), (sy_call_t *)ia32_mmap }, /* 197 = ia32_mmap */ { 0, (sy_call_t *)nosys }, /* 198 = __syscall */ - { AS(lseek_args), (sy_call_t *)lseek }, /* 199 = lseek */ - { AS(truncate_args), (sy_call_t *)truncate }, /* 200 = truncate */ - { AS(ftruncate_args), (sy_call_t *)ftruncate }, /* 201 = ftruncate */ + { AS(ia32_lseek_args), (sy_call_t *)ia32_lseek }, /* 199 = ia32_lseek */ + { AS(ia32_truncate_args), (sy_call_t *)ia32_truncate }, /* 200 = ia32_truncate */ + { AS(ia32_ftruncate_args), (sy_call_t *)ia32_ftruncate }, /* 201 = ia32_ftruncate */ { SYF_MPSAFE | AS(ia32_sysctl_args), (sy_call_t *)ia32_sysctl }, /* 202 = ia32_sysctl */ { SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock }, /* 203 = mlock */ { SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock }, /* 204 = munlock */ @@ -353,7 +353,7 @@ { SYF_MPSAFE | AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min }, /* 333 = sched_get_priority_min */ { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval }, /* 334 = sched_rr_get_interval */ { AS(utrace_args), (sy_call_t *)utrace }, /* 335 = utrace */ - { SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile }, /* 336 = sendfile */ + { SYF_MPSAFE | AS(ia32_sendfile_args), (sy_call_t *)ia32_sendfile }, /* 336 = ia32_sendfile */ { AS(kldsym_args), (sy_call_t *)kldsym }, /* 337 = kldsym */ { SYF_MPSAFE | AS(jail_args), (sy_call_t *)jail }, /* 338 = jail */ { 0, (sy_call_t *)nosys }, /* 339 = pioctl */ ==== //depot/projects/ia64/sys/ia64/ia32/syscalls.master#4 (text+ko) ==== @@ -202,8 +202,8 @@ 126 MNOPROTO BSD { int setreuid(int ruid, int euid); } 127 MNOPROTO BSD { int setregid(int rgid, int egid); } 128 NOPROTO POSIX { int rename(char *from, char *to); } -129 NOPROTO BSD { int truncate(char *path, long length); } -130 NOPROTO BSD { int ftruncate(int fd, long length); } +129 OBSOL BSD otruncate +130 OBSOL BSD ftruncate 131 MNOPROTO BSD { int flock(int fd, int how); } 132 NOPROTO POSIX { int mkfifo(char *path, int mode); } 133 MNOPROTO BSD { int sendto(int s, caddr_t buf, size_t len, \ @@ -301,10 +301,16 @@ int prot, int flags, int fd, int pad, \ u_int32_t poslo, u_int32_t poshi); } 198 NOPROTO NOHIDE { int nosys(void); } __syscall __syscall_args int -199 NOPROTO POSIX { off_t lseek(int fd, int pad, off_t offset, \ +; XXX note - bigendian is different +199 STD POSIX { off_t ia32_lseek(int fd, int pad, \ + u_int32_t offsetlo, u_int32_t offsethi, \ int whence); } -200 NOPROTO BSD { int truncate(char *path, int pad, off_t length); } -201 NOPROTO BSD { int ftruncate(int fd, int pad, off_t length); } +; XXX note - bigendian is different +200 STD BSD { int ia32_truncate(char *path, int pad, \ + u_int32_t lengthlo, u_int32_t lengthhi); } +; XXX note - bigendian is different +201 STD BSD { int ia32_ftruncate(int fd, int pad, \ + u_int32_t lengthlo, u_int32_t lengthhi); } 202 MSTD BSD { int ia32_sysctl(int *name, u_int namelen, \ void *old, u_int32_t *oldlenp, void *new, \ u_int32_t newlen); } @@ -468,8 +474,10 @@ 333 MNOPROTO POSIX { int sched_get_priority_min (int policy); } 334 MNOPROTO POSIX { int sched_rr_get_interval (pid_t pid, struct timespec *interval); } 335 NOPROTO BSD { int utrace(const void *addr, size_t len); } -336 MNOPROTO BSD { int sendfile(int fd, int s, off_t offset, size_t nbytes, \ - struct sf_hdtr *hdtr, off_t *sbytes, int flags); } +; XXX note - bigendian is different +336 MSTD BSD { int ia32_sendfile(int fd, int s, u_int32_t offsetlo, \ + u_int32_t offsethi, size_t nbytes, \ + struct sf_hdtr *hdtr, off_t *sbytes, int flags); } 337 NOPROTO BSD { int kldsym(int fileid, int cmd, void *data); } 338 MNOPROTO BSD { int jail(struct jail *jail); } 339 UNIMPL BSD pioctl To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 23:11:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6846637B403; Wed, 19 Jun 2002 23:10:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8443A37B406 for ; Wed, 19 Jun 2002 23:10:08 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5K6A7H00343 for perforce@freebsd.org; Wed, 19 Jun 2002 23:10:07 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Wed, 19 Jun 2002 23:10:07 -0700 (PDT) Message-Id: <200206200610.g5K6A7H00343@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13189 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13189 Change 13189 by peter@peter_daintree on 2002/06/19 23:09:18 IFC @13188 Affected files ... ... //depot/projects/ia64/bin/ed/ed.h#3 integrate ... //depot/projects/ia64/bin/ed/main.c#3 integrate ... //depot/projects/ia64/bin/sh/jobs.c#7 integrate ... //depot/projects/ia64/bin/sh/mktokens#2 integrate ... //depot/projects/ia64/bin/sh/parser.c#4 integrate ... //depot/projects/ia64/bin/sh/sh.1#8 integrate ... //depot/projects/ia64/contrib/gdb/gdb/coffread.c#1 branch ... //depot/projects/ia64/contrib/gdb/gdb/defs.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/top.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/utils.c#3 integrate ... //depot/projects/ia64/etc/pam.d/Makefile#5 integrate ... //depot/projects/ia64/etc/pam.d/csshd#3 delete ... //depot/projects/ia64/etc/pam.d/sshd#6 integrate ... //depot/projects/ia64/etc/pam.d/telnetd#2 integrate ... //depot/projects/ia64/etc/rc.d/network1#2 integrate ... //depot/projects/ia64/etc/rc.devfs#4 integrate ... //depot/projects/ia64/gnu/lib/libstdc++/Makefile#8 integrate ... //depot/projects/ia64/include/stdbool.h#2 integrate ... //depot/projects/ia64/lib/libfetch/http.c#6 integrate ... //depot/projects/ia64/release/Makefile#15 integrate ... //depot/projects/ia64/share/examples/etc/make.conf#13 integrate ... //depot/projects/ia64/share/man/man4/ng_device.4#1 branch ... //depot/projects/ia64/share/man/man5/make.conf.5#14 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#8 integrate ... //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#2 integrate ... //depot/projects/ia64/sys/conf/files#30 integrate ... //depot/projects/ia64/sys/conf/options#19 integrate ... //depot/projects/ia64/sys/conf/options.i386#6 integrate ... //depot/projects/ia64/sys/conf/options.ia64#6 integrate ... //depot/projects/ia64/sys/conf/options.pc98#7 integrate ... //depot/projects/ia64/sys/dev/ata/ata-dma.c#14 integrate ... //depot/projects/ia64/sys/dev/ata/ata-pci.c#13 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-fd.c#7 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-fd.h#3 integrate ... //depot/projects/ia64/sys/dev/em/if_em_fxhw.c#4 delete ... //depot/projects/ia64/sys/dev/em/if_em_fxhw.h#4 delete ... //depot/projects/ia64/sys/dev/em/if_em_phy.c#5 delete ... //depot/projects/ia64/sys/dev/em/if_em_phy.h#4 delete ... //depot/projects/ia64/sys/dev/sio/sio.c#10 integrate ... //depot/projects/ia64/sys/dev/sio/sioreg.h#3 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi.c#19 integrate ... //depot/projects/ia64/sys/dev/wi/if_wireg.h#9 integrate ... //depot/projects/ia64/sys/dev/wi/if_wivar.h#7 integrate ... //depot/projects/ia64/sys/kern/kern_exec.c#16 integrate ... //depot/projects/ia64/sys/kern/kern_linker.c#15 integrate ... //depot/projects/ia64/sys/kern/kern_prot.c#16 integrate ... //depot/projects/ia64/sys/kern/sys_generic.c#12 integrate ... //depot/projects/ia64/sys/modules/netgraph/device/Makefile#1 branch ... //depot/projects/ia64/sys/netgraph/ng_device.c#1 branch ... //depot/projects/ia64/sys/netgraph/ng_device.h#1 branch ... //depot/projects/ia64/sys/netinet/if_ether.c#10 integrate ... //depot/projects/ia64/sys/pc98/conf/GENERIC#11 integrate ... //depot/projects/ia64/sys/pc98/pc98/fd.c#7 integrate ... //depot/projects/ia64/sys/pc98/pc98/sio.c#11 integrate ... //depot/projects/ia64/sys/sys/disklabel.h#14 integrate ... //depot/projects/ia64/sys/sys/malloc.h#12 integrate ... //depot/projects/ia64/sys/sys/ucred.h#6 integrate ... //depot/projects/ia64/sys/sys/un.h#4 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_readwrite.c#8 integrate ... //depot/projects/ia64/sys/vm/uma.h#7 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#18 integrate ... //depot/projects/ia64/sys/vm/vm_kern.c#7 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#23 integrate ... //depot/projects/ia64/sys/vm/vm_object.c#14 integrate ... //depot/projects/ia64/sys/vm/vm_unix.c#3 integrate ... //depot/projects/ia64/tools/regression/usr.bin/make/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/env/env.c#4 integrate ... //depot/projects/ia64/usr.bin/false/false.c#3 integrate ... //depot/projects/ia64/usr.bin/locate/locate/updatedb.sh#2 integrate ... //depot/projects/ia64/usr.bin/make/var.c#5 integrate ... //depot/projects/ia64/usr.bin/pr/pr.c#4 integrate ... //depot/projects/ia64/usr.bin/printenv/printenv.1#4 integrate ... //depot/projects/ia64/usr.bin/printf/printf.c#5 integrate ... //depot/projects/ia64/usr.bin/true/true.c#3 integrate Differences ... ==== //depot/projects/ia64/bin/ed/ed.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp - * $FreeBSD: src/bin/ed/ed.h,v 1.16 2002/02/02 06:36:49 imp Exp $ + * $FreeBSD: src/bin/ed/ed.h,v 1.17 2002/06/20 05:28:02 jmallett Exp $ */ #include @@ -270,3 +270,5 @@ extern long first_addr; extern int lineno; extern long second_addr; +extern long u_addr_last; +extern long u_current_addr; ==== //depot/projects/ia64/bin/ed/main.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/bin/ed/main.c,v 1.22 2002/02/02 06:36:49 imp Exp $"; + "$FreeBSD: src/bin/ed/main.c,v 1.23 2002/06/20 05:28:02 jmallett Exp $"; #endif /* not lint */ /* @@ -449,9 +449,6 @@ int exec_command(void) { - extern long u_current_addr; - extern long u_addr_last; - static pattern_t *pat = NULL; static int sgflag = 0; static long sgnum = 0; ==== //depot/projects/ia64/bin/sh/jobs.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)jobs.c 8.5 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/jobs.c,v 1.44 2002/06/04 15:26:00 tjr Exp $"; + "$FreeBSD: src/bin/sh/jobs.c,v 1.45 2002/06/20 05:21:43 jmallett Exp $"; #endif /* not lint */ #include @@ -273,7 +273,6 @@ int jobscmd(int argc, char *argv[]) { - struct job *jp; char *id; int ch, sformat, lformat; @@ -926,7 +925,6 @@ struct job *thisjob; int done; int stopped; - int core; int sig; in_dowait++; ==== //depot/projects/ia64/bin/sh/mktokens#2 (text+ko) ==== @@ -35,7 +35,7 @@ # SUCH DAMAGE. # # @(#)mktokens 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/sh/mktokens,v 1.7 2000/11/22 11:05:51 kris Exp $ +# $FreeBSD: src/bin/sh/mktokens,v 1.8 2002/06/20 05:20:50 jmallett Exp $ # The following is a list of tokens. The second column is nonzero if the # token marks the end of a list. The third column is the name to print in @@ -81,14 +81,14 @@ awk '{print "\t" $2 ","}' $temp echo '}; -char *const tokname[] = {' +const char *const tokname[] = {' sed -e 's/"/\\"/g' \ -e 's/[^ ]*[ ][ ]*[^ ]*[ ][ ]*\(.*\)/ "\1",/' \ $temp echo '}; ' sed 's/"//g' $temp | awk ' -/TIF/{print "#define KWDOFFSET " NR-1; print ""; print "char *const parsekwd[] = {"} +/TIF/{print "#define KWDOFFSET " NR-1; print ""; print "const char *const parsekwd[] = {"} /TIF/,/neverfound/{print " \"" $3 "\","}' echo ' 0 };' ==== //depot/projects/ia64/bin/sh/parser.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/parser.c,v 1.39 2002/05/19 06:03:05 tjr Exp $"; + "$FreeBSD: src/bin/sh/parser.c,v 1.40 2002/06/20 05:20:50 jmallett Exp $"; #endif /* not lint */ #include @@ -742,9 +742,9 @@ */ if (t == TWORD && !quoteflag) { - char * const *pp; + const char * const *pp; - for (pp = (char **)parsekwd; *pp; pp++) { + for (pp = parsekwd; *pp; pp++) { if (**pp == *wordtext && equal(*pp, wordtext)) { lasttoken = t = pp - parsekwd + KWDOFFSET; ==== //depot/projects/ia64/bin/sh/sh.1#8 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.68 2002/06/06 04:12:50 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.69 2002/06/19 12:04:22 tjr Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -1289,16 +1289,18 @@ is specified. If .Ar directory -is not found as a subdirectory of the current directory -(and does not begin with -.Pa / , ./ , +does not begin with +.Pa / , . , or -.Pa ../ ) , +.Pa .. , then the directories listed in the .Ev CDPATH variable will be searched for the specified .Ar directory . +If +.Ev CDPATH +is unset, the current directory is searched. The format of .Ar CDPATH is the same as that of ==== //depot/projects/ia64/contrib/gdb/gdb/defs.h#2 (text+ko) ==== @@ -18,6 +18,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gdb/gdb/defs.h,v 1.3 2001/04/11 16:15:19 obrien Exp $ */ + #ifndef DEFS_H #define DEFS_H @@ -505,10 +507,6 @@ extern int read_relative_register_raw_bytes PARAMS ((int, char *)); -/* From readline (but not in any readline .h files). */ - -extern char *tilde_expand PARAMS ((char *)); - /* Control types for commands */ enum misc_command_type ==== //depot/projects/ia64/contrib/gdb/gdb/top.c#2 (text+ko) ==== @@ -18,6 +18,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gdb/gdb/top.c,v 1.3 2001/04/14 01:49:32 obrien Exp $ */ + #include "defs.h" #include "gdbcmd.h" #include "call-cmds.h" @@ -1536,8 +1538,6 @@ char *text; char *word; { - /* From readline. */ - extern char *filename_completion_function PARAMS ((char *, int)); int subsequent_name; char **return_val; int return_val_used; ==== //depot/projects/ia64/contrib/gdb/gdb/utils.c#3 (text+ko) ==== @@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gdb/gdb/utils.c,v 1.2 2002/01/27 12:45:01 obrien Exp $ */ + #include "defs.h" #include #include "gdb_string.h" @@ -895,7 +897,7 @@ the caller wanting to allocate zero bytes. */ PTR -xmalloc (size) +USE_FROM_LIBIBERTY_NOW_xmalloc (size) size_t size; { return (xmmalloc ((PTR) NULL, size)); @@ -904,7 +906,7 @@ /* Like mrealloc but get error if no storage available. */ PTR -xrealloc (ptr, size) +USE_FROM_LIBIBERTY_NOW_xrealloc (ptr, size) PTR ptr; size_t size; { ==== //depot/projects/ia64/etc/pam.d/Makefile#5 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/etc/pam.d/Makefile,v 1.6 2002/05/02 05:05:28 des Exp $ +# $FreeBSD: src/etc/pam.d/Makefile,v 1.7 2002/06/19 20:01:25 des Exp $ NOOBJ= noobj -FILES= README csshd ftp ftpd gdm imap kde login other passwd pop3 \ +FILES= README ftp ftpd gdm imap kde login other passwd pop3 \ rexecd rsh sshd su telnetd xdm xserver FILESDIR= /etc/pam.d FILESMODE= 644 ==== //depot/projects/ia64/etc/pam.d/sshd#6 (text+ko) ==== @@ -1,11 +1,13 @@ # -# $FreeBSD: src/etc/pam.d/sshd,v 1.6 2002/05/08 00:33:02 des Exp $ +# $FreeBSD: src/etc/pam.d/sshd,v 1.7 2002/06/19 20:00:43 des Exp $ # # PAM configuration for the "sshd" service # # auth auth required pam_nologin.so no_warn +auth sufficient pam_opie.so no_warn no_fake_prompts +auth required pam_opieaccess.so no_warn auth required pam_unix.so no_warn try_first_pass # account ==== //depot/projects/ia64/etc/pam.d/telnetd#2 (text+ko) ==== @@ -1,11 +1,13 @@ # -# $FreeBSD: src/etc/pam.d/telnetd,v 1.2 2001/12/05 21:26:00 des Exp $ +# $FreeBSD: src/etc/pam.d/telnetd,v 1.3 2002/06/19 20:00:43 des Exp $ # # PAM configuration for the "telnetd" service # # auth auth required pam_nologin.so no_warn +auth sufficient pam_opie.so no_warn no_fake_prompts +auth required pam_opieaccess.so no_warn auth required pam_unix.so no_warn try_first_pass # account ==== //depot/projects/ia64/etc/rc.d/network1#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh -x # -# $FreeBSD: src/etc/rc.d/network1,v 1.3 2002/06/16 06:50:38 dougb Exp $ +# $FreeBSD: src/etc/rc.d/network1,v 1.4 2002/06/18 23:12:50 dougb Exp $ # # PROVIDE: network1 @@ -113,10 +113,14 @@ # Set the domainname if we're using NIS # - if checkyesno nisdomainname ; then + case ${nisdomainname} in + [Nn][Oo]|'') + ;; + *) domainname ${nisdomainname} echo -n ' domain' - fi + ;; + esac echo '.' ==== //depot/projects/ia64/etc/rc.devfs#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/etc/rc.devfs,v 1.11 2002/06/18 07:33:56 dougb Exp $ +# $FreeBSD: src/etc/rc.devfs,v 1.12 2002/06/19 05:35:16 dougb Exp $ # # If there is a global system configuration file, suck it in. @@ -41,13 +41,13 @@ # This isn't necessarily a good example, since we probably shouldn't need this. # However, a lot of X software depends on it. # -if [ -c ttyv0 ]; then +if [ -c ttyv0 -a ! -e vga ]; then ln -fs ttyv0 vga fi # Commonly used by many ports # -#if [ -c acd0c ]; then +#if [ -c acd0c -a ! -e cdrom ]; then # ln -fs acd0c cdrom #fi ==== //depot/projects/ia64/gnu/lib/libstdc++/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.34 2002/06/02 17:49:08 obrien Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.35 2002/06/19 05:38:45 obrien Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ @@ -8,7 +8,7 @@ ${SRCDIR}/config/locale/generic ${SRCDIR} ${SRCDIR}/std \ ${SUPDIR} ${GCCDIR} -SUBDIR= doc +#SUBDIR= doc LIB= stdc++ SHLIB_MAJOR= 4 ==== //depot/projects/ia64/include/stdbool.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/stdbool.h,v 1.4 2001/08/13 13:29:29 asmodai Exp $ + * $FreeBSD: src/include/stdbool.h,v 1.5 2002/06/19 06:04:37 obrien Exp $ */ #ifndef _STDBOOL_H_ @@ -31,6 +31,8 @@ #define __bool_true_false_are_defined 1 +#ifndef __cplusplus + #define false 0 #define true 1 @@ -39,4 +41,6 @@ typedef int _Bool; #endif +#endif /* !__cplusplus */ + #endif /* !_STDBOOL_H_ */ ==== //depot/projects/ia64/lib/libfetch/http.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.59 2002/06/05 21:35:35 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.60 2002/06/19 08:36:00 des Exp $"); /* * The following copyright applies to the base64 code: @@ -766,7 +766,7 @@ conn_t *conn; struct url *url, *new; int chunked, direct, need_auth, noredirect, verbose; - int i, n; + int e, i, n; off_t offset, clength, length, size; time_t mtime; const char *p; @@ -793,6 +793,7 @@ n = noredirect ? 1 : MAX_REDIRECT; i = 0; + e = HTTP_PROTOCOL_ERROR; need_auth = 0; do { new = NULL; @@ -990,6 +991,7 @@ /* we need to provide authentication */ if (conn->err == HTTP_NEED_AUTH) { + e = conn->err; need_auth = 1; _fetch_close(conn); conn = NULL; @@ -997,6 +999,7 @@ } /* all other cases: we got a redirect */ + e = conn->err; need_auth = 0; _fetch_close(conn); conn = NULL; @@ -1011,7 +1014,7 @@ /* we failed, or ran out of retries */ if (conn == NULL) { - _http_seterr(conn->err); + _http_seterr(e); goto ouch; } ==== //depot/projects/ia64/release/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.686 2002/06/08 03:15:50 matusita Exp $ +# $FreeBSD: src/release/Makefile,v 1.687 2002/06/19 15:06:38 matusita Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \ # [ RELEASETAG=tag ] @@ -392,7 +392,7 @@ .endif # Don't remove this, or the build will fall over! echo "export RELEASEDIR=${_R}" >> ${CHROOTDIR}/mk - echo "export PATH=$${PATH}:${LOCALDIR}" >> ${CHROOTDIR}/mk + echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}" >> ${CHROOTDIR}/mk echo "export TMPDIR=/tmp" >> ${CHROOTDIR}/mk echo "export MAKEOBJDIRPREFIX=/usr/obj" >> ${CHROOTDIR}/mk echo "export MANBUILDCAT=YES" >> ${CHROOTDIR}/mk @@ -406,7 +406,7 @@ echo "make \$${_RELTARGET}" >> ${CHROOTDIR}/mk echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk chmod 755 ${CHROOTDIR}/mk - chroot ${CHROOTDIR} /mk + env -i /usr/sbin/chroot ${CHROOTDIR} /mk clean: rm -rf boot_crunch release.[0-9] ==== //depot/projects/ia64/share/examples/etc/make.conf#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.191 2002/06/09 09:28:01 dougb Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.192 2002/06/20 04:33:04 gshapiro Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -259,6 +259,9 @@ # install time. Use with caution as a make install will overwrite # any existing /etc/mail/sendmail.cf. Note that SENDMAIL_CF is now # deprecated. The value should be a fully qualified path name. +# Avoid using a value of /etc/mail/sendmail.mc as a buildworld will +# create /etc/mail/sendmail.cf before installworld installs an +# updated sendmail binary. # #SENDMAIL_MC=/etc/mail/myconfig.mc # @@ -266,11 +269,17 @@ # submission to use at install time. Use with caution as a make # install will overwrite any existing /etc/mail/submit.cf. The # value should be a fully qualified path name. +# Avoid using a value of /etc/mail/submit.mc as a buildworld will +# create /etc/mail/submit.cf before installworld installs an +# updated sendmail binary. # #SENDMAIL_SUBMIT_MC=/etc/mail/mysubmit.mc # # If you need to build additional .cf files during a make buildworld, # include the full paths to the .mc files in SENDMAIL_ADDITIONAL_MC. +# Avoid using a value of /etc/mail/sendmail.mc as a buildworld will +# create /etc/mail/sendmail.cf before installworld installs an +# updated sendmail binary. # #SENDMAIL_ADDITIONAL_MC=/etc/mail/foo.mc /etc/mail/bar.mc # ==== //depot/projects/ia64/share/man/man5/make.conf.5#14 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.51 2002/06/09 09:28:01 dougb Exp $ +.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.52 2002/06/20 04:33:06 gshapiro Exp $ .\" .Dd November 3, 2000 .Dt MAKE.CONF 5 @@ -507,6 +507,13 @@ Note that .Va SENDMAIL_CF is now deprecated. +Avoid using a value of +.Pa /etc/mail/sendmail.mc +as a buildworld will create +.Pa /etc/mail/sendmail.cf +before installworld installs an updated +.Xr sendmail 8 +binary. .It Va SENDMAIL_SUBMIT_MC .Pq Vt str The default m4 configuration file for mail submission @@ -517,6 +524,13 @@ .Pa /etc/mail/mysubmit.mc . Use with caution as a make install will overwrite any existing .Pa /etc/mail/submit.cf . +Avoid using a value of +.Pa /etc/mail/submit.mc +as a buildworld will create +.Pa /etc/mail/submit.cf +before installworld installs an updated +.Xr sendmail 8 +binary. .It Va SENDMAIL_ADDITIONAL_MC .Pq Vt str Additional @@ -529,6 +543,13 @@ file(s), e.g., .Pa /etc/mail/foo.mc .Pa /etc/mail/bar.mc . +Avoid using a value of +.Pa /etc/mail/sendmail.mc +as a buildworld will create +.Pa /etc/mail/sendmail.cf +before installworld installs an updated +.Xr sendmail 8 +binary. .It Va SENDMAIL_M4_FLAGS .Pq Vt str Flags passed to m4 when building a ==== //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.30 2002/04/13 23:11:22 jhb Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.31 2002/06/19 06:39:25 alfred Exp $ */ @@ -1056,17 +1056,20 @@ struct proc *p; int error; uid_t uid; + struct uidinfo *uip; struct ucred *newcred, *oldcred; p = td->td_proc; uid = SCARG(uap, uid); newcred = crget(); + uip = uifind(uid); PROC_LOCK(p); oldcred = p->p_ucred; if ((error = suser_cred(p->p_ucred, PRISON_ROOT)) != 0 && uid != oldcred->cr_ruid && uid != oldcred->cr_svuid) { PROC_UNLOCK(p); + uifree(uip); crfree(newcred); return (error); } @@ -1074,7 +1077,7 @@ crcopy(newcred, oldcred); if (error == 0) { if (uid != oldcred->cr_ruid) { - change_ruid(newcred, uid); + change_ruid(newcred, uip); setsugid(p); } if (oldcred->cr_svuid != uid) { @@ -1083,11 +1086,12 @@ } } if (newcred->cr_uid != uid) { - change_euid(newcred, uid); + change_euid(newcred, uip); setsugid(p); } p->p_ucred = newcred; PROC_UNLOCK(p); + uifree(uip); crfree(oldcred); return (0); } ==== //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.81 2001/09/14 19:00:51 mjacob Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.82 2002/06/19 20:44:48 robert Exp $ * * Implementation of SCSI Sequential Access Peripheral driver for CAM. * @@ -2298,7 +2298,7 @@ saerror(union ccb *ccb, u_int32_t cflgs, u_int32_t sflgs) { static const char *toobig = - "%d-byte tape record bigger than suplied buffer\n"; + "%d-byte tape record bigger than supplied buffer\n"; struct cam_periph *periph; struct sa_softc *softc; struct ccb_scsiio *csio; ==== //depot/projects/ia64/sys/conf/files#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.649 2002/06/17 05:40:40 jhay Exp $ +# $FreeBSD: src/sys/conf/files,v 1.650 2002/06/18 21:32:33 julian Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1114,6 +1114,7 @@ net/bpf_filter.c optional netgraph_bpf netgraph/ng_bridge.c optional netgraph_bridge netgraph/ng_cisco.c optional netgraph_cisco +netgraph/ng_device.c optional netgraph_device netgraph/ng_echo.c optional netgraph_echo netgraph/ng_ether.c optional netgraph_ether netgraph/ng_frame_relay.c optional netgraph_frame_relay ==== //depot/projects/ia64/sys/conf/options#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.325 2002/06/13 22:41:23 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.326 2002/06/18 21:30:36 n_hibma Exp $ # # On the handling of kernel options # @@ -69,10 +69,12 @@ COMPAT_SUNOS opt_compat.h COMPILING_LINT opt_global.h CY_PCI_FASTINTR +CONSPEED opt_comconsole.h DDB DDB_NOKLDSYM opt_ddb.h DDB_UNATTENDED opt_ddb.h GDB_REMOTE_CHAT opt_ddb.h +GDBSPEED opt_ddb.h NODEVFS opt_devfs.h HW_WDOG KTRACE ==== //depot/projects/ia64/sys/conf/options.i386#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.170 2002/05/16 21:23:40 trhodes Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.171 2002/06/18 21:30:36 n_hibma Exp $ # Options specific to the i386 platform kernels DISABLE_PSE @@ -14,7 +14,6 @@ POWERFAIL_NMI opt_trap.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h -CONSPEED opt_comconsole.h I586_PMC_GUPROF opt_i586_guprof.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h ==== //depot/projects/ia64/sys/conf/options.ia64#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.ia64,v 1.10 2002/04/14 04:33:41 peter Exp $ +# $FreeBSD: src/sys/conf/options.ia64,v 1.11 2002/06/18 21:30:37 n_hibma Exp $ # Options specific to the ia64 platform kernels ITANIUM opt_global.h @@ -15,8 +15,6 @@ SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h -CONSPEED opt_comconsole.h - MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h SC_DEBUG_LEVEL opt_syscons.h ==== //depot/projects/ia64/sys/conf/options.pc98#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.145 2002/05/19 13:18:10 nyan Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.146 2002/06/18 21:30:37 n_hibma Exp $ # Options specific to the pc98 platform kernels DISABLE_PSE @@ -14,7 +14,6 @@ POWERFAIL_NMI opt_trap.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h -CONSPEED opt_comconsole.h I586_PMC_GUPROF opt_i586_guprof.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h ==== //depot/projects/ia64/sys/dev/ata/ata-dma.c#14 (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. * - * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.98 2002/04/26 22:48:20 mike Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.99 2002/06/19 12:26:20 sos Exp $ */ #include @@ -1027,8 +1027,8 @@ } break; + case 0x0d30105a: /* Promise OEM ATA100 controllers */ case 0x4d30105a: /* Promise Ultra/FastTrak 100 controllers */ - case 0x0d30105a: /* Promise OEM ATA100 controllers */ if (!ATAPI_DEVICE(atadev) && udmamode >= 5 && !(pci_read_config(parent, 0x50, 2) & (channel ? 1<<11 : 1<<10))) { error = ata_command(atadev, ATA_C_SETFEATURES, 0, @@ -1044,6 +1044,7 @@ } /* FALLTHROUGH */ + case 0x0d38105a: /* Promise FastTrak 66 controllers */ case 0x4d38105a: /* Promise Ultra/FastTrak 66 controllers */ if (!ATAPI_DEVICE(atadev) && udmamode >= 4 && !(pci_read_config(parent, 0x50, 2) & (channel ? 1<<11 : 1<<10))) { @@ -1398,9 +1399,10 @@ } break; + case 0x0d38105a: /* Promise Fasttrak 66 */ case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */ + case 0x0d30105a: /* Promise OEM ATA 100 */ case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */ - case 0x0d30105a: /* Promise OEM ATA 100 */ switch (mode) { default: case ATA_PIO0: t->pa = 15; t->pb = 31; t->mb = 7; t->mc = 15; break; ==== //depot/projects/ia64/sys/dev/ata/ata-pci.c#13 (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. * - * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.41 2002/04/16 08:30:51 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.42 2002/06/19 12:26:20 sos Exp $ */ #include "opt_ata.h" @@ -243,6 +243,7 @@ case 0x4d33105a: return "Promise ATA33 controller"; + case 0x0d38105a: case 0x4d38105a: return "Promise ATA66 controller"; @@ -404,9 +405,10 @@ (pci_read_config(dev, 0x53, 1) & ~0x01) | 0x02, 1); break; - case 0x4d38105a: /* Promise 66 & 100 (before TX2) need the clock changed */ + case 0x0d30105a: /* Promise 66 & 100 (before TX2) need the clock changed */ case 0x4d30105a: - case 0x0d30105a: + case 0x0d38105a: + case 0x4d38105a: ATA_OUTB(controller->bmio, 0x11, ATA_INB(controller->bmio, 0x11)|0x0a); /* FALLTHROUGH */ @@ -565,9 +567,10 @@ break; case 0x4d33105a: /* Promise Ultra/Fasttrak 33 */ + case 0x0d38105a: /* Promise Fasttrak 66 */ case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */ + case 0x0d30105a: /* Promise OEM ATA100 */ case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */ - case 0x0d30105a: /* Promise OEM ATA100 */ if (!(ATA_INL(ch->r_bmio, (ch->unit ? 0x14 : 0x1c)) & (ch->unit ? 0x00004000 : 0x00000400))) return 1; ==== //depot/projects/ia64/sys/dev/ata/atapi-fd.c#7 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.72 2002/05/25 11:18:02 bde Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.73 2002/06/19 12:41:05 sos Exp $ */ #include @@ -69,7 +69,6 @@ /* prototypes */ static int afd_sense(struct afd_softc *); static void afd_describe(struct afd_softc *); -static int afd_partial_done(struct atapi_request *); static int afd_done(struct atapi_request *); static int afd_eject(struct afd_softc *, int); static int afd_start_stop(struct afd_softc *, int); @@ -101,17 +100,20 @@ return 0; } - if (!strncmp(atadev->param->model, "IOMEGA ZIP", 10)) - fdp->transfersize = 64; - devstat_add_entry(&fdp->stats, "afd", fdp->lun, DEV_BSIZE, DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_DIRECT | DEVSTAT_TYPE_IF_IDE, DEVSTAT_PRIORITY_WFD); dev = disk_create(fdp->lun, &fdp->disk, 0, &afd_cdevsw, &afddisk_cdevsw); dev->si_drv1 = fdp; - dev->si_iosize_max = 252 * DEV_BSIZE; fdp->dev = dev; + + if (!strncmp(atadev->param->model, "IOMEGA ZIP", 10) || + !strncmp(atadev->param->model, "IOMEGA Clik!", 12)) + fdp->dev->si_iosize_max = 64 * DEV_BSIZE; + else + fdp->dev->si_iosize_max = 252 * DEV_BSIZE; + afd_describe(fdp); atadev->flags |= ATA_D_MEDIA_CHANGED; atadev->driver = fdp; @@ -147,7 +149,6 @@ /* The IOMEGA Clik! doesn't support reading the cap page, fake it */ if (!strncmp(fdp->device->param->model, "IOMEGA Clik!", 12)) { - fdp->transfersize = 64; fdp->cap.transfer_rate = 500; fdp->cap.heads = 1; fdp->cap.sectors = 2; @@ -189,8 +190,6 @@ fdp->cap.cylinders, fdp->cap.heads, fdp->cap.sectors, fdp->cap.sector_size); ata_prtdev(fdp->device, "%dKB/s,", fdp->cap.transfer_rate / 8); - if (fdp->transfersize) - printf(" transfer limit %d blks,", fdp->transfersize); printf(" %s\n", ata_mode2str(fdp->device->mode)); if (fdp->cap.medium_type) { ata_prtdev(fdp->device, "Medium: "); @@ -294,6 +293,13 @@ return; } + /* if it's a null transfer, return immediatly. */ + if (bp->bio_bcount == 0) { + bp->bio_resid = 0; + biodone(bp); + return; + } + s = splbio(); bioqdisksort(&fdp->queue, bp); splx(s); @@ -324,7 +330,7 @@ lba = bp->bio_pblkno; count = bp->bio_bcount / fdp->cap.sector_size; data_ptr = bp->bio_data; - bp->bio_resid = 0; + bp->bio_resid = bp->bio_bcount; bzero(ccb, sizeof(ccb)); @@ -333,26 +339,6 @@ else ccb[0] = ATAPI_WRITE_BIG; - devstat_start_transaction(&fdp->stats); - - while (fdp->transfersize && (count > fdp->transfersize)) { - ccb[2] = lba>>24; - ccb[3] = lba>>16; - ccb[4] = lba>>8; - ccb[5] = lba; - ccb[7] = fdp->transfersize>>8; - ccb[8] = fdp->transfersize; - - atapi_queue_cmd(fdp->device, ccb, data_ptr, - fdp->transfersize * fdp->cap.sector_size, - (bp->bio_cmd == BIO_READ) ? ATPR_F_READ : 0, 30, - afd_partial_done, bp); - - count -= fdp->transfersize; - lba += fdp->transfersize; - data_ptr += fdp->transfersize * fdp->cap.sector_size; - } - ccb[2] = lba>>24; ccb[3] = lba>>16; ccb[4] = lba>>8; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 19 23:42:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEEA137B400; Wed, 19 Jun 2002 23:41:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 890D037B401 for ; Wed, 19 Jun 2002 23:40:56 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5K6ekj04871 for perforce@freebsd.org; Wed, 19 Jun 2002 23:40:46 -0700 (PDT) (envelope-from chris@freebsd.org) Date: Wed, 19 Jun 2002 23:40:46 -0700 (PDT) Message-Id: <200206200640.g5K6ekj04871@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 13192 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13192 Change 13192 by chris@chris_holly on 2002/06/19 23:40:39 Integ. Affected files ... ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/Makefile#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/book.sgml#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/sound/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/Makefile#3 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#3 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#3 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/euro/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hubs/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/new-users/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/Makefile#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/converse.c#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/su.c#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#3 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#3 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#3 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-ed1.scr#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-ed2.scr#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-fs.scr#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-root1.scr#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-root2.scr#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/disklabel-root3.scr#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/fdisk-edit1.scr#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/fdisk-edit2.scr#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/keymap.scr#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/options.scr#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/xf86setup.scr#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelopts/Makefile#2 delete ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelopts/chapter.sgml#2 delete ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#3 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/bmah.key#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/gordon.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/scop.key#1 branch ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#3 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/sound/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#3 integrate ... //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/authors.ent#2 integrate ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/Makefile#2 integrate ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#2 integrate ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#1 branch ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#2 integrate ... //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/faq/book.sgml#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/backups/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/bibliography/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/contrib/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/cutting-edge/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/introduction/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/policies/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/Makefile#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/calendar.1#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cdcontrol.1#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dig.1#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dnskeygen.1#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dnsquery.1#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/expr.1#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/host.1#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipnat.1#2 delete ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_create.1#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sort.1#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uniq.1#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/quotactl.2#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/_secure_path.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/abort.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/abs.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/acos.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/acosh.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/addr2ascii.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/alarm.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/alloca.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/asin.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/asinh.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/assert.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/atan.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/atan2.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/atanh.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/atexit.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/atof.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/atoi.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/atol.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/auth.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/bcmp.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/bcopy.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/bindresvport.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/bitstring.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/bsearch.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/bstring.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/btree.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/byteorder.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/bzero.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/calendar.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/cam.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/cam_cdbparse.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/catclose.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/catgets.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/catopen.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ceil.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/cftime.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/cipher.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/cos.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/cosh.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/crypt.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ctime.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ctype.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/curs_addch.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/cuserid.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/dbopen.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/des_crypt.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/devstat.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/dialog.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/div.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/dladdr.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/dlopen.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/editline.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/end.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/erf.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/err.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ethers.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/exec.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/exit.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/exp.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fabs.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fclose.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ferror.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fetch.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fflush.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ffs.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fgetln.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fgets.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/floor.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fmod.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fopen.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fpgetround.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fputs.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fread.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fseek.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ftime.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ftok.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ftpio.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fts.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/funopen.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getbootfile.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getc.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getcwd.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getdomainname.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getenv.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getgrent.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/gethostbyname.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getnetent.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getobjformat.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getopt.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getprotoent.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getpw.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getpwent.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getrpcent.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getservent.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getsubopt.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getusershell.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getvfsent.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/hash.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/hypot.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ieee.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ieee_test.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/index.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/inet.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/initgroups.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/insque.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ipx.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/isalnum.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/isalpha.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/isascii.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/isblank.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/iscntrl.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/isdigit.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/isgraph.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/isinf.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/islower.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/isprint.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ispunct.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/isspace.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/isupper.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/isxdigit.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/j0.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/kvm_getprocs.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ldexp.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/lgamma.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/libalias.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/libdisk.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/libradius.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/libstand.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/libtacplus.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/link_addr.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/lockf.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/login.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/login_auth.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/login_cap.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/login_class.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/login_ok.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/login_times.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/login_tty.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/logout.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/logwtmp.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/lsearch.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/malloc.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/math.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/mbrune.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/md2.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/md4.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/md5.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/memccpy.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/memchr.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/memcmp.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/memcpy.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/memmove.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/memory.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/memset.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/mktemp.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/mpool.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/msgctl.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/msgget.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/msgrcv.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/msgsnd.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/nlist.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_authenticate.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_chauthtok.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_fail_delay.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_open_session.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_setcred.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_start.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_strerror.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pause.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/popen.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/printf.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/property.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_cleanup_pop.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_cleanup_push.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_cond_broadcast.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_cond_destroy.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_cond_init.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_cond_signal.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_cond_timedwait.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_cond_wait.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_create.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_detach.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_equal.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_exit.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_getspecific.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_join.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_key_create.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_key_delete.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_mutex_destroy.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_mutex_init.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_mutex_lock.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_mutex_trylock.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_mutex_unlock.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_once.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_rwlock_destroy.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_rwlock_init.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_rwlock_rdlock.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_rwlock_unlock.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_rwlock_wrlock.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_rwlockattr_destroy.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_rwlockattr_getpshared.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_rwlockattr_init.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_rwlockattr_setpshared.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_self.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_setspecific.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pty.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/publickey.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/putc.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pwcache.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/queue.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/radixsort.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/raise.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/rand.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/rand48.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/random.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/rcmd.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/re_comp.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/realpath.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/recno.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/regexp.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/remove.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/resolver.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/rexec.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/rindex.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/rint.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/rpc.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/rpc_secure.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/rtime.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/rune.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/scandir.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/scanf.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/setbuf.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/setjmp.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/setlocale.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/setmode.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/setproctitle.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/setruid.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/sin.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/sinh.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/skey.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/sleep.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/sqrt.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/stdarg.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/stdio.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strcasecmp.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strcat.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strchr.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strcmp.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strcoll.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strcpy.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strcspn.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strdup.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strerror.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strftime.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/string.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/stringlist.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strlen.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strmode.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strpbrk.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strptime.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strrchr.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strsep.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strspn.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strstr.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strtod.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strtok.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strtol.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strtoul.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/strxfrm.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/stty.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/swab.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/sysconf.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/sysctl.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/sysexits.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/syslog.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/system.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/tan.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/tanh.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/tcgetpgrp.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/tcsendbreak.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/tcsetattr.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/tcsetpgrp.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/time.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/time2posix.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/times.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/timezone.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/tmpnam.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ttyname.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/tzset.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ualarm.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/uname.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ungetc.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/unvis.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/usleep.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/uucplock.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/valloc.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/vgl.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/vis.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/xdr.3#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/Makefile#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhclient.conf.5#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhcp-eval.5#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/dhcp-options.5#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/make.conf.5#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/named.conf.5#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/termcap.5#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/Makefile#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/build.7#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/groff_mdoc.7#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/groff_mm.7#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/Makefile#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/atacontrol.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/boot0cfg.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/burncd.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dhclient.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ifconfig.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ipnat.8#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/isdnmonitor.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/jail.8#3 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mergemaster.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_ntfs.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mrouted.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/named-bootconf.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/named-xfer.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/named.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ndc.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/newsyslog.8#3 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/nfsd.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/nslookup.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/nsupdate.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pam_ssh.8#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pciconf.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rc.sendmail.8#1 branch ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/tunefs.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/wicontrol.8#2 integrate ... //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/yp.8#1 branch ... //depot/projects/trustedbsd/doc/share/mk/doc.docbook.mk#2 integrate ... //depot/projects/trustedbsd/doc/share/sgml/freebsd.ent#2 integrate ... //depot/projects/trustedbsd/doc/share/sgml/man-refs.ent#3 integrate ... //depot/projects/trustedbsd/doc/share/sgml/man-refs.pl#1 branch Differences ... ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/faq/book.sgml#2 (text+ko) ==== @@ -2,10 +2,10 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project -$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.18 2002/04/06 18:48:38 ue Exp $ -$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.311 2002/04/06 18:37:43 ue Exp $ +$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.20 2002/05/26 19:55:15 ue Exp $ +$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.331 2002/05/26 17:23:17 mheinen Exp $ - basiert auf: 1.423 + basiert auf: 1.443 --> @@ -44,7 +44,7 @@ - $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.311 2002/04/06 18:37:43 ue Exp $ + $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.331 2002/05/26 17:23:17 mheinen Exp $ 1995 @@ -814,10 +814,16 @@ Das Format des Dokumentes. Die Dokumentation wird - in verschiedenen Formaten erzeugt, um eine - möglichst große Flexibilität zu - erreichen. Zur Zeit werden die folgenden Formate - unterstützt. + in verschiedenen Formaten erzeugt, von denen jedes seine + eigenen Vor- und Nachteile hat. Einige Formate lassen sich + gut an einem Bildschirm lesen, während andere Formate + dafür gedacht sind, ein ansprechendes Druckbild zu + erzeugen. Das die Dokumentation in verschiedenen Formaten + verfügbar ist, stellt sicher, daß unsere Leser + die für sie relevanten Teile unabhängig vom + Ausgabemedium (Bildschirm oder Papier) lesen können. + Zur Zeit werden die folgenden Formate + unterstützt: @@ -1105,7 +1111,7 @@ ein FreeBSD-Forum, aber gehen Sie nicht dorthin, um technische Unterstützung zu suchen, oder, um zu versuchen, die Leute dort dazu zu bringen, Ihnen dabei - zu Helfen, das mühselige Lesen von Manuals zu + zu helfen, das mühselige Lesen von Manuals zu ersparen oder eigene Nachforschungen zu betreiben. Es ist in erster Linie ein Chat-Channel und die Themen dort umfassen Sex, Sport oder Kernwaffen ebensogut, @@ -1178,6 +1184,13 @@ BSD Mall. + FreeBSD Services Ltd. bieten kommerzielle Unterstützung + für FreeBSD in Großbritannien an. Sie verkaufen + übrigens auch eine FreeBSD-DVD. Weitere Informationen + erhalten Sie auf der + Webseite von + FreeBSD Services Ltd.. + Die FreeBSD Mall bietet ebenfalls professionellen FreeBSD support an. Weitergehende Informationen finden Sie auf Ihrer - - Wieso kann ich nicht von Band installieren? - - - - Falls Sie 2.1.7R von Band installieren, müssen - Sie bei der Erstellung des Bandes eine - tar-Blockgröße von 10 (5120 Byte) verwenden. - Die standard tar-Blockgröße beträgt 20 - (10240 Byte) und Bänder, die mit diesem Standardwert - erstellt worden sind, können nicht zur Installation - von 2.1.7R verwendet werden. Diese Bänder - verursachen einen Fehler, der besagt, daß die - Satzlänge zu groß ist. - - - - Kann ich auf meinem Laptop per PLIP (Parallel Line IP) installieren? @@ -2156,7 +2151,7 @@ - Soll ich DES oder MD5 zur Verschlüsselung der + Soll ich DES, Blowfisch oder MD5 zur Verschlüsselung der Paßwörter benutzen? @@ -2174,13 +2169,16 @@ Verfügung, wenn Sie mit sysinstall die crypto Distribution installieren. Sie können auch die crypto Sourcecodes installieren, wenn - Sie Ihr System über die Sourcen aktualisieren. Das - für neue Paßwörter benutzte + Sie Ihr System über die Sourcen aktualisieren. Die crypto + Bibliotheken erlauben es Ihnen das sichere Blowfisch Verfahren + für die Verschlüsselung der Paßwörter + einzusetzen. Das für neue Paßwörter benutzte Verschlüsselungsverfahren wird über die Einstellung passwd_format in /etc/login festgelegt. Die - möglichen Werte sind entweder des - (falls installiert) oder md5. Weitere + möglichen Werte sind entweder des, + blf (falls sie zur Verfügung stehen) + oder md5. Weitere Informationen über die Einstellungen für den Login erhalten Sie in &man.login.conf.5;. @@ -2497,7 +2495,7 @@ Wenn Sie den Quellcode für das Update benutzen wollen, finden Sie im FreeBSD + url="../handbook/cutting-edge.html">FreeBSD Handbuch weitere Informationen. @@ -4446,9 +4444,9 @@ Mail für die Domäne (z.B. domain.net) an einen speziellen Host (in diesem Fall relay.domain.net) weitergeleitet wird, aber der Relay-Host erkennt sich selbst nicht als - domain.net. Fügen Sie domain.net in /etc/sendmail.cw + domain.net. Fügen Sie domain.net in /etc/mail/local-host-names (falls Sie FEATURE(use_cw_file) benutzen) oder "Cw domain.net" - in /etc/sendmail.cf ein. + in /etc/mail/sendmail.cf ein. Die aktuelle Version der + + Warum erkennt mein Laptop PC-Cards nicht? + + + + Dieses Problem tritt häufig auf Laptops mit mehreren + Betriebssystemen auf. Einige nicht-BSD Betriebssysteme lassen + die Hardware in einem inkonsistenten Zustand. Die Karte wird + dann von pccardd als + "(null)""(null)" anstelle des + tatsächlichen Modells gefunden. + + Um dies zu beheben, müssen Sie die Hardware + zurücksetzen, das heißt der PC-Card Einschub + muß stromlos sein. Gehen Sie dazu nicht in den Standby- + oder Suspend-Modus und stellen Sie sicher, daß der Laptop + wirklich ausgeschaltet ist. Warten Sie einen Moment und booten + dann, Ihre PC-Card sollte jetzt funktionieren. + + Einige Laptops schalten sich nicht wirklich aus. Wenn der + obige Vorschlag nichts genutzt hat, entfernen Sie bitte die + Batterie, warten einen Moment und booten erneut. + + + + Wieso hängt sich FreeBSD nach dem BIOS-Bildschirm mit der Meldung Read error @@ -6134,7 +6158,7 @@ - Wenn Sie zum Beispiel root auf + Wenn Sie zum Beispiel root auf /dev/ad1s1a verschieben wollen und diese zur Zeit auf /mnt gemountet ist, bedeutet das: @@ -6147,11 +6171,11 @@ Wenn Sie Ihre Partitionen mit &man.dump.8; umorganisieren wollen, steht Ihnen etwas mehr Arbeit bevor. Wenn Sie eine Partition wie - /var in die übergeordnete Partition - verschieben wollen, müssen Sie zunächst eine neue + /var in die übergeordnete Partition + verschieben wollen, müssen Sie zunächst eine neue Partition erzeugen, die die beiden alten Partitionen aufnehmen kann. Der zweite Schritt ist, wie oben - beschrieben die übergeordnete Partition in die neue + beschrieben die übergeordnete Partition in die neue Partition zu verschieben. Im dritten und letzten Schritt verschieben Sie dann die untergeordnete Partition in das leere Verzeichnis, das im zweiten Schritt entstanden @@ -7304,7 +7328,7 @@ Wenn Sie aufgefordert werden, den Pfadnamen der Shell einzugeben, drücken Sie einfach ENTER. Geben Sie danach mount - / ein, um das root Dateisystem im + / ein, um das Root-Dateisystem im Schreib/Lese-Modus zu mounten. Sie werden wahrscheinlich auch mount -a -t ufs ausführen müssen, um das Dateisystem mit Ihrem Lieblingseditor @@ -7500,7 +7524,7 @@ sendmail-Konfigurationsdatei installieren. Die manuelle Bearbeitung von - /etc/sendmail.cf ist nur etwas + /etc/mail/sendmail.cf ist nur etwas für Puristen. Sendmail Version 8 bietet die neue Möglichkeit der Generierung von Konfigurationsdateien über eine Vorverarbeitung mit &man.m4.1;, wobei die @@ -7668,12 +7692,12 @@ Internet benutzen, bekommen Sie wahrscheinlich eine Mailbox auf dem Mailserver Ihres ISPs zugeordnet. Lassen Sie uns annehmen, die Domäne ihres ISPs sei myISP.com und Ihr Benutzername + role="domainname">example.net und Ihr Benutzername user; außerdem nehmen wir an, daß Sie Ihre Maschine bsd.home genannt haben und, daß Ihr ISP ihnen gesagt hat, daß Sie relay.myISP.com als Mail-Relayhost + role="fqdn">relay.example.net als Mail-Relayhost benutzen können. Um Mails aus Ihrer Mailbox abzuholen, müssen Sie @@ -7715,7 +7739,7 @@ .fetchmailrc: -poll myISP.com protocol pop3 fetchall pass MySecret; +poll example.net protocol pop3 fetchall pass MySecret; Diese Datei sollte für niemandem außer @@ -7725,11 +7749,11 @@ Um Mails mit dem richtigen from:-Header zu versenden, müssen Sie sendmail mitteilen, - daß es user@myISP.com und nicht + daß es user@example.net und nicht user@bsd.home benutzen soll. Evtl. möchten Sie auch, daß sendmail alle Mails über - relay.myISP.com versendet, um + relay.example.net versendet, um eine schnellere Übertragung von Mails zu gewährleisten. @@ -7744,12 +7768,12 @@ MAILER(smtp)dnl Cwlocalhost Cwbsd.home -MASQUERADE_AS(`myISP.com')dnl +MASQUERADE_AS(`example.net')dnl FEATURE(allmasquerade)dnl FEATURE(masquerade_envelope)dnl FEATURE(nocanonify)dnl FEATURE(nodns)dnl -define(`SMART_HOST', `relay.myISP.com') +define(`SMART_HOST', `relay.example.net') Dmbsd.home define(`confDOMAIN_NAME',`bsd.home')dnl define(`confDELIVERY_MODE',`deferred')dnl @@ -8065,7 +8089,7 @@ Nehmen Sie zum Beispiel den Dienst ntalk (siehe auch /etc/inetd.conf). Dieser Dienst ist früher mit der Benutzerkennung - root gelaufen; nun läuft er mit der + root gelaufen; nun läuft er mit der Benutzerkennung tty. Der Benutzer tty ist ein Sandkasten, der dazu gedacht ist, es jemandem, der über ntalk erfolgreich in das System eingebrochen @@ -8243,7 +8267,7 @@ Ich wollte auf das aktuelle -STABLE updaten, und - plötzlich läuft hier ein -RC oder -BETA. Was + plötzlich läuft hier ein -RC oder -PRERELEASE. Was ist passiert? @@ -8251,9 +8275,10 @@ Kurze Antwort: Das ist nur ein anderer Name. RC ist die Abkürzung für Release Candidate. Es bedeutet, daß eine neue - Release bevorsteht. Und -BETA bedeutet bei FreeBSD + Release bevorsteht. Und -PRERELEASE bedeutet bei FreeBSD normalerweise, daß die Sourcen zur Vorbereitung auf eine - Release eingefroren wurden. + Release eingefroren wurden (in einigen Releases + wurde -BETA anstelle von -PRERELEASE verwendet). Ausführliche Antwort: Bei FreeBSD gibt es zwei Quellen für Releases. Die Major Releases wie @@ -8275,19 +8300,24 @@ der Stop der Weiterentwicklung. Sobald dieser Schritt erfolgt ist, wird der Name des Zweiges geändert, um anzuzeigen, daß demnächst eine Release erfolgen - wird. Wenn der Zweig zum Beispiel 4.0-STABLE genannt - wurde, wird der Name in 4.1-BETA geändert, um dies zu + wird. Wenn der Zweig zum Beispiel 4.5-STABLE genannt + wurde, wird der Name in 4.6-PRERELEASE geändert, um dies zu verdeutlichen. Weiterhin ist das ein Zeichen, daß jetzt besonders intensiv getestet werden sollte. In dieser Phase können Fehler im Sourcecode noch korrigiert werden. Wenn der Sourcecode so weit gereift ist, daß eine Release - erstellt werden kann, wird der Name in 4.1-RC + erstellt werden kann, wird der Name in 4.6-RC geändert, um genau dies anzuzeigen. In dieser Phase können nur noch extrem wichtige Korrekturen aufgenommen werden. Sobald die Release (in diesem Beispiel - 4.1-RELEASE) erfolgt ist, wird der Zweig in 4.1-STABLE + 4.6-RELEASE) erfolgt ist, wird der Zweig in 4.6-STABLE umbenannt. + + Weitere Informationen über Versionsnummern und die + verschiedenen Entwicklungszweige enthält der Artikel + Release + Engineering. @@ -10373,6 +10403,35 @@ Systems nicht negativ beeinflussen. + + + + Ich habe gerade CVSup installiert, aber das Programm bricht + mit Fehlermeldungen ab. Was ist da schief gelaufen? + + + + Schauen Sie bitte zuerst nach, ob Sie eine Fehlermeldung + wie die unten gezeigte erhalten. + + /usr/libexec/ld-elf.so.1: Shared object "libXaw.so.6" not found + + Solche Fehlermeldungen erhalten Sie, wenn Sie den + net/cvsup Port auf einer + Maschine installieren, die kein + XFree86-System besitzt. Wenn Sie + das GUI von CVSup + benutzen wollen, müssen Sie + XFree86 installieren. Wenn Sie + CVSup nur auf der Kommandozeile + benutzen wollen, entfernen Sie bitte den Port, den Sie gerade + installiert haben. Installieren Sie stattdessen den Port + net/cvsup-without-gui. + Genauere Informationen finden Sie im + CVSup Abschnitt + des Handbuchs. + + @@ -12220,7 +12279,7 @@ das bedeutet, man kann sich über diese Schnittstelle nicht als root einloggen. Für Einwahlanschlüsse wie diesen, benutzen Sie den - ttydX Eintrag. + ttydX Eintrag. Es ist relativ geläufig, dialup als Terminal-Typ zu verwenden. @@ -13122,10 +13181,12 @@ - Das Mailsystem von FreeBSD.org nicht keine Mail an, - wenn es Anzeichen für Konfigurationsprobleme oder - Spam gibt. Dies kann aus einem der folgenden Gründe - geschehen: + Das Mailsystem von FreeBSD.org verwendet einige der + strengeren Überprüfungen von + Postfix für eingehende Mails. + Mails, bei denen es Anzeichen für Konfigurationsprobleme + oder Spam gibt, werden nicht akzeptiert. Dies kann aus einem + der folgenden Gründe geschehen: @@ -13162,6 +13223,28 @@ Ihre Mails über den Mailserver Ihres Providers versenden. + + + Der Rechnername, der im EHLO/HELO Teil der SMTP + Kommunikation übergeben wird, kann nicht zu einer + IP-Adresse aufgelöst werden. + + Damit die E-Mail akzeptiert wird, brauchen Sie einen + voll qualifizierten Rechnernamen, der im DNS eingetragen ist. + Wenn Sie diesen nicht besitzen, benutzen Sie bitte den + Mailserver Ihres Providers, um E-Mails zu verschicken. + + + + Die Message-ID Ihrer Mail endet in + localhost. + + Einige Mail-Clients generieren eine Message-ID, die + nicht akzeptiert wird. Sie müssen Ihren Mail-Client + so konfigurieren, daß er eine gültige Message-ID + generiert. Alternativ können Sie die Message-ID von + Ihrem Mailserver umschreiben lassen. + @@ -13312,6 +13395,25 @@ + + Was bedeutet POLA? + + + + Prinzip der kleinsten Überraschung (engl. + Principle of Least Astonishment). + Das bedeutet, daß Änderungen in FreeBSD, die den + Endanwender betreffen, für diesen so transparent wie + möglich bleiben. Es wäre beispielsweise eine + Verletzung dieses Prinzips die Variablen in + /etc/defaults/rc.conf willkürlich + umzuordnen. Entwickler berücksichtigen dieses Prinzip, + wenn Sie über Änderungen nachdenken, die den Endanwender + betreffen. + + + + Was ist eine repo-copy? @@ -13622,7 +13724,7 @@ wenn sie mit TenDRA kompiliert werden würde (obwohl sie ein einen Würfel umgeformt werden müßte) und daß FreeBSD deshalb nach - TenDRA, anstatt nach EGCS wechseln sollte; + TenDRA, anstatt nach GCC wechseln sollte; Einen, der sich beschwert, daß bei der neuen Glühbirne die Verkleidung fehlt; ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ # -# $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/Makefile,v 1.14 2002/03/13 00:44:20 ue Exp $ -# $FreeBSDde: de-docproj/books/handbook/Makefile,v 1.16 2002/03/11 22:07:13 mheinen Exp $ +# $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/Makefile,v 1.15 2002/05/26 13:11:06 ue Exp $ +# $FreeBSDde: de-docproj/books/handbook/Makefile,v 1.17 2002/05/09 15:56:27 mheinen Exp $ # # Build the FreeBSD Handbook in its German translation. # @@ -32,6 +32,7 @@ SRCS+= book.sgml SRCS+= basics/chapter.sgml SRCS+= bibliography/chapter.sgml +SRCS+= cutting-edge/chapter.sgml SRCS+= boot/chapter.sgml SRCS+= config/chapter.sgml SRCS+= disks/chapter.sgml ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#2 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - Original version 1.59 - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.8 2002/04/06 18:55:41 ue Exp $ - $FreeBSDde: de-docproj/books/handbook/basics/chapter.sgml,v 1.19 2002/04/01 15:31:36 mheinen Exp $ + Original version 1.63 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.9 2002/05/26 13:11:07 ue Exp $ + $FreeBSDde: de-docproj/books/handbook/basics/chapter.sgml,v 1.30 2002/05/24 22:05:18 mheinen Exp $ --> @@ -37,7 +37,7 @@ Material gilt auch für jedes andere Unix-ähnliche System. Falls Sie mit dem Material schon vertraut sind, können Sie dieses Kapitel überlesen. Wenn FreeBSD neu für Sie ist, dann sollten - Sie dieses Kapitel auf jeden Fall sehr genau lesen. + Sie dieses Kapitel auf jeden Fall aufmerksam lesen. Nachdem Sie dieses Kapitel gelesen haben, werden Sie folgendes wissen: @@ -57,7 +57,7 @@ wie Sie mit Texteditoren umgehen, und - wie Sie in den Manual-Pages nach weiteren Informationen + wie Sie in den Manualpages nach weiteren Informationen suchen können. @@ -69,11 +69,11 @@ Unix Die Grundlagen von FreeBSD, das ein direkter Abkömmling - von BSD UNIX ist, stützen sich auf verschiedene UNIX + von BSD Unix ist, stützen sich auf verschiedene Unix Grundkonzepte. Das erste und ausgeprägteste: FreeBSD ist - ein Multi-User Betriebssystem. Das System ermöglicht, + ein Mehrbenutzer Betriebssystem. Das System ermöglicht, daß mehrere User gleichzeitig an völlig verschiedenen >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 20 0:52:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3852C37B400; Thu, 20 Jun 2002 00:50:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A520F37B429 for ; Thu, 20 Jun 2002 00:50:28 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5K7oSs20248 for perforce@freebsd.org; Thu, 20 Jun 2002 00:50:28 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 20 Jun 2002 00:50:28 -0700 (PDT) Message-Id: <200206200750.g5K7oSs20248@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13199 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13199 Change 13199 by peter@peter_ia64 on 2002/06/20 00:49:29 IFC @13198 Affected files ... ... //depot/projects/ia64/MAINTAINERS#10 integrate ... //depot/projects/ia64/bin/ed/buf.c#3 integrate ... //depot/projects/ia64/bin/rcp/extern.h#3 integrate ... //depot/projects/ia64/bin/rcp/rcp.c#4 integrate ... //depot/projects/ia64/share/doc/papers/fsinterface/fsinterface.ms#2 integrate ... //depot/projects/ia64/share/man/man9/uio.9#4 integrate ... //depot/projects/ia64/sys/alpha/alpha/support.s#5 integrate ... //depot/projects/ia64/sys/alpha/include/runq.h#2 integrate ... //depot/projects/ia64/sys/boot/efi/libefi/bootinfo.c#6 integrate ... //depot/projects/ia64/sys/boot/i386/libi386/bootinfo.c#5 integrate ... //depot/projects/ia64/sys/boot/ia64/libski/bootinfo.c#4 integrate ... //depot/projects/ia64/sys/boot/sparc64/loader/metadata.c#5 integrate ... //depot/projects/ia64/sys/gnu/i386/fpemul/load_store.c#2 integrate ... //depot/projects/ia64/sys/gnu/i386/fpemul/reg_ld_str.c#2 integrate ... //depot/projects/ia64/sys/i386/i386/math_emulate.c#4 integrate ... //depot/projects/ia64/sys/i386/i386/support.s#6 integrate ... //depot/projects/ia64/sys/i386/i386/vm86.c#5 integrate ... //depot/projects/ia64/sys/i386/include/runq.h#2 integrate ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#23 integrate ... //depot/projects/ia64/sys/ia64/ia64/support.s#5 integrate ... //depot/projects/ia64/sys/ia64/ia64/trap.c#30 integrate ... //depot/projects/ia64/sys/ia64/include/runq.h#2 integrate ... //depot/projects/ia64/sys/kern/kern_subr.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_switch.c#6 integrate ... //depot/projects/ia64/sys/powerpc/include/runq.h#2 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/copyinout.c#7 integrate ... //depot/projects/ia64/sys/sparc64/include/runq.h#2 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/support.s#7 integrate ... //depot/projects/ia64/sys/sys/systm.h#15 integrate ... //depot/projects/ia64/sys/sys/uio.h#4 integrate ... //depot/projects/ia64/usr.bin/time/time.1#3 integrate ... //depot/projects/ia64/usr.bin/time/time.c#5 integrate ... //depot/projects/ia64/usr.bin/who/who.c#7 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#10 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.35 2002/06/17 08:58:29 anholt Exp $ +$FreeBSD: src/MAINTAINERS,v 1.36 2002/06/20 07:06:21 jmallett Exp $ subsystem login notes ----------------------------- @@ -69,3 +69,5 @@ ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org xten imp Looking after it, don't remove, don't break it. drm anholt Just keep me informed of changes, try not to break it. +xargs jmallett Willing to handle problems. appreciate heads-up + but just try not to break it. ==== //depot/projects/ia64/bin/ed/buf.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/bin/ed/buf.c,v 1.20 2002/02/02 06:36:49 imp Exp $"; + "$FreeBSD: src/bin/ed/buf.c,v 1.21 2002/06/20 07:15:55 jmallett Exp $"; #endif /* not lint */ #include @@ -193,7 +193,7 @@ int open_sbuf(void) { - int fd = -1; + int fd; int u; isbinary = newline_added = 0; ==== //depot/projects/ia64/bin/rcp/extern.h#3 (text+ko) ==== @@ -31,11 +31,11 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/rcp/extern.h,v 1.7 2002/02/02 06:48:10 imp Exp $ + * $FreeBSD: src/bin/rcp/extern.h,v 1.8 2002/06/20 06:00:51 jmallett Exp $ */ typedef struct { - int cnt; + size_t cnt; char *buf; } BUF; ==== //depot/projects/ia64/bin/rcp/rcp.c#4 (text+ko) ==== @@ -49,7 +49,7 @@ static char sccsid[] = "@(#)rcp.c 8.2 (Berkeley) 4/2/94"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/rcp/rcp.c,v 1.31 2002/05/08 00:41:48 des Exp $"; + "$FreeBSD: src/bin/rcp/rcp.c,v 1.32 2002/06/20 06:00:51 jmallett Exp $"; #endif /* not lint */ #include @@ -670,14 +670,17 @@ if (*cp++ != ' ') SCREWUP("size not delimited"); if (targisdir) { - static char *namebuf; - static int cursize; + static char *namebuf = NULL; + static size_t cursize; size_t need; need = strlen(targ) + strlen(cp) + 250; if (need > cursize) { + if (namebuf != NULL) + free(namebuf); if (!(namebuf = malloc(need))) run_err("%s", strerror(errno)); + cursize = need; } (void)snprintf(namebuf, need, "%s%s%s", targ, *targ ? "/" : "", cp); ==== //depot/projects/ia64/share/doc/papers/fsinterface/fsinterface.ms#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fsinterface.ms 1.4 (Berkeley) 4/16/91 -.\" $FreeBSD: src/share/doc/papers/fsinterface/fsinterface.ms,v 1.8 2000/11/27 18:16:24 ru Exp $ +.\" $FreeBSD: src/share/doc/papers/fsinterface/fsinterface.ms,v 1.9 2002/06/20 07:09:23 peter Exp $ .\" .nr UX 0 .de UX @@ -755,14 +755,13 @@ }; .DE .DS -.ta .5i +\w'UIO_USERISPACE\0\0\0\0\0'u +.ta .5i +\w'UIO_USERSPACE\0\0\0\0\0'u /* * Segment flag values. */ enum uio_seg { UIO_USERSPACE, /* from user data space */ UIO_SYSSPACE, /* from system space */ - UIO_USERISPACE /* from user I space */ }; .DE .NH ==== //depot/projects/ia64/share/man/man9/uio.9#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/share/man/man9/uio.9,v 1.12 2001/11/21 12:02:28 ru Exp $ +.\" $FreeBSD: src/share/man/man9/uio.9,v 1.13 2002/06/20 07:09:24 peter Exp $ .\" .Dd February 2, 1997 .Os @@ -90,14 +90,11 @@ The number of bytes to process. .It Va uio_segflg One of the following flags: -.Bl -tag -width ".Dv UIO_USERISPACE" +.Bl -tag -width ".Dv UIO_USERSPACE" .It Dv UIO_USERSPACE The I/O vector points into a process's address space. .It Dv UIO_SYSSPACE The I/O vector points into the kernel address space. -.It Dv UIO_USERISPACE -The I/O vector points into the instruction area of a process's address -space. .It Dv UIO_NOCOPY Don't copy, already in object. .El ==== //depot/projects/ia64/sys/alpha/alpha/support.s#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.10 2002/05/26 16:03:12 dfr Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.12 2002/06/20 07:40:53 peter Exp $ */ /* @@ -150,11 +150,6 @@ RET END(fubyte) - LEAF(suibyte, 2) - ldiq v0, -1 - RET - END(suibyte) - LEAF(fusufault, 0) ldq t0, PC_CURTHREAD(pcpup) ldq t0, TD_PCB(t0) @@ -164,8 +159,8 @@ END(fusufault) LEAF(fswintrberr, 0) -XLEAF(fuswintr, 2) /* XXX what is a 'word'? */ -XLEAF(suswintr, 2) /* XXX what is a 'word'? */ +XLEAF(fuswintr, 2) /* XXX 16 bit short for profiling */ +XLEAF(suswintr, 2) /* XXX 16 bit short for profiling */ LDGP(pv) ldiq v0, -1 RET ==== //depot/projects/ia64/sys/alpha/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/runq.h,v 1.1 2002/05/25 01:12:15 jake Exp $ + * $FreeBSD: src/sys/alpha/include/runq.h,v 1.2 2002/06/20 06:21:19 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1UL << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs64(word)) +#define RQB_FFS(word) (ffs64(word) - 1) /* * Type of run queue status word. ==== //depot/projects/ia64/sys/boot/efi/libefi/bootinfo.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.5 2001/11/19 07:09:47 peter Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.6 2002/06/20 06:29:42 peter Exp $ */ #include ==== //depot/projects/ia64/sys/boot/i386/libi386/bootinfo.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.32 2002/01/04 07:59:27 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.33 2002/06/20 06:29:42 peter Exp $ */ #include @@ -53,6 +53,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; ==== //depot/projects/ia64/sys/boot/ia64/libski/bootinfo.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.5 2001/11/19 07:05:09 peter Exp $ + * $FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.6 2002/06/20 06:29:42 peter Exp $ */ #include @@ -54,6 +54,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; ==== //depot/projects/ia64/sys/boot/sparc64/loader/metadata.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.29 - * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.5 2002/05/29 05:49:58 jake Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.6 2002/06/20 06:29:42 peter Exp $ */ #include @@ -61,6 +61,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; ==== //depot/projects/ia64/sys/gnu/i386/fpemul/load_store.c#2 (text+ko) ==== @@ -57,7 +57,7 @@ * W. Metzenthen June 1994. * * - * $FreeBSD: src/sys/gnu/i386/fpemul/load_store.c,v 1.13 1999/08/28 00:42:52 peter Exp $ + * $FreeBSD: src/sys/gnu/i386/fpemul/load_store.c,v 1.14 2002/06/20 07:23:08 peter Exp $ * */ @@ -201,7 +201,7 @@ break; case 024: /* fldcw */ REENTRANT_CHECK(OFF); - control_word = fusword((unsigned short *) FPU_data_address); + control_word = fuword16((unsigned short *) FPU_data_address); REENTRANT_CHECK(ON); #ifdef NO_UNDERFLOW_TRAP if (!(control_word & EX_Underflow)) { @@ -242,7 +242,7 @@ case 034: /* fstcw m16int */ REENTRANT_CHECK(OFF); /* verify_area(VERIFY_WRITE, FPU_data_address, 2);*/ - susword( (short *) FPU_data_address,control_word); + suword16( (short *) FPU_data_address,control_word); REENTRANT_CHECK(ON); /* We want no net effect: */ FPU_data_address = (void *) (intptr_t ) data_operand_offset; @@ -258,7 +258,7 @@ status_word |= (top & 7) << SW_Top_Shift; REENTRANT_CHECK(OFF); /* verify_area(VERIFY_WRITE, FPU_data_address, 2);*/ - susword( (short *) FPU_data_address,status_word); + suword16( (short *) FPU_data_address,status_word); REENTRANT_CHECK(ON); /* We want no net effect: */ FPU_data_address = (void *) (intptr_t) data_operand_offset; ==== //depot/projects/ia64/sys/gnu/i386/fpemul/reg_ld_str.c#2 (text+ko) ==== @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * - * $FreeBSD: src/sys/gnu/i386/fpemul/reg_ld_str.c,v 1.13 1999/08/28 00:42:56 peter Exp $ + * $FreeBSD: src/sys/gnu/i386/fpemul/reg_ld_str.c,v 1.14 2002/06/20 07:23:08 peter Exp $ * */ @@ -110,7 +110,7 @@ * hence re-entrancy problems can arise */ sigl = fuword((unsigned long *) s); sigh = fuword(1 + (unsigned long *) s); - exp = fusword(4 + (unsigned short *) s); + exp = fuword16(4 + (unsigned short *) s); REENTRANT_CHECK(ON); FPU_loaded_data.sigl = sigl; @@ -361,7 +361,7 @@ REENTRANT_CHECK(OFF); /* Cast as short to get the sign extended. */ - s = (short) fusword((unsigned short *) _s); + s = (short) fuword16((unsigned short *) _s); REENTRANT_CHECK(ON); if (s == 0) { @@ -527,7 +527,7 @@ /* verify_area(VERIFY_WRITE, d, 10); */ suword((unsigned long *) d, ls); suword(1 + (unsigned long *) d, ms); - susword(4 + (short *) d, (unsigned short) e | sign); + suword16(4 + (short *) d, (unsigned short) e | sign); REENTRANT_CHECK(ON); return 1; @@ -1001,7 +1001,7 @@ /* Put out the QNaN indefinite */ REENTRANT_CHECK(OFF); /* verify_area(VERIFY_WRITE, d, 2);*/ - susword((unsigned short *) d, 0x8000); + suword16((unsigned short *) d, 0x8000); REENTRANT_CHECK(ON); return 1; } else @@ -1025,7 +1025,7 @@ REENTRANT_CHECK(OFF); /* verify_area(VERIFY_WRITE, d, 2); */ - susword((short *) d, (short) t.sigl); + suword16((short *) d, (short) t.sigl); REENTRANT_CHECK(ON); return 1; @@ -1164,9 +1164,9 @@ int i; REENTRANT_CHECK(OFF); - control_word = fusword((unsigned short *) s); - status_word = fusword((unsigned short *) (s + 4)); - tag_word = fusword((unsigned short *) (s + 8)); + control_word = fuword16((unsigned short *) s); + status_word = fuword16((unsigned short *) (s + 4)); + tag_word = fuword16((unsigned short *) (s + 8)); ip_offset = fuword((unsigned long *) (s + 0x0c)); cs_selector = fuword((unsigned long *) (s + 0x10)); data_operand_offset = fuword((unsigned long *) (s + 0x14)); @@ -1285,9 +1285,9 @@ #endif /****/ REENTRANT_CHECK(OFF); - susword((unsigned short *) d, control_word); - susword((unsigned short *) (d + 4), (status_word & ~SW_Top) | ((top & 7) << SW_Top_Shift)); - susword((unsigned short *) (d + 8), tag_word()); + suword16((unsigned short *) d, control_word); + suword16((unsigned short *) (d + 4), (status_word & ~SW_Top) | ((top & 7) << SW_Top_Shift)); + suword16((unsigned short *) (d + 8), tag_word()); suword((unsigned long *) (d + 0x0c), ip_offset); suword((unsigned long *) (d + 0x10), cs_selector); suword((unsigned long *) (d + 0x14), data_operand_offset); @@ -1378,7 +1378,7 @@ } e |= rp->sign == SIGN_POS ? 0 : 0x8000; REENTRANT_CHECK(OFF); - susword((unsigned short *) (d + i * 10 + 8), e); + suword16((unsigned short *) (d + i * 10 + 8), e); REENTRANT_CHECK(ON); } ==== //depot/projects/ia64/sys/i386/i386/math_emulate.c#4 (text+ko) ==== @@ -6,7 +6,7 @@ * [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj] * * from: 386BSD 0.1 - * $FreeBSD: src/sys/i386/i386/math_emulate.c,v 1.40 2001/11/28 01:42:16 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/math_emulate.c,v 1.41 2002/06/20 07:23:08 peter Exp $ */ /* @@ -71,7 +71,7 @@ static unsigned short get_fs_word(unsigned short *adr) - { return(fuword(adr)); } + { return(fuword16(adr)); } static u_int32_t get_fs_long(u_int32_t *adr) @@ -83,7 +83,7 @@ static void put_fs_word(unsigned short val, short *adr) - { (void)susword(adr,val); } + { (void)suword16(adr,val); } static void put_fs_long(u_long val, u_int32_t *adr) ==== //depot/projects/ia64/sys/i386/i386/support.s#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/support.s,v 1.89 2002/05/26 16:03:12 dfr Exp $ + * $FreeBSD: src/sys/i386/i386/support.s,v 1.90 2002/06/20 07:13:33 peter Exp $ */ #include "opt_npx.h" @@ -1204,9 +1204,9 @@ ret /* - * fusword - MP SAFE + * fuword16 - MP SAFE */ -ENTRY(fusword) +ENTRY(fuword16) movl PCPU(CURPCB),%ecx movl $fusufault,PCB_ONFAULT(%ecx) movl 4(%esp),%edx @@ -1293,9 +1293,9 @@ jmp suword /* - * susword - MP SAFE (if not I386_CPU) + * suword16 - MP SAFE (if not I386_CPU) */ -ENTRY(susword) +ENTRY(suword16) movl PCPU(CURPCB),%ecx movl $fusufault,PCB_ONFAULT(%ecx) movl 4(%esp),%edx @@ -1339,9 +1339,8 @@ ret /* - * su[i]byte - MP SAFE (if not I386_CPU) + * subyte - MP SAFE (if not I386_CPU) */ -ALTENTRY(suibyte) ENTRY(subyte) movl PCPU(CURPCB),%ecx movl $fusufault,PCB_ONFAULT(%ecx) ==== //depot/projects/ia64/sys/i386/i386/vm86.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/vm86.c,v 1.45 2002/04/04 21:03:19 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/vm86.c,v 1.46 2002/06/20 07:23:08 peter Exp $ */ #include @@ -98,7 +98,7 @@ PUSH(u_short x, struct vm86frame *vmf) { vmf->vmf_sp -= 2; - susword(MAKE_ADDR(vmf->vmf_ss, vmf->vmf_sp), x); + suword16(MAKE_ADDR(vmf->vmf_ss, vmf->vmf_sp), x); } static __inline void @@ -111,7 +111,7 @@ static __inline u_short POP(struct vm86frame *vmf) { - u_short x = fusword(MAKE_ADDR(vmf->vmf_ss, vmf->vmf_sp)); + u_short x = fuword16(MAKE_ADDR(vmf->vmf_ss, vmf->vmf_sp)); vmf->vmf_sp += 2; return (x); ==== //depot/projects/ia64/sys/i386/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/runq.h,v 1.1 2002/05/25 01:12:16 jake Exp $ + * $FreeBSD: src/sys/i386/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1 << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs(word)) +#define RQB_FFS(word) (ffs(word) - 1) /* * Type of run queue status word. ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#23 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.61 2002/05/04 12:21:32 dfr Exp $ + * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.63 2002/06/20 06:25:22 peter Exp $ */ /* ==== //depot/projects/ia64/sys/ia64/ia64/support.s#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/support.s,v 1.12 2002/04/10 19:26:49 dfr Exp $ + * $FreeBSD: src/sys/ia64/ia64/support.s,v 1.15 2002/06/20 07:40:53 peter Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -359,11 +359,6 @@ END(fubyte) -ENTRY(suibyte, 2) - mov ret0=-1 - br.ret.sptk.few rp -END(suibyte) - ENTRY(fusufault, 0) st8 [r15]=r0 ;; // r15 points at onfault mov ret0=r0 @@ -371,8 +366,8 @@ END(fusufault) ENTRY(fswintrberr, 0) -XENTRY(fuswintr) /* XXX what is a 'word'? */ -XENTRY(suswintr) /* XXX what is a 'word'? */ +XENTRY(fuswintr) /* XXX 16 bit short for profiling */ +XENTRY(suswintr) /* XXX 16 bit short for profiling */ mov ret0=-1 br.ret.sptk.few rp END(fswintrberr) ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#30 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.55 2002/06/07 05:47:35 jhb Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.57 2002/06/20 06:47:44 peter Exp $ */ /* From: src/sys/alpha/alpha/trap.c,v 1.33 */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ ==== //depot/projects/ia64/sys/ia64/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/runq.h,v 1.1 2002/05/25 01:12:19 jake Exp $ + * $FreeBSD: src/sys/ia64/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1UL << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs64(word)) +#define RQB_FFS(word) (ffs64(word) - 1) /* * Type of run queue status word. ==== //depot/projects/ia64/sys/kern/kern_subr.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_subr.c,v 1.52 2002/05/05 22:42:40 alc Exp $ + * $FreeBSD: src/sys/kern/kern_subr.c,v 1.53 2002/06/20 07:08:43 peter Exp $ */ #include @@ -96,7 +96,6 @@ switch (uio->uio_segflg) { case UIO_USERSPACE: - case UIO_USERISPACE: if (ticks - PCPU_GET(switchticks) >= hogticks) uio_yield(); if (uio->uio_rw == UIO_READ) @@ -168,7 +167,6 @@ switch (uio->uio_segflg) { case UIO_USERSPACE: - case UIO_USERISPACE: if (ticks - PCPU_GET(switchticks) >= hogticks) uio_yield(); if (uio->uio_rw == UIO_READ) { @@ -311,10 +309,6 @@ *iov->iov_base = c; break; - case UIO_USERISPACE: - if (suibyte(iov->iov_base, c) < 0) - return (EFAULT); - break; case UIO_NOCOPY: break; } ==== //depot/projects/ia64/sys/kern/kern_switch.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_switch.c,v 1.27 2002/05/25 01:12:23 jake Exp $ + * $FreeBSD: src/sys/kern/kern_switch.c,v 1.28 2002/06/20 06:21:20 peter Exp $ */ #include @@ -129,8 +129,7 @@ rqb = &rq->rq_status; for (i = 0; i < RQB_LEN; i++) if (rqb->rqb_bits[i]) { - pri = (RQB_FFS(rqb->rqb_bits[i]) - 1) + - (i << RQB_L2BPW); + pri = RQB_FFS(rqb->rqb_bits[i]) + (i << RQB_L2BPW); CTR3(KTR_RUNQ, "runq_findbit: bits=%#x i=%d pri=%d", rqb->rqb_bits[i], i, pri); return (pri); ==== //depot/projects/ia64/sys/powerpc/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/runq.h,v 1.1 2002/05/25 01:12:23 jake Exp $ + * $FreeBSD: src/sys/powerpc/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1 << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs(word)) +#define RQB_FFS(word) (ffs(word) - 1) /* * Type of run queue status word. ==== //depot/projects/ia64/sys/powerpc/powerpc/copyinout.c#7 (text+ko) ==== @@ -55,7 +55,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/powerpc/powerpc/copyinout.c,v 1.5 2002/05/27 10:50:47 benno Exp $"; + "$FreeBSD: src/sys/powerpc/powerpc/copyinout.c,v 1.6 2002/06/20 07:13:34 peter Exp $"; #endif /* not lint */ #include @@ -233,13 +233,6 @@ } int -suibyte(void *addr, int byte) -{ - - return (subyte(addr, byte)); -} - -int suword(void *addr, long word) { struct thread *td; ==== //depot/projects/ia64/sys/sparc64/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/runq.h,v 1.1 2002/05/25 01:12:23 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/runq.h,v 1.2 2002/06/20 06:21:20 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1UL << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs64(word)) +#define RQB_FFS(word) (ffs64(word) - 1) /* * Type of run queue status word. ==== //depot/projects/ia64/sys/sparc64/sparc64/support.s#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/sparc64/support.s,v 1.13 2002/05/26 16:03:13 dfr Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/support.s,v 1.14 2002/06/20 07:13:35 peter Exp $ */ #include @@ -536,18 +536,6 @@ END(subyte) /* - * int suibyte(const void *base, int byte) - */ -ENTRY(suibyte) -#if KTR_COMPILE & KTR_CT1 - CATR(KTR_CT1, "suibyte: base=%#lx", %g1, %g2, %g3, 7, 8, 9) - stx %o0, [%g1 + KTR_PARM1] -9: -#endif - SU_ALIGNED(stba, fsbail) -END(suibyte) - -/* * int susword(const void *base, int word) */ ENTRY(susword) ==== //depot/projects/ia64/sys/sys/systm.h#15 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.175 2002/06/12 02:08:17 kbyanc Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.177 2002/06/20 07:23:08 peter Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -180,16 +180,15 @@ int copyout(const void *kaddr, void *udaddr, size_t len); int fubyte(const void *base); -int subyte(void *base, int byte); -int suibyte(void *base, int byte); +long fuword(const void *base); +int fuword16(void *base); int32_t fuword32(const void *base); int64_t fuword64(const void *base); -long fuword(const void *base); +int subyte(void *base, int byte); int suword(void *base, long word); +int suword16(void *base, int word); int suword32(void *base, int32_t word); int suword64(void *base, int64_t word); -int fusword(void *base); -int susword(void *base, int word); void realitexpire(void *); ==== //depot/projects/ia64/sys/sys/uio.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uio.h 8.5 (Berkeley) 2/22/94 - * $FreeBSD: src/sys/sys/uio.h,v 1.19 2002/05/06 06:20:03 alc Exp $ + * $FreeBSD: src/sys/sys/uio.h,v 1.20 2002/06/20 07:08:43 peter Exp $ */ #ifndef _SYS_UIO_H_ @@ -52,7 +52,6 @@ enum uio_seg { UIO_USERSPACE, /* from user data space */ UIO_SYSSPACE, /* from system space */ - UIO_USERISPACE, /* from user I space */ UIO_NOCOPY /* don't copy, already in object */ }; ==== //depot/projects/ia64/usr.bin/time/time.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)time.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/time/time.1,v 1.17 2002/06/03 14:54:04 tjr Exp $ +.\" $FreeBSD: src/usr.bin/time/time.1,v 1.19 2002/06/20 07:12:34 tjr Exp $ .\" .Dd June 6, 1993 .Dt TIME 1 @@ -43,27 +43,23 @@ .Op Fl al .Op Fl h | Fl p .Op Fl o Ar file -.Ar command +.Ar utility Op Ar argument ... .Sh DESCRIPTION The .Nm utility executes and -times -.Ar command -by initiating a timer and passing the -.Ar command -to the -shell. +times the specified +.Ar utility . After the -.Ar command +.Ar utility finishes, .Nm writes to the standard error stream, (in seconds): the total time elapsed, the time used to execute the -.Ar command +.Ar utility process and the time consumed by system overhead. .Pp Available options: @@ -103,16 +99,16 @@ manual page. .Sh DIAGNOSTICS If -.Ar command +.Ar utility could be timed successfully, its exit status is returned. If -.Ar command +.Ar utility terminated abnormally, a warning message is output to stderr. If the -.Ar command +.Ar utility was found but could not be run, the exit status is 126. If no -.Ar command +.Ar utility could be found at all, the exit status is 127. If .Nm ==== //depot/projects/ia64/usr.bin/time/time.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$FreeBSD: src/usr.bin/time/time.c,v 1.21 2002/05/25 03:32:23 tjr Exp $"; + "$FreeBSD: src/usr.bin/time/time.c,v 1.22 2002/06/20 07:07:00 tjr Exp $"; #endif /* not lint */ #include @@ -225,7 +225,8 @@ static void usage() { - fprintf(stderr, "usage: time [-al] [-h|-p] [-o file] command\n"); + fprintf(stderr, + "usage: time [-al] [-h|-p] [-o file] utility [argument ...]\n"); exit(1); } ==== //depot/projects/ia64/usr.bin/who/who.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/who/who.c,v 1.16 2002/06/04 09:52:30 tjr Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/who/who.c,v 1.17 2002/06/20 07:36:22 tjr Exp $"); #include #include @@ -132,7 +132,7 @@ exit(0); } -void +static void usage(void) { @@ -140,7 +140,7 @@ exit(1); } -void +static void heading(void) { @@ -155,7 +155,7 @@ putchar('\n'); } -void +static void row(struct utmp *ut) { char buf[80], tty[sizeof(_PATH_DEV) + UT_LINESIZE]; @@ -201,7 +201,7 @@ putchar('\n'); } -void +static void process_utmp(FILE *fp) { struct utmp ut; @@ -211,7 +211,7 @@ row(&ut); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 20 1: 4:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C65E37B40C; Thu, 20 Jun 2002 01:04:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from overcee.wemm.org (12-232-114-102.client.attbi.com [12.232.114.102]) by hub.freebsd.org (Postfix) with ESMTP id 5B83C37B40A; Thu, 20 Jun 2002 01:04:02 -0700 (PDT) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 58285380E; Thu, 20 Jun 2002 01:04:04 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Julian Elischer Cc: Jake Burkholder , Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 12762 for review In-Reply-To: Date: Thu, 20 Jun 2002 01:04:04 -0700 From: Peter Wemm Message-Id: <20020620080404.58285380E@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer wrote: > ok, thanks. > I'll (re)fix them. Good, bde will tell you off otherwise. :-) This is as much a syntax error as the original code according to strict interpretation of the C standard. > On Wed, 12 Jun 2002, Jake Burkholder wrote: > > > Apparently, On Wed, Jun 12, 2002 at 12:21:42PM -0700, > > Julian Elischer said words to the effect of; > > > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12762 > > > > > > Change 12762 by julian@julian_ref on 2002/06/12 12:21:09 > > > > > > fix warning > > > > FYI, the preferred way to fix these is to put a break instead > > of a null statement. > > > > > > > > Affected files ... > > > > > > ... //depot/projects/kse/sys/vm/vm_meter.c#13 edit > > > > > > Differences ... > > > > > > ==== //depot/projects/kse/sys/vm/vm_meter.c#13 (text+ko) ==== > > > > > > @@ -149,6 +149,7 @@ > > > totalp->t_sl++; > > > continue; > > > default: > > > + ; > > > } > > > } > > > } > > > > Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 20 1:31:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C4EB37B40D; Thu, 20 Jun 2002 01:31:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 691A137B40C for ; Thu, 20 Jun 2002 01:31:18 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5K8VIT29330 for perforce@freebsd.org; Thu, 20 Jun 2002 01:31:18 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 20 Jun 2002 01:31:18 -0700 (PDT) Message-Id: <200206200831.g5K8VIT29330@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13200 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13200 Change 13200 by peter@peter_overcee on 2002/06/20 01:31:14 Update for new Brandinfo members. Probably needs EM_486 here as well, I'm sure some leeenucks toolchains generate it somewhere. Affected files ... ... //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#10 edit Differences ... ==== //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#10 (text+ko) ==== @@ -799,6 +799,7 @@ static Elf32_Brandinfo linux_brand = { ELFOSABI_LINUX, + EM_386, "Linux", "/compat/linux", "/lib/ld-linux.so.1", @@ -807,6 +808,7 @@ static Elf32_Brandinfo linux_glibc2brand = { ELFOSABI_LINUX, + EM_386, "Linux", "/compat/linux", "/lib/ld-linux.so.2", To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 20 1:36:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A89237B40A; Thu, 20 Jun 2002 01:36:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id F1F7A37B411 for ; Thu, 20 Jun 2002 01:36:24 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5K8aOZ29709 for perforce@freebsd.org; Thu, 20 Jun 2002 01:36:24 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 20 Jun 2002 01:36:24 -0700 (PDT) Message-Id: <200206200836.g5K8aOZ29709@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13201 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13201 Change 13201 by peter@peter_overcee on 2002/06/20 01:35:38 Update more Elf_Brandinfo structs Affected files ... ... //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#5 edit ... //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#5 edit Differences ... ==== //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#5 (text+ko) ==== @@ -196,6 +196,7 @@ static Elf64_Brandinfo linux_brand = { ELFOSABI_LINUX, + EM_ALPHA, "Linux", "/compat/linux", "/lib/ld-linux.so.1", @@ -204,6 +205,7 @@ static Elf64_Brandinfo linux_glibc2brand = { ELFOSABI_LINUX, + EM_ALPHA, "Linux", "/compat/linux", "/lib/ld-linux.so.2", ==== //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#5 (text+ko) ==== @@ -186,6 +186,7 @@ Elf32_Brandinfo svr4_brand = { ELFOSABI_SOLARIS, /* XXX Or should we use ELFOSABI_SYSV here? */ + EM_386, /* XXX only implemented for x86 so far. */ "SVR4", svr4_emul_path, "/lib/libc.so.1", To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 20 15:42:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5315F37B411; Thu, 20 Jun 2002 15:42:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7E2B237B410 for ; Thu, 20 Jun 2002 15:42:06 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5KMg6J89055 for perforce@freebsd.org; Thu, 20 Jun 2002 15:42:06 -0700 (PDT) (envelope-from mux@freebsd.org) Date: Thu, 20 Jun 2002 15:42:06 -0700 (PDT) Message-Id: <200206202242.g5KMg6J89055@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mux@freebsd.org using -f From: Maxime Henrion Subject: PERFORCE change 13221 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13221 Change 13221 by mux@mux_nebula on 2002/06/20 15:41:04 Add missing includes. Affected files ... ... //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#4 edit Differences ... ==== //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#4 (text+ko) ==== @@ -40,9 +40,16 @@ */ #include +#include #include #include +#include +#include +#include +#include +#include #include +#include #include "linker_if.h" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 20 21: 6:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4836A37B408; Thu, 20 Jun 2002 21:06:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6AA5F37B400 for ; Thu, 20 Jun 2002 21:06:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5L46k856143 for perforce@freebsd.org; Thu, 20 Jun 2002 21:06:46 -0700 (PDT) (envelope-from peter@freebsd.org) Date: Thu, 20 Jun 2002 21:06:46 -0700 (PDT) Message-Id: <200206210406.g5L46k856143@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13227 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13227 Change 13227 by peter@peter_ia64 on 2002/06/20 21:06:26 fix (I hope) a warning that Maxime found. Affected files ... ... //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#5 edit Differences ... ==== //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#5 (text+ko) ==== @@ -217,7 +217,7 @@ Elf_Word rtype, symidx; Elf_Addr value; Elf_Addr mask; - caddr_t addr; + Elf_Addr addr; if (type != ELF_RELOC_RELA) return (-1); @@ -245,7 +245,7 @@ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return (-1); - value += (Elf_Addr)addr; + value += addr; } if (RELOC_PC_RELATIVE(rtype)) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 20 21:18:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C4C137B40E; Thu, 20 Jun 2002 21:16:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5AFDD37B404 for ; Thu, 20 Jun 2002 21:15:58 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5L4Fvu57122 for perforce@freebsd.org; Thu, 20 Jun 2002 21:15:57 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Date: Thu, 20 Jun 2002 21:15:57 -0700 (PDT) Message-Id: <200206210415.g5L4Fvu57122@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bmilekic@freebsd.org using -f From: Bosko Milekic Subject: PERFORCE change 13228 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13228 Change 13228 by bmilekic@bmilekic_angela on 2002/06/20 21:15:00 Catch up to -CURRENT... sigh; need to get textbox back up. Affected files ... ... //depot/projects/interrupt/sys/alpha/alpha/support.s#3 integrate ... //depot/projects/interrupt/sys/alpha/include/runq.h#2 integrate ... //depot/projects/interrupt/sys/alpha/osf1/osf1_misc.c#5 integrate ... //depot/projects/interrupt/sys/boot/efi/libefi/bootinfo.c#2 integrate ... //depot/projects/interrupt/sys/boot/i386/libi386/bootinfo.c#2 integrate ... //depot/projects/interrupt/sys/boot/ia64/libski/bootinfo.c#2 integrate ... //depot/projects/interrupt/sys/boot/sparc64/loader/metadata.c#4 integrate ... //depot/projects/interrupt/sys/cam/scsi/scsi_sa.c#2 integrate ... //depot/projects/interrupt/sys/conf/files#8 integrate ... //depot/projects/interrupt/sys/conf/options#6 integrate ... //depot/projects/interrupt/sys/conf/options.i386#5 integrate ... //depot/projects/interrupt/sys/conf/options.ia64#3 integrate ... //depot/projects/interrupt/sys/conf/options.pc98#5 integrate ... //depot/projects/interrupt/sys/dev/ata/ata-dma.c#6 integrate ... //depot/projects/interrupt/sys/dev/ata/ata-pci.c#6 integrate ... //depot/projects/interrupt/sys/dev/ata/atapi-fd.c#5 integrate ... //depot/projects/interrupt/sys/dev/ata/atapi-fd.h#3 integrate ... //depot/projects/interrupt/sys/dev/em/if_em_fxhw.c#4 delete ... //depot/projects/interrupt/sys/dev/em/if_em_fxhw.h#4 delete ... //depot/projects/interrupt/sys/dev/em/if_em_phy.c#4 delete ... //depot/projects/interrupt/sys/dev/em/if_em_phy.h#4 delete ... //depot/projects/interrupt/sys/dev/sio/sio.c#4 integrate ... //depot/projects/interrupt/sys/dev/sio/sioreg.h#3 integrate ... //depot/projects/interrupt/sys/dev/wi/if_wi.c#8 integrate ... //depot/projects/interrupt/sys/dev/wi/if_wireg.h#5 integrate ... //depot/projects/interrupt/sys/dev/wi/if_wivar.h#2 integrate ... //depot/projects/interrupt/sys/gnu/i386/fpemul/load_store.c#2 integrate ... //depot/projects/interrupt/sys/gnu/i386/fpemul/reg_ld_str.c#2 integrate ... //depot/projects/interrupt/sys/i386/i386/math_emulate.c#3 integrate ... //depot/projects/interrupt/sys/i386/i386/support.s#5 integrate ... //depot/projects/interrupt/sys/i386/i386/vm86.c#3 integrate ... //depot/projects/interrupt/sys/i386/include/runq.h#2 integrate ... //depot/projects/interrupt/sys/ia64/ia32/imgact_ia32.c#2 integrate ... //depot/projects/interrupt/sys/ia64/ia64/pmap.c#6 integrate ... //depot/projects/interrupt/sys/ia64/ia64/support.s#3 integrate ... //depot/projects/interrupt/sys/ia64/ia64/trap.c#6 integrate ... //depot/projects/interrupt/sys/ia64/include/runq.h#2 integrate ... //depot/projects/interrupt/sys/kern/kern_exec.c#5 integrate ... //depot/projects/interrupt/sys/kern/kern_linker.c#6 integrate ... //depot/projects/interrupt/sys/kern/kern_prot.c#6 integrate ... //depot/projects/interrupt/sys/kern/kern_subr.c#4 integrate ... //depot/projects/interrupt/sys/kern/kern_switch.c#5 integrate ... //depot/projects/interrupt/sys/kern/sys_generic.c#5 integrate ... //depot/projects/interrupt/sys/kern/tty.c#6 integrate ... //depot/projects/interrupt/sys/kern/uipc_socket.c#5 integrate ... //depot/projects/interrupt/sys/kern/uipc_syscalls.c#5 integrate ... //depot/projects/interrupt/sys/kern/vfs_subr.c#7 integrate ... //depot/projects/interrupt/sys/kern/vfs_syscalls.c#7 integrate ... //depot/projects/interrupt/sys/modules/netgraph/device/Makefile#1 branch ... //depot/projects/interrupt/sys/netgraph/ng_device.c#1 branch ... //depot/projects/interrupt/sys/netgraph/ng_device.h#1 branch ... //depot/projects/interrupt/sys/netinet/if_ether.c#3 integrate ... //depot/projects/interrupt/sys/pc98/conf/GENERIC#4 integrate ... //depot/projects/interrupt/sys/pc98/pc98/fd.c#4 integrate ... //depot/projects/interrupt/sys/pc98/pc98/sio.c#6 integrate ... //depot/projects/interrupt/sys/powerpc/include/runq.h#2 integrate ... //depot/projects/interrupt/sys/powerpc/powerpc/copyinout.c#2 integrate ... //depot/projects/interrupt/sys/sparc64/include/runq.h#2 integrate ... //depot/projects/interrupt/sys/sparc64/sparc64/support.s#4 integrate ... //depot/projects/interrupt/sys/sys/_sigset.h#2 integrate ... //depot/projects/interrupt/sys/sys/disklabel.h#5 integrate ... //depot/projects/interrupt/sys/sys/malloc.h#5 integrate ... //depot/projects/interrupt/sys/sys/mbuf.h#4 integrate ... //depot/projects/interrupt/sys/sys/mount.h#5 integrate ... //depot/projects/interrupt/sys/sys/socket.h#5 integrate ... //depot/projects/interrupt/sys/sys/systm.h#7 integrate ... //depot/projects/interrupt/sys/sys/ucred.h#5 integrate ... //depot/projects/interrupt/sys/sys/uio.h#3 integrate ... //depot/projects/interrupt/sys/sys/un.h#3 integrate ... //depot/projects/interrupt/sys/ufs/ufs/ufs_readwrite.c#5 integrate ... //depot/projects/interrupt/sys/vm/uma.h#3 integrate ... //depot/projects/interrupt/sys/vm/uma_core.c#3 integrate ... //depot/projects/interrupt/sys/vm/vm_kern.c#5 integrate ... //depot/projects/interrupt/sys/vm/vm_map.c#7 integrate ... //depot/projects/interrupt/sys/vm/vm_object.c#5 integrate ... //depot/projects/interrupt/sys/vm/vm_unix.c#3 integrate Differences ... ==== //depot/projects/interrupt/sys/alpha/alpha/support.s#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.10 2002/05/26 16:03:12 dfr Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.12 2002/06/20 07:40:53 peter Exp $ */ /* @@ -150,11 +150,6 @@ RET END(fubyte) - LEAF(suibyte, 2) - ldiq v0, -1 - RET - END(suibyte) - LEAF(fusufault, 0) ldq t0, PC_CURTHREAD(pcpup) ldq t0, TD_PCB(t0) @@ -164,8 +159,8 @@ END(fusufault) LEAF(fswintrberr, 0) -XLEAF(fuswintr, 2) /* XXX what is a 'word'? */ -XLEAF(suswintr, 2) /* XXX what is a 'word'? */ +XLEAF(fuswintr, 2) /* XXX 16 bit short for profiling */ +XLEAF(suswintr, 2) /* XXX 16 bit short for profiling */ LDGP(pv) ldiq v0, -1 RET ==== //depot/projects/interrupt/sys/alpha/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/runq.h,v 1.1 2002/05/25 01:12:15 jake Exp $ + * $FreeBSD: src/sys/alpha/include/runq.h,v 1.2 2002/06/20 06:21:19 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1UL << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs64(word)) +#define RQB_FFS(word) (ffs64(word) - 1) /* * Type of run queue status word. ==== //depot/projects/interrupt/sys/alpha/osf1/osf1_misc.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.30 2002/04/13 23:11:22 jhb Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.31 2002/06/19 06:39:25 alfred Exp $ */ @@ -1056,17 +1056,20 @@ struct proc *p; int error; uid_t uid; + struct uidinfo *uip; struct ucred *newcred, *oldcred; p = td->td_proc; uid = SCARG(uap, uid); newcred = crget(); + uip = uifind(uid); PROC_LOCK(p); oldcred = p->p_ucred; if ((error = suser_cred(p->p_ucred, PRISON_ROOT)) != 0 && uid != oldcred->cr_ruid && uid != oldcred->cr_svuid) { PROC_UNLOCK(p); + uifree(uip); crfree(newcred); return (error); } @@ -1074,7 +1077,7 @@ crcopy(newcred, oldcred); if (error == 0) { if (uid != oldcred->cr_ruid) { - change_ruid(newcred, uid); + change_ruid(newcred, uip); setsugid(p); } if (oldcred->cr_svuid != uid) { @@ -1083,11 +1086,12 @@ } } if (newcred->cr_uid != uid) { - change_euid(newcred, uid); + change_euid(newcred, uip); setsugid(p); } p->p_ucred = newcred; PROC_UNLOCK(p); + uifree(uip); crfree(oldcred); return (0); } ==== //depot/projects/interrupt/sys/boot/efi/libefi/bootinfo.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.5 2001/11/19 07:09:47 peter Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.6 2002/06/20 06:29:42 peter Exp $ */ #include @@ -55,6 +55,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; ==== //depot/projects/interrupt/sys/boot/i386/libi386/bootinfo.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.32 2002/01/04 07:59:27 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.33 2002/06/20 06:29:42 peter Exp $ */ #include @@ -53,6 +53,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; ==== //depot/projects/interrupt/sys/boot/ia64/libski/bootinfo.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.5 2001/11/19 07:05:09 peter Exp $ + * $FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.6 2002/06/20 06:29:42 peter Exp $ */ #include @@ -54,6 +54,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; ==== //depot/projects/interrupt/sys/boot/sparc64/loader/metadata.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.29 - * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.5 2002/05/29 05:49:58 jake Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.6 2002/06/20 06:29:42 peter Exp $ */ #include @@ -61,6 +61,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; ==== //depot/projects/interrupt/sys/cam/scsi/scsi_sa.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.81 2001/09/14 19:00:51 mjacob Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.82 2002/06/19 20:44:48 robert Exp $ * * Implementation of SCSI Sequential Access Peripheral driver for CAM. * @@ -2298,7 +2298,7 @@ saerror(union ccb *ccb, u_int32_t cflgs, u_int32_t sflgs) { static const char *toobig = - "%d-byte tape record bigger than suplied buffer\n"; + "%d-byte tape record bigger than supplied buffer\n"; struct cam_periph *periph; struct sa_softc *softc; struct ccb_scsiio *csio; ==== //depot/projects/interrupt/sys/conf/files#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.649 2002/06/17 05:40:40 jhay Exp $ +# $FreeBSD: src/sys/conf/files,v 1.650 2002/06/18 21:32:33 julian Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1112,6 +1112,7 @@ net/bpf_filter.c optional netgraph_bpf netgraph/ng_bridge.c optional netgraph_bridge netgraph/ng_cisco.c optional netgraph_cisco +netgraph/ng_device.c optional netgraph_device netgraph/ng_echo.c optional netgraph_echo netgraph/ng_ether.c optional netgraph_ether netgraph/ng_frame_relay.c optional netgraph_frame_relay ==== //depot/projects/interrupt/sys/conf/options#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.325 2002/06/13 22:41:23 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.326 2002/06/18 21:30:36 n_hibma Exp $ # # On the handling of kernel options # @@ -69,10 +69,12 @@ COMPAT_SUNOS opt_compat.h COMPILING_LINT opt_global.h CY_PCI_FASTINTR +CONSPEED opt_comconsole.h DDB DDB_NOKLDSYM opt_ddb.h DDB_UNATTENDED opt_ddb.h GDB_REMOTE_CHAT opt_ddb.h +GDBSPEED opt_ddb.h NODEVFS opt_devfs.h HW_WDOG KTRACE ==== //depot/projects/interrupt/sys/conf/options.i386#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.170 2002/05/16 21:23:40 trhodes Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.171 2002/06/18 21:30:36 n_hibma Exp $ # Options specific to the i386 platform kernels DISABLE_PSE @@ -14,7 +14,6 @@ POWERFAIL_NMI opt_trap.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h -CONSPEED opt_comconsole.h I586_PMC_GUPROF opt_i586_guprof.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h ==== //depot/projects/interrupt/sys/conf/options.ia64#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.ia64,v 1.10 2002/04/14 04:33:41 peter Exp $ +# $FreeBSD: src/sys/conf/options.ia64,v 1.11 2002/06/18 21:30:37 n_hibma Exp $ # Options specific to the ia64 platform kernels ITANIUM opt_global.h @@ -15,8 +15,6 @@ SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h -CONSPEED opt_comconsole.h - MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h SC_DEBUG_LEVEL opt_syscons.h ==== //depot/projects/interrupt/sys/conf/options.pc98#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.145 2002/05/19 13:18:10 nyan Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.146 2002/06/18 21:30:37 n_hibma Exp $ # Options specific to the pc98 platform kernels DISABLE_PSE @@ -14,7 +14,6 @@ POWERFAIL_NMI opt_trap.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h -CONSPEED opt_comconsole.h I586_PMC_GUPROF opt_i586_guprof.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h ==== //depot/projects/interrupt/sys/dev/ata/ata-dma.c#6 (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. * - * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.98 2002/04/26 22:48:20 mike Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.99 2002/06/19 12:26:20 sos Exp $ */ #include @@ -1027,8 +1027,8 @@ } break; + case 0x0d30105a: /* Promise OEM ATA100 controllers */ case 0x4d30105a: /* Promise Ultra/FastTrak 100 controllers */ - case 0x0d30105a: /* Promise OEM ATA100 controllers */ if (!ATAPI_DEVICE(atadev) && udmamode >= 5 && !(pci_read_config(parent, 0x50, 2) & (channel ? 1<<11 : 1<<10))) { error = ata_command(atadev, ATA_C_SETFEATURES, 0, @@ -1044,6 +1044,7 @@ } /* FALLTHROUGH */ + case 0x0d38105a: /* Promise FastTrak 66 controllers */ case 0x4d38105a: /* Promise Ultra/FastTrak 66 controllers */ if (!ATAPI_DEVICE(atadev) && udmamode >= 4 && !(pci_read_config(parent, 0x50, 2) & (channel ? 1<<11 : 1<<10))) { @@ -1398,9 +1399,10 @@ } break; + case 0x0d38105a: /* Promise Fasttrak 66 */ case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */ + case 0x0d30105a: /* Promise OEM ATA 100 */ case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */ - case 0x0d30105a: /* Promise OEM ATA 100 */ switch (mode) { default: case ATA_PIO0: t->pa = 15; t->pb = 31; t->mb = 7; t->mc = 15; break; ==== //depot/projects/interrupt/sys/dev/ata/ata-pci.c#6 (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. * - * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.41 2002/04/16 08:30:51 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.42 2002/06/19 12:26:20 sos Exp $ */ #include "opt_ata.h" @@ -243,6 +243,7 @@ case 0x4d33105a: return "Promise ATA33 controller"; + case 0x0d38105a: case 0x4d38105a: return "Promise ATA66 controller"; @@ -404,9 +405,10 @@ (pci_read_config(dev, 0x53, 1) & ~0x01) | 0x02, 1); break; - case 0x4d38105a: /* Promise 66 & 100 (before TX2) need the clock changed */ + case 0x0d30105a: /* Promise 66 & 100 (before TX2) need the clock changed */ case 0x4d30105a: - case 0x0d30105a: + case 0x0d38105a: + case 0x4d38105a: ATA_OUTB(controller->bmio, 0x11, ATA_INB(controller->bmio, 0x11)|0x0a); /* FALLTHROUGH */ @@ -565,9 +567,10 @@ break; case 0x4d33105a: /* Promise Ultra/Fasttrak 33 */ + case 0x0d38105a: /* Promise Fasttrak 66 */ case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */ + case 0x0d30105a: /* Promise OEM ATA100 */ case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */ - case 0x0d30105a: /* Promise OEM ATA100 */ if (!(ATA_INL(ch->r_bmio, (ch->unit ? 0x14 : 0x1c)) & (ch->unit ? 0x00004000 : 0x00000400))) return 1; ==== //depot/projects/interrupt/sys/dev/ata/atapi-fd.c#5 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.72 2002/05/25 11:18:02 bde Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.73 2002/06/19 12:41:05 sos Exp $ */ #include @@ -69,7 +69,6 @@ /* prototypes */ static int afd_sense(struct afd_softc *); static void afd_describe(struct afd_softc *); -static int afd_partial_done(struct atapi_request *); static int afd_done(struct atapi_request *); static int afd_eject(struct afd_softc *, int); static int afd_start_stop(struct afd_softc *, int); @@ -101,17 +100,20 @@ return 0; } - if (!strncmp(atadev->param->model, "IOMEGA ZIP", 10)) - fdp->transfersize = 64; - devstat_add_entry(&fdp->stats, "afd", fdp->lun, DEV_BSIZE, DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_DIRECT | DEVSTAT_TYPE_IF_IDE, DEVSTAT_PRIORITY_WFD); dev = disk_create(fdp->lun, &fdp->disk, 0, &afd_cdevsw, &afddisk_cdevsw); dev->si_drv1 = fdp; - dev->si_iosize_max = 252 * DEV_BSIZE; fdp->dev = dev; + + if (!strncmp(atadev->param->model, "IOMEGA ZIP", 10) || + !strncmp(atadev->param->model, "IOMEGA Clik!", 12)) + fdp->dev->si_iosize_max = 64 * DEV_BSIZE; + else + fdp->dev->si_iosize_max = 252 * DEV_BSIZE; + afd_describe(fdp); atadev->flags |= ATA_D_MEDIA_CHANGED; atadev->driver = fdp; @@ -147,7 +149,6 @@ /* The IOMEGA Clik! doesn't support reading the cap page, fake it */ if (!strncmp(fdp->device->param->model, "IOMEGA Clik!", 12)) { - fdp->transfersize = 64; fdp->cap.transfer_rate = 500; fdp->cap.heads = 1; fdp->cap.sectors = 2; @@ -189,8 +190,6 @@ fdp->cap.cylinders, fdp->cap.heads, fdp->cap.sectors, fdp->cap.sector_size); ata_prtdev(fdp->device, "%dKB/s,", fdp->cap.transfer_rate / 8); - if (fdp->transfersize) - printf(" transfer limit %d blks,", fdp->transfersize); printf(" %s\n", ata_mode2str(fdp->device->mode)); if (fdp->cap.medium_type) { ata_prtdev(fdp->device, "Medium: "); @@ -294,6 +293,13 @@ return; } + /* if it's a null transfer, return immediatly. */ + if (bp->bio_bcount == 0) { + bp->bio_resid = 0; + biodone(bp); + return; + } + s = splbio(); bioqdisksort(&fdp->queue, bp); splx(s); @@ -324,7 +330,7 @@ lba = bp->bio_pblkno; count = bp->bio_bcount / fdp->cap.sector_size; data_ptr = bp->bio_data; - bp->bio_resid = 0; + bp->bio_resid = bp->bio_bcount; bzero(ccb, sizeof(ccb)); @@ -333,26 +339,6 @@ else ccb[0] = ATAPI_WRITE_BIG; - devstat_start_transaction(&fdp->stats); - - while (fdp->transfersize && (count > fdp->transfersize)) { - ccb[2] = lba>>24; - ccb[3] = lba>>16; - ccb[4] = lba>>8; - ccb[5] = lba; - ccb[7] = fdp->transfersize>>8; - ccb[8] = fdp->transfersize; - - atapi_queue_cmd(fdp->device, ccb, data_ptr, - fdp->transfersize * fdp->cap.sector_size, - (bp->bio_cmd == BIO_READ) ? ATPR_F_READ : 0, 30, - afd_partial_done, bp); - - count -= fdp->transfersize; - lba += fdp->transfersize; - data_ptr += fdp->transfersize * fdp->cap.sector_size; - } - ccb[2] = lba>>24; ccb[3] = lba>>16; ccb[4] = lba>>8; @@ -360,25 +346,14 @@ ccb[7] = count>>8; ccb[8] = count; + devstat_start_transaction(&fdp->stats); + atapi_queue_cmd(fdp->device, ccb, data_ptr, count * fdp->cap.sector_size, (bp->bio_cmd == BIO_READ) ? ATPR_F_READ : 0, 30, afd_done, bp); } static int -afd_partial_done(struct atapi_request *request) -{ - struct bio *bp = request->driver; - - if (request->error) { - bp->bio_error = request->error; - bp->bio_flags |= BIO_ERROR; - } - bp->bio_resid += request->bytecount; - return 0; -} - -static int afd_done(struct atapi_request *request) { struct bio *bp = request->driver; @@ -389,7 +364,7 @@ bp->bio_flags |= BIO_ERROR; } else - bp->bio_resid += (bp->bio_bcount - request->donecount); + bp->bio_resid = bp->bio_bcount - request->donecount; biofinish(bp, &fdp->stats, 0); return 0; } ==== //depot/projects/interrupt/sys/dev/ata/atapi-fd.h#3 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-fd.h,v 1.16 2002/02/04 19:23:40 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-fd.h,v 1.17 2002/06/19 12:41:05 sos Exp $ */ /* ATAPI Rewriteable drive Capabilities and Mechanical Status Page */ @@ -71,7 +71,6 @@ struct afd_softc { struct ata_device *device; /* device softc */ int lun; /* logical device unit */ - int transfersize; /* max size of each transfer */ struct bio_queue_head queue; /* queue of i/o requests */ struct afd_cappage cap; /* capabilities page info */ struct disk disk; /* virtual drives */ ==== //depot/projects/interrupt/sys/dev/sio/sio.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sio/sio.c,v 1.374 2002/04/26 20:24:10 phk Exp $ + * $FreeBSD: src/sys/dev/sio/sio.c,v 1.375 2002/06/18 21:30:37 n_hibma Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -332,14 +332,12 @@ static volatile speed_t comdefaultrate = CONSPEED; static u_long comdefaultrclk = DEFAULT_RCLK; SYSCTL_ULONG(_machdep, OID_AUTO, conrclk, CTLFLAG_RW, &comdefaultrclk, 0, ""); -#ifdef __alpha__ -static volatile speed_t gdbdefaultrate = CONSPEED; -#endif +static speed_t gdbdefaultrate = GDBSPEED; +SYSCTL_UINT(_machdep, OID_AUTO, gdbspeed, CTLFLAG_RW, + &gdbdefaultrate, GDBSPEED, ""); static u_int com_events; /* input chars + weighted output completions */ static Port_t siocniobase; -#ifndef __alpha__ -static int siocnunit; -#endif +static int siocnunit = -1; static Port_t siogdbiobase; static int siogdbunit = -1; static void *sio_slow_ih; @@ -3126,13 +3124,17 @@ Port_t iobase; int s; struct siocnstate sp; + speed_t speed; - if (minor(dev) == siogdbunit) + if (minor(dev) == siocnunit) { + iobase = siocniobase; + speed = comdefaultrate; + } else { iobase = siogdbiobase; - else - iobase = siocniobase; + speed = gdbdefaultrate; + } s = spltty(); - siocnopen(&sp, iobase, comdefaultrate); + siocnopen(&sp, iobase, speed); if (inb(iobase + com_lsr) & LSR_RXRDY) c = inb(iobase + com_data); else @@ -3151,13 +3153,17 @@ Port_t iobase; int s; struct siocnstate sp; + speed_t speed; - if (minor(dev) == siogdbunit) + if (minor(dev) == siocnunit) { + iobase = siocniobase; + speed = comdefaultrate; + } else { iobase = siogdbiobase; - else - iobase = siocniobase; + speed = gdbdefaultrate; + } s = spltty(); - siocnopen(&sp, iobase, comdefaultrate); + siocnopen(&sp, iobase, speed); while (!(inb(iobase + com_lsr) & LSR_RXRDY)) ; c = inb(iobase + com_data); @@ -3175,18 +3181,22 @@ int s; struct siocnstate sp; Port_t iobase; + speed_t speed; - if (minor(dev) == siogdbunit) + if (minor(dev) == siocnunit) { + iobase = siocniobase; + speed = comdefaultrate; + } else { iobase = siogdbiobase; - else - iobase = siocniobase; + speed = gdbdefaultrate; + } s = spltty(); need_unlock = 0; if (sio_inited == 2 && !mtx_owned(&sio_lock)) { mtx_lock_spin(&sio_lock); need_unlock = 1; } - siocnopen(&sp, iobase, comdefaultrate); + siocnopen(&sp, iobase, speed); siocntxwait(iobase); outb(iobase + com_data, c); siocnclose(&sp, iobase); @@ -3201,12 +3211,20 @@ { int c; Port_t iobase; + speed_t speed; int s; struct siocnstate sp; - iobase = siogdbiobase; + if (minor(dev) == siocnunit) { + iobase = siocniobase; + speed = comdefaultrate; + } else { + iobase = siogdbiobase; + speed = gdbdefaultrate; + } + s = spltty(); - siocnopen(&sp, iobase, gdbdefaultrate); + siocnopen(&sp, iobase, speed); while (!(inb(iobase + com_lsr) & LSR_RXRDY)) ; c = inb(iobase + com_data); @@ -3219,11 +3237,21 @@ siogdbputc(c) int c; { + Port_t iobase; + speed_t speed; int s; struct siocnstate sp; + if (minor(dev) == siocnunit) { + iobase = siocniobase; + speed = comdefaultrate; + } else { + iobase = siogdbiobase; + speed = gdbdefaultrate; + } + s = spltty(); - siocnopen(&sp, siogdbiobase, gdbdefaultrate); + siocnopen(&sp, iobase, speed); siocntxwait(siogdbiobase); outb(siogdbiobase + com_data, c); siocnclose(&sp, siogdbiobase); ==== //depot/projects/interrupt/sys/dev/sio/sioreg.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)comreg.h 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/dev/sio/sioreg.h,v 1.19 2002/01/31 08:23:30 nyan Exp $ + * $FreeBSD: src/sys/dev/sio/sioreg.h,v 1.20 2002/06/18 21:30:37 n_hibma Exp $ */ /* Receiver clock frequency for "standard" pc serial ports. */ @@ -123,4 +123,9 @@ #define CONSPEED 9600 #endif +/* default serial gdb speed if not set with sysctl or probed from boot */ +#ifndef GDBSPEED +#define GDBSPEED CONSPEED +#endif + #define IO_COMSIZE 8 /* 8250, 16x50 com controllers */ ==== //depot/projects/interrupt/sys/dev/wi/if_wi.c#8 (text+ko) ==== @@ -103,7 +103,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.105 2002/05/29 20:24:09 phk Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.106 2002/06/19 17:37:34 imp Exp $"; #endif static void wi_intr(void *); @@ -313,6 +313,39 @@ sc->wi_channel = gen.wi_val; /* + * Set flags based on firmware version. + */ + switch (sc->sc_firmware_type) { + case WI_LUCENT: + sc->wi_flags |= WI_FLAGS_HAS_ROAMING; + if (sc->sc_sta_firmware_ver >= 60000) + sc->wi_flags |= WI_FLAGS_HAS_MOR; + if (sc->sc_sta_firmware_ver >= 60006) { + sc->wi_flags |= WI_FLAGS_HAS_IBSS; + sc->wi_flags |= WI_FLAGS_HAS_CREATE_IBSS; + } + sc->wi_ibss_port = htole16(1); + break; + case WI_INTERSIL: + sc->wi_flags |= WI_FLAGS_HAS_ROAMING; + if (sc->sc_sta_firmware_ver >= 800) { + sc->wi_flags |= WI_FLAGS_HAS_IBSS; + sc->wi_flags |= WI_FLAGS_HAS_CREATE_IBSS; + } + sc->wi_ibss_port = htole16(0); + break; + case WI_SYMBOL: + sc->wi_flags |= WI_FLAGS_HAS_DIVERSITY; + if (sc->sc_sta_firmware_ver >= 20000) + sc->wi_flags |= WI_FLAGS_HAS_IBSS; + /* Older Symbol firmware does not support IBSS creation. */ + if (sc->sc_sta_firmware_ver >= 25000) + sc->wi_flags |= WI_FLAGS_HAS_CREATE_IBSS; + sc->wi_ibss_port = htole16(4); + break; + } + + /* * Find out if we support WEP on this card. */ gen.wi_type = WI_RID_WEP_AVAIL; @@ -326,10 +359,13 @@ /* * Find supported rates. */ - gen.wi_type = WI_RID_TX_RATE; + gen.wi_type = WI_RID_DATA_RATES; gen.wi_len = 2; - wi_read_record(sc, &gen); - sc->wi_supprates = gen.wi_val; + if (wi_read_record(sc, &gen)) + sc->wi_supprates = WI_SUPPRATES_1M | WI_SUPPRATES_2M | + WI_SUPPRATES_5M | WI_SUPPRATES_11M; + else + sc->wi_supprates = gen.wi_val; bzero((char *)&sc->wi_stats, sizeof(sc->wi_stats)); @@ -337,36 +373,76 @@ wi_stop(sc); ifmedia_init(&sc->ifmedia, 0, wi_media_change, wi_media_status); - /* XXX: Should read from card capabilities */ #define ADD(m, c) ifmedia_add(&sc->ifmedia, (m), (c), NULL) - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, - IFM_IEEE80211_ADHOC, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, 0, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, - IFM_IEEE80211_ADHOC, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, 0, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, - IFM_IEEE80211_ADHOC, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, 0, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, - IFM_IEEE80211_ADHOC, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, 0, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, - IFM_IEEE80211_ADHOC, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, 0, 0), 0); - if (sc->sc_firmware_type == WI_INTERSIL) { + if (sc->wi_supprates & WI_SUPPRATES_1M) { + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, 0, 0), 0); ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, - IFM_IEEE80211_HOSTAP, 0), 0); + IFM_IEEE80211_ADHOC, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, + IFM_IEEE80211_IBSS, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_CREATE_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, + IFM_IEEE80211_IBSSMASTER, 0), 0); + if (sc->sc_firmware_type == WI_INTERSIL) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS1, + IFM_IEEE80211_HOSTAP, 0), 0); + } + if (sc->wi_supprates & WI_SUPPRATES_2M) { + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, 0, 0), 0); ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, - IFM_IEEE80211_HOSTAP, 0), 0); + IFM_IEEE80211_ADHOC, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, + IFM_IEEE80211_IBSS, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_CREATE_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, + IFM_IEEE80211_IBSSMASTER, 0), 0); + if (sc->sc_firmware_type == WI_INTERSIL) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS2, + IFM_IEEE80211_HOSTAP, 0), 0); + } + if (sc->wi_supprates & WI_SUPPRATES_5M) { + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, 0, 0), 0); ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, - IFM_IEEE80211_HOSTAP, 0), 0); + IFM_IEEE80211_ADHOC, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, + IFM_IEEE80211_IBSS, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_CREATE_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, + IFM_IEEE80211_IBSSMASTER, 0), 0); + if (sc->sc_firmware_type == WI_INTERSIL) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS5, + IFM_IEEE80211_HOSTAP, 0), 0); + } + if (sc->wi_supprates & WI_SUPPRATES_11M) { + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, 0, 0), 0); ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, + IFM_IEEE80211_ADHOC, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, + IFM_IEEE80211_IBSS, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_CREATE_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, + IFM_IEEE80211_IBSSMASTER, 0), 0); + if (sc->sc_firmware_type == WI_INTERSIL) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_IEEE80211_DS11, + IFM_IEEE80211_HOSTAP, 0), 0); + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_MANUAL, 0, 0), 0); + } + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, IFM_IEEE80211_ADHOC, 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, IFM_IEEE80211_IBSS, + 0), 0); + if (sc->wi_flags & WI_FLAGS_HAS_CREATE_IBSS) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, + IFM_IEEE80211_IBSSMASTER, 0), 0); + if (sc->sc_firmware_type == WI_INTERSIL) + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, IFM_IEEE80211_HOSTAP, 0), 0); - ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, - IFM_IEEE80211_HOSTAP, 0), 0); - } -#undef ADD + ADD(IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, 0, 0), 0); +#undef ADD ifmedia_set(&sc->ifmedia, IFM_MAKEWORD(IFM_IEEE80211, IFM_AUTO, 0, 0)); @@ -1065,7 +1141,15 @@ for (i = 0; i < ltv->wi_len - 1; i++) ptr[i] = CSR_READ_2(sc, WI_DATA1); - if (sc->sc_firmware_type != WI_LUCENT) { + if (ltv->wi_type == WI_RID_PORTTYPE && sc->wi_ptype == WI_PORTTYPE_IBSS + && ltv->wi_val == sc->wi_ibss_port) { + /* + * Convert vendor IBSS port type to WI_PORTTYPE_IBSS. + * Since Lucent uses port type 1 for BSS *and* IBSS we + * have to rely on wi_ptype to distinguish this for us. + */ + ltv->wi_val = htole16(WI_PORTTYPE_IBSS); + } else if (sc->sc_firmware_type != WI_LUCENT) { >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 13:19: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9909537B403; Sat, 22 Jun 2002 13:19:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B996637B401 for ; Sat, 22 Jun 2002 13:19:01 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5MKJ1p30569 for perforce@freebsd.org; Sat, 22 Jun 2002 13:19:01 -0700 (PDT) (envelope-from mux@freebsd.org) Date: Sat, 22 Jun 2002 13:19:01 -0700 (PDT) Message-Id: <200206222019.g5MKJ1p30569@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mux@freebsd.org using -f From: Maxime Henrion Subject: PERFORCE change 13279 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13279 Change 13279 by mux@mux_nebula on 2002/06/22 13:18:34 We don't need this cast anymore. Affected files ... ... //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#6 edit Differences ... ==== //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#6 (text+ko) ==== @@ -252,7 +252,7 @@ value -= (Elf_Addr)where; if (RELOC_BASE_RELATIVE(rtype)) - value += (Elf_Addr)(relocbase); + value += relocbase; mask = RELOC_VALUE_BITMASK(rtype); value >>= RELOC_VALUE_RIGHTSHIFT(rtype); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 16:22:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFE1437B403; Sat, 22 Jun 2002 16:21:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8E61D37B404 for ; Sat, 22 Jun 2002 16:21:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5MNLlV69192 for perforce@freebsd.org; Sat, 22 Jun 2002 16:21:47 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sat, 22 Jun 2002 16:21:47 -0700 (PDT) Message-Id: <200206222321.g5MNLlV69192@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13290 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13290 Change 13290 by julian@julian_ref on 2002/06/22 16:21:15 Checking AC KBLRU in BLURP GAK stuff. - Bill the cat Affected files ... ... //depot/projects/kse/sys/i386/i386/trap.c#53 edit ... //depot/projects/kse/sys/kern/init_main.c#43 edit ... //depot/projects/kse/sys/kern/kern_fork.c#72 edit ... //depot/projects/kse/sys/kern/kern_idle.c#14 edit ... //depot/projects/kse/sys/kern/kern_intr.c#25 edit ... //depot/projects/kse/sys/kern/kern_mutex.c#28 edit ... //depot/projects/kse/sys/kern/kern_proc.c#72 edit ... //depot/projects/kse/sys/kern/kern_switch.c#53 edit ... //depot/projects/kse/sys/kern/kern_synch.c#68 edit ... //depot/projects/kse/sys/kern/kern_thread.c#75 edit ... //depot/projects/kse/sys/kern/subr_trap.c#70 edit ... //depot/projects/kse/sys/sys/proc.h#112 edit ... //depot/projects/kse/sys/vm/uma_int.h#5 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#53 (text+ko) ==== @@ -951,6 +951,8 @@ mtx_unlock(&Giant); } #endif + KASSERT((td->td_kse != NULL), ("syscall: kse/thread UNLINKED")); + KASSERT((td->td_kse->ke_thread == td), ("syscall:kse/thread mismatch")); sticks = td->td_kse->ke_sticks; td->td_frame = &frame; ==== //depot/projects/kse/sys/kern/init_main.c#43 (text+ko) ==== @@ -349,6 +349,8 @@ kg->kg_idle_kses--; p->p_peers = 0; p->p_leader = p; +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); + bcopy("swapper", p->p_comm, sizeof ("swapper")); ==== //depot/projects/kse/sys/kern/kern_fork.c#72 (text+ko) ==== @@ -508,12 +508,13 @@ proc_linkup(p2, kg2, ke2, td2); /* Set up the thread as an active thread (as if runnable). */ + TAILQ_REMOVE(&kg2->kg_iq, ke2, ke_kgrlist); + kg2->kg_idle_kses--; + ke2->ke_state = KES_UNQUEUED; ke2->ke_thread = td2; td2->td_kse = ke2; - TAILQ_REMOVE(&kg2->kg_iq, ke2, ke_kgrlist); - ke2->ke_state = KES_UNQUEUED; - kg2->kg_idle_kses--; td2->td_flags &= ~TDF_UNBOUND; /* For the rest of this syscall. */ +KASSERT((ke2->ke_kgrlist.tqe_next != ke2), ("linked to self!")); /* note.. XXXKSE no pcb or u-area yet */ @@ -834,6 +835,7 @@ td->td_kse->ke_oncpu = PCPU_GET(cpuid); p->p_state = PRS_NORMAL; td->td_state = TDS_RUNNING; /* Already done in switch() on 386. */ + td->td_kse->ke_state = KES_RUNNING; /* * Finish setting up thread glue. We need to initialize * the thread into a td_critnest=1 state. Some platforms ==== //depot/projects/kse/sys/kern/kern_idle.c#14 (text+ko) ==== @@ -40,6 +40,7 @@ struct pcpu *pc; #endif struct proc *p; + struct thread *td; int error; #ifdef SMP @@ -60,7 +61,10 @@ panic("idle_setup: kthread_create error %d\n", error); p->p_flag |= P_NOLOAD; - FIRST_THREAD_IN_PROC(p)->td_state = TDS_RUNQ; /* XXXKSE */ + td = FIRST_THREAD_IN_PROC(p); + td->td_state = TDS_RUNQ; + td->td_kse->ke_state = KES_ONRUNQ; + td->td_kse->ke_flags |= KEF_IDLEKSE; #ifdef SMP } #endif @@ -75,7 +79,13 @@ #ifdef DIAGNOSTIC int count; #endif + struct thread *td; + struct proc *p; + td = curthread; + p = td->td_proc; + td->td_state = TDS_RUNNING; + td->td_kse->ke_state = KES_RUNNING; for (;;) { mtx_assert(&Giant, MA_NOTOWNED); @@ -103,9 +113,9 @@ } mtx_lock_spin(&sched_lock); - curthread->td_proc->p_stats->p_ru.ru_nvcsw++; - curthread->td_state = TDS_RUNQ; /* Pretend we are on the runq */ + p->p_stats->p_ru.ru_nvcsw++; mi_switch(); + td->td_kse->ke_state = KES_RUNNING; mtx_unlock_spin(&sched_lock); } } ==== //depot/projects/kse/sys/kern/kern_intr.c#25 (text+ko) ==== @@ -390,10 +390,12 @@ CTR2(KTR_INTR, "%s: setrunqueue %d", __func__, p->p_pid); setrunqueue(td); if (do_switch && - (curthread->td_critnest == 1) && - (curthread->td_state == TDS_RUNNING)) { + (curthread->td_critnest == 1)/* && + (curthread->td_state == TDS_RUNNING) XXXKSE*/) { +#if 0 /* not needed in KSE */ if (curthread != PCPU_GET(idlethread)) setrunqueue(curthread); +#endif curthread->td_proc->p_stats->p_ru.ru_nivcsw++; mi_switch(); } else { ==== //depot/projects/kse/sys/kern/kern_mutex.c#28 (text+ko) ==== ==== //depot/projects/kse/sys/kern/kern_proc.c#72 (text+ko) ==== @@ -120,8 +120,10 @@ { struct proc *p = kg->kg_proc; +KASSERT((ke->ke_state != KES_ONRUNQ), ("linking suspect kse on run queue")); TAILQ_INSERT_HEAD(&kg->kg_kseq, ke, ke_kglist); kg->kg_kses++; +KASSERT((ke->ke_state != KES_IDLE), ("already on idle queue")); ke->ke_state = KES_IDLE; TAILQ_INSERT_HEAD(&kg->kg_iq, ke, ke_kgrlist); kg->kg_idle_kses++; ==== //depot/projects/kse/sys/kern/kern_switch.c#53 (text+ko) ==== @@ -126,18 +126,22 @@ if ((ke = runq_choose(&runq))) { td = ke->ke_thread; + KASSERT((td->td_kse == ke), ("kse/thread mismatch")); + kg = ke->ke_ksegrp; if (td->td_flags & TDF_UNBOUND) { - kg = ke->ke_ksegrp; TAILQ_REMOVE(&kg->kg_runq, td, td_runq); if (kg->kg_last_assigned == td) kg->kg_last_assigned = NULL; } + kg->kg_runnable--; CTR2(KTR_RUNQ, "choosethread: td=%p pri=%d", td, td->td_priority); } else { /* Pretend the idle thread was on the run queue. */ td = PCPU_GET(idlethread); + /* Simulate that it was on the run queue */ td->td_state = TDS_RUNQ; + td->td_kse->ke_state = KES_UNQUEUED; CTR1(KTR_RUNQ, "choosethread: td=%p (idle)", td); } return (td); @@ -156,6 +160,7 @@ kg = ke->ke_ksegrp; +KASSERT((ke->ke_state != KES_ONRUNQ), ("kse_reassigning non-free kse")); /* * Find the first unassigned thread * If there is a 'last assigned' then see what's next. @@ -177,10 +182,13 @@ runq_add(&runq, ke); CTR2(KTR_RUNQ, "kse_reassign: ke%p -> td%p", ke, td); } else { + KASSERT((ke->ke_state != KES_IDLE), ("kse already idle")); +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); ke->ke_state = KES_IDLE; TAILQ_INSERT_HEAD(&kg->kg_iq, ke, ke_kgrlist); kg->kg_idle_kses++; CTR1(KTR_RUNQ, "kse_reassign: ke%p idled", ke); +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); } } @@ -234,6 +242,7 @@ struct ksegrp *kg; struct kse *ke; + mtx_assert(&sched_lock, MA_OWNED); if (td->td_state != TDS_RUNQ) { panic("remrunqueue: Bad state on run queue"); /* NOTREACHED */ @@ -289,14 +298,21 @@ kg->kg_last_assigned = TAILQ_PREV(td, threadlist_head, td_runq); } +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); + KASSERT((ke->ke_state != KES_IDLE), + ("kse already idle")); ke->ke_state = KES_IDLE; +KASSERT((TAILQ_FIRST(&kg->kg_iq) != ke), ("really bad screwup")); TAILQ_INSERT_HEAD(&kg->kg_iq, ke, ke_kgrlist); kg->kg_idle_kses++; +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self2!")); } } TAILQ_REMOVE(&kg->kg_runq, td, td_runq); } +#if 1 /* use the first version */ + void setrunqueue(struct thread *td) { @@ -305,11 +321,14 @@ struct thread *td2; CTR1(KTR_RUNQ, "setrunqueue: td%p", td); + mtx_assert(&sched_lock, MA_OWNED); KASSERT((td->td_state != TDS_RUNQ), ("setrunqueue: bad thread state")); td->td_state = TDS_RUNQ; kg = td->td_ksegrp; kg->kg_runnable++; if ((td->td_flags & TDF_UNBOUND) == 0) { + KASSERT((td->td_kse != NULL), + ("queueing BAD thread to run queue")); /* * Common path optimisation: Only one of everything * and the KSE is always already attached. @@ -318,7 +337,98 @@ runq_add(&runq, td->td_kse); return; } + /* + * Ok, so we are threading with this thread. + * quickly disassociate the KSE if we have one.. + */ + if ((ke = td->td_kse) == NULL) { + /* + * see if we will need a KSE and if there is one.. + * First look for a free one, before getting desperate. + */ + if (kg->kg_idle_kses) { + /* + * There is a free one so it's ours for the asking.. + */ + ke = TAILQ_FIRST(&kg->kg_iq); +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); + TAILQ_REMOVE(&kg->kg_iq, ke, ke_kgrlist); + ke->ke_state = KES_UNQUEUED; + kg->kg_idle_kses--; + ke->ke_thread = td; + td->td_kse = ke; +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); + } else if ((kg->kg_last_assigned) && + (kg->kg_last_assigned->td_priority > td->td_priority)) { + /* + * None free, but there is one we can commandeer. + */ + td2 = kg->kg_last_assigned; + kg->kg_last_assigned = + TAILQ_PREV(td2, threadlist_head, td_runq); + ke = td2->td_kse; + runq_remove(&runq, ke); + ke->ke_thread = td; + td2->td_kse = NULL; + td->td_kse = ke; +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); + } + } + /* + * Add the thread to the ksegrp's run queue at + * the appropriate place. + */ + TAILQ_FOREACH(td2, &kg->kg_runq, td_runq) { + if (td2->td_priority > td->td_priority) { + TAILQ_INSERT_BEFORE(td2, td, td_runq); + break; + } + } + if (td2 == NULL) { + /* We ran off the end of the TAILQ or it was empty. */ + TAILQ_INSERT_TAIL(&kg->kg_runq, td, td_runq); + } + + /* + * If we have a ke to use, then put it on the run queue and + * If needed, readjust the last_assigned pointer. + */ + if (ke) { + ke->ke_thread = td; + td->td_kse = ke; + if (kg->kg_last_assigned == + TAILQ_PREV(td, threadlist_head, td_runq)) { + kg->kg_last_assigned = td; + } + runq_add(&runq, ke); + } +} + +#else + +void +setrunqueue(struct thread *td) +{ + struct kse *ke; + struct ksegrp *kg; + struct thread *td2; + + CTR1(KTR_RUNQ, "setrunqueue: td%p", td); + KASSERT((td->td_state != TDS_RUNQ), ("setrunqueue: bad thread state")); + td->td_state = TDS_RUNQ; + kg = td->td_ksegrp; + kg->kg_runnable++; + if ((td->td_flags & TDF_UNBOUND) == 0) { + /* + * Common path optimisation: Only one of everything + * and the KSE is always already attached. + * Totally ignore the ksegrp run queue. + */ + runq_add(&runq, td->td_kse); + return; + } + /* * First add the thread to the ksegrp's run queue at * the appropriate place. */ @@ -379,12 +489,15 @@ * assigned" pointer set to us as well. */ ke = TAILQ_FIRST(&kg->kg_iq); +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); TAILQ_REMOVE(&kg->kg_iq, ke, ke_kgrlist); ke->ke_state = KES_UNQUEUED; kg->kg_idle_kses--; +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); ke->ke_thread = td; td->td_kse = ke; runq_add(&runq, ke); +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); if (TAILQ_NEXT(td, td_runq) == NULL) { kg->kg_last_assigned = td; } @@ -400,14 +513,17 @@ */ td2 = kg->kg_last_assigned; ke = td2->td_kse; +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); kg->kg_last_assigned = TAILQ_PREV(td2, threadlist_head, td_runq); td2->td_kse = NULL; td->td_kse = ke; ke->ke_thread = td; runq_readjust(&runq, ke); +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); } } +#endif /************************************************************************ * Critical section marker functions * @@ -586,6 +702,9 @@ KASSERT(ke != NULL, ("runq_choose: no proc on busy queue")); CTR3(KTR_RUNQ, "runq_choose: pri=%d kse=%p rqh=%p", pri, ke, rqh); +KASSERT(ke->ke_procq.tqe_prev != NULL, ("no prev")); +if (ke->ke_procq.tqe_next) + KASSERT(ke->ke_procq.tqe_next->ke_procq.tqe_prev != NULL, ("no next")); TAILQ_REMOVE(rqh, ke, ke_procq); ke->ke_ksegrp->kg_runq_kses--; if (TAILQ_EMPTY(rqh)) { ==== //depot/projects/kse/sys/kern/kern_synch.c#68 (text+ko) ==== @@ -420,6 +420,9 @@ * entered before msleep returns. If priority includes the PDROP * flag the mutex is not entered before returning. */ + +struct thread *TD1; + int msleep(ident, mtx, priority, wmesg, timo) void *ident; @@ -437,6 +440,8 @@ if (KTRPOINT(td, KTR_CSW)) ktrcsw(1, 0); #endif + KASSERT((td->td_kse != NULL), ("msleep: NULL KSE?")); + KASSERT((td->td_kse->ke_state == KES_RUNNING), ("msleep: kse state?")); WITNESS_SLEEP(0, &mtx->mtx_object); KASSERT(timo != 0 || mtx_owned(&Giant) || mtx != NULL, ("sleeping without a mutex")); @@ -453,6 +458,7 @@ and not the exiting thread. */ if ((p->p_flag & P_WEXIT) && catch && p->p_singlethread != td) return (EINTR); + TD1 = NULL; if (td->td_mailbox && (!(td->td_flags & TDF_INMSLEEP))) { /* * If we have no queued work to do, then @@ -461,14 +467,22 @@ * queue it. */ if (TAILQ_FIRST(&td->td_ksegrp->kg_runq) == NULL) { + TD1 = td; /* Don't recurse here! */ mtx_lock_spin(&sched_lock); + KASSERT((td->td_kse->ke_state == KES_RUNNING), ("msleep: kse stateX?")); td->td_flags |= TDF_INMSLEEP; thread_schedule_upcall(td, td->td_kse); td->td_flags &= ~TDF_INMSLEEP; + KASSERT((td->td_kse->ke_state == KES_RUNNING), ("msleep: kse stateY?")); mtx_unlock_spin(&sched_lock); } } + KASSERT((td->td_kse != NULL), ("msleep: NULL KSE2?")); + KASSERT((td->td_kse->ke_state == KES_RUNNING), + ("msleep: kse state2?")); + KASSERT((td->td_kse->ke_thread == td), + ("msleep: kse/thread mismatch?")); } mtx_lock_spin(&sched_lock); if (cold || panicstr) { @@ -767,7 +781,7 @@ { struct bintime new_switchtime; struct thread *td = curthread; /* XXX */ - register struct proc *p = td->td_proc; /* XXX */ + struct proc *p = td->td_proc; /* XXX */ struct kse *ke = td->td_kse; #if 0 register struct rlimit *rlim; @@ -775,6 +789,7 @@ u_int sched_nest; mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED); + KASSERT((ke->ke_state == KES_RUNNING), ("mi_switch: kse state?")); #ifdef INVARIANTS if (td->td_state != TDS_MTX && td->td_state != TDS_RUNQ && @@ -846,10 +861,12 @@ * At the last moment: if this KSE is not on the run queue, * it needs to be freed correctly and the thread treated accordingly. */ - if (td->td_state == TDS_RUNNING) { + if ((td->td_state == TDS_RUNNING) && + ((ke->ke_flags & KEF_IDLEKSE) == 0)) { /* Put us back on the run queue (kse and all). */ setrunqueue(td); - } else if ((td->td_flags & TDF_UNBOUND) && (td->td_state != TDS_RUNQ)) { + } else if ((td->td_flags & TDF_UNBOUND) && + (td->td_state != TDS_RUNQ)) { /* in case of old code */ /* * We will not be on the run queue. * Someone else can use the KSE if they need it. @@ -859,6 +876,7 @@ } cpu_switch(); td->td_kse->ke_oncpu = PCPU_GET(cpuid); + td->td_kse->ke_state = KES_RUNNING; sched_lock.mtx_recurse = sched_nest; sched_lock.mtx_lock = (uintptr_t)td; CTR3(KTR_PROC, "mi_switch: new thread %p (pid %d, %s)", td, p->p_pid, ==== //depot/projects/kse/sys/kern/kern_thread.c#75 (text+ko) ==== @@ -313,6 +313,8 @@ /* Reassign this thread's KSE. */ if (ke != NULL) { +KASSERT((ke->ke_state != KES_ONRUNQ), ("zapping kse on run queue")); +KASSERT((ke->ke_thread->td_state != TDS_RUNQ), ("zapping thread on run queue")); ke->ke_thread = NULL; td->td_kse = NULL; ke->ke_state = KES_UNQUEUED; @@ -401,7 +403,6 @@ thread_link(td2, ke->ke_ksegrp); cpu_set_upcall(td2, ke->ke_pcb); td2->td_ucred = crhold(td->td_ucred); - td2->td_kse = NULL; /* Back as it was. */ td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; td2->td_priority = td->td_priority; setrunqueue(td2); ==== //depot/projects/kse/sys/kern/subr_trap.c#70 (text+ko) ==== @@ -341,7 +341,6 @@ if (flags & KEF_NEEDRESCHED) { mtx_lock_spin(&sched_lock); td->td_priority = kg->kg_user_pri; - setrunqueue(td); p->p_stats->p_ru.ru_nivcsw++; mi_switch(); mtx_unlock_spin(&sched_lock); ==== //depot/projects/kse/sys/sys/proc.h#112 (text+ko) ==== @@ -380,6 +380,7 @@ /* flags kept in ke_flags */ #define KEF_ONRUNQ 0x00001 /* This KE is on a run queue */ #define KEF_OWEUPC 0x00002 /* Owe process an addupc() call at next ast. */ +#define KEF_IDLEKSE 0x00004 /* A 'Per CPU idle process'.. has one thread */ #define KEF_ASTPENDING 0x00400 /* KSE has a pending ast. */ #define KEF_NEEDRESCHED 0x00800 /* Process needs to yield. */ ==== //depot/projects/kse/sys/vm/uma_int.h#5 (text+ko) ==== @@ -109,7 +109,7 @@ #define UMA_SLAB_MASK (PAGE_SIZE - 1) /* Mask to get back to the page */ #define UMA_SLAB_SHIFT PAGE_SHIFT /* Number of bits PAGE_MASK */ -#define UMA_BOOT_PAGES 15 /* Number of pages allocated for startup */ +#define UMA_BOOT_PAGES 30 /* Number of pages allocated for startup */ #define UMA_WORKING_TIME 20 /* Seconds worth of items to keep */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 16:24:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1346D37B405; Sat, 22 Jun 2002 16:24:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 550CA37B404 for ; Sat, 22 Jun 2002 16:24:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5MNOp169412 for perforce@freebsd.org; Sat, 22 Jun 2002 16:24:51 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sat, 22 Jun 2002 16:24:51 -0700 (PDT) Message-Id: <200206222324.g5MNOp169412@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13291 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13291 Change 13291 by julian@julian_ref on 2002/06/22 16:24:38 scrap bogus _KERNEL definition Affected files ... ... //depot/projects/kse/sys/sys/kse.h#13 edit Differences ... ==== //depot/projects/kse/sys/sys/kse.h#13 (text+ko) ==== @@ -32,7 +32,6 @@ #ifndef SYS_KSE_H #define SYS_KSE_H -#define _KERNEL #include /* * This file defines the structures needed for communication between To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 18:18:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59D2F37B405; Sat, 22 Jun 2002 18:18:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 07D5A37B400 for ; Sat, 22 Jun 2002 18:18:12 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5N1IBi91562 for perforce@freebsd.org; Sat, 22 Jun 2002 18:18:11 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sat, 22 Jun 2002 18:18:11 -0700 (PDT) Message-Id: <200206230118.g5N1IBi91562@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13295 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13295 Change 13295 by julian@julian_ref on 2002/06/22 18:17:51 don't set runq explicitly.. mi_switch will assume this under KSEs Affected files ... ... //depot/projects/kse/sys/kern/kern_shutdown.c#29 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_shutdown.c#29 (text+ko) ==== @@ -281,7 +281,6 @@ DROP_GIANT(); for (subiter = 0; subiter < 50 * iter; subiter++) { mtx_lock_spin(&sched_lock); - setrunqueue(curthread); curthread->td_proc->p_stats->p_ru.ru_nvcsw++; mi_switch(); /* Allow interrupt threads to run */ mtx_unlock_spin(&sched_lock); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 18:55: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED95737B401; Sat, 22 Jun 2002 18:54:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4E33637B400 for ; Sat, 22 Jun 2002 18:54:57 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5N1svF96517 for perforce@freebsd.org; Sat, 22 Jun 2002 18:54:57 -0700 (PDT) (envelope-from dillon@freebsd.org) Date: Sat, 22 Jun 2002 18:54:57 -0700 (PDT) Message-Id: <200206230154.g5N1svF96517@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to dillon@freebsd.org using -f From: Matt Dillon Subject: PERFORCE change 13298 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13298 Change 13298 by dillon@apollo on 2002/06/22 18:54:12 Reorder scheduler mutex around SUSPEND. Adjust kasserts. Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#76 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#76 (text+ko) ==== @@ -313,10 +313,12 @@ /* Reassign this thread's KSE. */ if (ke != NULL) { -KASSERT((ke->ke_state != KES_ONRUNQ), ("zapping kse on run queue")); -KASSERT((ke->ke_thread->td_state != TDS_RUNQ), ("zapping thread on run queue")); +KASSERT((ke->ke_state == KES_RUNNING), ("zapping kse not running")); +KASSERT((ke->ke_thread == td ), ("kse ke_thread mismatch against curthread")); +KASSERT((ke->ke_thread->td_state == TDS_RUNNING), ("zapping thread not running")); ke->ke_thread = NULL; td->td_kse = NULL; + mtx_assert(&sched_lock, MA_OWNED); ke->ke_state = KES_UNQUEUED; kse_reassign(ke); } @@ -483,10 +485,10 @@ * Wake us up when everyone else has suspended. * (or died) */ + mtx_lock_spin(&sched_lock); TAILQ_INSERT_TAIL(&p->p_suspended, td, td_runq); td->td_state = TDS_SUSPENDED; p->p_suspcount++; - mtx_lock_spin(&sched_lock); mtx_unlock(&Giant); PROC_UNLOCK(p); mi_switch(); @@ -585,10 +587,11 @@ * (lent kse's can not go back to userland?) * and can only be lent in STOPPED state. */ + mtx_assert(&Giant, MA_NOTOWNED); + mtx_lock_spin(&sched_lock); p->p_suspcount++; td->td_state = TDS_SUSPENDED; TAILQ_INSERT_TAIL(&p->p_suspended, td, td_runq); - mtx_lock_spin(&sched_lock); PROC_UNLOCK(p); mi_switch(); mtx_unlock_spin(&sched_lock); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 20: 4:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CAFB37B403; Sat, 22 Jun 2002 20:04:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by hub.freebsd.org (Postfix) with ESMTP id 092AC37B439; Sat, 22 Jun 2002 20:04:43 -0700 (PDT) Received: by elvis.mu.org (Postfix, from userid 1921) id B1A54AE160; Sat, 22 Jun 2002 20:04:39 -0700 (PDT) Date: Sat, 22 Jun 2002 20:04:39 -0700 From: Jon Mini To: Matt Dillon Cc: Perforce Change Reviews Subject: Re: PERFORCE change 13298 for review Message-ID: <20020623030439.GC9840@elvis.mu.org> References: <200206230154.g5N1svF96517@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200206230154.g5N1svF96517@freefall.freebsd.org> User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, Jun 22, 2002 at 06:54:57PM -0700, Matt Dillon wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13298 > > Change 13298 by dillon@apollo on 2002/06/22 18:54:12 > > Reorder scheduler mutex around SUSPEND. Adjust kasserts. > h0h0h0! =) Are you working on KSE now, or was this just a one-time stab? -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 20:11:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EF9537B405; Sat, 22 Jun 2002 20:10:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7729D37B40C for ; Sat, 22 Jun 2002 20:10:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5N3ATv16154 for perforce@freebsd.org; Sat, 22 Jun 2002 20:10:29 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sat, 22 Jun 2002 20:10:29 -0700 (PDT) Message-Id: <200206230310.g5N3ATv16154@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13300 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13300 Change 13300 by julian@julian_ref on 2002/06/22 20:10:22 Upcalls need to unset the UNBOUND bit when scheduled. Affected files ... ... //depot/projects/kse/sys/kern/kern_switch.c#54 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_switch.c#54 (text+ko) ==== @@ -132,6 +132,16 @@ TAILQ_REMOVE(&kg->kg_runq, td, td_runq); if (kg->kg_last_assigned == td) kg->kg_last_assigned = NULL; + /* + * If we have started running an upcall, + * Then TDF_UNBOUND WAS set because the thread was + * created without a KSE. Now that we have one, + * and it is our time to run, we make sure + * that BOUND semantics apply for the rest of + * the journey to userland, and into the UTS. + */ + if (td->td_flags & TDF_UPCALLING) + tdf->td_flags &= ~TDF_UNBOUND; } kg->kg_runnable--; CTR2(KTR_RUNQ, "choosethread: td=%p pri=%d", To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 20:16:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8FD337B405; Sat, 22 Jun 2002 20:16:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 34AD837B404 for ; Sat, 22 Jun 2002 20:16:37 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5N3Gbf17341 for perforce@freebsd.org; Sat, 22 Jun 2002 20:16:37 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sat, 22 Jun 2002 20:16:37 -0700 (PDT) Message-Id: <200206230316.g5N3Gbf17341@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13301 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13301 Change 13301 by julian@julian_ref on 2002/06/22 20:15:41 fix a sched-lock test and remove debugging Matt accidentally included. Affected files ... ... //depot/projects/kse/sys/kern/kern_synch.c#69 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_synch.c#69 (text+ko) ==== @@ -421,7 +421,6 @@ * flag the mutex is not entered before returning. */ -struct thread *TD1; int msleep(ident, mtx, priority, wmesg, timo) @@ -458,7 +457,6 @@ and not the exiting thread. */ if ((p->p_flag & P_WEXIT) && catch && p->p_singlethread != td) return (EINTR); - TD1 = NULL; if (td->td_mailbox && (!(td->td_flags & TDF_INMSLEEP))) { /* * If we have no queued work to do, then @@ -466,17 +464,16 @@ * We don't need to upcall now, just make it and * queue it. */ + mtx_lock_spin(&sched_lock); if (TAILQ_FIRST(&td->td_ksegrp->kg_runq) == NULL) { - TD1 = td; /* Don't recurse here! */ - mtx_lock_spin(&sched_lock); KASSERT((td->td_kse->ke_state == KES_RUNNING), ("msleep: kse stateX?")); td->td_flags |= TDF_INMSLEEP; thread_schedule_upcall(td, td->td_kse); td->td_flags &= ~TDF_INMSLEEP; KASSERT((td->td_kse->ke_state == KES_RUNNING), ("msleep: kse stateY?")); - mtx_unlock_spin(&sched_lock); } + mtx_unlock_spin(&sched_lock); } KASSERT((td->td_kse != NULL), ("msleep: NULL KSE2?")); KASSERT((td->td_kse->ke_state == KES_RUNNING), To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 21:15: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D467037B406; Sat, 22 Jun 2002 21:14:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0C0D637B405 for ; Sat, 22 Jun 2002 21:14:49 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5N4Emd28970 for perforce@freebsd.org; Sat, 22 Jun 2002 21:14:48 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sat, 22 Jun 2002 21:14:48 -0700 (PDT) Message-Id: <200206230414.g5N4Emd28970@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13303 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13303 Change 13303 by julian@julian_ref on 2002/06/22 21:14:02 Add massive debugging aid to TAILQ Affected files ... ... //depot/projects/kse/sys/sys/queue.h#6 edit Differences ... ==== //depot/projects/kse/sys/sys/queue.h#6 (text+ko) ==== @@ -102,7 +102,37 @@ * _REMOVE + + + + * */ +#define QUEUE_MACRO_DEBUG 1 +#ifdef QUEUE_MACRO_DEBUG +struct qm_trace { + char * lastfile; + int lastline; + char * prevfile; + int prevline; +}; + +#define TRACEBUF struct qm_trace trace; +#define QMD_TRACE_HEAD(head) do { \ + (head)->trace.prevline = (head)->trace.lastline; \ + (head)->trace.prevfile = (head)->trace.lastfile; \ + (head)->trace.lastline = __LINE__; \ + (head)->trace.lastfile = __FILE__; \ +} while (0) + +#define QMD_TRACE_ELEM(elem) do { \ + (elem)->trace.prevline = (elem)->trace.lastline; \ + (elem)->trace.prevfile = (elem)->trace.lastfile; \ + (elem)->trace.lastline = __LINE__; \ + (elem)->trace.lastfile = __FILE__; \ +} while (0) + +#else +#define QMD_TRACE_ELEM(elem) +#define QMD_TRACE_HEAD(head) +#define TRACEBUF +#endif /* QUEUE_MACRO_DEBUG */ + /* * Singly-linked List declarations. */ @@ -329,6 +359,7 @@ struct name { \ struct type *tqh_first; /* first element */ \ struct type **tqh_last; /* addr of last next element */ \ + TRACEBUF \ } #define TAILQ_HEAD_INITIALIZER(head) \ @@ -338,6 +369,7 @@ struct { \ struct type *tqe_next; /* next element */ \ struct type **tqe_prev; /* address of previous next element */ \ + TRACEBUF \ } /* @@ -349,6 +381,8 @@ (head2)->tqh_first->field.tqe_prev = (head1)->tqh_last; \ (head1)->tqh_last = (head2)->tqh_last; \ TAILQ_INIT((head2)); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_HEAD(head2); \ } \ } while (0) @@ -369,16 +403,21 @@ #define TAILQ_INIT(head) do { \ TAILQ_FIRST((head)) = NULL; \ (head)->tqh_last = &TAILQ_FIRST((head)); \ + QMD_TRACE_HEAD(head); \ } while (0) #define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \ if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\ TAILQ_NEXT((elm), field)->field.tqe_prev = \ &TAILQ_NEXT((elm), field); \ - else \ + else { \ (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_HEAD(head); \ + } \ TAILQ_NEXT((listelm), field) = (elm); \ (elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field); \ + QMD_TRACE_ELEM(&(elm)->field); \ + QMD_TRACE_ELEM(&listelm->field); \ } while (0) #define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ @@ -386,6 +425,8 @@ TAILQ_NEXT((elm), field) = (listelm); \ *(listelm)->field.tqe_prev = (elm); \ (listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_ELEM(&(elm)->field); \ + QMD_TRACE_ELEM(&listelm->field); \ } while (0) #define TAILQ_INSERT_HEAD(head, elm, field) do { \ @@ -396,6 +437,8 @@ (head)->tqh_last = &TAILQ_NEXT((elm), field); \ TAILQ_FIRST((head)) = (elm); \ (elm)->field.tqe_prev = &TAILQ_FIRST((head)); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_ELEM(&(elm)->field); \ } while (0) #define TAILQ_INSERT_TAIL(head, elm, field) do { \ @@ -403,6 +446,8 @@ (elm)->field.tqe_prev = (head)->tqh_last; \ *(head)->tqh_last = (elm); \ (head)->tqh_last = &TAILQ_NEXT((elm), field); \ + QMD_TRACE_HEAD(head); \ + QMD_TRACE_ELEM(&(elm)->field); \ } while (0) #define TAILQ_LAST(head, headname) \ @@ -417,9 +462,13 @@ if ((TAILQ_NEXT((elm), field)) != NULL) \ TAILQ_NEXT((elm), field)->field.tqe_prev = \ (elm)->field.tqe_prev; \ - else \ + else { \ (head)->tqh_last = (elm)->field.tqe_prev; \ + QMD_TRACE_HEAD(head); \ + } \ *(elm)->field.tqe_prev = TAILQ_NEXT((elm), field); \ + (elm)->field.tqe_next = (void *)-1; \ + QMD_TRACE_ELEM(&(elm)->field); \ } while (0) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 21:20: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35F9837B403; Sat, 22 Jun 2002 21:19:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 76B3537B401 for ; Sat, 22 Jun 2002 21:19:55 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5N4JtI29387 for perforce@freebsd.org; Sat, 22 Jun 2002 21:19:55 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sat, 22 Jun 2002 21:19:55 -0700 (PDT) Message-Id: <200206230419.g5N4JtI29387@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13304 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13304 Change 13304 by julian@julian_ref on 2002/06/22 21:19:09 remove duplicate mtx_assert() Affected files ... ... //depot/projects/kse/sys/kern/kern_thread.c#77 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#77 (text+ko) ==== @@ -318,7 +318,6 @@ KASSERT((ke->ke_thread->td_state == TDS_RUNNING), ("zapping thread not running")); ke->ke_thread = NULL; td->td_kse = NULL; - mtx_assert(&sched_lock, MA_OWNED); ke->ke_state = KES_UNQUEUED; kse_reassign(ke); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 22:10:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B880D37B404; Sat, 22 Jun 2002 22:10:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from apollo.backplane.com (apollo.backplane.com [216.240.41.2]) by hub.freebsd.org (Postfix) with ESMTP id C546E37B400 for ; Sat, 22 Jun 2002 22:10:38 -0700 (PDT) Received: from apollo.backplane.com (localhost [127.0.0.1]) by apollo.backplane.com (8.12.3/8.12.3) with ESMTP id g5N5AcCV037545; Sat, 22 Jun 2002 22:10:38 -0700 (PDT) (envelope-from dillon@apollo.backplane.com) Received: (from dillon@localhost) by apollo.backplane.com (8.12.3/8.12.3/Submit) id g5N5AcwK037544; Sat, 22 Jun 2002 22:10:38 -0700 (PDT) (envelope-from dillon) Date: Sat, 22 Jun 2002 22:10:38 -0700 (PDT) From: Matthew Dillon Message-Id: <200206230510.g5N5AcwK037544@apollo.backplane.com> To: Jon Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 13298 for review References: <200206230154.g5N1svF96517@freefall.freebsd.org> <20020623030439.GC9840@elvis.mu.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG : :On Sat, Jun 22, 2002 at 06:54:57PM -0700, Matt Dillon wrote: :> http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13298 :> :> Change 13298 by dillon@apollo on 2002/06/22 18:54:12 :> :> Reorder scheduler mutex around SUSPEND. Adjust kasserts. :> : :h0h0h0! =) : :Are you working on KSE now, or was this just a one-time stab? : :-- :Jonathan Mini Julian and I are doing a KSEathon at my place, trying to track down some issues. -Matt To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 23:40:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3997737B40F; Sat, 22 Jun 2002 23:40:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from sccrmhc01.attbi.com (sccrmhc01.attbi.com [204.127.202.61]) by hub.freebsd.org (Postfix) with ESMTP id 2099B37B406; Sat, 22 Jun 2002 23:40:14 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc01.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020623064013.KEZW1024.sccrmhc01.attbi.com@InterJet.elischer.org>; Sun, 23 Jun 2002 06:40:13 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id XAA44985; Sat, 22 Jun 2002 23:39:56 -0700 (PDT) Date: Sat, 22 Jun 2002 23:39:56 -0700 (PDT) From: Julian Elischer To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 13300 for review In-Reply-To: <200206230310.g5N3ATv16154@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG umm actually it WILL need to do this.. it's premature.. and without more changes I'm writing now will kill the system.. I'll back this out until I'm ready for it.. On Sat, 22 Jun 2002, Julian Elischer wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13300 > > Change 13300 by julian@julian_ref on 2002/06/22 20:10:22 > > Upcalls need to unset the UNBOUND bit when scheduled. > > Affected files ... > > ... //depot/projects/kse/sys/kern/kern_switch.c#54 edit > > Differences ... > > ==== //depot/projects/kse/sys/kern/kern_switch.c#54 (text+ko) ==== > > @@ -132,6 +132,16 @@ > TAILQ_REMOVE(&kg->kg_runq, td, td_runq); > if (kg->kg_last_assigned == td) > kg->kg_last_assigned = NULL; > + /* > + * If we have started running an upcall, > + * Then TDF_UNBOUND WAS set because the thread was > + * created without a KSE. Now that we have one, > + * and it is our time to run, we make sure > + * that BOUND semantics apply for the rest of > + * the journey to userland, and into the UTS. > + */ > + if (td->td_flags & TDF_UPCALLING) > + tdf->td_flags &= ~TDF_UNBOUND; > } > kg->kg_runnable--; > CTR2(KTR_RUNQ, "choosethread: td=%p pri=%d", > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 23:40:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2632937B403; Sat, 22 Jun 2002 23:40:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from sccrmhc01.attbi.com (sccrmhc01.attbi.com [204.127.202.61]) by hub.freebsd.org (Postfix) with ESMTP id 71AE037B404; Sat, 22 Jun 2002 23:40:29 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc01.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020623064028.KFBI1024.sccrmhc01.attbi.com@InterJet.elischer.org>; Sun, 23 Jun 2002 06:40:28 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id XAA44979; Sat, 22 Jun 2002 23:38:54 -0700 (PDT) Date: Sat, 22 Jun 2002 23:38:51 -0700 (PDT) From: Julian Elischer To: Jon Mini Cc: Matt Dillon , Perforce Change Reviews Subject: Re: PERFORCE change 13298 for review In-Reply-To: <20020623030439.GC9840@elvis.mu.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG We were at Matt's place working on a brain-stretching problem I'm seeing... As we went on with these small things the problem got harder and harder to see, but as of an hour ago we hadn't a definative smoking gun.... the good news is that the KSE kernel seems to work on an SMP machine as well (which I have not been able to test since January) On Sat, 22 Jun 2002, Jon Mini wrote: > On Sat, Jun 22, 2002 at 06:54:57PM -0700, Matt Dillon wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13298 > > > > Change 13298 by dillon@apollo on 2002/06/22 18:54:12 > > > > Reorder scheduler mutex around SUSPEND. Adjust kasserts. > > > > h0h0h0! =) > > Are you working on KSE now, or was this just a one-time stab? > > -- > Jonathan Mini > http://www.freebsd.org/ > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 23:52: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31BB737B401; Sat, 22 Jun 2002 23:52:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7579B37B400 for ; Sat, 22 Jun 2002 23:52:01 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5N6q1r60544 for perforce@freebsd.org; Sat, 22 Jun 2002 23:52:01 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sat, 22 Jun 2002 23:52:01 -0700 (PDT) Message-Id: <200206230652.g5N6q1r60544@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13307 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13307 Change 13307 by julian@julian_jules1 on 2002/06/22 23:51:26 back out a premature change and alow us to diffarentiate between two panic messages. Affected files ... ... //depot/projects/kse/sys/kern/kern_switch.c#55 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_switch.c#55 (text+ko) ==== @@ -140,8 +140,10 @@ * that BOUND semantics apply for the rest of * the journey to userland, and into the UTS. */ +#ifdef NOTYET if (td->td_flags & TDF_UPCALLING) tdf->td_flags &= ~TDF_UNBOUND; +#endif } kg->kg_runnable--; CTR2(KTR_RUNQ, "choosethread: td=%p pri=%d", @@ -198,7 +200,7 @@ TAILQ_INSERT_HEAD(&kg->kg_iq, ke, ke_kgrlist); kg->kg_idle_kses++; CTR1(KTR_RUNQ, "kse_reassign: ke%p idled", ke); -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self2!")); } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 22 23:54:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8722237B401; Sat, 22 Jun 2002 23:54:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 718D937B400 for ; Sat, 22 Jun 2002 23:54:04 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5N6s4I60725 for perforce@freebsd.org; Sat, 22 Jun 2002 23:54:04 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sat, 22 Jun 2002 23:54:04 -0700 (PDT) Message-Id: <200206230654.g5N6s4I60725@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13308 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13308 Change 13308 by julian@julian_ref on 2002/06/22 23:53:31 add a bit of documentation. Affected files ... ... //depot/projects/kse/sys/kern/kern_synch.c#70 edit ... //depot/projects/kse/sys/sys/proc.h#113 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_synch.c#70 (text+ko) ==== ==== //depot/projects/kse/sys/sys/proc.h#113 (text+ko) ==== @@ -326,6 +326,16 @@ #define TDF_DEADLKTREAT 0x800000 /* Lock aquisition - deadlock treatment. */ /* + * Traps for young players: + * The main thread flag that controls whether a thread acts as a threaded + * or unthreaded thread is the TDF_UNBOUND flag. + * UPCALLS run with the UNBOUND flags clear, after they are first scheduled. + * i.e. they bind themselves to whatever thread thay are first scheduled with. + * You may see BOUND threads in KSE processes but you should never see + * UNBOUND threads in non KSE processes. + */ + +/* * The schedulable entity that can be given a context to run. * A process may have several of these. Probably one per processor * but posibly a few more. In this universe they are grouped To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 23 0:39:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C550837B403; Sun, 23 Jun 2002 00:39:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by hub.freebsd.org (Postfix) with ESMTP id 04A1C37B401; Sun, 23 Jun 2002 00:39:10 -0700 (PDT) Received: by elvis.mu.org (Postfix, from userid 1921) id D3724AE162; Sun, 23 Jun 2002 00:39:09 -0700 (PDT) Date: Sun, 23 Jun 2002 00:39:09 -0700 From: Jon Mini To: Julian Elischer Cc: Matt Dillon , Perforce Change Reviews Subject: Re: PERFORCE change 13298 for review Message-ID: <20020623073909.GD9840@elvis.mu.org> References: <20020623030439.GC9840@elvis.mu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, Jun 22, 2002 at 11:38:51PM -0700, Julian Elischer wrote: > On Sat, 22 Jun 2002, Jon Mini wrote: > > On Sat, Jun 22, 2002 at 06:54:57PM -0700, Matt Dillon wrote: > > > Change 13298 by dillon@apollo on 2002/06/22 18:54:12 > > > > > > Reorder scheduler mutex around SUSPEND. Adjust kasserts. > > > > Are you working on KSE now, or was this just a one-time stab? > > We were at Matt's place working on a brain-stretching problem I'm > seeing... As we went on with these small things the > problem got harder and harder to see, but as of an hour ago we hadn't a > definative smoking gun.... That's good news. An extra pair of eyes is a good thing to see here. Forward progress is also nice to see on this as well. For various reasons, we've both been held back and it's been a bit frustrating (as I'm sure you'll agree). > the good news is that the KSE kernel seems to work on an SMP machine > as well (which I have not been able to test since January) That is good news. Please let me know what happens. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 23 0:51:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F11F37B405; Sun, 23 Jun 2002 00:51:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 43EA737B414 for ; Sun, 23 Jun 2002 00:51:14 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5N7pEV73087 for perforce@freebsd.org; Sun, 23 Jun 2002 00:51:14 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sun, 23 Jun 2002 00:51:14 -0700 (PDT) Message-Id: <200206230751.g5N7pEV73087@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13311 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13311 Change 13311 by julian@julian_jules1 on 2002/06/23 00:50:37 Bunch of possible fixes and stuff from Matt and myself. Affected files ... ... //depot/projects/kse/sys/kern/kern_switch.c#56 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_switch.c#56 (text+ko) ==== @@ -131,7 +131,11 @@ if (td->td_flags & TDF_UNBOUND) { TAILQ_REMOVE(&kg->kg_runq, td, td_runq); if (kg->kg_last_assigned == td) - kg->kg_last_assigned = NULL; + if (TAILQ_PREV(td, threadlist_head, td_runq) + != NULL) + printf("Yo MAMA!\n"); + kg->kg_last_assigned = TAILQ_PREV(td, + threadlist_head, td_runq); /* * If we have started running an upcall, * Then TDF_UNBOUND WAS set because the thread was @@ -255,11 +259,8 @@ struct kse *ke; mtx_assert(&sched_lock, MA_OWNED); - if (td->td_state != TDS_RUNQ) { - panic("remrunqueue: Bad state on run queue"); - /* NOTREACHED */ - return; - } + KASSERT (td->td_state != TDS_RUNQ), + ("remrunqueue: Bad state on run queue")); kg = td->td_ksegrp; ke = td->td_kse; /* @@ -270,7 +271,7 @@ td->td_state = TDS_UNQUEUED; kg->kg_runnable--; if ((td->td_flags & TDF_UNBOUND) == 0) { - /* Bring its kse with it. */ + /* Bring its kse with it, leave the thread attached */ runq_remove(&runq, ke); ke->ke_state = KES_UNQUEUED; return; @@ -282,8 +283,10 @@ * KSE to the next available thread. Then, we should * see if we need to move the KSE in the run queues. */ + td->td_kse = NULL; td2 = kg->kg_last_assigned; if ((td3 = TAILQ_NEXT(td2, td_runq))) { + KASSERT(td3 != td, ("td3 somehow matched td")); /* * Give the next unassigned thread to the KSE * so the number of runnable KSEs remains @@ -302,14 +305,9 @@ */ if (td == td2) { kg->kg_last_assigned = - TAILQ_PREV(td, - threadlist_head, td_runq); + TAILQ_PREV(td, threadlist_head, td_runq); } runq_remove(&runq, ke); - if (td == td2) { - kg->kg_last_assigned = TAILQ_PREV(td, - threadlist_head, td_runq); - } KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); KASSERT((ke->ke_state != KES_IDLE), ("kse already idle")); @@ -351,25 +349,27 @@ } /* * Ok, so we are threading with this thread. - * quickly disassociate the KSE if we have one.. + * We don't have a KSE, see if we can get one.. */ if ((ke = td->td_kse) == NULL) { /* - * see if we will need a KSE and if there is one.. + * We will need a KSE, see if there is one.. * First look for a free one, before getting desperate. + * If we can't get one, our priority is not high enough.. + * that's ok.. */ if (kg->kg_idle_kses) { /* * There is a free one so it's ours for the asking.. */ ke = TAILQ_FIRST(&kg->kg_iq); -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self3!")); TAILQ_REMOVE(&kg->kg_iq, ke, ke_kgrlist); ke->ke_state = KES_UNQUEUED; kg->kg_idle_kses--; ke->ke_thread = td; td->td_kse = ke; -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self4!")); } else if ((kg->kg_last_assigned) && (kg->kg_last_assigned->td_priority > td->td_priority)) { /* @@ -383,8 +383,11 @@ ke->ke_thread = td; td2->td_kse = NULL; td->td_kse = ke; -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); +KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self5!")); } + } else { + KASSERT(ke->ke_thread == td, ("KSE/thread mismatch")); + KASSERT(ke->ke_state != KES_IDLE, ("KSE unexpectedly idle")); } /* @@ -407,8 +410,6 @@ * If needed, readjust the last_assigned pointer. */ if (ke) { - ke->ke_thread = td; - td->td_kse = ke; if (kg->kg_last_assigned == TAILQ_PREV(td, threadlist_head, td_runq)) { kg->kg_last_assigned = td; @@ -747,11 +748,7 @@ struct rqhead *rqh; int pri; - if (ke->ke_state != KES_ONRUNQ) { - printf("request to removed unqueued item from runq: "); - printf("state was %d", ke->ke_state); - return; - } + KASSERT((ke->ke_state == KES_ONRUNQ), ("KSE not on run queue")); mtx_assert(&sched_lock, MA_OWNED); pri = ke->ke_rqindex; rqh = &rq->rq_queues[pri]; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 23 0:53:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6963137B404; Sun, 23 Jun 2002 00:53:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2596237B400 for ; Sun, 23 Jun 2002 00:53:17 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5N7rGN73267 for perforce@freebsd.org; Sun, 23 Jun 2002 00:53:16 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sun, 23 Jun 2002 00:53:16 -0700 (PDT) Message-Id: <200206230753.g5N7rGN73267@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13312 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13312 Change 13312 by julian@julian_ref on 2002/06/23 00:52:52 Typo Affected files ... ... //depot/projects/kse/sys/kern/kern_switch.c#57 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_switch.c#57 (text+ko) ==== @@ -259,7 +259,7 @@ struct kse *ke; mtx_assert(&sched_lock, MA_OWNED); - KASSERT (td->td_state != TDS_RUNQ), + KASSERT ((td->td_state != TDS_RUNQ), ("remrunqueue: Bad state on run queue")); kg = td->td_ksegrp; ke = td->td_kse; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 23 1:23: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DC3137B401; Sun, 23 Jun 2002 01:22:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2B43137B403 for ; Sun, 23 Jun 2002 01:22:53 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5N8MqU80663 for perforce@freebsd.org; Sun, 23 Jun 2002 01:22:52 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sun, 23 Jun 2002 01:22:52 -0700 (PDT) Message-Id: <200206230822.g5N8MqU80663@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13313 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13313 Change 13313 by julian@julian_ref on 2002/06/23 01:22:33 Hopefully all teh data changes needed to implement the KSE-loan scheme discussed with Matt. Affected files ... ... //depot/projects/kse/sys/sys/proc.h#114 edit Differences ... ==== //depot/projects/kse/sys/sys/proc.h#114 (text+ko) ==== @@ -351,7 +351,8 @@ #define ke_startzero ke_flags int ke_flags; /* (j) KEF_* flags. */ - struct thread *ke_thread; /* Associated thread, if running. */ + struct thread *ke_thread; /* Active associated thread. */ + struct thread *ke_bound; /* Thread bound to this KSE (*) */ /*u_int ke_estcpu; */ /* (j) Time averaged val of cpticks. */ int ke_cpticks; /* (j) Ticks of cpu time. */ fixpt_t ke_pctcpu; /* (j) %cpu during p_swtime. */ @@ -388,13 +389,23 @@ /* switch for our extension PCB x86 */ }; /* flags kept in ke_flags */ -#define KEF_ONRUNQ 0x00001 /* This KE is on a run queue */ #define KEF_OWEUPC 0x00002 /* Owe process an addupc() call at next ast. */ #define KEF_IDLEKSE 0x00004 /* A 'Per CPU idle process'.. has one thread */ +#define KEF_LOANED 0x00004 /* On loan from the bound thread to another */ #define KEF_ASTPENDING 0x00400 /* KSE has a pending ast. */ #define KEF_NEEDRESCHED 0x00800 /* Process needs to yield. */ /* + * (*) A bound KSE with a bound thread in a KSE process may be lent to + * Other threads, as long as those threads do not leave the kernel. + * The other threads must be either exiting, or be unbound with a valid + * mailbox so that they can save their state there rather than going + * to user space. While this happens the real bound thread is still linked + * to the kse via the ke_bound field, and the KSE has its "KEF_LOANED + * flag set. + */ + +/* * Kernel-scheduled entity group (KSEG). The scheduler considers each KSEG to * be an indivisible unit from a time-sharing perspective, though each KSEG may * contain multiple KSEs. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 23 12:23:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8174137B403; Sun, 23 Jun 2002 12:23:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from apollo.backplane.com (apollo.backplane.com [216.240.41.2]) by hub.freebsd.org (Postfix) with ESMTP id 7B81C37B401 for ; Sun, 23 Jun 2002 12:23:30 -0700 (PDT) Received: from apollo.backplane.com (localhost [127.0.0.1]) by apollo.backplane.com (8.12.3/8.12.3) with ESMTP id g5NJNSCV022750; Sun, 23 Jun 2002 12:23:28 -0700 (PDT) (envelope-from dillon@apollo.backplane.com) Received: (from dillon@localhost) by apollo.backplane.com (8.12.3/8.12.3/Submit) id g5NJNSRe022749; Sun, 23 Jun 2002 12:23:28 -0700 (PDT) (envelope-from dillon) Date: Sun, 23 Jun 2002 12:23:28 -0700 (PDT) From: Matthew Dillon Message-Id: <200206231923.g5NJNSRe022749@apollo.backplane.com> To: Jon Mini Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 13298 for review References: <20020623030439.GC9840@elvis.mu.org> <20020623073909.GD9840@elvis.mu.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG :That's good news. An extra pair of eyes is a good thing to see here. :Forward progress is also nice to see on this as well. For various :reasons, we've both been held back and it's been a bit frustrating :(as I'm sure you'll agree). : :> the good news is that the KSE kernel seems to work on an SMP machine :> as well (which I have not been able to test since January) : :That is good news. Please let me know what happens. : :-- :Jonathan Mini Well, all the electrodes are hooked up. Now we are just waiting for the next good lightning storm. -Matt To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 23 16:28:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEDC737B400; Sun, 23 Jun 2002 16:28:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 20A5037B403 for ; Sun, 23 Jun 2002 16:28:05 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5NNS4D50800 for perforce@freebsd.org; Sun, 23 Jun 2002 16:28:04 -0700 (PDT) (envelope-from dillon@freebsd.org) Date: Sun, 23 Jun 2002 16:28:04 -0700 (PDT) Message-Id: <200206232328.g5NNS4D50800@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to dillon@freebsd.org using -f From: Matt Dillon Subject: PERFORCE change 13343 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13343 Change 13343 by dillon@apollo on 2002/06/23 16:27:40 NULL-out ke_thread where appropriate when a KSE is going into the IDLE queue. Fix an inverted assertion in remrunqueue(). Fix a restart label in wakeup() that was breaking Julian's sys/queue.h debugging code. Change Julian's OIKS Debugger() entry: Add a sysctl to allow us to control whether it just printf()'s, or whether it drops into the debugger. Cross fingers and hope I've done this correctly. Affected files ... ... //depot/projects/kse/sys/kern/kern_switch.c#58 edit ... //depot/projects/kse/sys/kern/kern_synch.c#71 edit ... //depot/projects/kse/sys/kern/kern_thread.c#78 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_switch.c#58 (text+ko) ==== @@ -201,6 +201,7 @@ KASSERT((ke->ke_state != KES_IDLE), ("kse already idle")); KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); ke->ke_state = KES_IDLE; + ke->ke_thread = NULL; TAILQ_INSERT_HEAD(&kg->kg_iq, ke, ke_kgrlist); kg->kg_idle_kses++; CTR1(KTR_RUNQ, "kse_reassign: ke%p idled", ke); @@ -259,7 +260,7 @@ struct kse *ke; mtx_assert(&sched_lock, MA_OWNED); - KASSERT ((td->td_state != TDS_RUNQ), + KASSERT ((td->td_state == TDS_RUNQ), ("remrunqueue: Bad state on run queue")); kg = td->td_ksegrp; ke = td->td_kse; @@ -312,6 +313,7 @@ KASSERT((ke->ke_state != KES_IDLE), ("kse already idle")); ke->ke_state = KES_IDLE; + ke->ke_thread = NULL; KASSERT((TAILQ_FIRST(&kg->kg_iq) != ke), ("really bad screwup")); TAILQ_INSERT_HEAD(&kg->kg_iq, ke, ke_kgrlist); kg->kg_idle_kses++; ==== //depot/projects/kse/sys/kern/kern_synch.c#71 (text+ko) ==== @@ -421,7 +421,6 @@ * flag the mutex is not entered before returning. */ - int msleep(ident, mtx, priority, wmesg, timo) void *ident; @@ -719,8 +718,8 @@ wakeup((caddr_t)&proc0); } /* END INLINE EXPANSION */ - goto restart; } + goto restart; } } mtx_unlock_spin(&sched_lock); ==== //depot/projects/kse/sys/kern/kern_thread.c#78 (text+ko) ==== @@ -70,6 +70,10 @@ SYSCTL_INT(_kern_threads, OID_AUTO, allocated, CTLFLAG_RD, &allocated_threads, 0, "Number of threads in zone."); +static int oiks_debug = 1; /* 0 disable, 1 printf, 2 enter debugger */ +SYSCTL_INT(_kern_threads, OID_AUTO, oiks, CTLFLAG_RW, + &oiks_debug, 0, "OIKS thread debug"); + #define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) tdlist_head_t zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads); @@ -375,7 +379,11 @@ TAILQ_INSERT_HEAD(&kg->kg_threads, td, td_kglist); p->p_numthreads++; kg->kg_numthreads++; -if (p->p_numthreads > 4) Debugger("OIKS"); + if (oiks_debug && p->p_numthreads > 4) { + printf("OIKS %d\n", p->p_numthreads); + if (oiks_debug > 1) + Debugger("OIKS"); + } td->td_critnest = 0; td->td_kse = NULL; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 23 19: 3:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13F2937B401; Sun, 23 Jun 2002 19:03:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 61C2537B400 for ; Sun, 23 Jun 2002 19:03:16 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5O23GH73964 for perforce@freebsd.org; Sun, 23 Jun 2002 19:03:16 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sun, 23 Jun 2002 19:03:16 -0700 (PDT) Message-Id: <200206240203.g5O23GH73964@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 13347 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13347 Change 13347 by mini@freefall on 2002/06/23 19:02:16 Diff reduction against -CURRENT. Remove unused #if 0'd code. Affected files ... ... //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#25 edit ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#58 edit Differences ... ==== //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#25 (text+ko) ==== @@ -338,25 +338,6 @@ #endif } -#if 0 -/* - * Set the return value for returning upcalls. - * We should be able to do this ahead of time in cpu_save_upcall(). - * doing it once there instead of N times in the upcall path - */ - -void -cpu_set_retval(struct thread *td, int retval, int aux, int success) -{ - struct trapframe *frame; - - frame = td->td_frame; - frame->tf_regs[FRAME_V0] = (u_int64_t)retval; - frame->tf_regs[FRAME_A3] = (success) ? 0 : ~0; - frame->tf_regs[FRAME_A4] = (u_int64_t)aux; -} -#endif - void cpu_set_args(struct thread *td, struct kse *ke) { ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#58 (text+ko) ==== @@ -395,28 +395,6 @@ pcb2->pcb_ext = NULL; } -#if 0 -/* - * Set the return value for returning upcalls. - * We should be able to do this ahead of time in cpu_save_upcall(). - * doing it once there instead of N times in the upcall path - */ - -void -cpu_set_retval(struct thread *td, int retval, int aux, int success) -{ - struct trapframe *frame; - - frame = td->td_frame; - frame->tf_eax = retval; /* Child returns zero */ - frame->tf_edx = aux; /* for 64 bit or multiple values */ - if (success) - frame->tf_eflags &= ~PSL_C; /* success */ - else - frame->tf_eflags |= PSL_C; /* error */ -} -#endif - void cpu_set_args(struct thread *td, struct kse *ke) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 23 19:20:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16F2E37B400; Sun, 23 Jun 2002 19:20:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39]) by hub.freebsd.org (Postfix) with ESMTP id 1862C37B400; Sun, 23 Jun 2002 19:20:11 -0700 (PDT) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc53.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020624022009.HFHW11659.rwcrmhc53.attbi.com@InterJet.elischer.org>; Mon, 24 Jun 2002 02:20:09 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id TAA49583; Sun, 23 Jun 2002 19:10:52 -0700 (PDT) Date: Sun, 23 Jun 2002 19:10:51 -0700 (PDT) From: Julian Elischer To: Matt Dillon Cc: Perforce Change Reviews Subject: Re: PERFORCE change 13343 for review In-Reply-To: <200206232328.g5NNS4D50800@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Hi MAtt.. Just made it back to the computer after a busy day doing family stuff.. thanks for catching thost things... I couldn't test last night after committing as my test machine at work froze up.. and there lies an interesting story.. when I went in, theo power was apparently off on it.. so when I powered it on again, I went to the serial console, and hit CR. IT was already UP! 'uptime' said it had been up 58 minutes! It looks to me as if it had suspended.. very odd since I don't have acpi in that kernleand I disabled the loading of it. On Sun, 23 Jun 2002, Matt Dillon wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13343 > > Change 13343 by dillon@apollo on 2002/06/23 16:27:40 > > NULL-out ke_thread where appropriate when a KSE is > going into the IDLE queue. > > Fix an inverted assertion in remrunqueue(). > > Fix a restart label in wakeup() that was breaking Julian's > sys/queue.h debugging code. > > Change Julian's OIKS Debugger() entry: Add a sysctl to allow > us to control whether it just printf()'s, or whether it drops > into the debugger. > > Cross fingers and hope I've done this correctly. > > Affected files ... > > ... //depot/projects/kse/sys/kern/kern_switch.c#58 edit > ... //depot/projects/kse/sys/kern/kern_synch.c#71 edit > ... //depot/projects/kse/sys/kern/kern_thread.c#78 edit > > Differences ... > > ==== //depot/projects/kse/sys/kern/kern_switch.c#58 (text+ko) ==== > > @@ -201,6 +201,7 @@ > KASSERT((ke->ke_state != KES_IDLE), ("kse already idle")); > KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); > ke->ke_state = KES_IDLE; > + ke->ke_thread = NULL; > TAILQ_INSERT_HEAD(&kg->kg_iq, ke, ke_kgrlist); > kg->kg_idle_kses++; > CTR1(KTR_RUNQ, "kse_reassign: ke%p idled", ke); > @@ -259,7 +260,7 @@ > struct kse *ke; > > mtx_assert(&sched_lock, MA_OWNED); > - KASSERT ((td->td_state != TDS_RUNQ), > + KASSERT ((td->td_state == TDS_RUNQ), > ("remrunqueue: Bad state on run queue")); > kg = td->td_ksegrp; > ke = td->td_kse; > @@ -312,6 +313,7 @@ > KASSERT((ke->ke_state != KES_IDLE), > ("kse already idle")); > ke->ke_state = KES_IDLE; > + ke->ke_thread = NULL; > KASSERT((TAILQ_FIRST(&kg->kg_iq) != ke), ("really bad screwup")); > TAILQ_INSERT_HEAD(&kg->kg_iq, ke, ke_kgrlist); > kg->kg_idle_kses++; > > ==== //depot/projects/kse/sys/kern/kern_synch.c#71 (text+ko) ==== > > @@ -421,7 +421,6 @@ > * flag the mutex is not entered before returning. > */ > > - > int > msleep(ident, mtx, priority, wmesg, timo) > void *ident; > @@ -719,8 +718,8 @@ > wakeup((caddr_t)&proc0); > } > /* END INLINE EXPANSION */ > - goto restart; > } > + goto restart; > } > } > mtx_unlock_spin(&sched_lock); > > ==== //depot/projects/kse/sys/kern/kern_thread.c#78 (text+ko) ==== > > @@ -70,6 +70,10 @@ > SYSCTL_INT(_kern_threads, OID_AUTO, allocated, CTLFLAG_RD, > &allocated_threads, 0, "Number of threads in zone."); > > +static int oiks_debug = 1; /* 0 disable, 1 printf, 2 enter debugger */ > +SYSCTL_INT(_kern_threads, OID_AUTO, oiks, CTLFLAG_RW, > + &oiks_debug, 0, "OIKS thread debug"); > + > #define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) > > tdlist_head_t zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads); > @@ -375,7 +379,11 @@ > TAILQ_INSERT_HEAD(&kg->kg_threads, td, td_kglist); > p->p_numthreads++; > kg->kg_numthreads++; > -if (p->p_numthreads > 4) Debugger("OIKS"); > + if (oiks_debug && p->p_numthreads > 4) { > + printf("OIKS %d\n", p->p_numthreads); > + if (oiks_debug > 1) > + Debugger("OIKS"); > + } > td->td_critnest = 0; > td->td_kse = NULL; > } > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 23 21: 4:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CE3937B403; Sun, 23 Jun 2002 21:04:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7138137B401 for ; Sun, 23 Jun 2002 21:04:42 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5O44g894257 for perforce@freebsd.org; Sun, 23 Jun 2002 21:04:42 -0700 (PDT) (envelope-from mini@freebsd.org) Date: Sun, 23 Jun 2002 21:04:42 -0700 (PDT) Message-Id: <200206240404.g5O44g894257@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 13349 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13349 Change 13349 by mini@freefall on 2002/06/23 21:04:17 More diff reduction. Remove the reamining references to cred_free_thread(). Affected files ... ... //depot/projects/kse/sys/ia64/ia64/trap.c#21 edit ... //depot/projects/kse/sys/kern/kern_prot.c#28 edit ... //depot/projects/kse/sys/sys/ucred.h#11 edit Differences ... ==== //depot/projects/kse/sys/ia64/ia64/trap.c#21 (text+ko) ==== @@ -1065,10 +1065,6 @@ */ STOPEVENT(p, S_SCX, code); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif - #ifdef WITNESS if (witness_list(td)) { panic("system call %s returning with mutex(s) held\n", ==== //depot/projects/kse/sys/kern/kern_prot.c#28 (text+ko) ==== @@ -1767,19 +1767,6 @@ return (newcr); } -#ifdef DIAGNOSTIC -void -cred_free_thread(struct thread *td) -{ - struct ucred *cred; - - cred = td->td_ucred; - td->td_ucred = NULL; - if (cred != NULL) - crfree(cred); -} -#endif - /* * Fill in a struct xucred based on a struct ucred. */ ==== //depot/projects/kse/sys/sys/ucred.h#11 (text+ko) ==== @@ -80,9 +80,6 @@ #ifdef _KERNEL struct thread; -#ifdef DIAGNOSTIC -void cred_free_thread(struct thread *td); -#endif void cred_update_thread(struct thread *td); void change_egid(struct ucred *newcred, gid_t egid); void change_euid(struct ucred *newcred, struct uidinfo *euip); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 23 23:42:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67DDD37B407; Sun, 23 Jun 2002 23:39:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 82C3037B437 for ; Sun, 23 Jun 2002 23:38:52 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5O6co225547 for perforce@freebsd.org; Sun, 23 Jun 2002 23:38:50 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sun, 23 Jun 2002 23:38:50 -0700 (PDT) Message-Id: <200206240638.g5O6co225547@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13355 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13355 Change 13355 by julian@julian_jules1 on 2002/06/23 23:38:19 MFC Affected files ... ... //depot/projects/kse/bin/ps/ps.c#10 integrate ... //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#5 integrate ... //depot/projects/kse/sys/alpha/alpha/support.s#7 integrate ... //depot/projects/kse/sys/alpha/include/runq.h#2 integrate ... //depot/projects/kse/sys/arm/include/types.h#3 integrate ... //depot/projects/kse/sys/boot/common/ufsread.c#2 integrate ... //depot/projects/kse/sys/boot/efi/libefi/bootinfo.c#4 integrate ... //depot/projects/kse/sys/boot/i386/Makefile#4 integrate ... //depot/projects/kse/sys/boot/i386/boot2/Makefile#4 integrate ... //depot/projects/kse/sys/boot/i386/boot2/boot2.c#11 integrate ... //depot/projects/kse/sys/boot/i386/libi386/Makefile#5 integrate ... //depot/projects/kse/sys/boot/i386/libi386/bootinfo.c#6 integrate ... //depot/projects/kse/sys/boot/i386/loader/Makefile#9 integrate ... //depot/projects/kse/sys/boot/ia64/libski/bootinfo.c#5 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/Makefile#8 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/metadata.c#5 integrate ... //depot/projects/kse/sys/conf/NOTES#8 integrate ... //depot/projects/kse/sys/conf/files#39 integrate ... //depot/projects/kse/sys/ddb/db_run.c#5 integrate ... //depot/projects/kse/sys/dev/hea/eni_receive.c#3 integrate ... //depot/projects/kse/sys/dev/hea/eni_transmit.c#3 integrate ... //depot/projects/kse/sys/dev/hfa/fore_buffer.c#3 integrate ... //depot/projects/kse/sys/dev/hfa/fore_command.c#3 integrate ... //depot/projects/kse/sys/dev/hfa/fore_if.c#2 integrate ... //depot/projects/kse/sys/dev/hfa/fore_init.c#3 integrate ... //depot/projects/kse/sys/dev/hfa/fore_load.c#6 integrate ... //depot/projects/kse/sys/dev/hfa/fore_output.c#4 integrate ... //depot/projects/kse/sys/dev/hfa/fore_receive.c#3 integrate ... //depot/projects/kse/sys/dev/hfa/fore_stats.c#2 integrate ... //depot/projects/kse/sys/dev/hfa/fore_transmit.c#2 integrate ... //depot/projects/kse/sys/dev/hfa/hfa_freebsd.c#4 integrate ... //depot/projects/kse/sys/dev/sio/sio.c#16 integrate ... //depot/projects/kse/sys/dev/wi/if_wavelan_ieee.h#5 integrate ... //depot/projects/kse/sys/dev/wi/if_wireg.h#11 integrate ... //depot/projects/kse/sys/dev/wi/wi_hostap.h#3 integrate ... //depot/projects/kse/sys/gnu/i386/fpemul/load_store.c#2 integrate ... //depot/projects/kse/sys/gnu/i386/fpemul/reg_ld_str.c#2 integrate ... //depot/projects/kse/sys/i386/Makefile#3 integrate ... //depot/projects/kse/sys/i386/conf/Makefile#4 integrate ... //depot/projects/kse/sys/i386/conf/OLDCARD#1 branch ... //depot/projects/kse/sys/i386/i386/in_cksum.c#3 integrate ... //depot/projects/kse/sys/i386/i386/math_emulate.c#6 integrate ... //depot/projects/kse/sys/i386/i386/support.s#8 integrate ... //depot/projects/kse/sys/i386/i386/vm86.c#9 integrate ... //depot/projects/kse/sys/i386/include/in_cksum.h#4 integrate ... //depot/projects/kse/sys/i386/include/runq.h#2 integrate ... //depot/projects/kse/sys/i386/include/specialreg.h#2 integrate ... //depot/projects/kse/sys/i386/include/types.h#4 integrate ... //depot/projects/kse/sys/i386/isa/clock.c#12 integrate ... //depot/projects/kse/sys/ia64/ia32/imgact_ia32.c#3 integrate ... //depot/projects/kse/sys/ia64/ia64/pmap.c#25 integrate ... //depot/projects/kse/sys/ia64/ia64/support.s#10 integrate ... //depot/projects/kse/sys/ia64/ia64/trap.c#22 integrate ... //depot/projects/kse/sys/ia64/include/runq.h#2 integrate ... //depot/projects/kse/sys/kern/kern_exec.c#29 integrate ... //depot/projects/kse/sys/kern/kern_proc.c#73 integrate ... //depot/projects/kse/sys/kern/kern_subr.c#13 integrate ... //depot/projects/kse/sys/kern/kern_switch.c#59 integrate ... //depot/projects/kse/sys/kern/kern_synch.c#72 integrate ... //depot/projects/kse/sys/kern/subr_disklabel.c#9 integrate ... //depot/projects/kse/sys/kern/subr_diskslice.c#10 integrate ... //depot/projects/kse/sys/kern/sys_generic.c#28 integrate ... //depot/projects/kse/sys/kern/tty.c#27 integrate ... //depot/projects/kse/sys/kern/uipc_socket.c#18 integrate ... //depot/projects/kse/sys/kern/uipc_syscalls.c#17 integrate ... //depot/projects/kse/sys/kern/vfs_bio.c#19 integrate ... //depot/projects/kse/sys/kern/vfs_cluster.c#8 integrate ... //depot/projects/kse/sys/kern/vfs_init.c#6 integrate ... //depot/projects/kse/sys/kern/vfs_subr.c#34 integrate ... //depot/projects/kse/sys/kern/vfs_syscalls.c#28 integrate ... //depot/projects/kse/sys/kern/vfs_vnops.c#26 integrate ... //depot/projects/kse/sys/net/bpf.h#4 integrate ... //depot/projects/kse/sys/net/bridge.c#10 integrate ... //depot/projects/kse/sys/net/if_ethersubr.c#14 integrate ... //depot/projects/kse/sys/net/if_ieee80211.h#4 integrate ... //depot/projects/kse/sys/netatm/atm_if.h#6 integrate ... //depot/projects/kse/sys/netgraph/ng_pppoe.c#8 integrate ... //depot/projects/kse/sys/netinet/ip_divert.c#15 integrate ... //depot/projects/kse/sys/netinet/ip_dummynet.c#7 integrate ... //depot/projects/kse/sys/netinet/ip_dummynet.h#6 integrate ... //depot/projects/kse/sys/netinet/ip_fw.c#16 integrate ... //depot/projects/kse/sys/netinet/ip_fw.h#8 integrate ... //depot/projects/kse/sys/netinet/ip_input.c#22 integrate ... //depot/projects/kse/sys/netinet/ip_output.c#23 integrate ... //depot/projects/kse/sys/netinet/ip_var.h#5 integrate ... //depot/projects/kse/sys/netinet/tcp_input.c#22 integrate ... //depot/projects/kse/sys/netinet/tcp_output.c#9 integrate ... //depot/projects/kse/sys/netinet/tcp_subr.c#16 integrate ... //depot/projects/kse/sys/netinet/udp_usrreq.c#17 integrate ... //depot/projects/kse/sys/pccard/i82365.h#5 integrate ... //depot/projects/kse/sys/pccard/pccard.c#10 integrate ... //depot/projects/kse/sys/pccard/pcic.c#14 integrate ... //depot/projects/kse/sys/pccard/pcic_pci.c#25 integrate ... //depot/projects/kse/sys/pccard/pcic_pci.h#7 integrate ... //depot/projects/kse/sys/pccard/plxcard.c#2 delete ... //depot/projects/kse/sys/pccard/plxcardreg.h#2 delete ... //depot/projects/kse/sys/powerpc/include/runq.h#2 integrate ... //depot/projects/kse/sys/powerpc/include/types.h#3 integrate ... //depot/projects/kse/sys/powerpc/powerpc/copyinout.c#5 integrate ... //depot/projects/kse/sys/sparc64/include/clock.h#4 integrate ... //depot/projects/kse/sys/sparc64/include/runq.h#2 integrate ... //depot/projects/kse/sys/sparc64/sparc64/critical.c#2 integrate ... //depot/projects/kse/sys/sparc64/sparc64/elf_machdep.c#5 integrate ... //depot/projects/kse/sys/sparc64/sparc64/pmap.c#30 integrate ... //depot/projects/kse/sys/sparc64/sparc64/support.s#12 integrate ... //depot/projects/kse/sys/sys/_sigset.h#2 integrate ... //depot/projects/kse/sys/sys/ktr.h#6 integrate ... //depot/projects/kse/sys/sys/mbuf.h#9 integrate ... //depot/projects/kse/sys/sys/mount.h#12 integrate ... //depot/projects/kse/sys/sys/socket.h#9 integrate ... //depot/projects/kse/sys/sys/stat.h#5 integrate ... //depot/projects/kse/sys/sys/systm.h#26 integrate ... //depot/projects/kse/sys/sys/tree.h#1 branch ... //depot/projects/kse/sys/sys/types.h#16 integrate ... //depot/projects/kse/sys/sys/uio.h#8 integrate ... //depot/projects/kse/sys/sys/vnode.h#25 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_alloc.c#11 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_balloc.c#6 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_extern.h#7 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_inode.c#10 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_snapshot.c#13 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_softdep.c#13 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_softdep_stub.c#5 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_subr.c#4 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_tables.c#3 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_vfsops.c#21 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_vnops.c#6 integrate ... //depot/projects/kse/sys/ufs/ffs/fs.h#8 integrate ... //depot/projects/kse/sys/ufs/ffs/softdep.h#3 integrate ... //depot/projects/kse/sys/ufs/ufs/dinode.h#4 integrate ... //depot/projects/kse/sys/ufs/ufs/inode.h#4 integrate ... //depot/projects/kse/sys/ufs/ufs/quota.h#5 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_acl.c#11 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_bmap.c#4 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_extattr.c#13 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_extern.h#7 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_inode.c#7 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_lookup.c#11 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_quota.c#10 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_readwrite.c#10 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_vnops.c#14 integrate ... //depot/projects/kse/sys/ufs/ufs/ufsmount.h#6 integrate ... //depot/projects/kse/sys/vm/device_pager.c#4 integrate ... //depot/projects/kse/sys/vm/phys_pager.c#4 integrate ... //depot/projects/kse/sys/vm/swap_pager.c#10 integrate ... //depot/projects/kse/sys/vm/vm_glue.c#32 integrate ... //depot/projects/kse/sys/vm/vm_kern.c#9 integrate ... //depot/projects/kse/sys/vm/vm_map.c#22 integrate ... //depot/projects/kse/sys/vm/vm_mmap.c#17 integrate ... //depot/projects/kse/sys/vm/vm_pager.c#7 integrate ... //depot/projects/kse/sys/vm/vm_unix.c#6 integrate ... //depot/projects/kse/sys/vm/vnode_pager.c#14 integrate Differences ... ==== //depot/projects/kse/bin/ps/ps.c#10 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.54 2002/06/06 21:21:25 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.55 2002/06/20 14:55:53 sobomax Exp $"); #ifndef lint static const char copyright[] = @@ -114,6 +114,12 @@ static kvm_t *kd; +#if defined(LAZY_PS) +#define PS_ARGS "aCcefghjLlM:mN:O:o:p:rSTt:U:uvwxZ" +#else +#define PS_ARGS "aCceghjLlM:mN:O:o:p:rSTt:U:uvwxZ" +#endif + int main(int argc, char *argv[]) { @@ -123,11 +129,11 @@ dev_t ttydev; pid_t pid; uid_t *uids; - int all, ch, flag, i, _fmt, lineno, nentries, dropgid; + int all, ch, flag, i, _fmt, lineno, nentries, nocludge, dropgid; int prtheader, wflag, what, xflg, uid, nuids; char *cols; char errbuf[_POSIX2_LINE_MAX]; - const char *nlistf, *memf; + const char *cp, *nlistf, *memf; (void) setlocale(LC_ALL, ""); /* Set the time to what it is right now. */ @@ -143,8 +149,25 @@ else termwidth = ws.ws_col - 1; - if (argc > 1) - argv[1] = kludge_oldps_options(argv[1]); + /* + * Don't apply a kludge if the first argument is an option taking an + * argument + */ + if (argc > 1) { + nocludge = 0; + if (argv[1][0] == '-') { + for (cp = PS_ARGS; *cp != '\0'; cp++) { + if (*cp != ':') + continue; + if (*(cp - 1) == argv[1][1]) { + nocludge = 1; + break; + } + } + } + if (nocludge == 0) + argv[1] = kludge_oldps_options(argv[1]); + } all = _fmt = prtheader = wflag = xflg = 0; pid = -1; @@ -153,12 +176,7 @@ ttydev = NODEV; dropgid = 0; memf = nlistf = _PATH_DEVNULL; - while ((ch = getopt(argc, argv, -#if defined(LAZY_PS) - "aCcefghjLlM:mN:O:o:p:rSTt:U:uvwxZ")) != -1) -#else - "aCceghjLlM:mN:O:o:p:rSTt:U:uvwxZ")) != -1) -#endif + while ((ch = getopt(argc, argv, PS_ARGS)) != -1) switch((char)ch) { case 'a': all = 1; ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#5 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.56 2002/05/19 18:25:40 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.59 2002/06/22 17:07:45 obrien Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils +NOSHARED?=yes PROG= gdb XSRCS= annotate.c ax-general.c ax-gdb.c bcache.c blockframe.c \ breakpoint.c buildsym.c c-exp.y c-lang.c c-typeprint.c \ @@ -40,18 +41,18 @@ CFLAGS+= -I${GDBDIR}/gdb/config DPADD= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libopcodes/libopcodes.a -DPADD+= ${LIBREADLINE} DPADD+= ${LIBGNUREGEX} DPADD+= ${RELTOP}/libiberty/libiberty.a +DPADD+= ${LIBREADLINE} DPADD+= ${LIBTERMCAP} LDADD+= ${RELTOP}/libbfd/libbfd.a LDADD+= ${RELTOP}/libopcodes/libopcodes.a -LDADD+= -lreadline LDADD+= -lgnuregex LDADD+= ${RELTOP}/libiberty/libiberty.a +LDADD+= -lreadline LDADD+= -ltermcap -GDBDIR= ${.CURDIR}/../../../../contrib/gdb.291 +GDBDIR= ${.CURDIR}/../../../../contrib/gdb .PATH: ${GDBDIR}/gdb .PATH: ${SRCDIR}/opcodes ==== //depot/projects/kse/sys/alpha/alpha/support.s#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.10 2002/05/26 16:03:12 dfr Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.12 2002/06/20 07:40:53 peter Exp $ */ /* @@ -150,11 +150,6 @@ RET END(fubyte) - LEAF(suibyte, 2) - ldiq v0, -1 - RET - END(suibyte) - LEAF(fusufault, 0) ldq t0, PC_CURTHREAD(pcpup) ldq t0, TD_PCB(t0) @@ -164,8 +159,8 @@ END(fusufault) LEAF(fswintrberr, 0) -XLEAF(fuswintr, 2) /* XXX what is a 'word'? */ -XLEAF(suswintr, 2) /* XXX what is a 'word'? */ +XLEAF(fuswintr, 2) /* XXX 16 bit short for profiling */ +XLEAF(suswintr, 2) /* XXX 16 bit short for profiling */ LDGP(pv) ldiq v0, -1 RET ==== //depot/projects/kse/sys/alpha/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/runq.h,v 1.1 2002/05/25 01:12:15 jake Exp $ + * $FreeBSD: src/sys/alpha/include/runq.h,v 1.2 2002/06/20 06:21:19 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1UL << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs64(word)) +#define RQB_FFS(word) (ffs64(word) - 1) /* * Type of run queue status word. ==== //depot/projects/kse/sys/arm/include/types.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/types.h,v 1.2 2002/03/20 18:22:19 alfred Exp $ + * $FreeBSD: src/sys/arm/include/types.h,v 1.3 2002/06/23 21:57:17 iedowse Exp $ */ #ifndef _MACHINE_TYPES_H_ @@ -49,7 +49,7 @@ typedef unsigned int vm_offset_t; typedef __int64_t vm_ooffset_t; -typedef unsigned int vm_pindex_t; +typedef __uint64_t vm_pindex_t; typedef unsigned int vm_size_t; typedef __int32_t register_t; ==== //depot/projects/kse/sys/boot/common/ufsread.c#2 (text+ko) ==== @@ -1,4 +1,13 @@ /* + * Copyright (c) 2002 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by Marshall + * Kirk McKusick and Network Associates Laboratories, the Security + * Research Division of Network Associates, Inc. under DARPA/SPAWAR + * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS + * research program + * * Copyright (c) 1998 Robert Nordier * All rights reserved. * @@ -14,34 +23,36 @@ */ /* - * $FreeBSD: src/sys/boot/common/ufsread.c,v 1.3 2002/06/05 12:00:49 phk Exp $ + * $FreeBSD: src/sys/boot/common/ufsread.c,v 1.5 2002/06/21 22:33:56 jake Exp $ */ +#include #include -#include /* * We use 4k `virtual' blocks for filesystem data, whatever the actual * filesystem block size. FFS blocks are always a multiple of 4k. */ #define VBLKSIZE 4096 +#define VBLKSHIFT 12 #define VBLKMASK (VBLKSIZE - 1) #define DBPERVBLK (VBLKSIZE / DEV_BSIZE) -#define IPERVBLK (VBLKSIZE / sizeof(struct dinode)) -#define INDIRPERVBLK (VBLKSIZE / sizeof(ufs_daddr_t)) -#define INO_TO_VBA(fs, x) (fsbtodb(fs, ino_to_fsba(fs, x)) + \ - (ino_to_fsbo(fs, x) / IPERVBLK) * DBPERVBLK) -#define INO_TO_VBO(fs, x) (ino_to_fsbo(fs, x) % IPERVBLK) +#define INDIRPERVBLK(fs) (NINDIR(fs) / ((fs)->fs_bsize / VBLKSIZE)) +#define IPERVBLK(fs) (INOPB(fs) / ((fs)->fs_bsize / VBLKSIZE)) +#define INO_TO_VBA(fs, ipervblk, x) \ + (fsbtodb(fs, cgimin(fs, ino_to_cg(fs, x))) + \ + (((x) % (fs)->fs_ipg) / (ipervblk) * DBPERVBLK)) +#define INO_TO_VBO(ipervblk, x) ((x) % ipervblk) #define FS_TO_VBA(fs, fsb, off) (fsbtodb(fs, fsb) + \ ((off) / VBLKSIZE) * DBPERVBLK) #define FS_TO_VBO(fs, fsb, off) ((off) & VBLKMASK) /* Buffers that must not span a 64k boundary. */ struct dmadat { - char blkbuf[VBLKSIZE]; /* filesystem blocks */ - ufs_daddr_t indbuf[VBLKSIZE / sizeof(ufs_daddr_t)]; /* indir blocks */ - char sbbuf[SBSIZE]; /* superblock */ - char secbuf[DEV_BSIZE]; /* for MBR/disklabel */ + char blkbuf[VBLKSIZE]; /* filesystem blocks */ + char indbuf[VBLKSIZE]; /* indir blocks */ + char sbbuf[SBLOCKSIZE]; /* superblock */ + char secbuf[DEV_BSIZE]; /* for MBR/disklabel */ }; static struct dmadat *dmadat; @@ -61,16 +72,16 @@ fs_off = 0; while ((n = fsread(*ino, buf, DEV_BSIZE)) > 0) - for (s = buf; s < buf + DEV_BSIZE;) { - d = (void *)s; - if (ls) - printf("%s ", d->d_name); - else if (!strcmp(name, d->d_name)) { - *ino = d->d_fileno; - return d->d_type; + for (s = buf; s < buf + DEV_BSIZE;) { + d = (void *)s; + if (ls) + printf("%s ", d->d_name); + else if (!strcmp(name, d->d_name)) { + *ino = d->d_fileno; + return d->d_type; + } + s += d->d_reclen; } - s += d->d_reclen; - } if (n != -1 && ls) printf("\n"); return 0; @@ -95,8 +106,8 @@ if (!*path) break; for (s = path; *s && *s != '/'; s++); - if ((n = s - path) > MAXNAMLEN) - return 0; + if ((n = s - path) > MAXNAMLEN) + return 0; ls = *path == '?' && n == 1 && !*s; memcpy(name, path, n); name[n] = 0; @@ -111,28 +122,134 @@ return dt == DT_REG ? ino : 0; } +#ifndef __sparc64__ +#define UFS1_ONLY +#endif +#ifdef UFS1_ONLY + static ssize_t fsread(ino_t inode, void *buf, size_t nbyte) { - static struct dinode din; + static struct ufs1_dinode dp1; static ino_t inomap; - static daddr_t blkmap, indmap; char *blkbuf; - ufs_daddr_t *indbuf; + caddr_t indbuf; struct fs *fs; char *s; - ufs_daddr_t lbn, addr; - daddr_t vbaddr; - size_t n, nb, off, vboff; + size_t n, nb, size, off, vboff; + long lbn; + ufs1_daddr_t addr, vbaddr; + static ufs1_daddr_t blkmap, indmap; blkbuf = dmadat->blkbuf; indbuf = dmadat->indbuf; fs = (struct fs *)dmadat->sbbuf; if (!dsk_meta) { inomap = 0; - if (dskread(fs, SBOFF / DEV_BSIZE, SBSIZE / DEV_BSIZE)) + if (dskread(fs, SBLOCK_UFS1 / DEV_BSIZE, SBLOCKSIZE / DEV_BSIZE)) + return -1; + if (fs->fs_magic != FS_UFS1_MAGIC) { + printf("Not ufs\n"); + return -1; + } + dsk_meta++; + } + if (!inode) + return 0; + if (inomap != inode) { + n = IPERVBLK(fs); + if (dskread(blkbuf, INO_TO_VBA(fs, n, inode), DBPERVBLK)) return -1; - if (fs->fs_magic != FS_MAGIC) { + dp1 = ((struct ufs1_dinode *)blkbuf)[INO_TO_VBO(n, inode)]; + inomap = inode; + fs_off = 0; + blkmap = indmap = 0; + } + s = buf; + size = dp1.di_size; + n = size - fs_off; + if (nbyte > n) + nbyte = n; + nb = nbyte; + while (nb) { + lbn = lblkno(fs, fs_off); + off = blkoff(fs, fs_off); + if (lbn < NDADDR) { + addr = dp1.di_db[lbn]; + } else { + n = INDIRPERVBLK(fs); + addr = dp1.di_ib[0]; + vbaddr = fsbtodb(fs, addr) + + (lbn - NDADDR) / n * DBPERVBLK; + if (indmap != vbaddr) { + if (dskread(indbuf, vbaddr, DBPERVBLK)) + return -1; + indmap = vbaddr; + } + addr = ((ufs1_daddr_t *)indbuf)[(lbn - NDADDR) % n]; + } + vbaddr = fsbtodb(fs, addr) + (off >> VBLKSHIFT) * DBPERVBLK; + vboff = off & VBLKMASK; + n = sblksize(fs, size, lbn) - (off & ~VBLKMASK); + if (n > VBLKSIZE) + n = VBLKSIZE; + if (blkmap != vbaddr) { + if (dskread(blkbuf, vbaddr, n >> DEV_BSHIFT)) + return -1; + blkmap = vbaddr; + } + n -= vboff; + if (n > nb) + n = nb; + memcpy(s, blkbuf + vboff, n); + s += n; + fs_off += n; + nb -= n; + } + return nbyte; +} + +#else /* UFS1_AND_UFS2 */ + +/* + * Possible superblock locations ordered from most to least likely. + */ +static int sblock_try[] = SBLOCKSEARCH; + +#define DIP(field) fs->fs_magic == FS_UFS1_MAGIC ? dp1.field : dp2.field + +static ssize_t +fsread(ino_t inode, void *buf, size_t nbyte) +{ + static struct ufs1_dinode dp1; + static struct ufs2_dinode dp2; + static ino_t inomap; + char *blkbuf; + caddr_t indbuf; + struct fs *fs; + char *s; + size_t n, nb, size, off, vboff; + ufs_lbn_t lbn; + ufs2_daddr_t addr, vbaddr; + static ufs2_daddr_t blkmap, indmap; + + blkbuf = dmadat->blkbuf; + indbuf = dmadat->indbuf; + fs = (struct fs *)dmadat->sbbuf; + if (!dsk_meta) { + inomap = 0; + for (n = 0; sblock_try[n] != -1; n++) { + if (dskread(fs, sblock_try[n] / DEV_BSIZE, + SBLOCKSIZE / DEV_BSIZE)) + return -1; + if ((fs->fs_magic == FS_UFS1_MAGIC || + (fs->fs_magic == FS_UFS2_MAGIC && + fs->fs_sblockloc == numfrags(fs, sblock_try[n]))) && + fs->fs_bsize <= MAXBSIZE && + fs->fs_bsize >= sizeof(struct fs)) + break; + } + if (sblock_try[n] == -1) { printf("Not ufs\n"); return -1; } @@ -141,35 +258,51 @@ if (!inode) return 0; if (inomap != inode) { - if (dskread(blkbuf, INO_TO_VBA(fs, inode), DBPERVBLK)) + n = IPERVBLK(fs); + if (dskread(blkbuf, INO_TO_VBA(fs, n, inode), DBPERVBLK)) return -1; - din = ((struct dinode *)blkbuf)[INO_TO_VBO(fs, inode)]; + n = INO_TO_VBO(n, inode); + if (fs->fs_magic == FS_UFS1_MAGIC) + dp1 = ((struct ufs1_dinode *)blkbuf)[n]; + else + dp2 = ((struct ufs2_dinode *)blkbuf)[n]; inomap = inode; fs_off = 0; blkmap = indmap = 0; } s = buf; - if (nbyte > (n = din.di_size - fs_off)) + size = DIP(di_size); + n = size - fs_off; + if (nbyte > n) nbyte = n; nb = nbyte; while (nb) { lbn = lblkno(fs, fs_off); off = blkoff(fs, fs_off); - if (lbn < NDADDR) - addr = din.di_db[lbn]; - else { - vbaddr = FS_TO_VBA(fs, din.di_ib[0], sizeof(indbuf[0]) * - ((lbn - NDADDR) % NINDIR(fs))); + if (lbn < NDADDR) { + addr = DIP(di_db[lbn]); + } else if (lbn < NDADDR + NINDIR(fs)) { + n = INDIRPERVBLK(fs); + addr = DIP(di_ib[0]); + vbaddr = fsbtodb(fs, addr) + + (lbn - NDADDR) / n * DBPERVBLK; if (indmap != vbaddr) { if (dskread(indbuf, vbaddr, DBPERVBLK)) return -1; indmap = vbaddr; } - addr = indbuf[(lbn - NDADDR) % INDIRPERVBLK]; + n = (lbn - NDADDR) % n; + if (fs->fs_magic == FS_UFS1_MAGIC) + addr = ((ufs1_daddr_t *)indbuf)[n]; + else + addr = ((ufs2_daddr_t *)indbuf)[n]; + } else { + printf("file too big\n"); + return -1; } - vbaddr = FS_TO_VBA(fs, addr, off); - vboff = FS_TO_VBO(fs, addr, off); - n = dblksize(fs, &din, lbn) - (off & ~VBLKMASK); + vbaddr = fsbtodb(fs, addr) + (off >> VBLKSHIFT) * DBPERVBLK; + vboff = off & VBLKMASK; + n = sblksize(fs, size, lbn) - (off & ~VBLKMASK); if (n > VBLKSIZE) n = VBLKSIZE; if (blkmap != vbaddr) { @@ -187,3 +320,5 @@ } return nbyte; } + +#endif /* UFS1_AND_UFS2 */ ==== //depot/projects/kse/sys/boot/efi/libefi/bootinfo.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.5 2001/11/19 07:09:47 peter Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.6 2002/06/20 06:29:42 peter Exp $ */ #include @@ -55,6 +55,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; ==== //depot/projects/kse/sys/boot/i386/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.16 2002/05/11 21:41:03 peter Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.18 2002/06/21 10:59:57 phk Exp $ SUBDIR= mbr boot0 btx boot2 cdboot kgzldr libi386 loader ==== //depot/projects/kse/sys/boot/i386/boot2/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.29 2002/06/05 12:30:41 phk Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.31 2002/06/21 11:00:00 phk Exp $ PROG= boot2 NOMAN= ==== //depot/projects/kse/sys/boot/i386/boot2/boot2.c#11 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.42 2002/06/05 11:10:38 phk Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.43 2002/06/21 06:18:01 mckusick Exp $ */ #include @@ -73,9 +73,10 @@ #define TYPE_AD 0 #define TYPE_WD 1 -#define TYPE_WFD 2 -#define TYPE_FD 3 -#define TYPE_DA 4 +#define TYPE_DA 2 +#define TYPE_MAXHARD TYPE_DA +#define TYPE_WFD 3 +#define TYPE_FD 4 extern uint32_t _end; @@ -97,8 +98,8 @@ RBX_VERBOSE }; -static const char *const dev_nm[] = {"ad", "wd", " ", "fd", "da"}; -static const unsigned dev_maj[] = {30, 0, 1, 2, 4}; +static const char *const dev_nm[NDEV] = {"ad", "wd", "da", " ", "fd"}; +static const unsigned char dev_maj[NDEV] = {30, 0, 4, 1, 2}; static struct dsk { unsigned drive; @@ -111,16 +112,14 @@ } dsk; static char cmd[512]; static char kname[1024]; -static uint32_t opts; +static uint32_t opts = RB_BOOTINFO; static struct bootinfo bootinfo; static uint8_t ioctrl = IO_KEYBOARD; void exit(int); static void load(const char *); static int parse(char *); -static ino_t lookup(const char *); static int xfsread(ino_t, void *, size_t); -static ssize_t fsread(ino_t, void *, size_t); static int dskread(void *, unsigned, unsigned); static int printf(const char *,...); static int putchar(int); @@ -131,16 +130,17 @@ static int xgetc(int); static int getc(int); +#if 1 #define memcpy __builtin_memcpy - -static inline void -readfile(const char *fname, void *buf, size_t size) +#else +static void memcpy(char *, const char *, int); +static void +memcpy(char *dst, const char *src, int len) { - ino_t ino; - - if ((ino = lookup(fname))) - fsread(ino, buf, size); + while (len--) + *dst++ = *src++; } +#endif static inline int strcmp(const char *s1, const char *s2) @@ -151,15 +151,14 @@ #include "ufsread.c" -static inline int -getchar(void) +static int +xfsread(ino_t inode, void *buf, size_t nbyte) { - int c; - - c = xgetc(0); - if (c == '\r') - c = '\n'; - return c; + if (fsread(inode, buf, nbyte) != nbyte) { + printf("Invalid %s\n", "format"); + return -1; + } + return 0; } static inline void @@ -169,12 +168,13 @@ int c; s = str; - do { - switch (c = getchar()) { + for (;;) { + switch (c = xgetc(0)) { case 0: break; + case '\177': + c = '\b'; case '\b': - case '\177': if (s > str) { s--; putchar('\b'); @@ -183,15 +183,16 @@ c = 0; break; case '\n': + case '\r': *s = 0; - break; + return; default: if (s - str < size - 1) *s++ = c; } if (c) putchar(c); - } while (c != '\n'); + } } static inline uint32_t @@ -220,6 +221,7 @@ main(void) { int autoboot, i; + ino_t ino; dmadat = (void *)(roundup2(__base + _end, 0x10000) - __base); v86.ctl = V86_FLAGS; @@ -238,7 +240,10 @@ /* Process configuration file */ autoboot = 1; - readfile(PATH_CONFIG, cmd, sizeof(cmd)); + + if ((ino = lookup(PATH_CONFIG))) + fsread(ino, cmd, sizeof(cmd)); + if (*cmd) { printf("%s: %s", PATH_CONFIG, cmd); if (parse(cmd)) @@ -328,7 +333,7 @@ return; p += hdr.ex.a_data + roundup2(hdr.ex.a_bss, PAGE_SIZE); bootinfo.bi_symtab = VTOP(p); - memcpy(p, &hdr.ex.a_syms, sizeof(hdr.ex.a_syms)); + memcpy(p, (char *)&hdr.ex.a_syms, sizeof(hdr.ex.a_syms)); p += sizeof(hdr.ex.a_syms); if (hdr.ex.a_syms) { if (xfsread(ino, p, hdr.ex.a_syms)) @@ -365,7 +370,7 @@ if (xfsread(ino, &es, sizeof(es))) return; for (i = 0; i < 2; i++) { - memcpy(p, &es[i].sh_size, sizeof(es[i].sh_size)); + memcpy(p, (char *)&es[i].sh_size, sizeof(es[i].sh_size)); p += sizeof(es[i].sh_size); fs_off = es[i].sh_offset; if (xfsread(ino, p, es[i].sh_size)) @@ -378,7 +383,7 @@ bootinfo.bi_esymtab = VTOP(p); bootinfo.bi_kernelname = VTOP(fname); bootinfo.bi_bios_dev = dsk.drive; - __exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK), + __exec((caddr_t)addr, opts & RBX_MASK, MAKEBOOTDEV(dev_maj[dsk.type], 0, dsk.slice, dsk.unit, dsk.part), 0, 0, 0, VTOP(&bootinfo)); } @@ -449,9 +454,8 @@ arg += 2; if (drv == -1) drv = dsk.unit; - dsk.drive = (dsk.type == TYPE_WD || - dsk.type == TYPE_AD || - dsk.type == TYPE_DA ? DRV_HARD : 0) + drv; + dsk.drive = (dsk.type <= TYPE_MAXHARD + ? DRV_HARD : 0) + drv; dsk_meta = 0; fsread(0, NULL, 0); } @@ -467,16 +471,6 @@ } static int -xfsread(ino_t inode, void *buf, size_t nbyte) -{ - if (fsread(inode, buf, nbyte) != nbyte) { - printf("Invalid %s\n", "format"); - return -1; - } - return 0; -} - -static int dskread(void *buf, unsigned lba, unsigned nblk) { struct dos_partition *dp; ==== //depot/projects/kse/sys/boot/i386/libi386/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.25 2002/05/13 11:09:06 ru Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.27 2002/06/21 11:00:00 phk Exp $ # LIB= i386 INTERNALLIB= true ==== //depot/projects/kse/sys/boot/i386/libi386/bootinfo.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.32 2002/01/04 07:59:27 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.33 2002/06/20 06:29:42 peter Exp $ */ #include @@ -53,6 +53,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; ==== //depot/projects/kse/sys/boot/i386/loader/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.57 2002/05/10 00:53:45 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.59 2002/06/21 11:00:00 phk Exp $ BASE= loader PROG= ${BASE} ==== //depot/projects/kse/sys/boot/ia64/libski/bootinfo.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.5 2001/11/19 07:05:09 peter Exp $ + * $FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.6 2002/06/20 06:29:42 peter Exp $ */ #include @@ -54,6 +54,8 @@ {"boot_gdb", RB_GDB}, {"boot_single", RB_SINGLE}, {"boot_verbose", RB_VERBOSE}, + {"boot_multicons", RB_MULTIPLE}, + {"boot_serial", RB_SERIAL}, {NULL, 0} }; ==== //depot/projects/kse/sys/boot/sparc64/loader/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.8 2002/05/28 23:09:59 jake Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.9 2002/06/21 22:34:51 jake Exp $ BASE= loader PROG= ${BASE} @@ -13,7 +13,7 @@ LOADER_DISK_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes -LOADER_CD9660_SUPPORT?= no +LOADER_CD9660_SUPPORT?= yes LOADER_NET_SUPPORT?= no >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 23 23:52:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1604D37B403; Sun, 23 Jun 2002 23:52:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 43C7337B400 for ; Sun, 23 Jun 2002 23:52:09 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5O6q9S28323 for perforce@freebsd.org; Sun, 23 Jun 2002 23:52:09 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Sun, 23 Jun 2002 23:52:09 -0700 (PDT) Message-Id: <200206240652.g5O6q9S28323@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13357 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13357 Change 13357 by julian@julian_ref on 2002/06/23 23:51:55 Missing semicolon. Affected files ... ... //depot/projects/kse/sys/kern/tty.c#28 edit Differences ... ==== //depot/projects/kse/sys/kern/tty.c#28 (text+ko) ==== @@ -2403,7 +2403,7 @@ } else if (td->td_wmesg) { stmp = td->td_wmesg; } else { - stmp = "iowait" + stmp = "iowait"; } } else { stmp = "threadless"; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 24 1:51: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BC7237B42C; Mon, 24 Jun 2002 01:50:46 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C726537B7EC for ; Mon, 24 Jun 2002 01:50:33 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5O8oX048633 for perforce@freebsd.org; Mon, 24 Jun 2002 01:50:33 -0700 (PDT) (envelope-from dfr@freebsd.org) Date: Mon, 24 Jun 2002 01:50:33 -0700 (PDT) Message-Id: <200206240850.g5O8oX048633@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson Subject: PERFORCE change 13363 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13363 Change 13363 by dfr@dfr_home on 2002/06/24 01:49:35 Add UMA_ZONE_VM to the pmap zones to prevent malloc recursion. Affected files ... ... //depot/projects/ia64/sys/ia64/ia64/pmap.c#24 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#24 (text+ko) ==== @@ -522,12 +522,12 @@ if (initial_pvs < MINPV) initial_pvs = MINPV; pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); uma_zone_set_allocf(pvzone, pmap_allocf); uma_prealloc(pvzone, initial_pvs); ptezone = uma_zcreate("PT ENTRY", sizeof (struct ia64_lpte), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); uma_zone_set_allocf(ptezone, pmap_allocf); uma_prealloc(ptezone, initial_pvs); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 24 7:44:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF17F37B401; Mon, 24 Jun 2002 07:44:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 54C1337B404 for ; Mon, 24 Jun 2002 07:44:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5OEiAm41914 for perforce@freebsd.org; Mon, 24 Jun 2002 07:44:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Jun 2002 07:44:10 -0700 (PDT) Message-Id: <200206241444.g5OEiAm41914@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13372 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13372 Change 13372 by rwatson@rwatson_tislabs on 2002/06/24 07:43:16 Let mac_update_vnode_from_externalized() return a failure so that invalid labels are ignored. Affected files ... ... //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#151 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#50 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#36 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#30 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#3 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#65 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#151 (text+ko) ==== @@ -853,11 +853,14 @@ * Given an externalized mac label, internalize it and stamp it on a * vnode. */ -static void +static int mac_update_vnode_from_externalized(struct vnode *vp, struct mac *extmac) { + int error; - MAC_PERFORM(update_vnode_from_externalized, vp, &vp->v_label, extmac); + MAC_CHECK(update_vnode_from_externalized, vp, &vp->v_label, extmac); + + return (error); } /* @@ -905,8 +908,10 @@ } if (buflen == sizeof(extmac)) - mac_update_vnode_from_externalized(vp, &extmac); - else { + error = EPERM; /* Fail very closed. */ + if (error == 0) + error = mac_update_vnode_from_externalized(vp, &extmac); + if (error) { if (mac_debug_label_fallback) { printf("Corrupted label, falling back.\n"); mac_update_vnode_from_mount(vp, vp->v_mount); ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#50 (text+ko) ==== @@ -704,17 +704,26 @@ mac_biba_copy_single(source, dest); } -static void +static int mac_biba_update_vnode_from_externalized(struct vnode *vp, struct label *vnodelabel, struct mac *extmac) { struct mac_biba *source, *dest; + int error; - /* XXX: Validity check. */ source = &extmac->m_biba; dest = SLOT(vnodelabel); + error = mac_biba_valid(source); + if (error) + return (error); + + if ((source->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) + return (EINVAL); + mac_biba_copy_single(source, dest); + + return (0); } static void ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#36 (text+ko) ==== @@ -689,17 +689,26 @@ mac_mls_copy_single(source, dest); } -static void +static int mac_mls_update_vnode_from_externalized(struct vnode *vp, struct label *vnodelabel, struct mac *extmac) { struct mac_mls *source, *dest; + int error; - /* XXX: Validity check. */ source = &extmac->m_mls; dest = SLOT(vnodelabel); + error = mac_mls_valid(source); + if (error) + return (error); + + if ((source->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAG_SINGLE) + return (EINVAL); + mac_mls_copy_single(source, dest); + + return (0); } static void ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#30 (text+ko) ==== @@ -305,11 +305,12 @@ } -static void +static int mac_none_update_vnode_from_externalized(struct vnode *vp, struct label *vnodelabel, struct mac *extmac) { + return (0); } static void ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#3 (text+ko) ==== @@ -498,11 +498,12 @@ } -static void +static int mac_test_update_vnode_from_externalized(struct vnode *vp, struct label *vnodelabel, struct mac *extmac) { + return (0); } static void ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#65 (text+ko) ==== @@ -130,7 +130,7 @@ struct label *vnodelabel); void (*mpo_update_procfsvnode_from_subject)(struct vnode *vp, struct label *vnodelabel, struct ucred *cred); - void (*mpo_update_vnode_from_externalized)(struct vnode *vp, + int (*mpo_update_vnode_from_externalized)(struct vnode *vp, struct label *vnodelabel, struct mac *mac); void (*mpo_update_vnode_from_mount)(struct vnode *vp, struct label *vnodelabel, struct mount *mp, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 24 8:29:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF56937B401; Mon, 24 Jun 2002 08:28:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id D245437B400 for ; Mon, 24 Jun 2002 08:28:07 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5OFS7N50572 for perforce@freebsd.org; Mon, 24 Jun 2002 08:28:07 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Mon, 24 Jun 2002 08:28:07 -0700 (PDT) Message-Id: <200206241528.g5OFS7N50572@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 13373 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13373 Change 13373 by cvance@cvance_korben on 2002/06/24 08:27:35 Major update: - Update support for binary policy file versioning - Sync with SELinux to gain generic non-persistent fs support - Update policy parser/compiler - Revise build process for initial kernel sids, contexts, etc. - Sync with SELinux for dontaudit rules in policy parser/compiler - Sync with SELinux MLS support Still Missing: - True support for process/file labels - Updated policy Still Broken: - kernel avc_*_audit() call (auditing code was non-portable) Take Note: - policy format has changed, need new policy file to boot, put new policy in /etc/security/sebsd/policy.11 Affected files ... ... //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/checkpolicy.c#3 edit ... //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/policy_parse.y#3 edit ... //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/policy_scan.l#3 edit ... //depot/projects/trustedbsd/mac/sbin/sebsd_checkpolicy/Makefile#4 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/av_inherit.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/av_perm_to_string.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/av_permissions.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#5 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc_ss.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/class_to_string.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/common_perm_to_string.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/flask.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/initial_sid_to_string.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/flask.h#2 delete ... //depot/projects/trustedbsd/mac/sys/security/sebsd/flask/Makefile#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/flask/README#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/flask/access_vectors#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/flask/initial_sids#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/flask/mkaccess_vector.sh#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/flask/mkflask.sh#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/flask/security_classes#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#9 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#4 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_labels.h#1 add ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#3 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/init.c#5 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/initial_sid_to_string.h#2 delete ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/mls.c#3 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/mls.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/policydb.c#4 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/policydb.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/security.h#3 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.c#5 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/services_private.h#3 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#5 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.h#2 edit ... //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/symtab.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/checkpolicy.c#3 (text+ko) ==== @@ -47,6 +47,7 @@ #include "services.h" #include "queue.h" #include "checkpolicy.h" +#include "security.h" extern char *optarg; extern int optind; @@ -54,7 +55,7 @@ extern policydb_t *policydbp; extern queue_t id_queue; extern unsigned int policydb_errors; -extern unsigned int policydb_lineno; +extern unsigned long policydb_lineno; extern unsigned int pass; extern FILE *yyin; @@ -311,14 +312,14 @@ security_context_t scontext; access_vector_t allowed, decided, auditallow, auditdeny; class_datum_t *cladatum; - char ans[80 + 1], *perm, *file = txtfile, *outfile = NULL, *path; + char ans[80 + 1], *perm, *file = txtfile, *outfile = NULL, *path, *fstype; unsigned int scontext_len, pathlen, seqno, i; unsigned int protocol, port, addr; unsigned int binary = 0, debug = 0; int ret, ch, nel; FILE *fp, *outfp = NULL; - while ((ch = getopt(argc, argv, "o:db")) != EOF) { + while ((ch = getopt(argc, argv, "o:dbV")) != EOF) { switch (ch) { case 'o': outfile = optarg; @@ -330,6 +331,13 @@ case 'd': debug = 1; break; + case 'V': +#ifdef CONFIG_SECURITY_SELINUX_MLS + printf("%d-mls\n", POLICYDB_VERSION); +#else + printf("%d\n", POLICYDB_VERSION); +#endif + exit(0); default: usage(argv[0]); } @@ -396,8 +404,8 @@ printf("%s: policy configuration loaded\n", argv[0]); if (outfile) { - printf("%s: writing binary representation to %s\n", - argv[0], outfile); + printf("%s: writing binary representation (version %d) to %s\n", + argv[0], POLICYDB_VERSION, outfile); outfp = fopen(outfile, "w"); if (!outfp) { perror(outfile); @@ -430,8 +438,8 @@ printf("9) Call port_sid\n"); printf("a) Call netif_sid\n"); printf("b) Call node_sid\n"); - printf("c) Call nfs_sid\n"); - printf("d) Call devfs_sid\n"); + printf("c) Call fs_use\n"); + printf("d) Call genfs_sid\n"); printf("e) Call get_user_sids\n"); #ifdef EQUIVTYPES printf("z) Show equivalent types\n"); @@ -670,15 +678,36 @@ printf("sid %d\n", ssid); break; case 'c': - printf("NFS server IP address? "); + printf("fstype? "); fgets(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; - addr = inet_addr(ans); - security_nfs_sid(AF_INET, &addr, sizeof addr, &ssid, &tsid); - printf("fs_sid %d file_sid %d\n", ssid, tsid); + security_fs_use(ans, &ret, &ssid); + switch (ret) { + case SECURITY_FS_USE_PSID: + printf("use persistent label mapping\n"); + break; + case SECURITY_FS_USE_TRANS: + printf("use transition SIDs\n"); + break; + case SECURITY_FS_USE_TASK: + printf("use task SIDs\n"); + break; + case SECURITY_FS_USE_GENFS: + printf("use genfs\n"); + break; + case SECURITY_FS_USE_NONE: + printf("no labeling support\n"); + break; + } + if (ret != SECURITY_FS_USE_PSID) + printf("sid %d\n", ssid); break; case 'd': - printf("name? "); + printf("fstype? "); + fgets(ans, sizeof(ans), stdin); + ans[strlen(ans) - 1] = 0; + fstype = strdup(ans); + printf("path? "); fgets(ans, sizeof(ans), stdin); ans[strlen(ans) - 1] = 0; path = strdup(ans); @@ -700,8 +729,9 @@ } tclass = cladatum->value; } - security_devfs_sid(path, tclass, &ssid); + security_genfs_sid(fstype, path, tclass, &ssid); printf("sid %d\n", ssid); + free(fstype); free(path); break; case 'e': ==== //depot/projects/trustedbsd/mac/contrib/sebsd/checkpolicy/policy_parse.y#3 (text+ko) ==== @@ -22,12 +22,13 @@ #include "services.h" #include "queue.h" #include "checkpolicy.h" +#include "security.h" policydb_t *policydbp; queue_t id_queue = 0; unsigned int pass; -extern unsigned int policydb_lineno; +extern unsigned long policydb_lineno; extern char yytext[]; extern int yywarn(char *msg); @@ -47,9 +48,9 @@ static int define_level(void); static int define_common_base(void); static int define_av_base(void); +static int define_attrib(void); static int define_type(int alias); static int define_compute_type(int which); -static int define_te_clone(void); static int define_te_avtab(int which); static int define_role_types(void); static role_datum_t *merge_roles_dom(role_datum_t *r1,role_datum_t *r2); @@ -61,7 +62,8 @@ static int define_user(void); static int parse_security_context(context_struct_t *c); static int define_initial_sid_context(void); -static int define_devfs_context(int has_type); +static int define_fs_use(int behavior); +static int define_genfs_context(int has_type); static int define_fs_context(int major, int minor); static int define_port_context(int low, int high); static int define_netif_context(void); @@ -80,6 +82,7 @@ %token TYPE %token TYPES %token ALIAS +%token ATTRIBUTE %token TYPE_TRANSITION %token TYPE_MEMBER %token TYPE_CHANGE @@ -95,9 +98,13 @@ %token ALLOW %token AUDITALLOW %token AUDITDENY +%token DONTAUDIT %token SOURCE %token TARGET %token SAMEUSER +%token FSCON PORTCON NETIFCON NODECON +%token FSUSEPSID FSUSETASK FSUSETRANS +%token GENFSCON %token U1 U2 R1 R2 T1 T2 %token NOT AND OR %token IDENTIFIER @@ -112,9 +119,9 @@ %% policy : classes initial_sids access_vectors { if (pass == 1) { if (policydb_index_classes(policydbp)) return -1; } } - opt_mls te_rbac users constraints + opt_mls te_rbac users opt_constraints { if (pass == 2) { if (policydb_index_others(policydbp)) return -1;} } - initial_sid_contexts fs_contexts devfs_contexts net_contexts + initial_sid_contexts opt_fs_contexts fs_uses opt_genfs_contexts net_contexts ; classes : class_def | classes class_def @@ -128,8 +135,11 @@ initial_sid_def : SID identifier {if (define_initial_sid()) return -1;} ; -access_vectors : common_perms av_perms +access_vectors : opt_common_perms av_perms ; +opt_common_perms : common_perms + | + ; common_perms : common_perms_def | common_perms common_perms_def ; @@ -149,7 +159,7 @@ opt_mls : mls | ; -mls : sensitivities dominance categories levels base_perms +mls : sensitivities dominance opt_categories levels base_perms ; sensitivities : sensitivity_def | sensitivities sensitivity_def @@ -166,6 +176,9 @@ | DOMINANCE '{' identifier_list '}' {if (define_dominance()) return -1;} ; +opt_categories : categories + | + ; categories : category_def | categories category_def ; @@ -182,8 +195,11 @@ | LEVEL identifier ';' {if (define_level()) return -1;} ; -base_perms : common_base av_base +base_perms : opt_common_base av_base ; +opt_common_base : common_base + | + ; common_base : common_base_def | common_base common_base_def ; @@ -218,14 +234,14 @@ | role_trans_def | role_allow_def ; -te_decl : type_def +te_decl : attribute_def + | type_def | transition_def | te_avtab_def - | te_clone_def ; -te_clone_def : CLONE identifier identifier ';' - {if (define_te_clone()) return -1;} - ; +attribute_def : ATTRIBUTE identifier ';' + { if (define_attrib()) return -1;} + ; type_def : TYPE identifier alias_def opt_attr_list ';' {if (define_type(1)) return -1;} | TYPE identifier opt_attr_list ';' @@ -244,6 +260,7 @@ te_avtab_def : allow_def | auditallow_def | auditdeny_def + | dontaudit_def | neverallow_def ; allow_def : ALLOW names names ':' names names ';' @@ -255,6 +272,9 @@ auditdeny_def : AUDITDENY names names ':' names names ';' {if (define_te_avtab(AVTAB_AUDITDENY)) return -1; } ; +dontaudit_def : DONTAUDIT names names ':' names names ';' + {if (define_te_avtab(-AVTAB_AUDITDENY)) return -1; } + ; neverallow_def : NEVERALLOW names names ':' names names ';' {if (define_te_avtab(-AVTAB_ALLOWED)) return -1; } ; @@ -279,6 +299,9 @@ | ROLE identifier_push '{' roles '}' {$$ = (int) define_role_dom((role_datum_t*)$4); if ($$ == 0) return -1;} ; +opt_constraints : constraints + | + ; constraints : constraint_def | constraints constraint_def ; @@ -381,51 +404,69 @@ initial_sid_context_def : SID identifier security_context_def {if (define_initial_sid_context()) return -1;} ; +opt_fs_contexts : fs_contexts + | + ; fs_contexts : fs_context_def | fs_contexts fs_context_def ; -fs_context_def : number number security_context_def security_context_def - {if (define_fs_context($1,$2)) return -1;} +fs_context_def : FSCON number number security_context_def security_context_def + {if (define_fs_context($2,$3)) return -1;} ; -net_contexts : port_contexts netif_contexts node_contexts opt_nfs_contexts +net_contexts : opt_port_contexts opt_netif_contexts opt_node_contexts ; +opt_port_contexts : port_contexts + | + ; port_contexts : port_context_def | port_contexts port_context_def ; -port_context_def : identifier number security_context_def - {if (define_port_context($2,$2)) return -1;} - | identifier number '-' number security_context_def - {if (define_port_context($2,$4)) return -1;} +port_context_def : PORTCON identifier number security_context_def + {if (define_port_context($3,$3)) return -1;} + | PORTCON identifier number '-' number security_context_def + {if (define_port_context($3,$5)) return -1;} ; +opt_netif_contexts : netif_contexts + | + ; netif_contexts : netif_context_def | netif_contexts netif_context_def ; -netif_context_def : identifier security_context_def security_context_def - {if (define_netif_context()) return -1;} +netif_context_def : NETIFCON identifier security_context_def security_context_def + {if (define_netif_context()) return -1;} ; +opt_node_contexts : node_contexts + | + ; node_contexts : node_context_def | node_contexts node_context_def ; -node_context_def : ipv4_addr_def ipv4_addr_def security_context_def - {if (define_node_context($1,$2)) return -1;} +node_context_def : NODECON ipv4_addr_def ipv4_addr_def security_context_def + {if (define_node_context($2,$3)) return -1;} ; -opt_nfs_contexts : nfs_contexts - | +fs_uses : fs_use_def + | fs_uses fs_use_def + ; +fs_use_def : FSUSEPSID identifier ';' + {if (define_fs_use(SECURITY_FS_USE_PSID)) return -1;} + | FSUSETASK identifier security_context_def ';' + {if (define_fs_use(SECURITY_FS_USE_TASK)) return -1;} + | FSUSETRANS identifier security_context_def ';' + {if (define_fs_use(SECURITY_FS_USE_TRANS)) return -1;} + ; +opt_genfs_contexts : genfs_contexts + | ; -nfs_contexts : nfs_context_def - | nfs_contexts nfs_context_def +genfs_contexts : genfs_context_def + | genfs_contexts genfs_context_def ; -nfs_context_def : ipv4_addr_def ipv4_addr_def security_context_def security_context_def - {if (define_nfs_context($1,$2)) return -1;} +genfs_context_def : GENFSCON identifier path '-' identifier security_context_def + {if (define_genfs_context(1)) return -1;} + | GENFSCON identifier path '-' '-' {insert_id("-", 0);} security_context_def + {if (define_genfs_context(1)) return -1;} + | GENFSCON identifier path security_context_def + {if (define_genfs_context(0)) return -1;} ; -devfs_contexts : devfs_context_def - | devfs_contexts devfs_context_def - ; -devfs_context_def : path '-' identifier security_context_def - {if (define_devfs_context(1)) return -1;} - | path security_context_def - {if (define_devfs_context(0)) return -1;} - ; ipv4_addr_def : number '.' number '.' number '.' number { unsigned int addr; @@ -1371,12 +1412,54 @@ #endif } +static int define_attrib(void) +{ + char *id; + type_datum_t *attr; + int ret; + + + if (pass == 2) { + free(queue_remove(id_queue)); + return 0; + } + id = (char *) queue_remove(id_queue); + if (!id) { + return -1; + } + + attr = hashtab_search(policydbp->p_types.table, id); + if (attr) { + sprintf(errormsg, "duplicate declaration for attribute %s\n", + id); + yyerror(errormsg); + return -1; + } + + attr = (type_datum_t *) malloc(sizeof(type_datum_t)); + if (!attr) { + yyerror("out of memory"); + return -1; + } + memset(attr, 0, sizeof(type_datum_t)); + attr->isattr = TRUE; + ret = hashtab_insert(policydbp->p_types.table, + id, (hashtab_datum_t) attr); + if (ret) { + yyerror("hash table overflow"); + return -1; + } + + return 0; +} + + static int define_type(int alias) { char *id; type_datum_t *datum, *aliasdatum, *attr; - int ret; + int ret, newattr = 0; if (pass == 2) { @@ -1453,8 +1536,39 @@ } while ((id = queue_remove(id_queue))) { +#ifdef CONFIG_SECURITY_SELINUX_MLS + if (!strcmp(id, "mlstrustedreader")) { + if (!ebitmap_set_bit(&policydbp->trustedreaders, datum->value - 1, TRUE)) { + yyerror("out of memory"); + free(id); + return -1; + } + } else if (!strcmp(id, "mlstrustedwriter")) { + if (!ebitmap_set_bit(&policydbp->trustedwriters, datum->value - 1, TRUE)) { + yyerror("out of memory"); + free(id); + return -1; + } + } else if (!strcmp(id, "mlstrustedobject")) { + if (!ebitmap_set_bit(&policydbp->trustedobjects, datum->value - 1, TRUE)) { + yyerror("out of memory"); + free(id); + return -1; + } + } +#endif attr = hashtab_search(policydbp->p_types.table, id); if (!attr) { + sprintf(errormsg, "attribute %s is not declared", id); +#if 1 + /* treat it as a fatal error */ + yyerror(errormsg); + return -1; +#else + /* Warn but automatically define the attribute. + Useful for quickly finding all those attributes you + forgot to declare. */ + yywarn(errormsg); attr = (type_datum_t *) malloc(sizeof(type_datum_t)); if (!attr) { yyerror("out of memory"); @@ -1468,14 +1582,21 @@ yyerror("hash table overflow"); return -1; } + newattr = 1; +#endif } else { - free(id); + newattr = 0; } + if (!attr->isattr) { - sprintf(errormsg, "name conflict for type attribute %s", id); + sprintf(errormsg, "%s is a type, not an attribute", id); yyerror(errormsg); return -1; } + + if (!newattr) + free(id); + ebitmap_set_bit(&attr->types, datum->value - 1, TRUE); } @@ -1738,12 +1859,16 @@ static int te_avtab_helper(int which, int stype, int ttype, - ebitmap_t *tclasses, access_vector_t *avp) + ebitmap_t *tclasses, access_vector_t *avp) { avtab_key_t avkey; avtab_datum_t avdatum, *avdatump; int ret, k; + if (which == -AVTAB_ALLOWED) { + yyerror("neverallow should not reach this function."); + return -1; + } for (k = ebitmap_startbit(tclasses); k < ebitmap_length(tclasses); k++) { if (!ebitmap_get_bit(tclasses, k)) @@ -1753,11 +1878,8 @@ avkey.target_class = k + 1; avdatump = avtab_search(&policydbp->te_avtab, &avkey, AVTAB_AV); if (!avdatump) { - if (which == -AVTAB_ALLOWED) { - continue; - } memset(&avdatum, 0, sizeof avdatum); - avdatum.specified = which; + avdatum.specified = (which > 0) ? which : -which; ret = avtab_insert(&policydbp->te_avtab, &avkey, &avdatum); if (ret) { yyerror("hash table overflow"); @@ -1770,18 +1892,7 @@ } } - if (which == -AVTAB_ALLOWED) { - if ((avdatump->specified & AVTAB_ALLOWED) && - (avtab_allowed(avdatump) & avp[k])) { - sprintf(errormsg, "assertion failed: allow %s %s:%s {%s } was granted.", type_val_to_name(stype+1), type_val_to_name(ttype+1), policydbp->p_class_val_to_name[k], - av_to_string(k+1, - avtab_allowed(avdatump) & avp[k])); - yyerror(errormsg); - } - continue; - } - - avdatump->specified |= which; + avdatump->specified |= ((which > 0) ? which : -which); switch (which) { case AVTAB_ALLOWED: @@ -1793,6 +1904,12 @@ case AVTAB_AUDITDENY: avtab_auditdeny(avdatump) |= avp[k]; break; + case -AVTAB_AUDITDENY: + if (avtab_auditdeny(avdatump)) + avtab_auditdeny(avdatump) &= ~avp[k]; + else + avtab_auditdeny(avdatump) = ~avp[k]; + break; } } @@ -1876,6 +1993,8 @@ if (strcmp(id, "~") == 0) { /* complement the set */ + if (which == -AVTAB_AUDITDENY) + yywarn("dontaudit rule with a ~?"); avp[i] = ~avp[i]; continue; } @@ -1943,167 +2062,6 @@ return -1; } - -typedef struct te_clone_args { - type_datum_t *src; - type_datum_t *tgt; -} te_clone_args_t; - -static int te_clone_transition( - avtab_key_t *k, - avtab_datum_t *d, - avtab_datum_t *newd, - te_clone_args_t *myargs) -{ - if (k->target_class == SECCLASS_PROCESS && - (avtab_transition(d) == myargs->src->value || - avtab_transition(d) == myargs->tgt->value)) { - /* - * Do not clone a process transition if - * if the new domain is equal to the - * source domain or to the target - * domain in the clone statement. - */ - return 0; - } - - if ((newd->specified & AVTAB_TRANSITION) && - avtab_transition(newd) != avtab_transition(d)) { - sprintf(errormsg, "conflicting type transition rule for (%s, %s:%s): default was %s, now is %s", type_val_to_name(myargs->tgt->value), type_val_to_name(k->target_type), policydbp->p_class_val_to_name[k->target_class-1], - type_val_to_name(avtab_transition(newd)), - type_val_to_name(avtab_transition(d))); - yywarn(errormsg); - } - - newd->specified |= AVTAB_TRANSITION; - avtab_transition(newd) = avtab_transition(d); - return 0; -} - - -static int te_clone_av( - avtab_key_t *k, - avtab_datum_t *d, - avtab_datum_t *newd, - te_clone_args_t *myargs) -{ - if (k->target_type == myargs->src->value || - k->target_type == myargs->tgt->value) { - /* - * Do not clone an access vector if - * the target domain is equal to the - * source domain or to the target domain - * in the clone statement. - */ - return 0; - } - - newd->specified |= d->specified; - if (d->specified & AVTAB_ALLOWED) - avtab_allowed(newd) |= avtab_allowed(d); - if (d->specified & AVTAB_AUDITALLOW) - avtab_auditallow(newd) |= avtab_auditallow(d); - if (d->specified & AVTAB_AUDITDENY) - avtab_auditdeny(newd) |= avtab_auditdeny(d); - return 0; -} - - -static int te_clone(avtab_key_t *k, avtab_datum_t *d, void *args) -{ - avtab_key_t newk; - avtab_datum_t newd, *newd_ptr; - te_clone_args_t *myargs = args; - int ret; - - if (k->source_type != myargs->src->value) - /* only clone entries for the source domain */ - return 0; - - newk.source_type = myargs->tgt->value; - newk.target_type = k->target_type; - newk.target_class = k->target_class; - memset(&newd, 0, sizeof newd); - - if (d->specified & AVTAB_AV) { - newd_ptr = avtab_search(&policydbp->te_avtab, &newk, AVTAB_AV); - if (!newd_ptr) - newd_ptr = &newd; - te_clone_av(k, d, newd_ptr, myargs); - } else if (d->specified & AVTAB_TRANSITION) { - newd_ptr = avtab_search(&policydbp->te_avtab, &newk, AVTAB_TYPE); - if (!newd_ptr) - newd_ptr = &newd; - te_clone_transition(k, d, newd_ptr, myargs); - } - - if (newd.specified == 0) - return 0; - - ret = avtab_insert(&policydbp->te_avtab, - &newk, &newd); - if (ret) { - yyerror("out of memory"); - return -1; - } - - return 0; -} - -static int define_te_clone(void) -{ - char *src_id, *tgt_id; - type_datum_t *src, *tgt; - te_clone_args_t args; - - if (pass == 1) { - src_id = queue_remove(id_queue); - free(src_id); - tgt_id = queue_remove(id_queue); - free(tgt_id); - return 0; - } - - src_id = queue_remove(id_queue); - if (!src_id) { - yyerror("No source domain?"); - return -1; - } - src = hashtab_search(policydbp->p_types.table, src_id); - if (!src || src->isattr) { - sprintf(errormsg, "unknown type %s used in rule", src_id); - yyerror(errormsg); - free(src_id); - return -1; - } - - tgt_id = queue_remove(id_queue); - if (!tgt_id) { - yyerror("No target domain?"); - free(src_id); - return -1; - } - tgt = hashtab_search(policydbp->p_types.table, tgt_id); - if (!tgt || tgt->isattr) { - sprintf(errormsg, "unknown type %s used in rule", tgt_id); - yyerror(errormsg); - free(src_id); - free(tgt_id); - return -1; - } - - sprintf(errormsg, "clone %s %s - Cloning rules are DEPRECATED, use macros.", src_id, tgt_id); - yywarn(errormsg); - free(src_id); - free(tgt_id); - - args.src = src; - args.tgt = tgt; - return avtab_map(&policydbp->te_avtab, - te_clone, (void *)&args); -} - - static int role_val_to_name_helper(hashtab_key_t key, hashtab_datum_t datum, void *p) { unsigned int value; @@ -3254,56 +3212,64 @@ return 0; } - -static int define_nfs_context(int addr, int mask) +static int define_fs_use(int behavior) { - ocontext_t *newc, *c, *l, *head; + ocontext_t *newc, *c, *head; if (pass == 1) { - parse_security_context(NULL); + free(queue_remove(id_queue)); + if (behavior != SECURITY_FS_USE_PSID) + parse_security_context(NULL); return 0; } - newc = malloc(sizeof(ocontext_t)); + newc = (ocontext_t *) malloc(sizeof(ocontext_t)); if (!newc) { yyerror("out of memory"); return -1; } memset(newc, 0, sizeof(ocontext_t)); - newc->u.node.addr = addr; - newc->u.node.mask = mask; - - if (parse_security_context(&newc->context[0])) { + newc->u.name = (char *) queue_remove(id_queue); + if (!newc->u.name) { free(newc); return -1; } - if (parse_security_context(&newc->context[1])) { - context_destroy(&newc->context[0]); - free(newc->u.name); - free(newc); - return -1; + newc->v.behavior = behavior; + if (behavior != SECURITY_FS_USE_PSID) { + if (parse_security_context(&newc->context[0])) { + free(newc->u.name); + free(newc); + return -1; + } } + head = policydbp->ocontexts[OCON_FSUSE]; - /* Place this at the end of the list, to retain - the matching order specified in the configuration. */ - head = policydbp->ocontexts[OCON_NFS]; - for (l = NULL, c = head; c; l = c, c = c->next); + for (c = head; c; c = c->next) { + if (!strcmp(newc->u.name, c->u.name)) { + sprintf(errormsg, "duplicate fs_use entry for filesystem type %s", newc->u.name); + yyerror(errormsg); + context_destroy(&newc->context[0]); + free(newc->u.name); + free(newc); + return -1; + } + } - if (l) - l->next = newc; - else - policydbp->ocontexts[OCON_NFS] = newc; - + newc->next = head; + policydbp->ocontexts[OCON_FSUSE] = newc; return 0; } -static int define_devfs_context(int has_type) +static int define_genfs_context_helper(char *fstype, int has_type) { - ocontext_t *newc, *c, *head; - char *type; + struct genfs *genfs_p, *genfs, *newgenfs; + ocontext_t *newc, *c, *head, *p; + char *type = NULL; + int len, len2; if (pass == 1) { + free(fstype); free(queue_remove(id_queue)); if (has_type) free(queue_remove(id_queue)); @@ -3311,6 +3277,28 @@ return 0; } + for (genfs_p = NULL, genfs = policydbp->genfs; + genfs; genfs_p = genfs, genfs = genfs->next) { + if (strcmp(fstype, genfs->fstype) <= 0) + break; + } + + if (!genfs || strcmp(fstype, genfs->fstype)) { + newgenfs = malloc(sizeof(struct genfs)); + if (!newgenfs) { + yyerror("out of memory"); + return -1; + } + memset(newgenfs, 0, sizeof(struct genfs)); + newgenfs->fstype = fstype; + newgenfs->next = genfs; + if (genfs_p) + genfs_p->next = newgenfs; + else + policydbp->genfs = newgenfs; + genfs = newgenfs; + } + newc = (ocontext_t *) malloc(sizeof(ocontext_t)); if (!newc) { yyerror("out of memory"); @@ -3319,10 +3307,8 @@ memset(newc, 0, sizeof(ocontext_t)); newc->u.name = (char *) queue_remove(id_queue); - if (!newc->u.name) { - free(newc); - return -1; - } + if (!newc->u.name) + goto fail; if (has_type) { type = (char *) queue_remove(id_queue); if (!type) @@ -3334,25 +3320,25 @@ } switch (type[0]) { case 'b': - newc->sclass = SECCLASS_BLK_FILE; + newc->v.sclass = SECCLASS_BLK_FILE; break; case 'c': - newc->sclass = SECCLASS_CHR_FILE; + newc->v.sclass = SECCLASS_CHR_FILE; break; case 'd': - newc->sclass = SECCLASS_DIR; + newc->v.sclass = SECCLASS_DIR; break; case 'p': - newc->sclass = SECCLASS_FIFO_FILE; + newc->v.sclass = SECCLASS_FIFO_FILE; break; case 'l': - newc->sclass = SECCLASS_LNK_FILE; + newc->v.sclass = SECCLASS_LNK_FILE; break; case 's': - newc->sclass = SECCLASS_SOCK_FILE; + newc->v.sclass = SECCLASS_SOCK_FILE; break; case '-': - newc->sclass = SECCLASS_FILE; + newc->v.sclass = SECCLASS_FILE; break; default: sprintf(errormsg, "invalid type %s", type); @@ -3360,36 +3346,47 @@ goto fail; } } - if (parse_security_context(&newc->context[0])) { - free(newc->u.name); - free(newc); - return -1; - } - head = policydbp->ocontexts[OCON_DEVFS]; + if (parse_security_context(&newc->context[0])) + goto fail; + + head = genfs->head; - for (c = head; c; c = c->next) { + for (p = NULL, c = head; c; p = c, c = c->next) { if (!strcmp(newc->u.name, c->u.name) && - newc->sclass == c->sclass) { - sprintf(errormsg, "duplicate entry for devfs entry %s", newc->u.name); + (!newc->v.sclass || !c->v.sclass || newc->v.sclass == c->v.sclass)) { + sprintf(errormsg, "duplicate entry for genfs entry (%s, %s)", fstype, newc->u.name); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 24 8:58:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A542F37B405; Mon, 24 Jun 2002 08:57:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id C2FEF37B404 for ; Mon, 24 Jun 2002 08:57:47 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5OFvla54790 for perforce@freebsd.org; Mon, 24 Jun 2002 08:57:47 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Mon, 24 Jun 2002 08:57:47 -0700 (PDT) Message-Id: <200206241557.g5OFvla54790@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 13377 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13377 Change 13377 by cvance@cvance_korben on 2002/06/24 08:57:12 Updated Policy, copied from SELinux. Note this is likely not applicable to FreeBSD, it's just a starting point. Affected files ... ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/Makefile#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/README#2 delete ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/assert.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/attrib.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/constraints#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/admin.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/httpadm.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/misc/kernel.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/misc/kmod.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/misc/tcpmux.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/acct.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/amanda.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/apache.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/apmd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/atd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/authbind.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/automount.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/backup.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/bootloader.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/cardmgr.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/courier.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/crack.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/crond.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/crontab.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/cups.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ddt-client.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/devfsd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/dhcpc.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/dhcpd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/dictd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/dpkg.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/fsadm.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ftpd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/gatekeeper.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/getty.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/gnome-pty-helper.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/gpg.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/gpm.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/hotplug.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/hwclock.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ifconfig.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/inetd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/init.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/initrc.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ipchains.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ipsec.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/klogd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ldconfig.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/login.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/logrotate.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/lpd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/lpr.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/mail.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/modutil.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/mount.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/named.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/netscape.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/netutils.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/newrole.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/nscd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ntpd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/passwd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ping.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/portmap.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/portslave.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/postfix.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/pppd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/procmail.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/pump.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/qmail.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/quota.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/radius.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/radvd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/rlogind.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/rpcd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/rpm.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/rshd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/run_deb.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/run_init.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/selopt.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/sendmail.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/setfiles.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/slapd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/snmpd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/snort.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/sound.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/speedmgmt.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/squid.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ssh.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/sshd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/su.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/sxid.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/syslogd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/sysstat.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/tcpd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/tftpd.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/traceroute.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/usbmodules.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/utempter.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/vmware.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/watchdog.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/xdm.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/xfs.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/xserver.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ypbind.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_capable_file.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_capable_net.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_capable_sys.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_entrypoint.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_execshare.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_exectrace.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_execute_no_trans.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_fdreceive.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_file.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_global.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_inherit.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_ioctl.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_ipc.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_link.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_mkdir.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_open.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_ptrace.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_readlink.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_relabel.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_rename.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_rxdir.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_setattr.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_setnice.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_sigkill.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_socket.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_stat.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_sysctl.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_system_misc.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_task_create.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_task_getpgid.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_task_getsched.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_task_getsid.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_task_setpgid.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_task_setsched.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_transition.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/test/test_wait.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/user.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/acct.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/apache.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/apmd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/atd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/authbind.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/automount.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/backup.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/bootloader.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/cardmgr.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/courier.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/crack.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/crond.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/crontab.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/cups.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ddt-client.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/devfsd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dhcpc.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dhcpd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dictd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dpkg.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/fsadm.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ftpd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/gatekeeper.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/getty.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/gnome-pty-helper.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/gpg.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/gpm.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/hotplug.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/hwclock.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ifconfig.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/inetd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/init.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/initrc.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ipchains.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ipsec.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/kernel.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/klogd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/kmod.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ldconfig.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/login.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/logrotate.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/lpd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/lpr.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/mail.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/modutil.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/mount.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/named.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/netscape.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/netutils.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/newrole.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/nscd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ntpd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/passwd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ping.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/portmap.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/portslave.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/postfix.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/pppd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/procmail.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/pump.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/qmail.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/quota.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/radius.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/radvd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/rlogind.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/rpcd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/rpm.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/rshd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/run_deb.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/run_init.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/selopt.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/sendmail.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/setfiles.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/slapd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/snmpd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/snort.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/sound.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/speedmgmt.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/squid.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ssh.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/sshd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/su.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/sxid.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/syslogd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/sysstat.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/tcpd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/tftpd.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/traceroute.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/usbmodules.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/utempter.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/vmware.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/watchdog.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/xdm.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/xfs.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/xserver.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ypbind.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/types.fc#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/flask/access_vectors#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/flask/initial_sids#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/flask/security_classes#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/fs_use#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/genfs_contexts#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/initial_sid_contexts#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/macros/admin_macros.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/macros/global_macros.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/macros/program/crond_macros.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/macros/program/crontab_macros.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/macros/program/gpg_macros.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/macros/program/gph_macros.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/macros/program/lpr_macros.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/macros/program/netscape_macros.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/macros/program/sendmail_macros.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/macros/program/ssh_macros.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/macros/program/su_macros.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/macros/program/xserver_macros.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/macros/user_macros.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/mls#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/net_contexts#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/policy.conf#3 delete ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/rbac#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/test.mk#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/test_attrib.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/types/device.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/types/devpts.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/types/file.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/types/network.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/types/nfs.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/types/procfs.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/types/security.te#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/users#1 add ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/users.distrib#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jun 24 11:20:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D36B337B404; Mon, 24 Jun 2002 11:20:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id BB81C37B40A for ; Mon, 24 Jun 2002 11:20:41 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5OIKfk85727 for perforce@freebsd.org; Mon, 24 Jun 2002 11:20:41 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Mon, 24 Jun 2002 11:20:41 -0700 (PDT) Message-Id: <200206241820.g5OIKfk85727@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 13382 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13382 Change 13382 by cvance@cvance_korben on 2002/06/24 11:20:14 Allow default SEBSD policy to be installed into /usr/share/sebsd/policy Affected files ... ... //depot/projects/trustedbsd/mac/contrib/sebsd/policy/files.lst#1 add ... //depot/projects/trustedbsd/mac/share/sebsd/Makefile#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 25 0:34:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F73D37B4D0; Tue, 25 Jun 2002 00:32:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 3D4C437B4AC for ; Tue, 25 Jun 2002 00:31:10 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5P7V9N27321 for perforce@freebsd.org; Tue, 25 Jun 2002 00:31:09 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Tue, 25 Jun 2002 00:31:09 -0700 (PDT) Message-Id: <200206250731.g5P7V9N27321@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13410 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13410 Change 13410 by julian@julian_ref on 2002/06/25 00:30:56 Check in "bunch-o-debuggin". Still lookign for the mysterious runqueue corruption. I can duplicate it at least. Affected files ... ... //depot/projects/kse/sys/kern/kern_mutex.c#29 edit ... //depot/projects/kse/sys/kern/kern_proc.c#74 edit ... //depot/projects/kse/sys/kern/kern_switch.c#60 edit ... //depot/projects/kse/sys/kern/kern_synch.c#73 edit ... //depot/projects/kse/sys/kern/kern_thread.c#79 edit ... //depot/projects/kse/sys/posix4/ksched.c#10 edit ... //depot/projects/kse/sys/sys/proc.h#115 edit ... //depot/projects/kse/sys/vm/vm_glue.c#33 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_mutex.c#29 (text+ko) ==== @@ -127,16 +127,14 @@ if (td->td_priority <= pri) /* lower is higher priority */ return; - /* - * Bump this thread's priority. - */ - td->td_priority = pri; /* * If lock holder is actually running, just bump priority. */ - if (td->td_state == TDS_RUNNING) + if (td->td_state == TDS_RUNNING) { + td->td_priority = pri; return; + } #ifndef SMP /* @@ -155,9 +153,14 @@ if (td->td_state == TDS_RUNQ) { MPASS(td->td_blocked == NULL); remrunqueue(td); + td->td_priority = pri; setrunqueue(td); return; } + /* + * Adjust for any other cases. + */ + td->td_priority = pri; /* * If we aren't blocked on a mutex, we should be. ==== //depot/projects/kse/sys/kern/kern_proc.c#74 (text+ko) ==== @@ -255,13 +255,11 @@ mtx_lock_spin(&sched_lock); mi_switch(); /* Save current registers to PCB. */ mtx_unlock_spin(&sched_lock); - PROC_LOCK(p); newkse->ke_upcall = mbx.kmbx_upcall; newkse->ke_stackbase = mbx.kmbx_stackbase; newkse->ke_stacksize = mbx.kmbx_stacksize; newkse->ke_mailbox = uap->mbx; cpu_save_upcall(td, newkse); - PROC_UNLOCK(p); /* Note that we are the returning syscall */ td->td_retval[0] = 0; td->td_retval[1] = 0; ==== //depot/projects/kse/sys/kern/kern_switch.c#60 (text+ko) ==== @@ -131,11 +131,11 @@ if (td->td_flags & TDF_UNBOUND) { TAILQ_REMOVE(&kg->kg_runq, td, td_runq); if (kg->kg_last_assigned == td) - if (TAILQ_PREV(td, threadlist_head, td_runq) + if (TAILQ_PREV(td, threadqueue, td_runq) != NULL) printf("Yo MAMA!\n"); kg->kg_last_assigned = TAILQ_PREV(td, - threadlist_head, td_runq); + threadqueue, td_runq); /* * If we have started running an upcall, * Then TDF_UNBOUND WAS set because the thread was @@ -160,6 +160,7 @@ td->td_kse->ke_state = KES_UNQUEUED; CTR1(KTR_RUNQ, "choosethread: td=%p (idle)", td); } + thread_sanity_check(td); return (td); } @@ -192,6 +193,7 @@ * If we found one assign it the kse, otherwise idle the kse. */ if (td) { + thread_sanity_check(td); kg->kg_last_assigned = td; td->td_kse = ke; ke->ke_thread = td; @@ -209,37 +211,6 @@ } } -#if 0 -/* - * Given a current kse, and a current thread, see if - * there is another thread of the same priority and - * group, waiting to run, and if so, link it up as if it were ours and - * return. Refuse to change if bound together. - * ****not completed**** - */ -struct thread * -nextthread(struct kse *ke) -{ - struct ksegrp *kg = ke->ke_ksegrp; - struct thread *td = ke->ke_thread;; - - if (((td->td_flags & TDF_UNBOUND) == 0) - && (td = TAILQ_FIRST(&kg->kg_runq))) { - if ((td->td_priority / RQ_PPQ) <= ke->ke_rqindex) { - /* head thread's priority is more urgent than ours */ - if (td->td_kse) { - kse_reassign(ke); - } else { - ke->ke_thread = td; - td->td_kse = ke; - kg->kg_last_assigned = td; - } - } - } - return (td); -} -#endif - int kserunnable(void) { @@ -260,6 +231,7 @@ struct kse *ke; mtx_assert(&sched_lock, MA_OWNED); + thread_sanity_check(td); KASSERT ((td->td_state == TDS_RUNQ), ("remrunqueue: Bad state on run queue")); kg = td->td_ksegrp; @@ -284,8 +256,9 @@ * KSE to the next available thread. Then, we should * see if we need to move the KSE in the run queues. */ + td2 = kg->kg_last_assigned; + KASSERT((td2 != NULL), ("last assigned has wrong value ")); td->td_kse = NULL; - td2 = kg->kg_last_assigned; if ((td3 = TAILQ_NEXT(td2, td_runq))) { KASSERT(td3 != td, ("td3 somehow matched td")); /* @@ -306,7 +279,7 @@ */ if (td == td2) { kg->kg_last_assigned = - TAILQ_PREV(td, threadlist_head, td_runq); + TAILQ_PREV(td, threadqueue, td_runq); } runq_remove(&runq, ke); KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); @@ -321,6 +294,7 @@ } } TAILQ_REMOVE(&kg->kg_runq, td, td_runq); + thread_sanity_check(td); } #if 1 /* use the first version */ @@ -334,6 +308,7 @@ CTR1(KTR_RUNQ, "setrunqueue: td%p", td); mtx_assert(&sched_lock, MA_OWNED); + thread_sanity_check(td); KASSERT((td->td_state != TDS_RUNQ), ("setrunqueue: bad thread state")); td->td_state = TDS_RUNQ; kg = td->td_ksegrp; @@ -379,7 +354,7 @@ */ td2 = kg->kg_last_assigned; kg->kg_last_assigned = - TAILQ_PREV(td2, threadlist_head, td_runq); + TAILQ_PREV(td2, threadqueue, td_runq); ke = td2->td_kse; runq_remove(&runq, ke); ke->ke_thread = td; @@ -413,11 +388,12 @@ */ if (ke) { if (kg->kg_last_assigned == - TAILQ_PREV(td, threadlist_head, td_runq)) { + TAILQ_PREV(td, threadqueue, td_runq)) { kg->kg_last_assigned = td; } runq_add(&runq, ke); } + thread_sanity_check(td); } #else @@ -530,7 +506,7 @@ ke = td2->td_kse; KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); kg->kg_last_assigned = - TAILQ_PREV(td2, threadlist_head, td_runq); + TAILQ_PREV(td2, threadqueue, td_runq); td2->td_kse = NULL; td->td_kse = ke; ke->ke_thread = td; @@ -774,3 +750,91 @@ runq_add(rq, ke); } } + +void +thread_sanity_check(struct thread *td) +{ + struct proc *p; + struct ksegrp *kg; + struct kse *ke; + struct thread *td2; + unsigned int prevpri; + int saw_lastassigned; + int unassigned; + int assigned; + + p = td->td_proc; + kg = td->td_ksegrp; + ke = td->td_kse; + + if (kg != &p->p_ksegrp) { + panic ("wrong ksegrp"); + } + + if (ke) { + if (ke != &p->p_kse) { + panic("wrong kse"); + } + if (ke->ke_thread != td) { + panic("wrong thread"); + } + } + + if ((p->p_flag & P_KSES) == 0) { + if (ke == NULL) { + panic("non KSE thread lost kse"); + } + } else { + prevpri = 0; + saw_lastassigned = 0; + unassigned = 0; + assigned = 0; + TAILQ_FOREACH(td2, &kg->kg_runq, td_runq) { + if (td2->td_priority < prevpri) { + panic("thread runqueue unosorted"); + } + prevpri = td2->td_priority; + if (td2->td_kse) { + assigned++; + if (unassigned) { + panic("unassigned before assigned"); + } + if (kg->kg_last_assigned == NULL) { + panic("lastassigned corrupt"); + } + if (saw_lastassigned) { + panic("last assigned not last"); + } + if (td2->td_kse->ke_thread != td2) { + panic("mismatched kse/thread"); + } + } else { + unassigned++; + } + if (td2 == kg->kg_last_assigned) { + saw_lastassigned = 1; + if (td2->td_kse == NULL) { + panic("last assigned not assigned"); + } + } + } + if (kg->kg_last_assigned && (saw_lastassigned == 0)) { + panic("where on earth does lastassigned point?"); + } + FOREACH_THREAD_IN_GROUP(kg, td2) { + if (((td2->td_flags & TDF_UNBOUND) == 0) && + (td2->td_state == TDS_RUNQ)) { + assigned++; + if (td2->td_kse == NULL) { + panic ("BOUND thread with no KSE"); + } + } + } +#if 0 + if ((unassigned + assigned) != kg->kg_runnable) { + panic("wrong number in runnable"); + } +#endif + } +} + ==== //depot/projects/kse/sys/kern/kern_synch.c#73 (text+ko) ==== @@ -345,7 +345,11 @@ td->td_state == TDS_RUNQ) { /* this could be optimised */ remrunqueue(td); + td->td_priority = + kg->kg_user_pri; setrunqueue(td); + } else { + td->td_priority = kg->kg_user_pri; } } } ==== //depot/projects/kse/sys/kern/kern_thread.c#79 (text+ko) ==== @@ -76,7 +76,7 @@ #define RANGEOF(type, start, end) (offsetof(type, end) - offsetof(type, start)) -tdlist_head_t zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads); +struct threadqueue zombie_threads = TAILQ_HEAD_INITIALIZER(zombie_threads); struct mtx zombie_thread_lock; MTX_SYSINIT(zombie_thread_lock, &zombie_thread_lock, "zombie_thread_lock", MTX_SPIN); ==== //depot/projects/kse/sys/posix4/ksched.c#10 (text+ko) ==== @@ -185,8 +185,12 @@ if (td->td_state == TDS_RUNNING) { td->td_kse->ke_flags |= KEF_NEEDRESCHED; } else if (td->td_state == TDS_RUNQ) { - remrunqueue(td); - setrunqueue(td); + if (td->td_priority > kg->kg_user_pri) { + remrunqueue(td); + td->td_priority = + kg->kg_user_pri; + setrunqueue(td); + } } } mtx_unlock_spin(&sched_lock); @@ -214,9 +218,14 @@ if (td->td_state == TDS_RUNNING) { td->td_kse->ke_flags |= KEF_NEEDRESCHED; } else if (td->td_state == TDS_RUNQ) { - remrunqueue(td); - setrunqueue(td); + if (td->td_priority > kg->kg_user_pri) { + remrunqueue(td); + td->td_priority = + kg->kg_user_pri; + setrunqueue(td); + } } + } mtx_unlock_spin(&sched_lock); } ==== //depot/projects/kse/sys/sys/proc.h#115 (text+ko) ==== @@ -186,7 +186,6 @@ * cache of free threads. */ struct thread; -typedef TAILQ_HEAD(threadlist_head, thread) tdlist_head_t; /* * The second structure is the Kernel Schedulable Entity. (KSE) @@ -857,6 +856,7 @@ int thread_suspend_check(int how); void thread_unsuspend(struct proc *p); +void thread_sanity_check(struct thread *td); #endif /* _KERNEL */ #endif /* !_SYS_PROC_H_ */ ==== //depot/projects/kse/sys/vm/vm_glue.c#33 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 25 9:15:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4052C37B401; Tue, 25 Jun 2002 09:15:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by hub.freebsd.org (Postfix) with ESMTP id 711DE37B404 for ; Tue, 25 Jun 2002 09:15:19 -0700 (PDT) Received: (qmail 14838 invoked from network); 25 Jun 2002 15:11:03 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 25 Jun 2002 15:11:04 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g5PFB2b38555; Tue, 25 Jun 2002 11:11:02 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200206180725.g5I7PCQ51323@freefall.freebsd.org> Date: Tue, 25 Jun 2002 11:11:05 -0400 (EDT) From: John Baldwin To: Julian Elischer Subject: RE: PERFORCE change 13103 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 18-Jun-2002 Julian Elischer wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13103 > > Change 13103 by julian@julian_ref on 2002/06/18 00:24:27 > > Start cleaning up the mess I made when I changed APIs. > still doesn't quite work, but I've tracked down a lot of brainos > including a couple I haven't fixed yet. > > Affected files ... > > ... //depot/projects/kse/sys/alpha/alpha/trap.c#26 edit > ... //depot/projects/kse/sys/i386/i386/swtch.s#34 edit > ... //depot/projects/kse/sys/i386/i386/trap.c#51 edit > ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#57 edit > ... //depot/projects/kse/sys/kern/init_main.c#42 edit > ... //depot/projects/kse/sys/kern/kern_exit.c#54 edit > ... //depot/projects/kse/sys/kern/kern_fork.c#70 edit > ... //depot/projects/kse/sys/kern/kern_proc.c#70 edit > ... //depot/projects/kse/sys/kern/kern_thread.c#70 edit > ... //depot/projects/kse/sys/sparc64/sparc64/trap.c#30 edit > > Differences ... > > ==== //depot/projects/kse/sys/alpha/alpha/trap.c#26 (text+ko) ==== > > @@ -301,6 +301,7 @@ > if (td->td_ucred != p->p_ucred) > cred_update_thread(td); > if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { > + mtx_lock_spin(&sched_lock); > PROC_LOCK(p); > thread_exit(); > /* NOTREACHED */ Can't do this. (Acquire spin lock before a sleep mutex.) > * First check that we shouldn't just abort. > - * But check if the are the single thread first! > + * But check if we are the single thread first! > */ > if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { > + mtx_lock_spin(&sched_lock); > PROC_LOCK(p); > thread_exit(); > /* NOTREACHED */ Same here. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 25 11:38:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBD6C37B40B; Tue, 25 Jun 2002 11:38:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5792E37B409 for ; Tue, 25 Jun 2002 11:37:55 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5PIbtl70845 for perforce@freebsd.org; Tue, 25 Jun 2002 11:37:55 -0700 (PDT) (envelope-from cvance@tislabs.com) Date: Tue, 25 Jun 2002 11:37:55 -0700 (PDT) Message-Id: <200206251837.g5PIbtl70845@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 13423 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13423 Change 13423 by cvance@cvance_korben on 2002/06/25 11:37:01 Update makefiles (remove duplicate) to install SEBSD default policy into /usr/share/security/sebsd Affected files ... ... //depot/projects/trustedbsd/mac/etc/Makefile#14 edit ... //depot/projects/trustedbsd/mac/share/sebsd/Makefile#2 delete ... //depot/projects/trustedbsd/mac/share/security/sebsd/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/Makefile#14 (text+ko) ==== @@ -100,8 +100,8 @@ ${DESTDIR}/etc/ssl ) .endif .if exists(${.CURDIR}/../contrib/sebsd) - (cd ${.CURDIR}/../contrib/sebsd/policy; \ - /sbin/sebsd_checkpolicy -o ${DESTDIR}/etc/security/sebsd/ss_policy) + (cd ${.CURDIR}/../contrib/sebsd/policy; cpio -p -R${BINOWN}:${BINGRP} ${DESTDIR}/etc/security/sebsd/policy < files.lst) + (cd ${DESTDIR}/etc/security/sebsd/policy; ${MAKE} install) .endif .if !defined(NO_MAKEDEV_INSTALL) ( cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \ ==== //depot/projects/trustedbsd/mac/share/security/sebsd/Makefile#3 (text+ko) ==== @@ -1,10 +1,17 @@ # $FreeBSD$ # Install SEBSD example policy files. -FILES= policy/policy.conf policy/README -NOOBJ= noobj -FILESDIR= /usr/share/security/sebsd +NOMAN = noman +NOOBJ = noobj + +SRCDIR = ${.CURDIR}/../../../contrib/sebsd/policy +DSTDIR = ${DESTDIR}/usr/share/security/sebsd/policy + +all: + echo ${DSTDIR} + +install: + cd ${SRCDIR}; cpio -p -R${BINOWN}:${BINGRP} ${DSTDIR} < files.lst -.PATH: ${.CURDIR}/../../../contrib/sebsd .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 25 15:23:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1D9B37B407; Tue, 25 Jun 2002 15:23:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 94C8B37B405 for ; Tue, 25 Jun 2002 15:23:29 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5PMNTN12416 for perforce@freebsd.org; Tue, 25 Jun 2002 15:23:29 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Tue, 25 Jun 2002 15:23:29 -0700 (PDT) Message-Id: <200206252223.g5PMNTN12416@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13429 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13429 Change 13429 by julian@julian_ref on 2002/06/25 15:23:13 Fix STUPID bug in run queue addition code. Affected files ... ... //depot/projects/kse/sys/kern/kern_switch.c#61 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_switch.c#61 (text+ko) ==== @@ -305,6 +305,7 @@ struct kse *ke; struct ksegrp *kg; struct thread *td2; + struct thread *tda; CTR1(KTR_RUNQ, "setrunqueue: td%p", td); mtx_assert(&sched_lock, MA_OWNED); @@ -328,6 +329,7 @@ * Ok, so we are threading with this thread. * We don't have a KSE, see if we can get one.. */ + tda = kg->kg_last_assigned; if ((ke = td->td_kse) == NULL) { /* * We will need a KSE, see if there is one.. @@ -344,27 +346,24 @@ TAILQ_REMOVE(&kg->kg_iq, ke, ke_kgrlist); ke->ke_state = KES_UNQUEUED; kg->kg_idle_kses--; - ke->ke_thread = td; - td->td_kse = ke; KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self4!")); - } else if ((kg->kg_last_assigned) && - (kg->kg_last_assigned->td_priority > td->td_priority)) { + } else if (tda && (tda->td_priority > td->td_priority)) { /* * None free, but there is one we can commandeer. */ - td2 = kg->kg_last_assigned; - kg->kg_last_assigned = - TAILQ_PREV(td2, threadqueue, td_runq); - ke = td2->td_kse; + ke = tda->td_kse; + tda->td_kse = NULL; + ke->ke_thread = NULL; + tda = kg->kg_last_assigned = + TAILQ_PREV(tda, threadqueue, td_runq); runq_remove(&runq, ke); - ke->ke_thread = td; - td2->td_kse = NULL; - td->td_kse = ke; KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self5!")); } } else { KASSERT(ke->ke_thread == td, ("KSE/thread mismatch")); KASSERT(ke->ke_state != KES_IDLE, ("KSE unexpectedly idle")); + ke->ke_thread = NULL; + td->td_kse = NULL; } /* @@ -387,9 +386,34 @@ * If needed, readjust the last_assigned pointer. */ if (ke) { - if (kg->kg_last_assigned == - TAILQ_PREV(td, threadqueue, td_runq)) { - kg->kg_last_assigned = td; + if (tda == NULL) { + /* + * No pre-existing last assigned so whoever is first + * gets the KSE we borught in.. (may be us) + */ + td2 = TAILQ_FIRST(&kg->kg_runq); + KASSERT((td2->td_kse == NULL), + ("unexpected ke present")); + td2->td_kse = ke; + ke->ke_thread = td2; + kg->kg_last_assigned = td2; + } else if (tda->td_priority > td->td_priority) { + /* + * It's ours, grab it, but last_assigned is past us + * so don't change it. + */ + td->td_kse = ke; + ke->ke_thread = td; + } else { + /* + * We are past last_assigned, so + * put the new kse on whatever is next, + * which may or may not be us. + */ + td2 = TAILQ_NEXT(tda, td_runq); + kg->kg_last_assigned = td2; + td2->td_kse = ke; + ke->ke_thread = td2; } runq_add(&runq, ke); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jun 25 15:37:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68B3837B400; Tue, 25 Jun 2002 15:35:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4EB3237B401 for ; Tue, 25 Jun 2002 15:35:46 -0700 (PDT) Received: (from perforce@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5PMZi113407 for perforce@freebsd.org; Tue, 25 Jun 2002 15:35:44 -0700 (PDT) (envelope-from julian@freebsd.org) Date: Tue, 25 Jun 2002 15:35:44 -0700 (PDT) Message-Id: <200206252235.g5PMZi113407@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13430 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13430 Change 13430 by julian@julian_ref on 2002/06/25 15:35:17 MFC Affected files ... ... //depot/projects/kse/sys/alpha/alpha/trap.c#27 integrate ... //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#26 integrate ... //depot/projects/kse/sys/ddb/db_examine.c#3 integrate ... //depot/projects/kse/sys/ddb/db_expr.c#3 integrate ... //depot/projects/kse/sys/dev/bge/if_bge.c#10 integrate ... //depot/projects/kse/sys/dev/bge/if_bgereg.h#5 integrate ... //depot/projects/kse/sys/dev/md/md.c#22 integrate ... //depot/projects/kse/sys/dev/sound/pci/maestro3.c#6 integrate ... //depot/projects/kse/sys/dev/wi/wi_hostap.c#4 integrate ... //depot/projects/kse/sys/i386/i386/machdep.c#48 integrate ... //depot/projects/kse/sys/i386/i386/pmap.c#38 integrate ... //depot/projects/kse/sys/i386/i386/trap.c#54 integrate ... //depot/projects/kse/sys/i386/i386/vm_machdep.c#59 integrate ... //depot/projects/kse/sys/ia64/ia64/pmap.c#26 integrate ... //depot/projects/kse/sys/ia64/ia64/trap.c#23 integrate ... //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#19 integrate ... //depot/projects/kse/sys/kern/kern_exec.c#30 integrate ... //depot/projects/kse/sys/kern/kern_exit.c#56 integrate ... //depot/projects/kse/sys/kern/kern_fork.c#73 integrate ... //depot/projects/kse/sys/kern/kern_prot.c#29 integrate ... //depot/projects/kse/sys/kern/md5c.c#2 integrate ... //depot/projects/kse/sys/kern/subr_trap.c#71 integrate ... //depot/projects/kse/sys/kern/vfs_syscalls.c#29 integrate ... //depot/projects/kse/sys/kern/vfs_vnops.c#27 integrate ... //depot/projects/kse/sys/netatm/port.h#4 integrate ... //depot/projects/kse/sys/netinet/tcp_input.c#23 integrate ... //depot/projects/kse/sys/pc98/i386/machdep.c#28 integrate ... //depot/projects/kse/sys/pc98/pc98/clock.c#8 integrate ... //depot/projects/kse/sys/pc98/pc98/sio.c#17 integrate ... //depot/projects/kse/sys/powerpc/powerpc/trap.c#15 integrate ... //depot/projects/kse/sys/powerpc/powerpc/vm_machdep.c#12 integrate ... //depot/projects/kse/sys/sparc64/include/pmap.h#14 integrate ... //depot/projects/kse/sys/sparc64/sparc64/bus_machdep.c#6 integrate ... //depot/projects/kse/sys/sparc64/sparc64/pmap.c#31 integrate ... //depot/projects/kse/sys/sparc64/sparc64/trap.c#31 integrate ... //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#25 integrate ... //depot/projects/kse/sys/sys/md5.h#3 integrate ... //depot/projects/kse/sys/sys/proc.h#116 integrate ... //depot/projects/kse/sys/sys/snoop.h#2 integrate ... //depot/projects/kse/sys/sys/ucred.h#12 integrate ... //depot/projects/kse/sys/ufs/ffs/ffs_softdep_stub.c#6 integrate ... //depot/projects/kse/sys/ufs/ufs/ufs_inode.c#8 integrate ... //depot/projects/kse/sys/vm/device_pager.c#5 integrate ... //depot/projects/kse/sys/vm/uma_core.c#11 integrate ... //depot/projects/kse/sys/vm/vm_map.h#15 integrate ... //depot/projects/kse/sys/vm/vm_object.c#12 integrate ... //depot/projects/kse/sys/vm/vm_object.h#6 integrate ... //depot/projects/kse/sys/vm/vm_page.c#12 integrate ... //depot/projects/kse/sys/vm/vm_page.h#8 integrate Differences ... ==== //depot/projects/kse/sys/alpha/alpha/trap.c#27 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.94 2002/06/07 05:47:34 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.95 2002/06/24 06:21:52 mini Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* ==== //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#26 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.66 2002/04/05 00:52:15 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.67 2002/06/24 15:48:00 jake Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -247,6 +247,12 @@ } void +cpu_sched_exit(td) + register struct thread *td; +{ +} + +void cpu_thread_exit(struct thread *td) { ==== //depot/projects/kse/sys/ddb/db_examine.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/ddb/db_examine.c,v 1.28 2002/03/20 05:14:28 alfred Exp $ + * $FreeBSD: src/sys/ddb/db_examine.c,v 1.29 2002/06/25 15:59:24 tmm Exp $ */ /* @@ -83,26 +83,22 @@ while (--count >= 0) { fp = fmt; size = 4; - width = 16; while ((c = *fp++) != 0) { switch (c) { case 'b': size = 1; - width = 4; break; case 'h': size = 2; - width = 8; break; case 'l': size = 4; - width = 16; break; case 'g': size = 8; - width = 32; break; case 'a': /* address */ + size = sizeof(void *); /* always forces a new line */ if (db_print_position() != 0) db_printf("\n"); @@ -118,6 +114,7 @@ db_prev = addr; } + width = size * 4; switch (c) { case 'r': /* signed, current radix */ value = db_get_value(addr, size, TRUE); ==== //depot/projects/kse/sys/ddb/db_expr.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/ddb/db_expr.c,v 1.14 2002/03/20 05:14:28 alfred Exp $ + * $FreeBSD: src/sys/ddb/db_expr.c,v 1.15 2002/06/25 15:59:24 tmm Exp $ */ /* @@ -119,7 +119,7 @@ db_error("Syntax error\n"); /*NOTREACHED*/ } - *valuep = db_get_value((db_addr_t)*valuep, sizeof(int), FALSE); + *valuep = db_get_value((db_addr_t)*valuep, sizeof(void *), FALSE); return (TRUE); } db_unread_token(t); ==== //depot/projects/kse/sys/dev/bge/if_bge.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.13 2002/04/28 20:34:17 phk Exp $ + * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.15 2002/06/24 22:28:42 mp Exp $ */ /* @@ -122,7 +122,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.13 2002/04/28 20:34:17 phk Exp $"; + "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.15 2002/06/24 22:28:42 mp Exp $"; #endif /* @@ -725,7 +725,8 @@ m_new->m_data = m_new->m_ext.ext_buf; } - m_adj(m_new, ETHER_ALIGN); + if (!sc->bge_rx_alignment_bug) + m_adj(m_new, ETHER_ALIGN); sc->bge_cdata.bge_rx_std_chain[i] = m_new; r = &sc->bge_rdata->bge_rx_std_ring[i]; BGE_HOSTADDR(r->bge_addr) = vtophys(mtod(m_new, caddr_t)); @@ -778,7 +779,8 @@ m_new->m_ext.ext_size = BGE_JUMBO_FRAMELEN; } - m_adj(m_new, ETHER_ALIGN); + if (!sc->bge_rx_alignment_bug) + m_adj(m_new, ETHER_ALIGN); /* Set up the descriptor. */ r = &sc->bge_rdata->bge_rx_jumbo_ring[i]; sc->bge_cdata.bge_rx_jumbo_chain[i] = m_new; @@ -1674,6 +1676,27 @@ } /* + * When using the BCM5701 in PCI-X mode, data corruption has + * been observed in the first few bytes of some received packets. + * Aligning the packet buffer in memory eliminates the corruption. + * Unfortunately, this misaligns the packet payloads. On platforms + * which do not support unaligned accesses, we will realign the + * payloads by copying the received packets. + */ + switch (sc->bge_asicrev) { + case BGE_ASICREV_BCM5701_A0: + case BGE_ASICREV_BCM5701_B0: + case BGE_ASICREV_BCM5701_B2: + case BGE_ASICREV_BCM5701_B5: + /* If in PCI-X mode, work around the alignment bug. */ + if ((pci_read_config(dev, BGE_PCI_PCISTATE, 4) & + (BGE_PCISTATE_PCI_BUSMODE | BGE_PCISTATE_PCI_BUSSPEED)) == + BGE_PCISTATE_PCI_BUSSPEED) + sc->bge_rx_alignment_bug = 1; + break; + } + + /* * Call MI attach routine. */ ether_ifattach(ifp, ETHER_BPF_SUPPORTED); @@ -1905,6 +1928,17 @@ } ifp->if_ipackets++; +#ifndef __i386__ + /* + * The i386 allows unaligned accesses, but for other + * platforms we must make sure the payload is aligned. + */ + if (sc->bge_rx_alignment_bug) { + bcopy(m->m_data, m->m_data + ETHER_ALIGN, + cur_rx->bge_len); + m->m_data += ETHER_ALIGN; + } +#endif eh = mtod(m, struct ether_header *); m->m_pkthdr.len = m->m_len = cur_rx->bge_len; m->m_pkthdr.rcvif = ifp; @@ -2355,8 +2389,10 @@ ifp = &sc->arpcom.ac_if; - if (ifp->if_flags & IFF_RUNNING) + if (ifp->if_flags & IFF_RUNNING) { + splx(s); return; + } /* Cancel pending I/O and flush buffers. */ bge_stop(sc); ==== //depot/projects/kse/sys/dev/bge/if_bgereg.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.4 2002/04/04 06:01:31 wpaul Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.5 2002/06/24 22:04:15 jdp Exp $ */ /* @@ -2131,6 +2131,7 @@ u_int8_t bge_unit; /* interface number */ u_int8_t bge_extram; /* has external SSRAM */ u_int8_t bge_tbi; + u_int8_t bge_rx_alignment_bug; u_int32_t bge_asicrev; struct bge_ring_data *bge_rdata; /* rings */ struct bge_chain_data bge_cdata; /* mbufs */ ==== //depot/projects/kse/sys/dev/md/md.c#22 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/dev/md/md.c,v 1.65 2002/06/15 19:18:43 phk Exp $ + * $FreeBSD: src/sys/dev/md/md.c,v 1.66 2002/06/24 12:07:02 mux Exp $ * */ @@ -76,6 +76,7 @@ #include #include #include +#include #include #include @@ -279,7 +280,7 @@ uintptr_t up; if (md_debug > 1) - printf("s_read(%lld)\n", offset); + printf("s_read(%jd)\n", (intmax_t)offset); up = 0; for (cip = ip; cip != NULL;) { if (cip->shift) { @@ -306,7 +307,7 @@ uintptr_t up; if (md_debug > 1) - printf("s_write(%lld, %p)\n", offset, (void *)ptr); + printf("s_write(%jd, %p)\n", (intmax_t)offset, (void *)ptr); up = 0; li = 0; cip = ip; ==== //depot/projects/kse/sys/dev/sound/pci/maestro3.c#6 (text+ko) ==== @@ -61,7 +61,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro3.c,v 1.13 2002/01/27 23:09:41 scottl Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro3.c,v 1.14 2002/06/24 15:28:47 robert Exp $"); /* -------------------------------------------------------------------- */ @@ -1172,6 +1172,8 @@ goto bad; } + m3_enable_ints(sc); + if (pcm_register(dev, sc, M3_PCHANS, M3_RCHANS)) { device_printf(dev, "pcm_register error\n"); goto bad; @@ -1321,8 +1323,6 @@ /* [m3_assp_continue] */ m3_wr_1(sc, DSP_PORT_CONTROL_REG_B, reset_state | REGB_ENABLE_RESET); - m3_enable_ints(sc); - m3_amp_enable(sc); if (mixer_reinit(dev) == -1) { ==== //depot/projects/kse/sys/dev/wi/wi_hostap.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/wi/wi_hostap.c,v 1.14 2002/05/25 11:18:03 bde Exp $ + * $FreeBSD: src/sys/dev/wi/wi_hostap.c,v 1.15 2002/06/24 07:50:41 imp Exp $ */ /* This is experimental Host AP software for Prism 2 802.11b interfaces. @@ -693,6 +693,17 @@ /* Pull out request parameters. */ capinfo = take_hword(&pkt, &len); lstintvl = take_hword(&pkt, &len); + + if ((rxfrm->wi_frame_ctl & htole16(WI_FCTL_STYPE)) == + htole16(WI_STYPE_MGMT_REASREQ)) { + if (len < 6) + return; + /* Eat the MAC address of the current AP */ + take_hword(&pkt, &len); + take_hword(&pkt, &len); + take_hword(&pkt, &len); + } + if ((ssid_len = take_tlv(&pkt, &len, IEEE80211_ELEMID_SSID, ssid, sizeof(ssid) - 1))<0) return; @@ -701,13 +712,6 @@ rates, sizeof(rates)))<0) return; - if ((rxfrm->wi_frame_ctl & htole16(WI_FCTL_STYPE)) == - htole16(WI_STYPE_MGMT_REASREQ)) { - /* Reassociation Request-- * Current AP. (Ignore?) */ - if (len < 6) - return; - } - if (sc->arpcom.ac_if.if_flags & IFF_DEBUG) printf("wihap_assoc_req: from station %6D\n", rxfrm->wi_addr2, ":"); ==== //depot/projects/kse/sys/i386/i386/machdep.c#48 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.519 2002/05/13 11:53:40 bde Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.520 2002/06/24 21:31:57 peter Exp $ */ #include "opt_atalk.h" @@ -780,7 +780,11 @@ * the !SMP case, as there is no clean way to ensure that a CPU will be * woken when there is work available for it. */ +#ifdef SMP +static int cpu_idle_hlt = 0; +#else static int cpu_idle_hlt = 1; +#endif SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, &cpu_idle_hlt, 0, "Idle loop HLT enable"); @@ -793,7 +797,6 @@ void cpu_idle(void) { -#ifndef SMP if (cpu_idle_hlt) { disable_intr(); if (kserunnable()) { @@ -807,7 +810,6 @@ __asm __volatile("sti; hlt"); } } -#endif } /* ==== //depot/projects/kse/sys/i386/i386/pmap.c#38 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.323 2002/06/17 22:02:41 jeff Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.324 2002/06/25 22:14:06 iedowse Exp $ */ /* @@ -2499,14 +2499,10 @@ ((objpgs > 0) && (p != NULL)); p = TAILQ_NEXT(p, listq)) { - tmpidx = p->pindex; - if (tmpidx < pindex) { + if (p->pindex < pindex || p->pindex - pindex > psize) { continue; } - tmpidx -= pindex; - if (tmpidx >= psize) { - continue; - } + tmpidx = p->pindex - pindex; /* * don't allow an madvise to blow away our really * free pages allocating pv entries. ==== //depot/projects/kse/sys/i386/i386/trap.c#54 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.225 2002/06/12 13:30:52 bde Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.227 2002/06/24 06:23:41 mini Exp $ */ /* ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#59 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.187 2002/03/27 05:39:19 dillon Exp $ + * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.188 2002/06/24 15:48:00 jake Exp $ */ #include "opt_npx.h" @@ -293,6 +293,12 @@ } void +cpu_sched_exit(td) + register struct thread *td; +{ +} + +void cpu_thread_setup(struct thread *td) { ==== //depot/projects/kse/sys/ia64/ia64/pmap.c#26 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.63 2002/06/20 06:25:22 peter Exp $ + * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.64 2002/06/24 18:31:49 dfr Exp $ */ /* @@ -522,12 +522,12 @@ if (initial_pvs < MINPV) initial_pvs = MINPV; pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); uma_zone_set_allocf(pvzone, pmap_allocf); uma_prealloc(pvzone, initial_pvs); ptezone = uma_zcreate("PT ENTRY", sizeof (struct ia64_lpte), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); uma_zone_set_allocf(ptezone, pmap_allocf); uma_prealloc(ptezone, initial_pvs); ==== //depot/projects/kse/sys/ia64/ia64/trap.c#23 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.57 2002/06/20 06:47:44 peter Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.58 2002/06/24 06:21:57 mini Exp $ */ /* From: src/sys/alpha/alpha/trap.c,v 1.33 */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ ==== //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#19 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.40 2002/05/05 08:16:10 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.41 2002/06/24 15:48:00 jake Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -314,6 +314,12 @@ } void +cpu_sched_exit(td) + register struct thread *td; +{ +} + +void cpu_wait(p) struct proc *p; { ==== //depot/projects/kse/sys/kern/kern_exec.c#30 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_exec.c,v 1.166 2002/06/20 17:27:28 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_exec.c,v 1.167 2002/06/25 18:14:38 alc Exp $ */ #include @@ -275,7 +275,6 @@ * Copy out strings (args and env) and initialize stack base */ stack_base = exec_copyout_strings(imgp); - p->p_vmspace->vm_minsaddr = (char *)stack_base; /* * If custom stack fixup routine present for this process ==== //depot/projects/kse/sys/kern/kern_exit.c#56 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 - * $FreeBSD: src/sys/kern/kern_exit.c,v 1.167 2002/06/07 05:41:27 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_exit.c,v 1.168 2002/06/24 15:48:01 jake Exp $ */ #include "opt_compat.h" @@ -505,6 +505,8 @@ cnt.v_swtch++; binuptime(PCPU_PTR(switchtime)); PCPU_SET(switchticks, ticks); + + cpu_sched_exit(td); /* XXXKSE check if this should be in thread_exit */ /* * Make sure this thread is discarded from the zombie. * This will also release this thread's reference to the ucred. ==== //depot/projects/kse/sys/kern/kern_fork.c#73 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_fork.c 8.6 (Berkeley) 4/8/94 - * $FreeBSD: src/sys/kern/kern_fork.c,v 1.149 2002/06/07 05:42:25 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_fork.c,v 1.150 2002/06/24 06:21:57 mini Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/kse/sys/kern/kern_prot.c#29 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_prot.c,v 1.158 2002/06/19 06:39:25 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_prot.c,v 1.159 2002/06/24 06:21:57 mini Exp $ */ /* ==== //depot/projects/kse/sys/kern/md5c.c#2 (text+ko) ==== @@ -22,12 +22,16 @@ * These notices must be retained in any copies of any part of this * documentation and/or software. * - * $FreeBSD: src/sys/kern/md5c.c,v 1.18 2000/09/29 13:34:40 dfr Exp $ - * * This code is the same as the code published by RSA Inc. It has been * edited for clarity and style only. */ +/* + * This file should be kept in sync with src/lib/libmd/md5c.c + */ +#include +__FBSDID("$FreeBSD: src/sys/kern/md5c.c,v 1.19 2002/06/24 14:15:25 mux Exp $"); + #include #ifdef _KERNEL @@ -36,39 +40,35 @@ #include #endif +#include +#include #include +static void MD5Transform(u_int32_t [4], const unsigned char [64]); #ifdef _KERNEL #define memset(x,y,z) bzero(x,z); #define memcpy(x,y,z) bcopy(y, x, z) #endif -#if defined(__i386__) || defined(__alpha__) || defined(__ia64__) +#if (BYTE_ORDER == LITTLE_ENDIAN) #define Encode memcpy #define Decode memcpy -#else /* __i386__ */ +#else /* * Encodes input (u_int32_t) into output (unsigned char). Assumes len is * a multiple of 4. */ -/* XXX not prototyped, and not compatible with memcpy(). */ static void -Encode (output, input, len) - unsigned char *output; - u_int32_t *input; - unsigned int len; +Encode (unsigned char *output, u_int32_t *input, unsigned int len) { - unsigned int i, j; + unsigned int i; + u_int32_t *op = (u_int32_t *)output; - for (i = 0, j = 0; j < len; i++, j += 4) { - output[j] = (unsigned char)(input[i] & 0xff); - output[j+1] = (unsigned char)((input[i] >> 8) & 0xff); - output[j+2] = (unsigned char)((input[i] >> 16) & 0xff); - output[j+3] = (unsigned char)((input[i] >> 24) & 0xff); - } + for (i = 0; i < len / 4; i++) + op[i] = htole32(input[i]); } /* @@ -77,18 +77,15 @@ */ static void -Decode (output, input, len) - u_int32_t *output; - const unsigned char *input; - unsigned int len; +Decode (u_int32_t *output, const unsigned char *input, unsigned int len) { - unsigned int i, j; + unsigned int i; + const u_int32_t *ip = (const u_int32_t *)input; - for (i = 0, j = 0; j < len; i++, j += 4) - output[i] = ((u_int32_t)input[j]) | (((u_int32_t)input[j+1]) << 8) | - (((u_int32_t)input[j+2]) << 16) | (((u_int32_t)input[j+3]) << 24); + for (i = 0; i < len / 4; i++) + output[i] = le32toh(ip[i]); } -#endif /* i386 */ +#endif static unsigned char PADDING[64] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -235,7 +232,7 @@ /* MD5 basic transformation. Transforms state based on block. */ -void +static void MD5Transform (state, block) u_int32_t state[4]; const unsigned char block[64]; ==== //depot/projects/kse/sys/kern/subr_trap.c#71 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/kern/subr_trap.c,v 1.217 2002/06/07 05:43:40 jhb Exp $ + * $FreeBSD: src/sys/kern/subr_trap.c,v 1.218 2002/06/24 06:21:57 mini Exp $ */ #ifdef __i386__ ==== //depot/projects/kse/sys/kern/vfs_syscalls.c#29 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.262 2002/06/22 22:01:13 mckusick Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.263 2002/06/24 07:14:44 mckusick Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -2596,7 +2596,7 @@ struct stat *sb; struct nstat *nsb; { - bzero(nsb, sizeof nsb); + bzero(nsb, sizeof *nsb); nsb->st_dev = sb->st_dev; nsb->st_ino = sb->st_ino; nsb->st_mode = sb->st_mode; ==== //depot/projects/kse/sys/kern/vfs_vnops.c#27 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.148 2002/06/22 22:01:13 mckusick Exp $ + * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.149 2002/06/24 07:14:44 mckusick Exp $ */ #include @@ -562,7 +562,7 @@ /* * Zero the spare stat fields */ - bzero(sb, sizeof sb); + bzero(sb, sizeof *sb); /* * Copy from vattr table ==== //depot/projects/kse/sys/netatm/port.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/netatm/port.h,v 1.9 2002/04/21 01:41:04 arr Exp $ + * @(#) $FreeBSD: src/sys/netatm/port.h,v 1.10 2002/06/24 22:31:17 arr Exp $ * */ @@ -38,22 +38,6 @@ #ifndef _NETATM_PORT_H #define _NETATM_PORT_H -/* - * User-space memory management - * - * UM_ALLOC(size) Returns an allocated kernel memory chunk of size bytes. - * UM_FREE(addr) Free a kernel memory chunk of size bytes. - * UM_COPY(from, to, len) - * Copies len bytes of data from from to to. - * UM_ZERO(addr, len) Zeros len bytes of data from addr. - * - */ -#define UM_ALLOC(size) malloc((size_t)(size)) -#define UM_FREE(addr) free((void *)(addr)) -#define UM_COPY(from, to, len) bcopy((void *)(from), (void *)(to),\ - (size_t)(len)) -#define UM_ZERO(addr, len) bzero((void *)(addr), (size_t)(len)) - #ifdef _KERNEL /* @@ -267,7 +251,7 @@ & ~(sizeof(long) - 1)); \ } #define KB_HEADROOM(bfr, n) { \ - /* n = M_LEADINGSPACE(bfr) XXX */ \ + /* N = m_leadingspace(BFR) XXX */ \ (n) = ((bfr)->m_flags & M_EXT ? (bfr)->m_data - (bfr)->m_ext.ext_buf : \ (bfr)->m_flags & M_PKTHDR ? (bfr)->m_data - (bfr)->m_pktdat : \ (bfr)->m_data - (bfr)->m_dat); \ ==== //depot/projects/kse/sys/netinet/tcp_input.c#23 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.162 2002/06/23 21:22:56 luigi Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.164 2002/06/24 22:25:00 hsu Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -2187,7 +2187,7 @@ &tcp_savetcp, 0); #endif if (headlocked) - INP_INFO_WUNLOCK(&tcbinfo); + INP_INFO_WUNLOCK(&tcbinfo); m_freem(m); tp->t_flags |= TF_ACKNOW; (void) tcp_output(tp); @@ -2216,8 +2216,6 @@ goto drop; /* IPv6 anycast check is done at tcp6_input() */ - if (tp) - INP_UNLOCK(inp); /* * Perform bandwidth limiting. */ @@ -2229,6 +2227,10 @@ tcp_trace(TA_DROP, ostate, tp, (void *)tcp_saveipgen, &tcp_savetcp, 0); #endif + + if (tp) + INP_UNLOCK(inp); + if (thflags & TH_ACK) /* mtod() below is safe as long as hdr dropping is delayed */ tcp_respond(tp, mtod(m, void *), th, m, (tcp_seq)0, th->th_ack, @@ -2241,7 +2243,7 @@ (tcp_seq)0, TH_RST|TH_ACK); } if (headlocked) - INP_INFO_WUNLOCK(&tcbinfo); + INP_INFO_WUNLOCK(&tcbinfo); return; drop: @@ -2254,10 +2256,10 @@ &tcp_savetcp, 0); #endif if (tp) - INP_UNLOCK(inp); + INP_UNLOCK(inp); m_freem(m); if (headlocked) - INP_INFO_WUNLOCK(&tcbinfo); + INP_INFO_WUNLOCK(&tcbinfo); return; } ==== //depot/projects/kse/sys/pc98/i386/machdep.c#28 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/pc98/i386/machdep.c,v 1.280 2002/05/14 12:31:47 nyan Exp $ + * $FreeBSD: src/sys/pc98/i386/machdep.c,v 1.281 2002/06/25 09:10:38 kato Exp $ */ #include "opt_atalk.h" @@ -800,7 +800,11 @@ * the !SMP case, as there is no clean way to ensure that a CPU will be * woken when there is work available for it. */ +#ifdef SMP +static int cpu_idle_hlt = 0; +#else static int cpu_idle_hlt = 1; +#endif SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, &cpu_idle_hlt, 0, "Idle loop HLT enable"); @@ -813,7 +817,6 @@ void cpu_idle(void) { -#ifndef SMP if (cpu_idle_hlt) { disable_intr(); if (procrunnable()) { @@ -827,7 +830,6 @@ __asm __volatile("sti; hlt"); } } -#endif } /* ==== //depot/projects/kse/sys/pc98/pc98/clock.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/pc98/pc98/clock.c,v 1.113 2002/04/30 19:34:31 phk Exp $ + * $FreeBSD: src/sys/pc98/pc98/clock.c,v 1.114 2002/06/24 08:04:47 kato Exp $ */ /* @@ -1553,7 +1553,7 @@ } SYSCTL_PROC(_machdep, OID_AUTO, i8254_freq, CTLTYPE_INT | CTLFLAG_RW, - 0, sizeof(u_int), sysctl_machdep_i8254_freq, "I", ""); + 0, sizeof(u_int), sysctl_machdep_i8254_freq, "IU", ""); static int sysctl_machdep_tsc_freq(SYSCTL_HANDLER_ARGS) @@ -1573,7 +1573,7 @@ } SYSCTL_PROC(_machdep, OID_AUTO, tsc_freq, CTLTYPE_INT | CTLFLAG_RW, - 0, sizeof(u_int), sysctl_machdep_tsc_freq, "I", ""); + 0, sizeof(u_int), sysctl_machdep_tsc_freq, "IU", ""); static unsigned i8254_get_timecount(struct timecounter *tc) ==== //depot/projects/kse/sys/pc98/pc98/sio.c#17 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.174 2002/06/19 13:20:20 nyan Exp $ + * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.175 2002/06/24 15:24:42 nyan Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -4270,11 +4270,13 @@ u_char cfcr; u_int divisor; struct siocnstate sp; + int unit = 0; /* XXX random value! */ siocniobase = port; + siocnunit = unit; comdefaultrate = speed; sio_consdev.cn_pri = CN_NORMAL; - sio_consdev.cn_dev = makedev(CDEV_MAJOR, 0); + sio_consdev.cn_dev = makedev(CDEV_MAJOR, unit); s = spltty(); @@ -4310,7 +4312,7 @@ u_char cfcr; u_int divisor; struct siocnstate sp; - int unit = 1; /* XXX !!! */ + int unit = 1; /* XXX random value! */ siogdbiobase = port; gdbdefaultrate = speed; @@ -4448,7 +4450,7 @@ int s; struct siocnstate sp; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 26 6:34:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F05D237B407; Wed, 26 Jun 2002 06:34:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0230137B42B for ; Wed, 26 Jun 2002 06:34:03 -0700 (PDT) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5QDY2JU065999 for ; Wed, 26 Jun 2002 06:34:02 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5QDY2K5065996 for perforce@freebsd.org; Wed, 26 Jun 2002 06:34:02 -0700 (PDT) Date: Wed, 26 Jun 2002 06:34:02 -0700 (PDT) Message-Id: <200206261334.g5QDY2K5065996@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 13446 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13446 Change 13446 by green@green_laptop_2 on 2002/06/26 06:33:34 Unfix unbotched integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/Makefile#5 (text+ko) ==== @@ -8,6 +8,31 @@ SUBDIR+=modules .endif +.for arch in alpha ia64 powerpc sparc64 +.if ${MACHINE_ARCH} != "${arch}" +SKIPARCHS+= ${arch} +.endif +.endfor +.if ${MACHINE_ARCH} == "i386" +SKIPARCHS+= pc98 +.elif ${MACHINE_ARCH} == "pc98" +.else +SKIPARCHS+= i386 +SKIPARCHS+= pc98 +.endif +SKIPPATTERN:=\./boot +.for arch in ${SKIPARCHS} +SKIPPATTERN:=${SKIPPATTERN}|\./${arch} +.endfor +ctags: + rm -f ${.CURDIR}/tags + touch ${.CURDIR}/tags + cd ${.CURDIR}; \ + find -E . -type d -mindepth 1 -maxdepth 1 \ + ! -regex "${SKIPPATTERN}" | \ + xargs -J {} find {} -name "*.[lych]" | \ + xargs ctags -a -f ${.CURDIR}/tags + HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 26 6:55:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40AEB37B400; Wed, 26 Jun 2002 06:53:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6BE8137B401 for ; Wed, 26 Jun 2002 06:53:35 -0700 (PDT) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5QDrZJU068329 for ; Wed, 26 Jun 2002 06:53:35 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5QDrRnI068319 for perforce@freebsd.org; Wed, 26 Jun 2002 06:53:27 -0700 (PDT) Date: Wed, 26 Jun 2002 06:53:27 -0700 (PDT) Message-Id: <200206261353.g5QDrRnI068319@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bmilekic@freebsd.org using -f From: Bosko Milekic Subject: PERFORCE change 13448 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13448 Change 13448 by bmilekic@bmilekic_angela on 2002/06/26 06:52:31 IFC, keep up with pre-KSE III -CURRENT. TODO: - Move heavyweight int. sched routine [back] to C, hopefully - Re-enable preemption for the heavyweight scheduling case - Prepare self psychologically and emotionally for KSE milestone 3 and bug julian to commit it or something; :-) Affected files ... .. //depot/projects/interrupt/sys/alpha/alpha/trap.c#6 integrate .. //depot/projects/interrupt/sys/alpha/alpha/vm_machdep.c#4 integrate .. //depot/projects/interrupt/sys/arm/include/types.h#3 integrate .. //depot/projects/interrupt/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/interrupt/sys/boot/i386/Makefile#3 integrate .. //depot/projects/interrupt/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/interrupt/sys/boot/i386/boot2/boot2.c#5 integrate .. //depot/projects/interrupt/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/interrupt/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/interrupt/sys/boot/sparc64/loader/Makefile#4 integrate .. //depot/projects/interrupt/sys/conf/NOTES#2 integrate .. //depot/projects/interrupt/sys/conf/files#9 integrate .. //depot/projects/interrupt/sys/conf/options#7 integrate .. //depot/projects/interrupt/sys/ddb/db_examine.c#3 integrate .. //depot/projects/interrupt/sys/ddb/db_expr.c#3 integrate .. //depot/projects/interrupt/sys/ddb/db_run.c#3 integrate .. //depot/projects/interrupt/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/interrupt/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/interrupt/sys/dev/hea/eni_receive.c#3 integrate .. //depot/projects/interrupt/sys/dev/hea/eni_transmit.c#3 integrate .. //depot/projects/interrupt/sys/dev/hfa/fore_buffer.c#3 integrate .. //depot/projects/interrupt/sys/dev/hfa/fore_command.c#3 integrate .. //depot/projects/interrupt/sys/dev/hfa/fore_if.c#2 integrate .. //depot/projects/interrupt/sys/dev/hfa/fore_init.c#3 integrate .. //depot/projects/interrupt/sys/dev/hfa/fore_load.c#4 integrate .. //depot/projects/interrupt/sys/dev/hfa/fore_output.c#3 integrate .. //depot/projects/interrupt/sys/dev/hfa/fore_receive.c#3 integrate .. //depot/projects/interrupt/sys/dev/hfa/fore_stats.c#2 integrate .. //depot/projects/interrupt/sys/dev/hfa/fore_transmit.c#2 integrate .. //depot/projects/interrupt/sys/dev/hfa/hfa_freebsd.c#3 integrate .. //depot/projects/interrupt/sys/dev/md/md.c#7 integrate .. //depot/projects/interrupt/sys/dev/sio/sio.c#5 integrate .. //depot/projects/interrupt/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/interrupt/sys/dev/wi/if_wavelan_ieee.h#3 integrate .. //depot/projects/interrupt/sys/dev/wi/if_wireg.h#6 integrate .. //depot/projects/interrupt/sys/dev/wi/wi_hostap.c#2 integrate .. //depot/projects/interrupt/sys/dev/wi/wi_hostap.h#2 integrate .. //depot/projects/interrupt/sys/i386/Makefile#3 integrate .. //depot/projects/interrupt/sys/i386/conf/Makefile#3 integrate .. //depot/projects/interrupt/sys/i386/conf/OLDCARD#1 branch .. //depot/projects/interrupt/sys/i386/i386/in_cksum.c#3 integrate .. //depot/projects/interrupt/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/interrupt/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/interrupt/sys/i386/i386/trap.c#8 integrate .. //depot/projects/interrupt/sys/i386/i386/vm_machdep.c#4 integrate .. //depot/projects/interrupt/sys/i386/include/in_cksum.h#3 integrate .. //depot/projects/interrupt/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/interrupt/sys/i386/include/types.h#3 integrate .. //depot/projects/interrupt/sys/i386/isa/clock.c#4 integrate .. //depot/projects/interrupt/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/interrupt/sys/ia64/ia64/trap.c#7 integrate .. //depot/projects/interrupt/sys/ia64/ia64/vm_machdep.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_exec.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_exit.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_fork.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_jail.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_module.c#4 integrate .. //depot/projects/interrupt/sys/kern/kern_proc.c#4 integrate .. //depot/projects/interrupt/sys/kern/kern_prot.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_subr.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_synch.c#4 integrate .. //depot/projects/interrupt/sys/kern/md5c.c#3 integrate .. //depot/projects/interrupt/sys/kern/subr_disklabel.c#4 integrate .. //depot/projects/interrupt/sys/kern/subr_diskslice.c#5 integrate .. //depot/projects/interrupt/sys/kern/subr_trap.c#4 integrate .. //depot/projects/interrupt/sys/kern/uipc_cow.c#1 branch .. //depot/projects/interrupt/sys/kern/uipc_jumbo.c#1 branch .. //depot/projects/interrupt/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/interrupt/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/interrupt/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/interrupt/sys/kern/vfs_cluster.c#5 integrate .. //depot/projects/interrupt/sys/kern/vfs_init.c#4 integrate .. //depot/projects/interrupt/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/interrupt/sys/kern/vfs_vnops.c#7 integrate .. //depot/projects/interrupt/sys/modules/ti/Makefile#2 integrate .. //depot/projects/interrupt/sys/net/bpf.h#3 integrate .. //depot/projects/interrupt/sys/net/bridge.c#5 integrate .. //depot/projects/interrupt/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/interrupt/sys/net/if_ieee80211.h#3 integrate .. //depot/projects/interrupt/sys/net/if_media.c#3 integrate .. //depot/projects/interrupt/sys/netatm/atm_if.h#4 integrate .. //depot/projects/interrupt/sys/netatm/port.h#4 integrate .. //depot/projects/interrupt/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/interrupt/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/interrupt/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/interrupt/sys/netinet/ip_dummynet.h#3 integrate .. //depot/projects/interrupt/sys/netinet/ip_fw.c#5 integrate .. //depot/projects/interrupt/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/interrupt/sys/netinet/ip_input.c#4 integrate .. //depot/projects/interrupt/sys/netinet/ip_output.c#4 integrate .. //depot/projects/interrupt/sys/netinet/ip_var.h#3 integrate .. //depot/projects/interrupt/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/interrupt/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/interrupt/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/interrupt/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/interrupt/sys/pc98/i386/machdep.c#6 integrate .. //depot/projects/interrupt/sys/pc98/pc98/clock.c#4 integrate .. //depot/projects/interrupt/sys/pc98/pc98/sio.c#7 integrate .. //depot/projects/interrupt/sys/pccard/i82365.h#2 integrate .. //depot/projects/interrupt/sys/pccard/pccard.c#4 integrate .. //depot/projects/interrupt/sys/pccard/pcic.c#4 integrate .. //depot/projects/interrupt/sys/pccard/pcic_pci.c#5 integrate .. //depot/projects/interrupt/sys/pccard/pcic_pci.h#3 integrate .. //depot/projects/interrupt/sys/pccard/plxcard.c#2 delete .. //depot/projects/interrupt/sys/pccard/plxcardreg.h#2 delete .. //depot/projects/interrupt/sys/pci/if_ti.c#4 integrate .. //depot/projects/interrupt/sys/pci/if_tireg.h#2 integrate .. //depot/projects/interrupt/sys/pci/ti_fw.h#2 integrate .. //depot/projects/interrupt/sys/pci/ti_fw2.h#2 integrate .. //depot/projects/interrupt/sys/powerpc/include/types.h#2 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/trap.c#6 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/vm_machdep.c#5 integrate .. //depot/projects/interrupt/sys/sparc64/include/clock.h#3 integrate .. //depot/projects/interrupt/sys/sparc64/include/pmap.h#5 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/bus_machdep.c#5 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/critical.c#2 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/trap.c#7 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/vm_machdep.c#6 integrate .. //depot/projects/interrupt/sys/sys/jumbo.h#1 branch .. //depot/projects/interrupt/sys/sys/ktr.h#3 integrate .. //depot/projects/interrupt/sys/sys/mbuf.h#5 integrate .. //depot/projects/interrupt/sys/sys/md5.h#3 integrate .. //depot/projects/interrupt/sys/sys/mount.h#6 integrate .. //depot/projects/interrupt/sys/sys/proc.h#5 integrate .. //depot/projects/interrupt/sys/sys/resource.h#3 integrate .. //depot/projects/interrupt/sys/sys/snoop.h#3 integrate .. //depot/projects/interrupt/sys/sys/socketvar.h#5 integrate .. //depot/projects/interrupt/sys/sys/stat.h#4 integrate .. //depot/projects/interrupt/sys/sys/tiio.h#1 branch .. //depot/projects/interrupt/sys/sys/tree.h#1 branch .. //depot/projects/interrupt/sys/sys/types.h#6 integrate .. //depot/projects/interrupt/sys/sys/ucred.h#6 integrate .. //depot/projects/interrupt/sys/sys/uio.h#4 integrate .. //depot/projects/interrupt/sys/sys/vnode.h#4 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_balloc.c#4 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_extern.h#4 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_inode.c#4 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_softdep.c#6 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_softdep_stub.c#3 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_subr.c#3 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_tables.c#3 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/interrupt/sys/ufs/ffs/fs.h#4 integrate .. //depot/projects/interrupt/sys/ufs/ffs/softdep.h#3 integrate .. //depot/projects/interrupt/sys/ufs/ufs/dinode.h#4 integrate .. //depot/projects/interrupt/sys/ufs/ufs/inode.h#3 integrate .. //depot/projects/interrupt/sys/ufs/ufs/quota.h#3 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_acl.c#5 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_bmap.c#4 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_extattr.c#6 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_extern.h#3 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_inode.c#4 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_lookup.c#5 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_quota.c#4 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_readwrite.c#6 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufsmount.h#3 integrate .. //depot/projects/interrupt/sys/vm/device_pager.c#3 integrate .. //depot/projects/interrupt/sys/vm/phys_pager.c#3 integrate .. //depot/projects/interrupt/sys/vm/swap_pager.c#6 integrate .. //depot/projects/interrupt/sys/vm/uma_core.c#4 integrate .. //depot/projects/interrupt/sys/vm/vm_fault.c#6 integrate .. //depot/projects/interrupt/sys/vm/vm_glue.c#6 integrate .. //depot/projects/interrupt/sys/vm/vm_kern.c#6 integrate .. //depot/projects/interrupt/sys/vm/vm_map.c#8 integrate .. //depot/projects/interrupt/sys/vm/vm_map.h#6 integrate .. //depot/projects/interrupt/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/interrupt/sys/vm/vm_object.c#6 integrate .. //depot/projects/interrupt/sys/vm/vm_object.h#3 integrate .. //depot/projects/interrupt/sys/vm/vm_page.c#6 integrate .. //depot/projects/interrupt/sys/vm/vm_page.h#7 integrate .. //depot/projects/interrupt/sys/vm/vm_pager.c#6 integrate .. //depot/projects/interrupt/sys/vm/vm_unix.c#4 integrate .. //depot/projects/interrupt/sys/vm/vnode_pager.c#5 integrate Differences ... ==== //depot/projects/interrupt/sys/alpha/alpha/trap.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.94 2002/06/07 05:47:34 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.95 2002/06/24 06:21:52 mini Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -589,9 +589,6 @@ framep->tf_regs[FRAME_SP] = alpha_pal_rdusp(); userret(td, framep, sticks); mtx_assert(&Giant, MA_NOTOWNED); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif } return; @@ -778,9 +775,6 @@ */ STOPEVENT(p, S_SCX, code); -#ifdef DIAGNOSTIC - cred_free_thread(td); -#endif #ifdef WITNESS if (witness_list(td)) { panic("system call %s returning with mutex(s) held\n", ==== //depot/projects/interrupt/sys/alpha/alpha/vm_machdep.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.66 2002/04/05 00:52:15 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.67 2002/06/24 15:48:00 jake Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -248,6 +248,12 @@ } void +cpu_sched_exit(td) + register struct thread *td; +{ +} + +void cpu_wait(p) struct proc *p; { ==== //depot/projects/interrupt/sys/arm/include/types.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/types.h,v 1.2 2002/03/20 18:22:19 alfred Exp $ + * $FreeBSD: src/sys/arm/include/types.h,v 1.3 2002/06/23 21:57:17 iedowse Exp $ */ #ifndef _MACHINE_TYPES_H_ @@ -49,7 +49,7 @@ typedef unsigned int vm_offset_t; typedef __int64_t vm_ooffset_t; -typedef unsigned int vm_pindex_t; +typedef __uint64_t vm_pindex_t; typedef unsigned int vm_size_t; typedef __int32_t register_t; ==== //depot/projects/interrupt/sys/boot/common/ufsread.c#2 (text+ko) ==== @@ -1,4 +1,13 @@ /* + * Copyright (c) 2002 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by Marshall + * Kirk McKusick and Network Associates Laboratories, the Security + * Research Division of Network Associates, Inc. under DARPA/SPAWAR + * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS + * research program + * * Copyright (c) 1998 Robert Nordier * All rights reserved. * @@ -14,34 +23,36 @@ */ /* - * $FreeBSD: src/sys/boot/common/ufsread.c,v 1.3 2002/06/05 12:00:49 phk Exp $ + * $FreeBSD: src/sys/boot/common/ufsread.c,v 1.5 2002/06/21 22:33:56 jake Exp $ */ +#include #include -#include /* * We use 4k `virtual' blocks for filesystem data, whatever the actual * filesystem block size. FFS blocks are always a multiple of 4k. */ #define VBLKSIZE 4096 +#define VBLKSHIFT 12 #define VBLKMASK (VBLKSIZE - 1) #define DBPERVBLK (VBLKSIZE / DEV_BSIZE) -#define IPERVBLK (VBLKSIZE / sizeof(struct dinode)) -#define INDIRPERVBLK (VBLKSIZE / sizeof(ufs_daddr_t)) -#define INO_TO_VBA(fs, x) (fsbtodb(fs, ino_to_fsba(fs, x)) + \ - (ino_to_fsbo(fs, x) / IPERVBLK) * DBPERVBLK) -#define INO_TO_VBO(fs, x) (ino_to_fsbo(fs, x) % IPERVBLK) +#define INDIRPERVBLK(fs) (NINDIR(fs) / ((fs)->fs_bsize / VBLKSIZE)) +#define IPERVBLK(fs) (INOPB(fs) / ((fs)->fs_bsize / VBLKSIZE)) +#define INO_TO_VBA(fs, ipervblk, x) \ + (fsbtodb(fs, cgimin(fs, ino_to_cg(fs, x))) + \ + (((x) % (fs)->fs_ipg) / (ipervblk) * DBPERVBLK)) +#define INO_TO_VBO(ipervblk, x) ((x) % ipervblk) #define FS_TO_VBA(fs, fsb, off) (fsbtodb(fs, fsb) + \ ((off) / VBLKSIZE) * DBPERVBLK) #define FS_TO_VBO(fs, fsb, off) ((off) & VBLKMASK) /* Buffers that must not span a 64k boundary. */ struct dmadat { - char blkbuf[VBLKSIZE]; /* filesystem blocks */ - ufs_daddr_t indbuf[VBLKSIZE / sizeof(ufs_daddr_t)]; /* indir blocks */ - char sbbuf[SBSIZE]; /* superblock */ - char secbuf[DEV_BSIZE]; /* for MBR/disklabel */ + char blkbuf[VBLKSIZE]; /* filesystem blocks */ + char indbuf[VBLKSIZE]; /* indir blocks */ + char sbbuf[SBLOCKSIZE]; /* superblock */ + char secbuf[DEV_BSIZE]; /* for MBR/disklabel */ }; static struct dmadat *dmadat; @@ -61,16 +72,16 @@ fs_off = 0; while ((n = fsread(*ino, buf, DEV_BSIZE)) > 0) - for (s = buf; s < buf + DEV_BSIZE;) { - d = (void *)s; - if (ls) - printf("%s ", d->d_name); - else if (!strcmp(name, d->d_name)) { - *ino = d->d_fileno; - return d->d_type; + for (s = buf; s < buf + DEV_BSIZE;) { + d = (void *)s; + if (ls) + printf("%s ", d->d_name); + else if (!strcmp(name, d->d_name)) { + *ino = d->d_fileno; + return d->d_type; + } + s += d->d_reclen; } - s += d->d_reclen; - } if (n != -1 && ls) printf("\n"); return 0; @@ -95,8 +106,8 @@ if (!*path) break; for (s = path; *s && *s != '/'; s++); - if ((n = s - path) > MAXNAMLEN) - return 0; + if ((n = s - path) > MAXNAMLEN) + return 0; ls = *path == '?' && n == 1 && !*s; memcpy(name, path, n); name[n] = 0; @@ -111,28 +122,134 @@ return dt == DT_REG ? ino : 0; } +#ifndef __sparc64__ +#define UFS1_ONLY +#endif +#ifdef UFS1_ONLY + static ssize_t fsread(ino_t inode, void *buf, size_t nbyte) { - static struct dinode din; + static struct ufs1_dinode dp1; static ino_t inomap; - static daddr_t blkmap, indmap; char *blkbuf; - ufs_daddr_t *indbuf; + caddr_t indbuf; struct fs *fs; char *s; - ufs_daddr_t lbn, addr; - daddr_t vbaddr; - size_t n, nb, off, vboff; + size_t n, nb, size, off, vboff; + long lbn; + ufs1_daddr_t addr, vbaddr; + static ufs1_daddr_t blkmap, indmap; blkbuf = dmadat->blkbuf; indbuf = dmadat->indbuf; fs = (struct fs *)dmadat->sbbuf; if (!dsk_meta) { inomap = 0; - if (dskread(fs, SBOFF / DEV_BSIZE, SBSIZE / DEV_BSIZE)) + if (dskread(fs, SBLOCK_UFS1 / DEV_BSIZE, SBLOCKSIZE / DEV_BSIZE)) + return -1; + if (fs->fs_magic != FS_UFS1_MAGIC) { + printf("Not ufs\n"); + return -1; + } + dsk_meta++; + } + if (!inode) + return 0; + if (inomap != inode) { + n = IPERVBLK(fs); + if (dskread(blkbuf, INO_TO_VBA(fs, n, inode), DBPERVBLK)) return -1; - if (fs->fs_magic != FS_MAGIC) { + dp1 = ((struct ufs1_dinode *)blkbuf)[INO_TO_VBO(n, inode)]; + inomap = inode; + fs_off = 0; + blkmap = indmap = 0; + } + s = buf; + size = dp1.di_size; + n = size - fs_off; + if (nbyte > n) + nbyte = n; + nb = nbyte; + while (nb) { + lbn = lblkno(fs, fs_off); + off = blkoff(fs, fs_off); + if (lbn < NDADDR) { + addr = dp1.di_db[lbn]; + } else { + n = INDIRPERVBLK(fs); + addr = dp1.di_ib[0]; + vbaddr = fsbtodb(fs, addr) + + (lbn - NDADDR) / n * DBPERVBLK; + if (indmap != vbaddr) { + if (dskread(indbuf, vbaddr, DBPERVBLK)) + return -1; + indmap = vbaddr; + } + addr = ((ufs1_daddr_t *)indbuf)[(lbn - NDADDR) % n]; + } + vbaddr = fsbtodb(fs, addr) + (off >> VBLKSHIFT) * DBPERVBLK; + vboff = off & VBLKMASK; + n = sblksize(fs, size, lbn) - (off & ~VBLKMASK); + if (n > VBLKSIZE) + n = VBLKSIZE; + if (blkmap != vbaddr) { + if (dskread(blkbuf, vbaddr, n >> DEV_BSHIFT)) + return -1; + blkmap = vbaddr; + } + n -= vboff; + if (n > nb) + n = nb; + memcpy(s, blkbuf + vboff, n); + s += n; + fs_off += n; + nb -= n; + } + return nbyte; +} + +#else /* UFS1_AND_UFS2 */ + +/* + * Possible superblock locations ordered from most to least likely. + */ +static int sblock_try[] = SBLOCKSEARCH; + +#define DIP(field) fs->fs_magic == FS_UFS1_MAGIC ? dp1.field : dp2.field + +static ssize_t +fsread(ino_t inode, void *buf, size_t nbyte) +{ + static struct ufs1_dinode dp1; + static struct ufs2_dinode dp2; + static ino_t inomap; + char *blkbuf; + caddr_t indbuf; + struct fs *fs; + char *s; + size_t n, nb, size, off, vboff; + ufs_lbn_t lbn; + ufs2_daddr_t addr, vbaddr; + static ufs2_daddr_t blkmap, indmap; + + blkbuf = dmadat->blkbuf; + indbuf = dmadat->indbuf; + fs = (struct fs *)dmadat->sbbuf; + if (!dsk_meta) { + inomap = 0; + for (n = 0; sblock_try[n] != -1; n++) { + if (dskread(fs, sblock_try[n] / DEV_BSIZE, + SBLOCKSIZE / DEV_BSIZE)) + return -1; + if ((fs->fs_magic == FS_UFS1_MAGIC || + (fs->fs_magic == FS_UFS2_MAGIC && + fs->fs_sblockloc == numfrags(fs, sblock_try[n]))) && + fs->fs_bsize <= MAXBSIZE && + fs->fs_bsize >= sizeof(struct fs)) + break; + } + if (sblock_try[n] == -1) { printf("Not ufs\n"); return -1; } @@ -141,35 +258,51 @@ if (!inode) return 0; if (inomap != inode) { - if (dskread(blkbuf, INO_TO_VBA(fs, inode), DBPERVBLK)) + n = IPERVBLK(fs); + if (dskread(blkbuf, INO_TO_VBA(fs, n, inode), DBPERVBLK)) return -1; - din = ((struct dinode *)blkbuf)[INO_TO_VBO(fs, inode)]; + n = INO_TO_VBO(n, inode); + if (fs->fs_magic == FS_UFS1_MAGIC) + dp1 = ((struct ufs1_dinode *)blkbuf)[n]; + else + dp2 = ((struct ufs2_dinode *)blkbuf)[n]; inomap = inode; fs_off = 0; blkmap = indmap = 0; } s = buf; - if (nbyte > (n = din.di_size - fs_off)) + size = DIP(di_size); + n = size - fs_off; + if (nbyte > n) nbyte = n; nb = nbyte; while (nb) { lbn = lblkno(fs, fs_off); off = blkoff(fs, fs_off); - if (lbn < NDADDR) - addr = din.di_db[lbn]; - else { - vbaddr = FS_TO_VBA(fs, din.di_ib[0], sizeof(indbuf[0]) * - ((lbn - NDADDR) % NINDIR(fs))); + if (lbn < NDADDR) { + addr = DIP(di_db[lbn]); + } else if (lbn < NDADDR + NINDIR(fs)) { + n = INDIRPERVBLK(fs); + addr = DIP(di_ib[0]); + vbaddr = fsbtodb(fs, addr) + + (lbn - NDADDR) / n * DBPERVBLK; if (indmap != vbaddr) { if (dskread(indbuf, vbaddr, DBPERVBLK)) return -1; indmap = vbaddr; } - addr = indbuf[(lbn - NDADDR) % INDIRPERVBLK]; + n = (lbn - NDADDR) % n; + if (fs->fs_magic == FS_UFS1_MAGIC) + addr = ((ufs1_daddr_t *)indbuf)[n]; + else + addr = ((ufs2_daddr_t *)indbuf)[n]; + } else { + printf("file too big\n"); + return -1; } - vbaddr = FS_TO_VBA(fs, addr, off); - vboff = FS_TO_VBO(fs, addr, off); - n = dblksize(fs, &din, lbn) - (off & ~VBLKMASK); + vbaddr = fsbtodb(fs, addr) + (off >> VBLKSHIFT) * DBPERVBLK; + vboff = off & VBLKMASK; + n = sblksize(fs, size, lbn) - (off & ~VBLKMASK); if (n > VBLKSIZE) n = VBLKSIZE; if (blkmap != vbaddr) { @@ -187,3 +320,5 @@ } return nbyte; } + +#endif /* UFS1_AND_UFS2 */ ==== //depot/projects/interrupt/sys/boot/i386/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.16 2002/05/11 21:41:03 peter Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.18 2002/06/21 10:59:57 phk Exp $ SUBDIR= mbr boot0 btx boot2 cdboot kgzldr libi386 loader ==== //depot/projects/interrupt/sys/boot/i386/boot2/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.29 2002/06/05 12:30:41 phk Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.31 2002/06/21 11:00:00 phk Exp $ PROG= boot2 NOMAN= ==== //depot/projects/interrupt/sys/boot/i386/boot2/boot2.c#5 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.42 2002/06/05 11:10:38 phk Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.43 2002/06/21 06:18:01 mckusick Exp $ */ #include @@ -73,9 +73,10 @@ #define TYPE_AD 0 #define TYPE_WD 1 -#define TYPE_WFD 2 -#define TYPE_FD 3 -#define TYPE_DA 4 +#define TYPE_DA 2 +#define TYPE_MAXHARD TYPE_DA +#define TYPE_WFD 3 +#define TYPE_FD 4 extern uint32_t _end; @@ -97,8 +98,8 @@ RBX_VERBOSE }; -static const char *const dev_nm[] = {"ad", "wd", " ", "fd", "da"}; -static const unsigned dev_maj[] = {30, 0, 1, 2, 4}; +static const char *const dev_nm[NDEV] = {"ad", "wd", "da", " ", "fd"}; +static const unsigned char dev_maj[NDEV] = {30, 0, 4, 1, 2}; static struct dsk { unsigned drive; @@ -111,16 +112,14 @@ } dsk; static char cmd[512]; static char kname[1024]; -static uint32_t opts; +static uint32_t opts = RB_BOOTINFO; static struct bootinfo bootinfo; static uint8_t ioctrl = IO_KEYBOARD; void exit(int); static void load(const char *); static int parse(char *); -static ino_t lookup(const char *); static int xfsread(ino_t, void *, size_t); -static ssize_t fsread(ino_t, void *, size_t); static int dskread(void *, unsigned, unsigned); static int printf(const char *,...); static int putchar(int); @@ -131,16 +130,17 @@ static int xgetc(int); static int getc(int); +#if 1 #define memcpy __builtin_memcpy - -static inline void -readfile(const char *fname, void *buf, size_t size) +#else +static void memcpy(char *, const char *, int); +static void +memcpy(char *dst, const char *src, int len) { - ino_t ino; - - if ((ino = lookup(fname))) - fsread(ino, buf, size); + while (len--) + *dst++ = *src++; } +#endif static inline int strcmp(const char *s1, const char *s2) @@ -151,15 +151,14 @@ #include "ufsread.c" -static inline int -getchar(void) +static int +xfsread(ino_t inode, void *buf, size_t nbyte) { - int c; - - c = xgetc(0); - if (c == '\r') - c = '\n'; - return c; + if (fsread(inode, buf, nbyte) != nbyte) { + printf("Invalid %s\n", "format"); + return -1; + } + return 0; } static inline void @@ -169,12 +168,13 @@ int c; s = str; - do { - switch (c = getchar()) { + for (;;) { + switch (c = xgetc(0)) { case 0: break; + case '\177': + c = '\b'; case '\b': - case '\177': if (s > str) { s--; putchar('\b'); @@ -183,15 +183,16 @@ c = 0; break; case '\n': + case '\r': *s = 0; - break; + return; default: if (s - str < size - 1) *s++ = c; } if (c) putchar(c); - } while (c != '\n'); + } } static inline uint32_t @@ -220,6 +221,7 @@ main(void) { int autoboot, i; + ino_t ino; dmadat = (void *)(roundup2(__base + _end, 0x10000) - __base); v86.ctl = V86_FLAGS; @@ -238,7 +240,10 @@ /* Process configuration file */ autoboot = 1; - readfile(PATH_CONFIG, cmd, sizeof(cmd)); + + if ((ino = lookup(PATH_CONFIG))) + fsread(ino, cmd, sizeof(cmd)); + if (*cmd) { printf("%s: %s", PATH_CONFIG, cmd); if (parse(cmd)) @@ -328,7 +333,7 @@ return; p += hdr.ex.a_data + roundup2(hdr.ex.a_bss, PAGE_SIZE); bootinfo.bi_symtab = VTOP(p); - memcpy(p, &hdr.ex.a_syms, sizeof(hdr.ex.a_syms)); + memcpy(p, (char *)&hdr.ex.a_syms, sizeof(hdr.ex.a_syms)); p += sizeof(hdr.ex.a_syms); if (hdr.ex.a_syms) { if (xfsread(ino, p, hdr.ex.a_syms)) @@ -365,7 +370,7 @@ if (xfsread(ino, &es, sizeof(es))) return; for (i = 0; i < 2; i++) { - memcpy(p, &es[i].sh_size, sizeof(es[i].sh_size)); + memcpy(p, (char *)&es[i].sh_size, sizeof(es[i].sh_size)); p += sizeof(es[i].sh_size); fs_off = es[i].sh_offset; if (xfsread(ino, p, es[i].sh_size)) @@ -378,7 +383,7 @@ bootinfo.bi_esymtab = VTOP(p); bootinfo.bi_kernelname = VTOP(fname); bootinfo.bi_bios_dev = dsk.drive; - __exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK), + __exec((caddr_t)addr, opts & RBX_MASK, MAKEBOOTDEV(dev_maj[dsk.type], 0, dsk.slice, dsk.unit, dsk.part), 0, 0, 0, VTOP(&bootinfo)); } @@ -449,9 +454,8 @@ arg += 2; if (drv == -1) drv = dsk.unit; - dsk.drive = (dsk.type == TYPE_WD || - dsk.type == TYPE_AD || - dsk.type == TYPE_DA ? DRV_HARD : 0) + drv; + dsk.drive = (dsk.type <= TYPE_MAXHARD + ? DRV_HARD : 0) + drv; dsk_meta = 0; fsread(0, NULL, 0); } @@ -467,16 +471,6 @@ } static int -xfsread(ino_t inode, void *buf, size_t nbyte) -{ - if (fsread(inode, buf, nbyte) != nbyte) { - printf("Invalid %s\n", "format"); - return -1; - } - return 0; -} - -static int dskread(void *buf, unsigned lba, unsigned nblk) { struct dos_partition *dp; ==== //depot/projects/interrupt/sys/boot/i386/libi386/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.25 2002/05/13 11:09:06 ru Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.27 2002/06/21 11:00:00 phk Exp $ # LIB= i386 INTERNALLIB= true ==== //depot/projects/interrupt/sys/boot/i386/loader/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.57 2002/05/10 00:53:45 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.59 2002/06/21 11:00:00 phk Exp $ BASE= loader PROG= ${BASE} ==== //depot/projects/interrupt/sys/boot/sparc64/loader/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.8 2002/05/28 23:09:59 jake Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.9 2002/06/21 22:34:51 jake Exp $ BASE= loader PROG= ${BASE} @@ -13,7 +13,7 @@ LOADER_DISK_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes -LOADER_CD9660_SUPPORT?= no +LOADER_CD9660_SUPPORT?= yes LOADER_NET_SUPPORT?= no LOADER_NFS_SUPPORT?= no LOADER_TFTP_SUPPORT?= no ==== //depot/projects/interrupt/sys/conf/NOTES#2 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1039 2002/06/10 18:49:37 phk Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1041 2002/06/26 03:34:43 ken Exp $ # # @@ -533,6 +533,13 @@ options DUMMYNET options BRIDGE +# Zero copy sockets support. This enables "zero copy" for sending and +# receving data via a socket. The send side works for any type of NIC, +# the receive side only works for NICs that support MTUs greater than the +# page size of your architecture and that support header splitting. See +# zero_copy(9) for more details. +options ZERO_COPY_SOCKETS + # # ATM (HARP version) options # @@ -1670,6 +1677,13 @@ device ti device fpa 1 +# Use "private" jumbo buffers allocated exclusively for the ti(4) driver. +# This option is incompatible with the TI_JUMBO_HDRSPLIT option below. +#options TI_PRIVATE_JUMBOS +# Turn on the header splitting option for the ti(4) driver firmware. This +# only works for Tigon II chips, and has no effect for Tigon I chips. +options TI_JUMBO_HDRSPLIT + # # ATM related options (Cranor version) # (note: this driver cannot be used with the HARP ATM stack) @@ -2255,6 +2269,8 @@ options NBUF=512 # Number of buffer headers +options MSIZE=256 # mbuf size in bytes +options MCLSHIFT=12 # mbuf cluster shift in bits, 12 == 4KB options NMBCLUSTERS=1024 # Number of mbuf clusters options SCSI_NCR_DEBUG @@ -2284,8 +2300,6 @@ # driver still mostly spells this option BROOKTREE_ALLOC_PAGES. ##options BKTR_ALLOC_PAGES="(217*4+1)" options BROOKTREE_ALLOC_PAGES="(217*4+1)" -# Broken: -##options CAPABILITIES options MAXFILES=999 # METEOR_TEST_VIDEO has no effect since meteor is broken. options METEOR_TEST_VIDEO ==== //depot/projects/interrupt/sys/conf/files#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.650 2002/06/18 21:32:33 julian Exp $ +# $FreeBSD: src/sys/conf/files,v 1.654 2002/06/26 03:34:43 ken Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -22,7 +22,7 @@ kern/device_if.m standard kern/bus_if.m standard kern/clock_if.m optional genclock -kern/linker_if.m standard +kern/linker_if.m standard cam/cam.c optional scbus cam/cam_extend.c optional scbus cam/cam_periph.c optional scbus @@ -472,10 +472,10 @@ dev/pci/ignore_pci.c optional pci dev/pci/isa_pci.c optional pci dev/pci/pci.c count pci -dev/pci/pci_if.m optional pci +dev/pci/pci_if.m standard dev/pci/pci_pci.c optional pci dev/pci/pci_user.c optional pci -dev/pci/pcib_if.m optional pci +dev/pci/pcib_if.m standard dev/pcic/i82365.c optional pcic pccard dev/pcic/i82365_isa.c optional pcic pccard isa dev/pdq/if_fea.c optional fea eisa @@ -811,7 +811,7 @@ i4b/layer4/i4b_l4mgmt.c optional i4b i4b/layer4/i4b_l4timer.c optional i4b # -isa/isa_if.m optional isa +isa/isa_if.m standard isa/isa_common.c optional isa isa/isahint.c optional isa isa/orm.c optional isa @@ -921,7 +921,9 @@ kern/tty_subr.c standard kern/tty_tty.c standard kern/uipc_accf.c optional inet +kern/uipc_cow.c optional zero_copy_sockets kern/uipc_domain.c standard +kern/uipc_jumbo.c standard kern/uipc_mbuf.c standard kern/uipc_mbuf2.c standard kern/uipc_proto.c standard @@ -1273,7 +1275,6 @@ pccard/pcic.c optional pcic card pccard/pcic_isa.c optional pcic card isa pccard/pcic_pci.c optional pcic card pci -pccard/plxcard.c optional plxcard pci pci/agp.c optional agp pci/agp_if.m optional agp pci/agp_intel.c optional agp ==== //depot/projects/interrupt/sys/conf/options#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.326 2002/06/18 21:30:36 n_hibma Exp $ +# $FreeBSD: src/sys/conf/options,v 1.327 2002/06/26 03:34:43 ken Exp $ # # On the handling of kernel options # @@ -345,6 +345,11 @@ DRM_LINUX opt_drm.h DRM_DEBUG opt_drm.h + +ZERO_COPY_SOCKETS opt_zero.h +TI_PRIVATE_JUMBOS opt_ti.h +TI_JUMBO_HDRSPLIT opt_ti.h + # ATM (HARP version) ATM_CORE opt_atm.h ATM_IP opt_atm.h @@ -405,6 +410,8 @@ REGRESSION opt_global.h RESTARTABLE_PANICS opt_global.h VFS_BIO_DEBUG opt_global.h +MSIZE opt_global.h +MCLSHIFT opt_global.h # These are VM related options VM_KMEM_SIZE opt_vm.h ==== //depot/projects/interrupt/sys/ddb/db_examine.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jun 26 13:17:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4367137C701; Wed, 26 Jun 2002 13:03:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 91D5F37C2D0 for ; Wed, 26 Jun 2002 12:24:39 -0700 (PDT) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5QJN1JU037637 for ; Wed, 26 Jun 2002 12:23:20 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5QJMHrm037477 for perforce@freebsd.org; Wed, 26 Jun 2002 12:22:17 -0700 (PDT) Date: Wed, 26 Jun 2002 12:22:17 -0700 (PDT) Message-Id: <200206261922.g5QJMHrm037477@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 13459 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13459 Change 13459 by cvance@cvance_korben on 2002/06/26 12:20:54 Fix typo in extended attribute handling. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#152 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#152 (text+ko) ==== @@ -907,7 +907,7 @@ return (error); } - if (buflen == sizeof(extmac)) + if (buflen != sizeof(extmac)) error = EPERM; /* Fail very closed. */ if (error == 0) error = mac_update_vnode_from_externalized(vp, &extmac); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 4:53: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11FCE37B401; Thu, 27 Jun 2002 04:52:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 1EBDD37B400 for ; Thu, 27 Jun 2002 04:52:56 -0700 (PDT) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5RBquJU013339 for ; Thu, 27 Jun 2002 04:52:56 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5RBqtSZ013336 for perforce@freebsd.org; Thu, 27 Jun 2002 04:52:55 -0700 (PDT) Date: Thu, 27 Jun 2002 04:52:55 -0700 (PDT) Message-Id: <200206271152.g5RBqtSZ013336@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 13473 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13473 Change 13473 by chris@chris_holly on 2002/06/27 04:52:20 Include a man page for these utilities. Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/getfmac/Makefile#2 edit .. //depot/projects/trustedbsd/mac/usr.sbin/getfmac/getfmac.8#1 add .. //depot/projects/trustedbsd/mac/usr.sbin/setfmac/Makefile#2 edit .. //depot/projects/trustedbsd/mac/usr.sbin/setfmac/setfmac.8#1 add Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/getfmac/Makefile#2 (text+ko) ==== @@ -1,5 +1,4 @@ PROG= getfmac SRCS= getfmac.c CFLAGS+=-Wall -NOMAN=yes .include ==== //depot/projects/trustedbsd/mac/usr.sbin/setfmac/Makefile#2 (text+ko) ==== @@ -1,5 +1,4 @@ PROG= setfmac SRCS= setfmac.c CFLAGS+=-Wall -NOMAN=yes .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 5:24:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDA9B37B405; Thu, 27 Jun 2002 05:24:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from holly.calldei.com (adsl-208-191-149-232.dsl.hstntx.swbell.net [208.191.149.232]) by hub.freebsd.org (Postfix) with ESMTP id 7C8FA37B401 for ; Thu, 27 Jun 2002 05:24:16 -0700 (PDT) Received: by holly.calldei.com (Postfix, from userid 1001) id 26218A1A; Thu, 27 Jun 2002 06:58:49 -0500 (CDT) Date: Thu, 27 Jun 2002 06:58:49 -0500 From: Chris Costello To: Perforce Change Reviews Subject: Re: PERFORCE change 13473 for review Message-ID: <20020627065849.B412@holly.calldei.com> Reply-To: chris@FreeBSD.org References: <200206271152.g5RBqtSZ013336@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200206271152.g5RBqtSZ013336@freefall.freebsd.org>; from chris@FreeBSD.org on Thu, Jun 27, 2002 at 04:52:55AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thursday, June 27, 2002, Chris Costello wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13473 > > Change 13473 by chris@chris_holly on 2002/06/27 04:52:20 > > Include a man page for these utilities. Are we going to keep these for the long term? If so, I can spend some of my free time rewriting these to match style(9). Wouldn't take very long at all. -- +-------------------+------------------------------------+ | Chris Costello | 29A, the hexadecimal of the Beast. | | chris@FreeBSD.org | | +-------------------+------------------------------------+ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 7: 7:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF7DB37B407; Thu, 27 Jun 2002 07:07:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E25B537B400 for ; Thu, 27 Jun 2002 07:07:39 -0700 (PDT) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5RE7dJU050226 for ; Thu, 27 Jun 2002 07:07:39 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5RE7djG050223 for perforce@freebsd.org; Thu, 27 Jun 2002 07:07:39 -0700 (PDT) Date: Thu, 27 Jun 2002 07:07:39 -0700 (PDT) Message-Id: <200206271407.g5RE7djG050223@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 13476 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13476 Change 13476 by green@green_laptop_2 on 2002/06/27 07:07:14 Don't crash if an ELF module is b0rked and has a 0 where it shouldn't. Maybe I should just let it crash? Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/link_elf.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/link_elf.c#5 (text+ko) ==== @@ -311,6 +311,8 @@ const Elf_Hashelt *hashtab = (const Elf_Hashelt *) (ef->address + dp->d_un.d_ptr); ef->nbuckets = hashtab[0]; + if (ef->nbuckets == 0) + return ENOEXEC; ef->nchains = hashtab[1]; ef->buckets = hashtab + 2; ef->chains = ef->buckets + ef->nbuckets; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 7: 9:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B210937B406; Thu, 27 Jun 2002 07:08:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B7EF637B405 for ; Thu, 27 Jun 2002 07:08:41 -0700 (PDT) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5RE8fJU050282 for ; Thu, 27 Jun 2002 07:08:41 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5RE8f0k050279 for perforce@freebsd.org; Thu, 27 Jun 2002 07:08:41 -0700 (PDT) Date: Thu, 27 Jun 2002 07:08:41 -0700 (PDT) Message-Id: <200206271408.g5RE8f0k050279@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 13477 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13477 Change 13477 by green@green_laptop_2 on 2002/06/27 07:08:17 Update mac_te and mac_none more. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#31 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#33 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#31 (text+ko) ==== @@ -271,6 +271,13 @@ } static void +mac_none_create_vnode_from_exported(struct ucred *cred, struct vnode *vp, + struct mac *extmac, struct label *intlabel) +{ + +} + +static void mac_none_create_mount(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel) { @@ -825,6 +832,8 @@ (macop_t)mac_none_create_devfs_directory }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_none_create_devfs_vnode }, + { MAC_CREATE_VNODE_FROM_EXPORTED, + (macop_t)mac_none_create_vnode_from_exported }, { MAC_CREATE_VNODE_FROM_VNODE, (macop_t)mac_none_create_vnode_from_vnode }, { MAC_CREATE_MOUNT, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#33 (text+ko) ==== @@ -652,6 +652,42 @@ } static int +mac_te_cred_check_bind_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + if (!mac_te_enabled) + return (0); + + return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), + MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_BIND)); +} + +static int +mac_te_cred_check_connect_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + if (!mac_te_enabled) + return (0); + + return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), + MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_CONNECT)); +} + +static int +mac_te_cred_check_listen_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel) +{ + + if (!mac_te_enabled) + return (0); + + return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), + MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_LISTEN)); +} + +static int mac_te_socket_check_receive_mbuf(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { @@ -866,6 +902,15 @@ mac_te_init_label_as(SLOT(fslabel), MAC_TE_TYPE_FS); } +static void +mac_te_relabel_vnode(struct ucred *cred, struct vnode *vp, + struct label *vnodelabel, struct label *label) +{ + + mac_te_copy_label(SLOT(label), SLOT(vnodelabel)); +} + + static int mac_te_internalize(struct label *label, const struct mac *extlabel) { @@ -914,6 +959,14 @@ } static void +mac_te_create_devfs_vnode(struct devfs_dirent *de, struct label *direntlabel, + struct vnode *vp, struct label *vnodelabel) +{ + + mac_te_copy_label(SLOT(direntlabel), SLOT(vnodelabel)); +} + +static void mac_te_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, struct label *parentlabel, struct vnode *child, struct label *childlabel) { @@ -921,6 +974,15 @@ mac_te_create_object(cred, childlabel); } +static void +mac_te_create_vnode_from_exported(struct ucred *cred, struct vnode *vp, + struct mac *extmac, struct label *intlabel) +{ + + /* XXX should check return */ + mac_te_internalize(intlabel, extmac); +} + static int mac_te_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) @@ -1299,6 +1361,46 @@ return (error); } +static void +mac_te_update_devfsdirent_from_vnode(struct devfs_dirent *devfs_dirent, + struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) +{ + + mac_te_copy_label(SLOT(vnodelabel), SLOT(direntlabel)); +} + +static void +mac_te_update_procfsvnode_from_subject(struct vnode *vp, + struct label *vnodelabel, struct ucred *cred) +{ + + mac_te_copy_label(SLOT(&cred->cr_label), SLOT(vnodelabel)); +} + +static int +mac_te_update_vnode_from_externalized(struct vnode *vp, + struct label *vnodelabel, struct mac *mac) +{ + + return (mac_te_internalize(vnodelabel, mac)); +} + +static void +mac_te_update_vnode_from_mount(struct vnode *vp, struct label *vnodelabel, + struct mount *mp, struct label *fslabel) +{ + + mac_te_copy_label(SLOT(fslabel), SLOT(vnodelabel)); +} + +static void +mac_te_update_ipq_from_fragment(struct mbuf *fragment, + struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +{ + + mac_te_copy_label(SLOT(fragmentlabel), SLOT(ipqlabel)); +} + static struct mac_policy_op_entry mac_te_ops[] = { { MAC_INIT_BPFDESC, (macop_t)mac_te_init_bpfdesc }, @@ -1323,8 +1425,11 @@ { MAC_DESTROY_VNODE, (macop_t)mac_te_destroy_vnode }, { MAC_CREATE_DEVFS_DEVICE, (macop_t)mac_te_create_devfs_device }, { MAC_CREATE_DEVFS_DIRECTORY, (macop_t)mac_te_create_devfs_directory }, + { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_te_create_devfs_vnode }, { MAC_CREATE_VNODE_FROM_VNODE, (macop_t)mac_te_create_vnode_from_vnode }, + { MAC_CREATE_VNODE_FROM_EXPORTED, + (macop_t)mac_te_create_vnode_from_exported }, { MAC_CREATE_MOUNT, (macop_t)mac_te_create_mount }, { MAC_CREATE_ROOT_MOUNT, (macop_t)mac_te_create_root_mount }, { MAC_CREATE_MBUF_FROM_SOCKET, @@ -1365,10 +1470,16 @@ { MAC_CREATE_PROC0, (macop_t)mac_te_create_proc0 }, { MAC_CREATE_PROC1, (macop_t)mac_te_create_proc1 }, { MAC_RELABEL_SUBJECT, (macop_t)mac_te_relabel_subject }, + { MAC_RELABEL_VNODE, (macop_t)mac_te_relabel_vnode }, { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, (macop_t)mac_te_bpfdesc_check_receive_from_ifnet }, { MAC_CRED_CHECK_SEE_CRED, (macop_t)mac_te_cred_check_see_cred }, { MAC_CRED_CHECK_SEE_SOCKET, (macop_t)mac_te_cred_check_see_socket }, + { MAC_CRED_CHECK_BIND_SOCKET, (macop_t)mac_te_cred_check_bind_socket }, + { MAC_CRED_CHECK_CONNECT_SOCKET, + (macop_t)mac_te_cred_check_connect_socket }, + { MAC_CRED_CHECK_LISTEN_SOCKET, + (macop_t)mac_te_cred_check_listen_socket }, { MAC_CRED_CHECK_RELABEL_IFNET, (macop_t)mac_te_cred_check_relabel_ifnet }, { MAC_CRED_CHECK_RELABEL_SOCKET, @@ -1382,6 +1493,7 @@ { MAC_CRED_CHECK_CHDIR_VNODE, (macop_t)mac_te_cred_check_chdir_vnode }, { MAC_CRED_CHECK_CREATE_VNODE, (macop_t)mac_te_cred_check_create_vnode }, + { MAC_RELABEL_VNODE, (macop_t)mac_te_relabel_vnode }, { MAC_CRED_CHECK_DELETE_VNODE, (macop_t)mac_te_cred_check_delete_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)mac_te_cred_check_exec_vnode }, @@ -1414,6 +1526,16 @@ (macop_t)mac_te_socket_check_receive_mbuf }, { MAC_EXTERNALIZE, (macop_t)mac_te_externalize }, { MAC_INTERNALIZE, (macop_t)mac_te_internalize }, + { MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, + (macop_t)mac_te_update_devfsdirent_from_vnode }, + { MAC_UPDATE_PROCFSVNODE_FROM_SUBJECT, + (macop_t)mac_te_update_procfsvnode_from_subject }, + { MAC_UPDATE_VNODE_FROM_EXTERNALIZED, + (macop_t)mac_te_update_vnode_from_externalized }, + { MAC_UPDATE_VNODE_FROM_MOUNT, + (macop_t)mac_te_update_vnode_from_mount }, + { MAC_UPDATE_IPQ_FROM_FRAGMENT, + (macop_t)mac_te_update_ipq_from_fragment }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#2 (text+ko) ==== @@ -96,5 +96,8 @@ #define MAC_TE_CLASS_SOCKET 7 #define MAC_TE_OPERATION_SOCKET_SEE 1 +#define MAC_TE_OPERATION_SOCKET_BIND 2 +#define MAC_TE_OPERATION_SOCKET_CONNECT 3 +#define MAC_TE_OPERATION_SOCKET_LISTEN 4 #endif /* _SYS_SECURITY_MAC_TE_H */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 7:15:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3BFE37B47A; Thu, 27 Jun 2002 07:14:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from holly.calldei.com (adsl-208-191-149-232.dsl.hstntx.swbell.net [208.191.149.232]) by hub.freebsd.org (Postfix) with ESMTP id C61D037B493; Thu, 27 Jun 2002 07:14:41 -0700 (PDT) Received: by holly.calldei.com (Postfix, from userid 1001) id 4F0EAA1C; Thu, 27 Jun 2002 09:14:59 -0500 (CDT) Date: Thu, 27 Jun 2002 09:14:58 -0500 From: Chris Costello To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 13476 for review Message-ID: <20020627091458.C412@holly.calldei.com> Reply-To: chris@FreeBSD.org References: <200206271407.g5RE7djG050223@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200206271407.g5RE7djG050223@freefall.freebsd.org>; from green@FreeBSD.org on Thu, Jun 27, 2002 at 07:07:39AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thursday, June 27, 2002, Brian Feldman wrote: > Don't crash if an ELF module is b0rked and has a 0 where it > shouldn't. Maybe I should just let it crash? More sanity/validity checks for KLD files is probably for the best. I can't see how you could go wrong in preventing an unnecessary crash, but I think printing a log message like "filename: Invalid ELF header" or the like would be a good idea as well. -- +-------------------+----------------------------------------------------+ | Chris Costello | Remember the good old days, when CPU was singular? | | chris@FreeBSD.org | | +-------------------+----------------------------------------------------+ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 7:36:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3CFF37B406; Thu, 27 Jun 2002 07:36:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A3EDB37B405 for ; Thu, 27 Jun 2002 07:36:15 -0700 (PDT) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5REaFJU054279 for ; Thu, 27 Jun 2002 07:36:15 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5REaFgd054276 for perforce@freebsd.org; Thu, 27 Jun 2002 07:36:15 -0700 (PDT) Date: Thu, 27 Jun 2002 07:36:15 -0700 (PDT) Message-Id: <200206271436.g5REaFgd054276@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 13478 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13478 Change 13478 by chris@chris_holly on 2002/06/27 07:35:32 Make my TrustedBSD Handbook/Dev Handbook notes public. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/OUTLINE.TrustedBSD#1 add .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/OUTLINE.TrustedBSD#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 9:59:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 919D037B40E; Thu, 27 Jun 2002 09:58:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 71B8437B405; Thu, 27 Jun 2002 09:58:22 -0700 (PDT) Received: from localhost (green@localhost) by green.bikeshed.org (8.11.6/8.11.6) with ESMTP id g5RGwNP39104; Thu, 27 Jun 2002 12:58:23 -0400 (EDT) (envelope-from green@green.bikeshed.org) Message-Id: <200206271658.g5RGwNP39104@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: chris@FreeBSD.org Cc: Brian Feldman , Perforce Change Reviews Subject: Re: PERFORCE change 13476 for review In-Reply-To: Your message of "Thu, 27 Jun 2002 09:14:58 CDT." <20020627091458.C412@holly.calldei.com> From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 27 Jun 2002 12:58:22 -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Chris Costello wrote: > On Thursday, June 27, 2002, Brian Feldman wrote: > > Don't crash if an ELF module is b0rked and has a 0 where it > > shouldn't. Maybe I should just let it crash? > > More sanity/validity checks for KLD files is probably for the > best. I can't see how you could go wrong in preventing an > unnecessary crash, but I think printing a log message like > "filename: Invalid ELF header" or the like would be a good idea > as well. Well, the lingering thought in my mind against it is that if the KLD file is really corrupt it could just as easily have a data segment that will crash you when it starts executing. I'm not sure what the right trade-off here is. -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 10:18:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 730AA37B401; Thu, 27 Jun 2002 10:18:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id 6832037B405; Thu, 27 Jun 2002 10:18:23 -0700 (PDT) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g5RHIMbM009709; Thu, 27 Jun 2002 13:18:22 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Thu, 27 Jun 2002 13:18:22 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Chris Costello Cc: Perforce Change Reviews Subject: Re: PERFORCE change 13473 for review In-Reply-To: <20020627065849.B412@holly.calldei.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, 27 Jun 2002, Chris Costello wrote: > On Thursday, June 27, 2002, Chris Costello wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13473 > > > > Change 13473 by chris@chris_holly on 2002/06/27 04:52:20 > > > > Include a man page for these utilities. > > Are we going to keep these for the long term? If so, I can spend > some of my free time rewriting these to match style(9). Wouldn't take > very long at all. There will be utilities of equivilent functionality, but things are sufficiently not set in stone that it's probably not worth investing any substantial time in the current MAC userland interface. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 10:45:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9191D37B405; Thu, 27 Jun 2002 10:42:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 5D4F037B40B for ; Thu, 27 Jun 2002 10:41:41 -0700 (PDT) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5RHffJU086633 for ; Thu, 27 Jun 2002 10:41:41 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5RHfaQZ086630 for perforce@freebsd.org; Thu, 27 Jun 2002 10:41:36 -0700 (PDT) Date: Thu, 27 Jun 2002 10:41:36 -0700 (PDT) Message-Id: <200206271741.g5RHfaQZ086630@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13486 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13486 Change 13486 by julian@julian_ref on 2002/06/27 10:40:35 MFC to try catch some bugfixes in pmap.c Affected files ... .. //depot/projects/kse/sys/alpha/alpha/pmap.c#29 integrate .. //depot/projects/kse/sys/compat/linux/linux_ioctl.c#15 integrate .. //depot/projects/kse/sys/conf/NOTES#9 integrate .. //depot/projects/kse/sys/conf/files#40 integrate .. //depot/projects/kse/sys/conf/options#21 integrate .. //depot/projects/kse/sys/i386/i386/pmap.c#39 integrate .. //depot/projects/kse/sys/kern/kern_jail.c#15 integrate .. //depot/projects/kse/sys/kern/kern_module.c#9 integrate .. //depot/projects/kse/sys/kern/kern_subr.c#14 integrate .. //depot/projects/kse/sys/kern/uipc_cow.c#1 branch .. //depot/projects/kse/sys/kern/uipc_jumbo.c#1 branch .. //depot/projects/kse/sys/kern/uipc_socket.c#19 integrate .. //depot/projects/kse/sys/kern/uipc_syscalls.c#18 integrate .. //depot/projects/kse/sys/modules/ti/Makefile#3 integrate .. //depot/projects/kse/sys/net/if_media.c#3 integrate .. //depot/projects/kse/sys/netinet/ip_input.c#23 integrate .. //depot/projects/kse/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/kse/sys/netinet/ip_output.c#24 integrate .. //depot/projects/kse/sys/pci/if_ti.c#10 integrate .. //depot/projects/kse/sys/pci/if_tireg.h#2 integrate .. //depot/projects/kse/sys/pci/ti_fw.h#2 integrate .. //depot/projects/kse/sys/pci/ti_fw2.h#2 integrate .. //depot/projects/kse/sys/sparc64/conf/GENERIC#15 integrate .. //depot/projects/kse/sys/sys/jumbo.h#1 branch .. //depot/projects/kse/sys/sys/mbuf.h#10 integrate .. //depot/projects/kse/sys/sys/resource.h#6 integrate .. //depot/projects/kse/sys/sys/socketvar.h#21 integrate .. //depot/projects/kse/sys/sys/tiio.h#1 branch .. //depot/projects/kse/sys/sys/uio.h#9 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_vfsops.c#22 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_readwrite.c#11 integrate .. //depot/projects/kse/sys/vm/swap_pager.c#11 integrate .. //depot/projects/kse/sys/vm/vm_fault.c#13 integrate .. //depot/projects/kse/sys/vm/vm_map.c#23 integrate .. //depot/projects/kse/sys/vm/vm_mmap.c#18 integrate .. //depot/projects/kse/sys/vm/vm_object.c#13 integrate .. //depot/projects/kse/sys/vm/vm_object.h#7 integrate .. //depot/projects/kse/sys/vm/vm_page.c#13 integrate .. //depot/projects/kse/sys/vm/vm_page.h#9 integrate .. //depot/projects/kse/sys/vm/vm_unix.c#7 integrate Differences ... ==== //depot/projects/kse/sys/alpha/alpha/pmap.c#29 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.92 2002/04/29 07:43:08 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.93 2002/06/27 04:08:45 jeff Exp $ */ /* @@ -610,7 +610,7 @@ if (initial_pvs < MINPV) initial_pvs = MINPV; pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, 0); + NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); uma_zone_set_allocf(pvzone, pmap_allocf); uma_prealloc(pvzone, initial_pvs); /* ==== //depot/projects/kse/sys/compat/linux/linux_ioctl.c#15 (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. * - * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.85 2002/06/02 20:05:41 schweikh Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.86 2002/06/26 15:53:11 arr Exp $ */ #include @@ -2027,15 +2027,10 @@ ifp = NULL; error = 0; - mtx_lock(&Giant); - if ((error = fget(td, args->fd, &fp)) != 0) { - mtx_unlock(&Giant); + if ((error = fget(td, args->fd, &fp)) != 0) return (error); - } type = fp->f_type; fdrop(fp, td); - mtx_unlock(&Giant); - if (type != DTYPE_SOCKET) { /* not a socket - probably a tap / vmnet device */ switch (args->cmd) { @@ -2243,14 +2238,10 @@ struct file *fp; int error, type; - mtx_lock(&Giant); - if ((error = fget(td, args->fd, &fp)) != 0) { - mtx_unlock(&Giant); + if ((error = fget(td, args->fd, &fp)) != 0) return (error); - } type = fp->f_type; fdrop(fp, td); - mtx_unlock(&Giant); if (type == DTYPE_SOCKET) return (linux_ioctl_socket(td, args)); return (ENOIOCTL); ==== //depot/projects/kse/sys/conf/NOTES#9 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1040 2002/06/21 19:53:04 rwatson Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1041 2002/06/26 03:34:43 ken Exp $ # # @@ -533,6 +533,13 @@ options DUMMYNET options BRIDGE +# Zero copy sockets support. This enables "zero copy" for sending and +# receving data via a socket. The send side works for any type of NIC, +# the receive side only works for NICs that support MTUs greater than the +# page size of your architecture and that support header splitting. See +# zero_copy(9) for more details. +options ZERO_COPY_SOCKETS + # # ATM (HARP version) options # @@ -1670,6 +1677,13 @@ device ti device fpa 1 +# Use "private" jumbo buffers allocated exclusively for the ti(4) driver. +# This option is incompatible with the TI_JUMBO_HDRSPLIT option below. +#options TI_PRIVATE_JUMBOS +# Turn on the header splitting option for the ti(4) driver firmware. This +# only works for Tigon II chips, and has no effect for Tigon I chips. +options TI_JUMBO_HDRSPLIT + # # ATM related options (Cranor version) # (note: this driver cannot be used with the HARP ATM stack) @@ -2255,6 +2269,8 @@ options NBUF=512 # Number of buffer headers +options MSIZE=256 # mbuf size in bytes +options MCLSHIFT=12 # mbuf cluster shift in bits, 12 == 4KB options NMBCLUSTERS=1024 # Number of mbuf clusters options SCSI_NCR_DEBUG ==== //depot/projects/kse/sys/conf/files#40 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.653 2002/06/24 01:53:26 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.654 2002/06/26 03:34:43 ken Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -922,7 +922,9 @@ kern/tty_subr.c standard kern/tty_tty.c standard kern/uipc_accf.c optional inet +kern/uipc_cow.c optional zero_copy_sockets kern/uipc_domain.c standard +kern/uipc_jumbo.c standard kern/uipc_mbuf.c standard kern/uipc_mbuf2.c standard kern/uipc_proto.c standard ==== //depot/projects/kse/sys/conf/options#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.326 2002/06/18 21:30:36 n_hibma Exp $ +# $FreeBSD: src/sys/conf/options,v 1.327 2002/06/26 03:34:43 ken Exp $ # # On the handling of kernel options # @@ -345,6 +345,11 @@ DRM_LINUX opt_drm.h DRM_DEBUG opt_drm.h + +ZERO_COPY_SOCKETS opt_zero.h +TI_PRIVATE_JUMBOS opt_ti.h +TI_JUMBO_HDRSPLIT opt_ti.h + # ATM (HARP version) ATM_CORE opt_atm.h ATM_IP opt_atm.h @@ -405,6 +410,8 @@ REGRESSION opt_global.h RESTARTABLE_PANICS opt_global.h VFS_BIO_DEBUG opt_global.h +MSIZE opt_global.h +MCLSHIFT opt_global.h # These are VM related options VM_KMEM_SIZE opt_vm.h ==== //depot/projects/kse/sys/i386/i386/pmap.c#39 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.324 2002/06/25 22:14:06 iedowse Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.326 2002/06/27 06:34:03 arr Exp $ */ /* @@ -2016,7 +2016,7 @@ register pt_entry_t *ptbase; vm_offset_t pdnxt; pd_entry_t ptpaddr; - vm_pindex_t sindex, eindex; + vm_offset_t sindex, eindex; int anychanged; if (pmap == NULL) @@ -2499,7 +2499,7 @@ ((objpgs > 0) && (p != NULL)); p = TAILQ_NEXT(p, listq)) { - if (p->pindex < pindex || p->pindex - pindex > psize) { + if (p->pindex < pindex || p->pindex - pindex >= psize) { continue; } tmpidx = p->pindex - pindex; ==== //depot/projects/kse/sys/kern/kern_jail.c#15 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/kern/kern_jail.c,v 1.23 2002/04/04 21:03:25 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_jail.c,v 1.24 2002/06/26 00:29:01 arr Exp $ * */ @@ -72,7 +72,6 @@ if (j.version != 0) return (EINVAL); - mtx_lock(&Giant); MALLOC(pr, struct prison *, sizeof *pr , M_PRISON, M_WAITOK | M_ZERO); mtx_init(&pr->pr_mtx, "jail mutex", NULL, MTX_DEF); pr->pr_securelevel = securelevel; @@ -97,14 +96,12 @@ pr->pr_ref = 1; PROC_UNLOCK(p); crfree(oldcred); - mtx_unlock(&Giant); return (0); badcred: PROC_UNLOCK(p); crfree(newcred); bail: FREE(pr, M_PRISON); - mtx_unlock(&Giant); return (error); } ==== //depot/projects/kse/sys/kern/kern_module.c#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_module.c,v 1.33 2002/03/18 07:45:27 arr Exp $ + * $FreeBSD: src/sys/kern/kern_module.c,v 1.35 2002/06/26 03:00:40 arr Exp $ */ #include @@ -256,9 +256,8 @@ module_t mod; int error = 0; - mtx_lock(&Giant); + td->td_retval[0] = -1; - td->td_retval[0] = -1; MOD_SLOCK; if (SCARG(uap, modid) == 0) { mod = TAILQ_FIRST(&modules); @@ -279,7 +278,6 @@ td->td_retval[0] = 0; done2: MOD_SUNLOCK; - mtx_unlock(&Giant); return (error); } @@ -294,8 +292,6 @@ td->td_retval[0] = -1; - mtx_lock(&Giant); - MOD_SLOCK; mod = module_lookupbyid(SCARG(uap, modid)); if (mod == NULL) { @@ -308,7 +304,6 @@ td->td_retval[0] = 0; } MOD_SUNLOCK; - mtx_unlock(&Giant); return (error); } @@ -332,14 +327,11 @@ struct module_stat *stat; char *name; - mtx_lock(&Giant); - MOD_SLOCK; mod = module_lookupbyid(SCARG(uap, modid)); if (mod == NULL) { MOD_SUNLOCK; - error = ENOENT; - goto out; + return (ENOENT); } id = mod->id; refs = mod->refs; @@ -352,34 +344,29 @@ * Check the version of the user's structure. */ if ((error = copyin(&stat->version, &version, sizeof(version))) != 0) - goto out; + return (error); if (version != sizeof(struct module_stat_v1) - && version != sizeof(struct module_stat)) { - error = EINVAL; - goto out; - } + && version != sizeof(struct module_stat)) + return (EINVAL); namelen = strlen(mod->name) + 1; if (namelen > MAXMODNAME) namelen = MAXMODNAME; if ((error = copyout(name, &stat->name[0], namelen)) != 0) - goto out; + return (error); if ((error = copyout(&refs, &stat->refs, sizeof(int))) != 0) - goto out; + return (error); if ((error = copyout(&id, &stat->id, sizeof(int))) != 0) - goto out; + return (error); /* * >v1 stat includes module data. */ - if (version == sizeof(struct module_stat)) { + if (version == sizeof(struct module_stat)) if ((error = copyout(&data, &stat->data, sizeof(data))) != 0) - goto out; - } + return (error); td->td_retval[0] = 0; -out: - mtx_unlock(&Giant); return (error); } @@ -394,9 +381,8 @@ module_t mod; if ((error = copyinstr(SCARG(uap, name), name, sizeof name, 0)) != 0) - goto out; + return (error); - mtx_lock(&Giant); MOD_SLOCK; mod = module_lookupbyname(name); if (mod == NULL) @@ -404,7 +390,5 @@ else td->td_retval[0] = module_getid(mod); MOD_SUNLOCK; - mtx_unlock(&Giant); -out: return (error); } ==== //depot/projects/kse/sys/kern/kern_subr.c#14 (text+ko) ==== @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_subr.c,v 1.53 2002/06/20 07:08:43 peter Exp $ + * $FreeBSD: src/sys/kern/kern_subr.c,v 1.54 2002/06/26 03:34:48 ken Exp $ */ +#include "opt_zero.h" + #include #include #include @@ -58,6 +60,82 @@ SYSCTL_INT(_kern, KERN_IOV_MAX, iov_max, CTLFLAG_RD, NULL, UIO_MAXIOV, "Maximum number of elements in an I/O vector; sysconf(_SC_IOV_MAX)"); +#ifdef ZERO_COPY_SOCKETS +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Declared in uipc_socket.c */ +extern int so_zero_copy_receive; + +static int vm_pgmoveco(vm_map_t mapa, vm_object_t srcobj, vm_offset_t kaddr, + vm_offset_t uaddr); +static int userspaceco(caddr_t cp, u_int cnt, struct uio *uio, + struct vm_object *obj, int disposable); + +static int +vm_pgmoveco(mapa, srcobj, kaddr, uaddr) + vm_map_t mapa; + vm_object_t srcobj; + vm_offset_t kaddr, uaddr; +{ + vm_map_t map = mapa; + vm_page_t kern_pg, user_pg; + vm_object_t uobject; + vm_map_entry_t entry; + vm_pindex_t upindex, kpindex; + vm_prot_t prot; + boolean_t wired; + + /* + * First lookup the kernel page. + */ + kern_pg = PHYS_TO_VM_PAGE(vtophys(kaddr)); + + if ((vm_map_lookup(&map, uaddr, + VM_PROT_READ, &entry, &uobject, + &upindex, &prot, &wired)) != KERN_SUCCESS) { + return(EFAULT); + } + if ((user_pg = vm_page_lookup(uobject, upindex)) != NULL) { + vm_page_sleep_busy(user_pg, 1, "vm_pgmoveco"); + pmap_remove(map->pmap, uaddr, uaddr+PAGE_SIZE); + vm_page_busy(user_pg); + vm_page_free(user_pg); + } + + if (kern_pg->busy || ((kern_pg->queue - kern_pg->pc) == PQ_FREE) || + (kern_pg->hold_count != 0)|| (kern_pg->flags & PG_BUSY)) { + printf("vm_pgmoveco: pindex(%lu), busy(%d), PG_BUSY(%d), " + "hold(%d) paddr(0x%lx)\n", (u_long)kern_pg->pindex, + kern_pg->busy, (kern_pg->flags & PG_BUSY) ? 1 : 0, + kern_pg->hold_count, (u_long)kern_pg->phys_addr); + if ((kern_pg->queue - kern_pg->pc) == PQ_FREE) + panic("vm_pgmoveco: renaming free page"); + else + panic("vm_pgmoveco: renaming busy page"); + } + kpindex = kern_pg->pindex; + vm_page_busy(kern_pg); + vm_page_rename(kern_pg, uobject, upindex); + vm_page_flag_clear(kern_pg, PG_BUSY); + kern_pg->valid = VM_PAGE_BITS_ALL; + + vm_map_lookup_done(map, entry); + return(KERN_SUCCESS); +} +#endif /* ZERO_COPY_SOCKETS */ + int uiomove(cp, n, uio) register caddr_t cp; @@ -133,16 +211,100 @@ return (error); } -#ifdef ENABLE_VFS_IOOPT +#if defined(ENABLE_VFS_IOOPT) || defined(ZERO_COPY_SOCKETS) /* * Experimental support for zero-copy I/O */ +static int +userspaceco(cp, cnt, uio, obj, disposable) + caddr_t cp; + u_int cnt; + struct uio *uio; + struct vm_object *obj; + int disposable; +{ + struct iovec *iov; + int error; + + iov = uio->uio_iov; + +#ifdef ZERO_COPY_SOCKETS + + if (uio->uio_rw == UIO_READ) { + if ((so_zero_copy_receive != 0) + && (obj != NULL) + && ((cnt & PAGE_MASK) == 0) + && ((((intptr_t) iov->iov_base) & PAGE_MASK) == 0) + && ((uio->uio_offset & PAGE_MASK) == 0) + && ((((intptr_t) cp) & PAGE_MASK) == 0) + && (obj->type == OBJT_DEFAULT) + && (disposable != 0)) { + /* SOCKET: use page-trading */ + /* + * We only want to call vm_pgmoveco() on + * disposeable pages, since it gives the + * kernel page to the userland process. + */ + error = vm_pgmoveco(&curproc->p_vmspace->vm_map, + obj, (vm_offset_t)cp, + (vm_offset_t)iov->iov_base); + + /* + * If we get an error back, attempt + * to use copyout() instead. The + * disposable page should be freed + * automatically if we weren't able to move + * it into userland. + */ + if (error != 0) + error = copyout(cp, iov->iov_base, cnt); +#ifdef ENABLE_VFS_IOOPT + } else if ((vfs_ioopt != 0) + && ((cnt & PAGE_MASK) == 0) + && ((((intptr_t) iov->iov_base) & PAGE_MASK) == 0) + && ((uio->uio_offset & PAGE_MASK) == 0) + && ((((intptr_t) cp) & PAGE_MASK) == 0)) { + error = vm_uiomove(&curproc->p_vmspace->vm_map, obj, + uio->uio_offset, cnt, + (vm_offset_t) iov->iov_base, NULL); +#endif /* ENABLE_VFS_IOOPT */ + } else { + error = copyout(cp, iov->iov_base, cnt); + } + } else { + error = copyin(iov->iov_base, cp, cnt); + } +#else /* ZERO_COPY_SOCKETS */ + if (uio->uio_rw == UIO_READ) { +#ifdef ENABLE_VFS_IOOPT + if ((vfs_ioopt != 0) + && ((cnt & PAGE_MASK) == 0) + && ((((intptr_t) iov->iov_base) & PAGE_MASK) == 0) + && ((uio->uio_offset & PAGE_MASK) == 0) + && ((((intptr_t) cp) & PAGE_MASK) == 0)) { + error = vm_uiomove(&curproc->p_vmspace->vm_map, obj, + uio->uio_offset, cnt, + (vm_offset_t) iov->iov_base, NULL); + } else +#endif /* ENABLE_VFS_IOOPT */ + { + error = copyout(cp, iov->iov_base, cnt); + } + } else { + error = copyin(iov->iov_base, cp, cnt); + } +#endif /* ZERO_COPY_SOCKETS */ + + return (error); +} + int -uiomoveco(cp, n, uio, obj) +uiomoveco(cp, n, uio, obj, disposable) caddr_t cp; int n; struct uio *uio; struct vm_object *obj; + int disposable; { struct iovec *iov; u_int cnt; @@ -169,23 +331,9 @@ case UIO_USERSPACE: if (ticks - PCPU_GET(switchticks) >= hogticks) uio_yield(); - if (uio->uio_rw == UIO_READ) { -#ifdef ENABLE_VFS_IOOPT - if (vfs_ioopt && ((cnt & PAGE_MASK) == 0) && - ((((intptr_t) iov->iov_base) & PAGE_MASK) == 0) && - ((uio->uio_offset & PAGE_MASK) == 0) && - ((((intptr_t) cp) & PAGE_MASK) == 0)) { - error = vm_uiomove(&curproc->p_vmspace->vm_map, obj, - uio->uio_offset, cnt, - (vm_offset_t) iov->iov_base, NULL); - } else -#endif - { - error = copyout(cp, iov->iov_base, cnt); - } - } else { - error = copyin(iov->iov_base, cp, cnt); - } + + error = userspaceco(cp, cnt, uio, obj, disposable); + if (error) return (error); break; @@ -208,6 +356,9 @@ } return (0); } +#endif /* ENABLE_VFS_IOOPT || ZERO_COPY_SOCKETS */ + +#ifdef ENABLE_VFS_IOOPT /* * Experimental support for zero-copy I/O @@ -277,7 +428,7 @@ } return error; } -#endif +#endif /* ENABLE_VFS_IOOPT */ /* * Give next character to user as result of read. ==== //depot/projects/kse/sys/kern/uipc_socket.c#19 (text+ko) ==== @@ -31,10 +31,11 @@ * SUCH DAMAGE. * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.123 2002/06/20 18:52:54 alfred Exp $ + * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.124 2002/06/26 03:34:48 ken Exp $ */ #include "opt_inet.h" +#include "opt_zero.h" #include #include @@ -94,6 +95,17 @@ static int numopensockets; SYSCTL_INT(_kern_ipc, OID_AUTO, numopensockets, CTLFLAG_RD, &numopensockets, 0, "Number of open sockets"); +#ifdef ZERO_COPY_SOCKETS +/* These aren't static because they're used in other files. */ +int so_zero_copy_send = 1; +int so_zero_copy_receive = 1; +SYSCTL_NODE(_kern_ipc, OID_AUTO, zero_copy, CTLFLAG_RD, 0, + "Zero copy controls"); +SYSCTL_INT(_kern_ipc_zero_copy, OID_AUTO, receive, CTLFLAG_RW, + &so_zero_copy_receive, 0, "Enable zero copy receive"); +SYSCTL_INT(_kern_ipc_zero_copy, OID_AUTO, send, CTLFLAG_RW, + &so_zero_copy_send, 0, "Enable zero copy send"); +#endif /* ZERO_COPY_SOCKETS */ /* @@ -471,6 +483,22 @@ * must check for short counts if EINTR/ERESTART are returned. * Data and control buffers are freed on return. */ + +#ifdef ZERO_COPY_SOCKETS +struct so_zerocopy_stats{ + int size_ok; + int align_ok; + int found_ifp; +}; +struct so_zerocopy_stats so_zerocp_stats = {0,0,0}; +#include +#include +#include +#include +#include +#include +#endif /*ZERO_COPY_SOCKETS*/ + int sosend(so, addr, uio, top, control, flags, td) register struct socket *so; @@ -486,6 +514,9 @@ register long space, len, resid; int clen = 0, error, s, dontroute, mlen; int atomic = sosendallatonce(so) || top; +#ifdef ZERO_COPY_SOCKETS + int cow_send; +#endif /* ZERO_COPY_SOCKETS */ if (uio) resid = uio->uio_resid; @@ -574,6 +605,9 @@ if (flags & MSG_EOR) top->m_flags |= M_EOR; } else do { +#ifdef ZERO_COPY_SOCKETS + cow_send = 0; +#endif /* ZERO_COPY_SOCKETS */ if (top == 0) { MGETHDR(m, M_TRYWAIT, MT_DATA); if (m == NULL) { @@ -592,12 +626,32 @@ mlen = MLEN; } if (resid >= MINCLSIZE) { +#ifdef ZERO_COPY_SOCKETS + if (so_zero_copy_send && + resid>=PAGE_SIZE && + space>=PAGE_SIZE && + uio->uio_iov->iov_len>=PAGE_SIZE) { + so_zerocp_stats.size_ok++; + if (!((vm_offset_t) + uio->uio_iov->iov_base & PAGE_MASK)){ + so_zerocp_stats.align_ok++; + cow_send = socow_setup(m, uio); + } + } + if (!cow_send){ +#endif /* ZERO_COPY_SOCKETS */ MCLGET(m, M_TRYWAIT); if ((m->m_flags & M_EXT) == 0) goto nopages; mlen = MCLBYTES; len = min(min(mlen, resid), space); } else { +#ifdef ZERO_COPY_SOCKETS + len = PAGE_SIZE; + } + + } else { +#endif /* ZERO_COPY_SOCKETS */ nopages: len = min(min(mlen, resid), space); /* @@ -608,6 +662,11 @@ MH_ALIGN(m, len); } space -= len; +#ifdef ZERO_COPY_SOCKETS + if (cow_send) + error = 0; + else +#endif /* ZERO_COPY_SOCKETS */ error = uiomove(mtod(m, caddr_t), (int)len, uio); resid = uio->uio_resid; m->m_len = len; @@ -719,6 +778,27 @@ if (error) goto bad; do { +#ifdef ZERO_COPY_SOCKETS + if (so_zero_copy_receive) { + vm_page_t pg; + int disposable; + + if ((m->m_flags & M_EXT) + && (m->m_ext.ext_type == EXT_DISPOSABLE)) + disposable = 1; + else + disposable = 0; + + pg = PHYS_TO_VM_PAGE(vtophys(mtod(m, caddr_t))); + if (uio->uio_offset == -1) + uio->uio_offset =IDX_TO_OFF(pg->pindex); + + error = uiomoveco(mtod(m, caddr_t), + min(uio->uio_resid, m->m_len), + uio, pg->object, + disposable); + } else +#endif /* ZERO_COPY_SOCKETS */ error = uiomove(mtod(m, caddr_t), (int) min(uio->uio_resid, m->m_len), uio); m = m_free(m); @@ -874,6 +954,28 @@ */ if (mp == 0) { splx(s); +#ifdef ZERO_COPY_SOCKETS + if (so_zero_copy_receive) { + vm_page_t pg; + int disposable; + + if ((m->m_flags & M_EXT) + && (m->m_ext.ext_type == EXT_DISPOSABLE)) + disposable = 1; + else + disposable = 0; + + pg = PHYS_TO_VM_PAGE(vtophys(mtod(m, caddr_t) + + moff)); + + if (uio->uio_offset == -1) + uio->uio_offset =IDX_TO_OFF(pg->pindex); + + error = uiomoveco(mtod(m, caddr_t) + moff, + (int)len, uio,pg->object, + disposable); + } else +#endif /* ZERO_COPY_SOCKETS */ error = uiomove(mtod(m, caddr_t) + moff, (int)len, uio); s = splnet(); if (error) ==== //depot/projects/kse/sys/kern/uipc_syscalls.c#18 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.113 2002/06/20 18:52:54 alfred Exp $ + * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.114 2002/06/26 03:34:48 ken Exp $ */ #include "opt_compat.h" @@ -74,8 +74,8 @@ static void sf_buf_init(void *arg); SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) -static struct sf_buf *sf_buf_alloc(void); -static void sf_buf_free(caddr_t addr, void *args); +struct sf_buf *sf_buf_alloc(void); +void sf_buf_free(caddr_t addr, void *args); static int sendit(struct thread *td, int s, struct msghdr *mp, int flags); static int recvit(struct thread *td, int s, struct msghdr *mp, @@ -96,9 +96,9 @@ struct mtx sf_lock; } sf_freelist; -static vm_offset_t sf_base; -static struct sf_buf *sf_bufs; -static u_int sf_buf_alloc_want; +vm_offset_t sf_base; +struct sf_buf *sf_bufs; +u_int sf_buf_alloc_want; /* * System call interface to the socket abstraction. @@ -1570,7 +1570,7 @@ /* * Get an sf_buf from the freelist. Will block if none are available. */ -static struct sf_buf * +struct sf_buf * sf_buf_alloc() { struct sf_buf *sf; @@ -1600,7 +1600,7 @@ /* * Detatch mapped page and release resources back to the system. */ -static void +void sf_buf_free(caddr_t addr, void *args) { struct sf_buf *sf; ==== //depot/projects/kse/sys/modules/ti/Makefile#3 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/sys/modules/ti/Makefile,v 1.12 2001/09/05 23:47:02 brooks Exp $ +# $FreeBSD: src/sys/modules/ti/Makefile,v 1.13 2002/06/26 03:34:49 ken Exp $ .PATH: ${.CURDIR}/../../pci KMOD= if_ti -SRCS= if_ti.c opt_bdg.h device_if.h bus_if.h pci_if.h +SRCS= if_ti.c opt_bdg.h device_if.h bus_if.h pci_if.h opt_ti.h opt_zero.h \ + vnode_if.h .include ==== //depot/projects/kse/sys/net/if_media.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_media.c,v 1.1 1997/03/17 02:55:15 thorpej Exp $ */ -/* $FreeBSD: src/sys/net/if_media.c,v 1.16 2002/03/19 21:54:18 alfred Exp $ */ +/* $FreeBSD: src/sys/net/if_media.c,v 1.17 2002/06/26 03:34:50 ken Exp $ */ /* * Copyright (c) 1997 @@ -303,8 +303,10 @@ if (ifmr->ifm_count != 0) { kptr = (int *)malloc(ifmr->ifm_count * sizeof(int), - M_TEMP, M_WAITOK); + M_TEMP, M_NOWAIT); + if (kptr == NULL) + return (ENOMEM); /* * Get the media words from the interface's list. */ ==== //depot/projects/kse/sys/netinet/ip_input.c#23 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_input.c,v 1.203 2002/06/23 20:48:26 luigi Exp $ + * $FreeBSD: src/sys/netinet/ip_input.c,v 1.204 2002/06/27 11:02:06 mux Exp $ */ #define _IP_VHL @@ -308,7 +308,7 @@ break; case PACKET_TAG_DIVERT: - args.divert_rule = (int)m->m_hdr.mh_data & 0xffff; + args.divert_rule = (intptr_t)m->m_hdr.mh_data & 0xffff; break; case PACKET_TAG_IPFORWARD: ==== //depot/projects/kse/sys/netinet/ip_mroute.c#11 (text+ko) ==== @@ -9,7 +9,7 @@ * Modified by Bill Fenner, PARC, April 1995 * * MROUTING Revision: 3.5 - * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.76 2002/05/31 11:52:32 tanimura Exp $ + * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.77 2002/06/26 21:00:53 luigi Exp $ */ #include "opt_mrouting.h" @@ -2058,6 +2058,11 @@ printf("ip_rsvp_vif_done: v_rsvpd = %p so = %p\n", viftable[i].v_rsvpd, so); + /* + * XXX as an additional consistency check, one could make sure + * that viftable[i].v_rsvpd == so, otherwise passing so as + * first parameter is pretty useless. + */ viftable[i].v_rsvpd = NULL; /* * This may seem silly, but we need to be sure we don't over-decrement ==== //depot/projects/kse/sys/netinet/ip_output.c#24 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/netinet/ip_output.c,v 1.159 2002/06/23 09:15:43 luigi Exp $ + * $FreeBSD: src/sys/netinet/ip_output.c,v 1.161 2002/06/27 11:02:06 mux Exp $ */ #define _IP_VHL @@ -168,7 +168,7 @@ break; case PACKET_TAG_DIVERT: - args.divert_rule = (int)m0->m_data & 0xffff; + args.divert_rule = (intptr_t)m0->m_data & 0xffff; break; case PACKET_TAG_IPFORWARD: @@ -917,8 +917,50 @@ m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; } + if (len > PAGE_SIZE) { + /* + * Fragement large datagrams such that each segment + * contains a multiple of PAGE_SIZE amount of data, + * plus headers. This enables a receiver to perform + * page-flipping zero-copy optimizations. + */ + + int newlen; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 11:30:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EBB537B480; Thu, 27 Jun 2002 11:27:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2312F37B49E for ; Thu, 27 Jun 2002 11:25:42 -0700 (PDT) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5RIPZJU095445 for ; Thu, 27 Jun 2002 11:25:35 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5RIPZwl095442 for perforce@freebsd.org; Thu, 27 Jun 2002 11:25:35 -0700 (PDT) Date: Thu, 27 Jun 2002 11:25:35 -0700 (PDT) Message-Id: <200206271825.g5RIPZwl095442@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 13489 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13489 Change 13489 by green@green_laptop_2 on 2002/06/27 11:25:26 Add my missingops tool. Affected files ... .. //depot/projects/trustedbsd/mac/tools/tools/README#5 edit .. //depot/projects/trustedbsd/mac/tools/tools/missingops/missingops.rb#1 add Differences ... ==== //depot/projects/trustedbsd/mac/tools/tools/README#5 (text+ko) ==== @@ -20,6 +20,7 @@ kerninclude Shellscript to find unused #includes in the kernel. kernxref Shellscript to cross reference symbols in the LINT kernel. mid Create a Message-ID database for mailing lists. +missingops Generate a list of MAC ops not implemented by a source file pciid Generate src/share/misc/pci_vendors. portsinfo Generate list of new ports for last two weeks. prstats Generate statistics about the PR database. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 14: 4:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68D7537B40B; Thu, 27 Jun 2002 14:04:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 46F0D37B4EE for ; Thu, 27 Jun 2002 14:03:50 -0700 (PDT) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5RL3oJU022839 for ; Thu, 27 Jun 2002 14:03:50 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5RL3ngk022836 for perforce@freebsd.org; Thu, 27 Jun 2002 14:03:49 -0700 (PDT) Date: Thu, 27 Jun 2002 14:03:49 -0700 (PDT) Message-Id: <200206272103.g5RL3ngk022836@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13496 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13496 Change 13496 by julian@julian_ref on 2002/06/27 14:03:30 MFC to see if it fixes anything.. Affected files ... .. //depot/projects/kse/sys/kern/kern_acl.c#16 integrate .. //depot/projects/kse/sys/pccard/pcic_pci.c#26 integrate Differences ... ==== //depot/projects/kse/sys/kern/kern_acl.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_acl.c,v 1.28 2002/06/13 23:17:39 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_acl.c,v 1.30 2002/06/27 19:31:15 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -50,12 +50,12 @@ MALLOC_DEFINE(M_ACL, "acl", "access control list"); -static int vacl_set_acl(struct thread *td, struct vnode *vp, acl_type_t type, - struct acl *aclp); -static int vacl_get_acl(struct thread *td, struct vnode *vp, acl_type_t type, - struct acl *aclp); +static int vacl_set_acl(struct thread *td, struct vnode *vp, + acl_type_t type, struct acl *aclp); +static int vacl_get_acl(struct thread *td, struct vnode *vp, + acl_type_t type, struct acl *aclp); static int vacl_aclcheck(struct thread *td, struct vnode *vp, - acl_type_t type, struct acl *aclp); + acl_type_t type, struct acl *aclp); /* * Implement a version of vaccess() that understands POSIX.1e ACL semantics. @@ -621,7 +621,7 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_SETACL(vp, ACL_TYPE_DEFAULT, 0, td->td_ucred, td); + error = VOP_SETACL(vp, type, NULL, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return (error); ==== //depot/projects/kse/sys/pccard/pcic_pci.c#26 (text+ko) ==== @@ -26,7 +26,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/pccard/pcic_pci.c,v 1.112 2002/06/23 01:55:10 imp Exp $ + * $FreeBSD: src/sys/pccard/pcic_pci.c,v 1.115 2002/06/27 19:56:22 imp Exp $ */ #include @@ -435,7 +435,7 @@ { /* * The 68xx datasheets make it hard to know what the right thing - * do do here is. We do hwat we knjow, which is nothing, and + * to do here is. We do what we know, which is nothing, and * hope for the best. */ /* XXX */ @@ -1338,7 +1338,7 @@ pci_write_config(dev, sc->memrid, 0xffffffff, 4); sockbase = pci_read_config(dev, sc->memrid, 4); sockbase = (sockbase & 0xfffffff0) & -(sockbase & 0xfffffff0); -#define CARDBUS_SYS_RES_MEMORY_START 0x44000000 +#define CARDBUS_SYS_RES_MEMORY_START 0x88000000 #define CARDBUS_SYS_RES_MEMORY_END 0xFFFFFFFF sc->memres = bus_generic_alloc_resource(device_get_parent(dev), dev, SYS_RES_MEMORY, &sc->memrid, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 14:13:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81BDB37B406; Thu, 27 Jun 2002 14:13:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E689F37B401 for ; Thu, 27 Jun 2002 14:13:01 -0700 (PDT) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5RLD1JU027980 for ; Thu, 27 Jun 2002 14:13:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5RLD1Ku027977 for perforce@freebsd.org; Thu, 27 Jun 2002 14:13:01 -0700 (PDT) Date: Thu, 27 Jun 2002 14:13:01 -0700 (PDT) Message-Id: <200206272113.g5RLD1Ku027977@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13497 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13497 Change 13497 by rwatson@rwatson_tislabs on 2002/06/27 14:12:38 Teach the MAC framework about ACL operations (delete, get, set), and the ACL code about the MAC framework. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#8 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#153 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#107 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#66 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#8 (text+ko) ==== @@ -33,6 +33,7 @@ */ #include "opt_cap.h" +#include "opt_mac.h" #include #include @@ -584,7 +585,16 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); +#ifdef MAC + error = mac_cred_check_setacl_vnode(td->td_ucred, vp, type, + &inkernacl); + if (error != 0) + goto out; +#endif error = VOP_SETACL(vp, type, &inkernacl, td->td_ucred, td); +#ifdef MAC +out: +#endif VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return(error); @@ -602,7 +612,15 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); +#ifdef MAC + error = mac_cred_check_getacl_vnode(td->td_ucred, vp, type); + if (error != 0) + goto out; +#endif error = VOP_GETACL(vp, type, &inkernelacl, td->td_ucred, td); +#ifdef MAC +out: +#endif VOP_UNLOCK(vp, 0, td); if (error == 0) error = copyout(&inkernelacl, aclp, sizeof(struct acl)); @@ -623,7 +641,15 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); +#ifdef MAC + error = mac_cred_check_deleteacl_vnode(td->td_ucred, vp, type); + if (error) + goto out; +#endif error = VOP_SETACL(vp, ACL_TYPE_DEFAULT, 0, td->td_ucred, td); +#ifdef MAC +out: +#endif VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return (error); ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#153 (text+ko) ==== @@ -499,10 +499,18 @@ mpc->mpc_ops.mpo_cred_check_delete_vnode = mpe->mpe_function; break; + case MAC_CRED_CHECK_DELETEACL_VNODE: + mpc->mpc_ops.mpo_cred_check_deleteacl_vnode = + mpe->mpe_function; + break; case MAC_CRED_CHECK_EXEC_VNODE: mpc->mpc_ops.mpo_cred_check_exec_vnode = mpe->mpe_function; break; + case MAC_CRED_CHECK_GETACL_VNODE: + mpc->mpc_ops.mpo_cred_check_getacl_vnode = + mpe->mpe_function; + break; case MAC_CRED_CHECK_GETEXTATTR_VNODE: mpc->mpc_ops.mpo_cred_check_getextattr_vnode = mpe->mpe_function; @@ -531,6 +539,10 @@ mpc->mpc_ops.mpo_cred_check_search_vnode = mpe->mpe_function; break; + case MAC_CRED_CHECK_SETACL_VNODE: + mpc->mpc_ops.mpo_cred_check_setacl_vnode = + mpe->mpe_function; + break; case MAC_CRED_CHECK_SETEXTATTR_VNODE: mpc->mpc_ops.mpo_cred_check_setextattr_vnode = mpe->mpe_function; @@ -1450,6 +1462,25 @@ } int +mac_cred_check_getacl_vnode(struct ucred *cred, struct vnode *vp, + acl_type_t type) +{ + int error; + + ASSERT_VOP_LOCKED(vp, "mac_cred_check_getacl_vnode"); + + if (!mac_enforce_fs) + return (0); + + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + + MAC_CHECK(cred_check_getacl_vnode, cred, vp, &vp->v_label, type); + return (error); +} + +int mac_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio) { @@ -1538,6 +1569,25 @@ } int +mac_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, + acl_type_t type, struct acl *acl) +{ + int error; + + ASSERT_VOP_LOCKED(vp, "mac_cred_check_setacl_vnode"); + + if (!mac_enforce_fs) + return (0); + + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + + MAC_CHECK(cred_check_setacl_vnode, cred, vp, &vp->v_label, type, acl); + return (error); +} + +int mac_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio) { @@ -1659,6 +1709,26 @@ } int +mac_cred_check_deleteacl_vnode(struct ucred *cred, struct vnode *vp, + acl_type_t type) +{ + int error; + + ASSERT_VOP_LOCKED(vp, "mac_cred_check_deleteacl_vnode"); + + if (!mac_enforce_fs) + return (0); + + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + + MAC_CHECK(cred_check_deleteacl_vnode, cred, vp, &vp->v_label, + type); + return (error); +} + +int mac_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, struct vnode *vp) { ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#107 (text+ko) ==== @@ -210,6 +210,8 @@ struct vattr; struct vnode; +#include /* XXX acl_type_t */ + /* Label-based operations. */ void mac_init_bpfdesc(struct bpf_d *); void mac_init_devfsdirent(struct devfs_dirent *); @@ -247,11 +249,17 @@ struct sockaddr *sa); int mac_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct vattr *vap); +int mac_cred_check_deleteacl_vnode(struct ucred *cred, struct vnode *vp, + acl_type_t type); +int mac_cred_check_getacl_vnode(struct ucred *cred, struct vnode *vp, + acl_type_t type); int mac_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio); int mac_cred_check_listen_socket(struct ucred *cred, struct socket *socket); int mac_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp); +int mac_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, + acl_type_t type, struct acl *acl); int mac_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio); int mac_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#66 (text+ko) ==== @@ -254,8 +254,12 @@ int (*mpo_cred_check_delete_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, void *label); + int (*mpo_cred_check_deleteacl_vnode)(struct ucred *cred, + struct vnode *vp, struct label *label, acl_type_t type); int (*mpo_cred_check_exec_vnode)(struct ucred *cred, struct vnode *vp, struct label *label); + int (*mpo_cred_check_getacl_vnode)(struct ucred *cred, + struct vnode *vp, struct label *label, acl_type_t type); int (*mpo_cred_check_getextattr_vnode)(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio); @@ -274,6 +278,9 @@ struct vnode *vp, struct label *label); int (*mpo_cred_check_search_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel); + int (*mpo_cred_check_setacl_vnode)(struct ucred *cred, + struct vnode *vp, struct label *label, acl_type_t type, + struct acl *acl); int (*mpo_cred_check_setextattr_vnode)(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio); @@ -381,7 +388,9 @@ MAC_CRED_CHECK_CONNECT_SOCKET, MAC_CRED_CHECK_CREATE_VNODE, MAC_CRED_CHECK_DELETE_VNODE, + MAC_CRED_CHECK_DELETEACL_VNODE, MAC_CRED_CHECK_EXEC_VNODE, + MAC_CRED_CHECK_GETACL_VNODE, MAC_CRED_CHECK_GETEXTATTR_VNODE, MAC_CRED_CHECK_LISTEN_SOCKET, MAC_CRED_CHECK_OPEN_VNODE, @@ -389,6 +398,7 @@ MAC_CRED_CHECK_RENAME_TO_VNODE, MAC_CRED_CHECK_REVOKE_VNODE, MAC_CRED_CHECK_SEARCH_VNODE, + MAC_CRED_CHECK_SETACL_VNODE, MAC_CRED_CHECK_SETEXTATTR_VNODE, MAC_CRED_CHECK_SETFLAGS_VNODE, MAC_CRED_CHECK_SETMODE_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 14:14:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8468E37B401; Thu, 27 Jun 2002 14:13:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 49B0E37B405 for ; Thu, 27 Jun 2002 14:13:02 -0700 (PDT) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5RLD2JU027987 for ; Thu, 27 Jun 2002 14:13:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5RLD1v0027984 for perforce@freebsd.org; Thu, 27 Jun 2002 14:13:01 -0700 (PDT) Date: Thu, 27 Jun 2002 14:13:01 -0700 (PDT) Message-Id: <200206272113.g5RLD1v0027984@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13498 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13498 Change 13498 by rwatson@rwatson_tislabs on 2002/06/27 14:12:50 Teach various policies about ACLs. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#51 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#30 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#37 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#32 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#34 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#3 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#51 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -1378,6 +1379,24 @@ } static int +mac_biba_cred_check_deleteacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_biba_cred_check_exec_vnode(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -1396,6 +1415,24 @@ } static int +mac_biba_cred_check_getacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int mac_biba_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { @@ -1523,6 +1560,24 @@ } static int +mac_biba_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type, struct acl *acl) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_biba_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, int attrnamespace, const char *name, struct uio *uio) @@ -1852,8 +1907,12 @@ (macop_t)mac_biba_cred_check_create_vnode }, { MAC_CRED_CHECK_DELETE_VNODE, (macop_t)mac_biba_cred_check_delete_vnode }, + { MAC_CRED_CHECK_DELETEACL_VNODE, + (macop_t)mac_biba_cred_check_deleteacl_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)mac_biba_cred_check_exec_vnode }, + { MAC_CRED_CHECK_GETACL_VNODE, + (macop_t)mac_biba_cred_check_getacl_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_biba_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, @@ -1866,6 +1925,8 @@ (macop_t)mac_biba_cred_check_revoke_vnode }, { MAC_CRED_CHECK_SEARCH_VNODE, (macop_t)mac_biba_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETACL_VNODE, + (macop_t)mac_biba_cred_check_setacl_vnode }, { MAC_CRED_CHECK_SETEXTATTR_VNODE, (macop_t)mac_biba_cred_check_setextattr_vnode }, { MAC_CRED_CHECK_SETFLAGS_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#30 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -334,6 +335,22 @@ } static int +mac_bsdextended_cred_check_deleteacl_vnode(struct ucred *cred, + struct vnode *vp, struct label *label, acl_type_t type) +{ + struct vattr vap; + int error; + + if (!mac_bsdextended_enabled) + return (0); + + error = VOP_GETATTR(vp, &vap, cred, curthread); + if (error) + return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VADMIN)); +} + +static int mac_bsdextended_cred_check_exec_vnode(struct ucred *cred, struct vnode *vp, struct mac *label) { @@ -351,6 +368,22 @@ } static int +mac_bsdextended_cred_check_getacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + struct vattr vap; + int error; + + if (!mac_bsdextended_enabled) + return (0); + + error = VOP_GETATTR(vp, &vap, cred, curthread); + if (error) + return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VSTAT)); +} + +static int mac_bsdextended_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, struct mac *label, int attrnamespace, const char *name, struct uio *uio) @@ -469,6 +502,22 @@ } static int +mac_bsdextended_cred_check_setacl_vnode(struct ucred *cred, + struct vnode *vp, struct label *label, acl_type_t type, struct acl *acl) +{ + struct vattr vap; + int error; + + if (!mac_bsdextended_enabled) + return (0); + + error = VOP_GETATTR(vp, &vap, cred, curthread); + if (error) + return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VADMIN)); +} + +static int mac_bsdextended_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, struct mac *label, int attrnamespace, const char *name, struct uio *uio) @@ -637,8 +686,12 @@ (macop_t)mac_bsdextended_cred_check_create_vnode }, { MAC_CRED_CHECK_DELETE_VNODE, (macop_t)mac_bsdextended_cred_check_delete_vnode }, + { MAC_CRED_CHECK_DELETEACL_VNODE, + (macop_t)mac_bsdextended_cred_check_deleteacl_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)mac_bsdextended_cred_check_exec_vnode }, + { MAC_CRED_CHECK_GETACL_VNODE, + (macop_t)mac_bsdextended_cred_check_getacl_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_bsdextended_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, @@ -651,6 +704,8 @@ (macop_t)mac_bsdextended_cred_check_revoke_vnode }, { MAC_CRED_CHECK_SEARCH_VNODE, (macop_t)mac_bsdextended_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETACL_VNODE, + (macop_t)mac_bsdextended_cred_check_setacl_vnode }, { MAC_CRED_CHECK_SETEXTATTR_VNODE, (macop_t)mac_bsdextended_cred_check_setextattr_vnode }, { MAC_CRED_CHECK_SETFLAGS_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#37 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -1318,6 +1319,24 @@ } static int +mac_mls_cred_check_deleteacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int mac_mls_cred_check_exec_vnode(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -1336,6 +1355,24 @@ } static int +mac_mls_cred_check_getacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_mls_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { @@ -1463,6 +1500,24 @@ } static int +mac_mls_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type, struct acl *acl) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int mac_mls_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, int attrnamespace, const char *name, struct uio *uio) @@ -1792,8 +1847,12 @@ (macop_t)mac_mls_cred_check_create_vnode }, { MAC_CRED_CHECK_DELETE_VNODE, (macop_t)mac_mls_cred_check_delete_vnode }, + { MAC_CRED_CHECK_DELETEACL_VNODE, + (macop_t)mac_mls_cred_check_deleteacl_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)mac_mls_cred_check_exec_vnode }, + { MAC_CRED_CHECK_GETACL_VNODE, + (macop_t)mac_mls_cred_check_getacl_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_mls_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, @@ -1806,6 +1865,8 @@ (macop_t)mac_mls_cred_check_revoke_vnode }, { MAC_CRED_CHECK_SEARCH_VNODE, (macop_t)mac_mls_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETACL_VNODE, + (macop_t)mac_mls_cred_check_setacl_vnode }, { MAC_CRED_CHECK_SETEXTATTR_VNODE, (macop_t)mac_mls_cred_check_setextattr_vnode }, { MAC_CRED_CHECK_SETFLAGS_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#32 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -634,6 +635,14 @@ } static int +mac_none_cred_check_deleteacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + + return (0); +} + +static int mac_none_cred_check_exec_vnode(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -642,6 +651,14 @@ } static int +mac_none_cred_check_getacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + + return (0); +} + +static int mac_none_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { @@ -698,6 +715,14 @@ } static int +mac_none_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type, struct acl *acl) +{ + + return (0); +} + +static int mac_none_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#34 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -1106,6 +1107,21 @@ } static int +mac_te_cred_check_getacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + + switch (vp->v_type) { + case VDIR: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_GETACL)); + default: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_GETACL)); + } +} + +static int mac_te_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { @@ -1139,6 +1155,21 @@ } static int +mac_te_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type, struct acl *acl) +{ + + switch (vp->v_type) { + case VDIR: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_SETACL)); + default: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_SETACL)); + } +} + +static int mac_te_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { @@ -1251,6 +1282,22 @@ } static int +mac_te_cred_check_deleteacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + + switch (vp->v_type) { + case VDIR: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETEACL)); + default: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETEACL)); + } +} + + +static int mac_te_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label) { @@ -1496,7 +1543,11 @@ { MAC_RELABEL_VNODE, (macop_t)mac_te_relabel_vnode }, { MAC_CRED_CHECK_DELETE_VNODE, (macop_t)mac_te_cred_check_delete_vnode }, + { MAC_CRED_CHECK_DELETEACL_VNODE, + (macop_t)mac_te_cred_check_deleteacl_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)mac_te_cred_check_exec_vnode }, + { MAC_CRED_CHECK_GETACL_VNODE, + (macop_t)mac_te_cred_check_getacl_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_te_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_te_cred_check_open_vnode }, @@ -1508,6 +1559,8 @@ (macop_t)mac_te_cred_check_revoke_vnode }, { MAC_CRED_CHECK_SEARCH_VNODE, (macop_t)mac_te_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETACL_VNODE, + (macop_t)mac_te_cred_check_setacl_vnode }, { MAC_CRED_CHECK_SETEXTATTR_VNODE, (macop_t)mac_te_cred_check_setextattr_vnode }, { MAC_CRED_CHECK_SETFLAGS_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#3 (text+ko) ==== @@ -66,12 +66,15 @@ #define MAC_TE_CLASS_FILE 2 #define MAC_TE_OPERATION_FILE_ADMIN 1 #define MAC_TE_OPERATION_FILE_DELETE 2 -#define MAC_TE_OPERATION_FILE_EXEC 3 -#define MAC_TE_OPERATION_FILE_GETEXTATTR 4 -#define MAC_TE_OPERATION_FILE_READ 5 -#define MAC_TE_OPERATION_FILE_SETEXTATTR 6 -#define MAC_TE_OPERATION_FILE_STAT 7 -#define MAC_TE_OPERATION_FILE_WRITE 8 +#define MAC_TE_OPERATION_FILE_DELETEACL 3 +#define MAC_TE_OPERATION_FILE_EXEC 4 +#define MAC_TE_OPERATION_FILE_GETACL 5 +#define MAC_TE_OPERATION_FILE_GETEXTATTR 6 +#define MAC_TE_OPERATION_FILE_READ 7 +#define MAC_TE_OPERATION_FILE_SETACL 8 +#define MAC_TE_OPERATION_FILE_SETEXTATTR 9 +#define MAC_TE_OPERATION_FILE_STAT 10 +#define MAC_TE_OPERATION_FILE_WRITE 11 #define MAC_TE_CLASS_MBUF 3 #define MAC_TE_OPERATION_MBUF_RECEIVE 1 @@ -81,12 +84,15 @@ #define MAC_TE_OPERATION_DIR_ADMIN 1 #define MAC_TE_OPERATION_DIR_CHDIR 2 #define MAC_TE_OPERATION_DIR_DELETE 3 -#define MAC_TE_OPERATION_DIR_GETEXTATTR 4 -#define MAC_TE_OPERATION_DIR_LOOKUP 5 -#define MAC_TE_OPERATION_DIR_READ 6 -#define MAC_TE_OPERATION_DIR_SETEXTATTR 7 -#define MAC_TE_OPERATION_DIR_STAT 8 -#define MAC_TE_OPERATION_DIR_WRITE 9 +#define MAC_TE_OPERATION_DIR_DELETEACL 4 +#define MAC_TE_OPERATION_DIR_GETACL 5 +#define MAC_TE_OPERATION_DIR_GETEXTATTR 6 +#define MAC_TE_OPERATION_DIR_LOOKUP 7 +#define MAC_TE_OPERATION_DIR_READ 8 +#define MAC_TE_OPERATION_DIR_SETACL 9 +#define MAC_TE_OPERATION_DIR_SETEXTATTR 10 +#define MAC_TE_OPERATION_DIR_STAT 11 +#define MAC_TE_OPERATION_DIR_WRITE 12 #define MAC_TE_CLASS_FS 5 #define MAC_TE_OPERATION_FS_STATFS 1 ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#4 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -820,6 +821,14 @@ } static int +mac_test_cred_check_deleteacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + + return (0); +} + +static int mac_test_cred_check_exec_vnode(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -828,6 +837,14 @@ } static int +mac_test_cred_check_getacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + + return (0); +} + +static int mac_test_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { @@ -884,6 +901,14 @@ } static int +mac_test_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type, struct acl *acl) +{ + + return (0); +} + +static int mac_test_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { @@ -1114,8 +1139,12 @@ (macop_t)mac_test_cred_check_create_vnode }, { MAC_CRED_CHECK_DELETE_VNODE, (macop_t)mac_test_cred_check_delete_vnode }, + { MAC_CRED_CHECK_DELETEACL_VNODE, + (macop_t)mac_test_cred_check_deleteacl_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)mac_test_cred_check_exec_vnode }, + { MAC_CRED_CHECK_GETACL_VNODE, + (macop_t)mac_test_cred_check_getacl_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_test_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_LISTEN_SOCKET, @@ -1130,6 +1159,8 @@ (macop_t)mac_test_cred_check_revoke_vnode }, { MAC_CRED_CHECK_SEARCH_VNODE, (macop_t)mac_test_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETACL_VNODE, + (macop_t)mac_test_cred_check_setacl_vnode }, { MAC_CRED_CHECK_SETEXTATTR_VNODE, (macop_t)mac_test_cred_check_setextattr_vnode }, { MAC_CRED_CHECK_SETFLAGS_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 21:16:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B09BC37B405; Thu, 27 Jun 2002 21:15:50 -0700 (PDT) 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 F254237B407 for ; Thu, 27 Jun 2002 21:15:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9179E43DAD for ; Thu, 27 Jun 2002 21:15:48 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5S4FmJU019818 for ; Thu, 27 Jun 2002 21:15:48 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5S4Flpt019815 for perforce@freebsd.org; Thu, 27 Jun 2002 21:15:47 -0700 (PDT) Date: Thu, 27 Jun 2002 21:15:47 -0700 (PDT) Message-Id: <200206280415.g5S4Flpt019815@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 13512 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13512 Change 13512 by chris@chris_holly on 2002/06/27 21:15:17 Apply the outline (except for experimental section) to the Security chapter. Credit myself as the sole author until I bring in (for example) the LOMAC article, which will be placed into this section soon. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#3 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#3 (text+ko) ==== @@ -944,6 +944,91 @@ + + + + + Chris + Costello + Written by + + + + + Trusted Operating System Features + + This section will give an overview of the features offered + by TrustedBSD. + + + Mandatory Access Control Framework + + This section will document the MAC framework from a user's + perspective. + + + Biba + + This section will document the Biba fixed-label MAC + policy. + + + + Biba Low-Watermark Integrity Protection + + This section will document the LOMAC policy. + + + + Multi-Level Security + + This section will document the MLS policy. + + + + Type Enforcement + + This section will document the Type Enforcement + policy. + + + + BSD Extended + + This section will document the BSD Extended + policy. + + + + + Access Control Lists + + This section will document ACLs. + + + Configuring ACLs + + This section will include the commands and kernel + options necessary to enable ACLs on a given file + system. + + + + Examples Using ACLs + + This section will include a few hypothetical system + situations and appropriate ACL configuration for each + case. + + + + + POSIX.1e Capabilities + + This section will explain POSIX.1e Capabilities. + + + To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 21:50:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74B6237B406; Thu, 27 Jun 2002 21:48:35 -0700 (PDT) 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 BD08137B405 for ; Thu, 27 Jun 2002 21:48:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D24A543E06 for ; Thu, 27 Jun 2002 21:48:28 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5S4mSJU022762 for ; Thu, 27 Jun 2002 21:48:28 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5S4mSiC022759 for perforce@freebsd.org; Thu, 27 Jun 2002 21:48:28 -0700 (PDT) Date: Thu, 27 Jun 2002 21:48:28 -0700 (PDT) Message-Id: <200206280448.g5S4mSiC022759@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13514 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13514 Change 13514 by julian@julian_jules1 on 2002/06/27 21:47:44 MFC Affected files ... .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/config.h#3 integrate .. //depot/projects/kse/sys/conf/files#41 integrate .. //depot/projects/kse/sys/dev/sound/pci/ich.c#15 integrate .. //depot/projects/kse/sys/kern/kern_poll.c#7 integrate .. //depot/projects/kse/sys/netinet/ip_dummynet.c#8 integrate .. //depot/projects/kse/sys/netinet/ip_fw.h#9 integrate .. //depot/projects/kse/sys/netinet/ip_fw2.c#1 branch Differences ... ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/config.h#3 (text+ko) ==== @@ -1,20 +1,8 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/config.h,v 1.4 2002/05/18 04:59:56 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/config.h,v 1.6 2002/06/28 01:33:53 obrien Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ -/* Whether malloc must be declared even if is included. */ -/* #undef NEED_DECLARATION_MALLOC */ - -/* Whether realloc must be declared even if is included. */ -/* #undef NEED_DECLARATION_REALLOC */ - -/* Whether free must be declared even if is included. */ -/* #undef NEED_DECLARATION_FREE */ - -/* Whether strerror must be declared even if is included. */ -/* #undef NEED_DECLARATION_STRERROR */ - /* Define if on AIX 3. System headers sometimes define this. We just want to avoid a redefinition error message. */ @@ -44,18 +32,24 @@ /* Define if you have a working `mmap' system call. */ #define HAVE_MMAP 1 +/* Define if you have . */ +/* #undef HAVE_VFORK_H */ + /* Define as __inline if that's what the C compiler calls it. */ /* #undef inline */ /* Define to `long' if doesn't define. */ /* #undef off_t */ -/* Define if you need to in order for stat and other things to work. */ -/* #undef _POSIX_SOURCE */ +/* Define to `int' if doesn't define. */ +/* #undef pid_t */ /* Define as the return type of signal handlers (int or void). */ #define RETSIGTYPE void +/* Define if the `setpgrp' function takes no argument. */ +/* #undef SETPGRP_VOID */ + /* Define to `unsigned' if doesn't define. */ /* #undef size_t */ @@ -74,13 +68,44 @@ /* Define if you have the ANSI C header files. */ #define STDC_HEADERS 1 +/* Define vfork as fork if vfork does not work. */ +/* #undef vfork */ + +/* Define if compiling on Solaris 7. */ +/* #undef _MSE_INT_H */ + +/* Define if your struct reg has r_fs. */ +#define HAVE_STRUCT_REG_R_FS 1 + +/* Define if your struct reg has r_gs. */ +#define HAVE_STRUCT_REG_R_GS 1 + +/* Define if exists and defines struct link_map which has + members with an ``l_'' prefix. (For Solaris, SVR4, and + SVR4-like systems.) */ +#define HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS 1 + +/* Define if exists and defines struct link_map which has + members with an ``lm_'' prefix. (For SunOS.) */ +/* #undef HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS */ + +/* Define if exists and defines a struct so_map which has + members with an ``som_'' prefix. (Found on older *BSD systems.) */ +/* #undef HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS */ + +/* Define if has struct link_map32 */ +/* #undef HAVE_STRUCT_LINK_MAP32 */ + +/* Define if the prfpregset_t type is broken. */ +/* #undef PRFPREGSET_T_BROKEN */ + +/* Define if you want to use new multi-fd /proc interface + (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros). */ +/* #undef NEW_PROC_API */ + /* Define if ioctl argument PIOCSET is available. */ /* #undef HAVE_PROCFS_PIOCSET */ -/* /proc PID entries are directories containing the files - ctl as map status */ -/* #undef HAVE_MULTIPLE_PROC_FDS */ - /* Define if the `long long' type works. */ #define CC_HAS_LONG_LONG 1 @@ -112,18 +137,55 @@ to explicitly deallocate that memory when gdb calls exit. */ /* #undef MMCHECK_FORCE */ -/* Define if you want to use the full-screen terminal user interface. */ -/* #undef TUI */ - /* Define if on solaris uses int instead of size_t, and assorted other type changes. */ /* #undef PROC_SERVICE_IS_OLD */ +/* If you want to specify a default CPU variant, define this to be its + name, as a C string. */ +/* #undef TARGET_CPU_DEFAULT */ + +/* Define if the simulator is being linked in. */ +/* #undef WITH_SIM */ + /* Set to true if the save_state_t structure is present */ -#define HAVE_STRUCT_SAVE_STATE_T 0 +/* #undef HAVE_STRUCT_SAVE_STATE_T */ /* Set to true if the save_state_t structure has the ss_wide member */ -#define HAVE_STRUCT_MEMBER_SS_WIDE 0 +/* #undef HAVE_STRUCT_MEMBER_SS_WIDE */ + +/* Define if defines the PTRACE_GETREGS request. */ +/* #undef HAVE_PTRACE_GETREGS */ + +/* Define if defines the PTRACE_GETFPXREGS request. */ +/* #undef HAVE_PTRACE_GETFPXREGS */ + +/* Define if defines the PT_GETDBREGS request. */ +#define HAVE_PT_GETDBREGS 1 + +/* Define if defines the PT_GETXMMREGS request. */ +/* #undef HAVE_PT_GETXMMREGS */ + +/* Define if gnu-regex.c included with GDB should be used. */ +#define USE_INCLUDED_REGEX 1 + +/* BFD's default architecture. */ +#define DEFAULT_BFD_ARCH bfd_i386_arch + +/* BFD's default target vector. */ +#define DEFAULT_BFD_VEC bfd_elf32_i386_vec + +/* Multi-arch enabled. */ +/* #undef GDB_MULTI_ARCH */ + +/* hostfile */ +#define GDB_XM_FILE config/i386/xm-i386.h + +/* targetfile */ +#define GDB_TM_FILE config/i386/tm-fbsd.h + +/* nativefile */ +#define GDB_NM_FILE config/i386/nm-fbsd.h /* Define if you have the __argz_count function. */ /* #undef HAVE___ARGZ_COUNT */ @@ -143,6 +205,9 @@ /* Define if you have the bzero function. */ #define HAVE_BZERO 1 +/* Define if you have the canonicalize_file_name function. */ +/* #undef HAVE_CANONICALIZE_FILE_NAME */ + /* Define if you have the dcgettext function. */ /* #undef HAVE_DCGETTEXT */ @@ -158,9 +223,15 @@ /* Define if you have the munmap function. */ #define HAVE_MUNMAP 1 +/* Define if you have the poll function. */ +#define HAVE_POLL 1 + /* Define if you have the putenv function. */ #define HAVE_PUTENV 1 +/* Define if you have the realpath function. */ +#define HAVE_REALPATH 1 + /* Define if you have the sbrk function. */ #define HAVE_SBRK 1 @@ -173,9 +244,21 @@ /* Define if you have the setpgid function. */ #define HAVE_SETPGID 1 +/* Define if you have the setpgrp function. */ +#define HAVE_SETPGRP 1 + /* Define if you have the sigaction function. */ #define HAVE_SIGACTION 1 +/* Define if you have the sigprocmask function. */ +#define HAVE_SIGPROCMASK 1 + +/* Define if you have the sigsetmask function. */ +#define HAVE_SIGSETMASK 1 + +/* Define if you have the socketpair function. */ +#define HAVE_SOCKETPAIR 1 + /* Define if you have the stpcpy function. */ /* #undef HAVE_STPCPY */ @@ -197,8 +280,8 @@ /* Define if you have the header file. */ #define HAVE_CURSES_H 1 -/* Define if you have the header file. */ -/* #undef HAVE_ENDIAN_H */ +/* Define if you have the header file. */ +#define HAVE_DIRENT_H 1 /* Define if you have the header file. */ #define HAVE_LIMITS_H 1 @@ -215,12 +298,27 @@ /* Define if you have the header file. */ #define HAVE_MEMORY_H 1 +/* Define if you have the header file. */ +#define HAVE_NCURSES_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_NDIR_H */ + /* Define if you have the header file. */ #define HAVE_NL_TYPES_H 1 +/* Define if you have the header file. */ +#define HAVE_NLIST_H 1 + /* Define if you have the header file. */ /* #undef HAVE_OBJLIST_H */ +/* Define if you have the header file. */ +#define HAVE_POLL_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_PROC_SERVICE_H */ + /* Define if you have the header file. */ /* #undef HAVE_PTRACE_H */ @@ -230,6 +328,9 @@ /* Define if you have the header file. */ #define HAVE_STDDEF_H 1 +/* Define if you have the header file. */ +#define HAVE_STDINT_H 1 + /* Define if you have the header file. */ #define HAVE_STDLIB_H 1 @@ -239,9 +340,30 @@ /* Define if you have the header file. */ /* #undef HAVE_SYS_DEBUGREG_H */ +/* Define if you have the header file. */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_FAULT_H */ + +/* Define if you have the header file. */ +#define HAVE_SYS_FILE_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_FILIO_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_NDIR_H */ + /* Define if you have the header file. */ #define HAVE_SYS_PARAM_H 1 +/* Define if you have the header file. */ +#define HAVE_SYS_POLL_H 1 + /* Define if you have the header file. */ #define HAVE_SYS_PROCFS_H 1 @@ -251,6 +373,15 @@ /* Define if you have the header file. */ /* #undef HAVE_SYS_REG_H */ +/* Define if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_SYSCALL_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_USER_H 1 + /* Define if you have the header file. */ #define HAVE_SYS_WAIT_H 1 @@ -263,6 +394,12 @@ /* Define if you have the header file. */ #define HAVE_TERMIOS_H 1 +/* Define if you have the header file. */ +/* #undef HAVE_THREAD_DB_H */ + +/* Define if you have the header file. */ +#define HAVE_TIME_H 1 + /* Define if you have the header file. */ #define HAVE_UNISTD_H 1 @@ -273,10 +410,10 @@ /* #undef HAVE_WAIT_H */ /* Define if you have the header file. */ -/* #undef HAVE_WCHAR_H */ +#define HAVE_WCHAR_H 1 /* Define if you have the header file. */ -/* #undef HAVE_WCTYPE_H */ +#define HAVE_WCTYPE_H 1 /* Define if you have the dl library (-ldl). */ /* #undef HAVE_LIBDL */ @@ -284,6 +421,9 @@ /* Define if you have the m library (-lm). */ #define HAVE_LIBM 1 +/* Define if you have the socket library (-lsocket). */ +/* #undef HAVE_LIBSOCKET */ + /* Define if you have the w library (-lw). */ /* #undef HAVE_LIBW */ @@ -294,11 +434,14 @@ #define HAVE_LC_MESSAGES 1 /* Define to 1 if NLS is requested */ -#define ENABLE_NLS 1 +/* #define ENABLE_NLS 1 */ /* Define as 1 if you have gettext and don't want to use GNU gettext. */ /* #undef HAVE_GETTEXT */ +/* Define if sigsetjmp is available. */ +#define HAVE_SIGSETJMP 1 + /* Define if malloc is not declared in system header files. */ /* #undef NEED_DECLARATION_MALLOC */ @@ -314,6 +457,9 @@ /* Define if strdup is not declared in system header files. */ /* #undef NEED_DECLARATION_STRDUP */ +/* Define if strstr is not declared in system header files. */ +/* #undef NEED_DECLARATION_STRSTR */ + /* Define if has pstatus_t. */ /* #undef HAVE_PSTATUS_T */ @@ -328,3 +474,33 @@ /* Define if has fpregset_t. */ #define HAVE_FPREGSET_T 1 +/* Define if has prgregset_t. */ +/* #undef HAVE_PRGREGSET_T */ + +/* Define if has prfpregset_t. */ +#define HAVE_PRFPREGSET_T 1 + +/* Define if has prgregset32_t. */ +/* #undef HAVE_PRGREGSET32_T */ + +/* Define if has prfpregset32_t. */ +/* #undef HAVE_PRFPREGSET32_T */ + +/* Define if has lwpid_t. */ +/* #undef HAVE_LWPID_T */ + +/* Define if has psaddr_t. */ +/* #undef HAVE_PSADDR_T */ + +/* Define if has prsysent_t. */ +/* #undef HAVE_PRSYSENT_T */ + +/* Define if has pr_sigset_t. */ +/* #undef HAVE_PR_SIGSET_T */ + +/* Define if has pr_sigaction64_t. */ +/* #undef HAVE_PR_SIGACTION64_T */ + +/* Define if has pr_siginfo64_t. */ +/* #undef HAVE_PR_SIGINFO64_T */ + ==== //depot/projects/kse/sys/conf/files#41 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.654 2002/06/26 03:34:43 ken Exp $ +# $FreeBSD: src/sys/conf/files,v 1.655 2002/06/27 23:02:17 luigi Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1165,7 +1165,7 @@ netinet/ip_encap.c optional inet netinet/ip_encap.c optional inet6 netinet/ip_flow.c optional inet -netinet/ip_fw.c optional ipfirewall +netinet/ip_fw2.c optional ipfirewall netinet/ip_icmp.c optional inet netinet/ip_input.c optional inet netinet/ip_mroute.c optional inet ==== //depot/projects/kse/sys/dev/sound/pci/ich.c#15 (text+ko) ==== @@ -32,7 +32,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.21 2002/05/05 15:37:09 orion Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.22 2002/06/27 22:36:01 scottl Exp $"); /* -------------------------------------------------------------------- */ @@ -85,6 +85,8 @@ struct sc_chinfo ch[3]; int ac97rate; struct ich_desc *dtbl; + struct intr_config_hook intrhook; + int use_intrhook; }; /* -------------------------------------------------------------------- */ @@ -455,13 +457,20 @@ /* Calibrate card (some boards are overclocked and need scaling) */ static -unsigned int ich_calibrate(struct sc_info *sc) +void ich_calibrate(void *arg) { - struct sc_chinfo *ch = &sc->ch[1]; + struct sc_info *sc; + struct sc_chinfo *ch; struct timeval t1, t2; u_int8_t ociv, nciv; u_int32_t wait_us, actual_48k_rate, bytes; + sc = (struct sc_info *)arg; + ch = &sc->ch[1]; + + if (sc->use_intrhook) + config_intrhook_disestablish(&sc->intrhook); + /* * Grab audio from input for fixed interval and compare how * much we actually get with what we expect. Interval needs @@ -516,7 +525,7 @@ if (nciv == ociv) { device_printf(sc->dev, "ac97 link rate calibration timed out after %d us\n", wait_us); - return 0; + return; } actual_48k_rate = (bytes * 250000) / wait_us; @@ -534,7 +543,7 @@ printf("\n"); } - return sc->ac97rate; + return; } /* -------------------------------------------------------------------- */ @@ -708,7 +717,15 @@ pcm_setstatus(dev, status); ich_initsys(sc); - ich_calibrate(sc); + + sc->intrhook.ich_func = ich_calibrate; + sc->intrhook.ich_arg = sc; + sc->use_intrhook = 1; + if (config_intrhook_establish(&sc->intrhook) != 0) { + device_printf(dev, "Cannot establish calibration hook, will calibrate now\n"); + sc->use_intrhook = 0; + ich_calibrate(sc); + } return 0; ==== //depot/projects/kse/sys/kern/kern_poll.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_poll.c,v 1.6 2002/03/09 08:02:52 luigi Exp $ + * $FreeBSD: src/sys/kern/kern_poll.c,v 1.7 2002/06/27 23:23:04 luigi Exp $ */ #include @@ -195,6 +195,12 @@ /* * Hook from hardclock. Tries to schedule a netisr, but keeps track * of lost ticks due to the previous handler taking too long. + * Normally, this should not happen, because polling handler should + * run for a short time. However, in some cases (e.g. when there are + * changes in link status etc.) the drivers take a very long time + * (even in the order of milliseconds) to reset and reconfigure the + * device, causing apparent lost polls. + * * The first part of the code is just for debugging purposes, and tries * to count how often hardclock ticks are shorter than they should, * meaning either stray interrupts or delayed events. @@ -217,10 +223,11 @@ prev_t = t; if (pending_polls > 100) { - /* too much, assume it has stalled */ + /* + * Too much, assume it has stalled (not always true + * see comment above). + */ stalled++; - printf("poll stalled [%d] in phase %d\n", - stalled, phase); pending_polls = 0; phase = 0; } ==== //depot/projects/kse/sys/netinet/ip_dummynet.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2001 Luigi Rizzo, Universita` di Pisa + * Copyright (c) 1998-2002 Luigi Rizzo, Universita` di Pisa * Portions Copyright (c) 2000 Akamba Corp. * All rights reserved * @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.47 2002/06/22 11:51:02 luigi Exp $ + * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.48 2002/06/27 23:02:17 luigi Exp $ */ #define DEB(x) @@ -61,7 +61,6 @@ #include #include #include -#include /* XXX */ #include #include #include @@ -166,12 +165,6 @@ int if_tx_rdy(struct ifnet *ifp); -/* - * ip_fw_chain_head is used when deleting a pipe, because ipfw rules can - * hold references to the pipe. - */ -extern LIST_HEAD (ip_fw_head, ip_fw) ip_fw_chain_head; - static void rt_unref(struct rtentry *rt) { @@ -1023,9 +1016,13 @@ struct dn_flow_set * locate_flowset(int pipe_nr, struct ip_fw *rule) { - struct dn_flow_set *fs = NULL ; + ipfw_insn_pipe *cmd = (ipfw_insn_pipe *)(rule->cmd + rule->act_ofs); + struct dn_flow_set *fs = (struct dn_flow_set *)(cmd->pipe_ptr); + + if (fs != NULL) + return fs; - if ( (rule->fw_flg & IP_FW_F_COMMAND) == IP_FW_F_QUEUE ) + if ( cmd->o.opcode == O_QUEUE ) for (fs=all_flow_sets; fs && fs->fs_nr != pipe_nr; fs=fs->next) ; else { @@ -1035,8 +1032,7 @@ if (p1 != NULL) fs = &(p1->fs) ; } - if (fs != NULL) - rule->pipe_ptr = fs ; /* record for the future */ + (struct dn_flow_set *)(cmd->pipe_ptr) = fs; /* record for the future */ return fs ; } @@ -1065,16 +1061,18 @@ u_int64_t len = m->m_pkthdr.len ; struct dn_flow_queue *q = NULL ; int s ; + int action = fwa->rule->cmd[fwa->rule->act_ofs].opcode; s = splimp(); pipe_nr &= 0xffff ; - if ( (fs = fwa->rule->pipe_ptr) == NULL ) { - fs = locate_flowset(pipe_nr, fwa->rule); - if (fs == NULL) - goto dropit ; /* this queue/pipe does not exist! */ - } + /* + * this is a dummynet rule, so we expect a O_PIPE or O_QUEUE rule + */ + fs = locate_flowset(pipe_nr, fwa->rule); + if (fs == NULL) + goto dropit ; /* this queue/pipe does not exist! */ pipe = fs->pipe ; if (pipe == NULL) { /* must be a queue, try find a matching pipe */ for (pipe = all_pipes; pipe && pipe->pipe_nr != fs->parent_nr; @@ -1152,7 +1150,7 @@ * to schedule it. This involves different actions for fixed-rate or * WF2Q queues. */ - if ( (fwa->rule->fw_flg & IP_FW_F_COMMAND) == IP_FW_F_PIPE ) { + if ( action == O_PIPE ) { /* * Fixed-rate queue: just insert into the ready_heap. */ @@ -1302,15 +1300,13 @@ dummynet_flush() { struct dn_pipe *curr_p, *p ; - struct ip_fw *rule ; struct dn_flow_set *fs, *curr_fs; int s ; s = splimp() ; /* remove all references to pipes ...*/ - LIST_FOREACH(rule, &ip_fw_chain_head, next) - rule->pipe_ptr = NULL ; + flush_pipe_ptrs(NULL); /* prevent future matches... */ p = all_pipes ; all_pipes = NULL ; @@ -1375,8 +1371,8 @@ fs = &(p->fs) ; dn_rule_delete_fs(fs, r); for (pkt = p->head ; pkt ; pkt = DN_NEXT(pkt) ) - if (pkt->rule == r) - pkt->rule = ip_fw_default_rule ; + if (pkt->hdr.mh_data == r) + pkt->hdr.mh_data = (void *)ip_fw_default_rule ; } } @@ -1663,7 +1659,6 @@ delete_pipe(struct dn_pipe *p) { int s ; - struct ip_fw *rule ; if (p->pipe_nr == 0 && p->fs.fs_nr == 0) return EINVAL ; @@ -1687,9 +1682,7 @@ else a->next = b->next ; /* remove references to this pipe from the ip_fw rules. */ - LIST_FOREACH(rule, &ip_fw_chain_head, next) - if (rule->pipe_ptr == &(b->fs)) - rule->pipe_ptr = NULL ; + flush_pipe_ptrs(&(b->fs)); /* remove all references to this pipe from flow_sets */ for (fs = all_flow_sets; fs; fs= fs->next ) @@ -1721,9 +1714,7 @@ else a->next = b->next ; /* remove references to this flow_set from the ip_fw rules. */ - LIST_FOREACH(rule, &ip_fw_chain_head, next) - if (rule->pipe_ptr == b) - rule->pipe_ptr = NULL ; + flush_pipe_ptrs(b); if (b->pipe != NULL) { /* Update total weight on parent pipe and cleanup parent heaps */ @@ -1847,9 +1838,14 @@ /* Disallow sets in really-really secure mode. */ if (sopt->sopt_dir == SOPT_SET) { +#if __FreeBSD_version >= 500034 error = securelevel_ge(sopt->sopt_td->td_ucred, 3); if (error) return (error); +#else + if (securelevel >= 3) + return (EPERM); +#endif } switch (sopt->sopt_name) { ==== //depot/projects/kse/sys/netinet/ip_fw.h#9 (text+ko) ==== @@ -1,183 +1,305 @@ /* - * Copyright (c) 1993 Daniel Boulet - * Copyright (c) 1994 Ugen J.S.Antsilevich + * Copyright (c) 2002 Luigi Rizzo, Universita` di Pisa + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * Redistribution and use in source forms, with and without modification, - * are permitted provided that this entire comment appears intact. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. * - * Redistribution in binary form may occur without any restrictions. - * Obviously, it would be nice if you gave credit where credit is due - * but requiring it would be too onerous. + * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.69 2002/06/27 23:02:17 luigi Exp $ + */ + +#ifndef _IPFW2_H +#define _IPFW2_H + +/* + * The kernel representation of ipfw rules is made of a list of + * 'instructions' (for all practical purposes equivalent to BPF + * instructions), which specify which fields of the packet + * (or its metatada) should be analysed. * - * This software is provided ``AS IS'' without any warranties of any kind. + * Each instruction is stored in a structure which begins with + * "ipfw_insn", and can contain extra fields depending on the + * instruction type (listed below). * - * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.68 2002/06/22 11:51:02 luigi Exp $ + * "enum ipfw_opcodes" are the opcodes supported. We can have up + * to 256 different opcodes. */ -#ifndef _IP_FW_H -#define _IP_FW_H +enum ipfw_opcodes { /* arguments (4 byte each) */ + O_NOP, + + O_IP_SRC, /* u32 = IP */ + O_IP_SRC_MASK, /* ip = IP/mask */ + O_IP_SRC_ME, /* none */ + O_IP_SRC_SET, /* u32=base, arg1=len, bitmap */ + + O_IP_DST, /* u32 = IP */ + O_IP_DST_MASK, /* ip = IP/mask */ + O_IP_DST_ME, /* none */ + O_IP_DST_SET, /* u32=base, arg1=len, bitmap */ + + O_IP_SRCPORT, /* (n)port list:mask 4 byte ea */ + O_IP_DSTPORT, /* (n)port list:mask 4 byte ea */ + O_PROTO, /* arg1=protocol */ + + O_MACADDR2, /* 2 mac addr:mask */ + O_MAC_TYPE, /* same as srcport */ + + O_LAYER2, /* none */ + O_IN, /* none */ + O_FRAG, /* none */ + + O_RECV, /* none */ + O_XMIT, /* none */ + O_VIA, /* none */ + + O_IPOPT, /* arg1 = 2*u8 bitmap */ + O_IPLEN, /* arg1 = len */ + O_IPID, /* arg1 = id */ + + O_IPPRE, /* arg1 = id */ + O_IPTOS, /* arg1 = id */ + O_IPTTL, /* arg1 = TTL */ + + O_IPVER, /* arg1 = version */ + O_UID, /* u32 = id */ + O_GID, /* u32 = id */ + O_ESTAB, /* none (tcp established) */ + O_TCPFLAGS, /* arg1 = 2*u8 bitmap */ + O_TCPWIN, /* arg1 = desired win */ + O_TCPSEQ, /* u32 = desired seq. */ + O_TCPACK, /* u32 = desired seq. */ + O_ICMPTYPE, /* u32 = icmp bitmap */ + O_TCPOPTS, /* arg1 = 2*u8 bitmap */ + O_IPOPTS, /* arg1 = 2*u8 bitmap */ + + O_PROBE_STATE, /* none */ + O_KEEP_STATE, /* none */ + O_LIMIT, /* ipfw_insn_limit */ + O_LIMIT_PARENT, /* dyn_type, not an opcode. */ + /* + * these are really 'actions', and must be last in the list. + */ + + O_LOG, /* ipfw_insn_log */ + O_PROB, /* u32 = match probability */ -#include + O_CHECK_STATE, /* none */ + O_ACCEPT, /* none */ + O_DENY, /* none */ + O_REJECT, /* arg1=icmp arg (same as deny) */ + O_COUNT, /* none */ + O_SKIPTO, /* arg1=next rule number */ + O_PIPE, /* arg1=pipe number */ + O_QUEUE, /* arg1=queue number */ + O_DIVERT, /* arg1=port number */ + O_TEE, /* arg1=port number */ + O_FORWARD_IP, /* fwd sockaddr */ + O_FORWARD_MAC, /* fwd mac */ + O_LAST_OPCODE /* not an opcode! */ +}; /* - * This union structure identifies an interface, either explicitly - * by name or implicitly by IP address. The flags IP_FW_F_IIFNAME - * and IP_FW_F_OIFNAME say how to interpret this structure. An - * interface unit number of -1 matches any unit number, while an - * IP address of 0.0.0.0 indicates matches any interface. + * Template for instructions. + * + * ipfw_insn is used for all instructions which require no operands, + * a single 16-bit value (arg1), or a couple of 8-bit values. + * + * For other instructions which require different/larger arguments + * we have derived structures, ipfw_insn_*. + * + * The size of the instruction (in 32-bit words) is in the low + * 6 bits of "len". The 2 remaining bits are used to implement + * NOT and OR on individual instructions. Given a type, you can + * compute the length to be put in "len" using F_INSN_SIZE(t) + * + * F_NOT negates the match result of the instruction. + * + * F_OR is used to build or blocks. By default, instructions + * are evaluated as part of a logical AND. An "or" block + * { X or Y or Z } contains F_OR set in all but the last + * instruction of the block. A match will cause the code + * to skip past the last instruction of the block. + * + * NOTA BENE: in a couple of places we assume that + * sizeof(ipfw_insn) == sizeof(u_int32_t) + * this needs to be fixed. * - * The receive and transmit interfaces are only compared against the - * the packet if the corresponding bit (IP_FW_F_IIFACE or IP_FW_F_OIFACE) - * is set. Note some packets lack a receive or transmit interface - * (in which case the missing "interface" never matches). */ +typedef struct _ipfw_insn { /* template for instructions */ + enum ipfw_opcodes opcode:8; + u_int8_t len; /* numer of 32-byte words */ +#define F_NOT 0x80 +#define F_OR 0x40 +#define F_LEN_MASK 0x3f +#define F_LEN(cmd) ((cmd)->len & F_LEN_MASK) -union ip_fw_if { - struct in_addr fu_via_ip; /* Specified by IP address */ - struct { /* Specified by interface name */ -#define FW_IFNLEN 10 /* need room ! was IFNAMSIZ */ - char name[FW_IFNLEN]; - short unit; /* -1 means match any unit */ - } fu_via_if; -}; + u_int16_t arg1; +} ipfw_insn; + +/* + * The F_INSN_SIZE(type) computes the size, in 4-byte words, of + * a given type. + */ +#define F_INSN_SIZE(t) ((sizeof (t))/sizeof(u_int32_t)) /* - * Format of an IP firewall descriptor - * - * fw_src, fw_dst, fw_smsk, fw_dmsk are always stored in network byte order. - * fw_flg and fw_n*p are stored in host byte order (of course). - * Port numbers are stored in HOST byte order. + * This is used to store an array of 16-bit entries (ports etc.) */ +typedef struct _ipfw_insn_u16 { + ipfw_insn o; + u_int16_t ports[2]; /* there may be more */ +} ipfw_insn_u16; /* - * To match MAC headers: - * 12 bytes at fw_mac_hdr contain the dst-src MAC address after masking. - * 12 bytes at fw_mac_mask contain the mask to apply to dst-src - * 2 bytes at fw_mac_type contain the mac type after mask (in net format) - * 2 bytes at fw_mac_type_mask contain the mac type mask - * If IP_FW_F_SRNG, the two contain the low-high of a range of types. - * IP_FW_F_DRNG is used to indicare we want to match a vlan. + * This is used to store an array of 32-bit entries + * (uid, single IPv4 addresses etc.) */ -#define fw_mac_hdr fw_src -#define fw_mac_mask fw_uar -#define fw_mac_type fw_iplen -#define fw_mac_mask_type fw_ipid +typedef struct _ipfw_insn_u32 { + ipfw_insn o; + u_int32_t d[1]; /* one or more */ +} ipfw_insn_u32; -struct ip_fw { - LIST_ENTRY(ip_fw) next; /* bidirectional list of rules */ - u_int fw_flg; /* Operational Flags word */ - u_int64_t fw_pcnt; /* Packet counters */ - u_int64_t fw_bcnt; /* Byte counters */ +/* + * This is used to store IP addr-mask pairs. + */ +typedef struct _ipfw_insn_ip { + ipfw_insn o; + struct in_addr addr; + struct in_addr mask; +} ipfw_insn_ip; - struct in_addr fw_src; /* Source IP address */ - struct in_addr fw_dst; /* Destination IP address */ - struct in_addr fw_smsk; /* Mask for source IP address */ - struct in_addr fw_dmsk; /* Mask for destination address */ - u_short fw_number; /* Rule number */ - u_char fw_prot; /* IP protocol */ -#if 1 - u_char fw_nports; /* # of src/dst port in array */ -#define IP_FW_GETNSRCP(rule) ((rule)->fw_nports & 0x0f) -#define IP_FW_SETNSRCP(rule, n) do { \ - (rule)->fw_nports &= ~0x0f; \ - (rule)->fw_nports |= (n); \ - } while (0) -#define IP_FW_GETNDSTP(rule) ((rule)->fw_nports >> 4) -#define IP_FW_SETNDSTP(rule, n) do { \ - (rule)->fw_nports &= ~0xf0; \ - (rule)->fw_nports |= (n) << 4;\ - } while (0) -#define IP_FW_HAVEPORTS(rule) ((rule)->fw_nports != 0) -#else - u_char __pad[1]; - u_int _nsrcp; - u_int _ndstp; -#define IP_FW_GETNSRCP(rule) (rule)->_nsrcp -#define IP_FW_SETNSRCP(rule,n) (rule)->_nsrcp = n -#define IP_FW_GETNDSTP(rule) (rule)->_ndstp -#define IP_FW_SETNDSTP(rule,n) (rule)->_ndstp = n -#define IP_FW_HAVEPORTS(rule) ((rule)->_ndstp + (rule)->_nsrcp != 0) -#endif -#define IP_FW_MAX_PORTS 10 /* A reasonable maximum */ - union { - u_short fw_pts[IP_FW_MAX_PORTS]; /* port numbers to match */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jun 27 22:55:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B74B37B408; Thu, 27 Jun 2002 22:54:56 -0700 (PDT) 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 0821E37B407 for ; Thu, 27 Jun 2002 22:54:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CC9B43E13 for ; Thu, 27 Jun 2002 22:54:51 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5S5spJU034068 for ; Thu, 27 Jun 2002 22:54:51 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5S5spqt034065 for perforce@freebsd.org; Thu, 27 Jun 2002 22:54:51 -0700 (PDT) Date: Thu, 27 Jun 2002 22:54:51 -0700 (PDT) Message-Id: <200206280554.g5S5spqt034065@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 13519 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13519 Change 13519 by amigus@amigus_vmganyopa on 2002/06/27 22:54:14 It's probably better to return "operation not supported" than "protocol not available", if the user doesn't have MAC enabled but attempts to set the label anyway. Unfortunately there is no EDUDEYOURESOINTHEBOX... Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#26 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#26 (text+ko) ==== @@ -1280,8 +1280,8 @@ break; } break; + case SO_LABEL: #ifdef MAC - case SO_LABEL: error = sooptcopyin(sopt, &extmac, sizeof extmac, sizeof extmac); if (error) @@ -1290,8 +1290,10 @@ error = mac_setsockopt_label_set( sopt->sopt_td->td_ucred, so, &extmac); +#else /* MAC */ + error = EOPNOTSUPP; +#endif /* MAC */ break; -#endif /* MAC */ default: error = ENOPROTOOPT; break; @@ -1431,22 +1433,28 @@ tv.tv_usec = (optval % hz) * tick; error = sooptcopyout(sopt, &tv, sizeof tv); break; + case SO_LABEL: #ifdef MAC - case SO_LABEL: error = mac_getsockopt_label_get( sopt->sopt_td->td_ucred, so, &extmac); if (error) return (error); error = sooptcopyout(sopt, &extmac, sizeof extmac); +#else /* MAC */ + error = EOPNOTSUPP; +#endif /* MAC */ break; case SO_PEERLABEL: +#ifdef MAC error = mac_getsockopt_peerlabel_get( sopt->sopt_td->td_ucred, so, &extmac); if (error) return (error); error = sooptcopyout(sopt, &extmac, sizeof extmac); +#else /* MAC */ + error = EOPNOTSUPP; +#endif /* MAC */ break; -#endif /* MAC */ default: error = ENOPROTOOPT; break; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 11: 8:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CA6537B406; Fri, 28 Jun 2002 11:06:06 -0700 (PDT) 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 13D8537B405 for ; Fri, 28 Jun 2002 11:06:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4771C43E09 for ; Fri, 28 Jun 2002 11:06:01 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5SI61JU089403 for ; Fri, 28 Jun 2002 11:06:01 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5SI6071089395 for perforce@freebsd.org; Fri, 28 Jun 2002 11:06:00 -0700 (PDT) Date: Fri, 28 Jun 2002 11:06:00 -0700 (PDT) Message-Id: <200206281806.g5SI6071089395@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bmilekic@freebsd.org using -f From: Bosko Milekic Subject: PERFORCE change 13530 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13530 Change 13530 by bmilekic@bmilekic_angela on 2002/06/28 11:05:23 IFC (waiting for KSE III to see what to do next) Affected files ... .. //depot/projects/interrupt/sys/alpha/alpha/pmap.c#5 integrate .. //depot/projects/interrupt/sys/compat/linux/linux_ioctl.c#4 integrate .. //depot/projects/interrupt/sys/conf/files#10 integrate .. //depot/projects/interrupt/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/interrupt/sys/dev/sound/pci/maestro3.c#4 integrate .. //depot/projects/interrupt/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_acl.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_poll.c#5 integrate .. //depot/projects/interrupt/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/interrupt/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/interrupt/sys/modules/ipfw/Makefile#3 integrate .. //depot/projects/interrupt/sys/netinet/ip_dummynet.c#5 integrate .. //depot/projects/interrupt/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/interrupt/sys/netinet/ip_fw2.c#1 branch .. //depot/projects/interrupt/sys/netinet/ip_input.c#5 integrate .. //depot/projects/interrupt/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/interrupt/sys/netinet/ip_output.c#5 integrate .. //depot/projects/interrupt/sys/pccard/pcic_pci.c#6 integrate .. //depot/projects/interrupt/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_vfsops.c#7 integrate .. //depot/projects/interrupt/sys/vm/swap_pager.c#7 integrate .. //depot/projects/interrupt/sys/vm/vm_map.c#9 integrate .. //depot/projects/interrupt/sys/vm/vm_object.c#7 integrate Differences ... ==== //depot/projects/interrupt/sys/alpha/alpha/pmap.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.92 2002/04/29 07:43:08 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.93 2002/06/27 04:08:45 jeff Exp $ */ /* @@ -610,7 +610,7 @@ if (initial_pvs < MINPV) initial_pvs = MINPV; pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, 0); + NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); uma_zone_set_allocf(pvzone, pmap_allocf); uma_prealloc(pvzone, initial_pvs); /* ==== //depot/projects/interrupt/sys/compat/linux/linux_ioctl.c#4 (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. * - * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.85 2002/06/02 20:05:41 schweikh Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.86 2002/06/26 15:53:11 arr Exp $ */ #include @@ -2027,15 +2027,10 @@ ifp = NULL; error = 0; - mtx_lock(&Giant); - if ((error = fget(td, args->fd, &fp)) != 0) { - mtx_unlock(&Giant); + if ((error = fget(td, args->fd, &fp)) != 0) return (error); - } type = fp->f_type; fdrop(fp, td); - mtx_unlock(&Giant); - if (type != DTYPE_SOCKET) { /* not a socket - probably a tap / vmnet device */ switch (args->cmd) { @@ -2243,14 +2238,10 @@ struct file *fp; int error, type; - mtx_lock(&Giant); - if ((error = fget(td, args->fd, &fp)) != 0) { - mtx_unlock(&Giant); + if ((error = fget(td, args->fd, &fp)) != 0) return (error); - } type = fp->f_type; fdrop(fp, td); - mtx_unlock(&Giant); if (type == DTYPE_SOCKET) return (linux_ioctl_socket(td, args)); return (ENOIOCTL); ==== //depot/projects/interrupt/sys/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.654 2002/06/26 03:34:43 ken Exp $ +# $FreeBSD: src/sys/conf/files,v 1.655 2002/06/27 23:02:17 luigi Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1164,7 +1164,7 @@ netinet/ip_encap.c optional inet netinet/ip_encap.c optional inet6 netinet/ip_flow.c optional inet -netinet/ip_fw.c optional ipfirewall +netinet/ip_fw2.c optional ipfirewall netinet/ip_icmp.c optional inet netinet/ip_input.c optional inet netinet/ip_mroute.c optional inet ==== //depot/projects/interrupt/sys/dev/sound/pci/ich.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.21 2002/05/05 15:37:09 orion Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.22 2002/06/27 22:36:01 scottl Exp $"); /* -------------------------------------------------------------------- */ @@ -85,6 +85,8 @@ struct sc_chinfo ch[3]; int ac97rate; struct ich_desc *dtbl; + struct intr_config_hook intrhook; + int use_intrhook; }; /* -------------------------------------------------------------------- */ @@ -455,13 +457,20 @@ /* Calibrate card (some boards are overclocked and need scaling) */ static -unsigned int ich_calibrate(struct sc_info *sc) +void ich_calibrate(void *arg) { - struct sc_chinfo *ch = &sc->ch[1]; + struct sc_info *sc; + struct sc_chinfo *ch; struct timeval t1, t2; u_int8_t ociv, nciv; u_int32_t wait_us, actual_48k_rate, bytes; + sc = (struct sc_info *)arg; + ch = &sc->ch[1]; + + if (sc->use_intrhook) + config_intrhook_disestablish(&sc->intrhook); + /* * Grab audio from input for fixed interval and compare how * much we actually get with what we expect. Interval needs @@ -516,7 +525,7 @@ if (nciv == ociv) { device_printf(sc->dev, "ac97 link rate calibration timed out after %d us\n", wait_us); - return 0; + return; } actual_48k_rate = (bytes * 250000) / wait_us; @@ -534,7 +543,7 @@ printf("\n"); } - return sc->ac97rate; + return; } /* -------------------------------------------------------------------- */ @@ -708,7 +717,15 @@ pcm_setstatus(dev, status); ich_initsys(sc); - ich_calibrate(sc); + + sc->intrhook.ich_func = ich_calibrate; + sc->intrhook.ich_arg = sc; + sc->use_intrhook = 1; + if (config_intrhook_establish(&sc->intrhook) != 0) { + device_printf(dev, "Cannot establish calibration hook, will calibrate now\n"); + sc->use_intrhook = 0; + ich_calibrate(sc); + } return 0; ==== //depot/projects/interrupt/sys/dev/sound/pci/maestro3.c#4 (text+ko) ==== @@ -61,7 +61,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro3.c,v 1.14 2002/06/24 15:28:47 robert Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/maestro3.c,v 1.15 2002/06/28 06:11:26 scottl Exp $"); /* -------------------------------------------------------------------- */ @@ -1390,7 +1390,7 @@ hv_cfg = HV_BUTTON_FROM_GD; data = pci_read_config(sc->dev, PCI_ALLEGRO_CONFIG, 4); - data &= HV_BUTTON_FROM_GD; + data &= ~HV_BUTTON_FROM_GD; data |= REDUCED_DEBOUNCE | HV_CTRL_ENABLE | hv_cfg; data |= PM_CTRL_ENABLE | CLK_DIV_BY_49 | USE_PCI_TIMING; pci_write_config(sc->dev, PCI_ALLEGRO_CONFIG, data, 4); ==== //depot/projects/interrupt/sys/i386/i386/pmap.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.324 2002/06/25 22:14:06 iedowse Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.326 2002/06/27 06:34:03 arr Exp $ */ /* @@ -2010,7 +2010,7 @@ register pt_entry_t *ptbase; vm_offset_t pdnxt; pd_entry_t ptpaddr; - vm_pindex_t sindex, eindex; + vm_offset_t sindex, eindex; int anychanged; if (pmap == NULL) @@ -2493,7 +2493,7 @@ ((objpgs > 0) && (p != NULL)); p = TAILQ_NEXT(p, listq)) { - if (p->pindex < pindex || p->pindex - pindex > psize) { + if (p->pindex < pindex || p->pindex - pindex >= psize) { continue; } tmpidx = p->pindex - pindex; ==== //depot/projects/interrupt/sys/kern/kern_acl.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_acl.c,v 1.28 2002/06/13 23:17:39 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_acl.c,v 1.30 2002/06/27 19:31:15 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -50,12 +50,12 @@ MALLOC_DEFINE(M_ACL, "acl", "access control list"); -static int vacl_set_acl(struct thread *td, struct vnode *vp, acl_type_t type, - struct acl *aclp); -static int vacl_get_acl(struct thread *td, struct vnode *vp, acl_type_t type, - struct acl *aclp); +static int vacl_set_acl(struct thread *td, struct vnode *vp, + acl_type_t type, struct acl *aclp); +static int vacl_get_acl(struct thread *td, struct vnode *vp, + acl_type_t type, struct acl *aclp); static int vacl_aclcheck(struct thread *td, struct vnode *vp, - acl_type_t type, struct acl *aclp); + acl_type_t type, struct acl *aclp); /* * Implement a version of vaccess() that understands POSIX.1e ACL semantics. @@ -621,7 +621,7 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_SETACL(vp, ACL_TYPE_DEFAULT, 0, td->td_ucred, td); + error = VOP_SETACL(vp, type, NULL, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return (error); ==== //depot/projects/interrupt/sys/kern/kern_poll.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_poll.c,v 1.6 2002/03/09 08:02:52 luigi Exp $ + * $FreeBSD: src/sys/kern/kern_poll.c,v 1.7 2002/06/27 23:23:04 luigi Exp $ */ #include @@ -195,6 +195,12 @@ /* * Hook from hardclock. Tries to schedule a netisr, but keeps track * of lost ticks due to the previous handler taking too long. + * Normally, this should not happen, because polling handler should + * run for a short time. However, in some cases (e.g. when there are + * changes in link status etc.) the drivers take a very long time + * (even in the order of milliseconds) to reset and reconfigure the + * device, causing apparent lost polls. + * * The first part of the code is just for debugging purposes, and tries * to count how often hardclock ticks are shorter than they should, * meaning either stray interrupts or delayed events. @@ -217,10 +223,11 @@ prev_t = t; if (pending_polls > 100) { - /* too much, assume it has stalled */ + /* + * Too much, assume it has stalled (not always true + * see comment above). + */ stalled++; - printf("poll stalled [%d] in phase %d\n", - stalled, phase); pending_polls = 0; phase = 0; } ==== //depot/projects/interrupt/sys/kern/vfs_subr.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.362 2002/06/20 20:03:41 mux Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.363 2002/06/28 16:17:47 green Exp $ */ /* @@ -812,8 +812,8 @@ object->ref_count)) { TAILQ_INSERT_TAIL(&vnode_free_list, vp, v_freelist); + VOP_UNLOCK(vp, 0, td); vp = NULL; - VOP_UNLOCK(vp, 0, td); continue; } if (LIST_FIRST(&vp->v_cache_src)) { ==== //depot/projects/interrupt/sys/kern/vfs_vnops.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.149 2002/06/24 07:14:44 mckusick Exp $ + * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.150 2002/06/28 17:51:11 jeff Exp $ */ #include @@ -356,11 +356,16 @@ if ((ioflg & IO_NODELOCKED) == 0) { mp = NULL; - if (rw == UIO_WRITE && - vp->v_type != VCHR && - (error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) - return (error); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + if (rw == UIO_WRITE) { + if (vp->v_type != VCHR && + (error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) + != 0) + return (error); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + } else { + vn_lock(vp, LK_SHARED | LK_RETRY, td); + } + } auio.uio_iov = &aiov; auio.uio_iovcnt = 1; @@ -382,7 +387,8 @@ if (auio.uio_resid && error == 0) error = EIO; if ((ioflg & IO_NODELOCKED) == 0) { - vn_finished_write(mp); + if (rw == UIO_WRITE) + vn_finished_write(mp); VOP_UNLOCK(vp, 0, td); } return (error); ==== //depot/projects/interrupt/sys/modules/ipfw/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/modules/ipfw/Makefile,v 1.15 2002/01/11 15:48:49 ru Exp $ +# $FreeBSD: src/sys/modules/ipfw/Makefile,v 1.16 2002/06/28 08:10:07 julian Exp $ .PATH: ${.CURDIR}/../../netinet KMOD= ipfw -SRCS= ip_fw.c +SRCS= ip_fw2.c CFLAGS+= -DIPFIREWALL # ==== //depot/projects/interrupt/sys/netinet/ip_dummynet.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2001 Luigi Rizzo, Universita` di Pisa + * Copyright (c) 1998-2002 Luigi Rizzo, Universita` di Pisa * Portions Copyright (c) 2000 Akamba Corp. * All rights reserved * @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.47 2002/06/22 11:51:02 luigi Exp $ + * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.48 2002/06/27 23:02:17 luigi Exp $ */ #define DEB(x) @@ -61,7 +61,6 @@ #include #include #include -#include /* XXX */ #include #include #include @@ -166,12 +165,6 @@ int if_tx_rdy(struct ifnet *ifp); -/* - * ip_fw_chain_head is used when deleting a pipe, because ipfw rules can - * hold references to the pipe. - */ -extern LIST_HEAD (ip_fw_head, ip_fw) ip_fw_chain_head; - static void rt_unref(struct rtentry *rt) { @@ -1023,9 +1016,13 @@ struct dn_flow_set * locate_flowset(int pipe_nr, struct ip_fw *rule) { - struct dn_flow_set *fs = NULL ; + ipfw_insn_pipe *cmd = (ipfw_insn_pipe *)(rule->cmd + rule->act_ofs); + struct dn_flow_set *fs = (struct dn_flow_set *)(cmd->pipe_ptr); + + if (fs != NULL) + return fs; - if ( (rule->fw_flg & IP_FW_F_COMMAND) == IP_FW_F_QUEUE ) + if ( cmd->o.opcode == O_QUEUE ) for (fs=all_flow_sets; fs && fs->fs_nr != pipe_nr; fs=fs->next) ; else { @@ -1035,8 +1032,7 @@ if (p1 != NULL) fs = &(p1->fs) ; } - if (fs != NULL) - rule->pipe_ptr = fs ; /* record for the future */ + (struct dn_flow_set *)(cmd->pipe_ptr) = fs; /* record for the future */ return fs ; } @@ -1065,16 +1061,18 @@ u_int64_t len = m->m_pkthdr.len ; struct dn_flow_queue *q = NULL ; int s ; + int action = fwa->rule->cmd[fwa->rule->act_ofs].opcode; s = splimp(); pipe_nr &= 0xffff ; - if ( (fs = fwa->rule->pipe_ptr) == NULL ) { - fs = locate_flowset(pipe_nr, fwa->rule); - if (fs == NULL) - goto dropit ; /* this queue/pipe does not exist! */ - } + /* + * this is a dummynet rule, so we expect a O_PIPE or O_QUEUE rule + */ + fs = locate_flowset(pipe_nr, fwa->rule); + if (fs == NULL) + goto dropit ; /* this queue/pipe does not exist! */ pipe = fs->pipe ; if (pipe == NULL) { /* must be a queue, try find a matching pipe */ for (pipe = all_pipes; pipe && pipe->pipe_nr != fs->parent_nr; @@ -1152,7 +1150,7 @@ * to schedule it. This involves different actions for fixed-rate or * WF2Q queues. */ - if ( (fwa->rule->fw_flg & IP_FW_F_COMMAND) == IP_FW_F_PIPE ) { + if ( action == O_PIPE ) { /* * Fixed-rate queue: just insert into the ready_heap. */ @@ -1302,15 +1300,13 @@ dummynet_flush() { struct dn_pipe *curr_p, *p ; - struct ip_fw *rule ; struct dn_flow_set *fs, *curr_fs; int s ; s = splimp() ; /* remove all references to pipes ...*/ - LIST_FOREACH(rule, &ip_fw_chain_head, next) - rule->pipe_ptr = NULL ; + flush_pipe_ptrs(NULL); /* prevent future matches... */ p = all_pipes ; all_pipes = NULL ; @@ -1375,8 +1371,8 @@ fs = &(p->fs) ; dn_rule_delete_fs(fs, r); for (pkt = p->head ; pkt ; pkt = DN_NEXT(pkt) ) - if (pkt->rule == r) - pkt->rule = ip_fw_default_rule ; + if (pkt->hdr.mh_data == r) + pkt->hdr.mh_data = (void *)ip_fw_default_rule ; } } @@ -1663,7 +1659,6 @@ delete_pipe(struct dn_pipe *p) { int s ; - struct ip_fw *rule ; if (p->pipe_nr == 0 && p->fs.fs_nr == 0) return EINVAL ; @@ -1687,9 +1682,7 @@ else a->next = b->next ; /* remove references to this pipe from the ip_fw rules. */ - LIST_FOREACH(rule, &ip_fw_chain_head, next) - if (rule->pipe_ptr == &(b->fs)) - rule->pipe_ptr = NULL ; + flush_pipe_ptrs(&(b->fs)); /* remove all references to this pipe from flow_sets */ for (fs = all_flow_sets; fs; fs= fs->next ) @@ -1721,9 +1714,7 @@ else a->next = b->next ; /* remove references to this flow_set from the ip_fw rules. */ - LIST_FOREACH(rule, &ip_fw_chain_head, next) - if (rule->pipe_ptr == b) - rule->pipe_ptr = NULL ; + flush_pipe_ptrs(b); if (b->pipe != NULL) { /* Update total weight on parent pipe and cleanup parent heaps */ @@ -1847,9 +1838,14 @@ /* Disallow sets in really-really secure mode. */ if (sopt->sopt_dir == SOPT_SET) { +#if __FreeBSD_version >= 500034 error = securelevel_ge(sopt->sopt_td->td_ucred, 3); if (error) return (error); +#else + if (securelevel >= 3) + return (EPERM); +#endif } switch (sopt->sopt_name) { ==== //depot/projects/interrupt/sys/netinet/ip_fw.h#4 (text+ko) ==== @@ -1,183 +1,305 @@ /* - * Copyright (c) 1993 Daniel Boulet - * Copyright (c) 1994 Ugen J.S.Antsilevich + * Copyright (c) 2002 Luigi Rizzo, Universita` di Pisa + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * Redistribution and use in source forms, with and without modification, - * are permitted provided that this entire comment appears intact. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. * - * Redistribution in binary form may occur without any restrictions. - * Obviously, it would be nice if you gave credit where credit is due - * but requiring it would be too onerous. + * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.69 2002/06/27 23:02:17 luigi Exp $ + */ + +#ifndef _IPFW2_H +#define _IPFW2_H + +/* + * The kernel representation of ipfw rules is made of a list of + * 'instructions' (for all practical purposes equivalent to BPF + * instructions), which specify which fields of the packet + * (or its metatada) should be analysed. * - * This software is provided ``AS IS'' without any warranties of any kind. + * Each instruction is stored in a structure which begins with + * "ipfw_insn", and can contain extra fields depending on the + * instruction type (listed below). * - * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.68 2002/06/22 11:51:02 luigi Exp $ + * "enum ipfw_opcodes" are the opcodes supported. We can have up + * to 256 different opcodes. */ -#ifndef _IP_FW_H -#define _IP_FW_H +enum ipfw_opcodes { /* arguments (4 byte each) */ + O_NOP, + + O_IP_SRC, /* u32 = IP */ + O_IP_SRC_MASK, /* ip = IP/mask */ + O_IP_SRC_ME, /* none */ + O_IP_SRC_SET, /* u32=base, arg1=len, bitmap */ + + O_IP_DST, /* u32 = IP */ + O_IP_DST_MASK, /* ip = IP/mask */ + O_IP_DST_ME, /* none */ + O_IP_DST_SET, /* u32=base, arg1=len, bitmap */ + + O_IP_SRCPORT, /* (n)port list:mask 4 byte ea */ + O_IP_DSTPORT, /* (n)port list:mask 4 byte ea */ + O_PROTO, /* arg1=protocol */ + + O_MACADDR2, /* 2 mac addr:mask */ + O_MAC_TYPE, /* same as srcport */ + + O_LAYER2, /* none */ + O_IN, /* none */ + O_FRAG, /* none */ + + O_RECV, /* none */ + O_XMIT, /* none */ + O_VIA, /* none */ + + O_IPOPT, /* arg1 = 2*u8 bitmap */ + O_IPLEN, /* arg1 = len */ + O_IPID, /* arg1 = id */ + + O_IPPRE, /* arg1 = id */ + O_IPTOS, /* arg1 = id */ + O_IPTTL, /* arg1 = TTL */ + + O_IPVER, /* arg1 = version */ + O_UID, /* u32 = id */ + O_GID, /* u32 = id */ + O_ESTAB, /* none (tcp established) */ + O_TCPFLAGS, /* arg1 = 2*u8 bitmap */ + O_TCPWIN, /* arg1 = desired win */ + O_TCPSEQ, /* u32 = desired seq. */ + O_TCPACK, /* u32 = desired seq. */ + O_ICMPTYPE, /* u32 = icmp bitmap */ + O_TCPOPTS, /* arg1 = 2*u8 bitmap */ + O_IPOPTS, /* arg1 = 2*u8 bitmap */ + + O_PROBE_STATE, /* none */ + O_KEEP_STATE, /* none */ + O_LIMIT, /* ipfw_insn_limit */ + O_LIMIT_PARENT, /* dyn_type, not an opcode. */ + /* + * these are really 'actions', and must be last in the list. + */ + + O_LOG, /* ipfw_insn_log */ + O_PROB, /* u32 = match probability */ -#include + O_CHECK_STATE, /* none */ + O_ACCEPT, /* none */ + O_DENY, /* none */ + O_REJECT, /* arg1=icmp arg (same as deny) */ + O_COUNT, /* none */ + O_SKIPTO, /* arg1=next rule number */ + O_PIPE, /* arg1=pipe number */ + O_QUEUE, /* arg1=queue number */ + O_DIVERT, /* arg1=port number */ + O_TEE, /* arg1=port number */ + O_FORWARD_IP, /* fwd sockaddr */ + O_FORWARD_MAC, /* fwd mac */ + O_LAST_OPCODE /* not an opcode! */ +}; /* - * This union structure identifies an interface, either explicitly - * by name or implicitly by IP address. The flags IP_FW_F_IIFNAME - * and IP_FW_F_OIFNAME say how to interpret this structure. An - * interface unit number of -1 matches any unit number, while an - * IP address of 0.0.0.0 indicates matches any interface. + * Template for instructions. + * + * ipfw_insn is used for all instructions which require no operands, + * a single 16-bit value (arg1), or a couple of 8-bit values. + * + * For other instructions which require different/larger arguments + * we have derived structures, ipfw_insn_*. + * + * The size of the instruction (in 32-bit words) is in the low + * 6 bits of "len". The 2 remaining bits are used to implement + * NOT and OR on individual instructions. Given a type, you can + * compute the length to be put in "len" using F_INSN_SIZE(t) + * + * F_NOT negates the match result of the instruction. + * + * F_OR is used to build or blocks. By default, instructions + * are evaluated as part of a logical AND. An "or" block + * { X or Y or Z } contains F_OR set in all but the last + * instruction of the block. A match will cause the code + * to skip past the last instruction of the block. + * + * NOTA BENE: in a couple of places we assume that + * sizeof(ipfw_insn) == sizeof(u_int32_t) + * this needs to be fixed. * - * The receive and transmit interfaces are only compared against the - * the packet if the corresponding bit (IP_FW_F_IIFACE or IP_FW_F_OIFACE) - * is set. Note some packets lack a receive or transmit interface - * (in which case the missing "interface" never matches). */ +typedef struct _ipfw_insn { /* template for instructions */ + enum ipfw_opcodes opcode:8; + u_int8_t len; /* numer of 32-byte words */ +#define F_NOT 0x80 +#define F_OR 0x40 +#define F_LEN_MASK 0x3f +#define F_LEN(cmd) ((cmd)->len & F_LEN_MASK) -union ip_fw_if { - struct in_addr fu_via_ip; /* Specified by IP address */ - struct { /* Specified by interface name */ -#define FW_IFNLEN 10 /* need room ! was IFNAMSIZ */ - char name[FW_IFNLEN]; - short unit; /* -1 means match any unit */ - } fu_via_if; -}; + u_int16_t arg1; +} ipfw_insn; + +/* + * The F_INSN_SIZE(type) computes the size, in 4-byte words, of + * a given type. + */ +#define F_INSN_SIZE(t) ((sizeof (t))/sizeof(u_int32_t)) /* - * Format of an IP firewall descriptor - * - * fw_src, fw_dst, fw_smsk, fw_dmsk are always stored in network byte order. - * fw_flg and fw_n*p are stored in host byte order (of course). - * Port numbers are stored in HOST byte order. + * This is used to store an array of 16-bit entries (ports etc.) */ +typedef struct _ipfw_insn_u16 { + ipfw_insn o; + u_int16_t ports[2]; /* there may be more */ +} ipfw_insn_u16; /* - * To match MAC headers: - * 12 bytes at fw_mac_hdr contain the dst-src MAC address after masking. - * 12 bytes at fw_mac_mask contain the mask to apply to dst-src - * 2 bytes at fw_mac_type contain the mac type after mask (in net format) - * 2 bytes at fw_mac_type_mask contain the mac type mask - * If IP_FW_F_SRNG, the two contain the low-high of a range of types. - * IP_FW_F_DRNG is used to indicare we want to match a vlan. + * This is used to store an array of 32-bit entries + * (uid, single IPv4 addresses etc.) */ -#define fw_mac_hdr fw_src -#define fw_mac_mask fw_uar -#define fw_mac_type fw_iplen -#define fw_mac_mask_type fw_ipid +typedef struct _ipfw_insn_u32 { + ipfw_insn o; + u_int32_t d[1]; /* one or more */ +} ipfw_insn_u32; -struct ip_fw { - LIST_ENTRY(ip_fw) next; /* bidirectional list of rules */ - u_int fw_flg; /* Operational Flags word */ - u_int64_t fw_pcnt; /* Packet counters */ - u_int64_t fw_bcnt; /* Byte counters */ +/* + * This is used to store IP addr-mask pairs. + */ +typedef struct _ipfw_insn_ip { + ipfw_insn o; + struct in_addr addr; + struct in_addr mask; +} ipfw_insn_ip; - struct in_addr fw_src; /* Source IP address */ - struct in_addr fw_dst; /* Destination IP address */ - struct in_addr fw_smsk; /* Mask for source IP address */ - struct in_addr fw_dmsk; /* Mask for destination address */ - u_short fw_number; /* Rule number */ - u_char fw_prot; /* IP protocol */ -#if 1 - u_char fw_nports; /* # of src/dst port in array */ -#define IP_FW_GETNSRCP(rule) ((rule)->fw_nports & 0x0f) -#define IP_FW_SETNSRCP(rule, n) do { \ - (rule)->fw_nports &= ~0x0f; \ - (rule)->fw_nports |= (n); \ - } while (0) -#define IP_FW_GETNDSTP(rule) ((rule)->fw_nports >> 4) -#define IP_FW_SETNDSTP(rule, n) do { \ - (rule)->fw_nports &= ~0xf0; \ - (rule)->fw_nports |= (n) << 4;\ - } while (0) -#define IP_FW_HAVEPORTS(rule) ((rule)->fw_nports != 0) -#else - u_char __pad[1]; - u_int _nsrcp; - u_int _ndstp; -#define IP_FW_GETNSRCP(rule) (rule)->_nsrcp -#define IP_FW_SETNSRCP(rule,n) (rule)->_nsrcp = n -#define IP_FW_GETNDSTP(rule) (rule)->_ndstp -#define IP_FW_SETNDSTP(rule,n) (rule)->_ndstp = n -#define IP_FW_HAVEPORTS(rule) ((rule)->_ndstp + (rule)->_nsrcp != 0) -#endif -#define IP_FW_MAX_PORTS 10 /* A reasonable maximum */ - union { - u_short fw_pts[IP_FW_MAX_PORTS]; /* port numbers to match */ -#define IP_FW_ICMPTYPES_MAX 128 -#define IP_FW_ICMPTYPES_DIM (IP_FW_ICMPTYPES_MAX / (sizeof(unsigned) * 8)) - unsigned fw_icmptypes[IP_FW_ICMPTYPES_DIM]; /*ICMP types bitmap*/ - } fw_uar; +/* + * This is used to forward to a given address (ip) + */ +typedef struct _ipfw_insn_sa { + ipfw_insn o; + struct sockaddr_in sa; +} ipfw_insn_sa; - u_int fw_ipflg; /* IP flags word */ - u_short fw_iplen; /* IP length */ - u_short fw_ipid; /* Identification */ - u_char fw_ipopt; /* IP options set */ - u_char fw_ipnopt; /* IP options unset */ - u_char fw_iptos; /* IP type of service set */ - u_char fw_ipntos; /* IP type of service unset */ - u_char fw_ipttl; /* IP time to live */ - u_int fw_ipver:4; /* IP version */ - u_char fw_tcpopt; /* TCP options set */ - u_char fw_tcpnopt; /* TCP options unset */ - u_char fw_tcpf; /* TCP flags set */ - u_char fw_tcpnf; /* TCP flags unset */ - u_short fw_tcpwin; /* TCP window size */ - u_int32_t fw_tcpseq; /* TCP sequence */ - u_int32_t fw_tcpack; /* TCP acknowledgement */ - long timestamp; /* timestamp (tv_sec) of last match */ - union ip_fw_if fw_in_if; /* Incoming interfaces */ - union ip_fw_if fw_out_if; /* Outgoing interfaces */ - union { - u_short fu_divert_port; /* Divert/tee port (options IPDIVERT) */ - u_short fu_pipe_nr; /* queue number (option DUMMYNET) */ - u_short fu_skipto_rule; /* SKIPTO command rule number */ - u_short fu_reject_code; /* REJECT response code */ - struct sockaddr_in fu_fwd_ip; - } fw_un; - void *pipe_ptr; /* flow_set ptr for dummynet pipe */ - void *next_rule_ptr; /* next rule in case of match */ - uid_t fw_uid; /* uid to match */ - gid_t fw_gid; /* gid to match */ - int fw_logamount; /* amount to log */ - u_int64_t fw_loghighest; /* highest number packet to log */ +/* + * This is used for MAC addr-mask pairs. + */ +typedef struct _ipfw_insn_mac { + ipfw_insn o; + u_char addr[12]; /* dst[6] + src[6] */ + u_char mask[12]; /* dst[6] + src[6] */ +} ipfw_insn_mac; - long dont_match_prob; /* 0x7fffffff means 1.0, always fail */ - u_char dyn_type; /* type for dynamic rule */ +/* + * This is used for interface match rules (recv xx, xmit xx) + */ +typedef struct _ipfw_insn_if { + ipfw_insn o; + union { + struct in_addr ip; + int unit; + } p; + char name[IFNAMSIZ]; +} ipfw_insn_if; -#define DYN_KEEP_STATE 0 /* type for keep-state rules */ -#define DYN_LIMIT 1 /* type for limit connection rules */ -#define DYN_LIMIT_PARENT 2 /* parent entry for limit connection rules */ +/* + * This is used for pipe and queue actions, which need to store + * a single pointer (which can have different size on different + * architectures. + */ +typedef struct _ipfw_insn_pipe { + ipfw_insn o; + void *pipe_ptr; +} ipfw_insn_pipe; - /* following two fields are used to limit number of connections - * basing on either src, srcport, dst, dstport. - */ - u_char limit_mask; /* mask type for limit rule, can - * have many. - */ +/* + * This is used for limit rules. + */ +typedef struct _ipfw_insn_limit { + ipfw_insn o; + u_int8_t _pad; + u_int8_t limit_mask; /* combination of DYN_* below */ #define DYN_SRC_ADDR 0x1 #define DYN_SRC_PORT 0x2 #define DYN_DST_ADDR 0x4 #define DYN_DST_PORT 0x8 - u_short conn_limit; /* # of connections for limit rule */ -}; + u_int16_t conn_limit; +} ipfw_insn_limit; -#define fw_divert_port fw_un.fu_divert_port -#define fw_skipto_rule fw_un.fu_skipto_rule -#define fw_reject_code fw_un.fu_reject_code -#define fw_pipe_nr fw_un.fu_pipe_nr -#define fw_fwd_ip fw_un.fu_fwd_ip +/* + * This is used for log instructions + */ +typedef struct _ipfw_insn_log { + ipfw_insn o; + u_int32_t max_log; /* how many do we log -- 0 = all */ + u_int32_t log_left; /* how many left to log */ +} ipfw_insn_log; /* + * Here we have the structure representing an ipfw rule. + * + * It starts with a general area (with link fields and counters) + * followed by an array of one or more instructions, which the code + * accesses as an array of 32-bit values. + * + * Given a rule pointer r: + * + * r->cmd is the start of the first instruction. + * ACTION_PTR(r) is the start of the first action (things to do + * once a rule matched). + * + * When assembling instruction, remember the following: * - * rule_ptr -------------+ - * V - * [ next.le_next ]---->[ next.le_next ]---- [ next.le_next ]---> - * [ next.le_prev ]<----[ next.le_prev ]<----[ next.le_prev ]<--- - * [ body ] [ body ] [ body ] + * + if a rule has a "keep-state" (or "limit") option, then the + * first instruction (at r->cmd) MUST BE an O_PROBE_STATE + * + if a rule has a "log" option, then the first action + * (at ACTION_PTR(r)) MUST be O_LOG * + * NOTE: we use a simple linked list of rules because we never need + * to delete a rule without scanning the list. We do not use + * queue(3) macros for portability and readability. */ +struct ip_fw { + struct ip_fw *next; /* linked list of rules */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 15: 6:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32A1D37B409; Fri, 28 Jun 2002 15:03:36 -0700 (PDT) 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 AC04437B411 for ; Fri, 28 Jun 2002 15:03:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A574943E16 for ; Fri, 28 Jun 2002 15:02:48 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5SM2mJU024810 for ; Fri, 28 Jun 2002 15:02:48 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5SM2mNN024806 for perforce@freebsd.org; Fri, 28 Jun 2002 15:02:48 -0700 (PDT) Date: Fri, 28 Jun 2002 15:02:48 -0700 (PDT) Message-Id: <200206282202.g5SM2mNN024806@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13537 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13537 Change 13537 by julian@julian_ref on 2002/06/28 15:02:33 Extract some KSE specific code into a function for diff-reduction. Affected files ... .. //depot/projects/kse/sys/kern/kern_thread.c#80 edit .. //depot/projects/kse/sys/kern/subr_trap.c#72 edit .. //depot/projects/kse/sys/sys/proc.h#117 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#80 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2001 Julian Elischer . * All rights reserved. * @@ -419,6 +419,138 @@ } /* + * The extra work we go through if we are a threaded process when we + * return to userland + */ +int +thread_userret(struct proc *p, struct ksegrp *kg, struct kse *ke, + struct thread *td, struct trapframe *frame) +{ + int error = 0; + + if (ke->ke_tdspare == NULL) { + mtx_lock(&Giant); + ke->ke_tdspare = thread_alloc(); + mtx_unlock(&Giant); + } + if (td->td_flags & TDF_UNBOUND) { + /* + * Are we returning from a thread that had a mailbox? + * + * XXX Maybe this should be in a separate function. + */ + if (((td->td_flags & TDF_UPCALLING) == 0) && td->td_mailbox) { + /* + * [XXXKSE Future enhancement] + * We could also go straight back to the syscall + * if we never had to do an upcall since then. + * If the KSE's copy is == the thread's copy.. + * AND there are no other completed threads. + */ + /* + * We will go back as an upcall or go do another thread. + * Either way we need to save the context back to + * the user thread mailbox. + * So the UTS can restart it later. + */ + error = thread_export_context(td); + td->td_mailbox = NULL; + if (error) { + /* + * Failing to do the KSE + * operation just defaults operation + * back to synchonous operation. + */ + goto cont; + } + + if (TAILQ_FIRST(&kg->kg_runq)) { + /* + * Uh-oh.. don't return to the user. + * Instead, switch to the thread that + * needs to run. The question is: + * What do we do with the thread we have now? + * We have put the completion block + * on the kse mailbox. If we had more energy, + * we could lazily do so, assuming someone + * else might get to userland earlier + * and deliver it earlier than we could. + * To do that we could save it off the KSEG. + * An upcalling KSE would 'reap' all completed + * threads. + * Being in a hurry, we'll do nothing and + * leave it on the current KSE for now. + * + * As for the other threads to run; + * we COULD rush through all the threads + * in this KSEG at this priority, or we + * could throw the ball back into the court + * and just run the highest prio kse available. + * What is OUR priority? + * the priority of the highest sycall waiting + * to be returned? + * For now, just let another KSE run (easiest). + */ + PROC_LOCK(p); + mtx_lock_spin(&sched_lock); + thread_exit(); /* Abandon current thread. */ + /* NOTREACHED */ + } else { /* if (number of returning syscalls = 1) */ + /* + * Swap our frame for the upcall frame. + * + * XXXKSE Assumes we are going to user land + * and not nested in the kernel + */ + td->td_flags |= TDF_UPCALLING; + } + } + /* + * This is NOT just an 'else' clause for the above test... + */ + if (td->td_flags & TDF_UPCALLING) { + CTR3(KTR_PROC, "userret: upcall thread %p (pid %d, %s)", + td, p->p_pid, p->p_comm); + /* + * Make sure that it has the correct frame loaded. + * While we know that we are on the same KSEGRP + * as we were created on, we could very easily + * have come in on another KSE. We therefore need + * to do the copy of the frame after the last + * possible switch() (the one above). + */ + bcopy(ke->ke_frame, frame, sizeof(struct trapframe)); + + /* + * Decide what we are sending to the user + * upcall sets one argument. The address of the mbox. + */ + cpu_set_args(td, ke); + + /* + * There is no more work to do and we are going to ride + * this thead/KSE up to userland. Make sure the user's + * pointer to the thread mailbox is cleared before we + * re-enter the kernel next time for any reason.. + * We might as well do it here. + */ + td->td_flags &= ~TDF_UPCALLING; /* Hmmmm. */ + error = suword((caddr_t)td->td_kse->ke_mailbox + + offsetof(struct kse_mailbox, kmbx_current_thread), + 0); + } + /* + * Stop any chance that we may be separated from + * the KSE we are currently on. This is "biting the bullet", + * we are committing to go to user space as as THIS KSE here. + */ +cont: + td->td_flags &= ~TDF_UNBOUND; + } + return (error); +} + +/* * Enforce single-threading. * * Returns 1 if the caller must abort (another thread is waiting to ==== //depot/projects/kse/sys/kern/subr_trap.c#72 (text+ko) ==== @@ -72,7 +72,6 @@ struct proc *p = td->td_proc; struct kse *ke = td->td_kse; struct ksegrp *kg = td->td_ksegrp; - int error; CTR3(KTR_SYSC, "userret: thread %p (pid %d, %s)", td, p->p_pid, p->p_comm); @@ -82,7 +81,7 @@ PROC_LOCK(p); mtx_lock_spin(&sched_lock); if (SIGPENDING(p) && ((p->p_sflag & PS_NEEDSIGCHK) == 0 || - (p->p_kse.ke_flags & KEF_ASTPENDING) == 0)) + (ke->ke_flags & KEF_ASTPENDING) == 0)) printf("failed to set signal flags proprly for ast()\n"); mtx_unlock_spin(&sched_lock); PROC_UNLOCK(p); @@ -118,127 +117,10 @@ thread_suspend_check(0); /* Can suspend or kill */ PROC_UNLOCK(p); if (p->p_flag & P_KSES) { - if (ke->ke_tdspare == NULL) { - mtx_lock(&Giant); - ke->ke_tdspare = thread_alloc(); - mtx_unlock(&Giant); - } + thread_userret(p, kg, ke, td, frame); + /* printf("KSE thread returned"); */ } - if (td->td_flags & TDF_UNBOUND) { - /* - * Are we returning from a thread that had a mailbox? - * - * XXX Maybe this should be in a separate function. - */ - if (((td->td_flags & TDF_UPCALLING) == 0) && td->td_mailbox) { - /* - * [XXXKSE Future enhancement] - * We could also go straight back to the syscall - * if we never had to do an upcall since then. - * If the KSE's copy is == the thread's copy.. - * AND there are no other completed threads. - */ - /* - * We will go back as an upcall or go do another thread. - * Either way we need to save the context back to - * the user thread mailbox. - * So the UTS can restart it later. - */ - error = thread_export_context(td); - td->td_mailbox = NULL; - if (error) { - /* - * Failing to do the KSE - * operation just defaults operation - * back to synchonous operation. - */ - goto cont; - } - if (TAILQ_FIRST(&kg->kg_runq)) { - /* - * Uh-oh.. don't return to the user. - * Instead, switch to the thread that - * needs to run. The question is: - * What do we do with the thread we have now? - * We have put the completion block - * on the kse mailbox. If we had more energy, - * we could lazily do so, assuming someone - * else might get to userland earlier - * and deliver it earlier than we could. - * To do that we could save it off the KSEG. - * An upcalling KSE would 'reap' all completed - * threads. - * Being in a hurry, we'll do nothing and - * leave it on the current KSE for now. - * - * As for the other threads to run; - * we COULD rush through all the threads - * in this KSEG at this priority, or we - * could throw the ball back into the court - * and just run the highest prio kse available. - * What is OUR priority? - * the priority of the highest sycall waiting - * to be returned? - * For now, just let another KSE run (easiest). - */ - PROC_LOCK(p); - mtx_lock_spin(&sched_lock); - thread_exit(); /* Abandon current thread. */ - /* NOTREACHED */ - } else { /* if (number of returning syscalls = 1) */ - /* - * Swap our frame for the upcall frame. - * - * XXXKSE Assumes we are going to user land - * and not nested in the kernel - */ - td->td_flags |= TDF_UPCALLING; - } - } - /* - * This is NOT just an 'else' clause for the above test... - */ - if (td->td_flags & TDF_UPCALLING) { - CTR3(KTR_PROC, "userret: upcall thread %p (pid %d, %s)", - td, p->p_pid, p->p_comm); - /* - * Make sure that it has the correct frame loaded. - * While we know that we are on the same KSEGRP - * as we were created on, we could very easily - * have come in on another KSE. We therefore need - * to do the copy of the frame after the last - * possible switch() (the one above). - */ - bcopy(ke->ke_frame, frame, sizeof(struct trapframe)); - - /* - * Decide what we are sending to the user - * upcall sets one argument. The address of the mbox. - */ - cpu_set_args(td, ke); - - /* - * There is no more work to do and we are going to ride - * this thead/KSE up to userland. Make sure the user's - * pointer to the thread mailbox is cleared before we - * re-enter the kernel next time for any reason.. - * We might as well do it here. - */ - td->td_flags &= ~TDF_UPCALLING; /* Hmmmm. */ - error = suword((caddr_t)td->td_kse->ke_mailbox + - offsetof(struct kse_mailbox, kmbx_current_thread), - 0); - } - /* - * Stop any chance that we may be separated from - * the KSE we are currently on. This is "biting the bullet", - * we are committing to go to user space as as THIS KSE here. - */ -cont: - td->td_flags &= ~TDF_UNBOUND; - } - /* * Charge system time if profiling. * @@ -261,8 +143,7 @@ * This function will return with preemption disabled. */ void -ast(framep) - struct trapframe *framep; +ast(struct trapframe *framep) { struct thread *td = curthread; struct proc *p = td->td_proc; ==== //depot/projects/kse/sys/sys/proc.h#117 (text+ko) ==== @@ -856,6 +856,8 @@ void thread_stash(struct thread *td); int thread_suspend_check(int how); void thread_unsuspend(struct proc *p); +int thread_userret(struct proc *p, struct ksegrp *kg, struct kse *ke, + struct thread *td, struct trapframe *frame); void thread_sanity_check(struct thread *td); #endif /* _KERNEL */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 15:50: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD85C37B412; Fri, 28 Jun 2002 15:49:13 -0700 (PDT) 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 1AFD137B408 for ; Fri, 28 Jun 2002 15:49:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92CB7440CF for ; Fri, 28 Jun 2002 15:41:37 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5SMfbJU032586 for ; Fri, 28 Jun 2002 15:41:37 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5SMfarv032580 for perforce@freebsd.org; Fri, 28 Jun 2002 15:41:36 -0700 (PDT) Date: Fri, 28 Jun 2002 15:41:36 -0700 (PDT) Message-Id: <200206282241.g5SMfarv032580@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13540 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13540 Change 13540 by julian@julian_ref on 2002/06/28 15:40:48 tidy up a bit Affected files ... .. //depot/projects/kse/sys/kern/kern_thread.c#81 edit .. //depot/projects/kse/sys/kern/subr_trap.c#73 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#81 (text+ko) ==== @@ -421,6 +421,13 @@ /* * The extra work we go through if we are a threaded process when we * return to userland + * + * If we are a KSE process and returning to user mode, check for + * extra work to do before we return (e.g. for more syscalls + * to complete first). If we were in a critical section, we should + * just return to let it finish. Same if we were in the UTS (in + * which case we will have no thread mailbox registered). The only + * traps we suport will have set the mailbox. We will clear it here. */ int thread_userret(struct proc *p, struct ksegrp *kg, struct kse *ke, ==== //depot/projects/kse/sys/kern/subr_trap.c#73 (text+ko) ==== @@ -104,18 +104,16 @@ } /* - * If we are a KSE process and returning to user mode, check for - * extra work to do before we return (e.g. for more syscalls - * to complete first). If we were in a critical section, we should - * just return to let it finish. Same if we were in the UTS (in - * which case we will have no thread mailbox registered). The only - * traps we suport will have set the mailbox. We will clear it here. - * We also need to check to see if we have to exit or wait due to a - * single threading requirement. + * We need to check to see if we have to exit or wait due to a + * single threading requirement or some other STOP condition. */ PROC_LOCK(p); thread_suspend_check(0); /* Can suspend or kill */ PROC_UNLOCK(p); + + /* + * DO special thread processing, e.g. upcall tweaking and such + */ if (p->p_flag & P_KSES) { thread_userret(p, kg, ke, td, frame); /* printf("KSE thread returned"); */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 15:52: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62EA537B40E; Fri, 28 Jun 2002 15:49:42 -0700 (PDT) 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 0E42C37B4A1 for ; Fri, 28 Jun 2002 15:49:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0B6444073 for ; Fri, 28 Jun 2002 15:36:29 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5SMaTJU031847 for ; Fri, 28 Jun 2002 15:36:29 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5SMaTbT031844 for perforce@freebsd.org; Fri, 28 Jun 2002 15:36:29 -0700 (PDT) Date: Fri, 28 Jun 2002 15:36:29 -0700 (PDT) Message-Id: <200206282236.g5SMaTbT031844@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13539 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13539 Change 13539 by julian@julian_ref on 2002/06/28 15:36:04 try get a bit up to date Affected files ... .. //depot/projects/kse/sys/notes#12 edit Differences ... ==== //depot/projects/kse/sys/notes#12 (text+ko) ==== @@ -1,13 +1,15 @@ This file is to keep notes on what is going on re: KSEing the kernel. [STOPPED/SUSPEND] -WHen a process is 'stopped' thread that are in system calls +When a process is 'stopped', threads that are in a system call and may hold resources must be allowed to complete, however from the point of -view of teh rest of the world, the process is stopped if we do not allow +view of the rest of the world, the process is stopped if we do not allow any threads to go to user land. This means that we can implement 'stop' by taking any threads that wish to go to userland, and hanging them off a special suspended queue, and NOT letting them go to userland. +[done] + -------------------------------- More STOPs There are 4 basic kinds of stop that must be dealt with: @@ -15,15 +17,26 @@ ((p->p_userthreads == 0) && (p->p_flag & P_STOPPED_SGNL)) i.e no user threads are allowed and they are presenlty all not there. +[p_userthreads does not yet exist] +[presently use p_numthreads == p_suspcount] + 2/ Singlethreading: A process can generally only be considered safely singlethreaded when the state of all other threads is KNOWN to be "suspended". This can be needed for safe completion of some syscalls (e.g. fork) however the variant needed for exit and exec must force the other threads to actually die. This actually must occur in a safe place, e.g. the SUSPEND checkpoint. +The singlethreading thread will itself suspend until all other threads +are suspended. thus the completion state is p_numthreads == p_suspcount. +Either p_numthreads or p_suspcount can be chenged to reach this condition. + It is possible that for fork() a NON_KILLING singlethreading need only keep the threads out of userspace if there were no effort to -restart the threads in the child. The child would need to +restart the threads in the child. +[no probably they need to be suspended so that the child gets +a consistent image of memeory][hmmm maybe not.. think more] + +The child would need to complete all the context blocks in it's own space with a set of known failure codes, before completing the first upcall. The parent would be allowed to have it's threads in any state, suspended @@ -42,7 +55,7 @@ STOPPING mode, it requires the same notification of the parent that would occur when the TRACE suspencion is completed -5/ Embedded breakpoint: the thread is stopped. WHether the rest of the +4A/ Embedded breakpoint: the thread is stopped. WHether the rest of the threads are stopped is dependent on what is required. ----------------------- @@ -55,14 +68,15 @@ Thus they must not take part in the 'assigned thread' system. Such a thread and KSE combination becomes 'synchronous'. ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^VIP +[Done (in part) see "BOUND" mode (TDF_UNBOUND)] SWAPPING In swapping, the function faultin() in vm_glue.c is the one to start investigations with. pmap_swapin_proc() and pmap_swapin_thread() are used and are synchronous. -Thus a processes hreads are either all-in or potentially all-out +Thus a processes threads are either all-in or potentially all-out of memory. The act of swapping a process in, ensures that they are -all in memory. +all in memory. [CHECK THIS] Note cached threads must be unswapped and in fact I believe that can only be so in this code. Thread-free() is only called as part of @@ -76,7 +90,7 @@ SINGLE_THREADING -This is a variant of SSTOP/SUSPEND. where on thread is allowed to continue +This is a variant of SSTOP/SUSPEND. where one thread is allowed to continue operation. (since it will never enter userland in this state that is normal). The difference is that the master thread is awoken when all other threads have become suspended (or exited) @@ -87,14 +101,17 @@ EXIT exit1 needs to set up the single threading. Set a flag that makes all threads entering or exiting the kernel -abort. ALso examined at other points (e.g. tsleep)/wake etc. +abort. Also examined at other points (e.g. tsleep)/wake etc. Possibly send a signal-like wakeup to all PCATCH sleeping threads. exiting needs to have a flag rather than be a state. The state is RUNNING (usually). ALready exists.. P_WEXIT. The single-threading mode may be enough. **The exit's own KSE should be freed to exit other threads while it waits** +[This brings up the whole concept of KSE BORROWING or LENDING.. see later] + FORK. +The grand plan... The singlethreading pointer points to the only thread that can act normally at this time. All other threads will proceed to the userland interface and write out results and return values asap. They may even abort @@ -114,7 +131,7 @@ you want them to suspend BEFORE they write out their status because that would perterb the parent address space that you are duplicating, The results of a read() are ok, but the tcbs shouldn't be filled out and -moved to teh completed queue, because the child needs to do them differently. +moved to the completed queue, because the child needs to do them differently. @@ -146,11 +163,12 @@ setrunqueue(td); } +Usually this is done with a priority change.. +should really take the new peiority as an argument. + All the sleeptime stats are screwed up between threads, KSEs and KSEGRPs - - WAKEUP/setrunqueue in wakeup() in the !INMEM case, I've probably broken it by @@ -167,5 +185,3 @@ cannot be touched during wakeup as the thread may not have a KSE. find out what it's for and think of a better way of doing it. -[kg_runnable] -is never decremented.. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 18:26:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C65BD37B400; Fri, 28 Jun 2002 18:26:04 -0700 (PDT) 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 4AAC937B401 for ; Fri, 28 Jun 2002 18:26:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D09B43E06 for ; Fri, 28 Jun 2002 18:26:04 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T1Q3JU063568 for ; Fri, 28 Jun 2002 18:26:03 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T1Q3Xf063565 for perforce@freebsd.org; Fri, 28 Jun 2002 18:26:03 -0700 (PDT) Date: Fri, 28 Jun 2002 18:26:03 -0700 (PDT) Message-Id: <200206290126.g5T1Q3Xf063565@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13551 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13551 Change 13551 by julian@julian_ref on 2002/06/28 18:25:56 Don't need Giant pre-set for userret() Affected files ... .. //depot/projects/kse/sys/i386/i386/trap.c#55 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#55 (text+ko) ==== @@ -1076,6 +1076,12 @@ } /* + * Release Giant if we previously set it. + */ + if ((callp->sy_narg & SYF_MPSAFE) == 0) + mtx_unlock(&Giant); + + /* * Traced syscall. */ if ((orig_tf_eflags & PSL_T) && !(orig_tf_eflags & PSL_VM)) { @@ -1088,12 +1094,6 @@ */ userret(td, &frame, sticks); - /* - * Release Giant if we previously set it. - */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); - #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 18:35:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 804C037B406; Fri, 28 Jun 2002 18:35:16 -0700 (PDT) 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 159F437B401 for ; Fri, 28 Jun 2002 18:35:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9257643E06 for ; Fri, 28 Jun 2002 18:35:15 -0700 (PDT) (envelope-from ticso@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T1ZFJU064438 for ; Fri, 28 Jun 2002 18:35:15 -0700 (PDT) (envelope-from ticso@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T1ZFij064435 for perforce@freebsd.org; Fri, 28 Jun 2002 18:35:15 -0700 (PDT) Date: Fri, 28 Jun 2002 18:35:15 -0700 (PDT) Message-Id: <200206290135.g5T1ZFij064435@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to ticso@freebsd.org using -f From: Bernd Walter Subject: PERFORCE change 13552 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13552 Change 13552 by ticso@ticso-cicely5 on 2002/06/28 18:34:37 release Giant before calling userret() Affected files ... .. //depot/projects/kse/sys/alpha/alpha/trap.c#28 edit Differences ... ==== //depot/projects/kse/sys/alpha/alpha/trap.c#28 (text+ko) ==== @@ -780,14 +780,14 @@ break; } - userret(td, framep, sticks); - /* * Release Giant if we had to get it. */ if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); + userret(td, framep, sticks); + #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 18:49:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4873A37B410; Fri, 28 Jun 2002 18:49:36 -0700 (PDT) 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 0F26337B4CC for ; Fri, 28 Jun 2002 18:49:35 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7EA743E0A for ; Fri, 28 Jun 2002 18:49:34 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T1nYJU065868 for ; Fri, 28 Jun 2002 18:49:34 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T1nYAV065861 for perforce@freebsd.org; Fri, 28 Jun 2002 18:49:34 -0700 (PDT) Date: Fri, 28 Jun 2002 18:49:34 -0700 (PDT) Message-Id: <200206290149.g5T1nYAV065861@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13554 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13554 Change 13554 by julian@julian_ref on 2002/06/28 18:49:16 Move userret in syscall for the other architectures where that makes sense. (to not have Giant SOMETIMES set) Affected files ... .. //depot/projects/kse/sys/alpha/alpha/trap.c#29 edit .. //depot/projects/kse/sys/i386/i386/trap.c#56 edit .. //depot/projects/kse/sys/ia64/ia64/trap.c#24 edit .. //depot/projects/kse/sys/powerpc/powerpc/trap.c#16 edit .. //depot/projects/kse/sys/sparc64/sparc64/trap.c#32 edit Differences ... ==== //depot/projects/kse/sys/alpha/alpha/trap.c#29 (text+ko) ==== ==== //depot/projects/kse/sys/i386/i386/trap.c#56 (text+ko) ==== ==== //depot/projects/kse/sys/ia64/ia64/trap.c#24 (text+ko) ==== @@ -872,14 +872,14 @@ break; } - userret(td, framep, sticks); - /* * Release Giant if we had to get it. */ if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); + userret(td, framep, sticks); + #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); @@ -1043,15 +1043,15 @@ } /* - * Handle reschedule and other end-of-syscall issues + * Release Giant if we previously set it. */ - userret(td, framep, sticks); + if ((callp->sy_narg & SYF_MPSAFE) == 0) + mtx_unlock(&Giant); /* - * Release Giant if we previously set it. + * Handle reschedule and other end-of-syscall issues */ - if ((callp->sy_narg & SYF_MPSAFE) == 0) - mtx_unlock(&Giant); + userret(td, framep, sticks); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ==== //depot/projects/kse/sys/powerpc/powerpc/trap.c#16 (text+ko) ==== ==== //depot/projects/kse/sys/sparc64/sparc64/trap.c#32 (text+ko) ==== @@ -657,17 +657,17 @@ } /* - * Handle reschedule and other end-of-syscall issues - */ - userret(td, tf, sticks); - - /* * Release Giant if we had to get it. Don't use mtx_owned(), * we want to catch broken syscalls. */ if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); + /* + * Handle reschedule and other end-of-syscall issues + */ + userret(td, tf, sticks); + #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ktrsysret(code, error, td->td_retval[0]); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 18:59:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CADAB37B400; Fri, 28 Jun 2002 18:57:35 -0700 (PDT) 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 4EF7737B401 for ; Fri, 28 Jun 2002 18:57:35 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 326CD43E06 for ; Fri, 28 Jun 2002 18:57:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T1vXJU068131 for ; Fri, 28 Jun 2002 18:57:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T1tTEq067057 for perforce@freebsd.org; Fri, 28 Jun 2002 18:55:29 -0700 (PDT) Date: Fri, 28 Jun 2002 18:55:29 -0700 (PDT) Message-Id: <200206290155.g5T1tTEq067057@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13556 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13556 Change 13556 by rwatson@rwatson_tislabs on 2002/06/28 18:54:23 Integrate the trustedbsd_mac branch to the head of trustedbsd_base. Not quite done merging, since I have to rebuild system call tables (etc). Also, I'll then integrated trustedbsd_base forward once I've confirmed this boots and runs. WARNING: some magic numbers have changed (constants for socket options, etc), so please rebuild userland and the kernel when this finally works. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#4 integrate .. //depot/projects/trustedbsd/mac/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#14 integrate .. //depot/projects/trustedbsd/mac/UPDATING#12 integrate .. //depot/projects/trustedbsd/mac/bin/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/bin/cat/cat.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/date/netdate.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/dd/args.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/dd/misc.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/df/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/expr/expr.1#4 integrate .. //depot/projects/trustedbsd/mac/bin/expr/expr.y#5 integrate .. //depot/projects/trustedbsd/mac/bin/kill/kill.1#2 integrate .. //depot/projects/trustedbsd/mac/bin/kill/kill.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.1#2 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/ln/symlink.7#2 integrate .. //depot/projects/trustedbsd/mac/bin/ls/extern.h#4 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.h#5 integrate .. //depot/projects/trustedbsd/mac/bin/ls/print.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/mv/pathnames.h#2 integrate .. //depot/projects/trustedbsd/mac/bin/pax/ar_subs.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/buf_subs.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/cache.h#2 integrate .. //depot/projects/trustedbsd/mac/bin/pax/file_subs.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/ftree.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/options.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pat_rep.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pax.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pax.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pax.h#2 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tables.h#2 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tar.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tar.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/ps/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/bin/ps/extern.h#5 integrate .. //depot/projects/trustedbsd/mac/bin/ps/fmt.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/ps/nlist.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/ps/print.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/pwd/pwd.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/pwd/pwd.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/pathnames.h#2 delete .. //depot/projects/trustedbsd/mac/bin/rcp/rcp.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/realpath/realpath.c#2 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/alias.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/cd.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/error.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/eval.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/exec.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/expand.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/histedit.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/main.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/nodetypes#2 integrate .. //depot/projects/trustedbsd/mac/bin/sh/options.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/output.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/output.h#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/redir.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/show.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/var.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/var.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/sleep/sleep.1#2 integrate .. //depot/projects/trustedbsd/mac/bin/sync/sync.8#2 integrate .. //depot/projects/trustedbsd/mac/bin/test/test.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/amq/amq.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/amd/hlfsd/hlfsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/CHANGES#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/Version#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/dig/dig.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/dnsquery/dnsquery.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/host/host.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/named.conf#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/named.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_config.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_defs.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_forw.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_func.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_lexer.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_main.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_maint.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_notify.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_parser.y#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_req.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_resp.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_xfr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/commands.l#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/getinfo.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/list.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/main.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/res.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/send.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/subr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/docdef.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/logging.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/options.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/server.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/zone.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/dig.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/dnskeygen.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/dnsquery.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/getaddrinfo.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/gethostbyname.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/getipnodebyname.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/getnameinfo.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/getnetent.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/host.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/hostname.7#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/inet_cidr.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/mailaddr.7#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/mkdep.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/named-bootconf.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/named-xfer.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/named.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/named.conf.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/ndc.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/nslookup.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/nsupdate.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/resolver.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/resolver.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/tsig.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/arpa/nameser.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/resolv.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_ho.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_nw.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getaddrinfo.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/getnameinfo.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_sign.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_findzonecut.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_send.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_update.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/Makefile.set#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/include/port_after.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/diff/diff.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/BUGS#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog.lib#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/FREEBSD-libiberty#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/FSFChangeLog.10#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/FSFChangeLog.11#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/INSTALL#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/NEWS#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/PROBLEMS#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/PROJECTS#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/README#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/README-bugs#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/README.DWARF#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/README.TRAD#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/TESTS.FLUNK#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/alias.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ansidecl.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/assert.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/attribs.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/basic-block.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/bb-reorder.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/build-make#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/builtins.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-common.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-common.def#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-common.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-decl.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-format.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-iterate.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/c-lang.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-lex.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-objc-common.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-parse.gperf#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/c-parse.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-pragma.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-pragma.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-semantics.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-tree.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-typeck.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/calls.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cccp.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cexp.y#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cfg.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfganal.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfgcleanup.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfgrtl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/choose-temp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/collect2.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/combine.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/concat.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config.gcc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha-protos.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha.md#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/elf.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/freebsd.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/linux.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/netbsd-elf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/netbsd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/osf.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/t-crtbe#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/t-vms#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/vms-tramp.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/vms.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/x-alpha#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/x-vms#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/xm-alpha.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/xm-freebsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/xm-openbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/xm-vms.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/aof.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/aout.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm.md#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/coff.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/elf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/linux-elf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/netbsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/rtems-elf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/float-sparc.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/config-nt.sed#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/cygwin.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/dgux.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/djgpp-rtems.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/gnu.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386-interix.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386-protos.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.md#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/libgcc-x86_64-glibc.ver#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/linux-aout.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/linux-oldld.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/linux.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/linux64.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/netbsd-elf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/netbsd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/os2.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/perform.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/rtems.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/rtemself.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sco.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sco4.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sco4dbx.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sco5.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sco5gas.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/scodbx.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/sol2.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-i386bare#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-interix#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-linux64#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-rtems-i386#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-vsta#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/t-winnt#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/win-nt.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-aix#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-cygwin#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-dgux#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-djgpp#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-isc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-isc3#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-ncr3000#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-next#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-osf1elf#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-osfrose#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-sco#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-sco4#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-sco5#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-sysv3#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x-vsta#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/x86-64.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-aix.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-bsd386.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-dgux.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-dos.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-freebsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-gnu.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-i386.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-isc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-lynx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-next.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-openbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-os2.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-osf.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-osf1elf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-sco.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-sco5.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-sun.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-sysv3.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-sysv4.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-uwin.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/xm-winnt.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/aix.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/elf.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/freebsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/hpux.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64-protos.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/ia64.md#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/linux.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/sysv4.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/unwind-ia64.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/libgcc-glibc.ver#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/netbsd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix43.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix51.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/altivec.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/crtsavres.asm#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/darwin.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/eabi.asm#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/gnu.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/linux64.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/netbsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/ppc-asm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000-protos.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rtems.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-aix43#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-linux64#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/t-ppccomm#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/xcoff.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rtems.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/aout.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/crtfastmath.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/elf.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/gmon-sol2.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/libgcc-sparc-glibc.ver#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/linux-aout.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/linux.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/linux64.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/lite.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/litecoff.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/liteelf.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/netbsd-elf.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/netbsd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/pbd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/rtems.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/rtemself.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol2-64.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol2-bi.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol2-gas-bi.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol2-gld-bi.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol2-gld.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol2-sld-64.h#5 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol2-sld.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol2.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol27-sld.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sp64-aout.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sp64-elf.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sp86x-aout.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sp86x-elf.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc-protos.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc.md#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/splet.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/t-crtfm#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/t-elf#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/t-linux64#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/t-netbsd64#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/t-sol2-64#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/t-sp64#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/t-sunos40#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/vxsim.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/vxsparc64.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/x-sysv4#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/xm-linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/xm-lynx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/xm-openbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/xm-pbd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/xm-sol2.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/xm-sp64.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/xm-sparc.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/xm-sysv4-64.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/xm-sysv4.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-slibgcc-elf-ver#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-slibgcc-nolc-override#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/t-slibgcc-sld#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/x-linux#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/x-linux-aout#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/x-lynx#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/x-svr4#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/xm-alloca.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/xm-freebsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/xm-gnu.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/xm-interix.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/xm-linux.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/xm-lynx.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/xm-openbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/xm-siglist.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/xm-std32.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/xm-svr3.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/config/xm-svr4.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/configure#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/configure.lang#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp-demangle.c#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/Make-lang.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/NEWS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/call.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cfns.h#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/class.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cp-tree.def#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cp-tree.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cvt.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/decl.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/decl2.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/dump.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/errfn.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/error.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/exception.cc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/friend.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/g++spec.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/gxx.gperf#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/gxxint.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/inc/exception#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/inc/new#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/inc/new.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/inc/typeinfo#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/init.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/input.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/lang-specs.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/lex.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/mangle.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/method.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/new.cc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/new1.cc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/new2.cc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/parse.y#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/pt.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/search.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/semantics.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/sig.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/spew.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/tinfo.cc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/tinfo.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/tinfo2.cc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/tree.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/typeck.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/typeck2.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/xref.c#5 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cplus-dem.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpp.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cppalloc.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cppexp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpphash.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpphash.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppinit.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpplex.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpplib.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpplib.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppmacro.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppmain.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppulp.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/cross-make#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/crtstuff.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cse.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cselib.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dbxout.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/defaults.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/demangle.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/df.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/c-tree.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/contrib.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/contribute.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/cpp.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/cppenv.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/cppopts.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/extend.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/frontends.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/gcc.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/include/texinfo.tex#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/install.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/invoke.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/md.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/passes.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/rtl.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/sourcebuild.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/standards.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/tm.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doprint.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/dostage2#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/dostage3#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/dwarf2.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dwarf2out.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dwarfout.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/dyn-string.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dyn-string.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/eh-common.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/emit-rtl.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/except.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/except.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/exgettext#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/explow.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expmed.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expr.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expr.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/extend.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/BUGS#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/INSTALL#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/Make-lang.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/NEWS#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/assert.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/bad.def#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/bugs.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/com.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/config.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/convert.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/data.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/expr.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/ffe.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/flags.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/g77.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/g77install.texi#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/g77spec.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/glimits.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/hconfig.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/implic.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/input.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/intdoc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/intdoc.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/intrin.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/intrin.def#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/invoke.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/lex.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/news.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/output.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/proj.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/proj.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/root.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/rtl.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/stb.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/ste.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/stu.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/system.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/target.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/target.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/tconfig.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/tm.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/toplev.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/tree.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/f/version.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/fibheap.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/fibheap.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/final.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/fixcpp#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/fixinc-nt.sed#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/fixincludes#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/flags.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/flow.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/fold-const.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/frame.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/frame.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/function.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/function.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gansidecl.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/gcc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcc.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/gccbug.in#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/gcov.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/gcse.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genattrtab.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genemit.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genextract.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genflags.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genoutput.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/genrecog.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/getopt.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/getopt.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/getopt1.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/getpwd.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ggc-common.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/math-3300.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/math-68881.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/ppc-asm.h#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/proto.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-alpha.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-arc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-c4x.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-clipper.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-h8300.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-i860.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-i960.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-m32r.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-m88k.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-mips.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-mn10200.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-mn10300.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-pa.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-ppc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-pyr.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-sh.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-sparc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-spur.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/ginclude/va-v850.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-dce.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-posix.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-rtems.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-solaris.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gthr-win32.h#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/haifa-sched.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hashtab.c#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/hashtab.h#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/hex.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/hooks.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/hooks.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/hwint.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ifcvt.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/install.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/integrate.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/invoke.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/jump.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/just-fixinc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/langhooks-def.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/langhooks.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/langhooks.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/lbasename.c#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/libfuncs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/libgcc1-test.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/libgcc1.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/libiberty.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/listing#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/local-alloc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/longlong.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/loop.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/loop.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/machmode.def#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/machmode.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/make-temp-file.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/makefile.vms#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/md.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/md5.c#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/md5.h#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/mkconfig.sh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/mklibgcc.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/mkmap-symver.awk#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/lang-specs.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/objc-act.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/objc-lang.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/objc.gperf#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/obstack.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/obstack.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/optabs.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/output.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/partition.c#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/partition.h#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/patch-apollo-includes#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/pcp.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/pexecute.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/predict.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/print-tree.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/protoize.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/pself.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/pself1.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/pself2.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/pself3.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/pself4.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/pself5.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/recog.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reg-stack.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/regclass.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/regmove.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/regrename.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reload.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reload1.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reorg.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/resource.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/rtl.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/rtl.def#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/rtl.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/rtl.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/rtlanal.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-deps.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-int.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-rgn.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/sibcall.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/simplify-rtx.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/splay-tree.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/splay-tree.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ssa-ccp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/stmt.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/stor-layout.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/stupid.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/symcat.h#3 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/system.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/target-def.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/target.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tm.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/toplev.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tradcif.y#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tradcpp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tradcpp.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree-dump.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree-inline.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree.def#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unprotoize.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc/unroll.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unwind-dw2-fde-glibc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/varasm.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/version.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/vmsdbgout.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/config-ml.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/config.guess#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/config.sub#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/configure#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/configure.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/ChangeLog-97#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/ChangeLog-98#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/ChangeLog-99#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/MAINTAINERS#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/NEWS#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/TODO#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/acinclude.m4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/annotate.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/annotate.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/arc-tdep.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/arch-utils.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/arch-utils.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/arm-linux-nat.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/arm-linux-tdep.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/ax-gdb.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/ax-gdb.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/ax-general.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/ax.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/bcache.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/bcache.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/blockframe.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/breakpoint.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/breakpoint.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/buildsym.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/buildsym.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/c-lang.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/c-lang.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/c-typeprint.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/c-valprint.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/call-cmds.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/ch-exp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/ch-lang.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/ch-lang.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/ch-typeprint.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/ch-valprint.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/cli-out.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/cli-out.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/command.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/command.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/complaints.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/complaints.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/alpha/alpha-linux.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/alpha/alpha-osf2.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/alpha/alpha-osf3.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/alpha/nm-linux.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/alpha/nm-osf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/alpha/nm-osf2.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/alpha/nm-osf3.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/alpha/tm-alphalinux.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/alpha/xm-alphalinux.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/alpha/xm-alphaosf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/arm.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/arm.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/embed.mt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/linux.mh#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/linux.mt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/nm-arm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/nm-linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/tm-arm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/tm-embed.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/tm-linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/tm-wince.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/wince.mt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/xm-arm.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/xm-linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/embed.mt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/go32.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/go32.mt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/i386dgux.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/i386gnu.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/i386sol2.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/i386v4.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/i386v42mp.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/linux.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/linux.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nbsd.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nbsd.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/ncr3000.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-fbsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-gnu.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-go32.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-i386aix.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-i386bsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-i386lynx.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-i386mach.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-i386sco.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-i386sco4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-i386sco5.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-i386sol2.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-i386v.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-i386v4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-i386v42mp.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-linux.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-m3.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-nbsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-ptx4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-sun386.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/nm-symmetry.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-cygwin.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-fbsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-go32.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386aix.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386bsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386gnu.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386lynx.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386m3.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386mk.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386nw.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386os9k.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386sco5.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386sol2.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386v.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386v4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-i386v42mp.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-linux.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-nbsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-ptx.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-ptx4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-sun386.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-symmetry.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-vxworks.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/vxworks.mt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-cygwin.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-go32.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-i386aix.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-i386bsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-i386gnu.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-i386lynx.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-i386m3.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-i386mach.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-i386mk.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-i386sco.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-i386v.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-i386v32.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-i386v4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-linux.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-nbsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-ptx.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-ptx4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-sun386.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-symmetry.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/xm-windows.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/ia64/linux.mh#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/ia64/linux.mt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/ia64/nm-linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/ia64/tm-ia64.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/ia64/tm-linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/ia64/xm-linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/mips/tm-tx39.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/mips/tm-tx39l.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/mips/tm-vr4100.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/mips/tm-vr4xxx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/mips/tm-vr4xxxel.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/mips/tm-vr5000.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/mips/tm-vr5000el.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/mips/tm-wince.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/mips/vr4xxx.mt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/mips/vr4xxxel.mt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/mips/wince.mt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/linux.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/linux.mt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/macos.mh#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/macos.mt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/nm-aix.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/nm-linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/nm-macos.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/nm-solaris.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/solaris.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-cygwin.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-macos.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-ppc-aix.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-ppc-nw.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-ppc-sim.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-solaris.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-vxworks.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/vxworks.mt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/xm-aix.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/xm-cygwin.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/xm-linux.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/xm-mpw.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/xm-solaris.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/linux.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nbsd.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nbsd.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nbsdelf.mh#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nm-linux.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nm-nbsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nm-nbsdelf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nm-sparclynx.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nm-sun4os4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nm-sun4sol2.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/sun4sol2.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-linux.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-nbsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sp64.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sp64sim.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sparc.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sparclet.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sparclite.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sparclynx.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-spc-em.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sun4os4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sun4sol2.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-vxsparc.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/xm-linux.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/xm-nbsd.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/xm-sparc.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/xm-sparclynx.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/xm-sun4os4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/xm-sun4sol2.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/configure#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/configure.host#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/configure.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/configure.tgt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/core-aout.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/corefile.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/corelow.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/cp-valprint.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/dcache.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/dcache.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/dink32-rom.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/doc/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/doc/GDBvn.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/doc/agentexpr.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/doc/all-cfg.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/doc/annotate.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/doc/configure#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/doc/configure.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/doc/gdb.texinfo#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/doc/gdbgui.texinfo#2 delete .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/doc/gdbint.texinfo#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/doc/stabs.texinfo#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/dwarf2read.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/dwarfread.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/elfread.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/environ.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/environ.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/eval.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/event-loop.c#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 19: 7:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C35F37B406; Fri, 28 Jun 2002 19:07:01 -0700 (PDT) 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 BD0CB37B405 for ; Fri, 28 Jun 2002 19:07:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6143443E06 for ; Fri, 28 Jun 2002 19:07:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T270JU083517 for ; Fri, 28 Jun 2002 19:07:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T270Ct083508 for perforce@freebsd.org; Fri, 28 Jun 2002 19:07:00 -0700 (PDT) Date: Fri, 28 Jun 2002 19:07:00 -0700 (PDT) Message-Id: <200206290207.g5T270Ct083508@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13559 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13559 Change 13559 by rwatson@rwatson_tislabs on 2002/06/28 19:06:03 Rebuild system call tables from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#19 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#19 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#20 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#20 edit .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#19 (text+ko) ==== @@ -2,16 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL init_sysent.c#8 - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.121 2002/04/17 13:06:35 mux Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== THEIRS init_sysent.c#9 - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.124 2002/06/13 23:44:50 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp -==== YOURS init_sysent.c - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.110 2002/04/17 13:05:13 mux Exp -<<<< */ #include "opt_compat.h" @@ -421,11 +413,6 @@ { SYF_MPSAFE | AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd }, /* 388 = __mac_set_fd */ { SYF_MPSAFE | AS(__mac_set_file_args), (sy_call_t *)__mac_set_file }, /* 389 = __mac_set_file */ { AS(kenv_args), (sy_call_t *)kenv }, /* 390 = kenv */ ->>>> ORIGINAL init_sysent.c#8 -==== THEIRS init_sysent.c#9 { AS(lchflags_args), (sy_call_t *)lchflags }, /* 391 = lchflags */ { AS(uuidgen_args), (sy_call_t *)uuidgen }, /* 392 = uuidgen */ -==== YOURS init_sysent.c - { 0, (sy_call_t *)nosys }, /* 391 = lchflags */ -<<<< }; ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#19 (text+ko) ==== @@ -2,16 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL syscalls.c#8 - * $FreeBSD: src/sys/kern/syscalls.c,v 1.108 2002/04/17 13:06:36 mux Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== THEIRS syscalls.c#9 - * $FreeBSD: src/sys/kern/syscalls.c,v 1.111 2002/06/13 23:44:50 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp -==== YOURS syscalls.c - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.110 2002/04/17 13:05:13 mux Exp -<<<< */ char *syscallnames[] = { @@ -406,11 +398,6 @@ "__mac_set_fd", /* 388 = __mac_set_fd */ "__mac_set_file", /* 389 = __mac_set_file */ "kenv", /* 390 = kenv */ ->>>> ORIGINAL syscalls.c#8 -==== THEIRS syscalls.c#9 "lchflags", /* 391 = lchflags */ "uuidgen", /* 392 = uuidgen */ -==== YOURS syscalls.c - "#391", /* 391 = lchflags */ -<<<< }; ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.h#20 (text+ko) ==== @@ -2,16 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL syscall.h#9 - * $FreeBSD: src/sys/sys/syscall.h,v 1.107 2002/04/17 13:06:36 mux Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== THEIRS syscall.h#10 - * $FreeBSD: src/sys/sys/syscall.h,v 1.110 2002/06/13 23:44:50 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp -==== YOURS syscall.h - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.110 2002/04/17 13:05:13 mux Exp -<<<< */ #define SYS_syscall 0 @@ -312,12 +304,6 @@ #define SYS___mac_set_fd 388 #define SYS___mac_set_file 389 #define SYS_kenv 390 ->>>> ORIGINAL syscall.h#9 -#define SYS_MAXSYSCALL 391 -==== THEIRS syscall.h#10 #define SYS_lchflags 391 #define SYS_uuidgen 392 #define SYS_MAXSYSCALL 393 -==== YOURS syscall.h -#define SYS_MAXSYSCALL 392 -<<<< ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#20 (text+ko) ==== @@ -1,15 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL syscall.mk#9 -# $FreeBSD: src/sys/sys/syscall.mk,v 1.62 2002/04/17 13:06:36 mux Exp $ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== THEIRS syscall.mk#10 -# $FreeBSD: src/sys/sys/syscall.mk,v 1.65 2002/06/13 23:44:50 rwatson Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp -==== YOURS syscall.mk -# $FreeBSD$ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.110 2002/04/17 13:05:13 mux Exp -<<<< MIASM = \ syscall.o \ exit.o \ @@ -255,18 +247,12 @@ kse_new.o \ thread_wakeup.o \ kse_yield.o \ ->>>> ORIGINAL syscall.mk#9 - kenv.o -==== THEIRS syscall.mk#10 - kenv.o \ - lchflags.o \ - uuidgen.o -==== YOURS syscall.mk __mac_get_proc.o \ __mac_set_proc.o \ __mac_get_fd.o \ __mac_get_file.o \ __mac_set_fd.o \ __mac_set_file.o \ - kenv.o -<<<< + kenv.o \ + lchflags.o \ + uuidgen.o ==== //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#21 (text+ko) ==== @@ -2,16 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL sysproto.h#10 - * $FreeBSD: src/sys/sys/sysproto.h,v 1.99 2002/04/17 13:06:36 mux Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.109 2002/04/14 05:31:47 alc Exp -==== THEIRS sysproto.h#11 - * $FreeBSD: src/sys/sys/sysproto.h,v 1.102 2002/06/13 23:44:50 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp -==== YOURS sysproto.h - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.110 2002/04/17 13:05:13 mux Exp -<<<< */ #ifndef _SYS_SYSPROTO_H_ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 19:16:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17FD237B400; Fri, 28 Jun 2002 19:16:14 -0700 (PDT) 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 B39A437B405 for ; Fri, 28 Jun 2002 19:16:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 147CE43E13 for ; Fri, 28 Jun 2002 19:16:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T2GBJU092264 for ; Fri, 28 Jun 2002 19:16:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T2GBuZ092258 for perforce@freebsd.org; Fri, 28 Jun 2002 19:16:11 -0700 (PDT) Date: Fri, 28 Jun 2002 19:16:11 -0700 (PDT) Message-Id: <200206290216.g5T2GBuZ092258@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13560 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13560 Change 13560 by rwatson@rwatson_tislabs on 2002/06/28 19:16:06 Sync to GENERIC. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#32 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#32 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.341 2002/05/03 17:59:22 jmallett Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.345 2002/06/06 16:35:58 gibbs Exp $ machine i386 cpu I486_CPU @@ -60,7 +60,7 @@ options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS #Enable checks to detects deadlocks and cycles +options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed options ALT_BREAK_TO_DEBUGGER @@ -87,6 +87,7 @@ # SCSI Controllers device ahb # EISA AHA1742 family device ahc # AHA2940 and onboard AIC7xxx devices +device ahd # AHA39320 and onboard AIC79xx devices device amd # AMD 53C974 (Tekram DC-390(T)) device isp # Qlogic family #device ncr # NCR/Symbios Logic @@ -170,6 +171,7 @@ # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') +device em # Intel PRO/1000 adapter Gigabit Ethernet Card device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 19:53:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8363937B401; Fri, 28 Jun 2002 19:51:58 -0700 (PDT) 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 26F0E37B400 for ; Fri, 28 Jun 2002 19:51:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B858F43E0A for ; Fri, 28 Jun 2002 19:51:56 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T2puJU017282 for ; Fri, 28 Jun 2002 19:51:56 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T2pt7u017279 for perforce@freebsd.org; Fri, 28 Jun 2002 19:51:55 -0700 (PDT) Date: Fri, 28 Jun 2002 19:51:55 -0700 (PDT) Message-Id: <200206290251.g5T2pt7u017279@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13562 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13562 Change 13562 by julian@julian_ref on 2002/06/28 19:51:34 MFC to keep following current Affected files ... .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#6 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.alpha#4 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.i386#4 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/freebsd-nat-stubs.c#2 delete .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/freebsd-nat.c#3 delete .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/kvm-fbsd.c#6 delete .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/nm.h#4 delete .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/tm.h#3 delete .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/version.c#3 delete .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/alpha/xm.h#2 delete .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/config.h#4 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#4 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/i386/freebsd-nat.c#6 delete .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/i386/kvm-fbsd.c#10 delete .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/i386/nm.h#2 delete .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/i386/tm.h#3 delete .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/i386/xm.h#2 delete .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#1 branch .. //depot/projects/kse/sys/boot/alpha/boot1/boot1.c#3 integrate .. //depot/projects/kse/sys/boot/alpha/libalpha/common.h#2 integrate .. //depot/projects/kse/sys/ddb/db_elf.c#2 integrate .. //depot/projects/kse/sys/dev/bge/if_bge.c#11 integrate .. //depot/projects/kse/sys/dev/fxp/if_fxp.c#14 integrate .. //depot/projects/kse/sys/dev/lge/if_lge.c#5 integrate .. //depot/projects/kse/sys/dev/nge/if_nge.c#10 integrate .. //depot/projects/kse/sys/dev/sio/sio_ebus.c#2 integrate .. //depot/projects/kse/sys/dev/sound/pci/maestro3.c#7 integrate .. //depot/projects/kse/sys/geom/geom_aes.c#3 integrate .. //depot/projects/kse/sys/i386/isa/intr_machdep.h#9 integrate .. //depot/projects/kse/sys/kern/kern_descrip.c#32 integrate .. //depot/projects/kse/sys/kern/kern_event.c#12 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#31 integrate .. //depot/projects/kse/sys/kern/kern_exit.c#57 integrate .. //depot/projects/kse/sys/kern/kern_ktrace.c#13 integrate .. //depot/projects/kse/sys/kern/kern_lockf.c#10 integrate .. //depot/projects/kse/sys/kern/kern_physio.c#3 integrate .. //depot/projects/kse/sys/kern/kern_prot.c#30 integrate .. //depot/projects/kse/sys/kern/kern_resource.c#21 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#57 integrate .. //depot/projects/kse/sys/kern/kern_subr.c#15 integrate .. //depot/projects/kse/sys/kern/kern_synch.c#74 integrate .. //depot/projects/kse/sys/kern/kern_sysctl.c#14 integrate .. //depot/projects/kse/sys/kern/kern_time.c#10 integrate .. //depot/projects/kse/sys/kern/kern_xxx.c#6 integrate .. //depot/projects/kse/sys/kern/subr_disklabel.c#10 integrate .. //depot/projects/kse/sys/kern/subr_log.c#7 integrate .. //depot/projects/kse/sys/kern/subr_mbuf.c#13 integrate .. //depot/projects/kse/sys/kern/subr_prf.c#15 integrate .. //depot/projects/kse/sys/kern/subr_prof.c#10 integrate .. //depot/projects/kse/sys/kern/sys_pipe.c#13 integrate .. //depot/projects/kse/sys/kern/sys_socket.c#9 integrate .. //depot/projects/kse/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/kse/sys/kern/uipc_jumbo.c#2 integrate .. //depot/projects/kse/sys/kern/uipc_socket.c#20 integrate .. //depot/projects/kse/sys/kern/uipc_socket2.c#18 integrate .. //depot/projects/kse/sys/kern/uipc_syscalls.c#19 integrate .. //depot/projects/kse/sys/kern/uipc_usrreq.c#20 integrate .. //depot/projects/kse/sys/kern/vfs_cache.c#14 integrate .. //depot/projects/kse/sys/kern/vfs_export.c#5 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#35 integrate .. //depot/projects/kse/sys/kern/vfs_syscalls.c#30 integrate .. //depot/projects/kse/sys/kern/vfs_vnops.c#28 integrate .. //depot/projects/kse/sys/modules/ipfw/Makefile#3 integrate .. //depot/projects/kse/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/kse/sys/netinet/tcp_syncache.c#18 integrate .. //depot/projects/kse/sys/nfsclient/nfs.h#10 integrate .. //depot/projects/kse/sys/nfsclient/nfs_bio.c#9 integrate .. //depot/projects/kse/sys/nfsclient/nfs_socket.c#13 integrate .. //depot/projects/kse/sys/nfsclient/nfs_vnops.c#9 integrate .. //depot/projects/kse/sys/pci/if_sk.c#7 integrate .. //depot/projects/kse/sys/pci/if_ti.c#11 integrate .. //depot/projects/kse/sys/pci/if_wb.c#5 integrate .. //depot/projects/kse/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/kse/sys/sys/event.h#8 integrate .. //depot/projects/kse/sys/sys/file.h#12 integrate .. //depot/projects/kse/sys/sys/jumbo.h#2 integrate .. //depot/projects/kse/sys/sys/mbuf.h#11 integrate .. //depot/projects/kse/sys/sys/socketvar.h#22 integrate .. //depot/projects/kse/sys/sys/vnode.h#26 integrate Differences ... ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.59 2002/06/22 17:07:45 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.60 2002/06/29 01:16:00 obrien Exp $ .include "../Makefile.inc0" @@ -9,22 +9,28 @@ XSRCS= annotate.c ax-general.c ax-gdb.c bcache.c blockframe.c \ breakpoint.c buildsym.c c-exp.y c-lang.c c-typeprint.c \ c-valprint.c ch-exp.c ch-lang.c ch-typeprint.c ch-valprint.c \ - coffread.c command.c complaints.c copying.c core-regset.c \ + coffread.c complaints.c copying.c core-regset.c \ corefile.c corelow.c cp-valprint.c dcache.c dbxread.c \ demangle.c dwarfread.c dwarf2read.c elfread.c environ.c eval.c \ exec.c expprint.c f-exp.y f-lang.c f-typeprint.c f-valprint.c \ - findvar%UAfix.c fork-child.c freebsd-uthread.c gdbarch.c gdbtypes.c \ + findvar.c fork-child.c gdbarch.c gdbtypes.c \ infcmd.c inflow.c infptrace.c infrun.c inftarg.c language.c \ jv-exp.y jv-lang.c jv-valprint.c jv-typeprint.c nlmread.c \ m2-lang.c m2-exp.y m2-typeprint.c m2-valprint.c main.c maint.c \ mdebugread.c mem-break.c minsyms.c objfiles.c parse.c \ printcmd.c remote.c remote-utils.c scm-exp.c scm-lang.c \ scm-valprint.c solib.c source.c stabsread.c stack.c symfile.c \ - symmisc.c symtab.c target.c thread.c top.c tracepoint.c \ + symmisc.c symtab.c target.c thread.c top.c tracepoint.c \ typeprint.c utils.c valarith.c valops.c valprint.c values.c \ - version.c serial.c ser-unix.c ser-tcp.c -SRCS= init.c ${XSRCS} -SRCS+= wait.h + serial.c ser-unix.c ser-tcp.c +XSRCS+= arch-utils.c cp-abi.c completer.c doublest.c event-loop.c \ + event-top.c frame.c gdb-events.c inf-loop.c linespec.c \ + memattr.c regcache.c signals.c solib-svr4.c solib-legacy.c \ + ui-file.c ui-out.c wrapper.c cli-out.c \ + cli-cmds.c cli-cmds.h cli-decode.c cli-decode.h cli-script.c \ + cli-script.h cli-setshow.c cli-setshow.h cli-utils.c cli-utils.h +XSRCS+= freebsd-uthread.c kvm-fbsd.c +SRCS= init.c ${XSRCS} nm.h tm.h xm.h gdbversion.c xregex.h .if exists(${.CURDIR}/Makefile.${TARGET_ARCH}) .include "${.CURDIR}/Makefile.${TARGET_ARCH}" @@ -34,17 +40,22 @@ .if ${TARGET_ARCH} != ${MACHINE_ARCH} CFLAGS+= -DCROSS_COMPILE=1 .endif +CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${TARGET_ARCH}_arch CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd CFLAGS+= -I${GDBDIR}/gdb CFLAGS+= -I${GDBDIR}/gdb/config -DPADD= ${RELTOP}/libbfd/libbfd.a +DPADD= ${LIBKVM} +DPADD+= ${LIBM} +DPADD+= ${RELTOP}/libbfd/libbfd.a DPADD+= ${RELTOP}/libopcodes/libopcodes.a DPADD+= ${LIBGNUREGEX} DPADD+= ${RELTOP}/libiberty/libiberty.a DPADD+= ${LIBREADLINE} DPADD+= ${LIBTERMCAP} +LDADD= -lkvm +LDADD+= -lm LDADD+= ${RELTOP}/libbfd/libbfd.a LDADD+= ${RELTOP}/libopcodes/libopcodes.a LDADD+= -lgnuregex @@ -53,16 +64,13 @@ LDADD+= -ltermcap GDBDIR= ${.CURDIR}/../../../../contrib/gdb -.PATH: ${GDBDIR}/gdb +.PATH: ${GDBDIR}/gdb ${GDBDIR}/gdb/cli .PATH: ${SRCDIR}/opcodes -CFLAGS+= -DFREEBSD_ELF - CFLAGS+= -I$(.CURDIR) -I${DESTDIR}/usr/include/readline YFLAGS= -CLEANFILES= init.c init.c-tmp wait.h -CLEANFILES+= findvar%UAfix.c +CLEANFILES= init.c init.c-tmp nm.h tm.h xm.h gdbversion.c xregex.h # We do this by grepping through sources. If that turns out to be too slow, # maybe we could just require every .o file to have an initialization routine @@ -80,6 +88,8 @@ @rm -f init.c-tmp @echo '/* Do not modify this file. */' >init.c-tmp @echo '/* It is created automatically by the Makefile. */'>>init.c-tmp + @echo '#include "defs.h"' >>init.c-tmp + @echo '#include "call-cmds.h"' >>init.c-tmp @echo 'void initialize_all_files () {' >>init.c-tmp @for i in ${.ALLSRC} ; do \ filename=`echo $$i | sed \ @@ -106,7 +116,24 @@ .PRECIOUS: init.c -wait.h: - ln -sf ${.CURDIR}/../../../../sys/sys/wait.h ${.TARGET} +nm.h: + echo '#include "${TARGET_ARCH}/nm-fbsd.h"' >${.TARGET} + echo '#include "fbsd-kgdb.h"' >>${.TARGET} + +.for H in tm-fbsd xm-${TARGET_ARCH} +${H:C/-.*$//}.h: + ln -sf \ + ${.CURDIR}/../../../../contrib/gdb/gdb/config/${TARGET_ARCH}/${H}.h \ + ${.TARGET} +.endfor + +gdbversion.c: version.in + @echo '#include "version.h"' > ${.TARGET} + @echo 'const char version[] = "'"`sed q ${.ALLSRC}`"'";'>>${.TARGET} + @echo 'const char host_name[] = "${MACHINE_ARCH}-undermydesk-freebsd";' >>${.TARGET} + @echo 'const char target_name[] = "${TARGET_ARCH}-undermydesk-freebsd";' >>${.TARGET} + +xregex.h: + @echo '#include ' >${.TARGET} .include ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.alpha#4 (text+ko) ==== @@ -1,16 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.5 2002/05/18 04:59:56 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.6 2002/06/29 01:16:00 obrien Exp $ -.PATH: ${.CURDIR}/alpha - -.if ${TARGET_ARCH} == ${MACHINE_ARCH} -XSRCS+= freebsd-nat.c -.else -XSRCS+= freebsd-nat-stubs.c -.endif -XSRCS+= alpha-tdep.c kvm-fbsd.c -LDADD+= -lkvm - -findvar%UAfix.c: findvar.c - sed -e \ - 's,char registers[REGISTER_BYTES + /* SLOP */ 256];,char registers[REGISTER_BYTES + /* SLOP */ 256] __attribute__ ((aligned (8)));,g' \ - ${.ALLSRC} >${.TARGET} +XSRCS+= alphabsd-nat.c alphafbsd-tdep.c alpha-tdep.c +CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf64_alpha_vec ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.i386#4 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.4 2002/05/18 04:59:56 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.5 2002/06/29 01:16:00 obrien Exp $ -.PATH: ${.CURDIR}/i386 +XSRCS+= i386fbsd-nat.c i386bsd-tdep.c i386bsd-nat.c i386-nat.c i386-tdep.c \ + i387-nat.c i387-tdep.c \ + core-aout.c -XSRCS+= freebsd-nat.c i386-tdep.c i387-tdep.c kvm-fbsd.c - CFLAGS+= -Dprint_insn_i386=print_insn_i386_att - -findvar%UAfix.c: findvar.c - ln -sf ${.ALLSRC} ${.TARGET} +CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf32_i386_vec +CFLAGS+= -DGDB_XM_FILE ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/config.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/config.h,v 1.6 2002/06/28 01:33:53 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/config.h,v 1.7 2002/06/29 01:16:00 obrien Exp $ */ /* config.h. Generated automatically by configure. */ /* config.in. Generated automatically from configure.in by autoheader. */ @@ -170,22 +170,22 @@ #define USE_INCLUDED_REGEX 1 /* BFD's default architecture. */ -#define DEFAULT_BFD_ARCH bfd_i386_arch +/* #define DEFAULT_BFD_ARCH bfd_alpha_arch */ /* BFD's default target vector. */ -#define DEFAULT_BFD_VEC bfd_elf32_i386_vec +/* #define DEFAULT_BFD_VEC bfd_elf64_alpha_vec */ /* Multi-arch enabled. */ /* #undef GDB_MULTI_ARCH */ /* hostfile */ -#define GDB_XM_FILE config/i386/xm-i386.h +/* #define GDB_XM_FILE 1 */ /* targetfile */ -#define GDB_TM_FILE config/i386/tm-fbsd.h +#define GDB_TM_FILE 1 /* nativefile */ -#define GDB_NM_FILE config/i386/nm-fbsd.h +#define GDB_NM_FILE 1 /* Define if you have the __argz_count function. */ /* #undef HAVE___ARGZ_COUNT */ @@ -503,4 +503,3 @@ /* Define if has pr_siginfo64_t. */ /* #undef HAVE_PR_SIGINFO64_T */ - ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.7 2002/02/23 19:28:01 deischen Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.8 2002/06/29 01:16:00 obrien Exp $ */ /* Low level interface for debugging FreeBSD user threads for GDB, the GNU debugger. Copyright 1996, 1999 Free Software Foundation, Inc. @@ -51,8 +51,6 @@ extern void _initialize_freebsd_uthread PARAMS ((void)); -static int main_pid = -1; /* Real process ID */ - /* Set to true while we are part-way through attaching */ static int freebsd_uthread_attaching; @@ -60,60 +58,17 @@ static CORE_ADDR P_thread_list; static CORE_ADDR P_thread_run; -static struct cleanup * save_inferior_pid PARAMS ((void)); +/* Pointer to the next function on the objfile event chain. */ +static void (*target_new_objfile_chain) (struct objfile *objfile); -static void restore_inferior_pid PARAMS ((int pid)); - -static void freebsd_uthread_resume PARAMS ((int pid, int step, +static void freebsd_uthread_resume PARAMS ((ptid_t pid, int step, enum target_signal signo)); static void init_freebsd_uthread_ops PARAMS ((void)); static struct target_ops freebsd_uthread_ops; -static struct target_thread_vector freebsd_uthread_vec; -/* - -LOCAL FUNCTION - - save_inferior_pid - Save inferior_pid on the cleanup list - restore_inferior_pid - Restore inferior_pid from the cleanup list - -SYNOPSIS - - struct cleanup *save_inferior_pid () - void restore_inferior_pid (int pid) - -DESCRIPTION - - These two functions act in unison to restore inferior_pid in - case of an error. - -NOTES - - inferior_pid is a global variable that needs to be changed by many of - these routines before calling functions in procfs.c. In order to - guarantee that inferior_pid gets restored (in case of errors), you - need to call save_inferior_pid before changing it. At the end of the - function, you should invoke do_cleanups to restore it. - - */ - -static struct cleanup * -save_inferior_pid () -{ - return make_cleanup ((make_cleanup_func) restore_inferior_pid, - (void *)(intptr_t) inferior_pid); -} - -static void -restore_inferior_pid (pid) - int pid; -{ - inferior_pid = pid; -} - -static int find_active_thread PARAMS ((void)); +static ptid_t find_active_ptid PARAMS ((void)); struct cached_pthread { u_int64_t uniqueid; @@ -125,13 +80,10 @@ } ctx; }; -static int cached_thread; +static ptid_t cached_ptid; static struct cached_pthread cached_pthread; static CORE_ADDR cached_pthread_addr; -#define THREADID_TID(id) ((id) >> 17) -#define THREADID_PID(id) ((id) & ((1 << 17) - 1)) - LIST_HEAD(idmaplist, idmap); struct idmap { @@ -171,8 +123,7 @@ #define IS_TID_FREE(tid) (tid_to_hash[tid] == -1) static int -get_new_tid(h) - int h; +get_new_tid(int h) { int tid = next_free_tid; @@ -199,30 +150,28 @@ return tid; } -static int -find_pid(uniqueid) - u_int64_t uniqueid; +static ptid_t +find_ptid(u_int64_t uniqueid) { int h = UNIQUEID_HASH(uniqueid); struct idmap *im; LIST_FOREACH(im, &map_hash[h], link) if (im->uniqueid == uniqueid) - return (im->tid << 17) + main_pid; + return MERGEPID(PIDGET(inferior_ptid), im->tid); im = xmalloc(sizeof(struct idmap)); im->uniqueid = uniqueid; im->tid = get_new_tid(h); LIST_INSERT_HEAD(&map_hash[h], im, link); - return (im->tid << 17) + main_pid; + return MERGEPID(PIDGET(inferior_ptid), im->tid); } static void -free_pid(pid) - int pid; +free_ptid(ptid_t ptid) { - int tid = THREADID_TID(pid); + int tid = TIDGET(ptid); int h = tid_to_hash[tid]; struct idmap *im; @@ -248,7 +197,7 @@ sizeof(name##_value)) static void -read_thread_offsets () +read_thread_offsets (void) { READ_OFFSET(next); READ_OFFSET(uniqueid); @@ -264,8 +213,7 @@ read_memory ((ptr) + field##_offset, (char *) &(result), sizeof result) static u_int64_t -read_pthread_uniqueid (ptr) - CORE_ADDR ptr; +read_pthread_uniqueid (CORE_ADDR ptr) { u_int64_t uniqueid; READ_FIELD(ptr, u_int64_t, uniqueid, uniqueid); @@ -273,8 +221,7 @@ } static CORE_ADDR -read_pthread_next (ptr) - CORE_ADDR ptr; +read_pthread_next (CORE_ADDR ptr) { CORE_ADDR next; READ_FIELD(ptr, CORE_ADDR, next, next); @@ -282,9 +229,7 @@ } static void -read_cached_pthread (ptr, cache) - CORE_ADDR ptr; - struct cached_pthread *cache; +read_cached_pthread (CORE_ADDR ptr, struct cached_pthread *cache) { READ_FIELD(ptr, u_int64_t, uniqueid, cache->uniqueid); READ_FIELD(ptr, int, state, cache->state); @@ -292,31 +237,27 @@ READ_FIELD(ptr, ucontext_t, ctx, cache->ctx); } -static int -find_active_thread () +static ptid_t +find_active_ptid (void) { CORE_ADDR ptr; - if (main_pid == -1) - return -1; - read_memory ((CORE_ADDR)P_thread_run, (char *)&ptr, sizeof ptr); - return find_pid(read_pthread_uniqueid(ptr)); + return find_ptid(read_pthread_uniqueid(ptr)); } -static CORE_ADDR find_pthread_addr PARAMS ((int thread)); -static struct cached_pthread * find_pthread PARAMS ((int thread)); +static CORE_ADDR find_pthread_addr PARAMS ((ptid_t ptid)); +static struct cached_pthread * find_pthread PARAMS ((ptid_t ptid)); static CORE_ADDR -find_pthread_addr (thread) - int thread; +find_pthread_addr (ptid_t ptid) { CORE_ADDR ptr; - if (thread == cached_thread) + if (ptid_equal(ptid, cached_ptid)) return cached_pthread_addr; read_memory ((CORE_ADDR)P_thread_list, @@ -325,9 +266,9 @@ while (ptr != 0) { - if (find_pid(read_pthread_uniqueid(ptr)) == thread) + if (ptid_equal(find_ptid(read_pthread_uniqueid(ptr)), ptid)) { - cached_thread = thread; + cached_ptid = ptid; cached_pthread_addr = ptr; read_cached_pthread(ptr, &cached_pthread); return ptr; @@ -339,12 +280,11 @@ } static struct cached_pthread * -find_pthread (thread) - int thread; +find_pthread (ptid_t ptid) { CORE_ADDR ptr; - if (thread == cached_thread) + if (ptid_equal(ptid, cached_ptid)) return &cached_pthread; read_memory ((CORE_ADDR)P_thread_list, @@ -353,9 +293,9 @@ while (ptr != 0) { - if (find_pid(read_pthread_uniqueid(ptr)) == thread) + if (ptid_equal(find_ptid(read_pthread_uniqueid(ptr)), ptid)) { - cached_thread = thread; + cached_ptid = ptid; cached_pthread_addr = ptr; read_cached_pthread(ptr, &cached_pthread); return &cached_pthread; @@ -364,8 +304,7 @@ } #if 0 - error ("Can't find pthread %d,%d", - THREADID_TID(thread), THREADID_PID(thread)); + error ("Can't find pthread %d,%d", PIDGET(ptid), TIDGET(ptid)); #endif return NULL; } @@ -376,9 +315,7 @@ /* ARGSUSED */ static void -freebsd_uthread_open (arg, from_tty) - char *arg; - int from_tty; +freebsd_uthread_open (char *arg, int from_tty) { child_ops.to_open (arg, from_tty); } @@ -387,9 +324,7 @@ and wait for the trace-trap that results from attaching. */ static void -freebsd_uthread_attach (args, from_tty) - char *args; - int from_tty; +freebsd_uthread_attach (char *args, int from_tty) { child_ops.to_attach (args, from_tty); push_target (&freebsd_uthread_ops); @@ -399,20 +334,13 @@ /* After an attach, see if the target is threaded */ static void -freebsd_uthread_post_attach (pid) - int pid; +freebsd_uthread_post_attach (int pid) { if (freebsd_uthread_active) { read_thread_offsets (); - - main_pid = pid; - - bind_target_thread_vector (&freebsd_uthread_vec); - - inferior_pid = find_active_thread (); - - add_thread (inferior_pid); + inferior_ptid = find_active_ptid (); + add_thread (inferior_ptid); } else { @@ -432,9 +360,7 @@ started via the normal ptrace (PTRACE_TRACEME). */ static void -freebsd_uthread_detach (args, from_tty) - char *args; - int from_tty; +freebsd_uthread_detach (char *args, int from_tty) { child_ops.to_detach (args, from_tty); } @@ -445,70 +371,46 @@ for procfs. */ static void -freebsd_uthread_resume (pid, step, signo) - int pid; - int step; - enum target_signal signo; +freebsd_uthread_resume (ptid_t ptid, int step, enum target_signal signo) { - struct cleanup *old_chain; - if (freebsd_uthread_attaching) { - child_ops.to_resume (pid, step, signo); + child_ops.to_resume (ptid, step, signo); return; } - old_chain = save_inferior_pid (); - - pid = inferior_pid = main_pid; - - child_ops.to_resume (pid, step, signo); - - cached_thread = 0; - - do_cleanups (old_chain); + child_ops.to_resume (ptid, step, signo); + cached_ptid = MERGEPID(0, 0); } /* Wait for any threads to stop. We may have to convert PID from a thread id to a LWP id, and vice versa on the way out. */ -static int -freebsd_uthread_wait (pid, ourstatus) - int pid; - struct target_waitstatus *ourstatus; +static ptid_t +freebsd_uthread_wait (ptid_t ptid, struct target_waitstatus *ourstatus) { - int rtnval; - struct cleanup *old_chain; + ptid_t rtnval; if (freebsd_uthread_attaching) { - return child_ops.to_wait (pid, ourstatus); + return child_ops.to_wait (ptid, ourstatus); } - old_chain = save_inferior_pid (); + rtnval = child_ops.to_wait (ptid, ourstatus); - inferior_pid = main_pid; - - if (pid != -1) - pid = main_pid; - - rtnval = child_ops.to_wait (pid, ourstatus); - - if (rtnval >= 0) + if (PIDGET(rtnval) >= 0) { - rtnval = find_active_thread (); + rtnval = find_active_ptid (); if (!in_thread_list (rtnval)) add_thread (rtnval); } - do_cleanups (old_chain); - return rtnval; } #ifdef __i386__ -static char sigmap[NUM_REGS] = /* map reg to sigcontext */ +static char sigmap[MAX_NUM_REGS] = /* map reg to sigcontext */ { 12, /* eax */ 11, /* ecx */ @@ -526,9 +428,13 @@ 3, /* es */ 2, /* fs */ 1, /* gs */ + -1, -1, -1, -1, -1, -1, -1, /* st0-st7 */ + -1, -1, -1, -1, -1, -1, -1, /* fctrl-fop */ + -1, -1, -1, -1, -1, -1, -1, /* xmm0-xmm7 */ + -1, /* mxcsr */ }; -static char jmpmap[NUM_REGS] = /* map reg to jmp_buf */ +static char jmpmap[MAX_NUM_REGS] = /* map reg to jmp_buf */ { 6, /* eax */ -1, /* ecx */ @@ -546,6 +452,10 @@ -1, /* es */ -1, /* fs */ -1, /* gs */ + -1, -1, -1, -1, -1, -1, -1, /* st0-st7 */ + -1, -1, -1, -1, -1, -1, -1, /* fctrl-fop */ + -1, -1, -1, -1, -1, -1, -1, /* xmm0-xmm7 */ + -1, /* mxcsr */ }; #endif @@ -579,36 +489,26 @@ #endif static void -freebsd_uthread_fetch_registers (regno) - int regno; +freebsd_uthread_fetch_registers (int regno) { struct cached_pthread *thread; - struct cleanup *old_chain; int active; int first_regno, last_regno; register_t *regbase; char *regmap; - if (freebsd_uthread_attaching) + if (freebsd_uthread_attaching || TIDGET(inferior_ptid) == 0) { child_ops.to_fetch_registers (regno); return; } - thread = find_pthread (inferior_pid); - - old_chain = save_inferior_pid (); - - active = (inferior_pid == find_active_thread()); + thread = find_pthread (inferior_ptid); + active = (ptid_equal(inferior_ptid, find_active_ptid())); - inferior_pid = main_pid; - if (active) { child_ops.to_fetch_registers (regno); - - do_cleanups (old_chain); - return; } @@ -631,19 +531,18 @@ if (regmap[regno] == -1) child_ops.to_fetch_registers (regno); else - supply_register (regno, (char*) ®base[regmap[regno]]); + if (thread) + supply_register (regno, (char*) ®base[regmap[regno]]); + else + supply_register (regno, NULL); } - - do_cleanups (old_chain); } static void -freebsd_uthread_store_registers (regno) - int regno; +freebsd_uthread_store_registers (int regno) { struct cached_pthread *thread; CORE_ADDR ptr; - struct cleanup *old_chain; int first_regno, last_regno; u_int32_t *regbase; char *regmap; @@ -654,18 +553,11 @@ return; } - thread = find_pthread (inferior_pid); - - old_chain = save_inferior_pid (); + thread = find_pthread (inferior_ptid); - inferior_pid = main_pid; - if (thread->state == PS_RUNNING_value) { child_ops.to_store_registers (regno); - - do_cleanups (old_chain); - return; } @@ -683,7 +575,7 @@ regbase = (u_int32_t*) &thread->ctx.jb[0]; regmap = jmpmap; - ptr = find_pthread_addr (inferior_pid); + ptr = find_pthread_addr (inferior_ptid); for (regno = first_regno; regno <= last_regno; regno++) { if (regmap[regno] == -1) @@ -704,8 +596,6 @@ REGISTER_RAW_SIZE (regno)); } } - - do_cleanups (old_chain); } /* Get ready to modify the registers array. On machines which store @@ -715,102 +605,53 @@ debugged. */ static void -freebsd_uthread_prepare_to_store () +freebsd_uthread_prepare_to_store (void) { - struct cleanup *old_chain; - - if (freebsd_uthread_attaching) - { - child_ops.to_prepare_to_store (); - return; - } - - old_chain = save_inferior_pid (); - inferior_pid = main_pid; - child_ops.to_prepare_to_store (); - - do_cleanups (old_chain); } static int -freebsd_uthread_xfer_memory (memaddr, myaddr, len, dowrite, target) - CORE_ADDR memaddr; - char *myaddr; - int len; - int dowrite; - struct target_ops *target; /* ignored */ +freebsd_uthread_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, + int dowrite, struct mem_attrib *attrib, + struct target_ops *target) { - int retval; - struct cleanup *old_chain; - - if (freebsd_uthread_attaching) - { - return child_ops.to_xfer_memory (memaddr, myaddr, len, dowrite, target); - } - - old_chain = save_inferior_pid (); - - inferior_pid = main_pid; - - retval = child_ops.to_xfer_memory (memaddr, myaddr, len, dowrite, target); - - do_cleanups (old_chain); - - return retval; + return child_ops.to_xfer_memory (memaddr, myaddr, len, dowrite, + attrib, target); } /* Print status information about what we're accessing. */ static void -freebsd_uthread_files_info (ignore) - struct target_ops *ignore; +freebsd_uthread_files_info (struct target_ops *ignore) { child_ops.to_files_info (ignore); } static void -freebsd_uthread_kill_inferior () +freebsd_uthread_kill_inferior (void) { - inferior_pid = main_pid; child_ops.to_kill (); } static void -freebsd_uthread_notice_signals (pid) - int pid; +freebsd_uthread_notice_signals (ptid_t ptid) { - struct cleanup *old_chain; - old_chain = save_inferior_pid (); - inferior_pid = main_pid; - - child_ops.to_notice_signals (pid); - - do_cleanups (old_chain); + child_ops.to_notice_signals (ptid); } /* Fork an inferior process, and start debugging it with /proc. */ static void -freebsd_uthread_create_inferior (exec_file, allargs, env) - char *exec_file; - char *allargs; - char **env; +freebsd_uthread_create_inferior (char *exec_file, char *allargs, char **env) { child_ops.to_create_inferior (exec_file, allargs, env); - if (inferior_pid && freebsd_uthread_active) + if (PIDGET(inferior_ptid) && freebsd_uthread_active) { read_thread_offsets (); - - main_pid = inferior_pid; - push_target (&freebsd_uthread_ops); - bind_target_thread_vector (&freebsd_uthread_vec); - - inferior_pid = find_active_thread (); - - add_thread (inferior_pid); + inferior_ptid = find_active_ptid (); + add_thread (inferior_ptid); } } @@ -818,8 +659,7 @@ We check for the _thread_run and _thread_list globals. */ void -freebsd_uthread_new_objfile (objfile) - struct objfile *objfile; +freebsd_uthread_new_objfile (struct objfile *objfile) { struct minimal_symbol *ms; @@ -873,24 +713,11 @@ freebsd_uthread_active = 1; } -int -freebsd_uthread_has_exited (pid, wait_status, exit_status) - int pid; - int wait_status; - int * exit_status; -{ - int t = child_ops.to_has_exited (pid, wait_status, exit_status); - if (t) - main_pid = -1; - return t; -} - /* Clean up after the inferior dies. */ static void freebsd_uthread_mourn_inferior () { - inferior_pid = main_pid; /* don't bother to restore inferior_pid */ child_ops.to_mourn_inferior (); unpush_target (&freebsd_uthread_ops); } @@ -904,10 +731,8 @@ } static int -freebsd_uthread_thread_alive (pid) - int pid; +freebsd_uthread_thread_alive (ptid_t ptid) { - struct cleanup *old_chain; struct cached_pthread *thread; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 20:58:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F69437B401; Fri, 28 Jun 2002 20:57:16 -0700 (PDT) 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 D096637B400 for ; Fri, 28 Jun 2002 20:57:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C319D43E06 for ; Fri, 28 Jun 2002 20:57:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T3vCJU030715 for ; Fri, 28 Jun 2002 20:57:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T3sfdR027388 for perforce@freebsd.org; Fri, 28 Jun 2002 20:54:41 -0700 (PDT) Date: Fri, 28 Jun 2002 20:54:41 -0700 (PDT) Message-Id: <200206290354.g5T3sfdR027388@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13565 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13565 Change 13565 by rwatson@rwatson_curry on 2002/06/28 20:54:03 Integ trustedbsd_base to the head of the FreeBSD 5.0-CURRENT tree. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#5 integrate .. //depot/projects/trustedbsd/base/Makefile#9 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#17 integrate .. //depot/projects/trustedbsd/base/bin/ed/buf.c#3 integrate .. //depot/projects/trustedbsd/base/bin/ed/ed.1#3 integrate .. //depot/projects/trustedbsd/base/bin/ed/ed.h#3 integrate .. //depot/projects/trustedbsd/base/bin/ed/main.c#3 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.1#3 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.c#6 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.c#9 integrate .. //depot/projects/trustedbsd/base/bin/rcp/extern.h#3 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/miscbltin.c#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/mktokens#2 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/awk/ACKNOWLEDGMENT#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/AUTHORS#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/COPYING#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/FREEBSD-upgrade#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/FUTURES#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/INSTALL#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/LIMITATIONS#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/NEWS#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/PORTS#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/POSIX.STD#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/PROBLEMS#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/README#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/README_d/README.FIRST#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/README_d/README.tests#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/acconfig.h#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/aclocal.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/alloca.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/array.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awk.h#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awk.y#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awkgram.y#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/data/BBS-list#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/data/inventory-shipped#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/assert.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/bits2str.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/cliff_rand.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/ctime.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/ftrans.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/getopt.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/gettime.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/grcat.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/groupawk.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/join.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/libintl.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/mktime.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/nextfile.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/noassign.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/ord.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/passwdawk.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/pwcat.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/readable.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/rewind.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/lib/round.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/misc/arraymax.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/misc/arraymax.data#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/misc/findpat.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/misc/findpat.data#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/misc/findpat.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/PostAgent.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/coreserv.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/eliza.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/fingerclient.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/geturl.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/hello-serv.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/maze.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/mobag.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/panic.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/protbase.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/protbase.request#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/protbase.result#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/remconf.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/statist.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/stoxdata.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/stoxpred.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/testserv.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/urlchk.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/network/webgrab.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/alarm.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/awksed.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/cut.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/dupword.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/egrep.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/extract.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/guide.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/histsort.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/id.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/igawk.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/labels.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/split.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/tee.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/testbits.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/translate.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/uniq.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/wc.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/eg/prog/wordfreq.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/extract.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awklib/stamp-eg#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/awktab.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/builtin.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/configh.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/configure#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/configure.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/custom.h#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/dfa.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/dfa.h#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/README.card#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/ad.block#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/awk.1#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/awkcard.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/awkforai.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/cardfonts#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/colors#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/gawk.1#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/gawk.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/gawkinet.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/igawk.1#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/macros#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/no.colors#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/setter.outline#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/doc/texinfo.tex#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/eval.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/eval_p.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/ext.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/extension/dl.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/extension/doit#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/extension/filefuncs.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/extension/foo.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/extension/fork.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/extension/steps#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/extension/testff.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/extension/testfork.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/field.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/fixvers#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/gawkmisc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/getopt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/getopt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/getopt1.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/install-sh#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/io.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/main.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/msg.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/node.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/patchlev.h#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/patchlevel.h#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/po/POTFILES.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/po/cat-id-tbl.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/po/gawk.pot#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/po/he.gmo#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/po/stamp-cat-id#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/posix/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/posix/gawkmisc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/profile.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/profile_p.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/protos.h#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/re.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/regex.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/replace.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/stamp-h.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/addcomma.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/addcomma.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/addcomma.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/arynasty.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/arynasty.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/arynocls.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/arynocls.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/arynocls.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/arysubnm.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/arysubnm.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/clos1way.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/clos1way.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/datanonl.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/datanonl.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/datanonl.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/fnamedat.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/fnamedat.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/fnamedat.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/fnaryscl.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/fnaryscl.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/fnasgnm.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/fnasgnm.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/fnasgnm.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/fnparydl.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/fnparydl.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/fsfwfs.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/fsfwfs.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/fsfwfs.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/funsemnl.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/funsemnl.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/funsmnam.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/funsmnam.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/getlnbuf.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/getlnbuf.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/getlnbuf.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/getnr2tb.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/getnr2tb.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/getnr2tb.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/getnr2tm.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/getnr2tm.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/getnr2tm.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/gnuops2.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/gnuops2.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/gtlnbufv.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/hsprint.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/hsprint.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/igncdym.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/igncdym.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/igncdym.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/leaddig.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/leaddig.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/leadnl.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/leadnl.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/leadnl.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/lint.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/lint.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/nasty.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/nasty.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/nasty2.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/nasty2.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/nlinstr.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/nlinstr.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/nlinstr.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/nlstrina.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/nlstrina.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/numindex.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/numindex.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/numindex.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/octsub.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/octsub.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/ofmt.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/ofmt.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/ofmt.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/ofmtbig.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/ofmtbig.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/ofmtbig.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/ofmts.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/ofmts.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/ofmts.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/opasnidx.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/opasnidx.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/opasnslf.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/opasnslf.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/paramtyp.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/paramtyp.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/parseme.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/parseme.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/poundbang.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/printf1.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/printf1.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/printfloat.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/procinfs.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/procinfs.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/psx96sub.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/psx96sub.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/rebt8b1.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/rebt8b1.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/rebt8b2.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/rebt8b2.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/redfilnm.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/redfilnm.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/redfilnm.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/reg/Obsolete/exp.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/reg/Obsolete/exp.good#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/reg/Obsolete/exp.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/reg/Obsolete/log.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/reg/Obsolete/log.good#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/reg/Obsolete/log.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/regeq.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/regeq.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/regeq.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/regtest.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/regx8bit.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/regx8bit.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/rsnul1nl.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/rsnul1nl.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/rsnul1nl.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/shadow.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/shadow.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/sort1.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/sort1.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/splitdef.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/splitdef.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/strftime.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/strtod.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/strtod.in#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/strtod.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/subslash.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/subslash.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/zeroflag.awk#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/test/zeroflag.ok#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/version.c#2 delete .. //depot/projects/trustedbsd/base/contrib/awk/version.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/BUGS#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/COPYING#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/COPYING.LIB#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ChangeLog#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/FREEBSD-Xlist#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/FSFChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/INSTALL#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/LANGUAGES#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/NEWS#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ONEWS#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/PROBLEMS#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/PROJECTS#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/README#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/README-bugs#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/README-fixinc#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/README.DWARF#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/README.TRAD#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/README.g77#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/SERVICE#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/TESTS.FLUNK#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/acconfig.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/aclocal.m4#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/alias.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ansidecl.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/assert.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/basic-block.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/bitmap.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/bitmap.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/build-make#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-aux-info.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-common.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-convert.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-decl.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-iterate.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-lang.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-lex.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-lex.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-parse.gperf#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-parse.in#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-pragma.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-pragma.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-tree.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/c-typeck.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/caller-save.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/calls.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cccp.1#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cccp.c#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cexp.y#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/choose-temp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/collect2.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/collect2.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/combine.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/conditions.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config.guess#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config.sub#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/README#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/alpha-interix.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/alpha.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/alpha.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/alpha.md#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/alpha32.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/config-nt.sed#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/crtbegin.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/crtend.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/elf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/freebsd.h#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/lib1funcs.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/linux-ecoff.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/linux-elf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/linux.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/netbsd-elf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/netbsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/openbsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/osf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/osf12.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/osf2or3.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/t-crtbe#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/t-ieee#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/t-interix#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/t-vms#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/va_list.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/vms-tramp.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/vms.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/vxworks.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/win-nt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/x-alpha#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/xm-alpha-interix.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/xm-alpha.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/xm-freebsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/xm-openbsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/xm-vms.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/alpha/xm-winnt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/aoutos.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/dbx.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/dbxcoff.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/dbxelf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/elfos.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/float-i128.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/float-i32.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/float-i386.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/float-i64.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/float-m68k.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/float-sh.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/float-vax.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/fp-bit.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/freebsd.h#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/gnu.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/gofast.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/386bsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/aix386.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/aix386ng.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/att.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/bsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/bsd386.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/config-nt.sed#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/crtdll.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/cygwin.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/cygwin.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/dgux.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/dgux.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/djgpp-rtems.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/djgpp.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/freebsd-aout.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/freebsd.h#6 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/freebsd.h.fixed#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/gas.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/gmon-sol2.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/gnu.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/gstabs.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/i386-aout.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/i386-coff.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/i386-interix.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/i386.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/i386.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/i386.md#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/interix.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/isc.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/isccoff.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/iscdbx.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/linux-aout.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/linux-oldld.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/linux.h#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/lynx-ng.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/lynx.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/mach.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/mingw32.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/moss.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/netbsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/next.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/openbsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/os2.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/osf1-ci.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/osf1-cn.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/osf1elf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/osf1elfgdb.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/osfelf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/osfrose.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/perform.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/ptx4-i.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/rtems.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/rtemself.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sco.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sco4.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sco4dbx.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sco5.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sco5gas.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/scodbx.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/seq-gas.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/seq-sysv3.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/seq2-sysv3.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sequent.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sol2-c1.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sol2-ci.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sol2-cn.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sol2-gc1.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sol2.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sol2gas.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sun.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sun386.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/svr3.ifile#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/svr3dbx.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/svr3gas.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/svr3z.ifile#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sysv3.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sysv4.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/sysv5.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-crtpic#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-crtstuff#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-cygwin#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-dgux#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-djgpp#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-i386bare#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-interix#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-mingw32#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-next#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-osf#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-osf1elf#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-sco5#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-sco5gas#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-sol2#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-svr3dbx#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-udk#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-uwin#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-vsta#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/t-winnt#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/udk.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/unix.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/uwin.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/uwin.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/v3gas.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/vsta.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/vxi386.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/win-nt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/win32.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/winnt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-aix#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-cygwin#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-dgux#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-djgpp#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-isc#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-isc3#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-ncr3000#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-next#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-osf1elf#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-osfrose#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-sco#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-sco4#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-sco5#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-sysv3#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/x-vsta#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-aix.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-bsd386.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-cygwin.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-dgux.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-djgpp.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-dos.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-freebsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-gnu.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-i386-interix.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-i386.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-isc.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-linux.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-lynx.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-mingw32.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-next.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-openbsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-os2.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-osf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-osf1elf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-sco.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-sco5.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-sun.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-sysv3.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-sysv4.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-uwin.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-vsta.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/i386/xm-winnt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/interix.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/libgloss.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/linux-aout.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/linux.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/lynx-ng.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/lynx.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/netbsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/nextstep.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/nextstep.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/nextstep21.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/openbsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/psos.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/ptx4.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/aout.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/bsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/elf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/gmon-sol2.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/hal.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/lb1spc.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/lb1spl.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/linux-aout.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/linux.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/linux64.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/lite.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/litecoff.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/lynx-ng.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/lynx.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/netbsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/openbsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/pbd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/rtems.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sol2-c1.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sol2-ci.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sol2-cn.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sol2-g1.asm#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sol2-sld-64.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sol2-sld.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sol2.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sp64-aout.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sp64-elf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sparc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sparc.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sparc.md#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/splet.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sun4gas.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sun4o3.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sunos4.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/sysv4.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/t-elf#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/t-halos#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/t-linux64#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/t-sol2#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/t-sol2-64#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/t-sp64#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/t-sparcbare#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/t-sparclite#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/t-splet#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/t-sunos40#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/t-sunos41#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/t-vxsparc#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/vxsim.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/vxsparc.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/x-sysv4#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/xm-linux.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/xm-lynx.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/xm-openbsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/xm-pbd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/xm-sol2.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/xm-sp64.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/xm-sparc.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/xm-sysv4-64.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/sparc/xm-sysv4.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/svr3.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/svr4.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/t-freebsd#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/t-gnu#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/t-install-cpp#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/t-libc-ok#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/t-linux#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/t-linux-aout#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/t-linux-gnulibc1#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/t-netbsd#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/t-openbsd#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/t-openbsd-thread#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/t-rtems#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/t-svr4#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/tm-dwarf2.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/x-interix#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/x-linux#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/x-linux-aout#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/x-lynx#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/x-svr4#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/xm-alloca.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/xm-freebsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/xm-gnu.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/xm-interix.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/xm-linux.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/xm-lynx.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/xm-openbsd.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/xm-siglist.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/xm-std32.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/xm-svr3.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/config/xm-svr4.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/configure#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/configure.frag#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/configure.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/configure.lang#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/convert.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/convert.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/Make-lang.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/NEWS#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/call.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/class.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/config-lang.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/cp-tree.def#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/cp-tree.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/cvt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/decl.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/decl.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/decl2.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/errfn.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/error.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/except.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/exception.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/expr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/friend.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/g++.1#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/g++spec.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/gxx.gperf#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/gxxint.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/inc/exception#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/inc/new#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/inc/new.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/inc/typeinfo#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/init.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/input.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/lang-options.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/lang-specs.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/lex.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/lex.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/method.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/mpw-config.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/mpw-make.sed#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/new.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/new1.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/new2.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/parse.y#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/pt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/ptree.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/repo.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/rtti.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/search.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/semantics.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/sig.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/spew.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/tinfo.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/tinfo.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/tinfo2.cc#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/tree.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/typeck.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/typeck2.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cp/xref.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cplus-dem.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cpp.1#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cpp.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cpp.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cppalloc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cpperror.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cppexp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cppfiles.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cpphash.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cpphash.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cppinit.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cpplib.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cpplib.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cppmain.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cppspec.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cppulp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cross-make#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/crtstuff.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cse.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/cstamp-h.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/dbxout.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/dbxout.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/dbxstclass.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/defaults.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/demangle.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/doprint.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/doschk.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/dostage2#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/dostage3#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/dwarf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/dwarf2.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/dwarf2out.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/dwarf2out.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/dwarfout.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/dwarfout.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/dyn-string.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/dyn-string.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/eh-common.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/emit-rtl.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/enquire.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/except.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/except.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/exgettext#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/explow.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/expmed.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/expr.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/expr.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/extend.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/BUGS#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/INSTALL#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/Make-lang.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/NEWS#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/README#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/RELEASE-PREP#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/ansify.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/assert.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/bad.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/bad.def#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/bad.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/bit.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/bit.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/bld-op.def#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/bld.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/bld.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/bugs.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/bugs0.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/com-rt.def#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/com.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/com.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/config-lang.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/config.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/convert.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/data.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/data.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/equiv.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/equiv.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/expr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/expr.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/ffe.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/fini.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/flags.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/g77.1#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/g77.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/g77install.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/g77spec.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/glimits.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/global.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/global.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/hconfig.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/implic.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/implic.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/info-b.def#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/info-k.def#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/info-w.def#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/info.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/info.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/input.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/intdoc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/intdoc.in#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/intdoc.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/intrin.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/intrin.def#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/intrin.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/lab.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/lab.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/lang-options.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/lang-specs.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/lex.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/lex.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/malloc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/malloc.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/name.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/name.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/news.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/news0.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/output.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/parse.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/proj.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/proj.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/root.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/rtl.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/src.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/src.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/st.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/st.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/sta.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/sta.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stb.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stb.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stc.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stc.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/std.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/std.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/ste.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/ste.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/storag.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/storag.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stp.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/str-1t.fin#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/str-2t.fin#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/str-fo.fin#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/str-io.fin#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/str-nq.fin#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/str-op.fin#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/str-ot.fin#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/str.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/str.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/sts.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/sts.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stu.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stu.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stv.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stv.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stw.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/stw.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/symbol.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/symbol.def#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/symbol.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/system.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/target.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/target.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/tconfig.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/tm.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/top.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/top.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/toplev.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/tree.j#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/type.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/type.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/version.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/version.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/where.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/f/where.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/final.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/fix-header.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/fixcpp#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/fixinc-nt.sed#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/fixincludes#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/fixproto#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/flags.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/floatlib.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/flow.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/fold-const.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/fp-test.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/frame.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/frame.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/function.c#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/function.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/future.options#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gansidecl.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gbl-ctors.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gcc.1#3 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gcc.c#4 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gcc.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gccspec.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gcov-io.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gcov.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gcov.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gcse.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gen-protos.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/genattr.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/genattrtab.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gencheck.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gencodes.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/genconfig.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/genemit.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/genextract.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/genflags.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gengenrtl.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/genmultilib#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/genopinit.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/genoutput.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/genpeep.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/genrecog.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/getopt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/getopt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/getopt1.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/getpwd.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/iso646.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/math-3300.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/math-68881.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/ppc-asm.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/proto.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/stdarg.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/stdbool.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/stddef.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-alpha.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-arc.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-c4x.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-clipper.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-h8300.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-i860.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-i960.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-m32r.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-m88k.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-mips.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-mn10200.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-mn10300.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-pa.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-ppc.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-pyr.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-sh.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-sparc.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-spur.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/va-v850.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/ginclude/varargs.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/glimits.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/global.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gmon.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/graph.c#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gstab.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gsyms.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gsyslimits.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gthr-dce.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gthr-posix.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gthr-single.h#2 delete .. //depot/projects/trustedbsd/base/contrib/gcc.295/gthr-solaris.h#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 21:48:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97FB937B401; Fri, 28 Jun 2002 21:47:03 -0700 (PDT) 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 27C6137B400 for ; Fri, 28 Jun 2002 21:47:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9788D43E09 for ; Fri, 28 Jun 2002 21:47:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T4l1JU056728 for ; Fri, 28 Jun 2002 21:47:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T4jHww055246 for perforce@freebsd.org; Fri, 28 Jun 2002 21:45:17 -0700 (PDT) Date: Fri, 28 Jun 2002 21:45:17 -0700 (PDT) Message-Id: <200206290445.g5T4jHww055246@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13567 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13567 Change 13567 by rwatson@rwatson_tislabs on 2002/06/28 21:44:36 Integ trustedbsd_mac the rest of the way forwards to the head of -CURRENT, picking up all kinds of stuff including new compilers, debuggers, IP stack locking, etc. This might take a little bit to work itself out. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#5 integrate .. //depot/projects/trustedbsd/mac/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#15 integrate .. //depot/projects/trustedbsd/mac/bin/ed/buf.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/ed/ed.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/ed/ed.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/ed/main.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/extern.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/rcp.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/miscbltin.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mktokens#2 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/awk/ACKNOWLEDGMENT#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/AUTHORS#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/COPYING#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/FREEBSD-upgrade#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/FUTURES#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/INSTALL#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/LIMITATIONS#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/NEWS#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/PORTS#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/POSIX.STD#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/PROBLEMS#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/README#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/README_d/README.FIRST#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/README_d/README.tests#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/acconfig.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/aclocal.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/alloca.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/array.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awk.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awk.y#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awkgram.y#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/data/BBS-list#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/data/inventory-shipped#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/assert.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/bits2str.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/cliff_rand.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/ctime.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/ftrans.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/getopt.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/gettime.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/grcat.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/groupawk.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/join.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/libintl.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/mktime.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/nextfile.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/noassign.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/ord.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/passwdawk.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/pwcat.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/readable.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/rewind.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/lib/round.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/misc/arraymax.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/misc/arraymax.data#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/misc/findpat.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/misc/findpat.data#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/misc/findpat.sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/PostAgent.sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/coreserv.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/eliza.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/fingerclient.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/geturl.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/hello-serv.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/maze.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/mobag.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/panic.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/protbase.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/protbase.request#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/protbase.result#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/remconf.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/statist.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/stoxdata.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/stoxpred.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/testserv.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/urlchk.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/network/webgrab.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/alarm.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/awksed.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/cut.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/dupword.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/egrep.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/extract.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/guide.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/histsort.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/id.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/igawk.sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/labels.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/split.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/tee.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/testbits.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/translate.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/uniq.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/wc.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/eg/prog/wordfreq.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/extract.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awklib/stamp-eg#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/awktab.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/builtin.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/configh.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/configure#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/configure.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/custom.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/dfa.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/dfa.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/README.card#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/ad.block#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/awk.1#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/awkcard.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/awkforai.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/cardfonts#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/colors#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/gawk.1#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/gawk.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/gawkinet.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/igawk.1#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/macros#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/no.colors#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/setter.outline#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/doc/texinfo.tex#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/eval.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/eval_p.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/ext.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/extension/dl.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/extension/doit#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/extension/filefuncs.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/extension/foo.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/extension/fork.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/extension/steps#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/extension/testff.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/extension/testfork.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/field.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/fixvers#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/gawkmisc.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/getopt.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/getopt.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/getopt1.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/install-sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/io.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/main.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/msg.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/node.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/patchlev.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/patchlevel.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/po/POTFILES.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/po/cat-id-tbl.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/po/gawk.pot#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/po/he.gmo#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/po/stamp-cat-id#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/posix/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/posix/gawkmisc.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/profile.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/profile_p.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/protos.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/re.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/regex.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/replace.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/stamp-h.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/addcomma.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/addcomma.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/addcomma.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/arynasty.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/arynasty.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/arynocls.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/arynocls.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/arynocls.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/arysubnm.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/arysubnm.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/clos1way.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/clos1way.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/datanonl.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/datanonl.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/datanonl.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/fnamedat.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/fnamedat.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/fnamedat.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/fnaryscl.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/fnaryscl.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/fnasgnm.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/fnasgnm.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/fnasgnm.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/fnparydl.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/fnparydl.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/fsfwfs.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/fsfwfs.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/fsfwfs.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/funsemnl.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/funsemnl.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/funsmnam.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/funsmnam.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/getlnbuf.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/getlnbuf.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/getlnbuf.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/getnr2tb.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/getnr2tb.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/getnr2tb.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/getnr2tm.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/getnr2tm.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/getnr2tm.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/gnuops2.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/gnuops2.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/gtlnbufv.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/hsprint.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/hsprint.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/igncdym.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/igncdym.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/igncdym.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/leaddig.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/leaddig.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/leadnl.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/leadnl.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/leadnl.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/lint.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/lint.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/nasty.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/nasty.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/nasty2.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/nasty2.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/nlinstr.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/nlinstr.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/nlinstr.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/nlstrina.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/nlstrina.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/numindex.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/numindex.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/numindex.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/octsub.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/octsub.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/ofmt.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/ofmt.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/ofmt.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/ofmtbig.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/ofmtbig.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/ofmtbig.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/ofmts.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/ofmts.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/ofmts.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/opasnidx.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/opasnidx.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/opasnslf.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/opasnslf.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/paramtyp.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/paramtyp.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/parseme.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/parseme.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/poundbang.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/printf1.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/printf1.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/printfloat.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/procinfs.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/procinfs.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/psx96sub.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/psx96sub.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/rebt8b1.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/rebt8b1.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/rebt8b2.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/rebt8b2.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/redfilnm.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/redfilnm.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/redfilnm.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/reg/Obsolete/exp.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/reg/Obsolete/exp.good#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/reg/Obsolete/exp.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/reg/Obsolete/log.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/reg/Obsolete/log.good#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/reg/Obsolete/log.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/regeq.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/regeq.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/regeq.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/regtest.sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/regx8bit.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/regx8bit.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/rsnul1nl.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/rsnul1nl.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/rsnul1nl.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/shadow.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/shadow.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/sort1.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/sort1.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/splitdef.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/splitdef.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/strftime.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/strtod.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/strtod.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/strtod.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/subslash.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/subslash.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/zeroflag.awk#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/test/zeroflag.ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/version.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/awk/version.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/BUGS#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/COPYING#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/COPYING.LIB#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ChangeLog#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/FREEBSD-Xlist#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/FSFChangeLog#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/INSTALL#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/LANGUAGES#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/NEWS#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ONEWS#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/PROBLEMS#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/PROJECTS#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/README#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/README-bugs#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/README-fixinc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/README.DWARF#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/README.TRAD#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/README.g77#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/SERVICE#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/TESTS.FLUNK#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/acconfig.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/aclocal.m4#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/alias.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ansidecl.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/assert.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/basic-block.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/bitmap.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/bitmap.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/build-make#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-aux-info.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-common.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-convert.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-decl.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-iterate.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-lang.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-lex.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-lex.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-parse.gperf#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-parse.in#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-pragma.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-pragma.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-tree.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/c-typeck.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/caller-save.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/calls.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cccp.1#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cccp.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cexp.y#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/choose-temp.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/collect2.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/collect2.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/combine.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/conditions.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config.guess#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config.sub#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/README#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/alpha-interix.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/alpha.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/alpha.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/alpha.md#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/alpha32.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/config-nt.sed#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/crtbegin.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/crtend.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/elf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/freebsd.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/lib1funcs.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/linux-ecoff.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/linux-elf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/netbsd-elf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/netbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/openbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/osf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/osf12.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/osf2or3.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/t-crtbe#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/t-ieee#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/t-interix#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/t-vms#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/va_list.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/vms-tramp.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/vms.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/vxworks.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/win-nt.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/x-alpha#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/xm-alpha-interix.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/xm-alpha.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/xm-freebsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/xm-openbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/xm-vms.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/alpha/xm-winnt.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/aoutos.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/dbx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/dbxcoff.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/dbxelf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/elfos.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/float-i128.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/float-i32.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/float-i386.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/float-i64.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/float-m68k.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/float-sh.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/float-vax.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/fp-bit.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/freebsd.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/gnu.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/gofast.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/386bsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/aix386.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/aix386ng.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/att.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/bsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/bsd386.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/config-nt.sed#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/crtdll.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/cygwin.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/cygwin.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/dgux.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/dgux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/djgpp-rtems.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/djgpp.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/freebsd-aout.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/freebsd.h#6 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/freebsd.h.fixed#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/gas.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/gmon-sol2.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/gnu.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/gstabs.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/i386-aout.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/i386-coff.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/i386-interix.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/i386.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/i386.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/i386.md#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/interix.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/isc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/isccoff.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/iscdbx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/linux-aout.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/linux-oldld.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/linux.h#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/lynx-ng.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/lynx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/mach.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/mingw32.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/moss.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/netbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/next.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/openbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/os2.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/osf1-ci.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/osf1-cn.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/osf1elf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/osf1elfgdb.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/osfelf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/osfrose.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/perform.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/ptx4-i.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/rtems.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/rtemself.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sco.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sco4.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sco4dbx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sco5.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sco5gas.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/scodbx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/seq-gas.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/seq-sysv3.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/seq2-sysv3.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sequent.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sol2-c1.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sol2-ci.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sol2-cn.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sol2-gc1.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sol2.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sol2gas.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sun.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sun386.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/svr3.ifile#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/svr3dbx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/svr3gas.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/svr3z.ifile#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sysv3.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sysv4.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/sysv5.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-crtpic#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-crtstuff#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-cygwin#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-dgux#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-djgpp#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-i386bare#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-interix#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-mingw32#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-next#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-osf#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-osf1elf#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-sco5#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-sco5gas#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-sol2#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-svr3dbx#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-udk#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-uwin#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-vsta#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/t-winnt#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/udk.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/unix.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/uwin.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/uwin.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/v3gas.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/vsta.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/vxi386.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/win-nt.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/win32.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/winnt.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-aix#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-cygwin#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-dgux#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-djgpp#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-isc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-isc3#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-ncr3000#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-next#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-osf1elf#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-osfrose#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-sco#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-sco4#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-sco5#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-sysv3#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/x-vsta#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-aix.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-bsd386.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-cygwin.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-dgux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-djgpp.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-dos.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-freebsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-gnu.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-i386-interix.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-i386.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-isc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-lynx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-mingw32.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-next.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-openbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-os2.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-osf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-osf1elf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-sco.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-sco5.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-sun.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-sysv3.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-sysv4.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-uwin.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-vsta.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/i386/xm-winnt.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/interix.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/libgloss.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/linux-aout.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/lynx-ng.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/lynx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/netbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/nextstep.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/nextstep.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/nextstep21.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/openbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/psos.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/ptx4.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/aout.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/bsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/elf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/gmon-sol2.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/hal.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/lb1spc.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/lb1spl.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/linux-aout.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/linux64.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/lite.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/litecoff.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/lynx-ng.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/lynx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/netbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/openbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/pbd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/rtems.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sol2-c1.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sol2-ci.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sol2-cn.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sol2-g1.asm#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sol2-sld-64.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sol2-sld.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sol2.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sp64-aout.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sp64-elf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sparc.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sparc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sparc.md#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/splet.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sun4gas.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sun4o3.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sunos4.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/sysv4.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/t-elf#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/t-halos#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/t-linux64#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/t-sol2#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/t-sol2-64#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/t-sp64#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/t-sparcbare#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/t-sparclite#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/t-splet#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/t-sunos40#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/t-sunos41#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/t-vxsparc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/vxsim.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/vxsparc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/x-sysv4#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/xm-linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/xm-lynx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/xm-openbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/xm-pbd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/xm-sol2.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/xm-sp64.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/xm-sparc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/xm-sysv4-64.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/sparc/xm-sysv4.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/svr3.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/svr4.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/t-freebsd#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/t-gnu#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/t-install-cpp#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/t-libc-ok#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/t-linux#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/t-linux-aout#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/t-linux-gnulibc1#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/t-netbsd#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/t-openbsd#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/t-openbsd-thread#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/t-rtems#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/t-svr4#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/tm-dwarf2.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/x-interix#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/x-linux#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/x-linux-aout#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/x-lynx#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/x-svr4#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/xm-alloca.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/xm-freebsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/xm-gnu.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/xm-interix.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/xm-linux.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/xm-lynx.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/xm-openbsd.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/xm-siglist.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/xm-std32.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/xm-svr3.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/config/xm-svr4.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/configure#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/configure.frag#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/configure.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/configure.lang#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/convert.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/convert.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/Make-lang.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/NEWS#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/call.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/class.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/config-lang.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/cp-tree.def#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/cp-tree.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/cvt.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/decl.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/decl.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/decl2.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/errfn.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/error.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/except.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/exception.cc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/expr.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/friend.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/g++.1#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/g++spec.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/gxx.gperf#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/gxxint.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/inc/exception#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/inc/new#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/inc/new.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/inc/typeinfo#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/init.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/input.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/lang-options.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/lang-specs.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/lex.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/lex.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/method.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/mpw-config.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/mpw-make.sed#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/new.cc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/new1.cc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/new2.cc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/parse.y#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/pt.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/ptree.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/repo.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/rtti.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/search.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/semantics.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/sig.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/spew.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/tinfo.cc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/tinfo.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/tinfo2.cc#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/tree.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/typeck.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/typeck2.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cp/xref.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cplus-dem.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cpp.1#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cpp.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cpp.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cppalloc.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cpperror.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cppexp.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cppfiles.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cpphash.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cpphash.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cppinit.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cpplib.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cpplib.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cppmain.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cppspec.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cppulp.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cross-make#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/crtstuff.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cse.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/cstamp-h.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/dbxout.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/dbxout.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/dbxstclass.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/defaults.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/demangle.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/doprint.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/doschk.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/dostage2#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/dostage3#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/dwarf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/dwarf2.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/dwarf2out.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/dwarf2out.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/dwarfout.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/dwarfout.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/dyn-string.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/dyn-string.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/eh-common.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/emit-rtl.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/enquire.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/except.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/except.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/exgettext#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/explow.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/expmed.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/expr.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/expr.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/extend.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/BUGS#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/INSTALL#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/Make-lang.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/NEWS#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/README#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/RELEASE-PREP#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/ansify.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/assert.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/bad.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/bad.def#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/bad.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/bit.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/bit.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/bld-op.def#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/bld.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/bld.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/bugs.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/bugs0.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/com-rt.def#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/com.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/com.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/config-lang.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/config.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/convert.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/data.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/data.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/equiv.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/equiv.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/expr.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/expr.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/ffe.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/fini.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/flags.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/g77.1#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/g77.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/g77install.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/g77spec.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/glimits.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/global.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/global.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/hconfig.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/implic.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/implic.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/info-b.def#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/info-k.def#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/info-w.def#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/info.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/info.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/input.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/intdoc.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/intdoc.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/intdoc.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/intrin.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/intrin.def#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/intrin.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/lab.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/lab.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/lang-options.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/lang-specs.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/lex.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/lex.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/malloc.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/malloc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/name.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/name.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/news.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/news0.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/output.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/parse.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/proj.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/proj.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/root.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/rtl.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/src.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/src.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/st.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/st.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/sta.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/sta.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stb.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stb.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stc.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/std.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/std.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/ste.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/ste.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/storag.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/storag.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stp.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stp.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/str-1t.fin#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/str-2t.fin#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/str-fo.fin#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/str-io.fin#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/str-nq.fin#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/str-op.fin#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/str-ot.fin#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/str.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/str.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/sts.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/sts.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stt.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stt.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stu.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stu.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stv.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stv.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stw.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/stw.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/symbol.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/symbol.def#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/symbol.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/system.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/target.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/target.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/tconfig.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/tm.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/top.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/top.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/toplev.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/tree.j#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/type.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/type.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/version.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/version.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/where.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/f/where.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/final.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/fix-header.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/fixcpp#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/fixinc-nt.sed#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/fixincludes#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/fixproto#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/flags.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/floatlib.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/flow.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/fold-const.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/fp-test.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/frame.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/frame.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/function.c#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/function.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/future.options#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gansidecl.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gbl-ctors.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gcc.1#3 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gcc.c#4 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gcc.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gccspec.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gcov-io.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gcov.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gcov.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gcse.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gen-protos.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/genattr.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/genattrtab.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gencheck.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gencodes.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/genconfig.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/genemit.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/genextract.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/genflags.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gengenrtl.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/genmultilib#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/genopinit.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/genoutput.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/genpeep.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/genrecog.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/getopt.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/getopt.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/getopt1.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/getpwd.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/iso646.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/math-3300.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/math-68881.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/ppc-asm.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/proto.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/stdarg.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/stdbool.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/stddef.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-alpha.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-arc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-c4x.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-clipper.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-h8300.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-i860.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-i960.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-m32r.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-m88k.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-mips.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-mn10200.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-mn10300.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-pa.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-ppc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-pyr.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-sh.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-sparc.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-spur.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/va-v850.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/ginclude/varargs.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/glimits.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/global.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gmon.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/graph.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gstab.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gsyms.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gsyslimits.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/gcc.295/gthr-dce.h#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 22:29:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B9FE37B401; Fri, 28 Jun 2002 22:28:25 -0700 (PDT) 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 AC74537B400 for ; Fri, 28 Jun 2002 22:28:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 947C743E09 for ; Fri, 28 Jun 2002 22:28:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T5SMJU082224 for ; Fri, 28 Jun 2002 22:28:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T5RFEY082175 for perforce@freebsd.org; Fri, 28 Jun 2002 22:27:15 -0700 (PDT) Date: Fri, 28 Jun 2002 22:27:15 -0700 (PDT) Message-Id: <200206290527.g5T5RFEY082175@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13569 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13569 Change 13569 by peter@peter_daintree on 2002/06/28 22:26:39 IFC @13568 Affected files ... .. //depot/projects/ia64/MAINTAINERS#11 integrate .. //depot/projects/ia64/Makefile#11 integrate .. //depot/projects/ia64/Makefile.inc1#32 integrate .. //depot/projects/ia64/bin/ed/ed.1#3 integrate .. //depot/projects/ia64/bin/ln/ln.1#3 integrate .. //depot/projects/ia64/bin/ln/ln.c#5 integrate .. //depot/projects/ia64/bin/ps/ps.c#6 integrate .. //depot/projects/ia64/bin/sh/miscbltin.c#3 integrate .. //depot/projects/ia64/bin/sh/sh.1#9 integrate .. //depot/projects/ia64/contrib/awk/ACKNOWLEDGMENT#2 delete .. //depot/projects/ia64/contrib/awk/AUTHORS#2 delete .. //depot/projects/ia64/contrib/awk/COPYING#3 delete .. //depot/projects/ia64/contrib/awk/ChangeLog#3 delete .. //depot/projects/ia64/contrib/awk/FREEBSD-upgrade#2 delete .. //depot/projects/ia64/contrib/awk/FUTURES#3 delete .. //depot/projects/ia64/contrib/awk/INSTALL#2 delete .. //depot/projects/ia64/contrib/awk/LIMITATIONS#2 delete .. //depot/projects/ia64/contrib/awk/Makefile.am#2 delete .. //depot/projects/ia64/contrib/awk/Makefile.in#3 delete .. //depot/projects/ia64/contrib/awk/NEWS#3 delete .. //depot/projects/ia64/contrib/awk/PORTS#2 delete .. //depot/projects/ia64/contrib/awk/POSIX.STD#3 delete .. //depot/projects/ia64/contrib/awk/PROBLEMS#3 delete .. //depot/projects/ia64/contrib/awk/README#3 delete .. //depot/projects/ia64/contrib/awk/README_d/README.FIRST#2 delete .. //depot/projects/ia64/contrib/awk/README_d/README.tests#2 delete .. //depot/projects/ia64/contrib/awk/acconfig.h#3 delete .. //depot/projects/ia64/contrib/awk/aclocal.m4#2 delete .. //depot/projects/ia64/contrib/awk/alloca.c#2 delete .. //depot/projects/ia64/contrib/awk/array.c#3 delete .. //depot/projects/ia64/contrib/awk/awk.h#3 delete .. //depot/projects/ia64/contrib/awk/awk.y#2 delete .. //depot/projects/ia64/contrib/awk/awkgram.y#2 delete .. //depot/projects/ia64/contrib/awk/awklib/ChangeLog#3 delete .. //depot/projects/ia64/contrib/awk/awklib/Makefile.am#2 delete .. //depot/projects/ia64/contrib/awk/awklib/Makefile.in#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/data/BBS-list#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/data/inventory-shipped#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/assert.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/bits2str.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/cliff_rand.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/ctime.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/ftrans.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/getopt.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/gettime.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/grcat.c#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/groupawk.in#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/join.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/libintl.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/mktime.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/nextfile.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/noassign.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/ord.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/passwdawk.in#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/pwcat.c#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/readable.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/rewind.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/lib/round.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/misc/arraymax.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/misc/arraymax.data#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/misc/findpat.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/misc/findpat.data#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/misc/findpat.sh#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/PostAgent.sh#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/coreserv.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/eliza.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/fingerclient.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/geturl.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/hello-serv.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/maze.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/mobag.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/panic.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/protbase.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/protbase.request#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/protbase.result#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/remconf.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/statist.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/stoxdata.txt#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/stoxpred.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/testserv.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/urlchk.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/network/webgrab.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/alarm.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/awksed.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/cut.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/dupword.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/egrep.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/extract.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/guide.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/histsort.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/id.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/igawk.sh#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/labels.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/split.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/tee.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/testbits.awk#2 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/translate.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/uniq.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/wc.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/eg/prog/wordfreq.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/extract.awk#3 delete .. //depot/projects/ia64/contrib/awk/awklib/stamp-eg#2 delete .. //depot/projects/ia64/contrib/awk/awktab.c#2 delete .. //depot/projects/ia64/contrib/awk/builtin.c#3 delete .. //depot/projects/ia64/contrib/awk/configh.in#3 delete .. //depot/projects/ia64/contrib/awk/configure#3 delete .. //depot/projects/ia64/contrib/awk/configure.in#3 delete .. //depot/projects/ia64/contrib/awk/custom.h#3 delete .. //depot/projects/ia64/contrib/awk/dfa.c#3 delete .. //depot/projects/ia64/contrib/awk/dfa.h#3 delete .. //depot/projects/ia64/contrib/awk/doc/ChangeLog#3 delete .. //depot/projects/ia64/contrib/awk/doc/Makefile.am#2 delete .. //depot/projects/ia64/contrib/awk/doc/Makefile.in#3 delete .. //depot/projects/ia64/contrib/awk/doc/README.card#2 delete .. //depot/projects/ia64/contrib/awk/doc/ad.block#3 delete .. //depot/projects/ia64/contrib/awk/doc/awk.1#2 delete .. //depot/projects/ia64/contrib/awk/doc/awkcard.in#3 delete .. //depot/projects/ia64/contrib/awk/doc/awkforai.txt#2 delete .. //depot/projects/ia64/contrib/awk/doc/cardfonts#3 delete .. //depot/projects/ia64/contrib/awk/doc/colors#2 delete .. //depot/projects/ia64/contrib/awk/doc/gawk.1#3 delete .. //depot/projects/ia64/contrib/awk/doc/gawk.texi#3 delete .. //depot/projects/ia64/contrib/awk/doc/gawkinet.texi#2 delete .. //depot/projects/ia64/contrib/awk/doc/igawk.1#2 delete .. //depot/projects/ia64/contrib/awk/doc/macros#2 delete .. //depot/projects/ia64/contrib/awk/doc/no.colors#3 delete .. //depot/projects/ia64/contrib/awk/doc/setter.outline#2 delete .. //depot/projects/ia64/contrib/awk/doc/texinfo.tex#3 delete .. //depot/projects/ia64/contrib/awk/eval.c#3 delete .. //depot/projects/ia64/contrib/awk/eval_p.c#2 delete .. //depot/projects/ia64/contrib/awk/ext.c#2 delete .. //depot/projects/ia64/contrib/awk/extension/dl.c#2 delete .. //depot/projects/ia64/contrib/awk/extension/doit#2 delete .. //depot/projects/ia64/contrib/awk/extension/filefuncs.c#2 delete .. //depot/projects/ia64/contrib/awk/extension/foo.awk#2 delete .. //depot/projects/ia64/contrib/awk/extension/fork.c#2 delete .. //depot/projects/ia64/contrib/awk/extension/steps#2 delete .. //depot/projects/ia64/contrib/awk/extension/testff.awk#2 delete .. //depot/projects/ia64/contrib/awk/extension/testfork.awk#2 delete .. //depot/projects/ia64/contrib/awk/field.c#3 delete .. //depot/projects/ia64/contrib/awk/fixvers#2 delete .. //depot/projects/ia64/contrib/awk/gawkmisc.c#3 delete .. //depot/projects/ia64/contrib/awk/getopt.c#3 delete .. //depot/projects/ia64/contrib/awk/getopt.h#3 delete .. //depot/projects/ia64/contrib/awk/getopt1.c#3 delete .. //depot/projects/ia64/contrib/awk/install-sh#2 delete .. //depot/projects/ia64/contrib/awk/io.c#3 delete .. //depot/projects/ia64/contrib/awk/main.c#3 delete .. //depot/projects/ia64/contrib/awk/mkinstalldirs#2 delete .. //depot/projects/ia64/contrib/awk/msg.c#3 delete .. //depot/projects/ia64/contrib/awk/node.c#3 delete .. //depot/projects/ia64/contrib/awk/patchlev.h#2 delete .. //depot/projects/ia64/contrib/awk/patchlevel.h#2 delete .. //depot/projects/ia64/contrib/awk/po/POTFILES.in#2 delete .. //depot/projects/ia64/contrib/awk/po/cat-id-tbl.c#2 delete .. //depot/projects/ia64/contrib/awk/po/gawk.pot#2 delete .. //depot/projects/ia64/contrib/awk/po/he.gmo#2 delete .. //depot/projects/ia64/contrib/awk/po/stamp-cat-id#2 delete .. //depot/projects/ia64/contrib/awk/posix/ChangeLog#3 delete .. //depot/projects/ia64/contrib/awk/posix/gawkmisc.c#3 delete .. //depot/projects/ia64/contrib/awk/profile.c#2 delete .. //depot/projects/ia64/contrib/awk/profile_p.c#2 delete .. //depot/projects/ia64/contrib/awk/protos.h#3 delete .. //depot/projects/ia64/contrib/awk/re.c#3 delete .. //depot/projects/ia64/contrib/awk/regex.c#3 delete .. //depot/projects/ia64/contrib/awk/replace.c#2 delete .. //depot/projects/ia64/contrib/awk/stamp-h.in#3 delete .. //depot/projects/ia64/contrib/awk/test/Makefile.am#2 delete .. //depot/projects/ia64/contrib/awk/test/addcomma.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/addcomma.in#2 delete .. //depot/projects/ia64/contrib/awk/test/addcomma.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/arynasty.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/arynasty.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/arynocls.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/arynocls.in#2 delete .. //depot/projects/ia64/contrib/awk/test/arynocls.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/arysubnm.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/arysubnm.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/clos1way.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/clos1way.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/datanonl.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/datanonl.in#2 delete .. //depot/projects/ia64/contrib/awk/test/datanonl.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/fnamedat.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/fnamedat.in#2 delete .. //depot/projects/ia64/contrib/awk/test/fnamedat.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/fnaryscl.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/fnaryscl.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/fnasgnm.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/fnasgnm.in#2 delete .. //depot/projects/ia64/contrib/awk/test/fnasgnm.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/fnparydl.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/fnparydl.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/fsfwfs.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/fsfwfs.in#2 delete .. //depot/projects/ia64/contrib/awk/test/fsfwfs.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/funsemnl.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/funsemnl.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/funsmnam.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/funsmnam.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/getlnbuf.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/getlnbuf.in#2 delete .. //depot/projects/ia64/contrib/awk/test/getlnbuf.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/getnr2tb.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/getnr2tb.in#2 delete .. //depot/projects/ia64/contrib/awk/test/getnr2tb.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/getnr2tm.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/getnr2tm.in#2 delete .. //depot/projects/ia64/contrib/awk/test/getnr2tm.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/gnuops2.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/gnuops2.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/gtlnbufv.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/hsprint.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/hsprint.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/igncdym.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/igncdym.in#2 delete .. //depot/projects/ia64/contrib/awk/test/igncdym.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/leaddig.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/leaddig.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/leadnl.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/leadnl.in#2 delete .. //depot/projects/ia64/contrib/awk/test/leadnl.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/lint.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/lint.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/nasty.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/nasty.ok#3 delete .. //depot/projects/ia64/contrib/awk/test/nasty2.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/nasty2.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/nlinstr.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/nlinstr.in#2 delete .. //depot/projects/ia64/contrib/awk/test/nlinstr.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/nlstrina.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/nlstrina.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/numindex.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/numindex.in#2 delete .. //depot/projects/ia64/contrib/awk/test/numindex.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/octsub.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/octsub.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/ofmt.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/ofmt.in#2 delete .. //depot/projects/ia64/contrib/awk/test/ofmt.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/ofmtbig.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/ofmtbig.in#2 delete .. //depot/projects/ia64/contrib/awk/test/ofmtbig.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/ofmts.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/ofmts.in#2 delete .. //depot/projects/ia64/contrib/awk/test/ofmts.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/opasnidx.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/opasnidx.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/opasnslf.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/opasnslf.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/paramtyp.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/paramtyp.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/parseme.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/parseme.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/poundbang.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/printf1.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/printf1.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/printfloat.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/procinfs.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/procinfs.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/psx96sub.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/psx96sub.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/rebt8b1.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/rebt8b1.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/rebt8b2.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/rebt8b2.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/redfilnm.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/redfilnm.in#2 delete .. //depot/projects/ia64/contrib/awk/test/redfilnm.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/reg/Obsolete/exp.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/reg/Obsolete/exp.good#2 delete .. //depot/projects/ia64/contrib/awk/test/reg/Obsolete/exp.in#2 delete .. //depot/projects/ia64/contrib/awk/test/reg/Obsolete/log.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/reg/Obsolete/log.good#2 delete .. //depot/projects/ia64/contrib/awk/test/reg/Obsolete/log.in#2 delete .. //depot/projects/ia64/contrib/awk/test/regeq.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/regeq.in#2 delete .. //depot/projects/ia64/contrib/awk/test/regeq.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/regtest.sh#2 delete .. //depot/projects/ia64/contrib/awk/test/regx8bit.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/regx8bit.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/rsnul1nl.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/rsnul1nl.in#2 delete .. //depot/projects/ia64/contrib/awk/test/rsnul1nl.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/shadow.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/shadow.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/sort1.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/sort1.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/splitdef.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/splitdef.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/strftime.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/strtod.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/strtod.in#2 delete .. //depot/projects/ia64/contrib/awk/test/strtod.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/subslash.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/subslash.ok#2 delete .. //depot/projects/ia64/contrib/awk/test/zeroflag.awk#2 delete .. //depot/projects/ia64/contrib/awk/test/zeroflag.ok#2 delete .. //depot/projects/ia64/contrib/awk/version.c#3 delete .. //depot/projects/ia64/contrib/awk/version.in#2 delete .. //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#11 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/x86-64.h#3 integrate .. //depot/projects/ia64/contrib/gcc/toplev.c#5 integrate .. //depot/projects/ia64/contrib/gdb.291/COPYING#2 delete .. //depot/projects/ia64/contrib/gdb.291/COPYING.LIB#2 delete .. //depot/projects/ia64/contrib/gdb.291/FREEBSD-Xlist#2 delete .. //depot/projects/ia64/contrib/gdb.291/FREEBSD-upgrade#2 delete .. //depot/projects/ia64/contrib/gdb.291/Makefile.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/README#2 delete .. //depot/projects/ia64/contrib/gdb.291/config-ml.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/config.guess#2 delete .. //depot/projects/ia64/contrib/gdb.291/config.if#2 delete .. //depot/projects/ia64/contrib/gdb.291/config.sub#2 delete .. //depot/projects/ia64/contrib/gdb.291/configure#2 delete .. //depot/projects/ia64/contrib/gdb.291/configure.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/.gdbinit#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/29k-share/README#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/29k-share/udi/udi2go32.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/29k-share/udi/udiids.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/29k-share/udi/udip2soc.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/29k-share/udi/udiphcfg.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/29k-share/udi/udiphunix.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/29k-share/udi/udiproc.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/29k-share/udi/udipt29k.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/29k-share/udi/udiptcfg.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/29k-share/udi/udisoc.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/29k-share/udi/udr.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/29k-share/udi_soc#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/COPYING#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ChangeLog#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ChangeLog-96#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ChangeLog-97#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ChangeLog-98#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/Makefile.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/NEWS#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/README#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/TODO#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/abug-rom.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/acinclude.m4#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/aclocal.m4#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/alpha-tdep.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/annotate.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/annotate.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/arc-tdep.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ax-gdb.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ax-gdb.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ax-general.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ax.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/bcache.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/bcache.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/blockframe.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/breakpoint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/breakpoint.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/buildsym.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/buildsym.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/c-exp.y#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/c-lang.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/c-lang.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/c-typeprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/c-valprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/call-cmds.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/callback.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/callback.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ch-exp.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ch-lang.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ch-lang.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ch-typeprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ch-valprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/coffread.c#3 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/command.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/command.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/complaints.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/complaints.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/alpha-linux.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/alpha-linux.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/alpha-osf1.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/alpha-osf1.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/alpha-osf2.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/alpha-osf3.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/nm-linux.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/nm-osf.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/nm-osf2.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/nm-osf3.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/tm-alpha.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/tm-alphalinux.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/xm-alphalinux.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/alpha/xm-alphaosf.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/arm/arm.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/arm/arm.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/arm/nm-arm.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/arm/tm-arm.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/arm/xm-arm.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/cygwin.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/cygwin.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/cygwin32.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/cygwin32.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/fbsd.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/fbsd.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/gdbserve.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/go32.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386aix.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386aix.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386aout.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386bsd.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386bsd.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386dgux.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386gnu.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386gnu.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386lynx.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386lynx.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386m3.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386m3.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386mach.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386mk.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386mk.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386nw.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386os9k.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386sco.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386sco4.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386sco5.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386sco5.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386sol2.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386sol2.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386v.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386v.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386v32.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386v4.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386v4.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386v42mp.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/i386v42mp.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/linux.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/linux.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nbsd.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nbsd.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/ncr3000.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/ncr3000.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-fbsd.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-gnu.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-i386aix.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-i386bsd.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-i386lynx.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-i386mach.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-i386sco.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-i386sco4.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-i386sco5.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-i386sol2.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-i386v.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-i386v4.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-i386v42mp.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-linux.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-m3.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-nbsd.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-ptx4.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-sun386.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/nm-symmetry.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/ptx.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/ptx.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/ptx4.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/ptx4.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/sun386.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/sun386.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/symmetry.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/symmetry.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-cygwin.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-cygwin32.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-fbsd.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386aix.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386bsd.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386gnu.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386lynx.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386m3.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386mk.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386nw.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386os9k.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386sco5.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386sol2.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386v.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386v4.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-i386v42mp.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-linux.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-nbsd.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-ptx.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-ptx4.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-sun386.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/tm-symmetry.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/windows.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-cygwin.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-cygwin32.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-go32.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-i386aix.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-i386bsd.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-i386gnu.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-i386lynx.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-i386m3.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-i386mach.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-i386mk.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-i386sco.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-i386v.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-i386v32.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-i386v4.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-linux.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-nbsd.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-ptx.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-ptx4.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-sun386.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-symmetry.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/i386/xm-windows.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/mips/tm-tx39.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/mips/tm-tx39l.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/mips/tm-vr4100.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/mips/tm-vr5000.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/mips/tm-vr5000el.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/mips/tx39.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/mips/tx39l.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/mips/vr4100.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/mips/vr5000.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/mips/vr5000el.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/aix.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/aix.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/cygwin.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/cygwin.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/gdbserve.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/linux.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/macos.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/macos.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/nm-aix.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/nm-macos.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/nm-solaris.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/ppc-eabi.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/ppc-nw.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/ppc-sim.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/ppcle-eabi.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/ppcle-sim.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/solaris.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/solaris.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/tm-cygwin.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/tm-macos.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/tm-ppc-aix.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/tm-ppc-eabi.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/tm-ppc-nw.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/tm-ppc-sim.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/tm-ppcle-eabi.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/tm-ppcle-sim.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/tm-solaris.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/xm-aix.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/xm-cygwin.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/xm-linux.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/xm-mpw.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/powerpc/xm-solaris.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/linux.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/linux.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/nbsd.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/nbsd.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/nm-linux.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/nm-nbsd.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/nm-sparclynx.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/nm-sun4os4.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/nm-sun4sol2.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/sp64.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/sp64sim.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/sp64sol2.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/sparc-em.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/sparclet.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/sparclite.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/sparclynx.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/sparclynx.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/sun4os4.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/sun4os4.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/sun4sol2.mh#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/sun4sol2.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/tm-linux.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/tm-nbsd.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/tm-sp64.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/tm-sp64sim.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/tm-sparc.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/tm-sparclet.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/tm-sparclite.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/tm-sparclynx.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/tm-spc-em.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/tm-sun4os4.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/tm-sun4sol2.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/tm-vxsparc.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/vxsparc.mt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/xm-linux.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/xm-nbsd.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/xm-sparc.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/xm-sparclynx.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/xm-sun4os4.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/config/sparc/xm-sun4sol2.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/configure#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/configure.host#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/configure.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/configure.tgt#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/copying.awk#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/copying.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/core-aout.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/core-regset.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/corefile.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/corelow.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/cp-valprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/d10v-tdep.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/d30v-tdep.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/dbug-rom.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/dbxread.c#3 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/dcache.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/dcache.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/debugify.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/debugify.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/defs.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/demangle.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/dink32-rom.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/ChangeLog#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/GDBvn.texi#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/HPPA-cfg.texi#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/LRS#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/Makefile.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/a4rc.sed#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/agentexpr.texi#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/all-cfg.texi#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/annotate.texi#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/configure#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/configure.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/gdb.texinfo#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/gdbint.texinfo#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/h8-cfg.texi#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/libgdb.texinfo#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/lpsrc.sed#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/psrc.sed#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/refcard.tex#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/remote.texi#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/doc/stabs.texinfo#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/dve3900-rom.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/dwarf2read.c#3 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/dwarfread.c#3 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/elfread.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/environ.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/environ.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/eval.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/exc_request.defs#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/exec.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/expprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/expression.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/f-exp.y#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/f-lang.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/f-lang.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/f-typeprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/f-valprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/findvar.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/fork-child.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/fr30-tdep.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/frame.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdb-stabs.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdb.1#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdb.gdb#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdb_stat.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdb_string.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdba.el#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbarch.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbarch.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbcmd.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbcore.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbinit.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/Makefile.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/README#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/configure.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/gdbreplay.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/gdbserver.1#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/low-hppabsd.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/low-linux.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/low-lynx.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/low-sim.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/low-sparc.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/low-sun3.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/remote-utils.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/server.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/server.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbserver/utils.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbthread.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbtypes.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gdbtypes.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gnu-regex.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/gnu-regex.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/hp-psymtab-read.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/hp-symtab-read.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/hpread.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/hpux-thread.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/i386-tdep.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/i386b-nat.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/i387-tdep.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/infcmd.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/inferior.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/inflow.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/infptrace.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/infrun.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/inftarg.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/infttrace.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/jv-exp.tab.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/jv-exp.y#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/jv-lang.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/jv-lang.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/jv-typeprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/jv-valprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/language.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/language.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/m2-exp.y#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/m2-lang.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/m2-lang.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/m2-typeprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/m2-valprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/m32r-rom.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/m32r-stub.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/m32r-tdep.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/m68klinux-nat.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/main.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/maint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/mdebugread.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/mem-break.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/minsyms.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/mipsread.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/mn10200-tdep.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/mn10300-tdep.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/msg.defs#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/msg_reply.defs#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/nlm/Makefile.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/nlm/configure#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/nlm/configure.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/nlm/gdbserve.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/nlm/gdbserve.def#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/nlm/i386.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/nlm/i386.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/nlm/ppc.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/nlm/ppc.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/nlm/prelude.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/nlmread.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/notify.defs#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ns32knbsd-nat.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/objfiles.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/objfiles.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ocd.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ocd.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/os9kread.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/parse.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/parser-defs.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/partial-stab.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ppc-bdm.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/printcmd.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/process_reply.defs#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/remote-d10v.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/remote-rdi.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/remote-sds.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/remote-sim.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/remote-utils.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/remote-utils.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/remote.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/reply_mig_hack.awk#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/saber.suppress#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/scm-exp.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/scm-lang.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/scm-lang.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/scm-tags.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/scm-valprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ser-ocd.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ser-tcp.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/ser-unix.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/serial.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/serial.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/sh-stub.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/signals.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/sol-thread.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/solib.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/solib.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/source.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/sparclet-rom.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/sparclet-stub.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/stabsread.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/stabsread.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/stack.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/symfile.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/symfile.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/symmisc.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/symtab.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/symtab.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/target.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/target.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/terminal.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/thread.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/thread.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/top.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/top.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tracepoint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tracepoint.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/ChangeLog#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/Makefile#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/Makefile.in#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tui.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tui.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiCommand.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiCommand.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiData.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiData.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiDataWin.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiDataWin.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiDisassem.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiDisassem.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiGeneralWin.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiGeneralWin.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiIO.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiIO.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiLayout.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiLayout.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiRegs.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiRegs.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiSource.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiSource.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiSourceWin.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiSourceWin.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiStack.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiStack.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiWin.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/tui/tuiWin.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/typeprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/typeprint.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/utils.c#3 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/v850-tdep.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/valarith.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/valops.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/valprint.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/valprint.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/value.h#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/values.c#2 delete .. //depot/projects/ia64/contrib/gdb.291/gdb/xcoffsolib.h#2 delete .. //depot/projects/ia64/contrib/gdb/ChangeLog#1 branch .. //depot/projects/ia64/contrib/gdb/MAINTAINERS#1 branch .. //depot/projects/ia64/contrib/gdb/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/gdb/config-ml.in#3 integrate .. //depot/projects/ia64/contrib/gdb/config.guess#3 integrate .. //depot/projects/ia64/contrib/gdb/config.if#2 integrate .. //depot/projects/ia64/contrib/gdb/config.sub#3 integrate .. //depot/projects/ia64/contrib/gdb/configure#3 integrate .. //depot/projects/ia64/contrib/gdb/configure.in#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/CONTRIBUTE#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1990#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1991#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1992#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1993#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1994#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1995#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1996#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1997#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1998#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1999#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-2000#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-2001#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-3.x#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/MAINTAINERS#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/NEWS#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/PROBLEMS#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/README#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/TODO#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/acinclude.m4#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/aclocal.m4#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/alpha-tdep.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/alphabsd-nat.c#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/alphafbsd-tdep.c#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/annotate.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/annotate.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/arc-tdep.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/arch-utils.c#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/arch-utils.h#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/arm-linux-nat.c#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/arm-linux-tdep.c#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/arm-tdep.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/armnbsd-nat.c#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/armnbsd-tdep.c#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/ax-gdb.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ax-gdb.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ax-general.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ax.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/bcache.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/bcache.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/blockframe.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/breakpoint.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/breakpoint.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/buildsym.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/buildsym.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/c-exp.y#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/c-lang.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/c-lang.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/c-typeprint.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/c-valprint.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/call-cmds.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ch-exp.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ch-lang.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ch-lang.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ch-typeprint.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ch-valprint.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cli-out.c#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/cli-out.h#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-cmds.c#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-cmds.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-decode.c#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-decode.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-script.c#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-script.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-setshow.c#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-setshow.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-utils.c#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-utils.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/coffread.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/command.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/complaints.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/complaints.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/completer.c#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/completer.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config.in#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-linux.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-linux.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-osf1.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-osf2.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-osf3.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/fbsd.mh#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/fbsd.mt#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-fbsd.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-linux.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-osf.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-osf2.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-osf3.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/tm-alpha.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/tm-alphalinux.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/tm-fbsd.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/xm-alphalinux.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/xm-alphaosf.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/arm.mh#3 delete .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/arm.mt#3 delete .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/embed.mt#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/linux.mh#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/linux.mt#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/nbsd.mh#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/nbsd.mt#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/nm-arm.h#3 delete .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/nm-linux.h#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/nm-nbsd.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-embed.h#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-linux.h#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-wince.h#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/wince.mt#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/xm-arm.h#3 delete .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/xm-linux.h#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/xm-nbsd.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/cygwin.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/embed.mt#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/fbsd.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/fbsd.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/go32.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/go32.mt#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386aix.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386bsd.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386dgux.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386gnu.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386gnu.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386lynx.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386m3.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386mach.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386mk.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386sco.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386sco4.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386sco5.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386sol2.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386sol2.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386v.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386v32.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386v4.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386v42mp.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/linux.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/linux.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nbsd.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nbsd.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nbsdelf.mh#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nbsdelf.mt#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/ncr3000.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/ncr3000.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-cygwin.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-fbsd.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-gnu.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-go32.h#3 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386.h#1 branch .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386aix.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386bsd.h#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 23: 0:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D1B837B400; Fri, 28 Jun 2002 23:00:04 -0700 (PDT) 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 7D97D37B405 for ; Fri, 28 Jun 2002 23:00:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7950F43E13 for ; Fri, 28 Jun 2002 23:00:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T602JU005129 for ; Fri, 28 Jun 2002 23:00:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T602bm005126 for perforce@freebsd.org; Fri, 28 Jun 2002 23:00:02 -0700 (PDT) Date: Fri, 28 Jun 2002 23:00:02 -0700 (PDT) Message-Id: <200206290600.g5T602bm005126@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13571 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13571 Change 13571 by peter@peter_daintree on 2002/06/28 23:00:00 IFC @13570 - missed a heap of stuff last time. (needed p4 integ -i) Affected files ... .. //depot/projects/ia64/bin/cat/cat.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-arm.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/aix.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/aix.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/gdbserve.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/linux.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nm-aix.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppc-eabi.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppc-sim.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppcle-eabi.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppcle-sim.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-aix.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-sim.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-aix.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-linux.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/linux.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/linux.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsd.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsd.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-linux.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-nbsd.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sparclynx.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sun4os4.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sun4sol2.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64sim.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64sol2.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparc-em.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclet.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclite.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclynx.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclynx.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4os4.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4os4.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4sol2.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4sol2.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-linux.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-nbsd.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sp64.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sp64sim.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparc.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclet.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclite.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclynx.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-spc-em.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sun4os4.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sun4sol2.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-vxsparc.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/vxsparc.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-linux.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-nbsd.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-sun4sol2.h#3 integrate .. //depot/projects/ia64/usr.bin/csplit/csplit.c#4 integrate Differences ... ==== //depot/projects/ia64/bin/cat/cat.c#4 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/cat/cat.c,v 1.24 2002/06/14 09:54:48 jmallett Exp $"; + "$FreeBSD: src/bin/cat/cat.c,v 1.25 2002/06/29 04:52:33 tjr Exp $"; #endif /* not lint */ #include @@ -278,8 +278,11 @@ fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd >= 0) { sou.sun_family = AF_UNIX; - snprintf(sou.sun_path, sizeof(sou.sun_path), "%s", path); - len = strlen(sou.sun_path); + if ((len = strlcpy(sou.sun_path, path, + sizeof(sou.sun_path))) >= sizeof(sou.sun_path)) { + errno = ENAMETOOLONG; + return (-1); + } len = offsetof(struct sockaddr_un, sun_path[len+1]); if (connect(fd, (void *)&sou, len) < 0) { ==== //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-arm.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/aix.mh#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/aix.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/gdbserve.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/linux.mh#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nm-aix.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppc-eabi.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppc-sim.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppcle-eabi.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppcle-sim.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-aix.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-sim.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-aix.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-linux.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/linux.mh#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/linux.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsd.mh#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsd.mt#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-linux.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-nbsd.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sparclynx.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sun4os4.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sun4sol2.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64sim.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64sol2.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparc-em.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclet.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclite.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclynx.mh#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclynx.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4os4.mh#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4os4.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4sol2.mh#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4sol2.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-linux.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-nbsd.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sp64.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sp64sim.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparc.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclet.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclite.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclynx.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-spc-em.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sun4os4.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sun4sol2.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-vxsparc.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/vxsparc.mt#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-linux.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-nbsd.h#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-sun4sol2.h#3 (text+ko) ==== ==== //depot/projects/ia64/usr.bin/csplit/csplit.c#4 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/csplit/csplit.c,v 1.4 2002/06/07 01:04:24 tjr Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/csplit/csplit.c,v 1.5 2002/06/29 05:31:26 tjr Exp $"); #include @@ -227,8 +227,11 @@ { FILE *fp; - snprintf(currfile, sizeof(currfile), "%s%0*ld", prefix, (int)sufflen, - nfiles); + if (snprintf(currfile, sizeof(currfile), "%s%0*ld", prefix, + (int)sufflen, nfiles) >= sizeof(currfile)) { + errno = ENAMETOOLONG; + err(1, NULL); + } if ((fp = fopen(currfile, "w+")) == NULL) err(1, "%s", currfile); nfiles++; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 23:27:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF28437B401; Fri, 28 Jun 2002 23:25:43 -0700 (PDT) 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 60BD937B400 for ; Fri, 28 Jun 2002 23:25:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A636443E1A for ; Fri, 28 Jun 2002 23:25:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T6PfJU012196 for ; Fri, 28 Jun 2002 23:25:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T6PXwj012160 for perforce@freebsd.org; Fri, 28 Jun 2002 23:25:33 -0700 (PDT) Date: Fri, 28 Jun 2002 23:25:33 -0700 (PDT) Message-Id: <200206290625.g5T6PXwj012160@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13572 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13572 Change 13572 by peter@peter_daintree on 2002/06/28 23:24:39 forced reintegration of gdb to attempt to de-haunt the gdb/config/sparc, gdb/config/arm and gdb/config/powerpc files. Affected files ... .. //depot/projects/ia64/contrib/gdb/COPYING#2 integrate .. //depot/projects/ia64/contrib/gdb/COPYING.LIB#2 integrate .. //depot/projects/ia64/contrib/gdb/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/gdb/FREEBSD-Xlist#2 integrate .. //depot/projects/ia64/contrib/gdb/FREEBSD-deletelist#2 integrate .. //depot/projects/ia64/contrib/gdb/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/contrib/gdb/MAINTAINERS#2 integrate .. //depot/projects/ia64/contrib/gdb/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/gdb/README#2 integrate .. //depot/projects/ia64/contrib/gdb/config-ml.in#4 integrate .. //depot/projects/ia64/contrib/gdb/config.guess#4 integrate .. //depot/projects/ia64/contrib/gdb/config.if#3 integrate .. //depot/projects/ia64/contrib/gdb/config.sub#4 integrate .. //depot/projects/ia64/contrib/gdb/configure#4 integrate .. //depot/projects/ia64/contrib/gdb/configure.in#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/CONTRIBUTE#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/COPYING#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1990#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1991#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1992#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1993#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1994#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1995#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1996#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1997#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1998#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1999#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-2000#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-2001#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-3.x#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-96#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-97#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-98#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/MAINTAINERS#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/NEWS#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/PROBLEMS#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/README#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/TODO#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/acinclude.m4#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/aclocal.m4#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/alpha-tdep.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/alphabsd-nat.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/alphafbsd-tdep.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/annotate.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/annotate.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/arc-tdep.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/arch-utils.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/arch-utils.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/arm-linux-nat.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/arm-linux-tdep.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/arm-tdep.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/armnbsd-nat.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/armnbsd-tdep.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ax-gdb.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ax-gdb.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ax-general.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ax.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/bcache.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/bcache.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/blockframe.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/breakpoint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/breakpoint.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/buildsym.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/buildsym.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/c-exp.y#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/c-lang.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/c-lang.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/c-typeprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/c-valprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/call-cmds.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ch-exp.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ch-lang.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ch-lang.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ch-typeprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ch-valprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cli-out.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cli-out.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-cmds.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-cmds.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-decode.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-decode.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-script.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-script.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-setshow.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-setshow.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-utils.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cli/cli-utils.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/coffread.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/command.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/command.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/complaints.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/complaints.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/completer.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/completer.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config.in#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-linux.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-linux.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-osf1.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-osf1.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-osf2.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-osf3.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/fbsd.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/fbsd.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-fbsd.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-osf.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-osf2.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/nm-osf3.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/tm-alpha.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/tm-alphalinux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/tm-fbsd.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/xm-alphalinux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/alpha/xm-alphaosf.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/embed.mt#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/linux.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/linux.mt#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/nbsd.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/nbsd.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/nm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/nm-nbsd.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-arm.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-embed.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/tm-wince.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/wince.mt#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/xm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/arm/xm-nbsd.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/cygwin.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/cygwin.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/embed.mt#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/fbsd.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/fbsd.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/gdbserve.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/go32.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/go32.mt#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386aix.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386aix.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386aout.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386bsd.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386bsd.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386dgux.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386gnu.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386gnu.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386lynx.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386lynx.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386m3.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386m3.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386mach.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386mk.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386mk.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386nw.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386os9k.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386sco.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386sco4.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386sco5.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386sco5.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386sol2.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386sol2.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386v.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386v.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386v32.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386v4.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386v4.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386v42mp.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/i386v42mp.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/linux.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/linux.mt#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nbsd.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nbsd.mt#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nbsdelf.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nbsdelf.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/ncr3000.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/ncr3000.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-cygwin.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-fbsd.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-gnu.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-go32.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386aix.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386bsd.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386lynx.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386mach.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386sco.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386sco4.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386sco5.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386sol2.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386v.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386v4.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-i386v42mp.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-m3.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-nbsd.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-nbsdelf.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-obsd.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-ptx4.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-sun386.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-symmetry.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/nm-x86-64.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/obsd.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/obsd.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/ptx.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/ptx.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/ptx4.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/ptx4.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/sun386.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/sun386.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/symmetry.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/symmetry.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-cygwin.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-fbsd.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-go32.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386aix.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386bsd.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386gnu.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386lynx.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386m3.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386mk.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386nw.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386os9k.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386sco5.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386sol2.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386v.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386v4.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-i386v42mp.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-nbsd.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-nbsdelf.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-obsd.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-ptx.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-ptx4.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-sun386.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-symmetry.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-vxworks.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/vxworks.mt#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/x86-64linux.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/x86-64linux.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-cygwin.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-go32.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386aix.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386bsd.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386gnu.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386lynx.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386m3.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386mach.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386mk.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386sco.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386v.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386v32.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-i386v4.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-linux.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-nbsd.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-ptx.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-ptx4.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-sun386.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-symmetry.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/xm-windows.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/aix.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/aix.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/linux.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/linux.mt#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/nm-aix.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/nm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/tm-aix.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/tm-ia64.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/tm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/xm-aix.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/ia64/xm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/nm-linux.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/none/nm-none.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/none/none.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/none/none.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/none/tm-none.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/none/xm-none.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/aix.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/aix.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/gdbserve.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/linux.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/linux.mt#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nbsd.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nbsd.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nm-aix.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/nm-nbsd.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppc-eabi.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppc-sim.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppcle-eabi.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/ppcle-sim.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-nbsd.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-aix.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppc-sim.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/tm-vxworks.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/vxworks.mt#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-aix.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/powerpc/xm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/fbsd.mh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/fbsd.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/linux.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/linux.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsd.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsd.mt#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nbsdelf.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-fbsd.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-nbsd.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-nbsdelf.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sparclynx.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sun4os4.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/nm-sun4sol2.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64linux.mt#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64sim.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sp64sol2.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparc-em.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclet.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclite.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclynx.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sparclynx.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4os4.mh#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4os4.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4sol2.mh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/sun4sol2.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-fbsd.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-nbsd.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sp64.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sp64linux.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sp64sim.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparc.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclet.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclite.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sparclynx.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-spc-em.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sun4os4.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-sun4sol2.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/tm-vxsparc.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/vxsparc.mt#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-linux.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-nbsd.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/sparc/xm-sun4sol2.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/tm-linux.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/tm-vxworks.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/configure#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/configure.host#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/configure.in#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/configure.tgt#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/copying.awk#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/copying.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/core-aout.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/core-regset.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/corefile.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/corelow.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cp-abi.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cp-abi.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/cp-valprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/dbug-rom.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/dbxread.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/dcache.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/dcache.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/defs.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/demangle.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/dink32-rom.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/ChangeLog#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/GDBvn.texi#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/LRS#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/a4rc.sed#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/agentexpr.texi#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/all-cfg.texi#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/annotate.texi#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/configure#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/configure.in#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/fdl.texi#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/gdb.texinfo#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/gdbint.texinfo#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/gpl.texi#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/libgdb.texinfo#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/lpsrc.sed#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/psrc.sed#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/refcard.tex#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doc/stabs.texinfo#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doublest.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/doublest.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/dsrec.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/dst.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/dstread.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/dwarf2cfi.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/dwarf2cfi.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/dwarf2read.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/dwarfread.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/elfread.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/environ.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/environ.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/eval.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/event-loop.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/event-loop.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/event-top.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/event-top.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/exc_request.defs#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/exec.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/expprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/expression.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/f-exp.y#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/f-lang.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/f-lang.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/f-typeprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/f-valprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/findvar.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/fork-child.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/frame.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/frame.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gcore.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb-events.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb-events.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb-events.sh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb-stabs.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb.1#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb.gdb#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb_assert.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb_dirent.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb_indent.sh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb_proc_service.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb_regex.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb_stat.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb_string.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb_thread_db.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb_vfork.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdb_wait.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdba.el#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbarch.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbarch.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbarch.sh#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbcmd.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbcore.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbinit.in#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/README#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/acconfig.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/aclocal.m4#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/config.in#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/configure#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/configure.in#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/configure.srv#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/gdbreplay.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/gdbserver.1#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/i387-fp.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/i387-fp.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/linux-arm-low.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/linux-i386-low.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/linux-ia64-low.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/linux-low.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/linux-low.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/linux-x86-64-low.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/low-hppabsd.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/low-linux.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/low-lynx.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/low-nbsd.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/low-sim.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/low-sparc.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/low-sun3.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/regcache.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/regcache.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/remote-utils.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/server.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/server.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/terminal.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/utils.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbthread.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbtypes.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbtypes.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gnu-regex.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gnu-regex.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gnu-v2-abi.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gnu-v3-abi.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gregset.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/hp-psymtab-read.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/hp-symtab-read.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/hpacc-abi.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/hpread.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/hpux-thread.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i386-linux-nat.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i386-linux-tdep.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i386-nat.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i386-tdep.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i386-tdep.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i386b-nat.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i386bsd-nat.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i386bsd-tdep.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i386fbsd-nat.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i386nbsd-nat.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i386nbsd-tdep.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i387-nat.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i387-nat.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/i387-tdep.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ia64-aix-nat.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ia64-aix-tdep.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ia64-linux-nat.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ia64-linux-tdep.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ia64-tdep.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/inf-loop.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/inf-loop.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/infcmd.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/inferior.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/inflow.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/infptrace.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/infrun.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/inftarg.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/infttrace.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/jv-exp.tab.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/jv-exp.y#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/jv-lang.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/jv-lang.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/jv-typeprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/jv-valprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/kod-cisco.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/kod.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/kod.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/language.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/language.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/lin-lwp.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/linespec.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/linespec.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/linux-proc.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/m2-exp.y#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/m2-lang.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/m2-lang.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/m2-typeprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/m2-valprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/main.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/maint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mdebugread.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mem-break.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/memattr.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/memattr.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/gdbmi.texinfo#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-cmd-break.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-cmd-disas.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-cmd-stack.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-cmd-var.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-cmds.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-cmds.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-console.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-console.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-getopt.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-getopt.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-main.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-out.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-out.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-parse.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mi/mi-parse.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/minsyms.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/mipsread.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/msg.defs#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/msg_reply.defs#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/nlm/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/nlm/configure#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/nlm/configure.in#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/nlm/gdbserve.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/nlm/gdbserve.def#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/nlm/i386.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/nlm/i386.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/nlm/ppc.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/nlm/ppc.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/nlm/prelude.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/nlmread.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/notify.defs#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/objfiles.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/objfiles.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ocd.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ocd.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/p-exp.y#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/p-lang.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/p-lang.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/p-typeprint.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/p-valprint.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/parse.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/parser-defs.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/partial-stab.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ppc-bdm.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ppc-linux-nat.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ppc-linux-tdep.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ppc-tdep.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ppcnbsd-nat.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/printcmd.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/proc-api.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/proc-events.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/proc-flags.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/proc-service.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/proc-utils.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/proc-why.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/process_reply.defs#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/regcache.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/regcache.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/regformats/reg-arm.dat#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/regformats/reg-i386-linux.dat#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/regformats/reg-i386.dat#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/regformats/reg-ia64.dat#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/regformats/reg-ppc.dat#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/regformats/reg-x86-64.dat#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/regformats/regdat.sh#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/regformats/regdef.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/remote-rdi.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/remote-utils.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/remote-utils.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/remote.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/remote.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/reply_mig_hack.awk#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/saber.suppress#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/scm-exp.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/scm-lang.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/scm-lang.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/scm-tags.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/scm-valprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ser-pipe.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ser-tcp.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ser-unix.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ser-unix.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/serial.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/serial.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/signals.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/signals.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/signals/signals.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/sol-thread.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/solib-legacy.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/solib-osf.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/solib-sunos.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/solib-svr4.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/solib-svr4.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/solib.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/solib.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/solist.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/source.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/source.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/sparc-linux-nat.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/sparc-nat.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/sparc-stub.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/sparc-tdep.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/sparcl-stub.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/sparcl-tdep.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/sparclet-rom.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/sparclet-stub.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/stabsread.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/stabsread.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/stack.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/symfile.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/symfile.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/symmisc.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/symtab.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/symtab.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/target.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/target.h#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/terminal.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/thread-db.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/thread.c#3 integrate .. //depot/projects/ia64/contrib/gdb/gdb/top.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/top.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/tracepoint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/tracepoint.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/typeprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/typeprint.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ui-file.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ui-file.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ui-out.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/ui-out.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/utils.c#5 integrate .. //depot/projects/ia64/contrib/gdb/gdb/uw-thread.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/valarith.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/valops.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/valprint.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/valprint.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/value.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/values.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/varobj.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/varobj.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/version.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/version.in#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/wrapper.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/wrapper.h#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/x86-64-linux-nat.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/x86-64-linux-tdep.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/x86-64-tdep.c#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/x86-64-tdep.h#2 integrate .. //depot/projects/ia64/contrib/gdb/gdb/xcoffsolib.h#4 integrate .. //depot/projects/ia64/contrib/gdb/include/gdb/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/gdb/include/gdb/signals.h#2 integrate Differences ... ==== //depot/projects/ia64/contrib/gdb/COPYING#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/COPYING.LIB#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/ChangeLog#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/FREEBSD-Xlist#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/FREEBSD-deletelist#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/FREEBSD-upgrade#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/MAINTAINERS#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/Makefile.in#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/README#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/config-ml.in#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/config.guess#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/config.if#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/config.sub#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/configure#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/configure.in#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/CONTRIBUTE#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/COPYING#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1990#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1991#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1992#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1993#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1994#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1995#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1996#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1997#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1998#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-1999#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-2000#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-2001#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-3.x#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-96#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-97#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ChangeLog-98#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/MAINTAINERS#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/Makefile.in#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/NEWS#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/PROBLEMS#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/README#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/TODO#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/acinclude.m4#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/aclocal.m4#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/alpha-tdep.c#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/alphabsd-nat.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/alphafbsd-tdep.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/annotate.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/annotate.h#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/arc-tdep.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/arch-utils.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/arch-utils.h#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/arm-linux-nat.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/arm-linux-tdep.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/arm-tdep.h#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/armnbsd-nat.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/armnbsd-tdep.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ax-gdb.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ax-gdb.h#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ax-general.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ax.h#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/bcache.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/bcache.h#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/blockframe.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/breakpoint.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/breakpoint.h#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/buildsym.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/buildsym.h#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/c-exp.y#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/c-lang.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/c-lang.h#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/c-typeprint.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/c-valprint.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/call-cmds.h#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ch-exp.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ch-lang.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ch-lang.h#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ch-typeprint.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/ch-valprint.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/cli-out.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/cli-out.h#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/cli/cli-cmds.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/cli/cli-cmds.h#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/cli/cli-decode.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/cli/cli-decode.h#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/cli/cli-script.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/cli/cli-script.h#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/cli/cli-setshow.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/cli/cli-setshow.h#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/cli/cli-utils.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/cli/cli-utils.h#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/coffread.c#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/command.c#3 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/command.h#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/complaints.c#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/complaints.h#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/completer.c#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/completer.h#2 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config.in#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-linux.mh#4 (text+ko) ==== ==== //depot/projects/ia64/contrib/gdb/gdb/config/alpha/alpha-linux.mt#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 23:43:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A2F737B401; Fri, 28 Jun 2002 23:42:14 -0700 (PDT) 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 F12A937B400 for ; Fri, 28 Jun 2002 23:42:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27D6B43E06 for ; Fri, 28 Jun 2002 23:42:12 -0700 (PDT) (envelope-from benno@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T6gCJU016040 for ; Fri, 28 Jun 2002 23:42:12 -0700 (PDT) (envelope-from benno@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T6dcE5015518 for perforce@freebsd.org; Fri, 28 Jun 2002 23:39:38 -0700 (PDT) Date: Fri, 28 Jun 2002 23:39:38 -0700 (PDT) Message-Id: <200206290639.g5T6dcE5015518@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to benno@freebsd.org using -f From: Benno Rice Subject: PERFORCE change 13573 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13573 Change 13573 by benno@benno_ratchet on 2002/06/28 23:38:24 Bring this branch up to date. (ie, IFC) Affected files ... .. //depot/projects/powerpc/sys/Makefile#2 integrate .. //depot/projects/powerpc/sys/alpha/Makefile#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/alpha-gdbstub.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/api_up1000.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/atomic.s#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/autoconf.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/busdma_machdep.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/busspace.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/clock_if.m#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/cpuconf.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/critical.c#1 branch .. //depot/projects/powerpc/sys/alpha/alpha/db_disasm.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/db_instruction.h#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/db_interface.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/db_trace.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dec_1000a.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dec_2100_a50.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dec_2100_a500.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dec_3000_300.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dec_3000_500.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dec_axppci_33.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dec_eb164.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dec_eb64plus.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dec_kn20aa.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dec_kn300.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dec_kn8ae.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dec_st550.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dec_st6600.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/divrem.m4#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/powerpc/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/exception.s#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/fp_emulate.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/genassym.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/ieee_float.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/ieee_float.h#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/in_cksum.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/interrupt.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/locore.s#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/machdep.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/mem.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/mp_machdep.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/pal.s#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/pmap.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/prom.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/prom_disp.s#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/promcons.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/setdef0.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/setdef1.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/support.s#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/swtch.s#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/sys_machdep.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/timerreg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/alpha/trap.c#3 integrate .. //depot/projects/powerpc/sys/alpha/alpha/vm_machdep.c#3 integrate .. //depot/projects/powerpc/sys/alpha/compile/.cvsignore#2 integrate .. //depot/projects/powerpc/sys/alpha/conf/GENERIC#3 integrate .. //depot/projects/powerpc/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/powerpc/sys/alpha/conf/SIMOS#3 integrate .. //depot/projects/powerpc/sys/alpha/conf/gethints.pl#2 integrate .. //depot/projects/powerpc/sys/alpha/include/_inttypes.h#1 branch .. //depot/projects/powerpc/sys/alpha/include/alpha_cpu.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/ansi.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/asm.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/atomic.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/bootinfo.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/bus.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/bus_memio.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/bus_pio.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/bwx.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/chipset.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/clock.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/clockvar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/cpu.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/cpuconf.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/cpufunc.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/critical.h#1 branch .. //depot/projects/powerpc/sys/alpha/include/db_machdep.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/elf.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/endian.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/exec.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/float.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/floatingpoint.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/fpu.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/frame.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/ieee.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/ieeefp.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/in_cksum.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/inst.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/intr.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/intrcnt.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/ioctl_bt848.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/ioctl_meteor.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/limits.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/md_var.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/mutex.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/pal.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/param.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/pc/bios.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/pc/display.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/pc/msdos.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/pc/vesa.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/pcb.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/pcpu.h#1 branch .. //depot/projects/powerpc/sys/alpha/include/pmap.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/proc.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/profile.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/prom.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/psl.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/pte.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/ptrace.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/reg.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/reloc.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/resource.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/rpb.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/runq.h#1 branch .. //depot/projects/powerpc/sys/alpha/include/setjmp.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/sgmap.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/sigframe.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/signal.h#3 integrate .. //depot/projects/powerpc/sys/alpha/include/smp.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/stdarg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/swiz.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/sysarch.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/types.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/ucontext.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/varargs.h#2 integrate .. //depot/projects/powerpc/sys/alpha/include/vmparam.h#3 integrate .. //depot/projects/powerpc/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/powerpc/sys/alpha/isa/isa_dma.c#2 integrate .. //depot/projects/powerpc/sys/alpha/isa/isavar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/isa/mcclock_isa.c#2 integrate .. //depot/projects/powerpc/sys/alpha/linux/Makefile#2 integrate .. //depot/projects/powerpc/sys/alpha/linux/linux.h#3 integrate .. //depot/projects/powerpc/sys/alpha/linux/linux_dummy.c#3 integrate .. //depot/projects/powerpc/sys/alpha/linux/linux_genassym.c#3 integrate .. //depot/projects/powerpc/sys/alpha/linux/linux_locore.s#2 integrate .. //depot/projects/powerpc/sys/alpha/linux/linux_machdep.c#3 integrate .. //depot/projects/powerpc/sys/alpha/linux/linux_proto.h#3 integrate .. //depot/projects/powerpc/sys/alpha/linux/linux_syscall.h#3 integrate .. //depot/projects/powerpc/sys/alpha/linux/linux_sysent.c#3 integrate .. //depot/projects/powerpc/sys/alpha/linux/linux_sysvec.c#3 integrate .. //depot/projects/powerpc/sys/alpha/linux/syscalls.conf#2 integrate .. //depot/projects/powerpc/sys/alpha/linux/syscalls.master#3 integrate .. //depot/projects/powerpc/sys/alpha/mcbus/mcbus.c#2 integrate .. //depot/projects/powerpc/sys/alpha/mcbus/mcbusreg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/mcbus/mcbusvar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/mcbus/mcmem.c#2 integrate .. //depot/projects/powerpc/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/powerpc/sys/alpha/mcbus/mcpciareg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/mcbus/mcpciavar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/osf1/Makefile#2 integrate .. //depot/projects/powerpc/sys/alpha/osf1/README.mach-traps#2 integrate .. //depot/projects/powerpc/sys/alpha/osf1/exec_ecoff.h#2 integrate .. //depot/projects/powerpc/sys/alpha/osf1/imgact_osf1.c#3 integrate .. //depot/projects/powerpc/sys/alpha/osf1/osf1.h#2 integrate .. //depot/projects/powerpc/sys/alpha/osf1/osf1_ioctl.c#3 integrate .. //depot/projects/powerpc/sys/alpha/osf1/osf1_misc.c#3 integrate .. //depot/projects/powerpc/sys/alpha/osf1/osf1_mount.c#3 integrate .. //depot/projects/powerpc/sys/alpha/osf1/osf1_proto.h#3 integrate .. //depot/projects/powerpc/sys/alpha/osf1/osf1_signal.c#3 integrate .. //depot/projects/powerpc/sys/alpha/osf1/osf1_signal.h#2 integrate .. //depot/projects/powerpc/sys/alpha/osf1/osf1_syscall.h#3 integrate .. //depot/projects/powerpc/sys/alpha/osf1/osf1_sysent.c#3 integrate .. //depot/projects/powerpc/sys/alpha/osf1/osf1_sysvec.c#2 integrate .. //depot/projects/powerpc/sys/alpha/osf1/osf1_util.h#3 integrate .. //depot/projects/powerpc/sys/alpha/osf1/syscalls.conf#2 integrate .. //depot/projects/powerpc/sys/alpha/osf1/syscalls.master#3 integrate .. //depot/projects/powerpc/sys/alpha/pci/alphapci_if.m#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/apecs.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/apecs_pci.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/apecsreg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/apecsvar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/bwx.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/cia_pci.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/ciareg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/ciavar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/irongate.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/irongate_pci.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/irongatereg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/irongatevar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/lca.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/lca_pci.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/lcareg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/lcavar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/pci_eb164_intr.s#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/pci_eb64plus_intr.s#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/pcibus.h#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/swiz.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/t2_pci.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/t2reg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/t2var.h#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/tsunamireg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/pci/tsunamivar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/am7990.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/am7990reg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/am7990var.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/ascvar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/esp.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/espreg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/espvar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/if_le_dec.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/if_le_ioasic.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/if_levar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/ioasic.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/ioasicreg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/ioasicvar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/mcclock_ioasic.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/sticreg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/sticvar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/tc.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/tcasic.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/tcdevs.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/tcdevs_data.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/tcds.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/tcds_dma.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/tcdsreg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/tcdsvar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/tcreg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tc/tcvar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/dwlpxreg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/dwlpxvar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/gbus.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/gbusreg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/gbusvar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/kftxx.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/kftxxreg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/kftxxvar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/mcclock_tlsb.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/tlsb.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/tlsbcpu.c#3 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/tlsbmem.c#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/tlsbreg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/tlsbvar.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/zs_tlsb.c#3 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/zsreg.h#2 integrate .. //depot/projects/powerpc/sys/alpha/tlsb/zsvar.h#2 integrate .. //depot/projects/powerpc/sys/arm/compile/.cvsignore#2 integrate .. //depot/projects/powerpc/sys/arm/include/ansi.h#3 integrate .. //depot/projects/powerpc/sys/arm/include/elf.h#3 integrate .. //depot/projects/powerpc/sys/arm/include/endian.h#2 integrate .. //depot/projects/powerpc/sys/arm/include/exec.h#2 integrate .. //depot/projects/powerpc/sys/arm/include/limits.h#1 branch .. //depot/projects/powerpc/sys/arm/include/param.h#2 integrate .. //depot/projects/powerpc/sys/arm/include/signal.h#1 branch .. //depot/projects/powerpc/sys/arm/include/types.h#1 branch .. //depot/projects/powerpc/sys/arm/include/ucontext.h#1 branch .. //depot/projects/powerpc/sys/boot/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/README#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/Makefile.inc#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/boot1/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/boot1/boot1.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/cdboot/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/cdboot/version#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/common/Makefile.common#3 integrate .. //depot/projects/powerpc/sys/boot/alpha/common/conf.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/common/help.alpha#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/common/main.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/OSFpal.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/alpha_copy.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/alpha_module.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/bbinfo.h#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/bootinfo.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/common.h#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/delay.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/devicename.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/getsecs.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/libalpha.h#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/pal.S#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/prom.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/prom_disp.S#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/prom_swpal.S#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/reboot.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/srmdisk.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/srmnet.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/start.S#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/libalpha/time.c#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/loader/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/loader/version#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/netboot/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/alpha/netboot/version#2 integrate .. //depot/projects/powerpc/sys/boot/arc/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/arc/Makefile.inc#2 integrate .. //depot/projects/powerpc/sys/boot/arc/include/arcfuncs.h#2 integrate .. //depot/projects/powerpc/sys/boot/arc/include/arctypes.h#2 integrate .. //depot/projects/powerpc/sys/boot/arc/include/libarc.h#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/abort.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/arcconsole.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/arcdisk.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/arch/alpha/copy.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/arch/alpha/rpb.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/arch/alpha/setjmp.S#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/arch/alpha/start.S#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/bootinfo.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/delay.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/devicename.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/elf_freebsd.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/module.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/prom.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/setjmperr.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/lib/time.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/loader/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/arc/loader/conf.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/loader/help.alpha#2 integrate .. //depot/projects/powerpc/sys/boot/arc/loader/main.c#2 integrate .. //depot/projects/powerpc/sys/boot/arc/loader/version#2 integrate .. //depot/projects/powerpc/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/powerpc/sys/boot/common/bcache.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/boot.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/powerpc/sys/boot/common/commands.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/console.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/dev_net.h#2 integrate .. //depot/projects/powerpc/sys/boot/common/devopen.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/help.common#2 integrate .. //depot/projects/powerpc/sys/boot/common/interp.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/interp_backslash.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/interp_forth.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/interp_parse.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/isapnp.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/isapnp.h#2 integrate .. //depot/projects/powerpc/sys/boot/common/load.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/load_aout.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/loader.8#3 integrate .. //depot/projects/powerpc/sys/boot/common/ls.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/merge_help.awk#2 integrate .. //depot/projects/powerpc/sys/boot/common/misc.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/module.c#3 integrate .. //depot/projects/powerpc/sys/boot/common/newvers.sh#2 integrate .. //depot/projects/powerpc/sys/boot/common/panic.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/pnp.c#2 integrate .. //depot/projects/powerpc/sys/boot/common/pnpdata#2 integrate .. //depot/projects/powerpc/sys/boot/common/ufsread.c#1 branch .. //depot/projects/powerpc/sys/boot/efi/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/efi/Makefile.inc#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/README#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efi.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efi_nii.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efiapi.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/eficon.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efidebug.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efidef.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efidevp.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efierr.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/powerpc/sys/boot/efi/include/efifs.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efilib.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efinet.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efipart.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efiprot.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efipxebc.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efiser.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/efistdarg.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/i386/efibind.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/i386/pe.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/ia64/efibind.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/include/ia64/pe.h#2 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#3 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/arch/ia64/start.S#2 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/copy.c#3 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/delay.c#2 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/devicename.c#3 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/efi_console.c#2 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/efiboot.h#3 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/efifpswa.c#1 branch .. //depot/projects/powerpc/sys/boot/efi/libefi/efifs.c#2 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/elf_freebsd.c#3 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/exit.c#2 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/libefi.c#2 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/module.c#2 integrate .. //depot/projects/powerpc/sys/boot/efi/libefi/time.c#3 integrate .. //depot/projects/powerpc/sys/boot/efi/loader/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/efi/loader/conf.c#3 integrate .. //depot/projects/powerpc/sys/boot/efi/loader/main.c#3 integrate .. //depot/projects/powerpc/sys/boot/efi/loader/version#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/alpha/sysdep.c#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/alpha/sysdep.h#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/dict.c#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/ficl.c#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/powerpc/sys/boot/ficl/float.c#1 branch .. //depot/projects/powerpc/sys/boot/ficl/i386/sysdep.c#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/i386/sysdep.h#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/ia64/sysdep.c#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/ia64/sysdep.h#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/loader.c#3 integrate .. //depot/projects/powerpc/sys/boot/ficl/math64.c#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/math64.h#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/prefix.c#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/search.c#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/softwords/classes.fr#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/powerpc/sys/boot/ficl/softwords/ficllocal.fr#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/powerpc/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/powerpc/sys/boot/ficl/softwords/freebsd.fr#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/softwords/ifbrack.fr#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/softwords/jhlocal.fr#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/softwords/marker.fr#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/softwords/softcore.awk#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/softwords/softcore.fr#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/softwords/string.fr#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/powerpc/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/powerpc/sys/boot/ficl/stack.c#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/testmain.c#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/tools.c#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/unix.c#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/vm.c#2 integrate .. //depot/projects/powerpc/sys/boot/ficl/words.c#3 integrate .. //depot/projects/powerpc/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/powerpc/sys/boot/forth/loader.4th.8#2 integrate .. //depot/projects/powerpc/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/powerpc/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/powerpc/sys/boot/forth/loader.rc#2 integrate .. //depot/projects/powerpc/sys/boot/forth/pnp.4th#2 integrate .. //depot/projects/powerpc/sys/boot/forth/support.4th#2 integrate .. //depot/projects/powerpc/sys/boot/i386/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/i386/Makefile.inc#2 integrate .. //depot/projects/powerpc/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/i386/boot0/boot0.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/i386/boot2/boot1.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/boot2/lib.h#2 integrate .. //depot/projects/powerpc/sys/boot/i386/boot2/sio.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/btx/btx.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/btxldr/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/btxldr/btxldr.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/lib/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/lib/btxcsu.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/lib/btxsys.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/lib/btxv86.h#2 integrate .. //depot/projects/powerpc/sys/boot/i386/btx/lib/btxv86.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/powerpc/sys/boot/i386/kgzldr/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/i386/kgzldr/boot.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/kgzldr/crt.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/kgzldr/kgzldr.h#2 integrate .. //depot/projects/powerpc/sys/boot/i386/kgzldr/kgzldr.m4#2 integrate .. //depot/projects/powerpc/sys/boot/i386/kgzldr/lib.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/kgzldr/sio.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/kgzldr/start.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/aout_freebsd.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/powerpc/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/comconsole.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/elf_freebsd.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/gatea20.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/i386_module.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/nullconsole.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/pread.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/pxe.h#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/pxetramp.s#3 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/time.c#2 integrate .. //depot/projects/powerpc/sys/boot/i386/libi386/vidconsole.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/liloldr/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/i386/liloldr/lilobsect.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/liloldr/liloldr.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/loader/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/i386/loader/conf.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/loader/help.i386#3 integrate .. //depot/projects/powerpc/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/powerpc/sys/boot/i386/loader/version#2 integrate .. //depot/projects/powerpc/sys/boot/i386/mbr/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/i386/mbr/mbr.s#2 integrate .. //depot/projects/powerpc/sys/boot/i386/pxeldr/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/powerpc/sys/boot/i386/pxeldr/pxeldr.s#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/powerpc/sys/boot/ia64/libski/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/libski/bootinfo.c#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/libski/copy.c#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/libski/delay.c#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/libski/devicename.c#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/libski/elf_freebsd.c#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/libski/exit.c#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/libski/libski.h#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/libski/module.c#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/libski/skiconsole.c#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/libski/skifs.c#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/libski/ssc.c#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/libski/time.c#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/skiload/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/skiload/conf.c#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/skiload/ldscript.ia64#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/skiload/main.c#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/skiload/skiload.cmd#2 integrate .. //depot/projects/powerpc/sys/boot/ia64/skiload/version#2 integrate .. //depot/projects/powerpc/sys/boot/ofw/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/ofw/common/Makefile.inc#2 integrate .. //depot/projects/powerpc/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/devicename.c#2 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/elf_freebsd.c#2 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/libofw.h#3 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/ofw_console.c#2 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/ofw_copy.c#3 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/ofw_devsearch.c#2 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/ofw_module.c#2 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/ofw_net.c#3 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/ofw_reboot.c#2 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/ofw_time.c#3 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/openfirm.c#3 integrate .. //depot/projects/powerpc/sys/boot/ofw/libofw/openfirm.h#3 integrate .. //depot/projects/powerpc/sys/boot/pc98/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/boot.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/boot0.5.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/disk.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/selector.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/support.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0.5/syscons.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot0/boot0.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/README.serial.98#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/asm.S#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/asm.h#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/bios.S#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/boot.h#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/boot2.S#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/disk.c#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/io.c#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/probe_keyboard.c#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/serial.S#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/serial_16550.S#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/serial_8251.S#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/start.S#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/boot2/table.c#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/btx/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/btx/btx/btx.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/btx/btxldr/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/btx/btxldr/btxldr.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/btx/lib/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/btx/lib/btxsys.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/btx/lib/btxv86.h#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/btx/lib/btxv86.s#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/powerpc/sys/boot/pc98/libpc98/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/libpc98/comconsole.c#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/libpc98/gatea20.c#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/libpc98/time.c#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/libpc98/vidconsole.c#2 integrate .. //depot/projects/powerpc/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/pc98/loader/main.c#3 integrate .. //depot/projects/powerpc/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/powerpc/sys/boot/powerpc/loader/Makefile#3 integrate .. //depot/projects/powerpc/sys/boot/powerpc/loader/conf.c#3 integrate .. //depot/projects/powerpc/sys/boot/powerpc/loader/help.ofw#2 integrate .. //depot/projects/powerpc/sys/boot/powerpc/loader/start.c#3 integrate .. //depot/projects/powerpc/sys/boot/powerpc/loader/version#2 integrate .. //depot/projects/powerpc/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/sparc64/boot1/_start.S#1 branch .. //depot/projects/powerpc/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/powerpc/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/powerpc/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/powerpc/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/powerpc/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/powerpc/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/powerpc/sys/cam/cam.c#2 integrate .. //depot/projects/powerpc/sys/cam/cam.h#2 integrate .. //depot/projects/powerpc/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/powerpc/sys/cam/cam_debug.h#2 integrate .. //depot/projects/powerpc/sys/cam/cam_extend.c#2 integrate .. //depot/projects/powerpc/sys/cam/cam_extend.h#2 integrate .. //depot/projects/powerpc/sys/cam/cam_periph.c#2 integrate .. //depot/projects/powerpc/sys/cam/cam_periph.h#2 integrate .. //depot/projects/powerpc/sys/cam/cam_queue.c#2 integrate .. //depot/projects/powerpc/sys/cam/cam_queue.h#2 integrate .. //depot/projects/powerpc/sys/cam/cam_sim.c#2 integrate .. //depot/projects/powerpc/sys/cam/cam_sim.h#2 integrate .. //depot/projects/powerpc/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/powerpc/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/powerpc/sys/cam/cam_xpt_periph.h#2 integrate .. //depot/projects/powerpc/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_cd.h#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_ch.h#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_da.h#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_dvcfg.h#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/powerpc/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_low_pisa.c#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_low_pisa.h#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_message.h#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_pass.h#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_pt.h#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_sa.h#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_ses.h#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/powerpc/sys/cam/scsi/scsi_targetio.h#2 integrate .. //depot/projects/powerpc/sys/coda/00READ#2 integrate .. //depot/projects/powerpc/sys/coda/README#2 integrate .. //depot/projects/powerpc/sys/coda/TODO#2 integrate .. //depot/projects/powerpc/sys/coda/cnode.h#2 integrate .. //depot/projects/powerpc/sys/coda/coda.h#2 integrate .. //depot/projects/powerpc/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/powerpc/sys/coda/coda_io.h#2 integrate .. //depot/projects/powerpc/sys/coda/coda_kernel.h#2 integrate .. //depot/projects/powerpc/sys/coda/coda_namecache.c#3 integrate .. //depot/projects/powerpc/sys/coda/coda_namecache.h#2 integrate .. //depot/projects/powerpc/sys/coda/coda_opstats.h#2 integrate .. //depot/projects/powerpc/sys/coda/coda_pioctl.h#2 integrate .. //depot/projects/powerpc/sys/coda/coda_psdev.c#3 integrate .. //depot/projects/powerpc/sys/coda/coda_psdev.h#3 integrate .. //depot/projects/powerpc/sys/coda/coda_subr.c#3 integrate .. //depot/projects/powerpc/sys/coda/coda_subr.h#2 integrate .. //depot/projects/powerpc/sys/coda/coda_venus.c#2 integrate .. //depot/projects/powerpc/sys/coda/coda_venus.h#2 integrate .. //depot/projects/powerpc/sys/coda/coda_vfsops.c#3 integrate .. //depot/projects/powerpc/sys/coda/coda_vfsops.h#3 integrate .. //depot/projects/powerpc/sys/coda/coda_vnops.c#3 integrate .. //depot/projects/powerpc/sys/coda/coda_vnops.h#3 integrate .. //depot/projects/powerpc/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_getcwd.c#2 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_ipc.h#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_signal.h#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_socket.h#2 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_sysctl.c#2 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_uid16.c#2 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/powerpc/sys/compat/linux/linux_util.h#3 integrate .. //depot/projects/powerpc/sys/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/powerpc/sys/compat/pecoff/imgact_pecoff.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/Makefile#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_acl.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_dirent.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_errno.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_exec.h#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_fcntl.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_filio.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_filio.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_fuser.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_hrt.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_ioctl.h#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_ipc.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_mman.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_resource.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_resource.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_siginfo.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_signal.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_signal.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_socket.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_socket.h#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_sockio.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_sockmod.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_stat.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_statvfs.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_systeminfo.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_termios.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_termios.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_time.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_timod.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_ttold.c#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_ttold.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_types.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_ucontext.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_ulimit.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_ustat.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_util.h#3 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_utsname.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/svr4_wait.h#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/powerpc/sys/compat/svr4/syscalls.master#3 integrate .. //depot/projects/powerpc/sys/conf/Makefile.alpha#3 integrate .. //depot/projects/powerpc/sys/conf/Makefile.i386#3 integrate .. //depot/projects/powerpc/sys/conf/Makefile.ia64#3 integrate .. //depot/projects/powerpc/sys/conf/Makefile.pc98#3 integrate .. //depot/projects/powerpc/sys/conf/Makefile.powerpc#3 integrate .. //depot/projects/powerpc/sys/conf/Makefile.sparc64#3 integrate .. //depot/projects/powerpc/sys/conf/NOTES#1 branch .. //depot/projects/powerpc/sys/conf/defines#2 integrate .. //depot/projects/powerpc/sys/conf/files#3 integrate .. //depot/projects/powerpc/sys/conf/files.alpha#3 integrate .. //depot/projects/powerpc/sys/conf/files.i386#3 integrate .. //depot/projects/powerpc/sys/conf/files.ia64#3 integrate .. //depot/projects/powerpc/sys/conf/files.pc98#3 integrate .. //depot/projects/powerpc/sys/conf/files.powerpc#2 integrate .. //depot/projects/powerpc/sys/conf/files.sparc64#3 integrate .. //depot/projects/powerpc/sys/conf/kern.post.mk#1 branch .. //depot/projects/powerpc/sys/conf/kern.pre.mk#1 branch .. //depot/projects/powerpc/sys/conf/kmod.mk#3 integrate .. //depot/projects/powerpc/sys/conf/kmod_syms.awk#1 branch .. //depot/projects/powerpc/sys/conf/ldscript.alpha#3 integrate .. //depot/projects/powerpc/sys/conf/ldscript.i386#3 integrate .. //depot/projects/powerpc/sys/conf/ldscript.ia64#2 integrate .. //depot/projects/powerpc/sys/conf/ldscript.powerpc#3 integrate .. //depot/projects/powerpc/sys/conf/ldscript.sparc64#3 integrate .. //depot/projects/powerpc/sys/conf/majors#3 integrate .. //depot/projects/powerpc/sys/conf/newvers.sh#2 integrate .. //depot/projects/powerpc/sys/conf/options#3 integrate .. //depot/projects/powerpc/sys/conf/options.alpha#3 integrate .. //depot/projects/powerpc/sys/conf/options.i386#3 integrate .. //depot/projects/powerpc/sys/conf/options.ia64#3 integrate .. //depot/projects/powerpc/sys/conf/options.pc98#3 integrate .. //depot/projects/powerpc/sys/conf/options.powerpc#2 integrate .. //depot/projects/powerpc/sys/conf/options.sparc64#2 integrate .. //depot/projects/powerpc/sys/conf/systags.sh#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acconfig.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acdebug.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acdispat.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acdos16.h#1 branch .. //depot/projects/powerpc/sys/contrib/dev/acpica/acefi.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acenv.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acevents.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acexcep.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acgcc.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acglobal.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/achware.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acinterp.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/aclocal.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acmacros.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acnamesp.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acobject.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acoutput.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acparser.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acpi.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acpica_prep.sh#1 branch .. //depot/projects/powerpc/sys/contrib/dev/acpica/acpiosxf.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acpixf.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acresrc.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acstruct.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/actables.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/actbl.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/actbl1.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/actbl2.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/actbl71.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/actypes.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/acutils.h#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/amlcode.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dbcmds.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dbdisasm.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dbdisply.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dbexec.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dbfileio.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dbhistry.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dbinput.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dbstats.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dbutils.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dbxface.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dsfield.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dsmethod.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dsmthdat.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dsobject.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dsopcode.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dsutils.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dswexec.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dswload.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dswscope.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/dswstate.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/evevent.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/evmisc.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/evregion.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/evrgnini.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/evsci.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/evxface.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/evxfevnt.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/evxfregn.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exconfig.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exconvrt.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/excreate.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exdump.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exfield.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exfldio.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exmisc.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exmutex.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exnames.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exoparg1.c#1 branch .. //depot/projects/powerpc/sys/contrib/dev/acpica/exoparg2.c#1 branch .. //depot/projects/powerpc/sys/contrib/dev/acpica/exoparg3.c#1 branch .. //depot/projects/powerpc/sys/contrib/dev/acpica/exoparg6.c#1 branch .. //depot/projects/powerpc/sys/contrib/dev/acpica/exprep.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exregion.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exresnte.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exresolv.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exresop.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exstore.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exstoren.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exstorob.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exsystem.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/exutils.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/hwacpi.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/hwgpe.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/hwregs.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/hwsleep.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/hwtimer.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/nsaccess.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/nsalloc.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/nsdump.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/nseval.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/nsinit.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/nsload.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/nsnames.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/nsobject.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/nssearch.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/nsutils.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/nswalk.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/nsxfname.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/nsxfobj.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/psargs.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/psfind.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/psopcode.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/psparse.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/psscope.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/pstree.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/psutils.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/pswalk.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/psxface.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/rsaddr.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/rscalc.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/rscreate.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/rsdump.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/rsio.c#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/rsirq.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/rslist.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/rsmemory.c#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/rsmisc.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/rsutils.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/rsxface.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/tbconvrt.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/tbget.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/tbinstal.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/tbutils.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/tbxface.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/tbxfroot.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/utalloc.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/utclib.c#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/utcopy.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/utdebug.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/utdelete.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/uteval.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/utglobal.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/utinit.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/utmath.c#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/utobject.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/acpica/utxface.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/fla/COPYRIGHT#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/fla/README#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/fla/fla.c#3 integrate .. //depot/projects/powerpc/sys/contrib/dev/fla/i386/msysosak.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/fla/msysosak.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/fla/patch.00#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/fla/prep.fla.sh#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/oltr/COPYRIGHT#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/oltr/i386-elf.trlld.o.uu#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/oltr/trlld.h#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/oltr/trlldbm.c#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/oltr/trlldhm.c#2 integrate .. //depot/projects/powerpc/sys/contrib/dev/oltr/trlldmac.c#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_fil.c#3 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#1 branch .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#1 branch .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/powerpc/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/powerpc/sys/crypto/blowfish/arch/i386/bf_enc.S#1 branch .. //depot/projects/powerpc/sys/crypto/blowfish/arch/i386/bf_enc_586.S#1 branch .. //depot/projects/powerpc/sys/crypto/blowfish/arch/i386/bf_enc_686.S#1 branch .. //depot/projects/powerpc/sys/crypto/blowfish/bf_enc.c#2 integrate .. //depot/projects/powerpc/sys/crypto/blowfish/bf_locl.h#2 integrate .. //depot/projects/powerpc/sys/crypto/blowfish/bf_pi.h#2 integrate .. //depot/projects/powerpc/sys/crypto/blowfish/bf_skey.c#2 integrate .. //depot/projects/powerpc/sys/crypto/blowfish/blowfish.h#2 integrate .. //depot/projects/powerpc/sys/crypto/cast128/cast128.c#2 integrate .. //depot/projects/powerpc/sys/crypto/cast128/cast128.h#2 integrate .. //depot/projects/powerpc/sys/crypto/cast128/cast128_subkey.h#2 integrate .. //depot/projects/powerpc/sys/crypto/des/arch/i386/des_enc.S#1 branch .. //depot/projects/powerpc/sys/crypto/des/des.h#2 integrate .. //depot/projects/powerpc/sys/crypto/des/des_ecb.c#2 integrate .. //depot/projects/powerpc/sys/crypto/des/des_enc.c#1 branch .. //depot/projects/powerpc/sys/crypto/des/des_locl.h#2 integrate .. //depot/projects/powerpc/sys/crypto/des/des_setkey.c#2 integrate .. //depot/projects/powerpc/sys/crypto/des/podd.h#2 integrate .. //depot/projects/powerpc/sys/crypto/des/sk.h#2 integrate .. //depot/projects/powerpc/sys/crypto/des/spr.h#2 integrate .. //depot/projects/powerpc/sys/crypto/md5.c#2 integrate .. //depot/projects/powerpc/sys/crypto/md5.h#2 integrate .. //depot/projects/powerpc/sys/crypto/rc4/rc4.c#2 integrate .. //depot/projects/powerpc/sys/crypto/rc4/rc4.h#2 integrate .. //depot/projects/powerpc/sys/crypto/rijndael/boxes-fst.dat#2 integrate .. //depot/projects/powerpc/sys/crypto/rijndael/rijndael-alg-fst.c#2 integrate .. //depot/projects/powerpc/sys/crypto/rijndael/rijndael-alg-fst.h#2 integrate .. //depot/projects/powerpc/sys/crypto/rijndael/rijndael-api-fst.c#2 integrate .. //depot/projects/powerpc/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate .. //depot/projects/powerpc/sys/crypto/rijndael/rijndael.h#2 integrate .. //depot/projects/powerpc/sys/crypto/rijndael/rijndael_local.h#2 integrate .. //depot/projects/powerpc/sys/crypto/sha1.c#2 integrate .. //depot/projects/powerpc/sys/crypto/sha1.h#2 integrate .. //depot/projects/powerpc/sys/crypto/sha2/sha2.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jun 28 23:55:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4830937B405; Fri, 28 Jun 2002 23:55:30 -0700 (PDT) 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 9E24637B400 for ; Fri, 28 Jun 2002 23:55:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E29043E1A for ; Fri, 28 Jun 2002 23:55:29 -0700 (PDT) (envelope-from jake@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T6tTJU017061 for ; Fri, 28 Jun 2002 23:55:29 -0700 (PDT) (envelope-from jake@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T6tSHY017057 for perforce@freebsd.org; Fri, 28 Jun 2002 23:55:28 -0700 (PDT) Date: Fri, 28 Jun 2002 23:55:28 -0700 (PDT) Message-Id: <200206290655.g5T6tSHY017057@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f From: Jake Burkholder Subject: PERFORCE change 13575 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13575 Change 13575 by jake@jake_k7 on 2002/06/28 23:55:01 Integ. Affected files ... .. //depot/projects/kse/sys/sparc64/sparc64/pmap.c#32 integrate Differences ... ==== //depot/projects/kse/sys/sparc64/sparc64/pmap.c#32 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.62 2002/06/25 15:13:07 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.63 2002/06/29 06:37:24 jake Exp $ */ /* @@ -1200,7 +1200,8 @@ KASSERT(pmap_resident_count(pm) == 0, ("pmap_release: resident pages %ld != 0", pmap_resident_count(pm))); - TAILQ_FOREACH(m, &obj->memq, listq) { + while (!TAILQ_EMPTY(&obj->memq)) { + m = TAILQ_FIRST(&obj->memq); if (vm_page_sleep_busy(m, FALSE, "pmaprl")) continue; vm_page_busy(m); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 0:20:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6076937B400; Sat, 29 Jun 2002 00:20:16 -0700 (PDT) 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 E8B3A37B401; Sat, 29 Jun 2002 00:20:15 -0700 (PDT) Received: from sccrmhc02.attbi.com (sccrmhc02.attbi.com [204.127.202.62]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40E0D43E09; Sat, 29 Jun 2002 00:20:15 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc02.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020629072014.JOGV6023.sccrmhc02.attbi.com@InterJet.elischer.org>; Sat, 29 Jun 2002 07:20:14 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id AAA78125; Sat, 29 Jun 2002 00:10:15 -0700 (PDT) Date: Sat, 29 Jun 2002 00:10:14 -0700 (PDT) From: Julian Elischer To: Jake Burkholder Cc: Perforce Change Reviews Subject: Re: PERFORCE change 13575 for review In-Reply-To: <200206290655.g5T6tSHY017057@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG jake, could thi s be the reason that david couldn;t get the sparc64 KSE kernel to boot? Mounting root from ufs:/dev/ad0a WARNING: / was not properly dismounted panic: trap: memory address not aligned cpuid = 0; Debugger("panic") Stopped at Debugger+0x1c: ta %xcc, 1 db> tr panic() at panic+0xf4 trap() at trap+0x4e8 -- memory address not aligned sfar=0xa1 sfsr=0x40029 %o7=0xc01efce4 -- vm_page_sleep_busy() at vm_page_sleep_busy+0x20 pmap_release() at pmap_release+0x90 vmspace_exitfree() at vmspace_exitfree+0x94 vm_waitproc() at vm_waitproc+0x44 wait1() at wait1+0x4e0 wait4() at wait4+0xc syscall() at syscall+0x368 -- syscall (7, FreeBSD ELF, wait4) %o7=0x13a0c0 -- userland() at 0x13be88 user trace: trap %o7=0x13a0c0 pc 0x13be88, sp 0x7fdffffec71 pc 0x10d064, sp 0x7fdffffed31 pc 0x10cd8c, sp 0x7fdffffedf1 pc 0x10cbf0, sp 0x7fdffffeec1 pc 0x10512c, sp 0x7fdffffef81 pc 0x103c58, sp 0x7fdfffff141 pc 0x10dc6c, sp 0x7fdfffff201 pc 0x10db24, sp 0x7fdfffff2e1 pc 0x1001e4, sp 0x7fdfffff401 pc 0, sp 0x7fdfffff4c1 done On Fri, 28 Jun 2002, Jake Burkholder wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13575 > > Change 13575 by jake@jake_k7 on 2002/06/28 23:55:01 > > Integ. > > Affected files ... > > .. //depot/projects/kse/sys/sparc64/sparc64/pmap.c#32 integrate > > Differences ... > > ==== //depot/projects/kse/sys/sparc64/sparc64/pmap.c#32 (text+ko) ==== > > @@ -39,7 +39,7 @@ > * SUCH DAMAGE. > * > * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 > - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.62 2002/06/25 15:13:07 jake Exp $ > + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.63 2002/06/29 06:37:24 jake Exp $ > */ > > /* > @@ -1200,7 +1200,8 @@ > KASSERT(pmap_resident_count(pm) == 0, > ("pmap_release: resident pages %ld != 0", > pmap_resident_count(pm))); > - TAILQ_FOREACH(m, &obj->memq, listq) { > + while (!TAILQ_EMPTY(&obj->memq)) { > + m = TAILQ_FIRST(&obj->memq); > if (vm_page_sleep_busy(m, FALSE, "pmaprl")) > continue; > vm_page_busy(m); > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 0:55:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAE5B37B401; Sat, 29 Jun 2002 00:55:15 -0700 (PDT) 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 6D3AE37B400 for ; Sat, 29 Jun 2002 00:55:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 753C343E13 for ; Sat, 29 Jun 2002 00:54:52 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T7sgJU026639 for ; Sat, 29 Jun 2002 00:54:42 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T7sfM7026636 for perforce@freebsd.org; Sat, 29 Jun 2002 00:54:41 -0700 (PDT) Date: Sat, 29 Jun 2002 00:54:41 -0700 (PDT) Message-Id: <200206290754.g5T7sfM7026636@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13579 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13579 Change 13579 by julian@julian_jules1 on 2002/06/29 00:54:00 MFC Affected files ... .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#7 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.alpha#5 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.arm#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.i386#5 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.ia64#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.powerpc#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.sparc64#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#5 integrate .. //depot/projects/kse/sys/geom/geom_kern.c#3 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#36 integrate .. //depot/projects/kse/sys/sparc64/conf/GENERIC#16 integrate .. //depot/projects/kse/sys/sys/kse.h#14 integrate Differences ... ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile#7 (text+ko) ==== @@ -1,15 +1,23 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.60 2002/06/29 01:16:00 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.61 2002/06/29 03:16:10 obrien Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils +.if ${TARGET_ARCH} == "sparc64" +GDB_CPU= sparc +.elif ${TARGET_ARCH} == "x86-64" +GDB_CPU= i386 +.else +GDB_CPU= ${TARGET_ARCH} +.endif + NOSHARED?=yes PROG= gdb XSRCS= annotate.c ax-general.c ax-gdb.c bcache.c blockframe.c \ breakpoint.c buildsym.c c-exp.y c-lang.c c-typeprint.c \ c-valprint.c ch-exp.c ch-lang.c ch-typeprint.c ch-valprint.c \ - coffread.c complaints.c copying.c core-regset.c \ + coffread.c complaints.c copying.c \ corefile.c corelow.c cp-valprint.c dcache.c dbxread.c \ demangle.c dwarfread.c dwarf2read.c elfread.c environ.c eval.c \ exec.c expprint.c f-exp.y f-lang.c f-typeprint.c f-valprint.c \ @@ -40,7 +48,7 @@ .if ${TARGET_ARCH} != ${MACHINE_ARCH} CFLAGS+= -DCROSS_COMPILE=1 .endif -CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${TARGET_ARCH}_arch +CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${GDB_CPU}_arch CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd @@ -117,13 +125,13 @@ .PRECIOUS: init.c nm.h: - echo '#include "${TARGET_ARCH}/nm-fbsd.h"' >${.TARGET} + echo '#include "${GDB_CPU}/nm-fbsd.h"' >${.TARGET} echo '#include "fbsd-kgdb.h"' >>${.TARGET} -.for H in tm-fbsd xm-${TARGET_ARCH} +.for H in tm-fbsd xm-${GDB_CPU} ${H:C/-.*$//}.h: ln -sf \ - ${.CURDIR}/../../../../contrib/gdb/gdb/config/${TARGET_ARCH}/${H}.h \ + ${.CURDIR}/../../../../contrib/gdb/gdb/config/${GDB_CPU}/${H}.h \ ${.TARGET} .endfor ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.alpha#5 (text+ko) ==== @@ -1,4 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.6 2002/06/29 01:16:00 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.7 2002/06/29 03:16:10 obrien Exp $ -XSRCS+= alphabsd-nat.c alphafbsd-tdep.c alpha-tdep.c +XSRCS+= alphabsd-nat.c alphafbsd-tdep.c alpha-tdep.c \ + core-regset.c CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf64_alpha_vec ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/Makefile.i386#5 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.5 2002/06/29 01:16:00 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.6 2002/06/29 03:16:10 obrien Exp $ XSRCS+= i386fbsd-nat.c i386bsd-tdep.c i386bsd-nat.c i386-nat.c i386-tdep.c \ i387-nat.c i387-tdep.c \ - core-aout.c + core-regset.c core-aout.c CFLAGS+= -Dprint_insn_i386=print_insn_i386_att CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf32_i386_vec ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.8 2002/06/29 01:16:00 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.9 2002/06/29 03:16:10 obrien Exp $ */ /* Low level interface for debugging FreeBSD user threads for GDB, the GNU debugger. Copyright 1996, 1999 Free Software Foundation, Inc. @@ -408,6 +408,7 @@ return rtnval; } +/* XXX: this needs to be selected by target, not [build] host */ #ifdef __i386__ static char sigmap[MAX_NUM_REGS] = /* map reg to sigcontext */ @@ -488,6 +489,18 @@ #endif +#ifdef __sparc64__ + +static char sigmap[125] = /* map reg to sigcontext */ +{ + -1 +}; +static char jmpmap[125] = { + -1 +}; + +#endif + static void freebsd_uthread_fetch_registers (int regno) { ==== //depot/projects/kse/sys/geom/geom_kern.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_kern.c,v 1.3 2002/03/26 22:07:38 phk Exp $ + * $FreeBSD: src/sys/geom/geom_kern.c,v 1.4 2002/06/29 07:47:20 julian Exp $ */ #include @@ -63,7 +63,7 @@ g_up_procbody(void) { struct proc *p = g_up_proc; - struct thread *tp = &p->p_xxthread; + struct thread *tp = FIRST_THREAD_IN_PROC(p); curthread->td_base_pri = PRIBIO; for(;;) { @@ -86,7 +86,7 @@ g_down_procbody(void) { struct proc *p = g_down_proc; - struct thread *tp = &p->p_xxthread; + struct thread *tp = FIRST_THREAD_IN_PROC(p); curthread->td_base_pri = PRIBIO; for(;;) { ==== //depot/projects/kse/sys/kern/vfs_subr.c#36 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.365 2002/06/28 23:17:36 alfred Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.366 2002/06/29 04:45:09 obrien Exp $ */ /* @@ -2456,7 +2456,7 @@ * List all of the locked vnodes in the system. * Called when debugging the kernel. */ -DB_SHOW_COMMAND(lockedvnodes, lockedvnodes) +DB_SHOW_COMMAND(lockedvnods, lockedvnodes) { struct thread *td = curthread; /* XXX */ struct mount *mp, *nmp; ==== //depot/projects/kse/sys/sparc64/conf/GENERIC#16 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.22 2002/06/27 14:43:27 mux Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.23 2002/06/29 04:42:03 obrien Exp $ machine sparc64 cpu SUN4U @@ -83,7 +83,9 @@ device atapicd # ATAPI CDROM drives #device atapifd # ATAPI floppy drives #device atapist # ATAPI tape drives -options ATA_STATIC_ID #Static device numbering +# Do NOT enable ATA_STATIC_ID -- cmd646 controller will be !ata2!, +# and you will not mount an ATA /. +#options ATA_STATIC_ID #Static device numbering # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices ==== //depot/projects/kse/sys/sys/kse.h#14 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/sys/kse.h,v 1.1 2002/02/19 02:12:36 julian Exp $ + * $FreeBSD: src/sys/sys/kse.h,v 1.3 2002/06/29 07:16:24 julian Exp $ */ #ifndef SYS_KSE_H @@ -75,12 +75,4 @@ }; #define GMBXF_CRITICAL 0x00000001 -/* some provisional sycalls: */ - -#ifndef _KERNEL -int kse_new(struct kse_mailbox *mbx, int new_grp_flag); -int kse_exit(void); -int thread_wakeup(struct thread_mailbox *tmbx); -int kse_wakeup(void); -#endif #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 0:57:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC32937B401; Sat, 29 Jun 2002 00:56:46 -0700 (PDT) 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 8E5E237B400 for ; Sat, 29 Jun 2002 00:56:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A78243E13 for ; Sat, 29 Jun 2002 00:56:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T7ujJU026880 for ; Sat, 29 Jun 2002 00:56:45 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T7uj78026877 for perforce@freebsd.org; Sat, 29 Jun 2002 00:56:45 -0700 (PDT) Date: Sat, 29 Jun 2002 00:56:45 -0700 (PDT) Message-Id: <200206290756.g5T7uj78026877@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13580 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13580 Change 13580 by peter@peter_ia64 on 2002/06/29 00:56:12 before I lose it: Make libz use stand.h instead of libc's headers Implement malloc debugging. Sigh, I have triggered a heisenbug here. Adding debugging makes it work. Affected files ... .. //depot/projects/ia64/lib/libstand/Makefile#8 edit .. //depot/projects/ia64/lib/libstand/stand.h#7 edit .. //depot/projects/ia64/lib/libstand/zalloc_defs.h#2 edit .. //depot/projects/ia64/lib/libstand/zalloc_malloc.c#2 edit Differences ... ==== //depot/projects/ia64/lib/libstand/Makefile#8 (text+ko) ==== @@ -13,6 +13,7 @@ MAN= libstand.3 CFLAGS+= -ffreestanding +CFLAGS+= -I${.CURDIR} .if ${MACHINE_ARCH} == "alpha" CFLAGS+= -mno-fp-regs @@ -25,7 +26,7 @@ .endif # standalone components and stuff we have modified locally -SRCS+= __main.c assert.c bcd.c bswap.c environment.c getopt.c gets.c \ +SRCS+= zutil.h __main.c assert.c bcd.c bswap.c environment.c getopt.c gets.c \ globals.c pager.c printf.c strdup.c strerror.c strtol.c random.c \ sbrk.c twiddle.c zalloc.c zalloc_malloc.c @@ -132,9 +133,22 @@ # decompression functionality from libz .PATH: ${.CURDIR}/../libz -CFLAGS+=-DHAVE_MEMCPY -SRCS+= adler32.c crc32.c infblock.c infcodes.c inffast.c inflate.c \ - inftrees.c infutil.c zutil.c +CFLAGS+=-DHAVE_MEMCPY -I${.CURDIR}/../libz +SRCS+= adler32.c crc32.c _infblock.c _infcodes.c _inffast.c _inflate.c \ + _inftrees.c _infutil.c _zutil.c _zutil.h + +# aargh +.for file in zutil.h +CLEANFILES+= _${file} _${file}.orig + +_${file}: ${file} ${file}.diff + patch -s -b .orig -o ${.TARGET} < ${.ALLSRC:M*.diff} ${.ALLSRC:M*.[ch]} +.endfor + +.for file in infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c zutil.c +_${file}: ${file} + sed "s|zutil\.h|_zutil.h|" ${.ALLSRC} > ${.TARGET} +.endfor # io routines SRCS+= closeall.c dev.c ioctl.c nullfs.c stat.c \ ==== //depot/projects/ia64/lib/libstand/stand.h#7 (text+ko) ==== @@ -391,26 +391,19 @@ #define ntohs(x) __ntohs(x) #endif -#if 0 +void *Malloc(size_t, char *, int); +void *Calloc(size_t, size_t, char *, int); +void *Realloc(void *, size_t, char *, int); +void Free(void *, char *, int); -static inline void * -malloc_debug(size_t size, const char *file, int line) -{ - void *p; - printf("%s:%d malloc(%ld)", file, line, size); - p = malloc(size); - printf("=%p\n", p); - return p; -} - -static inline void -free_debug(void *p, const char *file, int line) -{ - printf("%s:%d free(%p)\n", file, line, p); - free(p); -} - -#define malloc(x) malloc_debug(x, __FILE__, __LINE__) -#define free(x) free_debug(x, __FILE__, __LINE__) - +#if 1 +#define malloc(x) Malloc(x, __FILE__, __LINE__) +#define calloc(x, y) Calloc(x, y, __FILE__, __LINE__) +#define free(x) Free(x, __FILE__, __LINE__) +#define realloc(x, y) Realloc(x, y, __FILE__, __LINE__) +#else +#define malloc(x) Malloc(x, NULL 0) +#define calloc(x, y) Calloc(x, y, NULL, 0) +#define free(x) Free(x, NULL, 0) +#define realloc(x, y) Realloc(x, y, NULL, 0) #endif ==== //depot/projects/ia64/lib/libstand/zalloc_defs.h#2 (text+ko) ==== @@ -96,6 +96,7 @@ #define MATYPE long double #define MALLOCALIGN ((sizeof(MATYPE) > sizeof(Guard)) ? sizeof(MATYPE) : sizeof(Guard)) #define GAMAGIC 0x55FF44FD +#define GAFREE 0x5F54F4DF #include "zalloc_protos.h" ==== //depot/projects/ia64/lib/libstand/zalloc_malloc.c#2 (text+ko) ==== @@ -60,14 +60,14 @@ #endif void * -malloc(size_t bytes) +Malloc(size_t bytes, char *file, int line) { Guard *res; #ifdef USEENDGUARD - bytes += MALLOCALIGN + 1; + bytes += 2 * MALLOCALIGN + 1; #else - bytes += MALLOCALIGN; + bytes += 2 * MALLOCALIGN; #endif while ((res = znalloc(&MallocPool, bytes)) == NULL) { @@ -94,21 +94,31 @@ } void -free(void *ptr) +Free(void *ptr, char *file, int line) { size_t bytes; if (ptr != NULL) { Guard *res = (void *)((char *)ptr - MALLOCALIGN); + if (file == NULL) + file = "unknown"; #ifdef USEGUARD + if (res->ga_Magic == GAFREE) { + printf("free: duplicate free @ %p from %s:%d\n", ptr, file, line); + return; + } if (res->ga_Magic != GAMAGIC) - panic("free: guard1 fail @ %p", ptr); - res->ga_Magic = -1; + panic("free: guard1 fail @ %p from %s:%p", ptr, file, line); + res->ga_Magic = GAFREE; #endif #ifdef USEENDGUARD + if (*((char *)res + res->ga_Bytes - 1) == -1) { + printf("free: duplicate2 free @ %p from %s:%d\n", ptr, file, line); + return; + } if (*((char *)res + res->ga_Bytes - 1) != -2) - panic("free: guard2 fail @ %p + %d", ptr, res->ga_Bytes - MALLOCALIGN); + panic("free: guard2 fail @ %p + %d from %s:%d", ptr, res->ga_Bytes - MALLOCALIGN, file, line); *((char *)res + res->ga_Bytes - 1) = -1; #endif @@ -122,12 +132,12 @@ void * -calloc(size_t n1, size_t n2) +Calloc(size_t n1, size_t n2, char *file, int line) { iaddr_t bytes = (iaddr_t)n1 * (iaddr_t)n2; void *res; - if ((res = malloc(bytes)) != NULL) { + if ((res = Malloc(bytes, file, line)) != NULL) { bzero(res, bytes); #ifdef DMALLOCDEBUG if (++MallocCount > MallocMax) @@ -144,19 +154,19 @@ */ void * -realloc(void *ptr, size_t size) +Realloc(void *ptr, size_t size, char *file, int line) { void *res; size_t old; - if ((res = malloc(size)) != NULL) { + if ((res = Malloc(size, file, line)) != NULL) { if (ptr) { old = *(size_t *)((char *)ptr - MALLOCALIGN) - MALLOCALIGN; if (old < size) bcopy(ptr, res, old); else bcopy(ptr, res, size); - free(ptr); + Free(ptr, file, line); } else { #ifdef DMALLOCDEBUG if (++MallocCount > MallocMax) @@ -174,12 +184,12 @@ } void * -reallocf(void *ptr, size_t size) +Reallocf(void *ptr, size_t size, char *file, int line) { void *res; - if ((res = realloc(ptr, size)) == NULL) - free(ptr); + if ((res = Realloc(ptr, size, file, line)) == NULL) + Free(ptr, file, line); return(res); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 2:42:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F32237B400; Sat, 29 Jun 2002 02:41:59 -0700 (PDT) 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 085A037B401 for ; Sat, 29 Jun 2002 02:41:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B43BB43E13 for ; Sat, 29 Jun 2002 02:41:57 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5T9fvJU046539 for ; Sat, 29 Jun 2002 02:41:57 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5T9fv6b046536 for perforce@freebsd.org; Sat, 29 Jun 2002 02:41:57 -0700 (PDT) Date: Sat, 29 Jun 2002 02:41:57 -0700 (PDT) Message-Id: <200206290941.g5T9fv6b046536@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 13585 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13585 Change 13585 by chris@chris_holly on 2002/06/29 02:41:04 Add in the LOMAC article as-is. Note that the pre-formatted bits like have been filled--this was a side-effect of the Emacs sgml-fill-element function. They will be re-formatted once it's determined what stays and what goes. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#4 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#4 (text+ko) ==== @@ -973,10 +973,669 @@ policy. + + + + + Tim + Fraser + + NAI Labs + + + + + Chris + Costello + + Safeport Network Services, NAI Labs + + + + + Biba Low-Watermark Integrity Protection - - This section will document the LOMAC policy. + + LOMAC is a loadable kernel module-based security + extension available on a number of UNIX kernels. LOMAC + provides Low Water-Mark Mandatory Access Control + functionality to protect the integrity of processes and data + from viruses, Trojan horses, malicious remote users, and + compromised root daemons. LOMAC is + designed to be virtually invisible to users, and largely + painless to administrators. + + This is the operations manual for LOMAC. It describes + LOMAC and the protection LOMAC provides. Please note that + the FreeBSD version of LOMAC is still under development. + Although enough functionality exists to provide some useful + protection, some features and fixes remain to be + implemented. The FreeBSD version of LOMAC should be used for + experimental purposes only at this time. + + + Introduction + + + MAC + + + Several projects have demonstrated that + kernel-resident Mandatory Access Control + (MAC) mechanisms can protect the + integrity of Free UNIX systems from malicious code and + users. However, implementations of these mechanisms have + traditionally required invasive kernel modifications, + sometimes coupled with supporting modifications of + user-space utilities, as well. This requirement has + hindered the adoption of MAC mechanisms in the mainstream + Free UNIX community. Adoption has been further discouraged + by the difficulty of starting small and evolving towards a + complete MAC solution - in general, the complete set of + extensive modifications must be made before MAC can + provide any useful protection. + + LOMAC is an attempt to make an easily-adoptable form + of MAC integrity protection available to the Free UNIX + community without the discouraging necessity of kernel + modifications. LOMAC implements a simple form of MAC + integrity protection based on Biba's Low Water-Mark model + in a Loadable Kernel Module (LKM) Although it trades off + some of the advanced MAC features found in traditional MAC + implementations, LOMAC provides useful integrity + protection without any modifications to the kernel, + applications, or their existing configurations. LOMAC is + designed to be compatible with existing software, and + ships with a one-size-fits-all default configuration. + LOMAC may be used to harden cur rently-deployed FreeBSD + systems simply by loading the LKM into the kernel shortly + after boot time. + + Once loaded, LOMAC divides the system into two + conceptual levels of integrity: high and low. The high + side contains all process and files that should be + protected from malicious code and remote users, including + the system binaries (/bin, + /lib) and configuration files + (/etc). The low side contains the + processes that interact with remote users (remote login + sessions, httpd) and the files + they download from the net (mail attachments). Low files + may contain viruses or Trojan Horses. Low processes take + input from remote users that may cause buffer overflows. + During run-time, LOMAC protects high files and processes + by preventing low processes from modifying or signalling + them. Thanks to is generic default configuration, LOMAC + handles the division of the system into high and low parts + automatically, without administrative direction. + + LOMAC does not override the existing FreeBSD + protection mechanisms. Instead, its permission checks are + done in addition to the existing ones—the kernel + permits an operation only if both the existing mechanisms + and LOMAC decide it should permit it. Unlike the existing + FreeBSD protection mechanisms, LOMAC makes decisions based + solely on integrity level, not on user identity. With + LOMAC, a low-level root process is + just as powerless as a low-level + non-root process. Since LOMAC + automatically places all network servers in the low part + of the system, this fact prevents compromised + root-privileged network servers from + harming the high-integrity part of the system. + + + + A Short Tour + + This section introduces LOMAC's major features. You + may follow these steps the first time you boot with LOMAC + running to ensure that your installation is + correct. + + + + Log in as root, from the + system console. + + + + Check to make sure that the LOMAC LKM is + loaded: + + # /sbin/kldstat | grep lomac.ko 5 1 + 0xc13e0000 c000 lomac.ko + + + + Look at the levels of your processes: + + # ps PID LVL TT STAT TIME COMMAND 251 2 + v6 Is 0:00.37 login -p root 650 2 v6 S + 0:00.56 -csh (csh) 665 2 v6 R+ 0:00.05 + ./ps + + Note that all your processes are running at level + 2—LOMAC's highest level of privilege. + + + + Look at the levels of your files. + (-Z shows levels.) + + # ls -lZ total 62 -rw-r--r-- 2 root wheel 2 + 802 Apr 21 2001 .cshrc -rw------- 1 root wheel 2 + 2973 Oct 12 09:41 .history -rw-r--r-- 1 root wheel + 2 142 Apr 21 2001 .klogin -rw-r--r-- 1 root wheel + 2 297 Apr 21 2001 .login ... + + Note that all your files are also at level 2. + Level-2 files are high-integrity—LOMAC assumes + that they contain no viruses or Trojan horses at boot + time, and limits the behavior of processes during + run-time to keep them that way. + + + + Look at the levels of a normal user's files. I'll + use the user tfraser in the example; you'll have to + use one of your own users. + + # ls -laZ /home/tfraser total 47 drwxr-xr-x 8 + tfraser staff 1 1024 Oct 25 14:30 . drwxr-xr-x 4 + root wheel 2 512 Aug 27 10:47 .. -rw------- 1 + tfraser staff 1 114 Aug 27 11:11 .Xauthority + -rw------- 1 tfraser staff 1 42 Oct 4 10:17 + .bash_history + + Note that while /home is + level 2 (high integrity), all of the user's files are + level 1 (low integrity). LOMAC assumes that any of the + user's files may be Trojan horses or contain + viruses. + + + + Examine one of the user's files with less, and put + less in the background with ctrl-Z. Then run ps to + look at your processes. + + # less /home/tfraser/.bash_history <output + not included in document to save space> ^Z + Suspended # ps PID LVL TT STAT TIME COMMAND 251 + 2 v6 Is 0:00.37 login -p root 650 2 v6 S + 0:01.28 -csh (csh) 733 1 v6 T 0:00.08 less + /home/tfraser/.bash_history 735 2 v6 R+ + 0:00.05 ./ps + + Note that, although your shell + (csh in my case) is still + at level 2, the process running less is at level 1. + Here's why: Processes generally inherit the level of + their parent. So, any process you start with your + level-2 shell will initially execute at level 2. The + less process was no exception - it began running at + level 2. However, the less process went on to read the + user's .cshrc file. This file is + a level-1 file—it contains low-integrity data. + Whenever LOMAC sees a level-2 process read a level-1 + file, LOMAC "demotes" the process. That is, it reduces + the process to level 1. + + Level-2 processes have maximum privileges (like + root in standard UNIX). Level-1 + processes have greatly reduced privileges. For + example, they cannot write to level-2 files, or signal + level-2 processes. When a level-2 process reads a + level-1 file, it puts itself at risk. The file may be + a Trojan horse or may contain data designed to cause + buffer overflows. Because of this risk, LOMAC demotes + level-2 processes that read level-1 files to level 1. + Once at level 1, these processes have insufficient + privilege to harm level-2 processes and files. + + Many cautious UNIX administrators avoid putting + "." in their PATH environment variable, in order to + avoid executing some Trojan horses. In standard UNIX, + a malicious user might give an attack program the same + name as a commonly-used command like ls. If the + administrator, running as root, + were to cd to the malicious user's directory and type + ls, if the "." preceded /bin in + their path, they would accidentally execute the + malicious ls rather than + /bin/ls. This act would + effectively execute the malicious user's Trojan horse + program with root privileges, + perhaps to modify the login program or the + passwd file. + + This precaution is not required in a system + running LOMAC. LOMAC considers the execution of a + program to be equivalent to a read (since the process + reads the program file in order to execute it). Since + all non-root user's files are at + level 1, LOMAC would demote the process executing the + Trojan ls, just as it demoted less in our example, + above. Once at level 1, LOMAC would prevent the Trojan + ls from modifying level-2 files such as the login + program or the passwd file. + + Demotion is a key part of the LOMAC's integrity + protection scheme. Now that we've demonstrated how it + works, we're now done with less. Quit the less + program. + + # fg <output not included in document to save + space> q + + + + Create a test file. We'll use this test file to + demonstrate LOMAC's integrity protection later + on. + + # cat > /root/foo This file contains test data. + ^D + + + + tail -f + /var/log/messages + + Leave this running while you continue the tour. + It's output will contain LOMAC log messages as we + proceed. + + + + Switch to another virtual console and log in as a + normal user. Once logged in, examine the levels of + your processes: + + $ ps PID LVL TT STAT TIME COMMAND 742 1 + v7 S 0:00.48 -tcsh (tcsh) 750 1 v7 R+ + 0:00.05 ps + + Note that as a normal user, all of your processes + are at level 1. Why? Switch back to the virtual + console where you are logged in as + root. You should see a log + message similar to: + + Oct 25 14:44:54 myhost + /boot/kernel/kernel: LOMAC: level-2 subject + p252g252u1002:login demoted to level 1 after reading + under "/usr/home" + + All the getty programs that handle logins run at + level 2. When a user attempts to log in, they run the + login program, which also runs at level 2. Upon + supplying the proper password, the login program + starts a shell for the user + (tcsh in this case). The + shell starts at level 2, but LOMAC demotes it to level + 1 when it reads the user's .cshrc + file, just as it demoted the less program, above. Once + the user's shell is running at level 1, all of the + programs subsequently executed by the user will run at + level 1, also. + + Our root shell from the start + of the tour remains at level-2 because LOMAC has set + all of root's files at level 2. A + level-2 process may read level-2 files without being + demoted. The user's shell is demoted because it reads + the user's level-1 files. LOMAC does not assign levels + to processes based on the user's + root/non-root + identity. LOMAC assigns levels to files by starting + the first process (init) at level 2, allowing child + processes to inherit their parent's level, and by + demoting processes that read level-1 files. LOMAC does + not pay any attention to user identity. Consequently, + LOMAC is not vulnerable to any of the traditional + attacks on UNIX security that involve obtaining + root identity. + + + + Test the above assertion that LOMAC does not give + any extra privileges to processes with + root identity. Switch back to the + normal user's shell and become + root. + + &prompt.user; su Password: # ps PID LVL TT STAT + TIME COMMAND 252 1 v7 Is 0:00.39 login -p + tfraser 751 1 v7 I 0:00.18 su 752 1 v7 S + 0:00.43 _su (csh) 755 1 v7 R+ 0:00.05 ps + + Note that, despite the su, your + shell is still at level 1. LOMAC never increases the + level of a process. Now attempt to delete the + /root/foo file you created + earlier. + + # ls -lZ /root/foo -rw-r--r-- 1 root wheel 2 + 30 Oct 25 14:44 /root/foo # rm /root/foo rm: + /root/foo: Operation not permitted + + Even though you are root, + LOMAC will not allow a level-1 process + (rm in this case) to delete a + level-2 file. You should see a log message similar to + this one in on the root virtual + console that is tailing /var/log/messages: + + Oct 25 14:50:52 myhost + /boot/kernel/kernel: LOMAC: level-1 proc p763g763u0:rm + denied delete to level-2 object under + "/" + + This concludes the short tour. + + + + + + LOMAC and Network Applications + + This section explains how LOMAC uses its demotion + behavior to ensure that all remote users and servers that + serve remote users (httpd, + ftpd, etc.) run at level 1. At + this level, malicious remote users and compromised network + servers can do little harm to the level-2 part of the + system, even if they have root + privilege. It also discusses a few of the finer points + concerning LOMAC's protection scheme not already covered + in the Short Tour + section, above. The basic elements of LOMAC's integrity + protection scheme are summarized here: + + + + LOMAC assigns every process, or named filesystem + object (file, named pipe, or bound UNIX-domain socket) + a level: either 1 (low integrity) or 2 (high + integrity). + + + + LOMAC assigns levels to filesystem objects based + on their location in the filesystem namespace. The + mapping between names and levels constitutes most of + LOMAC's "default policy", and is presently hardcoded + into the LKM. Once assigned, the levels of filesystem + objects never change. + + + + The first process (init) starts at level 2. All + child processes inherit the level of their parent. + Only when a level-2 process reads from a level-1 + object does LOMAC demote the process to level + 1. + + + + Level-1 processes have insufficient privilege to + write to level-2 objects or signal level-2 processes. + This protects the level-2 part of the system from + malicious interference. + + + + The combination of LOMAC's demotion behavior and + its restrictions on the privileges of level-1 + processes prevent malicious level-1 users from harming + the level-2 part of the system, even in cases where + level-2 administrators accidentally execute malicious + user's Trojan horses. + + + + In UNIX, network servers are generally started + automatically by the init process, or by one of its + children. With LOMAC, this arrangement guarantees that + network servers inherit the init process's level of 2. In + addition to demoting level-2 processes upon reading + level-1 files, LOMAC also demotes level-2 processes when + they read from a network interface. Consequently, LOMAC + demotes network server as soon as they read their first + client request from the network. Just as LOMAC assigns + appropriate levels to user shells based on their + file-reading behavior, not their user's identity, this + scheme allows LOMAC to demote network servers without + initially knowing which programs are network servers: + LOMAC simply allows the init program to start all of its + servers at level 2, and subsequently demotes those servers + which read from a network interface. + + LOMAC uses the same strategy to ensure that remote + users run at level 1: it demotes the remote login + (telnetd, rlogind) servers when they receive their first + login request, as described above. LOMAC's ability to + automatically determine the proper levels for users and + servers during runtime is the feature which allows it to + avoid site-specific configuration and ship with a + one-size-fits-all default policy. + + Here is an example of an httpd server before it reads + its first request. Note that the httpd server is comprised + of 5 processes, all at level 2. + + # ps -U nobody PID LVL TT STAT TIME COMMAND + 369 2 ?? I 0:00.03 /usr/local/sbin/httpd 370 2 + ?? I 0:00.03 /usr/local/sbin/httpd 371 2 ?? I + 0:00.03 /usr/local/sbin/httpd 372 2 ?? I 0:00.03 + /usr/local/sbin/httpd 373 2 ?? I 0:00.03 + /usr/local/sbin/httpd + + After httpd reads its first request from the network, + you should see a message similar to this one in + /var/log/messages: + + Oct 25 16:16:24 myhost /boot/kernel/kernel: + LOMAC: level-2 subject p369g368u65534:httpd demoted to + level 1 after reading from the network + + And running ps again will produce: + + PID LVL TT STAT TIME COMMAND + 369 1 ?? S 0:00.30 /usr/local/sbin/httpd 370 2 + ?? I 0:00.03 /usr/local/sbin/httpd 371 2 ?? I + 0:00.03 /usr/local/sbin/httpd 372 2 ?? I 0:00.03 + /usr/local/sbin/httpd 373 2 ?? I 0:00.03 + /usr/local/sbin/httpd 1572 2 ?? S 0:00.06 + /usr/local/sbin/httpd + + LOMAC demoted httpd process 369 as soon as it read its + first client request. + + + + LOMAC and Traditional UNIX Access Control + + LOMAC does not override the existing FreeBSD + protection mechanisms. Instead, its permission checks are + done in addition to the existing ones—the kernel + permits an operation only if both the existing mechanisms + and LOMAC decide the kernel should permit it. + + There are three main differences between the integrity + protection scheme implemented by LOMAC and traditional + UNIX security mechanisms: + + + + Traditional UNIX provides mechanisms by which + processes can increase their privileges by changing + their effective identities. Although UNIX systems can + be configured to prevent malicious users from + exploiting these mechanisms in most cases, they can + also be misconfigured, and good configurations can be + foiled by bugs in user-space application programs. + LOMAC provides no mechanism to allow a process to + increase its level. + + + + Traditional UNIX access control mechanisms are not + designed to prevent the flow of potentially dangerous + data from low-integrity objects to high-integrity + objects. That is, from files owned by one user to + those owned by another - even to those owned by + root. The Trojan ls scenario in + the Short Tour + section describes one well-known example of this + vulnerability, and how LOMAC counters it. + + + + Although many enhancements now exist, in its most + basic form traditional UNIX depends on easily defeated + authentication mechanisms to establish appropriate + initial privilege levels. LOMAC assigns privilege + levels to processes based on their reading behavior. + As described above, the effect of LOMAC's policy is to + give the highest level of privilege only local + administrative users, and the lowest level of + privilege to all others, regardless of identity. LOMAC + does not consider user identity; consequently, it does + not depend on authentication. + + + + + + Limits of LOMAC's Protection + + LOMAC embodies a trade-off between quality of MAC + protection and compatibility. LOMAC's primary goal is to + remain compatible with existing software while providing + some useful MAC integrity protection. The Low Water-Mark + MAC model supports this compatibility-first requirement. + However, it the quality of protection it provides is not + as great as that provided by more modern, less compatible, + models. This issue is discussed at length in. This section + presents the two well-known primary quality-of-protection + drawbacks of the Low Water-Mark model: its enforcement of + the principle of least privilege, and its reliance on + trusted applications. + + The first drawback of the Low Water-Mark MAC scheme + concerns the Principle of Least Privilege, which holds + that a good MAC scheme should grant a subject the minimum + set of privileges needed to do its job [SAL75]. + Constraining a subject in this way minimizes the amount of + damage the subject can cause should it become compromised. + Low Water-Mark provides weaker constraints than some more + modern models. The LOMAC AND NETWORK APPLICATIONS section + describes how LOMAC protects the level-2 part of the + system by demoting network servers to level 1. Although + LOMAC will prevent a compromised level-1 network server + from harming the level-2 part of the system, LOMAC will + not prevent such a server from doing harm in the level-1 + remainder of the system. A compromised + root-privileged network server could, + for example, send kill signals to another level-1 + server. + + + The second drawback of the Low Water-Mark MAC scheme + is its reliance on trusted applications. This reliance is + a feature of hierarchical models like Low Water-Mark + [BOE85]. The dhclient(8) client-side DHCP agent is a good + example of LOMAC's reliance on trusted applications: As + described in the LOMAC AND NETWORK APPLICATIONS section, + LOMAC protects the integrity of the level-2 part of the + system by demoting all applications which read from the + network to level 1. Once demoted, these applications can + no longer modify level-2 files. Although this demotion and + confinement prevents potentially-compromised network + applications provides useful protection, it also prevents + applications like dhclient from operating properly. + + The dhclient application reads DHCP information from + the network and attempts to update the host's + /etc configuration files, + accordingly. This is exactly the kind of + potentially-dangerous behavior that is prohibited by + LOMAC; a dhclient that LOMAC has demoted to level 1 cannot + modify /etc configuration files. + Although dangerous, dhclient's behavior is required for + the proper operation of some systems. + + LOMAC must provide an exception to its policy in order + to allow dhclient to run, and "trust" dhclient not to + abuse this exceptional privilege. LOMAC sets the special + "NONETDEMOTE" flag on all processes running the dhclient + program. LOMAC will not demote a process with this flag + set when that process reads from the network. This + exception allows a level-2 dhclient to stay at level 2 + after reading DHCP information from the network, + permitting it to modify /etc + configuration files as it chooses. + + The FreeBSD version of LOMAC presently two flags for + processes, each implementing a specific flavor of + trust: + + + + + NONETDEMOTE + + + + LOMAC will not demote a processes after reading + from the network provided that it has this flag + set. + + + + + + NODEMOTE + + + + LOMAC will never demote a process that has this + flag set. + + + + + Note that, although these flags allow level-2 + processes to escape demotion, they do not allow a level-1 + process to raise its level to 2. LOMAC does not provide + any such promotion mechanism. + + LOMAC will set a process's + NONETDEMOTE or + NODEMOTE flag when that process + executes a particular program, such as dhclient. In + addition, once a process has one of these flags set, any + children it subsequently creates will have the same flag + set. LOMAC maintains a short list mapping programs to + process trust flags. Eventually, that list will be shown + here. However, since the FreeBSD version of LOMAC is still + under development, the membership of the list is still + fluid. The best reference is the LOMAC source code, + specifically policy_plm.h. + + If you create symlinks to env + named env-nonetdemote and + env-nodemote , executing env through + these symlinks will cause env and its child processes to + run with the NONETDEMOTE and + NODEMOTE flags, respectively. This + feature may be an aid to administration, particularly when + downloading and installing new software. + To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 6:20:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAE0537B401; Sat, 29 Jun 2002 06:19:15 -0700 (PDT) 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 32F2837B400 for ; Sat, 29 Jun 2002 06:19:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B26ED43E06 for ; Sat, 29 Jun 2002 06:19:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5TDJDJU000347 for ; Sat, 29 Jun 2002 06:19:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5TDJDNd000344 for perforce@freebsd.org; Sat, 29 Jun 2002 06:19:13 -0700 (PDT) Date: Sat, 29 Jun 2002 06:19:13 -0700 (PDT) Message-Id: <200206291319.g5TDJDNd000344@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13593 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13593 Change 13593 by rwatson@rwatson_curry on 2002/06/29 06:18:24 For reasons unknown, p4 didn't pick this up without integ -i. Affected files ... .. //depot/projects/trustedbsd/base/gnu/usr.bin/sort/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/sort/config.h#2 integrate Differences ... ==== //depot/projects/trustedbsd/base/gnu/usr.bin/sort/Makefile#2 (text+ko) ==== @@ -1,6 +1,30 @@ +# $FreeBSD: src/gnu/usr.bin/sort/Makefile,v 1.7 2002/06/08 10:34:12 ache Exp $ + +SORTDIR= ${.CURDIR}/../../../contrib/gnu-sort +.PATH: ${SORTDIR}/lib ${SORTDIR}/src ${SORTDIR}/man + PROG= sort -SRCS= sort.c error.c version.c long-options.c getopt.c getopt1.c xstrtod.c +SRCS= sort.c \ + argmatch.c \ + dup-safer.c \ + error.c \ + fopen-safer.c \ + getopt.c \ + getopt1.c \ + hard-locale.c \ + human.c \ + long-options.c \ + memcoll.c \ + physmem.c \ + posixver.c \ + quote.c \ + quotearg.c \ + version-etc.c \ + xmalloc.c \ + xmemcoll.c \ + xstrtoul.c \ + xstrtoumax.c -CFLAGS+=-I${.CURDIR} -DHAVE_CONFIG_H +CFLAGS+=-I${.CURDIR} -I${SORTDIR}/lib -DHAVE_CONFIG_H .include ==== //depot/projects/trustedbsd/base/gnu/usr.bin/sort/config.h#2 (text+ko) ==== @@ -1,123 +1,1316 @@ -/* config.h. Generated automatically by configure. */ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.4 2002/06/08 10:34:12 ache Exp $ */ +/* config.h. Generated by configure. */ +/* config.hin. Generated from configure.ac by autoheader. */ + +/* Define if you have the Andrew File System. */ +/* #undef AFS */ + +/* Define to the function xargmatch calls on failures. */ +#define ARGMATCH_DIE usage (1) + +/* Define to the declaration of the xargmatch failure function. */ +#define ARGMATCH_DIE_DECL extern void usage () + +/* Define to 1 if the `closedir' function returns void instead of `int'. */ +/* #undef CLOSEDIR_VOID */ + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ + +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ + +/* Define to 1 if using `getloadavg.c'. */ +/* #undef C_GETLOADAVG */ + +/* Define to 1 for DGUX with . */ +/* #undef DGUX */ + +/* the name of the file descriptor member of DIR */ +/* #undef DIR_FD_MEMBER_NAME */ + +#ifdef DIR_FD_MEMBER_NAME +# define DIR_TO_FD(Dir_p) ((Dir_p)->DIR_FD_MEMBER_NAME) +#else +# define DIR_TO_FD(Dir_p) -1 +#endif + + + +/* Define if there is a member named d_ino in the struct describing directory + headers. */ +#define D_INO_IN_DIRENT 1 + +/* Define if there is a member named d_type in the struct describing directory + headers. */ +#define D_TYPE_IN_DIRENT 1 + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#define ENABLE_NLS 1 + +/* Define on systems for which file names may have a so-called `drive letter' + prefix, define this to compute the length of that prefix, including the + colon. */ +#define FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX 0 + +/* Define if the backslash character may also serve as a file name component + separator. */ +#define FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR 0 -/* Define if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -/* #undef _ALL_SOURCE */ +#if FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX +# define FILESYSTEM_PREFIX_LEN(Filename) \ + ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0) +#else +# define FILESYSTEM_PREFIX_LEN(Filename) 0 #endif -/* Define if using alloca.c. */ -/* #undef C_ALLOCA */ +/* Define to the type of elements in the array set by `getgroups'. Usually + this is either `int' or `gid_t'. */ +#define GETGROUPS_T gid_t + +/* Define if the `getloadavg' function needs to be run setuid or setgid. */ +/* #undef GETLOADAVG_PRIVILEGED */ + +/* Define if gettimeofday clobbers localtime's static buffer. */ +/* #undef GETTIMEOFDAY_CLOBBERS_LOCALTIME_BUFFER */ + +/* The concatenation of the strings `GNU ', and PACKAGE. */ +#define GNU_PACKAGE "GNU textutils" -/* Define to empty if the keyword does not work. */ -/* #undef const */ +/* Define to 1 if you have the `acl' function. */ +/* #undef HAVE_ACL */ -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -/* #undef CRAY_STACKSEG_END */ +/* Define to 1 if you have the `alarm' function. */ +#define HAVE_ALARM 1 -/* Define if you have alloca, as a function or macro. */ +/* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 -/* Define if you have and it should be used (not on Ultrix). */ +/* Define to 1 if you have and it should be used (not on Ultrix). + */ /* #undef HAVE_ALLOCA_H */ -/* Define if you don't have vprintf but do have _doprnt. */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ARGZ_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Define to 1 if you have the `atexit' function. */ +#define HAVE_ATEXIT 1 + +/* Define to 1 if you have the `bcopy' function. */ +#define HAVE_BCOPY 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BP_SYM_H */ + +/* Define to 1 if you have the `btowc' function. */ +/* #undef HAVE_BTOWC */ + +/* Define to 1 if you have the `bzero' function. */ +#define HAVE_BZERO 1 + +/* Define to 1 if you have the `canonicalize_file_name' function. */ +/* #undef HAVE_CANONICALIZE_FILE_NAME */ + +/* Define to 1 if you have the `chsize' function. */ +/* #undef HAVE_CHSIZE */ + +/* Define to 1 if you have the `clearerr_unlocked' function. */ +/* #undef HAVE_CLEARERR_UNLOCKED */ + +/* Define to 1 if you have the `clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + +/* Define if backslash-a works in C strings. */ +#define HAVE_C_BACKSLASH_A 1 + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_CLEARERR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `dirfd', and to 0 if you don't. + */ +#define HAVE_DECL_DIRFD 1 + +/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_FEOF_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FERROR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FFLUSH_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FGETS_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FPUTC_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FPUTS_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FREAD_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `free', and to 0 if you don't. + */ +#define HAVE_DECL_FREE 1 + +/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FWRITE_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_GETCHAR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_GETC_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. + */ +#define HAVE_DECL_GETENV 1 + +/* Define to 1 if you have the declaration of `geteuid', and to 0 if you + don't. */ +#define HAVE_DECL_GETEUID 1 + +/* Define to 1 if you have the declaration of `getgrgid', and to 0 if you + don't. */ +#define HAVE_DECL_GETGRGID 1 + +/* Define to 1 if you have the declaration of `getlogin', and to 0 if you + don't. */ +#define HAVE_DECL_GETLOGIN 1 + +/* Define to 1 if you have the declaration of `getpwuid', and to 0 if you + don't. */ +#define HAVE_DECL_GETPWUID 1 + +/* Define to 1 if you have the declaration of `getuid', and to 0 if you don't. + */ +#define HAVE_DECL_GETUID 1 + +/* Define to 1 if you have the declaration of `getutent', and to 0 if you + don't. */ +#define HAVE_DECL_GETUTENT 0 + +/* Define to 1 if you have the declaration of `lseek', and to 0 if you don't. + */ +#define HAVE_DECL_LSEEK 1 + +/* Define to 1 if you have the declaration of `malloc', and to 0 if you don't. + */ +#define HAVE_DECL_MALLOC 1 + +/* Define to 1 if you have the declaration of `memchr', and to 0 if you don't. + */ +#define HAVE_DECL_MEMCHR 1 + +/* Define to 1 if you have the declaration of `memrchr', and to 0 if you + don't. */ +#define HAVE_DECL_MEMRCHR 0 + +/* Define to 1 if you have the declaration of `nanosleep', and to 0 if you + don't. */ +#define HAVE_DECL_NANOSLEEP 1 + +/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_PUTCHAR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_PUTC_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `realloc', and to 0 if you + don't. */ +#define HAVE_DECL_REALLOC 1 + +/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't. + */ +#define HAVE_DECL_STPCPY 0 + +/* Define to 1 if you have the declaration of `strerror', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR 1 + +/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_R 1 + +/* Define to 1 if you have the declaration of `strndup', and to 0 if you + don't. */ +#define HAVE_DECL_STRNDUP 0 + +/* Define to 1 if you have the declaration of `strnlen', and to 0 if you + don't. */ +#define HAVE_DECL_STRNLEN 0 + +/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't. + */ +#define HAVE_DECL_STRSTR 1 + +/* Define to 1 if you have the declaration of `strtoimax', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOIMAX 1 + +/* Define to 1 if you have the declaration of `strtol', and to 0 if you don't. + */ +#define HAVE_DECL_STRTOL 1 + +/* Define to 1 if you have the declaration of `strtoll', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOLL 1 + +/* Define to 1 if you have the declaration of `strtoul', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOUL 1 + +/* Define to 1 if you have the declaration of `strtoull', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOULL 1 + +/* Define to 1 if you have the declaration of `strtoumax', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOUMAX 1 + +/* Define to 1 if you have the declaration of `ttyname', and to 0 if you + don't. */ +#define HAVE_DECL_TTYNAME 1 + +/* Define to 1 if you have the declaration of wcwidth(), and to 0 otherwise. + */ +#define HAVE_DECL_WCWIDTH 0 + +/* Define to 1 if you have the declaration of `__fpending', and to 0 if you + don't. */ +#define HAVE_DECL___FPENDING 0 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the `dirfd' function. */ +/* #undef HAVE_DIRFD */ + +/* Define if the malloc check has been performed. */ +#define HAVE_DONE_WORKING_MALLOC_CHECK 1 + +/* Define if the realloc check has been performed. */ +#define HAVE_DONE_WORKING_REALLOC_CHECK 1 + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ /* #undef HAVE_DOPRNT */ -/* Define if the `long double' type works. */ -#define HAVE_LONG_DOUBLE 1 +/* Define to 1 if you have the `dup2' function. */ +#define HAVE_DUP2 1 + +/* Define to 1 if you have the `endgrent' function. */ +#define HAVE_ENDGRENT 1 + +/* Define to 1 if you have the `endpwent' function. */ +#define HAVE_ENDPWENT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the `euidaccess' function. */ +/* #undef HAVE_EUIDACCESS */ + +/* Define to 1 if you have the `fchdir' function. */ +#define HAVE_FCHDIR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `fdatasync' function. */ +/* #undef HAVE_FDATASYNC */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FENV_H */ + +/* Define to 1 if you have the `feof_unlocked' function. */ +/* #undef HAVE_FEOF_UNLOCKED */ + +/* Define to 1 if you have the `ferror_unlocked' function. */ +/* #undef HAVE_FERROR_UNLOCKED */ + +/* Define to 1 if you have the `fesetround' function. */ +/* #undef HAVE_FESETROUND */ + +/* Define to 1 if you have the `fflush_unlocked' function. */ +/* #undef HAVE_FFLUSH_UNLOCKED */ + +/* Define to 1 if you have the `fgets_unlocked' function. */ +/* #undef HAVE_FGETS_UNLOCKED */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FLOAT_H 1 + +/* Define to 1 if you have the `floor' function. */ +#define HAVE_FLOOR 1 + +/* Define to 1 if your system has a working `fnmatch' function. */ +#define HAVE_FNMATCH 1 + +/* Define to 1 if you have the `fputc_unlocked' function. */ +/* #undef HAVE_FPUTC_UNLOCKED */ + +/* Define to 1 if you have the `fputs_unlocked' function. */ +/* #undef HAVE_FPUTS_UNLOCKED */ + +/* Define to 1 if you have the `fread_unlocked' function. */ +/* #undef HAVE_FREAD_UNLOCKED */ + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#define HAVE_FSEEKO 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FS_INFO_H */ + +/* Define to 1 if you have the `fs_stat_dev' function. */ +/* #undef HAVE_FS_STAT_DEV */ + +/* Define to 1 if you have the `ftime' function. */ +/* #undef HAVE_FTIME */ + +/* Define to 1 if you have the `ftruncate' function. */ +#define HAVE_FTRUNCATE 1 + +/* Define to 1 if you have the `fwrite_unlocked' function. */ +/* #undef HAVE_FWRITE_UNLOCKED */ + +/* Define if struct statfs has the f_fstypename member. */ +#define HAVE_F_FSTYPENAME_IN_STATFS 1 + +/* Define to 1 if you have the `getchar_unlocked' function. */ +/* #undef HAVE_GETCHAR_UNLOCKED */ + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define if getcwd (NULL, 0) allocates memory for result. */ +#define HAVE_GETCWD_NULL 1 + +/* Define to 1 if you have the `getc_unlocked' function. */ +/* #undef HAVE_GETC_UNLOCKED */ + +/* Define to 1 if you have the `getdelim' function. */ +/* #undef HAVE_GETDELIM */ + +/* Define to 1 if you have the `getegid' function. */ +#define HAVE_GETEGID 1 + +/* Define to 1 if you have the `geteuid' function. */ +#define HAVE_GETEUID 1 + +/* Define to 1 if you have the `getgid' function. */ +#define HAVE_GETGID 1 + +/* Define to 1 if you have the `getgroups' function. */ +#define HAVE_GETGROUPS 1 + +/* Define to 1 if you have the `gethostbyaddr' function. */ +#define HAVE_GETHOSTBYADDR 1 + +/* Define to 1 if you have the `gethostbyname' function. */ +#define HAVE_GETHOSTBYNAME 1 + +/* Define to 1 if you have the `gethostname' function. */ +#define HAVE_GETHOSTNAME 1 + +/* Define to 1 if you have the `gethrtime' function. */ +/* #undef HAVE_GETHRTIME */ + +/* Define to 1 if you have the `getloadavg' function. */ +#define HAVE_GETLOADAVG 1 + +/* Define to 1 if you have the `getmntent' function. */ +/* #undef HAVE_GETMNTENT */ + +/* Define to 1 if you have the `getmntinfo' function. */ +#define HAVE_GETMNTINFO 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getpass' function. */ +#define HAVE_GETPASS 1 + +/* Define to 1 if you have the `getspnam' function. */ +/* #undef HAVE_GETSPNAM */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the `getuid' function. */ +#define HAVE_GETUID 1 + +/* Define to 1 if you have the `getusershell' function. */ +#define HAVE_GETUSERSHELL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GRP_H 1 + +/* Define to 1 if you have the `hasmntopt' function. */ +/* #undef HAVE_HASMNTOPT */ + +/* Define if you have the iconv() function. */ +/* #undef HAVE_ICONV */ + +/* Define to 1 if you have the `inet_ntoa' function. */ +#define HAVE_INET_NTOA 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `isascii' function. */ +#define HAVE_ISASCII 1 + +/* Define to 1 if you have the `iswcntrl' function. */ +/* #undef HAVE_ISWCNTRL */ + +/* Define to 1 if you have the `iswprint' function. */ +/* #undef HAVE_ISWPRINT */ + +/* Define to 1 if you have the `iswspace' function. */ +/* #undef HAVE_ISWSPACE */ + +/* Define if you have and nl_langinfo(CODESET). */ +#define HAVE_LANGINFO_CODESET 1 + +/* Define to 1 if you have the `lchown' function. */ +#define HAVE_LCHOWN 1 + +/* Define if your file defines LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 + +/* Define to 1 if you have the `dgc' library (-ldgc). */ +/* #undef HAVE_LIBDGC */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBINTL_H */ + +/* Define to 1 if you have the `kstat' library (-lkstat). */ +/* #undef HAVE_LIBKSTAT */ + +/* Define to 1 if you have the `ldgc' library (-lldgc). */ +/* #undef HAVE_LIBLDGC */ + +/* Define to 1 if you have the `ypsec' library (-lypsec). */ +/* #undef HAVE_LIBYPSEC */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the `listmntent' function. */ +/* #undef HAVE_LISTMNTENT */ + +/* Define to 1 if you have the `localeconv' function. */ +#define HAVE_LOCALECONV 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + +/* Define to 1 if you have the `localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + +/* Define to 1 if long double works and has more range or precision than + double. */ +/* #undef HAVE_LONG_DOUBLE */ + +/* Define to 1 if you support file names longer than 14 characters. */ +#define HAVE_LONG_FILE_NAMES 1 + +/* Define if you have the long long type. */ +#define HAVE_LONG_LONG 1 + +/* Define if lstat has the bug that it succeeds when given the zero-length + file name argument. The lstat from SunOS4.1.4 and the Hurd as of + 1998-11-01) do this. */ +/* #undef HAVE_LSTAT_EMPTY_STRING_BUG */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MACH_MACH_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MALLOC_H */ + +/* Define to 1 if you have the `mblen' function. */ +#define HAVE_MBLEN 1 + +/* Define to 1 if you have the `mbrlen' function. */ +/* #undef HAVE_MBRLEN */ + +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ +/* #undef HAVE_MBRTOWC */ + +/* Define to 1 if you have the `mbsinit' function. */ +/* #undef HAVE_MBSINIT */ + +/* Define to 1 if you have the `memchr' function. */ +#define HAVE_MEMCHR 1 + +/* Define to 1 if you have the `memcmp' function. */ +#define HAVE_MEMCMP 1 + +/* Define to 1 if you have the `memcpy' function. */ +#define HAVE_MEMCPY 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mempcpy' function. */ +/* #undef HAVE_MEMPCPY */ + +/* Define to 1 if you have the `memrchr' function. */ +/* #undef HAVE_MEMRCHR */ + +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define to 1 if you have the `mkfifo' function. */ +#define HAVE_MKFIFO 1 + +/* Define to 1 if you have the `mkstemp' function. */ +#define HAVE_MKSTEMP 1 + +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MNTENT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MNTTAB_H */ + +/* Define to 1 if you have the `modf' function. */ +#define HAVE_MODF 1 + +/* Define to 1 if you have the `munmap' function. */ +#define HAVE_MUNMAP 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define to 1 if you have the `next_dev' function. */ +/* #undef HAVE_NEXT_DEV */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NLIST_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NL_TYPES_H 1 + +/* Define to 1 if libc includes obstacks. */ +/* #undef HAVE_OBSTACK */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OS_H */ + +/* Define to 1 if you have the `pathconf' function. */ +#define HAVE_PATHCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PATHS_H 1 + +/* Define if your system has the /proc/uptime special file. */ +/* #undef HAVE_PROC_UPTIME */ + +/* Define to 1 if you have the `pstat_getdynamic' function. */ +/* #undef HAVE_PSTAT_GETDYNAMIC */ + +/* Define to 1 if you have the `pstat_getstatic' function. */ +/* #undef HAVE_PSTAT_GETSTATIC */ + +/* Define to 1 if you have the `putchar_unlocked' function. */ +/* #undef HAVE_PUTCHAR_UNLOCKED */ + +/* Define to 1 if you have the `putc_unlocked' function. */ +/* #undef HAVE_PUTC_UNLOCKED */ + +/* Define to 1 if you have the `putenv' function. */ +/* #undef HAVE_PUTENV */ + +/* Define to 1 if you have the header file. */ +#define HAVE_PWD_H 1 + +/* Define to 1 if you have the `realpath' function. */ +#define HAVE_REALPATH 1 + +/* Define to 1 if you have the `resolvepath' function. */ +/* #undef HAVE_RESOLVEPATH */ + +/* Define to 1 if you have the `rint' function. */ +#define HAVE_RINT 1 + +/* Define to 1 if you have the `rmdir' function. */ +#define HAVE_RMDIR 1 + +/* Define to 1 if you have the `rpmatch' function. */ +/* #undef HAVE_RPMATCH */ + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `sethostname' function. */ +#define HAVE_SETHOSTNAME 1 + +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SHADOW_H */ + +/* Define to 1 if you have the `sqrt' function. */ +/* #undef HAVE_SQRT */ + +/* Define if stat has the bug that it succeeds when given the zero-length file + name argument. The stat from SunOS4.1.4 and the Hurd as of 1998-11-01) do + this. */ +/* #undef HAVE_STAT_EMPTY_STRING_BUG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDDEF_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_STDIO_EXT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `stime' function. */ +/* #undef HAVE_STIME */ + +/* Define to 1 if you have the `stpcpy' function. */ +/* #undef HAVE_STPCPY */ + +/* Define to 1 if you have the `strcasecmp' function. */ +#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the `strcspn' function. */ +#define HAVE_STRCSPN 1 + +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strncasecmp' function. */ +#define HAVE_STRNCASECMP 1 + +/* Define to 1 if you have the `strndup' function. */ +/* #undef HAVE_STRNDUP */ + +/* Define to 1 if you have the `strnlen' function. */ +/* #undef HAVE_STRNLEN */ + +/* Define to 1 if you have the `strpbrk' function. */ +#define HAVE_STRPBRK 1 + +/* Define to 1 if you have the `strrchr' function. */ +#define HAVE_STRRCHR 1 + +/* Define to 1 if you have the `strstr' function. */ +#define HAVE_STRSTR 1 + +/* Define to 1 if you have the `strtoimax' function. */ +#define HAVE_STRTOIMAX 1 + +/* Define to 1 if you have the `strtol' function. */ +#define HAVE_STRTOL 1 + +/* Define to 1 if you have the `strtoll' function. */ +/* #undef HAVE_STRTOLL */ + +/* Define to 1 if you have the `strtoul' function. */ +#define HAVE_STRTOUL 1 + +/* Define to 1 if you have the `strtoull' function. */ +/* #undef HAVE_STRTOULL */ + +/* Define to 1 if you have the `strtoumax' function. */ +#define HAVE_STRTOUMAX 1 + +/* Define to 1 if `f_fstypename' is member of `struct fsstat'. */ +/* #undef HAVE_STRUCT_FSSTAT_F_FSTYPENAME */ + +/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */ +/* #undef HAVE_STRUCT_NLIST_N_UN_N_NAME */ + +/* Define to 1 if `sp_pwdp' is member of `struct spwd'. */ +/* #undef HAVE_STRUCT_SPWD_SP_PWDP */ + +/* Define to 1 if `st_blksize' is member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 + +/* Define to 1 if `st_blocks' is member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_BLOCKS 1 + +/* Define if struct timespec is declared in . */ +#define HAVE_STRUCT_TIMESPEC 1 + +/* Define to 1 if `tm_zone' is member of `struct tm'. */ +#define HAVE_STRUCT_TM_TM_ZONE 1 + +/* Define if struct utimbuf is declared -- usually in . Some systems + have utime.h but don't declare the struct anywhere. */ +#define HAVE_STRUCT_UTIMBUF 1 + +/* Define to 1 if `ut_name' is member of `struct utmpx'. */ +/* #undef HAVE_STRUCT_UTMPX_UT_NAME */ + +/* Define to 1 if `ut_type' is member of `struct utmpx'. */ +/* #undef HAVE_STRUCT_UTMPX_UT_TYPE */ + +/* Define to 1 if `ut_user' is member of `struct utmpx'. */ +/* #undef HAVE_STRUCT_UTMPX_UT_USER */ + +/* Define to 1 if `ut_name' is member of `struct utmp'. */ +#define HAVE_STRUCT_UTMP_UT_NAME 1 + +/* Define to 1 if `ut_type' is member of `struct utmp'. */ +/* #undef HAVE_STRUCT_UTMP_UT_TYPE */ + +/* Define to 1 if `ut_user' is member of `struct utmp'. */ +/* #undef HAVE_STRUCT_UTMP_UT_USER */ + +/* Define to 1 if you have the `strverscmp' function. */ +/* #undef HAVE_STRVERSCMP */ + +/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use + `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */ +#define HAVE_ST_BLOCKS 1 + +/* Define if struct stat has an st_dm_mode member. */ +/* #undef HAVE_ST_DM_MODE */ + +/* Define to 1 if you have the `sysinfo' function. */ +/* #undef HAVE_SYSINFO */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSLOG_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_ACL_H 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_FILSYS_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_FSTYP_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_FS_S5PARAM_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_FS_TYPES_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MNTENT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MOUNT_H 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_PSTAT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_STATFS_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_STATVFS_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SYSTEMINFO_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIMEB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UCRED_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_VFS_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define if struct tm has the tm_gmtoff member. */ +#define HAVE_TM_GMTOFF 1 + +/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use + `HAVE_STRUCT_TM_TM_ZONE' instead. */ +#define HAVE_TM_ZONE 1 + +/* Define to 1 if you have the `tsearch' function. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 6:22:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0590F37B401; Sat, 29 Jun 2002 06:21:18 -0700 (PDT) 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 965BF37B400 for ; Sat, 29 Jun 2002 06:21:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0BF543E09 for ; Sat, 29 Jun 2002 06:21:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5TDLGJU000952 for ; Sat, 29 Jun 2002 06:21:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5TDLG92000949 for perforce@freebsd.org; Sat, 29 Jun 2002 06:21:16 -0700 (PDT) Date: Sat, 29 Jun 2002 06:21:16 -0700 (PDT) Message-Id: <200206291321.g5TDLG92000949@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13594 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13594 Change 13594 by rwatson@rwatson_curry on 2002/06/29 06:20:29 Cruft p4 missed last time. Affected files ... .. //depot/projects/trustedbsd/mac/gnu/usr.bin/sort/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/sort/config.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ifs/ifs_vfsops.c#7 delete .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/ispppcontrol/ispppcontrol.c#3 delete Differences ... ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/sort/Makefile#2 (text+ko) ==== @@ -1,6 +1,30 @@ +# $FreeBSD: src/gnu/usr.bin/sort/Makefile,v 1.7 2002/06/08 10:34:12 ache Exp $ + +SORTDIR= ${.CURDIR}/../../../contrib/gnu-sort +.PATH: ${SORTDIR}/lib ${SORTDIR}/src ${SORTDIR}/man + PROG= sort -SRCS= sort.c error.c version.c long-options.c getopt.c getopt1.c xstrtod.c +SRCS= sort.c \ + argmatch.c \ + dup-safer.c \ + error.c \ + fopen-safer.c \ + getopt.c \ + getopt1.c \ + hard-locale.c \ + human.c \ + long-options.c \ + memcoll.c \ + physmem.c \ + posixver.c \ + quote.c \ + quotearg.c \ + version-etc.c \ + xmalloc.c \ + xmemcoll.c \ + xstrtoul.c \ + xstrtoumax.c -CFLAGS+=-I${.CURDIR} -DHAVE_CONFIG_H +CFLAGS+=-I${.CURDIR} -I${SORTDIR}/lib -DHAVE_CONFIG_H .include ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/sort/config.h#2 (text+ko) ==== @@ -1,123 +1,1316 @@ -/* config.h. Generated automatically by configure. */ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* $FreeBSD: src/gnu/usr.bin/sort/config.h,v 1.4 2002/06/08 10:34:12 ache Exp $ */ +/* config.h. Generated by configure. */ +/* config.hin. Generated from configure.ac by autoheader. */ + +/* Define if you have the Andrew File System. */ +/* #undef AFS */ + +/* Define to the function xargmatch calls on failures. */ +#define ARGMATCH_DIE usage (1) + +/* Define to the declaration of the xargmatch failure function. */ +#define ARGMATCH_DIE_DECL extern void usage () + +/* Define to 1 if the `closedir' function returns void instead of `int'. */ +/* #undef CLOSEDIR_VOID */ + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ + +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ + +/* Define to 1 if using `getloadavg.c'. */ +/* #undef C_GETLOADAVG */ + +/* Define to 1 for DGUX with . */ +/* #undef DGUX */ + +/* the name of the file descriptor member of DIR */ +/* #undef DIR_FD_MEMBER_NAME */ + +#ifdef DIR_FD_MEMBER_NAME +# define DIR_TO_FD(Dir_p) ((Dir_p)->DIR_FD_MEMBER_NAME) +#else +# define DIR_TO_FD(Dir_p) -1 +#endif + + + +/* Define if there is a member named d_ino in the struct describing directory + headers. */ +#define D_INO_IN_DIRENT 1 + +/* Define if there is a member named d_type in the struct describing directory + headers. */ +#define D_TYPE_IN_DIRENT 1 + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#define ENABLE_NLS 1 + +/* Define on systems for which file names may have a so-called `drive letter' + prefix, define this to compute the length of that prefix, including the + colon. */ +#define FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX 0 + +/* Define if the backslash character may also serve as a file name component + separator. */ +#define FILESYSTEM_BACKSLASH_IS_FILE_NAME_SEPARATOR 0 -/* Define if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -/* #undef _ALL_SOURCE */ +#if FILESYSTEM_ACCEPTS_DRIVE_LETTER_PREFIX +# define FILESYSTEM_PREFIX_LEN(Filename) \ + ((Filename)[0] && (Filename)[1] == ':' ? 2 : 0) +#else +# define FILESYSTEM_PREFIX_LEN(Filename) 0 #endif -/* Define if using alloca.c. */ -/* #undef C_ALLOCA */ +/* Define to the type of elements in the array set by `getgroups'. Usually + this is either `int' or `gid_t'. */ +#define GETGROUPS_T gid_t + +/* Define if the `getloadavg' function needs to be run setuid or setgid. */ +/* #undef GETLOADAVG_PRIVILEGED */ + +/* Define if gettimeofday clobbers localtime's static buffer. */ +/* #undef GETTIMEOFDAY_CLOBBERS_LOCALTIME_BUFFER */ + +/* The concatenation of the strings `GNU ', and PACKAGE. */ +#define GNU_PACKAGE "GNU textutils" -/* Define to empty if the keyword does not work. */ -/* #undef const */ +/* Define to 1 if you have the `acl' function. */ +/* #undef HAVE_ACL */ -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -/* #undef CRAY_STACKSEG_END */ +/* Define to 1 if you have the `alarm' function. */ +#define HAVE_ALARM 1 -/* Define if you have alloca, as a function or macro. */ +/* Define to 1 if you have `alloca', as a function or macro. */ #define HAVE_ALLOCA 1 -/* Define if you have and it should be used (not on Ultrix). */ +/* Define to 1 if you have and it should be used (not on Ultrix). + */ /* #undef HAVE_ALLOCA_H */ -/* Define if you don't have vprintf but do have _doprnt. */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ARGZ_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ARPA_INET_H 1 + +/* Define to 1 if you have the `atexit' function. */ +#define HAVE_ATEXIT 1 + +/* Define to 1 if you have the `bcopy' function. */ +#define HAVE_BCOPY 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BP_SYM_H */ + +/* Define to 1 if you have the `btowc' function. */ +/* #undef HAVE_BTOWC */ + +/* Define to 1 if you have the `bzero' function. */ +#define HAVE_BZERO 1 + +/* Define to 1 if you have the `canonicalize_file_name' function. */ +/* #undef HAVE_CANONICALIZE_FILE_NAME */ + +/* Define to 1 if you have the `chsize' function. */ +/* #undef HAVE_CHSIZE */ + +/* Define to 1 if you have the `clearerr_unlocked' function. */ +/* #undef HAVE_CLEARERR_UNLOCKED */ + +/* Define to 1 if you have the `clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + +/* Define if backslash-a works in C strings. */ +#define HAVE_C_BACKSLASH_A 1 + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_CLEARERR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `dirfd', and to 0 if you don't. + */ +#define HAVE_DECL_DIRFD 1 + +/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_FEOF_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FERROR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FFLUSH_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FGETS_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FPUTC_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FPUTS_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FREAD_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `free', and to 0 if you don't. + */ +#define HAVE_DECL_FREE 1 + +/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_FWRITE_UNLOCKED 0 + +/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_GETCHAR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_GETC_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't. + */ +#define HAVE_DECL_GETENV 1 + +/* Define to 1 if you have the declaration of `geteuid', and to 0 if you + don't. */ +#define HAVE_DECL_GETEUID 1 + +/* Define to 1 if you have the declaration of `getgrgid', and to 0 if you + don't. */ +#define HAVE_DECL_GETGRGID 1 + +/* Define to 1 if you have the declaration of `getlogin', and to 0 if you + don't. */ +#define HAVE_DECL_GETLOGIN 1 + +/* Define to 1 if you have the declaration of `getpwuid', and to 0 if you + don't. */ +#define HAVE_DECL_GETPWUID 1 + +/* Define to 1 if you have the declaration of `getuid', and to 0 if you don't. + */ +#define HAVE_DECL_GETUID 1 + +/* Define to 1 if you have the declaration of `getutent', and to 0 if you + don't. */ +#define HAVE_DECL_GETUTENT 0 + +/* Define to 1 if you have the declaration of `lseek', and to 0 if you don't. + */ +#define HAVE_DECL_LSEEK 1 + +/* Define to 1 if you have the declaration of `malloc', and to 0 if you don't. + */ +#define HAVE_DECL_MALLOC 1 + +/* Define to 1 if you have the declaration of `memchr', and to 0 if you don't. + */ +#define HAVE_DECL_MEMCHR 1 + +/* Define to 1 if you have the declaration of `memrchr', and to 0 if you + don't. */ +#define HAVE_DECL_MEMRCHR 0 + +/* Define to 1 if you have the declaration of `nanosleep', and to 0 if you + don't. */ +#define HAVE_DECL_NANOSLEEP 1 + +/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if + you don't. */ +#define HAVE_DECL_PUTCHAR_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you + don't. */ +#define HAVE_DECL_PUTC_UNLOCKED 1 + +/* Define to 1 if you have the declaration of `realloc', and to 0 if you + don't. */ +#define HAVE_DECL_REALLOC 1 + +/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't. + */ +#define HAVE_DECL_STPCPY 0 + +/* Define to 1 if you have the declaration of `strerror', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR 1 + +/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you + don't. */ +#define HAVE_DECL_STRERROR_R 1 + +/* Define to 1 if you have the declaration of `strndup', and to 0 if you + don't. */ +#define HAVE_DECL_STRNDUP 0 + +/* Define to 1 if you have the declaration of `strnlen', and to 0 if you + don't. */ +#define HAVE_DECL_STRNLEN 0 + +/* Define to 1 if you have the declaration of `strstr', and to 0 if you don't. + */ +#define HAVE_DECL_STRSTR 1 + +/* Define to 1 if you have the declaration of `strtoimax', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOIMAX 1 + +/* Define to 1 if you have the declaration of `strtol', and to 0 if you don't. + */ +#define HAVE_DECL_STRTOL 1 + +/* Define to 1 if you have the declaration of `strtoll', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOLL 1 + +/* Define to 1 if you have the declaration of `strtoul', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOUL 1 + +/* Define to 1 if you have the declaration of `strtoull', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOULL 1 + +/* Define to 1 if you have the declaration of `strtoumax', and to 0 if you + don't. */ +#define HAVE_DECL_STRTOUMAX 1 + +/* Define to 1 if you have the declaration of `ttyname', and to 0 if you + don't. */ +#define HAVE_DECL_TTYNAME 1 + +/* Define to 1 if you have the declaration of wcwidth(), and to 0 otherwise. + */ +#define HAVE_DECL_WCWIDTH 0 + +/* Define to 1 if you have the declaration of `__fpending', and to 0 if you + don't. */ +#define HAVE_DECL___FPENDING 0 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the `dirfd' function. */ +/* #undef HAVE_DIRFD */ + +/* Define if the malloc check has been performed. */ +#define HAVE_DONE_WORKING_MALLOC_CHECK 1 + +/* Define if the realloc check has been performed. */ +#define HAVE_DONE_WORKING_REALLOC_CHECK 1 + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ /* #undef HAVE_DOPRNT */ -/* Define if the `long double' type works. */ -#define HAVE_LONG_DOUBLE 1 +/* Define to 1 if you have the `dup2' function. */ +#define HAVE_DUP2 1 + +/* Define to 1 if you have the `endgrent' function. */ +#define HAVE_ENDGRENT 1 + +/* Define to 1 if you have the `endpwent' function. */ +#define HAVE_ENDPWENT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the `euidaccess' function. */ +/* #undef HAVE_EUIDACCESS */ + +/* Define to 1 if you have the `fchdir' function. */ +#define HAVE_FCHDIR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `fdatasync' function. */ +/* #undef HAVE_FDATASYNC */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FENV_H */ + +/* Define to 1 if you have the `feof_unlocked' function. */ +/* #undef HAVE_FEOF_UNLOCKED */ + +/* Define to 1 if you have the `ferror_unlocked' function. */ +/* #undef HAVE_FERROR_UNLOCKED */ + +/* Define to 1 if you have the `fesetround' function. */ +/* #undef HAVE_FESETROUND */ + +/* Define to 1 if you have the `fflush_unlocked' function. */ +/* #undef HAVE_FFLUSH_UNLOCKED */ + +/* Define to 1 if you have the `fgets_unlocked' function. */ +/* #undef HAVE_FGETS_UNLOCKED */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FLOAT_H 1 + +/* Define to 1 if you have the `floor' function. */ +#define HAVE_FLOOR 1 + +/* Define to 1 if your system has a working `fnmatch' function. */ +#define HAVE_FNMATCH 1 + +/* Define to 1 if you have the `fputc_unlocked' function. */ +/* #undef HAVE_FPUTC_UNLOCKED */ + +/* Define to 1 if you have the `fputs_unlocked' function. */ +/* #undef HAVE_FPUTS_UNLOCKED */ + +/* Define to 1 if you have the `fread_unlocked' function. */ +/* #undef HAVE_FREAD_UNLOCKED */ + +/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ +#define HAVE_FSEEKO 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FS_INFO_H */ + +/* Define to 1 if you have the `fs_stat_dev' function. */ +/* #undef HAVE_FS_STAT_DEV */ + +/* Define to 1 if you have the `ftime' function. */ +/* #undef HAVE_FTIME */ + +/* Define to 1 if you have the `ftruncate' function. */ +#define HAVE_FTRUNCATE 1 + +/* Define to 1 if you have the `fwrite_unlocked' function. */ +/* #undef HAVE_FWRITE_UNLOCKED */ + +/* Define if struct statfs has the f_fstypename member. */ +#define HAVE_F_FSTYPENAME_IN_STATFS 1 + +/* Define to 1 if you have the `getchar_unlocked' function. */ +/* #undef HAVE_GETCHAR_UNLOCKED */ + +/* Define to 1 if you have the `getcwd' function. */ +#define HAVE_GETCWD 1 + +/* Define if getcwd (NULL, 0) allocates memory for result. */ +#define HAVE_GETCWD_NULL 1 + +/* Define to 1 if you have the `getc_unlocked' function. */ +/* #undef HAVE_GETC_UNLOCKED */ + +/* Define to 1 if you have the `getdelim' function. */ +/* #undef HAVE_GETDELIM */ + +/* Define to 1 if you have the `getegid' function. */ +#define HAVE_GETEGID 1 + +/* Define to 1 if you have the `geteuid' function. */ +#define HAVE_GETEUID 1 + +/* Define to 1 if you have the `getgid' function. */ +#define HAVE_GETGID 1 + +/* Define to 1 if you have the `getgroups' function. */ +#define HAVE_GETGROUPS 1 + +/* Define to 1 if you have the `gethostbyaddr' function. */ +#define HAVE_GETHOSTBYADDR 1 + +/* Define to 1 if you have the `gethostbyname' function. */ +#define HAVE_GETHOSTBYNAME 1 + +/* Define to 1 if you have the `gethostname' function. */ +#define HAVE_GETHOSTNAME 1 + +/* Define to 1 if you have the `gethrtime' function. */ +/* #undef HAVE_GETHRTIME */ + +/* Define to 1 if you have the `getloadavg' function. */ +#define HAVE_GETLOADAVG 1 + +/* Define to 1 if you have the `getmntent' function. */ +/* #undef HAVE_GETMNTENT */ + +/* Define to 1 if you have the `getmntinfo' function. */ +#define HAVE_GETMNTINFO 1 + +/* Define to 1 if you have the `getpagesize' function. */ +#define HAVE_GETPAGESIZE 1 + +/* Define to 1 if you have the `getpass' function. */ +#define HAVE_GETPASS 1 + +/* Define to 1 if you have the `getspnam' function. */ +/* #undef HAVE_GETSPNAM */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the `getuid' function. */ +#define HAVE_GETUID 1 + +/* Define to 1 if you have the `getusershell' function. */ +#define HAVE_GETUSERSHELL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_GRP_H 1 + +/* Define to 1 if you have the `hasmntopt' function. */ +/* #undef HAVE_HASMNTOPT */ + +/* Define if you have the iconv() function. */ +/* #undef HAVE_ICONV */ + +/* Define to 1 if you have the `inet_ntoa' function. */ +#define HAVE_INET_NTOA 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `isascii' function. */ +#define HAVE_ISASCII 1 + +/* Define to 1 if you have the `iswcntrl' function. */ +/* #undef HAVE_ISWCNTRL */ + +/* Define to 1 if you have the `iswprint' function. */ +/* #undef HAVE_ISWPRINT */ + +/* Define to 1 if you have the `iswspace' function. */ +/* #undef HAVE_ISWSPACE */ + +/* Define if you have and nl_langinfo(CODESET). */ +#define HAVE_LANGINFO_CODESET 1 + +/* Define to 1 if you have the `lchown' function. */ +#define HAVE_LCHOWN 1 + +/* Define if your file defines LC_MESSAGES. */ +#define HAVE_LC_MESSAGES 1 + +/* Define to 1 if you have the `dgc' library (-ldgc). */ +/* #undef HAVE_LIBDGC */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_LIBINTL_H */ + +/* Define to 1 if you have the `kstat' library (-lkstat). */ +/* #undef HAVE_LIBKSTAT */ + +/* Define to 1 if you have the `ldgc' library (-lldgc). */ +/* #undef HAVE_LIBLDGC */ + +/* Define to 1 if you have the `ypsec' library (-lypsec). */ +/* #undef HAVE_LIBYPSEC */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the `listmntent' function. */ +/* #undef HAVE_LISTMNTENT */ + +/* Define to 1 if you have the `localeconv' function. */ +#define HAVE_LOCALECONV 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LOCALE_H 1 + +/* Define to 1 if you have the `localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + +/* Define to 1 if long double works and has more range or precision than + double. */ +/* #undef HAVE_LONG_DOUBLE */ + +/* Define to 1 if you support file names longer than 14 characters. */ +#define HAVE_LONG_FILE_NAMES 1 + +/* Define if you have the long long type. */ +#define HAVE_LONG_LONG 1 + +/* Define if lstat has the bug that it succeeds when given the zero-length + file name argument. The lstat from SunOS4.1.4 and the Hurd as of + 1998-11-01) do this. */ +/* #undef HAVE_LSTAT_EMPTY_STRING_BUG */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MACH_MACH_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MALLOC_H */ + +/* Define to 1 if you have the `mblen' function. */ +#define HAVE_MBLEN 1 + +/* Define to 1 if you have the `mbrlen' function. */ +/* #undef HAVE_MBRLEN */ + +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ +/* #undef HAVE_MBRTOWC */ + +/* Define to 1 if you have the `mbsinit' function. */ +/* #undef HAVE_MBSINIT */ + +/* Define to 1 if you have the `memchr' function. */ +#define HAVE_MEMCHR 1 + +/* Define to 1 if you have the `memcmp' function. */ +#define HAVE_MEMCMP 1 + +/* Define to 1 if you have the `memcpy' function. */ +#define HAVE_MEMCPY 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mempcpy' function. */ +/* #undef HAVE_MEMPCPY */ + +/* Define to 1 if you have the `memrchr' function. */ +/* #undef HAVE_MEMRCHR */ + +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define to 1 if you have the `mkfifo' function. */ +#define HAVE_MKFIFO 1 + +/* Define to 1 if you have the `mkstemp' function. */ +#define HAVE_MKSTEMP 1 + +/* Define to 1 if you have a working `mmap' system call. */ +#define HAVE_MMAP 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MNTENT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MNTTAB_H */ + +/* Define to 1 if you have the `modf' function. */ +#define HAVE_MODF 1 + +/* Define to 1 if you have the `munmap' function. */ +#define HAVE_MUNMAP 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define to 1 if you have the `next_dev' function. */ +/* #undef HAVE_NEXT_DEV */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NLIST_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NL_TYPES_H 1 + +/* Define to 1 if libc includes obstacks. */ +/* #undef HAVE_OBSTACK */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_OS_H */ + +/* Define to 1 if you have the `pathconf' function. */ +#define HAVE_PATHCONF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PATHS_H 1 + +/* Define if your system has the /proc/uptime special file. */ +/* #undef HAVE_PROC_UPTIME */ + +/* Define to 1 if you have the `pstat_getdynamic' function. */ +/* #undef HAVE_PSTAT_GETDYNAMIC */ + +/* Define to 1 if you have the `pstat_getstatic' function. */ +/* #undef HAVE_PSTAT_GETSTATIC */ + +/* Define to 1 if you have the `putchar_unlocked' function. */ +/* #undef HAVE_PUTCHAR_UNLOCKED */ + +/* Define to 1 if you have the `putc_unlocked' function. */ +/* #undef HAVE_PUTC_UNLOCKED */ + +/* Define to 1 if you have the `putenv' function. */ +/* #undef HAVE_PUTENV */ + +/* Define to 1 if you have the header file. */ +#define HAVE_PWD_H 1 + +/* Define to 1 if you have the `realpath' function. */ +#define HAVE_REALPATH 1 + +/* Define to 1 if you have the `resolvepath' function. */ +/* #undef HAVE_RESOLVEPATH */ + +/* Define to 1 if you have the `rint' function. */ +#define HAVE_RINT 1 + +/* Define to 1 if you have the `rmdir' function. */ +#define HAVE_RMDIR 1 + +/* Define to 1 if you have the `rpmatch' function. */ +/* #undef HAVE_RPMATCH */ + +/* Define to 1 if you have the `setenv' function. */ +#define HAVE_SETENV 1 + +/* Define to 1 if you have the `sethostname' function. */ +#define HAVE_SETHOSTNAME 1 + +/* Define to 1 if you have the `setlocale' function. */ +#define HAVE_SETLOCALE 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SHADOW_H */ + +/* Define to 1 if you have the `sqrt' function. */ +/* #undef HAVE_SQRT */ + +/* Define if stat has the bug that it succeeds when given the zero-length file + name argument. The stat from SunOS4.1.4 and the Hurd as of 1998-11-01) do + this. */ +/* #undef HAVE_STAT_EMPTY_STRING_BUG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDDEF_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_STDIO_EXT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `stime' function. */ +/* #undef HAVE_STIME */ + +/* Define to 1 if you have the `stpcpy' function. */ +/* #undef HAVE_STPCPY */ + +/* Define to 1 if you have the `strcasecmp' function. */ +#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the `strcspn' function. */ +#define HAVE_STRCSPN 1 + +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strerror_r' function. */ +#define HAVE_STRERROR_R 1 + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strncasecmp' function. */ +#define HAVE_STRNCASECMP 1 + +/* Define to 1 if you have the `strndup' function. */ +/* #undef HAVE_STRNDUP */ + +/* Define to 1 if you have the `strnlen' function. */ +/* #undef HAVE_STRNLEN */ + +/* Define to 1 if you have the `strpbrk' function. */ +#define HAVE_STRPBRK 1 + +/* Define to 1 if you have the `strrchr' function. */ +#define HAVE_STRRCHR 1 + +/* Define to 1 if you have the `strstr' function. */ +#define HAVE_STRSTR 1 + +/* Define to 1 if you have the `strtoimax' function. */ +#define HAVE_STRTOIMAX 1 + +/* Define to 1 if you have the `strtol' function. */ +#define HAVE_STRTOL 1 + +/* Define to 1 if you have the `strtoll' function. */ +/* #undef HAVE_STRTOLL */ + +/* Define to 1 if you have the `strtoul' function. */ +#define HAVE_STRTOUL 1 + +/* Define to 1 if you have the `strtoull' function. */ +/* #undef HAVE_STRTOULL */ + +/* Define to 1 if you have the `strtoumax' function. */ +#define HAVE_STRTOUMAX 1 + +/* Define to 1 if `f_fstypename' is member of `struct fsstat'. */ +/* #undef HAVE_STRUCT_FSSTAT_F_FSTYPENAME */ + +/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */ +/* #undef HAVE_STRUCT_NLIST_N_UN_N_NAME */ + +/* Define to 1 if `sp_pwdp' is member of `struct spwd'. */ +/* #undef HAVE_STRUCT_SPWD_SP_PWDP */ + +/* Define to 1 if `st_blksize' is member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_BLKSIZE 1 + +/* Define to 1 if `st_blocks' is member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_BLOCKS 1 + +/* Define if struct timespec is declared in . */ +#define HAVE_STRUCT_TIMESPEC 1 + +/* Define to 1 if `tm_zone' is member of `struct tm'. */ +#define HAVE_STRUCT_TM_TM_ZONE 1 + +/* Define if struct utimbuf is declared -- usually in . Some systems + have utime.h but don't declare the struct anywhere. */ +#define HAVE_STRUCT_UTIMBUF 1 + +/* Define to 1 if `ut_name' is member of `struct utmpx'. */ +/* #undef HAVE_STRUCT_UTMPX_UT_NAME */ + +/* Define to 1 if `ut_type' is member of `struct utmpx'. */ +/* #undef HAVE_STRUCT_UTMPX_UT_TYPE */ + +/* Define to 1 if `ut_user' is member of `struct utmpx'. */ +/* #undef HAVE_STRUCT_UTMPX_UT_USER */ + +/* Define to 1 if `ut_name' is member of `struct utmp'. */ +#define HAVE_STRUCT_UTMP_UT_NAME 1 + +/* Define to 1 if `ut_type' is member of `struct utmp'. */ +/* #undef HAVE_STRUCT_UTMP_UT_TYPE */ + +/* Define to 1 if `ut_user' is member of `struct utmp'. */ +/* #undef HAVE_STRUCT_UTMP_UT_USER */ + +/* Define to 1 if you have the `strverscmp' function. */ +/* #undef HAVE_STRVERSCMP */ + +/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use + `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */ +#define HAVE_ST_BLOCKS 1 + +/* Define if struct stat has an st_dm_mode member. */ +/* #undef HAVE_ST_DM_MODE */ + +/* Define to 1 if you have the `sysinfo' function. */ +/* #undef HAVE_SYSINFO */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYSLOG_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_ACL_H 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_FILSYS_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_FSTYP_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_FS_S5PARAM_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_FS_TYPES_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MNTENT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_MOUNT_H 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_PSTAT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_RESOURCE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_STATFS_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_STATVFS_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SYSTEMINFO_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIMEB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_UCRED_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_VFS_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_WAIT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TERMIOS_H 1 + +/* Define if struct tm has the tm_gmtoff member. */ +#define HAVE_TM_GMTOFF 1 + +/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use + `HAVE_STRUCT_TM_TM_ZONE' instead. */ +#define HAVE_TM_ZONE 1 >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 10: 9:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4ADC537B400; Sat, 29 Jun 2002 10:07:53 -0700 (PDT) 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 E9A1737B401 for ; Sat, 29 Jun 2002 10:07:52 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4024143E06 for ; Sat, 29 Jun 2002 10:07:52 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5TH7qJU037438 for ; Sat, 29 Jun 2002 10:07:52 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5TH7pZ1037435 for perforce@freebsd.org; Sat, 29 Jun 2002 10:07:51 -0700 (PDT) Date: Sat, 29 Jun 2002 10:07:51 -0700 (PDT) Message-Id: <200206291707.g5TH7pZ1037435@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13597 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13597 Change 13597 by julian@julian_ref on 2002/06/29 10:07:22 MFC Affected files ... .. //depot/projects/kse/sys/conf/files.powerpc#7 integrate .. //depot/projects/kse/sys/pci/if_ti.c#12 integrate .. //depot/projects/kse/sys/powerpc/include/cpufunc.h#9 integrate .. //depot/projects/kse/sys/powerpc/include/critical.h#2 integrate .. //depot/projects/kse/sys/powerpc/include/in_cksum.h#1 branch .. //depot/projects/kse/sys/powerpc/include/pcb.h#5 integrate .. //depot/projects/kse/sys/powerpc/include/pmap.h#7 integrate .. //depot/projects/kse/sys/powerpc/powerpc/autoconf.c#5 integrate .. //depot/projects/kse/sys/powerpc/powerpc/bcopy.c#2 integrate .. //depot/projects/kse/sys/powerpc/powerpc/clock.c#6 integrate .. //depot/projects/kse/sys/powerpc/powerpc/in_cksum.c#1 branch .. //depot/projects/kse/sys/powerpc/powerpc/interrupt.c#1 branch .. //depot/projects/kse/sys/powerpc/powerpc/locore.s#8 integrate .. //depot/projects/kse/sys/powerpc/powerpc/ofw_machdep.c#4 integrate .. //depot/projects/kse/sys/powerpc/powerpc/pmap.c#17 integrate .. //depot/projects/kse/sys/powerpc/powerpc/swtch.s#13 integrate .. //depot/projects/kse/sys/powerpc/powerpc/trap_subr.S#4 integrate Differences ... ==== //depot/projects/kse/sys/conf/files.powerpc#7 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.10 2002/05/13 07:53:22 benno Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.12 2002/06/29 09:50:20 benno Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -21,6 +21,8 @@ powerpc/powerpc/extintr.c standard powerpc/powerpc/fpu.c standard powerpc/powerpc/fuswintr.c standard +powerpc/powerpc/in_cksum.c optional inet +powerpc/powerpc/interrupt.c standard powerpc/powerpc/machdep.c standard powerpc/powerpc/nexus.c standard powerpc/powerpc/ofwmagic.s standard ==== //depot/projects/kse/sys/pci/if_ti.c#12 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_ti.c,v 1.61 2002/06/29 02:32:34 peter Exp $ + * $FreeBSD: src/sys/pci/if_ti.c,v 1.62 2002/06/29 11:26:05 alfred Exp $ */ /* @@ -152,7 +152,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/pci/if_ti.c,v 1.61 2002/06/29 02:32:34 peter Exp $"; + "$FreeBSD: src/sys/pci/if_ti.c,v 1.62 2002/06/29 11:26:05 alfred Exp $"; #endif struct ti_softc *tis[8]; @@ -251,7 +251,7 @@ #ifdef TI_PRIVATE_JUMBOS static int ti_alloc_jumbo_mem (struct ti_softc *); static void *ti_jalloc (struct ti_softc *); -static void ti_jfree (caddr_t, void *); +static void ti_jfree (void *, void *); #endif /* TI_PRIVATE_JUMBOS */ static int ti_newbuf_std (struct ti_softc *, int, struct mbuf *); static int ti_newbuf_mini (struct ti_softc *, int, struct mbuf *); @@ -1077,7 +1077,7 @@ * Release a jumbo buffer. */ static void ti_jfree(buf, args) - caddr_t buf; + void *buf; void *args; { struct ti_softc *sc; ==== //depot/projects/kse/sys/powerpc/include/cpufunc.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/include/cpufunc.h,v 1.13 2002/04/16 11:45:09 benno Exp $ + * $FreeBSD: src/sys/powerpc/include/cpufunc.h,v 1.14 2002/06/29 10:00:07 benno Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -102,6 +102,13 @@ } static __inline void +eieio(void) +{ + + __asm __volatile ("eieio"); +} + +static __inline void isync(void) { ==== //depot/projects/kse/sys/powerpc/include/critical.h#2 (text+ko) ==== @@ -12,7 +12,7 @@ * related support functions residing * in //critical.c - prototyped * - * $FreeBSD: src/sys/powerpc/include/critical.h,v 1.1 2002/04/01 23:51:22 dillon Exp $ + * $FreeBSD: src/sys/powerpc/include/critical.h,v 1.2 2002/06/29 09:55:57 benno Exp $ */ #ifndef _MACHINE_CRITICAL_H_ @@ -43,7 +43,7 @@ msr = mfmsr(); td->td_md.md_savecrit = msr; - msr &= ~(PSL_EE | PSL_RI); + msr &= ~PSL_EE; mtmsr(msr); } ==== //depot/projects/kse/sys/powerpc/include/pcb.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: pcb.h,v 1.4 2000/06/04 11:57:17 tsubai Exp $ - * $FreeBSD: src/sys/powerpc/include/pcb.h,v 1.4 2002/05/13 07:44:42 benno Exp $ + * $FreeBSD: src/sys/powerpc/include/pcb.h,v 1.5 2002/06/29 09:39:43 benno Exp $ */ #ifndef _MACHINE_PCB_H_ @@ -38,7 +38,7 @@ typedef int faultbuf[23]; struct pcb { - register_t pcb_context[18]; /* non-volatile r14-r31 */ + register_t pcb_context[20]; /* non-volatile r14-r31 */ register_t pcb_cr; /* Condition register */ register_t pcb_sp; /* stack pointer */ register_t pcb_lr; /* link register */ ==== //depot/projects/kse/sys/powerpc/include/pmap.h#7 (text+ko) ==== @@ -29,7 +29,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: pmap.h,v 1.17 2000/03/30 16:18:24 jdolecek Exp $ - * $FreeBSD: src/sys/powerpc/include/pmap.h,v 1.6 2002/04/29 07:43:15 peter Exp $ + * $FreeBSD: src/sys/powerpc/include/pmap.h,v 1.8 2002/06/29 09:47:06 benno Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -68,11 +68,15 @@ #ifdef _KERNEL void pmap_bootstrap(vm_offset_t, vm_offset_t); +void *pmap_mapdev(vm_offset_t, vm_size_t); +void pmap_unmapdev(vm_offset_t, vm_size_t); void pmap_deactivate(struct thread *); vm_offset_t pmap_kextract(vm_offset_t); int pmap_pte_spill(vm_offset_t); +#define vtophys(va) pmap_kextract(((vm_offset_t)(va))) + extern vm_offset_t avail_start; extern vm_offset_t avail_end; extern vm_offset_t phys_avail[]; ==== //depot/projects/kse/sys/powerpc/powerpc/autoconf.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/powerpc/powerpc/autoconf.c,v 1.8 2002/03/31 07:15:27 phk Exp $"; + "$FreeBSD: src/sys/powerpc/powerpc/autoconf.c,v 1.9 2002/06/29 09:33:18 benno Exp $"; #endif #include "opt_bootp.h" @@ -60,6 +60,23 @@ static void configure(void *); SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL) +#ifdef NFS_ROOT +SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL) + +#ifndef BOOTP_NFSROOT +#error "NFS_ROOT support not implemented for the non-BOOTP_NFSROOT case" +#endif + +extern void bootpc_init(void); + +void +cpu_rootconf() +{ + + bootpc_init(); + rootdevnames[0] = "nfs:"; +} +#endif /* * Determine i/o configuration for a machine. ==== //depot/projects/kse/sys/powerpc/powerpc/bcopy.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* LIBC_SCCS and not lint */ #ifndef lint static char *rcsid = - "$FreeBSD: src/sys/powerpc/powerpc/bcopy.c,v 1.1 2001/06/10 02:39:37 benno Exp $"; + "$FreeBSD: src/sys/powerpc/powerpc/bcopy.c,v 1.2 2002/06/29 09:34:54 benno Exp $"; #endif #include @@ -152,3 +152,10 @@ memcpy(dst0, src0, length); } + +void +ovbcopy(const void *src0, void *dst0, size_t length) +{ + + memcpy(dst0, src0, length); +} ==== //depot/projects/kse/sys/powerpc/powerpc/clock.c#6 (text+ko) ==== @@ -57,7 +57,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/powerpc/powerpc/clock.c,v 1.8 2002/04/30 19:34:31 phk Exp $"; + "$FreeBSD: src/sys/powerpc/powerpc/clock.c,v 1.9 2002/06/29 09:28:21 benno Exp $"; #endif /* not lint */ #include @@ -83,7 +83,8 @@ /* * Initially we assume a processor with a bus frequency of 12.5 MHz. */ -static u_long ticks_per_sec = 12500000; +u_int tickspending; +static u_long ticks_per_sec = 12500000; static u_long ns_per_tick = 80; static long ticks_per_intr; static volatile u_long lasttb; @@ -189,28 +190,25 @@ */ lasttb = tb + tick - ticks_per_intr; - /* - * This probably needs some kind of locking. - */ - - intrcnt[CNT_CLOCK]++; - nticks += tickspending; tickspending = 0; /* * Reenable interrupts */ +#if 0 msr = mfmsr(); mtmsr(msr | PSL_EE | PSL_RI); - +#endif /* * Do standard timer interrupt stuff. * Do softclock stuff only on the last iteration. */ +#if 0 while (--nticks > 0) { hardclock(frame); } +#endif hardclock(frame); } ==== //depot/projects/kse/sys/powerpc/powerpc/locore.s#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/powerpc/powerpc/locore.s,v 1.10 2002/04/29 12:14:31 benno Exp $ */ +/* $FreeBSD: src/sys/powerpc/powerpc/locore.s,v 1.12 2002/06/29 09:31:27 benno Exp $ */ /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */ /* @@ -82,41 +82,7 @@ .space 8208 GLOBAL(esym) .long 0 /* end of symbol table */ -GLOBAL(proc0paddr) - .long 0 /* proc0 p_addr */ -GLOBAL(PTmap) - .long 0 /* PTmap */ -GLOBAL(decrnest) - .long 0 -GLOBAL(intrnames) - .asciz "irq0", "irq1", "irq2", "irq3" - .asciz "irq4", "irq5", "irq6", "irq7" - .asciz "irq8", "irq9", "irq10", "irq11" - .asciz "irq12", "irq13", "irq14", "irq15" - .asciz "irq16", "irq17", "irq18", "irq19" - .asciz "irq20", "irq21", "irq22", "irq23" - .asciz "irq24", "irq25", "irq26", "irq27" - .asciz "irq28", "irq29", "irq30", "irq31" - .asciz "irq32", "irq33", "irq34", "irq35" - .asciz "irq36", "irq37", "irq38", "irq39" - .asciz "irq40", "irq41", "irq42", "irq43" - .asciz "irq44", "irq45", "irq46", "irq47" - .asciz "irq48", "irq49", "irq50", "irq51" - .asciz "irq52", "irq53", "irq54", "irq55" - .asciz "irq56", "irq57", "irq58", "irq59" - .asciz "irq60", "irq61", "irq62", "irq63" - .asciz "clock", "softclock", "softnet", "softserial" -GLOBAL(eintrnames) - .align 4 -GLOBAL(intrcnt) - .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 - .long 0,0,0,0 -GLOBAL(eintrcnt) - GLOBAL(ofmsr) .long 0 /* msr used in Open Firmware */ @@ -204,196 +170,14 @@ lis 4,end@ha addi 4,4,end@l mr 5,4 - li 9,PAGE_MASK - add 4,4,9 - andc 4,4,9 - lis 9,OF_buf@ha - stw 4,OF_buf@l(9) - addi 4,4,PAGE_SIZE - lis 9,proc0paddr@ha - stw 4,proc0paddr@l(9) - addi 4,4,USPACE-FRAMELEN - mr 1,4 - xor 0,0,0 - stwu 0,-16(1) lis 3,kernel_text@ha addi 3,3,kernel_text@l -#if 0 - mr 5,6 -#endif bl powerpc_init bl mi_startup b OF_exit -#if 0 /* XXX: We may switch back to this in the future. */ -/* - * OpenFirmware entry point - */ -ENTRY(openfirmware) - mflr 0 /* save return address */ - stw 0,4(1) - stwu 1,-16(1) /* setup stack frame */ - - mfmsr 4 /* save msr */ - stw 4,8(1) - - lis 4,openfirmware_entry@ha /* get firmware entry point */ - lwz 4,openfirmware_entry@l(4) - mtlr 4 - - li 0,0 /* clear battable translations */ - mtdbatu 2,0 - mtdbatu 3,0 - mtibatu 2,0 - mtibatu 3,0 - - lis 4,ofmsr@ha /* Open Firmware msr */ - lwz 4,ofmsr@l(4) - mtmsr 4 - isync - - lis 4,srsave@ha /* save old SR */ - addi 4,4,srsave@l - li 5,0 -1: mfsrin 0,5 - stw 0,0(4) - addi 4,4,4 - addis 5,5,0x10000000@h - cmpwi 5,0 - bne 1b - - lis 4,ofw_pmap@ha /* load OFW SR */ - addi 4,4,ofw_pmap@l - lwz 0,PM_KERNELSR(4) - cmpwi 0,0 /* pm_sr[KERNEL_SR] == 0? */ - beq 2f /* then skip (not initialized yet) */ - li 5,0 -1: lwz 0,0(4) - mtsrin 0,5 - addi 4,4,4 - addis 5,5,0x10000000@h - cmpwi 5,0 - bne 1b -2: - blrl /* call Open Firmware */ - - mfmsr 4 - li 5,PSL_IR|PSL_DR - andc 4,4,5 - mtmsr 4 - isync - - lis 4,srsave@ha /* restore saved SR */ - addi 4,4,srsave@l - li 5,0 -1: lwz 0,0(4) - mtsrin 0,5 - addi 4,4,4 - addis 5,5,0x10000000@h - cmpwi 5,0 - bne 1b - - lwz 4,8(1) /* restore msr */ - mtmsr 4 - isync - - lwz 1,0(1) /* and return */ - lwz 0,4(1) - mtlr 0 - blr -#endif - -/* - * Switch to/from OpenFirmware real mode stack - * - * Note: has to be called as the very first thing in OpenFirmware interface - * routines. - * E.g.: - * int - * OF_xxx(arg1, arg2) - * type arg1, arg2; - * { - * static struct { - * char *name; - * int nargs; - * int nreturns; - * char *method; - * int arg1; - * int arg2; - * int ret; - * } args = { - * "xxx", - * 2, - * 1, - * }; - * - * ofw_stack(); - * args.arg1 = arg1; - * args.arg2 = arg2; - * if (openfirmware(&args) < 0) - * return -1; - * return args.ret; - * } - */ - - .local firmstk - .comm firmstk,PAGE_SIZE,8 - -ENTRY(ofw_stack) - mfmsr 8 /* turn off interrupts */ - andi. 0,8,~(PSL_EE|PSL_RI)@l - mtmsr 0 - stw 8,4(1) /* abuse return address slot */ - - lwz 5,0(1) /* get length of stack frame */ - subf 5,1,5 - - lis 7,firmstk+PAGE_SIZE-8@ha - addi 7,7,firmstk+PAGE_SIZE-8@l - lis 6,ofw_back@ha - addi 6,6,ofw_back@l - subf 4,5,7 /* make room for stack frame on - new stack */ - stw 6,-4(7) /* setup return pointer */ - stwu 1,-8(7) - - stw 7,-8(4) - - addi 3,1,8 - addi 1,4,-8 - subi 5,5,8 - - cmpw 3,4 - beqlr - - mr 0,5 - addi 5,5,-1 - cmpwi 0,0 - beqlr - -1: lwz 0,0(3) - stw 0,0(4) - addi 3,3,1 - addi 4,4,1 - mr 0,5 - addi 5,5,-1 - cmpwi 0,0 - bne 1b - blr - -ofw_back: - lwz 1,0(1) /* get callers original stack pointer */ - - lwz 0,4(1) /* get saved msr from abused slot */ - mtmsr 0 - - lwz 1,0(1) /* return */ - lwz 0,4(1) - mtlr 0 - blr - /* * int setfault() * ==== //depot/projects/kse/sys/powerpc/powerpc/ofw_machdep.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/powerpc/powerpc/ofw_machdep.c,v 1.3 2002/05/27 11:18:12 benno Exp $"; + "$FreeBSD: src/sys/powerpc/powerpc/ofw_machdep.c,v 1.4 2002/06/29 09:16:30 benno Exp $"; #endif /* not lint */ #include @@ -53,6 +53,7 @@ #include #include +#include #define OFMEM_REGIONS 32 static struct mem_region OFmem[OFMEM_REGIONS + 1], OFavail[OFMEM_REGIONS + 3]; @@ -106,43 +107,8 @@ long oldmsr; int result; u_int srsave[16]; - - if (pmap_bootstrapped) { - __asm __volatile("mfsr %0,0" : "=r"(srsave[0])); - __asm __volatile("mfsr %0,1" : "=r"(srsave[1])); - __asm __volatile("mfsr %0,2" : "=r"(srsave[2])); - __asm __volatile("mfsr %0,3" : "=r"(srsave[3])); - __asm __volatile("mfsr %0,4" : "=r"(srsave[4])); - __asm __volatile("mfsr %0,5" : "=r"(srsave[5])); - __asm __volatile("mfsr %0,6" : "=r"(srsave[6])); - __asm __volatile("mfsr %0,7" : "=r"(srsave[7])); - __asm __volatile("mfsr %0,8" : "=r"(srsave[8])); - __asm __volatile("mfsr %0,9" : "=r"(srsave[9])); - __asm __volatile("mfsr %0,10" : "=r"(srsave[10])); - __asm __volatile("mfsr %0,11" : "=r"(srsave[11])); - __asm __volatile("mfsr %0,12" : "=r"(srsave[12])); - __asm __volatile("mfsr %0,13" : "=r"(srsave[13])); - __asm __volatile("mfsr %0,14" : "=r"(srsave[14])); - __asm __volatile("mfsr %0,15" : "=r"(srsave[15])); + u_int i; - __asm __volatile("mtsr 0,%0" :: "r"(ofw_pmap.pm_sr[0])); - __asm __volatile("mtsr 1,%0" :: "r"(ofw_pmap.pm_sr[1])); - __asm __volatile("mtsr 2,%0" :: "r"(ofw_pmap.pm_sr[2])); - __asm __volatile("mtsr 3,%0" :: "r"(ofw_pmap.pm_sr[3])); - __asm __volatile("mtsr 4,%0" :: "r"(ofw_pmap.pm_sr[4])); - __asm __volatile("mtsr 5,%0" :: "r"(ofw_pmap.pm_sr[5])); - __asm __volatile("mtsr 6,%0" :: "r"(ofw_pmap.pm_sr[6])); - __asm __volatile("mtsr 7,%0" :: "r"(ofw_pmap.pm_sr[7])); - __asm __volatile("mtsr 8,%0" :: "r"(ofw_pmap.pm_sr[8])); - __asm __volatile("mtsr 9,%0" :: "r"(ofw_pmap.pm_sr[9])); - __asm __volatile("mtsr 10,%0" :: "r"(ofw_pmap.pm_sr[10])); - __asm __volatile("mtsr 11,%0" :: "r"(ofw_pmap.pm_sr[11])); - __asm __volatile("mtsr 12,%0" :: "r"(ofw_pmap.pm_sr[12])); - __asm __volatile("mtsr 13,%0" :: "r"(ofw_pmap.pm_sr[13])); - __asm __volatile("mtsr 14,%0" :: "r"(ofw_pmap.pm_sr[14])); - __asm __volatile("mtsr 15,%0" :: "r"(ofw_pmap.pm_sr[15])); - } - __asm __volatile( "\t" "sync\n\t" "mfmsr %0\n\t" @@ -152,35 +118,37 @@ : "r" (ofmsr) ); + if (pmap_bootstrapped) { + /* + * Swap the kernel's address space with OpenFirmware's + */ + for (i = 0; i < 16; i++) { + srsave[i] = mfsrin(i << ADDR_SR_SHFT); + mtsrin(i << ADDR_SR_SHFT, ofw_pmap.pm_sr[i]); + } + isync(); + } + result = ofwcall(args); + if (pmap_bootstrapped) { + /* + * Restore the kernel's addr space. The isync() doesn;t + * work outside the loop unless mtsrin() is open-coded + * in an asm statement :( + */ + for (i = 0; i < 16; i++) { + mtsrin(i << ADDR_SR_SHFT, srsave[i]); + isync(); + } + } + __asm( "\t" "mtmsr %0\n\t" "isync\n" : : "r" (oldmsr) ); - if (pmap_bootstrapped) { - __asm __volatile("mtsr 0,%0" :: "r"(srsave[0])); - __asm __volatile("mtsr 1,%0" :: "r"(srsave[1])); - __asm __volatile("mtsr 2,%0" :: "r"(srsave[2])); - __asm __volatile("mtsr 3,%0" :: "r"(srsave[3])); - __asm __volatile("mtsr 4,%0" :: "r"(srsave[4])); - __asm __volatile("mtsr 5,%0" :: "r"(srsave[5])); - __asm __volatile("mtsr 6,%0" :: "r"(srsave[6])); - __asm __volatile("mtsr 7,%0" :: "r"(srsave[7])); - __asm __volatile("mtsr 8,%0" :: "r"(srsave[8])); - __asm __volatile("mtsr 9,%0" :: "r"(srsave[9])); - __asm __volatile("mtsr 10,%0" :: "r"(srsave[10])); - __asm __volatile("mtsr 11,%0" :: "r"(srsave[11])); - __asm __volatile("mtsr 12,%0" :: "r"(srsave[12])); - __asm __volatile("mtsr 13,%0" :: "r"(srsave[13])); - __asm __volatile("mtsr 14,%0" :: "r"(srsave[14])); - __asm __volatile("mtsr 15,%0" :: "r"(srsave[15])); - __asm __volatile("sync"); - } - - return (result); } ==== //depot/projects/kse/sys/powerpc/powerpc/pmap.c#17 (text+ko) ==== @@ -92,7 +92,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.37 2002/05/28 07:38:55 benno Exp $"; + "$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.39 2002/06/29 09:45:59 benno Exp $"; #endif /* not lint */ /* @@ -250,10 +250,9 @@ static vm_object_t pmap_pvo_obj; static u_int pmap_pvo_count; -#define PMAP_PVO_SIZE 1024 +#define BPVO_POOL_SIZE 32768 static struct pvo_entry *pmap_bpvo_pool; -static int pmap_bpvo_pool_index; -static int pmap_bpvo_pool_count; +static int pmap_bpvo_pool_index = 0; #define VSID_NBPW (sizeof(u_int32_t) * 8) static u_int pmap_vsid_bitmap[NPMAPS / VSID_NBPW]; @@ -541,6 +540,33 @@ vm_offset_t pa, va, off; u_int batl, batu; + /* + * Set up BAT0 to only map the lowest 256 MB area + */ + battable[0x0].batl = BATL(0x00000000, BAT_M, BAT_PP_RW); + battable[0x0].batu = BATU(0x00000000, BAT_BL_256M, BAT_Vs); + + /* + * Map PCI memory space. + */ + battable[0x8].batl = BATL(0x80000000, BAT_I|BAT_G, BAT_PP_RW); + battable[0x8].batu = BATU(0x80000000, BAT_BL_256M, BAT_Vs); + + battable[0x9].batl = BATL(0x90000000, BAT_I|BAT_G, BAT_PP_RW); + battable[0x9].batu = BATU(0x90000000, BAT_BL_256M, BAT_Vs); + + battable[0xa].batl = BATL(0xa0000000, BAT_I|BAT_G, BAT_PP_RW); + battable[0xa].batu = BATU(0xa0000000, BAT_BL_256M, BAT_Vs); + + battable[0xb].batl = BATL(0xb0000000, BAT_I|BAT_G, BAT_PP_RW); + battable[0xb].batu = BATU(0xb0000000, BAT_BL_256M, BAT_Vs); + + /* + * Map obio devices. + */ + battable[0xf].batl = BATL(0xf0000000, BAT_I|BAT_G, BAT_PP_RW); + battable[0xf].batu = BATU(0xf0000000, BAT_BL_256M, BAT_Vs); + /* * Use an IBAT and a DBAT to map the bottom segment of memory * where we are. @@ -549,10 +575,20 @@ batl = BATL(0x00000000, BAT_M, BAT_PP_RW); __asm ("mtibatu 0,%0; mtibatl 0,%1; mtdbatu 0,%0; mtdbatl 0,%1" :: "r"(batu), "r"(batl)); + #if 0 + /* map frame buffer */ + batu = BATU(0x90000000, BAT_BL_256M, BAT_Vs); + batl = BATL(0x90000000, BAT_I|BAT_G, BAT_PP_RW); + __asm ("mtdbatu 1,%0; mtdbatl 1,%1" + :: "r"(batu), "r"(batl)); +#endif + +#if 1 + /* map pci space */ batu = BATU(0x80000000, BAT_BL_256M, BAT_Vs); - batl = BATL(0x80000000, BAT_M, BAT_PP_RW); - __asm ("mtibatu 1,%0; mtibatl 1,%1; mtdbatu 1,%0; mtdbatl 1,%1" + batl = BATL(0x80000000, BAT_I|BAT_G, BAT_PP_RW); + __asm ("mtdbatu 1,%0; mtdbatl 1,%1" :: "r"(batu), "r"(batl)); #endif @@ -629,9 +665,9 @@ /* * Initialise the unmanaged pvo pool. */ - pmap_bpvo_pool = (struct pvo_entry *)pmap_bootstrap_alloc(PAGE_SIZE, 0); + pmap_bpvo_pool = (struct pvo_entry *)pmap_bootstrap_alloc( + BPVO_POOL_SIZE*sizeof(struct pvo_entry), 0); pmap_bpvo_pool_index = 0; - pmap_bpvo_pool_count = (int)PAGE_SIZE / sizeof(struct pvo_entry); /* * Make sure kernel vsid is allocated as well as VSID 0. @@ -984,25 +1020,25 @@ { CTR0(KTR_PMAP, "pmap_init"); -} -void -pmap_init2(void) -{ - - CTR0(KTR_PMAP, "pmap_init2"); - pmap_pvo_obj = vm_object_allocate(OBJT_PHYS, 16); pmap_pvo_count = 0; pmap_upvo_zone = uma_zcreate("UPVO entry", sizeof (struct pvo_entry), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); uma_zone_set_allocf(pmap_upvo_zone, pmap_pvo_allocf); pmap_mpvo_zone = uma_zcreate("MPVO entry", sizeof(struct pvo_entry), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); uma_zone_set_allocf(pmap_mpvo_zone, pmap_pvo_allocf); pmap_initialized = TRUE; } +void +pmap_init2(void) +{ + + CTR0(KTR_PMAP, "pmap_init2"); +} + boolean_t pmap_is_modified(vm_page_t m) { @@ -1778,10 +1814,10 @@ if (pmap_initialized) { pvo = uma_zalloc(zone, M_NOWAIT); } else { - if (pmap_bpvo_pool_index >= pmap_bpvo_pool_count) { - pmap_bpvo_pool = (struct pvo_entry *) - pmap_bootstrap_alloc(PAGE_SIZE, 0); - pmap_bpvo_pool_index = 0; + if (pmap_bpvo_pool_index >= BPVO_POOL_SIZE) { + panic("pmap_enter: bpvo pool exhausted, %d, %d, %d", + pmap_bpvo_pool_index, BPVO_POOL_SIZE, + BPVO_POOL_SIZE * sizeof(struct pvo_entry)); } pvo = &pmap_bpvo_pool[pmap_bpvo_pool_index]; pmap_bpvo_pool_index++; @@ -2236,3 +2272,46 @@ return ((rv & ptebit) != 0); } + +/* + * Map a set of physical memory pages into the kernel virtual + * address space. Return a pointer to where it is mapped. This + * routine is intended to be used for mapping device memory, + * NOT real memory. + */ +void * +pmap_mapdev(vm_offset_t pa, vm_size_t size) +{ + vm_offset_t va, tmpva, offset; + + pa = trunc_page(pa); + offset = pa & PAGE_MASK; + size = roundup(offset + size, PAGE_SIZE); + + GIANT_REQUIRED; + + va = kmem_alloc_pageable(kernel_map, size); + if (!va) + panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); + + for (tmpva = va; size > 0;) { + pmap_kenter(tmpva, pa); + TLBIE(tmpva); /* XXX or should it be invalidate-all ? */ + size -= PAGE_SIZE; + tmpva += PAGE_SIZE; + pa += PAGE_SIZE; + } + + return ((void *)(va + offset)); +} + +void +pmap_unmapdev(vm_offset_t va, vm_size_t size) +{ + vm_offset_t base, offset; + + base = trunc_page(va); + offset = va & PAGE_MASK; + size = roundup(offset + size, PAGE_SIZE); + kmem_free(kernel_map, base, size); +} ==== //depot/projects/kse/sys/powerpc/powerpc/swtch.s#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/powerpc/powerpc/swtch.s,v 1.13 2002/05/09 14:13:29 benno Exp $ */ +/* $FreeBSD: src/sys/powerpc/powerpc/swtch.s,v 1.14 2002/06/29 09:39:44 benno Exp $ */ /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */ /* @@ -75,9 +75,10 @@ lwz %r4,PC_CURTHREAD(%r3) /* Get the current thread */ lwz %r3,TD_PCB(%r4) /* Get a pointer to the PCB */ - stmw %r14,PCB_CONTEXT(%r3) /* Save the non-volatile GP regs */ - mr %r14,%r3 /* Copy the curthread pointer */ - mr %r15,%r4 /* ... and the current pcb pointer */ + mr %r12,%r2 + stmw %r12,PCB_CONTEXT(%r3) /* Save the non-volatile GP regs */ + mr %r14,%r3 /* Copy the current pcb pointer */ + mr %r15,%r4 /* ... and the curthread pointer */ mfcr %r16 /* Save the condition register */ stw %r16,PCB_CR(%r3) mflr %r16 /* Save the link register */ @@ -106,9 +107,9 @@ mfsprg %r4,0 /* Get the pcpu pointer */ stw %r16,PC_CURTHREAD(%r4) /* Store new current thread */ - lwz %r16,TD_PCB(%r16) /* Grab the new PCB */ + mr %r3,%r16 /* and save in r3 */ + lwz %r16,TD_PCB(%r16) /* Store new current PCB */ stw %r16,PC_CURPCB(%r4) - mr %r4,%r16 #if 0 lwz %r29, PCB_FLAGS(%r4) /* Restore FPU regs if needed */ @@ -118,13 +119,16 @@ bl enable_fpu #endif + /* thread to restore is in r3 */ .L2: - lmw %r14,PCB_CONTEXT(%r4) /* Load the non-volatile GP regs */ - lwz %r5,PCB_CR(%r4) /* Load the condition register */ + lwz %r3, TD_PCB(%r3) + lmw %r12,PCB_CONTEXT(%r3) /* Load the non-volatile GP regs */ + mr %r2,%r12 + lwz %r5,PCB_CR(%r3) /* Load the condition register */ mtcr %r5 - lwz %r5,PCB_LR(%r4) /* Load the link register */ + lwz %r5,PCB_LR(%r3) /* Load the link register */ mtlr %r5 - lwz %r1,PCB_SP(%r4) /* Load the stack pointer */ + lwz %r1,PCB_SP(%r3) /* Load the stack pointer */ blr /* @@ -132,7 +136,8 @@ * Update pcb, saving current processor state */ ENTRY(savectx) - stmw %r14,PCB_CONTEXT(%r3) /* Save the non-volatile GP regs */ + mr %r12,%r2 + stmw %r12,PCB_CONTEXT(%r3) /* Save the non-volatile GP regs */ mfcr %r4 /* Save the condition register */ stw %r4,PCB_CONTEXT(%r3) blr ==== //depot/projects/kse/sys/powerpc/powerpc/trap_subr.S#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/powerpc/powerpc/trap_subr.S,v 1.4 2002/05/28 12:31:34 benno Exp $ */ +/* $FreeBSD: src/sys/powerpc/powerpc/trap_subr.S,v 1.5 2002/06/29 09:28:21 benno Exp $ */ /* $NetBSD: trap_subr.S,v 1.20 2002/04/22 23:20:08 kleink Exp $ */ /* @@ -46,8 +46,6 @@ #define EXC_AST 0x3000 .data .align 4 -astpending: - .long 0 cpassert: .asciz "attempting to return from kernel with no current pmap" @@ -275,48 +273,6 @@ CNAME(isi601size)= .-CNAME(isitrap601) /* - * This one for the external interrupt handler. - */ - .globl CNAME(extint),CNAME(extsize) -CNAME(extint): - mtsprg 1,1 /* save SP */ - stmw 28,tempsave(0) /* free r28-r31 */ - mflr 28 /* save LR */ - mfcr 29 /* save CR */ - mfxer 30 /* save XER */ - lis 1,intstk+INTSTK@ha /* get interrupt stack */ - addi 1,1,intstk+INTSTK@l /* this is really intr_depth! */ - lwz 31,0(1) /* were we already running on intstk? */ - addic. 31,31,1 - stw 31,0(1) - beq 1f - mfsprg 1,1 /* yes, get old SP */ -1: - ba extintr -CNAME(extsize) = .-CNAME(extint) - -/* - * And this one for the decrementer interrupt handler. - */ - .globl CNAME(decrint),CNAME(decrsize) -CNAME(decrint): - mtsprg 1,1 /* save SP */ - stmw 28,tempsave(0) /* free r28-r31 */ - mflr 28 /* save LR */ - mfcr 29 /* save CR */ - mfxer 30 /* save XER */ - lis 1,intstk+INTSTK@ha /* get interrupt stack */ - addi 1,1,intstk+INTSTK@l - lwz 31,0(1) /* were we already running on intstk? */ - addic. 31,31,1 - stw 31,0(1) - beq 1f - mfsprg 1,1 /* yes, get old SP */ -1: - ba decrintr -CNAME(decrsize) = .-CNAME(decrint) - -/* * Now the tlb software load for 603 processors: * (Code essentially from the 603e User Manual, Chapter 5, but * corrected a lot.) @@ -579,7 +535,7 @@ mfsrr1 31; \ stmw 30,savearea+24(0); \ mfmsr 30; \ - ori 30,30,(PSL_DR|PSL_IR); \ + ori 30,30,(PSL_DR|PSL_IR)@l; \ mtmsr 30; \ isync; \ mfsprg 31,1; \ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 10:34:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61B1237B401; Sat, 29 Jun 2002 10:33:28 -0700 (PDT) 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 EC5CD37B400 for ; Sat, 29 Jun 2002 10:33:27 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 281EB43E06 for ; Sat, 29 Jun 2002 10:33:27 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5THXRJU041723 for ; Sat, 29 Jun 2002 10:33:27 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5THXQZu041720 for perforce@freebsd.org; Sat, 29 Jun 2002 10:33:26 -0700 (PDT) Date: Sat, 29 Jun 2002 10:33:26 -0700 (PDT) Message-Id: <200206291733.g5THXQZu041720@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bmilekic@freebsd.org using -f From: Bosko Milekic Subject: PERFORCE change 13599 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13599 Change 13599 by bmilekic@bmilekic_angela on 2002/06/29 10:32:45 Final IFC before KSEIII (just saw julian's Email about commit about to go in). Affected files ... .. //depot/projects/interrupt/sys/alpha/include/kse.h#1 branch .. //depot/projects/interrupt/sys/boot/alpha/boot1/boot1.c#3 integrate .. //depot/projects/interrupt/sys/boot/alpha/libalpha/common.h#2 integrate .. //depot/projects/interrupt/sys/conf/files.powerpc#4 integrate .. //depot/projects/interrupt/sys/ddb/db_elf.c#2 integrate .. //depot/projects/interrupt/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/interrupt/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/interrupt/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/interrupt/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/interrupt/sys/dev/sio/sio_ebus.c#2 integrate .. //depot/projects/interrupt/sys/geom/geom_aes.c#2 integrate .. //depot/projects/interrupt/sys/geom/geom_kern.c#3 integrate .. //depot/projects/interrupt/sys/i386/include/kse.h#1 branch .. //depot/projects/interrupt/sys/i386/isa/intr_machdep.h#5 integrate .. //depot/projects/interrupt/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_event.c#4 integrate .. //depot/projects/interrupt/sys/kern/kern_exec.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_exit.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_ktrace.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_lockf.c#3 integrate .. //depot/projects/interrupt/sys/kern/kern_physio.c#3 integrate .. //depot/projects/interrupt/sys/kern/kern_prot.c#8 integrate .. //depot/projects/interrupt/sys/kern/kern_resource.c#4 integrate .. //depot/projects/interrupt/sys/kern/kern_sig.c#4 integrate .. //depot/projects/interrupt/sys/kern/kern_subr.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_synch.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/interrupt/sys/kern/kern_thread.c#1 branch .. //depot/projects/interrupt/sys/kern/kern_time.c#4 integrate .. //depot/projects/interrupt/sys/kern/kern_xxx.c#3 integrate .. //depot/projects/interrupt/sys/kern/subr_disklabel.c#5 integrate .. //depot/projects/interrupt/sys/kern/subr_log.c#3 integrate .. //depot/projects/interrupt/sys/kern/subr_mbuf.c#5 integrate .. //depot/projects/interrupt/sys/kern/subr_prf.c#5 integrate .. //depot/projects/interrupt/sys/kern/subr_prof.c#3 integrate .. //depot/projects/interrupt/sys/kern/sys_pipe.c#7 integrate .. //depot/projects/interrupt/sys/kern/sys_socket.c#5 integrate .. //depot/projects/interrupt/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/interrupt/sys/kern/uipc_jumbo.c#2 integrate .. //depot/projects/interrupt/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/interrupt/sys/kern/uipc_socket2.c#5 integrate .. //depot/projects/interrupt/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/interrupt/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/interrupt/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/interrupt/sys/kern/vfs_export.c#4 integrate .. //depot/projects/interrupt/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/interrupt/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/interrupt/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/interrupt/sys/netinet/tcp_syncache.c#7 integrate .. //depot/projects/interrupt/sys/nfsclient/nfs.h#4 integrate .. //depot/projects/interrupt/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/interrupt/sys/nfsclient/nfs_socket.c#4 integrate .. //depot/projects/interrupt/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/interrupt/sys/pci/if_sk.c#3 integrate .. //depot/projects/interrupt/sys/pci/if_ti.c#5 integrate .. //depot/projects/interrupt/sys/pci/if_wb.c#3 integrate .. //depot/projects/interrupt/sys/powerpc/include/cpufunc.h#5 integrate .. //depot/projects/interrupt/sys/powerpc/include/critical.h#2 integrate .. //depot/projects/interrupt/sys/powerpc/include/in_cksum.h#1 branch .. //depot/projects/interrupt/sys/powerpc/include/pcb.h#4 integrate .. //depot/projects/interrupt/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/autoconf.c#3 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/bcopy.c#2 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/clock.c#4 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/in_cksum.c#1 branch .. //depot/projects/interrupt/sys/powerpc/powerpc/interrupt.c#1 branch .. //depot/projects/interrupt/sys/powerpc/powerpc/locore.s#5 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/ofw_machdep.c#4 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/pmap.c#7 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/swtch.s#5 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/trap_subr.S#2 integrate .. //depot/projects/interrupt/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/interrupt/sys/sparc64/include/kse.h#1 branch .. //depot/projects/interrupt/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/pmap.c#8 integrate .. //depot/projects/interrupt/sys/sys/event.h#3 integrate .. //depot/projects/interrupt/sys/sys/file.h#5 integrate .. //depot/projects/interrupt/sys/sys/jumbo.h#2 integrate .. //depot/projects/interrupt/sys/sys/kse.h#3 integrate .. //depot/projects/interrupt/sys/sys/mbuf.h#6 integrate .. //depot/projects/interrupt/sys/sys/socketvar.h#6 integrate .. //depot/projects/interrupt/sys/sys/vnode.h#5 integrate Differences ... ==== //depot/projects/interrupt/sys/boot/alpha/boot1/boot1.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.11 2002/06/11 10:19:59 phk Exp $ + * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.12 2002/06/29 02:32:32 peter Exp $ * From $NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ */ @@ -253,7 +253,7 @@ char *name = "/boot/loader"; char *p; char filename[512]; - void (*entry) __P((void)); + void (*entry)(void); u_long start, freq; int i; ==== //depot/projects/interrupt/sys/boot/alpha/libalpha/common.h#2 (text+ko) ==== @@ -1,11 +1,11 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.2 1999/08/28 00:39:26 peter Exp $ + * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.3 2002/06/29 02:32:32 peter Exp $ * From: $NetBSD: common.h,v 1.2 1998/01/05 07:02:48 perry Exp $ */ -int prom_open __P((char*, int)); -void OSFpal __P((void)); -void halt __P((void)); -u_int64_t prom_dispatch __P((int, ...)); -int cpu_number __P((void)); -void switch_palcode __P((void)); +int prom_open(char*, int); +void OSFpal(void); +void halt(void); +u_int64_t prom_dispatch(int, ...); +int cpu_number(void); +void switch_palcode(void); ==== //depot/projects/interrupt/sys/conf/files.powerpc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.10 2002/05/13 07:53:22 benno Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.12 2002/06/29 09:50:20 benno Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -21,6 +21,8 @@ powerpc/powerpc/extintr.c standard powerpc/powerpc/fpu.c standard powerpc/powerpc/fuswintr.c standard +powerpc/powerpc/in_cksum.c optional inet +powerpc/powerpc/interrupt.c standard powerpc/powerpc/machdep.c standard powerpc/powerpc/nexus.c standard powerpc/powerpc/ofwmagic.s standard ==== //depot/projects/interrupt/sys/ddb/db_elf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.10 2002/05/07 10:59:52 bde Exp $ */ +/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.11 2002/06/29 02:32:33 peter Exp $ */ /* $NetBSD: db_elf.c,v 1.4 1998/05/03 18:49:54 thorpej Exp $ */ /*- @@ -56,7 +56,7 @@ #include -static char *db_elf_find_strtab __P((db_symtab_t *)); +static char *db_elf_find_strtab(db_symtab_t *); #define STAB_TO_SYMSTART(stab) ((Elf_Sym *)((stab)->start)) #define STAB_TO_SYMEND(stab) ((Elf_Sym *)((stab)->end)) ==== //depot/projects/interrupt/sys/dev/bge/if_bge.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.15 2002/06/24 22:28:42 mp Exp $ + * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.16 2002/06/29 01:36:59 alfred Exp $ */ /* @@ -122,7 +122,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.15 2002/06/24 22:28:42 mp Exp $"; + "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.16 2002/06/29 01:36:59 alfred Exp $"; #endif /* @@ -181,7 +181,7 @@ static int bge_alloc_jumbo_mem (struct bge_softc *); static void bge_free_jumbo_mem (struct bge_softc *); static void *bge_jalloc (struct bge_softc *); -static void bge_jfree (caddr_t, void *); +static void bge_jfree (void *, void *); static int bge_newbuf_std (struct bge_softc *, int, struct mbuf *); static int bge_newbuf_jumbo (struct bge_softc *, int, struct mbuf *); static int bge_init_rx_ring_std (struct bge_softc *); @@ -663,7 +663,7 @@ */ static void bge_jfree(buf, args) - caddr_t buf; + void *buf; void *args; { struct bge_jpool_entry *entry; ==== //depot/projects/interrupt/sys/dev/fxp/if_fxp.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.130 2002/06/05 18:34:08 ambrisko Exp $ + * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.131 2002/06/29 01:56:14 silby Exp $ */ /* @@ -160,6 +160,7 @@ { 0x1037, "Intel Pro/100 Ethernet" }, { 0x1038, "Intel Pro/100 Ethernet" }, { 0x1039, "Intel Pro/100 Ethernet" }, + { 0x103A, "Intel Pro/100 Ethernet" }, { 0, NULL }, }; ==== //depot/projects/interrupt/sys/dev/lge/if_lge.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.11 2002/04/28 20:34:20 phk Exp $ + * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.12 2002/06/29 01:36:59 alfred Exp $ */ /* @@ -114,7 +114,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.11 2002/04/28 20:34:20 phk Exp $"; + "$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.12 2002/06/29 01:36:59 alfred Exp $"; #endif /* @@ -132,7 +132,7 @@ static int lge_alloc_jumbo_mem (struct lge_softc *); static void lge_free_jumbo_mem (struct lge_softc *); static void *lge_jalloc (struct lge_softc *); -static void lge_jfree (caddr_t, void *); +static void lge_jfree (void *, void *); static int lge_newbuf (struct lge_softc *, struct lge_rx_desc *, @@ -917,7 +917,7 @@ * Release a jumbo buffer. */ static void lge_jfree(buf, args) - caddr_t buf; + void *buf; void *args; { struct lge_softc *sc; ==== //depot/projects/interrupt/sys/dev/nge/if_nge.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.32 2002/05/04 11:15:33 phk Exp $ + * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.33 2002/06/29 01:36:59 alfred Exp $ */ /* @@ -132,7 +132,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.32 2002/05/04 11:15:33 phk Exp $"; + "$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.33 2002/06/29 01:36:59 alfred Exp $"; #endif #define NGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) @@ -153,7 +153,7 @@ static int nge_alloc_jumbo_mem (struct nge_softc *); static void nge_free_jumbo_mem (struct nge_softc *); static void *nge_jalloc (struct nge_softc *); -static void nge_jfree (caddr_t, void *); +static void nge_jfree (void *, void *); static int nge_newbuf (struct nge_softc *, struct nge_desc *, struct mbuf *); @@ -1203,7 +1203,7 @@ * Release a jumbo buffer. */ static void nge_jfree(buf, args) - caddr_t buf; + void *buf; void *args; { struct nge_softc *sc; ==== //depot/projects/interrupt/sys/dev/sio/sio_ebus.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID($FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.1 2002/06/18 01:19:31 obrien Exp $); +__FBSDID($FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.2 2002/06/29 02:32:33 peter Exp $); #include #include @@ -40,9 +40,9 @@ #include #include -int sio_ofw_inlist __P((char *name, char *list[])); -static int sio_ebus_attach __P((device_t dev)); -static int sio_ebus_probe __P((device_t dev)); +int sio_ofw_inlist(char *name, char *list[]); +static int sio_ebus_attach(device_t dev); +static int sio_ebus_probe(device_t dev); static device_method_t sio_ebus_methods[] = { /* Device interface */ ==== //depot/projects/interrupt/sys/geom/geom_aes.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_aes.c,v 1.2 2002/06/09 10:57:33 phk Exp $ + * $FreeBSD: src/sys/geom/geom_aes.c,v 1.3 2002/06/28 21:25:15 phk Exp $ * * This method provides AES encryption with a compiled in key (default * all zeroes). @@ -55,6 +55,9 @@ #include #include #include +#include +#include +#include #endif #include #include @@ -65,26 +68,83 @@ #define AES_CLASS_NAME "AES" +#define MASTER_KEY_LENGTH (1024/8) + static u_char *aes_magic = "<>"; +static u_char *aes_magic_random = "<>"; +static u_char *aes_magic_test = "<>"; -static u_char aes_key[128 / 8] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; struct g_aes_softc { + enum { + KEY_ZERO, + KEY_RANDOM, + KEY_TEST + } keying; u_int sectorsize; off_t mediasize; - keyInstance ekey; - keyInstance dkey; cipherInstance ci; + u_char master_key[MASTER_KEY_LENGTH]; }; +/* + * Generate a sectorkey from the masterkey and the offset position. + * + * For KEY_ZERO we just return a key of all zeros. + * + * We feed the sector byte offset, 16 bytes of the master-key and + * the sector byte offset once more to MD5. + * The sector byte offset is converted to little-endian format first + * to support multi-architecture operation. + * We use 16 bytes from the master-key starting at the logical sector + * number modulus he length of the master-key. If need be we wrap + * around to the start of the master-key. + */ + +static void +g_aes_makekey(struct g_aes_softc *sc, off_t off, keyInstance *ki, int dir) +{ + MD5_CTX cx; + u_int64_t u64; + u_int u, u1; + u_char *p, buf[16]; + + if (sc->keying == KEY_ZERO) { + rijndael_makeKey(ki, dir, 128, sc->master_key); + return; + } + MD5Init(&cx); + u64 = htole64(off); + MD5Update(&cx, (u_char *)&u64, sizeof(u64)); + u = off / sc->sectorsize; + u %= sizeof sc->master_key; + p = sc->master_key + u; + if (u + 16 <= sizeof(sc->master_key)) { + MD5Update(&cx, p, 16); + } else { + u1 = sizeof sc->master_key - u; + MD5Update(&cx, p, u1); + MD5Update(&cx, sc->master_key, 16 - u1); + u1 = 0; /* destroy evidence */ + } + u = 0; /* destroy evidence */ + MD5Update(&cx, (u_char *)&u64, sizeof(u64)); + u64 = 0; /* destroy evidence */ + MD5Final(buf, &cx); + bzero(&cx, sizeof cx); /* destroy evidence */ + rijndael_makeKey(ki, dir, 128, buf); + bzero(buf, sizeof buf); /* destroy evidence */ + +} + static void g_aes_read_done(struct bio *bp) { struct g_geom *gp; struct g_aes_softc *sc; u_char *p, *b, *e, *sb; + keyInstance dkey; + off_t o; gp = bp->bio_from->geom; sc = gp->softc; @@ -92,17 +152,28 @@ b = bp->bio_data; e = bp->bio_data; e += bp->bio_length; + o = bp->bio_offset - sc->sectorsize; for (p = b; p < e; p += sc->sectorsize) { - rijndael_blockDecrypt(&sc->ci, &sc->dkey, p, sc->sectorsize * 8, sb); + g_aes_makekey(sc, o, &dkey, DIR_DECRYPT); + rijndael_blockDecrypt(&sc->ci, &dkey, p, sc->sectorsize * 8, sb); bcopy(sb, p, sc->sectorsize); + o += sc->sectorsize; } + bzero(&dkey, sizeof dkey); /* destroy evidence */ + bzero(sb, sc->sectorsize); /* destroy evidence */ + g_free(sb); g_std_done(bp); } static void g_aes_write_done(struct bio *bp) { + struct g_aes_softc *sc; + struct g_geom *gp; + gp = bp->bio_to->geom; + sc = gp->softc; + bzero(bp->bio_data, bp->bio_length); /* destroy evidence */ g_free(bp->bio_data); g_std_done(bp); } @@ -115,6 +186,8 @@ struct g_aes_softc *sc; struct bio *bp2; u_char *p1, *p2, *b, *e; + keyInstance ekey; + off_t o; gp = bp->bio_to->geom; cp = LIST_FIRST(&gp->consumer); @@ -135,11 +208,15 @@ e = bp->bio_data; e += bp->bio_length; p2 = bp2->bio_data; + o = bp->bio_offset; for (p1 = b; p1 < e; p1 += sc->sectorsize) { - rijndael_blockEncrypt(&sc->ci, &sc->ekey, + g_aes_makekey(sc, o, &ekey, DIR_ENCRYPT); + rijndael_blockEncrypt(&sc->ci, &ekey, p1, sc->sectorsize * 8, p2); p2 += sc->sectorsize; + o += sc->sectorsize; } + bzero(&ekey, sizeof ekey); /* destroy evidence */ g_io_request(bp2, cp); break; case BIO_GETATTR: @@ -166,6 +243,7 @@ { struct g_geom *gp; struct g_provider *pp; + struct g_aes_softc *sc; int error; g_trace(G_T_TOPOLOGY, "g_aes_orphan(%p/%s)", cp, cp->provider->name); @@ -174,10 +252,12 @@ ("g_aes_orphan with error == 0")); gp = cp->geom; + sc = gp->softc; gp->flags |= G_GEOM_WITHER; error = cp->provider->error; LIST_FOREACH(pp, &gp->provider, provider) g_orphan_provider(pp, error); + bzero(sc, sizeof(struct g_aes_softc)); /* destroy evidence */ return; } @@ -238,16 +318,46 @@ if (buf == NULL || error != 0) { break; } - if (memcmp(buf, aes_magic, strlen(aes_magic))) + sc = g_malloc(sizeof(struct g_aes_softc), M_WAITOK | M_ZERO); + if (!memcmp(buf, aes_magic, strlen(aes_magic))) { + sc->keying = KEY_ZERO; + } else if (!memcmp(buf, aes_magic_random, + strlen(aes_magic_random))) { + sc->keying = KEY_RANDOM; + } else if (!memcmp(buf, aes_magic_test, + strlen(aes_magic_test))) { + sc->keying = KEY_TEST; + } else { + g_free(sc); break; - sc = g_malloc(sizeof(struct g_aes_softc), M_WAITOK | M_ZERO); + } gp->softc = sc; gp->access = g_aes_access; sc->sectorsize = sectorsize; sc->mediasize = mediasize - sectorsize; rijndael_cipherInit(&sc->ci, MODE_CBC, NULL); - rijndael_makeKey(&sc->ekey, DIR_ENCRYPT, 128, aes_key); - rijndael_makeKey(&sc->dkey, DIR_DECRYPT, 128, aes_key); + if (sc->keying == KEY_TEST) { + int i; + u_char *p; + + p = sc->master_key; + for (i = 0; i < sizeof sc->master_key; i ++) + *p++ = i; + } + if (sc->keying == KEY_RANDOM) { + int i; + u_int32_t u; + u_char *p; + + p = sc->master_key; + for (i = 0; i < sizeof sc->master_key; i += sizeof u) { + u = arc4random(); + *p++ = u; + *p++ = u >> 8; + *p++ = u >> 16; + *p++ = u >> 24; + } + } pp = g_new_providerf(gp, gp->name); pp->mediasize = mediasize - sectorsize; g_error_provider(pp, 0); ==== //depot/projects/interrupt/sys/geom/geom_kern.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_kern.c,v 1.3 2002/03/26 22:07:38 phk Exp $ + * $FreeBSD: src/sys/geom/geom_kern.c,v 1.4 2002/06/29 07:47:20 julian Exp $ */ #include @@ -63,7 +63,7 @@ g_up_procbody(void) { struct proc *p = g_up_proc; - struct thread *tp = &p->p_xxthread; + struct thread *tp = FIRST_THREAD_IN_PROC(p); curthread->td_base_pri = PRIBIO; for(;;) { @@ -86,7 +86,7 @@ g_down_procbody(void) { struct proc *p = g_down_proc; - struct thread *tp = &p->p_xxthread; + struct thread *tp = FIRST_THREAD_IN_PROC(p); curthread->td_base_pri = PRIBIO; for(;;) { ==== //depot/projects/interrupt/sys/i386/isa/intr_machdep.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.40 2002/04/06 08:25:05 nyan Exp $ + * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.41 2002/06/29 02:32:33 peter Exp $ */ #ifndef _I386_ISA_INTR_MACHDEP_H_ @@ -140,7 +140,7 @@ * Type of the first (asm) part of an interrupt handler. */ typedef void inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); -typedef void unpendhand_t __P((void)); +typedef void unpendhand_t(void); #define IDTVEC(name) __CONCAT(X,name) ==== //depot/projects/interrupt/sys/kern/kern_descrip.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.148 2002/05/31 11:52:29 tanimura Exp $ + * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.149 2002/06/29 01:50:24 alfred Exp $ */ #include "opt_compat.h" @@ -99,7 +99,7 @@ static int do_dup(struct filedesc *fdp, int old, int new, register_t *retval, struct thread *td); static int badfo_readwrite(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td); -static int badfo_ioctl(struct file *fp, u_long com, caddr_t data, +static int badfo_ioctl(struct file *fp, u_long com, void *data, struct thread *td); static int badfo_poll(struct file *fp, int events, struct ucred *cred, struct thread *td); @@ -313,34 +313,34 @@ fp->f_flag &= ~FCNTLFLAGS; fp->f_flag |= FFLAGS(uap->arg & ~O_ACCMODE) & FCNTLFLAGS; tmp = fp->f_flag & FNONBLOCK; - error = fo_ioctl(fp, FIONBIO, (caddr_t)&tmp, td); + error = fo_ioctl(fp, FIONBIO, &tmp, td); if (error) { fdrop(fp, td); break; } tmp = fp->f_flag & FASYNC; - error = fo_ioctl(fp, FIOASYNC, (caddr_t)&tmp, td); + error = fo_ioctl(fp, FIOASYNC, &tmp, td); if (!error) { fdrop(fp, td); break; } fp->f_flag &= ~FNONBLOCK; tmp = 0; - (void)fo_ioctl(fp, FIONBIO, (caddr_t)&tmp, td); + (void)fo_ioctl(fp, FIONBIO, &tmp, td); fdrop(fp, td); break; case F_GETOWN: fhold(fp); FILEDESC_UNLOCK(fdp); - error = fo_ioctl(fp, FIOGETOWN, (caddr_t)td->td_retval, td); + error = fo_ioctl(fp, FIOGETOWN, (void *)td->td_retval, td); fdrop(fp, td); break; case F_SETOWN: fhold(fp); FILEDESC_UNLOCK(fdp); - error = fo_ioctl(fp, FIOSETOWN, (caddr_t)&uap->arg, td); + error = fo_ioctl(fp, FIOSETOWN, &uap->arg, td); fdrop(fp, td); break; @@ -363,8 +363,7 @@ vp = (struct vnode *)fp->f_data; /* Copy in the lock structure */ - error = copyin((caddr_t)(intptr_t)uap->arg, (caddr_t)&fl, - sizeof(fl)); + error = copyin((caddr_t)(intptr_t)uap->arg, &fl, sizeof(fl)); if (error) { fdrop(fp, td); break; @@ -434,8 +433,7 @@ vp = (struct vnode *)fp->f_data; /* Copy in the lock structure */ - error = copyin((caddr_t)(intptr_t)uap->arg, (caddr_t)&fl, - sizeof(fl)); + error = copyin((caddr_t)(intptr_t)uap->arg, &fl, sizeof(fl)); if (error) { fdrop(fp, td); break; @@ -461,8 +459,8 @@ &fl, F_POSIX); fdrop(fp, td); if (error == 0) { - error = copyout((caddr_t)&fl, - (caddr_t)(intptr_t)uap->arg, sizeof(fl)); + error = copyout(&fl, (caddr_t)(intptr_t)uap->arg, + sizeof(fl)); } break; default: @@ -835,7 +833,7 @@ error = fo_stat(fp, &ub, td); if (error == 0) { cvtstat(&ub, &oub); - error = copyout((caddr_t)&oub, (caddr_t)uap->sb, sizeof (oub)); + error = copyout(&oub, uap->sb, sizeof (oub)); } fdrop(fp, td); done2: @@ -871,7 +869,7 @@ goto done2; error = fo_stat(fp, &ub, td); if (error == 0) - error = copyout((caddr_t)&ub, (caddr_t)uap->sb, sizeof (ub)); + error = copyout(&ub, uap->sb, sizeof (ub)); fdrop(fp, td); done2: mtx_unlock(&Giant); @@ -907,7 +905,7 @@ error = fo_stat(fp, &ub, td); if (error == 0) { cvtnstat(&ub, &nub); - error = copyout((caddr_t)&nub, (caddr_t)uap->sb, sizeof (nub)); + error = copyout(&nub, uap->sb, sizeof (nub)); } fdrop(fp, td); done2: @@ -1563,7 +1561,7 @@ break; } NDFREE(&nd, NDF_ONLY_PNBUF); - fp->f_data = (caddr_t)nd.ni_vp; + fp->f_data = nd.ni_vp; fp->f_flag = flags; fp->f_ops = &vnops; fp->f_type = DTYPE_VNODE; @@ -2067,7 +2065,7 @@ return (error); } - error = SYSCTL_OUT(req, (caddr_t)&filehead, sizeof(filehead)); + error = SYSCTL_OUT(req, &filehead, sizeof(filehead)); if (error) { sx_sunlock(&filelist_lock); return (error); @@ -2077,7 +2075,7 @@ * followed by an array of file structures */ LIST_FOREACH(fp, &filehead, f_list) { - error = SYSCTL_OUT(req, (caddr_t)fp, sizeof (struct file)); + error = SYSCTL_OUT(req, fp, sizeof (struct file)); if (error) { sx_sunlock(&filelist_lock); return (error); @@ -2145,7 +2143,7 @@ badfo_ioctl(fp, com, data, td) struct file *fp; u_long com; - caddr_t data; + void *data; struct thread *td; { ==== //depot/projects/interrupt/sys/kern/kern_event.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_event.c,v 1.39 2002/05/19 00:14:48 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_event.c,v 1.41 2002/06/29 01:50:24 alfred Exp $ */ #include @@ -60,7 +60,7 @@ struct ucred *cred, int flags, struct thread *td); static int kqueue_write(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td); -static int kqueue_ioctl(struct file *fp, u_long com, caddr_t data, +static int kqueue_ioctl(struct file *fp, u_long com, void *data, struct thread *td); static int kqueue_poll(struct file *fp, int events, struct ucred *cred, struct thread *td); @@ -334,7 +334,7 @@ M_KQUEUE, M_WAITOK); callout_init(calloutp, 0); callout_reset(calloutp, tticks, filt_timerexpire, kn); - kn->kn_hook = (caddr_t)calloutp; + kn->kn_hook = calloutp; return (0); } @@ -380,7 +380,7 @@ fp->f_type = DTYPE_KQUEUE; fp->f_ops = &kqueueops; TAILQ_INIT(&kq->kq_head); - fp->f_data = (caddr_t)kq; + fp->f_data = kq; FILE_UNLOCK(fp); FILEDESC_LOCK(fdp); td->td_retval[0] = fd; @@ -446,8 +446,8 @@ if (uap->nevents != 0) { kevp->flags = EV_ERROR; kevp->data = error; - (void) copyout((caddr_t)kevp, - (caddr_t)uap->eventlist, + (void) copyout(kevp, + uap->eventlist, sizeof(*kevp)); uap->eventlist++; uap->nevents--; @@ -751,7 +751,7 @@ count--; if (nkev == KQ_NEVENTS) { splx(s); - error = copyout((caddr_t)&kq->kq_kev, (caddr_t)ulistp, + error = copyout(&kq->kq_kev, ulistp, sizeof(struct kevent) * nkev); ulistp += nkev; nkev = 0; @@ -765,7 +765,7 @@ splx(s); done: if (nkev != 0) - error = copyout((caddr_t)&kq->kq_kev, (caddr_t)ulistp, + error = copyout(&kq->kq_kev, ulistp, sizeof(struct kevent) * nkev); td->td_retval[0] = maxevents - count; return (error); @@ -793,7 +793,7 @@ /*ARGSUSED*/ static int -kqueue_ioctl(struct file *fp, u_long com, caddr_t data, struct thread *td) +kqueue_ioctl(struct file *fp, u_long com, void *data, struct thread *td) { return (ENOTTY); } @@ -980,7 +980,7 @@ FILEDESC_LOCK(fdp); goto retry; } - bcopy((caddr_t)fdp->fd_knlist, (caddr_t)list, + bcopy(fdp->fd_knlist, list, fdp->fd_knlistsize * sizeof(struct klist *)); bzero((caddr_t)list + fdp->fd_knlistsize * sizeof(struct klist *), ==== //depot/projects/interrupt/sys/kern/kern_exec.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_exec.c,v 1.167 2002/06/25 18:14:38 alc Exp $ + * $FreeBSD: src/sys/kern/kern_exec.c,v 1.168 2002/06/29 01:50:24 alfred Exp $ */ #include @@ -353,7 +353,7 @@ p->p_flag |= P_EXEC; if (p->p_pptr && (p->p_flag & P_PPWAIT)) { p->p_flag &= ~P_PPWAIT; - wakeup((caddr_t)p->p_pptr); + wakeup(p->p_pptr); } /* ==== //depot/projects/interrupt/sys/kern/kern_exit.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 - * $FreeBSD: src/sys/kern/kern_exit.c,v 1.168 2002/06/24 15:48:01 jake Exp $ + * $FreeBSD: src/sys/kern/kern_exit.c,v 1.169 2002/06/29 01:50:24 alfred Exp $ */ #include "opt_compat.h" @@ -157,7 +157,7 @@ q = q->p_peers; } while (p->p_peers) - msleep((caddr_t)p, &p->p_mtx, PWAIT, "exit1", 0); + msleep(p, &p->p_mtx, PWAIT, "exit1", 0); } PROC_UNLOCK(p); @@ -212,7 +212,7 @@ while (q->p_peers != p) q = q->p_peers; q->p_peers = p->p_peers; - wakeup((caddr_t)p->p_leader); + wakeup(p->p_leader); } PROC_UNLOCK(p->p_leader); @@ -348,7 +348,7 @@ sx_xlock(&proctree_lock); q = LIST_FIRST(&p->p_children); if (q != NULL) /* only need this if any child is S_ZOMB */ - wakeup((caddr_t) initproc); + wakeup(initproc); for (; q != NULL; q = nq) { nq = LIST_NEXT(q, p_sibling); PROC_LOCK(q); @@ -401,7 +401,7 @@ * continue. */ if (LIST_EMPTY(&pp->p_children)) - wakeup((caddr_t)pp); + wakeup(pp); } if (p->p_sigparent && p->p_pptr != initproc) @@ -414,7 +414,7 @@ * If this is a kthread, then wakeup anyone waiting for it to exit. */ if (p->p_flag & P_KTHREAD) - wakeup((caddr_t)p); + wakeup(p); PROC_UNLOCK(p); /* @@ -569,8 +569,8 @@ if (uap->status) { status = p->p_xstat; /* convert to int */ PROC_UNLOCK(p); - if ((error = copyout((caddr_t)&status, - (caddr_t)uap->status, sizeof(status)))) { + if ((error = copyout(&status, + uap->status, sizeof(status)))) { sx_xunlock(&proctree_lock); mtx_unlock(&Giant); return (error); @@ -580,9 +580,8 @@ if (uap->rusage) { bcopy(p->p_ru, &ru, sizeof(ru)); PROC_UNLOCK(p); - if ((error = copyout((caddr_t)&ru, - (caddr_t)uap->rusage, - sizeof (struct rusage)))) { + if ((error = copyout(&ru, + uap->rusage, sizeof (struct rusage)))) { sx_xunlock(&proctree_lock); mtx_unlock(&Giant); return (error); @@ -599,7 +598,7 @@ proc_reparent(p, t); PROC_UNLOCK(p); psignal(t, SIGCHLD); - wakeup((caddr_t)t); + wakeup(t); PROC_UNLOCK(t); sx_xunlock(&proctree_lock); mtx_unlock(&Giant); @@ -685,8 +684,8 @@ if (uap->status) { status = W_STOPCODE(p->p_xstat); PROC_UNLOCK(p); - error = copyout((caddr_t)&status, - (caddr_t)uap->status, sizeof(status)); + error = copyout(&status, + uap->status, sizeof(status)); } else { PROC_UNLOCK(p); error = 0; @@ -702,8 +701,8 @@ if (uap->status) { status = SIGCONT; - error = copyout((caddr_t)&status, - (caddr_t)uap->status, sizeof(status)); + error = copyout(&status, + uap->status, sizeof(status)); } else error = 0; @@ -725,7 +724,7 @@ } PROC_LOCK(q); sx_xunlock(&proctree_lock); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 10:37:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B72437B400; Sat, 29 Jun 2002 10:35:54 -0700 (PDT) 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 ECF3437B401; Sat, 29 Jun 2002 10:35:53 -0700 (PDT) Received: from tesla.distributel.net (nat.MTL.distributel.NET [66.38.181.24]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E21F43E09; Sat, 29 Jun 2002 10:35:52 -0700 (PDT) (envelope-from bmilekic@unixdaemons.com) Received: (from bmilekic@localhost) by tesla.distributel.net (8.11.6/8.11.6) id g5THcqS12141; Sat, 29 Jun 2002 13:38:52 -0400 (EDT) (envelope-from bmilekic@unixdaemons.com) Date: Sat, 29 Jun 2002 13:38:51 -0400 From: Bosko Milekic To: Bosko Milekic Cc: Perforce Change Reviews Subject: Re: PERFORCE change 13599 for review Message-ID: <20020629133851.A12121@unixdaemons.com> References: <200206291733.g5THXQZu041720@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <200206291733.g5THXQZu041720@freefall.freebsd.org>; from bmilekic@freebsd.org on Sat, Jun 29, 2002 at 10:33:26AM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I think I almost caught exactly everything right before the first part of KSE III. :-) On Sat, Jun 29, 2002 at 10:33:26AM -0700, Bosko Milekic wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13599 > > Change 13599 by bmilekic@bmilekic_angela on 2002/06/29 10:32:45 > > Final IFC before KSEIII (just saw julian's Email about > commit about to go in). > > Affected files ... > > .. //depot/projects/interrupt/sys/alpha/include/kse.h#1 branch > .. //depot/projects/interrupt/sys/boot/alpha/boot1/boot1.c#3 integrate > .. //depot/projects/interrupt/sys/boot/alpha/libalpha/common.h#2 integrate > .. //depot/projects/interrupt/sys/conf/files.powerpc#4 integrate > .. //depot/projects/interrupt/sys/ddb/db_elf.c#2 integrate > .. //depot/projects/interrupt/sys/dev/bge/if_bge.c#5 integrate > .. //depot/projects/interrupt/sys/dev/fxp/if_fxp.c#4 integrate > .. //depot/projects/interrupt/sys/dev/lge/if_lge.c#3 integrate > .. //depot/projects/interrupt/sys/dev/nge/if_nge.c#4 integrate > .. //depot/projects/interrupt/sys/dev/sio/sio_ebus.c#2 integrate > .. //depot/projects/interrupt/sys/geom/geom_aes.c#2 integrate > .. //depot/projects/interrupt/sys/geom/geom_kern.c#3 integrate > .. //depot/projects/interrupt/sys/i386/include/kse.h#1 branch > .. //depot/projects/interrupt/sys/i386/isa/intr_machdep.h#5 integrate > .. //depot/projects/interrupt/sys/kern/kern_descrip.c#6 integrate > .. //depot/projects/interrupt/sys/kern/kern_event.c#4 integrate > .. //depot/projects/interrupt/sys/kern/kern_exec.c#7 integrate > .. //depot/projects/interrupt/sys/kern/kern_exit.c#6 integrate > .. //depot/projects/interrupt/sys/kern/kern_ktrace.c#6 integrate > .. //depot/projects/interrupt/sys/kern/kern_lockf.c#3 integrate > .. //depot/projects/interrupt/sys/kern/kern_physio.c#3 integrate > .. //depot/projects/interrupt/sys/kern/kern_prot.c#8 integrate > .. //depot/projects/interrupt/sys/kern/kern_resource.c#4 integrate > .. //depot/projects/interrupt/sys/kern/kern_sig.c#4 integrate > .. //depot/projects/interrupt/sys/kern/kern_subr.c#6 integrate > .. //depot/projects/interrupt/sys/kern/kern_synch.c#5 integrate > .. //depot/projects/interrupt/sys/kern/kern_sysctl.c#4 integrate > .. //depot/projects/interrupt/sys/kern/kern_thread.c#1 branch > .. //depot/projects/interrupt/sys/kern/kern_time.c#4 integrate > .. //depot/projects/interrupt/sys/kern/kern_xxx.c#3 integrate > .. //depot/projects/interrupt/sys/kern/subr_disklabel.c#5 integrate > .. //depot/projects/interrupt/sys/kern/subr_log.c#3 integrate > .. //depot/projects/interrupt/sys/kern/subr_mbuf.c#5 integrate > .. //depot/projects/interrupt/sys/kern/subr_prf.c#5 integrate > .. //depot/projects/interrupt/sys/kern/subr_prof.c#3 integrate > .. //depot/projects/interrupt/sys/kern/sys_pipe.c#7 integrate > .. //depot/projects/interrupt/sys/kern/sys_socket.c#5 integrate > .. //depot/projects/interrupt/sys/kern/uipc_cow.c#2 integrate > .. //depot/projects/interrupt/sys/kern/uipc_jumbo.c#2 integrate > .. //depot/projects/interrupt/sys/kern/uipc_socket.c#7 integrate > .. //depot/projects/interrupt/sys/kern/uipc_socket2.c#5 integrate > .. //depot/projects/interrupt/sys/kern/uipc_syscalls.c#7 integrate > .. //depot/projects/interrupt/sys/kern/uipc_usrreq.c#5 integrate > .. //depot/projects/interrupt/sys/kern/vfs_cache.c#6 integrate > .. //depot/projects/interrupt/sys/kern/vfs_export.c#4 integrate > .. //depot/projects/interrupt/sys/kern/vfs_subr.c#9 integrate > .. //depot/projects/interrupt/sys/kern/vfs_syscalls.c#9 integrate > .. //depot/projects/interrupt/sys/kern/vfs_vnops.c#9 integrate > .. //depot/projects/interrupt/sys/netinet/tcp_syncache.c#7 integrate > .. //depot/projects/interrupt/sys/nfsclient/nfs.h#4 integrate > .. //depot/projects/interrupt/sys/nfsclient/nfs_bio.c#4 integrate > .. //depot/projects/interrupt/sys/nfsclient/nfs_socket.c#4 integrate > .. //depot/projects/interrupt/sys/nfsclient/nfs_vnops.c#3 integrate > .. //depot/projects/interrupt/sys/pci/if_sk.c#3 integrate > .. //depot/projects/interrupt/sys/pci/if_ti.c#5 integrate > .. //depot/projects/interrupt/sys/pci/if_wb.c#3 integrate > .. //depot/projects/interrupt/sys/powerpc/include/cpufunc.h#5 integrate > .. //depot/projects/interrupt/sys/powerpc/include/critical.h#2 integrate > .. //depot/projects/interrupt/sys/powerpc/include/in_cksum.h#1 branch > .. //depot/projects/interrupt/sys/powerpc/include/pcb.h#4 integrate > .. //depot/projects/interrupt/sys/powerpc/include/pmap.h#5 integrate > .. //depot/projects/interrupt/sys/powerpc/powerpc/autoconf.c#3 integrate > .. //depot/projects/interrupt/sys/powerpc/powerpc/bcopy.c#2 integrate > .. //depot/projects/interrupt/sys/powerpc/powerpc/clock.c#4 integrate > .. //depot/projects/interrupt/sys/powerpc/powerpc/in_cksum.c#1 branch > .. //depot/projects/interrupt/sys/powerpc/powerpc/interrupt.c#1 branch > .. //depot/projects/interrupt/sys/powerpc/powerpc/locore.s#5 integrate > .. //depot/projects/interrupt/sys/powerpc/powerpc/ofw_machdep.c#4 integrate > .. //depot/projects/interrupt/sys/powerpc/powerpc/pmap.c#7 integrate > .. //depot/projects/interrupt/sys/powerpc/powerpc/swtch.s#5 integrate > .. //depot/projects/interrupt/sys/powerpc/powerpc/trap_subr.S#2 integrate > .. //depot/projects/interrupt/sys/sparc64/conf/GENERIC#6 integrate > .. //depot/projects/interrupt/sys/sparc64/include/kse.h#1 branch > .. //depot/projects/interrupt/sys/sparc64/include/profile.h#2 integrate > .. //depot/projects/interrupt/sys/sparc64/sparc64/pmap.c#8 integrate > .. //depot/projects/interrupt/sys/sys/event.h#3 integrate > .. //depot/projects/interrupt/sys/sys/file.h#5 integrate > .. //depot/projects/interrupt/sys/sys/jumbo.h#2 integrate > .. //depot/projects/interrupt/sys/sys/kse.h#3 integrate > .. //depot/projects/interrupt/sys/sys/mbuf.h#6 integrate > .. //depot/projects/interrupt/sys/sys/socketvar.h#6 integrate > .. //depot/projects/interrupt/sys/sys/vnode.h#5 integrate > > Differences ... > > ==== //depot/projects/interrupt/sys/boot/alpha/boot1/boot1.c#3 (text+ko) ==== > > @@ -1,5 +1,5 @@ > /* > - * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.11 2002/06/11 10:19:59 phk Exp $ > + * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.12 2002/06/29 02:32:32 peter Exp $ > * From $NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ > */ > > @@ -253,7 +253,7 @@ > char *name = "/boot/loader"; > char *p; > char filename[512]; > - void (*entry) __P((void)); > + void (*entry)(void); > u_long start, freq; > int i; > > > ==== //depot/projects/interrupt/sys/boot/alpha/libalpha/common.h#2 (text+ko) ==== > > @@ -1,11 +1,11 @@ > /* > - * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.2 1999/08/28 00:39:26 peter Exp $ > + * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.3 2002/06/29 02:32:32 peter Exp $ > * From: $NetBSD: common.h,v 1.2 1998/01/05 07:02:48 perry Exp $ > */ > > -int prom_open __P((char*, int)); > -void OSFpal __P((void)); > -void halt __P((void)); > -u_int64_t prom_dispatch __P((int, ...)); > -int cpu_number __P((void)); > -void switch_palcode __P((void)); > +int prom_open(char*, int); > +void OSFpal(void); > +void halt(void); > +u_int64_t prom_dispatch(int, ...); > +int cpu_number(void); > +void switch_palcode(void); > > ==== //depot/projects/interrupt/sys/conf/files.powerpc#4 (text+ko) ==== > > @@ -1,7 +1,7 @@ > # This file tells config what files go into building a kernel, > # files marked standard are always included. > # > -# $FreeBSD: src/sys/conf/files.powerpc,v 1.10 2002/05/13 07:53:22 benno Exp $ > +# $FreeBSD: src/sys/conf/files.powerpc,v 1.12 2002/06/29 09:50:20 benno Exp $ > # > # The long compile-with and dependency lines are required because of > # limitations in config: backslash-newline doesn't work in strings, and > @@ -21,6 +21,8 @@ > powerpc/powerpc/extintr.c standard > powerpc/powerpc/fpu.c standard > powerpc/powerpc/fuswintr.c standard > +powerpc/powerpc/in_cksum.c optional inet > +powerpc/powerpc/interrupt.c standard > powerpc/powerpc/machdep.c standard > powerpc/powerpc/nexus.c standard > powerpc/powerpc/ofwmagic.s standard > > ==== //depot/projects/interrupt/sys/ddb/db_elf.c#2 (text+ko) ==== > > @@ -1,4 +1,4 @@ > -/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.10 2002/05/07 10:59:52 bde Exp $ */ > +/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.11 2002/06/29 02:32:33 peter Exp $ */ > /* $NetBSD: db_elf.c,v 1.4 1998/05/03 18:49:54 thorpej Exp $ */ > > /*- > @@ -56,7 +56,7 @@ > > #include > > -static char *db_elf_find_strtab __P((db_symtab_t *)); > +static char *db_elf_find_strtab(db_symtab_t *); > > #define STAB_TO_SYMSTART(stab) ((Elf_Sym *)((stab)->start)) > #define STAB_TO_SYMEND(stab) ((Elf_Sym *)((stab)->end)) > > ==== //depot/projects/interrupt/sys/dev/bge/if_bge.c#5 (text+ko) ==== > > @@ -30,7 +30,7 @@ > * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF > * THE POSSIBILITY OF SUCH DAMAGE. > * > - * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.15 2002/06/24 22:28:42 mp Exp $ > + * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.16 2002/06/29 01:36:59 alfred Exp $ > */ > > /* > @@ -122,7 +122,7 @@ > > #if !defined(lint) > static const char rcsid[] = > - "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.15 2002/06/24 22:28:42 mp Exp $"; > + "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.16 2002/06/29 01:36:59 alfred Exp $"; > #endif > > /* > @@ -181,7 +181,7 @@ > static int bge_alloc_jumbo_mem (struct bge_softc *); > static void bge_free_jumbo_mem (struct bge_softc *); > static void *bge_jalloc (struct bge_softc *); > -static void bge_jfree (caddr_t, void *); > +static void bge_jfree (void *, void *); > static int bge_newbuf_std (struct bge_softc *, int, struct mbuf *); > static int bge_newbuf_jumbo (struct bge_softc *, int, struct mbuf *); > static int bge_init_rx_ring_std (struct bge_softc *); > @@ -663,7 +663,7 @@ > */ > static void > bge_jfree(buf, args) > - caddr_t buf; > + void *buf; > void *args; > { > struct bge_jpool_entry *entry; > > ==== //depot/projects/interrupt/sys/dev/fxp/if_fxp.c#4 (text+ko) ==== > > @@ -25,7 +25,7 @@ > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > * SUCH DAMAGE. > * > - * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.130 2002/06/05 18:34:08 ambrisko Exp $ > + * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.131 2002/06/29 01:56:14 silby Exp $ > */ > > /* > @@ -160,6 +160,7 @@ > { 0x1037, "Intel Pro/100 Ethernet" }, > { 0x1038, "Intel Pro/100 Ethernet" }, > { 0x1039, "Intel Pro/100 Ethernet" }, > + { 0x103A, "Intel Pro/100 Ethernet" }, > { 0, NULL }, > }; > > > ==== //depot/projects/interrupt/sys/dev/lge/if_lge.c#3 (text+ko) ==== > > @@ -30,7 +30,7 @@ > * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF > * THE POSSIBILITY OF SUCH DAMAGE. > * > - * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.11 2002/04/28 20:34:20 phk Exp $ > + * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.12 2002/06/29 01:36:59 alfred Exp $ > */ > > /* > @@ -114,7 +114,7 @@ > > #ifndef lint > static const char rcsid[] = > - "$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.11 2002/04/28 20:34:20 phk Exp $"; > + "$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.12 2002/06/29 01:36:59 alfred Exp $"; > #endif > > /* > @@ -132,7 +132,7 @@ > static int lge_alloc_jumbo_mem (struct lge_softc *); > static void lge_free_jumbo_mem (struct lge_softc *); > static void *lge_jalloc (struct lge_softc *); > -static void lge_jfree (caddr_t, void *); > +static void lge_jfree (void *, void *); > > static int lge_newbuf (struct lge_softc *, > struct lge_rx_desc *, > @@ -917,7 +917,7 @@ > * Release a jumbo buffer. > */ > static void lge_jfree(buf, args) > - caddr_t buf; > + void *buf; > void *args; > { > struct lge_softc *sc; > > ==== //depot/projects/interrupt/sys/dev/nge/if_nge.c#4 (text+ko) ==== > > @@ -30,7 +30,7 @@ > * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF > * THE POSSIBILITY OF SUCH DAMAGE. > * > - * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.32 2002/05/04 11:15:33 phk Exp $ > + * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.33 2002/06/29 01:36:59 alfred Exp $ > */ > > /* > @@ -132,7 +132,7 @@ > > #ifndef lint > static const char rcsid[] = > - "$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.32 2002/05/04 11:15:33 phk Exp $"; > + "$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.33 2002/06/29 01:36:59 alfred Exp $"; > #endif > > #define NGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) > @@ -153,7 +153,7 @@ > static int nge_alloc_jumbo_mem (struct nge_softc *); > static void nge_free_jumbo_mem (struct nge_softc *); > static void *nge_jalloc (struct nge_softc *); > -static void nge_jfree (caddr_t, void *); > +static void nge_jfree (void *, void *); > > static int nge_newbuf (struct nge_softc *, > struct nge_desc *, struct mbuf *); > @@ -1203,7 +1203,7 @@ > * Release a jumbo buffer. > */ > static void nge_jfree(buf, args) > - caddr_t buf; > + void *buf; > void *args; > { > struct nge_softc *sc; > > ==== //depot/projects/interrupt/sys/dev/sio/sio_ebus.c#2 (text+ko) ==== > > @@ -24,7 +24,7 @@ > */ > > #include > -__FBSDID($FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.1 2002/06/18 01:19:31 obrien Exp $); > +__FBSDID($FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.2 2002/06/29 02:32:33 peter Exp $); > > #include > #include > @@ -40,9 +40,9 @@ > #include > #include > > -int sio_ofw_inlist __P((char *name, char *list[])); > -static int sio_ebus_attach __P((device_t dev)); > -static int sio_ebus_probe __P((device_t dev)); > +int sio_ofw_inlist(char *name, char *list[]); > +static int sio_ebus_attach(device_t dev); > +static int sio_ebus_probe(device_t dev); > > static device_method_t sio_ebus_methods[] = { > /* Device interface */ > > ==== //depot/projects/interrupt/sys/geom/geom_aes.c#2 (text+ko) ==== > > @@ -32,7 +32,7 @@ > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > * SUCH DAMAGE. > * > - * $FreeBSD: src/sys/geom/geom_aes.c,v 1.2 2002/06/09 10:57:33 phk Exp $ > + * $FreeBSD: src/sys/geom/geom_aes.c,v 1.3 2002/06/28 21:25:15 phk Exp $ > * > * This method provides AES encryption with a compiled in key (default > * all zeroes). > @@ -55,6 +55,9 @@ > #include > #include > #include > +#include > +#include > +#include > #endif > #include > #include > @@ -65,26 +68,83 @@ > > #define AES_CLASS_NAME "AES" > > +#define MASTER_KEY_LENGTH (1024/8) > + > static u_char *aes_magic = "<>"; > +static u_char *aes_magic_random = "<>"; > +static u_char *aes_magic_test = "<>"; > > -static u_char aes_key[128 / 8] = { > - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 > -}; > > struct g_aes_softc { > + enum { > + KEY_ZERO, > + KEY_RANDOM, > + KEY_TEST > + } keying; > u_int sectorsize; > off_t mediasize; > - keyInstance ekey; > - keyInstance dkey; > cipherInstance ci; > + u_char master_key[MASTER_KEY_LENGTH]; > }; > > +/* > + * Generate a sectorkey from the masterkey and the offset position. > + * > + * For KEY_ZERO we just return a key of all zeros. > + * > + * We feed the sector byte offset, 16 bytes of the master-key and > + * the sector byte offset once more to MD5. > + * The sector byte offset is converted to little-endian format first > + * to support multi-architecture operation. > + * We use 16 bytes from the master-key starting at the logical sector > + * number modulus he length of the master-key. If need be we wrap > + * around to the start of the master-key. > + */ > + > +static void > +g_aes_makekey(struct g_aes_softc *sc, off_t off, keyInstance *ki, int dir) > +{ > + MD5_CTX cx; > + u_int64_t u64; > + u_int u, u1; > + u_char *p, buf[16]; > + > + if (sc->keying == KEY_ZERO) { > + rijndael_makeKey(ki, dir, 128, sc->master_key); > + return; > + } > + MD5Init(&cx); > + u64 = htole64(off); > + MD5Update(&cx, (u_char *)&u64, sizeof(u64)); > + u = off / sc->sectorsize; > + u %= sizeof sc->master_key; > + p = sc->master_key + u; > + if (u + 16 <= sizeof(sc->master_key)) { > + MD5Update(&cx, p, 16); > + } else { > + u1 = sizeof sc->master_key - u; > + MD5Update(&cx, p, u1); > + MD5Update(&cx, sc->master_key, 16 - u1); > + u1 = 0; /* destroy evidence */ > + } > + u = 0; /* destroy evidence */ > + MD5Update(&cx, (u_char *)&u64, sizeof(u64)); > + u64 = 0; /* destroy evidence */ > + MD5Final(buf, &cx); > + bzero(&cx, sizeof cx); /* destroy evidence */ > + rijndael_makeKey(ki, dir, 128, buf); > + bzero(buf, sizeof buf); /* destroy evidence */ > + > +} > + > static void > g_aes_read_done(struct bio *bp) > { > struct g_geom *gp; > struct g_aes_softc *sc; > u_char *p, *b, *e, *sb; > + keyInstance dkey; > + off_t o; > > gp = bp->bio_from->geom; > sc = gp->softc; > @@ -92,17 +152,28 @@ > b = bp->bio_data; > e = bp->bio_data; > e += bp->bio_length; > + o = bp->bio_offset - sc->sectorsize; > for (p = b; p < e; p += sc->sectorsize) { > - rijndael_blockDecrypt(&sc->ci, &sc->dkey, p, sc->sectorsize * 8, sb); > + g_aes_makekey(sc, o, &dkey, DIR_DECRYPT); > + rijndael_blockDecrypt(&sc->ci, &dkey, p, sc->sectorsize * 8, sb); > bcopy(sb, p, sc->sectorsize); > + o += sc->sectorsize; > } > + bzero(&dkey, sizeof dkey); /* destroy evidence */ > + bzero(sb, sc->sectorsize); /* destroy evidence */ > + g_free(sb); > g_std_done(bp); > } > > static void > g_aes_write_done(struct bio *bp) > { > + struct g_aes_softc *sc; > + struct g_geom *gp; > > + gp = bp->bio_to->geom; > + sc = gp->softc; > + bzero(bp->bio_data, bp->bio_length); /* destroy evidence */ > g_free(bp->bio_data); > g_std_done(bp); > } > @@ -115,6 +186,8 @@ > struct g_aes_softc *sc; > struct bio *bp2; > u_char *p1, *p2, *b, *e; > + keyInstance ekey; > + off_t o; > > gp = bp->bio_to->geom; > cp = LIST_FIRST(&gp->consumer); > @@ -135,11 +208,15 @@ > e = bp->bio_data; > e += bp->bio_length; > p2 = bp2->bio_data; > + o = bp->bio_offset; > for (p1 = b; p1 < e; p1 += sc->sectorsize) { > - rijndael_blockEncrypt(&sc->ci, &sc->ekey, > + g_aes_makekey(sc, o, &ekey, DIR_ENCRYPT); > + rijndael_blockEncrypt(&sc->ci, &ekey, > p1, sc->sectorsize * 8, p2); > p2 += sc->sectorsize; > + o += sc->sectorsize; > } > + bzero(&ekey, sizeof ekey); /* destroy evidence */ > g_io_request(bp2, cp); > break; > case BIO_GETATTR: > @@ -166,6 +243,7 @@ > { > struct g_geom *gp; > struct g_provider *pp; > + struct g_aes_softc *sc; > int error; > > g_trace(G_T_TOPOLOGY, "g_aes_orphan(%p/%s)", cp, cp->provider->name); > @@ -174,10 +252,12 @@ > ("g_aes_orphan with error == 0")); > > gp = cp->geom; > + sc = gp->softc; > gp->flags |= G_GEOM_WITHER; > error = cp->provider->error; > LIST_FOREACH(pp, &gp->provider, provider) > g_orphan_provider(pp, error); > + bzero(sc, sizeof(struct g_aes_softc)); /* destroy evidence */ > return; > } > > @@ -238,16 +318,46 @@ > if (buf == NULL || error != 0) { > break; > } > - if (memcmp(buf, aes_magic, strlen(aes_magic))) > + sc = g_malloc(sizeof(struct g_aes_softc), M_WAITOK | M_ZERO); > + if (!memcmp(buf, aes_magic, strlen(aes_magic))) { > + sc->keying = KEY_ZERO; > + } else if (!memcmp(buf, aes_magic_random, > + strlen(aes_magic_random))) { > + sc->keying = KEY_RANDOM; > + } else if (!memcmp(buf, aes_magic_test, > + strlen(aes_magic_test))) { > + sc->keying = KEY_TEST; > + } else { > + g_free(sc); > break; > - sc = g_malloc(sizeof(struct g_aes_softc), M_WAITOK | M_ZERO); > + } > gp->softc = sc; > gp->access = g_aes_access; > sc->sectorsize = sectorsize; > sc->mediasize = mediasize - sectorsize; > rijndael_cipherInit(&sc->ci, MODE_CBC, NULL); > - rijndael_makeKey(&sc->ekey, DIR_ENCRYPT, 128, aes_key); > - rijndael_makeKey(&sc->dkey, DIR_DECRYPT, 128, aes_key); > + if (sc->keying == KEY_TEST) { > + int i; > + u_char *p; > + > + p = sc->master_key; > + for (i = 0; i < sizeof sc->master_key; i ++) > + *p++ = i; > + } > + if (sc->keying == KEY_RANDOM) { > + int i; > + u_int32_t u; > + u_char *p; > + > + p = sc->master_key; > + for (i = 0; i < sizeof sc->master_key; i += sizeof u) { > + u = arc4random(); > + *p++ = u; > + *p++ = u >> 8; > + *p++ = u >> 16; > + *p++ = u >> 24; > + } > + } > pp = g_new_providerf(gp, gp->name); > pp->mediasize = mediasize - sectorsize; > g_error_provider(pp, 0); > > ==== //depot/projects/interrupt/sys/geom/geom_kern.c#3 (text+ko) ==== > > @@ -32,7 +32,7 @@ > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > * SUCH DAMAGE. > * > - * $FreeBSD: src/sys/geom/geom_kern.c,v 1.3 2002/03/26 22:07:38 phk Exp $ > + * $FreeBSD: src/sys/geom/geom_kern.c,v 1.4 2002/06/29 07:47:20 julian Exp $ > */ > > #include > @@ -63,7 +63,7 @@ > g_up_procbody(void) > { > struct proc *p = g_up_proc; > - struct thread *tp = &p->p_xxthread; > + struct thread *tp = FIRST_THREAD_IN_PROC(p); > > curthread->td_base_pri = PRIBIO; > for(;;) { > @@ -86,7 +86,7 @@ > g_down_procbody(void) > { > struct proc *p = g_down_proc; > - struct thread *tp = &p->p_xxthread; > + struct thread *tp = FIRST_THREAD_IN_PROC(p); > > curthread->td_base_pri = PRIBIO; > for(;;) { > > ==== //depot/projects/interrupt/sys/i386/isa/intr_machdep.h#5 (text+ko) ==== > > @@ -30,7 +30,7 @@ > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > * SUCH DAMAGE. > * > - * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.40 2002/04/06 08:25:05 nyan Exp $ > + * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.41 2002/06/29 02:32:33 peter Exp $ > */ > > #ifndef _I386_ISA_INTR_MACHDEP_H_ > @@ -140,7 +140,7 @@ > * Type of the first (asm) part of an interrupt handler. > */ > typedef void inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); > -typedef void unpendhand_t __P((void)); > +typedef void unpendhand_t(void); > > #define IDTVEC(name) __CONCAT(X,name) > > > ==== //depot/projects/interrupt/sys/kern/kern_descrip.c#6 (text+ko) ==== > > @@ -36,7 +36,7 @@ > * SUCH DAMAGE. > * > * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 > - * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.148 2002/05/31 11:52:29 tanimura Exp $ > + * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.149 2002/06/29 01:50:24 alfred Exp $ > */ > > #include "opt_compat.h" > @@ -99,7 +99,7 @@ > static int do_dup(struct filedesc *fdp, int old, int new, register_t *retval, struct thread *td); > static int badfo_readwrite(struct file *fp, struct uio *uio, > struct ucred *cred, int flags, struct thread *td); > -static int badfo_ioctl(struct file *fp, u_long com, caddr_t data, > +static int badfo_ioctl(struct file *fp, u_long com, void *data, > struct thread *td); > static int badfo_poll(struct file *fp, int events, > struct ucred *cred, struct thread *td); > @@ -313,34 +313,34 @@ > fp->f_flag &= ~FCNTLFLAGS; > fp->f_flag |= FFLAGS(uap->arg & ~O_ACCMODE) & FCNTLFLAGS; > tmp = fp->f_flag & FNONBLOCK; > - error = fo_ioctl(fp, FIONBIO, (caddr_t)&tmp, td); > + error = fo_ioctl(fp, FIONBIO, &tmp, td); > if (error) { > fdrop(fp, td); > break; > } > tmp = fp->f_flag & FASYNC; > - error = fo_ioctl(fp, FIOASYNC, (caddr_t)&tmp, td); > + error = fo_ioctl(fp, FIOASYNC, &tmp, td); > if (!error) { > fdrop(fp, td); > break; > } > fp->f_flag &= ~FNONBLOCK; > tmp = 0; > - (void)fo_ioctl(fp, FIONBIO, (caddr_t)&tmp, td); > + (void)fo_ioctl(fp, FIONBIO, &tmp, td); > fdrop(fp, td); > break; > > case F_GETOWN: > fhold(fp); > FILEDESC_UNLOCK(fdp); > - error = fo_ioctl(fp, FIOGETOWN, (caddr_t)td->td_retval, td); > + error = fo_ioctl(fp, FIOGETOWN, (void *)td->td_retval, td); > fdrop(fp, td); > break; > > case F_SETOWN: > fhold(fp); > FILEDESC_UNLOCK(fdp); > - error = fo_ioctl(fp, FIOSETOWN, (caddr_t)&uap->arg, td); > + error = fo_ioctl(fp, FIOSETOWN, &uap->arg, td); > fdrop(fp, td); > break; > > @@ -363,8 +363,7 @@ > vp = (struct vnode *)fp->f_data; > > /* Copy in the lock structure */ > - error = copyin((caddr_t)(intptr_t)uap->arg, (caddr_t)&fl, > - sizeof(fl)); > + error = copyin((caddr_t)(intptr_t)uap->arg, &fl, sizeof(fl)); > if (error) { > fdrop(fp, td); > break; > @@ -434,8 +433,7 @@ > vp = (struct vnode *)fp->f_data; > > /* Copy in the lock structure */ > - error = copyin((caddr_t)(intptr_t)uap->arg, (caddr_t)&fl, > - sizeof(fl)); > + error = copyin((caddr_t)(intptr_t)uap->arg, &fl, sizeof(fl)); > if (error) { > fdrop(fp, td); > break; > @@ -461,8 +459,8 @@ > &fl, F_POSIX); > fdrop(fp, td); > if (error == 0) { > - error = copyout((caddr_t)&fl, > - (caddr_t)(intptr_t)uap->arg, sizeof(fl)); > + error = copyout(&fl, (caddr_t)(intptr_t)uap->arg, > + sizeof(fl)); > } > break; > default: > @@ -835,7 +833,7 @@ > error = fo_stat(fp, &ub, td); > if (error == 0) { > cvtstat(&ub, &oub); > - error = copyout((caddr_t)&oub, (caddr_t)uap->sb, sizeof (oub)); > + error = copyout(&oub, uap->sb, sizeof (oub)); > } > fdrop(fp, td); > done2: > @@ -871,7 +869,7 @@ > goto done2; > error = fo_stat(fp, &ub, td); > if (error == 0) > - error = copyout((caddr_t)&ub, (caddr_t)uap->sb, sizeof (ub)); > + error = copyout(&ub, uap->sb, sizeof (ub)); > fdrop(fp, td); > done2: > mtx_unlock(&Giant); > @@ -907,7 +905,7 @@ > error = fo_stat(fp, &ub, td); > if (error == 0) { > cvtnstat(&ub, &nub); > - error = copyout((caddr_t)&nub, (caddr_t)uap->sb, sizeof (nub)); > + error = copyout(&nub, uap->sb, sizeof (nub)); > } > fdrop(fp, td); > done2: > @@ -1563,7 +1561,7 @@ > break; > } > NDFREE(&nd, NDF_ONLY_PNBUF); > - fp->f_data = (caddr_t)nd.ni_vp; > + fp->f_data = nd.ni_vp; > fp->f_flag = flags; > fp->f_ops = &vnops; > fp->f_type = DTYPE_VNODE; > @@ -2067,7 +2065,7 @@ > return (error); > } > > - error = SYSCTL_OUT(req, (caddr_t)&filehead, sizeof(filehead)); > + error = SYSCTL_OUT(req, &filehead, sizeof(filehead)); > if (error) { > sx_sunlock(&filelist_lock); > return (error); > @@ -2077,7 +2075,7 @@ > * followed by an array of file structures > */ > LIST_FOREACH(fp, &filehead, f_list) { > - error = SYSCTL_OUT(req, (caddr_t)fp, sizeof (struct file)); > + error = SYSCTL_OUT(req, fp, sizeof (struct file)); > if (error) { > sx_sunlock(&filelist_lock); > return (error); > @@ -2145,7 +2143,7 @@ > badfo_ioctl(fp, com, data, td) > struct file *fp; > u_long com; > - caddr_t data; > + void *data; > struct thread *td; > { > > > ==== //depot/projects/interrupt/sys/kern/kern_event.c#4 (text+ko) ==== > > @@ -23,7 +23,7 @@ > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > * SUCH DAMAGE. > * > - * $FreeBSD: src/sys/kern/kern_event.c,v 1.39 2002/05/19 00:14:48 jhb Exp $ > + * $FreeBSD: src/sys/kern/kern_event.c,v 1.41 2002/06/29 01:50:24 alfred Exp $ > */ > > #include > @@ -60,7 +60,7 @@ > struct ucred *cred, int flags, struct thread *td); > static int kqueue_write(struct file *fp, struct uio *uio, > struct ucred *cred, int flags, struct thread *td); > -static int kqueue_ioctl(struct file *fp, u_long com, caddr_t data, > +static int kqueue_ioctl(struct file *fp, u_long com, void *data, > struct thread *td); > static int kqueue_poll(struct file *fp, int events, struct ucred *cred, > struct thread *td); > @@ -334,7 +334,7 @@ > M_KQUEUE, M_WAITOK); > callout_init(calloutp, 0); > callout_reset(calloutp, tticks, filt_timerexpire, kn); > - kn->kn_hook = (caddr_t)calloutp; > + kn->kn_hook = calloutp; > > return (0); > } > @@ -380,7 +380,7 @@ > fp->f_type = DTYPE_KQUEUE; > fp->f_ops = &kqueueops; > TAILQ_INIT(&kq->kq_head); > - fp->f_data = (caddr_t)kq; > + fp->f_data = kq; > FILE_UNLOCK(fp); > FILEDESC_LOCK(fdp); > td->td_retval[0] = fd; > @@ -446,8 +446,8 @@ > if (uap->nevents != 0) { > kevp->flags = EV_ERROR; > kevp->data = error; > - (void) copyout((caddr_t)kevp, > - (caddr_t)uap->eventlist, > + (void) copyout(kevp, > + uap->eventlist, > sizeof(*kevp)); > uap->eventlist++; > uap->nevents--; > @@ -751,7 +751,7 @@ > count--; > if (nkev == KQ_NEVENTS) { > splx(s); > - error = copyout((caddr_t)&kq->kq_kev, (caddr_t)ulistp, > + error = copyout(&kq->kq_kev, ulistp, > sizeof(struct kevent) * nkev); > ulistp += nkev; > nkev = 0; > @@ -765,7 +765,7 @@ > splx(s); > done: > if (nkev != 0) > - error = copyout((caddr_t)&kq->kq_kev, (caddr_t)ulistp, > + error = copyout(&kq->kq_kev, ulistp, > sizeof(struct kevent) * nkev); > td->td_retval[0] = maxevents - count; > return (error); > @@ -793,7 +793,7 @@ > > /*ARGSUSED*/ > static int > -kqueue_ioctl(struct file *fp, u_long com, caddr_t data, struct thread *td) > +kqueue_ioctl(struct file *fp, u_long com, void *data, struct thread *td) > { > return (ENOTTY); > } > @@ -980,7 +980,7 @@ > FILEDESC_LOCK(fdp); > goto retry; > } > - bcopy((caddr_t)fdp->fd_knlist, (caddr_t)list, > + bcopy(fdp->fd_knlist, list, > fdp->fd_knlistsize * sizeof(struct klist *)); > bzero((caddr_t)list + > fdp->fd_knlistsize * sizeof(struct klist *), > > ==== //depot/projects/interrupt/sys/kern/kern_exec.c#7 (text+ko) ==== > > @@ -23,7 +23,7 @@ > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > * SUCH DAMAGE. > * > - * $FreeBSD: src/sys/kern/kern_exec.c,v 1.167 2002/06/25 18:14:38 alc Exp $ > + * $FreeBSD: src/sys/kern/kern_exec.c,v 1.168 2002/06/29 01:50:24 alfred Exp $ > */ > > #include > @@ -353,7 +353,7 @@ > p->p_flag |= P_EXEC; > if (p->p_pptr && (p->p_flag & P_PPWAIT)) { > p->p_flag &= ~P_PPWAIT; > - wakeup((caddr_t)p->p_pptr); > + wakeup(p->p_pptr); > } > > /* > > ==== //depot/projects/interrupt/sys/kern/kern_exit.c#6 (text+ko) ==== > > @@ -36,7 +36,7 @@ > * SUCH DAMAGE. > * > * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 > - * $FreeBSD: src/sys/kern/kern_exit.c,v 1.168 2002/06/24 15:48:01 jake Exp $ > + * $FreeBSD: src/sys/kern/kern_exit.c,v 1.169 2002/06/29 01:50:24 alfred Exp $ > */ > > #include "opt_compat.h" > @@ -157,7 +157,7 @@ > q = q->p_peers; > } > while (p->p_peers) > - msleep((caddr_t)p, &p->p_mtx, PWAIT, "exit1", 0); > + msleep(p, &p->p_mtx, PWAIT, "exit1", 0); > } > PROC_UNLOCK(p); > > @@ -212,7 +212,7 @@ > while (q->p_peers != p) > q = q->p_peers; > q->p_peers = p->p_peers; > - wakeup((caddr_t)p->p_leader); > + wakeup(p->p_leader); > } > PROC_UNLOCK(p->p_leader); > > @@ -348,7 +348,7 @@ > sx_xlock(&proctree_lock); > q = LIST_FIRST(&p->p_children); > if (q != NULL) /* only need this if any child is S_ZOMB */ > - wakeup((caddr_t) initproc); > + wakeup(initproc); > for (; q != NULL; q = nq) { > nq = LIST_NEXT(q, p_sibling); > PROC_LOCK(q); > @@ -401,7 +401,7 @@ > * continue. > */ > if (LIST_EMPTY(&pp->p_children)) > - wakeup((caddr_t)pp); > + wakeup(pp); > } > > if (p->p_sigparent && p->p_pptr != initproc) > @@ -414,7 +414,7 @@ > * If this is a kthread, then wakeup anyone waiting for it to exit. > */ > if (p->p_flag & P_KTHREAD) > - wakeup((caddr_t)p); > + wakeup(p); > PROC_UNLOCK(p); > > /* > @@ -569,8 +569,8 @@ > if (uap->status) { > status = p->p_xstat; /* convert to int */ > PROC_UNLOCK(p); > - if ((error = copyout((caddr_t)&status, > - (caddr_t)uap->status, sizeof(status)))) { > + if ((error = copyout(&status, > + uap->status, sizeof(status)))) { > sx_xunlock(&proctree_lock); > mtx_unlock(&Giant); > return (error); > @@ -580,9 +580,8 @@ > if (uap->rusage) { > bcopy(p->p_ru, &ru, sizeof(ru)); > PROC_UNLOCK(p); > - if ((error = copyout((caddr_t)&ru, > - (caddr_t)uap->rusage, > - sizeof (struct rusage)))) { > + if ((error = copyout(&ru, > + uap->rusage, sizeof (struct rusage)))) { > sx_xunlock(&proctree_lock); > mtx_unlock(&Giant); > return (error); > @@ -599,7 +598,7 @@ > proc_reparent(p, t); > PROC_UNLOCK(p); > psignal(t, SIGCHLD); > - wakeup((caddr_t)t); > + wakeup(t); > PROC_UNLOCK(t); > sx_xunlock(&proctree_lock); > mtx_unlock(&Giant); > @@ -685,8 +684,8 @@ > if (uap->status) { > status = W_STOPCODE(p->p_xstat); > PROC_UNLOCK(p); > - error = copyout((caddr_t)&status, > - (caddr_t)uap->status, sizeof(status)); > + error = copyout(&status, > + uap->status, sizeof(status)); > } else { > PROC_UNLOCK(p); > error = 0; > @@ -702,8 +701,8 @@ > > if (uap->status) { > status = SIGCONT; > - error = copyout((caddr_t)&status, > - (caddr_t)uap->status, sizeof(status)); > + error = copyout(&status, > + uap->status, sizeof(status)); > } else > error = 0; > > @@ -725,7 +724,7 @@ > } > PROC_LOCK(q); > sx_xunlock(&proctree_lock); > > >>> TRUNCATED FOR MAIL (1000 lines) <<< > -- Bosko Milekic bmilekic@unixdaemons.com bmilekic@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 10:43:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38A6B37B401; Sat, 29 Jun 2002 10:43:41 -0700 (PDT) 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 D085637B400 for ; Sat, 29 Jun 2002 10:43:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CD5943E13 for ; Sat, 29 Jun 2002 10:43:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5THheJU042745 for ; Sat, 29 Jun 2002 10:43:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5THhetH042742 for perforce@freebsd.org; Sat, 29 Jun 2002 10:43:40 -0700 (PDT) Date: Sat, 29 Jun 2002 10:43:40 -0700 (PDT) Message-Id: <200206291743.g5THhetH042742@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13601 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13601 Change 13601 by rwatson@rwatson_curry on 2002/06/29 10:43:09 Point Makefiles explicitly at foo.8 instead of lettting it figure it out themselves. Apparently some default changed in the integ that broke this. Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/getfmac/Makefile#3 edit .. //depot/projects/trustedbsd/mac/usr.sbin/getpmac/Makefile#2 edit .. //depot/projects/trustedbsd/mac/usr.sbin/setfmac/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/getfmac/Makefile#3 (text+ko) ==== @@ -1,4 +1,5 @@ PROG= getfmac SRCS= getfmac.c +MAN= getfmac.8 CFLAGS+=-Wall .include ==== //depot/projects/trustedbsd/mac/usr.sbin/getpmac/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/usr.sbin/setfmac/Makefile#3 (text+ko) ==== @@ -1,4 +1,5 @@ PROG= setfmac SRCS= setfmac.c +MAN= setfmac.8 CFLAGS+=-Wall .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 11:51: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 087E037B405; Sat, 29 Jun 2002 11:51:05 -0700 (PDT) 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 8D84937B400 for ; Sat, 29 Jun 2002 11:51:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21B9B43E09 for ; Sat, 29 Jun 2002 11:51:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5TIp4JU054392 for ; Sat, 29 Jun 2002 11:51:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5TIp36V054389 for perforce@freebsd.org; Sat, 29 Jun 2002 11:51:03 -0700 (PDT) Date: Sat, 29 Jun 2002 11:51:03 -0700 (PDT) Message-Id: <200206291851.g5TIp36V054389@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13606 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13606 Change 13606 by rwatson@rwatson_curry on 2002/06/29 11:50:18 Temporarily disable the install of share/security/sebsd, since cpio isn't found: ===> share/security ===> share/security/sebsd cd /cboss/p4/rwatson/trustedbsd/mac/share/security/sebsd/../../../contrib/sebsd/policy; cpio -p -Rroot:wheel /cboss/devel/nfsroot/crash1.cboss.tislabs.com/usr/share/security/sebsd/policy < files.lst cpio: not found *** Error code 127 Stop in /cboss/p4/rwatson/trustedbsd/mac/share/security/sebsd. *** Error code 1 We should reconnect once fixed. Affected files ... .. //depot/projects/trustedbsd/mac/share/security/sebsd/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/share/security/sebsd/Makefile#4 (text+ko) ==== @@ -11,7 +11,8 @@ echo ${DSTDIR} install: - cd ${SRCDIR}; cpio -p -R${BINOWN}:${BINGRP} ${DSTDIR} < files.lst +# cd ${SRCDIR}; cpio -p -R${BINOWN}:${BINGRP} ${DSTDIR} < files.lst + echo "share/security/sebsd temporarily disabled due to breakage" .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 12:14:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A805237B405; Sat, 29 Jun 2002 12:14:33 -0700 (PDT) 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 2B7A037B400 for ; Sat, 29 Jun 2002 12:14:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCE5B43E0A for ; Sat, 29 Jun 2002 12:14:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5TJEWJU062055 for ; Sat, 29 Jun 2002 12:14:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5TJEWqv062052 for perforce@freebsd.org; Sat, 29 Jun 2002 12:14:32 -0700 (PDT) Date: Sat, 29 Jun 2002 12:14:32 -0700 (PDT) Message-Id: <200206291914.g5TJEWqv062052@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13607 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13607 Change 13607 by rwatson@rwatson_curry on 2002/06/29 12:13:32 Fix mis-merge, rename of p1/p2 to td/p Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#22 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#22 (text+ko) ==== @@ -1595,7 +1595,7 @@ return (error); #ifdef MAC - error = mac_cred_candebug(p1->p_ucred, p2); + error = mac_cred_candebug(td->td_ucred, p); if (error) return (error); #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 12:20:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C86537B401; Sat, 29 Jun 2002 12:18:40 -0700 (PDT) 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 0A40237B400 for ; Sat, 29 Jun 2002 12:18:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F5FF43E13 for ; Sat, 29 Jun 2002 12:18:39 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5TJIdJU062807 for ; Sat, 29 Jun 2002 12:18:39 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5TJIcuk062804 for perforce@freebsd.org; Sat, 29 Jun 2002 12:18:38 -0700 (PDT) Date: Sat, 29 Jun 2002 12:18:38 -0700 (PDT) Message-Id: <200206291918.g5TJIcuk062804@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 13609 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13609 Change 13609 by julian@julian_ref on 2002/06/29 12:17:47 MFC should nullify most of the diff Affected files ... .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#1 branch .. //depot/projects/kse/lib/libkvm/kvm_proc.c#17 integrate .. //depot/projects/kse/sys/alpha/alpha/genassym.c#16 integrate .. //depot/projects/kse/sys/alpha/alpha/pmap.c#30 integrate .. //depot/projects/kse/sys/alpha/alpha/swtch.s#12 integrate .. //depot/projects/kse/sys/alpha/alpha/trap.c#30 integrate .. //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#27 integrate .. //depot/projects/kse/sys/alpha/linux/linux_machdep.c#11 integrate .. //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#18 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_misc.c#15 integrate .. //depot/projects/kse/sys/conf/files#42 integrate .. //depot/projects/kse/sys/ddb/db_ps.c#21 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_ctl.c#22 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_dbregs.c#15 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_fpregs.c#15 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#7 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_regs.c#15 integrate .. //depot/projects/kse/sys/i386/i386/genassym.c#29 integrate .. //depot/projects/kse/sys/i386/i386/machdep.c#49 integrate .. //depot/projects/kse/sys/i386/i386/pmap.c#40 integrate .. //depot/projects/kse/sys/i386/i386/swtch.s#35 integrate .. //depot/projects/kse/sys/i386/i386/trap.c#57 integrate .. //depot/projects/kse/sys/i386/i386/vm_machdep.c#60 integrate .. //depot/projects/kse/sys/i386/linux/linux_machdep.c#15 integrate .. //depot/projects/kse/sys/i386/linux/linux_ptrace.c#4 integrate .. //depot/projects/kse/sys/ia64/ia64/genassym.c#21 integrate .. //depot/projects/kse/sys/ia64/ia64/swtch.s#18 integrate .. //depot/projects/kse/sys/ia64/ia64/trap.c#25 integrate .. //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#20 integrate .. //depot/projects/kse/sys/ia64/include/kse.h#1 branch .. //depot/projects/kse/sys/kern/init_main.c#44 integrate .. //depot/projects/kse/sys/kern/init_sysent.c#21 integrate .. //depot/projects/kse/sys/kern/kern_condvar.c#38 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#32 integrate .. //depot/projects/kse/sys/kern/kern_exit.c#58 integrate .. //depot/projects/kse/sys/kern/kern_fork.c#74 integrate .. //depot/projects/kse/sys/kern/kern_idle.c#15 integrate .. //depot/projects/kse/sys/kern/kern_intr.c#26 integrate .. //depot/projects/kse/sys/kern/kern_kthread.c#13 integrate .. //depot/projects/kse/sys/kern/kern_mutex.c#30 integrate .. //depot/projects/kse/sys/kern/kern_poll.c#8 integrate .. //depot/projects/kse/sys/kern/kern_proc.c#75 integrate .. //depot/projects/kse/sys/kern/kern_shutdown.c#30 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#58 integrate .. //depot/projects/kse/sys/kern/kern_subr.c#16 integrate .. //depot/projects/kse/sys/kern/kern_switch.c#62 integrate .. //depot/projects/kse/sys/kern/kern_synch.c#75 integrate .. //depot/projects/kse/sys/kern/subr_smp.c#12 integrate .. //depot/projects/kse/sys/kern/subr_trap.c#74 integrate .. //depot/projects/kse/sys/kern/subr_witness.c#28 integrate .. //depot/projects/kse/sys/kern/sys_generic.c#29 integrate .. //depot/projects/kse/sys/kern/sys_process.c#27 integrate .. //depot/projects/kse/sys/kern/syscalls.master#20 integrate .. //depot/projects/kse/sys/kern/tty.c#29 integrate .. //depot/projects/kse/sys/kern/vfs_export.c#6 integrate .. //depot/projects/kse/sys/posix4/ksched.c#11 integrate .. //depot/projects/kse/sys/sparc64/sparc64/genassym.c#27 integrate .. //depot/projects/kse/sys/sparc64/sparc64/swtch.s#18 integrate .. //depot/projects/kse/sys/sparc64/sparc64/trap.c#33 integrate .. //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#26 integrate .. //depot/projects/kse/sys/sys/condvar.h#7 integrate .. //depot/projects/kse/sys/sys/proc.h#118 integrate .. //depot/projects/kse/sys/sys/queue.h#7 integrate .. //depot/projects/kse/sys/sys/signalvar.h#14 integrate .. //depot/projects/kse/sys/sys/systm.h#27 integrate .. //depot/projects/kse/sys/sys/ucred.h#13 integrate .. //depot/projects/kse/sys/vm/uma_int.h#6 integrate .. //depot/projects/kse/sys/vm/vm_glue.c#34 integrate .. //depot/projects/kse/sys/vm/vm_meter.c#15 integrate .. //depot/projects/kse/sys/vm/vm_pageout.c#16 integrate .. //depot/projects/kse/sys/vm/vm_zeroidle.c#10 integrate Differences ... ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#17 (text+ko) ==== @@ -34,11 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.46 2002/04/07 04:47:58 dd Exp $ + * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.47 2002/06/29 17:26:10 julian Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.46 2002/04/07 04:47:58 dd Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.47 2002/06/29 17:26:10 julian Exp $"); #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93"; ==== //depot/projects/kse/sys/alpha/alpha/genassym.c#16 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.37 2002/03/29 16:35:25 jake Exp $ + * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.38 2002/06/29 17:26:10 julian Exp $ */ #include ==== //depot/projects/kse/sys/alpha/alpha/pmap.c#30 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.93 2002/06/27 04:08:45 jeff Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.94 2002/06/29 17:26:11 julian Exp $ */ /* ==== //depot/projects/kse/sys/alpha/alpha/swtch.s#12 (text+ko) ==== @@ -25,7 +25,7 @@ * rights to redistribute these changes. * * $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ - * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.31 2001/12/11 23:33:38 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.32 2002/06/29 17:26:11 julian Exp $ */ #define _LOCORE ==== //depot/projects/kse/sys/alpha/alpha/trap.c#30 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.95 2002/06/24 06:21:52 mini Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.96 2002/06/29 17:26:11 julian Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* ==== //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#27 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.67 2002/06/24 15:48:00 jake Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.68 2002/06/29 17:26:11 julian Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. ==== //depot/projects/kse/sys/alpha/linux/linux_machdep.c#11 (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. * - * $FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.21 2002/02/08 08:56:00 peter Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.22 2002/06/29 17:26:12 julian Exp $ */ #include ==== //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#18 (text+ko) ==== @@ -38,7 +38,7 @@ * * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 * - * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.52 2002/05/19 00:14:47 jhb Exp $ + * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.53 2002/06/29 17:26:13 julian Exp $ */ #include ==== //depot/projects/kse/sys/compat/svr4/svr4_misc.c#15 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.46 2002/05/25 10:48:03 bde Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.47 2002/06/29 17:26:13 julian Exp $ */ /* ==== //depot/projects/kse/sys/conf/files#42 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.655 2002/06/27 23:02:17 luigi Exp $ +# $FreeBSD: src/sys/conf/files,v 1.656 2002/06/29 17:26:14 julian Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/kse/sys/ddb/db_ps.c#21 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/db_ps.c,v 1.28 2002/04/11 21:01:34 jhb Exp $ + * $FreeBSD: src/sys/ddb/db_ps.c,v 1.29 2002/06/29 17:26:14 julian Exp $ */ #include #include ==== //depot/projects/kse/sys/fs/procfs/procfs_ctl.c#22 (text+ko) ==== @@ -38,7 +38,7 @@ * * From: * $Id: procfs_ctl.c,v 3.2 1993/12/15 09:40:17 jsp Exp $ - * $FreeBSD: src/sys/fs/procfs/procfs_ctl.c,v 1.40 2002/05/19 00:14:47 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_ctl.c,v 1.41 2002/06/29 17:26:14 julian Exp $ */ #include ==== //depot/projects/kse/sys/fs/procfs/procfs_dbregs.c#15 (text+ko) ==== @@ -44,7 +44,7 @@ * * From: * $Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $ - * $FreeBSD: src/sys/fs/procfs/procfs_dbregs.c,v 1.20 2002/05/19 00:14:47 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_dbregs.c,v 1.21 2002/06/29 17:26:15 julian Exp $ */ #include ==== //depot/projects/kse/sys/fs/procfs/procfs_fpregs.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ * * From: * $Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $ - * $FreeBSD: src/sys/fs/procfs/procfs_fpregs.c,v 1.26 2002/05/19 00:14:47 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_fpregs.c,v 1.27 2002/06/29 17:26:15 julian Exp $ */ #include ==== //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#7 (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. * - * $FreeBSD: src/sys/fs/procfs/procfs_ioctl.c,v 1.4 2002/04/01 21:30:39 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_ioctl.c,v 1.5 2002/06/29 17:26:15 julian Exp $ */ #include ==== //depot/projects/kse/sys/fs/procfs/procfs_regs.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ * * From: * $Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $ - * $FreeBSD: src/sys/fs/procfs/procfs_regs.c,v 1.25 2002/05/19 00:14:47 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs_regs.c,v 1.26 2002/06/29 17:26:15 julian Exp $ */ #include ==== //depot/projects/kse/sys/i386/i386/genassym.c#29 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.124 2002/03/27 05:39:18 dillon Exp $ + * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.125 2002/06/29 17:26:16 julian Exp $ */ #include "opt_kstack_pages.h" ==== //depot/projects/kse/sys/i386/i386/machdep.c#49 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.520 2002/06/24 21:31:57 peter Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.521 2002/06/29 17:26:16 julian Exp $ */ #include "opt_atalk.h" ==== //depot/projects/kse/sys/i386/i386/pmap.c#40 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.326 2002/06/27 06:34:03 arr Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.327 2002/06/29 17:26:16 julian Exp $ */ /* ==== //depot/projects/kse/sys/i386/i386/swtch.s#35 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.131 2002/03/27 05:39:19 dillon Exp $ + * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.132 2002/06/29 17:26:16 julian Exp $ */ #include "opt_npx.h" ==== //depot/projects/kse/sys/i386/i386/trap.c#57 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.227 2002/06/24 06:23:41 mini Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.228 2002/06/29 17:26:16 julian Exp $ */ /* ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#60 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.188 2002/06/24 15:48:00 jake Exp $ + * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.189 2002/06/29 17:26:16 julian Exp $ */ #include "opt_npx.h" ==== //depot/projects/kse/sys/i386/linux/linux_machdep.c#15 (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. * - * $FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.26 2002/04/01 21:30:46 jhb Exp $ + * $FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.27 2002/06/29 17:26:17 julian Exp $ */ #include ==== //depot/projects/kse/sys/i386/linux/linux_ptrace.c#4 (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. * - * $FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.2 2002/05/19 19:35:36 marcel Exp $ + * $FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.3 2002/06/29 17:26:17 julian Exp $ */ #include ==== //depot/projects/kse/sys/ia64/ia64/genassym.c#21 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/ia64/ia64/genassym.c,v 1.28 2002/03/29 16:35:25 jake Exp $ + * $FreeBSD: src/sys/ia64/ia64/genassym.c,v 1.29 2002/06/29 18:26:18 julian Exp $ */ #include @@ -76,9 +76,11 @@ ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); +ASSYM(TD_STATE, offsetof(struct thread, td_state)); ASSYM(TD_KSE, offsetof(struct thread, td_kse)); ASSYM(TD_KSTACK, offsetof(struct thread, td_kstack)); ASSYM(TD_MD_FLAGS, offsetof(struct thread, td_md.md_flags)); +ASSYM(TDS_RUNNING, TDS_RUNNING); ASSYM(KE_FLAGS, offsetof(struct kse, ke_flags)); ==== //depot/projects/kse/sys/ia64/ia64/swtch.s#18 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/swtch.s,v 1.21 2002/05/07 05:52:27 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/swtch.s,v 1.22 2002/06/29 18:26:18 julian Exp $ */ #include @@ -283,6 +283,12 @@ st8 [r14]=r4 // set r13->pc_curthread mov ar.k7=r4 ;; +// Julian's guess at settinghte thread state + add r15=TD_STATE,r4 + ;; + mov [r15]=TDS_RUNNING + ;; +// end of julian's guess add r15=TD_PCB,r4 ;; ld8 r15=[r15] ==== //depot/projects/kse/sys/ia64/ia64/trap.c#25 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.58 2002/06/24 06:21:57 mini Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.60 2002/06/29 18:26:18 julian Exp $ */ /* From: src/sys/alpha/alpha/trap.c,v 1.33 */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -334,6 +335,11 @@ td->td_frame = framep; if (td->td_ucred != p->p_ucred) cred_update_thread(td); + if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + mtx_lock_spin(&sched_lock); + thread_exit(); + /* NOTREACHED */ + } } else { sticks = 0; /* XXX bogus -Wuninitialized warning */ KASSERT(cold || td->td_ucred != NULL, @@ -799,6 +805,24 @@ framep->tf_cr_iip += 16; } + if (p->p_flag & P_KSES) { + /* + * If we are doing a syscall in a KSE environment, + * note where our mailbox is. There is always the + * possibility that we could do this lazily (in sleep()), + * but for now do it every time. + */ + td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox + + offsetof(struct kse_mailbox, kmbx_current_thread)); + if ((td->td_mailbox == NULL) || + (td->td_mailbox == (void *)-1)) { + td->td_mailbox = NULL; /* single thread it.. */ + td->td_flags &= ~TDF_UNBOUND; + } else { + td->td_flags |= TDF_UNBOUND; + } + } + #ifdef DIAGNOSTIC ia64_fpstate_check(td); #endif ==== //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#20 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.41 2002/06/24 15:48:00 jake Exp $ + * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.42 2002/06/29 18:26:18 julian Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -112,6 +112,43 @@ return(r); } +void +cpu_thread_exit(struct thread *td) +{ +} + +void +cpu_thread_setup(struct thread *td) +{ +} + +void +cpu_save_upcall(struct thread *td, struct kse *newkse) +{ +} + +void +cpu_set_upcall(struct thread *td, void *pcb) +{ +} + +void +cpu_set_args(struct thread *td, struct kse *ke) +{ +} + +void +cpu_free_kse_mdstorage(struct kse *ke) +{ +} + +int +cpu_export_context(struct thread *td) +{ + return (0); +} + + /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child ==== //depot/projects/kse/sys/kern/init_main.c#44 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/init_main.c,v 1.195 2002/05/16 21:28:11 trhodes Exp $ + * $FreeBSD: src/sys/kern/init_main.c,v 1.196 2002/06/29 17:26:18 julian Exp $ */ #include "opt_init_path.h" ==== //depot/projects/kse/sys/kern/init_sysent.c#21 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.124 2002/06/13 23:44:50 rwatson Exp $ + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.125 2002/06/29 17:26:18 julian Exp $ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp */ ==== //depot/projects/kse/sys/kern/kern_condvar.c#38 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_condvar.c,v 1.22 2002/06/07 05:39:16 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_condvar.c,v 1.23 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/kse/sys/kern/kern_exec.c#32 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_exec.c,v 1.168 2002/06/29 01:50:24 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_exec.c,v 1.169 2002/06/29 17:26:18 julian Exp $ */ #include ==== //depot/projects/kse/sys/kern/kern_exit.c#58 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 - * $FreeBSD: src/sys/kern/kern_exit.c,v 1.169 2002/06/29 01:50:24 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_exit.c,v 1.170 2002/06/29 17:26:18 julian Exp $ */ #include "opt_compat.h" ==== //depot/projects/kse/sys/kern/kern_fork.c#74 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_fork.c 8.6 (Berkeley) 4/8/94 - * $FreeBSD: src/sys/kern/kern_fork.c,v 1.150 2002/06/24 06:21:57 mini Exp $ + * $FreeBSD: src/sys/kern/kern_fork.c,v 1.151 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/kse/sys/kern/kern_idle.c#15 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 2000, All rights reserved. See /usr/src/COPYRIGHT * - * $FreeBSD: src/sys/kern/kern_idle.c,v 1.22 2002/02/07 20:58:44 julian Exp $ + * $FreeBSD: src/sys/kern/kern_idle.c,v 1.23 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/kse/sys/kern/kern_intr.c#26 (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/sys/kern/kern_intr.c,v 1.75 2002/05/29 20:40:50 julian Exp $ + * $FreeBSD: src/sys/kern/kern_intr.c,v 1.76 2002/06/29 17:26:18 julian Exp $ * */ ==== //depot/projects/kse/sys/kern/kern_kthread.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_kthread.c,v 1.22 2002/02/07 23:06:26 peter Exp $ + * $FreeBSD: src/sys/kern/kern_kthread.c,v 1.23 2002/06/29 17:26:18 julian Exp $ */ #include ==== //depot/projects/kse/sys/kern/kern_mutex.c#30 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.101 2002/06/04 22:36:24 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.102 2002/06/29 17:26:18 julian Exp $ */ /* ==== //depot/projects/kse/sys/kern/kern_poll.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_poll.c,v 1.7 2002/06/27 23:23:04 luigi Exp $ + * $FreeBSD: src/sys/kern/kern_poll.c,v 1.8 2002/06/29 17:26:18 julian Exp $ */ #include ==== //depot/projects/kse/sys/kern/kern_proc.c#75 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $FreeBSD: src/sys/kern/kern_proc.c,v 1.137 2002/06/22 10:05:50 mini Exp $ + * $FreeBSD: src/sys/kern/kern_proc.c,v 1.138 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/kse/sys/kern/kern_shutdown.c#30 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.128 2002/05/12 18:27:28 marcel Exp $ + * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.129 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ddb.h" ==== //depot/projects/kse/sys/kern/kern_sig.c#58 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.170 2002/06/29 02:00:01 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.171 2002/06/29 17:26:18 julian Exp $ */ #include "opt_compat.h" ==== //depot/projects/kse/sys/kern/kern_subr.c#16 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_subr.c,v 1.55 2002/06/29 00:29:12 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_subr.c,v 1.56 2002/06/29 17:26:18 julian Exp $ */ #include "opt_zero.h" ==== //depot/projects/kse/sys/kern/kern_switch.c#62 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_switch.c,v 1.28 2002/06/20 06:21:20 peter Exp $ + * $FreeBSD: src/sys/kern/kern_switch.c,v 1.29 2002/06/29 17:26:18 julian Exp $ */ /*** ==== //depot/projects/kse/sys/kern/kern_synch.c#75 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.177 2002/06/29 02:00:01 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.178 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ddb.h" ==== //depot/projects/kse/sys/kern/subr_smp.c#12 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_smp.c,v 1.168 2002/04/05 10:00:37 bde Exp $ + * $FreeBSD: src/sys/kern/subr_smp.c,v 1.169 2002/06/29 17:26:18 julian Exp $ */ /* ==== //depot/projects/kse/sys/kern/subr_trap.c#74 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/kern/subr_trap.c,v 1.218 2002/06/24 06:21:57 mini Exp $ + * $FreeBSD: src/sys/kern/subr_trap.c,v 1.219 2002/06/29 17:26:18 julian Exp $ */ #ifdef __i386__ ==== //depot/projects/kse/sys/kern/subr_witness.c#28 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/subr_witness.c,v 1.118 2002/06/06 20:51:03 jhb Exp $ + * $FreeBSD: src/sys/kern/subr_witness.c,v 1.119 2002/06/29 17:26:18 julian Exp $ */ /* ==== //depot/projects/kse/sys/kern/sys_generic.c#29 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/sys_generic.c,v 1.103 2002/06/20 18:52:54 alfred Exp $ + * $FreeBSD: src/sys/kern/sys_generic.c,v 1.104 2002/06/29 17:26:18 julian Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/kse/sys/kern/sys_process.c#27 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/sys_process.c,v 1.94 2002/05/19 01:37:43 marcel Exp $ + * $FreeBSD: src/sys/kern/sys_process.c,v 1.95 2002/06/29 17:26:18 julian Exp $ */ #include ==== //depot/projects/kse/sys/kern/syscalls.master#20 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.114 2002/06/29 17:26:19 julian Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. ==== //depot/projects/kse/sys/kern/tty.c#29 (text+ko) ==== @@ -44,7 +44,7 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/tty.c,v 1.182 2002/06/20 14:03:36 iedowse Exp $ + * $FreeBSD: src/sys/kern/tty.c,v 1.183 2002/06/29 17:26:19 julian Exp $ */ /*- ==== //depot/projects/kse/sys/kern/vfs_export.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_export.c,v 1.316 2002/06/28 23:17:36 alfred Exp $ + * $FreeBSD: src/sys/kern/vfs_export.c,v 1.318 2002/06/29 17:58:44 alfred Exp $ */ #include @@ -129,7 +129,7 @@ if (saddr->sa_len > argp->ex_addrlen) saddr->sa_len = argp->ex_addrlen; if (argp->ex_masklen) { - smask = (struct sockaddr *) (saddr + argp->ex_addrlen); + smask = (struct sockaddr *)((caddr_t)saddr + argp->ex_addrlen); error = copyin(argp->ex_mask, smask, argp->ex_masklen); if (error) goto out; @@ -153,11 +153,22 @@ goto out; } } - rn = (*rnh->rnh_addaddr) (saddr, smask, rnh, - np->netc_rnodes); - if (rn == 0 || np != (struct netcred *) rn) { /* already exists */ - error = EPERM; - goto out; + rn = (*rnh->rnh_addaddr)(saddr, smask, rnh, np->netc_rnodes); + if (rn == 0) { + /* + * One of the reasons that rnh_addaddr may fail is that + * the entry already exists. To check for this case, we + * look up the entry to see if it is there. If so, we + * do not need to make a new entry but do return success. + */ + free(np, M_NETADDR); + rn = (*rnh->rnh_matchaddr)(saddr, rnh); + if (rn != 0 && (rn->rn_flags & RNF_ROOT) == 0 && + ((struct netcred *)rn)->netc_exflags == argp->ex_flags && + !bcmp(&((struct netcred *)rn)->netc_anon, + &argp->ex_anon, sizeof(struct ucred))) + return (0); + return (EPERM); } np->netc_exflags = argp->ex_flags; bzero(&np->netc_anon, sizeof(np->netc_anon)); @@ -357,8 +368,7 @@ rnh = nep->ne_rtable[saddr->sa_family]; if (rnh != NULL) { np = (struct netcred *) - (*rnh->rnh_matchaddr)(saddr, - rnh); + (*rnh->rnh_matchaddr)(saddr, rnh); if (np && np->netc_rnodes->rn_flags & RNF_ROOT) np = NULL; } ==== //depot/projects/kse/sys/posix4/ksched.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/posix4/ksched.c,v 1.17 2002/02/11 20:37:54 julian Exp $ + * $FreeBSD: src/sys/posix4/ksched.c,v 1.18 2002/06/29 17:26:20 julian Exp $ */ /* ksched: Soft real time scheduling based on "rtprio". ==== //depot/projects/kse/sys/sparc64/sparc64/genassym.c#27 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.34 2002/05/29 06:08:44 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.35 2002/06/29 17:26:21 julian Exp $ */ #include ==== //depot/projects/kse/sys/sparc64/sparc64/swtch.s#18 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/sparc64/swtch.s,v 1.18 2002/03/07 05:15:43 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/swtch.s,v 1.19 2002/06/29 17:26:21 julian Exp $ */ #include ==== //depot/projects/kse/sys/sparc64/sparc64/trap.c#33 (text+ko) ==== @@ -37,7 +37,7 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * from: FreeBSD: src/sys/i386/i386/trap.c,v 1.197 2001/07/19 - * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.41 2002/06/24 06:21:59 mini Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.42 2002/06/29 17:26:21 julian Exp $ */ #include "opt_ddb.h" ==== //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#26 (text+ko) ==== @@ -40,7 +40,7 @@ * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ * from: FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.167 2001/07/12 - * $FreeBSD: src/sys/sparc64/sparc64/vm_machdep.c,v 1.25 2002/06/24 15:48:01 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/vm_machdep.c,v 1.26 2002/06/29 17:26:21 julian Exp $ */ #include ==== //depot/projects/kse/sys/sys/condvar.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/condvar.h,v 1.7 2002/03/31 07:23:29 phk Exp $ + * $FreeBSD: src/sys/sys/condvar.h,v 1.8 2002/06/29 17:26:22 julian Exp $ */ #ifndef _SYS_CONDVAR_H_ ==== //depot/projects/kse/sys/sys/proc.h#118 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.225 2002/06/24 16:44:38 markm Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.226 2002/06/29 17:26:22 julian Exp $ */ #ifndef _SYS_PROC_H_ ==== //depot/projects/kse/sys/sys/queue.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD: src/sys/sys/queue.h,v 1.48 2002/04/17 14:00:37 tmm Exp $ + * $FreeBSD: src/sys/sys/queue.h,v 1.49 2002/06/29 17:26:22 julian Exp $ */ #ifndef _SYS_QUEUE_H_ ==== //depot/projects/kse/sys/sys/signalvar.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signalvar.h 8.6 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/signalvar.h,v 1.52 2002/05/29 23:44:32 julian Exp $ + * $FreeBSD: src/sys/sys/signalvar.h,v 1.53 2002/06/29 17:26:22 julian Exp $ */ #ifndef _SYS_SIGNALVAR_H_ ==== //depot/projects/kse/sys/sys/systm.h#27 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.177 2002/06/20 07:23:08 peter Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.178 2002/06/29 17:26:22 julian Exp $ */ #ifndef _SYS_SYSTM_H_ ==== //depot/projects/kse/sys/sys/ucred.h#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ucred.h 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/ucred.h,v 1.37 2002/06/24 11:37:56 bde Exp $ + * $FreeBSD: src/sys/sys/ucred.h,v 1.38 2002/06/29 17:26:22 julian Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 12:23:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E92A137B401; Sat, 29 Jun 2002 12:23:46 -0700 (PDT) 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 A48A637B400 for ; Sat, 29 Jun 2002 12:23:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 615A543E1D for ; Sat, 29 Jun 2002 12:23:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5TJNkJU064437 for ; Sat, 29 Jun 2002 12:23:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5TJNkWt064434 for perforce@freebsd.org; Sat, 29 Jun 2002 12:23:46 -0700 (PDT) Date: Sat, 29 Jun 2002 12:23:46 -0700 (PDT) Message-Id: <200206291923.g5TJNkWt064434@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13611 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13611 Change 13611 by rwatson@rwatson_curry on 2002/06/29 12:22:51 Correct spelling of m_copy_pkthdr() prototype. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#10 (text+ko) ==== @@ -482,7 +482,7 @@ void m_copydata(const struct mbuf *, int, int, caddr_t); struct mbuf *m_copym(struct mbuf *, int, int, int); struct mbuf *m_copypacket(struct mbuf *, int); -void m_copy_pktrhdr(struct mbuf *to, struct mbuf *from); +void m_copy_pkthdr(struct mbuf *to, struct mbuf *from); struct mbuf *m_devget(char *, int, int, struct ifnet *, void (*copy)(char *, caddr_t, u_int)); struct mbuf *m_dup(struct mbuf *, int); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 12:51:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65D7C37B401; Sat, 29 Jun 2002 12:51:21 -0700 (PDT) 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 08CDE37B400 for ; Sat, 29 Jun 2002 12:51:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B87DD43E1D for ; Sat, 29 Jun 2002 12:51:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5TJpKJU067471 for ; Sat, 29 Jun 2002 12:51:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5TJpKpx067468 for perforce@freebsd.org; Sat, 29 Jun 2002 12:51:20 -0700 (PDT) Date: Sat, 29 Jun 2002 12:51:20 -0700 (PDT) Message-Id: <200206291951.g5TJpKpx067468@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13613 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13613 Change 13613 by rwatson@rwatson_curry on 2002/06/29 12:51:00 Hook up mac_none_*acl* checks, which I previously didn't hook up for some reason. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#33 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#33 (text+ko) ==== @@ -957,8 +957,12 @@ (macop_t)mac_none_cred_check_create_vnode }, { MAC_CRED_CHECK_DELETE_VNODE, (macop_t)mac_none_cred_check_delete_vnode }, + { MAC_CRED_CHECK_DELETEACL_VNODE, + (macop_t)mac_none_cred_check_deleteacl_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)mac_none_cred_check_exec_vnode }, + { MAC_CRED_CHECK_GETACL_VNODE, + (macop_t)mac_none_cred_check_getacl_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_none_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_LISTEN_SOCKET, @@ -973,6 +977,8 @@ (macop_t)mac_none_cred_check_revoke_vnode }, { MAC_CRED_CHECK_SEARCH_VNODE, (macop_t)mac_none_cred_check_search_vnode }, + { MAC_CRED_CHECK_SETACL_VNODE, + (macop_t)mac_none_cred_check_setacl_vnode }, { MAC_CRED_CHECK_SETEXTATTR_VNODE, (macop_t)mac_none_cred_check_setextattr_vnode }, { MAC_CRED_CHECK_SETFLAGS_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 13:26:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87A2A37B408; Sat, 29 Jun 2002 13:26:05 -0700 (PDT) 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 DC46D37B400 for ; Sat, 29 Jun 2002 13:26:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C14743E09 for ; Sat, 29 Jun 2002 13:26:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5TKQ4JU075083 for ; Sat, 29 Jun 2002 13:26:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5TKQ4lm075080 for perforce@freebsd.org; Sat, 29 Jun 2002 13:26:04 -0700 (PDT) Date: Sat, 29 Jun 2002 13:26:04 -0700 (PDT) Message-Id: <200206292026.g5TKQ4lm075080@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13616 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13616 Change 13616 by rwatson@rwatson_curry on 2002/06/29 13:25:25 Remove use of Giant from __mac_set_proc(). Call mac_internalize() while not holding the proc lock, since it may allocate memory, which can result in sleeping. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#154 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#154 (text+ko) ==== @@ -2338,26 +2338,21 @@ if (error) return (error); + error = mac_internalize(&intlabel, &extmac); + if (error) + return (error); + newcred = crget(); p = td->td_proc; - mtx_lock(&Giant); PROC_LOCK(p); oldcred = p->p_ucred; - error = mac_internalize(&intlabel, &extmac); - if (error) { - crfree(newcred); - mtx_unlock(&Giant); - return (error); - } - error = mac_cred_check_relabel_subject(oldcred, &intlabel); if (error) { PROC_UNLOCK(p); mac_destroy_temp(&intlabel); crfree(newcred); - mtx_unlock(&Giant); return (error); } @@ -2368,10 +2363,8 @@ p->p_ucred = newcred; PROC_UNLOCK(p); - crfree(oldcred); mac_destroy_temp(&intlabel); - mtx_unlock(&Giant); return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 13:27:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EB4D37B408; Sat, 29 Jun 2002 13:27:07 -0700 (PDT) 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 A493737B406 for ; Sat, 29 Jun 2002 13:27:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B5BA43E09 for ; Sat, 29 Jun 2002 13:27:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5TKR6JU075124 for ; Sat, 29 Jun 2002 13:27:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5TKR5HB075121 for perforce@freebsd.org; Sat, 29 Jun 2002 13:27:05 -0700 (PDT) Date: Sat, 29 Jun 2002 13:27:05 -0700 (PDT) Message-Id: <200206292027.g5TKR5HB075121@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13617 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13617 Change 13617 by rwatson@rwatson_tislabs on 2002/06/29 13:26:29 Fix var args handling in a macro, ## is not needed and was generating a token warning with the new compiler. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#155 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#155 (text+ko) ==== @@ -175,7 +175,7 @@ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ if (mpc->mpc_ops.mpo_ ## check != NULL) \ error = error_select( \ - mpc->mpc_ops.mpo_ ## check (## args), \ + mpc->mpc_ops.mpo_ ## check (args), \ error); \ } \ MAC_POLICY_LIST_UNBUSY(); \ @@ -196,7 +196,7 @@ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ if (mpc->mpc_ops.mpo_ ## operation != NULL) \ result = result composition \ - mpc->mpc_ops.mpo_ ## operation ( ## args); \ + mpc->mpc_ops.mpo_ ## operation (args); \ } \ MAC_POLICY_LIST_UNBUSY(); \ } while (0) @@ -211,7 +211,7 @@ MAC_POLICY_LIST_BUSY(); \ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ if (mpc->mpc_ops.mpo_ ## operation != NULL) \ - mpc->mpc_ops.mpo_ ## operation (## args); \ + mpc->mpc_ops.mpo_ ## operation (args); \ } \ MAC_POLICY_LIST_UNBUSY(); \ } while (0) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 14:14:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15C3037B400; Sat, 29 Jun 2002 14:14:03 -0700 (PDT) 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 AB5AA37B401; Sat, 29 Jun 2002 14:14:02 -0700 (PDT) Received: from garple.migus.org (pcp243391pcs.howard01.md.comcast.net [68.55.83.143]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2A4C43E0A; Sat, 29 Jun 2002 14:14:01 -0700 (PDT) (envelope-from adam@migus.org) Received: from ganyopa (ganyopa.migus.org [192.168.4.2]) by garple.migus.org (8.12.2/8.12.2) with SMTP id g5TLGxkj005211; Sat, 29 Jun 2002 17:16:59 -0400 (EDT) From: "Adam Migus" To: "Robert Watson" , "Perforce Change Reviews" Subject: RE: PERFORCE change 13617 for review Date: Sat, 29 Jun 2002 17:13:44 -0400 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2911.0) Importance: Normal X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 In-Reply-To: <200206292027.g5TKR5HB075121@freefall.freebsd.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Will this cause errors if I compile with the old compiler? > -----Original Message----- > From: Robert Watson [mailto:rwatson@freebsd.org] > Sent: Saturday, June 29, 2002 4:27 PM > To: Perforce Change Reviews > Subject: PERFORCE change 13617 for review > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13617 > > Change 13617 by rwatson@rwatson_tislabs on 2002/06/29 13:26:29 > > Fix var args handling in a macro, ## is not needed and was > generating a token warning with the new compiler. > > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#155 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#155 > (text+ko) ==== > > @@ -175,7 +175,7 @@ > LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ > if (mpc->mpc_ops.mpo_ ## check != NULL) \ > error = error_select( \ > - mpc->mpc_ops.mpo_ ## check (## args), \ > + mpc->mpc_ops.mpo_ ## check (args), \ > error); \ > } \ > MAC_POLICY_LIST_UNBUSY(); \ > @@ -196,7 +196,7 @@ > LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ > if (mpc->mpc_ops.mpo_ ## operation != NULL) \ > result = result composition \ > - mpc->mpc_ops.mpo_ ## operation ( ## args); \ > + mpc->mpc_ops.mpo_ ## operation (args); \ > } \ > MAC_POLICY_LIST_UNBUSY(); \ > } while (0) > @@ -211,7 +211,7 @@ > MAC_POLICY_LIST_BUSY(); \ > LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ > if (mpc->mpc_ops.mpo_ ## operation != NULL) \ > - mpc->mpc_ops.mpo_ ## operation (## args); \ > + mpc->mpc_ops.mpo_ ## operation (args); \ > } \ > MAC_POLICY_LIST_UNBUSY(); \ > } while (0) -----BEGIN PGP SIGNATURE----- Version: PGP 7.1 iQA/AwUBPR4jCHYIuWxy/CTSEQI7MACdHlABZrdixPd3iebnG6GSKS0PPq8Aniaz nR0aGoO07fvNyIC1X91Z5w9g =vXQl -----END PGP SIGNATURE----- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 14:20:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B88237B401; Sat, 29 Jun 2002 14:20:10 -0700 (PDT) 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 BACB137B400 for ; Sat, 29 Jun 2002 14:20:09 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B59643E09 for ; Sat, 29 Jun 2002 14:20:08 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g5TLK6bM040618; Sat, 29 Jun 2002 17:20:06 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Sat, 29 Jun 2002 17:20:06 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Adam Migus Cc: Perforce Change Reviews Subject: RE: PERFORCE change 13617 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Not sure if this will cause errors, but there is other stuff in the integ'd assembly code that requires a new compiler. What I'm doing until I trust the new code base is using a compiler local to the build tree: make buildworld make buildkernel KERNCONF=MYMAC If you do buildworld first, buildkernel will use the compiler from the obj tree from buildworld. Make sure you don't installworld unless you mean to :-) Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Sat, 29 Jun 2002, Adam Migus wrote: > > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Will this cause errors if I compile with the old compiler? > > > -----Original Message----- > > From: Robert Watson [mailto:rwatson@freebsd.org] > > Sent: Saturday, June 29, 2002 4:27 PM > > To: Perforce Change Reviews > > Subject: PERFORCE change 13617 for review > > > > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13617 > > > > Change 13617 by rwatson@rwatson_tislabs on 2002/06/29 13:26:29 > > > > Fix var args handling in a macro, ## is not needed and was > > generating a token warning with the new compiler. > > > > Affected files ... > > > > .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#155 edit > > > > Differences ... > > > > ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#155 > > (text+ko) ==== > > > > @@ -175,7 +175,7 @@ > > LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ > > if (mpc->mpc_ops.mpo_ ## check != NULL) \ > > error = error_select( \ > > - mpc->mpc_ops.mpo_ ## check (## args), \ > > + mpc->mpc_ops.mpo_ ## check (args), \ > > error); \ > > } \ > > MAC_POLICY_LIST_UNBUSY(); \ > > @@ -196,7 +196,7 @@ > > LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ > > if (mpc->mpc_ops.mpo_ ## operation != NULL) \ > > result = result composition \ > > - mpc->mpc_ops.mpo_ ## operation ( ## args); \ > > + mpc->mpc_ops.mpo_ ## operation (args); \ > > } \ > > MAC_POLICY_LIST_UNBUSY(); \ > > } while (0) > > @@ -211,7 +211,7 @@ > > MAC_POLICY_LIST_BUSY(); \ > > LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ > > if (mpc->mpc_ops.mpo_ ## operation != NULL) \ > > - mpc->mpc_ops.mpo_ ## operation (## args); \ > > + mpc->mpc_ops.mpo_ ## operation (args); \ > > } \ > > MAC_POLICY_LIST_UNBUSY(); \ > > } while (0) > > -----BEGIN PGP SIGNATURE----- > Version: PGP 7.1 > > iQA/AwUBPR4jCHYIuWxy/CTSEQI7MACdHlABZrdixPd3iebnG6GSKS0PPq8Aniaz > nR0aGoO07fvNyIC1X91Z5w9g > =vXQl > -----END PGP SIGNATURE----- > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jun 29 17:20:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 453B537B413; Sat, 29 Jun 2002 17:20:04 -0700 (PDT) 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 BA94F37B40E for ; Sat, 29 Jun 2002 17:20:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F92B43E77 for ; Sat, 29 Jun 2002 17:19:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5U0JnJU012575 for ; Sat, 29 Jun 2002 17:19:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5U0JmXd012572 for perforce@freebsd.org; Sat, 29 Jun 2002 17:19:48 -0700 (PDT) Date: Sat, 29 Jun 2002 17:19:48 -0700 (PDT) Message-Id: <200206300019.g5U0JmXd012572@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13621 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13621 Change 13621 by peter@peter_overcee on 2002/06/29 17:18:53 IFC @13620 - needed to use -i to get the $FreeBSD$'s in sync because p4 thought the two files were independently added and had no common merge point. Affected files ... .. //depot/projects/kse/sys/alpha/alpha/trap.c#31 integrate .. //depot/projects/kse/sys/alpha/include/kse.h#3 integrate .. //depot/projects/kse/sys/i386/i386/trap.c#58 integrate .. //depot/projects/kse/sys/i386/include/kse.h#6 integrate .. //depot/projects/kse/sys/ia64/ia64/trap.c#26 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#82 integrate .. //depot/projects/kse/sys/sparc64/include/kse.h#2 integrate .. //depot/projects/kse/sys/sparc64/sparc64/trap.c#34 integrate .. //depot/projects/kse/sys/sys/event.h#9 integrate .. //depot/projects/kse/sys/sys/queue.h#8 integrate .. //depot/projects/kse/sys/sys/ucred.h#14 integrate .. //depot/projects/kse/sys/vm/vm_object.c#14 integrate Differences ... ==== //depot/projects/kse/sys/alpha/alpha/trap.c#31 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.96 2002/06/29 17:26:11 julian Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.97 2002/06/29 23:58:50 julian Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -301,8 +301,8 @@ if (td->td_ucred != p->p_ucred) cred_update_thread(td); if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + PROC_LOCK(p); mtx_lock_spin(&sched_lock); - PROC_LOCK(p); thread_exit(); /* NOTREACHED */ } ==== //depot/projects/kse/sys/alpha/include/kse.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/alpha/include/kse.h,v 1.2 2002/06/29 17:26:11 julian Exp $ */ #ifndef MACHINE_KSE_H ==== //depot/projects/kse/sys/i386/i386/trap.c#58 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.228 2002/06/29 17:26:16 julian Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.229 2002/06/29 23:58:50 julian Exp $ */ /* @@ -273,8 +273,8 @@ * But check if we are the single thread first! */ if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + PROC_LOCK(p); /* check if thisis really needed */ mtx_lock_spin(&sched_lock); - PROC_LOCK(p); thread_exit(); /* NOTREACHED */ } ==== //depot/projects/kse/sys/i386/include/kse.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/i386/include/kse.h,v 1.2 2002/06/29 17:26:16 julian Exp $ */ #ifndef MACHINE_KSE_H ==== //depot/projects/kse/sys/ia64/ia64/trap.c#26 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.60 2002/06/29 18:26:18 julian Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.61 2002/06/29 23:58:50 julian Exp $ */ /* From: src/sys/alpha/alpha/trap.c,v 1.33 */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ @@ -337,7 +337,7 @@ cred_update_thread(td); if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { mtx_lock_spin(&sched_lock); - thread_exit(); + thread_exit(); /* XXXKSE need proc lock? */ /* NOTREACHED */ } } else { ==== //depot/projects/kse/sys/kern/kern_thread.c#82 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/kern/kern_thread.c,v 1.2 2002/06/29 17:26:18 julian Exp $ */ #include ==== //depot/projects/kse/sys/sparc64/include/kse.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/sparc64/include/kse.h,v 1.2 2002/06/29 17:26:21 julian Exp $ */ #ifndef _MACHINE_KSE_H_ ==== //depot/projects/kse/sys/sparc64/sparc64/trap.c#34 (text+ko) ==== @@ -37,7 +37,7 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * from: FreeBSD: src/sys/i386/i386/trap.c,v 1.197 2001/07/19 - * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.42 2002/06/29 17:26:21 julian Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.43 2002/06/29 23:58:50 julian Exp $ */ #include "opt_ddb.h" @@ -193,7 +193,7 @@ cred_update_thread(td); if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { mtx_lock_spin(&sched_lock); - thread_exit(); + thread_exit(); /* XXXKSE need proc lock? */ /* NOTREACHED */ } } else { ==== //depot/projects/kse/sys/sys/event.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/event.h,v 1.20 2002/06/29 00:29:12 alfred Exp $ + * $FreeBSD: src/sys/sys/event.h,v 1.21 2002/06/29 19:14:52 bde Exp $ */ #ifndef _SYS_EVENT_H_ @@ -114,7 +114,7 @@ /* * This is currently visible to userland to work around broken - * programs which pull in or . + * programs which pull in . */ #include struct knote; ==== //depot/projects/kse/sys/sys/queue.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD: src/sys/sys/queue.h,v 1.49 2002/06/29 17:26:22 julian Exp $ + * $FreeBSD: src/sys/sys/queue.h,v 1.50 2002/06/29 19:16:10 julian Exp $ */ #ifndef _SYS_QUEUE_H_ @@ -102,8 +102,9 @@ * _REMOVE + + + + * */ -#define QUEUE_MACRO_DEBUG 1 -#ifdef QUEUE_MACRO_DEBUG +#define QUEUE_MACRO_DEBUG 0 +#if QUEUE_MACRO_DEBUG +/* Store the last 2 places the queue element or head was altered */ struct qm_trace { char * lastfile; int lastline; ==== //depot/projects/kse/sys/sys/ucred.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ucred.h 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/ucred.h,v 1.38 2002/06/29 17:26:22 julian Exp $ + * $FreeBSD: src/sys/sys/ucred.h,v 1.39 2002/06/29 19:53:55 bde Exp $ */ #ifndef _SYS_UCRED_H_ @@ -44,15 +44,15 @@ * Only the suser() or suser_cred() function should be used for this. */ struct ucred { - u_int cr_ref; /* reference count */ + u_int cr_ref; /* reference count */ #define cr_startcopy cr_uid - uid_t cr_uid; /* effective user id */ - uid_t cr_ruid; /* real user id */ - uid_t cr_svuid; /* saved user id */ - short cr_ngroups; /* number of groups */ - gid_t cr_groups[NGROUPS]; /* groups */ - gid_t cr_rgid; /* real group id */ - gid_t cr_svgid; /* saved user id */ + uid_t cr_uid; /* effective user id */ + uid_t cr_ruid; /* real user id */ + uid_t cr_svuid; /* saved user id */ + short cr_ngroups; /* number of groups */ + gid_t cr_groups[NGROUPS]; /* groups */ + gid_t cr_rgid; /* real group id */ + gid_t cr_svgid; /* saved user id */ struct uidinfo *cr_uidinfo; /* per euid resource consumption */ struct uidinfo *cr_ruidinfo; /* per ruid resource consumption */ struct prison *cr_prison; /* jail(4) */ ==== //depot/projects/kse/sys/vm/vm_object.c#14 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_object.c,v 1.220 2002/06/26 20:32:48 iedowse Exp $ + * $FreeBSD: src/sys/vm/vm_object.c,v 1.221 2002/06/29 20:04:38 iedowse Exp $ */ /* @@ -676,7 +676,7 @@ * the size might be in the gigabytes or terrabytes. */ if (msync_flush_flags & MSYNC_FLUSH_HARDSEQ) { - vm_offset_t tscan; + vm_pindex_t tscan; int scanlimit; int scanreset; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 30 3:42:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A050F37B401; Sun, 30 Jun 2002 03:42:25 -0700 (PDT) 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 23AD937B400 for ; Sun, 30 Jun 2002 03:42:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABAF543E13 for ; Sun, 30 Jun 2002 03:42:23 -0700 (PDT) (envelope-from dfr@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5UAgNJU016234 for ; Sun, 30 Jun 2002 03:42:23 -0700 (PDT) (envelope-from dfr@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5UAgNLf016231 for perforce@freebsd.org; Sun, 30 Jun 2002 03:42:23 -0700 (PDT) Date: Sun, 30 Jun 2002 03:42:23 -0700 (PDT) Message-Id: <200206301042.g5UAgNLf016231@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to dfr@freebsd.org using -f From: Doug Rabson Subject: PERFORCE change 13644 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13644 Change 13644 by dfr@dfr_home on 2002/06/30 03:41:22 Add vga console. Affected files ... .. //depot/projects/ia64/sys/ia64/conf/SMALL#12 edit .. //depot/projects/ia64/sys/ia64/conf/SMALL.hints#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/SMALL#12 (text+ko) ==== @@ -34,6 +34,7 @@ options _KPOSIX_PRIORITY_SCHEDULING options CONSPEED=115200 options SMP +options BOOTP # Debugging for use in -current options DDB @@ -81,13 +82,13 @@ device atkbd device psm -#device vga +device vga # splash screen/screen saver device splash # syscons is the default console driver, resembling an SCO console -#device sc 1 +device sc 1 # Serial (COM) ports device sio ==== //depot/projects/ia64/sys/ia64/conf/SMALL.hints#2 (text+ko) ==== @@ -2,3 +2,5 @@ hint.sio.0.at="isa" hint.sio.0.port="0x3F8" hint.sio.0.flags="0x10" +hint.vga.0.at="isa" +hint.sc.0.at="isa" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 30 13:40:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E2C837B436; Sun, 30 Jun 2002 13:40:03 -0700 (PDT) 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 3654F37B4D8 for ; Sun, 30 Jun 2002 13:40:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D362943E13 for ; Sun, 30 Jun 2002 13:40:00 -0700 (PDT) (envelope-from des@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5UKe0JU030380 for ; Sun, 30 Jun 2002 13:40:00 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5UKe00Z030375 for perforce@freebsd.org; Sun, 30 Jun 2002 13:40:00 -0700 (PDT) Date: Sun, 30 Jun 2002 13:40:00 -0700 (PDT) Message-Id: <200206302040.g5UKe00Z030375@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 13655 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13655 Change 13655 by des@des.at.des.thinksec.com on 2002/06/30 13:39:52 Define struct pam_repository (from Solaris 9). Note that the PAM headers now require size_t to be defined. Sponsored by: DARPA, NAI Labs Affected files ... .. //depot/projects/openpam/include/security/pam_types.h#7 edit Differences ... ==== //depot/projects/openpam/include/security/pam_types.h#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/include/security/pam_types.h#6 $ + * $P4: //depot/projects/openpam/include/security/pam_types.h#7 $ */ #ifndef _PAM_TYPES_H_INCLUDED @@ -69,6 +69,15 @@ struct pam_handle; typedef struct pam_handle pam_handle_t; +/* + * Solaris 9 + */ +typedef struct pam_repository { + char *type; + void *scope; + size_t scope_len; +} pam_repository_t; + #ifdef __cplusplus } #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 30 13:42:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7135037B405; Sun, 30 Jun 2002 13:42:18 -0700 (PDT) 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 1572637B401 for ; Sun, 30 Jun 2002 13:42:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B487343E09 for ; Sun, 30 Jun 2002 13:42:17 -0700 (PDT) (envelope-from des@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5UKgHJU030956 for ; Sun, 30 Jun 2002 13:42:17 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5UKgHEL030953 for perforce@freebsd.org; Sun, 30 Jun 2002 13:42:17 -0700 (PDT) Date: Sun, 30 Jun 2002 13:42:17 -0700 (PDT) Message-Id: <200206302042.g5UKgHEL030953@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 13656 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13656 Change 13656 by des@des.at.des.thinksec.com on 2002/06/30 13:41:17 Include to define size_t. Affected files ... .. //depot/projects/openpam/lib/pam_prompt.c#8 edit Differences ... ==== //depot/projects/openpam/lib/pam_prompt.c#8 (text+ko) ==== @@ -31,9 +31,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_prompt.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_prompt.c#8 $ */ +#include + #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 30 13:42:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0380F37B408; Sun, 30 Jun 2002 13:42:20 -0700 (PDT) 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 65F0C37B400 for ; Sun, 30 Jun 2002 13:42:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03D8043E13 for ; Sun, 30 Jun 2002 13:42:18 -0700 (PDT) (envelope-from des@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5UKgHJU030963 for ; Sun, 30 Jun 2002 13:42:17 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5UKgHaO030960 for perforce@freebsd.org; Sun, 30 Jun 2002 13:42:17 -0700 (PDT) Date: Sun, 30 Jun 2002 13:42:17 -0700 (PDT) Message-Id: <200206302042.g5UKgHaO030960@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 13657 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13657 Change 13657 by des@des.at.des.thinksec.com on 2002/06/30 13:41:59 Implement the "binding" control flag (from Solaris 9) Sponsored by: DARPA, NAI Labs Affected files ... .. //depot/projects/openpam/include/security/pam_constants.h#16 edit .. //depot/projects/openpam/lib/openpam_configure.c#5 edit .. //depot/projects/openpam/lib/openpam_dispatch.c#17 edit .. //depot/projects/openpam/lib/openpam_impl.h#16 edit Differences ... ==== //depot/projects/openpam/include/security/pam_constants.h#16 (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/pam_constants.h#15 $ + * $P4: //depot/projects/openpam/include/security/pam_constants.h#16 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED ==== //depot/projects/openpam/lib/openpam_configure.c#5 (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_configure.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_configure.c#5 $ */ #include @@ -150,6 +150,8 @@ flag = PAM_SUFFICIENT; } else if (strcmp(p, "optional") == 0) { flag = PAM_OPTIONAL; + } else if (strcmp(p, "binding") == 0) { + flag = PAM_BINDING; } else { openpam_log(PAM_LOG_ERROR, "%s: invalid control flag on line %d: '%s'", ==== //depot/projects/openpam/lib/openpam_dispatch.c#17 (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_dispatch.c#16 $ + * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#17 $ */ #include @@ -109,13 +109,14 @@ if (r == PAM_IGNORE) continue; - if (r == PAM_SUCCESS || r == PAM_NEW_AUTHTOK_REQD) { + if (r == PAM_SUCCESS) { /* * For pam_setcred() and pam_chauthtok() with the * PAM_PRELIM_CHECK flag, treat "sufficient" as * "optional". */ - if (chain->flag == PAM_SUFFICIENT && !fail && + if ((chain->flag == PAM_SUFFICIENT || + chain->flag == PAM_BINDING) && !fail && primitive != PAM_SM_SETCRED && !(primitive == PAM_SM_CHAUTHTOK && (flags & PAM_PRELIM_CHECK))) @@ -132,7 +133,8 @@ */ if (err == 0) err = r; - if (chain->flag == PAM_REQUIRED && !fail) { + if ((chain->flag == PAM_REQUIRED || + chain->flag == PAM_BINDING) && !fail) { openpam_log(PAM_LOG_DEBUG, "required module failed"); fail = 1; err = r; ==== //depot/projects/openpam/lib/openpam_impl.h#16 (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_impl.h#15 $ + * $P4: //depot/projects/openpam/lib/openpam_impl.h#16 $ */ #ifndef _OPENPAM_IMPL_H_INCLUDED @@ -48,7 +48,8 @@ #define PAM_REQUISITE 2 #define PAM_SUFFICIENT 3 #define PAM_OPTIONAL 4 -#define PAM_NUM_CONTROLFLAGS 5 +#define PAM_BINDING 5 +#define PAM_NUM_CONTROLFLAGS 6 /* * Chains To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 30 13:52:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1627537B401; Sun, 30 Jun 2002 13:52:32 -0700 (PDT) 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 B000B37B400 for ; Sun, 30 Jun 2002 13:52:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FDCB43E09 for ; Sun, 30 Jun 2002 13:52:31 -0700 (PDT) (envelope-from des@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5UKqVJU031979 for ; Sun, 30 Jun 2002 13:52:31 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5UKqViG031976 for perforce@freebsd.org; Sun, 30 Jun 2002 13:52:31 -0700 (PDT) Date: Sun, 30 Jun 2002 13:52:31 -0700 (PDT) Message-Id: <200206302052.g5UKqViG031976@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 13659 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13659 Change 13659 by des@des.at.des.thinksec.com on 2002/06/30 13:51:46 List Darren J. Moffat and Gary Winiger, both of Sun Microsystems. Reformat a little. Affected files ... .. //depot/projects/openpam/CREDITS#3 edit Differences ... ==== //depot/projects/openpam/CREDITS#3 (text+ko) ==== @@ -2,18 +2,19 @@ The OpenPAM library was developed for the FreeBSD Project by ThinkSec AS and Network Associates Laboratories, the Security Research Division of Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 -(``CBOSS''), as part of the DARPA CHATS research program. +("CBOSS"), as part of the DARPA CHATS research program. Principal design and development by: Dag-Erling Smørgrav -The following persons (in no particular order) have contributed, -directly or indirectly, with patches, criticism, suggestions, or -ideas: +The following persons (in no particular order) have contributed, directly +or indirectly, with patches, criticism, suggestions, or ideas: Andrew Morgan Brian Fundakowski Feldman + Darren J. Moffat + Gary Winiger Joe Marcus Clarke Mark Murray Robert Watson @@ -21,4 +22,4 @@ Solar Designer Takanori Saneto -$P4: //depot/projects/openpam/CREDITS#2 $ +$P4: //depot/projects/openpam/CREDITS#3 $ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 30 14:12: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EC1C37B401; Sun, 30 Jun 2002 14:11:56 -0700 (PDT) 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 DCAC237B400 for ; Sun, 30 Jun 2002 14:11:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9EF3343E09 for ; Sun, 30 Jun 2002 14:11:55 -0700 (PDT) (envelope-from des@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5ULBtJU037935 for ; Sun, 30 Jun 2002 14:11:55 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5ULBtdc037932 for perforce@freebsd.org; Sun, 30 Jun 2002 14:11:55 -0700 (PDT) Date: Sun, 30 Jun 2002 14:11:55 -0700 (PDT) Message-Id: <200206302111.g5ULBtdc037932@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 13661 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13661 Change 13661 by des@des.at.des.thinksec.com on 2002/06/30 14:10:59 s/pam_info/pam_error/ in documentation. Affected files ... .. //depot/projects/openpam/lib/pam_error.c#8 edit Differences ... ==== //depot/projects/openpam/lib/pam_error.c#8 (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_error.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_error.c#8 $ */ #include @@ -73,7 +73,7 @@ */ /** - * The =pam_info function displays an error message through the + * The =pam_error function displays an error message through the * intermediary of the given PAM context's conversation function. * * >pam_info To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 30 14:12:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5805437B400; Sun, 30 Jun 2002 14:11:58 -0700 (PDT) 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 B344037B415 for ; Sun, 30 Jun 2002 14:11:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0096F43E09 for ; Sun, 30 Jun 2002 14:11:56 -0700 (PDT) (envelope-from des@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5ULBtJU037942 for ; Sun, 30 Jun 2002 14:11:55 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5ULBtWW037939 for perforce@freebsd.org; Sun, 30 Jun 2002 14:11:55 -0700 (PDT) Date: Sun, 30 Jun 2002 14:11:55 -0700 (PDT) Message-Id: <200206302111.g5ULBtWW037939@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 13662 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13662 Change 13662 by des@des.at.des.thinksec.com on 2002/06/30 14:11:38 Add the PAM_REPOSITORY item (from Solaris 9). Sponsored by: DARPA, NAI Labs Affected files ... .. //depot/projects/openpam/include/security/pam_constants.h#17 edit .. //depot/projects/openpam/lib/pam_get_item.c#13 edit .. //depot/projects/openpam/lib/pam_set_item.c#15 edit Differences ... ==== //depot/projects/openpam/include/security/pam_constants.h#17 (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/pam_constants.h#16 $ + * $P4: //depot/projects/openpam/include/security/pam_constants.h#17 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED @@ -122,6 +122,7 @@ PAM_USER_PROMPT = 9, PAM_AUTHTOK_PROMPT = 10, /* OpenPAM extension */ PAM_OLDAUTHTOK_PROMPT = 11, /* OpenPAM extension */ + PAM_REPOSITORY = 12, PAM_NUM_ITEMS /* OpenPAM extension */ }; ==== //depot/projects/openpam/lib/pam_get_item.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/pam_get_item.c#12 $ + * $P4: //depot/projects/openpam/lib/pam_get_item.c#13 $ */ #include @@ -67,6 +67,7 @@ case PAM_USER_PROMPT: case PAM_AUTHTOK_PROMPT: case PAM_OLDAUTHTOK_PROMPT: + case PAM_REPOSITORY: *item = pamh->item[item_type]; return (PAM_SUCCESS); default: ==== //depot/projects/openpam/lib/pam_set_item.c#15 (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_set_item.c#14 $ + * $P4: //depot/projects/openpam/lib/pam_set_item.c#15 $ */ #include @@ -56,13 +56,12 @@ const void *item) { void **slot, *tmp; - size_t size; + size_t nsize, osize; if (pamh == NULL) return (PAM_SYSTEM_ERR); slot = &pamh->item[item_type]; - tmp = NULL; switch (item_type) { case PAM_SERVICE: case PAM_USER: @@ -74,27 +73,31 @@ case PAM_USER_PROMPT: case PAM_AUTHTOK_PROMPT: case PAM_OLDAUTHTOK_PROMPT: + if (item != NULL) + nsize = strlen(item) + 1; if (*slot != NULL) - size = strlen(*slot) + 1; - if (item != NULL) - if ((tmp = strdup(item)) == NULL) - return (PAM_BUF_ERR); + osize = strlen(*slot) + 1; + break; + case PAM_REPOSITORY: + osize = nsize = sizeof(struct pam_repository); break; case PAM_CONV: - size = sizeof(struct pam_conv); - if (item != NULL) { - if ((tmp = malloc(size)) == NULL) - return (PAM_BUF_ERR); - memcpy(tmp, item, sizeof(struct pam_conv)); - } + osize = nsize = sizeof(struct pam_conv); break; default: return (PAM_SYMBOL_ERR); } if (*slot != NULL) { - memset(*slot, 0xd0, size); + memset(*slot, 0xd0, osize); free(*slot); } + if (item != NULL) { + if ((tmp = malloc(nsize)) == NULL) + return (PAM_BUF_ERR); + memcpy(tmp, item, nsize); + } else { + tmp = NULL; + } *slot = tmp; return (PAM_SUCCESS); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 30 14:21:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02FAC37B400; Sun, 30 Jun 2002 14:21:08 -0700 (PDT) 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 485AE37B401 for ; Sun, 30 Jun 2002 14:21:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD90043E0A for ; Sun, 30 Jun 2002 14:21:07 -0700 (PDT) (envelope-from des@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5ULL7JU038732 for ; Sun, 30 Jun 2002 14:21:07 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5ULL7Va038729 for perforce@freebsd.org; Sun, 30 Jun 2002 14:21:07 -0700 (PDT) Date: Sun, 30 Jun 2002 14:21:07 -0700 (PDT) Message-Id: <200206302121.g5ULL7Va038729@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 13663 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13663 Change 13663 by des@des.at.des.thinksec.com on 2002/06/30 14:20:26 OpenPAM Citronella. Affected files ... .. //depot/projects/openpam/HISTORY#13 edit .. //depot/projects/openpam/RELNOTES#12 edit .. //depot/projects/openpam/include/security/openpam_version.h#6 edit Differences ... ==== //depot/projects/openpam/HISTORY#13 (text+ko) ==== @@ -1,4 +1,26 @@ ============================================================================ +OpenPAM Citronella 2002-06-30 + + - ENHANCE: Add the "binding" control flag (from Solaris 9). + + - ENHANCE: Define struct pam_repository and PAM_REPOSITORY (from + Solaris 9). + + - ENHANCE: Flesh out the pam(3) man page. + + - ENHANCE: Add an openpam(3) page with cross-references to all the + documented OpenPAM API extensions. + + - ENHANCE: Add a pam_conv(3) man page describing the conversation + system. + + - ENHANCE: Improved sample application. + + - ENHANCE: Added sample pam_unix module. + + - BUGFIX: Various documentation nits. + +============================================================================ OpenPAM Cinquefoil 2002-05-24 - BUGFIX: Various warnings uncovered by gcc 3.1. @@ -162,4 +184,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#12 $ +$P4: //depot/projects/openpam/HISTORY#13 $ ==== //depot/projects/openpam/RELNOTES#12 (text+ko) ==== @@ -1,13 +1,13 @@ - Release notes for OpenPAM Cinquefoil + Release notes for OpenPAM Citronella ==================================== The library itself is complete. Documentation exists in the form of man pages for the library functions. -This release is incorporated into FreeBSD-CURRENT as of 2002-05-24. +This release is incorporated into FreeBSD-CURRENT as of 2002-06-30. It has also been successfully built on NetBSD, and should build with minimal or no changes on OpenBSD. It has not been tested on any other OS. -$P4: //depot/projects/openpam/RELNOTES#11 $ +$P4: //depot/projects/openpam/RELNOTES#12 $ ==== //depot/projects/openpam/include/security/openpam_version.h#6 (text+ko) ==== @@ -31,14 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/include/security/openpam_version.h#5 $ + * $P4: //depot/projects/openpam/include/security/openpam_version.h#6 $ */ #ifndef _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM_VERSION_H_INCLUDED #define _OPENPAM -#define _OPENPAM_VERSION 20020524 -#define _OPENPAM_RELEASE "Cinquefoil" +#define _OPENPAM_VERSION 20020630 +#define _OPENPAM_RELEASE "Citronella" #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 30 14:21:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FE0337B401; Sun, 30 Jun 2002 14:21:10 -0700 (PDT) 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 4B79C37B412 for ; Sun, 30 Jun 2002 14:21:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEC0843E0A for ; Sun, 30 Jun 2002 14:21:08 -0700 (PDT) (envelope-from des@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5ULL8JU038740 for ; Sun, 30 Jun 2002 14:21:08 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5ULL79S038736 for perforce@freebsd.org; Sun, 30 Jun 2002 14:21:07 -0700 (PDT) Date: Sun, 30 Jun 2002 14:21:07 -0700 (PDT) Message-Id: <200206302121.g5ULL79S038736@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 13664 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13664 Change 13664 by des@des.at.des.thinksec.com on 2002/06/30 14:20:58 Release checklist. Affected files ... .. //depot/projects/openpam/CHECKLIST#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 30 14:35:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18E9C37B401; Sun, 30 Jun 2002 14:35:28 -0700 (PDT) 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 B104937B400 for ; Sun, 30 Jun 2002 14:35:27 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E59D43E09 for ; Sun, 30 Jun 2002 14:35:27 -0700 (PDT) (envelope-from des@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5ULZRJU040030 for ; Sun, 30 Jun 2002 14:35:27 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5ULZRg0040027 for perforce@freebsd.org; Sun, 30 Jun 2002 14:35:27 -0700 (PDT) Date: Sun, 30 Jun 2002 14:35:27 -0700 (PDT) Message-Id: <200206302135.g5ULZRg0040027@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 13665 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13665 Change 13665 by des@des.at.des.thinksec.com on 2002/06/30 14:34:53 Don't forget the sample pam_unix module. Affected files ... .. //depot/projects/openpam/MANIFEST#12 edit Differences ... ==== //depot/projects/openpam/MANIFEST#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/openpam/MANIFEST#11 $ +# $P4: //depot/projects/openpam/MANIFEST#12 $ # CREDITS HISTORY @@ -129,3 +129,5 @@ modules/pam_dummy/pam_dummy.c modules/pam_permit/Makefile modules/pam_permit/pam_permit.c +modules/pam_unix/Makefile +modules/pam_unix/pam_unix.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 30 14:36:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8A4A37B401; Sun, 30 Jun 2002 14:36:29 -0700 (PDT) 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 6789937B400 for ; Sun, 30 Jun 2002 14:36:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2910A43E09 for ; Sun, 30 Jun 2002 14:36:29 -0700 (PDT) (envelope-from des@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5ULaTJU040106 for ; Sun, 30 Jun 2002 14:36:29 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5ULaSEY040103 for perforce@freebsd.org; Sun, 30 Jun 2002 14:36:28 -0700 (PDT) Date: Sun, 30 Jun 2002 14:36:28 -0700 (PDT) Message-Id: <200206302136.g5ULaSEY040103@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 13666 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13666 Change 13666 by des@des.at.des.thinksec.com on 2002/06/30 14:35:29 Bite the bullet and move PAM_{,OLD}AUTHTOK_PROMPT to make room for PAM_REPOSITORY, which is defined to 10 in Solaris 9. Affected files ... .. //depot/projects/openpam/include/security/pam_constants.h#18 edit Differences ... ==== //depot/projects/openpam/include/security/pam_constants.h#18 (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/pam_constants.h#17 $ + * $P4: //depot/projects/openpam/include/security/pam_constants.h#18 $ */ #ifndef _PAM_CONSTANTS_H_INCLUDED @@ -120,9 +120,9 @@ PAM_OLDAUTHTOK = 7, PAM_RUSER = 8, PAM_USER_PROMPT = 9, - PAM_AUTHTOK_PROMPT = 10, /* OpenPAM extension */ - PAM_OLDAUTHTOK_PROMPT = 11, /* OpenPAM extension */ - PAM_REPOSITORY = 12, + PAM_REPOSITORY = 10, + PAM_AUTHTOK_PROMPT = 11, /* OpenPAM extension */ + PAM_OLDAUTHTOK_PROMPT = 12, /* OpenPAM extension */ PAM_NUM_ITEMS /* OpenPAM extension */ }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 30 15: 0: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1B1E37B407; Sun, 30 Jun 2002 14:59:59 -0700 (PDT) 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 22EA337B400 for ; Sun, 30 Jun 2002 14:59:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97CA843E13 for ; Sun, 30 Jun 2002 14:59:58 -0700 (PDT) (envelope-from des@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5ULxwJU043275 for ; Sun, 30 Jun 2002 14:59:58 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5ULxwob043270 for perforce@freebsd.org; Sun, 30 Jun 2002 14:59:58 -0700 (PDT) Date: Sun, 30 Jun 2002 14:59:58 -0700 (PDT) Message-Id: <200206302159.g5ULxwob043270@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 13668 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13668 Change 13668 by des@des.at.des.thinksec.com on 2002/06/30 14:59:44 Formatting nit. Affected files ... .. //depot/projects/openpam/HISTORY#14 edit Differences ... ==== //depot/projects/openpam/HISTORY#14 (text+ko) ==== @@ -19,7 +19,6 @@ - ENHANCE: Added sample pam_unix module. - BUGFIX: Various documentation nits. - ============================================================================ OpenPAM Cinquefoil 2002-05-24 @@ -184,4 +183,4 @@ First (beta) release. ============================================================================ -$P4: //depot/projects/openpam/HISTORY#13 $ +$P4: //depot/projects/openpam/HISTORY#14 $ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jun 30 15: 8:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2158537B401; Sun, 30 Jun 2002 15:08:10 -0700 (PDT) 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 B739A37B400 for ; Sun, 30 Jun 2002 15:08:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 799B843E0A for ; Sun, 30 Jun 2002 15:08:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5UM89JU048387 for ; Sun, 30 Jun 2002 15:08:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5UM89PO048384 for perforce@freebsd.org; Sun, 30 Jun 2002 15:08:09 -0700 (PDT) Date: Sun, 30 Jun 2002 15:08:09 -0700 (PDT) Message-Id: <200206302208.g5UM89PO048384@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13670 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13670 Change 13670 by peter@peter_daintree on 2002/06/30 15:07:41 IFC @13574 (right before kse3) Affected files ... .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#15 integrate Differences ... ==== //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#15 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.62 2002/06/25 15:13:07 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.63 2002/06/29 06:37:24 jake Exp $ */ /* @@ -1200,7 +1200,8 @@ KASSERT(pmap_resident_count(pm) == 0, ("pmap_release: resident pages %ld != 0", pmap_resident_count(pm))); - TAILQ_FOREACH(m, &obj->memq, listq) { + while (!TAILQ_EMPTY(&obj->memq)) { + m = TAILQ_FIRST(&obj->memq); if (vm_page_sleep_busy(m, FALSE, "pmaprl")) continue; vm_page_busy(m); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 1 8:23:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00D2437B401; Mon, 1 Jul 2002 08:23:49 -0700 (PDT) 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 83CC137B400 for ; Mon, 1 Jul 2002 08:23:49 -0700 (PDT) Received: from mail.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by mx1.FreeBSD.org (Postfix) with ESMTP id D83A843E13 for ; Mon, 1 Jul 2002 08:23:48 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 22585 invoked from network); 1 Jul 2002 15:23:48 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 1 Jul 2002 15:23:48 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g61FOLM16999; Mon, 1 Jul 2002 11:24:21 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200206302121.g5ULL7Va038729@freefall.freebsd.org> Date: Mon, 01 Jul 2002 11:23:50 -0400 (EDT) From: John Baldwin To: Dag-Erling Smorgrav Subject: RE: PERFORCE change 13663 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 30-Jun-2002 Dag-Erling Smorgrav wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13663 > > Change 13663 by des@des.at.des.thinksec.com on 2002/06/30 14:20:26 > > OpenPAM Citronella. So if I run this on my laptop out on a screen porch, will it keep the mosquitos away? -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 1 8:25:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69F4C37B401; Mon, 1 Jul 2002 08:25:25 -0700 (PDT) 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 1EDFB37B400; Mon, 1 Jul 2002 08:25:25 -0700 (PDT) Received: from flood.ping.uio.no (flood.ping.uio.no [129.240.78.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FD1443E0A; Mon, 1 Jul 2002 08:25:24 -0700 (PDT) (envelope-from des@ofug.org) Received: by flood.ping.uio.no (Postfix, from userid 2602) id 00FBA5349; Mon, 1 Jul 2002 17:25:22 +0200 (CEST) X-URL: http://www.ofug.org/~des/ X-Disclaimer: The views expressed in this message do not necessarily coincide with those of any organisation or company with which I am or have been affiliated. To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 13663 for review References: From: Dag-Erling Smorgrav Date: 01 Jul 2002 17:25:22 +0200 In-Reply-To: Message-ID: Lines: 9 User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/21.2 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin writes: > So if I run this on my laptop out on a screen porch, will it keep > the mosquitos away? I dunno, try it and let me know :) DES -- Dag-Erling Smorgrav - des@ofug.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 2 14:12: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19B1E37C092; Tue, 2 Jul 2002 14:10:45 -0700 (PDT) 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 DF41337BF25 for ; Tue, 2 Jul 2002 14:10:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D400444CA6 for ; Tue, 2 Jul 2002 13:25:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g62KPoJU094551 for ; Tue, 2 Jul 2002 13:25:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g62KPojb094548 for perforce@freebsd.org; Tue, 2 Jul 2002 13:25:50 -0700 (PDT) Date: Tue, 2 Jul 2002 13:25:50 -0700 (PDT) Message-Id: <200207022025.g62KPojb094548@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13737 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13737 Change 13737 by rwatson@rwatson_tislabs on 2002/07/02 13:25:10 Need a policy directory under /etc/security/sebsd. Fix whitespace while here -- we use four space indents here for reasons unknown to me. Affected files ... .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.root.dist#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.root.dist#5 (text+ko) ==== @@ -56,10 +56,12 @@ .. rc.d .. - security - sebsd - .. - .. + security + sebsd + policy + .. + .. + .. skel .. ssh To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 2 14:14:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20B6337C4A4; Tue, 2 Jul 2002 14:12:24 -0700 (PDT) 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 D8C2337B810 for ; Tue, 2 Jul 2002 14:10:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D3E944CD0 for ; Tue, 2 Jul 2002 13:28:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g62KStJU094796 for ; Tue, 2 Jul 2002 13:28:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g62KSsgg094791 for perforce@freebsd.org; Tue, 2 Jul 2002 13:28:54 -0700 (PDT) Date: Tue, 2 Jul 2002 13:28:54 -0700 (PDT) Message-Id: <200207022028.g62KSsgg094791@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13738 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13738 Change 13738 by rwatson@rwatson_tislabs on 2002/07/02 13:28:15 We don't appear to have README, so remove it from files.lst until we add one. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/files.lst#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/files.lst#2 (text+ko) ==== @@ -273,10 +273,9 @@ constraints attrib.te assert.te -README users.distrib Makefile users test_attrib.te test.mk -rbac+rbac To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 2 14:18:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7924937BA52; Tue, 2 Jul 2002 14:14:56 -0700 (PDT) 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 96C9F37C445 for ; Tue, 2 Jul 2002 14:12:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24C0144CDE for ; Tue, 2 Jul 2002 13:30:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g62KUwJU095426 for ; Tue, 2 Jul 2002 13:30:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g62KUvTK095423 for perforce@freebsd.org; Tue, 2 Jul 2002 13:30:57 -0700 (PDT) Date: Tue, 2 Jul 2002 13:30:57 -0700 (PDT) Message-Id: <200207022030.g62KUvTK095423@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13739 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13739 Change 13739 by rwatson@rwatson_tislabs on 2002/07/02 13:30:24 Use ${CHECKPOLICY} instead of relying implicitly on the path including /sbin. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/Makefile#2 (text+ko) ==== @@ -30,7 +30,7 @@ ALLDOMAINS != ls domains/*.te domains/misc/*.te domains/program/*.te policy.11: policy.conf - sebsd_checkpolicy -o policy.11 policy.conf + ${CHECKPOLICY} -o policy.11 policy.conf policy.conf: tmp $(FLASKFILES) $(POLICYFILES) $(MACROFILES) $(M4) $(FLASKFILES) $(POLICYFILES) > policy.conf To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 2 14:21:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F24F37C959; Tue, 2 Jul 2002 14:18:33 -0700 (PDT) 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 9955437C4F1 for ; Tue, 2 Jul 2002 14:12:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8623E4489E for ; Tue, 2 Jul 2002 12:04:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g62J4xJU077480 for ; Tue, 2 Jul 2002 12:04:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g62J4wAi077477 for perforce@freebsd.org; Tue, 2 Jul 2002 12:04:58 -0700 (PDT) Date: Tue, 2 Jul 2002 12:04:58 -0700 (PDT) Message-Id: <200207021904.g62J4wAi077477@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13735 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13735 Change 13735 by rwatson@rwatson_tislabs on 2002/07/02 12:04:58 Move #include of malloc.h so that MALLOC_DECLARE is defined by the time acl.h is first included. We need to move some ACL types to types.h to fix all this stuff, but that's a fix for the main tree I'll make seperately. This appears to get the kernel compiling more. Affected files ... .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#37 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#37 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -54,7 +55,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 3 14:42:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8AC937B401; Wed, 3 Jul 2002 14:42:25 -0700 (PDT) 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 2B17037B400 for ; Wed, 3 Jul 2002 14:42:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2E2343E09 for ; Wed, 3 Jul 2002 14:42:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g63LgOJU069800 for ; Wed, 3 Jul 2002 14:42:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g63LgOef069795 for perforce@freebsd.org; Wed, 3 Jul 2002 14:42:24 -0700 (PDT) Date: Wed, 3 Jul 2002 14:42:24 -0700 (PDT) Message-Id: <200207032142.g63LgOef069795@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13772 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13772 Change 13772 by rwatson@rwatson_tislabs on 2002/07/03 14:41:28 Add MAC entry point for mac_cred_check_access_vnode(), which services the access() and eaccess() system calls. Required to make applications with pretty user interfaces involving file icons more useful. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#156 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#47 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#108 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#67 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#156 (text+ko) ==== @@ -81,9 +81,11 @@ SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, "TrustedBSD MAC policy controls"); +SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, + "TrustedBSD MAC debug info"); int mac_debug_label_fallback = 0; -SYSCTL_INT(_security_mac, OID_AUTO, debug_label_fallback, CTLFLAG_RW, +SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, &mac_debug_label_fallback, 0, "Filesystems should fall back to fs label" "when label is corrupted."); TUNABLE_INT("security.mac.debug_label_fallback", @@ -274,6 +276,7 @@ error = 0; break; default: + break; } return (error); @@ -487,6 +490,10 @@ mpc->mpc_ops.mpo_cred_check_debug_proc = mpe->mpe_function; break; + case MAC_CRED_CHECK_ACCESS_VNODE: + mpc->mpc_ops.mpo_cred_check_access_vnode = + mpe->mpe_function; + break; case MAC_CRED_CHECK_CHDIR_VNODE: mpc->mpc_ops.mpo_cred_check_chdir_vnode = mpe->mpe_function; @@ -1095,8 +1102,6 @@ /* label->l_flags &= ~MAC_FLAG_INITIALIZED; */ } -SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, - "TrustedBSD MAC debug info"); static unsigned int nmacmbufs, nmacsubjects, nmacifnets, nmacbpfdescs, nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, nmacipqs; @@ -1425,6 +1430,24 @@ } int +mac_cred_check_access_vnode(struct ucred *cred, struct vnode *vp, int flags) +{ + int error; + + ASSERT_VOP_LOCKED(vp, "mac_cred_check_access_vnode"); + + if (!mac_enforce_fs) + return (0); + + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + + MAC_CHECK(cred_check_access_vnode, cred, vp, &vp->v_label, flags); + return (error); +} + +int mac_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp) { int error; ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#47 (text+ko) ==== @@ -2386,6 +2386,11 @@ flags |= VWRITE; if (user_flags & X_OK) flags |= VEXEC; +#ifdef MAC + error = mac_cred_check_access_vnode(cred, vp, flags); + if (error) + return (error); +#endif if ((flags & VWRITE) == 0 || (error = vn_writechk(vp)) == 0) error = VOP_ACCESS(vp, flags, cred, td); } ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#108 (text+ko) ==== @@ -242,6 +242,8 @@ /* Authorizational event hooks. */ int mac_bpfdesc_check_receive_from_ifnet(struct bpf_d *bpf_d, struct ifnet *ifnet); +int mac_cred_check_access_vnode(struct ucred *cred, struct vnode *vp, + int flags); int mac_cred_check_bind_socket(struct ucred *cred, struct socket *so, struct sockaddr *sa); int mac_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#67 (text+ko) ==== @@ -246,6 +246,8 @@ struct label *mntlabel); int (*mpo_cred_check_debug_proc)(struct ucred *cred, struct proc *proc); + int (*mpo_cred_check_access_vnode)(struct ucred *cred, + struct vnode *vp, struct label *label, int flags); int (*mpo_cred_check_chdir_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel); int (*mpo_cred_check_create_vnode)(struct ucred *cred, @@ -384,6 +386,7 @@ MAC_CRED_CHECK_RELABEL_VNODE, MAC_CRED_CHECK_STATFS, MAC_CRED_CHECK_DEBUG_PROC, + MAC_CRED_CHECK_ACCESS_VNODE, MAC_CRED_CHECK_CHDIR_VNODE, MAC_CRED_CHECK_CONNECT_SOCKET, MAC_CRED_CHECK_CREATE_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 3 18: 5:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1846537B405; Wed, 3 Jul 2002 18:05:34 -0700 (PDT) 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 7EDD937B405 for ; Wed, 3 Jul 2002 18:05:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 432C943E09 for ; Wed, 3 Jul 2002 18:05:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6415XJU006594 for ; Wed, 3 Jul 2002 18:05:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6415WgJ006586 for perforce@freebsd.org; Wed, 3 Jul 2002 18:05:32 -0700 (PDT) Date: Wed, 3 Jul 2002 18:05:32 -0700 (PDT) Message-Id: <200207040105.g6415WgJ006586@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13779 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13779 Change 13779 by peter@peter_ia64 on 2002/07/03 18:04:56 Note: accessing physical addresses instead of mapped addresses is bad. This should not have worked on the Itanium SDV either, but probably did due to a stray TC entry or something. This is necessary to work on the Itanium2 box I have. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/efi.c#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/efi.c#3 (text+ko) ==== @@ -133,7 +133,8 @@ static EFI_GUID acpi = ACPI_TABLE_GUID; static EFI_GUID acpi20 = ACPI_20_TABLE_GUID; if (!memcmp(&conf[i].VendorGuid, &sal, sizeof(EFI_GUID))) - saltab = conf[i].VendorTable; + saltab = (struct sal_system_table *) + IA64_PHYS_TO_RR7((u_int64_t) conf[i].VendorTable); if (!memcmp(&conf[i].VendorGuid, &acpi, sizeof(EFI_GUID))) ia64_efi_acpi_table = (u_int64_t) conf[i].VendorTable; if (!memcmp(&conf[i].VendorGuid, &acpi20, sizeof(EFI_GUID))) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 3 18: 8:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13B7637B401; Wed, 3 Jul 2002 18:08:38 -0700 (PDT) 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 AFF2D37B400 for ; Wed, 3 Jul 2002 18:08:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7450243E31 for ; Wed, 3 Jul 2002 18:08:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6418bJU008645 for ; Wed, 3 Jul 2002 18:08:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6418b3l008642 for perforce@freebsd.org; Wed, 3 Jul 2002 18:08:37 -0700 (PDT) Date: Wed, 3 Jul 2002 18:08:37 -0700 (PDT) Message-Id: <200207040108.g6418b3l008642@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13780 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13780 Change 13780 by peter@peter_ia64 on 2002/07/03 18:07:57 Make this work on the Itanium2 box I have here. It tries to preallocate over 1 million entries here due to the (very) discontiguous memory map. Note that we have some nasty problems elsewhere to deal with that assume that memory is approximately contiguous (ie: pages = (maxaddr - minaddr) / PAGE_SIZE; type bugs) Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#26 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#26 (text+ko) ==== @@ -133,7 +133,8 @@ #define PMAP_DIAGNOSTIC #endif -#define MINPV 2048 +#define MINPV 2048 /* Preallocate at least this many */ +#define MAXPV 20480 /* But no more than this */ #if 0 #define PMAP_DIAGNOSTIC @@ -521,6 +522,8 @@ initial_pvs = vm_page_array_size; if (initial_pvs < MINPV) initial_pvs = MINPV; + if (initial_pvs > MAXPV) + initial_pvs = MAXPV; pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); uma_zone_set_allocf(pvzone, pmap_allocf); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 3 21:22:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4983837B401; Wed, 3 Jul 2002 21:22:33 -0700 (PDT) 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 E700C37B400 for ; Wed, 3 Jul 2002 21:22:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 926CC43E09 for ; Wed, 3 Jul 2002 21:22:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g644MWJU050425 for ; Wed, 3 Jul 2002 21:22:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g644MWQK050422 for perforce@freebsd.org; Wed, 3 Jul 2002 21:22:32 -0700 (PDT) Date: Wed, 3 Jul 2002 21:22:32 -0700 (PDT) Message-Id: <200207040422.g644MWQK050422@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13782 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13782 Change 13782 by rwatson@rwatson_curry on 2002/07/03 21:21:36 Remove debugging output that crept in from some tree or another (maybe mine?). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#157 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#157 (text+ko) ==== @@ -1550,8 +1550,6 @@ return (error); MAC_CHECK(cred_check_open_vnode, cred, vp, &vp->v_label, acc_mode); - if (error) - printf("mac_cred_check_open_vnode returns %d\n", error); return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 3 21:26:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A25D637B401; Wed, 3 Jul 2002 21:26:38 -0700 (PDT) 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 47E4A37B400 for ; Wed, 3 Jul 2002 21:26:38 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07EFF43E09 for ; Wed, 3 Jul 2002 21:26:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g644QbJU050710 for ; Wed, 3 Jul 2002 21:26:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g644QbRE050707 for perforce@freebsd.org; Wed, 3 Jul 2002 21:26:37 -0700 (PDT) Date: Wed, 3 Jul 2002 21:26:37 -0700 (PDT) Message-Id: <200207040426.g644QbRE050707@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13783 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13783 Change 13783 by rwatson@rwatson_tislabs on 2002/07/03 21:26:09 Teach mac_bsdextended to speak the mac_cred_check_access_vnode() entry point. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#31 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#31 (text+ko) ==== @@ -280,6 +280,22 @@ } static int +mac_bsdextended_cred_check_access_vnode(struct ucred *cred, struct vnode *vp, + struct mac *label, mode_t flags) +{ + struct vattr vap; + int error; + + if (!mac_bsdextended_enabled) + return (0); + + error = VOP_GETATTR(vp, &vap, cred, curthread); + if (error) + return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, flags)); +} + +static int mac_bsdextended_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp, struct mac *dlabel) { @@ -680,6 +696,8 @@ (macop_t)mac_bsdextended_cred_check_see_socket }, { MAC_CRED_CHECK_DEBUG_PROC, (macop_t)mac_bsdextended_cred_check_debug_proc }, + { MAC_CRED_CHECK_ACCESS_VNODE, + (macop_t)mac_bsdextended_cred_check_access_vnode }, { MAC_CRED_CHECK_CHDIR_VNODE, (macop_t)mac_bsdextended_cred_check_chdir_vnode }, { MAC_CRED_CHECK_CREATE_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 3 22:11:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C9AF37B401; Wed, 3 Jul 2002 22:11:33 -0700 (PDT) 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 A2DB437B400 for ; Wed, 3 Jul 2002 22:11:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 52EE343E3B for ; Wed, 3 Jul 2002 22:11:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g645BWJU059524 for ; Wed, 3 Jul 2002 22:11:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g645BWRH059521 for perforce@freebsd.org; Wed, 3 Jul 2002 22:11:32 -0700 (PDT) Date: Wed, 3 Jul 2002 22:11:32 -0700 (PDT) Message-Id: <200207040511.g645BWRH059521@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 13784 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13784 Change 13784 by peter@peter_ia64 on 2002/07/03 22:10:58 GRRR. Affected files ... .. //depot/projects/ia64/usr.sbin/kldxref/ef.c#7 edit Differences ... ==== //depot/projects/ia64/usr.sbin/kldxref/ef.c#7 (text+ko) ==== @@ -33,14 +33,13 @@ */ #include -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include -#include #define FREEBSD_ELF #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 4 9:31:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E37937B401; Thu, 4 Jul 2002 09:31:27 -0700 (PDT) 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 0B28F37B400 for ; Thu, 4 Jul 2002 09:31:27 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDBF243E09 for ; Thu, 4 Jul 2002 09:31:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g64GVQJU086561 for ; Thu, 4 Jul 2002 09:31:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g64GVQNQ086558 for perforce@freebsd.org; Thu, 4 Jul 2002 09:31:26 -0700 (PDT) Date: Thu, 4 Jul 2002 09:31:26 -0700 (PDT) Message-Id: <200207041631.g64GVQNQ086558@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13792 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13792 Change 13792 by rwatson@rwatson_curry on 2002/07/04 09:31:17 spelling fix from hiten Affected files ... .. //depot/projects/trustedbsd/mac/MACREADME#19 edit Differences ... ==== //depot/projects/trustedbsd/mac/MACREADME#19 (text+ko) ==== @@ -50,7 +50,7 @@ options NETSMB # Could well work options NFSSERVER # Probably doesn't work options NWFS # Probably doesn't work -options SMPFS # Probably doesn't work +options SMBFS # Probably doesn't work Using those options may result in incorrect security behavior, memory corruption, or a kernel panic. They do not work with MAC at this time. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 6 9:33:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD2D937B401; Sat, 6 Jul 2002 09:33:17 -0700 (PDT) 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 4C44737B400 for ; Sat, 6 Jul 2002 09:33:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 085EC43E3B for ; Sat, 6 Jul 2002 09:33:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g66GXGJU009960 for ; Sat, 6 Jul 2002 09:33:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g66GXGt1009957 for perforce@freebsd.org; Sat, 6 Jul 2002 09:33:16 -0700 (PDT) Date: Sat, 6 Jul 2002 09:33:16 -0700 (PDT) Message-Id: <200207061633.g66GXGt1009957@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13835 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13835 Change 13835 by rwatson@rwatson_paprika on 2002/07/06 09:32:52 Fail a little more gracefully if v_mount is NULL, and generate some debugging output when it happens. On some of my boxes, I occasionally find this code dereferencing a null v_mount despite the vnode locks, which suggests either a race or a possible nit involving specfs/deadfs. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#158 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#158 (text+ko) ==== @@ -956,6 +956,22 @@ ASSERT_VOP_LOCKED(vp, "vn_refreshlabel"); + if (vp->v_mount == NULL) { +/* + Eventually, we probably want to special-case refreshing + of deadfs vnodes, and if there's a lock-free race somewhere, + that case might be handled here. + + mac_update_vnode_deadfs(vp); + return (0); + */ + printf("vn_refreshlabel: null v_mount\n"); + if (vp->v_type != VT_NON) + printf( + "vn_refreshlabel: null v_mount with non-VT_NON\n"); + return (EBADF); + } + if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { mac_update_vnode_from_mount(vp, vp->v_mount); return (0); @@ -2297,6 +2313,12 @@ { int error; + if (vp->v_mount == NULL) { + printf("vn_setlabel: null v_mount\n"); + if (vp->v_type != VT_NON) + printf("vn_setlabel: null v_mount with non-VT_NON\n"); + return (EBADF); + } /* * Multi-phase commit. First check the policies to confirm the * change is OK. Then commit via the filesystem. Finally, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 6 20:28:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10F9537B405; Sat, 6 Jul 2002 20:27:50 -0700 (PDT) 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 B2BC837B401 for ; Sat, 6 Jul 2002 20:27:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B832043E4A for ; Sat, 6 Jul 2002 20:27:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g673RmJU018189 for ; Sat, 6 Jul 2002 20:27:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g673Rmet018186 for perforce@freebsd.org; Sat, 6 Jul 2002 20:27:48 -0700 (PDT) Date: Sat, 6 Jul 2002 20:27:48 -0700 (PDT) Message-Id: <200207070327.g673Rmet018186@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13848 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13848 Change 13848 by rwatson@rwatson_curry on 2002/07/06 20:27:22 Integ trustedbsd_base forward to just before KSE-III. In particular, pick up a working gdb. Another integ coming to pick up specific post kse-iii changes such as compiler and linker fixes. Affected files ... .. //depot/projects/trustedbsd/base/bin/cat/cat.c#5 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.c#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile.alpha#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile.arm#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile.i386#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile.ia64#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile.powerpc#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile.sparc64#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/_setjmp.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/fixunsdfsi.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/frexp.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/modf.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/setjmp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/sigsetjmp.S#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/alpha/boot1/boot1.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/common.h#2 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_elf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio_ebus.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/intr_machdep.h#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ti.c#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#10 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/csplit/csplit.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/base/bin/cat/cat.c#5 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/cat/cat.c,v 1.24 2002/06/14 09:54:48 jmallett Exp $"; + "$FreeBSD: src/bin/cat/cat.c,v 1.25 2002/06/29 04:52:33 tjr Exp $"; #endif /* not lint */ #include @@ -278,8 +278,11 @@ fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd >= 0) { sou.sun_family = AF_UNIX; - snprintf(sou.sun_path, sizeof(sou.sun_path), "%s", path); - len = strlen(sou.sun_path); + if ((len = strlcpy(sou.sun_path, path, + sizeof(sou.sun_path))) >= sizeof(sou.sun_path)) { + errno = ENAMETOOLONG; + return (-1); + } len = offsetof(struct sockaddr_un, sun_path[len+1]); if (connect(fd, (void *)&sou, len) < 0) { ==== //depot/projects/trustedbsd/base/bin/ln/ln.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/ln/ln.c,v 1.26 2002/05/30 00:57:38 tjr Exp $"; + "$FreeBSD: src/bin/ln/ln.c,v 1.27 2002/06/29 04:10:40 tjr Exp $"; #endif /* not lint */ #include @@ -189,7 +189,12 @@ p = target; else ++p; - (void)snprintf(path, sizeof(path), "%s/%s", source, p); + if (snprintf(path, sizeof(path), "%s/%s", source, p) >= + sizeof(path)) { + errno = ENAMETOOLONG; + warn("%s", target); + return (1); + } source = path; } ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.19 2002/06/27 22:59:11 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.20 2002/06/29 03:19:35 obrien Exp $ # In my absence, bde and jdp have pre-approval for any commit they feel # necessary. @@ -8,11 +8,10 @@ addr2line ar as gasp ld nm objcopy objdump ranlib readelf \ size strings strip doc -NO_GDB=yes TARGET_ARCH?= ${MACHINE_ARCH} .if (${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "i386") \ && !defined(NO_GDB) -SUBDIR+= gdb gdbserver gdbreplay +SUBDIR+= gdb gdbreplay .endif .include ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile#6 (text+ko) ==== @@ -1,15 +1,23 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.60 2002/06/29 01:16:00 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.61 2002/06/29 03:16:10 obrien Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils +.if ${TARGET_ARCH} == "sparc64" +GDB_CPU= sparc +.elif ${TARGET_ARCH} == "x86-64" +GDB_CPU= i386 +.else +GDB_CPU= ${TARGET_ARCH} +.endif + NOSHARED?=yes PROG= gdb XSRCS= annotate.c ax-general.c ax-gdb.c bcache.c blockframe.c \ breakpoint.c buildsym.c c-exp.y c-lang.c c-typeprint.c \ c-valprint.c ch-exp.c ch-lang.c ch-typeprint.c ch-valprint.c \ - coffread.c complaints.c copying.c core-regset.c \ + coffread.c complaints.c copying.c \ corefile.c corelow.c cp-valprint.c dcache.c dbxread.c \ demangle.c dwarfread.c dwarf2read.c elfread.c environ.c eval.c \ exec.c expprint.c f-exp.y f-lang.c f-typeprint.c f-valprint.c \ @@ -40,7 +48,7 @@ .if ${TARGET_ARCH} != ${MACHINE_ARCH} CFLAGS+= -DCROSS_COMPILE=1 .endif -CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${TARGET_ARCH}_arch +CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${GDB_CPU}_arch CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd @@ -117,13 +125,13 @@ .PRECIOUS: init.c nm.h: - echo '#include "${TARGET_ARCH}/nm-fbsd.h"' >${.TARGET} + echo '#include "${GDB_CPU}/nm-fbsd.h"' >${.TARGET} echo '#include "fbsd-kgdb.h"' >>${.TARGET} -.for H in tm-fbsd xm-${TARGET_ARCH} +.for H in tm-fbsd xm-${GDB_CPU} ${H:C/-.*$//}.h: ln -sf \ - ${.CURDIR}/../../../../contrib/gdb/gdb/config/${TARGET_ARCH}/${H}.h \ + ${.CURDIR}/../../../../contrib/gdb/gdb/config/${GDB_CPU}/${H}.h \ ${.TARGET} .endfor ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile.alpha#5 (text+ko) ==== @@ -1,4 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.6 2002/06/29 01:16:00 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.7 2002/06/29 03:16:10 obrien Exp $ -XSRCS+= alphabsd-nat.c alphafbsd-tdep.c alpha-tdep.c +XSRCS+= alphabsd-nat.c alphafbsd-tdep.c alpha-tdep.c \ + core-regset.c CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf64_alpha_vec ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/Makefile.i386#5 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.5 2002/06/29 01:16:00 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.6 2002/06/29 03:16:10 obrien Exp $ XSRCS+= i386fbsd-nat.c i386bsd-tdep.c i386bsd-nat.c i386-nat.c i386-tdep.c \ i387-nat.c i387-tdep.c \ - core-aout.c + core-regset.c core-aout.c CFLAGS+= -Dprint_insn_i386=print_insn_i386_att CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf32_i386_vec ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.8 2002/06/29 01:16:00 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.9 2002/06/29 03:16:10 obrien Exp $ */ /* Low level interface for debugging FreeBSD user threads for GDB, the GNU debugger. Copyright 1996, 1999 Free Software Foundation, Inc. @@ -408,6 +408,7 @@ return rtnval; } +/* XXX: this needs to be selected by target, not [build] host */ #ifdef __i386__ static char sigmap[MAX_NUM_REGS] = /* map reg to sigcontext */ @@ -488,6 +489,18 @@ #endif +#ifdef __sparc64__ + +static char sigmap[125] = /* map reg to sigcontext */ +{ + -1 +}; +static char jmpmap[125] = { + -1 +}; + +#endif + static void freebsd_uthread_fetch_registers (int regno) { ==== //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.3 2002/03/05 04:03:57 jake Exp $ +# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.4 2002/06/29 03:23:18 obrien Exp $ -SRCS+= _setjmp.S fixunsdfsi.S flt_rounds.c fpsetmask.c infinity.c isinf.c \ - ldexp.c modf.S setjmp.S sigsetjmp.S +SRCS+= _setjmp.S fixunsdfsi.S flt_rounds.c fpsetmask.c frexp.c \ + infinity.c isinf.c ldexp.c modf.S setjmp.S sigsetjmp.S ==== //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/_setjmp.S#4 (text+ko) ==== @@ -38,19 +38,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" #if 0 - .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" -#else RCSID("$NetBSD: _setjmp.S,v 1.4 1998/10/08 02:27:59 eeh Exp $") #endif #endif /* LIBC_SCCS and not lint */ - -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/_setjmp.S,v 1.3 2001/12/29 06:37:33 jake Exp $" -#endif /* SYSLIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/_setjmp.S,v 1.4 2002/06/29 03:23:51 obrien Exp $"); #include "assym.s" ==== //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/fixunsdfsi.S#3 (text+ko) ==== @@ -40,17 +40,12 @@ #include #if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)fixunsdfsi.s 8.1 (Berkeley) 6/4/93" #if 0 - .asciz "@(#)fixunsdfsi.s 8.1 (Berkeley) 6/4/93" -#else RCSID("$NetBSD: fixunsdfsi.S,v 1.3 2000/07/25 04:26:12 mycroft Exp $") #endif #endif /* LIBC_SCCS and not lint */ - -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/fixunsdfsi.S,v 1.2 2002/03/11 03:10:55 tmm Exp $" -#endif /* SYSLIBC_RCS and not lint */ +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fixunsdfsi.S,v 1.3 2002/06/29 03:23:51 obrien Exp $"); /* * Convert double to unsigned integer (for gcc). ==== //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/modf.S#3 (text+ko) ==== @@ -38,19 +38,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)modf.s 8.1 (Berkeley) 6/4/93" #if 0 - .asciz "@(#)modf.s 8.1 (Berkeley) 6/4/93" -#else .asciz "$NetBSD: modf.S,v 1.2 2000/07/23 07:12:22 eeh Exp $" #endif #endif /* LIBC_SCCS and not lint */ - -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/modf.S,v 1.2 2002/03/11 03:13:02 tmm Exp $" -#endif /* SYSLIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/modf.S,v 1.3 2002/06/29 03:23:51 obrien Exp $"); #include "assym.s" ==== //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/setjmp.S#3 (text+ko) ==== @@ -38,19 +38,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" #if 0 - .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" -#else RCSID("$NetBSD: _setjmp.S,v 1.4 1998/10/08 02:27:59 eeh Exp $") #endif #endif /* LIBC_SCCS and not lint */ - -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/setjmp.S,v 1.2 2001/12/29 06:39:53 jake Exp $" -#endif /* SYSLIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/setjmp.S,v 1.3 2002/06/29 03:23:51 obrien Exp $"); #include "assym.s" ==== //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/sigsetjmp.S#4 (text+ko) ==== @@ -29,12 +29,8 @@ * */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/sigsetjmp.S,v 1.3 2002/03/05 04:02:04 jake Exp $" -#endif /* SYSLIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/sigsetjmp.S,v 1.4 2002/06/29 03:23:51 obrien Exp $"); #include "assym.s" ==== //depot/projects/trustedbsd/base/sys/boot/alpha/boot1/boot1.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.11 2002/06/11 10:19:59 phk Exp $ + * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.12 2002/06/29 02:32:32 peter Exp $ * From $NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ */ @@ -253,7 +253,7 @@ char *name = "/boot/loader"; char *p; char filename[512]; - void (*entry) __P((void)); + void (*entry)(void); u_long start, freq; int i; ==== //depot/projects/trustedbsd/base/sys/boot/alpha/libalpha/common.h#2 (text+ko) ==== @@ -1,11 +1,11 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.2 1999/08/28 00:39:26 peter Exp $ + * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.3 2002/06/29 02:32:32 peter Exp $ * From: $NetBSD: common.h,v 1.2 1998/01/05 07:02:48 perry Exp $ */ -int prom_open __P((char*, int)); -void OSFpal __P((void)); -void halt __P((void)); -u_int64_t prom_dispatch __P((int, ...)); -int cpu_number __P((void)); -void switch_palcode __P((void)); +int prom_open(char*, int); +void OSFpal(void); +void halt(void); +u_int64_t prom_dispatch(int, ...); +int cpu_number(void); +void switch_palcode(void); ==== //depot/projects/trustedbsd/base/sys/ddb/db_elf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.10 2002/05/07 10:59:52 bde Exp $ */ +/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.11 2002/06/29 02:32:33 peter Exp $ */ /* $NetBSD: db_elf.c,v 1.4 1998/05/03 18:49:54 thorpej Exp $ */ /*- @@ -56,7 +56,7 @@ #include -static char *db_elf_find_strtab __P((db_symtab_t *)); +static char *db_elf_find_strtab(db_symtab_t *); #define STAB_TO_SYMSTART(stab) ((Elf_Sym *)((stab)->start)) #define STAB_TO_SYMEND(stab) ((Elf_Sym *)((stab)->end)) ==== //depot/projects/trustedbsd/base/sys/dev/sio/sio_ebus.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID($FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.1 2002/06/18 01:19:31 obrien Exp $); +__FBSDID($FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.2 2002/06/29 02:32:33 peter Exp $); #include #include @@ -40,9 +40,9 @@ #include #include -int sio_ofw_inlist __P((char *name, char *list[])); -static int sio_ebus_attach __P((device_t dev)); -static int sio_ebus_probe __P((device_t dev)); +int sio_ofw_inlist(char *name, char *list[]); +static int sio_ebus_attach(device_t dev); +static int sio_ebus_probe(device_t dev); static device_method_t sio_ebus_methods[] = { /* Device interface */ ==== //depot/projects/trustedbsd/base/sys/i386/isa/intr_machdep.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.40 2002/04/06 08:25:05 nyan Exp $ + * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.41 2002/06/29 02:32:33 peter Exp $ */ #ifndef _I386_ISA_INTR_MACHDEP_H_ @@ -140,7 +140,7 @@ * Type of the first (asm) part of an interrupt handler. */ typedef void inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); -typedef void unpendhand_t __P((void)); +typedef void unpendhand_t(void); #define IDTVEC(name) __CONCAT(X,name) ==== //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#14 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.365 2002/06/28 23:17:36 alfred Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.366 2002/06/29 04:45:09 obrien Exp $ */ /* @@ -2456,7 +2456,7 @@ * List all of the locked vnodes in the system. * Called when debugging the kernel. */ -DB_SHOW_COMMAND(lockedvnodes, lockedvnodes) +DB_SHOW_COMMAND(lockedvnods, lockedvnodes) { struct thread *td = curthread; /* XXX */ struct mount *mp, *nmp; ==== //depot/projects/trustedbsd/base/sys/pci/if_ti.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_ti.c,v 1.60 2002/06/26 03:34:52 ken Exp $ + * $FreeBSD: src/sys/pci/if_ti.c,v 1.61 2002/06/29 02:32:34 peter Exp $ */ /* @@ -152,7 +152,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/pci/if_ti.c,v 1.60 2002/06/26 03:34:52 ken Exp $"; + "$FreeBSD: src/sys/pci/if_ti.c,v 1.61 2002/06/29 02:32:34 peter Exp $"; #endif struct ti_softc *tis[8]; @@ -270,8 +270,8 @@ static int ti_gibinit (struct ti_softc *); #ifdef TI_JUMBO_HDRSPLIT -static __inline void ti_hdr_split __P((struct mbuf *top, int hdr_len, - int pkt_len, int idx)); +static __inline void ti_hdr_split (struct mbuf *top, int hdr_len, + int pkt_len, int idx); #endif /* TI_JUMBO_HDRSPLIT */ static device_method_t ti_methods[] = { ==== //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#10 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.22 2002/06/27 14:43:27 mux Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.23 2002/06/29 04:42:03 obrien Exp $ machine sparc64 cpu SUN4U @@ -83,7 +83,9 @@ device atapicd # ATAPI CDROM drives #device atapifd # ATAPI floppy drives #device atapist # ATAPI tape drives -options ATA_STATIC_ID #Static device numbering +# Do NOT enable ATA_STATIC_ID -- cmd646 controller will be !ata2!, +# and you will not mount an ATA /. +#options ATA_STATIC_ID #Static device numbering # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices ==== //depot/projects/trustedbsd/base/sys/sparc64/include/profile.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * * from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp * from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29 - * $FreeBSD: src/sys/sparc64/include/profile.h,v 1.1 2001/11/18 17:56:46 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/profile.h,v 1.2 2002/06/29 02:32:34 peter Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -52,10 +52,10 @@ #ifdef GUPROF struct gmonparam; -void nullfunc_loop_profiled __P((void)); -void nullfunc_profiled __P((void)); -void startguprof __P((struct gmonparam *p)); -void stopguprof __P((struct gmonparam *p)); +void nullfunc_loop_profiled(void); +void nullfunc_profiled(void); +void startguprof(struct gmonparam *p); +void stopguprof(struct gmonparam *p); #else #define startguprof(p) #define stopguprof(p) ==== //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.62 2002/06/25 15:13:07 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.63 2002/06/29 06:37:24 jake Exp $ */ /* @@ -1200,7 +1200,8 @@ KASSERT(pmap_resident_count(pm) == 0, ("pmap_release: resident pages %ld != 0", pmap_resident_count(pm))); - TAILQ_FOREACH(m, &obj->memq, listq) { + while (!TAILQ_EMPTY(&obj->memq)) { + m = TAILQ_FIRST(&obj->memq); if (vm_page_sleep_busy(m, FALSE, "pmaprl")) continue; vm_page_busy(m); ==== //depot/projects/trustedbsd/base/usr.bin/csplit/csplit.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/csplit/csplit.c,v 1.4 2002/06/07 01:04:24 tjr Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/csplit/csplit.c,v 1.5 2002/06/29 05:31:26 tjr Exp $"); #include @@ -227,8 +227,11 @@ { FILE *fp; - snprintf(currfile, sizeof(currfile), "%s%0*ld", prefix, (int)sufflen, - nfiles); + if (snprintf(currfile, sizeof(currfile), "%s%0*ld", prefix, + (int)sufflen, nfiles) >= sizeof(currfile)) { + errno = ENAMETOOLONG; + err(1, NULL); + } if ((fp = fopen(currfile, "w+")) == NULL) err(1, "%s", currfile); nfiles++; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 6 20:43:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12FFF37B401; Sat, 6 Jul 2002 20:43:09 -0700 (PDT) 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 9DECF37B400 for ; Sat, 6 Jul 2002 20:43:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0240743E09 for ; Sat, 6 Jul 2002 20:43:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g673h7JU019908 for ; Sat, 6 Jul 2002 20:43:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g673h7hC019905 for perforce@freebsd.org; Sat, 6 Jul 2002 20:43:07 -0700 (PDT) Date: Sat, 6 Jul 2002 20:43:07 -0700 (PDT) Message-Id: <200207070343.g673h7hC019905@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13849 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13849 Change 13849 by rwatson@rwatson_curry on 2002/07/06 20:42:17 Integ trustedbsd_mac forward to just before KSE-III. In particular, pick up a working gdb. Another integ coming to pick up specific post kse-iii changes such as compiler and linker fixes. Affected files ... .. //depot/projects/trustedbsd/mac/bin/cat/cat.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.c#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.alpha#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.arm#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.i386#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.ia64#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.powerpc#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.sparc64#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/_setjmp.S#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/fixunsdfsi.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/frexp.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/modf.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/setjmp.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/sigsetjmp.S#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/alpha/boot1/boot1.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/common.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_elf.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sio/sio_ebus.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/intr_machdep.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#10 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#14 integrate .. //depot/projects/trustedbsd/mac/usr.bin/csplit/csplit.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac/bin/cat/cat.c#5 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)cat.c 8.2 (Berkeley) 4/27/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/cat/cat.c,v 1.24 2002/06/14 09:54:48 jmallett Exp $"; + "$FreeBSD: src/bin/cat/cat.c,v 1.25 2002/06/29 04:52:33 tjr Exp $"; #endif /* not lint */ #include @@ -278,8 +278,11 @@ fd = socket(AF_UNIX, SOCK_STREAM, 0); if (fd >= 0) { sou.sun_family = AF_UNIX; - snprintf(sou.sun_path, sizeof(sou.sun_path), "%s", path); - len = strlen(sou.sun_path); + if ((len = strlcpy(sou.sun_path, path, + sizeof(sou.sun_path))) >= sizeof(sou.sun_path)) { + errno = ENAMETOOLONG; + return (-1); + } len = offsetof(struct sockaddr_un, sun_path[len+1]); if (connect(fd, (void *)&sou, len) < 0) { ==== //depot/projects/trustedbsd/mac/bin/ln/ln.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)ln.c 8.2 (Berkeley) 3/31/94"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/ln/ln.c,v 1.26 2002/05/30 00:57:38 tjr Exp $"; + "$FreeBSD: src/bin/ln/ln.c,v 1.27 2002/06/29 04:10:40 tjr Exp $"; #endif /* not lint */ #include @@ -189,7 +189,12 @@ p = target; else ++p; - (void)snprintf(path, sizeof(path), "%s/%s", source, p); + if (snprintf(path, sizeof(path), "%s/%s", source, p) >= + sizeof(path)) { + errno = ENAMETOOLONG; + warn("%s", target); + return (1); + } source = path; } ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.19 2002/06/27 22:59:11 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile,v 1.20 2002/06/29 03:19:35 obrien Exp $ # In my absence, bde and jdp have pre-approval for any commit they feel # necessary. @@ -8,11 +8,10 @@ addr2line ar as gasp ld nm objcopy objdump ranlib readelf \ size strings strip doc -NO_GDB=yes TARGET_ARCH?= ${MACHINE_ARCH} .if (${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "i386") \ && !defined(NO_GDB) -SUBDIR+= gdb gdbserver gdbreplay +SUBDIR+= gdb gdbreplay .endif .include ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile#6 (text+ko) ==== @@ -1,15 +1,23 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.60 2002/06/29 01:16:00 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile,v 1.61 2002/06/29 03:16:10 obrien Exp $ .include "../Makefile.inc0" .PATH: ${SRCDIR}/binutils +.if ${TARGET_ARCH} == "sparc64" +GDB_CPU= sparc +.elif ${TARGET_ARCH} == "x86-64" +GDB_CPU= i386 +.else +GDB_CPU= ${TARGET_ARCH} +.endif + NOSHARED?=yes PROG= gdb XSRCS= annotate.c ax-general.c ax-gdb.c bcache.c blockframe.c \ breakpoint.c buildsym.c c-exp.y c-lang.c c-typeprint.c \ c-valprint.c ch-exp.c ch-lang.c ch-typeprint.c ch-valprint.c \ - coffread.c complaints.c copying.c core-regset.c \ + coffread.c complaints.c copying.c \ corefile.c corelow.c cp-valprint.c dcache.c dbxread.c \ demangle.c dwarfread.c dwarf2read.c elfread.c environ.c eval.c \ exec.c expprint.c f-exp.y f-lang.c f-typeprint.c f-valprint.c \ @@ -40,7 +48,7 @@ .if ${TARGET_ARCH} != ${MACHINE_ARCH} CFLAGS+= -DCROSS_COMPILE=1 .endif -CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${TARGET_ARCH}_arch +CFLAGS+= -DDEFAULT_BFD_ARCH=bfd_${GDB_CPU}_arch CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd @@ -117,13 +125,13 @@ .PRECIOUS: init.c nm.h: - echo '#include "${TARGET_ARCH}/nm-fbsd.h"' >${.TARGET} + echo '#include "${GDB_CPU}/nm-fbsd.h"' >${.TARGET} echo '#include "fbsd-kgdb.h"' >>${.TARGET} -.for H in tm-fbsd xm-${TARGET_ARCH} +.for H in tm-fbsd xm-${GDB_CPU} ${H:C/-.*$//}.h: ln -sf \ - ${.CURDIR}/../../../../contrib/gdb/gdb/config/${TARGET_ARCH}/${H}.h \ + ${.CURDIR}/../../../../contrib/gdb/gdb/config/${GDB_CPU}/${H}.h \ ${.TARGET} .endfor ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.alpha#5 (text+ko) ==== @@ -1,4 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.6 2002/06/29 01:16:00 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.alpha,v 1.7 2002/06/29 03:16:10 obrien Exp $ -XSRCS+= alphabsd-nat.c alphafbsd-tdep.c alpha-tdep.c +XSRCS+= alphabsd-nat.c alphafbsd-tdep.c alpha-tdep.c \ + core-regset.c CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf64_alpha_vec ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/Makefile.i386#5 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.5 2002/06/29 01:16:00 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/gdb/Makefile.i386,v 1.6 2002/06/29 03:16:10 obrien Exp $ XSRCS+= i386fbsd-nat.c i386bsd-tdep.c i386bsd-nat.c i386-nat.c i386-tdep.c \ i387-nat.c i387-tdep.c \ - core-aout.c + core-regset.c core-aout.c CFLAGS+= -Dprint_insn_i386=print_insn_i386_att CFLAGS+= -DDEFAULT_BFD_VEC=bfd_elf32_i386_vec ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.8 2002/06/29 01:16:00 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.9 2002/06/29 03:16:10 obrien Exp $ */ /* Low level interface for debugging FreeBSD user threads for GDB, the GNU debugger. Copyright 1996, 1999 Free Software Foundation, Inc. @@ -408,6 +408,7 @@ return rtnval; } +/* XXX: this needs to be selected by target, not [build] host */ #ifdef __i386__ static char sigmap[MAX_NUM_REGS] = /* map reg to sigcontext */ @@ -488,6 +489,18 @@ #endif +#ifdef __sparc64__ + +static char sigmap[125] = /* map reg to sigcontext */ +{ + -1 +}; +static char jmpmap[125] = { + -1 +}; + +#endif + static void freebsd_uthread_fetch_registers (int regno) { ==== //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.3 2002/03/05 04:03:57 jake Exp $ +# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.4 2002/06/29 03:23:18 obrien Exp $ -SRCS+= _setjmp.S fixunsdfsi.S flt_rounds.c fpsetmask.c infinity.c isinf.c \ - ldexp.c modf.S setjmp.S sigsetjmp.S +SRCS+= _setjmp.S fixunsdfsi.S flt_rounds.c fpsetmask.c frexp.c \ + infinity.c isinf.c ldexp.c modf.S setjmp.S sigsetjmp.S ==== //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/_setjmp.S#4 (text+ko) ==== @@ -38,19 +38,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" #if 0 - .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" -#else RCSID("$NetBSD: _setjmp.S,v 1.4 1998/10/08 02:27:59 eeh Exp $") #endif #endif /* LIBC_SCCS and not lint */ - -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/_setjmp.S,v 1.3 2001/12/29 06:37:33 jake Exp $" -#endif /* SYSLIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/_setjmp.S,v 1.4 2002/06/29 03:23:51 obrien Exp $"); #include "assym.s" ==== //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/fixunsdfsi.S#3 (text+ko) ==== @@ -40,17 +40,12 @@ #include #if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)fixunsdfsi.s 8.1 (Berkeley) 6/4/93" #if 0 - .asciz "@(#)fixunsdfsi.s 8.1 (Berkeley) 6/4/93" -#else RCSID("$NetBSD: fixunsdfsi.S,v 1.3 2000/07/25 04:26:12 mycroft Exp $") #endif #endif /* LIBC_SCCS and not lint */ - -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/fixunsdfsi.S,v 1.2 2002/03/11 03:10:55 tmm Exp $" -#endif /* SYSLIBC_RCS and not lint */ +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fixunsdfsi.S,v 1.3 2002/06/29 03:23:51 obrien Exp $"); /* * Convert double to unsigned integer (for gcc). ==== //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/modf.S#3 (text+ko) ==== @@ -38,19 +38,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)modf.s 8.1 (Berkeley) 6/4/93" #if 0 - .asciz "@(#)modf.s 8.1 (Berkeley) 6/4/93" -#else .asciz "$NetBSD: modf.S,v 1.2 2000/07/23 07:12:22 eeh Exp $" #endif #endif /* LIBC_SCCS and not lint */ - -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/modf.S,v 1.2 2002/03/11 03:13:02 tmm Exp $" -#endif /* SYSLIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/modf.S,v 1.3 2002/06/29 03:23:51 obrien Exp $"); #include "assym.s" ==== //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/setjmp.S#3 (text+ko) ==== @@ -38,19 +38,13 @@ */ #if defined(LIBC_SCCS) && !defined(lint) + .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" #if 0 - .asciz "@(#)_setjmp.s 8.1 (Berkeley) 6/4/93" -#else RCSID("$NetBSD: _setjmp.S,v 1.4 1998/10/08 02:27:59 eeh Exp $") #endif #endif /* LIBC_SCCS and not lint */ - -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/setjmp.S,v 1.2 2001/12/29 06:39:53 jake Exp $" -#endif /* SYSLIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/setjmp.S,v 1.3 2002/06/29 03:23:51 obrien Exp $"); #include "assym.s" ==== //depot/projects/trustedbsd/mac/lib/libc/sparc64/gen/sigsetjmp.S#4 (text+ko) ==== @@ -29,12 +29,8 @@ * */ -#if defined(SYSLIBC_RCS) && !defined(lint) - .text - .asciz "$FreeBSD: src/lib/libc/sparc64/gen/sigsetjmp.S,v 1.3 2002/03/05 04:02:04 jake Exp $" -#endif /* SYSLIBC_RCS and not lint */ - #include +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/sigsetjmp.S,v 1.4 2002/06/29 03:23:51 obrien Exp $"); #include "assym.s" ==== //depot/projects/trustedbsd/mac/sys/boot/alpha/boot1/boot1.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.11 2002/06/11 10:19:59 phk Exp $ + * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.12 2002/06/29 02:32:32 peter Exp $ * From $NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ */ @@ -253,7 +253,7 @@ char *name = "/boot/loader"; char *p; char filename[512]; - void (*entry) __P((void)); + void (*entry)(void); u_long start, freq; int i; ==== //depot/projects/trustedbsd/mac/sys/boot/alpha/libalpha/common.h#2 (text+ko) ==== @@ -1,11 +1,11 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.2 1999/08/28 00:39:26 peter Exp $ + * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.3 2002/06/29 02:32:32 peter Exp $ * From: $NetBSD: common.h,v 1.2 1998/01/05 07:02:48 perry Exp $ */ -int prom_open __P((char*, int)); -void OSFpal __P((void)); -void halt __P((void)); -u_int64_t prom_dispatch __P((int, ...)); -int cpu_number __P((void)); -void switch_palcode __P((void)); +int prom_open(char*, int); +void OSFpal(void); +void halt(void); +u_int64_t prom_dispatch(int, ...); +int cpu_number(void); +void switch_palcode(void); ==== //depot/projects/trustedbsd/mac/sys/ddb/db_elf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.10 2002/05/07 10:59:52 bde Exp $ */ +/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.11 2002/06/29 02:32:33 peter Exp $ */ /* $NetBSD: db_elf.c,v 1.4 1998/05/03 18:49:54 thorpej Exp $ */ /*- @@ -56,7 +56,7 @@ #include -static char *db_elf_find_strtab __P((db_symtab_t *)); +static char *db_elf_find_strtab(db_symtab_t *); #define STAB_TO_SYMSTART(stab) ((Elf_Sym *)((stab)->start)) #define STAB_TO_SYMEND(stab) ((Elf_Sym *)((stab)->end)) ==== //depot/projects/trustedbsd/mac/sys/dev/sio/sio_ebus.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID($FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.1 2002/06/18 01:19:31 obrien Exp $); +__FBSDID($FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.2 2002/06/29 02:32:33 peter Exp $); #include #include @@ -40,9 +40,9 @@ #include #include -int sio_ofw_inlist __P((char *name, char *list[])); -static int sio_ebus_attach __P((device_t dev)); -static int sio_ebus_probe __P((device_t dev)); +int sio_ofw_inlist(char *name, char *list[]); +static int sio_ebus_attach(device_t dev); +static int sio_ebus_probe(device_t dev); static device_method_t sio_ebus_methods[] = { /* Device interface */ ==== //depot/projects/trustedbsd/mac/sys/i386/isa/intr_machdep.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.40 2002/04/06 08:25:05 nyan Exp $ + * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.41 2002/06/29 02:32:33 peter Exp $ */ #ifndef _I386_ISA_INTR_MACHDEP_H_ @@ -140,7 +140,7 @@ * Type of the first (asm) part of an interrupt handler. */ typedef void inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); -typedef void unpendhand_t __P((void)); +typedef void unpendhand_t(void); #define IDTVEC(name) __CONCAT(X,name) ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#26 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.365 2002/06/28 23:17:36 alfred Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.366 2002/06/29 04:45:09 obrien Exp $ */ /* @@ -2465,7 +2465,7 @@ * List all of the locked vnodes in the system. * Called when debugging the kernel. */ -DB_SHOW_COMMAND(lockedvnodes, lockedvnodes) +DB_SHOW_COMMAND(lockedvnods, lockedvnodes) { struct thread *td = curthread; /* XXX */ struct mount *mp, *nmp; ==== //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_ti.c,v 1.60 2002/06/26 03:34:52 ken Exp $ + * $FreeBSD: src/sys/pci/if_ti.c,v 1.61 2002/06/29 02:32:34 peter Exp $ */ /* @@ -152,7 +152,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/pci/if_ti.c,v 1.60 2002/06/26 03:34:52 ken Exp $"; + "$FreeBSD: src/sys/pci/if_ti.c,v 1.61 2002/06/29 02:32:34 peter Exp $"; #endif struct ti_softc *tis[8]; @@ -270,8 +270,8 @@ static int ti_gibinit (struct ti_softc *); #ifdef TI_JUMBO_HDRSPLIT -static __inline void ti_hdr_split __P((struct mbuf *top, int hdr_len, - int pkt_len, int idx)); +static __inline void ti_hdr_split (struct mbuf *top, int hdr_len, + int pkt_len, int idx); #endif /* TI_JUMBO_HDRSPLIT */ static device_method_t ti_methods[] = { ==== //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#10 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.22 2002/06/27 14:43:27 mux Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.23 2002/06/29 04:42:03 obrien Exp $ machine sparc64 cpu SUN4U @@ -83,7 +83,9 @@ device atapicd # ATAPI CDROM drives #device atapifd # ATAPI floppy drives #device atapist # ATAPI tape drives -options ATA_STATIC_ID #Static device numbering +# Do NOT enable ATA_STATIC_ID -- cmd646 controller will be !ata2!, +# and you will not mount an ATA /. +#options ATA_STATIC_ID #Static device numbering # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices ==== //depot/projects/trustedbsd/mac/sys/sparc64/include/profile.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * * from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp * from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29 - * $FreeBSD: src/sys/sparc64/include/profile.h,v 1.1 2001/11/18 17:56:46 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/profile.h,v 1.2 2002/06/29 02:32:34 peter Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -52,10 +52,10 @@ #ifdef GUPROF struct gmonparam; -void nullfunc_loop_profiled __P((void)); -void nullfunc_profiled __P((void)); -void startguprof __P((struct gmonparam *p)); -void stopguprof __P((struct gmonparam *p)); +void nullfunc_loop_profiled(void); +void nullfunc_profiled(void); +void startguprof(struct gmonparam *p); +void stopguprof(struct gmonparam *p); #else #define startguprof(p) #define stopguprof(p) ==== //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.62 2002/06/25 15:13:07 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.63 2002/06/29 06:37:24 jake Exp $ */ /* @@ -1200,7 +1200,8 @@ KASSERT(pmap_resident_count(pm) == 0, ("pmap_release: resident pages %ld != 0", pmap_resident_count(pm))); - TAILQ_FOREACH(m, &obj->memq, listq) { + while (!TAILQ_EMPTY(&obj->memq)) { + m = TAILQ_FIRST(&obj->memq); if (vm_page_sleep_busy(m, FALSE, "pmaprl")) continue; vm_page_busy(m); ==== //depot/projects/trustedbsd/mac/usr.bin/csplit/csplit.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/csplit/csplit.c,v 1.4 2002/06/07 01:04:24 tjr Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/csplit/csplit.c,v 1.5 2002/06/29 05:31:26 tjr Exp $"); #include @@ -227,8 +227,11 @@ { FILE *fp; - snprintf(currfile, sizeof(currfile), "%s%0*ld", prefix, (int)sufflen, - nfiles); + if (snprintf(currfile, sizeof(currfile), "%s%0*ld", prefix, + (int)sufflen, nfiles) >= sizeof(currfile)) { + errno = ENAMETOOLONG; + err(1, NULL); + } if ((fp = fopen(currfile, "w+")) == NULL) err(1, "%s", currfile); nfiles++; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 6 21:29: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 476A937B401; Sat, 6 Jul 2002 21:29:04 -0700 (PDT) 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 D23A537B400 for ; Sat, 6 Jul 2002 21:29:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FF7243E42 for ; Sat, 6 Jul 2002 21:29:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g674T3JU028007 for ; Sat, 6 Jul 2002 21:29:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g674T3hl028004 for perforce@freebsd.org; Sat, 6 Jul 2002 21:29:03 -0700 (PDT) Date: Sat, 6 Jul 2002 21:29:03 -0700 (PDT) Message-Id: <200207070429.g674T3hl028004@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13850 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13850 Change 13850 by rwatson@rwatson_curry on 2002/07/06 21:28:51 Typo: check the right vnode field. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#159 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#159 (text+ko) ==== @@ -966,7 +966,7 @@ return (0); */ printf("vn_refreshlabel: null v_mount\n"); - if (vp->v_type != VT_NON) + if (vp->v_tag != VT_NON) printf( "vn_refreshlabel: null v_mount with non-VT_NON\n"); return (EBADF); @@ -2315,7 +2315,7 @@ if (vp->v_mount == NULL) { printf("vn_setlabel: null v_mount\n"); - if (vp->v_type != VT_NON) + if (vp->v_tag != VT_NON) printf("vn_setlabel: null v_mount with non-VT_NON\n"); return (EBADF); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 6 21:51: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02BD537B401; Sat, 6 Jul 2002 21:49:36 -0700 (PDT) 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 9224837B400 for ; Sat, 6 Jul 2002 21:49:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EEFB43E31 for ; Sat, 6 Jul 2002 21:49:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g674nZJU030131 for ; Sat, 6 Jul 2002 21:49:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g674nXYG030128 for perforce@freebsd.org; Sat, 6 Jul 2002 21:49:33 -0700 (PDT) Date: Sat, 6 Jul 2002 21:49:33 -0700 (PDT) Message-Id: <200207070449.g674nXYG030128@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13852 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13852 Change 13852 by rwatson@rwatson_curry on 2002/07/06 21:48:34 Integ some changes from post-kse-iii userland--particularly, new binutils/gdb stuff, rtld changes, and gcc fixes for XFree86 building. Affected files ... .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ChangeLog-9495#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/archures.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/bfd-in2.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-arm.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/coffcode.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/config.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/configure#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/configure.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-powerpc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/cpu-s390.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/archures.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/libbfd.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/doc/reloc.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/dwarf2.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf-bfd.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf-eh-frame.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-arm.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-mips.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-ppc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf32-s390.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-alpha.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-ppc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-ppc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-s390.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-sparc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-x86-64.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elfarm-nabi.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elflink.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elfxx-ia64.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elfxx-target.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ihex.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/libbfd.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/opncls.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/reloc.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/rs6000-core.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/syms.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/version.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/xcofflink.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/MAINTAINERS#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/arparse.y#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/config.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/dlltool.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/dllwrap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/addr2line.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/ar.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/cxxfilt.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/dlltool.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/nm.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/objcopy.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/objdump.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/ranlib.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/readelf.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/size.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/strings.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/doc/strip.1#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/nm.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/rclex.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/rclex.l#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/rcparse.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/rcparse.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/rcparse.y#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/readelf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/resbin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/resrc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/size.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/config/mh-s390pic#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/config/mt-s390pic#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/gas/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/obj-coff.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-arm.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-i386.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-ppc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-s390.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/gas/config/tc-s390.h#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/gas/doc/as.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/stabs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/gas/symbols.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/dwarf2.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/ChangeLog#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/i386.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/include/opcode/s390.h#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/Makefile.am#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/configure.host#4 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf64_s390.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/elf_s390.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/armelf.em#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emultempl/ppc64elf.em#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ld.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ld.texinfo#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldlang.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/ppc-opc.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/s390-dis.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/s390-mkopc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/s390-opc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/opcodes/s390-opc.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/emit-rtl.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/recog.c#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/doc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/doc/inc-hist.diff#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/i386/version.c#3 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/Makefile#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/Makefile.alpha#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/Makefile.i386#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/Makefile.ia64#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/alpha/freebsd-nat.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/alpha/kvm-fbsd.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/alpha/nm.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/alpha/tm.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/alpha/version.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/alpha/xm.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/config.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/freebsd-uthread.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/i386/freebsd-nat.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/i386/kvm-fbsd.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/i386/nm.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/i386/tm.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/i386/version.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb5/i386/xm.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdbreplay/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdbreplay5/Makefile#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdbserver5/Makefile#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdbserver5/low-fbsd.c#2 delete .. //depot/projects/trustedbsd/base/libexec/rtld-elf/alpha/lockdflt.c#2 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/i386/lockdflt.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/ia64/lockdflt.c#2 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.1#4 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/sparc64/lockdflt.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/base/contrib/binutils/bfd/ChangeLog#6 (text+ko) ==== @@ -1,3 +1,311 @@ +2002-05-14 Daniel Jacobowitz + + * configure.in: Set is_release=y for 2.12.1 release. + * configure: Likewise. + +2002-05-13 David Edelsohn + + * configure.in: Auto-configure HAVE_ST_C_IMPL. + * configure: Regenerate. + * config.in: Regenerate. + * rs6000-core.c (CNEW_IMPL): Guard use of c_impl with HAVE_ST_C_IMPL + or AIX_5_CORE. + +2002-05-11 Daniel Jacobowitz + + Merge from mainline (to elf32-mips.c): + 2002-05-03 H.J. Lu (hjl@gnu.org) + + * elfxx-mips.c (mips_elf_link_hash_entry): Add forced_local. + (mips_elf_link_hash_newfunc): Initialize forced_local to false. + (mips_elf_record_global_got_symbol): Call _bfd_mips_elf_hide_symbol + to hide a global symbol. + (_bfd_mips_elf_hide_symbol): Return if forced_local is true. Set + forced_local to true. + +2002-05-11 Ralf Corsepius + Daniel Jacobowitz + + * coff-sh.c (sh_reloc_map): Map to R_SH_IMM32 for non-PE. Don't + map BFD_RELOC_RVA. + +2002-05-09 Alan Modra + + * elf64-ppc.c (RA_REGISTER_MASK, RA_REGISTER_SHIFT): Delete. + + Merge from mainline + 2002-05-08 Alan Modra + * elf32-ppc.c (ppc_elf_create_got): New function. + (ppc_elf_create_dynamic_sections): Call ppc_elf_create_got before + _bfd_elf_create_dynamic_sections. Correct .plt flags. + (ppc_elf_check_relocs): Use ppc_elf_create_got in place of + _bfd_elf_create_got_section. + + 2002-05-07 Alan Modra + * elf-bfd.h (struct elf_backend_data): Add rela_normal. + * elfxx-target.h (elf_backend_rela_normal): Define. + (elfNN_bed): Init rela_normal. + * elflink.h (elf_link_input_bfd ): Handle adjustment + for section symbols here if rela_normal. Simplify abs section test. + * elf-m10200.c (mn10200_elf_relocate_section): If relocatable, + return immediately. Remove code handling relocatable linking. + * elf-m10300.c (mn10300_elf_relocate_section): Likewise. + * elf32-fr30.c (fr30_elf_relocate_section): Likewise. + * elf32-i370.c (i370_elf_relocate_section): Likewise. + * elf32-i860.c (elf32_i860_relocate_section): Likewise. + * elf32-m68k.c (elf_m68k_relocate_section): Likewise. + * elf32-mcore.c (mcore_elf_relocate_section): Likewise. + * elf32-openrisc.c (openrisc_elf_relocate_section): Likewise. + * elf32-ppc.c (ppc_elf_relocate_section): Likewise. + * elf32-s390.c (elf_s390_relocate_section): Likewise. + * elf32-xstormy16.c (xstormy16_elf_relocate_section): Likewise. + * elf64-ppc.c (ppc64_elf_relocate_section): Likewise. + * elf64-s390.c (elf_s390_relocate_section): Likewise. + * elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise. + * elfxx-ia64.c (elfNN_ia64_relocate_section): Likewise. + * elf32-arm.h (elf32_arm_relocate_section): Likewise #ifndef USE_REL. + * elf32-m32r.c (m32r_elf_relocate_section): Likewise. + * elf-m10200.c (elf_backend_rela_normal): Define. + * elf-m10300.c (elf_backend_rela_normal): Define. + * elf32-fr30.c (elf_backend_rela_normal): Define. + * elf32-i370.c (elf_backend_rela_normal): Define. + * elf32-i860.c (elf_backend_rela_normal): Define. + * elf32-m68k.c (elf_backend_rela_normal): Define. + * elf32-mcore.c (elf_backend_rela_normal): Define. + * elf32-openrisc.c (elf_backend_rela_normal): Define. + * elf32-ppc.c (elf_backend_rela_normal): Define. + * elf32-s390.c (elf_backend_rela_normal): Define. + * elf32-xstormy16.c (elf_backend_rela_normal): Define. + * elf64-ppc.c (elf_backend_rela_normal): Define. + * elf64-s390.c (elf_backend_rela_normal): Define. + * elf64-x86-64.c (elf_backend_rela_normal): Define. + * elfxx-ia64.c (elf_backend_rela_normal): Define. + * elf32-arm.h (elf_backend_rela_normal): Define #ifndef USE_REL. + * elf32-m32r.c (elf_backend_rela_normal): Likewise. + + 2002-05-06 Alan Modra + * elflink.h (elf_link_input_bfd ): Adjust r_offset + when not relocatable. Fix reloc_emitter call for K&R. + + 2002-05-04 Alan Modra + * dwarf2.c (struct line_head): Make prologue_length a bfd_vma. + (read_abbrevs): Change "offset" param to bfd_vma. + (parse_comp_unit): Change "version" and addr_size to unsigned ints. + Change "abbrev_offset" to bfd_vma. + (read_indirect_string): Use correct conversion chars in error + message format string, cast bfd_vma's to unsigned long. + (read_abbrevs): Likewise. + (read_attribute_value): Likewise. + (decode_line_info): Likewise. + (scan_unit_for_functions): Likewise. + (parse_comp_unit): Likewise. + + 2002-05-04 Bob Byrnes + * opncls.c (_bfd_new_bfd_contained_in): Check return value of + _bfd_new_bfd. + + 2002-05-02 Alan Modra + * elf64-ppc.c (ppc64_elf_howto_raw ): Change to a + 16 bit reloc. + : Likewise. + (ppc64_elf_reloc_type_lookup): Map from BFD_RELOC_16_BASEREL to + SECTOFF reloc. + * elf32-ppc.c (ppc_elf_howto_raw ): Correct. + (ppc_elf_reloc_type_lookup): Map from BFD_RELOC_16_BASEREL to + SECTOFF reloc. + * elf64-ppc.c (ppc64_elf_addr16_ha_reloc): Delete. + (ppc64_elf_ha_reloc): New function. + (ppc64_elf_brtaken_reloc): New function. + (ppc64_elf_sectoff_reloc): New function. + (ppc64_elf_sectoff_ha_reloc): New function. + (ppc64_elf_toc_reloc): New function. + (ppc64_elf_toc_ha_reloc): New function. + (ppc64_elf_toc64_reloc): New function. + (ppc64_elf_unhandled_reloc): New function. + (ppc64_elf_howto_raw): Use the above. + : Mark pc_relative, pcrel_offset. + : Not pc_relative or pcrel_offset. Fix dst_mask. + : Likewise. + (IS_ABSOLUTE_RELOC): Update. + (struct ppc_link_hash_table): Add have_undefweak. + (ppc64_elf_link_hash_table_create): Init. + (func_desc_adjust): Set have_undefweak. + (ppc64_elf_func_desc_adjust): Call func_desc_adjust earlier. Only + add the .sfpr blr when have_undefweak. + (ppc64_elf_set_toc): Rename to ppc64_elf_toc, remove info param + and relocatable test. Return TOCstart and don't set elf_gp. + (ppc64_elf_relocate_section): Correct BRTAKEN/BRNTAKEN branch + offset calculation. Add assert on weak sym branch tweaks. + * elf64-ppc.h (ppc64_elf_set_toc): Delete. + (ppc64_elf_toc): Declare. + + 2002-05-01 Alan Modra + * syms.c (_bfd_stab_section_find_nearest_line): Don't bomb on NULL + file_name. + + 2002-05-01 Alan Modra + * elf64-ppc.c (CROR_151515, CROR_313131): Define. + (ppc64_elf_relocate_section): Use them. Don't look for plt calls + on R_PPC64_ADDR24 relocs. Require a nop or no link reg on plt + call branches. Correct undefined weak destination. + (ppc64_elf_func_desc_adjust): Always create at least one blr in + .sfpr, and correct case where either only savef* or restf* is + needed. + + 2002-04-09 DJ Delorie + * elfarm-nabi.c (elf32_arm_howto_table): Fix ABS16 masks. + +2002-05-06 Nick Clifton + + * elf32-arm.h (elf32_arm_final_link_relocate): Convert + 'reloc_signed_max' and 'reloc_signed_min' into half-word offsets. + +2002-05-02 Richard Henderson + + * elf64-alpha.c (elf64_alpha_relocate_section): Force relative relocs + vs SHN_UNDEF to zero. + +2002-04-27 Alan Modra + + Merge from mainline + 2002-04-12 Alan Modra + * elf.c (prep_headers): Don't zero EI_OSABI, EI_ABIVERSION or + header pad. + + 2002-02-21 Andreas Jaeger + * elf64-x86-64.c: Major rework that introduces all recent changes + to the x86-64 backend. Get a closer match to elf32-i386. + (struct elf64_x86_64_dyn_relocs): Rename from + elf64_x86_64_pcrel_relocs_copied, add additional fields. Change + all users. + (struct elf64_x86_64_link_hash_table): Add short cuts to some + sections. + (link_hash_newfunc): Rename from elf64_x86_64_link_hash_newfunc, + remove casts, initialize new hash members. + (create_got_section): New. + (elf64_x86_64_create_dynamic_sections): New. + (elf64_x86_64_copy_indirect_symbol): New. + (elf64_x86_64_check_relocs): Don't allocate space for dynamic + relocs, .got or .relgot here but do it in allocate_dynrelocs. + Reference count possible .plt and .got entries. Don't test input + section SEC_READONLY here to try to avoid copy relocs, and keep + dyn_relocs regardless of ELF_LINK_NON_GOT_REF. Don't set + DF_TEXTREL here. Delay setting of variables until needed. Cache + pointer to "sreloc" section in elf_section_data. Tweak condition + under which .got created. Report files with bad relocation + section names. + (elf64_x86_64_gc_sweep_hook): Sweep dyn_relocs and local_dynrel. + Reference count possible .plt entries. Don't deallocate .got and + .relgot space here. + (elf64_x86_64_adjust_dynamic_symbol): Handle nocopyreloc. Don't + do copy reloc processing for weakdefs. Remove redundant casts and + aborts. Delay setting of vars until needed. Move creation of + dynamic symbols and allocation of .plt and .rela.plt to + allocate_dynrelocs. Replace BFD_ASSERT with abort. + (WILL_CALL_FINISH_DYNAMIC_SYMBOL): New. + (allocate_dynrelocs): New. + (readonly_dynrelocs): New. + (elf64_x86_64_size_dynamic_sections): Call readonly_dynrelocs. + Allocate space for dyn relocs. Replace BFD_ASSERT with abort. + Zero out the dynamic allocated content space. + (elf64_x86_64_discard_copies): Removed. + (elf64_x86_64_relocate_section): Make use of dynamic section + short-cuts. Localise vars, and delay setting. Better error + reporting, replace BFD_ASSERT with abort. Check + ELF_LINK_HASH_DEF_DYNAMIC to see if a symbol is not defined in the + regular object file and tread the weak definition as the normal + one. Don't discard relocs for undefweak or undefined symbols and + check !DEF_REGULAR as well as DEF_DYNAMIC in test for avoided copy + relocs. + (elf64_x86_64_finish_dynamic_symbol): Don't copy relocs for + symbols that have been forced local. Use same test to decide if + we can use a relative reloc for got as relocate_section. Expand + SHN_UNDEF comment. Move expressions out of function calls. + Replace BFD_ASSERT with abort. + (bfd_elf64_bfd_final_link): Removed. + (elf_backend_copy_indirect_symbol): Define. + + * reloc.c: Move sh relocs to where they belong. + * libbfd.h, bfd-in2.h: Regenerate. + + Merge from mainline + 2002-04-26 Alan Modra + * opncls.c (bfd_make_readable): Call bfd_section_list_clear. + * xcofflink.c (xcoff_link_add_dynamic_symbols): Likewise. + * elflink.h (elf_bfd_final_link): Ensure input bfd class is the + same as the output before calling elf_link_input_bfd. + * coffcode.h (coff_compute_section_file_positions): Set + section_tail after shuffling section list. + + 2002-04-23 Alan Modra + * elf32-hppa.c (hppa_type_of_stub): Correct and simplify condition + under which a plt call stub is used. + (final_link_relocate): Similarly. + (allocate_plt_static): Clear h-plabel except when plt entry is + exclusively used for a plabel. + (allocate_dynrelocs): Use the above to simplify plt sizing. + (struct elf32_hppa_link_hash_table): Add has_22bit_branch. + (elf32_hppa_link_hash_table_create): Init. + (BL22_RP): Define. + (hppa_build_one_stub): Use BL22_RP if has_22bit_branch. + (elf32_hppa_check_relocs): Set has_22bit_branch. + * elf32-hppa.c (elf32_hppa_check_relocs): Remove debug message. + (final_link_relocate): Likewise. + + 2002-04-20 Alan Modra + * archures.c (bfd_arch_info): Add comment on list order. + (bfd_default_set_arch_mach): Use bfd_lookup_arch. + * cpu-powerpc.c (bfd_powerpc_archs): Re-order so that the default + is always at head of list. + * bfd-in2.h: Regenerate. + + 2002-04-16 Alan Modra + * elf32-m32r.c (m32r_elf_add_symbol_hook): Check the hash table + type rather than just assuming entries are ELF. + * elf32-sh64.c (sh64_elf_add_symbol_hook): Likewise. + * elf64-sh64.c (sh64_elf64_add_symbol_hook): Likewise. + * elf64-sparc.c (sparc64_elf_add_symbol_hook): Likewise. + * elf64-mmix.c (mmix_elf_add_symbol_hook): Use bfd_link_hash_entry + rather than elf_link_hash_entry. + + 2002-04-15 Alan Modra + * elf32-ppc.c (ppc_elf_add_symbol_hook): Check the hash table type. + + 2002-04-08 Randolph Chung + * elf32-hppa.c (hppa_unwind_entry_compare): Move to elf-hppa.h. + (elf32_hppa_final_link): Split out sorting logic to.. + * elf-hppa.h (elf_hppa_sort_unwind): ..here. + (elf_hppa_final_link): Call elf_hppa_sort_unwind. + +2002-04-26 Richard Smith + Jakub Jelinek + + * elf-eh-frame.c (struct eh_cie_fde): Add per_encoding_relative. + (_bfd_elf_discard_section_eh_frame): Set it for CIEs with pcrel + encoded personality. + (_bfd_elf_write_section_eh_frame): Adjust pcrel encoded personality + for CIE/FDE removal. + +2002-04-26 Jakub Jelinek + + * elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Don't build + search table if some FDE is DW_EH_PE_aligned encoded either. + (_bfd_elf_write_section_eh_frame): Handle terminating FDE specially. + +2002-04-18 Nick Clifton + + * coff-arm.c (coff_thumb_pcrel_12, coff_thumb_pcrel_9, + insert_thumb_branch, record_thumb_to_arm_glue): Suppress + definition of these functions for ARM_WINCE builds as they are + not used. + (SWAP_IN_RELOC_OFFSET, SWAP_OUT_RELOC_OFFSET): Do not define + for ARM_WINCE builds. + +2002-04-16 Nick Clifton + + * ihex.c (ihex_write_object_contents): Fix check for records + crossing 64K boundaries. + 2002-04-06 Hans-Peter Nilsson * elf32-cris.c (cris_elf_howto_table) >. *} . boolean the_default; . const struct bfd_arch_info * (*compatible) . PARAMS ((const struct bfd_arch_info *a, @@ -604,21 +606,9 @@ enum bfd_architecture arch; unsigned long mach; { - const bfd_arch_info_type * const *app, *ap; - - for (app = bfd_archures_list; *app != NULL; app++) - { - for (ap = *app; ap != NULL; ap = ap->next) - { - if (ap->arch == arch - && (ap->mach == mach - || (mach == 0 && ap->the_default))) - { - abfd->arch_info = ap; - return true; - } - } - } + abfd->arch_info = bfd_lookup_arch (arch, mach); + if (abfd->arch_info != NULL) + return true; abfd->arch_info = &bfd_default_arch_struct; bfd_set_error (bfd_error_bad_value); ==== //depot/projects/trustedbsd/base/contrib/binutils/bfd/bfd-in2.h#5 (text+ko) ==== @@ -1657,7 +1657,9 @@ const char *arch_name; const char *printable_name; unsigned int section_align_power; - /* True if this is the default machine for the architecture. */ + /* True if this is the default machine for the architecture. + The default arch should be the first entry for an arch so that + all the entries for that arch can be accessed via <>. */ boolean the_default; const struct bfd_arch_info * (*compatible) PARAMS ((const struct bfd_arch_info *a, @@ -2194,55 +2196,6 @@ BFD_RELOC_MIPS_REL16, BFD_RELOC_MIPS_RELGOT, BFD_RELOC_MIPS_JALR, - BFD_RELOC_SH_GOT_LOW16, - BFD_RELOC_SH_GOT_MEDLOW16, - BFD_RELOC_SH_GOT_MEDHI16, - BFD_RELOC_SH_GOT_HI16, - BFD_RELOC_SH_GOTPLT_LOW16, - BFD_RELOC_SH_GOTPLT_MEDLOW16, - BFD_RELOC_SH_GOTPLT_MEDHI16, - BFD_RELOC_SH_GOTPLT_HI16, - BFD_RELOC_SH_PLT_LOW16, - BFD_RELOC_SH_PLT_MEDLOW16, - BFD_RELOC_SH_PLT_MEDHI16, - BFD_RELOC_SH_PLT_HI16, - BFD_RELOC_SH_GOTOFF_LOW16, - BFD_RELOC_SH_GOTOFF_MEDLOW16, - BFD_RELOC_SH_GOTOFF_MEDHI16, - BFD_RELOC_SH_GOTOFF_HI16, - BFD_RELOC_SH_GOTPC_LOW16, - BFD_RELOC_SH_GOTPC_MEDLOW16, - BFD_RELOC_SH_GOTPC_MEDHI16, - BFD_RELOC_SH_GOTPC_HI16, - BFD_RELOC_SH_COPY64, - BFD_RELOC_SH_GLOB_DAT64, - BFD_RELOC_SH_JMP_SLOT64, - BFD_RELOC_SH_RELATIVE64, - BFD_RELOC_SH_GOT10BY4, - BFD_RELOC_SH_GOT10BY8, - BFD_RELOC_SH_GOTPLT10BY4, - BFD_RELOC_SH_GOTPLT10BY8, - BFD_RELOC_SH_GOTPLT32, - BFD_RELOC_SH_SHMEDIA_CODE, - BFD_RELOC_SH_IMMU5, - BFD_RELOC_SH_IMMS6, - BFD_RELOC_SH_IMMS6BY32, - BFD_RELOC_SH_IMMU6, - BFD_RELOC_SH_IMMS10, - BFD_RELOC_SH_IMMS10BY2, - BFD_RELOC_SH_IMMS10BY4, - BFD_RELOC_SH_IMMS10BY8, - BFD_RELOC_SH_IMMS16, - BFD_RELOC_SH_IMMU16, - BFD_RELOC_SH_IMM_LOW16, - BFD_RELOC_SH_IMM_LOW16_PCREL, - BFD_RELOC_SH_IMM_MEDLOW16, - BFD_RELOC_SH_IMM_MEDLOW16_PCREL, - BFD_RELOC_SH_IMM_MEDHI16, - BFD_RELOC_SH_IMM_MEDHI16_PCREL, - BFD_RELOC_SH_IMM_HI16, - BFD_RELOC_SH_IMM_HI16_PCREL, - BFD_RELOC_SH_PT_16, /* i386/elf relocations */ @@ -2423,6 +2376,55 @@ BFD_RELOC_SH_JMP_SLOT, BFD_RELOC_SH_RELATIVE, BFD_RELOC_SH_GOTPC, + BFD_RELOC_SH_GOT_LOW16, + BFD_RELOC_SH_GOT_MEDLOW16, + BFD_RELOC_SH_GOT_MEDHI16, + BFD_RELOC_SH_GOT_HI16, + BFD_RELOC_SH_GOTPLT_LOW16, + BFD_RELOC_SH_GOTPLT_MEDLOW16, + BFD_RELOC_SH_GOTPLT_MEDHI16, + BFD_RELOC_SH_GOTPLT_HI16, + BFD_RELOC_SH_PLT_LOW16, + BFD_RELOC_SH_PLT_MEDLOW16, + BFD_RELOC_SH_PLT_MEDHI16, + BFD_RELOC_SH_PLT_HI16, + BFD_RELOC_SH_GOTOFF_LOW16, + BFD_RELOC_SH_GOTOFF_MEDLOW16, + BFD_RELOC_SH_GOTOFF_MEDHI16, + BFD_RELOC_SH_GOTOFF_HI16, + BFD_RELOC_SH_GOTPC_LOW16, + BFD_RELOC_SH_GOTPC_MEDLOW16, + BFD_RELOC_SH_GOTPC_MEDHI16, + BFD_RELOC_SH_GOTPC_HI16, + BFD_RELOC_SH_COPY64, + BFD_RELOC_SH_GLOB_DAT64, + BFD_RELOC_SH_JMP_SLOT64, + BFD_RELOC_SH_RELATIVE64, + BFD_RELOC_SH_GOT10BY4, + BFD_RELOC_SH_GOT10BY8, + BFD_RELOC_SH_GOTPLT10BY4, + BFD_RELOC_SH_GOTPLT10BY8, + BFD_RELOC_SH_GOTPLT32, + BFD_RELOC_SH_SHMEDIA_CODE, + BFD_RELOC_SH_IMMU5, + BFD_RELOC_SH_IMMS6, + BFD_RELOC_SH_IMMS6BY32, + BFD_RELOC_SH_IMMU6, + BFD_RELOC_SH_IMMS10, + BFD_RELOC_SH_IMMS10BY2, + BFD_RELOC_SH_IMMS10BY4, + BFD_RELOC_SH_IMMS10BY8, + BFD_RELOC_SH_IMMS16, + BFD_RELOC_SH_IMMU16, + BFD_RELOC_SH_IMM_LOW16, + BFD_RELOC_SH_IMM_LOW16_PCREL, + BFD_RELOC_SH_IMM_MEDLOW16, + BFD_RELOC_SH_IMM_MEDLOW16_PCREL, + BFD_RELOC_SH_IMM_MEDHI16, + BFD_RELOC_SH_IMM_MEDHI16_PCREL, + BFD_RELOC_SH_IMM_HI16, + BFD_RELOC_SH_IMM_HI16_PCREL, + BFD_RELOC_SH_PT_16, /* Thumb 23-, 12- and 9-bit pc-relative branches. The lowest bit must be zero and is not stored in the instruction. */ ==== //depot/projects/trustedbsd/base/contrib/binutils/bfd/coff-arm.c#5 (text+ko) ==== @@ -87,12 +87,16 @@ PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); static bfd_reloc_status_type aoutarm_fix_pcrel_26 PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); +#ifndef ARM_WINCE static bfd_reloc_status_type coff_thumb_pcrel_23 PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); +static bfd_reloc_status_type coff_thumb_pcrel_9 + PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); +static insn32 insert_thumb_branch + PARAMS ((insn32, int)); +#endif static bfd_reloc_status_type coff_thumb_pcrel_12 PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); -static bfd_reloc_status_type coff_thumb_pcrel_9 - PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); static bfd_reloc_status_type coff_arm_reloc PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); static boolean coff_arm_adjust_symndx @@ -109,8 +113,6 @@ PARAMS ((bfd *, bfd_reloc_code_real_type)); static struct bfd_link_hash_table * coff_arm_link_hash_table_create PARAMS ((bfd *)); -static insn32 insert_thumb_branch - PARAMS ((insn32, int)); static struct coff_link_hash_entry * find_thumb_glue PARAMS ((struct bfd_link_info *, const char *, bfd *)); static struct coff_link_hash_entry * find_arm_glue @@ -118,9 +120,11 @@ #ifndef COFF_IMAGE_WITH_PE static void record_arm_to_thumb_glue PARAMS ((struct bfd_link_info *, struct coff_link_hash_entry *)); +#ifndef ARM_WINCE static void record_thumb_to_arm_glue PARAMS ((struct bfd_link_info *, struct coff_link_hash_entry *)); #endif +#endif static boolean coff_arm_merge_private_bfd_data PARAMS ((bfd *, bfd *)); static boolean coff_arm_print_private_bfd_data @@ -801,6 +805,7 @@ return flag; } +#ifndef ARM_WINCE static bfd_reloc_status_type coff_thumb_pcrel_23 (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message) @@ -818,7 +823,7 @@ } static bfd_reloc_status_type -coff_thumb_pcrel_12 (abfd, reloc_entry, symbol, data, input_section, +coff_thumb_pcrel_9 (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message) bfd *abfd; arelent *reloc_entry; @@ -830,11 +835,12 @@ { return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message, - b12); + b9); } +#endif /* not ARM_WINCE */ static bfd_reloc_status_type -coff_thumb_pcrel_9 (abfd, reloc_entry, symbol, data, input_section, +coff_thumb_pcrel_12 (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message) bfd *abfd; arelent *reloc_entry; @@ -846,7 +852,7 @@ { return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message, - b9); + b12); } static const struct reloc_howto_struct * @@ -900,10 +906,12 @@ #define BADMAG(x) ARMBADMAG(x) #define ARM 1 /* Customize coffcode.h */ +#ifndef ARM_WINCE /* Make sure that the 'r_offset' field is copied properly so that identical binaries will compare the same. */ #define SWAP_IN_RELOC_OFFSET H_GET_32 #define SWAP_OUT_RELOC_OFFSET H_PUT_32 +#endif /* Extend the coff_link_hash_table structure with a few ARM specific fields. This allows us to store global data here without actually creating any @@ -975,6 +983,7 @@ } +#ifndef ARM_WINCE /* The thumb form of a long branch is a bit finicky, because the offset encoding is split over two fields, each in it's own instruction. They can occur in any order. So given a thumb form of long branch, and an @@ -1031,6 +1040,7 @@ return br_insn; } + static struct coff_link_hash_entry * find_thumb_glue (info, name, input_bfd) @@ -1060,6 +1070,7 @@ return myh; } +#endif /* not ARM_WINCE */ static struct coff_link_hash_entry * find_arm_glue (info, name, input_bfd) @@ -1914,6 +1925,7 @@ return; } +#ifndef ARM_WINCE static void record_thumb_to_arm_glue (info, h) struct bfd_link_info * info; @@ -1987,6 +1999,7 @@ return; } +#endif /* not ARM_WINCE */ /* Select a BFD to be used to hold the sections used by the glue code. This function is called from the linker scripts in ld/emultempl/ ==== //depot/projects/trustedbsd/base/contrib/binutils/bfd/coffcode.h#5 (text+ko) ==== @@ -3014,6 +3014,7 @@ else current->target_index = target_index++; } + abfd->section_tail = ¤t->next; free (section_list); } ==== //depot/projects/trustedbsd/base/contrib/binutils/bfd/config.in#3 (text+ko) ==== @@ -214,6 +214,9 @@ /* Define if getenv is not declared in system header files. */ #undef NEED_DECLARATION_GETENV +/* Define if struct core_dumpx has member c_impl */ +#undef HAVE_ST_C_IMPL + /* Define if has prstatus_t. */ #undef HAVE_PRSTATUS_T ==== //depot/projects/trustedbsd/base/contrib/binutils/bfd/configure#6 (text+ko) ==== @@ -1199,7 +1199,7 @@ # Uncomment the next line to remove the date from the reported bfd version -#is_release=y +is_release=y bfd_version=`echo "${VERSION}" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$/\1\2\3\4\5/'` @@ -5173,6 +5173,32 @@ rs6000-*-aix4.[3-9]* | powerpc-*-aix4.[3-9]*) COREFILE=rs6000-core.lo COREFLAG="$COREFLAG -DAIX_CORE_DUMPX_CORE" + # Not all versions of AIX with -DAIX_CORE_DUMPX_CORE + # have c_impl as a member of struct core_dumpx + echo $ac_n "checking for c_impl in struct core_dumpx""... $ac_c" 1>&6 +echo "configure:5180: checking for c_impl in struct core_dumpx" >&5 + cat > conftest.$ac_ext < +int main() { +struct core_dumpx c; c.c_impl = 0; +; return 0; } +EOF +if { (eval echo configure:5189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat >> confdefs.h <<\EOF +#define HAVE_ST_C_IMPL 1 +EOF + + echo "$ac_t""yes" 1>&6 +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 +fi +rm -f conftest* ;; rs6000-*-aix4*) COREFILE=rs6000-core.lo ;; rs6000-*-*) COREFILE=rs6000-core.lo ;; @@ -5226,17 +5252,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5230: checking for $ac_hdr" >&5 +echo "configure:5256: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5264,12 +5290,12 @@ if test "$ac_cv_header_sys_procfs_h" = yes; then echo $ac_n "checking for prstatus_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:5268: checking for prstatus_t in sys/procfs.h" >&5 +echo "configure:5294: checking for prstatus_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prstatus_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_prstatus_t=yes else @@ -5300,12 +5326,12 @@ echo "$ac_t""$bfd_cv_have_sys_procfs_type_prstatus_t" 1>&6 echo $ac_n "checking for prstatus32_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:5304: checking for prstatus32_t in sys/procfs.h" >&5 +echo "configure:5330: checking for prstatus32_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prstatus32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_prstatus32_t=yes else @@ -5336,12 +5362,12 @@ echo "$ac_t""$bfd_cv_have_sys_procfs_type_prstatus32_t" 1>&6 echo $ac_n "checking for prstatus_t.pr_who in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:5340: checking for prstatus_t.pr_who in sys/procfs.h" >&5 +echo "configure:5366: checking for prstatus_t.pr_who in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who=yes else @@ -5372,12 +5398,12 @@ echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who" 1>&6 echo $ac_n "checking for prstatus32_t.pr_who in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:5376: checking for prstatus32_t.pr_who in sys/procfs.h" >&5 +echo "configure:5402: checking for prstatus32_t.pr_who in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who=yes else @@ -5408,12 +5434,12 @@ echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who" 1>&6 echo $ac_n "checking for pstatus_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:5412: checking for pstatus_t in sys/procfs.h" >&5 +echo "configure:5438: checking for pstatus_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pstatus_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_pstatus_t=yes else @@ -5444,12 +5470,12 @@ echo "$ac_t""$bfd_cv_have_sys_procfs_type_pstatus_t" 1>&6 echo $ac_n "checking for pxstatus_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:5448: checking for pxstatus_t in sys/procfs.h" >&5 +echo "configure:5474: checking for pxstatus_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pxstatus_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 6 22:14:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4316F37B405; Sat, 6 Jul 2002 22:13:11 -0700 (PDT) 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 56DC037B400 for ; Sat, 6 Jul 2002 22:13:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5236E43E09 for ; Sat, 6 Jul 2002 22:13:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g675D9JU037586 for ; Sat, 6 Jul 2002 22:13:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g675D4uw037583 for perforce@freebsd.org; Sat, 6 Jul 2002 22:13:04 -0700 (PDT) Date: Sat, 6 Jul 2002 22:13:04 -0700 (PDT) Message-Id: <200207070513.g675D4uw037583@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13854 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13854 Change 13854 by rwatson@rwatson_curry on 2002/07/06 22:12:32 Integ some changes from post-kse-iii userland--particularly, new binutils/gdb stuff, rtld changes, and gcc fixes for XFree86 building. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/ChangeLog#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/ChangeLog-9495#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/archures.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/bfd-in2.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/coff-arm.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/coffcode.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/config.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/configure#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/configure.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/cpu-powerpc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/cpu-s390.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/archures.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/libbfd.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/doc/reloc.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/dwarf2.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf-bfd.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf-eh-frame.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf32-arm.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf32-mips.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf32-ppc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf32-s390.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-alpha.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-ppc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-ppc.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-s390.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-sparc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-x86-64.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elfarm-nabi.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elflink.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elfxx-ia64.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elfxx-target.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/ihex.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/libbfd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/opncls.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/reloc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/rs6000-core.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/syms.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/version.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/xcofflink.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/ChangeLog#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/MAINTAINERS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/arparse.y#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/config.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/configure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/configure.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/dlltool.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/dllwrap.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/addr2line.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/ar.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/cxxfilt.man#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/dlltool.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/nm.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/objcopy.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/objdump.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/ranlib.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/readelf.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/size.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/strings.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/doc/strip.1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/nm.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/rclex.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/rclex.l#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/rcparse.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/rcparse.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/rcparse.y#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/readelf.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/resbin.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/resrc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/size.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/config/mh-s390pic#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/config/mt-s390pic#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/gas/ChangeLog#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/obj-coff.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-arm.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-i386.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-ppc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-s390.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/gas/config/tc-s390.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/gas/doc/as.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/gas/stabs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/gas/symbols.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/include/elf/ChangeLog#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/include/elf/dwarf2.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/include/opcode/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/include/opcode/i386.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/include/opcode/s390.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/ChangeLog#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/Makefile.am#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/configure.host#4 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf64_s390.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/elf_s390.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emultempl/armelf.em#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emultempl/ppc64elf.em#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/ld.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/ld.texinfo#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/ldlang.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/ChangeLog#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/ppc-opc.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/s390-dis.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/s390-mkopc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/s390-opc.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/opcodes/s390-opc.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/emit-rtl.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/recog.c#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/doc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/doc/inc-hist.diff#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/i386/version.c#3 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/Makefile#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/Makefile.alpha#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/Makefile.i386#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/Makefile.ia64#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/alpha/freebsd-nat.c#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/alpha/kvm-fbsd.c#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/alpha/nm.h#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/alpha/tm.h#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/alpha/version.c#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/alpha/xm.h#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/config.h#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/freebsd-uthread.c#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/i386/freebsd-nat.c#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/i386/kvm-fbsd.c#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/i386/nm.h#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/i386/tm.h#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/i386/version.c#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdb5/i386/xm.h#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdbreplay/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdbreplay5/Makefile#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdbserver5/Makefile#2 delete .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/gdbserver5/low-fbsd.c#2 delete .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/alpha/lockdflt.c#2 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/i386/lockdflt.c#3 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/ia64/lockdflt.c#2 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.1#4 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/sparc64/lockdflt.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/mac/contrib/binutils/bfd/ChangeLog#6 (text+ko) ==== @@ -1,3 +1,311 @@ +2002-05-14 Daniel Jacobowitz + + * configure.in: Set is_release=y for 2.12.1 release. + * configure: Likewise. + +2002-05-13 David Edelsohn + + * configure.in: Auto-configure HAVE_ST_C_IMPL. + * configure: Regenerate. + * config.in: Regenerate. + * rs6000-core.c (CNEW_IMPL): Guard use of c_impl with HAVE_ST_C_IMPL + or AIX_5_CORE. + +2002-05-11 Daniel Jacobowitz + + Merge from mainline (to elf32-mips.c): + 2002-05-03 H.J. Lu (hjl@gnu.org) + + * elfxx-mips.c (mips_elf_link_hash_entry): Add forced_local. + (mips_elf_link_hash_newfunc): Initialize forced_local to false. + (mips_elf_record_global_got_symbol): Call _bfd_mips_elf_hide_symbol + to hide a global symbol. + (_bfd_mips_elf_hide_symbol): Return if forced_local is true. Set + forced_local to true. + +2002-05-11 Ralf Corsepius + Daniel Jacobowitz + + * coff-sh.c (sh_reloc_map): Map to R_SH_IMM32 for non-PE. Don't + map BFD_RELOC_RVA. + +2002-05-09 Alan Modra + + * elf64-ppc.c (RA_REGISTER_MASK, RA_REGISTER_SHIFT): Delete. + + Merge from mainline + 2002-05-08 Alan Modra + * elf32-ppc.c (ppc_elf_create_got): New function. + (ppc_elf_create_dynamic_sections): Call ppc_elf_create_got before + _bfd_elf_create_dynamic_sections. Correct .plt flags. + (ppc_elf_check_relocs): Use ppc_elf_create_got in place of + _bfd_elf_create_got_section. + + 2002-05-07 Alan Modra + * elf-bfd.h (struct elf_backend_data): Add rela_normal. + * elfxx-target.h (elf_backend_rela_normal): Define. + (elfNN_bed): Init rela_normal. + * elflink.h (elf_link_input_bfd ): Handle adjustment + for section symbols here if rela_normal. Simplify abs section test. + * elf-m10200.c (mn10200_elf_relocate_section): If relocatable, + return immediately. Remove code handling relocatable linking. + * elf-m10300.c (mn10300_elf_relocate_section): Likewise. + * elf32-fr30.c (fr30_elf_relocate_section): Likewise. + * elf32-i370.c (i370_elf_relocate_section): Likewise. + * elf32-i860.c (elf32_i860_relocate_section): Likewise. + * elf32-m68k.c (elf_m68k_relocate_section): Likewise. + * elf32-mcore.c (mcore_elf_relocate_section): Likewise. + * elf32-openrisc.c (openrisc_elf_relocate_section): Likewise. + * elf32-ppc.c (ppc_elf_relocate_section): Likewise. + * elf32-s390.c (elf_s390_relocate_section): Likewise. + * elf32-xstormy16.c (xstormy16_elf_relocate_section): Likewise. + * elf64-ppc.c (ppc64_elf_relocate_section): Likewise. + * elf64-s390.c (elf_s390_relocate_section): Likewise. + * elf64-x86-64.c (elf64_x86_64_relocate_section): Likewise. + * elfxx-ia64.c (elfNN_ia64_relocate_section): Likewise. + * elf32-arm.h (elf32_arm_relocate_section): Likewise #ifndef USE_REL. + * elf32-m32r.c (m32r_elf_relocate_section): Likewise. + * elf-m10200.c (elf_backend_rela_normal): Define. + * elf-m10300.c (elf_backend_rela_normal): Define. + * elf32-fr30.c (elf_backend_rela_normal): Define. + * elf32-i370.c (elf_backend_rela_normal): Define. + * elf32-i860.c (elf_backend_rela_normal): Define. + * elf32-m68k.c (elf_backend_rela_normal): Define. + * elf32-mcore.c (elf_backend_rela_normal): Define. + * elf32-openrisc.c (elf_backend_rela_normal): Define. + * elf32-ppc.c (elf_backend_rela_normal): Define. + * elf32-s390.c (elf_backend_rela_normal): Define. + * elf32-xstormy16.c (elf_backend_rela_normal): Define. + * elf64-ppc.c (elf_backend_rela_normal): Define. + * elf64-s390.c (elf_backend_rela_normal): Define. + * elf64-x86-64.c (elf_backend_rela_normal): Define. + * elfxx-ia64.c (elf_backend_rela_normal): Define. + * elf32-arm.h (elf_backend_rela_normal): Define #ifndef USE_REL. + * elf32-m32r.c (elf_backend_rela_normal): Likewise. + + 2002-05-06 Alan Modra + * elflink.h (elf_link_input_bfd ): Adjust r_offset + when not relocatable. Fix reloc_emitter call for K&R. + + 2002-05-04 Alan Modra + * dwarf2.c (struct line_head): Make prologue_length a bfd_vma. + (read_abbrevs): Change "offset" param to bfd_vma. + (parse_comp_unit): Change "version" and addr_size to unsigned ints. + Change "abbrev_offset" to bfd_vma. + (read_indirect_string): Use correct conversion chars in error + message format string, cast bfd_vma's to unsigned long. + (read_abbrevs): Likewise. + (read_attribute_value): Likewise. + (decode_line_info): Likewise. + (scan_unit_for_functions): Likewise. + (parse_comp_unit): Likewise. + + 2002-05-04 Bob Byrnes + * opncls.c (_bfd_new_bfd_contained_in): Check return value of + _bfd_new_bfd. + + 2002-05-02 Alan Modra + * elf64-ppc.c (ppc64_elf_howto_raw ): Change to a + 16 bit reloc. + : Likewise. + (ppc64_elf_reloc_type_lookup): Map from BFD_RELOC_16_BASEREL to + SECTOFF reloc. + * elf32-ppc.c (ppc_elf_howto_raw ): Correct. + (ppc_elf_reloc_type_lookup): Map from BFD_RELOC_16_BASEREL to + SECTOFF reloc. + * elf64-ppc.c (ppc64_elf_addr16_ha_reloc): Delete. + (ppc64_elf_ha_reloc): New function. + (ppc64_elf_brtaken_reloc): New function. + (ppc64_elf_sectoff_reloc): New function. + (ppc64_elf_sectoff_ha_reloc): New function. + (ppc64_elf_toc_reloc): New function. + (ppc64_elf_toc_ha_reloc): New function. + (ppc64_elf_toc64_reloc): New function. + (ppc64_elf_unhandled_reloc): New function. + (ppc64_elf_howto_raw): Use the above. + : Mark pc_relative, pcrel_offset. + : Not pc_relative or pcrel_offset. Fix dst_mask. + : Likewise. + (IS_ABSOLUTE_RELOC): Update. + (struct ppc_link_hash_table): Add have_undefweak. + (ppc64_elf_link_hash_table_create): Init. + (func_desc_adjust): Set have_undefweak. + (ppc64_elf_func_desc_adjust): Call func_desc_adjust earlier. Only + add the .sfpr blr when have_undefweak. + (ppc64_elf_set_toc): Rename to ppc64_elf_toc, remove info param + and relocatable test. Return TOCstart and don't set elf_gp. + (ppc64_elf_relocate_section): Correct BRTAKEN/BRNTAKEN branch + offset calculation. Add assert on weak sym branch tweaks. + * elf64-ppc.h (ppc64_elf_set_toc): Delete. + (ppc64_elf_toc): Declare. + + 2002-05-01 Alan Modra + * syms.c (_bfd_stab_section_find_nearest_line): Don't bomb on NULL + file_name. + + 2002-05-01 Alan Modra + * elf64-ppc.c (CROR_151515, CROR_313131): Define. + (ppc64_elf_relocate_section): Use them. Don't look for plt calls + on R_PPC64_ADDR24 relocs. Require a nop or no link reg on plt + call branches. Correct undefined weak destination. + (ppc64_elf_func_desc_adjust): Always create at least one blr in + .sfpr, and correct case where either only savef* or restf* is + needed. + + 2002-04-09 DJ Delorie + * elfarm-nabi.c (elf32_arm_howto_table): Fix ABS16 masks. + +2002-05-06 Nick Clifton + + * elf32-arm.h (elf32_arm_final_link_relocate): Convert + 'reloc_signed_max' and 'reloc_signed_min' into half-word offsets. + +2002-05-02 Richard Henderson + + * elf64-alpha.c (elf64_alpha_relocate_section): Force relative relocs + vs SHN_UNDEF to zero. + +2002-04-27 Alan Modra + + Merge from mainline + 2002-04-12 Alan Modra + * elf.c (prep_headers): Don't zero EI_OSABI, EI_ABIVERSION or + header pad. + + 2002-02-21 Andreas Jaeger + * elf64-x86-64.c: Major rework that introduces all recent changes + to the x86-64 backend. Get a closer match to elf32-i386. + (struct elf64_x86_64_dyn_relocs): Rename from + elf64_x86_64_pcrel_relocs_copied, add additional fields. Change + all users. + (struct elf64_x86_64_link_hash_table): Add short cuts to some + sections. + (link_hash_newfunc): Rename from elf64_x86_64_link_hash_newfunc, + remove casts, initialize new hash members. + (create_got_section): New. + (elf64_x86_64_create_dynamic_sections): New. + (elf64_x86_64_copy_indirect_symbol): New. + (elf64_x86_64_check_relocs): Don't allocate space for dynamic + relocs, .got or .relgot here but do it in allocate_dynrelocs. + Reference count possible .plt and .got entries. Don't test input + section SEC_READONLY here to try to avoid copy relocs, and keep + dyn_relocs regardless of ELF_LINK_NON_GOT_REF. Don't set + DF_TEXTREL here. Delay setting of variables until needed. Cache + pointer to "sreloc" section in elf_section_data. Tweak condition + under which .got created. Report files with bad relocation + section names. + (elf64_x86_64_gc_sweep_hook): Sweep dyn_relocs and local_dynrel. + Reference count possible .plt entries. Don't deallocate .got and + .relgot space here. + (elf64_x86_64_adjust_dynamic_symbol): Handle nocopyreloc. Don't + do copy reloc processing for weakdefs. Remove redundant casts and + aborts. Delay setting of vars until needed. Move creation of + dynamic symbols and allocation of .plt and .rela.plt to + allocate_dynrelocs. Replace BFD_ASSERT with abort. + (WILL_CALL_FINISH_DYNAMIC_SYMBOL): New. + (allocate_dynrelocs): New. + (readonly_dynrelocs): New. + (elf64_x86_64_size_dynamic_sections): Call readonly_dynrelocs. + Allocate space for dyn relocs. Replace BFD_ASSERT with abort. + Zero out the dynamic allocated content space. + (elf64_x86_64_discard_copies): Removed. + (elf64_x86_64_relocate_section): Make use of dynamic section + short-cuts. Localise vars, and delay setting. Better error + reporting, replace BFD_ASSERT with abort. Check + ELF_LINK_HASH_DEF_DYNAMIC to see if a symbol is not defined in the + regular object file and tread the weak definition as the normal + one. Don't discard relocs for undefweak or undefined symbols and + check !DEF_REGULAR as well as DEF_DYNAMIC in test for avoided copy + relocs. + (elf64_x86_64_finish_dynamic_symbol): Don't copy relocs for + symbols that have been forced local. Use same test to decide if + we can use a relative reloc for got as relocate_section. Expand + SHN_UNDEF comment. Move expressions out of function calls. + Replace BFD_ASSERT with abort. + (bfd_elf64_bfd_final_link): Removed. + (elf_backend_copy_indirect_symbol): Define. + + * reloc.c: Move sh relocs to where they belong. + * libbfd.h, bfd-in2.h: Regenerate. + + Merge from mainline + 2002-04-26 Alan Modra + * opncls.c (bfd_make_readable): Call bfd_section_list_clear. + * xcofflink.c (xcoff_link_add_dynamic_symbols): Likewise. + * elflink.h (elf_bfd_final_link): Ensure input bfd class is the + same as the output before calling elf_link_input_bfd. + * coffcode.h (coff_compute_section_file_positions): Set + section_tail after shuffling section list. + + 2002-04-23 Alan Modra + * elf32-hppa.c (hppa_type_of_stub): Correct and simplify condition + under which a plt call stub is used. + (final_link_relocate): Similarly. + (allocate_plt_static): Clear h-plabel except when plt entry is + exclusively used for a plabel. + (allocate_dynrelocs): Use the above to simplify plt sizing. + (struct elf32_hppa_link_hash_table): Add has_22bit_branch. + (elf32_hppa_link_hash_table_create): Init. + (BL22_RP): Define. + (hppa_build_one_stub): Use BL22_RP if has_22bit_branch. + (elf32_hppa_check_relocs): Set has_22bit_branch. + * elf32-hppa.c (elf32_hppa_check_relocs): Remove debug message. + (final_link_relocate): Likewise. + + 2002-04-20 Alan Modra + * archures.c (bfd_arch_info): Add comment on list order. + (bfd_default_set_arch_mach): Use bfd_lookup_arch. + * cpu-powerpc.c (bfd_powerpc_archs): Re-order so that the default + is always at head of list. + * bfd-in2.h: Regenerate. + + 2002-04-16 Alan Modra + * elf32-m32r.c (m32r_elf_add_symbol_hook): Check the hash table + type rather than just assuming entries are ELF. + * elf32-sh64.c (sh64_elf_add_symbol_hook): Likewise. + * elf64-sh64.c (sh64_elf64_add_symbol_hook): Likewise. + * elf64-sparc.c (sparc64_elf_add_symbol_hook): Likewise. + * elf64-mmix.c (mmix_elf_add_symbol_hook): Use bfd_link_hash_entry + rather than elf_link_hash_entry. + + 2002-04-15 Alan Modra + * elf32-ppc.c (ppc_elf_add_symbol_hook): Check the hash table type. + + 2002-04-08 Randolph Chung + * elf32-hppa.c (hppa_unwind_entry_compare): Move to elf-hppa.h. + (elf32_hppa_final_link): Split out sorting logic to.. + * elf-hppa.h (elf_hppa_sort_unwind): ..here. + (elf_hppa_final_link): Call elf_hppa_sort_unwind. + +2002-04-26 Richard Smith + Jakub Jelinek + + * elf-eh-frame.c (struct eh_cie_fde): Add per_encoding_relative. + (_bfd_elf_discard_section_eh_frame): Set it for CIEs with pcrel + encoded personality. + (_bfd_elf_write_section_eh_frame): Adjust pcrel encoded personality + for CIE/FDE removal. + +2002-04-26 Jakub Jelinek + + * elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Don't build + search table if some FDE is DW_EH_PE_aligned encoded either. + (_bfd_elf_write_section_eh_frame): Handle terminating FDE specially. + +2002-04-18 Nick Clifton + + * coff-arm.c (coff_thumb_pcrel_12, coff_thumb_pcrel_9, + insert_thumb_branch, record_thumb_to_arm_glue): Suppress + definition of these functions for ARM_WINCE builds as they are + not used. + (SWAP_IN_RELOC_OFFSET, SWAP_OUT_RELOC_OFFSET): Do not define + for ARM_WINCE builds. + +2002-04-16 Nick Clifton + + * ihex.c (ihex_write_object_contents): Fix check for records + crossing 64K boundaries. + 2002-04-06 Hans-Peter Nilsson * elf32-cris.c (cris_elf_howto_table) >. *} . boolean the_default; . const struct bfd_arch_info * (*compatible) . PARAMS ((const struct bfd_arch_info *a, @@ -604,21 +606,9 @@ enum bfd_architecture arch; unsigned long mach; { - const bfd_arch_info_type * const *app, *ap; - - for (app = bfd_archures_list; *app != NULL; app++) - { - for (ap = *app; ap != NULL; ap = ap->next) - { - if (ap->arch == arch - && (ap->mach == mach - || (mach == 0 && ap->the_default))) - { - abfd->arch_info = ap; - return true; - } - } - } + abfd->arch_info = bfd_lookup_arch (arch, mach); + if (abfd->arch_info != NULL) + return true; abfd->arch_info = &bfd_default_arch_struct; bfd_set_error (bfd_error_bad_value); ==== //depot/projects/trustedbsd/mac/contrib/binutils/bfd/bfd-in2.h#5 (text+ko) ==== @@ -1657,7 +1657,9 @@ const char *arch_name; const char *printable_name; unsigned int section_align_power; - /* True if this is the default machine for the architecture. */ + /* True if this is the default machine for the architecture. + The default arch should be the first entry for an arch so that + all the entries for that arch can be accessed via <>. */ boolean the_default; const struct bfd_arch_info * (*compatible) PARAMS ((const struct bfd_arch_info *a, @@ -2194,55 +2196,6 @@ BFD_RELOC_MIPS_REL16, BFD_RELOC_MIPS_RELGOT, BFD_RELOC_MIPS_JALR, - BFD_RELOC_SH_GOT_LOW16, - BFD_RELOC_SH_GOT_MEDLOW16, - BFD_RELOC_SH_GOT_MEDHI16, - BFD_RELOC_SH_GOT_HI16, - BFD_RELOC_SH_GOTPLT_LOW16, - BFD_RELOC_SH_GOTPLT_MEDLOW16, - BFD_RELOC_SH_GOTPLT_MEDHI16, - BFD_RELOC_SH_GOTPLT_HI16, - BFD_RELOC_SH_PLT_LOW16, - BFD_RELOC_SH_PLT_MEDLOW16, - BFD_RELOC_SH_PLT_MEDHI16, - BFD_RELOC_SH_PLT_HI16, - BFD_RELOC_SH_GOTOFF_LOW16, - BFD_RELOC_SH_GOTOFF_MEDLOW16, - BFD_RELOC_SH_GOTOFF_MEDHI16, - BFD_RELOC_SH_GOTOFF_HI16, - BFD_RELOC_SH_GOTPC_LOW16, - BFD_RELOC_SH_GOTPC_MEDLOW16, - BFD_RELOC_SH_GOTPC_MEDHI16, - BFD_RELOC_SH_GOTPC_HI16, - BFD_RELOC_SH_COPY64, - BFD_RELOC_SH_GLOB_DAT64, - BFD_RELOC_SH_JMP_SLOT64, - BFD_RELOC_SH_RELATIVE64, - BFD_RELOC_SH_GOT10BY4, - BFD_RELOC_SH_GOT10BY8, - BFD_RELOC_SH_GOTPLT10BY4, - BFD_RELOC_SH_GOTPLT10BY8, - BFD_RELOC_SH_GOTPLT32, - BFD_RELOC_SH_SHMEDIA_CODE, - BFD_RELOC_SH_IMMU5, - BFD_RELOC_SH_IMMS6, - BFD_RELOC_SH_IMMS6BY32, - BFD_RELOC_SH_IMMU6, - BFD_RELOC_SH_IMMS10, - BFD_RELOC_SH_IMMS10BY2, - BFD_RELOC_SH_IMMS10BY4, - BFD_RELOC_SH_IMMS10BY8, - BFD_RELOC_SH_IMMS16, - BFD_RELOC_SH_IMMU16, - BFD_RELOC_SH_IMM_LOW16, - BFD_RELOC_SH_IMM_LOW16_PCREL, - BFD_RELOC_SH_IMM_MEDLOW16, - BFD_RELOC_SH_IMM_MEDLOW16_PCREL, - BFD_RELOC_SH_IMM_MEDHI16, - BFD_RELOC_SH_IMM_MEDHI16_PCREL, - BFD_RELOC_SH_IMM_HI16, - BFD_RELOC_SH_IMM_HI16_PCREL, - BFD_RELOC_SH_PT_16, /* i386/elf relocations */ @@ -2423,6 +2376,55 @@ BFD_RELOC_SH_JMP_SLOT, BFD_RELOC_SH_RELATIVE, BFD_RELOC_SH_GOTPC, + BFD_RELOC_SH_GOT_LOW16, + BFD_RELOC_SH_GOT_MEDLOW16, + BFD_RELOC_SH_GOT_MEDHI16, + BFD_RELOC_SH_GOT_HI16, + BFD_RELOC_SH_GOTPLT_LOW16, + BFD_RELOC_SH_GOTPLT_MEDLOW16, + BFD_RELOC_SH_GOTPLT_MEDHI16, + BFD_RELOC_SH_GOTPLT_HI16, + BFD_RELOC_SH_PLT_LOW16, + BFD_RELOC_SH_PLT_MEDLOW16, + BFD_RELOC_SH_PLT_MEDHI16, + BFD_RELOC_SH_PLT_HI16, + BFD_RELOC_SH_GOTOFF_LOW16, + BFD_RELOC_SH_GOTOFF_MEDLOW16, + BFD_RELOC_SH_GOTOFF_MEDHI16, + BFD_RELOC_SH_GOTOFF_HI16, + BFD_RELOC_SH_GOTPC_LOW16, + BFD_RELOC_SH_GOTPC_MEDLOW16, + BFD_RELOC_SH_GOTPC_MEDHI16, + BFD_RELOC_SH_GOTPC_HI16, + BFD_RELOC_SH_COPY64, + BFD_RELOC_SH_GLOB_DAT64, + BFD_RELOC_SH_JMP_SLOT64, + BFD_RELOC_SH_RELATIVE64, + BFD_RELOC_SH_GOT10BY4, + BFD_RELOC_SH_GOT10BY8, + BFD_RELOC_SH_GOTPLT10BY4, + BFD_RELOC_SH_GOTPLT10BY8, + BFD_RELOC_SH_GOTPLT32, + BFD_RELOC_SH_SHMEDIA_CODE, + BFD_RELOC_SH_IMMU5, + BFD_RELOC_SH_IMMS6, + BFD_RELOC_SH_IMMS6BY32, + BFD_RELOC_SH_IMMU6, + BFD_RELOC_SH_IMMS10, + BFD_RELOC_SH_IMMS10BY2, + BFD_RELOC_SH_IMMS10BY4, + BFD_RELOC_SH_IMMS10BY8, + BFD_RELOC_SH_IMMS16, + BFD_RELOC_SH_IMMU16, + BFD_RELOC_SH_IMM_LOW16, + BFD_RELOC_SH_IMM_LOW16_PCREL, + BFD_RELOC_SH_IMM_MEDLOW16, + BFD_RELOC_SH_IMM_MEDLOW16_PCREL, + BFD_RELOC_SH_IMM_MEDHI16, + BFD_RELOC_SH_IMM_MEDHI16_PCREL, + BFD_RELOC_SH_IMM_HI16, + BFD_RELOC_SH_IMM_HI16_PCREL, + BFD_RELOC_SH_PT_16, /* Thumb 23-, 12- and 9-bit pc-relative branches. The lowest bit must be zero and is not stored in the instruction. */ ==== //depot/projects/trustedbsd/mac/contrib/binutils/bfd/coff-arm.c#5 (text+ko) ==== @@ -87,12 +87,16 @@ PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); static bfd_reloc_status_type aoutarm_fix_pcrel_26 PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); +#ifndef ARM_WINCE static bfd_reloc_status_type coff_thumb_pcrel_23 PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); +static bfd_reloc_status_type coff_thumb_pcrel_9 + PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); +static insn32 insert_thumb_branch + PARAMS ((insn32, int)); +#endif static bfd_reloc_status_type coff_thumb_pcrel_12 PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); -static bfd_reloc_status_type coff_thumb_pcrel_9 - PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); static bfd_reloc_status_type coff_arm_reloc PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **)); static boolean coff_arm_adjust_symndx @@ -109,8 +113,6 @@ PARAMS ((bfd *, bfd_reloc_code_real_type)); static struct bfd_link_hash_table * coff_arm_link_hash_table_create PARAMS ((bfd *)); -static insn32 insert_thumb_branch - PARAMS ((insn32, int)); static struct coff_link_hash_entry * find_thumb_glue PARAMS ((struct bfd_link_info *, const char *, bfd *)); static struct coff_link_hash_entry * find_arm_glue @@ -118,9 +120,11 @@ #ifndef COFF_IMAGE_WITH_PE static void record_arm_to_thumb_glue PARAMS ((struct bfd_link_info *, struct coff_link_hash_entry *)); +#ifndef ARM_WINCE static void record_thumb_to_arm_glue PARAMS ((struct bfd_link_info *, struct coff_link_hash_entry *)); #endif +#endif static boolean coff_arm_merge_private_bfd_data PARAMS ((bfd *, bfd *)); static boolean coff_arm_print_private_bfd_data @@ -801,6 +805,7 @@ return flag; } +#ifndef ARM_WINCE static bfd_reloc_status_type coff_thumb_pcrel_23 (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message) @@ -818,7 +823,7 @@ } static bfd_reloc_status_type -coff_thumb_pcrel_12 (abfd, reloc_entry, symbol, data, input_section, +coff_thumb_pcrel_9 (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message) bfd *abfd; arelent *reloc_entry; @@ -830,11 +835,12 @@ { return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message, - b12); + b9); } +#endif /* not ARM_WINCE */ static bfd_reloc_status_type -coff_thumb_pcrel_9 (abfd, reloc_entry, symbol, data, input_section, +coff_thumb_pcrel_12 (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message) bfd *abfd; arelent *reloc_entry; @@ -846,7 +852,7 @@ { return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message, - b9); + b12); } static const struct reloc_howto_struct * @@ -900,10 +906,12 @@ #define BADMAG(x) ARMBADMAG(x) #define ARM 1 /* Customize coffcode.h */ +#ifndef ARM_WINCE /* Make sure that the 'r_offset' field is copied properly so that identical binaries will compare the same. */ #define SWAP_IN_RELOC_OFFSET H_GET_32 #define SWAP_OUT_RELOC_OFFSET H_PUT_32 +#endif /* Extend the coff_link_hash_table structure with a few ARM specific fields. This allows us to store global data here without actually creating any @@ -975,6 +983,7 @@ } +#ifndef ARM_WINCE /* The thumb form of a long branch is a bit finicky, because the offset encoding is split over two fields, each in it's own instruction. They can occur in any order. So given a thumb form of long branch, and an @@ -1031,6 +1040,7 @@ return br_insn; } + static struct coff_link_hash_entry * find_thumb_glue (info, name, input_bfd) @@ -1060,6 +1070,7 @@ return myh; } +#endif /* not ARM_WINCE */ static struct coff_link_hash_entry * find_arm_glue (info, name, input_bfd) @@ -1914,6 +1925,7 @@ return; } +#ifndef ARM_WINCE static void record_thumb_to_arm_glue (info, h) struct bfd_link_info * info; @@ -1987,6 +1999,7 @@ return; } +#endif /* not ARM_WINCE */ /* Select a BFD to be used to hold the sections used by the glue code. This function is called from the linker scripts in ld/emultempl/ ==== //depot/projects/trustedbsd/mac/contrib/binutils/bfd/coffcode.h#5 (text+ko) ==== @@ -3014,6 +3014,7 @@ else current->target_index = target_index++; } + abfd->section_tail = ¤t->next; free (section_list); } ==== //depot/projects/trustedbsd/mac/contrib/binutils/bfd/config.in#3 (text+ko) ==== @@ -214,6 +214,9 @@ /* Define if getenv is not declared in system header files. */ #undef NEED_DECLARATION_GETENV +/* Define if struct core_dumpx has member c_impl */ +#undef HAVE_ST_C_IMPL + /* Define if has prstatus_t. */ #undef HAVE_PRSTATUS_T ==== //depot/projects/trustedbsd/mac/contrib/binutils/bfd/configure#6 (text+ko) ==== @@ -1199,7 +1199,7 @@ # Uncomment the next line to remove the date from the reported bfd version -#is_release=y +is_release=y bfd_version=`echo "${VERSION}" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$/\1\2\3\4\5/'` @@ -5173,6 +5173,32 @@ rs6000-*-aix4.[3-9]* | powerpc-*-aix4.[3-9]*) COREFILE=rs6000-core.lo COREFLAG="$COREFLAG -DAIX_CORE_DUMPX_CORE" + # Not all versions of AIX with -DAIX_CORE_DUMPX_CORE + # have c_impl as a member of struct core_dumpx + echo $ac_n "checking for c_impl in struct core_dumpx""... $ac_c" 1>&6 +echo "configure:5180: checking for c_impl in struct core_dumpx" >&5 + cat > conftest.$ac_ext < +int main() { +struct core_dumpx c; c.c_impl = 0; +; return 0; } +EOF +if { (eval echo configure:5189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cat >> confdefs.h <<\EOF +#define HAVE_ST_C_IMPL 1 +EOF + + echo "$ac_t""yes" 1>&6 +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 +fi +rm -f conftest* ;; rs6000-*-aix4*) COREFILE=rs6000-core.lo ;; rs6000-*-*) COREFILE=rs6000-core.lo ;; @@ -5226,17 +5252,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5230: checking for $ac_hdr" >&5 +echo "configure:5256: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5264,12 +5290,12 @@ if test "$ac_cv_header_sys_procfs_h" = yes; then echo $ac_n "checking for prstatus_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:5268: checking for prstatus_t in sys/procfs.h" >&5 +echo "configure:5294: checking for prstatus_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prstatus_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_prstatus_t=yes else @@ -5300,12 +5326,12 @@ echo "$ac_t""$bfd_cv_have_sys_procfs_type_prstatus_t" 1>&6 echo $ac_n "checking for prstatus32_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:5304: checking for prstatus32_t in sys/procfs.h" >&5 +echo "configure:5330: checking for prstatus32_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prstatus32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_prstatus32_t=yes else @@ -5336,12 +5362,12 @@ echo "$ac_t""$bfd_cv_have_sys_procfs_type_prstatus32_t" 1>&6 echo $ac_n "checking for prstatus_t.pr_who in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:5340: checking for prstatus_t.pr_who in sys/procfs.h" >&5 +echo "configure:5366: checking for prstatus_t.pr_who in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who=yes else @@ -5372,12 +5398,12 @@ echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who" 1>&6 echo $ac_n "checking for prstatus32_t.pr_who in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:5376: checking for prstatus32_t.pr_who in sys/procfs.h" >&5 +echo "configure:5402: checking for prstatus32_t.pr_who in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who=yes else @@ -5408,12 +5434,12 @@ echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_prstatus32_t_pr_who" 1>&6 echo $ac_n "checking for pstatus_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:5412: checking for pstatus_t in sys/procfs.h" >&5 +echo "configure:5438: checking for pstatus_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pstatus_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_have_sys_procfs_type_pstatus_t=yes else @@ -5444,12 +5470,12 @@ echo "$ac_t""$bfd_cv_have_sys_procfs_type_pstatus_t" 1>&6 echo $ac_n "checking for pxstatus_t in sys/procfs.h""... $ac_c" 1>&6 -echo "configure:5448: checking for pxstatus_t in sys/procfs.h" >&5 +echo "configure:5474: checking for pxstatus_t in sys/procfs.h" >&5 if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pxstatus_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 6 22:16:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CE8437B401; Sat, 6 Jul 2002 22:16:14 -0700 (PDT) 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 DD60A37B400 for ; Sat, 6 Jul 2002 22:16:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8717D43E52 for ; Sat, 6 Jul 2002 22:16:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g675GDJU038697 for ; Sat, 6 Jul 2002 22:16:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g675GDMo038694 for perforce@freebsd.org; Sat, 6 Jul 2002 22:16:13 -0700 (PDT) Date: Sat, 6 Jul 2002 22:16:13 -0700 (PDT) Message-Id: <200207070516.g675GDMo038694@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13855 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13855 Change 13855 by rwatson@rwatson_paprika on 2002/07/06 22:15:37 Missing mac_mls_enabled check in socket visibility entry point. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#38 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#38 (text+ko) ==== @@ -1089,6 +1089,9 @@ { struct mac_mls *subj, *obj; + if (!mac_mls_enabled) + return (0); + subj = SLOT(&cred->cr_label); obj = SLOT(socketlabel); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 7 7:12:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3ECDC37B401; Sun, 7 Jul 2002 07:12:13 -0700 (PDT) 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 C19EB37B400 for ; Sun, 7 Jul 2002 07:12:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F41F43E31 for ; Sun, 7 Jul 2002 07:12:12 -0700 (PDT) (envelope-from des@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g67ECBJU048654 for ; Sun, 7 Jul 2002 07:12:12 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g67ECBqT048633 for perforce@freebsd.org; Sun, 7 Jul 2002 07:12:11 -0700 (PDT) Date: Sun, 7 Jul 2002 07:12:11 -0700 (PDT) Message-Id: <200207071412.g67ECBqT048633@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav Subject: PERFORCE change 13865 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13865 Change 13865 by des@des.at.des.thinksec.com on 2002/07/07 07:11:12 Checkpoint commit: add the beginnings of a protocol stack, which currently supports USB slots and ISO7816-3 T=1 devices. You can't actually talk to the device yet though. Sponsored by: DARPA, NAI Labs Affected files ... .. //depot/projects/cryptoki/bin/slots/slots.c#3 edit .. //depot/projects/cryptoki/lib/C_GetSlotInfo.c#7 edit .. //depot/projects/cryptoki/lib/C_GetTokenInfo.c#5 edit .. //depot/projects/cryptoki/lib/Makefile#6 edit .. //depot/projects/cryptoki/lib/_ck_apdu.c#1 add .. //depot/projects/cryptoki/lib/_ck_configure.c#2 edit .. //depot/projects/cryptoki/lib/_ck_crc.c#1 add .. //depot/projects/cryptoki/lib/_ck_hexdump.c#1 add .. //depot/projects/cryptoki/lib/_ck_object.c#1 add .. //depot/projects/cryptoki/lib/_ck_parallel.c#1 add .. //depot/projects/cryptoki/lib/_ck_serial.c#1 add .. //depot/projects/cryptoki/lib/_ck_tpdu_t0.c#1 add .. //depot/projects/cryptoki/lib/_ck_tpdu_t1.c#1 add .. //depot/projects/cryptoki/lib/_ck_ugen.c#1 add .. //depot/projects/cryptoki/lib/_ck_usb.c#1 add .. //depot/projects/cryptoki/lib/cryptoki_impl.h#4 edit Differences ... ==== //depot/projects/cryptoki/bin/slots/slots.c#3 (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/cryptoki/bin/slots/slots.c#2 $ + * $P4: //depot/projects/cryptoki/bin/slots/slots.c#3 $ */ #include @@ -80,7 +80,7 @@ printf(" (unrecognized token)"); return; default: - errx(1, "C_GetTokenInfo(%lu): 0x%x", ulSlotID, rv); + errx(1, "C_GetTokenInfo(%lu): 0x%lx", ulSlotID, rv); } TERMINATE(TokenInfo.label); TERMINATE(TokenInfo.manufacturerID); @@ -144,7 +144,7 @@ rv = C_GetSlotInfo(ulSlotID, &SlotInfo); if (rv != CKR_OK) - errx(1, "C_GetSlotInfo(%lu): 0x%x", ulSlotID, rv); + errx(1, "C_GetSlotInfo(%lu): 0x%lx", ulSlotID, rv); TERMINATE(SlotInfo.slotDescription); TERMINATE(SlotInfo.manufacturerID); if (v_flag) { @@ -191,7 +191,7 @@ if (ulCount == 0 || pSlotList != NULL_PTR) break; } else if (rv != CKR_BUFFER_TOO_SMALL) { - errx(1, "C_GetSlotList(): 0x%x", rv); + errx(1, "C_GetSlotList(): 0x%lx", rv); } tmp = realloc(pSlotList, ulCount * sizeof *pSlotList); if (tmp == NULL) @@ -240,7 +240,7 @@ rv = C_Initialize(NULL_PTR); if (rv != CKR_OK) - err(1, "C_Initialize(): %d", rv); + err(1, "C_Initialize(): %lx", rv); slots(); C_Finalize(NULL_PTR); exit(0); ==== //depot/projects/cryptoki/lib/C_GetSlotInfo.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/cryptoki/lib/C_GetSlotInfo.c#6 $ + * $P4: //depot/projects/cryptoki/lib/C_GetSlotInfo.c#7 $ */ #include @@ -42,22 +42,15 @@ C_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo) { + _ck_slot_ptr slot; + int ret; if (!_ck_Initialized) return (CKR_CRYPTOKI_NOT_INITIALIZED); if (pInfo == NULL_PTR || slotID > _ck_NumSlots) return (CKR_ARGUMENTS_BAD); + slot = &_ck_Slots[slotID]; memset(pInfo, 0, sizeof *pInfo); - memset(pInfo->slotDescription, ' ', sizeof pInfo->slotDescription); - strncpy(pInfo->slotDescription, _ck_Slots[slotID].cks_dev, - strlen(_ck_Slots[slotID].cks_dev)); - memset(pInfo->manufacturerID, ' ', sizeof pInfo->manufacturerID); - switch (_ck_Slots[slotID].cks_type) { - case serial: - case parallel: - case ugen: - pInfo->flags |= CKF_HW_SLOT; - break; - } - return (CKR_OK); + ret = _ck_call(sinfo, slot->cks_stack, pInfo); + return (ret == 0 ? CKR_OK : CKR_GENERAL_ERROR /* XXX */); } ==== //depot/projects/cryptoki/lib/C_GetTokenInfo.c#5 (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/cryptoki/lib/C_GetTokenInfo.c#4 $ + * $P4: //depot/projects/cryptoki/lib/C_GetTokenInfo.c#5 $ */ #include "cryptoki_impl.h" @@ -46,5 +46,5 @@ if (pInfo == NULL_PTR || slotID > _ck_NumSlots) return (CKR_ARGUMENTS_BAD); - return (CKR_OK); + return (CKR_TOKEN_NOT_PRESENT); } ==== //depot/projects/cryptoki/lib/Makefile#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/cryptoki/lib/Makefile#5 $ +# $P4: //depot/projects/cryptoki/lib/Makefile#6 $ # LIB = cryptoki @@ -111,9 +111,16 @@ SRCS += C_WaitForSlotEvent.c SRCS += C_WrapKey.c SRCS += _ck_configure.c +SRCS += _ck_crc.c SRCS += _ck_global.c +SRCS += _ck_hexdump.c +SRCS += _ck_parallel.c +SRCS += _ck_serial.c SRCS += _ck_session_delete.c SRCS += _ck_session_find.c SRCS += _ck_session_new.c +SRCS += _ck_tpdu_t0.c +SRCS += _ck_tpdu_t1.c +SRCS += _ck_ugen.c .include ==== //depot/projects/cryptoki/lib/_ck_configure.c#2 (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/cryptoki/lib/_ck_configure.c#1 $ + * $P4: //depot/projects/cryptoki/lib/_ck_configure.c#2 $ */ #include @@ -56,7 +56,7 @@ _ck_slot_ptr slot, tmp; const char **cfn, *line, *p, *q; size_t len, size; - int lineno, plen; + int lineno, plen, ret; FILE *f; if (_ck_Slots != NULL) { @@ -98,7 +98,7 @@ for (p = q = line; q < line + len; ++q) if (isspace(*q)) break; -#if 0 +#if 1 warnx("%s:%d: device '%.*s'", *cfn, lineno, (int)(q - p), p); warnx("slots %p, slot %lu = %p", _ck_Slots, _ck_NumSlots, slot); #endif @@ -115,15 +115,20 @@ for (p = q; q < line + len; ++q) if (isspace(*q)) break; + slot->cks_stack = calloc(1, sizeof *slot->cks_stack); if (strncmp(p, "serial", q - p) == 0) { slot->cks_type = serial; + slot->cks_stack->cks_layer = &_ck_serial; } else if (strncmp(p, "parallel", q - p) == 0) { slot->cks_type = parallel; + slot->cks_stack->cks_layer = &_ck_parallel; } else if (strncmp(p, "ugen", q - p) == 0) { slot->cks_type = ugen; + slot->cks_stack->cks_layer = &_ck_ugen; } else { warnx("%s:%d: unknown device type '%.*s'", *cfn, lineno, (int)(q - p), p); + free(slot->cks_stack); continue; } @@ -147,6 +152,15 @@ continue; } + /* open the device */ + ret = _ck_call(open, slot->cks_stack, slot->cks_dev, 0); + if (ret != 0) { + warnx("%s:%d: failed to open device '%s': 0x%x", + *cfn, lineno, slot->cks_dev, ret); + free(slot->cks_stack); + continue; + } + ++_ck_NumSlots; } fclose(f); ==== //depot/projects/cryptoki/lib/cryptoki_impl.h#4 (text+ko) ==== @@ -31,45 +31,73 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/cryptoki_impl.h#3 $ + * $P4: //depot/projects/cryptoki/lib/cryptoki_impl.h#4 $ */ #ifndef _CRYPTOKI_IMPL_H_INCLUDED #define _CRYPTOKI_IMPL_H_INCLUDED #include +#include + +/* + * Types + */ +typedef struct _ck_stack _ck_stack; +typedef _ck_stack *_ck_stack_ptr; +typedef struct _ck_layer _ck_layer; +typedef _ck_layer *_ck_layer_ptr; +typedef int (*_ck_open)(_ck_stack_ptr, const char *, int); +typedef int (*_ck_close)(_ck_stack_ptr, int); +typedef int (*_ck_sinfo)(_ck_stack_ptr, CK_SLOT_INFO_PTR); +typedef int (*_ck_tinfo)(_ck_stack_ptr, CK_TOKEN_INFO_PTR); +typedef int (*_ck_xfer)(_ck_stack_ptr, unsigned char *, int *); -extern CK_BBOOL _ck_Initialized; -extern CK_CREATEMUTEX _ck_CreateMutex; -extern CK_DESTROYMUTEX _ck_DestroyMutex; -extern CK_LOCKMUTEX _ck_LockMutex; -extern CK_UNLOCKMUTEX _ck_UnlockMutex; +struct _ck_stack { + _ck_layer_ptr cks_layer; + void *cks_param; + + _ck_stack_ptr cks_down; + _ck_stack_ptr cks_up; +}; -extern CK_INFO _ck_Info; +struct _ck_layer { + const char *ckl_name; + const char *ckl_desc; + _ck_open ckl_open; + _ck_close ckl_close; + _ck_sinfo ckl_sinfo; + _ck_tinfo ckl_tinfo; + _ck_xfer ckl_send; + _ck_xfer ckl_recv; +}; -extern CK_FUNCTION_LIST _ck_FunctionList; +#define _ck_call(func, stack, ...) \ + ((*stack->cks_layer->ckl_##func)(stack, __VA_ARGS__)) +#define _ck_call_down(func, stack, ...) \ + _ck_call(func, stack->cks_down, __VA_ARGS__) +#define _ck_call_up(func, stack, ...) \ + _ck_call(func, stack->cks_up, __VA_ARGS__) typedef struct _ck_slot _ck_slot; typedef _ck_slot *_ck_slot_ptr; struct _ck_slot { - CK_ULONG cks_id; - char cks_dev[64]; + CK_ULONG cks_id; + char cks_dev[64]; enum { serial, parallel, ugen, - } cks_type; + } cks_type; enum { autodetect, tzero, tone, apdu, - } cks_protocol; + } cks_protocol; + _ck_stack_ptr cks_stack; }; -extern CK_ULONG _ck_NumSlots; -extern _ck_slot_ptr _ck_Slots; - typedef struct _ck_session _ck_session; typedef _ck_session *_ck_session_ptr; struct _ck_session { @@ -79,13 +107,40 @@ _ck_session_ptr cks_next; }; +/* + * Global variables + */ +extern CK_BBOOL _ck_Initialized; +extern CK_CREATEMUTEX _ck_CreateMutex; +extern CK_DESTROYMUTEX _ck_DestroyMutex; +extern CK_LOCKMUTEX _ck_LockMutex; +extern CK_UNLOCKMUTEX _ck_UnlockMutex; + +extern CK_INFO _ck_Info; + +extern CK_FUNCTION_LIST _ck_FunctionList; + +extern CK_ULONG _ck_NumSlots; +extern _ck_slot_ptr _ck_Slots; + extern CK_ULONG _ck_NextSession; extern _ck_session_ptr _ck_Sessions; +extern _ck_layer _ck_parallel; +extern _ck_layer _ck_serial; +extern _ck_layer _ck_tpdu_t0; +extern _ck_layer _ck_tpdu_t1; +extern _ck_layer _ck_ugen; +/* + * Functions + */ int _ck_configure(void); _ck_session_ptr _ck_session_new(CK_SLOT_ID, CK_STATE, CK_FLAGS); int _ck_session_delete(CK_SESSION_HANDLE); _ck_session_ptr _ck_session_find(CK_SESSION_HANDLE); +uint16_t _ck_crc(uint16_t, uint8_t *, int); +void _ck_hexdump(uint8_t *, int, int); + #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 7 9: 0:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0396337B407; Sun, 7 Jul 2002 09:00:25 -0700 (PDT) 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 53D5737B406 for ; Sun, 7 Jul 2002 09:00:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 121CC43E4A for ; Sun, 7 Jul 2002 09:00:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g67G0NJU063154 for ; Sun, 7 Jul 2002 09:00:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g67G0Nj3063151 for perforce@freebsd.org; Sun, 7 Jul 2002 09:00:23 -0700 (PDT) Date: Sun, 7 Jul 2002 09:00:23 -0700 (PDT) Message-Id: <200207071600.g67G0Nj3063151@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13866 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13866 Change 13866 by rwatson@rwatson_paprika on 2002/07/07 08:59:26 Apparently whoever decided to stick SAVENAME into the namei() arguments all over vfs_syscalls.c forgot that SAVENAME wasn't an operation, it's a flag, resulting in a panic on calls to mkfifo(). Someone remind me why we've added SAVENAME all over the place anyway, it results in a lot of diffs and I'm not sure we're using it. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#48 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#48 (text+ko) ==== @@ -1977,7 +1977,7 @@ restart: bwillwrite(); - NDINIT(&nd, CREATE | SAVENAME, LOCKPARENT, UIO_USERSPACE, + NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME, UIO_USERSPACE, SCARG(uap, path), td); if ((error = namei(&nd)) != 0) return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 7 10: 9:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3048C37B400; Sun, 7 Jul 2002 10:08:30 -0700 (PDT) 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 3CC2037B400 for ; Sun, 7 Jul 2002 10:08:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EE2743FE7 for ; Sun, 7 Jul 2002 10:01:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g67H1eJU075958 for ; Sun, 7 Jul 2002 10:01:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g67H1eIu075955 for perforce@freebsd.org; Sun, 7 Jul 2002 10:01:40 -0700 (PDT) Date: Sun, 7 Jul 2002 10:01:40 -0700 (PDT) Message-Id: <200207071701.g67H1eIu075955@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13869 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13869 Change 13869 by rwatson@rwatson_paprika on 2002/07/07 10:00:59 Integ recent changes to system makefiles to fix builds for things like gnome and other recent ports changes. Affected files ... .. //depot/projects/trustedbsd/base/share/mk/Makefile#7 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.dep.mk#7 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.doc.mk#5 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.files.mk#2 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.incs.mk#2 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.info.mk#5 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#11 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.links.mk#1 branch .. //depot/projects/trustedbsd/base/share/mk/bsd.nls.mk#5 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.obj.mk#7 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#10 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.subdir.mk#7 integrate Differences ... ==== //depot/projects/trustedbsd/base/share/mk/Makefile#7 (text+ko) ==== @@ -1,11 +1,12 @@ -# $FreeBSD: src/share/mk/Makefile,v 1.39 2002/06/03 14:49:34 ru Exp $ +# $FreeBSD: src/share/mk/Makefile,v 1.40 2002/07/02 12:16:54 ru Exp $ # @(#)Makefile 8.1 (Berkeley) 6/8/93 FILES= bsd.README FILES+= bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.files.mk FILES+= bsd.info.mk bsd.incs.mk bsd.init.mk FILES+= bsd.kern.mk bsd.kmod.mk -FILES+= bsd.lib.mk bsd.libnames.mk bsd.man.mk bsd.nls.mk bsd.obj.mk bsd.own.mk +FILES+= bsd.lib.mk bsd.libnames.mk bsd.links.mk bsd.man.mk bsd.nls.mk +FILES+= bsd.obj.mk bsd.own.mk FILES+= bsd.port.mk bsd.port.post.mk bsd.port.pre.mk bsd.port.subdir.mk FILES+= bsd.prog.mk bsd.subdir.mk bsd.sys.mk FILES+= sys.mk ==== //depot/projects/trustedbsd/base/share/mk/bsd.dep.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.35 2002/05/07 00:15:53 bde Exp $ +# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.36 2002/07/03 12:44:06 ru Exp $ # # The include file handles Makefile dependencies. # @@ -150,3 +150,25 @@ .endif .endif .endif + +.if !target(checkdpadd) && (defined(DPADD) || defined(LDADD)) +checkdpadd: +.if ${OBJFORMAT} != aout + @ldadd=`echo \`for lib in ${DPADD} ; do \ + echo $$lib | sed 's;^/usr/lib/lib\(.*\)\.a;-l\1;' ; \ + done \`` ; \ + ldadd1=`echo ${LDADD}` ; \ + if [ "$$ldadd" != "$$ldadd1" ] ; then \ + echo ${.CURDIR} ; \ + echo "DPADD -> $$ldadd" ; \ + echo "LDADD -> $$ldadd1" ; \ + fi +.else + @dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \ + if [ "$$dpadd" != "${DPADD}" ] ; then \ + echo ${.CURDIR} ; \ + echo "LDADD -> $$dpadd" ; \ + echo "DPADD = ${DPADD}" ; \ + fi +.endif +.endif ==== //depot/projects/trustedbsd/base/share/mk/bsd.doc.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.doc.mk 5.3 (Berkeley) 1/2/91 -# $FreeBSD: src/share/mk/bsd.doc.mk,v 1.52 2002/04/24 13:29:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.doc.mk,v 1.53 2002/07/01 14:51:42 ru Exp $ # # The include file handles installing BSD troff documents. # @@ -110,17 +110,6 @@ ${DFILE} ${DESTDIR}${BINDIR}/${VOLUME} .endif -install: beforeinstall realinstall afterinstall - -.if !target(beforeinstall) -beforeinstall: - -.endif -.if !target(afterinstall) -afterinstall: - -.endif - spell: ${SRCS} (cd ${.CURDIR}; spell ${SRCS} ) | sort | \ comm -23 - ${.CURDIR}/spell.ok > ${DOC}.spell ==== //depot/projects/trustedbsd/base/share/mk/bsd.files.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.files.mk,v 1.1 2002/06/03 14:49:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.files.mk,v 1.2 2002/07/03 12:28:03 ru Exp $ .if !target(____) .error bsd.files.mk cannot be included directly. @@ -66,3 +66,4 @@ .endif !target(installfiles) realinstall: installfiles +.ORDER: beforeinstall installfiles ==== //depot/projects/trustedbsd/base/share/mk/bsd.incs.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.incs.mk,v 1.2 2002/05/15 16:19:54 ru Exp $ +# $FreeBSD: src/share/mk/bsd.incs.mk,v 1.3 2002/07/03 12:28:03 ru Exp $ .if !target(____) .error bsd.incs.mk cannot be included directly. @@ -77,3 +77,4 @@ .endif !target(installincludes) realinstall: installincludes +.ORDER: beforeinstall installincludes ==== //depot/projects/trustedbsd/base/share/mk/bsd.info.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.info.mk,v 1.64 2002/04/24 13:29:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.info.mk,v 1.65 2002/07/06 14:58:20 ru Exp $ # # The include file handles installing GNU (tech)info files. # Texinfo is a documentation system that uses a single source @@ -144,7 +144,7 @@ .for x in ${INFO} INSTALLINFODIRS+= ${x:S/$/-install/} -${x:S/$/-install/}: ${DESTDIR}${INFODIR}/${INFODIRFILE} +${x:S/$/-install/}: ${INSTALLINFO} ${INSTALLINFOFLAGS} \ --defsection=${INFOSECTION} \ --defentry=${INFOENTRY_${x}} \ ==== //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#11 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.129 2002/06/26 08:41:00 jmallett Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.132 2002/07/03 16:22:43 ru Exp $ # .include @@ -13,7 +13,7 @@ .undef INSTALL_PIC_ARCHIVE .else .if ${OBJFORMAT} == elf -.if !defined(SHLIB_NAME) && defined(SHLIB_MAJOR) +.if !defined(SHLIB_NAME) && defined(LIB) && defined(SHLIB_MAJOR) SHLIB_NAME= lib${LIB}.so.${SHLIB_MAJOR} SHLIB_LINK?= lib${LIB}.so .endif @@ -154,19 +154,23 @@ all: objwarn +.if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME) +OBJS+= ${SRCS:N*.h:R:S/$/.o/} +.endif + .if defined(LIB) && !empty(LIB) _LIBS= lib${LIB}.a -OBJS+= ${SRCS:N*.h:R:S/$/.o/} lib${LIB}.a: ${OBJS} ${STATICOBJS} @${ECHO} building static ${LIB} library @rm -f ${.TARGET} @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} ${RANLIB} ${.TARGET} +.endif .if !defined(INTERNALLIB) -.if !defined(NOPROFILE) +.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB) _LIBS+= lib${LIB}_p.a POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po} @@ -177,7 +181,10 @@ ${RANLIB} ${.TARGET} .endif +.if defined(SHLIB_NAME) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) SOBJS+= ${OBJS:.o=.So} +.endif .if defined(SHLIB_NAME) _LIBS+= ${SHLIB_NAME} @@ -199,7 +206,7 @@ .endif .endif -.if defined(INSTALL_PIC_ARCHIVE) +.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) _LIBS+= lib${LIB}_pic.a lib${LIB}_pic.a: ${SOBJS} @@ -209,7 +216,7 @@ ${RANLIB} ${.TARGET} .endif -.if defined(WANT_LINT) +.if defined(WANT_LINT) && defined(LIB) && !empty(LIB) LINTLIB= llib-l${LIB}.ln _LIBS+= ${LINTLIB} LINTOBJS+= ${SRCS:M*.c:.c=.ln} @@ -224,8 +231,6 @@ all: ${_LIBS} -.endif defined(LIB) && !empty(LIB) - .if !defined(NOMAN) all: _manpages .endif @@ -237,20 +242,30 @@ .endif .if defined(LIB) && !empty(LIB) rm -f a.out ${OBJS} ${OBJS:S/$/.tmp/} ${STATICOBJS} +.endif .if !defined(INTERNALLIB) -.if !defined(NOPROFILE) +.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB) rm -f ${POBJS} ${POBJS:S/$/.tmp/} .endif +.if defined(SHLIB_NAME) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) rm -f ${SOBJS} ${SOBJS:.So=.so} ${SOBJS:S/$/.tmp/} +.endif .if defined(SHLIB_NAME) - rm -f ${SHLIB_LINK} lib${LIB}.so.* lib${LIB}.so +.if defined(SHLIB_LINK) + rm -f ${SHLIB_LINK} +.endif +.if defined(LIB) && !empty(LIB) + rm -f lib${LIB}.so.* lib${LIB}.so +.endif .endif -.if defined(WANT_LINT) +.if defined(WANT_LINT) && defined(LIB) && !empty(LIB) rm -f ${LINTOBJS} .endif .endif !defined(INTERNALLIB) +.if defined(_LIBS) && !empty(_LIBS) rm -f ${_LIBS} -.endif defined(LIB) && !empty(LIB) +.endif .if defined(CLEANDIRS) && !empty(CLEANDIRS) rm -rf ${CLEANDIRS} .endif @@ -288,14 +303,15 @@ _SHLINSTALLFLAGS:= ${_SHLINSTALLFLAGS${ie}} .endfor -.if defined(LIB) && !empty(LIB) && !defined(INTERNALLIB) +.if !defined(INTERNALLIB) realinstall: _libinstall +.ORDER: beforeinstall _libinstall _libinstall: -.if !defined(NOINSTALLLIB) +.if defined(LIB) && !empty(LIB) && !defined(NOINSTALLLIB) ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} .endif -.if !defined(NOPROFILE) +.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB) ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} .endif @@ -307,45 +323,23 @@ ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK} .endif .endif -.if defined(INSTALL_PIC_ARCHIVE) +.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR} .endif -.if defined(WANT_LINT) +.if defined(WANT_LINT) && defined(LIB) && !empty(LIB) ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} .endif -.endif defined(LIB) && !empty(LIB) && !defined(INTERNALLIB) +.endif !defined(INTERNALLIB) -realinstall: -.if defined(LINKS) && !empty(LINKS) - @set ${LINKS}; \ - while test $$# -ge 2; do \ - l=${DESTDIR}$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -f $$l $$t; \ - done; true -.endif -.if defined(SYMLINKS) && !empty(SYMLINKS) - @set ${SYMLINKS}; \ - while test $$# -ge 2; do \ - l=$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -fs $$l $$t; \ - done; true -.endif - .include .include +.include .if !defined(NOMAN) realinstall: _maninstall +.ORDER: beforeinstall _maninstall .endif .endif @@ -361,9 +355,13 @@ .include +.if !exists(${.OBJDIR}/${DEPENDFILE}) .if defined(LIB) && !empty(LIB) -.if !exists(${.OBJDIR}/${DEPENDFILE}) -${OBJS} ${STATICOBJS} ${POBJS} ${SOBJS}: ${SRCS:M*.h} +${OBJS} ${STATICOBJS} ${POBJS}: ${SRCS:M*.h} +.endif +.if defined(SHLIB_NAME) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) +${SOBJS}: ${SRCS:M*.h} .endif .endif ==== //depot/projects/trustedbsd/base/share/mk/bsd.nls.mk#5 (text+ko) ==== @@ -1,5 +1,4 @@ -# Based on $NetBSD: bsd.nls.mk,v 1.35 2001/11/28 20:19:08 tv Exp $ -# $FreeBSD: src/share/mk/bsd.nls.mk,v 1.9 2002/04/24 13:29:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.nls.mk,v 1.10 2002/07/02 12:37:07 ru Exp $ # # This include file handles building and installing Native # Language Support (NLS) catalogs @@ -21,108 +20,57 @@ # NLSOWN National Language Support files owner. [${SHAREOWN}] # # NO_NLS Do not make or install NLS files. [not set] -# -# +++ targets +++ -# -# install: -# Install compiled NLS files -# -# bsd.obj.mk: cleandir and obj -.include +.if !target(____) +.error bsd.nls.mk cannot be included directly. +.endif GENCAT?= gencat -new -NLSDIR?= ${SHAREDIR}/nls -NLSGRP?= ${SHAREGRP} -NLSMODE?= ${NOBINMODE} -NLSOWN?= ${SHAREOWN} - -NLS?= -NLSLINKS= - .SUFFIXES: .cat .msg .msg.cat: ${GENCAT} ${.TARGET} ${.IMPSRC} +.if defined(NLS) && !empty(NLS) && !defined(NO_NLS) + # # .msg file pre-build rules # +NLSSRCDIR?= ${.CURDIR} .for file in ${NLS} -.if !defined(NLSSRCDIR_${file}) && defined(NLSSRCDIR) -NLSSRCDIR_${file}=${NLSSRCDIR} +.if defined(NLSSRCFILES) +NLSSRCFILES_${file}?= ${NLSSRCFILES} .endif -.if !defined(NLSSRCFILES_${file}) && defined(NLSSRCFILES) -NLSSRCFILES_${file}=${NLSSRCFILES} -.endif - .if defined(NLSSRCFILES_${file}) -${file}: +NLSSRCDIR_${file}?= ${NLSSRCDIR} +${file}.msg: ${NLSSRCFILES_${file}:S/^/${NLSSRCDIR_${file}}\//} @rm -f ${.TARGET} - cat ${NLSSRCDIR_${file}}/${NLSSRCFILES_${file}} > ${.TARGET} -CLEANFILES+= ${file} + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= ${file}.msg .endif - -.if defined(NLSLINKS_${file:C/.msg//g}) && !empty(NLSLINKS_${file:C/.msg//g}) -NLSLINKS+= ${file:C/.msg//g} -.endif .endfor # # .cat file build rules # -NLSALL= ${NLS:.msg=.cat} -CLEANFILES+= ${NLSALL} +NLS:= ${NLS:=.cat} +CLEANFILES+= ${NLS} +FILESGROUPS?= FILES +FILESGROUPS+= NLS +NLSDIR?= ${SHAREDIR}/nls # # installation rules # -__nlsinstall: .USE - ${INSTALL} -o ${NLSOWN} -g ${NLSGRP} -m ${NLSMODE} \ - ${.ALLSRC} ${.TARGET} - -.for F in ${NLSALL} -_F:= ${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat - -${_F}: ${F} __nlsinstall # install rule -nlsinstall:: ${_F} -.PRECIOUS: ${_F} # keep if install fails +.for file in ${NLS} +NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat +.if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) +NLSLINKS+= ${file:R} +.endif +.for dst in ${NLSLINKS_${file:R}} +SYMLINKS+= ../${file:R}/${NLSNAME}.cat ${NLSDIR}/${dst}/${NLSNAME}.cat .endfor - -links-nls: -.if defined(NLSLINKS) && !empty(NLSLINKS) -.for src in ${NLSLINKS} -.for dst in ${NLSLINKS_${src}} - ln -fs ../${src}/${NLSNAME}.cat \ - ${DESTDIR}${NLSDIR}/${dst}/${NLSNAME}.cat .endfor -.endfor -.endif -# - -.if !defined(NO_NLS) && !empty(NLS) -all-nls: ${NLSALL} -.else -all-nls: -.endif - -.if !defined(NO_NLS) && !empty(NLS) -realinstall: beforeinstall nlsinstall links-nls -.else -realinstall: beforeinstall -.endif - -all: all-nls -install: realinstall afterinstall - -.if !target(beforeinstall) -beforeinstall: -.endif - -.if !target(afterinstall) -afterinstall: -.endif - -.include +.endif defined(NLS) && !empty(NLS) && !defined(NO_NLS) ==== //depot/projects/trustedbsd/base/share/mk/bsd.obj.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.44 2002/06/21 07:30:51 ru Exp $ +# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.46 2002/07/03 12:44:06 ru Exp $ # # The include file handles creating the 'obj' directory # and cleaning up object files, etc. @@ -10,15 +10,15 @@ # CLEANFILES Additional files to remove for the clean target. # # MAKEOBJDIR A pathname for the directory where the targets -# are built. Note: MAKEOBJDIR is an *enviroment* variable -# and works properly only if set as an enviroment variable, +# are built. Note: MAKEOBJDIR is an *environment* variable +# and works properly only if set as an environment variable, # not as a global or command line variable! # # E.g. use `env MAKEOBJDIR=temp-obj make' # # MAKEOBJDIRPREFIX Specifies somewhere other than /usr/obj to root the object -# tree. Note: MAKEOBJDIRPREFIX is an *enviroment* variable -# and works properly only if set as an enviroment variable, +# tree. Note: MAKEOBJDIRPREFIX is an *environment* variable +# and works properly only if set as an environment variable, # not as a global or command line variable! # # E.g. use `env MAKEOBJDIRPREFIX=/somewhere/obj make' @@ -126,31 +126,6 @@ .endif .endif -.if !target(checkdpadd) -checkdpadd: -.if (defined(DPADD) || defined(LDADD)) -checkdpadd: -.if ${OBJFORMAT} != aout - @ldadd=`echo \`for lib in ${DPADD} ; do \ - echo $$lib | sed 's;^/usr/lib/lib\(.*\)\.a;-l\1;' ; \ - done \`` ; \ - ldadd1=`echo ${LDADD}` ; \ - if [ "$$ldadd" != "$$ldadd1" ] ; then \ - echo ${.CURDIR} ; \ - echo "DPADD -> $$ldadd" ; \ - echo "LDADD -> $$ldadd1" ; \ - fi -.else - @dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \ - if [ "$$dpadd" != "${DPADD}" ] ; then \ - echo ${.CURDIR} ; \ - echo "LDADD -> $$dpadd" ; \ - echo "DPADD = ${DPADD}" ; \ - fi -.endif -.endif -.endif - cleandir: cleanobj DISTRIBUTION?= base ==== //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#10 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.122 2002/06/03 14:49:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.125 2002/07/03 12:28:03 ru Exp $ .include @@ -102,6 +102,7 @@ .if !target(realinstall) realinstall: _proginstall +.ORDER: beforeinstall _proginstall _proginstall: .if defined(PROG) .if defined(PROGNAME) @@ -116,34 +117,11 @@ (cd ${DESTDIR}${ORIGBINDIR}; ln -fs dm ${PROG}; \ chown -h ${BINOWN}:${ORIGBINGRP} ${PROG}) .endif - -realinstall: -.if defined(LINKS) && !empty(LINKS) - @set ${LINKS}; \ - while test $$# -ge 2; do \ - l=${DESTDIR}$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -f $$l $$t; \ - done; true -.endif -.if defined(SYMLINKS) && !empty(SYMLINKS) - @set ${SYMLINKS}; \ - while test $$# -ge 2; do \ - l=$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -fs $$l $$t; \ - done; true -.endif .endif !target(realinstall) .if defined(SCRIPTS) && !empty(SCRIPTS) realinstall: _scriptsinstall +.ORDER: beforeinstall _scriptsinstall SCRIPTSDIR?= ${BINDIR} SCRIPTSOWN?= ${BINOWN} @@ -169,11 +147,16 @@ .endfor .endif +NLSNAME?= ${PROG} +.include + .include .include +.include .if !defined(NOMAN) realinstall: _maninstall +.ORDER: beforeinstall _maninstall .endif .endif ==== //depot/projects/trustedbsd/base/share/mk/bsd.subdir.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.42 2002/06/03 14:49:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.43 2002/07/01 14:49:16 ru Exp $ # # The include file contains the default targets # for building subdirectories. @@ -81,7 +81,6 @@ .if !target(afterinstall) afterinstall: .endif -install: afterinstall -afterinstall: realinstall -realinstall: beforeinstall +install: beforeinstall realinstall afterinstall +.ORDER: beforeinstall realinstall afterinstall .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 7 10:16:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80CF437B401; Sun, 7 Jul 2002 10:15:59 -0700 (PDT) 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 ED65A37B400 for ; Sun, 7 Jul 2002 10:15:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6037843E09 for ; Sun, 7 Jul 2002 10:15:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g67HFwJU081183 for ; Sun, 7 Jul 2002 10:15:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g67HFw2H081180 for perforce@freebsd.org; Sun, 7 Jul 2002 10:15:58 -0700 (PDT) Date: Sun, 7 Jul 2002 10:15:58 -0700 (PDT) Message-Id: <200207071715.g67HFw2H081180@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13870 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13870 Change 13870 by rwatson@rwatson_paprika on 2002/07/07 10:15:04 Integ recent system makefile changes. Affected files ... .. //depot/projects/trustedbsd/mac/share/mk/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.dep.mk#7 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.doc.mk#5 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.files.mk#2 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.incs.mk#2 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.info.mk#5 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.lib.mk#11 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.links.mk#1 branch .. //depot/projects/trustedbsd/mac/share/mk/bsd.nls.mk#5 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.obj.mk#7 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.prog.mk#10 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.subdir.mk#7 integrate Differences ... ==== //depot/projects/trustedbsd/mac/share/mk/Makefile#7 (text+ko) ==== @@ -1,11 +1,12 @@ -# $FreeBSD: src/share/mk/Makefile,v 1.39 2002/06/03 14:49:34 ru Exp $ +# $FreeBSD: src/share/mk/Makefile,v 1.40 2002/07/02 12:16:54 ru Exp $ # @(#)Makefile 8.1 (Berkeley) 6/8/93 FILES= bsd.README FILES+= bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.files.mk FILES+= bsd.info.mk bsd.incs.mk bsd.init.mk FILES+= bsd.kern.mk bsd.kmod.mk -FILES+= bsd.lib.mk bsd.libnames.mk bsd.man.mk bsd.nls.mk bsd.obj.mk bsd.own.mk +FILES+= bsd.lib.mk bsd.libnames.mk bsd.links.mk bsd.man.mk bsd.nls.mk +FILES+= bsd.obj.mk bsd.own.mk FILES+= bsd.port.mk bsd.port.post.mk bsd.port.pre.mk bsd.port.subdir.mk FILES+= bsd.prog.mk bsd.subdir.mk bsd.sys.mk FILES+= sys.mk ==== //depot/projects/trustedbsd/mac/share/mk/bsd.dep.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.35 2002/05/07 00:15:53 bde Exp $ +# $FreeBSD: src/share/mk/bsd.dep.mk,v 1.36 2002/07/03 12:44:06 ru Exp $ # # The include file handles Makefile dependencies. # @@ -150,3 +150,25 @@ .endif .endif .endif + +.if !target(checkdpadd) && (defined(DPADD) || defined(LDADD)) +checkdpadd: +.if ${OBJFORMAT} != aout + @ldadd=`echo \`for lib in ${DPADD} ; do \ + echo $$lib | sed 's;^/usr/lib/lib\(.*\)\.a;-l\1;' ; \ + done \`` ; \ + ldadd1=`echo ${LDADD}` ; \ + if [ "$$ldadd" != "$$ldadd1" ] ; then \ + echo ${.CURDIR} ; \ + echo "DPADD -> $$ldadd" ; \ + echo "LDADD -> $$ldadd1" ; \ + fi +.else + @dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \ + if [ "$$dpadd" != "${DPADD}" ] ; then \ + echo ${.CURDIR} ; \ + echo "LDADD -> $$dpadd" ; \ + echo "DPADD = ${DPADD}" ; \ + fi +.endif +.endif ==== //depot/projects/trustedbsd/mac/share/mk/bsd.doc.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.doc.mk 5.3 (Berkeley) 1/2/91 -# $FreeBSD: src/share/mk/bsd.doc.mk,v 1.52 2002/04/24 13:29:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.doc.mk,v 1.53 2002/07/01 14:51:42 ru Exp $ # # The include file handles installing BSD troff documents. # @@ -110,17 +110,6 @@ ${DFILE} ${DESTDIR}${BINDIR}/${VOLUME} .endif -install: beforeinstall realinstall afterinstall - -.if !target(beforeinstall) -beforeinstall: - -.endif -.if !target(afterinstall) -afterinstall: - -.endif - spell: ${SRCS} (cd ${.CURDIR}; spell ${SRCS} ) | sort | \ comm -23 - ${.CURDIR}/spell.ok > ${DOC}.spell ==== //depot/projects/trustedbsd/mac/share/mk/bsd.files.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.files.mk,v 1.1 2002/06/03 14:49:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.files.mk,v 1.2 2002/07/03 12:28:03 ru Exp $ .if !target(____) .error bsd.files.mk cannot be included directly. @@ -66,3 +66,4 @@ .endif !target(installfiles) realinstall: installfiles +.ORDER: beforeinstall installfiles ==== //depot/projects/trustedbsd/mac/share/mk/bsd.incs.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.incs.mk,v 1.2 2002/05/15 16:19:54 ru Exp $ +# $FreeBSD: src/share/mk/bsd.incs.mk,v 1.3 2002/07/03 12:28:03 ru Exp $ .if !target(____) .error bsd.incs.mk cannot be included directly. @@ -77,3 +77,4 @@ .endif !target(installincludes) realinstall: installincludes +.ORDER: beforeinstall installincludes ==== //depot/projects/trustedbsd/mac/share/mk/bsd.info.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.info.mk,v 1.64 2002/04/24 13:29:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.info.mk,v 1.65 2002/07/06 14:58:20 ru Exp $ # # The include file handles installing GNU (tech)info files. # Texinfo is a documentation system that uses a single source @@ -144,7 +144,7 @@ .for x in ${INFO} INSTALLINFODIRS+= ${x:S/$/-install/} -${x:S/$/-install/}: ${DESTDIR}${INFODIR}/${INFODIRFILE} +${x:S/$/-install/}: ${INSTALLINFO} ${INSTALLINFOFLAGS} \ --defsection=${INFOSECTION} \ --defentry=${INFOENTRY_${x}} \ ==== //depot/projects/trustedbsd/mac/share/mk/bsd.lib.mk#11 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 -# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.129 2002/06/26 08:41:00 jmallett Exp $ +# $FreeBSD: src/share/mk/bsd.lib.mk,v 1.132 2002/07/03 16:22:43 ru Exp $ # .include @@ -13,7 +13,7 @@ .undef INSTALL_PIC_ARCHIVE .else .if ${OBJFORMAT} == elf -.if !defined(SHLIB_NAME) && defined(SHLIB_MAJOR) +.if !defined(SHLIB_NAME) && defined(LIB) && defined(SHLIB_MAJOR) SHLIB_NAME= lib${LIB}.so.${SHLIB_MAJOR} SHLIB_LINK?= lib${LIB}.so .endif @@ -154,19 +154,23 @@ all: objwarn +.if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME) +OBJS+= ${SRCS:N*.h:R:S/$/.o/} +.endif + .if defined(LIB) && !empty(LIB) _LIBS= lib${LIB}.a -OBJS+= ${SRCS:N*.h:R:S/$/.o/} lib${LIB}.a: ${OBJS} ${STATICOBJS} @${ECHO} building static ${LIB} library @rm -f ${.TARGET} @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} ${RANLIB} ${.TARGET} +.endif .if !defined(INTERNALLIB) -.if !defined(NOPROFILE) +.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB) _LIBS+= lib${LIB}_p.a POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o=.po} @@ -177,7 +181,10 @@ ${RANLIB} ${.TARGET} .endif +.if defined(SHLIB_NAME) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) SOBJS+= ${OBJS:.o=.So} +.endif .if defined(SHLIB_NAME) _LIBS+= ${SHLIB_NAME} @@ -199,7 +206,7 @@ .endif .endif -.if defined(INSTALL_PIC_ARCHIVE) +.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) _LIBS+= lib${LIB}_pic.a lib${LIB}_pic.a: ${SOBJS} @@ -209,7 +216,7 @@ ${RANLIB} ${.TARGET} .endif -.if defined(WANT_LINT) +.if defined(WANT_LINT) && defined(LIB) && !empty(LIB) LINTLIB= llib-l${LIB}.ln _LIBS+= ${LINTLIB} LINTOBJS+= ${SRCS:M*.c:.c=.ln} @@ -224,8 +231,6 @@ all: ${_LIBS} -.endif defined(LIB) && !empty(LIB) - .if !defined(NOMAN) all: _manpages .endif @@ -237,20 +242,30 @@ .endif .if defined(LIB) && !empty(LIB) rm -f a.out ${OBJS} ${OBJS:S/$/.tmp/} ${STATICOBJS} +.endif .if !defined(INTERNALLIB) -.if !defined(NOPROFILE) +.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB) rm -f ${POBJS} ${POBJS:S/$/.tmp/} .endif +.if defined(SHLIB_NAME) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) rm -f ${SOBJS} ${SOBJS:.So=.so} ${SOBJS:S/$/.tmp/} +.endif .if defined(SHLIB_NAME) - rm -f ${SHLIB_LINK} lib${LIB}.so.* lib${LIB}.so +.if defined(SHLIB_LINK) + rm -f ${SHLIB_LINK} +.endif +.if defined(LIB) && !empty(LIB) + rm -f lib${LIB}.so.* lib${LIB}.so +.endif .endif -.if defined(WANT_LINT) +.if defined(WANT_LINT) && defined(LIB) && !empty(LIB) rm -f ${LINTOBJS} .endif .endif !defined(INTERNALLIB) +.if defined(_LIBS) && !empty(_LIBS) rm -f ${_LIBS} -.endif defined(LIB) && !empty(LIB) +.endif .if defined(CLEANDIRS) && !empty(CLEANDIRS) rm -rf ${CLEANDIRS} .endif @@ -288,14 +303,15 @@ _SHLINSTALLFLAGS:= ${_SHLINSTALLFLAGS${ie}} .endfor -.if defined(LIB) && !empty(LIB) && !defined(INTERNALLIB) +.if !defined(INTERNALLIB) realinstall: _libinstall +.ORDER: beforeinstall _libinstall _libinstall: -.if !defined(NOINSTALLLIB) +.if defined(LIB) && !empty(LIB) && !defined(NOINSTALLLIB) ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} .endif -.if !defined(NOPROFILE) +.if !defined(NOPROFILE) && defined(LIB) && !empty(LIB) ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} .endif @@ -307,45 +323,23 @@ ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK} .endif .endif -.if defined(INSTALL_PIC_ARCHIVE) +.if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR} .endif -.if defined(WANT_LINT) +.if defined(WANT_LINT) && defined(LIB) && !empty(LIB) ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} ${LINTLIB} ${DESTDIR}${LINTLIBDIR} .endif -.endif defined(LIB) && !empty(LIB) && !defined(INTERNALLIB) +.endif !defined(INTERNALLIB) -realinstall: -.if defined(LINKS) && !empty(LINKS) - @set ${LINKS}; \ - while test $$# -ge 2; do \ - l=${DESTDIR}$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -f $$l $$t; \ - done; true -.endif -.if defined(SYMLINKS) && !empty(SYMLINKS) - @set ${SYMLINKS}; \ - while test $$# -ge 2; do \ - l=$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -fs $$l $$t; \ - done; true -.endif - .include .include +.include .if !defined(NOMAN) realinstall: _maninstall +.ORDER: beforeinstall _maninstall .endif .endif @@ -361,9 +355,13 @@ .include +.if !exists(${.OBJDIR}/${DEPENDFILE}) .if defined(LIB) && !empty(LIB) -.if !exists(${.OBJDIR}/${DEPENDFILE}) -${OBJS} ${STATICOBJS} ${POBJS} ${SOBJS}: ${SRCS:M*.h} +${OBJS} ${STATICOBJS} ${POBJS}: ${SRCS:M*.h} +.endif +.if defined(SHLIB_NAME) || \ + defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) +${SOBJS}: ${SRCS:M*.h} .endif .endif ==== //depot/projects/trustedbsd/mac/share/mk/bsd.nls.mk#5 (text+ko) ==== @@ -1,5 +1,4 @@ -# Based on $NetBSD: bsd.nls.mk,v 1.35 2001/11/28 20:19:08 tv Exp $ -# $FreeBSD: src/share/mk/bsd.nls.mk,v 1.9 2002/04/24 13:29:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.nls.mk,v 1.10 2002/07/02 12:37:07 ru Exp $ # # This include file handles building and installing Native # Language Support (NLS) catalogs @@ -21,108 +20,57 @@ # NLSOWN National Language Support files owner. [${SHAREOWN}] # # NO_NLS Do not make or install NLS files. [not set] -# -# +++ targets +++ -# -# install: -# Install compiled NLS files -# -# bsd.obj.mk: cleandir and obj -.include +.if !target(____) +.error bsd.nls.mk cannot be included directly. +.endif GENCAT?= gencat -new -NLSDIR?= ${SHAREDIR}/nls -NLSGRP?= ${SHAREGRP} -NLSMODE?= ${NOBINMODE} -NLSOWN?= ${SHAREOWN} - -NLS?= -NLSLINKS= - .SUFFIXES: .cat .msg .msg.cat: ${GENCAT} ${.TARGET} ${.IMPSRC} +.if defined(NLS) && !empty(NLS) && !defined(NO_NLS) + # # .msg file pre-build rules # +NLSSRCDIR?= ${.CURDIR} .for file in ${NLS} -.if !defined(NLSSRCDIR_${file}) && defined(NLSSRCDIR) -NLSSRCDIR_${file}=${NLSSRCDIR} +.if defined(NLSSRCFILES) +NLSSRCFILES_${file}?= ${NLSSRCFILES} .endif -.if !defined(NLSSRCFILES_${file}) && defined(NLSSRCFILES) -NLSSRCFILES_${file}=${NLSSRCFILES} -.endif - .if defined(NLSSRCFILES_${file}) -${file}: +NLSSRCDIR_${file}?= ${NLSSRCDIR} +${file}.msg: ${NLSSRCFILES_${file}:S/^/${NLSSRCDIR_${file}}\//} @rm -f ${.TARGET} - cat ${NLSSRCDIR_${file}}/${NLSSRCFILES_${file}} > ${.TARGET} -CLEANFILES+= ${file} + cat ${.ALLSRC} > ${.TARGET} +CLEANFILES+= ${file}.msg .endif - -.if defined(NLSLINKS_${file:C/.msg//g}) && !empty(NLSLINKS_${file:C/.msg//g}) -NLSLINKS+= ${file:C/.msg//g} -.endif .endfor # # .cat file build rules # -NLSALL= ${NLS:.msg=.cat} -CLEANFILES+= ${NLSALL} +NLS:= ${NLS:=.cat} +CLEANFILES+= ${NLS} +FILESGROUPS?= FILES +FILESGROUPS+= NLS +NLSDIR?= ${SHAREDIR}/nls # # installation rules # -__nlsinstall: .USE - ${INSTALL} -o ${NLSOWN} -g ${NLSGRP} -m ${NLSMODE} \ - ${.ALLSRC} ${.TARGET} - -.for F in ${NLSALL} -_F:= ${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat - -${_F}: ${F} __nlsinstall # install rule -nlsinstall:: ${_F} -.PRECIOUS: ${_F} # keep if install fails +.for file in ${NLS} +NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat +.if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R}) +NLSLINKS+= ${file:R} +.endif +.for dst in ${NLSLINKS_${file:R}} +SYMLINKS+= ../${file:R}/${NLSNAME}.cat ${NLSDIR}/${dst}/${NLSNAME}.cat .endfor - -links-nls: -.if defined(NLSLINKS) && !empty(NLSLINKS) -.for src in ${NLSLINKS} -.for dst in ${NLSLINKS_${src}} - ln -fs ../${src}/${NLSNAME}.cat \ - ${DESTDIR}${NLSDIR}/${dst}/${NLSNAME}.cat .endfor -.endfor -.endif -# - -.if !defined(NO_NLS) && !empty(NLS) -all-nls: ${NLSALL} -.else -all-nls: -.endif - -.if !defined(NO_NLS) && !empty(NLS) -realinstall: beforeinstall nlsinstall links-nls -.else -realinstall: beforeinstall -.endif - -all: all-nls -install: realinstall afterinstall - -.if !target(beforeinstall) -beforeinstall: -.endif - -.if !target(afterinstall) -afterinstall: -.endif - -.include +.endif defined(NLS) && !empty(NLS) && !defined(NO_NLS) ==== //depot/projects/trustedbsd/mac/share/mk/bsd.obj.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.44 2002/06/21 07:30:51 ru Exp $ +# $FreeBSD: src/share/mk/bsd.obj.mk,v 1.46 2002/07/03 12:44:06 ru Exp $ # # The include file handles creating the 'obj' directory # and cleaning up object files, etc. @@ -10,15 +10,15 @@ # CLEANFILES Additional files to remove for the clean target. # # MAKEOBJDIR A pathname for the directory where the targets -# are built. Note: MAKEOBJDIR is an *enviroment* variable -# and works properly only if set as an enviroment variable, +# are built. Note: MAKEOBJDIR is an *environment* variable +# and works properly only if set as an environment variable, # not as a global or command line variable! # # E.g. use `env MAKEOBJDIR=temp-obj make' # # MAKEOBJDIRPREFIX Specifies somewhere other than /usr/obj to root the object -# tree. Note: MAKEOBJDIRPREFIX is an *enviroment* variable -# and works properly only if set as an enviroment variable, +# tree. Note: MAKEOBJDIRPREFIX is an *environment* variable +# and works properly only if set as an environment variable, # not as a global or command line variable! # # E.g. use `env MAKEOBJDIRPREFIX=/somewhere/obj make' @@ -126,31 +126,6 @@ .endif .endif -.if !target(checkdpadd) -checkdpadd: -.if (defined(DPADD) || defined(LDADD)) -checkdpadd: -.if ${OBJFORMAT} != aout - @ldadd=`echo \`for lib in ${DPADD} ; do \ - echo $$lib | sed 's;^/usr/lib/lib\(.*\)\.a;-l\1;' ; \ - done \`` ; \ - ldadd1=`echo ${LDADD}` ; \ - if [ "$$ldadd" != "$$ldadd1" ] ; then \ - echo ${.CURDIR} ; \ - echo "DPADD -> $$ldadd" ; \ - echo "LDADD -> $$ldadd1" ; \ - fi -.else - @dpadd=`echo \`ld -Bstatic -f ${LDADD}\`` ; \ - if [ "$$dpadd" != "${DPADD}" ] ; then \ - echo ${.CURDIR} ; \ - echo "LDADD -> $$dpadd" ; \ - echo "DPADD = ${DPADD}" ; \ - fi -.endif -.endif -.endif - cleandir: cleanobj DISTRIBUTION?= base ==== //depot/projects/trustedbsd/mac/share/mk/bsd.prog.mk#10 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.122 2002/06/03 14:49:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.125 2002/07/03 12:28:03 ru Exp $ .include @@ -102,6 +102,7 @@ .if !target(realinstall) realinstall: _proginstall +.ORDER: beforeinstall _proginstall _proginstall: .if defined(PROG) .if defined(PROGNAME) @@ -116,34 +117,11 @@ (cd ${DESTDIR}${ORIGBINDIR}; ln -fs dm ${PROG}; \ chown -h ${BINOWN}:${ORIGBINGRP} ${PROG}) .endif - -realinstall: -.if defined(LINKS) && !empty(LINKS) - @set ${LINKS}; \ - while test $$# -ge 2; do \ - l=${DESTDIR}$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -f $$l $$t; \ - done; true -.endif -.if defined(SYMLINKS) && !empty(SYMLINKS) - @set ${SYMLINKS}; \ - while test $$# -ge 2; do \ - l=$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -fs $$l $$t; \ - done; true -.endif .endif !target(realinstall) .if defined(SCRIPTS) && !empty(SCRIPTS) realinstall: _scriptsinstall +.ORDER: beforeinstall _scriptsinstall SCRIPTSDIR?= ${BINDIR} SCRIPTSOWN?= ${BINOWN} @@ -169,11 +147,16 @@ .endfor .endif +NLSNAME?= ${PROG} +.include + .include .include +.include .if !defined(NOMAN) realinstall: _maninstall +.ORDER: beforeinstall _maninstall .endif .endif ==== //depot/projects/trustedbsd/mac/share/mk/bsd.subdir.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.42 2002/06/03 14:49:34 ru Exp $ +# $FreeBSD: src/share/mk/bsd.subdir.mk,v 1.43 2002/07/01 14:49:16 ru Exp $ # # The include file contains the default targets # for building subdirectories. @@ -81,7 +81,6 @@ .if !target(afterinstall) afterinstall: .endif -install: afterinstall -afterinstall: realinstall -realinstall: beforeinstall +install: beforeinstall realinstall afterinstall +.ORDER: beforeinstall realinstall afterinstall .endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 7 11:42:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAE5137B405; Sun, 7 Jul 2002 11:39:49 -0700 (PDT) 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 7B63437B400 for ; Sun, 7 Jul 2002 11:39:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F8C243E67 for ; Sun, 7 Jul 2002 11:39:44 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g67IdiJU008731 for ; Sun, 7 Jul 2002 11:39:44 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g67IdhCp008728 for perforce@freebsd.org; Sun, 7 Jul 2002 11:39:43 -0700 (PDT) Date: Sun, 7 Jul 2002 11:39:43 -0700 (PDT) Message-Id: <200207071839.g67IdhCp008728@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 13879 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13879 Change 13879 by amigus@amigus_vmganyopa on 2002/07/07 11:39:21 Integ Affected files ... .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#38 edit .. //depot/user/amigus/amigus_mac_pipes/sys/boot/alpha/boot1/boot1.c#3 integrate .. //depot/user/amigus/amigus_mac_pipes/sys/boot/alpha/libalpha/common.h#2 integrate .. //depot/user/amigus/amigus_mac_pipes/sys/ddb/db_elf.c#2 integrate .. //depot/user/amigus/amigus_mac_pipes/sys/dev/sio/sio_ebus.c#2 integrate .. //depot/user/amigus/amigus_mac_pipes/sys/i386/isa/intr_machdep.h#2 integrate .. //depot/user/amigus/amigus_mac_pipes/sys/kern/kern_mac.c#12 integrate .. //depot/user/amigus/amigus_mac_pipes/sys/kern/vfs_subr.c#3 integrate .. //depot/user/amigus/amigus_mac_pipes/sys/kern/vfs_syscalls.c#6 integrate .. //depot/user/amigus/amigus_mac_pipes/sys/pci/if_ti.c#4 integrate .. //depot/user/amigus/amigus_mac_pipes/sys/security/mac_mls/mac_mls.c#9 integrate .. //depot/user/amigus/amigus_mac_pipes/sys/sparc64/conf/GENERIC#3 integrate .. //depot/user/amigus/amigus_mac_pipes/sys/sparc64/include/profile.h#2 integrate .. //depot/user/amigus/amigus_mac_pipes/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/user/amigus/amigus_mac_pipes_rewrite/sys/i386/conf/MAC#2 integrate .. //depot/user/amigus/amigus_mac_pipes_rewrite/sys/kern/kern_acl.c#2 integrate .. //depot/user/amigus/amigus_mac_pipes_rewrite/sys/kern/kern_mac.c#2 integrate .. //depot/user/amigus/amigus_mac_pipes_rewrite/sys/kern/sys_pipe.c#3 edit .. //depot/user/amigus/amigus_mac_pipes_rewrite/sys/kern/uipc_syscalls.c#2 integrate .. //depot/user/amigus/amigus_mac_pipes_rewrite/sys/kern/vfs_syscalls.c#2 integrate .. //depot/user/amigus/amigus_mac_pipes_rewrite/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/user/amigus/amigus_mac_pipes_rewrite/sys/security/mac_none/mac_none.c#2 integrate .. //depot/user/amigus/amigus_mac_pipes_rewrite/sys/security/mac_test/mac_test.c#2 integrate .. //depot/user/amigus/amigus_mac_pipes_rewrite/sys/sys/mac.h#2 integrate .. //depot/user/amigus/amigus_mac_pipes_rewrite/sys/sys/mac_policy.h#2 integrate .. //depot/user/amigus/amigus_mac_pipes_rewrite/sys/sys/pipe.h#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#38 (text+ko) ==== @@ -84,6 +84,10 @@ #include #endif +#ifdef MALLOC_DECLARE +MALLOC_DECLARE(M_ACL); +#endif + static int ufs_access(struct vop_access_args *); static int ufs_advlock(struct vop_advlock_args *); static int ufs_chmod(struct vnode *, int, struct ucred *, struct thread *); ==== //depot/user/amigus/amigus_mac_pipes/sys/boot/alpha/boot1/boot1.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.11 2002/06/11 10:19:59 phk Exp $ + * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.12 2002/06/29 02:32:32 peter Exp $ * From $NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ */ @@ -253,7 +253,7 @@ char *name = "/boot/loader"; char *p; char filename[512]; - void (*entry) __P((void)); + void (*entry)(void); u_long start, freq; int i; ==== //depot/user/amigus/amigus_mac_pipes/sys/boot/alpha/libalpha/common.h#2 (text+ko) ==== @@ -1,11 +1,11 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.2 1999/08/28 00:39:26 peter Exp $ + * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.3 2002/06/29 02:32:32 peter Exp $ * From: $NetBSD: common.h,v 1.2 1998/01/05 07:02:48 perry Exp $ */ -int prom_open __P((char*, int)); -void OSFpal __P((void)); -void halt __P((void)); -u_int64_t prom_dispatch __P((int, ...)); -int cpu_number __P((void)); -void switch_palcode __P((void)); +int prom_open(char*, int); +void OSFpal(void); +void halt(void); +u_int64_t prom_dispatch(int, ...); +int cpu_number(void); +void switch_palcode(void); ==== //depot/user/amigus/amigus_mac_pipes/sys/ddb/db_elf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.10 2002/05/07 10:59:52 bde Exp $ */ +/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.11 2002/06/29 02:32:33 peter Exp $ */ /* $NetBSD: db_elf.c,v 1.4 1998/05/03 18:49:54 thorpej Exp $ */ /*- @@ -56,7 +56,7 @@ #include -static char *db_elf_find_strtab __P((db_symtab_t *)); +static char *db_elf_find_strtab(db_symtab_t *); #define STAB_TO_SYMSTART(stab) ((Elf_Sym *)((stab)->start)) #define STAB_TO_SYMEND(stab) ((Elf_Sym *)((stab)->end)) ==== //depot/user/amigus/amigus_mac_pipes/sys/dev/sio/sio_ebus.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID($FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.1 2002/06/18 01:19:31 obrien Exp $); +__FBSDID($FreeBSD: src/sys/dev/sio/sio_ebus.c,v 1.2 2002/06/29 02:32:33 peter Exp $); #include #include @@ -40,9 +40,9 @@ #include #include -int sio_ofw_inlist __P((char *name, char *list[])); -static int sio_ebus_attach __P((device_t dev)); -static int sio_ebus_probe __P((device_t dev)); +int sio_ofw_inlist(char *name, char *list[]); +static int sio_ebus_attach(device_t dev); +static int sio_ebus_probe(device_t dev); static device_method_t sio_ebus_methods[] = { /* Device interface */ ==== //depot/user/amigus/amigus_mac_pipes/sys/i386/isa/intr_machdep.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.40 2002/04/06 08:25:05 nyan Exp $ + * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.41 2002/06/29 02:32:33 peter Exp $ */ #ifndef _I386_ISA_INTR_MACHDEP_H_ @@ -140,7 +140,7 @@ * Type of the first (asm) part of an interrupt handler. */ typedef void inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); -typedef void unpendhand_t __P((void)); +typedef void unpendhand_t(void); #define IDTVEC(name) __CONCAT(X,name) ==== //depot/user/amigus/amigus_mac_pipes/sys/kern/kern_mac.c#12 (text+ko) ==== @@ -988,6 +988,22 @@ ASSERT_VOP_LOCKED(vp, "vn_refreshlabel"); + if (vp->v_mount == NULL) { +/* + Eventually, we probably want to special-case refreshing + of deadfs vnodes, and if there's a lock-free race somewhere, + that case might be handled here. + + mac_update_vnode_deadfs(vp); + return (0); + */ + printf("vn_refreshlabel: null v_mount\n"); + if (vp->v_tag != VT_NON) + printf( + "vn_refreshlabel: null v_mount with non-VT_NON\n"); + return (EBADF); + } + if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { mac_update_vnode_from_mount(vp, vp->v_mount); return (0); @@ -2432,6 +2448,12 @@ { int error; + if (vp->v_mount == NULL) { + printf("vn_setlabel: null v_mount\n"); + if (vp->v_tag != VT_NON) + printf("vn_setlabel: null v_mount with non-VT_NON\n"); + return (EBADF); + } /* * Multi-phase commit. First check the policies to confirm the * change is OK. Then commit via the filesystem. Finally, ==== //depot/user/amigus/amigus_mac_pipes/sys/kern/vfs_subr.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.365 2002/06/28 23:17:36 alfred Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.366 2002/06/29 04:45:09 obrien Exp $ */ /* @@ -2465,7 +2465,7 @@ * List all of the locked vnodes in the system. * Called when debugging the kernel. */ -DB_SHOW_COMMAND(lockedvnodes, lockedvnodes) +DB_SHOW_COMMAND(lockedvnods, lockedvnodes) { struct thread *td = curthread; /* XXX */ struct mount *mp, *nmp; ==== //depot/user/amigus/amigus_mac_pipes/sys/kern/vfs_syscalls.c#6 (text+ko) ==== @@ -1977,7 +1977,7 @@ restart: bwillwrite(); - NDINIT(&nd, CREATE | SAVENAME, LOCKPARENT, UIO_USERSPACE, + NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME, UIO_USERSPACE, SCARG(uap, path), td); if ((error = namei(&nd)) != 0) return (error); ==== //depot/user/amigus/amigus_mac_pipes/sys/pci/if_ti.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_ti.c,v 1.60 2002/06/26 03:34:52 ken Exp $ + * $FreeBSD: src/sys/pci/if_ti.c,v 1.61 2002/06/29 02:32:34 peter Exp $ */ /* @@ -152,7 +152,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/pci/if_ti.c,v 1.60 2002/06/26 03:34:52 ken Exp $"; + "$FreeBSD: src/sys/pci/if_ti.c,v 1.61 2002/06/29 02:32:34 peter Exp $"; #endif struct ti_softc *tis[8]; @@ -270,8 +270,8 @@ static int ti_gibinit (struct ti_softc *); #ifdef TI_JUMBO_HDRSPLIT -static __inline void ti_hdr_split __P((struct mbuf *top, int hdr_len, - int pkt_len, int idx)); +static __inline void ti_hdr_split (struct mbuf *top, int hdr_len, + int pkt_len, int idx); #endif /* TI_JUMBO_HDRSPLIT */ static device_method_t ti_methods[] = { ==== //depot/user/amigus/amigus_mac_pipes/sys/security/mac_mls/mac_mls.c#9 (text+ko) ==== @@ -1118,6 +1118,9 @@ { struct mac_mls *subj, *obj; + if (!mac_mls_enabled) + return (0); + subj = SLOT(&cred->cr_label); obj = SLOT(socketlabel); ==== //depot/user/amigus/amigus_mac_pipes/sys/sparc64/conf/GENERIC#3 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.22 2002/06/27 14:43:27 mux Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.23 2002/06/29 04:42:03 obrien Exp $ machine sparc64 cpu SUN4U @@ -83,7 +83,9 @@ device atapicd # ATAPI CDROM drives #device atapifd # ATAPI floppy drives #device atapist # ATAPI tape drives -options ATA_STATIC_ID #Static device numbering +# Do NOT enable ATA_STATIC_ID -- cmd646 controller will be !ata2!, +# and you will not mount an ATA /. +#options ATA_STATIC_ID #Static device numbering # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices ==== //depot/user/amigus/amigus_mac_pipes/sys/sparc64/include/profile.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * * from: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp * from: FreeBSD: src/sys/alpha/include/profile.h,v 1.4 1999/12/29 - * $FreeBSD: src/sys/sparc64/include/profile.h,v 1.1 2001/11/18 17:56:46 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/profile.h,v 1.2 2002/06/29 02:32:34 peter Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -52,10 +52,10 @@ #ifdef GUPROF struct gmonparam; -void nullfunc_loop_profiled __P((void)); -void nullfunc_profiled __P((void)); -void startguprof __P((struct gmonparam *p)); -void stopguprof __P((struct gmonparam *p)); +void nullfunc_loop_profiled(void); +void nullfunc_profiled(void); +void startguprof(struct gmonparam *p); +void stopguprof(struct gmonparam *p); #else #define startguprof(p) #define stopguprof(p) ==== //depot/user/amigus/amigus_mac_pipes/sys/sparc64/sparc64/pmap.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.62 2002/06/25 15:13:07 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.63 2002/06/29 06:37:24 jake Exp $ */ /* @@ -1200,7 +1200,8 @@ KASSERT(pmap_resident_count(pm) == 0, ("pmap_release: resident pages %ld != 0", pmap_resident_count(pm))); - TAILQ_FOREACH(m, &obj->memq, listq) { + while (!TAILQ_EMPTY(&obj->memq)) { + m = TAILQ_FIRST(&obj->memq); if (vm_page_sleep_busy(m, FALSE, "pmaprl")) continue; vm_page_busy(m); ==== //depot/user/amigus/amigus_mac_pipes_rewrite/sys/i386/conf/MAC#2 (text+ko) ==== @@ -30,6 +30,7 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options MAC +options UFS_ACL options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART ==== //depot/user/amigus/amigus_mac_pipes_rewrite/sys/kern/kern_acl.c#2 (text+ko) ==== @@ -90,7 +90,7 @@ */ #ifndef CAPABILITIES if (suser_cred(cred, PRISON_ROOT) == 0) - cap_granted = (VEXEC | VREAD | VWRITE | VADMIN); + cap_granted = (VEXEC | VREAD | VWRITE | VADMIN | VAPPEND); else cap_granted = 0; #else @@ -110,9 +110,9 @@ PRISON_ROOT)) cap_granted |= VREAD; - if ((acc_mode & VWRITE) && !cap_check(cred, NULL, CAP_DAC_WRITE, - PRISON_ROOT)) - cap_granted |= VWRITE; + if (((acc_mode & VWRITE) || (acc_mode & VAPPEND)) && + !cap_check(cred, NULL, CAP_DAC_WRITE, PRISON_ROOT)) + cap_granted |= (VWRITE | VAPPEND); if ((acc_mode & VADMIN) && !cap_check(cred, NULL, CAP_FOWNER, PRISON_ROOT)) @@ -138,7 +138,7 @@ if (acl->acl_entry[i].ae_perm & ACL_READ) dac_granted |= VREAD; if (acl->acl_entry[i].ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); if ((acc_mode & dac_granted) == acc_mode) return (0); if ((acc_mode & (dac_granted | cap_granted)) == @@ -190,9 +190,9 @@ if (acl_mask->ae_perm & ACL_READ) acl_mask_granted |= VREAD; if (acl_mask->ae_perm & ACL_WRITE) - acl_mask_granted |= VWRITE; + acl_mask_granted |= (VWRITE | VAPPEND); } else - acl_mask_granted = VEXEC | VREAD | VWRITE; + acl_mask_granted = VEXEC | VREAD | VWRITE | VAPPEND; /* * Iterate through user ACL entries. Do checks twice, first @@ -214,7 +214,7 @@ if (acl->acl_entry[i].ae_perm & ACL_READ) dac_granted |= VREAD; if (acl->acl_entry[i].ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); dac_granted &= acl_mask_granted; if ((acc_mode & dac_granted) == acc_mode) return (0); @@ -247,7 +247,7 @@ if (acl->acl_entry[i].ae_perm & ACL_READ) dac_granted |= VREAD; if (acl->acl_entry[i].ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); dac_granted &= acl_mask_granted; if ((acc_mode & dac_granted) == acc_mode) @@ -265,7 +265,7 @@ if (acl->acl_entry[i].ae_perm & ACL_READ) dac_granted |= VREAD; if (acl->acl_entry[i].ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); dac_granted &= acl_mask_granted; if ((acc_mode & dac_granted) == acc_mode) @@ -295,7 +295,7 @@ if (acl->acl_entry[i].ae_perm & ACL_READ) dac_granted |= VREAD; if (acl->acl_entry[i].ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); dac_granted &= acl_mask_granted; if ((acc_mode & (dac_granted | cap_granted)) != @@ -316,7 +316,7 @@ if (acl->acl_entry[i].ae_perm & ACL_READ) dac_granted |= VREAD; if (acl->acl_entry[i].ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); dac_granted &= acl_mask_granted; if ((acc_mode & (dac_granted | cap_granted)) != @@ -347,7 +347,7 @@ if (acl_other->ae_perm & ACL_READ) dac_granted |= VREAD; if (acl_other->ae_perm & ACL_WRITE) - dac_granted |= VWRITE; + dac_granted |= (VWRITE | VAPPEND); if ((acc_mode & dac_granted) == acc_mode) return (0); ==== //depot/user/amigus/amigus_mac_pipes_rewrite/sys/kern/kern_mac.c#2 (text+ko) ==== @@ -222,6 +222,7 @@ } while (0) MALLOC_DEFINE(M_TMPLABEL, "tmplabel", "temporary user-label copied storage"); +MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); const size_t maxlabelsize = 65536; /* @@ -456,6 +457,14 @@ mpc->mpc_ops.mpo_bpfdesc_check_receive_from_ifnet = mpe->mpe_function; break; + case MAC_CRED_CHECK_BIND_SOCKET: + mpc->mpc_ops.mpo_cred_check_bind_socket = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_CONNECT_SOCKET: + mpc->mpc_ops.mpo_cred_check_connect_socket = + mpe->mpe_function; + break; case MAC_CRED_CHECK_SEE_CRED: mpc->mpc_ops.mpo_cred_check_see_cred = mpe->mpe_function; @@ -507,6 +516,10 @@ mpc->mpc_ops.mpo_cred_check_getextattr_vnode = mpe->mpe_function; break; + case MAC_CRED_CHECK_LISTEN_SOCKET: + mpc->mpc_ops.mpo_cred_check_listen_socket = + mpe->mpe_function; + break; case MAC_CRED_CHECK_OPEN_VNODE: mpc->mpc_ops.mpo_cred_check_open_vnode = mpe->mpe_function; @@ -1017,7 +1030,7 @@ { int error; - if (!mac_enforce_process) + if (!mac_enforce_process && !mac_enforce_fs) return (0); error = vn_refreshlabel(vp, cred); @@ -1215,9 +1228,13 @@ void mac_init_pipe(struct pipe *pipe) { + struct label *label; - mac_init_label(&pipe->pipe_label); - MAC_PERFORM(init_pipe, pipe, &pipe->pipe_label); + label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK); + mac_init_label(label); + pipe->pipe_label = label; + pipe->pipe_peer->pipe_label = label; + MAC_PERFORM(init_pipe, pipe, pipe->pipe_label); atomic_add_int(&nmacpipes, 1); } @@ -1225,8 +1242,9 @@ mac_destroy_pipe(struct pipe * pipe) { - MAC_PERFORM(destroy_pipe, pipe, &pipe->pipe_label); - mac_destroy_label(&pipe->pipe_label); + MAC_PERFORM(destroy_pipe, pipe, pipe->pipe_label); + mac_destroy_label(pipe->pipe_label); + free(pipe->pipe_label, M_MACPIPELABEL); atomic_subtract_int(&nmacpipes, 1); } @@ -1443,6 +1461,9 @@ ASSERT_VOP_LOCKED(dvp, "mac_cred_check_chdir_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(dvp, cred); if (error) return (error); @@ -1459,6 +1480,9 @@ ASSERT_VOP_LOCKED(dvp, "mac_cred_check_create_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(dvp, cred); if (error) return (error); @@ -1475,6 +1499,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_getextattr_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1485,17 +1512,34 @@ } int +mac_cred_check_listen_socket(struct ucred *cred, struct socket *socket) +{ + int error; + + if (!mac_enforce_socket) + return (0); + + MAC_CHECK(cred_check_listen_socket, cred, socket, &socket->so_label); + return (error); +} + +int mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode) { int error; ASSERT_VOP_LOCKED(vp, "mac_cred_check_open_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); MAC_CHECK(cred_check_open_vnode, cred, vp, &vp->v_label, acc_mode); + if (error) + printf("mac_cred_check_open_vnode returns %d\n", error); return (error); } @@ -1506,6 +1550,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_revoke_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1521,6 +1568,9 @@ ASSERT_VOP_LOCKED(dvp, "mac_cred_check_search_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(dvp, cred); if (error) return (error); @@ -1537,6 +1587,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_setextattr_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1553,6 +1606,10 @@ int error; ASSERT_VOP_LOCKED(vp, "mac_cred_check_setflags_vnode"); + + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1569,6 +1626,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_setmode_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1585,6 +1645,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_setowner_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1601,6 +1664,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_setutimes_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1619,6 +1685,9 @@ ASSERT_VOP_LOCKED(dvp, "mac_cred_check_delete_vnode"); ASSERT_VOP_LOCKED(vp, "mac_cred_check_delete_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(dvp, cred); if (error) return (error); @@ -1640,6 +1709,9 @@ ASSERT_VOP_LOCKED(dvp, "mac_cred_check_rename_from_vnode"); ASSERT_VOP_LOCKED(vp, "mac_cred_check_rename_from_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(dvp, cred); if (error) return (error); @@ -1661,6 +1733,9 @@ ASSERT_VOP_LOCKED(dvp, "mac_cred_check_rename_to_vnode"); ASSERT_VOP_LOCKED(vp, "mac_cred_check_rename_to_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(dvp, cred); if (error) return (error); @@ -1681,6 +1756,9 @@ ASSERT_VOP_LOCKED(vp, "mac_cred_check_stat_vnode"); + if (!mac_enforce_fs) + return (0); + error = vn_refreshlabel(vp, cred); if (error) return (error); @@ -1728,7 +1806,7 @@ mac_create_pipe(struct ucred *cred, struct pipe *pipe) { - MAC_PERFORM(create_pipe, cred, pipe, &pipe->pipe_label); + MAC_PERFORM(create_pipe, cred, pipe, pipe->pipe_label); } void @@ -1884,7 +1962,7 @@ { int error; - MAC_CHECK(cred_check_pipe_op, cred, pipe, &pipe->pipe_label, op); + MAC_CHECK(cred_check_pipe_op, cred, pipe, pipe->pipe_label, op); return (error); } @@ -1895,7 +1973,7 @@ { int error; - MAC_CHECK(cred_check_pipe_ioctl, cred, pipe, &pipe->pipe_label, + MAC_CHECK(cred_check_pipe_ioctl, cred, pipe, pipe->pipe_label, cmd, data); return (error); @@ -1951,6 +2029,36 @@ } int +mac_cred_check_bind_socket(struct ucred *ucred, struct socket *socket, + struct sockaddr *sockaddr) +{ + int error; + + if (!mac_enforce_socket) + return (0); + + MAC_CHECK(cred_check_bind_socket, ucred, socket, &socket->so_label, + sockaddr); + + return (error); +} + +int +mac_cred_check_connect_socket(struct ucred *cred, struct socket *socket, + struct sockaddr *sockaddr) +{ + int error; + + if (!mac_enforce_socket) + return (0); + + MAC_CHECK(cred_check_connect_socket, cred, socket, &socket->so_label, + sockaddr); + + return (error); +} + +int mac_socket_can_receive(struct socket *socket, struct mbuf *mbuf) { int error; ==== //depot/user/amigus/amigus_mac_pipes_rewrite/sys/kern/sys_pipe.c#3 (text+ko) ==== @@ -1376,6 +1376,13 @@ cpipe->pipe_state |= PIPE_WANT | PIPE_EOF; msleep(cpipe, PIPE_MTX(cpipe), PRIBIO, "pipecl", 0); } +#ifdef MAC + /* + * Destroy MAC data + */ + if (cpipe->pipe_peer) + mac_destroy_pipe(cpipe); +#endif /* MAC */ KNOTE(&cpipe->pipe_sel.si_note, 0); ==== //depot/user/amigus/amigus_mac_pipes_rewrite/sys/kern/uipc_syscalls.c#2 (text+ko) ==== @@ -39,6 +39,7 @@ #include "opt_compat.h" #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -178,6 +179,13 @@ goto done2; if ((error = getsockaddr(&sa, uap->name, uap->namelen)) != 0) goto done1; +#ifdef MAC + error = mac_cred_check_bind_socket(td->td_ucred, so, sa); + if (error) { + FREE(sa, M_SONAME); + goto done1; + } +#endif error = sobind(so, sa, td); FREE(sa, M_SONAME); done1: @@ -204,7 +212,15 @@ mtx_lock(&Giant); if ((error = fgetsock(td, uap->s, &so, NULL)) == 0) { +#ifdef MAC + error = mac_cred_check_listen_socket(td->td_ucred, so); + if (error) + goto done; +#endif error = solisten(so, uap->backlog, td); +#ifdef MAC +done: +#endif fputsock(so); } mtx_unlock(&Giant); @@ -439,6 +455,11 @@ error = getsockaddr(&sa, uap->name, uap->namelen); if (error) goto done1; +#ifdef MAC + error = mac_cred_check_connect_socket(td->td_ucred, so, sa); + if (error) + goto bad; +#endif error = soconnect(so, sa, td); if (error) goto bad; ==== //depot/user/amigus/amigus_mac_pipes_rewrite/sys/kern/vfs_syscalls.c#2 (text+ko) ==== @@ -1655,6 +1655,9 @@ return (error); NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, SCARG(uap, path), td); +#ifdef MAC + /* XXXMAC: MAC check for chroot here. */ +#endif if ((error = change_dir(&nd, td)) != 0) return (error); NDFREE(&nd, NDF_ONLY_PNBUF); @@ -2232,6 +2235,11 @@ return (error); goto restart; } +#ifdef MAC + /* + * XXXMAC: Need some or another MAC check here. + */ +#endif VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); error = VOP_WHITEOUT(nd.ni_dvp, &nd.ni_cnd, DELETE); NDFREE(&nd, NDF_ONLY_PNBUF); @@ -2873,6 +2881,11 @@ return (error); NDFREE(&nd, NDF_ONLY_PNBUF); vp = nd.ni_vp; +#ifdef MAC + /* + * XXXMAC: need some or another MAC check here. + */ +#endif if (vp->v_type != VLNK) error = EINVAL; else { ==== //depot/user/amigus/amigus_mac_pipes_rewrite/sys/security/mac_biba/mac_biba.c#2 (text+ko) ==== @@ -1680,7 +1680,7 @@ return (0); subj = SLOT(&cred->cr_label); - obj = SLOT(&pipe->pipe_label); + obj = SLOT((pipelabel)); switch(op) { case MAC_OP_PIPE_READ: ==== //depot/user/amigus/amigus_mac_pipes_rewrite/sys/security/mac_none/mac_none.c#2 (text+ko) ==== @@ -525,6 +525,22 @@ } static int +mac_none_cred_check_bind_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int +mac_none_cred_check_connect_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int mac_none_cred_check_see_cred(struct ucred *u1, struct ucred *u2) { @@ -626,6 +642,14 @@ } static int +mac_none_cred_check_listen_socket(struct ucred *cred, struct vnode *vp, + struct label *socketlabel) +{ + + return (0); +} + +static int mac_none_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) { @@ -872,6 +896,10 @@ (macop_t)mac_none_relabel_subject }, { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, (macop_t)mac_none_bpfdesc_check_receive_from_ifnet }, + { MAC_CRED_CHECK_BIND_SOCKET, + (macop_t)mac_none_cred_check_bind_socket }, + { MAC_CRED_CHECK_CONNECT_SOCKET, + (macop_t)mac_none_cred_check_connect_socket }, { MAC_CRED_CHECK_SEE_CRED, (macop_t)mac_none_cred_check_see_cred }, { MAC_CRED_CHECK_SEE_SOCKET, @@ -898,6 +926,8 @@ (macop_t)mac_none_cred_check_exec_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_none_cred_check_getextattr_vnode }, + { MAC_CRED_CHECK_LISTEN_SOCKET, + (macop_t)mac_none_cred_check_listen_socket }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_none_cred_check_open_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, ==== //depot/user/amigus/amigus_mac_pipes_rewrite/sys/security/mac_test/mac_test.c#2 (text+ko) ==== @@ -753,6 +753,22 @@ } static int +mac_test_cred_check_bind_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int +mac_test_cred_check_connect_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int mac_test_cred_check_see_cred(struct ucred *u1, struct ucred *u2) { @@ -870,6 +886,14 @@ } static int +mac_test_cred_check_listen_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int mac_test_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) { @@ -1120,6 +1144,10 @@ (macop_t)mac_test_relabel_subject }, { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, (macop_t)mac_test_bpfdesc_check_receive_from_ifnet }, + { MAC_CRED_CHECK_BIND_SOCKET, + (macop_t)mac_test_cred_check_bind_socket }, + { MAC_CRED_CHECK_CONNECT_SOCKET, + (macop_t)mac_test_cred_check_connect_socket }, { MAC_CRED_CHECK_SEE_CRED, (macop_t)mac_test_cred_check_see_cred }, { MAC_CRED_CHECK_SEE_SOCKET, @@ -1146,6 +1174,8 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 7 21:40:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78F4237B401; Sun, 7 Jul 2002 21:40:33 -0700 (PDT) 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 2F30E37B400 for ; Sun, 7 Jul 2002 21:40:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E167243E09 for ; Sun, 7 Jul 2002 21:40:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g684eWJU009595 for ; Sun, 7 Jul 2002 21:40:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g684eWSf009592 for perforce@freebsd.org; Sun, 7 Jul 2002 21:40:32 -0700 (PDT) Date: Sun, 7 Jul 2002 21:40:32 -0700 (PDT) Message-Id: <200207080440.g684eWSf009592@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13905 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13905 Change 13905 by rwatson@rwatson_tislabs on 2002/07/07 21:39:37 First pass at a KDE-based MAC kernel module manager. Sponsored by: DARPA, NAI Labs Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/Makefile#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/TODO#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/logwindow.cc#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/logwindow.h#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/main.cc#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/modulelist.cc#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/modulelist.h#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/modules.conf#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/sysctl_util.c#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/sysctl_util.h#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/sysctllist.cc#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/sysctllist.h#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/test.cc#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/test.h#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 7 21:41:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BB2437B405; Sun, 7 Jul 2002 21:41:35 -0700 (PDT) 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 1DF6E37B401 for ; Sun, 7 Jul 2002 21:41:35 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A57AB43E52 for ; Sun, 7 Jul 2002 21:41:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g684fYJU010176 for ; Sun, 7 Jul 2002 21:41:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g684fYhM010173 for perforce@freebsd.org; Sun, 7 Jul 2002 21:41:34 -0700 (PDT) Date: Sun, 7 Jul 2002 21:41:34 -0700 (PDT) Message-Id: <200207080441.g684fYhM010173@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13906 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13906 Change 13906 by rwatson@rwatson_paprika on 2002/07/07 21:41:12 Since the mac branch now uses gdb52, no longer need -gstabs debugging symbols. Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmacmanager/Makefile#2 (text+ko) ==== @@ -35,7 +35,7 @@ KDELIB=-L/usr/local/lib -lkdeui -lkdecore QTLIB=-L/usr/X11R6/lib -lqt-mt -pthread MOC=/usr/X11R6/bin/moc -CFLAGS=-Wall -gstabs+ ${KDEINC} ${QTINC} +CFLAGS=-Wall ${KDEINC} ${QTINC} LDFLAGS=${KDELIB} ${QTLIB} all: test To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 8 15:58:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8853F37B401; Mon, 8 Jul 2002 15:58:16 -0700 (PDT) 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 3ED7037B400 for ; Mon, 8 Jul 2002 15:58:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD3C443E31 for ; Mon, 8 Jul 2002 15:58:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g68MwFJU017133 for ; Mon, 8 Jul 2002 15:58:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g68MwFVw017130 for perforce@freebsd.org; Mon, 8 Jul 2002 15:58:15 -0700 (PDT) Date: Mon, 8 Jul 2002 15:58:15 -0700 (PDT) Message-Id: <200207082258.g68MwFVw017130@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13934 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13934 Change 13934 by rwatson@rwatson_paprika on 2002/07/08 15:57:30 Spell sebsd correctly. Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/modules.conf#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmacmanager/modules.conf#2 (text+ko) ==== @@ -32,7 +32,7 @@ # # module:provider:description:options # -seebsd:NSA/NAI Labs:NSA SELinux/FLASK/TE:noload,nounload +sebsd:NSA/NAI Labs:NSA SELinux/FLASK/TE:noload,nounload mac_biba:TrustedBSD:Biba integrity:noload,nounload mac_bsdextended:TrustedBSD:UID/GID file firewall mac_ifoff:TrustedBSD:secure interface silencing To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 8 17:59:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8DAD37B401; Mon, 8 Jul 2002 17:59:44 -0700 (PDT) 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 6C5F937B400 for ; Mon, 8 Jul 2002 17:59:44 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1085343E31 for ; Mon, 8 Jul 2002 17:59:44 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g690xhJU041735 for ; Mon, 8 Jul 2002 17:59:43 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g690xhXe041732 for perforce@freebsd.org; Mon, 8 Jul 2002 17:59:43 -0700 (PDT) Date: Mon, 8 Jul 2002 17:59:43 -0700 (PDT) Message-Id: <200207090059.g690xhXe041732@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 13939 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13939 Change 13939 by jhb@jhb_laptop on 2002/07/08 17:58:53 - Add some KASSERT()'s to prevent foot-shooting from mismatching mutexes and mutex operations. - Do all the assertions in _mtx_unlock_flags() before we run the mutex profiling code so we only perform calculations when we actually have a valid locked mutex that we are releasing. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#40 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#40 (text+ko) ==== @@ -313,6 +313,9 @@ { MPASS(curthread != NULL); + KASSERT(m->mtx_object->lo_class == &lock_class_mtx_sleep, + "mtx_lock() of spin mutex %s @ %s:%d", m->mtx_object->lo_name, + file, line); _get_sleep_lock(m, curthread, opts, file, line); LOCK_LOG_LOCK("LOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); @@ -333,6 +336,13 @@ { MPASS(curthread != NULL); + KASSERT(m->mtx_object->lo_class == &lock_class_mtx_sleep, + "mtx_unlock() of spin mutex %s @ %s:%d", m->mtx_object->lo_name, + file, line); + WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); + LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, + line); + mtx_assert(m, MA_OWNED); #ifdef MUTEX_PROFILING if (m->acqtime != 0) { static const char *unknown = "(unknown)"; @@ -387,10 +397,6 @@ } out: #endif - WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); - LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, - line); - mtx_assert(m, MA_OWNED); _rel_sleep_lock(m, curthread, opts, file, line); } @@ -399,6 +405,9 @@ { MPASS(curthread != NULL); + KASSERT(m->mtx_object->lo_class == &lock_class_mtx_sleep, + "mtx_lock_spin() of sleep mutex %s @ %s:%d", m->mtx_object->lo_name, + file, line); #if defined(SMP) || LOCK_DEBUG > 0 _get_spin_lock(m, curthread, opts, file, line); #else @@ -414,6 +423,9 @@ { MPASS(curthread != NULL); + KASSERT(m->mtx_object->lo_class == &lock_class_mtx_sleep, + "mtx_unlock_spin() of sleep mutex %s @ %s:%d", + m->mtx_object->lo_name, file, line); WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 8 19:41:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DEBE37B401; Mon, 8 Jul 2002 19:40:16 -0700 (PDT) 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 AB20C37B400 for ; Mon, 8 Jul 2002 19:40:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B439D43E31 for ; Mon, 8 Jul 2002 19:40:14 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g692eEJU059358 for ; Mon, 8 Jul 2002 19:40:14 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g692dkVw059256 for perforce@freebsd.org; Mon, 8 Jul 2002 19:39:46 -0700 (PDT) Date: Mon, 8 Jul 2002 19:39:46 -0700 (PDT) Message-Id: <200207090239.g692dkVw059256@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 13943 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13943 Change 13943 by jhb@jhb_laptop on 2002/07/08 19:39:31 IFC @13574 (pre-KSE3) This includes un-backing out cred_free_thread() changes. I guess jhbBSD will diverge that much more from FreeBSD. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#31 integrate .. //depot/projects/smpng/sys/alpha/alpha/support.s#5 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#34 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#11 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#19 integrate .. //depot/projects/smpng/sys/alpha/include/runq.h#2 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#16 integrate .. //depot/projects/smpng/sys/arm/include/types.h#3 integrate .. //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/alpha/boot1/boot1.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/boot1/sys.c#5 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/common.h#2 integrate .. //depot/projects/smpng/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/bootinfo.c#4 integrate .. //depot/projects/smpng/sys/boot/i386/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#11 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/bootinfo.c#6 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/bootinfo.c#3 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#6 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#15 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#24 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#8 integrate .. //depot/projects/smpng/sys/conf/NOTES#17 integrate .. //depot/projects/smpng/sys/conf/files#44 integrate .. //depot/projects/smpng/sys/conf/files.i386#25 integrate .. //depot/projects/smpng/sys/conf/files.pc98#25 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#16 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#12 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#11 integrate .. //depot/projects/smpng/sys/conf/options#30 integrate .. //depot/projects/smpng/sys/conf/options.i386#15 integrate .. //depot/projects/smpng/sys/conf/options.ia64#8 integrate .. //depot/projects/smpng/sys/conf/options.pc98#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/smpng/sys/ddb/db_elf.c#2 integrate .. //depot/projects/smpng/sys/ddb/db_examine.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_expr.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_run.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#20 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#22 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#21 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#9 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.h#4 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#4 integrate .. //depot/projects/smpng/sys/dev/em/if_em_fxhw.c#5 delete .. //depot/projects/smpng/sys/dev/em/if_em_fxhw.h#4 delete .. //depot/projects/smpng/sys/dev/em/if_em_phy.c#5 delete .. //depot/projects/smpng/sys/dev/em/if_em_phy.h#4 delete .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#15 integrate .. //depot/projects/smpng/sys/dev/hea/eni.c#5 integrate .. //depot/projects/smpng/sys/dev/hea/eni.h#4 integrate .. //depot/projects/smpng/sys/dev/hea/eni_globals.c#2 integrate .. //depot/projects/smpng/sys/dev/hea/eni_receive.c#3 integrate .. //depot/projects/smpng/sys/dev/hea/eni_transmit.c#3 integrate .. //depot/projects/smpng/sys/dev/hea/eni_var.h#3 integrate .. //depot/projects/smpng/sys/dev/hea/hea_freebsd.c#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_buffer.c#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_command.c#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_globals.c#2 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_if.c#2 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_include.h#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_init.c#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_load.c#4 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_output.c#4 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_receive.c#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_stats.c#2 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_transmit.c#2 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_var.h#2 integrate .. //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.c#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#20 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#13 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#12 integrate .. //depot/projects/smpng/sys/dev/isp/isp_inline.h#7 integrate .. //depot/projects/smpng/sys/dev/isp/isp_ioctl.h#6 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.c#5 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.h#6 integrate .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#11 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#14 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/smpng/sys/dev/md/md.c#22 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#14 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#15 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#5 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/smpng/sys/dev/puc/pucvar.h#2 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#19 integrate .. //depot/projects/smpng/sys/dev/sio/sio_ebus.c#1 branch .. //depot/projects/smpng/sys/dev/sio/sioreg.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#11 integrate .. //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#8 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#36 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/wi/if_wireg.h#14 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#8 integrate .. //depot/projects/smpng/sys/dev/wi/wi_hostap.c#8 integrate .. //depot/projects/smpng/sys/dev/wi/wi_hostap.h#5 integrate .. //depot/projects/smpng/sys/fs/nullfs/null.h#3 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/smpng/sys/fs/udf/udf_mount.h#2 delete .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/smpng/sys/fs/unionfs/union.h#5 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#11 integrate .. //depot/projects/smpng/sys/geom/geom.h#9 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#10 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#7 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#5 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#7 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#8 integrate .. //depot/projects/smpng/sys/gnu/i386/fpemul/load_store.c#2 integrate .. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_ld_str.c#2 integrate .. //depot/projects/smpng/sys/i386/Makefile#3 integrate .. //depot/projects/smpng/sys/i386/conf/Makefile#5 integrate .. //depot/projects/smpng/sys/i386/conf/OLDCARD#1 branch .. //depot/projects/smpng/sys/i386/i386/in_cksum.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#39 integrate .. //depot/projects/smpng/sys/i386/i386/math_emulate.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#6 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#39 integrate .. //depot/projects/smpng/sys/i386/i386/vm86.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#21 integrate .. //depot/projects/smpng/sys/i386/include/in_cksum.h#4 integrate .. //depot/projects/smpng/sys/i386/include/runq.h#2 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/smpng/sys/i386/include/types.h#4 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#17 integrate .. //depot/projects/smpng/sys/i386/isa/intr_machdep.h#10 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_card.c#2 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_lli.c#4 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia32/imgact_ia32.c#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#31 integrate .. //depot/projects/smpng/sys/ia64/ia64/support.s#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#34 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#14 integrate .. //depot/projects/smpng/sys/ia64/include/runq.h#2 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_acl.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_cap.c#6 delete .. //depot/projects/smpng/sys/kern/kern_descrip.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_lockf.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_module.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_physio.c#3 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#5 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#11 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#8 integrate .. //depot/projects/smpng/sys/kern/md5c.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_disklabel.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_diskslice.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_kobj.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_log.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_prof.c#14 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#35 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#15 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#18 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#9 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#16 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#15 integrate .. //depot/projects/smpng/sys/kern/tty.c#24 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#1 branch .. //depot/projects/smpng/sys/kern/uipc_jumbo.c#1 branch .. //depot/projects/smpng/sys/kern/uipc_socket.c#24 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#17 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#21 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#21 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#23 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#13 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#10 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#6 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#7 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#39 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#26 integrate .. //depot/projects/smpng/sys/modules/ipfw/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/netgraph/device/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sppp/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ti/Makefile#3 integrate .. //depot/projects/smpng/sys/net/bpf.h#4 integrate .. //depot/projects/smpng/sys/net/bridge.c#11 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#17 integrate .. //depot/projects/smpng/sys/net/if_ieee80211.h#3 integrate .. //depot/projects/smpng/sys/net/if_media.c#3 integrate .. //depot/projects/smpng/sys/net/rtsock.c#20 integrate .. //depot/projects/smpng/sys/netatm/atm_cm.c#6 integrate .. //depot/projects/smpng/sys/netatm/atm_device.c#4 integrate .. //depot/projects/smpng/sys/netatm/atm_if.c#5 integrate .. //depot/projects/smpng/sys/netatm/atm_if.h#5 integrate .. //depot/projects/smpng/sys/netatm/atm_subr.c#10 integrate .. //depot/projects/smpng/sys/netatm/atm_sys.h#4 integrate .. //depot/projects/smpng/sys/netatm/atm_var.h#8 integrate .. //depot/projects/smpng/sys/netatm/port.h#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni_lower.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_lower.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_var.h#3 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_cache.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_timer.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_vcm.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/uniip.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/uniip_var.h#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_decode.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_if.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_msg.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_subr.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_util.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_var.h#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_vc_state.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_device.h#1 branch .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#10 integrate .. //depot/projects/smpng/sys/netinet/accf_data.c#6 integrate .. //depot/projects/smpng/sys/netinet/accf_http.c#6 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#14 integrate .. //depot/projects/smpng/sys/netinet/in.c#13 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#26 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#11 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#17 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#8 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#6 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.c#15 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#8 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#1 branch .. //depot/projects/smpng/sys/netinet/ip_input.c#21 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#14 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#24 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#5 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#20 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#20 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#21 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#13 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#22 integrate .. //depot/projects/smpng/sys/netinet/udp_var.h#4 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#16 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.h#5 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#13 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#15 integrate .. //depot/projects/smpng/sys/netkey/keysock.c#10 integrate .. //depot/projects/smpng/sys/netns/spp_usrreq.c#4 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#11 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#11 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#21 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#35 integrate .. //depot/projects/smpng/sys/pc98/pc98/clock.c#10 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#12 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#20 integrate .. //depot/projects/smpng/sys/pccard/i82365.h#6 integrate .. //depot/projects/smpng/sys/pccard/pccard.c#13 integrate .. //depot/projects/smpng/sys/pccard/pcic.c#15 integrate .. //depot/projects/smpng/sys/pccard/pcic_pci.c#21 integrate .. //depot/projects/smpng/sys/pccard/pcic_pci.h#9 integrate .. //depot/projects/smpng/sys/pccard/plxcard.c#2 delete .. //depot/projects/smpng/sys/pccard/plxcardreg.h#2 delete .. //depot/projects/smpng/sys/pci/if_sk.c#8 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#12 integrate .. //depot/projects/smpng/sys/pci/if_tireg.h#2 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#6 integrate .. //depot/projects/smpng/sys/pci/ti_fw.h#2 integrate .. //depot/projects/smpng/sys/pci/ti_fw2.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/runq.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/types.h#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#23 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#14 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#15 integrate .. //depot/projects/smpng/sys/sparc64/include/clock.h#4 integrate .. //depot/projects/smpng/sys/sparc64/include/fp.h#8 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#13 integrate .. //depot/projects/smpng/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/smpng/sys/sparc64/include/runq.h#2 integrate .. //depot/projects/smpng/sys/sparc64/include/smp.h#8 integrate .. //depot/projects/smpng/sys/sparc64/include/tlb.h#12 integrate .. //depot/projects/smpng/sys/sparc64/include/vmparam.h#9 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#4 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#3 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#7 integrate .. //depot/projects/smpng/sys/sparc64/pci/psychoreg.h#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/critical.c#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#30 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.s#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#24 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.s#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#36 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#21 integrate .. //depot/projects/smpng/sys/sys/_lock.h#10 integrate .. //depot/projects/smpng/sys/sys/_mutex.h#8 integrate .. //depot/projects/smpng/sys/sys/_sigset.h#1 branch .. //depot/projects/smpng/sys/sys/_types.h#3 integrate .. //depot/projects/smpng/sys/sys/capability.h#6 delete .. //depot/projects/smpng/sys/sys/disklabel.h#17 integrate .. //depot/projects/smpng/sys/sys/event.h#8 integrate .. //depot/projects/smpng/sys/sys/file.h#10 integrate .. //depot/projects/smpng/sys/sys/jumbo.h#1 branch .. //depot/projects/smpng/sys/sys/kobj.h#2 integrate .. //depot/projects/smpng/sys/sys/ktr.h#9 integrate .. //depot/projects/smpng/sys/sys/malloc.h#10 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#9 integrate .. //depot/projects/smpng/sys/sys/md5.h#3 integrate .. //depot/projects/smpng/sys/sys/mount.h#13 integrate .. //depot/projects/smpng/sys/sys/proc.h#52 integrate .. //depot/projects/smpng/sys/sys/resource.h#6 integrate .. //depot/projects/smpng/sys/sys/select.h#2 integrate .. //depot/projects/smpng/sys/sys/signal.h#6 integrate .. //depot/projects/smpng/sys/sys/snoop.h#4 integrate .. //depot/projects/smpng/sys/sys/socket.h#7 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#22 integrate .. //depot/projects/smpng/sys/sys/stat.h#5 integrate .. //depot/projects/smpng/sys/sys/statvfs.h#1 branch .. //depot/projects/smpng/sys/sys/syscall.h#16 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#16 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#18 integrate .. //depot/projects/smpng/sys/sys/systm.h#31 integrate .. //depot/projects/smpng/sys/sys/tiio.h#1 branch .. //depot/projects/smpng/sys/sys/time.h#9 integrate .. //depot/projects/smpng/sys/sys/tree.h#1 branch .. //depot/projects/smpng/sys/sys/types.h#15 integrate .. //depot/projects/smpng/sys/sys/ucred.h#16 integrate .. //depot/projects/smpng/sys/sys/uio.h#7 integrate .. //depot/projects/smpng/sys/sys/un.h#7 integrate .. //depot/projects/smpng/sys/sys/vnode.h#19 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#12 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#5 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#6 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#7 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#13 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#14 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep_stub.c#4 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_subr.c#4 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_tables.c#3 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#27 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/smpng/sys/ufs/ffs/fs.h#7 integrate .. //depot/projects/smpng/sys/ufs/ffs/softdep.h#3 integrate .. //depot/projects/smpng/sys/ufs/ufs/dinode.h#4 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#4 integrate .. //depot/projects/smpng/sys/ufs/ufs/quota.h#4 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#10 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#5 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#16 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#7 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#7 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#10 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#13 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_readwrite.c#10 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#16 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#6 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#6 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#5 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#15 integrate .. //depot/projects/smpng/sys/vm/uma.h#5 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#16 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#9 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#6 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#12 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#13 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#6 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#17 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#11 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#20 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#14 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#7 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#17 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#9 integrate .. //depot/projects/smpng/sys/vm/vm_pager.c#8 integrate .. //depot/projects/smpng/sys/vm/vm_unix.c#5 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#15 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#31 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.92 2002/04/29 07:43:08 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.93 2002/06/27 04:08:45 jeff Exp $ */ /* @@ -610,7 +610,7 @@ if (initial_pvs < MINPV) initial_pvs = MINPV; pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, 0); + NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); uma_zone_set_allocf(pvzone, pmap_allocf); uma_prealloc(pvzone, initial_pvs); /* ==== //depot/projects/smpng/sys/alpha/alpha/support.s#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.10 2002/05/26 16:03:12 dfr Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.12 2002/06/20 07:40:53 peter Exp $ */ /* @@ -150,11 +150,6 @@ RET END(fubyte) - LEAF(suibyte, 2) - ldiq v0, -1 - RET - END(suibyte) - LEAF(fusufault, 0) ldq t0, PC_CURTHREAD(pcpup) ldq t0, TD_PCB(t0) @@ -164,8 +159,8 @@ END(fusufault) LEAF(fswintrberr, 0) -XLEAF(fuswintr, 2) /* XXX what is a 'word'? */ -XLEAF(suswintr, 2) /* XXX what is a 'word'? */ +XLEAF(fuswintr, 2) /* XXX 16 bit short for profiling */ +XLEAF(suswintr, 2) /* XXX 16 bit short for profiling */ LDGP(pv) ldiq v0, -1 RET ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#34 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.94 2002/06/07 05:47:34 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.95 2002/06/24 06:21:52 mini Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#11 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.66 2002/04/05 00:52:15 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.67 2002/06/24 15:48:00 jake Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -248,6 +248,12 @@ } void +cpu_sched_exit(td) + register struct thread *td; +{ +} + +void cpu_wait(p) struct proc *p; { ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#19 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.138 2002/05/03 17:59:21 jmallett Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.140 2002/06/16 06:48:42 mjacob Exp $ machine alpha cpu EV4 @@ -130,7 +130,7 @@ # real time clock device mcclock -# Serial (COM) ports +# Serial (COM) ports (required) device sio # 8250, 16[45]50 based serial ports # Parallel port ==== //depot/projects/smpng/sys/alpha/include/runq.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/runq.h,v 1.1 2002/05/25 01:12:15 jake Exp $ + * $FreeBSD: src/sys/alpha/include/runq.h,v 1.2 2002/06/20 06:21:19 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1UL << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs64(word)) +#define RQB_FFS(word) (ffs64(word) - 1) /* * Type of run queue status word. ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.30 2002/04/13 23:11:22 jhb Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.31 2002/06/19 06:39:25 alfred Exp $ */ @@ -1056,17 +1056,20 @@ struct proc *p; int error; uid_t uid; + struct uidinfo *uip; struct ucred *newcred, *oldcred; p = td->td_proc; uid = SCARG(uap, uid); newcred = crget(); + uip = uifind(uid); PROC_LOCK(p); oldcred = p->p_ucred; if ((error = suser_cred(p->p_ucred, PRISON_ROOT)) != 0 && uid != oldcred->cr_ruid && uid != oldcred->cr_svuid) { PROC_UNLOCK(p); + uifree(uip); crfree(newcred); return (error); } @@ -1074,7 +1077,7 @@ crcopy(newcred, oldcred); if (error == 0) { if (uid != oldcred->cr_ruid) { - change_ruid(newcred, uid); + change_ruid(newcred, uip); setsugid(p); } if (oldcred->cr_svuid != uid) { @@ -1083,11 +1086,12 @@ } } if (newcred->cr_uid != uid) { - change_euid(newcred, uid); + change_euid(newcred, uip); setsugid(p); } p->p_ucred = newcred; PROC_UNLOCK(p); + uifree(uip); crfree(oldcred); return (0); } ==== //depot/projects/smpng/sys/arm/include/types.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/types.h,v 1.2 2002/03/20 18:22:19 alfred Exp $ + * $FreeBSD: src/sys/arm/include/types.h,v 1.3 2002/06/23 21:57:17 iedowse Exp $ */ #ifndef _MACHINE_TYPES_H_ @@ -49,7 +49,7 @@ typedef unsigned int vm_offset_t; typedef __int64_t vm_ooffset_t; -typedef unsigned int vm_pindex_t; +typedef __uint64_t vm_pindex_t; typedef unsigned int vm_size_t; typedef __int32_t register_t; ==== //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $ -# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.12 2002/05/10 09:26:27 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.13 2002/06/11 06:56:31 phk Exp $ .include <../Makefile.inc> @@ -7,7 +7,7 @@ .PATH: ${.CURDIR}/../libalpha -SRCS= start.S boot1.c sys.c +SRCS= start.S boot1.c CFLAGS+= -ffreestanding -mno-fp-regs CFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -DMINIMAL CFLAGS+= -DBOOT1 ==== //depot/projects/smpng/sys/boot/alpha/boot1/boot1.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.9 2000/10/25 23:24:43 dfr Exp $ + * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.12 2002/06/29 02:32:32 peter Exp $ * From $NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ */ @@ -32,18 +32,42 @@ #include #include +#include +#include #include #include #define DEBUGxx +void puts(const char *s); +void puthex(u_long v); +static int dskread(void *, u_int64_t, size_t); + +#define printf(...) \ +while (0) + +#define memcpy(dst, src, len) \ +bcopy(src, dst, len) + +#include "ufsread.c" + extern end[]; int errno; char *heap = (char*) end; void +bcopy(const void *src, void *dst, size_t len) +{ + const char *s; + char *d; + + for (d = dst, s = src; len; len--) + *d++ = *s++; +} + +void putchar(int c) { if (c == '\n') @@ -70,21 +94,7 @@ putchar(*s++); } -void * -malloc(size_t size) -{ - char *p = heap; - size = (size + 7) & ~7; - heap += size; - return p; -} - void -free(void * p) -{ -} - -void panic(const char *message, ...) { puts(message); @@ -124,6 +134,7 @@ int digit; char hex[] = "0123456789abcdef"; + puts("0x"); if (!v) { puts("0"); return; @@ -138,11 +149,11 @@ #endif -void -devread(char *buf, int block, size_t size) +int +dskread(void *buf, u_int64_t block, size_t size) { #ifdef DEBUG - puts("devread("); + puts("dskread("); puthex((u_long)buf); puts(","); puthex(block); @@ -151,7 +162,8 @@ puts(")\n"); #endif - prom_read(prom_fd, size, buf, block); + prom_read(prom_fd, size * DEV_BSIZE, buf, block); + return (0); } static inline void @@ -189,17 +201,22 @@ return; } +static struct dmadat __dmadat; + static inline void loadfile(char *name, char *addr) { int n; char *p; + ino_t ino; puts("Loading "); puts(name); puts("\n"); - if (openrd(name)) { + dmadat = &__dmadat; + + if (devopen() || (ino = lookup(name)) == 0) { puts("Can't open file "); puts(name); puts("\n"); @@ -208,10 +225,16 @@ p = addr; do { - n = readit(p, 1024); + n = fsread(ino, p, VBLKSIZE); + if (n < 0) { + puts("Can't read file "); + puts(name); + puts("\n"); + halt(); + } p += n; twiddle(); - } while (n > 0); + } while (n == VBLKSIZE); devclose(); } @@ -230,7 +253,7 @@ char *name = "/boot/loader"; char *p; char filename[512]; - void (*entry) __P((void)); + void (*entry)(void); u_long start, freq; int i; ==== //depot/projects/smpng/sys/boot/alpha/libalpha/common.h#2 (text+ko) ==== @@ -1,11 +1,11 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.2 1999/08/28 00:39:26 peter Exp $ + * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.3 2002/06/29 02:32:32 peter Exp $ * From: $NetBSD: common.h,v 1.2 1998/01/05 07:02:48 perry Exp $ */ -int prom_open __P((char*, int)); -void OSFpal __P((void)); -void halt __P((void)); -u_int64_t prom_dispatch __P((int, ...)); -int cpu_number __P((void)); -void switch_palcode __P((void)); +int prom_open(char*, int); +void OSFpal(void); +void halt(void); +u_int64_t prom_dispatch(int, ...); +int cpu_number(void); +void switch_palcode(void); ==== //depot/projects/smpng/sys/boot/common/ufsread.c#2 (text+ko) ==== @@ -1,4 +1,13 @@ /* + * Copyright (c) 2002 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by Marshall + * Kirk McKusick and Network Associates Laboratories, the Security + * Research Division of Network Associates, Inc. under DARPA/SPAWAR + * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS + * research program + * * Copyright (c) 1998 Robert Nordier * All rights reserved. * @@ -14,34 +23,36 @@ */ /* - * $FreeBSD: src/sys/boot/common/ufsread.c,v 1.3 2002/06/05 12:00:49 phk Exp $ + * $FreeBSD: src/sys/boot/common/ufsread.c,v 1.5 2002/06/21 22:33:56 jake Exp $ */ +#include #include -#include /* * We use 4k `virtual' blocks for filesystem data, whatever the actual * filesystem block size. FFS blocks are always a multiple of 4k. */ #define VBLKSIZE 4096 +#define VBLKSHIFT 12 #define VBLKMASK (VBLKSIZE - 1) #define DBPERVBLK (VBLKSIZE / DEV_BSIZE) -#define IPERVBLK (VBLKSIZE / sizeof(struct dinode)) -#define INDIRPERVBLK (VBLKSIZE / sizeof(ufs_daddr_t)) -#define INO_TO_VBA(fs, x) (fsbtodb(fs, ino_to_fsba(fs, x)) + \ - (ino_to_fsbo(fs, x) / IPERVBLK) * DBPERVBLK) -#define INO_TO_VBO(fs, x) (ino_to_fsbo(fs, x) % IPERVBLK) +#define INDIRPERVBLK(fs) (NINDIR(fs) / ((fs)->fs_bsize / VBLKSIZE)) +#define IPERVBLK(fs) (INOPB(fs) / ((fs)->fs_bsize / VBLKSIZE)) +#define INO_TO_VBA(fs, ipervblk, x) \ + (fsbtodb(fs, cgimin(fs, ino_to_cg(fs, x))) + \ + (((x) % (fs)->fs_ipg) / (ipervblk) * DBPERVBLK)) +#define INO_TO_VBO(ipervblk, x) ((x) % ipervblk) #define FS_TO_VBA(fs, fsb, off) (fsbtodb(fs, fsb) + \ ((off) / VBLKSIZE) * DBPERVBLK) #define FS_TO_VBO(fs, fsb, off) ((off) & VBLKMASK) /* Buffers that must not span a 64k boundary. */ struct dmadat { - char blkbuf[VBLKSIZE]; /* filesystem blocks */ - ufs_daddr_t indbuf[VBLKSIZE / sizeof(ufs_daddr_t)]; /* indir blocks */ - char sbbuf[SBSIZE]; /* superblock */ - char secbuf[DEV_BSIZE]; /* for MBR/disklabel */ + char blkbuf[VBLKSIZE]; /* filesystem blocks */ + char indbuf[VBLKSIZE]; /* indir blocks */ + char sbbuf[SBLOCKSIZE]; /* superblock */ + char secbuf[DEV_BSIZE]; /* for MBR/disklabel */ }; static struct dmadat *dmadat; @@ -61,16 +72,16 @@ fs_off = 0; while ((n = fsread(*ino, buf, DEV_BSIZE)) > 0) - for (s = buf; s < buf + DEV_BSIZE;) { - d = (void *)s; - if (ls) - printf("%s ", d->d_name); - else if (!strcmp(name, d->d_name)) { - *ino = d->d_fileno; - return d->d_type; + for (s = buf; s < buf + DEV_BSIZE;) { + d = (void *)s; + if (ls) + printf("%s ", d->d_name); + else if (!strcmp(name, d->d_name)) { + *ino = d->d_fileno; + return d->d_type; + } + s += d->d_reclen; } - s += d->d_reclen; - } if (n != -1 && ls) printf("\n"); return 0; @@ -95,8 +106,8 @@ if (!*path) break; for (s = path; *s && *s != '/'; s++); - if ((n = s - path) > MAXNAMLEN) - return 0; + if ((n = s - path) > MAXNAMLEN) + return 0; ls = *path == '?' && n == 1 && !*s; memcpy(name, path, n); name[n] = 0; @@ -111,28 +122,134 @@ return dt == DT_REG ? ino : 0; } +#ifndef __sparc64__ +#define UFS1_ONLY +#endif +#ifdef UFS1_ONLY + static ssize_t fsread(ino_t inode, void *buf, size_t nbyte) { - static struct dinode din; + static struct ufs1_dinode dp1; static ino_t inomap; - static daddr_t blkmap, indmap; char *blkbuf; - ufs_daddr_t *indbuf; + caddr_t indbuf; struct fs *fs; char *s; - ufs_daddr_t lbn, addr; - daddr_t vbaddr; - size_t n, nb, off, vboff; + size_t n, nb, size, off, vboff; + long lbn; + ufs1_daddr_t addr, vbaddr; + static ufs1_daddr_t blkmap, indmap; blkbuf = dmadat->blkbuf; indbuf = dmadat->indbuf; fs = (struct fs *)dmadat->sbbuf; if (!dsk_meta) { inomap = 0; - if (dskread(fs, SBOFF / DEV_BSIZE, SBSIZE / DEV_BSIZE)) + if (dskread(fs, SBLOCK_UFS1 / DEV_BSIZE, SBLOCKSIZE / DEV_BSIZE)) + return -1; + if (fs->fs_magic != FS_UFS1_MAGIC) { + printf("Not ufs\n"); + return -1; + } >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 8 21:32:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB16937B405; Mon, 8 Jul 2002 21:32:34 -0700 (PDT) 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 91CB137B400 for ; Mon, 8 Jul 2002 21:32:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 508BA43E52 for ; Mon, 8 Jul 2002 21:32:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g694WYJU078430 for ; Mon, 8 Jul 2002 21:32:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g694WXFA078427 for perforce@freebsd.org; Mon, 8 Jul 2002 21:32:33 -0700 (PDT) Date: Mon, 8 Jul 2002 21:32:33 -0700 (PDT) Message-Id: <200207090432.g694WXFA078427@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13946 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13946 Change 13946 by rwatson@rwatson_paprika on 2002/07/08 21:31:53 More cleanup editing. Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/modules.conf#3 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmacmanager/modules.conf#3 (text+ko) ==== @@ -32,13 +32,13 @@ # # module:provider:description:options # -sebsd:NSA/NAI Labs:NSA SELinux/FLASK/TE:noload,nounload mac_biba:TrustedBSD:Biba integrity:noload,nounload mac_bsdextended:TrustedBSD:UID/GID file firewall -mac_ifoff:TrustedBSD:secure interface silencing +mac_ifoff:TrustedBSD:Secure interface silencing mac_mls:TrustedBSD:Multi-Level Security (MLS) confidentiality:noload,nounload mac_none:TrustedBSD:Null policy mac_partition:TrustedBSD:System partitioning mac_seeotheruids:TrustedBSD:Limit inter-user process operations mac_test:TrustedBSD:Test module mac_te:TrustedBSD:Type Enforcement:noload,nounload +sebsd:NSA/NAI Labs:SELinux/FLASK/TE:noload,nounload To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 8 21:32:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E87A337B40D; Mon, 8 Jul 2002 21:32:35 -0700 (PDT) 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 D5CB937B401 for ; Mon, 8 Jul 2002 21:32:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FB1843E58 for ; Mon, 8 Jul 2002 21:32:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g694WYJU078437 for ; Mon, 8 Jul 2002 21:32:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g694WYaR078434 for perforce@freebsd.org; Mon, 8 Jul 2002 21:32:34 -0700 (PDT) Date: Mon, 8 Jul 2002 21:32:34 -0700 (PDT) Message-Id: <200207090432.g694WYaR078434@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13947 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13947 Change 13947 by rwatson@rwatson_paprika on 2002/07/08 21:32:17 Gratuitous whitespace change. Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/sysctllist.cc#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmacmanager/sysctllist.cc#2 (text+ko) ==== @@ -58,7 +58,8 @@ }; static sysctl_entry * -make_sysctl_entry(QListView *parent, struct sysctl_entry **list, char *name) +make_sysctl_entry(QListView *parent, struct sysctl_entry **list, + char *name) { struct sysctl_entry *temp; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 8 21:33:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3ACA37B401; Mon, 8 Jul 2002 21:33:36 -0700 (PDT) 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 8E63137B400 for ; Mon, 8 Jul 2002 21:33:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A56B43E58 for ; Mon, 8 Jul 2002 21:33:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g694XaJU078521 for ; Mon, 8 Jul 2002 21:33:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g694Xa2W078518 for perforce@freebsd.org; Mon, 8 Jul 2002 21:33:36 -0700 (PDT) Date: Mon, 8 Jul 2002 21:33:36 -0700 (PDT) Message-Id: <200207090433.g694Xa2W078518@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13948 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13948 Change 13948 by rwatson@rwatson_paprika on 2002/07/08 21:33:03 Teach the main class how to cause Konqueror windows to refresh using dcop, and add a menu option for it. Eventually, should do this following relevant policy changes. Due to bugs in Konqueror, I'm not sure it's possible to get all browsers to refresh, only most. Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/test.cc#2 edit .. //depot/projects/trustedbsd/misc/kmacmanager/test.h#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmacmanager/test.cc#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include "test.moc" +#include #include #include @@ -45,6 +46,8 @@ file = new QPopupMenu(); file->insertItem("&About", this, SLOT(slotAbout())); + file->insertItem("Refresh &konquerors", this, + SLOT(slotRefreshKonquerors())); file->insertItem("Refresh &modules", this, SLOT(slotRefreshModules())); file->insertItem("Refresh &sysctls", this, SLOT(slotRefreshSysctls())); file->insertSeparator(); @@ -82,6 +85,15 @@ "Network Associates, Inc."); } +void Test::slotRefreshKonquerors() +{ + + if (!kapp->dcopClient()->isAttached()) + kapp->dcopClient()->attach(); + kapp->dcopClient()->send("konqueror*", "konqueror-mainwindow#1", + "reload()", ""); +} + void Test::slotRefreshModules() { ==== //depot/projects/trustedbsd/misc/kmacmanager/test.h#2 (text+ko) ==== @@ -58,6 +58,7 @@ void closeEvent(QCloseEvent *); public slots: void slotAbout(); + void slotRefreshKonquerors(); void slotRefreshModules(); void slotRefreshSysctls(); void slotExit(); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 8 21:33:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CCD437B400; Mon, 8 Jul 2002 21:33:38 -0700 (PDT) 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 F3E5737B40C for ; Mon, 8 Jul 2002 21:33:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A29043E58 for ; Mon, 8 Jul 2002 21:33:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g694XaJU078528 for ; Mon, 8 Jul 2002 21:33:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g694XaYM078525 for perforce@freebsd.org; Mon, 8 Jul 2002 21:33:36 -0700 (PDT) Date: Mon, 8 Jul 2002 21:33:36 -0700 (PDT) Message-Id: <200207090433.g694XaYM078525@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 13949 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13949 Change 13949 by rwatson@rwatson_paprika on 2002/07/08 21:33:27 Add konqueror action to the list of todo items. Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/TODO#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmacmanager/TODO#2 (text+ko) ==== @@ -5,4 +5,4 @@ refresh only one sysctl entry on sysctl change, not all - +reload konquerors at the right moments To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 9 13:37: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7779E37B401; Tue, 9 Jul 2002 13:36:39 -0700 (PDT) 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 13E4A37B400 for ; Tue, 9 Jul 2002 13:36:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9FD843E3B for ; Tue, 9 Jul 2002 13:36:38 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g69KacJU082038 for ; Tue, 9 Jul 2002 13:36:38 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g69KacId082034 for perforce@freebsd.org; Tue, 9 Jul 2002 13:36:38 -0700 (PDT) Date: Tue, 9 Jul 2002 13:36:38 -0700 (PDT) Message-Id: <200207092036.g69KacId082034@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 13992 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13992 Change 13992 by jhb@jhb_laptop on 2002/07/09 13:36:07 Clean up alpha MD thread flags. Move uac settings to mdproc since they are process wide. Rename remaining per-thread flags to MDTD_FOO instead of MDP_FOO. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/exception.s#6 edit .. //depot/projects/smpng/sys/alpha/alpha/genassym.c#11 edit .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#44 edit .. //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#10 edit .. //depot/projects/smpng/sys/alpha/alpha/trap.c#35 edit .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#12 edit .. //depot/projects/smpng/sys/alpha/include/proc.h#5 edit .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#10 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/exception.s#6 (text+ko) ==== @@ -151,7 +151,7 @@ /* set the hae register if this process has specified a value */ ldq t1, TD_MD_FLAGS(s0) - and t1, MDP_HAEUSED + and t1, MDTD_HAEUSED beq t1, 3f ldq a0, TD_MD_HAE(s0) ldq pv, chipset + CHIPSET_WRITE_HAE @@ -302,7 +302,7 @@ Lrestoreregs: /* set the hae register if this process has specified a value */ ldq t1, TD_MD_FLAGS(s0) - and t1, MDP_HAEUSED + and t1, MDTD_HAEUSED beq t1, Lnohae ldq a0, TD_MD_HAE(t0) ldq pv, chipset + CHIPSET_WRITE_HAE ==== //depot/projects/smpng/sys/alpha/alpha/genassym.c#11 (text+ko) ==== @@ -92,7 +92,7 @@ #ifdef SMP ASSYM(TD_MD_KERNNEST, offsetof(struct thread, td_md.md_kernnest)); #endif -ASSYM(MDP_HAEUSED, MDP_HAEUSED); +ASSYM(MDTD_HAEUSED, MDTD_HAEUSED); ASSYM(CHIPSET_WRITE_HAE, offsetof(struct alpha_chipset, write_hae)); ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#44 (text+ko) ==== @@ -1209,7 +1209,7 @@ /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); /* XXX maybe write=0 */ - ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDP_FPUSED; + ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; bcopy(&td->td_pcb->pcb_fp, (struct fpreg *)ksi.si_sc.sc_fpregs, sizeof(struct fpreg)); ksi.si_sc.sc_fp_control = td->td_pcb->pcb_fp_control; @@ -1332,7 +1332,7 @@ #endif /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); - sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDP_FPUSED; + sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; bcopy(&td->td_pcb->pcb_fp, (struct fpreg *)sf.sf_uc.uc_mcontext.mc_fpregs, sizeof(struct fpreg)); @@ -1606,7 +1606,7 @@ tfp->tf_regs[FRAME_T12] = tfp->tf_regs[FRAME_PC]; /* a.k.a. PV */ tfp->tf_regs[FRAME_FLAGS] = 0; /* full restore */ - td->td_md.md_flags &= ~MDP_FPUSED; + td->td_md.md_flags &= ~MDTD_FPUSED; alpha_fpstate_drop(td); } @@ -1720,13 +1720,13 @@ int ptrace_clear_single_step(struct thread *td) { - if (td->td_md.md_flags & MDP_STEP2) { + if (td->td_md.md_flags & MDTD_STEP2) { ptrace_clear_bpt(td, &td->td_md.md_sstep[1]); ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); - td->td_md.md_flags &= ~MDP_STEP2; - } else if (td->td_md.md_flags & MDP_STEP1) { + td->td_md.md_flags &= ~MDTD_STEP2; + } else if (td->td_md.md_flags & MDTD_STEP1) { ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); - td->td_md.md_flags &= ~MDP_STEP1; + td->td_md.md_flags &= ~MDTD_STEP1; } return 0; } @@ -1740,7 +1740,7 @@ vm_offset_t addr[2]; /* places to set breakpoints */ int count = 0; /* count of breakpoints */ - if (td->td_md.md_flags & (MDP_STEP1|MDP_STEP2)) + if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) panic("ptrace_single_step: step breakpoints not removed"); error = ptrace_read_int(td, pc, &ins.bits); @@ -1793,9 +1793,9 @@ ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); return error; } - td->td_md.md_flags |= MDP_STEP2; + td->td_md.md_flags |= MDTD_STEP2; } else - td->td_md.md_flags |= MDP_STEP1; + td->td_md.md_flags |= MDTD_STEP1; return 0; } @@ -2132,7 +2132,7 @@ SET_FEN(td); } - td->td_md.md_flags |= MDP_FPUSED; + td->td_md.md_flags |= MDTD_FPUSED; intr_restore(s); } ==== //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#10 (text+ko) ==== @@ -122,7 +122,7 @@ if (error) return (error); - td->td_md.md_flags |= MDP_HAEUSED; + td->td_md.md_flags |= MDTD_HAEUSED; td->td_md.md_hae = ua.hae; return (0); @@ -169,8 +169,7 @@ { int error; unsigned long uac; - struct proc *p; - struct thread *td2; + struct proc *p, *pp; error = copyin(args, &uac, sizeof(uac)); if (error) @@ -178,13 +177,11 @@ p = td->td_proc; PROC_LOCK(p); - if (p->p_pptr) { - PROC_LOCK(p->p_pptr); - /* XXXKSE which threads? */ - td2 = FIRST_THREAD_IN_PROC(p->p_pptr); - td2->td_md.md_flags &= ~MDP_UAC_MASK; - td2->td_md.md_flags |= uac & MDP_UAC_MASK; - PROC_UNLOCK(p->p_pptr); + pp = p->p_pptr; + if (pp != NULL) { + PROC_LOCK(pp); + pp->p_md.md_uac = uac & MDP_UAC_MASK; + PROC_UNLOCK(pp); } PROC_UNLOCK(p); return 0; @@ -193,20 +190,18 @@ static int alpha_get_uac(struct thread *td, char *args) { - struct proc *p; - struct thread *td2; + struct proc *p, *pp; int error; unsigned long uac; p = td->td_proc; error = ESRCH; PROC_LOCK(p); - if (p->p_pptr) { - PROC_LOCK(p->p_pptr); - /* XXXKSE which threads? */ - td2 = FIRST_THREAD_IN_PROC(p->p_pptr); - uac = td2->td_md.md_flags & MDP_UAC_MASK; - PROC_UNLOCK(p->p_pptr); + pp = p->p_pptr; + if (pp != NULL) { + PROC_LOCK(pp); + uac = p->p_md.md_uac; + PROC_UNLOCK(pp); PROC_UNLOCK(p); error = copyout(&uac, args, sizeof(uac)); } else ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#35 (text+ko) ==== @@ -400,7 +400,7 @@ /* FALLTHROUTH */ case ALPHA_IF_CODE_BPT: case ALPHA_IF_CODE_BUGCHK: - if (td->td_md.md_flags & (MDP_STEP1|MDP_STEP2)) { + if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) { mtx_lock(&Giant); ptrace_clear_single_step(td); td->td_frame->tf_regs[FRAME_PC] -= 4; @@ -1009,8 +1009,8 @@ */ if (td) { - uac = td->td_md.md_flags & MDP_UAC_MASK; p = td->td_proc; + uac = p->p_md.md_uac; } else { uac = 0; p = NULL; ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#12 (text+ko) ==== @@ -133,7 +133,8 @@ p1 = td1->td_proc; td2->td_pcb = (struct pcb *) (td2->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - td2->td_md.md_flags = td1->td_md.md_flags & (MDP_FPUSED | MDP_UAC_MASK); + td2->td_md.md_flags = td1->td_md.md_flags & MDTD_FPUSED; + p2->p_md.md_uac = p1->p_md.md_uac; /* * Cache the physical address of the pcb, so we can ==== //depot/projects/smpng/sys/alpha/include/proc.h#5 (text+ko) ==== @@ -40,6 +40,11 @@ u_int32_t contents; }; +#define MDTD_FPUSED 0x0001 /* Process used the FPU */ +#define MDTD_STEP1 0x0002 /* Single step normal instruction */ +#define MDTD_STEP2 0x0004 /* Single step branch instruction */ +#define MDTD_HAEUSED 0x0008 /* Process used the HAE */ + struct mdthread { u_long md_flags; struct pcb *md_pcbpaddr; /* phys addr of the pcb */ @@ -50,17 +55,14 @@ register_t md_savecrit; /* save PSL for critical section */ }; -#define MDP_FPUSED 0x0001 /* Process used the FPU */ -#define MDP_STEP1 0x0002 /* Single step normal instruction */ -#define MDP_STEP2 0x0004 /* Single step branch instruction */ -#define MDP_HAEUSED 0x0008 /* Process used the HAE */ -#define MDP_UAC_NOPRINT 0x0010 /* Don't print unaligned traps */ -#define MDP_UAC_NOFIX 0x0020 /* Don't fixup unaligned traps */ -#define MDP_UAC_SIGBUS 0x0040 /* Deliver SIGBUS upon +#define MDP_UAC_NOPRINT 0x0010 /* Don't print unaligned traps */ +#define MDP_UAC_NOFIX 0x0020 /* Don't fixup unaligned traps */ +#define MDP_UAC_SIGBUS 0x0040 /* Deliver SIGBUS upon unaligned access */ -#define MDP_UAC_MASK (MDP_UAC_NOPRINT | MDP_UAC_NOFIX | MDP_UAC_SIGBUS) +#define MDP_UAC_MASK (MDP_UAC_NOPRINT | MDP_UAC_NOFIX | MDP_UAC_SIGBUS) struct mdproc { + u_int md_uac; /* Unaligned Access Check flags. */ }; #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#10 (text+ko) ==== @@ -631,7 +631,7 @@ /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); /* XXX maybe write=0 */ - ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDP_FPUSED; + ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; bcopy(&td->td_pcb->pcb_fp, (struct fpreg *)ksi.si_sc.sc_fpregs, sizeof(struct fpreg)); ksi.si_sc.sc_fp_control = td->td_pcb->pcb_fp_control; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 9 14:21:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6541937B401; Tue, 9 Jul 2002 14:21:35 -0700 (PDT) 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 D3CC137B400 for ; Tue, 9 Jul 2002 14:21:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A2CE43E31 for ; Tue, 9 Jul 2002 14:21:34 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g69LLYJU092122 for ; Tue, 9 Jul 2002 14:21:34 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g69LLYBh092119 for perforce@freebsd.org; Tue, 9 Jul 2002 14:21:34 -0700 (PDT) Date: Tue, 9 Jul 2002 14:21:34 -0700 (PDT) Message-Id: <200207092121.g69LLYBh092119@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 13995 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13995 Change 13995 by jhb@jhb_laptop on 2002/07/09 14:21:31 Get rid of gross mtx_owned()'s. This still isn't pretty. I need to figure out a better way of handling this. Affected files ... .. //depot/projects/smpng/sys/i386/i386/machdep.c#40 edit .. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#20 edit .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#22 edit .. //depot/projects/smpng/sys/i386/include/proc.h#7 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/machdep.c#40 (text+ko) ==== @@ -825,8 +825,11 @@ struct trapframe *regs = td->td_frame; struct pcb *pcb = td->td_pcb; + mtx_lock_spin(&sched_lock); if (td->td_proc->p_md.md_ldt) user_ldt_free(td); + else + mtx_unlock_spin(&sched_lock); bzero((char *)regs, sizeof(struct trapframe)); regs->tf_eip = entry; ==== //depot/projects/smpng/sys/i386/i386/sys_machdep.c#20 (text+ko) ==== @@ -286,7 +286,7 @@ #endif /* - * Must be called with either sched_lock free or held but not recursed. + * Must be called with sched_lock held but not recursed. * If it does not return NULL, it will return with it owned. */ struct proc_ldt * @@ -294,9 +294,8 @@ { struct proc_ldt *pldt, *new_ldt; - if (mtx_owned(&sched_lock)) - mtx_unlock_spin(&sched_lock); - mtx_assert(&sched_lock, MA_NOTOWNED); + mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED); + mtx_unlock_spin(&sched_lock); MALLOC(new_ldt, struct proc_ldt *, sizeof(struct proc_ldt), M_SUBPROC, M_WAITOK); @@ -327,7 +326,7 @@ } /* - * Must be called either with sched_lock free or held but not recursed. + * Must be called with sched_lock held but not recursed. * If md_ldt is not NULL, it will return with sched_lock released. */ void @@ -339,8 +338,6 @@ if (pldt == NULL) return; - if (!mtx_owned(&sched_lock)) - mtx_lock_spin(&sched_lock); mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED); if (td == PCPU_GET(curthread)) { lldt(_default_ldt); @@ -407,7 +404,7 @@ int error = 0, i, n; int largest_ld; struct mdproc *mdp = &td->td_proc->p_md; - struct proc_ldt *pldt = mdp->md_ldt; + struct proc_ldt *pldt; struct i386_ldt_args ua, *uap = &ua; caddr_t old_ldt_base; int old_ldt_len; @@ -432,8 +429,12 @@ return(EINVAL); /* allocate user ldt */ + mtx_lock_spin(&sched_lock); + pldt = mdp->md_ldt; if (!pldt || largest_ld >= pldt->ldt_len) { - struct proc_ldt *new_ldt = user_ldt_alloc(mdp, largest_ld); + struct proc_ldt *new_ldt; + + new_ldt = user_ldt_alloc(mdp, largest_ld); if (new_ldt == NULL) return ENOMEM; if (pldt) { @@ -463,7 +464,8 @@ set_user_ldt(mdp); mtx_unlock_spin(&sched_lock); #endif - } + } else + mtx_unlock_spin(&sched_lock); /* Check descriptors for access violations */ for (i = 0, n = uap->start; i < uap->num; i++, n++) { ==== //depot/projects/smpng/sys/i386/i386/vm_machdep.c#22 (text+ko) ==== @@ -135,7 +135,10 @@ if ((flags & RFMEM) == 0) { /* unshare user LDT */ struct mdproc *mdp1 = &p1->p_md; - struct proc_ldt *pldt = mdp1->md_ldt; + struct proc_ldt *pldt; + + mtx_lock_spin(&sched_lock); + pltd = mdp1->md_ldt; if (pldt && pldt->ldt_refcnt > 1) { pldt = user_ldt_alloc(mdp1, pldt->ldt_len); if (pldt == NULL) @@ -143,7 +146,8 @@ mdp1->md_ldt = pldt; set_user_ldt(mdp1); user_ldt_free(td1); - } + } else + mtx_unlock_spin(&sched_lock); } return; } @@ -210,7 +214,7 @@ /* Copy the LDT, if necessary. */ mtx_lock_spin(&sched_lock); - if (mdp2->md_ldt != 0) { + if (mdp2->md_ldt != NULL) { if (flags & RFMEM) { mdp2->md_ldt->ldt_refcnt++; } else { @@ -271,8 +275,11 @@ ctob(IOPAGES + 1)); pcb->pcb_ext = 0; } + mtx_lock_spin(&sched_lock); if (mdp->md_ldt) user_ldt_free(td); + else + mtx_unlock_spin(&sched_lock); if (pcb->pcb_flags & PCB_DBREGS) { /* * disable all hardware breakpoints ==== //depot/projects/smpng/sys/i386/include/proc.h#7 (text+ko) ==== @@ -55,7 +55,7 @@ }; struct mdproc { - struct proc_ldt *md_ldt; /* per-process ldt */ + struct proc_ldt *md_ldt; /* (j) per-process ldt */ }; #ifdef _KERNEL To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 9 14:25:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9816437B401; Tue, 9 Jul 2002 14:25:07 -0700 (PDT) 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 4DA6137B400; Tue, 9 Jul 2002 14:25:07 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id F05EA43E3B; Tue, 9 Jul 2002 14:25:05 -0700 (PDT) (envelope-from arr@watson.org) Received: from fledge.watson.org (localhost [127.0.0.1]) by fledge.watson.org (8.12.4/8.12.4) with ESMTP id g69LP1bL060530; Tue, 9 Jul 2002 17:25:01 -0400 (EDT) (envelope-from arr@watson.org) Received: from localhost (arr@localhost) by fledge.watson.org (8.12.4/8.12.4/Submit) with SMTP id g69LP1p6060527; Tue, 9 Jul 2002 17:25:01 -0400 (EDT) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Tue, 9 Jul 2002 17:25:01 -0400 (EDT) From: "Andrew R. Reiter" To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 13995 for review In-Reply-To: <200207092121.g69LLYBh092119@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, 9 Jul 2002, John Baldwin wrote: :http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13995 : :Change 13995 by jhb@jhb_laptop on 2002/07/09 14:21:31 : : Get rid of gross mtx_owned()'s. This still isn't pretty. : I need to figure out a better way of handling this. : :Affected files ... : :.. //depot/projects/smpng/sys/i386/i386/machdep.c#40 edit :.. //depot/projects/smpng/sys/i386/i386/sys_machdep.c#20 edit :.. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#22 edit :.. //depot/projects/smpng/sys/i386/include/proc.h#7 edit : :Differences ... : :==== //depot/projects/smpng/sys/i386/i386/machdep.c#40 (text+ko) ==== : :@@ -825,8 +825,11 @@ : struct trapframe *regs = td->td_frame; : struct pcb *pcb = td->td_pcb; : :+ mtx_lock_spin(&sched_lock); : if (td->td_proc->p_md.md_ldt) : user_ldt_free(td); :+ else :+ mtx_unlock_spin(&sched_lock); : : bzero((char *)regs, sizeof(struct trapframe)); : regs->tf_eip = entry; : :==== //depot/projects/smpng/sys/i386/i386/sys_machdep.c#20 (text+ko) ==== : :@@ -286,7 +286,7 @@ : #endif : : /* :- * Must be called with either sched_lock free or held but not recursed. :+ * Must be called with sched_lock held but not recursed. : * If it does not return NULL, it will return with it owned. : */ : struct proc_ldt * :@@ -294,9 +294,8 @@ : { : struct proc_ldt *pldt, *new_ldt; : :- if (mtx_owned(&sched_lock)) :- mtx_unlock_spin(&sched_lock); :- mtx_assert(&sched_lock, MA_NOTOWNED); :+ mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED); :+ mtx_unlock_spin(&sched_lock); : MALLOC(new_ldt, struct proc_ldt *, sizeof(struct proc_ldt), : M_SUBPROC, M_WAITOK); : :@@ -327,7 +326,7 @@ : } : : /* :- * Must be called either with sched_lock free or held but not recursed. :+ * Must be called with sched_lock held but not recursed. : * If md_ldt is not NULL, it will return with sched_lock released. : */ : void :@@ -339,8 +338,6 @@ : if (pldt == NULL) : return; : :- if (!mtx_owned(&sched_lock)) :- mtx_lock_spin(&sched_lock); : mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED); : if (td == PCPU_GET(curthread)) { : lldt(_default_ldt); :@@ -407,7 +404,7 @@ : int error = 0, i, n; : int largest_ld; : struct mdproc *mdp = &td->td_proc->p_md; :- struct proc_ldt *pldt = mdp->md_ldt; :+ struct proc_ldt *pldt; : struct i386_ldt_args ua, *uap = &ua; : caddr_t old_ldt_base; : int old_ldt_len; :@@ -432,8 +429,12 @@ : return(EINVAL); : : /* allocate user ldt */ :+ mtx_lock_spin(&sched_lock); :+ pldt = mdp->md_ldt; : if (!pldt || largest_ld >= pldt->ldt_len) { :- struct proc_ldt *new_ldt = user_ldt_alloc(mdp, largest_ld); :+ struct proc_ldt *new_ldt; :+ :+ new_ldt = user_ldt_alloc(mdp, largest_ld); : if (new_ldt == NULL) : return ENOMEM; If this change is going to happen, might as well push the declaration northward towards the top of the function, no? Cheers, Andrew : if (pldt) { :@@ -463,7 +464,8 @@ : set_user_ldt(mdp); : mtx_unlock_spin(&sched_lock); : #endif :- } :+ } else :+ mtx_unlock_spin(&sched_lock); : : /* Check descriptors for access violations */ : for (i = 0, n = uap->start; i < uap->num; i++, n++) { : :==== //depot/projects/smpng/sys/i386/i386/vm_machdep.c#22 (text+ko) ==== : :@@ -135,7 +135,10 @@ : if ((flags & RFMEM) == 0) { : /* unshare user LDT */ : struct mdproc *mdp1 = &p1->p_md; :- struct proc_ldt *pldt = mdp1->md_ldt; :+ struct proc_ldt *pldt; :+ :+ mtx_lock_spin(&sched_lock); :+ pltd = mdp1->md_ldt; : if (pldt && pldt->ldt_refcnt > 1) { : pldt = user_ldt_alloc(mdp1, pldt->ldt_len); : if (pldt == NULL) :@@ -143,7 +146,8 @@ : mdp1->md_ldt = pldt; : set_user_ldt(mdp1); : user_ldt_free(td1); :- } :+ } else :+ mtx_unlock_spin(&sched_lock); : } : return; : } :@@ -210,7 +214,7 @@ : : /* Copy the LDT, if necessary. */ : mtx_lock_spin(&sched_lock); :- if (mdp2->md_ldt != 0) { :+ if (mdp2->md_ldt != NULL) { : if (flags & RFMEM) { : mdp2->md_ldt->ldt_refcnt++; : } else { :@@ -271,8 +275,11 @@ : ctob(IOPAGES + 1)); : pcb->pcb_ext = 0; : } :+ mtx_lock_spin(&sched_lock); : if (mdp->md_ldt) : user_ldt_free(td); :+ else :+ mtx_unlock_spin(&sched_lock); : if (pcb->pcb_flags & PCB_DBREGS) { : /* : * disable all hardware breakpoints : :==== //depot/projects/smpng/sys/i386/include/proc.h#7 (text+ko) ==== : :@@ -55,7 +55,7 @@ : }; : : struct mdproc { :- struct proc_ldt *md_ldt; /* per-process ldt */ :+ struct proc_ldt *md_ldt; /* (j) per-process ldt */ : }; : : #ifdef _KERNEL : -- Andrew R. Reiter arr@watson.org arr@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 9 15:20:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0FFE37B401; Tue, 9 Jul 2002 15:20:17 -0700 (PDT) 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 D95E637B400; Tue, 9 Jul 2002 15:20:16 -0700 (PDT) Received: from sccrmhc02.attbi.com (sccrmhc02.attbi.com [204.127.202.62]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AE4A43E58; Tue, 9 Jul 2002 15:20:16 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc02.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020709222015.NZSG6023.sccrmhc02.attbi.com@InterJet.elischer.org>; Tue, 9 Jul 2002 22:20:15 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id PAA36932; Tue, 9 Jul 2002 15:03:58 -0700 (PDT) Date: Tue, 9 Jul 2002 15:03:57 -0700 (PDT) From: Julian Elischer To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 13995 for review In-Reply-To: <200207092121.g69LLYBh092119@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG this looks "odd" ==== //depot/projects/smpng/sys/i386/i386/machdep.c#40 (text+ko) ==== @@ -825,8 +825,11 @@ struct trapframe *regs = td->td_frame; struct pcb *pcb = td->td_pcb; + mtx_lock_spin(&sched_lock); if (td->td_proc->p_md.md_ldt) user_ldt_free(td); + else + mtx_unlock_spin(&sched_lock); bzero((char *)regs, sizeof(struct trapframe)); regs->tf_eip = entry; does user_ldt_free(td) release the sched lock? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 9 16:53:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AE0137B405; Tue, 9 Jul 2002 16:52:18 -0700 (PDT) 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 E767B37B400 for ; Tue, 9 Jul 2002 16:52:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C824A43E5E for ; Tue, 9 Jul 2002 16:52:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g69NqBJU015474 for ; Tue, 9 Jul 2002 16:52:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g69Np6LE015198 for perforce@freebsd.org; Tue, 9 Jul 2002 16:51:06 -0700 (PDT) Date: Tue, 9 Jul 2002 16:51:06 -0700 (PDT) Message-Id: <200207092351.g69Np6LE015198@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14000 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14000 Change 14000 by peter@peter_daintree on 2002/07/09 16:50:32 IFC (ouch! - will have to resync after this anyway) Affected files ... .. //depot/projects/pmap/sys/Makefile#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/api_up1000.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/autoconf.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/busdma_machdep.c#3 integrate .. //depot/projects/pmap/sys/alpha/alpha/clock.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/cpuconf.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/critical.c#1 branch .. //depot/projects/pmap/sys/alpha/alpha/db_disasm.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/db_instruction.h#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/db_interface.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/db_trace.c#3 integrate .. //depot/projects/pmap/sys/alpha/alpha/dec_1000a.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/dec_2100_a50.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/dec_2100_a500.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/dec_axppci_33.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/dec_eb164.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/dec_eb64plus.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/dec_kn20aa.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/dec_kn300.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/dec_st550.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/dec_st6600.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/dump_machdep.c#1 branch .. //depot/projects/pmap/sys/alpha/alpha/elf_machdep.c#3 integrate .. //depot/projects/pmap/sys/alpha/alpha/exception.s#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/genassym.c#3 integrate .. //depot/projects/pmap/sys/alpha/alpha/interrupt.c#5 integrate .. //depot/projects/pmap/sys/alpha/alpha/machdep.c#5 integrate .. //depot/projects/pmap/sys/alpha/alpha/mem.c#3 integrate .. //depot/projects/pmap/sys/alpha/alpha/mp_machdep.c#6 integrate .. //depot/projects/pmap/sys/alpha/alpha/pal.s#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/pmap.c#5 integrate .. //depot/projects/pmap/sys/alpha/alpha/prom.c#3 integrate .. //depot/projects/pmap/sys/alpha/alpha/prom_disp.s#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/support.s#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/swtch.s#2 integrate .. //depot/projects/pmap/sys/alpha/alpha/sys_machdep.c#4 integrate .. //depot/projects/pmap/sys/alpha/alpha/trap.c#6 integrate .. //depot/projects/pmap/sys/alpha/alpha/vm_machdep.c#3 integrate .. //depot/projects/pmap/sys/alpha/conf/GENERIC#3 integrate .. //depot/projects/pmap/sys/alpha/conf/SIMOS#2 integrate .. //depot/projects/pmap/sys/alpha/include/_inttypes.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/ansi.h#3 integrate .. //depot/projects/pmap/sys/alpha/include/asm.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/atomic.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/bootinfo.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/clock.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/cpu.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/cpuconf.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/cpufunc.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/critical.h#1 branch .. //depot/projects/pmap/sys/alpha/include/db_machdep.h#3 integrate .. //depot/projects/pmap/sys/alpha/include/elf.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/endian.h#4 integrate .. //depot/projects/pmap/sys/alpha/include/float.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/kse.h#1 branch .. //depot/projects/pmap/sys/alpha/include/md_var.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/param.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/pmap.h#4 integrate .. //depot/projects/pmap/sys/alpha/include/proc.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/profile.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/prom.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/ptrace.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/reg.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/runq.h#1 branch .. //depot/projects/pmap/sys/alpha/include/stdarg.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/sysarch.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/varargs.h#2 integrate .. //depot/projects/pmap/sys/alpha/isa/isa_dma.c#2 integrate .. //depot/projects/pmap/sys/alpha/linux/linux_dummy.c#2 integrate .. //depot/projects/pmap/sys/alpha/linux/linux_machdep.c#3 integrate .. //depot/projects/pmap/sys/alpha/linux/linux_proto.h#3 integrate .. //depot/projects/pmap/sys/alpha/linux/linux_sysvec.c#3 integrate .. //depot/projects/pmap/sys/alpha/mcbus/mcbus.c#2 integrate .. //depot/projects/pmap/sys/alpha/mcbus/mcbusvar.h#2 integrate .. //depot/projects/pmap/sys/alpha/mcbus/mcpcia.c#3 integrate .. //depot/projects/pmap/sys/alpha/mcbus/mcpciavar.h#2 integrate .. //depot/projects/pmap/sys/alpha/osf1/imgact_osf1.c#3 integrate .. //depot/projects/pmap/sys/alpha/osf1/osf1.h#2 integrate .. //depot/projects/pmap/sys/alpha/osf1/osf1_ioctl.c#2 integrate .. //depot/projects/pmap/sys/alpha/osf1/osf1_misc.c#5 integrate .. //depot/projects/pmap/sys/alpha/osf1/osf1_mount.c#3 integrate .. //depot/projects/pmap/sys/alpha/osf1/osf1_proto.h#2 integrate .. //depot/projects/pmap/sys/alpha/osf1/osf1_signal.c#2 integrate .. //depot/projects/pmap/sys/alpha/osf1/osf1_signal.h#2 integrate .. //depot/projects/pmap/sys/alpha/osf1/osf1_sysvec.c#2 integrate .. //depot/projects/pmap/sys/alpha/osf1/osf1_util.h#2 integrate .. //depot/projects/pmap/sys/alpha/pci/cia.c#2 integrate .. //depot/projects/pmap/sys/alpha/pci/irongate_pci.c#3 integrate .. //depot/projects/pmap/sys/alpha/pci/lca.c#2 integrate .. //depot/projects/pmap/sys/alpha/pci/lca_pci.c#3 integrate .. //depot/projects/pmap/sys/alpha/pci/t2.c#2 integrate .. //depot/projects/pmap/sys/alpha/pci/t2_pci.c#3 integrate .. //depot/projects/pmap/sys/alpha/pci/tsunami.c#2 integrate .. //depot/projects/pmap/sys/alpha/pci/tsunami_pci.c#3 integrate .. //depot/projects/pmap/sys/alpha/tc/am7990.c#3 delete .. //depot/projects/pmap/sys/alpha/tc/am7990reg.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/am7990var.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/ascvar.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/esp.c#2 delete .. //depot/projects/pmap/sys/alpha/tc/espreg.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/espvar.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/if_le_dec.c#2 delete .. //depot/projects/pmap/sys/alpha/tc/if_le_ioasic.c#2 delete .. //depot/projects/pmap/sys/alpha/tc/if_levar.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/ioasic.c#2 delete .. //depot/projects/pmap/sys/alpha/tc/ioasicreg.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/ioasicvar.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/mcclock_ioasic.c#2 delete .. //depot/projects/pmap/sys/alpha/tc/sticreg.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/sticvar.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/tc.c#2 delete .. //depot/projects/pmap/sys/alpha/tc/tcasic.c#2 delete .. //depot/projects/pmap/sys/alpha/tc/tcdevs.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/tcdevs_data.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/tcds.c#2 delete .. //depot/projects/pmap/sys/alpha/tc/tcds_dma.c#2 delete .. //depot/projects/pmap/sys/alpha/tc/tcdsreg.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/tcdsvar.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/tcreg.h#2 delete .. //depot/projects/pmap/sys/alpha/tc/tcvar.h#2 delete .. //depot/projects/pmap/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/pmap/sys/arm/include/ansi.h#2 integrate .. //depot/projects/pmap/sys/arm/include/param.h#2 integrate .. //depot/projects/pmap/sys/arm/include/types.h#2 integrate .. //depot/projects/pmap/sys/boot/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/alpha/boot1/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/alpha/boot1/boot1.c#2 integrate .. //depot/projects/pmap/sys/boot/alpha/boot1/sys.c#4 delete .. //depot/projects/pmap/sys/boot/alpha/cdboot/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/alpha/libalpha/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/alpha/libalpha/common.h#2 integrate .. //depot/projects/pmap/sys/boot/alpha/loader/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/alpha/netboot/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/arc/lib/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/arc/loader/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/pmap/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/pmap/sys/boot/common/help.common#2 integrate .. //depot/projects/pmap/sys/boot/common/interp_forth.c#2 integrate .. //depot/projects/pmap/sys/boot/common/isapnp.h#2 integrate .. //depot/projects/pmap/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/pmap/sys/boot/common/loader.8#4 integrate .. //depot/projects/pmap/sys/boot/common/module.c#2 integrate .. //depot/projects/pmap/sys/boot/common/ufsread.c#1 branch .. //depot/projects/pmap/sys/boot/efi/Makefile.inc#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/efi.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/efi_nii.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/efiapi.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/eficon.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/efidebug.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/efidef.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/efidevp.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/efifpswa.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/efifs.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/efinet.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/efipart.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/efiprot.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/efipxebc.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/efiser.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/i386/efibind.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/include/ia64/efibind.h#2 integrate .. //depot/projects/pmap/sys/boot/efi/libefi/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/efi/libefi/arch/ia64/ldscript.ia64#2 integrate .. //depot/projects/pmap/sys/boot/efi/libefi/arch/ia64/start.S#2 integrate .. //depot/projects/pmap/sys/boot/efi/libefi/bootinfo.c#2 integrate .. //depot/projects/pmap/sys/boot/efi/libefi/copy.c#2 integrate .. //depot/projects/pmap/sys/boot/efi/libefi/efifs.c#2 integrate .. //depot/projects/pmap/sys/boot/efi/libefi/efinet.c#2 integrate .. //depot/projects/pmap/sys/boot/efi/libefi/elf_freebsd.c#2 integrate .. //depot/projects/pmap/sys/boot/efi/loader/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/efi/loader/conf.c#2 integrate .. //depot/projects/pmap/sys/boot/efi/loader/main.c#2 integrate .. //depot/projects/pmap/sys/boot/efi/loader/version#2 integrate .. //depot/projects/pmap/sys/boot/ficl/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/ficl/alpha/sysdep.h#2 integrate .. //depot/projects/pmap/sys/boot/ficl/dict.c#2 integrate .. //depot/projects/pmap/sys/boot/ficl/ficl.c#2 integrate .. //depot/projects/pmap/sys/boot/ficl/ficl.h#2 integrate .. //depot/projects/pmap/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/pmap/sys/boot/ficl/float.c#1 branch .. //depot/projects/pmap/sys/boot/ficl/i386/sysdep.h#2 integrate .. //depot/projects/pmap/sys/boot/ficl/ia64/sysdep.h#2 integrate .. //depot/projects/pmap/sys/boot/ficl/loader.c#2 integrate .. //depot/projects/pmap/sys/boot/ficl/math64.c#2 integrate .. //depot/projects/pmap/sys/boot/ficl/math64.h#2 integrate .. //depot/projects/pmap/sys/boot/ficl/prefix.c#2 integrate .. //depot/projects/pmap/sys/boot/ficl/search.c#2 integrate .. //depot/projects/pmap/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/pmap/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/pmap/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/pmap/sys/boot/ficl/softwords/ifbrack.fr#2 integrate .. //depot/projects/pmap/sys/boot/ficl/softwords/marker.fr#2 integrate .. //depot/projects/pmap/sys/boot/ficl/softwords/oo.fr#2 integrate .. //depot/projects/pmap/sys/boot/ficl/softwords/prefix.fr#2 integrate .. //depot/projects/pmap/sys/boot/ficl/softwords/softcore.fr#2 integrate .. //depot/projects/pmap/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/pmap/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/pmap/sys/boot/ficl/stack.c#2 integrate .. //depot/projects/pmap/sys/boot/ficl/testmain.c#2 integrate .. //depot/projects/pmap/sys/boot/ficl/tools.c#2 integrate .. //depot/projects/pmap/sys/boot/ficl/vm.c#2 integrate .. //depot/projects/pmap/sys/boot/ficl/words.c#2 integrate .. //depot/projects/pmap/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/pmap/sys/boot/forth/loader.4th.8#2 integrate .. //depot/projects/pmap/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/pmap/sys/boot/forth/loader.conf.5#2 integrate .. //depot/projects/pmap/sys/boot/forth/support.4th#2 integrate .. //depot/projects/pmap/sys/boot/i386/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/i386/Makefile.inc#2 integrate .. //depot/projects/pmap/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/i386/boot2/boot2.c#4 integrate .. //depot/projects/pmap/sys/boot/i386/btx/lib/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/i386/kgzldr/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/pmap/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/pmap/sys/boot/i386/libi386/biospnp.c#2 integrate .. //depot/projects/pmap/sys/boot/i386/libi386/bootinfo.c#3 integrate .. //depot/projects/pmap/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/pmap/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/pmap/sys/boot/ia64/libski/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/ia64/libski/bootinfo.c#2 integrate .. //depot/projects/pmap/sys/boot/ia64/libski/copy.c#2 integrate .. //depot/projects/pmap/sys/boot/ia64/libski/elf_freebsd.c#2 integrate .. //depot/projects/pmap/sys/boot/ia64/skiload/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/ia64/skiload/version#2 integrate .. //depot/projects/pmap/sys/boot/ofw/libofw/Makefile#3 integrate .. //depot/projects/pmap/sys/boot/ofw/libofw/devicename.c#2 integrate .. //depot/projects/pmap/sys/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_disk.c#3 integrate .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_net.c#3 integrate .. //depot/projects/pmap/sys/boot/pc98/Makefile.inc#2 integrate .. //depot/projects/pmap/sys/boot/pc98/boot2/Makefile#3 integrate .. //depot/projects/pmap/sys/boot/pc98/boot2/asm.h#2 integrate .. //depot/projects/pmap/sys/boot/pc98/boot2/boot.h#2 integrate .. //depot/projects/pmap/sys/boot/pc98/boot2/disk.c#2 integrate .. //depot/projects/pmap/sys/boot/pc98/boot2/io.c#2 integrate .. //depot/projects/pmap/sys/boot/pc98/boot2/serial_16550.S#3 integrate .. //depot/projects/pmap/sys/boot/pc98/boot2/start.S#2 integrate .. //depot/projects/pmap/sys/boot/pc98/btx/lib/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/pc98/kgzldr/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/pmap/sys/boot/pc98/libpc98/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/powerpc/loader/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/pmap/sys/boot/sparc64/boot1/Makefile#2 integrate .. //depot/projects/pmap/sys/boot/sparc64/boot1/_start.S#1 branch .. //depot/projects/pmap/sys/boot/sparc64/boot1/boot1.c#2 integrate .. //depot/projects/pmap/sys/boot/sparc64/bootblock/Makefile#2 delete .. //depot/projects/pmap/sys/boot/sparc64/bootblock/bootblock.c#4 delete .. //depot/projects/pmap/sys/boot/sparc64/loader/Makefile#3 integrate .. //depot/projects/pmap/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/pmap/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/pmap/sys/boot/sparc64/loader/locore.s#3 delete .. //depot/projects/pmap/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/pmap/sys/boot/sparc64/loader/metadata.c#3 integrate .. //depot/projects/pmap/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/pmap/sys/cam/cam_periph.c#2 integrate .. //depot/projects/pmap/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/pmap/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/pmap/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/pmap/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/pmap/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/pmap/sys/cam/scsi/scsi_low.c#3 integrate .. //depot/projects/pmap/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/pmap/sys/cam/scsi/scsi_low_pisa.h#2 integrate .. //depot/projects/pmap/sys/cam/scsi/scsi_message.h#2 integrate .. //depot/projects/pmap/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/pmap/sys/coda/README#2 integrate .. //depot/projects/pmap/sys/coda/cnode.h#2 integrate .. //depot/projects/pmap/sys/coda/coda_fbsd.c#2 integrate .. //depot/projects/pmap/sys/coda/coda_io.h#2 integrate .. //depot/projects/pmap/sys/coda/coda_namecache.c#2 integrate .. //depot/projects/pmap/sys/coda/coda_namecache.h#2 integrate .. //depot/projects/pmap/sys/coda/coda_pioctl.h#2 integrate .. //depot/projects/pmap/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/pmap/sys/coda/coda_subr.c#2 integrate .. //depot/projects/pmap/sys/coda/coda_venus.c#3 integrate .. //depot/projects/pmap/sys/coda/coda_vfsops.c#3 integrate .. //depot/projects/pmap/sys/coda/coda_vnops.c#3 integrate .. //depot/projects/pmap/sys/coda/coda_vnops.h#3 integrate .. //depot/projects/pmap/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/pmap/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/pmap/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/pmap/sys/compat/linux/linux_ioctl.c#6 integrate .. //depot/projects/pmap/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/pmap/sys/compat/linux/linux_ipc.h#2 integrate .. //depot/projects/pmap/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/pmap/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/pmap/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/pmap/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/pmap/sys/compat/linux/linux_signal.h#2 integrate .. //depot/projects/pmap/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/pmap/sys/compat/linux/linux_socket.h#2 integrate .. //depot/projects/pmap/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/pmap/sys/compat/linux/linux_uid16.c#3 integrate .. //depot/projects/pmap/sys/compat/linux/linux_util.h#3 integrate .. //depot/projects/pmap/sys/compat/pecoff/imgact_pecoff.c#4 integrate .. //depot/projects/pmap/sys/compat/svr4/imgact_svr4.c#2 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_exec.h#2 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_fcntl.c#5 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_filio.c#4 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_ioctl.h#2 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_ipc.c#2 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_misc.c#6 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_signal.h#2 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_termios.c#2 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_ttold.c#2 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/pmap/sys/conf/Makefile.ia64#3 integrate .. //depot/projects/pmap/sys/conf/Makefile.powerpc#3 integrate .. //depot/projects/pmap/sys/conf/Makefile.sparc64#3 integrate .. //depot/projects/pmap/sys/conf/Makefile.x86_64#1 branch .. //depot/projects/pmap/sys/conf/NOTES#1 branch .. //depot/projects/pmap/sys/conf/files#9 integrate .. //depot/projects/pmap/sys/conf/files.alpha#5 integrate .. //depot/projects/pmap/sys/conf/files.i386#8 integrate .. //depot/projects/pmap/sys/conf/files.ia64#4 integrate .. //depot/projects/pmap/sys/conf/files.pc98#7 integrate .. //depot/projects/pmap/sys/conf/files.powerpc#3 integrate .. //depot/projects/pmap/sys/conf/files.sparc64#5 integrate .. //depot/projects/pmap/sys/conf/files.x86_64#1 branch .. //depot/projects/pmap/sys/conf/kern.post.mk#8 integrate .. //depot/projects/pmap/sys/conf/kern.pre.mk#8 integrate .. //depot/projects/pmap/sys/conf/kmod.mk#5 integrate .. //depot/projects/pmap/sys/conf/kmod_syms.awk#2 integrate .. //depot/projects/pmap/sys/conf/majors#4 integrate .. //depot/projects/pmap/sys/conf/options#4 integrate .. //depot/projects/pmap/sys/conf/options.alpha#3 integrate .. //depot/projects/pmap/sys/conf/options.i386#7 integrate .. //depot/projects/pmap/sys/conf/options.ia64#2 integrate .. //depot/projects/pmap/sys/conf/options.pc98#7 integrate .. //depot/projects/pmap/sys/conf/options.powerpc#2 integrate .. //depot/projects/pmap/sys/conf/options.sparc64#3 integrate .. //depot/projects/pmap/sys/conf/options.x86_64#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/acconfig.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acdebug.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acdispat.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acdos16.h#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/acefi.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acenv.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acevents.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acexcep.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acgcc.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acglobal.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/achware.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acinterp.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/aclocal.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acmacros.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acnamesp.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acobject.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acoutput.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acparser.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acpiosxf.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acpixf.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acresrc.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acstruct.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/actables.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/actypes.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acutils.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/amlcode.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbcmds.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbdisasm.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbdisply.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbexec.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbfileio.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbhistry.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbinput.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbstats.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbutils.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbxface.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dsfield.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dsmethod.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dsmthdat.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dsobject.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dsopcode.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dsutils.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dswexec.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dswload.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dswstate.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/evevent.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/evmisc.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/evregion.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/evrgnini.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/evsci.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/evxface.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/evxfevnt.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/evxfregn.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exconfig.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exconvrt.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/excreate.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exdump.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exfield.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exfldio.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exmisc.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exmutex.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exnames.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exoparg1.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exoparg2.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exoparg3.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exoparg6.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exprep.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exregion.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exresnte.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exresolv.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exresop.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exstore.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exstoren.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exstorob.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exsystem.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exutils.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/hwacpi.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/hwgpe.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/hwregs.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/hwsleep.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/hwtimer.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsaccess.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsalloc.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsdump.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nseval.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsinit.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsload.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsnames.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsobject.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nssearch.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsutils.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nswalk.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsxfname.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsxfobj.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/psargs.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/psfind.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/psopcode.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/psparse.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/pstree.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/psutils.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/pswalk.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/psxface.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rsaddr.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rscalc.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rscreate.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rsdump.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rsio.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rsirq.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rslist.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rsmemory.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rsmisc.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rsutils.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rsxface.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/tbconvrt.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/tbget.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/tbinstal.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/tbutils.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/tbxface.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/tbxfroot.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utalloc.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utclib.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utcopy.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utdebug.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utdelete.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/uteval.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utglobal.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utinit.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utmath.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utobject.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utxface.c#3 integrate .. //depot/projects/pmap/sys/contrib/dev/fla/fla.c#2 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#2 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_fil.c#4 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_frag.c#3 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_frag.h#2 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_ipsec_pxy.c#1 branch .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_log.c#3 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_netbios_pxy.c#1 branch .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_proxy.c#3 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_proxy.h#2 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c#2 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_state.c#3 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/pmap/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/pmap/sys/crypto/blowfish/blowfish.h#3 integrate .. //depot/projects/pmap/sys/crypto/cast128/cast128.h#2 integrate .. //depot/projects/pmap/sys/crypto/des/des.h#3 integrate .. //depot/projects/pmap/sys/crypto/des/podd.h#2 integrate .. //depot/projects/pmap/sys/crypto/des/sk.h#2 integrate .. //depot/projects/pmap/sys/crypto/md5.c#2 integrate .. //depot/projects/pmap/sys/crypto/md5.h#2 integrate .. //depot/projects/pmap/sys/crypto/rijndael/rijndael-api-fst.c#2 integrate .. //depot/projects/pmap/sys/crypto/rijndael/rijndael-api-fst.h#2 integrate .. //depot/projects/pmap/sys/crypto/sha1.c#2 integrate .. //depot/projects/pmap/sys/crypto/sha1.h#2 integrate .. //depot/projects/pmap/sys/crypto/sha2/sha2.h#2 integrate .. //depot/projects/pmap/sys/ddb/db_access.h#2 integrate .. //depot/projects/pmap/sys/ddb/db_break.c#2 integrate .. //depot/projects/pmap/sys/ddb/db_break.h#2 integrate .. //depot/projects/pmap/sys/ddb/db_command.c#3 integrate .. //depot/projects/pmap/sys/ddb/db_command.h#2 integrate .. //depot/projects/pmap/sys/ddb/db_elf.c#1 branch .. //depot/projects/pmap/sys/ddb/db_examine.c#2 integrate .. //depot/projects/pmap/sys/ddb/db_expr.c#2 integrate .. //depot/projects/pmap/sys/ddb/db_input.c#3 integrate .. //depot/projects/pmap/sys/ddb/db_kld.c#2 integrate .. //depot/projects/pmap/sys/ddb/db_lex.c#2 integrate .. //depot/projects/pmap/sys/ddb/db_lex.h#2 integrate .. //depot/projects/pmap/sys/ddb/db_output.c#2 integrate .. //depot/projects/pmap/sys/ddb/db_output.h#2 integrate .. //depot/projects/pmap/sys/ddb/db_ps.c#3 integrate .. //depot/projects/pmap/sys/ddb/db_run.c#2 integrate .. //depot/projects/pmap/sys/ddb/db_sym.c#2 integrate .. //depot/projects/pmap/sys/ddb/db_sym.h#2 integrate .. //depot/projects/pmap/sys/ddb/db_variables.c#2 integrate .. //depot/projects/pmap/sys/ddb/db_variables.h#2 integrate .. //depot/projects/pmap/sys/ddb/db_watch.c#2 integrate .. //depot/projects/pmap/sys/ddb/ddb.h#2 integrate .. //depot/projects/pmap/sys/dev/aac/aac.c#5 integrate .. //depot/projects/pmap/sys/dev/aac/aac_cam.c#1 branch .. //depot/projects/pmap/sys/dev/aac/aac_cam.h#1 branch .. //depot/projects/pmap/sys/dev/aac/aac_debug.c#3 integrate .. //depot/projects/pmap/sys/dev/aac/aac_disk.c#3 integrate .. //depot/projects/pmap/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/pmap/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/pmap/sys/dev/aac/aacvar.h#4 integrate .. //depot/projects/pmap/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/pmap/sys/dev/acpica/Osd/OsdInterrupt.c#4 integrate .. //depot/projects/pmap/sys/dev/acpica/Osd/OsdMemory.c#3 integrate .. //depot/projects/pmap/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate .. //depot/projects/pmap/sys/dev/acpica/Osd/OsdSynch.c#3 integrate .. //depot/projects/pmap/sys/dev/acpica/Osd/OsdTable.c#1 branch .. //depot/projects/pmap/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi_button.c#4 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi_lid.c#4 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi_pcib.c#4 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi_powerres.c#4 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi_resource.c#5 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi_thermal.c#5 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi_timer.c#4 integrate .. //depot/projects/pmap/sys/dev/acpica/acpica_support.c#3 integrate .. //depot/projects/pmap/sys/dev/acpica/acpivar.h#6 integrate .. //depot/projects/pmap/sys/dev/aha/aha.c#2 integrate .. //depot/projects/pmap/sys/dev/ahb/ahb.c#2 integrate .. //depot/projects/pmap/sys/dev/aic/aic.c#3 integrate .. //depot/projects/pmap/sys/dev/aic/aic6360reg.h#2 integrate .. //depot/projects/pmap/sys/dev/aic/aic_cbus.c#2 integrate .. //depot/projects/pmap/sys/dev/aic/aic_isa.c#2 integrate .. //depot/projects/pmap/sys/dev/aic/aicvar.h#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/ahd_pci.c#1 branch .. //depot/projects/pmap/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aic79xx.c#1 branch .. //depot/projects/pmap/sys/dev/aic7xxx/aic79xx.h#1 branch .. //depot/projects/pmap/sys/dev/aic7xxx/aic79xx.reg#1 branch .. //depot/projects/pmap/sys/dev/aic7xxx/aic79xx.seq#1 branch .. //depot/projects/pmap/sys/dev/aic7xxx/aic79xx_inline.h#1 branch .. //depot/projects/pmap/sys/dev/aic7xxx/aic79xx_osm.c#1 branch .. //depot/projects/pmap/sys/dev/aic7xxx/aic79xx_osm.h#1 branch .. //depot/projects/pmap/sys/dev/aic7xxx/aic79xx_pci.c#1 branch .. //depot/projects/pmap/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aic7xxx.reg#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aic7xxx.seq#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aic7xxx_freebsd.c#2 delete .. //depot/projects/pmap/sys/dev/aic7xxx/aic7xxx_freebsd.h#2 delete .. //depot/projects/pmap/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aicasm/aicasm.h#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#1 branch .. //depot/projects/pmap/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#1 branch .. //depot/projects/pmap/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate .. //depot/projects/pmap/sys/dev/amr/amr.c#3 integrate .. //depot/projects/pmap/sys/dev/an/if_an.c#5 integrate .. //depot/projects/pmap/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/pmap/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/pmap/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/pmap/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/pmap/sys/dev/asr/asr.c#3 integrate .. //depot/projects/pmap/sys/dev/asr/dptalign.h#2 integrate .. //depot/projects/pmap/sys/dev/asr/dptsig.h#2 integrate .. //depot/projects/pmap/sys/dev/asr/i2oadptr.h#2 integrate .. //depot/projects/pmap/sys/dev/asr/i2obscsi.h#2 integrate .. //depot/projects/pmap/sys/dev/asr/i2odep.h#2 integrate .. //depot/projects/pmap/sys/dev/asr/i2odpt.h#2 integrate .. //depot/projects/pmap/sys/dev/asr/i2oexec.h#2 integrate .. //depot/projects/pmap/sys/dev/asr/i2omsg.h#2 integrate .. //depot/projects/pmap/sys/dev/asr/i2otypes.h#2 integrate .. //depot/projects/pmap/sys/dev/asr/i2outil.h#2 integrate .. //depot/projects/pmap/sys/dev/asr/osd_defs.h#2 integrate .. //depot/projects/pmap/sys/dev/asr/osd_unix.h#2 integrate .. //depot/projects/pmap/sys/dev/asr/osd_util.h#2 integrate .. //depot/projects/pmap/sys/dev/asr/sys_info.h#2 integrate .. //depot/projects/pmap/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/pmap/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/pmap/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/pmap/sys/dev/ata/ata-disk.h#5 integrate .. //depot/projects/pmap/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/pmap/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/pmap/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/pmap/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/pmap/sys/dev/ata/ata-raid.h#4 integrate .. //depot/projects/pmap/sys/dev/ata/atapi-all.c#4 integrate .. //depot/projects/pmap/sys/dev/ata/atapi-all.h#3 integrate .. //depot/projects/pmap/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/pmap/sys/dev/ata/atapi-cd.h#3 integrate .. //depot/projects/pmap/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/pmap/sys/dev/ata/atapi-fd.h#3 integrate .. //depot/projects/pmap/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/pmap/sys/dev/awi/am79c930.c#2 integrate .. //depot/projects/pmap/sys/dev/awi/am79c930var.h#2 integrate .. //depot/projects/pmap/sys/dev/awi/awi.c#2 integrate .. //depot/projects/pmap/sys/dev/awi/awi_wep.c#2 integrate .. //depot/projects/pmap/sys/dev/awi/awi_wicfg.c#2 integrate .. //depot/projects/pmap/sys/dev/awi/awivar.h#2 integrate .. //depot/projects/pmap/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/pmap/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/pmap/sys/dev/bktr/CHANGELOG.TXT#2 integrate .. //depot/projects/pmap/sys/dev/bktr/bktr_card.h#2 integrate .. //depot/projects/pmap/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/pmap/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/pmap/sys/dev/bktr/bktr_i2c.h#2 integrate .. //depot/projects/pmap/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/pmap/sys/dev/bktr/bktr_reg.h#2 integrate .. //depot/projects/pmap/sys/dev/cardbus/cardbus.c#5 integrate .. //depot/projects/pmap/sys/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/pmap/sys/dev/ccd/ccd.c#3 integrate .. //depot/projects/pmap/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/pmap/sys/dev/cm/if_cm_isa.c#2 integrate .. //depot/projects/pmap/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/pmap/sys/dev/cm/smc90cx6var.h#2 integrate .. //depot/projects/pmap/sys/dev/cnw/if_cnw.c#3 integrate .. //depot/projects/pmap/sys/dev/ct/bshw_machdep.c#2 integrate .. //depot/projects/pmap/sys/dev/ct/bshwvar.h#2 integrate .. //depot/projects/pmap/sys/dev/ct/ct.c#2 integrate .. //depot/projects/pmap/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/pmap/sys/dev/ct/ct_machdep.h#2 integrate .. //depot/projects/pmap/sys/dev/ct/ctvar.h#2 integrate .. //depot/projects/pmap/sys/dev/dgb/dgb.c#3 integrate .. //depot/projects/pmap/sys/dev/digi/CX.c#2 integrate .. //depot/projects/pmap/sys/dev/digi/CX_PCI.c#2 integrate .. //depot/projects/pmap/sys/dev/digi/EPCX.c#2 integrate .. //depot/projects/pmap/sys/dev/digi/EPCX_PCI.c#2 integrate .. //depot/projects/pmap/sys/dev/digi/Xe.c#2 integrate .. //depot/projects/pmap/sys/dev/digi/Xem.c#2 integrate .. //depot/projects/pmap/sys/dev/digi/Xr.c#2 integrate .. //depot/projects/pmap/sys/dev/digi/digi.c#5 integrate .. //depot/projects/pmap/sys/dev/digi/digi.h#4 integrate .. //depot/projects/pmap/sys/dev/digi/digi_isa.c#3 integrate .. //depot/projects/pmap/sys/dev/drm/drm.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drmP.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_agpsupport.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_auth.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_bufs.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_context.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_dma.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_drawable.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_drv.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_fops.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_init.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_ioctl.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_linux.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_lists.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_lock.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_memory.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_os_freebsd.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_scatter.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_sysctl.h#1 branch .. //depot/projects/pmap/sys/dev/drm/drm_vm.h#1 branch .. //depot/projects/pmap/sys/dev/drm/gamma.h#1 branch .. //depot/projects/pmap/sys/dev/drm/gamma_dma.c#1 branch .. //depot/projects/pmap/sys/dev/drm/gamma_drv.c#1 branch .. //depot/projects/pmap/sys/dev/drm/gamma_drv.h#1 branch .. //depot/projects/pmap/sys/dev/drm/i810_drm.h#1 branch .. //depot/projects/pmap/sys/dev/drm/mga.h#1 branch .. //depot/projects/pmap/sys/dev/drm/mga_dma.c#1 branch .. //depot/projects/pmap/sys/dev/drm/mga_drm.h#1 branch .. //depot/projects/pmap/sys/dev/drm/mga_drv.c#1 branch .. //depot/projects/pmap/sys/dev/drm/mga_drv.h#1 branch .. //depot/projects/pmap/sys/dev/drm/mga_state.c#1 branch .. //depot/projects/pmap/sys/dev/drm/mga_ucode.h#1 branch .. //depot/projects/pmap/sys/dev/drm/mga_warp.c#1 branch .. //depot/projects/pmap/sys/dev/drm/r128.h#1 branch .. //depot/projects/pmap/sys/dev/drm/r128_cce.c#1 branch .. //depot/projects/pmap/sys/dev/drm/r128_drm.h#1 branch .. //depot/projects/pmap/sys/dev/drm/r128_drv.c#1 branch .. //depot/projects/pmap/sys/dev/drm/r128_drv.h#1 branch .. //depot/projects/pmap/sys/dev/drm/r128_state.c#1 branch .. //depot/projects/pmap/sys/dev/drm/radeon.h#1 branch .. //depot/projects/pmap/sys/dev/drm/radeon_cp.c#1 branch .. //depot/projects/pmap/sys/dev/drm/radeon_drm.h#1 branch .. //depot/projects/pmap/sys/dev/drm/radeon_drv.c#1 branch .. //depot/projects/pmap/sys/dev/drm/radeon_drv.h#1 branch .. //depot/projects/pmap/sys/dev/drm/radeon_state.c#1 branch .. //depot/projects/pmap/sys/dev/drm/sis_drm.h#1 branch .. //depot/projects/pmap/sys/dev/drm/tdfx.h#1 branch .. //depot/projects/pmap/sys/dev/drm/tdfx_drv.c#1 branch .. //depot/projects/pmap/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/pmap/sys/dev/ed/if_ed_cbus.c#2 integrate .. //depot/projects/pmap/sys/dev/ed/if_ed_isa.c#2 integrate .. //depot/projects/pmap/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/pmap/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/pmap/sys/dev/ed/if_edvar.h#2 integrate .. //depot/projects/pmap/sys/dev/eisa/eisaconf.c#2 integrate .. //depot/projects/pmap/sys/dev/eisa/eisaconf.h#2 integrate .. //depot/projects/pmap/sys/dev/em/README#1 branch .. //depot/projects/pmap/sys/dev/em/if_em.c#3 integrate .. //depot/projects/pmap/sys/dev/em/if_em.h#3 integrate .. //depot/projects/pmap/sys/dev/em/if_em_fxhw.c#3 delete .. //depot/projects/pmap/sys/dev/em/if_em_fxhw.h#3 delete .. //depot/projects/pmap/sys/dev/em/if_em_hw.c#1 branch .. //depot/projects/pmap/sys/dev/em/if_em_hw.h#1 branch .. //depot/projects/pmap/sys/dev/em/if_em_osdep.h#3 integrate .. //depot/projects/pmap/sys/dev/em/if_em_phy.c#3 delete .. //depot/projects/pmap/sys/dev/em/if_em_phy.h#3 delete .. //depot/projects/pmap/sys/dev/en/midway.c#2 integrate .. //depot/projects/pmap/sys/dev/en/midwayvar.h#2 integrate .. //depot/projects/pmap/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/pmap/sys/dev/ep/if_ep_eisa.c#2 integrate .. //depot/projects/pmap/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/pmap/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/pmap/sys/dev/ex/if_ex_isa.c#2 integrate .. //depot/projects/pmap/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/pmap/sys/dev/exca/exca.c#2 integrate .. //depot/projects/pmap/sys/dev/fb/fb.c#2 integrate .. //depot/projects/pmap/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/pmap/sys/dev/fb/gfb.c#2 integrate .. //depot/projects/pmap/sys/dev/fb/tga.c#2 integrate .. //depot/projects/pmap/sys/dev/fb/vga.c#2 integrate .. //depot/projects/pmap/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/pmap/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/pmap/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/pmap/sys/dev/gem/if_gem_pci.c#2 integrate .. //depot/projects/pmap/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/pmap/sys/dev/gfb/gfb_pci.c#2 integrate .. //depot/projects/pmap/sys/dev/gx/if_gx.c#2 integrate .. //depot/projects/pmap/sys/dev/gx/if_gxvar.h#2 integrate .. //depot/projects/pmap/sys/dev/hea/eni.c#2 integrate .. //depot/projects/pmap/sys/dev/hea/eni.h#2 integrate .. //depot/projects/pmap/sys/dev/hea/eni_buffer.c#3 integrate .. //depot/projects/pmap/sys/dev/hea/eni_globals.c#2 integrate .. //depot/projects/pmap/sys/dev/hea/eni_if.c#2 integrate .. //depot/projects/pmap/sys/dev/hea/eni_intr.c#2 integrate .. //depot/projects/pmap/sys/dev/hea/eni_receive.c#2 integrate .. //depot/projects/pmap/sys/dev/hea/eni_transmit.c#2 integrate .. //depot/projects/pmap/sys/dev/hea/eni_var.h#2 integrate .. //depot/projects/pmap/sys/dev/hea/eni_vcm.c#3 integrate .. //depot/projects/pmap/sys/dev/hea/hea_freebsd.c#1 branch .. //depot/projects/pmap/sys/dev/hea/hea_freebsd.h#1 branch .. //depot/projects/pmap/sys/dev/hea/hea_pci.c#1 branch .. //depot/projects/pmap/sys/dev/hfa/fore_buffer.c#2 integrate .. //depot/projects/pmap/sys/dev/hfa/fore_command.c#2 integrate .. //depot/projects/pmap/sys/dev/hfa/fore_globals.c#2 integrate .. //depot/projects/pmap/sys/dev/hfa/fore_if.c#2 integrate .. //depot/projects/pmap/sys/dev/hfa/fore_include.h#2 integrate .. //depot/projects/pmap/sys/dev/hfa/fore_init.c#2 integrate .. //depot/projects/pmap/sys/dev/hfa/fore_load.c#2 integrate .. //depot/projects/pmap/sys/dev/hfa/fore_output.c#2 integrate .. //depot/projects/pmap/sys/dev/hfa/fore_receive.c#2 integrate .. //depot/projects/pmap/sys/dev/hfa/fore_slave.h#2 integrate .. //depot/projects/pmap/sys/dev/hfa/fore_stats.c#2 integrate .. //depot/projects/pmap/sys/dev/hfa/fore_transmit.c#2 integrate .. //depot/projects/pmap/sys/dev/hfa/fore_var.h#2 integrate .. //depot/projects/pmap/sys/dev/hfa/hfa_eisa.c#1 branch .. //depot/projects/pmap/sys/dev/hfa/hfa_freebsd.c#1 branch .. //depot/projects/pmap/sys/dev/hfa/hfa_freebsd.h#1 branch .. //depot/projects/pmap/sys/dev/hfa/hfa_pci.c#1 branch .. //depot/projects/pmap/sys/dev/hfa/hfa_sbus.c#1 branch .. //depot/projects/pmap/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/pmap/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/pmap/sys/dev/hme/if_hme_sbus.c#2 integrate .. //depot/projects/pmap/sys/dev/hme/if_hmereg.h#2 integrate .. //depot/projects/pmap/sys/dev/hme/if_hmevar.h#2 integrate .. //depot/projects/pmap/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/pmap/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/pmap/sys/dev/ida/ida.c#2 integrate .. //depot/projects/pmap/sys/dev/ida/ida_disk.c#2 integrate .. //depot/projects/pmap/sys/dev/iicbus/if_ic.c#2 integrate .. //depot/projects/pmap/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/pmap/sys/dev/iicbus/iicbb.c#2 integrate .. //depot/projects/pmap/sys/dev/iicbus/iicbb_if.m#2 integrate .. //depot/projects/pmap/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/pmap/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/pmap/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/pmap/sys/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/pmap/sys/dev/iir/iir.c#2 integrate .. //depot/projects/pmap/sys/dev/iir/iir.h#3 integrate .. //depot/projects/pmap/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/pmap/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/pmap/sys/dev/isp/isp.c#6 integrate .. //depot/projects/pmap/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/pmap/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/pmap/sys/dev/isp/isp_inline.h#5 integrate .. //depot/projects/pmap/sys/dev/isp/isp_ioctl.h#5 integrate .. //depot/projects/pmap/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/pmap/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/pmap/sys/dev/isp/isp_target.h#3 integrate .. //depot/projects/pmap/sys/dev/isp/ispmbox.h#4 integrate .. //depot/projects/pmap/sys/dev/isp/ispvar.h#4 integrate .. //depot/projects/pmap/sys/dev/ispfw/ispfw.c#2 integrate .. //depot/projects/pmap/sys/dev/joy/joy.c#3 integrate .. //depot/projects/pmap/sys/dev/joy/joy_isa.c#2 integrate .. //depot/projects/pmap/sys/dev/joy/joy_pccard.c#2 integrate .. //depot/projects/pmap/sys/dev/joy/joyvar.h#2 integrate .. //depot/projects/pmap/sys/dev/kbd/atkbd.c#2 integrate .. //depot/projects/pmap/sys/dev/kbd/atkbdc.c#2 integrate .. //depot/projects/pmap/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/pmap/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/pmap/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/pmap/sys/dev/lmc/if_lmc_common.c#2 integrate .. //depot/projects/pmap/sys/dev/lmc/if_lmc_fbsd3.c#2 integrate .. //depot/projects/pmap/sys/dev/lmc/if_lmc_media.c#2 integrate .. //depot/projects/pmap/sys/dev/lmc/if_lmcioctl.h#2 integrate .. //depot/projects/pmap/sys/dev/lmc/if_lmcvar.h#2 integrate .. //depot/projects/pmap/sys/dev/lnc/if_lnc.c#3 integrate .. //depot/projects/pmap/sys/dev/lnc/if_lncvar.h#2 integrate .. //depot/projects/pmap/sys/dev/md/md.c#4 integrate .. //depot/projects/pmap/sys/dev/mii/acphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/bmtphy.c#1 branch .. //depot/projects/pmap/sys/dev/mii/bmtphyreg.h#1 branch .. //depot/projects/pmap/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/dcphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/exphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/inphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/lxtphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/mii.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/mii.h#2 integrate .. //depot/projects/pmap/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/miidevs#2 integrate .. //depot/projects/pmap/sys/dev/mii/miidevs.h#2 integrate .. //depot/projects/pmap/sys/dev/mii/miivar.h#2 integrate .. //depot/projects/pmap/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/nsgphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/nsgphyreg.h#2 integrate .. //depot/projects/pmap/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/pnaphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/pnphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/qsphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/rlphy.c#3 integrate .. //depot/projects/pmap/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/ukphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/pmap/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/pmap/sys/dev/mk48txx/mk48txx.c#1 branch .. //depot/projects/pmap/sys/dev/mk48txx/mk48txxreg.h#1 branch .. //depot/projects/pmap/sys/dev/mlx/mlx.c#2 integrate .. //depot/projects/pmap/sys/dev/mly/mly.c#2 integrate .. //depot/projects/pmap/sys/dev/my/if_my.c#1 branch .. //depot/projects/pmap/sys/dev/my/if_myreg.h#1 branch .. //depot/projects/pmap/sys/dev/ncv/ncr53c500.c#3 integrate .. //depot/projects/pmap/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/pmap/sys/dev/ncv/ncr53c500var.h#2 integrate .. //depot/projects/pmap/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/pmap/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/pmap/sys/dev/nmdm/nmdm.c#4 integrate .. //depot/projects/pmap/sys/dev/nsp/nsp.c#2 integrate .. //depot/projects/pmap/sys/dev/nsp/nsp_pccard.c#2 integrate .. //depot/projects/pmap/sys/dev/nsp/nspvar.h#2 integrate .. //depot/projects/pmap/sys/dev/null/null.c#2 integrate .. //depot/projects/pmap/sys/dev/ofw/ofw_console.c#3 integrate .. //depot/projects/pmap/sys/dev/ofw/ofw_disk.c#1 branch .. //depot/projects/pmap/sys/dev/pccard/card_if.m#3 integrate .. //depot/projects/pmap/sys/dev/pccard/pccard.c#5 integrate .. //depot/projects/pmap/sys/dev/pccard/pccard_cis.c#5 integrate .. //depot/projects/pmap/sys/dev/pccard/pccard_common.c#1 branch .. //depot/projects/pmap/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/pmap/sys/dev/pccard/pccarddevs.h#4 integrate .. //depot/projects/pmap/sys/dev/pccard/pccardvar.h#4 integrate .. //depot/projects/pmap/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/pmap/sys/dev/pccbb/pccbbreg.h#4 integrate .. //depot/projects/pmap/sys/dev/pccbb/pccbbvar.h#4 integrate .. //depot/projects/pmap/sys/dev/pci/pci.c#4 integrate .. //depot/projects/pmap/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/pmap/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/pmap/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/pmap/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/pmap/sys/dev/pcic/i82365_isa.c#2 integrate .. //depot/projects/pmap/sys/dev/pdq/if_fea.c#2 integrate .. //depot/projects/pmap/sys/dev/pdq/if_fpa.c#2 integrate .. //depot/projects/pmap/sys/dev/pdq/pdq.c#2 integrate .. //depot/projects/pmap/sys/dev/pdq/pdq_freebsd.h#1 branch .. //depot/projects/pmap/sys/dev/pdq/pdq_ifsubr.c#3 integrate .. //depot/projects/pmap/sys/dev/pdq/pdqreg.h#2 integrate .. //depot/projects/pmap/sys/dev/pdq/pdqvar.h#2 integrate .. //depot/projects/pmap/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/pmap/sys/dev/ppbus/lpbb.c#2 integrate .. //depot/projects/pmap/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/pmap/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/pmap/sys/dev/ppbus/ppb_msq.c#2 integrate .. //depot/projects/pmap/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/pmap/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/pmap/sys/dev/ppbus/vpo.c#2 integrate .. //depot/projects/pmap/sys/dev/puc/puc.c#3 integrate .. //depot/projects/pmap/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/pmap/sys/dev/puc/pucvar.h#2 integrate .. //depot/projects/pmap/sys/dev/random/harvest.c#3 integrate .. //depot/projects/pmap/sys/dev/random/randomdev.c#4 integrate .. //depot/projects/pmap/sys/dev/random/yarrow.c#4 integrate .. //depot/projects/pmap/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/pmap/sys/dev/rp/rp.c#3 integrate .. //depot/projects/pmap/sys/dev/sbni/if_sbni.c#3 integrate .. //depot/projects/pmap/sys/dev/se/se_console.c#1 branch .. //depot/projects/pmap/sys/dev/se/sereg.h#1 branch .. //depot/projects/pmap/sys/dev/si/si.c#2 integrate .. //depot/projects/pmap/sys/dev/sio/sio.c#6 integrate .. //depot/projects/pmap/sys/dev/sio/sio_ebus.c#1 branch .. //depot/projects/pmap/sys/dev/sio/sio_isa.c#4 integrate .. //depot/projects/pmap/sys/dev/sio/sio_pccard.c#3 integrate .. //depot/projects/pmap/sys/dev/sio/sio_pci.c#3 integrate .. //depot/projects/pmap/sys/dev/sio/sio_puc.c#3 integrate .. //depot/projects/pmap/sys/dev/sio/sioreg.h#3 integrate .. //depot/projects/pmap/sys/dev/sio/siovar.h#3 integrate .. //depot/projects/pmap/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/pmap/sys/dev/smbus/smbconf.c#2 integrate .. //depot/projects/pmap/sys/dev/smbus/smbconf.h#2 integrate .. //depot/projects/pmap/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/pmap/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/pmap/sys/dev/snc/dp83932subr.c#2 integrate .. //depot/projects/pmap/sys/dev/snc/dp83932subr.h#2 integrate .. //depot/projects/pmap/sys/dev/snc/dp83932var.h#2 integrate .. //depot/projects/pmap/sys/dev/snc/if_snc_cbus.c#2 integrate .. //depot/projects/pmap/sys/dev/snc/if_sncvar.h#2 integrate .. //depot/projects/pmap/sys/dev/snp/snp.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/isa/emu8000.c#4 integrate .. //depot/projects/pmap/sys/dev/sound/isa/gusmidi.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/isa/mpu.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/isa/opl.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/isa/uartsio.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/midi/midi.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/midi/midi.h#3 integrate .. //depot/projects/pmap/sys/dev/sound/midi/midibuf.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/midi/sequencer.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/midi/timer.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/pci/csamidi.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/ac97_if.m#2 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/feeder_if.m#2 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/mixer_if.m#2 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/sndstat.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 9 17:38:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0557F37B401; Tue, 9 Jul 2002 17:37:07 -0700 (PDT) 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 AC8E137B400 for ; Tue, 9 Jul 2002 17:37:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 226E443E09 for ; Tue, 9 Jul 2002 17:37:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6A0b6JU023171 for ; Tue, 9 Jul 2002 17:37:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6A0b594023168 for perforce@freebsd.org; Tue, 9 Jul 2002 17:37:05 -0700 (PDT) Date: Tue, 9 Jul 2002 17:37:05 -0700 (PDT) Message-Id: <200207100037.g6A0b594023168@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14001 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14001 Change 14001 by peter@peter_overcee on 2002/07/09 17:36:34 sync up with recent changes from my checked out cvs tree. Of note: fix some bugs in pmap_qenter/qremove (doh!) undo hackery for critical_enter() blocking interrupts make PG_G sort-of work again. fix bug in pmap_map() (doh!) catch up with kse3 Affected files ... .. //depot/projects/pmap/sys/i386/i386/bios.c#8 edit .. //depot/projects/pmap/sys/i386/i386/locore.s#8 edit .. //depot/projects/pmap/sys/i386/i386/mp_machdep.c#18 edit .. //depot/projects/pmap/sys/i386/i386/pmap.c#17 edit .. //depot/projects/pmap/sys/i386/i386/vm86.c#4 edit .. //depot/projects/pmap/sys/i386/include/cpufunc.h#11 edit .. //depot/projects/pmap/sys/i386/include/pmap.h#10 edit .. //depot/projects/pmap/sys/kern/subr_witness.c#11 edit .. //depot/projects/pmap/sys/vm/vm_glue.c#7 edit Differences ... ==== //depot/projects/pmap/sys/i386/i386/bios.c#8 (text+ko) ==== @@ -384,31 +384,24 @@ args->seg.code32.limit = 0xffff; ptd = (pd_entry_t *)rcr3(); -printf("ptd %p\n", ptd); if (ptd == (u_int *)IdlePTD) { -printf("matches IdlePTD, which is %p\n", IdlePTD); /* * no page table, so create one and install it. */ pte = (pt_entry_t *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK); ptd = (pd_entry_t *)((u_int)ptd + KERNBASE); *ptd = vtophys(pte) | PG_RW | PG_V; -printf("KERNBASE ptd = %p, pte = %p\n", ptd, pte); - *ptd = vtophys(pte) | PG_RW | PG_V; -printf("set to 0x%x\n", *ptd); } else { /* * this is a user-level page table */ pte = PTmap; } -printf("ok, pte = %p, vm86pa = 0x%x\n", pte, vm86pa); /* * install pointer to page 0. we don't need to flush the tlb, * since there should not be a previous mapping for page 0. */ *pte = (vm86pa - PAGE_SIZE) | PG_RW | PG_V; -printf("*pte is now 0x%x\n", *pte); stack_top = stack; va_start(ap, fmt); @@ -457,15 +450,11 @@ bioscall_vector.vec16.offset = (u_short)args->entry; bioscall_vector.vec16.segment = GSEL(GBIOSCODE16_SEL, SEL_KPL); -printf("doing bios16call\n"); i = bios16_call(&args->r, stack_top); -printf("done\n"); if (pte == PTmap) { -printf("pte = %p, PTmap = %p, zeroing\n", pte, PTmap); *pte = 0; /* remove entry */ } else { -printf("ptd = %p, zeroing\n", ptd); *ptd = 0; /* remove page table */ free(pte, M_TEMP); /* ... and free it */ } @@ -474,7 +463,6 @@ * XXX only needs to be invlpg(0) but that doesn't work on the 386 */ pmap_invalidate_all(kernel_pmap); -printf("done\n"); return (i); } ==== //depot/projects/pmap/sys/i386/i386/locore.s#8 (text+ko) ==== @@ -127,6 +127,7 @@ .globl bootinfo bootinfo: .space BOOTINFO_SIZE /* bootinfo that we can handle */ + .globl KERNend KERNend: .long 0 /* phys addr end of kernel (just after bss) */ physfree: .long 0 /* phys addr of next free page */ ==== //depot/projects/pmap/sys/i386/i386/mp_machdep.c#18 (text+ko) ==== @@ -345,7 +345,7 @@ mtx_init(&com_mtx, "com", NULL, MTX_SPIN); #endif /* USE_COMLOCK */ #ifdef APIC_IO - mtx_init(&smp_tlb_mtx, "tlb", MTX_SPIN); + mtx_init(&smp_tlb_mtx, "tlb", NULL, MTX_SPIN); #endif } @@ -2261,13 +2261,43 @@ mtx_lock_spin(&smp_tlb_mtx); smp_tlb_addr1 = addr1; smp_tlb_addr2 = addr2; - smp_tlb_wait = 0; + atomic_store_int_rel(&smp_tlb_wait, 0); ipi_all_but_self(vector); - while (atomic_load_acq_int(&smp_tlb_wait) < ncpu) - /* XXX cpu_pause() */ ; + while (smp_tlb_wait < ncpu) + ia32_pause(); mtx_unlock_spin(&smp_tlb_mtx); } +/* + * This is about as magic as it gets. fortune(1) has got similar code + * for reversing bits in a word. Who thinks up this stuff?? + * + * Yes, it does appear to be consistently faster than: + * while (i = ffs(m)) { + * m >>= i; + * bits++; + * } + * and + * while (lsb = (m & -m)) { /* This is magic too */ + * m &= ~lsb; /* or: m ^= lsb */ + * bits++; + * } + * Both of these latter forms do some very strange things on gcc-3.1 with + * -mcpu=pentiumpro and/or -march=pentiumpro and/or -O or -O2. + * There is probably an SSE or MMX popcnt instruction. + */ +static inline u_int32_t +popcnt(u_int32_t m) +{ + + m = (m & 0x55555555) + ((m & 0xaaaaaaaa) >> 1); + m = (m & 0x33333333) + ((m & 0xcccccccc) >> 2); + m = (m & 0x0f0f0f0f) + ((m & 0xf0f0f0f0) >> 4); + m = (m & 0x00ff00ff) + ((m & 0xff00ff00) >> 8); + m = (m & 0x0000ffff) + ((m & 0xffff0000) >> 16); + return m; +} + static void smp_targeted_tlb_shootdown(u_int mask, u_int vector, vm_offset_t addr1, vm_offset_t addr2) { @@ -2285,13 +2315,7 @@ mask &= ~(1 << PCPU_GET(cpuid)); if (mask == 0) return; - /* Count the target cpus */ - ncpu = 0; - m = mask; - while ((i = ffs(m)) != 0) { - m >>= i; - ncpu++; - } + ncpu = popcnt(mask); if (ncpu > othercpus) { /* XXX this should be a panic offence */ printf("SMP: tlb shootdown to %d other cpus (only have %d)\n", @@ -2308,13 +2332,13 @@ mtx_lock_spin(&smp_tlb_mtx); smp_tlb_addr1 = addr1; smp_tlb_addr2 = addr2; - smp_tlb_wait = 0; + atomic_store_int_rel(&smp_tlb_wait, 0); if (mask == (u_int)-1) ipi_all_but_self(vector); else ipi_selected(mask, vector); - while (atomic_load_acq_int(&smp_tlb_wait) < ncpu) - /* XXX cpu_pause() */ ; + while (smp_tlb_wait < ncpu) + ia32_pause(); mtx_unlock_spin(&smp_tlb_mtx); } #endif ==== //depot/projects/pmap/sys/i386/i386/pmap.c#17 (text+ko) ==== @@ -100,6 +100,7 @@ #include #include +#include #include #include #include @@ -164,6 +165,7 @@ static int nkpt; vm_offset_t kernel_vm_end; +extern u_int32_t KERNend; /* * Data for the pv entry allocation mechanism @@ -364,7 +366,7 @@ PTD[i] = 0; pgeflag = 0; -#if /* !defined(SMP) || */ defined(ENABLE_PG_G) +#if !defined(SMP) || defined(ENABLE_PG_G) if (cpu_feature & CPUID_PGE) pgeflag = PG_G; #endif @@ -403,6 +405,7 @@ #ifdef SMP if (cpu_apic_address == 0) panic("pmap_bootstrap: no local apic! (non-SMP hardware?)"); + /* local apic is mapped on last page */ SMPpt[NPTEPG - 1] = (pt_entry_t)(PG_V | PG_RW | PG_N | pgeflag | (cpu_apic_address & PG_FRAME)); @@ -418,27 +421,36 @@ pmap_set_opt(void) { pt_entry_t *pte; - vm_offset_t va; + vm_offset_t va, endva; - if (pgeflag && (cpu_feature & CPUID_PGE)) + if (pgeflag && (cpu_feature & CPUID_PGE)) { load_cr4(rcr4() | CR4_PGE); + invltlb(); /* Insurance */ + } #ifndef DISABLE_PSE - if (pseflag && (cpu_feature & CPUID_PSE)) + if (pseflag && (cpu_feature & CPUID_PSE)) { load_cr4(rcr4() | CR4_PSE); + invltlb(); /* Insurance */ + } #endif if (PCPU_GET(cpuid) == 0) { #ifndef DISABLE_PSE - if (pdir4mb) + if (pdir4mb) { kernel_pmap->pm_pdir[KPTDI] = PTD[KPTDI] = pdir4mb; + invltlb(); /* Insurance */ + } #endif if (pgeflag) { - /* XXX see earlier comments about virtual_avail */ - for (va = KERNBASE; va < virtual_avail; va += PAGE_SIZE) - { + /* Turn on PG_G for text, data, bss pages. */ + va = (vm_offset_t)btext; + endva = KERNBASE + KERNend; + while (va < endva) { pte = vtopte(va); if (*pte) *pte |= pgeflag; + va += PAGE_SIZE; } + invltlb(); /* Insurance */ } /* * We do not need to broadcast the invltlb here, because @@ -446,7 +458,6 @@ * lock. See ap_init(). */ } - invltlb(); /* local */ } void * @@ -576,8 +587,6 @@ * interrupts disabled here. * XXX we may need to hold schedlock to get a coherent pm_active */ - if (td->td_critnest == 1) - cpu_critical_exit(td->td_savecrit); if (pmap->pm_active == -1 || pmap->pm_active == all_cpus) { invlpg(va); smp_invlpg(va); @@ -622,8 +631,6 @@ * interrupts disabled here. * XXX we may need to hold schedlock to get a coherent pm_active */ - if (td->td_critnest == 1) - cpu_critical_exit(td->td_savecrit); if (pmap->pm_active == -1 || pmap->pm_active == all_cpus) { for (addr = sva; addr < eva; addr += PAGE_SIZE) invlpg(addr); @@ -672,8 +679,6 @@ * interrupts disabled here. * XXX we may need to hold schedlock to get a coherent pm_active */ - if (td->td_critnest == 1) - cpu_critical_exit(td->td_savecrit); if (pmap->pm_active == -1 || pmap->pm_active == all_cpus) { invltlb(); smp_invltlb(); @@ -839,7 +844,7 @@ va += PAGE_SIZE; start += PAGE_SIZE; } - pmap_invalidate_range(kernel_pmap, sva, end); + pmap_invalidate_range(kernel_pmap, sva, va); *virt = va; return (sva); } @@ -856,17 +861,15 @@ void pmap_qenter(vm_offset_t sva, vm_page_t *m, int count) { - vm_offset_t va, end_va; + vm_offset_t va; va = sva; - end_va = va + count * PAGE_SIZE; - - while (va < end_va) { + while (count-- > 0) { pmap_kenter(va, VM_PAGE_TO_PHYS(*m)); va += PAGE_SIZE; m++; } - pmap_invalidate_range(kernel_pmap, sva, end_va); + pmap_invalidate_range(kernel_pmap, sva, va); } /* @@ -876,16 +879,14 @@ void pmap_qremove(vm_offset_t sva, int count) { - vm_offset_t va, end_va; + vm_offset_t va; va = sva; - end_va = va + count * PAGE_SIZE; - - while (va < end_va) { + while (count-- > 0) { pmap_kremove(va); va += PAGE_SIZE; } - pmap_invalidate_range(kernel_pmap, sva, end_va); + pmap_invalidate_range(kernel_pmap, sva, va); } static vm_page_t @@ -920,37 +921,20 @@ td->td_kstack_obj = ksobj; /* get a kernel virtual address for the kstack for this thread */ +#ifdef KSTACK_GUARD ks = kmem_alloc_nofault(kernel_map, (KSTACK_PAGES + 1) * PAGE_SIZE); if (ks == 0) panic("pmap_new_thread: kstack allocation failed"); - - /* - * Set the first page to be the unmapped guard page. - */ - ptek = vtopte(ks); - oldpte = *ptek; - *ptek = 0; - if (oldpte) { -#ifdef I386_CPU - updateneeded = 1; -#else - invlpg(ks); -#endif - } - - /* - * move to the next page, which is where the real stack starts. - */ + if (*vtopte(ks) != 0) + pmap_qremove(ks, 1); ks += PAGE_SIZE; td->td_kstack = ks; - ptek++; #else /* get a kernel virtual address for the kstack for this thread */ ks = kmem_alloc_nofault(kernel_map, KSTACK_PAGES * PAGE_SIZE); if (ks == 0) panic("pmap_new_thread: kstack allocation failed"); td->td_kstack = ks; - ptek = vtopte(ks); #endif /* * For the length of the stack, link in a real page of ram for each @@ -1163,7 +1147,6 @@ (pd_entry_t *)kmem_alloc_pageable(kernel_map, PAGE_SIZE); pmap_kenter((vm_offset_t)pmap->pm_pdir, (vm_offset_t)IdlePTD); invlpg((vm_offset_t)pmap->pm_pdir); - pmap->pm_count = 1; pmap->pm_ptphint = NULL; pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvlist); @@ -2265,8 +2248,11 @@ void * pmap_kenter_temporary(vm_offset_t pa, int i) { - pmap_kenter((vm_offset_t)crashdumpmap + (i * PAGE_SIZE), pa); - invlpg((vm_offset_t)crashdumpmap + (i * PAGE_SIZE)); + vm_offset_t va; + + va = (vm_offset_t)crashdumpmap + (i * PAGE_SIZE); + pmap_kenter(va, pa); + invlpg(va); return ((void *)crashdumpmap); } @@ -2644,6 +2630,12 @@ * block. */ dstmpte = pmap_allocpte(dst_pmap, addr); + if ((APTDpde & PG_FRAME) != + (saved_pde & PG_FRAME)) { + APTDpde = saved_pde; +printf ("IT HAPPENNED!"); + invltlb(); + } if ((*dst_pte == 0) && (ptetemp = *src_pte)) { /* * Clear the modified and @@ -2675,13 +2667,16 @@ void pmap_zero_page(vm_page_t m) { - vm_offset_t phys = VM_PAGE_TO_PHYS(m); + vm_offset_t phys; -#ifdef SMP - /* XXX overkill, we only want to disable migration here */ - /* XXX or maybe not. down the track we have reentrancy issues */ - critical_enter(); -#endif + /* + * Note that we do not use PG_G here, in case we get preempted + * and end up on another CPU. In doing so, we will have had an + * implied invltlb() by the cpu_switch() routine. This only works + * if we do not use PG_G here. With this concession, we do not + * need to do any IPI shootdowns from here. + */ + phys = VM_PAGE_TO_PHYS(m); if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); *CMAP2 = PG_V | PG_RW | phys | PG_A | PG_M; @@ -2694,9 +2689,6 @@ bzero(CADDR2, PAGE_SIZE); *CMAP2 = 0; invlpg((vm_offset_t)CADDR2); /* SMP: local cpu only */ -#ifdef SMP - critical_exit(); -#endif } /* @@ -2708,16 +2700,18 @@ void pmap_zero_page_area(vm_page_t m, int off, int size) { - vm_offset_t phys = VM_PAGE_TO_PHYS(m); + vm_offset_t phys; -#ifdef SMP - /* XXX overkill, we only want to disable migration here */ - /* XXX or maybe not. down the track we have reentrancy issues */ - critical_enter(); -#endif + /* + * Note that we do not use PG_G here, in case we get preempted + * and end up on another CPU. In doing so, we will have had an + * implied invltlb() by the cpu_switch() routine. This only works + * if we do not use PG_G here. With this concession, we do not + * need to do any IPI shootdowns from here. + */ + phys = VM_PAGE_TO_PHYS(m); if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); - *CMAP2 = PG_V | PG_RW | phys | PG_A | PG_M; invlpg((vm_offset_t)CADDR2); /* SMP: local cpu only */ #if defined(I686_CPU) @@ -2728,9 +2722,6 @@ bzero((char *)CADDR2 + off, size); *CMAP2 = 0; invlpg((vm_offset_t)CADDR2); /* SMP: local cpu only */ -#ifdef SMP - critical_exit(); -#endif } /* @@ -2742,20 +2733,20 @@ void pmap_zero_page_idle(vm_page_t m) { - vm_offset_t phys = VM_PAGE_TO_PHYS(m); + vm_offset_t phys; + /* + * Note that we do not use PG_G here, in case we get preempted + * and end up on another CPU. In doing so, we will have had an + * implied invltlb() by the cpu_switch() routine. This only works + * if we do not use PG_G here. With this concession, we do not + * need to do any IPI shootdowns from here. + */ + phys = VM_PAGE_TO_PHYS(m); if (*CMAP3) panic("pmap_zero_page: CMAP3 busy"); - *CMAP3 = PG_V | PG_RW | phys | PG_A | PG_M; -#ifdef SMP - mtx_lock(&Giant); /* IPI sender not MPSAFE */ -#endif - invltlb_1pg((vm_offset_t)CADDR3); -#ifdef SMP - mtx_unlock(&Giant); -#endif - + invlpg((vm_offset_t)CADDR3); /* SMP: local cpu only */ #if defined(I686_CPU) if (cpu_class == CPUCLASS_686) i686_pagezero(CADDR3); @@ -2763,6 +2754,7 @@ #endif bzero(CADDR3, PAGE_SIZE); *CMAP3 = 0; + invlpg((vm_offset_t)CADDR3); /* SMP: local cpu only */ } /* @@ -2775,30 +2767,19 @@ pmap_copy_page(vm_page_t src, vm_page_t dst) { -#ifdef SMP - /* XXX overkill, we only want to disable migration here */ - /* XXX or maybe not. down the track we have reentrancy issues */ - critical_enter(); -#endif if (*CMAP1) panic("pmap_copy_page: CMAP1 busy"); if (*CMAP2) panic("pmap_copy_page: CMAP2 busy"); - *CMAP1 = PG_V | VM_PAGE_TO_PHYS(src) | PG_A; *CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M; - invlpg((u_int)CADDR1); - invlpg((u_int)CADDR2); -#endif - + invlpg((vm_offset_t)CADDR1); /* SMP: local cpu only */ + invlpg((vm_offset_t)CADDR2); /* SMP: local cpu only */ bcopy(CADDR1, CADDR2, PAGE_SIZE); *CMAP1 = 0; *CMAP2 = 0; - invlpg((u_int)CADDR1); /* SMP: local only */ - invlpg((u_int)CADDR2); /* SMP: local only */ -#ifdef SMP - critical_exit(); -#endif + invlpg((vm_offset_t)CADDR1); /* SMP: local cpu only */ + invlpg((vm_offset_t)CADDR2); /* SMP: local cpu only */ } @@ -3228,16 +3209,11 @@ for (tmpva = va; size > 0; ) { pte = vtopte(tmpva); *pte = pa | PG_RW | PG_V | pgeflag; -#ifdef SMP - cpu_invlpg((void *)tmpva); -#else - invltlb_1pg(tmpva); -#endif size -= PAGE_SIZE; tmpva += PAGE_SIZE; + pa += PAGE_SIZE; } pmap_invalidate_range(kernel_pmap, va, tmpva); - return ((void *)(va + offset)); } @@ -3252,11 +3228,9 @@ base = va & PG_FRAME; offset = va & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); - for (tmpva = base; size > 0; ) { + for (tmpva = base; tmpva < (base + size); tmpva += PAGE_SIZE) { pte = vtopte(tmpva); *pte = 0; - size -= PAGE_SIZE; - tmpva += PAGE_SIZE; } pmap_invalidate_range(kernel_pmap, va, tmpva); kmem_free(kernel_map, base, size); ==== //depot/projects/pmap/sys/i386/i386/vm86.c#4 (text+ko) ==== @@ -574,7 +574,6 @@ if (intnum < 0 || intnum > 0xff) return (EINVAL); -printf("vm86_intcall: int 0x%x\n", intnum); vmf->vmf_trapno = intnum; mtx_lock(&vm86_lock); retval = vm86_bioscall(vmf); @@ -598,7 +597,6 @@ u_int page; int i, entry, retval; -printf("vm86_datacall: int 0x%x\n", intnum); mtx_lock(&vm86_lock); for (i = 0; i < vmc->npages; i++) { page = vtophys(vmc->pmap[i].kva & PG_FRAME); ==== //depot/projects/pmap/sys/i386/include/cpufunc.h#11 (text+ko) ==== @@ -628,6 +628,7 @@ void outsl(u_int port, void *addr, size_t cnt); void outsw(u_int port, void *addr, size_t cnt); void outw(u_int port, u_short data); +void ia32_pause(void); u_int rcr0(void); u_int rcr2(void); u_int rcr3(void); @@ -641,13 +642,30 @@ void wbinvd(void); void write_eflags(u_int ef); void wrmsr(u_int msr, u_int64_t newval); -critical_t cpu_critical_enter(void); -void cpu_critical_exit(critical_t eflags); +u_int rdr0(void); +void load_dr0(u_int dr0); +u_int rdr1(void); +void load_dr1(u_int dr1); +u_int rdr2(void); +void load_dr2(u_int dr2); +u_int rdr3(void); +void load_dr3(u_int dr3); +u_int rdr4(void); +void load_dr4(u_int dr4); +u_int rdr5(void); +void load_dr5(u_int dr5); +u_int rdr6(void); +void load_dr6(u_int dr6); +u_int rdr7(void); +void load_dr7(u_int dr7); +register_t intr_disable(void); +void intr_restore(register_t ef); #endif /* __GNUC__ */ void ltr(u_short sel); void reset_dbregs(void); + __END_DECLS #endif /* !_MACHINE_CPUFUNC_H_ */ ==== //depot/projects/pmap/sys/i386/include/pmap.h#10 (text+ko) ==== @@ -254,7 +254,6 @@ extern vm_offset_t virtual_end; void pmap_bootstrap(vm_offset_t, vm_offset_t); -pmap_t pmap_kernel(void); void *pmap_mapdev(vm_offset_t, vm_size_t); void pmap_unmapdev(vm_offset_t, vm_size_t); pt_entry_t *pmap_pte(pmap_t, vm_offset_t) __pure2; ==== //depot/projects/pmap/sys/kern/subr_witness.c#11 (text+ko) ==== @@ -223,7 +223,7 @@ { "icu", &lock_class_mtx_spin }, #ifdef SMP { "smp rendezvous", &lock_class_mtx_spin }, -#ifdef __i386__ +#if defined(__i386__) && defined(APIC_IO) { "tlb", &lock_class_mtx_spin }, #endif #endif ==== //depot/projects/pmap/sys/vm/vm_glue.c#7 (text+ko) ==== @@ -319,10 +319,13 @@ rv = vm_pager_get_pages(upobj, &m, 1, 0); if (rv != VM_PAGER_OK) panic("vm_proc_swapin: cannot get upage"); - m = vm_page_lookup(upobj, i); - m->valid = VM_PAGE_BITS_ALL; } + } + if (upobj->resident_page_count != UAREA_PAGES) + panic("vm_proc_swapin: lost pages from upobj"); + TAILQ_FOREACH(m, &upobj->memq, listq) { ma[i] = m; + m->valid = VM_PAGE_BITS_ALL; vm_page_wire(m); vm_page_wakeup(m); vm_page_flag_set(m, PG_MAPPED | PG_WRITEABLE); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 9 21:27:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87A4437B405; Tue, 9 Jul 2002 21:27:49 -0700 (PDT) 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 27D8737B400 for ; Tue, 9 Jul 2002 21:27:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 928BE43E3B for ; Tue, 9 Jul 2002 21:27:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6A4RmJU060841 for ; Tue, 9 Jul 2002 21:27:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6A4RmLW060838 for perforce@freebsd.org; Tue, 9 Jul 2002 21:27:48 -0700 (PDT) Date: Tue, 9 Jul 2002 21:27:48 -0700 (PDT) Message-Id: <200207100427.g6A4RmLW060838@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14010 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14010 Change 14010 by rwatson@rwatson_paprika on 2002/07/09 21:27:24 Make the DCOP konqueror call into a macro that can be invoked from any class that includes the appropriate include file. Easier than figuring the OOP goo. Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/konqueror.h#1 add .. //depot/projects/trustedbsd/misc/kmacmanager/modulelist.cc#2 edit .. //depot/projects/trustedbsd/misc/kmacmanager/sysctllist.cc#3 edit .. //depot/projects/trustedbsd/misc/kmacmanager/test.cc#3 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmacmanager/modulelist.cc#2 (text+ko) ==== @@ -45,6 +45,7 @@ #include +#include "konqueror.h" #include "modulelist.moc" #define BUFLEN 256 @@ -277,6 +278,7 @@ refresh(); sysctllist->refresh(NULL); + KONQUEROR_REFRESH(); } void @@ -332,4 +334,5 @@ refresh(); sysctllist->refresh(NULL); + KONQUEROR_REFRESH(); } ==== //depot/projects/trustedbsd/misc/kmacmanager/sysctllist.cc#3 (text+ko) ==== @@ -42,11 +42,11 @@ #include #include +#include +#include + +#include "konqueror.h" #include "sysctllist.moc" - -#include "qinputdialog.h" -#include "qmessagebox.h" - #include "sysctl_util.h" #define BUFLEN 256 @@ -235,8 +235,10 @@ "%s: %s", itemname, strerror(error)); QMessageBox::warning(this, "Error setting sysctl", buf); - } else + } else { refresh(itemname); + KONQUEROR_REFRESH(); + } } free(itemname); } ==== //depot/projects/trustedbsd/misc/kmacmanager/test.cc#3 (text+ko) ==== @@ -37,10 +37,11 @@ #include #include "test.moc" -#include #include #include +#include "konqueror.h" + Test::Test() : KMainWindow() { @@ -88,10 +89,7 @@ void Test::slotRefreshKonquerors() { - if (!kapp->dcopClient()->isAttached()) - kapp->dcopClient()->attach(); - kapp->dcopClient()->send("konqueror*", "konqueror-mainwindow#1", - "reload()", ""); + KONQUEROR_REFRESH(); } void Test::slotRefreshModules() To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 9 21:42:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57E7737B401; Tue, 9 Jul 2002 21:42:07 -0700 (PDT) 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 EA99137B400 for ; Tue, 9 Jul 2002 21:42:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA8DD43E4A for ; Tue, 9 Jul 2002 21:42:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6A4g6JU062343 for ; Tue, 9 Jul 2002 21:42:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6A4g6X7062340 for perforce@freebsd.org; Tue, 9 Jul 2002 21:42:06 -0700 (PDT) Date: Tue, 9 Jul 2002 21:42:06 -0700 (PDT) Message-Id: <200207100442.g6A4g6X7062340@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14011 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14011 Change 14011 by rwatson@rwatson_paprika on 2002/07/09 21:41:42 If a tree entry doesn't have a type string, don't dereference the string. This prevents the application from segfaulting if you double click a node in the sysctl tree that is not a leaf node. Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/sysctllist.cc#4 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmacmanager/sysctllist.cc#4 (text+ko) ==== @@ -212,11 +212,13 @@ void SysctlList::slotDoubleClicked(QListViewItem *item) { + const char *type; char *itemname, buf[BUFSIZ]; int error, newvalue, oldvalue; bool ok = FALSE; - if (strcmp(item->text(3).latin1(), "int") == 0) { + type = item->text(3).latin1(); + if (type != NULL && strcmp(type, "int") == 0) { itemname = strdup(item->text(2).latin1()); oldvalue = atoi(item->text(1).latin1()); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 1:15:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73D4B37B401; Wed, 10 Jul 2002 01:15:33 -0700 (PDT) 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 16B7B37B400 for ; Wed, 10 Jul 2002 01:15:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEF6943E09 for ; Wed, 10 Jul 2002 01:15:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6A8FWJU099043 for ; Wed, 10 Jul 2002 01:15:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6A8FW69099040 for perforce@freebsd.org; Wed, 10 Jul 2002 01:15:32 -0700 (PDT) Date: Wed, 10 Jul 2002 01:15:32 -0700 (PDT) Message-Id: <200207100815.g6A8FW69099040@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14018 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14018 Change 14018 by peter@peter_daintree on 2002/07/10 01:14:35 panic: bad peter _ _ _ __| | ___ | |__ | | / _` |/ _ \| '_ \| | | (_| | (_) | | | |_| \__,_|\___/|_| |_(_) (translation: I think this is it!) Affected files ... .. //depot/projects/pmap/sys/i386/i386/pmap.c#18 edit Differences ... ==== //depot/projects/pmap/sys/i386/i386/pmap.c#18 (text+ko) ==== @@ -753,7 +753,7 @@ newpf = pde & PG_FRAME; if (((*PMAP1) & PG_FRAME) != newpf) { *PMAP1 = newpf | PG_RW | PG_V; - pmap_invalidate_page(pmap, (vm_offset_t) PADDR1); + pmap_invalidate_page(kernel_pmap, (vm_offset_t) PADDR1); } return PADDR1 + (index & (NPTEPG - 1)); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 2:33:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06F3737B401; Wed, 10 Jul 2002 02:33:08 -0700 (PDT) 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 9647437B400 for ; Wed, 10 Jul 2002 02:33:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58EA943E3B for ; Wed, 10 Jul 2002 02:33:07 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6A9X7JU010933 for ; Wed, 10 Jul 2002 02:33:07 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6A9X7cV010930 for perforce@freebsd.org; Wed, 10 Jul 2002 02:33:07 -0700 (PDT) Date: Wed, 10 Jul 2002 02:33:07 -0700 (PDT) Message-Id: <200207100933.g6A9X7cV010930@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14020 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14020 Change 14020 by peter@peter_daintree on 2002/07/10 02:33:04 Minimal tweak to make sure this does not explode, as identified by Alan Cox. There is more to be done here still. Affected files ... .. //depot/projects/pmap/sys/vm/vm_glue.c#8 edit Differences ... ==== //depot/projects/pmap/sys/vm/vm_glue.c#8 (text+ko) ==== @@ -320,11 +320,11 @@ if (rv != VM_PAGER_OK) panic("vm_proc_swapin: cannot get upage"); } + ma[i] = m; } if (upobj->resident_page_count != UAREA_PAGES) panic("vm_proc_swapin: lost pages from upobj"); TAILQ_FOREACH(m, &upobj->memq, listq) { - ma[i] = m; m->valid = VM_PAGE_BITS_ALL; vm_page_wire(m); vm_page_wakeup(m); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 2:35:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6997F37B401; Wed, 10 Jul 2002 02:35:11 -0700 (PDT) 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 0937637B400 for ; Wed, 10 Jul 2002 02:35:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A9AE43E4A for ; Wed, 10 Jul 2002 02:35:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6A9ZAJU011055 for ; Wed, 10 Jul 2002 02:35:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6A9ZAL7011052 for perforce@freebsd.org; Wed, 10 Jul 2002 02:35:10 -0700 (PDT) Date: Wed, 10 Jul 2002 02:35:10 -0700 (PDT) Message-Id: <200207100935.g6A9ZAL7011052@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14021 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14021 Change 14021 by peter@peter_daintree on 2002/07/10 02:34:53 IFC @14019 Affected files ... .. //depot/projects/pmap/sys/conf/majors#5 integrate .. //depot/projects/pmap/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/pmap/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/pmap/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/pmap/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/pmap/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/pmap/sys/dev/usb/usbdevs.h#5 integrate .. //depot/projects/pmap/sys/dev/usb/usbdevs_data.h#5 integrate .. //depot/projects/pmap/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/pmap/sys/i386/i386/exception.s#5 integrate .. //depot/projects/pmap/sys/kern/kern_sig.c#9 integrate .. //depot/projects/pmap/sys/kern/subr_trap.c#8 integrate .. //depot/projects/pmap/sys/sys/consio.h#3 integrate .. //depot/projects/pmap/sys/sys/poll.h#4 integrate .. //depot/projects/pmap/sys/sys/stat.h#4 integrate Differences ... ==== //depot/projects/pmap/sys/conf/majors#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/conf/majors,v 1.135 2002/04/15 10:41:47 benno Exp $ +$FreeBSD: src/sys/conf/majors,v 1.136 2002/07/10 01:42:25 joe Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. @@ -153,7 +153,7 @@ 135 zsc TurboLaser console uart 136 ipr Iprobe on-chip perf. counters (gallatin@freebsd.org) 137 nfp nFast PCI crypto accelerator (support@ncipher.com) -138 usio USB Serial support +138 ucom USB Serial support 139 wanrouter Sangoma Technologies Inc. (al.feldman@sangoma.com) 140 pcfclock PCFCLOCK 141 pcdmx PCDMX theatre lighting controller ==== //depot/projects/pmap/sys/dev/syscons/syscons.c#4 (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. * - * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.385 2002/06/06 06:02:17 alfred Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.386 2002/07/10 03:29:38 dd Exp $ */ #include "opt_syscons.h" @@ -981,6 +981,13 @@ *(int *)data = scp->index + 1; return 0; + case VT_LOCKSWITCH: /* prevent vty switching */ + if ((*(int *)data) & 0x01) + sc->flags |= SC_SCRN_VTYLOCK; + else + sc->flags &= ~SC_SCRN_VTYLOCK; + return 0; + case KDENABIO: /* allow io operations */ error = suser(td); if (error != 0) @@ -2075,6 +2082,13 @@ DPRINTF(5, ("sc0: sc_switch_scr() %d ", next_scr + 1)); + /* prevent switch if previously requested */ + if (sc->flags & SC_SCRN_VTYLOCK) { + sc_bell(sc->cur_scp, sc->cur_scp->bell_pitch, + sc->cur_scp->bell_duration); + return EPERM; + } + /* delay switch if the screen is blanked or being updated */ if ((sc->flags & SC_SCRN_BLANKED) || sc->write_in_progress || sc->blink_in_progress || sc->videoio_in_progress) { ==== //depot/projects/pmap/sys/dev/syscons/syscons.h#3 (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. * - * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.74 2002/04/13 22:34:16 obrien Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.h,v 1.75 2002/07/10 03:29:38 dd Exp $ */ #ifndef _DEV_SYSCONS_SYSCONS_H_ @@ -194,6 +194,7 @@ #define SC_SCRN_IDLE (1 << 5) #define SC_SCRN_BLANKED (1 << 6) #define SC_SAVER_FAILED (1 << 7) +#define SC_SCRN_VTYLOCK (1 << 8) #define SC_INIT_DONE (1 << 16) #define SC_SPLASH_SCRN (1 << 17) ==== //depot/projects/pmap/sys/dev/usb/ucom.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ucom.c,v 1.39 2001/08/16 22:31:24 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.16 2002/04/01 21:30:36 jhb Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.19 2002/07/10 01:42:25 joe Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . @@ -139,11 +139,14 @@ /* poll */ ttypoll, /* mmap */ nommap, /* strategy */ nostrategy, - /* name */ "usio", + /* name */ "ucom", /* maj */ UCOM_CDEV_MAJOR, /* dump */ nodump, /* psize */ nopsize, /* flags */ D_TTY | D_KQFILTER, +#if __FreeBSD_version < 500014 + /* bmaj */ -1, +#endif /* kqfilter */ ttykqfilter, }; @@ -188,11 +191,11 @@ DPRINTF(("ucom_attach: tty_attach tp = %p\n", tp)); - DPRINTF(("ucom_attach: make_dev: usio%d\n", unit)); + DPRINTF(("ucom_attach: make_dev: ucom%d\n", unit)); sc->dev = make_dev(&ucom_cdevsw, unit | UCOM_CALLOUT_MASK, UID_UUCP, GID_DIALER, 0660, - "usio%d", unit); + "ucom%d", unit); sc->dev->si_tty = tp; return (0); @@ -201,6 +204,9 @@ int ucom_detach(struct ucom_softc *sc) { + struct tty *tp = sc->sc_tty; + int s; + DPRINTF(("ucom_detach: sc = %p, tp = %p\n", sc, sc->sc_tty)); sc->sc_dying = 1; @@ -210,11 +216,28 @@ if (sc->sc_bulkout_pipe != NULL) usbd_abort_pipe(sc->sc_bulkout_pipe); - if (sc->sc_tty == NULL) { + if (tp != NULL) { + if (tp->t_state & TS_ISOPEN) { + device_printf(sc->sc_dev, + "still open, focing close\n"); + (*linesw[tp->t_line].l_close)(tp, 0); + tp->t_gen++; + ttyclose(tp); + ttwakeup(tp); + ttwwakeup(tp); + } + } else { DPRINTF(("ucom_detach: no tty\n")); return (0); } + s = splusb(); + if (--sc->sc_refcnt >= 0) { + /* Wait for processes to go away. */ + usb_detach_wait(USBDEV(sc->sc_dev)); + } + splx(s); + destroy_dev(sc->dev); return (0); @@ -249,7 +272,7 @@ USB_GET_SC_OPEN(ucom, unit, sc); if (sc->sc_dying) - return (EIO); + return (ENXIO); tp = sc->sc_tty; @@ -370,8 +393,8 @@ /* * Handle initial DCD. */ - if (ISSET(sc->sc_msr, UMSR_DCD) - || (minor(dev) & UCOM_CALLOUT_MASK)) + if (ISSET(sc->sc_msr, UMSR_DCD) || + (minor(dev) & UCOM_CALLOUT_MASK)) (*linesw[tp->t_line].l_modem)(tp, 1); ucomstartread(sc); @@ -394,6 +417,7 @@ DPRINTF(("%s: ucomopen: success\n", USBDEVNAME(sc->sc_dev))); sc->sc_poll = 1; + sc->sc_refcnt++; return (0); @@ -444,7 +468,7 @@ USBDEVNAME(sc->sc_dev), UCOMUNIT(dev))); if (!ISSET(tp->t_state, TS_ISOPEN)) - return (0); + goto quit; s = spltty(); (*linesw[tp->t_line].l_close)(tp, flag); @@ -453,7 +477,7 @@ splx(s); if (sc->sc_dying) - return (0); + goto quit; if (!ISSET(tp->t_state, TS_ISOPEN)) { /* @@ -467,6 +491,10 @@ if (sc->sc_callback->ucom_close != NULL) sc->sc_callback->ucom_close(sc->sc_parent, sc->sc_portno); + quit: + if (--sc->sc_refcnt < 0) + usb_detach_wakeup(USBDEV(sc->sc_dev)); + return (0); } @@ -924,6 +952,8 @@ } splx(s); } + + DPRINTF(("ucomstop: done\n")); } Static void @@ -1103,12 +1133,24 @@ Static void ucomstopread(struct ucom_softc *sc) { + usbd_status err; + + DPRINTF(("ucomstopread: enter\n")); + if (!(sc->sc_state & UCS_RXSTOP)) { - if (sc->sc_bulkin_pipe == NULL) + if (sc->sc_bulkin_pipe == NULL) { + DPRINTF(("ucomstopread: bulkin pipe NULL\n")); return; + } sc->sc_state |= UCS_RXSTOP; - usbd_abort_pipe(sc->sc_bulkin_pipe); + err = usbd_abort_pipe(sc->sc_bulkin_pipe); + if (err) { + DPRINTF(("ucomstopread: err = %s\n", + usbd_errstr(err))); + } } + + DPRINTF(("ucomstopread: leave\n")); } static void ==== //depot/projects/pmap/sys/dev/usb/uplcom.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uplcom.c,v 1.20 2001/07/31 12:33:11 ichiro Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uplcom.c,v 1.1 2002/03/18 18:23:39 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uplcom.c,v 1.4 2002/07/10 01:42:25 joe Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . @@ -204,6 +204,8 @@ { USB_VENDOR_TDK, USB_PRODUCT_TDK_UHA6400 }, /* RATOC REX-USB60 */ { USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60 }, + /* ELECOM UC-SGT */ + { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT }, { 0, 0 } }; @@ -220,7 +222,7 @@ }; Static driver_t uplcom_driver = { - "usio", + "uplcom", uplcom_methods, sizeof (struct uplcom_softc) }; @@ -678,7 +680,7 @@ int err; if (sc->sc_ucom.sc_dying) - return (EIO); + return (ENXIO); DPRINTF(("uplcom_open: sc = %p\n", sc)); ==== //depot/projects/pmap/sys/dev/usb/usbdevs#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.92 2002/07/09 16:45:03 joe Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.93 2002/07/10 00:43:10 joe Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -554,6 +554,7 @@ product ELECOM LDUSBTX1 0x4002 LD-USB/TX product ELECOM LDUSBLTX 0x4005 LD-USBL/TX product ELECOM LDUSBTX2 0x400b LD-USB/TX +product ELECOM UCSGT 0x5003 UC-SGT product ELECOM LDUSBTX3 0xabc1 LD-USB/TX /* Elsa products */ ==== //depot/projects/pmap/sys/dev/usb/usbdevs.h#5 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.104 2002/07/09 16:46:31 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.105 2002/07/10 00:43:50 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.92 2002/07/09 16:45:03 joe Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.93 2002/07/10 00:43:10 joe Exp */ /* @@ -561,6 +561,7 @@ #define USB_PRODUCT_ELECOM_LDUSBTX1 0x4002 /* LD-USB/TX */ #define USB_PRODUCT_ELECOM_LDUSBLTX 0x4005 /* LD-USBL/TX */ #define USB_PRODUCT_ELECOM_LDUSBTX2 0x400b /* LD-USB/TX */ +#define USB_PRODUCT_ELECOM_UCSGT 0x5003 /* UC-SGT */ #define USB_PRODUCT_ELECOM_LDUSBTX3 0xabc1 /* LD-USB/TX */ /* Elsa products */ ==== //depot/projects/pmap/sys/dev/usb/usbdevs_data.h#5 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.104 2002/07/09 16:46:31 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.105 2002/07/10 00:43:50 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.92 2002/07/09 16:45:03 joe Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.93 2002/07/10 00:43:10 joe Exp */ /* @@ -730,6 +730,12 @@ "LD-USB/TX", }, { + USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT, + 0, + "Elecom", + "UC-SGT", + }, + { USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3, 0, "Elecom", ==== //depot/projects/pmap/sys/dev/usb/uvscom.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/uvscom.c,v 1.4 2002/03/28 12:22:58 joe Exp $ + * $FreeBSD: src/sys/dev/usb/uvscom.c,v 1.6 2002/07/10 01:42:25 joe Exp $ */ /* @@ -232,7 +232,7 @@ }; Static driver_t uvscom_driver = { - "usio", + "uvscom", uvscom_methods, sizeof (struct uvscom_softc) }; @@ -712,7 +712,7 @@ int i; if (sc->sc_ucom.sc_dying) - return (EIO); + return (ENXIO); DPRINTF(("uvscom_open: sc = %p\n", sc)); @@ -725,7 +725,7 @@ if (err) { DPRINTF(("%s: uvscom_open: readstat faild\n", USBDEVNAME(sc->sc_ucom.sc_dev))); - return (EIO); + return (ENXIO); } sc->sc_intr_buf = malloc(sc->sc_isize, M_USBDEV, M_WAITOK); @@ -742,7 +742,7 @@ printf("%s: cannot open interrupt pipe (addr %d)\n", USBDEVNAME(sc->sc_ucom.sc_dev), sc->sc_intr_number); - return (EIO); + return (ENXIO); } } else { DPRINTF(("uvscom_open: did not open interrupt pipe.\n")); @@ -759,14 +759,14 @@ if (i == 0) { DPRINTF(("%s: unit is not ready\n", USBDEVNAME(sc->sc_ucom.sc_dev))); - return (EIO); + return (ENXIO); } /* check PC card was inserted */ if (ISSET(sc->sc_usr, UVSCOM_NOCARD)) { DPRINTF(("%s: no card\n", USBDEVNAME(sc->sc_ucom.sc_dev))); - return (EIO); + return (ENXIO); } } ==== //depot/projects/pmap/sys/i386/i386/exception.s#5 (text+ko) ==== @@ -1,4 +1,5 @@ /*- + * Copyright (c) 1989, 1990 William F. Jolitz. * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * @@ -30,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/exception.s,v 1.94 2002/03/27 05:39:18 dillon Exp $ + * $FreeBSD: src/sys/i386/i386/exception.s,v 1.95 2002/07/10 02:24:44 julian Exp $ */ #include "opt_npx.h" @@ -264,15 +265,103 @@ */ #include "i386/isa/vector.s" + .data + ALIGN_DATA + /* - * Include what was once icu-dependent code. - * XXX it should be merged into this file (also move the definition of - * imen to vector.s or isa.c). - * Before including it, set up a normal asm environment so that vector.s - * doesn't have to know that stuff is included after it. + * void doreti(struct trapframe) + * + * Handle return from interrupts, traps and syscalls. */ - .data - ALIGN_DATA .text SUPERALIGN_TEXT -#include "i386/isa/ipl.s" + .type doreti,@function +doreti: + FAKE_MCOUNT(bintr) /* init "from" bintr -> doreti */ +doreti_next: + /* + * Check if ASTs can be handled now. PSL_VM must be checked first + * since segment registers only have an RPL in non-VM86 mode. + */ + testl $PSL_VM,TF_EFLAGS(%esp) /* are we in vm86 mode? */ + jz doreti_notvm86 + cmpl $1,in_vm86call /* are we in a vm86 call? */ + jne doreti_ast /* can handle ASTs now if not */ + jmp doreti_exit + +doreti_notvm86: + testb $SEL_RPL_MASK,TF_CS(%esp) /* are we in user mode? */ + jz doreti_exit /* can't handle ASTs now if not */ + +doreti_ast: + /* + * Check for ASTs atomically with returning. Disabling CPU + * interrupts provides sufficient locking evein the SMP case, + * since we will be informed of any new ASTs by an IPI. + */ + cli + movl PCPU(CURTHREAD),%eax + movl TD_KSE(%eax), %eax + testl $KEF_ASTPENDING | KEF_NEEDRESCHED,KE_FLAGS(%eax) + je doreti_exit + sti + pushl %esp /* pass a pointer to the trapframe */ + call ast + add $4,%esp + jmp doreti_ast + + /* + * doreti_exit: pop registers, iret. + * + * The segment register pop is a special case, since it may + * fault if (for example) a sigreturn specifies bad segment + * registers. The fault is handled in trap.c. + */ +doreti_exit: + MEXITCOUNT + + .globl doreti_popl_fs +doreti_popl_fs: + popl %fs + .globl doreti_popl_es +doreti_popl_es: + popl %es + .globl doreti_popl_ds +doreti_popl_ds: + popl %ds + popal + addl $8,%esp + .globl doreti_iret +doreti_iret: + iret + + /* + * doreti_iret_fault and friends. Alternative return code for + * the case where we get a fault in the doreti_exit code + * above. trap() (i386/i386/trap.c) catches this specific + * case, sends the process a signal and continues in the + * corresponding place in the code below. + */ + ALIGN_TEXT + .globl doreti_iret_fault +doreti_iret_fault: + subl $8,%esp + pushal + pushl %ds + .globl doreti_popl_ds_fault +doreti_popl_ds_fault: + pushl %es + .globl doreti_popl_es_fault +doreti_popl_es_fault: + pushl %fs + .globl doreti_popl_fs_fault +doreti_popl_fs_fault: + movl $0,TF_ERR(%esp) /* XXX should be the error code */ + movl $T_PROTFLT,TF_TRAPNO(%esp) + jmp alltraps_with_regs_pushed + +#ifdef APIC_IO +#include "i386/isa/apic_ipl.s" +#else +#include "i386/isa/icu_ipl.s" +#endif /* APIC_IO */ ==== //depot/projects/pmap/sys/kern/kern_sig.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.174 2002/07/03 09:15:20 julian Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.175 2002/07/10 06:31:35 truckman Exp $ */ #include "opt_compat.h" @@ -1967,8 +1967,6 @@ * then it passes on a vnode and a size limit to the process-specific * coredump routine if there is one; if there _is not_ one, it returns * ENOSYS; otherwise it returns the error from the process-specific routine. - * - * XXX: VOP_GETATTR() here requires holding the vnode lock. */ static int @@ -2021,6 +2019,14 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vp = nd.ni_vp; + /* Don't dump to non-regular files or files with links. */ + if (vp->v_type != VREG || + VOP_GETATTR(vp, &vattr, cred, td) || vattr.va_nlink != 1) { + VOP_UNLOCK(vp, 0, td); + error = EFAULT; + goto out2; + } + VOP_UNLOCK(vp, 0, td); lf.l_whence = SEEK_SET; lf.l_start = 0; @@ -2040,12 +2046,6 @@ goto restart; } - /* Don't dump to non-regular files or files with links. */ - if (vp->v_type != VREG || - VOP_GETATTR(vp, &vattr, cred, td) || vattr.va_nlink != 1) { - error = EFAULT; - goto out1; - } VATTR_NULL(&vattr); vattr.va_size = 0; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); @@ -2060,7 +2060,6 @@ p->p_sysent->sv_coredump(td, vp, limit) : ENOSYS; -out1: lf.l_type = F_UNLCK; VOP_ADVLOCK(vp, (caddr_t)p, F_UNLCK, &lf, F_FLOCK); vn_finished_write(mp); ==== //depot/projects/pmap/sys/kern/subr_trap.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/kern/subr_trap.c,v 1.219 2002/06/29 17:26:18 julian Exp $ + * $FreeBSD: src/sys/kern/subr_trap.c,v 1.220 2002/07/10 06:40:22 julian Exp $ */ #ifdef __i386__ @@ -106,10 +106,14 @@ /* * We need to check to see if we have to exit or wait due to a * single threading requirement or some other STOP condition. + * Don't bother doing all the work if the stop bits are not set + * at this time.. If we miss it, we miss it.. no big deal. */ - PROC_LOCK(p); - thread_suspend_check(0); /* Can suspend or kill */ - PROC_UNLOCK(p); + if (P_SHOULDSTOP(p)) { + PROC_LOCK(p); + thread_suspend_check(0); /* Can suspend or kill */ + PROC_UNLOCK(p); + } /* * DO special thread processing, e.g. upcall tweaking and such ==== //depot/projects/pmap/sys/sys/consio.h#3 (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. * - * $FreeBSD: src/sys/sys/consio.h,v 1.14 2002/05/16 10:57:10 sobomax Exp $ + * $FreeBSD: src/sys/sys/consio.h,v 1.15 2002/07/10 03:29:38 dd Exp $ */ #ifndef _SYS_CONSIO_H_ @@ -335,6 +335,9 @@ /* get the index of the vty */ #define VT_GETINDEX _IOR('v', 8, int) +/* prevent switching vtys */ +#define VT_LOCKSWITCH _IOW('v', 9, int) + /* * Video mode switching ioctl. See sys/fbio.h for mode numbers. */ ==== //depot/projects/pmap/sys/sys/poll.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/poll.h,v 1.12 2002/07/08 16:37:34 mike Exp $ + * $FreeBSD: src/sys/sys/poll.h,v 1.13 2002/07/10 04:47:25 mike Exp $ */ #ifndef _SYS_POLL_H_ @@ -66,8 +66,8 @@ #define POLLRDBAND 0x0080 /* OOB/Urgent readable data */ #define POLLWRBAND 0x0100 /* OOB/Urgent data can be written */ +#if __BSD_VISIBLE /* General FreeBSD extension (currently only supported for sockets): */ -#if __BSD_VISIBLE #define POLLINIGNEOF 0x2000 /* like POLLIN, except ignore EOF */ #endif ==== //depot/projects/pmap/sys/sys/stat.h#4 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)stat.h 8.12 (Berkeley) 6/16/95 - * $FreeBSD: src/sys/sys/stat.h,v 1.26 2002/06/22 22:01:09 mckusick Exp $ + * $FreeBSD: src/sys/sys/stat.h,v 1.27 2002/07/10 05:21:14 bde Exp $ */ #ifndef _SYS_STAT_H_ @@ -58,6 +58,10 @@ #include #endif +#ifdef _POSIX_SOURCE +#include +#endif + #ifdef _KERNEL #define __dev_t udev_t #else @@ -112,10 +116,6 @@ int32_t st_lspare; #ifndef _POSIX_SOURCE struct timespec st_createtimespec; /* time of file creation */ -#else - time_t st_createtime; /* time of file creation */ - long st_createtimensec; /* nsec of file creation */ -#endif /* * Explicitly pad st_createtimespec to 16 bytes so that the size of * struct stat is backwards compatible. We use bitfields instead @@ -126,6 +126,12 @@ */ int :(8 / 2) * (16 - (int)sizeof(struct timespec)); int :(8 / 2) * (16 - (int)sizeof(struct timespec)); +#else + time_t st_createtime; /* time of file creation */ + long st_createtimensec; /* nsec of file creation */ + int :(8 / 2) * (16 - (int)sizeof(struct __timespec)); + int :(8 / 2) * (16 - (int)sizeof(struct __timespec)); +#endif }; #ifndef _POSIX_SOURCE To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 2:52:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5077837B401; Wed, 10 Jul 2002 02:52:33 -0700 (PDT) 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 EB09937B400 for ; Wed, 10 Jul 2002 02:52:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9F8943E3B for ; Wed, 10 Jul 2002 02:52:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6A9qWJU013061 for ; Wed, 10 Jul 2002 02:52:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6A9qWQ4013058 for perforce@freebsd.org; Wed, 10 Jul 2002 02:52:32 -0700 (PDT) Date: Wed, 10 Jul 2002 02:52:32 -0700 (PDT) Message-Id: <200207100952.g6A9qWQ4013058@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14024 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14024 Change 14024 by peter@peter_daintree on 2002/07/10 02:51:44 go for broke and turn PG_G on everywhere, including SMP. Yes, there are some known problems still (turning 4MB pages to 4K pages, for example) Affected files ... .. //depot/projects/pmap/sys/conf/options.i386#8 edit .. //depot/projects/pmap/sys/conf/options.pc98#8 edit .. //depot/projects/pmap/sys/i386/i386/pmap.c#19 edit Differences ... ==== //depot/projects/pmap/sys/conf/options.i386#8 (text+ko) ==== @@ -1,11 +1,11 @@ # $FreeBSD: src/sys/conf/options.i386,v 1.171 2002/06/18 21:30:36 n_hibma Exp $ # Options specific to the i386 platform kernels -DISABLE_PSE MATH_EMULATE opt_math_emulate.h GPL_MATH_EMULATE opt_math_emulate.h +DISABLE_PSE opt_pmap.h PMAP_SHPGPERPROC opt_pmap.h -ENABLE_PG_G opt_pmap.h +DISABLE_PG_G opt_pmap.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h SHOW_BUSYBUFS ==== //depot/projects/pmap/sys/conf/options.pc98#8 (text+ko) ==== @@ -1,11 +1,11 @@ # $FreeBSD: src/sys/conf/options.pc98,v 1.146 2002/06/18 21:30:37 n_hibma Exp $ # Options specific to the pc98 platform kernels -DISABLE_PSE MATH_EMULATE opt_math_emulate.h GPL_MATH_EMULATE opt_math_emulate.h +DISABLE_PSE opt_pmap.h PMAP_SHPGPERPROC opt_pmap.h -ENABLE_PG_G opt_pmap.h +DISABLE_PG_G opt_pmap.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h SHOW_BUSYBUFS ==== //depot/projects/pmap/sys/i386/i386/pmap.c#19 (text+ko) ==== @@ -68,7 +68,6 @@ * and to when physical maps must be made correct. */ -#include "opt_disable_pse.h" #include "opt_pmap.h" #include "opt_msgbuf.h" #include "opt_kstack_pages.h" @@ -366,7 +365,7 @@ PTD[i] = 0; pgeflag = 0; -#if !defined(SMP) || defined(ENABLE_PG_G) +#ifndef DISABLE_PG_G if (cpu_feature & CPUID_PGE) pgeflag = PG_G; #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 3:19:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A86537B401; Wed, 10 Jul 2002 03:19:06 -0700 (PDT) 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 A19FB37B400 for ; Wed, 10 Jul 2002 03:19:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4440A43E09 for ; Wed, 10 Jul 2002 03:19:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AAJ5JU019642 for ; Wed, 10 Jul 2002 03:19:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AAJ41N019639 for perforce@freebsd.org; Wed, 10 Jul 2002 03:19:04 -0700 (PDT) Date: Wed, 10 Jul 2002 03:19:04 -0700 (PDT) Message-Id: <200207101019.g6AAJ41N019639@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14025 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14025 Change 14025 by peter@peter_daintree on 2002/07/10 03:18:50 oops, stray bit of code I thought I got rid of. Affected files ... .. //depot/projects/pmap/sys/i386/i386/pmap.c#20 edit Differences ... ==== //depot/projects/pmap/sys/i386/i386/pmap.c#20 (text+ko) ==== @@ -2629,12 +2629,6 @@ * block. */ dstmpte = pmap_allocpte(dst_pmap, addr); - if ((APTDpde & PG_FRAME) != - (saved_pde & PG_FRAME)) { - APTDpde = saved_pde; -printf ("IT HAPPENNED!"); - invltlb(); - } if ((*dst_pte == 0) && (ptetemp = *src_pte)) { /* * Clear the modified and To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 8: 2:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B03637B401; Wed, 10 Jul 2002 08:02:17 -0700 (PDT) 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 EA04E37B400 for ; Wed, 10 Jul 2002 08:02:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 905AC43E52 for ; Wed, 10 Jul 2002 08:02:16 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AF2GJU077861 for ; Wed, 10 Jul 2002 08:02:16 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AF2GVj077852 for perforce@freebsd.org; Wed, 10 Jul 2002 08:02:16 -0700 (PDT) Date: Wed, 10 Jul 2002 08:02:16 -0700 (PDT) Message-Id: <200207101502.g6AF2GVj077852@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14031 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14031 Change 14031 by green@green_laptop_2 on 2002/07/10 08:02:13 * Fix a bug where mac_update_vnode_from_externalized would _never_ get called. (ALSO: LAZY INSTANTIATE ALL FREEBSD.MAC LABELS) * Remove mac_create_vnode_from_exported() Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#160 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#109 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#160 (text+ko) ==== @@ -917,10 +917,19 @@ case EOPNOTSUPP: case ENOATTR: - /* Use the label from the mountpoint. */ + /* + * Use the label from the mountpoint. Take this opportunity + * to lazy-instantiate, just for correctness. + */ mac_update_vnode_from_mount(vp, vp->v_mount); - return (0); - + error = mac_externalize(&vp->v_label, &extmac); + if (error) + return (error); + error = vn_extattr_set(vp, IO_NODELOCKED, + FREEBSD_MAC_EXTATTR_NAMESPACE, FREEBSD_MAC_EXTATTR_NAME, + sizeof(extmac), (char *)&extmac, curthread); + if (error == 0) + break; default: /* Fail horribly. */ return (error); @@ -987,8 +996,7 @@ * about doing this. */ mac_update_vnode_from_mount(vp, vp->v_mount); - - return (0); + error = 0; default: return (error); } @@ -2216,16 +2224,6 @@ child, &child->v_label); } -void -mac_create_vnode_from_exported(struct ucred *cred, struct vnode *vp, - struct mac *extmac, struct label *intlabel) -{ - - ASSERT_VOP_LOCKED(vp, "mac_create_vnode_from_exported"); - - MAC_PERFORM(create_vnode_from_exported, cred, vp, extmac, intlabel); -} - int mac_cred_check_statfs(struct ucred *cred, struct mount *mount) { ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#109 (text+ko) ==== @@ -326,8 +326,6 @@ struct ucred *cred_child); void mac_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, struct vnode *child); -void mac_create_vnode_from_exported(struct ucred *cred, struct vnode *vp, - struct mac *extmac, struct label *intlabel); void mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket); void mac_set_socket_peer_from_socket(struct socket *oldsocket, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 8:17:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E77F537B401; Wed, 10 Jul 2002 08:17:37 -0700 (PDT) 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 9F63437B400 for ; Wed, 10 Jul 2002 08:17:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6402643E42 for ; Wed, 10 Jul 2002 08:17:37 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AFHbJU084164 for ; Wed, 10 Jul 2002 08:17:37 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AFHbFG084161 for perforce@freebsd.org; Wed, 10 Jul 2002 08:17:37 -0700 (PDT) Date: Wed, 10 Jul 2002 08:17:37 -0700 (PDT) Message-Id: <200207101517.g6AFHbFG084161@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 14033 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14033 Change 14033 by cvance@cvance_korben on 2002/07/10 08:16:53 Separate EOPNOTSUPP case from ENOATTR Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#161 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#161 (text+ko) ==== @@ -915,7 +915,6 @@ /* Got it */ break; - case EOPNOTSUPP: case ENOATTR: /* * Use the label from the mountpoint. Take this opportunity @@ -930,6 +929,7 @@ sizeof(extmac), (char *)&extmac, curthread); if (error == 0) break; + case EOPNOTSUPP: default: /* Fail horribly. */ return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 8:21:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96FEB37B401; Wed, 10 Jul 2002 08:21:43 -0700 (PDT) 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 4B1CF37B400 for ; Wed, 10 Jul 2002 08:21:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06E3E43E3B for ; Wed, 10 Jul 2002 08:21:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AFLgJU084778 for ; Wed, 10 Jul 2002 08:21:42 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AFLgiL084761 for perforce@freebsd.org; Wed, 10 Jul 2002 08:21:42 -0700 (PDT) Date: Wed, 10 Jul 2002 08:21:42 -0700 (PDT) Message-Id: <200207101521.g6AFLgiL084761@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14034 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14034 Change 14034 by rwatson@rwatson_paprika on 2002/07/10 08:21:41 Rename test to kmacmanager for consistency purposes. Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/Makefile#3 edit .. //depot/projects/trustedbsd/misc/kmacmanager/kmacmanager.cc#1 branch .. //depot/projects/trustedbsd/misc/kmacmanager/kmacmanager.h#1 branch .. //depot/projects/trustedbsd/misc/kmacmanager/test.cc#4 delete .. //depot/projects/trustedbsd/misc/kmacmanager/test.h#3 delete Differences ... ==== //depot/projects/trustedbsd/misc/kmacmanager/Makefile#3 (text+ko) ==== @@ -38,17 +38,17 @@ CFLAGS=-Wall ${KDEINC} ${QTINC} LDFLAGS=${KDELIB} ${QTLIB} -all: test +all: kmacmanager hellowindow: hellowindow.c g++ ${KDEINC} ${QTINC} -Wall -o hellowindow hellowindow.c ${KDELIB} \ ${QTLIB} -main.o: main.cc test.h -test.moc: test.h - ${MOC} test.h -o test.moc -test.o: test.cc test.h test.moc -test: main.o test.o logwindow.o modulelist.o sysctllist.o sysctl_util.o +main.o: main.cc kmacmanager.h +kmacmanager.moc: kmacmanager.h + ${MOC} macmanager.h -o macmanager.moc +kmacmanager.o: kmacmanager.cc kmacmanager.h kmacmanager.moc +kmacmanager: main.o kmacmanager.o logwindow.o modulelist.o sysctllist.o sysctl_util.o g++ -o ${.TARGET} ${.ALLSRC} ${KDELIB} ${QTLIB} logwindow.moc: logwindow.h ${MOC} logwindow.h -o logwindow.moc @@ -62,4 +62,4 @@ sysctl_util.o: sysctl_util.c sysctl_util.h clean: - rm -f test *.o *.moc *.core + rm -f kmacmanager *.o *.moc *.core To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 8:25: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66DB237B401; Wed, 10 Jul 2002 08:24:48 -0700 (PDT) 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 048DF37B400 for ; Wed, 10 Jul 2002 08:24:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 929A643E5E for ; Wed, 10 Jul 2002 08:24:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AFOlJU085042 for ; Wed, 10 Jul 2002 08:24:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AFOlf1085039 for perforce@freebsd.org; Wed, 10 Jul 2002 08:24:47 -0700 (PDT) Date: Wed, 10 Jul 2002 08:24:47 -0700 (PDT) Message-Id: <200207101524.g6AFOlf1085039@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14035 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14035 Change 14035 by rwatson@rwatson_paprika on 2002/07/10 08:24:09 Finish the rename. Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/Makefile#4 edit .. //depot/projects/trustedbsd/misc/kmacmanager/kmacmanager.cc#2 edit .. //depot/projects/trustedbsd/misc/kmacmanager/kmacmanager.h#2 edit .. //depot/projects/trustedbsd/misc/kmacmanager/main.cc#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmacmanager/Makefile#4 (text+ko) ==== @@ -46,7 +46,7 @@ main.o: main.cc kmacmanager.h kmacmanager.moc: kmacmanager.h - ${MOC} macmanager.h -o macmanager.moc + ${MOC} kmacmanager.h -o kmacmanager.moc kmacmanager.o: kmacmanager.cc kmacmanager.h kmacmanager.moc kmacmanager: main.o kmacmanager.o logwindow.o modulelist.o sysctllist.o sysctl_util.o g++ -o ${.TARGET} ${.ALLSRC} ${KDELIB} ${QTLIB} ==== //depot/projects/trustedbsd/misc/kmacmanager/kmacmanager.cc#2 (text+ko) ==== @@ -36,13 +36,13 @@ #include -#include "test.moc" +#include "kmacmanager.moc" #include #include #include "konqueror.h" -Test::Test() : KMainWindow() +KMacManager::KMacManager() : KMainWindow() { file = new QPopupMenu(); @@ -70,12 +70,12 @@ setCentralWidget(split); } -void Test::closeEvent(QCloseEvent *e) +void KMacManager::closeEvent(QCloseEvent *e) { KMainWindow::closeEvent(e); } -void Test::slotAbout() +void KMacManager::slotAbout() { QMessageBox::information(this, "About", @@ -86,27 +86,27 @@ "Network Associates, Inc."); } -void Test::slotRefreshKonquerors() +void KMacManager::slotRefreshKonquerors() { KONQUEROR_REFRESH(); } -void Test::slotRefreshModules() +void KMacManager::slotRefreshModules() { modulelist->refresh(); bar->message("Module information refreshed\n"); } -void Test::slotRefreshSysctls() +void KMacManager::slotRefreshSysctls() { sysctllist->refresh(NULL); bar->message("Sysctl information refreshed\n"); } -void Test::slotExit() +void KMacManager::slotExit() { close(); } ==== //depot/projects/trustedbsd/misc/kmacmanager/kmacmanager.h#2 (text+ko) ==== @@ -50,11 +50,11 @@ #include "modulelist.h" #include "sysctllist.h" -class Test : public KMainWindow +class KMacManager : public KMainWindow { Q_OBJECT public: - Test(); + KMacManager(); void closeEvent(QCloseEvent *); public slots: void slotAbout(); ==== //depot/projects/trustedbsd/misc/kmacmanager/main.cc#2 (text+ko) ==== @@ -34,12 +34,12 @@ * $FreeBSD$ */ -#include "test.h" +#include "kmacmanager.h" int main( int argc, char **argv ) { - KApplication a(argc, argv, "test"); - Test *w = new Test(); + KApplication a(argc, argv, "KMacManager"); + KMacManager *w = new KMacManager(); a.setMainWidget( w ); w->show(); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 8:25:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBEC737B40B; Wed, 10 Jul 2002 08:25:27 -0700 (PDT) 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 6563437B409 for ; Wed, 10 Jul 2002 08:25:27 -0700 (PDT) Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by mx1.FreeBSD.org (Postfix) with ESMTP id B30E243E3B for ; Wed, 10 Jul 2002 08:25:20 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 13702 invoked from network); 10 Jul 2002 15:25:19 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 10 Jul 2002 15:25:19 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g6AFPI001415; Wed, 10 Jul 2002 11:25:18 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Wed, 10 Jul 2002 11:25:27 -0400 (EDT) From: John Baldwin To: Julian Elischer Subject: Re: PERFORCE change 13995 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 09-Jul-2002 Julian Elischer wrote: > this looks "odd" Unfortuantely user_ldt_free has a weird rule with sched_lock: it drops it. user_ldt_alloc() has a weirder one in that it drops it if it returns NULL. > ==== //depot/projects/smpng/sys/i386/i386/machdep.c#40 (text+ko) ==== > > @@ -825,8 +825,11 @@ > struct trapframe *regs = td->td_frame; > struct pcb *pcb = td->td_pcb; > > + mtx_lock_spin(&sched_lock); > if (td->td_proc->p_md.md_ldt) > user_ldt_free(td); > + else > + mtx_unlock_spin(&sched_lock); > > bzero((char *)regs, sizeof(struct trapframe)); > regs->tf_eip = entry; > > > does user_ldt_free(td) release the sched lock? > > > -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 8:25:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7284737B401; Wed, 10 Jul 2002 08:25:51 -0700 (PDT) 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 C184637B400 for ; Wed, 10 Jul 2002 08:25:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6359F43E42 for ; Wed, 10 Jul 2002 08:25:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AFPnJU085183 for ; Wed, 10 Jul 2002 08:25:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AFPnm1085180 for perforce@freebsd.org; Wed, 10 Jul 2002 08:25:49 -0700 (PDT) Date: Wed, 10 Jul 2002 08:25:49 -0700 (PDT) Message-Id: <200207101525.g6AFPnm1085180@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14036 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14036 Change 14036 by rwatson@rwatson_paprika on 2002/07/10 08:25:43 Remove some historical cruft. Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmacmanager/Makefile#5 (text+ko) ==== @@ -40,10 +40,6 @@ all: kmacmanager -hellowindow: hellowindow.c - g++ ${KDEINC} ${QTINC} -Wall -o hellowindow hellowindow.c ${KDELIB} \ - ${QTLIB} - main.o: main.cc kmacmanager.h kmacmanager.moc: kmacmanager.h ${MOC} kmacmanager.h -o kmacmanager.moc To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 9:45:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 891EB37B401; Wed, 10 Jul 2002 09:45:35 -0700 (PDT) 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 807CD37B400 for ; Wed, 10 Jul 2002 09:45:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FB2643E09 for ; Wed, 10 Jul 2002 09:45:34 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AGjYJU098079 for ; Wed, 10 Jul 2002 09:45:34 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AGjVCp098074 for perforce@freebsd.org; Wed, 10 Jul 2002 09:45:31 -0700 (PDT) Date: Wed, 10 Jul 2002 09:45:31 -0700 (PDT) Message-Id: <200207101645.g6AGjVCp098074@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14039 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14039 Change 14039 by green@green_laptop_2 on 2002/07/10 09:45:07 Finish removing unused hook. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#162 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#68 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#162 (text+ko) ==== @@ -321,10 +321,6 @@ mpc->mpc_ops.mpo_create_vnode_from_vnode = mpe->mpe_function; break; - case MAC_CREATE_VNODE_FROM_EXPORTED: - mpc->mpc_ops.mpo_create_vnode_from_exported = - mpe->mpe_function; - break; case MAC_CREATE_MOUNT: mpc->mpc_ops.mpo_create_mount = mpe->mpe_function; break; ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#68 (text+ko) ==== @@ -114,9 +114,6 @@ void (*mpo_create_vnode_from_vnode)(struct ucred *cred, struct vnode *parent, struct label *parentlabel, struct vnode *child, struct label *childlabel); - void (*mpo_create_vnode_from_exported)(struct ucred *cred, - struct vnode *vp, struct mac *extmac, - struct label *intlabel); void (*mpo_create_mount)(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel); void (*mpo_create_root_mount)(struct ucred *cred, @@ -342,7 +339,6 @@ MAC_CREATE_DEVFS_DIRECTORY, MAC_CREATE_DEVFS_VNODE, MAC_CREATE_VNODE_FROM_VNODE, - MAC_CREATE_VNODE_FROM_EXPORTED, MAC_CREATE_MOUNT, MAC_CREATE_ROOT_MOUNT, MAC_RELABEL_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 9:49:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C609537B401; Wed, 10 Jul 2002 09:49:42 -0700 (PDT) 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 5F23A37B400 for ; Wed, 10 Jul 2002 09:49:42 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2151243E3B for ; Wed, 10 Jul 2002 09:49:42 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AGngJU098331 for ; Wed, 10 Jul 2002 09:49:42 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AGndW2098327 for perforce@freebsd.org; Wed, 10 Jul 2002 09:49:39 -0700 (PDT) Date: Wed, 10 Jul 2002 09:49:39 -0700 (PDT) Message-Id: <200207101649.g6AGndW2098327@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14040 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14040 Change 14040 by green@green_laptop_2 on 2002/07/10 09:49:04 Catch up with trmeoved mac_created_vnode_from_exported. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#34 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#34 (text+ko) ==== @@ -272,13 +272,6 @@ } static void -mac_none_create_vnode_from_exported(struct ucred *cred, struct vnode *vp, - struct mac *extmac, struct label *intlabel) -{ - -} - -static void mac_none_create_mount(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel) { @@ -857,8 +850,6 @@ (macop_t)mac_none_create_devfs_directory }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_none_create_devfs_vnode }, - { MAC_CREATE_VNODE_FROM_EXPORTED, - (macop_t)mac_none_create_vnode_from_exported }, { MAC_CREATE_VNODE_FROM_VNODE, (macop_t)mac_none_create_vnode_from_vnode }, { MAC_CREATE_MOUNT, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 10:52:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97A2337B406; Wed, 10 Jul 2002 10:52:05 -0700 (PDT) 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 2AC3D37B401 for ; Wed, 10 Jul 2002 10:52:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD69843E09 for ; Wed, 10 Jul 2002 10:52:04 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AHq4JU010712 for ; Wed, 10 Jul 2002 10:52:04 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AHq4IC010709 for perforce@freebsd.org; Wed, 10 Jul 2002 10:52:04 -0700 (PDT) Date: Wed, 10 Jul 2002 10:52:04 -0700 (PDT) Message-Id: <200207101752.g6AHq4IC010709@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 14046 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14046 Change 14046 by cvance@cvance_korben on 2002/07/10 10:51:06 Add user-space utility to label files for SEBSD consumption Affected files ... .. //depot/projects/trustedbsd/mac/sbin/sebsd_setfiles/Makefile#1 add .. //depot/projects/trustedbsd/mac/sbin/sebsd_setfiles/setfiles.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 10:54:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D9F237B407; Wed, 10 Jul 2002 10:54:09 -0700 (PDT) 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 256B737B405 for ; Wed, 10 Jul 2002 10:54:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD06343E31 for ; Wed, 10 Jul 2002 10:54:07 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AHs7JU010931 for ; Wed, 10 Jul 2002 10:54:07 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AHs7Zc010928 for perforce@freebsd.org; Wed, 10 Jul 2002 10:54:07 -0700 (PDT) Date: Wed, 10 Jul 2002 10:54:07 -0700 (PDT) Message-Id: <200207101754.g6AHs7Zc010928@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 14047 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14047 Change 14047 by cvance@cvance_korben on 2002/07/10 10:53:11 Add sebsd_setfiles to build and fix cut-n-paste goof Affected files ... .. //depot/projects/trustedbsd/mac/sbin/Makefile#8 edit .. //depot/projects/trustedbsd/mac/sbin/sebsd_setfiles/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/Makefile#8 (text+ko) ==== @@ -67,6 +67,7 @@ rtsol \ savecore \ sebsd_checkpolicy \ + sebsd_setfiles \ shutdown \ slattach \ spppcontrol \ ==== //depot/projects/trustedbsd/mac/sbin/sebsd_setfiles/Makefile#2 (text+ko) ==== @@ -3,7 +3,7 @@ #.PATH: ${.CURDIR}/../../contrib/sebsd/setfiles .PATH: ${.CURDIR} -PROG= sebsd_checkpolicy +PROG= sebsd_setfiles MAN= SRCS= setfiles.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 10:57:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DE5537B400; Wed, 10 Jul 2002 10:57:13 -0700 (PDT) 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 1BE9437B401 for ; Wed, 10 Jul 2002 10:57:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3479343E42 for ; Wed, 10 Jul 2002 10:57:12 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AHvCJU011185 for ; Wed, 10 Jul 2002 10:57:12 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AHvBPk011182 for perforce@freebsd.org; Wed, 10 Jul 2002 10:57:11 -0700 (PDT) Date: Wed, 10 Jul 2002 10:57:11 -0700 (PDT) Message-Id: <200207101757.g6AHvBPk011182@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 14048 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14048 Change 14048 by cvance@cvance_korben on 2002/07/10 10:56:28 Updated SEBSD to include minimal support for using extended attributes to store persistent file labels. Fixed a bit of the process labeling code as well. This is a checkpoint submission, not everything works as well as it could and it's certainly not ready for general use. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#10 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#5 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_sysctl.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#10 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -51,6 +52,8 @@ #include #include +int sebsd_verbose = 0; + static int slot; #define SLOT(l) ((void *)LABEL_TO_SLOT((l), slot).l_ptr) @@ -131,7 +134,7 @@ task = SLOT(&cred->cr_label); task->osid = task->sid = SECINITSID_KERNEL; - printf("sebsd_create_proc0:: using SICINITSID_KERNEL = %d\n", + printf("sebsd_create_proc0:: using SECINITSID_KERNEL = %d\n", SECINITSID_KERNEL); } @@ -141,84 +144,59 @@ struct task_security_struct *task; task = SLOT(&cred->cr_label); - task->osid = task->sid = SECINITSID_UNLABELED; - printf("sebsd_create_proc1:: using SICINITSID_UNLABELED = %d\n", - SECINITSID_KERNEL); -} - -static void -sebsd_execve_transition(struct ucred *old, struct ucred *new, - struct vnode *vp, struct mac *vnodelabel) -{ - /* NOP */ + task->osid = SECINITSID_KERNEL; + task->sid = SECINITSID_INIT; + printf("sebsd_create_proc1:: using SICINITSID_INIT = %d\n", + SECINITSID_INIT); } static int -sebsd_execve_will_transition(struct ucred *old, struct vnode *vp, - struct mac *vnodelabel) +sebsd_compute_transition(struct ucred *cred, struct vnode *vp, + struct label *label, security_id_t *newsid) { - /* NOP */ - return (0); -} - -static int -sebsd_check_exec_vnode(struct ucred *cred, struct vnode *vp, - struct label *label) -{ - struct task_security_struct *task, *file; - security_id_t newsid; - avc_audit_data_t ad; + struct task_security_struct *task; + struct vnode_security_struct *file; int rc; - u_int32_t scontext_len; - security_context_t scontext; - task = SLOT(&cred->cr_label); file = SLOT(label); rc = security_transition_sid(task->sid, file->sid, SECCLASS_PROCESS, - &newsid); + newsid); if (rc) return EACCES; - /* + if (sebsd_verbose > 0) { + u_int32_t scontext_len; + security_context_t scontext; (void)security_sid_to_context(task->sid, &scontext, &scontext_len); printf("exec_vnode:: tsid (%d) = %s", task->sid, scontext); security_free_context(scontext); (void)security_sid_to_context(file->sid, &scontext, &scontext_len); printf(" fsid (%d) = %s", file->sid, scontext); security_free_context(scontext); - (void)security_sid_to_context(newsid, &scontext, &scontext_len); - printf(" newsid (%d) = %s\n", newsid, scontext); + (void)security_sid_to_context(*newsid, &scontext, &scontext_len); + printf(" newsid (%d) = %s\n", *newsid, scontext); security_free_context(scontext); - */ + } -/* AVC_AUDIT_DATA_INIT(&ad, FS); */ + return (*newsid != task->sid); +#ifdef notdef /* TBD, auditing not really working yet */ -/* ad.u.fs.dentry = bprm->file->f_dentry; */ if (newsid == task->sid) { - /* - rc = avc_has_perm_ref_audit(task->sid, file->sid, - SECCLASS_FILE, - FILE__EXECUTE_NO_TRANS, - &task->avcr, &ad); - */ rc = avc_has_perm(task->sid, file->sid, SECCLASS_FILE, FILE__EXECUTE_NO_TRANS); if (rc) return EACCES; - } -#ifdef broken_stuff } else { /* Check permissions for the transition. */ - rc = avc_has_perm_audit(task->sid, newsid, - SECCLASS_PROCESS, PROCESS__TRANSITION, - &ad); + rc = avc_has_perm(task->sid, newsid, SECCLASS_PROCESS, + PROCESS__TRANSITION); if (rc) return EACCES; - rc = avc_has_perm_ref_audit(newsid, file->sid, - SECCLASS_FILE, FILE__ENTRYPOINT, - &file->avcr, &ad); + rc = avc_has_perm(newsid, file->sid, + SECCLASS_FILE, FILE__ENTRYPOINT); +/* &file->avcr, &ad); */ if (rc) return EACCES; @@ -243,12 +221,41 @@ * permission check if the parent was waiting. */ } -#endif /* broken_stuff */ + task->sid = newsid; +#endif /* notdef */ return (0); } static void +sebsd_execve_transition(struct ucred *old, struct ucred *new, + struct vnode *vp, struct mac *vnodelabel) +{ + struct task_security_struct *task; + security_id_t newsid; + + sebsd_compute_transition(old, vp, &vp->v_label, &newsid); + task = SLOT(&new->cr_label); + task->osid = task->sid; + task->sid = newsid; +} + +static int +sebsd_execve_will_transition(struct ucred *old, struct vnode *vp, + struct mac *vnodelabel) +{ + security_id_t newsid; + return sebsd_compute_transition(old, vp, &vp->v_label, &newsid); +} + +static int +sebsd_check_exec_vnode(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + return 0; +} + +static void sebsd_init_vnode(struct vnode *vp, struct label *label) { struct vnode_security_struct *vsec; @@ -257,8 +264,7 @@ vsec->sid = SECINITSID_UNLABELED; /* - * TBD: should actually set this from the task sid, either here - * or in the create_vnode_from_vnode hook. + * TBD: should actually set this from the task sid */ vsec->task_sid = SECINITSID_UNLABELED; @@ -277,25 +283,169 @@ struct label *parentlabel, struct vnode *child, struct label *childlabel) { + struct vnode_security_struct *dir, *vsec; struct task_security_struct *task; - struct vnode_security_struct *dir, *vsec; - - u_int32_t scontext_len; - security_context_t scontext; + security_context_t context; + u_int32_t context_len; + security_id_t newsid; + int error; task = SLOT(&cred->cr_label); dir = SLOT(parentlabel); vsec = SLOT(childlabel); - /* - * TBD, temporarily use a generic file sid. Need to use - * extended attributes at some future point. - */ - vsec->sid = SECINITSID_FILE; - (void)security_sid_to_context(vsec->sid, &scontext, &scontext_len); - printf("create_vnode_from_vnode:: sid=%d, context=%s\n", - vsec->sid, scontext); - security_free_context(scontext); + error = security_transition_sid(task->sid, dir->sid, SECCLASS_FILE, + &newsid); + vsec->sid = newsid; + vsec->task_sid = task->sid; + + if ((child->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { + return; + } + + /* store label in vnode */ + error = security_sid_to_context(vsec->sid, &context, + &context_len); + if (error) { + /* TBD: this is probably bad... */ + return; + } + error = vn_extattr_set(child, IO_NODELOCKED, + SEBSD_MAC_EXTATTR_NAMESPACE, + SEBSD_MAC_EXTATTR_NAME, + context_len, context, curthread); + + security_free_context(context); + if (error) { + /* TBD: this is probably bad... */ + return; + } +} + + +static void +sebsd_relabel_vnode(struct ucred *cred, struct vnode *vp, + struct label *vnodelabel, struct label *label) +{ + struct vnode_security_struct *source, *dest; + security_context_t context; + u_int32_t context_len; + int error; + + source = SLOT(label); + dest = SLOT(vnodelabel); + + if (!source) { +/* Debugger("sebsd_relabel_vnode:: source is NULL!\n"); */ + printf("sebsd_relabel_vnode:: source is NULL!\n"); + return; + } + if (!dest) { + printf("sebsd_relabel_vnode:: dest is NULL!\n"); + return; + } + + printf("relabel_vnode:: source=%d, dest=%d\n", source->sid, + dest->sid); + + if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { + return; + } + + error = security_sid_to_context(source->sid, &context, + &context_len); + if (error) { + /* TBD: this is probably bad... */ + return; + } + + error = vn_extattr_set(vp, IO_NODELOCKED, + SEBSD_MAC_EXTATTR_NAMESPACE, + SEBSD_MAC_EXTATTR_NAME, + context_len, context, curthread); + + security_free_context(context); + if (error) { + /* TBD: this is probably bad... */ + return; + } +} + +static int +sebsd_check_create_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vattr *vap) +{ + struct vnode_security_struct *file, *dir; + + file = SLOT(&cred->cr_label); + dir = SLOT(dlabel); + +/* + printf("check_create_vnode:: file=%d, dir=%d\n", file->sid, + dir->sid); +*/ + return 0; +} + +static int +sebsd_update_vnode_from_externalized(struct vnode *vp, + struct label *vnodelabel, + struct mac *extmac) +{ + struct vnode_security_struct *vsec; + /* TBD: Need to limit size of contexts used in extattr labels */ + char context[128]; + u_int32_t context_len; + int error; + + if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { + return (EOPNOTSUPP); + } + + context_len = 128; /* TBD: bad fixed length */ + error = vn_extattr_get(vp, IO_NODELOCKED, + SEBSD_MAC_EXTATTR_NAMESPACE, + SEBSD_MAC_EXTATTR_NAME, + &context_len, context, curthread); + if (error) + return (error); + + if (sebsd_verbose > 1) { + char *fullpath = "unknown"; + char *freepath = NULL; + struct vattr va; + + VOP_GETATTR(vp, &va, curthread->td_ucred, curthread); + VOP_UNLOCK(vp, 0, curthread); + vn_fullpath(curthread, vp->v_dd, vp, &fullpath, &freepath); + printf("sebsd_vnode_from_externallize: len=%d: context=%s file=%s inode=%d, fsid=%d\n", context_len, context, fullpath, va.va_fileid, va.va_fsid); + if (freepath) + free(freepath, M_TEMP); + vn_lock(vp, LK_EXCLUSIVE, curthread); + } + + vsec = SLOT(vnodelabel); + error = security_context_to_sid(context, context_len, &vsec->sid); + if (error) { + printf("sebsd_update_vnode_from_externalized: ERROR mapping context to sid: %s\n", context); + } + +/* printf("sebsd_update_vnode_from_externalized got sid %d, label size=%d: %s\n", vsec->sid, context_len, context); */ + + return (0); +} + +static int +sebsd_externalize(struct label *label, struct mac *extmac) +{ + /* TBD: this assumes vnodes only and only stores '5' */ + struct vnode_security_struct *vsec; + + vsec = SLOT(label); + if (vsec) + extmac->m_sebsd.ms_psid = (uint32_t)5; + + return 0; } /* @@ -342,8 +492,14 @@ (macop_t)sebsd_destroy_vnode }, { MAC_CREATE_VNODE_FROM_VNODE, (macop_t)sebsd_create_vnode_from_vnode }, + { MAC_UPDATE_VNODE_FROM_EXTERNALIZED, + (macop_t)sebsd_update_vnode_from_externalized }, + { MAC_RELABEL_VNODE, + (macop_t)sebsd_relabel_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, (macop_t)sebsd_check_exec_vnode }, + { MAC_CRED_CHECK_CREATE_VNODE, + (macop_t)sebsd_check_create_vnode }, { MAC_EXECVE_TRANSITION, @@ -351,6 +507,8 @@ { MAC_EXECVE_WILL_TRANSITION, (macop_t)sebsd_execve_will_transition }, + { MAC_EXTERNALIZE, + (macop_t)sebsd_externalize }, { MAC_CREATE_ROOT_MOUNT, (macop_t)sebsd_create_root_mount }, { MAC_OP_LAST, NULL } ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#5 (text+ko) ==== @@ -43,7 +43,11 @@ extern int avc_debug_always_allow; extern int security_init(void); +extern int sebsd_verbose; #define SELINUX_MAGIC 0xf97cff8c +#define SEBSD_MAC_EXTATTR_NAME "sebsd" +#define SEBSD_MAC_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM + #endif /* _SYS_SECURITY_SEBSD_H */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_sysctl.c#2 (text+ko) ==== @@ -63,6 +63,10 @@ &avc_debug_always_allow, 0, "Debug Security Enhanced BSD policy"); TUNABLE_INT("security.mac.sebsd.debug", &avc_debug_always_allow); +SYSCTL_INT(_security_mac_sebsd, OID_AUTO, verbose, CTLFLAG_RW, + &sebsd_verbose, 0, " SEBSD Verbose Debug Stuff"); +TUNABLE_INT("security.mac.sebsd.verbose", &sebsd_verbose); + SYSCTL_OID(_security_mac_sebsd, OID_AUTO, sids, CTLTYPE_STRING|CTLFLAG_RD, NULL, 0, sysctl_list_sids, "A", "SEBSD SIDs"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 11: 2:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8747F37B401; Wed, 10 Jul 2002 11:01:19 -0700 (PDT) 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 EA6EC37B400 for ; Wed, 10 Jul 2002 11:01:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3466443E3B for ; Wed, 10 Jul 2002 11:01:18 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AI1IJU011953 for ; Wed, 10 Jul 2002 11:01:18 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AI1H1P011950 for perforce@freebsd.org; Wed, 10 Jul 2002 11:01:17 -0700 (PDT) Date: Wed, 10 Jul 2002 11:01:17 -0700 (PDT) Message-Id: <200207101801.g6AI1H1P011950@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 14049 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14049 Change 14049 by cvance@cvance_korben on 2002/07/10 11:01:00 Sync with SELinux file contexts (soon to diverge drastically) Linux's POSIX 1003.2 regular expression compliance was looser than FreeBSD's, so convert (|/foo) to (/foo)? Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/acct.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/apache.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/atd.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/authbind.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/backup.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/cardmgr.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/courier.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/crack.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/crond.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/cups.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ddt-client.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/devfsd.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dhcpc.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dhcpd.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dictd.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dpkg.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ftpd.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/gatekeeper.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/gpg.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ipsec.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/lpd.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/modutil.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/named.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/netscape.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ntpd.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/portslave.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/postfix.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/qmail.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/quota.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/radius.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/rpm.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/run_init.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/sendmail.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/setfiles.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/slapd.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/snmpd.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/snort.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/squid.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/sysstat.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/vmware.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/watchdog.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/xdm.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/xfs.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/xserver.fc#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/types.fc#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/acct.fc#2 (text+ko) ==== @@ -1,4 +1,4 @@ # berkeley process accounting /usr/sbin/accton system_u:object_r:acct_exec_t -/var/account(|/.*) system_u:object_r:acct_data_t +/var/account(/.*)? system_u:object_r:acct_data_t /etc/cron.(daily|monthly)/acct system_u:object_r:acct_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/apache.fc#2 (text+ko) ==== @@ -1,17 +1,17 @@ # apache -/var/www/html(|/.*) system_u:object_r:httpd_sys_content_t -/var/www/cgi-bin(|/.*) system_u:object_r:httpd_sys_script_t -/var/www/perl(|/.*) system_u:object_r:httpd_sys_script_t -/var/www/icons(|/.*) system_u:object_r:httpd_sys_content_t -/var/cache/httpd(|/.*) system_u:object_r:httpd_cache_t +/var/www/html(/.*)? system_u:object_r:httpd_sys_content_t +/var/www/cgi-bin(/.*)? system_u:object_r:httpd_sys_script_t +/var/www/perl(/.*)? system_u:object_r:httpd_sys_script_t +/var/www/icons(/.*)? system_u:object_r:httpd_sys_content_t +/var/cache/httpd(/.*)? system_u:object_r:httpd_cache_t /etc/httpd system_u:object_r:httpd_config_t -/etc/httpd/conf(|/.*) system_u:object_r:httpd_config_t +/etc/httpd/conf(/.*)? system_u:object_r:httpd_config_t /etc/httpd/logs system_u:object_r:httpd_log_files_t /etc/httpd/modules system_u:object_r:httpd_modules_t -/usr/lib/apache(|/.*) system_u:object_r:httpd_modules_t +/usr/lib/apache(/.*)? system_u:object_r:httpd_modules_t /usr/sbin/httpd system_u:object_r:httpd_exec_t /usr/sbin/apache system_u:object_r:httpd_exec_t /usr/sbin/suexec system_u:object_r:httpd_suexec_exec_t -/var/log/httpd(|/.*) system_u:object_r:httpd_log_files_t -/var/log/apache(|/.*) system_u:object_r:httpd_log_files_t +/var/log/httpd(/.*)? system_u:object_r:httpd_log_files_t +/var/log/apache(/.*)? system_u:object_r:httpd_log_files_t /var/cache/ssl.*\.sem system_u:object_r:httpd_cache_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/atd.fc#2 (text+ko) ==== @@ -1,3 +1,3 @@ # atd /usr/sbin/atd system_u:object_r:atd_exec_t -/var/spool/at(|/.*) system_u:object_r:at_spool_t +/var/spool/at(/.*)? system_u:object_r:at_spool_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/authbind.fc#2 (text+ko) ==== @@ -1,3 +1,3 @@ # authbind -/etc/authbind(|/.*) system_u:object_r:etc_authbind_t +/etc/authbind(/.*)? system_u:object_r:etc_authbind_t /usr/lib/authbind/helper system_u:object_r:authbind_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/backup.fc#2 (text+ko) ==== @@ -1,4 +1,4 @@ # backup #/usr/local/bin/backup-script system_u:object_r:backup_exec_t #/var/backup system_u:object_r:backup_store_t -/var/backups(|/.*) system_u:object_r:backup_store_t +/var/backups(/.*)? system_u:object_r:backup_store_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/cardmgr.fc#2 (text+ko) ==== @@ -1,4 +1,5 @@ # cardmgr /sbin/cardmgr system_u:object_r:cardmgr_exec_t +/sbin/cardctl system_u:object_r:cardmgr_exec_t /var/run/stab system_u:object_r:cardmgr_var_run_t /etc/apm/event.d/pcmcia system_u:object_r:cardmgr_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/courier.fc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # courier pop, imap, and webmail -/usr/lib/courier(|/.*) system_u:object_r:etc_courier_t +/usr/lib/courier(/.*)? system_u:object_r:etc_courier_t /usr/lib/courier/authlib/.* system_u:object_r:courier_authdaemon_exec_t /usr/lib/courier/courier/.* system_u:object_r:courier_exec_t /usr/lib/courier/courier/courierpop.* system_u:object_r:courier_pop_exec_t @@ -13,4 +13,4 @@ /usr/sbin/courierlogger system_u:object_r:courier_exec_t /usr/sbin/couriertcpd system_u:object_r:courier_tcpd_exec_t /var/run/courier.* system_u:object_r:courier_var_run_t -/etc/courier(|/.*) system_u:object_r:etc_courier_t +/etc/courier(/.*)? system_u:object_r:etc_courier_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/crack.fc#2 (text+ko) ==== @@ -1,3 +1,3 @@ # crack - for password checking /usr/sbin/crack_[a-z]* system_u:object_r:crack_exec_t -/var/cache/cracklib(|/.*) system_u:object_r:crack_db_t +/var/cache/cracklib(/.*)? system_u:object_r:crack_db_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/crond.fc#2 (text+ko) ==== @@ -1,8 +1,8 @@ # crond /etc/crontab system_u:object_r:system_crond_script_t -/etc/cron.d(|/.*) system_u:object_r:system_crond_script_t +/etc/cron.d(/.*)? system_u:object_r:system_crond_script_t /etc/security/cron_context.* system_u:object_r:cron_context_t -/usr/sbin/cron(|d) system_u:object_r:crond_exec_t +/usr/sbin/cron(d)? system_u:object_r:crond_exec_t /usr/sbin/anacron system_u:object_r:anacron_exec_t /usr/sbin/fcron system_u:object_r:anacron_exec_t /var/spool/cron system_u:object_r:cron_spool_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/cups.fc#2 (text+ko) ==== @@ -1,8 +1,8 @@ # cups printing -/etc/cups(|/.*) system_u:object_r:etc_cupsd_t +/etc/cups(/.*)? system_u:object_r:etc_cupsd_t /etc/cups/client.conf system_u:object_r:etc_t /etc/printcap.cups system_u:object_r:etc_cupsd_t /usr/lib/cups/backend/.* system_u:object_r:cupsd_exec_t /usr/sbin/cupsd system_u:object_r:cupsd_exec_t -/var/log/cups(|/.*) system_u:object_r:var_log_cups_t -/var/spool/cups(|/.*) system_u:object_r:cupsd_spool_t +/var/log/cups(/.*)? system_u:object_r:var_log_cups_t +/var/spool/cups(/.*)? system_u:object_r:cupsd_spool_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ddt-client.fc#2 (text+ko) ==== @@ -2,5 +2,5 @@ /usr/sbin/ddtcd system_u:object_r:ddt_client_exec_t /var/run/ddtcd.pid system_u:object_r:var_run_ddt_client_t /etc/ddtcd.conf system_u:object_r:etc_ddt_client_t -/var/lib/ddt-client(|/.*) system_u:object_r:var_lib_ddt_client_t +/var/lib/ddt-client(/.*)? system_u:object_r:var_lib_ddt_client_t /var/log/ddtcd.log.* system_u:object_r:var_log_ddt_client_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/devfsd.fc#2 (text+ko) ==== @@ -1,4 +1,4 @@ # devfsd -/etc/devfs(|/.*) system_u:object_r:etc_devfsd_t +/etc/devfs(/.*)? system_u:object_r:etc_devfsd_t /sbin/devfsd.* system_u:object_r:devfsd_exec_t /etc/init.d/makedev system_u:object_r:devfsd_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dhcpc.fc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # dhcpcd -/etc/dhcpc.*(|/.*) system_u:object_r:etc_dhcpc_t +/etc/dhcpc.*(/.*)? system_u:object_r:etc_dhcpc_t /etc/dhclient.conf system_u:object_r:etc_dhcpc_t /etc/dhclient-script system_u:object_r:etc_dhcpc_t /sbin/dhcpcd system_u:object_r:dhcpc_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dhcpd.fc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # dhcpd /etc/dhcpd.conf system_u:object_r:etc_dhcpd_t -/usr/sbin/dhcpd(|-.*) system_u:object_r:dhcpd_exec_t +/usr/sbin/dhcpd(-.*)? system_u:object_r:dhcpd_exec_t /var/lib/dhcp system_u:object_r:dhcp_state_t /var/lib/dhcp/dhcpd.leases.* system_u:object_r:dhcpd_state_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dictd.fc#2 (text+ko) ==== @@ -1,4 +1,4 @@ # dictd /etc/dictd.conf system_u:object_r:etc_dictd_t /usr/sbin/dictd system_u:object_r:dictd_exec_t -/var/lib/dictd(|/.*) system_u:object_r:var_lib_dictd_t +/var/lib/dictd(/.*)? system_u:object_r:var_lib_dictd_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/dpkg.fc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # dpkg/dselect/apt -/etc/apt(|/.*) system_u:object_r:etc_apt_t +/etc/apt(/.*)? system_u:object_r:etc_apt_t /usr/bin/apt-cache system_u:object_r:apt_exec_t /usr/bin/apt-config system_u:object_r:apt_exec_t /usr/bin/apt-get system_u:object_r:apt_exec_t @@ -8,19 +8,20 @@ /usr/bin/dselect system_u:object_r:dpkg_exec_t /usr/bin/update-menus system_u:object_r:install_menu_exec_t /usr/lib/apt/methods/.* system_u:object_r:apt_exec_t +/usr/lib/man-db(/.*)? system_u:object_r:bin_t /usr/lib/dpkg/.* system_u:object_r:dpkg_exec_t /usr/sbin/dpkg-preconfigure system_u:object_r:dpkg_exec_t /usr/sbin/install-menu system_u:object_r:install_menu_exec_t -/usr/share/applnk(|/.*) system_u:object_r:debian_menu_t -/usr/share/debconf(|/.*) system_u:object_r:dpkg_exec_t +/usr/share/applnk(/.*)? system_u:object_r:debian_menu_t +/usr/share/debconf(/.*)? system_u:object_r:dpkg_exec_t /usr/share/lintian/.* system_u:object_r:bin_t /usr/share/kernel-package/.* system_u:object_r:bin_t -/var/cache/apt(|/.*) system_u:object_r:var_cache_apt_t -/var/lib/apt(|/.*) system_u:object_r:var_lib_apt_t -/var/lib/dpkg(|/.*) system_u:object_r:var_lib_dpkg_t -/var/lib/dpkg/(|meth)lock system_u:object_r:dpkg_lock_t -/var/lib/kde(|/.*) system_u:object_r:debian_menu_t -/var/spool/kdeapplnk(|/.*) system_u:object_r:debian_menu_t +/var/cache/apt(/.*)? system_u:object_r:var_cache_apt_t +/var/lib/apt(/.*)? system_u:object_r:var_lib_apt_t +/var/lib/dpkg(/.*)? system_u:object_r:var_lib_dpkg_t +/var/lib/dpkg/(meth)?lock system_u:object_r:dpkg_lock_t +/var/lib/kde(/.*)? system_u:object_r:debian_menu_t +/var/spool/kdeapplnk(/.*)? system_u:object_r:debian_menu_t /etc/dpkg/.* system_u:object_r:etc_dpkg_t /etc/menu-methods/.* system_u:object_r:install_menu_exec_t /etc/kde2/.*\.sh system_u:object_r:install_menu_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ftpd.fc#2 (text+ko) ==== @@ -1,5 +1,8 @@ # ftpd /usr/sbin/in.ftpd system_u:object_r:ftpd_exec_t /usr/sbin/proftpd system_u:object_r:ftpd_exec_t +/usr/sbin/muddleftpd system_u:object_r:ftpd_exec_t +/usr/sbin/ftpwho system_u:object_r:ftpd_exec_t /etc/proftpd.conf system_u:object_r:etc_ftpd_t /var/run/proftpd/proftpd-inetd system_u:object_r:ftpd_var_run_t +/var/log/muddleftpd.log.* system_u:object_r:xferlog_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/gatekeeper.fc#2 (text+ko) ==== @@ -3,4 +3,4 @@ /usr/sbin/gk system_u:object_r:gatekeeper_exec_t /usr/sbin/gnugk system_u:object_r:gatekeeper_exec_t /var/run/gk.pid system_u:object_r:var_run_gatekeeper_t -/var/log/gnugk(|/.*) system_u:object_r:var_log_gatekeeper_t +/var/log/gnugk(/.*)? system_u:object_r:var_log_gatekeeper_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/gpg.fc#2 (text+ko) ==== @@ -1,4 +1,4 @@ # gpg -/home/.*/\.gnupg(|/.*) system_u:object_r:user_gpg_secret_t -/root/.*/\.gnupg(|/.*) system_u:object_r:sysadm_gpg_secret_t +/home/.*/\.gnupg(/.*)? system_u:object_r:user_gpg_secret_t +/root/.*/\.gnupg(/.*)? system_u:object_r:sysadm_gpg_secret_t /usr/bin/gpg system_u:object_r:gpg_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ipsec.fc#2 (text+ko) ==== @@ -2,7 +2,7 @@ /etc/ipsec.secrets system_u:object_r:ipsec_key_file_t /etc/ipsec.conf system_u:object_r:ipsec_conf_file_t -/etc/ipsec.d(|/.*) system_u:object_r:ipsec_key_file_t +/etc/ipsec.d(/.*)? system_u:object_r:ipsec_key_file_t /usr/lib/ipsec/.* system_u:object_r:ipsec_mgmt_exec_t /usr/local/lib/ipsec/.* system_u:object_r:ipsec_mgmt_exec_t /usr/lib/ipsec/eroute system_u:object_r:ipsec_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/lpd.fc#2 (text+ko) ==== @@ -2,5 +2,5 @@ /dev/printer system_u:object_r:printer_t /usr/sbin/lpd system_u:object_r:lpd_exec_t /usr/sbin/checkpc system_u:object_r:checkpc_exec_t -/var/spool/lpd(|/.*) system_u:object_r:lpd_spool_t +/var/spool/lpd(/.*)? system_u:object_r:lpd_spool_t /usr/share/printconf/.* system_u:object_r:printconf_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/modutil.fc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # module utilities -/etc/modules.conf(|.old) system_u:object_r:modules_conf_t -/lib/modules(|/.*) system_u:object_r:modules_object_t +/etc/modules.conf(.old)? system_u:object_r:modules_conf_t +/lib/modules(/.*)? system_u:object_r:modules_object_t /lib/modules/[^/]*/modules\..* system_u:object_r:modules_dep_t /sbin/depmod system_u:object_r:depmod_exec_t #/sbin/modprobe system_u:object_r:insmod_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/named.fc#2 (text+ko) ==== @@ -1,10 +1,10 @@ # named -/var/named(|/.*) system_u:object_r:named_conf_t +/var/named(/.*)? system_u:object_r:named_conf_t /etc/named.conf system_u:object_r:named_conf_t -/etc/bind(|/.*) system_u:object_r:named_zone_t +/etc/bind(/.*)? system_u:object_r:named_zone_t /etc/bind/named.conf system_u:object_r:named_conf_t /usr/sbin/named.* system_u:object_r:named_exec_t /usr/sbin/ndc system_u:object_r:ndc_exec_t -/var/cache/bind(|/.*) system_u:object_r:named_cache_t +/var/cache/bind(/.*)? system_u:object_r:named_cache_t /var/run/ndc system_u:object_r:var_run_named_t /usr/sbin/lwresd system_u:object_r:named_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/netscape.fc#2 (text+ko) ==== @@ -1,8 +1,8 @@ # netscape/mozilla -/root/\.netscape(|/.*) system_u:object_r:sysadm_netscape_rw_t -/root/\.mozilla(|/.*) system_u:object_r:sysadm_netscape_rw_t -/home/.*/\.netscape(|/.*) system_u:object_r:user_netscape_rw_t -/home/.*/\.mozilla(|/.*) system_u:object_r:user_netscape_rw_t +/root/\.netscape(/.*)? system_u:object_r:sysadm_netscape_rw_t +/root/\.mozilla(/.*)? system_u:object_r:sysadm_netscape_rw_t +/home/.*/\.netscape(/.*)? system_u:object_r:user_netscape_rw_t +/home/.*/\.mozilla(/.*)? system_u:object_r:user_netscape_rw_t /usr/bin/netscape system_u:object_r:netscape_exec_t /usr/bin/mozilla system_u:object_r:netscape_exec_t /usr/bin/mozilla-[0-9].* system_u:object_r:netscape_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ntpd.fc#2 (text+ko) ==== @@ -1,6 +1,6 @@ -/var/lib/ntp(|/.*) system_u:object_r:var_lib_ntp_t +/var/lib/ntp(/.*)? system_u:object_r:var_lib_ntp_t /etc/ntp.conf system_u:object_r:etc_ntp_t /usr/sbin/ntpd system_u:object_r:ntpd_exec_t -/var/log/ntpstats(|/.*) system_u:object_r:var_log_ntp_t +/var/log/ntpstats(/.*)? system_u:object_r:var_log_ntp_t /var/log/ntpd system_u:object_r:var_log_ntp_t /etc/cron.(daily|weekly)/ntp-simple system_u:object_r:ntpd_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/portslave.fc#2 (text+ko) ==== @@ -1,3 +1,3 @@ # portslave /usr/sbin/portslave system_u:object_r:portslave_exec_t -/etc/portslave(|/.*) system_u:object_r:portslave_etc_t +/etc/portslave(/.*)? system_u:object_r:portslave_etc_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/postfix.fc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # postfix -/etc/postfix(|/.*) system_u:object_r:etc_postfix_t +/etc/postfix(/.*)? system_u:object_r:etc_postfix_t /etc/postfix/postfix-script.* system_u:object_r:postfix_exec_t /etc/postfix/prng_exch system_u:object_r:postfix_prng_t /usr/lib/postfix/.* system_u:object_r:postfix_exec_t @@ -24,12 +24,12 @@ /usr/sbin/postqueue system_u:object_r:postfix_postqueue_exec_t /usr/sbin/postsuper system_u:object_r:postfix_master_exec_t /usr/sbin/rmail system_u:object_r:postfix_master_exec_t -/var/spool/postfix/active(|/.*) system_u:object_r:postfix_spool_t -/var/spool/postfix/incoming(|/.*) system_u:object_r:postfix_spool_t -/var/spool/postfix/maildrop(|/.*) system_u:object_r:postfix_spool_maildrop_t +/var/spool/postfix/active(/.*)? system_u:object_r:postfix_spool_t +/var/spool/postfix/incoming(/.*)? system_u:object_r:postfix_spool_t +/var/spool/postfix/maildrop(/.*)? system_u:object_r:postfix_spool_maildrop_t /var/spool/postfix/pid system_u:object_r:var_run_t /var/spool/postfix/pid/.* system_u:object_r:postfix_var_run_t -/var/spool/postfix/private(|/.*) system_u:object_r:postfix_private_t -/var/spool/postfix/public(|/.*) system_u:object_r:postfix_public_t -/var/spool/postfix/defer(|red)(|/.*) system_u:object_r:postfix_spool_t -/var/spool/postfix/bounce(|/.*) system_u:object_r:postfix_spool_bounce_t +/var/spool/postfix/private(/.*)? system_u:object_r:postfix_private_t +/var/spool/postfix/public(/.*)? system_u:object_r:postfix_public_t +/var/spool/postfix/defer(red)(/.*)? system_u:object_r:postfix_spool_t +/var/spool/postfix/bounce(/.*)? system_u:object_r:postfix_spool_bounce_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/qmail.fc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # qmail -/etc/qmail(|/.*) system_u:object_r:etc_qmail_t -/var/qmail(|/.*) system_u:object_r:etc_qmail_t -/var/spool/qmail(|/.*) system_u:object_r:qmail_spool_t +/etc/qmail(/.*)? system_u:object_r:etc_qmail_t +/var/qmail(/.*)? system_u:object_r:etc_qmail_t +/var/spool/qmail(/.*)? system_u:object_r:qmail_spool_t /usr/sbin/qmail-start system_u:object_r:qmail_start_exec_t /usr/sbin/qmail-lspawn system_u:object_r:qmail_lspawn_exec_t /usr/bin/tcp-env system_u:object_r:qmail_tcp_env_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/quota.fc#2 (text+ko) ==== @@ -1,3 +1,3 @@ # quota system -/var/lib/quota(|/.*) system_u:object_r:quota_flag_t +/var/lib/quota(/.*)? system_u:object_r:quota_flag_t /sbin/quota(check|on) system_u:object_r:quota_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/radius.fc#2 (text+ko) ==== @@ -1,9 +1,9 @@ # radius -/etc/raddb(|/.*) system_u:object_r:etc_radiusd_t +/etc/raddb(/.*)? system_u:object_r:etc_radiusd_t /usr/sbin/radiusd system_u:object_r:radiusd_exec_t -/var/log/radiusd-freeradius(|/.*) system_u:object_r:var_log_radiusd_t +/var/log/radiusd-freeradius(/.*)? system_u:object_r:var_log_radiusd_t /var/log/radius.log.* system_u:object_r:var_log_radiusd_t -/var/log/radacct(|/.*) system_u:object_r:var_log_radiusd_t +/var/log/radacct(/.*)? system_u:object_r:var_log_radiusd_t /var/log/radutmp system_u:object_r:var_log_radiusd_t /var/log/radwtmp.* system_u:object_r:var_log_radiusd_t /etc/cron.(daily|monthly)/radiusd system_u:object_r:radiusd_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/rpm.fc#2 (text+ko) ==== @@ -1,4 +1,4 @@ # rpm -/var/lib/rpm(|/.*) system_u:object_r:var_lib_rpm_t +/var/lib/rpm(/.*)? system_u:object_r:var_lib_rpm_t /bin/rpm system_u:object_r:rpm_exec_t /var/log/rpmpkgs.* system_u:object_r:var_log_rpm_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/run_init.fc#2 (text+ko) ==== @@ -1,3 +1,3 @@ # run_init -/usr/local/selinux/bin/run_init system_u:object_r:run_init_exec_t +/usr/local/selinux/sbin/run_init system_u:object_r:run_init_exec_t /usr/sbin/run_init system_u:object_r:run_init_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/sendmail.fc#2 (text+ko) ==== @@ -1,9 +1,10 @@ # sendmail /etc/aliases system_u:object_r:etc_aliases_t /etc/aliases.db system_u:object_r:etc_aliases_t -/etc/mail(|/.*) system_u:object_r:etc_mail_t +/etc/mail(/.*)? system_u:object_r:etc_mail_t /usr/sbin/sendmail system_u:object_r:sendmail_exec_t -/var/spool/mail(|/.*) system_u:object_r:mail_spool_t -/var/spool/mqueue(|/.*) system_u:object_r:mqueue_spool_t +/usr/sbin/sendmail.sendmail system_u:object_r:sendmail_exec_t +/var/spool/mail(/.*)? system_u:object_r:mail_spool_t +/var/spool/mqueue(/.*)? system_u:object_r:mqueue_spool_t /var/log/sendmail.st system_u:object_r:sendmail_var_log_t -/var/mail(|/.*) system_u:object_r:mail_spool_t +/var/mail(/.*)? system_u:object_r:mail_spool_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/setfiles.fc#2 (text+ko) ==== @@ -1,3 +1,3 @@ # setfiles /usr/sbin/setfiles system_u:object_r:setfiles_exec_t -/usr/local/selinux/sbin/setfiles system_u:object_r:setfiles_exec_t +/usr/local/selinux/bin/setfiles system_u:object_r:setfiles_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/slapd.fc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # slapd - ldap server /usr/sbin/slapd system_u:object_r:slapd_exec_t -/var/lib/ldap(|/.*) system_u:object_r:slapd_db_t -/var/lib/ldap/replog(|/.*) system_u:object_r:slapd_replog_t +/var/lib/ldap(/.*)? system_u:object_r:slapd_db_t +/var/lib/ldap/replog(/.*)? system_u:object_r:slapd_replog_t /var/run/slapd.args system_u:object_r:var_run_slapd_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/snmpd.fc#2 (text+ko) ==== @@ -1,3 +1,3 @@ # snmpd -/usr/sbin/snmp(|trap)d system_u:object_r:snmpd_exec_t -/var/lib/snmp(|/.*) system_u:object_r:var_lib_snmpd_t +/usr/sbin/snmp(trap)?d system_u:object_r:snmpd_exec_t +/var/lib/snmp(/.*)? system_u:object_r:var_lib_snmpd_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/snort.fc#2 (text+ko) ==== @@ -1,4 +1,4 @@ # SNORT /usr/sbin/snort system_u:object_r:snort_exec_t -/etc/snort(|/.*) system_u:object_r:snort_etc_t -/var/log/snort(|/.*) system_u:object_r:snort_log_t +/etc/snort(/.*)? system_u:object_r:snort_etc_t +/var/log/snort(/.*)? system_u:object_r:snort_log_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/squid.fc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # squid /usr/sbin/squid system_u:object_r:squid_exec_t -/var/cache/squid(|/.*) system_u:object_r:squid_cache_t -/var/spool/squid(|/.*) system_u:object_r:squid_cache_t -/var/log/squid(|/.*) system_u:object_r:var_log_squid_t +/var/cache/squid(/.*)? system_u:object_r:squid_cache_t +/var/spool/squid(/.*)? system_u:object_r:squid_cache_t +/var/log/squid(/.*)? system_u:object_r:var_log_squid_t /etc/squid.conf system_u:object_r:squid_conf_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/sysstat.fc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # sysstat and other sar programs /usr/lib/atsar/atsadc system_u:object_r:sysstat_exec_t /usr/lib/sysstat/sa.* system_u:object_r:sysstat_exec_t -/var/log/atsar(|/.*) system_u:object_r:var_log_sysstat_t -/var/log/sysstat(|/.*) system_u:object_r:var_log_sysstat_t +/var/log/atsar(/.*)? system_u:object_r:var_log_sysstat_t +/var/log/sysstat(/.*)? system_u:object_r:var_log_sysstat_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/vmware.fc#2 (text+ko) ==== @@ -31,7 +31,7 @@ /dev/vmnet8 system_u:object_r:vmware_device_t /dev/vmnet9 system_u:object_r:vmware_device_t -/etc/vmware.*(|/.*) system_u:object_r:vmware_sys_conf_t +/etc/vmware.*(/.*)? system_u:object_r:vmware_sys_conf_t /usr/lib/vmware/config system_u:object_r:vmware_sys_conf_t /usr/lib/vmware/bin/vmware-mks system_u:object_r:vmware_user_exec_t @@ -42,5 +42,5 @@ # files. A general user can execute vmware and start a vmware session # but the user cannot modify the session configuration information # -#/usr/local/vmware(|/.*) system_u:object_r:vmware_user_file_t +#/usr/local/vmware(/.*)? system_u:object_r:vmware_user_file_t #/usr/local/vmware/[^/]*/.*\.cfg system_u:object_r:vmware_user_conf_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/watchdog.fc#2 (text+ko) ==== @@ -1,2 +1,3 @@ # watchdog /usr/sbin/watchdog system_u:object_r:watchdog_exec_t +/dev/watchdog system_u:object_r:watchdog_device_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/xdm.fc#2 (text+ko) ==== @@ -1,9 +1,10 @@ # X Display Manager /usr/bin/[xgk]dm system_u:object_r:xdm_exec_t -/var/[xgk]dm(|/.*) system_u:object_r:xdm_log_t -/usr/var/[xgk]dm(|/.*) system_u:object_r:xdm_log_t +/var/[xgk]dm(/.*)? system_u:object_r:xdm_log_t +/usr/var/[xgk]dm(/.*)? system_u:object_r:xdm_log_t +/var/log/kdm.log system_u:object_r:xdm_log_t # Uncomment if you are running an X Display Manager. #/var/log/XFree86.* system_u:object_r:xdm_log_t -#/tmp/.X11-unix(|/.*) system_u:object_r:xdm_tmp_t +#/tmp/.X11-unix(/.*)? system_u:object_r:xdm_tmp_t #/tmp/.X0-lock system_u:object_r:xdm_tmp_t -/var/log/kdm.log system_u:object_r:xdm_log_t + ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/xfs.fc#2 (text+ko) ==== @@ -1,3 +1,3 @@ # xfs -/tmp/.font-unix(|/.*) system_u:object_r:xfs_tmp_t +/tmp/.font-unix(/.*)? system_u:object_r:xfs_tmp_t /usr/X11R6/bin/xfs system_u:object_r:xfs_exec_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/xserver.fc#2 (text+ko) ==== @@ -1,10 +1,12 @@ # X server /dev/agpgart system_u:object_r:agp_device_t -/dev/dri(|/.*) system_u:object_r:dri_device_t -/tmp/.X11-unix(|/.*) system_u:object_r:user_xserver_tmp_t +/dev/dri(/.*)? system_u:object_r:dri_device_t +/tmp/.X11-unix(/.*)? system_u:object_r:user_xserver_tmp_t /tmp/.X0-lock system_u:object_r:user_xserver_tmp_t /usr/X11R6/bin/Xwrapper system_u:object_r:xserver_exec_t +/usr/X11R6/bin/X system_u:object_r:xserver_exec_t +/usr/X11R6/bin/XFree86 system_u:object_r:xserver_exec_t +/var/lib/xkb(/.*)? system_u:object_r:var_lib_xkb_t # Comment out if you are running an X Display Manager. /var/log/XFree86.* system_u:object_r:xserver_var_log_t -/usr/X11R6/bin/X system_u:object_r:xserver_exec_t -/var/lib/xkb(|/.*) system_u:object_r:var_lib_xkb_t + ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/types.fc#2 (text+ko) ==== @@ -51,40 +51,41 @@ # # /var # -/var(|/.*) system_u:object_r:var_t -/var/catman(|/.*) system_u:object_r:catman_t -/var/cache/man(|/.*) system_u:object_r:catman_t -/var/yp(|/.*) system_u:object_r:var_yp_t -/var/lib(|/.*) system_u:object_r:var_lib_t -/var/lib/nfs(|/.*) system_u:object_r:var_lib_nfs_t -/var/lock(|/.*) system_u:object_r:var_lock_t +/var(/.*)? system_u:object_r:var_t +/var/catman(/.*)? system_u:object_r:catman_t +/var/cache/man(/.*)? system_u:object_r:catman_t +/var/yp(/.*)? system_u:object_r:var_yp_t +/var/lib(/.*)? system_u:object_r:var_lib_t +/var/lib/nfs(/.*)? system_u:object_r:var_lib_nfs_t +/var/lock(/.*)? system_u:object_r:var_lock_t /var/tmp system_u:object_r:tmp_t /var/tmp/.* <> +/var/tmp/vi.recover system_u:object_r:tmp_t # # /var/ftp # -/var/ftp/bin(|/.*) system_u:object_r:bin_t +/var/ftp/bin(/.*)? system_u:object_r:bin_t /var/ftp/bin/ls system_u:object_r:ls_exec_t -/var/ftp/lib(|/.*) system_u:object_r:lib_t +/var/ftp/lib(/.*)? system_u:object_r:lib_t /var/ftp/lib/ld.*\.so.* system_u:object_r:ld_so_t /var/ftp/lib/lib.*\.so.* system_u:object_r:shlib_t -/var/ftp/etc(|/.*) system_u:object_r:etc_t +/var/ftp/etc(/.*)? system_u:object_r:etc_t # # The superuser home directory. # -/root(|/.*) system_u:object_r:sysadm_home_t +/root(/.*)? system_u:object_r:sysadm_home_t # # Other user home directories. # -/home(|/.*) system_u:object_r:user_home_t +/home(/.*)? system_u:object_r:user_home_t # # /bin # -/bin(|/.*) system_u:object_r:bin_t +/bin(/.*)? system_u:object_r:bin_t /bin/tcsh system_u:object_r:shell_exec_t /bin/bash system_u:object_r:shell_exec_t /bin/ash system_u:object_r:shell_exec_t @@ -93,18 +94,19 @@ # # /boot # -/boot(|/.*) system_u:object_r:boot_t +/boot(/.*)? system_u:object_r:boot_t /boot/System.map-.* system_u:object_r:system_map_t # # /dev # -/dev(|/.*) system_u:object_r:device_t +/dev(/.*)? system_u:object_r:device_t /dev/MAKEDEV system_u:object_r:sbin_t /dev/null system_u:object_r:null_device_t /dev/zero system_u:object_r:zero_device_t /dev/console system_u:object_r:console_device_t /dev/(kmem|mem|port) system_u:object_r:memory_device_t +/dev/nvram system_u:object_r:memory_device_t /dev/random system_u:object_r:random_device_t /dev/urandom system_u:object_r:random_device_t /dev/[^/]*tty[^/]* system_u:object_r:tty_device_t @@ -112,20 +114,22 @@ /dev/tty system_u:object_r:devtty_t /dev/sd[^/]* system_u:object_r:fixed_disk_device_t /dev/hd[^/]* system_u:object_r:fixed_disk_device_t +/dev/ataraid/d[^/]* system_u:object_r:fixed_disk_device_t +/dev/md[0-9]* system_u:object_r:fixed_disk_device_t /dev/s(cd|r)[^/]* system_u:object_r:removable_device_t -/dev/fd[^/]* system_u:object_r:removable_device_t +/dev/fd[^/]+ system_u:object_r:removable_device_t /dev/rtc system_u:object_r:clock_device_t /dev/psaux system_u:object_r:mouse_device_t /dev/.*mouse.* -c system_u:object_r:mouse_device_t /dev/input/.*mouse.* system_u:object_r:mouse_device_t /dev/ptmx system_u:object_r:ptmx_t /dev/sequencer system_u:object_r:misc_device_t -/dev/fb[0-9]* system_u:object_r:framebuf_device_t +/dev/fb[0-9]* system_u:object_r:framebuf_device_t # # /etc # -/etc(|/.*) system_u:object_r:etc_t +/etc(/.*)? system_u:object_r:etc_t /etc/fstab.REVOKE system_u:object_r:etc_runtime_t /etc/HOSTNAME system_u:object_r:etc_runtime_t /etc/ioctl.save system_u:object_r:etc_runtime_t @@ -138,14 +142,14 @@ /etc/ld.so.preload system_u:object_r:ld_so_cache_t /etc/resolv.conf.* system_u:object_r:resolv_conf_t /etc/adjtime system_u:object_r:adjtime_t -/etc/mrtg(|/.*) system_u:object_r:etc_mrtg_t -/etc/selinux(|/.*) system_u:object_r:policy_src_t -/etc/security/selinux(|/.*) system_u:object_r:policy_config_t +/etc/mrtg(/.*)? system_u:object_r:etc_mrtg_t +/etc/selinux(/.*)? system_u:object_r:policy_src_t +/etc/security/selinux(/.*)? system_u:object_r:policy_config_t # # /lib # -/lib(|/.*) system_u:object_r:lib_t +/lib(/.*)? system_u:object_r:lib_t /lib/ld.*\.so.* system_u:object_r:ld_so_t /lib/lib.*\.so.* system_u:object_r:shlib_t /lib/[^/]*/lib.*\.so.* system_u:object_r:shlib_t @@ -155,7 +159,7 @@ # # /sbin # -/sbin(|/.*) system_u:object_r:sbin_t +/sbin(/.*)? system_u:object_r:sbin_t /sbin/.*_chkpwd system_u:object_r:chkpwd_exec_t # @@ -164,147 +168,147 @@ /tmp system_u:object_r:tmp_t /tmp/.* <> /tmp/orbit.* system_u:object_r:user_tmp_t -/tmp/.ICE-unix(|/.*) system_u:object_r:user_tmp_t +/tmp/.ICE-unix(/.*)? system_u:object_r:user_tmp_t # # /usr # -/usr(|/.*) system_u:object_r:usr_t -/usr/etc(|/.*) system_u:object_r:etc_t -/usr/libexec(|/.*) system_u:object_r:lib_t -/usr/src(|/.*) system_u:object_r:src_t -/usr/tmp(|/.*) system_u:object_r:tmp_t -/usr/man(|/.*) system_u:object_r:man_t +/usr(/.*)? system_u:object_r:usr_t +/usr/etc(/.*)? system_u:object_r:etc_t +/usr/libexec(/.*)? system_u:object_r:lib_t +/usr/src(/.*)? system_u:object_r:src_t +/usr/tmp(/.*)? system_u:object_r:tmp_t +/usr/man(/.*)? system_u:object_r:man_t # # /usr/bin # -/usr/bin(|/.*) system_u:object_r:bin_t +/usr/bin(/.*)? system_u:object_r:bin_t /usr/bin/makemap system_u:object_r:sbin_t # # /usr/lib # -/usr/lib(|/.*) system_u:object_r:lib_t +/usr/lib(/.*)? system_u:object_r:lib_t /usr/lib/lib.*\.so.* system_u:object_r:shlib_t /usr/lib/python.*\.so system_u:object_r:shlib_t /usr/lib/[^/]*/lib.*\.so.* system_u:object_r:shlib_t /usr/lib/autofs/.*\.so system_u:object_r:shlib_t -/usr/lib/perl5/man(|/.*) system_u:object_r:man_t +/usr/lib/perl5/man(/.*)? system_u:object_r:man_t /usr/lib/perl.*\.so system_u:object_r:shlib_t /usr/lib/locale/.*/LC_.* system_u:object_r:writeable_t -/usr/lib/selinux(|/.*) system_u:object_r:policy_src_t +/usr/lib/selinux(/.*)? system_u:object_r:policy_src_t /usr/lib/emacsen-common/.* system_u:object_r:bin_t /usr/share/locale/.*/LC_.* system_u:object_r:writeable_t -/usr/share/selinux(|/.*) system_u:object_r:policy_src_t -/usr/games(|/.*) system_u:object_r:bin_t +/usr/share/selinux(/.*)? system_u:object_r:policy_src_t +/usr/games(/.*)? system_u:object_r:bin_t # # /usr/.*glibc.*-linux/lib # -/usr/.*glibc.*-linux/lib(|/.*) system_u:object_r:lib_t +/usr/.*glibc.*-linux/lib(/.*)? system_u:object_r:lib_t /usr/.*glibc.*-linux/lib/ld.*\.so.* system_u:object_r:ld_so_t /usr/.*glibc.*-linux/lib/lib.*\.so.* system_u:object_r:shlib_t # /usr/.*redhat-linux/lib # -/usr/.*redhat-linux/lib(|/.*) system_u:object_r:lib_t +/usr/.*redhat-linux/lib(/.*)? system_u:object_r:lib_t /usr/.*redhat-linux/lib/ld.*\.so.* system_u:object_r:ld_so_t /usr/.*redhat-linux/lib/lib.*\.so.* system_u:object_r:shlib_t # # /usr/.*linux-libc.*/lib # -/usr/.*linux-libc.*/lib(|/.*) system_u:object_r:lib_t +/usr/.*linux-libc.*/lib(/.*)? system_u:object_r:lib_t /usr/.*linux-libc.*/lib/ld.*\.so.* system_u:object_r:ld_so_t /usr/.*linux-libc.*/lib/lib.*\.so.* system_u:object_r:shlib_t # # /usr/local # -/usr/local/etc(|/.*) system_u:object_r:etc_t -/usr/local/src(|/.*) system_u:object_r:src_t -/usr/local/sbin(|/.*) system_u:object_r:sbin_t -/usr/local/man(|/.*) system_u:object_r:man_t +/usr/local/etc(/.*)? system_u:object_r:etc_t +/usr/local/src(/.*)? system_u:object_r:src_t +/usr/local/sbin(/.*)? system_u:object_r:sbin_t +/usr/local/man(/.*)? system_u:object_r:man_t # # /usr/local/bin # -/usr/local/bin(|/.*) system_u:object_r:bin_t +/usr/local/bin(/.*)? system_u:object_r:bin_t # # /usr/local/lib # -/usr/local/lib(|/.*) system_u:object_r:lib_t +/usr/local/lib(/.*)? system_u:object_r:lib_t /usr/local/lib/.*\.so system_u:object_r:shlib_t # # /usr/sbin # -/usr/sbin(|/.*) system_u:object_r:sbin_t +/usr/sbin(/.*)? system_u:object_r:sbin_t /usr/sbin/makemap system_u:object_r:sbin_t # # /usr/X11R6/bin # -/usr/X11R6/bin(|/.*) system_u:object_r:bin_t +/usr/X11R6/bin(/.*)? system_u:object_r:bin_t # # /usr/X11R6/lib # -/usr/X11R6/lib(|/.*) system_u:object_r:lib_t +/usr/X11R6/lib(/.*)? system_u:object_r:lib_t /usr/X11R6/lib/lib.*\.so.* system_u:object_r:shlib_t # # /usr/X11R6/man # -/usr/X11R6/man(|/.*) system_u:object_r:man_t +/usr/X11R6/man(/.*)? system_u:object_r:man_t # # /usr/kerberos # -/usr/kerberos/bin(|/.*) system_u:object_r:bin_t -/usr/kerberos/sbin(|/.*) system_u:object_r:sbin_t -/usr/kerberos/lib(|/.*) system_u:object_r:lib_t +/usr/kerberos/bin(/.*)? system_u:object_r:bin_t +/usr/kerberos/sbin(/.*)? system_u:object_r:sbin_t +/usr/kerberos/lib(/.*)? system_u:object_r:lib_t /usr/kerberos/lib/lib.*\.so.* system_u:object_r:shlib_t # # /usr/local/selinux # -/usr/local/selinux/bin(|/.*) system_u:object_r:bin_t -/usr/local/selinux/sbin(|/.*) system_u:object_r:bin_t -/usr/local/selinux/lib(|/.*) system_u:object_r:lib_t -/usr/local/selinux/libexec(|/.*) system_u:object_r:lib_t +/usr/local/selinux/bin(/.*)? system_u:object_r:bin_t +/usr/local/selinux/sbin(/.*)? system_u:object_r:bin_t +/usr/local/selinux/lib(/.*)? system_u:object_r:lib_t +/usr/local/selinux/libexec(/.*)? system_u:object_r:lib_t # # /var/run # -/var/run(|/.*) system_u:object_r:var_run_t +/var/run(/.*)? system_u:object_r:var_run_t /var/run/.*\.*pid <> # # /var/spool # -/var/spool(|/.*) system_u:object_r:var_spool_t +/var/spool(/.*)? system_u:object_r:var_spool_t # # /var/log # -/var/log(|/.*) system_u:object_r:var_log_t +/var/log(/.*)? system_u:object_r:var_log_t /var/log/wtmp system_u:object_r:wtmp_t -/var/log/sa(|/.*) system_u:object_r:var_log_sa_t +/var/log/sa(/.*)? system_u:object_r:var_log_sa_t /var/log/ksyms.* system_u:object_r:var_log_ksyms_t /var/log/lastlog system_u:object_r:lastlog_t -/var/log/ksymoops(|/.*) system_u:object_r:var_log_ksyms_t +/var/log/ksymoops(/.*)? system_u:object_r:var_log_ksyms_t /var/log/syslog system_u:object_r:var_log_t # # Persistent label mappings. # -.*/\.\.\.security(|/.*) system_u:object_r:file_labels_t +.*/\.\.\.security(/.*)? system_u:object_r:file_labels_t # # Lost and found directories. # -.*/lost\+found(|/.*) system_u:object_r:lost_found_t +.*/lost\+found(/.*)? system_u:object_r:lost_found_t To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 11: 8:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F138A37B401; Wed, 10 Jul 2002 11:08:27 -0700 (PDT) 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 A1B6537B400 for ; Wed, 10 Jul 2002 11:08:27 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FA0B43E31 for ; Wed, 10 Jul 2002 11:08:27 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AI8RJU016805 for ; Wed, 10 Jul 2002 11:08:27 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AI8RrS016802 for perforce@freebsd.org; Wed, 10 Jul 2002 11:08:27 -0700 (PDT) Date: Wed, 10 Jul 2002 11:08:27 -0700 (PDT) Message-Id: <200207101808.g6AI8RrS016802@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 14050 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14050 Change 14050 by cvance@cvance_korben on 2002/07/10 11:07:52 Add a target to re-label the filesystem Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/Makefile#3 (text+ko) ==== @@ -1,4 +1,5 @@ CHECKPOLICY = /sbin/sebsd_checkpolicy +SETFILES = /sbin/sebsd_setfiles M4 = m4 -Imacros -s INSTALLDIR = /etc/security/sebsd @@ -25,6 +26,9 @@ PROGRAMFILES != ls domains/program/*.te TYPEFILES != ls types/*.te +FC = file_contexts/file_contexts +FCFILES != ls file_contexts/*.fc file_contexts/program/*.fc + ALLTEFILES := macros/global_macros.te attrib.te tmp/all_types.te tmp/all_program_macros.te tmp/all_domains.te assert.te ALLDOMAINS != ls domains/*.te domains/misc/*.te domains/program/*.te @@ -59,5 +63,11 @@ tmp/all_domains.te: $(ALLDOMAINS) cat $> > $@ +relabel: $(FC) + $(SETFILES) $(FC) / + +$(FC): $(FCFILES) + cat $> > $@ + clean: rm -f policy.11 policy.conf tmp/* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 11:16:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43B0A37B401; Wed, 10 Jul 2002 11:16:38 -0700 (PDT) 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 D658A37B400 for ; Wed, 10 Jul 2002 11:16:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96DCB43E4A for ; Wed, 10 Jul 2002 11:16:37 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AIGbJU017718 for ; Wed, 10 Jul 2002 11:16:37 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AIGblG017715 for perforce@freebsd.org; Wed, 10 Jul 2002 11:16:37 -0700 (PDT) Date: Wed, 10 Jul 2002 11:16:37 -0700 (PDT) Message-Id: <200207101816.g6AIGblG017715@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14051 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14051 Change 14051 by green@green_laptop_2 on 2002/07/10 11:15:51 Actually let this get installed. really. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#16 edit .. //depot/projects/trustedbsd/mac/share/security/sebsd/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#16 (text+ko) ==== @@ -357,8 +357,8 @@ # distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} - for prog in [ awk cat chflags chmod chown date echo egrep find grep \ - ln make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + for prog in [ awk cat chflags chmod chown cpio date echo egrep find \ + grep ln make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test true uname wc zic; do \ cp `which $$prog` ${INSTALLTMP}; \ done ==== //depot/projects/trustedbsd/mac/share/security/sebsd/Makefile#5 (text+ko) ==== @@ -11,8 +11,7 @@ echo ${DSTDIR} install: -# cd ${SRCDIR}; cpio -p -R${BINOWN}:${BINGRP} ${DSTDIR} < files.lst - echo "share/security/sebsd temporarily disabled due to breakage" + cd ${SRCDIR}; cpio -p -R${BINOWN}:${BINGRP} ${DSTDIR} < files.lst .include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 11:23:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27FD437B400; Wed, 10 Jul 2002 11:23:48 -0700 (PDT) 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 735EE37B405 for ; Wed, 10 Jul 2002 11:23:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB8CF43E65 for ; Wed, 10 Jul 2002 11:23:46 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6AINkJU018503 for ; Wed, 10 Jul 2002 11:23:46 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6AINkg5018500 for perforce@freebsd.org; Wed, 10 Jul 2002 11:23:46 -0700 (PDT) Date: Wed, 10 Jul 2002 11:23:46 -0700 (PDT) Message-Id: <200207101823.g6AINkg5018500@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14052 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14052 Change 14052 by green@green_laptop_2 on 2002/07/10 11:23:36 Catch up better. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#35 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#35 (text+ko) ==== @@ -975,15 +975,6 @@ mac_te_create_object(cred, childlabel); } -static void -mac_te_create_vnode_from_exported(struct ucred *cred, struct vnode *vp, - struct mac *extmac, struct label *intlabel) -{ - - /* XXX should check return */ - mac_te_internalize(intlabel, extmac); -} - static int mac_te_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) @@ -1475,8 +1466,6 @@ { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_te_create_devfs_vnode }, { MAC_CREATE_VNODE_FROM_VNODE, (macop_t)mac_te_create_vnode_from_vnode }, - { MAC_CREATE_VNODE_FROM_EXPORTED, - (macop_t)mac_te_create_vnode_from_exported }, { MAC_CREATE_MOUNT, (macop_t)mac_te_create_mount }, { MAC_CREATE_ROOT_MOUNT, (macop_t)mac_te_create_root_mount }, { MAC_CREATE_MBUF_FROM_SOCKET, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 17: 6:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2807437B401; Wed, 10 Jul 2002 17:04:47 -0700 (PDT) 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 B101037B400 for ; Wed, 10 Jul 2002 17:04:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABE2243E3B for ; Wed, 10 Jul 2002 17:04:44 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6B04iJU073104 for ; Wed, 10 Jul 2002 17:04:44 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6B04iDC073101 for perforce@freebsd.org; Wed, 10 Jul 2002 17:04:44 -0700 (PDT) Date: Wed, 10 Jul 2002 17:04:44 -0700 (PDT) Message-Id: <200207110004.g6B04iDC073101@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14063 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14063 Change 14063 by peter@peter_daintree on 2002/07/10 17:04:18 IFC @14062 (catch up with locore.s) Affected files ... .. //depot/projects/pmap/sys/alpha/include/types.h#2 integrate .. //depot/projects/pmap/sys/arm/include/types.h#3 integrate .. //depot/projects/pmap/sys/boot/ofw/libofw/elf_freebsd.c#3 integrate .. //depot/projects/pmap/sys/boot/powerpc/loader/Makefile#3 integrate .. //depot/projects/pmap/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/pmap/sys/conf/files.powerpc#4 integrate .. //depot/projects/pmap/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/pmap/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/pmap/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/pmap/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/pmap/sys/dev/sio/sio_pci.c#4 integrate .. //depot/projects/pmap/sys/i386/i386/critical.c#2 integrate .. //depot/projects/pmap/sys/i386/i386/exception.s#6 integrate .. //depot/projects/pmap/sys/i386/i386/genassym.c#5 integrate .. //depot/projects/pmap/sys/i386/i386/locore.s#9 integrate .. //depot/projects/pmap/sys/i386/include/critical.h#2 integrate .. //depot/projects/pmap/sys/i386/include/proc.h#3 integrate .. //depot/projects/pmap/sys/i386/include/types.h#3 integrate .. //depot/projects/pmap/sys/i386/isa/ipl.s#3 delete .. //depot/projects/pmap/sys/ia64/include/types.h#3 integrate .. //depot/projects/pmap/sys/kern/kern_acct.c#5 integrate .. //depot/projects/pmap/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/pmap/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/pmap/sys/kern/vfs_subr.c#7 integrate .. //depot/projects/pmap/sys/netkey/key.c#5 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_serv.c#6 integrate .. //depot/projects/pmap/sys/powerpc/include/db_machdep.h#4 integrate .. //depot/projects/pmap/sys/powerpc/include/metadata.h#1 branch .. //depot/projects/pmap/sys/powerpc/include/setjmp.h#2 integrate .. //depot/projects/pmap/sys/powerpc/include/types.h#3 integrate .. //depot/projects/pmap/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/pmap/sys/powerpc/powerpc/db_disasm.c#1 branch .. //depot/projects/pmap/sys/powerpc/powerpc/db_hwwatch.c#1 branch .. //depot/projects/pmap/sys/powerpc/powerpc/db_interface.c#1 branch .. //depot/projects/pmap/sys/powerpc/powerpc/db_memrw.c#1 branch .. //depot/projects/pmap/sys/powerpc/powerpc/db_trace.c#1 branch .. //depot/projects/pmap/sys/powerpc/powerpc/locore.s#5 integrate .. //depot/projects/pmap/sys/powerpc/powerpc/machdep.c#6 integrate .. //depot/projects/pmap/sys/powerpc/powerpc/nexus.c#2 integrate .. //depot/projects/pmap/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/pmap/sys/powerpc/powerpc/setjmp.S#1 branch .. //depot/projects/pmap/sys/sparc64/include/types.h#2 integrate .. //depot/projects/pmap/sys/sys/buf.h#5 integrate .. //depot/projects/pmap/sys/sys/vnode.h#4 integrate .. //depot/projects/pmap/sys/x86_64/include/types.h#2 integrate Differences ... ==== //depot/projects/pmap/sys/alpha/include/types.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)types.h 8.3 (Berkeley) 1/5/94 * $NetBSD: types.h,v 1.8 1997/04/06 08:47:45 cgd Exp $ - * $FreeBSD: src/sys/alpha/include/types.h,v 1.16 2001/12/09 19:12:05 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/types.h,v 1.17 2002/07/10 15:47:57 mike Exp $ */ #ifndef _MACHTYPES_H_ @@ -40,16 +40,6 @@ #include -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -typedef struct _physadr { - long r[1]; -} *physadr; - -typedef struct label_t { - long val[10]; -} label_t; -#endif - typedef unsigned long vm_offset_t; typedef long vm_ooffset_t; typedef unsigned long vm_pindex_t; ==== //depot/projects/pmap/sys/arm/include/types.h#3 (text+ko) ==== @@ -31,22 +31,12 @@ * SUCH DAMAGE. * * @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/types.h,v 1.4 2002/07/09 01:20:51 mike Exp $ + * $FreeBSD: src/sys/arm/include/types.h,v 1.5 2002/07/10 15:47:58 mike Exp $ */ #ifndef _MACHINE_TYPES_H_ #define _MACHINE_TYPES_H_ -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -typedef struct _physadr { - int r[1]; -} *physadr; - -typedef struct label_t { - int val[10]; -} label_t; -#endif - typedef unsigned int vm_offset_t; typedef __int64_t vm_ooffset_t; typedef __uint64_t vm_pindex_t; ==== //depot/projects/pmap/sys/boot/ofw/libofw/elf_freebsd.c#3 (text+ko) ==== @@ -23,15 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.2 2002/02/23 04:13:02 jake Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.3 2002/07/10 12:13:11 benno Exp $ */ #include #include -#if 0 -#include -#endif +#include #include #include @@ -65,51 +63,25 @@ int ofw_elf_exec(struct preloaded_file *fp) { - struct file_metadata *md; - Elf_Ehdr *ehdr; - vm_offset_t entry, bootinfop; - int boothowto, err, bootdev; -#if 0 - struct bootinfo *bi; -#endif - vm_offset_t ssym, esym; + struct file_metadata *fmp; + vm_offset_t mdp; + Elf_Ehdr *e; + int error; - if ((md = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL) { - return(EFTYPE); /* XXX actually EFUCKUP */ + if ((fmp = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL) { + return(EFTYPE); } - ehdr = (Elf_Ehdr *)&(md->md_data); + e = (Elf_Ehdr *)&fmp->md_data; -#if 0 - if ((err = bi_load(fp->f_args, &boothowto, &bootdev, &bootinfop)) != 0) - return(err); -#endif - entry = ehdr->e_entry & 0xffffff; + if ((error = md_load(fp->f_args, &mdp)) != 0) + return (error); - ssym = esym = 0; - if ((md = file_findmetadata(fp, MODINFOMD_SSYM)) != NULL) - ssym = *((vm_offset_t *)&(md->md_data)); - if ((md = file_findmetadata(fp, MODINFOMD_ESYM)) != NULL) - esym = *((vm_offset_t *)&(md->md_data)); - if (ssym == 0 || esym == 0) - ssym = esym = 0; /* sanity */ -#if 0 - bi = (struct bootinfo *)PTOV(bootinfop); - bi->bi_symtab = ssym; - bi->bi_esymtab = esym; -#endif - -/* -#ifdef DEBUG -*/ - printf("Start @ 0x%lx ...\n", entry); -/* -#endif -*/ + printf("Kernel entry at 0x%lx ...\n", e->e_entry); dev_cleanup(); ofw_release_heap(); -/* OF_chain(0, 0, entry, bootinfop, sizeof(struct bootinfo));*/ - OF_chain((void *)reloc, end - (char *)reloc, (void *)entry, NULL, 0); + OF_chain((void *)reloc, end - (char *)reloc, (void *)e->e_entry, + (void *)mdp, sizeof(mdp)); panic("exec returned"); } ==== //depot/projects/pmap/sys/boot/powerpc/loader/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.9 2002/06/07 11:49:56 benno Exp $ +# $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.10 2002/07/10 12:13:16 benno Exp $ BASE= loader PROG= ${BASE} @@ -17,7 +17,7 @@ CFLAGS+= -DRELOC=${RELOC} # architecture-specific loader code -SRCS= conf.c +SRCS= conf.c metadata.c # Pull in common loader code .PATH: ${.CURDIR}/../../ofw/common ==== //depot/projects/pmap/sys/conf/files.powerpc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.17 2002/07/09 13:34:06 benno Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.19 2002/07/10 12:26:10 benno Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -32,6 +32,7 @@ powerpc/powerpc/openpic.c standard powerpc/powerpc/pic_if.m standard powerpc/powerpc/pmap.c standard +powerpc/powerpc/setjmp.S standard powerpc/powerpc/sigcode.S standard powerpc/powerpc/suswintr.c standard powerpc/powerpc/syncicache.c standard @@ -42,6 +43,7 @@ powerpc/powerpc/db_disasm.c optional ddb powerpc/powerpc/db_interface.c optional ddb +powerpc/powerpc/db_hwwatch.c optional ddb powerpc/powerpc/db_memrw.c optional ddb powerpc/powerpc/db_trace.c optional ddb ==== //depot/projects/pmap/sys/dev/gem/if_gem.c#3 (text+ko) ==== @@ -23,9 +23,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: NetBSD: gem.c,v 1.9 2001/10/21 20:45:15 thorpej Exp + * from: NetBSD: gem.c,v 1.21 2002/06/01 23:50:58 lukem Exp * - * $FreeBSD: src/sys/dev/gem/if_gem.c,v 1.5 2002/05/24 12:47:41 tmm Exp $ + * $FreeBSD: src/sys/dev/gem/if_gem.c,v 1.6 2002/07/10 10:24:23 benno Exp $ */ /* @@ -124,6 +124,7 @@ struct ifnet *ifp = &sc->sc_arpcom.ac_if; struct mii_softc *child; int i, error; + u_int32_t v; /* Make sure the chip is stopped. */ ifp->if_softc = sc; @@ -228,7 +229,15 @@ device_printf(sc->sc_dev, "Ethernet address:"); for (i = 0; i < 6; i++) printf("%c%02x", i > 0 ? ':' : ' ', sc->sc_arpcom.ac_enaddr[i]); - printf("\n"); + + /* Get RX FIFO size */ + sc->sc_rxfifosize = 64 * + bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_RX_FIFO_SIZE); + printf(", %uKB RX fifo", sc->sc_rxfifosize / 1024); + + /* Get TX FIFO size */ + v = bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_FIFO_SIZE); + printf(", %uKB TX fifo\n", v / 16); /* Initialize ifnet structure. */ ifp->if_softc = sc; @@ -416,6 +425,10 @@ CTR2(KTR_GEM, "txdma_cb: start of packet at seg %d, " "tx %d", seg, tx->txd_nexttx); flags |= GEM_TD_START_OF_PACKET; + if (++tx->txd_sc->sc_txwin > GEM_NTXSEGS * 2 / 3) { + tx->txd_sc->sc_txwin = 0; + flags |= GEM_TD_INTERRUPT_ME; + } } if ((tx->txd_flags & GTXD_LAST) != 0 && seg == nsegs - 1) { CTR2(KTR_GEM, "txdma_cb: end of packet at seg %d, " @@ -680,8 +693,9 @@ } GEM_CDTXSYNC(sc, 0, GEM_NTXDESC, BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); - sc->sc_txfree = GEM_NTXDESC; + sc->sc_txfree = GEM_NTXDESC-1; sc->sc_txnext = 0; + sc->sc_txwin = 0; /* * Initialize the receive descriptor and receive job @@ -821,7 +835,8 @@ GEM_INTR_RX_TAG_ERR|GEM_INTR_PCS| GEM_INTR_MAC_CONTROL|GEM_INTR_MIF| GEM_INTR_BERR)); - bus_space_write_4(t, h, GEM_MAC_RX_MASK, 0); /* XXXX */ + bus_space_write_4(t, h, GEM_MAC_RX_MASK, + GEM_MAC_RX_DONE|GEM_MAC_RX_FRAME_CNT); bus_space_write_4(t, h, GEM_MAC_TX_MASK, 0xffff); /* XXXX */ bus_space_write_4(t, h, GEM_MAC_CONTROL_MASK, 0); /* XXXX */ @@ -844,14 +859,16 @@ (2<sc_rxfifosize / 256) | + ( (sc->sc_rxfifosize / 256) << 12)); + bus_space_write_4(t, h, GEM_RX_BLANKING, (6<<12)|6); /* step 11. Configure Media */ - (void)gem_mii_statchg(sc->sc_dev); + mii_mediachg(sc->sc_mii); /* step 12. RX_MAC Configuration Register */ v = bus_space_read_4(t, h, GEM_MAC_RX_CONFIG); @@ -873,7 +890,7 @@ ifp->if_flags |= IFF_RUNNING; ifp->if_flags &= ~IFF_OACTIVE; ifp->if_timer = 0; - sc->sc_flags = ifp->if_flags; + sc->sc_ifflags = ifp->if_flags; splx(s); } @@ -1005,12 +1022,12 @@ gem_init_regs(sc) struct gem_softc *sc; { - struct ifnet *ifp = &sc->sc_arpcom.ac_if; bus_space_tag_t t = sc->sc_bustag; bus_space_handle_t h = sc->sc_h; + const u_char *laddr = sc->sc_arpcom.ac_enaddr; + u_int32_t v; /* These regs are not cleared on reset */ - sc->sc_inited = 0; if (!sc->sc_inited) { /* Wooo. Magic values. */ @@ -1021,20 +1038,22 @@ bus_space_write_4(t, h, GEM_MAC_MAC_MIN_FRAME, ETHER_MIN_LEN); /* Max frame and max burst size */ bus_space_write_4(t, h, GEM_MAC_MAC_MAX_FRAME, - (ifp->if_mtu+18) | (0x2000<<16)/* Burst size */); + ETHER_MAX_LEN | (0x2000<<16)); + bus_space_write_4(t, h, GEM_MAC_PREAMBLE_LEN, 0x7); bus_space_write_4(t, h, GEM_MAC_JAM_SIZE, 0x4); bus_space_write_4(t, h, GEM_MAC_ATTEMPT_LIMIT, 0x10); /* Dunno.... */ bus_space_write_4(t, h, GEM_MAC_CONTROL_TYPE, 0x8088); bus_space_write_4(t, h, GEM_MAC_RANDOM_SEED, - ((sc->sc_arpcom.ac_enaddr[5]<<8)| - sc->sc_arpcom.ac_enaddr[4])&0x3ff); + ((laddr[5]<<8)|laddr[4])&0x3ff); + /* Secondary MAC addr set to 0:0:0:0:0:0 */ bus_space_write_4(t, h, GEM_MAC_ADDR3, 0); bus_space_write_4(t, h, GEM_MAC_ADDR4, 0); bus_space_write_4(t, h, GEM_MAC_ADDR5, 0); - /* MAC control addr set to 0:1:c2:0:1:80 */ + + /* MAC control addr set to 01:80:c2:00:00:01 */ bus_space_write_4(t, h, GEM_MAC_ADDR6, 0x0001); bus_space_write_4(t, h, GEM_MAC_ADDR7, 0xc200); bus_space_write_4(t, h, GEM_MAC_ADDR8, 0x0180); @@ -1073,12 +1092,21 @@ /* * Set the station address. */ - bus_space_write_4(t, h, GEM_MAC_ADDR0, - (sc->sc_arpcom.ac_enaddr[4]<<8) | sc->sc_arpcom.ac_enaddr[5]); - bus_space_write_4(t, h, GEM_MAC_ADDR1, - (sc->sc_arpcom.ac_enaddr[2]<<8) | sc->sc_arpcom.ac_enaddr[3]); - bus_space_write_4(t, h, GEM_MAC_ADDR2, - (sc->sc_arpcom.ac_enaddr[0]<<8) | sc->sc_arpcom.ac_enaddr[1]); + bus_space_write_4(t, h, GEM_MAC_ADDR0, (laddr[4]<<8)|laddr[5]); + bus_space_write_4(t, h, GEM_MAC_ADDR1, (laddr[2]<<8)|laddr[3]); + bus_space_write_4(t, h, GEM_MAC_ADDR2, (laddr[0]<<8)|laddr[1]); + + /* + * Enable MII outputs. Enable GMII if there is a gigabit PHY. + */ + sc->sc_mif_config = bus_space_read_4(t, h, GEM_MIF_CONFIG); + v = GEM_MAC_XIF_TX_MII_ENA; + if (sc->sc_mif_config & GEM_MIF_CONFIG_MDI1) { + v |= GEM_MAC_XIF_FDPLX_LED; + if (sc->sc_flags & GEM_GIGABIT) + v |= GEM_MAC_XIF_GMII_MODE; + } + bus_space_write_4(t, h, GEM_MAC_XIF_CONFIG, v); } static void @@ -1271,6 +1299,7 @@ bus_space_handle_t mac = sc->sc_h; struct gem_txsoft *txs; int txlast; + int progress = 0; DPRINTF(sc, ("%s: gem_tint\n", device_get_name(sc->sc_dev))); @@ -1360,6 +1389,7 @@ STAILQ_INSERT_TAIL(&sc->sc_txfreeq, txs, txs_q); ifp->if_opackets++; + progress = 1; } DPRINTF(sc, ("gem_tint: GEM_TX_STATE_MACHINE %x " @@ -1381,18 +1411,22 @@ GEM_TX_DATA_PTR_LO), bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_COMPLETION)); - if (STAILQ_FIRST(&sc->sc_txdirtyq) == NULL) - ifp->if_timer = 0; + if (progress) { + if (sc->sc_txfree == GEM_NTXDESC - 1) + sc->sc_txwin = 0; + + /* Freed some descriptors, so reset IFF_OACTIVE and restart. */ + ifp->if_flags &= ~IFF_OACTIVE; + gem_start(ifp); + if (STAILQ_EMPTY(&sc->sc_txdirtyq)) + ifp->if_timer = 0; + } DPRINTF(sc, ("%s: gem_tint: watchdog %d\n", device_get_name(sc->sc_dev), ifp->if_timer)); CTR2(KTR_GEM, "%s: gem_tint: watchdog %d", device_get_name(sc->sc_dev), ifp->if_timer); - - /* Freed some descriptors, so reset IFF_OACTIVE and restart. */ - ifp->if_flags &= ~IFF_OACTIVE; - gem_start(ifp); } static void @@ -1417,19 +1451,27 @@ struct gem_rxsoft *rxs; struct mbuf *m; u_int64_t rxstat; - int i, len; + u_int32_t rxcomp; + int i, len, progress = 0; callout_stop(&sc->sc_rx_ch); DPRINTF(sc, ("%s: gem_rint\n", device_get_name(sc->sc_dev))); CTR1(KTR_GEM, "%s: gem_rint", device_get_name(sc->sc_dev)); + /* + * Read the completion register once. This limits + * how long the following loop can execute. + */ + rxcomp = bus_space_read_4(t, h, GEM_RX_COMPLETION); + + /* * XXXX Read the lastrx only once at the top for speed. */ DPRINTF(sc, ("gem_rint: sc->rxptr %d, complete %d\n", - sc->sc_rxptr, bus_space_read_4(t, h, GEM_RX_COMPLETION))); + sc->sc_rxptr, rxcomp)); CTR2(KTR_GEM, "gem_rint: sc->rxptr %d, complete %d", - sc->sc_rxptr, bus_space_read_4(t, h, GEM_RX_COMPLETION)); - for (i = sc->sc_rxptr; i != bus_space_read_4(t, h, GEM_RX_COMPLETION); + sc->sc_rxptr, rxcomp); + for (i = sc->sc_rxptr; i != rxcomp; i = GEM_NEXTRX(i)) { rxs = &sc->sc_rxsoft[i]; @@ -1439,6 +1481,7 @@ rxstat = GEM_DMA_READ(sc, sc->sc_rxdescs[i].gd_flags); if (rxstat & GEM_RD_OWN) { +#if 0 /* XXX: In case of emergency, re-enable this. */ /* * The descriptor is still marked as owned, although * it is supposed to have completed. This has been @@ -1449,10 +1492,15 @@ */ callout_reset(&sc->sc_rx_ch, GEM_RXOWN_TICKS, gem_rint_timeout, sc); +#endif break; } + progress++; + ifp->if_ipackets++; + if (rxstat & GEM_RD_BAD_CRC) { + ifp->if_ierrors++; device_printf(sc->sc_dev, "receive error: CRC error\n"); GEM_INIT_RXDESC(sc, i); continue; @@ -1491,7 +1539,6 @@ } m->m_data += 2; /* We're already off by two */ - ifp->if_ipackets++; eh = mtod(m, struct ether_header *); m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = len - ETHER_CRC_LEN; @@ -1501,9 +1548,14 @@ ether_input(ifp, eh, m); } - /* Update the receive pointer. */ - sc->sc_rxptr = i; - bus_space_write_4(t, h, GEM_RX_KICK, i); + if (progress) { + /* Update the receive pointer. */ + if (i == sc->sc_rxptr) { + device_printf(sc->sc_dev, "rint: ring wrap\n"); + } + sc->sc_rxptr = i; + bus_space_write_4(t, h, GEM_RX_KICK, GEM_PREVRX(i)); + } DPRINTF(sc, ("gem_rint: done sc->rxptr %d, complete %d\n", sc->sc_rxptr, bus_space_read_4(t, h, GEM_RX_COMPLETION))); @@ -1609,14 +1661,16 @@ if (status & GEM_INTR_TX_MAC) { int txstat = bus_space_read_4(t, seb, GEM_MAC_TX_STATUS); if (txstat & ~GEM_MAC_TX_XMIT_DONE) - printf("MAC tx fault, status %x\n", txstat); + device_printf(sc->sc_dev, "MAC tx fault, status %x\n", + txstat); if (txstat & (GEM_MAC_TX_UNDERRUN | GEM_MAC_TX_PKT_TOO_LONG)) gem_init(sc); } if (status & GEM_INTR_RX_MAC) { int rxstat = bus_space_read_4(t, seb, GEM_MAC_RX_STATUS); if (rxstat & ~(GEM_MAC_RX_DONE | GEM_MAC_RX_FRAME_CNT)) - printf("MAC rx fault, status %x\n", rxstat); + device_printf(sc->sc_dev, "MAC rx fault, status %x\n", + rxstat); if ((rxstat & GEM_MAC_RX_OVERFLOW) != 0) gem_init(sc); } @@ -1800,6 +1854,7 @@ v = bus_space_read_4(t, mac, GEM_MAC_XIF_CONFIG); v = GEM_MAC_XIF_LINK_LED; v |= GEM_MAC_XIF_TX_MII_ENA; + /* If an external transceiver is connected, enable its MII drivers */ sc->sc_mif_config = bus_space_read_4(t, mac, GEM_MIF_CONFIG); if ((sc->sc_mif_config & GEM_MIF_CONFIG_MDI1) != 0) { @@ -1807,9 +1862,14 @@ if ((IFM_OPTIONS(sc->sc_mii->mii_media_active) & IFM_FDX) != 0) /* turn on full duplex LED */ v |= GEM_MAC_XIF_FDPLX_LED; - else - /* half duplex -- disable echo */ - v |= GEM_MAC_XIF_ECHO_DISABL; + else + /* half duplex -- disable echo */ + v |= GEM_MAC_XIF_ECHO_DISABL; + + if (IFM_SUBTYPE(sc->sc_mii->mii_media_active) == IFM_1000_T) + v |= GEM_MAC_XIF_GMII_MODE; + else + v &= ~GEM_MAC_XIF_GMII_MODE; } else { /* Internal MII needs buf enable */ v |= GEM_MAC_XIF_MII_BUF_ENA; @@ -1864,7 +1924,7 @@ break; case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { - if ((sc->sc_flags ^ ifp->if_flags) == IFF_PROMISC) + if ((sc->sc_ifflags ^ ifp->if_flags) == IFF_PROMISC) gem_setladrf(sc); else gem_init(sc); @@ -1872,7 +1932,7 @@ if (ifp->if_flags & IFF_RUNNING) gem_stop(ifp, 0); } - sc->sc_flags = ifp->if_flags; + sc->sc_ifflags = ifp->if_flags; error = 0; break; case SIOCADDMULTI: @@ -1913,38 +1973,42 @@ u_int32_t hash[16]; u_int32_t v; int len; - - /* Clear hash table */ - memset(hash, 0, sizeof(hash)); + int i; /* Get current RX configuration */ v = bus_space_read_4(t, h, GEM_MAC_RX_CONFIG); + /* + * Turn off promiscuous mode, promiscuous group mode (all multicast), + * and hash filter. Depending on the case, the right bit will be + * enabled. + */ + v &= ~(GEM_MAC_RX_PROMISCUOUS|GEM_MAC_RX_HASH_FILTER| + GEM_MAC_RX_PROMISC_GRP); + if ((ifp->if_flags & IFF_PROMISC) != 0) { - /* Turn on promiscuous mode; turn off the hash filter */ + /* Turn on promiscuous mode */ v |= GEM_MAC_RX_PROMISCUOUS; - v &= ~GEM_MAC_RX_HASH_FILTER; - ; goto chipit; } if ((ifp->if_flags & IFF_ALLMULTI) != 0) { hash[3] = hash[2] = hash[1] = hash[0] = 0xffff; ifp->if_flags |= IFF_ALLMULTI; + v |= GEM_MAC_RX_PROMISC_GRP; goto chipit; } - /* Turn off promiscuous mode; turn on the hash filter */ - v &= ~GEM_MAC_RX_PROMISCUOUS; - v |= GEM_MAC_RX_HASH_FILTER; - /* * Set up multicast address filter by passing all multicast addresses - * through a crc generator, and then using the high order 6 bits as an - * index into the 256 bit logical address filter. The high order bit - * selects the word, while the rest of the bits select the bit within - * the word. + * through a crc generator, and then using the high order 8 bits as an + * index into the 256 bit logical address filter. The high order 4 + * bits selects the word, while the other 4 bits select the bit within + * the word (where bit 0 is the MSB). */ + /* Clear hash table */ + memset(hash, 0, sizeof(hash)); + TAILQ_FOREACH(inm, &sc->sc_arpcom.ac_if.if_multiaddrs, ifma_link) { if (inm->ifma_addr->sa_family != AF_LINK) continue; @@ -1970,28 +2034,20 @@ crc >>= 24; /* Set the corresponding bit in the filter. */ - hash[crc >> 4] |= 1 << (crc & 0xf); + hash[crc >> 4] |= 1 << (15 - (crc & 15)); + } + + v |= GEM_MAC_RX_HASH_FILTER; + ifp->if_flags &= ~IFF_ALLMULTI; + + /* Now load the hash table into the chip (if we are using it) */ + for (i = 0; i < 16; i++) { + bus_space_write_4(t, h, + GEM_MAC_HASH0 + i * (GEM_MAC_HASH1-GEM_MAC_HASH0), + hash[i]); } chipit: - /* Now load the hash table into the chip */ - bus_space_write_4(t, h, GEM_MAC_HASH0, hash[0]); - bus_space_write_4(t, h, GEM_MAC_HASH1, hash[1]); - bus_space_write_4(t, h, GEM_MAC_HASH2, hash[2]); - bus_space_write_4(t, h, GEM_MAC_HASH3, hash[3]); - bus_space_write_4(t, h, GEM_MAC_HASH4, hash[4]); - bus_space_write_4(t, h, GEM_MAC_HASH5, hash[5]); - bus_space_write_4(t, h, GEM_MAC_HASH6, hash[6]); - bus_space_write_4(t, h, GEM_MAC_HASH7, hash[7]); - bus_space_write_4(t, h, GEM_MAC_HASH8, hash[8]); - bus_space_write_4(t, h, GEM_MAC_HASH9, hash[9]); - bus_space_write_4(t, h, GEM_MAC_HASH10, hash[10]); - bus_space_write_4(t, h, GEM_MAC_HASH11, hash[11]); - bus_space_write_4(t, h, GEM_MAC_HASH12, hash[12]); - bus_space_write_4(t, h, GEM_MAC_HASH13, hash[13]); - bus_space_write_4(t, h, GEM_MAC_HASH14, hash[14]); - bus_space_write_4(t, h, GEM_MAC_HASH15, hash[15]); - bus_space_write_4(t, h, GEM_MAC_RX_CONFIG, v); } ==== //depot/projects/pmap/sys/dev/gem/if_gem_pci.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * * from: NetBSD: if_gem_pci.c,v 1.7 2001/10/18 15:09:15 thorpej Exp * - * $FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.4 2002/03/20 02:07:21 alfred Exp $ + * $FreeBSD: src/sys/dev/gem/if_gem_pci.c,v 1.5 2002/07/10 10:24:23 benno Exp $ */ /* @@ -107,12 +107,13 @@ struct gem_pci_dev { u_int32_t gpd_devid; + int gpd_variant; char *gpd_desc; } gem_pci_devlist[] = { - { 0x1101108e, "Sun ERI 10/100 Ethernet Adaptor" }, - { 0x2bad108e, "Sun GEM Gigabit Ethernet Adaptor" }, - { 0x0021106b, "Apple GMAC Ethernet Adaptor" }, - { 0x0024106b, "Apple GMAC2 Ethernet Adaptor" }, + { 0x1101108e, GEM_SUN_GEM, "Sun ERI 10/100 Ethernet Adaptor" }, + { 0x2bad108e, GEM_SUN_GEM, "Sun GEM Gigabit Ethernet Adaptor" }, + { 0x0021106b, GEM_APPLE_GMAC, "Apple GMAC Ethernet Adaptor" }, + { 0x0024106b, GEM_APPLE_GMAC, "Apple GMAC2 Ethernet Adaptor" }, { 0, NULL } }; @@ -125,11 +126,15 @@ { int i; u_int32_t devid; + struct gem_pci_softc *gsc; devid = pci_get_devid(dev); for (i = 0; gem_pci_devlist[i].gpd_desc != NULL; i++) { if (devid == gem_pci_devlist[i].gpd_devid) { device_set_desc(dev, gem_pci_devlist[i].gpd_desc); + gsc = device_get_softc(dev); + gsc->gsc_gem.sc_variant = + gem_pci_devlist[i].gpd_variant; return (0); } } ==== //depot/projects/pmap/sys/dev/gem/if_gemreg.h#2 (text+ko) ==== @@ -24,9 +24,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: NetBSD: gemreg.h,v 1.2 2001/10/18 03:33:33 thorpej Exp + * from: NetBSD: gemreg.h,v 1.15 2002/05/11 00:36:02 matt Exp * - * $FreeBSD: src/sys/dev/gem/if_gemreg.h,v 1.1 2002/02/27 17:41:06 tmm Exp $ + * $FreeBSD: src/sys/dev/gem/if_gemreg.h,v 1.2 2002/07/10 10:24:23 benno Exp $ */ #ifndef _IF_GEMREG_H @@ -205,13 +205,14 @@ /* GEM_RX_PAUSE_THRESH register bits -- sizes in multiples of 64 bytes */ #define GEM_RX_PTH_XOFF_THRESH 0x000001ff -#define GEM_RX_PTH_XON_THRESH 0x07fc0000 +#define GEM_RX_PTH_XON_THRESH 0x001ff000 /* GEM_RX_BLANKING register bits */ #define GEM_RX_BLANKING_PACKETS 0x000001ff /* Delay intr for x packets */ -#define GEM_RX_BLANKING_TIME 0x03fc0000 /* Delay intr for x ticks */ -/* One tick is 1048 PCI clocs, or 16us at 66MHz */ +#define GEM_RX_BLANKING_TIME 0x000ff000 /* Delay intr for x ticks */ +#define GEM_RX_BLANKING_TIME_SHIFT 12 +/* One tick is 2048 PCI clocks, or 16us at 66MHz */ /* GEM_MAC registers */ @@ -324,7 +325,7 @@ #define GEM_MAC_XIF_TX_MII_ENA 0x00000001 /* Enable XIF output drivers */ #define GEM_MAC_XIF_MII_LOOPBK 0x00000002 /* Enable MII loopback mode */ #define GEM_MAC_XIF_ECHO_DISABL 0x00000004 /* Disable echo */ -#define GEM_MAC_XIF_MII_MODE 0x00000008 /* Select GMII/MII mode */ +#define GEM_MAC_XIF_GMII_MODE 0x00000008 /* Select GMII/MII mode */ #define GEM_MAC_XIF_MII_BUF_ENA 0x00000010 /* Enable MII recv buffers */ #define GEM_MAC_XIF_LINK_LED 0x00000020 /* force link LED active */ #define GEM_MAC_XIF_FDPLX_LED 0x00000040 /* force FDPLX LED active */ ==== //depot/projects/pmap/sys/dev/gem/if_gemvar.h#3 (text+ko) ==== @@ -23,9 +23,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: NetBSD: gemvar.h,v 1.5 2001/10/18 15:19:22 thorpej Exp + * from: NetBSD: gemvar.h,v 1.8 2002/05/15 02:36:12 matt Exp * - * $FreeBSD: src/sys/dev/gem/if_gemvar.h,v 1.3 2002/03/23 19:43:15 tmm Exp $ + * $FreeBSD: src/sys/dev/gem/if_gemvar.h,v 1.4 2002/07/10 10:24:23 benno Exp $ */ #ifndef _IF_GEMVAR_H @@ -57,6 +57,7 @@ */ #define GEM_NRXDESC 128 #define GEM_NRXDESC_MASK (GEM_NRXDESC - 1) +#define GEM_PREVRX(x) ((x - 1) & GEM_NRXDESC_MASK) #define GEM_NEXTRX(x) ((x + 1) & GEM_NRXDESC_MASK) /* @@ -153,6 +154,13 @@ int sc_mif_config; /* Selected MII reg setting */ int sc_pci; /* XXXXX -- PCI buses are LE. */ + u_int sc_variant; /* which GEM are we dealing with? */ +#define GEM_UNKNOWN 0 /* don't know */ +#define GEM_SUN_GEM 1 /* Sun GEM variant */ +#define GEM_APPLE_GMAC 2 /* Apple GMAC variant */ + + u_int sc_flags; /* */ +#define GEM_GIGABIT 0x0001 /* has a gigabit PHY */ /* * Ring buffer DMA stuff. @@ -177,16 +185,18 @@ int sc_txfree; /* number of free Tx descriptors */ int sc_txnext; /* next ready Tx descriptor */ + int sc_txwin; /* Tx descriptors since last Tx int */ struct gem_txsq sc_txfreeq; /* free Tx descsofts */ struct gem_txsq sc_txdirtyq; /* dirty Tx descsofts */ int sc_rxptr; /* next ready RX descriptor/descsoft */ + int sc_rxfifosize; /* Rx FIFO size (bytes) */ /* ========== */ int sc_inited; int sc_debug; - int sc_flags; + int sc_ifflags; /* Special hardware hooks */ void (*sc_hwreset)(struct gem_softc *); ==== //depot/projects/pmap/sys/dev/sio/sio_pci.c#4 (text+ko) ==== @@ -21,7 +21,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/dev/sio/sio_pci.c,v 1.7 2002/03/20 19:38:26 jhb Exp $ + * $FreeBSD: src/sys/dev/sio/sio_pci.c,v 1.8 2002/07/10 17:26:11 sobomax Exp $ */ #include @@ -76,6 +76,7 @@ { 0x7101135e, "SeaLevel Ultra 530.PCI Single Port Serial", 0x18 }, { 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 }, { 0x0103115d, "Xircom Cardbus modem", 0x10 }, + { 0x98459710, "Netmos Nm9845 PCI Bridge with Dual UART", 0x10 }, { 0x00000000, NULL, 0 } }; ==== //depot/projects/pmap/sys/i386/i386/critical.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * Copyright (c) 2001 Matthew Dillon. This code is distributed under * the BSD copyright, /usr/src/COPYRIGHT. * - * $FreeBSD: src/sys/i386/i386/critical.c,v 1.3 2002/04/01 23:51:16 dillon Exp $ + * $FreeBSD: src/sys/i386/i386/critical.c,v 1.4 2002/07/10 20:15:57 dillon Exp $ */ #include @@ -34,16 +34,6 @@ void i386_unpend(void); /* NOTE: not static, called from assembly */ /* - * Instrument our ability to run critical sections with interrupts - * enabled. Default is 1 (enabled). The value can be changed on the - * fly, at any time. If set to 0 the original interrupt disablement - * will be used for critical sections. - */ -int critical_mode = 1; -SYSCTL_INT(_debug, OID_AUTO, critical_mode, - CTLFLAG_RW, &critical_mode, 0, ""); - -/* * cpu_unpend() - called from critical_exit() inline after quick * interrupt-pending check. */ @@ -66,8 +56,8 @@ /* * cpu_critical_fork_exit() - cleanup after fork * - * For i386 we do not have to do anything, td_critnest and - * td_savecrit are handled by the fork trampoline code. + * For i386 we do not have to do anything, td_critnest is + * handled by the fork trampoline code. */ void cpu_critical_fork_exit(void) @@ -77,16 +67,12 @@ /* * cpu_thread_link() - thread linkup, initialize machine-dependant fields * - * (copy code originally in kern/kern_proc.c). XXX we actually - * don't have to initialize this field but it's probably a good - * idea for the moment for debugging's sake. The field is only - * valid when td_critnest is non-zero. + * There are currently no machine-dependant fields that require + * initialization. */ void cpu_thread_link(struct thread *td) { - - td->td_md.md_savecrit = 0; } /* ==== //depot/projects/pmap/sys/i386/i386/exception.s#6 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/exception.s,v 1.95 2002/07/10 02:24:44 julian Exp $ + * $FreeBSD: src/sys/i386/i386/exception.s,v 1.97 2002/07/10 21:17:23 julian Exp $ */ #include "opt_npx.h" @@ -225,23 +225,7 @@ pushl %esi /* function */ movl PCPU(CURTHREAD),%ebx /* setup critnest */ movl $1,TD_CRITNEST(%ebx) - /* - * Initialize md_savecrit based on critical_mode. If critical_mode - * is enabled (new/1) savecrit is basically not used but must - * be initialized to -1 so we know it isn't used in - * cpu_critical_exit(). If critical_mode is disabled (old/0) - * the eflags to restore must be saved in md_savecrit. - */ - cmpl $0,critical_mode - jne 1f - pushfl - popl TD_MD+MD_SAVECRIT(%ebx) - orl $PSL_I,TD_MD+MD_SAVECRIT(%ebx) - jmp 2f -1: - movl $-1,TD_MD+MD_SAVECRIT(%ebx) sti /* enable interrupts */ -2: call fork_exit addl $12,%esp /* cut from syscall */ @@ -285,12 +269,12 @@ */ testl $PSL_VM,TF_EFLAGS(%esp) /* are we in vm86 mode? */ jz doreti_notvm86 - cmpl $1,in_vm86call /* are we in a vm86 call? */ + cmpl $1,in_vm86call /* are we in a vm86 call? XXXSMP */ jne doreti_ast /* can handle ASTs now if not */ jmp doreti_exit doreti_notvm86: - testb $SEL_RPL_MASK,TF_CS(%esp) /* are we in user mode? */ + testb $SEL_RPL_MASK,TF_CS(%esp) /* are we returning to user mode? */ jz doreti_exit /* can't handle ASTs now if not */ doreti_ast: ==== //depot/projects/pmap/sys/i386/i386/genassym.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.125 2002/06/29 17:26:16 julian Exp $ + * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.126 2002/07/10 20:15:57 dillon Exp $ */ #include "opt_kstack_pages.h" @@ -94,7 +94,6 @@ ASSYM(P_MD, offsetof(struct proc, p_md)); ASSYM(MD_LDT, offsetof(struct mdproc, md_ldt)); -ASSYM(MD_SAVECRIT, offsetof(struct mdthread, md_savecrit)); ASSYM(KE_FLAGS, offsetof(struct kse, ke_flags)); ==== //depot/projects/pmap/sys/i386/i386/locore.s#9 (text+ko) ==== @@ -34,7 +34,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 17:20:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F8A037B405; Wed, 10 Jul 2002 17:20:14 -0700 (PDT) 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 5B7FC37B407 for ; Wed, 10 Jul 2002 17:20:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F21D143E3B for ; Wed, 10 Jul 2002 17:20:03 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6B0K3JU078448 for ; Wed, 10 Jul 2002 17:20:03 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6B0K3TO078445 for perforce@freebsd.org; Wed, 10 Jul 2002 17:20:03 -0700 (PDT) Date: Wed, 10 Jul 2002 17:20:03 -0700 (PDT) Message-Id: <200207110020.g6B0K3TO078445@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14065 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14065 Change 14065 by peter@peter_daintree on 2002/07/10 17:19:11 fix some oops's. s/atomic_store_int_rel/atomic_store_rel_int/ (cut/pasted from jhb's suggestion). Fix comment within comment. Affected files ... .. //depot/projects/pmap/sys/i386/i386/mp_machdep.c#19 edit Differences ... ==== //depot/projects/pmap/sys/i386/i386/mp_machdep.c#19 (text+ko) ==== @@ -2261,7 +2261,7 @@ mtx_lock_spin(&smp_tlb_mtx); smp_tlb_addr1 = addr1; smp_tlb_addr2 = addr2; - atomic_store_int_rel(&smp_tlb_wait, 0); + atomic_store_rel_int(&smp_tlb_wait, 0); ipi_all_but_self(vector); while (smp_tlb_wait < ncpu) ia32_pause(); @@ -2278,8 +2278,8 @@ * bits++; * } * and - * while (lsb = (m & -m)) { /* This is magic too */ - * m &= ~lsb; /* or: m ^= lsb */ + * while (lsb = (m & -m)) { // This is magic too + * m &= ~lsb; // or: m ^= lsb * bits++; * } * Both of these latter forms do some very strange things on gcc-3.1 with @@ -2332,7 +2332,7 @@ mtx_lock_spin(&smp_tlb_mtx); smp_tlb_addr1 = addr1; smp_tlb_addr2 = addr2; - atomic_store_int_rel(&smp_tlb_wait, 0); + atomic_store_rel_int(&smp_tlb_wait, 0); if (mask == (u_int)-1) ipi_all_but_self(vector); else To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 17:22:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4648B37B401; Wed, 10 Jul 2002 17:22:08 -0700 (PDT) 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 F1C5837B400 for ; Wed, 10 Jul 2002 17:22:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3640043E3B for ; Wed, 10 Jul 2002 17:22:07 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6B0M6JU078953 for ; Wed, 10 Jul 2002 17:22:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6B0M6EA078950 for perforce@freebsd.org; Wed, 10 Jul 2002 17:22:06 -0700 (PDT) Date: Wed, 10 Jul 2002 17:22:06 -0700 (PDT) Message-Id: <200207110022.g6B0M6EA078950@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14066 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14066 Change 14066 by peter@peter_daintree on 2002/07/10 17:21:56 Spell __inline correctly. -Wunused fixes Affected files ... .. //depot/projects/pmap/sys/i386/i386/mp_machdep.c#20 edit Differences ... ==== //depot/projects/pmap/sys/i386/i386/mp_machdep.c#20 (text+ko) ==== @@ -2286,7 +2286,7 @@ * -mcpu=pentiumpro and/or -march=pentiumpro and/or -O or -O2. * There is probably an SSE or MMX popcnt instruction. */ -static inline u_int32_t +static __inline u_int32_t popcnt(u_int32_t m) { @@ -2301,8 +2301,7 @@ static void smp_targeted_tlb_shootdown(u_int mask, u_int vector, vm_offset_t addr1, vm_offset_t addr2) { - u_int m; - int i, ncpu, othercpus; + int ncpu, othercpus; register_t eflags; othercpus = mp_ncpus - 1; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 10 17:27:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57B8337B401; Wed, 10 Jul 2002 17:27:14 -0700 (PDT) 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 126F237B400 for ; Wed, 10 Jul 2002 17:27:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B44F943E31 for ; Wed, 10 Jul 2002 17:27:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6B0RDJU079256 for ; Wed, 10 Jul 2002 17:27:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6B0RDhJ079253 for perforce@freebsd.org; Wed, 10 Jul 2002 17:27:13 -0700 (PDT) Date: Wed, 10 Jul 2002 17:27:13 -0700 (PDT) Message-Id: <200207110027.g6B0RDhJ079253@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14067 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14067 Change 14067 by peter@peter_daintree on 2002/07/10 17:26:48 OK, so isn't a superset of Affected files ... .. //depot/projects/pmap/sys/i386/i386/pmap.c#21 edit Differences ... ==== //depot/projects/pmap/sys/i386/i386/pmap.c#21 (text+ko) ==== @@ -104,6 +104,7 @@ #include #include #if defined(SMP) || defined(APIC_IO) +#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 11 0:53:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90E1537B405; Thu, 11 Jul 2002 00:52:58 -0700 (PDT) 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 1E17337B400 for ; Thu, 11 Jul 2002 00:52:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4399943E52 for ; Thu, 11 Jul 2002 00:52:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6B7qtJU051269 for ; Thu, 11 Jul 2002 00:52:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6B7qsHe051265 for perforce@freebsd.org; Thu, 11 Jul 2002 00:52:54 -0700 (PDT) Date: Thu, 11 Jul 2002 00:52:54 -0700 (PDT) Message-Id: <200207110752.g6B7qsHe051265@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14078 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14078 Change 14078 by peter@peter_daintree on 2002/07/11 00:51:57 IFC @14077 Affected files ... .. //depot/projects/pmap/sys/conf/NOTES#2 integrate .. //depot/projects/pmap/sys/conf/files#10 integrate .. //depot/projects/pmap/sys/conf/options#5 integrate .. //depot/projects/pmap/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/pmap/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/pmap/sys/dev/isp/isp_inline.h#6 integrate .. //depot/projects/pmap/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/pmap/sys/dev/isp/isp_sbus.c#1 branch .. //depot/projects/pmap/sys/dev/ispfw/asm_1000.h#1 branch .. //depot/projects/pmap/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/pmap/sys/kern/kern_fork.c#9 integrate .. //depot/projects/pmap/sys/kern/kern_prot.c#8 integrate .. //depot/projects/pmap/sys/kern/subr_trap.c#9 integrate .. //depot/projects/pmap/sys/sys/cdefs.h#3 integrate .. //depot/projects/pmap/sys/vm/vm_kern.c#3 integrate .. //depot/projects/pmap/sys/vm/vm_map.c#5 integrate .. //depot/projects/pmap/sys/vm/vm_map.h#4 integrate Differences ... ==== //depot/projects/pmap/sys/conf/NOTES#2 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1043 2002/07/08 22:00:43 mp Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1044 2002/07/11 04:15:53 ken Exp $ # # @@ -1684,6 +1684,15 @@ # only works for Tigon II chips, and has no effect for Tigon I chips. options TI_JUMBO_HDRSPLIT +# These two options allow manipulating the mbuf cluster size and mbuf size, +# respectively. Be very careful with NIC driver modules when changing +# these from their default values, because that can potentially cause a +# mismatch between the mbuf size assumed by the kernel and the mbuf size +# assumed by a module. The only driver that currently has the ability to +# detect a mismatch is ti(4). +options MCLSHIFT=12 # mbuf cluster shift in bits, 12 == 4KB +options MSIZE=512 # mbuf size in bytes + # # ATM related options (Cranor version) # (note: this driver cannot be used with the HARP ATM stack) @@ -2269,8 +2278,6 @@ options NBUF=512 # Number of buffer headers -options MSIZE=256 # mbuf size in bytes -options MCLSHIFT=12 # mbuf cluster shift in bits, 12 == 4KB options NMBCLUSTERS=1024 # Number of mbuf clusters options SCSI_NCR_DEBUG ==== //depot/projects/pmap/sys/conf/files#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.659 2002/07/09 17:53:47 iwasaki Exp $ +# $FreeBSD: src/sys/conf/files,v 1.660 2002/07/11 03:26:39 mjacob Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -408,10 +408,11 @@ dev/iir/iir.c optional iir dev/iir/iir_ctrl.c optional iir dev/iir/iir_pci.c optional iir pci -dev/isp/isp.c optional isp nowerror +dev/isp/isp.c optional isp dev/isp/isp_freebsd.c optional isp dev/isp/isp_target.c optional isp -dev/isp/isp_pci.c optional isp nowerror +dev/isp/isp_pci.c optional isp pci +dev/isp/isp_sbus.c optional isp sbus dev/ispfw/ispfw.c optional ispfw dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa ==== //depot/projects/pmap/sys/conf/options#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.329 2002/07/08 22:00:43 mp Exp $ +# $FreeBSD: src/sys/conf/options,v 1.330 2002/07/11 04:15:53 ken Exp $ # # On the handling of kernel options # @@ -407,11 +407,11 @@ ENABLE_VFS_IOOPT opt_global.h INVARIANT_SUPPORT opt_global.h INVARIANTS opt_global.h +MCLSHIFT opt_global.h +MSIZE opt_global.h REGRESSION opt_global.h RESTARTABLE_PANICS opt_global.h VFS_BIO_DEBUG opt_global.h -MSIZE opt_global.h -MCLSHIFT opt_global.h # These are VM related options VM_KMEM_SIZE opt_vm.h ==== //depot/projects/pmap/sys/dev/isp/isp_freebsd.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.80 2002/07/08 17:42:47 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.81 2002/07/11 03:25:04 mjacob Exp $ */ /* * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. * @@ -34,6 +34,9 @@ #include +int isp_announced = 0; +ispfwfunc *isp_get_firmware_p = NULL; + static d_ioctl_t ispioctl; static void isp_intr_enable(void *); static void isp_cam_async(void *, u_int32_t, struct cam_path *, void *); @@ -2075,7 +2078,6 @@ } cv_signal(&isp->isp_osinfo.kthread_cv); isp_freeze_loopdown(isp, "isp_action(RQLATER)"); - isp->isp_osinfo.simqfrozen |= SIMQFRZ_LOOPDOWN; XS_SETERR(ccb, CAM_REQUEUE_REQ); ISPLOCK_2_CAMLOCK(isp); xpt_done(ccb); ==== //depot/projects/pmap/sys/dev/isp/isp_freebsd.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.65 2002/07/08 17:48:39 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.66 2002/07/11 03:25:04 mjacob Exp $ */ /* * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob @@ -365,6 +365,11 @@ extern void isp_uninit(struct ispsoftc *); /* + * driver global data + */ +extern int isp_announced; + +/* * Platform private flags */ #define ISP_SPRIV_ERRSET 0x1 ==== //depot/projects/pmap/sys/dev/isp/isp_inline.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_inline.h,v 1.26 2002/06/16 05:00:20 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_inline.h,v 1.27 2002/07/11 03:25:04 mjacob Exp $ */ /* * Qlogic Host Adapter Inline Functions * @@ -31,6 +31,7 @@ */ #ifndef _ISP_INLINE_H #define _ISP_INLINE_H + /* * Handle Functions. * For each outstanding command there will be a non-zero handle. ==== //depot/projects/pmap/sys/dev/isp/isp_pci.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.83 2002/07/08 17:34:32 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.84 2002/07/11 03:25:04 mjacob Exp $ */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. * FreeBSD Version. @@ -62,10 +62,6 @@ static void isp_pci_reset1(struct ispsoftc *); static void isp_pci_dumpregs(struct ispsoftc *, const char *); -#ifndef ISP_CODE_ORG -#define ISP_CODE_ORG 0x1000 -#endif - static struct ispmdvec mdvec = { isp_pci_rd_isr, isp_pci_rd_reg, @@ -266,7 +262,7 @@ bus_dma_tag_t dmat; bus_dmamap_t *dmaps; }; -ispfwfunc *isp_get_firmware_p = NULL; +extern ispfwfunc *isp_get_firmware_p; static device_method_t isp_pci_methods[] = { /* Device interface */ @@ -281,7 +277,6 @@ }; static devclass_t isp_devclass; DRIVER_MODULE(isp, pci, isp_pci_driver, isp_devclass, 0, 0); -MODULE_VERSION(isp, 1); static int isp_pci_probe(device_t dev) @@ -320,11 +315,12 @@ default: return (ENXIO); } - if (device_get_unit(dev) == 0 && bootverbose) { + if (isp_announced == 0 && bootverbose) { printf("Qlogic ISP Driver, FreeBSD Version %d.%d, " "Core Version %d.%d\n", ISP_PLATFORM_VERSION_MAJOR, ISP_PLATFORM_VERSION_MINOR, ISP_CORE_VERSION_MAJOR, ISP_CORE_VERSION_MINOR); + isp_announced++; } /* * XXXX: Here is where we might load the f/w module @@ -689,7 +685,6 @@ } isp_debug = 0; - isp_debug = 0; (void) resource_int_value(device_get_name(dev), device_get_unit(dev), "debug", &isp_debug); ==== //depot/projects/pmap/sys/dev/ispfw/ispfw.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.7 2002/03/20 02:07:25 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.8 2002/07/11 01:55:15 mjacob Exp $ */ /* * ISP Firmware Helper Pseudo Device for FreeBSD * @@ -37,6 +37,9 @@ #include #include #include +#if _MACHINE_ARCH == sparc64 +#include +#endif #define ISPFW_VERSION 0 @@ -49,6 +52,9 @@ #define PCI_PRODUCT_QLOGIC_ISP2200 0x2200 #define PCI_PRODUCT_QLOGIC_ISP2300 0x2300 #define PCI_PRODUCT_QLOGIC_ISP2312 0x2312 +#if _MACHINE_ARCH == sparc64 +#define SBUS_PRODUCT_QLOGIC_ISP1000 0x1000 +#endif typedef void ispfwfunc(int, int, int, const u_int16_t **); extern ispfwfunc *isp_get_firmware_p; @@ -119,6 +125,13 @@ case PCI_PRODUCT_QLOGIC_ISP2312: rp = isp_2300_risc_code; break; +#if _MACHINE_ARCH == sparc64 + case SBUS_PRODUCT_QLOGIC_ISP1000: + if (tgtmode) + break; + rp = isp_1000_risc_code; + break; +#endif default: break; } ==== //depot/projects/pmap/sys/kern/kern_fork.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_fork.c 8.6 (Berkeley) 4/8/94 - * $FreeBSD: src/sys/kern/kern_fork.c,v 1.151 2002/06/29 17:26:18 julian Exp $ + * $FreeBSD: src/sys/kern/kern_fork.c,v 1.152 2002/07/11 02:18:33 mini Exp $ */ #include "opt_ktrace.h" @@ -875,6 +875,9 @@ kthread_exit(0); } PROC_UNLOCK(p); +#ifdef DIAGNOSTIC + cred_free_thread(td); +#endif mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/pmap/sys/kern/kern_prot.c#8 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_prot.c,v 1.160 2002/06/29 01:50:25 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_prot.c,v 1.161 2002/07/11 02:18:33 mini Exp $ */ /* @@ -1765,6 +1765,19 @@ return (newcr); } +#ifdef DIAGNOSTIC +void +cred_free_thread(struct thread *td) +{ + struct ucred *cred; + + cred = td->td_ucred; + td->td_ucred = NULL; + if (cred != NULL) + crfree(cred); +} +#endif + /* * Fill in a struct xucred based on a struct ucred. */ ==== //depot/projects/pmap/sys/kern/subr_trap.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/kern/subr_trap.c,v 1.220 2002/07/10 06:40:22 julian Exp $ + * $FreeBSD: src/sys/kern/subr_trap.c,v 1.221 2002/07/11 02:18:33 mini Exp $ */ #ifdef __i386__ @@ -236,5 +236,8 @@ } userret(td, framep, sticks); +#ifdef DIAGNOSTIC + cred_free_thread(td); +#endif mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/pmap/sys/sys/cdefs.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)cdefs.h 8.8 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/cdefs.h,v 1.56 2002/07/08 16:43:35 mike Exp $ + * $FreeBSD: src/sys/sys/cdefs.h,v 1.57 2002/07/11 02:51:02 dillon Exp $ */ #ifndef _SYS_CDEFS_H_ @@ -175,7 +175,7 @@ #endif /* Compiler-dependent macros that rely on FreeBSD-specific extensions. */ -#if __FreeBSD_cc_version >= 300001 +#if __FreeBSD_cc_version >= 300001 && __FreeBSD_cc_version < 500003 #define __printf0like(fmtarg, firstvararg) \ __attribute__((__format__ (__printf0__, fmtarg, firstvararg))) #else @@ -240,7 +240,7 @@ * Embed the rcs id of a source file in the resulting library. Note that in * more recent ELF binutils, we use .ident allowing the ID to be stripped. * Usage: - * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.56 2002/07/08 16:43:35 mike Exp $"); + * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.57 2002/07/11 02:51:02 dillon Exp $"); */ #ifndef __FBSDID #if !defined(lint) && !defined(STRIP_FBSDID) ==== //depot/projects/pmap/sys/vm/vm_kern.c#3 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_kern.c,v 1.81 2002/06/23 18:07:40 alc Exp $ + * $FreeBSD: src/sys/vm/vm_kern.c,v 1.82 2002/07/11 02:39:24 alc Exp $ */ /* @@ -473,10 +473,10 @@ vm_map_unlock(map); return (0); } - vm_map_unlock(map); - tsleep(map, PVM, "kmaw", 0); + map->needs_wakeup = TRUE; + vm_map_unlock_and_wait(map, FALSE); } - vm_map_insert(map, NULL, (vm_offset_t) 0, addr, addr + size, VM_PROT_ALL, VM_PROT_ALL, 0); + vm_map_insert(map, NULL, 0, addr, addr + size, VM_PROT_ALL, VM_PROT_ALL, 0); vm_map_unlock(map); return (addr); } @@ -497,7 +497,10 @@ vm_map_lock(map); (void) vm_map_delete(map, trunc_page(addr), round_page(addr + size)); - wakeup(map); + if (map->needs_wakeup) { + map->needs_wakeup = FALSE; + vm_map_wakeup(map); + } vm_map_unlock(map); } ==== //depot/projects/pmap/sys/vm/vm_map.c#5 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.c,v 1.260 2002/07/03 19:16:37 alc Exp $ + * $FreeBSD: src/sys/vm/vm_map.c,v 1.261 2002/07/11 02:39:24 alc Exp $ */ /* @@ -418,7 +418,7 @@ /* * vm_map_unlock_and_wait: */ -static __inline int +int vm_map_unlock_and_wait(vm_map_t map, boolean_t user_wait) { int retval; @@ -433,7 +433,7 @@ /* * vm_map_wakeup: */ -static __inline void +void vm_map_wakeup(vm_map_t map) { @@ -482,6 +482,7 @@ { map->header.next = map->header.prev = &map->header; + map->needs_wakeup = FALSE; map->system_map = 0; map->min_offset = min; map->max_offset = max; ==== //depot/projects/pmap/sys/vm/vm_map.h#4 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.h,v 1.88 2002/06/25 18:14:38 alc Exp $ + * $FreeBSD: src/sys/vm/vm_map.h,v 1.89 2002/07/11 02:39:24 alc Exp $ */ /* @@ -164,6 +164,7 @@ struct lock lock; /* Lock for map data */ int nentries; /* Number of entries */ vm_size_t size; /* virtual size */ + u_char needs_wakeup; u_char system_map; /* Am I a system map? */ u_char infork; /* Am I in fork processing? */ vm_map_entry_t root; @@ -245,6 +246,8 @@ int _vm_map_trylock(vm_map_t map, const char *file, int line); int _vm_map_lock_upgrade(vm_map_t map, const char *file, int line); void _vm_map_lock_downgrade(vm_map_t map, const char *file, int line); +int vm_map_unlock_and_wait(vm_map_t map, boolean_t user_wait); +void vm_map_wakeup(vm_map_t map); #define vm_map_lock(map) _vm_map_lock(map, LOCK_FILE, LOCK_LINE) #define vm_map_unlock(map) _vm_map_unlock(map, LOCK_FILE, LOCK_LINE) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 11 7:14:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB63537B401; Thu, 11 Jul 2002 07:14:11 -0700 (PDT) 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 7017A37B400 for ; Thu, 11 Jul 2002 07:14:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33B3A43E42 for ; Thu, 11 Jul 2002 07:14:11 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6BEEBJU029528 for ; Thu, 11 Jul 2002 07:14:11 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6BEEAiL029525 for perforce@freebsd.org; Thu, 11 Jul 2002 07:14:10 -0700 (PDT) Date: Thu, 11 Jul 2002 07:14:10 -0700 (PDT) Message-Id: <200207111414.g6BEEAiL029525@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 14089 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14089 Change 14089 by cvance@cvance_laptop on 2002/07/11 07:14:02 Minor tweaking Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/types.fc#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/types.fc#3 (text+ko) ==== @@ -46,7 +46,7 @@ # # The policy configuration. # -/ss_policy system_u:object_r:policy_config_t +/etc/security/sebsd/policy.* system_u:object_r:policy_config_t # # /var @@ -88,6 +88,7 @@ /bin(/.*)? system_u:object_r:bin_t /bin/tcsh system_u:object_r:shell_exec_t /bin/bash system_u:object_r:shell_exec_t +/bin/sh system_u:object_r:shell_exec_t /bin/ash system_u:object_r:shell_exec_t /bin/ls system_u:object_r:ls_exec_t @@ -144,7 +145,7 @@ /etc/adjtime system_u:object_r:adjtime_t /etc/mrtg(/.*)? system_u:object_r:etc_mrtg_t /etc/selinux(/.*)? system_u:object_r:policy_src_t -/etc/security/selinux(/.*)? system_u:object_r:policy_config_t +/etc/security/sebsd(/.*)? system_u:object_r:policy_config_t # # /lib To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 11 8: 0:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABEB137B406; Thu, 11 Jul 2002 08:00:10 -0700 (PDT) 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 52C6D37B401 for ; Thu, 11 Jul 2002 08:00:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 45B4343E77 for ; Thu, 11 Jul 2002 08:00:08 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6BF07JU034041 for ; Thu, 11 Jul 2002 08:00:07 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6BF0720034038 for perforce@freebsd.org; Thu, 11 Jul 2002 08:00:07 -0700 (PDT) Date: Thu, 11 Jul 2002 08:00:07 -0700 (PDT) Message-Id: <200207111500.g6BF0720034038@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14091 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14091 Change 14091 by green@green_laptop_2 on 2002/07/11 07:59:09 Display the mount point and inode for corrupted labels. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#163 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#163 (text+ko) ==== @@ -936,16 +936,23 @@ if (error == 0) error = mac_update_vnode_from_externalized(vp, &extmac); if (error) { + struct vattr va; + + printf("Corrupted label on %s", + vp->v_mount->mnt_stat.f_mntonname); + if (VOP_GETATTR(vp, &va, curthread->td_ucred, curthread) == 0) + printf(" inum %ld", va.va_fileid); if (mac_debug_label_fallback) { - printf("Corrupted label, falling back.\n"); + printf(", falling back.\n"); mac_update_vnode_from_mount(vp, vp->v_mount); + error = 0; } else { - printf("Corrupted label\n"); + printf(".\n"); error = EPERM; } } - return (0); + return (error); } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 11 11:47:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA83537B406; Thu, 11 Jul 2002 11:46:02 -0700 (PDT) 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 1015437B401 for ; Thu, 11 Jul 2002 11:46:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 218C943E67 for ; Thu, 11 Jul 2002 11:45:58 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6BIjvJU083352 for ; Thu, 11 Jul 2002 11:45:57 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6BIji27083296 for perforce@freebsd.org; Thu, 11 Jul 2002 11:45:44 -0700 (PDT) Date: Thu, 11 Jul 2002 11:45:44 -0700 (PDT) Message-Id: <200207111845.g6BIji27083296@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" Subject: PERFORCE change 14098 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14098 Change 14098 by obrien@obrien_trang on 2002/07/11 11:42:39 Initial sync with FreeBSD "vendor" sources. Affected files ... .. //depot/projects/s390/COPYRIGHT#1 branch .. //depot/projects/s390/MAINTAINERS#1 branch .. //depot/projects/s390/Makefile#1 branch .. //depot/projects/s390/Makefile.inc1#1 branch .. //depot/projects/s390/Makefile.upgrade#1 branch .. //depot/projects/s390/README#1 branch .. //depot/projects/s390/UPDATING#1 branch .. //depot/projects/s390/bin/Makefile#1 branch .. //depot/projects/s390/bin/Makefile.inc#1 branch .. //depot/projects/s390/bin/cat/Makefile#1 branch .. //depot/projects/s390/bin/cat/cat.1#1 branch .. //depot/projects/s390/bin/cat/cat.c#1 branch .. //depot/projects/s390/bin/chio/Makefile#1 branch .. //depot/projects/s390/bin/chio/chio.1#1 branch .. //depot/projects/s390/bin/chio/chio.c#1 branch .. //depot/projects/s390/bin/chio/defs.h#1 branch .. //depot/projects/s390/bin/chio/pathnames.h#1 branch .. //depot/projects/s390/bin/chmod/Makefile#1 branch .. //depot/projects/s390/bin/chmod/chmod.1#1 branch .. //depot/projects/s390/bin/chmod/chmod.c#1 branch .. //depot/projects/s390/bin/cp/Makefile#1 branch .. //depot/projects/s390/bin/cp/cp.1#1 branch .. //depot/projects/s390/bin/cp/cp.c#1 branch .. //depot/projects/s390/bin/cp/extern.h#1 branch .. //depot/projects/s390/bin/cp/utils.c#1 branch .. //depot/projects/s390/bin/csh/Makefile#1 branch .. //depot/projects/s390/bin/csh/USD.doc/Makefile#1 branch .. //depot/projects/s390/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/s390/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/s390/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/s390/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/s390/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/s390/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/s390/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/s390/bin/csh/config.h#1 branch .. //depot/projects/s390/bin/csh/host.defs#1 branch .. //depot/projects/s390/bin/date/Makefile#1 branch .. //depot/projects/s390/bin/date/date.1#1 branch .. //depot/projects/s390/bin/date/date.c#1 branch .. //depot/projects/s390/bin/date/extern.h#1 branch .. //depot/projects/s390/bin/date/netdate.c#1 branch .. //depot/projects/s390/bin/date/vary.c#1 branch .. //depot/projects/s390/bin/date/vary.h#1 branch .. //depot/projects/s390/bin/dd/Makefile#1 branch .. //depot/projects/s390/bin/dd/args.c#1 branch .. //depot/projects/s390/bin/dd/conv.c#1 branch .. //depot/projects/s390/bin/dd/conv_tab.c#1 branch .. //depot/projects/s390/bin/dd/dd.1#1 branch .. //depot/projects/s390/bin/dd/dd.c#1 branch .. //depot/projects/s390/bin/dd/dd.h#1 branch .. //depot/projects/s390/bin/dd/extern.h#1 branch .. //depot/projects/s390/bin/dd/misc.c#1 branch .. //depot/projects/s390/bin/dd/position.c#1 branch .. //depot/projects/s390/bin/df/Makefile#1 branch .. //depot/projects/s390/bin/df/df.1#1 branch .. //depot/projects/s390/bin/df/df.c#1 branch .. //depot/projects/s390/bin/domainname/Makefile#1 branch .. //depot/projects/s390/bin/domainname/domainname.1#1 branch .. //depot/projects/s390/bin/domainname/domainname.c#1 branch .. //depot/projects/s390/bin/echo/Makefile#1 branch .. //depot/projects/s390/bin/echo/echo.1#1 branch .. //depot/projects/s390/bin/echo/echo.c#1 branch .. //depot/projects/s390/bin/ed/Makefile#1 branch .. //depot/projects/s390/bin/ed/POSIX#1 branch .. //depot/projects/s390/bin/ed/README#1 branch .. //depot/projects/s390/bin/ed/buf.c#1 branch .. //depot/projects/s390/bin/ed/cbc.c#1 branch .. //depot/projects/s390/bin/ed/ed.1#1 branch .. //depot/projects/s390/bin/ed/ed.h#1 branch .. //depot/projects/s390/bin/ed/glbl.c#1 branch .. //depot/projects/s390/bin/ed/io.c#1 branch .. //depot/projects/s390/bin/ed/main.c#1 branch .. //depot/projects/s390/bin/ed/re.c#1 branch .. //depot/projects/s390/bin/ed/sub.c#1 branch .. //depot/projects/s390/bin/ed/test/=.err#1 branch .. //depot/projects/s390/bin/ed/test/Makefile#1 branch .. //depot/projects/s390/bin/ed/test/README#1 branch .. //depot/projects/s390/bin/ed/test/TODO#1 branch .. //depot/projects/s390/bin/ed/test/a.d#1 branch .. //depot/projects/s390/bin/ed/test/a.r#1 branch .. //depot/projects/s390/bin/ed/test/a.t#1 branch .. //depot/projects/s390/bin/ed/test/a1.err#1 branch .. //depot/projects/s390/bin/ed/test/a2.err#1 branch .. //depot/projects/s390/bin/ed/test/addr.d#1 branch .. //depot/projects/s390/bin/ed/test/addr.r#1 branch .. //depot/projects/s390/bin/ed/test/addr.t#1 branch .. //depot/projects/s390/bin/ed/test/addr1.err#1 branch .. //depot/projects/s390/bin/ed/test/addr2.err#1 branch .. //depot/projects/s390/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/s390/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/s390/bin/ed/test/ascii.t#1 branch .. //depot/projects/s390/bin/ed/test/bang1.d#1 branch .. //depot/projects/s390/bin/ed/test/bang1.err#1 branch .. //depot/projects/s390/bin/ed/test/bang1.r#1 branch .. //depot/projects/s390/bin/ed/test/bang1.t#1 branch .. //depot/projects/s390/bin/ed/test/bang2.err#1 branch .. //depot/projects/s390/bin/ed/test/c.d#1 branch .. //depot/projects/s390/bin/ed/test/c.r#1 branch .. //depot/projects/s390/bin/ed/test/c.t#1 branch .. //depot/projects/s390/bin/ed/test/c1.err#1 branch .. //depot/projects/s390/bin/ed/test/c2.err#1 branch .. //depot/projects/s390/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/s390/bin/ed/test/d.d#1 branch .. //depot/projects/s390/bin/ed/test/d.err#1 branch .. //depot/projects/s390/bin/ed/test/d.r#1 branch .. //depot/projects/s390/bin/ed/test/d.t#1 branch .. //depot/projects/s390/bin/ed/test/e1.d#1 branch .. //depot/projects/s390/bin/ed/test/e1.err#1 branch .. //depot/projects/s390/bin/ed/test/e1.r#1 branch .. //depot/projects/s390/bin/ed/test/e1.t#1 branch .. //depot/projects/s390/bin/ed/test/e2.d#1 branch .. //depot/projects/s390/bin/ed/test/e2.err#1 branch .. //depot/projects/s390/bin/ed/test/e2.r#1 branch .. //depot/projects/s390/bin/ed/test/e2.t#1 branch .. //depot/projects/s390/bin/ed/test/e3.d#1 branch .. //depot/projects/s390/bin/ed/test/e3.err#1 branch .. //depot/projects/s390/bin/ed/test/e3.r#1 branch .. //depot/projects/s390/bin/ed/test/e3.t#1 branch .. //depot/projects/s390/bin/ed/test/e4.d#1 branch .. //depot/projects/s390/bin/ed/test/e4.r#1 branch .. //depot/projects/s390/bin/ed/test/e4.t#1 branch .. //depot/projects/s390/bin/ed/test/f1.err#1 branch .. //depot/projects/s390/bin/ed/test/f2.err#1 branch .. //depot/projects/s390/bin/ed/test/g1.d#1 branch .. //depot/projects/s390/bin/ed/test/g1.err#1 branch .. //depot/projects/s390/bin/ed/test/g1.r#1 branch .. //depot/projects/s390/bin/ed/test/g1.t#1 branch .. //depot/projects/s390/bin/ed/test/g2.d#1 branch .. //depot/projects/s390/bin/ed/test/g2.err#1 branch .. //depot/projects/s390/bin/ed/test/g2.r#1 branch .. //depot/projects/s390/bin/ed/test/g2.t#1 branch .. //depot/projects/s390/bin/ed/test/g3.d#1 branch .. //depot/projects/s390/bin/ed/test/g3.err#1 branch .. //depot/projects/s390/bin/ed/test/g3.r#1 branch .. //depot/projects/s390/bin/ed/test/g3.t#1 branch .. //depot/projects/s390/bin/ed/test/g4.d#1 branch .. //depot/projects/s390/bin/ed/test/g4.r#1 branch .. //depot/projects/s390/bin/ed/test/g4.t#1 branch .. //depot/projects/s390/bin/ed/test/g5.d#1 branch .. //depot/projects/s390/bin/ed/test/g5.r#1 branch .. //depot/projects/s390/bin/ed/test/g5.t#1 branch .. //depot/projects/s390/bin/ed/test/h.err#1 branch .. //depot/projects/s390/bin/ed/test/i.d#1 branch .. //depot/projects/s390/bin/ed/test/i.r#1 branch .. //depot/projects/s390/bin/ed/test/i.t#1 branch .. //depot/projects/s390/bin/ed/test/i1.err#1 branch .. //depot/projects/s390/bin/ed/test/i2.err#1 branch .. //depot/projects/s390/bin/ed/test/i3.err#1 branch .. //depot/projects/s390/bin/ed/test/j.d#1 branch .. //depot/projects/s390/bin/ed/test/j.r#1 branch .. //depot/projects/s390/bin/ed/test/j.t#1 branch .. //depot/projects/s390/bin/ed/test/k.d#1 branch .. //depot/projects/s390/bin/ed/test/k.r#1 branch .. //depot/projects/s390/bin/ed/test/k.t#1 branch .. //depot/projects/s390/bin/ed/test/k1.err#1 branch .. //depot/projects/s390/bin/ed/test/k2.err#1 branch .. //depot/projects/s390/bin/ed/test/k3.err#1 branch .. //depot/projects/s390/bin/ed/test/k4.err#1 branch .. //depot/projects/s390/bin/ed/test/l.d#1 branch .. //depot/projects/s390/bin/ed/test/l.r#1 branch .. //depot/projects/s390/bin/ed/test/l.t#1 branch .. //depot/projects/s390/bin/ed/test/m.d#1 branch .. //depot/projects/s390/bin/ed/test/m.err#1 branch .. //depot/projects/s390/bin/ed/test/m.r#1 branch .. //depot/projects/s390/bin/ed/test/m.t#1 branch .. //depot/projects/s390/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/s390/bin/ed/test/n.d#1 branch .. //depot/projects/s390/bin/ed/test/n.r#1 branch .. //depot/projects/s390/bin/ed/test/n.t#1 branch .. //depot/projects/s390/bin/ed/test/nl.err#1 branch .. //depot/projects/s390/bin/ed/test/nl1.d#1 branch .. //depot/projects/s390/bin/ed/test/nl1.r#1 branch .. //depot/projects/s390/bin/ed/test/nl1.t#1 branch .. //depot/projects/s390/bin/ed/test/nl2.d#1 branch .. //depot/projects/s390/bin/ed/test/nl2.r#1 branch .. //depot/projects/s390/bin/ed/test/nl2.t#1 branch .. //depot/projects/s390/bin/ed/test/p.d#1 branch .. //depot/projects/s390/bin/ed/test/p.r#1 branch .. //depot/projects/s390/bin/ed/test/p.t#1 branch .. //depot/projects/s390/bin/ed/test/q.d#1 branch .. //depot/projects/s390/bin/ed/test/q.r#1 branch .. //depot/projects/s390/bin/ed/test/q.t#1 branch .. //depot/projects/s390/bin/ed/test/q1.err#1 branch .. //depot/projects/s390/bin/ed/test/r1.d#1 branch .. //depot/projects/s390/bin/ed/test/r1.err#1 branch .. //depot/projects/s390/bin/ed/test/r1.r#1 branch .. //depot/projects/s390/bin/ed/test/r1.t#1 branch .. //depot/projects/s390/bin/ed/test/r2.d#1 branch .. //depot/projects/s390/bin/ed/test/r2.err#1 branch .. //depot/projects/s390/bin/ed/test/r2.r#1 branch .. //depot/projects/s390/bin/ed/test/r2.t#1 branch .. //depot/projects/s390/bin/ed/test/r3.d#1 branch .. //depot/projects/s390/bin/ed/test/r3.r#1 branch .. //depot/projects/s390/bin/ed/test/r3.t#1 branch .. //depot/projects/s390/bin/ed/test/s1.d#1 branch .. //depot/projects/s390/bin/ed/test/s1.err#1 branch .. //depot/projects/s390/bin/ed/test/s1.r#1 branch .. //depot/projects/s390/bin/ed/test/s1.t#1 branch .. //depot/projects/s390/bin/ed/test/s10.err#1 branch .. //depot/projects/s390/bin/ed/test/s2.d#1 branch .. //depot/projects/s390/bin/ed/test/s2.err#1 branch .. //depot/projects/s390/bin/ed/test/s2.r#1 branch .. //depot/projects/s390/bin/ed/test/s2.t#1 branch .. //depot/projects/s390/bin/ed/test/s3.d#1 branch .. //depot/projects/s390/bin/ed/test/s3.err#1 branch .. //depot/projects/s390/bin/ed/test/s3.r#1 branch .. //depot/projects/s390/bin/ed/test/s3.t#1 branch .. //depot/projects/s390/bin/ed/test/s4.err#1 branch .. //depot/projects/s390/bin/ed/test/s5.err#1 branch .. //depot/projects/s390/bin/ed/test/s6.err#1 branch .. //depot/projects/s390/bin/ed/test/s7.err#1 branch .. //depot/projects/s390/bin/ed/test/s8.err#1 branch .. //depot/projects/s390/bin/ed/test/s9.err#1 branch .. //depot/projects/s390/bin/ed/test/t.d#1 branch .. //depot/projects/s390/bin/ed/test/t.r#1 branch .. //depot/projects/s390/bin/ed/test/t1.d#1 branch .. //depot/projects/s390/bin/ed/test/t1.err#1 branch .. //depot/projects/s390/bin/ed/test/t1.r#1 branch .. //depot/projects/s390/bin/ed/test/t1.t#1 branch .. //depot/projects/s390/bin/ed/test/t2.d#1 branch .. //depot/projects/s390/bin/ed/test/t2.err#1 branch .. //depot/projects/s390/bin/ed/test/t2.r#1 branch .. //depot/projects/s390/bin/ed/test/t2.t#1 branch .. //depot/projects/s390/bin/ed/test/u.d#1 branch .. //depot/projects/s390/bin/ed/test/u.err#1 branch .. //depot/projects/s390/bin/ed/test/u.r#1 branch .. //depot/projects/s390/bin/ed/test/u.t#1 branch .. //depot/projects/s390/bin/ed/test/v.d#1 branch .. //depot/projects/s390/bin/ed/test/v.r#1 branch .. //depot/projects/s390/bin/ed/test/v.t#1 branch .. //depot/projects/s390/bin/ed/test/w.d#1 branch .. //depot/projects/s390/bin/ed/test/w.r#1 branch .. //depot/projects/s390/bin/ed/test/w.t#1 branch .. //depot/projects/s390/bin/ed/test/w1.err#1 branch .. //depot/projects/s390/bin/ed/test/w2.err#1 branch .. //depot/projects/s390/bin/ed/test/w3.err#1 branch .. //depot/projects/s390/bin/ed/test/x.err#1 branch .. //depot/projects/s390/bin/ed/test/z.err#1 branch .. //depot/projects/s390/bin/ed/undo.c#1 branch .. //depot/projects/s390/bin/expr/Makefile#1 branch .. //depot/projects/s390/bin/expr/expr.1#1 branch .. //depot/projects/s390/bin/expr/expr.y#1 branch .. //depot/projects/s390/bin/getfacl/Makefile#1 branch .. //depot/projects/s390/bin/getfacl/getfacl.1#1 branch .. //depot/projects/s390/bin/getfacl/getfacl.c#1 branch .. //depot/projects/s390/bin/hostname/Makefile#1 branch .. //depot/projects/s390/bin/hostname/hostname.1#1 branch .. //depot/projects/s390/bin/hostname/hostname.c#1 branch .. //depot/projects/s390/bin/kill/Makefile#1 branch .. //depot/projects/s390/bin/kill/kill.1#1 branch .. //depot/projects/s390/bin/kill/kill.c#1 branch .. //depot/projects/s390/bin/ln/Makefile#1 branch .. //depot/projects/s390/bin/ln/ln.1#1 branch .. //depot/projects/s390/bin/ln/ln.c#1 branch .. //depot/projects/s390/bin/ln/symlink.7#1 branch .. //depot/projects/s390/bin/ls/Makefile#1 branch .. //depot/projects/s390/bin/ls/cmp.c#1 branch .. //depot/projects/s390/bin/ls/extern.h#1 branch .. //depot/projects/s390/bin/ls/lomac.c#1 branch .. //depot/projects/s390/bin/ls/lomac.h#1 branch .. //depot/projects/s390/bin/ls/ls.1#1 branch .. //depot/projects/s390/bin/ls/ls.c#1 branch .. //depot/projects/s390/bin/ls/ls.h#1 branch .. //depot/projects/s390/bin/ls/print.c#1 branch .. //depot/projects/s390/bin/ls/util.c#1 branch .. //depot/projects/s390/bin/mkdir/Makefile#1 branch .. //depot/projects/s390/bin/mkdir/mkdir.1#1 branch .. //depot/projects/s390/bin/mkdir/mkdir.c#1 branch .. //depot/projects/s390/bin/mv/Makefile#1 branch .. //depot/projects/s390/bin/mv/mv.1#1 branch .. //depot/projects/s390/bin/mv/mv.c#1 branch .. //depot/projects/s390/bin/mv/pathnames.h#1 branch .. //depot/projects/s390/bin/pax/Makefile#1 branch .. //depot/projects/s390/bin/pax/ar_io.c#1 branch .. //depot/projects/s390/bin/pax/ar_subs.c#1 branch .. //depot/projects/s390/bin/pax/buf_subs.c#1 branch .. //depot/projects/s390/bin/pax/cache.c#1 branch .. //depot/projects/s390/bin/pax/cache.h#1 branch .. //depot/projects/s390/bin/pax/cpio.1#1 branch .. //depot/projects/s390/bin/pax/cpio.c#1 branch .. //depot/projects/s390/bin/pax/cpio.h#1 branch .. //depot/projects/s390/bin/pax/extern.h#1 branch .. //depot/projects/s390/bin/pax/file_subs.c#1 branch .. //depot/projects/s390/bin/pax/ftree.c#1 branch .. //depot/projects/s390/bin/pax/ftree.h#1 branch .. //depot/projects/s390/bin/pax/gen_subs.c#1 branch .. //depot/projects/s390/bin/pax/getoldopt.c#1 branch .. //depot/projects/s390/bin/pax/options.c#1 branch .. //depot/projects/s390/bin/pax/options.h#1 branch .. //depot/projects/s390/bin/pax/pat_rep.c#1 branch .. //depot/projects/s390/bin/pax/pat_rep.h#1 branch .. //depot/projects/s390/bin/pax/pax.1#1 branch .. //depot/projects/s390/bin/pax/pax.c#1 branch .. //depot/projects/s390/bin/pax/pax.h#1 branch .. //depot/projects/s390/bin/pax/sel_subs.c#1 branch .. //depot/projects/s390/bin/pax/sel_subs.h#1 branch .. //depot/projects/s390/bin/pax/tables.c#1 branch .. //depot/projects/s390/bin/pax/tables.h#1 branch .. //depot/projects/s390/bin/pax/tar.1#1 branch .. //depot/projects/s390/bin/pax/tar.c#1 branch .. //depot/projects/s390/bin/pax/tar.h#1 branch .. //depot/projects/s390/bin/pax/tty_subs.c#1 branch .. //depot/projects/s390/bin/ps/Makefile#1 branch .. //depot/projects/s390/bin/ps/extern.h#1 branch .. //depot/projects/s390/bin/ps/fmt.c#1 branch .. //depot/projects/s390/bin/ps/keyword.c#1 branch .. //depot/projects/s390/bin/ps/lomac.c#1 branch .. //depot/projects/s390/bin/ps/lomac.h#1 branch .. //depot/projects/s390/bin/ps/nlist.c#1 branch .. //depot/projects/s390/bin/ps/print.c#1 branch .. //depot/projects/s390/bin/ps/ps.1#1 branch .. //depot/projects/s390/bin/ps/ps.c#1 branch .. //depot/projects/s390/bin/ps/ps.h#1 branch .. //depot/projects/s390/bin/pwd/Makefile#1 branch .. //depot/projects/s390/bin/pwd/pwd.1#1 branch .. //depot/projects/s390/bin/pwd/pwd.c#1 branch .. //depot/projects/s390/bin/rcp/Makefile#1 branch .. //depot/projects/s390/bin/rcp/extern.h#1 branch .. //depot/projects/s390/bin/rcp/rcp.1#1 branch .. //depot/projects/s390/bin/rcp/rcp.c#1 branch .. //depot/projects/s390/bin/rcp/util.c#1 branch .. //depot/projects/s390/bin/realpath/Makefile#1 branch .. //depot/projects/s390/bin/realpath/realpath.1#1 branch .. //depot/projects/s390/bin/realpath/realpath.c#1 branch .. //depot/projects/s390/bin/rm/Makefile#1 branch .. //depot/projects/s390/bin/rm/rm.1#1 branch .. //depot/projects/s390/bin/rm/rm.c#1 branch .. //depot/projects/s390/bin/rmail/Makefile#1 branch .. //depot/projects/s390/bin/rmdir/Makefile#1 branch .. //depot/projects/s390/bin/rmdir/rmdir.1#1 branch .. //depot/projects/s390/bin/rmdir/rmdir.c#1 branch .. //depot/projects/s390/bin/setfacl/Makefile#1 branch .. //depot/projects/s390/bin/setfacl/file.c#1 branch .. //depot/projects/s390/bin/setfacl/mask.c#1 branch .. //depot/projects/s390/bin/setfacl/merge.c#1 branch .. //depot/projects/s390/bin/setfacl/remove.c#1 branch .. //depot/projects/s390/bin/setfacl/setfacl.1#1 branch .. //depot/projects/s390/bin/setfacl/setfacl.c#1 branch .. //depot/projects/s390/bin/setfacl/setfacl.h#1 branch .. //depot/projects/s390/bin/setfacl/util.c#1 branch .. //depot/projects/s390/bin/sh/Makefile#1 branch .. //depot/projects/s390/bin/sh/TOUR#1 branch .. //depot/projects/s390/bin/sh/alias.c#1 branch .. //depot/projects/s390/bin/sh/alias.h#1 branch .. //depot/projects/s390/bin/sh/arith.h#1 branch .. //depot/projects/s390/bin/sh/arith.y#1 branch .. //depot/projects/s390/bin/sh/arith_lex.l#1 branch .. //depot/projects/s390/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/s390/bin/sh/bltin/echo.1#1 branch .. //depot/projects/s390/bin/sh/bltin/echo.c#1 branch .. //depot/projects/s390/bin/sh/builtins.def#1 branch .. //depot/projects/s390/bin/sh/cd.c#1 branch .. //depot/projects/s390/bin/sh/cd.h#1 branch .. //depot/projects/s390/bin/sh/error.c#1 branch .. //depot/projects/s390/bin/sh/error.h#1 branch .. //depot/projects/s390/bin/sh/eval.c#1 branch .. //depot/projects/s390/bin/sh/eval.h#1 branch .. //depot/projects/s390/bin/sh/exec.c#1 branch .. //depot/projects/s390/bin/sh/exec.h#1 branch .. //depot/projects/s390/bin/sh/expand.c#1 branch .. //depot/projects/s390/bin/sh/expand.h#1 branch .. //depot/projects/s390/bin/sh/funcs/cmv#1 branch .. //depot/projects/s390/bin/sh/funcs/dirs#1 branch .. //depot/projects/s390/bin/sh/funcs/kill#1 branch .. //depot/projects/s390/bin/sh/funcs/login#1 branch .. //depot/projects/s390/bin/sh/funcs/newgrp#1 branch .. //depot/projects/s390/bin/sh/funcs/popd#1 branch .. //depot/projects/s390/bin/sh/funcs/pushd#1 branch .. //depot/projects/s390/bin/sh/funcs/suspend#1 branch .. //depot/projects/s390/bin/sh/histedit.c#1 branch .. //depot/projects/s390/bin/sh/init.h#1 branch .. //depot/projects/s390/bin/sh/input.c#1 branch .. //depot/projects/s390/bin/sh/input.h#1 branch .. //depot/projects/s390/bin/sh/jobs.c#1 branch .. //depot/projects/s390/bin/sh/jobs.h#1 branch .. //depot/projects/s390/bin/sh/machdep.h#1 branch .. //depot/projects/s390/bin/sh/mail.c#1 branch .. //depot/projects/s390/bin/sh/mail.h#1 branch .. //depot/projects/s390/bin/sh/main.c#1 branch .. //depot/projects/s390/bin/sh/main.h#1 branch .. //depot/projects/s390/bin/sh/memalloc.c#1 branch .. //depot/projects/s390/bin/sh/memalloc.h#1 branch .. //depot/projects/s390/bin/sh/miscbltin.c#1 branch .. //depot/projects/s390/bin/sh/mkbuiltins#1 branch .. //depot/projects/s390/bin/sh/mkinit.c#1 branch .. //depot/projects/s390/bin/sh/mknodes.c#1 branch .. //depot/projects/s390/bin/sh/mksyntax.c#1 branch .. //depot/projects/s390/bin/sh/mktokens#1 branch .. //depot/projects/s390/bin/sh/myhistedit.h#1 branch .. //depot/projects/s390/bin/sh/mystring.c#1 branch .. //depot/projects/s390/bin/sh/mystring.h#1 branch .. //depot/projects/s390/bin/sh/nodes.c.pat#1 branch .. //depot/projects/s390/bin/sh/nodetypes#1 branch .. //depot/projects/s390/bin/sh/options.c#1 branch .. //depot/projects/s390/bin/sh/options.h#1 branch .. //depot/projects/s390/bin/sh/output.c#1 branch .. //depot/projects/s390/bin/sh/output.h#1 branch .. //depot/projects/s390/bin/sh/parser.c#1 branch .. //depot/projects/s390/bin/sh/parser.h#1 branch .. //depot/projects/s390/bin/sh/redir.c#1 branch .. //depot/projects/s390/bin/sh/redir.h#1 branch .. //depot/projects/s390/bin/sh/sh.1#1 branch .. //depot/projects/s390/bin/sh/shell.h#1 branch .. //depot/projects/s390/bin/sh/show.c#1 branch .. //depot/projects/s390/bin/sh/show.h#1 branch .. //depot/projects/s390/bin/sh/trap.c#1 branch .. //depot/projects/s390/bin/sh/trap.h#1 branch .. //depot/projects/s390/bin/sh/var.c#1 branch .. //depot/projects/s390/bin/sh/var.h#1 branch .. //depot/projects/s390/bin/sleep/Makefile#1 branch .. //depot/projects/s390/bin/sleep/sleep.1#1 branch .. //depot/projects/s390/bin/sleep/sleep.c#1 branch .. //depot/projects/s390/bin/stty/Makefile#1 branch .. //depot/projects/s390/bin/stty/cchar.c#1 branch .. //depot/projects/s390/bin/stty/extern.h#1 branch .. //depot/projects/s390/bin/stty/gfmt.c#1 branch .. //depot/projects/s390/bin/stty/key.c#1 branch .. //depot/projects/s390/bin/stty/modes.c#1 branch .. //depot/projects/s390/bin/stty/print.c#1 branch .. //depot/projects/s390/bin/stty/stty.1#1 branch .. //depot/projects/s390/bin/stty/stty.c#1 branch .. //depot/projects/s390/bin/stty/stty.h#1 branch .. //depot/projects/s390/bin/stty/util.c#1 branch .. //depot/projects/s390/bin/sync/Makefile#1 branch .. //depot/projects/s390/bin/sync/sync.8#1 branch .. //depot/projects/s390/bin/sync/sync.c#1 branch .. //depot/projects/s390/bin/test/Makefile#1 branch .. //depot/projects/s390/bin/test/TEST.README#1 branch .. //depot/projects/s390/bin/test/TEST.csh#1 branch .. //depot/projects/s390/bin/test/TEST.sh#1 branch .. //depot/projects/s390/bin/test/test.1#1 branch .. //depot/projects/s390/bin/test/test.c#1 branch .. //depot/projects/s390/contrib/amd/AUTHORS#1 branch .. //depot/projects/s390/contrib/amd/BUGS#1 branch .. //depot/projects/s390/contrib/amd/COPYING#1 branch .. //depot/projects/s390/contrib/amd/ChangeLog#1 branch .. //depot/projects/s390/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/s390/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/s390/contrib/amd/INSTALL#1 branch .. //depot/projects/s390/contrib/amd/MIRRORS#1 branch .. //depot/projects/s390/contrib/amd/NEWS#1 branch .. //depot/projects/s390/contrib/amd/README#1 branch .. //depot/projects/s390/contrib/amd/README.ldap#1 branch .. //depot/projects/s390/contrib/amd/README.y2k#1 branch .. //depot/projects/s390/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amd.8#1 branch .. //depot/projects/s390/contrib/amd/amd/amd.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amd.h#1 branch .. //depot/projects/s390/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/s390/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/s390/contrib/amd/amd/autil.c#1 branch .. //depot/projects/s390/contrib/amd/amd/clock.c#1 branch .. //depot/projects/s390/contrib/amd/amd/conf.c#1 branch .. //depot/projects/s390/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/s390/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/s390/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/s390/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/s390/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/s390/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/s390/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/s390/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/s390/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/s390/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/s390/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/s390/contrib/amd/amd/map.c#1 branch .. //depot/projects/s390/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/s390/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/s390/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/s390/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_autofs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/s390/contrib/amd/amd/opts.c#1 branch .. //depot/projects/s390/contrib/amd/amd/restart.c#1 branch .. //depot/projects/s390/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/s390/contrib/amd/amd/sched.c#1 branch .. //depot/projects/s390/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/s390/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/s390/contrib/amd/amq/amq.8#1 branch .. //depot/projects/s390/contrib/amd/amq/amq.c#1 branch .. //depot/projects/s390/contrib/amd/amq/amq.h#1 branch .. //depot/projects/s390/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/s390/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/s390/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/s390/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/s390/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/s390/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/s390/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/s390/contrib/amd/conf/hn_dref/hn_dref_default.h#1 branch .. //depot/projects/s390/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/s390/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#1 branch .. //depot/projects/s390/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/s390/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/s390/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/s390/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/s390/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/s390/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/s390/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/s390/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/s390/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/s390/contrib/amd/doc/version.texi#1 branch .. //depot/projects/s390/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/s390/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/s390/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/s390/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/s390/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/s390/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/s390/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/s390/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/s390/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/s390/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/s390/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/s390/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/s390/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/s390/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/s390/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/s390/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/s390/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/s390/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/s390/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/s390/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/s390/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/s390/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/s390/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/s390/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/s390/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/s390/contrib/amd/libamu/util.c#1 branch .. //depot/projects/s390/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/s390/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/s390/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/s390/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/s390/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/s390/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/s390/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/s390/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/s390/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/s390/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/s390/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/s390/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/s390/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/s390/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/s390/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/s390/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/s390/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/s390/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/s390/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/s390/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/s390/contrib/amd/scripts/lostaltmail.conf-sample#1 branch .. //depot/projects/s390/contrib/amd/scripts/lostaltmail.in#1 branch .. //depot/projects/s390/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/s390/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/s390/contrib/amd/tasks#1 branch .. //depot/projects/s390/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/s390/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/s390/contrib/bc/AUTHORS#1 branch .. //depot/projects/s390/contrib/bc/ChangeLog#1 branch .. //depot/projects/s390/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/s390/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/s390/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/s390/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/s390/contrib/bc/FAQ#1 branch .. //depot/projects/s390/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/s390/contrib/bc/INSTALL#1 branch .. //depot/projects/s390/contrib/bc/Makefile.am#1 branch .. //depot/projects/s390/contrib/bc/Makefile.in#1 branch .. //depot/projects/s390/contrib/bc/NEWS#1 branch .. //depot/projects/s390/contrib/bc/README#1 branch .. //depot/projects/s390/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/s390/contrib/bc/Test/array.b#1 branch .. //depot/projects/s390/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/s390/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/s390/contrib/bc/Test/atan.b#1 branch .. //depot/projects/s390/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/s390/contrib/bc/Test/div.b#1 branch .. //depot/projects/s390/contrib/bc/Test/exp.b#1 branch .. //depot/projects/s390/contrib/bc/Test/fact.b#1 branch .. //depot/projects/s390/contrib/bc/Test/jn.b#1 branch .. //depot/projects/s390/contrib/bc/Test/ln.b#1 branch .. //depot/projects/s390/contrib/bc/Test/mul.b#1 branch .. //depot/projects/s390/contrib/bc/Test/raise.b#1 branch .. //depot/projects/s390/contrib/bc/Test/signum#1 branch .. //depot/projects/s390/contrib/bc/Test/sine.b#1 branch .. //depot/projects/s390/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/s390/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/s390/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/s390/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/s390/contrib/bc/Test/timetest#1 branch .. //depot/projects/s390/contrib/bc/acconfig.h#1 branch .. //depot/projects/s390/contrib/bc/aclocal.m4#1 branch .. //depot/projects/s390/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/s390/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/s390/contrib/bc/bc/bc.y#1 branch .. //depot/projects/s390/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/s390/contrib/bc/bc/const.h#1 branch .. //depot/projects/s390/contrib/bc/bc/execute.c#1 branch .. //depot/projects/s390/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/s390/contrib/bc/bc/global.c#1 branch .. //depot/projects/s390/contrib/bc/bc/global.h#1 branch .. //depot/projects/s390/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/s390/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/s390/contrib/bc/bc/load.c#1 branch .. //depot/projects/s390/contrib/bc/bc/main.c#1 branch .. //depot/projects/s390/contrib/bc/bc/proto.h#1 branch .. //depot/projects/s390/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/s390/contrib/bc/bc/scan.l#1 branch .. //depot/projects/s390/contrib/bc/bc/storage.c#1 branch .. //depot/projects/s390/contrib/bc/bc/util.c#1 branch .. //depot/projects/s390/contrib/bc/config.h.in#1 branch .. //depot/projects/s390/contrib/bc/configure#1 branch .. //depot/projects/s390/contrib/bc/configure.in#1 branch .. //depot/projects/s390/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/s390/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/s390/contrib/bc/dc/array.c#1 branch .. //depot/projects/s390/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/s390/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/s390/contrib/bc/dc/dc.c#1 branch .. //depot/projects/s390/contrib/bc/dc/dc.h#1 branch .. //depot/projects/s390/contrib/bc/dc/eval.c#1 branch .. //depot/projects/s390/contrib/bc/dc/misc.c#1 branch .. //depot/projects/s390/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/s390/contrib/bc/dc/stack.c#1 branch .. //depot/projects/s390/contrib/bc/dc/string.c#1 branch .. //depot/projects/s390/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/s390/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/s390/contrib/bc/doc/bc.1#1 branch .. //depot/projects/s390/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/s390/contrib/bc/doc/dc.1#1 branch .. //depot/projects/s390/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/s390/contrib/bc/h/getopt.h#1 branch .. //depot/projects/s390/contrib/bc/h/number.h#1 branch .. //depot/projects/s390/contrib/bc/install-sh#1 branch .. //depot/projects/s390/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/s390/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/s390/contrib/bc/lib/getopt.c#1 branch .. //depot/projects/s390/contrib/bc/lib/getopt1.c#1 branch .. //depot/projects/s390/contrib/bc/lib/number.c#1 branch .. //depot/projects/s390/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/s390/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/s390/contrib/bc/missing#1 branch .. //depot/projects/s390/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/s390/contrib/bc/stamp-h.in#1 branch .. //depot/projects/s390/contrib/bind/CHANGES#1 branch .. //depot/projects/s390/contrib/bind/DNSSEC#1 branch .. //depot/projects/s390/contrib/bind/FREEBSD-Upgrade#1 branch .. //depot/projects/s390/contrib/bind/FREEBSD-Xlist#1 branch .. //depot/projects/s390/contrib/bind/INSTALL#1 branch .. //depot/projects/s390/contrib/bind/LICENSE#1 branch .. //depot/projects/s390/contrib/bind/Makefile#1 branch .. //depot/projects/s390/contrib/bind/README#1 branch .. //depot/projects/s390/contrib/bind/SUPPORT#1 branch .. //depot/projects/s390/contrib/bind/TODO#1 branch .. //depot/projects/s390/contrib/bind/Version#1 branch .. //depot/projects/s390/contrib/bind/bin/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/addr/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/addr/addr.c#1 branch .. //depot/projects/s390/contrib/bind/bin/dig/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/dig/dig.c#1 branch .. //depot/projects/s390/contrib/bind/bin/dnskeygen/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/dnskeygen/dnskeygen.c#1 branch .. //depot/projects/s390/contrib/bind/bin/dnsquery/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/dnsquery/dnsquery.c#1 branch .. //depot/projects/s390/contrib/bind/bin/host/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/host/host.c#1 branch .. //depot/projects/s390/contrib/bind/bin/irpd/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/irpd/irpd.c#1 branch .. //depot/projects/s390/contrib/bind/bin/irpd/irs-irpd.conf#1 branch .. //depot/projects/s390/contrib/bind/bin/irpd/version.c#1 branch .. //depot/projects/s390/contrib/bind/bin/mkservdb/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/mkservdb/mkservdb.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#1 branch .. //depot/projects/s390/contrib/bind/bin/named-bootconf/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/named-bootconf/named-bootconf.sh#1 branch .. //depot/projects/s390/contrib/bind/bin/named-bootconf/test.boot#1 branch .. //depot/projects/s390/contrib/bind/bin/named-xfer/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/named-xfer/named-xfer.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/named/db_defs.h#1 branch .. //depot/projects/s390/contrib/bind/bin/named/db_dump.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/db_func.h#1 branch .. //depot/projects/s390/contrib/bind/bin/named/db_glob.h#1 branch .. //depot/projects/s390/contrib/bind/bin/named/db_glue.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/db_ixfr.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/db_load.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/db_lookup.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/db_save.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/db_sec.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/db_tsig.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/db_update.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/named.conf#1 branch .. //depot/projects/s390/contrib/bind/bin/named/named.h#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_config.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_ctl.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_defs.h#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_forw.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_func.h#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_glob.h#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_glue.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_init.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_ixfr.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_lexer.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_lexer.h#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_main.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_maint.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_ncache.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_notify.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_parser.y#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_parseutil.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_parseutil.h#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_req.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_resp.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_signal.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_sort.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_stats.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_udp.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_update.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/ns_xfr.c#1 branch .. //depot/projects/s390/contrib/bind/bin/named/pathtemplate.h#1 branch .. //depot/projects/s390/contrib/bind/bin/named/test/127.0.0.zone#1 branch .. //depot/projects/s390/contrib/bind/bin/named/test/localhost.zone#1 branch .. //depot/projects/s390/contrib/bind/bin/named/test/named.conf#1 branch .. //depot/projects/s390/contrib/bind/bin/named/test/root.hint#1 branch .. //depot/projects/s390/contrib/bind/bin/named/version.c#1 branch .. //depot/projects/s390/contrib/bind/bin/ndc/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/ndc/ndc.c#1 branch .. //depot/projects/s390/contrib/bind/bin/nslookup/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/nslookup/commands.l#1 branch .. //depot/projects/s390/contrib/bind/bin/nslookup/debug.c#1 branch .. //depot/projects/s390/contrib/bind/bin/nslookup/getinfo.c#1 branch .. //depot/projects/s390/contrib/bind/bin/nslookup/list.c#1 branch .. //depot/projects/s390/contrib/bind/bin/nslookup/main.c#1 branch .. //depot/projects/s390/contrib/bind/bin/nslookup/nslookup.help#1 branch .. //depot/projects/s390/contrib/bind/bin/nslookup/pathnames.h#1 branch .. //depot/projects/s390/contrib/bind/bin/nslookup/res.h#1 branch .. //depot/projects/s390/contrib/bind/bin/nslookup/send.c#1 branch .. //depot/projects/s390/contrib/bind/bin/nslookup/skip.c#1 branch .. //depot/projects/s390/contrib/bind/bin/nslookup/subr.c#1 branch .. //depot/projects/s390/contrib/bind/bin/nsupdate/Makefile#1 branch .. //depot/projects/s390/contrib/bind/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/s390/contrib/bind/doc/html/acl.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/address_list.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/comments.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/config.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/controls.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/docdef.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/example.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/include.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/index.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/key.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/logging.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/master.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/options.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/server.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/trusted-keys.html#1 branch .. //depot/projects/s390/contrib/bind/doc/html/zone.html#1 branch .. //depot/projects/s390/contrib/bind/doc/man/Makefile#1 branch .. //depot/projects/s390/contrib/bind/doc/man/dig.1#1 branch .. //depot/projects/s390/contrib/bind/doc/man/dnskeygen.1#1 branch .. //depot/projects/s390/contrib/bind/doc/man/dnsquery.1#1 branch .. //depot/projects/s390/contrib/bind/doc/man/getaddrinfo.3#1 branch .. //depot/projects/s390/contrib/bind/doc/man/gethostbyname.3#1 branch .. //depot/projects/s390/contrib/bind/doc/man/getipnodebyname.3#1 branch .. //depot/projects/s390/contrib/bind/doc/man/getnameinfo.3#1 branch .. //depot/projects/s390/contrib/bind/doc/man/getnetent.3#1 branch .. //depot/projects/s390/contrib/bind/doc/man/hesiod.3#1 branch .. //depot/projects/s390/contrib/bind/doc/man/host.1#1 branch .. //depot/projects/s390/contrib/bind/doc/man/hostname.7#1 branch .. //depot/projects/s390/contrib/bind/doc/man/inet_cidr.3#1 branch .. //depot/projects/s390/contrib/bind/doc/man/irs.conf.5#1 branch .. //depot/projects/s390/contrib/bind/doc/man/mailaddr.7#1 branch .. //depot/projects/s390/contrib/bind/doc/man/mkdep.1#1 branch .. //depot/projects/s390/contrib/bind/doc/man/named-bootconf.8#1 branch .. //depot/projects/s390/contrib/bind/doc/man/named-xfer.8#1 branch .. //depot/projects/s390/contrib/bind/doc/man/named.8#1 branch .. //depot/projects/s390/contrib/bind/doc/man/named.conf.5#1 branch .. //depot/projects/s390/contrib/bind/doc/man/ndc.8#1 branch .. //depot/projects/s390/contrib/bind/doc/man/nslookup.8#1 branch .. //depot/projects/s390/contrib/bind/doc/man/nsupdate.8#1 branch .. //depot/projects/s390/contrib/bind/doc/man/resolver.3#1 branch .. //depot/projects/s390/contrib/bind/doc/man/resolver.5#1 branch .. //depot/projects/s390/contrib/bind/doc/man/tsig.3#1 branch .. //depot/projects/s390/contrib/bind/doc/misc/DynamicUpdate#1 branch .. //depot/projects/s390/contrib/bind/doc/misc/FAQ.1of2#1 branch .. //depot/projects/s390/contrib/bind/doc/misc/FAQ.2of2#1 branch .. //depot/projects/s390/contrib/bind/doc/misc/rfc2317-notes.txt#1 branch .. //depot/projects/s390/contrib/bind/doc/misc/style.txt#1 branch .. //depot/projects/s390/contrib/bind/include/Makefile#1 branch .. //depot/projects/s390/contrib/bind/include/arpa/Makefile#1 branch .. //depot/projects/s390/contrib/bind/include/arpa/inet.h#1 branch .. //depot/projects/s390/contrib/bind/include/arpa/nameser.h#1 branch .. //depot/projects/s390/contrib/bind/include/arpa/nameser_compat.h#1 branch .. //depot/projects/s390/contrib/bind/include/fd_setsize.h#1 branch .. //depot/projects/s390/contrib/bind/include/hesiod.h#1 branch .. //depot/projects/s390/contrib/bind/include/irp.h#1 branch .. //depot/projects/s390/contrib/bind/include/irs.h#1 branch .. //depot/projects/s390/contrib/bind/include/isc/Makefile#1 branch .. //depot/projects/s390/contrib/bind/include/isc/assertions.h#1 branch .. //depot/projects/s390/contrib/bind/include/isc/ctl.h#1 branch .. //depot/projects/s390/contrib/bind/include/isc/dst.h#1 branch .. //depot/projects/s390/contrib/bind/include/isc/eventlib.h#1 branch .. //depot/projects/s390/contrib/bind/include/isc/heap.h#1 branch .. //depot/projects/s390/contrib/bind/include/isc/irpmarshall.h#1 branch .. //depot/projects/s390/contrib/bind/include/isc/list.h#1 branch .. //depot/projects/s390/contrib/bind/include/isc/logging.h#1 branch .. //depot/projects/s390/contrib/bind/include/isc/memcluster.h#1 branch .. //depot/projects/s390/contrib/bind/include/isc/misc.h#1 branch .. //depot/projects/s390/contrib/bind/include/isc/tree.h#1 branch .. //depot/projects/s390/contrib/bind/include/netdb.h#1 branch .. //depot/projects/s390/contrib/bind/include/netgroup.h#1 branch .. //depot/projects/s390/contrib/bind/include/res_update.h#1 branch .. //depot/projects/s390/contrib/bind/include/resolv.h#1 branch .. //depot/projects/s390/contrib/bind/lib/Makefile#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/Makefile#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/README#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/bsafe_link.c#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/cylink_link.c#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/dst_api.c#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/dst_internal.h#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/eay_dss_link.c#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/hmac_link.c#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/md5.h#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/md5_dgst.c#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/md5_locl.h#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/prandom.c#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/rsaref_link.c#1 branch .. //depot/projects/s390/contrib/bind/lib/dst/support.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/Makefile#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_addr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_cidr_pton.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_data.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_lnaof.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_makeaddr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_net_ntop.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_net_pton.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_neta.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_netof.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_network.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_ntoa.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_ntop.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/inet_pton.c#1 branch .. //depot/projects/s390/contrib/bind/lib/inet/nsap_addr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/Makefile#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/Makefile.BSD#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/README#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/dns.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/dns_gr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/dns_ho.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/dns_nw.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/dns_p.h#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/dns_pr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/dns_pw.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/dns_sv.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/gai_strerror.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/gen.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/gen_gr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/gen_ho.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/gen_ng.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/gen_nw.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/gen_p.h#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/gen_pr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/gen_pw.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/gen_sv.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getaddrinfo.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getgrent.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getgrent_r.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/gethostent.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/gethostent_r.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getnameinfo.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getnetent.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getnetent_r.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getnetgrent.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getnetgrent_r.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getprotoent.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getprotoent_r.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getpwent.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getpwent_r.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getservent.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/getservent_r.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/hesiod.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/hesiod_p.h#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/irp.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/irp_gr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/irp_ho.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/irp_ng.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/irp_nw.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/irp_p.h#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/irp_pr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/irp_pw.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/irp_sv.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/irpmarshall.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/irs_data.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/irs_data.h#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/irs_p.h#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/lcl.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/lcl_gr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/lcl_ho.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/lcl_ng.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/lcl_nw.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/lcl_p.h#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/lcl_pr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/lcl_pw.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/lcl_sv.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/nis.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/nis_gr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/nis_ho.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/nis_ng.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/nis_nw.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/nis_p.h#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/nis_pr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/nis_pw.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/nis_sv.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/nul_ng.c#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/pathnames.h#1 branch .. //depot/projects/s390/contrib/bind/lib/irs/util.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/Makefile#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/assertions.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/assertions.mdoc#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/base64.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/bitncmp.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/bitncmp.mdoc#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/ctl_clnt.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/ctl_p.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/ctl_p.h#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/ctl_srvr.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/ev_connects.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/ev_files.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/ev_streams.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/ev_timers.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/ev_waits.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/eventlib.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/eventlib.mdoc#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/eventlib_p.h#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/heap.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/heap.mdoc#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/hex.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/logging.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/logging.mdoc#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/logging_p.h#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/memcluster.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/memcluster.mdoc#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/movefile.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/tree.c#1 branch .. //depot/projects/s390/contrib/bind/lib/isc/tree.mdoc#1 branch .. //depot/projects/s390/contrib/bind/lib/nameser/Makefile#1 branch .. //depot/projects/s390/contrib/bind/lib/nameser/ns_date.c#1 branch .. //depot/projects/s390/contrib/bind/lib/nameser/ns_name.c#1 branch .. //depot/projects/s390/contrib/bind/lib/nameser/ns_netint.c#1 branch .. //depot/projects/s390/contrib/bind/lib/nameser/ns_parse.c#1 branch .. //depot/projects/s390/contrib/bind/lib/nameser/ns_print.c#1 branch .. //depot/projects/s390/contrib/bind/lib/nameser/ns_samedomain.c#1 branch .. //depot/projects/s390/contrib/bind/lib/nameser/ns_sign.c#1 branch .. //depot/projects/s390/contrib/bind/lib/nameser/ns_ttl.c#1 branch .. //depot/projects/s390/contrib/bind/lib/nameser/ns_verify.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 11 11:57:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5980537B400; Thu, 11 Jul 2002 11:57:08 -0700 (PDT) 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 D9AF537B401 for ; Thu, 11 Jul 2002 11:57:06 -0700 (PDT) Received: from mail.speakeasy.net (mail16.speakeasy.net [216.254.0.216]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1C8043E64 for ; Thu, 11 Jul 2002 11:57:05 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 29594 invoked from network); 11 Jul 2002 18:57:04 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail16.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 11 Jul 2002 18:57:04 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g6BIv2032621; Thu, 11 Jul 2002 14:57:02 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200207111845.g6BIji27083296@freefall.freebsd.org> Date: Thu, 11 Jul 2002 14:57:08 -0400 (EDT) From: John Baldwin To: "David E. O'Brien" Subject: RE: PERFORCE change 14098 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 11-Jul-2002 David E. O'Brien wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14098 > > Change 14098 by obrien@obrien_trang on 2002/07/11 11:42:39 > > Initial sync with FreeBSD "vendor" sources. > > Affected files ... > > .. //depot/projects/s390/COPYRIGHT#1 branch Great fear. Is the guy working on S/390 going to use this branch directly? -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 11 12:25:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE58237B401; Thu, 11 Jul 2002 12:25:33 -0700 (PDT) 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 457E337B400; Thu, 11 Jul 2002 12:25:32 -0700 (PDT) Received: from dragon.nuxi.com (trang.nuxi.com [66.92.13.169]) by mx1.FreeBSD.org (Postfix) with ESMTP id C44D343E58; Thu, 11 Jul 2002 12:25:31 -0700 (PDT) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.12.5/8.12.2) with ESMTP id g6BJPVoi098798; Thu, 11 Jul 2002 12:25:31 -0700 (PDT) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.5/8.12.5/Submit) id g6BJPVnZ098797; Thu, 11 Jul 2002 12:25:31 -0700 (PDT) Date: Thu, 11 Jul 2002 12:25:31 -0700 From: "David O'Brien" To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 14098 for review Message-ID: <20020711192531.GA98532@dragon.nuxi.com> Reply-To: obrien@FreeBSD.org References: <200207111845.g6BIji27083296@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4i X-Operating-System: FreeBSD 5.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, Jul 11, 2002 at 02:57:08PM -0400, John Baldwin wrote: > > .. //depot/projects/s390/COPYRIGHT#1 branch > > Great fear. Is the guy working on S/390 going to use this branch directly? I hope to commit his patches so we have them. What happens going forward, I don't know. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 11 12:26:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F2B437B405; Thu, 11 Jul 2002 12:26:44 -0700 (PDT) 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 BBEF537B401; Thu, 11 Jul 2002 12:26:43 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 913D143E6D; Thu, 11 Jul 2002 12:26:42 -0700 (PDT) (envelope-from arr@watson.org) Received: from fledge.watson.org (localhost [127.0.0.1]) by fledge.watson.org (8.12.4/8.12.4) with ESMTP id g6BJQYbL080665; Thu, 11 Jul 2002 15:26:34 -0400 (EDT) (envelope-from arr@watson.org) Received: from localhost (arr@localhost) by fledge.watson.org (8.12.4/8.12.4/Submit) with SMTP id g6BJQXIB080662; Thu, 11 Jul 2002 15:26:33 -0400 (EDT) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Thu, 11 Jul 2002 15:26:33 -0400 (EDT) From: "Andrew R. Reiter" To: "David O'Brien" Cc: John Baldwin , Perforce Change Reviews Subject: Re: PERFORCE change 14098 for review In-Reply-To: <20020711192531.GA98532@dragon.nuxi.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, 11 Jul 2002, David O'Brien wrote: :On Thu, Jul 11, 2002 at 02:57:08PM -0400, John Baldwin wrote: :> > .. //depot/projects/s390/COPYRIGHT#1 branch :> :> Great fear. Is the guy working on S/390 going to use this branch directly? : :I hope to commit his patches so we have them. What happens going :forward, I don't know. Sweet, the linus approach ;-) -- Andrew R. Reiter arr@watson.org arr@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 11 15:14:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7093C37B401; Thu, 11 Jul 2002 15:14:16 -0700 (PDT) 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 176D837B400 for ; Thu, 11 Jul 2002 15:14:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CFC8943E3B for ; Thu, 11 Jul 2002 15:14:15 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6BMEFJU025523 for ; Thu, 11 Jul 2002 15:14:15 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6BMEFtV025520 for perforce@freebsd.org; Thu, 11 Jul 2002 15:14:15 -0700 (PDT) Date: Thu, 11 Jul 2002 15:14:15 -0700 (PDT) Message-Id: <200207112214.g6BMEFtV025520@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14108 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14108 Change 14108 by green@green_laptop_2 on 2002/07/11 15:13:26 Make sure to register for space in the per-policy internal MAC labels. Until now, SEBSD could not coexist with other policies because it would overwrite slot 0 with its labels. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#11 (text+ko) ==== @@ -515,4 +515,4 @@ }; MAC_POLICY_SET(sebsd_ops, trustedbsd_sebsd, "Security Enhanced BSD", - MPC_LOADTIME_FLAG_NOTLATE, NULL); + MPC_LOADTIME_FLAG_NOTLATE, &slot); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 11 19:24:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E63A437B401; Thu, 11 Jul 2002 19:23:20 -0700 (PDT) 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 78F7C37B400 for ; Thu, 11 Jul 2002 19:23:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA68643E70 for ; Thu, 11 Jul 2002 19:23:19 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6C2NJJU067077 for ; Thu, 11 Jul 2002 19:23:19 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6C2NJeO067062 for perforce@freebsd.org; Thu, 11 Jul 2002 19:23:19 -0700 (PDT) Date: Thu, 11 Jul 2002 19:23:19 -0700 (PDT) Message-Id: <200207120223.g6C2NJeO067062@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14117 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14117 Change 14117 by peter@peter_daintree on 2002/07/11 19:23:15 IFC @14116 (I'm actually using cvs for this, but it is useful to keep history here) Affected files ... .. //depot/projects/pmap/sys/conf/NOTES#3 integrate .. //depot/projects/pmap/sys/conf/kmod.mk#6 integrate .. //depot/projects/pmap/sys/i386/i386/mp_machdep.c#21 integrate .. //depot/projects/pmap/sys/i386/isa/apic_vector.s#10 integrate .. //depot/projects/pmap/sys/kern/kern_exec.c#7 integrate .. //depot/projects/pmap/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/pmap/sys/kern/kern_switch.c#6 integrate .. //depot/projects/pmap/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/pmap/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_bio.c#6 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_nfsiod.c#3 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_node.c#3 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_serv.c#7 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_srvsock.c#4 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/trap.c#7 integrate Differences ... ==== //depot/projects/pmap/sys/conf/NOTES#3 (text+ko) ==== @@ -5,7 +5,7 @@ # 'makeoptions', 'hints' etc go into the kernel configuration that you # run config(8) with. # -# Lines that begin with 'hints.' are NOT for config(8), they go into your +# Lines that begin with 'hint.' are NOT for config(8), they go into your # hints file. See /boot/device.hints and/or the 'hints' config(8) directive. # # Please use ``make LINT'' to create an old-style LINT file if you want to @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1044 2002/07/11 04:15:53 ken Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1045 2002/07/11 20:43:37 bde Exp $ # # @@ -1821,26 +1821,26 @@ # device rp # core driver support # # Comtrol Rocketport ISA single card -# hints.rp.0.at="isa" -# hints.rp.0.port="0x280" +# hint.rp.0.at="isa" +# hint.rp.0.port="0x280" # # If instead you have two ISA cards, one installed at 0x100 and the # second installed at 0x180, then you should add the following to # your kernel probe hints: -# hints.rp.0.at="isa" -# hints.rp.0.port="0x100" -# hints.rp.1.at="isa" -# hints.rp.1.port="0x180" +# hint.rp.0.at="isa" +# hint.rp.0.port="0x100" +# hint.rp.1.at="isa" +# hint.rp.1.port="0x180" # # For 4 ISA cards, it might be something like this: -# hints.rp.0.at="isa" -# hints.rp.0.port="0x180" -# hints.rp.1.at="isa" -# hints.rp.1.port="0x100" -# hints.rp.2.at="isa" -# hints.rp.2.port="0x340" -# hints.rp.3.at="isa" -# hints.rp.3.port="0x240" +# hint.rp.0.at="isa" +# hint.rp.0.port="0x180" +# hint.rp.1.at="isa" +# hint.rp.1.port="0x100" +# hint.rp.2.at="isa" +# hint.rp.2.port="0x340" +# hint.rp.3.at="isa" +# hint.rp.3.port="0x240" # # For PCI cards, you need no hints. ==== //depot/projects/pmap/sys/conf/kmod.mk#6 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.125 2002/06/17 20:01:06 n_hibma Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.126 2002/07/11 14:13:37 ru Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -9,8 +9,6 @@ # # CLEANFILES Additional files to remove for the clean and cleandir targets. # -# DISTRIBUTION Name of distribution. [bin] -# # KMOD The name of the kernel module to build. # # KMODDIR Base path for kernel modules (see kld(4)). [/boot/kernel] @@ -268,14 +266,6 @@ realinstall: beforeinstall .endif -DISTRIBUTION?= bin -.if !target(distribute) -distribute: -.for dist in ${DISTRIBUTION} - cd ${.CURDIR} ; $(MAKE) install DESTDIR=${DISTDIR}/${dist} SHARED=copies -.endfor -.endif - .if !target(load) load: ${PROG} ${KMODLOAD} -v ${.OBJDIR}/${KMOD}.ko ==== //depot/projects/pmap/sys/i386/i386/mp_machdep.c#21 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.186 2002/04/17 22:41:58 tegge Exp $ + * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.187 2002/07/11 08:31:10 peter Exp $ */ #include "opt_cpu.h" ==== //depot/projects/pmap/sys/i386/isa/apic_vector.s#10 (text+ko) ==== @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/isa/apic_vector.s,v 1.81 2002/04/01 23:51:17 dillon Exp $ + * $FreeBSD: src/sys/i386/isa/apic_vector.s,v 1.83 2002/07/11 08:31:10 peter Exp $ */ ==== //depot/projects/pmap/sys/kern/kern_exec.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_exec.c,v 1.172 2002/07/06 07:00:01 jeff Exp $ + * $FreeBSD: src/sys/kern/kern_exec.c,v 1.173 2002/07/11 18:48:05 alc Exp $ */ #include "opt_ktrace.h" @@ -590,15 +590,18 @@ if ((rv != VM_PAGER_OK) || (ma[0] == NULL) || (ma[0]->valid == 0)) { if (ma[0]) { + vm_page_lock_queues(); vm_page_protect(ma[0], VM_PROT_NONE); vm_page_free(ma[0]); + vm_page_unlock_queues(); } return EIO; } } - + vm_page_lock_queues(); vm_page_wire(ma[0]); vm_page_wakeup(ma[0]); + vm_page_unlock_queues(); pmap_qenter((vm_offset_t)imgp->image_header, ma, 1); imgp->firstpage = ma[0]; @@ -614,7 +617,9 @@ if (imgp->firstpage) { pmap_qremove((vm_offset_t)imgp->image_header, 1); + vm_page_lock_queues(); vm_page_unwire(imgp->firstpage, 1); + vm_page_unlock_queues(); imgp->firstpage = NULL; } } ==== //depot/projects/pmap/sys/kern/kern_shutdown.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.129 2002/06/29 17:26:18 julian Exp $ + * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.130 2002/07/11 21:56:37 jhb Exp $ */ #include "opt_ddb.h" @@ -468,6 +468,8 @@ printf("cpuid = %d; ", PCPU_GET(cpuid)); #ifdef APIC_IO printf("lapic.id = %08x\n", lapic.id); +#else + printf("\n"); #endif #endif ==== //depot/projects/pmap/sys/kern/kern_switch.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_switch.c,v 1.29 2002/06/29 17:26:18 julian Exp $ + * $FreeBSD: src/sys/kern/kern_switch.c,v 1.30 2002/07/11 22:47:58 julian Exp $ */ /*** @@ -160,7 +160,6 @@ td->td_kse->ke_state = KES_UNQUEUED; CTR1(KTR_RUNQ, "choosethread: td=%p (idle)", td); } - thread_sanity_check(td); return (td); } @@ -177,7 +176,6 @@ kg = ke->ke_ksegrp; -KASSERT((ke->ke_state != KES_ONRUNQ), ("kse_reassigning non-free kse")); /* * Find the first unassigned thread * If there is a 'last assigned' then see what's next. @@ -193,7 +191,6 @@ * If we found one assign it the kse, otherwise idle the kse. */ if (td) { - thread_sanity_check(td); kg->kg_last_assigned = td; td->td_kse = ke; ke->ke_thread = td; @@ -201,13 +198,11 @@ CTR2(KTR_RUNQ, "kse_reassign: ke%p -> td%p", ke, td); } else { KASSERT((ke->ke_state != KES_IDLE), ("kse already idle")); -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); ke->ke_state = KES_IDLE; ke->ke_thread = NULL; TAILQ_INSERT_HEAD(&kg->kg_iq, ke, ke_kgrlist); kg->kg_idle_kses++; CTR1(KTR_RUNQ, "kse_reassign: ke%p idled", ke); -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self2!")); } } @@ -231,7 +226,6 @@ struct kse *ke; mtx_assert(&sched_lock, MA_OWNED); - thread_sanity_check(td); KASSERT ((td->td_state == TDS_RUNQ), ("remrunqueue: Bad state on run queue")); kg = td->td_ksegrp; @@ -282,19 +276,15 @@ TAILQ_PREV(td, threadqueue, td_runq); } runq_remove(&runq, ke); -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); KASSERT((ke->ke_state != KES_IDLE), ("kse already idle")); ke->ke_state = KES_IDLE; ke->ke_thread = NULL; -KASSERT((TAILQ_FIRST(&kg->kg_iq) != ke), ("really bad screwup")); TAILQ_INSERT_HEAD(&kg->kg_iq, ke, ke_kgrlist); kg->kg_idle_kses++; -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self2!")); } } TAILQ_REMOVE(&kg->kg_runq, td, td_runq); - thread_sanity_check(td); } #if 1 /* use the first version */ @@ -309,7 +299,6 @@ CTR1(KTR_RUNQ, "setrunqueue: td%p", td); mtx_assert(&sched_lock, MA_OWNED); - thread_sanity_check(td); KASSERT((td->td_state != TDS_RUNQ), ("setrunqueue: bad thread state")); td->td_state = TDS_RUNQ; kg = td->td_ksegrp; @@ -342,11 +331,9 @@ * There is a free one so it's ours for the asking.. */ ke = TAILQ_FIRST(&kg->kg_iq); -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self3!")); TAILQ_REMOVE(&kg->kg_iq, ke, ke_kgrlist); ke->ke_state = KES_UNQUEUED; kg->kg_idle_kses--; -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self4!")); } else if (tda && (tda->td_priority > td->td_priority)) { /* * None free, but there is one we can commandeer. @@ -357,7 +344,6 @@ tda = kg->kg_last_assigned = TAILQ_PREV(tda, threadqueue, td_runq); runq_remove(&runq, ke); -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self5!")); } } else { KASSERT(ke->ke_thread == td, ("KSE/thread mismatch")); @@ -417,7 +403,6 @@ } runq_add(&runq, ke); } - thread_sanity_check(td); } #else @@ -504,15 +489,12 @@ * assigned" pointer set to us as well. */ ke = TAILQ_FIRST(&kg->kg_iq); -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); TAILQ_REMOVE(&kg->kg_iq, ke, ke_kgrlist); ke->ke_state = KES_UNQUEUED; kg->kg_idle_kses--; -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); ke->ke_thread = td; td->td_kse = ke; runq_add(&runq, ke); -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); if (TAILQ_NEXT(td, td_runq) == NULL) { kg->kg_last_assigned = td; } @@ -528,14 +510,12 @@ */ td2 = kg->kg_last_assigned; ke = td2->td_kse; -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); kg->kg_last_assigned = TAILQ_PREV(td2, threadqueue, td_runq); td2->td_kse = NULL; td->td_kse = ke; ke->ke_thread = td; runq_readjust(&runq, ke); -KASSERT((ke->ke_kgrlist.tqe_next != ke), ("linked to self!")); } } #endif @@ -716,9 +696,6 @@ KASSERT(ke != NULL, ("runq_choose: no proc on busy queue")); CTR3(KTR_RUNQ, "runq_choose: pri=%d kse=%p rqh=%p", pri, ke, rqh); -KASSERT(ke->ke_procq.tqe_prev != NULL, ("no prev")); -if (ke->ke_procq.tqe_next) - KASSERT(ke->ke_procq.tqe_next->ke_procq.tqe_prev != NULL, ("no next")); TAILQ_REMOVE(rqh, ke, ke_procq); ke->ke_ksegrp->kg_runq_kses--; if (TAILQ_EMPTY(rqh)) { @@ -775,6 +752,7 @@ } } +#if 0 void thread_sanity_check(struct thread *td) { @@ -861,4 +839,5 @@ #endif } } +#endif ==== //depot/projects/pmap/sys/netinet/tcp_subr.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.134 2002/06/30 20:07:21 jesper Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.136 2002/07/11 23:18:43 truckman Exp $ */ #include "opt_compat.h" @@ -931,24 +931,23 @@ if (inp == NULL) { error = ENOENT; goto outunlocked; - } else { - INP_LOCK(inp); - if (inp->inp_socket == NULL) { - error = ENOENT; - goto out; - } + } + INP_LOCK(inp); + if (inp->inp_socket == NULL) { + error = ENOENT; + goto out; } - error = cr_canseesocket(req->td->td_ucred, inp->inp_socket); if (error) goto out; cru2x(inp->inp_socket->so_cred, &xuc); - error = SYSCTL_OUT(req, &xuc, sizeof(struct xucred)); out: INP_UNLOCK(inp); outunlocked: INP_INFO_RUNLOCK(&tcbinfo); splx(s); + if (error == 0) + error = SYSCTL_OUT(req, &xuc, sizeof(struct xucred)); return (error); } @@ -994,23 +993,23 @@ if (inp == NULL) { error = ENOENT; goto outunlocked; - } else { - INP_LOCK(inp); - if (inp->inp_socket == NULL) { - error = ENOENT; - goto out; - } + } + INP_LOCK(inp); + if (inp->inp_socket == NULL) { + error = ENOENT; + goto out; } error = cr_canseesocket(req->td->td_ucred, inp->inp_socket); if (error) goto out; cru2x(inp->inp_socket->so_cred, &xuc); - error = SYSCTL_OUT(req, &xuc, sizeof(struct xucred)); out: INP_UNLOCK(inp); outunlocked: INP_INFO_RUNLOCK(&tcbinfo); splx(s); + if (error == 0) + error = SYSCTL_OUT(req, &xuc, sizeof(struct xucred)); return (error); } ==== //depot/projects/pmap/sys/netinet/udp_usrreq.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.114 2002/06/21 22:54:16 hsu Exp $ + * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.115 2002/07/11 23:18:43 truckman Exp $ */ #include "opt_ipsec.h" @@ -689,10 +689,11 @@ if (error) goto out; cru2x(inp->inp_socket->so_cred, &xuc); - error = SYSCTL_OUT(req, &xuc, sizeof(struct xucred)); out: INP_INFO_RUNLOCK(&udbinfo); splx(s); + if (error == 0) + error = SYSCTL_OUT(req, &xuc, sizeof(struct xucred)); return (error); } ==== //depot/projects/pmap/sys/nfsclient/nfs_bio.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_bio.c,v 1.109 2002/07/10 17:02:31 dillon Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_bio.c,v 1.110 2002/07/11 17:54:58 dillon Exp $"); #include #include @@ -1025,9 +1025,9 @@ if (nmp->nm_flag & NFSMNT_INT) { bp = getblk(vp, bn, size, PCATCH, 0); - while (bp == (struct buf *)0) { - if (nfs_sigintr(nmp, (struct nfsreq *)0, td)) - return ((struct buf *)0); + while (bp == NULL) { + if (nfs_sigintr(nmp, NULL, td)) + return (NULL); bp = getblk(vp, bn, size, 0, 2 * hz); } } else { @@ -1076,7 +1076,7 @@ error = tsleep((caddr_t)&np->n_flag, PRIBIO + 2, "nfsvinval", slptimeo); if (error && intrflg && - nfs_sigintr(nmp, (struct nfsreq *)0, td)) + nfs_sigintr(nmp, NULL, td)) return (EINTR); } @@ -1087,7 +1087,7 @@ error = vinvalbuf(vp, flags, cred, td, slpflag, 0); while (error) { if (intrflg && - nfs_sigintr(nmp, (struct nfsreq *)0, td)) { + nfs_sigintr(nmp, NULL, td)) { np->n_flag &= ~NFLUSHINPROG; if (np->n_flag & NFLUSHWANT) { np->n_flag &= ~NFLUSHWANT; @@ -1165,7 +1165,7 @@ */ NFS_DPF(ASYNCIO, ("nfs_asyncio: waking iod %d for mount %p\n", iod, nmp)); - nfs_iodwant[iod] = (struct proc *)0; + nfs_iodwant[iod] = NULL; nfs_iodmount[iod] = nmp; nmp->nm_bufqiods++; wakeup((caddr_t)&nfs_iodwant[iod]); ==== //depot/projects/pmap/sys/nfsclient/nfs_nfsiod.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_nfsiod.c,v 1.74 2002/01/15 20:57:21 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_nfsiod.c,v 1.75 2002/07/11 17:54:58 dillon Exp $"); #include #include @@ -258,9 +258,9 @@ wakeup(&nmp->nm_bufq); } if (bp->b_iocmd == BIO_READ) - (void) nfs_doio(bp, bp->b_rcred, (struct thread *)0); + (void) nfs_doio(bp, bp->b_rcred, NULL); else - (void) nfs_doio(bp, bp->b_wcred, (struct thread *)0); + (void) nfs_doio(bp, bp->b_wcred, NULL); /* * If there are more than one iod on this mount, then defect * so that the iods can be shared out fairly between the mounts ==== //depot/projects/pmap/sys/nfsclient/nfs_node.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_node.c,v 1.54 2002/04/27 22:10:16 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_node.c,v 1.55 2002/07/11 17:54:58 dillon Exp $"); #include #include @@ -285,9 +285,9 @@ vprint("nfs_inactive: pushing active", ap->a_vp); if (ap->a_vp->v_type != VDIR) { sp = np->n_sillyrename; - np->n_sillyrename = (struct sillyrename *)0; + np->n_sillyrename = NULL; } else - sp = (struct sillyrename *)0; + sp = NULL; if (sp) { /* * We need a reference to keep the vnode from being @@ -354,6 +354,6 @@ cache_purge(vp); uma_zfree(nfsnode_zone, vp->v_data); - vp->v_data = (void *)0; + vp->v_data = NULL; return (0); } ==== //depot/projects/pmap/sys/nfsclient/nfs_socket.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.82 2002/06/28 21:53:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_socket.c,v 1.83 2002/07/11 17:54:58 dillon Exp $"); /* * Socket operations for use by nfs @@ -160,7 +160,7 @@ struct sockaddr_in *sin; struct thread *td = &thread0; /* only used for socreate and sobind */ - nmp->nm_so = (struct socket *)0; + nmp->nm_so = NULL; saddr = nmp->nm_nam; error = socreate(saddr->sa_family, &nmp->nm_so, nmp->nm_sotype, nmp->nm_soproto, nmp->nm_cred, td); @@ -367,7 +367,7 @@ if (nmp->nm_so) { so = nmp->nm_so; - nmp->nm_so = (struct socket *)0; + nmp->nm_so = NULL; soshutdown(so, 2); soclose(so); } @@ -414,7 +414,7 @@ soflags = rep->r_nmp->nm_soflags; if ((soflags & PR_CONNREQUIRED) || (so->so_state & SS_ISCONNECTED)) - sendnam = (struct sockaddr *)0; + sendnam = NULL; else sendnam = nam; if (so->so_type == SOCK_SEQPACKET) @@ -475,8 +475,8 @@ /* * Set up arguments for soreceive() */ - *mp = (struct mbuf *)0; - *aname = (struct sockaddr *)0; + *mp = NULL; + *aname = NULL; sotype = rep->r_nmp->nm_sotype; /* @@ -541,9 +541,7 @@ do { rcvflg = MSG_WAITALL; error = so->so_proto->pr_usrreqs->pru_soreceive - (so, (struct sockaddr **)0, &auio, - (struct mbuf **)0, (struct mbuf **)0, - &rcvflg); + (so, NULL, &auio, NULL, NULL, &rcvflg); if (error == EWOULDBLOCK && rep) { if (rep->r_flags & R_SOFTTERM) return (EINTR); @@ -583,8 +581,8 @@ do { rcvflg = MSG_WAITALL; error = so->so_proto->pr_usrreqs->pru_soreceive - (so, (struct sockaddr **)0, - &auio, mp, (struct mbuf **)0, &rcvflg); + (so, NULL, + &auio, mp, NULL, &rcvflg); } while (error == EWOULDBLOCK || error == EINTR || error == ERESTART); if (!error && auio.uio_resid > 0) { @@ -609,7 +607,7 @@ do { rcvflg = 0; error = so->so_proto->pr_usrreqs->pru_soreceive - (so, (struct sockaddr **)0, + (so, NULL, &auio, mp, &control, &rcvflg); if (control) m_freem(control); @@ -628,7 +626,7 @@ errout: if (error && error != EINTR && error != ERESTART) { m_freem(*mp); - *mp = (struct mbuf *)0; + *mp = NULL; if (error != EPIPE) log(LOG_INFO, "receive error %d from nfs server %s\n", @@ -646,7 +644,7 @@ if ((so = rep->r_nmp->nm_so) == NULL) return (EACCES); if (so->so_state & SS_ISCONNECTED) - getnam = (struct sockaddr **)0; + getnam = NULL; else getnam = aname; auio.uio_resid = len = 1000000; @@ -655,7 +653,7 @@ rcvflg = 0; error = so->so_proto->pr_usrreqs->pru_soreceive (so, getnam, &auio, mp, - (struct mbuf **)0, &rcvflg); + NULL, &rcvflg); if (error == EWOULDBLOCK && (rep->r_flags & R_SOFTTERM)) return (EINTR); @@ -664,7 +662,7 @@ } if (error) { m_freem(*mp); - *mp = (struct mbuf *)0; + *mp = NULL; } /* * Search for any mbufs that are not a multiple of 4 bytes long @@ -1130,12 +1128,10 @@ (m = m_copym(rep->r_mreq, 0, M_COPYALL, M_DONTWAIT))){ if ((nmp->nm_flag & NFSMNT_NOCONN) == 0) error = (*so->so_proto->pr_usrreqs->pru_send) - (so, 0, m, (struct sockaddr *)0, - (struct mbuf *)0, td); + (so, 0, m, NULL, NULL, td); else error = (*so->so_proto->pr_usrreqs->pru_send) - (so, 0, m, nmp->nm_nam, (struct mbuf *)0, - td); + (so, 0, m, nmp->nm_nam, NULL, td); if (error) { if (NFSIGNORE_SOERROR(nmp->nm_soflags, error)) so->so_error = 0; @@ -1162,7 +1158,7 @@ } } splx(s); - nfs_timer_handle = timeout(nfs_timer, (void *)0, nfs_ticks); + nfs_timer_handle = timeout(nfs_timer, NULL, nfs_ticks); } /* @@ -1265,7 +1261,7 @@ if (rep->r_nmp->nm_flag & NFSMNT_INT) slpflag = PCATCH; } else - td = (struct thread *)0; + td = NULL; while (*statep & NFSSTA_SNDLOCK) { if (nfs_sigintr(rep->r_nmp, rep, td)) return (EINTR); ==== //depot/projects/pmap/sys/nfsclient/nfs_subs.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_subs.c,v 1.112 2002/03/20 10:07:52 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_subs.c,v 1.113 2002/07/11 17:54:58 dillon Exp $"); /* * These functions support the macros and help fiddle mbuf chains for @@ -233,7 +233,7 @@ *tl = 0; mb->m_next = mrest; mreq->m_pkthdr.len = authsiz + 10 * NFSX_UNSIGNED + mrest_len; - mreq->m_pkthdr.rcvif = (struct ifnet *)0; + mreq->m_pkthdr.rcvif = NULL; *mbp = mb; return (mreq); } @@ -406,8 +406,8 @@ nfs_ticks = 1; /* Ensure async daemons disabled */ for (i = 0; i < NFS_MAXASYNCDAEMON; i++) { - nfs_iodwant[i] = (struct proc *)0; - nfs_iodmount[i] = (struct nfsmount *)0; + nfs_iodwant[i] = NULL; + nfs_iodmount[i] = NULL; } nfs_nhinit(); /* Init the nfsnode table */ @@ -719,14 +719,14 @@ dp->ndm_eocookie = 0; LIST_INSERT_HEAD(&np->n_cookies, dp, ndm_list); } else - return ((nfsuint64 *)0); + return (NULL); } while (pos >= NFSNUMCOOKIES) { pos -= NFSNUMCOOKIES; if (LIST_NEXT(dp, ndm_list)) { if (!add && dp->ndm_eocookie < NFSNUMCOOKIES && pos >= dp->ndm_eocookie) - return ((nfsuint64 *)0); + return (NULL); dp = LIST_NEXT(dp, ndm_list); } else if (add) { MALLOC(dp2, struct nfsdmap *, sizeof (struct nfsdmap), @@ -735,13 +735,13 @@ LIST_INSERT_AFTER(dp, dp2, ndm_list); dp = dp2; } else - return ((nfsuint64 *)0); + return (NULL); } if (pos >= dp->ndm_eocookie) { if (add) dp->ndm_eocookie = pos + 1; else - return ((nfsuint64 *)0); + return (NULL); } return (&dp->ndm_cookies[pos]); } @@ -848,7 +848,7 @@ } if (*f) { ttvp = *v; - t1 = nfs_loadattrcache(&ttvp, md, dpos, (struct vattr *)0, 0); + t1 = nfs_loadattrcache(&ttvp, md, dpos, NULL, 0); if (t1) return t1; *v = ttvp; @@ -905,7 +905,7 @@ return EBADRPC; *f = fxdr_unsigned(int, *tl); if (*f != 0) { - t1 = nfs_loadattrcache(&ttvp, md, dpos, (struct vattr *)0, 1); + t1 = nfs_loadattrcache(&ttvp, md, dpos, NULL, 1); if (t1 != 0) { *f = 0; return t1; ==== //depot/projects/pmap/sys/nfsclient/nfs_vfsops.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.118 2002/05/16 21:28:20 trhodes Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.119 2002/07/11 17:54:58 dillon Exp $"); #include "opt_bootp.h" @@ -246,7 +246,7 @@ u_quad_t tquad; #ifndef nolint - sfp = (struct nfs_statfs *)0; + sfp = NULL; #endif error = nfs_nget(mp, (nfsfh_t *)nmp->nm_fh, nmp->nm_fhsize, &np); if (error) @@ -452,7 +452,7 @@ error = rtrequest(RTM_ADD, (struct sockaddr *)&sin, (struct sockaddr *)&nd->mygateway, (struct sockaddr *)&mask, - RTF_UP | RTF_GATEWAY, (struct rtentry **)0); + RTF_UP | RTF_GATEWAY, NULL); if (error) panic("nfs_mountroot: RTM_ADD: %d", error); } @@ -697,7 +697,7 @@ if (nmp->nm_so && adjsock) { nfs_safedisconnect(nmp); if (nmp->nm_sotype == SOCK_DGRAM) - while (nfs_connect(nmp, (struct nfsreq *)0)) { + while (nfs_connect(nmp, NULL)) { printf("nfs_args: retrying connect\n"); (void) tsleep((caddr_t)&lbolt, PSOCK, "nfscon", 0); @@ -850,7 +850,7 @@ * the first request, in case the server is not responding. */ if (nmp->nm_sotype == SOCK_DGRAM && - (error = nfs_connect(nmp, (struct nfsreq *)0))) + (error = nfs_connect(nmp, NULL))) goto bad; /* ==== //depot/projects/pmap/sys/nfsclient/nfs_vnops.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.183 2002/06/28 21:53:08 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vnops.c,v 1.184 2002/07/11 17:54:58 dillon Exp $"); /* * vnode op calls for Sun NFS version 2 and 3 @@ -727,7 +727,7 @@ if (v3) { nfsm_wcc_data(vp, wccflag); } else - nfsm_loadattr(vp, (struct vattr *)0); + nfsm_loadattr(vp, NULL); m_freem(mrep); nfsmout: return (error); @@ -865,7 +865,7 @@ nfsm_postop_attr(newvp, attrflag); nfsm_postop_attr(dvp, attrflag); } else - nfsm_loadattr(newvp, (struct vattr *)0); + nfsm_loadattr(newvp, NULL); *vpp = newvp; m_freem(mrep); cnp->cn_flags |= SAVENAME; @@ -912,7 +912,7 @@ nfsm_postop_attr(newvp, attrflag); nfsm_postop_attr(dvp, attrflag); } else - nfsm_loadattr(newvp, (struct vattr *)0); + nfsm_loadattr(newvp, NULL); if (cnp->cn_nameiop != LOOKUP && (flags & ISLASTCN)) cnp->cn_flags |= SAVENAME; if ((cnp->cn_flags & MAKEENTRY) && @@ -1053,7 +1053,7 @@ tl = nfsm_dissect(u_int32_t *, 2 * NFSX_UNSIGNED); eof = fxdr_unsigned(int, *(tl + 1)); } else - nfsm_loadattr(vp, (struct vattr *)0); + nfsm_loadattr(vp, NULL); nfsm_strsiz(retlen, nmp->nm_rsize); nfsm_mtouio(uiop, retlen); m_freem(mrep); @@ -1164,7 +1164,7 @@ } } } else - nfsm_loadattr(vp, (struct vattr *)0); + nfsm_loadattr(vp, NULL); if (wccflag) VTONFS(vp)->n_mtime = VTONFS(vp)->n_vattr.va_mtime.tv_sec; m_freem(mrep); @@ -1192,8 +1192,8 @@ { struct nfsv2_sattr *sp; u_int32_t *tl; - struct vnode *newvp = (struct vnode *)0; - struct nfsnode *np = (struct nfsnode *)0; + struct vnode *newvp = NULL; + struct nfsnode *np = NULL; struct vattr vattr; caddr_t bpos, dpos; int error = 0, wccflag = NFSV3_WCCRATTR, gotvp = 0; @@ -1242,7 +1242,7 @@ if (!gotvp) { if (newvp) { vput(newvp); - newvp = (struct vnode *)0; + newvp = NULL; } error = nfs_lookitup(dvp, cnp->cn_nameptr, cnp->cn_namelen, cnp->cn_cred, cnp->cn_thread, &np); @@ -1292,8 +1292,8 @@ struct componentname *cnp = ap->a_cnp; struct nfsv2_sattr *sp; u_int32_t *tl; - struct nfsnode *np = (struct nfsnode *)0; - struct vnode *newvp = (struct vnode *)0; + struct nfsnode *np = NULL; + struct vnode *newvp = NULL; caddr_t bpos, dpos; int error = 0, wccflag = NFSV3_WCCRATTR, gotvp = 0, fmode = 0; struct mbuf *mreq, *mrep, *md, *mb; @@ -1350,7 +1350,7 @@ if (!gotvp) { if (newvp) { vput(newvp); - newvp = (struct vnode *)0; + newvp = NULL; } error = nfs_lookitup(dvp, cnp->cn_nameptr, cnp->cn_namelen, cnp->cn_cred, cnp->cn_thread, &np); @@ -1466,7 +1466,7 @@ { return (nfs_removerpc(sp->s_dvp, sp->s_name, sp->s_namlen, sp->s_cred, - (struct thread *)0)); + NULL)); } /* @@ -1694,7 +1694,7 @@ caddr_t bpos, dpos; int slen, error = 0, wccflag = NFSV3_WCCRATTR, gotvp; struct mbuf *mreq, *mrep, *md, *mb; - struct vnode *newvp = (struct vnode *)0; + struct vnode *newvp = NULL; int v3 = NFS_ISV3(dvp); nfsstats.rpccnt[NFSPROC_SYMLINK]++; @@ -1784,8 +1784,8 @@ struct componentname *cnp = ap->a_cnp; struct nfsv2_sattr *sp; int len; - struct nfsnode *np = (struct nfsnode *)0; - struct vnode *newvp = (struct vnode *)0; + struct nfsnode *np = NULL; + struct vnode *newvp = NULL; caddr_t bpos, dpos; int error = 0, wccflag = NFSV3_WCCRATTR; int gotvp = 0; @@ -1832,7 +1832,7 @@ if (error == EEXIST || (!error && !gotvp)) { if (newvp) { vrele(newvp); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 11 20:21:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE03237B401; Thu, 11 Jul 2002 20:21:33 -0700 (PDT) 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 8284937B400 for ; Thu, 11 Jul 2002 20:21:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2878A43E31 for ; Thu, 11 Jul 2002 20:21:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6C3LXJU097209 for ; Thu, 11 Jul 2002 20:21:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6C3LWj8097206 for perforce@freebsd.org; Thu, 11 Jul 2002 20:21:32 -0700 (PDT) Date: Thu, 11 Jul 2002 20:21:32 -0700 (PDT) Message-Id: <200207120321.g6C3LWj8097206@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14123 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14123 Change 14123 by peter@peter_daintree on 2002/07/11 20:20:33 Back off on the pmap_zero_page and pmap_copy_page optimizations, since they could suffer the same problem as pmap_zero_page_idle (noticed by Matt). These can be fixed with a cpu_switch hook. Affected files ... .. //depot/projects/pmap/sys/i386/i386/pmap.c#22 edit Differences ... ==== //depot/projects/pmap/sys/i386/i386/pmap.c#22 (text+ko) ==== @@ -2674,7 +2674,7 @@ if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); *CMAP2 = PG_V | PG_RW | phys | PG_A | PG_M; - invlpg((vm_offset_t)CADDR2); /* SMP: local cpu only */ + pmap_invalidate_page(kernel_pmap, (vm_offset_t)CADDR2); #if defined(I686_CPU) if (cpu_class == CPUCLASS_686) i686_pagezero(CADDR2); @@ -2682,7 +2682,6 @@ #endif bzero(CADDR2, PAGE_SIZE); *CMAP2 = 0; - invlpg((vm_offset_t)CADDR2); /* SMP: local cpu only */ } /* @@ -2707,7 +2706,7 @@ if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); *CMAP2 = PG_V | PG_RW | phys | PG_A | PG_M; - invlpg((vm_offset_t)CADDR2); /* SMP: local cpu only */ + pmap_invalidate_page(kernel_pmap, (vm_offset_t)CADDR2); #if defined(I686_CPU) if (cpu_class == CPUCLASS_686 && off == 0 && size == PAGE_SIZE) i686_pagezero(CADDR2); @@ -2715,7 +2714,6 @@ #endif bzero((char *)CADDR2 + off, size); *CMAP2 = 0; - invlpg((vm_offset_t)CADDR2); /* SMP: local cpu only */ } /* @@ -2748,7 +2746,6 @@ #endif bzero(CADDR3, PAGE_SIZE); *CMAP3 = 0; - invlpg((vm_offset_t)CADDR3); /* SMP: local cpu only */ } /* @@ -2767,13 +2764,15 @@ panic("pmap_copy_page: CMAP2 busy"); *CMAP1 = PG_V | VM_PAGE_TO_PHYS(src) | PG_A; *CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M; - invlpg((vm_offset_t)CADDR1); /* SMP: local cpu only */ - invlpg((vm_offset_t)CADDR2); /* SMP: local cpu only */ + /* + * XXX we "know" that CADDR2 immediately follows CADDR1 and use + * that to save an IPI on SMP systems. + */ + pmap_invalidate_range(kernel_pmap, (vm_offset_t)CADDR1, + (vm_offset_t)CADDR2); bcopy(CADDR1, CADDR2, PAGE_SIZE); *CMAP1 = 0; *CMAP2 = 0; - invlpg((vm_offset_t)CADDR1); /* SMP: local cpu only */ - invlpg((vm_offset_t)CADDR2); /* SMP: local cpu only */ } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 11 21:27:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95DF037B405; Thu, 11 Jul 2002 21:27:13 -0700 (PDT) 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 BD28837B400; Thu, 11 Jul 2002 21:27:12 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 061A343E42; Thu, 11 Jul 2002 21:27:12 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g6C4R7bM086547; Fri, 12 Jul 2002 00:27:07 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Fri, 12 Jul 2002 00:27:07 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 14031 for review In-Reply-To: <200207101502.g6AF2GVj077852@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I'm not sure this is a good idea -- you may have broken default labels on read-only multilabel file systems, since you've introduced a new failure mode. You've also introduced a write where previously we often did only a cached read... Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Wed, 10 Jul 2002, Brian Feldman wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14031 > > Change 14031 by green@green_laptop_2 on 2002/07/10 08:02:13 > > * Fix a bug where mac_update_vnode_from_externalized would _never_ > get called. (ALSO: LAZY INSTANTIATE ALL FREEBSD.MAC LABELS) > * Remove mac_create_vnode_from_exported() > > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#160 edit > .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#109 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#160 (text+ko) ==== > > @@ -917,10 +917,19 @@ > > case EOPNOTSUPP: > case ENOATTR: > - /* Use the label from the mountpoint. */ > + /* > + * Use the label from the mountpoint. Take this opportunity > + * to lazy-instantiate, just for correctness. > + */ > mac_update_vnode_from_mount(vp, vp->v_mount); > - return (0); > - > + error = mac_externalize(&vp->v_label, &extmac); > + if (error) > + return (error); > + error = vn_extattr_set(vp, IO_NODELOCKED, > + FREEBSD_MAC_EXTATTR_NAMESPACE, FREEBSD_MAC_EXTATTR_NAME, > + sizeof(extmac), (char *)&extmac, curthread); > + if (error == 0) > + break; > default: > /* Fail horribly. */ > return (error); > @@ -987,8 +996,7 @@ > * about doing this. > */ > mac_update_vnode_from_mount(vp, vp->v_mount); > - > - return (0); > + error = 0; > default: > return (error); > } > @@ -2216,16 +2224,6 @@ > child, &child->v_label); > } > > -void > -mac_create_vnode_from_exported(struct ucred *cred, struct vnode *vp, > - struct mac *extmac, struct label *intlabel) > -{ > - > - ASSERT_VOP_LOCKED(vp, "mac_create_vnode_from_exported"); > - > - MAC_PERFORM(create_vnode_from_exported, cred, vp, extmac, intlabel); > -} > - > int > mac_cred_check_statfs(struct ucred *cred, struct mount *mount) > { > > ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#109 (text+ko) ==== > > @@ -326,8 +326,6 @@ > struct ucred *cred_child); > void mac_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, > struct vnode *child); > -void mac_create_vnode_from_exported(struct ucred *cred, struct vnode *vp, > - struct mac *extmac, struct label *intlabel); > void mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, > struct socket *socket); > void mac_set_socket_peer_from_socket(struct socket *oldsocket, > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 11 21:54:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEDC037B401; Thu, 11 Jul 2002 21:54:30 -0700 (PDT) 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 6D4A637B400 for ; Thu, 11 Jul 2002 21:54:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 29C7D43E31 for ; Thu, 11 Jul 2002 21:54:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6C4sUJU009800 for ; Thu, 11 Jul 2002 21:54:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6C4sTax009797 for perforce@freebsd.org; Thu, 11 Jul 2002 21:54:29 -0700 (PDT) Date: Thu, 11 Jul 2002 21:54:29 -0700 (PDT) Message-Id: <200207120454.g6C4sTax009797@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14125 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14125 Change 14125 by rwatson@rwatson_paprika on 2002/07/11 21:54:24 Back out the lazy instantiate component of @14031, as it broke mount-derived labels on multilabel (read-only or full) file systems, as the EA write could result in a failure of the label refresh, even though a valid label is available. Approved by: green Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#164 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#164 (text+ko) ==== @@ -913,18 +913,11 @@ case ENOATTR: /* - * Use the label from the mountpoint. Take this opportunity - * to lazy-instantiate, just for correctness. + * Use the label from the mountpoint. */ mac_update_vnode_from_mount(vp, vp->v_mount); - error = mac_externalize(&vp->v_label, &extmac); - if (error) - return (error); - error = vn_extattr_set(vp, IO_NODELOCKED, - FREEBSD_MAC_EXTATTR_NAMESPACE, FREEBSD_MAC_EXTATTR_NAME, - sizeof(extmac), (char *)&extmac, curthread); - if (error == 0) - break; + return (0); + case EOPNOTSUPP: default: /* Fail horribly. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 11 21:57:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CF6037B406; Thu, 11 Jul 2002 21:57:37 -0700 (PDT) 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 E2F9B37B400 for ; Thu, 11 Jul 2002 21:57:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8367343E09 for ; Thu, 11 Jul 2002 21:57:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6C4vYJU010037 for ; Thu, 11 Jul 2002 21:57:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6C4vYMk010034 for perforce@freebsd.org; Thu, 11 Jul 2002 21:57:34 -0700 (PDT) Date: Thu, 11 Jul 2002 21:57:34 -0700 (PDT) Message-Id: <200207120457.g6C4vYMk010034@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14126 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14126 Change 14126 by peter@peter_overcee on 2002/07/11 21:57:17 s/ / / (s/8-spaces/tab/) Affected files ... .. //depot/projects/pmap/sys/i386/i386/pmap.c#23 edit Differences ... ==== //depot/projects/pmap/sys/i386/i386/pmap.c#23 (text+ko) ==== @@ -622,7 +622,7 @@ u_int cpumask; u_int other_cpus; struct thread *td; - vm_offset_t addr; + vm_offset_t addr; td = curthread; critical_enter(); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 1:28: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6A6237B401; Fri, 12 Jul 2002 01:26:52 -0700 (PDT) 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 734E437B400 for ; Fri, 12 Jul 2002 01:26:52 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F4CF43E4A for ; Fri, 12 Jul 2002 01:26:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6C8QpJU058935 for ; Fri, 12 Jul 2002 01:26:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6C8Qpwl058932 for perforce@freebsd.org; Fri, 12 Jul 2002 01:26:51 -0700 (PDT) Date: Fri, 12 Jul 2002 01:26:51 -0700 (PDT) Message-Id: <200207120826.g6C8Qpwl058932@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14134 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14134 Change 14134 by peter@peter_daintree on 2002/07/12 01:25:56 IFC @14133 (run the merge-o-matic) Affected files ... .. //depot/projects/pmap/sys/conf/options#6 integrate .. //depot/projects/pmap/sys/conf/options.i386#9 integrate .. //depot/projects/pmap/sys/conf/options.pc98#9 integrate .. //depot/projects/pmap/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/pmap/sys/i386/conf/NOTES#6 integrate .. //depot/projects/pmap/sys/i386/i386/bios.c#9 integrate .. //depot/projects/pmap/sys/i386/i386/db_interface.c#5 integrate .. //depot/projects/pmap/sys/i386/i386/locore.s#10 integrate .. //depot/projects/pmap/sys/i386/i386/mp_machdep.c#22 integrate .. //depot/projects/pmap/sys/i386/i386/mpapic.c#8 integrate .. //depot/projects/pmap/sys/i386/i386/pmap.c#24 integrate .. //depot/projects/pmap/sys/i386/i386/support.s#7 integrate .. //depot/projects/pmap/sys/i386/i386/vm86.c#5 integrate .. //depot/projects/pmap/sys/i386/include/cpufunc.h#12 integrate .. //depot/projects/pmap/sys/i386/include/pmap.h#11 integrate .. //depot/projects/pmap/sys/i386/include/smp.h#9 integrate .. //depot/projects/pmap/sys/i386/isa/apic_vector.s#11 integrate .. //depot/projects/pmap/sys/i386/isa/intr_machdep.h#8 integrate .. //depot/projects/pmap/sys/kern/init_sysent.c#5 integrate .. //depot/projects/pmap/sys/kern/kern_subr.c#5 integrate .. //depot/projects/pmap/sys/kern/makesyscalls.sh#4 integrate .. //depot/projects/pmap/sys/kern/subr_witness.c#12 integrate .. //depot/projects/pmap/sys/kern/syscalls.c#5 integrate .. //depot/projects/pmap/sys/kern/syscalls.master#5 integrate .. //depot/projects/pmap/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/pmap/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/pmap/sys/sys/syscall.h#5 integrate .. //depot/projects/pmap/sys/sys/syscall.mk#5 integrate .. //depot/projects/pmap/sys/sys/sysproto.h#5 integrate .. //depot/projects/pmap/sys/vm/device_pager.c#3 integrate .. //depot/projects/pmap/sys/vm/vm_contig.c#4 integrate .. //depot/projects/pmap/sys/vm/vm_glue.c#9 integrate Differences ... ==== //depot/projects/pmap/sys/conf/options#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.330 2002/07/11 04:15:53 ken Exp $ +# $FreeBSD: src/sys/conf/options,v 1.331 2002/07/12 06:38:33 alfred Exp $ # # On the handling of kernel options # @@ -66,6 +66,7 @@ ADAPTIVE_MUTEXES COMPAT_43 opt_compat.h +COMPAT_FREEBSD4 opt_compat.h COMPAT_SUNOS opt_compat.h COMPILING_LINT opt_global.h CY_PCI_FASTINTR ==== //depot/projects/pmap/sys/conf/options.i386#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.171 2002/06/18 21:30:36 n_hibma Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.172 2002/07/12 07:56:07 peter Exp $ # Options specific to the i386 platform kernels MATH_EMULATE opt_math_emulate.h ==== //depot/projects/pmap/sys/conf/options.pc98#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.146 2002/06/18 21:30:37 n_hibma Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.147 2002/07/12 07:56:07 peter Exp $ # Options specific to the pc98 platform kernels MATH_EMULATE opt_math_emulate.h ==== //depot/projects/pmap/sys/i386/conf/GENERIC#4 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.348 2002/07/08 11:56:44 markm Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.349 2002/07/12 06:38:34 alfred Exp $ machine i386 cpu I486_CPU @@ -43,6 +43,7 @@ options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] +options COMPAT_FREEBSD4 #Compatible with FreeBSD4 options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory ==== //depot/projects/pmap/sys/i386/conf/NOTES#6 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1020 2002/05/06 00:45:27 jedgar Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1021 2002/07/12 06:38:34 alfred Exp $ # # @@ -874,6 +874,9 @@ # and PSEUDOFS) options LINPROCFS +# Enable FreeBSD4 compatibility syscalls +options COMPAT_FREEBSD4 + # # SysVR4 ABI emulation # ==== //depot/projects/pmap/sys/i386/i386/bios.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/bios.c,v 1.53 2002/05/13 14:34:47 bde Exp $ + * $FreeBSD: src/sys/i386/i386/bios.c,v 1.54 2002/07/12 07:56:08 peter Exp $ */ /* ==== //depot/projects/pmap/sys/i386/i386/db_interface.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/i386/i386/db_interface.c,v 1.65 2002/03/20 08:56:31 alfred Exp $ + * $FreeBSD: src/sys/i386/i386/db_interface.c,v 1.66 2002/07/12 07:56:08 peter Exp $ */ /* ==== //depot/projects/pmap/sys/i386/i386/locore.s#10 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/locore.s,v 1.157 2002/07/10 19:36:04 obrien Exp $ + * $FreeBSD: src/sys/i386/i386/locore.s,v 1.158 2002/07/12 07:56:08 peter Exp $ * * originally from: locore.s, by William F. Jolitz * ==== //depot/projects/pmap/sys/i386/i386/mp_machdep.c#22 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.187 2002/07/11 08:31:10 peter Exp $ + * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.188 2002/07/12 07:56:08 peter Exp $ */ #include "opt_cpu.h" @@ -2285,6 +2285,22 @@ * Both of these latter forms do some very strange things on gcc-3.1 with * -mcpu=pentiumpro and/or -march=pentiumpro and/or -O or -O2. * There is probably an SSE or MMX popcnt instruction. + * + * I wonder if this should be in libkern? + * + * XXX Stop the presses! Another one: + * static __inline u_int32_t + * popcnt1(u_int32_t v) + * { + * v -= ((v >> 1) & 0x55555555); + * v = (v & 0x33333333) + ((v >> 2) & 0x33333333); + * v = (v + (v >> 4)) & 0x0F0F0F0F; + * return (v * 0x01010101) >> 24; + * } + * The downside is that it has a multiply. With a pentium3 with + * -mcpu=pentiumpro and -march=pentiumpro then gcc-3.1 will use + * an imull, and in that case it is faster. In most other cases + * it appears slightly slower. */ static __inline u_int32_t popcnt(u_int32_t m) ==== //depot/projects/pmap/sys/i386/i386/mpapic.c#8 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/mpapic.c,v 1.58 2002/03/27 05:39:19 dillon Exp $ + * $FreeBSD: src/sys/i386/i386/mpapic.c,v 1.59 2002/07/12 07:56:08 peter Exp $ */ #include ==== //depot/projects/pmap/sys/i386/i386/pmap.c#24 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.335 2002/07/08 04:24:25 peter Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.337 2002/07/12 07:56:09 peter Exp $ */ /* @@ -84,7 +84,7 @@ #include #include #include -#if defined(SMP) +#ifdef SMP #include #endif @@ -572,15 +572,54 @@ return 0; } +#ifdef I386_CPU +/* + * i386 only has "invalidate everything" and no SMP to worry about. + */ +PMAP_INLINE void +pmap_invalidate_page(pmap_t pmap, vm_offset_t va) +{ + + if (pmap == kernel_pmap || pmap->pm_active) + invltlb(); +} + +PMAP_INLINE void +pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + + if (pmap == kernel_pmap || pmap->pm_active) + invltlb(); +} +#endif + #ifdef SMP void +pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + u_int cpumask; + u_int other_cpus; + struct thread *td; + vm_offset_t addr; + +PMAP_INLINE void +pmap_invalidate_all(pmap_t pmap) +{ + + if (pmap == kernel_pmap || pmap->pm_active) + invltlb(); +} +#else /* !I386_CPU */ +#ifdef SMP +/* + * For SMP, these functions have to use the IPI mechanism for coherence. + */ +void pmap_invalidate_page(pmap_t pmap, vm_offset_t va) { u_int cpumask; u_int other_cpus; - struct thread *td; - td = curthread; critical_enter(); /* * We need to disable interrupt preemption but MUST NOT have @@ -600,31 +639,14 @@ } critical_exit(); } -#else -PMAP_INLINE void -pmap_invalidate_page(pmap_t pmap, vm_offset_t va) -{ - -#ifndef I386_CPU - if (pmap == kernel_pmap || pmap->pm_active) - invlpg(va); -#else - if (pmap == kernel_pmap || pmap->pm_active) - invltlb(); -#endif -} -#endif -#ifdef SMP void pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { u_int cpumask; u_int other_cpus; - struct thread *td; vm_offset_t addr; - td = curthread; critical_enter(); /* * We need to disable interrupt preemption but MUST NOT have @@ -647,32 +669,13 @@ } critical_exit(); } -#else -PMAP_INLINE void -pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) -{ -#ifndef I386_CPU - vm_offset_t addr; - - if (pmap == kernel_pmap || pmap->pm_active) - for (addr = sva; addr < eva; addr += PAGE_SIZE) - invlpg(addr); -#else - if (pmap == kernel_pmap || pmap->pm_active) - invltlb(); -#endif -} -#endif -#ifdef SMP void pmap_invalidate_all(pmap_t pmap) { u_int cpumask; u_int other_cpus; - struct thread *td; - td = curthread; critical_enter(); /* * We need to disable interrupt preemption but MUST NOT have @@ -692,7 +695,30 @@ } critical_exit(); } -#else +#else /* !SMP */ +/* + * Normal, non-SMP, 486+ invalidation functions. + * We inline these within pmap.c for speed. + */ +PMAP_INLINE void +pmap_invalidate_page(pmap_t pmap, vm_offset_t va) +{ + + if (pmap == kernel_pmap || pmap->pm_active) + invlpg(va); +} + +PMAP_INLINE void +pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + vm_offset_t addr; + + if (pmap == kernel_pmap || pmap->pm_active) + for (addr = sva; addr < eva; addr += PAGE_SIZE) + invlpg(addr); +} +#endif + PMAP_INLINE void pmap_invalidate_all(pmap_t pmap) { @@ -700,7 +726,8 @@ if (pmap == kernel_pmap || pmap->pm_active) invltlb(); } -#endif +#endif /* !SMP */ +#endif /* !I386_CPU */ /* * Return an address which is the base of the Virtual mapping of @@ -753,7 +780,7 @@ newpf = pde & PG_FRAME; if (((*PMAP1) & PG_FRAME) != newpf) { *PMAP1 = newpf | PG_RW | PG_V; - pmap_invalidate_page(kernel_pmap, (vm_offset_t) PADDR1); + pmap_invalidate_page(kernel_pmap, (vm_offset_t)PADDR1); } return PADDR1 + (index & (NPTEPG - 1)); } @@ -798,7 +825,8 @@ ***************************************************/ /* - * add a wired page to the kva + * Add a wired page to the kva. + * Note: not SMP coherent. */ PMAP_INLINE void pmap_kenter(vm_offset_t va, vm_offset_t pa) @@ -810,7 +838,8 @@ } /* - * remove a page from the kernel pagetables + * Remove a page from the kernel pagetables. + * Note: not SMP coherent. */ PMAP_INLINE void pmap_kremove(vm_offset_t va) @@ -857,6 +886,7 @@ * page modification or references recorded. * Note that old mappings are simply written * over. The page *must* be wired. + * Note: SMP coherent. Uses a ranged shootdown IPI. */ void pmap_qenter(vm_offset_t sva, vm_page_t *m, int count) @@ -873,8 +903,9 @@ } /* - * this routine jerks page mappings from the + * This routine tears out page mappings from the * kernel -- it is meant only for temporary mappings. + * Note: SMP coherent. Uses a ranged shootdown IPI. */ void pmap_qremove(vm_offset_t sva, int count) @@ -893,6 +924,7 @@ pmap_page_lookup(vm_object_t object, vm_pindex_t pindex) { vm_page_t m; + retry: m = vm_page_lookup(object, pindex); if (m && vm_page_sleep_busy(m, FALSE, "pplookp")) @@ -1440,7 +1472,7 @@ { unsigned long ksize = VM_MAX_KERNEL_ADDRESS - KERNBASE; - return sysctl_handle_long(oidp, &ksize, 0, req); + return sysctl_handle_long(oidp, &ksize, 0, req); } SYSCTL_PROC(_vm, OID_AUTO, kvm_size, CTLTYPE_LONG|CTLFLAG_RD, 0, 0, kvm_size, "IU", "Size of KVM"); @@ -1450,7 +1482,7 @@ { unsigned long kfree = VM_MAX_KERNEL_ADDRESS - kernel_vm_end; - return sysctl_handle_long(oidp, &kfree, 0, req); + return sysctl_handle_long(oidp, &kfree, 0, req); } SYSCTL_PROC(_vm, OID_AUTO, kvm_free, CTLTYPE_LONG|CTLFLAG_RD, 0, 0, kvm_free, "IU", "Amount of KVM free"); @@ -2769,7 +2801,7 @@ * that to save an IPI on SMP systems. */ pmap_invalidate_range(kernel_pmap, (vm_offset_t)CADDR1, - (vm_offset_t)CADDR2); + (vm_offset_t)CADDR2 + PAGE_SIZE); bcopy(CADDR1, CADDR2, PAGE_SIZE); *CMAP1 = 0; *CMAP2 = 0; ==== //depot/projects/pmap/sys/i386/i386/support.s#7 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/support.s,v 1.90 2002/06/20 07:13:33 peter Exp $ + * $FreeBSD: src/sys/i386/i386/support.s,v 1.91 2002/07/12 07:56:09 peter Exp $ */ #include "opt_npx.h" ==== //depot/projects/pmap/sys/i386/i386/vm86.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/vm86.c,v 1.46 2002/06/20 07:23:08 peter Exp $ + * $FreeBSD: src/sys/i386/i386/vm86.c,v 1.48 2002/07/12 08:15:42 peter Exp $ */ #include @@ -483,10 +483,10 @@ for (i = 0; i < vmc->npages; i++) if (vmc->pmap[i].pte_num == pagenum) - goto bad; + goto overlap; if (vmc->npages == VM86_PMAPSIZE) - goto bad; /* XXX grow map? */ + goto full; /* XXX grow map? */ if (kva == 0) { kva = (vm_offset_t)malloc(PAGE_SIZE, M_TEMP, M_WAITOK); @@ -498,8 +498,10 @@ vmc->pmap[i].kva = kva; vmc->pmap[i].pte_num = pagenum; return (kva); -bad: - panic("vm86_addpage: not enough room, or overlap"); +overlap: + panic("vm86_addpage: overlap"); +full: + panic("vm86_addpage: not enough room"); } static void ==== //depot/projects/pmap/sys/i386/include/cpufunc.h#12 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.125 2002/05/22 20:32:39 jhb Exp $ + * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.126 2002/07/12 07:56:10 peter Exp $ */ /* ==== //depot/projects/pmap/sys/i386/include/pmap.h#11 (text+ko) ==== @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pmap.h,v 1.79 2002/07/08 08:14:28 peter Exp $ + * $FreeBSD: src/sys/i386/include/pmap.h,v 1.80 2002/07/12 07:56:10 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ ==== //depot/projects/pmap/sys/i386/include/smp.h#9 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/i386/include/smp.h,v 1.70 2002/03/23 15:09:35 bde Exp $ + * $FreeBSD: src/sys/i386/include/smp.h,v 1.71 2002/07/12 07:56:10 peter Exp $ * */ ==== //depot/projects/pmap/sys/i386/isa/apic_vector.s#11 (text+ko) ==== @@ -1,6 +1,6 @@ /* * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/isa/apic_vector.s,v 1.83 2002/07/11 08:31:10 peter Exp $ + * $FreeBSD: src/sys/i386/isa/apic_vector.s,v 1.84 2002/07/12 07:56:10 peter Exp $ */ @@ -310,7 +310,6 @@ mov %ax, %fs movl PCPU(CPUID), %eax popl %fs - ss incl xhits_pg(,%eax,4) #endif /* COUNT_XINVLTLB_HITS */ ==== //depot/projects/pmap/sys/i386/isa/intr_machdep.h#8 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.41 2002/06/29 02:32:33 peter Exp $ + * $FreeBSD: src/sys/i386/isa/intr_machdep.h,v 1.42 2002/07/12 07:56:10 peter Exp $ */ #ifndef _I386_ISA_INTR_MACHDEP_H_ ==== //depot/projects/pmap/sys/kern/init_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.125 2002/06/29 17:26:18 julian Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.126 2002/07/12 06:52:43 alfred Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.114 2002/06/29 17:26:19 julian Exp */ #include "opt_compat.h" @@ -20,6 +20,12 @@ #define compat(n, name) 0, (sy_call_t *)nosys #endif +#ifdef COMPAT_FREEBSD4 +#define compat4(n, name) n, (sy_call_t *)__CONCAT(freebsd4_,name) +#else +#define compat4(n, name) 0, (sy_call_t *)nosys +#endif + /* The casts are bogus but will do for now. */ struct sysent sysent[] = { { 0, (sy_call_t *)nosys }, /* 0 = syscall */ @@ -358,7 +364,7 @@ { SYF_MPSAFE | AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min }, /* 333 = sched_get_priority_min */ { SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval }, /* 334 = sched_rr_get_interval */ { AS(utrace_args), (sy_call_t *)utrace }, /* 335 = utrace */ - { SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile }, /* 336 = sendfile */ + { compat4(SYF_MPSAFE | AS(freebsd4_sendfile_args),sendfile) }, /* 336 = old sendfile */ { AS(kldsym_args), (sy_call_t *)kldsym }, /* 337 = kldsym */ { SYF_MPSAFE | AS(jail_args), (sy_call_t *)jail }, /* 338 = jail */ { 0, (sy_call_t *)nosys }, /* 339 = pioctl */ @@ -415,4 +421,5 @@ { AS(kenv_args), (sy_call_t *)kenv }, /* 390 = kenv */ { AS(lchflags_args), (sy_call_t *)lchflags }, /* 391 = lchflags */ { AS(uuidgen_args), (sy_call_t *)uuidgen }, /* 392 = uuidgen */ + { SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile }, /* 393 = sendfile */ }; ==== //depot/projects/pmap/sys/kern/kern_subr.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_subr.c,v 1.57 2002/06/30 02:07:26 iedowse Exp $ + * $FreeBSD: src/sys/kern/kern_subr.c,v 1.58 2002/07/12 02:23:55 ken Exp $ */ #include "opt_zero.h" @@ -56,32 +56,27 @@ #include #include #include +#ifdef ZERO_COPY_SOCKETS +#include +#endif +#if defined(ZERO_COPY_SOCKETS) || defined(ENABLE_VFS_IOOPT) +#include +#endif SYSCTL_INT(_kern, KERN_IOV_MAX, iov_max, CTLFLAG_RD, NULL, UIO_MAXIOV, "Maximum number of elements in an I/O vector; sysconf(_SC_IOV_MAX)"); +#if defined(ZERO_COPY_SOCKETS) || defined(ENABLE_VFS_IOOPT) +static int userspaceco(caddr_t cp, u_int cnt, struct uio *uio, + struct vm_object *obj, int disposable); +#endif + #ifdef ZERO_COPY_SOCKETS -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - /* Declared in uipc_socket.c */ extern int so_zero_copy_receive; static int vm_pgmoveco(vm_map_t mapa, vm_object_t srcobj, vm_offset_t kaddr, vm_offset_t uaddr); -static int userspaceco(caddr_t cp, u_int cnt, struct uio *uio, - struct vm_object *obj, int disposable); static int vm_pgmoveco(mapa, srcobj, kaddr, uaddr) ==== //depot/projects/pmap/sys/kern/makesyscalls.sh#4 (text+ko) ==== @@ -1,11 +1,12 @@ #! /bin/sh - # @(#)makesyscalls.sh 8.1 (Berkeley) 6/10/93 -# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.55 2002/04/22 13:44:34 des Exp $ +# $FreeBSD: src/sys/kern/makesyscalls.sh,v 1.56 2002/07/12 06:38:34 alfred Exp $ set -e -# name of compat option: +# name of compat options: compat=COMPAT_43 +compat4=COMPAT_FREEBSD4 # output files: sysnames="syscalls.c" @@ -22,13 +23,16 @@ sysdcl="sysent.dcl.$$" syscompat="sysent.compat.$$" syscompatdcl="sysent.compatdcl.$$" +syscompat4="sysent.compat4.$$" +syscompat4dcl="sysent.compat4dcl.$$" sysent="sysent.switch.$$" sysinc="sysinc.switch.$$" sysarg="sysarg.switch.$$" +sysprotoend="sysprotoend.$$" -trap "rm $sysdcl $syscompat $syscompatdcl $sysent $sysinc $sysarg" 0 +trap "rm $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend" 0 -touch $sysdcl $syscompat $syscompatdcl $sysent $sysinc $sysarg +touch $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $sysent $sysinc $sysarg $sysprotoend case $# in 0) echo "usage: $0 input-file " 1>&2 @@ -56,9 +60,12 @@ BEGIN { sysdcl = \"$sysdcl\" sysproto = \"$sysproto\" + sysprotoend = \"$sysprotoend\" sysproto_h = \"$sysproto_h\" syscompat = \"$syscompat\" syscompatdcl = \"$syscompatdcl\" + syscompat4 = \"$syscompat4\" + syscompat4dcl = \"$syscompat4dcl\" sysent = \"$sysent\" syssw = \"$syssw\" sysinc = \"$sysinc\" @@ -67,6 +74,7 @@ syshdr = \"$syshdr\" sysmk = \"$sysmk\" compat = \"$compat\" + compat4 = \"$compat4\" syscallprefix = \"$syscallprefix\" switchname = \"$switchname\" namesname = \"$namesname\" @@ -82,6 +90,7 @@ printf " * $%s$\n", "FreeBSD" > sysarg printf "\n#ifdef %s\n\n", compat > syscompat + printf "\n#ifdef %s\n\n", compat4 > syscompat4 printf "/*\n * System call names.\n *\n" > sysnames printf " * DO NOT EDIT-- this file is automatically generated.\n" > sysnames @@ -141,6 +150,7 @@ print > sysdcl print > sysarg print > syscompat + print > syscompat4 print > sysnames savesyscall = syscall next @@ -150,6 +160,7 @@ print > sysdcl print > sysarg print > syscompat + print > syscompat4 print > sysnames syscall = savesyscall next @@ -159,6 +170,7 @@ print > sysdcl print > sysarg print > syscompat + print > syscompat4 print > sysnames next } @@ -224,6 +236,8 @@ argalias = funcname "_args" if ($2 == "COMPAT") argalias = "o" argalias + if ($2 == "COMPAT4") + argalias = "freebsd4_" argalias } f++ @@ -280,6 +294,8 @@ $2 = "NOSTD"; } else if ($2 == "MCOMPAT") { $2 = "COMPAT"; + } else if ($2 == "MCOMPAT4") { + $2 = "COMPAT4"; } else if ($2 == "MCPT_NOA") { $2 = "CPT_NOA"; } else if ($2 == "MLIBCOMPAT") { @@ -348,26 +364,38 @@ syscall++ next } - $2 == "COMPAT" || $2 == "CPT_NOA" { - ncompat++ + $2 == "COMPAT" || $2 == "COMPAT4" || $2 == "CPT_NOA" { + if ($2 == "COMPAT" || $2 == "CPT_NOA") { + ncompat++ + out = syscompat + outdcl = syscompatdcl + wrap = "compat" + prefix = "o" + } else if ($2 == "COMPAT4") { + ncompat4++ + out = syscompat4 + outdcl = syscompat4dcl + wrap = "compat4" + prefix = "freebsd4_" + } parseline() if (argc != 0 && $2 != "CPT_NOA") { - printf("struct %s {\n", argalias) > syscompat + printf("struct %s {\n", argalias) > out for (i = 1; i <= argc; i++) printf("\tchar %s_l_[PADL_(%s)]; %s %s; " \ "char %s_r_[PADR_(%s)];\n", argname[i], argtype[i], argtype[i], argname[i], - argname[i], argtype[i]) > syscompat - printf("};\n") > syscompat + argname[i], argtype[i]) > out + printf("};\n") > out } else if($2 != "CPT_NOA") printf("struct %s {\n\tregister_t dummy;\n};\n", argalias) > sysarg - printf("%s\to%s(struct thread *, struct %s *);\n", - rettype, funcname, argalias) > syscompatdcl - printf("\t{ compat(%s%s,%s) },", - mpsafe, argssize, funcname) > sysent + printf("%s\t%s%s(struct thread *, struct %s *);\n", + rettype, prefix, funcname, argalias) > outdcl + printf("\t{ %s(%s%s,%s) },", + wrap, mpsafe, argssize, funcname) > sysent align_sysent_comment(8 + 9 + length(mpsafe) + \ length(argssize) + 1 + length(funcname) + 4) printf("/* %d = old %s */\n", syscall, funcalias) > sysent @@ -420,8 +448,11 @@ } END { printf "\n#define AS(name) (sizeof(struct name) / sizeof(register_t))\n" > sysinc + + if (ncompat != 0 || ncompat4 != 0) + printf "#include \"opt_compat.h\"\n\n" > syssw + if (ncompat != 0) { - printf "#include \"opt_compat.h\"\n\n" > syssw printf "\n#ifdef %s\n", compat > sysinc printf "#define compat(n, name) n, (sy_call_t *)__CONCAT(o,name)\n" > sysinc printf "#else\n" > sysinc @@ -429,11 +460,22 @@ printf "#endif\n" > sysinc } + if (ncompat4 != 0) { + printf "\n#ifdef %s\n", compat4 > sysinc + printf "#define compat4(n, name) n, (sy_call_t *)__CONCAT(freebsd4_,name)\n" > sysinc + printf "#else\n" > sysinc + printf "#define compat4(n, name) 0, (sy_call_t *)nosys\n" > sysinc + printf "#endif\n" > sysinc + } + printf("\n#endif /* %s */\n\n", compat) > syscompatdcl - printf("#undef PAD_\n") > syscompatdcl - printf("#undef PADL_\n") > syscompatdcl - printf("#undef PADR_\n") > syscompatdcl - printf("\n#endif /* !%s */\n", sysproto_h) > syscompatdcl + + printf("\n#endif /* %s */\n\n", compat4) > syscompat4dcl + + printf("#undef PAD_\n") > sysprotoend + printf("#undef PADL_\n") > sysprotoend + printf("#undef PADR_\n") > sysprotoend + printf("\n#endif /* !%s */\n", sysproto_h) > sysprotoend printf("\n") > sysmk printf("};\n") > sysent @@ -443,4 +485,8 @@ } ' cat $sysinc $sysent >> $syssw -cat $sysarg $sysdcl $syscompat $syscompatdcl > $sysproto +cat $sysarg $sysdcl \ + $syscompat $syscompatdcl \ + $syscompat4 $syscompat4dcl \ + $sysprotoend > $sysproto + ==== //depot/projects/pmap/sys/kern/subr_witness.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/subr_witness.c,v 1.120 2002/07/04 22:07:37 alc Exp $ + * $FreeBSD: src/sys/kern/subr_witness.c,v 1.121 2002/07/12 07:56:11 peter Exp $ */ /* ==== //depot/projects/pmap/sys/kern/syscalls.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.111 2002/06/13 23:44:50 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.113 2002/06/13 23:43:53 rwatson Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.112 2002/07/12 06:52:43 alfred Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.114 2002/06/29 17:26:19 julian Exp */ char *syscallnames[] = { @@ -343,7 +343,7 @@ "sched_get_priority_min", /* 333 = sched_get_priority_min */ "sched_rr_get_interval", /* 334 = sched_rr_get_interval */ "utrace", /* 335 = utrace */ - "sendfile", /* 336 = sendfile */ + "old.sendfile", /* 336 = old sendfile */ "kldsym", /* 337 = kldsym */ "jail", /* 338 = jail */ "#339", /* 339 = pioctl */ @@ -400,4 +400,5 @@ "kenv", /* 390 = kenv */ "lchflags", /* 391 = lchflags */ "uuidgen", /* 392 = uuidgen */ + "sendfile", /* 393 = sendfile */ }; ==== //depot/projects/pmap/sys/kern/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.114 2002/06/29 17:26:19 julian Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.115 2002/07/12 06:51:57 alfred Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -8,7 +8,7 @@ ; number system call number, must be in order ; type one of [M]STD, [M]OBSOL, [M]UNIMPL, [M]COMPAT, [M]CPT_NOA, ; [M]LIBCOMPAT, [M]NODEF, [M]NOARGS, [M]NOPROTO, [M]NOIMPL, -; [M]NOSTD +; [M]NOSTD, [M]COMPAT4 ; namespc one of POSIX, BSD, NOHIDE ; name psuedo-prototype of syscall routine ; If one of the following alts is different, then all appear: @@ -23,6 +23,7 @@ ; lock for the syscall. ; STD always included ; COMPAT included on COMPAT #ifdef +; COMPAT4 included on COMPAT4 #ifdef (FreeBSD 4 compat) ; LIBCOMPAT included on COMPAT #ifdef, and placed in syscall.h ; OBSOL obsolete, not included in system, only specifies name ; UNIMPL not implemented, placeholder only @@ -479,7 +480,7 @@ 333 MSTD POSIX { int sched_get_priority_min (int policy); } 334 MSTD POSIX { int sched_rr_get_interval (pid_t pid, struct timespec *interval); } 335 STD BSD { int utrace(const void *addr, size_t len); } -336 MSTD BSD { int sendfile(int fd, int s, off_t offset, size_t nbytes, \ +336 MCOMPAT4 BSD { int sendfile(int fd, int s, off_t offset, size_t nbytes, \ struct sf_hdtr *hdtr, off_t *sbytes, int flags); } 337 STD BSD { int kldsym(int fileid, int cmd, void *data); } 338 MSTD BSD { int jail(struct jail *jail); } @@ -563,3 +564,5 @@ int len); } 391 STD BSD { int lchflags(const char *path, int flags); } 392 STD BSD { int uuidgen(struct uuid *store, int count); } +393 MSTD BSD { int sendfile(int fd, int s, off_t offset, size_t nbytes, \ + struct sf_hdtr *hdtr, off_t *sbytes, int flags); } ==== //depot/projects/pmap/sys/kern/uipc_syscalls.c#7 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.116 2002/06/29 00:02:01 alfred Exp $ + * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.117 2002/07/12 06:51:57 alfred Exp $ */ #include "opt_compat.h" @@ -81,6 +81,7 @@ static int recvit(struct thread *td, int s, struct msghdr *mp, void *namelenp); static int accept1(struct thread *td, struct accept_args *uap, int compat); +static int do_sendfile(struct thread *td, struct sendfile_args *uap, int compat); static int getsockname1(struct thread *td, struct getsockname_args *uap, int compat); static int getpeername1(struct thread *td, struct getpeername_args *uap, @@ -1637,6 +1638,31 @@ int sendfile(struct thread *td, struct sendfile_args *uap) { + + return (do_sendfile(td, uap, 0)); +} + +#ifdef COMPAT_FREEBSD4 >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 1:28: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D0AF37B405; Fri, 12 Jul 2002 01:27:54 -0700 (PDT) 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 A5EE837B400 for ; Fri, 12 Jul 2002 01:27:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 69AA543E31 for ; Fri, 12 Jul 2002 01:27:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6C8RrJU059016 for ; Fri, 12 Jul 2002 01:27:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6C8RrFo059013 for perforce@freebsd.org; Fri, 12 Jul 2002 01:27:53 -0700 (PDT) Date: Fri, 12 Jul 2002 01:27:53 -0700 (PDT) Message-Id: <200207120827.g6C8RrFo059013@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14135 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14135 Change 14135 by peter@peter_daintree on 2002/07/12 01:27:33 repair merge-o-tron glitches Affected files ... .. //depot/projects/pmap/sys/i386/i386/pmap.c#25 edit Differences ... ==== //depot/projects/pmap/sys/i386/i386/pmap.c#25 (text+ko) ==== @@ -591,17 +591,7 @@ if (pmap == kernel_pmap || pmap->pm_active) invltlb(); } -#endif -#ifdef SMP -void -pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) -{ - u_int cpumask; - u_int other_cpus; - struct thread *td; - vm_offset_t addr; - PMAP_INLINE void pmap_invalidate_all(pmap_t pmap) { @@ -717,7 +707,6 @@ for (addr = sva; addr < eva; addr += PAGE_SIZE) invlpg(addr); } -#endif PMAP_INLINE void pmap_invalidate_all(pmap_t pmap) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 7:40:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 347CC37B401; Fri, 12 Jul 2002 07:40:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 2B4DB37B400; Fri, 12 Jul 2002 07:40:29 -0700 (PDT) Received: from localhost (green@localhost) by green.bikeshed.org (8.11.6/8.11.6) with ESMTP id g6CEeSA38753; Fri, 12 Jul 2002 10:40:29 -0400 (EDT) (envelope-from green@green.bikeshed.org) Message-Id: <200207121440.g6CEeSA38753@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 14125 for review In-Reply-To: Your message of "Thu, 11 Jul 2002 21:54:29 PDT." <200207120454.g6C4sTax009797@freefall.freebsd.org> From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 12 Jul 2002 10:40:28 -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14125 > > Change 14125 by rwatson@rwatson_paprika on 2002/07/11 21:54:24 > > Back out the lazy instantiate component of @14031, as it broke > mount-derived labels on multilabel (read-only or full) file > systems, as the EA write could result in a failure of the > label refresh, even though a valid label is available. > > Approved by: green Ack! No, you backed out all of it and re-re-reintroduced the bug where mac_update_vnode_from_externalized _NEVER_ gets called! -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 7:42:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1642A37B401; Fri, 12 Jul 2002 07:42:50 -0700 (PDT) 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 C0B2937B400 for ; Fri, 12 Jul 2002 07:42:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B55B43E6E for ; Fri, 12 Jul 2002 07:42:49 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CEgmJU035507 for ; Fri, 12 Jul 2002 07:42:49 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CEgmRY035504 for perforce@freebsd.org; Fri, 12 Jul 2002 07:42:48 -0700 (PDT) Date: Fri, 12 Jul 2002 07:42:48 -0700 (PDT) Message-Id: <200207121442.g6CEgmRY035504@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14138 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14138 Change 14138 by green@green_laptop_2 on 2002/07/12 07:42:36 Debuggerify again. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#165 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#165 (text+ko) ==== @@ -913,11 +913,11 @@ case ENOATTR: /* - * Use the label from the mountpoint. + * Use the label from the mount point. */ mac_update_vnode_from_mount(vp, vp->v_mount); - return (0); - + error = 0; + break; case EOPNOTSUPP: default: /* Fail horribly. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 9:40:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 080AA37B405; Fri, 12 Jul 2002 09:40:15 -0700 (PDT) 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 9AB0737B401 for ; Fri, 12 Jul 2002 09:40:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD06043E42 for ; Fri, 12 Jul 2002 09:40:13 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CGeDJU055157 for ; Fri, 12 Jul 2002 09:40:13 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CGeDE9055153 for perforce@freebsd.org; Fri, 12 Jul 2002 09:40:13 -0700 (PDT) Date: Fri, 12 Jul 2002 09:40:13 -0700 (PDT) Message-Id: <200207121640.g6CGeDE9055153@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 14142 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14142 Change 14142 by chris@chris_holly on 2002/07/12 09:39:47 Update outline to match some of the other sections I like (as well as what I'm writing locally), and add a section to the outline for documenting the individual policy ops. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#2 edit .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/OUTLINE.TrustedBSD#2 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#2 (text+ko) ==== @@ -35,6 +35,7 @@ SRCS+= kobj/chapter.sgml SRCS+= l10n/chapter.sgml SRCS+= locking/chapter.sgml +SRCS+= mac/chapter.sgml SRCS+= pci/chapter.sgml SRCS+= policies/chapter.sgml SRCS+= scsi/chapter.sgml ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/OUTLINE.TrustedBSD#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$P4: //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/OUTLINE.TrustedBSD#1 $ +$P4: //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/OUTLINE.TrustedBSD#2 $ This is the outline for the upcoming updates to the Developers' Handbook. As bits are committed, entries will be removed. There are other sections @@ -7,5 +7,7 @@ Section III. Kernel BEFORE 14. MAC Framework - 14.1 Architecture - 14.2 Sample Modules + 14.1 Synopsis + 14.2 Architecture + 14.3 Documentation for Policy Operations + 14.4 Sample Modules To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 9:41:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93B9937B401; Fri, 12 Jul 2002 09:41:16 -0700 (PDT) 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 385EA37B400 for ; Fri, 12 Jul 2002 09:41:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BD5F43E6D for ; Fri, 12 Jul 2002 09:41:15 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CGfFJU055543 for ; Fri, 12 Jul 2002 09:41:15 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CGfFQ6055540 for perforce@freebsd.org; Fri, 12 Jul 2002 09:41:15 -0700 (PDT) Date: Fri, 12 Jul 2002 09:41:15 -0700 (PDT) Message-Id: <200207121641.g6CGfFQ6055540@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 14144 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14144 Change 14144 by chris@chris_holly on 2002/07/12 09:40:45 `mac/chapter.sgml' should be commented out. Oops. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#3 (text+ko) ==== @@ -35,7 +35,7 @@ SRCS+= kobj/chapter.sgml SRCS+= l10n/chapter.sgml SRCS+= locking/chapter.sgml -SRCS+= mac/chapter.sgml +# SRCS+= mac/chapter.sgml SRCS+= pci/chapter.sgml SRCS+= policies/chapter.sgml SRCS+= scsi/chapter.sgml To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 11:43:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67CA737B400; Fri, 12 Jul 2002 11:43:46 -0700 (PDT) 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 1A6C337B401 for ; Fri, 12 Jul 2002 11:43:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD0DB43E4A for ; Fri, 12 Jul 2002 11:43:45 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CIhjJU077149 for ; Fri, 12 Jul 2002 11:43:45 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CIhjm7077146 for perforce@freebsd.org; Fri, 12 Jul 2002 11:43:45 -0700 (PDT) Date: Fri, 12 Jul 2002 11:43:45 -0700 (PDT) Message-Id: <200207121843.g6CIhjm7077146@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 14150 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14150 Change 14150 by chris@chris_holly on 2002/07/12 11:42:47 Add in the beginnings of a MAC chapter. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#4 edit .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#2 edit .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#2 edit .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#1 add Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#4 (text+ko) ==== @@ -35,7 +35,7 @@ SRCS+= kobj/chapter.sgml SRCS+= l10n/chapter.sgml SRCS+= locking/chapter.sgml -# SRCS+= mac/chapter.sgml +SRCS+= mac/chapter.sgml SRCS+= pci/chapter.sgml SRCS+= policies/chapter.sgml SRCS+= scsi/chapter.sgml ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#2 (text+ko) ==== @@ -94,6 +94,7 @@ &chap.kobj; &chap.jail; &chap.sysinit; + &chap.mac; &chap.vm; &chap.dma; &chap.kerneldebug; ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#2 (text+ko) ==== @@ -28,6 +28,7 @@ + To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 13:29:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9650637B405; Fri, 12 Jul 2002 13:28:57 -0700 (PDT) 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 471AF37B401 for ; Fri, 12 Jul 2002 13:28:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A826E43E65 for ; Fri, 12 Jul 2002 13:28:56 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CKSuJU097714 for ; Fri, 12 Jul 2002 13:28:56 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CKSuPv097710 for perforce@freebsd.org; Fri, 12 Jul 2002 13:28:56 -0700 (PDT) Date: Fri, 12 Jul 2002 13:28:56 -0700 (PDT) Message-Id: <200207122028.g6CKSuPv097710@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14156 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14156 Change 14156 by peter@peter_daintree on 2002/07/12 13:28:19 IFC @14154 Affected files ... .. //depot/projects/pmap/sys/alpha/alpha/genassym.c#4 integrate .. //depot/projects/pmap/sys/alpha/alpha/swtch.s#3 integrate .. //depot/projects/pmap/sys/i386/i386/genassym.c#6 integrate .. //depot/projects/pmap/sys/i386/i386/pmap.c#26 integrate .. //depot/projects/pmap/sys/i386/i386/swtch.s#6 integrate .. //depot/projects/pmap/sys/ia64/ia64/genassym.c#5 integrate .. //depot/projects/pmap/sys/ia64/ia64/swtch.s#3 integrate .. //depot/projects/pmap/sys/kern/kern_switch.c#7 integrate .. //depot/projects/pmap/sys/kern/kern_synch.c#6 integrate .. //depot/projects/pmap/sys/kern/sys_process.c#8 integrate .. //depot/projects/pmap/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/pmap/sys/powerpc/powerpc/genassym.c#5 integrate .. //depot/projects/pmap/sys/powerpc/powerpc/swtch.s#5 integrate .. //depot/projects/pmap/sys/sparc64/include/smp.h#7 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/genassym.c#8 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/swtch.s#7 integrate .. //depot/projects/pmap/sys/sys/proc.h#7 integrate .. //depot/projects/pmap/sys/ufs/ffs/README.snapshot#2 integrate .. //depot/projects/pmap/sys/vm/vm_zeroidle.c#4 integrate Differences ... ==== //depot/projects/pmap/sys/alpha/alpha/genassym.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.38 2002/06/29 17:26:10 julian Exp $ + * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.39 2002/07/12 18:34:21 jhb Exp $ */ #include @@ -80,8 +80,6 @@ ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_KSE, offsetof(struct thread, td_kse)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); -ASSYM(TD_STATE, offsetof(struct thread, td_state)); -ASSYM(TDS_RUNNING, TDS_RUNNING); ASSYM(KE_FLAGS, offsetof(struct kse, ke_flags)); ==== //depot/projects/pmap/sys/alpha/alpha/swtch.s#3 (text+ko) ==== @@ -25,7 +25,7 @@ * rights to redistribute these changes. * * $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ - * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.32 2002/06/29 17:26:11 julian Exp $ + * $FreeBSD: src/sys/alpha/alpha/swtch.s,v 1.33 2002/07/12 18:34:21 jhb Exp $ */ #define _LOCORE @@ -127,9 +127,6 @@ mov v0, s2 /* s2 = new thread */ ldq s3, TD_MD_PCBPADDR(s2) /* s3 = new pcbpaddr */ - ldiq t0, TDS_RUNNING - stl t0, TD_STATE(s2) - /* * Check to see if we're switching to ourself. If we are, * don't bother loading the new context. ==== //depot/projects/pmap/sys/i386/i386/genassym.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.126 2002/07/10 20:15:57 dillon Exp $ + * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.128 2002/07/12 20:17:06 dillon Exp $ */ #include "opt_kstack_pages.h" @@ -82,7 +82,6 @@ ASSYM(P_STATE, offsetof(struct proc, p_state)); ASSYM(P_UAREA, offsetof(struct proc, p_uarea)); -ASSYM(TD_STATE, offsetof(struct thread, td_state)); ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_WCHAN, offsetof(struct thread, td_wchan)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); @@ -90,6 +89,7 @@ ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_INTR_NESTING_LEVEL, offsetof(struct thread, td_intr_nesting_level)); ASSYM(TD_CRITNEST, offsetof(struct thread, td_critnest)); +ASSYM(TD_SWITCHIN, offsetof(struct thread, td_switchin)); ASSYM(TD_MD, offsetof(struct thread, td_md)); ASSYM(P_MD, offsetof(struct proc, p_md)); @@ -100,9 +100,6 @@ ASSYM(KEF_ASTPENDING, KEF_ASTPENDING); ASSYM(KEF_NEEDRESCHED, KEF_NEEDRESCHED); -ASSYM(TDS_SLP, TDS_SLP); -ASSYM(TDS_RUNQ, TDS_RUNQ); -ASSYM(TDS_RUNNING, TDS_RUNNING); ASSYM(V_TRAP, offsetof(struct vmmeter, v_trap)); ASSYM(V_SYSCALL, offsetof(struct vmmeter, v_syscall)); ASSYM(V_INTR, offsetof(struct vmmeter, v_intr)); ==== //depot/projects/pmap/sys/i386/i386/pmap.c#26 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.337 2002/07/12 07:56:09 peter Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.338 2002/07/12 20:17:06 dillon Exp $ */ /* @@ -2675,7 +2675,39 @@ } } +#ifdef SMP + /* + * pmap_zpi_switchin*() + * + * These functions allow us to avoid doing IPIs alltogether in certain + * temporary page-mapping situations (page zeroing). Instead to deal + * with being preempted and moved onto a different cpu we invalidate + * the page when the scheduler switches us in. This does not occur + * very often so we remain relatively optimal with very little effort. + */ +static void +pmap_zpi_switchin12(void) +{ + invlpg((u_int)CADDR1); + invlpg((u_int)CADDR2); +} + +static void +pmap_zpi_switchin2(void) +{ + invlpg((u_int)CADDR2); +} + +static void +pmap_zpi_switchin3(void) +{ + invlpg((u_int)CADDR3); +} + +#endif + +/* * pmap_zero_page zeros the specified hardware page by mapping * the page into KVM and using bzero to clear its contents. */ @@ -2695,13 +2727,19 @@ if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); *CMAP2 = PG_V | PG_RW | phys | PG_A | PG_M; - pmap_invalidate_page(kernel_pmap, (vm_offset_t)CADDR2); +#ifdef SMP + curthread->td_switchin = pmap_zpi_switchin2; +#endif + invlpg((u_int)CADDR2); #if defined(I686_CPU) if (cpu_class == CPUCLASS_686) i686_pagezero(CADDR2); else #endif bzero(CADDR2, PAGE_SIZE); +#ifdef SMP + curthread->td_switchin = NULL; +#endif *CMAP2 = 0; } @@ -2727,13 +2765,19 @@ if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); *CMAP2 = PG_V | PG_RW | phys | PG_A | PG_M; - pmap_invalidate_page(kernel_pmap, (vm_offset_t)CADDR2); +#ifdef SMP + curthread->td_switchin = pmap_zpi_switchin2; +#endif + invlpg((u_int)CADDR2); #if defined(I686_CPU) if (cpu_class == CPUCLASS_686 && off == 0 && size == PAGE_SIZE) i686_pagezero(CADDR2); else #endif bzero((char *)CADDR2 + off, size); +#ifdef SMP + curthread->td_switchin = NULL; +#endif *CMAP2 = 0; } @@ -2759,13 +2803,19 @@ if (*CMAP3) panic("pmap_zero_page: CMAP3 busy"); *CMAP3 = PG_V | PG_RW | phys | PG_A | PG_M; - invlpg((vm_offset_t)CADDR3); /* SMP: local cpu only */ +#ifdef SMP + curthread->td_switchin = pmap_zpi_switchin3; +#endif + invlpg((u_int)CADDR3); #if defined(I686_CPU) if (cpu_class == CPUCLASS_686) i686_pagezero(CADDR3); else #endif bzero(CADDR3, PAGE_SIZE); +#ifdef SMP + curthread->td_switchin = NULL; +#endif *CMAP3 = 0; } @@ -2785,13 +2835,20 @@ panic("pmap_copy_page: CMAP2 busy"); *CMAP1 = PG_V | VM_PAGE_TO_PHYS(src) | PG_A; *CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M; - /* - * XXX we "know" that CADDR2 immediately follows CADDR1 and use - * that to save an IPI on SMP systems. - */ - pmap_invalidate_range(kernel_pmap, (vm_offset_t)CADDR1, - (vm_offset_t)CADDR2 + PAGE_SIZE); +#ifdef I386_CPU + invltlb(); +#else +#ifdef SMP + curthread->td_switchin = pmap_zpi_switchin12; +#endif + invlpg((u_int)CADDR1); + invlpg((u_int)CADDR2); +#endif bcopy(CADDR1, CADDR2, PAGE_SIZE); + +#ifdef SMP + curthread->td_switchin = NULL; +#endif *CMAP1 = 0; *CMAP2 = 0; } ==== //depot/projects/pmap/sys/i386/i386/swtch.s#6 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.132 2002/06/29 17:26:16 julian Exp $ + * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.133 2002/07/12 18:34:21 jhb Exp $ */ #include "opt_npx.h" @@ -171,13 +171,6 @@ sw1b: movl %eax,%ecx - -#ifdef INVARIANTS - cmpb $TDS_RUNQ,TD_STATE(%ecx) - jne badsw2 -#endif - - movl $TDS_RUNNING,TD_STATE(%ecx) movl TD_PCB(%ecx),%edx #if defined(SWTCH_OPTIM_STATS) @@ -316,13 +309,6 @@ ret #ifdef INVARIANTS -badsw2: - pushal - pushl $sw0_2 - call panic - -sw0_2: .asciz "cpu_switch: not TDS_RUNQ" - badsw3: pushal pushl $sw0_3 ==== //depot/projects/pmap/sys/ia64/ia64/genassym.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/ia64/ia64/genassym.c,v 1.29 2002/06/29 18:26:18 julian Exp $ + * $FreeBSD: src/sys/ia64/ia64/genassym.c,v 1.30 2002/07/12 18:34:22 jhb Exp $ */ #include @@ -76,11 +76,9 @@ ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); -ASSYM(TD_STATE, offsetof(struct thread, td_state)); ASSYM(TD_KSE, offsetof(struct thread, td_kse)); ASSYM(TD_KSTACK, offsetof(struct thread, td_kstack)); ASSYM(TD_MD_FLAGS, offsetof(struct thread, td_md.md_flags)); -ASSYM(TDS_RUNNING, TDS_RUNNING); ASSYM(KE_FLAGS, offsetof(struct kse, ke_flags)); ==== //depot/projects/pmap/sys/ia64/ia64/swtch.s#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/swtch.s,v 1.22 2002/06/29 18:26:18 julian Exp $ + * $FreeBSD: src/sys/ia64/ia64/swtch.s,v 1.23 2002/07/12 18:34:22 jhb Exp $ */ #include @@ -283,12 +283,6 @@ st8 [r14]=r4 // set r13->pc_curthread mov ar.k7=r4 ;; -// Julian's guess at settinghte thread state - add r15=TD_STATE,r4 - ;; - mov [r15]=TDS_RUNNING - ;; -// end of julian's guess add r15=TD_PCB,r4 ;; ld8 r15=[r15] ==== //depot/projects/pmap/sys/kern/kern_switch.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_switch.c,v 1.30 2002/07/11 22:47:58 julian Exp $ + * $FreeBSD: src/sys/kern/kern_switch.c,v 1.32 2002/07/12 20:16:46 julian Exp $ */ /*** @@ -153,13 +153,12 @@ CTR2(KTR_RUNQ, "choosethread: td=%p pri=%d", td, td->td_priority); } else { - /* Pretend the idle thread was on the run queue. */ + /* Simulate runq_choose() having returned the idle thread */ td = PCPU_GET(idlethread); - /* Simulate that it was on the run queue */ - td->td_state = TDS_RUNQ; - td->td_kse->ke_state = KES_UNQUEUED; + td->td_kse->ke_state = KES_RUNNING; CTR1(KTR_RUNQ, "choosethread: td=%p (idle)", td); } + td->td_state = TDS_RUNNING; return (td); } ==== //depot/projects/pmap/sys/kern/kern_synch.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.182 2002/07/06 08:47:24 julian Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.183 2002/07/12 20:17:06 dillon Exp $ */ #include "opt_ddb.h" @@ -892,6 +892,13 @@ if (PCPU_GET(switchtime.sec) == 0) binuptime(PCPU_PTR(switchtime)); PCPU_SET(switchticks, ticks); + + /* + * Call the switchin function while still holding the scheduler lock + * (used by the idlezero code and the general page-zeroing code) + */ + if (td->td_switchin) + td->td_switchin(); } /* ==== //depot/projects/pmap/sys/kern/sys_process.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/sys_process.c,v 1.95 2002/06/29 17:26:18 julian Exp $ + * $FreeBSD: src/sys/kern/sys_process.c,v 1.97 2002/07/12 17:21:22 alc Exp $ */ #include @@ -268,7 +268,9 @@ /* * Wire the page into memory */ + vm_page_lock_queues(); vm_page_wire(m); + vm_page_unlock_queues(); /* * We're done with tmap now. @@ -290,7 +292,9 @@ /* * release the page and the object */ + vm_page_lock_queues(); vm_page_unwire(m, 1); + vm_page_unlock_queues(); vm_object_deallocate(object); object = NULL; @@ -334,7 +338,7 @@ } r; struct proc *curp, *p, *pp; struct thread *td2; - int error, write; + int error, write, tmp; int proctree_locked = 0; curp = td->td_proc; @@ -586,9 +590,9 @@ case PT_READ_I: case PT_READ_D: PROC_UNLOCK(p); + tmp = 0; /* write = 0 set above */ - iov.iov_base = write ? (caddr_t)&uap->data : - (caddr_t)td->td_retval; + iov.iov_base = write ? (caddr_t)&uap->data : (caddr_t)&tmp; iov.iov_len = sizeof(int); uio.uio_iov = &iov; uio.uio_iovcnt = 1; @@ -611,6 +615,8 @@ if (error == 0 || error == ENOSPC || error == EPERM) error = EINVAL; /* EOF */ } + if (!write) + td->td_retval[0] = tmp; return (error); case PT_IO: ==== //depot/projects/pmap/sys/netinet/udp_usrreq.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.116 2002/07/12 08:05:22 truckman Exp $ + * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.117 2002/07/12 09:55:48 truckman Exp $ */ #include "opt_ipsec.h" @@ -681,13 +681,8 @@ INP_INFO_RLOCK(&udbinfo); inp = in_pcblookup_hash(&udbinfo, addrs[1].sin_addr, addrs[1].sin_port, addrs[0].sin_addr, addrs[0].sin_port, 1, NULL); - if (inp == NULL) { + if (inp == NULL || inp->inp_socket == NULL) { error = ENOENT; - goto outunlocked; - } - INP_LOCK(inp); - if (inp->inp_socket == NULL) { - error = ENOENT; goto out; } error = cr_canseesocket(req->td->td_ucred, inp->inp_socket); @@ -695,8 +690,6 @@ goto out; cru2x(inp->inp_socket->so_cred, &xuc); out: - INP_UNLOCK(inp); -outunlocked: INP_INFO_RUNLOCK(&udbinfo); splx(s); if (error == 0) ==== //depot/projects/pmap/sys/powerpc/powerpc/genassym.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/powerpc/powerpc/genassym.c,v 1.44 2002/07/09 12:57:23 benno Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/genassym.c,v 1.45 2002/07/12 18:34:22 jhb Exp $ */ #include @@ -140,8 +140,6 @@ ASSYM(TD_PROC, offsetof(struct thread, td_proc)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_KSE, offsetof(struct thread, td_kse)); -ASSYM(TD_STATE, offsetof(struct thread, td_state)); -ASSYM(TDS_RUNNING, TDS_RUNNING); ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); ==== //depot/projects/pmap/sys/powerpc/powerpc/swtch.s#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/powerpc/powerpc/swtch.s,v 1.15 2002/07/09 12:57:23 benno Exp $ */ +/* $FreeBSD: src/sys/powerpc/powerpc/swtch.s,v 1.16 2002/07/12 18:34:22 jhb Exp $ */ /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */ /* @@ -121,8 +121,6 @@ /* thread to restore is in r3 */ .L2: - li %r15,TDS_RUNNING - stw %r15,TD_STATE(%r3) /* Set KSE state */ lwz %r3, TD_PCB(%r3) lmw %r12,PCB_CONTEXT(%r3) /* Load the non-volatile GP regs */ mr %r2,%r12 ==== //depot/projects/pmap/sys/sparc64/include/smp.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/smp.h,v 1.11 2002/06/08 07:21:52 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/smp.h,v 1.12 2002/07/12 16:26:49 tmm Exp $ */ #ifndef _MACHINE_SMP_H_ @@ -116,8 +116,8 @@ ica = &ipi_cache_args; ica->ica_mask = all_cpus; ica->ica_pa = pa; - cpu_ipi_selected(all_cpus, 0, (u_long)tl_ipi_dcache_page_inval, - (u_long)ica); + cpu_ipi_selected(PCPU_GET(other_cpus), 0, + (u_long)tl_ipi_dcache_page_inval, (u_long)ica); return (&ica->ica_mask); } @@ -131,8 +131,8 @@ ica = &ipi_cache_args; ica->ica_mask = all_cpus; ica->ica_pa = pa; - cpu_ipi_selected(all_cpus, 0, (u_long)tl_ipi_icache_page_inval, - (u_long)ica); + cpu_ipi_selected(PCPU_GET(other_cpus), 0, + (u_long)tl_ipi_icache_page_inval, (u_long)ica); return (&ica->ica_mask); } ==== //depot/projects/pmap/sys/sparc64/sparc64/genassym.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.35 2002/06/29 17:26:21 julian Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.36 2002/07/12 18:34:22 jhb Exp $ */ #include @@ -232,8 +232,6 @@ ASSYM(TD_KSTACK, offsetof(struct thread, td_kstack)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ASSYM(TD_PROC, offsetof(struct thread, td_proc)); -ASSYM(TD_STATE, offsetof(struct thread, td_state)); -ASSYM(TDS_RUNNING, TDS_RUNNING); ASSYM(PCB_SIZEOF, sizeof(struct pcb)); ASSYM(PCB_FPSTATE, offsetof(struct pcb, pcb_fpstate)); ==== //depot/projects/pmap/sys/sparc64/sparc64/swtch.s#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/sparc64/swtch.s,v 1.19 2002/06/29 17:26:21 julian Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/swtch.s,v 1.20 2002/07/12 18:34:22 jhb Exp $ */ #include @@ -109,9 +109,6 @@ stx %o0, [PCPU(CURTHREAD)] stx %o1, [PCPU(CURPCB)] - mov TDS_RUNNING, %o2 - stw %o2, [%o0 + TD_STATE] - SET(sched_lock, %o3, %o2) stx %o0, [%o2 + MTX_LOCK] ==== //depot/projects/pmap/sys/sys/proc.h#7 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.227 2002/07/08 01:49:49 peter Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.228 2002/07/12 20:17:06 dillon Exp $ */ #ifndef _SYS_PROC_H_ @@ -285,6 +285,7 @@ int td_intr_nesting_level; /* (k) Interrupt recursion. */ void *td_mailbox; /* the userland mailbox address */ struct ucred *td_ucred; /* (k) Reference to credentials. */ + void (*td_switchin)(void); /* (k) switchin special func */ #define td_endzero td_md #define td_startcopy td_endzero ==== //depot/projects/pmap/sys/ufs/ffs/README.snapshot#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/ufs/ffs/README.snapshot,v 1.2 2001/04/14 18:32:09 mckusick Exp $ +$FreeBSD: src/sys/ufs/ffs/README.snapshot,v 1.3 2002/07/12 19:56:31 trhodes Exp $ Soft Updates Status @@ -30,7 +30,7 @@ root of each filesystem into which I can place snapshots. You may create up to 20 snapshots per filesystem. Active snapshots are recorded in the superblock, so they persist across unmount -and remount operations and across system reboots. When your +and remount operations and across system reboots. When you are done with a snapshot, it can be removed with the `rm' command. Snapshots may be removed in any order, however you may not get back all the space contained in the snapshot as ==== //depot/projects/pmap/sys/vm/vm_zeroidle.c#4 (text+ko) ==== @@ -7,7 +7,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/vm/vm_zeroidle.c,v 1.13 2002/07/08 23:12:37 peter Exp $ + * $FreeBSD: src/sys/vm/vm_zeroidle.c,v 1.14 2002/07/12 20:17:06 dillon Exp $ */ #include @@ -30,11 +30,7 @@ SYSCTL_INT(_vm_stats_misc, OID_AUTO, cnt_prezero, CTLFLAG_RD, &cnt_prezero, 0, ""); -#ifdef SMP -static int idlezero_enable = 0; -#else static int idlezero_enable = 1; -#endif SYSCTL_INT(_vm, OID_AUTO, idlezero_enable, CTLFLAG_RW, &idlezero_enable, 0, ""); TUNABLE_INT("vm.idlezero_enable", &idlezero_enable); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 13:31: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35C2437B401; Fri, 12 Jul 2002 13:31:00 -0700 (PDT) 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 D1BBB37B400 for ; Fri, 12 Jul 2002 13:30:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9084A43E4A for ; Fri, 12 Jul 2002 13:30:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CKUxJU098296 for ; Fri, 12 Jul 2002 13:30:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CKUxB2098293 for perforce@freebsd.org; Fri, 12 Jul 2002 13:30:59 -0700 (PDT) Date: Fri, 12 Jul 2002 13:30:59 -0700 (PDT) Message-Id: <200207122030.g6CKUxB2098293@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14157 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14157 Change 14157 by peter@peter_xeon on 2002/07/12 13:30:38 set P_NOLOAD so that we do not skew the loadav calculation. This isn't real load. Alan says we theoretically do not need Giant since the free page queue is fully locked down now. Lets find out. :-) Affected files ... .. //depot/projects/pmap/sys/vm/vm_zeroidle.c#5 edit Differences ... ==== //depot/projects/pmap/sys/vm/vm_zeroidle.c#5 (text+ko) ==== @@ -74,7 +74,6 @@ static int free_rover; vm_page_t m; - mtx_lock(&Giant); mtx_lock_spin(&vm_page_queue_free_mtx); zero_state = 0; m = vm_pageq_find(PQ_FREE, free_rover, FALSE); @@ -83,9 +82,7 @@ TAILQ_REMOVE(&vm_page_queues[m->queue].pl, m, pageq); m->queue = PQ_NONE; mtx_unlock_spin(&vm_page_queue_free_mtx); - mtx_unlock(&Giant); pmap_zero_page_idle(m); - mtx_lock(&Giant); mtx_lock_spin(&vm_page_queue_free_mtx); vm_page_flag_set(m, PG_ZERO); m->queue = PQ_FREE + m->pc; @@ -99,7 +96,6 @@ } free_rover = (free_rover + PQ_PRIME2) & PQ_L2_MASK; mtx_unlock_spin(&vm_page_queue_free_mtx); - mtx_unlock(&Giant); return 1; } @@ -127,6 +123,9 @@ rtp_to_pri(&rtp, td->td_ksegrp); pri = td->td_priority; mtx_unlock_spin(&sched_lock); + PROC_LOCK(td->td_proc); + td->td_proc->p_flag |= P_NOLOAD; + PROC_UNLOCK(td->td_proc); for (;;) { if (vm_page_zero_check()) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 15:50:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D780937B873; Fri, 12 Jul 2002 15:45:10 -0700 (PDT) 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 313E137B4F4 for ; Fri, 12 Jul 2002 15:45:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30B6E4498E for ; Fri, 12 Jul 2002 15:35:05 -0700 (PDT) (envelope-from chris@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CLmYJU009637 for ; Fri, 12 Jul 2002 14:48:34 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CLmWtZ009617 for perforce@freebsd.org; Fri, 12 Jul 2002 14:48:32 -0700 (PDT) Date: Fri, 12 Jul 2002 14:48:32 -0700 (PDT) Message-Id: <200207122148.g6CLmWtZ009617@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 14158 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14158 Change 14158 by chris@chris_holly on 2002/07/12 14:48:13 IFC Affected files ... .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/Makefile#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/console-server/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributing/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/fonts/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hats/Makefile#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hats/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hubs/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/java-tomcat/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/laptop/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/mh/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/new-users/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/branches.ascii#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vinum/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/jail/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/contrib/Makefile#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/contrib/chapter.sgml#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.eps#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.eps#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.eps#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.eps#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.eps#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/ceri.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/dannyboy.key#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/des.key#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/jon.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/perky.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/scop.key#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/sheldonh.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/sound/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/ppp-primer/book.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/authors.ent#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/catalog#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#2 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cu.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/df.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/whois.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/window.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/init.8#2 integrate .. //depot/projects/trustedbsd/doc/no_NO.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/no_NO.ISO8859-1/books/handbook/install/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/release/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/release/texts/README#2 integrate .. //depot/projects/trustedbsd/doc/share/mk/doc.html.mk#2 integrate .. //depot/projects/trustedbsd/doc/share/sgml/man-refs.ent#4 integrate Differences ... ==== //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#2 (text+ko) ==== @@ -9,7 +9,7 @@ %man; ]> -
+
Óýíäåóç ìÝóù ôçëåöþíïõ êáé firewalling óôï FreeBSD @@ -24,7 +24,7 @@ - $FreeBSD: doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml,v 1.1 2002/02/15 00:35:06 keramida Exp $ + $FreeBSD: doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml,v 1.2 2002/06/27 19:39:40 keramida Exp $ Áõôü ôï Üñèñï ðåñéãñÜöåé ðùò ìðïñåßôå íá ñõèìßóåôå Ýíá firewall ==== //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#2 (text+ko) ==== @@ -1,5 +1,5 @@ + @@ -273,7 +273,7 @@

The Stallion driver is not included in the default GENERIC kernel, so you will need to create a kernel config file with the appropriate entries. See the - stl(4) man page and the appropriate section of the + stl(4) manual page and the appropriate section of the FreeBSD Handbook.

@@ -283,12 +283,12 @@

After applying the patch you will certainly need to update the whole system, including all the user programs and the kernel. See the documentation in /usr/src/UPDATING and the - FreeBSD + FreeBSD Handbook.

Making The Devices

-

You will need to make the device notes for the Stallion card +

You will need to make the device nodes for the Stallion card (which are not made by default). A new version of /dev/MAKEDEV with Stallion support will have been created by the mergemaster run during the above @@ -305,7 +305,7 @@

to create dial-out devices for the first Stallion card. See the comments in MAKEDEV and the stl(4) - man page for more details.

+ manual page for more details.

Compiling conserver

@@ -416,10 +416,10 @@ carrier on these ports, perhaps by setting this using the ttyiEx device in the /etc/rc.serial file. See the comments in this file for more details. Also see the - sio(4) man page for information on the + sio(4) manual page for information on the initial-state and locked-state devices. (The Stallion driver also supports these conventions). And see the - stty(1) man page for details on setting device + stty(1) manual page for details on setting device modes.

The last section shows that any user logged into the server @@ -569,7 +569,7 @@ master server, and it will arrange to signal all the child processes. Yes, this will send a HUP to all clients whenever a single log file needs rotating, but that is quite cheap. See - the newsysylog(8) man page for details.

+ the newsysylog(8) manual page for details.

Cabling

@@ -966,7 +966,7 @@ key sequence <Return><Tilda><control-B> (within 5 seconds) will drop to the ROM. You can enable this permanently by editing the /etc/default/kbd file; - see the kbd(1) man page. Note that this alternate + see the kbd(1) manual page. Note that this alternate break sequence is only active once the kernel has started running multiuser and processed the default file. While the ROM is active (during power-on and during the boot process) and @@ -1192,9 +1192,9 @@
  • Grrr. Fixed the pinout for the Cisco - Stallion RJ-45 cable. The cable would have worked but was backwards. The new table now reflects the description. -
  • Noted that Catalyst cable is a 26xx cable plugged in the othyer +
  • Noted that Catalyst cable is a 26xx cable plugged in the other way around. -
  • Added notes about RJ-45 pin numberring and color coding +
  • Added notes about RJ-45 pin numbering and color coding conventions
  • Added notes about serial console on FreeBSD/i386 platforms.
  • Now in RCS. ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributing/article.sgml#2 (text+ko) ==== @@ -14,7 +14,7 @@ Contributing to FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/contributing/article.sgml,v 1.486 2002/05/08 18:29:01 mwlucas Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/contributing/article.sgml,v 1.487 2002/07/11 19:07:49 trhodes Exp $ This article describes the different ways in which an @@ -329,7 +329,7 @@ &prompt.user; diff -c -r olddir newdir would generate such a set of context diffs for the given - source file or directory hierarchy. See the man page for + source file or directory hierarchy. See the manual page for &man.diff.1; for more details. Once you have a set of diffs (which you may test with the ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#4 (text+ko) ==== @@ -18,7 +18,7 @@ Contributors to FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.208 2002/06/19 23:13:30 mike Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.223 2002/07/12 02:59:19 mdodd Exp $ This article lists individuals and organizations who have @@ -334,7 +334,11 @@ - &a.dg; + &a.jhb; + + + + &a.kuriyama; @@ -346,7 +350,15 @@ - &a.dfr; + &a.markm; + + + + &a.wes; + + + + &a.murray; @@ -490,6 +502,10 @@ + &a.perky; + + + &a.dwcjr; @@ -698,15 +714,15 @@ - &a.petef; + &a.scrappy; - &a.scrappy; + &a.lars; - &a.lars; + &a.petef; @@ -914,11 +930,15 @@ - &a.joe; + &a.cokane; + + + + &a.johan; - &a.cokane; + &a.joe; @@ -974,11 +994,15 @@ + &a.reg; + + + &a.chern; - &a.reg; + &a.sam; @@ -1122,11 +1146,11 @@ - &a.markm; + &a.rich; - &a.rich; + &a.markm; @@ -1214,11 +1238,11 @@ - &a.alfred; + &a.roam; - &a.roam; + &a.alfred; @@ -1294,11 +1318,11 @@ - &a.luigi; + &a.paul; - &a.paul; + &a.luigi; @@ -1334,10 +1358,6 @@ - &a.asmodai; - - - &a.ps; @@ -1438,10 +1458,6 @@ - &a.nsouch; - - - &a.des; @@ -1458,6 +1474,10 @@ + &a.nsouch; + + + &a.mks; @@ -1891,6 +1911,15 @@ In rough chronological order: + + + &a.dg; (1992 - 2002) + + + + &a.dfr; (1999 - 2002) + + &a.msmith; (2000 - 2002) @@ -2005,6 +2034,9 @@ + &a.asmodai; (1999 - 2002) + + &a.uch; (2000 - 2002) @@ -3432,6 +3464,10 @@ + Filippo Natali filippo@widestore.net + + + Flemming Jacobsen fj@batmule.dk @@ -3513,6 +3549,10 @@ + Frerich Raabe frerich.raabe@gmx.de + + + FUJIMOTO Kensaku fujimoto@oscar.elec.waseda.ac.jp @@ -3859,10 +3899,6 @@ - Hye-Shik Chang perky@fallin.lv - - - Ian Holland ianh@tortuga.com.au @@ -4250,10 +4286,6 @@ - Johan Karlsson k@numeri.campus.luth.se - - - Johan Larsson johan@moon.campus.luth.se @@ -4701,6 +4733,10 @@ + Kyle Martin mkm@ieee.org + + + L. Jonas Olsson ljo@ljo-slip.DIALIN.CWRU.Edu @@ -4971,10 +5007,18 @@ + Matt Douhan matt@athame.co.uk + + + Matt Heckaman matt@LUCIDA.QC.CA + Matt Peterson matt@peterson.org + + + Matt Thomas matt@3am-software.com @@ -5055,6 +5099,10 @@ + Michael Handler handler@grendel.net + + + Michael Lyngbøl michael@lyngbol.dk @@ -5083,6 +5131,10 @@ + Michael Hostbaek mich@freebsdcluster.org + + + Michael Perlman canuck@caam.rice.edu @@ -5194,6 +5246,10 @@ + Mike Makonnen makonnen@pacbell.net + + + Mike McGaughey mmcg@cs.monash.edu.au @@ -7009,6 +7065,10 @@ + William Josephson wkj-freebsd@honk.eecs.harvard.edu + + + William Liao william@tale.net ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#3 (text+ko) ==== @@ -22,12 +22,12 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml,v 1.5 2002/05/26 21:45:41 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml,v 1.6 2002/06/30 20:39:47 blackend Exp $ - The present article assumes a basic understanding of CVSup + The present article assumes a basic understanding of CVSup operation. It documents several delicate issues connected with - source synchronization via CVSup, viz. effective solutions to + source synchronization via CVSup, viz. effective solutions to the problem of stale files as well as special source updating cases; which issues are likely to cause apparently inexplicable troubles. @@ -38,7 +38,7 @@ Preface This document is the fruit of the author's attempts to - fully understand the niceties of cvsup & source updating. :-) + fully understand the niceties of CVSup & source updating. :-) While the author has made every effort to make these pages as informative and correct as possible, he is only human and may have made all sorts of typos, mistakes, etc. He will be @@ -66,12 +66,12 @@ your base is /usr. A checkouts file contains information on the current status - of your sources -- in a way, a sort of "photograph". This - significant information enables cvsup to retrieve updates most - effectively. Further, and maybe more important, it enables cvsup + of your sources -- in a way, a sort of photograph. This + significant information enables cvsup to retrieve updates most + effectively. Further, and maybe more important, it enables cvsup to correctly manage your sources by locally deleting any files no longer present in the repository, thus leaving no stale files - on your system. In fact, without a checkouts file, cvsup would + on your system. In fact, without a checkouts file, cvsup would NOT know which files your collection was composed of (cf &man.cvsup.1; and the fallback method for details); as a result, it could NOT delete on your system those files no longer present @@ -82,15 +82,15 @@ have got(ten) your installation CDs. It is therefore recommended that you adopt the two-step procedure - outlined in the Cvsup FAQ (cf Q12, Q13); in subsequent sections, you + outlined in the CVSup FAQ (cf Q12, Q13); in subsequent sections, you will be given interesting and instructive concrete examples. - A useful python script: cvsupchk + A useful python script: <command>cvsupchk</command> Alternatively, in order to examine your sources for - inconsistencies, you may wish to utilize the cvsupchk python + inconsistencies, you may wish to utilize the cvsupchk python script; which script is currently found in /usr/ports/net/cvsup/work/cvsup-16.1/contrib/cvsupchk, together with a nice README. Prerequisites: @@ -121,7 +121,7 @@ &prompt.user; /path/to/cvsupchk -d /usr -c /usr/sup/src-all/checkouts.cvs:RELENG_4 | more - In each case, cvsupchk will inspect your sources for + In each case, cvsupchk will inspect your sources for inconsistencies by utilizing the information contained in the related checkouts file. Such anomalies as deleted files being present (aka stale files), missing checked-out files, extra RCS @@ -138,17 +138,17 @@ How to safely change tags when updating -<literal>src-all.</literal> +src-all - If you specify eg tag=A in your supfile, cvsup will create + If you specify eg tag=A in your supfile, cvsup will create a checkouts file called checkouts.cvs:A: - for instance, if tag=RELENG_4, a checkouts file called + for instance, if tag=RELENG_4, a checkouts file called checkouts.cvs:RELENG_4 is generated. This file will be used to retrieve and/or store information identifying your 4-STABLE sources. When tracking src-all, if you wish to - pass from tag=A to tag=B (A less/greater than B not making + pass from tag=A to tag=B (A less/greater than B not making any difference) and if your checkouts file is checkouts.cvs:A, the following actions should be performed: @@ -162,17 +162,17 @@ - write a supfile whose collection line reads: + write a supfile whose collection line reads: src-all tag=B - cvsup your sources using the new supfile. + cvsup your sources using the new supfile. - Cvsup will look for checkouts.cvs:B - -- in that the target is B; that is, cvsup will make use of + The cvsup utility will look for checkouts.cvs:B + -- in that the target is B; that is, cvsup will make use of the information contained therein to correctly manage your sources. @@ -185,15 +185,15 @@ - less load is placed on the server, in that cvsup + less load is placed on the server, in that cvsup operates in the most efficient way. - For example, A=RELENG_4, B=. The period in "B=." means + For example, A=RELENG_4, B=.. The period in B=. means -CURRENT. This is a rather typical update, from 4-STABLE - to -CURRENT. While it is straightforward to "downgrade" your + to -CURRENT. While it is straightforward to downgrade your sources (eg from -CURRENT to -STABLE), downgrading a system is quite another matter. You are STRONGLY advised not to attempt such an operation, unless you know exactly what you @@ -203,24 +203,24 @@ Updating to the same tag as of a different date - If you wish to switch from "tag=A" to "tag=A" as of a - different GMT date (say, "date=D"), you will execute the + If you wish to switch from tag=A to tag=A as of a + different GMT date (say, date=D), you will execute the following: - write a supfile whose collection line reads: + write a supfile whose collection line reads: src-all tag=A date=D - update your sources using the new supfile + update your sources using the new supfile Whether the new date precedes that of the last sync - operation with tag=A or not, it is immaterial. For example, - in order to specify the date "August 27, 2000, 10:00:00 GMT" + operation with tag=A or not, it is immaterial. For example, + in order to specify the date August 27, 2000, 10:00:00 GMT you write the line: @@ -237,19 +237,19 @@ is called checkouts.cvs:A (eg checkouts.cvs:RELENG_4). As a result, no particular action is needed in order to revert to the - previous state: you have to modify the date in the supfile, - and csvup again. + previous state: you have to modify the date in the supfile, + and run csvup again. Updating your ports collection for the first time - Since ports are tagged "." (ie -CURRENT), you can - correctly "sync" them for the first time by adding the date + Since ports are tagged . (ie -CURRENT), you can + correctly sync them for the first time by adding the date keyword (cf &man.cvsup.1; for the exact format): you should - specify a date as close as possible to that of "shipping" of - your ports tree. After cvsup has correctly created the ports + specify a date as close as possible to that of shipping of + your ports tree. After cvsup has correctly created the ports checkouts file, which is precisely the goal of this first special sync operation, the date field must be removed; all subsequent updates will be carried out smoothly. ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/fonts/article.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ +
    Formatting Media For Use With FreeBSD @@ -521,7 +521,7 @@ several identical disks as a single disk. Striping can result in increased disk performance by distributing reads and writes across the disks. See the &man.ccd.4; and &man.ccdconfig.8; - man pages or the CCD Homepage for further details. ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hubs/article.sgml#3 (text+ko) ==== @@ -11,7 +11,7 @@
    Mirroring FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/hubs/article.sgml,v 1.21 2002/05/21 20:11:19 logo Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/hubs/article.sgml,v 1.22 2002/06/28 23:44:36 keramida Exp $ Jun @@ -1005,7 +1005,7 @@ Then you can ask the &a.doc; or the &a.hubs; to add your mirror site to the mirror list in the - FreeBSD + FreeBSD Handbook. Make sure you tell them the email address, to list as the maintainer of the site. ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/java-tomcat/article.sgml#2 (text+ko) ==== @@ -80,7 +80,7 @@ Hiten Pandya - $FreeBSD: doc/en_US.ISO8859-1/articles/java-tomcat/article.sgml,v 1.5 2002/04/27 00:12:03 znerd Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/java-tomcat/article.sgml,v 1.6 2002/07/03 23:19:11 jim Exp $ This document is presented in hopes of making it easier for @@ -118,7 +118,7 @@ The Tomcat portion of the install is very straight forward, but the difficulty I had was getting Java Development Kit up and - running for FreeBSD 4.x, as Sun Microsystems only supplies + running for FreeBSD 4.X, as Sun Microsystems only supplies Binaries for Linux, Solaris, and Windows NT. This means that I had to compile my own JDK for FreeBSD. I began by searching for documentation on the Internet. I quickly found that there is more ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/laptop/article.sgml#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 15:50:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7CB537B48E; Fri, 12 Jul 2002 15:47:27 -0700 (PDT) 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 2D30F37BADF for ; Fri, 12 Jul 2002 15:47:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D049B44171 for ; Fri, 12 Jul 2002 15:45:44 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CMjiJU019983 for ; Fri, 12 Jul 2002 15:45:44 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CMjitK019980 for perforce@freebsd.org; Fri, 12 Jul 2002 15:45:44 -0700 (PDT) Date: Fri, 12 Jul 2002 15:45:44 -0700 (PDT) Message-Id: <200207122245.g6CMjitK019980@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 14161 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14161 Change 14161 by chris@chris_holly on 2002/07/12 15:45:12 o Color HTML elements and class="varname" bits green. o Color function definitions (DocBook ) an interesting shade of blue. Affected files ... .. //depot/projects/trustedbsd/doc/share/misc/docbook.css#2 edit Differences ... ==== //depot/projects/trustedbsd/doc/share/misc/docbook.css#2 (text+ko) ==== @@ -140,11 +140,16 @@ padding: 0; } - +CODE, +.VARNAME, .FILENAME { color: #007a00; } +.FUNCDEF { + color: #2030f0; +} + BODY H1, BODY H2, BODY H3, BODY H4, BODY H5, BODY H6 { margin-left: 0 } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 16:17:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BFE937B400; Fri, 12 Jul 2002 16:17:24 -0700 (PDT) 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 CBAFE37B401 for ; Fri, 12 Jul 2002 16:17:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4111B43E4A for ; Fri, 12 Jul 2002 16:17:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CNHNJU027034 for ; Fri, 12 Jul 2002 16:17:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CNHMYU027031 for perforce@freebsd.org; Fri, 12 Jul 2002 16:17:22 -0700 (PDT) Date: Fri, 12 Jul 2002 16:17:22 -0700 (PDT) Message-Id: <200207122317.g6CNHMYU027031@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14162 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14162 Change 14162 by peter@peter_xeon on 2002/07/12 16:16:30 cosmetic tweaks Affected files ... .. //depot/projects/pmap/sys/vm/vm_zeroidle.c#6 edit Differences ... ==== //depot/projects/pmap/sys/vm/vm_zeroidle.c#6 (text+ko) ==== @@ -112,20 +112,23 @@ static void vm_pagezero(void) { - struct thread *td = curthread; + struct thread *td; + struct proc *p; struct rtprio rtp; int pages = 0; int pri; + td = curthread; + p = td->td_proc; rtp.prio = RTP_PRIO_MAX; rtp.type = RTP_PRIO_IDLE; mtx_lock_spin(&sched_lock); rtp_to_pri(&rtp, td->td_ksegrp); pri = td->td_priority; mtx_unlock_spin(&sched_lock); - PROC_LOCK(td->td_proc); - td->td_proc->p_flag |= P_NOLOAD; - PROC_UNLOCK(td->td_proc); + PROC_LOCK(p); + p->p_flag |= P_NOLOAD; + PROC_UNLOCK(p); for (;;) { if (vm_page_zero_check()) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 16:20:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1CCA37B406; Fri, 12 Jul 2002 16:20:28 -0700 (PDT) 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 E355537B400 for ; Fri, 12 Jul 2002 16:20:27 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79D2C43E3B for ; Fri, 12 Jul 2002 16:20:27 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CNKRJU027496 for ; Fri, 12 Jul 2002 16:20:27 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CNKRid027493 for perforce@freebsd.org; Fri, 12 Jul 2002 16:20:27 -0700 (PDT) Date: Fri, 12 Jul 2002 16:20:27 -0700 (PDT) Message-Id: <200207122320.g6CNKRid027493@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14163 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14163 Change 14163 by peter@peter_xeon on 2002/07/12 16:20:07 make it possible for pagezero to run outside of Giant. - add locking state assertions to vm_pageq.c - lock the vm_pageq_add stuff from early boot to not trip these - allow vm_page_flag_set() etc to work on pages not in the remaining giant protected queues. ie: not required for PQ_NONE or PQ_FREE. I hope. :-) It should probably only be exempt for PQ_NONE. Affected files ... .. //depot/projects/pmap/sys/vm/vm_page.c#5 edit .. //depot/projects/pmap/sys/vm/vm_pageq.c#5 edit Differences ... ==== //depot/projects/pmap/sys/vm/vm_page.c#5 (text+ko) ==== @@ -303,6 +303,7 @@ * last rather than first. On large-memory machines, this avoids * the exhaustion of low physical memory before isa_dmainit has run. */ + mtx_lock_spin(&vm_page_queue_free_mtx); cnt.v_page_count = 0; cnt.v_free_count = 0; for (i = 0; phys_avail[i + 1] && npages > 0; i += 2) { @@ -316,6 +317,7 @@ pa += PAGE_SIZE; } } + mtx_unlock_spin(&vm_page_queue_free_mtx); return (vaddr); } @@ -341,14 +343,22 @@ void vm_page_flag_set(vm_page_t m, unsigned short bits) { - GIANT_REQUIRED; + +#ifdef INVARIANTS + if (m->queue >= PQ_INACTIVE) + mtx_assert(&Giant, MA_OWNED); +#endif m->flags |= bits; } void vm_page_flag_clear(vm_page_t m, unsigned short bits) { - GIANT_REQUIRED; + +#ifdef INVARIANTS + if (m->queue >= PQ_INACTIVE) + mtx_assert(&Giant, MA_OWNED); +#endif m->flags &= ~bits; } ==== //depot/projects/pmap/sys/vm/vm_pageq.c#5 (text+ko) ==== @@ -26,6 +26,22 @@ struct vpgqueues vm_page_queues[PQ_COUNT]; static struct mtx vm_pageq_mtx[PQ_COUNT]; + +#ifdef INVARIANTS +static __inline void +vm_pageq_lockcheck(int queue) +{ + + if (queue >= PQ_FREE && queue < PQ_INACTIVE) + mtx_assert(&vm_page_queue_free_mtx, MA_OWNED); + else + mtx_assert(&Giant, MA_OWNED); +} +#define LOCKCHECK(queue) vm_pageq_lockcheck(queue) +#else +#define LOCKCHECK(queue) do { } while(0) +#endif + void vm_pageq_init(void) { @@ -108,8 +124,7 @@ { vm_page_t m; - GIANT_REQUIRED; - + LOCKCHECK(PQ_FREE); ++cnt.v_page_count; m = PHYS_TO_VM_PAGE(pa); m->phys_addr = pa; @@ -155,8 +170,8 @@ int queue = m->queue; struct vpgqueues *pq; - GIANT_REQUIRED; if (queue != PQ_NONE) { + LOCKCHECK(queue); m->queue = PQ_NONE; pq = &vm_page_queues[queue]; TAILQ_REMOVE(&pq->pl, m, pageq); @@ -195,9 +210,8 @@ vm_page_t m = NULL; struct vpgqueues *pq; - GIANT_REQUIRED; + LOCKCHECK(basequeue); pq = &vm_page_queues[basequeue]; - /* * Note that for the first loop, index+i and index-i wind up at the * same place. Even though this is not totally optimal, we've already @@ -217,10 +231,9 @@ vm_page_t vm_pageq_find(int basequeue, int index, boolean_t prefer_zero) { - vm_page_t m; + vm_page_t m; - GIANT_REQUIRED; - + LOCKCHECK(basequeue); #if PQ_L2_SIZE > 1 if (prefer_zero) { m = TAILQ_LAST(&vm_page_queues[basequeue+index].pl, pglist); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 16:47:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C13237B401; Fri, 12 Jul 2002 16:47:49 -0700 (PDT) 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 E6B3937B400 for ; Fri, 12 Jul 2002 16:47:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE69443E88 for ; Fri, 12 Jul 2002 16:47:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CNl1JU029848 for ; Fri, 12 Jul 2002 16:47:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CNl1UD029845 for perforce@freebsd.org; Fri, 12 Jul 2002 16:47:01 -0700 (PDT) Date: Fri, 12 Jul 2002 16:47:01 -0700 (PDT) Message-Id: <200207122347.g6CNl1UD029845@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14166 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14166 Change 14166 by peter@peter_xeon on 2002/07/12 16:46:53 add two more lockchecks. Unfortunately this panics, because vm_page_free_toq() removes pages from the free queue without holding the free queue locked. Affected files ... .. //depot/projects/pmap/sys/vm/vm_pageq.c#6 edit Differences ... ==== //depot/projects/pmap/sys/vm/vm_pageq.c#6 (text+ko) ==== @@ -106,6 +106,7 @@ { struct vpgqueues *vpq; + LOCKCHECK(queue); vpq = &vm_page_queues[queue]; m->queue = queue; TAILQ_INSERT_TAIL(&vpq->pl, m, pageq); @@ -147,7 +148,9 @@ { int queue = m->queue; struct vpgqueues *pq; + if (queue != PQ_NONE) { + LOCKCHECK(PQ_FREE); pq = &vm_page_queues[queue]; m->queue = PQ_NONE; TAILQ_REMOVE(&pq->pl, m, pageq); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 16:48: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D662037B40A; Fri, 12 Jul 2002 16:47:54 -0700 (PDT) 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 69F5C37B400 for ; Fri, 12 Jul 2002 16:47:54 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A7EC43EE8 for ; Fri, 12 Jul 2002 16:47:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CNl1JU029841 for ; Fri, 12 Jul 2002 16:47:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CNl1kA029838 for perforce@freebsd.org; Fri, 12 Jul 2002 16:47:01 -0700 (PDT) Date: Fri, 12 Jul 2002 16:47:01 -0700 (PDT) Message-Id: <200207122347.g6CNl1kA029838@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14165 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14165 Change 14165 by peter@peter_xeon on 2002/07/12 16:46:04 Use vm_pageq_remove_nowakeup() and vm_pageq_insert() instead of the incompletely expanded versions that were there. Affected files ... .. //depot/projects/pmap/sys/vm/vm_zeroidle.c#7 edit Differences ... ==== //depot/projects/pmap/sys/vm/vm_zeroidle.c#7 (text+ko) ==== @@ -78,17 +78,12 @@ zero_state = 0; m = vm_pageq_find(PQ_FREE, free_rover, FALSE); if (m != NULL && (m->flags & PG_ZERO) == 0) { - vm_page_queues[m->queue].lcnt--; - TAILQ_REMOVE(&vm_page_queues[m->queue].pl, m, pageq); - m->queue = PQ_NONE; + vm_pageq_remove_nowakeup(m); mtx_unlock_spin(&vm_page_queue_free_mtx); pmap_zero_page_idle(m); mtx_lock_spin(&vm_page_queue_free_mtx); vm_page_flag_set(m, PG_ZERO); - m->queue = PQ_FREE + m->pc; - vm_page_queues[m->queue].lcnt++; - TAILQ_INSERT_TAIL(&vm_page_queues[m->queue].pl, m, - pageq); + vm_pageq_enqueue(PQ_FREE + m->pc, m); ++vm_page_zero_count; ++cnt_prezero; if (vm_page_zero_count >= ZIDLE_HI(cnt.v_free_count)) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 16:54:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEEA737B405; Fri, 12 Jul 2002 16:54:47 -0700 (PDT) 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 5C5B837B400 for ; Fri, 12 Jul 2002 16:54:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A01B343E99 for ; Fri, 12 Jul 2002 16:52:18 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6CNq8JU030576 for ; Fri, 12 Jul 2002 16:52:08 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6CNq8dl030573 for perforce@freebsd.org; Fri, 12 Jul 2002 16:52:08 -0700 (PDT) Date: Fri, 12 Jul 2002 16:52:08 -0700 (PDT) Message-Id: <200207122352.g6CNq8dl030573@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14167 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14167 Change 14167 by peter@peter_xeon on 2002/07/12 16:51:19 OK, kick me please. Affected files ... .. //depot/projects/pmap/sys/vm/vm_pageq.c#7 edit Differences ... ==== //depot/projects/pmap/sys/vm/vm_pageq.c#7 (text+ko) ==== @@ -150,7 +150,7 @@ struct vpgqueues *pq; if (queue != PQ_NONE) { - LOCKCHECK(PQ_FREE); + LOCKCHECK(queue); pq = &vm_page_queues[queue]; m->queue = PQ_NONE; TAILQ_REMOVE(&pq->pl, m, pageq); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 19:21:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3277337B401; Fri, 12 Jul 2002 19:21:31 -0700 (PDT) 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 6323637B401 for ; Fri, 12 Jul 2002 19:21:30 -0700 (PDT) Received: from mail.speakeasy.net (mail16.speakeasy.net [216.254.0.216]) by mx1.FreeBSD.org (Postfix) with ESMTP id 046C243E67 for ; Fri, 12 Jul 2002 19:21:30 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 12125 invoked from network); 13 Jul 2002 02:21:28 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail16.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 13 Jul 2002 02:21:28 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g6D2LR038003; Fri, 12 Jul 2002 22:21:27 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Fri, 12 Jul 2002 22:21:37 -0400 (EDT) From: John Baldwin To: Julian Elischer Subject: Re: PERFORCE change 13995 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 09-Jul-2002 Julian Elischer wrote: > this looks "odd" Unfortuantely user_ldt_free has a weird rule with sched_lock: it drops it. user_ldt_alloc() has a weirder one in that it drops it if it returns NULL. > ==== //depot/projects/smpng/sys/i386/i386/machdep.c#40 (text+ko) ==== > > @@ -825,8 +825,11 @@ > struct trapframe *regs = td->td_frame; > struct pcb *pcb = td->td_pcb; > > + mtx_lock_spin(&sched_lock); > if (td->td_proc->p_md.md_ldt) > user_ldt_free(td); > + else > + mtx_unlock_spin(&sched_lock); > > bzero((char *)regs, sizeof(struct trapframe)); > regs->tf_eip = entry; > > > does user_ldt_free(td) release the sched lock? > > > -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 19:50:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 751DA37B401; Fri, 12 Jul 2002 19:50:38 -0700 (PDT) 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 07A8B37B400; Fri, 12 Jul 2002 19:50:38 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7520F43E6D; Fri, 12 Jul 2002 19:50:37 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g6D2oWbM002010; Fri, 12 Jul 2002 22:50:32 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Fri, 12 Jul 2002 22:50:32 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: "Brian F. Feldman" Cc: Perforce Change Reviews Subject: Re: PERFORCE change 14125 for review In-Reply-To: <200207121440.g6CEeSA38753@green.bikeshed.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 12 Jul 2002, Brian F. Feldman wrote: > Robert Watson wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14125 > > > > Change 14125 by rwatson@rwatson_paprika on 2002/07/11 21:54:24 > > > > Back out the lazy instantiate component of @14031, as it broke > > mount-derived labels on multilabel (read-only or full) file > > systems, as the EA write could result in a failure of the > > label refresh, even though a valid label is available. > > > > Approved by: green > > Ack! No, you backed out all of it and re-re-reintroduced the bug where > mac_update_vnode_from_externalized _NEVER_ gets called! We probably need to sit down with the source, because I think this still isn't right. mac_update_vnode_from_externalized() is intended to take a fully filled out extmac from the extended attribute, and initialize a vnode label from it. You've changed the code flow so that you call it even when extmac doesn't contain any valid data, which is simply incorrect. Probably what we need is a new entry point intended specifically to handle policies that manage the loading of the externalized form themselves. Something on the order of: mac_update_vnode(vp); Also, we'll need to figure out how to arrange things so that mac_update_vnode_from_mount() does the right thing in this context. The real answer may be to take this opportunity to jump off the 'extmac on disk' notion and switch all policies to use EAs directly now that we have a working model for how it should happen. I'm surprised you can even boot this with any of the non-SEBSD policies enabled. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 12 19:55:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DCA337B401; Fri, 12 Jul 2002 19:55:28 -0700 (PDT) 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 B3A3C37B400; Fri, 12 Jul 2002 19:55:27 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EC7843E3B; Fri, 12 Jul 2002 19:55:27 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g6D2tMbM002022; Fri, 12 Jul 2002 22:55:22 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Fri, 12 Jul 2002 22:55:22 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: "Brian F. Feldman" Cc: Perforce Change Reviews Subject: Re: PERFORCE change 14125 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 12 Jul 2002, Robert Watson wrote: > mac_update_vnode(vp); Actually, that should probably be spelt mac_update_vnode_from_ea(vp). Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 13 14:22: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 846CD37B401; Sat, 13 Jul 2002 14:21:00 -0700 (PDT) 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 130FA37B400 for ; Sat, 13 Jul 2002 14:21:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42B0B43E42 for ; Sat, 13 Jul 2002 14:20:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6DLKxJU054426 for ; Sat, 13 Jul 2002 14:20:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6DLKwO1054423 for perforce@freebsd.org; Sat, 13 Jul 2002 14:20:58 -0700 (PDT) Date: Sat, 13 Jul 2002 14:20:58 -0700 (PDT) Message-Id: <200207132120.g6DLKwO1054423@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14193 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14193 Change 14193 by peter@peter_daintree on 2002/07/13 14:20:21 IFC @14192 Affected files ... .. //depot/projects/pmap/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/pmap/sys/alpha/alpha/trap.c#7 integrate .. //depot/projects/pmap/sys/alpha/conf/GENERIC#4 integrate .. //depot/projects/pmap/sys/conf/Makefile.alpha#3 integrate .. //depot/projects/pmap/sys/conf/Makefile.i386#4 integrate .. //depot/projects/pmap/sys/conf/Makefile.ia64#4 integrate .. //depot/projects/pmap/sys/conf/Makefile.pc98#3 integrate .. //depot/projects/pmap/sys/conf/Makefile.powerpc#4 integrate .. //depot/projects/pmap/sys/conf/Makefile.sparc64#4 integrate .. //depot/projects/pmap/sys/conf/Makefile.x86_64#2 integrate .. //depot/projects/pmap/sys/conf/NOTES#4 integrate .. //depot/projects/pmap/sys/conf/kern.pre.mk#9 integrate .. //depot/projects/pmap/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/pmap/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/pmap/sys/i386/conf/NOTES#7 integrate .. //depot/projects/pmap/sys/i386/i386/pmap.c#27 integrate .. //depot/projects/pmap/sys/i386/i386/trap.c#7 integrate .. //depot/projects/pmap/sys/ia64/ia64/trap.c#6 integrate .. //depot/projects/pmap/sys/kern/kern_exec.c#8 integrate .. //depot/projects/pmap/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/pmap/sys/kern/syscalls.master#6 integrate .. //depot/projects/pmap/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/pmap/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/pmap/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/pmap/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/pmap/sys/netinet/ip_output.c#5 integrate .. //depot/projects/pmap/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/pmap/sys/pci/agp.c#2 integrate .. //depot/projects/pmap/sys/pci/agp_i810.c#2 integrate .. //depot/projects/pmap/sys/powerpc/powerpc/trap.c#6 integrate .. //depot/projects/pmap/sys/sparc64/include/ver.h#3 integrate .. //depot/projects/pmap/sys/sparc64/include/vmparam.h#3 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/identcpu.c#5 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/trap.c#8 integrate .. //depot/projects/pmap/sys/sys/cdefs.h#4 integrate .. //depot/projects/pmap/sys/sys/ucred.h#5 integrate .. //depot/projects/pmap/sys/vm/vm_fault.c#4 integrate .. //depot/projects/pmap/sys/vm/vm_glue.c#10 integrate .. //depot/projects/pmap/sys/vm/vm_kern.c#4 integrate .. //depot/projects/pmap/sys/vm/vm_map.c#6 integrate .. //depot/projects/pmap/sys/vm/vm_page.c#6 integrate .. //depot/projects/pmap/sys/vm/vm_page.h#5 integrate Differences ... ==== //depot/projects/pmap/sys/alpha/alpha/pmap.c#6 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.98 2002/07/09 19:20:16 obrien Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.99 2002/07/13 20:55:21 alc Exp $ */ /* @@ -997,8 +997,10 @@ vm_page_busy(m); ptek[i] = 0; pmap_invalidate_page(kernel_pmap, ks + i * PAGE_SIZE); + vm_page_lock_queues(); vm_page_unwire(m, 0); vm_page_free(m); + vm_page_unlock_queues(); } /* @@ -1036,8 +1038,10 @@ m = vm_page_lookup(ksobj, i); if (m == NULL) panic("pmap_swapout_thread: kstack already missing?"); + vm_page_lock_queues(); vm_page_dirty(m); vm_page_unwire(m, 0); + vm_page_unlock_queues(); pmap_kremove(ks + i * PAGE_SIZE); } } ==== //depot/projects/pmap/sys/alpha/alpha/trap.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.97 2002/06/29 23:58:50 julian Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.98 2002/07/13 04:36:30 mini Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -596,6 +596,9 @@ framep->tf_regs[FRAME_SP] = alpha_pal_rdusp(); userret(td, framep, sticks); mtx_assert(&Giant, MA_NOTOWNED); +#ifdef DIAGNOSTIC + cred_free_thread(td); +#endif } return; @@ -799,6 +802,9 @@ */ STOPEVENT(p, S_SCX, code); +#ifdef DIAGNOSTIC + cred_free_thread(td); +#endif #ifdef WITNESS if (witness_list(td)) { panic("system call %s returning with mutex(s) held\n", ==== //depot/projects/pmap/sys/alpha/conf/GENERIC#4 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.141 2002/07/09 19:20:16 obrien Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.142 2002/07/13 16:43:53 alfred Exp $ machine alpha cpu EV4 @@ -60,6 +60,7 @@ options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] +options COMPAT_FREEBSD4 #Compatible with FreeBSD4 options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory ==== //depot/projects/pmap/sys/conf/Makefile.alpha#3 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.123 2002/02/20 23:35:49 peter Exp $ +# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.124 2002/07/13 19:36:13 bde Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 .if !defined(S) .if exists(./@/.) ==== //depot/projects/pmap/sys/conf/Makefile.i386#4 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 peter Exp $ +# $FreeBSD: src/sys/conf/Makefile.i386,v 1.256 2002/07/13 19:36:13 bde Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 STD8X16FONT?= iso ==== //depot/projects/pmap/sys/conf/Makefile.ia64#4 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.50 2002/05/19 03:41:48 marcel Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.51 2002/07/13 19:36:13 bde Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ GCC3= you bet # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 STD8X16FONT?= iso ==== //depot/projects/pmap/sys/conf/Makefile.pc98#3 (text+ko) ==== @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.156 2002/02/20 23:35:51 peter Exp $ +# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.157 2002/07/13 19:36:13 bde Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 .if !defined(S) .if exists(./@/.) ==== //depot/projects/pmap/sys/conf/Makefile.powerpc#4 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.261 2002/03/24 17:45:46 obrien Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.262 2002/07/13 19:36:13 bde Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 # Temporary stuff while we're still embryonic NO_MODULES?= yes ==== //depot/projects/pmap/sys/conf/Makefile.sparc64#4 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.19 2002/05/26 15:55:28 jake Exp $ +# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.20 2002/07/13 19:36:14 bde Exp $ # # Makefile for FreeBSD # @@ -21,7 +21,7 @@ -ansi # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 STD8X16FONT?= iso ==== //depot/projects/pmap/sys/conf/Makefile.x86_64#2 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.x86_64,v 1.1 2002/06/30 08:05:21 obrien Exp $ +# $FreeBSD: src/sys/conf/Makefile.x86_64,v 1.2 2002/07/13 19:36:14 bde Exp $ # # Makefile for FreeBSD # @@ -18,7 +18,7 @@ # # Which version of config(8) is required. -%VERSREQ= 500010 +%VERSREQ= 500011 STD8X16FONT?= iso ==== //depot/projects/pmap/sys/conf/NOTES#4 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1045 2002/07/11 20:43:37 bde Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1046 2002/07/13 16:43:53 alfred Exp $ # # @@ -172,6 +172,9 @@ # options COMPAT_43 +# Enable FreeBSD4 compatibility syscalls +options COMPAT_FREEBSD4 + # # These three options provide support for System V Interface # Definition-style interprocess communication, in the form of shared ==== //depot/projects/pmap/sys/conf/kern.pre.mk#9 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kenrels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.13 2002/06/16 10:42:05 mux Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.14 2002/07/13 19:36:14 bde Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -49,6 +49,11 @@ # then it might break building of utilities. CFLAGS+= ${FMT} +.if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 +IDENT= -DGPROF +PROF= -pg +.endif + DEFINED_PROF= ${PROF} .if defined(PROF) CFLAGS+= -falign-functions=16 ==== //depot/projects/pmap/sys/dev/usb/ucom.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ucom.c,v 1.39 2001/08/16 22:31:24 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.19 2002/07/10 01:42:25 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.20 2002/07/13 10:41:35 ume Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . @@ -174,6 +174,7 @@ }; DECLARE_MODULE(ucom, ucom_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); +MODULE_DEPEND(uplcom, usb, 1, 1, 1); MODULE_VERSION(ucom, UCOM_MODVER); int ==== //depot/projects/pmap/sys/dev/usb/uplcom.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uplcom.c,v 1.20 2001/07/31 12:33:11 ichiro Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uplcom.c,v 1.4 2002/07/10 01:42:25 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uplcom.c,v 1.5 2002/07/13 10:41:35 ume Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . @@ -228,6 +228,7 @@ }; DRIVER_MODULE(uplcom, uhub, uplcom_driver, ucom_devclass, usbd_driver_load, 0); +MODULE_DEPEND(uplcom, usb, 1, 1, 1); MODULE_DEPEND(uplcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); MODULE_VERSION(uplcom, UPLCOM_MODVER); ==== //depot/projects/pmap/sys/i386/conf/NOTES#7 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1021 2002/07/12 06:38:34 alfred Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1022 2002/07/13 16:43:53 alfred Exp $ # # @@ -874,9 +874,6 @@ # and PSEUDOFS) options LINPROCFS -# Enable FreeBSD4 compatibility syscalls -options COMPAT_FREEBSD4 - # # SysVR4 ABI emulation # ==== //depot/projects/pmap/sys/i386/i386/pmap.c#27 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.338 2002/07/12 20:17:06 dillon Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.342 2002/07/13 21:03:08 peter Exp $ */ /* @@ -740,7 +740,7 @@ /* otherwise, we are alternate address space */ if (frame != (APTDpde & PG_FRAME)) { APTDpde = (pd_entry_t) (frame | PG_RW | PG_V); - invltlb(); + pmap_invalidate_all(kernel_pmap); /* XXX Bandaid */ } return APTmap; } @@ -1002,9 +1002,11 @@ m = vm_page_lookup(ksobj, i); if (m == NULL) panic("pmap_dispose_thread: kstack already missing?"); + vm_page_lock_queues(); vm_page_busy(m); vm_page_unwire(m, 0); vm_page_free(m); + vm_page_unlock_queues(); } /* * Free the space that this stack was mapped to in the kernel @@ -1037,8 +1039,10 @@ m = vm_page_lookup(ksobj, i); if (m == NULL) panic("pmap_swapout_thread: kstack already missing?"); + vm_page_lock_queues(); vm_page_dirty(m); vm_page_unwire(m, 0); + vm_page_unlock_queues(); } } @@ -1385,7 +1389,7 @@ if (ptepa & PG_PS) { pmap->pm_pdir[ptepindex] = 0; ptepa = 0; - invltlb(); + pmap_invalidate_all(kernel_pmap); } /* @@ -2348,7 +2352,7 @@ ptepindex += 1; } vm_page_flag_set(p, PG_MAPPED); - invltlb(); + pmap_invalidate_all(kernel_pmap); return; } @@ -2634,7 +2638,7 @@ */ if (dst_frame != (APTDpde & PG_FRAME)) { APTDpde = dst_frame | PG_RW | PG_V; - invltlb(); + pmap_invalidate_all(kernel_pmap); /* XXX Bandaid */ } src_pte = vtopte(addr); dst_pte = avtopte(addr); @@ -2727,10 +2731,14 @@ if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); *CMAP2 = PG_V | PG_RW | phys | PG_A | PG_M; +#ifdef I386_CPU + invltlb(); +#else #ifdef SMP curthread->td_switchin = pmap_zpi_switchin2; #endif invlpg((u_int)CADDR2); +#endif #if defined(I686_CPU) if (cpu_class == CPUCLASS_686) i686_pagezero(CADDR2); @@ -2765,10 +2773,14 @@ if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); *CMAP2 = PG_V | PG_RW | phys | PG_A | PG_M; +#ifdef I386_CPU + invltlb(); +#else #ifdef SMP curthread->td_switchin = pmap_zpi_switchin2; #endif invlpg((u_int)CADDR2); +#endif #if defined(I686_CPU) if (cpu_class == CPUCLASS_686 && off == 0 && size == PAGE_SIZE) i686_pagezero(CADDR2); @@ -2803,10 +2815,14 @@ if (*CMAP3) panic("pmap_zero_page: CMAP3 busy"); *CMAP3 = PG_V | PG_RW | phys | PG_A | PG_M; +#ifdef I386_CPU + invltlb(); +#else #ifdef SMP curthread->td_switchin = pmap_zpi_switchin3; #endif invlpg((u_int)CADDR3); +#endif #if defined(I686_CPU) if (cpu_class == CPUCLASS_686) i686_pagezero(CADDR3); @@ -2845,7 +2861,6 @@ invlpg((u_int)CADDR2); #endif bcopy(CADDR1, CADDR2, PAGE_SIZE); - #ifdef SMP curthread->td_switchin = NULL; #endif ==== //depot/projects/pmap/sys/i386/i386/trap.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.229 2002/06/29 23:58:50 julian Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.230 2002/07/13 04:36:34 mini Exp $ */ /* @@ -295,7 +295,7 @@ #ifdef DEV_NPX ucode = npxtrap(); if (ucode == -1) - goto out; + goto userout; #else ucode = code; #endif @@ -345,7 +345,7 @@ } #endif if (i == -1) - goto out; + goto userout; if (i == 0) goto user; @@ -370,7 +370,7 @@ lastalert = time_second; } mtx_unlock(&Giant); - goto out; + goto userout; #else /* !POWERFAIL_NMI */ /* machine/parity/power fail/"kitchen sink" faults */ /* XXX Giant */ @@ -385,7 +385,7 @@ kdb_trap (type, 0, &frame); } #endif /* DDB */ - goto out; + goto userout; } else if (panic_on_nmi) panic("NMI indicates hardware failure"); break; @@ -406,7 +406,7 @@ #ifdef DEV_NPX /* transparent fault (due to context switch "late") */ if (npxdna()) - goto out; + goto userout; #endif if (!pmath_emulate) { i = SIGFPE; @@ -418,7 +418,7 @@ mtx_unlock(&Giant); if (i == 0) { if (!(frame.tf_eflags & PSL_T)) - goto out; + goto userout; frame.tf_eflags &= ~PSL_T; i = SIGTRAP; } @@ -662,6 +662,10 @@ user: userret(td, &frame, sticks); mtx_assert(&Giant, MA_NOTOWNED); +userout: +#ifdef DIAGNOSTIC + cred_free_thread(td); +#endif out: return; } @@ -1106,6 +1110,10 @@ */ STOPEVENT(p, S_SCX, code); +#ifdef DIAGNOSTIC + cred_free_thread(td); +#endif + #ifdef WITNESS if (witness_list(td)) { panic("system call %s returning with mutex(s) held\n", ==== //depot/projects/pmap/sys/ia64/ia64/trap.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.61 2002/06/29 23:58:50 julian Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.62 2002/07/13 04:36:45 mini Exp $ */ /* From: src/sys/alpha/alpha/trap.c,v 1.33 */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ @@ -746,6 +746,9 @@ if (user) { userret(td, framep, sticks); mtx_assert(&Giant, MA_NOTOWNED); +#ifdef DIAGNOSTIC + cred_free_thread(td); +#endif } return; @@ -915,6 +918,9 @@ */ STOPEVENT(p, S_SCX, code); +#ifdef DIAGNOSTIC + cred_free_thread(td); +#endif #ifdef WITNESS if (witness_list(td)) { panic("system call %s returning with mutex(s) held\n", @@ -1089,6 +1095,10 @@ */ STOPEVENT(p, S_SCX, code); +#ifdef DIAGNOSTIC + cred_free_thread(td); +#endif + #ifdef WITNESS if (witness_list(td)) { panic("system call %s returning with mutex(s) held\n", ==== //depot/projects/pmap/sys/kern/kern_exec.c#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_exec.c,v 1.173 2002/07/11 18:48:05 alc Exp $ + * $FreeBSD: src/sys/kern/kern_exec.c,v 1.174 2002/07/13 03:13:15 jhb Exp $ */ #include "opt_ktrace.h" @@ -396,10 +396,8 @@ #endif /* Make sure file descriptors 0..2 are in use. */ error = fdcheckstd(td); - if (error != 0) { - oldcred = NULL; + if (error != 0) goto done1; - } /* * Set the new credentials. */ ==== //depot/projects/pmap/sys/kern/sys_pipe.c#6 (text+ko) ==== @@ -16,7 +16,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.108 2002/06/29 01:50:25 alfred Exp $ + * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.109 2002/07/13 04:09:45 alc Exp $ */ /* @@ -616,18 +616,27 @@ for (i = 0; addr < endaddr; addr += PAGE_SIZE, i++) { vm_page_t m; + /* + * vm_fault_quick() can sleep. Consequently, + * vm_page_lock_queue() and vm_page_unlock_queue() + * should not be performed outside of this loop. + */ if (vm_fault_quick((caddr_t)addr, VM_PROT_READ) < 0 || (paddr = pmap_extract(vmspace_pmap(curproc->p_vmspace), addr)) == 0) { int j; + vm_page_lock_queues(); for (j = 0; j < i; j++) vm_page_unwire(wpipe->pipe_map.ms[j], 1); + vm_page_unlock_queues(); return (EFAULT); } m = PHYS_TO_VM_PAGE(paddr); + vm_page_lock_queues(); vm_page_wire(m); + vm_page_unlock_queues(); wpipe->pipe_map.ms[i] = m; } @@ -690,8 +699,10 @@ amountpipekva -= wpipe->pipe_buffer.size + PAGE_SIZE; } } + vm_page_lock_queues(); for (i = 0; i < wpipe->pipe_map.npages; i++) vm_page_unwire(wpipe->pipe_map.ms[i], 1); + vm_page_unlock_queues(); wpipe->pipe_map.npages = 0; } ==== //depot/projects/pmap/sys/kern/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.115 2002/07/12 06:51:57 alfred Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.116 2002/07/13 17:11:17 alfred Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -160,7 +160,6 @@ 92 MSTD POSIX { int fcntl(int fd, int cmd, long arg); } ; XXX should be { int fcntl(int fd, int cmd, ...); } ; but we're not ready for varargs. -; XXX man page says `int arg' too. 93 MSTD BSD { int select(int nd, fd_set *in, fd_set *ou, \ fd_set *ex, struct timeval *tv); } 94 UNIMPL BSD setdopt ==== //depot/projects/pmap/sys/kern/uipc_cow.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/uipc_cow.c,v 1.3 2002/07/06 02:44:15 gallatin Exp $ + * $FreeBSD: src/sys/kern/uipc_cow.c,v 1.4 2002/07/13 04:37:22 alc Exp $ */ /* * This is a set of routines for enabling and disabling copy on write @@ -148,7 +148,9 @@ /* * wire the page for I/O */ + vm_page_lock_queues(); vm_page_wire(pp); + vm_page_unlock_queues(); /* * prevent the process from exiting on us. ==== //depot/projects/pmap/sys/kern/uipc_syscalls.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.117 2002/07/12 06:51:57 alfred Exp $ + * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.118 2002/07/13 03:10:55 alc Exp $ */ #include "opt_compat.h" @@ -1605,6 +1605,7 @@ sf = dtosf(addr); pmap_qremove((vm_offset_t)addr, 1); m = sf->m; + vm_page_lock_queues(); vm_page_unwire(m, 0); /* * Check for the object going away on us. This can @@ -1613,6 +1614,7 @@ */ if (m->wire_count == 0 && m->object == NULL) vm_page_free(m); + vm_page_unlock_queues(); sf->m = NULL; mtx_lock(&sf_freelist.sf_lock); SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); @@ -1795,7 +1797,9 @@ * us. */ + vm_page_lock_queues(); vm_page_wire(pg); + vm_page_unlock_queues(); /* * If page is not valid for what we need, initiate I/O @@ -1823,6 +1827,7 @@ vm_page_flag_clear(pg, PG_ZERO); vm_page_io_finish(pg); if (error) { + vm_page_lock_queues(); vm_page_unwire(pg, 0); /* * See if anyone else might know about this page. @@ -1834,6 +1839,7 @@ vm_page_busy(pg); vm_page_free(pg); } + vm_page_unlock_queues(); sbunlock(&so->so_snd); goto done; } @@ -1845,9 +1851,11 @@ * but this wait can be interrupted. */ if ((sf = sf_buf_alloc()) == NULL) { + vm_page_lock_queues(); vm_page_unwire(pg, 0); if (pg->wire_count == 0 && pg->object == NULL) vm_page_free(pg); + vm_page_unlock_queues(); sbunlock(&so->so_snd); error = EINTR; goto done; ==== //depot/projects/pmap/sys/kern/vfs_bio.c#9 (text+ko) ==== @@ -11,7 +11,7 @@ * 2. Absolutely no warranty of function or purpose is made by the author * John S. Dyson. * - * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.319 2002/07/10 17:02:28 dillon Exp $ + * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.320 2002/07/13 20:13:34 alc Exp $ */ /* @@ -1473,7 +1473,7 @@ vm_page_t m; GIANT_REQUIRED; - + vm_page_lock_queues(); for (i = 0; i < bp->b_npages; i++) { m = bp->b_pages[i]; bp->b_pages[i] = NULL; @@ -1509,6 +1509,7 @@ } } } + vm_page_unlock_queues(); pmap_qremove(trunc_page((vm_offset_t) bp->b_data), bp->b_npages); if (bp->b_bufsize) { @@ -2652,7 +2653,9 @@ ; bp->b_pages[i] = NULL; + vm_page_lock_queues(); vm_page_unwire(m, 0); + vm_page_unlock_queues(); } pmap_qremove((vm_offset_t) trunc_page((vm_offset_t)bp->b_data) + (desiredpages << PAGE_SHIFT), (bp->b_npages - desiredpages)); @@ -3386,9 +3389,11 @@ } bp->b_pages[index] = NULL; pmap_qremove(pg, 1); + vm_page_lock_queues(); vm_page_busy(p); vm_page_unwire(p, 0); vm_page_free(p); + vm_page_unlock_queues(); } } bp->b_npages = newnpages; ==== //depot/projects/pmap/sys/kern/vfs_syscalls.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.267 2002/07/02 17:09:22 mux Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.268 2002/07/13 04:07:12 jhb Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -450,20 +450,17 @@ struct file *fp; int fd; - FILEDESC_LOCK(fdp); + FILEDESC_LOCK_ASSERT(fdp, MA_OWNED); for (fd = 0; fd < fdp->fd_nfiles ; fd++) { fp = fget_locked(fdp, fd); if (fp == NULL) continue; if (fp->f_type == DTYPE_VNODE) { vp = (struct vnode *)fp->f_data; - if (vp->v_type == VDIR) { - FILEDESC_UNLOCK(fdp); + if (vp->v_type == VDIR) return (EPERM); - } } } - FILEDESC_UNLOCK(fdp); return (0); } @@ -504,21 +501,18 @@ error = suser_cred(td->td_ucred, PRISON_ROOT); if (error) return (error); + NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, + SCARG(uap, path), td); + mtx_lock(&Giant); + if ((error = change_dir(&nd, td)) != 0) + goto error; FILEDESC_LOCK(fdp); if (chroot_allow_open_directories == 0 || (chroot_allow_open_directories == 1 && fdp->fd_rdir != rootvnode)) { - FILEDESC_UNLOCK(fdp); error = chroot_refuse_vdir_fds(fdp); - } else - FILEDESC_UNLOCK(fdp); - if (error) - return (error); - NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, - SCARG(uap, path), td); - if ((error = change_dir(&nd, td)) != 0) - return (error); - NDFREE(&nd, NDF_ONLY_PNBUF); - FILEDESC_LOCK(fdp); + if (error) + goto error_unlock; + } vp = fdp->fd_rdir; fdp->fd_rdir = nd.ni_vp; if (!fdp->fd_jdir) { @@ -526,8 +520,16 @@ VREF(fdp->fd_jdir); } FILEDESC_UNLOCK(fdp); + NDFREE(&nd, NDF_ONLY_PNBUF); vrele(vp); + mtx_unlock(&Giant); return (0); +error_unlock: + FILEDESC_UNLOCK(fdp); +error: + mtx_unlock(&Giant); + NDFREE(&nd, 0); + return (error); } /* ==== //depot/projects/pmap/sys/netinet/ip_output.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/netinet/ip_output.c,v 1.161 2002/06/27 11:02:06 mux Exp $ + * $FreeBSD: src/sys/netinet/ip_output.c,v 1.162 2002/07/12 22:08:47 luigi Exp $ */ #define _IP_VHL @@ -123,7 +123,7 @@ int hlen = sizeof (struct ip); int len, off, error = 0; struct sockaddr_in *dst = NULL; /* keep compiler happy */ - struct in_ifaddr *ia; + struct in_ifaddr *ia = NULL; int isbroadcast, sw_csum; struct in_addr pkt_dst; #ifdef IPSEC @@ -190,7 +190,8 @@ if (args.rule != NULL) { /* dummynet already saw us */ ip = mtod(m, struct ip *); hlen = IP_VHL_HL(ip->ip_vhl) << 2 ; - ia = ifatoia(ro->ro_rt->rt_ifa); + if (ro->ro_rt) + ia = ifatoia(ro->ro_rt->rt_ifa); goto sendit; } ==== //depot/projects/pmap/sys/pc98/conf/GENERIC#4 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.205 2002/06/30 04:12:20 rwatson Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.206 2002/07/13 16:43:52 alfred Exp $ machine pc98 #cpu I386_CPU #Do not enable with other cpu types @@ -46,6 +46,7 @@ options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] +options COMPAT_FREEBSD4 #Compatible with FreeBSD4 options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI options EPSON_BOUNCEDMA #use bounce buufer for 15-16M >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 13 15:49:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5BB837B401; Sat, 13 Jul 2002 15:49:49 -0700 (PDT) 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 54F5237B400 for ; Sat, 13 Jul 2002 15:49:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1017F43E5E for ; Sat, 13 Jul 2002 15:49:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6DMnmJU069734 for ; Sat, 13 Jul 2002 15:49:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6DMnm4i069731 for perforce@freebsd.org; Sat, 13 Jul 2002 15:49:48 -0700 (PDT) Date: Sat, 13 Jul 2002 15:49:48 -0700 (PDT) Message-Id: <200207132249.g6DMnm4i069731@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14197 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14197 Change 14197 by rwatson@rwatson_paprika on 2002/07/13 15:49:41 Debugging output for mac_bsdextended that can be toggled using a sysctl. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#32 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#32 (text+ko) ==== @@ -92,6 +92,10 @@ SYSCTL_INT(_security_mac_bsdextended, OID_AUTO, rule_slots, CTLFLAG_RD, &rule_slots, 0, "Number of used rule slots\n"); +static int mac_bsdextended_debugging; +SYSCTL_INT(_security_mac_bsdextended, OID_AUTO, debugging, CTLFLAG_RW, + &mac_bsdextended_debugging, 0, "Enable debugging on failure"); + static int mac_bsdextended_rule_valid(struct mac_bsdextended_rule *rule) { @@ -254,8 +258,13 @@ /* * Is the access permitted? */ - if ((rule->mbr_mode & acc_mode) != acc_mode) + if ((rule->mbr_mode & acc_mode) != acc_mode) { + if (mac_bsdextended_debugging) + printf("mac_bsdextended: %d:%d request %d on %d:%d" + " fails\n", cred->cr_ruid, cred->cr_rgid, + acc_mode, object_uid, object_gid); return (EACCES); + } return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 13 15:50:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D89B37B401; Sat, 13 Jul 2002 15:50:51 -0700 (PDT) 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 19FCF37B400 for ; Sat, 13 Jul 2002 15:50:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC2BE43E31 for ; Sat, 13 Jul 2002 15:50:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6DMooJU070322 for ; Sat, 13 Jul 2002 15:50:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6DMoohq070319 for perforce@freebsd.org; Sat, 13 Jul 2002 15:50:50 -0700 (PDT) Date: Sat, 13 Jul 2002 15:50:50 -0700 (PDT) Message-Id: <200207132250.g6DMoohq070319@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14198 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14198 Change 14198 by rwatson@rwatson_paprika on 2002/07/13 15:50:10 Add an XXX comment since releasing the vnode lock here will result in nasty race conditions. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#12 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#12 (text+ko) ==== @@ -415,6 +415,9 @@ char *freepath = NULL; struct vattr va; + /* + * XXX Releasing the vnode lock here is a very bad idea. + */ VOP_GETATTR(vp, &va, curthread->td_ucred, curthread); VOP_UNLOCK(vp, 0, curthread); vn_fullpath(curthread, vp->v_dd, vp, &fullpath, &freepath); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 13 15:50:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EC0037B405; Sat, 13 Jul 2002 15:50:53 -0700 (PDT) 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 89B3E37B400 for ; Sat, 13 Jul 2002 15:50:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DEBA43E31 for ; Sat, 13 Jul 2002 15:50:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6DMopJU070329 for ; Sat, 13 Jul 2002 15:50:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6DMoo6g070326 for perforce@freebsd.org; Sat, 13 Jul 2002 15:50:50 -0700 (PDT) Date: Sat, 13 Jul 2002 15:50:50 -0700 (PDT) Message-Id: <200207132250.g6DMoo6g070326@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14199 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14199 Change 14199 by rwatson@rwatson_paprika on 2002/07/13 15:50:31 Initialize devfs directories as MLS/low, not MLS/high. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#39 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#39 (text+ko) ==== @@ -597,7 +597,7 @@ struct mac_mls *mac_mls; mac_mls = SLOT(label); - mac_mls_set_single(mac_mls, MAC_MLS_TYPE_HIGH, 0); + mac_mls_set_single(mac_mls, MAC_MLS_TYPE_LOW, 0); } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 13 15:52: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A991F37B401; Sat, 13 Jul 2002 15:51:53 -0700 (PDT) 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 4D43537B400 for ; Sat, 13 Jul 2002 15:51:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F12E943E42 for ; Sat, 13 Jul 2002 15:51:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6DMpqJU070367 for ; Sat, 13 Jul 2002 15:51:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6DMpqgd070364 for perforce@freebsd.org; Sat, 13 Jul 2002 15:51:52 -0700 (PDT) Date: Sat, 13 Jul 2002 15:51:52 -0700 (PDT) Message-Id: <200207132251.g6DMpqgd070364@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14200 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14200 Change 14200 by rwatson@rwatson_paprika on 2002/07/13 15:51:43 Cache EA labels in the vnode so we don't keep hitting the EA and polluting the buffer cache. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#166 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#166 (text+ko) ==== @@ -128,6 +128,15 @@ SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size"); +static unsigned int mac_ea_cache_hits = 0; +SYSCTL_UINT(_security_mac, OID_AUTO, ea_cache_hits, CTLFLAG_RD, + &mac_ea_cache_hits, 0, + "How often cached label can be used for EA backing"); +static unsigned int mac_ea_cache_misses = 0; +SYSCTL_UINT(_security_mac, OID_AUTO, ea_cache_misses, CTLFLAG_RD, + &mac_ea_cache_misses, 0, + "How often cached label cannot be used for EA backing"); + static int error_select(int error1, int error2); static int mac_externalize(struct label *label, struct mac *mac); static int mac_policy_register(struct mac_policy_conf *mpc); @@ -902,6 +911,14 @@ struct mac extmac; int buflen, error; + ASSERT_VOP_LOCKED(vp, "vop_stdrefreshlabel_ea"); + + if (vp->v_flag & VCACHEDLABEL) { + mac_ea_cache_hits++; + return (0); + } else + mac_ea_cache_misses++; + buflen = sizeof(extmac); error = vn_extattr_get(vp, IO_NODELOCKED, FREEBSD_MAC_EXTATTR_NAMESPACE, FREEBSD_MAC_EXTATTR_NAME, &buflen, @@ -913,7 +930,9 @@ case ENOATTR: /* - * Use the label from the mount point. + * Use the label from the mount point. Since we may want + * to let this label be updated, don't set the caching + * flag. */ mac_update_vnode_from_mount(vp, vp->v_mount); error = 0; @@ -928,7 +947,9 @@ error = EPERM; /* Fail very closed. */ if (error == 0) error = mac_update_vnode_from_externalized(vp, &extmac); - if (error) { + if (error == 0) + vp->v_flag |= VCACHEDLABEL; + else { struct vattr va; printf("Corrupted label on %s", @@ -952,7 +973,10 @@ * Make sure the vnode label is up-to-date. If EOPNOTSUPP, then we handle * the labeling activity outselves. Filesystems should be careful not * to change their minds regarding whether they support vop_refreshlabel() - * for a vnode or not. + * for a vnode or not. Don't cache the vnode here, allow the file + * system code to determine if it's safe to cache. If we update from + * the mount, don't cache since a change to the mount label should affect + * all vnodes. */ static int vn_refreshlabel(struct vnode *vp, struct ucred *cred) @@ -1002,7 +1026,8 @@ * Helper function for file systems using the vop_std*_ea() calls. This * function must be called after EA service is available for the vnode, * but before it's hooked up to the namespace so that the node persists - * if there's a crash, or before it can be accessed. + * if there's a crash, or before it can be accessed. On successful + * commit of the label to disk (etc), do cache the label. */ int mac_stdcreatevnode_ea(struct vnode *dvp, struct vnode *tvp, struct ucred *cred) @@ -1032,7 +1057,9 @@ error = vn_extattr_set(tvp, IO_NODELOCKED, FREEBSD_MAC_EXTATTR_NAMESPACE, FREEBSD_MAC_EXTATTR_NAME, sizeof(extmac), (char *)&extmac, curthread); - if (error) { + if (error == 0) + tvp->v_flag |= VCACHEDLABEL; + else { #if 0 /* * In theory, we could have fall-back behavior here. @@ -2284,6 +2311,8 @@ struct mac extmac; int error; + ASSERT_VOP_LOCKED(vp, "vop_stdsetlabel_ea"); + if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) return (EOPNOTSUPP); @@ -2299,6 +2328,8 @@ mac_relabel_vnode(ap->a_cred, vp, intlabel); + vp->v_flag |= VCACHEDLABEL; + return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 14 16:44:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CE4137B401; Sun, 14 Jul 2002 16:44:18 -0700 (PDT) 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 939BC37B400 for ; Sun, 14 Jul 2002 16:44:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41A5643E42 for ; Sun, 14 Jul 2002 16:44:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6ENiHJU037386 for ; Sun, 14 Jul 2002 16:44:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6ENiG1u037353 for perforce@freebsd.org; Sun, 14 Jul 2002 16:44:16 -0700 (PDT) Date: Sun, 14 Jul 2002 16:44:16 -0700 (PDT) Message-Id: <200207142344.g6ENiG1u037353@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14233 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14233 Change 14233 by rwatson@rwatson_paprika on 2002/07/14 16:42:40 Change default interface labels: mls/low default for incoming packets, and range of low-low to prevent mls/!low from getting out unless specifically configured. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#40 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#40 (text+ko) ==== @@ -826,8 +826,8 @@ dest = SLOT(ifnetlabel); - mac_mls_set_single(dest, MAC_MLS_TYPE_HIGH, 0); - mac_mls_set_range(dest, MAC_MLS_TYPE_LOW, 0, MAC_MLS_TYPE_HIGH, 0); + mac_mls_set_single(dest, MAC_MLS_TYPE_LOW, 0); + mac_mls_set_range(dest, MAC_MLS_TYPE_LOW, 0, MAC_MLS_TYPE_LOW, 0); } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 14 16:49:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A811137B406; Sun, 14 Jul 2002 16:49:27 -0700 (PDT) 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 451A637B400 for ; Sun, 14 Jul 2002 16:49:27 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC7C243E31 for ; Sun, 14 Jul 2002 16:49:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6ENnQJU037818 for ; Sun, 14 Jul 2002 16:49:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6ENnQVR037815 for perforce@freebsd.org; Sun, 14 Jul 2002 16:49:26 -0700 (PDT) Date: Sun, 14 Jul 2002 16:49:26 -0700 (PDT) Message-Id: <200207142349.g6ENnQVR037815@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14235 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14235 Change 14235 by rwatson@rwatson_paprika on 2002/07/14 16:48:46 First pass at helping extattr-backed labels work for various policies. Introduce mac_update_vnode_from_extattr() to replace the use of mac_update_vnode_from_externalized() in SEBSD, and invoke that before handling the MAC labels for other policies using centralized label support, introducing the preferred failure mode while not breaking those other policies (now fixed). I haven't added entry points for the write case nor the create case (create to come shortly), as the write case has some murky details we'll have to talk about for a bit. In the mean time, hopefully this resolves problems getting both SEBSD and other policies to live side-by-side. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#167 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#13 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#69 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#167 (text+ko) ==== @@ -347,6 +347,10 @@ mpc->mpc_ops.mpo_update_procfsvnode_from_subject = mpe->mpe_function; break; + case MAC_UPDATE_VNODE_FROM_EXTATTR: + mpc->mpc_ops.mpo_update_vnode_from_extattr = + mpe->mpe_function; + break; case MAC_UPDATE_VNODE_FROM_EXTERNALIZED: mpc->mpc_ops.mpo_update_vnode_from_externalized = mpe->mpe_function; @@ -874,6 +878,21 @@ } /* + * Support callout for policies that manage their own externalization + * using extended attributes. + */ +static int +mac_update_vnode_from_extattr(struct vnode *vp, struct mount *mp) +{ + int error; + + MAC_CHECK(update_vnode_from_extattr, vp, &vp->v_label, mp, + &mp->mnt_fslabel); + + return (error); +} + +/* * Given an externalized mac label, internalize it and stamp it on a * vnode. */ @@ -919,6 +938,14 @@ } else mac_ea_cache_misses++; + /* + * Call out to external policies first. Order doesn't really + * matter, as long as failure of one assures failure of all. + */ + error = mac_update_vnode_from_extattr(vp, vp->v_mount); + if (error) + return (error); + buflen = sizeof(extmac); error = vn_extattr_get(vp, IO_NODELOCKED, FREEBSD_MAC_EXTATTR_NAMESPACE, FREEBSD_MAC_EXTATTR_NAME, &buflen, @@ -935,8 +962,8 @@ * flag. */ mac_update_vnode_from_mount(vp, vp->v_mount); - error = 0; - break; + return (0); + case EOPNOTSUPP: default: /* Fail horribly. */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#13 (text+ko) ==== @@ -388,9 +388,8 @@ } static int -sebsd_update_vnode_from_externalized(struct vnode *vp, - struct label *vnodelabel, - struct mac *extmac) +sebsd_update_vnode_from_extattr(struct vnode *vp, struct label *vnodelabel, + struct mount *mp, struct label *fslabel) { struct vnode_security_struct *vsec; /* TBD: Need to limit size of contexts used in extattr labels */ @@ -398,7 +397,11 @@ u_int32_t context_len; int error; - if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { + /* + * XXX: this check is probably redundant, since we'll only get + * called here for multilabel file systems. + */ + if ((mp->mnt_flag & MNT_MULTILABEL) == 0) { return (EOPNOTSUPP); } @@ -421,7 +424,7 @@ VOP_GETATTR(vp, &va, curthread->td_ucred, curthread); VOP_UNLOCK(vp, 0, curthread); vn_fullpath(curthread, vp->v_dd, vp, &fullpath, &freepath); - printf("sebsd_vnode_from_externallize: len=%d: context=%s file=%s inode=%d, fsid=%d\n", context_len, context, fullpath, va.va_fileid, va.va_fsid); + printf("sebsd_vnode_from_extattr: len=%d: context=%s file=%s inode=%d, fsid=%d\n", context_len, context, fullpath, va.va_fileid, va.va_fsid); if (freepath) free(freepath, M_TEMP); vn_lock(vp, LK_EXCLUSIVE, curthread); @@ -430,10 +433,10 @@ vsec = SLOT(vnodelabel); error = security_context_to_sid(context, context_len, &vsec->sid); if (error) { - printf("sebsd_update_vnode_from_externalized: ERROR mapping context to sid: %s\n", context); + printf("sebsd_update_vnode_from_extattr: ERROR mapping context to sid: %s\n", context); } -/* printf("sebsd_update_vnode_from_externalized got sid %d, label size=%d: %s\n", vsec->sid, context_len, context); */ +/* printf("sebsd_update_vnode_from_extattr got sid %d, label size=%d: %s\n", vsec->sid, context_len, context); */ return (0); } @@ -495,8 +498,8 @@ (macop_t)sebsd_destroy_vnode }, { MAC_CREATE_VNODE_FROM_VNODE, (macop_t)sebsd_create_vnode_from_vnode }, - { MAC_UPDATE_VNODE_FROM_EXTERNALIZED, - (macop_t)sebsd_update_vnode_from_externalized }, + { MAC_UPDATE_VNODE_FROM_EXTATTR, + (macop_t)sebsd_update_vnode_from_extattr }, { MAC_RELABEL_VNODE, (macop_t)sebsd_relabel_vnode }, { MAC_CRED_CHECK_EXEC_VNODE, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#69 (text+ko) ==== @@ -127,6 +127,9 @@ struct label *vnodelabel); void (*mpo_update_procfsvnode_from_subject)(struct vnode *vp, struct label *vnodelabel, struct ucred *cred); + int (*mpo_update_vnode_from_extattr)(struct vnode *vp, + struct label *vnodelabel, struct mount *mp, + struct label *fslabel); int (*mpo_update_vnode_from_externalized)(struct vnode *vp, struct label *vnodelabel, struct mac *mac); void (*mpo_update_vnode_from_mount)(struct vnode *vp, @@ -344,6 +347,7 @@ MAC_RELABEL_VNODE, MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, MAC_UPDATE_PROCFSVNODE_FROM_SUBJECT, + MAC_UPDATE_VNODE_FROM_EXTATTR, MAC_UPDATE_VNODE_FROM_EXTERNALIZED, MAC_UPDATE_VNODE_FROM_MOUNT, MAC_CREATE_MBUF_FROM_SOCKET, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 15 9:10: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05AD537B401; Mon, 15 Jul 2002 09:09:53 -0700 (PDT) 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 8B36C37B400 for ; Mon, 15 Jul 2002 09:09:52 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0994043E6A for ; Mon, 15 Jul 2002 09:09:52 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6FG9pJU055892 for ; Mon, 15 Jul 2002 09:09:51 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6FG9peO055886 for perforce@freebsd.org; Mon, 15 Jul 2002 09:09:51 -0700 (PDT) Date: Mon, 15 Jul 2002 09:09:51 -0700 (PDT) Message-Id: <200207151609.g6FG9peO055886@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 14278 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14278 Change 14278 by chris@chris_holly on 2002/07/15 09:09:01 o Move the copyright over to the left one so it doesn't exceed 80 columns. o Turn the sample category and function into an actual MAC Policy Operation description. The introduction to the Access Control Checks section will be written after I figure out what information becomes redundant in each subsection. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#2 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#2 (text+ko) ==== @@ -1,41 +1,41 @@ - + @@ -78,13 +78,12 @@ which supply policy modules with relevant data on a subject and the operation it is attempting to perform on an object. - - Category + + Access Control Checks - General information regarding this family of mac policy - ops. + ... - + <function>mac_<replaceable>policy</replaceable>_cred_check_debug_proc</function> @@ -125,7 +124,18 @@ - Such and such ... + This policy operation is intended to determine whether a + specified subject process should be debugging a specified + object process. Generally a policy module implementing this + operation would compare the subject label + (cred->cr_label) to the object label + (proc->p_ucred->cr_label) and return + 0 if the subject is allowed to debug the + object, or EACCES if it + cannot. + + Why does BIBA return 'No such process' if the + process is of lower integrity? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 15 9:36:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0F4B37B405; Mon, 15 Jul 2002 09:36:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0EE4A37B400; Mon, 15 Jul 2002 09:36:40 -0700 (PDT) Received: from localhost (green@localhost) by green.bikeshed.org (8.11.6/8.11.6) with ESMTP id g6FGadD69438; Mon, 15 Jul 2002 12:36:39 -0400 (EDT) (envelope-from green@green.bikeshed.org) Message-Id: <200207151636.g6FGadD69438@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 14125 for review In-Reply-To: Your message of "Fri, 12 Jul 2002 22:50:32 EDT." From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Mon, 15 Jul 2002 12:36:39 -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson wrote: > > On Fri, 12 Jul 2002, Brian F. Feldman wrote: > > > Robert Watson wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14125 > > > > > > Change 14125 by rwatson@rwatson_paprika on 2002/07/11 21:54:24 > > > > > > Back out the lazy instantiate component of @14031, as it broke > > > mount-derived labels on multilabel (read-only or full) file > > > systems, as the EA write could result in a failure of the > > > label refresh, even though a valid label is available. > > > > > > Approved by: green > > > > Ack! No, you backed out all of it and re-re-reintroduced the bug where > > mac_update_vnode_from_externalized _NEVER_ gets called! > > We probably need to sit down with the source, because I think this still > isn't right. mac_update_vnode_from_externalized() is intended to take a > fully filled out extmac from the extended attribute, and initialize a > vnode label from it. You've changed the code flow so that you call it > even when extmac doesn't contain any valid data, which is simply > incorrect. Probably what we need is a new entry point intended > specifically to handle policies that manage the loading of the > externalized form themselves. Something on the order of: > > mac_update_vnode(vp); I suppose adding that hook probably will be a solution, if not an elegant one. I'd rather it just not call it for policies that have no data but a reserved data slow. > Also, we'll need to figure out how to arrange things so that > mac_update_vnode_from_mount() does the right thing in this context. The > real answer may be to take this opportunity to jump off the 'extmac on > disk' notion and switch all policies to use EAs directly now that we have > a working model for how it should happen. > > I'm surprised you can even boot this with any of the non-SEBSD policies > enabled. I don't run with corrupt labels, though. And I also wasn't running with "no labels" since I was lazy-instantiating them. The logic I had made sense except for read-only cases. -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 15 11:48:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A780437B405; Mon, 15 Jul 2002 11:48:47 -0700 (PDT) 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 17CB137B400; Mon, 15 Jul 2002 11:48:47 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8768B43E5E; Mon, 15 Jul 2002 11:48:46 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g6FIaROo078176; Mon, 15 Jul 2002 14:36:27 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Mon, 15 Jul 2002 14:36:27 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: "Brian F. Feldman" Cc: Perforce Change Reviews Subject: Re: PERFORCE change 14125 for review In-Reply-To: <200207151636.g6FGadD69438@green.bikeshed.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, 15 Jul 2002, Brian F. Feldman wrote: > I suppose adding that hook probably will be a solution, if not an > elegant one. I'd rather it just not call it for policies that have no > data but a reserved data slow. Not sure how to parse the last sentence. The direction we seem to be moving in is to permit policies to implement their own label persistence in EAs as they see appropriate. The commit I did over the weekend for improved caching should help, I think. Note that policies currently have the option to pick one (or both) of the two approaches: they can implement neither, mac_update_vnode_from_extattr(), mac_update_vnode_from_externalized(), or both. Right now I have SEBSD implementing ..._extattr(), and the other policies still using ..._externalized(). I don't want to move the other policies over until we figure out what the right failure modes are in various crash/failure cases. > > I'm surprised you can even boot this with any of the non-SEBSD policies > > enabled. > > I don't run with corrupt labels, though. And I also wasn't running with > "no labels" since I was lazy-instantiating them. The logic I had made > sense except for read-only cases. Right now I run several file systems in nomultilabel mode. The changes you made appeared to cause mac_update_vnode_from_externalized() to accept an un-filled-out 'struct mac' in the case where the EA wasn't present (ENOATTR), resulting in externalized() policies often panicking. In general, we can't assume that we'll be able to write a persistent label in every case we can read, since the main tree uses shared locks for some cases where exclusive locks are required to modify the extended attribute. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 15 13:14:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 433F837B401; Mon, 15 Jul 2002 13:13:07 -0700 (PDT) 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 BE23337B400 for ; Mon, 15 Jul 2002 13:13:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9859E43E58 for ; Mon, 15 Jul 2002 13:13:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6FKD5JU008711 for ; Mon, 15 Jul 2002 13:13:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6FKD223008702 for perforce@freebsd.org; Mon, 15 Jul 2002 13:13:02 -0700 (PDT) Date: Mon, 15 Jul 2002 13:13:02 -0700 (PDT) Message-Id: <200207152013.g6FKD223008702@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14297 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14297 Change 14297 by peter@peter_xeon on 2002/07/15 13:12:37 IFC @14296 Affected files ... .. //depot/projects/pmap/sys/alpha/alpha/pmap.c#7 integrate .. //depot/projects/pmap/sys/alpha/conf/GENERIC#5 integrate .. //depot/projects/pmap/sys/alpha/conf/Makefile#1 branch .. //depot/projects/pmap/sys/alpha/conf/NOTES#1 branch .. //depot/projects/pmap/sys/alpha/conf/SIMOS#3 integrate .. //depot/projects/pmap/sys/boot/common/loader.8#5 integrate .. //depot/projects/pmap/sys/boot/forth/loader.4th.8#3 integrate .. //depot/projects/pmap/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/pmap/sys/conf/NOTES#5 integrate .. //depot/projects/pmap/sys/conf/files#11 integrate .. //depot/projects/pmap/sys/conf/files.alpha#6 integrate .. //depot/projects/pmap/sys/conf/files.i386#9 integrate .. //depot/projects/pmap/sys/conf/files.ia64#5 integrate .. //depot/projects/pmap/sys/conf/files.pc98#8 integrate .. //depot/projects/pmap/sys/conf/files.sparc64#6 integrate .. //depot/projects/pmap/sys/conf/files.x86_64#2 integrate .. //depot/projects/pmap/sys/conf/kern.post.mk#9 integrate .. //depot/projects/pmap/sys/conf/kern.pre.mk#10 integrate .. //depot/projects/pmap/sys/conf/makeLINT.sed#1 branch .. //depot/projects/pmap/sys/conf/options#7 integrate .. //depot/projects/pmap/sys/conf/options.alpha#4 integrate .. //depot/projects/pmap/sys/conf/options.i386#10 integrate .. //depot/projects/pmap/sys/conf/options.ia64#3 integrate .. //depot/projects/pmap/sys/conf/options.pc98#10 integrate .. //depot/projects/pmap/sys/crypto/sha2/sha2.c#3 integrate .. //depot/projects/pmap/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/pmap/sys/dev/hme/if_hmereg.h#3 integrate .. //depot/projects/pmap/sys/dev/random/hash.c#3 integrate .. //depot/projects/pmap/sys/dev/random/hash.h#3 integrate .. //depot/projects/pmap/sys/dev/random/yarrow.c#5 integrate .. //depot/projects/pmap/sys/dev/sbni/if_sbni_isa.c#3 integrate .. //depot/projects/pmap/sys/dev/sbni/if_sbni_pci.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/pmap/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/pmap/sys/dev/usb/if_kuereg.h#3 integrate .. //depot/projects/pmap/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/pmap/sys/i386/conf/Makefile#3 integrate .. //depot/projects/pmap/sys/i386/conf/NOTES#8 integrate .. //depot/projects/pmap/sys/i386/conf/makeLINT.sed#2 delete .. //depot/projects/pmap/sys/i386/i386/pmap.c#28 integrate .. //depot/projects/pmap/sys/i386/include/bus_at386.h#3 integrate .. //depot/projects/pmap/sys/i386/include/cpufunc.h#13 integrate .. //depot/projects/pmap/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/pmap/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/pmap/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/pmap/sys/kern/init_main.c#9 integrate .. //depot/projects/pmap/sys/kern/kern_exec.c#9 integrate .. //depot/projects/pmap/sys/kern/kern_fork.c#10 integrate .. //depot/projects/pmap/sys/kern/kern_idle.c#4 integrate .. //depot/projects/pmap/sys/kern/kern_proc.c#8 integrate .. //depot/projects/pmap/sys/kern/kern_switch.c#8 integrate .. //depot/projects/pmap/sys/kern/kern_synch.c#7 integrate .. //depot/projects/pmap/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/pmap/sys/kern/kern_tc.c#7 integrate .. //depot/projects/pmap/sys/kern/kern_thread.c#2 integrate .. //depot/projects/pmap/sys/kern/subr_mbuf.c#4 integrate .. //depot/projects/pmap/sys/kern/subr_mchain.c#4 integrate .. //depot/projects/pmap/sys/kern/subr_power.c#3 integrate .. //depot/projects/pmap/sys/kern/subr_witness.c#13 integrate .. //depot/projects/pmap/sys/kern/sysv_msg.c#4 integrate .. //depot/projects/pmap/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/pmap/sys/kern/vfs_bio.c#10 integrate .. //depot/projects/pmap/sys/libkern/iconv.c#2 integrate .. //depot/projects/pmap/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/pmap/sys/modules/nfsserver/Makefile#3 integrate .. //depot/projects/pmap/sys/modules/random/Makefile#3 integrate .. //depot/projects/pmap/sys/net/if_media.h#3 integrate .. //depot/projects/pmap/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/pmap/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/pmap/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_lock.c#4 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_lock.h#2 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/pmap/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_srvsock.c#5 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_srvsubs.c#6 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/pmap/sys/pc98/i386/machdep.c#7 integrate .. //depot/projects/pmap/sys/pccard/cardinfo.h#3 integrate .. //depot/projects/pmap/sys/pccard/pcic.c#4 integrate .. //depot/projects/pmap/sys/pccard/slot.h#3 integrate .. //depot/projects/pmap/sys/pci/agp.c#3 integrate .. //depot/projects/pmap/sys/pci/agp_i810.c#3 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/pmap.c#11 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/support.s#4 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/tsb.c#7 integrate .. //depot/projects/pmap/sys/sys/cdefs.h#5 integrate .. //depot/projects/pmap/sys/sys/eventhandler.h#3 integrate .. //depot/projects/pmap/sys/sys/filedesc.h#6 integrate .. //depot/projects/pmap/sys/sys/iconv.h#3 integrate .. //depot/projects/pmap/sys/sys/mbuf.h#4 integrate .. //depot/projects/pmap/sys/sys/param.h#6 integrate .. //depot/projects/pmap/sys/sys/power.h#3 integrate .. //depot/projects/pmap/sys/sys/proc.h#8 integrate .. //depot/projects/pmap/sys/sys/sysctl.h#4 integrate .. //depot/projects/pmap/sys/sys/systm.h#5 integrate .. //depot/projects/pmap/sys/vm/phys_pager.c#3 integrate .. //depot/projects/pmap/sys/vm/vm_contig.c#5 integrate .. //depot/projects/pmap/sys/vm/vm_glue.c#11 integrate .. //depot/projects/pmap/sys/vm/vm_kern.c#5 integrate .. //depot/projects/pmap/sys/vm/vm_page.c#7 integrate .. //depot/projects/pmap/sys/vm/vm_zone.c#4 delete Differences ... ==== //depot/projects/pmap/sys/alpha/alpha/pmap.c#7 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.99 2002/07/13 20:55:21 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.100 2002/07/14 23:51:55 alc Exp $ */ /* @@ -1070,9 +1070,11 @@ m = vm_page_lookup(ksobj, i); m->valid = VM_PAGE_BITS_ALL; } + vm_page_lock_queues(); vm_page_wire(m); vm_page_wakeup(m); vm_page_flag_set(m, PG_MAPPED | PG_WRITEABLE); + vm_page_unlock_queues(); } /* ==== //depot/projects/pmap/sys/alpha/conf/GENERIC#5 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.142 2002/07/13 16:43:53 alfred Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.143 2002/07/15 14:54:36 jhb Exp $ machine alpha cpu EV4 @@ -94,7 +94,6 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices -#device esp # 53C94 & friends, not CAM-ified device isp # Qlogic family #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') ==== //depot/projects/pmap/sys/alpha/conf/SIMOS#3 (text+ko) ==== @@ -11,29 +11,27 @@ # device lines is present in the ./NOTES file. If you are in doubt as # to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.19 2002/04/03 10:56:54 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.20 2002/07/15 14:33:20 jhb Exp $ -machine "alpha" -cpu "EV5" -ident GENERIC +machine alpha +cpu EV5 +ident SIMOS maxusers 10 -options "DEC_KN8AE" +options DEC_KN8AE options SIMOS options INET #InterNETworking options FFS #Berkeley Fast Filesystem options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server options MSDOSFS #MSDOS Filesystem -options "CD9660" #ISO 9660 Filesystem +options CD9660 #ISO 9660 Filesystem options NFS_ROOT #NFS usable as root device options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework -options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!] +options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=100 #Be pessimistic about Joe SCSI device -config kernel - device pci device simos @@ -43,11 +41,7 @@ device sa device cd -# Order is important here due to intrusive probes, do *not* alphabetize -# this list of network interfaces until the probes have been fixed. -# Right now it appears that the ie0 must be probed before ep0. See -# revision 1.20 of this file. -#device de +#device de device loop device ether ==== //depot/projects/pmap/sys/boot/common/loader.8#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.42 2002/05/29 22:57:18 schweikh Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.44 2002/07/15 03:39:34 keramida Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -78,7 +78,7 @@ .Tn FICL is initialized, the builtin words are added to its vocabulary, and .Pa /boot/boot.4th -will be processed if it exists. +is processed if it exists. No disk switching is possible while that file is being read. The inner interpreter .Nm @@ -93,7 +93,7 @@ .Pa /boot/loader.rc is processed if available, and, failing that, .Pa /boot/boot.conf -will be read for historical reasons. +is read for historical reasons. These files are processed through the .Ic include command, which reads all of them into memory before processing them, @@ -114,8 +114,9 @@ .Nm will engage interactive mode. .Sh BUILTIN COMMANDS -.Nm Loader Ns 's -builtin commands take its parameters from the command line. +In +.Nm Ns , +builtin commands take parameters from the command line. Presently, the only way to call them from a script is by using .Pa evaluate @@ -585,7 +586,7 @@ versa. .Pp In -.Nm , +.Nm Ns , each line read interactively is then fed to .Tn FICL , which may call @@ -860,11 +861,13 @@ Search-Order extensions word set. .Ef .Sh HISTORY +The .Nm first appeared in .Fx 3.1 . .Sh AUTHORS .An -nosplit +The .Nm was written by .An Michael Smith Aq msmith@FreeBSD.org . ==== //depot/projects/pmap/sys/boot/forth/loader.4th.8#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/sys/boot/forth/loader.4th.8,v 1.12 2002/05/30 09:24:01 schweikh Exp $ +.\" $FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.13 2002/07/14 15:21:28 charnier Exp $ .\" .Dd April 25, 1999 .Dt LOADER.4TH 8 @@ -53,7 +53,7 @@ for additional commands. .Pp Before using any of the commands provided in -.Nm , +.Nm Ns , it must be included through the command: .Pp @@ -202,12 +202,14 @@ .Xr loader.conf 5 , .Xr loader 8 .Sh HISTORY +The .Nm -first appeared in +set of commands first appeared in .Fx 3.2 . .Sh AUTHORS +The .Nm -was written by +set of commands was written by .An Daniel C. Sobral Aq dcs@FreeBSD.org . .Sh BUGS A British espionage series. ==== //depot/projects/pmap/sys/boot/i386/pxeldr/pxeboot.8#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/sys/boot/i386/pxeldr/pxeboot.8,v 1.5 2000/11/22 09:30:31 ru Exp $ +.\" $FreeBSD: src/sys/boot/i386/pxeldr/pxeboot.8,v 1.6 2002/07/14 15:22:49 charnier Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -33,15 +33,17 @@ .Nm pxeboot .Nd Preboot Execution Environment (PXE) bootloader .Sh DESCRIPTION +The .Nm -is a modified version of the system third-stage bootstrap +bootloader is a modified version of the system third-stage bootstrap .Xr loader 8 configured to run under Intel's Preboot Execution Environment (PXE) system. PXE is a form of smart boot ROM, built into Intel EtherExpress Pro/100 and 3Com 3c905c Ethernet cards, and Ethernet-equipped Intel motherboards. PXE supports DHCP configuration and provides low-level NIC access services. +The .Nm -retrieves the kernel, modules, +bootloader retrieves the kernel, modules, and other files either via NFS over UDP or by TFTP, selectable through compile-time options. In combination with a memory filesystem image or NFS-mounted root filesystem, @@ -92,8 +94,9 @@ .Pp As PXE is still in its infancy, some firmware versions may not work properly. +The .Nm -has been extensively tested on version 0.99 of Intel firmware; +bootloader has been extensively tested on version 0.99 of Intel firmware; pre-release versions of the newer 2.0 firmware are known to have problems. Check with the device's manufacturer for their latest stable release. @@ -104,13 +107,15 @@ .Sh SEE ALSO .Xr loader 8 .Sh HISTORY +The .Nm -first appeared in +bootloader first appeared in .Fx 4.1 . .Sh AUTHORS .An -nosplit +The .Nm -was written by +bootloader was written by .An John Baldwin Aq jhb@FreeBSD.org and .An Paul Saab Aq ps@FreeBSD.org . ==== //depot/projects/pmap/sys/conf/NOTES#5 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1046 2002/07/13 16:43:53 alfred Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1056 2002/07/15 19:24:50 jhb Exp $ # # @@ -86,7 +86,6 @@ # Options for the VM subsystem options PQ_CACHESIZE=512 # color for 512k/16k cache -options KSTACK_PAGES=3 # number of stack pages per process # Deprecated options supported for backwards compatibility #options PQ_NOOPT # No coloring #options PQ_LARGECACHE # color for 512k/16k cache @@ -100,7 +99,7 @@ # options INCLUDE_CONFIG_FILE # Include this file in kernel -options GEOM # Use the GEOMetry system for +options GEOM # Use the GEOMetry system for # disk-I/O transformations. # @@ -739,6 +738,20 @@ options HZ=100 +# If you see the "calcru: negative time of %ld usec for pid %d (%s)\n" +# message you probably have some broken sw/hw which disables interrupts +# for too long. You can make the system more resistant to this by +# choosing a high value for NTIMECOUNTER. The default is 5, there +# is no upper limit but more than a couple of hundred are not productive. + +options NTIMECOUNTER=20 + +# Enable support for the kernel PLL to use an external PPS signal, +# under supervision of [x]ntpd(8) +# More info in ntpd documentation: http://www.eecis.udel.edu/~ntp + +options PPS_SYNC + ##################################################################### # SCSI DEVICES @@ -932,46 +945,6 @@ ##################################################################### -# HARDWARE BUS CONFIGURATION - -# -# ISA bus -# - -options COMPAT_OLDISA #Use ISA shims and glue for old drivers - -# Enable support for the kernel PLL to use an external PPS signal, -# under supervision of [x]ntpd(8) -# More info in ntpd documentation: http://www.eecis.udel.edu/~ntp - -options PPS_SYNC - -# If you see the "calcru: negative time of %ld usec for pid %d (%s)\n" -# message you probably have some broken sw/hw which disables interrupts -# for too long. You can make the system more resistant to this by -# choosing a high value for NTIMECOUNTER. The default is 5, there -# is no upper limit but more than a couple of hundred are not productive. - -options NTIMECOUNTER=20 - -# -# EISA bus -# - -# By default, only 10 EISA slots are probed, since the slot numbers -# above clash with the configuration address space of the PCI subsystem, -# and the EISA probe is not very smart about this. This is sufficient -# for most machines, but in particular the HP NetServer LC series comes -# with an onboard AIC7770 dual-channel SCSI controller on EISA slot #11, -# thus you need to bump this figure to 12 for them. -options EISA_SLOTS=12 - -# -# PCI bus & PCI options: -# - - -##################################################################### # HARDWARE DEVICE CONFIGURATION # For ISA the required hints are listed. @@ -1017,7 +990,7 @@ #for some laptops options PSM_RESETAFTERSUSPEND #reset the device at the resume event -# The video card driver. +# Video card driver for VGA adapters. device vga hint.vga.0.at="isa" @@ -1096,21 +1069,6 @@ # 0x100 Probe for a keyboard device periodically if one is not present # -# ACPI support using the Intel ACPI Component Architecture reference -# implementation. -# -# ACPI_DEBUG enables the use of the debug.acpi.level and debug.acpi.layer -# kernel environment variables to select initial debugging levels for the -# Intel ACPICA code. (Note that the Intel code must also have USE_DEBUGGER -# defined when it is built). -# -# Note that building ACPI into the kernel is deprecated; the module is -# normally loaded automatically by the loader. -# -device acpica -options ACPI_DEBUG - -# # Optional devices: # @@ -1810,6 +1768,11 @@ # si: Specialix SI/XIO 4-32 port terminal multiplexor # nmdm: nullmodem terminal driver (see nmdm(4)) +# Notes on the Digiboard PC/Xi and PC/Xe series driver +# +# The NDGBPORTS option specifies the number of ports controlled by the +# dgb(4) driver. The default value is 16 ports per device. + # Notes on the Digiboard driver: # # The following flag values have special meanings in dgb: @@ -1857,7 +1820,7 @@ hint.cy.0.maddr="0xd4000" hint.cy.0.msize="0x2000" device dgb 1 -options NDGBPORTS=16 # Defaults to 16*NDGB +options NDGBPORTS=17 hint.dgb.0.at="isa" hint.dgb.0.port="0x220" hint.dgb.0.maddr="0xfc000" @@ -2316,8 +2279,6 @@ options NDEVFSINO=1025 options NDEVFSOVERFLOW=32769 options NETGRAPH_BRIDGE -# SIMOS is broken since it is alpha-only but not ifdefed. -##options SIMOS # Yet more undocumented options for linting. options VGA_DEBUG ==== //depot/projects/pmap/sys/conf/files#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.660 2002/07/11 03:26:39 mjacob Exp $ +# $FreeBSD: src/sys/conf/files,v 1.664 2002/07/15 19:11:20 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -501,12 +501,15 @@ dev/ppbus/pps.c optional pps dev/ppbus/vpo.c optional vpo dev/ppbus/vpoio.c optional vpo +dev/puc/puc.c optional puc pci +dev/puc/pucdata.c optional puc pci dev/random/harvest.c standard dev/random/randomdev.c optional random dev/random/yarrow.c optional random dev/random/hash.c optional random crypto/rijndael/rijndael-alg-fst.c optional random crypto/rijndael/rijndael-api-fst.c optional random +crypto/sha2/sha2.c optional random dev/ray/if_ray.c optional ray card dev/ray/if_ray.c optional ray pccard dev/rp/rp.c optional rp @@ -519,6 +522,11 @@ dev/si/si_eisa.c optional si eisa dev/si/si_isa.c optional si isa dev/si/si_pci.c optional si pci +dev/sio/sio_isa.c optional sio isa +dev/sio/sio_pccard.c optional sio card +dev/sio/sio_pccard.c optional sio pccard +dev/sio/sio_pci.c optional sio pci +dev/sio/sio_puc.c optional sio puc pci dev/smbus/smbus_if.m optional smbus dev/smbus/smb.c optional smb dev/smbus/smbconf.c optional smbus @@ -718,6 +726,12 @@ fs/pseudofs/pseudofs_fileno.c optional pseudofs fs/pseudofs/pseudofs_vncache.c optional pseudofs fs/pseudofs/pseudofs_vnops.c optional pseudofs +fs/smbfs/smbfs_io.c optional smbfs +fs/smbfs/smbfs_node.c optional smbfs +fs/smbfs/smbfs_smb.c optional smbfs +fs/smbfs/smbfs_subr.c optional smbfs +fs/smbfs/smbfs_vfsops.c optional smbfs +fs/smbfs/smbfs_vnops.c optional smbfs fs/specfs/spec_vnops.c standard fs/udf/udf_vfsops.c optional udf fs/udf/udf_vnops.c optional udf ==== //depot/projects/pmap/sys/conf/files.alpha#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.87 2002/07/09 19:20:18 obrien Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.90 2002/07/15 15:47:34 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -69,9 +69,6 @@ # alpha/alpha/locore.s standard alpha/alpha/machdep.c standard alpha/alpha/mem.c standard -alpha/alpha/mountroot.c optional slice -alpha/alpha/perfmon.c optional perfmon profiling-routine -alpha/alpha/perfmon.c optional perfmon alpha/alpha/pmap.c standard alpha/alpha/mp_machdep.c optional smp alpha/alpha/prom.c standard @@ -177,9 +174,6 @@ dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/sio/sio.c optional sio -dev/sio/sio_isa.c optional sio isa -#dev/sio/sio_pccard.c optional sio pccard -dev/sio/sio_pci.c optional sio pci dev/syscons/schistory.c count sc dev/syscons/scmouse.c optional sc dev/syscons/scterm.c optional sc ==== //depot/projects/pmap/sys/conf/files.i386#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.402 2002/06/13 06:04:25 brooks Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.405 2002/07/15 19:11:21 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -120,17 +120,10 @@ dev/kbd/kbd.c optional ukbd dev/kbd/kbd.c optional vt dev/lnc/if_lnc_isa.c optional lnc isa -dev/puc/puc.c optional puc -dev/puc/pucdata.c optional puc dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_isa.c optional sbni isa dev/sbni/if_sbni_pci.c optional sbni pci dev/sio/sio.c optional sio -dev/sio/sio_isa.c optional sio isa -dev/sio/sio_pccard.c optional sio card -dev/sio/sio_pccard.c optional sio pccard -dev/sio/sio_pci.c optional sio pci -dev/sio/sio_puc.c optional sio puc dev/sr/if_sr_isa.c optional sr isa dev/syscons/apm/apm_saver.c optional apm_saver apm dev/syscons/schistory.c count sc @@ -144,12 +137,6 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc -fs/smbfs/smbfs_io.c optional smbfs -fs/smbfs/smbfs_node.c optional smbfs -fs/smbfs/smbfs_smb.c optional smbfs -fs/smbfs/smbfs_subr.c optional smbfs -fs/smbfs/smbfs_vfsops.c optional smbfs -fs/smbfs/smbfs_vnops.c optional smbfs gnu/i386/fpemul/div_small.s optional gpl_math_emulate \ warning "kernel contains GPL contaminated math emulator" gnu/i386/fpemul/errors.c optional gpl_math_emulate ==== //depot/projects/pmap/sys/conf/files.ia64#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.32 2002/05/13 02:40:21 jake Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.33 2002/07/15 15:47:34 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -85,9 +85,6 @@ dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/sio/sio.c optional sio -dev/sio/sio_isa.c optional sio isa -#dev/sio/sio_pccard.c optional sio pccard -dev/sio/sio_pci.c optional sio pci dev/syscons/schistory.c count sc dev/syscons/scmouse.c optional sc dev/syscons/scterm.c optional sc ==== //depot/projects/pmap/sys/conf/files.pc98#8 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.234 2002/06/13 06:04:25 brooks Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.237 2002/07/15 19:11:21 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -114,15 +114,9 @@ dev/kbd/kbd.c optional ukbd dev/kbd/kbd.c count pckbd dev/lnc/if_lnc_cbus.c optional lnc isa -dev/puc/puc.c optional puc -dev/puc/pucdata.c optional puc dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_isa.c optional sbni isa dev/sbni/if_sbni_pci.c optional sbni pci -dev/sio/sio_pccard.c optional sio card -dev/sio/sio_pccard.c optional sio pccard -dev/sio/sio_pci.c optional sio pci -dev/sio/sio_puc.c optional sio puc dev/snc/dp83932.c optional snc dev/snc/dp83932subr.c optional snc dev/snc/if_snc.c optional snc @@ -136,12 +130,6 @@ dev/syscons/scterm-dumb.c optional sc dev/syscons/scvidctl.c optional sc dev/syscons/sysmouse.c optional sc -fs/smbfs/smbfs_io.c optional smbfs -fs/smbfs/smbfs_node.c optional smbfs -fs/smbfs/smbfs_smb.c optional smbfs -fs/smbfs/smbfs_subr.c optional smbfs -fs/smbfs/smbfs_vfsops.c optional smbfs -fs/smbfs/smbfs_vnops.c optional smbfs gnu/i386/fpemul/div_small.s optional gpl_math_emulate \ warning "kernel contains GPL contaminated math emulator" gnu/i386/fpemul/errors.c optional gpl_math_emulate ==== //depot/projects/pmap/sys/conf/files.sparc64#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.22 2002/06/18 01:14:54 obrien Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.23 2002/07/15 15:47:34 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -13,11 +13,6 @@ dev/ofw/ofw_console.c optional ofw_console dev/ofw/openfirm.c standard dev/sio/sio.c optional sio -dev/sio/sio_ebus.c optional sio ebus -dev/sio/sio_isa.c optional sio isa -dev/sio/sio_pccard.c optional sio card -dev/sio/sio_pccard.c optional sio pccard -dev/sio/sio_pci.c optional sio pci libkern/ffs.c standard kern/subr_diskmbr.c standard kern/syscalls.c optional ktr ==== //depot/projects/pmap/sys/conf/files.x86_64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.x86_64,v 1.1 2002/06/30 08:05:21 obrien Exp $ +# $FreeBSD: src/sys/conf/files.x86_64,v 1.3 2002/07/15 15:47:34 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -16,11 +16,6 @@ dev/kbd/kbd.c optional ukbd dev/kbd/kbd.c optional vt dev/sio/sio.c optional sio -dev/sio/sio_isa.c optional sio isa -dev/sio/sio_pccard.c optional sio card -dev/sio/sio_pccard.c optional sio pccard -dev/sio/sio_pci.c optional sio pci -dev/sio/sio_puc.c optional sio puc dev/syscons/apm/apm_saver.c optional apm_saver apm dev/syscons/schistory.c count sc dev/syscons/scmouse.c optional sc ==== //depot/projects/pmap/sys/conf/kern.post.mk#9 (text+ko) ==== @@ -6,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.20 2002/05/23 07:25:01 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.21 2002/07/13 22:28:34 bde Exp $ # # XXX why are only some phony targets marked phony? @@ -224,7 +224,7 @@ ${NORMAL_C} vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP} - sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT} + sh $S/conf/newvers.sh ${KERN_IDENT} # XXX strictly, everything depends on Makefile because changes to ${PROF} # only appear there, but we don't handle that. ==== //depot/projects/pmap/sys/conf/kern.pre.mk#10 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kenrels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.14 2002/07/13 19:36:14 bde Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.15 2002/07/13 22:28:34 bde Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -38,7 +38,7 @@ INCLUDES+= -I/usr/include .endif -COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h +COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common # XXX LOCORE means "don't declare C stuff" not "for locore.s". @@ -50,18 +50,16 @@ CFLAGS+= ${FMT} .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 -IDENT= -DGPROF +CFLAGS+= -DGPROF -falign-functions=16 +.if ${PROFLEVEL} >= 2 +CFLAGS+= -DGPROF4 -DGUPROF +# XXX -Wno-inline is to break some warnings. +PROF= -finstrument-functions -Wno-inline +.else PROF= -pg .endif - +.endif DEFINED_PROF= ${PROF} -.if defined(PROF) -CFLAGS+= -falign-functions=16 -.if ${PROFLEVEL} >= 2 -IDENT+= -DGPROF4 -DGUPROF -PROF+= -mprofiler-epilogue -.endif -.endif .if defined(NO_WERROR) WERROR= ==== //depot/projects/pmap/sys/conf/options#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.331 2002/07/12 06:38:33 alfred Exp $ +# $FreeBSD: src/sys/conf/options,v 1.337 2002/07/15 19:11:21 jhb Exp $ # # On the handling of kernel options # @@ -62,8 +62,6 @@ # mapped I/O # Miscellaneous options. -GEOM opt_geom.h - ADAPTIVE_MUTEXES COMPAT_43 opt_compat.h COMPAT_FREEBSD4 opt_compat.h @@ -76,28 +74,27 @@ DDB_UNATTENDED opt_ddb.h GDB_REMOTE_CHAT opt_ddb.h GDBSPEED opt_ddb.h -NODEVFS opt_devfs.h +GEOM HW_WDOG KTRACE KTRACE_REQUEST_POOL opt_ktrace.h LIBICONV MD_ROOT opt_md.h MD_ROOT_SIZE opt_md.h +NDGBPORTS opt_dgb.h +NODEVFS opt_devfs.h NTIMECOUNTER opt_ntp.h NSWAPDEV opt_swap.h PPS_SYNC opt_ntp.h +PUC_FASTINTR opt_puc.h QUOTA SPX_HACK SUIDDIR opt_suiddir.h -SYSVMSG opt_sysvipc.h -SYSVSEM opt_sysvipc.h -SYSVSHM opt_sysvipc.h -SHMALL opt_sysvipc.h -SHMMAX opt_sysvipc.h -SHMMAXPGS opt_sysvipc.h -SHMMIN opt_sysvipc.h -SHMMNI opt_sysvipc.h -SHMSEG opt_sysvipc.h +MSGMNB opt_sysvipc.h +MSGMNI opt_sysvipc.h +MSGSEG opt_sysvipc.h +MSGSSZ opt_sysvipc.h +MSGTQL opt_sysvipc.h SEMMAP opt_sysvipc.h SEMMNI opt_sysvipc.h SEMMNS opt_sysvipc.h @@ -105,12 +102,18 @@ SEMMSL opt_sysvipc.h SEMOPM opt_sysvipc.h SEMUME opt_sysvipc.h -MSGMNB opt_sysvipc.h -MSGMNI opt_sysvipc.h -MSGSEG opt_sysvipc.h -MSGSSZ opt_sysvipc.h -MSGTQL opt_sysvipc.h +SHMALL opt_sysvipc.h +SHMMAX opt_sysvipc.h +SHMMAXPGS opt_sysvipc.h +SHMMIN opt_sysvipc.h +SHMMNI opt_sysvipc.h +SHMSEG opt_sysvipc.h +SYSVMSG opt_sysvipc.h +SYSVSEM opt_sysvipc.h +SYSVSHM opt_sysvipc.h VFS_AIO +WLCACHE opt_wavelan.h +WLDEBUG opt_wavelan.h # POSIX kernel options P1003_1B opt_posix.h @@ -140,6 +143,7 @@ UMAPFS opt_dontuse.h NTFS opt_dontuse.h HPFS opt_dontuse.h +SMBFS opt_dontuse.h UNIONFS opt_dontuse.h UDF opt_dontuse.h @@ -179,6 +183,10 @@ # they won't make any difference yet). NFS_ROOT opt_nfsroot.h +# SMB/CIFS requester +NETSMB opt_netsmb.h +NETSMBCRYPTO opt_netsmb.h + # Options used only in subr_param.c. HZ opt_param.h MAXFILES opt_param.h ==== //depot/projects/pmap/sys/conf/options.alpha#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.alpha,v 1.36 2002/07/09 19:20:18 obrien Exp $ +# $FreeBSD: src/sys/conf/options.alpha,v 1.37 2002/07/15 18:43:09 jhb Exp $ # Options specific to the Alpha platform kernels EV5 opt_global.h @@ -26,9 +26,11 @@ MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h +SC_CUT_SPACES2TABS opt_syscons.h +SC_CUT_SEPCHARS opt_syscons.h SC_DEBUG_LEVEL opt_syscons.h SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDB opt_syscons.h +SC_DISABLE_DDBKEY opt_syscons.h SC_DISABLE_REBOOT opt_syscons.h SC_HISTORY_SIZE opt_syscons.h SC_KERNEL_CONS_ATTR opt_syscons.h ==== //depot/projects/pmap/sys/conf/options.i386#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.172 2002/07/12 07:56:07 peter Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.176 2002/07/15 19:11:21 jhb Exp $ # Options specific to the i386 platform kernels MATH_EMULATE opt_math_emulate.h @@ -16,8 +16,6 @@ AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h I586_PMC_GUPROF opt_i586_guprof.h -WLCACHE opt_wavelan.h -WLDEBUG opt_wavelan.h COMPAT_OLDISA BROKEN_KEYBOARD_RESET opt_reset.h KSTACK_PAGES @@ -107,8 +105,6 @@ PSM_RESETAFTERSUSPEND opt_psm.h PSM_DEBUG opt_psm.h -PUC_FASTINTR opt_puc.h - ATKBD_DFLT_KEYMAP opt_atkbd.h KBD_DISABLE_KEYMAP_LOAD opt_kbd.h @@ -173,21 +169,10 @@ IPR_VJ opt_i4b.h IPR_LOG opt_i4b.h -# Total number of ports controlled by the dgb(4) driver. -# Defaults to NDGB*16. -NDGBPORTS opt_dgb.h - # Device options DEV_NPX opt_npx.h DEV_SPLASH opt_splash.h -# SMB/CIFS requester -NETSMB opt_netsmb.h -NETSMBCRYPTO opt_netsmb.h - >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 15 13:21:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F031137B401; Mon, 15 Jul 2002 13:21:16 -0700 (PDT) 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 8696137B400 for ; Mon, 15 Jul 2002 13:21:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3050043E31 for ; Mon, 15 Jul 2002 13:21:16 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6FKLGJU009625 for ; Mon, 15 Jul 2002 13:21:16 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6FKLFYo009622 for perforce@freebsd.org; Mon, 15 Jul 2002 13:21:15 -0700 (PDT) Date: Mon, 15 Jul 2002 13:21:15 -0700 (PDT) Message-Id: <200207152021.g6FKLFYo009622@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 14298 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14298 Change 14298 by chris@chris_holly on 2002/07/15 13:20:56 o Document mac_policy_cred_check_relabel_subject and mac_policy_cred_check_statfs. o Change in the paramter list to . o Slightly reword mac_policy_cred_check_debug_proc ("should be debugging" -> "should be allowed to debug"). Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#3 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#3 (text+ko) ==== @@ -83,6 +83,111 @@ ... + + <function>mac_<replaceable>policy</replaceable>_cred_check_relabel_subject</function> + + + + static int + mac_policy_cred_check_relabel_subject + + + struct ucred + *cred + struct label + *newlabel + + + + + + + + Parameter + Description + + + + + + cred + Subject credential + + + + newlabel + New label to apply to subject + + + + + This policy operation is intended to determine whether a + subject should be allowed to change its label. Generally, + this is implemented by checking if the subject would be + upgrading its own privilege by making the requested change, + and denying (returning typically + EPERM) the request if so. + + + + <function>mac_<replaceable>policy</replaceable>_cred_check_statfs</function + + + + static int + mac_policy_cred_check_statfs + + + struct ucred + *cred + struct mount + *mp + struct label + *mntlabel + + + + + + + + Parameter + Description + + + + + cred + Subject credential + + + + mp + Object; file system mount point + + + + mntlabel + Object label + + + + + This policy operation is intended to determine whether a + specified subject should be allowed to retrieve file system + statistics information. Generally a policy module + implementing this operation would compare the subject label + (cred->cr_label) to the object label + (mntlabel) and return + 0 if the subject is to be granted the + information requested, and EACCES + otherwise. + + Figure out a scenario where using + mp is immenently practical, especially + for use in the sample module. + + <function>mac_<replaceable>policy</replaceable>_cred_check_debug_proc</function> @@ -99,9 +204,7 @@ - - Parameters - + @@ -112,7 +215,7 @@ - cred + cred Subject credential @@ -122,20 +225,17 @@ -
    + This policy operation is intended to determine whether a - specified subject process should be debugging a specified - object process. Generally a policy module implementing this - operation would compare the subject label + specified subject process should be allowed to debug a + specified object process. Generally a policy module + implementing this operation would compare the subject label (cred->cr_label) to the object label (proc->p_ucred->cr_label) and return 0 if the subject is allowed to debug the - object, or EACCES if it - cannot. - - Why does BIBA return 'No such process' if the - process is of lower integrity? + object, or an error (typically + EACCES) if it cannot.     To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 15 13:26:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D49937B401; Mon, 15 Jul 2002 13:26:45 -0700 (PDT) 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 BDC6037B400 for ; Mon, 15 Jul 2002 13:26:44 -0700 (PDT) Received: from holly.calldei.com (adsl-208-191-149-232.dsl.hstntx.swbell.net [208.191.149.232]) by mx1.FreeBSD.org (Postfix) with ESMTP id A023943EAC for ; Mon, 15 Jul 2002 13:24:57 -0700 (PDT) (envelope-from chris@holly.dyndns.org) Received: by holly.calldei.com (Postfix, from userid 1001) id 97A8AAA8; Mon, 15 Jul 2002 15:25:09 -0500 (CDT) Date: Mon, 15 Jul 2002 15:25:08 -0500 From: Chris Costello To: Perforce Change Reviews Subject: Re: PERFORCE change 14298 for review Message-ID: <20020715152508.B9678@holly.calldei.com> Reply-To: chris@FreeBSD.org References: <200207152021.g6FKLFYo009622@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200207152021.g6FKLFYo009622@freefall.freebsd.org>; from chris@FreeBSD.org on Mon, Jul 15, 2002 at 01:21:15PM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Monday, July 15, 2002, Chris Costello wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14298 > > Change 14298 by chris@chris_holly on 2002/07/15 13:20:56 > > o Document mac_policy_cred_check_relabel_subject and > mac_policy_cred_check_statfs. > o Change in the paramter list to . > o Slightly reword mac_policy_cred_check_debug_proc ("should be > debugging" -> "should be allowed to debug"). Also, I changed the s to s, mostly to get around a DocBook bug where the `tocentry' attribute is ignored, but it turns out that this is more appropriate anyway. -- +-------------------+----------------------------------------------+ | Chris Costello | Unable to locate Coffee -- Operator Halted! | | chris@FreeBSD.org | | +-------------------+----------------------------------------------+ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 15 20:50: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B94437B401; Mon, 15 Jul 2002 20:49:59 -0700 (PDT) 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 96F4C37B400 for ; Mon, 15 Jul 2002 20:49:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6198D43E58 for ; Mon, 15 Jul 2002 20:49:47 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6G3nRJU085945 for ; Mon, 15 Jul 2002 20:49:27 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6G3nQKo085942 for perforce@freebsd.org; Mon, 15 Jul 2002 20:49:26 -0700 (PDT) Date: Mon, 15 Jul 2002 20:49:26 -0700 (PDT) Message-Id: <200207160349.g6G3nQKo085942@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 14313 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14313 Change 14313 by chris@chris_holly on 2002/07/15 20:48:47 Set things up so that XEmacs' psgml module can properly edit the chapter.sgml files (particularly mac/chapter.sgml). This is a merge-back-to-FreeBSD candidate. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/chapter.decl#1 add .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#4 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#4 (text+ko) ==== @@ -35,8 +35,6 @@ $FreeBSD$ --> - - @@ -239,4 +237,15 @@ -+ + + To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 16 6:45:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 511B537B405; Tue, 16 Jul 2002 06:45:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7BD5237B400; Tue, 16 Jul 2002 06:45:13 -0700 (PDT) Received: from localhost (green@localhost) by green.bikeshed.org (8.11.6/8.11.6) with ESMTP id g6GDi8678281; Tue, 16 Jul 2002 09:44:08 -0400 (EDT) (envelope-from green@green.bikeshed.org) Message-Id: <200207161344.g6GDi8678281@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Robert Watson , Perforce Change Reviews Subject: Re: PERFORCE change 14125 for review In-Reply-To: Your message of "Mon, 15 Jul 2002 12:36:39 EDT." <200207151636.g6FGadD69438@green.bikeshed.org> From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 16 Jul 2002 09:44:08 -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG "Brian F. Feldman" wrote: > Robert Watson wrote: > > We probably need to sit down with the source, because I think this still > > isn't right. mac_update_vnode_from_externalized() is intended to take a > > fully filled out extmac from the extended attribute, and initialize a > > vnode label from it. You've changed the code flow so that you call it > > even when extmac doesn't contain any valid data, which is simply > > incorrect. Probably what we need is a new entry point intended > > specifically to handle policies that manage the loading of the > > externalized form themselves. Something on the order of: > > > > mac_update_vnode(vp); > > I suppose adding that hook probably will be a solution, if not an elegant > one. I'd rather it just not call it for policies that have no data but a > reserved data slow. slot As in, policies that will not externalize/internalize directly with the MAC framework support, but rather their own. -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 16 6:56:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2957837B401; Tue, 16 Jul 2002 06:56:05 -0700 (PDT) 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 2435837B427 for ; Tue, 16 Jul 2002 06:55:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 821554406F for ; Tue, 16 Jul 2002 06:54:22 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6GDsGJU097024 for ; Tue, 16 Jul 2002 06:54:16 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6GDsGjh097021 for perforce@freebsd.org; Tue, 16 Jul 2002 06:54:16 -0700 (PDT) Date: Tue, 16 Jul 2002 06:54:16 -0700 (PDT) Message-Id: <200207161354.g6GDsGjh097021@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14328 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14328 Change 14328 by green@green_laptop_2 on 2002/07/16 06:54:14 Evidently, the VLABEL flag wants to now be dressed as VCACHEDLABEL. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#28 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#28 (text+ko) ==== @@ -183,7 +183,7 @@ #define VOWANT 0x20000 /* a thread is waiting for VOLOCK */ #define VDOOMED 0x40000 /* This vnode is being recycled */ #define VFREE 0x80000 /* This vnode is on the freelist */ -#define VLABEL 0x100000 /* vnode has a valid private MAC label */ +#define VCACHEDLABEL 0x100000 /* vnode has a valid private MAC label */ #define VONWORKLST 0x200000 /* On syncer work-list */ #define VMOUNT 0x400000 /* Mount in progress */ #define VOBJDIRTY 0x800000 /* object might be dirty */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 16 9:55:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01D1A37B401; Tue, 16 Jul 2002 09:55:55 -0700 (PDT) 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 B044137B400; Tue, 16 Jul 2002 09:55:54 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1588743E4A; Tue, 16 Jul 2002 09:55:54 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g6GGtlOo084888; Tue, 16 Jul 2002 12:55:48 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Tue, 16 Jul 2002 12:55:47 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 14328 for review In-Reply-To: <200207161354.g6GDsGjh097021@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Sigh. The problem with off-line p4 editing is when you forget to p4 edit all the files you've locally modified. Thanks. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Tue, 16 Jul 2002, Brian Feldman wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14328 > > Change 14328 by green@green_laptop_2 on 2002/07/16 06:54:14 > > Evidently, the VLABEL flag wants to now be dressed as > VCACHEDLABEL. > > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#28 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#28 (text+ko) ==== > > @@ -183,7 +183,7 @@ > #define VOWANT 0x20000 /* a thread is waiting for VOLOCK */ > #define VDOOMED 0x40000 /* This vnode is being recycled */ > #define VFREE 0x80000 /* This vnode is on the freelist */ > -#define VLABEL 0x100000 /* vnode has a valid private MAC label */ > +#define VCACHEDLABEL 0x100000 /* vnode has a valid private MAC label */ > #define VONWORKLST 0x200000 /* On syncer work-list */ > #define VMOUNT 0x400000 /* Mount in progress */ > #define VOBJDIRTY 0x800000 /* object might be dirty */ > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 16 10:59: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7611837B401; Tue, 16 Jul 2002 10:59:00 -0700 (PDT) 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 93F4737B400; Tue, 16 Jul 2002 10:58:58 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3617743E4A; Tue, 16 Jul 2002 10:58:58 -0700 (PDT) (envelope-from peter@wemm.org) Received: from fw.wemm.org (canning.wemm.org [192.203.228.65]) by canning.wemm.org (Postfix) with ESMTP id 1E04B2A7F2; Tue, 16 Jul 2002 10:58:58 -0700 (PDT) (envelope-from peter@wemm.org) Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by fw.wemm.org (Postfix) with ESMTP id CC4F44C4E1; Tue, 16 Jul 2002 10:58:57 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 8470A3811; Tue, 16 Jul 2002 10:58:57 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Robert Watson Cc: Brian Feldman , Perforce Change Reviews Subject: Re: PERFORCE change 14328 for review In-Reply-To: Date: Tue, 16 Jul 2002 10:58:57 -0700 From: Peter Wemm Message-Id: <20020716175857.8470A3811@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson wrote: > Sigh. The problem with off-line p4 editing is when you forget to p4 edit > all the files you've locally modified. Thanks. p4 diff -se ... is your friend. It compares the md5 checksums and shows any files that you have touched that you haven't told p4 about. > Robert N M Watson FreeBSD Core Team, TrustedBSD Projects > robert@fledge.watson.org Network Associates Laboratories > > On Tue, 16 Jul 2002, Brian Feldman wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14328 > > > > Change 14328 by green@green_laptop_2 on 2002/07/16 06:54:14 > > > > Evidently, the VLABEL flag wants to now be dressed as > > VCACHEDLABEL. > > > > Affected files ... > > > > .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#28 edit > > > > Differences ... > > > > ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#28 (text+ko) ==== > > > > @@ -183,7 +183,7 @@ > > #define VOWANT 0x20000 /* a thread is waiting for VOLOCK */ > > #define VDOOMED 0x40000 /* This vnode is being recycled */ > > #define VFREE 0x80000 /* This vnode is on the freelist */ > > -#define VLABEL 0x100000 /* vnode has a valid private MAC label */ > > +#define VCACHEDLABEL 0x100000 /* vnode has a valid private MAC label */ > > #define VONWORKLST 0x200000 /* On syncer work-list */ > > #define VMOUNT 0x400000 /* Mount in progress */ > > #define VOBJDIRTY 0x800000 /* object might be dirty */ > > > > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe p4-all" in the body of the message > Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 16 11:15:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5321E37B401; Tue, 16 Jul 2002 11:15:28 -0700 (PDT) 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 D657D37B400 for ; Tue, 16 Jul 2002 11:15:27 -0700 (PDT) Received: from mail.speakeasy.net (mail17.speakeasy.net [216.254.0.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id C75E743E4A for ; Tue, 16 Jul 2002 11:15:26 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 4615 invoked from network); 16 Jul 2002 18:15:26 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail17.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 16 Jul 2002 18:15:26 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.11.6/8.11.6) with ESMTP id g6GIFO053615; Tue, 16 Jul 2002 14:15:24 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Tue, 16 Jul 2002 14:15:29 -0400 (EDT) From: John Baldwin To: Robert Watson Subject: Re: PERFORCE change 14328 for review Cc: Perforce Change Reviews Cc: Perforce Change Reviews , Brian Feldman Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 16-Jul-2002 Robert Watson wrote: > Sigh. The problem with off-line p4 editing is when you forget to p4 edit > all the files you've locally modified. Thanks. p4 diff -se can be useful in that case. > Robert N M Watson FreeBSD Core Team, TrustedBSD Projects > robert@fledge.watson.org Network Associates Laboratories > > On Tue, 16 Jul 2002, Brian Feldman wrote: > >> http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14328 >> >> Change 14328 by green@green_laptop_2 on 2002/07/16 06:54:14 >> >> Evidently, the VLABEL flag wants to now be dressed as >> VCACHEDLABEL. >> >> Affected files ... >> >> .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#28 edit >> >> Differences ... >> >> ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#28 (text+ko) ==== >> >> @@ -183,7 +183,7 @@ >> #define VOWANT 0x20000 /* a thread is waiting for VOLOCK */ >> #define VDOOMED 0x40000 /* This vnode is being recycled */ >> #define VFREE 0x80000 /* This vnode is on the freelist */ >> -#define VLABEL 0x100000 /* vnode has a valid private MAC label */ >> +#define VCACHEDLABEL 0x100000 /* vnode has a valid private MAC label */ >> #define VONWORKLST 0x200000 /* On syncer work-list */ >> #define VMOUNT 0x400000 /* Mount in progress */ >> #define VOBJDIRTY 0x800000 /* object might be dirty */ >> > -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 16 13:19:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A300A37B400; Tue, 16 Jul 2002 13:19:10 -0700 (PDT) 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 370FA37B405 for ; Tue, 16 Jul 2002 13:19:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA0A743E6D for ; Tue, 16 Jul 2002 13:19:08 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6GKJ8JU071993 for ; Tue, 16 Jul 2002 13:19:08 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6GKJ8q1071990 for perforce@freebsd.org; Tue, 16 Jul 2002 13:19:08 -0700 (PDT) Date: Tue, 16 Jul 2002 13:19:08 -0700 (PDT) Message-Id: <200207162019.g6GKJ8q1071990@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 14345 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14345 Change 14345 by chris@chris_holly on 2002/07/16 13:18:33 Document the module event hooks. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#5 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#5 (text+ko) ==== @@ -76,6 +76,106 @@ which supply policy modules with relevant data on a subject and the operation it is attempting to perform on an object. + + Policy Module Operations + + The MAC policy framework includes the ability for policies + to be compiled as separate loadable kernel modules. The + following structure is passed to the module operation + hooks: + + struct mac_policy_conf { + char *mpc_name; /* policy name */ + char *mpc_fullname; /* policy full name */ + struct mac_policy_ops mpc_ops; /* policy operations */ + struct mac_policy_op_entry *mpc_entries; /* ops to fill in */ + int mpc_loadtime_flags; /* flags */ + int *mpc_field_off; /* security field */ + int mpc_runtime_flags; /* flags */ + LIST_ENTRY(mac_policy_conf) mpc_list; /* global list */ +}; + + + <function>mac_<replaceable>policy</replaceable>_init</function + + + + static void + mac_policy_init + + + struct mac_policy_conf + *conf + + + + + + + + Parameter + Description + + + + + + conf + MAC policy definition + + + + + + This is the initialization hook called after the policy + has been added to the list, but before the list is unlocked. + At the point a module would typically initialize its own + internal structures, print any copyright messages, + etc. + + A module loaded message is already + printed when a policy is loaded so any further messages of + that nature are probably unnecessary. + + + + <function>mac_<replaceable>policy</replaceable>_destroy</function> + + + + static void + mac_policy_ops + + + struct mac_policy_conf + *conf + + + + + + + + Parameter + Description + + + + + + conf + MAC policy definition + + + + + + This hook is called when the module is being unloaded. + At this point the policy would typically be freeing internal + storage, etc. + + + Access Control Checks To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 16 19:27:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 772C037B401; Tue, 16 Jul 2002 19:26:20 -0700 (PDT) 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 23BC537B400 for ; Tue, 16 Jul 2002 19:26:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2230043E3B for ; Tue, 16 Jul 2002 19:26:18 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6H2QIJU033140 for ; Tue, 16 Jul 2002 19:26:18 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6H2Q0E8033012 for perforce@freebsd.org; Tue, 16 Jul 2002 19:26:00 -0700 (PDT) Date: Tue, 16 Jul 2002 19:26:00 -0700 (PDT) Message-Id: <200207170226.g6H2Q0E8033012@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14356 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14356 Change 14356 by peter@peter_daintree on 2002/07/16 19:25:23 IFC @14354 Affected files ... .. //depot/projects/ia64/MAINTAINERS#12 integrate .. //depot/projects/ia64/Makefile.inc1#33 integrate .. //depot/projects/ia64/UPDATING#15 integrate .. //depot/projects/ia64/bin/cat/cat.c#5 integrate .. //depot/projects/ia64/bin/chio/chio.c#4 integrate .. //depot/projects/ia64/bin/chmod/Makefile#3 integrate .. //depot/projects/ia64/bin/chmod/chmod.1#3 integrate .. //depot/projects/ia64/bin/chmod/chmod.c#3 integrate .. //depot/projects/ia64/bin/cp/Makefile#4 integrate .. //depot/projects/ia64/bin/cp/cp.c#7 integrate .. //depot/projects/ia64/bin/cp/utils.c#4 integrate .. //depot/projects/ia64/bin/csh/Makefile#4 integrate .. //depot/projects/ia64/bin/csh/nls/Makefile#3 delete .. //depot/projects/ia64/bin/date/date.c#3 integrate .. //depot/projects/ia64/bin/date/netdate.c#4 integrate .. //depot/projects/ia64/bin/date/vary.c#3 integrate .. //depot/projects/ia64/bin/dd/args.c#4 integrate .. //depot/projects/ia64/bin/dd/conv.c#3 integrate .. //depot/projects/ia64/bin/dd/conv_tab.c#2 integrate .. //depot/projects/ia64/bin/dd/dd.c#3 integrate .. //depot/projects/ia64/bin/dd/misc.c#4 integrate .. //depot/projects/ia64/bin/dd/position.c#3 integrate .. //depot/projects/ia64/bin/df/df.c#7 integrate .. //depot/projects/ia64/bin/domainname/domainname.c#3 integrate .. //depot/projects/ia64/bin/echo/echo.c#3 integrate .. //depot/projects/ia64/bin/ed/buf.c#4 integrate .. //depot/projects/ia64/bin/ed/cbc.c#3 integrate .. //depot/projects/ia64/bin/ed/ed.1#4 integrate .. //depot/projects/ia64/bin/ed/glbl.c#3 integrate .. //depot/projects/ia64/bin/ed/io.c#3 integrate .. //depot/projects/ia64/bin/ed/main.c#4 integrate .. //depot/projects/ia64/bin/ed/re.c#3 integrate .. //depot/projects/ia64/bin/ed/sub.c#3 integrate .. //depot/projects/ia64/bin/ed/undo.c#3 integrate .. //depot/projects/ia64/bin/getfacl/getfacl.c#4 integrate .. //depot/projects/ia64/bin/hostname/hostname.c#3 integrate .. //depot/projects/ia64/bin/kill/kill.c#4 integrate .. //depot/projects/ia64/bin/ln/ln.c#6 integrate .. //depot/projects/ia64/bin/ls/cmp.c#3 integrate .. //depot/projects/ia64/bin/ls/lomac.c#5 integrate .. //depot/projects/ia64/bin/ls/ls.c#7 integrate .. //depot/projects/ia64/bin/ls/print.c#6 integrate .. //depot/projects/ia64/bin/ls/util.c#4 integrate .. //depot/projects/ia64/bin/mkdir/mkdir.1#3 integrate .. //depot/projects/ia64/bin/mkdir/mkdir.c#3 integrate .. //depot/projects/ia64/bin/mv/mv.1#4 integrate .. //depot/projects/ia64/bin/mv/mv.c#6 integrate .. //depot/projects/ia64/bin/pax/ar_io.c#3 integrate .. //depot/projects/ia64/bin/pax/ar_subs.c#4 integrate .. //depot/projects/ia64/bin/pax/buf_subs.c#4 integrate .. //depot/projects/ia64/bin/pax/cache.c#3 integrate .. //depot/projects/ia64/bin/pax/cpio.c#3 integrate .. //depot/projects/ia64/bin/pax/file_subs.c#4 integrate .. //depot/projects/ia64/bin/pax/ftree.c#4 integrate .. //depot/projects/ia64/bin/pax/gen_subs.c#3 integrate .. //depot/projects/ia64/bin/pax/getoldopt.c#3 integrate .. //depot/projects/ia64/bin/pax/options.c#5 integrate .. //depot/projects/ia64/bin/pax/pat_rep.c#4 integrate .. //depot/projects/ia64/bin/pax/pax.c#4 integrate .. //depot/projects/ia64/bin/pax/sel_subs.c#4 integrate .. //depot/projects/ia64/bin/pax/tables.c#3 integrate .. //depot/projects/ia64/bin/pax/tar.c#4 integrate .. //depot/projects/ia64/bin/pax/tty_subs.c#3 integrate .. //depot/projects/ia64/bin/ps/Makefile#6 integrate .. //depot/projects/ia64/bin/ps/fmt.c#6 integrate .. //depot/projects/ia64/bin/ps/keyword.c#5 integrate .. //depot/projects/ia64/bin/ps/lomac.c#5 integrate .. //depot/projects/ia64/bin/ps/nlist.c#4 integrate .. //depot/projects/ia64/bin/ps/print.c#5 integrate .. //depot/projects/ia64/bin/ps/ps.c#7 integrate .. //depot/projects/ia64/bin/pwd/pwd.c#4 integrate .. //depot/projects/ia64/bin/rcp/rcp.c#5 integrate .. //depot/projects/ia64/bin/rcp/util.c#3 integrate .. //depot/projects/ia64/bin/rm/Makefile#3 integrate .. //depot/projects/ia64/bin/rm/rm.c#6 integrate .. //depot/projects/ia64/bin/rmdir/rmdir.c#3 integrate .. //depot/projects/ia64/bin/setfacl/file.c#3 integrate .. //depot/projects/ia64/bin/setfacl/mask.c#4 integrate .. //depot/projects/ia64/bin/setfacl/merge.c#4 integrate .. //depot/projects/ia64/bin/setfacl/remove.c#3 integrate .. //depot/projects/ia64/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/ia64/bin/setfacl/util.c#3 integrate .. //depot/projects/ia64/bin/sh/alias.c#4 integrate .. //depot/projects/ia64/bin/sh/cd.c#5 integrate .. //depot/projects/ia64/bin/sh/error.c#5 integrate .. //depot/projects/ia64/bin/sh/eval.c#4 integrate .. //depot/projects/ia64/bin/sh/exec.c#5 integrate .. //depot/projects/ia64/bin/sh/expand.c#4 integrate .. //depot/projects/ia64/bin/sh/histedit.c#4 integrate .. //depot/projects/ia64/bin/sh/input.c#3 integrate .. //depot/projects/ia64/bin/sh/jobs.c#8 integrate .. //depot/projects/ia64/bin/sh/mail.c#3 integrate .. //depot/projects/ia64/bin/sh/main.c#4 integrate .. //depot/projects/ia64/bin/sh/memalloc.c#3 integrate .. //depot/projects/ia64/bin/sh/miscbltin.c#4 integrate .. //depot/projects/ia64/bin/sh/mkinit.c#3 integrate .. //depot/projects/ia64/bin/sh/mknodes.c#3 integrate .. //depot/projects/ia64/bin/sh/mksyntax.c#3 integrate .. //depot/projects/ia64/bin/sh/mystring.c#3 integrate .. //depot/projects/ia64/bin/sh/options.c#5 integrate .. //depot/projects/ia64/bin/sh/output.c#4 integrate .. //depot/projects/ia64/bin/sh/parser.c#5 integrate .. //depot/projects/ia64/bin/sh/redir.c#4 integrate .. //depot/projects/ia64/bin/sh/sh.1#10 integrate .. //depot/projects/ia64/bin/sh/show.c#4 integrate .. //depot/projects/ia64/bin/sh/trap.c#3 integrate .. //depot/projects/ia64/bin/sh/var.c#5 integrate .. //depot/projects/ia64/bin/sleep/sleep.c#3 integrate .. //depot/projects/ia64/bin/stty/cchar.c#3 integrate .. //depot/projects/ia64/bin/stty/gfmt.c#3 integrate .. //depot/projects/ia64/bin/stty/key.c#3 integrate .. //depot/projects/ia64/bin/stty/modes.c#3 integrate .. //depot/projects/ia64/bin/stty/print.c#3 integrate .. //depot/projects/ia64/bin/stty/stty.c#3 integrate .. //depot/projects/ia64/bin/stty/util.c#3 integrate .. //depot/projects/ia64/bin/sync/sync.8#3 integrate .. //depot/projects/ia64/bin/sync/sync.c#3 integrate .. //depot/projects/ia64/bin/test/test.c#8 integrate .. //depot/projects/ia64/contrib/bind/CHANGES#4 integrate .. //depot/projects/ia64/contrib/bind/FREEBSD-Upgrade#1 branch .. //depot/projects/ia64/contrib/bind/FREEBSD-Xlist#2 integrate .. //depot/projects/ia64/contrib/bind/README#4 integrate .. //depot/projects/ia64/contrib/bind/Version#4 integrate .. //depot/projects/ia64/contrib/bind/bin/addr/addr.c#2 integrate .. //depot/projects/ia64/contrib/bind/bin/dig/dig.c#4 integrate .. //depot/projects/ia64/contrib/bind/bin/host/host.c#4 integrate .. //depot/projects/ia64/contrib/bind/bin/named-xfer/named-xfer.c#3 integrate .. //depot/projects/ia64/contrib/bind/bin/named/db_defs.h#3 integrate .. //depot/projects/ia64/contrib/bind/bin/named/db_glue.c#3 integrate .. //depot/projects/ia64/contrib/bind/bin/named/db_save.c#3 integrate .. //depot/projects/ia64/contrib/bind/bin/named/db_tsig.c#3 integrate .. //depot/projects/ia64/contrib/bind/bin/named/named.conf#4 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_config.c#4 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_ctl.c#3 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_defs.h#4 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_forw.c#4 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_glob.h#3 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_ixfr.c#3 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_lexer.c#4 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_main.c#4 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_maint.c#4 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_parser.y#4 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_req.c#4 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_resp.c#4 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_signal.c#3 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_update.c#3 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_xfr.c#4 integrate .. //depot/projects/ia64/contrib/bind/bin/ndc/ndc.c#3 integrate .. //depot/projects/ia64/contrib/bind/bin/nslookup/Makefile#2 integrate .. //depot/projects/ia64/contrib/bind/bin/nslookup/commands.l#3 integrate .. //depot/projects/ia64/contrib/bind/bin/nslookup/getinfo.c#5 integrate .. //depot/projects/ia64/contrib/bind/bin/nslookup/main.c#4 integrate .. //depot/projects/ia64/contrib/bind/bin/nslookup/send.c#4 integrate .. //depot/projects/ia64/contrib/bind/doc/bog/00macs.me#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/00title.me#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/Makefile#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/ack.me#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/build.me#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/files.me#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/intro.me#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/manage.me#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/named.boot.cache#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/named.boot.primary#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/named.boot.secondary#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/named.local#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/ns.me#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/resolv.conf#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/root.cache#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/setup.me#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/types.me#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/ucbhosts#2 delete .. //depot/projects/ia64/contrib/bind/doc/bog/ucbhosts.rev#2 delete .. //depot/projects/ia64/contrib/bind/doc/html/server.html#3 integrate .. //depot/projects/ia64/contrib/bind/doc/man/dig.1#3 integrate .. //depot/projects/ia64/contrib/bind/doc/man/dnsquery.1#3 integrate .. //depot/projects/ia64/contrib/bind/doc/man/host.1#3 integrate .. //depot/projects/ia64/contrib/bind/doc/man/named.conf.5#3 integrate .. //depot/projects/ia64/contrib/bind/doc/misc/rfc2317-notes.txt#1 branch .. //depot/projects/ia64/contrib/bind/doc/notes/data#2 delete .. //depot/projects/ia64/contrib/bind/doc/notes/db_names.c#2 delete .. //depot/projects/ia64/contrib/bind/doc/notes/irp.txt#2 delete .. //depot/projects/ia64/contrib/bind/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/ia64/contrib/bind/include/isc/list.h#2 integrate .. //depot/projects/ia64/contrib/bind/include/resolv.h#4 integrate .. //depot/projects/ia64/contrib/bind/lib/irs/dns_ho.c#4 integrate .. //depot/projects/ia64/contrib/bind/lib/irs/dns_nw.c#4 integrate .. //depot/projects/ia64/contrib/bind/lib/irs/gethostent.c#3 integrate .. //depot/projects/ia64/contrib/bind/lib/nameser/ns_name.c#3 integrate .. //depot/projects/ia64/contrib/bind/lib/resolv/res_debug.c#3 integrate .. //depot/projects/ia64/contrib/bind/lib/resolv/res_init.c#3 integrate .. //depot/projects/ia64/contrib/bind/lib/resolv/res_private.h#2 integrate .. //depot/projects/ia64/contrib/bind/port/freebsd/Makefile.set#4 integrate .. //depot/projects/ia64/contrib/bind/port/freebsd/include/port_before.h#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ChangeLog-9495#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/archures.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/bfd-in2.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coff-arm.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/coffcode.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/config.in#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/configure#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/configure.in#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/cpu-powerpc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/cpu-s390.c#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/doc/archures.texi#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/libbfd.texi#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/doc/reloc.texi#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/dwarf2.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf-bfd.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf-eh-frame.c#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf32-arm.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf32-mips.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf32-ppc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf32-s390.c#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/elf64-alpha.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf64-ppc.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf64-ppc.h#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf64-s390.c#1 branch .. //depot/projects/ia64/contrib/binutils/bfd/elf64-sparc.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf64-x86-64.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elfarm-nabi.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elflink.h#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elfxx-ia64.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elfxx-target.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ihex.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/libbfd.h#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/opncls.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/reloc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/rs6000-core.c#2 integrate .. //depot/projects/ia64/contrib/binutils/bfd/syms.c#4 integrate .. //depot/projects/ia64/contrib/binutils/bfd/version.h#3 integrate .. //depot/projects/ia64/contrib/binutils/bfd/xcofflink.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/MAINTAINERS#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/arparse.y#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/config.in#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/configure#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/configure.in#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/dlltool.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/dllwrap.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/addr2line.1#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/ar.1#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/cxxfilt.man#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/dlltool.1#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/nm.1#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/objcopy.1#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/objdump.1#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/ranlib.1#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/readelf.1#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/size.1#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/strings.1#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/doc/strip.1#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/nm.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/rclex.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/rclex.l#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/rcparse.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/rcparse.h#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/rcparse.y#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/readelf.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/resbin.c#2 integrate .. //depot/projects/ia64/contrib/binutils/binutils/resrc.c#3 integrate .. //depot/projects/ia64/contrib/binutils/binutils/size.c#3 integrate .. //depot/projects/ia64/contrib/binutils/config/mh-s390pic#1 branch .. //depot/projects/ia64/contrib/binutils/config/mt-s390pic#1 branch .. //depot/projects/ia64/contrib/binutils/gas/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/obj-coff.c#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-arm.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-i386.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-ppc.c#4 integrate .. //depot/projects/ia64/contrib/binutils/gas/config/tc-s390.c#1 branch .. //depot/projects/ia64/contrib/binutils/gas/config/tc-s390.h#1 branch .. //depot/projects/ia64/contrib/binutils/gas/doc/as.1#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/stabs.c#3 integrate .. //depot/projects/ia64/contrib/binutils/gas/symbols.c#3 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/binutils/include/elf/dwarf2.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/opcode/ChangeLog#4 integrate .. //depot/projects/ia64/contrib/binutils/include/opcode/i386.h#3 integrate .. //depot/projects/ia64/contrib/binutils/include/opcode/s390.h#1 branch .. //depot/projects/ia64/contrib/binutils/ld/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/Makefile.am#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/configure.host#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf64_s390.sh#1 branch .. //depot/projects/ia64/contrib/binutils/ld/emulparams/elf_s390.sh#1 branch .. //depot/projects/ia64/contrib/binutils/ld/emultempl/armelf.em#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/emultempl/ppc64elf.em#2 integrate .. //depot/projects/ia64/contrib/binutils/ld/ld.1#3 integrate .. //depot/projects/ia64/contrib/binutils/ld/ld.texinfo#4 integrate .. //depot/projects/ia64/contrib/binutils/ld/ldlang.c#4 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/ppc-opc.c#5 integrate .. //depot/projects/ia64/contrib/binutils/opcodes/s390-dis.c#1 branch .. //depot/projects/ia64/contrib/binutils/opcodes/s390-mkopc.c#1 branch .. //depot/projects/ia64/contrib/binutils/opcodes/s390-opc.c#1 branch .. //depot/projects/ia64/contrib/binutils/opcodes/s390-opc.txt#1 branch .. //depot/projects/ia64/contrib/cvs/src/client.c#2 integrate .. //depot/projects/ia64/contrib/gcc/c-format.c#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/freebsd.h#12 integrate .. //depot/projects/ia64/contrib/gcc/emit-rtl.c#5 integrate .. //depot/projects/ia64/contrib/gcc/recog.c#4 integrate .. //depot/projects/ia64/contrib/gdb/gdb/config/i386/tm-fbsd.h#5 integrate .. //depot/projects/ia64/contrib/gdb/gdb/gdbserver/gdbreplay.c#4 integrate .. //depot/projects/ia64/contrib/openpam/CREDITS#4 integrate .. //depot/projects/ia64/contrib/openpam/HISTORY#11 integrate .. //depot/projects/ia64/contrib/openpam/LICENSE#7 integrate .. //depot/projects/ia64/contrib/openpam/MANIFEST#11 integrate .. //depot/projects/ia64/contrib/openpam/Makefile#7 integrate .. //depot/projects/ia64/contrib/openpam/RELNOTES#11 integrate .. //depot/projects/ia64/contrib/openpam/bin/Makefile#7 integrate .. //depot/projects/ia64/contrib/openpam/bin/su/Makefile#7 integrate .. //depot/projects/ia64/contrib/openpam/bin/su/su.c#8 integrate .. //depot/projects/ia64/contrib/openpam/doc/Makefile#7 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/Makefile#9 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam.3#1 branch .. //depot/projects/ia64/contrib/openpam/doc/man/openpam.man#1 branch .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_borrow_cred.3#7 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_free_data.3#7 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_get_option.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_log.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_restore_cred.3#7 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_set_option.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/openpam_ttyconv.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam.man#1 branch .. //depot/projects/ia64/contrib/openpam/doc/man/pam_acct_mgmt.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_authenticate.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_chauthtok.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_close_session.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_conv.3#1 branch .. //depot/projects/ia64/contrib/openpam/doc/man/pam_end.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_error.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_authtok.3#12 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_data.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_item.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_get_user.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenv.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_getenvlist.3#12 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_info.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_open_session.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_prompt.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_putenv.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_data.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_set_item.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setcred.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_setenv.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_authenticate.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_chauthtok.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_close_session.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_open_session.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_sm_setcred.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_start.3#12 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_strerror.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_verror.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vinfo.3#11 integrate .. //depot/projects/ia64/contrib/openpam/doc/man/pam_vprompt.3#11 integrate .. //depot/projects/ia64/contrib/openpam/include/security/openpam.h#14 integrate .. //depot/projects/ia64/contrib/openpam/include/security/openpam_version.h#3 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_appl.h#7 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_constants.h#9 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_modules.h#9 integrate .. //depot/projects/ia64/contrib/openpam/include/security/pam_types.h#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/Makefile#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_borrow_cred.c#4 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_configure.c#4 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_dispatch.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_dynamic.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_findenv.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_free_data.c#4 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_get_option.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_impl.h#10 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_load.c#8 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_log.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_nullconv.c#3 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_restore_cred.c#4 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_set_option.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_static.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/openpam_ttyconv.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_acct_mgmt.c#8 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_authenticate.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_authenticate_secondary.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_chauthtok.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_close_session.c#8 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_end.c#8 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_error.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_authtok.c#12 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_data.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_item.c#8 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_authtok.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_mapped_username.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_get_user.c#8 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_getenv.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_getenvlist.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_info.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_open_session.c#8 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_prompt.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_putenv.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_data.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_item.c#8 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_authtok.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_set_mapped_username.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_setcred.c#8 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_setenv.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_acct_mgmt.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_authenticate_secondary.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_chauthtok.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_close_session.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_get_mapped_username.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_open_session.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_set_mapped_username.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_sm_setcred.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_start.c#9 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_strerror.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_verror.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_vinfo.c#7 integrate .. //depot/projects/ia64/contrib/openpam/lib/pam_vprompt.c#8 integrate .. //depot/projects/ia64/contrib/openpam/misc/gendoc.pl#9 integrate .. //depot/projects/ia64/contrib/openpam/modules/Makefile#7 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_deny/Makefile#7 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_deny/pam_deny.c#7 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_dummy/Makefile#7 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_dummy/pam_dummy.c#7 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_permit/Makefile#7 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_permit/pam_permit.c#7 integrate .. //depot/projects/ia64/contrib/openpam/modules/pam_unix/Makefile#1 branch .. //depot/projects/ia64/contrib/openpam/modules/pam_unix/pam_unix.c#1 branch .. //depot/projects/ia64/contrib/tar/lib/error.c#2 integrate .. //depot/projects/ia64/contrib/tar/src/compare.c#2 integrate .. //depot/projects/ia64/contrib/tar/src/extract.c#2 integrate .. //depot/projects/ia64/crypto/openssh-portable/CREDITS#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ChangeLog#2 delete .. //depot/projects/ia64/crypto/openssh-portable/FREEBSD-Xlist#2 delete .. //depot/projects/ia64/crypto/openssh-portable/FREEBSD-upgrade#2 delete .. //depot/projects/ia64/crypto/openssh-portable/INSTALL#2 delete .. //depot/projects/ia64/crypto/openssh-portable/LICENCE#2 delete .. //depot/projects/ia64/crypto/openssh-portable/Makefile.in#2 delete .. //depot/projects/ia64/crypto/openssh-portable/OVERVIEW#2 delete .. //depot/projects/ia64/crypto/openssh-portable/README#2 delete .. //depot/projects/ia64/crypto/openssh-portable/README.privsep#2 delete .. //depot/projects/ia64/crypto/openssh-portable/README.smartcard#2 delete .. //depot/projects/ia64/crypto/openssh-portable/RFC.nroff#2 delete .. //depot/projects/ia64/crypto/openssh-portable/TODO#2 delete .. //depot/projects/ia64/crypto/openssh-portable/WARNING.RNG#2 delete .. //depot/projects/ia64/crypto/openssh-portable/acconfig.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/aclocal.m4#2 delete .. //depot/projects/ia64/crypto/openssh-portable/atomicio.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/atomicio.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-bsdauth.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-chall.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-krb4.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-krb5.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-options.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-options.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-pam.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-pam.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-passwd.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-rh-rsa.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-rhosts.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-rsa.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-sia.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-sia.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth-skey.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth1.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth2-chall.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth2-hostbased.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth2-kbdint.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth2-none.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth2-pam-freebsd.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth2-pam.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth2-pam.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth2-passwd.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth2-pubkey.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/auth2.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/authfd.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/authfd.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/authfile.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/authfile.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/bufaux.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/bufaux.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/buffer.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/buffer.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/canohost.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/canohost.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/channels.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/channels.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/cipher.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/cipher.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/clientloop.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/clientloop.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/compat.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/compat.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/compress.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/compress.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/config.guess#2 delete .. //depot/projects/ia64/crypto/openssh-portable/config.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/config.sub#2 delete .. //depot/projects/ia64/crypto/openssh-portable/configure.ac#2 delete .. //depot/projects/ia64/crypto/openssh-portable/crc32.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/crc32.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/deattack.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/deattack.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/defines.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/dh.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/dh.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/dispatch.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/dispatch.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/entropy.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/entropy.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/fatal.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/fixpaths#2 delete .. //depot/projects/ia64/crypto/openssh-portable/fixprogs#2 delete .. //depot/projects/ia64/crypto/openssh-portable/getput.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/groupaccess.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/groupaccess.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/hostfile.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/hostfile.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/includes.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/install-sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/kex.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/kex.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/kexdh.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/kexgex.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/key.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/key.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/log.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/log.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/loginrec.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/loginrec.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/logintest.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/mac.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/mac.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/match.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/match.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/md5crypt.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/md5crypt.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/mdoc2man.pl#2 delete .. //depot/projects/ia64/crypto/openssh-portable/misc.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/misc.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/mkinstalldirs#2 delete .. //depot/projects/ia64/crypto/openssh-portable/moduli#2 delete .. //depot/projects/ia64/crypto/openssh-portable/monitor.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/monitor.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/monitor_fdpass.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/monitor_fdpass.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/monitor_mm.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/monitor_mm.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/monitor_wrap.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/monitor_wrap.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/mpaux.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/mpaux.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/msg.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/msg.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/myproposal.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/nchan.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/nchan.ms#2 delete .. //depot/projects/ia64/crypto/openssh-portable/nchan2.ms#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/Makefile.in#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/base64.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/base64.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bindresvport.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bindresvport.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-arc4random.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-arc4random.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-cray.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-cray.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-cygwin_util.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-cygwin_util.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-misc.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-misc.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-nextstep.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-nextstep.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-snprintf.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-snprintf.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-waitpid.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/bsd-waitpid.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/daemon.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/daemon.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/dirname.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/dirname.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/fake-gai-errnos.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/fake-getaddrinfo.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/fake-getaddrinfo.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/fake-getnameinfo.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/fake-getnameinfo.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/fake-queue.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/fake-socket.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/getcwd.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/getcwd.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/getgrouplist.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/getgrouplist.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/getopt.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/getopt.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/glob.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/glob.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/inet_aton.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/inet_aton.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/inet_ntoa.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/inet_ntoa.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/inet_ntop.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/inet_ntop.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/mktemp.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/mktemp.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/openbsd-compat.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/port-aix.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/port-aix.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/port-irix.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/port-irix.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/readpassphrase.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/readpassphrase.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/realpath.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/realpath.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/rresvport.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/rresvport.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/setenv.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/setenv.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/setproctitle.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/setproctitle.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/sigact.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/sigact.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/strlcat.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/strlcat.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/strlcpy.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/strlcpy.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/strmode.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/strmode.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/strsep.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/strsep.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/openbsd-compat/tree.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/packet.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/packet.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/pathnames.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/radix.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/radix.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/readconf.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/readconf.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/readpass.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/readpass.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/Makefile#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/agent.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/authorized_keys_root#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/broken-pipe.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/bsd.regress.mk#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/connect-privsep.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/connect.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/copy.1#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/copy.2#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/dsa_ssh2.prv#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/dsa_ssh2.pub#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/exit-status.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/forwarding.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/keyscan.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/proto-mismatch.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/proto-version.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/proxy-connect.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/rsa_openssh.prv#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/rsa_openssh.pub#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/rsa_ssh2.prv#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/runtests.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/sftp.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/ssh-com-client.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/ssh-com-keygen.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/ssh-com-sftp.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/ssh-com.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/stderr-after-eof.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/stderr-data.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/t4.ok#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/t5.ok#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/test-exec.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/transfer.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/try-ciphers.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/regress/yes-head.sh#2 delete .. //depot/projects/ia64/crypto/openssh-portable/rijndael.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/rijndael.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/rsa.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/rsa.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/scard-opensc.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/scard.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/scard.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/scard/Makefile.in#2 delete .. //depot/projects/ia64/crypto/openssh-portable/scard/Ssh.bin#2 delete .. //depot/projects/ia64/crypto/openssh-portable/scard/Ssh.bin.uu#2 delete .. //depot/projects/ia64/crypto/openssh-portable/scard/Ssh.java#2 delete .. //depot/projects/ia64/crypto/openssh-portable/scp.1#2 delete .. //depot/projects/ia64/crypto/openssh-portable/scp.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/servconf.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/servconf.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/serverloop.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/serverloop.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/session.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/session.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sftp-client.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sftp-client.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sftp-common.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sftp-common.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sftp-glob.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sftp-glob.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sftp-int.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sftp-int.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sftp-server.8#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sftp-server.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sftp.1#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sftp.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sftp.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-add.1#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-add.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-agent.1#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-agent.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-dss.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-dss.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-keygen.1#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-keygen.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-keyscan.1#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-keyscan.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-keysign.8#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-keysign.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-rand-helper.8#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-rand-helper.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-rsa.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh-rsa.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh.1#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh1.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh2.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh_config#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh_config.5#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ssh_prng_cmds.in#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshconnect.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshconnect.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshconnect1.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshconnect2.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshd.8#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshd.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshd_config#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshd_config.5#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshlogin.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshlogin.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshpty.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshpty.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshtty.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/sshtty.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/tildexpand.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/tildexpand.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ttymodes.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/ttymodes.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/uidswap.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/uidswap.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/uuencode.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/uuencode.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/version.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/version.h#2 delete .. //depot/projects/ia64/crypto/openssh-portable/xmalloc.c#2 delete .. //depot/projects/ia64/crypto/openssh-portable/xmalloc.h#2 delete .. //depot/projects/ia64/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/ia64/crypto/openssh/FREEBSD-Xlist#1 branch .. //depot/projects/ia64/crypto/openssh/FREEBSD-upgrade#1 branch .. //depot/projects/ia64/crypto/openssh/INSTALL#2 integrate .. //depot/projects/ia64/crypto/openssh/Makefile.in#2 integrate .. //depot/projects/ia64/crypto/openssh/README.privsep#2 integrate .. //depot/projects/ia64/crypto/openssh/TODO#2 integrate .. //depot/projects/ia64/crypto/openssh/acconfig.h#2 integrate .. //depot/projects/ia64/crypto/openssh/auth-krb5.c#4 integrate .. //depot/projects/ia64/crypto/openssh/auth-passwd.c#4 integrate .. //depot/projects/ia64/crypto/openssh/auth-skey.c#4 integrate .. //depot/projects/ia64/crypto/openssh/auth.h#4 integrate .. //depot/projects/ia64/crypto/openssh/auth2-chall.c#5 integrate .. //depot/projects/ia64/crypto/openssh/auth2-pam-freebsd.c#1 branch .. //depot/projects/ia64/crypto/openssh/auth2-pam.c#4 integrate .. //depot/projects/ia64/crypto/openssh/auth2.c#5 integrate .. //depot/projects/ia64/crypto/openssh/authfd.c#4 integrate .. //depot/projects/ia64/crypto/openssh/authfile.c#5 integrate .. //depot/projects/ia64/crypto/openssh/bufaux.c#4 integrate .. //depot/projects/ia64/crypto/openssh/buffer.c#3 integrate .. //depot/projects/ia64/crypto/openssh/channels.c#5 integrate .. //depot/projects/ia64/crypto/openssh/channels.h#4 integrate .. //depot/projects/ia64/crypto/openssh/cipher.c#4 integrate .. //depot/projects/ia64/crypto/openssh/clientloop.c#4 integrate .. //depot/projects/ia64/crypto/openssh/config.h#1 branch .. //depot/projects/ia64/crypto/openssh/configure.ac#2 integrate .. //depot/projects/ia64/crypto/openssh/defines.h#2 integrate .. //depot/projects/ia64/crypto/openssh/includes.h#4 integrate .. //depot/projects/ia64/crypto/openssh/kex.c#4 integrate .. //depot/projects/ia64/crypto/openssh/key.c#4 integrate .. //depot/projects/ia64/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/ia64/crypto/openssh/monitor.c#2 integrate .. //depot/projects/ia64/crypto/openssh/monitor.h#2 integrate .. //depot/projects/ia64/crypto/openssh/monitor_fdpass.h#2 integrate .. //depot/projects/ia64/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/ia64/crypto/openssh/monitor_mm.h#2 integrate .. //depot/projects/ia64/crypto/openssh/monitor_wrap.c#2 integrate .. //depot/projects/ia64/crypto/openssh/monitor_wrap.h#2 integrate .. //depot/projects/ia64/crypto/openssh/msg.c#2 integrate .. //depot/projects/ia64/crypto/openssh/myproposal.h#5 integrate .. //depot/projects/ia64/crypto/openssh/openbsd-compat/getopt.c#2 integrate .. //depot/projects/ia64/crypto/openssh/packet.c#4 integrate .. //depot/projects/ia64/crypto/openssh/readconf.c#5 integrate .. //depot/projects/ia64/crypto/openssh/scard.c#3 integrate .. //depot/projects/ia64/crypto/openssh/scp.1#4 integrate .. //depot/projects/ia64/crypto/openssh/servconf.c#8 integrate .. //depot/projects/ia64/crypto/openssh/serverloop.c#4 integrate .. //depot/projects/ia64/crypto/openssh/session.c#10 integrate .. //depot/projects/ia64/crypto/openssh/session.h#4 integrate .. //depot/projects/ia64/crypto/openssh/sftp-client.c#4 integrate .. //depot/projects/ia64/crypto/openssh/sftp-client.h#3 integrate .. //depot/projects/ia64/crypto/openssh/sftp-common.c#3 integrate .. //depot/projects/ia64/crypto/openssh/sftp-int.c#4 integrate .. //depot/projects/ia64/crypto/openssh/sftp-server.c#4 integrate .. //depot/projects/ia64/crypto/openssh/sftp.c#4 integrate .. //depot/projects/ia64/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/ia64/crypto/openssh/ssh-agent.c#4 integrate .. //depot/projects/ia64/crypto/openssh/ssh-dss.c#3 integrate .. //depot/projects/ia64/crypto/openssh/ssh-keygen.c#4 integrate .. //depot/projects/ia64/crypto/openssh/ssh-rsa.c#4 integrate .. //depot/projects/ia64/crypto/openssh/ssh.1#4 integrate .. //depot/projects/ia64/crypto/openssh/ssh.c#5 integrate .. //depot/projects/ia64/crypto/openssh/ssh.h#4 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config#6 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect.c#4 integrate .. //depot/projects/ia64/crypto/openssh/sshconnect2.c#5 integrate .. //depot/projects/ia64/crypto/openssh/sshd.8#5 integrate .. //depot/projects/ia64/crypto/openssh/sshd.c#5 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config#7 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/ia64/crypto/openssh/sshlogin.c#4 integrate .. //depot/projects/ia64/crypto/openssh/sshpty.c#4 integrate .. //depot/projects/ia64/crypto/openssh/tildexpand.c#3 integrate .. //depot/projects/ia64/crypto/openssh/version.c#2 integrate .. //depot/projects/ia64/crypto/openssh/version.h#7 integrate .. //depot/projects/ia64/etc/MAKEDEV#10 integrate .. //depot/projects/ia64/etc/Makefile#13 integrate .. //depot/projects/ia64/etc/mail/aliases#4 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#12 integrate .. //depot/projects/ia64/etc/pam.d/sshd#7 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#3 integrate .. //depot/projects/ia64/etc/rc.d/apm#1 branch .. //depot/projects/ia64/etc/rc.d/apmd#3 integrate .. //depot/projects/ia64/etc/rc.d/kadmind#2 integrate .. //depot/projects/ia64/etc/rc.d/kerberos#2 integrate .. //depot/projects/ia64/etc/rc.d/motd#3 integrate .. //depot/projects/ia64/etc/rc.d/mountd#4 integrate .. //depot/projects/ia64/etc/rc.d/nfsd#3 integrate .. //depot/projects/ia64/etc/rc.syscons#4 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#15 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2#9 integrate .. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#6 integrate .. //depot/projects/ia64/gnu/lib/libstdc++/Makefile#9 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/doc/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/doc/inc-hist.diff#2 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h#1 branch .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h#1 branch .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#1 branch .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h#1 branch .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h#1 branch .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h#1 branch .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb-x86_64.h#1 branch .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#1 branch .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/i386/version.c#3 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#2 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/Makefile#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/Makefile.alpha#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/Makefile.i386#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/Makefile.ia64#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/alpha/freebsd-nat.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/alpha/kvm-fbsd.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/alpha/nm.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/alpha/tm.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/alpha/version.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/alpha/xm.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/config.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/freebsd-uthread.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/i386/freebsd-nat.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/i386/kvm-fbsd.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/i386/nm.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/i386/tm.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/i386/version.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb5/i386/xm.h#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdbreplay/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdbreplay5/Makefile#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdbserver5/Makefile#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/gdbserver5/low-fbsd.c#2 delete .. //depot/projects/ia64/gnu/usr.bin/binutils/libbfd/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/diff/diff.1#2 integrate .. //depot/projects/ia64/gnu/usr.bin/grep/grep.1#3 integrate .. //depot/projects/ia64/gnu/usr.bin/man/makewhatis/makewhatis.local.8#2 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/categories#4 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#3 integrate .. //depot/projects/ia64/include/elf.h#2 integrate .. //depot/projects/ia64/include/inttypes.h#4 integrate .. //depot/projects/ia64/include/paths.h#6 integrate .. //depot/projects/ia64/include/rpc/clnt.h#4 integrate .. //depot/projects/ia64/include/runetype.h#3 integrate .. //depot/projects/ia64/include/stddef.h#2 integrate .. //depot/projects/ia64/include/stdio.h#4 integrate .. //depot/projects/ia64/include/stdlib.h#9 integrate .. //depot/projects/ia64/include/unistd.h#8 integrate .. //depot/projects/ia64/include/wchar.h#3 integrate .. //depot/projects/ia64/kerberos5/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/doc/Makefile#1 branch .. //depot/projects/ia64/kerberos5/usr.bin/k5admin/Makefile#3 integrate .. //depot/projects/ia64/lib/Makefile#13 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/libc.so.4.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.i386/libc.so.4.gz.uu#3 delete .. //depot/projects/ia64/lib/compat/compat4x.i386/libc_r.so.4.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat4x.i386/libc_r.so.4.gz.uu#3 delete .. //depot/projects/ia64/lib/csu/alpha/crt1.c#5 integrate .. //depot/projects/ia64/lib/csu/i386-elf/crt1.c#4 integrate .. //depot/projects/ia64/lib/csu/ia64/crt1.c#4 integrate .. //depot/projects/ia64/lib/csu/powerpc/crt1.c#6 integrate .. //depot/projects/ia64/lib/csu/sparc64/crt1.c#5 integrate .. //depot/projects/ia64/lib/libalias/alias.c#4 integrate .. //depot/projects/ia64/lib/libalias/alias.h#3 integrate .. //depot/projects/ia64/lib/libalias/alias_cuseeme.c#2 integrate .. //depot/projects/ia64/lib/libalias/alias_db.c#4 integrate .. //depot/projects/ia64/lib/libalias/alias_irc.c#3 integrate .. //depot/projects/ia64/lib/libalias/alias_local.h#3 integrate .. //depot/projects/ia64/lib/libalias/alias_nbt.c#3 integrate .. //depot/projects/ia64/lib/libalias/alias_proxy.c#3 integrate .. //depot/projects/ia64/lib/libalias/alias_smedia.c#2 integrate .. //depot/projects/ia64/lib/libalias/alias_util.c#3 integrate .. //depot/projects/ia64/lib/libatm/timer.c#2 integrate .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#10 integrate .. //depot/projects/ia64/lib/libc/gen/confstr.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/fmtcheck.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/signal.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/statvfs.3#1 branch .. //depot/projects/ia64/lib/libc/gen/statvfs.c#1 branch .. //depot/projects/ia64/lib/libc/gen/sysconf.c#5 integrate .. //depot/projects/ia64/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/net/getnameinfo.c#3 integrate .. //depot/projects/ia64/lib/libc/net/if_indextoname.3#2 integrate .. //depot/projects/ia64/lib/libc/net/if_indextoname.c#1 branch .. //depot/projects/ia64/lib/libc/net/if_nameindex.c#1 branch .. //depot/projects/ia64/lib/libc/net/if_nametoindex.c#1 branch .. //depot/projects/ia64/lib/libc/net/ifname.c#4 delete .. //depot/projects/ia64/lib/libc/net/res_query.c#3 integrate .. //depot/projects/ia64/lib/libc/rpc/LICENSE#1 branch .. //depot/projects/ia64/lib/libc/rpc/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/rpc/clnt_dg.c#5 integrate .. //depot/projects/ia64/lib/libc/rpc/clnt_generic.c#3 integrate .. //depot/projects/ia64/lib/libc/rpc/clnt_raw.c#4 integrate .. //depot/projects/ia64/lib/libc/rpc/clnt_vc.c#5 integrate .. //depot/projects/ia64/lib/libc/rpc/key_call.c#5 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc.3#2 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_clnt_create.3#2 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_com.h#3 integrate .. //depot/projects/ia64/lib/libc/rpc/rpcb_clnt.c#4 integrate .. //depot/projects/ia64/lib/libc/rpc/rpcb_st_xdr.c#3 integrate .. //depot/projects/ia64/lib/libc/sparc64/net/htonl.S#4 integrate .. //depot/projects/ia64/lib/libc/sparc64/net/htons.S#3 integrate .. //depot/projects/ia64/lib/libc/sparc64/net/ntohl.S#4 integrate .. //depot/projects/ia64/lib/libc/sparc64/net/ntohs.S#3 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S#2 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/__sparc_utrap_gen.S#3 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/brk.S#3 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/cerror.S#3 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/exect.S#3 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/pipe.S#3 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/ptrace.S#3 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/sbrk.S#4 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/setlogin.S#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fseek.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/printf.3#8 integrate .. //depot/projects/ia64/lib/libc/stdlib/abort.c#3 integrate .. //depot/projects/ia64/lib/libc/string/strerror.c#5 integrate .. //depot/projects/ia64/lib/libc/sys/access.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/acct.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/adjtime.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/bind.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/chdir.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/chflags.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/chmod.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/chown.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/chroot.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/close.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/dup.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/execve.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/fcntl.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/flock.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/fork.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/getlogin.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/poll.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/setuid.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/stat.2#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 16 20: 8:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D1FC837B401; Tue, 16 Jul 2002 20:08:11 -0700 (PDT) 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 5EB0037B400 for ; Tue, 16 Jul 2002 20:08:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2B6043E67 for ; Tue, 16 Jul 2002 20:08:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6H38AJU056936 for ; Tue, 16 Jul 2002 20:08:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6H38A8d056923 for perforce@freebsd.org; Tue, 16 Jul 2002 20:08:10 -0700 (PDT) Date: Tue, 16 Jul 2002 20:08:10 -0700 (PDT) Message-Id: <200207170308.g6H38A8d056923@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14360 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14360 Change 14360 by peter@peter_ia64 on 2002/07/16 20:07:42 gah. s/area/idle/ Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#28 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#28 (text+ko) ==== @@ -2048,7 +2048,7 @@ */ void -pmap_zero_page_area(vm_page_t m) +pmap_zero_page_idle(vm_page_t m) { vm_offset_t va = IA64_PHYS_TO_RR7(VM_PAGE_TO_PHYS(m)); bzero((caddr_t) va, PAGE_SIZE); @@ -2056,7 +2056,6 @@ /* -/* * pmap_copy_page copies the specified (machine independent) * page by mapping the page into virtual memory and using * bcopy to copy the page, one machine dependent page at a To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 16 20:16:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F19B837B401; Tue, 16 Jul 2002 20:16:21 -0700 (PDT) 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 83DF337B400 for ; Tue, 16 Jul 2002 20:16:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 496EE43E58 for ; Tue, 16 Jul 2002 20:16:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6H3GLJU057904 for ; Tue, 16 Jul 2002 20:16:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6H3GKKB057901 for perforce@freebsd.org; Tue, 16 Jul 2002 20:16:20 -0700 (PDT) Date: Tue, 16 Jul 2002 20:16:20 -0700 (PDT) Message-Id: <200207170316.g6H3GKKB057901@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14361 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14361 Change 14361 by peter@peter_ia64 on 2002/07/16 20:15:30 Make this compile on ia64. Note that we cannot abuse 'struct trapframe' for this. Affected files ... .. //depot/projects/ia64/sys/kern/kern_thread.c#2 edit Differences ... ==== //depot/projects/ia64/sys/kern/kern_thread.c#2 (text+ko) ==== @@ -51,6 +51,15 @@ #include #include +#ifdef __ia64__ +/* + * We cannot use 'struct trapframe' for KSE. + */ +struct trapframe { + int not_bloody_likely; +}; +#endif + /* * Thread related storage. */ @@ -266,6 +275,9 @@ void *addr2; int error; +#ifdef __ia64__ + td2_mbx = 0; /* pacify gcc */ +#endif /* Export the register contents. */ error = cpu_export_context(td); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 16 20:48: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF37A37B401; Tue, 16 Jul 2002 20:48:03 -0700 (PDT) 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 52FB337B400 for ; Tue, 16 Jul 2002 20:48:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1606043E4A for ; Tue, 16 Jul 2002 20:48:03 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6H3m2JU060343 for ; Tue, 16 Jul 2002 20:48:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6H3m2cJ060340 for perforce@freebsd.org; Tue, 16 Jul 2002 20:48:02 -0700 (PDT) Date: Tue, 16 Jul 2002 20:48:02 -0700 (PDT) Message-Id: <200207170348.g6H3m2cJ060340@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14363 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14363 Change 14363 by peter@peter_ia64 on 2002/07/16 20:48:01 Sometimes, I wonder if the acpica folks sit down and has a brainstorm session to figure out new ways to make people's lives hard. Affected files ... .. //depot/projects/ia64/sys/ia64/acpica/madt.c#9 edit Differences ... ==== //depot/projects/ia64/sys/ia64/acpica/madt.c#9 (text+ko) ==== @@ -237,16 +237,16 @@ static int parse_table(int countcpus) { - ACPI_PHYSICAL_ADDRESS rsdp_phys; + ACPI_POINTER rsdp_ptr; RSDP_DESCRIPTOR *rsdp; XSDT_DESCRIPTOR *xsdt; ACPI_TABLE_HEADER *table; int i, count; - if (AcpiOsGetRootPointer(0, &rsdp_phys) != AE_OK) + if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK) return 0; - rsdp = (RSDP_DESCRIPTOR *)IA64_PHYS_TO_RR7(rsdp_phys); + rsdp = (RSDP_DESCRIPTOR *)IA64_PHYS_TO_RR7(rsdp_ptr.Pointer.Physical); xsdt = (XSDT_DESCRIPTOR *)IA64_PHYS_TO_RR7(rsdp->XsdtPhysicalAddress); count = (UINT64 *)((char *)xsdt + xsdt->Header.Length) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 16 20:50:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8591937B401; Tue, 16 Jul 2002 20:50:46 -0700 (PDT) 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 429D537B400 for ; Tue, 16 Jul 2002 20:50:46 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA40043E31 for ; Tue, 16 Jul 2002 20:50:45 -0700 (PDT) (envelope-from peter@wemm.org) Received: from fw.wemm.org (canning.wemm.org [192.203.228.65]) by canning.wemm.org (Postfix) with ESMTP id C309A2A7D6 for ; Tue, 16 Jul 2002 20:50:45 -0700 (PDT) (envelope-from peter@wemm.org) Received: from overcee.wemm.org (overcee.wemm.org [10.0.0.3]) by fw.wemm.org (Postfix) with ESMTP id 767944C279 for ; Tue, 16 Jul 2002 20:50:45 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.wemm.org (Postfix) with ESMTP id 254383811 for ; Tue, 16 Jul 2002 20:50:45 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Perforce Change Reviews Subject: Re: PERFORCE change 14363 for review In-Reply-To: <200207170348.g6H3m2cJ060340@freefall.freebsd.org> Date: Tue, 16 Jul 2002 20:50:45 -0700 From: Peter Wemm Message-Id: <20020717035045.254383811@overcee.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I plan to do a pass over this stuff and merge as much as I can into cvs tonight. Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14363 > > Change 14363 by peter@peter_ia64 on 2002/07/16 20:48:01 > > Sometimes, I wonder if the acpica folks sit down and has a > brainstorm session to figure out new ways to make people's > lives hard. > > Affected files ... > > .. //depot/projects/ia64/sys/ia64/acpica/madt.c#9 edit > > Differences ... > > ==== //depot/projects/ia64/sys/ia64/acpica/madt.c#9 (text+ko) ==== > > @@ -237,16 +237,16 @@ > static int > parse_table(int countcpus) > { > - ACPI_PHYSICAL_ADDRESS rsdp_phys; > + ACPI_POINTER rsdp_ptr; > RSDP_DESCRIPTOR *rsdp; > XSDT_DESCRIPTOR *xsdt; > ACPI_TABLE_HEADER *table; > int i, count; > > - if (AcpiOsGetRootPointer(0, &rsdp_phys) != AE_OK) > + if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK) > return 0; > > - rsdp = (RSDP_DESCRIPTOR *)IA64_PHYS_TO_RR7(rsdp_phys); > + rsdp = (RSDP_DESCRIPTOR *)IA64_PHYS_TO_RR7(rsdp_ptr.Pointer.Physical); > xsdt = (XSDT_DESCRIPTOR *)IA64_PHYS_TO_RR7(rsdp->XsdtPhysicalAddress); > > count = (UINT64 *)((char *)xsdt + xsdt->Header.Length) > Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 17 10:56:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C802E37B401; Wed, 17 Jul 2002 10:55:41 -0700 (PDT) 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 26D9937B400 for ; Wed, 17 Jul 2002 10:55:41 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF33C43E58 for ; Wed, 17 Jul 2002 10:55:39 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6HHtdJU020733 for ; Wed, 17 Jul 2002 10:55:39 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6HHtVSD020710 for perforce@freebsd.org; Wed, 17 Jul 2002 10:55:31 -0700 (PDT) Date: Wed, 17 Jul 2002 10:55:31 -0700 (PDT) Message-Id: <200207171755.g6HHtVSD020710@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 14380 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14380 Change 14380 by jhb@jhb_laptop on 2002/07/17 10:55:03 IFC. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/autoconf.c#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/genassym.c#12 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#32 integrate .. //depot/projects/smpng/sys/alpha/alpha/swtch.s#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#36 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#13 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#20 integrate .. //depot/projects/smpng/sys/alpha/conf/Makefile#1 branch .. //depot/projects/smpng/sys/alpha/conf/NOTES#1 branch .. //depot/projects/smpng/sys/alpha/conf/SIMOS#5 integrate .. //depot/projects/smpng/sys/alpha/conf/gethints.pl#2 delete .. //depot/projects/smpng/sys/alpha/include/_inttypes.h#2 integrate .. //depot/projects/smpng/sys/alpha/include/ansi.h#13 integrate .. //depot/projects/smpng/sys/alpha/include/kse.h#1 branch .. //depot/projects/smpng/sys/alpha/include/types.h#3 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#8 integrate .. //depot/projects/smpng/sys/alpha/tc/am7990.c#4 delete .. //depot/projects/smpng/sys/alpha/tc/am7990reg.h#2 delete .. //depot/projects/smpng/sys/alpha/tc/am7990var.h#3 delete .. //depot/projects/smpng/sys/alpha/tc/ascvar.h#3 delete .. //depot/projects/smpng/sys/alpha/tc/esp.c#3 delete .. //depot/projects/smpng/sys/alpha/tc/espreg.h#2 delete .. //depot/projects/smpng/sys/alpha/tc/espvar.h#2 delete .. //depot/projects/smpng/sys/alpha/tc/if_le_dec.c#3 delete .. //depot/projects/smpng/sys/alpha/tc/if_le_ioasic.c#3 delete .. //depot/projects/smpng/sys/alpha/tc/if_levar.h#3 delete .. //depot/projects/smpng/sys/alpha/tc/ioasic.c#3 delete .. //depot/projects/smpng/sys/alpha/tc/ioasicreg.h#2 delete .. //depot/projects/smpng/sys/alpha/tc/ioasicvar.h#3 delete .. //depot/projects/smpng/sys/alpha/tc/mcclock_ioasic.c#2 delete .. //depot/projects/smpng/sys/alpha/tc/sticreg.h#2 delete .. //depot/projects/smpng/sys/alpha/tc/sticvar.h#3 delete .. //depot/projects/smpng/sys/alpha/tc/tc.c#3 delete .. //depot/projects/smpng/sys/alpha/tc/tcasic.c#2 delete .. //depot/projects/smpng/sys/alpha/tc/tcdevs.h#2 delete .. //depot/projects/smpng/sys/alpha/tc/tcdevs_data.h#2 delete .. //depot/projects/smpng/sys/alpha/tc/tcds.c#3 delete .. //depot/projects/smpng/sys/alpha/tc/tcds_dma.c#2 delete .. //depot/projects/smpng/sys/alpha/tc/tcdsreg.h#3 delete .. //depot/projects/smpng/sys/alpha/tc/tcdsvar.h#3 delete .. //depot/projects/smpng/sys/alpha/tc/tcreg.h#2 delete .. //depot/projects/smpng/sys/alpha/tc/tcvar.h#3 delete .. //depot/projects/smpng/sys/arm/include/ansi.h#10 integrate .. //depot/projects/smpng/sys/arm/include/types.h#4 integrate .. //depot/projects/smpng/sys/boot/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/common/help.common#3 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#13 integrate .. //depot/projects/smpng/sys/boot/forth/loader.4th.8#5 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/smpng/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.c#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/boot.h#3 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#18 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#17 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/smpng/sys/conf/Makefile.alpha#14 integrate .. //depot/projects/smpng/sys/conf/Makefile.i386#14 integrate .. //depot/projects/smpng/sys/conf/Makefile.ia64#19 integrate .. //depot/projects/smpng/sys/conf/Makefile.pc98#13 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#15 integrate .. //depot/projects/smpng/sys/conf/Makefile.sparc64#16 integrate .. //depot/projects/smpng/sys/conf/Makefile.x86_64#1 branch .. //depot/projects/smpng/sys/conf/NOTES#18 integrate .. //depot/projects/smpng/sys/conf/files#45 integrate .. //depot/projects/smpng/sys/conf/files.alpha#15 integrate .. //depot/projects/smpng/sys/conf/files.i386#26 integrate .. //depot/projects/smpng/sys/conf/files.ia64#16 integrate .. //depot/projects/smpng/sys/conf/files.pc98#26 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#9 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#17 integrate .. //depot/projects/smpng/sys/conf/files.x86_64#1 branch .. //depot/projects/smpng/sys/conf/gethints.awk#1 branch .. //depot/projects/smpng/sys/conf/kern.post.mk#12 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#13 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#12 integrate .. //depot/projects/smpng/sys/conf/majors#10 integrate .. //depot/projects/smpng/sys/conf/makeLINT.sed#1 branch .. //depot/projects/smpng/sys/conf/options#31 integrate .. //depot/projects/smpng/sys/conf/options.alpha#7 integrate .. //depot/projects/smpng/sys/conf/options.i386#16 integrate .. //depot/projects/smpng/sys/conf/options.ia64#9 integrate .. //depot/projects/smpng/sys/conf/options.pc98#18 integrate .. //depot/projects/smpng/sys/conf/options.powerpc#3 integrate .. //depot/projects/smpng/sys/conf/options.x86_64#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdispat.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdos16.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acefi.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acgcc.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/achware.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acoutput.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acresrc.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acstruct.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actables.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisasm.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbhistry.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evsci.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconvrt.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfield.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exnames.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg3.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg6.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstorob.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwtimer.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsobject.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nswalk.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfobj.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psfind.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pstree.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psutils.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pswalk.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsio.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rslist.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmemory.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmisc.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsutils.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utalloc.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utclib.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmath.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#8 integrate .. //depot/projects/smpng/sys/crypto/sha2/sha2.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSynch.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi.c#28 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpica_support.c#5 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/smpng/sys/dev/em/README#2 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#9 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#6 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/smpng/sys/dev/em/if_em_osdep.h#5 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#16 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#6 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/smpng/sys/dev/gem/if_gemvar.h#4 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#5 integrate .. //depot/projects/smpng/sys/dev/hme/if_hmereg.h#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#21 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#14 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#13 integrate .. //depot/projects/smpng/sys/dev/isp/isp_inline.h#8 integrate .. //depot/projects/smpng/sys/dev/isp/isp_ioctl.h#7 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#1 branch .. //depot/projects/smpng/sys/dev/ispfw/asm_1000.h#1 branch .. //depot/projects/smpng/sys/dev/ispfw/ispfw.c#4 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#7 integrate .. //depot/projects/smpng/sys/dev/mii/bmtphy.c#1 branch .. //depot/projects/smpng/sys/dev/mii/bmtphyreg.h#1 branch .. //depot/projects/smpng/sys/dev/mii/exphy.c#5 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#6 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs.h#6 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#15 integrate .. //depot/projects/smpng/sys/dev/pccard/card_if.m#6 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_common.c#2 delete .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#15 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#15 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvar.h#9 integrate .. //depot/projects/smpng/sys/dev/random/hash.c#3 integrate .. //depot/projects/smpng/sys/dev/random/hash.h#3 integrate .. //depot/projects/smpng/sys/dev/random/yarrow.c#6 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/sio/sio_ebus.c#2 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#21 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/if_kuereg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#21 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#21 integrate .. //depot/projects/smpng/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#7 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#9 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#4 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_rule.c#1 branch .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#6 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#17 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#6 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#12 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#10 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_fpregs.c#10 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#7 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_regs.c#10 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#10 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#18 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#3 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_ihash.c#3 integrate .. //depot/projects/smpng/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#23 integrate .. //depot/projects/smpng/sys/i386/conf/Makefile#6 integrate .. //depot/projects/smpng/sys/i386/conf/NEWCARD#13 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#37 integrate .. //depot/projects/smpng/sys/i386/conf/OLDCARD#2 integrate .. //depot/projects/smpng/sys/i386/conf/gethints.pl#2 delete .. //depot/projects/smpng/sys/i386/conf/makeLINT.sed#2 delete .. //depot/projects/smpng/sys/i386/i386/bios.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/critical.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/db_interface.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/exception.s#8 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/locore.s#8 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#41 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#24 integrate .. //depot/projects/smpng/sys/i386/i386/mpapic.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#7 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#13 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#40 integrate .. //depot/projects/smpng/sys/i386/i386/vm86.c#12 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#23 integrate .. //depot/projects/smpng/sys/i386/include/_inttypes.h#2 integrate .. //depot/projects/smpng/sys/i386/include/ansi.h#13 integrate .. //depot/projects/smpng/sys/i386/include/atomic.h#8 integrate .. //depot/projects/smpng/sys/i386/include/bus_at386.h#4 integrate .. //depot/projects/smpng/sys/i386/include/cpufunc.h#18 integrate .. //depot/projects/smpng/sys/i386/include/critical.h#2 integrate .. //depot/projects/smpng/sys/i386/include/kse.h#1 branch .. //depot/projects/smpng/sys/i386/include/pcpu.h#4 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#8 integrate .. //depot/projects/smpng/sys/i386/include/proc.h#8 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#6 integrate .. //depot/projects/smpng/sys/i386/include/smptests.h#3 integrate .. //depot/projects/smpng/sys/i386/include/types.h#5 integrate .. //depot/projects/smpng/sys/i386/isa/apic_vector.s#12 integrate .. //depot/projects/smpng/sys/i386/isa/intr_machdep.c#16 integrate .. //depot/projects/smpng/sys/i386/isa/intr_machdep.h#11 integrate .. //depot/projects/smpng/sys/i386/isa/ipl.s#8 delete .. //depot/projects/smpng/sys/i386/isa/isa_device.h#3 integrate .. //depot/projects/smpng/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#6 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#14 integrate .. //depot/projects/smpng/sys/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/smpng/sys/ia64/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/genassym.c#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#32 integrate .. //depot/projects/smpng/sys/ia64/ia64/swtch.s#11 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#35 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#15 integrate .. //depot/projects/smpng/sys/ia64/include/_inttypes.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/ansi.h#13 integrate .. //depot/projects/smpng/sys/ia64/include/kse.h#1 branch .. //depot/projects/smpng/sys/ia64/include/types.h#3 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#12 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#14 integrate .. //depot/projects/smpng/sys/kern/init_main.c#19 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#39 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#7 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_kthread.c#7 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#1 branch .. //depot/projects/smpng/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/smpng/sys/kern/makesyscalls.sh#11 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_mchain.c#5 integrate .. //depot/projects/smpng/sys/kern/subr_power.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#17 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#13 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#36 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#57 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#16 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#19 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#20 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#17 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#16 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#13 integrate .. //depot/projects/smpng/sys/kern/tty.c#25 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#2 integrate .. //depot/projects/smpng/sys/kern/uipc_jumbo.c#2 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#22 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#24 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#11 integrate .. //depot/projects/smpng/sys/kern/vfs_conf.c#7 delete .. //depot/projects/smpng/sys/kern/vfs_default.c#7 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#7 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#1 branch .. //depot/projects/smpng/sys/kern/vfs_subr.c#28 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#40 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#27 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#7 integrate .. //depot/projects/smpng/sys/libkern/iconv.c#2 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/nfsclient/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/nfsserver/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/random/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ufs/Makefile#1 branch .. //depot/projects/smpng/sys/net/bpf_filter.c#5 integrate .. //depot/projects/smpng/sys/net/bridge.c#12 integrate .. //depot/projects/smpng/sys/net/if.c#25 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/smpng/sys/net/if_media.h#6 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#9 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#9 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#25 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#22 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#23 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#16 integrate .. //depot/projects/smpng/sys/netkey/key.c#13 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#12 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#18 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.h#4 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_nfsiod.c#6 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_node.c#7 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#12 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_subs.c#7 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#14 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#14 integrate .. //depot/projects/smpng/sys/nfsserver/nfs.h#7 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#18 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvcache.c#4 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#9 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#10 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#10 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#22 integrate .. //depot/projects/smpng/sys/pc98/conf/gethints.pl#2 delete .. //depot/projects/smpng/sys/pc98/i386/machdep.c#36 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#13 integrate .. //depot/projects/smpng/sys/pccard/cardinfo.h#4 integrate .. //depot/projects/smpng/sys/pccard/i82365.h#7 integrate .. //depot/projects/smpng/sys/pccard/pccard_nbk.c#8 integrate .. //depot/projects/smpng/sys/pccard/pcic.c#16 integrate .. //depot/projects/smpng/sys/pccard/pcic_pci.c#22 integrate .. //depot/projects/smpng/sys/pccard/slot.h#5 integrate .. //depot/projects/smpng/sys/pci/agp.c#5 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#2 integrate .. //depot/projects/smpng/sys/pci/agp_intel.c#5 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#17 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#7 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#13 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#13 integrate .. //depot/projects/smpng/sys/pci/if_sisreg.h#6 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#13 integrate .. //depot/projects/smpng/sys/posix4/ksched.c#7 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/smpng/sys/powerpc/include/_inttypes.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/ansi.h#13 integrate .. //depot/projects/smpng/sys/powerpc/include/bus.h#3 integrate .. //depot/projects/smpng/sys/powerpc/include/bus_memio.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/bus_pio.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/cpufunc.h#13 integrate .. //depot/projects/smpng/sys/powerpc/include/critical.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/db_machdep.h#4 integrate .. //depot/projects/smpng/sys/powerpc/include/in_cksum.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/interruptvar.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/intr_machdep.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/kse.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/metadata.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/nexusvar.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/ofw_machdep.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/openpicreg.h#3 integrate .. //depot/projects/smpng/sys/powerpc/include/openpicvar.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/pcb.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/setjmp.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/types.h#4 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pci.c#1 branch .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pci.h#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/uninorth.c#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/uninorthvar.h#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/autoconf.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/bcopy.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/clock.c#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_disasm.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/db_hwwatch.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/db_interface.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/db_memrw.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/db_trace.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#14 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/in_cksum.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/interrupt.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/locore.s#8 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#25 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/nexus.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/ofw_machdep.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/pic_if.m#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#19 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/setjmp.S#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/swtch.s#12 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#24 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap_subr.S#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#15 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#16 integrate .. //depot/projects/smpng/sys/sparc64/include/_inttypes.h#2 integrate .. //depot/projects/smpng/sys/sparc64/include/ansi.h#14 integrate .. //depot/projects/smpng/sys/sparc64/include/asi.h#8 integrate .. //depot/projects/smpng/sys/sparc64/include/instr.h#5 integrate .. //depot/projects/smpng/sys/sparc64/include/iommuvar.h#5 integrate .. //depot/projects/smpng/sys/sparc64/include/kse.h#1 branch .. //depot/projects/smpng/sys/sparc64/include/lsu.h#2 integrate .. //depot/projects/smpng/sys/sparc64/include/smp.h#9 integrate .. //depot/projects/smpng/sys/sparc64/include/types.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/ver.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/vmparam.h#10 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#8 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#21 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#8 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#25 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.s#14 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/swtch.s#14 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#37 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#22 integrate .. //depot/projects/smpng/sys/sys/_mutex.h#9 integrate .. //depot/projects/smpng/sys/sys/buf.h#11 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#14 integrate .. //depot/projects/smpng/sys/sys/condvar.h#4 integrate .. //depot/projects/smpng/sys/sys/consio.h#6 integrate .. //depot/projects/smpng/sys/sys/event.h#9 integrate .. //depot/projects/smpng/sys/sys/eventhandler.h#7 integrate .. //depot/projects/smpng/sys/sys/filedesc.h#13 integrate .. //depot/projects/smpng/sys/sys/iconv.h#4 integrate .. //depot/projects/smpng/sys/sys/imgact.h#4 integrate .. //depot/projects/smpng/sys/sys/jumbo.h#2 integrate .. //depot/projects/smpng/sys/sys/kse.h#2 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#10 integrate .. //depot/projects/smpng/sys/sys/mount.h#14 integrate .. //depot/projects/smpng/sys/sys/param.h#26 integrate .. //depot/projects/smpng/sys/sys/poll.h#5 integrate .. //depot/projects/smpng/sys/sys/power.h#3 integrate .. //depot/projects/smpng/sys/sys/proc.h#53 integrate .. //depot/projects/smpng/sys/sys/queue.h#6 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#10 integrate .. //depot/projects/smpng/sys/sys/stat.h#6 integrate .. //depot/projects/smpng/sys/sys/syscall.h#17 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#17 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#10 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#19 integrate .. //depot/projects/smpng/sys/sys/systm.h#32 integrate .. //depot/projects/smpng/sys/sys/ucred.h#17 integrate .. //depot/projects/smpng/sys/sys/unistd.h#4 integrate .. //depot/projects/smpng/sys/sys/vnode.h#20 integrate .. //depot/projects/smpng/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/smpng/sys/ufs/ffs/README.snapshot#2 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#13 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#7 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#15 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep_stub.c#5 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#28 integrate .. //depot/projects/smpng/sys/ufs/ufs/dinode.h#5 integrate .. //depot/projects/smpng/sys/ufs/ufs/dirhash.h#2 integrate .. //depot/projects/smpng/sys/ufs/ufs/quota.h#5 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#14 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#8 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_ihash.c#7 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#14 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#12 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#17 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#7 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#6 integrate .. //depot/projects/smpng/sys/vm/pmap.h#8 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#17 integrate .. //depot/projects/smpng/sys/vm/uma_dbg.c#3 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#10 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#7 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#11 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#13 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#14 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#7 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#18 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#12 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#8 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#21 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#15 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#18 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#10 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#12 integrate .. //depot/projects/smpng/sys/vm/vm_pager.c#9 integrate .. //depot/projects/smpng/sys/vm/vm_pager.h#4 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#7 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#16 integrate .. //depot/projects/smpng/sys/x86_64/compile/.cvsignore#1 branch .. //depot/projects/smpng/sys/x86_64/include/ansi.h#1 branch .. //depot/projects/smpng/sys/x86_64/include/endian.h#1 branch .. //depot/projects/smpng/sys/x86_64/include/limits.h#1 branch .. //depot/projects/smpng/sys/x86_64/include/param.h#1 branch .. //depot/projects/smpng/sys/x86_64/include/stdarg.h#1 branch .. //depot/projects/smpng/sys/x86_64/include/types.h#1 branch Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/autoconf.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.51 2002/03/31 07:15:24 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.52 2002/07/09 19:20:16 obrien Exp $ */ #include "opt_bootp.h" @@ -178,16 +178,14 @@ root_bus_configure(); - if((hwrpb->rpb_type != ST_DEC_3000_300) && - (hwrpb->rpb_type != ST_DEC_3000_500)){ - /* - * Probe ISA devices after everything. - */ + /* + * Probe ISA devices after everything. + */ #ifdef DEV_ISA - if (isa_bus_device) - isa_probe_children(isa_bus_device); + if (isa_bus_device) + isa_probe_children(isa_bus_device); #endif - } + configure_finish(); /* ==== //depot/projects/smpng/sys/alpha/alpha/cpuconf.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.13 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.14 2002/07/09 19:20:16 obrien Exp $ */ /* $NetBSD: cpuconf.c,v 1.10 1998/03/20 21:48:21 thorpej Exp $ */ /* @@ -39,18 +39,6 @@ #include "opt_cpu.h" -#ifdef DEC_3000_500 -extern void dec_3000_500_init(int); -#else -#define dec_3000_500_init platform_not_configured -#endif - -#ifdef DEC_3000_300 -extern void dec_3000_300_init(int); -#else -#define dec_3000_300_init platform_not_configured -#endif - #ifdef DEC_AXPPCI_33 extern void dec_axppci_33_init(int); #else @@ -134,10 +122,10 @@ cpu_notsupp("ST_ADU"), /* 1: ST_ADU */ cpu_notsupp("ST_DEC_4000"), /* 2: ST_DEC_4000 */ cpu_notsupp("ST_DEC_7000"), /* 3: ST_DEC_7000 */ - cpu_init(dec_3000_500_init,"DEC_3000_500"), /* 4: ST_DEC_3000_500 */ + cpu_notsupp("DEC_3000_500"), /* 4: ST_DEC_3000_500 */ cpu_notsupp("???"), /* 5: ??? */ cpu_notsupp("ST_DEC_2000_300"), /* 6: ST_DEC_2000_300 */ - cpu_init(dec_3000_300_init,"DEC_3000_300"), /* 7: ST_DEC_3000_300 */ + cpu_notsupp("DEC_3000_300"), /* 7: ST_DEC_3000_300 */ cpu_init(avalon_a12_init,"ST_AVALON_A12"), /* 8: ST_AVALON_A12 */ cpu_init(dec_2100_a500_init, "ST_DEC_2100_A500"), /* 9: ST_DEC_2100_A500 */ cpu_notsupp("ST_DEC_APXVME_64"), /* 10: ST_DEC_APXVME_64 */ ==== //depot/projects/smpng/sys/alpha/alpha/genassym.c#12 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.37 2002/03/29 16:35:25 jake Exp $ + * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.39 2002/07/12 18:34:21 jhb Exp $ */ #include ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#32 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.93 2002/06/27 04:08:45 jeff Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.100 2002/07/14 23:51:55 alc Exp $ */ /* @@ -561,9 +561,7 @@ int cputype; cputype = hwrpb->rpb_type; - return (cputype == ST_DEC_21000 || ST_DEC_4100 - || cputype == ST_DEC_3000_300 - || cputype == ST_DEC_3000_500); + return (cputype == ST_DEC_21000 || ST_DEC_4100); return 0; } @@ -901,161 +899,6 @@ } /* - * Create the UPAGES for a new process. - * This routine directly affects the fork perf for a process. - */ -void -pmap_new_proc(struct proc *p) -{ - int i; - vm_object_t upobj; - vm_offset_t up; - vm_page_t m; - pt_entry_t *ptek, oldpte; - - /* - * allocate object for the upages - */ - upobj = p->p_upages_obj; - if (upobj == NULL) { - upobj = vm_object_allocate(OBJT_DEFAULT, UAREA_PAGES); - p->p_upages_obj = upobj; - } - - /* get a kernel virtual address for the UPAGES for this proc */ - up = (vm_offset_t)p->p_uarea; - if (up == 0) { - up = kmem_alloc_nofault(kernel_map, UAREA_PAGES * PAGE_SIZE); - if (up == 0) - panic("pmap_new_proc: upage allocation failed"); - p->p_uarea = (struct user *)up; - } - - ptek = vtopte(up); - - for (i = 0; i < UAREA_PAGES; i++) { - /* - * Get a kernel stack page - */ - m = vm_page_grab(upobj, i, VM_ALLOC_NORMAL | VM_ALLOC_RETRY); - - /* - * Wire the page - */ - m->wire_count++; - cnt.v_wire_count++; - - oldpte = *(ptek + i); - /* - * Enter the page into the kernel address space. - */ - *(ptek + i) = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) - | PG_ASM | PG_KRE | PG_KWE | PG_V; - if (oldpte) - pmap_invalidate_page(kernel_pmap, up + i * PAGE_SIZE); - - vm_page_wakeup(m); - vm_page_flag_clear(m, PG_ZERO); - vm_page_flag_set(m, PG_MAPPED | PG_WRITEABLE); - m->valid = VM_PAGE_BITS_ALL; - } -} - -/* - * Dispose the UPAGES for a process that has exited. - * This routine directly impacts the exit perf of a process. - */ -void -pmap_dispose_proc(p) - struct proc *p; -{ - int i; - vm_object_t upobj; - vm_offset_t up; - vm_page_t m; - pt_entry_t *ptek, oldpte; - - upobj = p->p_upages_obj; - up = (vm_offset_t)p->p_uarea; - ptek = vtopte(up); - for (i = 0; i < UAREA_PAGES; i++) { - m = vm_page_lookup(upobj, i); - if (m == NULL) - panic("pmap_dispose_proc: upage already missing?"); - vm_page_busy(m); - oldpte = *(ptek + i); - *(ptek + i) = 0; - pmap_invalidate_page(kernel_pmap, up + i * PAGE_SIZE); - vm_page_unwire(m, 0); - vm_page_free(m); - } - - /* - * If the process got swapped out some of its UPAGES might have gotten - * swapped. Just get rid of the object to clean up the swap use - * proactively. NOTE! might block waiting for paging I/O to complete. - */ - if (upobj->type == OBJT_SWAP) { - p->p_upages_obj = NULL; - vm_object_deallocate(upobj); - } -} - -/* - * Allow the UPAGES for a process to be prejudicially paged out. - */ -void -pmap_swapout_proc(p) - struct proc *p; -{ - int i; - vm_object_t upobj; - vm_offset_t up; - vm_page_t m; - - upobj = p->p_upages_obj; - up = (vm_offset_t)p->p_uarea; - for (i = 0; i < UAREA_PAGES; i++) { - m = vm_page_lookup(upobj, i); - if (m == NULL) - panic("pmap_swapout_proc: upage already missing?"); - vm_page_dirty(m); - vm_page_unwire(m, 0); - pmap_kremove(up + i * PAGE_SIZE); - } -} - -/* - * Bring the UPAGES for a specified process back in. - */ -void -pmap_swapin_proc(p) - struct proc *p; -{ - int i, rv; - vm_object_t upobj; - vm_offset_t up; - vm_page_t m; - - upobj = p->p_upages_obj; - up = (vm_offset_t)p->p_uarea; - for (i = 0; i < UAREA_PAGES; i++) { - m = vm_page_grab(upobj, i, VM_ALLOC_NORMAL | VM_ALLOC_RETRY); - pmap_kenter(up + i * PAGE_SIZE, VM_PAGE_TO_PHYS(m)); - if (m->valid != VM_PAGE_BITS_ALL) { - rv = vm_pager_get_pages(upobj, &m, 1, 0); - if (rv != VM_PAGER_OK) - panic("pmap_swapin_proc: cannot get upages for proc: %d\n", p->p_pid); - m = vm_page_lookup(upobj, i); - m->valid = VM_PAGE_BITS_ALL; - } - vm_page_wire(m); - vm_page_wakeup(m); - vm_page_flag_set(m, PG_MAPPED | PG_WRITEABLE); - } -} - -/* * Create the kernel stack for a new thread. * This routine directly affects the fork perf for a process and thread. */ @@ -1069,43 +912,39 @@ pt_entry_t *ptek, oldpte; /* - * allocate object for the upages + * allocate object for the kstack */ - ksobj = td->td_kstack_obj; - if (ksobj == NULL) { - ksobj = vm_object_allocate(OBJT_DEFAULT, KSTACK_PAGES); - td->td_kstack_obj = ksobj; - } + ksobj = vm_object_allocate(OBJT_DEFAULT, KSTACK_PAGES); + td->td_kstack_obj = ksobj; #ifdef KSTACK_GUARD /* get a kernel virtual address for the kstack for this thread */ - ks = td->td_kstack; - if (ks == 0) { - ks = kmem_alloc_nofault(kernel_map, - (KSTACK_PAGES + 1) * PAGE_SIZE); - if (ks == NULL) - panic("pmap_new_thread: kstack allocation failed"); - ks += PAGE_SIZE; - td->td_kstack = ks; - } + ks = kmem_alloc_nofault(kernel_map, (KSTACK_PAGES + 1) * PAGE_SIZE); + if (ks == NULL) + panic("pmap_new_thread: kstack allocation failed"); - ptek = vtopte(ks - PAGE_SIZE); + /* Set the first page to be the unmapped guard page. */ + ptek = vtopte(ks); oldpte = *ptek; *ptek = 0; if (oldpte) - pmap_invalidate_page(kernel_pmap, ks - PAGE_SIZE); + pmap_invalidate_page(kernel_pmap, ks); + /* move to the next page, which is where the real stack starts. */ + ks += PAGE_SIZE; + td->td_kstack = ks; ptek++; #else /* get a kernel virtual address for the kstack for this thread */ - ks = td->td_kstack; - if (ks == 0) { - ks = kmem_alloc_nofault(kernel_map, KSTACK_PAGES * PAGE_SIZE); - if (ks == NULL) - panic("pmap_new_thread: kstack allocation failed"); - td->td_kstack = ks; - } + ks = kmem_alloc_nofault(kernel_map, KSTACK_PAGES * PAGE_SIZE); + if (ks == NULL) + panic("pmap_new_thread: kstack allocation failed"); + td->td_kstack = ks; ptek = vtopte(ks); #endif + /* + * For the length of the stack, link in a real page of ram for each + * page of stack. + */ for (i = 0; i < KSTACK_PAGES; i++) { /* * Get a kernel stack page @@ -1118,11 +957,11 @@ m->wire_count++; cnt.v_wire_count++; - oldpte = *(ptek + i); /* * Enter the page into the kernel address space. */ - *(ptek + i) = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) + oldpte = ptek[i]; + ptek[i] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_ASM | PG_KRE | PG_KWE | PG_V; if (oldpte) pmap_invalidate_page(kernel_pmap, ks + i * PAGE_SIZE); @@ -1146,7 +985,7 @@ vm_object_t ksobj; vm_offset_t ks; vm_page_t m; - pt_entry_t *ptek, oldpte; + pt_entry_t *ptek; ksobj = td->td_kstack_obj; ks = td->td_kstack; @@ -1156,22 +995,24 @@ if (m == NULL) panic("pmap_dispose_thread: kstack already missing?"); vm_page_busy(m); - oldpte = *(ptek + i); - *(ptek + i) = 0; + ptek[i] = 0; pmap_invalidate_page(kernel_pmap, ks + i * PAGE_SIZE); + vm_page_lock_queues(); vm_page_unwire(m, 0); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 17 16:55:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED80D37B401; Wed, 17 Jul 2002 16:54:18 -0700 (PDT) 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 6CAC537B400 for ; Wed, 17 Jul 2002 16:54:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C67A43E42 for ; Wed, 17 Jul 2002 16:54:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6HNsHJU094490 for ; Wed, 17 Jul 2002 16:54:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6HNsGoE094487 for perforce@freebsd.org; Wed, 17 Jul 2002 16:54:16 -0700 (PDT) Date: Wed, 17 Jul 2002 16:54:16 -0700 (PDT) Message-Id: <200207172354.g6HNsGoE094487@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14402 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14402 Change 14402 by peter@peter_daintree on 2002/07/17 16:53:21 IFC @14401 (damn, missed 14400 by one) Affected files ... .. //depot/projects/ia64/crypto/openssh/auth2-pam-freebsd.c#2 integrate .. //depot/projects/ia64/etc/rc.d/network1#3 integrate .. //depot/projects/ia64/include/glob.h#3 integrate .. //depot/projects/ia64/include/protocols/dumprestore.h#4 integrate .. //depot/projects/ia64/lib/libc/gen/glob.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/glob.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/utimes.2#2 integrate .. //depot/projects/ia64/libexec/ftpd/ftpcmd.y#5 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#6 integrate .. //depot/projects/ia64/libexec/ftpd/popen.c#3 integrate .. //depot/projects/ia64/libexec/rtld-elf/sparc64/rtld_start.S#2 integrate .. //depot/projects/ia64/sbin/Makefile#16 integrate .. //depot/projects/ia64/sbin/devfs/Makefile#1 branch .. //depot/projects/ia64/sbin/devfs/devfs.8#1 branch .. //depot/projects/ia64/sbin/devfs/devfs.c#1 branch .. //depot/projects/ia64/sbin/devfs/extern.h#1 branch .. //depot/projects/ia64/sbin/devfs/rule.c#1 branch .. //depot/projects/ia64/sbin/dump/traverse.c#8 integrate .. //depot/projects/ia64/sbin/newfs/mkfs.c#13 integrate .. //depot/projects/ia64/sbin/restore/dirs.c#4 integrate .. //depot/projects/ia64/sbin/restore/restore.h#4 integrate .. //depot/projects/ia64/sbin/restore/tape.c#8 integrate .. //depot/projects/ia64/share/man/man1/builtin.1#4 integrate .. //depot/projects/ia64/share/mk/Makefile#7 integrate .. //depot/projects/ia64/sys/conf/files#33 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#12 integrate .. //depot/projects/ia64/sys/dev/pccard/card_if.m#4 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard_common.c#2 delete .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#12 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#12 integrate .. //depot/projects/ia64/sys/dev/pccard/pccardvar.h#6 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#6 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#20 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/ia64/sys/i386/include/atomic.h#4 integrate .. //depot/projects/ia64/sys/ia64/acpica/madt.c#10 integrate .. //depot/projects/ia64/sys/ia64/ia64/efi.c#4 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_condvar.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_idle.c#5 integrate .. //depot/projects/ia64/sys/kern/kern_shutdown.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#8 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#3 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/ia64/sys/netinet/ip_fw.h#9 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#13 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#18 integrate .. //depot/projects/ia64/sys/pccard/i82365.h#4 integrate .. //depot/projects/ia64/sys/pccard/pccard_nbk.c#4 integrate .. //depot/projects/ia64/sys/pccard/pcic.c#8 integrate .. //depot/projects/ia64/sys/pccard/pcic_pci.c#8 integrate .. //depot/projects/ia64/sys/pci/agp_intel.c#5 integrate .. //depot/projects/ia64/sys/sys/proc.h#22 integrate .. //depot/projects/ia64/usr.bin/alias/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#16 integrate .. //depot/projects/ia64/usr.sbin/chown/chown.c#6 integrate Differences ... ==== //depot/projects/ia64/crypto/openssh/auth2-pam-freebsd.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include "includes.h" -RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.2 2002/07/05 15:27:26 des Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.3 2002/07/17 17:44:02 des Exp $"); #ifdef USE_PAM #include @@ -154,6 +154,17 @@ exit(0); } +static void +pam_cleanup(void *ctxtp) +{ + struct pam_ctxt *ctxt = ctxtp; + int status; + + close(ctxt->pam_sock); + kill(ctxt->pam_pid, SIGHUP); + waitpid(ctxt->pam_pid, &status, 0); +} + static void * pam_init_ctx(Authctxt *authctxt) { @@ -190,6 +201,7 @@ } ctxt->pam_sock = socks[0]; close(socks[1]); + fatal_add_cleanup(pam_cleanup, ctxt); return (ctxt); } @@ -295,6 +307,7 @@ struct pam_ctxt *ctxt = ctxtp; int status; + fatal_remove_cleanup(pam_cleanup, ctxt); close(ctxt->pam_sock); kill(ctxt->pam_pid, SIGHUP); waitpid(ctxt->pam_pid, &status, 0); ==== //depot/projects/ia64/etc/rc.d/network1#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh -x # -# $FreeBSD: src/etc/rc.d/network1,v 1.4 2002/06/18 23:12:50 dougb Exp $ +# $FreeBSD: src/etc/rc.d/network1,v 1.5 2002/07/17 03:29:37 dd Exp $ # # PROVIDE: network1 @@ -205,8 +205,6 @@ fi done - echo '.' - # Resync ipfilter /etc/rc.d/ipfilter resync } ==== //depot/projects/ia64/include/glob.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)glob.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/glob.h,v 1.6 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/glob.h,v 1.7 2002/07/17 04:58:09 mikeh Exp $ */ #ifndef _GLOB_H_ @@ -64,13 +64,24 @@ int (*gl_stat)(const char *, struct stat *); } glob_t; +#if __POSIX_VISIBLE >= 199209 +/* Believed to have been introduced in 1003.2-1992 */ #define GLOB_APPEND 0x0001 /* Append to output from previous call. */ #define GLOB_DOOFFS 0x0002 /* Use gl_offs. */ #define GLOB_ERR 0x0004 /* Return on error. */ #define GLOB_MARK 0x0008 /* Append / to matching directories. */ #define GLOB_NOCHECK 0x0010 /* Return pattern itself if nothing matches. */ #define GLOB_NOSORT 0x0020 /* Don't sort. */ +#define GLOB_NOESCAPE 0x2000 /* Disable backslash escaping. */ + +/* Error values returned by glob(3) */ +#define GLOB_NOSPACE (-1) /* Malloc call failed. */ +#define GLOB_ABORTED (-2) /* Unignored error. */ +#define GLOB_NOMATCH (-3) /* No match and GLOB_NOCHECK was not set. */ +#define GLOB_NOSYS (-4) /* Obsolete: source comptability only. */ +#endif /* __POSIX_VISIBLE >= 199209 */ +#if __BSD_VISIBLE #define GLOB_ALTDIRFUNC 0x0040 /* Use alternately specified directory funcs. */ #define GLOB_BRACE 0x0080 /* Expand braces ala csh. */ #define GLOB_MAGCHAR 0x0100 /* Pattern had globbing characters. */ @@ -79,11 +90,10 @@ #define GLOB_TILDE 0x0800 /* Expand tilde names from the passwd file. */ #define GLOB_LIMIT 0x1000 /* limit number of returned paths */ -/* backwards compatibility, this is the old name for this option */ +/* source compatibility, these are the old names */ #define GLOB_MAXPATH GLOB_LIMIT - -#define GLOB_NOSPACE (-1) /* Malloc call failed. */ -#define GLOB_ABEND (-2) /* Unignored error. */ +#define GLOB_ABEND GLOB_ABORTED +#endif /* __BSD_VISIBLE */ __BEGIN_DECLS int glob(const char *, int, int (*)(const char *, int), glob_t *); ==== //depot/projects/ia64/include/protocols/dumprestore.h#4 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)dumprestore.h 8.2 (Berkeley) 1/21/94 * - * $FreeBSD: src/include/protocols/dumprestore.h,v 1.9 2002/06/21 06:17:46 mckusick Exp $ + * $FreeBSD: src/include/protocols/dumprestore.h,v 1.10 2002/07/17 02:03:19 mckusick Exp $ */ #ifndef _PROTOCOLS_DUMPRESTORE_H_ @@ -93,8 +93,8 @@ int32_t c_mtimensec; /* last modified time, nanosecs */ int32_t c_spare2[2]; /* old ctime */ int32_t c_rdev; /* for devices, device number */ - int32_t c_createtimensec; /* creation time, nanosecs */ - int64_t c_createtime; /* creation time, seconds */ + int32_t c_birthtimensec; /* creation time, nanosecs */ + int64_t c_birthtime; /* creation time, seconds */ int64_t c_atime; /* last access time, seconds */ int64_t c_mtime; /* last modified time, seconds */ int32_t c_spare4[7]; /* old block pointers */ ==== //depot/projects/ia64/lib/libc/gen/glob.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)glob.3 8.3 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.20 2001/10/01 16:08:51 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/glob.3,v 1.21 2002/07/17 04:58:09 mikeh Exp $ .\" .Dd April 16, 1994 .Dt GLOB 3 @@ -187,9 +187,15 @@ .Fa pattern , with the number of total pathnames is set to 1, and the number of matched pathnames set to 0. +The effect of backslash escaping is present in the pattern returned. +.It Dv GLOB_NOESCAPE +By default, a backslash +.Pq Ql \e +character is used to escape the following character in the pattern, +avoiding any special interpretation of the character. If -.Dv GLOB_QUOTE -is set, its effect is present in the pattern returned. +.Dv GLOB_NOESCAPE +is set, backslash escaping is disabled. .It Dv GLOB_NOSORT By default, the pathnames are sorted in ascending .Tn ASCII @@ -250,12 +256,6 @@ is provided to simplify implementing the historic .Xr csh 1 globbing behavior and should probably not be used anywhere else. -.It Dv GLOB_QUOTE -Use the backslash -.Pq Ql \e -character for quoting: every occurrence of -a backslash followed by a character in the pattern is replaced by that -character, avoiding any special interpretation of the character. .It Dv GLOB_TILDE Expand patterns that start with .Ql ~ @@ -304,7 +304,7 @@ returns non-zero, .Fn glob stops the scan and returns -.Dv GLOB_ABEND +.Dv GLOB_ABORTED after setting .Fa gl_pathc and @@ -386,12 +386,16 @@ was specified in the flags and .Fa pglob\->gl_matchc or more patterns were matched. -.It Dv GLOB_ABEND +.It Dv GLOB_ABORTED The scan was stopped because an error was encountered and either .Dv GLOB_ERR was set or .Fa \*(lp*errfunc\*(rp\*(lp\*(rp returned non-zero. +.It Dv GLOB_NOMATCH +The pattern did not match a pathname and +.Dv GLOB_NOCHECK +was not set. .El .Pp The arguments @@ -430,7 +434,6 @@ .Dv GLOB_LIMIT , .Dv GLOB_MAGCHAR , .Dv GLOB_NOMAGIC , -.Dv GLOB_QUOTE , and .Dv GLOB_TILDE , and the fields ==== //depot/projects/ia64/lib/libc/gen/glob.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.19 2002/02/01 01:32:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.20 2002/07/17 04:58:09 mikeh Exp $"); /* * glob(3) -- a superset of the one defined in POSIX 1003.2. @@ -182,7 +182,10 @@ bufnext = patbuf; bufend = bufnext + MAXPATHLEN - 1; - if (flags & GLOB_QUOTE) { + if (flags & GLOB_NOESCAPE) + while (bufnext < bufend && (c = *patnext++) != EOS) + *bufnext++ = c; + else { /* Protect the quoted characters. */ while (bufnext < bufend && (c = *patnext++) != EOS) if (c == QUOTE) { @@ -195,9 +198,6 @@ else *bufnext++ = c; } - else - while (bufnext < bufend && (c = *patnext++) != EOS) - *bufnext++ = c; *bufnext = EOS; if (flags & GLOB_BRACE) @@ -415,8 +415,7 @@ * The main glob() routine: compiles the pattern (optionally processing * quotes), calls glob1() to do the real pattern matching, and finally * sorts the list (unless unsorted operation is requested). Returns 0 - * if things went well, nonzero if errors occurred. It is not an error - * to find no matches. + * if things went well, nonzero if errors occurred. */ static int glob0(pattern, pglob, limit) @@ -493,12 +492,15 @@ * and the pattern did not contain any magic characters * GLOB_NOMAGIC is there just for compatibility with csh. */ - if (pglob->gl_pathc == oldpathc && - ((pglob->gl_flags & GLOB_NOCHECK) || - ((pglob->gl_flags & GLOB_NOMAGIC) && - !(pglob->gl_flags & GLOB_MAGCHAR)))) - return(globextend(pattern, pglob, limit)); - else if (!(pglob->gl_flags & GLOB_NOSORT)) + if (pglob->gl_pathc == oldpathc) { + if (((pglob->gl_flags & GLOB_NOCHECK) || + ((pglob->gl_flags & GLOB_NOMAGIC) && + !(pglob->gl_flags & GLOB_MAGCHAR)))) + return(globextend(pattern, pglob, limit)); + else + return(GLOB_NOMATCH); + } + if (!(pglob->gl_flags & GLOB_NOSORT)) qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc, pglob->gl_pathc - oldpathc, sizeof(char *), compare); return(0); @@ -557,7 +559,7 @@ (g_stat(pathbuf, &sb, pglob) == 0) && S_ISDIR(sb.st_mode)))) { if (pathend + 1 > pathend_last) - return (1); + return (GLOB_ABORTED); *pathend++ = SEP; *pathend = EOS; } @@ -572,7 +574,7 @@ if (ismeta(*p)) anymeta = 1; if (q + 1 > pathend_last) - return (1); + return (GLOB_ABORTED); *q++ = *p++; } @@ -581,7 +583,7 @@ pattern = p; while (*pattern == SEP) { if (pathend + 1 > pathend_last) - return (1); + return (GLOB_ABORTED); *pathend++ = *pattern++; } } else /* Need expansion, recurse. */ @@ -611,7 +613,7 @@ struct dirent *(*readdirfunc)(); if (pathend > pathend_last) - return (1); + return (GLOB_ABORTED); *pathend = EOS; errno = 0; @@ -619,10 +621,10 @@ /* TODO: don't call for ENOENT or ENOTDIR? */ if (pglob->gl_errfunc) { if (g_Ctoc(pathbuf, buf, sizeof(buf))) - return (GLOB_ABEND); + return (GLOB_ABORTED); if (pglob->gl_errfunc(buf, errno) || pglob->gl_flags & GLOB_ERR) - return (GLOB_ABEND); + return (GLOB_ABORTED); } return(0); } ==== //depot/projects/ia64/lib/libc/sys/utimes.2#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)utimes.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/utimes.2,v 1.12 2001/10/01 16:09:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/utimes.2,v 1.13 2002/07/17 02:03:18 mckusick Exp $ .\" .Dd June 4, 1993 .Dt UTIMES 2 @@ -75,6 +75,15 @@ it is assumed to point to an array of two timeval structures. The access time is set to the value of the first element, and the modification time is set to the value of the second element. +For filesystems that support file birth (creation) times (such as +.Dv UFS2 ), +the birth time will be set to the value of the second element +if the second element is older than the currently set birth time. +To set both a birth time and a modification time, +two calls are required; the first to set the birth time +and the second to set the (presumably newer) modification time. +Ideally a new system call will be added that allows the setting +of all three times at once. The caller must be the owner of the file or be the super-user. .Pp In either case, the inode-change-time of the file is set to the current ==== //depot/projects/ia64/libexec/ftpd/ftpcmd.y#5 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.33 2002/03/14 16:05:06 maxim Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.34 2002/07/17 05:47:49 mikeh Exp $"; #endif /* not lint */ #include @@ -969,7 +969,7 @@ if (logged_in && $1) { glob_t gl; int flags = - GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE; + GLOB_BRACE|GLOB_NOCHECK|GLOB_TILDE; memset(&gl, 0, sizeof(gl)); flags |= GLOB_MAXPATH; ==== //depot/projects/ia64/libexec/ftpd/ftpd.c#6 (text+ko) ==== @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.108 2002/07/16 16:48:15 yar Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.111 2002/07/17 19:29:25 yar Exp $"; #endif /* not lint */ /* @@ -787,12 +787,12 @@ /* XXX: getaddrinfo() can't do alias check */ switch(hrp->hostinfo->ai_family) { case AF_INET: - addr = &((struct sockaddr_in *)&hrp->hostinfo->ai_addr)->sin_addr; - addrsize = sizeof(struct sockaddr_in); + addr = &((struct sockaddr_in *)hrp->hostinfo->ai_addr)->sin_addr; + addrsize = sizeof(struct in_addr); break; case AF_INET6: - addr = &((struct sockaddr_in6 *)&hrp->hostinfo->ai_addr)->sin6_addr; - addrsize = sizeof(struct sockaddr_in6); + addr = &((struct sockaddr_in6 *)hrp->hostinfo->ai_addr)->sin6_addr; + addrsize = sizeof(struct in6_addr); break; default: /* should not reach here */ @@ -829,7 +829,8 @@ lhrp->next = hrp; lhrp = hrp; } - freehostent(hp); + if (hp) + freehostent(hp); } nextline: if (mp) @@ -2737,7 +2738,7 @@ glob_t gl; if (strpbrk(whichf, "~{[*?") != NULL) { - int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE; + int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_TILDE; memset(&gl, 0, sizeof(gl)); gl.gl_matchc = MAXGLOBARGS; ==== //depot/projects/ia64/libexec/ftpd/popen.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 4/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/popen.c,v 1.22 2002/02/03 15:53:02 imp Exp $"; + "$FreeBSD: src/libexec/ftpd/popen.c,v 1.23 2002/07/17 05:47:49 mikeh Exp $"; #endif /* not lint */ #include @@ -103,7 +103,7 @@ gargv[0] = argv[0]; for (gargc = argc = 1; argv[argc] && gargc < (MAXGLOBARGS-1); argc++) { glob_t gl; - int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_QUOTE|GLOB_TILDE; + int flags = GLOB_BRACE|GLOB_NOCHECK|GLOB_TILDE; memset(&gl, 0, sizeof(gl)); gl.gl_matchc = MAXGLOBARGS; ==== //depot/projects/ia64/libexec/rtld-elf/sparc64/rtld_start.S#2 (text+ko) ==== @@ -37,7 +37,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/sparc64/rtld_start.S,v 1.1 2002/03/13 02:40:39 jake Exp $ + * $FreeBSD: src/libexec/rtld-elf/sparc64/rtld_start.S,v 1.2 2002/07/17 22:20:41 jake Exp $ */ #include @@ -65,6 +65,7 @@ mov %l1, %o3 jmp %o0 mov %l0, %o0 +END(.rtld_start) /* * We have two separate entry points to the runtime linker. @@ -124,6 +125,7 @@ jmp %o0 /* return value == function address */ restore /* Dump our stack frame */ +END(_rtld_bind_start_0) ENTRY(_rtld_bind_start_1) srax %o0, 15, %o2 /* %o0 is the index to our PLT slot */ @@ -140,4 +142,4 @@ jmp %o0 /* return value == function address */ restore /* Dump our stack frame */ - +END(_rtld_bind_start_1) ==== //depot/projects/ia64/sbin/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.108 2002/07/07 22:14:40 gordon Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.109 2002/07/17 01:46:47 dd Exp $ # XXX MISSING: icheck ncheck @@ -12,6 +12,7 @@ clri \ comcontrol \ conscontrol \ + devfs \ dhclient \ disklabel \ dmesg \ ==== //depot/projects/ia64/sbin/dump/traverse.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/traverse.c,v 1.23 2002/07/08 23:53:21 iedowse Exp $"; + "$FreeBSD: src/sbin/dump/traverse.c,v 1.24 2002/07/17 02:03:18 mckusick Exp $"; #endif /* not lint */ #include @@ -407,8 +407,8 @@ spcl.c_atimensec = dp->dp1.di_atimensec; spcl.c_mtime = _time32_to_time(dp->dp1.di_mtime); spcl.c_mtimensec = dp->dp1.di_mtimensec; - spcl.c_createtime = 0; - spcl.c_createtimensec = 0; + spcl.c_birthtime = 0; + spcl.c_birthtimensec = 0; spcl.c_rdev = dp->dp1.di_rdev; spcl.c_file_flags = dp->dp1.di_flags; spcl.c_uid = dp->dp1.di_uid; @@ -420,8 +420,8 @@ spcl.c_atimensec = dp->dp2.di_atimensec; spcl.c_mtime = _time64_to_time(dp->dp2.di_mtime); spcl.c_mtimensec = dp->dp2.di_mtimensec; - spcl.c_createtime = _time64_to_time(dp->dp2.di_createtime); - spcl.c_createtimensec = dp->dp2.di_creatensec; + spcl.c_birthtime = _time64_to_time(dp->dp2.di_birthtime); + spcl.c_birthtimensec = dp->dp2.di_birthnsec; spcl.c_rdev = dp->dp2.di_rdev; spcl.c_file_flags = dp->dp2.di_flags; spcl.c_uid = dp->dp2.di_uid; ==== //depot/projects/ia64/sbin/newfs/mkfs.c#13 (text+ko) ==== @@ -48,7 +48,7 @@ static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.59 2002/07/11 17:49:41 bde Exp $"; + "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.60 2002/07/17 10:31:38 roberto Exp $"; #endif /* not lint */ #include @@ -708,7 +708,7 @@ node.dp2.di_atime = utime; node.dp2.di_mtime = utime; node.dp2.di_ctime = utime; - node.dp2.di_createtime = utime; + node.dp2.di_birthtime = utime; /* * create the root directory */ ==== //depot/projects/ia64/sbin/restore/dirs.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)dirs.c 8.7 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/restore/dirs.c,v 1.22 2002/06/21 06:18:00 mckusick Exp $"; + "$FreeBSD: src/sbin/restore/dirs.c,v 1.23 2002/07/17 02:03:18 mckusick Exp $"; #endif /* not lint */ #include @@ -82,7 +82,8 @@ */ struct modeinfo { ino_t ino; - struct timeval timep[2]; + struct timeval ctimep[2]; + struct timeval mtimep[2]; mode_t mode; uid_t uid; gid_t gid; @@ -597,7 +598,8 @@ if (!Nflag) { (void) chown(cp, node.uid, node.gid); (void) chmod(cp, node.mode); - utimes(cp, node.timep); + utimes(cp, node.ctimep); + utimes(cp, node.mtimep); (void) chflags(cp, node.flags); } ep->e_flags &= ~NEW; @@ -685,10 +687,14 @@ if (mf == NULL) return (itp); node.ino = ctxp->ino; - node.timep[0].tv_sec = ctxp->atime_sec; - node.timep[0].tv_usec = ctxp->atime_nsec / 1000; - node.timep[1].tv_sec = ctxp->mtime_sec; - node.timep[1].tv_usec = ctxp->mtime_nsec / 1000; + node.mtimep[0].tv_sec = ctxp->atime_sec; + node.mtimep[0].tv_usec = ctxp->atime_nsec / 1000; + node.mtimep[1].tv_sec = ctxp->mtime_sec; + node.mtimep[1].tv_usec = ctxp->mtime_nsec / 1000; + node.ctimep[0].tv_sec = ctxp->atime_sec; + node.ctimep[0].tv_usec = ctxp->atime_nsec / 1000; + node.ctimep[1].tv_sec = ctxp->birthtime_sec; + node.ctimep[1].tv_usec = ctxp->birthtime_nsec / 1000; node.mode = ctxp->mode; node.flags = ctxp->file_flags; node.uid = ctxp->uid; ==== //depot/projects/ia64/sbin/restore/restore.h#4 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)restore.h 8.3 (Berkeley) 9/13/94 - * $FreeBSD: src/sbin/restore/restore.h,v 1.4 2002/06/21 06:18:00 mckusick Exp $ + * $FreeBSD: src/sbin/restore/restore.h,v 1.5 2002/07/17 02:03:18 mckusick Exp $ */ /* @@ -113,8 +113,10 @@ int rdev; /* device number of file */ time_t atime_sec; /* access time seconds */ time_t mtime_sec; /* modified time seconds */ + time_t birthtime_sec; /* creation time seconds */ int atime_nsec; /* access time nanoseconds */ int mtime_nsec; /* modified time nanoseconds */ + int birthtime_nsec; /* creation time nanoseconds */ off_t size; /* size of file */ char *name; /* name of file */ } curfile; ==== //depot/projects/ia64/sbin/restore/tape.c#8 (text+ko) ==== @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)tape.c 8.9 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/restore/tape.c,v 1.35 2002/06/21 06:18:00 mckusick Exp $"; + "$FreeBSD: src/sbin/restore/tape.c,v 1.36 2002/07/17 02:03:18 mckusick Exp $"; #endif /* not lint */ #include @@ -521,15 +521,19 @@ { int flags; mode_t mode; - struct timeval timep[2]; + struct timeval mtimep[2], ctimep[2]; struct entry *ep; curfile.name = name; curfile.action = USING; - timep[0].tv_sec = curfile.atime_sec; - timep[0].tv_usec = curfile.atime_nsec / 1000; - timep[1].tv_sec = curfile.mtime_sec; - timep[1].tv_usec = curfile.mtime_nsec / 1000; + mtimep[0].tv_sec = curfile.atime_sec; + mtimep[0].tv_usec = curfile.atime_nsec / 1000; + mtimep[1].tv_sec = curfile.mtime_sec; + mtimep[1].tv_usec = curfile.mtime_nsec / 1000; + ctimep[0].tv_sec = curfile.atime_sec; + ctimep[0].tv_usec = curfile.atime_nsec / 1000; + ctimep[1].tv_sec = curfile.birthtime_sec; + ctimep[1].tv_usec = curfile.birthtime_nsec / 1000; mode = curfile.mode; flags = curfile.file_flags; switch (mode & IFMT) { @@ -567,7 +571,8 @@ if (linkit(lnkbuf, name, SYMLINK) == GOOD) { (void) lchown(name, curfile.uid, curfile.gid); (void) lchmod(name, mode); - (void) lutimes(name, timep); + (void) lutimes(name, ctimep); + (void) lutimes(name, mtimep); return (GOOD); } return (FAIL); @@ -588,7 +593,8 @@ } (void) chown(name, curfile.uid, curfile.gid); (void) chmod(name, mode); - (void) utimes(name, timep); + (void) utimes(name, ctimep); + (void) utimes(name, mtimep); (void) chflags(name, flags); skipfile(); return (GOOD); @@ -610,7 +616,8 @@ } (void) chown(name, curfile.uid, curfile.gid); (void) chmod(name, mode); - (void) utimes(name, timep); + (void) utimes(name, ctimep); + (void) utimes(name, mtimep); (void) chflags(name, flags); skipfile(); return (GOOD); @@ -634,7 +641,8 @@ (void) fchmod(ofile, mode); getfile(xtrfile, xtrskip); (void) close(ofile); - utimes(name, timep); + (void) utimes(name, ctimep); + (void) utimes(name, mtimep); (void) chflags(name, flags); return (GOOD); } @@ -1174,6 +1182,8 @@ curfile.atime_nsec = header->c_atimensec; curfile.mtime_sec = header->c_mtime; curfile.mtime_nsec = header->c_mtimensec; + curfile.birthtime_sec = header->c_birthtime; + curfile.birthtime_nsec = header->c_birthtimensec; curfile.size = header->c_size; curfile.ino = header->c_inumber; break; ==== //depot/projects/ia64/share/man/man1/builtin.1#4 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man1/builtin.1,v 1.17 2001/11/20 18:41:01 knu Exp $ +.\" $FreeBSD: src/share/man/man1/builtin.1,v 1.19 2002/07/17 15:34:25 sheldonh Exp $ .\" .Dd September 1, 1999 .Dt BUILTIN 1 @@ -171,17 +171,17 @@ .It Xo .Em "Command External" Ta Xr csh 1 Ta Xr sh 1 .Xc -.It Ic alias Ta \&No Ta Yes Ta Yes +.It Ic alias Ta Yes Ta Yes Ta Yes .It Ic alloc Ta \&No Ta Yes Ta \&No -.It Ic bg Ta \&No Ta Yes Ta Yes +.It Ic bg Ta Yes Ta Yes Ta Yes .It Ic bindkey Ta \&No Ta Yes Ta \&No .It Ic break Ta \&No Ta Yes Ta \&Yes .It Ic breaksw Ta \&No Ta Yes Ta \&No .It Ic builtins Ta \&No Ta Yes Ta \&No .It Ic case Ta \&No Ta Yes Ta Yes -.It Ic cd Ta \&No Ta Yes Ta Yes +.It Ic cd Ta Yes Ta Yes Ta Yes .It Ic chdir Ta \&No Ta Yes Ta \&Yes -.It Ic command Ta \&No Ta \&No Ta Yes +.It Ic command Ta Yes Ta \&No Ta Yes .It Ic complete Ta \&No Ta Yes Ta \&No .It Ic continue Ta \&No Ta Yes Ta \&Yes .It Ic default Ta \&No Ta Yes Ta \&No @@ -201,13 +201,13 @@ .It Ic exit Ta \&No Ta Yes Ta Yes .It Ic export Ta \&No Ta \&No Ta Yes .It Ic false Ta Yes Ta \&No Ta Yes -.It Ic fc Ta \&No Ta \&No Ta Yes -.It Ic fg Ta \&No Ta Yes Ta Yes +.It Ic fc Ta Yes Ta \&No Ta Yes +.It Ic fg Ta Yes Ta Yes Ta Yes .It Ic filetest Ta \&No Ta Yes Ta \&No .It Ic fi Ta \&No Ta \&No Ta Yes .It Ic for Ta \&No Ta \&No Ta Yes .It Ic foreach Ta \&No Ta Yes Ta \&No -.It Ic getopts Ta \&No Ta \&No Ta Yes +.It Ic getopts Ta Yes Ta \&No Ta Yes .It Ic glob Ta \&No Ta Yes Ta \&No .It Ic goto Ta \&No Ta Yes Ta \&No .It Ic hash Ta \&No Ta \&No Ta Yes @@ -216,7 +216,7 @@ .It Ic hup Ta \&No Ta Yes Ta \&No .It Ic if Ta \&No Ta Yes Ta \&Yes .It Ic jobid Ta \&No Ta \&No Ta Yes -.It Ic jobs Ta \&No Ta Yes Ta Yes +.It Ic jobs Ta Yes Ta Yes Ta Yes .It Ic kill Ta Yes Ta Yes Ta \&No .It Ic limit Ta \&No Ta Yes Ta \&No .It Ic log Ta \&No Ta Yes Ta \&No @@ -231,7 +231,7 @@ .It Ic printenv Ta Yes Ta Yes Ta \&No .It Ic pushd Ta \&No Ta Yes Ta \&No .It Ic pwd Ta Yes Ta \&No Ta Yes -.It Ic read Ta \&No Ta \&No Ta Yes +.It Ic read Ta Yes Ta \&No Ta Yes .It Ic readonly Ta \&No Ta \&No Ta Yes .It Ic rehash Ta \&No Ta Yes Ta \&No .It Ic repeat Ta \&No Ta Yes Ta \&No @@ -254,15 +254,15 @@ .It Ic true Ta Yes Ta \&No Ta Yes .It Ic type Ta \&No Ta \&No Ta Yes .It Ic ulimit Ta \&No Ta \&No Ta Yes -.It Ic umask Ta \&No Ta Yes Ta Yes -.It Ic unalias Ta \&No Ta Yes Ta Yes +.It Ic umask Ta Yes Ta Yes Ta Yes +.It Ic unalias Ta Yes Ta Yes Ta Yes .It Ic uncomplete Ta \&No Ta Yes Ta \&No .It Ic unhash Ta \&No Ta Yes Ta \&No .It Ic unlimit Ta \&No Ta Yes Ta \&No .It Ic unset Ta \&No Ta Yes Ta Yes .It Ic unsetenv Ta \&No Ta Yes Ta \&No .It Ic until Ta \&No Ta \&No Ta Yes -.It Ic wait Ta \&No Ta Yes Ta Yes +.It Ic wait Ta Yes Ta Yes Ta Yes .It Ic where Ta \&No Ta Yes Ta \&No .It Ic which Ta Yes Ta Yes Ta \&No .It Ic while Ta \&No Ta Yes Ta \&Yes ==== //depot/projects/ia64/share/mk/Makefile#7 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/share/mk/Makefile,v 1.40 2002/07/02 12:16:54 ru Exp $ +# $FreeBSD: src/share/mk/Makefile,v 1.41 2002/07/17 16:35:00 ru Exp $ # @(#)Makefile 8.1 (Berkeley) 6/8/93 FILES= bsd.README FILES+= bsd.cpu.mk bsd.dep.mk bsd.doc.mk bsd.files.mk -FILES+= bsd.info.mk bsd.incs.mk bsd.init.mk +FILES+= bsd.incs.mk bsd.info.mk bsd.init.mk FILES+= bsd.kern.mk bsd.kmod.mk FILES+= bsd.lib.mk bsd.libnames.mk bsd.links.mk bsd.man.mk bsd.nls.mk FILES+= bsd.obj.mk bsd.own.mk ==== //depot/projects/ia64/sys/conf/files#33 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.665 2002/07/17 01:46:48 dd Exp $ +# $FreeBSD: src/sys/conf/files,v 1.666 2002/07/17 05:22:00 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -463,7 +463,6 @@ dev/nge/if_nge.c optional nge dev/null/null.c standard dev/nmdm/nmdm.c optional nmdm -dev/pccard/pccard_common.c standard dev/pccard/card_if.m standard dev/pccard/pccard.c optional pccard dev/pccard/pccard_cis.c optional pccard ==== //depot/projects/ia64/sys/conf/kmod.mk#12 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.126 2002/07/11 14:13:37 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.127 2002/07/17 08:21:50 ru Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -19,13 +19,6 @@ # # KMODMODE KLD mode. [${BINMODE}] # -# LINKS The list of KLD links; should be full pathnames, the -# linked-to file coming first, followed by the linked -# file. The files are hard-linked. For example, to link -# /modules/master and /modules/meister, use: -# -# LINKS= /modules/master /modules/meister -# # KMODLOAD Command to load a kernel module [/sbin/kldload] # # KMODUNLOAD Command to unload a kernel module [/sbin/kldunload] @@ -35,15 +28,8 @@ # # SRCS List of source files # -# SUBDIR A list of subdirectories that should be built as well. -# Each of the targets will execute the same target in the -# subdirectories. +# DESTDIR Change the tree where the module gets installed. [not set] # -# SYMLINKS Same as LINKS, except it creates symlinks and the -# linked-to pathname may be relative. -# -# DESTDIR, DISTDIR are set by other Makefiles (e.g. bsd.own.mk) -# # MFILES Optionally a list of interfaces used by the module. # This file contains a default list of interfaces. # @@ -54,10 +40,6 @@ # # +++ targets +++ # -# distribute: -# This is a variant of install, which will -# put the stuff into the right "distribution". -# # install: # install the kernel module; if the Makefile # does not itself define the target install, the targets @@ -207,12 +189,6 @@ CLEANFILES+= ${PROG} ${FULLPROG} ${KMOD}.kld ${OBJS} ${_ILINKS} symb.tmp tmp.o .if !target(install) -.if !target(beforeinstall) -beforeinstall: -.endif -.if !target(afterinstall) -afterinstall: -.endif _INSTALLFLAGS:= ${INSTALLFLAGS} .for ie in ${INSTALLFLAGS_EDIT} @@ -224,47 +200,34 @@ cd ${.CURDIR}; ${MAKE} -DINSTALL_DEBUG install .endif -realinstall: +.if !target(realinstall) +realinstall: _kmodinstall +.ORDER: beforeinstall _kmodinstall .if defined(DEBUG) && defined(INSTALL_DEBUG) +_kmodinstall: ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ - ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR}/ + ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR} .else +_kmodinstall: ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ - ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}/ -.if defined(LINKS) && !empty(LINKS) - @set ${LINKS}; \ - while test $$# -ge 2; do \ - l=${DESTDIR}$$1; \ - shift; \ - t=${DESTDIR}$$1; \ - shift; \ - ${ECHO} $$t -\> $$l; \ - ln -f $$l $$t; \ - done; true -.endif -.if defined(SYMLINKS) && !empty(SYMLINKS) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 2:43:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0331F37B401; Thu, 18 Jul 2002 02:43:47 -0700 (PDT) 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 9B4AD37B400 for ; Thu, 18 Jul 2002 02:43:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E43F43E3B for ; Thu, 18 Jul 2002 02:43:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6I9hkJU017629 for ; Thu, 18 Jul 2002 02:43:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6I9hk7D017626 for perforce@freebsd.org; Thu, 18 Jul 2002 02:43:46 -0700 (PDT) Date: Thu, 18 Jul 2002 02:43:46 -0700 (PDT) Message-Id: <200207180943.g6I9hk7D017626@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14413 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14413 Change 14413 by peter@peter_ia64 on 2002/07/18 02:43:20 fix printf format errors Affected files ... .. //depot/projects/ia64/sys/boot/efi/loader/main.c#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/loader/main.c#3 (text+ko) ==== @@ -292,7 +292,7 @@ { int i; - printf("NumberOfTableEntries=%d\n", ST->NumberOfTableEntries); + printf("NumberOfTableEntries=%ld\n", ST->NumberOfTableEntries); for (i = 0; i < ST->NumberOfTableEntries; i++) { static EFI_GUID mps = MPS_TABLE_GUID; static EFI_GUID acpi = ACPI_TABLE_GUID; @@ -450,7 +450,7 @@ if (!(res.pal_result[0] & 8)) buf.pte.pte_ma = 0; sprintf(lbuf, - "%d %06x %013x %013x %4s %d %d %d %d %d %-3s %d %06x\n", + "%d %06x %013lx %013lx %4s %d %d %d %d %d %-3s %d %06x\n", buf.ifa.ifa_ig & 1, buf.rr.rr_rid, buf.ifa.ifa_vpn, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 2:44:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB24F37B401; Thu, 18 Jul 2002 02:44:48 -0700 (PDT) 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 6157437B400 for ; Thu, 18 Jul 2002 02:44:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F12643E3B for ; Thu, 18 Jul 2002 02:44:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6I9ilJU017738 for ; Thu, 18 Jul 2002 02:44:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6I9ilm3017735 for perforce@freebsd.org; Thu, 18 Jul 2002 02:44:47 -0700 (PDT) Date: Thu, 18 Jul 2002 02:44:47 -0700 (PDT) Message-Id: <200207180944.g6I9ilm3017735@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14414 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14414 Change 14414 by peter@peter_ia64 on 2002/07/18 02:44:10 comment out the ufs hook. I do not know why but it consistently makes the Itanium2 disk based and netboot based loader wedge solid. Affected files ... .. //depot/projects/ia64/sys/boot/efi/loader/conf.c#4 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/loader/conf.c#4 (text+ko) ==== @@ -60,7 +60,7 @@ struct fs_ops *file_system[] = { &efi_fsops, - &ufs_fsops, +/* &ufs_fsops, */ &nfs_fsops, &zipfs_fsops, NULL To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 2:45:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C83437B401; Thu, 18 Jul 2002 02:45:50 -0700 (PDT) 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 178A337B400 for ; Thu, 18 Jul 2002 02:45:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF62E43E58 for ; Thu, 18 Jul 2002 02:45:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6I9jnJU017824 for ; Thu, 18 Jul 2002 02:45:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6I9jnad017821 for perforce@freebsd.org; Thu, 18 Jul 2002 02:45:49 -0700 (PDT) Date: Thu, 18 Jul 2002 02:45:49 -0700 (PDT) Message-Id: <200207180945.g6I9jnad017821@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14415 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14415 Change 14415 by peter@peter_ia64 on 2002/07/18 02:45:19 Turn on -Wformat Affected files ... .. //depot/projects/ia64/lib/libstand/Makefile#9 edit .. //depot/projects/ia64/sys/boot/efi/Makefile.inc#7 edit Differences ... ==== //depot/projects/ia64/lib/libstand/Makefile#9 (text+ko) ==== @@ -12,7 +12,7 @@ INCS= stand.h MAN= libstand.3 -CFLAGS+= -ffreestanding +CFLAGS+= -ffreestanding -Wformat CFLAGS+= -I${.CURDIR} .if ${MACHINE_ARCH} == "alpha" ==== //depot/projects/ia64/sys/boot/efi/Makefile.inc#7 (text+ko) ==== @@ -1,4 +1,4 @@ # $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.4 2002/04/06 04:29:36 peter Exp $ # Options used when building app-specific efi components -CFLAGS+= -ffreestanding +CFLAGS+= -ffreestanding -Wformat To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 2:46:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B55B37B401; Thu, 18 Jul 2002 02:46:52 -0700 (PDT) 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 DA22A37B400 for ; Thu, 18 Jul 2002 02:46:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C97843E3B for ; Thu, 18 Jul 2002 02:46:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6I9kpJU018011 for ; Thu, 18 Jul 2002 02:46:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6I9kpPR018008 for perforce@freebsd.org; Thu, 18 Jul 2002 02:46:51 -0700 (PDT) Date: Thu, 18 Jul 2002 02:46:51 -0700 (PDT) Message-Id: <200207180946.g6I9kpPR018008@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14416 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14416 Change 14416 by peter@peter_ia64 on 2002/07/18 02:45:50 -ffreestanding turns off gcc's "knowledge" of printf etc. explicitly tag it as __printflike() so we can check args. Affected files ... .. //depot/projects/ia64/lib/libstand/stand.h#8 edit Differences ... ==== //depot/projects/ia64/lib/libstand/stand.h#8 (text+ko) ==== @@ -244,9 +244,9 @@ struct disklabel; extern char *getdisklabel(const char *, struct disklabel *); -extern int printf(const char *fmt, ...); +extern int printf(const char *fmt, ...) __printflike(1, 2); extern void vprintf(const char *fmt, _BSD_VA_LIST_); -extern int sprintf(char *buf, const char *cfmt, ...); +extern int sprintf(char *buf, const char *cfmt, ...) __printflike(2, 3); extern void vsprintf(char *buf, const char *cfmt, _BSD_VA_LIST_); extern void twiddle(void); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 2:51: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C404237B401; Thu, 18 Jul 2002 02:50:57 -0700 (PDT) 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 7C9E037B400 for ; Thu, 18 Jul 2002 02:50:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 218BB43E42 for ; Thu, 18 Jul 2002 02:50:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6I9ovJU018695 for ; Thu, 18 Jul 2002 02:50:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6I9ouDH018692 for perforce@freebsd.org; Thu, 18 Jul 2002 02:50:56 -0700 (PDT) Date: Thu, 18 Jul 2002 02:50:56 -0700 (PDT) Message-Id: <200207180950.g6I9ouDH018692@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14417 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14417 Change 14417 by peter@peter_ia64 on 2002/07/18 02:50:11 Somebody shoot me please. This cost me weeks of debugging time. First: net->Transmit() takes an address that net->GetStatus() is supposed to return when the buffer is no longer needed. However, somebody decided to make the E1000 UNDI driver return a *different* address for some unknown reason. Maybe it is a copy, who knows. Second: net->Receive() takes a buffer pointer and length. The same E1000 driver feels that it is quite OK to trash memory outside of this buffer. I do not know if it doesn't respect the length, or just simply trashes things. Trashing your stack on IA64 can really ruin your day. So, provide a temporary buffer (also on the stack, urgh) that is "big enough" to hopefully survive and then bcopy the results that we expect without trashing our RPC client. Affected files ... .. //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#3 (text+ko) ==== @@ -102,10 +102,14 @@ return -1; /* Wait for the buffer to be transmitted */ - buf = 0; /* XXX Is this needed? */ do { + buf = 0; /* XXX Is this needed? */ status = net->GetStatus(net, 0, &buf); - } while (status == EFI_SUCCESS && buf != pkt); + /* + * XXX EFI1.1 and the E1000 card returns a different + * address than we gave. Sigh. + */ + } while (status == EFI_SUCCESS && buf == 0); /* XXX How do we deal with status != EFI_SUCCESS now? */ return (status == EFI_SUCCESS) ? len : -1; @@ -120,15 +124,26 @@ EFI_STATUS status; UINTN bufsz; time_t t; + char buf[2048]; net = nif->nif_devdata; t = time(0); while ((time(0) - t) < timeout) { - bufsz = len; - status = net->Receive(net, 0, &bufsz, pkt, 0, 0, 0); - if (status == EFI_SUCCESS) + bufsz = sizeof(buf); + status = net->Receive(net, 0, &bufsz, buf, 0, 0, 0); + if (status == EFI_SUCCESS) { + /* + * XXX EFI1.1 and the E1000 card trash our + * workspace if we do not do this silly copy. + * Either they are not respecting the len + * value or do not like the alignment. + */ + if (bufsz > len) + bufsz = len; + bcopy(buf, pkt, bufsz); return bufsz; + } if (status != EFI_NOT_READY) return 0; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 2:54: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09F6637B401; Thu, 18 Jul 2002 02:54:02 -0700 (PDT) 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 9235E37B400 for ; Thu, 18 Jul 2002 02:54:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 52C2E43E3B for ; Thu, 18 Jul 2002 02:54:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6I9s1JU018969 for ; Thu, 18 Jul 2002 02:54:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6I9s1VU018966 for perforce@freebsd.org; Thu, 18 Jul 2002 02:54:01 -0700 (PDT) Date: Thu, 18 Jul 2002 02:54:01 -0700 (PDT) Message-Id: <200207180954.g6I9s1VU018966@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14418 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14418 Change 14418 by peter@peter_ia64 on 2002/07/18 02:53:01 fix printf format errors Affected files ... .. //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#4 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#4 (text+ko) ==== @@ -164,7 +164,7 @@ if (net->Mode->State == EfiSimpleNetworkStopped) { status = net->Start(net); if (status != EFI_SUCCESS) { - printf("net%d: cannot start interface (status=%d)\n", + printf("net%d: cannot start interface (status=%ld)\n", nif->nif_unit, status); return; } @@ -173,7 +173,7 @@ if (net->Mode->State != EfiSimpleNetworkInitialized) { status = net->Initialize(net, 0, 0); if (status != EFI_SUCCESS) { - printf("net%d: cannot init. interface (status=%d)\n", + printf("net%d: cannot init. interface (status=%ld)\n", nif->nif_unit, status); return; } @@ -185,7 +185,7 @@ status = net->ReceiveFilters(net, mask, 0, FALSE, 0, 0); if (status != EFI_SUCCESS) { - printf("net%d: cannot set rx. filters (status=%d)\n", + printf("net%d: cannot set rx. filters (status=%ld)\n", nif->nif_unit, status); return; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 4:19:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFC5837B401; Thu, 18 Jul 2002 04:19:11 -0700 (PDT) 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 776DB37B400 for ; Thu, 18 Jul 2002 04:19:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2440B43E5E for ; Thu, 18 Jul 2002 04:19:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6IBJBJU040071 for ; Thu, 18 Jul 2002 04:19:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6IBJAo3040068 for perforce@freebsd.org; Thu, 18 Jul 2002 04:19:10 -0700 (PDT) Date: Thu, 18 Jul 2002 04:19:10 -0700 (PDT) Message-Id: <200207181119.g6IBJAo3040068@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14423 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14423 Change 14423 by peter@peter_ia64 on 2002/07/18 04:18:16 Check in lmin fix here as well. Affected files ... .. //depot/projects/ia64/sys/vm/vm_map.c#26 edit Differences ... ==== //depot/projects/ia64/sys/vm/vm_map.c#26 (text+ko) ==== @@ -263,7 +263,7 @@ void vm_init2(void) { - uma_zone_set_obj(kmapentzone, &kmapentobj, min(cnt.v_page_count, + uma_zone_set_obj(kmapentzone, &kmapentobj, lmin(cnt.v_page_count, (VM_MAX_KERNEL_ADDRESS - KERNBASE) / PAGE_SIZE) / 8); vmspace_zone = uma_zcreate("VMSPACE", sizeof(struct vmspace), NULL, #ifdef INVARIANTS To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 11:54:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B235537B405; Thu, 18 Jul 2002 11:54:50 -0700 (PDT) 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 5218437B401 for ; Thu, 18 Jul 2002 11:54:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 108D543E58 for ; Thu, 18 Jul 2002 11:54:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6IIsnJU043316 for ; Thu, 18 Jul 2002 11:54:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6IIsn61043313 for perforce@freebsd.org; Thu, 18 Jul 2002 11:54:49 -0700 (PDT) Date: Thu, 18 Jul 2002 11:54:49 -0700 (PDT) Message-Id: <200207181854.g6IIsn61043313@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14435 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14435 Change 14435 by rwatson@rwatson_tislabs on 2002/07/18 11:54:44 Bump the MULTILABEL check on label write a little higher in the stack so that it is enforced at the framework layer rather than the file system layer. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#168 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#168 (text+ko) ==== @@ -2340,9 +2340,6 @@ ASSERT_VOP_LOCKED(vp, "vop_stdsetlabel_ea"); - if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) - return (EOPNOTSUPP); - error = mac_externalize(intlabel, &extmac); if (error) return (error); @@ -2371,6 +2368,10 @@ printf("vn_setlabel: null v_mount with non-VT_NON\n"); return (EBADF); } + + if ((vp->v_mount->mnt_label & MNT_MULTILABEL) == 0) + return (EOPNOTSUPP); + /* * Multi-phase commit. First check the policies to confirm the * change is OK. Then commit via the filesystem. Finally, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 11:59: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BB8637B401; Thu, 18 Jul 2002 11:58:56 -0700 (PDT) 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 E48E437B400 for ; Thu, 18 Jul 2002 11:58:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9391443E65 for ; Thu, 18 Jul 2002 11:58:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6IIwtJU043613 for ; Thu, 18 Jul 2002 11:58:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6IIwtYN043610 for perforce@freebsd.org; Thu, 18 Jul 2002 11:58:55 -0700 (PDT) Date: Thu, 18 Jul 2002 11:58:55 -0700 (PDT) Message-Id: <200207181858.g6IIwtYN043610@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14436 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14436 Change 14436 by rwatson@rwatson_tislabs on 2002/07/18 11:58:07 A couple of comments indicating where work needs to be done to get EA support working for multiple policies, and pointing out some potential concerns to watch out for in the implementation. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#169 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#169 (text+ko) ==== @@ -1077,6 +1077,12 @@ * of disk, etc). */ mac_create_vnode_from_vnode(cred, dvp, tvp); + + /* + * XXX: Eventually call out to EA creation entry point + * here. + */ + error = mac_externalize(&tvp->v_label, &extmac); if (error) return (error); @@ -2340,6 +2346,13 @@ ASSERT_VOP_LOCKED(vp, "vop_stdsetlabel_ea"); + /* + * XXX: Eventually call out to EA check/set calls here. + * Be particularly careful to avoid race conditions, + * consistency problems, and stability problems when + * dealing with multiple EAs. + */ + error = mac_externalize(intlabel, &extmac); if (error) return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 12: 8:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8098037B401; Thu, 18 Jul 2002 12:08:08 -0700 (PDT) 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 254E237B400 for ; Thu, 18 Jul 2002 12:08:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D59DC43E42 for ; Thu, 18 Jul 2002 12:08:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6IJ87JU048756 for ; Thu, 18 Jul 2002 12:08:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6IJ87sX048753 for perforce@freebsd.org; Thu, 18 Jul 2002 12:08:07 -0700 (PDT) Date: Thu, 18 Jul 2002 12:08:07 -0700 (PDT) Message-Id: <200207181908.g6IJ87sX048753@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14438 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14438 Change 14438 by rwatson@rwatson_curry on 2002/07/18 12:07:41 Add #define's for the EA namespace and names for several policies that currently use the base externalized label storage. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.h#2 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.h#2 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.h#2 (text+ko) ==== @@ -42,6 +42,9 @@ #ifndef _SYS_SECURITY_MAC_BIBA_H #define _SYS_SECURITY_MAC_BIBA_H +#define MAC_BIBA_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM +#define MAC_BIBA_EXTATTR_NAME "mac_biba" + #define MAC_BIBA_FLAG_SINGLE 0x00000001 /* mb_single initialized */ #define MAC_BIBA_FLAG_RANGE 0x00000002 /* mb_range* initialized */ #define MAC_BIBA_FLAGS_BOTH (MAC_BIBA_FLAG_SINGLE | MAC_BIBA_FLAG_RANGE) ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.h#2 (text+ko) ==== @@ -42,6 +42,9 @@ #ifndef _SYS_SECURITY_MAC_MLS_H #define _SYS_SECURITY_MAC_MLS_H +#define MAC_MLS_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM +#define MAC_MLS_EXTATTR_NAME "mac_biba" + #define MAC_MLS_FLAG_SINGLE 0x00000001 /* mm_single initialized */ #define MAC_MLS_FLAG_RANGE 0x00000002 /* mm_range* initialized */ #define MAC_MLS_FLAGS_BOTH (MAC_MLS_FLAG_SINGLE | MAC_MLS_FLAG_RANGE) ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#4 (text+ko) ==== @@ -42,6 +42,9 @@ #ifndef _SYS_SECURITY_MAC_TE_H #define _SYS_SECURITY_MAC_TE_H +#define MAC_TE_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM +#define MAC_TE_EXTATTR_NAME "mac_mls" + #define MAC_TE_TYPE_UNINITIALIZED "uninitialized_t" #define MAC_TE_TYPE_EQUAL "equal" #define MAC_TE_TYPE_INIT "init_d" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 13:32:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B3F537B401; Thu, 18 Jul 2002 13:32:56 -0700 (PDT) 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 EEA7C37B400 for ; Thu, 18 Jul 2002 13:32:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 974DA43E70 for ; Thu, 18 Jul 2002 13:32:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6IKWtJU063848 for ; Thu, 18 Jul 2002 13:32:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6IKWt7k063845 for perforce@freebsd.org; Thu, 18 Jul 2002 13:32:55 -0700 (PDT) Date: Thu, 18 Jul 2002 13:32:55 -0700 (PDT) Message-Id: <200207182032.g6IKWt7k063845@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14441 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14441 Change 14441 by rwatson@rwatson_paprika on 2002/07/18 13:32:39 Simple KDE tool for managing mac_bsdextended policies. Will seperately commit libugidfw. Affected files ... .. //depot/projects/trustedbsd/misc/kugidfw/Makefile#1 add .. //depot/projects/trustedbsd/misc/kugidfw/kugidfw.cc#1 add .. //depot/projects/trustedbsd/misc/kugidfw/kugidfw.h#1 add .. //depot/projects/trustedbsd/misc/kugidfw/main.cc#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 13:34: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04BE537B401; Thu, 18 Jul 2002 13:33:58 -0700 (PDT) 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 B49A537B400 for ; Thu, 18 Jul 2002 13:33:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F31A43E88 for ; Thu, 18 Jul 2002 13:33:57 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6IKXvJU064047 for ; Thu, 18 Jul 2002 13:33:57 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6IKXvWr064044 for perforce@freebsd.org; Thu, 18 Jul 2002 13:33:57 -0700 (PDT) Date: Thu, 18 Jul 2002 13:33:57 -0700 (PDT) Message-Id: <200207182033.g6IKXvWr064044@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14442 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14442 Change 14442 by rwatson@rwatson_paprika on 2002/07/18 13:33:06 Simple KDE process viewer, for use with KDE-based MAC demos involving process visibility. Affected files ... .. //depot/projects/trustedbsd/misc/kprocess/Makefile#1 add .. //depot/projects/trustedbsd/misc/kprocess/kprocess.cc#1 add .. //depot/projects/trustedbsd/misc/kprocess/kprocess.h#1 add .. //depot/projects/trustedbsd/misc/kprocess/main.cc#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 13:35: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0426037B401; Thu, 18 Jul 2002 13:35:00 -0700 (PDT) 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 9275C37B400 for ; Thu, 18 Jul 2002 13:34:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31E1443E86 for ; Thu, 18 Jul 2002 13:34:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6IKYxJU064081 for ; Thu, 18 Jul 2002 13:34:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6IKYwi3064078 for perforce@freebsd.org; Thu, 18 Jul 2002 13:34:59 -0700 (PDT) Date: Thu, 18 Jul 2002 13:34:59 -0700 (PDT) Message-Id: <200207182034.g6IKYwi3064078@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14443 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14443 Change 14443 by rwatson@rwatson_paprika on 2002/07/18 13:34:37 Put in a missing license. Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/konqueror.h#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmacmanager/konqueror.h#2 (text+ko) ==== @@ -1,3 +1,39 @@ +/*- + * Copyright (c) 2002 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by NAI Labs, the + * Security Research Division of Network Associates, Inc. under + * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA + * CHATS research program. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. + * + * $FreeBSD$ + */ + #ifndef _KONQUEROR_H #define _KONQUEROR_H To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 13:36: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E368637B401; Thu, 18 Jul 2002 13:36:01 -0700 (PDT) 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 86BA137B400 for ; Thu, 18 Jul 2002 13:36:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2EE2743E4A for ; Thu, 18 Jul 2002 13:36:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6IKa1JU064292 for ; Thu, 18 Jul 2002 13:36:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6IKa1mO064289 for perforce@freebsd.org; Thu, 18 Jul 2002 13:36:01 -0700 (PDT) Date: Thu, 18 Jul 2002 13:36:01 -0700 (PDT) Message-Id: <200207182036.g6IKa1mO064289@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14444 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14444 Change 14444 by rwatson@rwatson_paprika on 2002/07/18 13:35:08 Did that. Affected files ... .. //depot/projects/trustedbsd/misc/kmacmanager/TODO#3 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmacmanager/TODO#3 (text+ko) ==== @@ -5,4 +5,4 @@ refresh only one sysctl entry on sysctl change, not all -reload konquerors at the right moments +#reload konquerors at the right moments To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 13:47:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C66137B401; Thu, 18 Jul 2002 13:47:16 -0700 (PDT) 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 B2A1D37B400 for ; Thu, 18 Jul 2002 13:47:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39CC543E6A for ; Thu, 18 Jul 2002 13:47:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6IKlFJU065227 for ; Thu, 18 Jul 2002 13:47:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6IKlFwN065224 for perforce@freebsd.org; Thu, 18 Jul 2002 13:47:15 -0700 (PDT) Date: Thu, 18 Jul 2002 13:47:15 -0700 (PDT) Message-Id: <200207182047.g6IKlFwN065224@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14445 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14445 Change 14445 by rwatson@rwatson_paprika on 2002/07/18 13:46:22 Support library for mac_bsdextended userland utilities. Supports rule retrieval, setting, deletion, parsing, and conversion to strings. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libugidfw/Makefile#1 add .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#1 add .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 13:48:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A0E837B401; Thu, 18 Jul 2002 13:48:17 -0700 (PDT) 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 53D1B37B400 for ; Thu, 18 Jul 2002 13:48:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12FAD43E31 for ; Thu, 18 Jul 2002 13:48:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6IKmGJU065346 for ; Thu, 18 Jul 2002 13:48:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6IKmGIe065343 for perforce@freebsd.org; Thu, 18 Jul 2002 13:48:16 -0700 (PDT) Date: Thu, 18 Jul 2002 13:48:16 -0700 (PDT) Message-Id: <200207182048.g6IKmGIe065343@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14446 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14446 Change 14446 by rwatson@rwatson_paprika on 2002/07/18 13:47:43 Hook up libugidfw to the build. Affected files ... .. //depot/projects/trustedbsd/mac/lib/Makefile#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/Makefile#6 (text+ko) ==== @@ -29,7 +29,8 @@ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ - libstand ${_libtelnet} libusbhid ${_libvgl} libwrap libxpg4 liby libz + libstand ${_libtelnet} libugidfw libusbhid ${_libvgl} libwrap \ + libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT}) _csu=csu/${MACHINE_ARCH}-${OBJFORMAT} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 13:50:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE70F37B401; Thu, 18 Jul 2002 13:50:20 -0700 (PDT) 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 70C3937B400 for ; Thu, 18 Jul 2002 13:50:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F85E43E42 for ; Thu, 18 Jul 2002 13:50:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6IKoKJU065754 for ; Thu, 18 Jul 2002 13:50:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6IKoJCt065748 for perforce@freebsd.org; Thu, 18 Jul 2002 13:50:19 -0700 (PDT) Date: Thu, 18 Jul 2002 13:50:19 -0700 (PDT) Message-Id: <200207182050.g6IKoJCt065748@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14447 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14447 Change 14447 by rwatson@rwatson_paprika on 2002/07/18 13:49:49 use -lugidfw instead of pointing it at my locally built version, since it's now in the tree. Affected files ... .. //depot/projects/trustedbsd/misc/kugidfw/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/kugidfw/Makefile#2 (text+ko) ==== @@ -36,7 +36,7 @@ QTLIB=-L/usr/X11R6/lib -lqt-mt -pthread MOC=/usr/X11R6/bin/moc CFLAGS=-Wall ${KDEINC} ${QTINC} -g -LDFLAGS=-lkvm ${KDELIB} ${QTLIB} /home/rwatson/libugidfw/ugidfw.o +LDFLAGS=-lkvm ${KDELIB} ${QTLIB} -lugidfw all: kugidfw To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 14:12:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF5D537B401; Thu, 18 Jul 2002 14:12:48 -0700 (PDT) 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 6ABFF37B400 for ; Thu, 18 Jul 2002 14:12:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 28FEF43E31 for ; Thu, 18 Jul 2002 14:12:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6ILCmJU072238 for ; Thu, 18 Jul 2002 14:12:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6ILClda072235 for perforce@freebsd.org; Thu, 18 Jul 2002 14:12:47 -0700 (PDT) Date: Thu, 18 Jul 2002 14:12:47 -0700 (PDT) Message-Id: <200207182112.g6ILClda072235@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14449 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14449 Change 14449 by rwatson@rwatson_paprika on 2002/07/18 14:12:00 Slightly more supportive error dialog if kugidfw is unable to load the current rule set from the kernel. Affected files ... .. //depot/projects/trustedbsd/misc/kugidfw/kugidfw.cc#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/kugidfw/kugidfw.cc#2 (text+ko) ==== @@ -264,7 +264,9 @@ rule_slots = bsde_get_rule_slots(BUFSIZ, errstr); if (rule_slots == -1) { - QMessageBox::information(this, "", ""); + QMessageBox::information(this, "Unable to load rules", + "Unable to load the current ruleset. " + "Perhaps mac_bsdextended.ko is not loaded?"); return; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 18 19: 1:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2502637B401; Thu, 18 Jul 2002 19:01:43 -0700 (PDT) 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 A46EC37B400 for ; Thu, 18 Jul 2002 19:01:42 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C54943E4A for ; Thu, 18 Jul 2002 19:01:42 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6J21gJU016062 for ; Thu, 18 Jul 2002 19:01:42 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6J21fJi016059 for perforce@freebsd.org; Thu, 18 Jul 2002 19:01:41 -0700 (PDT) Date: Thu, 18 Jul 2002 19:01:41 -0700 (PDT) Message-Id: <200207190201.g6J21fJi016059@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14452 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14452 Change 14452 by rwatson@rwatson_paprika on 2002/07/18 19:01:35 Fix error return in parsing routine to allow parsing to fail properly. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#2 (text+ko) ==== @@ -549,7 +549,7 @@ free(stringdup); - return (0); + return (error); } int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 7:58:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABADE37B401; Fri, 19 Jul 2002 07:58:27 -0700 (PDT) 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 3751837B400 for ; Fri, 19 Jul 2002 07:58:27 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E797143E67 for ; Fri, 19 Jul 2002 07:58:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6JEwQJU074406 for ; Fri, 19 Jul 2002 07:58:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6JEwQmM074403 for perforce@freebsd.org; Fri, 19 Jul 2002 07:58:26 -0700 (PDT) Date: Fri, 19 Jul 2002 07:58:26 -0700 (PDT) Message-Id: <200207191458.g6JEwQmM074403@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14465 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14465 Change 14465 by rwatson@rwatson_paprika on 2002/07/19 07:58:11 Move the vnode label refresh of parent directory to the MULTILABEL-specific block of the mac_stdcreate_ea file system helper function. This should improve performance on non-MULTILABEL file systems that support extended attribute backing of MAC labels. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#170 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#170 (text+ko) ==== @@ -1062,13 +1062,13 @@ struct mac extmac; int error; - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); - if ((dvp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { mac_update_vnode_from_mount(tvp, tvp->v_mount); } else { + error = vn_refreshlabel(dvp, cred); + if (error) + return (error); + /* * Stick the label in the vnode. Then try to write to * disk. If we fail, return a failure to abort the To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 8:13:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0CF637B401; Fri, 19 Jul 2002 08:13:47 -0700 (PDT) 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 863A437B400 for ; Fri, 19 Jul 2002 08:13:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2702543E5E for ; Fri, 19 Jul 2002 08:13:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6JFDkJU080234 for ; Fri, 19 Jul 2002 08:13:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6JFDkbZ080221 for perforce@freebsd.org; Fri, 19 Jul 2002 08:13:46 -0700 (PDT) Date: Fri, 19 Jul 2002 08:13:46 -0700 (PDT) Message-Id: <200207191513.g6JFDkbZ080221@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14467 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14467 Change 14467 by rwatson@rwatson_paprika on 2002/07/19 08:13:14 New entry point 'mpo_create_extattr_from_vnode' to support the association of extended attribute backed MAC labels with a vnode on creation if the vnode is created on a generic EA-supporting file system with MAC/MULTILABEL enabled. This call provides access to the vnode, and if the entry point fails, then the creation operation will be aborted by the file system. TODO: mac_update_extattr_from_vnode() in a way that doesn't have race conditions and consistency problems. That's actually quite hard. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#171 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#171 (text+ko) ==== @@ -142,6 +142,8 @@ static int mac_policy_register(struct mac_policy_conf *mpc); static int mac_policy_unregister(struct mac_policy_conf *mpc); +static int mac_create_extattr_from_vnode(struct vnode *vp); + /* * mac_policy_list_lock protects the consistency of 'mac_policy_list', * the linked list of attached policy modules. Read-only consumers of @@ -326,6 +328,10 @@ mpc->mpc_ops.mpo_create_devfs_vnode = mpe->mpe_function; break; + case MAC_CREATE_EXTATTR_FROM_VNODE: + mpc->mpc_ops.mpo_create_extattr_from_vnode = + mpe->mpe_function; + break; case MAC_CREATE_VNODE_FROM_VNODE: mpc->mpc_ops.mpo_create_vnode_from_vnode = mpe->mpe_function; @@ -1078,10 +1084,9 @@ */ mac_create_vnode_from_vnode(cred, dvp, tvp); - /* - * XXX: Eventually call out to EA creation entry point - * here. - */ + error = mac_create_extattr_from_vnode(tvp); + if (error) + return (error); error = mac_externalize(&tvp->v_label, &extmac); if (error) @@ -2248,6 +2253,16 @@ MAC_PERFORM(create_devfs_device, dev, de, &de->de_label); } +static int +mac_create_extattr_from_vnode(struct vnode *vp) +{ + int error; + + MAC_CHECK(create_extattr_from_vnode, vp, &vp->v_label); + + return (error); +} + void mac_create_devfs_directory(char *dirname, int dirnamelen, struct devfs_dirent *de) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 8:14:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFF2737B401; Fri, 19 Jul 2002 08:14:49 -0700 (PDT) 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 4D31137B400 for ; Fri, 19 Jul 2002 08:14:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E79ED43E31 for ; Fri, 19 Jul 2002 08:14:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6JFEmJU080274 for ; Fri, 19 Jul 2002 08:14:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6JFEml9080271 for perforce@freebsd.org; Fri, 19 Jul 2002 08:14:48 -0700 (PDT) Date: Fri, 19 Jul 2002 08:14:48 -0700 (PDT) Message-Id: <200207191514.g6JFEml9080271@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14468 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14468 Change 14468 by rwatson@rwatson_paprika on 2002/07/19 08:14:26 Correct a typo in an earlier submission. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#172 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#172 (text+ko) ==== @@ -2397,7 +2397,7 @@ return (EBADF); } - if ((vp->v_mount->mnt_label & MNT_MULTILABEL) == 0) + if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) return (EOPNOTSUPP); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 10: 8:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B4F837B405; Fri, 19 Jul 2002 10:08:08 -0700 (PDT) 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 B52C437B400 for ; Fri, 19 Jul 2002 10:08:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04DD343E42 for ; Fri, 19 Jul 2002 10:08:07 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6JH86JU000106 for ; Fri, 19 Jul 2002 10:08:06 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6JH86ov099986 for perforce@freebsd.org; Fri, 19 Jul 2002 10:08:06 -0700 (PDT) Date: Fri, 19 Jul 2002 10:08:06 -0700 (PDT) Message-Id: <200207191708.g6JH86ov099986@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14471 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14471 Change 14471 by green@green_laptop_2 on 2002/07/19 10:08:03 Start documenting more about the MAC operations (information for system programmers regarding code flow and coverage.) Affected files ... .. //depot/projects/trustedbsd/mac/share/man/man9/mac.9#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/share/man/man9/mac.9#4 (text+ko) ==== @@ -133,6 +133,205 @@ framework, and modifying appropriate modules to take advantage of the new entry points so that they may consistently enforce their policies. +.Sh ENTRY POINTS +.Ss Authorizational +.Bl -tag +.It Ft int Fn mac_bpfdesc_check_receive_from_ifnet "struct bpf_d *bpf_d" "struct ifnet *ifnet" +Called in +.Xr bpf_tap 9 +before allowing +.Xr catchpacket 9 . +(Not called in +.Xr bpf_mtap 9 +before allowing +.Xr catchpacket 9 ?) +.It Ft int Fn mac_cred_check_access_vnode "struct ucred *cred" "struct vnode *vp" "int flags" +Called in +.Xr vn_access 9 +before checking +.Xr VOP_ACCESS 9 . +.It Ft int Fn mac_cred_check_bind_socket "struct ucred *cred" "struct socket *so" "struct sockaddr *sa" +Called in +.Xr bind 9 +before allowing +.Xr sobind 9 . +.It Ft int Fn mac_cred_check_chdir_vnode "struct ucred *cred" "struct vnode *dvp" +Called in +.Xr chdir 9 +via +.Xr change_dir 9 +and in +.Xr fchdir 9 . +.It Ft int Fn mac_cred_check_connect_socket "struct ucred *cred" "struct socket *so" "struct sockaddr *sa" +Called in +.Xr connect 9 +before allowing +.Xr soconnect 9 . +.It Ft int Fn mac_cred_check_create_vnode "struct ucred *cred" "struct vnode *dvp" "struct vattr *vap" +Called in +.Xr unp_bind 9 +before +.Xr VOP_CREATE 9 , +.Xr symlink 9 +before +.Xr VOP_SYMLINK 9 , +.Xr vn_mkdir 9 +before +.Xr VOP_MKDIR 9 , +.Xr vn_open_cred 9 +before +.Xr VOP_CREATE 9 , +and in +.Xr mknod 9 +and +.Xr mkfifo 9 +before +.Xr VOP_MKNOD 9 . +.It Ft int Fn mac_cred_check_deleteacl_vnode "struct ucred *cred" "struct vnode *vp" "acl_type_t type" +Called by +.Xr vacl_delete 9 +before +.Xr VOP_SETACL 9 . +.It Ft int Fn mac_cred_check_getacl_vnode "struct ucred *cred" "struct vnode *vp" "acl_type_t type" +Called by +.Xr vacl_get_acl 9 +before +.Xr VOP_GETACL 9 . +.It Ft int Fn mac_cred_check_getextattr_vnode "struct ucred *cred" "struct vnode *vp" "int attrnamespace" "const char *name" "struct uio *uio" +Called in +.Xr extattr_get_vp 9 +before calling +.Xr VOP_GETEXTATTR 9 . +.It Ft int Fn mac_cred_check_listen_socket "struct ucred *cred" "struct socket *socket" +Called in +.Xr listen 9 +before calling +.Xr solisten 9 . +.It Ft int Fn mac_cred_check_search_vnode "struct ucred *cred" "struct vnode *dvp" +Called in +.Xr getdents_common 9 , +.Xr linux_getcwd_scandir 9 , +.Xr svr4_sys_getdents64 9 , +.Xr svr4_sys_getdents 9 , +.Xr ibcs2_getdents 9 , +.Xr ibcs2_read 9 , +.Xr ogetdirentries 9 +and +.Xr getdirentries 9 +before calling +.Xr VOP_READDIR 9 . +Called in +.Xr lookup 9 +before calling +.Xr VOP_LOOKUP 9 . +.It Ft int Fn mac_cred_check_setacl_vnode "struct ucred *cred" "struct vnode *vp" "acl_type_t type" "struct acl *acl" +Called in +.Xr vacl_set_acl 9 +before calling +.Xr VOP_SETACL 9 . +.It Ft int Fn mac_cred_check_setextattr_vnode "struct ucred *cred" "struct vnode *vp" "int attrnamespace" "const char *name" "struct uio *uio" +Called in +.Xr extattr_set_vp 9 +and +.Xr extattr_delete_vp 9 +before calling +.Xr VOP_SETEXTATTR 9 . +.It Ft int Fn mac_cred_check_setflags_vnode "struct ucred *cred" "struct vnode *vp" "u_long flags" +Called in +.Xr setfflags 9 +before calling +.Xr VOP_SETATTR 9 . +.It Ft int Fn mac_cred_check_setmode_vnode "struct ucred *cred" "struct vnode *vp" "mode_t mode" +Called in +.Xr setfmode 9 +before calling +.Xr VOP_SETATTR 9 . +.It Ft int Fn mac_cred_check_setowner_vnode "struct ucred *cred" "struct vnode *vp" "uid_t uid" "gid_t gid" +Called in +.Xr setfown 9 +before calling +.Xr VOP_SETATTR 9 . +.It Ft int Fn mac_cred_check_setutimes_vnode "struct ucred *cred" "struct vnode *vp" "struct timespec atime" "struct timespec ctime" +Called in +.Xr setfown 9 +before calling +.Xr VOP_SETATTR 9 . +.It Ft int Fn mac_cred_check_stat_vnode "struct ucred *cred" "struct vnode *vp" +Called in +.Xr vn_stat 9 +before calling +.Xr VOP_GETATTR 9 . +.It Ft int Fn mac_cred_check_delete_vnode "struct ucred *cred" "struct vnode *dvp" "struct vnode *vp" +Called in the last component of +.Xr namei 9 +for all DELETE operations. +.It Ft int Fn mac_cred_check_rename_from_vnode "struct ucred *cred" "struct vnode *dvp" "struct vnode *vp" +Called in +.Xr rename 9 +after the +.Xr namei 9 +DELETE operation. +.It Ft int Fn mac_cred_check_rename_to_vnode "struct ucred *cred" "struct vnode *dvp" "struct vnode *vp" "int samedir" +Called in +.Xr rename 9 +after the +.Xr namei 9 +RENAME operation and before the +.Xr VOP_RENAME 9 . +.It Ft int Fn mac_cred_check_open_vnode "struct ucred *cred" "struct vnode *vp" "mode_t acc_mode" +Called by +.Xr fcntl 9 +in the F_SETFL case before allowing flags to be changed, by +.Xr truncate 9 +to mediate access to +.Xr VOP_SETATTR 9 +and +.Xr vn_open_cred 9 +when handling a non-O_CREAT vnode. +.It Ft int Fn mac_cred_check_revoke_vnode "struct ucred *cred" "struct vnode *vp" +Called by +.Xr revoke 9 +to mediate access to +.Xr VOP_REVOKE 9 . +.It Ft int Fn mac_cred_check_statfs "struct ucred *cred" "struct mount *mp" +Called by +.Xr osf1_statfs 9 , +.Xr osf1_fstatfs 9 , +.Xr osf1_getfsstat 9 , +.Xr linux_statfs 9 , +.Xr linux_fstatfs 9 , +.Xr linux_ustat 9 , +.Xr statfs 9 , +.Xr fstatfs 9 , +.Xr getfsstat 9 +and +.Xr fhstatfs 9 +before calling +.Xr VFS_STATFS 9 . +.El +.Ss Label-based +.Bl -tag +.It Ft int Fn mac_getsockopt_label_get "struct ucred *cred" "struct socket *so" "struct mac *extmac" +Called by +.Xr sogetopt 9 +in the SO_LABEL case. +.It Ft int Fn mac_getsockopt_peerlabel_get "struct ucred *cred" "struct socket *so" "struct mac *extmac" +Called by +.Xr sogetopt 9 +in the SO_PEERLABEL case. +.It Ft int Fn mac_getsockopt_label_set "struct ucred *cred" "struct socket *so" "struct mac *extmac" +Called by +.Xr sosetopt 9 +in the SO_LABEL case. +.It Ft int Fn mac_ioctl_ifnet_get "struct ucred *cred" "struct ifreq *ifr" "struct ifnet *ifnet" +Called by +.Xr ifhwioctl 9 +in the SIOCGIFMAC case. +.It Ft int Fn mac_ioctl_ifnet_set "struct ucred *cred" "struct ifreq *ifr" "struct ifnet *ifnet" +Called by +.Xr ifhwioctl 9 +in the SIOCSIFMAC case. +.El .Pp .Sh SEE ALSO .Xr acl 3 , To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 12:14:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B394637B401; Fri, 19 Jul 2002 12:14:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id CED9F37B400; Fri, 19 Jul 2002 12:14:46 -0700 (PDT) Received: from localhost (green@localhost) by green.bikeshed.org (8.11.6/8.11.6) with ESMTP id g6JJEkN15272; Fri, 19 Jul 2002 15:14:46 -0400 (EDT) (envelope-from green@green.bikeshed.org) Message-Id: <200207191914.g6JJEkN15272@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 14467 for review In-Reply-To: Your message of "Fri, 19 Jul 2002 08:13:46 PDT." <200207191513.g6JFDkbZ080221@freefall.freebsd.org> From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 19 Jul 2002 15:14:46 -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14467 > > Change 14467 by rwatson@rwatson_paprika on 2002/07/19 08:13:14 > > New entry point 'mpo_create_extattr_from_vnode' to support > the association of extended attribute backed MAC labels with a > vnode on creation if the vnode is created on a generic > EA-supporting file system with MAC/MULTILABEL enabled. This > call provides access to the vnode, and if the entry point fails, > then the creation operation will be aborted by the file system. > > TODO: mac_update_extattr_from_vnode() in a way that doesn't > have race conditions and consistency problems. That's actually > quite hard. Err... I don't like this name. It goes against the current convention (which is de facto, I admit), so I think if we're running out of proper ways to classify these operations into higher level sets we should discuss extending the convention and renaming to support that. If you want to start merging it into the main tree I think it would probably be a good idea if we discussed the naming before that, you know? I don't think this fits in any of the current sets of operations, just like mac_externalize() et al :) -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 12:19:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F084B37B401; Fri, 19 Jul 2002 12:19:10 -0700 (PDT) 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 92EDC37B400; Fri, 19 Jul 2002 12:19:10 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79E9443E5E; Fri, 19 Jul 2002 12:19:09 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g6JJJ2Oo026242; Fri, 19 Jul 2002 15:19:03 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Fri, 19 Jul 2002 15:19:02 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: "Brian F. Feldman" Cc: Perforce Change Reviews Subject: Re: PERFORCE change 14467 for review In-Reply-To: <200207191914.g6JJEkN15272@green.bikeshed.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 19 Jul 2002, Brian F. Feldman wrote: > Robert Watson wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14467 > > > > Change 14467 by rwatson@rwatson_paprika on 2002/07/19 08:13:14 > > > > New entry point 'mpo_create_extattr_from_vnode' to support > > the association of extended attribute backed MAC labels with a > > vnode on creation if the vnode is created on a generic > > EA-supporting file system with MAC/MULTILABEL enabled. This > > call provides access to the vnode, and if the entry point fails, > > then the creation operation will be aborted by the file system. > > > > TODO: mac_update_extattr_from_vnode() in a way that doesn't > > have race conditions and consistency problems. That's actually > > quite hard. > > Err... I don't like this name. It goes against the current convention > (which is de facto, I admit), so I think if we're running out of proper > ways to classify these operations into higher level sets we should > discuss extending the convention and renaming to support that. If you > want to start merging it into the main tree I think it would probably be > a good idea if we discussed the naming before that, you know? I don't > think this fits in any of the current sets of operations, just like > mac_externalize() et al :) Yeah, I agree, and had the same concerns, but figured we could rename it once we figured out what the other related calls would be called. I'm actually tempted to name these based on the fact that they have to do with the _std_foo_ea calls. I.e., make them be named mpo_stdcreate_ea(), mpo_stdupdate_ea(), etc. Thoughts? Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 15:14:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FE0B37B405; Fri, 19 Jul 2002 15:14:24 -0700 (PDT) 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 9D48237B400 for ; Fri, 19 Jul 2002 15:14:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DC4743E4A for ; Fri, 19 Jul 2002 15:14:23 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6JMENJU056405 for ; Fri, 19 Jul 2002 15:14:23 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6JMEN0o056402 for perforce@freebsd.org; Fri, 19 Jul 2002 15:14:23 -0700 (PDT) Date: Fri, 19 Jul 2002 15:14:23 -0700 (PDT) Message-Id: <200207192214.g6JMEN0o056402@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 14482 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14482 Change 14482 by amigus@amigus_ganymede on 2002/07/19 15:13:41 Oops, forgot these... Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#70 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#70 (text+ko) ==== @@ -119,6 +119,8 @@ void (*mpo_create_root_mount)(struct ucred *cred, struct mount *mp, struct label *mountlabel, struct label *fslabel); + int (*mpo_create_extattr_from_vnode)(struct vnode *vp, + struct label *vnodelabel); void (*mpo_relabel_vnode)(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label); void (*mpo_update_devfsdirent_from_vnode)( @@ -344,6 +346,7 @@ MAC_CREATE_VNODE_FROM_VNODE, MAC_CREATE_MOUNT, MAC_CREATE_ROOT_MOUNT, + MAC_CREATE_EXTATTR_FROM_VNODE, MAC_RELABEL_VNODE, MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, MAC_UPDATE_PROCFSVNODE_FROM_SUBJECT, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 16:49:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7671937B405; Fri, 19 Jul 2002 16:48:15 -0700 (PDT) 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 03BA137B401 for ; Fri, 19 Jul 2002 16:48:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C719043E5E for ; Fri, 19 Jul 2002 16:48:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6JNldJU069965 for ; Fri, 19 Jul 2002 16:47:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6JNla0v069962 for perforce@freebsd.org; Fri, 19 Jul 2002 16:47:36 -0700 (PDT) Date: Fri, 19 Jul 2002 16:47:36 -0700 (PDT) Message-Id: <200207192347.g6JNla0v069962@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14486 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14486 Change 14486 by peter@peter_daintree on 2002/07/19 16:47:21 IFC @14485 Affected files ... .. //depot/projects/ia64/MAINTAINERS#13 integrate .. //depot/projects/ia64/bin/sh/cd.c#6 integrate .. //depot/projects/ia64/bin/sh/error.c#6 integrate .. //depot/projects/ia64/bin/sh/error.h#3 integrate .. //depot/projects/ia64/bin/sh/exec.c#6 integrate .. //depot/projects/ia64/bin/sh/jobs.c#9 integrate .. //depot/projects/ia64/bin/sh/jobs.h#4 integrate .. //depot/projects/ia64/bin/sh/redir.c#5 integrate .. //depot/projects/ia64/bin/sh/shell.h#3 integrate .. //depot/projects/ia64/bin/sh/trap.c#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-common#4 integrate .. //depot/projects/ia64/etc/Makefile#14 integrate .. //depot/projects/ia64/etc/defaults/pccard.conf#10 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#14 integrate .. //depot/projects/ia64/etc/isdn/Makefile#2 integrate .. //depot/projects/ia64/etc/mail/Makefile#10 integrate .. //depot/projects/ia64/etc/periodic/Makefile.inc#2 integrate .. //depot/projects/ia64/etc/periodic/daily/Makefile#2 integrate .. //depot/projects/ia64/etc/periodic/monthly/Makefile#2 integrate .. //depot/projects/ia64/etc/periodic/security/Makefile#2 integrate .. //depot/projects/ia64/etc/periodic/weekly/Makefile#2 integrate .. //depot/projects/ia64/etc/rc.network6#6 integrate .. //depot/projects/ia64/etc/sendmail/Makefile#8 integrate .. //depot/projects/ia64/games/battlestar/Makefile#2 integrate .. //depot/projects/ia64/games/canfield/canfield/Makefile#2 integrate .. //depot/projects/ia64/games/cribbage/Makefile#3 integrate .. //depot/projects/ia64/games/hack/Makefile#3 integrate .. //depot/projects/ia64/games/larn/Makefile#3 integrate .. //depot/projects/ia64/games/robots/Makefile#2 integrate .. //depot/projects/ia64/games/rogue/Makefile#2 integrate .. //depot/projects/ia64/games/sail/Makefile#2 integrate .. //depot/projects/ia64/games/snake/snake/Makefile#2 integrate .. //depot/projects/ia64/gnu/lib/libdialog/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/contrib/mm/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/font/Makefile.dev#2 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/utils/indxbib/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#8 integrate .. //depot/projects/ia64/gnu/usr.bin/rcs/rcsfreeze/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/Makefile#2 integrate .. //depot/projects/ia64/kerberosIV/share/info/Makefile#2 integrate .. //depot/projects/ia64/lib/libalias/alias_db.c#5 integrate .. //depot/projects/ia64/lib/libncurses/Makefile#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#34 integrate .. //depot/projects/ia64/sbin/mount_msdosfs/Makefile#4 integrate .. //depot/projects/ia64/share/colldef/Makefile#7 integrate .. //depot/projects/ia64/share/examples/Makefile#4 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#15 integrate .. //depot/projects/ia64/share/examples/isdn/i4brunppp/Makefile#2 integrate .. //depot/projects/ia64/share/info/Makefile#3 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#15 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#15 integrate .. //depot/projects/ia64/share/sendmail/Makefile#2 integrate .. //depot/projects/ia64/share/skel/Makefile#2 integrate .. //depot/projects/ia64/share/syscons/fonts/Makefile#3 integrate .. //depot/projects/ia64/share/syscons/keymaps/Makefile#4 integrate .. //depot/projects/ia64/share/zoneinfo/Makefile#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#12 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/elf_freebsd.c#4 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_disk.c#4 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/openfirm.c#3 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/openfirm.h#3 integrate .. //depot/projects/ia64/sys/boot/pc98/Makefile#3 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#15 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#14 integrate .. //depot/projects/ia64/sys/dev/ata/ata-dma.c#15 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#14 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#21 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/ia64/sys/i386/include/atomic.h#5 integrate .. //depot/projects/ia64/sys/i386/include/cputypes.h#2 integrate .. //depot/projects/ia64/sys/i386/include/md_var.h#6 integrate .. //depot/projects/ia64/sys/i386/pci/pci_bus.c#5 integrate .. //depot/projects/ia64/sys/kern/subr_eventhandler.c#4 integrate .. //depot/projects/ia64/sys/kern/tty.c#16 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#17 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#15 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.h#4 integrate .. //depot/projects/ia64/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/ia64/sys/netinet6/esp_input.c#5 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#19 integrate .. //depot/projects/ia64/sys/pccard/pcic.c#9 integrate .. //depot/projects/ia64/sys/pccard/pcic_pci.c#9 integrate .. //depot/projects/ia64/sys/pci/uhci_pci.c#5 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#13 integrate .. //depot/projects/ia64/sys/sys/buf.h#10 integrate .. //depot/projects/ia64/sys/sys/vnode.h#14 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_alloc.c#10 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_balloc.c#5 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_extern.h#7 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_inode.c#7 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#12 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep_stub.c#5 integrate .. //depot/projects/ia64/sys/ufs/ffs/softdep.h#4 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_bmap.c#6 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extern.h#9 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_inode.c#6 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_lookup.c#6 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_readwrite.c#10 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#14 integrate .. //depot/projects/ia64/sys/vm/uma.h#8 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#27 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#13 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#8 integrate .. //depot/projects/ia64/sys/vm/vm_pageq.c#5 integrate .. //depot/projects/ia64/sys/vm/vm_zeroidle.c#5 integrate .. //depot/projects/ia64/tools/tools/kernxref/kernxref.sh#3 integrate .. //depot/projects/ia64/usr.bin/calendar/Makefile#8 integrate .. //depot/projects/ia64/usr.bin/doscmd/cmos.c#3 integrate .. //depot/projects/ia64/usr.bin/doscmd/cwd.c#6 integrate .. //depot/projects/ia64/usr.bin/doscmd/cwd.h#3 integrate .. //depot/projects/ia64/usr.bin/doscmd/dispatch.h#2 integrate .. //depot/projects/ia64/usr.bin/doscmd/dos.h#3 integrate .. //depot/projects/ia64/usr.bin/doscmd/int13.c#4 integrate .. //depot/projects/ia64/usr.bin/doscmd/int1a.c#3 integrate .. //depot/projects/ia64/usr.bin/doscmd/port.c#4 integrate .. //depot/projects/ia64/usr.bin/doscmd/register.h#2 integrate .. //depot/projects/ia64/usr.bin/doscmd/trace.c#4 integrate .. //depot/projects/ia64/usr.bin/hexdump/display.c#8 integrate .. //depot/projects/ia64/usr.bin/locate/locate/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/mail/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/netstat/inet.c#3 integrate .. //depot/projects/ia64/usr.bin/sed/process.c#10 integrate .. //depot/projects/ia64/usr.bin/tip/tip/tip.1#4 integrate .. //depot/projects/ia64/usr.bin/truss/alpha-fbsd.c#3 integrate .. //depot/projects/ia64/usr.bin/truss/i386-fbsd.c#2 integrate .. //depot/projects/ia64/usr.bin/truss/i386-linux.c#4 integrate .. //depot/projects/ia64/usr.bin/truss/main.c#5 integrate .. //depot/projects/ia64/usr.bin/vi/Makefile#5 integrate .. //depot/projects/ia64/usr.bin/xlint/common/lint.h#2 integrate .. //depot/projects/ia64/usr.bin/xlint/common/param.h#2 integrate .. //depot/projects/ia64/usr.bin/xlint/lint1/err.c#3 integrate .. //depot/projects/ia64/usr.bin/xlint/lint1/mem1.c#3 integrate .. //depot/projects/ia64/usr.bin/xlint/xlint/lint.1#5 integrate .. //depot/projects/ia64/usr.bin/xlint/xlint/xlint.c#9 integrate .. //depot/projects/ia64/usr.sbin/kldxref/ef.c#8 integrate .. //depot/projects/ia64/usr.sbin/mountd/exports.5#2 integrate .. //depot/projects/ia64/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/ia64/usr.sbin/pcvt/keycap/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/tcp.c#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/udp.c#5 integrate .. //depot/projects/ia64/usr.sbin/rpc.yppasswdd/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/ypserv/Makefile#3 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#13 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.45 2002/07/10 14:51:48 joerg Exp $ +$FreeBSD: src/MAINTAINERS,v 1.46 2002/07/18 12:12:15 ru Exp $ subsystem login notes ----------------------------- @@ -65,6 +65,8 @@ nvi peter Try not to break it. libz peter Try not to break it. pppd/chat peter Try not to break it. +groff ru Recommends pre-commit review. +natd(8) ru Recommends pre-commit review. share/mk ru Recommends pre-commit review. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org xten imp Looking after it, don't remove, don't break it. ==== //depot/projects/ia64/bin/sh/cd.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.27 2002/06/30 05:15:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.28 2002/07/19 08:09:04 tjr Exp $"); #include #include @@ -369,20 +369,6 @@ if (curdir) return curdir; - /* - * Things are a bit complicated here; we could have just used - * getcwd, but traditionally getcwd is implemented using popen - * to /bin/pwd. This creates a problem for us, since we cannot - * keep track of the job if it is being ran behind our backs. - * So we re-implement getcwd(), and we suppress interrupts - * throughout the process. This is not completely safe, since - * the user can still break out of it by killing the pwd program. - * We still try to use getcwd for systems that we know have a - * c implementation of getcwd, that does not open a pipe to - * /bin/pwd. - */ -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__SVR4) - if (getcwd(buf, sizeof(buf)) == NULL) { char *pwd = getenv("PWD"); struct stat stdot, stpwd; @@ -397,47 +383,6 @@ return NULL; } curdir = savestr(buf); -#else - { - char *p; - int i; - int status; - struct job *jp; - int pip[2]; - INTOFF; - if (pipe(pip) < 0) - error("Pipe call failed: %s", strerror(errno)); - jp = makejob((union node *)NULL, 1); - if (forkshell(jp, (union node *)NULL, FORK_NOJOB) == 0) { - (void) close(pip[0]); - if (pip[1] != 1) { - close(1); - copyfd(pip[1], 1); - close(pip[1]); - } - (void) execl("/bin/pwd", "pwd", (char *)0); - error("Cannot exec /bin/pwd"); - } - (void) close(pip[1]); - pip[1] = -1; - p = buf; - while ((i = read(pip[0], p, buf + MAXPWD - p)) > 0 - || (i == -1 && errno == EINTR)) { - if (i > 0) - p += i; - } - (void) close(pip[0]); - pip[0] = -1; - status = waitforjob(jp); - if (status != 0) - error((char *)0); - if (i < 0 || p == buf || p[-1] != '\n') - error("pwd command failed"); - p[-1] = '\0'; - } - curdir = savestr(buf); - INTON; -#endif return curdir; } ==== //depot/projects/ia64/bin/sh/error.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.21 2002/06/30 05:15:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.22 2002/07/19 08:09:04 tjr Exp $"); /* * Errors and exceptions. @@ -221,9 +221,6 @@ { ENXIO, ALL, "no such device or address" }, { EROFS, ALL, "read-only filesystem" }, { ETXTBSY, ALL, "text busy" }, -#ifdef SYSV - { EAGAIN, E_EXEC, "not enough memory" }, -#endif { ENOMEM, ALL, "not enough memory" }, #ifdef ENOLINK { ENOLINK, ALL, "remote access failed" }, ==== //depot/projects/ia64/bin/sh/error.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)error.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/error.h,v 1.14 2002/02/02 06:50:46 imp Exp $ + * $FreeBSD: src/bin/sh/error.h,v 1.15 2002/07/19 08:09:04 tjr Exp $ */ /* @@ -101,7 +101,5 @@ * so we use _setjmp instead. */ -#ifdef BSD #define setjmp(jmploc) _setjmp(jmploc) #define longjmp(jmploc, val) _longjmp(jmploc, val) -#endif ==== //depot/projects/ia64/bin/sh/exec.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.19 2002/06/30 05:15:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.20 2002/07/19 08:09:04 tjr Exp $"); #include #include @@ -100,9 +100,6 @@ STATIC void tryexec(char *, char **, char **); -#ifndef BSD -STATIC void execinterp(char **, char **); -#endif STATIC void printentry(struct tblentry *, int); STATIC struct tblentry *cmdlookup(char *, int); STATIC void delete_cmd_entry(void); @@ -155,30 +152,13 @@ tryexec(char *cmd, char **argv, char **envp) { int e; -#ifndef BSD - char *p; -#endif -#ifdef SYSV - do { - execve(cmd, argv, envp); - } while (errno == EINTR); -#else execve(cmd, argv, envp); -#endif e = errno; if (e == ENOEXEC) { initshellproc(); setinputfile(cmd, 0); commandname = arg0 = savestr(argv[0]); -#ifndef BSD - pgetc(); pungetc(); /* fill up input buffer */ - p = parsenextc; - if (parsenleft > 2 && p[0] == '#' && p[1] == '!') { - argv[0] = cmd; - execinterp(argv, envp); - } -#endif setparam(argv + 1); exraise(EXSHELLPROC); /*NOTREACHED*/ @@ -186,86 +166,7 @@ errno = e; } - -#ifndef BSD /* - * Execute an interpreter introduced by "#!", for systems where this - * feature has not been built into the kernel. If the interpreter is - * the shell, return (effectively ignoring the "#!"). If the execution - * of the interpreter fails, exit. - * - * This code peeks inside the input buffer in order to avoid actually - * reading any input. It would benefit from a rewrite. - */ - -#define NEWARGS 5 - -STATIC void -execinterp(char **argv, char **envp) -{ - int n; - char *inp; - char *outp; - char c; - char *p; - char **ap; - char *newargs[NEWARGS]; - int i; - char **ap2; - char **new; - - n = parsenleft - 2; - inp = parsenextc + 2; - ap = newargs; - for (;;) { - while (--n >= 0 && (*inp == ' ' || *inp == '\t')) - inp++; - if (n < 0) - goto bad; - if ((c = *inp++) == '\n') - break; - if (ap == &newargs[NEWARGS]) -bad: error("Bad #! line"); - STARTSTACKSTR(outp); - do { - STPUTC(c, outp); - } while (--n >= 0 && (c = *inp++) != ' ' && c != '\t' && c != '\n'); - STPUTC('\0', outp); - n++, inp--; - *ap++ = grabstackstr(outp); - } - if (ap == newargs + 1) { /* if no args, maybe no exec is needed */ - p = newargs[0]; - for (;;) { - if (equal(p, "sh") || equal(p, "ash")) { - return; - } - while (*p != '/') { - if (*p == '\0') - goto break2; - p++; - } - p++; - } -break2:; - } - i = (char *)ap - (char *)newargs; /* size in bytes */ - if (i == 0) - error("Bad #! line"); - for (ap2 = argv ; *ap2++ != NULL ; ); - new = ckmalloc(i + ((char *)ap2 - (char *)argv)); - ap = newargs, ap2 = new; - while ((i -= sizeof (char **)) >= 0) - *ap2++ = *ap++; - ap = argv; - while (*ap2++ = *ap++); - shellexec(new, envp, pathval(), 0); -} -#endif - - - -/* * Do a path search. The variable path (passed by reference) should be * set to the start of the path before the first call; padvance will update * this value as it proceeds. Successive calls to padvance will return @@ -478,11 +379,7 @@ TRACE(("searchexec \"%s\": no change\n", name)); goto success; } - while (stat(fullname, &statb) < 0) { -#ifdef SYSV - if (errno == EINTR) - continue; -#endif + if (stat(fullname, &statb) < 0) { if (errno != ENOENT && errno != ENOTDIR) e = errno; goto loop; ==== //depot/projects/ia64/bin/sh/jobs.c#9 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.50 2002/07/11 06:42:11 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.53 2002/07/19 08:09:04 tjr Exp $"); #include #include @@ -49,12 +49,10 @@ #include #include #include -#ifdef BSD #include #include #include #include -#endif #include #include "shell.h" @@ -83,7 +81,7 @@ MKINIT pid_t backgndpid = -1; /* pid of last background process */ #if JOBS struct job *jobmru; /* most recently used job list */ -int initialpgrp; /* pgrp of shell on invocation */ +pid_t initialpgrp; /* pgrp of shell on invocation */ #endif int in_waitcmd = 0; /* are we in waitcmd()? */ int in_dowait = 0; /* are we in dowait()? */ @@ -95,11 +93,8 @@ #endif STATIC void freejob(struct job *); STATIC struct job *getjob(char *); -STATIC int dowait(int, struct job *); -#if SYSV -STATIC int onsigchild(void); -#endif -STATIC int waitproc(int, int *); +STATIC pid_t dowait(int, struct job *); +STATIC pid_t waitproc(int, int *); STATIC void cmdtxt(union node *); STATIC void cmdputs(char *); #if JOBS @@ -112,10 +107,6 @@ /* * Turn job control on and off. - * - * Note: This code assumes that the third arg to ioctl is a character - * pointer, which is true on Berkeley systems but not System V. Since - * System V doesn't have job control yet, this isn't a problem now. */ MKINIT int jobctl; @@ -196,7 +187,7 @@ fgcmd(int argc __unused, char **argv) { struct job *jp; - int pgrp; + pid_t pgrp; int status; jp = getjob(argv[1]); @@ -208,6 +199,7 @@ pgrp = jp->ps[0].pid; tcsetpgrp(ttyfd, pgrp); restartjob(jp); + jp->foreground = 1; INTOFF; status = waitforjob(jp, (int *)NULL); INTON; @@ -228,6 +220,7 @@ if (jp->state == JOBDONE) continue; restartjob(jp); + jp->foreground = 0; fmtstr(s, 64, "[%d] ", jp - jobtab + 1); out1str(s); out1str(jp->ps[0].cmd); @@ -313,7 +306,7 @@ #endif for (ps = jp->ps ; ; ps++) { /* for each process */ if (sformat) { - out1fmt("%d\n", ps->pid); + out1fmt("%d\n", (int)ps->pid); goto skip; } if (!lformat && ps != jp->ps && pid == 0) @@ -333,7 +326,7 @@ out1str(s); col = strlen(s); if (lformat) { - fmtstr(s, 64, "%d ", ps->pid); + fmtstr(s, 64, "%d ", (int)ps->pid); out1str(s); col += strlen(s); } @@ -498,7 +491,7 @@ jp = getjob(argv[1]); for (i = 0 ; i < jp->nprocs ; ) { - out1fmt("%d", jp->ps[i].pid); + out1fmt("%d", (int)jp->ps[i].pid); out1c(++i < jp->nprocs? ' ' : '\n'); } return 0; @@ -515,7 +508,7 @@ { int jobno; struct job *found, *jp; - int pid; + pid_t pid; int i; if (name == NULL) { @@ -569,7 +562,7 @@ return found; } } else if (is_number(name)) { - pid = number(name); + pid = (pid_t)number(name); for (jp = jobtab, i = njobs ; --i >= 0 ; jp++) { if (jp->used && jp->nprocs > 0 && jp->ps[jp->nprocs - 1].pid == pid) @@ -633,6 +626,7 @@ jp->used = 1; jp->changed = 0; jp->nprocs = 0; + jp->foreground = 0; #if JOBS jp->jobctl = jobctl; jp->next = NULL; @@ -723,11 +717,11 @@ * in a pipeline). */ -int +pid_t forkshell(struct job *jp, union node *n, int mode) { - int pid; - int pgrp; + pid_t pid; + pid_t pgrp; TRACE(("forkshell(%%%d, 0x%lx, %d) called\n", jp - jobtab, (long)n, mode)); @@ -743,7 +737,7 @@ int wasroot; int i; - TRACE(("Child shell %d\n", getpid())); + TRACE(("Child shell %d\n", (int)getpid())); wasroot = rootshell; rootshell = 0; for (i = njobs, p = jobtab ; --i >= 0 ; p++) @@ -813,12 +807,13 @@ ps->cmd = nullstr; if (iflag && rootshell && n) ps->cmd = commandtext(n); + jp->foreground = mode == FORK_FG; #if JOBS setcurjob(jp); #endif } INTON; - TRACE(("In parent shell: child = %d\n", pid)); + TRACE(("In parent shell: child = %d\n", (int)pid)); return pid; } @@ -847,7 +842,7 @@ waitforjob(struct job *jp, int *origstatus) { #if JOBS - int mypgrp = getpgrp(); + pid_t mypgrp = getpgrp(); #endif int status; int st; @@ -895,10 +890,10 @@ * Wait for a process to terminate. */ -STATIC int +STATIC pid_t dowait(int block, struct job *job) { - int pid; + pid_t pid; int status; struct procstat *sp; struct job *jp; @@ -906,12 +901,13 @@ int done; int stopped; int sig; + int i; in_dowait++; TRACE(("dowait(%d) called\n", block)); do { pid = waitproc(block, &status); - TRACE(("wait returns %d, status=%d\n", pid, status)); + TRACE(("wait returns %d, status=%d\n", (int)pid, status)); } while ((pid == -1 && errno == EINTR && breakwaitcmd == 0) || (WIFSTOPPED(status) && !iflag)); in_dowait--; @@ -932,7 +928,8 @@ continue; if (sp->pid == pid) { TRACE(("Changing status of proc %d from 0x%x to 0x%x\n", - pid, sp->status, status)); + (int)pid, sp->status, + status)); sp->status = status; thisjob = jp; } @@ -967,8 +964,24 @@ else sig = WTERMSIG(status); } - if (sig != 0 && sig != SIGINT && sig != SIGPIPE) - showjob(thisjob, pid, 0, 1); + if (sig != 0 && sig != SIGINT && sig != SIGPIPE) { + if (jp->foreground) { +#if JOBS + if (WIFSTOPPED(status)) + i = WSTOPSIG(status); + else +#endif + i = WTERMSIG(status); + if ((i & 0x7F) < NSIG && sys_siglist[i & 0x7F]) + out1str(sys_siglist[i & 0x7F]); + else + out1fmt("Signal %d", i & 0x7F); + if (WCOREDUMP(status)) + out1str(" (core dumped)"); + out1c('\n'); + } else + showjob(thisjob, pid, 0, 1); + } } else { TRACE(("Not printing status, rootshell=%d, job=0x%x\n", rootshell, job)); if (thisjob) @@ -983,44 +996,10 @@ * Do a wait system call. If job control is compiled in, we accept * stopped processes. If block is zero, we return a value of zero * rather than blocking. - * - * System V doesn't have a non-blocking wait system call. It does - * have a SIGCLD signal that is sent to a process when one of it's - * children dies. The obvious way to use SIGCLD would be to install - * a handler for SIGCLD which simply bumped a counter when a SIGCLD - * was received, and have waitproc bump another counter when it got - * the status of a process. Waitproc would then know that a wait - * system call would not block if the two counters were different. - * This approach doesn't work because if a process has children that - * have not been waited for, System V will send it a SIGCLD when it - * installs a signal handler for SIGCLD. What this means is that when - * a child exits, the shell will be sent SIGCLD signals continuously - * until is runs out of stack space, unless it does a wait call before - * restoring the signal handler. The code below takes advantage of - * this (mis)feature by installing a signal handler for SIGCLD and - * then checking to see whether it was called. If there are any - * children to be waited for, it will be. - * - * If neither SYSV nor BSD is defined, we don't implement nonblocking - * waits at all. In this case, the user will not be informed when - * a background process until the next time she runs a real program - * (as opposed to running a builtin command or just typing return), - * and the jobs command may give out of date information. */ - -#ifdef SYSV -STATIC sig_atomic_t gotsigchild; - -STATIC int onsigchild() { - gotsigchild = 1; -} -#endif - - -STATIC int +STATIC pid_t waitproc(int block, int *status) { -#ifdef BSD int flags; #if JOBS @@ -1031,24 +1010,6 @@ if (block == 0) flags |= WNOHANG; return wait3(status, flags, (struct rusage *)NULL); -#else -#ifdef SYSV - int (*save)(); - - if (block == 0) { - gotsigchild = 0; - save = signal(SIGCLD, onsigchild); - signal(SIGCLD, save); - if (gotsigchild == 0) - return 0; - } - return wait(status); -#else - if (block == 0) - return 0; - return wait(status); -#endif -#endif } /* ==== //depot/projects/ia64/bin/sh/jobs.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)jobs.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/jobs.h,v 1.15 2002/05/31 14:04:23 tjr Exp $ + * $FreeBSD: src/bin/sh/jobs.h,v 1.17 2002/07/18 10:22:42 tjr Exp $ */ /* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */ @@ -67,10 +67,11 @@ struct procstat ps0; /* status of process */ struct procstat *ps; /* status or processes when more than one */ short nprocs; /* number of processes */ - short pgrp; /* process group of this job */ + pid_t pgrp; /* process group of this job */ char state; /* true if job is finished */ char used; /* true if this entry is in used */ char changed; /* true if status has changed */ + char foreground; /* true if running in the foreground */ #if JOBS char jobctl; /* job running under job control */ struct job *next; /* job used after this one */ @@ -91,7 +92,7 @@ int waitcmd(int, char **); int jobidcmd(int, char **); struct job *makejob(union node *, int); -int forkshell(struct job *, union node *, int); +pid_t forkshell(struct job *, union node *, int); int waitforjob(struct job *, int *); int stoppedjobs(void); char *commandtext(union node *); ==== //depot/projects/ia64/bin/sh/redir.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.20 2002/07/09 08:55:46 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/redir.c,v 1.21 2002/07/18 12:24:35 tjr Exp $"); #include #include @@ -73,7 +73,7 @@ MKINIT struct redirtab { struct redirtab *next; - short renamed[10]; + int renamed[10]; }; ==== //depot/projects/ia64/bin/sh/shell.h#3 (text+ko) ==== @@ -34,15 +34,12 @@ * SUCH DAMAGE. * * @(#)shell.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/shell.h,v 1.13 2002/02/18 06:08:23 imp Exp $ + * $FreeBSD: src/bin/sh/shell.h,v 1.14 2002/07/19 08:09:04 tjr Exp $ */ /* * The follow should be set to reflect the type of system you have: * JOBS -> 1 if you have Berkeley job control, 0 otherwise. - * SHORTNAMES -> 1 if your linker cannot handle long names. - * define BSD if you are running 4.2 BSD or later. - * define SYSV if you are running under System V. * define DEBUG=1 to compile in debugging (set global "debug" to turn on) * define DEBUG=2 to compile in and turn on debugging. * @@ -52,9 +49,6 @@ #define JOBS 1 -#ifndef BSD -#define BSD 1 -#endif /* #define DEBUG 1 */ typedef void *pointer; ==== //depot/projects/ia64/bin/sh/trap.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.22 2002/06/30 05:15:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.23 2002/07/19 08:09:04 tjr Exp $"); #include #include @@ -281,10 +281,8 @@ } *t = action; sig = signal(signo, sigact); -#ifdef BSD if (sig != SIG_ERR && action == S_CATCH) siginterrupt(signo, 1); -#endif } @@ -340,9 +338,6 @@ onsig(int signo) { -#ifndef BSD - signal(signo, onsig); -#endif if (signo == SIGINT && trap[SIGINT] == NULL) { onint(); return; ==== //depot/projects/ia64/contrib/groff/tmac/doc-common#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)doc-common 8.1 (Berkeley) 06/08/93 -.\" $FreeBSD: src/contrib/groff/tmac/doc-common,v 1.53 2002/06/18 00:41:46 dougb Exp $ +.\" $FreeBSD: src/contrib/groff/tmac/doc-common,v 1.56 2002/07/18 09:32:11 ru Exp $ .\" .\" %beginstrip% . @@ -419,7 +419,6 @@ .ds doc-operating-system-FreeBSD-4.3 4.3 .ds doc-operating-system-FreeBSD-4.4 4.4 .ds doc-operating-system-FreeBSD-4.5 4.5 -.ds doc-operating-system-FreeBSD-4.6 4.6 .ds doc-operating-system-FreeBSD-5.0 5.0 . .de Os ==== //depot/projects/ia64/etc/Makefile#14 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.289 2002/07/05 13:47:29 ru Exp $ +# $FreeBSD: src/etc/Makefile,v 1.290 2002/07/18 12:07:44 ru Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -69,14 +69,14 @@ distribution: cd ${.CURDIR}; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${BIN1} ${DESTDIR}/etc; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 755 \ ${BIN2} ${DESTDIR}/etc; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 \ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd - cd ${.CURDIR}/defaults; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}/defaults; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${DEFAULTS} ${DESTDIR}/etc/defaults cd ${.CURDIR}/periodic; ${MAKE} install cd ${.CURDIR}/rc.d; ${MAKE} install @@ -92,73 +92,73 @@ .endif .if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL) .if !defined(NO_OPENSSH) - cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SSH} ${DESTDIR}/etc/ssh .endif - cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SSL} ${DESTDIR}/etc/ssl .endif .if !defined(NO_MAKEDEV_INSTALL) - cd ${.CURDIR}; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \ + cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 555 \ MAKEDEV.local MAKEDEV ${DESTDIR}/dev .if !defined(NO_MAKEDEV_RUN) cd ${DESTDIR}/dev; sh MAKEDEV all .endif .endif cd ${.CURDIR}/root; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.cshrc ${DESTDIR}/root/.cshrc; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.klogin ${DESTDIR}/root/.klogin; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.login ${DESTDIR}/root/.login; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.profile ${DESTDIR}/root/.profile; \ rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile; \ ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \ ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile - cd ${.CURDIR}/mtree; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}/mtree; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree - cd ${.CURDIR}/namedb; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}/namedb; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${NAMEDB} ${DESTDIR}/etc/namedb - cd ${.CURDIR}/ppp; ${INSTALL} -c -o root -g ${BINGRP} -m 600 \ + cd ${.CURDIR}/ppp; ${INSTALL} ${COPY} -o root -g ${BINGRP} -m 600 \ ${PPPCNF} ${DESTDIR}/etc/ppp - cd ${.CURDIR}/mail; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}/mail; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${ETCMAIL} ${DESTDIR}/etc/mail @if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \ ! -f ${DESTDIR}/etc/aliases ]; then \ set -x; \ ln -s mail/aliases ${DESTDIR}/etc/aliases; \ fi - ${INSTALL} -c -o ${BINOWN} -g operator -m 664 /dev/null \ + ${INSTALL} ${COPY} -o ${BINOWN} -g operator -m 664 /dev/null \ ${DESTDIR}/etc/dumpdates - ${INSTALL} -c -o nobody -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} ${COPY} -o nobody -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/db/locate.database - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 17:45:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1F3737B401; Fri, 19 Jul 2002 17:44:08 -0700 (PDT) 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 B897E37B400 for ; Fri, 19 Jul 2002 17:44:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3C3943E5E for ; Fri, 19 Jul 2002 17:44:06 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6K0i6JU080821 for ; Fri, 19 Jul 2002 17:44:06 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6K0i6Na080818 for perforce@freebsd.org; Fri, 19 Jul 2002 17:44:06 -0700 (PDT) Date: Fri, 19 Jul 2002 17:44:06 -0700 (PDT) Message-Id: <200207200044.g6K0i6Na080818@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 14488 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14488 Change 14488 by chris@chris_holly on 2002/07/19 17:43:06 o Add a section on locking from the man page. o s/hook/entry point/ (and rewrap) o Remove not-supposed-to-be-documented struct mac_policy_conf o `mac_policy' is replaced by an entity for easily changing it once we decide what to change it to. o Some small SGML formatting nits o ... section that keeps getting repeated was replaced with an entity containing that bit, for cleanliness purposes. o Documented mpo_destroy and fix an instant where I misspelled it as mpo_ops. o Mark up and partially document the MAC label operations. o Add a new `mac.ent' to contain the new entities mentioned above. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#3 edit .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac.ent#1 add .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#6 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#3 (text+ko) ==== @@ -10,6 +10,7 @@ %man; %chapters; + %mac-entities; %authors %mailing-lists; ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#6 (text+ko) ==== @@ -69,40 +69,57 @@ MAC_PERFORM -> policy + + Locking + + + Module writers must be aware of the locking semantics of + entry points that they implement: MAC API entry points will have + specific locking or reference counting semantics for each + argument, and modules must follow the locking and reference + counting protocol or risk a variety of failure modes, including + race conditions, imappropriate pointer dereferences, etc. + + MAC module writers must also be aware that MAC API entry + points will frequently be invoked from deep in a kernel stack, + and as such must be careful to avoid violating more global + locking requirements, such as global lock order requirements. + For example, it may be inappropriate to lock additional objects + not specifically maintained and ordered by the policy module, or + the policy module might violate a global ordering requirement + relating to those additional objects. + + Finally, MAC API module implementors must be careful to + avoid inappropriately calling back into the MAC framework: the + framework makes use of locking to prevent inconsistencies during + policy module attachment and detachment. MAC API modules should + avoid producing scenarios in which deadlocks or inconsistencies + might occur. + + Policy Operations - The MAC policy framework implements policy operation hooks - which supply policy modules with relevant data on a subject and - the operation it is attempting to perform on an object. + The MAC policy framework implements policy operation entry + points which supply policy modules with relevant data on a + subject and the operation it is attempting to perform on an + object. Policy Module Operations The MAC policy framework includes the ability for policies to be compiled as separate loadable kernel modules. The - following structure is passed to the module operation - hooks: + following entry points are defined for module-related + events. - struct mac_policy_conf { - char *mpc_name; /* policy name */ - char *mpc_fullname; /* policy full name */ - struct mac_policy_ops mpc_ops; /* policy operations */ - struct mac_policy_op_entry *mpc_entries; /* ops to fill in */ - int mpc_loadtime_flags; /* flags */ - int *mpc_field_off; /* security field */ - int mpc_runtime_flags; /* flags */ - LIST_ENTRY(mac_policy_conf) mpc_list; /* global list */ -}; - - <function>mac_<replaceable>policy</replaceable>_init</function + <function>&mac.mpo;_init</function static void - mac_policy_init - + &mac.mpo;_init struct mac_policy_conf *conf @@ -111,12 +128,7 @@ - - - Parameter - Description - - + &mac.thead; @@ -127,11 +139,10 @@ - This is the initialization hook called after the policy - has been added to the list, but before the list is unlocked. - At the point a module would typically initialize its own - internal structures, print any copyright messages, - etc. + This is the entry point called after the policy has been + added to the list, but before the list is unlocked. At the + point a module would typically initialize its own internal + structures, print any copyright messages, etc. A module loaded message is already printed when a policy is loaded so any further messages of @@ -139,13 +150,12 @@ - <function>mac_<replaceable>policy</replaceable>_destroy</function> + <function>&mac.mpo;_destroy</function> static void - mac_policy_ops - + &mac.mpo;_destroy struct mac_policy_conf *conf @@ -154,40 +164,885 @@ - + &mac.thead; + + + + conf + MAC policy definition + + + + + + This entry point is called when the module is being + unloaded. At this point the policy would typically be + freeing internal storage, etc. + + + + + Label Operations + + ... + + + <function>&mac.mpo;_init_bpfdesc</function> + + + + static void + &mac.mpo;_init_bpfdesc + + struct bpf_d + *bpf_d + struct label + *label + + + + + + &mac.thead; + + + + bpf_d + Object; bpf descriptor + + + + label + New label to apply + + + + + + ... + + + + <function>&mac.mpo;_init_devfsdirent</function> + + + + static void + &mac.mpo;_init_devfsdirent + + struct devfs_dirent + *devfs_dirent + struct label + *label + + + + + + &mac.thead; + + + + devfs_dirent + Object; devfs directory entry + + + + label + New label to apply + + + + + + ... + + + + <function>&mac.mpo;_init_ifnet</function> + + + + static void + &mac.mpo;_init_ifnet + + struct ifnet + *ifnet + struct label + *label + + + + + + &mac.thead; + + + + ifnet + Object; network interface + + + + label + New label to apply + + + + + + ... + + + + <function>&mac.mpo;_init_ipq</function> + + + + static void + &mac.mpo;_init_ipq + + struct ipq + *ipq + struct label + *label + + + + + + &mac.thead; + + + + ipq + Object; IP reassembly queue + + + + label + New label to apply + + + + + + + + <function>&mac.mpo;_init_mbuf</function> + + + + static void + &mac.mpo;_init_mbuf + + struct mbuf + *mbuf + struct label + *label + + + + + + &mac.thead; + + + + mbuf + Object; mbuf + + + + label + New label to apply + + + + + ... + + + + <function>&mac.mpo;_init_mount</function> + + + + static void + &mac.mpo;_init_mount + + struct mount + *mount + struct label + *mntlabel + struct label + *fslabel + + + + + + + &mac.thead; + + + + mount + Object; file system mount point + + + + mntlabel + New file system mount point label + + + + fslabel + New file system label + + + + + + ... + + + + <function>&mac.mpo;_init_socket</function> + + + + static void + &mac.mpo;_init_socket + + struct socket + *socket + struct label + *label + struct label + *peerlabel + + + + + + &mac.thead; + + + + socket + Object; socket + + + + label + New label to apply to the socket + + + + peerlabel + New label to apply to the socket's peer + + + + + + ... + + + + <function>&mac.mpo;_init_subject</function> + + + + static void + &mac.mpo;_init_subject + + struct ucred + *cred + struct label + *label + + + + + + &mac.thead; + + + + cred + Subject; user credetial + + + + label + New label + + + + + + In this entry point, a policy module should allocate and + initialize any internal storage for a new label for a + subject (user) credential. No label information should be + filled out. + + + + <function>&mac.mpo;_init_temp</function> + + + + static void + &mac.mpo;_init_temp + + struct label + *label + + + + + + &mac.thead; + + + + label + Temporary label + + + + + + In this entry point, a policy module should allocate + storage for a label meant for temporary use. No label + information should be filled out. + + + + <function>&mac.mpo;_init_vnode</function> + + + + static void + &mac.mpo;_init_vnode + + struct vnode + *vp + struct label + *label + + + + + + &mac.thead; + + + + vp + Object; file system object + + + + label + New label to initialize + + + + + + In this entry point, a policy module should allocate and + initialize any internal storage necessary for a new file + system object label. + + + + <function>&mac.mpo;_destroy_bpfdesc</function> + + + + static void + &mac.mpo;_destroy_bpfdesc + + struct bpf_d + *bpf_d + struct label + *label + + + + + + &mac.thead; + + + + bpf_d + Object; bpf descriptor + + + + label + Label being destroyed + + + + + + In this entry point, a policy module should free any + internal storage associated with + label so that it may be + destroyed. + + + + <function>&mac.mpo;_destroy_devfsdirent</function> + + + + static void + &mac.mpo;_destroy_devfsdirent + + struct devfs_dirent + *devfs_dirent + struct label + *label + + + + + + &mac.thead; + + + + devfs_dirent + Object; devfs directory entry + + + + label + Label being destroyed + + + + + + In this entry point, a policy module should free any + internal storage asociated with label + so that it may be destroyed. + + + + <function>&mac.mpo;_destroy_ifnet</function> + + + + static void + &mac.mpo;_destroy_ifnet + + struct ifnet + *ifnet + struct label + *label + + + + + + &mac.thead; + + + + ifnet + Object; network interface + + + + label + Label being destroyed + + + + + + In this entry point, a policy module should free any + internal storage associated with + label so that it may be + destroyed. + + + + <function>&mac.mpo;_destroy_ipq</function> + + + + static void + &mac.mpo;_destroy_ipq + + struct ipq + *ipq + struct label + *label + + + + + + &mac.thead; + + + + ipq + Object; IP reassembly queue + + + + label + Label being destroyed + + + + + + In this entry point, a policy module should free any + internal storage associated with + label so that it may be + destroyed. + + + + <function>&mac.mpo;_destroy_mbuf</function> + + + + static void + &mac.mpo;_destroy_mbuf + + struct mbuf + *mbuf + struct label + *label + + + + + + &mac.thead; + + + + mbuf + Object; mbuf + + + + label + Label being destroyed + + + + + + In this entry point, a policy module should free any + internal storage associated with + label so that it may be + destroyed. + + + + <function>&mac.mpo;_destroy_mount</function> + + + + static void + &mac.mpo;_destroy_mount + + struct mount + *mp + struct label + *mntlabel + struct label + *fslabel + + + + + + &mac.thead; + + + + mp + Object; file system mount point + + + + mntlabel + Mount point label being destroyed + + + + fslabel + File system label being destroyed> + + + + + + In this entry point, a policy module should free the + internal storage associated with + mntlabel and + fslabel so that they may be + destroyed. + + + + <function>&mac.mpo;_destroy_socket</function> + + + + static void + &mac.mpo;_destroy_socket + + struct socket + *socket + struct label + *label + struct label + *peerlabel + + + + + + &mac.thead; + + + + socket + Object; socket + + + + label + Socket label being destroyed + + + + peerlabel + Socket peer label being destroyed + + + + + + In this entry point, a policy module should free any + internal storage associated with + label and + peerlabel so that they may be + destroyed. + + + + <function>&mac.mpo;_destroy_subject</function> + + + + static void + &mac.mpo;_destroy_subject + + struct ucred + *cred + struct label + *label + + + + + + &mac.thead; + + + + cred + Subject; user credential + + + + label + Label being destroyed + + + + + + In this entry point, a policy module should free any + internal storage associated with + label so that it may be + destroyed. + + + + <function>&mac.mpo;_destroy_temp</function> + + + + static void + &mac.mpo;_destroy_temp + + struct label + *label + + + + + + &mac.thead; + + + + label + Temporary label being destroyed + + + + + + In this entry point, a policy module should free any + internal storage associated with the temporary label + label so that it may be + destroyed. + + + + <function>&mac.mpo;_destroy_vnode</function> + + + + static void + &mac.mpo;_destroy_vnode + + struct vnode + *vp + struct label + *label + + + + + + &mac.thead; + + + + vp + Object; file system object + + + + label + Label being destroyed + + + + + + In this entry point, a policy module should free any + internal storage associated with + label so that it may be + destroyed. + + + + <function>&mac.mpo;_externalize</function> + + + + static void + &mac.mpo;_externalize + + struct label + *label + struct mac + *extmac + + + + + + &mac.thead; + + + + label + Label to be externalized + + - Parameter - Description + extmac + MAC structure to be filled in - + + + + + ... + + + + <function>&mac.mpo;_internalize</function> >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 20: 2: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B7EE37B401; Fri, 19 Jul 2002 20:01:55 -0700 (PDT) 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 ADDE237B400 for ; Fri, 19 Jul 2002 20:01:54 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E1A943E4A for ; Fri, 19 Jul 2002 20:01:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6K31sJU002209 for ; Fri, 19 Jul 2002 20:01:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6K31rJ5002206 for perforce@freebsd.org; Fri, 19 Jul 2002 20:01:53 -0700 (PDT) Date: Fri, 19 Jul 2002 20:01:53 -0700 (PDT) Message-Id: <200207200301.g6K31rJ5002206@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14491 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14491 Change 14491 by rwatson@rwatson_curry on 2002/07/19 20:01:43 Possible naming consistency improvements. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#173 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#110 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#71 edit .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#39 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#173 (text+ko) ==== @@ -142,7 +142,8 @@ static int mac_policy_register(struct mac_policy_conf *mpc); static int mac_policy_unregister(struct mac_policy_conf *mpc); -static int mac_create_extattr_from_vnode(struct vnode *vp); +static int mac_stdcreatevnode_ea(struct vnode *vp); + /* * mac_policy_list_lock protects the consistency of 'mac_policy_list', @@ -328,8 +329,8 @@ mpc->mpc_ops.mpo_create_devfs_vnode = mpe->mpe_function; break; - case MAC_CREATE_EXTATTR_FROM_VNODE: - mpc->mpc_ops.mpo_create_extattr_from_vnode = + case MAC_STDCREATEVNODE_EA: + mpc->mpc_ops.mpo_stdcreatevnode_ea = mpe->mpe_function; break; case MAC_CREATE_VNODE_FROM_VNODE: @@ -1063,7 +1064,7 @@ * commit of the label to disk (etc), do cache the label. */ int -mac_stdcreatevnode_ea(struct vnode *dvp, struct vnode *tvp, struct ucred *cred) +vop_stdcreatevnode_ea(struct vnode *dvp, struct vnode *tvp, struct ucred *cred) { struct mac extmac; int error; @@ -1084,10 +1085,14 @@ */ mac_create_vnode_from_vnode(cred, dvp, tvp); - error = mac_create_extattr_from_vnode(tvp); + error = mac_stdcreatevnode_ea(tvp); if (error) return (error); + /* + * XXX: Eventually this will go away and all policies will + * directly manage their extended attributes. + */ error = mac_externalize(&tvp->v_label, &extmac); if (error) return (error); @@ -2254,11 +2259,11 @@ } static int -mac_create_extattr_from_vnode(struct vnode *vp) +mac_stdcreatevnode_ea(struct vnode *vp) { int error; - MAC_CHECK(create_extattr_from_vnode, vp, &vp->v_label); + MAC_CHECK(stdcreatevnode_ea, vp, &vp->v_label); return (error); } ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#110 (text+ko) ==== @@ -353,7 +353,7 @@ /* Calls to help various file systems implement labeling using EAs. */ struct vop_refreshlabel_args; struct vop_setlabel_args; -int mac_stdcreatevnode_ea(struct vnode *dvp, struct vnode *tvp, +int vop_stdcreatevnode_ea(struct vnode *dvp, struct vnode *tvp, struct ucred *cred); int vop_stdrefreshlabel_ea(struct vop_refreshlabel_args *ap); int vop_stdsetlabel_ea(struct vop_setlabel_args *ap); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#71 (text+ko) ==== @@ -119,10 +119,10 @@ void (*mpo_create_root_mount)(struct ucred *cred, struct mount *mp, struct label *mountlabel, struct label *fslabel); - int (*mpo_create_extattr_from_vnode)(struct vnode *vp, - struct label *vnodelabel); void (*mpo_relabel_vnode)(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label); + int (*mpo_stdcreatevnode_ea)(struct vnode *vp, + struct label *vnodelabel); void (*mpo_update_devfsdirent_from_vnode)( struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, @@ -346,8 +346,8 @@ MAC_CREATE_VNODE_FROM_VNODE, MAC_CREATE_MOUNT, MAC_CREATE_ROOT_MOUNT, - MAC_CREATE_EXTATTR_FROM_VNODE, MAC_RELABEL_VNODE, + MAC_STDCREATEVNODE_EA, MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, MAC_UPDATE_PROCFSVNODE_FROM_SUBJECT, MAC_UPDATE_VNODE_FROM_EXTATTR, ==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#39 (text+ko) ==== @@ -1533,7 +1533,7 @@ goto bad; #ifdef MAC - error = mac_stdcreatevnode_ea(dvp, tvp, cnp->cn_cred); + error = vop_stdcreatevnode_ea(dvp, tvp, cnp->cn_cred); if (error) goto bad; #endif @@ -2445,7 +2445,7 @@ if (error) goto bad; #ifdef MAC - error = mac_stdcreatevnode_ea(dvp, tvp, cnp->cn_cred); + error = vop_stdcreatevnode_ea(dvp, tvp, cnp->cn_cred); if (error) goto bad; #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 20: 5: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2944237B401; Fri, 19 Jul 2002 20:04:59 -0700 (PDT) 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 D33DB37B400 for ; Fri, 19 Jul 2002 20:04:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9226943E42 for ; Fri, 19 Jul 2002 20:04:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6K34wJU002416 for ; Fri, 19 Jul 2002 20:04:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6K34wRa002413 for perforce@freebsd.org; Fri, 19 Jul 2002 20:04:58 -0700 (PDT) Date: Fri, 19 Jul 2002 20:04:58 -0700 (PDT) Message-Id: <200207200304.g6K34wRa002413@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14492 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14492 Change 14492 by rwatson@rwatson_curry on 2002/07/19 20:04:23 Diff reduction -- possible mis-merge. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/link_elf.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/link_elf.c#6 (text+ko) ==== @@ -311,8 +311,6 @@ const Elf_Hashelt *hashtab = (const Elf_Hashelt *) (ef->address + dp->d_un.d_ptr); ef->nbuckets = hashtab[0]; - if (ef->nbuckets == 0) - return ENOEXEC; ef->nchains = hashtab[1]; ef->buckets = hashtab + 2; ef->chains = ef->buckets + ef->nbuckets; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 20:13:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF7B937B418; Fri, 19 Jul 2002 20:12:11 -0700 (PDT) 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 3354337B417 for ; Fri, 19 Jul 2002 20:12:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A485643E6A for ; Fri, 19 Jul 2002 20:12:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6K3C9JU007700 for ; Fri, 19 Jul 2002 20:12:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6K3C9c1007696 for perforce@freebsd.org; Fri, 19 Jul 2002 20:12:09 -0700 (PDT) Date: Fri, 19 Jul 2002 20:12:09 -0700 (PDT) Message-Id: <200207200312.g6K3C9c1007696@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14493 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14493 Change 14493 by peter@peter_daintree on 2002/07/19 20:11:10 IFC @14492 Affected files ... .. //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/elf_machdep.c#4 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#6 integrate .. //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#4 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#6 integrate .. //depot/projects/ia64/sys/compat/svr4/imgact_svr4.c#5 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/ia64/sys/conf/files#34 integrate .. //depot/projects/ia64/sys/conf/files.ia64#10 integrate .. //depot/projects/ia64/sys/i386/i386/elf_machdep.c#4 integrate .. //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#7 integrate .. //depot/projects/ia64/sys/i386/linux/imgact_linux.c#5 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#11 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_proto.h#4 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_syscall.h#5 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_sysent.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia32/syscalls.master#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/elf_machdep.c#6 integrate .. //depot/projects/ia64/sys/ia64/include/elf.h#7 integrate .. //depot/projects/ia64/sys/kern/imgact_aout.c#7 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/ia64/sys/kern/imgact_gzip.c#5 integrate .. //depot/projects/ia64/sys/kern/init_main.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#19 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#8 integrate .. //depot/projects/ia64/sys/sys/elf_generic.h#5 integrate .. //depot/projects/ia64/sys/sys/imgact.h#6 integrate .. //depot/projects/ia64/sys/sys/imgact_elf.h#6 integrate .. //depot/projects/ia64/sys/sys/sysent.h#8 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#13 integrate .. //depot/projects/ia64/sys/vm/vm_extern.h#9 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#28 integrate Differences ... ==== //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#4 (text+ko) ==== @@ -45,8 +45,6 @@ .\" times and is guaranteed to give a worst case performance .\" for an already extremely slow package. .\" -.\" $FreeBSD: src/contrib/groff/tmac/groff_mdoc.man,v 1.2 2002/06/18 00:41:47 dougb Exp $ -.\" . .Dd July 20, 2001 .Os @@ -837,7 +835,7 @@ .It FreeBSD 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1, 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1, -4.2, 4.3, 4.4, 4.5, 4.6, 5.0 +4.2, 4.3, 4.4, 4.5, 5.0 .El .Ed .Pp ==== //depot/projects/ia64/sys/alpha/alpha/elf_machdep.c#4 (text+ko) ==== @@ -22,7 +22,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/alpha/alpha/elf_machdep.c,v 1.9 2002/04/25 01:22:15 marcel Exp $ + * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.10 2002/07/20 02:56:09 peter Exp $ */ #include @@ -32,10 +32,48 @@ #include #include #include +#include +#include +#include +#include #include #include #include +#include + +struct sysentvec elf64_freebsd_sysvec = { + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf64_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, + "FreeBSD ELF64", + __elfN(coredump), + NULL, + MINSIGSTKSZ +}; +static Elf64_Brandinfo freebsd_brand_info = { + ELFOSABI_FREEBSD, + EM_ALPHA, + "FreeBSD", + "", + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec + }; + +SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_info); + /* Process one elf relocation with addend. */ int elf_reloc(linker_file_t lf, const void *data, int type) @@ -85,7 +123,7 @@ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return -1; - addr += addend; + addr += addend; if (*where != addr) *where = addr; break; ==== //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#6 (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. * - * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.82 2002/06/02 20:05:40 schweikh Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.83 2002/07/20 02:56:09 peter Exp $ */ /* XXX we use functions that might not exist. */ @@ -189,7 +189,7 @@ &linux_szsigcode, 0, "Linux ELF", - elf_coredump, + elf64_coredump, exec_linux_imgact_try, LINUX_MINSIGSTKSZ }; @@ -231,7 +231,7 @@ case MOD_LOAD: for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo) - if (elf_insert_brand_entry(*brandinfo) < 0) + if (elf64_insert_brand_entry(*brandinfo) < 0) error = EINVAL; if (error == 0) { SET_FOREACH(lihp, linux_ioctl_handler_set) @@ -244,12 +244,12 @@ case MOD_UNLOAD: for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo) - if (elf_brand_inuse(*brandinfo)) + if (elf64_brand_inuse(*brandinfo)) error = EBUSY; if (error == 0) { for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo) - if (elf_remove_brand_entry(*brandinfo) < 0) + if (elf64_remove_brand_entry(*brandinfo) < 0) error = EINVAL; } if (error == 0) { ==== //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#4 (text+ko) ==== @@ -30,7 +30,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/alpha/osf1/imgact_osf1.c,v 1.11 2002/06/02 20:05:41 schweikh Exp $ + * $FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.12 2002/07/20 02:56:09 peter Exp $ */ #include @@ -178,7 +178,7 @@ /* * Destroy old process VM and create a new one (with a new stack). */ - exec_new_vmspace(imgp); + exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK); /* * The vm space can now be changed. ==== //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD$ */ -/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.15 2002/04/09 20:10:40 jhb Exp $ */ +/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.16 2002/07/20 02:56:09 peter Exp $ */ /* * Copyright (c) 2000 Masaru OKI ==== //depot/projects/ia64/sys/compat/svr4/imgact_svr4.c#5 (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/compat/svr4/imgact_svr4.c,v 1.15 2002/06/02 20:05:43 schweikh Exp $ + * $FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.16 2002/07/20 02:56:09 peter Exp $ */ #include ==== //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#7 (text+ko) ==== @@ -27,7 +27,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/compat/svr4/svr4_sysvec.c,v 1.25 2002/07/09 14:59:27 robert Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.26 2002/07/20 02:56:09 peter Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/ia64/sys/conf/files#34 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.666 2002/07/17 05:22:00 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.667 2002/07/20 02:56:09 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/ia64/sys/conf/files.ia64#10 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.33 2002/07/15 15:47:34 jhb Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.34 2002/07/20 02:56:09 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/ia64/sys/i386/i386/elf_machdep.c#4 (text+ko) ==== @@ -22,13 +22,53 @@ * (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/i386/i386/elf_machdep.c,v 1.9 2002/04/25 01:22:15 marcel Exp $ + * $FreeBSD: src/sys/i386/i386/elf_machdep.c,v 1.10 2002/07/20 02:56:10 peter Exp $ */ #include +#include #include #include +#include +#include +#include +#include +#include #include +#include + +struct sysentvec elf32_freebsd_sysvec = { + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf32_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, + "FreeBSD ELF32", + __elfN(coredump), + NULL, + MINSIGSTKSZ +}; + +static Elf32_Brandinfo freebsd_brand_info = { + ELFOSABI_FREEBSD, + EM_386, + "FreeBSD", + "", + "/usr/libexec/ld-elf.so.1", + &elf32_freebsd_sysvec + }; + +SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf32_insert_brand_entry, + &freebsd_brand_info); struct sysentvec elf32_freebsd_sysvec = { SYS_MAXSYSCALL, ==== //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#7 (text+ko) ==== @@ -26,7 +26,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/i386/ibcs2/imgact_coff.c,v 1.51 2002/06/02 20:05:48 schweikh Exp $ + * $FreeBSD: src/sys/i386/ibcs2/imgact_coff.c,v 1.52 2002/07/20 02:56:10 peter Exp $ */ #include ==== //depot/projects/ia64/sys/i386/linux/imgact_linux.c#5 (text+ko) ==== @@ -28,7 +28,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/i386/linux/imgact_linux.c,v 1.41 2002/06/02 20:05:51 schweikh Exp $ + * $FreeBSD: src/sys/i386/linux/imgact_linux.c,v 1.42 2002/07/20 02:56:10 peter Exp $ */ #include ==== //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#11 (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. * - * $FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.100 2002/06/02 20:05:52 schweikh Exp $ + * $FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.101 2002/07/20 02:56:10 peter Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/ia64/sys/ia64/ia32/ia32_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.1 2002/04/10 19:34:51 dfr Exp + * $FreeBSD: src/sys/ia64/ia32/ia32_proto.h,v 1.2 2002/07/20 02:56:34 peter Exp $ + * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.2 2002/07/20 02:56:10 peter Exp */ #ifndef _IA32_SYSPROTO_H_ @@ -251,6 +251,12 @@ #endif /* COMPAT_43 */ + +#ifdef COMPAT_FREEBSD4 + + +#endif /* COMPAT_FREEBSD4 */ + #undef PAD_ #undef PADL_ #undef PADR_ ==== //depot/projects/ia64/sys/ia64/ia32/ia32_syscall.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.1 2002/04/10 19:34:51 dfr Exp + * $FreeBSD: src/sys/ia64/ia32/ia32_syscall.h,v 1.2 2002/07/20 02:56:34 peter Exp $ + * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.2 2002/07/20 02:56:10 peter Exp */ #define IA32_SYS_syscall 0 ==== //depot/projects/ia64/sys/ia64/ia32/ia32_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.1 2002/04/10 19:34:51 dfr Exp + * $FreeBSD: src/sys/ia64/ia32/ia32_sysent.c,v 1.2 2002/07/20 02:56:34 peter Exp $ + * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.2 2002/07/20 02:56:10 peter Exp */ #include ==== //depot/projects/ia64/sys/ia64/ia32/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.1 2002/04/10 19:34:51 dfr Exp $ + $FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.2 2002/07/20 02:56:10 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; ==== //depot/projects/ia64/sys/ia64/ia64/elf_machdep.c#6 (text+ko) ==== @@ -22,7 +22,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/ia64/ia64/elf_machdep.c,v 1.4 2002/04/25 01:22:15 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/elf_machdep.c,v 1.5 2002/07/20 02:56:10 peter Exp $ */ #include @@ -42,19 +42,19 @@ #include struct sysentvec elf64_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - 0, - 0, - 0, - 0, - elf64_freebsd_fixup, - sendsig, - sigcode, - &szsigcode, - 0, + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf64_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, "FreeBSD ELF64", __elfN(coredump), NULL, ==== //depot/projects/ia64/sys/ia64/include/elf.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/elf.h,v 1.8 2002/05/30 08:32:18 dfr Exp $ + * $FreeBSD: src/sys/ia64/include/elf.h,v 1.9 2002/07/20 02:56:10 peter Exp $ */ #ifndef _MACHINE_ELF_H_ ==== //depot/projects/ia64/sys/kern/imgact_aout.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/imgact_aout.c,v 1.78 2002/07/06 07:00:01 jeff Exp $ + * $FreeBSD: src/sys/kern/imgact_aout.c,v 1.79 2002/07/20 02:56:11 peter Exp $ */ #include "opt_kstack_pages.h" ==== //depot/projects/ia64/sys/kern/imgact_elf.c#12 (text+ko) ==== @@ -27,7 +27,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/kern/imgact_elf.c,v 1.112 2002/07/06 07:00:01 jeff Exp $ + * $FreeBSD: src/sys/kern/imgact_elf.c,v 1.113 2002/07/20 02:56:11 peter Exp $ */ #include @@ -162,7 +162,7 @@ if (hdr->e_version != ELF_TARG_VER) return ENOEXEC; - + return 0; } @@ -375,12 +375,12 @@ map_len = round_page_ps((vm_offset_t)vmaddr + memsz, pagesize) - map_addr; /* This had damn well better be true! */ - if (map_len != 0) { + if (map_len != 0) { rv = __elfN(map_insert)(&vmspace->vm_map, NULL, 0, map_addr, map_addr + map_len, VM_PROT_ALL, VM_PROT_ALL, 0); if (rv != KERN_SUCCESS) { - return EINVAL; + return EINVAL; } } @@ -388,7 +388,7 @@ vm_offset_t off; vm_object_reference(object); rv = vm_map_find(exec_map, - object, + object, trunc_page(offset + filsz), &data_buf, PAGE_SIZE, @@ -479,8 +479,8 @@ } /* XXXKSE */ - NDINIT(nd, LOOKUP, LOCKLEAF|FOLLOW, UIO_SYSSPACE, file, curthread); - + NDINIT(nd, LOOKUP, LOCKLEAF|FOLLOW, UIO_SYSSPACE, file, curthread); + if ((error = namei(nd)) != 0) { nd->ni_vp = NULL; goto fail; @@ -509,7 +509,7 @@ VOP_UNLOCK(nd->ni_vp, 0, curthread); /* XXXKSE */ if (error) - goto fail; + goto fail; hdr = (const Elf_Ehdr *)imgp->image_header; if ((error = __elfN(check_header)(hdr)) != 0) @@ -618,7 +618,7 @@ return ENOEXEC; } phdr = (const Elf_Phdr*)(imgp->image_header + hdr->e_phoff); - + /* * From this point on, we may have resources that need to be freed. */ @@ -644,11 +644,11 @@ for (i = 0; i < MAX_BRANDS; i++) { Elf_Brandinfo *bi = elf_brand_list[i]; - if (bi != NULL && + if (bi != NULL && hdr->e_machine == bi->machine && (hdr->e_ident[EI_OSABI] == bi->brand - || 0 == - strncmp((const char *)&hdr->e_ident[OLD_EI_BRAND], + || 0 == + strncmp((const char *)&hdr->e_ident[OLD_EI_BRAND], bi->compat_3_brand, strlen(bi->compat_3_brand)))) { brand_info = bi; break; @@ -760,11 +760,11 @@ for (i = 0; i < MAX_BRANDS; i++) { Elf_Brandinfo *bi = elf_brand_list[i]; - if (bi != NULL && + if (bi != NULL && hdr->e_machine == bi->machine && (hdr->e_ident[EI_OSABI] == bi->brand - || 0 == - strncmp((const char *)&hdr->e_ident[OLD_EI_BRAND], + || 0 == + strncmp((const char *)&hdr->e_ident[OLD_EI_BRAND], bi->compat_3_brand, strlen(bi->compat_3_brand)))) { brand_info = bi; break; @@ -810,19 +810,19 @@ imgp->proc->p_sysent = brand_info->sysvec; if (interp != NULL) { path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - snprintf(path, MAXPATHLEN, "%s%s", + snprintf(path, MAXPATHLEN, "%s%s", brand_info->emul_path, interp); if ((error = __elfN(load_file)(imgp->proc, path, &addr, &imgp->entry_addr, pagesize)) != 0) { - if ((error = __elfN(load_file) + if ((error = __elfN(load_file) (imgp->proc, interp, &addr, &imgp->entry_addr, pagesize)) != 0) { - uprintf("ELF interpreter %s not found\n", path); + uprintf("ELF interpreter %s not found\n", path); free(path, M_TEMP); goto fail; } - } + } free(path, M_TEMP); } @@ -887,7 +887,7 @@ suword(base, (long) imgp->argc); *stack_base = (register_t *)base; return 0; -} +} /* * Code for generating ELF core dumps. @@ -969,7 +969,7 @@ php = (Elf_Phdr *)((char *)hdr + sizeof(Elf_Ehdr)) + 1; offset = hdrsize; for (i = 0; i < seginfo.count; i++) { - error = vn_rdwr_inchunks(UIO_WRITE, vp, + error = vn_rdwr_inchunks(UIO_WRITE, vp, (caddr_t)(uintptr_t)php->p_vaddr, php->p_filesz, offset, UIO_USERSPACE, IO_UNIT | IO_DIRECT, cred, (int *)NULL, curthread); /* XXXKSE */ @@ -980,7 +980,7 @@ } } free(hdr, M_TEMP); - + return error; } ==== //depot/projects/ia64/sys/kern/imgact_gzip.c#5 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/kern/imgact_gzip.c,v 1.46 2002/03/25 13:52:45 phk Exp $ + * $FreeBSD: src/sys/kern/imgact_gzip.c,v 1.47 2002/07/20 02:56:11 peter Exp $ * * This module handles execution of a.out files which have been run through * "gzip". This saves diskspace, but wastes cpu-cycles and VM. ==== //depot/projects/ia64/sys/kern/init_main.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/init_main.c,v 1.198 2002/07/14 03:43:33 julian Exp $ + * $FreeBSD: src/sys/kern/init_main.c,v 1.199 2002/07/20 02:56:11 peter Exp $ */ #include "opt_init_path.h" ==== //depot/projects/ia64/sys/kern/kern_exec.c#19 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_exec.c,v 1.175 2002/07/14 17:58:35 alc Exp $ + * $FreeBSD: src/sys/kern/kern_exec.c,v 1.176 2002/07/20 02:56:11 peter Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/ia64/sys/powerpc/powerpc/elf_machdep.c#4 (text+ko) ==== @@ -22,7 +22,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/powerpc/powerpc/elf_machdep.c,v 1.10 2002/04/25 01:22:16 marcel Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/elf_machdep.c,v 1.11 2002/07/20 02:56:11 peter Exp $ */ #include @@ -32,24 +32,29 @@ #include #include #include +#include +#include +#include +#include #include #include #include +#include struct sysentvec elf32_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - 0, - 0, - 0, - 0, - elf32_freebsd_fixup, - sendsig, - sigcode, - &szsigcode, - 0, + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf32_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, "FreeBSD ELF32", __elfN(coredump), NULL, @@ -109,7 +114,7 @@ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return -1; - addr += addend; + addr += addend; if (*where != addr) *where = addr; break; ==== //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * from: NetBSD: mdreloc.c,v 1.5 2001/04/25 12:24:51 kleink Exp - * $FreeBSD: src/sys/sparc64/sparc64/elf_machdep.c,v 1.6 2002/06/22 20:46:59 mux Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/elf_machdep.c,v 1.7 2002/07/20 02:56:11 peter Exp $ */ #include @@ -54,19 +54,19 @@ #include "linker_if.h" struct sysentvec elf64_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - 0, - 0, - 0, - 0, - elf64_freebsd_fixup, - sendsig, - sigcode, - &szsigcode, - 0, + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf64_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, "FreeBSD ELF64", __elfN(coredump), NULL, ==== //depot/projects/ia64/sys/sys/elf_generic.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/elf_generic.h,v 1.5 2002/05/30 08:32:18 dfr Exp $ + * $FreeBSD: src/sys/sys/elf_generic.h,v 1.6 2002/07/20 02:56:11 peter Exp $ */ #ifndef _SYS_ELF_GENERIC_H_ ==== //depot/projects/ia64/sys/sys/imgact.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/imgact.h,v 1.27 2002/07/06 07:00:01 jeff Exp $ + * $FreeBSD: src/sys/sys/imgact.h,v 1.28 2002/07/20 02:56:11 peter Exp $ */ #ifndef _SYS_IMGACT_H_ ==== //depot/projects/ia64/sys/sys/imgact_elf.h#6 (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. * - * $FreeBSD: src/sys/sys/imgact_elf.h,v 1.23 2002/06/02 20:05:56 schweikh Exp $ + * $FreeBSD: src/sys/sys/imgact_elf.h,v 1.24 2002/07/20 02:56:11 peter Exp $ */ #ifndef _SYS_IMGACT_ELF_H_ ==== //depot/projects/ia64/sys/sys/sysent.h#8 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/sysent.h,v 1.37 2002/03/23 08:46:52 bde Exp $ + * $FreeBSD: src/sys/sys/sysent.h,v 1.38 2002/07/20 02:56:11 peter Exp $ */ #ifndef _SYS_SYSENT_H_ ==== //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#13 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.120 2002/07/19 07:29:38 mckusick Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.121 2002/07/20 01:09:35 peter Exp $"); /* * For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide. @@ -1627,7 +1627,8 @@ WORKLIST_INSERT(&bp->b_dep, &adp->ad_list); if (lbn >= NXADDR) { FREE_LOCK(&lk); - panic("softdep_setup_allocext: lbn %d > NXADDR", lbn); + panic("softdep_setup_allocext: lbn %lld > NXADDR", + (long long)lbn); } /* * The list of allocdirects must be kept in sorted and ascending ==== //depot/projects/ia64/sys/vm/vm_extern.h#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_extern.h 8.2 (Berkeley) 1/12/94 - * $FreeBSD: src/sys/vm/vm_extern.h,v 1.57 2002/07/07 23:05:27 peter Exp $ + * $FreeBSD: src/sys/vm/vm_extern.h,v 1.58 2002/07/20 02:56:12 peter Exp $ */ #ifndef _VM_EXTERN_H_ ==== //depot/projects/ia64/sys/vm/vm_map.c#28 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.c,v 1.263 2002/07/18 10:28:00 peter Exp $ + * $FreeBSD: src/sys/vm/vm_map.c,v 1.264 2002/07/20 02:56:12 peter Exp $ */ /* @@ -2586,7 +2586,7 @@ * mapped to it, then create a new one. The new vmspace is null. */ void -vmspace_exec(struct proc *p, vm_offset_t minuser, vm_offset_t maxuser) +vmspace_exec(struct proc *p, vm_offset_t minuser, vm_offset_t maxuser) { struct vmspace *oldvmspace = p->p_vmspace; struct vmspace *newvmspace; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 20:41: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA3FC37B401; Fri, 19 Jul 2002 20:40:46 -0700 (PDT) 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 6E72D37B400 for ; Fri, 19 Jul 2002 20:40:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C54E43E6A for ; Fri, 19 Jul 2002 20:40:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6K3ejJU010528 for ; Fri, 19 Jul 2002 20:40:45 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6K3ejWl010499 for perforce@freebsd.org; Fri, 19 Jul 2002 20:40:45 -0700 (PDT) Date: Fri, 19 Jul 2002 20:40:45 -0700 (PDT) Message-Id: <200207200340.g6K3ejWl010499@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14495 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14495 Change 14495 by peter@peter_daintree on 2002/07/19 20:40:19 IFC @14492 (with -i this time) Affected files ... .. //depot/projects/ia64/sys/ia64/ia32/ia32.h#2 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_misc.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_util.h#3 integrate .. //depot/projects/ia64/sys/kern/imgact_elf32.c#2 integrate .. //depot/projects/ia64/sys/kern/imgact_elf64.c#2 integrate .. //depot/projects/ia64/sys/kern/imgact_elfN.c#3 integrate Differences ... ==== //depot/projects/ia64/sys/ia64/ia32/ia32.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/ia64/ia32/ia32.h,v 1.1 2002/07/20 02:56:10 peter Exp $ */ #ifndef _IA64_IA32_IA32_H_ ==== //depot/projects/ia64/sys/ia64/ia32/ia32_misc.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/ia64/ia32/ia32_misc.c,v 1.1 2002/07/20 02:56:10 peter Exp $ */ #include @@ -76,7 +76,7 @@ #include #include -static const char ia32_emul_path[] = "/compat/ilp32"; +static const char ia32_emul_path[] = "/compat/ia32"; /* * [ taken from the linux emulator ] * Search an alternate path before passing pathname arguments on @@ -89,20 +89,20 @@ int ia32_emul_find(td, sgp, prefix, path, pbuf, cflag) struct thread *td; - caddr_t *sgp; /* Pointer to stackgap memory */ + caddr_t *sgp; /* Pointer to stackgap memory */ const char *prefix; char *path; char **pbuf; int cflag; { - int error; - size_t len, sz; - char *buf, *cp, *ptr; + int error; + size_t len, sz; + char *buf, *cp, *ptr; struct ucred *ucred; - struct nameidata nd; - struct nameidata ndroot; - struct vattr vat; - struct vattr vatroot; + struct nameidata nd; + struct nameidata ndroot; + struct vattr vat; + struct vattr vatroot; buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK); *pbuf = path; ==== //depot/projects/ia64/sys/ia64/ia32/ia32_sysvec.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/ia64/ia32/ia32_sysvec.c,v 1.1 2002/07/20 02:56:10 peter Exp $ */ #define __ELF_WORD_SIZE 32 @@ -89,19 +89,19 @@ static int ia32_szsigcode = sizeof(ia32_sigcode) & ~3; struct sysentvec ia32_freebsd_sysvec = { - SYS_MAXSYSCALL, - ia32_sysent, - 0, - 0, - 0, - 0, - 0, - 0, - elf32_freebsd_fixup, - sendsig, - ia32_sigcode, - &ia32_szsigcode, - 0, + SYS_MAXSYSCALL, + ia32_sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf32_freebsd_fixup, + sendsig, + ia32_sigcode, + &ia32_szsigcode, + 0, "FreeBSD ELF", elf32_coredump, NULL, @@ -171,7 +171,7 @@ vectp = (u_int32_t *) (destp - (imgp->argc + imgp->envc + 2 + imgp->auxarg_size) * sizeof(u_int32_t)); - } else + } else /* * The '+ 2' is for the null pointers at the end of each of * the arg and env vector sets @@ -288,7 +288,7 @@ &gdt, PAGE_SIZE, 0, VM_PROT_ALL, VM_PROT_ALL, 0); ldt = gdt + 4096; - + desc.sd_lolimit = 8*NLDT-1; desc.sd_lobase = ldt & 0xffffff; desc.sd_type = SDT_SYSLDT; @@ -312,7 +312,7 @@ copyout(&desc, (caddr_t) ldt + 8*LUCODE_SEL, sizeof(desc)); desc.sd_type = SDT_MEMRWA; copyout(&desc, (caddr_t) ldt + 8*LUDATA_SEL, sizeof(desc)); - + codeseg = 0 /* base */ + (((IA32_USRSTACK >> 12) - 1) << 32) /* limit */ + ((long)SDT_MEMERA << 52) ==== //depot/projects/ia64/sys/ia64/ia32/ia32_util.h#3 (text+ko) ==== @@ -6,7 +6,7 @@ * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer + * notice, this list of conditions and the following disclaimer * in this position and unchanged. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -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. * - * $FreeBSD$ + * $FreeBSD: src/sys/ia64/ia32/ia32_util.h,v 1.1 2002/07/20 02:56:10 peter Exp $ */ #include ==== //depot/projects/ia64/sys/kern/imgact_elf32.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/kern/imgact_elf32.c,v 1.1 2002/07/20 02:56:11 peter Exp $ */ /* ==== //depot/projects/ia64/sys/kern/imgact_elf64.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/kern/imgact_elf64.c,v 1.1 2002/07/20 02:56:11 peter Exp $ */ /* ==== //depot/projects/ia64/sys/kern/imgact_elfN.c#3 (text+ko) ==== @@ -27,7 +27,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/kern/imgact_elf.c,v 1.110 2002/03/19 21:24:05 alfred Exp $ + * $FreeBSD: src/sys/kern/imgact_elfN.c,v 1.1 2002/07/20 02:56:11 peter Exp $ */ #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 20:41:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D0DF37B401; Fri, 19 Jul 2002 20:41:48 -0700 (PDT) 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 22B1B37B400 for ; Fri, 19 Jul 2002 20:41:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8F2043E6A for ; Fri, 19 Jul 2002 20:41:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6K3flJU010734 for ; Fri, 19 Jul 2002 20:41:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6K3flus010731 for perforce@freebsd.org; Fri, 19 Jul 2002 20:41:47 -0700 (PDT) Date: Fri, 19 Jul 2002 20:41:47 -0700 (PDT) Message-Id: <200207200341.g6K3flus010731@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14496 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14496 Change 14496 by peter@peter_daintree on 2002/07/19 20:41:36 Mismerge Affected files ... .. //depot/projects/ia64/sys/i386/i386/elf_machdep.c#5 edit Differences ... ==== //depot/projects/ia64/sys/i386/i386/elf_machdep.c#5 (text+ko) ==== @@ -70,39 +70,6 @@ (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_info); -struct sysentvec elf32_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - 0, - 0, - 0, - 0, - elf32_freebsd_fixup, - sendsig, - sigcode, - &szsigcode, - 0, - "FreeBSD ELF32", - __elfN(coredump), - NULL, - MINSIGSTKSZ -}; - -static Elf32_Brandinfo freebsd_brand_info = { - ELFOSABI_FREEBSD, - EM_386, - "FreeBSD", - "", - "/usr/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec - }; - -SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, - (sysinit_cfunc_t) elf32_insert_brand_entry, - &freebsd_brand_info); - /* Process one elf relocation with addend. */ int elf_reloc(linker_file_t lf, const void *data, int type) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 19 21: 8:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FC6637B401; Fri, 19 Jul 2002 21:08:22 -0700 (PDT) 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 31B3737B400 for ; Fri, 19 Jul 2002 21:08:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C460743E75 for ; Fri, 19 Jul 2002 21:08:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6K48LJU017145 for ; Fri, 19 Jul 2002 21:08:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6K48LoH017142 for perforce@freebsd.org; Fri, 19 Jul 2002 21:08:21 -0700 (PDT) Date: Fri, 19 Jul 2002 21:08:21 -0700 (PDT) Message-Id: <200207200408.g6K48LoH017142@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14500 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14500 Change 14500 by rwatson@rwatson_curry on 2002/07/19 21:07:37 Entry point to authorize chroot(). No policy implementations yet. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#174 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#49 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#111 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#72 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#174 (text+ko) ==== @@ -514,6 +514,10 @@ mpc->mpc_ops.mpo_cred_check_chdir_vnode = mpe->mpe_function; break; + case MAC_CRED_CHECK_CHROOT_VNODE: + mpc->mpc_ops.mpo_cred_check_chroot_vnode = + mpe->mpe_function; + break; case MAC_CRED_CHECK_CREATE_VNODE: mpc->mpc_ops.mpo_cred_check_create_vnode = mpe->mpe_function; @@ -1556,6 +1560,24 @@ } int +mac_cred_check_chroot_vnode(struct ucred *cred, struct vnode *dvp) +{ + int error; + + ASSERT_VOP_LOCKED(dvp, "mac_cred_check_chroot_vnode"); + + if (!mac_enforce_fs) + return (0); + + error = vn_refreshlabel(dvp, cred); + if (error) + return (error); + + MAC_CHECK(cred_check_chroot_vnode, cred, dvp, &dvp->v_label); + return (error); +} + +int mac_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct vattr *vap) { ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#49 (text+ko) ==== @@ -1600,7 +1600,15 @@ NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, SCARG(uap, path), td); #ifdef MAC - /* XXXMAC: MAC check for chroot here. */ + if ((error = mac_cred_check_chroot_vnode(td->td_ucred, nd.ni_vp))) { + /* + * XXX: Release of namei() structures may be wrong here + * and below in existing code. + */ + FILEDESC_UNLOCK(fdp); + vput(nd.ni_vp); + return (error); + } #endif if ((error = change_dir(&nd, td)) != 0) return (error); ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#111 (text+ko) ==== @@ -247,6 +247,7 @@ int mac_cred_check_bind_socket(struct ucred *cred, struct socket *so, struct sockaddr *sa); int mac_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp); +int mac_cred_check_chroot_vnode(struct ucred *cred, struct vnode *dvp); int mac_cred_check_connect_socket(struct ucred *cred, struct socket *so, struct sockaddr *sa); int mac_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#72 (text+ko) ==== @@ -252,6 +252,8 @@ struct vnode *vp, struct label *label, int flags); int (*mpo_cred_check_chdir_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel); + int (*mpo_cred_check_chroot_vnode)(struct ucred *cred, + struct vnode *dvp, struct label *dlabel); int (*mpo_cred_check_create_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vattr *vap); @@ -391,6 +393,7 @@ MAC_CRED_CHECK_DEBUG_PROC, MAC_CRED_CHECK_ACCESS_VNODE, MAC_CRED_CHECK_CHDIR_VNODE, + MAC_CRED_CHECK_CHROOT_VNODE, MAC_CRED_CHECK_CONNECT_SOCKET, MAC_CRED_CHECK_CREATE_VNODE, MAC_CRED_CHECK_DELETE_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 7:42:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DB8237B401; Sat, 20 Jul 2002 07:42:29 -0700 (PDT) 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 8A5B437B400 for ; Sat, 20 Jul 2002 07:42:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48FAA43E4A for ; Sat, 20 Jul 2002 07:42:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KEgRJU032141 for ; Sat, 20 Jul 2002 07:42:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KEgRmg032137 for perforce@freebsd.org; Sat, 20 Jul 2002 07:42:27 -0700 (PDT) Date: Sat, 20 Jul 2002 07:42:27 -0700 (PDT) Message-Id: <200207201442.g6KEgRmg032137@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14519 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14519 Change 14519 by rwatson@rwatson_curry on 2002/07/20 07:41:26 Sadly, babyaudit is a victim of correct VFS locking: we can't invoke vn_fullpath() deep in a MAC module because we already hold sufficient vnode locks to give it a head ache. Releasing and re-acquiring those locks would open race conditions. Presumably a better solution would involve a record queue and a worker thread to avoid the locking issues, but I don't have time to implement that right now. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/babyaudit/babyaudit.c#10 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 7:43:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C223D37B401; Sat, 20 Jul 2002 07:43:30 -0700 (PDT) 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 654EB37B400 for ; Sat, 20 Jul 2002 07:43:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1079B43E4A for ; Sat, 20 Jul 2002 07:43:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KEhTJU032406 for ; Sat, 20 Jul 2002 07:43:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KEhTeY032403 for perforce@freebsd.org; Sat, 20 Jul 2002 07:43:29 -0700 (PDT) Date: Sat, 20 Jul 2002 07:43:29 -0700 (PDT) Message-Id: <200207201443.g6KEhTeY032403@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14520 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14520 Change 14520 by rwatson@rwatson_curry on 2002/07/20 07:43:04 Don't need this anymore either, and it was already disconnected from the build. Affected files ... .. //depot/projects/trustedbsd/mac/sys/modules/babyaudit/Makefile#2 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 7:52:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D19BE37B401; Sat, 20 Jul 2002 07:52:04 -0700 (PDT) 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 5653E37B400 for ; Sat, 20 Jul 2002 07:52:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CBF6143E31 for ; Sat, 20 Jul 2002 07:52:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KEq3JU033316 for ; Sat, 20 Jul 2002 07:52:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KEq3YZ033313 for perforce@freebsd.org; Sat, 20 Jul 2002 07:52:03 -0700 (PDT) Date: Sat, 20 Jul 2002 07:52:03 -0700 (PDT) Message-Id: <200207201452.g6KEq3YZ033313@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14521 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14521 Change 14521 by rwatson@rwatson_curry on 2002/07/20 07:51:33 Teach various policies about chroot access control. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#52 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#33 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#41 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#35 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#36 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#5 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#52 (text+ko) ==== @@ -1338,6 +1338,24 @@ } static int +mac_biba_cred_check_chroot_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(dlabel); + + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int mac_biba_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vattr *vap) { @@ -1903,6 +1921,8 @@ (macop_t)mac_biba_cred_check_debug_proc }, { MAC_CRED_CHECK_CHDIR_VNODE, (macop_t)mac_biba_cred_check_chdir_vnode }, + { MAC_CRED_CHECK_CHROOT_VNODE, + (macop_t)mac_biba_cred_check_chroot_vnode }, { MAC_CRED_CHECK_CREATE_VNODE, (macop_t)mac_biba_cred_check_create_vnode }, { MAC_CRED_CHECK_DELETE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#33 (text+ko) ==== @@ -321,6 +321,22 @@ } static int +mac_bsdextended_cred_check_chroot_vnode(struct ucred *cred, struct vnode *dvp, + struct mac *dlabel) +{ + struct vattr vap; + int error; + + if (!mac_bsdextended_enabled) + return (0); + + error = VOP_GETATTR(dvp, &vap, cred, curthread); + if (error) + return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VEXEC)); +} + +static int mac_bsdextended_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct mac *dlabel, struct vattr *vap) { @@ -709,6 +725,8 @@ (macop_t)mac_bsdextended_cred_check_access_vnode }, { MAC_CRED_CHECK_CHDIR_VNODE, (macop_t)mac_bsdextended_cred_check_chdir_vnode }, + { MAC_CRED_CHECK_CHROOT_VNODE, + (macop_t)mac_bsdextended_cred_check_chroot_vnode }, { MAC_CRED_CHECK_CREATE_VNODE, (macop_t)mac_bsdextended_cred_check_create_vnode }, { MAC_CRED_CHECK_DELETE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#41 (text+ko) ==== @@ -1281,6 +1281,24 @@ } static int +mac_mls_cred_check_chroot_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(dlabel); + + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_mls_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vattr *vap) { @@ -1846,6 +1864,8 @@ (macop_t)mac_mls_cred_check_debug_proc }, { MAC_CRED_CHECK_CHDIR_VNODE, (macop_t)mac_mls_cred_check_chdir_vnode }, + { MAC_CRED_CHECK_CHROOT_VNODE, + (macop_t)mac_mls_cred_check_chroot_vnode }, { MAC_CRED_CHECK_CREATE_VNODE, (macop_t)mac_mls_cred_check_create_vnode }, { MAC_CRED_CHECK_DELETE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#35 (text+ko) ==== @@ -612,6 +612,14 @@ } static int +mac_none_cred_check_chroot_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + + return (0); +} + +static int mac_none_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vattr *vap) { @@ -944,6 +952,8 @@ (macop_t)mac_none_cred_check_debug_proc }, { MAC_CRED_CHECK_CHDIR_VNODE, (macop_t)mac_none_cred_check_chdir_vnode }, + { MAC_CRED_CHECK_CHROOT_VNODE, + (macop_t)mac_none_cred_check_chroot_vnode }, { MAC_CRED_CHECK_CREATE_VNODE, (macop_t)mac_none_cred_check_create_vnode }, { MAC_CRED_CHECK_DELETE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#36 (text+ko) ==== @@ -1245,6 +1245,15 @@ } static int +mac_te_cred_check_chroot_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + + return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_CHROOT)); +} + +static int mac_te_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vattr *vap) { @@ -1527,6 +1536,8 @@ { MAC_CRED_CHECK_STATFS, (macop_t)mac_te_cred_check_statfs }, { MAC_CRED_CHECK_DEBUG_PROC, (macop_t)mac_te_cred_check_debug_proc }, { MAC_CRED_CHECK_CHDIR_VNODE, (macop_t)mac_te_cred_check_chdir_vnode }, + { MAC_CRED_CHECK_CHROOT_VNODE, + (macop_t)mac_te_cred_check_chroot_vnode }, { MAC_CRED_CHECK_CREATE_VNODE, (macop_t)mac_te_cred_check_create_vnode }, { MAC_RELABEL_VNODE, (macop_t)mac_te_relabel_vnode }, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#5 (text+ko) ==== @@ -86,16 +86,17 @@ #define MAC_TE_CLASS_DIR 4 #define MAC_TE_OPERATION_DIR_ADMIN 1 #define MAC_TE_OPERATION_DIR_CHDIR 2 -#define MAC_TE_OPERATION_DIR_DELETE 3 -#define MAC_TE_OPERATION_DIR_DELETEACL 4 -#define MAC_TE_OPERATION_DIR_GETACL 5 -#define MAC_TE_OPERATION_DIR_GETEXTATTR 6 -#define MAC_TE_OPERATION_DIR_LOOKUP 7 -#define MAC_TE_OPERATION_DIR_READ 8 -#define MAC_TE_OPERATION_DIR_SETACL 9 -#define MAC_TE_OPERATION_DIR_SETEXTATTR 10 -#define MAC_TE_OPERATION_DIR_STAT 11 -#define MAC_TE_OPERATION_DIR_WRITE 12 +#define MAC_TE_OPERATION_DIR_CHROOT 3 +#define MAC_TE_OPERATION_DIR_DELETE 4 +#define MAC_TE_OPERATION_DIR_DELETEACL 5 +#define MAC_TE_OPERATION_DIR_GETACL 6 +#define MAC_TE_OPERATION_DIR_GETEXTATTR 7 +#define MAC_TE_OPERATION_DIR_LOOKUP 8 +#define MAC_TE_OPERATION_DIR_READ 9 +#define MAC_TE_OPERATION_DIR_SETACL 10 +#define MAC_TE_OPERATION_DIR_SETEXTATTR 11 +#define MAC_TE_OPERATION_DIR_STAT 12 +#define MAC_TE_OPERATION_DIR_WRITE 13 #define MAC_TE_CLASS_FS 5 #define MAC_TE_OPERATION_FS_STATFS 1 ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#5 (text+ko) ==== @@ -805,6 +805,14 @@ } static int +mac_test_cred_check_chroot_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + + return (0); +} + +static int mac_test_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vattr *vap) { @@ -1135,6 +1143,8 @@ (macop_t)mac_test_cred_check_debug_proc }, { MAC_CRED_CHECK_CHDIR_VNODE, (macop_t)mac_test_cred_check_chdir_vnode }, + { MAC_CRED_CHECK_CHROOT_VNODE, + (macop_t)mac_test_cred_check_chroot_vnode }, { MAC_CRED_CHECK_CREATE_VNODE, (macop_t)mac_test_cred_check_create_vnode }, { MAC_CRED_CHECK_DELETE_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 8: 4:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B24B37B401; Sat, 20 Jul 2002 08:04:20 -0700 (PDT) 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 9E46C37B400 for ; Sat, 20 Jul 2002 08:04:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B00543E4A for ; Sat, 20 Jul 2002 08:04:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KF4JJU034165 for ; Sat, 20 Jul 2002 08:04:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KF4Jwv034162 for perforce@freebsd.org; Sat, 20 Jul 2002 08:04:19 -0700 (PDT) Date: Sat, 20 Jul 2002 08:04:19 -0700 (PDT) Message-Id: <200207201504.g6KF4Jwv034162@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14522 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14522 Change 14522 by rwatson@rwatson_curry on 2002/07/20 08:04:10 Implement MAC security checks for file/directory removal in the system call implementations of unlink() and rmdir(). This duplicates the checks for deletion currently in namei()/lookup(), but puts them in a place more consistent with other checks. We should probably remove the deletion checks from namei(). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#50 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#50 (text+ko) ==== @@ -2253,8 +2253,16 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); if (!error) { - VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); - error = VOP_REMOVE(nd.ni_dvp, vp, &nd.ni_cnd); +#ifdef MAC + error = mac_cred_check_delete_vnode(td->td_ucred, nd.ni_dvp, + vp); + if (error == 0) { +#endif + VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); + error = VOP_REMOVE(nd.ni_dvp, vp, &nd.ni_cnd); +#ifdef MAC + } +#endif } NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); @@ -3902,6 +3910,11 @@ error = EBUSY; goto out; } +#ifdef MAC + error = mac_cred_check_delete_vnode(td->td_ucred, nd.ni_dvp, vp); + if (error) + goto out; +#endif if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { NDFREE(&nd, NDF_ONLY_PNBUF); if (nd.ni_dvp == vp) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 8:16:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D37EE37B401; Sat, 20 Jul 2002 08:15:35 -0700 (PDT) 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 4978337B400 for ; Sat, 20 Jul 2002 08:15:35 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7DA143E58 for ; Sat, 20 Jul 2002 08:15:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KFFYJU039421 for ; Sat, 20 Jul 2002 08:15:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KFFXge039418 for perforce@freebsd.org; Sat, 20 Jul 2002 08:15:33 -0700 (PDT) Date: Sat, 20 Jul 2002 08:15:33 -0700 (PDT) Message-Id: <200207201515.g6KFFXge039418@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14523 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14523 Change 14523 by rwatson@rwatson_curry on 2002/07/20 08:14:56 Dynamically allocate the operation vector so we maintain the ABI for modules even when changing the operation vector. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#175 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#73 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#175 (text+ko) ==== @@ -187,9 +187,9 @@ error = 0; \ MAC_POLICY_LIST_BUSY(); \ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ - if (mpc->mpc_ops.mpo_ ## check != NULL) \ + if (mpc->mpc_ops->mpo_ ## check != NULL) \ error = error_select( \ - mpc->mpc_ops.mpo_ ## check (args), \ + mpc->mpc_ops->mpo_ ## check (args), \ error); \ } \ MAC_POLICY_LIST_UNBUSY(); \ @@ -208,9 +208,9 @@ \ MAC_POLICY_LIST_BUSY(); \ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ - if (mpc->mpc_ops.mpo_ ## operation != NULL) \ + if (mpc->mpc_ops->mpo_ ## operation != NULL) \ result = result composition \ - mpc->mpc_ops.mpo_ ## operation (args); \ + mpc->mpc_ops->mpo_ ## operation (args); \ } \ MAC_POLICY_LIST_UNBUSY(); \ } while (0) @@ -224,12 +224,13 @@ \ MAC_POLICY_LIST_BUSY(); \ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ - if (mpc->mpc_ops.mpo_ ## operation != NULL) \ - mpc->mpc_ops.mpo_ ## operation (args); \ + if (mpc->mpc_ops->mpo_ ## operation != NULL) \ + mpc->mpc_ops->mpo_ ## operation (args); \ } \ MAC_POLICY_LIST_UNBUSY(); \ } while (0) +MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); MALLOC_DEFINE(M_TMPLABEL, "tmplabel", "temporary user-label copied storage"); const size_t maxlabelsize = 65536; @@ -298,9 +299,14 @@ mac_policy_register(struct mac_policy_conf *mpc) { struct mac_policy_conf *tmpc; + struct mac_policy_ops *ops; struct mac_policy_op_entry *mpe; int slot; + MALLOC(ops, struct mac_policy_ops *, sizeof(*ops), M_MACOPVEC, + M_WAITOK); + mpc->mpc_ops = ops; + for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) { switch (mpe->mpe_constant) { case MAC_OP_LAST: @@ -310,392 +316,392 @@ */ break; case MAC_DESTROY: - mpc->mpc_ops.mpo_destroy = + mpc->mpc_ops->mpo_destroy = mpe->mpe_function; break; case MAC_INIT: - mpc->mpc_ops.mpo_init = + mpc->mpc_ops->mpo_init = mpe->mpe_function; break; case MAC_CREATE_DEVFS_DEVICE: - mpc->mpc_ops.mpo_create_devfs_device = + mpc->mpc_ops->mpo_create_devfs_device = mpe->mpe_function; break; case MAC_CREATE_DEVFS_DIRECTORY: - mpc->mpc_ops.mpo_create_devfs_directory = + mpc->mpc_ops->mpo_create_devfs_directory = mpe->mpe_function; break; case MAC_CREATE_DEVFS_VNODE: - mpc->mpc_ops.mpo_create_devfs_vnode = + mpc->mpc_ops->mpo_create_devfs_vnode = mpe->mpe_function; break; case MAC_STDCREATEVNODE_EA: - mpc->mpc_ops.mpo_stdcreatevnode_ea = + mpc->mpc_ops->mpo_stdcreatevnode_ea = mpe->mpe_function; break; case MAC_CREATE_VNODE_FROM_VNODE: - mpc->mpc_ops.mpo_create_vnode_from_vnode = + mpc->mpc_ops->mpo_create_vnode_from_vnode = mpe->mpe_function; break; case MAC_CREATE_MOUNT: - mpc->mpc_ops.mpo_create_mount = mpe->mpe_function; + mpc->mpc_ops->mpo_create_mount = mpe->mpe_function; break; case MAC_CREATE_ROOT_MOUNT: - mpc->mpc_ops.mpo_create_root_mount = mpe->mpe_function; + mpc->mpc_ops->mpo_create_root_mount = mpe->mpe_function; break; case MAC_RELABEL_VNODE: - mpc->mpc_ops.mpo_relabel_vnode = mpe->mpe_function; + mpc->mpc_ops->mpo_relabel_vnode = mpe->mpe_function; break; case MAC_UPDATE_DEVFSDIRENT_FROM_VNODE: - mpc->mpc_ops.mpo_update_devfsdirent_from_vnode = + mpc->mpc_ops->mpo_update_devfsdirent_from_vnode = mpe->mpe_function; break; case MAC_UPDATE_PROCFSVNODE_FROM_SUBJECT: - mpc->mpc_ops.mpo_update_procfsvnode_from_subject = + mpc->mpc_ops->mpo_update_procfsvnode_from_subject = mpe->mpe_function; break; case MAC_UPDATE_VNODE_FROM_EXTATTR: - mpc->mpc_ops.mpo_update_vnode_from_extattr = + mpc->mpc_ops->mpo_update_vnode_from_extattr = mpe->mpe_function; break; case MAC_UPDATE_VNODE_FROM_EXTERNALIZED: - mpc->mpc_ops.mpo_update_vnode_from_externalized = + mpc->mpc_ops->mpo_update_vnode_from_externalized = mpe->mpe_function; break; case MAC_UPDATE_VNODE_FROM_MOUNT: - mpc->mpc_ops.mpo_update_vnode_from_mount = + mpc->mpc_ops->mpo_update_vnode_from_mount = mpe->mpe_function; break; case MAC_CREATE_MBUF_FROM_SOCKET: - mpc->mpc_ops.mpo_create_mbuf_from_socket = + mpc->mpc_ops->mpo_create_mbuf_from_socket = mpe->mpe_function; break; case MAC_CREATE_SOCKET: - mpc->mpc_ops.mpo_create_socket = mpe->mpe_function; + mpc->mpc_ops->mpo_create_socket = mpe->mpe_function; break; case MAC_CREATE_SOCKET_FROM_SOCKET: - mpc->mpc_ops.mpo_create_socket_from_socket = + mpc->mpc_ops->mpo_create_socket_from_socket = mpe->mpe_function; break; case MAC_RELABEL_SOCKET: - mpc->mpc_ops.mpo_relabel_socket = mpe->mpe_function; + mpc->mpc_ops->mpo_relabel_socket = mpe->mpe_function; break; case MAC_SET_SOCKET_PEER_FROM_MBUF: - mpc->mpc_ops.mpo_set_socket_peer_from_mbuf = + mpc->mpc_ops->mpo_set_socket_peer_from_mbuf = mpe->mpe_function; break; case MAC_SET_SOCKET_PEER_FROM_SOCKET: - mpc->mpc_ops.mpo_set_socket_peer_from_socket = + mpc->mpc_ops->mpo_set_socket_peer_from_socket = mpe->mpe_function; break; case MAC_CREATE_BPFDESC: - mpc->mpc_ops.mpo_create_bpfdesc = + mpc->mpc_ops->mpo_create_bpfdesc = mpe->mpe_function; break; case MAC_CREATE_DATAGRAM_FROM_IPQ: - mpc->mpc_ops.mpo_create_datagram_from_ipq = + mpc->mpc_ops->mpo_create_datagram_from_ipq = mpe->mpe_function; break; case MAC_CREATE_FRAGMENT_FROM_DATAGRAM: - mpc->mpc_ops.mpo_create_fragment_from_datagram = + mpc->mpc_ops->mpo_create_fragment_from_datagram = mpe->mpe_function; break; case MAC_CREATE_IFNET: - mpc->mpc_ops.mpo_create_ifnet = + mpc->mpc_ops->mpo_create_ifnet = mpe->mpe_function; break; case MAC_CREATE_IPQ_FROM_FRAGMENT: - mpc->mpc_ops.mpo_create_ipq_from_fragment = + mpc->mpc_ops->mpo_create_ipq_from_fragment = mpe->mpe_function; break; case MAC_CREATE_MBUF_FROM_MBUF: - mpc->mpc_ops.mpo_create_mbuf_from_mbuf = + mpc->mpc_ops->mpo_create_mbuf_from_mbuf = mpe->mpe_function; break; case MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET: - mpc->mpc_ops.mpo_create_mbuf_linklayer_for_ifnet = + mpc->mpc_ops->mpo_create_mbuf_linklayer_for_ifnet = mpe->mpe_function; break; case MAC_CREATE_MBUF_FROM_BPFDESC: - mpc->mpc_ops.mpo_create_mbuf_from_bpfdesc = + mpc->mpc_ops->mpo_create_mbuf_from_bpfdesc = mpe->mpe_function; break; case MAC_CREATE_MBUF_FROM_IFNET: - mpc->mpc_ops.mpo_create_mbuf_from_ifnet = + mpc->mpc_ops->mpo_create_mbuf_from_ifnet = mpe->mpe_function; break; case MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF: - mpc->mpc_ops.mpo_create_mbuf_multicast_encap_from_mbuf = + mpc->mpc_ops->mpo_create_mbuf_multicast_encap_from_mbuf = mpe->mpe_function; break; case MAC_CREATE_MBUF_NETLAYER_FROM_MBUF: - mpc->mpc_ops.mpo_create_mbuf_netlayer_from_mbuf = + mpc->mpc_ops->mpo_create_mbuf_netlayer_from_mbuf = mpe->mpe_function; break; case MAC_FRAGMENT_MATCHES_IPQ: - mpc->mpc_ops.mpo_fragment_matches_ipq = + mpc->mpc_ops->mpo_fragment_matches_ipq = mpe->mpe_function; break; case MAC_RELABEL_IFNET: - mpc->mpc_ops.mpo_relabel_ifnet = mpe->mpe_function; + mpc->mpc_ops->mpo_relabel_ifnet = mpe->mpe_function; break; case MAC_UPDATE_IPQ_FROM_FRAGMENT: - mpc->mpc_ops.mpo_update_ipq_from_fragment = + mpc->mpc_ops->mpo_update_ipq_from_fragment = mpe->mpe_function; break; case MAC_CREATE_SUBJECT: - mpc->mpc_ops.mpo_create_subject = mpe->mpe_function; + mpc->mpc_ops->mpo_create_subject = mpe->mpe_function; break; case MAC_EXECVE_TRANSITION: - mpc->mpc_ops.mpo_execve_transition = mpe->mpe_function; + mpc->mpc_ops->mpo_execve_transition = mpe->mpe_function; break; case MAC_EXECVE_WILL_TRANSITION: - mpc->mpc_ops.mpo_execve_will_transition = + mpc->mpc_ops->mpo_execve_will_transition = mpe->mpe_function; break; case MAC_CREATE_PROC0: - mpc->mpc_ops.mpo_create_proc0 = mpe->mpe_function; + mpc->mpc_ops->mpo_create_proc0 = mpe->mpe_function; break; case MAC_CREATE_PROC1: - mpc->mpc_ops.mpo_create_proc1 = mpe->mpe_function; + mpc->mpc_ops->mpo_create_proc1 = mpe->mpe_function; break; case MAC_RELABEL_SUBJECT: - mpc->mpc_ops.mpo_relabel_subject = + mpc->mpc_ops->mpo_relabel_subject = mpe->mpe_function; break; case MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET: - mpc->mpc_ops.mpo_bpfdesc_check_receive_from_ifnet = + mpc->mpc_ops->mpo_bpfdesc_check_receive_from_ifnet = mpe->mpe_function; break; case MAC_CRED_CHECK_BIND_SOCKET: - mpc->mpc_ops.mpo_cred_check_bind_socket = + mpc->mpc_ops->mpo_cred_check_bind_socket = mpe->mpe_function; break; case MAC_CRED_CHECK_CONNECT_SOCKET: - mpc->mpc_ops.mpo_cred_check_connect_socket = + mpc->mpc_ops->mpo_cred_check_connect_socket = mpe->mpe_function; break; case MAC_CRED_CHECK_SEE_CRED: - mpc->mpc_ops.mpo_cred_check_see_cred = + mpc->mpc_ops->mpo_cred_check_see_cred = mpe->mpe_function; break; case MAC_CRED_CHECK_SEE_SOCKET: - mpc->mpc_ops.mpo_cred_check_see_socket = + mpc->mpc_ops->mpo_cred_check_see_socket = mpe->mpe_function; break; case MAC_CRED_CHECK_RELABEL_IFNET: - mpc->mpc_ops.mpo_cred_check_relabel_ifnet = + mpc->mpc_ops->mpo_cred_check_relabel_ifnet = mpe->mpe_function; break; case MAC_CRED_CHECK_RELABEL_SOCKET: - mpc->mpc_ops.mpo_cred_check_relabel_socket = + mpc->mpc_ops->mpo_cred_check_relabel_socket = mpe->mpe_function; break; case MAC_CRED_CHECK_RELABEL_SUBJECT: - mpc->mpc_ops.mpo_cred_check_relabel_subject = + mpc->mpc_ops->mpo_cred_check_relabel_subject = mpe->mpe_function; break; case MAC_CRED_CHECK_RELABEL_VNODE: - mpc->mpc_ops.mpo_cred_check_relabel_vnode = + mpc->mpc_ops->mpo_cred_check_relabel_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_STATFS: - mpc->mpc_ops.mpo_cred_check_statfs = mpe->mpe_function; + mpc->mpc_ops->mpo_cred_check_statfs = mpe->mpe_function; break; case MAC_CRED_CHECK_DEBUG_PROC: - mpc->mpc_ops.mpo_cred_check_debug_proc = + mpc->mpc_ops->mpo_cred_check_debug_proc = mpe->mpe_function; break; case MAC_CRED_CHECK_ACCESS_VNODE: - mpc->mpc_ops.mpo_cred_check_access_vnode = + mpc->mpc_ops->mpo_cred_check_access_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_CHDIR_VNODE: - mpc->mpc_ops.mpo_cred_check_chdir_vnode = + mpc->mpc_ops->mpo_cred_check_chdir_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_CHROOT_VNODE: - mpc->mpc_ops.mpo_cred_check_chroot_vnode = + mpc->mpc_ops->mpo_cred_check_chroot_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_CREATE_VNODE: - mpc->mpc_ops.mpo_cred_check_create_vnode = + mpc->mpc_ops->mpo_cred_check_create_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_DELETE_VNODE: - mpc->mpc_ops.mpo_cred_check_delete_vnode = + mpc->mpc_ops->mpo_cred_check_delete_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_DELETEACL_VNODE: - mpc->mpc_ops.mpo_cred_check_deleteacl_vnode = + mpc->mpc_ops->mpo_cred_check_deleteacl_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_EXEC_VNODE: - mpc->mpc_ops.mpo_cred_check_exec_vnode = + mpc->mpc_ops->mpo_cred_check_exec_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_GETACL_VNODE: - mpc->mpc_ops.mpo_cred_check_getacl_vnode = + mpc->mpc_ops->mpo_cred_check_getacl_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_GETEXTATTR_VNODE: - mpc->mpc_ops.mpo_cred_check_getextattr_vnode = + mpc->mpc_ops->mpo_cred_check_getextattr_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_LISTEN_SOCKET: - mpc->mpc_ops.mpo_cred_check_listen_socket = + mpc->mpc_ops->mpo_cred_check_listen_socket = mpe->mpe_function; break; case MAC_CRED_CHECK_OPEN_VNODE: - mpc->mpc_ops.mpo_cred_check_open_vnode = + mpc->mpc_ops->mpo_cred_check_open_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_RENAME_FROM_VNODE: - mpc->mpc_ops.mpo_cred_check_rename_from_vnode = + mpc->mpc_ops->mpo_cred_check_rename_from_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_RENAME_TO_VNODE: - mpc->mpc_ops.mpo_cred_check_rename_to_vnode = + mpc->mpc_ops->mpo_cred_check_rename_to_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_REVOKE_VNODE: - mpc->mpc_ops.mpo_cred_check_revoke_vnode = + mpc->mpc_ops->mpo_cred_check_revoke_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_SEARCH_VNODE: - mpc->mpc_ops.mpo_cred_check_search_vnode = + mpc->mpc_ops->mpo_cred_check_search_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_SETACL_VNODE: - mpc->mpc_ops.mpo_cred_check_setacl_vnode = + mpc->mpc_ops->mpo_cred_check_setacl_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_SETEXTATTR_VNODE: - mpc->mpc_ops.mpo_cred_check_setextattr_vnode = + mpc->mpc_ops->mpo_cred_check_setextattr_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_SETFLAGS_VNODE: - mpc->mpc_ops.mpo_cred_check_setflags_vnode = + mpc->mpc_ops->mpo_cred_check_setflags_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_SETMODE_VNODE: - mpc->mpc_ops.mpo_cred_check_setmode_vnode = + mpc->mpc_ops->mpo_cred_check_setmode_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_SETOWNER_VNODE: - mpc->mpc_ops.mpo_cred_check_setowner_vnode = + mpc->mpc_ops->mpo_cred_check_setowner_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_SETUTIMES_VNODE: - mpc->mpc_ops.mpo_cred_check_setutimes_vnode = + mpc->mpc_ops->mpo_cred_check_setutimes_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_SCHED_PROC: - mpc->mpc_ops.mpo_cred_check_sched_proc = + mpc->mpc_ops->mpo_cred_check_sched_proc = mpe->mpe_function; break; case MAC_CRED_CHECK_SIGNAL_PROC: - mpc->mpc_ops.mpo_cred_check_signal_proc = + mpc->mpc_ops->mpo_cred_check_signal_proc = mpe->mpe_function; break; case MAC_CRED_CHECK_STAT_VNODE: - mpc->mpc_ops.mpo_cred_check_stat_vnode = + mpc->mpc_ops->mpo_cred_check_stat_vnode = mpe->mpe_function; break; case MAC_IFNET_CHECK_SEND_MBUF: - mpc->mpc_ops.mpo_ifnet_check_send_mbuf = + mpc->mpc_ops->mpo_ifnet_check_send_mbuf = mpe->mpe_function; break; case MAC_SOCKET_CHECK_RECEIVE_MBUF: - mpc->mpc_ops.mpo_socket_check_receive_mbuf = + mpc->mpc_ops->mpo_socket_check_receive_mbuf = mpe->mpe_function; break; case MAC_INIT_BPFDESC: - mpc->mpc_ops.mpo_init_bpfdesc = + mpc->mpc_ops->mpo_init_bpfdesc = mpe->mpe_function; break; case MAC_INIT_DEVFSDIRENT: - mpc->mpc_ops.mpo_init_devfsdirent = + mpc->mpc_ops->mpo_init_devfsdirent = mpe->mpe_function; break; case MAC_INIT_IFNET: - mpc->mpc_ops.mpo_init_ifnet = + mpc->mpc_ops->mpo_init_ifnet = mpe->mpe_function; break; case MAC_INIT_IPQ: - mpc->mpc_ops.mpo_init_ipq = + mpc->mpc_ops->mpo_init_ipq = mpe->mpe_function; break; case MAC_INIT_MBUF: - mpc->mpc_ops.mpo_init_mbuf = + mpc->mpc_ops->mpo_init_mbuf = mpe->mpe_function; break; case MAC_INIT_MOUNT: - mpc->mpc_ops.mpo_init_mount = + mpc->mpc_ops->mpo_init_mount = mpe->mpe_function; break; case MAC_INIT_SOCKET: - mpc->mpc_ops.mpo_init_socket = + mpc->mpc_ops->mpo_init_socket = mpe->mpe_function; break; case MAC_INIT_SUBJECT: - mpc->mpc_ops.mpo_init_subject = + mpc->mpc_ops->mpo_init_subject = mpe->mpe_function; break; case MAC_INIT_TEMP: - mpc->mpc_ops.mpo_init_temp = + mpc->mpc_ops->mpo_init_temp = mpe->mpe_function; break; case MAC_INIT_VNODE: - mpc->mpc_ops.mpo_init_vnode = + mpc->mpc_ops->mpo_init_vnode = mpe->mpe_function; break; case MAC_DESTROY_BPFDESC: - mpc->mpc_ops.mpo_destroy_bpfdesc = + mpc->mpc_ops->mpo_destroy_bpfdesc = mpe->mpe_function; break; case MAC_DESTROY_DEVFSDIRENT: - mpc->mpc_ops.mpo_destroy_devfsdirent = + mpc->mpc_ops->mpo_destroy_devfsdirent = mpe->mpe_function; break; case MAC_DESTROY_IFNET: - mpc->mpc_ops.mpo_destroy_ifnet = + mpc->mpc_ops->mpo_destroy_ifnet = mpe->mpe_function; break; case MAC_DESTROY_IPQ: - mpc->mpc_ops.mpo_destroy_ipq = + mpc->mpc_ops->mpo_destroy_ipq = mpe->mpe_function; break; case MAC_DESTROY_MBUF: - mpc->mpc_ops.mpo_destroy_mbuf = + mpc->mpc_ops->mpo_destroy_mbuf = mpe->mpe_function; break; case MAC_DESTROY_MOUNT: - mpc->mpc_ops.mpo_destroy_mount = + mpc->mpc_ops->mpo_destroy_mount = mpe->mpe_function; break; case MAC_DESTROY_SOCKET: - mpc->mpc_ops.mpo_destroy_socket = + mpc->mpc_ops->mpo_destroy_socket = mpe->mpe_function; break; case MAC_DESTROY_SUBJECT: - mpc->mpc_ops.mpo_destroy_subject = + mpc->mpc_ops->mpo_destroy_subject = mpe->mpe_function; break; case MAC_DESTROY_TEMP: - mpc->mpc_ops.mpo_destroy_temp = + mpc->mpc_ops->mpo_destroy_temp = mpe->mpe_function; break; case MAC_DESTROY_VNODE: - mpc->mpc_ops.mpo_destroy_vnode = + mpc->mpc_ops->mpo_destroy_vnode = mpe->mpe_function; break; case MAC_EXTERNALIZE: - mpc->mpc_ops.mpo_externalize = + mpc->mpc_ops->mpo_externalize = mpe->mpe_function; break; case MAC_INTERNALIZE: - mpc->mpc_ops.mpo_internalize = + mpc->mpc_ops->mpo_internalize = mpe->mpe_function; break; /* @@ -731,8 +737,8 @@ LIST_INSERT_HEAD(&mac_policy_list, mpc, mpc_list); /* Per-policy initialization. */ - if (mpc->mpc_ops.mpo_init != NULL) - (*(mpc->mpc_ops.mpo_init))(mpc); + if (mpc->mpc_ops->mpo_init != NULL) + (*(mpc->mpc_ops->mpo_init))(mpc); MAC_POLICY_LIST_UNLOCK(); printf("Security policy loaded: %s (%s)\n", mpc->mpc_fullname, @@ -759,12 +765,15 @@ MAC_POLICY_LIST_UNLOCK(); return (EBUSY); } - if (mpc->mpc_ops.mpo_destroy != NULL) - (*(mpc->mpc_ops.mpo_destroy))(mpc); + if (mpc->mpc_ops->mpo_destroy != NULL) + (*(mpc->mpc_ops->mpo_destroy))(mpc); LIST_REMOVE(mpc, mpc_list); MAC_POLICY_LIST_UNLOCK(); + FREE(mpc->mpc_ops, M_MACOPVEC); + mpc->mpc_ops = NULL; + printf("Security policy unload: %s (%s)\n", mpc->mpc_fullname, mpc->mpc_name); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#73 (text+ko) ==== @@ -428,7 +428,7 @@ struct mac_policy_conf { char *mpc_name; /* policy name */ char *mpc_fullname; /* policy full name */ - struct mac_policy_ops mpc_ops; /* policy operations */ + struct mac_policy_ops *mpc_ops; /* policy operations */ struct mac_policy_op_entry *mpc_entries; /* ops to fill in */ int mpc_loadtime_flags; /* flags */ int *mpc_field_off; /* security field */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 8:17:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 694D637B401; Sat, 20 Jul 2002 08:17:38 -0700 (PDT) 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 0F97037B400 for ; Sat, 20 Jul 2002 08:17:38 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C06DC43E58 for ; Sat, 20 Jul 2002 08:17:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KFHbJU039796 for ; Sat, 20 Jul 2002 08:17:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KFHb84039793 for perforce@freebsd.org; Sat, 20 Jul 2002 08:17:37 -0700 (PDT) Date: Sat, 20 Jul 2002 08:17:37 -0700 (PDT) Message-Id: <200207201517.g6KFHb84039793@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14524 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14524 Change 14524 by rwatson@rwatson_curry on 2002/07/20 08:16:42 Make sure to release mpc_ops memory in various registration failure modes. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#176 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#176 (text+ko) ==== @@ -303,10 +303,8 @@ struct mac_policy_op_entry *mpe; int slot; - MALLOC(ops, struct mac_policy_ops *, sizeof(*ops), M_MACOPVEC, + MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*ops), M_MACOPVEC, M_WAITOK); - mpc->mpc_ops = ops; - for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) { switch (mpe->mpe_constant) { case MAC_OP_LAST: @@ -715,11 +713,15 @@ MAC_POLICY_LIST_LOCK(); if (mac_policy_list_busy > 0) { MAC_POLICY_LIST_UNLOCK(); + FREE(mpc->mpc_ops, M_MACOPVEC); + mpc->mpc_ops = NULL; return (EBUSY); } LIST_FOREACH(tmpc, &mac_policy_list, mpc_list) { if (strcmp(tmpc->mpc_name, mpc->mpc_name) == 0) { MAC_POLICY_LIST_UNLOCK(); + FREE(mpc->mpc_ops, M_MACOPVEC); + mpc->mpc_ops = NULL; return (EEXIST); } } @@ -727,6 +729,8 @@ slot = ffs(mac_policy_offsets_free); if (slot == 0) { MAC_POLICY_LIST_UNLOCK(); + FREE(mpc->mpc_ops, M_MACOPVEC); + mpc->mpc_ops = NULL; return (ENOMEM); } slot--; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 8:44:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C319C37B405; Sat, 20 Jul 2002 08:44:40 -0700 (PDT) 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 5869637B401 for ; Sat, 20 Jul 2002 08:44:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AD6243E3B for ; Sat, 20 Jul 2002 08:44:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KFidJU047964 for ; Sat, 20 Jul 2002 08:44:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KFicRe047958 for perforce@freebsd.org; Sat, 20 Jul 2002 08:44:38 -0700 (PDT) Date: Sat, 20 Jul 2002 08:44:38 -0700 (PDT) Message-Id: <200207201544.g6KFicRe047958@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14525 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14525 Change 14525 by rwatson@rwatson_curry on 2002/07/20 08:43:52 Implement mac_cred_check_readlink() to authorize the reading and use of symlink stored data. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#177 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#13 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#51 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#112 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#74 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#177 (text+ko) ==== @@ -554,6 +554,10 @@ mpc->mpc_ops->mpo_cred_check_open_vnode = mpe->mpe_function; break; + case MAC_CRED_CHECK_READLINK: + mpc->mpc_ops->mpo_cred_check_readlink = + mpe->mpe_function; + break; case MAC_CRED_CHECK_RENAME_FROM_VNODE: mpc->mpc_ops->mpo_cred_check_rename_from_vnode = mpe->mpe_function; @@ -1679,6 +1683,24 @@ } int +mac_cred_check_readlink(struct ucred *cred, struct vnode *vp) +{ + int error; + + ASSERT_VOP_LOCKED(vp, "mac_cred_check_readlink"); + + if (!mac_enforce_fs) + return (0); + + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + + MAC_CHECK(cred_check_readlink, cred, vp, &vp->v_label); + return (error); +} + +int mac_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp) { int error; ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#13 (text+ko) ==== @@ -316,6 +316,11 @@ error = ELOOP; break; } +#ifdef MAC + error = mac_cred_check_readlink(td->td_ucred, ndp->ni_vp); + if (error) + break; +#endif if (ndp->ni_pathlen > 1) cp = uma_zalloc(namei_zone, M_WAITOK); else ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#51 (text+ko) ==== @@ -2849,9 +2849,11 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vp = nd.ni_vp; #ifdef MAC - /* - * XXXMAC: need some or another MAC check here. - */ + error = mac_cred_check_readlink(td->td_ucred, vp); + if (error) { + vput(vp); + return (error); + } #endif if (vp->v_type != VLNK) error = EINVAL; ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#112 (text+ko) ==== @@ -282,6 +282,7 @@ struct vnode *vp, int samedir); int mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode); +int mac_cred_check_readlink(struct ucred *cred, struct vnode *vp); int mac_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp); int mac_cred_check_statfs(struct ucred *cred, struct mount *mp); int mac_getsockopt_label_get(struct ucred *cred, struct socket *so, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#74 (text+ko) ==== @@ -274,6 +274,8 @@ int (*mpo_cred_check_open_vnode)(struct ucred *cred, struct vnode *vp, struct label *label, mode_t acc_mode); + int (*mpo_cred_check_readlink)(struct ucred *cred, + struct vnode *vp, struct label *label); int (*mpo_cred_check_rename_from_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label); @@ -403,6 +405,7 @@ MAC_CRED_CHECK_GETEXTATTR_VNODE, MAC_CRED_CHECK_LISTEN_SOCKET, MAC_CRED_CHECK_OPEN_VNODE, + MAC_CRED_CHECK_READLINK, MAC_CRED_CHECK_RENAME_FROM_VNODE, MAC_CRED_CHECK_RENAME_TO_VNODE, MAC_CRED_CHECK_REVOKE_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 9: 9:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37BBA37B405; Sat, 20 Jul 2002 09:09:08 -0700 (PDT) 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 6496C37B400 for ; Sat, 20 Jul 2002 09:09:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E829543E42 for ; Sat, 20 Jul 2002 09:09:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KG96JU057329 for ; Sat, 20 Jul 2002 09:09:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KG96RA057313 for perforce@freebsd.org; Sat, 20 Jul 2002 09:09:06 -0700 (PDT) Date: Sat, 20 Jul 2002 09:09:06 -0700 (PDT) Message-Id: <200207201609.g6KG96RA057313@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14527 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14527 Change 14527 by rwatson@rwatson_curry on 2002/07/20 09:05:59 Teach policies about mpo_cred_check_readlink(). In particular, teach TE to handle symlinks as their own object class. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#53 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#42 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#36 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#37 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#6 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#53 (text+ko) ==== @@ -1494,6 +1494,24 @@ } static int +mac_biba_cred_check_readlink(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(vnodelabel); + + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int mac_biba_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label) { @@ -1937,6 +1955,8 @@ (macop_t)mac_biba_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_biba_cred_check_open_vnode }, + { MAC_CRED_CHECK_READLINK, + (macop_t)mac_biba_cred_check_readlink }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_biba_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#42 (text+ko) ==== @@ -1437,6 +1437,21 @@ } static int +mac_mls_cred_check_readlink(struct ucred *cred, struct vnode *vp, + struct label *vnodelabel) +{ + struct mac_mls *subj, *obj; + + subj = SLOT(&cred->cr_label); + obj = SLOT(vnodelabel); + + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_mls_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label) { @@ -1880,6 +1895,8 @@ (macop_t)mac_mls_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_mls_cred_check_open_vnode }, + { MAC_CRED_CHECK_READLINK, + (macop_t)mac_mls_cred_check_readlink }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_mls_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#36 (text+ko) ==== @@ -684,6 +684,14 @@ } static int +mac_none_cred_check_readlink(struct ucred *cred, struct vnode *vp, + struct label *vnodelabel) +{ + + return (0); +} + +static int mac_none_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label) { @@ -970,6 +978,8 @@ (macop_t)mac_none_cred_check_listen_socket }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_none_cred_check_open_vnode }, + { MAC_CRED_CHECK_READLINK, + (macop_t)mac_none_cred_check_readlink }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_none_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#37 (text+ko) ==== @@ -421,6 +421,13 @@ default: return ("fs unknown"); } + + case MAC_TE_CLASS_SYLINK: + switch (operation) { + default: + return ("symlink unknown"); + } + default: return ("unknown unknown"); } @@ -1045,6 +1052,20 @@ } static int +mac_te_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, + struct label *vnodelabel) +{ + struct mac_te *subj, *obj; + + subj = SLOT(&cred->cr_label); + obj = SLOT(filelabel); + KASSERT(vp->v_type == VLNK); + + return (mac_te_check(subj, obj, MAC_TE_CLASS_SYMLINK, + MAC_TE_OPERATION_SYMLINK_READLINK)); +} + +static int mac_te_cred_check_see_cred(struct ucred *u1, struct ucred *u2) { @@ -1106,6 +1127,9 @@ case VDIR: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_GETACL)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_GETACL)); default: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_GETACL)); @@ -1121,6 +1145,9 @@ case VDIR: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_FILE, MAC_TE_OPERATION_DIR_GETEXTATTR)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_GETEXTATTR); default: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_GETEXTATTR)); @@ -1154,6 +1181,9 @@ case VDIR: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_SETACL)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_SETACL)); default: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_SETACL)); @@ -1184,6 +1214,9 @@ case VDIR: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_ADMIN)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_ADMIN)); default: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_ADMIN)); @@ -1199,6 +1232,9 @@ case VDIR: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_ADMIN)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_ADMIN)); default: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_ADMIN)); @@ -1214,6 +1250,9 @@ case VDIR: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_ADMIN)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK, ADMIN)); default: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_ADMIN)); @@ -1229,6 +1268,9 @@ case VDIR: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_ADMIN)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_ADMIN)); default: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_ADMIN)); @@ -1272,13 +1314,16 @@ MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_WRITE); if (error) return (error); - if (vp->v_type == VDIR) { + switch (vp->v_type) { + case VDIR: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETE)); - } else { + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETE); + default: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETE)); - } } static int @@ -1290,6 +1335,9 @@ case VDIR: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETEACL)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETEACL)); default: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETEACL)); @@ -1308,10 +1356,17 @@ if (error) return (error); /* Not really correct. */ - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - vp->v_type == VDIR ? MAC_TE_CLASS_DIR : MAC_TE_CLASS_FILE, - vp->v_type == VDIR ? MAC_TE_OPERATION_DIR_DELETE : - MAC_TE_OPERATION_FILE_DELETE)); + switch (vp->v_type) { + case VDIR: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETE)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETE)); + default: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETE)); + } } static int @@ -1325,10 +1380,17 @@ if (error || label == NULL || vp == NULL) return (error); /* Not really correct. */ - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - vp->v_type == VDIR ? MAC_TE_CLASS_DIR : MAC_TE_CLASS_FILE, - vp->v_type == VDIR ? MAC_TE_OPERATION_DIR_DELETE : - MAC_TE_OPERATION_FILE_DELETE)); + switch (vp->v_type) { + case VDIR: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETE)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETE)); + default: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETE)); + } } static int @@ -1337,11 +1399,17 @@ { int error; - error = mac_te_check(SLOT(&cred->cr_label), SLOT(label), - vp->v_type == VDIR ? MAC_TE_CLASS_DIR : MAC_TE_CLASS_FILE, - vp->v_type == VDIR ? MAC_TE_OPERATION_DIR_STAT : - MAC_TE_OPERATION_FILE_STAT); - return (error); + switch (vp->v_type) { + case VDIR: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_STAT)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_STAT)); + default: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_STAT)); + } } static void @@ -1551,6 +1619,8 @@ { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_te_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_te_cred_check_open_vnode }, + { MAC_CRED_CHECK_READLINK, + (macop_t)mac_te_cred_check_readlink }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_te_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#6 (text+ko) ==== @@ -110,4 +110,13 @@ #define MAC_TE_OPERATION_SOCKET_CONNECT 3 #define MAC_TE_OPERATION_SOCKET_LISTEN 4 +#define MAC_TE_CLASS_SYMLINK 8 +#define MAC_TE_OPERATION_SYMLINK_ADMIN 1 +#define MAC_TE_OPERATION_SYMLINK_DELETE 2 +#define MAC_TE_OPERATION_SYMLINK_DELETEACL 3 +#define MAC_TE_OPERATION_SYMLINK_GETACL 4 +#define MAC_TE_OPERATION_SYMLINK_GETEXTATTR 5 +#define MAC_TE_OPERATION_SYMLINK_READLINK 6 +#define MAC_TE_OPERATION_SYMLINK_STAT 7 + #endif /* _SYS_SECURITY_MAC_TE_H */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#6 (text+ko) ==== @@ -877,6 +877,14 @@ } static int +mac_test_cred_check_readlink(struct ucred *cred, struct vnode *vp, + struct label *vnodelabel) +{ + + return (0); +} + +static int mac_test_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label) { @@ -1161,6 +1169,8 @@ (macop_t)mac_test_cred_check_listen_socket }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_test_cred_check_open_vnode }, + { MAC_CRED_CHECK_READLINK, + (macop_t)mac_test_cred_check_readlink }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_test_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 10:18:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C870637B401; Sat, 20 Jul 2002 10:18:32 -0700 (PDT) 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 3F29F37B400 for ; Sat, 20 Jul 2002 10:18:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAF3843E42 for ; Sat, 20 Jul 2002 10:18:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KHIVJU074042 for ; Sat, 20 Jul 2002 10:18:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KHIVBj074039 for perforce@freebsd.org; Sat, 20 Jul 2002 10:18:31 -0700 (PDT) Date: Sat, 20 Jul 2002 10:18:31 -0700 (PDT) Message-Id: <200207201718.g6KHIVBj074039@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14528 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14528 Change 14528 by rwatson@rwatson_curry on 2002/07/20 10:18:09 Typo correction. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#54 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#54 (text+ko) ==== @@ -1503,7 +1503,7 @@ return (0); subj = SLOT(&cred->cr_label); - obj = SLOT(vnodelabel); + obj = SLOT(label); if (!mac_biba_dominate_single(obj, subj)) return (EACCES); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 10:28:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72A7D37B401; Sat, 20 Jul 2002 10:28:45 -0700 (PDT) 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 16A2637B400 for ; Sat, 20 Jul 2002 10:28:45 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B24B643E3B for ; Sat, 20 Jul 2002 10:28:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KHSiJU076415 for ; Sat, 20 Jul 2002 10:28:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KHSiAt076412 for perforce@freebsd.org; Sat, 20 Jul 2002 10:28:44 -0700 (PDT) Date: Sat, 20 Jul 2002 10:28:44 -0700 (PDT) Message-Id: <200207201728.g6KHSiAt076412@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14529 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14529 Change 14529 by rwatson@rwatson_curry on 2002/07/20 10:27:43 mpc_ops is now a pointer, so initialize to NULL. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#75 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#75 (text+ko) ==== @@ -450,7 +450,7 @@ static struct mac_policy_conf mpname##_mac_policy_conf = { \ #mpname, \ mpfullname, \ - { NULL /*... */ }, \ + NULL, \ mpents, \ mpflags, \ privdata_wanted, \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 10:28:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA0C937B400; Sat, 20 Jul 2002 10:28:46 -0700 (PDT) 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 7413037B405 for ; Sat, 20 Jul 2002 10:28:45 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11E1743E5E for ; Sat, 20 Jul 2002 10:28:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KHSiJU076422 for ; Sat, 20 Jul 2002 10:28:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KHSiHY076419 for perforce@freebsd.org; Sat, 20 Jul 2002 10:28:44 -0700 (PDT) Date: Sat, 20 Jul 2002 10:28:44 -0700 (PDT) Message-Id: <200207201728.g6KHSiHY076419@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14530 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14530 Change 14530 by rwatson@rwatson_curry on 2002/07/20 10:28:06 Various cleanups and fixes. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#38 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#38 (text+ko) ==== @@ -422,7 +422,7 @@ return ("fs unknown"); } - case MAC_TE_CLASS_SYLINK: + case MAC_TE_CLASS_SYMLINK: switch (operation) { default: return ("symlink unknown"); @@ -1052,14 +1052,13 @@ } static int -mac_te_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, +mac_te_cred_check_readlink(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { struct mac_te *subj, *obj; subj = SLOT(&cred->cr_label); - obj = SLOT(filelabel); - KASSERT(vp->v_type == VLNK); + obj = SLOT(vnodelabel); return (mac_te_check(subj, obj, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_READLINK)); @@ -1147,7 +1146,7 @@ MAC_TE_CLASS_FILE, MAC_TE_OPERATION_DIR_GETEXTATTR)); case VLNK: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_GETEXTATTR); + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_GETEXTATTR)); default: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_GETEXTATTR)); @@ -1252,7 +1251,7 @@ MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_ADMIN)); case VLNK: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK, ADMIN)); + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_ADMIN)); default: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_ADMIN)); @@ -1320,10 +1319,11 @@ MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETE)); case VLNK: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETE); + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETE)); default: return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETE)); + } } static int @@ -1343,7 +1343,6 @@ MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETEACL)); } } - static int mac_te_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, @@ -1397,7 +1396,6 @@ mac_te_cred_check_stat_vnode(struct ucred *cred, struct vnode *vp, struct label *label) { - int error; switch (vp->v_type) { case VDIR: ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#7 (text+ko) ==== @@ -117,6 +117,8 @@ #define MAC_TE_OPERATION_SYMLINK_GETACL 4 #define MAC_TE_OPERATION_SYMLINK_GETEXTATTR 5 #define MAC_TE_OPERATION_SYMLINK_READLINK 6 -#define MAC_TE_OPERATION_SYMLINK_STAT 7 +#define MAC_TE_OPERATION_SYMLINK_SETACL 7 +#define MAC_TE_OPERATION_SYMLINK_SETEXTATTR 8 +#define MAC_TE_OPERATION_SYMLINK_STAT 9 #endif /* _SYS_SECURITY_MAC_TE_H */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 12:15: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F266337B401; Sat, 20 Jul 2002 12:15:05 -0700 (PDT) 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 81EAC37B400 for ; Sat, 20 Jul 2002 12:15:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F62043E67 for ; Sat, 20 Jul 2002 12:15:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KJF5JU095783 for ; Sat, 20 Jul 2002 12:15:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KJF0XT095766 for perforce@freebsd.org; Sat, 20 Jul 2002 12:15:00 -0700 (PDT) Date: Sat, 20 Jul 2002 12:15:00 -0700 (PDT) Message-Id: <200207201915.g6KJF0XT095766@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14537 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14537 Change 14537 by rwatson@rwatson_curry on 2002/07/20 12:14:18 Make sure we zero the operation vector, or the function pointers may appear to be non-null for policies that don't implement every entry-point, and all hell will break loose. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#178 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#178 (text+ko) ==== @@ -304,7 +304,7 @@ int slot; MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*ops), M_MACOPVEC, - M_WAITOK); + M_WAITOK | M_ZERO); for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) { switch (mpe->mpe_constant) { case MAC_OP_LAST: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 12:54:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22A5E37B401; Sat, 20 Jul 2002 12:53:23 -0700 (PDT) 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 89C3E37B400 for ; Sat, 20 Jul 2002 12:53:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91B6843E31 for ; Sat, 20 Jul 2002 12:53:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KJppJU000278 for ; Sat, 20 Jul 2002 12:51:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KJppYJ000275 for perforce@freebsd.org; Sat, 20 Jul 2002 12:51:51 -0700 (PDT) Date: Sat, 20 Jul 2002 12:51:51 -0700 (PDT) Message-Id: <200207201951.g6KJppYJ000275@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14541 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14541 Change 14541 by peter@peter_daintree on 2002/07/20 12:51:34 IFC @14540 Affected files ... .. //depot/projects/ia64/Makefile#12 integrate .. //depot/projects/ia64/bin/sh/sh.1#11 integrate .. //depot/projects/ia64/etc/isdn/Makefile#3 integrate .. //depot/projects/ia64/etc/rc.d/serial#2 integrate .. //depot/projects/ia64/lib/libc_r/arch/ia64/_atomic_lock.S#2 integrate .. //depot/projects/ia64/lib/libstand/Makefile#10 integrate .. //depot/projects/ia64/lib/libstand/stand.h#9 integrate .. //depot/projects/ia64/lib/libstand/zalloc_defs.h#3 integrate .. //depot/projects/ia64/lib/libstand/zalloc_malloc.c#3 integrate .. //depot/projects/ia64/lib/libstand/zutil.h.diff#1 branch .. //depot/projects/ia64/sbin/Makefile#17 integrate .. //depot/projects/ia64/sbin/gpt/Makefile#3 integrate .. //depot/projects/ia64/sbin/gpt/destroy.c#2 integrate .. //depot/projects/ia64/sbin/gpt/gpt.c#9 integrate .. //depot/projects/ia64/sbin/gpt/gpt.h#6 integrate .. //depot/projects/ia64/sbin/gpt/map.c#5 integrate .. //depot/projects/ia64/sbin/gpt/map.h#3 integrate .. //depot/projects/ia64/sbin/gpt/migrate.c#3 integrate .. //depot/projects/ia64/sbin/gpt/mkdisk.sh#3 integrate .. //depot/projects/ia64/sbin/gpt/recover.c#2 integrate .. //depot/projects/ia64/sbin/gpt/show.c#2 integrate .. //depot/projects/ia64/sbin/mca/Makefile#2 integrate .. //depot/projects/ia64/sbin/mca/mca.c#6 integrate .. //depot/projects/ia64/share/man/man4/syscons.4#3 integrate .. //depot/projects/ia64/sys/boot/efi/Makefile.inc#8 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#5 integrate .. //depot/projects/ia64/sys/boot/efi/loader/conf.c#5 integrate .. //depot/projects/ia64/sys/boot/efi/loader/main.c#4 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#16 integrate .. //depot/projects/ia64/sys/ia64/ia64/nexus.c#4 integrate .. //depot/projects/ia64/sys/pccard/pccard.c#8 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep_stub.c#6 integrate .. //depot/projects/ia64/sys/vm/vm_contig.c#6 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#15 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#14 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#9 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#11 integrate .. //depot/projects/ia64/sys/vm/vm_pageq.c#6 integrate Differences ... ==== //depot/projects/ia64/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.261 2002/06/24 20:13:09 dillon Exp $ +# $FreeBSD: src/Makefile,v 1.263 2002/07/20 10:01:00 ru Exp $ # # The user-driven targets are: # @@ -174,20 +174,26 @@ # upgrade_checks: @cd ${.CURDIR}; \ - if ! make -m ${.CURDIR}/share/mk test > /dev/null 2>&1; then \ - make make; \ - fi + if ! make -m ${.CURDIR}/share/mk -Dnotdef test >/dev/null 2>&1; then \ + make make; \ + fi @cd ${.CURDIR}; \ - if make -V .CURDIR:C/.// 2>&1 >/dev/null | \ - grep -q "Unknown modifier 'C'"; then \ - make make; \ - fi + if make -V .CURDIR:C/.// 2>&1 >/dev/null | \ + grep -q "Unknown modifier 'C'"; then \ + make make; \ + fi # # A simple test target used as part of the test to see if make supports -# the -m argument. +# the -m argument. Also test that make will only evaluate a conditional +# as far as is necessary to determine its value. # test: +.if defined(notdef) +.undef notdef +.if defined(notdef) && ${notdef:U} +.endif +.endif # # Upgrade the installed make to the current version using the installed ==== //depot/projects/ia64/bin/sh/sh.1#11 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.71 2002/07/02 19:06:33 dillon Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.72 2002/07/20 04:39:23 tjr Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -1332,7 +1332,11 @@ A synonym for the .Ic cd builtin command. -.It Ic echo Oo Fl en Oc Ar string +.It Xo +.Ic echo +.Op Fl e | Fl n +.Op Ar string +.Xc Print .Ar string to the standard output with a newline appended. @@ -1386,6 +1390,12 @@ a\eb .Ed .El +.Pp +Only one of the +.Fl e +and +.Fl n +options may be specified. .It Ic eval Ar string ... Concatenate all the arguments with spaces. Then re-parse and execute the command. ==== //depot/projects/ia64/etc/isdn/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/isdn/Makefile,v 1.6 2002/07/18 12:07:44 ru Exp $ +# $FreeBSD: src/etc/isdn/Makefile,v 1.7 2002/07/20 10:56:00 ru Exp $ I4BETCPROG= answer \ isdntel.sh \ @@ -24,3 +24,5 @@ ${INSTALL} ${COPY} -o root -g wheel -m 600 $$i ${DESTDIR}/etc/isdn ; \ done +# Suck in the ${COPY} definition. +.include ==== //depot/projects/ia64/etc/rc.d/serial#2 (text+ko) ==== @@ -24,7 +24,8 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/serial,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/serial,v 1.2 2002/07/20 04:31:33 gordon Exp $ +# From: src/etc/rc.serial,v 1.16 2002/04/23 08:26:50 sobomax Exp $ # # PROVIDE: serial @@ -33,118 +34,113 @@ # Change some defaults for serial devices. # Standard defaults are: -# dtrwait 300 drainwait 0 -# initial cflag from = cread cs8 hupcl -# initial iflag, lflag and oflag all 0 -# speed 9600 -# special chars from -# nothing locked +# dtrwait 300 drainwait 0 +# initial cflag from = cread cs8 hupcl +# initial iflag, lflag and oflag all 0 +# speed 9600 +# special chars from +# nothing locked # except for serial consoles the initial iflag, lflag and oflag are from # and clocal is locked on. -default() -{ - # Reset everything changed by the other functions to initial defaults. +default() { + # Reset everything changed by the other functions to initial defaults. - ci=$1; shift # call in device identifier - co=$1; shift # call out device identifier + ci=$1; shift # call in device identifier + co=$1; shift # call out device identifier - for i in $* - do - comcontrol /dev/tty${ci}${i} dtrwait 300 drainwait 300 - stty < /dev/ttyi${ci}${i} -clocal crtscts hupcl 9600 reprint ^R - stty < /dev/ttyl${ci}${i} -clocal -crtscts -hupcl 0 - stty < /dev/cuai${co}${i} -clocal crtscts hupcl 9600 reprint ^R - stty < /dev/cual${co}${i} -clocal -crtscts -hupcl 0 - done + for i in $* + do + comcontrol /dev/tty${ci}${i} dtrwait 300 drainwait 300 + stty < /dev/ttyi${ci}${i} -clocal crtscts hupcl 9600 reprint ^R + stty < /dev/ttyl${ci}${i} -clocal -crtscts -hupcl 0 + stty < /dev/cuai${co}${i} -clocal crtscts hupcl 9600 reprint ^R + stty < /dev/cual${co}${i} -clocal -crtscts -hupcl 0 + done } -maybe() -{ - # Special settings. +maybe() { + # Special settings. - ci=$1; shift - co=$1; shift + ci=$1; shift + co=$1; shift - for i in $* - do - # Don't use ^R; it breaks bash's ^R when typed ahead. - stty < /dev/ttyi${ci}${i} reprint undef - stty < /dev/cuai${co}${i} reprint undef - # Lock clocal off on dialin device for security. - stty < /dev/ttyl${ci}${i} clocal - # Lock the speeds to use old binaries that don't support them. - # Any legal speed works to lock the initial speed. - stty < /dev/ttyl${ci}${i} 300 - stty < /dev/cual${co}${i} 300 - done + for i in $* + do + # Don't use ^R; it breaks bash's ^R when typed ahead. + stty < /dev/ttyi${ci}${i} reprint undef + stty < /dev/cuai${co}${i} reprint undef + # Lock clocal off on dialin device for security. + stty < /dev/ttyl${ci}${i} clocal + # Lock the speeds to use old binaries that don't support them. + # Any legal speed works to lock the initial speed. + stty < /dev/ttyl${ci}${i} 300 + stty < /dev/cual${co}${i} 300 + done } -modem() -{ - # Modem that supports CTS and perhaps RTS handshaking. +modem() { + # Modem that supports CTS and perhaps RTS handshaking. - ci=$1; shift - co=$1; shift + ci=$1; shift + co=$1; shift - for i in $* - do - # may depend on modem - comcontrol /dev/tty${ci}${i} dtrwait 100 drainwait 180 - # Lock crtscts on. - # Speed reasonable for V42bis. - stty < /dev/ttyi${ci}${i} crtscts 57600 - stty < /dev/ttyl${ci}${i} crtscts - stty < /dev/cuai${co}${i} crtscts 57600 - stty < /dev/cual${co}${i} crtscts - done + for i in $* + do + # may depend on modem + comcontrol /dev/tty${ci}${i} dtrwait 100 drainwait 180 + # Lock crtscts on. + # Speed reasonable for V42bis. + stty < /dev/ttyi${ci}${i} crtscts 57600 + stty < /dev/ttyl${ci}${i} crtscts + stty < /dev/cuai${co}${i} crtscts 57600 + stty < /dev/cual${co}${i} crtscts + done } -mouse() -{ - # Mouse on either callin or callout port. +mouse() { + # Mouse on either callin or callout port. - ci=$1; shift - co=$1; shift + ci=$1; shift + co=$1; shift - for i in $* - do - # Lock clocal on, hupcl off. - # Standard speed for Microsoft mouse. - stty < /dev/ttyi${ci}${i} clocal -hupcl 1200 - stty < /dev/ttyl${ci}${i} clocal hupcl - stty < /dev/cuai${co}${i} clocal -hupcl 1200 - stty < /dev/cual${co}${i} clocal hupcl - done + for i in $* + do + # Lock clocal on, hupcl off. + # Standard speed for Microsoft mouse. + stty < /dev/ttyi${ci}${i} clocal -hupcl 1200 + stty < /dev/ttyl${ci}${i} clocal hupcl + stty < /dev/cuai${co}${i} clocal -hupcl 1200 + stty < /dev/cual${co}${i} clocal hupcl + done } -terminal() -{ - # Terminal that supports CTS and perhaps RTS handshaking - # with the cable or terminal arranged so that DCD is on - # at least while the terminal is on. - # Also works for bidirectional communications to another pc - # provided at most one side runs getty. - # Same as modem() except we want a faster speed and no dtrwait. +terminal() { + # Terminal that supports CTS and perhaps RTS handshaking + # with the cable or terminal arranged so that DCD is on + # at least while the terminal is on. + # Also works for bidirectional communications to another pc + # provided at most one side runs getty. + # Same as modem() except we want a faster speed and no dtrwait. - ci=$1; shift - co=$1; shift + ci=$1; shift + co=$1; shift - modem ${ci} ${co} $* - for i in $* - do - comcontrol /dev/tty${ci}${i} dtrwait 0 - stty < /dev/ttyi${ci}${i} 115200 - stty < /dev/cuai${co}${i} 115200 - done + modem ${ci} ${co} $* + for i in $* + do + comcontrol /dev/tty${ci}${i} dtrwait 0 + stty < /dev/ttyi${ci}${i} 115200 + stty < /dev/cuai${co}${i} 115200 + done } # Don't use anything from this file unless you have some buggy programs # that require it. # Edit the functions and the examples to suit your system. -# $1 is the call in device identifier, $2 is the call out device -# identifier and the remainder of the line lists the device numbers. +# $1 is the call in device identifier, $2 is the call out device identifier +# and the remainder of the line lists the device numbers. # Initialize assorted 8250-16550 (sio) ports. # maybe d a 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v @@ -156,7 +152,7 @@ # modem c c 00 01 02 03 04 05 06 07 # Initialize all ports on a Cyclades-16ye. -# modem c c 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f +# modem c c 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f # Initialize all ports on a Digiboard 8. # modem D D 00 01 02 03 04 05 06 07 ==== //depot/projects/ia64/lib/libc_r/arch/ia64/_atomic_lock.S#2 (text+ko) ==== @@ -23,12 +23,12 @@ * (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$ + * $FreeBSD: src/lib/libc_r/arch/ia64/_atomic_lock.S,v 1.1 2002/07/20 19:22:10 peter Exp $ */ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$FreeBSD$" + .asciz "$FreeBSD: src/lib/libc_r/arch/ia64/_atomic_lock.S,v 1.1 2002/07/20 19:22:10 peter Exp $" #endif /* LIBC_RCS and not lint */ #include ==== //depot/projects/ia64/lib/libstand/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libstand/Makefile,v 1.35 2002/05/12 16:00:54 ru Exp $ +# $FreeBSD: src/lib/libstand/Makefile,v 1.36 2002/07/20 04:18:20 peter Exp $ # Originally from $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $ # # Notes: ==== //depot/projects/ia64/lib/libstand/stand.h#9 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libstand/stand.h,v 1.32 2002/06/03 19:04:10 sobomax Exp $ + * $FreeBSD: src/lib/libstand/stand.h,v 1.34 2002/07/20 04:18:20 peter Exp $ * From $NetBSD: stand.h,v 1.22 1997/06/26 19:17:40 drochner Exp $ */ @@ -391,10 +391,10 @@ #define ntohs(x) __ntohs(x) #endif -void *Malloc(size_t, char *, int); -void *Calloc(size_t, size_t, char *, int); -void *Realloc(void *, size_t, char *, int); -void Free(void *, char *, int); +void *Malloc(size_t, const char *, int); +void *Calloc(size_t, size_t, const char *, int); +void *Realloc(void *, size_t, const char *, int); +void Free(void *, const char *, int); #if 1 #define malloc(x) Malloc(x, __FILE__, __LINE__) ==== //depot/projects/ia64/lib/libstand/zalloc_defs.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libstand/zalloc_defs.h,v 1.10 2001/10/15 13:50:47 robert Exp $ + * $FreeBSD: src/lib/libstand/zalloc_defs.h,v 1.11 2002/07/20 04:18:20 peter Exp $ */ /* ==== //depot/projects/ia64/lib/libstand/zalloc_malloc.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/zalloc_malloc.c,v 1.6 2001/09/30 22:28:01 dillon Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/zalloc_malloc.c,v 1.7 2002/07/20 04:18:20 peter Exp $"); /* * MALLOC.C - malloc equivalent, runs on top of zalloc and uses sbrk @@ -60,7 +60,7 @@ #endif void * -Malloc(size_t bytes, char *file, int line) +Malloc(size_t bytes, const char *file, int line) { Guard *res; @@ -94,7 +94,7 @@ } void -Free(void *ptr, char *file, int line) +Free(void *ptr, const char *file, int line) { size_t bytes; @@ -132,7 +132,7 @@ void * -Calloc(size_t n1, size_t n2, char *file, int line) +Calloc(size_t n1, size_t n2, const char *file, int line) { iaddr_t bytes = (iaddr_t)n1 * (iaddr_t)n2; void *res; @@ -154,7 +154,7 @@ */ void * -Realloc(void *ptr, size_t size, char *file, int line) +Realloc(void *ptr, size_t size, const char *file, int line) { void *res; size_t old; @@ -184,7 +184,7 @@ } void * -Reallocf(void *ptr, size_t size, char *file, int line) +Reallocf(void *ptr, size_t size, const char *file, int line) { void *res; ==== //depot/projects/ia64/sbin/Makefile#17 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.109 2002/07/17 01:46:47 dd Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.110 2002/07/20 19:32:33 peter Exp $ # XXX MISSING: icheck ncheck ==== //depot/projects/ia64/sbin/gpt/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/sbin/gpt/Makefile,v 1.1 2002/07/20 19:27:43 peter Exp $ PROG= gpt SRCS= destroy.c gpt.c map.c migrate.c recover.c show.c ==== //depot/projects/ia64/sbin/gpt/destroy.c#2 (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$ + * $FreeBSD: src/sbin/gpt/destroy.c,v 1.1 2002/07/20 19:27:43 peter Exp $ */ #include ==== //depot/projects/ia64/sbin/gpt/gpt.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.1 2002/07/20 19:27:43 peter Exp $"); #include #include ==== //depot/projects/ia64/sbin/gpt/gpt.h#6 (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$ + * $FreeBSD: src/sbin/gpt/gpt.h,v 1.1 2002/07/20 19:27:43 peter Exp $ */ #ifndef _GPT_H_ ==== //depot/projects/ia64/sbin/gpt/map.c#5 (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$ + * $FreeBSD: src/sbin/gpt/map.c,v 1.1 2002/07/20 19:27:43 peter Exp $ */ #include ==== //depot/projects/ia64/sbin/gpt/map.h#3 (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$ + * $FreeBSD: src/sbin/gpt/map.h,v 1.1 2002/07/20 19:27:43 peter Exp $ */ #ifndef _MAP_H_ ==== //depot/projects/ia64/sbin/gpt/migrate.c#3 (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$ + * $FreeBSD: src/sbin/gpt/migrate.c,v 1.1 2002/07/20 19:27:43 peter Exp $ */ #include ==== //depot/projects/ia64/sbin/gpt/mkdisk.sh#3 (text+ko) ==== @@ -1,4 +1,5 @@ #!/bin/sh +# $FreeBSD: src/sbin/gpt/mkdisk.sh,v 1.1 2002/07/20 19:27:43 peter Exp $ dd if=/dev/zero of=disk count=125307 sudo mdconfig -a -t vnode -f disk -u 4 ==== //depot/projects/ia64/sbin/gpt/recover.c#2 (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$ + * $FreeBSD: src/sbin/gpt/recover.c,v 1.1 2002/07/20 19:27:43 peter Exp $ */ #include ==== //depot/projects/ia64/sbin/gpt/show.c#2 (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$ + * $FreeBSD: src/sbin/gpt/show.c,v 1.1 2002/07/20 19:27:43 peter Exp $ */ #include ==== //depot/projects/ia64/sbin/mca/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD$ +# $FreeBSD: src/sbin/mca/Makefile,v 1.1 2002/07/20 19:31:11 peter Exp $ PROG= mca WARNS= 4 NOMAN= yes ==== //depot/projects/ia64/sbin/mca/mca.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sbin/mca/mca.c,v 1.1 2002/07/20 19:31:11 peter Exp $"); #include #include ==== //depot/projects/ia64/share/man/man4/syscons.4#3 (text+ko) ==== @@ -24,7 +24,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/share/man/man4/syscons.4,v 1.31 2002/01/21 12:09:13 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/syscons.4,v 1.32 2002/07/20 09:25:55 schweikh Exp $ .\" .Dd June 30, 1999 .Dt SYSCONS 4 @@ -311,7 +311,7 @@ Adds support for pixel (raster) mode console. This mode is useful on some laptop computers, but less so on most other systems, and it adds substantial amount of code to syscons. -If the this option is NOT defined, you can reduce the kernel size a lot. +If this option is NOT defined, you can reduce the kernel size a lot. See the .Dv VESA800X600 flag below. ==== //depot/projects/ia64/sys/boot/efi/Makefile.inc#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.4 2002/04/06 04:29:36 peter Exp $ +# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.5 2002/07/20 03:52:37 peter Exp $ # Options used when building app-specific efi components CFLAGS+= -ffreestanding -Wformat ==== //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/efinet.c,v 1.3 2002/03/30 04:50:52 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/efinet.c,v 1.5 2002/07/20 03:52:18 peter Exp $ */ #include ==== //depot/projects/ia64/sys/boot/efi/loader/conf.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.6 2002/03/19 10:50:41 peter Exp $"; + "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.7 2002/07/20 03:46:43 peter Exp $"; #endif /* not lint */ #include ==== //depot/projects/ia64/sys/boot/efi/loader/main.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.10 2002/03/30 07:32:08 marcel Exp $"; + "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.11 2002/07/20 03:44:01 peter Exp $"; #endif /* not lint */ #include ==== //depot/projects/ia64/sys/conf/files.sparc64#16 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.24 2002/07/19 08:03:14 obrien Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.25 2002/07/20 08:16:51 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -17,7 +17,7 @@ libkern/ffs.c standard kern/subr_diskmbr.c standard kern/syscalls.c optional ktr -sparc64/ebus/ebus.c count ebus +sparc64/ebus/ebus.c optional ebus sparc64/isa/isa.c optional isa sparc64/isa/ofw_isa.c optional ebus sparc64/isa/ofw_isa.c optional isa ==== //depot/projects/ia64/sys/ia64/ia64/nexus.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/nexus.c,v 1.4 2002/03/19 11:05:07 peter Exp $ + * $FreeBSD: src/sys/ia64/ia64/nexus.c,v 1.5 2002/07/20 06:25:47 peter Exp $ */ /* @@ -164,7 +164,7 @@ irq_rman.rm_start = 0; irq_rman.rm_type = RMAN_ARRAY; irq_rman.rm_descr = "Interrupt request lines"; - irq_rman.rm_end = 63; + irq_rman.rm_end = 255; if (rman_init(&irq_rman) || rman_manage_region(&irq_rman, irq_rman.rm_start, irq_rman.rm_end)) ==== //depot/projects/ia64/sys/pccard/pccard.c#8 (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/pccard/pccard.c,v 1.148 2002/06/23 01:55:10 imp Exp $ + * $FreeBSD: src/sys/pccard/pccard.c,v 1.149 2002/07/20 18:59:58 imp Exp $ */ #include @@ -555,7 +555,6 @@ break; /* * Set the memory window to be used for the read/write interface. - * Not available on the alpha. */ case PIOCRWMEM: if (*(unsigned long *)data == 0) { ==== //depot/projects/ia64/sys/ufs/ffs/ffs_softdep_stub.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)ffs_softdep_stub.c 9.1 (McKusick) 7/10/97 - * $FreeBSD: src/sys/ufs/ffs/ffs_softdep_stub.c,v 1.25 2002/07/19 07:29:38 mckusick Exp $ + * $FreeBSD: src/sys/ufs/ffs/ffs_softdep_stub.c,v 1.26 2002/07/20 04:07:15 benno Exp $ */ /* @@ -164,9 +164,10 @@ } void -softdep_setup_freeblocks(ip, length) +softdep_setup_freeblocks(ip, length, flags) struct inode *ip; off_t length; + int flags; { panic("softdep_setup_freeblocks called"); ==== //depot/projects/ia64/sys/vm/vm_contig.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91 - * $FreeBSD: src/sys/vm/vm_contig.c,v 1.10 2002/07/15 06:33:31 alc Exp $ + * $FreeBSD: src/sys/vm/vm_contig.c,v 1.11 2002/07/20 06:11:16 alc Exp $ */ /* @@ -111,9 +111,11 @@ vm_pageout_flush(&m_tmp, 1, 0); return (TRUE); } + } else if (m->busy == 0 && m->hold_count == 0) { + vm_page_lock_queues(); + vm_page_cache(m); + vm_page_unlock_queues(); } - if ((m->dirty == 0) && (m->busy == 0) && (m->hold_count == 0)) - vm_page_cache(m); } return (FALSE); } ==== //depot/projects/ia64/sys/vm/vm_fault.c#15 (text+ko) ==== @@ -66,7 +66,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_fault.c,v 1.145 2002/07/13 19:24:04 alc Exp $ + * $FreeBSD: src/sys/vm/vm_fault.c,v 1.146 2002/07/20 19:34:21 alc Exp $ */ /* @@ -444,6 +444,7 @@ else firstpindex = fs.first_pindex - 2 * VM_FAULT_READ; + vm_page_lock_queues(); /* * note: partially valid pages cannot be * included in the lookahead - NFS piecemeal @@ -471,7 +472,7 @@ vm_page_cache(mt); } } - + vm_page_unlock_queues(); ahead += behind; behind = 0; } ==== //depot/projects/ia64/sys/vm/vm_page.c#14 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91 - * $FreeBSD: src/sys/vm/vm_page.c,v 1.197 2002/07/19 03:33:04 alc Exp $ + * $FreeBSD: src/sys/vm/vm_page.c,v 1.198 2002/07/20 19:34:21 alc Exp $ */ /* @@ -1412,7 +1412,7 @@ { int s; - GIANT_REQUIRED; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if ((m->flags & (PG_BUSY|PG_UNMANAGED)) || m->busy || m->wire_count) { printf("vm_page_cache: attempting to cache busy page\n"); return; ==== //depot/projects/ia64/sys/vm/vm_page.h#9 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_page.h,v 1.105 2002/07/18 04:08:10 alc Exp $ + * $FreeBSD: src/sys/vm/vm_page.h,v 1.106 2002/07/20 05:06:20 alc Exp $ */ /* @@ -337,8 +337,6 @@ void vm_page_wakeup(vm_page_t m); void vm_pageq_init(void); -struct vpgqueues *vm_pageq_aquire(int queue); -void vm_pageq_release(struct vpgqueues *vpq); vm_page_t vm_pageq_add_new_page(vm_offset_t pa); void vm_pageq_enqueue(int queue, vm_page_t m); void vm_pageq_remove_nowakeup(vm_page_t m); ==== //depot/projects/ia64/sys/vm/vm_pageout.c#11 (text+ko) ==== @@ -65,7 +65,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_pageout.c,v 1.197 2002/06/29 17:26:22 julian Exp $ + * $FreeBSD: src/sys/vm/vm_pageout.c,v 1.199 2002/07/20 19:34:21 alc Exp $ */ /* @@ -792,7 +792,9 @@ * effectively frees them. */ } else if (m->dirty == 0) { + vm_page_lock_queues(); vm_page_cache(m); + vm_page_unlock_queues(); --page_shortage; } else if ((m->flags & PG_WINATCFLS) == 0 && pass == 0) { /* @@ -961,6 +963,7 @@ cnt.v_inactive_target - cnt.v_inactive_count; page_shortage += addl_page_shortage; + vm_page_lock_queues(); /* * Scan the active queue for things we can deactivate. We nominally * track the per-page activity counter and use it to locate @@ -1045,7 +1048,7 @@ } m = next; } - + vm_page_unlock_queues(); s = splvm(); /* @@ -1216,7 +1219,7 @@ return; s0 = splvm(); - + vm_page_lock_queues(); pcount = cnt.v_active_count; fullintervalcount += vm_pageout_stats_interval; if (fullintervalcount < vm_pageout_full_stats_interval) { @@ -1280,6 +1283,7 @@ m = next; } + vm_page_unlock_queues(); splx(s0); } ==== //depot/projects/ia64/sys/vm/vm_pageq.c#6 (text+ko) ==== @@ -2,7 +2,7 @@ * (c)Copyright 1998, Matthew Dillon. Terms for use and redistribution * are covered by the BSD Copyright as found in /usr/src/COPYRIGHT. * - * $FreeBSD: src/sys/vm/vm_pageq.c,v 1.6 2002/07/18 17:40:07 alc Exp $ + * $FreeBSD: src/sys/vm/vm_pageq.c,v 1.7 2002/07/20 05:06:20 alc Exp $ */ #include @@ -24,7 +24,6 @@ #include struct vpgqueues vm_page_queues[PQ_COUNT]; -static struct mtx vm_pageq_mtx[PQ_COUNT]; void vm_pageq_init(void) @@ -43,33 +42,21 @@ for (i = 0; i < PQ_COUNT; i++) { TAILQ_INIT(&vm_page_queues[i].pl); - mtx_init(&vm_pageq_mtx[i], "vm pageq mutex", NULL, MTX_DEF); } } -struct vpgqueues * +static __inline struct vpgqueues * vm_pageq_aquire(int queue) { struct vpgqueues *vpq = NULL; if (queue != PQ_NONE) { vpq = &vm_page_queues[queue]; -#if 0 - mtx_lock(&vm_pageq_mtx[queue]); -#endif } return (vpq); } void -vm_pageq_release(struct vpgqueues *vpq) -{ -#if 0 - mtx_unlock(&vm_pageq_mtx[vpq - &vm_page_queues[0]]); -#endif -} - -void vm_pageq_requeue(vm_page_t m) { int queue = m->queue; @@ -78,7 +65,6 @@ vpq = vm_pageq_aquire(queue); TAILQ_REMOVE(&vpq->pl, m, pageq); TAILQ_INSERT_TAIL(&vpq->pl, m, pageq); - vm_pageq_release(vpq); } >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 12:55:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BF3537B405; Sat, 20 Jul 2002 12:53:56 -0700 (PDT) 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 4F25B37B40E for ; Sat, 20 Jul 2002 12:53:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8DC743E42 for ; Sat, 20 Jul 2002 12:53:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KJrsJU000801 for ; Sat, 20 Jul 2002 12:53:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KJrs84000798 for perforce@freebsd.org; Sat, 20 Jul 2002 12:53:54 -0700 (PDT) Date: Sat, 20 Jul 2002 12:53:54 -0700 (PDT) Message-Id: <200207201953.g6KJrs84000798@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14543 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14543 Change 14543 by rwatson@rwatson_curry on 2002/07/20 12:53:45 Rename mac_cred_check_readlink() to mac_cred_check_readlink_vnode() for consistency with other checks (and forthcoming readdir check). Eventually, maybe we should drop the _vnode from all checks except the ones that have namespace conflicts with other objects (such as pipe/socket/.. operations). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#179 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#14 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#52 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#55 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#43 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#37 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#39 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#7 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#113 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#76 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#179 (text+ko) ==== @@ -555,7 +555,7 @@ mpe->mpe_function; break; case MAC_CRED_CHECK_READLINK: - mpc->mpc_ops->mpo_cred_check_readlink = + mpc->mpc_ops->mpo_cred_check_readlink_vnode = mpe->mpe_function; break; case MAC_CRED_CHECK_RENAME_FROM_VNODE: @@ -1683,11 +1683,11 @@ } int -mac_cred_check_readlink(struct ucred *cred, struct vnode *vp) +mac_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_readlink"); + ASSERT_VOP_LOCKED(vp, "mac_cred_check_readlink_vnode"); if (!mac_enforce_fs) return (0); @@ -1696,7 +1696,7 @@ if (error) return (error); - MAC_CHECK(cred_check_readlink, cred, vp, &vp->v_label); + MAC_CHECK(cred_check_readlink_vnode, cred, vp, &vp->v_label); return (error); } ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#14 (text+ko) ==== @@ -317,7 +317,8 @@ break; } #ifdef MAC - error = mac_cred_check_readlink(td->td_ucred, ndp->ni_vp); + error = mac_cred_check_readlink_vnode(td->td_ucred, + ndp->ni_vp); if (error) break; #endif ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#52 (text+ko) ==== @@ -2849,7 +2849,7 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vp = nd.ni_vp; #ifdef MAC - error = mac_cred_check_readlink(td->td_ucred, vp); + error = mac_cred_check_readlink_vnode(td->td_ucred, vp); if (error) { vput(vp); return (error); ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#55 (text+ko) ==== @@ -1494,7 +1494,7 @@ } static int -mac_biba_cred_check_readlink(struct ucred *cred, struct vnode *vp, +mac_biba_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *label) { struct mac_biba *subj, *obj; @@ -1955,8 +1955,8 @@ (macop_t)mac_biba_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_biba_cred_check_open_vnode }, - { MAC_CRED_CHECK_READLINK, - (macop_t)mac_biba_cred_check_readlink }, + { MAC_CRED_CHECK_READLINK_VNODE, + (macop_t)mac_biba_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_biba_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#43 (text+ko) ==== @@ -1437,7 +1437,7 @@ } static int -mac_mls_cred_check_readlink(struct ucred *cred, struct vnode *vp, +mac_mls_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { struct mac_mls *subj, *obj; @@ -1895,8 +1895,8 @@ (macop_t)mac_mls_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_mls_cred_check_open_vnode }, - { MAC_CRED_CHECK_READLINK, - (macop_t)mac_mls_cred_check_readlink }, + { MAC_CRED_CHECK_READLINK_VNODE, + (macop_t)mac_mls_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_mls_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#37 (text+ko) ==== @@ -684,7 +684,7 @@ } static int -mac_none_cred_check_readlink(struct ucred *cred, struct vnode *vp, +mac_none_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { @@ -978,8 +978,8 @@ (macop_t)mac_none_cred_check_listen_socket }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_none_cred_check_open_vnode }, - { MAC_CRED_CHECK_READLINK, - (macop_t)mac_none_cred_check_readlink }, + { MAC_CRED_CHECK_READLINK_VNODE, + (macop_t)mac_none_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_none_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#39 (text+ko) ==== @@ -1052,7 +1052,7 @@ } static int -mac_te_cred_check_readlink(struct ucred *cred, struct vnode *vp, +mac_te_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { struct mac_te *subj, *obj; @@ -1617,8 +1617,8 @@ { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_te_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_te_cred_check_open_vnode }, - { MAC_CRED_CHECK_READLINK, - (macop_t)mac_te_cred_check_readlink }, + { MAC_CRED_CHECK_READLINK_VNODE, + (macop_t)mac_te_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_te_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#7 (text+ko) ==== @@ -877,7 +877,7 @@ } static int -mac_test_cred_check_readlink(struct ucred *cred, struct vnode *vp, +mac_test_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { @@ -1169,8 +1169,8 @@ (macop_t)mac_test_cred_check_listen_socket }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_test_cred_check_open_vnode }, - { MAC_CRED_CHECK_READLINK, - (macop_t)mac_test_cred_check_readlink }, + { MAC_CRED_CHECK_READLINK_VNODE, + (macop_t)mac_test_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_test_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#113 (text+ko) ==== @@ -282,7 +282,7 @@ struct vnode *vp, int samedir); int mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode); -int mac_cred_check_readlink(struct ucred *cred, struct vnode *vp); +int mac_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp); int mac_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp); int mac_cred_check_statfs(struct ucred *cred, struct mount *mp); int mac_getsockopt_label_get(struct ucred *cred, struct socket *so, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#76 (text+ko) ==== @@ -274,7 +274,7 @@ int (*mpo_cred_check_open_vnode)(struct ucred *cred, struct vnode *vp, struct label *label, mode_t acc_mode); - int (*mpo_cred_check_readlink)(struct ucred *cred, + int (*mpo_cred_check_readlink_vnode)(struct ucred *cred, struct vnode *vp, struct label *label); int (*mpo_cred_check_rename_from_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, @@ -405,7 +405,7 @@ MAC_CRED_CHECK_GETEXTATTR_VNODE, MAC_CRED_CHECK_LISTEN_SOCKET, MAC_CRED_CHECK_OPEN_VNODE, - MAC_CRED_CHECK_READLINK, + MAC_CRED_CHECK_READLINK_VNODE, MAC_CRED_CHECK_RENAME_FROM_VNODE, MAC_CRED_CHECK_RENAME_TO_VNODE, MAC_CRED_CHECK_REVOKE_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 13: 7:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB3DA37B401; Sat, 20 Jul 2002 13:07:12 -0700 (PDT) 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 7EA0B37B400 for ; Sat, 20 Jul 2002 13:07:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15CD943E31 for ; Sat, 20 Jul 2002 13:07:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KK7BJU006147 for ; Sat, 20 Jul 2002 13:07:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KK7BeX006144 for perforce@freebsd.org; Sat, 20 Jul 2002 13:07:11 -0700 (PDT) Date: Sat, 20 Jul 2002 13:07:11 -0700 (PDT) Message-Id: <200207202007.g6KK7BeX006144@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14545 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14545 Change 14545 by rwatson@rwatson_curry on 2002/07/20 13:06:37 Differentiate "search" and "readdir" MAC checks, since lookup may be seperately authorized from the ability to read the object. While I'm there, implement the mac_bsdextended_readlink check, since it was missed in a prior pass. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#180 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#53 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#56 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#34 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#44 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#38 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#40 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#8 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#8 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#114 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#77 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#180 (text+ko) ==== @@ -554,7 +554,11 @@ mpc->mpc_ops->mpo_cred_check_open_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_READLINK: + case MAC_CRED_CHECK_READDIR_VNODE: + mpc->mpc_ops->mpo_cred_check_readdir_vnode = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_READLINK_VNODE: mpc->mpc_ops->mpo_cred_check_readlink_vnode = mpe->mpe_function; break; @@ -1683,6 +1687,24 @@ } int +mac_cred_check_readdir_vnode(struct ucred *cred, struct vnode *dvp) +{ + int error; + + ASSERT_VOP_LOCKED(dvp, "mac_cred_check_readdir_vnode"); + + if (!mac_enforce_fs) + return (0); + + error = vn_refreshlabel(dvp, cred); + if (error) + return (error); + + MAC_CHECK(cred_check_readdir_vnode, cred, dvp, &dvp->v_label); + return (error); +} + +int mac_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp) { int error; ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#53 (text+ko) ==== @@ -4004,7 +4004,7 @@ * Using the process credentials, not the cached ones owned by the fd, * check for ability to search in a directory before reading from it. */ - error = mac_cred_check_search_vnode(td->td_ucred, vp); + error = mac_cred_check_readdir_vnode(td->td_ucred, vp); if (error) { VOP_UNLOCK(vp, 0, td); fdrop(fp, td); @@ -4152,7 +4152,7 @@ * Here also, don't use cached credentials for checking directory * search MAC. */ - error = mac_cred_check_search_vnode(td->td_ucred, vp); + error = mac_cred_check_readdir_vnode(td->td_ucred, vp); if (error == 0) #endif /* MAC */ error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, NULL, ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#56 (text+ko) ==== @@ -1494,6 +1494,24 @@ } static int +mac_bibe_cred_check_readdir_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int mac_biba_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -1955,6 +1973,8 @@ (macop_t)mac_biba_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_biba_cred_check_open_vnode }, + { MAC_CRED_CHECK_READDIR_VNODE, + (macop_t)mac_biba_cred_check_readdir_vnode }, { MAC_CRED_CHECK_READLINK_VNODE, (macop_t)mac_biba_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#34 (text+ko) ==== @@ -458,6 +458,38 @@ } static int +mac_bsdextended_cred_check_readdir_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + struct vattr vap; + int error; + + if (!mac_bsdextended_enabled) + return (0); + + error = VOP_GETATTR(vp, &vap, cred, curthread); + if (error) + return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VREAD)); +} + +static int +mac_bsdextended_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct vattr vap; + int error; + + if (!mac_bsdextended_enabled) + return (0); + + error = VOP_GETATTR(vp, &vap, cred, curthread); + if (error) + return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VREAD)); +} + +static int mac_bsdextended_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, struct mac *dlabel, struct vnode *vp, struct mac *label) { @@ -741,6 +773,10 @@ (macop_t)mac_bsdextended_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_bsdextended_cred_check_open_vnode }, + { MAC_CRED_CHECK_READDIR_VNODE, + (macop_t)mac_bsdextended_cred_check_readdir_vnode }, + { MAC_CRED_CHECK_READLINK_VNODE, + (macop_t)mac_bsdextended_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, (macop_t)mac_bsdextended_cred_check_rename_from_vnode }, { MAC_CRED_CHECK_RENAME_TO_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#44 (text+ko) ==== @@ -1437,11 +1437,32 @@ } static int +mac_mls_cred_check_readdir_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(vnodelabel); + + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_mls_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { struct mac_mls *subj, *obj; + if (!mac_mls_enabled) + return (0); + subj = SLOT(&cred->cr_label); obj = SLOT(vnodelabel); @@ -1895,6 +1916,8 @@ (macop_t)mac_mls_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_mls_cred_check_open_vnode }, + { MAC_CRED_CHECK_READDIR_VNODE, + (macop_t)mac_mls_cred_check_readdir_vnode }, { MAC_CRED_CHECK_READLINK_VNODE, (macop_t)mac_mls_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#38 (text+ko) ==== @@ -684,6 +684,14 @@ } static int +mac_none_cred_check_readdir_vnode(struct ucred *cred, struct vnode *vp, + struct label *dlabel) +{ + + return (0); +} + +static int mac_none_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { @@ -978,6 +986,8 @@ (macop_t)mac_none_cred_check_listen_socket }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_none_cred_check_open_vnode }, + { MAC_CRED_CHECK_READDIR_VNODE, + (macop_t)mac_none_cred_check_readdir_vnode }, { MAC_CRED_CHECK_READLINK_VNODE, (macop_t)mac_none_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#40 (text+ko) ==== @@ -1052,6 +1052,19 @@ } static int +mac_te_cred_check_readdir_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + struct mac_te *subj, *obj; + + subj = SLOT(&cred->cr_label); + obj = SLOT(dlabel); + + return (mac_te_check(subj, obj, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_READDIR)); +} + +static int mac_te_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { @@ -1617,6 +1630,8 @@ { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_te_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_te_cred_check_open_vnode }, + { MAC_CRED_CHECK_READDIR_VNODE, + (macop_t)mac_te_cred_check_readdir_vnode }, { MAC_CRED_CHECK_READLINK_VNODE, (macop_t)mac_te_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#8 (text+ko) ==== @@ -93,10 +93,11 @@ #define MAC_TE_OPERATION_DIR_GETEXTATTR 7 #define MAC_TE_OPERATION_DIR_LOOKUP 8 #define MAC_TE_OPERATION_DIR_READ 9 -#define MAC_TE_OPERATION_DIR_SETACL 10 -#define MAC_TE_OPERATION_DIR_SETEXTATTR 11 -#define MAC_TE_OPERATION_DIR_STAT 12 -#define MAC_TE_OPERATION_DIR_WRITE 13 +#define MAC_TE_OPERATION_DIR_READDIR 10 +#define MAC_TE_OPERATION_DIR_SETACL 11 +#define MAC_TE_OPERATION_DIR_SETEXTATTR 12 +#define MAC_TE_OPERATION_DIR_STAT 13 +#define MAC_TE_OPERATION_DIR_WRITE 14 #define MAC_TE_CLASS_FS 5 #define MAC_TE_OPERATION_FS_STATFS 1 ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#8 (text+ko) ==== @@ -877,6 +877,14 @@ } static int +mac_test_cred_check_readdir_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + + return (0); +} + +static int mac_test_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { @@ -1169,6 +1177,8 @@ (macop_t)mac_test_cred_check_listen_socket }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_test_cred_check_open_vnode }, + { MAC_CRED_CHECK_READDIR_VNODE, + (macop_t)mac_test_cred_check_readdir_vnode }, { MAC_CRED_CHECK_READLINK_VNODE, (macop_t)mac_test_cred_check_readlink_vnode }, { MAC_CRED_CHECK_RENAME_FROM_VNODE, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#114 (text+ko) ==== @@ -282,6 +282,7 @@ struct vnode *vp, int samedir); int mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode); +int mac_cred_check_readdir_vnode(struct ucred *cred, struct vnode *vp); int mac_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp); int mac_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp); int mac_cred_check_statfs(struct ucred *cred, struct mount *mp); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#77 (text+ko) ==== @@ -274,6 +274,8 @@ int (*mpo_cred_check_open_vnode)(struct ucred *cred, struct vnode *vp, struct label *label, mode_t acc_mode); + int (*mpo_cred_check_readdir_vnode)(struct ucred *cred, + struct vnode *dvp, struct label *dlabel); int (*mpo_cred_check_readlink_vnode)(struct ucred *cred, struct vnode *vp, struct label *label); int (*mpo_cred_check_rename_from_vnode)(struct ucred *cred, @@ -405,6 +407,7 @@ MAC_CRED_CHECK_GETEXTATTR_VNODE, MAC_CRED_CHECK_LISTEN_SOCKET, MAC_CRED_CHECK_OPEN_VNODE, + MAC_CRED_CHECK_READDIR_VNODE, MAC_CRED_CHECK_READLINK_VNODE, MAC_CRED_CHECK_RENAME_FROM_VNODE, MAC_CRED_CHECK_RENAME_TO_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 13: 8:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E97FC37B401; Sat, 20 Jul 2002 13:08:14 -0700 (PDT) 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 5D22837B400 for ; Sat, 20 Jul 2002 13:08:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F287943E5E for ; Sat, 20 Jul 2002 13:08:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KK8DJU006189 for ; Sat, 20 Jul 2002 13:08:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KK8D30006186 for perforce@freebsd.org; Sat, 20 Jul 2002 13:08:13 -0700 (PDT) Date: Sat, 20 Jul 2002 13:08:13 -0700 (PDT) Message-Id: <200207202008.g6KK8D30006186@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14546 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14546 Change 14546 by rwatson@rwatson_curry on 2002/07/20 13:08:09 mac_bsdextended apparently missed the move to 'struct label' from 'struct mac', but since it's an unlabeled policy, it didn't make a difference. Fix. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#35 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#35 (text+ko) ==== @@ -290,7 +290,7 @@ static int mac_bsdextended_cred_check_access_vnode(struct ucred *cred, struct vnode *vp, - struct mac *label, mode_t flags) + struct label *label, mode_t flags) { struct vattr vap; int error; @@ -306,7 +306,7 @@ static int mac_bsdextended_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp, - struct mac *dlabel) + struct label *dlabel) { struct vattr vap; int error; @@ -322,7 +322,7 @@ static int mac_bsdextended_cred_check_chroot_vnode(struct ucred *cred, struct vnode *dvp, - struct mac *dlabel) + struct label *dlabel) { struct vattr vap; int error; @@ -338,7 +338,7 @@ static int mac_bsdextended_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, - struct mac *dlabel, struct vattr *vap) + struct label *dlabel, struct vattr *vap) { struct vattr dvap; int error; @@ -354,7 +354,7 @@ static int mac_bsdextended_cred_check_delete_vnode(struct ucred *cred, struct vnode *dvp, - struct mac *dlabel, struct vnode *vp, struct mac *label) + struct label *dlabel, struct vnode *vp, struct label *label) { struct vattr vap; int error; @@ -393,7 +393,7 @@ static int mac_bsdextended_cred_check_exec_vnode(struct ucred *cred, struct vnode *vp, - struct mac *label) + struct label *label) { struct vattr vap; int error; @@ -426,7 +426,7 @@ static int mac_bsdextended_cred_check_getextattr_vnode(struct ucred *cred, - struct vnode *vp, struct mac *label, int attrnamespace, + struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { struct vattr vap; @@ -443,7 +443,7 @@ static int mac_bsdextended_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, - struct mac *filelabel, mode_t acc_mode) + struct label *filelabel, mode_t acc_mode) { struct vattr vap; int error; @@ -491,7 +491,7 @@ static int mac_bsdextended_cred_check_rename_from_vnode(struct ucred *cred, - struct vnode *dvp, struct mac *dlabel, struct vnode *vp, struct mac *label) + struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label) { struct vattr vap; int error; @@ -515,7 +515,7 @@ static int mac_bsdextended_cred_check_rename_to_vnode(struct ucred *cred, - struct vnode *dvp, struct mac *dlabel, struct vnode *vp, struct mac *label, + struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, int samedir) { struct vattr vap; @@ -544,7 +544,7 @@ static int mac_bsdextended_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp, - struct mac *label) + struct label *label) { struct vattr vap; int error; @@ -560,7 +560,7 @@ static int mac_bsdextended_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp, - struct mac *dlabel) + struct label *dlabel) { struct vattr vap; int error; @@ -592,7 +592,7 @@ static int mac_bsdextended_cred_check_setextattr_vnode(struct ucred *cred, - struct vnode *vp, struct mac *label, int attrnamespace, const char *name, + struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio) { struct vattr vap; @@ -609,7 +609,7 @@ static int mac_bsdextended_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp, - struct mac *label, u_long flags) + struct label *label, u_long flags) { struct vattr vap; int error; @@ -625,7 +625,7 @@ static int mac_bsdextended_cred_check_setmode_vnode(struct ucred *cred, struct vnode *vp, - struct mac *label, mode_t mode) + struct label *label, mode_t mode) { struct vattr vap; int error; @@ -641,7 +641,7 @@ static int mac_bsdextended_cred_check_setowner_vnode(struct ucred *cred, struct vnode *vp, - struct mac *label, uid_t uid, gid_t gid) + struct label *label, uid_t uid, gid_t gid) { struct vattr vap; int error; @@ -657,7 +657,7 @@ static int mac_bsdextended_cred_check_setutimes_vnode(struct ucred *cred, - struct vnode *vp, struct mac *label, struct timespec atime, + struct vnode *vp, struct label *label, struct timespec atime, struct timespec utime) { struct vattr vap; @@ -674,7 +674,7 @@ static int mac_bsdextended_cred_check_stat_vnode(struct ucred *cred, struct vnode *vp, - struct mac *label) + struct label *label) { struct vattr vap; int error; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 13:42: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A865137B401; Sat, 20 Jul 2002 13:41:56 -0700 (PDT) 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 4170C37B400 for ; Sat, 20 Jul 2002 13:41:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E097243E3B for ; Sat, 20 Jul 2002 13:41:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KKftJU008912 for ; Sat, 20 Jul 2002 13:41:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KKft5F008909 for perforce@freebsd.org; Sat, 20 Jul 2002 13:41:55 -0700 (PDT) Date: Sat, 20 Jul 2002 13:41:55 -0700 (PDT) Message-Id: <200207202041.g6KKft5F008909@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14549 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14549 Change 14549 by peter@peter_daintree on 2002/07/20 13:41:12 revert to freebsd version Affected files ... .. //depot/projects/ia64/lib/libstand/zalloc_malloc.c#4 edit Differences ... ==== //depot/projects/ia64/lib/libstand/zalloc_malloc.c#4 (text+ko) ==== @@ -65,9 +65,9 @@ Guard *res; #ifdef USEENDGUARD - bytes += 2 * MALLOCALIGN + 1; + bytes += MALLOCALIGN + 1; #else - bytes += 2 * MALLOCALIGN; + bytes += MALLOCALIGN; #endif while ((res = znalloc(&MallocPool, bytes)) == NULL) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 14:13:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A630B37B401; Sat, 20 Jul 2002 14:13:35 -0700 (PDT) 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 3884B37B400 for ; Sat, 20 Jul 2002 14:13:35 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA64743E4A for ; Sat, 20 Jul 2002 14:13:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KLDYJU015227 for ; Sat, 20 Jul 2002 14:13:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KLDYWP015224 for perforce@freebsd.org; Sat, 20 Jul 2002 14:13:34 -0700 (PDT) Date: Sat, 20 Jul 2002 14:13:34 -0700 (PDT) Message-Id: <200207202113.g6KLDYWP015224@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14551 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14551 Change 14551 by rwatson@rwatson_curry on 2002/07/20 14:12:46 Various compilation fixes. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#57 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#57 (text+ko) ==== @@ -1494,7 +1494,7 @@ } static int -mac_bibe_cred_check_readdir_vnode(struct ucred *cred, struct vnode *dvp, +mac_biba_cred_check_readdir_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { struct mac_biba *subj, *obj; @@ -1503,7 +1503,7 @@ return (0); subj = SLOT(&cred->cr_label); - obj = SLOT(label); + obj = SLOT(dlabel); if (!mac_biba_dominate_single(obj, subj)) return (EACCES); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 14:14:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 438B337B401; Sat, 20 Jul 2002 14:14:37 -0700 (PDT) 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 0082737B400 for ; Sat, 20 Jul 2002 14:14:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B29E743E31 for ; Sat, 20 Jul 2002 14:14:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KLEaJU015259 for ; Sat, 20 Jul 2002 14:14:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KLEaY9015256 for perforce@freebsd.org; Sat, 20 Jul 2002 14:14:36 -0700 (PDT) Date: Sat, 20 Jul 2002 14:14:36 -0700 (PDT) Message-Id: <200207202114.g6KLEaY9015256@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14552 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14552 Change 14552 by rwatson@rwatson_curry on 2002/07/20 14:13:43 More fixes for typos. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#36 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#36 (text+ko) ==== @@ -467,7 +467,7 @@ if (!mac_bsdextended_enabled) return (0); - error = VOP_GETATTR(vp, &vap, cred, curthread); + error = VOP_GETATTR(dvp, &vap, cred, curthread); if (error) return (error); return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VREAD)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 14:15:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41D8337B401; Sat, 20 Jul 2002 14:15:39 -0700 (PDT) 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 DB3E837B400 for ; Sat, 20 Jul 2002 14:15:38 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8214043E31 for ; Sat, 20 Jul 2002 14:15:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6KLFcJU015444 for ; Sat, 20 Jul 2002 14:15:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6KLFcNl015441 for perforce@freebsd.org; Sat, 20 Jul 2002 14:15:38 -0700 (PDT) Date: Sat, 20 Jul 2002 14:15:38 -0700 (PDT) Message-Id: <200207202115.g6KLFcNl015441@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14553 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14553 Change 14553 by rwatson@rwatson_curry on 2002/07/20 14:14:45 More fixes from earlier changes. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#45 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#45 (text+ko) ==== @@ -1446,7 +1446,7 @@ return (0); subj = SLOT(&cred->cr_label); - obj = SLOT(vnodelabel); + obj = SLOT(dlabel); if (!mac_mls_dominate_single(subj, obj)) return (EACCES); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 18:41:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AB9C37B401; Sat, 20 Jul 2002 18:41:16 -0700 (PDT) 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 0DE2437B400 for ; Sat, 20 Jul 2002 18:41:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F5DC43E31 for ; Sat, 20 Jul 2002 18:41:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6L1fFJU051313 for ; Sat, 20 Jul 2002 18:41:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6L1fF2r051310 for perforce@freebsd.org; Sat, 20 Jul 2002 18:41:15 -0700 (PDT) Date: Sat, 20 Jul 2002 18:41:15 -0700 (PDT) Message-Id: <200207210141.g6L1fF2r051310@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14565 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14565 Change 14565 by peter@peter_daintree on 2002/07/20 18:40:43 IFC @14563 Affected files ... .. //depot/projects/ia64/sys/kern/sys_process.c#12 integrate .. //depot/projects/ia64/sys/netinet/ip_var.h#5 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.c#7 integrate .. //depot/projects/ia64/sys/pccard/i82365.h#5 integrate .. //depot/projects/ia64/sys/pccard/pcic.c#10 integrate .. //depot/projects/ia64/sys/pccard/pcic_pci.c#10 integrate .. //depot/projects/ia64/sys/pccard/pcicvar.h#3 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#9 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#15 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#12 integrate Differences ... ==== //depot/projects/ia64/sys/kern/sys_process.c#12 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/sys_process.c,v 1.97 2002/07/12 17:21:22 alc Exp $ + * $FreeBSD: src/sys/kern/sys_process.c,v 1.98 2002/07/20 22:44:39 rwatson Exp $ */ #include @@ -392,10 +392,8 @@ return (ESRCH); } } - if (p_cansee(td, p)) { - error = ESRCH; + if ((error = p_cansee(td, p)) != 0) goto fail; - } if ((error = p_candebug(td, p)) != 0) goto fail; ==== //depot/projects/ia64/sys/netinet/ip_var.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/ip_var.h,v 1.62 2002/06/23 09:03:42 luigi Exp $ + * $FreeBSD: src/sys/netinet/ip_var.h,v 1.63 2002/07/20 22:46:20 rwatson Exp $ */ #ifndef _NETINET_IP_VAR_H_ @@ -50,6 +50,7 @@ struct in_addr ih_dst; /* destination internet address */ }; +#ifdef _KERNEL /* * Ip reassembly queue structure. Each fragment * being reassembled is attached to one of these structures. @@ -68,6 +69,7 @@ u_int16_t ipq_div_cookie; /* ipfw divert cookie */ #endif }; +#endif /* _KERNEL */ /* * Structure stored in mbuf in inpcb.ip_options ==== //depot/projects/ia64/sys/netinet/tcp_timer.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_timer.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_timer.c,v 1.52 2002/07/18 19:06:12 dillon Exp $ + * $FreeBSD: src/sys/netinet/tcp_timer.c,v 1.53 2002/07/20 23:48:59 jdp Exp $ */ #include "opt_compat.h" @@ -74,13 +74,13 @@ int error, s, tt; tt = *(int *)oidp->oid_arg1; - s = tt * 1000 / hz; + s = (int)((int64_t)tt * 1000 / hz); error = sysctl_handle_int(oidp, &s, 0, req); if (error || !req->newptr) return (error); - tt = s * hz / 1000; + tt = (int)((int64_t)s * hz / 1000); if (tt < 1) return (EINVAL); ==== //depot/projects/ia64/sys/pccard/i82365.h#5 (text+ko) ==== @@ -33,7 +33,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/pccard/i82365.h,v 1.25 2002/07/17 05:43:39 imp Exp $ + * $FreeBSD: src/sys/pccard/i82365.h,v 1.26 2002/07/20 22:29:23 imp Exp $ */ #define PCIC_I82365 0 /* Intel i82365SL-A/B or clone */ @@ -104,6 +104,13 @@ #define PCIC_TIME_CMD1 0x3e #define PCIC_TIME_RECOV1 0x3f +/* Yenta only registers */ +#define PCIC_MEMORY_HIGH0 0x40 /* A31..A25 of mapping addres for */ +#define PCIC_MEMORY_HIGH1 0x41 /* the memory windows. */ +#define PCIC_MEMORY_HIGH2 0x42 +#define PCIC_MEMORY_HIGH3 0x43 + + #define PCIC_SLOT_SIZE 0x40 /* Size of register set for one slot */ /* Now register bits, ordered by reg # */ ==== //depot/projects/ia64/sys/pccard/pcic.c#10 (text+ko) ==== @@ -27,7 +27,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/pccard/pcic.c,v 1.176 2002/07/18 08:13:45 imp Exp $ + * $FreeBSD: src/sys/pccard/pcic.c,v 1.177 2002/07/20 22:29:23 imp Exp $ */ #include @@ -223,14 +223,25 @@ } if (mp->flags & MDF_ACTIVE) { unsigned long sys_addr = (uintptr_t)(void *)mp->start >> 12; + if ((sys_addr >> 12) != 0 && + (sp->sc->flags & PCIC_YENTA_HIGH_MEMORY) == 0) { + printf("This pcic does not support mapping > 24M\n"); + return (ENXIO); + } /* * Write the addresses, card offsets and length. * The values are all stored as the upper 12 bits of the * 24 bit address i.e everything is allocated as 4 Kb chunks. + * Memory mapped cardbus bridges extend this slightly to allow + * one to set the upper 8 bits of the 32bit address as well. + * If the chip supports it, then go ahead and write those + * upper 8 bits. */ pcic_putw(sp, reg, sys_addr & 0xFFF); pcic_putw(sp, reg+2, (sys_addr + (mp->size >> 12) - 1) & 0xFFF); pcic_putw(sp, reg+4, ((mp->card >> 12) - sys_addr) & 0x3FFF); + if (sp->sc->flags & PCIC_YENTA_HIGH_MEMORY) + sp->putb(sp, PCIC_MEMORY_HIGH0 + win, sys_addr >> 12); /* * Each 16 bit register has some flags in the upper bits. */ ==== //depot/projects/ia64/sys/pccard/pcic_pci.c#10 (text+ko) ==== @@ -26,7 +26,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/pccard/pcic_pci.c,v 1.118 2002/07/18 08:05:00 imp Exp $ + * $FreeBSD: src/sys/pccard/pcic_pci.c,v 1.119 2002/07/20 22:29:23 imp Exp $ */ #include @@ -1269,6 +1269,8 @@ sp->revision = 0; sc->flags = PCIC_CARDBUS_POWER; } + /* All memory mapped cardbus bridges have these registers */ + sc->flags |= PCIC_YENTA_HIGH_MEMORY; sp->slt = (struct slot *) 1; sc->csc_route = pcic_intr_path; sc->func_route = pcic_intr_path; ==== //depot/projects/ia64/sys/pccard/pcicvar.h#3 (text+ko) ==== @@ -21,7 +21,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/pccard/pcicvar.h,v 1.28 2001/11/09 05:24:51 imp Exp $ + * $FreeBSD: src/sys/pccard/pcicvar.h,v 1.29 2002/07/20 22:29:23 imp Exp $ */ /* @@ -52,6 +52,7 @@ #define PCIC_KING_POWER 0x00000010 /* Uses IBM KING regs */ #define PCIC_RICOH_POWER 0x00000020 /* Uses the ricoh power regs */ #define PCIC_CARDBUS_POWER 0x00000040 /* Cardbus power regs */ +#define PCIC_YENTA_HIGH_MEMORY 0x0080 /* Can do high memory mapping */ enum pcic_intr_way csc_route; /* How to route csc interrupts */ enum pcic_intr_way func_route; /* How to route function ints */ ==== //depot/projects/ia64/sys/vm/swap_pager.c#9 (text+ko) ==== @@ -64,7 +64,7 @@ * * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94 * - * $FreeBSD: src/sys/vm/swap_pager.c,v 1.175 2002/06/26 20:32:48 iedowse Exp $ + * $FreeBSD: src/sys/vm/swap_pager.c,v 1.176 2002/07/20 20:58:46 alc Exp $ */ #include @@ -1478,6 +1478,7 @@ */ pmap_qremove((vm_offset_t)bp->b_data, bp->b_npages); + vm_page_lock_queues(); /* * cleanup pages. If an error occurs writing to swap, we are in * very serious trouble. If it happens to be a disk error, though, @@ -1596,6 +1597,7 @@ vm_page_protect(m, VM_PROT_READ); } } + vm_page_unlock_queues(); /* * adjust pip. NOTE: the original parent may still have its own ==== //depot/projects/ia64/sys/vm/vm_page.c#15 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91 - * $FreeBSD: src/sys/vm/vm_page.c,v 1.198 2002/07/20 19:34:21 alc Exp $ + * $FreeBSD: src/sys/vm/vm_page.c,v 1.200 2002/07/20 20:58:46 alc Exp $ */ /* @@ -1365,8 +1365,8 @@ int vm_page_try_to_cache(vm_page_t m) { - GIANT_REQUIRED; + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (m->dirty || m->hold_count || m->busy || m->wire_count || (m->flags & (PG_BUSY|PG_UNMANAGED))) { return (0); @@ -1387,6 +1387,8 @@ int vm_page_try_to_free(vm_page_t m) { + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (m->dirty || m->hold_count || m->busy || m->wire_count || (m->flags & (PG_BUSY|PG_UNMANAGED))) { return (0); ==== //depot/projects/ia64/sys/vm/vm_pageout.c#12 (text+ko) ==== @@ -65,7 +65,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_pageout.c,v 1.199 2002/07/20 19:34:21 alc Exp $ + * $FreeBSD: src/sys/vm/vm_pageout.c,v 1.200 2002/07/20 20:58:46 alc Exp $ */ /* @@ -392,6 +392,7 @@ (flags | ((object == kernel_object) ? OBJPC_SYNC : 0)), pageout_status); + vm_page_lock_queues(); for (i = 0; i < count; i++) { vm_page_t mt = mc[i]; @@ -437,6 +438,7 @@ vm_page_protect(mt, VM_PROT_READ); } } + vm_page_unlock_queues(); return numpagedout; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 20:20:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E41EF37B401; Sat, 20 Jul 2002 20:20:23 -0700 (PDT) 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 7C97137B400 for ; Sat, 20 Jul 2002 20:20:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3EF5843E42 for ; Sat, 20 Jul 2002 20:20:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6L3KNJU068004 for ; Sat, 20 Jul 2002 20:20:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6L3KMk6067986 for perforce@freebsd.org; Sat, 20 Jul 2002 20:20:22 -0700 (PDT) Date: Sat, 20 Jul 2002 20:20:22 -0700 (PDT) Message-Id: <200207210320.g6L3KMk6067986@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14567 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14567 Change 14567 by peter@peter_ia64 on 2002/07/20 20:19:52 report when we hit an ACPI2.0 table. (hack) Affected files ... .. //depot/projects/ia64/sys/ia64/acpica/OsdEnvironment.c#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/acpica/OsdEnvironment.c#3 (text+ko) ==== @@ -55,11 +55,19 @@ { if (ia64_efi_acpi20_table) { +printf("ACPI 2.0 table at %p\n", ia64_efi_acpi20_table); + } + if (ia64_efi_acpi_table) { +printf("ACPI 1.x table at %p\n", ia64_efi_acpi_table); + } + if (ia64_efi_acpi20_table) { +printf("Using ACPI2.0 table\n"); RsdpAddress->PointerType = ACPI_PHYSICAL_POINTER; RsdpAddress->Pointer.Physical = ia64_efi_acpi20_table; } else if (ia64_efi_acpi_table) { +printf("Using ACPI1.x table\n"); RsdpAddress->PointerType = ACPI_PHYSICAL_POINTER; RsdpAddress->Pointer.Physical = ia64_efi_acpi_table; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 20:24:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 524D137B401; Sat, 20 Jul 2002 20:24:29 -0700 (PDT) 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 0B88837B400 for ; Sat, 20 Jul 2002 20:24:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A39E743E3B for ; Sat, 20 Jul 2002 20:24:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6L3OSJU068372 for ; Sat, 20 Jul 2002 20:24:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6L3OSMW068369 for perforce@freebsd.org; Sat, 20 Jul 2002 20:24:28 -0700 (PDT) Date: Sat, 20 Jul 2002 20:24:28 -0700 (PDT) Message-Id: <200207210324.g6L3OSMW068369@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14568 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14568 Change 14568 by peter@peter_ia64 on 2002/07/20 20:24:16 drop in a hack that I was using to give an explicit address to the dump routines. The itanium2 system does not provide the usual pointers in a place where this can find. Affected files ... .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi_user.c#2 edit .. //depot/projects/ia64/usr.sbin/acpi/acpidump/acpidump.c#3 edit Differences ... ==== //depot/projects/ia64/usr.sbin/acpi/acpidump/acpi_user.c#2 (text+ko) ==== @@ -52,8 +52,8 @@ LIST_HEAD(acpi_user_mapping_list, acpi_user_mapping) maplist; -static void -acpi_user_init() +void +acpi_user_init(void) { if (acpi_mem_fd == -1) { ==== //depot/projects/ia64/usr.sbin/acpi/acpidump/acpidump.c#3 (text+ko) ==== @@ -36,6 +36,8 @@ #include "acpidump.h" +u_int64_t xaddr; + static void asl_dump_from_file(char *file) { @@ -47,21 +49,62 @@ acpi_dump_dsdt(dp, end); } +void +hd(void *buf, int len) +{ + unsigned char *p; + int n, i; + + p = buf; + for (n = 0; n < len; n += 16) { + for (i = n; i < n + 16; i++) { + if ((i % 16) == 0) { /* beginning of line */ + printf("0x%04x ", i); + } + if ((i % 2) == 0) { + printf(" "); + } + if (i < len) + printf("%02x", p[i]); + else + printf(" "); + } + printf(" "); /* Why does \t come out as '?' ? */ + for (i = n; i < n + 16; i++) { + if (i >= len) + break; + if (p[i] >= ' ' && p[i] <= '~') + printf("%c", p[i]); + else + printf("."); + } + printf("\n"); + } +} + static void asl_dump_from_devmem() { struct ACPIrsdp *rp; struct ACPIsdt *rsdp; +if (xaddr == 0) { rp = acpi_find_rsd_ptr(); if (!rp) errx(1, "Can't find ACPI information\n"); acpi_print_rsd_ptr(rp); rsdp = (struct ACPIsdt *) acpi_map_sdt(rp->addr); - if (memcmp(rsdp->signature, "RSDT", 4) || - acpi_checksum(rsdp, rsdp->len)) - errx(1, "RSDT is corrupted\n"); +} else { + acpi_user_init(); + rsdp = (struct ACPIsdt *) acpi_map_sdt(xaddr); +} + if (memcmp(rsdp->signature, "RSDT", 4)) { +hd(rsdp, 256); + errx(1, "RSDT is not a RSDT\n"); + } + if (acpi_checksum(rsdp, rsdp->len)) + errx(1, "RSDT checksum corrupted\n"); acpi_handle_rsdt(rsdp); } @@ -82,7 +125,7 @@ char c, *progname; progname = argv[0]; - while ((c = getopt(argc, argv, "f:o:hr")) != -1) { + while ((c = getopt(argc, argv, "f:o:hrx:")) != -1) { switch (c) { case 'f': asl_dump_from_file(optarg); @@ -96,6 +139,10 @@ case 'r': rflag++; break; + case 'x': + xaddr = strtol(optarg, 0, 0); + printf("xaddr = %p\n", xaddr); + break; default: argc -= optind; argv += optind; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 20:26:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43C2C37B401; Sat, 20 Jul 2002 20:26:32 -0700 (PDT) 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 DCC9837B400 for ; Sat, 20 Jul 2002 20:26:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8ACFA43E31 for ; Sat, 20 Jul 2002 20:26:31 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6L3QVJU068543 for ; Sat, 20 Jul 2002 20:26:31 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6L3QVNN068540 for perforce@freebsd.org; Sat, 20 Jul 2002 20:26:31 -0700 (PDT) Date: Sat, 20 Jul 2002 20:26:31 -0700 (PDT) Message-Id: <200207210326.g6L3QVNN068540@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14569 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14569 Change 14569 by peter@peter_ia64 on 2002/07/20 20:25:35 add the em driver (this should be MI, sigh) Affected files ... .. //depot/projects/ia64/sys/conf/files.ia64#11 edit Differences ... ==== //depot/projects/ia64/sys/conf/files.ia64#11 (text+ko) ==== @@ -75,6 +75,8 @@ crypto/des/des_enc.c optional ipsec ipsec_esp dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa +dev/em/if_em.c optional em +dev/em/if_em_hw.c optional em dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 20:29:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6674F37B401; Sat, 20 Jul 2002 20:29:36 -0700 (PDT) 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 0BE8837B400 for ; Sat, 20 Jul 2002 20:29:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE33643E4A for ; Sat, 20 Jul 2002 20:29:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6L3TZJU068824 for ; Sat, 20 Jul 2002 20:29:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6L3TZIE068821 for perforce@freebsd.org; Sat, 20 Jul 2002 20:29:35 -0700 (PDT) Date: Sat, 20 Jul 2002 20:29:35 -0700 (PDT) Message-Id: <200207210329.g6L3TZIE068821@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14570 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14570 Change 14570 by peter@peter_ia64 on 2002/07/20 20:28:56 I'm tired of adding this over and over again. It is so damn useful at times when you want to see where you hang solid during boot (or do an instant reset or whatever) Affected files ... .. //depot/projects/ia64/sys/conf/options#22 edit .. //depot/projects/ia64/sys/kern/init_main.c#12 edit Differences ... ==== //depot/projects/ia64/sys/conf/options#22 (text+ko) ==== @@ -553,3 +553,6 @@ # Mutex profiling MUTEX_PROFILING opt_global.h + +# Log SYSINIT() execution +SYSINIT_TRACE opt_sysinit.h ==== //depot/projects/ia64/sys/kern/init_main.c#12 (text+ko) ==== @@ -43,6 +43,7 @@ */ #include "opt_init_path.h" +#include "opt_sysinit.h" #include #include @@ -204,6 +205,12 @@ if ((*sipp)->subsystem == SI_SUB_DONE) continue; +#ifdef SYSINIT_TRACE + printf("SYSINIT: 0x%08x:%08x %p(%p)\n", + (*sipp)->subsystem, (*sipp)->order, + (*sipp)->func, (*sipp)->udata); +#endif + /* Call function */ (*((*sipp)->func))((*sipp)->udata); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 20 20:41: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AEF037B401; Sat, 20 Jul 2002 20:40:53 -0700 (PDT) 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 3225037B400 for ; Sat, 20 Jul 2002 20:40:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1F4343E31 for ; Sat, 20 Jul 2002 20:40:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6L3eqJU069734 for ; Sat, 20 Jul 2002 20:40:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6L3eqgR069731 for perforce@freebsd.org; Sat, 20 Jul 2002 20:40:52 -0700 (PDT) Date: Sat, 20 Jul 2002 20:40:52 -0700 (PDT) Message-Id: <200207210340.g6L3eqgR069731@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14574 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14574 Change 14574 by peter@peter_ia64 on 2002/07/20 20:40:44 Beware of grossness. Hardwire the itanium2 tiger4 box's irq configuration for the devices I know about. Each slot/pin has a fixed configuration, but these are the only ones I know. No, this stuff is not intended for commit. :) Affected files ... .. //depot/projects/ia64/sys/conf/options#23 edit .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#5 edit .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#5 edit Differences ... ==== //depot/projects/ia64/sys/conf/options#23 (text+ko) ==== @@ -556,3 +556,6 @@ # Log SYSINIT() execution SYSINIT_TRACE opt_sysinit.h + +# MD hacks +TIGER4 opt_tiger4.h ==== //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#5 (text+ko) ==== @@ -27,6 +27,7 @@ * $FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.21 2002/05/19 06:16:45 peter Exp $ */ #include "opt_acpi.h" +#include "opt_tiger4.h" #include #include #include @@ -170,18 +171,19 @@ * XXX invoke _REG on this for the PCI config space address space? */ if (ACPI_FAILURE(status = acpi_EvaluateInteger(sc->ap_handle, "_BBN", &sc->ap_bus))) { + device_printf(dev, "could not evaluate _BBN - %s\n", AcpiFormatException(status)); if (status != AE_NOT_FOUND) { - device_printf(dev, "could not evaluate _BBN - %s\n", AcpiFormatException(status)); return_VALUE(ENXIO); } if (ACPI_FAILURE(status = acpi_EvaluateInteger(sc->ap_handle, "_ADR", &sc->ap_bus))) { + device_printf(dev, "could not evaluate _ADR - %s\n", AcpiFormatException(status)); if (status != AE_NOT_FOUND) { - device_printf(dev, "could not evaluate _ADR - %s\n", AcpiFormatException(status)); return_VALUE(ENXIO); } } else { /* if it's not found, assume 0 */ sc->ap_bus = 0; +device_printf(dev, "defaulting to ap_bus = 0\n"); } } @@ -198,7 +200,7 @@ */ sc->ap_prt.Length = ACPI_ALLOCATE_BUFFER; if (ACPI_FAILURE(status = AcpiGetIrqRoutingTable(sc->ap_handle, &sc->ap_prt))) { - device_printf(dev, "could not get PCI interrupt routing table - %s\n", AcpiFormatException(status)); + device_printf(dev, "could not get PCI interrupt routing table for %s - %s\n", acpi_name(sc->ap_handle), AcpiFormatException(status)); /* this is not an error, but it may reduce functionality */ } @@ -309,6 +311,7 @@ int interrupt; int i; uintptr_t up; + int slot; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -334,6 +337,25 @@ } if (sc == NULL) /* not one of ours */ goto out; + + slot = pci_get_slot(dev); + +#ifdef TIGER4 + device_printf(sc->ap_dev, "acpi_pcib_route_interrupt: %s pci%d:%d:%d\n", acpi_name(sc->ap_handle), bus, slot, pin); + if (bus == 0 && slot == 29 && pin == 0) { + interrupt = 50; /* usb0 */ + device_printf(sc->ap_dev, "IRQ ROUTING KLUDGE %s bus %d slot %d pin %d -> %d\n", + acpi_name(sc->ap_handle), bus, slot, pin, interrupt); + goto out; + } + if (bus == 0 && slot == 29 && pin == 1) { + interrupt = 49; /* usb1 */ + device_printf(sc->ap_dev, "IRQ ROUTING KLUDGE %s bus %d slot %d pin %d -> %d\n", + acpi_name(sc->ap_handle), bus, slot, pin, interrupt); + goto out; + } +#endif + prtp = sc->ap_prt.Pointer; if (prtp == NULL) /* didn't get routing table */ goto out; ==== //depot/projects/ia64/sys/dev/pci/pci_pci.c#5 (text+ko) ==== @@ -46,6 +46,7 @@ #include "pcib_if.h" #include "opt_pci.h" +#include "opt_tiger4.h" /* * Bridge-specific data. @@ -424,6 +425,57 @@ int parent_intpin; int intnum; +#ifdef TIGER4 +int childslot = pci_get_slot(dev); +int childpin = pin - 1; +int childbus = pci_get_bus(dev); +device_printf(dev, "pcib_route_interrupt: pci%d:%d:%d\n", childbus, childslot, childpin); +intnum = 255; +/* +em0: pcib_route_interrupt: pci1:0:0 +fxp0: pcib_route_interrupt: pci3:2:0 +fxp1: pcib_route_interrupt: pci5:1:0 +isp0: pcib_route_interrupt: pci10:2:0 +fxp2: pcib_route_interrupt: pci13:1:0 +*/ +#if 0 /* XXX need to hack this at acpi level */ + if (childbus == 1 && childslot == 29 && childpin == 0) + intnum = 50; /* usb */ + if (childbus == 1 && childslot == 29 && childpin == 1) + intnum = 49; /* usb */ +#endif + if (childbus == 1 && childslot == 0 && childpin == 0) + intnum = 51; /* em */ + if (childbus == 3 && childslot == 2 && childpin == 0) + intnum = 63; /* fxp0 */ + if (childbus == 3 && childslot == 31 && childpin == 0) + intnum = 67; /* hotplug */ + if (childbus == 5 && childslot == 1 && childpin == 0) + intnum = 52; /* fxp1 */ + if (childbus == 5 && childslot == 2 && childpin == 0) + intnum = 56; /* mpt0 */ + if (childbus == 5 && childslot == 2 && childpin == 1) + intnum = 57; /* mpt1 */ + if (childbus == 5 && childslot == 31 && childpin == 0) + intnum = 58; /* hotplug */ + if (childbus == 8 && childslot == 31 && childpin == 0) + intnum = 80; /* hotplug */ + if (childbus == 10 && childslot == 2 && childpin == 0) + intnum = 72; /* isp0 */ + if (childbus == 10 && childslot == 31 && childpin == 0) + intnum = 75; /* hotplug */ + if (childbus == 13 && childslot == 1 && childpin == 0) + intnum = 86; /* fxp2 */ + if (childbus == 13 && childslot == 31 && childpin == 0) + intnum = 90; /* hotplug */ + if (childbus == 14 && childslot == 31 && childpin == 0) + intnum = 85; /* hotplug */ +if (intnum != 255) { +device_printf(dev, "Hardwiring IRQ to %d\n", intnum); +return intnum; +} +#endif + /* * * The PCI standard defines a swizzle of the child-side device/intpin to To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 1:23:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9584137B401; Sun, 21 Jul 2002 01:23:09 -0700 (PDT) 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 3387237B400 for ; Sun, 21 Jul 2002 01:23:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB55A43E3B for ; Sun, 21 Jul 2002 01:23:08 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6L8N8JU013794 for ; Sun, 21 Jul 2002 01:23:08 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6L8N8JK013791 for perforce@freebsd.org; Sun, 21 Jul 2002 01:23:08 -0700 (PDT) Date: Sun, 21 Jul 2002 01:23:08 -0700 (PDT) Message-Id: <200207210823.g6L8N8JK013791@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14593 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14593 Change 14593 by peter@peter_daintree on 2002/07/21 01:23:04 I think Doug deserves the pointy hat for this. (hint: it is an 8-bit value). It is amazing how unhappy the system gets when the sapics fill up their queues to non-existing cpu targets. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/sapic.c#8 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/sapic.c#8 (text+ko) ==== @@ -138,8 +138,8 @@ u_int64_t lid = ia64_get_lid(); bzero(&rte, sizeof(rte)); - rte.rte_destination_id = (lid >> 24) & 15; - rte.rte_destination_eid = (lid >> 16) & 15; + rte.rte_destination_id = (lid >> 24) & 255; + rte.rte_destination_eid = (lid >> 16) & 255; rte.rte_trigger_mode = trigger_mode; rte.rte_polarity = polarity; rte.rte_delivery_mode = 0; /* fixed */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 7: 4:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A8A737B401; Sun, 21 Jul 2002 07:04:44 -0700 (PDT) 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 A028837B400 for ; Sun, 21 Jul 2002 07:04:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A4B143E31 for ; Sun, 21 Jul 2002 07:04:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LE4gJU076948 for ; Sun, 21 Jul 2002 07:04:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LE4gJw076945 for perforce@freebsd.org; Sun, 21 Jul 2002 07:04:42 -0700 (PDT) Date: Sun, 21 Jul 2002 07:04:42 -0700 (PDT) Message-Id: <200207211404.g6LE4gJw076945@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14599 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14599 Change 14599 by rwatson@rwatson_curry on 2002/07/21 07:03:46 Add comments for places where we'll need access control checks. Specifically: - O_TRUNC on open - O_CREAT open case Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#54 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#22 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#54 (text+ko) ==== @@ -1800,6 +1800,9 @@ VATTR_NULL(&vat); vat.va_size = 0; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); +#ifdef MAC + /* XXXMAC: Truncation check here. */ +#endif error = VOP_SETATTR(vp, &vat, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); @@ -4477,6 +4480,9 @@ } VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); /* XXX */ +#ifdef MAC + /* XXXMAC: Truncation check here. */ +#endif VATTR_NULL(vap); vap->va_size = 0; error = VOP_SETATTR(vp, vap, td->td_ucred, td); ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#22 (text+ko) ==== @@ -212,6 +212,11 @@ if (fmode & O_APPEND) mode |= VAPPEND; #ifdef MAC + /* + * XXXMAC: Note that for newly created files, we never + * perform an open check. This is probably wrong, but if + * we add it, the failure modes need to be right. + */ error = mac_cred_check_open_vnode(cred, vp, mode); if (error) goto bad; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 7: 8:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23F6E37B401; Sun, 21 Jul 2002 07:08:52 -0700 (PDT) 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 AFBC237B400 for ; Sun, 21 Jul 2002 07:08:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FCD443E65 for ; Sun, 21 Jul 2002 07:08:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LE8pJU081330 for ; Sun, 21 Jul 2002 07:08:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LE8pDA081327 for perforce@freebsd.org; Sun, 21 Jul 2002 07:08:51 -0700 (PDT) Date: Sun, 21 Jul 2002 07:08:51 -0700 (PDT) Message-Id: <200207211408.g6LE8pDA081327@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14600 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14600 Change 14600 by rwatson@rwatson_curry on 2002/07/21 07:08:30 Comment to indicate fhopen() requires mediation. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#55 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#55 (text+ko) ==== @@ -4472,6 +4472,12 @@ if (error) goto bad; } +#ifdef MAC + /* + * XXXMAC: Mediation required here. Also check that the rest of + * this is in sync with vn_open(). + */ +#endif if (fmode & O_TRUNC) { VOP_UNLOCK(vp, 0, td); /* XXX */ if ((error = vn_start_write(NULL, &mp, V_WAIT | PCATCH)) != 0) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 7:19:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D5D637B400; Sun, 21 Jul 2002 07:19:06 -0700 (PDT) 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 C9A8437B401 for ; Sun, 21 Jul 2002 07:19:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C00643E5E for ; Sun, 21 Jul 2002 07:19:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LEJ4JU082325 for ; Sun, 21 Jul 2002 07:19:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LEJ4UB082322 for perforce@freebsd.org; Sun, 21 Jul 2002 07:19:04 -0700 (PDT) Date: Sun, 21 Jul 2002 07:19:04 -0700 (PDT) Message-Id: <200207211419.g6LEJ4UB082322@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14601 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14601 Change 14601 by rwatson@rwatson_curry on 2002/07/21 07:18:45 Mediate access to fhopen(). Note the truncation check is still required. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#56 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#56 (text+ko) ==== @@ -4467,17 +4467,16 @@ } if (fmode & FREAD) mode |= VREAD; +#ifdef MAC + error = mac_cred_check_open_vnode(td->td_ucred, vp, mode); + if (error) + goto bad; +#endif if (mode) { error = VOP_ACCESS(vp, mode, td->td_ucred, td); if (error) goto bad; } -#ifdef MAC - /* - * XXXMAC: Mediation required here. Also check that the rest of - * this is in sync with vn_open(). - */ -#endif if (fmode & O_TRUNC) { VOP_UNLOCK(vp, 0, td); /* XXX */ if ((error = vn_start_write(NULL, &mp, V_WAIT | PCATCH)) != 0) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 12:14:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D932237B401; Sun, 21 Jul 2002 12:14:19 -0700 (PDT) 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 6A3C537B400 for ; Sun, 21 Jul 2002 12:14:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1331943E65 for ; Sun, 21 Jul 2002 12:14:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LJEIJU078591 for ; Sun, 21 Jul 2002 12:14:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LJEIjk078562 for perforce@freebsd.org; Sun, 21 Jul 2002 12:14:18 -0700 (PDT) Date: Sun, 21 Jul 2002 12:14:18 -0700 (PDT) Message-Id: <200207211914.g6LJEIjk078562@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14619 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14619 Change 14619 by rwatson@rwatson_curry on 2002/07/21 12:13:41 Various preps for improved VFS access control extensibility: - Comment various VOP's that will shortly be instrumented, both in generic VFS entry points and in the ctty code. - Add instrumentation to cttyopen(), since it invokes vn_open(). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#8 edit .. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#4 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#23 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#8 (text+ko) ==== @@ -35,6 +35,7 @@ */ #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -44,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -766,6 +768,9 @@ vn_start_write(vp, &mp, V_WAIT); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); (void)VOP_LEASE(vp, td, cred, LEASE_WRITE); +#ifdef MAC + /* XXXMAC: Write authorization checks here. */ +#endif error = VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, cred); if (error == 0 && uio != NULL) { (void)VOP_LEASE(vp, td, cred, LEASE_WRITE); ==== //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#4 (text+ko) ==== @@ -38,12 +38,15 @@ * Indirect driver for controlling tty. */ +#include "opt_mac.h" + #include #include #include #include #include #include +#include #include #include #include @@ -94,6 +97,13 @@ if (ttyvp == NULL) return (ENXIO); vn_lock(ttyvp, LK_EXCLUSIVE | LK_RETRY, td); +#ifdef MAC + error = mac_cred_check_open_vnode(td->td_ucred, ttyvp, flag); + if (error) { + VOP_UNLOCK(ttyvp, 0, td); + return (error); + } +#endif error = VOP_OPEN(ttyvp, flag, NOCRED, td); VOP_UNLOCK(ttyvp, 0, td); return (error); @@ -149,6 +159,9 @@ (error = vn_start_write(ttyvp, &mp, V_WAIT | PCATCH)) != 0) return (error); vn_lock(ttyvp, LK_EXCLUSIVE | LK_RETRY, td); +#ifdef MAC + /* XXXMAC: Write authorization check here. */ +#endif error = VOP_WRITE(ttyvp, uio, flag, NOCRED); VOP_UNLOCK(ttyvp, 0, td); vn_finished_write(mp); @@ -189,6 +202,9 @@ PROC_UNLOCK(td->td_proc); return (error); } +#ifdef MAC + /* XXXMAC: Ioctl authorization check here. */ +#endif return (VOP_IOCTL(ttyvp, cmd, addr, flag, NOCRED, td)); } @@ -210,6 +226,9 @@ if (ttyvp == NULL) /* try operation to get EOF/failure */ return (seltrue(dev, events, td)); +#ifdef MAC + /* XXXMAC: Poll authorization check here. */ +#endif return (VOP_POLL(ttyvp, events, td->td_ucred, td)); } ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#23 (text+ko) ==== @@ -397,8 +397,14 @@ auio.uio_rw = rw; auio.uio_td = td; if (rw == UIO_READ) { +#ifdef MAC + /* XXXMAC: Read authorization check here. */ +#endif error = VOP_READ(vp, &auio, ioflg, cred); } else { +#ifdef MAC + /* XXXMAC: Write authorization check here. */ +#endif error = VOP_WRITE(vp, &auio, ioflg, cred); } if (aresid) @@ -486,6 +492,9 @@ ioflag |= sequential_heuristic(uio, fp); +#ifdef MAC + /* XXXMAC: Read authorization check here. */ +#endif error = VOP_READ(vp, uio, ioflag, cred); if ((flags & FOF_OFFSET) == 0) fp->f_offset = uio->uio_offset; @@ -537,6 +546,9 @@ if ((flags & FOF_OFFSET) == 0) uio->uio_offset = fp->f_offset; ioflag |= sequential_heuristic(uio, fp); +#ifdef MAC + /* XXXMAC: Write authorization check here. */ +#endif error = VOP_WRITE(vp, uio, ioflag, cred); if ((flags & FOF_OFFSET) == 0) fp->f_offset = uio->uio_offset; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 12:15:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5340F37B401; Sun, 21 Jul 2002 12:15:21 -0700 (PDT) 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 0D30E37B400 for ; Sun, 21 Jul 2002 12:15:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF1C743E3B for ; Sun, 21 Jul 2002 12:15:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LJFKJU085317 for ; Sun, 21 Jul 2002 12:15:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LJFKPS085279 for perforce@freebsd.org; Sun, 21 Jul 2002 12:15:20 -0700 (PDT) Date: Sun, 21 Jul 2002 12:15:20 -0700 (PDT) Message-Id: <200207211915.g6LJFKPS085279@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14620 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14620 Change 14620 by rwatson@rwatson_curry on 2002/07/21 12:15:16 A couple more comments for future authorization checks. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#24 (text+ko) ==== @@ -740,6 +740,9 @@ *(int *)data = devsw(vp->v_rdev)->d_flags & D_TYPEMASK; return (0); } +#ifdef MAC + /* XXXMAC: Ioctl authorization check here. */ +#endif error = VOP_IOCTL(vp, com, data, fp->f_flag, td->td_ucred, td); if (error == 0 && com == TIOCSCTTY) { @@ -777,6 +780,10 @@ struct thread *td; { +#ifdef MAC + /* XXXMAC: Poll authorization check here. */ +#endif + return (VOP_POLL(((struct vnode *)fp->f_data), events, cred, td)); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 12:23:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB4B637B401; Sun, 21 Jul 2002 12:23:31 -0700 (PDT) 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 61D6037B400 for ; Sun, 21 Jul 2002 12:23:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A29F43E58 for ; Sun, 21 Jul 2002 12:23:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LJNUJU093234 for ; Sun, 21 Jul 2002 12:23:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LJNUNH093231 for perforce@freebsd.org; Sun, 21 Jul 2002 12:23:30 -0700 (PDT) Date: Sun, 21 Jul 2002 12:23:30 -0700 (PDT) Message-Id: <200207211923.g6LJNUNH093231@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14621 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14621 Change 14621 by rwatson@rwatson_curry on 2002/07/21 12:22:43 A couple of VFS/MAC cleanups including: - Authorize readdir using readdir check rather than search check - Stick in an open check until the emulator is fixed to use vn_open() Affected files ... .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#6 edit .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#6 edit .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#12 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#6 (text+ko) ==== @@ -331,7 +331,7 @@ /* * Do directory search MAC check using non-cached credentials. */ - if ((error = mac_cred_check_search_vnode(td->td_proc->p_ucred, vp)) + if ((error = mac_cred_check_readdir_vnode(td->td_proc->p_ucred, vp)) goto out; #endif /* MAC */ if ((error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, &ncookies, ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#6 (text+ko) ==== @@ -203,7 +203,7 @@ eofflag = 0; #ifdef MAC - error = mac_cred_check_search_vnode(td->td_ucred, uvp); + error = mac_cred_check_readdir_vnode(td->td_ucred, uvp); if (error == 0) #endif /* MAC */ error = VOP_READDIR(uvp, &uio, td->td_ucred, &eofflag, ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#12 (text+ko) ==== @@ -307,6 +307,11 @@ * authorized. It would also remove lots of duplicated code * from vn_open(). */ +#ifdef MAC + error = mac_cred_check_open_vnode(td->td_ucred, vp, FREAD); + if (error) + goto cleanup; +#endif error = VOP_OPEN(vp, FREAD, td->td_ucred, td); if (error) goto cleanup; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 12:25:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAC2D37B401; Sun, 21 Jul 2002 12:25:34 -0700 (PDT) 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 57DA037B400 for ; Sun, 21 Jul 2002 12:25:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1545043E3B for ; Sun, 21 Jul 2002 12:25:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LJPXJU093418 for ; Sun, 21 Jul 2002 12:25:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LJPXkO093415 for perforce@freebsd.org; Sun, 21 Jul 2002 12:25:33 -0700 (PDT) Date: Sun, 21 Jul 2002 12:25:33 -0700 (PDT) Message-Id: <200207211925.g6LJPXkO093415@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14622 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14622 Change 14622 by rwatson@rwatson_curry on 2002/07/21 12:24:35 Modify search check to be readdir for svr4. Affected files ... .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#9 (text+ko) ==== @@ -316,7 +316,7 @@ #ifdef MAC /* Use process's credentials to check directory search MAC. */ - error = mac_cred_check_search_vnode(td->td_proc->p_ucred, vp); + error = mac_cred_check_readdir_vnode(td->td_proc->p_ucred, vp); if (error) goto out; #endif /* MAC */ @@ -479,7 +479,7 @@ */ #ifdef MAC /* Use process's credentials to check directory search MAC. */ - error = mac_cred_check_search_vnode(td->td_proc->p_ucred, vp); + error = mac_cred_check_readdir_vnode(td->td_proc->p_ucred, vp); if (error) goto out; #endif /* MAC */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 12:29:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CC5C37B401; Sun, 21 Jul 2002 12:29:40 -0700 (PDT) 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 E3DBC37B400 for ; Sun, 21 Jul 2002 12:29:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F7BF43E5E for ; Sun, 21 Jul 2002 12:29:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LJTdJU093844 for ; Sun, 21 Jul 2002 12:29:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LJTdT6093841 for perforce@freebsd.org; Sun, 21 Jul 2002 12:29:39 -0700 (PDT) Date: Sun, 21 Jul 2002 12:29:39 -0700 (PDT) Message-Id: <200207211929.g6LJTdT6093841@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14623 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14623 Change 14623 by rwatson@rwatson_curry on 2002/07/21 12:29:01 Teach SVR4 fd_revoke() implementation about MAC. Affected files ... .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#6 (text+ko) ==== @@ -30,12 +30,16 @@ * * $FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.23 2002/04/01 21:30:30 jhb Exp $ */ + +#include "opt_mac.h" + #include #include #include #include /*#include */ #include +#include #include #include #include @@ -260,6 +264,14 @@ goto out; } +#ifdef MAC + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + error = mac_cred_check_revoke_vnode(td->td_ucred, vp); + VOP_UNLOCK(vp, 0, td); + if (error) + goto out; +#endif + if ((error = VOP_GETATTR(vp, &vattr, td->td_ucred, td)) != 0) goto out; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 12:57:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 823CA37B401; Sun, 21 Jul 2002 12:57:15 -0700 (PDT) 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 1641537B400 for ; Sun, 21 Jul 2002 12:57:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C78AD43E65 for ; Sun, 21 Jul 2002 12:57:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LJvEJU096175 for ; Sun, 21 Jul 2002 12:57:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LJvEMu096172 for perforce@freebsd.org; Sun, 21 Jul 2002 12:57:14 -0700 (PDT) Date: Sun, 21 Jul 2002 12:57:14 -0700 (PDT) Message-Id: <200207211957.g6LJvEMu096172@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14625 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14625 Change 14625 by rwatson@rwatson_curry on 2002/07/21 12:56:41 Use readdir check for ibcs2 readdir system calls, not search. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_misc.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_misc.c#5 (text+ko) ==== @@ -352,8 +352,7 @@ } #ifdef MAC - /* Use the process's credentials to check directory search MAC. */ - error = mac_cred_check_search_vnode(td->td_proc->p_ucred, vp); + error = mac_cred_check_readdir_vnode(td->td_proc->p_ucred, vp); if (error) goto out; #endif /* MAC */ @@ -513,8 +512,7 @@ } #ifdef MAC - /* Use the process's credentials to check directory search MAC. */ - error = mac_cred_check_search_vnode(td->td_proc->p_ucred, vp); + error = mac_cred_check_readdir_vnode(td->td_proc->p_ucred, vp); if (error) goto out; #endif /* MAC */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 13:11:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9097937B401; Sun, 21 Jul 2002 13:10:33 -0700 (PDT) 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 24CBE37B400 for ; Sun, 21 Jul 2002 13:10:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 402AD43E64 for ; Sun, 21 Jul 2002 13:10:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LKAWJU001901 for ; Sun, 21 Jul 2002 13:10:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LKAVWR001898 for perforce@freebsd.org; Sun, 21 Jul 2002 13:10:31 -0700 (PDT) Date: Sun, 21 Jul 2002 13:10:31 -0700 (PDT) Message-Id: <200207212010.g6LKAVWR001898@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14627 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14627 Change 14627 by rwatson@rwatson_curry on 2002/07/21 13:09:39 Rename mac_cred_check_search_vnode() to mac_cred_check_lookup_vnode() to be more consistent with the name of the service that we are protecting. A bit of whitespace cleanup also. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#181 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#15 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#58 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#37 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#46 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#39 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#41 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#9 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#9 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#115 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#78 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#181 (text+ko) ==== @@ -550,6 +550,10 @@ mpc->mpc_ops->mpo_cred_check_listen_socket = mpe->mpe_function; break; + case MAC_CRED_CHECK_LOOKUP_VNODE: + mpc->mpc_ops->mpo_cred_check_lookup_vnode = + mpe->mpe_function; + break; case MAC_CRED_CHECK_OPEN_VNODE: mpc->mpc_ops->mpo_cred_check_open_vnode = mpe->mpe_function; @@ -574,10 +578,6 @@ mpc->mpc_ops->mpo_cred_check_revoke_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_SEARCH_VNODE: - mpc->mpc_ops->mpo_cred_check_search_vnode = - mpe->mpe_function; - break; case MAC_CRED_CHECK_SETACL_VNODE: mpc->mpc_ops->mpo_cred_check_setacl_vnode = mpe->mpe_function; @@ -1669,6 +1669,24 @@ } int +mac_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp) +{ + int error; + + ASSERT_VOP_LOCKED(dvp, "mac_cred_check_lookup_vnode"); + + if (!mac_enforce_fs) + return (0); + + error = vn_refreshlabel(dvp, cred); + if (error) + return (error); + + MAC_CHECK(cred_check_lookup_vnode, cred, dvp, &dvp->v_label); + return (error); +} + +int mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode) { int error; @@ -1741,24 +1759,6 @@ } int -mac_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp) -{ - int error; - - ASSERT_VOP_LOCKED(dvp, "mac_cred_check_search_vnode"); - - if (!mac_enforce_fs) - return (0); - - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); - - MAC_CHECK(cred_check_search_vnode, cred, dvp, &dvp->v_label); - return (error); -} - -int mac_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, acl_type_t type, struct acl *acl) { ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#15 (text+ko) ==== @@ -570,10 +570,10 @@ unionlookup: #ifdef MAC /* - * Execute MAC search policy check here, in the heart of all + * Execute MAC lookup policy check here, in the heart of all * "sanctioned" lookup operations. */ - error = mac_cred_check_search_vnode(td->td_ucred, dp); + error = mac_cred_check_lookup_vnode(td->td_ucred, dp); if (error) goto bad; #endif /* MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#58 (text+ko) ==== @@ -1469,6 +1469,24 @@ } static int +mac_biba_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(dlabel); + + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int mac_biba_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, mode_t acc_mode) { @@ -1596,24 +1614,6 @@ } static int -mac_biba_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) -{ - struct mac_biba *subj, *obj; - - if (!mac_biba_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(dlabel); - - if (!mac_biba_dominate_single(obj, subj)) - return (EACCES); - - return (0); -} - -static int mac_biba_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type, struct acl *acl) { @@ -1727,42 +1727,42 @@ static int mac_biba_cred_check_sched_proc(struct ucred *cred, struct proc *proc) { - struct mac_biba *subj, *obj; + struct mac_biba *subj, *obj; - if (!mac_biba_enabled) - return (0); + if (!mac_biba_enabled) + return (0); - subj = SLOT(&cred->cr_label); - obj = SLOT(&proc->p_ucred->cr_label); + subj = SLOT(&cred->cr_label); + obj = SLOT(&proc->p_ucred->cr_label); - /* XXX: range checks */ - if (!mac_biba_dominate_single(obj, subj)) - return (ESRCH); - if (!mac_biba_dominate_single(subj, obj)) - return (EACCES); + /* XXX: range checks */ + if (!mac_biba_dominate_single(obj, subj)) + return (ESRCH); + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); - return (0); + return (0); } static int mac_biba_cred_check_signal_proc(struct ucred *cred, struct proc *proc, int signum) { - struct mac_biba *subj, *obj; + struct mac_biba *subj, *obj; - if (!mac_biba_enabled) - return (0); + if (!mac_biba_enabled) + return (0); - subj = SLOT(&cred->cr_label); - obj = SLOT(&proc->p_ucred->cr_label); + subj = SLOT(&cred->cr_label); + obj = SLOT(&proc->p_ucred->cr_label); - /* XXX: range checks */ - if (!mac_biba_dominate_single(obj, subj)) - return (ESRCH); - if (!mac_biba_dominate_single(subj, obj)) - return (EACCES); + /* XXX: range checks */ + if (!mac_biba_dominate_single(obj, subj)) + return (ESRCH); + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); - return (0); + return (0); } static int @@ -1971,6 +1971,8 @@ (macop_t)mac_biba_cred_check_getacl_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_biba_cred_check_getextattr_vnode }, + { MAC_CRED_CHECK_LOOKUP_VNODE, + (macop_t)mac_biba_cred_check_lookup_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_biba_cred_check_open_vnode }, { MAC_CRED_CHECK_READDIR_VNODE, @@ -1983,8 +1985,6 @@ (macop_t)mac_biba_cred_check_rename_to_vnode }, { MAC_CRED_CHECK_REVOKE_VNODE, (macop_t)mac_biba_cred_check_revoke_vnode }, - { MAC_CRED_CHECK_SEARCH_VNODE, - (macop_t)mac_biba_cred_check_search_vnode }, { MAC_CRED_CHECK_SETACL_VNODE, (macop_t)mac_biba_cred_check_setacl_vnode }, { MAC_CRED_CHECK_SETEXTATTR_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#37 (text+ko) ==== @@ -442,6 +442,22 @@ } static int +mac_bsdextended_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + struct vattr vap; + int error; + + if (!mac_bsdextended_enabled) + return (0); + + error = VOP_GETATTR(dvp, &vap, cred, curthread); + if (error) + return (error); + return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VEXEC)); +} + +static int mac_bsdextended_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) { @@ -559,22 +575,6 @@ } static int -mac_bsdextended_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) -{ - struct vattr vap; - int error; - - if (!mac_bsdextended_enabled) - return (0); - - error = VOP_GETATTR(dvp, &vap, cred, curthread); - if (error) - return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VEXEC)); -} - -static int mac_bsdextended_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type, struct acl *acl) { @@ -771,6 +771,8 @@ (macop_t)mac_bsdextended_cred_check_getacl_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_bsdextended_cred_check_getextattr_vnode }, + { MAC_CRED_CHECK_LOOKUP_VNODE, + (macop_t)mac_bsdextended_cred_check_lookup_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_bsdextended_cred_check_open_vnode }, { MAC_CRED_CHECK_READDIR_VNODE, @@ -783,8 +785,6 @@ (macop_t)mac_bsdextended_cred_check_rename_to_vnode }, { MAC_CRED_CHECK_REVOKE_VNODE, (macop_t)mac_bsdextended_cred_check_revoke_vnode }, - { MAC_CRED_CHECK_SEARCH_VNODE, - (macop_t)mac_bsdextended_cred_check_search_vnode }, { MAC_CRED_CHECK_SETACL_VNODE, (macop_t)mac_bsdextended_cred_check_setacl_vnode }, { MAC_CRED_CHECK_SETEXTATTR_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#46 (text+ko) ==== @@ -1412,6 +1412,24 @@ } static int +mac_mls_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(dlabel); + + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_mls_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, mode_t acc_mode) { @@ -1539,24 +1557,6 @@ } static int -mac_mls_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) -{ - struct mac_mls *subj, *obj; - - if (!mac_mls_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(dlabel); - - if (!mac_mls_dominate_single(subj, obj)) - return (EACCES); - - return (0); -} - -static int mac_mls_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type, struct acl *acl) { @@ -1670,42 +1670,42 @@ static int mac_mls_cred_check_sched_proc(struct ucred *cred, struct proc *proc) { - struct mac_mls *subj, *obj; + struct mac_mls *subj, *obj; - if (!mac_mls_enabled) - return (0); + if (!mac_mls_enabled) + return (0); - subj = SLOT(&cred->cr_label); - obj = SLOT(&proc->p_ucred->cr_label); + subj = SLOT(&cred->cr_label); + obj = SLOT(&proc->p_ucred->cr_label); - /* XXX: range checks */ - if (!mac_mls_dominate_single(subj, obj)) - return (ESRCH); - if (!mac_mls_dominate_single(obj, subj)) - return (EACCES); + /* XXX: range checks */ + if (!mac_mls_dominate_single(subj, obj)) + return (ESRCH); + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); - return (0); + return (0); } static int mac_mls_cred_check_signal_proc(struct ucred *cred, struct proc *proc, int signum) { - struct mac_mls *subj, *obj; + struct mac_mls *subj, *obj; - if (!mac_mls_enabled) - return (0); + if (!mac_mls_enabled) + return (0); - subj = SLOT(&cred->cr_label); - obj = SLOT(&proc->p_ucred->cr_label); + subj = SLOT(&cred->cr_label); + obj = SLOT(&proc->p_ucred->cr_label); - /* XXX: range checks */ - if (!mac_mls_dominate_single(subj, obj)) - return (ESRCH); - if (!mac_mls_dominate_single(obj, subj)) - return (EACCES); + /* XXX: range checks */ + if (!mac_mls_dominate_single(subj, obj)) + return (ESRCH); + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); - return (0); + return (0); } static int @@ -1914,6 +1914,8 @@ (macop_t)mac_mls_cred_check_getacl_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_mls_cred_check_getextattr_vnode }, + { MAC_CRED_CHECK_LOOKUP_VNODE, + (macop_t)mac_mls_cred_check_lookup_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_mls_cred_check_open_vnode }, { MAC_CRED_CHECK_READDIR_VNODE, @@ -1926,8 +1928,6 @@ (macop_t)mac_mls_cred_check_rename_to_vnode }, { MAC_CRED_CHECK_REVOKE_VNODE, (macop_t)mac_mls_cred_check_revoke_vnode }, - { MAC_CRED_CHECK_SEARCH_VNODE, - (macop_t)mac_mls_cred_check_search_vnode }, { MAC_CRED_CHECK_SETACL_VNODE, (macop_t)mac_mls_cred_check_setacl_vnode }, { MAC_CRED_CHECK_SETEXTATTR_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#39 (text+ko) ==== @@ -676,6 +676,14 @@ } static int +mac_none_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + + return (0); +} + +static int mac_none_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) { @@ -724,14 +732,6 @@ } static int -mac_none_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) -{ - - return (0); -} - -static int mac_none_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type, struct acl *acl) { @@ -984,6 +984,8 @@ (macop_t)mac_none_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_LISTEN_SOCKET, (macop_t)mac_none_cred_check_listen_socket }, + { MAC_CRED_CHECK_LOOKUP_VNODE, + (macop_t)mac_none_cred_check_lookup_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_none_cred_check_open_vnode }, { MAC_CRED_CHECK_READDIR_VNODE, @@ -996,8 +998,6 @@ (macop_t)mac_none_cred_check_rename_to_vnode }, { MAC_CRED_CHECK_REVOKE_VNODE, (macop_t)mac_none_cred_check_revoke_vnode }, - { MAC_CRED_CHECK_SEARCH_VNODE, - (macop_t)mac_none_cred_check_search_vnode }, { MAC_CRED_CHECK_SETACL_VNODE, (macop_t)mac_none_cred_check_setacl_vnode }, { MAC_CRED_CHECK_SETEXTATTR_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#41 (text+ko) ==== @@ -1167,6 +1167,15 @@ } static int +mac_te_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + + return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_LOOKUP)); +} + +static int mac_te_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -1176,15 +1185,6 @@ } static int -mac_te_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) -{ - - return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_LOOKUP)); -} - -static int mac_te_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type, struct acl *acl) { @@ -1529,26 +1529,26 @@ static struct mac_policy_op_entry mac_te_ops[] = { - { MAC_INIT_BPFDESC, (macop_t)mac_te_init_bpfdesc }, - { MAC_INIT_DEVFSDIRENT, (macop_t)mac_te_init_devfsdirent }, - { MAC_INIT_IFNET, (macop_t)mac_te_init_ifnet }, - { MAC_INIT_IPQ, (macop_t)mac_te_init_ipq }, - { MAC_INIT_MBUF, (macop_t)mac_te_init_mbuf }, - { MAC_INIT_MOUNT, (macop_t)mac_te_init_mount }, - { MAC_INIT_SOCKET, (macop_t)mac_te_init_socket }, - { MAC_INIT_SUBJECT, (macop_t)mac_te_init_subject }, - { MAC_INIT_TEMP, (macop_t)mac_te_init_temp }, - { MAC_INIT_VNODE, (macop_t)mac_te_init_vnode }, - { MAC_DESTROY_BPFDESC, (macop_t)mac_te_destroy_bpfdesc }, - { MAC_DESTROY_DEVFSDIRENT, (macop_t)mac_te_destroy_devfsdirent }, - { MAC_DESTROY_IFNET, (macop_t)mac_te_destroy_ifnet }, - { MAC_DESTROY_IPQ, (macop_t)mac_te_destroy_ipq }, - { MAC_DESTROY_MBUF, (macop_t)mac_te_destroy_mbuf }, - { MAC_DESTROY_MOUNT, (macop_t)mac_te_destroy_mount }, - { MAC_DESTROY_SOCKET, (macop_t)mac_te_destroy_socket }, - { MAC_DESTROY_SUBJECT, (macop_t)mac_te_destroy_subject }, - { MAC_DESTROY_TEMP, (macop_t)mac_te_destroy_temp }, - { MAC_DESTROY_VNODE, (macop_t)mac_te_destroy_vnode }, + { MAC_INIT_BPFDESC, (macop_t)mac_te_init_bpfdesc }, + { MAC_INIT_DEVFSDIRENT, (macop_t)mac_te_init_devfsdirent }, + { MAC_INIT_IFNET, (macop_t)mac_te_init_ifnet }, + { MAC_INIT_IPQ, (macop_t)mac_te_init_ipq }, + { MAC_INIT_MBUF, (macop_t)mac_te_init_mbuf }, + { MAC_INIT_MOUNT, (macop_t)mac_te_init_mount }, + { MAC_INIT_SOCKET, (macop_t)mac_te_init_socket }, + { MAC_INIT_SUBJECT, (macop_t)mac_te_init_subject }, + { MAC_INIT_TEMP, (macop_t)mac_te_init_temp }, + { MAC_INIT_VNODE, (macop_t)mac_te_init_vnode }, + { MAC_DESTROY_BPFDESC, (macop_t)mac_te_destroy_bpfdesc }, + { MAC_DESTROY_DEVFSDIRENT, (macop_t)mac_te_destroy_devfsdirent }, + { MAC_DESTROY_IFNET, (macop_t)mac_te_destroy_ifnet }, + { MAC_DESTROY_IPQ, (macop_t)mac_te_destroy_ipq }, + { MAC_DESTROY_MBUF, (macop_t)mac_te_destroy_mbuf }, + { MAC_DESTROY_MOUNT, (macop_t)mac_te_destroy_mount }, + { MAC_DESTROY_SOCKET, (macop_t)mac_te_destroy_socket }, + { MAC_DESTROY_SUBJECT, (macop_t)mac_te_destroy_subject }, + { MAC_DESTROY_TEMP, (macop_t)mac_te_destroy_temp }, + { MAC_DESTROY_VNODE, (macop_t)mac_te_destroy_vnode }, { MAC_CREATE_DEVFS_DEVICE, (macop_t)mac_te_create_devfs_device }, { MAC_CREATE_DEVFS_DIRECTORY, (macop_t)mac_te_create_devfs_directory }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_te_create_devfs_vnode }, @@ -1629,6 +1629,8 @@ (macop_t)mac_te_cred_check_getacl_vnode }, { MAC_CRED_CHECK_GETEXTATTR_VNODE, (macop_t)mac_te_cred_check_getextattr_vnode }, + { MAC_CRED_CHECK_LOOKUP_VNODE, + (macop_t)mac_te_cred_check_lookup_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_te_cred_check_open_vnode }, { MAC_CRED_CHECK_READDIR_VNODE, (macop_t)mac_te_cred_check_readdir_vnode }, @@ -1640,8 +1642,6 @@ (macop_t)mac_te_cred_check_rename_to_vnode }, { MAC_CRED_CHECK_REVOKE_VNODE, (macop_t)mac_te_cred_check_revoke_vnode }, - { MAC_CRED_CHECK_SEARCH_VNODE, - (macop_t)mac_te_cred_check_search_vnode }, { MAC_CRED_CHECK_SETACL_VNODE, (macop_t)mac_te_cred_check_setacl_vnode }, { MAC_CRED_CHECK_SETEXTATTR_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#9 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#9 (text+ko) ==== @@ -869,6 +869,14 @@ } static int +mac_test_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + + return (0); +} + +static int mac_test_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) { @@ -917,14 +925,6 @@ } static int -mac_test_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) -{ - - return (0); -} - -static int mac_test_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type, struct acl *acl) { @@ -1175,6 +1175,8 @@ (macop_t)mac_test_cred_check_getextattr_vnode }, { MAC_CRED_CHECK_LISTEN_SOCKET, (macop_t)mac_test_cred_check_listen_socket }, + { MAC_CRED_CHECK_LOOKUP_VNODE, + (macop_t)mac_test_cred_check_lookup_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_test_cred_check_open_vnode }, { MAC_CRED_CHECK_READDIR_VNODE, @@ -1187,8 +1189,6 @@ (macop_t)mac_test_cred_check_rename_to_vnode }, { MAC_CRED_CHECK_REVOKE_VNODE, (macop_t)mac_test_cred_check_revoke_vnode }, - { MAC_CRED_CHECK_SEARCH_VNODE, - (macop_t)mac_test_cred_check_search_vnode }, { MAC_CRED_CHECK_SETACL_VNODE, (macop_t)mac_test_cred_check_setacl_vnode }, { MAC_CRED_CHECK_SETEXTATTR_VNODE, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#115 (text+ko) ==== @@ -260,7 +260,7 @@ int attrnamespace, const char *name, struct uio *uio); int mac_cred_check_listen_socket(struct ucred *cred, struct socket *socket); -int mac_cred_check_search_vnode(struct ucred *cred, struct vnode *dvp); +int mac_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp); int mac_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, acl_type_t type, struct acl *acl); int mac_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#78 (text+ko) ==== @@ -271,6 +271,8 @@ int attrnamespace, const char *name, struct uio *uio); int (*mpo_cred_check_listen_socket)(struct ucred *cred, struct socket *socket, struct label *socketlabel); + int (*mpo_cred_check_lookup_vnode)(struct ucred *cred, + struct vnode *dvp, struct label *dlabel); int (*mpo_cred_check_open_vnode)(struct ucred *cred, struct vnode *vp, struct label *label, mode_t acc_mode); @@ -286,8 +288,6 @@ struct vnode *vp, struct label *label, int samedir); int (*mpo_cred_check_revoke_vnode)(struct ucred *cred, struct vnode *vp, struct label *label); - int (*mpo_cred_check_search_vnode)(struct ucred *cred, - struct vnode *dvp, struct label *dlabel); int (*mpo_cred_check_setacl_vnode)(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type, struct acl *acl); @@ -406,13 +406,13 @@ MAC_CRED_CHECK_GETACL_VNODE, MAC_CRED_CHECK_GETEXTATTR_VNODE, MAC_CRED_CHECK_LISTEN_SOCKET, + MAC_CRED_CHECK_LOOKUP_VNODE, MAC_CRED_CHECK_OPEN_VNODE, MAC_CRED_CHECK_READDIR_VNODE, MAC_CRED_CHECK_READLINK_VNODE, MAC_CRED_CHECK_RENAME_FROM_VNODE, MAC_CRED_CHECK_RENAME_TO_VNODE, MAC_CRED_CHECK_REVOKE_VNODE, - MAC_CRED_CHECK_SEARCH_VNODE, MAC_CRED_CHECK_SETACL_VNODE, MAC_CRED_CHECK_SETEXTATTR_VNODE, MAC_CRED_CHECK_SETFLAGS_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 13:19:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D462C37B401; Sun, 21 Jul 2002 13:19:46 -0700 (PDT) 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 78E8A37B400 for ; Sun, 21 Jul 2002 13:19:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 179A943E42 for ; Sun, 21 Jul 2002 13:19:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LKJjJU002871 for ; Sun, 21 Jul 2002 13:19:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LKJjvW002868 for perforce@freebsd.org; Sun, 21 Jul 2002 13:19:45 -0700 (PDT) Date: Sun, 21 Jul 2002 13:19:45 -0700 (PDT) Message-Id: <200207212019.g6LKJjvW002868@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14629 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14629 Change 14629 by rwatson@rwatson_curry on 2002/07/21 13:18:49 Provide the componentname from lookup()/namei() to the MAC framework and policies so that policies can make decisions based on the name. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#182 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#16 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#116 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#79 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#182 (text+ko) ==== @@ -1669,7 +1669,8 @@ } int -mac_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp) +mac_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, + struct componentname *cnp) { int error; @@ -1682,7 +1683,7 @@ if (error) return (error); - MAC_CHECK(cred_check_lookup_vnode, cred, dvp, &dvp->v_label); + MAC_CHECK(cred_check_lookup_vnode, cred, dvp, &dvp->v_label, cnp); return (error); } ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#16 (text+ko) ==== @@ -573,7 +573,7 @@ * Execute MAC lookup policy check here, in the heart of all * "sanctioned" lookup operations. */ - error = mac_cred_check_lookup_vnode(td->td_ucred, dp); + error = mac_cred_check_lookup_vnode(td->td_ucred, dp, cnp); if (error) goto bad; #endif /* MAC */ ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#116 (text+ko) ==== @@ -195,6 +195,7 @@ * Kernel functions to manage and evaluate labels. */ struct bpf_d; +struct componentname; struct devfs_dirent; struct ifnet; struct ifreq; @@ -260,7 +261,8 @@ int attrnamespace, const char *name, struct uio *uio); int mac_cred_check_listen_socket(struct ucred *cred, struct socket *socket); -int mac_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp); +int mac_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, + struct componentname *cnp); int mac_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, acl_type_t type, struct acl *acl); int mac_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#79 (text+ko) ==== @@ -272,7 +272,8 @@ int (*mpo_cred_check_listen_socket)(struct ucred *cred, struct socket *socket, struct label *socketlabel); int (*mpo_cred_check_lookup_vnode)(struct ucred *cred, - struct vnode *dvp, struct label *dlabel); + struct vnode *dvp, struct label *dlabel, + struct componentname *cnp); int (*mpo_cred_check_open_vnode)(struct ucred *cred, struct vnode *vp, struct label *label, mode_t acc_mode); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 13:31:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 873D137B400; Sun, 21 Jul 2002 13:31:06 -0700 (PDT) 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 14B5E37B401 for ; Sun, 21 Jul 2002 13:31:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8495E43E58 for ; Sun, 21 Jul 2002 13:31:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LKV5JU004114 for ; Sun, 21 Jul 2002 13:31:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LKV5qf004111 for perforce@freebsd.org; Sun, 21 Jul 2002 13:31:05 -0700 (PDT) Date: Sun, 21 Jul 2002 13:31:05 -0700 (PDT) Message-Id: <200207212031.g6LKV5qf004111@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14630 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14630 Change 14630 by rwatson@rwatson_curry on 2002/07/21 13:30:48 First pass at diff-reducing the lookup/namei code. Since we've moved all the checks but one lookup and one readlink check out of this code, we can restore the original locking behavior. Not quite down to minimal diffs with -current, and it's possible we might have to stick some of this back if I misunderstood why it was there, but it appears to work. :-) Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#17 (text+ko) ==== @@ -72,61 +72,7 @@ } SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_SECOND, nameiinit, NULL) -#ifdef MAC /* - * Restore the status of whether the parent would be locked/referenced, - * and then lock status of the target, after having overridden with. - * Only called if any of (LOCKPARENT | LOCKLEAF) was not "on" previously. - */ -static void -nameirestoreparent(struct nameidata *ndp, u_long cn_flags, struct thread *td) -{ - const int vneq = ndp->ni_dvp == ndp->ni_vp; /* - * For the CREATE case, - * this also catches ni_vp - * being NULL. - */ - - KASSERT((cn_flags & (LOCKPARENT | LOCKLEAF)) != (LOCKPARENT | LOCKLEAF), - ("nameirestoreparent botch")); - - switch (cn_flags & (LOCKPARENT | WANTPARENT | LOCKLEAF)) { - /* If I added LOCKLEAF, just unlock the target if it's not equal. */ - case LOCKPARENT: /* CREATE, DELETE, RENAME */ - /* - * CREATE may or may not return a vnode in ni_vp: if it - * cannot create one, it acts like a LOOKUP. - */ - if (!vneq && ndp->ni_vp != NULL) - VOP_UNLOCK(ndp->ni_vp, 0, td); - break; - /* I just added LOCKPARENT. */ - case LOCKLEAF | WANTPARENT: /* DELETE, RENAME */ - case LOCKLEAF: - if (!vneq) - VOP_UNLOCK(ndp->ni_dvp, 0, td); - if ((cn_flags & WANTPARENT) == 0) - vrele(ndp->ni_dvp); - break; - /* I added both LOCKLEAF and LOCKPARENT */ - case WANTPARENT: - case 0: - if (ndp->ni_vp != NULL) - VOP_UNLOCK(ndp->ni_vp, 0, td); - if (!vneq) - VOP_UNLOCK(ndp->ni_dvp, 0, td); - if ((cn_flags & WANTPARENT) == 0) - vrele(ndp->ni_dvp); - break; - default: - panic("nameirestoreparent: weird flags %#lx", cn_flags); - } - ndp->ni_cnd.cn_flags = (ndp->ni_cnd.cn_flags & ~(LOCKLEAF | LOCKPARENT - | WANTPARENT)) | (cn_flags & (LOCKLEAF | LOCKPARENT | WANTPARENT)); -} -#endif /* MAC */ - -/* * Convert a pathname into a pointer to a locked inode. * * The FOLLOW flag is set when symbolic links are to be followed @@ -154,10 +100,6 @@ register char *cp; /* pointer into pathname argument */ register struct vnode *dp; /* the directory we are searching */ struct iovec aiov; /* uio for reading symbolic links */ -#ifdef MAC - u_long pflags; /* saved cn_flags for replacing */ - int lockoverride; /* overridden parent/final lock via pflags */ -#endif /* MAC */ struct uio auio; int error, linklen; struct componentname *cnp = &ndp->ni_cnd; @@ -231,26 +173,6 @@ VREF(dp); } ndp->ni_startdir = dp; -#ifdef MAC - /* - * Save the parent and leaf locked so that they may be - * managed by MAC of this is the last component; restore - * afterward. Note that search permissions used by LOOKUP - * are checked in lookup() itself, and RENAME checked by - * rename() itself, so we only care about CREATE and DELETE. - */ - if (~cnp->cn_flags & (LOCKLEAF | LOCKPARENT) && - cnp->cn_nameiop == DELETE) { - pflags = cnp->cn_flags; - cnp->cn_flags = (pflags & ~WANTPARENT) | - LOCKPARENT | LOCKLEAF; - lockoverride = 1; - } else { - /* Silence, knave! */ - lockoverride = 0; - pflags = 0; - } -#endif /* MAC */ error = lookup(ndp); if (error) { uma_zfree(namei_zone, cnp->cn_pnbuf); @@ -260,42 +182,7 @@ * Check for symbolic link */ if (cnp->cn_flags & ISSYMLINK) { -#ifdef MAC - /* Don't check MAC operations on symlinks. */ - if (lockoverride) - nameirestoreparent(ndp, pflags, td); -#endif /* MAC */ } else { -#ifdef MAC - struct ucred *cred = td->td_ucred; - - /* - * We know it's ISLASTCN, so do the MAC delete, rename, - * or create check if appropriate. - */ - switch (cnp->cn_nameiop) { - case DELETE: - error = mac_cred_check_delete_vnode(cred, - ndp->ni_dvp, ndp->ni_vp); - break; - default: - error = 0; - } - if (error) { - uma_zfree(namei_zone, cnp->cn_pnbuf); - if (ndp->ni_vp != NULL) { - if (ndp->ni_vp != ndp->ni_dvp) - vput(ndp->ni_vp); - else - vrele(ndp->ni_vp); - ndp->ni_vp = NULL; - } - vput(ndp->ni_dvp); - return (error); - } - if (lockoverride) - nameirestoreparent(ndp, pflags, td); -#endif /* MAC */ if ((cnp->cn_flags & (SAVENAME | SAVESTART)) == 0) uma_zfree(namei_zone, cnp->cn_pnbuf); else To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 13:33:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 401BE37B401; Sun, 21 Jul 2002 13:33:09 -0700 (PDT) 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 C23C937B400 for ; Sun, 21 Jul 2002 13:33:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F03F43E3B for ; Sun, 21 Jul 2002 13:33:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LKX8JU004803 for ; Sun, 21 Jul 2002 13:33:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LKX8tr004797 for perforce@freebsd.org; Sun, 21 Jul 2002 13:33:08 -0700 (PDT) Date: Sun, 21 Jul 2002 13:33:08 -0700 (PDT) Message-Id: <200207212033.g6LKX8tr004797@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14631 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14631 Change 14631 by rwatson@rwatson_curry on 2002/07/21 13:32:28 Further diff reduction and simplification against -CURRENT. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#18 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#18 (text+ko) ==== @@ -181,8 +181,7 @@ /* * Check for symbolic link */ - if (cnp->cn_flags & ISSYMLINK) { - } else { + if ((cnp->cn_flags & ISSYMLINK) == 0) { if ((cnp->cn_flags & (SAVENAME | SAVESTART)) == 0) uma_zfree(namei_zone, cnp->cn_pnbuf); else @@ -456,14 +455,10 @@ */ unionlookup: #ifdef MAC - /* - * Execute MAC lookup policy check here, in the heart of all - * "sanctioned" lookup operations. - */ error = mac_cred_check_lookup_vnode(td->td_ucred, dp, cnp); if (error) goto bad; -#endif /* MAC */ +#endif ndp->ni_dvp = dp; ndp->ni_vp = NULL; cnp->cn_flags &= ~PDIRUNLOCK; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 15: 8:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E44B737B401; Sun, 21 Jul 2002 15:08:14 -0700 (PDT) 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 8672537B400 for ; Sun, 21 Jul 2002 15:08:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D4AC143E6E for ; Sun, 21 Jul 2002 15:08:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LM8DJU054282 for ; Sun, 21 Jul 2002 15:08:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LM8DMr054279 for perforce@freebsd.org; Sun, 21 Jul 2002 15:08:13 -0700 (PDT) Date: Sun, 21 Jul 2002 15:08:13 -0700 (PDT) Message-Id: <200207212208.g6LM8DMr054279@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14637 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14637 Change 14637 by rwatson@rwatson_curry on 2002/07/21 15:08:12 Although none of the policies currently use the componentname passed to lookup(), teach them about it anyway. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#59 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#38 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#47 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#40 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#42 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#59 (text+ko) ==== @@ -1470,7 +1470,7 @@ static int mac_biba_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) + struct label *dlabel, struct componentname *cnp) { struct mac_biba *subj, *obj; ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#38 (text+ko) ==== @@ -443,7 +443,7 @@ static int mac_bsdextended_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) + struct label *dlabel, struct componentname *cnp) { struct vattr vap; int error; ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#47 (text+ko) ==== @@ -1413,7 +1413,7 @@ static int mac_mls_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) + struct label *dlabel, struct componentname *cnp) { struct mac_mls *subj, *obj; ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#40 (text+ko) ==== @@ -677,7 +677,7 @@ static int mac_none_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) + struct label *dlabel, struct componentname *cnp) { return (0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#42 (text+ko) ==== @@ -1168,7 +1168,7 @@ static int mac_te_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) + struct label *dlabel, struct componentname *cnp) { return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#10 (text+ko) ==== @@ -870,7 +870,7 @@ static int mac_test_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) + struct label *dlabel, struct componentname *cnp) { return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 15:11:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A24EC37B401; Sun, 21 Jul 2002 15:11:18 -0700 (PDT) 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 599F437B400 for ; Sun, 21 Jul 2002 15:11:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16B3D43E31 for ; Sun, 21 Jul 2002 15:11:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LMBHJU054817 for ; Sun, 21 Jul 2002 15:11:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LMBHIR054814 for perforce@freebsd.org; Sun, 21 Jul 2002 15:11:17 -0700 (PDT) Date: Sun, 21 Jul 2002 15:11:17 -0700 (PDT) Message-Id: <200207212211.g6LMBHIR054814@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14638 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14638 Change 14638 by rwatson@rwatson_curry on 2002/07/21 15:11:10 Whitespace cleanup from copy/paste. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#183 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#183 (text+ko) ==== @@ -1023,7 +1023,7 @@ printf(".\n"); error = EPERM; } - } + } return (error); } @@ -1673,12 +1673,12 @@ struct componentname *cnp) { int error; - + ASSERT_VOP_LOCKED(dvp, "mac_cred_check_lookup_vnode"); - - if (!mac_enforce_fs) + + if (!mac_enforce_fs) return (0); - + error = vn_refreshlabel(dvp, cred); if (error) return (error); @@ -1996,7 +1996,7 @@ void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *newlabel) { - + MAC_PERFORM(relabel_vnode, cred, vp, &vp->v_label, newlabel); } @@ -2334,7 +2334,7 @@ void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de) { - + MAC_PERFORM(create_devfs_device, dev, de, &de->de_label); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 16:39:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 708CF37B401; Sun, 21 Jul 2002 16:39:12 -0700 (PDT) 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 D1C4737B400 for ; Sun, 21 Jul 2002 16:39:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E10243E42 for ; Sun, 21 Jul 2002 16:39:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6LNdBJU066552 for ; Sun, 21 Jul 2002 16:39:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6LNdBqP066549 for perforce@freebsd.org; Sun, 21 Jul 2002 16:39:11 -0700 (PDT) Date: Sun, 21 Jul 2002 16:39:11 -0700 (PDT) Message-Id: <200207212339.g6LNdBqP066549@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14647 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14647 Change 14647 by rwatson@rwatson_curry on 2002/07/21 16:38:23 Pass name information on vnode creation so that policies may make decisions based on the requested name. No policies currently do. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#184 edit .. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#17 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#57 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#25 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#60 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#39 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#48 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#41 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#43 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#11 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#117 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#80 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#184 (text+ko) ==== @@ -1600,7 +1600,7 @@ int mac_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, - struct vattr *vap) + struct componentname *cnp, struct vattr *vap) { int error; @@ -1613,7 +1613,7 @@ if (error) return (error); - MAC_CHECK(cred_check_create_vnode, cred, dvp, &dvp->v_label, vap); + MAC_CHECK(cred_check_create_vnode, cred, dvp, &dvp->v_label, cnp, vap); return (error); } ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#17 (text+ko) ==== @@ -639,7 +639,8 @@ vattr.va_mode = (ACCESSPERMS & ~td->td_proc->p_fd->fd_cmask); FILEDESC_UNLOCK(td->td_proc->p_fd); #ifdef MAC - error = mac_cred_check_create_vnode(td->td_ucred, nd.ni_dvp, &vattr); + error = mac_cred_check_create_vnode(td->td_ucred, nd.ni_dvp, + &nd.ni_cnd, &vattr); #endif /* MAC */ if (error == 0) { VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#57 (text+ko) ==== @@ -1942,7 +1942,7 @@ #ifdef MAC if (error == 0 && !whiteout) error = mac_cred_check_create_vnode(td->td_ucred, nd.ni_dvp, - &vattr); + &nd.ni_cnd, &vattr); #endif /* MAC */ if (!error) { VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); @@ -2011,7 +2011,8 @@ vattr.va_mode = (SCARG(uap, mode) & ALLPERMS) &~ td->td_proc->p_fd->fd_cmask; FILEDESC_UNLOCK(td->td_proc->p_fd); #ifdef MAC - error = mac_cred_check_create_vnode(td->td_ucred, nd.ni_dvp, &vattr); + error = mac_cred_check_create_vnode(td->td_ucred, nd.ni_dvp, + &nd.ni_cnd, &vattr); #endif /* MAC */ if (error == 0) { VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); @@ -2136,7 +2137,8 @@ FILEDESC_UNLOCK(td->td_proc->p_fd); vattr.va_type = VLNK; #ifdef MAC - error = mac_cred_check_create_vnode(td->td_ucred, nd.ni_dvp, &vattr); + error = mac_cred_check_create_vnode(td->td_ucred, nd.ni_dvp, + &nd.ni_cnd, &vattr); #endif /* MAC */ if (error == 0) { VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); @@ -3853,7 +3855,8 @@ vattr.va_mode = (mode & ACCESSPERMS) &~ td->td_proc->p_fd->fd_cmask; FILEDESC_UNLOCK(td->td_proc->p_fd); #ifdef MAC - error = mac_cred_check_create_vnode(td->td_ucred, nd.ni_dvp, &vattr); + error = mac_cred_check_create_vnode(td->td_ucred, nd.ni_dvp, + &nd.ni_cnd, &vattr); #endif /* MAC */ if (error == 0) { VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#25 (text+ko) ==== @@ -140,7 +140,7 @@ } #ifdef MAC error = mac_cred_check_create_vnode(cred, ndp->ni_dvp, - vap); + &ndp->ni_cnd, vap); #endif /* MAC */ if (error == 0) { VOP_LEASE(ndp->ni_dvp, td, cred, LEASE_WRITE); ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#60 (text+ko) ==== @@ -1357,7 +1357,7 @@ static int mac_biba_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vattr *vap) + struct label *dlabel, struct componentname *cnp, struct vattr *vap) { struct mac_biba *subj, *obj; ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#39 (text+ko) ==== @@ -338,7 +338,7 @@ static int mac_bsdextended_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vattr *vap) + struct label *dlabel, struct componentname *cnp, struct vattr *vap) { struct vattr dvap; int error; ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#48 (text+ko) ==== @@ -1300,7 +1300,7 @@ static int mac_mls_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vattr *vap) + struct label *dlabel, struct componentname *cnp, struct vattr *vap) { struct mac_mls *subj, *obj; ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#41 (text+ko) ==== @@ -621,7 +621,7 @@ static int mac_none_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vattr *vap) + struct label *dlabel, struct componentname *cnp, struct vattr *vap) { return (0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#43 (text+ko) ==== @@ -1309,7 +1309,7 @@ static int mac_te_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vattr *vap) + struct label *dlabel, struct componentname *cnp, struct vattr *vap) { return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#11 (text+ko) ==== @@ -814,7 +814,7 @@ static int mac_test_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vattr *vap) + struct label *dlabel, struct componentname *cnp, struct vattr *vap) { return (0); ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#117 (text+ko) ==== @@ -252,7 +252,7 @@ int mac_cred_check_connect_socket(struct ucred *cred, struct socket *so, struct sockaddr *sa); int mac_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, - struct vattr *vap); + struct componentname *cnp, struct vattr *vap); int mac_cred_check_deleteacl_vnode(struct ucred *cred, struct vnode *vp, acl_type_t type); int mac_cred_check_getacl_vnode(struct ucred *cred, struct vnode *vp, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#80 (text+ko) ==== @@ -256,7 +256,7 @@ struct vnode *dvp, struct label *dlabel); int (*mpo_cred_check_create_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, - struct vattr *vap); + struct componentname *cnp, struct vattr *vap); int (*mpo_cred_check_delete_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, void *label); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 17:24:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 500AA37B401; Sun, 21 Jul 2002 17:24:08 -0700 (PDT) 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 03EA737B400 for ; Sun, 21 Jul 2002 17:24:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A135943E3B for ; Sun, 21 Jul 2002 17:24:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6M0O7JU074121 for ; Sun, 21 Jul 2002 17:24:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6M0O7uG074118 for perforce@freebsd.org; Sun, 21 Jul 2002 17:24:07 -0700 (PDT) Date: Sun, 21 Jul 2002 17:24:07 -0700 (PDT) Message-Id: <200207220024.g6M0O7uG074118@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14651 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14651 Change 14651 by rwatson@rwatson_curry on 2002/07/21 17:23:29 When deleting a vnode, provide the componentname to the MAC framework and to policies. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#185 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#58 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#61 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#40 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#49 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#42 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#44 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#12 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#118 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#81 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#185 (text+ko) ==== @@ -1877,7 +1877,7 @@ int mac_cred_check_delete_vnode(struct ucred *cred, struct vnode *dvp, - struct vnode *vp) + struct vnode *vp, struct componentname *cnp) { int error; @@ -1895,7 +1895,7 @@ return (error); MAC_CHECK(cred_check_delete_vnode, cred, dvp, &dvp->v_label, vp, - &vp->v_label); + &vp->v_label, cnp); return (error); } ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#58 (text+ko) ==== @@ -2260,7 +2260,7 @@ if (!error) { #ifdef MAC error = mac_cred_check_delete_vnode(td->td_ucred, nd.ni_dvp, - vp); + vp, &nd.ni_cnd); if (error == 0) { #endif VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); @@ -3919,7 +3919,8 @@ goto out; } #ifdef MAC - error = mac_cred_check_delete_vnode(td->td_ucred, nd.ni_dvp, vp); + error = mac_cred_check_delete_vnode(td->td_ucred, nd.ni_dvp, + vp, &nd.ni_cnd); if (error) goto out; #endif ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#61 (text+ko) ==== @@ -1375,7 +1375,8 @@ static int mac_biba_cred_check_delete_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label) + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) { struct mac_biba *subj, *obj; ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#40 (text+ko) ==== @@ -354,7 +354,8 @@ static int mac_bsdextended_cred_check_delete_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label) + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) { struct vattr vap; int error; ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#49 (text+ko) ==== @@ -1318,7 +1318,8 @@ static int mac_mls_cred_check_delete_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label) + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) { struct mac_mls *subj, *obj; ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#42 (text+ko) ==== @@ -629,7 +629,8 @@ static int mac_none_cred_check_delete_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label) + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) { return (0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#44 (text+ko) ==== @@ -1318,7 +1318,8 @@ static int mac_te_cred_check_delete_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label) + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) { int error; ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#12 (text+ko) ==== @@ -822,7 +822,8 @@ static int mac_test_cred_check_delete_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label) + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) { return (0); ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#118 (text+ko) ==== @@ -277,7 +277,7 @@ struct timespec atime, struct timespec mtime); int mac_cred_check_stat_vnode(struct ucred *cred, struct vnode *vp); int mac_cred_check_delete_vnode(struct ucred *cred, struct vnode *dvp, - struct vnode *vp); + struct vnode *vp, struct componentname *cnp); int mac_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, struct vnode *vp); int mac_cred_check_rename_to_vnode(struct ucred *cred, struct vnode *dvp, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#81 (text+ko) ==== @@ -259,7 +259,7 @@ struct componentname *cnp, struct vattr *vap); int (*mpo_cred_check_delete_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, - struct vnode *vp, void *label); + struct vnode *vp, void *label, struct componentname *cnp); int (*mpo_cred_check_deleteacl_vnode)(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type); int (*mpo_cred_check_exec_vnode)(struct ucred *cred, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 17:54:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7979A37B401; Sun, 21 Jul 2002 17:54:49 -0700 (PDT) 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 0C0D237B400 for ; Sun, 21 Jul 2002 17:54:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDEAD43E65 for ; Sun, 21 Jul 2002 17:54:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6M0smJU076928 for ; Sun, 21 Jul 2002 17:54:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6M0smRc076925 for perforce@freebsd.org; Sun, 21 Jul 2002 17:54:48 -0700 (PDT) Date: Sun, 21 Jul 2002 17:54:48 -0700 (PDT) Message-Id: <200207220054.g6M0smRc076925@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14653 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14653 Change 14653 by rwatson@rwatson_paprika on 2002/07/21 17:54:47 Line wrapping Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#41 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#41 (text+ko) ==== @@ -508,7 +508,8 @@ static int mac_bsdextended_cred_check_rename_from_vnode(struct ucred *cred, - struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label) + struct vnode *dvp, struct label *dlabel, struct vnode *vp, + struct label *label) { struct vattr vap; int error; @@ -532,8 +533,8 @@ static int mac_bsdextended_cred_check_rename_to_vnode(struct ucred *cred, - struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, - int samedir) + struct vnode *dvp, struct label *dlabel, struct vnode *vp, + struct label *label, int samedir) { struct vattr vap; int error; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 21 19: 3:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F36F637B401; Sun, 21 Jul 2002 19:03:12 -0700 (PDT) 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 8C0A037B400 for ; Sun, 21 Jul 2002 19:03:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26FBA43E42 for ; Sun, 21 Jul 2002 19:03:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6M23CJU086922 for ; Sun, 21 Jul 2002 19:03:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6M23BJ7086918 for perforce@freebsd.org; Sun, 21 Jul 2002 19:03:11 -0700 (PDT) Date: Sun, 21 Jul 2002 19:03:11 -0700 (PDT) Message-Id: <200207220203.g6M23BJ7086918@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14655 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14655 Change 14655 by rwatson@rwatson_paprika on 2002/07/21 19:03:10 Add componentname arguments to the rename_{to,from} entry points so that policies can make decisions based on the looked up names. No policies currently use that information. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#186 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#59 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#62 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#42 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#50 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#43 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#45 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#13 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#119 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#82 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#186 (text+ko) ==== @@ -1921,7 +1921,7 @@ int mac_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, - struct vnode *vp) + struct vnode *vp, struct componentname *cnp) { int error; @@ -1939,13 +1939,13 @@ return (error); MAC_CHECK(cred_check_rename_from_vnode, cred, dvp, &dvp->v_label, vp, - &vp->v_label); + &vp->v_label, cnp); return (error); } int mac_cred_check_rename_to_vnode(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, int samedir) + struct vnode *vp, int samedir, struct componentname *cnp) { int error; @@ -1964,7 +1964,7 @@ return (error); } MAC_CHECK(cred_check_rename_to_vnode, cred, dvp, &dvp->v_label, vp, - vp != NULL ? &vp->v_label : NULL, samedir); + vp != NULL ? &vp->v_label : NULL, samedir, cnp); return (error); } ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#59 (text+ko) ==== @@ -3686,7 +3686,7 @@ fvp = fromnd.ni_vp; #ifdef MAC error = mac_cred_check_rename_from_vnode(td->td_ucred, fromnd.ni_dvp, - fvp); + fvp, &fromnd.ni_cnd); if (error) { NDFREE(&fromnd, NDF_ONLY_PNBUF); vrele(fromnd.ni_dvp); @@ -3745,7 +3745,7 @@ #ifdef MAC else error = mac_cred_check_rename_to_vnode(td->td_ucred, tdvp, - tond.ni_vp, fromnd.ni_dvp == tdvp); + tond.ni_vp, fromnd.ni_dvp == tdvp, &tond.ni_cnd); #endif /* MAC */ out: if (!error) { ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#62 (text+ko) ==== @@ -1550,7 +1550,8 @@ static int mac_biba_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label) + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) { struct mac_biba *subj, *obj; @@ -1573,7 +1574,8 @@ static int mac_biba_cred_check_rename_to_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label, int samedir) + struct label *dlabel, struct vnode *vp, struct label *label, int samedir, + struct componentname *cnp) { struct mac_biba *subj, *obj; ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#42 (text+ko) ==== @@ -509,7 +509,7 @@ static int mac_bsdextended_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, - struct label *label) + struct label *label, struct componentname *cnp) { struct vattr vap; int error; @@ -534,7 +534,7 @@ static int mac_bsdextended_cred_check_rename_to_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, - struct label *label, int samedir) + struct label *label, int samedir, struct componentname *cnp) { struct vattr vap; int error; ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#50 (text+ko) ==== @@ -1493,7 +1493,8 @@ static int mac_mls_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label) + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) { struct mac_mls *subj, *obj; @@ -1516,7 +1517,8 @@ static int mac_mls_cred_check_rename_to_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label, int samedir) + struct label *dlabel, struct vnode *vp, struct label *label, int samedir, + struct componentname *cnp) { struct mac_mls *subj, *obj; ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#43 (text+ko) ==== @@ -710,7 +710,8 @@ static int mac_none_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label) + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) { return (0); @@ -718,7 +719,8 @@ static int mac_none_cred_check_rename_to_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label, int samedir) + struct label *dlabel, struct vnode *vp, struct label *label, int samedir, + struct componentname *cnp) { return (0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#45 (text+ko) ==== @@ -1360,7 +1360,8 @@ static int mac_te_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label) + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) { int error; @@ -1384,7 +1385,8 @@ static int mac_te_cred_check_rename_to_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label, int samedir) + struct label *dlabel, struct vnode *vp, struct label *label, int samedir, + struct componentname *cnp) { int error; ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#13 (text+ko) ==== @@ -903,7 +903,8 @@ static int mac_test_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label) + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) { return (0); @@ -911,7 +912,8 @@ static int mac_test_cred_check_rename_to_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label, int samedir) + struct label *dlabel, struct vnode *vp, struct label *label, int samedir, + struct componentname *cnp) { return (0); ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#119 (text+ko) ==== @@ -279,9 +279,9 @@ int mac_cred_check_delete_vnode(struct ucred *cred, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); int mac_cred_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, - struct vnode *vp); + struct vnode *vp, struct componentname *cnp); int mac_cred_check_rename_to_vnode(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, int samedir); + struct vnode *vp, int samedir, struct componentname *cnp); int mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode); int mac_cred_check_readdir_vnode(struct ucred *cred, struct vnode *vp); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#82 (text+ko) ==== @@ -283,10 +283,12 @@ struct vnode *vp, struct label *label); int (*mpo_cred_check_rename_from_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, - struct vnode *vp, struct label *label); + struct vnode *vp, struct label *label, + struct componentname *cnp); int (*mpo_cred_check_rename_to_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, - struct vnode *vp, struct label *label, int samedir); + struct vnode *vp, struct label *label, int samedir, + struct componentname *cnp); int (*mpo_cred_check_revoke_vnode)(struct ucred *cred, struct vnode *vp, struct label *label); int (*mpo_cred_check_setacl_vnode)(struct ucred *cred, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 22 5:50:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 138C937B405; Mon, 22 Jul 2002 05:50:23 -0700 (PDT) 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 8893537B400 for ; Mon, 22 Jul 2002 05:50:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B6BC43E42 for ; Mon, 22 Jul 2002 05:50:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6MCoLJU002805 for ; Mon, 22 Jul 2002 05:50:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6MCoLDw002802 for perforce@freebsd.org; Mon, 22 Jul 2002 05:50:21 -0700 (PDT) Date: Mon, 22 Jul 2002 05:50:21 -0700 (PDT) Message-Id: <200207221250.g6MCoLDw002802@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14684 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14684 Change 14684 by rwatson@rwatson_paprika on 2002/07/22 05:49:25 Pass down VAPPEND flag in fhopen(), that VAPPEND change to vn_open() wasn't copied to here. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#60 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#60 (text+ko) ==== @@ -4471,6 +4471,8 @@ } if (fmode & FREAD) mode |= VREAD; + if (fmode & O_APPEND) + mode |= VAPPEND; #ifdef MAC error = mac_cred_check_open_vnode(td->td_ucred, vp, mode); if (error) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 22 14:17:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4222837B401; Mon, 22 Jul 2002 14:17:10 -0700 (PDT) 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 3307237B400 for ; Mon, 22 Jul 2002 14:17:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1CD543E31 for ; Mon, 22 Jul 2002 14:17:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6MLH8JU097142 for ; Mon, 22 Jul 2002 14:17:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6MLH8we097139 for perforce@freebsd.org; Mon, 22 Jul 2002 14:17:08 -0700 (PDT) Date: Mon, 22 Jul 2002 14:17:08 -0700 (PDT) Message-Id: <200207222117.g6MLH8we097139@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14726 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14726 Change 14726 by rwatson@rwatson_tislabs on 2002/07/22 14:16:10 Unique variable names to make it easier to debug slot problems. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#63 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#51 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#63 (text+ko) ==== @@ -96,8 +96,8 @@ TUNABLE_STR("security.mac.biba.trusted_interfaces", trusted_interfaces, sizeof(trusted_interfaces)); -static int slot; -#define SLOT(l) ((struct mac_biba *)LABEL_TO_SLOT((l), slot).l_ptr) +static int mac_biba_slot; +#define SLOT(l) ((struct mac_biba *)LABEL_TO_SLOT((l), mac_biba_slot).l_ptr) MALLOC_DEFINE(M_MACBIBA, "biba label", "MAC/Biba labels"); @@ -2014,4 +2014,4 @@ }; MAC_POLICY_SET(mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba", - MPC_LOADTIME_FLAG_NOTLATE, &slot); + MPC_LOADTIME_FLAG_NOTLATE, &mac_biba_slot); ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#51 (text+ko) ==== @@ -85,8 +85,8 @@ SYSCTL_INT(_security_mac_mls, OID_AUTO, destroyed_not_inited, CTLFLAG_RD, &destroyed_not_inited, 0, "Count of labels destroyed but not inited"); -static int slot; -#define SLOT(l) ((struct mac_mls *)LABEL_TO_SLOT((l), slot).l_ptr) +static int mac_mls_slot; +#define SLOT(l) ((struct mac_mls *)LABEL_TO_SLOT((l), mac_mls_slot).l_ptr) MALLOC_DEFINE(M_MACMLS, "mls label", "MAC/MLS labels"); @@ -1957,4 +1957,4 @@ }; MAC_POLICY_SET(mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS", - MPC_LOADTIME_FLAG_NOTLATE, &slot); + MPC_LOADTIME_FLAG_NOTLATE, &mac_mls_slot); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 22 18:51:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92A0F37B401; Mon, 22 Jul 2002 18:51:15 -0700 (PDT) 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 20D2437B400 for ; Mon, 22 Jul 2002 18:51:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C86E443E65 for ; Mon, 22 Jul 2002 18:51:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6N1pEJU039544 for ; Mon, 22 Jul 2002 18:51:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6N1pE7l039541 for perforce@freebsd.org; Mon, 22 Jul 2002 18:51:14 -0700 (PDT) Date: Mon, 22 Jul 2002 18:51:14 -0700 (PDT) Message-Id: <200207230151.g6N1pE7l039541@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14753 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14753 Change 14753 by rwatson@rwatson_tislabs on 2002/07/22 18:50:36 Use a SLOT() macro as with other policies. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#2 (text+ko) ==== @@ -76,6 +76,7 @@ &mac_partition_enabled, 0, "Enforce partition policy"); static int partition_slot; +#define SLOT(l) (SLOT((l))) static void mac_partition_init(struct mac_policy_conf *conf) @@ -87,35 +88,35 @@ mac_partition_init_subject(struct ucred *ucred, struct label *label) { - LABEL_TO_SLOT(label, partition_slot).l_long = 0; + SLOT(label) = 0; } static void mac_partition_init_temp(struct label *label) { - LABEL_TO_SLOT(label, partition_slot).l_long = 0; + SLOT(label) = 0; } static void mac_partition_destroy_subject(struct ucred *ucred, struct label *label) { - LABEL_TO_SLOT(label, partition_slot).l_long = 0; + SLOT(label) = 0; } static void mac_partition_destroy_temp(struct label *label) { - LABEL_TO_SLOT(label, partition_slot).l_long = 0; + SLOT(label) = 0; } static int mac_partition_externalize(struct label *label, struct mac *extmac) { - extmac->m_sebsd.ms_psid = LABEL_TO_SLOT(label, partition_slot).l_long; + extmac->m_sebsd.ms_psid = SLOT(label); return (0); } @@ -124,7 +125,7 @@ mac_partition_internalize(struct label *label, struct mac *extmac) { - LABEL_TO_SLOT(label, partition_slot).l_long = extmac->m_sebsd.ms_psid; + SLOT(label) = extmac->m_sebsd.ms_psid; return (0); } @@ -134,31 +135,29 @@ struct ucred *cred_child) { - LABEL_TO_SLOT(&cred_child->cr_label, partition_slot).l_long = - LABEL_TO_SLOT(&cred_parent->cr_label, partition_slot).l_long; + SLOT(&cred_child->cr_label) = SLOT(&cred_parent->cr_label); } static void mac_partition_create_proc0(struct ucred *cred) { - LABEL_TO_SLOT(&cred->cr_label, partition_slot).l_long = 0; + SLOT(&cred->cr_label) = 0; } static void mac_partition_create_proc1(struct ucred *cred) { - LABEL_TO_SLOT(&cred->cr_label, partition_slot).l_long = 0; + SLOT(&cred->cr_label) = 0; } static void mac_partition_relabel_subject(struct ucred *cred, struct label *newlabel) { - if (LABEL_TO_SLOT(newlabel, partition_slot).l_long != 0) - LABEL_TO_SLOT(&cred->cr_label, partition_slot).l_long = - LABEL_TO_SLOT(newlabel, partition_slot).l_long; + if (SLOT(newlabel) != 0) + SLOT(&cred->cr_label) = SLOT(newlabel); } static int @@ -168,11 +167,10 @@ if (mac_partition_enabled == 0) return (0); - if (LABEL_TO_SLOT(subject, partition_slot).l_long == 0) + if (SLOT(subject) == 0) return (0); - if (LABEL_TO_SLOT(subject, partition_slot).l_long == - LABEL_TO_SLOT(object, partition_slot).l_long) + if (SLOT(subject) == SLOT(object)) return (0); return (EPERM); @@ -205,7 +203,7 @@ { /* If in a partition, can't re-partition. */ - if (LABEL_TO_SLOT(&cred->cr_label, partition_slot).l_long != 0) + if (SLOT(&cred->cr_label) != 0) return (EPERM); /* If not in a partition, must have privilege */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 22 19:22:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C894137B401; Mon, 22 Jul 2002 19:22:55 -0700 (PDT) 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 6B16137B400 for ; Mon, 22 Jul 2002 19:22:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6087143E6E for ; Mon, 22 Jul 2002 19:22:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6N2MrJU046013 for ; Mon, 22 Jul 2002 19:22:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6N2MrAh046010 for perforce@freebsd.org; Mon, 22 Jul 2002 19:22:53 -0700 (PDT) Date: Mon, 22 Jul 2002 19:22:53 -0700 (PDT) Message-Id: <200207230222.g6N2MrAh046010@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14754 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14754 Change 14754 by rwatson@rwatson_tislabs on 2002/07/22 19:22:05 Errant search and replace correction. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#3 (text+ko) ==== @@ -76,7 +76,7 @@ &mac_partition_enabled, 0, "Enforce partition policy"); static int partition_slot; -#define SLOT(l) (SLOT((l))) +#define SLOT(l) (LABEL_TO_SLOT((l), partition_slot).l_long) static void mac_partition_init(struct mac_policy_conf *conf) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 22 20:26:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82E8C37B405; Mon, 22 Jul 2002 20:26:23 -0700 (PDT) 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 B875A37B405 for ; Mon, 22 Jul 2002 20:26:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51EDA43E3B for ; Mon, 22 Jul 2002 20:26:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6N3QMJU055845 for ; Mon, 22 Jul 2002 20:26:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6N3QMcm055842 for perforce@freebsd.org; Mon, 22 Jul 2002 20:26:22 -0700 (PDT) Date: Mon, 22 Jul 2002 20:26:22 -0700 (PDT) Message-Id: <200207230326.g6N3QMcm055842@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14756 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14756 Change 14756 by rwatson@rwatson_tislabs on 2002/07/22 20:26:07 Revert vnaccess() change such that file systems call vaccess() or vaccess_acl_posix1e(). This restores the ACL VOP operations to within UFS (the only file system currently using POSIX.1e ACLs). Slight performance optimization. vnaccess() is actually a good idea we should reconsider later once the MAC framework is merged, just not part of the MAC framework merge. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#18 edit .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vnops.c#9 edit .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vnops.c#7 edit .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vnops.c#6 edit .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#14 edit .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#6 edit .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vnops.c#5 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#27 edit .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#29 edit .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#40 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#18 (text+ko) ==== @@ -186,7 +186,7 @@ if (vp->v_type == VDIR) de = de->de_dir; - return (vnaccess(vp, de->de_mode, de->de_uid, de->de_gid, + return (vaccess(vp->v_type, de->de_mode, de->de_uid, de->de_gid, ap->a_mode, ap->a_cred, NULL)); } ==== //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vnops.c#9 (text+ko) ==== @@ -741,7 +741,7 @@ } } - return (vnaccess(vp, hp->h_mode, hp->h_uid, hp->h_gid, + return (vaccess(vp->v_type, hp->h_mode, hp->h_uid, hp->h_gid, ap->a_mode, ap->a_cred, NULL)); } ==== //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vnops.c#7 (text+ko) ==== @@ -263,7 +263,7 @@ } } - return (vnaccess(vp, file_mode, pmp->pm_uid, pmp->pm_gid, + return (vaccess(vp->v_type, file_mode, pmp->pm_uid, pmp->pm_gid, ap->a_mode, ap->a_cred, NULL)); } ==== //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vnops.c#6 (text+ko) ==== @@ -389,7 +389,7 @@ } } - return (vnaccess(vp, ip->i_mp->ntm_mode, ip->i_mp->ntm_uid, + return (vaccess(vp->v_type, ip->i_mp->ntm_mode, ip->i_mp->ntm_uid, ip->i_mp->ntm_gid, ap->a_mode, ap->a_cred, NULL)); } ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#14 (text+ko) ==== @@ -112,7 +112,7 @@ error = VOP_GETATTR(vn, &vattr, va->a_cred, va->a_td); if (error) PFS_RETURN (error); - error = vnaccess(vn, vattr.va_mode, vattr.va_uid, + error = vaccess(vn->v_type, vattr.va_mode, vattr.va_uid, vattr.va_gid, va->a_mode, va->a_cred, NULL); PFS_RETURN (error); } ==== //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#6 (text+ko) ==== @@ -215,7 +215,7 @@ mode = udf_permtomode(node); - return (vnaccess(vp, mode, node->fentry->uid, node->fentry->gid, + return (vaccess(vp->v_type, mode, node->fentry->uid, node->fentry->gid, a_mode, a->a_cred, NULL)); } ==== //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vnops.c#5 (text+ko) ==== @@ -151,7 +151,7 @@ } } - return (vnaccess(vp, ip->inode.iso_mode, ip->inode.iso_uid, + return (vaccess(vp->v_type, ip->inode.iso_mode, ip->inode.iso_uid, ip->inode.iso_gid, ap->a_mode, ap->a_cred, NULL)); } ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#27 (text+ko) ==== @@ -3156,75 +3156,15 @@ } /* - * Common file system object access control check routine. Accepts a - * locked vnode, cached file mode, owner, group, mode, subject credential - * requesting the operation, and optional call-by-reference privused - * argument allowing vnaccess() to indicate to the caller whether privilege - * was used to satisfy the request (obsoleted). Returns 0 on success, or - * an error value on failure. + * Common filesystem object access control check routine. Accepts a + * vnode's type, "mode", uid and gid, requested access mode, credentials, + * and optional call-by-reference privused argument allowing vaccess() + * to indicate to the caller whether privilege was used to satisfy the + * request (obsoleted). Returns 0 on success, or an error value on + * failure. */ int -vnaccess(vp, file_mode, file_uid, file_gid, acc_mode, cred, privused) - struct vnode *vp; - mode_t file_mode; - uid_t file_uid; - gid_t file_gid; - mode_t acc_mode; - struct ucred *cred; - int *privused; -{ - struct acl acl; - int error; - -#if 0 - if (error) { - char *fullpath = "unknown"; - char *freepath = NULL; - - vn_fullpath(curthread, vp, &fullpath, &freepath); - printf("vaccess_mac returned %d for %d (%s) on %s\n", error, - curthread->td_proc->p_pid, curthread->td_proc->p_comm, - fullpath); - - if (freepath) - free(freepath, M_TEMP); - - return (error); - } -#endif - error = VOP_GETACL(vp, ACL_TYPE_ACCESS, &acl, cred, curthread); - switch (error) { - case EOPNOTSUPP: - case EINVAL: /* Includes "ACL type not supported". */ - error = vaccess_dac(vp->v_type, file_mode, file_uid, - file_gid, acc_mode, cred, privused); - break; - case 0: - error = vaccess_acl_posix1e(vp->v_type, file_uid, file_gid, - &acl, acc_mode, cred, privused); - break; - default: - printf("vaccess(): Error retrieving ACL on object (%d).\n", - error); - /* - * XXX: Fall back until debugged. Should eventually - * possibly log an error, and return EPERM for safety. - */ - error = vaccess_dac(vp->v_type, file_mode, file_uid, - file_gid, acc_mode, cred, privused); - } - return (error); -} - -/* - * Common file system object discretionary access control check routine. - * Accepts a vnode's type, "mode", uid and gid, requested access mode, - * credentials, and optional call-by-reference privused argument allowing - * vaccess_dac() to indicate to the caller whether privilege was used to - * satisfy the request. Returns 0 on success, or an errno on failure. - */ -int -vaccess_dac(type, file_mode, file_uid, file_gid, acc_mode, cred, privused) +vaccess(type, file_mode, file_uid, file_gid, acc_mode, cred, privused) enum vtype type; mode_t file_mode; uid_t file_uid; ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#29 (text+ko) ==== @@ -608,12 +608,10 @@ (p)->p_textvp, rb, rfb) int vn_fullpath(struct thread *td, struct vnode *optional_dvp, struct vnode *vn, char **retbuf, char **freebuf); -int vnaccess(struct vnode *vp, mode_t file_mode, uid_t uid, gid_t gid, - mode_t acc_mode, struct ucred *cred, int *privused); int vaccess_acl_posix1e(enum vtype type, uid_t file_uid, gid_t file_gid, struct acl *acl, mode_t acc_mode, struct ucred *cred, int *privused); -int vaccess_dac(enum vtype type, mode_t file_mode, uid_t uid, +int vaccess(enum vtype type, mode_t file_mode, uid_t uid, gid_t gid, mode_t acc_mode, struct ucred *cred, int *privused); void vattr_null(struct vattr *vap); int vcount(struct vnode *vp); ==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#40 (text+ko) ==== @@ -340,6 +340,9 @@ struct inode *ip = VTOI(vp); mode_t mode = ap->a_mode; int error; +#ifdef UFS_ACL + struct acl *acl; +#endif /* * Disallow write attempts on read-only filesystems; @@ -372,8 +375,27 @@ if ((mode & VWRITE) && (ip->i_flags & (IMMUTABLE | SF_SNAPSHOT))) return (EPERM); - error = vnaccess(vp, ip->i_mode, ip->i_uid, ip->i_gid, +#ifdef UFS_ACL + MALLOC(acl, struct acl *, sizeof(*acl), M_ACL, M_WAITOK); + error = VOP_GETACL(vp, ACL_TYPE_ACCESS, acl, ap->a_cred, ap->a_td); + switch (error) { + case EOPNOTSUPP: + error = vaccess(vp->v_type, ip->i_mode, ip->i_uid, ip->i_gid, + ap->a_mode, ap->a_cred, NULL); + break; + case 0: + error = vaccess_acl_posix1e(vp->v_type, ip->i_uid, ip->i_gid, + acl, ap->a_mode, ap->a_cred, NULL); + break; + default: + printf("ufs_access(): error retrieving ACL on object (%d)\n", + error); + } + FREE(acl, M_ACL); +#else + error = vaccess(vp->v_type, ip->i_mode, ip->i_uid, ip->i_gid, ap->a_mode, ap->a_cred, NULL); +#endif return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 22 21: 6:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A2C637B401; Mon, 22 Jul 2002 21:06:21 -0700 (PDT) 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 0090F37B400 for ; Mon, 22 Jul 2002 21:06:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 97FA243E42 for ; Mon, 22 Jul 2002 21:06:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6N46KJU063480 for ; Mon, 22 Jul 2002 21:06:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6N46Kr4063477 for perforce@freebsd.org; Mon, 22 Jul 2002 21:06:20 -0700 (PDT) Date: Mon, 22 Jul 2002 21:06:20 -0700 (PDT) Message-Id: <200207230406.g6N46Kr4063477@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14757 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14757 Change 14757 by rwatson@rwatson_paprika on 2002/07/22 21:06:13 Introduce sysctl/tunable security.mac.cache_fslabel_in_vnode, which permits agressive caching of the mount fslabel in vnode labels, assuming that no individual label is available. Since we don't permit relabeling the mountpoint fslabel right now, enable by default, which will prevent repeated updating of a vnode label from the mountpoint when we know the mountpoint will never change labels. In the future if/when we permit the relabeling of the mountpoint, this would need to be turned off if use of that feature was anticipated. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#187 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#187 (text+ko) ==== @@ -128,6 +128,12 @@ SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size"); +static int mac_cache_fslabel_in_vnode = 1; +SYSCTL_INT(_security_mac, OID_AUTO, cache_fslabel_in_vnode, CTLFLAG_RW, + &mac_cache_fslabel_in_vnode, 0, "Cache mount fslabel in vnode"); +TUNABLE_INT("security.mac.cache_fslabel_in_vnode", + &mac_cache_fslabel_in_vnode); + static unsigned int mac_ea_cache_hits = 0; SYSCTL_UINT(_security_mac, OID_AUTO, ea_cache_hits, CTLFLAG_RD, &mac_ea_cache_hits, 0, @@ -948,6 +954,9 @@ MAC_PERFORM(update_vnode_from_mount, vp, &vp->v_label, mp, &mp->mnt_fslabel); + + if (mac_cache_fslabel_in_vnode) + vp->v_flag |= VCACHEDLABEL; } /* @@ -989,9 +998,7 @@ case ENOATTR: /* - * Use the label from the mount point. Since we may want - * to let this label be updated, don't set the caching - * flag. + * Use the label from the mount point. */ mac_update_vnode_from_mount(vp, vp->v_mount); return (0); @@ -1060,6 +1067,9 @@ return (EBADF); } + if (mac_cache_fslabel_in_vnode) + return (0); + if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { mac_update_vnode_from_mount(vp, vp->v_mount); return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 22 21:10:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D822E37B401; Mon, 22 Jul 2002 21:10:26 -0700 (PDT) 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 731B737B400 for ; Mon, 22 Jul 2002 21:10:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D77A43E42 for ; Mon, 22 Jul 2002 21:10:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6N4APJU063753 for ; Mon, 22 Jul 2002 21:10:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6N4APWa063750 for perforce@freebsd.org; Mon, 22 Jul 2002 21:10:25 -0700 (PDT) Date: Mon, 22 Jul 2002 21:10:25 -0700 (PDT) Message-Id: <200207230410.g6N4APWa063750@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14758 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14758 Change 14758 by rwatson@rwatson_paprika on 2002/07/22 21:09:35 Correctly spell VCACHEDLABEL due to a mismerge. Modify cache hit measurement to handle all cases not just the EA case, since that's no longer accurate. I'll export them from sysctls tomorrow. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#188 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#188 (text+ko) ==== @@ -134,14 +134,8 @@ TUNABLE_INT("security.mac.cache_fslabel_in_vnode", &mac_cache_fslabel_in_vnode); -static unsigned int mac_ea_cache_hits = 0; -SYSCTL_UINT(_security_mac, OID_AUTO, ea_cache_hits, CTLFLAG_RD, - &mac_ea_cache_hits, 0, - "How often cached label can be used for EA backing"); -static unsigned int mac_ea_cache_misses = 0; -SYSCTL_UINT(_security_mac, OID_AUTO, ea_cache_misses, CTLFLAG_RD, - &mac_ea_cache_misses, 0, - "How often cached label cannot be used for EA backing"); +static int mac_vnode_label_cache_hit = 0; +static int mac_vnode_label_cache_miss = 0; static int error_select(int error1, int error2); static int mac_externalize(struct label *label, struct mac *mac); @@ -973,12 +967,6 @@ ASSERT_VOP_LOCKED(vp, "vop_stdrefreshlabel_ea"); - if (vp->v_flag & VCACHEDLABEL) { - mac_ea_cache_hits++; - return (0); - } else - mac_ea_cache_misses++; - /* * Call out to external policies first. Order doesn't really * matter, as long as failure of one assures failure of all. @@ -1067,8 +1055,11 @@ return (EBADF); } - if (mac_cache_fslabel_in_vnode) + if (vp->v_flag & VCACHEDLABEL) { + mac_vnode_label_cache_hit++; return (0); + } else + mac_vnode_label_cache_miss++; if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { mac_update_vnode_from_mount(vp, vp->v_mount); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 23 8:35:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B46C37B401; Tue, 23 Jul 2002 08:35:09 -0700 (PDT) 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 A62C937B400 for ; Tue, 23 Jul 2002 08:35:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17AF343E67 for ; Tue, 23 Jul 2002 08:35:07 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6NFZ6JU093100 for ; Tue, 23 Jul 2002 08:35:06 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6NFZ4hO093095 for perforce@freebsd.org; Tue, 23 Jul 2002 08:35:04 -0700 (PDT) Date: Tue, 23 Jul 2002 08:35:04 -0700 (PDT) Message-Id: <200207231535.g6NFZ4hO093095@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14779 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14779 Change 14779 by green@green_laptop_2 on 2002/07/23 08:34:07 Begin support for MAC management of mmap(2)ed files. Currently, revocation at the time of mac_relabel_subject(9) is implemented. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#189 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#64 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#52 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#83 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#189 (text+ko) ==== @@ -65,6 +65,11 @@ #include #include +#include +#include +#include +#include + #include #include @@ -143,8 +148,11 @@ static int mac_policy_unregister(struct mac_policy_conf *mpc); static int mac_stdcreatevnode_ea(struct vnode *vp); +static void mac_subject_mmapped_drop_perms(struct thread *td, + struct ucred *cred); +static void mac_subject_mmapped_drop_perms_recurse(struct thread *td, + struct ucred *cred, struct vm_map *map); - /* * mac_policy_list_lock protects the consistency of 'mac_policy_list', * the linked list of attached policy modules. Read-only consumers of @@ -235,6 +243,162 @@ const size_t maxlabelsize = 65536; /* + * When relabeling a subject, call out to the policies for the maximum + * permission allowed for each object type we know about in its + * memory space, and revoke access (in the least surprising ways we + * know) when necessary. The process lock is not held here. + */ +static void +mac_subject_mmapped_drop_perms(struct thread *td, struct ucred *cred) +{ + + /* XXX freeze all other threads */ + mtx_lock(&Giant); + mac_subject_mmapped_drop_perms_recurse(td, cred, + &td->td_proc->p_vmspace->vm_map); + mtx_unlock(&Giant); + /* XXX allow other threads to continue */ +} + +static __inline const char * +prot2str(vm_prot_t prot) +{ + + switch (prot & VM_PROT_ALL) { + case VM_PROT_READ: + return ("r--"); + case VM_PROT_READ | VM_PROT_WRITE: + return ("rw-"); + case VM_PROT_READ | VM_PROT_EXECUTE: + return ("r-x"); + case VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE: + return ("rwx"); + case VM_PROT_WRITE: + return ("-w-"); + case VM_PROT_EXECUTE: + return ("--x"); + case VM_PROT_WRITE | VM_PROT_EXECUTE: + return ("-wx"); + default: + return ("---"); + } +} + +static void +mac_subject_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred, + struct vm_map *map) +{ + struct vm_map_entry *vme; + vm_prot_t result, revokeperms; + vm_object_t object; + vm_ooffset_t offset; + struct vnode *vp; + + vm_map_lock_read(map); + for (vme = map->header.next; vme != &map->header; vme = vme->next) { + if (vme->eflags & MAP_ENTRY_IS_SUB_MAP) { + mac_subject_mmapped_drop_perms_recurse(td, cred, + vme->object.sub_map); + continue; + } + /* + * Skip over entries that obviously are not shared. + */ + if (vme->eflags & (MAP_ENTRY_COW | MAP_ENTRY_NOSYNC) || + !vme->max_protection) + continue; + /* + * Drill down to the deepest backing object. + */ + offset = vme->offset; + object = vme->object.vm_object; + if (object == NULL) + continue; + while (object->backing_object != NULL) { + object = object->backing_object; + offset += object->backing_object_offset; + } + /* + * At the moment, vm_maps and objects aren't considered + * by the MAC system, so only things with backing by a + * normal object (read: vnodes) are checked. + */ + if (object->type != OBJT_VNODE) + continue; + vp = (struct vnode *)object->handle; + result = VM_PROT_ALL; + /* + * This should be some sort of MAC_BITWISE, maybe :) + */ + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + MAC_BOOLEAN(cred_check_vnode_mmap_perms, &, cred, + vp, &vp->v_label); + VOP_UNLOCK(vp, 0, td); + /* + * Find out what maximum protection we may be allowing + * now but a policy needs to get removed. + */ + revokeperms = vme->max_protection & ~result; + if (!revokeperms) + continue; + printf("pid %d: revoking %s perms from %#lx:%d " + "(max %s/cur %s)\n", td->td_proc->p_pid, + prot2str(revokeperms), vme->start, vme->end - vme->start, + prot2str(vme->max_protection), prot2str(vme->protection)); + vm_map_lock_upgrade(map); + /* + * This is the really simple case: if a map has more + * max_protection than is allowed, but it's not being + * actually used (that is, the current protection is + * still allowed), we can just wipe it out and do + * nothing more. + */ + if ((vme->protection & revokeperms) == 0) { + vme->max_protection -= revokeperms; + } else { + if (revokeperms & VM_PROT_WRITE) { + /* + * In the more complicated case, flush out all + * pending changes to the object then turn it + * copy-on-write. + */ + vm_object_reference(object); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vm_object_page_clean(object, + OFF_TO_IDX(offset), + OFF_TO_IDX(offset + vme->end - vme->start + + PAGE_MASK), + OBJPC_SYNC); + VOP_UNLOCK(vp, 0, td); + vm_object_deallocate(object); + /* + * Why bother if there's no read permissions + * anymore? For the rest of it, we need to + * leave the write permissions on for COW + * to happen. + */ + if ((revokeperms & VM_PROT_READ) == 0) + vme->eflags |= MAP_ENTRY_COW | + MAP_ENTRY_NEEDS_COPY; + } + if (revokeperms & VM_PROT_EXECUTE) { + vme->max_protection &= ~VM_PROT_EXECUTE; + vme->protection &= ~VM_PROT_EXECUTE; + } + if (revokeperms & VM_PROT_READ) { + vme->max_protection = 0; + vme->protection = 0; + } + pmap_protect(map->pmap, vme->start, vme->end, + vme->protection & ~revokeperms); + vm_map_simplify_entry(map, vme); + } + vm_map_lock_downgrade(map); + } + vm_map_unlock_read(map); +} + +/* * Initialize the MAC subsystem, including appropriate SMP locks. */ static void @@ -614,6 +778,10 @@ mpc->mpc_ops->mpo_cred_check_stat_vnode = mpe->mpe_function; break; + case MAC_CRED_CHECK_VNODE_MMAP_PERMS: + mpc->mpc_ops->mpo_cred_check_vnode_mmap_perms = + mpe->mpe_function; + break; case MAC_IFNET_CHECK_SEND_MBUF: mpc->mpc_ops->mpo_ifnet_check_send_mbuf = mpe->mpe_function; @@ -1987,11 +2155,17 @@ return (error); } +/* + * When the subject's label changes, it may require revocation of privilege + * to mapped objects. This can't be done on-the-fly later with a unified + * buffer cache. + */ static void mac_relabel_subject(struct ucred *cred, struct label *newlabel) { MAC_PERFORM(relabel_subject, cred, newlabel); + mac_subject_mmapped_drop_perms(curthread, cred); } void @@ -2568,10 +2742,11 @@ setsugid(p); crcopy(newcred, oldcred); + PROC_UNLOCK(p); mac_relabel_subject(newcred, &intlabel); + PROC_LOCK(p); p->p_ucred = newcred; - PROC_UNLOCK(p); crfree(oldcred); mac_destroy_temp(&intlabel); ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#64 (text+ko) ==== @@ -70,6 +70,8 @@ #include #include +#include + #include SYSCTL_DECL(_security_mac); @@ -1816,6 +1818,26 @@ return (mac_biba_equal_single(p, s) ? 0 : EACCES); } +static int +mac_biba_cred_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_biba *subj, *obj; + vm_prot_t prot = 0; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (mac_biba_dominate_single(obj, subj)) + prot |= VM_PROT_READ | VM_PROT_EXECUTE; + if (mac_biba_dominate_single(subj, obj)) + prot |= VM_PROT_WRITE; + return (prot); +} + static struct mac_policy_op_entry mac_biba_ops[] = { { MAC_DESTROY, @@ -2010,6 +2032,8 @@ (macop_t)mac_biba_ifnet_check_send_mbuf }, { MAC_SOCKET_CHECK_RECEIVE_MBUF, (macop_t)mac_biba_socket_check_receive_mbuf }, + { MAC_CRED_CHECK_VNODE_MMAP_PERMS, + (macop_t)mac_biba_cred_check_vnode_mmap_perms }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#52 (text+ko) ==== @@ -70,6 +70,8 @@ #include #include +#include + #include SYSCTL_DECL(_security_mac); @@ -1759,6 +1761,26 @@ return (mac_mls_equal_single(p, s) ? 0 : EACCES); } +static int +mac_mls_cred_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_mls *subj, *obj; + vm_prot_t prot = 0; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (mac_mls_dominate_single(subj, obj)) + prot |= VM_PROT_READ | VM_PROT_EXECUTE; + if (mac_mls_dominate_single(obj, subj)) + prot |= VM_PROT_WRITE; + return (prot); +} + static struct mac_policy_op_entry mac_mls_ops[] = { { MAC_DESTROY, @@ -1953,6 +1975,8 @@ (macop_t)mac_mls_ifnet_check_send_mbuf }, { MAC_SOCKET_CHECK_RECEIVE_MBUF, (macop_t)mac_mls_socket_check_receive_mbuf }, + { MAC_CRED_CHECK_VNODE_MMAP_PERMS, + (macop_t)mac_mls_cred_check_vnode_mmap_perms }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#83 (text+ko) ==== @@ -313,6 +313,9 @@ struct proc *proc, int signum); int (*mpo_cred_check_stat_vnode)(struct ucred *cred, struct vnode *vp, struct label *label); + /* XXX should be vm_prot_t, not u_char directly */ + u_char (*mpo_cred_check_vnode_mmap_perms)(struct ucred *cred, + struct vnode *vp, struct label *label); int (*mpo_ifnet_check_send_mbuf)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel); @@ -425,6 +428,7 @@ MAC_CRED_CHECK_SCHED_PROC, MAC_CRED_CHECK_SIGNAL_PROC, MAC_CRED_CHECK_STAT_VNODE, + MAC_CRED_CHECK_VNODE_MMAP_PERMS, MAC_IFNET_CHECK_SEND_MBUF, MAC_SOCKET_CHECK_RECEIVE_MBUF, }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 23 8:37:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0362C37B401; Tue, 23 Jul 2002 08:37:11 -0700 (PDT) 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 7EA3437B400 for ; Tue, 23 Jul 2002 08:37:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24DF143E6E for ; Tue, 23 Jul 2002 08:37:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6NFbAJU093217 for ; Tue, 23 Jul 2002 08:37:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6NFb9Rx093214 for perforce@freebsd.org; Tue, 23 Jul 2002 08:37:09 -0700 (PDT) Date: Tue, 23 Jul 2002 08:37:09 -0700 (PDT) Message-Id: <200207231537.g6NFb9Rx093214@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14780 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14780 Change 14780 by rwatson@rwatson_paprika on 2002/07/23 08:37:07 Typo correction (non-fatal). Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#84 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#84 (text+ko) ==== @@ -98,7 +98,7 @@ int (*mpo_externalize)(struct label *label, struct mac *extmac); int (*mpo_internalize)(struct label *label, - struct mac *extmax); + struct mac *extmac); /* * Labeling event operations: file system objects, and things that To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 23 9:22:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A10237B401; Tue, 23 Jul 2002 09:22:07 -0700 (PDT) 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 2DDE437B400 for ; Tue, 23 Jul 2002 09:22:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFDE343E65 for ; Tue, 23 Jul 2002 09:22:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6NGM6JU001510 for ; Tue, 23 Jul 2002 09:22:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6NGM6at001507 for perforce@freebsd.org; Tue, 23 Jul 2002 09:22:06 -0700 (PDT) Date: Tue, 23 Jul 2002 09:22:06 -0700 (PDT) Message-Id: <200207231622.g6NGM6at001507@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14781 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14781 Change 14781 by rwatson@rwatson_paprika on 2002/07/23 09:21:50 Implement mac_partition_execve_transition() as a wrapper to mac_create_subject() so that mac_partition works properly in the presence of a transitioning policy. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#4 (text+ko) ==== @@ -139,6 +139,14 @@ } static void +mac_partition_execve_transition(struct ucred *old, struct ucred *new, + struct vnode *vp, struct label *vnodelabel) +{ + + mac_partition_create_subject(old, new); +} + +static void mac_partition_create_proc0(struct ucred *cred) { @@ -259,6 +267,8 @@ (macop_t)mac_partition_internalize }, { MAC_CREATE_SUBJECT, (macop_t)mac_partition_create_subject }, + { MAC_EXECVE_TRANSITION, + (macop_t)mac_partition_execve_transition }, { MAC_CREATE_PROC0, (macop_t)mac_partition_create_proc0 }, { MAC_CREATE_PROC1, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 23 10:33:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E185537B40B; Tue, 23 Jul 2002 10:33:37 -0700 (PDT) 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 45B4537B40A for ; Tue, 23 Jul 2002 10:33:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEC6843E4A for ; Tue, 23 Jul 2002 10:33:36 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6NHXaJU012058 for ; Tue, 23 Jul 2002 10:33:36 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6NHXa7K012055 for perforce@freebsd.org; Tue, 23 Jul 2002 10:33:36 -0700 (PDT) Date: Tue, 23 Jul 2002 10:33:36 -0700 (PDT) Message-Id: <200207231733.g6NHXa7K012055@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 14784 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14784 Change 14784 by chris@chris_holly on 2002/07/23 10:32:47 Use `mpo' as the prefix now (mpo_create_vnode_from_vnode instead of mac_policy_create_vnode_from_vnode). Requested by: rwatson Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac.ent#2 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac.ent#2 (text+ko) ==== @@ -1,4 +1,4 @@ -policy"> + To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 23 10:59:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAA4F37B401; Tue, 23 Jul 2002 10:59:09 -0700 (PDT) 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 694E637B400 for ; Tue, 23 Jul 2002 10:59:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D20BA43E3B for ; Tue, 23 Jul 2002 10:59:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6NHx8JU014152 for ; Tue, 23 Jul 2002 10:59:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6NHx88V014149 for perforce@freebsd.org; Tue, 23 Jul 2002 10:59:08 -0700 (PDT) Date: Tue, 23 Jul 2002 10:59:08 -0700 (PDT) Message-Id: <200207231759.g6NHx88V014149@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14786 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14786 Change 14786 by rwatson@rwatson_tislabs on 2002/07/23 10:59:04 Implement the access() policy entry point for the policies where it had not yet been implemented. For TE, MLS, and Biba, simply wrap the existing open() check since the logic is identical. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#65 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#53 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#44 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#46 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#65 (text+ko) ==== @@ -1322,6 +1322,14 @@ } static int +mac_biba_cred_check_access_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, mode_t flags) +{ + + return (mac_biba_cred_check_open_vnode(cred, vp, label, flags)); +} + +static int mac_biba_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -1980,6 +1988,8 @@ (macop_t)mac_biba_cred_check_statfs }, { MAC_CRED_CHECK_DEBUG_PROC, (macop_t)mac_biba_cred_check_debug_proc }, + { MAC_CRED_CHECK_ACCESS_VNODE, + (macop_t)mac_biba_cred_check_access_vnode }, { MAC_CRED_CHECK_CHDIR_VNODE, (macop_t)mac_biba_cred_check_chdir_vnode }, { MAC_CRED_CHECK_CHROOT_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#53 (text+ko) ==== @@ -1265,6 +1265,14 @@ } static int +mac_mls_cred_check_access_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, mode_t flags) +{ + + return (mac_mls_cred_check_open_vnode(cred, vp, label, flags)); +} + +static int mac_mls_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -1923,6 +1931,8 @@ (macop_t)mac_mls_cred_check_statfs }, { MAC_CRED_CHECK_DEBUG_PROC, (macop_t)mac_mls_cred_check_debug_proc }, + { MAC_CRED_CHECK_ACCESS_VNODE, + (macop_t)mac_mls_cred_check_access_vnode }, { MAC_CRED_CHECK_CHDIR_VNODE, (macop_t)mac_mls_cred_check_chdir_vnode }, { MAC_CRED_CHECK_CHROOT_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#44 (text+ko) ==== @@ -604,6 +604,14 @@ } static int +mac_none_cred_check_access_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, mode_t flags) +{ + + return (0); +} + +static int mac_none_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -969,6 +977,8 @@ (macop_t)mac_none_cred_check_statfs }, { MAC_CRED_CHECK_DEBUG_PROC, (macop_t)mac_none_cred_check_debug_proc }, + { MAC_CRED_CHECK_ACCESS_VNODE, + (macop_t)mac_none_cred_check_access_vnode }, { MAC_CRED_CHECK_CHDIR_VNODE, (macop_t)mac_none_cred_check_chdir_vnode }, { MAC_CRED_CHECK_CHROOT_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#46 (text+ko) ==== @@ -1290,6 +1290,14 @@ } static int +mac_te_cred_check_access_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, mode_t flags) +{ + + return (mac_te_cred_check_open_vnode(cred, vp, label, flags)); +} + +static int mac_te_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -1617,6 +1625,8 @@ (macop_t)mac_te_cred_check_relabel_vnode }, { MAC_CRED_CHECK_STATFS, (macop_t)mac_te_cred_check_statfs }, { MAC_CRED_CHECK_DEBUG_PROC, (macop_t)mac_te_cred_check_debug_proc }, + { MAC_CRED_CHECK_ACCESS_VNODE, + (macop_t)mac_te_cred_check_access_vnode }, { MAC_CRED_CHECK_CHDIR_VNODE, (macop_t)mac_te_cred_check_chdir_vnode }, { MAC_CRED_CHECK_CHROOT_VNODE, (macop_t)mac_te_cred_check_chroot_vnode }, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#14 (text+ko) ==== @@ -797,6 +797,14 @@ } static int +mac_test_cred_check_access_vnode(struct ucred *cred, struct vnode *vp, + struct label *label, mode_t flags) +{ + + return (0); +} + +static int mac_test_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -1160,6 +1168,8 @@ (macop_t)mac_test_cred_check_statfs }, { MAC_CRED_CHECK_DEBUG_PROC, (macop_t)mac_test_cred_check_debug_proc }, + { MAC_CRED_CHECK_ACCESS_VNODE, + (macop_t)mac_test_cred_check_access_vnode }, { MAC_CRED_CHECK_CHDIR_VNODE, (macop_t)mac_test_cred_check_chdir_vnode }, { MAC_CRED_CHECK_CHROOT_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 23 14:38:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC76437B401; Tue, 23 Jul 2002 14:38:39 -0700 (PDT) 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 5A65337B400 for ; Tue, 23 Jul 2002 14:38:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A85843E42 for ; Tue, 23 Jul 2002 14:38:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6NLccJU058246 for ; Tue, 23 Jul 2002 14:38:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6NLccEX058243 for perforce@freebsd.org; Tue, 23 Jul 2002 14:38:38 -0700 (PDT) Date: Tue, 23 Jul 2002 14:38:38 -0700 (PDT) Message-Id: <200207232138.g6NLccEX058243@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14790 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14790 Change 14790 by rwatson@rwatson_tislabs on 2002/07/23 14:38:25 Declare a prototype of the _open_() implementation so that _access() can use it. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#66 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#66 (text+ko) ==== @@ -103,6 +103,10 @@ MALLOC_DEFINE(M_MACBIBA, "biba label", "MAC/Biba labels"); +static int mac_biba_cred_check_open_vnode(struct ucred *cred, + struct vnode *vp, struct label *vnodelabel, + mode_t acc_mode); + static struct mac_biba * biba_alloc(int how) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 23 14:47: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60FBD37B401; Tue, 23 Jul 2002 14:46:50 -0700 (PDT) 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 0123737B400 for ; Tue, 23 Jul 2002 14:46:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 901FC43E31 for ; Tue, 23 Jul 2002 14:46:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6NLknJU059034 for ; Tue, 23 Jul 2002 14:46:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6NLknBV059031 for perforce@freebsd.org; Tue, 23 Jul 2002 14:46:49 -0700 (PDT) Date: Tue, 23 Jul 2002 14:46:49 -0700 (PDT) Message-Id: <200207232146.g6NLknBV059031@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14791 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14791 Change 14791 by rwatson@rwatson_tislabs on 2002/07/23 14:46:35 First pass at implementing access control checks for vnode read, write, and poll operations using a mac_cred_check_vnode_op() interface. It may be it makes sense simply to move them to their own entry points, but it's not yet entirely clear. This implementation is modeled on amigus's pipe access control checks. No policy implementations yet: caution, if you enable this in policies without meaning to, a fair amount of suffering is to be had (revocation of tty access, etc). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#9 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#190 edit .. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#5 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#61 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#26 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#120 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#85 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#9 (text+ko) ==== @@ -769,9 +769,10 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); (void)VOP_LEASE(vp, td, cred, LEASE_WRITE); #ifdef MAC - /* XXXMAC: Write authorization checks here. */ + error = mac_cred_check_vnode_op(cred, vp, MAC_OP_VNODE_WRITE); + if (error == 0) #endif - error = VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, cred); + error = VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, cred); if (error == 0 && uio != NULL) { (void)VOP_LEASE(vp, td, cred, LEASE_WRITE); error = VOP_WRITE(vp, uio, IO_UNIT | IO_APPEND, cred); ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#190 (text+ko) ==== @@ -782,6 +782,10 @@ mpc->mpc_ops->mpo_cred_check_vnode_mmap_perms = mpe->mpe_function; break; + case MAC_CRED_CHECK_VNODE_OP: + mpc->mpc_ops->mpo_cred_check_vnode_op = + mpe->mpe_function; + break; case MAC_IFNET_CHECK_SEND_MBUF: mpc->mpc_ops->mpo_ifnet_check_send_mbuf = mpe->mpe_function; @@ -2567,6 +2571,26 @@ return (error); } + +int +mac_cred_check_vnode_op(struct ucred *cred, struct vnode *vp, int op) +{ + int error; + + if (!mac_enforce_fs) + return (0); + + ASSERT_VOP_LOCKED(vp, "mac_cred_check_vnode_op"); + + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + + MAC_CHECK(cred_check_vnode_op, cred, vp, &vp->v_label, op); + + return (error); +} + int mac_setsockopt_label_set(struct ucred *cred, struct socket *so, struct mac *extmac) ==== //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#5 (text+ko) ==== @@ -160,9 +160,12 @@ return (error); vn_lock(ttyvp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - /* XXXMAC: Write authorization check here. */ + /* XXX: shouldn't the cred below be td->td_ucred not NOCRED? */ + error = mac_cred_check_vnode_op(td->td_ucred, ttyvp, + MAC_OP_VNODE_WRITE); + if (error == 0) #endif - error = VOP_WRITE(ttyvp, uio, flag, NOCRED); + error = VOP_WRITE(ttyvp, uio, flag, NOCRED); VOP_UNLOCK(ttyvp, 0, td); vn_finished_write(mp); return (error); @@ -204,6 +207,7 @@ } #ifdef MAC /* XXXMAC: Ioctl authorization check here. */ + /* XXX: Should this be td->td_ucred below? */ #endif return (VOP_IOCTL(ttyvp, cmd, addr, flag, NOCRED, td)); } @@ -216,6 +220,7 @@ struct thread *td; { struct vnode *ttyvp; + int error; PROC_LOCK(td->td_proc); SESS_LOCK(td->td_proc->p_session); @@ -227,7 +232,12 @@ /* try operation to get EOF/failure */ return (seltrue(dev, events, td)); #ifdef MAC - /* XXXMAC: Poll authorization check here. */ + vn_lock(ttyvp, LK_EXCLUSIVE | LK_RETRY, td); + error = mac_cred_check_vnode_op(td->td_ucred, ttyvp, + MAC_OP_VNODE_POLL); + VOP_UNLOCK(ttyvp, 0, td); + if (error) + return (error); #endif return (VOP_POLL(ttyvp, events, td->td_ucred, td)); } ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#61 (text+ko) ==== @@ -1801,9 +1801,11 @@ vat.va_size = 0; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - /* XXXMAC: Truncation check here. */ + error = mac_cred_check_vnode_op(td->td_ucred, vp, + MAC_OP_VNODE_WRITE); + if (error == 0) #endif - error = VOP_SETATTR(vp, &vat, td->td_ucred, td); + error = VOP_SETATTR(vp, &vat, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); if (error) @@ -3469,13 +3471,8 @@ if (vp->v_type == VDIR) error = EISDIR; #ifdef MAC - /* - * XXXMAC: Temporarily, use the 'open' check, although eventually - * the 'write' check will be used. - */ - else if ((error = mac_cred_check_open_vnode(td->td_ucred, vp, VWRITE)) - != 0) { - } + else if ((error = mac_cred_check_vnode_op(td->td_ucred, vp, + MAC_OP_VNODE_WRITE))) {} #endif else if ((error = vn_writechk(vp)) == 0 && (error = VOP_ACCESS(vp, VWRITE, td->td_ucred, td)) == 0) { @@ -4492,7 +4489,12 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); /* XXX */ #ifdef MAC - /* XXXMAC: Truncation check here. */ + error = mac_cred_check_vnode_op(td->td_ucred, vp, + MAC_OP_VNODE_WRITE); + if (error) { + vn_finished_write(mp); + goto bad; + } #endif VATTR_NULL(vap); vap->va_size = 0; ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#26 (text+ko) ==== @@ -398,14 +398,16 @@ auio.uio_td = td; if (rw == UIO_READ) { #ifdef MAC - /* XXXMAC: Read authorization check here. */ + error = mac_cred_check_vnode_op(cred, vp, MAC_OP_VNODE_READ); + if (error == 0) #endif - error = VOP_READ(vp, &auio, ioflg, cred); + error = VOP_READ(vp, &auio, ioflg, cred); } else { #ifdef MAC - /* XXXMAC: Write authorization check here. */ + error = mac_cred_check_vnode_op(cred, vp, MAC_OP_VNODE_WRITE); + if (error == 0) #endif - error = VOP_WRITE(vp, &auio, ioflg, cred); + error = VOP_WRITE(vp, &auio, ioflg, cred); } if (aresid) *aresid = auio.uio_resid; @@ -493,9 +495,10 @@ ioflag |= sequential_heuristic(uio, fp); #ifdef MAC - /* XXXMAC: Read authorization check here. */ + error = mac_cred_check_vnode_op(cred, vp, MAC_OP_VNODE_READ); + if (error == 0) #endif - error = VOP_READ(vp, uio, ioflag, cred); + error = VOP_READ(vp, uio, ioflag, cred); if ((flags & FOF_OFFSET) == 0) fp->f_offset = uio->uio_offset; fp->f_nextoff = uio->uio_offset; @@ -547,9 +550,10 @@ uio->uio_offset = fp->f_offset; ioflag |= sequential_heuristic(uio, fp); #ifdef MAC - /* XXXMAC: Write authorization check here. */ + error = mac_cred_check_vnode_op(cred, vp, MAC_OP_VNODE_WRITE); + if (error == 0) #endif - error = VOP_WRITE(vp, uio, ioflag, cred); + error = VOP_WRITE(vp, uio, ioflag, cred); if ((flags & FOF_OFFSET) == 0) fp->f_offset = uio->uio_offset; fp->f_nextoff = uio->uio_offset; @@ -779,12 +783,17 @@ struct ucred *cred; struct thread *td; { + struct vnode *vp; + int error; + vp = (struct vnode *)fp->f_data; #ifdef MAC - /* XXXMAC: Poll authorization check here. */ + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + error = mac_cred_check_vnode_op(cred, vp, MAC_OP_VNODE_POLL); + if (error) + return (error); #endif - - return (VOP_POLL(((struct vnode *)fp->f_data), events, cred, td)); + return (VOP_POLL(vp, events, cred, td)); } /* ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#120 (text+ko) ==== @@ -191,6 +191,10 @@ */ extern int mac_debug_label_fallback; +#define MAC_OP_VNODE_READ 1 +#define MAC_OP_VNODE_WRITE 2 +#define MAC_OP_VNODE_POLL 3 + /* * Kernel functions to manage and evaluate labels. */ @@ -288,6 +292,7 @@ int mac_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp); int mac_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp); int mac_cred_check_statfs(struct ucred *cred, struct mount *mp); +int mac_cred_check_vnode_op(struct ucred *cred, struct vnode *vp, int op); int mac_getsockopt_label_get(struct ucred *cred, struct socket *so, struct mac *extmac); int mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#85 (text+ko) ==== @@ -316,6 +316,8 @@ /* XXX should be vm_prot_t, not u_char directly */ u_char (*mpo_cred_check_vnode_mmap_perms)(struct ucred *cred, struct vnode *vp, struct label *label); + int (*mpo_cred_check_vnode_op)(struct ucred *cred, + struct vnode *vp, struct label *label, int op); int (*mpo_ifnet_check_send_mbuf)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel); @@ -429,6 +431,7 @@ MAC_CRED_CHECK_SIGNAL_PROC, MAC_CRED_CHECK_STAT_VNODE, MAC_CRED_CHECK_VNODE_MMAP_PERMS, + MAC_CRED_CHECK_VNODE_OP, MAC_IFNET_CHECK_SEND_MBUF, MAC_SOCKET_CHECK_RECEIVE_MBUF, }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 23 15: 3:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8214E37B401; Tue, 23 Jul 2002 15:03:10 -0700 (PDT) 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 EAF0237B400 for ; Tue, 23 Jul 2002 15:03:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9EC143E42 for ; Tue, 23 Jul 2002 15:03:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6NM39JU060926 for ; Tue, 23 Jul 2002 15:03:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6NM39LG060922 for perforce@freebsd.org; Tue, 23 Jul 2002 15:03:09 -0700 (PDT) Date: Tue, 23 Jul 2002 15:03:09 -0700 (PDT) Message-Id: <200207232203.g6NM39LG060922@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14792 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14792 Change 14792 by rwatson@rwatson_paprika on 2002/07/23 15:02:18 Disable the null v_mount warnings in non deadfs cases, since this is an expected result following device revocation. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#191 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#191 (text+ko) ==== @@ -1220,7 +1220,7 @@ mac_update_vnode_deadfs(vp); return (0); */ - printf("vn_refreshlabel: null v_mount\n"); + /* printf("vn_refreshlabel: null v_mount\n"); */ if (vp->v_tag != VT_NON) printf( "vn_refreshlabel: null v_mount with non-VT_NON\n"); @@ -2675,7 +2675,7 @@ int error; if (vp->v_mount == NULL) { - printf("vn_setlabel: null v_mount\n"); + /* printf("vn_setlabel: null v_mount\n"); */ if (vp->v_tag != VT_NON) printf("vn_setlabel: null v_mount with non-VT_NON\n"); return (EBADF); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 6: 3:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B207437B428; Wed, 24 Jul 2002 06:03:26 -0700 (PDT) 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 E851B37B410 for ; Wed, 24 Jul 2002 06:03:18 -0700 (PDT) Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FA2043E31 for ; Wed, 24 Jul 2002 06:03:18 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 3371 invoked from network); 24 Jul 2002 13:03:17 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 24 Jul 2002 13:03:17 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g6OD3HuR034932; Wed, 24 Jul 2002 09:03:17 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200207210326.g6L3QVNN068540@freefall.freebsd.org> Date: Wed, 24 Jul 2002 09:03:27 -0400 (EDT) From: John Baldwin To: Peter Wemm Subject: RE: PERFORCE change 14569 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 21-Jul-2002 Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14569 > > Change 14569 by peter@peter_ia64 on 2002/07/20 20:25:35 > > add the em driver (this should be MI, sigh) Then do it. :) > Affected files ... > > .. //depot/projects/ia64/sys/conf/files.ia64#11 edit > > Differences ... > > ==== //depot/projects/ia64/sys/conf/files.ia64#11 (text+ko) ==== > > @@ -75,6 +75,8 @@ > crypto/des/des_enc.c optional ipsec ipsec_esp > dev/advansys/adv_isa.c optional adv isa > dev/aic/aic_isa.c optional aic isa > +dev/em/if_em.c optional em > +dev/em/if_em_hw.c optional em > dev/fb/fb.c optional fb > dev/fb/fb.c optional vga > dev/fb/splash.c optional splash -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 6:55:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB9C337B401; Wed, 24 Jul 2002 06:55:25 -0700 (PDT) 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 3F81437B400 for ; Wed, 24 Jul 2002 06:55:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C908343E65 for ; Wed, 24 Jul 2002 06:55:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6ODtOJU020760 for ; Wed, 24 Jul 2002 06:55:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6ODtOqL020754 for perforce@freebsd.org; Wed, 24 Jul 2002 06:55:24 -0700 (PDT) Date: Wed, 24 Jul 2002 06:55:24 -0700 (PDT) Message-Id: <200207241355.g6ODtOqL020754@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14831 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14831 Change 14831 by rwatson@rwatson_tislabs on 2002/07/24 06:54:51 For some reason, the plural is more pleasing for statistics than the singular. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#192 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#192 (text+ko) ==== @@ -139,8 +139,12 @@ TUNABLE_INT("security.mac.cache_fslabel_in_vnode", &mac_cache_fslabel_in_vnode); -static int mac_vnode_label_cache_hit = 0; -static int mac_vnode_label_cache_miss = 0; +static int mac_vnode_label_cache_hits = 0; +SYSCTL_INT(_security_mac, OID_AUTO, vnode_label_cache_hits, CTLFLAG_RD, + &mac_vnode_label_cache_hits, 0, "Cache hits on vnode labels"); +static int mac_vnode_label_cache_misses = 0; +SYSCTL_INT(_security_mac, OID_AUTO, vnode_label_cache_misses, CTLFLAG_RD, + &mac_vnode_label_cache_misses, 0, "Cache misses on vnode labels"); static int error_select(int error1, int error2); static int mac_externalize(struct label *label, struct mac *mac); @@ -1228,10 +1232,10 @@ } if (vp->v_flag & VCACHEDLABEL) { - mac_vnode_label_cache_hit++; + mac_vnode_label_cache_hits++; return (0); } else - mac_vnode_label_cache_miss++; + mac_vnode_label_cache_misses++; if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { mac_update_vnode_from_mount(vp, vp->v_mount); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 6:56:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7254D37B401; Wed, 24 Jul 2002 06:56:27 -0700 (PDT) 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 F29EF37B400 for ; Wed, 24 Jul 2002 06:56:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92EB643E31 for ; Wed, 24 Jul 2002 06:56:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6ODuQJU020807 for ; Wed, 24 Jul 2002 06:56:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6ODuQgR020804 for perforce@freebsd.org; Wed, 24 Jul 2002 06:56:26 -0700 (PDT) Date: Wed, 24 Jul 2002 06:56:26 -0700 (PDT) Message-Id: <200207241356.g6ODuQgR020804@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14832 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14832 Change 14832 by rwatson@rwatson_paprika on 2002/07/24 06:56:16 Add MAC_TE_OPERATION_FILE_POLL. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#47 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#47 (text+ko) ==== @@ -92,6 +92,12 @@ TUNABLE_INT("security.mac.te.debug_transitions", &mac_te_debug_transitions); +static int mac_te_revocation_enabled = 0; +SYSCTL_INT(_security_mac_te, OID_AUTO, revocation_enabled, CTLFLAG_RW, + &mac_te_revocation_enabled, 0, "Revoke access to objects on relabel"); +TUNABLE_INT("security.mac.te.revocation_enabled", + &mac_te_revocation_enabled); + static int labelslot; #define SLOT(l) ((struct mac_te *)LABEL_TO_SLOT((l), labelslot).l_ptr) @@ -1498,6 +1504,69 @@ return (error); } +static int +mac_te_cred_check_mmap_perms(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_te *subj, *obj; + vm_prot_t prot = 0; + + if (!mac_biba_revocation_enabled) + return (VM_PROT_ALL); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_FILE_READ) == 0) + prot |= VM_PROT_READ; + if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_FILE_EXEC) == 0) + prot |= VM_PROT_EXECUTE; + if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_FILE_WRITE) == 0) + prot |= VM_PROT_WRITE; + return (prot); +} + +static int +mac_te_cred_check_vnode_op(struct ucred *cred, struct vnode *vp, + struct label *label, int op) +{ + struct mac_te *subj, *obj; + int error, te_class, te_op; + + if (!mac_te_revocation_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + te_class = MAC_TE_CLASS_FILE; + switch (op) { + case MAC_OP_VNODE_POLL: + te_op = MAC_TE_OPERATION_FILE_POLL; + break; + + case MAC_OP_VNODE_READ: + te_op = MAC_TE_OPERATION_FILE_READ; + break; + + case MAC_OP_VNODE_WRITE: + te_op = MAC_TE_OPERATION_FILE_WRITE; + break; + + default: + printf("mac_te_cred_check_vnode_op: unknown operation %d\n", + op); + return (EINVAL); + } + + error = mac_te_check(subj, obj, MAC_TE_CLASS_FILE, te_op); + + return (error); +} + static void mac_te_update_devfsdirent_from_vnode(struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) @@ -1670,6 +1739,10 @@ { MAC_CRED_CHECK_SCHED_PROC, (macop_t)mac_te_cred_check_sched_proc }, { MAC_CRED_CHECK_SIGNAL_PROC, (macop_t)mac_te_cred_check_signal_proc }, { MAC_CRED_CHECK_STAT_VNODE, (macop_t)mac_te_cred_check_stat_vnode }, + { MAC_CRED_CHEKC_VNODE_MMAP_PERMS, + (macop_t)mac_te_cred_check_mmap_perms }, + { MAC_CRED_CHECK_VNODE_OP, + (macop_t)mac_te_cred_check_vnode_op }, { MAC_IFNET_CHECK_SEND_MBUF, (macop_t)mac_te_ifnet_check_send_mbuf }, { MAC_SOCKET_CHECK_RECEIVE_MBUF, (macop_t)mac_te_socket_check_receive_mbuf }, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 6:57:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3678837B401; Wed, 24 Jul 2002 06:57:18 -0700 (PDT) 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 6EA9137B400 for ; Wed, 24 Jul 2002 06:57:17 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id E807143E5E for ; Wed, 24 Jul 2002 06:57:16 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g6ODv9Oo085622 for ; Wed, 24 Jul 2002 09:57:09 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Wed, 24 Jul 2002 09:57:09 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Perforce Change Reviews Subject: Re: PERFORCE change 14832 for review In-Reply-To: <200207241356.g6ODuQgR020804@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, 24 Jul 2002, Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14832 > > Change 14832 by rwatson@rwatson_paprika on 2002/07/24 06:56:16 > > Add MAC_TE_OPERATION_FILE_POLL. Sigh. I committed the wrong file. This description should read: - Implement mac_te_cred_check_mmap_perms() for mac_te - Implement mac_te_cred_check_vnode_op() for mac_te > > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#47 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#47 (text+ko) ==== > > @@ -92,6 +92,12 @@ > TUNABLE_INT("security.mac.te.debug_transitions", > &mac_te_debug_transitions); > > +static int mac_te_revocation_enabled = 0; > +SYSCTL_INT(_security_mac_te, OID_AUTO, revocation_enabled, CTLFLAG_RW, > + &mac_te_revocation_enabled, 0, "Revoke access to objects on relabel"); > +TUNABLE_INT("security.mac.te.revocation_enabled", > + &mac_te_revocation_enabled); > + > static int labelslot; > #define SLOT(l) ((struct mac_te *)LABEL_TO_SLOT((l), labelslot).l_ptr) > > @@ -1498,6 +1504,69 @@ > return (error); > } > > +static int > +mac_te_cred_check_mmap_perms(struct ucred *cred, struct vnode *vp, > + struct label *label) > +{ > + struct mac_te *subj, *obj; > + vm_prot_t prot = 0; > + > + if (!mac_biba_revocation_enabled) > + return (VM_PROT_ALL); > + > + subj = SLOT(&cred->cr_label); > + obj = SLOT(label); > + > + if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, > + MAC_TE_OPERATION_FILE_READ) == 0) > + prot |= VM_PROT_READ; > + if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, > + MAC_TE_OPERATION_FILE_EXEC) == 0) > + prot |= VM_PROT_EXECUTE; > + if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, > + MAC_TE_OPERATION_FILE_WRITE) == 0) > + prot |= VM_PROT_WRITE; > + return (prot); > +} > + > +static int > +mac_te_cred_check_vnode_op(struct ucred *cred, struct vnode *vp, > + struct label *label, int op) > +{ > + struct mac_te *subj, *obj; > + int error, te_class, te_op; > + > + if (!mac_te_revocation_enabled) > + return (0); > + > + subj = SLOT(&cred->cr_label); > + obj = SLOT(label); > + > + te_class = MAC_TE_CLASS_FILE; > + switch (op) { > + case MAC_OP_VNODE_POLL: > + te_op = MAC_TE_OPERATION_FILE_POLL; > + break; > + > + case MAC_OP_VNODE_READ: > + te_op = MAC_TE_OPERATION_FILE_READ; > + break; > + > + case MAC_OP_VNODE_WRITE: > + te_op = MAC_TE_OPERATION_FILE_WRITE; > + break; > + > + default: > + printf("mac_te_cred_check_vnode_op: unknown operation %d\n", > + op); > + return (EINVAL); > + } > + > + error = mac_te_check(subj, obj, MAC_TE_CLASS_FILE, te_op); > + > + return (error); > +} > + > static void > mac_te_update_devfsdirent_from_vnode(struct devfs_dirent *devfs_dirent, > struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) > @@ -1670,6 +1739,10 @@ > { MAC_CRED_CHECK_SCHED_PROC, (macop_t)mac_te_cred_check_sched_proc }, > { MAC_CRED_CHECK_SIGNAL_PROC, (macop_t)mac_te_cred_check_signal_proc }, > { MAC_CRED_CHECK_STAT_VNODE, (macop_t)mac_te_cred_check_stat_vnode }, > + { MAC_CRED_CHEKC_VNODE_MMAP_PERMS, > + (macop_t)mac_te_cred_check_mmap_perms }, > + { MAC_CRED_CHECK_VNODE_OP, > + (macop_t)mac_te_cred_check_vnode_op }, > { MAC_IFNET_CHECK_SEND_MBUF, (macop_t)mac_te_ifnet_check_send_mbuf }, > { MAC_SOCKET_CHECK_RECEIVE_MBUF, > (macop_t)mac_te_socket_check_receive_mbuf }, > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 6:57:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E03B537B401; Wed, 24 Jul 2002 06:57:28 -0700 (PDT) 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 99D8837B400 for ; Wed, 24 Jul 2002 06:57:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5992843E3B for ; Wed, 24 Jul 2002 06:57:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6ODvSJU020940 for ; Wed, 24 Jul 2002 06:57:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6ODvSuv020937 for perforce@freebsd.org; Wed, 24 Jul 2002 06:57:28 -0700 (PDT) Date: Wed, 24 Jul 2002 06:57:28 -0700 (PDT) Message-Id: <200207241357.g6ODvSuv020937@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14833 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14833 Change 14833 by rwatson@rwatson_paprika on 2002/07/24 06:57:27 Really add MAC_TE_OPERATION_FILE_POLL. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#10 (text+ko) ==== @@ -73,11 +73,12 @@ #define MAC_TE_OPERATION_FILE_EXEC 4 #define MAC_TE_OPERATION_FILE_GETACL 5 #define MAC_TE_OPERATION_FILE_GETEXTATTR 6 -#define MAC_TE_OPERATION_FILE_READ 7 -#define MAC_TE_OPERATION_FILE_SETACL 8 -#define MAC_TE_OPERATION_FILE_SETEXTATTR 9 -#define MAC_TE_OPERATION_FILE_STAT 10 -#define MAC_TE_OPERATION_FILE_WRITE 11 +#define MAC_TE_OPERATION_FILE_POLL 7 +#define MAC_TE_OPERATION_FILE_READ 8 +#define MAC_TE_OPERATION_FILE_SETACL 9 +#define MAC_TE_OPERATION_FILE_SETEXTATTR 10 +#define MAC_TE_OPERATION_FILE_STAT 11 +#define MAC_TE_OPERATION_FILE_WRITE 12 #define MAC_TE_CLASS_MBUF 3 #define MAC_TE_OPERATION_MBUF_RECEIVE 1 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 7:27:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99B5637B401; Wed, 24 Jul 2002 07:27:12 -0700 (PDT) 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 38B7837B400 for ; Wed, 24 Jul 2002 07:27:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE20343E6E for ; Wed, 24 Jul 2002 07:27:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6OERBJU027908 for ; Wed, 24 Jul 2002 07:27:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6OERBn7027905 for perforce@freebsd.org; Wed, 24 Jul 2002 07:27:11 -0700 (PDT) Date: Wed, 24 Jul 2002 07:27:11 -0700 (PDT) Message-Id: <200207241427.g6OERBn7027905@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14834 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14834 Change 14834 by rwatson@rwatson_paprika on 2002/07/24 07:26:41 Implement mac_cred_check_vnode_op() for mls and biba, as well as correct bugs in the not enabled cases for these policies relating to bfeldman's mmap check (disabling the policy broke all mmaps for processes that changed their label, like login). Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#67 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#54 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#67 (text+ko) ==== @@ -98,6 +98,12 @@ TUNABLE_STR("security.mac.biba.trusted_interfaces", trusted_interfaces, sizeof(trusted_interfaces)); +static int mac_biba_revocation_enabled = 0; +SYSCTL_INT(_security_mac_biba, OID_AUTO, revocation_enabled, CTLFLAG_RW, + &mac_biba_revocation_enabled, 0, "Revoke access to objects on relabel"); +TUNABLE_INT("security.mac.biba.revocation_enabled", + &mac_biba_revocation_enabled); + static int mac_biba_slot; #define SLOT(l) ((struct mac_biba *)LABEL_TO_SLOT((l), mac_biba_slot).l_ptr) @@ -1837,8 +1843,8 @@ struct mac_biba *subj, *obj; vm_prot_t prot = 0; - if (!mac_biba_enabled) - return (0); + if (!mac_biba_enabled || !mac_biba_revocation_enabled) + return (VM_PROT_ALL); subj = SLOT(&cred->cr_label); obj = SLOT(label); @@ -1850,6 +1856,37 @@ return (prot); } +static int +mac_biba_cred_check_vnode_op(struct ucred *cred, struct vnode *vp, + struct label *label, int op) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled || !mac_biba_revocation_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + switch (op) { + case MAC_OP_VNODE_POLL: + case MAC_OP_VNODE_READ: + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + return (0); + + case MAC_OP_VNODE_WRITE: + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + return (0); + + default: + printf("mac_biba_cred_check_vnode_op: unknown operation %d\n", + op); + return (EINVAL); + } +} + static struct mac_policy_op_entry mac_biba_ops[] = { { MAC_DESTROY, @@ -2048,6 +2085,8 @@ (macop_t)mac_biba_socket_check_receive_mbuf }, { MAC_CRED_CHECK_VNODE_MMAP_PERMS, (macop_t)mac_biba_cred_check_vnode_mmap_perms }, + { MAC_CRED_CHECK_VNODE_OP, + (macop_t)mac_biba_cred_check_vnode_op }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#54 (text+ko) ==== @@ -87,6 +87,12 @@ SYSCTL_INT(_security_mac_mls, OID_AUTO, destroyed_not_inited, CTLFLAG_RD, &destroyed_not_inited, 0, "Count of labels destroyed but not inited"); +static int mac_mls_revocation_enabled = 0; +SYSCTL_INT(_security_mac_mls, OID_AUTO, revocation_enabled, CTLFLAG_RW, + &revocation_enabled, 0, "Revoke access to objects on relabel"); +TUNABLE_INT("security.mac.mls.revocation_enabled", + &mac_mls_revocation_enabled); + static int mac_mls_slot; #define SLOT(l) ((struct mac_mls *)LABEL_TO_SLOT((l), mac_mls_slot).l_ptr) @@ -1776,8 +1782,8 @@ struct mac_mls *subj, *obj; vm_prot_t prot = 0; - if (!mac_mls_enabled) - return (0); + if (!mac_mls_enabled || !mac_mls_revocation_enabled) + return (VM_PROT_ALL); subj = SLOT(&cred->cr_label); obj = SLOT(label); @@ -1789,6 +1795,37 @@ return (prot); } +static int +mac_mls_cred_check_vnode_op(struct ucred *cred, struct vnode *vp, + struct label *label, int op) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled || !mac_mls_revocation_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + switch (op) { + case MAC_OP_VNODE_POLL: + case MAC_OP_VNODE_READ: + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + return (0); + + case MAC_OP_VNODE_WRITE: + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + return (0); + + default: + printf("mac_mls_cred_check_vnode_op: unknown operation %d\n", + op); + return (EINVAL); + } +} + static struct mac_policy_op_entry mac_mls_ops[] = { { MAC_DESTROY, @@ -1987,6 +2024,8 @@ (macop_t)mac_mls_socket_check_receive_mbuf }, { MAC_CRED_CHECK_VNODE_MMAP_PERMS, (macop_t)mac_mls_cred_check_vnode_mmap_perms }, + { MAC_CRED_CHECK_VNODE_OP, + (macop_t)mac_mls_cred_check_vnode_op }, { MAC_OP_LAST, NULL } }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 7:32:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A001B37B401; Wed, 24 Jul 2002 07:32:19 -0700 (PDT) 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 3FEFD37B400 for ; Wed, 24 Jul 2002 07:32:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F227143E42 for ; Wed, 24 Jul 2002 07:32:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6OEWIJU029005 for ; Wed, 24 Jul 2002 07:32:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6OEWIdx029002 for perforce@freebsd.org; Wed, 24 Jul 2002 07:32:18 -0700 (PDT) Date: Wed, 24 Jul 2002 07:32:18 -0700 (PDT) Message-Id: <200207241432.g6OEWIdx029002@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14836 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14836 Change 14836 by rwatson@rwatson_paprika on 2002/07/24 07:31:54 Oops, I renamed the variable after testing and missed an instance. The perils of losing track of what you're doing because the connection went down. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#55 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#55 (text+ko) ==== @@ -89,7 +89,7 @@ static int mac_mls_revocation_enabled = 0; SYSCTL_INT(_security_mac_mls, OID_AUTO, revocation_enabled, CTLFLAG_RW, - &revocation_enabled, 0, "Revoke access to objects on relabel"); + &mac_mls_revocation_enabled, 0, "Revoke access to objects on relabel"); TUNABLE_INT("security.mac.mls.revocation_enabled", &mac_mls_revocation_enabled); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 7:34:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E547537B401; Wed, 24 Jul 2002 07:34:22 -0700 (PDT) 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 8009537B400 for ; Wed, 24 Jul 2002 07:34:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0733D43E3B for ; Wed, 24 Jul 2002 07:34:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6OEYLJU029181 for ; Wed, 24 Jul 2002 07:34:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6OEYLop029176 for perforce@freebsd.org; Wed, 24 Jul 2002 07:34:21 -0700 (PDT) Date: Wed, 24 Jul 2002 07:34:21 -0700 (PDT) Message-Id: <200207241434.g6OEYLop029176@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14837 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14837 Change 14837 by rwatson@rwatson_paprika on 2002/07/24 07:33:58 Do include now that vm_prot_t is required. Re-spell revocation. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#48 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#48 (text+ko) ==== @@ -67,6 +67,8 @@ #include +#include + SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, te, CTLFLAG_RW, 0, @@ -1511,7 +1513,7 @@ struct mac_te *subj, *obj; vm_prot_t prot = 0; - if (!mac_biba_revocation_enabled) + if (!mac_te_revocation_enabled) return (VM_PROT_ALL); subj = SLOT(&cred->cr_label); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 7:35:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7820737B401; Wed, 24 Jul 2002 07:35:24 -0700 (PDT) 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 16AB537B400 for ; Wed, 24 Jul 2002 07:35:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9FC343E31 for ; Wed, 24 Jul 2002 07:35:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6OEZNJU029369 for ; Wed, 24 Jul 2002 07:35:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6OEZNT5029366 for perforce@freebsd.org; Wed, 24 Jul 2002 07:35:23 -0700 (PDT) Date: Wed, 24 Jul 2002 07:35:23 -0700 (PDT) Message-Id: <200207241435.g6OEZNT5029366@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14838 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14838 Change 14838 by rwatson@rwatson_paprika on 2002/07/24 07:34:26 Re-spell check. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#49 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#49 (text+ko) ==== @@ -1741,7 +1741,7 @@ { MAC_CRED_CHECK_SCHED_PROC, (macop_t)mac_te_cred_check_sched_proc }, { MAC_CRED_CHECK_SIGNAL_PROC, (macop_t)mac_te_cred_check_signal_proc }, { MAC_CRED_CHECK_STAT_VNODE, (macop_t)mac_te_cred_check_stat_vnode }, - { MAC_CRED_CHEKC_VNODE_MMAP_PERMS, + { MAC_CRED_CHECK_VNODE_MMAP_PERMS, (macop_t)mac_te_cred_check_mmap_perms }, { MAC_CRED_CHECK_VNODE_OP, (macop_t)mac_te_cred_check_vnode_op }, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 8:38:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B83D37B400; Wed, 24 Jul 2002 08:38:46 -0700 (PDT) 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 1268E37B401 for ; Wed, 24 Jul 2002 08:38:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92AB343E3B for ; Wed, 24 Jul 2002 08:38:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6OFcjJU040033 for ; Wed, 24 Jul 2002 08:38:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6OFcj1k040030 for perforce@freebsd.org; Wed, 24 Jul 2002 08:38:45 -0700 (PDT) Date: Wed, 24 Jul 2002 08:38:45 -0700 (PDT) Message-Id: <200207241538.g6OFcj1k040030@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14842 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14842 Change 14842 by rwatson@rwatson_paprika on 2002/07/24 08:38:04 If you lock a vnode, please be sure to unlock it. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#27 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#27 (text+ko) ==== @@ -790,6 +790,7 @@ #ifdef MAC vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); error = mac_cred_check_vnode_op(cred, vp, MAC_OP_VNODE_POLL); + VOP_UNLOCK(vp, 0, td); if (error) return (error); #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 8:55:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D51B37B407; Wed, 24 Jul 2002 08:55:31 -0700 (PDT) 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 A994337B405 for ; Wed, 24 Jul 2002 08:55:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6885643E70 for ; Wed, 24 Jul 2002 08:55:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6OFtTJU041829 for ; Wed, 24 Jul 2002 08:55:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6OFtTTK041826 for perforce@freebsd.org; Wed, 24 Jul 2002 08:55:29 -0700 (PDT) Date: Wed, 24 Jul 2002 08:55:29 -0700 (PDT) Message-Id: <200207241555.g6OFtTTK041826@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14844 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14844 Change 14844 by rwatson@rwatson_tislabs on 2002/07/24 08:54:31 Re-definition of M_ACL is no longer required due to #include re-ordering. Affected files ... .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#41 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#41 (text+ko) ==== @@ -84,10 +84,6 @@ #include #endif -#ifdef MALLOC_DECLARE -MALLOC_DECLARE(M_ACL); -#endif - static int ufs_access(struct vop_access_args *); static int ufs_advlock(struct vop_advlock_args *); static int ufs_chmod(struct vnode *, int, struct ucred *, struct thread *); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 8:58: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E46937B401; Wed, 24 Jul 2002 08:57:33 -0700 (PDT) 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 27A4D37B400 for ; Wed, 24 Jul 2002 08:57:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4B4843E42 for ; Wed, 24 Jul 2002 08:57:32 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6OFvWJU041986 for ; Wed, 24 Jul 2002 08:57:32 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6OFvW1S041983 for perforce@freebsd.org; Wed, 24 Jul 2002 08:57:32 -0700 (PDT) Date: Wed, 24 Jul 2002 08:57:32 -0700 (PDT) Message-Id: <200207241557.g6OFvW1S041983@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14845 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14845 Change 14845 by green@green_laptop_2 on 2002/07/24 08:56:44 Add an "int newmapping" argument to MAC_CRED_CHECK_MMAP_VNODE_PERMS. Use vm_prot_t instead of u_char in mac_policy.h, and include vm/vm.h in places where sys/mac_policy.h is included. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#193 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#68 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#43 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#9 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#56 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#45 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#5 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#10 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#50 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#15 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#3 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#14 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#121 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#86 edit .. //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#193 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include #include @@ -70,6 +69,8 @@ #include #include +#include + #include #include @@ -145,6 +146,10 @@ static int mac_vnode_label_cache_misses = 0; SYSCTL_INT(_security_mac, OID_AUTO, vnode_label_cache_misses, CTLFLAG_RD, &mac_vnode_label_cache_misses, 0, "Cache misses on vnode labels"); +static int mac_mmap_revocation_via_cow = 1; +SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation_via_cow, CTLFLAG_RW, + &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " + "copy-on-write semantics, or by removing all write access"); static int error_select(int error1, int error2); static int mac_externalize(struct label *label, struct mac *mac); @@ -330,13 +335,8 @@ if (object->type != OBJT_VNODE) continue; vp = (struct vnode *)object->handle; - result = VM_PROT_ALL; - /* - * This should be some sort of MAC_BITWISE, maybe :) - */ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - MAC_BOOLEAN(cred_check_vnode_mmap_perms, &, cred, - vp, &vp->v_label); + result = mac_cred_check_mmap_vnode_prot(cred, vp, 0); VOP_UNLOCK(vp, 0, td); /* * Find out what maximum protection we may be allowing @@ -377,11 +377,14 @@ vm_object_deallocate(object); /* * Why bother if there's no read permissions - * anymore? For the rest of it, we need to - * leave the write permissions on for COW - * to happen. + * anymore? For the rest, we need to leave + * the write permissions on for COW, or + * remove them entirely if configured to. */ - if ((revokeperms & VM_PROT_READ) == 0) + if (!mac_mmap_revocation_via_cow) { + vme->max_protection &= ~VM_PROT_WRITE; + vme->protection &= ~VM_PROT_WRITE; + } if ((revokeperms & VM_PROT_READ) == 0) vme->eflags |= MAP_ENTRY_COW | MAP_ENTRY_NEEDS_COPY; } @@ -1864,6 +1867,21 @@ return (error); } +vm_prot_t +mac_cred_check_mmap_vnode_prot(struct ucred *cred, struct vnode *vp, + int newmapping) +{ + vm_prot_t result = VM_PROT_ALL; + + /* + * This should be some sort of MAC_BITWISE, maybe :) + */ + ASSERT_VOP_LOCKED(vp, "mac_cred_check_mmap_vnode_perms"); + MAC_BOOLEAN(cred_check_vnode_mmap_perms, &, cred, vp, &vp->v_label, + newmapping); + return (result); +} + int mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode) { ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#68 (text+ko) ==== @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -72,6 +71,8 @@ #include +#include + #include SYSCTL_DECL(_security_mac); @@ -1836,14 +1837,14 @@ return (mac_biba_equal_single(p, s) ? 0 : EACCES); } -static int +static vm_prot_t mac_biba_cred_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, - struct label *label) + struct label *label, int newmapping) { struct mac_biba *subj, *obj; vm_prot_t prot = 0; - if (!mac_biba_enabled || !mac_biba_revocation_enabled) + if (!mac_biba_enabled || (!mac_biba_revocation_enabled && !newmapping)) return (VM_PROT_ALL); subj = SLOT(&cred->cr_label); ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#43 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include #include @@ -68,6 +67,10 @@ #include #include +#include + +#include + #include SYSCTL_DECL(_security_mac); ==== //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#9 (text+ko) ==== @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include @@ -66,6 +65,10 @@ #include #include +#include + +#include + SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, ifoff, CTLFLAG_RW, 0, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#56 (text+ko) ==== @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -72,6 +71,8 @@ #include +#include + #include SYSCTL_DECL(_security_mac); @@ -1775,14 +1776,14 @@ return (mac_mls_equal_single(p, s) ? 0 : EACCES); } -static int +static vm_prot_t mac_mls_cred_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, - struct label *label) + struct label *label, int newmapping) { struct mac_mls *subj, *obj; vm_prot_t prot = 0; - if (!mac_mls_enabled || !mac_mls_revocation_enabled) + if (!mac_mls_enabled || (!mac_mls_revocation_enabled && !newmapping)) return (VM_PROT_ALL); subj = SLOT(&cred->cr_label); ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#45 (text+ko) ==== @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -70,6 +69,10 @@ #include #include +#include + +#include + SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, none, CTLFLAG_RW, 0, ==== //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#5 (text+ko) ==== @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -66,6 +65,10 @@ #include #include +#include + +#include + SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, partition, CTLFLAG_RW, 0, ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#10 (text+ko) ==== @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -65,6 +64,10 @@ #include #include +#include + +#include + SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, seeotheruids, CTLFLAG_RW, 0, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#50 (text+ko) ==== @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -65,6 +64,10 @@ #include #include +#include + +#include + #include #include @@ -1506,14 +1509,14 @@ return (error); } -static int -mac_te_cred_check_mmap_perms(struct ucred *cred, struct vnode *vp, - struct label *label) +static vm_prot_t +mac_te_cred_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, + struct label *label, int newmapping) { struct mac_te *subj, *obj; vm_prot_t prot = 0; - if (!mac_te_revocation_enabled) + if (!mac_te_enabled || (!mac_te_revocation_enabled && !newmapping)) return (VM_PROT_ALL); subj = SLOT(&cred->cr_label); @@ -1742,7 +1745,7 @@ { MAC_CRED_CHECK_SIGNAL_PROC, (macop_t)mac_te_cred_check_signal_proc }, { MAC_CRED_CHECK_STAT_VNODE, (macop_t)mac_te_cred_check_stat_vnode }, { MAC_CRED_CHECK_VNODE_MMAP_PERMS, - (macop_t)mac_te_cred_check_mmap_perms }, + (macop_t)mac_te_cred_check_vnode_mmap_perms }, { MAC_CRED_CHECK_VNODE_OP, (macop_t)mac_te_cred_check_vnode_op }, { MAC_IFNET_CHECK_SEND_MBUF, (macop_t)mac_te_ifnet_check_send_mbuf }, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#15 (text+ko) ==== @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -67,6 +66,10 @@ #include #include +#include + +#include + SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, test, CTLFLAG_RW, 0, ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#3 (text+ko) ==== @@ -25,6 +25,9 @@ #include #include #include + +#include + #include #include ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#14 (text+ko) ==== @@ -47,6 +47,9 @@ #include #include #include + +#include + #include #include ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#121 (text+ko) ==== @@ -286,6 +286,9 @@ struct vnode *vp, struct componentname *cnp); int mac_cred_check_rename_to_vnode(struct ucred *cred, struct vnode *dvp, struct vnode *vp, int samedir, struct componentname *cnp); +/* XXX This u_char should be vm_prot_t! */ +u_char mac_cred_check_mmap_vnode_prot(struct ucred *cred, struct vnode *vp, + int newmapping); int mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode); int mac_cred_check_readdir_vnode(struct ucred *cred, struct vnode *vp); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#86 (text+ko) ==== @@ -313,9 +313,8 @@ struct proc *proc, int signum); int (*mpo_cred_check_stat_vnode)(struct ucred *cred, struct vnode *vp, struct label *label); - /* XXX should be vm_prot_t, not u_char directly */ - u_char (*mpo_cred_check_vnode_mmap_perms)(struct ucred *cred, - struct vnode *vp, struct label *label); + vm_prot_t (*mpo_cred_check_vnode_mmap_perms)(struct ucred *cred, + struct vnode *vp, struct label *label, int newmapping); int (*mpo_cred_check_vnode_op)(struct ucred *cred, struct vnode *vp, struct label *label, int op); int (*mpo_ifnet_check_send_mbuf)(struct ifnet *ifnet, ==== //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#9 (text+ko) ==== @@ -46,6 +46,7 @@ */ #include "opt_compat.h" +#include "opt_mac.h" #include #include @@ -60,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -421,6 +423,24 @@ } mtx_unlock(&Giant); +#ifdef MAC + if (handle != NULL) { + if (flags & MAP_SHARED) { + vm_prot_t macmaxprot; + + macmaxprot = mac_cred_check_mmap_vnode_prot( + td->td_ucred, (struct vnode *)handle, 1); + if ((maxprot & macmaxprot) != maxprot) { + error = EPERM; + goto done; + } + } + /* + * XXX Policies (e.g. LOMAC) should possibly check for a read + * operation here. + */ + } +#endif /* MAC */ error = vm_mmap(&vms->vm_map, &addr, size, prot, maxprot, flags, handle, pos); if (error == 0) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 11:42:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE97E37B401; Wed, 24 Jul 2002 11:41:07 -0700 (PDT) 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 7254437B400 for ; Wed, 24 Jul 2002 11:41:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B234B43E67 for ; Wed, 24 Jul 2002 11:41:06 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6OIf6JU069480 for ; Wed, 24 Jul 2002 11:41:06 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6OIf6jx069460 for perforce@freebsd.org; Wed, 24 Jul 2002 11:41:06 -0700 (PDT) Date: Wed, 24 Jul 2002 11:41:06 -0700 (PDT) Message-Id: <200207241841.g6OIf6jx069460@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 14853 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14853 Change 14853 by amigus@amigus_ganymede on 2002/07/24 11:41:05 Integ from my pipe's branch. Appears to work. Comments welcome. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#194 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#26 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#69 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#57 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#122 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#87 integrate .. //depot/projects/trustedbsd/mac/sys/sys/pipe.h#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#194 (text+ko) ==== @@ -60,6 +60,7 @@ #include #include #include +#include #include #include #include @@ -130,6 +131,10 @@ &mac_enforce_socket, 0, "Enforce MAC policy on socket operations"); TUNABLE_INT("security.mac.enforce_socket", &mac_enforce_socket); +static int mac_enforce_pipe = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_pipe, CTLFLAG_RW, + &mac_enforce_pipe, 0, "Enforce MAC policy on pipe operations"); + static int mac_label_size = sizeof(struct mac); SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size"); @@ -249,6 +254,7 @@ MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); MALLOC_DEFINE(M_TMPLABEL, "tmplabel", "temporary user-label copied storage"); +MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); const size_t maxlabelsize = 65536; /* @@ -545,6 +551,9 @@ mpc->mpc_ops->mpo_create_mbuf_from_socket = mpe->mpe_function; break; + case MAC_CREATE_PIPE: + mpc->mpc_ops->mpo_create_pipe = mpe->mpe_function; + break; case MAC_CREATE_SOCKET: mpc->mpc_ops->mpo_create_socket = mpe->mpe_function; break; @@ -552,6 +561,9 @@ mpc->mpc_ops->mpo_create_socket_from_socket = mpe->mpe_function; break; + case MAC_RELABEL_PIPE: + mpc->mpc_ops->mpo_relabel_pipe = mpe->mpe_function; + break; case MAC_RELABEL_SOCKET: mpc->mpc_ops->mpo_relabel_socket = mpe->mpe_function; break; @@ -662,6 +674,10 @@ mpc->mpc_ops->mpo_cred_check_relabel_ifnet = mpe->mpe_function; break; + case MAC_CRED_CHECK_RELABEL_PIPE: + mpc->mpc_ops->mpo_cred_check_relabel_pipe = + mpe->mpe_function; + break; case MAC_CRED_CHECK_RELABEL_SOCKET: mpc->mpc_ops->mpo_cred_check_relabel_socket = mpe->mpe_function; @@ -793,6 +809,14 @@ mpc->mpc_ops->mpo_cred_check_vnode_op = mpe->mpe_function; break; + case MAC_CRED_CHECK_PIPE_IOCTL: + mpc->mpc_ops->mpo_cred_check_pipe_ioctl = + mpe->mpe_function; + break; + case MAC_CRED_CHECK_PIPE_OP: + mpc->mpc_ops->mpo_cred_check_pipe_op = + mpe->mpe_function; + break; case MAC_IFNET_CHECK_SEND_MBUF: mpc->mpc_ops->mpo_ifnet_check_send_mbuf = mpe->mpe_function; @@ -825,6 +849,10 @@ mpc->mpc_ops->mpo_init_mount = mpe->mpe_function; break; + case MAC_INIT_PIPE: + mpc->mpc_ops->mpo_init_pipe = + mpe->mpe_function; + break; case MAC_INIT_SOCKET: mpc->mpc_ops->mpo_init_socket = mpe->mpe_function; @@ -865,6 +893,10 @@ mpc->mpc_ops->mpo_destroy_mount = mpe->mpe_function; break; + case MAC_DESTROY_PIPE: + mpc->mpc_ops->mpo_destroy_pipe = + mpe->mpe_function; + break; case MAC_DESTROY_SOCKET: mpc->mpc_ops->mpo_destroy_socket = mpe->mpe_function; @@ -1399,7 +1431,7 @@ static unsigned int nmacmbufs, nmacsubjects, nmacifnets, nmacbpfdescs, nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, - nmacipqs; + nmacipqs, nmacpipes; SYSCTL_UINT(_security_mac_debug, OID_AUTO, mbufs, CTLFLAG_RD, &nmacmbufs, 0, "number of mbufs in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, subjects, CTLFLAG_RD, @@ -1412,6 +1444,8 @@ &nmacbpfdescs, 0, "number of bpfdescs in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, sockets, CTLFLAG_RD, &nmacsockets, 0, "number of sockets in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, pipes, CTLFLAG_RD, + &nmacpipes, 0, "number of pipes in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, mounts, CTLFLAG_RD, &nmacmounts, 0, "number of mounts in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, temp, CTLFLAG_RD, @@ -1519,6 +1553,29 @@ } void +mac_init_pipe(struct pipe *pipe) +{ + struct label *label; + + label = malloc(sizeof(struct label), M_MACPIPELABEL, M_ZERO|M_WAITOK); + mac_init_label(label); + pipe->pipe_label = label; + pipe->pipe_peer->pipe_label = label; + MAC_PERFORM(init_pipe, pipe, pipe->pipe_label); + atomic_add_int(&nmacpipes, 1); +} + +void +mac_destroy_pipe(struct pipe *pipe) +{ + + MAC_PERFORM(destroy_pipe, pipe, pipe->pipe_label); + mac_destroy_label(pipe->pipe_label); + free(pipe->pipe_label, M_MACPIPELABEL); + atomic_subtract_int(&nmacpipes, 1); +} + +void mac_init_bpfdesc(struct bpf_d *bpf_d) { @@ -2223,6 +2280,13 @@ } void +mac_create_pipe(struct ucred *cred, struct pipe *pipe) +{ + + MAC_PERFORM(create_pipe, cred, pipe, pipe->pipe_label); +} + +void mac_create_socket_from_socket(struct socket *oldsocket, struct socket *newsocket) { @@ -2239,6 +2303,13 @@ MAC_PERFORM(relabel_socket, cred, socket, &socket->so_label, newlabel); } +static void +mac_relabel_pipe(struct ucred *cred, struct pipe *pipe, struct label *newlabel) +{ + + MAC_PERFORM(relabel_pipe, cred, pipe, pipe->pipe_label, newlabel); +} + void mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct socket *socket) { @@ -2370,6 +2441,40 @@ return (error); } +static int +mac_cred_check_relabel_pipe(struct ucred *cred, struct pipe *pipe, + struct label *newlabel) +{ + int error; + + MAC_CHECK(cred_check_relabel_pipe, cred, pipe, pipe->pipe_label, + newlabel); + + return (error); +} + +int +mac_cred_check_pipe_op(struct ucred *cred, struct pipe *pipe, int op) +{ + int error; + + MAC_CHECK(cred_check_pipe_op, cred, pipe, pipe->pipe_label, op); + + return (error); +} + +int +mac_cred_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, + unsigned long cmd, void *data) +{ + int error; + + MAC_CHECK(cred_check_pipe_ioctl, cred, pipe, pipe->pipe_label, + cmd, data); + + return (error); +} + void mac_create_mount(struct ucred *cred, struct mount *mp) { @@ -2637,6 +2742,20 @@ } int +mac_pipe_label_set(struct ucred *cred, struct pipe *pipe, struct label *label) +{ + int error; + + error = mac_cred_check_relabel_pipe(cred, pipe, label); + if (error) + return (error); + + mac_relabel_pipe(cred, pipe, label); + + return (0); +} + +int mac_getsockopt_label_get(struct ucred *cred, struct socket *so, struct mac *extmac) { @@ -2808,6 +2927,7 @@ struct file *fp; struct mac extmac; struct vnode *vp; + struct pipe *pipe; int error; mtx_lock(&Giant); @@ -2827,7 +2947,10 @@ error = mac_externalize(&vp->v_label, &extmac); VOP_UNLOCK(vp, 0, td); break; - + case DTYPE_PIPE: + pipe = (struct pipe *)fp->f_data; + error = mac_externalize(pipe->pipe_label, &extmac); + break; default: error = EINVAL; } @@ -2884,6 +3007,7 @@ struct label intlabel; struct mount *mp; struct vnode *vp; + struct pipe *pipe; int error; mtx_lock(&Giant); @@ -2911,13 +3035,16 @@ error = vn_setlabel(vp, &intlabel, td->td_ucred); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); + mac_destroy_temp(&intlabel); + break; + case DTYPE_PIPE: + pipe = (struct pipe *)fp->f_data; + error = mac_pipe_label_set(td->td_ucred, pipe, &intlabel); break; - default: error = EINVAL; } - mac_destroy_temp(&intlabel); out2: fdrop(fp, td); out1: ==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#12 (text+ko) ==== @@ -49,9 +49,12 @@ * amount of kernel virtual memory. */ +#include "opt_mac.h" + #include #include #include +#include #include #include #include @@ -266,6 +269,16 @@ td->td_retval[1] = fd; rpipe->pipe_peer = wpipe; wpipe->pipe_peer = rpipe; +#ifdef MAC + /* + * struct pipe represents a pipe endpoint. The MAC label is shared + * between connected endpoints. As a result mac_init_pipe() and + * mac_create_pipe() should only be called on one of the endpoints + * after they have been connected. + */ + mac_init_pipe(rpipe); + mac_create_pipe(td->td_ucred, rpipe); +#endif /* MAC */ mtx_init(pmtx, "pipe mutex", NULL, MTX_DEF | MTX_RECURSE); rpipe->pipe_mtxp = wpipe->pipe_mtxp = pmtx; fdrop(rf, td); @@ -454,6 +467,12 @@ if (error) goto unlocked_error; +#ifdef MAC + error = mac_cred_check_pipe_op(cred, rpipe, MAC_OP_PIPE_READ); + if (error) + goto locked_error; +#endif /* MAC */ + while (uio->uio_resid) { /* * normal pipe buffer receive @@ -559,6 +578,9 @@ goto unlocked_error; } } +#ifdef MAC /* XXX: suppress compiler warning. */ +locked_error: +#endif /* MAC */ pipeunlock(rpipe); /* XXX: should probably do this before getting any locks. */ @@ -850,6 +872,13 @@ PIPE_UNLOCK(rpipe); return (EPIPE); } +#ifdef MAC + error = mac_cred_check_pipe_op(cred, wpipe, MAC_OP_PIPE_WRITE); + if (error) { + PIPE_UNLOCK(rpipe); + return (error); + } +#endif /* MAC */ ++wpipe->pipe_busy; /* @@ -1121,7 +1150,13 @@ struct thread *td; { struct pipe *mpipe = (struct pipe *)fp->f_data; +#ifdef MAC + int error; + error = mac_cred_check_pipe_ioctl(td->td_ucred, mpipe, cmd, data); + if (error) + return (error); +#endif /* MAC */ switch (cmd) { case FIONBIO: @@ -1176,7 +1211,13 @@ struct pipe *rpipe = (struct pipe *)fp->f_data; struct pipe *wpipe; int revents = 0; +#ifdef MAC + int error; + error = mac_cred_check_pipe_op(td->td_ucred, rpipe, MAC_OP_PIPE_POLL); + if (error) + return (error); +#endif /* MAC */ wpipe = rpipe->pipe_peer; PIPE_LOCK(rpipe); if (events & (POLLIN | POLLRDNORM)) @@ -1223,7 +1264,13 @@ struct thread *td; { struct pipe *pipe = (struct pipe *)fp->f_data; +#ifdef MAC + int error; + error = mac_cred_check_pipe_op(td->td_ucred, pipe, MAC_OP_PIPE_STAT); + if (error) + return (error); +#endif /* MAC */ bzero((caddr_t)ub, sizeof(*ub)); ub->st_mode = S_IFIFO; ub->st_blksize = pipe->pipe_buffer.size; @@ -1318,6 +1365,13 @@ cpipe->pipe_state |= PIPE_WANT | PIPE_EOF; msleep(cpipe, PIPE_MTX(cpipe), PRIBIO, "pipecl", 0); } +#ifdef MAC + /* + * Destroy MAC data + */ + if (cpipe->pipe_peer) + mac_destroy_pipe(cpipe); +#endif /* MAC */ /* * Disconnect from peer ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#26 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#69 (text+ko) ==== @@ -57,6 +57,7 @@ #include #include #include +#include #include #include @@ -455,6 +456,13 @@ } static void +mac_biba_init_pipe(struct pipe *pipe, struct label *label) +{ + + SLOT(label) = biba_alloc(M_WAITOK); +} + +static void mac_biba_init_subject(struct ucred *ucred, struct label *label) { @@ -539,6 +547,14 @@ } static void +mac_biba_destroy_pipe(struct pipe *pipe, struct label *label) +{ + + biba_free(SLOT(label)); + SLOT(label) = NULL; +} + +static void mac_biba_destroy_subject(struct ucred *ucred, struct label *label) { @@ -781,6 +797,18 @@ } static void +mac_biba_create_pipe(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + struct mac_biba *source, *dest; + + source = SLOT(&cred->cr_label); + dest = SLOT(pipelabel); + + mac_biba_copy_single(source, dest); +} + +static void mac_biba_create_socket_from_socket(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel) @@ -808,6 +836,18 @@ } static void +mac_biba_relabel_pipe(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, struct label *newlabel) +{ + struct mac_biba *source, *dest; + + source = SLOT(newlabel); + dest = SLOT(pipelabel); + + mac_biba_copy_single(source, dest); +} + +static void mac_biba_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, struct socket *socket, struct label *socketpeerlabel) { @@ -1223,6 +1263,40 @@ } static int +mac_biba_cred_check_relabel_pipe(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, struct label *newlabel) +{ + struct mac_biba *subj, *obj, *new; + + new = SLOT(newlabel); + subj = SLOT(&cred->cr_label); + obj = SLOT(pipelabel); + + if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) + return (EINVAL); + + /* + * To relabel a pipe, the old pipe label must be in the subject + * range. + */ + if (!mac_biba_single_in_range(obj, subj)) + return (EPERM); + + /* + * To relabel a pipe, the new pipe label must be in the subject + * range. + */ + if (!mac_biba_single_in_range(new, subj)) + return (EPERM); + + /* + * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + */ + + return (0); +} + +static int mac_biba_cred_check_relabel_subject(struct ucred *cred, struct label *newlabel) { struct mac_biba *subj, *new; @@ -1888,6 +1962,49 @@ } } +static int +mac_biba_cred_check_pipe_op(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, int op) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((pipelabel)); + + switch(op) { + case MAC_OP_PIPE_READ: + case MAC_OP_PIPE_STAT: + case MAC_OP_PIPE_POLL: + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + break; + case MAC_OP_PIPE_WRITE: + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + break; + default: + panic("mac_biba_cred_check_pipe_op: invalid pipe operation"); + } + + return (0); +} + +static int +mac_biba_cred_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) +{ + + if(!mac_biba_enabled) + return (0); + + /* XXX: This will be implemented soon... */ + + return (0); +} + static struct mac_policy_op_entry mac_biba_ops[] = { { MAC_DESTROY, @@ -1906,6 +2023,8 @@ (macop_t)mac_biba_init_mbuf }, { MAC_INIT_MOUNT, (macop_t)mac_biba_init_mount }, + { MAC_INIT_PIPE, + (macop_t)mac_biba_init_pipe }, { MAC_INIT_SOCKET, (macop_t)mac_biba_init_socket }, { MAC_INIT_SUBJECT, @@ -1926,6 +2045,8 @@ (macop_t)mac_biba_destroy_mbuf }, { MAC_DESTROY_MOUNT, (macop_t)mac_biba_destroy_mount }, + { MAC_DESTROY_PIPE, + (macop_t)mac_biba_destroy_pipe }, { MAC_DESTROY_SOCKET, (macop_t)mac_biba_destroy_socket }, { MAC_DESTROY_SUBJECT, @@ -1962,10 +2083,14 @@ (macop_t)mac_biba_update_vnode_from_mount }, { MAC_CREATE_MBUF_FROM_SOCKET, (macop_t)mac_biba_create_mbuf_from_socket }, + { MAC_CREATE_PIPE, + (macop_t)mac_biba_create_pipe }, { MAC_CREATE_SOCKET, (macop_t)mac_biba_create_socket }, { MAC_CREATE_SOCKET_FROM_SOCKET, (macop_t)mac_biba_create_socket_from_socket }, + { MAC_RELABEL_PIPE, + (macop_t)mac_biba_relabel_pipe }, { MAC_RELABEL_SOCKET, (macop_t)mac_biba_relabel_socket }, { MAC_SET_SOCKET_PEER_FROM_MBUF, @@ -2020,6 +2145,8 @@ (macop_t)mac_biba_cred_check_see_socket }, { MAC_CRED_CHECK_RELABEL_IFNET, (macop_t)mac_biba_cred_check_relabel_ifnet }, + { MAC_CRED_CHECK_RELABEL_PIPE, + (macop_t)mac_biba_cred_check_relabel_pipe }, { MAC_CRED_CHECK_RELABEL_SOCKET, (macop_t)mac_biba_cred_check_relabel_socket }, { MAC_CRED_CHECK_RELABEL_SUBJECT, @@ -2052,6 +2179,10 @@ (macop_t)mac_biba_cred_check_lookup_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_biba_cred_check_open_vnode }, + { MAC_CRED_CHECK_PIPE_IOCTL, + (macop_t)mac_biba_cred_check_pipe_ioctl }, + { MAC_CRED_CHECK_PIPE_OP, + (macop_t)mac_biba_cred_check_pipe_op }, { MAC_CRED_CHECK_READDIR_VNODE, (macop_t)mac_biba_cred_check_readdir_vnode }, { MAC_CRED_CHECK_READLINK_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#57 (text+ko) ==== @@ -57,6 +57,7 @@ #include #include #include +#include #include #include @@ -433,6 +434,13 @@ } static void +mac_mls_init_pipe(struct pipe *pipe, struct label *label) +{ + + SLOT(label) = mls_alloc(M_WAITOK); +} + +static void mac_mls_init_subject(struct ucred *ucred, struct label *label) { @@ -517,6 +525,14 @@ } static void +mac_mls_destroy_pipe(struct pipe *pipe, struct label *label) +{ + + mls_free(SLOT(label)); + SLOT(label) = NULL; +} + +static void mac_mls_destroy_subject(struct ucred *ucred, struct label *label) { @@ -762,6 +778,18 @@ } static void +mac_mls_create_pipe(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + struct mac_mls *source, *dest; + + source = SLOT(&cred->cr_label); + dest = SLOT(pipelabel); + + mac_mls_copy_single(source, dest); +} + +static void mac_mls_create_socket_from_socket(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel) @@ -789,6 +817,18 @@ } static void +mac_mls_relabel_pipe(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, struct label *newlabel) +{ + struct mac_mls *source, *dest; + + source = SLOT(newlabel); + dest = SLOT(pipelabel); + + mac_mls_copy_single(source, dest); +} + +static void mac_mls_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, struct socket *socket, struct label *socketpeerlabel) { @@ -1162,6 +1202,40 @@ } static int +mac_mls_cred_check_relabel_pipe(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, struct label *newlabel) +{ + struct mac_mls *subj, *obj, *new; + + new = SLOT(newlabel); + subj = SLOT(&cred->cr_label); + obj = SLOT(pipelabel); + + if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAG_SINGLE) + return (EINVAL); + + /* + * To relabel a pipe, the old pipe label must be in the subject + * range. + */ + if (!mac_mls_single_in_range(obj, subj)) + return (EPERM); + + /* + * To relabel a pipe, the new pipe label must be in the subject + * range. + */ + if (!mac_mls_single_in_range(new, subj)) + return (EPERM); + + /* + * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + */ + + return (0); +} + +static int mac_mls_cred_check_relabel_subject(struct ucred *cred, struct label *newlabel) { struct mac_mls *subj, *new; @@ -1827,6 +1901,49 @@ } } +static int +mac_mls_cred_check_pipe_op(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, int op) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((pipelabel)); + + switch(op) { + case MAC_OP_PIPE_READ: + case MAC_OP_PIPE_STAT: + case MAC_OP_PIPE_POLL: + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + break; + case MAC_OP_PIPE_WRITE: + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + break; + default: + panic("mac_mls_cred_check_pipe_op: invalid pipe operation"); + } + + return (0); +} + +static int +mac_mls_cred_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) +{ + + if(!mac_mls_enabled) + return (0); + + /* XXX: This will be implemented soon... */ + + return (0); +} + static struct mac_policy_op_entry mac_mls_ops[] = { { MAC_DESTROY, @@ -1845,6 +1962,8 @@ (macop_t)mac_mls_init_mbuf }, { MAC_INIT_MOUNT, (macop_t)mac_mls_init_mount }, + { MAC_INIT_PIPE, + (macop_t)mac_mls_init_pipe }, { MAC_INIT_SOCKET, (macop_t)mac_mls_init_socket }, { MAC_INIT_SUBJECT, @@ -1865,6 +1984,8 @@ (macop_t)mac_mls_destroy_mbuf }, { MAC_DESTROY_MOUNT, (macop_t)mac_mls_destroy_mount }, + { MAC_DESTROY_PIPE, + (macop_t)mac_mls_destroy_pipe }, { MAC_DESTROY_SOCKET, (macop_t)mac_mls_destroy_socket }, { MAC_DESTROY_SUBJECT, @@ -1901,10 +2022,14 @@ (macop_t)mac_mls_update_vnode_from_mount }, { MAC_CREATE_MBUF_FROM_SOCKET, (macop_t)mac_mls_create_mbuf_from_socket }, + { MAC_CREATE_PIPE, + (macop_t)mac_mls_create_pipe }, { MAC_CREATE_SOCKET, (macop_t)mac_mls_create_socket }, { MAC_CREATE_SOCKET_FROM_SOCKET, (macop_t)mac_mls_create_socket_from_socket }, + { MAC_RELABEL_PIPE, + (macop_t)mac_mls_relabel_pipe }, { MAC_RELABEL_SOCKET, (macop_t)mac_mls_relabel_socket }, { MAC_SET_SOCKET_PEER_FROM_MBUF, @@ -1959,6 +2084,8 @@ (macop_t)mac_mls_cred_check_see_socket }, { MAC_CRED_CHECK_RELABEL_IFNET, (macop_t)mac_mls_cred_check_relabel_ifnet }, + { MAC_CRED_CHECK_RELABEL_PIPE, + (macop_t)mac_mls_cred_check_relabel_pipe }, { MAC_CRED_CHECK_RELABEL_SOCKET, (macop_t)mac_mls_cred_check_relabel_socket }, { MAC_CRED_CHECK_RELABEL_SUBJECT, @@ -1991,6 +2118,10 @@ (macop_t)mac_mls_cred_check_lookup_vnode }, { MAC_CRED_CHECK_OPEN_VNODE, (macop_t)mac_mls_cred_check_open_vnode }, + { MAC_CRED_CHECK_PIPE_IOCTL, + (macop_t)mac_mls_cred_check_pipe_ioctl }, + { MAC_CRED_CHECK_PIPE_OP, + (macop_t)mac_mls_cred_check_pipe_op }, { MAC_CRED_CHECK_READDIR_VNODE, (macop_t)mac_mls_cred_check_readdir_vnode }, { MAC_CRED_CHECK_READLINK_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#46 (text+ko) ==== @@ -57,6 +57,7 @@ #include #include #include +#include #include #include @@ -147,6 +148,12 @@ } static void +mac_none_init_pipe(struct pipe *pipe, struct label *label) +{ + +} + +static void mac_none_init_subject(struct ucred *ucred, struct label *label) { @@ -210,6 +217,12 @@ } static void +mac_none_destroy_pipe(struct pipe *pipe, struct label *label) +{ + +} + +static void mac_none_destroy_subject(struct ucred *ucred, struct label *label) { @@ -342,6 +355,13 @@ } static void +mac_none_create_pipe(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + +} + +static void mac_none_create_socket_from_socket(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel) @@ -357,6 +377,13 @@ } static void +mac_none_relabel_pipe(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, struct label *newlabel) +{ + +} + +static void mac_none_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, struct socket *socket, struct label *socketpeerlabel) { @@ -577,6 +604,14 @@ } static int +mac_none_cred_check_relabel_pipe(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, struct label *newlabel) +{ + + return (0); +} + +static int mac_none_cred_check_relabel_subject(struct ucred *cred, struct label *newlabel) { @@ -832,6 +867,22 @@ return (0); } +static int +mac_none_cred_check_pipe_op(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, int op) +{ + + return (0); +} + +static int +mac_none_cred_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) +{ + + return (0); +} + static struct mac_policy_op_entry mac_none_ops[] = { { MAC_DESTROY, @@ -850,6 +901,8 @@ (macop_t)mac_none_init_mbuf }, { MAC_INIT_MOUNT, (macop_t)mac_none_init_mount }, + { MAC_INIT_PIPE, + (macop_t)mac_none_init_pipe }, { MAC_INIT_SOCKET, (macop_t)mac_none_init_socket }, { MAC_INIT_SUBJECT, @@ -870,6 +923,8 @@ (macop_t)mac_none_destroy_mbuf }, { MAC_DESTROY_MOUNT, (macop_t)mac_none_destroy_mount }, + { MAC_DESTROY_PIPE, + (macop_t)mac_none_destroy_pipe }, { MAC_DESTROY_SOCKET, (macop_t)mac_none_destroy_socket }, { MAC_DESTROY_SUBJECT, @@ -906,10 +961,14 @@ (macop_t)mac_none_update_vnode_from_mount }, { MAC_CREATE_MBUF_FROM_SOCKET, (macop_t)mac_none_create_mbuf_from_socket }, >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 13:49:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D4F737B401; Wed, 24 Jul 2002 13:49:50 -0700 (PDT) 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 E426B37B400 for ; Wed, 24 Jul 2002 13:49:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4B4943E70 for ; Wed, 24 Jul 2002 13:49:49 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6OKnnJU091270 for ; Wed, 24 Jul 2002 13:49:49 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6OKnnOT091267 for perforce@freebsd.org; Wed, 24 Jul 2002 13:49:49 -0700 (PDT) Date: Wed, 24 Jul 2002 13:49:49 -0700 (PDT) Message-Id: <200207242049.g6OKnnOT091267@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14863 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14863 Change 14863 by green@green_laptop_2 on 2002/07/24 13:48:51 Change vm_mmap(9) semantics to remove all non-MAC-policy-specified protections from the maximum protections on the mapping and to reject the mapping if the protections requested are not a subset of such protections allowed. Affected files ... .. //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#10 (text+ko) ==== @@ -426,14 +426,25 @@ #ifdef MAC if (handle != NULL) { if (flags & MAP_SHARED) { + /* + * Decrease maximum allowed protection that may be + * used with mprotect(2) later to that which the + * policies might allow "at the moment". This + * should possibly be revoked or limited further + * in mprotect(2). + * + * Make sure that prot is within the scope of + * what policies will allow, or fail immediately. + */ vm_prot_t macmaxprot; macmaxprot = mac_cred_check_mmap_vnode_prot( td->td_ucred, (struct vnode *)handle, 1); - if ((maxprot & macmaxprot) != maxprot) { - error = EPERM; + if ((prot & macmaxprot) != prot) { + error = EACCES; goto done; } + maxprot &= macmaxprot; } /* * XXX Policies (e.g. LOMAC) should possibly check for a read To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 15:33: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E8F737B401; Wed, 24 Jul 2002 15:32:56 -0700 (PDT) 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 06B4D37B400 for ; Wed, 24 Jul 2002 15:32:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A456043E6A for ; Wed, 24 Jul 2002 15:32:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6OMWtJU010421 for ; Wed, 24 Jul 2002 15:32:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6OMWtMs010418 for perforce@freebsd.org; Wed, 24 Jul 2002 15:32:55 -0700 (PDT) Date: Wed, 24 Jul 2002 15:32:55 -0700 (PDT) Message-Id: <200207242232.g6OMWtMs010418@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14867 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14867 Change 14867 by rwatson@rwatson_tislabs on 2002/07/24 15:32:07 Change the default label to make it more useful for experimentation. Affected files ... .. //depot/projects/trustedbsd/mac/etc/login.conf#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/login.conf#13 (text+ko) ==== @@ -38,7 +38,7 @@ :priority=0:\ :ignoretime@:\ :umask=022:\ - :label=biba/high(high-high),mls/low(low-low),te/default_d:\ + :label=biba/high(low-high),mls/low(low-high),te/default_d:\ :ttylabel=biba/high,mls/low,te/device_t: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 17:26:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CAD837B401; Wed, 24 Jul 2002 17:25:16 -0700 (PDT) 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 EF3B237B400 for ; Wed, 24 Jul 2002 17:25:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0041E43E72 for ; Wed, 24 Jul 2002 17:25:14 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6P0PEJU027574 for ; Wed, 24 Jul 2002 17:25:14 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6P0PEtI027565 for perforce@freebsd.org; Wed, 24 Jul 2002 17:25:14 -0700 (PDT) Date: Wed, 24 Jul 2002 17:25:14 -0700 (PDT) Message-Id: <200207250025.g6P0PEtI027565@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 14874 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14874 Change 14874 by chris@chris_holly on 2002/07/24 17:24:59 o Update/augment descriptions with descriptions from Robert's post to cboss-doc. o Mark up remaining label operations except those for processes (to be committed later this evening) o Credit Robert in authors for his description paragraphs. o Update mac.ent to include locking column and colspec's so that entries can span multiple columns. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac.ent#3 edit .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#7 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac.ent#3 (text+ko) ==== @@ -1,9 +1,14 @@ - + + + Parameter Description + Locking -"> +'> ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#7 (text+ko) ==== @@ -41,11 +41,22 @@ Chris Costello + TrustedBSD Project
    chris@FreeBSD.org
         + + + Robert + Watson + + + TrustedBSD Project +
    rwatson@FreeBSD.org
    +     +     @@ -118,7 +129,7 @@ - static void + void &mac.mpo;_init struct mac_policy_conf @@ -127,7 +138,7 @@ - + &mac.thead; @@ -139,14 +150,8 @@ - This is the entry point called after the policy has been - added to the list, but before the list is unlocked. At the - point a module would typically initialize its own internal - structures, print any copyright messages, etc. - - A module loaded message is already - printed when a policy is loaded so any further messages of - that nature are probably unnecessary. + Policy load event. The policy list mutex is held, so + caution should be applied. @@ -154,7 +159,7 @@ - static void + void &mac.mpo;_destroy struct mac_policy_conf @@ -163,7 +168,7 @@ - + &mac.thead; @@ -175,9 +180,8 @@ - This entry point is called when the module is being - unloaded. At this point the policy would typically be - freeing internal storage, etc. + Policy load event. The policy list mutex is held, so + caution should be applied. @@ -191,7 +195,7 @@ - static void + void &mac.mpo;_init_bpfdesc struct bpf_d @@ -202,7 +206,7 @@ - + &mac.thead; @@ -219,7 +223,8 @@ - ... + Initialize the label on a newly instantiated bpfdesc (BPF + descriptor) @@ -227,7 +232,7 @@ - static void + void &mac.mpo;_init_devfsdirent struct devfs_dirent @@ -238,7 +243,7 @@ - + &mac.thead; @@ -255,7 +260,8 @@ - ... + Initialize the label on a newly instantiated devfs + entry. @@ -263,7 +269,7 @@ - static void + void &mac.mpo;_init_ifnet struct ifnet @@ -274,7 +280,7 @@ - + &mac.thead; @@ -291,7 +297,8 @@ - ... + Initialize the label on a newly instantiated network + interface. @@ -299,7 +306,7 @@ - static void + void &mac.mpo;_init_ipq struct ipq @@ -310,7 +317,7 @@ - + &mac.thead; @@ -326,6 +333,9 @@ + + Initialize the label on a newly instantiated IP fragment + reassembly queue. @@ -333,18 +343,19 @@ - static void + void &mac.mpo;_init_mbuf struct mbuf *mbuf + int how struct label *label - + &mac.thead; @@ -354,13 +365,29 @@ + how + Blocking/non-blocking &man.malloc.9; see + below + + + label - New label to apply + Policy label to initialize - ... + Initialize the label on a newly instantiated mbuf packet + header (mbuf). The + how field may be one of + M_WAITOK and M_NOWAIT, and + should be employed to avoid performing a blocking + &man.malloc.9; during this initialization call. Mbuf + allocation frequently occurs in performance sensitive + environments, and the implementation should be careful to + avoid blocking or long-lived operations. This entry point + is permitted to fail resulting in the failure to allocate + the mbuf header. @@ -368,7 +395,7 @@ - static void + void &mac.mpo;_init_mount struct mount @@ -382,7 +409,7 @@ - + &mac.thead; @@ -393,18 +420,21 @@ mntlabel - New file system mount point label + Policy label to be initialized for the mount + itself fslabel - New file system label + Policy label to be initialized for the file + system - ... + Initialize the labels on a newly instantiated mount + point. @@ -412,7 +442,7 @@ - static void + void &mac.mpo;_init_socket struct socket @@ -425,7 +455,7 @@ - + &mac.thead; @@ -447,7 +477,8 @@ - ... + Initialize the labels on a newly instantiated + socket. @@ -455,7 +486,7 @@ - static void + void &mac.mpo;_init_subject struct ucred @@ -466,7 +497,7 @@ - + &mac.thead; @@ -483,10 +514,7 @@ - In this entry point, a policy module should allocate and - initialize any internal storage for a new label for a - subject (user) credential. No label information should be - filled out. + Initialize the labels on a newly instantiated subject. @@ -494,7 +522,7 @@ - static void + void &mac.mpo;_init_temp struct label @@ -503,7 +531,7 @@ - + &mac.thead; @@ -515,9 +543,9 @@ - In this entry point, a policy module should allocate - storage for a label meant for temporary use. No label - information should be filled out. + Initialize a newly instantiated temporary label; + temporary labels are frequently used to hold label update + requests. @@ -525,7 +553,7 @@ - static void + void &mac.mpo;_init_vnode struct vnode @@ -536,7 +564,7 @@ - + &mac.thead; @@ -553,9 +581,7 @@ - In this entry point, a policy module should allocate and - initialize any internal storage necessary for a new file - system object label. + Initialize the label on a newly instantiated vnode. @@ -563,7 +589,7 @@ - static void + void &mac.mpo;_destroy_bpfdesc struct bpf_d @@ -574,7 +600,7 @@ - + &mac.thead; @@ -591,10 +617,10 @@ - In this entry point, a policy module should free any - internal storage associated with - label so that it may be - destroyed. + Destroy the label on a BPF descriptor. In this entry + point, a policy module should free any internal storage + associated with label so that it may + be destroyed. @@ -602,7 +628,7 @@ - static void + void &mac.mpo;_destroy_devfsdirent struct devfs_dirent @@ -613,7 +639,7 @@ - + &mac.thead; @@ -630,9 +656,10 @@ - In this entry point, a policy module should free any - internal storage asociated with label - so that it may be destroyed. + Destroy the label on a devfs entry. In this entry + point, a policy module should free any internal storage + asociated with label so that it may + be destroyed. @@ -640,7 +667,7 @@ - static void + void &mac.mpo;_destroy_ifnet struct ifnet @@ -651,7 +678,7 @@ - + &mac.thead; @@ -668,10 +695,10 @@ - In this entry point, a policy module should free any - internal storage associated with - label so that it may be - destroyed. + Destroy the label on a removed interface. In this entry + point, a policy module should free any internal storage + associated with label so that it may + be destroyed. @@ -679,7 +706,7 @@ - static void + void &mac.mpo;_destroy_ipq struct ipq @@ -690,7 +717,7 @@ - + &mac.thead; @@ -707,10 +734,10 @@ - In this entry point, a policy module should free any - internal storage associated with - label so that it may be - destroyed. + Destroy the label on an IP fragment queue. In this + entry point, a policy module should free any internal + storage associated with label so that + it may be destroyed. @@ -718,7 +745,7 @@ - static void + void &mac.mpo;_destroy_mbuf struct mbuf @@ -729,7 +756,7 @@ - + &mac.thead; @@ -746,10 +773,10 @@ - In this entry point, a policy module should free any - internal storage associated with - label so that it may be - destroyed. + Destroy the label on an mbuf header. In this entry + point, a policy module should free any internal storage + associated with label so that it may + be destroyed. @@ -757,7 +784,7 @@ - static void + void &mac.mpo;_destroy_mount struct mount @@ -770,7 +797,7 @@ - + &mac.thead; @@ -792,9 +819,9 @@ - In this entry point, a policy module should free the - internal storage associated with - mntlabel and + Destroy the labels on a mount point. In this entry + point, a policy module should free the internal storage + associated with mntlabel and fslabel so that they may be destroyed. @@ -804,7 +831,7 @@ - static void + void &mac.mpo;_destroy_socket struct socket @@ -817,7 +844,7 @@ - + &mac.thead; @@ -839,9 +866,9 @@ - In this entry point, a policy module should free any - internal storage associated with - label and + Destroy the labels on a socket. In this entry point, a + policy module should free any internal storage associated + with label and peerlabel so that they may be destroyed. @@ -851,7 +878,7 @@ - static void + void &mac.mpo;_destroy_subject struct ucred @@ -862,7 +889,7 @@ - + &mac.thead; @@ -879,9 +906,9 @@ - In this entry point, a policy module should free any - internal storage associated with - label so that it may be + Destroy the label on a credential. In this entry point, + a policy module should free any internal storage associated + with label so that it may be destroyed. @@ -890,7 +917,7 @@ - static void + void &mac.mpo;_destroy_temp struct label @@ -899,7 +926,7 @@ - + &mac.thead; @@ -911,10 +938,10 @@ - In this entry point, a policy module should free any - internal storage associated with the temporary label - label so that it may be - destroyed. + Destroy a temporary label. In this entry point, a + policy module should free any internal storage associated + with the temporary label label so + that it may be destroyed. @@ -922,7 +949,7 @@ - static void + void &mac.mpo;_destroy_vnode struct vnode @@ -933,7 +960,7 @@ - + &mac.thead; @@ -950,9 +977,9 @@ - In this entry point, a policy module should free any - internal storage associated with - label so that it may be + Destroy the label on a vnode. In this entry point, a + policy module should free any internal storage associated + with label so that it may be destroyed. @@ -961,7 +988,7 @@ - static void + void &mac.mpo;_externalize struct label @@ -972,7 +999,7 @@ - + &mac.thead; @@ -988,8 +1015,10 @@ - - ... + Given an internalized subject or object label, fill out + an externalized label. This call is permitted to fail. + This call will be obsoleted by the new userland and extended + attribute interfaces for the MAC framework. @@ -997,7 +1026,7 @@ - static void + void &mac.mpo;_internalize struct label @@ -1008,7 +1037,7 @@ - + &mac.thead; @@ -1025,8 +1054,1814 @@ - - ... + Given an externalized subject or object label, likely + from userland, internalize the label. The entry point + implementation should handle incorrect or corrupted labels. + This call is permitted to fail. This call will be obsoleted + by the new userland and extended attribute interfaces for + the MAC framework. + + + + + File System Object Labeling Event Operations + + ... + + + <function>&mac.mpo;_create_devfs_device</function> + + + + void + &mac.mpo;_create_devfs_device + + dev_t dev + struct devfs_dirent + *devfs_dirent + struct label + *label + + + + + + &mac.thead; + + + + dev + Device corresponding with + devfs_dirent + + + + devfs_dirent + Devfs directory entry to be labeled. + + + + label + Label for devfs_dirent + to be filled in. + + + + + + Fill out the label on a devfs_dirent being created for + the passed device. This call will be made when the device + file system is mounted, regenerated, or a new device is made + available. + + + + <function>&mac.mpo;_create_devfs_directory</function> + + + + void + &mac.mpo;_create_devfs_directory + + char *dirname + int dirnamelen + struct devfs_dirent + *devfs_dirent + struct label + *label + + + + + + &mac.thead; + + + + dirname + Name of directory being created + + + + namelen + Length of string + dirname + + + + devfs_dirent + Devfs directory entry for directory being + created. + + + + + + Fill out the label on a devfs_dirent being created for + the passed directory. This call will be made when the device + file system is mounted, regenerated, or a new device + requiring a specific directory hierarchy is made + available. + + + + <function>&mac.mpo;_create_devfs_vnode</function> + + + + void + &mac.mpo;_create_devfs_vnode + + struct devfs_dirent + *devfs_dirent + struct label + *direntlabel + struct vnode + *vp + struct label + *vnodelabel + + + + + + &mac.thead; + + + + devfs_dirent + Object; devfs directory entry + + + + direntlabel + Policy label for + devfs_dirent + + + + vp + Object; file system object being labeled + + + + vnodelabel + Policy label to be filled in for + vp + + + + + + Fill out the label on the vnode being created for the + passed devfs_dirent. This call will be made when a vnode is + required to represent the specified devfs_dirent in a + mounted devfs instance. + + + + <function>&mac.mpo;_create_vnode_from_vnode</function> + + + >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 19:21:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78EA037B401; Wed, 24 Jul 2002 19:21:39 -0700 (PDT) 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 0593737B400 for ; Wed, 24 Jul 2002 19:21:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FCBD43E3B for ; Wed, 24 Jul 2002 19:21:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6P2LcJU044918 for ; Wed, 24 Jul 2002 19:21:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6P2LcOB044915 for perforce@freebsd.org; Wed, 24 Jul 2002 19:21:38 -0700 (PDT) Date: Wed, 24 Jul 2002 19:21:38 -0700 (PDT) Message-Id: <200207250221.g6P2LcOB044915@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14877 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14877 Change 14877 by rwatson@rwatson_curry on 2002/07/24 19:21:02 Hopefully a bug fix for a bug whereby when one pipe end is terminated, the label is prematurely destroyed, resulting in a blank label during follow-up policy checks. I believe this change modifies the logic so that the pipe label is destroyed only when the second end-point is removed. We'll see if this corrects the problem I'm bumping into. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#13 (text+ko) ==== @@ -1369,7 +1369,7 @@ /* * Destroy MAC data */ - if (cpipe->pipe_peer) + if (cpipe->pipe_peer == NULL) mac_destroy_pipe(cpipe); #endif /* MAC */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 19:59:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8491A37B401; Wed, 24 Jul 2002 19:59:12 -0700 (PDT) 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 1D16437B400; Wed, 24 Jul 2002 19:59:12 -0700 (PDT) Received: from angelica.unixdaemons.com (angelica.unixdaemons.com [209.148.64.135]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B6EE43E31; Wed, 24 Jul 2002 19:59:11 -0700 (PDT) (envelope-from bmilekic@angelica.unixdaemons.com) Received: from angelica.unixdaemons.com (bmilekic@localhost.unixdaemons.com [127.0.0.1]) by angelica.unixdaemons.com (8.12.5/8.12.1) with ESMTP id g6P2mCV2004132; Wed, 24 Jul 2002 22:48:12 -0400 (EDT) X-Authentication-Warning: angelica.unixdaemons.com: Host bmilekic@localhost.unixdaemons.com [127.0.0.1] claimed to be angelica.unixdaemons.com Received: (from bmilekic@localhost) by angelica.unixdaemons.com (8.12.5/8.12.1/Submit) id g6P2mCkn004131; Wed, 24 Jul 2002 22:48:12 -0400 (EDT) (envelope-from bmilekic) Date: Wed, 24 Jul 2002 22:48:12 -0400 From: Bosko Milekic To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 14877 for review Message-ID: <20020724224812.A1630@unixdaemons.com> References: <200207250221.g6P2LcOB044915@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <200207250221.g6P2LcOB044915@freefall.freebsd.org>; from rwatson@freebsd.org on Wed, Jul 24, 2002 at 07:21:38PM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, Jul 24, 2002 at 07:21:38PM -0700, Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14877 > > Change 14877 by rwatson@rwatson_curry on 2002/07/24 19:21:02 > > Hopefully a bug fix for a bug whereby when one pipe end is > terminated, the label is prematurely destroyed, resulting in > a blank label during follow-up policy checks. I believe this > change modifies the logic so that the pipe label is destroyed > only when the second end-point is removed. We'll see if this > corrects the problem I'm bumping into. Since you have one mutex and one label for both ends of the bi-directional pipe, why don't you just use the code already in place for destroying the mutex 'safely' to also destroy the label? In other words, pipeclose() has this `hadpeer' variable which it increments if it finds that the other end exists (and the mutex is grabbed, then). In other words, just group the label destroy with the mutex destroy. If one is wrong, they're both wrong and you can fix them both at the same time. I think that you should only be destroying the label if it hasn't already been initialized, as well. It could be that this is a partially created pipe and so the mutex (and possibly the label?) have not yet been created. I would examine this further myself but it'll have to wait... :-( > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#13 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#13 (text+ko) ==== > > @@ -1369,7 +1369,7 @@ > /* > * Destroy MAC data > */ > - if (cpipe->pipe_peer) > + if (cpipe->pipe_peer == NULL) > mac_destroy_pipe(cpipe); > #endif /* MAC */ > > -- Bosko Milekic bmilekic@unixdaemons.com bmilekic@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 24 21:21:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCB8637B401; Wed, 24 Jul 2002 21:21:06 -0700 (PDT) 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 39F0F37B400 for ; Wed, 24 Jul 2002 21:21:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAFF843E65 for ; Wed, 24 Jul 2002 21:21:05 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6P4L5JU063356 for ; Wed, 24 Jul 2002 21:21:05 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6P4L5SB063353 for perforce@freebsd.org; Wed, 24 Jul 2002 21:21:05 -0700 (PDT) Date: Wed, 24 Jul 2002 21:21:05 -0700 (PDT) Message-Id: <200207250421.g6P4L5SB063353@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 14885 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14885 Change 14885 by amigus@amigus_vmganyopa on 2002/07/24 21:20:52 We need this too since pipeclose() can get called before mac_init_pipe(). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#14 (text+ko) ==== @@ -1369,7 +1369,7 @@ /* * Destroy MAC data */ - if (cpipe->pipe_peer == NULL) + if (cpipe->pipe_label != NULL && cpipe->pipe_peer == NULL) mac_destroy_pipe(cpipe); #endif /* MAC */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 25 3:21:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 098C537B401; Thu, 25 Jul 2002 03:21:38 -0700 (PDT) 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 B334D37B400 for ; Thu, 25 Jul 2002 03:21:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E4EB43E67 for ; Thu, 25 Jul 2002 03:21:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6PALbJU018994 for ; Thu, 25 Jul 2002 03:21:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6PALbPp018986 for perforce@freebsd.org; Thu, 25 Jul 2002 03:21:37 -0700 (PDT) Date: Thu, 25 Jul 2002 03:21:37 -0700 (PDT) Message-Id: <200207251021.g6PALbPp018986@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14895 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14895 Change 14895 by rwatson@rwatson_curry on 2002/07/25 03:21:36 Set Biba and MLS range flags in their set_range() functions; this may explain why interface labeling wasn't quite working right since the change to dynamic labels. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#70 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#58 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#70 (text+ko) ==== @@ -333,6 +333,7 @@ mac_biba->mb_rangelow.mbe_grade = gradelow; mac_biba->mb_rangehigh.mbe_type = typehigh; mac_biba->mb_rangehigh.mbe_grade = gradehigh; + mac_biba->mb_flags |= MAC_BIBA_FLAG_RANGE; } static void ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#58 (text+ko) ==== @@ -311,6 +311,7 @@ mac_mls->mm_rangelow.mme_level = levellow; mac_mls->mm_rangehigh.mme_type = typehigh; mac_mls->mm_rangehigh.mme_level = levelhigh; + mac_mls->mm_flags |= MAC_MLS_FLAG_RANGE; } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 25 11:26:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5923A37B401; Thu, 25 Jul 2002 11:24:43 -0700 (PDT) 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 CEF4137B400 for ; Thu, 25 Jul 2002 11:24:42 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9EA7343E3B for ; Thu, 25 Jul 2002 11:24:41 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6PIOfJU011039 for ; Thu, 25 Jul 2002 11:24:41 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6PIOb6c011035 for perforce@freebsd.org; Thu, 25 Jul 2002 11:24:37 -0700 (PDT) Date: Thu, 25 Jul 2002 11:24:37 -0700 (PDT) Message-Id: <200207251824.g6PIOb6c011035@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bmilekic@freebsd.org using -f From: Bosko Milekic Subject: PERFORCE change 14912 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14912 Change 14912 by bmilekic@bmilekic_euclid on 2002/07/25 11:23:37 *GULP* Move to post-KSE3 world. Yes, this means that this branch is now effectively broken, but I had to do it sometime. It's time to play some serious catch-up. Affected files ... .. //depot/projects/interrupt/sys/alpha/alpha/autoconf.c#3 integrate .. //depot/projects/interrupt/sys/alpha/alpha/cpuconf.c#3 integrate .. //depot/projects/interrupt/sys/alpha/alpha/elf_machdep.c#4 integrate .. //depot/projects/interrupt/sys/alpha/alpha/genassym.c#4 integrate .. //depot/projects/interrupt/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/interrupt/sys/alpha/alpha/swtch.s#2 integrate .. //depot/projects/interrupt/sys/alpha/alpha/trap.c#7 integrate .. //depot/projects/interrupt/sys/alpha/alpha/vm_machdep.c#5 integrate .. //depot/projects/interrupt/sys/alpha/conf/GENERIC#5 integrate .. //depot/projects/interrupt/sys/alpha/conf/Makefile#1 branch .. //depot/projects/interrupt/sys/alpha/conf/NOTES#1 branch .. //depot/projects/interrupt/sys/alpha/conf/SIMOS#3 integrate .. //depot/projects/interrupt/sys/alpha/conf/gethints.awk#1 branch .. //depot/projects/interrupt/sys/alpha/conf/gethints.pl#2 delete .. //depot/projects/interrupt/sys/alpha/include/_inttypes.h#2 integrate .. //depot/projects/interrupt/sys/alpha/include/ansi.h#4 integrate .. //depot/projects/interrupt/sys/alpha/include/kse.h#2 integrate .. //depot/projects/interrupt/sys/alpha/include/types.h#2 integrate .. //depot/projects/interrupt/sys/alpha/linux/linux_machdep.c#3 integrate .. //depot/projects/interrupt/sys/alpha/linux/linux_sysvec.c#4 integrate .. //depot/projects/interrupt/sys/alpha/osf1/imgact_osf1.c#4 integrate .. //depot/projects/interrupt/sys/alpha/tc/am7990.c#4 delete .. //depot/projects/interrupt/sys/alpha/tc/am7990reg.h#2 delete .. //depot/projects/interrupt/sys/alpha/tc/am7990var.h#3 delete .. //depot/projects/interrupt/sys/alpha/tc/ascvar.h#3 delete .. //depot/projects/interrupt/sys/alpha/tc/esp.c#3 delete .. //depot/projects/interrupt/sys/alpha/tc/espreg.h#2 delete .. //depot/projects/interrupt/sys/alpha/tc/espvar.h#2 delete .. //depot/projects/interrupt/sys/alpha/tc/if_le_dec.c#3 delete .. //depot/projects/interrupt/sys/alpha/tc/if_le_ioasic.c#3 delete .. //depot/projects/interrupt/sys/alpha/tc/if_levar.h#3 delete .. //depot/projects/interrupt/sys/alpha/tc/ioasic.c#3 delete .. //depot/projects/interrupt/sys/alpha/tc/ioasicreg.h#2 delete .. //depot/projects/interrupt/sys/alpha/tc/ioasicvar.h#3 delete .. //depot/projects/interrupt/sys/alpha/tc/mcclock_ioasic.c#2 delete .. //depot/projects/interrupt/sys/alpha/tc/sticreg.h#2 delete .. //depot/projects/interrupt/sys/alpha/tc/sticvar.h#3 delete .. //depot/projects/interrupt/sys/alpha/tc/tc.c#3 delete .. //depot/projects/interrupt/sys/alpha/tc/tcasic.c#2 delete .. //depot/projects/interrupt/sys/alpha/tc/tcdevs.h#2 delete .. //depot/projects/interrupt/sys/alpha/tc/tcdevs_data.h#2 delete .. //depot/projects/interrupt/sys/alpha/tc/tcds.c#3 delete .. //depot/projects/interrupt/sys/alpha/tc/tcds_dma.c#2 delete .. //depot/projects/interrupt/sys/alpha/tc/tcdsreg.h#3 delete .. //depot/projects/interrupt/sys/alpha/tc/tcdsvar.h#3 delete .. //depot/projects/interrupt/sys/alpha/tc/tcreg.h#2 delete .. //depot/projects/interrupt/sys/alpha/tc/tcvar.h#3 delete .. //depot/projects/interrupt/sys/arm/include/ansi.h#3 integrate .. //depot/projects/interrupt/sys/arm/include/types.h#4 integrate .. //depot/projects/interrupt/sys/boot/Makefile#3 integrate .. //depot/projects/interrupt/sys/boot/common/help.common#2 integrate .. //depot/projects/interrupt/sys/boot/common/loader.8#5 integrate .. //depot/projects/interrupt/sys/boot/efi/Makefile.inc#3 integrate .. //depot/projects/interrupt/sys/boot/efi/libefi/efinet.c#3 integrate .. //depot/projects/interrupt/sys/boot/efi/loader/conf.c#3 integrate .. //depot/projects/interrupt/sys/boot/efi/loader/main.c#3 integrate .. //depot/projects/interrupt/sys/boot/forth/loader.4th.8#3 integrate .. //depot/projects/interrupt/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/interrupt/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/interrupt/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/interrupt/sys/boot/ofw/libofw/elf_freebsd.c#3 integrate .. //depot/projects/interrupt/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/interrupt/sys/boot/ofw/libofw/ofw_disk.c#4 integrate .. //depot/projects/interrupt/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/interrupt/sys/boot/ofw/libofw/openfirm.c#3 integrate .. //depot/projects/interrupt/sys/boot/ofw/libofw/openfirm.h#3 integrate .. //depot/projects/interrupt/sys/boot/pc98/Makefile#3 integrate .. //depot/projects/interrupt/sys/boot/pc98/boot2/boot.h#3 integrate .. //depot/projects/interrupt/sys/boot/powerpc/loader/Makefile#3 integrate .. //depot/projects/interrupt/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/interrupt/sys/boot/sparc64/loader/Makefile#5 integrate .. //depot/projects/interrupt/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/interrupt/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/interrupt/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/interrupt/sys/compat/pecoff/imgact_pecoff.c#5 integrate .. //depot/projects/interrupt/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/interrupt/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/interrupt/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/interrupt/sys/conf/Makefile.alpha#3 integrate .. //depot/projects/interrupt/sys/conf/Makefile.i386#3 integrate .. //depot/projects/interrupt/sys/conf/Makefile.ia64#4 integrate .. //depot/projects/interrupt/sys/conf/Makefile.pc98#3 integrate .. //depot/projects/interrupt/sys/conf/Makefile.powerpc#4 integrate .. //depot/projects/interrupt/sys/conf/Makefile.sparc64#5 integrate .. //depot/projects/interrupt/sys/conf/Makefile.x86_64#1 branch .. //depot/projects/interrupt/sys/conf/NOTES#3 integrate .. //depot/projects/interrupt/sys/conf/files#11 integrate .. //depot/projects/interrupt/sys/conf/files.alpha#6 integrate .. //depot/projects/interrupt/sys/conf/files.i386#7 integrate .. //depot/projects/interrupt/sys/conf/files.ia64#5 integrate .. //depot/projects/interrupt/sys/conf/files.pc98#8 integrate .. //depot/projects/interrupt/sys/conf/files.powerpc#5 integrate .. //depot/projects/interrupt/sys/conf/files.sparc64#7 integrate .. //depot/projects/interrupt/sys/conf/files.x86_64#1 branch .. //depot/projects/interrupt/sys/conf/gethints.awk#1 branch .. //depot/projects/interrupt/sys/conf/kern.post.mk#5 integrate .. //depot/projects/interrupt/sys/conf/kern.pre.mk#6 integrate .. //depot/projects/interrupt/sys/conf/kmod.mk#6 integrate .. //depot/projects/interrupt/sys/conf/majors#5 integrate .. //depot/projects/interrupt/sys/conf/makeLINT.sed#1 branch .. //depot/projects/interrupt/sys/conf/options#8 integrate .. //depot/projects/interrupt/sys/conf/options.alpha#4 integrate .. //depot/projects/interrupt/sys/conf/options.i386#6 integrate .. //depot/projects/interrupt/sys/conf/options.ia64#4 integrate .. //depot/projects/interrupt/sys/conf/options.pc98#6 integrate .. //depot/projects/interrupt/sys/conf/options.powerpc#2 integrate .. //depot/projects/interrupt/sys/conf/options.x86_64#1 branch .. //depot/projects/interrupt/sys/contrib/dev/acpica/acconfig.h#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acdebug.h#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acdispat.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acdos16.h#2 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acefi.h#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acenv.h#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acevents.h#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acexcep.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acgcc.h#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acglobal.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/achware.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acinterp.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/aclocal.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acmacros.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acnamesp.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acobject.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acoutput.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acparser.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acpiosxf.h#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acpixf.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acresrc.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acstruct.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/actables.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/actypes.h#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/acutils.h#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/amlcode.h#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dbcmds.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dbdisasm.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dbdisply.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dbexec.c#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dbfileio.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dbhistry.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dbinput.c#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dbstats.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dbutils.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dbxface.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dsfield.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dsmethod.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dsmthdat.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dsobject.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dsopcode.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dsutils.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dswexec.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dswload.c#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/dswstate.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/evevent.c#5 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/evmisc.c#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/evregion.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/evrgnini.c#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/evsci.c#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/evxface.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/evxfevnt.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/evxfregn.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exconfig.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exconvrt.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/excreate.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exdump.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exfield.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exfldio.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exmisc.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exmutex.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exnames.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exoparg1.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exoparg2.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exoparg3.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exoparg6.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exprep.c#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exregion.c#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exresnte.c#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exresolv.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exresop.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exstore.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exstoren.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exstorob.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exsystem.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/exutils.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/hwacpi.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/hwgpe.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/hwregs.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/hwsleep.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/hwtimer.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/nsaccess.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/nsalloc.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/nsdump.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/nseval.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/nsinit.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/nsload.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/nsnames.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/nsobject.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/nssearch.c#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/nsutils.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/nswalk.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/nsxfname.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/nsxfobj.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/psargs.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/psfind.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/psopcode.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/psparse.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/pstree.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/psutils.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/pswalk.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/psxface.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/rsaddr.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/rscalc.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/rscreate.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/rsdump.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/rsio.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/rsirq.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/rslist.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/rsmemory.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/rsmisc.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/rsutils.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/rsxface.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/tbconvrt.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/tbget.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/tbinstal.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/tbutils.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/tbxface.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/tbxfroot.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/utalloc.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/utclib.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/utcopy.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/utdebug.c#4 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/utdelete.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/uteval.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/utglobal.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/utinit.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/utmath.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/utmisc.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/utobject.c#3 integrate .. //depot/projects/interrupt/sys/contrib/dev/acpica/utxface.c#3 integrate .. //depot/projects/interrupt/sys/crypto/sha2/sha2.c#3 integrate .. //depot/projects/interrupt/sys/ddb/db_ps.c#4 integrate .. //depot/projects/interrupt/sys/dev/acpica/Osd/OsdSynch.c#4 integrate .. //depot/projects/interrupt/sys/dev/acpica/Osd/OsdTable.c#1 branch .. //depot/projects/interrupt/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/interrupt/sys/dev/acpica/acpi_button.c#4 integrate .. //depot/projects/interrupt/sys/dev/acpica/acpi_cmbat.c#4 integrate .. //depot/projects/interrupt/sys/dev/acpica/acpi_ec.c#4 integrate .. //depot/projects/interrupt/sys/dev/acpica/acpi_lid.c#4 integrate .. //depot/projects/interrupt/sys/dev/acpica/acpica_support.c#4 integrate .. //depot/projects/interrupt/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/interrupt/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/interrupt/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/interrupt/sys/dev/aic7xxx/aicasm/aicasm_gram.y#3 integrate .. //depot/projects/interrupt/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/interrupt/sys/dev/ata/ata-disk.c#7 integrate .. //depot/projects/interrupt/sys/dev/ata/ata-disk.h#5 integrate .. //depot/projects/interrupt/sys/dev/ata/ata-dma.c#7 integrate .. //depot/projects/interrupt/sys/dev/ata/ata-isa.c#4 integrate .. //depot/projects/interrupt/sys/dev/ata/ata-pci.c#7 integrate .. //depot/projects/interrupt/sys/dev/ata/atapi-all.c#6 integrate .. //depot/projects/interrupt/sys/dev/ata/atapi-all.h#4 integrate .. //depot/projects/interrupt/sys/dev/ata/atapi-fd.c#6 integrate .. //depot/projects/interrupt/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/interrupt/sys/dev/bktr/bktr_core.c#4 integrate .. //depot/projects/interrupt/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/interrupt/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/interrupt/sys/dev/buslogic/bt.c#2 integrate .. //depot/projects/interrupt/sys/dev/ed/if_ed_pccard.c#4 integrate .. //depot/projects/interrupt/sys/dev/em/README#2 integrate .. //depot/projects/interrupt/sys/dev/em/if_em.c#4 integrate .. //depot/projects/interrupt/sys/dev/em/if_em.h#4 integrate .. //depot/projects/interrupt/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/interrupt/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/interrupt/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/interrupt/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/interrupt/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/interrupt/sys/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/interrupt/sys/dev/gem/if_gemreg.h#2 integrate .. //depot/projects/interrupt/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/interrupt/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/interrupt/sys/dev/hme/if_hmereg.h#3 integrate .. //depot/projects/interrupt/sys/dev/isp/isp.c#6 integrate .. //depot/projects/interrupt/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/interrupt/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/interrupt/sys/dev/isp/isp_inline.h#5 integrate .. //depot/projects/interrupt/sys/dev/isp/isp_ioctl.h#4 integrate .. //depot/projects/interrupt/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/interrupt/sys/dev/isp/isp_sbus.c#1 branch .. //depot/projects/interrupt/sys/dev/ispfw/asm_1000.h#1 branch .. //depot/projects/interrupt/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/interrupt/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/interrupt/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/interrupt/sys/dev/mii/bmtphy.c#1 branch .. //depot/projects/interrupt/sys/dev/mii/bmtphyreg.h#1 branch .. //depot/projects/interrupt/sys/dev/mii/exphy.c#3 integrate .. //depot/projects/interrupt/sys/dev/mii/miidevs#3 integrate .. //depot/projects/interrupt/sys/dev/mii/miidevs.h#3 integrate .. //depot/projects/interrupt/sys/dev/nge/if_nge.c#5 integrate .. //depot/projects/interrupt/sys/dev/pccard/card_if.m#4 integrate .. //depot/projects/interrupt/sys/dev/pccard/pccard_common.c#2 delete .. //depot/projects/interrupt/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/interrupt/sys/dev/pccard/pccarddevs.h#4 integrate .. //depot/projects/interrupt/sys/dev/pccard/pccardvar.h#4 integrate .. //depot/projects/interrupt/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/interrupt/sys/dev/puc/puc.c#4 integrate .. //depot/projects/interrupt/sys/dev/random/hash.c#3 integrate .. //depot/projects/interrupt/sys/dev/random/hash.h#3 integrate .. //depot/projects/interrupt/sys/dev/random/yarrow.c#4 integrate .. //depot/projects/interrupt/sys/dev/sbni/if_sbni_isa.c#2 integrate .. //depot/projects/interrupt/sys/dev/sbni/if_sbni_pci.c#2 integrate .. //depot/projects/interrupt/sys/dev/sio/sio_ebus.c#3 integrate .. //depot/projects/interrupt/sys/dev/sio/sio_pci.c#4 integrate .. //depot/projects/interrupt/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/interrupt/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/interrupt/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/interrupt/sys/dev/sound/pci/maestro3.c#5 integrate .. //depot/projects/interrupt/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/interrupt/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/interrupt/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/interrupt/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/interrupt/sys/dev/sound/usb/uaudio.c#1 branch .. //depot/projects/interrupt/sys/dev/sound/usb/uaudio.h#1 branch .. //depot/projects/interrupt/sys/dev/sound/usb/uaudio_pcm.c#1 branch .. //depot/projects/interrupt/sys/dev/sound/usb/uaudioreg.h#1 branch .. //depot/projects/interrupt/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/interrupt/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/interrupt/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/interrupt/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/interrupt/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/interrupt/sys/dev/usb/if_kuereg.h#3 integrate .. //depot/projects/interrupt/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/interrupt/sys/dev/usb/ugen.c#5 integrate .. //depot/projects/interrupt/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/interrupt/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/interrupt/sys/dev/usb/usbdevs.h#4 integrate .. //depot/projects/interrupt/sys/dev/usb/usbdevs_data.h#4 integrate .. //depot/projects/interrupt/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/interrupt/sys/dev/wi/if_wi_pccard.c#2 integrate .. //depot/projects/interrupt/sys/dev/wi/if_wivar.h#3 integrate .. //depot/projects/interrupt/sys/dev/xe/if_xe_pccard.c#3 integrate .. //depot/projects/interrupt/sys/fs/devfs/devfs.h#3 integrate .. //depot/projects/interrupt/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/interrupt/sys/fs/devfs/devfs_rule.c#1 branch .. //depot/projects/interrupt/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/interrupt/sys/fs/devfs/devfs_vnops.c#4 integrate .. //depot/projects/interrupt/sys/fs/fdescfs/fdesc_vnops.c#4 integrate .. //depot/projects/interrupt/sys/fs/procfs/procfs_ctl.c#4 integrate .. //depot/projects/interrupt/sys/fs/procfs/procfs_dbregs.c#4 integrate .. //depot/projects/interrupt/sys/fs/procfs/procfs_fpregs.c#4 integrate .. //depot/projects/interrupt/sys/fs/procfs/procfs_ioctl.c#4 integrate .. //depot/projects/interrupt/sys/fs/procfs/procfs_regs.c#4 integrate .. //depot/projects/interrupt/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/interrupt/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/interrupt/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/interrupt/sys/gnu/ext2fs/ext2_ihash.c#2 integrate .. //depot/projects/interrupt/sys/i386/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/interrupt/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/interrupt/sys/i386/conf/Makefile#4 integrate .. //depot/projects/interrupt/sys/i386/conf/NEWCARD#5 integrate .. //depot/projects/interrupt/sys/i386/conf/NOTES#6 integrate .. //depot/projects/interrupt/sys/i386/conf/OLDCARD#2 integrate .. //depot/projects/interrupt/sys/i386/conf/gethints.awk#1 branch .. //depot/projects/interrupt/sys/i386/conf/makeLINT.sed#2 delete .. //depot/projects/interrupt/sys/i386/i386/bios.c#5 integrate .. //depot/projects/interrupt/sys/i386/i386/critical.c#2 integrate .. //depot/projects/interrupt/sys/i386/i386/db_interface.c#4 integrate .. //depot/projects/interrupt/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/interrupt/sys/i386/i386/exception.s#8 integrate .. //depot/projects/interrupt/sys/i386/i386/genassym.c#6 integrate .. //depot/projects/interrupt/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/interrupt/sys/i386/i386/locore.s#5 integrate .. //depot/projects/interrupt/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/interrupt/sys/i386/i386/mp_machdep.c#6 integrate .. //depot/projects/interrupt/sys/i386/i386/mpapic.c#5 integrate .. //depot/projects/interrupt/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/interrupt/sys/i386/i386/support.s#6 integrate .. //depot/projects/interrupt/sys/i386/i386/swtch.s#5 integrate .. //depot/projects/interrupt/sys/i386/i386/trap.c#9 integrate .. //depot/projects/interrupt/sys/i386/i386/vm86.c#4 integrate .. //depot/projects/interrupt/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/interrupt/sys/i386/ibcs2/imgact_coff.c#5 integrate .. //depot/projects/interrupt/sys/i386/include/_inttypes.h#3 integrate .. //depot/projects/interrupt/sys/i386/include/ansi.h#4 integrate .. //depot/projects/interrupt/sys/i386/include/atomic.h#5 integrate .. //depot/projects/interrupt/sys/i386/include/bus_at386.h#4 integrate .. //depot/projects/interrupt/sys/i386/include/cpufunc.h#5 integrate .. //depot/projects/interrupt/sys/i386/include/cputypes.h#3 integrate .. //depot/projects/interrupt/sys/i386/include/critical.h#2 integrate .. //depot/projects/interrupt/sys/i386/include/kse.h#2 integrate .. //depot/projects/interrupt/sys/i386/include/md_var.h#5 integrate .. //depot/projects/interrupt/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/interrupt/sys/i386/include/pmap.h#5 integrate .. //depot/projects/interrupt/sys/i386/include/proc.h#3 integrate .. //depot/projects/interrupt/sys/i386/include/smp.h#5 integrate .. //depot/projects/interrupt/sys/i386/include/smptests.h#5 integrate .. //depot/projects/interrupt/sys/i386/include/types.h#4 integrate .. //depot/projects/interrupt/sys/i386/isa/apic_vector.s#6 integrate .. //depot/projects/interrupt/sys/i386/isa/cx.c#3 integrate .. //depot/projects/interrupt/sys/i386/isa/intr_machdep.c#5 integrate .. //depot/projects/interrupt/sys/i386/isa/intr_machdep.h#6 integrate .. //depot/projects/interrupt/sys/i386/isa/ipl.s#3 delete .. //depot/projects/interrupt/sys/i386/isa/isa_device.h#3 integrate .. //depot/projects/interrupt/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/interrupt/sys/i386/isa/stallion.c#3 integrate .. //depot/projects/interrupt/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/interrupt/sys/i386/linux/linux.h#3 integrate .. //depot/projects/interrupt/sys/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/interrupt/sys/i386/linux/linux_ptrace.c#2 integrate .. //depot/projects/interrupt/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/interrupt/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/interrupt/sys/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/interrupt/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/interrupt/sys/ia64/acpica/madt.c#4 integrate .. //depot/projects/interrupt/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/interrupt/sys/ia64/ia32/ia32.h#1 branch .. //depot/projects/interrupt/sys/ia64/ia32/ia32_misc.c#1 branch .. //depot/projects/interrupt/sys/ia64/ia32/ia32_proto.h#2 integrate .. //depot/projects/interrupt/sys/ia64/ia32/ia32_syscall.h#2 integrate .. //depot/projects/interrupt/sys/ia64/ia32/ia32_sysent.c#2 integrate .. //depot/projects/interrupt/sys/ia64/ia32/ia32_sysvec.c#1 branch .. //depot/projects/interrupt/sys/ia64/ia32/ia32_util.h#1 branch .. //depot/projects/interrupt/sys/ia64/ia32/imgact_ia32.c#3 delete .. //depot/projects/interrupt/sys/ia64/ia32/imgact_ia32.h#2 delete .. //depot/projects/interrupt/sys/ia64/ia32/syscalls.master#2 integrate .. //depot/projects/interrupt/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/interrupt/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/interrupt/sys/ia64/ia64/genassym.c#6 integrate .. //depot/projects/interrupt/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/interrupt/sys/ia64/ia64/pmap.c#8 integrate .. //depot/projects/interrupt/sys/ia64/ia64/swtch.s#4 integrate .. //depot/projects/interrupt/sys/ia64/ia64/trap.c#8 integrate .. //depot/projects/interrupt/sys/ia64/ia64/vm_machdep.c#6 integrate .. //depot/projects/interrupt/sys/ia64/include/_inttypes.h#2 integrate .. //depot/projects/interrupt/sys/ia64/include/ansi.h#4 integrate .. //depot/projects/interrupt/sys/ia64/include/elf.h#3 integrate .. //depot/projects/interrupt/sys/ia64/include/kse.h#1 branch .. //depot/projects/interrupt/sys/ia64/include/types.h#2 integrate .. //depot/projects/interrupt/sys/kern/bus_if.m#3 integrate .. //depot/projects/interrupt/sys/kern/imgact_aout.c#4 integrate .. //depot/projects/interrupt/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/interrupt/sys/kern/imgact_elf32.c#1 branch .. //depot/projects/interrupt/sys/kern/imgact_elf64.c#1 branch .. //depot/projects/interrupt/sys/kern/imgact_elfN.c#1 branch .. //depot/projects/interrupt/sys/kern/imgact_gzip.c#3 integrate .. //depot/projects/interrupt/sys/kern/init_main.c#5 integrate .. //depot/projects/interrupt/sys/kern/init_sysent.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_acct.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_acl.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/interrupt/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_exec.c#8 integrate .. //depot/projects/interrupt/sys/kern/kern_exit.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_fork.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_idle.c#4 integrate .. //depot/projects/interrupt/sys/kern/kern_intr.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_jail.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_kthread.c#4 integrate .. //depot/projects/interrupt/sys/kern/kern_linker.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_poll.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_proc.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_prot.c#9 integrate .. //depot/projects/interrupt/sys/kern/kern_resource.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_sig.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_subr.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_switch.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_synch.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_tc.c#4 integrate .. //depot/projects/interrupt/sys/kern/kern_thread.c#2 integrate .. //depot/projects/interrupt/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/interrupt/sys/kern/makesyscalls.sh#4 integrate .. //depot/projects/interrupt/sys/kern/subr_bus.c#5 integrate .. //depot/projects/interrupt/sys/kern/subr_diskslice.c#6 integrate .. //depot/projects/interrupt/sys/kern/subr_eventhandler.c#3 integrate .. //depot/projects/interrupt/sys/kern/subr_mbuf.c#6 integrate .. //depot/projects/interrupt/sys/kern/subr_mchain.c#4 integrate .. //depot/projects/interrupt/sys/kern/subr_power.c#4 integrate .. //depot/projects/interrupt/sys/kern/subr_prf.c#6 integrate .. //depot/projects/interrupt/sys/kern/subr_smp.c#4 integrate .. //depot/projects/interrupt/sys/kern/subr_trap.c#5 integrate .. //depot/projects/interrupt/sys/kern/subr_witness.c#6 integrate .. //depot/projects/interrupt/sys/kern/sys_generic.c#6 integrate .. //depot/projects/interrupt/sys/kern/sys_pipe.c#8 integrate .. //depot/projects/interrupt/sys/kern/sys_process.c#6 integrate .. //depot/projects/interrupt/sys/kern/syscalls.c#6 integrate .. //depot/projects/interrupt/sys/kern/syscalls.master#6 integrate .. //depot/projects/interrupt/sys/kern/sysv_msg.c#4 integrate .. //depot/projects/interrupt/sys/kern/sysv_sem.c#6 integrate .. //depot/projects/interrupt/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/interrupt/sys/kern/tty.c#7 integrate .. //depot/projects/interrupt/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/interrupt/sys/kern/uipc_jumbo.c#3 integrate .. //depot/projects/interrupt/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/interrupt/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/interrupt/sys/kern/uipc_syscalls.c#8 integrate .. //depot/projects/interrupt/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/interrupt/sys/kern/vfs_cluster.c#6 integrate .. //depot/projects/interrupt/sys/kern/vfs_conf.c#4 delete .. //depot/projects/interrupt/sys/kern/vfs_default.c#4 integrate .. //depot/projects/interrupt/sys/kern/vfs_export.c#5 integrate .. //depot/projects/interrupt/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/interrupt/sys/kern/vfs_mount.c#1 branch .. //depot/projects/interrupt/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/interrupt/sys/kern/vfs_syscalls.c#10 integrate .. //depot/projects/interrupt/sys/kern/vfs_vnops.c#10 integrate .. //depot/projects/interrupt/sys/kern/vnode_if.src#5 integrate .. //depot/projects/interrupt/sys/libkern/iconv.c#2 integrate .. //depot/projects/interrupt/sys/modules/acpi/Makefile#3 integrate .. //depot/projects/interrupt/sys/modules/bktr/bktr/Makefile#3 integrate .. //depot/projects/interrupt/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/interrupt/sys/modules/nfsserver/Makefile#3 integrate .. //depot/projects/interrupt/sys/modules/random/Makefile#3 integrate .. //depot/projects/interrupt/sys/modules/sound/driver/Makefile#3 integrate .. //depot/projects/interrupt/sys/modules/sound/driver/uaudio/Makefile#1 branch .. //depot/projects/interrupt/sys/modules/ufs/Makefile#1 branch .. //depot/projects/interrupt/sys/net/bpf_filter.c#3 integrate .. //depot/projects/interrupt/sys/net/bridge.c#6 integrate .. //depot/projects/interrupt/sys/net/if.c#7 integrate .. //depot/projects/interrupt/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/interrupt/sys/net/if_media.h#3 integrate .. //depot/projects/interrupt/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/interrupt/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/interrupt/sys/netinet/ip_fw.h#5 integrate .. //depot/projects/interrupt/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/interrupt/sys/netinet/ip_output.c#6 integrate .. //depot/projects/interrupt/sys/netinet/ip_var.h#4 integrate .. //depot/projects/interrupt/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/interrupt/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/interrupt/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/interrupt/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/interrupt/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/interrupt/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/interrupt/sys/netinet6/esp_input.c#4 integrate .. //depot/projects/interrupt/sys/netinet6/in6.h#4 integrate .. //depot/projects/interrupt/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/interrupt/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/interrupt/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/interrupt/sys/netkey/key.c#6 integrate .. //depot/projects/interrupt/sys/nfsclient/nfs_bio.c#5 integrate .. //depot/projects/interrupt/sys/nfsclient/nfs_lock.c#4 integrate .. //depot/projects/interrupt/sys/nfsclient/nfs_lock.h#2 integrate .. //depot/projects/interrupt/sys/nfsclient/nfs_nfsiod.c#3 integrate .. //depot/projects/interrupt/sys/nfsclient/nfs_node.c#3 integrate .. //depot/projects/interrupt/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/interrupt/sys/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/interrupt/sys/nfsclient/nfs_vfsops.c#4 integrate .. //depot/projects/interrupt/sys/nfsclient/nfs_vnops.c#4 integrate .. //depot/projects/interrupt/sys/nfsserver/nfs.h#3 integrate .. //depot/projects/interrupt/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/interrupt/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/interrupt/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/interrupt/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/interrupt/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/interrupt/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/interrupt/sys/pc98/conf/gethints.awk#1 branch .. //depot/projects/interrupt/sys/pc98/conf/gethints.pl#2 delete .. //depot/projects/interrupt/sys/pc98/i386/machdep.c#7 integrate .. //depot/projects/interrupt/sys/pc98/pc98/fd.c#5 integrate .. //depot/projects/interrupt/sys/pccard/cardinfo.h#3 integrate .. //depot/projects/interrupt/sys/pccard/i82365.h#3 integrate .. //depot/projects/interrupt/sys/pccard/pccard.c#5 integrate .. //depot/projects/interrupt/sys/pccard/pccard_nbk.c#4 integrate .. //depot/projects/interrupt/sys/pccard/pcic.c#5 integrate .. //depot/projects/interrupt/sys/pccard/pcic_pci.c#7 integrate .. //depot/projects/interrupt/sys/pccard/pcicvar.h#2 integrate .. //depot/projects/interrupt/sys/pccard/slot.h#3 integrate .. //depot/projects/interrupt/sys/pci/agp.c#2 integrate .. //depot/projects/interrupt/sys/pci/agp_i810.c#2 integrate .. //depot/projects/interrupt/sys/pci/agp_intel.c#3 integrate .. //depot/projects/interrupt/sys/pci/if_dc.c#4 integrate .. //depot/projects/interrupt/sys/pci/if_pcn.c#3 integrate .. //depot/projects/interrupt/sys/pci/if_rl.c#4 integrate .. //depot/projects/interrupt/sys/pci/if_sis.c#4 integrate .. //depot/projects/interrupt/sys/pci/if_sisreg.h#3 integrate .. //depot/projects/interrupt/sys/pci/uhci_pci.c#3 integrate .. //depot/projects/interrupt/sys/posix4/ksched.c#3 integrate .. //depot/projects/interrupt/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/interrupt/sys/powerpc/include/_inttypes.h#2 integrate .. //depot/projects/interrupt/sys/powerpc/include/ansi.h#4 integrate .. //depot/projects/interrupt/sys/powerpc/include/bus.h#3 integrate .. //depot/projects/interrupt/sys/powerpc/include/bus_memio.h#1 branch .. //depot/projects/interrupt/sys/powerpc/include/bus_pio.h#1 branch .. //depot/projects/interrupt/sys/powerpc/include/db_machdep.h#4 integrate .. //depot/projects/interrupt/sys/powerpc/include/interruptvar.h#1 branch .. //depot/projects/interrupt/sys/powerpc/include/intr_machdep.h#1 branch .. //depot/projects/interrupt/sys/powerpc/include/kse.h#1 branch .. //depot/projects/interrupt/sys/powerpc/include/metadata.h#1 branch .. //depot/projects/interrupt/sys/powerpc/include/nexusvar.h#2 integrate .. //depot/projects/interrupt/sys/powerpc/include/ofw_machdep.h#1 branch .. //depot/projects/interrupt/sys/powerpc/include/openpicreg.h#2 integrate .. //depot/projects/interrupt/sys/powerpc/include/openpicvar.h#1 branch .. //depot/projects/interrupt/sys/powerpc/include/setjmp.h#2 integrate .. //depot/projects/interrupt/sys/powerpc/include/types.h#3 integrate .. //depot/projects/interrupt/sys/powerpc/ofw/ofw_pci.c#1 branch .. //depot/projects/interrupt/sys/powerpc/ofw/ofw_pci.h#1 branch .. //depot/projects/interrupt/sys/powerpc/powermac/uninorth.c#1 branch .. //depot/projects/interrupt/sys/powerpc/powermac/uninorthvar.h#1 branch .. //depot/projects/interrupt/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/db_disasm.c#1 branch .. //depot/projects/interrupt/sys/powerpc/powerpc/db_hwwatch.c#1 branch .. //depot/projects/interrupt/sys/powerpc/powerpc/db_interface.c#1 branch .. //depot/projects/interrupt/sys/powerpc/powerpc/db_memrw.c#1 branch .. //depot/projects/interrupt/sys/powerpc/powerpc/db_trace.c#1 branch .. //depot/projects/interrupt/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/genassym.c#5 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/intr_machdep.c#1 branch .. //depot/projects/interrupt/sys/powerpc/powerpc/locore.s#6 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/machdep.c#6 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/nexus.c#2 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/ofw_machdep.c#5 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/openpic.c#1 branch .. //depot/projects/interrupt/sys/powerpc/powerpc/pic_if.m#1 branch .. //depot/projects/interrupt/sys/powerpc/powerpc/pmap.c#8 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/setjmp.S#1 branch .. //depot/projects/interrupt/sys/powerpc/powerpc/swtch.s#6 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/trap.c#7 integrate .. //depot/projects/interrupt/sys/powerpc/powerpc/vm_machdep.c#6 integrate .. //depot/projects/interrupt/sys/sparc64/conf/GENERIC#7 integrate .. //depot/projects/interrupt/sys/sparc64/include/_inttypes.h#2 integrate .. //depot/projects/interrupt/sys/sparc64/include/ansi.h#4 integrate .. //depot/projects/interrupt/sys/sparc64/include/asi.h#2 integrate .. //depot/projects/interrupt/sys/sparc64/include/instr.h#4 integrate .. //depot/projects/interrupt/sys/sparc64/include/iommuvar.h#4 integrate .. //depot/projects/interrupt/sys/sparc64/include/kse.h#2 integrate .. //depot/projects/interrupt/sys/sparc64/include/lsu.h#2 integrate .. //depot/projects/interrupt/sys/sparc64/include/smp.h#6 integrate .. //depot/projects/interrupt/sys/sparc64/include/types.h#2 integrate .. //depot/projects/interrupt/sys/sparc64/include/ver.h#3 integrate .. //depot/projects/interrupt/sys/sparc64/include/vmparam.h#4 integrate .. //depot/projects/interrupt/sys/sparc64/pci/psycho.c#6 integrate .. //depot/projects/interrupt/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/elf_machdep.c#4 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/genassym.c#8 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/identcpu.c#5 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/iommu.c#4 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/mp_machdep.c#6 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/pmap.c#9 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/support.s#5 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/swtch.s#5 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/trap.c#8 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/tsb.c#5 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/vm_machdep.c#7 integrate .. //depot/projects/interrupt/sys/sys/_mutex.h#3 integrate .. //depot/projects/interrupt/sys/sys/buf.h#6 integrate .. //depot/projects/interrupt/sys/sys/bus.h#3 integrate .. //depot/projects/interrupt/sys/sys/cdefs.h#3 integrate .. //depot/projects/interrupt/sys/sys/condvar.h#3 integrate .. //depot/projects/interrupt/sys/sys/consio.h#3 integrate .. //depot/projects/interrupt/sys/sys/elf_generic.h#3 integrate .. //depot/projects/interrupt/sys/sys/event.h#4 integrate .. //depot/projects/interrupt/sys/sys/eventhandler.h#3 integrate .. //depot/projects/interrupt/sys/sys/filedesc.h#4 integrate .. //depot/projects/interrupt/sys/sys/iconv.h#3 integrate .. //depot/projects/interrupt/sys/sys/imgact.h#3 integrate .. //depot/projects/interrupt/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/interrupt/sys/sys/jumbo.h#3 integrate .. //depot/projects/interrupt/sys/sys/mbuf.h#7 integrate .. //depot/projects/interrupt/sys/sys/mount.h#7 integrate .. //depot/projects/interrupt/sys/sys/param.h#6 integrate .. //depot/projects/interrupt/sys/sys/poll.h#4 integrate .. //depot/projects/interrupt/sys/sys/power.h#4 integrate .. //depot/projects/interrupt/sys/sys/proc.h#6 integrate .. //depot/projects/interrupt/sys/sys/queue.h#3 integrate .. //depot/projects/interrupt/sys/sys/resourcevar.h#5 integrate .. //depot/projects/interrupt/sys/sys/signalvar.h#4 integrate .. //depot/projects/interrupt/sys/sys/socketvar.h#7 integrate .. //depot/projects/interrupt/sys/sys/stat.h#5 integrate .. //depot/projects/interrupt/sys/sys/syscall.h#6 integrate .. //depot/projects/interrupt/sys/sys/syscall.mk#6 integrate .. //depot/projects/interrupt/sys/sys/sysctl.h#4 integrate .. //depot/projects/interrupt/sys/sys/sysent.h#3 integrate .. //depot/projects/interrupt/sys/sys/sysproto.h#6 integrate .. //depot/projects/interrupt/sys/sys/systm.h#8 integrate .. //depot/projects/interrupt/sys/sys/ucred.h#7 integrate .. //depot/projects/interrupt/sys/sys/unistd.h#3 integrate .. //depot/projects/interrupt/sys/sys/vnode.h#6 integrate .. //depot/projects/interrupt/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/interrupt/sys/ufs/ffs/README.snapshot#2 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_alloc.c#5 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_balloc.c#5 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_extern.h#5 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_inode.c#5 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_softdep_stub.c#4 integrate .. //depot/projects/interrupt/sys/ufs/ffs/ffs_vfsops.c#8 integrate .. //depot/projects/interrupt/sys/ufs/ffs/softdep.h#4 integrate .. //depot/projects/interrupt/sys/ufs/ufs/dinode.h#5 integrate .. //depot/projects/interrupt/sys/ufs/ufs/dirhash.h#2 integrate .. //depot/projects/interrupt/sys/ufs/ufs/quota.h#4 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_bmap.c#5 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_dirhash.c#4 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_extern.h#4 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_ihash.c#3 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_inode.c#5 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_lookup.c#6 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_quota.c#5 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_readwrite.c#7 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_vfsops.c#4 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/interrupt/sys/vm/device_pager.c#4 integrate .. //depot/projects/interrupt/sys/vm/phys_pager.c#4 integrate .. //depot/projects/interrupt/sys/vm/pmap.h#5 integrate .. //depot/projects/interrupt/sys/vm/swap_pager.c#8 integrate .. //depot/projects/interrupt/sys/vm/uma.h#4 integrate .. //depot/projects/interrupt/sys/vm/uma_core.c#5 integrate .. //depot/projects/interrupt/sys/vm/uma_dbg.c#2 integrate .. //depot/projects/interrupt/sys/vm/uma_int.h#3 integrate .. //depot/projects/interrupt/sys/vm/vm_contig.c#5 integrate .. //depot/projects/interrupt/sys/vm/vm_extern.h#5 integrate .. //depot/projects/interrupt/sys/vm/vm_fault.c#7 integrate .. //depot/projects/interrupt/sys/vm/vm_glue.c#7 integrate .. //depot/projects/interrupt/sys/vm/vm_kern.c#7 integrate .. //depot/projects/interrupt/sys/vm/vm_map.c#10 integrate .. //depot/projects/interrupt/sys/vm/vm_map.h#7 integrate .. //depot/projects/interrupt/sys/vm/vm_meter.c#4 integrate .. //depot/projects/interrupt/sys/vm/vm_mmap.c#8 integrate .. //depot/projects/interrupt/sys/vm/vm_object.c#8 integrate .. //depot/projects/interrupt/sys/vm/vm_page.c#7 integrate .. //depot/projects/interrupt/sys/vm/vm_page.h#8 integrate .. //depot/projects/interrupt/sys/vm/vm_pageout.c#6 integrate .. //depot/projects/interrupt/sys/vm/vm_pageq.c#6 integrate .. //depot/projects/interrupt/sys/vm/vm_pager.c#7 integrate .. //depot/projects/interrupt/sys/vm/vm_pager.h#4 integrate .. //depot/projects/interrupt/sys/vm/vm_zeroidle.c#4 integrate .. //depot/projects/interrupt/sys/vm/vnode_pager.c#6 integrate .. //depot/projects/interrupt/sys/x86_64/compile/.cvsignore#1 branch .. //depot/projects/interrupt/sys/x86_64/include/ansi.h#1 branch .. //depot/projects/interrupt/sys/x86_64/include/endian.h#1 branch .. //depot/projects/interrupt/sys/x86_64/include/limits.h#1 branch .. //depot/projects/interrupt/sys/x86_64/include/param.h#1 branch .. //depot/projects/interrupt/sys/x86_64/include/stdarg.h#1 branch .. //depot/projects/interrupt/sys/x86_64/include/types.h#1 branch Differences ... ==== //depot/projects/interrupt/sys/alpha/alpha/autoconf.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.51 2002/03/31 07:15:24 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.52 2002/07/09 19:20:16 obrien Exp $ */ #include "opt_bootp.h" @@ -178,16 +178,14 @@ root_bus_configure(); - if((hwrpb->rpb_type != ST_DEC_3000_300) && - (hwrpb->rpb_type != ST_DEC_3000_500)){ - /* - * Probe ISA devices after everything. - */ + /* + * Probe ISA devices after everything. + */ #ifdef DEV_ISA - if (isa_bus_device) - isa_probe_children(isa_bus_device); + if (isa_bus_device) + isa_probe_children(isa_bus_device); #endif - } + configure_finish(); /* ==== //depot/projects/interrupt/sys/alpha/alpha/cpuconf.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.13 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/cpuconf.c,v 1.14 2002/07/09 19:20:16 obrien Exp $ */ /* $NetBSD: cpuconf.c,v 1.10 1998/03/20 21:48:21 thorpej Exp $ */ /* @@ -39,18 +39,6 @@ #include "opt_cpu.h" -#ifdef DEC_3000_500 -extern void dec_3000_500_init(int); -#else -#define dec_3000_500_init platform_not_configured -#endif - -#ifdef DEC_3000_300 -extern void dec_3000_300_init(int); -#else -#define dec_3000_300_init platform_not_configured -#endif - #ifdef DEC_AXPPCI_33 extern void dec_axppci_33_init(int); #else @@ -134,10 +122,10 @@ cpu_notsupp("ST_ADU"), /* 1: ST_ADU */ cpu_notsupp("ST_DEC_4000"), /* 2: ST_DEC_4000 */ cpu_notsupp("ST_DEC_7000"), /* 3: ST_DEC_7000 */ - cpu_init(dec_3000_500_init,"DEC_3000_500"), /* 4: ST_DEC_3000_500 */ + cpu_notsupp("DEC_3000_500"), /* 4: ST_DEC_3000_500 */ cpu_notsupp("???"), /* 5: ??? */ cpu_notsupp("ST_DEC_2000_300"), /* 6: ST_DEC_2000_300 */ - cpu_init(dec_3000_300_init,"DEC_3000_300"), /* 7: ST_DEC_3000_300 */ + cpu_notsupp("DEC_3000_300"), /* 7: ST_DEC_3000_300 */ cpu_init(avalon_a12_init,"ST_AVALON_A12"), /* 8: ST_AVALON_A12 */ cpu_init(dec_2100_a500_init, "ST_DEC_2100_A500"), /* 9: ST_DEC_2100_A500 */ cpu_notsupp("ST_DEC_APXVME_64"), /* 10: ST_DEC_APXVME_64 */ ==== //depot/projects/interrupt/sys/alpha/alpha/elf_machdep.c#4 (text+ko) ==== @@ -22,7 +22,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/alpha/alpha/elf_machdep.c,v 1.9 2002/04/25 01:22:15 marcel Exp $ + * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.10 2002/07/20 02:56:09 peter Exp $ */ #include @@ -32,10 +32,48 @@ #include #include #include +#include +#include +#include +#include #include #include #include +#include + +struct sysentvec elf64_freebsd_sysvec = { + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf64_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, + "FreeBSD ELF64", + __elfN(coredump), + NULL, + MINSIGSTKSZ +}; +static Elf64_Brandinfo freebsd_brand_info = { + ELFOSABI_FREEBSD, + EM_ALPHA, + "FreeBSD", + "", + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec + }; + +SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_info); + /* Process one elf relocation with addend. */ int elf_reloc(linker_file_t lf, const void *data, int type) @@ -85,7 +123,7 @@ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return -1; - addr += addend; + addr += addend; if (*where != addr) *where = addr; break; ==== //depot/projects/interrupt/sys/alpha/alpha/genassym.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.37 2002/03/29 16:35:25 jake Exp $ + * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.39 2002/07/12 18:34:21 jhb Exp $ */ #include ==== //depot/projects/interrupt/sys/alpha/alpha/pmap.c#6 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.93 2002/06/27 04:08:45 jeff Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.101 2002/07/18 04:08:10 alc Exp $ */ /* @@ -561,9 +561,7 @@ int cputype; cputype = hwrpb->rpb_type; - return (cputype == ST_DEC_21000 || ST_DEC_4100 - || cputype == ST_DEC_3000_300 - || cputype == ST_DEC_3000_500); + return (cputype == ST_DEC_21000 || ST_DEC_4100); return 0; } @@ -901,161 +899,6 @@ } /* - * Create the UPAGES for a new process. - * This routine directly affects the fork perf for a process. - */ -void -pmap_new_proc(struct proc *p) -{ - int i; - vm_object_t upobj; - vm_offset_t up; - vm_page_t m; - pt_entry_t *ptek, oldpte; - - /* - * allocate object for the upages - */ - upobj = p->p_upages_obj; - if (upobj == NULL) { - upobj = vm_object_allocate(OBJT_DEFAULT, UAREA_PAGES); - p->p_upages_obj = upobj; - } - - /* get a kernel virtual address for the UPAGES for this proc */ - up = (vm_offset_t)p->p_uarea; - if (up == 0) { - up = kmem_alloc_nofault(kernel_map, UAREA_PAGES * PAGE_SIZE); - if (up == 0) - panic("pmap_new_proc: upage allocation failed"); - p->p_uarea = (struct user *)up; - } - - ptek = vtopte(up); - - for (i = 0; i < UAREA_PAGES; i++) { - /* - * Get a kernel stack page - */ - m = vm_page_grab(upobj, i, VM_ALLOC_NORMAL | VM_ALLOC_RETRY); - - /* - * Wire the page - */ - m->wire_count++; - cnt.v_wire_count++; - - oldpte = *(ptek + i); - /* - * Enter the page into the kernel address space. - */ - *(ptek + i) = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) - | PG_ASM | PG_KRE | PG_KWE | PG_V; - if (oldpte) - pmap_invalidate_page(kernel_pmap, up + i * PAGE_SIZE); - - vm_page_wakeup(m); - vm_page_flag_clear(m, PG_ZERO); - vm_page_flag_set(m, PG_MAPPED | PG_WRITEABLE); - m->valid = VM_PAGE_BITS_ALL; - } -} - -/* - * Dispose the UPAGES for a process that has exited. - * This routine directly impacts the exit perf of a process. - */ -void -pmap_dispose_proc(p) - struct proc *p; -{ - int i; - vm_object_t upobj; - vm_offset_t up; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 25 11:49:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 479E837B401; Thu, 25 Jul 2002 11:49:14 -0700 (PDT) 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 DFA6B37B400 for ; Thu, 25 Jul 2002 11:49:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 829A043E42 for ; Thu, 25 Jul 2002 11:49:13 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6PInDJU013224 for ; Thu, 25 Jul 2002 11:49:13 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6PInDv6013221 for perforce@freebsd.org; Thu, 25 Jul 2002 11:49:13 -0700 (PDT) Date: Thu, 25 Jul 2002 11:49:13 -0700 (PDT) Message-Id: <200207251849.g6PInDv6013221@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14914 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14914 Change 14914 by green@green_crash2 on 2002/07/25 11:48:35 IFC Affected files ... .. //depot/projects/trustedbsd/base/bin/csh/Makefile#5 integrate .. //depot/projects/trustedbsd/base/bin/csh/nls/Makefile#3 delete Differences ... ==== //depot/projects/trustedbsd/base/bin/csh/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.27 2002/02/12 04:50:12 mp Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.29 2002/07/24 22:26:44 mp Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -10,11 +10,8 @@ .PATH: ${TCSHDIR} PROG= csh -SUBDIR= nls DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} -WARNS= 0 -WFORMAT=0 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ @@ -46,6 +43,34 @@ FILESDIR= ${SHAREDIR}/examples/tcsh FILES= complete.tcsh csh-mode.el +CATALOGS= et:et_EE.ISO8859-15 \ + finnish:fi_FI.ISO8859-1 \ + french:fr_FR.ISO8859-1 \ + german:de_DE.ISO8859-1 \ + greek:el_GR.ISO8859-7 \ + italian:it_IT.ISO8859-1 \ + ja:ja_JP.eucJP \ + russian:ru_RU.KOI8-R \ + spanish:es_ES.ISO8859-1 \ + ukrainian:uk_UA.KOI8-U + +NLSLINKS_fi_FI.ISO8859-1= fi_FI.ISO8859-15 +NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \ + fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \ + fr_CH.ISO8859-15 fr_FR.ISO8859-15 +NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \ + de_CH.ISO8859-15 de_DE.ISO8859-15 +NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15 +NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15 + +NLSNAME= tcsh + +.for catalog in ${CATALOGS} +NLS+= ${catalog:C/.*://} +NLSSRCDIR_${catalog:C/.*://}= ${TCSHDIR}/nls/${catalog:C/:.*//} +NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo set[0-9]* +.endfor + csh.1: tcsh.man ln -sf ${.ALLSRC} ${.TARGET} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 25 11:50:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AE8537B401; Thu, 25 Jul 2002 11:50:16 -0700 (PDT) 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 AFF6237B400 for ; Thu, 25 Jul 2002 11:50:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56E5143E67 for ; Thu, 25 Jul 2002 11:50:15 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6PIoFJU013522 for ; Thu, 25 Jul 2002 11:50:15 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6PIoERp013502 for perforce@freebsd.org; Thu, 25 Jul 2002 11:50:14 -0700 (PDT) Date: Thu, 25 Jul 2002 11:50:14 -0700 (PDT) Message-Id: <200207251850.g6PIoERp013502@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14915 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14915 Change 14915 by green@green_crash2 on 2002/07/25 11:49:55 IFC to try to unbreak world. Affected files ... .. //depot/projects/trustedbsd/mac/bin/csh/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/bin/csh/nls/Makefile#3 delete Differences ... ==== //depot/projects/trustedbsd/mac/bin/csh/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.27 2002/02/12 04:50:12 mp Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.29 2002/07/24 22:26:44 mp Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -10,11 +10,8 @@ .PATH: ${TCSHDIR} PROG= csh -SUBDIR= nls DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} -WARNS= 0 -WFORMAT=0 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ @@ -46,6 +43,34 @@ FILESDIR= ${SHAREDIR}/examples/tcsh FILES= complete.tcsh csh-mode.el +CATALOGS= et:et_EE.ISO8859-15 \ + finnish:fi_FI.ISO8859-1 \ + french:fr_FR.ISO8859-1 \ + german:de_DE.ISO8859-1 \ + greek:el_GR.ISO8859-7 \ + italian:it_IT.ISO8859-1 \ + ja:ja_JP.eucJP \ + russian:ru_RU.KOI8-R \ + spanish:es_ES.ISO8859-1 \ + ukrainian:uk_UA.KOI8-U + +NLSLINKS_fi_FI.ISO8859-1= fi_FI.ISO8859-15 +NLSLINKS_fr_FR.ISO8859-1= fr_BE.ISO8859-1 fr_BE.ISO8859-15 \ + fr_CA.ISO8859-1 fr_CA.ISO8859-15 fr_CH.ISO8859-1 \ + fr_CH.ISO8859-15 fr_FR.ISO8859-15 +NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \ + de_CH.ISO8859-15 de_DE.ISO8859-15 +NLSLINKS_it_IT.ISO8859-1= it_CH.ISO8859-1 it_CH.ISO8859-15 it_IT.ISO8859-15 +NLSLINKS_es_ES.ISO8859-1= es_ES.ISO8859-15 + +NLSNAME= tcsh + +.for catalog in ${CATALOGS} +NLS+= ${catalog:C/.*://} +NLSSRCDIR_${catalog:C/.*://}= ${TCSHDIR}/nls/${catalog:C/:.*//} +NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo set[0-9]* +.endfor + csh.1: tcsh.man ln -sf ${.ALLSRC} ${.TARGET} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 25 15:27:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8193037B401; Thu, 25 Jul 2002 15:26:40 -0700 (PDT) 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 0A94537B400 for ; Thu, 25 Jul 2002 15:26:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAE5143E4A for ; Thu, 25 Jul 2002 15:26:38 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6PMQcJU049981 for ; Thu, 25 Jul 2002 15:26:38 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6PMQcYk049978 for perforce@freebsd.org; Thu, 25 Jul 2002 15:26:38 -0700 (PDT) Date: Thu, 25 Jul 2002 15:26:38 -0700 (PDT) Message-Id: <200207252226.g6PMQcYk049978@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 14920 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14920 Change 14920 by chris@chris_holly on 2002/07/25 15:26:22 o Process labeling event ops o Access control checks That's "all" of the entry points, so far! Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#8 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#8 (text+ko) ==== @@ -2865,20 +2865,651 @@ + + Process Labeling Event Operations + + ... + + + <function>&mac.mpo;_create_subject</function> + + + + void + &mac.mpo;_create_subject + + struct ucred + *parent_cred + struct ucred + *child_cred + + + + + + &mac.thead; + + + + parent_cred + Parent subject credential + + + + child_cred + Child subject credential + + + + + + + Set the label of a newly created subject credential from + the passed subject credential. This call will be made when + crcopy(9) is invoked on a newly created struct + ucred. This call should not be confused with a + process forking or creation event. + + + + <function>&mac.mpo;_execve_transition</function> + + + + void + &mac.mpo;_execve_transition + + struct ucred + *old + struct ucred + *new + struct vnode + *vp + struct label + *vnodelabel + + + + + + &mac.thead; + + + + old + Existing subject credential + Immutable + + + + new + New subject credential to be labeled + + + + vp + File to execute + Locked + + + + vnodelabel + Policy label for + vp + + + + + + Update the label of a newly created subject credential + (new) from the passed existing + subject credential (old) based on a + label transition caused by executing the passed vnode + (vp). This call occurs when a + process executes the passed vnode and one of the policies + returns a success from the + mpo_execve_will_transition entry point. + Policies may choose to implement this call simply by + invoking mpo_create_subject and passing + the two subject credentials so as not to implement a + transitioning event. Policies should not leave this entry + point unimplemented if they implement + mpo_create_subject, even if they do not + implement + mpo_execve_will_transition. + + + + <function>&mac.mpo;_execve_will_transition</function> + + + + int + &mac.mpo;_execve_will_transition + + struct ucred + *old + struct vnode + *vp + struct label + *vnodelabel + + + + + + &mac.thead; + + + + old + Subject credential prior to + &man.execve.2; + Immutable + + + + vp + File to execute + + + + vnodelabel + Policy label for + vp + + + + + + Determine whether the policy will want to perform a + transition event as a result of the execution of the passed + vnode by the passed subject credential. Return + 1 if a transition is required, + 0 if not. Even if a policy + returns 0, it should behave + correctly in the presence of an unexpected invocation of + mpo_execve_transition, as that call may + happen as a result of another policy requesting a + transition. + + + + <function>&mac.mpo;_create_proc0</function> + + + + void + &mac.mpo;_create_proc0 + + struct ucred + *cred + + + + + + &mac.thead; + + + + cred + Subject credential to be filled in + + + + + + Create the subject credential of process 0, the parent + of all kernel processes. + + + + <function>&mac.mpo;_create_proc1</function> + + + + void + &mac.mpo;_create_proc1 + + struct ucred + *cred + + + + + + &mac.thead; + + + + cred + Subject credential to be filled in + + + + + + Create the subject credential of process 1, the parent + of all kernel processes. + + + + <function>&mac.mpo;_relabel_subject</function> + + + + void + &mac.mpo;_relabel_subject + + struct ucred + *cred + struct label + *newlabel + + + + + + &mac.thead; + + + + cred + Subject credential + + + + newlabel + Label update to apply to + cred + + + + + + Update the label on a subject credential from the passed + update label. + + + Access Control Checks Access control checks are implemented as checks supplementary to existing Unix permissions. + + <function>&mac.mpo;_bpfdesc_check_receive_from_ifnet</function> + + + + int + &mac.mpo;_bpfdesc_check_receive_from_ifnet + + struct bpf_d + *bpf_d + struct label + *bpflabel + struct ifnet + *ifnet + struct label + *ifnetlabel + + + + + + &mac.thead; + + + + bpf_d + Subject; BPF descriptor + + + + bpflabel + Policy label for + bpf_d + + + + ifnet + Object; network interface + + + + ifnetlabel + Policy label for + ifnet + + + + + + Determine whether the MAC framework should permit + datagrams from the passed interface to be delivered to the + buffers of the passed BPF descriptor. Return + (0) for success, or an + errno value for failure Suggested + failure: EACCES for label mismatches, + EPERM for lack of privilege. + + + + <function>&mac.mpo;_cred_check_bind_socket</function> + + + + int + &mac.mpo;_cred_check_bind_socket + + struct ucred + *cred + struct socket + *socket + struct label + *socketlabel + struct sockaddr + *sockaddr + + + + + + &mac.thead; + + + + cred + Subject credential + + + + socket + Socket to be bound + + + + socketlabel + Policy label for + socket + + + + sockaddr + Address of + socket + + + + + + + + + <function>&mac.mpo;_cred_check_connect_socket</function> + + + + int + &mac.mpo;_cred_check_connect_socket + + struct ucred + *cred + struct socket + *socket + struct label + *socketlabel + struct sockaddr + *sockaddr + + + + + + &mac.thead; + + + + cred + Subject credential + + + + socket + Socket to be connected + + + + socketlabel + Policy label for + socket + + + + sockaddr + Address of + socket + + + + + + Determine whether the subject credential + (cred) can connect the passed socket + (socket) to the passed socket address + (sockaddr). Return + 0 for success, or an + errno value for failure. Suggested + failure: EACCES for label mismatches, + EPERM for lack of privilege. + + + + <function>&mac.mpo;_cred_check_see_cred</function> + + + + int + &mac.mpo;_cred_check_see_cred + + struct ucred + *u1 + struct ucred + *u2 + + + + + + &mac.thead; + + + + u1 + Subject credential + + + + u2 + Object credential + + + + + + Determine whether the subject credential + u1 can see other + subjects with the passed subject credential + u2. Return + 0 for success, or an + errno value for failure. Suggested + failure: EACCES for label mismatches, + EPERM for lack of privilege, or + ESRCH to hide visibility. This call + may be made in a number of situations, including + inter-process status sysctls used by ps, + and in procfs lookups. + + + + <function>&mac.mpo;_cred_check_see_socket</function> + + + + int + &mac.mpo;_cred_check_see_socket + + struct ucred + *cred + struct socket + *socket + struct label + *socketlabel + + + + + + &mac.thead; + + + + cred + Subject credential + + + + socket + Object; socket + + + + socketlabel + Policy label for + socket + + + + + + + + + <function>&mac.mpo;_cred_check_relabel_ifnet</function> + + + + int + &mac.mpo;_cred_check_relabel_ifnet + + struct ucred + *cred + struct ifnet + *ifnet + struct label + *ifnetlabel + struct label + *newlabel + + + + + + &mac.thead; + + + + cred + Subject credential + + + + ifnet + Object; network interface + + + + ifnetlabel + Existing policy label for + ifnet + + + + newlabel + Policy label update to later be applied to + ifnet + + + + + + Determine whether the subject credential can relabel the + passed network interface to the passed label update. + + + + <function>&mac.mpo;_cred_check_relabel_socket</function> + + + + int + &mac.mpo;_cred_check_relabel_socket + + struct ucred + *cred + struct socket + *socket + struct label + *socketlabel + struct label + *newlabel + + + + + + &mac.thead; + + + + cred + Subject credential + + + + socket + Object; socket + + + + socketlabel + Existing policy label for + socket + + + + newlabel + Label update to later be applied to + socketlabel + + + + + + Determine whether the subject credential can relabel the + passed socket to the passed label update. + + <function>&mac.mpo;_cred_check_relabel_subject</function> int - &mac.mpo;_cred_check_relabel_subject - + &mac.mpo;_cred_check_relabel_subject struct ucred *cred @@ -2890,50 +3521,101 @@ &mac.thead; + + + + cred + Subject credential + + + newlabel + Label update to later be applied to + cred + + + + + + Determine whether the subject credential can relabel + itself to the passed label update. + + + + <function>&mac.mpo;_cred_check_relabel_vnode</function> + + + + int + &mac.mpo;_cred_check_relabel_vnode + + struct ucred + *cred + struct vnode + *vp + struct label + *vnodelabel + struct label + *newlabel + + + + + + &mac.thead; + cred Subject credential + Immutable - newlabel - New label to apply to subject + vp + Object; vnode + Locked + + + + vnodelabel + Existing policy label for + vp + + + + newlabel + Policy label update to later be applied to + vp + - This policy operation is intended to determine whether a - subject should be allowed to change its label. Generally, - this is implemented by checking if the subject would be - upgrading its own privilege by making the requested change, - and denying (returning typically - EPERM) the request if so. + Determine whether the subject credential can relabel the + passed vnode to the passed label update. - - <function>&mac.mpo;_cred_check_statfs</function + + <function>&mac.mpo;_cred_check_statfs</function> - int - &mac.mpo;_cred_check_statfs - + int &mac.mpo;_cred_check_statfs struct ucred *cred struct mount *mp struct label - *mntlabel + *mountlabel &mac.thead; - + cred @@ -2942,29 +3624,28 @@ mp - Object; file system mount point + Object; file system mount - mntlabel - Object label + mountlabel + Policy label for + mp + - This policy operation is intended to determine whether a - specified subject should be allowed to retrieve file system - statistics information. Generally a policy module - implementing this operation would compare the subject label - (cred->cr_label) to the object label - (mntlabel) and return - 0 if the subject is to be granted the - information requested, and EACCES - otherwise. - - Figure out a scenario where using - mp is immenently practical, especially - for use in the sample module. + Determine whether the subject credential can see the + results of a statfs performed on the file system. Return + 0 for success, or an + errno value for failure. Suggested + failure: EACCES for label mismatches + or EPERM for lack of privilege. This + call may be made in a number of situations, including during + invocations of &man.statfs.2; and related calls, as well as to + determine what file systems to exclude from listings of file + systems, such as when &man.getfsstat.2; is invoked. @@ -2973,11 +3654,1390 @@ int - &mac.mpo;_cred_check_debug_proc - + &mac.mpo;_cred_check_debug_proc + + struct ucred + *cred + struct proc + *proc + + + + + + &mac.thead; + + + + cred + Subject credential + Immutable + + + + proc + Object; process + + + + + + Determine whether the subject credential can debug the + passed process. Return 0 for + success, or an errno value for failure. + Suggested failure: EACCES for label + mismatch, EPERM for lack of + privilege, or ESRCH to hide + visibility of the target. This call may be made in a number + of situations, including use of the &man.ptrace.2; and + &man.ktrace.2; APIs, as well as for some types of procfs + operations. + + + + <function>&mac.mpo;_cred_check_access_vnode</function> + + + + int + &mac.mpo;_cred_check_access_vnode + + struct ucred + *cred + struct vnode + *vp + struct label + *label + int flags + + + + + + &mac.thead; + + + + cred + Subject credential + + + + vp + Object; vnode + + + + label + Policy label for + vp + + + + flags + &man.access.2; flags + + + + + + Determine how invocations of &man.access.2; and related + calls by the subject credential should return when performed + on the passed vnode using the passed access flags. Return + 0 for success, or an + errno value for failure. Suggested + failure: EACCES for label mismatches + or EPERM for lack of + privilege. + + + + <function>&mac.mpo;_cred_check_chdir_vnode</function> + + + + int + &mac.mpo;_cred_check_chdir_vnode + + struct ucred + *cred + struct vnode + *dvp + struct label + *dlabel + + + + + + &mac.thead; + + + + cred + Subject credential + + + + dvp + Object; vnode to &man.chdir.2; into + + + + dlabel + Policy label for + dvp + + + + + + Determine whether the subject credential can change the + process working directory to the passed vnode. Return + 0 for success, or an + errno value for failure. Suggested + failure: EACCES for label mismatch, + or EPERM for lack of + privilege. + + + + <function>&mac.mpo;_cred_check_create_vnode</function> + + + + int + &mac.mpo;_cred_check_create_vnode + + struct ucred + *cred + struct vnode + *dvp + struct label + *dlabel + struct componentname + *cnp >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 25 20: 8:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCA3537B401; Thu, 25 Jul 2002 20:08:20 -0700 (PDT) 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 8F51037B400 for ; Thu, 25 Jul 2002 20:08:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AD5343E31 for ; Thu, 25 Jul 2002 20:08:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6Q38KJU096310 for ; Thu, 25 Jul 2002 20:08:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6Q38JS3096307 for perforce@freebsd.org; Thu, 25 Jul 2002 20:08:19 -0700 (PDT) Date: Thu, 25 Jul 2002 20:08:19 -0700 (PDT) Message-Id: <200207260308.g6Q38JS3096307@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14923 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14923 Change 14923 by rwatson@rwatson_curry on 2002/07/25 20:07:42 Sanity checking on label single/range comparison operations. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#71 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#59 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#71 (text+ko) ==== @@ -196,6 +196,11 @@ mac_biba_single_in_range(struct mac_biba *single, struct mac_biba *range) { + KASSERT((single->mb_flag & MAC_BIBA_FLAG_SINGLE) != 0, + ("mac_biba_single_in_range: a not single")); + KASSERT((range->mb_flag & MAC_BIBA_FLAG_RANGE) != 0, + ("mac_biba_single_in_range: b not range")); + return (mac_biba_dominate_element(&range->mb_rangehigh, &single->mb_single) && mac_biba_dominate_element(&single->mb_single, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#59 (text+ko) ==== @@ -181,6 +181,11 @@ mac_mls_single_in_range(struct mac_mls *single, struct mac_mls *range) { + KASSERT((single->mm_flag & MAC_MLS_FLAG_SINGLE) != 0, + ("mac_mls_single_in_range: a not single")); + KASSERT((range->mm_flag & MAC_MLS_FLAG_RANGE) != 0, + ("mac_mls_single_in_range: b not range")); + return (mac_mls_dominate_element(&range->mm_rangehigh, &single->mm_single) && mac_mls_dominate_element(&single->mm_single, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Jul 25 20:22:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7ECB437B401; Thu, 25 Jul 2002 20:22:38 -0700 (PDT) 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 1B90137B400 for ; Thu, 25 Jul 2002 20:22:38 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDCEA43E5E for ; Thu, 25 Jul 2002 20:22:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6Q3MbJU097736 for ; Thu, 25 Jul 2002 20:22:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6Q3Mbkk097733 for perforce@freebsd.org; Thu, 25 Jul 2002 20:22:37 -0700 (PDT) Date: Thu, 25 Jul 2002 20:22:37 -0700 (PDT) Message-Id: <200207260322.g6Q3Mbkk097733@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14924 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14924 Change 14924 by rwatson@rwatson_curry on 2002/07/25 20:21:45 Initialize loopback interfaces as mls/equal(equal-equal) rather than mls/low(low-low). This was lost in the conversion to dynamic labeling. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#60 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#60 (text+ko) ==== @@ -878,11 +878,17 @@ mac_mls_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel) { struct mac_mls *dest; + int level; dest = SLOT(ifnetlabel); - mac_mls_set_single(dest, MAC_MLS_TYPE_LOW, 0); - mac_mls_set_range(dest, MAC_MLS_TYPE_LOW, 0, MAC_MLS_TYPE_LOW, 0); + if (ifnet->if_type == IFT_LOOP) + level = MAC_MLS_TYPE_EQUAL; + else + level = MAC_MLS_TYPE_LOW; + + mac_mls_set_single(dest, level, 0); + mac_mls_set_range(dest, level, 0, level, 0); } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 26 5:52: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 593F537B401; Fri, 26 Jul 2002 05:52:03 -0700 (PDT) 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 E070037B400 for ; Fri, 26 Jul 2002 05:52:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D98C43E42 for ; Fri, 26 Jul 2002 05:52:02 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6QCq2JU093712 for ; Fri, 26 Jul 2002 05:52:02 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6QCq2rf093709 for perforce@freebsd.org; Fri, 26 Jul 2002 05:52:02 -0700 (PDT) Date: Fri, 26 Jul 2002 05:52:02 -0700 (PDT) Message-Id: <200207261252.g6QCq2rf093709@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14943 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14943 Change 14943 by green@green_crash2 on 2002/07/26 05:51:04 The kern_mac.c system call stubs are mandatory. Affected files ... .. //depot/projects/trustedbsd/mac/sys/conf/files#35 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/files#35 (text+ko) ==== @@ -851,7 +851,7 @@ kern/kern_linker.c standard kern/kern_lock.c standard kern/kern_lockf.c standard -kern/kern_mac.c optional mac +kern/kern_mac.c standard kern/kern_malloc.c standard kern/kern_mib.c standard kern/kern_module.c standard To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 26 6:53:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B183637B400; Fri, 26 Jul 2002 06:53:22 -0700 (PDT) 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 2CFB437B401 for ; Fri, 26 Jul 2002 06:53:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F91E43E65 for ; Fri, 26 Jul 2002 06:53:19 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6QDrJJU007432 for ; Fri, 26 Jul 2002 06:53:19 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6QDrIxK007429 for perforce@freebsd.org; Fri, 26 Jul 2002 06:53:18 -0700 (PDT) Date: Fri, 26 Jul 2002 06:53:18 -0700 (PDT) Message-Id: <200207261353.g6QDrIxK007429@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14946 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14946 Change 14946 by green@green_crash2 on 2002/07/26 06:53:10 ... does not belong in mtree files Affected files ... .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#9 (text+ko) ==== @@ -127,11 +127,11 @@ lomac .. mac_biba - ... + .. mac_bsdextended .. mac_mls - ... + .. .. sys .. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 26 7:11:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66DD237B405; Fri, 26 Jul 2002 07:11:46 -0700 (PDT) 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 EE2A037B401 for ; Fri, 26 Jul 2002 07:11:45 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D20543E31 for ; Fri, 26 Jul 2002 07:11:42 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6QEBgJU013386 for ; Fri, 26 Jul 2002 07:11:42 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6QEBfBT013379 for perforce@freebsd.org; Fri, 26 Jul 2002 07:11:41 -0700 (PDT) Date: Fri, 26 Jul 2002 07:11:41 -0700 (PDT) Message-Id: <200207261411.g6QEBfBT013379@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14947 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14947 Change 14947 by green@green_crash2 on 2002/07/26 07:11:01 Try to catch up with the NLS stuff from current more. Affected files ... .. //depot/projects/trustedbsd/base/usr.bin/ee/Makefile#5 integrate Differences ... ==== //depot/projects/trustedbsd/base/usr.bin/ee/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.bin/ee/Makefile,v 1.23 2002/04/28 13:58:41 markm Exp $ +# $FreeBSD: src/usr.bin/ee/Makefile,v 1.24 2002/07/02 12:37:09 ru Exp $ CFLAGS+= -DCAP -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \ -DHAS_CTYPE -DHAS_SYS_IOCTL -DHAS_SYS_WAIT -DSLCT_HDR @@ -9,7 +9,7 @@ DPADD= ${LIBNCURSES} LDADD= -lncurses -LANGS= en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \ +NLS= en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \ uk_UA.KOI8-U ru_RU.KOI8-R NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15 @@ -19,14 +19,9 @@ NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \ de_CH.ISO8859-15 de_DE.ISO8859-15 -NLSNAME=ee - NLSSRCFILES=ee.msg - -.for lang in ${LANGS} -NLSSRCDIR_${lang}.msg=${.CURDIR}/nls/${lang} -NLS+=${lang}.msg +.for lang in ${NLS} +NLSSRCDIR_${lang}= ${.CURDIR}/nls/${lang} .endfor .include -.include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 26 7:15:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3692637B405; Fri, 26 Jul 2002 07:15:49 -0700 (PDT) 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 C199437B401 for ; Fri, 26 Jul 2002 07:15:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43A6743E72 for ; Fri, 26 Jul 2002 07:15:48 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6QEFlJU013756 for ; Fri, 26 Jul 2002 07:15:48 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6QEFlrJ013753 for perforce@freebsd.org; Fri, 26 Jul 2002 07:15:47 -0700 (PDT) Date: Fri, 26 Jul 2002 07:15:47 -0700 (PDT) Message-Id: <200207261415.g6QEFlrJ013753@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14948 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14948 Change 14948 by green@green_crash2 on 2002/07/26 07:15:34 Try chasing current NLS changes. Affected files ... .. //depot/projects/trustedbsd/mac/usr.bin/ee/Makefile#5 integrate Differences ... ==== //depot/projects/trustedbsd/mac/usr.bin/ee/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.bin/ee/Makefile,v 1.23 2002/04/28 13:58:41 markm Exp $ +# $FreeBSD: src/usr.bin/ee/Makefile,v 1.24 2002/07/02 12:37:09 ru Exp $ CFLAGS+= -DCAP -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \ -DHAS_CTYPE -DHAS_SYS_IOCTL -DHAS_SYS_WAIT -DSLCT_HDR @@ -9,7 +9,7 @@ DPADD= ${LIBNCURSES} LDADD= -lncurses -LANGS= en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \ +NLS= en_US.US-ASCII fr_FR.ISO8859-1 de_DE.ISO8859-1 pl_PL.ISO8859-2 \ uk_UA.KOI8-U ru_RU.KOI8-R NLSLINKS_en_US.US-ASCII= en_US.ISO8859-1 en_US.ISO8859-15 @@ -19,14 +19,9 @@ NLSLINKS_de_DE.ISO8859-1= de_AT.ISO8859-1 de_AT.ISO8859-15 de_CH.ISO8859-1 \ de_CH.ISO8859-15 de_DE.ISO8859-15 -NLSNAME=ee - NLSSRCFILES=ee.msg - -.for lang in ${LANGS} -NLSSRCDIR_${lang}.msg=${.CURDIR}/nls/${lang} -NLS+=${lang}.msg +.for lang in ${NLS} +NLSSRCDIR_${lang}= ${.CURDIR}/nls/${lang} .endfor .include -.include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 26 11: 1: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACCA837B405; Fri, 26 Jul 2002 10:59:24 -0700 (PDT) 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 24E6037B400 for ; Fri, 26 Jul 2002 10:59:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37D9943E3B for ; Fri, 26 Jul 2002 10:59:23 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6QHxNJU046682 for ; Fri, 26 Jul 2002 10:59:23 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6QHxK1T046678 for perforce@freebsd.org; Fri, 26 Jul 2002 10:59:20 -0700 (PDT) Date: Fri, 26 Jul 2002 10:59:20 -0700 (PDT) Message-Id: <200207261759.g6QHxK1T046678@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 14954 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14954 Change 14954 by jhb@jhb_laptop on 2002/07/26 10:59:14 IFC. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#33 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#21 integrate .. //depot/projects/smpng/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/smpng/sys/alpha/conf/SIMOS#6 integrate .. //depot/projects/smpng/sys/alpha/conf/gethints.awk#1 branch .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#7 integrate .. //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#5 integrate .. //depot/projects/smpng/sys/boot/efi/Makefile.inc#4 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/efinet.c#3 integrate .. //depot/projects/smpng/sys/boot/efi/loader/conf.c#6 integrate .. //depot/projects/smpng/sys/boot/efi/loader/main.c#5 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.c#4 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#3 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#5 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_memory.c#3 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.c#6 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.h#6 integrate .. //depot/projects/smpng/sys/boot/pc98/Makefile#3 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#6 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#8 integrate .. //depot/projects/smpng/sys/conf/NOTES#19 integrate .. //depot/projects/smpng/sys/conf/files#46 integrate .. //depot/projects/smpng/sys/conf/files.alpha#16 integrate .. //depot/projects/smpng/sys/conf/files.i386#27 integrate .. //depot/projects/smpng/sys/conf/files.ia64#17 integrate .. //depot/projects/smpng/sys/conf/files.pc98#27 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#18 integrate .. //depot/projects/smpng/sys/conf/files.x86_64#2 integrate .. //depot/projects/smpng/sys/conf/gethints.awk#2 delete .. //depot/projects/smpng/sys/conf/kern.post.mk#13 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#14 integrate .. //depot/projects/smpng/sys/conf/options#32 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#29 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_button.c#7 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#9 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_lid.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#16 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_gram.y#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#21 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#20 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.h#9 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#23 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#6 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#22 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-all.c#13 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-all.h#7 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#10 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#14 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#5 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#4 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#7 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#9 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#4 integrate .. //depot/projects/smpng/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/smpng/sys/dev/exca/excavar.h#2 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#15 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#14 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#5 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#16 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#6 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#6 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#6 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#13 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#5 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn_pccard.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csa.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/mixer.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#12 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#1 branch .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.h#1 branch .. //depot/projects/smpng/sys/dev/sound/usb/uaudio_pcm.c#1 branch .. //depot/projects/smpng/sys/dev/sound/usb/uaudioreg.h#1 branch .. //depot/projects/smpng/sys/dev/sr/if_sr.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#21 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#22 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#22 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#3 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#24 integrate .. //depot/projects/smpng/sys/i386/conf/NEWCARD#14 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#38 integrate .. //depot/projects/smpng/sys/i386/conf/OLDCARD#3 integrate .. //depot/projects/smpng/sys/i386/conf/gethints.awk#1 branch .. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#42 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#24 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#14 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#41 integrate .. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#9 integrate .. //depot/projects/smpng/sys/i386/include/atomic.h#9 integrate .. //depot/projects/smpng/sys/i386/include/cpufunc.h#19 integrate .. //depot/projects/smpng/sys/i386/include/cputypes.h#2 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#11 integrate .. //depot/projects/smpng/sys/i386/isa/cx.c#6 integrate .. //depot/projects/smpng/sys/i386/isa/stallion.c#6 integrate .. //depot/projects/smpng/sys/i386/linux/imgact_linux.c#5 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#19 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#6 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#11 integrate .. //depot/projects/smpng/sys/ia64/acpica/madt.c#7 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#18 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32.h#1 branch .. //depot/projects/smpng/sys/ia64/ia32/ia32_misc.c#1 branch .. //depot/projects/smpng/sys/ia64/ia32/ia32_proto.h#2 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_syscall.h#2 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_sysent.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_sysvec.c#1 branch .. //depot/projects/smpng/sys/ia64/ia32/ia32_util.h#1 branch .. //depot/projects/smpng/sys/ia64/ia32/imgact_ia32.c#4 delete .. //depot/projects/smpng/sys/ia64/ia32/imgact_ia32.h#3 delete .. //depot/projects/smpng/sys/ia64/ia32/syscalls.master#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia64/nexus.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#33 integrate .. //depot/projects/smpng/sys/ia64/include/elf.h#7 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#4 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#13 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#15 integrate .. //depot/projects/smpng/sys/kern/imgact_elf32.c#1 branch .. //depot/projects/smpng/sys/kern/imgact_elf64.c#1 branch .. //depot/projects/smpng/sys/kern/imgact_elfN.c#1 branch .. //depot/projects/smpng/sys/kern/imgact_gzip.c#5 integrate .. //depot/projects/smpng/sys/kern/init_main.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_acl.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#28 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_diskslice.c#12 integrate .. //depot/projects/smpng/sys/kern/subr_eventhandler.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#17 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#17 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#20 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#21 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#14 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#14 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#11 integrate .. //depot/projects/smpng/sys/kern/tty.c#26 integrate .. //depot/projects/smpng/sys/kern/uipc_jumbo.c#3 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#8 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#25 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#18 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#23 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#25 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#29 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#41 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#28 integrate .. //depot/projects/smpng/sys/modules/bktr/bktr/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/sound/driver/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/sound/driver/uaudio/Makefile#1 branch .. //depot/projects/smpng/sys/netinet/in_pcb.c#27 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#12 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#21 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#23 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#7 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#14 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/smpng/sys/netinet6/esp_input.c#7 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#7 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#11 integrate .. //depot/projects/smpng/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#17 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#13 integrate .. //depot/projects/smpng/sys/nfsserver/nfs.h#8 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#10 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#11 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#23 integrate .. //depot/projects/smpng/sys/pc98/conf/gethints.awk#1 branch .. //depot/projects/smpng/sys/pc98/i386/machdep.c#37 integrate .. //depot/projects/smpng/sys/pccard/cardinfo.h#5 integrate .. //depot/projects/smpng/sys/pccard/i82365.h#8 integrate .. //depot/projects/smpng/sys/pccard/pccard.c#14 integrate .. //depot/projects/smpng/sys/pccard/pcic.c#17 integrate .. //depot/projects/smpng/sys/pccard/pcic_pci.c#23 integrate .. //depot/projects/smpng/sys/pccard/pcic_pci.h#10 integrate .. //depot/projects/smpng/sys/pccard/pcicvar.h#9 integrate .. //depot/projects/smpng/sys/pccard/slot.h#6 integrate .. //depot/projects/smpng/sys/pci/agp.c#6 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#3 integrate .. //depot/projects/smpng/sys/pci/uhci_pci.c#4 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#20 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#17 integrate .. //depot/projects/smpng/sys/sparc64/include/smp.h#10 integrate .. //depot/projects/smpng/sys/sparc64/include/tlb.h#13 integrate .. //depot/projects/smpng/sys/sparc64/include/tte.h#9 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#22 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.s#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#26 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#14 integrate .. //depot/projects/smpng/sys/sys/buf.h#12 integrate .. //depot/projects/smpng/sys/sys/bus.h#5 integrate .. //depot/projects/smpng/sys/sys/elf_generic.h#3 integrate .. //depot/projects/smpng/sys/sys/imgact.h#5 integrate .. //depot/projects/smpng/sys/sys/imgact_elf.h#5 integrate .. //depot/projects/smpng/sys/sys/param.h#27 integrate .. //depot/projects/smpng/sys/sys/proc.h#54 integrate .. //depot/projects/smpng/sys/sys/resourcevar.h#8 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#23 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#11 integrate .. //depot/projects/smpng/sys/sys/sysent.h#7 integrate .. //depot/projects/smpng/sys/sys/vnode.h#21 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#14 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#6 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#8 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#8 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#16 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep_stub.c#6 integrate .. //depot/projects/smpng/sys/ufs/ffs/softdep.h#4 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#6 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#9 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#8 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#11 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_readwrite.c#11 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#18 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#16 integrate .. //depot/projects/smpng/sys/vm/uma.h#6 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#8 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#12 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#14 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#15 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#19 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#13 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#16 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#19 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#11 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#13 integrate .. //depot/projects/smpng/sys/vm/vm_pageq.c#6 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#8 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#4 (text+ko) ==== @@ -22,7 +22,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/alpha/alpha/elf_machdep.c,v 1.9 2002/04/25 01:22:15 marcel Exp $ + * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.10 2002/07/20 02:56:09 peter Exp $ */ #include @@ -32,10 +32,48 @@ #include #include #include +#include +#include +#include +#include #include #include #include +#include + +struct sysentvec elf64_freebsd_sysvec = { + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf64_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, + "FreeBSD ELF64", + __elfN(coredump), + NULL, + MINSIGSTKSZ +}; +static Elf64_Brandinfo freebsd_brand_info = { + ELFOSABI_FREEBSD, + EM_ALPHA, + "FreeBSD", + "", + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec + }; + +SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_info); + /* Process one elf relocation with addend. */ int elf_reloc(linker_file_t lf, const void *data, int type) @@ -85,7 +123,7 @@ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return -1; - addr += addend; + addr += addend; if (*where != addr) *where = addr; break; ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#33 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.100 2002/07/14 23:51:55 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.101 2002/07/18 04:08:10 alc Exp $ */ /* @@ -1561,14 +1561,14 @@ if (!pmap_pte_v(pte)) { int pindex = NKLEV3MAPS + pmap_lev1_index(kernel_vm_end) - K1SEGLEV1I; - nkpg = vm_page_alloc(kptobj, pindex, VM_ALLOC_SYSTEM); + nkpg = vm_page_alloc(kptobj, pindex, + VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED); if (!nkpg) panic("pmap_growkernel: no memory to grow kernel"); printf("pmap_growkernel: growing to %lx\n", addr); printf("pmap_growkernel: adding new level2 page table\n"); nklev2++; - vm_page_wire(nkpg); pmap_zero_page(nkpg); pa = VM_PAGE_TO_PHYS(nkpg); @@ -1596,13 +1596,12 @@ /* * This index is bogus, but out of the way */ - nkpg = vm_page_alloc(kptobj, nklev3, VM_ALLOC_SYSTEM); + nkpg = vm_page_alloc(kptobj, nklev3, + VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED); if (!nkpg) panic("pmap_growkernel: no memory to grow kernel"); nklev3++; - - vm_page_wire(nkpg); pmap_zero_page(nkpg); pa = VM_PAGE_TO_PHYS(nkpg); newlev2 = pmap_phys_to_pte(pa) | PG_V | PG_ASM | PG_KRE | PG_KWE; ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#21 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.144 2002/07/16 18:20:15 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.146 2002/07/23 06:36:23 peter Exp $ machine alpha cpu EV4 ==== //depot/projects/smpng/sys/alpha/conf/NOTES#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.145 2002/07/16 15:40:19 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.147 2002/07/23 06:36:23 peter Exp $ # # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. ==== //depot/projects/smpng/sys/alpha/conf/SIMOS#6 (text+ko) ==== @@ -11,7 +11,7 @@ # device lines is present in the ./NOTES file. If you are in doubt as # to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.20 2002/07/15 14:33:20 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.22 2002/07/23 06:36:23 peter Exp $ machine alpha cpu EV5 ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#7 (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. * - * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.82 2002/06/02 20:05:40 schweikh Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.83 2002/07/20 02:56:09 peter Exp $ */ /* XXX we use functions that might not exist. */ @@ -189,13 +189,14 @@ &linux_szsigcode, 0, "Linux ELF", - elf_coredump, + elf64_coredump, exec_linux_imgact_try, LINUX_MINSIGSTKSZ }; static Elf64_Brandinfo linux_brand = { ELFOSABI_LINUX, + EM_ALPHA, "Linux", "/compat/linux", "/lib/ld-linux.so.1", @@ -204,6 +205,7 @@ static Elf64_Brandinfo linux_glibc2brand = { ELFOSABI_LINUX, + EM_ALPHA, "Linux", "/compat/linux", "/lib/ld-linux.so.2", @@ -229,7 +231,7 @@ case MOD_LOAD: for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo) - if (elf_insert_brand_entry(*brandinfo) < 0) + if (elf64_insert_brand_entry(*brandinfo) < 0) error = EINVAL; if (error == 0) { SET_FOREACH(lihp, linux_ioctl_handler_set) @@ -242,12 +244,12 @@ case MOD_UNLOAD: for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo) - if (elf_brand_inuse(*brandinfo)) + if (elf64_brand_inuse(*brandinfo)) error = EBUSY; if (error == 0) { for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo) - if (elf_remove_brand_entry(*brandinfo) < 0) + if (elf64_remove_brand_entry(*brandinfo) < 0) error = EINVAL; } if (error == 0) { ==== //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#5 (text+ko) ==== @@ -30,7 +30,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/alpha/osf1/imgact_osf1.c,v 1.11 2002/06/02 20:05:41 schweikh Exp $ + * $FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.12 2002/07/20 02:56:09 peter Exp $ */ #include @@ -178,7 +178,7 @@ /* * Destroy old process VM and create a new one (with a new stack). */ - exec_new_vmspace(imgp); + exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK); /* * The vm space can now be changed. ==== //depot/projects/smpng/sys/boot/efi/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.4 2002/04/06 04:29:36 peter Exp $ +# $FreeBSD: src/sys/boot/efi/Makefile.inc,v 1.5 2002/07/20 03:52:37 peter Exp $ # Options used when building app-specific efi components -CFLAGS+= -ffreestanding +CFLAGS+= -ffreestanding -Wformat ==== //depot/projects/smpng/sys/boot/efi/libefi/efinet.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/efinet.c,v 1.3 2002/03/30 04:50:52 marcel Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/efinet.c,v 1.5 2002/07/20 03:52:18 peter Exp $ */ #include @@ -102,10 +102,14 @@ return -1; /* Wait for the buffer to be transmitted */ - buf = 0; /* XXX Is this needed? */ do { + buf = 0; /* XXX Is this needed? */ status = net->GetStatus(net, 0, &buf); - } while (status == EFI_SUCCESS && buf != pkt); + /* + * XXX EFI1.1 and the E1000 card returns a different + * address than we gave. Sigh. + */ + } while (status == EFI_SUCCESS && buf == 0); /* XXX How do we deal with status != EFI_SUCCESS now? */ return (status == EFI_SUCCESS) ? len : -1; @@ -120,15 +124,26 @@ EFI_STATUS status; UINTN bufsz; time_t t; + char buf[2048]; net = nif->nif_devdata; t = time(0); while ((time(0) - t) < timeout) { - bufsz = len; - status = net->Receive(net, 0, &bufsz, pkt, 0, 0, 0); - if (status == EFI_SUCCESS) + bufsz = sizeof(buf); + status = net->Receive(net, 0, &bufsz, buf, 0, 0, 0); + if (status == EFI_SUCCESS) { + /* + * XXX EFI1.1 and the E1000 card trash our + * workspace if we do not do this silly copy. + * Either they are not respecting the len + * value or do not like the alignment. + */ + if (bufsz > len) + bufsz = len; + bcopy(buf, pkt, bufsz); return bufsz; + } if (status != EFI_NOT_READY) return 0; } @@ -149,7 +164,7 @@ if (net->Mode->State == EfiSimpleNetworkStopped) { status = net->Start(net); if (status != EFI_SUCCESS) { - printf("net%d: cannot start interface (status=%d)\n", + printf("net%d: cannot start interface (status=%ld)\n", nif->nif_unit, status); return; } @@ -158,7 +173,7 @@ if (net->Mode->State != EfiSimpleNetworkInitialized) { status = net->Initialize(net, 0, 0); if (status != EFI_SUCCESS) { - printf("net%d: cannot init. interface (status=%d)\n", + printf("net%d: cannot init. interface (status=%ld)\n", nif->nif_unit, status); return; } @@ -170,7 +185,7 @@ status = net->ReceiveFilters(net, mask, 0, FALSE, 0, 0); if (status != EFI_SUCCESS) { - printf("net%d: cannot set rx. filters (status=%d)\n", + printf("net%d: cannot set rx. filters (status=%ld)\n", nif->nif_unit, status); return; } ==== //depot/projects/smpng/sys/boot/efi/loader/conf.c#6 (text+ko) ==== @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.6 2002/03/19 10:50:41 peter Exp $"; + "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.7 2002/07/20 03:46:43 peter Exp $"; #endif /* not lint */ #include @@ -60,7 +60,7 @@ struct fs_ops *file_system[] = { &efi_fsops, - &ufs_fsops, +/* &ufs_fsops, */ &nfs_fsops, &zipfs_fsops, NULL ==== //depot/projects/smpng/sys/boot/efi/loader/main.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.10 2002/03/30 07:32:08 marcel Exp $"; + "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.11 2002/07/20 03:44:01 peter Exp $"; #endif /* not lint */ #include @@ -292,7 +292,7 @@ { int i; - printf("NumberOfTableEntries=%d\n", ST->NumberOfTableEntries); + printf("NumberOfTableEntries=%ld\n", ST->NumberOfTableEntries); for (i = 0; i < ST->NumberOfTableEntries; i++) { static EFI_GUID mps = MPS_TABLE_GUID; static EFI_GUID acpi = ACPI_TABLE_GUID; @@ -450,7 +450,7 @@ if (!(res.pal_result[0] & 8)) buf.pte.pte_ma = 0; sprintf(lbuf, - "%d %06x %013x %013x %4s %d %d %d %d %d %-3s %d %06x\n", + "%d %06x %013lx %013lx %4s %d %d %d %d %d %-3s %d %06x\n", buf.ifa.ifa_ig & 1, buf.rr.rr_rid, buf.ifa.ifa_vpn, ==== //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.3 2002/07/10 12:13:11 benno Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/elf_freebsd.c,v 1.4 2002/07/18 12:39:01 benno Exp $ */ #include @@ -52,11 +52,6 @@ if (r != 0) return (r); - addr = OF_claim((void *)(*result)->f_addr, (*result)->f_size, 0); - - if (addr == (void *)-1 || addr != (void *)(*result)->f_addr) - return (ENOMEM); - return (0); } ==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_copy.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/ofw_copy.c,v 1.10 2001/10/07 13:27:27 benno Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/ofw_copy.c,v 1.11 2002/07/18 12:39:02 benno Exp $ */ /* * MD primitives supporting placement of module data @@ -35,10 +35,36 @@ #include "libofw.h" #define READIN_BUF (4 * 1024) +#define PAGE_SIZE 0x1000 +#define PAGE_MASK 0x0fff +#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) + ssize_t ofw_copyin(const void *src, vm_offset_t dest, const size_t len) { + void *destp, *addr; + size_t dlen; + + destp = (void *)(dest & ~PAGE_MASK); + dlen = roundup(len, PAGE_SIZE); + + if (OF_call_method("claim", memory, 3, 1, destp, dlen, 0, &addr) + == -1) { + printf("ofw_copyin: physical claim failed\n"); + return (0); + } + + if (OF_call_method("claim", mmu, 3, 1, destp, dlen, 0, &addr) == -1) { + printf("ofw_copyin: virtual claim failed\n"); + return (0); + } + + if (OF_call_method("map", mmu, 4, 0, destp, destp, dlen, 0) == -1) { + printf("ofw_copyin: map failed\n"); + return (0); + } + bcopy(src, (void *)dest, len); return(len); } @@ -76,7 +102,7 @@ break; } - bcopy(buf, (void *)p, got); + ofw_copyin(buf, p, got); } free(buf); ==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#5 (text+ko) ==== @@ -22,7 +22,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.6 2002/05/11 21:30:46 jake Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/ofw_disk.c,v 1.7 2002/07/18 12:39:02 benno Exp $ */ /* @@ -181,12 +181,8 @@ static int ofwd_init(void) { -#ifdef __sparc64__ /* Short-circuit the device probing, since it takes too long. */ return 0; -#else - return ofwd_init_devs(); -#endif } static int ==== //depot/projects/smpng/sys/boot/ofw/libofw/ofw_memory.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/ofw_memory.c,v 1.2 2001/10/15 12:16:20 robert Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/ofw_memory.c,v 1.3 2002/07/18 12:39:02 benno Exp $ */ #include @@ -47,17 +47,15 @@ void ofw_memmap(void) { - ihandle_t mmui; - phandle_t mmu; + phandle_t mmup; int nmapping, i; struct ofw_mapping mappings[256]; - OF_getprop(chosen, "mmu", &mmui, 4); - mmu = OF_instance_to_package(mmui); + mmup = OF_instance_to_package(mmu); bzero(mappings, sizeof(mappings)); - nmapping = OF_getprop(mmu, "translations", mappings, sizeof(mappings)); + nmapping = OF_getprop(mmup, "translations", mappings, sizeof(mappings)); if (nmapping == -1) { printf("Could not get memory map (%d)\n", nmapping); @@ -79,14 +77,12 @@ void * ofw_alloc_heap(unsigned int size) { - ihandle_t meminstance; - phandle_t memory; + phandle_t memoryp; struct ofw_reg available; void *base; - OF_getprop(chosen, "memory", &meminstance, sizeof(meminstance)); - memory = OF_instance_to_package(meminstance); - OF_getprop(memory, "available", &available, sizeof(available)); + memoryp = OF_instance_to_package(memory); + OF_getprop(memoryp, "available", &available, sizeof(available)); heap_base = OF_claim((void *)available.base, size, sizeof(register_t)); ==== //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.c#6 (text+ko) ==== @@ -54,7 +54,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.6 2002/02/23 03:36:04 jake Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/openfirm.c,v 1.7 2002/07/18 12:39:02 benno Exp $ */ #include @@ -68,8 +68,8 @@ static ihandle_t stdin; static ihandle_t stdout; -static ihandle_t mmu; -static ihandle_t memory; +ihandle_t mmu; +ihandle_t memory; /* Initialiaser */ ==== //depot/projects/smpng/sys/boot/ofw/libofw/openfirm.h#6 (text+ko) ==== @@ -54,7 +54,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/ofw/libofw/openfirm.h,v 1.7 2002/02/23 03:36:04 jake Exp $ + * $FreeBSD: src/sys/boot/ofw/libofw/openfirm.h,v 1.8 2002/07/18 12:39:02 benno Exp $ */ #ifndef _OPENFIRM_H_ #define _OPENFIRM_H_ @@ -71,6 +71,7 @@ extern int (*openfirmware)(void *); extern phandle_t chosen; +extern ihandle_t memory, mmu; /* * This isn't actually an OpenFirmware function, but it seemed like the right ==== //depot/projects/smpng/sys/boot/pc98/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/boot/pc98/Makefile,v 1.6 2002/01/18 09:00:37 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/Makefile,v 1.7 2002/07/18 14:50:41 nyan Exp $ -SUBDIR= btx boot0 boot0.5 boot2 kgzldr libpc98 loader +SUBDIR= btx boot0 boot0.5 kgzldr libpc98 loader .include ==== //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#11 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD$ */ -/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.15 2002/04/09 20:10:40 jhb Exp $ */ +/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.16 2002/07/20 02:56:09 peter Exp $ */ /* * Copyright (c) 2000 Masaru OKI @@ -465,7 +465,7 @@ peofs + PECOFF_HDR_SIZE, (caddr_t) sh, scnsiz); if ((error = exec_extract_strings(imgp)) != 0) goto fail; - exec_new_vmspace(imgp); + exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK); vmspace = imgp->proc->p_vmspace; for (i = 0; i < fp->f_nscns; i++) { prot = VM_PROT_WRITE; /* XXX for relocation? */ ==== //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#6 (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/compat/svr4/imgact_svr4.c,v 1.15 2002/06/02 20:05:43 schweikh Exp $ + * $FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.16 2002/07/20 02:56:09 peter Exp $ */ #include @@ -119,7 +119,7 @@ /* * Destroy old process VM and create a new one (with a new stack) */ - exec_new_vmspace(imgp); + exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK); vmspace = imgp->proc->p_vmspace; /* ==== //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#8 (text+ko) ==== @@ -27,7 +27,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/compat/svr4/svr4_sysvec.c,v 1.25 2002/07/09 14:59:27 robert Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.26 2002/07/20 02:56:09 peter Exp $ */ /* XXX we use functions that might not exist. */ @@ -179,13 +179,14 @@ &svr4_szsigcode, NULL, "SVR4", - elf_coredump, + elf32_coredump, NULL, SVR4_MINSIGSTKSZ }; Elf32_Brandinfo svr4_brand = { ELFOSABI_SYSV, + EM_386, /* XXX only implemented for x86 so far. */ "SVR4", svr4_emul_path, "/lib/libc.so.1", @@ -376,7 +377,7 @@ switch(type) { case MOD_LOAD: - if (elf_insert_brand_entry(&svr4_brand) < 0) + if (elf32_insert_brand_entry(&svr4_brand) < 0) error = EINVAL; if (error) printf("cannot insert svr4 elf brand handler\n"); @@ -385,9 +386,9 @@ break; case MOD_UNLOAD: /* Only allow the emulator to be removed if it isn't in use. */ - if (elf_brand_inuse(&svr4_brand) != 0) { + if (elf32_brand_inuse(&svr4_brand) != 0) { error = EBUSY; - } else if (elf_remove_brand_entry(&svr4_brand) < 0) { + } else if (elf32_remove_brand_entry(&svr4_brand) < 0) { error = EINVAL; } ==== //depot/projects/smpng/sys/conf/NOTES#19 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1057 2002/07/16 18:20:15 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1059 2002/07/21 23:20:29 peter Exp $ # # @@ -1557,7 +1557,7 @@ # Order for ISA/EISA devices is important here -device ar 1 +device ar hint.ar.0.at="isa" hint.ar.0.port="0x300" hint.ar.0.irq="10" @@ -1578,16 +1578,16 @@ hint.ed.0.maddr="0xd8000" device ep device ex -device fe 1 +device fe hint.fe.0.at="isa" hint.fe.0.port="0x300" device fea -device lnc 1 +device lnc hint.lnc.0.at="isa" hint.lnc.0.port="0x280" hint.lnc.0.irq="10" hint.lnc.0.drq="0" -device sr 1 +device sr hint.sr.0.at="isa" hint.sr.0.port="0x300" hint.sr.0.irq="5" @@ -1602,7 +1602,7 @@ device wi options WLCACHE # enables the signal-strength cache options WLDEBUG # enables verbose debugging output -device wl 1 +device wl hint.wl.0.at="isa" hint.wl.0.port="0x300" device xe @@ -1635,7 +1635,7 @@ device nge device sk device ti -device fpa 1 +device fpa >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 26 12:49:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FFF337B405; Fri, 26 Jul 2002 12:49:28 -0700 (PDT) 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 D88F837B400 for ; Fri, 26 Jul 2002 12:49:27 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F11243E86 for ; Fri, 26 Jul 2002 12:48:45 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6QJmZJU063554 for ; Fri, 26 Jul 2002 12:48:35 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6QJmYuZ063551 for perforce@freebsd.org; Fri, 26 Jul 2002 12:48:34 -0700 (PDT) Date: Fri, 26 Jul 2002 12:48:34 -0700 (PDT) Message-Id: <200207261948.g6QJmYuZ063551@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14956 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14956 Change 14956 by green@green_crash2 on 2002/07/26 12:48:30 More release build fixes: use echo(1) instead of ls(1) to list files, and add touch(1) to the commands preserved for the install environment. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#17 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#17 (text+ko) ==== @@ -359,7 +359,7 @@ mkdir -p ${INSTALLTMP} for prog in [ awk cat chflags chmod chown cpio date echo egrep find \ grep ln make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ - test true uname wc zic; do \ + test touch true uname wc zic; do \ cp `which $$prog` ${INSTALLTMP}; \ done cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//} ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/Makefile#4 (text+ko) ==== @@ -19,19 +19,19 @@ POLICYFILES += rbac users constraints POLICYFILES += initial_sid_contexts fs_use genfs_contexts net_contexts -MACROPROGRAMFILES != ls macros/program/*.te -MACROFILES != ls macros/*.te +MACROPROGRAMFILES != echo macros/program/*.te +MACROFILES != echo macros/*.te MACROFILES += $(MACROPROGRAMFILES) -PROGRAMFILES != ls domains/program/*.te -TYPEFILES != ls types/*.te +PROGRAMFILES != echo domains/program/*.te +TYPEFILES != echo types/*.te FC = file_contexts/file_contexts -FCFILES != ls file_contexts/*.fc file_contexts/program/*.fc +FCFILES != echo file_contexts/*.fc file_contexts/program/*.fc ALLTEFILES := macros/global_macros.te attrib.te tmp/all_types.te tmp/all_program_macros.te tmp/all_domains.te assert.te -ALLDOMAINS != ls domains/*.te domains/misc/*.te domains/program/*.te +ALLDOMAINS != echo domains/*.te domains/misc/*.te domains/program/*.te policy.11: policy.conf ${CHECKPOLICY} -o policy.11 policy.conf To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 26 13: 9: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67FB237B401; Fri, 26 Jul 2002 13:09:01 -0700 (PDT) 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 0B35537B400 for ; Fri, 26 Jul 2002 13:09:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C050343E6E for ; Fri, 26 Jul 2002 13:09:00 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6QK90JU069788 for ; Fri, 26 Jul 2002 13:09:00 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6QK90nR069783 for perforce@freebsd.org; Fri, 26 Jul 2002 13:09:00 -0700 (PDT) Date: Fri, 26 Jul 2002 13:09:00 -0700 (PDT) Message-Id: <200207262009.g6QK90nR069783@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 14958 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14958 Change 14958 by green@green_crash2 on 2002/07/26 13:08:09 Add m4 to the list of necessary install-tools. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#18 edit Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#18 (text+ko) ==== @@ -358,7 +358,7 @@ distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} for prog in [ awk cat chflags chmod chown cpio date echo egrep find \ - grep ln make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ + grep ln m4 make mkdir mtree mv pwd_mkdb rm sed sh sysctl \ test touch true uname wc zic; do \ cp `which $$prog` ${INSTALLTMP}; \ done To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 26 19:36:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B820737B401; Fri, 26 Jul 2002 19:35:59 -0700 (PDT) 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 2BC3937B400 for ; Fri, 26 Jul 2002 19:35:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D481B43E42 for ; Fri, 26 Jul 2002 19:35:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6R2ZwJU025210 for ; Fri, 26 Jul 2002 19:35:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6R2ZwHN025207 for perforce@freebsd.org; Fri, 26 Jul 2002 19:35:58 -0700 (PDT) Date: Fri, 26 Jul 2002 19:35:58 -0700 (PDT) Message-Id: <200207270235.g6R2ZwHN025207@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14968 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14968 Change 14968 by peter@peter_ia64 on 2002/07/26 19:35:30 refine my understanding of the routing Affected files ... .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#6 edit .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#6 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#6 (text+ko) ==== @@ -343,13 +343,13 @@ #ifdef TIGER4 device_printf(sc->ap_dev, "acpi_pcib_route_interrupt: %s pci%d:%d:%d\n", acpi_name(sc->ap_handle), bus, slot, pin); if (bus == 0 && slot == 29 && pin == 0) { - interrupt = 50; /* usb0 */ + interrupt = 50; /* usb0 50 */ device_printf(sc->ap_dev, "IRQ ROUTING KLUDGE %s bus %d slot %d pin %d -> %d\n", acpi_name(sc->ap_handle), bus, slot, pin, interrupt); goto out; } if (bus == 0 && slot == 29 && pin == 1) { - interrupt = 49; /* usb1 */ + interrupt = 49; /* usb1 49 */ device_printf(sc->ap_dev, "IRQ ROUTING KLUDGE %s bus %d slot %d pin %d -> %d\n", acpi_name(sc->ap_handle), bus, slot, pin, interrupt); goto out; ==== //depot/projects/ia64/sys/dev/pci/pci_pci.c#6 (text+ko) ==== @@ -429,15 +429,7 @@ int childslot = pci_get_slot(dev); int childpin = pin - 1; int childbus = pci_get_bus(dev); -device_printf(dev, "pcib_route_interrupt: pci%d:%d:%d\n", childbus, childslot, childpin); intnum = 255; -/* -em0: pcib_route_interrupt: pci1:0:0 -fxp0: pcib_route_interrupt: pci3:2:0 -fxp1: pcib_route_interrupt: pci5:1:0 -isp0: pcib_route_interrupt: pci10:2:0 -fxp2: pcib_route_interrupt: pci13:1:0 -*/ #if 0 /* XXX need to hack this at acpi level */ if (childbus == 1 && childslot == 29 && childpin == 0) intnum = 50; /* usb */ @@ -445,13 +437,18 @@ intnum = 49; /* usb */ #endif if (childbus == 1 && childslot == 0 && childpin == 0) - intnum = 51; /* em */ + intnum = 18; /* em 51 */ if (childbus == 3 && childslot == 2 && childpin == 0) - intnum = 63; /* fxp0 */ + intnum = 52; /* fxp0 63 */ + if (childbus == 5 && childslot == 1 && childpin == 0) + intnum = 24; /* fxp1 52 */ + if (childbus == 10 && childslot == 2 && childpin == 0) + intnum = 76; /* isp0 72 */ + if (childbus == 13 && childslot == 1 && childpin == 0) + intnum = 16; /* fxp2 86 */ +#if 0 if (childbus == 3 && childslot == 31 && childpin == 0) intnum = 67; /* hotplug */ - if (childbus == 5 && childslot == 1 && childpin == 0) - intnum = 52; /* fxp1 */ if (childbus == 5 && childslot == 2 && childpin == 0) intnum = 56; /* mpt0 */ if (childbus == 5 && childslot == 2 && childpin == 1) @@ -460,18 +457,15 @@ intnum = 58; /* hotplug */ if (childbus == 8 && childslot == 31 && childpin == 0) intnum = 80; /* hotplug */ - if (childbus == 10 && childslot == 2 && childpin == 0) - intnum = 72; /* isp0 */ if (childbus == 10 && childslot == 31 && childpin == 0) intnum = 75; /* hotplug */ - if (childbus == 13 && childslot == 1 && childpin == 0) - intnum = 86; /* fxp2 */ if (childbus == 13 && childslot == 31 && childpin == 0) intnum = 90; /* hotplug */ if (childbus == 14 && childslot == 31 && childpin == 0) intnum = 85; /* hotplug */ +#endif if (intnum != 255) { -device_printf(dev, "Hardwiring IRQ to %d\n", intnum); +device_printf(dev, "pcib_route_interrupt: pci%d:%d:%d - Hardwiring to IRQ %d\n", childbus, childslot, childpin, intnum); return intnum; } #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 26 19:37: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AA8D37B405; Fri, 26 Jul 2002 19:37:01 -0700 (PDT) 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 E43AE37B401 for ; Fri, 26 Jul 2002 19:37:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A69FD43E42 for ; Fri, 26 Jul 2002 19:37:00 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6R2b0JU025376 for ; Fri, 26 Jul 2002 19:37:00 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6R2b0A6025371 for perforce@freebsd.org; Fri, 26 Jul 2002 19:37:00 -0700 (PDT) Date: Fri, 26 Jul 2002 19:37:00 -0700 (PDT) Message-Id: <200207270237.g6R2b0A6025371@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14969 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14969 Change 14969 by peter@peter_ia64 on 2002/07/26 19:36:50 ignore memory above 4G right now. pci is Not Happy. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#41 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#41 (text+ko) ==== @@ -570,6 +570,15 @@ if (mdp->Type != EfiConventionalMemory) continue; + if (pfn0 >= ia64_btop(0x100000000UL)) { + printf("skipping memory chunk start 0x%lx\n", mdp->PhysicalStart); + continue; + } + if (pfn1 >= ia64_btop(0x100000000UL)) { + printf("skipping memory chunk end 0x%lx\n", mdp->PhysicalStart + mdp->NumberOfPages * 4096); + continue; + } + /* * We have a memory descriptor that describes conventional * memory that is for general use. We must determine if the To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 26 19:38: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2394E37B401; Fri, 26 Jul 2002 19:38:03 -0700 (PDT) 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 BB40137B400 for ; Fri, 26 Jul 2002 19:38:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78B6143E4A for ; Fri, 26 Jul 2002 19:38:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6R2c2JU025532 for ; Fri, 26 Jul 2002 19:38:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6R2c2W7025529 for perforce@freebsd.org; Fri, 26 Jul 2002 19:38:02 -0700 (PDT) Date: Fri, 26 Jul 2002 19:38:02 -0700 (PDT) Message-Id: <200207270238.g6R2c2W7025529@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14970 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14970 Change 14970 by peter@peter_ia64 on 2002/07/26 19:37:40 checkpoint. I added some delivery modes. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/sapic.c#9 edit .. //depot/projects/ia64/sys/ia64/include/sapicvar.h#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/sapic.c#9 (text+ko) ==== @@ -102,6 +102,7 @@ u_int32_t *p = (u_int32_t *) rte; register_t c; +/* printf("sapic_write_rte: input %d low 0x%08x high 0x%08x\n", which, p[0], p[1]); */ c = intr_disable(); sapic_write(sa, SAPIC_RTE_BASE + 2*which, p[0]); sapic_write(sa, SAPIC_RTE_BASE + 2*which + 1, p[1]); @@ -137,12 +138,14 @@ struct sapic_rte rte; u_int64_t lid = ia64_get_lid(); +/* printf("sapic_enable: input %d vector %d mylid 0x%lx\n", input, vector, lid); */ bzero(&rte, sizeof(rte)); rte.rte_destination_id = (lid >> 24) & 255; rte.rte_destination_eid = (lid >> 16) & 255; +/* printf("sapic_enable: dest_id 0x%x dest_eid 0x%x\n", rte.rte_destination_id, rte.rte_destination_eid); */ rte.rte_trigger_mode = trigger_mode; rte.rte_polarity = polarity; - rte.rte_delivery_mode = 0; /* fixed */ + rte.rte_delivery_mode = SAPIC_DELMODE_FIXED; rte.rte_vector = vector; sapic_write_rte(sa, input, &rte); } ==== //depot/projects/ia64/sys/ia64/include/sapicvar.h#3 (text+ko) ==== @@ -42,6 +42,13 @@ #define SAPIC_POLARITY_HIGH 0 #define SAPIC_POLARITY_LOW 1 +#define SAPIC_DELMODE_FIXED 0 +#define SAPIC_DELMODE_LOWPRI 1 +#define SAPIC_DELMODE_PMI 2 +#define SAPIC_DELMODE_NMI 4 +#define SAPIC_DELMODE_INIT 5 +#define SAPIC_DELMODE_EXTINT 7 + struct sapic *sapic_create(int id, int base, u_int64_t address); void sapic_enable(struct sapic *sa, int input, int vector, int trigger_mode, int polarity); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 26 19:39:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4943437B401; Fri, 26 Jul 2002 19:39:05 -0700 (PDT) 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 BF1B237B400 for ; Fri, 26 Jul 2002 19:39:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6260E43E5E for ; Fri, 26 Jul 2002 19:39:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6R2d4JU025567 for ; Fri, 26 Jul 2002 19:39:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6R2d4Se025564 for perforce@freebsd.org; Fri, 26 Jul 2002 19:39:04 -0700 (PDT) Date: Fri, 26 Jul 2002 19:39:04 -0700 (PDT) Message-Id: <200207270239.g6R2d4Se025564@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14971 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14971 Change 14971 by peter@peter_ia64 on 2002/07/26 19:38:20 This actually booted! Shock! Horror! Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#10 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#10 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include #include +#include #include #include @@ -87,6 +88,8 @@ static u_int schedclk2; +time_t lts; +u_int64_t lv; void interrupt(u_int64_t vector, struct trapframe *framep) @@ -148,8 +151,20 @@ CTR1(KTR_SMP, "IPI_TEST, cpuid=%d", PCPU_GET(cpuid)); mp_ipi_test++; #endif - } else + } else { +#if 0 +if (1 || vector < 48) { +if (lts != time_second || lv != vector) { + printf(">I%ld<", vector - 32); + lts = time_second; + lv = vector; +} +} else { +cnputc('I'); +} +#endif ia64_dispatch_intr(framep, vector); + } out: atomic_subtract_int(&td->td_intr_nesting_level, 1); @@ -187,8 +202,6 @@ static struct mtx ia64_intrs_lock; static struct ia64_intr *ia64_intrs[256]; -static void ithds_init(void *dummy); - static void ithds_init(void *dummy) { @@ -197,9 +210,11 @@ } SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL); + void ia64_add_sapic(struct sapic *sa) { + printf("SAPIC %d is %p, %d-%d\n", ia64_sapic_count, sa, sa->sa_base, sa->sa_limit); ia64_sapics[ia64_sapic_count++] = sa; } @@ -211,7 +226,8 @@ irq = vector - IA64_HARDWARE_IRQ_BASE; for (i = 0; i < ia64_sapic_count; i++) { struct sapic *sa = ia64_sapics[i]; - if (irq >= sa->sa_base && irq <= sa->sa_limit) + if (irq >= sa->sa_base && irq <= sa->sa_limit) { +/* printf("ia64_enable: vector %d -> hw int %d apic %d input %d\n", vector, irq, i, irq - sa->sa_base); */ sapic_enable(sa, irq - sa->sa_base, vector, (irq < 16 ? SAPIC_TRIGGER_EDGE @@ -219,8 +235,44 @@ (irq < 16 ? SAPIC_POLARITY_HIGH : SAPIC_POLARITY_LOW)); + } + } +} + +#if 0 +#if 0 +long fakecnt; +static void +fakeihand(void *junk) +{ + printf(">FAKE %d<", (int)(uintptr_t)junk); +} +#endif +static void +ithds_init2(void *dummy) +{ +#if 0 + void *cookie; + void *arg; +#endif + int i; + + printf("SETTING UP FAKE INTERRUPTS\n"); + for (i = 16; i < 128; i++) { +#if 0 + if (ia64_intrs[i + IA64_HARDWARE_IRQ_BASE]) + continue; + arg = (void *)(uintptr_t)i; + ia64_setup_intr("fake", i + IA64_HARDWARE_IRQ_BASE, fakeihand, arg, INTR_TYPE_TTY, &cookie, &fakecnt); +#else + ia64_enable(i + IA64_HARDWARE_IRQ_BASE); +#endif } + printf("SETTING UP DONE\n"); + } +SYSINIT(ithds_init2, SI_SUB_PSEUDO, SI_ORDER_ANY, ithds_init2, NULL); +#endif static void ia64_send_eoi(int vector) @@ -260,6 +312,7 @@ if (i == NULL) return ENOMEM; i->cntp = cntp; +/* printf("ia64_setup_intr: creating ithread for vector %d\n", vector); */ errcode = ithread_create(&i->ithd, vector, 0, 0, ia64_send_eoi, "intr:"); if (errcode) { @@ -272,12 +325,14 @@ mtx_unlock_spin(&ia64_intrs_lock); } +/* printf("ia64_setup_intr: add handler for vector %d\n", vector); */ /* Second, add this handler. */ errcode = ithread_add_handler(i->ithd, name, handler, arg, ithread_priority(flags), flags, cookiep); if (errcode) return errcode; +/* printf("ia64_setup_intr: enable vector %d\n", vector); */ ia64_enable(vector); return 0; } @@ -297,12 +352,15 @@ struct intrhand *ih; int error; + /* * Find the interrupt thread for this vector. */ i = ia64_intrs[vector]; - if (i == NULL) + if (i == NULL) { +printf(">>STRAY IRQ VECTOR %ld (IRQ %ld)<<\n", vector, vector - 32); return; /* no ithread for this vector */ + } ithd = i->ithd; KASSERT(ithd != NULL, ("interrupt vector without a thread")); @@ -311,8 +369,10 @@ * As an optimization, if an ithread has no handlers, don't * schedule it to run. */ - if (TAILQ_EMPTY(&ithd->it_handlers)) + if (TAILQ_EMPTY(&ithd->it_handlers)) { +printf(">>STRAY HANDLER VECTOR %ld (IRQ %ld)<<\n", vector, vector - 32); return; +} if (i->cntp) atomic_add_long(i->cntp, 1); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 26 19:41:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 181E237B401; Fri, 26 Jul 2002 19:41:08 -0700 (PDT) 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 BF42B37B400 for ; Fri, 26 Jul 2002 19:41:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C08643E3B for ; Fri, 26 Jul 2002 19:41:07 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6R2f7JU025872 for ; Fri, 26 Jul 2002 19:41:07 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6R2f7Xa025862 for perforce@freebsd.org; Fri, 26 Jul 2002 19:41:07 -0700 (PDT) Date: Fri, 26 Jul 2002 19:41:07 -0700 (PDT) Message-Id: <200207270241.g6R2f7Xa025862@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 14972 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14972 Change 14972 by peter@peter_ia64 on 2002/07/26 19:40:33 Checkpoint. This boots/runs. I2.hints has got the console pointing to what is traditionally com2, because that's all this box has. loader hints work fine now anyway. Affected files ... .. //depot/projects/ia64/sys/ia64/conf/I2#1 add .. //depot/projects/ia64/sys/ia64/conf/I2.hints#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Jul 26 22:31:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6A0C37B401; Fri, 26 Jul 2002 22:30:30 -0700 (PDT) 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 8BAF337B400 for ; Fri, 26 Jul 2002 22:30:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D887943E3B for ; Fri, 26 Jul 2002 22:30:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6R5USJU051001 for ; Fri, 26 Jul 2002 22:30:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6R5Tvx1050808 for perforce@freebsd.org; Fri, 26 Jul 2002 22:29:57 -0700 (PDT) Date: Fri, 26 Jul 2002 22:29:57 -0700 (PDT) Message-Id: <200207270529.g6R5Tvx1050808@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14977 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14977 Change 14977 by rwatson@rwatson_paprika on 2002/07/26 22:29:05 IFC FreeBSD vendor head into trustedbsd_base. This includes various things; in particular, KSEIII, some more nmount, and past merges of supporting MAC changes back to the main tree. Once I've done some test running of this tree, I will begin to IFC this into the trustedbsd_mac tree. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#6 integrate .. //depot/projects/trustedbsd/base/Makefile#10 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#18 integrate .. //depot/projects/trustedbsd/base/README#3 integrate .. //depot/projects/trustedbsd/base/UPDATING#15 integrate .. //depot/projects/trustedbsd/base/bin/cat/cat.c#6 integrate .. //depot/projects/trustedbsd/base/bin/chio/chio.c#6 integrate .. //depot/projects/trustedbsd/base/bin/chmod/Makefile#3 integrate .. //depot/projects/trustedbsd/base/bin/chmod/chmod.1#3 integrate .. //depot/projects/trustedbsd/base/bin/chmod/chmod.c#4 integrate .. //depot/projects/trustedbsd/base/bin/cp/Makefile#4 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.1#2 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.c#8 integrate .. //depot/projects/trustedbsd/base/bin/cp/extern.h#4 integrate .. //depot/projects/trustedbsd/base/bin/cp/utils.c#5 integrate .. //depot/projects/trustedbsd/base/bin/date/date.c#4 integrate .. //depot/projects/trustedbsd/base/bin/date/netdate.c#5 integrate .. //depot/projects/trustedbsd/base/bin/date/vary.c#3 integrate .. //depot/projects/trustedbsd/base/bin/dd/args.c#7 integrate .. //depot/projects/trustedbsd/base/bin/dd/conv.c#3 integrate .. //depot/projects/trustedbsd/base/bin/dd/conv_tab.c#2 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.c#6 integrate .. //depot/projects/trustedbsd/base/bin/dd/misc.c#4 integrate .. //depot/projects/trustedbsd/base/bin/dd/position.c#3 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#8 integrate .. //depot/projects/trustedbsd/base/bin/domainname/domainname.c#4 integrate .. //depot/projects/trustedbsd/base/bin/echo/echo.c#4 integrate .. //depot/projects/trustedbsd/base/bin/ed/buf.c#4 integrate .. //depot/projects/trustedbsd/base/bin/ed/cbc.c#3 integrate .. //depot/projects/trustedbsd/base/bin/ed/ed.1#4 integrate .. //depot/projects/trustedbsd/base/bin/ed/glbl.c#3 integrate .. //depot/projects/trustedbsd/base/bin/ed/io.c#3 integrate .. //depot/projects/trustedbsd/base/bin/ed/main.c#4 integrate .. //depot/projects/trustedbsd/base/bin/ed/re.c#3 integrate .. //depot/projects/trustedbsd/base/bin/ed/sub.c#3 integrate .. //depot/projects/trustedbsd/base/bin/ed/undo.c#3 integrate .. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.c#4 integrate .. //depot/projects/trustedbsd/base/bin/hostname/hostname.c#4 integrate .. //depot/projects/trustedbsd/base/bin/kill/kill.c#4 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.c#6 integrate .. //depot/projects/trustedbsd/base/bin/ls/cmp.c#3 integrate .. //depot/projects/trustedbsd/base/bin/ls/lomac.c#6 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#7 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#7 integrate .. //depot/projects/trustedbsd/base/bin/ls/util.c#6 integrate .. //depot/projects/trustedbsd/base/bin/mkdir/mkdir.1#3 integrate .. //depot/projects/trustedbsd/base/bin/mkdir/mkdir.c#4 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.1#4 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.c#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_io.c#3 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_subs.c#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/buf_subs.c#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/cache.c#3 integrate .. //depot/projects/trustedbsd/base/bin/pax/cpio.c#3 integrate .. //depot/projects/trustedbsd/base/bin/pax/file_subs.c#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/ftree.c#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/gen_subs.c#3 integrate .. //depot/projects/trustedbsd/base/bin/pax/getoldopt.c#3 integrate .. //depot/projects/trustedbsd/base/bin/pax/options.c#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/pat_rep.c#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.c#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/sel_subs.c#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/tables.c#3 integrate .. //depot/projects/trustedbsd/base/bin/pax/tar.c#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/tty_subs.c#3 integrate .. //depot/projects/trustedbsd/base/bin/ps/Makefile#6 integrate .. //depot/projects/trustedbsd/base/bin/ps/fmt.c#6 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#7 integrate .. //depot/projects/trustedbsd/base/bin/ps/lomac.c#6 integrate .. //depot/projects/trustedbsd/base/bin/ps/nlist.c#4 integrate .. //depot/projects/trustedbsd/base/bin/ps/print.c#7 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.c#10 integrate .. //depot/projects/trustedbsd/base/bin/pwd/pwd.c#6 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.c#5 integrate .. //depot/projects/trustedbsd/base/bin/rcp/util.c#3 integrate .. //depot/projects/trustedbsd/base/bin/rm/Makefile#3 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.c#6 integrate .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.c#3 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/file.c#3 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/mask.c#5 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/merge.c#4 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/remove.c#3 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/util.c#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/alias.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/builtins.def#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/cd.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/error.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/error.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/exec.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/expand.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/histedit.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/input.c#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.h#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/mail.c#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/main.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/memalloc.c#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/miscbltin.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/mkinit.c#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/mknodes.c#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/mksyntax.c#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/myhistedit.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/mystring.c#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/options.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/options.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/output.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/redir.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/shell.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/show.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/trap.c#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/trap.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sleep/sleep.c#3 integrate .. //depot/projects/trustedbsd/base/bin/stty/cchar.c#3 integrate .. //depot/projects/trustedbsd/base/bin/stty/gfmt.c#3 integrate .. //depot/projects/trustedbsd/base/bin/stty/key.c#3 integrate .. //depot/projects/trustedbsd/base/bin/stty/modes.c#3 integrate .. //depot/projects/trustedbsd/base/bin/stty/print.c#3 integrate .. //depot/projects/trustedbsd/base/bin/stty/stty.c#3 integrate .. //depot/projects/trustedbsd/base/bin/stty/util.c#3 integrate .. //depot/projects/trustedbsd/base/bin/sync/sync.8#3 integrate .. //depot/projects/trustedbsd/base/bin/sync/sync.c#3 integrate .. //depot/projects/trustedbsd/base/bin/test/test.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/bind/CHANGES#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/FREEBSD-Upgrade#1 branch .. //depot/projects/trustedbsd/base/contrib/bind/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/README#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/Version#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/addr/addr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/dig/dig.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/host/host.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named-xfer/named-xfer.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_defs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_glue.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_save.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_tsig.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/named.conf#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_config.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_ctl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_defs.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_forw.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_glob.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_ixfr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_lexer.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_main.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_maint.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_parser.y#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_req.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_resp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_signal.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_update.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_xfr.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/ndc/ndc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/Makefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/commands.l#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/getinfo.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/main.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/nslookup/send.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/00macs.me#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/00title.me#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/Makefile#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/ack.me#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/build.me#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/files.me#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/intro.me#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/manage.me#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/named.boot.cache#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/named.boot.primary#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/named.boot.secondary#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/named.local#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/ns.me#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/resolv.conf#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/root.cache#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/setup.me#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/types.me#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/ucbhosts#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/bog/ucbhosts.rev#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/html/server.html#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/dig.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/dnsquery.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/host.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/man/named.conf.5#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/doc/misc/rfc2317-notes.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/bind/doc/notes/data#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/notes/db_names.c#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/doc/notes/irp.txt#2 delete .. //depot/projects/trustedbsd/base/contrib/bind/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/isc/list.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/include/resolv.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_ho.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/dns_nw.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/irs/gethostent.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_name.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_debug.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_init.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/resolv/res_private.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/Makefile.set#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/include/port_before.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/client.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-format.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#10 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/arm/tm-arm.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/i386/tm-fbsd.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/aix.mh#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/aix.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/gdbserve.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/linux.mh#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/nm-aix.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/ppc-eabi.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/ppc-sim.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/ppcle-eabi.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/ppcle-sim.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-ppc-aix.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-ppc-sim.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/xm-aix.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/powerpc/xm-linux.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/linux.mh#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/linux.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nbsd.mh#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nbsd.mt#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nm-linux.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nm-nbsd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nm-sparclynx.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nm-sun4os4.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/nm-sun4sol2.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/sp64.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/sp64sim.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/sp64sol2.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/sparc-em.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/sparclet.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/sparclite.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/sparclynx.mh#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/sparclynx.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/sun4os4.mh#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/sun4os4.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/sun4sol2.mh#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/sun4sol2.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-linux.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-nbsd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sp64.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sp64sim.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sparc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sparclet.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sparclite.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sparclynx.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-spc-em.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sun4os4.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-sun4sol2.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/tm-vxsparc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/vxsparc.mt#2 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/xm-linux.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/xm-nbsd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/config/sparc/xm-sun4sol2.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gdb/gdb/gdbserver/gdbreplay.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#6 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/groff_mdoc.man#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/CREDITS#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/LICENSE#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/MANIFEST#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/Makefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/Makefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/Makefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/bin/su/su.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/Makefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/Makefile#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.man#1 branch .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#4 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.man#1 branch .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_conv.3#1 branch .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_appl.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_constants.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_modules.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_types.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/Makefile#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_configure.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dispatch.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dynamic.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_findenv.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_get_option.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_load.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_nullconv.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_set_option.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_static.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_acct_mgmt.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_authenticate_secondary.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_chauthtok.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_close_session.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_end.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_error.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_authtok.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_data.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_item.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_authtok.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_mapped_username.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_get_user.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenv.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenvlist.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_info.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_open_session.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_prompt.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_putenv.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_data.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_item.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_authtok.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_set_mapped_username.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setcred.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_setenv.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_acct_mgmt.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_authenticate_secondary.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_chauthtok.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_close_session.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_get_mapped_username.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_open_session.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_set_mapped_username.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_sm_setcred.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_start.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_strerror.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_verror.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vinfo.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_vprompt.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/misc/gendoc.pl#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/Makefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/Makefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_deny/pam_deny.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_dummy/Makefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_dummy/pam_dummy.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/Makefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_permit/pam_permit.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/Makefile#1 branch .. //depot/projects/trustedbsd/base/contrib/openpam/modules/pam_unix/pam_unix.c#1 branch .. //depot/projects/trustedbsd/base/contrib/smbfs/HISTORY#5 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/lib/smb/nls.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tar/lib/error.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tar/src/compare.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tar/src/extract.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/base/contrib/tcsh/Fixes#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Imakefile#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Makefile.std#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Makefile.vms#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/Ported#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/complete.tcsh#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/config.guess#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/config.sub#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/config/bsd4.4#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/config_f.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/configure#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/configure.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.chared.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.decls.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.defns.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.init.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.inputl.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.refresh.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.screen.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.term.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.term.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/ed.xmap.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/gethost.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/glob.3#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/glob.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/glob.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/host.defs#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set1#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/finnish/set20#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set1#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set13#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set17#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set19#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set2#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set20#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set21#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set22#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set23#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set26#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set3#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set30#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set4#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set7#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/pl/set9#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set1#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set10#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set13#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set17#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set18#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set19#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set2#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set20#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set22#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set23#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set26#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set27#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set3#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set30#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set31#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set4#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set6#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set7#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/russian/set9#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set1#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set10#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set11#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set12#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set13#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set14#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set15#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set16#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set17#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set18#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set19#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set2#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set20#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set21#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set22#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set23#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set24#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set25#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set26#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set27#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set29#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set3#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set30#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set31#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set4#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set5#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set6#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set7#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set8#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/nls/ukrainian/set9#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/patchlevel.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/pathnames.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.char.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.char.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.decls.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.dir.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.dir.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.dol.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.err.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.exec.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.exp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.file.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.func.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.glob.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.hist.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.init.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.misc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.parse.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.print.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.proc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.proc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.sem.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.set.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.time.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/sh.types.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.alloc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.bind.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.const.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.decls.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.disc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.func.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.os.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.os.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.printf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.prompt.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.sched.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.sig.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.sig.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.str.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.vers.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.wait.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tc.who.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tcsh.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.color.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.comp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.decls.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.help.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.init.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.parse.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcsh/tw.spell.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/INTRODUCTION#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/NEWS#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/TODO#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/config.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/config.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/fdl.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/info-stnd.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/info.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/info.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/install-info.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/makeinfo.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/texindex.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/texinfo.txi#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/version-stnd.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/doc/version.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/display.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/filesys.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/indices.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info-utils.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/info.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infokey.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/infokey.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/search.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/info/window.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/lib/libintl.h#2 delete .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/cmds.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/defun.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/html.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/html.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/index.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/insertion.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/insertion.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/makeinfo.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/makeinfo.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/node.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/texinfo.dtd#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/texinfo.xsl#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/toc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/xml.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/makeinfo/xml.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/util/install-info.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/texinfo/util/texindex.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/VERSION#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh-portable/CREDITS#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/FREEBSD-Xlist#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/FREEBSD-upgrade#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/INSTALL#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/LICENCE#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/OVERVIEW#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/README#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/README.privsep#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/README.smartcard#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/RFC.nroff#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/TODO#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/WARNING.RNG#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/acconfig.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/aclocal.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/atomicio.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/atomicio.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-bsdauth.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-chall.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-krb4.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-krb5.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-options.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-options.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-pam.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-pam.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-passwd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-rh-rsa.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-rhosts.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-rsa.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-sia.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-sia.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth-skey.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth1.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth2-chall.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth2-hostbased.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth2-kbdint.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth2-none.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth2-pam-freebsd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth2-pam.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth2-pam.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth2-passwd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth2-pubkey.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/auth2.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/authfd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/authfd.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/authfile.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/authfile.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/bufaux.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/bufaux.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/buffer.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/buffer.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/canohost.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/canohost.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/channels.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/channels.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/cipher.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/cipher.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/clientloop.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/clientloop.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/compat.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/compat.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/compress.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/compress.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/config.guess#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/config.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/config.sub#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/configure.ac#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/crc32.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/crc32.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/deattack.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/deattack.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/defines.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/dh.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/dh.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/dispatch.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/dispatch.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/entropy.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/entropy.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/fatal.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/fixpaths#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/fixprogs#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/getput.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/groupaccess.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/groupaccess.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/hostfile.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/hostfile.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/includes.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/install-sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/kex.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/kex.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/kexdh.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/kexgex.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/key.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/key.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/log.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/log.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/loginrec.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/loginrec.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/logintest.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/mac.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/mac.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/match.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/match.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/md5crypt.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/md5crypt.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/mdoc2man.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/misc.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/misc.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/moduli#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/monitor.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/monitor.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/monitor_fdpass.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/monitor_fdpass.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/monitor_mm.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/monitor_mm.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/monitor_wrap.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/monitor_wrap.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/mpaux.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/mpaux.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/msg.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/msg.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/myproposal.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/nchan.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/nchan.ms#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/nchan2.ms#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/base64.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/base64.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bindresvport.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bindresvport.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-arc4random.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-arc4random.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-cray.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-cray.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-cygwin_util.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-cygwin_util.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-misc.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-misc.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-nextstep.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-nextstep.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-snprintf.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-snprintf.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-waitpid.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/bsd-waitpid.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/daemon.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/daemon.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/dirname.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/dirname.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/fake-gai-errnos.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/fake-getaddrinfo.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/fake-getaddrinfo.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/fake-getnameinfo.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/fake-getnameinfo.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/fake-queue.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/fake-socket.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/getcwd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/getcwd.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/getgrouplist.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/getgrouplist.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/getopt.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/getopt.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/glob.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/glob.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/inet_aton.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/inet_aton.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/inet_ntoa.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/inet_ntoa.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/inet_ntop.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/inet_ntop.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/mktemp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/mktemp.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/openbsd-compat.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/port-aix.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/port-aix.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/port-irix.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/port-irix.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/readpassphrase.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/readpassphrase.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/realpath.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/realpath.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/rresvport.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/rresvport.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/setenv.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/setenv.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/setproctitle.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/setproctitle.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/sigact.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/sigact.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/strlcat.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/strlcat.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/strlcpy.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/strlcpy.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/strmode.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/strmode.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/strsep.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/strsep.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/openbsd-compat/tree.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/packet.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/packet.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/pathnames.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/radix.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/radix.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/readconf.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/readconf.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/readpass.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/readpass.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/Makefile#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/agent.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/authorized_keys_root#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/broken-pipe.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/bsd.regress.mk#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/connect-privsep.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/connect.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/copy.1#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/copy.2#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/dsa_ssh2.prv#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/dsa_ssh2.pub#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/exit-status.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/forwarding.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/keyscan.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/proto-mismatch.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/proto-version.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/proxy-connect.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/rsa_openssh.prv#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/rsa_openssh.pub#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/rsa_ssh2.prv#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/runtests.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/sftp.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/ssh-com-client.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/ssh-com-keygen.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/ssh-com-sftp.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/ssh-com.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/stderr-after-eof.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/stderr-data.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/t4.ok#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/t5.ok#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/test-exec.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/transfer.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/try-ciphers.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/regress/yes-head.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/rijndael.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/rijndael.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/rsa.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/rsa.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/scard-opensc.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/scard.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/scard.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/scard/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/scard/Ssh.bin#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/scard/Ssh.bin.uu#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/scard/Ssh.java#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/scp.1#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/scp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/servconf.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/servconf.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/serverloop.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/serverloop.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/session.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/session.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sftp-client.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sftp-client.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sftp-common.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sftp-common.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sftp-glob.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sftp-glob.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sftp-int.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sftp-int.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sftp-server.8#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sftp-server.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sftp.1#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sftp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sftp.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-add.1#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-add.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-agent.1#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-agent.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-dss.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-dss.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-keygen.1#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-keygen.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-keyscan.1#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-keyscan.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-keysign.8#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-keysign.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-rand-helper.8#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-rand-helper.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-rsa.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh-rsa.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh.1#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh1.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh2.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh_config#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh_config.5#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ssh_prng_cmds.in#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshconnect.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshconnect.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshconnect1.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshconnect2.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshd.8#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshd_config#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshd_config.5#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshlogin.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshlogin.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshpty.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshpty.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshtty.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/sshtty.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/tildexpand.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/tildexpand.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ttymodes.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/ttymodes.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/uidswap.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/uidswap.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/uuencode.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/uuencode.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/version.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/version.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/xmalloc.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh-portable/xmalloc.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/INSTALL#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README.privsep#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/TODO#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/acconfig.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb5.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-passwd.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-skey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-chall.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pam-freebsd.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/auth2-pam.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfd.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/authfile.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/bufaux.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/buffer.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/channels.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/cipher.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/clientloop.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.h#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/configure.ac#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/defines.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/includes.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/kex.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/key.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_fdpass.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_mm.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor_wrap.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/msg.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/myproposal.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/openbsd-compat/getopt.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/packet.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/readconf.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scard.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/scp.1#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/servconf.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/serverloop.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.c#10 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-client.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-common.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-int.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp-server.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sftp.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.1#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-agent.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-dss.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-keygen.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh-rsa.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.1#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#6 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 6:16:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6490637B401; Sat, 27 Jul 2002 06:16:08 -0700 (PDT) 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 1C46637B400 for ; Sat, 27 Jul 2002 06:16:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDF2B43E4A for ; Sat, 27 Jul 2002 06:16:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6RDG7JU054134 for ; Sat, 27 Jul 2002 06:16:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6RDG7AI054131 for perforce@freebsd.org; Sat, 27 Jul 2002 06:16:07 -0700 (PDT) Date: Sat, 27 Jul 2002 06:16:07 -0700 (PDT) Message-Id: <200207271316.g6RDG7AI054131@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 14990 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14990 Change 14990 by rwatson@rwatson_tislabs on 2002/07/27 06:15:43 Note that we need a seperate entry point for the F_SETFL fcntl, since we really want to authorize the delta not just the flags. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#18 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#18 (text+ko) ==== @@ -326,6 +326,11 @@ mode |= VAPPEND; vn_lock((struct vnode *)fp->f_data, LK_EXCLUSIVE | LK_RETRY, td); + /* + * XXX: A seperate entry point should be used here + * to pass in both the old and the new flags, + * with authorization performed only on the delta. + */ error = mac_cred_check_open_vnode(td->td_ucred, (struct vnode *)fp->f_data, mode); VOP_UNLOCK((struct vnode *)fp->f_data, 0, td); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 13: 2:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BD1537B405; Sat, 27 Jul 2002 13:02:21 -0700 (PDT) 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 E16BA37B401 for ; Sat, 27 Jul 2002 13:02:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9648943E6A for ; Sat, 27 Jul 2002 13:02:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6RK1sJU022883 for ; Sat, 27 Jul 2002 13:01:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6RK1sAI022880 for perforce@freebsd.org; Sat, 27 Jul 2002 13:01:54 -0700 (PDT) Date: Sat, 27 Jul 2002 13:01:54 -0700 (PDT) Message-Id: <200207272001.g6RK1sAI022880@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15002 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15002 Change 15002 by rwatson@rwatson_paprika on 2002/07/27 12:59:51 Rename VALL to VALLPERM to match the central source tree version. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#3 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#11 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#44 edit .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#30 edit .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#3 (text+ko) ==== @@ -181,8 +181,8 @@ left -= len; cur += len; - anymode = (rule->mbr_mode & VALL); - unknownmode = (rule->mbr_mode & ~VALL); + anymode = (rule->mbr_mode & VALLPERM); + unknownmode = (rule->mbr_mode & ~VALLPERM); if (rule->mbr_mode & VADMIN) { len = snprintf(cur, left, "a"); ==== //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#11 (text+ko) ==== @@ -90,7 +90,7 @@ */ #ifndef CAPABILITIES if (suser_cred(cred, PRISON_ROOT) == 0) - cap_granted = (VEXEC | VREAD | VWRITE | VADMIN | VAPPEND); + cap_granted = VALLPERM; else cap_granted = 0; #else ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#44 (text+ko) ==== @@ -109,7 +109,7 @@ if ((rule->mbr_object.mbi_flags | MBI_BITS) != MBI_BITS) return (EINVAL); - if ((rule->mbr_mode | VALL) != VALL) + if ((rule->mbr_mode | VALLPERM) != VALLPERM) return (EINVAL); return (0); ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#30 (text+ko) ==== @@ -248,7 +248,7 @@ #define VAPPEND 040000 /* permission to write/append */ #define VADMIN 010000 /* permission to administer vnode */ #define VSTAT 020000 /* permission to retrieve vnode attrs */ -#define VALL (VREAD | VWRITE | VEXEC | VAPPEND | VSTAT | VADMIN) +#define VALLPERM (VREAD | VWRITE | VEXEC | VAPPEND | VSTAT | VADMIN) /* * Token indicating no attribute value yet assigned. ==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#6 (text+ko) ==== @@ -118,8 +118,8 @@ } printf("mode "); - anymode = (rule->mbr_mode & VALL); - unknownmode = (rule->mbr_mode & ~VALL); + anymode = (rule->mbr_mode & VALLPERM); + unknownmode = (rule->mbr_mode & ~VALLPERM); if (rule->mbr_mode & VADMIN) printf("a"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 13: 2:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E8AB37B406; Sat, 27 Jul 2002 13:02:23 -0700 (PDT) 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 F3F8237B418 for ; Sat, 27 Jul 2002 13:02:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6063843E70 for ; Sat, 27 Jul 2002 13:02:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6RK1sJU022875 for ; Sat, 27 Jul 2002 13:01:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6RJxsjs022276 for perforce@freebsd.org; Sat, 27 Jul 2002 12:59:54 -0700 (PDT) Date: Sat, 27 Jul 2002 12:59:54 -0700 (PDT) Message-Id: <200207271959.g6RJxsjs022276@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15001 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15001 Change 15001 by rwatson@rwatson_paprika on 2002/07/27 12:59:09 Teach ugidfw to speak usernames and group names as well as uids and gids, making it a lot easier to use. Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#5 (text+ko) ==== @@ -41,6 +41,8 @@ #include +#include +#include #include #include #include @@ -69,6 +71,8 @@ void print_rule(int rulenum, struct mac_bsdextended_rule *rule) { + struct group *grp; + struct passwd *pwd; int anymode, unknownmode; printf("%d ", rulenum); @@ -77,20 +81,40 @@ printf("subject "); if (rule->mbr_subject.mbi_flags & MBI_NEGATED) printf("not "); - if (rule->mbr_subject.mbi_flags & MBI_UID_DEFINED) - printf("uid %u ", rule->mbr_subject.mbi_uid); - if (rule->mbr_subject.mbi_flags & MBI_GID_DEFINED) - printf("gid %u ", rule->mbr_subject.mbi_gid); + if (rule->mbr_subject.mbi_flags & MBI_UID_DEFINED) { + pwd = getpwuid(rule->mbr_subject.mbi_uid); + if (pwd != NULL) + printf("uid %s ", pwd->pw_name); + else + printf("uid %u ", rule->mbr_subject.mbi_uid); + } + if (rule->mbr_subject.mbi_flags & MBI_GID_DEFINED) { + grp = getgrgid(rule->mbr_subject.mbi_gid); + if (grp != NULL) + printf("gid %s ", grp->gr_name); + else + printf("gid %u ", rule->mbr_subject.mbi_gid); + } } if (rule->mbr_object.mbi_flags & (MBI_UID_DEFINED | MBI_GID_DEFINED)) { printf("object "); if (rule->mbr_object.mbi_flags & MBI_NEGATED) printf("not "); - if (rule->mbr_object.mbi_flags & MBI_UID_DEFINED) - printf("uid %u ", rule->mbr_object.mbi_uid); - if (rule->mbr_object.mbi_flags & MBI_GID_DEFINED) - printf("gid %u ", rule->mbr_object.mbi_gid); + if (rule->mbr_object.mbi_flags & MBI_UID_DEFINED) { + pwd = getpwuid(rule->mbr_object.mbi_uid); + if (pwd != NULL) + printf("uid %s ", pwd->pw_name); + else + printf("uid %u ", rule->mbr_object.mbi_uid); + } + if (rule->mbr_object.mbi_flags & MBI_GID_DEFINED) { + grp = getgrgid(rule->mbr_object.mbi_gid); + if (grp != NULL) + printf("gid %s ", grp->gr_name); + else + printf("gid %u ", rule->mbr_object.mbi_gid); + } } printf("mode "); @@ -119,6 +143,8 @@ parse_identity(int argc, char *argv[], struct mac_bsdextended_identity *identity) { + struct group *grp; + struct passwd *pwd; int uid_seen, gid_seen, not_seen; int current; char *endp; @@ -154,13 +180,18 @@ fprintf(stderr, "uid short.\n"); return (-1); } - value = strtol(argv[current+1], &endp, 10); - if (*endp != '\0') { - fprintf(stderr, "invalid uid: '%s'\n", - argv[current+1]); - return (-1); + pwd = getpwnam(argv[current+1]); + if (pwd != NULL) + uid = pwd->pw_uid; + else { + value = strtol(argv[current+1], &endp, 10); + if (*endp != '\0') { + fprintf(stderr, "invalid uid: '%s'\n", + argv[current+1]); + return (-1); + } + uid = value; } - uid = value; uid_seen = 1; current += 2; } else if (strcmp("gid", argv[current]) == 0) { @@ -168,13 +199,18 @@ fprintf(stderr, "gid short.\n"); return (-1); } - value = strtol(argv[current+1], &endp, 10); - if (*endp != '\0') { - fprintf(stderr, "invalid gid: '%s'\n", - argv[current+1]); - return (-1); + grp = getgrnam(argv[current+1]); + if (grp != NULL) + gid = grp->gr_gid; + else { + value = strtol(argv[current+1], &endp, 10); + if (*endp != '\0') { + fprintf(stderr, "invalid gid: '%s'\n", + argv[current+1]); + return (-1); + } + gid = value; } - gid = value; gid_seen = 1; current += 2; } else { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 13: 5:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13BB537B401; Sat, 27 Jul 2002 13:05:56 -0700 (PDT) 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 ABFAD37B400 for ; Sat, 27 Jul 2002 13:05:55 -0700 (PDT) Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A25743E3B for ; Sat, 27 Jul 2002 13:05:55 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 31710 invoked from network); 27 Jul 2002 20:05:54 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 27 Jul 2002 20:05:54 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g6RK5ruR045717; Sat, 27 Jul 2002 16:05:53 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200207271959.g6RJxsjs022276@freefall.freebsd.org> Date: Sat, 27 Jul 2002 16:06:00 -0400 (EDT) From: John Baldwin To: Robert Watson Subject: RE: PERFORCE change 15001 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 27-Jul-2002 Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15001 > > Change 15001 by rwatson@rwatson_paprika on 2002/07/27 12:59:09 > > Teach ugidfw to speak usernames and group names as well as > uids and gids, making it a lot easier to use. Cool! -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 14:16:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D50B37B401; Sat, 27 Jul 2002 14:15:27 -0700 (PDT) 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 DBFFC37B400 for ; Sat, 27 Jul 2002 14:15:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2FC943E5E for ; Sat, 27 Jul 2002 14:15:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6RLFPJU036458 for ; Sat, 27 Jul 2002 14:15:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6RLFPpZ036449 for perforce@freebsd.org; Sat, 27 Jul 2002 14:15:25 -0700 (PDT) Date: Sat, 27 Jul 2002 14:15:25 -0700 (PDT) Message-Id: <200207272115.g6RLFPpZ036449@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15005 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15005 Change 15005 by rwatson@rwatson_paprika on 2002/07/27 14:14:53 s/cred_check/check/g; reduce function name length and complexity prior to main tree merge. Affected files ... .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_mount.c#5 edit .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#7 edit .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#7 edit .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#13 edit .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#6 edit .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#7 edit .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#10 edit .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_misc.c#6 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#12 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#19 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#10 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#195 edit .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#15 edit .. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#6 edit .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#13 edit .. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#18 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#19 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#62 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#28 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#72 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#45 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#61 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#47 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#6 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#11 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#52 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#17 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#15 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#123 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#88 edit .. //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_mount.c#5 (text+ko) ==== @@ -134,7 +134,7 @@ sp = &mp->mnt_stat; vrele(nd.ni_vp); #ifdef MAC - error = mac_cred_check_statfs(td->td_proc->p_ucred, mp); + error = mac_check_statfs(td->td_proc->p_ucred, mp); if (error) return (error); #endif @@ -161,7 +161,7 @@ return (error); mp = ((struct vnode *)fp->f_data)->v_mount; #ifdef MAC - error = mac_cred_check_statfs(td->td_proc->p_ucred, mp); + error = mac_check_statfs(td->td_proc->p_ucred, mp); if (error) { drop(fp, td); return (error); @@ -199,8 +199,7 @@ nmp = TAILQ_NEXT(mp, mnt_list); if (osf_sfsp && count < maxcount) { #ifdef MAC - error = mac_cred_check_statfs(td->td_proc->p_ucred, - mp); + error = mac_check_statfs(td->td_proc->p_ucred, mp); if (error) continue; #endif ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#7 (text+ko) ==== @@ -331,7 +331,7 @@ /* * Do directory search MAC check using non-cached credentials. */ - if ((error = mac_cred_check_readdir_vnode(td->td_proc->p_ucred, vp)) + if ((error = mac_check_readdir_vnode(td->td_proc->p_ucred, vp)) goto out; #endif /* MAC */ if ((error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, &ncookies, ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#7 (text+ko) ==== @@ -203,7 +203,7 @@ eofflag = 0; #ifdef MAC - error = mac_cred_check_readdir_vnode(td->td_ucred, uvp); + error = mac_check_readdir_vnode(td->td_ucred, uvp); if (error == 0) #endif /* MAC */ error = VOP_READDIR(uvp, &uio, td->td_ucred, &eofflag, ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#13 (text+ko) ==== @@ -308,7 +308,7 @@ * from vn_open(). */ #ifdef MAC - error = mac_cred_check_open_vnode(td->td_ucred, vp, FREAD); + error = mac_check_open_vnode(td->td_ucred, vp, FREAD); if (error) goto cleanup; #endif ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#6 (text+ko) ==== @@ -251,7 +251,7 @@ bsd_statfs = &mp->mnt_stat; vrele(ndp->ni_vp); #ifdef MAC - error = mac_cred_check_statfs(td->td_proc->p_ucred, mp); + error = mac_check_statfs(td->td_proc->p_ucred, mp); if (error) return (error); #endif @@ -291,7 +291,7 @@ return error; mp = ((struct vnode *)fp->f_data)->v_mount; #ifdef MAC - error = mac_cred_check_statfs(td->td_proc->p_ucred, mp); + error = mac_check_statfs(td->td_proc->p_ucred, mp); if (error) { fdrop(fp, td); return (error); @@ -360,7 +360,7 @@ if (vp->v_mount == NULL) return (EINVAL); #ifdef MAC - error = mac_cred_check_statfs(td->td_proc->p_ucred, mp); + error = mac_check_statfs(td->td_proc->p_ucred, mp); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#7 (text+ko) ==== @@ -266,7 +266,7 @@ #ifdef MAC vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = mac_cred_check_revoke_vnode(td->td_ucred, vp); + error = mac_check_revoke_vnode(td->td_ucred, vp); VOP_UNLOCK(vp, 0, td); if (error) goto out; ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#10 (text+ko) ==== @@ -316,7 +316,7 @@ #ifdef MAC /* Use process's credentials to check directory search MAC. */ - error = mac_cred_check_readdir_vnode(td->td_proc->p_ucred, vp); + error = mac_check_readdir_vnode(td->td_proc->p_ucred, vp); if (error) goto out; #endif /* MAC */ @@ -479,7 +479,7 @@ */ #ifdef MAC /* Use process's credentials to check directory search MAC. */ - error = mac_cred_check_readdir_vnode(td->td_proc->p_ucred, vp); + error = mac_check_readdir_vnode(td->td_proc->p_ucred, vp); if (error) goto out; #endif /* MAC */ ==== //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_misc.c#6 (text+ko) ==== @@ -352,7 +352,7 @@ } #ifdef MAC - error = mac_cred_check_readdir_vnode(td->td_proc->p_ucred, vp); + error = mac_check_readdir_vnode(td->td_proc->p_ucred, vp); if (error) goto out; #endif /* MAC */ @@ -512,7 +512,7 @@ } #ifdef MAC - error = mac_cred_check_readdir_vnode(td->td_proc->p_ucred, vp); + error = mac_check_readdir_vnode(td->td_proc->p_ucred, vp); if (error) goto out; #endif /* MAC */ ==== //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#12 (text+ko) ==== @@ -585,8 +585,7 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_cred_check_setacl_vnode(td->td_ucred, vp, type, - &inkernacl); + error = mac_check_setacl_vnode(td->td_ucred, vp, type, &inkernacl); if (error != 0) goto out; #endif @@ -612,7 +611,7 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_cred_check_getacl_vnode(td->td_ucred, vp, type); + error = mac_check_getacl_vnode(td->td_ucred, vp, type); if (error != 0) goto out; #endif @@ -641,7 +640,7 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_cred_check_deleteacl_vnode(td->td_ucred, vp, type); + error = mac_check_deleteacl_vnode(td->td_ucred, vp, type); if (error) goto out; #endif ==== //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#19 (text+ko) ==== @@ -331,7 +331,7 @@ * to pass in both the old and the new flags, * with authorization performed only on the delta. */ - error = mac_cred_check_open_vnode(td->td_ucred, + error = mac_check_open_vnode(td->td_ucred, (struct vnode *)fp->f_data, mode); VOP_UNLOCK((struct vnode *)fp->f_data, 0, td); if (error) { ==== //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#10 (text+ko) ==== @@ -769,7 +769,7 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); (void)VOP_LEASE(vp, td, cred, LEASE_WRITE); #ifdef MAC - error = mac_cred_check_vnode_op(cred, vp, MAC_OP_VNODE_WRITE); + error = mac_check_vnode_op(cred, vp, MAC_OP_VNODE_WRITE); if (error == 0) #endif error = VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, cred); ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#195 (text+ko) ==== @@ -342,7 +342,7 @@ continue; vp = (struct vnode *)object->handle; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - result = mac_cred_check_mmap_vnode_prot(cred, vp, 0); + result = mac_check_mmap_vnode_prot(cred, vp, 0); VOP_UNLOCK(vp, 0, td); /* * Find out what maximum protection we may be allowing @@ -654,167 +654,167 @@ mpc->mpc_ops->mpo_bpfdesc_check_receive_from_ifnet = mpe->mpe_function; break; - case MAC_CRED_CHECK_BIND_SOCKET: - mpc->mpc_ops->mpo_cred_check_bind_socket = + case MAC_CHECK_BIND_SOCKET: + mpc->mpc_ops->mpo_check_bind_socket = mpe->mpe_function; break; - case MAC_CRED_CHECK_CONNECT_SOCKET: - mpc->mpc_ops->mpo_cred_check_connect_socket = + case MAC_CHECK_CONNECT_SOCKET: + mpc->mpc_ops->mpo_check_connect_socket = mpe->mpe_function; break; - case MAC_CRED_CHECK_SEE_CRED: - mpc->mpc_ops->mpo_cred_check_see_cred = + case MAC_CHECK_SEE_CRED: + mpc->mpc_ops->mpo_check_see_cred = mpe->mpe_function; break; - case MAC_CRED_CHECK_SEE_SOCKET: - mpc->mpc_ops->mpo_cred_check_see_socket = + case MAC_CHECK_SEE_SOCKET: + mpc->mpc_ops->mpo_check_see_socket = mpe->mpe_function; break; - case MAC_CRED_CHECK_RELABEL_IFNET: - mpc->mpc_ops->mpo_cred_check_relabel_ifnet = + case MAC_CHECK_RELABEL_IFNET: + mpc->mpc_ops->mpo_check_relabel_ifnet = mpe->mpe_function; break; - case MAC_CRED_CHECK_RELABEL_PIPE: - mpc->mpc_ops->mpo_cred_check_relabel_pipe = + case MAC_CHECK_RELABEL_PIPE: + mpc->mpc_ops->mpo_check_relabel_pipe = mpe->mpe_function; break; - case MAC_CRED_CHECK_RELABEL_SOCKET: - mpc->mpc_ops->mpo_cred_check_relabel_socket = + case MAC_CHECK_RELABEL_SOCKET: + mpc->mpc_ops->mpo_check_relabel_socket = mpe->mpe_function; break; - case MAC_CRED_CHECK_RELABEL_SUBJECT: - mpc->mpc_ops->mpo_cred_check_relabel_subject = + case MAC_CHECK_RELABEL_SUBJECT: + mpc->mpc_ops->mpo_check_relabel_subject = mpe->mpe_function; break; - case MAC_CRED_CHECK_RELABEL_VNODE: - mpc->mpc_ops->mpo_cred_check_relabel_vnode = + case MAC_CHECK_RELABEL_VNODE: + mpc->mpc_ops->mpo_check_relabel_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_STATFS: - mpc->mpc_ops->mpo_cred_check_statfs = mpe->mpe_function; + case MAC_CHECK_STATFS: + mpc->mpc_ops->mpo_check_statfs = mpe->mpe_function; break; - case MAC_CRED_CHECK_DEBUG_PROC: - mpc->mpc_ops->mpo_cred_check_debug_proc = + case MAC_CHECK_DEBUG_PROC: + mpc->mpc_ops->mpo_check_debug_proc = mpe->mpe_function; break; - case MAC_CRED_CHECK_ACCESS_VNODE: - mpc->mpc_ops->mpo_cred_check_access_vnode = + case MAC_CHECK_ACCESS_VNODE: + mpc->mpc_ops->mpo_check_access_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_CHDIR_VNODE: - mpc->mpc_ops->mpo_cred_check_chdir_vnode = + case MAC_CHECK_CHDIR_VNODE: + mpc->mpc_ops->mpo_check_chdir_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_CHROOT_VNODE: - mpc->mpc_ops->mpo_cred_check_chroot_vnode = + case MAC_CHECK_CHROOT_VNODE: + mpc->mpc_ops->mpo_check_chroot_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_CREATE_VNODE: - mpc->mpc_ops->mpo_cred_check_create_vnode = + case MAC_CHECK_CREATE_VNODE: + mpc->mpc_ops->mpo_check_create_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_DELETE_VNODE: - mpc->mpc_ops->mpo_cred_check_delete_vnode = + case MAC_CHECK_DELETE_VNODE: + mpc->mpc_ops->mpo_check_delete_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_DELETEACL_VNODE: - mpc->mpc_ops->mpo_cred_check_deleteacl_vnode = + case MAC_CHECK_DELETEACL_VNODE: + mpc->mpc_ops->mpo_check_deleteacl_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_EXEC_VNODE: - mpc->mpc_ops->mpo_cred_check_exec_vnode = + case MAC_CHECK_EXEC_VNODE: + mpc->mpc_ops->mpo_check_exec_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_GETACL_VNODE: - mpc->mpc_ops->mpo_cred_check_getacl_vnode = + case MAC_CHECK_GETACL_VNODE: + mpc->mpc_ops->mpo_check_getacl_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_GETEXTATTR_VNODE: - mpc->mpc_ops->mpo_cred_check_getextattr_vnode = + case MAC_CHECK_GETEXTATTR_VNODE: + mpc->mpc_ops->mpo_check_getextattr_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_LISTEN_SOCKET: - mpc->mpc_ops->mpo_cred_check_listen_socket = + case MAC_CHECK_LISTEN_SOCKET: + mpc->mpc_ops->mpo_check_listen_socket = mpe->mpe_function; break; - case MAC_CRED_CHECK_LOOKUP_VNODE: - mpc->mpc_ops->mpo_cred_check_lookup_vnode = + case MAC_CHECK_LOOKUP_VNODE: + mpc->mpc_ops->mpo_check_lookup_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_OPEN_VNODE: - mpc->mpc_ops->mpo_cred_check_open_vnode = + case MAC_CHECK_OPEN_VNODE: + mpc->mpc_ops->mpo_check_open_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_READDIR_VNODE: - mpc->mpc_ops->mpo_cred_check_readdir_vnode = + case MAC_CHECK_READDIR_VNODE: + mpc->mpc_ops->mpo_check_readdir_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_READLINK_VNODE: - mpc->mpc_ops->mpo_cred_check_readlink_vnode = + case MAC_CHECK_READLINK_VNODE: + mpc->mpc_ops->mpo_check_readlink_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_RENAME_FROM_VNODE: - mpc->mpc_ops->mpo_cred_check_rename_from_vnode = + case MAC_CHECK_RENAME_FROM_VNODE: + mpc->mpc_ops->mpo_check_rename_from_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_RENAME_TO_VNODE: - mpc->mpc_ops->mpo_cred_check_rename_to_vnode = + case MAC_CHECK_RENAME_TO_VNODE: + mpc->mpc_ops->mpo_check_rename_to_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_REVOKE_VNODE: - mpc->mpc_ops->mpo_cred_check_revoke_vnode = + case MAC_CHECK_REVOKE_VNODE: + mpc->mpc_ops->mpo_check_revoke_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_SETACL_VNODE: - mpc->mpc_ops->mpo_cred_check_setacl_vnode = + case MAC_CHECK_SETACL_VNODE: + mpc->mpc_ops->mpo_check_setacl_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_SETEXTATTR_VNODE: - mpc->mpc_ops->mpo_cred_check_setextattr_vnode = + case MAC_CHECK_SETEXTATTR_VNODE: + mpc->mpc_ops->mpo_check_setextattr_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_SETFLAGS_VNODE: - mpc->mpc_ops->mpo_cred_check_setflags_vnode = + case MAC_CHECK_SETFLAGS_VNODE: + mpc->mpc_ops->mpo_check_setflags_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_SETMODE_VNODE: - mpc->mpc_ops->mpo_cred_check_setmode_vnode = + case MAC_CHECK_SETMODE_VNODE: + mpc->mpc_ops->mpo_check_setmode_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_SETOWNER_VNODE: - mpc->mpc_ops->mpo_cred_check_setowner_vnode = + case MAC_CHECK_SETOWNER_VNODE: + mpc->mpc_ops->mpo_check_setowner_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_SETUTIMES_VNODE: - mpc->mpc_ops->mpo_cred_check_setutimes_vnode = + case MAC_CHECK_SETUTIMES_VNODE: + mpc->mpc_ops->mpo_check_setutimes_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_SCHED_PROC: - mpc->mpc_ops->mpo_cred_check_sched_proc = + case MAC_CHECK_SCHED_PROC: + mpc->mpc_ops->mpo_check_sched_proc = mpe->mpe_function; break; - case MAC_CRED_CHECK_SIGNAL_PROC: - mpc->mpc_ops->mpo_cred_check_signal_proc = + case MAC_CHECK_SIGNAL_PROC: + mpc->mpc_ops->mpo_check_signal_proc = mpe->mpe_function; break; - case MAC_CRED_CHECK_STAT_VNODE: - mpc->mpc_ops->mpo_cred_check_stat_vnode = + case MAC_CHECK_STAT_VNODE: + mpc->mpc_ops->mpo_check_stat_vnode = mpe->mpe_function; break; - case MAC_CRED_CHECK_VNODE_MMAP_PERMS: - mpc->mpc_ops->mpo_cred_check_vnode_mmap_perms = + case MAC_CHECK_VNODE_MMAP_PERMS: + mpc->mpc_ops->mpo_check_vnode_mmap_perms = mpe->mpe_function; break; - case MAC_CRED_CHECK_VNODE_OP: - mpc->mpc_ops->mpo_cred_check_vnode_op = + case MAC_CHECK_VNODE_OP: + mpc->mpc_ops->mpo_check_vnode_op = mpe->mpe_function; break; - case MAC_CRED_CHECK_PIPE_IOCTL: - mpc->mpc_ops->mpo_cred_check_pipe_ioctl = + case MAC_CHECK_PIPE_IOCTL: + mpc->mpc_ops->mpo_check_pipe_ioctl = mpe->mpe_function; break; - case MAC_CRED_CHECK_PIPE_OP: - mpc->mpc_ops->mpo_cred_check_pipe_op = + case MAC_CHECK_PIPE_OP: + mpc->mpc_ops->mpo_check_pipe_op = mpe->mpe_function; break; case MAC_IFNET_CHECK_SEND_MBUF: @@ -1048,7 +1048,7 @@ if (!mac_enforce_process) return (0); - MAC_CHECK(cred_check_see_cred, u1, u2); + MAC_CHECK(check_see_cred, u1, u2); return (error); } @@ -1061,7 +1061,7 @@ if (!mac_enforce_socket) return (0); - MAC_CHECK(cred_check_see_socket, cred, socket, &socket->so_label); + MAC_CHECK(check_see_socket, cred, socket, &socket->so_label); return (error); } @@ -1074,7 +1074,7 @@ if (!mac_enforce_process) return (0); - MAC_CHECK(cred_check_signal_proc, cred, proc, signum); + MAC_CHECK(check_signal_proc, cred, proc, signum); return (error); } @@ -1087,7 +1087,7 @@ if (!mac_enforce_process) return (0); - MAC_CHECK(cred_check_sched_proc, cred, proc); + MAC_CHECK(check_sched_proc, cred, proc); return (error); } @@ -1100,7 +1100,7 @@ if (!mac_enforce_process) return (0); - MAC_CHECK(cred_check_debug_proc, cred, proc); + MAC_CHECK(check_debug_proc, cred, proc); return (error); } @@ -1365,7 +1365,7 @@ error = vn_refreshlabel(vp, cred); if (error) return (error); - MAC_CHECK(cred_check_exec_vnode, cred, vp, &vp->v_label); + MAC_CHECK(check_exec_vnode, cred, vp, &vp->v_label); return (error); } @@ -1755,38 +1755,38 @@ * 0 is returned for success, otherwise an errno. */ static int -mac_cred_check_relabel_subject(struct ucred *cred, struct label *newlabel) +mac_check_relabel_subject(struct ucred *cred, struct label *newlabel) { int error; - MAC_CHECK(cred_check_relabel_subject, cred, newlabel); + MAC_CHECK(check_relabel_subject, cred, newlabel); return (error); } static int -mac_cred_check_relabel_vnode(struct ucred *cred, struct vnode *vp, +mac_check_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *newlabel) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_relabel_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_relabel_vnode"); error = vn_refreshlabel(vp, cred); if (error) return (error); - MAC_CHECK(cred_check_relabel_vnode, cred, vp, &vp->v_label, newlabel); + MAC_CHECK(check_relabel_vnode, cred, vp, &vp->v_label, newlabel); return (error); } int -mac_cred_check_access_vnode(struct ucred *cred, struct vnode *vp, int flags) +mac_check_access_vnode(struct ucred *cred, struct vnode *vp, int flags) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_access_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_access_vnode"); if (!mac_enforce_fs) return (0); @@ -1795,16 +1795,16 @@ if (error) return (error); - MAC_CHECK(cred_check_access_vnode, cred, vp, &vp->v_label, flags); + MAC_CHECK(check_access_vnode, cred, vp, &vp->v_label, flags); return (error); } int -mac_cred_check_chdir_vnode(struct ucred *cred, struct vnode *dvp) +mac_check_chdir_vnode(struct ucred *cred, struct vnode *dvp) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_cred_check_chdir_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_chdir_vnode"); if (!mac_enforce_fs) return (0); @@ -1813,16 +1813,16 @@ if (error) return (error); - MAC_CHECK(cred_check_chdir_vnode, cred, dvp, &dvp->v_label); + MAC_CHECK(check_chdir_vnode, cred, dvp, &dvp->v_label); return (error); } int -mac_cred_check_chroot_vnode(struct ucred *cred, struct vnode *dvp) +mac_check_chroot_vnode(struct ucred *cred, struct vnode *dvp) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_cred_check_chroot_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_chroot_vnode"); if (!mac_enforce_fs) return (0); @@ -1831,17 +1831,17 @@ if (error) return (error); - MAC_CHECK(cred_check_chroot_vnode, cred, dvp, &dvp->v_label); + MAC_CHECK(check_chroot_vnode, cred, dvp, &dvp->v_label); return (error); } int -mac_cred_check_create_vnode(struct ucred *cred, struct vnode *dvp, +mac_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct componentname *cnp, struct vattr *vap) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_cred_check_create_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_create_vnode"); if (!mac_enforce_fs) return (0); @@ -1850,17 +1850,16 @@ if (error) return (error); - MAC_CHECK(cred_check_create_vnode, cred, dvp, &dvp->v_label, cnp, vap); + MAC_CHECK(check_create_vnode, cred, dvp, &dvp->v_label, cnp, vap); return (error); } int -mac_cred_check_getacl_vnode(struct ucred *cred, struct vnode *vp, - acl_type_t type) +mac_check_getacl_vnode(struct ucred *cred, struct vnode *vp, acl_type_t type) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_getacl_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_getacl_vnode"); if (!mac_enforce_fs) return (0); @@ -1869,17 +1868,17 @@ if (error) return (error); - MAC_CHECK(cred_check_getacl_vnode, cred, vp, &vp->v_label, type); + MAC_CHECK(check_getacl_vnode, cred, vp, &vp->v_label, type); return (error); } int -mac_cred_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, +mac_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_getextattr_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_getextattr_vnode"); if (!mac_enforce_fs) return (0); @@ -1888,30 +1887,30 @@ if (error) return (error); - MAC_CHECK(cred_check_getextattr_vnode, cred, vp, &vp->v_label, + MAC_CHECK(check_getextattr_vnode, cred, vp, &vp->v_label, attrnamespace, name, uio); return (error); } int -mac_cred_check_listen_socket(struct ucred *cred, struct socket *socket) +mac_check_listen_socket(struct ucred *cred, struct socket *socket) { int error; if (!mac_enforce_socket) return (0); - MAC_CHECK(cred_check_listen_socket, cred, socket, &socket->so_label); + MAC_CHECK(check_listen_socket, cred, socket, &socket->so_label); return (error); } int -mac_cred_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, +mac_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, struct componentname *cnp) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_cred_check_lookup_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_lookup_vnode"); if (!mac_enforce_fs) return (0); @@ -1920,31 +1919,30 @@ if (error) return (error); - MAC_CHECK(cred_check_lookup_vnode, cred, dvp, &dvp->v_label, cnp); + MAC_CHECK(check_lookup_vnode, cred, dvp, &dvp->v_label, cnp); return (error); } vm_prot_t -mac_cred_check_mmap_vnode_prot(struct ucred *cred, struct vnode *vp, - int newmapping) +mac_check_mmap_vnode_prot(struct ucred *cred, struct vnode *vp, int newmapping) { vm_prot_t result = VM_PROT_ALL; /* * This should be some sort of MAC_BITWISE, maybe :) */ - ASSERT_VOP_LOCKED(vp, "mac_cred_check_mmap_vnode_perms"); - MAC_BOOLEAN(cred_check_vnode_mmap_perms, &, cred, vp, &vp->v_label, + ASSERT_VOP_LOCKED(vp, "mac_check_mmap_vnode_perms"); + MAC_BOOLEAN(check_vnode_mmap_perms, &, cred, vp, &vp->v_label, newmapping); return (result); } int -mac_cred_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode) +mac_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_open_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_open_vnode"); if (!mac_enforce_fs) return (0); @@ -1953,16 +1951,16 @@ if (error) return (error); - MAC_CHECK(cred_check_open_vnode, cred, vp, &vp->v_label, acc_mode); + MAC_CHECK(check_open_vnode, cred, vp, &vp->v_label, acc_mode); return (error); } int -mac_cred_check_readdir_vnode(struct ucred *cred, struct vnode *dvp) +mac_check_readdir_vnode(struct ucred *cred, struct vnode *dvp) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_cred_check_readdir_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_readdir_vnode"); if (!mac_enforce_fs) return (0); @@ -1971,16 +1969,16 @@ if (error) return (error); - MAC_CHECK(cred_check_readdir_vnode, cred, dvp, &dvp->v_label); + MAC_CHECK(check_readdir_vnode, cred, dvp, &dvp->v_label); return (error); } int -mac_cred_check_readlink_vnode(struct ucred *cred, struct vnode *vp) +mac_check_readlink_vnode(struct ucred *cred, struct vnode *vp) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_readlink_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_readlink_vnode"); if (!mac_enforce_fs) return (0); @@ -1989,16 +1987,16 @@ if (error) return (error); - MAC_CHECK(cred_check_readlink_vnode, cred, vp, &vp->v_label); + MAC_CHECK(check_readlink_vnode, cred, vp, &vp->v_label); return (error); } int -mac_cred_check_revoke_vnode(struct ucred *cred, struct vnode *vp) +mac_check_revoke_vnode(struct ucred *cred, struct vnode *vp) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_revoke_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_revoke_vnode"); if (!mac_enforce_fs) return (0); @@ -2007,17 +2005,17 @@ if (error) return (error); - MAC_CHECK(cred_check_revoke_vnode, cred, vp, &vp->v_label); + MAC_CHECK(check_revoke_vnode, cred, vp, &vp->v_label); return (error); } int -mac_cred_check_setacl_vnode(struct ucred *cred, struct vnode *vp, - acl_type_t type, struct acl *acl) +mac_check_setacl_vnode(struct ucred *cred, struct vnode *vp, acl_type_t type, + struct acl *acl) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_setacl_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_setacl_vnode"); if (!mac_enforce_fs) return (0); @@ -2026,17 +2024,17 @@ if (error) return (error); - MAC_CHECK(cred_check_setacl_vnode, cred, vp, &vp->v_label, type, acl); + MAC_CHECK(check_setacl_vnode, cred, vp, &vp->v_label, type, acl); return (error); } int -mac_cred_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, +mac_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_setextattr_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_setextattr_vnode"); if (!mac_enforce_fs) return (0); @@ -2045,18 +2043,17 @@ if (error) return (error); - MAC_CHECK(cred_check_setextattr_vnode, cred, vp, &vp->v_label, + MAC_CHECK(check_setextattr_vnode, cred, vp, &vp->v_label, attrnamespace, name, uio); return (error); } int -mac_cred_check_setflags_vnode(struct ucred *cred, struct vnode *vp, - u_long flags) +mac_check_setflags_vnode(struct ucred *cred, struct vnode *vp, u_long flags) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_setflags_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_setflags_vnode"); if (!mac_enforce_fs) return (0); @@ -2065,17 +2062,16 @@ if (error) return (error); - MAC_CHECK(cred_check_setflags_vnode, cred, vp, &vp->v_label, flags); + MAC_CHECK(check_setflags_vnode, cred, vp, &vp->v_label, flags); return (error); } int -mac_cred_check_setmode_vnode(struct ucred *cred, struct vnode *vp, - mode_t mode) +mac_check_setmode_vnode(struct ucred *cred, struct vnode *vp, mode_t mode) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_setmode_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_setmode_vnode"); if (!mac_enforce_fs) return (0); @@ -2084,17 +2080,17 @@ if (error) return (error); - MAC_CHECK(cred_check_setmode_vnode, cred, vp, &vp->v_label, mode); + MAC_CHECK(check_setmode_vnode, cred, vp, &vp->v_label, mode); return (error); } int -mac_cred_check_setowner_vnode(struct ucred *cred, struct vnode *vp, uid_t uid, +mac_check_setowner_vnode(struct ucred *cred, struct vnode *vp, uid_t uid, gid_t gid) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_setowner_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_setowner_vnode"); if (!mac_enforce_fs) return (0); @@ -2103,17 +2099,17 @@ if (error) return (error); - MAC_CHECK(cred_check_setowner_vnode, cred, vp, &vp->v_label, uid, gid); + MAC_CHECK(check_setowner_vnode, cred, vp, &vp->v_label, uid, gid); return (error); } int -mac_cred_check_setutimes_vnode(struct ucred *cred, struct vnode *vp, +mac_check_setutimes_vnode(struct ucred *cred, struct vnode *vp, struct timespec atime, struct timespec mtime) { int error; - ASSERT_VOP_LOCKED(vp, "mac_cred_check_setutimes_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_setutimes_vnode"); if (!mac_enforce_fs) return (0); @@ -2122,19 +2118,19 @@ if (error) return (error); - MAC_CHECK(cred_check_setutimes_vnode, cred, vp, &vp->v_label, atime, + MAC_CHECK(check_setutimes_vnode, cred, vp, &vp->v_label, atime, mtime); return (error); } int -mac_cred_check_delete_vnode(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, struct componentname *cnp) +mac_check_delete_vnode(struct ucred *cred, struct vnode *dvp, struct vnode *vp, + struct componentname *cnp) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_cred_check_delete_vnode"); - ASSERT_VOP_LOCKED(vp, "mac_cred_check_delete_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_delete_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_delete_vnode"); if (!mac_enforce_fs) return (0); @@ -2146,18 +2142,18 @@ if (error) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 14:17:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C83A37B401; Sat, 27 Jul 2002 14:17:29 -0700 (PDT) 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 2D05237B400 for ; Sat, 27 Jul 2002 14:17:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8E6743E5E for ; Sat, 27 Jul 2002 14:17:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6RLHSJU036880 for ; Sat, 27 Jul 2002 14:17:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6RLHS6M036877 for perforce@freebsd.org; Sat, 27 Jul 2002 14:17:28 -0700 (PDT) Date: Sat, 27 Jul 2002 14:17:28 -0700 (PDT) Message-Id: <200207272117.g6RLHS6M036877@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15006 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15006 Change 15006 by rwatson@rwatson_paprika on 2002/07/27 14:16:34 Typo in merge. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#63 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#63 (text+ko) ==== @@ -3311,7 +3311,7 @@ if (nullflag) vattr.va_vaflags |= VA_UTIMES_NULL; #ifdef MAC - error = mac_check_setutimes_vnode(td->td_ucred, vp, vattr.va_atime,u + error = mac_check_setutimes_vnode(td->td_ucred, vp, vattr.va_atime, vattr.va_mtime); if (error != 0) goto out; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 15:57:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A197B37B401; Sat, 27 Jul 2002 15:56:35 -0700 (PDT) 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 4418C37B400 for ; Sat, 27 Jul 2002 15:56:35 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9370343E4A for ; Sat, 27 Jul 2002 15:56:34 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6RMuYJU064001 for ; Sat, 27 Jul 2002 15:56:34 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6RMuYQS063991 for perforce@freebsd.org; Sat, 27 Jul 2002 15:56:34 -0700 (PDT) Date: Sat, 27 Jul 2002 15:56:34 -0700 (PDT) Message-Id: <200207272256.g6RMuYQS063991@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 15014 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15014 Change 15014 by chris@chris_holly on 2002/07/27 15:55:38 Match change no. 15005: s/cred_check/check/g Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#9 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#9 (text+ko) ==== @@ -3198,12 +3198,12 @@ - <function>&mac.mpo;_cred_check_bind_socket</function> + <function>&mac.mpo;_check_bind_socket</function> int - &mac.mpo;_cred_check_bind_socket + &mac.mpo;_check_bind_socket struct ucred *cred @@ -3249,12 +3249,12 @@ - <function>&mac.mpo;_cred_check_connect_socket</function> + <function>&mac.mpo;_check_connect_socket</function> int - &mac.mpo;_cred_check_connect_socket + &mac.mpo;_check_connect_socket struct ucred *cred @@ -3308,12 +3308,12 @@ - <function>&mac.mpo;_cred_check_see_cred</function> + <function>&mac.mpo;_check_see_cred</function> int - &mac.mpo;_cred_check_see_cred + &mac.mpo;_check_see_cred struct ucred *u1 @@ -3355,12 +3355,12 @@ - <function>&mac.mpo;_cred_check_see_socket</function> + <function>&mac.mpo;_check_see_socket</function> int - &mac.mpo;_cred_check_see_socket + &mac.mpo;_check_see_socket struct ucred *cred @@ -3398,12 +3398,12 @@ - <function>&mac.mpo;_cred_check_relabel_ifnet</function> + <function>&mac.mpo;_check_relabel_ifnet</function> int - &mac.mpo;_cred_check_relabel_ifnet + &mac.mpo;_check_relabel_ifnet struct ucred *cred @@ -3451,12 +3451,12 @@ - <function>&mac.mpo;_cred_check_relabel_socket</function> + <function>&mac.mpo;_check_relabel_socket</function> int - &mac.mpo;_cred_check_relabel_socket + &mac.mpo;_check_relabel_socket struct ucred *cred @@ -3504,12 +3504,12 @@ - <function>&mac.mpo;_cred_check_relabel_subject</function> + <function>&mac.mpo;_check_relabel_subject</function> int - &mac.mpo;_cred_check_relabel_subject + &mac.mpo;_check_relabel_subject struct ucred *cred @@ -3542,12 +3542,12 @@ - <function>&mac.mpo;_cred_check_relabel_vnode</function> + <function>&mac.mpo;_check_relabel_vnode</function> int - &mac.mpo;_cred_check_relabel_vnode + &mac.mpo;_check_relabel_vnode struct ucred *cred @@ -3597,11 +3597,11 @@ - <function>&mac.mpo;_cred_check_statfs</function> + <function>&mac.mpo;_check_statfs</function> - int &mac.mpo;_cred_check_statfs + int &mac.mpo;_check_statfs struct ucred *cred @@ -3649,12 +3649,12 @@ - <function>&mac.mpo;_cred_check_debug_proc</function> + <function>&mac.mpo;_check_debug_proc</function> int - &mac.mpo;_cred_check_debug_proc + &mac.mpo;_check_debug_proc struct ucred *cred @@ -3695,12 +3695,12 @@ - <function>&mac.mpo;_cred_check_access_vnode</function> + <function>&mac.mpo;_check_access_vnode</function> int - &mac.mpo;_cred_check_access_vnode + &mac.mpo;_check_access_vnode struct ucred *cred @@ -3752,12 +3752,12 @@ - <function>&mac.mpo;_cred_check_chdir_vnode</function> + <function>&mac.mpo;_check_chdir_vnode</function> int - &mac.mpo;_cred_check_chdir_vnode + &mac.mpo;_check_chdir_vnode struct ucred *cred @@ -3802,12 +3802,12 @@ - <function>&mac.mpo;_cred_check_create_vnode</function> + <function>&mac.mpo;_check_create_vnode</function> int - &mac.mpo;_cred_check_create_vnode + &mac.mpo;_check_create_vnode struct ucred *cred @@ -3871,12 +3871,12 @@ - <function>&mac.mpo;_cred_check_delete_vnode</function> + <function>&mac.mpo;_check_delete_vnode</function> int - &mac.mpo;_cred_check_delete_vnode + &mac.mpo;_check_delete_vnode struct ucred *cred @@ -3943,18 +3943,18 @@ including as a result of calls to 7man.unlink.2; and 7man.rmdir.2;. Policies implementing this entry point should also implement - mpo_cred_check_rename_to to authorize + mpo_check_rename_to to authorize deletion of objects as a result of being the target of a rename. - <function>&mac.mpo;_cred_check_deleteacl_vnode</function> + <function>&mac.mpo;_check_deleteacl_vnode</function> int - &mac.mpo;_cred_check_deleteacl_vnode + &mac.mpo;_check_deleteacl_vnode struct ucred *cred struct vnode *vp @@ -4004,12 +4004,12 @@ - <function>&mac.mpo;_cred_check_exec_vnode</function> + <function>&mac.mpo;_check_exec_vnode</function> int - &mac.mpo;_cred_check_exec_vnode + &mac.mpo;_check_exec_vnode struct ucred *cred @@ -4055,12 +4055,12 @@ - <function>&mac.mpo;_cred_check_getacl_vnode</function> + <function>&mac.mpo;_check_getacl_vnode</function> int - &mac.mpo;_cred_check_getacl_vnode + &mac.mpo;_check_getacl_vnode struct ucred *cred @@ -4112,12 +4112,12 @@ - <function>&mac.mpo;_cred_check_getextattr_vnode</function> + <function>&mac.mpo;_check_getextattr_vnode</function> int - &mac.mpo;_cred_check_getextattr_vnode + &mac.mpo;_check_getextattr_vnode struct ucred *cred @@ -4186,12 +4186,12 @@ - <function>&mac.mpo;_cred_check_listen_socket</function> + <function>&mac.mpo;_check_listen_socket</function> int - &mac.mpo;_cred_check_listen_socket + &mac.mpo;_check_listen_socket struct ucred *cred @@ -4235,12 +4235,12 @@ - <function>&mac.mpo;_cred_check_lookup_vnode</function> + <function>&mac.mpo;_check_lookup_vnode</function> int - &mac.mpo;_cred_check_lookup_vnode + &mac.mpo;_check_lookup_vnode struct ucred *cred @@ -4292,12 +4292,12 @@ - <function>&mac.mpo;_cred_check_open_vnode</function> + <function>&mac.mpo;_check_open_vnode</function> int - &mac.mpo;_cred_check_open_vnode + &mac.mpo;_check_open_vnode struct ucred *cred @@ -4348,12 +4348,12 @@ - <function>&mac.mpo;_cred_check_readdir_vnode</function> + <function>&mac.mpo;_check_readdir_vnode</function> int - &mac.mpo;_cred_check_readdir_vnode + &mac.mpo;_check_readdir_vnode struct ucred *cred @@ -4398,12 +4398,12 @@ - <function>&mac.mpo;_cred_check_readlink_vnode</function> + <function>&mac.mpo;_check_readlink_vnode</function> int - &mac.mpo;_cred_check_readlink_vnode + &mac.mpo;_check_readlink_vnode struct ucred *cred @@ -4452,12 +4452,12 @@ - <function>&mac.mpo;_cred_check_rename_from_vnode</function> + <function>&mac.mpo;_check_rename_from_vnode</function> int - &mac.mpo;_cred_check_rename_from_vnode + &mac.mpo;_check_rename_from_vnode struct ucred *cred @@ -4520,7 +4520,7 @@ directory (dvp) using the passed name (cnp). This call will be made in combination with a follow-up call to - mpo_cred_check_rename_to_vnode. Return + mpo_check_rename_to_vnode. Return 0 for success, or an errno value for failure. Suggested failure: EACCES for label mismatch, @@ -4529,12 +4529,12 @@ - <function>&mac.mpo;_cred_check_rename_to_vnode</function> + <function>&mac.mpo;_check_rename_to_vnode</function> int - &mac.mpo;_cred_check_rename_to_vnode + &mac.mpo;_check_rename_to_vnode struct ucred *cred @@ -4596,7 +4596,7 @@ directory (dvp) with the passed name (cnp). This call will be made in combination with an earlier call to - mpo_cred_check_rename_from_vnode. + mpo_check_rename_from_vnode. Return 0 for success, or an errno value for failure. Suggested failure: EACCES for label mismatch, @@ -4605,12 +4605,12 @@ - <function>&mac.mpo;_cred_check_revoke_vnode</function> + <function>&mac.mpo;_check_revoke_vnode</function> int - &mac.mpo;_cred_check_revoke_vnode + &mac.mpo;_check_revoke_vnode struct ucred *cred @@ -4655,12 +4655,12 @@ - <function>&mac.mpo;_cred_check_setacl_vnode</function> + <function>&mac.mpo;_check_setacl_vnode</function> int - &mac.mpo;_cred_check_setacl_vnode + &mac.mpo;_check_setacl_vnode struct ucred *cred @@ -4719,12 +4719,12 @@ - <function>&mac.mpo;_cred_check_setextattr_vnode</function> + <function>&mac.mpo;_check_setextattr_vnode</function> int - &mac.mpo;_cred_check_setextattr_vnode + &mac.mpo;_check_setextattr_vnode struct ucred *cred @@ -4792,12 +4792,12 @@ - <function>&mac.mpo;_cred_check_setflags_vnode</function> + <function>&mac.mpo;_check_setflags_vnode</function> int - &mac.mpo;_cred_check_setflags_vnode + &mac.mpo;_check_setflags_vnode struct ucred *cred @@ -4848,12 +4848,12 @@ - <function>&mac.mpo;_cred_check_setmode_vnode</function> + <function>&mac.mpo;_check_setmode_vnode</function> int - &mac.mpo;_cred_check_setmode_vnode + &mac.mpo;_check_setmode_vnode struct ucred *cred @@ -4903,12 +4903,12 @@ - <function>&mac.mpo;_cred_check_setowner_vnode</function> + <function>&mac.mpo;_check_setowner_vnode</function> int - &mac.mpo;_cred_check_setowner_vnode + &mac.mpo;_check_setowner_vnode struct ucred *cred @@ -4965,12 +4965,12 @@ - <function>&mac.mpo;_cred_check_setutimes_vnode</function> + <function>&mac.mpo;_check_setutimes_vnode</function> int - &mac.mpo;_cred_check_setutimes_vnode + &mac.mpo;_check_setutimes_vnode struct ucred *cred @@ -5029,12 +5029,12 @@ - <function>&mac.mpo;_cred_check_sched_proc</function> + <function>&mac.mpo;_check_sched_proc</function> int - &mac.mpo;_cred_check_sched_proc + &mac.mpo;_check_sched_proc struct ucred *ucred @@ -5071,12 +5071,12 @@ - <function>&mac.mpo;_cred_check_signal_proc</function> + <function>&mac.mpo;_check_signal_proc</function> int - &mac.mpo;_cred_check_signal_proc + &mac.mpo;_check_signal_proc struct ucred *cred @@ -5119,12 +5119,12 @@ - <function>&mac.mpo;_cred_check_stat_vnode</function> + <function>&mac.mpo;_check_stat_vnode</function> int - &mac.mpo;_cred_check_stat_vnode + &mac.mpo;_check_stat_vnode struct ucred *cred @@ -5169,12 +5169,12 @@ - <function>&mac.mpo;_cred_check_send_mbuf</function> + <function>&mac.mpo;_check_send_mbuf</function> int - &mac.mpo;_cred_check_send_mbuf + &mac.mpo;_check_send_mbuf struct ucred *cred @@ -5233,12 +5233,12 @@ - <function>&mac.mpo;_cred_check_receive_mbuf</function> + <function>&mac.mpo;_check_receive_mbuf</function> int - &mac.mpo;_cred_check_receive_mbuf + &mac.mpo;_check_receive_mbuf struct ucred *cred To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 16:19: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 756B837B401; Sat, 27 Jul 2002 16:18:26 -0700 (PDT) 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 0D00937B400; Sat, 27 Jul 2002 16:18:26 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C06C43E3B; Sat, 27 Jul 2002 16:18:23 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g6RNIEOo025816; Sat, 27 Jul 2002 19:18:14 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Sat, 27 Jul 2002 19:18:14 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Chris Costello Cc: Perforce Change Reviews Subject: Re: PERFORCE change 15014 for review In-Reply-To: <200207272256.g6RMuYQS063991@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Thanks. I meant to drop you an e-mail telling you I was in the process of producing suffering for you, but haven't had a chance yet. I may yet introduce a little more suffering, but all syntactic and not semantic. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Sat, 27 Jul 2002, Chris Costello wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15014 > > Change 15014 by chris@chris_holly on 2002/07/27 15:55:38 > > Match change no. 15005: s/cred_check/check/g > > Affected files ... > > .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#9 edit > > Differences ... > > ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#9 (text+ko) ==== > > @@ -3198,12 +3198,12 @@ > > > > - <function>&mac.mpo;_cred_check_bind_socket</function> > + <function>&mac.mpo;_check_bind_socket</function> > > > > int > - &mac.mpo;_cred_check_bind_socket > + &mac.mpo;_check_bind_socket > > struct ucred > *cred > @@ -3249,12 +3249,12 @@ > > > > - <function>&mac.mpo;_cred_check_connect_socket</function> > + <function>&mac.mpo;_check_connect_socket</function> > > > > int > - &mac.mpo;_cred_check_connect_socket > + &mac.mpo;_check_connect_socket > > struct ucred > *cred > @@ -3308,12 +3308,12 @@ > > > > - <function>&mac.mpo;_cred_check_see_cred</function> > + <function>&mac.mpo;_check_see_cred</function> > > > > int > - &mac.mpo;_cred_check_see_cred > + &mac.mpo;_check_see_cred > > struct ucred > *u1 > @@ -3355,12 +3355,12 @@ > > > > - <function>&mac.mpo;_cred_check_see_socket</function> > + <function>&mac.mpo;_check_see_socket</function> > > > > int > - &mac.mpo;_cred_check_see_socket > + &mac.mpo;_check_see_socket > > struct ucred > *cred > @@ -3398,12 +3398,12 @@ > > > > - <function>&mac.mpo;_cred_check_relabel_ifnet</function> > + <function>&mac.mpo;_check_relabel_ifnet</function> > > > > int > - &mac.mpo;_cred_check_relabel_ifnet > + &mac.mpo;_check_relabel_ifnet > > struct ucred > *cred > @@ -3451,12 +3451,12 @@ > > > > - <function>&mac.mpo;_cred_check_relabel_socket</function> > + <function>&mac.mpo;_check_relabel_socket</function> > > > > int > - &mac.mpo;_cred_check_relabel_socket > + &mac.mpo;_check_relabel_socket > > struct ucred > *cred > @@ -3504,12 +3504,12 @@ > > > > - <function>&mac.mpo;_cred_check_relabel_subject</function> > + <function>&mac.mpo;_check_relabel_subject</function> > > > > int > - &mac.mpo;_cred_check_relabel_subject > + &mac.mpo;_check_relabel_subject > > struct ucred > *cred > @@ -3542,12 +3542,12 @@ > > > > - <function>&mac.mpo;_cred_check_relabel_vnode</function> > + <function>&mac.mpo;_check_relabel_vnode</function> > > > > int > - &mac.mpo;_cred_check_relabel_vnode > + &mac.mpo;_check_relabel_vnode > > struct ucred > *cred > @@ -3597,11 +3597,11 @@ > > > > - <function>&mac.mpo;_cred_check_statfs</function> > + <function>&mac.mpo;_check_statfs</function> > > > > - int &mac.mpo;_cred_check_statfs > + int &mac.mpo;_check_statfs > > struct ucred > *cred > @@ -3649,12 +3649,12 @@ > > > > - <function>&mac.mpo;_cred_check_debug_proc</function> > + <function>&mac.mpo;_check_debug_proc</function> > > > > int > - &mac.mpo;_cred_check_debug_proc > + &mac.mpo;_check_debug_proc > > struct ucred > *cred > @@ -3695,12 +3695,12 @@ > > > > - <function>&mac.mpo;_cred_check_access_vnode</function> > + <function>&mac.mpo;_check_access_vnode</function> > > > > int > - &mac.mpo;_cred_check_access_vnode > + &mac.mpo;_check_access_vnode > > struct ucred > *cred > @@ -3752,12 +3752,12 @@ > > > > - <function>&mac.mpo;_cred_check_chdir_vnode</function> > + <function>&mac.mpo;_check_chdir_vnode</function> > > > > int > - &mac.mpo;_cred_check_chdir_vnode > + &mac.mpo;_check_chdir_vnode > > struct ucred > *cred > @@ -3802,12 +3802,12 @@ > > > > - <function>&mac.mpo;_cred_check_create_vnode</function> > + <function>&mac.mpo;_check_create_vnode</function> > > > > int > - &mac.mpo;_cred_check_create_vnode > + &mac.mpo;_check_create_vnode > > struct ucred > *cred > @@ -3871,12 +3871,12 @@ > > > > - <function>&mac.mpo;_cred_check_delete_vnode</function> > + <function>&mac.mpo;_check_delete_vnode</function> > > > > int > - &mac.mpo;_cred_check_delete_vnode > + &mac.mpo;_check_delete_vnode > > struct ucred > *cred > @@ -3943,18 +3943,18 @@ > including as a result of calls to 7man.unlink.2; and > 7man.rmdir.2;. Policies implementing this entry point > should also implement > - mpo_cred_check_rename_to to authorize > + mpo_check_rename_to to authorize > deletion of objects as a result of being the target of a > rename. > > > > - <function>&mac.mpo;_cred_check_deleteacl_vnode</function> > + <function>&mac.mpo;_check_deleteacl_vnode</function> > > > > int > - &mac.mpo;_cred_check_deleteacl_vnode > + &mac.mpo;_check_deleteacl_vnode > > struct ucred *cred > struct vnode *vp > @@ -4004,12 +4004,12 @@ > > > > - <function>&mac.mpo;_cred_check_exec_vnode</function> > + <function>&mac.mpo;_check_exec_vnode</function> > > > > int > - &mac.mpo;_cred_check_exec_vnode > + &mac.mpo;_check_exec_vnode > > struct ucred > *cred > @@ -4055,12 +4055,12 @@ > > > > - <function>&mac.mpo;_cred_check_getacl_vnode</function> > + <function>&mac.mpo;_check_getacl_vnode</function> > > > > int > - &mac.mpo;_cred_check_getacl_vnode > + &mac.mpo;_check_getacl_vnode > > struct ucred > *cred > @@ -4112,12 +4112,12 @@ > > > > - <function>&mac.mpo;_cred_check_getextattr_vnode</function> > + <function>&mac.mpo;_check_getextattr_vnode</function> > > > > int > - &mac.mpo;_cred_check_getextattr_vnode > + &mac.mpo;_check_getextattr_vnode > > struct ucred > *cred > @@ -4186,12 +4186,12 @@ > > > > - <function>&mac.mpo;_cred_check_listen_socket</function> > + <function>&mac.mpo;_check_listen_socket</function> > > > > int > - &mac.mpo;_cred_check_listen_socket > + &mac.mpo;_check_listen_socket > > struct ucred > *cred > @@ -4235,12 +4235,12 @@ > > > > - <function>&mac.mpo;_cred_check_lookup_vnode</function> > + <function>&mac.mpo;_check_lookup_vnode</function> > > > > int > - &mac.mpo;_cred_check_lookup_vnode > + &mac.mpo;_check_lookup_vnode > > struct ucred > *cred > @@ -4292,12 +4292,12 @@ > > > > - <function>&mac.mpo;_cred_check_open_vnode</function> > + <function>&mac.mpo;_check_open_vnode</function> > > > > int > - &mac.mpo;_cred_check_open_vnode > + &mac.mpo;_check_open_vnode > > struct ucred > *cred > @@ -4348,12 +4348,12 @@ > > > > - <function>&mac.mpo;_cred_check_readdir_vnode</function> > + <function>&mac.mpo;_check_readdir_vnode</function> > > > > int > - &mac.mpo;_cred_check_readdir_vnode > + &mac.mpo;_check_readdir_vnode > > struct ucred > *cred > @@ -4398,12 +4398,12 @@ > > > > - <function>&mac.mpo;_cred_check_readlink_vnode</function> > + <function>&mac.mpo;_check_readlink_vnode</function> > > > > int > - &mac.mpo;_cred_check_readlink_vnode > + &mac.mpo;_check_readlink_vnode > > struct ucred > *cred > @@ -4452,12 +4452,12 @@ > > > > - <function>&mac.mpo;_cred_check_rename_from_vnode</function> > + <function>&mac.mpo;_check_rename_from_vnode</function> > > > > int > - &mac.mpo;_cred_check_rename_from_vnode > + &mac.mpo;_check_rename_from_vnode > > struct ucred > *cred > @@ -4520,7 +4520,7 @@ > directory (dvp) using the passed name > (cnp). This call will be made in > combination with a follow-up call to > - mpo_cred_check_rename_to_vnode. Return > + mpo_check_rename_to_vnode. Return > 0 for success, or an > errno value for failure. Suggested > failure: EACCES for label mismatch, > @@ -4529,12 +4529,12 @@ > > > > - <function>&mac.mpo;_cred_check_rename_to_vnode</function> > + <function>&mac.mpo;_check_rename_to_vnode</function> > > > > int > - &mac.mpo;_cred_check_rename_to_vnode > + &mac.mpo;_check_rename_to_vnode > > struct ucred > *cred > @@ -4596,7 +4596,7 @@ > directory (dvp) with the passed name > (cnp). This call will be made in > combination with an earlier call to > - mpo_cred_check_rename_from_vnode. > + mpo_check_rename_from_vnode. > Return 0 for success, or an > errno value for failure. Suggested > failure: EACCES for label mismatch, > @@ -4605,12 +4605,12 @@ > > > > - <function>&mac.mpo;_cred_check_revoke_vnode</function> > + <function>&mac.mpo;_check_revoke_vnode</function> > > > > int > - &mac.mpo;_cred_check_revoke_vnode > + &mac.mpo;_check_revoke_vnode > > struct ucred > *cred > @@ -4655,12 +4655,12 @@ > > > > - <function>&mac.mpo;_cred_check_setacl_vnode</function> > + <function>&mac.mpo;_check_setacl_vnode</function> > > > > int > - &mac.mpo;_cred_check_setacl_vnode > + &mac.mpo;_check_setacl_vnode > > struct ucred > *cred > @@ -4719,12 +4719,12 @@ > > > > - <function>&mac.mpo;_cred_check_setextattr_vnode</function> > + <function>&mac.mpo;_check_setextattr_vnode</function> > > > > int > - &mac.mpo;_cred_check_setextattr_vnode > + &mac.mpo;_check_setextattr_vnode > > struct ucred > *cred > @@ -4792,12 +4792,12 @@ > > > > - <function>&mac.mpo;_cred_check_setflags_vnode</function> > + <function>&mac.mpo;_check_setflags_vnode</function> > > > > int > - &mac.mpo;_cred_check_setflags_vnode > + &mac.mpo;_check_setflags_vnode > > struct ucred > *cred > @@ -4848,12 +4848,12 @@ > > > > - <function>&mac.mpo;_cred_check_setmode_vnode</function> > + <function>&mac.mpo;_check_setmode_vnode</function> > > > > int > - &mac.mpo;_cred_check_setmode_vnode > + &mac.mpo;_check_setmode_vnode > > struct ucred > *cred > @@ -4903,12 +4903,12 @@ > > > > - <function>&mac.mpo;_cred_check_setowner_vnode</function> > + <function>&mac.mpo;_check_setowner_vnode</function> > > > > int > - &mac.mpo;_cred_check_setowner_vnode > + &mac.mpo;_check_setowner_vnode > > struct ucred > *cred > @@ -4965,12 +4965,12 @@ > > > > - <function>&mac.mpo;_cred_check_setutimes_vnode</function> > + <function>&mac.mpo;_check_setutimes_vnode</function> > > > > int > - &mac.mpo;_cred_check_setutimes_vnode > + &mac.mpo;_check_setutimes_vnode > > struct ucred > *cred > @@ -5029,12 +5029,12 @@ > > > > - <function>&mac.mpo;_cred_check_sched_proc</function> > + <function>&mac.mpo;_check_sched_proc</function> > > > > int > - &mac.mpo;_cred_check_sched_proc > + &mac.mpo;_check_sched_proc > > struct ucred > *ucred > @@ -5071,12 +5071,12 @@ > > > > - <function>&mac.mpo;_cred_check_signal_proc</function> > + <function>&mac.mpo;_check_signal_proc</function> > > > > int > - &mac.mpo;_cred_check_signal_proc > + &mac.mpo;_check_signal_proc > > struct ucred > *cred > @@ -5119,12 +5119,12 @@ > > > > - <function>&mac.mpo;_cred_check_stat_vnode</function> > + <function>&mac.mpo;_check_stat_vnode</function> > > > > int > - &mac.mpo;_cred_check_stat_vnode > + &mac.mpo;_check_stat_vnode > > struct ucred > *cred > @@ -5169,12 +5169,12 @@ > > > > - <function>&mac.mpo;_cred_check_send_mbuf</function> > + <function>&mac.mpo;_check_send_mbuf</function> > > > > int > - &mac.mpo;_cred_check_send_mbuf > + &mac.mpo;_check_send_mbuf > > struct ucred > *cred > @@ -5233,12 +5233,12 @@ > > > > - <function>&mac.mpo;_cred_check_receive_mbuf</function> > + <function>&mac.mpo;_check_receive_mbuf</function> > > > > int > - &mac.mpo;_cred_check_receive_mbuf > + &mac.mpo;_check_receive_mbuf > > struct ucred > *cred > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 16:20:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC3B337B401; Sat, 27 Jul 2002 16:20:48 -0700 (PDT) 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 79DBC37B400 for ; Sat, 27 Jul 2002 16:20:48 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id BED8943E4A for ; Sat, 27 Jul 2002 16:20:47 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g6RNKdOo025840; Sat, 27 Jul 2002 19:20:39 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Sat, 27 Jul 2002 19:20:38 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Bosko Milekic Cc: Perforce Change Reviews Subject: Re: PERFORCE change 14877 for review In-Reply-To: <20020724224812.A1630@unixdaemons.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, 24 Jul 2002, Bosko Milekic wrote: > On Wed, Jul 24, 2002 at 07:21:38PM -0700, Robert Watson wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14877 > > > > Change 14877 by rwatson@rwatson_curry on 2002/07/24 19:21:02 > > > > Hopefully a bug fix for a bug whereby when one pipe end is > > terminated, the label is prematurely destroyed, resulting in > > a blank label during follow-up policy checks. I believe this > > change modifies the logic so that the pipe label is destroyed > > only when the second end-point is removed. We'll see if this > > corrects the problem I'm bumping into. > > Since you have one mutex and one label for both ends of the > bi-directional pipe, why don't you just use the code already in place > for destroying the mutex 'safely' to also destroy the label? In > other words, pipeclose() has this `hadpeer' variable which it > increments if it finds that the other end exists (and the mutex is > grabbed, then). In other words, just group the label destroy with > the mutex destroy. If one is wrong, they're both wrong and you can > fix them both at the same time. I think that you should only be > destroying the label if it hasn't already been initialized, as well. > It could be that this is a partially created pipe and so the mutex > (and possibly the label?) have not yet been created. I would examine > this further myself but it'll have to wait... :-( Yeah, I think there may be windows where for fdesc-shared processes (and presumably KSE's), the pipe is present but not yet available. An interesting question is whether you can perform pipe operations in the window, and if so, whether we need to initialize the labels earlier, and destroy them later. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 17: 8:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE32E37B401; Sat, 27 Jul 2002 17:08:22 -0700 (PDT) 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 6A5E437B400; Sat, 27 Jul 2002 17:08:22 -0700 (PDT) Received: from angelica.unixdaemons.com (angelica.unixdaemons.com [209.148.64.135]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7A9D43E42; Sat, 27 Jul 2002 17:08:21 -0700 (PDT) (envelope-from bmilekic@angelica.unixdaemons.com) Received: from angelica.unixdaemons.com (bmilekic@localhost.unixdaemons.com [127.0.0.1]) by angelica.unixdaemons.com (8.12.5/8.12.1) with ESMTP id g6RNn41m039262; Sat, 27 Jul 2002 19:49:04 -0400 (EDT) X-Authentication-Warning: angelica.unixdaemons.com: Host bmilekic@localhost.unixdaemons.com [127.0.0.1] claimed to be angelica.unixdaemons.com Received: (from bmilekic@localhost) by angelica.unixdaemons.com (8.12.5/8.12.1/Submit) id g6RNn4mm039253; Sat, 27 Jul 2002 19:49:04 -0400 (EDT) (envelope-from bmilekic) Date: Sat, 27 Jul 2002 19:49:04 -0400 From: Bosko Milekic To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 14877 for review Message-ID: <20020727194904.A38779@unixdaemons.com> References: <20020724224812.A1630@unixdaemons.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: ; from rwatson@freebsd.org on Sat, Jul 27, 2002 at 07:20:38PM -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, Jul 27, 2002 at 07:20:38PM -0400, Robert Watson wrote: > > On Wed, 24 Jul 2002, Bosko Milekic wrote: > > > On Wed, Jul 24, 2002 at 07:21:38PM -0700, Robert Watson wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14877 > > > > > > Change 14877 by rwatson@rwatson_curry on 2002/07/24 19:21:02 > > > > > > Hopefully a bug fix for a bug whereby when one pipe end is > > > terminated, the label is prematurely destroyed, resulting in > > > a blank label during follow-up policy checks. I believe this > > > change modifies the logic so that the pipe label is destroyed > > > only when the second end-point is removed. We'll see if this > > > corrects the problem I'm bumping into. > > > > Since you have one mutex and one label for both ends of the > > bi-directional pipe, why don't you just use the code already in place > > for destroying the mutex 'safely' to also destroy the label? In > > other words, pipeclose() has this `hadpeer' variable which it > > increments if it finds that the other end exists (and the mutex is > > grabbed, then). In other words, just group the label destroy with > > the mutex destroy. If one is wrong, they're both wrong and you can > > fix them both at the same time. I think that you should only be > > destroying the label if it hasn't already been initialized, as well. > > It could be that this is a partially created pipe and so the mutex > > (and possibly the label?) have not yet been created. I would examine > > this further myself but it'll have to wait... :-( > > Yeah, I think there may be windows where for fdesc-shared processes (and > presumably KSE's), the pipe is present but not yet available. An > interesting question is whether you can perform pipe operations in the > window, and if so, whether we need to initialize the labels earlier, and > destroy them later. I'm actually looking at this today and should be able to come up with either confirmation that it's correct or a fix. What I initially thought was a problem may in fact not be, but when I come up with something, if anything, I'll send you the diff. > Robert N M Watson FreeBSD Core Team, TrustedBSD Projects > robert@fledge.watson.org Network Associates Laboratories -- Bosko Milekic bmilekic@unixdaemons.com bmilekic@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 19:38:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16D1637B401; Sat, 27 Jul 2002 19:38:10 -0700 (PDT) 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 B160437B400 for ; Sat, 27 Jul 2002 19:38:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41AB843E65 for ; Sat, 27 Jul 2002 19:38:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6S2c9JU002473 for ; Sat, 27 Jul 2002 19:38:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6S2c8lj002470 for perforce@freebsd.org; Sat, 27 Jul 2002 19:38:08 -0700 (PDT) Date: Sat, 27 Jul 2002 19:38:08 -0700 (PDT) Message-Id: <200207280238.g6S2c8lj002470@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15027 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15027 Change 15027 by rwatson@rwatson_paprika on 2002/07/27 19:37:38 Rename mac_bpfdesc_check_receive_from_ifnet() to mac_check_bpfdesc_receive() in the name of entry point name simplification. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#196 edit .. //depot/projects/trustedbsd/mac/sys/net/bpf.c#14 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#73 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#10 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#62 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#48 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#53 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#18 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#124 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#89 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#196 (text+ko) ==== @@ -650,12 +650,12 @@ mpc->mpc_ops->mpo_relabel_subject = mpe->mpe_function; break; - case MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET: - mpc->mpc_ops->mpo_bpfdesc_check_receive_from_ifnet = + case MAC_CHECK_BIND_SOCKET: + mpc->mpc_ops->mpo_check_bind_socket = mpe->mpe_function; break; - case MAC_CHECK_BIND_SOCKET: - mpc->mpc_ops->mpo_check_bind_socket = + case MAC_CHECK_BPFDESC_RECEIVE: + mpc->mpc_ops->mpo_check_bpfdesc_receive = mpe->mpe_function; break; case MAC_CHECK_CONNECT_SOCKET: @@ -2504,30 +2504,30 @@ } int -mac_bpfdesc_check_receive_from_ifnet(struct bpf_d *bpf_d, struct ifnet *ifnet) +mac_check_bind_socket(struct ucred *ucred, struct socket *socket, + struct sockaddr *sockaddr) { int error; - if (!mac_enforce_network) + if (!mac_enforce_socket) return (0); - MAC_CHECK(bpfdesc_check_receive_from_ifnet, bpf_d, &bpf_d->bd_label, - ifnet, &ifnet->if_label); + MAC_CHECK(check_bind_socket, ucred, socket, &socket->so_label, + sockaddr); return (error); } int -mac_check_bind_socket(struct ucred *ucred, struct socket *socket, - struct sockaddr *sockaddr) +mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet) { int error; - if (!mac_enforce_socket) + if (!mac_enforce_network) return (0); - MAC_CHECK(check_bind_socket, ucred, socket, &socket->so_label, - sockaddr); + MAC_CHECK(check_bpfdesc_receive, bpf_d, &bpf_d->bd_label, ifnet, + &ifnet->if_label); return (error); } ==== //depot/projects/trustedbsd/mac/sys/net/bpf.c#14 (text+ko) ==== @@ -1076,7 +1076,7 @@ slen = bpf_filter(d->bd_filter, pkt, pktlen, pktlen); if (slen != 0){ #ifdef MAC - if (mac_bpfdesc_check_receive_from_ifnet(d, ifp) == 0) + if (mac_check_bpfdesc_receive(d, ifp) == 0) #endif catchpacket(d, pkt, pktlen, slen, bcopy); ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#73 (text+ko) ==== @@ -1164,8 +1164,8 @@ * Access control checks. */ static int -mac_biba_bpfdesc_check_receive_from_ifnet(struct bpf_d *bpf_d, - struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel) +mac_biba_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, + struct ifnet *ifnet, struct label *ifnetlabel) { struct mac_biba *a, *b; @@ -2140,8 +2140,8 @@ (macop_t)mac_biba_create_proc1 }, { MAC_RELABEL_SUBJECT, (macop_t)mac_biba_relabel_subject }, - { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, - (macop_t)mac_biba_bpfdesc_check_receive_from_ifnet }, + { MAC_CHECK_BPFDESC_RECEIVE, + (macop_t)mac_biba_check_bpfdesc_receive }, { MAC_CHECK_SEE_CRED, (macop_t)mac_biba_check_see_cred }, { MAC_CHECK_SEE_SOCKET, ==== //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#10 (text+ko) ==== @@ -138,8 +138,8 @@ } static int -mac_ifoff_bpfdesc_check_receive_from_ifnet(struct bpf_d *bpf_d, - struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel) +mac_ifoff_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, + struct ifnet *ifnet, struct label *ifnetlabel) { return (check_ifnet_incoming(ifnet, 1)); @@ -160,8 +160,8 @@ static struct mac_policy_op_entry mac_ifoff_ops[] = { - { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, - (macop_t)mac_ifoff_bpfdesc_check_receive_from_ifnet }, + { MAC_CHECK_BPFDESC_RECEIVE, + (macop_t)mac_ifoff_check_bpfdesc_receive }, { MAC_IFNET_CHECK_SEND_MBUF, (macop_t)mac_ifoff_ifnet_check_send_mbuf }, { MAC_SOCKET_CHECK_RECEIVE_MBUF, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#62 (text+ko) ==== @@ -1110,8 +1110,8 @@ * Access control checks. */ static int -mac_mls_bpfdesc_check_receive_from_ifnet(struct bpf_d *bpf_d, - struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel) +mac_mls_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, + struct ifnet *ifnet, struct label *ifnetlabel) { struct mac_mls *a, *b; @@ -2086,8 +2086,8 @@ (macop_t)mac_mls_create_proc1 }, { MAC_RELABEL_SUBJECT, (macop_t)mac_mls_relabel_subject }, - { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, - (macop_t)mac_mls_bpfdesc_check_receive_from_ifnet }, + { MAC_CHECK_BPFDESC_RECEIVE, + (macop_t)mac_mls_check_bpfdesc_receive }, { MAC_CHECK_SEE_CRED, (macop_t)mac_mls_check_see_cred }, { MAC_CHECK_SEE_SOCKET, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#48 (text+ko) ==== @@ -549,19 +549,19 @@ * Access control checks. */ static int -mac_none_bpfdesc_check_receive_from_ifnet(struct bpf_d *bpf_d, - struct label *bpflabel, struct ifnet *ifnet, struct label *ifnet_label) +mac_none_check_bind_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) { return (0); } static int -mac_none_check_bind_socket(struct ucred *cred, struct socket *socket, - struct label *socketlabel, struct sockaddr *sockaddr) +mac_none_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, + struct ifnet *ifnet, struct label *ifnet_label) { - return (0); + return (0); } static int @@ -1016,10 +1016,10 @@ (macop_t)mac_none_create_proc1 }, { MAC_RELABEL_SUBJECT, (macop_t)mac_none_relabel_subject }, - { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, - (macop_t)mac_none_bpfdesc_check_receive_from_ifnet }, { MAC_CHECK_BIND_SOCKET, (macop_t)mac_none_check_bind_socket }, + { MAC_CHECK_BPFDESC_RECEIVE, + (macop_t)mac_none_check_bpfdesc_receive }, { MAC_CHECK_CONNECT_SOCKET, (macop_t)mac_none_check_connect_socket }, { MAC_CHECK_SEE_CRED, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#53 (text+ko) ==== @@ -674,27 +674,27 @@ } static int -mac_te_bpfdesc_check_receive_from_ifnet(struct bpf_d *bpf_d, - struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel) +mac_te_check_bind_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) { if (!mac_te_enabled) return (0); - return (mac_te_check(SLOT(bpflabel), SLOT(ifnetlabel), - MAC_TE_CLASS_BPF, MAC_TE_OPERATION_BPF_RECEIVE)); + return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), + MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_BIND)); } static int -mac_te_check_bind_socket(struct ucred *cred, struct socket *socket, - struct label *socketlabel, struct sockaddr *sockaddr) +mac_te_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, + struct ifnet *ifnet, struct label *ifnetlabel) { if (!mac_te_enabled) return (0); - return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), - MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_BIND)); + return (mac_te_check(SLOT(bpflabel), SLOT(ifnetlabel), + MAC_TE_CLASS_BPF, MAC_TE_OPERATION_BPF_RECEIVE)); } static int @@ -1747,11 +1747,10 @@ { MAC_CREATE_PROC1, (macop_t)mac_te_create_proc1 }, { MAC_RELABEL_SUBJECT, (macop_t)mac_te_relabel_subject }, { MAC_RELABEL_VNODE, (macop_t)mac_te_relabel_vnode }, - { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, - (macop_t)mac_te_bpfdesc_check_receive_from_ifnet }, { MAC_CHECK_SEE_CRED, (macop_t)mac_te_check_see_cred }, { MAC_CHECK_SEE_SOCKET, (macop_t)mac_te_check_see_socket }, { MAC_CHECK_BIND_SOCKET, (macop_t)mac_te_check_bind_socket }, + { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_te_check_bpfdesc_receive }, { MAC_CHECK_CONNECT_SOCKET, (macop_t)mac_te_check_connect_socket }, { MAC_CHECK_LISTEN_SOCKET, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#18 (text+ko) ==== @@ -757,16 +757,16 @@ * Access control checks. */ static int -mac_test_bpfdesc_check_receive_from_ifnet(struct bpf_d *bpf_d, - struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel) +mac_test_check_bind_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) { return (0); } static int -mac_test_check_bind_socket(struct ucred *cred, struct socket *socket, - struct label *socketlabel, struct sockaddr *sockaddr) +mac_test_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, + struct ifnet *ifnet, struct label *ifnetlabel) { return (0); @@ -1222,10 +1222,10 @@ (macop_t)mac_test_create_proc1 }, { MAC_RELABEL_SUBJECT, (macop_t)mac_test_relabel_subject }, - { MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, - (macop_t)mac_test_bpfdesc_check_receive_from_ifnet }, { MAC_CHECK_BIND_SOCKET, (macop_t)mac_test_check_bind_socket }, + { MAC_CHECK_BPFDESC_RECEIVE, + (macop_t)mac_test_check_bpfdesc_receive }, { MAC_CHECK_CONNECT_SOCKET, (macop_t)mac_test_check_connect_socket }, { MAC_CHECK_SEE_CRED, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#124 (text+ko) ==== @@ -257,12 +257,11 @@ int mac_execve_will_transition(struct ucred *old, struct vnode *vp); /* Authorizational event hooks. */ -int mac_bpfdesc_check_receive_from_ifnet(struct bpf_d *bpf_d, - struct ifnet *ifnet); int mac_check_access_vnode(struct ucred *cred, struct vnode *vp, int flags); int mac_check_bind_socket(struct ucred *cred, struct socket *so, struct sockaddr *sa); +int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); int mac_check_chdir_vnode(struct ucred *cred, struct vnode *dvp); int mac_check_chroot_vnode(struct ucred *cred, struct vnode *dvp); int mac_check_connect_socket(struct ucred *cred, struct socket *so, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#89 (text+ko) ==== @@ -228,12 +228,12 @@ /* * Access control checks. */ - int (*mpo_bpfdesc_check_receive_from_ifnet)(struct bpf_d *bpf_d, - struct label *bpflabel, struct ifnet *ifnet, - struct label *ifnetlabel); int (*mpo_check_bind_socket)(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr); + int (*mpo_check_bpfdesc_receive)(struct bpf_d *bpf_d, + struct label *bpflabel, struct ifnet *ifnet, + struct label *ifnetlabel); int (*mpo_check_connect_socket)(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr); @@ -411,8 +411,8 @@ MAC_CREATE_PROC0, MAC_CREATE_PROC1, MAC_RELABEL_SUBJECT, - MAC_BPFDESC_CHECK_RECEIVE_FROM_IFNET, MAC_CHECK_BIND_SOCKET, + MAC_CHECK_BPFDESC_RECEIVE, MAC_CHECK_SEE_CRED, MAC_CHECK_SEE_SOCKET, MAC_CHECK_RELABEL_IFNET, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 19:47:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B9A737B401; Sat, 27 Jul 2002 19:47:22 -0700 (PDT) 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 F2A4937B400 for ; Sat, 27 Jul 2002 19:47:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9363A43E31 for ; Sat, 27 Jul 2002 19:47:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6S2lLJU003329 for ; Sat, 27 Jul 2002 19:47:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6S2lLVS003326 for perforce@freebsd.org; Sat, 27 Jul 2002 19:47:21 -0700 (PDT) Date: Sat, 27 Jul 2002 19:47:21 -0700 (PDT) Message-Id: <200207280247.g6S2lLVS003326@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15029 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15029 Change 15029 by rwatson@rwatson_paprika on 2002/07/27 19:46:50 mac_bsdextended doesn't implement inter-process/credential checks, so don't include stubs for those entry points. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#46 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#46 (text+ko) ==== @@ -690,70 +690,12 @@ return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VSTAT)); } -static int -mac_bsdextended_check_see_cred(struct ucred *u1, struct ucred *u2) -{ - - if (!mac_bsdextended_enabled) - return (0); - - return (0); -} - -static int -mac_bsdextended_check_see_socket(struct ucred *cred, struct socket *socket) -{ - - if (!mac_bsdextended_enabled) - return (0); - - return (0); -} - -static int -mac_bsdextended_cred_cantouch(struct ucred *cred, struct proc *proc) -{ - - if (!mac_bsdextended_enabled) - return (0); - - return (0); -} - -static int -mac_bsdextended_check_signal_proc(struct ucred *cred, struct proc *proc, - int signum) -{ - - return (mac_bsdextended_cred_cantouch(cred, proc)); -} - -static int -mac_bsdextended_check_sched_proc(struct ucred *cred, struct proc *proc) -{ - - return (mac_bsdextended_cred_cantouch(cred, proc)); -} - -static int -mac_bsdextended_check_debug_proc(struct ucred *cred, struct proc *proc) -{ - - return (mac_bsdextended_cred_cantouch(cred, proc)); -} - static struct mac_policy_op_entry mac_bsdextended_ops[] = { { MAC_DESTROY, (macop_t)mac_bsdextended_destroy }, { MAC_INIT, (macop_t)mac_bsdextended_init }, - { MAC_CHECK_SEE_CRED, - (macop_t)mac_bsdextended_check_see_cred }, - { MAC_CHECK_SEE_SOCKET, - (macop_t)mac_bsdextended_check_see_socket }, - { MAC_CHECK_DEBUG_PROC, - (macop_t)mac_bsdextended_check_debug_proc }, { MAC_CHECK_ACCESS_VNODE, (macop_t)mac_bsdextended_check_access_vnode }, { MAC_CHECK_CHDIR_VNODE, @@ -798,10 +740,6 @@ (macop_t)mac_bsdextended_check_setowner_vnode }, { MAC_CHECK_SETUTIMES_VNODE, (macop_t)mac_bsdextended_check_setutimes_vnode }, - { MAC_CHECK_SCHED_PROC, - (macop_t)mac_bsdextended_check_sched_proc }, - { MAC_CHECK_SIGNAL_PROC, - (macop_t)mac_bsdextended_check_signal_proc }, { MAC_CHECK_STAT_VNODE, (macop_t)mac_bsdextended_check_stat_vnode }, { MAC_OP_LAST, NULL } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 19:56:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC33637B401; Sat, 27 Jul 2002 19:56:33 -0700 (PDT) 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 8322937B400 for ; Sat, 27 Jul 2002 19:56:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 454F343E3B for ; Sat, 27 Jul 2002 19:56:33 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6S2uXJU003974 for ; Sat, 27 Jul 2002 19:56:33 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6S2uXKs003971 for perforce@freebsd.org; Sat, 27 Jul 2002 19:56:33 -0700 (PDT) Date: Sat, 27 Jul 2002 19:56:33 -0700 (PDT) Message-Id: <200207280256.g6S2uXKs003971@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 15030 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15030 Change 15030 by chris@chris_holly on 2002/07/27 19:56:17 Match change #15027: more renaming... Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#10 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#10 (text+ko) ==== @@ -3140,12 +3140,12 @@ supplementary to existing Unix permissions. - <function>&mac.mpo;_bpfdesc_check_receive_from_ifnet</function> + <function>&mac.mpo;_check_bpfdesc_receive</function> int - &mac.mpo;_bpfdesc_check_receive_from_ifnet + &mac.mpo;_check_bpfdesc_receive struct bpf_d *bpf_d To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 20: 1:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B512937B401; Sat, 27 Jul 2002 20:01:40 -0700 (PDT) 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 58D0837B400 for ; Sat, 27 Jul 2002 20:01:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 015C543E65 for ; Sat, 27 Jul 2002 20:01:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6S31dJU004478 for ; Sat, 27 Jul 2002 20:01:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6S31doi004473 for perforce@freebsd.org; Sat, 27 Jul 2002 20:01:39 -0700 (PDT) Date: Sat, 27 Jul 2002 20:01:39 -0700 (PDT) Message-Id: <200207280301.g6S31doi004473@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15031 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15031 Change 15031 by rwatson@rwatson_paprika on 2002/07/27 20:01:22 Comment where the open check should be. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#29 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#29 (text+ko) ==== @@ -227,6 +227,11 @@ goto bad; } } +#ifdef MAC + /* + * XXXMAC: Open check should proabbly be here. + */ +#endif if ((error = VOP_OPEN(vp, fmode, cred, td)) != 0) goto bad; /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 20: 6:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A27837B401; Sat, 27 Jul 2002 20:06:47 -0700 (PDT) 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 E4AA037B400 for ; Sat, 27 Jul 2002 20:06:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C3CB43E42 for ; Sat, 27 Jul 2002 20:06:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6S36kJU008837 for ; Sat, 27 Jul 2002 20:06:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6S36kPn008834 for perforce@freebsd.org; Sat, 27 Jul 2002 20:06:46 -0700 (PDT) Date: Sat, 27 Jul 2002 20:06:46 -0700 (PDT) Message-Id: <200207280306.g6S36kPn008834@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15032 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15032 Change 15032 by rwatson@rwatson_paprika on 2002/07/27 20:06:01 Speel proabbly correctlie. Submitted by: chris@FreeBSD.org Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#30 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#30 (text+ko) ==== @@ -229,7 +229,7 @@ } #ifdef MAC /* - * XXXMAC: Open check should proabbly be here. + * XXXMAC: Open check should probably be here. */ #endif if ((error = VOP_OPEN(vp, fmode, cred, td)) != 0) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 20:14:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DADEA37B401; Sat, 27 Jul 2002 20:14:45 -0700 (PDT) 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 78AAF37B400 for ; Sat, 27 Jul 2002 20:14:45 -0700 (PDT) Received: from mail.speakeasy.net (mail15.speakeasy.net [216.254.0.215]) by mx1.FreeBSD.org (Postfix) with ESMTP id 164A643E42 for ; Sat, 27 Jul 2002 20:14:45 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 10023 invoked from network); 28 Jul 2002 03:14:43 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail15.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 28 Jul 2002 03:14:43 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g6S3EguR046422; Sat, 27 Jul 2002 23:14:43 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200207280306.g6S36kPn008834@freefall.freebsd.org> Date: Sat, 27 Jul 2002 23:14:50 -0400 (EDT) From: John Baldwin To: Robert Watson Subject: RE: PERFORCE change 15032 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 28-Jul-2002 Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15032 > > Change 15032 by rwatson@rwatson_paprika on 2002/07/27 20:06:01 > > Speel proabbly correctlie. correctlee. It ends with a long 'e' not a long 'i'. :) Unless'n you's a barrowin' yer talk fum sum good ol' boy fum the deeeep south. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 20:53:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9F8237B420; Sat, 27 Jul 2002 20:52:53 -0700 (PDT) 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 793A237B428 for ; Sat, 27 Jul 2002 20:52:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F142543E3B for ; Sat, 27 Jul 2002 20:52:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6S3qlJU012953 for ; Sat, 27 Jul 2002 20:52:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6S3qljh012950 for perforce@freebsd.org; Sat, 27 Jul 2002 20:52:47 -0700 (PDT) Date: Sat, 27 Jul 2002 20:52:47 -0700 (PDT) Message-Id: <200207280352.g6S3qljh012950@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15035 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15035 Change 15035 by rwatson@rwatson_paprika on 2002/07/27 20:52:28 Rename mpo_check_see_socket() and mpo_check_see_cred() to mpo_check_socket_visible() and mpo_check_cred_visible() respectively. Move entry point naming towards a model using mac_check_(objectname)_(methodname)() from mac_cred_check_(methodname)_(objectname)(). This is the bit where we generate conflicts. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#197 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#23 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#74 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#63 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#49 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#7 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#12 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#54 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#19 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#125 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#90 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#197 (text+ko) ==== @@ -658,18 +658,18 @@ mpc->mpc_ops->mpo_check_bpfdesc_receive = mpe->mpe_function; break; + case MAC_CHECK_CRED_VISIBLE: + mpc->mpc_ops->mpo_check_cred_visible = + mpe->mpe_function; + break; case MAC_CHECK_CONNECT_SOCKET: mpc->mpc_ops->mpo_check_connect_socket = mpe->mpe_function; break; - case MAC_CHECK_SEE_CRED: - mpc->mpc_ops->mpo_check_see_cred = + case MAC_CHECK_SOCKET_VISIBLE: + mpc->mpc_ops->mpo_check_socket_visible = mpe->mpe_function; break; - case MAC_CHECK_SEE_SOCKET: - mpc->mpc_ops->mpo_check_see_socket = - mpe->mpe_function; - break; case MAC_CHECK_RELABEL_IFNET: mpc->mpc_ops->mpo_check_relabel_ifnet = mpe->mpe_function; @@ -1041,32 +1041,6 @@ } int -mac_cred_cansee(struct ucred *u1, struct ucred *u2) -{ - int error; - - if (!mac_enforce_process) - return (0); - - MAC_CHECK(check_see_cred, u1, u2); - - return (error); -} - -int -mac_cred_canseesocket(struct ucred *cred, struct socket *socket) -{ - int error; - - if (!mac_enforce_socket) - return (0); - - MAC_CHECK(check_see_socket, cred, socket, &socket->so_label); - - return (error); -} - -int mac_cred_cansignal(struct ucred *cred, struct proc *proc, int signum) { int error; @@ -2533,6 +2507,19 @@ } int +mac_check_cred_visible(struct ucred *u1, struct ucred *u2) +{ + int error; + + if (!mac_enforce_process) + return (0); + + MAC_CHECK(check_cred_visible, u1, u2); + + return (error); +} + +int mac_check_connect_socket(struct ucred *cred, struct socket *socket, struct sockaddr *sockaddr) { @@ -2562,6 +2549,19 @@ } int +mac_check_socket_visible(struct ucred *cred, struct socket *socket) +{ + int error; + + if (!mac_enforce_socket) + return (0); + + MAC_CHECK(check_socket_visible, cred, socket, &socket->so_label); + + return (error); +} + +int mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr, struct ifnet *ifnet) { ==== //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#23 (text+ko) ==== @@ -1380,7 +1380,7 @@ if ((error = prison_check(u1, u2))) return (error); #ifdef MAC - if ((error = mac_cred_cansee(u1, u2))) + if ((error = mac_check_cred_visible(u1, u2))) return (error); #endif if ((error = cr_seeotheruids(u1, u2))) @@ -1674,7 +1674,7 @@ if (cr_seeotheruids(cred, so->so_cred)) return (ENOENT); #ifdef MAC - error = mac_cred_canseesocket(cred, so); + error = mac_check_socket_visible(cred, so); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#74 (text+ko) ==== @@ -1181,7 +1181,7 @@ } static int -mac_biba_check_see_cred(struct ucred *u1, struct ucred *u2) +mac_biba_check_cred_visible(struct ucred *u1, struct ucred *u2) { struct mac_biba *subj, *obj; @@ -1199,7 +1199,7 @@ } static int -mac_biba_check_see_socket(struct ucred *cred, struct socket *socket, +mac_biba_check_socket_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { struct mac_biba *subj, *obj; @@ -2142,10 +2142,10 @@ (macop_t)mac_biba_relabel_subject }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_biba_check_bpfdesc_receive }, - { MAC_CHECK_SEE_CRED, - (macop_t)mac_biba_check_see_cred }, - { MAC_CHECK_SEE_SOCKET, - (macop_t)mac_biba_check_see_socket }, + { MAC_CHECK_CRED_VISIBLE, + (macop_t)mac_biba_check_cred_visible }, + { MAC_CHECK_SOCKET_VISIBLE, + (macop_t)mac_biba_check_socket_visible }, { MAC_CHECK_RELABEL_IFNET, (macop_t)mac_biba_check_relabel_ifnet }, { MAC_CHECK_RELABEL_PIPE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#63 (text+ko) ==== @@ -1127,7 +1127,7 @@ } static int -mac_mls_check_see_cred(struct ucred *u1, struct ucred *u2) +mac_mls_check_cred_visible(struct ucred *u1, struct ucred *u2) { struct mac_mls *subj, *obj; @@ -1145,7 +1145,7 @@ } static int -mac_mls_check_see_socket(struct ucred *cred, struct socket *socket, +mac_mls_check_socket_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { struct mac_mls *subj, *obj; @@ -2088,10 +2088,10 @@ (macop_t)mac_mls_relabel_subject }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_mls_check_bpfdesc_receive }, - { MAC_CHECK_SEE_CRED, - (macop_t)mac_mls_check_see_cred }, - { MAC_CHECK_SEE_SOCKET, - (macop_t)mac_mls_check_see_socket }, + { MAC_CHECK_CRED_VISIBLE, + (macop_t)mac_mls_check_cred_visible }, + { MAC_CHECK_SOCKET_VISIBLE, + (macop_t)mac_mls_check_socket_visible }, { MAC_CHECK_RELABEL_IFNET, (macop_t)mac_mls_check_relabel_ifnet }, { MAC_CHECK_RELABEL_PIPE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#49 (text+ko) ==== @@ -565,22 +565,22 @@ } static int -mac_none_check_connect_socket(struct ucred *cred, struct socket *socket, - struct label *socketlabel, struct sockaddr *sockaddr) +mac_none_check_cred_visible(struct ucred *u1, struct ucred *u2) { return (0); } static int -mac_none_check_see_cred(struct ucred *u1, struct ucred *u2) +mac_none_check_connect_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) { return (0); } static int -mac_none_check_see_socket(struct ucred *cred, struct socket *socket, +mac_none_check_socket_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { @@ -1020,12 +1020,12 @@ (macop_t)mac_none_check_bind_socket }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_none_check_bpfdesc_receive }, + { MAC_CHECK_CRED_VISIBLE, + (macop_t)mac_none_check_cred_visible }, { MAC_CHECK_CONNECT_SOCKET, (macop_t)mac_none_check_connect_socket }, - { MAC_CHECK_SEE_CRED, - (macop_t)mac_none_check_see_cred }, - { MAC_CHECK_SEE_SOCKET, - (macop_t)mac_none_check_see_socket }, + { MAC_CHECK_SOCKET_VISIBLE, + (macop_t)mac_none_check_socket_visible }, { MAC_CHECK_RELABEL_IFNET, (macop_t)mac_none_check_relabel_ifnet }, { MAC_CHECK_RELABEL_PIPE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#7 (text+ko) ==== @@ -188,7 +188,7 @@ } static int -mac_partition_check_see_cred(struct ucred *u1, struct ucred *u2) +mac_partition_check_cred_visible(struct ucred *u1, struct ucred *u2) { int error; @@ -198,7 +198,7 @@ } static int -mac_partition_check_see_socket(struct ucred *cred, struct socket *socket, +mac_partition_check_socket_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { int error; @@ -277,10 +277,10 @@ (macop_t)mac_partition_create_proc1 }, { MAC_RELABEL_SUBJECT, (macop_t)mac_partition_relabel_subject }, - { MAC_CHECK_SEE_CRED, - (macop_t)mac_partition_check_see_cred }, - { MAC_CHECK_SEE_SOCKET, - (macop_t)mac_partition_check_see_socket }, + { MAC_CHECK_CRED_VISIBLE, + (macop_t)mac_partition_check_cred_visible }, + { MAC_CHECK_SOCKET_VISIBLE, + (macop_t)mac_partition_check_socket_visible }, { MAC_CHECK_RELABEL_SUBJECT, (macop_t)mac_partition_check_relabel_subject }, { MAC_CHECK_DEBUG_PROC, ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#12 (text+ko) ==== @@ -124,14 +124,14 @@ } static int -mac_seeotheruids_check_see_cred(struct ucred *u1, struct ucred *u2) +mac_seeotheruids_check_cred_visible(struct ucred *u1, struct ucred *u2) { return (mac_seeotheruids_check(u1, u2)); } static int -mac_seeotheruids_check_see_socket(struct ucred *cred, struct socket *socket, +mac_seeotheruids_check_socket_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { @@ -162,10 +162,10 @@ static struct mac_policy_op_entry mac_seeotheruids_ops[] = { - { MAC_CHECK_SEE_CRED, - (macop_t)mac_seeotheruids_check_see_cred }, - { MAC_CHECK_SEE_SOCKET, - (macop_t)mac_seeotheruids_check_see_socket }, + { MAC_CHECK_CRED_VISIBLE, + (macop_t)mac_seeotheruids_check_cred_visible }, + { MAC_CHECK_SOCKET_VISIBLE, + (macop_t)mac_seeotheruids_check_socket_visible }, { MAC_CHECK_DEBUG_PROC, (macop_t)mac_seeotheruids_check_debug_proc }, { MAC_CHECK_SCHED_PROC, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#54 (text+ko) ==== @@ -698,6 +698,14 @@ } static int +mac_te_check_cred_visible(struct ucred *u1, struct ucred *u2) +{ + + return (mac_te_check(SLOT(&u1->cr_label), SLOT(&u2->cr_label), + MAC_TE_CLASS_PROC, MAC_TE_OPERATION_PROC_SEE)); +} + +static int mac_te_check_connect_socket(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -735,6 +743,15 @@ MAC_TE_CLASS_MBUF, MAC_TE_OPERATION_MBUF_RECEIVE)); } +static int +mac_te_check_socket_visible(struct ucred *cred, struct socket *socket, + struct label *socketlabel) +{ + + return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), + MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_SEE)); +} + static void mac_te_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel) { @@ -1132,23 +1149,6 @@ } static int -mac_te_check_see_cred(struct ucred *u1, struct ucred *u2) -{ - - return (mac_te_check(SLOT(&u1->cr_label), SLOT(&u2->cr_label), - MAC_TE_CLASS_PROC, MAC_TE_OPERATION_PROC_SEE)); -} - -static int -mac_te_check_see_socket(struct ucred *cred, struct socket *socket, - struct label *socketlabel) -{ - - return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), - MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_SEE)); -} - -static int mac_te_check_signal_proc(struct ucred *cred, struct proc *proc, int signum) { @@ -1747,14 +1747,16 @@ { MAC_CREATE_PROC1, (macop_t)mac_te_create_proc1 }, { MAC_RELABEL_SUBJECT, (macop_t)mac_te_relabel_subject }, { MAC_RELABEL_VNODE, (macop_t)mac_te_relabel_vnode }, - { MAC_CHECK_SEE_CRED, (macop_t)mac_te_check_see_cred }, - { MAC_CHECK_SEE_SOCKET, (macop_t)mac_te_check_see_socket }, { MAC_CHECK_BIND_SOCKET, (macop_t)mac_te_check_bind_socket }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_te_check_bpfdesc_receive }, + { MAC_CHECK_CRED_VISIBLE, + (macop_t)mac_te_check_cred_visible }, { MAC_CHECK_CONNECT_SOCKET, (macop_t)mac_te_check_connect_socket }, { MAC_CHECK_LISTEN_SOCKET, (macop_t)mac_te_check_listen_socket }, + { MAC_CHECK_SOCKET_VISIBLE, + (macop_t)mac_te_check_socket_visible }, { MAC_CHECK_RELABEL_IFNET, (macop_t)mac_te_check_relabel_ifnet }, { MAC_CHECK_RELABEL_PIPE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#19 (text+ko) ==== @@ -773,22 +773,22 @@ } static int -mac_test_check_connect_socket(struct ucred *cred, struct socket *socket, - struct label *socketlabel, struct sockaddr *sockaddr) +mac_test_check_cred_visible(struct ucred *u1, struct ucred *u2) { return (0); } static int -mac_test_check_see_cred(struct ucred *u1, struct ucred *u2) +mac_test_check_connect_socket(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) { return (0); } static int -mac_test_check_see_socket(struct ucred *cred, struct socket *socket, +mac_test_check_socket_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { @@ -1226,12 +1226,12 @@ (macop_t)mac_test_check_bind_socket }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_test_check_bpfdesc_receive }, + { MAC_CHECK_CRED_VISIBLE, + (macop_t)mac_test_check_cred_visible }, { MAC_CHECK_CONNECT_SOCKET, (macop_t)mac_test_check_connect_socket }, - { MAC_CHECK_SEE_CRED, - (macop_t)mac_test_check_see_cred }, - { MAC_CHECK_SEE_SOCKET, - (macop_t)mac_test_check_see_socket }, + { MAC_CHECK_SOCKET_VISIBLE, + (macop_t)mac_test_check_socket_visible }, { MAC_CHECK_RELABEL_IFNET, (macop_t)mac_test_check_relabel_ifnet }, { MAC_CHECK_RELABEL_PIPE, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#125 (text+ko) ==== @@ -373,11 +373,11 @@ int mac_socket_can_receive(struct socket *so, struct mbuf *m); /* Hooks for the proc-based "can"-checks. */ +int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); +int mac_check_socket_visible(struct ucred *cred, struct socket *so); int mac_cred_candebug(struct ucred *cred, struct proc *proc); int mac_cred_canexec(struct ucred *cred, struct vnode *vp); int mac_cred_cansched(struct ucred *cred, struct proc *proc); -int mac_cred_cansee(struct ucred *u1, struct ucred *u2); -int mac_cred_canseesocket(struct ucred *cred, struct socket *socket); int mac_cred_cansignal(struct ucred *cred, struct proc *proc, int signum); /* Calls to help various file systems implement labeling using EAs. */ ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#90 (text+ko) ==== @@ -234,11 +234,11 @@ int (*mpo_check_bpfdesc_receive)(struct bpf_d *bpf_d, struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel); + int (*mpo_check_cred_visible)(struct ucred *u1, struct ucred *u2); int (*mpo_check_connect_socket)(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr); - int (*mpo_check_see_cred)(struct ucred *u1, struct ucred *u2); - int (*mpo_check_see_socket)(struct ucred *cred, + int (*mpo_check_socket_visible)(struct ucred *cred, struct socket *socket, struct label *socketlabel); int (*mpo_check_relabel_ifnet)(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, @@ -413,8 +413,8 @@ MAC_RELABEL_SUBJECT, MAC_CHECK_BIND_SOCKET, MAC_CHECK_BPFDESC_RECEIVE, - MAC_CHECK_SEE_CRED, - MAC_CHECK_SEE_SOCKET, + MAC_CHECK_CRED_VISIBLE, + MAC_CHECK_SOCKET_VISIBLE, MAC_CHECK_RELABEL_IFNET, MAC_CHECK_RELABEL_PIPE, MAC_CHECK_RELABEL_SOCKET, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Jul 27 21:47:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25EC937B401; Sat, 27 Jul 2002 21:46:57 -0700 (PDT) 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 A360637B400 for ; Sat, 27 Jul 2002 21:46:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EED4743E31 for ; Sat, 27 Jul 2002 21:46:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6S4ktJU021045 for ; Sat, 27 Jul 2002 21:46:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6S4ktvS021042 for perforce@freebsd.org; Sat, 27 Jul 2002 21:46:55 -0700 (PDT) Date: Sat, 27 Jul 2002 21:46:55 -0700 (PDT) Message-Id: <200207280446.g6S4ktvS021042@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15040 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15040 Change 15040 by rwatson@rwatson_paprika on 2002/07/27 21:46:36 More name consistency for entry points: s/mac_ifnet_check_send_mbuf/mac_check_ifnet_transmit/ s/mac_socket_check_receive_mbuf/mac_check_socket_receive/ Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#198 edit .. //depot/projects/trustedbsd/mac/sys/net/if_atmsubr.c#6 edit .. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#15 edit .. //depot/projects/trustedbsd/mac/sys/net/if_fddisubr.c#8 edit .. //depot/projects/trustedbsd/mac/sys/net/if_gif.c#13 edit .. //depot/projects/trustedbsd/mac/sys/net/if_iso88025subr.c#8 edit .. //depot/projects/trustedbsd/mac/sys/net/if_spppsubr.c#11 edit .. //depot/projects/trustedbsd/mac/sys/net/if_stf.c#16 edit .. //depot/projects/trustedbsd/mac/sys/net/if_tun.c#10 edit .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_input.c#6 edit .. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#13 edit .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#17 edit .. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#13 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#75 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#11 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#64 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#50 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#55 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#20 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#126 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#91 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#198 (text+ko) ==== @@ -666,6 +666,14 @@ mpc->mpc_ops->mpo_check_connect_socket = mpe->mpe_function; break; + case MAC_CHECK_IFNET_TRANSMIT: + mpc->mpc_ops->mpo_check_ifnet_transmit = + mpe->mpe_function; + break; + case MAC_CHECK_SOCKET_RECEIVE: + mpc->mpc_ops->mpo_check_socket_receive = + mpe->mpe_function; + break; case MAC_CHECK_SOCKET_VISIBLE: mpc->mpc_ops->mpo_check_socket_visible = mpe->mpe_function; @@ -817,14 +825,6 @@ mpc->mpc_ops->mpo_check_pipe_op = mpe->mpe_function; break; - case MAC_IFNET_CHECK_SEND_MBUF: - mpc->mpc_ops->mpo_ifnet_check_send_mbuf = - mpe->mpe_function; - break; - case MAC_SOCKET_CHECK_RECEIVE_MBUF: - mpc->mpc_ops->mpo_socket_check_receive_mbuf = - mpe->mpe_function; - break; case MAC_INIT_BPFDESC: mpc->mpc_ops->mpo_init_bpfdesc = mpe->mpe_function; @@ -2459,25 +2459,6 @@ } int -mac_ifnet_can_send(struct ifnet *ifnet, struct mbuf *mbuf) -{ - int error; - - if (!mac_enforce_network) - return (0); - - KASSERT(mbuf->m_flags & M_PKTHDR, ("packet has no pkthdr")); - if (!(mbuf->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED)) - printf("%s%d: not initialized\n", ifnet->if_name, - ifnet->if_unit); - - MAC_CHECK(ifnet_check_send_mbuf, ifnet, &ifnet->if_label, mbuf, - &mbuf->m_pkthdr.label); - - return (error); -} - -int mac_check_bind_socket(struct ucred *ucred, struct socket *socket, struct sockaddr *sockaddr) { @@ -2520,6 +2501,25 @@ } int +mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *mbuf) +{ + int error; + + if (!mac_enforce_network) + return (0); + + KASSERT(mbuf->m_flags & M_PKTHDR, ("packet has no pkthdr")); + if (!(mbuf->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED)) + printf("%s%d: not initialized\n", ifnet->if_name, + ifnet->if_unit); + + MAC_CHECK(check_ifnet_transmit, ifnet, &ifnet->if_label, mbuf, + &mbuf->m_pkthdr.label); + + return (error); +} + +int mac_check_connect_socket(struct ucred *cred, struct socket *socket, struct sockaddr *sockaddr) { @@ -2535,14 +2535,14 @@ } int -mac_socket_can_receive(struct socket *socket, struct mbuf *mbuf) +mac_check_socket_receive(struct socket *socket, struct mbuf *mbuf) { int error; if (!mac_enforce_socket) return (0); - MAC_CHECK(socket_check_receive_mbuf, socket, &socket->so_label, mbuf, + MAC_CHECK(check_socket_receive, socket, &socket->so_label, mbuf, &mbuf->m_pkthdr.label); return (error); ==== //depot/projects/trustedbsd/mac/sys/net/if_atmsubr.c#6 (text+ko) ==== @@ -106,7 +106,7 @@ u_int32_t atm_flags; #ifdef MAC - error = mac_ifnet_can_send(ifp, m); + error = mac_check_ifnet_transmit(ifp, m); if (error) senderr(error); #endif ==== //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#15 (text+ko) ==== @@ -157,7 +157,7 @@ struct arpcom *ac = IFP2AC(ifp); #ifdef MAC - error = mac_ifnet_can_send(ifp, m); + error = mac_check_ifnet_transmit(ifp, m); if (error) senderr(error); #endif ==== //depot/projects/trustedbsd/mac/sys/net/if_fddisubr.c#8 (text+ko) ==== @@ -127,7 +127,7 @@ struct arpcom *ac = IFP2AC(ifp); #ifdef MAC - error = mac_ifnet_can_send(ifp, m); + error = mac_check_ifnet_transmit(ifp, m); if (error) senderr(error); #endif ==== //depot/projects/trustedbsd/mac/sys/net/if_gif.c#13 (text+ko) ==== @@ -342,7 +342,7 @@ static int called = 0; /* XXX: MUTEX */ #ifdef MAC - error = mac_ifnet_can_send(ifp, m); + error = mac_check_ifnet_transmit(ifp, m); if (error) senderr(error); #endif ==== //depot/projects/trustedbsd/mac/sys/net/if_iso88025subr.c#8 (text+ko) ==== @@ -224,7 +224,7 @@ struct arpcom *ac = (struct arpcom *)ifp; #ifdef MAC - error = mac_ifnet_can_send(ifp, m); + error = mac_check_ifnet_transmit(ifp, m); if (error) senderr(error); #endif ==== //depot/projects/trustedbsd/mac/sys/net/if_spppsubr.c#11 (text+ko) ==== @@ -790,7 +790,7 @@ s = splimp(); #ifdef MAC - error = mac_ifnet_can_send(ifp, m); + error = mac_check_ifnet_transmit(ifp, m); if (error) { m_freem (m); splx (s); ==== //depot/projects/trustedbsd/mac/sys/net/if_stf.c#16 (text+ko) ==== @@ -359,7 +359,7 @@ #ifdef MAC int error; - error = mac_ifnet_can_send(ifp, m); + error = mac_check_ifnet_transmit(ifp, m); if (error) { m_freem(m); return (error); ==== //depot/projects/trustedbsd/mac/sys/net/if_tun.c#10 (text+ko) ==== @@ -452,7 +452,7 @@ TUNDEBUG ("%s%d: tunoutput\n", ifp->if_name, ifp->if_unit); #ifdef MAC - error = mac_ifnet_can_send(ifp, m0); + error = mac_check_ifnet_transmit(ifp, m0); if (error) { m_freem(m0); return (error); ==== //depot/projects/trustedbsd/mac/sys/netatalk/ddp_input.c#6 (text+ko) ==== @@ -398,7 +398,7 @@ } #ifdef MAC - if (mac_socket_can_receive(&ddp->ddp_socket, m) != 0) { + if (mac_check_socket_receive(&ddp->ddp_socket, m) != 0) { m_freem( m ); return; } ==== //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#13 (text+ko) ==== @@ -158,7 +158,7 @@ } #endif /*IPSEC*/ #ifdef MAC - if (mac_socket_can_receive(last->inp_socket, + if (mac_check_socket_receive(last->inp_socket, n) != 0) policyfail = 1; #endif @@ -195,7 +195,7 @@ } #endif /*IPSEC*/ #ifdef MAC - if (mac_socket_can_receive(last->inp_socket, m) != 0) { + if (mac_check_socket_receive(last->inp_socket, m) != 0) { m_freem(m); ipstat.ips_delivered--; return; ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#17 (text+ko) ==== @@ -656,7 +656,7 @@ so = inp->inp_socket; #ifdef MAC - error = mac_socket_can_receive(so, m); + error = mac_check_socket_receive(so, m); if (error) goto drop; #endif ==== //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#13 (text+ko) ==== @@ -324,7 +324,7 @@ } #endif /*IPSEC*/ #ifdef MAC - if (mac_socket_can_receive(last->inp_socket, + if (mac_check_socket_receive(last->inp_socket, m) != 0) policyfail = 1; #endif @@ -410,7 +410,7 @@ } #endif /*IPSEC*/ #ifdef MAC - error = mac_socket_can_receive(inp->inp_socket, m); + error = mac_check_socket_receive(inp->inp_socket, m); if (error) goto bad; #endif ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#75 (text+ko) ==== @@ -1199,6 +1199,21 @@ } static int +mac_biba_check_socket_receive(struct socket *so, struct label *socketlabel, + struct mbuf *m, struct label *mbuflabel) +{ + struct mac_biba *p, *s; + + if (!mac_biba_enabled) + return (0); + + p = SLOT(mbuflabel); + s = SLOT(socketlabel); + + return (mac_biba_equal_single(p, s) ? 0 : EACCES); +} + +static int mac_biba_check_socket_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { @@ -1213,6 +1228,21 @@ return (0); } +static int +mac_biba_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *m, struct label *mbuflabel) +{ + struct mac_biba *p, *i; + + if (!mac_biba_enabled) + return (0); + + p = SLOT(mbuflabel); + i = SLOT(ifnetlabel); + + return (mac_biba_single_in_range(p, i) ? 0 : EACCES); +} + static int mac_biba_check_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel) @@ -1885,36 +1915,6 @@ return (0); } -static int -mac_biba_ifnet_check_send_mbuf(struct ifnet *ifnet, struct label *ifnetlabel, - struct mbuf *m, struct label *mbuflabel) -{ - struct mac_biba *p, *i; - - if (!mac_biba_enabled) - return (0); - - p = SLOT(mbuflabel); - i = SLOT(ifnetlabel); - - return (mac_biba_single_in_range(p, i) ? 0 : EACCES); -} - -static int -mac_biba_socket_check_receive_mbuf(struct socket *so, - struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) -{ - struct mac_biba *p, *s; - - if (!mac_biba_enabled) - return (0); - - p = SLOT(mbuflabel); - s = SLOT(socketlabel); - - return (mac_biba_equal_single(p, s) ? 0 : EACCES); -} - static vm_prot_t mac_biba_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, struct label *label, int newmapping) @@ -2144,6 +2144,10 @@ (macop_t)mac_biba_check_bpfdesc_receive }, { MAC_CHECK_CRED_VISIBLE, (macop_t)mac_biba_check_cred_visible }, + { MAC_CHECK_IFNET_TRANSMIT, + (macop_t)mac_biba_check_ifnet_transmit }, + { MAC_CHECK_SOCKET_RECEIVE, + (macop_t)mac_biba_check_socket_receive }, { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_biba_check_socket_visible }, { MAC_CHECK_RELABEL_IFNET, @@ -2214,10 +2218,6 @@ (macop_t)mac_biba_check_signal_proc }, { MAC_CHECK_STAT_VNODE, (macop_t)mac_biba_check_stat_vnode }, - { MAC_IFNET_CHECK_SEND_MBUF, - (macop_t)mac_biba_ifnet_check_send_mbuf }, - { MAC_SOCKET_CHECK_RECEIVE_MBUF, - (macop_t)mac_biba_socket_check_receive_mbuf }, { MAC_CHECK_VNODE_MMAP_PERMS, (macop_t)mac_biba_check_vnode_mmap_perms }, { MAC_CHECK_VNODE_OP, ==== //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#11 (text+ko) ==== @@ -130,24 +130,24 @@ } static int -mac_ifoff_ifnet_check_send_mbuf(struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) +mac_ifoff_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, + struct ifnet *ifnet, struct label *ifnetlabel) { - return (check_ifnet_outgoing(ifnet)); + return (check_ifnet_incoming(ifnet, 1)); } static int -mac_ifoff_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, - struct ifnet *ifnet, struct label *ifnetlabel) +mac_ifoff_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *m, struct label *mbuflabel) { - return (check_ifnet_incoming(ifnet, 1)); + return (check_ifnet_outgoing(ifnet)); } static int -mac_ifoff_socket_check_receive_mbuf(struct socket *so, - struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) +mac_ifoff_check_socket_receive(struct socket *so, struct label *socketlabel, + struct mbuf *m, struct label *mbuflabel) { if (m->m_flags & M_PKTHDR) { @@ -162,10 +162,10 @@ { { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_ifoff_check_bpfdesc_receive }, - { MAC_IFNET_CHECK_SEND_MBUF, - (macop_t)mac_ifoff_ifnet_check_send_mbuf }, - { MAC_SOCKET_CHECK_RECEIVE_MBUF, - (macop_t)mac_ifoff_socket_check_receive_mbuf }, + { MAC_CHECK_IFNET_TRANSMIT, + (macop_t)mac_ifoff_check_ifnet_transmit }, + { MAC_CHECK_SOCKET_RECEIVE, + (macop_t)mac_ifoff_check_socket_receive }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#64 (text+ko) ==== @@ -1145,6 +1145,36 @@ } static int +mac_mls_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *m, struct label *mbuflabel) +{ + struct mac_mls *p, *i; + + if (!mac_mls_enabled) + return (0); + + p = SLOT(mbuflabel); + i = SLOT(ifnetlabel); + + return (mac_mls_single_in_range(p, i) ? 0 : EACCES); +} + +static int +mac_mls_check_socket_receive(struct socket *so, struct label *socketlabel, + struct mbuf *m, struct label *mbuflabel) +{ + struct mac_mls *p, *s; + + if (!mac_mls_enabled) + return (0); + + p = SLOT(mbuflabel); + s = SLOT(socketlabel); + + return (mac_mls_equal_single(p, s) ? 0 : EACCES); +} + +static int mac_mls_check_socket_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { @@ -1831,36 +1861,6 @@ return (0); } -static int -mac_mls_ifnet_check_send_mbuf(struct ifnet *ifnet, struct label *ifnetlabel, - struct mbuf *m, struct label *mbuflabel) -{ - struct mac_mls *p, *i; - - if (!mac_mls_enabled) - return (0); - - p = SLOT(mbuflabel); - i = SLOT(ifnetlabel); - - return (mac_mls_single_in_range(p, i) ? 0 : EACCES); -} - -static int -mac_mls_socket_check_receive_mbuf(struct socket *so, struct label *socketlabel, - struct mbuf *m, struct label *mbuflabel) -{ - struct mac_mls *p, *s; - - if (!mac_mls_enabled) - return (0); - - p = SLOT(mbuflabel); - s = SLOT(socketlabel); - - return (mac_mls_equal_single(p, s) ? 0 : EACCES); -} - static vm_prot_t mac_mls_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, struct label *label, int newmapping) @@ -2090,6 +2090,10 @@ (macop_t)mac_mls_check_bpfdesc_receive }, { MAC_CHECK_CRED_VISIBLE, (macop_t)mac_mls_check_cred_visible }, + { MAC_CHECK_IFNET_TRANSMIT, + (macop_t)mac_mls_check_ifnet_transmit }, + { MAC_CHECK_SOCKET_RECEIVE, + (macop_t)mac_mls_check_socket_receive }, { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_mls_check_socket_visible }, { MAC_CHECK_RELABEL_IFNET, @@ -2160,10 +2164,6 @@ (macop_t)mac_mls_check_signal_proc }, { MAC_CHECK_STAT_VNODE, (macop_t)mac_mls_check_stat_vnode }, - { MAC_IFNET_CHECK_SEND_MBUF, - (macop_t)mac_mls_ifnet_check_send_mbuf }, - { MAC_SOCKET_CHECK_RECEIVE_MBUF, - (macop_t)mac_mls_socket_check_receive_mbuf }, { MAC_CHECK_VNODE_MMAP_PERMS, (macop_t)mac_mls_check_vnode_mmap_perms }, { MAC_CHECK_VNODE_OP, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#50 (text+ko) ==== @@ -572,6 +572,14 @@ } static int +mac_none_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *m, struct label *mbuflabel) +{ + + return (0); +} + +static int mac_none_check_connect_socket(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -580,6 +588,14 @@ } static int +mac_none_check_socket_receive(struct socket *so, struct label *socketlabel, + struct mbuf *m, struct label *mbuflabel) +{ + + return (0); +} + +static int mac_none_check_socket_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { @@ -851,22 +867,6 @@ } static int -mac_none_ifnet_check_send_mbuf(struct ifnet *ifnet, struct label *ifnetlabel, - struct mbuf *m, struct label *mbuflabel) -{ - - return (0); -} - -static int -mac_none_socket_check_receive_mbuf(struct socket *so, - struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) -{ - - return (0); -} - -static int mac_none_check_pipe_op(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, int op) { @@ -1022,8 +1022,12 @@ (macop_t)mac_none_check_bpfdesc_receive }, { MAC_CHECK_CRED_VISIBLE, (macop_t)mac_none_check_cred_visible }, + { MAC_CHECK_IFNET_TRANSMIT, + (macop_t)mac_none_check_ifnet_transmit }, { MAC_CHECK_CONNECT_SOCKET, (macop_t)mac_none_check_connect_socket }, + { MAC_CHECK_SOCKET_RECEIVE, + (macop_t)mac_none_check_socket_receive }, { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_none_check_socket_visible }, { MAC_CHECK_RELABEL_IFNET, @@ -1092,10 +1096,6 @@ (macop_t)mac_none_check_signal_proc }, { MAC_CHECK_STAT_VNODE, (macop_t)mac_none_check_stat_vnode }, - { MAC_IFNET_CHECK_SEND_MBUF, - (macop_t)mac_none_ifnet_check_send_mbuf }, - { MAC_SOCKET_CHECK_RECEIVE_MBUF, - (macop_t)mac_none_socket_check_receive_mbuf }, { MAC_CHECK_PIPE_IOCTL, (macop_t)mac_none_check_pipe_ioctl }, { MAC_CHECK_PIPE_OP, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#55 (text+ko) ==== @@ -644,20 +644,6 @@ } static int -mac_te_ifnet_check_send_mbuf(struct ifnet *ifnet, struct label *ifnetlabel, - struct mbuf *m, struct label *mbuflabel) -{ - - /* - * XXX: This treats the interface as a subject, sending the - * mbuf as an object. Since sockets are objects, this is - * probably wrong. - */ - return (mac_te_check(SLOT(ifnetlabel), SLOT(mbuflabel), - MAC_TE_CLASS_MBUF, MAC_TE_OPERATION_MBUF_SEND)); -} - -static int mac_te_check_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, struct label *newlabel) { @@ -703,7 +689,21 @@ return (mac_te_check(SLOT(&u1->cr_label), SLOT(&u2->cr_label), MAC_TE_CLASS_PROC, MAC_TE_OPERATION_PROC_SEE)); -} +} + +static int +mac_te_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *m, struct label *mbuflabel) +{ + + /* + * XXX: This treats the interface as a subject, sending the + * mbuf as an object. Since sockets are objects, this is + * probably wrong. + */ + return (mac_te_check(SLOT(ifnetlabel), SLOT(mbuflabel), + MAC_TE_CLASS_MBUF, MAC_TE_OPERATION_MBUF_SEND)); +} static int mac_te_check_connect_socket(struct ucred *cred, struct socket *socket, @@ -730,15 +730,10 @@ } static int -mac_te_socket_check_receive_mbuf(struct socket *so, struct label *socketlabel, +mac_te_check_socket_receive(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { - /* - * XXX: This treats the socket as a subject, reading the - * mbuf as an object. Since sockets are objects, this is - * probably wrong. - */ return (mac_te_check(SLOT(socketlabel), SLOT(mbuflabel), MAC_TE_CLASS_MBUF, MAC_TE_OPERATION_MBUF_RECEIVE)); } @@ -1748,13 +1743,18 @@ { MAC_RELABEL_SUBJECT, (macop_t)mac_te_relabel_subject }, { MAC_RELABEL_VNODE, (macop_t)mac_te_relabel_vnode }, { MAC_CHECK_BIND_SOCKET, (macop_t)mac_te_check_bind_socket }, - { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_te_check_bpfdesc_receive }, + { MAC_CHECK_BPFDESC_RECEIVE, + (macop_t)mac_te_check_bpfdesc_receive }, { MAC_CHECK_CRED_VISIBLE, (macop_t)mac_te_check_cred_visible }, + { MAC_CHECK_IFNET_TRANSMIT, + (macop_t)mac_te_check_ifnet_transmit }, { MAC_CHECK_CONNECT_SOCKET, (macop_t)mac_te_check_connect_socket }, { MAC_CHECK_LISTEN_SOCKET, (macop_t)mac_te_check_listen_socket }, + { MAC_CHECK_SOCKET_RECEIVE, + (macop_t)mac_te_check_socket_receive }, { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_te_check_socket_visible }, { MAC_CHECK_RELABEL_IFNET, @@ -1822,9 +1822,6 @@ (macop_t)mac_te_check_vnode_mmap_perms }, { MAC_CHECK_VNODE_OP, (macop_t)mac_te_check_vnode_op }, - { MAC_IFNET_CHECK_SEND_MBUF, (macop_t)mac_te_ifnet_check_send_mbuf }, - { MAC_SOCKET_CHECK_RECEIVE_MBUF, - (macop_t)mac_te_socket_check_receive_mbuf }, { MAC_EXTERNALIZE, (macop_t)mac_te_externalize }, { MAC_INTERNALIZE, (macop_t)mac_te_internalize }, { MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#20 (text+ko) ==== @@ -780,6 +780,14 @@ } static int +mac_test_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *m, struct label *mbuflabel) +{ + + return (0); +} + +static int mac_test_check_connect_socket(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -788,6 +796,14 @@ } static int +mac_test_check_socket_receive(struct socket *socket, struct label *socketlabel, + struct mbuf *m, struct label *mbuflabel) +{ + + return (0); +} + +static int mac_test_check_socket_visible(struct ucred *cred, struct socket *socket, struct label *socketlabel) { @@ -1074,22 +1090,6 @@ return (0); } -static int -mac_test_ifnet_check_send_mbuf(struct ifnet *ifnet, struct label *ifnetlabel, - struct mbuf *m, struct label *mbuflabel) -{ - - return (0); -} - -static int -mac_test_socket_check_receive_mbuf(struct socket *so, - struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) -{ - - return (0); -} - static struct mac_policy_op_entry mac_test_ops[] = { { MAC_DESTROY, @@ -1228,8 +1228,12 @@ (macop_t)mac_test_check_bpfdesc_receive }, { MAC_CHECK_CRED_VISIBLE, (macop_t)mac_test_check_cred_visible }, + { MAC_CHECK_IFNET_TRANSMIT, + (macop_t)mac_test_check_ifnet_transmit }, { MAC_CHECK_CONNECT_SOCKET, (macop_t)mac_test_check_connect_socket }, + { MAC_CHECK_SOCKET_RECEIVE, + (macop_t)mac_test_check_socket_receive }, { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_test_check_socket_visible }, { MAC_CHECK_RELABEL_IFNET, @@ -1302,10 +1306,6 @@ (macop_t)mac_test_check_pipe_ioctl }, { MAC_CHECK_PIPE_OP, (macop_t)mac_test_check_pipe_op }, - { MAC_IFNET_CHECK_SEND_MBUF, - (macop_t)mac_test_ifnet_check_send_mbuf }, - { MAC_SOCKET_CHECK_RECEIVE_MBUF, - (macop_t)mac_test_socket_check_receive_mbuf }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#126 (text+ko) ==== @@ -368,9 +368,10 @@ /* Network event miscellany. */ int mac_fragment_matches_ipq(struct mbuf *fragment, struct ipq *ipq); -int mac_ifnet_can_send(struct ifnet *ifnet, struct mbuf *m); void mac_update_ipq_from_fragment(struct mbuf *fragment, struct ipq *ipq); -int mac_socket_can_receive(struct socket *so, struct mbuf *m); + +int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m); +int mac_check_socket_receive(struct socket *so, struct mbuf *m); /* Hooks for the proc-based "can"-checks. */ int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#91 (text+ko) ==== @@ -235,9 +235,15 @@ struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel); int (*mpo_check_cred_visible)(struct ucred *u1, struct ucred *u2); + int (*mpo_check_ifnet_transmit)(struct ifnet *ifnet, + struct label *ifnetlabel, struct mbuf *m, + struct label *mbuflabel); int (*mpo_check_connect_socket)(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr); + int (*mpo_check_socket_receive)(struct socket *so, + struct label *socketlabel, struct mbuf *m, + struct label *mbuflabel); int (*mpo_check_socket_visible)(struct ucred *cred, struct socket *socket, struct label *socketlabel); int (*mpo_check_relabel_ifnet)(struct ucred *cred, @@ -327,12 +333,6 @@ struct vnode *vp, struct label *label, int newmapping); int (*mpo_check_vnode_op)(struct ucred *cred, struct vnode *vp, struct label *label, int op); - int (*mpo_ifnet_check_send_mbuf)(struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *mbuf, - struct label *mbuflabel); - int (*mpo_socket_check_receive_mbuf)(struct socket *socket, - struct label *socketlabel, struct mbuf *mbuf, - struct label *mbuflabel); int (*mpo_check_pipe_op)(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, int op); int (*mpo_check_pipe_ioctl)(struct ucred *cred, @@ -414,6 +414,8 @@ MAC_CHECK_BIND_SOCKET, MAC_CHECK_BPFDESC_RECEIVE, MAC_CHECK_CRED_VISIBLE, + MAC_CHECK_IFNET_TRANSMIT, + MAC_CHECK_SOCKET_RECEIVE, MAC_CHECK_SOCKET_VISIBLE, MAC_CHECK_RELABEL_IFNET, MAC_CHECK_RELABEL_PIPE, @@ -451,8 +453,6 @@ MAC_CHECK_STAT_VNODE, MAC_CHECK_VNODE_MMAP_PERMS, MAC_CHECK_VNODE_OP, - MAC_IFNET_CHECK_SEND_MBUF, - MAC_SOCKET_CHECK_RECEIVE_MBUF, MAC_CHECK_PIPE_IOCTL, MAC_CHECK_PIPE_OP }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 8:18:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF6DB37B400; Sun, 28 Jul 2002 08:17:07 -0700 (PDT) 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 67B3137B405 for ; Sun, 28 Jul 2002 08:17:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1010143E6A for ; Sun, 28 Jul 2002 08:17:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6SFGwJU034352 for ; Sun, 28 Jul 2002 08:16:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6SFGva2034349 for perforce@freebsd.org; Sun, 28 Jul 2002 08:16:57 -0700 (PDT) Date: Sun, 28 Jul 2002 08:16:57 -0700 (PDT) Message-Id: <200207281516.g6SFGva2034349@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15052 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15052 Change 15052 by rwatson@rwatson_paprika on 2002/07/28 08:16:38 IFC the trustedbsd base branch a little further to pick up some of the manual TrustedBSD MAC merges from yesterday. Affected files ... .. //depot/projects/trustedbsd/base/bin/test/test.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/CHANGES#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/FILES#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/INSTALL#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/VERSION#3 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/aclocal.m4#1 branch .. //depot/projects/trustedbsd/base/contrib/traceroute/config.guess#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/config.sub#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/configure#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/configure.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/findsaddr-generic.c#1 branch .. //depot/projects/trustedbsd/base/contrib/traceroute/findsaddr-linux.c#1 branch .. //depot/projects/trustedbsd/base/contrib/traceroute/findsaddr-mib.c#1 branch .. //depot/projects/trustedbsd/base/contrib/traceroute/findsaddr-socket.c#1 branch .. //depot/projects/trustedbsd/base/contrib/traceroute/findsaddr.h#1 branch .. //depot/projects/trustedbsd/base/contrib/traceroute/ifaddrlist.c#1 branch .. //depot/projects/trustedbsd/base/contrib/traceroute/ifaddrlist.h#1 branch .. //depot/projects/trustedbsd/base/contrib/traceroute/install-sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/lbl/os-solaris2.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/lbl/os-sunos4.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/strerror.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.8#3 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.h#1 branch .. //depot/projects/trustedbsd/base/contrib/traceroute/usleep.c#1 branch .. //depot/projects/trustedbsd/base/etc/rc.d/bgfsck#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/initdiskless#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.diskless1#7 integrate .. //depot/projects/trustedbsd/base/release/Makefile#16 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#28 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/devfs.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/devfs.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/extern.h#2 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/rule.c#2 integrate .. //depot/projects/trustedbsd/base/share/man/man7/release.7#5 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#4 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#8 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-tape.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/si/si.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs.h#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/trustedbsd/base/sys/fs/specfs/spec_vnops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/db_trace.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/exception.s#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#6 integrate .. //depot/projects/trustedbsd/base/sys/net/netisr.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netipx/spx_debug.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_lib.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/cpu.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/pmap.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/profile.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/tlb.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.s#11 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#13 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/mutex.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/ucred.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#14 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_readwrite.c#8 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#5 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#12 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_kern.c#8 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#10 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/make/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.music#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/lock/lock.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/lock/lock.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/parse.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/getextattr/getextattr.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/setkey/setkey.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/traceroute/Makefile#3 integrate Differences ... ==== //depot/projects/trustedbsd/base/bin/test/test.c#10 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.49 2002/07/05 10:27:34 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.50 2002/07/27 22:53:44 dwmalone Exp $"); #include #include @@ -521,19 +521,21 @@ { struct stat b1, b2; - return (stat (f1, &b1) == 0 && - stat (f2, &b2) == 0 && - b1.st_mtime > b2.st_mtime); + if (stat(f1, &b1) != 0 || stat(f2, &b2) != 0) + return 0; + + if (b1.st_mtimespec.tv_sec > b2.st_mtimespec.tv_sec) + return 1; + if (b1.st_mtimespec.tv_sec < b2.st_mtimespec.tv_sec) + return 0; + + return (b1.st_mtimespec.tv_nsec > b2.st_mtimespec.tv_nsec); } static int olderf (const char *f1, const char *f2) { - struct stat b1, b2; - - return (stat (f1, &b1) == 0 && - stat (f2, &b2) == 0 && - b1.st_mtime < b2.st_mtime); + return (newerf(f2, f1)); } static int ==== //depot/projects/trustedbsd/base/contrib/traceroute/CHANGES#2 (text+ko) ==== @@ -1,4 +1,86 @@ -@(#) $Header: CHANGES,v 1.12 96/09/28 18:24:35 leres Exp $ (LBL) +@(#) $Id: CHANGES,v 1.23 2000/12/14 06:53:11 leres Exp $ (LBL) + +v1.4 Wed Dec 13 22:50:35 PST 2000 + +- Add an option to use icmp echo instead of udp datagrams. + +- Add HPUX and Linux support. + +- Handle hex argument values as suggested by John Hawkinson + (jhawk@mit.edu) + +- Added flags to set the first ttl and to set the don't fragment bit. + +- Add a local autoconf macro to check for routines in libraries; the + autoconf version is broken (it only puts the library name in the + cache variable name). Thanks to John Hawkinson. + +- Add a local autoconf macro to check for types; the autoconf version + is broken (it uses grep instead of actually compiling a code fragment). + +- Attempt to detect "egcs" versions of gcc. + +- Fix problems caused by savestr(). + +- Detect when there are more interfaces than we can deal with. Thanks + to Guy Harris guy@netapp.com. + +- Accommodate changes made to FreeBSD 3.2-RELEASE network headers files. + +- The ip header offset needs to be byte swapped under Solaris on the + intel as well. Reported by John McDermott (jjm@jkintl.com) Also byte + ip length and offset for linux. + +- In wait_for_reply(), use passed socket instead of global one. Thanks + to Richard Kettlewell (richard.kettlewell@kewill.com) + +- Check for IFF_LOOPBACK as a define or an enum (concession to linux). + Reported by Robert Bihlmeyer (robbe@orcus.priv.at) + +- Increase size of SIOCGIFCONF buffer to accommodate systems with lots + of virtual interfaces. Ignore sun virtual interfaces. Suggested by + Ian Donaldson (iand@aone.com.au) + +- Always calculate icmp checksums when using -I. Reported by Soumen + (sbiswas@novell.com) + +- Documentation fix for description of -p. Thanks to Jeffrey C Honig + (jch@bsdi.com) + +- Enable ip checksums for Solaris 2.6 and higher (since they seem to + work correctly now). + +- Avoid problems when broken routers return 0.0.0.0 as their source + address. Thanks to John Hawkinson (jhawk@bbnplanet.com) + +- Canonicalize hostname if gethostname() doesn't return a domain. + +- Add -z flag (pause msecs) to allow optional pause between probes. + Suggested by Dave Morrison (drmorris@uplanet.com) + +- Fix max packet length test. + +- Use "/dev/null" instead of "." for file descriptor fodder. + Suggested by Tim Robbins (fyre@box3n.gumbynet.org) + +- Watch for a NULL argv[0]. Suggested by Tim Robbins. + +- Be careful with hostname legnths. + +- Print RFC1191 Path MTU Discovery value on "needfrag" unreachables. + +- Limit port size to 16 bits. Suggested by Tim Robbins. + +- Limit wait time to 24 hours. + +- Modified linux specific struct ipovly definition to avoid problems + with 64 bit systems. Problem reported by Uros Prestor + (uros@turbolinux.com) + +- Use kernel routing tables to determine correct source address. + Three styles are supported: bsd/socket, solaris/mib and linux. + +- Fix configure to recognize older versions of Solaris. v1.3.2 Thu Sep 26 18:06:16 PDT 1996 ==== //depot/projects/trustedbsd/base/contrib/traceroute/FILES#2 (text+ko) ==== @@ -4,15 +4,28 @@ Makefile.in README VERSION -acsite.m4 +aclocal.m4 config.guess config.sub configure configure.in +findsaddr-generic.c +findsaddr-linux.c +findsaddr-mib.c +findsaddr-socket.c +findsaddr.h +ifaddrlist.c +ifaddrlist.h install-sh lbl/gnuc.h lbl/os-solaris2.h lbl/os-sunos4.h +linux-include/netinet/in_systm.h +linux-include/netinet/ip.h +linux-include/netinet/ip_icmp.h +linux-include/netinet/ip_var.h +linux-include/netinet/udp.h +linux-include/netinet/udp_var.h mean.awk median.awk mkdep @@ -20,3 +33,5 @@ strerror.c traceroute.8 traceroute.c +traceroute.h +usleep.c ==== //depot/projects/trustedbsd/base/contrib/traceroute/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/traceroute/FREEBSD-upgrade,v 1.2 1999/12/20 16:07:53 phantom Exp $ +$FreeBSD: src/contrib/traceroute/FREEBSD-upgrade,v 1.3 2002/07/28 02:26:31 fenner Exp $ This directory contains virgin copies of the original distribution files on a "vendor" branch. Do not, under any circumstances, attempt to upgrade @@ -10,11 +10,13 @@ [Do not make ANY changes to the files.] 2. Use the command: - cvs import -m 'Virgin import of LBL traceroute v' \ + cvs import -I linux-include \ + -m 'Virgin import of LBL traceroute v' \ src/contrib/traceroute LBL v For example, to do the import of version 1.3.2, I might have typed: - cvs import -m 'Virgin import of LBL traceroute v1.3.2' \ + cvs import -I linux-include \ + -m 'Virgin import of LBL traceroute v1.3.2' \ src/contrib/traceroute LBL v1_3_2 3. Follow the instructions printed out in step 2 to resolve any @@ -30,4 +32,7 @@ (The "SANE_PRECISION" patch has been submitted and rejected.) +(The extensive modifications for TCP and GRE probes have not been +submitted.) + fenner@freebsd.org - 30 Sep 1996 ==== //depot/projects/trustedbsd/base/contrib/traceroute/INSTALL#2 (text+ko) ==== @@ -1,4 +1,4 @@ -@(#) $Header: INSTALL,v 1.7 96/09/18 21:09:56 leres Exp $ (LBL) +@(#) $Id: INSTALL,v 1.13 2000/11/23 20:07:29 leres Exp $ (LBL) Traceroute is known to build and run under SunOS 4.1.4 and Solaris 5.4. If you are running a really old kernel, see the instructions under the @@ -20,6 +20,20 @@ ftp://prep.ai.mit.edu/pub/gnu/gcc-*.tar.gz +If you get the error message: + + traceroute: unknown protocol icmp + +it usually means you're missing the icmp line in /etc/protocols. + +If you are using Solaris 2.5.1 (and possibly higher), traceroute cannot +calculate checksums; configure automatically changes the default to +reflect this. The kernel updates the ip_id field with some unknown +value and the ip_off field with the IP_DF bit. Also, if the the udp +uh_sum field is non-zero, it gets updated with the value of the uh_ulen +field... This means that the icmp echo option (-I flag) is not as +useful. + KERNEL MODIFICATIONS -------------------- If yor have a really old system, it may be necessary to modify your @@ -65,18 +79,27 @@ Makefile.in - compilation rules (input to the configure script) README - description of distribution VERSION - version of this release -acsite.m4 - autoconf macros +aclocal.m4 - autoconf macros config.guess - autoconf support config.sub - autoconf support configure - configure script (run this first) configure.in - configure script source +findsaddr-generic.c - generic source address code +findsaddr-linux.c - linux source address code +findsaddr-socket.c - socket based soruce address code +findsaddr.h - source address prototypes +ifaddrlist.c - inet address routines +ifaddrlist.h - inet address prototypes install-sh - BSD style install script lbl/gnuc.h - gcc macros and defines lbl/os-*.h - os dependent defines and prototypes +linux-include/* - network include files missing on Linux mean.awk - awk script to print out the mean time along a route median.awk - awk script to print out the median time along a route mkdep - construct Makefile dependency list rip_output.c - sample rip_output() from /sys/netinet/raw_ip.c +strerror.c - emulation routine traceroute.8 - manual entry traceroute.c - main program -strerror.c - emulation routine +traceroute.h - global prototypes +usleep.c - missing system call emulation ==== //depot/projects/trustedbsd/base/contrib/traceroute/Makefile.in#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) 1988, 1989, 1990, 1991, 1992, 1995, 1996 +# Copyright (c) 1988, 1989, 1990, 1991, 1992, 1995, 1996, 1997, 1998, 1999, 2000 # The Regents of the University of California. All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: Makefile.in,v 1.21 96/09/16 18:49:46 leres Exp $ (LBL) +# @(#) $Id: Makefile.in,v 1.28 2000/11/23 20:05:14 leres Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -57,19 +57,20 @@ # problem if you don't own the file but can write to the directory. .c.o: @rm -f $@ - $(CC) $(CFLAGS) -c $*.c + $(CC) $(CFLAGS) -c $(srcdir)/$*.c -CSRC = traceroute.c +CSRC = traceroute.c ifaddrlist.c @V_FINDSADDR@ GENSRC = version.c SRC = $(CSRC) $(GENSRC) +HDR = findsaddr.h ifaddrlist.h TAGHDR = \ /usr/include/netinet/in.h \ /usr/include/netinet/ip_icmp.h \ /usr/include/netinet/udp.h -TAGFILES = $(SRC) $(TAGHDR) +TAGFILES = $(SRC) $(HDR) $(TAGHDR) # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot # hack the extra indirection @@ -77,6 +78,8 @@ CLEANFILES = $(OBJ) traceroute $(GENSRC) +all: traceroute + traceroute: $(OBJ) @rm -f $@ $(CC) $(CFLAGS) -o $@ $(OBJ) $(LIBS) @@ -92,7 +95,7 @@ install-man: force $(INSTALL) -m 444 -o bin -g bin traceroute.8 $(DESTDIR)$(MANDEST)/man8 -lint: $(GENSRC) force +lint: $(GENSRC) force lint -hbxn $(SRC) | \ grep -v 'struct/union .* never defined' | \ grep -v 'possible pointer alignment problem' @@ -104,23 +107,23 @@ rm -f $(CLEANFILES) Makefile config.cache config.log config.status \ gnuc.h os-proto.h -tags: $(TAGFILES) +tags: $(TAGFILES) ctags -wtd $(TAGFILES) -tar: force - @cwd=`pwd` ; dir=`basename $$cwd` ; name=traceroute-`cat VERSION` ; \ - list="" ; tar="tar chFFf" ; \ +tar: force + @cwd=`pwd` ; name=traceroute-`cat VERSION` ; \ + list="" ; tar="tar chf" ; temp="$$name.tar.gz" ; \ for i in `cat FILES` ; do list="$$list $$name/$$i" ; done; \ echo \ - "rm -f ../$$name; ln -s $$dir ../$$name" ; \ - rm -f ../$$name; ln -s $$dir ../$$name ; \ + "rm -f $$name; ln -s . $$name" ; \ + rm -f $$name; ln -s . $$name ; \ echo \ - "(cd .. ; $$tar - [lots of files]) | compress > /tmp/$$name.tar.Z" ; \ - (cd .. ; $$tar - $$list) | compress > /tmp/$$name.tar.Z ; \ + "$$tar - [lots of files] | gzip > $$temp" ; \ + $$tar - $$list | gzip > $$temp ; \ echo \ - "rm -f ../$$name" ; \ - rm -f ../$$name + "rm -f $$name" ; \ + rm -f $$name -force: /tmp -depend: $(GENSRC) force +force: /tmp +depend: $(GENSRC) force ./mkdep -c $(CC) $(DEFS) $(INCLS) $(SRC) ==== //depot/projects/trustedbsd/base/contrib/traceroute/README#2 (text+ko) ==== @@ -1,10 +1,10 @@ -@(#) $Header: README,v 1.7 96/07/06 02:08:32 leres Exp $ (LBL) +@(#) $Id: README,v 1.9 2000/09/16 05:32:01 leres Exp $ (LBL) -TRACEROUTE 1.3 +TRACEROUTE 1.4 Lawrence Berkeley National Laboratory Network Research Group traceroute@ee.lbl.gov -ftp://ftp.ee.lbl.gov/traceroute.tar.Z +ftp://ftp.ee.lbl.gov/traceroute.tar.gz Traceroute is a system administrators utility to trace the route ip packets from the current system take in getting to some @@ -19,7 +19,7 @@ to each hop, respectively. I've found that something like traceroute -q 7 foo.somewhere >t - awk -f median.awk t | graph + awk -f median.awk t | xgraph can give you a quick picture of the bad spots on a long path (median is usually a better noise filter than mean). ==== //depot/projects/trustedbsd/base/contrib/traceroute/VERSION#3 (text+ko) ==== @@ -1,2 +1,2 @@ -1.3.2+FreeBSD -$FreeBSD: src/contrib/traceroute/VERSION,v 1.2 2002/07/23 00:56:52 fenner Exp $ +1.4a12+FreeBSD +$FreeBSD: src/contrib/traceroute/VERSION,v 1.3 2002/07/28 02:26:31 fenner Exp $ ==== //depot/projects/trustedbsd/base/contrib/traceroute/config.guess#2 (text+ko) ==== @@ -67,21 +67,28 @@ amiga:NetBSD:*:*) echo m68k-cbm-netbsd${UNAME_RELEASE} exit 0 ;; + amiga:OpenBSD:*:*) + echo m68k-cbm-openbsd${UNAME_RELEASE} + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; - Pyramid*:OSx*:*:*) + Pyramid*:OSx*:*:*|MIS*:OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then echo pyramid-pyramid-sysv3 else echo pyramid-pyramid-bsd fi exit 0 ;; - sun4*:SunOS:5.*:*) + NILE:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit 0 ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; i86pc:SunOS:5.*:*) - echo i386-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -101,25 +108,60 @@ sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit 0 ;; atari*:NetBSD:*:*) echo m68k-atari-netbsd${UNAME_RELEASE} exit 0 ;; + atari*:OpenBSD:*:*) + echo m68k-atari-openbsd${UNAME_RELEASE} + exit 0 ;; sun3*:NetBSD:*:*) echo m68k-sun-netbsd${UNAME_RELEASE} exit 0 ;; + sun3*:OpenBSD:*:*) + echo m68k-sun-openbsd${UNAME_RELEASE} + exit 0 ;; mac68k:NetBSD:*:*) echo m68k-apple-netbsd${UNAME_RELEASE} exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-apple-openbsd${UNAME_RELEASE} + exit 0 ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit 0 ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} exit 0 ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} exit 0 ;; - mips:*:4*:UMIPS) - echo mips-mips-riscos4sysv - exit 0 ;; - mips:*:5*:RISCos) + mips:*:*:UMIPS | mips:*:*:RISCos) + sed 's/^ //' << EOF >dummy.c + int main (argc, argv) int argc; char **argv; { + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + ${CC-cc} dummy.c -o dummy \ + && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && rm dummy.c dummy && exit 0 + rm -f dummy.c dummy echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Night_Hawk:Power_UNIX:*:*) @@ -137,7 +179,7 @@ AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88100 ] ; then + if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ -o ${TARGET_BINARY_INTERFACE}x = x ] ; then echo m88k-dg-dgux${UNAME_RELEASE} @@ -163,10 +205,10 @@ *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` exit 0 ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i[34]86:AIX:*:*) + i?86:AIX:*:*) echo i386-ibm-aix exit 0 ;; *:AIX:2:3) @@ -211,7 +253,7 @@ echo romp-ibm-bsd4.4 exit 0 ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -229,7 +271,7 @@ case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/7?? | 9000/8?[679] ) HP_ARCH=hppa1.1 ;; + 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;; 9000/8?? ) HP_ARCH=hppa1.0 ;; esac HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` @@ -277,6 +319,13 @@ hp8??:OSF1:*:*) echo hppa1.0-hp-osf exit 0 ;; + i?86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit 0 ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; @@ -304,17 +353,33 @@ CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} exit 0 ;; - CRAY*C90:*:*:*) - echo c90-cray-unicos${UNAME_RELEASE} + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + exit 0 ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos exit 0 ;; + F300:UNIX_System_V:*:*) + FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; + F301:UNIX_System_V:*:*) + echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` + exit 0 ;; hp3[0-9][05]:NetBSD:*:*) echo m68k-hp-netbsd${UNAME_RELEASE} exit 0 ;; - i[34]86:BSD/386:*:* | *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + hp3[0-9][05]:OpenBSD:*:*) + echo m68k-hp-openbsd${UNAME_RELEASE} + exit 0 ;; + i?86:BSD/386:*:* | *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` @@ -322,8 +387,11 @@ *:NetBSD:*:*) echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + exit 0 ;; i*:CYGWIN*:*) - echo i386-unknown-cygwin32 + echo i386-pc-cygwin32 exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin32 @@ -338,23 +406,27 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. ld_help_string=`ld --help 2>&1` - if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then - echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then - echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0 - elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86coff"; then - echo "${UNAME_MACHINE}-unknown-linuxcoff" ; exit 0 + if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then + echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0 + elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then + echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 + elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then + echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then - echo "${UNAME_MACHINE}-unknown-linux" ; exit 0 + echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0 elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then - echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0 + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 + elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then + echo "powerpc-unknown-linux-gnu" ; exit 0 elif test "${UNAME_MACHINE}" = "alpha" ; then - echo alpha-unknown-linux ; exit 0 + echo alpha-unknown-linux-gnu ; exit 0 + elif test "${UNAME_MACHINE}" = "sparc" ; then + echo sparc-unknown-linux-gnu ; exit 0 else - # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us - # useful --help. Gcc wants to distinguish between linuxoldld and linuxaout. + # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us + # useful --help. Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout. test ! -d /usr/lib/ldscripts/. \ - && echo "${UNAME_MACHINE}-unknown-linuxoldld" && exit 0 + && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 # Determine whether the default compiler is a.out or elf cat >dummy.c </dev/null 2>/dev/null; then echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} else - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} fi exit 0 ;; - i[34]86:*:3.2:*) + i?86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 - echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else - echo ${UNAME_MACHINE}-unknown-sysv32 + echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; Intel:Mach:3*:*) - echo i386-unknown-mach3 + echo i386-pc-mach3 exit 0 ;; paragon:*:*:*) echo i860-intel-osf1 @@ -415,28 +487,36 @@ # "miniframe" echo m68010-convergent-sysv exit 0 ;; - M680[234]0:*:R3V[567]*:*) + M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0) - uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3 && exit 0 ;; + 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - uname -p 2>/dev/null | grep 86 >/dev/null \ + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && echo i486-ncr-sysv4 && exit 0 ;; - m680[234]0:LynxOS:2.[23]*:*) - echo m68k-lynx-lynxos${UNAME_RELEASE} + m68*:LynxOS:2.*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} exit 0 ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i[34]86:LynxOS:2.[23]*:*) - echo i386-lynx-lynxos${UNAME_RELEASE} + i?86:LynxOS:2.*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; - TSUNAMI:LynxOS:2.[23]*:*) - echo sparc-lynx-lynxos${UNAME_RELEASE} + rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} exit 0 ;; - rs6000:LynxOS:2.[23]*:*) - echo rs6000-lynx-lynxos${UNAME_RELEASE} + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} exit 0 ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 @@ -449,16 +529,29 @@ echo ns32k-sni-sysv fi exit 0 ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit 0 ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; - R3000:*System_V*:*:*) + R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi exit 0 ;; + PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -502,7 +595,7 @@ #endif int version; version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - printf ("%s-next-nextstep%s\n", __ARCHITECTURE__, version==2 ? "2" : "3"); + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); exit (0); #endif @@ -519,7 +612,7 @@ #endif #if defined (__386BSD__) - printf ("i386-unknown-bsd\n"); exit (0); + printf ("i386-pc-bsd\n"); exit (0); #endif #if defined (sequent) ==== //depot/projects/trustedbsd/base/contrib/traceroute/config.sub#2 (text+ko) ==== @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +# Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. +# can handle that machine. It does not imply ALL GNU software can. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -41,6 +41,8 @@ # The goal of this file is to map all the various variations of a given # machine specification into a single specification in the form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. if [ x$1 = x ] @@ -62,11 +64,21 @@ ;; esac -# Separate what the user gave into CPU-COMPANY and OS (if any). -basic_machine=`echo $1 | sed 's/-[^-]*$//'` -if [ $basic_machine != $1 ] -then os=`echo $1 | sed 's/.*-/-/'` -else os=; fi +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + linux-gnu*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac ### Let's recognize common machines as not being operating systems so ### that things like config.sub decstation-3100 work. We also @@ -81,38 +93,43 @@ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp ) + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple) os= basic_machine=$1 ;; -hiux*) os=-hiuxwe2 ;; + -sco5) + os=sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco4) os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco3.2v[4-9]*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco*) os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -isc) os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -clix*) basic_machine=clipper-intergraph ;; -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -lynx*) os=-lynxos @@ -123,35 +140,44 @@ -windowsnt*) os=`echo $os | sed -e 's/windowsnt/winnt/'` ;; + -psos*) + os=-psos + ;; esac >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 8:44:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17EC437B401; Sun, 28 Jul 2002 08:43:32 -0700 (PDT) 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 BFA3237B400 for ; Sun, 28 Jul 2002 08:43:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38E9843E3B for ; Sun, 28 Jul 2002 08:43:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6SFhVJU037530 for ; Sun, 28 Jul 2002 08:43:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6SFhUAc037527 for perforce@freebsd.org; Sun, 28 Jul 2002 08:43:30 -0700 (PDT) Date: Sun, 28 Jul 2002 08:43:30 -0700 (PDT) Message-Id: <200207281543.g6SFhUAc037527@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15053 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15053 Change 15053 by rwatson@rwatson_paprika on 2002/07/28 08:43:28 Rename socket bind, connect, and listen entry points to be more consistent with the mac_check_(objectname)_(methodname) format. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#199 edit .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#14 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#51 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#56 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#21 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#127 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#92 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#199 (text+ko) ==== @@ -650,10 +650,6 @@ mpc->mpc_ops->mpo_relabel_subject = mpe->mpe_function; break; - case MAC_CHECK_BIND_SOCKET: - mpc->mpc_ops->mpo_check_bind_socket = - mpe->mpe_function; - break; case MAC_CHECK_BPFDESC_RECEIVE: mpc->mpc_ops->mpo_check_bpfdesc_receive = mpe->mpe_function; @@ -662,12 +658,20 @@ mpc->mpc_ops->mpo_check_cred_visible = mpe->mpe_function; break; - case MAC_CHECK_CONNECT_SOCKET: - mpc->mpc_ops->mpo_check_connect_socket = + case MAC_CHECK_IFNET_TRANSMIT: + mpc->mpc_ops->mpo_check_ifnet_transmit = + mpe->mpe_function; + break; + case MAC_CHECK_SOCKET_BIND: + mpc->mpc_ops->mpo_check_socket_bind = + mpe->mpe_function; + break; + case MAC_CHECK_SOCKET_CONNECT: + mpc->mpc_ops->mpo_check_socket_connect = mpe->mpe_function; break; - case MAC_CHECK_IFNET_TRANSMIT: - mpc->mpc_ops->mpo_check_ifnet_transmit = + case MAC_CHECK_SOCKET_LISTEN: + mpc->mpc_ops->mpo_check_socket_listen = mpe->mpe_function; break; case MAC_CHECK_SOCKET_RECEIVE: @@ -741,10 +745,6 @@ mpc->mpc_ops->mpo_check_getextattr_vnode = mpe->mpe_function; break; - case MAC_CHECK_LISTEN_SOCKET: - mpc->mpc_ops->mpo_check_listen_socket = - mpe->mpe_function; - break; case MAC_CHECK_LOOKUP_VNODE: mpc->mpc_ops->mpo_check_lookup_vnode = mpe->mpe_function; @@ -1867,18 +1867,6 @@ } int -mac_check_listen_socket(struct ucred *cred, struct socket *socket) -{ - int error; - - if (!mac_enforce_socket) - return (0); - - MAC_CHECK(check_listen_socket, cred, socket, &socket->so_label); - return (error); -} - -int mac_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, struct componentname *cnp) { @@ -2459,21 +2447,6 @@ } int -mac_check_bind_socket(struct ucred *ucred, struct socket *socket, - struct sockaddr *sockaddr) -{ - int error; - - if (!mac_enforce_socket) - return (0); - - MAC_CHECK(check_bind_socket, ucred, socket, &socket->so_label, - sockaddr); - - return (error); -} - -int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet) { int error; @@ -2520,7 +2493,22 @@ } int -mac_check_connect_socket(struct ucred *cred, struct socket *socket, +mac_check_socket_bind(struct ucred *ucred, struct socket *socket, + struct sockaddr *sockaddr) +{ + int error; + + if (!mac_enforce_socket) + return (0); + + MAC_CHECK(check_socket_bind, ucred, socket, &socket->so_label, + sockaddr); + + return (error); +} + +int +mac_check_socket_connect(struct ucred *cred, struct socket *socket, struct sockaddr *sockaddr) { int error; @@ -2528,13 +2516,25 @@ if (!mac_enforce_socket) return (0); - MAC_CHECK(check_connect_socket, cred, socket, &socket->so_label, + MAC_CHECK(check_socket_connect, cred, socket, &socket->so_label, sockaddr); return (error); } int +mac_check_socket_listen(struct ucred *cred, struct socket *socket) +{ + int error; + + if (!mac_enforce_socket) + return (0); + + MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label); + return (error); +} + +int mac_check_socket_receive(struct socket *socket, struct mbuf *mbuf) { int error; ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#14 (text+ko) ==== @@ -179,7 +179,7 @@ if ((error = getsockaddr(&sa, uap->name, uap->namelen)) != 0) goto done1; #ifdef MAC - error = mac_check_bind_socket(td->td_ucred, so, sa); + error = mac_check_socket_bind(td->td_ucred, so, sa); if (error) { FREE(sa, M_SONAME); goto done1; @@ -212,7 +212,7 @@ mtx_lock(&Giant); if ((error = fgetsock(td, uap->s, &so, NULL)) == 0) { #ifdef MAC - error = mac_check_listen_socket(td->td_ucred, so); + error = mac_check_socket_listen(td->td_ucred, so); if (error) goto done; #endif @@ -454,7 +454,7 @@ if (error) goto done1; #ifdef MAC - error = mac_check_connect_socket(td->td_ucred, so, sa); + error = mac_check_socket_connect(td->td_ucred, so, sa); if (error) goto bad; #endif ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#51 (text+ko) ==== @@ -549,14 +549,6 @@ * Access control checks. */ static int -mac_none_check_bind_socket(struct ucred *cred, struct socket *socket, - struct label *socketlabel, struct sockaddr *sockaddr) -{ - - return (0); -} - -static int mac_none_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, struct ifnet *ifnet, struct label *ifnet_label) { @@ -580,7 +572,15 @@ } static int -mac_none_check_connect_socket(struct ucred *cred, struct socket *socket, +mac_none_check_socket_bind(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + return (0); +} + +static int +mac_none_check_socket_connect(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -588,6 +588,14 @@ } static int +mac_none_check_socket_listen(struct ucred *cred, struct vnode *vp, + struct label *socketlabel) +{ + + return (0); +} + +static int mac_none_check_socket_receive(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { @@ -731,14 +739,6 @@ } static int -mac_none_check_listen_socket(struct ucred *cred, struct vnode *vp, - struct label *socketlabel) -{ - - return (0); -} - -static int mac_none_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -1016,16 +1016,18 @@ (macop_t)mac_none_create_proc1 }, { MAC_RELABEL_SUBJECT, (macop_t)mac_none_relabel_subject }, - { MAC_CHECK_BIND_SOCKET, - (macop_t)mac_none_check_bind_socket }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_none_check_bpfdesc_receive }, { MAC_CHECK_CRED_VISIBLE, (macop_t)mac_none_check_cred_visible }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_none_check_ifnet_transmit }, - { MAC_CHECK_CONNECT_SOCKET, - (macop_t)mac_none_check_connect_socket }, + { MAC_CHECK_SOCKET_BIND, + (macop_t)mac_none_check_socket_bind }, + { MAC_CHECK_SOCKET_CONNECT, + (macop_t)mac_none_check_socket_connect }, + { MAC_CHECK_SOCKET_LISTEN, + (macop_t)mac_none_check_socket_listen }, { MAC_CHECK_SOCKET_RECEIVE, (macop_t)mac_none_check_socket_receive }, { MAC_CHECK_SOCKET_VISIBLE, @@ -1062,8 +1064,6 @@ (macop_t)mac_none_check_getacl_vnode }, { MAC_CHECK_GETEXTATTR_VNODE, (macop_t)mac_none_check_getextattr_vnode }, - { MAC_CHECK_LISTEN_SOCKET, - (macop_t)mac_none_check_listen_socket }, { MAC_CHECK_LOOKUP_VNODE, (macop_t)mac_none_check_lookup_vnode }, { MAC_CHECK_OPEN_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#56 (text+ko) ==== @@ -660,18 +660,6 @@ } static int -mac_te_check_bind_socket(struct ucred *cred, struct socket *socket, - struct label *socketlabel, struct sockaddr *sockaddr) -{ - - if (!mac_te_enabled) - return (0); - - return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), - MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_BIND)); -} - -static int mac_te_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel) { @@ -706,7 +694,19 @@ } static int -mac_te_check_connect_socket(struct ucred *cred, struct socket *socket, +mac_te_check_socket_bind(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) +{ + + if (!mac_te_enabled) + return (0); + + return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), + MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_BIND)); +} + +static int +mac_te_check_socket_connect(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -718,7 +718,7 @@ } static int -mac_te_check_listen_socket(struct ucred *cred, struct socket *socket, +mac_te_check_socket_listen(struct ucred *cred, struct socket *socket, struct label *socketlabel) { @@ -1742,17 +1742,18 @@ { MAC_CREATE_PROC1, (macop_t)mac_te_create_proc1 }, { MAC_RELABEL_SUBJECT, (macop_t)mac_te_relabel_subject }, { MAC_RELABEL_VNODE, (macop_t)mac_te_relabel_vnode }, - { MAC_CHECK_BIND_SOCKET, (macop_t)mac_te_check_bind_socket }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_te_check_bpfdesc_receive }, { MAC_CHECK_CRED_VISIBLE, (macop_t)mac_te_check_cred_visible }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_te_check_ifnet_transmit }, - { MAC_CHECK_CONNECT_SOCKET, - (macop_t)mac_te_check_connect_socket }, - { MAC_CHECK_LISTEN_SOCKET, - (macop_t)mac_te_check_listen_socket }, + { MAC_CHECK_SOCKET_BIND, + (macop_t)mac_te_check_socket_bind }, + { MAC_CHECK_SOCKET_CONNECT, + (macop_t)mac_te_check_socket_connect }, + { MAC_CHECK_SOCKET_LISTEN, + (macop_t)mac_te_check_socket_listen }, { MAC_CHECK_SOCKET_RECEIVE, (macop_t)mac_te_check_socket_receive }, { MAC_CHECK_SOCKET_VISIBLE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#21 (text+ko) ==== @@ -757,38 +757,46 @@ * Access control checks. */ static int -mac_test_check_bind_socket(struct ucred *cred, struct socket *socket, - struct label *socketlabel, struct sockaddr *sockaddr) +mac_test_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, + struct ifnet *ifnet, struct label *ifnetlabel) +{ + + return (0); +} + +static int +mac_test_check_cred_visible(struct ucred *u1, struct ucred *u2) { return (0); } static int -mac_test_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, - struct ifnet *ifnet, struct label *ifnetlabel) +mac_test_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *m, struct label *mbuflabel) { return (0); } static int -mac_test_check_cred_visible(struct ucred *u1, struct ucred *u2) +mac_test_check_socket_bind(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) { return (0); } static int -mac_test_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, - struct mbuf *m, struct label *mbuflabel) +mac_test_check_socket_connect(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) { return (0); } static int -mac_test_check_connect_socket(struct ucred *cred, struct socket *socket, +mac_test_check_socket_listen(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -955,14 +963,6 @@ } static int -mac_test_check_listen_socket(struct ucred *cred, struct socket *socket, - struct label *socketlabel, struct sockaddr *sockaddr) -{ - - return (0); -} - -static int mac_test_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -1222,16 +1222,18 @@ (macop_t)mac_test_create_proc1 }, { MAC_RELABEL_SUBJECT, (macop_t)mac_test_relabel_subject }, - { MAC_CHECK_BIND_SOCKET, - (macop_t)mac_test_check_bind_socket }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_test_check_bpfdesc_receive }, { MAC_CHECK_CRED_VISIBLE, (macop_t)mac_test_check_cred_visible }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_test_check_ifnet_transmit }, - { MAC_CHECK_CONNECT_SOCKET, - (macop_t)mac_test_check_connect_socket }, + { MAC_CHECK_SOCKET_BIND, + (macop_t)mac_test_check_socket_bind }, + { MAC_CHECK_SOCKET_CONNECT, + (macop_t)mac_test_check_socket_connect }, + { MAC_CHECK_SOCKET_LISTEN, + (macop_t)mac_test_check_socket_listen }, { MAC_CHECK_SOCKET_RECEIVE, (macop_t)mac_test_check_socket_receive }, { MAC_CHECK_SOCKET_VISIBLE, @@ -1268,8 +1270,6 @@ (macop_t)mac_test_check_getacl_vnode }, { MAC_CHECK_GETEXTATTR_VNODE, (macop_t)mac_test_check_getextattr_vnode }, - { MAC_CHECK_LISTEN_SOCKET, - (macop_t)mac_test_check_listen_socket }, { MAC_CHECK_LOOKUP_VNODE, (macop_t)mac_test_check_lookup_vnode }, { MAC_CHECK_OPEN_VNODE, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#127 (text+ko) ==== @@ -259,13 +259,9 @@ /* Authorizational event hooks. */ int mac_check_access_vnode(struct ucred *cred, struct vnode *vp, int flags); -int mac_check_bind_socket(struct ucred *cred, struct socket *so, - struct sockaddr *sa); int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); int mac_check_chdir_vnode(struct ucred *cred, struct vnode *dvp); int mac_check_chroot_vnode(struct ucred *cred, struct vnode *dvp); -int mac_check_connect_socket(struct ucred *cred, struct socket *so, - struct sockaddr *sa); int mac_check_create_vnode(struct ucred *cred, struct vnode *dvp, struct componentname *cnp, struct vattr *vap); int mac_check_deleteacl_vnode(struct ucred *cred, struct vnode *vp, @@ -274,8 +270,6 @@ acl_type_t type); int mac_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio); -int mac_check_listen_socket(struct ucred *cred, - struct socket *socket); int mac_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, struct componentname *cnp); int mac_check_setacl_vnode(struct ucred *cred, struct vnode *vp, @@ -371,6 +365,12 @@ void mac_update_ipq_from_fragment(struct mbuf *fragment, struct ipq *ipq); int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m); + +int mac_check_socket_bind(struct ucred *cred, struct socket *so, + struct sockaddr *sockaddr); +int mac_check_socket_connect(struct ucred *cred, struct socket *so, + struct sockaddr *sockaddr); +int mac_check_socket_listen(struct ucred *cred, struct socket *so); int mac_check_socket_receive(struct socket *so, struct mbuf *m); /* Hooks for the proc-based "can"-checks. */ ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#92 (text+ko) ==== @@ -228,9 +228,6 @@ /* * Access control checks. */ - int (*mpo_check_bind_socket)(struct ucred *cred, - struct socket *socket, struct label *socketlabel, - struct sockaddr *sockaddr); int (*mpo_check_bpfdesc_receive)(struct bpf_d *bpf_d, struct label *bpflabel, struct ifnet *ifnet, struct label *ifnetlabel); @@ -238,9 +235,14 @@ int (*mpo_check_ifnet_transmit)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel); - int (*mpo_check_connect_socket)(struct ucred *cred, - struct socket *socket, struct label *socketlabel, + int (*mpo_check_socket_bind)(struct ucred *cred, + struct socket *so, struct label *socketlabel, + struct sockaddr *sockaddr); + int (*mpo_check_socket_connect)(struct ucred *cred, + struct socket *so, struct label *socketlabel, struct sockaddr *sockaddr); + int (*mpo_check_socket_listen)(struct ucred *cred, + struct socket *so, struct label *socketlabel); int (*mpo_check_socket_receive)(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel); @@ -285,8 +287,6 @@ int (*mpo_check_getextattr_vnode)(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio); - int (*mpo_check_listen_socket)(struct ucred *cred, - struct socket *socket, struct label *socketlabel); int (*mpo_check_lookup_vnode)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp); @@ -411,10 +411,12 @@ MAC_CREATE_PROC0, MAC_CREATE_PROC1, MAC_RELABEL_SUBJECT, - MAC_CHECK_BIND_SOCKET, MAC_CHECK_BPFDESC_RECEIVE, MAC_CHECK_CRED_VISIBLE, MAC_CHECK_IFNET_TRANSMIT, + MAC_CHECK_SOCKET_BIND, + MAC_CHECK_SOCKET_CONNECT, + MAC_CHECK_SOCKET_LISTEN, MAC_CHECK_SOCKET_RECEIVE, MAC_CHECK_SOCKET_VISIBLE, MAC_CHECK_RELABEL_IFNET, @@ -427,14 +429,12 @@ MAC_CHECK_ACCESS_VNODE, MAC_CHECK_CHDIR_VNODE, MAC_CHECK_CHROOT_VNODE, - MAC_CHECK_CONNECT_SOCKET, MAC_CHECK_CREATE_VNODE, MAC_CHECK_DELETE_VNODE, MAC_CHECK_DELETEACL_VNODE, MAC_CHECK_EXEC_VNODE, MAC_CHECK_GETACL_VNODE, MAC_CHECK_GETEXTATTR_VNODE, - MAC_CHECK_LISTEN_SOCKET, MAC_CHECK_LOOKUP_VNODE, MAC_CHECK_OPEN_VNODE, MAC_CHECK_READDIR_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 9:44:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7168F37B406; Sun, 28 Jul 2002 09:43:47 -0700 (PDT) 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 2336637B400 for ; Sun, 28 Jul 2002 09:43:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04FFA43E5E for ; Sun, 28 Jul 2002 09:43:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6SGhjJU046818 for ; Sun, 28 Jul 2002 09:43:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6SGhjBH046815 for perforce@freebsd.org; Sun, 28 Jul 2002 09:43:45 -0700 (PDT) Date: Sun, 28 Jul 2002 09:43:45 -0700 (PDT) Message-Id: <200207281643.g6SGhjBH046815@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15058 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15058 Change 15058 by rwatson@rwatson_paprika on 2002/07/28 09:43:26 Rename inter-process authorization entry points to match the mac_check_obj_method naming standard. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#200 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#24 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#76 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#65 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#52 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#8 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#13 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#57 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#22 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#128 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#93 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#200 (text+ko) ==== @@ -662,6 +662,18 @@ mpc->mpc_ops->mpo_check_ifnet_transmit = mpe->mpe_function; break; + case MAC_CHECK_PROC_DEBUG: + mpc->mpc_ops->mpo_check_proc_debug = + mpe->mpe_function; + break; + case MAC_CHECK_PROC_SCHED: + mpc->mpc_ops->mpo_check_proc_sched = + mpe->mpe_function; + break; + case MAC_CHECK_PROC_SIGNAL: + mpc->mpc_ops->mpo_check_proc_signal = + mpe->mpe_function; + break; case MAC_CHECK_SOCKET_BIND: mpc->mpc_ops->mpo_check_socket_bind = mpe->mpe_function; @@ -705,10 +717,6 @@ case MAC_CHECK_STATFS: mpc->mpc_ops->mpo_check_statfs = mpe->mpe_function; break; - case MAC_CHECK_DEBUG_PROC: - mpc->mpc_ops->mpo_check_debug_proc = - mpe->mpe_function; - break; case MAC_CHECK_ACCESS_VNODE: mpc->mpc_ops->mpo_check_access_vnode = mpe->mpe_function; @@ -797,14 +805,6 @@ mpc->mpc_ops->mpo_check_setutimes_vnode = mpe->mpe_function; break; - case MAC_CHECK_SCHED_PROC: - mpc->mpc_ops->mpo_check_sched_proc = - mpe->mpe_function; - break; - case MAC_CHECK_SIGNAL_PROC: - mpc->mpc_ops->mpo_check_signal_proc = - mpe->mpe_function; - break; case MAC_CHECK_STAT_VNODE: mpc->mpc_ops->mpo_check_stat_vnode = mpe->mpe_function; @@ -1040,45 +1040,6 @@ return (error2); } -int -mac_cred_cansignal(struct ucred *cred, struct proc *proc, int signum) -{ - int error; - - if (!mac_enforce_process) - return (0); - - MAC_CHECK(check_signal_proc, cred, proc, signum); - - return (error); -} - -int -mac_cred_cansched(struct ucred *cred, struct proc *proc) -{ - int error; - - if (!mac_enforce_process) - return (0); - - MAC_CHECK(check_sched_proc, cred, proc); - - return (error); -} - -int -mac_cred_candebug(struct ucred *cred, struct proc *proc) -{ - int error; - - if (!mac_enforce_process) - return (0); - - MAC_CHECK(check_debug_proc, cred, proc); - - return (error); -} - void mac_update_devfsdirent_from_vnode(struct devfs_dirent *de, struct vnode *vp) { @@ -2493,6 +2454,45 @@ } int +mac_check_proc_debug(struct ucred *cred, struct proc *proc) +{ + int error; + + if (!mac_enforce_process) + return (0); + + MAC_CHECK(check_proc_debug, cred, proc); + + return (error); +} + +int +mac_check_proc_sched(struct ucred *cred, struct proc *proc) +{ + int error; + + if (!mac_enforce_process) + return (0); + + MAC_CHECK(check_proc_sched, cred, proc); + + return (error); +} + +int +mac_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) +{ + int error; + + if (!mac_enforce_process) + return (0); + + MAC_CHECK(check_proc_signal, cred, proc, signum); + + return (error); +} + +int mac_check_socket_bind(struct ucred *ucred, struct socket *socket, struct sockaddr *sockaddr) { ==== //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#24 (text+ko) ==== @@ -1429,7 +1429,7 @@ return (error); #ifdef MAC - if ((error = mac_cred_cansignal(cred, proc, signum))) + if ((error = mac_check_proc_signal(cred, proc, signum))) return (error); #endif @@ -1531,7 +1531,7 @@ if ((error = prison_check(td->td_ucred, p->p_ucred))) return (error); #ifdef MAC - if ((error = mac_cred_cansched(td->td_ucred, p))) + if ((error = mac_check_proc_sched(td->td_ucred, p))) return (error); #endif if ((error = cr_seeotheruids(td->td_ucred, p->p_ucred))) @@ -1595,7 +1595,7 @@ return (error); #ifdef MAC - error = mac_cred_candebug(td->td_ucred, p); + error = mac_check_proc_debug(td->td_ucred, p); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#76 (text+ko) ==== @@ -1199,6 +1199,66 @@ } static int +mac_biba_check_proc_debug(struct ucred *cred, struct proc *proc) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(&proc->p_ucred->cr_label); + + /* XXX: range checks */ + if (!mac_biba_dominate_single(obj, subj)) + return (ESRCH); + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int +mac_biba_check_proc_sched(struct ucred *cred, struct proc *proc) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(&proc->p_ucred->cr_label); + + /* XXX: range checks */ + if (!mac_biba_dominate_single(obj, subj)) + return (ESRCH); + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int +mac_biba_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(&proc->p_ucred->cr_label); + + /* XXX: range checks */ + if (!mac_biba_dominate_single(obj, subj)) + return (ESRCH); + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_biba_check_socket_receive(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { @@ -1422,26 +1482,6 @@ } static int -mac_biba_check_debug_proc(struct ucred *cred, struct proc *proc) -{ - struct mac_biba *subj, *obj; - - if (!mac_biba_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(&proc->p_ucred->cr_label); - - /* XXX: range checks */ - if (!mac_biba_dominate_single(obj, subj)) - return (ESRCH); - if (!mac_biba_dominate_single(subj, obj)) - return (EACCES); - - return (0); -} - -static int mac_biba_check_access_vnode(struct ucred *cred, struct vnode *vp, struct label *label, mode_t flags) { @@ -1858,46 +1898,6 @@ } static int -mac_biba_check_sched_proc(struct ucred *cred, struct proc *proc) -{ - struct mac_biba *subj, *obj; - - if (!mac_biba_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(&proc->p_ucred->cr_label); - - /* XXX: range checks */ - if (!mac_biba_dominate_single(obj, subj)) - return (ESRCH); - if (!mac_biba_dominate_single(subj, obj)) - return (EACCES); - - return (0); -} - -static int -mac_biba_check_signal_proc(struct ucred *cred, struct proc *proc, int signum) -{ - struct mac_biba *subj, *obj; - - if (!mac_biba_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(&proc->p_ucred->cr_label); - - /* XXX: range checks */ - if (!mac_biba_dominate_single(obj, subj)) - return (ESRCH); - if (!mac_biba_dominate_single(subj, obj)) - return (EACCES); - - return (0); -} - -static int mac_biba_check_stat_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { @@ -2146,6 +2146,12 @@ (macop_t)mac_biba_check_cred_visible }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_biba_check_ifnet_transmit }, + { MAC_CHECK_PROC_DEBUG, + (macop_t)mac_biba_check_proc_debug }, + { MAC_CHECK_PROC_SCHED, + (macop_t)mac_biba_check_proc_sched }, + { MAC_CHECK_PROC_SIGNAL, + (macop_t)mac_biba_check_proc_signal }, { MAC_CHECK_SOCKET_RECEIVE, (macop_t)mac_biba_check_socket_receive }, { MAC_CHECK_SOCKET_VISIBLE, @@ -2162,8 +2168,6 @@ (macop_t)mac_biba_check_relabel_vnode }, { MAC_CHECK_STATFS, (macop_t)mac_biba_check_statfs }, - { MAC_CHECK_DEBUG_PROC, - (macop_t)mac_biba_check_debug_proc }, { MAC_CHECK_ACCESS_VNODE, (macop_t)mac_biba_check_access_vnode }, { MAC_CHECK_CHDIR_VNODE, @@ -2212,10 +2216,6 @@ (macop_t)mac_biba_check_setowner_vnode }, { MAC_CHECK_SETUTIMES_VNODE, (macop_t)mac_biba_check_setutimes_vnode }, - { MAC_CHECK_SCHED_PROC, - (macop_t)mac_biba_check_sched_proc }, - { MAC_CHECK_SIGNAL_PROC, - (macop_t)mac_biba_check_signal_proc }, { MAC_CHECK_STAT_VNODE, (macop_t)mac_biba_check_stat_vnode }, { MAC_CHECK_VNODE_MMAP_PERMS, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#65 (text+ko) ==== @@ -1160,6 +1160,66 @@ } static int +mac_mls_check_proc_debug(struct ucred *cred, struct proc *proc) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(&proc->p_ucred->cr_label); + + /* XXX: range checks */ + if (!mac_mls_dominate_single(subj, obj)) + return (ESRCH); + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int +mac_mls_check_proc_sched(struct ucred *cred, struct proc *proc) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(&proc->p_ucred->cr_label); + + /* XXX: range checks */ + if (!mac_mls_dominate_single(subj, obj)) + return (ESRCH); + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int +mac_mls_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(&proc->p_ucred->cr_label); + + /* XXX: range checks */ + if (!mac_mls_dominate_single(subj, obj)) + return (ESRCH); + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int mac_mls_check_socket_receive(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { @@ -1368,26 +1428,6 @@ } static int -mac_mls_check_debug_proc(struct ucred *cred, struct proc *proc) -{ - struct mac_mls *subj, *obj; - - if (!mac_mls_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(&proc->p_ucred->cr_label); - - /* XXX: range checks */ - if (!mac_mls_dominate_single(subj, obj)) - return (ESRCH); - if (!mac_mls_dominate_single(obj, subj)) - return (EACCES); - - return (0); -} - -static int mac_mls_check_access_vnode(struct ucred *cred, struct vnode *vp, struct label *label, mode_t flags) { @@ -1804,46 +1844,6 @@ } static int -mac_mls_check_sched_proc(struct ucred *cred, struct proc *proc) -{ - struct mac_mls *subj, *obj; - - if (!mac_mls_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(&proc->p_ucred->cr_label); - - /* XXX: range checks */ - if (!mac_mls_dominate_single(subj, obj)) - return (ESRCH); - if (!mac_mls_dominate_single(obj, subj)) - return (EACCES); - - return (0); -} - -static int -mac_mls_check_signal_proc(struct ucred *cred, struct proc *proc, int signum) -{ - struct mac_mls *subj, *obj; - - if (!mac_mls_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(&proc->p_ucred->cr_label); - - /* XXX: range checks */ - if (!mac_mls_dominate_single(subj, obj)) - return (ESRCH); - if (!mac_mls_dominate_single(obj, subj)) - return (EACCES); - - return (0); -} - -static int mac_mls_check_stat_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { @@ -2092,6 +2092,12 @@ (macop_t)mac_mls_check_cred_visible }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_mls_check_ifnet_transmit }, + { MAC_CHECK_PROC_DEBUG, + (macop_t)mac_mls_check_proc_debug }, + { MAC_CHECK_PROC_SCHED, + (macop_t)mac_mls_check_proc_sched }, + { MAC_CHECK_PROC_SIGNAL, + (macop_t)mac_mls_check_proc_signal }, { MAC_CHECK_SOCKET_RECEIVE, (macop_t)mac_mls_check_socket_receive }, { MAC_CHECK_SOCKET_VISIBLE, @@ -2108,8 +2114,6 @@ (macop_t)mac_mls_check_relabel_vnode }, { MAC_CHECK_STATFS, (macop_t)mac_mls_check_statfs }, - { MAC_CHECK_DEBUG_PROC, - (macop_t)mac_mls_check_debug_proc }, { MAC_CHECK_ACCESS_VNODE, (macop_t)mac_mls_check_access_vnode }, { MAC_CHECK_CHDIR_VNODE, @@ -2158,10 +2162,6 @@ (macop_t)mac_mls_check_setowner_vnode }, { MAC_CHECK_SETUTIMES_VNODE, (macop_t)mac_mls_check_setutimes_vnode }, - { MAC_CHECK_SCHED_PROC, - (macop_t)mac_mls_check_sched_proc }, - { MAC_CHECK_SIGNAL_PROC, - (macop_t)mac_mls_check_signal_proc }, { MAC_CHECK_STAT_VNODE, (macop_t)mac_mls_check_stat_vnode }, { MAC_CHECK_VNODE_MMAP_PERMS, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#52 (text+ko) ==== @@ -572,6 +572,27 @@ } static int +mac_none_check_proc_debug(struct ucred *cred, struct proc *proc) +{ + + return (0); +} + +static int +mac_none_check_proc_sched(struct ucred *cred, struct proc *proc) +{ + + return (0); +} + +static int +mac_none_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) +{ + + return (0); +} + +static int mac_none_check_socket_bind(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -659,13 +680,6 @@ } static int -mac_none_check_debug_proc(struct ucred *cred, struct proc *proc) -{ - - return (0); -} - -static int mac_none_check_access_vnode(struct ucred *cred, struct vnode *vp, struct label *label, mode_t flags) { @@ -845,20 +859,6 @@ } static int -mac_none_check_sched_proc(struct ucred *cred, struct proc *proc) -{ - - return (0); -} - -static int -mac_none_check_signal_proc(struct ucred *cred, struct proc *proc, int signum) -{ - - return (0); -} - -static int mac_none_check_stat_vnode(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -1022,6 +1022,12 @@ (macop_t)mac_none_check_cred_visible }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_none_check_ifnet_transmit }, + { MAC_CHECK_PROC_DEBUG, + (macop_t)mac_none_check_proc_debug }, + { MAC_CHECK_PROC_SCHED, + (macop_t)mac_none_check_proc_sched }, + { MAC_CHECK_PROC_SIGNAL, + (macop_t)mac_none_check_proc_signal }, { MAC_CHECK_SOCKET_BIND, (macop_t)mac_none_check_socket_bind }, { MAC_CHECK_SOCKET_CONNECT, @@ -1044,8 +1050,6 @@ (macop_t)mac_none_check_relabel_vnode }, { MAC_CHECK_STATFS, (macop_t)mac_none_check_statfs }, - { MAC_CHECK_DEBUG_PROC, - (macop_t)mac_none_check_debug_proc }, { MAC_CHECK_ACCESS_VNODE, (macop_t)mac_none_check_access_vnode }, { MAC_CHECK_CHDIR_VNODE, @@ -1090,10 +1094,6 @@ (macop_t)mac_none_check_setowner_vnode }, { MAC_CHECK_SETUTIMES_VNODE, (macop_t)mac_none_check_setutimes_vnode }, - { MAC_CHECK_SCHED_PROC, - (macop_t)mac_none_check_sched_proc }, - { MAC_CHECK_SIGNAL_PROC, - (macop_t)mac_none_check_signal_proc }, { MAC_CHECK_STAT_VNODE, (macop_t)mac_none_check_stat_vnode }, { MAC_CHECK_PIPE_IOCTL, ==== //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#8 (text+ko) ==== @@ -198,30 +198,28 @@ } static int -mac_partition_check_socket_visible(struct ucred *cred, struct socket *socket, - struct label *socketlabel) +mac_partition_check_proc_debug(struct ucred *cred, struct proc *proc) { int error; - error = label_on_label(&cred->cr_label, socketlabel); + error = label_on_label(&cred->cr_label, &proc->p_ucred->cr_label); - return (error ? ENOENT : 0); + return (error ? ESRCH : 0); } static int -mac_partition_check_relabel_subject(struct ucred *cred, struct mac *newlabel) +mac_partition_check_proc_sched(struct ucred *cred, struct proc *proc) { + int error; - /* If in a partition, can't re-partition. */ - if (SLOT(&cred->cr_label) != 0) - return (EPERM); + error = label_on_label(&cred->cr_label, &proc->p_ucred->cr_label); - /* If not in a partition, must have privilege */ - return (suser_cred(cred, 0)); + return (error ? ESRCH : 0); } static int -mac_partition_check_debug_proc(struct ucred *cred, struct proc *proc) +mac_partition_check_proc_signal(struct ucred *cred, struct proc *proc, + int signum) { int error; @@ -231,24 +229,26 @@ } static int -mac_partition_check_sched_proc(struct ucred *cred, struct proc *proc) +mac_partition_check_socket_visible(struct ucred *cred, struct socket *socket, + struct label *socketlabel) { int error; - error = label_on_label(&cred->cr_label, &proc->p_ucred->cr_label); + error = label_on_label(&cred->cr_label, socketlabel); - return (error ? ESRCH : 0); + return (error ? ENOENT : 0); } static int -mac_partition_check_signal_proc(struct ucred *cred, struct proc *proc, - int signum) +mac_partition_check_relabel_subject(struct ucred *cred, struct mac *newlabel) { - int error; - error = label_on_label(&cred->cr_label, &proc->p_ucred->cr_label); + /* If in a partition, can't re-partition. */ + if (SLOT(&cred->cr_label) != 0) + return (EPERM); - return (error ? ESRCH : 0); + /* If not in a partition, must have privilege */ + return (suser_cred(cred, 0)); } static struct mac_policy_op_entry mac_partition_ops[] = @@ -279,16 +279,16 @@ (macop_t)mac_partition_relabel_subject }, { MAC_CHECK_CRED_VISIBLE, (macop_t)mac_partition_check_cred_visible }, + { MAC_CHECK_PROC_DEBUG, + (macop_t)mac_partition_check_proc_debug }, + { MAC_CHECK_PROC_SCHED, + (macop_t)mac_partition_check_proc_sched }, + { MAC_CHECK_PROC_SIGNAL, + (macop_t)mac_partition_check_proc_signal }, { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_partition_check_socket_visible }, { MAC_CHECK_RELABEL_SUBJECT, (macop_t)mac_partition_check_relabel_subject }, - { MAC_CHECK_DEBUG_PROC, - (macop_t)mac_partition_check_debug_proc }, - { MAC_CHECK_SCHED_PROC, - (macop_t)mac_partition_check_sched_proc }, - { MAC_CHECK_SIGNAL_PROC, - (macop_t)mac_partition_check_signal_proc }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#13 (text+ko) ==== @@ -131,47 +131,47 @@ } static int -mac_seeotheruids_check_socket_visible(struct ucred *cred, struct socket *socket, - struct label *socketlabel) +mac_seeotheruids_check_proc_signal(struct ucred *cred, struct proc *proc, + int signum) { - return (mac_seeotheruids_check(cred, socket->so_cred)); + return (mac_seeotheruids_check(cred, proc->p_ucred)); } static int -mac_seeotheruids_check_signal_proc(struct ucred *cred, struct proc *proc, - int signum) +mac_seeotheruids_check_proc_sched(struct ucred *cred, struct proc *proc) { return (mac_seeotheruids_check(cred, proc->p_ucred)); } static int -mac_seeotheruids_check_sched_proc(struct ucred *cred, struct proc *proc) +mac_seeotheruids_check_proc_debug(struct ucred *cred, struct proc *proc) { return (mac_seeotheruids_check(cred, proc->p_ucred)); } static int -mac_seeotheruids_check_debug_proc(struct ucred *cred, struct proc *proc) +mac_seeotheruids_check_socket_visible(struct ucred *cred, struct socket *socket, + struct label *socketlabel) { - return (mac_seeotheruids_check(cred, proc->p_ucred)); + return (mac_seeotheruids_check(cred, socket->so_cred)); } static struct mac_policy_op_entry mac_seeotheruids_ops[] = { { MAC_CHECK_CRED_VISIBLE, (macop_t)mac_seeotheruids_check_cred_visible }, + { MAC_CHECK_PROC_DEBUG, + (macop_t)mac_seeotheruids_check_proc_debug }, + { MAC_CHECK_PROC_SCHED, + (macop_t)mac_seeotheruids_check_proc_sched }, + { MAC_CHECK_PROC_SIGNAL, + (macop_t)mac_seeotheruids_check_proc_signal }, { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_seeotheruids_check_socket_visible }, - { MAC_CHECK_DEBUG_PROC, - (macop_t)mac_seeotheruids_check_debug_proc }, - { MAC_CHECK_SCHED_PROC, - (macop_t)mac_seeotheruids_check_sched_proc }, - { MAC_CHECK_SIGNAL_PROC, - (macop_t)mac_seeotheruids_check_signal_proc }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#57 (text+ko) ==== @@ -694,6 +694,33 @@ } static int +mac_te_check_proc_debug(struct ucred *cred, struct proc *proc) +{ + + return (mac_te_check(SLOT(&cred->cr_label), + SLOT(&proc->p_ucred->cr_label), MAC_TE_CLASS_PROC, + MAC_TE_OPERATION_PROC_DEBUG)); +} + +static int +mac_te_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) +{ + + return (mac_te_check(SLOT(&cred->cr_label), + SLOT(&proc->p_ucred->cr_label), MAC_TE_CLASS_PROC, + MAC_TE_OPERATION_PROC_SIGNAL)); +} + +static int +mac_te_check_proc_sched(struct ucred *cred, struct proc *proc) +{ + + return (mac_te_check(SLOT(&cred->cr_label), + SLOT(&proc->p_ucred->cr_label), MAC_TE_CLASS_PROC, + MAC_TE_OPERATION_PROC_SCHED)); +} + +static int mac_te_check_socket_bind(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -1144,33 +1171,6 @@ } static int -mac_te_check_signal_proc(struct ucred *cred, struct proc *proc, int signum) -{ - - return (mac_te_check(SLOT(&cred->cr_label), - SLOT(&proc->p_ucred->cr_label), MAC_TE_CLASS_PROC, - MAC_TE_OPERATION_PROC_SIGNAL)); -} - -static int -mac_te_check_sched_proc(struct ucred *cred, struct proc *proc) -{ - - return (mac_te_check(SLOT(&cred->cr_label), - SLOT(&proc->p_ucred->cr_label), MAC_TE_CLASS_PROC, - MAC_TE_OPERATION_PROC_SCHED)); -} - -static int -mac_te_check_debug_proc(struct ucred *cred, struct proc *proc) -{ - - return (mac_te_check(SLOT(&cred->cr_label), - SLOT(&proc->p_ucred->cr_label), MAC_TE_CLASS_PROC, - MAC_TE_OPERATION_PROC_DEBUG)); -} - -static int mac_te_check_exec_vnode(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -1748,6 +1748,12 @@ (macop_t)mac_te_check_cred_visible }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_te_check_ifnet_transmit }, + { MAC_CHECK_PROC_DEBUG, + (macop_t)mac_te_check_proc_debug }, + { MAC_CHECK_PROC_SCHED, + (macop_t)mac_te_check_proc_sched }, + { MAC_CHECK_PROC_SIGNAL, + (macop_t)mac_te_check_proc_signal }, { MAC_CHECK_SOCKET_BIND, (macop_t)mac_te_check_socket_bind }, { MAC_CHECK_SOCKET_CONNECT, @@ -1769,7 +1775,6 @@ { MAC_CHECK_RELABEL_VNODE, (macop_t)mac_te_check_relabel_vnode }, { MAC_CHECK_STATFS, (macop_t)mac_te_check_statfs }, - { MAC_CHECK_DEBUG_PROC, (macop_t)mac_te_check_debug_proc }, { MAC_CHECK_ACCESS_VNODE, (macop_t)mac_te_check_access_vnode }, { MAC_CHECK_CHDIR_VNODE, (macop_t)mac_te_check_chdir_vnode }, @@ -1816,8 +1821,6 @@ (macop_t)mac_te_check_pipe_ioctl }, { MAC_CHECK_PIPE_OP, (macop_t)mac_te_check_pipe_op }, - { MAC_CHECK_SCHED_PROC, (macop_t)mac_te_check_sched_proc }, - { MAC_CHECK_SIGNAL_PROC, (macop_t)mac_te_check_signal_proc }, { MAC_CHECK_STAT_VNODE, (macop_t)mac_te_check_stat_vnode }, { MAC_CHECK_VNODE_MMAP_PERMS, (macop_t)mac_te_check_vnode_mmap_perms }, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#22 (text+ko) ==== @@ -780,6 +780,27 @@ } static int +mac_test_check_proc_debug(struct ucred *cred, struct proc *proc) +{ + + return (0); +} + +static int +mac_test_check_proc_sched(struct ucred *cred, struct proc *proc) +{ + + return (0); +} + +static int +mac_test_check_proc_signal(struct ucred *cred, struct proc *proc) +{ + + return (0); +} + +static int mac_test_check_socket_bind(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { @@ -883,13 +904,6 @@ } static int -mac_test_check_debug_proc(struct ucred *cred, struct proc *proc) -{ - - return (0); -} - -static int mac_test_check_access_vnode(struct ucred *cred, struct vnode *vp, struct label *label, mode_t flags) { @@ -1069,20 +1083,6 @@ } static int -mac_test_check_sched_proc(struct ucred *cred, struct proc *proc) -{ - - return (0); -} - -static int -mac_test_check_signal_proc(struct ucred *cred, struct proc *proc, int signum) -{ - - return (0); -} - -static int mac_test_check_stat_vnode(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -1228,6 +1228,12 @@ (macop_t)mac_test_check_cred_visible }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_test_check_ifnet_transmit }, + { MAC_CHECK_PROC_DEBUG, + (macop_t)mac_test_check_proc_debug }, + { MAC_CHECK_PROC_SCHED, + (macop_t)mac_test_check_proc_sched }, + { MAC_CHECK_PROC_SIGNAL, + (macop_t)mac_test_check_proc_signal }, { MAC_CHECK_SOCKET_BIND, (macop_t)mac_test_check_socket_bind }, { MAC_CHECK_SOCKET_CONNECT, @@ -1250,8 +1256,6 @@ (macop_t)mac_test_check_relabel_vnode }, { MAC_CHECK_STATFS, (macop_t)mac_test_check_statfs }, - { MAC_CHECK_DEBUG_PROC, - (macop_t)mac_test_check_debug_proc }, { MAC_CHECK_ACCESS_VNODE, (macop_t)mac_test_check_access_vnode }, { MAC_CHECK_CHDIR_VNODE, @@ -1296,10 +1300,6 @@ (macop_t)mac_test_check_setowner_vnode }, >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 9:44:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78FA037B401; Sun, 28 Jul 2002 09:44:48 -0700 (PDT) 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 18E7037B400 for ; Sun, 28 Jul 2002 09:44:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C849C43E4A for ; Sun, 28 Jul 2002 09:44:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6SGilJU046868 for ; Sun, 28 Jul 2002 09:44:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6SGilk6046865 for perforce@freebsd.org; Sun, 28 Jul 2002 09:44:47 -0700 (PDT) Date: Sun, 28 Jul 2002 09:44:47 -0700 (PDT) Message-Id: <200207281644.g6SGilk6046865@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15059 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15059 Change 15059 by rwatson@rwatson_paprika on 2002/07/28 09:44:45 Move mac_biba_check_ifnet_transmit() to a more logical point in the file. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#77 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#77 (text+ko) ==== @@ -1198,6 +1198,21 @@ return (0); } +static int +mac_biba_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *m, struct label *mbuflabel) +{ + struct mac_biba *p, *i; + + if (!mac_biba_enabled) + return (0); + + p = SLOT(mbuflabel); + i = SLOT(ifnetlabel); + + return (mac_biba_single_in_range(p, i) ? 0 : EACCES); +} + static int mac_biba_check_proc_debug(struct ucred *cred, struct proc *proc) { @@ -1288,21 +1303,6 @@ return (0); } -static int -mac_biba_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, - struct mbuf *m, struct label *mbuflabel) -{ - struct mac_biba *p, *i; - - if (!mac_biba_enabled) - return (0); - - p = SLOT(mbuflabel); - i = SLOT(ifnetlabel); - - return (mac_biba_single_in_range(p, i) ? 0 : EACCES); -} - static int mac_biba_check_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, struct label *ifnetlabel, struct label *newlabel) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 12:41:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF28937B401; Sun, 28 Jul 2002 12:40:22 -0700 (PDT) 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 9587437B400 for ; Sun, 28 Jul 2002 12:40:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB35443E42 for ; Sun, 28 Jul 2002 12:40:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6SJeLJU075145 for ; Sun, 28 Jul 2002 12:40:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6SJeLAw075134 for perforce@freebsd.org; Sun, 28 Jul 2002 12:40:21 -0700 (PDT) Date: Sun, 28 Jul 2002 12:40:21 -0700 (PDT) Message-Id: <200207281940.g6SJeLAw075134@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15063 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15063 Change 15063 by rwatson@rwatson_paprika on 2002/07/28 12:39:59 Rename VNODE access control check entry points to fit the mac_check_object_method style. Affected files ... .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#8 edit .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#8 edit .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#14 edit .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#8 edit .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#11 edit .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_misc.c#7 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#13 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#20 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#24 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#201 edit .. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#7 edit .. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#19 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#20 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#64 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#31 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#78 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#47 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#66 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#53 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#58 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#23 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#16 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#129 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#94 edit .. //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#12 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#8 (text+ko) ==== @@ -331,7 +331,7 @@ /* * Do directory search MAC check using non-cached credentials. */ - if ((error = mac_check_readdir_vnode(td->td_proc->p_ucred, vp)) + if ((error = mac_check_vnode_readdir(td->td_proc->p_ucred, vp)) goto out; #endif /* MAC */ if ((error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, &ncookies, ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#8 (text+ko) ==== @@ -203,7 +203,7 @@ eofflag = 0; #ifdef MAC - error = mac_check_readdir_vnode(td->td_ucred, uvp); + error = mac_check_vnode_readdir(td->td_ucred, uvp); if (error == 0) #endif /* MAC */ error = VOP_READDIR(uvp, &uio, td->td_ucred, &eofflag, ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#14 (text+ko) ==== @@ -308,7 +308,7 @@ * from vn_open(). */ #ifdef MAC - error = mac_check_open_vnode(td->td_ucred, vp, FREAD); + error = mac_check_vnode_open(td->td_ucred, vp, FREAD); if (error) goto cleanup; #endif ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#8 (text+ko) ==== @@ -266,7 +266,7 @@ #ifdef MAC vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = mac_check_revoke_vnode(td->td_ucred, vp); + error = mac_check_vnode_revoke(td->td_ucred, vp); VOP_UNLOCK(vp, 0, td); if (error) goto out; ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#11 (text+ko) ==== @@ -316,7 +316,7 @@ #ifdef MAC /* Use process's credentials to check directory search MAC. */ - error = mac_check_readdir_vnode(td->td_proc->p_ucred, vp); + error = mac_check_vnode_readdir(td->td_proc->p_ucred, vp); if (error) goto out; #endif /* MAC */ @@ -479,7 +479,7 @@ */ #ifdef MAC /* Use process's credentials to check directory search MAC. */ - error = mac_check_readdir_vnode(td->td_proc->p_ucred, vp); + error = mac_check_vnode_readdir(td->td_proc->p_ucred, vp); if (error) goto out; #endif /* MAC */ ==== //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_misc.c#7 (text+ko) ==== @@ -352,7 +352,7 @@ } #ifdef MAC - error = mac_check_readdir_vnode(td->td_proc->p_ucred, vp); + error = mac_check_vnode_readdir(td->td_proc->p_ucred, vp); if (error) goto out; #endif /* MAC */ @@ -512,7 +512,7 @@ } #ifdef MAC - error = mac_check_readdir_vnode(td->td_proc->p_ucred, vp); + error = mac_check_vnode_readdir(td->td_proc->p_ucred, vp); if (error) goto out; #endif /* MAC */ ==== //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#13 (text+ko) ==== @@ -585,7 +585,7 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_setacl_vnode(td->td_ucred, vp, type, &inkernacl); + error = mac_check_vnode_setacl(td->td_ucred, vp, type, &inkernacl); if (error != 0) goto out; #endif @@ -611,7 +611,7 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_getacl_vnode(td->td_ucred, vp, type); + error = mac_check_vnode_getacl(td->td_ucred, vp, type); if (error != 0) goto out; #endif @@ -640,7 +640,7 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_deleteacl_vnode(td->td_ucred, vp, type); + error = mac_check_vnode_deleteacl(td->td_ucred, vp, type); if (error) goto out; #endif ==== //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#20 (text+ko) ==== @@ -331,7 +331,7 @@ * to pass in both the old and the new flags, * with authorization performed only on the delta. */ - error = mac_check_open_vnode(td->td_ucred, + error = mac_check_vnode_open(td->td_ucred, (struct vnode *)fp->f_data, mode); VOP_UNLOCK((struct vnode *)fp->f_data, 0, td); if (error) { ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#24 (text+ko) ==== @@ -948,7 +948,7 @@ * that the label is retained for use later for MAC models that * support subject domain transitions at execve()-time. */ - error = mac_cred_canexec(curthread->td_ucred, imgp->vp); + error = mac_check_vnode_exec(curthread->td_ucred, imgp->vp); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#201 (text+ko) ==== @@ -342,7 +342,7 @@ continue; vp = (struct vnode *)object->handle; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - result = mac_check_mmap_vnode_prot(cred, vp, 0); + result = mac_check_vnode_mmap_prot(cred, vp, 0); VOP_UNLOCK(vp, 0, td); /* * Find out what maximum protection we may be allowing @@ -717,96 +717,96 @@ case MAC_CHECK_STATFS: mpc->mpc_ops->mpo_check_statfs = mpe->mpe_function; break; - case MAC_CHECK_ACCESS_VNODE: - mpc->mpc_ops->mpo_check_access_vnode = + case MAC_CHECK_VNODE_ACCESS: + mpc->mpc_ops->mpo_check_vnode_access = mpe->mpe_function; break; - case MAC_CHECK_CHDIR_VNODE: - mpc->mpc_ops->mpo_check_chdir_vnode = + case MAC_CHECK_VNODE_CHDIR: + mpc->mpc_ops->mpo_check_vnode_chdir = mpe->mpe_function; break; - case MAC_CHECK_CHROOT_VNODE: - mpc->mpc_ops->mpo_check_chroot_vnode = + case MAC_CHECK_VNODE_CHROOT: + mpc->mpc_ops->mpo_check_vnode_chroot = mpe->mpe_function; break; - case MAC_CHECK_CREATE_VNODE: - mpc->mpc_ops->mpo_check_create_vnode = + case MAC_CHECK_VNODE_CREATE: + mpc->mpc_ops->mpo_check_vnode_create = mpe->mpe_function; break; - case MAC_CHECK_DELETE_VNODE: - mpc->mpc_ops->mpo_check_delete_vnode = + case MAC_CHECK_VNODE_DELETE: + mpc->mpc_ops->mpo_check_vnode_delete = mpe->mpe_function; break; - case MAC_CHECK_DELETEACL_VNODE: - mpc->mpc_ops->mpo_check_deleteacl_vnode = + case MAC_CHECK_VNODE_DELETEACL: + mpc->mpc_ops->mpo_check_vnode_deleteacl = mpe->mpe_function; break; - case MAC_CHECK_EXEC_VNODE: - mpc->mpc_ops->mpo_check_exec_vnode = + case MAC_CHECK_VNODE_EXEC: + mpc->mpc_ops->mpo_check_vnode_exec = mpe->mpe_function; break; - case MAC_CHECK_GETACL_VNODE: - mpc->mpc_ops->mpo_check_getacl_vnode = + case MAC_CHECK_VNODE_GETACL: + mpc->mpc_ops->mpo_check_vnode_getacl = mpe->mpe_function; break; - case MAC_CHECK_GETEXTATTR_VNODE: - mpc->mpc_ops->mpo_check_getextattr_vnode = + case MAC_CHECK_VNODE_GETEXTATTR: + mpc->mpc_ops->mpo_check_vnode_getextattr = mpe->mpe_function; break; - case MAC_CHECK_LOOKUP_VNODE: - mpc->mpc_ops->mpo_check_lookup_vnode = + case MAC_CHECK_VNODE_LOOKUP: + mpc->mpc_ops->mpo_check_vnode_lookup = mpe->mpe_function; break; - case MAC_CHECK_OPEN_VNODE: - mpc->mpc_ops->mpo_check_open_vnode = + case MAC_CHECK_VNODE_OPEN: + mpc->mpc_ops->mpo_check_vnode_open = mpe->mpe_function; break; - case MAC_CHECK_READDIR_VNODE: - mpc->mpc_ops->mpo_check_readdir_vnode = + case MAC_CHECK_VNODE_READDIR: + mpc->mpc_ops->mpo_check_vnode_readdir = mpe->mpe_function; break; - case MAC_CHECK_READLINK_VNODE: - mpc->mpc_ops->mpo_check_readlink_vnode = + case MAC_CHECK_VNODE_READLINK: + mpc->mpc_ops->mpo_check_vnode_readlink = mpe->mpe_function; break; - case MAC_CHECK_RENAME_FROM_VNODE: - mpc->mpc_ops->mpo_check_rename_from_vnode = + case MAC_CHECK_VNODE_RENAME_FROM: + mpc->mpc_ops->mpo_check_vnode_rename_from = mpe->mpe_function; break; - case MAC_CHECK_RENAME_TO_VNODE: - mpc->mpc_ops->mpo_check_rename_to_vnode = + case MAC_CHECK_VNODE_RENAME_TO: + mpc->mpc_ops->mpo_check_vnode_rename_to = mpe->mpe_function; break; - case MAC_CHECK_REVOKE_VNODE: - mpc->mpc_ops->mpo_check_revoke_vnode = + case MAC_CHECK_VNODE_REVOKE: + mpc->mpc_ops->mpo_check_vnode_revoke = mpe->mpe_function; break; - case MAC_CHECK_SETACL_VNODE: - mpc->mpc_ops->mpo_check_setacl_vnode = + case MAC_CHECK_VNODE_SETACL: + mpc->mpc_ops->mpo_check_vnode_setacl = mpe->mpe_function; break; - case MAC_CHECK_SETEXTATTR_VNODE: - mpc->mpc_ops->mpo_check_setextattr_vnode = + case MAC_CHECK_VNODE_SETEXTATTR: + mpc->mpc_ops->mpo_check_vnode_setextattr = mpe->mpe_function; break; - case MAC_CHECK_SETFLAGS_VNODE: - mpc->mpc_ops->mpo_check_setflags_vnode = + case MAC_CHECK_VNODE_SETFLAGS: + mpc->mpc_ops->mpo_check_vnode_setflags = mpe->mpe_function; break; - case MAC_CHECK_SETMODE_VNODE: - mpc->mpc_ops->mpo_check_setmode_vnode = + case MAC_CHECK_VNODE_SETMODE: + mpc->mpc_ops->mpo_check_vnode_setmode = mpe->mpe_function; break; - case MAC_CHECK_SETOWNER_VNODE: - mpc->mpc_ops->mpo_check_setowner_vnode = + case MAC_CHECK_VNODE_SETOWNER: + mpc->mpc_ops->mpo_check_vnode_setowner = mpe->mpe_function; break; - case MAC_CHECK_SETUTIMES_VNODE: - mpc->mpc_ops->mpo_check_setutimes_vnode = + case MAC_CHECK_VNODE_SETUTIMES: + mpc->mpc_ops->mpo_check_vnode_setutimes = mpe->mpe_function; break; - case MAC_CHECK_STAT_VNODE: - mpc->mpc_ops->mpo_check_stat_vnode = + case MAC_CHECK_VNODE_STAT: + mpc->mpc_ops->mpo_check_vnode_stat = mpe->mpe_function; break; case MAC_CHECK_VNODE_MMAP_PERMS: @@ -1288,23 +1288,6 @@ return (0); } - -int -mac_cred_canexec(struct ucred *cred, struct vnode *vp) -{ - int error; - - if (!mac_enforce_process && !mac_enforce_fs) - return (0); - - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_exec_vnode, cred, vp, &vp->v_label); - - return (error); -} - void mac_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp) { @@ -1717,11 +1700,11 @@ } int -mac_check_access_vnode(struct ucred *cred, struct vnode *vp, int flags) +mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int flags) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_access_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_access"); if (!mac_enforce_fs) return (0); @@ -1730,16 +1713,16 @@ if (error) return (error); - MAC_CHECK(check_access_vnode, cred, vp, &vp->v_label, flags); + MAC_CHECK(check_vnode_access, cred, vp, &vp->v_label, flags); return (error); } int -mac_check_chdir_vnode(struct ucred *cred, struct vnode *dvp) +mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_check_chdir_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_chdir"); if (!mac_enforce_fs) return (0); @@ -1748,16 +1731,16 @@ if (error) return (error); - MAC_CHECK(check_chdir_vnode, cred, dvp, &dvp->v_label); + MAC_CHECK(check_vnode_chdir, cred, dvp, &dvp->v_label); return (error); } int -mac_check_chroot_vnode(struct ucred *cred, struct vnode *dvp) +mac_check_vnode_chroot(struct ucred *cred, struct vnode *dvp) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_check_chroot_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_chroot"); if (!mac_enforce_fs) return (0); @@ -1766,17 +1749,17 @@ if (error) return (error); - MAC_CHECK(check_chroot_vnode, cred, dvp, &dvp->v_label); + MAC_CHECK(check_vnode_chroot, cred, dvp, &dvp->v_label); return (error); } int -mac_check_create_vnode(struct ucred *cred, struct vnode *dvp, +mac_check_vnode_create(struct ucred *cred, struct vnode *dvp, struct componentname *cnp, struct vattr *vap) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_check_create_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_create"); if (!mac_enforce_fs) return (0); @@ -1785,16 +1768,32 @@ if (error) return (error); - MAC_CHECK(check_create_vnode, cred, dvp, &dvp->v_label, cnp, vap); + MAC_CHECK(check_vnode_create, cred, dvp, &dvp->v_label, cnp, vap); + return (error); +} + +int +mac_check_vnode_exec(struct ucred *cred, struct vnode *vp) +{ + int error; + + if (!mac_enforce_process && !mac_enforce_fs) + return (0); + + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + MAC_CHECK(check_vnode_exec, cred, vp, &vp->v_label); + return (error); } int -mac_check_getacl_vnode(struct ucred *cred, struct vnode *vp, acl_type_t type) +mac_check_vnode_getacl(struct ucred *cred, struct vnode *vp, acl_type_t type) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_getacl_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_getacl"); if (!mac_enforce_fs) return (0); @@ -1803,17 +1802,17 @@ if (error) return (error); - MAC_CHECK(check_getacl_vnode, cred, vp, &vp->v_label, type); + MAC_CHECK(check_vnode_getacl, cred, vp, &vp->v_label, type); return (error); } int -mac_check_getextattr_vnode(struct ucred *cred, struct vnode *vp, +mac_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_getextattr_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_getextattr"); if (!mac_enforce_fs) return (0); @@ -1822,18 +1821,18 @@ if (error) return (error); - MAC_CHECK(check_getextattr_vnode, cred, vp, &vp->v_label, + MAC_CHECK(check_vnode_getextattr, cred, vp, &vp->v_label, attrnamespace, name, uio); return (error); } int -mac_check_lookup_vnode(struct ucred *cred, struct vnode *dvp, +mac_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct componentname *cnp) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_check_lookup_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_lookup"); if (!mac_enforce_fs) return (0); @@ -1842,30 +1841,30 @@ if (error) return (error); - MAC_CHECK(check_lookup_vnode, cred, dvp, &dvp->v_label, cnp); + MAC_CHECK(check_vnode_lookup, cred, dvp, &dvp->v_label, cnp); return (error); } vm_prot_t -mac_check_mmap_vnode_prot(struct ucred *cred, struct vnode *vp, int newmapping) +mac_check_vnode_mmap_prot(struct ucred *cred, struct vnode *vp, int newmapping) { vm_prot_t result = VM_PROT_ALL; /* * This should be some sort of MAC_BITWISE, maybe :) */ - ASSERT_VOP_LOCKED(vp, "mac_check_mmap_vnode_perms"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_mmap_perms"); MAC_BOOLEAN(check_vnode_mmap_perms, &, cred, vp, &vp->v_label, newmapping); return (result); } int -mac_check_open_vnode(struct ucred *cred, struct vnode *vp, mode_t acc_mode) +mac_check_vnode_open(struct ucred *cred, struct vnode *vp, mode_t acc_mode) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_open_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_open"); if (!mac_enforce_fs) return (0); @@ -1874,16 +1873,16 @@ if (error) return (error); - MAC_CHECK(check_open_vnode, cred, vp, &vp->v_label, acc_mode); + MAC_CHECK(check_vnode_open, cred, vp, &vp->v_label, acc_mode); return (error); } int -mac_check_readdir_vnode(struct ucred *cred, struct vnode *dvp) +mac_check_vnode_readdir(struct ucred *cred, struct vnode *dvp) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_check_readdir_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_readdir"); if (!mac_enforce_fs) return (0); @@ -1892,16 +1891,16 @@ if (error) return (error); - MAC_CHECK(check_readdir_vnode, cred, dvp, &dvp->v_label); + MAC_CHECK(check_vnode_readdir, cred, dvp, &dvp->v_label); return (error); } int -mac_check_readlink_vnode(struct ucred *cred, struct vnode *vp) +mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_readlink_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_readlink"); if (!mac_enforce_fs) return (0); @@ -1910,16 +1909,16 @@ if (error) return (error); - MAC_CHECK(check_readlink_vnode, cred, vp, &vp->v_label); + MAC_CHECK(check_vnode_readlink, cred, vp, &vp->v_label); return (error); } int -mac_check_revoke_vnode(struct ucred *cred, struct vnode *vp) +mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_revoke_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_revoke"); if (!mac_enforce_fs) return (0); @@ -1928,17 +1927,17 @@ if (error) return (error); - MAC_CHECK(check_revoke_vnode, cred, vp, &vp->v_label); + MAC_CHECK(check_vnode_revoke, cred, vp, &vp->v_label); return (error); } int -mac_check_setacl_vnode(struct ucred *cred, struct vnode *vp, acl_type_t type, +mac_check_vnode_setacl(struct ucred *cred, struct vnode *vp, acl_type_t type, struct acl *acl) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_setacl_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setacl"); if (!mac_enforce_fs) return (0); @@ -1947,17 +1946,17 @@ if (error) return (error); - MAC_CHECK(check_setacl_vnode, cred, vp, &vp->v_label, type, acl); + MAC_CHECK(check_vnode_setacl, cred, vp, &vp->v_label, type, acl); return (error); } int -mac_check_setextattr_vnode(struct ucred *cred, struct vnode *vp, +mac_check_vnode_setextattr(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_setextattr_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setextattr"); if (!mac_enforce_fs) return (0); @@ -1966,17 +1965,17 @@ if (error) return (error); - MAC_CHECK(check_setextattr_vnode, cred, vp, &vp->v_label, + MAC_CHECK(check_vnode_setextattr, cred, vp, &vp->v_label, attrnamespace, name, uio); return (error); } int -mac_check_setflags_vnode(struct ucred *cred, struct vnode *vp, u_long flags) +mac_check_vnode_setflags(struct ucred *cred, struct vnode *vp, u_long flags) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_setflags_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setflags"); if (!mac_enforce_fs) return (0); @@ -1985,16 +1984,16 @@ if (error) return (error); - MAC_CHECK(check_setflags_vnode, cred, vp, &vp->v_label, flags); + MAC_CHECK(check_vnode_setflags, cred, vp, &vp->v_label, flags); return (error); } int -mac_check_setmode_vnode(struct ucred *cred, struct vnode *vp, mode_t mode) +mac_check_vnode_setmode(struct ucred *cred, struct vnode *vp, mode_t mode) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_setmode_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setmode"); if (!mac_enforce_fs) return (0); @@ -2003,17 +2002,17 @@ if (error) return (error); - MAC_CHECK(check_setmode_vnode, cred, vp, &vp->v_label, mode); + MAC_CHECK(check_vnode_setmode, cred, vp, &vp->v_label, mode); return (error); } int -mac_check_setowner_vnode(struct ucred *cred, struct vnode *vp, uid_t uid, +mac_check_vnode_setowner(struct ucred *cred, struct vnode *vp, uid_t uid, gid_t gid) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_setowner_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setowner"); if (!mac_enforce_fs) return (0); @@ -2022,17 +2021,17 @@ if (error) return (error); - MAC_CHECK(check_setowner_vnode, cred, vp, &vp->v_label, uid, gid); + MAC_CHECK(check_vnode_setowner, cred, vp, &vp->v_label, uid, gid); return (error); } int -mac_check_setutimes_vnode(struct ucred *cred, struct vnode *vp, +mac_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, struct timespec atime, struct timespec mtime) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_setutimes_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setutimes"); if (!mac_enforce_fs) return (0); @@ -2041,19 +2040,19 @@ if (error) return (error); - MAC_CHECK(check_setutimes_vnode, cred, vp, &vp->v_label, atime, + MAC_CHECK(check_vnode_setutimes, cred, vp, &vp->v_label, atime, mtime); return (error); } int -mac_check_delete_vnode(struct ucred *cred, struct vnode *dvp, struct vnode *vp, +mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp, struct vnode *vp, struct componentname *cnp) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_check_delete_vnode"); - ASSERT_VOP_LOCKED(vp, "mac_check_delete_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_delete"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_delete"); if (!mac_enforce_fs) return (0); @@ -2065,18 +2064,18 @@ if (error) return (error); - MAC_CHECK(check_delete_vnode, cred, dvp, &dvp->v_label, vp, + MAC_CHECK(check_vnode_delete, cred, dvp, &dvp->v_label, vp, &vp->v_label, cnp); return (error); } int -mac_check_deleteacl_vnode(struct ucred *cred, struct vnode *vp, +mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, acl_type_t type) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_deleteacl_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_deleteacl"); if (!mac_enforce_fs) return (0); @@ -2085,18 +2084,18 @@ if (error) return (error); - MAC_CHECK(check_deleteacl_vnode, cred, vp, &vp->v_label, type); + MAC_CHECK(check_vnode_deleteacl, cred, vp, &vp->v_label, type); return (error); } int -mac_check_rename_from_vnode(struct ucred *cred, struct vnode *dvp, +mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, struct vnode *vp, struct componentname *cnp) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_check_rename_from_vnode"); - ASSERT_VOP_LOCKED(vp, "mac_check_rename_from_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_rename_from"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_rename_from"); if (!mac_enforce_fs) return (0); @@ -2108,19 +2107,19 @@ if (error) return (error); - MAC_CHECK(check_rename_from_vnode, cred, dvp, &dvp->v_label, vp, + MAC_CHECK(check_vnode_rename_from, cred, dvp, &dvp->v_label, vp, &vp->v_label, cnp); return (error); } int -mac_check_rename_to_vnode(struct ucred *cred, struct vnode *dvp, +mac_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, struct vnode *vp, int samedir, struct componentname *cnp) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_check_rename_to_vnode"); - ASSERT_VOP_LOCKED(vp, "mac_check_rename_to_vnode"); + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_rename_to"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_rename_to"); if (!mac_enforce_fs) return (0); @@ -2133,17 +2132,17 @@ if (error) return (error); } - MAC_CHECK(check_rename_to_vnode, cred, dvp, &dvp->v_label, vp, + MAC_CHECK(check_vnode_rename_to, cred, dvp, &dvp->v_label, vp, vp != NULL ? &vp->v_label : NULL, samedir, cnp); return (error); } int -mac_check_stat_vnode(struct ucred *cred, struct vnode *vp) +mac_check_vnode_stat(struct ucred *cred, struct vnode *vp) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_stat_vnode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_stat"); if (!mac_enforce_fs) return (0); @@ -2152,7 +2151,7 @@ if (error) return (error); - MAC_CHECK(check_stat_vnode, cred, vp, &vp->v_label); + MAC_CHECK(check_vnode_stat, cred, vp, &vp->v_label); return (error); } ==== //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#7 (text+ko) ==== @@ -98,7 +98,7 @@ return (ENXIO); vn_lock(ttyvp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_open_vnode(td->td_ucred, ttyvp, flag); + error = mac_check_vnode_open(td->td_ucred, ttyvp, flag); if (error) { VOP_UNLOCK(ttyvp, 0, td); return (error); ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#19 (text+ko) ==== @@ -639,7 +639,7 @@ vattr.va_mode = (ACCESSPERMS & ~td->td_proc->p_fd->fd_cmask); FILEDESC_UNLOCK(td->td_proc->p_fd); #ifdef MAC - error = mac_check_create_vnode(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, + error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); #endif /* MAC */ if (error == 0) { ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#20 (text+ko) ==== @@ -203,7 +203,7 @@ break; } #ifdef MAC - error = mac_check_readlink_vnode(td->td_ucred, ndp->ni_vp); + error = mac_check_vnode_readlink(td->td_ucred, ndp->ni_vp); if (error) break; #endif @@ -454,7 +454,7 @@ */ unionlookup: #ifdef MAC - error = mac_check_lookup_vnode(td->td_ucred, dp, cnp); + error = mac_check_vnode_lookup(td->td_ucred, dp, cnp); if (error) goto bad; #endif ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#64 (text+ko) ==== @@ -1460,7 +1460,7 @@ if (vp->v_type != VDIR) error = ENOTDIR; #ifdef MAC - else if ((error = mac_check_chdir_vnode(td->td_ucred, vp)) != 0) { + else if ((error = mac_check_vnode_chdir(td->td_ucred, vp)) != 0) { } #endif else @@ -1600,7 +1600,7 @@ NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, SCARG(uap, path), td); #ifdef MAC - if ((error = mac_check_chroot_vnode(td->td_ucred, nd.ni_vp))) { + if ((error = mac_check_vnode_chroot(td->td_ucred, nd.ni_vp))) { /* * XXX: Release of namei() structures may be wrong here * and below in existing code. @@ -1643,7 +1643,7 @@ if (vp->v_type != VDIR) error = ENOTDIR; #ifdef MAC - else if ((error = mac_check_chdir_vnode(td->td_ucred, vp)) != 0) { + else if ((error = mac_check_vnode_chdir(td->td_ucred, vp)) != 0) { } #endif else @@ -1943,7 +1943,7 @@ } #ifdef MAC if (error == 0 && !whiteout) - error = mac_check_create_vnode(td->td_ucred, nd.ni_dvp, + error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); #endif /* MAC */ if (!error) { @@ -2013,7 +2013,7 @@ vattr.va_mode = (SCARG(uap, mode) & ALLPERMS) &~ td->td_proc->p_fd->fd_cmask; FILEDESC_UNLOCK(td->td_proc->p_fd); #ifdef MAC - error = mac_check_create_vnode(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, + error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); #endif /* MAC */ if (error == 0) { @@ -2139,7 +2139,7 @@ FILEDESC_UNLOCK(td->td_proc->p_fd); vattr.va_type = VLNK; #ifdef MAC - error = mac_check_create_vnode(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, + error = mac_check_vnode_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); #endif /* MAC */ if (error == 0) { @@ -2261,7 +2261,7 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); if (!error) { #ifdef MAC - error = mac_check_delete_vnode(td->td_ucred, nd.ni_dvp, vp, + error = mac_check_vnode_delete(td->td_ucred, nd.ni_dvp, vp, &nd.ni_cnd); if (error == 0) { #endif @@ -2410,7 +2410,7 @@ if (user_flags & X_OK) flags |= VEXEC; #ifdef MAC - error = mac_check_access_vnode(cred, vp, flags); + error = mac_check_vnode_access(cred, vp, flags); if (error) return (error); #endif @@ -2856,7 +2856,7 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vp = nd.ni_vp; #ifdef MAC - error = mac_check_readlink_vnode(td->td_ucred, vp); + error = mac_check_vnode_readlink(td->td_ucred, vp); if (error) { vput(vp); return (error); @@ -2913,7 +2913,7 @@ VATTR_NULL(&vattr); vattr.va_flags = flags; #if MAC - error = mac_check_setflags_vnode(td->td_ucred, vp, vattr.va_flags); + error = mac_check_vnode_setflags(td->td_ucred, vp, vattr.va_flags); if (error != 0) goto out; #endif @@ -3027,7 +3027,7 @@ VATTR_NULL(&vattr); vattr.va_mode = mode & ALLPERMS; #ifdef MAC - error = mac_check_setmode_vnode(td->td_ucred, vp, vattr.va_mode); + error = mac_check_vnode_setmode(td->td_ucred, vp, vattr.va_mode); if (error != 0) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 13:18:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A2CB37B401; Sun, 28 Jul 2002 13:18:51 -0700 (PDT) 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 CF1AD37B400 for ; Sun, 28 Jul 2002 13:18:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8ADFE43E3B for ; Sun, 28 Jul 2002 13:18:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6SKIoJU082561 for ; Sun, 28 Jul 2002 13:18:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6SKIofm082558 for perforce@freebsd.org; Sun, 28 Jul 2002 13:18:50 -0700 (PDT) Date: Sun, 28 Jul 2002 13:18:50 -0700 (PDT) Message-Id: <200207282018.g6SKIofm082558@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15067 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15067 Change 15067 by rwatson@rwatson_paprika on 2002/07/28 13:18:13 Avoid entering mac_execve_transition() if the MAC framework hasn't previously indicated a transition will take place. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#25 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#25 (text+ko) ==== @@ -144,6 +144,9 @@ #endif struct vnode *textvp = NULL, *textdvp = NULL; int credential_changing; +#ifdef MAC + int will_transition; +#endif imgp = &image_params; @@ -379,7 +382,8 @@ attr.va_gid); #ifdef MAC vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); - credential_changing |= mac_execve_will_transition(oldcred, imgp->vp); + will_transition = mac_execve_will_transition(oldcred, imgp->vp); + credential_changing |= will_transition; VOP_UNLOCK(imgp->vp, 0, td); #endif @@ -420,9 +424,11 @@ if (attr.va_mode & VSGID) change_egid(newcred, attr.va_gid); #ifdef MAC - vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); - mac_execve_transition(oldcred, newcred, imgp->vp); - VOP_UNLOCK(imgp->vp, 0, td); + if (will_transition) { + vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); + mac_execve_transition(oldcred, newcred, imgp->vp); + VOP_UNLOCK(imgp->vp, 0, td); + } #endif setugidsafety(td); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 14:27:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDDE337B401; Sun, 28 Jul 2002 14:27:16 -0700 (PDT) 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 5E0E537B400 for ; Sun, 28 Jul 2002 14:27:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC95D43E4A for ; Sun, 28 Jul 2002 14:27:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6SLRFJU094948 for ; Sun, 28 Jul 2002 14:27:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6SLRFuA094945 for perforce@freebsd.org; Sun, 28 Jul 2002 14:27:15 -0700 (PDT) Date: Sun, 28 Jul 2002 14:27:15 -0700 (PDT) Message-Id: <200207282127.g6SLRFuA094945@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15073 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15073 Change 15073 by rwatson@rwatson_paprika on 2002/07/28 14:27:00 Rename mac_check_statfs to mac_check_mount_stat to conform to new naming scheme. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#202 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#65 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#79 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#67 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#54 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#59 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#24 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#130 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#95 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#202 (text+ko) ==== @@ -662,6 +662,10 @@ mpc->mpc_ops->mpo_check_ifnet_transmit = mpe->mpe_function; break; + case MAC_CHECK_MOUNT_STAT: + mpc->mpc_ops->mpo_check_mount_stat = + mpe->mpe_function; + break; case MAC_CHECK_PROC_DEBUG: mpc->mpc_ops->mpo_check_proc_debug = mpe->mpe_function; @@ -714,9 +718,6 @@ mpc->mpc_ops->mpo_check_relabel_vnode = mpe->mpe_function; break; - case MAC_CHECK_STATFS: - mpc->mpc_ops->mpo_check_statfs = mpe->mpe_function; - break; case MAC_CHECK_VNODE_ACCESS: mpc->mpc_ops->mpo_check_vnode_access = mpe->mpe_function; @@ -2453,6 +2454,19 @@ } int +mac_check_mount_stat(struct ucred *cred, struct mount *mount) +{ + int error; + + if (!mac_enforce_fs) + return (0); + + MAC_CHECK(check_mount_stat, cred, mount, &mount->mnt_mntlabel); + + return (error); +} + +int mac_check_proc_debug(struct ucred *cred, struct proc *proc) { int error; @@ -2679,19 +2693,6 @@ } int -mac_check_statfs(struct ucred *cred, struct mount *mount) -{ - int error; - - if (!mac_enforce_fs) - return (0); - - MAC_CHECK(check_statfs, cred, mount, &mount->mnt_mntlabel); - - return (error); -} - -int mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op) { int error; ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#65 (text+ko) ==== @@ -1290,7 +1290,7 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vrele(nd.ni_vp); #ifdef MAC - error = mac_check_statfs(td->td_ucred, mp); + error = mac_check_mount_stat(td->td_ucred, mp); if (error) return (error); #endif @@ -1337,7 +1337,7 @@ if (mp == NULL) return (EBADF); #ifdef MAC - error = mac_check_statfs(td->td_ucred, mp); + error = mac_check_mount_stat(td->td_ucred, mp); if (error) return (error); #endif @@ -1384,7 +1384,7 @@ mtx_lock(&mountlist_mtx); for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) { #ifdef MAC - if (mac_check_statfs(td->td_ucred, mp) != 0) { + if (mac_check_mount_stat(td->td_ucred, mp) != 0) { nmp = TAILQ_NEXT(mp, mnt_list); continue; } @@ -4671,7 +4671,7 @@ sp = &mp->mnt_stat; vput(vp); #ifdef MAC - error = mac_check_statfs(td->td_ucred, mp); + error = mac_check_mount_stat(td->td_ucred, mp); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#79 (text+ko) ==== @@ -1214,6 +1214,24 @@ } static int +mac_biba_check_mount_stat(struct ucred *cred, struct mount *mp, + struct label *mntlabel) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(mntlabel); + + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int mac_biba_check_proc_debug(struct ucred *cred, struct proc *proc) { struct mac_biba *subj, *obj; @@ -1464,24 +1482,6 @@ } static int -mac_biba_check_statfs(struct ucred *cred, struct mount *mp, - struct label *mntlabel) -{ - struct mac_biba *subj, *obj; - - if (!mac_biba_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(mntlabel); - - if (!mac_biba_dominate_single(obj, subj)) - return (EACCES); - - return (0); -} - -static int mac_biba_check_vnode_access(struct ucred *cred, struct vnode *vp, struct label *label, mode_t flags) { @@ -2146,6 +2146,8 @@ (macop_t)mac_biba_check_cred_visible }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_biba_check_ifnet_transmit }, + { MAC_CHECK_MOUNT_STAT, + (macop_t)mac_biba_check_mount_stat }, { MAC_CHECK_PROC_DEBUG, (macop_t)mac_biba_check_proc_debug }, { MAC_CHECK_PROC_SCHED, @@ -2166,8 +2168,6 @@ (macop_t)mac_biba_check_relabel_subject }, { MAC_CHECK_RELABEL_VNODE, (macop_t)mac_biba_check_relabel_vnode }, - { MAC_CHECK_STATFS, - (macop_t)mac_biba_check_statfs }, { MAC_CHECK_VNODE_ACCESS, (macop_t)mac_biba_check_vnode_access }, { MAC_CHECK_VNODE_CHDIR, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#67 (text+ko) ==== @@ -1163,6 +1163,24 @@ } static int +mac_mls_check_mount_stat(struct ucred *cred, struct mount *mp, + struct label *mntlabel) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(mntlabel); + + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_mls_check_proc_debug(struct ucred *cred, struct proc *proc) { struct mac_mls *subj, *obj; @@ -1413,24 +1431,6 @@ } static int -mac_mls_check_statfs(struct ucred *cred, struct mount *mp, - struct label *mntlabel) -{ - struct mac_mls *subj, *obj; - - if (!mac_mls_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(mntlabel); - - if (!mac_mls_dominate_single(subj, obj)) - return (EACCES); - - return (0); -} - -static int mac_mls_check_vnode_access(struct ucred *cred, struct vnode *vp, struct label *label, mode_t flags) { @@ -2095,6 +2095,8 @@ (macop_t)mac_mls_check_cred_visible }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_mls_check_ifnet_transmit }, + { MAC_CHECK_MOUNT_STAT, + (macop_t)mac_mls_check_mount_stat }, { MAC_CHECK_PROC_DEBUG, (macop_t)mac_mls_check_proc_debug }, { MAC_CHECK_PROC_SCHED, @@ -2115,8 +2117,6 @@ (macop_t)mac_mls_check_relabel_subject }, { MAC_CHECK_RELABEL_VNODE, (macop_t)mac_mls_check_relabel_vnode }, - { MAC_CHECK_STATFS, - (macop_t)mac_mls_check_statfs }, { MAC_CHECK_VNODE_ACCESS, (macop_t)mac_mls_check_vnode_access }, { MAC_CHECK_VNODE_CHDIR, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#54 (text+ko) ==== @@ -572,6 +572,14 @@ } static int +mac_none_check_mount_stat(struct ucred *cred, struct mount *mp, + struct label *mntlabel) +{ + + return (0); +} + +static int mac_none_check_proc_debug(struct ucred *cred, struct proc *proc) { @@ -672,14 +680,6 @@ } static int -mac_none_check_statfs(struct ucred *cred, struct mount *mp, - struct label *mntlabel) -{ - - return (0); -} - -static int mac_none_check_vnode_access(struct ucred *cred, struct vnode *vp, struct label *label, mode_t flags) { @@ -1022,6 +1022,8 @@ (macop_t)mac_none_check_cred_visible }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_none_check_ifnet_transmit }, + { MAC_CHECK_MOUNT_STAT, + (macop_t)mac_none_check_mount_stat }, { MAC_CHECK_PROC_DEBUG, (macop_t)mac_none_check_proc_debug }, { MAC_CHECK_PROC_SCHED, @@ -1048,8 +1050,6 @@ (macop_t)mac_none_check_relabel_subject }, { MAC_CHECK_RELABEL_VNODE, (macop_t)mac_none_check_relabel_vnode }, - { MAC_CHECK_STATFS, - (macop_t)mac_none_check_statfs }, { MAC_CHECK_VNODE_ACCESS, (macop_t)mac_none_check_vnode_access }, { MAC_CHECK_VNODE_CHDIR, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#59 (text+ko) ==== @@ -694,6 +694,18 @@ } static int +mac_te_check_mount_stat(struct ucred *cred, struct mount *mp, + struct label *mplabel) +{ + int error; + + error = mac_te_check(SLOT(&cred->cr_label), SLOT(mplabel), + MAC_TE_CLASS_FS, MAC_TE_OPERATION_FS_STATFS); + + return (error); +} + +static int mac_te_check_proc_debug(struct ucred *cred, struct proc *proc) { @@ -1535,18 +1547,6 @@ return (0); } -static int -mac_te_check_statfs(struct ucred *cred, struct mount *mp, - struct label *mplabel) -{ - int error; - - error = mac_te_check(SLOT(&cred->cr_label), SLOT(mplabel), - MAC_TE_CLASS_FS, MAC_TE_OPERATION_FS_STATFS); - - return (error); -} - static vm_prot_t mac_te_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, struct label *label, int newmapping) @@ -1748,6 +1748,8 @@ (macop_t)mac_te_check_cred_visible }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_te_check_ifnet_transmit }, + { MAC_CHECK_MOUNT_STAT, + (macop_t)mac_te_check_mount_stat }, { MAC_CHECK_PROC_DEBUG, (macop_t)mac_te_check_proc_debug }, { MAC_CHECK_PROC_SCHED, @@ -1774,7 +1776,6 @@ (macop_t)mac_te_check_relabel_subject }, { MAC_CHECK_RELABEL_VNODE, (macop_t)mac_te_check_relabel_vnode }, - { MAC_CHECK_STATFS, (macop_t)mac_te_check_statfs }, { MAC_CHECK_VNODE_ACCESS, (macop_t)mac_te_check_vnode_access }, { MAC_CHECK_VNODE_CHDIR, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#24 (text+ko) ==== @@ -780,6 +780,14 @@ } static int +mac_test_check_mount_stat(struct ucred *cred, struct mount *mp, + struct label *mntlabel) +{ + + return (0); +} + +static int mac_test_check_proc_debug(struct ucred *cred, struct proc *proc) { @@ -896,14 +904,6 @@ } static int -mac_test_check_statfs(struct ucred *cred, struct mount *mp, - struct label *mntlabel) -{ - - return (0); -} - -static int mac_test_check_vnode_access(struct ucred *cred, struct vnode *vp, struct label *label, mode_t flags) { @@ -1228,6 +1228,8 @@ (macop_t)mac_test_check_cred_visible }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_test_check_ifnet_transmit }, + { MAC_CHECK_MOUNT_STAT, + (macop_t)mac_test_check_mount_stat }, { MAC_CHECK_PROC_DEBUG, (macop_t)mac_test_check_proc_debug }, { MAC_CHECK_PROC_SCHED, @@ -1254,8 +1256,6 @@ (macop_t)mac_test_check_relabel_subject }, { MAC_CHECK_RELABEL_VNODE, (macop_t)mac_test_check_relabel_vnode }, - { MAC_CHECK_STATFS, - (macop_t)mac_test_check_statfs }, { MAC_CHECK_VNODE_ACCESS, (macop_t)mac_test_check_vnode_access }, { MAC_CHECK_VNODE_CHDIR, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#130 (text+ko) ==== @@ -258,6 +258,7 @@ /* Authorizational event hooks. */ int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); +int mac_check_mount_stat(struct ucred *cred, struct mount *mp); int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int flags); int mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp); @@ -300,7 +301,6 @@ int mac_check_vnode_readdir(struct ucred *cred, struct vnode *vp); int mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp); int mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp); -int mac_check_statfs(struct ucred *cred, struct mount *mp); int mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op); int mac_check_pipe_op(struct ucred *cred, struct pipe *pipe, int op); int mac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#95 (text+ko) ==== @@ -235,6 +235,8 @@ int (*mpo_check_ifnet_transmit)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel); + int (*mpo_check_mount_stat)(struct ucred *cred, struct mount *mp, + struct label *mntlabel); int (*mpo_check_proc_debug)(struct ucred *cred, struct proc *proc); int (*mpo_check_proc_sched)(struct ucred *cred, struct proc *proc); int (*mpo_check_proc_signal)(struct ucred *cred, struct proc *proc, @@ -266,8 +268,6 @@ int (*mpo_check_relabel_vnode)(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *newlabel); - int (*mpo_check_statfs)(struct ucred *cred, struct mount *mp, - struct label *mntlabel); int (*mpo_check_vnode_access)(struct ucred *cred, struct vnode *vp, struct label *label, int flags); int (*mpo_check_vnode_chdir)(struct ucred *cred, @@ -412,6 +412,7 @@ MAC_CHECK_BPFDESC_RECEIVE, MAC_CHECK_CRED_VISIBLE, MAC_CHECK_IFNET_TRANSMIT, + MAC_CHECK_MOUNT_STAT, MAC_CHECK_PROC_DEBUG, MAC_CHECK_PROC_SCHED, MAC_CHECK_PROC_SIGNAL, @@ -425,7 +426,6 @@ MAC_CHECK_RELABEL_SOCKET, MAC_CHECK_RELABEL_SUBJECT, MAC_CHECK_RELABEL_VNODE, - MAC_CHECK_STATFS, MAC_CHECK_VNODE_ACCESS, MAC_CHECK_VNODE_CHDIR, MAC_CHECK_VNODE_CHROOT, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 16:13:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D888A37B401; Sun, 28 Jul 2002 16:12:26 -0700 (PDT) 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 72D3C37B400 for ; Sun, 28 Jul 2002 16:12:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B719743E3B for ; Sun, 28 Jul 2002 16:12:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6SNCPJU012341 for ; Sun, 28 Jul 2002 16:12:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6SNCPuR012338 for perforce@freebsd.org; Sun, 28 Jul 2002 16:12:25 -0700 (PDT) Date: Sun, 28 Jul 2002 16:12:25 -0700 (PDT) Message-Id: <200207282312.g6SNCPuR012338@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15078 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15078 Change 15078 by rwatson@rwatson_paprika on 2002/07/28 16:11:27 Rename the various relabel checks to the new entry point naming convention. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#203 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#80 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#68 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#55 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#9 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#60 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#25 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#17 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#96 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#203 (text+ko) ==== @@ -162,10 +162,10 @@ static int mac_policy_unregister(struct mac_policy_conf *mpc); static int mac_stdcreatevnode_ea(struct vnode *vp); -static void mac_subject_mmapped_drop_perms(struct thread *td, - struct ucred *cred); -static void mac_subject_mmapped_drop_perms_recurse(struct thread *td, - struct ucred *cred, struct vm_map *map); +static void mac_subject_mmapped_drop_perms(struct thread *td, + struct ucred *cred); +static void mac_subject_mmapped_drop_perms_recurse(struct thread *td, + struct ucred *cred, struct vm_map *map); /* * mac_policy_list_lock protects the consistency of 'mac_policy_list', @@ -654,10 +654,18 @@ mpc->mpc_ops->mpo_check_bpfdesc_receive = mpe->mpe_function; break; + case MAC_CHECK_CRED_RELABEL: + mpc->mpc_ops->mpo_check_cred_relabel = + mpe->mpe_function; + break; case MAC_CHECK_CRED_VISIBLE: mpc->mpc_ops->mpo_check_cred_visible = mpe->mpe_function; break; + case MAC_CHECK_IFNET_RELABEL: + mpc->mpc_ops->mpo_check_ifnet_relabel = + mpe->mpe_function; + break; case MAC_CHECK_IFNET_TRANSMIT: mpc->mpc_ops->mpo_check_ifnet_transmit = mpe->mpe_function; @@ -666,6 +674,10 @@ mpc->mpc_ops->mpo_check_mount_stat = mpe->mpe_function; break; + case MAC_CHECK_PIPE_RELABEL: + mpc->mpc_ops->mpo_check_pipe_relabel = + mpe->mpe_function; + break; case MAC_CHECK_PROC_DEBUG: mpc->mpc_ops->mpo_check_proc_debug = mpe->mpe_function; @@ -694,30 +706,14 @@ mpc->mpc_ops->mpo_check_socket_receive = mpe->mpe_function; break; + case MAC_CHECK_SOCKET_RELABEL: + mpc->mpc_ops->mpo_check_socket_relabel = + mpe->mpe_function; + break; case MAC_CHECK_SOCKET_VISIBLE: mpc->mpc_ops->mpo_check_socket_visible = mpe->mpe_function; break; - case MAC_CHECK_RELABEL_IFNET: - mpc->mpc_ops->mpo_check_relabel_ifnet = - mpe->mpe_function; - break; - case MAC_CHECK_RELABEL_PIPE: - mpc->mpc_ops->mpo_check_relabel_pipe = - mpe->mpe_function; - break; - case MAC_CHECK_RELABEL_SOCKET: - mpc->mpc_ops->mpo_check_relabel_socket = - mpe->mpe_function; - break; - case MAC_CHECK_RELABEL_SUBJECT: - mpc->mpc_ops->mpo_check_relabel_subject = - mpe->mpe_function; - break; - case MAC_CHECK_RELABEL_VNODE: - mpc->mpc_ops->mpo_check_relabel_vnode = - mpe->mpe_function; - break; case MAC_CHECK_VNODE_ACCESS: mpc->mpc_ops->mpo_check_vnode_access = mpe->mpe_function; @@ -770,6 +766,10 @@ mpc->mpc_ops->mpo_check_vnode_readlink = mpe->mpe_function; break; + case MAC_CHECK_VNODE_RELABEL: + mpc->mpc_ops->mpo_check_vnode_relabel = + mpe->mpe_function; + break; case MAC_CHECK_VNODE_RENAME_FROM: mpc->mpc_ops->mpo_check_vnode_rename_from = mpe->mpe_function; @@ -1667,39 +1667,6 @@ MAC_PERFORM(create_subject, parent_cred, child_cred); } -/* - * Processes may need to modify their current subject label if they - * perform multi-level activities, or proxy data between levels. - * This function determines if a particular label change is permitted. - * 0 is returned for success, otherwise an errno. - */ -static int -mac_check_relabel_subject(struct ucred *cred, struct label *newlabel) -{ - int error; - - MAC_CHECK(check_relabel_subject, cred, newlabel); - - return (error); -} - -static int -mac_check_relabel_vnode(struct ucred *cred, struct vnode *vp, - struct label *newlabel) -{ - int error; - - ASSERT_VOP_LOCKED(vp, "mac_check_relabel_vnode"); - - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - - MAC_CHECK(check_relabel_vnode, cred, vp, &vp->v_label, newlabel); - - return (error); -} - int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int flags) { @@ -1914,6 +1881,23 @@ return (error); } +static int +mac_check_vnode_relabel(struct ucred *cred, struct vnode *vp, + struct label *newlabel) +{ + int error; + + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_relabel"); + + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + + MAC_CHECK(check_vnode_relabel, cred, vp, &vp->v_label, newlabel); + + return (error); +} + int mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp) { @@ -2347,29 +2331,6 @@ &mbuf->m_pkthdr.label); } -static int -mac_check_relabel_socket(struct ucred *cred, struct socket *socket, - struct label *newlabel) -{ - int error; - - MAC_CHECK(check_relabel_socket, cred, socket, &socket->so_label, - newlabel); - - return (error); -} - -static int -mac_check_relabel_pipe(struct ucred *cred, struct pipe *pipe, - struct label *newlabel) -{ - int error; - - MAC_CHECK(check_relabel_pipe, cred, pipe, pipe->pipe_label, newlabel); - - return (error); -} - int mac_check_pipe_op(struct ucred *cred, struct pipe *pipe, int op) { @@ -2421,6 +2382,16 @@ return (error); } +static int +mac_check_cred_relabel(struct ucred *cred, struct label *newlabel) +{ + int error; + + MAC_CHECK(check_cred_relabel, cred, newlabel); + + return (error); +} + int mac_check_cred_visible(struct ucred *u1, struct ucred *u2) { @@ -2466,6 +2437,17 @@ return (error); } +static int +mac_check_pipe_relabel(struct ucred *cred, struct pipe *pipe, + struct label *newlabel) +{ + int error; + + MAC_CHECK(check_pipe_relabel, cred, pipe, pipe->pipe_label, newlabel); + + return (error); +} + int mac_check_proc_debug(struct ucred *cred, struct proc *proc) { @@ -2561,6 +2543,18 @@ return (error); } +static int +mac_check_socket_relabel(struct ucred *cred, struct socket *socket, + struct label *newlabel) +{ + int error; + + MAC_CHECK(check_socket_relabel, cred, socket, &socket->so_label, + newlabel); + + return (error); +} + int mac_check_socket_visible(struct ucred *cred, struct socket *socket) { @@ -2613,7 +2607,7 @@ if (error) goto out; - MAC_CHECK(check_relabel_ifnet, cred, ifnet, &ifnet->if_label, + MAC_CHECK(check_ifnet_relabel, cred, ifnet, &ifnet->if_label, &intlabel); if (error) goto out; @@ -2722,7 +2716,7 @@ if (error) return (error); - mac_check_relabel_socket(cred, so, &intlabel); + mac_check_socket_relabel(cred, so, &intlabel); if (error) { mac_destroy_temp(&intlabel); return (error); @@ -2739,7 +2733,7 @@ { int error; - error = mac_check_relabel_pipe(cred, pipe, label); + error = mac_check_pipe_relabel(cred, pipe, label); if (error) return (error); @@ -2824,7 +2818,7 @@ * update the actual vnode label. Question: maybe the filesystem * should update the vnode at the end as part of VOP_SETLABEL()? */ - error = mac_check_relabel_vnode(cred, vp, intlabel); + error = mac_check_vnode_relabel(cred, vp, intlabel); if (error) return (error); @@ -2890,7 +2884,7 @@ PROC_LOCK(p); oldcred = p->p_ucred; - error = mac_check_relabel_subject(oldcred, &intlabel); + error = mac_check_cred_relabel(oldcred, &intlabel); if (error) { PROC_UNLOCK(p); mac_destroy_temp(&intlabel); ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#80 (text+ko) ==== @@ -1181,6 +1181,44 @@ } static int +mac_biba_check_cred_relabel(struct ucred *cred, struct label *newlabel) +{ + struct mac_biba *subj, *new; + + subj = SLOT(&cred->cr_label); + new = SLOT(newlabel); + + if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAGS_BOTH) + return (EINVAL); + + /* + * XXX: Allow processes with root privilege to set labels outside + * their range, so suid things like "su" work. This WILL go away + * when we figure out the 'correct' solution... + */ + if (!suser_cred(cred, 0)) + return (0); + + /* + * The new single must be in the old range. + */ + if (!mac_biba_single_in_range(new, subj)) + return (EPERM); + + /* + * The new range must be in the old range. + */ + if (!mac_biba_range_in_range(new, subj)) + return (EPERM); + + /* + * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + */ + + return (0); +} + +static int mac_biba_check_cred_visible(struct ucred *u1, struct ucred *u2) { struct mac_biba *subj, *obj; @@ -1198,6 +1236,26 @@ return (0); } +static int +mac_biba_check_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet, + struct label *ifnetlabel, struct label *newlabel) +{ + struct mac_biba *subj, *new; + + subj = SLOT(&cred->cr_label); + new = SLOT(newlabel); + + if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAGS_BOTH) + return (EINVAL); + + /* + * XXX: Only Biba HIGH subjects may relabel interfaces. */ + if (!mac_biba_high_single(subj)) + return (EPERM); + + return (suser_cred(cred, 0)); +} + static int mac_biba_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) @@ -1232,6 +1290,40 @@ } static int +mac_biba_check_pipe_relabel(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, struct label *newlabel) +{ + struct mac_biba *subj, *obj, *new; + + new = SLOT(newlabel); + subj = SLOT(&cred->cr_label); + obj = SLOT(pipelabel); + + if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) + return (EINVAL); + + /* + * To relabel a pipe, the old pipe label must be in the subject + * range. + */ + if (!mac_biba_single_in_range(obj, subj)) + return (EPERM); + + /* + * To relabel a pipe, the new pipe label must be in the subject + * range. + */ + if (!mac_biba_single_in_range(new, subj)) + return (EPERM); + + /* + * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + */ + + return (0); +} + +static int mac_biba_check_proc_debug(struct ucred *cred, struct proc *proc) { struct mac_biba *subj, *obj; @@ -1307,42 +1399,7 @@ } static int -mac_biba_check_socket_visible(struct ucred *cred, struct socket *socket, - struct label *socketlabel) -{ - struct mac_biba *subj, *obj; - - subj = SLOT(&cred->cr_label); - obj = SLOT(socketlabel); - - if (!mac_biba_dominate_single(obj, subj)) - return (ENOENT); - - return (0); -} - -static int -mac_biba_check_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, - struct label *ifnetlabel, struct label *newlabel) -{ - struct mac_biba *subj, *new; - - subj = SLOT(&cred->cr_label); - new = SLOT(newlabel); - - if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAGS_BOTH) - return (EINVAL); - - /* - * XXX: Only Biba HIGH subjects may relabel interfaces. */ - if (!mac_biba_high_single(subj)) - return (EPERM); - - return (suser_cred(cred, 0)); -} - -static int -mac_biba_check_relabel_socket(struct ucred *cred, struct socket *socket, +mac_biba_check_socket_relabel(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { struct mac_biba *subj, *obj, *new; @@ -1376,112 +1433,21 @@ } static int -mac_biba_check_relabel_pipe(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, struct label *newlabel) +mac_biba_check_socket_visible(struct ucred *cred, struct socket *socket, + struct label *socketlabel) { - struct mac_biba *subj, *obj, *new; + struct mac_biba *subj, *obj; - new = SLOT(newlabel); subj = SLOT(&cred->cr_label); - obj = SLOT(pipelabel); + obj = SLOT(socketlabel); - if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) - return (EINVAL); - - /* - * To relabel a pipe, the old pipe label must be in the subject - * range. - */ - if (!mac_biba_single_in_range(obj, subj)) - return (EPERM); - - /* - * To relabel a pipe, the new pipe label must be in the subject - * range. - */ - if (!mac_biba_single_in_range(new, subj)) - return (EPERM); - - /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. - */ - - return (0); -} - -static int -mac_biba_check_relabel_subject(struct ucred *cred, struct label *newlabel) -{ - struct mac_biba *subj, *new; - - subj = SLOT(&cred->cr_label); - new = SLOT(newlabel); - - if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAGS_BOTH) - return (EINVAL); - - /* - * XXX: Allow processes with root privilege to set labels outside - * their range, so suid things like "su" work. This WILL go away - * when we figure out the 'correct' solution... - */ - if (!suser_cred(cred, 0)) - return (0); - - /* - * The new single must be in the old range. - */ - if (!mac_biba_single_in_range(new, subj)) - return (EPERM); - - /* - * The new range must be in the old range. - */ - if (!mac_biba_range_in_range(new, subj)) - return (EPERM); - - /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. - */ + if (!mac_biba_dominate_single(obj, subj)) + return (ENOENT); return (0); } static int -mac_biba_check_relabel_vnode(struct ucred *cred, struct vnode *vp, - struct label *vnodelabel, struct label *newlabel) -{ - struct mac_biba *old, *new, *subj; - - old = SLOT(vnodelabel); - new = SLOT(newlabel); - subj = SLOT(&cred->cr_label); - - if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) - return (EINVAL); - - /* - * To relabel a vnode, the old vnode label must be in the subject - * range. - */ - if (!mac_biba_single_in_range(old, subj)) - return (EPERM); - - /* - * To relabel a vnode, the new vnode label must be in the subject - * range. - */ - if (!mac_biba_single_in_range(new, subj)) - return (EPERM); - - /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. - */ - - return (suser_cred(cred, 0)); -} - -static int mac_biba_check_vnode_access(struct ucred *cred, struct vnode *vp, struct label *label, mode_t flags) { @@ -1719,6 +1685,40 @@ } static int +mac_biba_check_vnode_relabel(struct ucred *cred, struct vnode *vp, + struct label *vnodelabel, struct label *newlabel) +{ + struct mac_biba *old, *new, *subj; + + old = SLOT(vnodelabel); + new = SLOT(newlabel); + subj = SLOT(&cred->cr_label); + + if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) + return (EINVAL); + + /* + * To relabel a vnode, the old vnode label must be in the subject + * range. + */ + if (!mac_biba_single_in_range(old, subj)) + return (EPERM); + + /* + * To relabel a vnode, the new vnode label must be in the subject + * range. + */ + if (!mac_biba_single_in_range(new, subj)) + return (EPERM); + + /* + * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + */ + + return (suser_cred(cred, 0)); +} + +static int mac_biba_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) @@ -2142,12 +2142,18 @@ (macop_t)mac_biba_relabel_subject }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_biba_check_bpfdesc_receive }, + { MAC_CHECK_CRED_RELABEL, + (macop_t)mac_biba_check_cred_relabel }, { MAC_CHECK_CRED_VISIBLE, (macop_t)mac_biba_check_cred_visible }, + { MAC_CHECK_IFNET_RELABEL, + (macop_t)mac_biba_check_ifnet_relabel }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_biba_check_ifnet_transmit }, { MAC_CHECK_MOUNT_STAT, (macop_t)mac_biba_check_mount_stat }, + { MAC_CHECK_PIPE_RELABEL, + (macop_t)mac_biba_check_pipe_relabel }, { MAC_CHECK_PROC_DEBUG, (macop_t)mac_biba_check_proc_debug }, { MAC_CHECK_PROC_SCHED, @@ -2156,18 +2162,10 @@ (macop_t)mac_biba_check_proc_signal }, { MAC_CHECK_SOCKET_RECEIVE, (macop_t)mac_biba_check_socket_receive }, + { MAC_CHECK_SOCKET_RELABEL, + (macop_t)mac_biba_check_socket_relabel }, { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_biba_check_socket_visible }, - { MAC_CHECK_RELABEL_IFNET, - (macop_t)mac_biba_check_relabel_ifnet }, - { MAC_CHECK_RELABEL_PIPE, - (macop_t)mac_biba_check_relabel_pipe }, - { MAC_CHECK_RELABEL_SOCKET, - (macop_t)mac_biba_check_relabel_socket }, - { MAC_CHECK_RELABEL_SUBJECT, - (macop_t)mac_biba_check_relabel_subject }, - { MAC_CHECK_RELABEL_VNODE, - (macop_t)mac_biba_check_relabel_vnode }, { MAC_CHECK_VNODE_ACCESS, (macop_t)mac_biba_check_vnode_access }, { MAC_CHECK_VNODE_CHDIR, @@ -2198,6 +2196,8 @@ (macop_t)mac_biba_check_vnode_readdir }, { MAC_CHECK_VNODE_READLINK, (macop_t)mac_biba_check_vnode_readlink }, + { MAC_CHECK_VNODE_RELABEL, + (macop_t)mac_biba_check_vnode_relabel }, { MAC_CHECK_VNODE_RENAME_FROM, (macop_t)mac_biba_check_vnode_rename_from }, { MAC_CHECK_VNODE_RENAME_TO, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#68 (text+ko) ==== @@ -1130,6 +1130,45 @@ } static int +mac_mls_check_cred_relabel(struct ucred *cred, struct label *newlabel) +{ + struct mac_mls *subj, *new; + + subj = SLOT(&cred->cr_label); + new = SLOT(newlabel); + + if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAGS_BOTH) + return (EINVAL); + + /* + * XXX: Allow processes with root privilege to set labels outside + * their range, so suid things like "su" work. This WILL go away + * when we figure out the 'correct' solution... + */ + if (!suser_cred(cred, 0)) + return (0); + + /* + * The new single must be in the old range. + */ + if (!mac_mls_single_in_range(new, subj)) + return (EPERM); + + /* + * The new range must be in the old range. + */ + if (!mac_mls_range_in_range(new, subj)) + return (EPERM); + + /* + * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + */ + + return (0); +} + + +static int mac_mls_check_cred_visible(struct ucred *u1, struct ucred *u2) { struct mac_mls *subj, *obj; @@ -1148,6 +1187,23 @@ } static int +mac_mls_check_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet, + struct label *ifnetlabel, struct label *newlabel) +{ + struct mac_mls *subj, *new; + + subj = SLOT(&cred->cr_label); + new = SLOT(newlabel); + + if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAGS_BOTH) + return (EINVAL); + + /* XXX: privilege model here? */ + + return (suser_cred(cred, 0)); +} + +static int mac_mls_check_ifnet_transmit(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *m, struct label *mbuflabel) { @@ -1181,6 +1237,40 @@ } static int +mac_mls_check_pipe_relabel(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, struct label *newlabel) +{ + struct mac_mls *subj, *obj, *new; + + new = SLOT(newlabel); + subj = SLOT(&cred->cr_label); + obj = SLOT(pipelabel); + + if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAG_SINGLE) + return (EINVAL); + + /* + * To relabel a pipe, the old pipe label must be in the subject + * range. + */ + if (!mac_mls_single_in_range(obj, subj)) + return (EPERM); + + /* + * To relabel a pipe, the new pipe label must be in the subject + * range. + */ + if (!mac_mls_single_in_range(new, subj)) + return (EPERM); + + /* + * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + */ + + return (0); +} + +static int mac_mls_check_proc_debug(struct ucred *cred, struct proc *proc) { struct mac_mls *subj, *obj; @@ -1256,42 +1346,7 @@ } static int -mac_mls_check_socket_visible(struct ucred *cred, struct socket *socket, - struct label *socketlabel) -{ - struct mac_mls *subj, *obj; - - if (!mac_mls_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(socketlabel); - - if (!mac_mls_dominate_single(subj, obj)) - return (ENOENT); - - return (0); -} - -static int -mac_mls_check_relabel_ifnet(struct ucred *cred, struct ifnet *ifnet, - struct label *ifnetlabel, struct label *newlabel) -{ - struct mac_mls *subj, *new; - - subj = SLOT(&cred->cr_label); - new = SLOT(newlabel); - - if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAGS_BOTH) - return (EINVAL); - - /* XXX: privilege model here? */ - - return (suser_cred(cred, 0)); -} - -static int -mac_mls_check_relabel_socket(struct ucred *cred, struct socket *socket, +mac_mls_check_socket_relabel(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { struct mac_mls *subj, *obj, *new; @@ -1325,112 +1380,24 @@ } static int -mac_mls_check_relabel_pipe(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, struct label *newlabel) +mac_mls_check_socket_visible(struct ucred *cred, struct socket *socket, + struct label *socketlabel) { - struct mac_mls *subj, *obj, *new; + struct mac_mls *subj, *obj; - new = SLOT(newlabel); - subj = SLOT(&cred->cr_label); - obj = SLOT(pipelabel); - - if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAG_SINGLE) - return (EINVAL); - - /* - * To relabel a pipe, the old pipe label must be in the subject - * range. - */ - if (!mac_mls_single_in_range(obj, subj)) - return (EPERM); - - /* - * To relabel a pipe, the new pipe label must be in the subject - * range. - */ - if (!mac_mls_single_in_range(new, subj)) - return (EPERM); - - /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. - */ - - return (0); -} + if (!mac_mls_enabled) + return (0); -static int -mac_mls_check_relabel_subject(struct ucred *cred, struct label *newlabel) -{ - struct mac_mls *subj, *new; - subj = SLOT(&cred->cr_label); - new = SLOT(newlabel); + obj = SLOT(socketlabel); - if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAGS_BOTH) - return (EINVAL); - - /* - * XXX: Allow processes with root privilege to set labels outside - * their range, so suid things like "su" work. This WILL go away - * when we figure out the 'correct' solution... - */ - if (!suser_cred(cred, 0)) - return (0); - - /* - * The new single must be in the old range. - */ - if (!mac_mls_single_in_range(new, subj)) - return (EPERM); - - /* - * The new range must be in the old range. - */ - if (!mac_mls_range_in_range(new, subj)) - return (EPERM); - - /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. - */ + if (!mac_mls_dominate_single(subj, obj)) + return (ENOENT); return (0); } static int -mac_mls_check_relabel_vnode(struct ucred *cred, struct vnode *vp, - struct label *vnodelabel, struct label *newlabel) -{ - struct mac_mls *old, *new, *subj; - - old = SLOT(vnodelabel); - new = SLOT(newlabel); - subj = SLOT(&cred->cr_label); - - if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAG_SINGLE) - return (EINVAL); - - /* - * To relabel a vnode, the old vnode label must be in the subject - * range. - */ - if (!mac_mls_single_in_range(old, subj)) - return (EPERM); - - /* - * To relabel a vnode, the new vnode label must be in the subject - * range. - */ - if (!mac_mls_single_in_range(new, subj)) - return (EPERM); - - /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. - */ - - return (suser_cred(cred, 0)); -} - -static int mac_mls_check_vnode_access(struct ucred *cred, struct vnode *vp, struct label *label, mode_t flags) { @@ -1668,6 +1635,41 @@ } static int +mac_mls_check_vnode_relabel(struct ucred *cred, struct vnode *vp, + struct label *vnodelabel, struct label *newlabel) +{ + struct mac_mls *old, *new, *subj; + + old = SLOT(vnodelabel); + new = SLOT(newlabel); + subj = SLOT(&cred->cr_label); + + if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAG_SINGLE) + return (EINVAL); + + /* + * To relabel a vnode, the old vnode label must be in the subject + * range. + */ + if (!mac_mls_single_in_range(old, subj)) + return (EPERM); + + /* + * To relabel a vnode, the new vnode label must be in the subject + * range. + */ + if (!mac_mls_single_in_range(new, subj)) + return (EPERM); + + /* + * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + */ + + return (suser_cred(cred, 0)); +} + + +static int mac_mls_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) @@ -2091,12 +2093,18 @@ (macop_t)mac_mls_relabel_subject }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_mls_check_bpfdesc_receive }, + { MAC_CHECK_CRED_RELABEL, >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 16:43:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B0A837B401; Sun, 28 Jul 2002 16:43:09 -0700 (PDT) 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 F24D437B400 for ; Sun, 28 Jul 2002 16:43:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CA2B43E65 for ; Sun, 28 Jul 2002 16:43:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6SNh3JU014836 for ; Sun, 28 Jul 2002 16:43:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6SNh3NH014833 for perforce@freebsd.org; Sun, 28 Jul 2002 16:43:03 -0700 (PDT) Date: Sun, 28 Jul 2002 16:43:03 -0700 (PDT) Message-Id: <200207282343.g6SNh3NH014833@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15079 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15079 Change 15079 by rwatson@rwatson_paprika on 2002/07/28 16:42:56 Move the pipe_ioctl and pipe_op entry point implementations into the right place alphabetically for the new naming convention. No functional change. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#204 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#81 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#69 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#56 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#61 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#26 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#131 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#97 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#204 (text+ko) ==== @@ -674,6 +674,14 @@ mpc->mpc_ops->mpo_check_mount_stat = mpe->mpe_function; break; + case MAC_CHECK_PIPE_IOCTL: + mpc->mpc_ops->mpo_check_pipe_ioctl = + mpe->mpe_function; + break; + case MAC_CHECK_PIPE_OP: + mpc->mpc_ops->mpo_check_pipe_op = + mpe->mpe_function; + break; case MAC_CHECK_PIPE_RELABEL: mpc->mpc_ops->mpo_check_pipe_relabel = mpe->mpe_function; @@ -818,14 +826,6 @@ mpc->mpc_ops->mpo_check_vnode_op = mpe->mpe_function; break; - case MAC_CHECK_PIPE_IOCTL: - mpc->mpc_ops->mpo_check_pipe_ioctl = - mpe->mpe_function; - break; - case MAC_CHECK_PIPE_OP: - mpc->mpc_ops->mpo_check_pipe_op = - mpe->mpe_function; - break; case MAC_INIT_BPFDESC: mpc->mpc_ops->mpo_init_bpfdesc = mpe->mpe_function; @@ -2331,27 +2331,6 @@ &mbuf->m_pkthdr.label); } -int -mac_check_pipe_op(struct ucred *cred, struct pipe *pipe, int op) -{ - int error; - - MAC_CHECK(check_pipe_op, cred, pipe, pipe->pipe_label, op); - - return (error); -} - -int -mac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, unsigned long cmd, - void *data) -{ - int error; - - MAC_CHECK(check_pipe_ioctl, cred, pipe, pipe->pipe_label, cmd, data); - - return (error); -} - void mac_create_mount(struct ucred *cred, struct mount *mp) { @@ -2437,6 +2416,27 @@ return (error); } +int +mac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, unsigned long cmd, + void *data) +{ + int error; + + MAC_CHECK(check_pipe_ioctl, cred, pipe, pipe->pipe_label, cmd, data); + + return (error); +} + +int +mac_check_pipe_op(struct ucred *cred, struct pipe *pipe, int op) +{ + int error; + + MAC_CHECK(check_pipe_op, cred, pipe, pipe->pipe_label, op); + + return (error); +} + static int mac_check_pipe_relabel(struct ucred *cred, struct pipe *pipe, struct label *newlabel) ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#81 (text+ko) ==== @@ -1290,6 +1290,49 @@ } static int +mac_biba_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) +{ + + if(!mac_biba_enabled) + return (0); + + /* XXX: This will be implemented soon... */ + + return (0); +} + +static int +mac_biba_check_pipe_op(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, int op) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((pipelabel)); + + switch(op) { + case MAC_OP_PIPE_READ: + case MAC_OP_PIPE_STAT: + case MAC_OP_PIPE_POLL: + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + break; + case MAC_OP_PIPE_WRITE: + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + break; + default: + panic("mac_biba_check_pipe_op: invalid pipe operation"); + } + + return (0); +} + +static int mac_biba_check_pipe_relabel(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, struct label *newlabel) { @@ -1965,49 +2008,6 @@ } } -static int -mac_biba_check_pipe_op(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, int op) -{ - struct mac_biba *subj, *obj; - - if (!mac_biba_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT((pipelabel)); - - switch(op) { - case MAC_OP_PIPE_READ: - case MAC_OP_PIPE_STAT: - case MAC_OP_PIPE_POLL: - if (!mac_biba_dominate_single(obj, subj)) - return (EACCES); - break; - case MAC_OP_PIPE_WRITE: - if (!mac_biba_dominate_single(subj, obj)) - return (EACCES); - break; - default: - panic("mac_biba_check_pipe_op: invalid pipe operation"); - } - - return (0); -} - -static int -mac_biba_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) -{ - - if(!mac_biba_enabled) - return (0); - - /* XXX: This will be implemented soon... */ - - return (0); -} - static struct mac_policy_op_entry mac_biba_ops[] = { { MAC_DESTROY, @@ -2152,6 +2152,10 @@ (macop_t)mac_biba_check_ifnet_transmit }, { MAC_CHECK_MOUNT_STAT, (macop_t)mac_biba_check_mount_stat }, + { MAC_CHECK_PIPE_IOCTL, + (macop_t)mac_biba_check_pipe_ioctl }, + { MAC_CHECK_PIPE_OP, + (macop_t)mac_biba_check_pipe_op }, { MAC_CHECK_PIPE_RELABEL, (macop_t)mac_biba_check_pipe_relabel }, { MAC_CHECK_PROC_DEBUG, @@ -2188,10 +2192,6 @@ (macop_t)mac_biba_check_vnode_lookup }, { MAC_CHECK_VNODE_OPEN, (macop_t)mac_biba_check_vnode_open }, - { MAC_CHECK_PIPE_IOCTL, - (macop_t)mac_biba_check_pipe_ioctl }, - { MAC_CHECK_PIPE_OP, - (macop_t)mac_biba_check_pipe_op }, { MAC_CHECK_VNODE_READDIR, (macop_t)mac_biba_check_vnode_readdir }, { MAC_CHECK_VNODE_READLINK, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#69 (text+ko) ==== @@ -1237,6 +1237,49 @@ } static int +mac_mls_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) +{ + + if(!mac_mls_enabled) + return (0); + + /* XXX: This will be implemented soon... */ + + return (0); +} + +static int +mac_mls_check_pipe_op(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, int op) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((pipelabel)); + + switch(op) { + case MAC_OP_PIPE_READ: + case MAC_OP_PIPE_STAT: + case MAC_OP_PIPE_POLL: + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + break; + case MAC_OP_PIPE_WRITE: + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + break; + default: + panic("mac_mls_check_pipe_op: invalid pipe operation"); + } + + return (0); +} + +static int mac_mls_check_pipe_relabel(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, struct label *newlabel) { @@ -1916,49 +1959,6 @@ } } -static int -mac_mls_check_pipe_op(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, int op) -{ - struct mac_mls *subj, *obj; - - if (!mac_mls_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT((pipelabel)); - - switch(op) { - case MAC_OP_PIPE_READ: - case MAC_OP_PIPE_STAT: - case MAC_OP_PIPE_POLL: - if (!mac_mls_dominate_single(subj, obj)) - return (EACCES); - break; - case MAC_OP_PIPE_WRITE: - if (!mac_mls_dominate_single(obj, subj)) - return (EACCES); - break; - default: - panic("mac_mls_check_pipe_op: invalid pipe operation"); - } - - return (0); -} - -static int -mac_mls_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) -{ - - if(!mac_mls_enabled) - return (0); - - /* XXX: This will be implemented soon... */ - - return (0); -} - static struct mac_policy_op_entry mac_mls_ops[] = { { MAC_DESTROY, @@ -2103,6 +2103,10 @@ (macop_t)mac_mls_check_ifnet_transmit }, { MAC_CHECK_MOUNT_STAT, (macop_t)mac_mls_check_mount_stat }, + { MAC_CHECK_PIPE_IOCTL, + (macop_t)mac_mls_check_pipe_ioctl }, + { MAC_CHECK_PIPE_OP, + (macop_t)mac_mls_check_pipe_op }, { MAC_CHECK_PIPE_RELABEL, (macop_t)mac_mls_check_pipe_relabel }, { MAC_CHECK_PROC_DEBUG, @@ -2139,10 +2143,6 @@ (macop_t)mac_mls_check_vnode_lookup }, { MAC_CHECK_VNODE_OPEN, (macop_t)mac_mls_check_vnode_open }, - { MAC_CHECK_PIPE_IOCTL, - (macop_t)mac_mls_check_pipe_ioctl }, - { MAC_CHECK_PIPE_OP, - (macop_t)mac_mls_check_pipe_op }, { MAC_CHECK_VNODE_READDIR, (macop_t)mac_mls_check_vnode_readdir }, { MAC_CHECK_VNODE_READLINK, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#56 (text+ko) ==== @@ -595,6 +595,22 @@ } static int +mac_none_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) +{ + + return (0); +} + +static int +mac_none_check_pipe_op(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, int op) +{ + + return (0); +} + +static int mac_none_check_pipe_relabel(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, struct label *newlabel) { @@ -866,22 +882,6 @@ return (0); } -static int -mac_none_check_pipe_op(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, int op) -{ - - return (0); -} - -static int -mac_none_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) -{ - - return (0); -} - static struct mac_policy_op_entry mac_none_ops[] = { { MAC_DESTROY, @@ -1028,6 +1028,10 @@ (macop_t)mac_none_check_ifnet_transmit }, { MAC_CHECK_MOUNT_STAT, (macop_t)mac_none_check_mount_stat }, + { MAC_CHECK_PIPE_IOCTL, + (macop_t)mac_none_check_pipe_ioctl }, + { MAC_CHECK_PIPE_OP, + (macop_t)mac_none_check_pipe_op }, { MAC_CHECK_PIPE_RELABEL, (macop_t)mac_none_check_pipe_relabel }, { MAC_CHECK_PROC_DEBUG, @@ -1096,10 +1100,6 @@ (macop_t)mac_none_check_vnode_setutimes }, { MAC_CHECK_VNODE_STAT, (macop_t)mac_none_check_vnode_stat }, - { MAC_CHECK_PIPE_IOCTL, - (macop_t)mac_none_check_pipe_ioctl }, - { MAC_CHECK_PIPE_OP, - (macop_t)mac_none_check_pipe_op }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#61 (text+ko) ==== @@ -686,6 +686,26 @@ } static int +mac_te_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) +{ + + /* XXX: This will be implemented soon... */ + + return (0); +} + +static int +mac_te_check_pipe_op(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, int op) +{ + + /* XXX: This will be implemented soon... */ + + return (0); +} + +static int mac_te_check_pipe_relabel(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, struct label *newlabel) { @@ -1650,26 +1670,6 @@ mac_te_copy_label(SLOT(fragmentlabel), SLOT(ipqlabel)); } -static int -mac_te_check_pipe_op(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, int op) -{ - - /* XXX: This will be implemented soon... */ - - return (0); -} - -static int -mac_te_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) -{ - - /* XXX: This will be implemented soon... */ - - return (0); -} - static struct mac_policy_op_entry mac_te_ops[] = { { MAC_INIT_BPFDESC, (macop_t)mac_te_init_bpfdesc }, @@ -1754,6 +1754,10 @@ (macop_t)mac_te_check_ifnet_transmit }, { MAC_CHECK_MOUNT_STAT, (macop_t)mac_te_check_mount_stat }, + { MAC_CHECK_PIPE_IOCTL, + (macop_t)mac_te_check_pipe_ioctl }, + { MAC_CHECK_PIPE_OP, + (macop_t)mac_te_check_pipe_op }, { MAC_CHECK_PIPE_RELABEL, (macop_t)mac_te_check_pipe_relabel }, { MAC_CHECK_PROC_DEBUG, @@ -1819,11 +1823,8 @@ (macop_t)mac_te_check_setowner_vnode }, { MAC_CHECK_VNODE_SETUTIMES, (macop_t)mac_te_check_vnode_setutimes }, - { MAC_CHECK_PIPE_IOCTL, - (macop_t)mac_te_check_pipe_ioctl }, - { MAC_CHECK_PIPE_OP, - (macop_t)mac_te_check_pipe_op }, - { MAC_CHECK_VNODE_STAT, (macop_t)mac_te_check_stat_vnode }, + { MAC_CHECK_VNODE_STAT, + (macop_t)mac_te_check_stat_vnode }, { MAC_CHECK_VNODE_MMAP_PERMS, (macop_t)mac_te_check_vnode_mmap_perms }, { MAC_CHECK_VNODE_OP, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#26 (text+ko) ==== @@ -803,6 +803,22 @@ } static int +mac_test_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) +{ + + return (0); +} + +static int +mac_test_check_pipe_op(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, int op) +{ + + return (0); +} + +static int mac_test_check_pipe_relabel(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, struct label *newlabel) { @@ -880,22 +896,6 @@ } static int -mac_test_check_pipe_op(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, int op) -{ - - return (0); -} - -static int -mac_test_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) -{ - - return (0); -} - -static int mac_test_check_vnode_access(struct ucred *cred, struct vnode *vp, struct label *label, mode_t flags) { @@ -1234,6 +1234,10 @@ (macop_t)mac_test_check_ifnet_transmit }, { MAC_CHECK_MOUNT_STAT, (macop_t)mac_test_check_mount_stat }, + { MAC_CHECK_PIPE_IOCTL, + (macop_t)mac_test_check_pipe_ioctl }, + { MAC_CHECK_PIPE_OP, + (macop_t)mac_test_check_pipe_op }, { MAC_CHECK_PIPE_RELABEL, (macop_t)mac_test_check_pipe_relabel }, { MAC_CHECK_PROC_DEBUG, @@ -1302,10 +1306,6 @@ (macop_t)mac_test_check_vnode_setutimes }, { MAC_CHECK_VNODE_STAT, (macop_t)mac_test_check_vnode_stat }, - { MAC_CHECK_PIPE_IOCTL, - (macop_t)mac_test_check_pipe_ioctl }, - { MAC_CHECK_PIPE_OP, - (macop_t)mac_test_check_pipe_op }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#131 (text+ko) ==== @@ -259,6 +259,9 @@ /* Authorizational event hooks. */ int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); int mac_check_mount_stat(struct ucred *cred, struct mount *mp); +int mac_check_pipe_op(struct ucred *cred, struct pipe *pipe, int op); +int mac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, + unsigned long cmd, void *data); int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int flags); int mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp); @@ -302,9 +305,6 @@ int mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp); int mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp); int mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op); -int mac_check_pipe_op(struct ucred *cred, struct pipe *pipe, int op); -int mac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, - unsigned long cmd, void *data); int mac_getsockopt_label_get(struct ucred *cred, struct socket *so, struct mac *extmac); int mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#97 (text+ko) ==== @@ -242,6 +242,11 @@ struct label *mbuflabel); int (*mpo_check_mount_stat)(struct ucred *cred, struct mount *mp, struct label *mntlabel); + int (*mpo_check_pipe_ioctl)(struct ucred *cred, + struct pipe *pipe, struct label *pipelabel, + unsigned long cmd, void *data); + int (*mpo_check_pipe_op)(struct ucred *cred, + struct pipe *pipe, struct label *pipelabel, int op); int (*mpo_check_pipe_relabel)(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, struct label *newlabel); @@ -331,11 +336,6 @@ struct vnode *vp, struct label *label, int newmapping); int (*mpo_check_vnode_op)(struct ucred *cred, struct vnode *vp, struct label *label, int op); - int (*mpo_check_pipe_op)(struct ucred *cred, - struct pipe *pipe, struct label *pipelabel, int op); - int (*mpo_check_pipe_ioctl)(struct ucred *cred, - struct pipe *pipe, struct label *pipelabel, - unsigned long cmd, void /* caddr_t */ *data); }; typedef void *macop_t; @@ -415,6 +415,8 @@ MAC_CHECK_IFNET_RELABEL, MAC_CHECK_IFNET_TRANSMIT, MAC_CHECK_MOUNT_STAT, + MAC_CHECK_PIPE_IOCTL, + MAC_CHECK_PIPE_OP, MAC_CHECK_PIPE_RELABEL, MAC_CHECK_PROC_DEBUG, MAC_CHECK_PROC_SCHED, @@ -451,8 +453,6 @@ MAC_CHECK_VNODE_STAT, MAC_CHECK_VNODE_MMAP_PERMS, MAC_CHECK_VNODE_OP, - MAC_CHECK_PIPE_IOCTL, - MAC_CHECK_PIPE_OP }; struct mac_policy_op_entry { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 18:47:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E17837B401; Sun, 28 Jul 2002 18:46:40 -0700 (PDT) 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 E53E237B400 for ; Sun, 28 Jul 2002 18:46:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2ABC343E5E for ; Sun, 28 Jul 2002 18:46:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T1kdJU034813 for ; Sun, 28 Jul 2002 18:46:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T1kcBq034810 for perforce@freebsd.org; Sun, 28 Jul 2002 18:46:38 -0700 (PDT) Date: Sun, 28 Jul 2002 18:46:38 -0700 (PDT) Message-Id: <200207290146.g6T1kcBq034810@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15085 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15085 Change 15085 by rwatson@rwatson_paprika on 2002/07/28 18:45:59 Generally rename "subject" to "cred" where we're specifically referring to credentials. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#5 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#205 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#25 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#82 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#70 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#57 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#10 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#62 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#27 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#18 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#132 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#98 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#5 (text+ko) ==== @@ -60,7 +60,7 @@ mac_update_vnode_from_mount(vp, vp->v_mount); else { PROC_LOCK(p); - mac_update_procfsvnode_from_subject(vp, p->p_ucred); + mac_update_procfsvnode_from_cred(vp, p->p_ucred); PROC_UNLOCK(p); } ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#205 (text+ko) ==== @@ -531,8 +531,8 @@ mpc->mpc_ops->mpo_update_devfsdirent_from_vnode = mpe->mpe_function; break; - case MAC_UPDATE_PROCFSVNODE_FROM_SUBJECT: - mpc->mpc_ops->mpo_update_procfsvnode_from_subject = + case MAC_UPDATE_PROCFSVNODE_FROM_CRED: + mpc->mpc_ops->mpo_update_procfsvnode_from_cred = mpe->mpe_function; break; case MAC_UPDATE_VNODE_FROM_EXTATTR: @@ -630,8 +630,9 @@ mpc->mpc_ops->mpo_update_ipq_from_fragment = mpe->mpe_function; break; - case MAC_CREATE_SUBJECT: - mpc->mpc_ops->mpo_create_subject = mpe->mpe_function; + case MAC_CREATE_CRED: + mpc->mpc_ops->mpo_create_cred = + mpe->mpe_function; break; case MAC_EXECVE_TRANSITION: mpc->mpc_ops->mpo_execve_transition = mpe->mpe_function; @@ -646,8 +647,8 @@ case MAC_CREATE_PROC1: mpc->mpc_ops->mpo_create_proc1 = mpe->mpe_function; break; - case MAC_RELABEL_SUBJECT: - mpc->mpc_ops->mpo_relabel_subject = + case MAC_RELABEL_CRED: + mpc->mpc_ops->mpo_relabel_cred = mpe->mpe_function; break; case MAC_CHECK_BPFDESC_RECEIVE: @@ -830,6 +831,10 @@ mpc->mpc_ops->mpo_init_bpfdesc = mpe->mpe_function; break; + case MAC_INIT_CRED: + mpc->mpc_ops->mpo_init_cred = + mpe->mpe_function; + break; case MAC_INIT_DEVFSDIRENT: mpc->mpc_ops->mpo_init_devfsdirent = mpe->mpe_function; @@ -858,10 +863,6 @@ mpc->mpc_ops->mpo_init_socket = mpe->mpe_function; break; - case MAC_INIT_SUBJECT: - mpc->mpc_ops->mpo_init_subject = - mpe->mpe_function; - break; case MAC_INIT_TEMP: mpc->mpc_ops->mpo_init_temp = mpe->mpe_function; @@ -874,6 +875,10 @@ mpc->mpc_ops->mpo_destroy_bpfdesc = mpe->mpe_function; break; + case MAC_DESTROY_CRED: + mpc->mpc_ops->mpo_destroy_cred = + mpe->mpe_function; + break; case MAC_DESTROY_DEVFSDIRENT: mpc->mpc_ops->mpo_destroy_devfsdirent = mpe->mpe_function; @@ -902,10 +907,6 @@ mpc->mpc_ops->mpo_destroy_socket = mpe->mpe_function; break; - case MAC_DESTROY_SUBJECT: - mpc->mpc_ops->mpo_destroy_subject = - mpe->mpe_function; - break; case MAC_DESTROY_TEMP: mpc->mpc_ops->mpo_destroy_temp = mpe->mpe_function; @@ -1050,10 +1051,10 @@ } void -mac_update_procfsvnode_from_subject(struct vnode *vp, struct ucred *cred) +mac_update_procfsvnode_from_cred(struct vnode *vp, struct ucred *cred) { - MAC_PERFORM(update_procfsvnode_from_subject, vp, &vp->v_label, cred); + MAC_PERFORM(update_procfsvnode_from_cred, vp, &vp->v_label, cred); } /* @@ -1348,13 +1349,13 @@ /* label->l_flags &= ~MAC_FLAG_INITIALIZED; */ } -static unsigned int nmacmbufs, nmacsubjects, nmacifnets, nmacbpfdescs, +static unsigned int nmacmbufs, nmaccreds, nmacifnets, nmacbpfdescs, nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, nmacipqs, nmacpipes; SYSCTL_UINT(_security_mac_debug, OID_AUTO, mbufs, CTLFLAG_RD, &nmacmbufs, 0, "number of mbufs in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, subjects, CTLFLAG_RD, - &nmacsubjects, 0, "number of ucreds in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, creds, CTLFLAG_RD, + &nmaccreds, 0, "number of ucreds in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, ifnets, CTLFLAG_RD, &nmacifnets, 0, "number of ifnets in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, ipqs, CTLFLAG_RD, @@ -1396,21 +1397,21 @@ } void -mac_init_subject(struct ucred *cr) +mac_init_cred(struct ucred *cr) { mac_init_label(&cr->cr_label); - MAC_PERFORM(init_subject, cr, &cr->cr_label); - atomic_add_int(&nmacsubjects, 1); + MAC_PERFORM(init_cred, cr, &cr->cr_label); + atomic_add_int(&nmaccreds, 1); } void -mac_destroy_subject(struct ucred *cr) +mac_destroy_cred(struct ucred *cr) { - MAC_PERFORM(destroy_subject, cr, &cr->cr_label); + MAC_PERFORM(destroy_cred, cr, &cr->cr_label); mac_destroy_label(&cr->cr_label); - atomic_subtract_int(&nmacsubjects, 1); + atomic_subtract_int(&nmaccreds, 1); } void @@ -1661,10 +1662,10 @@ * deltas. This function allows that processing to take place. */ void -mac_create_subject(struct ucred *parent_cred, struct ucred *child_cred) +mac_create_cred(struct ucred *parent_cred, struct ucred *child_cred) { - MAC_PERFORM(create_subject, parent_cred, child_cred); + MAC_PERFORM(create_cred, parent_cred, child_cred); } int @@ -2146,10 +2147,10 @@ * buffer cache. */ static void -mac_relabel_subject(struct ucred *cred, struct label *newlabel) +mac_relabel_cred(struct ucred *cred, struct label *newlabel) { - MAC_PERFORM(relabel_subject, cred, newlabel); + MAC_PERFORM(relabel_cred, cred, newlabel); mac_subject_mmapped_drop_perms(curthread, cred); } @@ -2895,7 +2896,7 @@ setsugid(p); crcopy(newcred, oldcred); PROC_UNLOCK(p); - mac_relabel_subject(newcred, &intlabel); + mac_relabel_cred(newcred, &intlabel); PROC_LOCK(p); p->p_ucred = newcred; ==== //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#25 (text+ko) ==== @@ -1694,7 +1694,7 @@ cr->cr_ref = 1; cr->cr_mtxp = mtx_pool_find(cr); #ifdef MAC - mac_init_subject(cr); + mac_init_cred(cr); #endif /* MAC */ return (cr); } @@ -1741,7 +1741,7 @@ if (jailed(cr)) prison_free(cr->cr_prison); #ifdef MAC - mac_destroy_subject(cr); + mac_destroy_cred(cr); #endif /* MAC */ FREE(cr, M_CRED); mtx_unlock(&Giant); @@ -1780,7 +1780,7 @@ if (jailed(dest)) prison_hold(dest->cr_prison); #if MAC - mac_create_subject(src, dest); + mac_create_cred(src, dest); #endif } ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#82 (text+ko) ==== @@ -410,6 +410,13 @@ } static void +mac_biba_init_cred(struct ucred *ucred, struct label *label) +{ + + SLOT(label) = biba_alloc(M_WAITOK); +} + +static void mac_biba_init_devfsdirent(struct devfs_dirent *devfs_dirent, struct label *label) { @@ -468,28 +475,29 @@ } static void -mac_biba_init_subject(struct ucred *ucred, struct label *label) +mac_biba_init_temp(struct label *label) { SLOT(label) = biba_alloc(M_WAITOK); } static void -mac_biba_init_temp(struct label *label) +mac_biba_init_vnode(struct vnode *vp, struct label *label) { SLOT(label) = biba_alloc(M_WAITOK); } static void -mac_biba_init_vnode(struct vnode *vp, struct label *label) +mac_biba_destroy_bpfdesc(struct bpf_d *bpf_d, struct label *label) { - SLOT(label) = biba_alloc(M_WAITOK); + biba_free(SLOT(label)); + SLOT(label) = NULL; } static void -mac_biba_destroy_bpfdesc(struct bpf_d *bpf_d, struct label *label) +mac_biba_destroy_cred(struct ucred *ucred, struct label *label) { biba_free(SLOT(label)); @@ -560,14 +568,6 @@ } static void -mac_biba_destroy_subject(struct ucred *ucred, struct label *label) -{ - - biba_free(SLOT(label)); - SLOT(label) = NULL; -} - -static void mac_biba_destroy_temp(struct label *label) { @@ -724,7 +724,7 @@ } static void -mac_biba_update_procfsvnode_from_subject(struct vnode *vp, +mac_biba_update_procfsvnode_from_cred(struct vnode *vp, struct label *vnodelabel, struct ucred *cred) { struct mac_biba *source, *dest; @@ -1094,7 +1094,7 @@ * Labeling event operations: processes. */ static void -mac_biba_create_subject(struct ucred *cred_parent, struct ucred *cred_child) +mac_biba_create_cred(struct ucred *cred_parent, struct ucred *cred_child) { struct mac_biba *source, *dest; @@ -1149,7 +1149,7 @@ } static void -mac_biba_relabel_subject(struct ucred *cred, struct label *newlabel) +mac_biba_relabel_cred(struct ucred *cred, struct label *newlabel) { struct mac_biba *source, *dest; @@ -2016,6 +2016,8 @@ (macop_t)mac_biba_init }, { MAC_INIT_BPFDESC, (macop_t)mac_biba_init_bpfdesc }, + { MAC_INIT_CRED, + (macop_t)mac_biba_init_cred }, { MAC_INIT_DEVFSDIRENT, (macop_t)mac_biba_init_devfsdirent }, { MAC_INIT_IFNET, @@ -2030,14 +2032,14 @@ (macop_t)mac_biba_init_pipe }, { MAC_INIT_SOCKET, (macop_t)mac_biba_init_socket }, - { MAC_INIT_SUBJECT, - (macop_t)mac_biba_init_subject }, { MAC_INIT_TEMP, (macop_t)mac_biba_init_temp }, { MAC_INIT_VNODE, (macop_t)mac_biba_init_vnode }, { MAC_DESTROY_BPFDESC, (macop_t)mac_biba_destroy_bpfdesc }, + { MAC_DESTROY_CRED, + (macop_t)mac_biba_destroy_cred }, { MAC_DESTROY_DEVFSDIRENT, (macop_t)mac_biba_destroy_devfsdirent }, { MAC_DESTROY_IFNET, @@ -2052,8 +2054,6 @@ (macop_t)mac_biba_destroy_pipe }, { MAC_DESTROY_SOCKET, (macop_t)mac_biba_destroy_socket }, - { MAC_DESTROY_SUBJECT, - (macop_t)mac_biba_destroy_subject }, { MAC_DESTROY_TEMP, (macop_t)mac_biba_destroy_temp }, { MAC_DESTROY_VNODE, @@ -2078,8 +2078,8 @@ (macop_t)mac_biba_relabel_vnode }, { MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, (macop_t)mac_biba_update_devfsdirent_from_vnode }, - { MAC_UPDATE_PROCFSVNODE_FROM_SUBJECT, - (macop_t)mac_biba_update_procfsvnode_from_subject }, + { MAC_UPDATE_PROCFSVNODE_FROM_CRED, + (macop_t)mac_biba_update_procfsvnode_from_cred }, { MAC_UPDATE_VNODE_FROM_EXTERNALIZED, (macop_t)mac_biba_update_vnode_from_externalized }, { MAC_UPDATE_VNODE_FROM_MOUNT, @@ -2128,8 +2128,8 @@ (macop_t)mac_biba_relabel_ifnet }, { MAC_UPDATE_IPQ_FROM_FRAGMENT, (macop_t)mac_biba_update_ipq_from_fragment }, - { MAC_CREATE_SUBJECT, - (macop_t)mac_biba_create_subject }, + { MAC_CREATE_CRED, + (macop_t)mac_biba_create_cred }, { MAC_EXECVE_TRANSITION, (macop_t)mac_biba_execve_transition }, { MAC_EXECVE_WILL_TRANSITION, @@ -2138,8 +2138,8 @@ (macop_t)mac_biba_create_proc0 }, { MAC_CREATE_PROC1, (macop_t)mac_biba_create_proc1 }, - { MAC_RELABEL_SUBJECT, - (macop_t)mac_biba_relabel_subject }, + { MAC_RELABEL_CRED, + (macop_t)mac_biba_relabel_cred }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_biba_check_bpfdesc_receive }, { MAC_CHECK_CRED_RELABEL, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#70 (text+ko) ==== @@ -392,6 +392,13 @@ } static void +mac_mls_init_cred(struct ucred *ucred, struct label *label) +{ + + SLOT(label) = mls_alloc(M_WAITOK); +} + +static void mac_mls_init_devfsdirent(struct devfs_dirent *devfs_dirent, struct label *label) { @@ -450,28 +457,29 @@ } static void -mac_mls_init_subject(struct ucred *ucred, struct label *label) +mac_mls_init_temp(struct label *label) { SLOT(label) = mls_alloc(M_WAITOK); } static void -mac_mls_init_temp(struct label *label) +mac_mls_init_vnode(struct vnode *vp, struct label *label) { SLOT(label) = mls_alloc(M_WAITOK); } static void -mac_mls_init_vnode(struct vnode *vp, struct label *label) +mac_mls_destroy_bpfdesc(struct bpf_d *bpf_d, struct label *label) { - SLOT(label) = mls_alloc(M_WAITOK); + mls_free(SLOT(label)); + SLOT(label) = NULL; } static void -mac_mls_destroy_bpfdesc(struct bpf_d *bpf_d, struct label *label) +mac_mls_destroy_cred(struct ucred *ucred, struct label *label) { mls_free(SLOT(label)); @@ -542,14 +550,6 @@ } static void -mac_mls_destroy_subject(struct ucred *ucred, struct label *label) -{ - - mls_free(SLOT(label)); - SLOT(label) = NULL; -} - -static void mac_mls_destroy_temp(struct label *label) { @@ -709,7 +709,7 @@ } static void -mac_mls_update_procfsvnode_from_subject(struct vnode *vp, +mac_mls_update_procfsvnode_from_cred(struct vnode *vp, struct label *vnodelabel, struct ucred *cred) { struct mac_mls *source, *dest; @@ -1043,7 +1043,7 @@ * Labeling event operations: processes. */ static void -mac_mls_create_subject(struct ucred *cred_parent, struct ucred *cred_child) +mac_mls_create_cred(struct ucred *cred_parent, struct ucred *cred_child) { struct mac_mls *source, *dest; @@ -1098,7 +1098,7 @@ } static void -mac_mls_relabel_subject(struct ucred *cred, struct label *newlabel) +mac_mls_relabel_cred(struct ucred *cred, struct label *newlabel) { struct mac_mls *source, *dest; @@ -1967,6 +1967,8 @@ (macop_t)mac_mls_init }, { MAC_INIT_BPFDESC, (macop_t)mac_mls_init_bpfdesc }, + { MAC_INIT_CRED, + (macop_t)mac_mls_init_cred }, { MAC_INIT_DEVFSDIRENT, (macop_t)mac_mls_init_devfsdirent }, { MAC_INIT_IFNET, @@ -1981,14 +1983,14 @@ (macop_t)mac_mls_init_pipe }, { MAC_INIT_SOCKET, (macop_t)mac_mls_init_socket }, - { MAC_INIT_SUBJECT, - (macop_t)mac_mls_init_subject }, { MAC_INIT_TEMP, (macop_t)mac_mls_init_temp }, { MAC_INIT_VNODE, (macop_t)mac_mls_init_vnode }, { MAC_DESTROY_BPFDESC, (macop_t)mac_mls_destroy_bpfdesc }, + { MAC_DESTROY_CRED, + (macop_t)mac_mls_destroy_cred }, { MAC_DESTROY_DEVFSDIRENT, (macop_t)mac_mls_destroy_devfsdirent }, { MAC_DESTROY_IFNET, @@ -2003,8 +2005,6 @@ (macop_t)mac_mls_destroy_pipe }, { MAC_DESTROY_SOCKET, (macop_t)mac_mls_destroy_socket }, - { MAC_DESTROY_SUBJECT, - (macop_t)mac_mls_destroy_subject }, { MAC_DESTROY_TEMP, (macop_t)mac_mls_destroy_temp }, { MAC_DESTROY_VNODE, @@ -2029,8 +2029,8 @@ (macop_t)mac_mls_relabel_vnode }, { MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, (macop_t)mac_mls_update_devfsdirent_from_vnode }, - { MAC_UPDATE_PROCFSVNODE_FROM_SUBJECT, - (macop_t)mac_mls_update_procfsvnode_from_subject }, + { MAC_UPDATE_PROCFSVNODE_FROM_CRED, + (macop_t)mac_mls_update_procfsvnode_from_cred }, { MAC_UPDATE_VNODE_FROM_EXTERNALIZED, (macop_t)mac_mls_update_vnode_from_externalized }, { MAC_UPDATE_VNODE_FROM_MOUNT, @@ -2079,8 +2079,8 @@ (macop_t)mac_mls_relabel_ifnet }, { MAC_UPDATE_IPQ_FROM_FRAGMENT, (macop_t)mac_mls_update_ipq_from_fragment }, - { MAC_CREATE_SUBJECT, - (macop_t)mac_mls_create_subject }, + { MAC_CREATE_CRED, + (macop_t)mac_mls_create_cred }, { MAC_EXECVE_TRANSITION, (macop_t)mac_mls_execve_transition }, { MAC_EXECVE_WILL_TRANSITION, @@ -2089,8 +2089,8 @@ (macop_t)mac_mls_create_proc0 }, { MAC_CREATE_PROC1, (macop_t)mac_mls_create_proc1 }, - { MAC_RELABEL_SUBJECT, - (macop_t)mac_mls_relabel_subject }, + { MAC_RELABEL_CRED, + (macop_t)mac_mls_relabel_cred }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_mls_check_bpfdesc_receive }, { MAC_CHECK_CRED_RELABEL, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#57 (text+ko) ==== @@ -108,6 +108,12 @@ } static void +mac_none_init_cred(struct ucred *ucred, struct label *label) +{ + +} + +static void mac_none_init_devfsdirent(struct devfs_dirent *devfs_dirent, struct label *label) { @@ -154,25 +160,25 @@ } static void -mac_none_init_subject(struct ucred *ucred, struct label *label) +mac_none_init_temp(struct label *label) { } static void -mac_none_init_temp(struct label *label) +mac_none_init_vnode(struct vnode *vp, struct label *label) { } static void -mac_none_init_vnode(struct vnode *vp, struct label *label) +mac_none_destroy_bpfdesc(struct bpf_d *bpf_d, struct label *label) { } static void -mac_none_destroy_bpfdesc(struct bpf_d *bpf_d, struct label *label) +mac_none_destroy_cred(struct ucred *ucred, struct label *label) { } @@ -223,12 +229,6 @@ } static void -mac_none_destroy_subject(struct ucred *ucred, struct label *label) -{ - -} - -static void mac_none_destroy_temp(struct label *label) { @@ -316,7 +316,7 @@ } static void -mac_none_update_procfsvnode_from_subject(struct vnode *vp, +mac_none_update_procfsvnode_from_cred(struct vnode *vp, struct label *vnodelabel, struct ucred *cred) { @@ -507,7 +507,7 @@ * Labeling event operations: processes. */ static void -mac_none_create_subject(struct ucred *cred_parent, struct ucred *cred_child) +mac_none_create_cred(struct ucred *cred_parent, struct ucred *cred_child) { } @@ -540,7 +540,7 @@ } static void -mac_none_relabel_subject(struct ucred *cred, struct label *newlabel) +mac_none_relabel_cred(struct ucred *cred, struct label *newlabel) { } @@ -890,6 +890,8 @@ (macop_t)mac_none_init }, { MAC_INIT_BPFDESC, (macop_t)mac_none_init_bpfdesc }, + { MAC_INIT_CRED, + (macop_t)mac_none_init_cred }, { MAC_INIT_DEVFSDIRENT, (macop_t)mac_none_init_devfsdirent }, { MAC_INIT_IFNET, @@ -904,14 +906,14 @@ (macop_t)mac_none_init_pipe }, { MAC_INIT_SOCKET, (macop_t)mac_none_init_socket }, - { MAC_INIT_SUBJECT, - (macop_t)mac_none_init_subject }, { MAC_INIT_TEMP, (macop_t)mac_none_init_temp }, { MAC_INIT_VNODE, (macop_t)mac_none_init_vnode }, { MAC_DESTROY_BPFDESC, (macop_t)mac_none_destroy_bpfdesc }, + { MAC_DESTROY_CRED, + (macop_t)mac_none_destroy_cred }, { MAC_DESTROY_DEVFSDIRENT, (macop_t)mac_none_destroy_devfsdirent }, { MAC_DESTROY_IFNET, @@ -926,8 +928,6 @@ (macop_t)mac_none_destroy_pipe }, { MAC_DESTROY_SOCKET, (macop_t)mac_none_destroy_socket }, - { MAC_DESTROY_SUBJECT, - (macop_t)mac_none_destroy_subject }, { MAC_DESTROY_TEMP, (macop_t)mac_none_destroy_temp }, { MAC_DESTROY_VNODE, @@ -952,8 +952,8 @@ (macop_t)mac_none_relabel_vnode }, { MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, (macop_t)mac_none_update_devfsdirent_from_vnode }, - { MAC_UPDATE_PROCFSVNODE_FROM_SUBJECT, - (macop_t)mac_none_update_procfsvnode_from_subject }, + { MAC_UPDATE_PROCFSVNODE_FROM_CRED, + (macop_t)mac_none_update_procfsvnode_from_cred }, { MAC_UPDATE_VNODE_FROM_EXTERNALIZED, (macop_t)mac_none_update_vnode_from_externalized }, { MAC_UPDATE_VNODE_FROM_MOUNT, @@ -1004,8 +1004,8 @@ (macop_t)mac_none_relabel_ifnet }, { MAC_UPDATE_IPQ_FROM_FRAGMENT, (macop_t)mac_none_update_ipq_from_fragment }, - { MAC_CREATE_SUBJECT, - (macop_t)mac_none_create_subject }, + { MAC_CREATE_CRED, + (macop_t)mac_none_create_cred }, { MAC_EXECVE_TRANSITION, (macop_t)mac_none_execve_transition }, { MAC_EXECVE_WILL_TRANSITION, @@ -1014,8 +1014,8 @@ (macop_t)mac_none_create_proc0 }, { MAC_CREATE_PROC1, (macop_t)mac_none_create_proc1 }, - { MAC_RELABEL_SUBJECT, - (macop_t)mac_none_relabel_subject }, + { MAC_RELABEL_CRED, + (macop_t)mac_none_relabel_cred }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_none_check_bpfdesc_receive }, { MAC_CHECK_CRED_RELABEL, ==== //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#10 (text+ko) ==== @@ -88,7 +88,7 @@ } static void -mac_partition_init_subject(struct ucred *ucred, struct label *label) +mac_partition_init_cred(struct ucred *ucred, struct label *label) { SLOT(label) = 0; @@ -102,7 +102,7 @@ } static void -mac_partition_destroy_subject(struct ucred *ucred, struct label *label) +mac_partition_destroy_cred(struct ucred *ucred, struct label *label) { SLOT(label) = 0; @@ -134,8 +134,7 @@ } static void -mac_partition_create_subject(struct ucred *cred_parent, - struct ucred *cred_child) +mac_partition_create_cred(struct ucred *cred_parent, struct ucred *cred_child) { SLOT(&cred_child->cr_label) = SLOT(&cred_parent->cr_label); @@ -146,7 +145,7 @@ struct vnode *vp, struct label *vnodelabel) { - mac_partition_create_subject(old, new); + mac_partition_create_cred(old, new); } static void @@ -164,7 +163,7 @@ } static void -mac_partition_relabel_subject(struct ucred *cred, struct label *newlabel) +mac_partition_relabel_cred(struct ucred *cred, struct label *newlabel) { if (SLOT(newlabel) != 0) @@ -255,28 +254,28 @@ { { MAC_INIT, (macop_t)mac_partition_init }, - { MAC_INIT_SUBJECT, - (macop_t)mac_partition_init_subject }, + { MAC_INIT_CRED, + (macop_t)mac_partition_init_cred }, { MAC_INIT_TEMP, (macop_t)mac_partition_init_temp }, - { MAC_DESTROY_SUBJECT, - (macop_t)mac_partition_destroy_subject }, + { MAC_DESTROY_CRED, + (macop_t)mac_partition_destroy_cred }, { MAC_DESTROY_TEMP, (macop_t)mac_partition_destroy_temp }, { MAC_EXTERNALIZE, (macop_t)mac_partition_externalize }, { MAC_INTERNALIZE, (macop_t)mac_partition_internalize }, - { MAC_CREATE_SUBJECT, - (macop_t)mac_partition_create_subject }, + { MAC_CREATE_CRED, + (macop_t)mac_partition_create_cred }, { MAC_EXECVE_TRANSITION, (macop_t)mac_partition_execve_transition }, { MAC_CREATE_PROC0, (macop_t)mac_partition_create_proc0 }, { MAC_CREATE_PROC1, (macop_t)mac_partition_create_proc1 }, - { MAC_RELABEL_SUBJECT, - (macop_t)mac_partition_relabel_subject }, + { MAC_RELABEL_CRED, + (macop_t)mac_partition_relabel_cred }, { MAC_CHECK_CRED_RELABEL, (macop_t)mac_partition_check_cred_relabel }, { MAC_CHECK_CRED_VISIBLE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#62 (text+ko) ==== @@ -210,6 +210,13 @@ } static void +mac_te_init_cred(struct ucred *ucred, struct label *label) +{ + + SLOT(label) = te_alloc(M_WAITOK); +} + +static void mac_te_init_devfsdirent(struct devfs_dirent *devfs_dirent, struct label *label) { @@ -268,28 +275,29 @@ } static void -mac_te_init_subject(struct ucred *ucred, struct label *label) +mac_te_init_temp(struct label *label) { SLOT(label) = te_alloc(M_WAITOK); } static void -mac_te_init_temp(struct label *label) +mac_te_init_vnode(struct vnode *vp, struct label *label) { SLOT(label) = te_alloc(M_WAITOK); } static void -mac_te_init_vnode(struct vnode *vp, struct label *label) +mac_te_destroy_bpfdesc(struct bpf_d *bpf_d, struct label *label) { - SLOT(label) = te_alloc(M_WAITOK); + te_free(SLOT(label)); + SLOT(label) = NULL; } static void -mac_te_destroy_bpfdesc(struct bpf_d *bpf_d, struct label *label) +mac_te_destroy_cred(struct ucred *ucred, struct label *label) { te_free(SLOT(label)); @@ -360,14 +368,6 @@ } static void -mac_te_destroy_subject(struct ucred *ucred, struct label *label) -{ - - te_free(SLOT(label)); - SLOT(label) = NULL; -} - -static void mac_te_destroy_temp(struct label *label) { @@ -590,7 +590,7 @@ } static void -mac_te_create_subject(struct ucred *cred_parent, struct ucred *cred_child) +mac_te_create_cred(struct ucred *cred_parent, struct ucred *cred_child) { mac_te_copy_label(SLOT(&cred_parent->cr_label), @@ -598,7 +598,7 @@ } static void -mac_te_relabel_subject(struct ucred *cred, struct label *newlabel) +mac_te_relabel_cred(struct ucred *cred, struct label *newlabel) { mac_te_copy_label(SLOT(newlabel), SLOT(&cred->cr_label)); @@ -1639,8 +1639,8 @@ } static void -mac_te_update_procfsvnode_from_subject(struct vnode *vp, - struct label *vnodelabel, struct ucred *cred) +mac_te_update_procfsvnode_from_cred(struct vnode *vp, struct label *vnodelabel, + struct ucred *cred) { mac_te_copy_label(SLOT(&cred->cr_label), SLOT(vnodelabel)); @@ -1673,6 +1673,7 @@ static struct mac_policy_op_entry mac_te_ops[] = { { MAC_INIT_BPFDESC, (macop_t)mac_te_init_bpfdesc }, + { MAC_INIT_CRED, (macop_t)mac_te_init_cred }, { MAC_INIT_DEVFSDIRENT, (macop_t)mac_te_init_devfsdirent }, { MAC_INIT_IFNET, (macop_t)mac_te_init_ifnet }, { MAC_INIT_IPQ, (macop_t)mac_te_init_ipq }, @@ -1680,10 +1681,10 @@ { MAC_INIT_MOUNT, (macop_t)mac_te_init_mount }, { MAC_INIT_PIPE, (macop_t)mac_te_init_pipe }, { MAC_INIT_SOCKET, (macop_t)mac_te_init_socket }, - { MAC_INIT_SUBJECT, (macop_t)mac_te_init_subject }, { MAC_INIT_TEMP, (macop_t)mac_te_init_temp }, { MAC_INIT_VNODE, (macop_t)mac_te_init_vnode }, { MAC_DESTROY_BPFDESC, (macop_t)mac_te_destroy_bpfdesc }, + { MAC_DESTROY_CRED, (macop_t)mac_te_destroy_cred }, { MAC_DESTROY_DEVFSDIRENT, (macop_t)mac_te_destroy_devfsdirent }, { MAC_DESTROY_IFNET, (macop_t)mac_te_destroy_ifnet }, { MAC_DESTROY_IPQ, (macop_t)mac_te_destroy_ipq }, @@ -1691,7 +1692,6 @@ { MAC_DESTROY_MOUNT, (macop_t)mac_te_destroy_mount }, { MAC_DESTROY_PIPE, (macop_t)mac_te_destroy_pipe }, { MAC_DESTROY_SOCKET, (macop_t)mac_te_destroy_socket }, - { MAC_DESTROY_SUBJECT, (macop_t)mac_te_destroy_subject }, { MAC_DESTROY_TEMP, (macop_t)mac_te_destroy_temp }, { MAC_DESTROY_VNODE, (macop_t)mac_te_destroy_vnode }, { MAC_CREATE_DEVFS_DEVICE, (macop_t)mac_te_create_devfs_device }, @@ -1735,12 +1735,12 @@ (macop_t)mac_te_create_mbuf_netlayer_from_mbuf }, { MAC_FRAGMENT_MATCHES_IPQ, (macop_t)mac_te_fragment_matches_ipq }, { MAC_RELABEL_IFNET, (macop_t)mac_te_relabel_ifnet }, - { MAC_CREATE_SUBJECT, (macop_t)mac_te_create_subject }, + { MAC_CREATE_CRED, (macop_t)mac_te_create_cred }, { MAC_EXECVE_TRANSITION, (macop_t)mac_te_execve_transition }, { MAC_EXECVE_WILL_TRANSITION, (macop_t)mac_te_execve_will_transition }, { MAC_CREATE_PROC0, (macop_t)mac_te_create_proc0 }, { MAC_CREATE_PROC1, (macop_t)mac_te_create_proc1 }, - { MAC_RELABEL_SUBJECT, (macop_t)mac_te_relabel_subject }, + { MAC_RELABEL_CRED, (macop_t)mac_te_relabel_cred }, { MAC_RELABEL_VNODE, (macop_t)mac_te_relabel_vnode }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_te_check_bpfdesc_receive }, @@ -1833,8 +1833,8 @@ { MAC_INTERNALIZE, (macop_t)mac_te_internalize }, { MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, (macop_t)mac_te_update_devfsdirent_from_vnode }, - { MAC_UPDATE_PROCFSVNODE_FROM_SUBJECT, - (macop_t)mac_te_update_procfsvnode_from_subject }, + { MAC_UPDATE_PROCFSVNODE_FROM_CRED, + (macop_t)mac_te_update_procfsvnode_from_cred }, { MAC_UPDATE_VNODE_FROM_EXTERNALIZED, (macop_t)mac_te_update_vnode_from_externalized }, { MAC_UPDATE_VNODE_FROM_MOUNT, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#27 (text+ko) ==== @@ -87,7 +87,7 @@ #define MOUNTMAGIC 0xc7c46e47 #define SOCKETMAGIC 0x9199c6cd #define PIPEMAGIC 0xdc6c9919 -#define SUBJECTMAGIC 0x9a5a4987 +#define CREDMAGIC 0x9a5a4987 #define TEMPMAGIC 0x70336678 #define VNODEMAGIC 0x1a67a45c #define EXMAGIC 0x849ba1fd @@ -100,6 +100,9 @@ static int init_count_bpfdesc; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_bpfdesc, CTLFLAG_RD, &init_count_bpfdesc, 0, "bpfdesc init calls"); +static int init_count_cred; +SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_cred, CTLFLAG_RD, + &init_count_cred, 0, "cred init calls"); static int init_count_devfsdirent; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_devfsdirent, CTLFLAG_RD, &init_count_devfsdirent, 0, "devfsdirent init calls"); @@ -121,9 +124,6 @@ static int init_count_pipe; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_pipe, CTLFLAG_RD, &init_count_pipe, 0, "pipe init calls"); -static int init_count_subject; -SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_subject, CTLFLAG_RD, - &init_count_subject, 0, "subjec5 init calls"); static int init_count_temp; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_temp, CTLFLAG_RD, &init_count_temp, 0, "temp init calls"); @@ -134,6 +134,9 @@ static int destroy_count_bpfdesc; SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_bpfdesc, CTLFLAG_RD, &destroy_count_bpfdesc, 0, "bpfdesc destroy calls"); +static int destroy_count_cred; +SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_cred, CTLFLAG_RD, + &destroy_count_cred, 0, "cred destroy calls"); static int destroy_count_devfsdirent; SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_devfsdirent, CTLFLAG_RD, &destroy_count_devfsdirent, 0, "devfsdirent destroy calls"); @@ -155,9 +158,6 @@ static int destroy_count_pipe; SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_pipe, CTLFLAG_RD, &destroy_count_pipe, 0, "pipe destroy calls"); -static int destroy_count_subject; -SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_subject, CTLFLAG_RD, - &destroy_count_subject, 0, "subjec5 destroy calls"); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 19: 3:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F90D37B401; Sun, 28 Jul 2002 19:03:00 -0700 (PDT) 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 C7EB837B400 for ; Sun, 28 Jul 2002 19:02:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F17543E42 for ; Sun, 28 Jul 2002 19:02:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T22xJU036202 for ; Sun, 28 Jul 2002 19:02:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T22xkw036199 for perforce@freebsd.org; Sun, 28 Jul 2002 19:02:59 -0700 (PDT) Date: Sun, 28 Jul 2002 19:02:59 -0700 (PDT) Message-Id: <200207290202.g6T22xkw036199@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15086 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15086 Change 15086 by rwatson@rwatson_paprika on 2002/07/28 19:01:59 Cosmetic whitespace changes. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#99 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#99 (text+ko) ==== @@ -72,8 +72,7 @@ struct label *label); void (*mpo_init_ifnet)(struct ifnet *, struct label *label); void (*mpo_init_ipq)(struct ipq *ipq, struct label *label); - int (*mpo_init_mbuf)(struct mbuf *, int how, - struct label *label); + int (*mpo_init_mbuf)(struct mbuf *, int how, struct label *label); void (*mpo_init_mount)(struct mount *, struct label *mntlabel, struct label *fslabel); void (*mpo_init_socket)(struct socket *so, struct label *label, @@ -81,25 +80,22 @@ void (*mpo_init_pipe)(struct pipe *pipe, struct label *label); void (*mpo_init_temp)(struct label *label); void (*mpo_init_vnode)(struct vnode *, struct label *label); - void (*mpo_destroy_bpfdesc)(struct bpf_d *, - struct label *label); + void (*mpo_destroy_bpfdesc)(struct bpf_d *, struct label *label); void (*mpo_destroy_cred)(struct ucred *, struct label *label); void (*mpo_destroy_devfsdirent)(struct devfs_dirent *de, struct label *label); void (*mpo_destroy_ifnet)(struct ifnet *, struct label *label); void (*mpo_destroy_ipq)(struct ipq *ipq, struct label *label); void (*mpo_destroy_mbuf)(struct mbuf *, struct label *label); - void (*mpo_destroy_mount)(struct mount *, - struct label *mntlabel, struct label *fslabel); + void (*mpo_destroy_mount)(struct mount *, struct label *mntlabel, + struct label *fslabel); void (*mpo_destroy_socket)(struct socket *so, struct label *label, struct label *peerlabel); void (*mpo_destroy_pipe)(struct pipe *pipe, struct label *label); void (*mpo_destroy_temp)(struct label *label); void (*mpo_destroy_vnode)(struct vnode *, struct label *label); - int (*mpo_externalize)(struct label *label, - struct mac *extmac); - int (*mpo_internalize)(struct label *label, - struct mac *extmac); + int (*mpo_externalize)(struct label *label, struct mac *extmac); + int (*mpo_internalize)(struct label *label, struct mac *extmac); /* * Labeling event operations: file system objects, and things that @@ -117,9 +113,8 @@ struct vnode *child, struct label *childlabel); void (*mpo_create_mount)(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel); - void (*mpo_create_root_mount)(struct ucred *cred, - struct mount *mp, struct label *mountlabel, - struct label *fslabel); + void (*mpo_create_root_mount)(struct ucred *cred, struct mount *mp, + struct label *mountlabel, struct label *fslabel); void (*mpo_relabel_vnode)(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label); int (*mpo_stdcreatevnode_ea)(struct vnode *vp, @@ -145,19 +140,17 @@ void (*mpo_create_mbuf_from_socket)(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel); - void (*mpo_create_socket)(struct ucred *cred, - struct socket *so, struct label *socketlabel); + void (*mpo_create_socket)(struct ucred *cred, struct socket *so, + struct label *socketlabel); void (*mpo_create_socket_from_socket)(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel); - void (*mpo_relabel_socket)(struct ucred *cred, - struct socket *socket, struct label *oldlabel, - struct label *newlabel); - void (*mpo_relabel_pipe)(struct ucred *cred, - struct pipe *pipe, struct label *oldlabel, - struct label *newlabel); + void (*mpo_relabel_socket)(struct ucred *cred, struct socket *so, + struct label *oldlabel, struct label *newlabel); + void (*mpo_relabel_pipe)(struct ucred *cred, struct pipe *pipe, + struct label *oldlabel, struct label *newlabel); void (*mpo_set_socket_peer_from_mbuf)(struct mbuf *mbuf, - struct label *mbuflabel, struct socket *socket, + struct label *mbuflabel, struct socket *so, struct label *socketpeerlabel); void (*mpo_set_socket_peer_from_socket)(struct socket *oldsocket, struct label *oldsocketlabel, struct socket *newsocket, @@ -214,9 +207,8 @@ */ void (*mpo_create_cred)(struct ucred *parent_cred, struct ucred *child_cred); - void (*mpo_execve_transition)(struct ucred *old, - struct ucred *new, struct vnode *vp, - struct label *vnodelabel); + void (*mpo_execve_transition)(struct ucred *old, struct ucred *new, + struct vnode *vp, struct label *vnodelabel); int (*mpo_execve_will_transition)(struct ucred *old, struct vnode *vp, struct label *vnodelabel); void (*mpo_create_proc0)(struct ucred *cred); @@ -241,18 +233,19 @@ struct label *mbuflabel); int (*mpo_check_mount_stat)(struct ucred *cred, struct mount *mp, struct label *mntlabel); - int (*mpo_check_pipe_ioctl)(struct ucred *cred, - struct pipe *pipe, struct label *pipelabel, - unsigned long cmd, void *data); - int (*mpo_check_pipe_op)(struct ucred *cred, - struct pipe *pipe, struct label *pipelabel, int op); + int (*mpo_check_pipe_ioctl)(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, unsigned long cmd, void *data); + int (*mpo_check_pipe_op)(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel, int op); int (*mpo_check_pipe_relabel)(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, struct label *newlabel); - int (*mpo_check_proc_debug)(struct ucred *cred, struct proc *proc); - int (*mpo_check_proc_sched)(struct ucred *cred, struct proc *proc); - int (*mpo_check_proc_signal)(struct ucred *cred, struct proc *proc, - int signum); + int (*mpo_check_proc_debug)(struct ucred *cred, + struct proc *proc); + int (*mpo_check_proc_sched)(struct ucred *cred, + struct proc *proc); + int (*mpo_check_proc_signal)(struct ucred *cred, + struct proc *proc, int signum); int (*mpo_check_socket_bind)(struct ucred *cred, struct socket *so, struct label *socketlabel, struct sockaddr *sockaddr); @@ -268,7 +261,7 @@ struct socket *so, struct label *socketlabel, struct label *newlabel); int (*mpo_check_socket_visible)(struct ucred *cred, - struct socket *socket, struct label *socketlabel); + struct socket *so, struct label *socketlabel); int (*mpo_check_vnode_access)(struct ucred *cred, struct vnode *vp, struct label *label, int flags); int (*mpo_check_vnode_chdir)(struct ucred *cred, @@ -283,19 +276,18 @@ struct vnode *vp, void *label, struct componentname *cnp); int (*mpo_check_vnode_deleteacl)(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type); - int (*mpo_check_vnode_exec)(struct ucred *cred, - struct vnode *vp, struct label *label); + int (*mpo_check_vnode_exec)(struct ucred *cred, struct vnode *vp, + struct label *label); int (*mpo_check_vnode_getacl)(struct ucred *cred, struct vnode *vp, struct label *label, acl_type_t type); int (*mpo_check_vnode_getextattr)(struct ucred *cred, - struct vnode *vp, struct label *label, - int attrnamespace, const char *name, struct uio *uio); + struct vnode *vp, struct label *label, int attrnamespace, + const char *name, struct uio *uio); int (*mpo_check_vnode_lookup)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp); - int (*mpo_check_vnode_open)(struct ucred *cred, - struct vnode *vp, struct label *label, - mode_t acc_mode); + int (*mpo_check_vnode_open)(struct ucred *cred, struct vnode *vp, + struct label *label, mode_t acc_mode); int (*mpo_check_vnode_readdir)(struct ucred *cred, struct vnode *dvp, struct label *dlabel); int (*mpo_check_vnode_readlink)(struct ucred *cred, @@ -304,12 +296,11 @@ struct vnode *vp, struct label *vnodelabel, struct label *newlabel); int (*mpo_check_vnode_rename_from)(struct ucred *cred, - struct vnode *dvp, struct label *dlabel, - struct vnode *vp, struct label *label, - struct componentname *cnp); + struct vnode *dvp, struct label *dlabel, struct vnode *vp, + struct label *label, struct componentname *cnp); int (*mpo_check_vnode_rename_to)(struct ucred *cred, - struct vnode *dvp, struct label *dlabel, - struct vnode *vp, struct label *label, int samedir, + struct vnode *dvp, struct label *dlabel, struct vnode *vp, + struct label *label, int samedir, struct componentname *cnp); int (*mpo_check_vnode_revoke)(struct ucred *cred, struct vnode *vp, struct label *label); @@ -317,8 +308,8 @@ struct vnode *vp, struct label *label, acl_type_t type, struct acl *acl); int (*mpo_check_vnode_setextattr)(struct ucred *cred, - struct vnode *vp, struct label *label, - int attrnamespace, const char *name, struct uio *uio); + struct vnode *vp, struct label *label, int attrnamespace, + const char *name, struct uio *uio); int (*mpo_check_vnode_setflags)(struct ucred *cred, struct vnode *vp, struct label *label, u_long flags); int (*mpo_check_vnode_setmode)(struct ucred *cred, @@ -329,12 +320,12 @@ int (*mpo_check_vnode_setutimes)(struct ucred *cred, struct vnode *vp, struct label *label, struct timespec atime, struct timespec mtime); - int (*mpo_check_vnode_stat)(struct ucred *cred, - struct vnode *vp, struct label *label); + int (*mpo_check_vnode_stat)(struct ucred *cred, struct vnode *vp, + struct label *label); vm_prot_t (*mpo_check_vnode_mmap_perms)(struct ucred *cred, struct vnode *vp, struct label *label, int newmapping); - int (*mpo_check_vnode_op)(struct ucred *cred, - struct vnode *vp, struct label *label, int op); + int (*mpo_check_vnode_op)(struct ucred *cred, struct vnode *vp, + struct label *label, int op); }; typedef void *macop_t; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 19: 9:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EA9637B401; Sun, 28 Jul 2002 19:09:08 -0700 (PDT) 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 CD40237B400 for ; Sun, 28 Jul 2002 19:09:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68B4A43E42 for ; Sun, 28 Jul 2002 19:09:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T297JU040721 for ; Sun, 28 Jul 2002 19:09:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T297no040718 for perforce@freebsd.org; Sun, 28 Jul 2002 19:09:07 -0700 (PDT) Date: Sun, 28 Jul 2002 19:09:07 -0700 (PDT) Message-Id: <200207290209.g6T297no040718@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15087 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15087 Change 15087 by rwatson@rwatson_paprika on 2002/07/28 19:08:58 Rearrange some functions and entry points to improve consistency. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#206 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#206 (text+ko) ==== @@ -763,6 +763,14 @@ mpc->mpc_ops->mpo_check_vnode_lookup = mpe->mpe_function; break; + case MAC_CHECK_VNODE_MMAP_PERMS: + mpc->mpc_ops->mpo_check_vnode_mmap_perms = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_OP: + mpc->mpc_ops->mpo_check_vnode_op = + mpe->mpe_function; + break; case MAC_CHECK_VNODE_OPEN: mpc->mpc_ops->mpo_check_vnode_open = mpe->mpe_function; @@ -819,14 +827,6 @@ mpc->mpc_ops->mpo_check_vnode_stat = mpe->mpe_function; break; - case MAC_CHECK_VNODE_MMAP_PERMS: - mpc->mpc_ops->mpo_check_vnode_mmap_perms = - mpe->mpe_function; - break; - case MAC_CHECK_VNODE_OP: - mpc->mpc_ops->mpo_check_vnode_op = - mpe->mpe_function; - break; case MAC_INIT_BPFDESC: mpc->mpc_ops->mpo_init_bpfdesc = mpe->mpe_function; @@ -1742,6 +1742,49 @@ } int +mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp, struct vnode *vp, + struct componentname *cnp) +{ + int error; + + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_delete"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_delete"); + + if (!mac_enforce_fs) + return (0); + + error = vn_refreshlabel(dvp, cred); + if (error) + return (error); + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + + MAC_CHECK(check_vnode_delete, cred, dvp, &dvp->v_label, vp, + &vp->v_label, cnp); + return (error); +} + +int +mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, + acl_type_t type) +{ + int error; + + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_deleteacl"); + + if (!mac_enforce_fs) + return (0); + + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + + MAC_CHECK(check_vnode_deleteacl, cred, vp, &vp->v_label, type); + return (error); +} + +int mac_check_vnode_exec(struct ucred *cred, struct vnode *vp) { int error; @@ -1900,68 +1943,60 @@ } int -mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp) +mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, + struct vnode *vp, struct componentname *cnp) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_revoke"); + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_rename_from"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_rename_from"); if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); + error = vn_refreshlabel(dvp, cred); if (error) return (error); - - MAC_CHECK(check_vnode_revoke, cred, vp, &vp->v_label); - return (error); -} - -int -mac_check_vnode_setacl(struct ucred *cred, struct vnode *vp, acl_type_t type, - struct acl *acl) -{ - int error; - - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setacl"); - - if (!mac_enforce_fs) - return (0); - error = vn_refreshlabel(vp, cred); if (error) return (error); - MAC_CHECK(check_vnode_setacl, cred, vp, &vp->v_label, type, acl); + MAC_CHECK(check_vnode_rename_from, cred, dvp, &dvp->v_label, vp, + &vp->v_label, cnp); return (error); } int -mac_check_vnode_setextattr(struct ucred *cred, struct vnode *vp, - int attrnamespace, const char *name, struct uio *uio) +mac_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, + struct vnode *vp, int samedir, struct componentname *cnp) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setextattr"); + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_rename_to"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_rename_to"); if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); + error = vn_refreshlabel(dvp, cred); if (error) return (error); - - MAC_CHECK(check_vnode_setextattr, cred, vp, &vp->v_label, - attrnamespace, name, uio); + if (vp != NULL) { + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + } + MAC_CHECK(check_vnode_rename_to, cred, dvp, &dvp->v_label, vp, + vp != NULL ? &vp->v_label : NULL, samedir, cnp); return (error); } int -mac_check_vnode_setflags(struct ucred *cred, struct vnode *vp, u_long flags) +mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setflags"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_revoke"); if (!mac_enforce_fs) return (0); @@ -1970,16 +2005,17 @@ if (error) return (error); - MAC_CHECK(check_vnode_setflags, cred, vp, &vp->v_label, flags); + MAC_CHECK(check_vnode_revoke, cred, vp, &vp->v_label); return (error); } int -mac_check_vnode_setmode(struct ucred *cred, struct vnode *vp, mode_t mode) +mac_check_vnode_setacl(struct ucred *cred, struct vnode *vp, acl_type_t type, + struct acl *acl) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setmode"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setacl"); if (!mac_enforce_fs) return (0); @@ -1988,17 +2024,17 @@ if (error) return (error); - MAC_CHECK(check_vnode_setmode, cred, vp, &vp->v_label, mode); + MAC_CHECK(check_vnode_setacl, cred, vp, &vp->v_label, type, acl); return (error); } int -mac_check_vnode_setowner(struct ucred *cred, struct vnode *vp, uid_t uid, - gid_t gid) +mac_check_vnode_setextattr(struct ucred *cred, struct vnode *vp, + int attrnamespace, const char *name, struct uio *uio) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setowner"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setextattr"); if (!mac_enforce_fs) return (0); @@ -2007,17 +2043,17 @@ if (error) return (error); - MAC_CHECK(check_vnode_setowner, cred, vp, &vp->v_label, uid, gid); + MAC_CHECK(check_vnode_setextattr, cred, vp, &vp->v_label, + attrnamespace, name, uio); return (error); } int -mac_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, - struct timespec atime, struct timespec mtime) +mac_check_vnode_setflags(struct ucred *cred, struct vnode *vp, u_long flags) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setutimes"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setflags"); if (!mac_enforce_fs) return (0); @@ -2026,42 +2062,35 @@ if (error) return (error); - MAC_CHECK(check_vnode_setutimes, cred, vp, &vp->v_label, atime, - mtime); + MAC_CHECK(check_vnode_setflags, cred, vp, &vp->v_label, flags); return (error); } int -mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp, struct vnode *vp, - struct componentname *cnp) +mac_check_vnode_setmode(struct ucred *cred, struct vnode *vp, mode_t mode) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_delete"); - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_delete"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setmode"); if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); error = vn_refreshlabel(vp, cred); if (error) return (error); - MAC_CHECK(check_vnode_delete, cred, dvp, &dvp->v_label, vp, - &vp->v_label, cnp); + MAC_CHECK(check_vnode_setmode, cred, vp, &vp->v_label, mode); return (error); } int -mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, - acl_type_t type) +mac_check_vnode_setowner(struct ucred *cred, struct vnode *vp, uid_t uid, + gid_t gid) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_deleteacl"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setowner"); if (!mac_enforce_fs) return (0); @@ -2070,56 +2099,27 @@ if (error) return (error); - MAC_CHECK(check_vnode_deleteacl, cred, vp, &vp->v_label, type); + MAC_CHECK(check_vnode_setowner, cred, vp, &vp->v_label, uid, gid); return (error); } int -mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, struct componentname *cnp) +mac_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, + struct timespec atime, struct timespec mtime) { int error; - ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_rename_from"); - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_rename_from"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_setutimes"); if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); error = vn_refreshlabel(vp, cred); if (error) return (error); - MAC_CHECK(check_vnode_rename_from, cred, dvp, &dvp->v_label, vp, - &vp->v_label, cnp); - return (error); -} - -int -mac_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, int samedir, struct componentname *cnp) -{ - int error; - - ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_rename_to"); - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_rename_to"); - - if (!mac_enforce_fs) - return (0); - - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); - if (vp != NULL) { - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - } - MAC_CHECK(check_vnode_rename_to, cred, dvp, &dvp->v_label, vp, - vp != NULL ? &vp->v_label : NULL, samedir, cnp); + MAC_CHECK(check_vnode_setutimes, cred, vp, &vp->v_label, atime, + mtime); return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 19:15:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBAA137B401; Sun, 28 Jul 2002 19:15:15 -0700 (PDT) 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 925BC37B400 for ; Sun, 28 Jul 2002 19:15:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 501D643E4A for ; Sun, 28 Jul 2002 19:15:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T2FFJU041384 for ; Sun, 28 Jul 2002 19:15:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T2FFFV041381 for perforce@freebsd.org; Sun, 28 Jul 2002 19:15:15 -0700 (PDT) Date: Sun, 28 Jul 2002 19:15:15 -0700 (PDT) Message-Id: <200207290215.g6T2FFFV041381@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15088 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15088 Change 15088 by rwatson@rwatson_paprika on 2002/07/28 19:14:26 Remove unused code. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#207 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#207 (text+ko) ==== @@ -1611,29 +1611,6 @@ return (error); } -#if 0 -static int -mac_label_valid(struct label *label) -{ - - /* - * If more flags are added, this should mask down to the initialized - * flag before testing. - */ - return (label->l_flags == MAC_FLAG_INITIALIZED); -} -#endif - -#if 0 -void -mac_copy_label(struct label *labelfrom, struct label *labelto) -{ - - bcopy(&labelfrom->l_perpolicy, &labelto->l_perpolicy, - sizeof(labelfrom->l_perpolicy)); -} -#endif - /* * Initialize MAC label for the first kernel process, from which other * kernel processes and threads are spawned. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 19:18:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D80237B401; Sun, 28 Jul 2002 19:18:20 -0700 (PDT) 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 C243D37B400 for ; Sun, 28 Jul 2002 19:18:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6367B43E31 for ; Sun, 28 Jul 2002 19:18:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T2IJJU041579 for ; Sun, 28 Jul 2002 19:18:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T2IJCY041576 for perforce@freebsd.org; Sun, 28 Jul 2002 19:18:19 -0700 (PDT) Date: Sun, 28 Jul 2002 19:18:19 -0700 (PDT) Message-Id: <200207290218.g6T2IJCY041576@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15089 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15089 Change 15089 by rwatson@rwatson_paprika on 2002/07/28 19:18:04 Whitespace consistency. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#208 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#208 (text+ko) ==== @@ -519,13 +519,16 @@ mpe->mpe_function; break; case MAC_CREATE_MOUNT: - mpc->mpc_ops->mpo_create_mount = mpe->mpe_function; + mpc->mpc_ops->mpo_create_mount = + mpe->mpe_function; break; case MAC_CREATE_ROOT_MOUNT: - mpc->mpc_ops->mpo_create_root_mount = mpe->mpe_function; + mpc->mpc_ops->mpo_create_root_mount = + mpe->mpe_function; break; case MAC_RELABEL_VNODE: - mpc->mpc_ops->mpo_relabel_vnode = mpe->mpe_function; + mpc->mpc_ops->mpo_relabel_vnode = + mpe->mpe_function; break; case MAC_UPDATE_DEVFSDIRENT_FROM_VNODE: mpc->mpc_ops->mpo_update_devfsdirent_from_vnode = @@ -552,20 +555,24 @@ mpe->mpe_function; break; case MAC_CREATE_PIPE: - mpc->mpc_ops->mpo_create_pipe = mpe->mpe_function; + mpc->mpc_ops->mpo_create_pipe = + mpe->mpe_function; break; case MAC_CREATE_SOCKET: - mpc->mpc_ops->mpo_create_socket = mpe->mpe_function; + mpc->mpc_ops->mpo_create_socket = + mpe->mpe_function; break; case MAC_CREATE_SOCKET_FROM_SOCKET: mpc->mpc_ops->mpo_create_socket_from_socket = mpe->mpe_function; break; case MAC_RELABEL_PIPE: - mpc->mpc_ops->mpo_relabel_pipe = mpe->mpe_function; + mpc->mpc_ops->mpo_relabel_pipe = + mpe->mpe_function; break; case MAC_RELABEL_SOCKET: - mpc->mpc_ops->mpo_relabel_socket = mpe->mpe_function; + mpc->mpc_ops->mpo_relabel_socket = + mpe->mpe_function; break; case MAC_SET_SOCKET_PEER_FROM_MBUF: mpc->mpc_ops->mpo_set_socket_peer_from_mbuf = @@ -624,7 +631,8 @@ mpe->mpe_function; break; case MAC_RELABEL_IFNET: - mpc->mpc_ops->mpo_relabel_ifnet = mpe->mpe_function; + mpc->mpc_ops->mpo_relabel_ifnet = + mpe->mpe_function; break; case MAC_UPDATE_IPQ_FROM_FRAGMENT: mpc->mpc_ops->mpo_update_ipq_from_fragment = @@ -635,7 +643,8 @@ mpe->mpe_function; break; case MAC_EXECVE_TRANSITION: - mpc->mpc_ops->mpo_execve_transition = mpe->mpe_function; + mpc->mpc_ops->mpo_execve_transition = + mpe->mpe_function; break; case MAC_EXECVE_WILL_TRANSITION: mpc->mpc_ops->mpo_execve_will_transition = To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 19:28:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EB9937B401; Sun, 28 Jul 2002 19:28:02 -0700 (PDT) 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 E308137B400 for ; Sun, 28 Jul 2002 19:28:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FA5B43E4A for ; Sun, 28 Jul 2002 19:28:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T2S1JU042395 for ; Sun, 28 Jul 2002 19:28:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T2S1Gj042392 for perforce@freebsd.org; Sun, 28 Jul 2002 19:28:01 -0700 (PDT) Date: Sun, 28 Jul 2002 19:28:01 -0700 (PDT) Message-Id: <200207290228.g6T2S1Gj042392@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15090 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15090 Change 15090 by rwatson@rwatson_paprika on 2002/07/28 19:27:01 Use the entry point definition order from mac_policy.h for the registration order during policy registration. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#209 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#209 (text+ko) ==== @@ -498,6 +498,102 @@ mpc->mpc_ops->mpo_init = mpe->mpe_function; break; + case MAC_INIT_BPFDESC: + mpc->mpc_ops->mpo_init_bpfdesc = + mpe->mpe_function; + break; + case MAC_INIT_CRED: + mpc->mpc_ops->mpo_init_cred = + mpe->mpe_function; + break; + case MAC_INIT_DEVFSDIRENT: + mpc->mpc_ops->mpo_init_devfsdirent = + mpe->mpe_function; + break; + case MAC_INIT_IFNET: + mpc->mpc_ops->mpo_init_ifnet = + mpe->mpe_function; + break; + case MAC_INIT_IPQ: + mpc->mpc_ops->mpo_init_ipq = + mpe->mpe_function; + break; + case MAC_INIT_MBUF: + mpc->mpc_ops->mpo_init_mbuf = + mpe->mpe_function; + break; + case MAC_INIT_MOUNT: + mpc->mpc_ops->mpo_init_mount = + mpe->mpe_function; + break; + case MAC_INIT_PIPE: + mpc->mpc_ops->mpo_init_pipe = + mpe->mpe_function; + break; + case MAC_INIT_SOCKET: + mpc->mpc_ops->mpo_init_socket = + mpe->mpe_function; + break; + case MAC_INIT_TEMP: + mpc->mpc_ops->mpo_init_temp = + mpe->mpe_function; + break; + case MAC_INIT_VNODE: + mpc->mpc_ops->mpo_init_vnode = + mpe->mpe_function; + break; + case MAC_DESTROY_BPFDESC: + mpc->mpc_ops->mpo_destroy_bpfdesc = + mpe->mpe_function; + break; + case MAC_DESTROY_CRED: + mpc->mpc_ops->mpo_destroy_cred = + mpe->mpe_function; + break; + case MAC_DESTROY_DEVFSDIRENT: + mpc->mpc_ops->mpo_destroy_devfsdirent = + mpe->mpe_function; + break; + case MAC_DESTROY_IFNET: + mpc->mpc_ops->mpo_destroy_ifnet = + mpe->mpe_function; + break; + case MAC_DESTROY_IPQ: + mpc->mpc_ops->mpo_destroy_ipq = + mpe->mpe_function; + break; + case MAC_DESTROY_MBUF: + mpc->mpc_ops->mpo_destroy_mbuf = + mpe->mpe_function; + break; + case MAC_DESTROY_MOUNT: + mpc->mpc_ops->mpo_destroy_mount = + mpe->mpe_function; + break; + case MAC_DESTROY_PIPE: + mpc->mpc_ops->mpo_destroy_pipe = + mpe->mpe_function; + break; + case MAC_DESTROY_SOCKET: + mpc->mpc_ops->mpo_destroy_socket = + mpe->mpe_function; + break; + case MAC_DESTROY_TEMP: + mpc->mpc_ops->mpo_destroy_temp = + mpe->mpe_function; + break; + case MAC_DESTROY_VNODE: + mpc->mpc_ops->mpo_destroy_vnode = + mpe->mpe_function; + break; + case MAC_EXTERNALIZE: + mpc->mpc_ops->mpo_externalize = + mpe->mpe_function; + break; + case MAC_INTERNALIZE: + mpc->mpc_ops->mpo_internalize = + mpe->mpe_function; + break; case MAC_CREATE_DEVFS_DEVICE: mpc->mpc_ops->mpo_create_devfs_device = mpe->mpe_function; @@ -836,102 +932,6 @@ mpc->mpc_ops->mpo_check_vnode_stat = mpe->mpe_function; break; - case MAC_INIT_BPFDESC: - mpc->mpc_ops->mpo_init_bpfdesc = - mpe->mpe_function; - break; - case MAC_INIT_CRED: - mpc->mpc_ops->mpo_init_cred = - mpe->mpe_function; - break; - case MAC_INIT_DEVFSDIRENT: - mpc->mpc_ops->mpo_init_devfsdirent = - mpe->mpe_function; - break; - case MAC_INIT_IFNET: - mpc->mpc_ops->mpo_init_ifnet = - mpe->mpe_function; - break; - case MAC_INIT_IPQ: - mpc->mpc_ops->mpo_init_ipq = - mpe->mpe_function; - break; - case MAC_INIT_MBUF: - mpc->mpc_ops->mpo_init_mbuf = - mpe->mpe_function; - break; - case MAC_INIT_MOUNT: - mpc->mpc_ops->mpo_init_mount = - mpe->mpe_function; - break; - case MAC_INIT_PIPE: - mpc->mpc_ops->mpo_init_pipe = - mpe->mpe_function; - break; - case MAC_INIT_SOCKET: - mpc->mpc_ops->mpo_init_socket = - mpe->mpe_function; - break; - case MAC_INIT_TEMP: - mpc->mpc_ops->mpo_init_temp = - mpe->mpe_function; - break; - case MAC_INIT_VNODE: - mpc->mpc_ops->mpo_init_vnode = - mpe->mpe_function; - break; - case MAC_DESTROY_BPFDESC: - mpc->mpc_ops->mpo_destroy_bpfdesc = - mpe->mpe_function; - break; - case MAC_DESTROY_CRED: - mpc->mpc_ops->mpo_destroy_cred = - mpe->mpe_function; - break; - case MAC_DESTROY_DEVFSDIRENT: - mpc->mpc_ops->mpo_destroy_devfsdirent = - mpe->mpe_function; - break; - case MAC_DESTROY_IFNET: - mpc->mpc_ops->mpo_destroy_ifnet = - mpe->mpe_function; - break; - case MAC_DESTROY_IPQ: - mpc->mpc_ops->mpo_destroy_ipq = - mpe->mpe_function; - break; - case MAC_DESTROY_MBUF: - mpc->mpc_ops->mpo_destroy_mbuf = - mpe->mpe_function; - break; - case MAC_DESTROY_MOUNT: - mpc->mpc_ops->mpo_destroy_mount = - mpe->mpe_function; - break; - case MAC_DESTROY_PIPE: - mpc->mpc_ops->mpo_destroy_pipe = - mpe->mpe_function; - break; - case MAC_DESTROY_SOCKET: - mpc->mpc_ops->mpo_destroy_socket = - mpe->mpe_function; - break; - case MAC_DESTROY_TEMP: - mpc->mpc_ops->mpo_destroy_temp = - mpe->mpe_function; - break; - case MAC_DESTROY_VNODE: - mpc->mpc_ops->mpo_destroy_vnode = - mpe->mpe_function; - break; - case MAC_EXTERNALIZE: - mpc->mpc_ops->mpo_externalize = - mpe->mpe_function; - break; - case MAC_INTERNALIZE: - mpc->mpc_ops->mpo_internalize = - mpe->mpe_function; - break; /* default: printf("MAC policy `%s': unknown operation %d\n", To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 19:31:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB20337B401; Sun, 28 Jul 2002 19:31:20 -0700 (PDT) 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 4909637B400 for ; Sun, 28 Jul 2002 19:31:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEBCC43E3B for ; Sun, 28 Jul 2002 19:31:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T2VJJU042920 for ; Sun, 28 Jul 2002 19:31:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T2VJeH042908 for perforce@freebsd.org; Sun, 28 Jul 2002 19:31:19 -0700 (PDT) Date: Sun, 28 Jul 2002 19:31:19 -0700 (PDT) Message-Id: <200207290231.g6T2VJeH042908@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15091 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15091 Change 15091 by rwatson@rwatson_paprika on 2002/07/28 19:30:19 Move variable and sysctl definitions for the object labels to the top of kern_mac.c for consistency. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#210 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#210 (text+ko) ==== @@ -156,6 +156,32 @@ &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " "copy-on-write semantics, or by removing all write access"); +static unsigned int nmacmbufs, nmaccreds, nmacifnets, nmacbpfdescs, + nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, + nmacipqs, nmacpipes; +SYSCTL_UINT(_security_mac_debug, OID_AUTO, mbufs, CTLFLAG_RD, + &nmacmbufs, 0, "number of mbufs in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, creds, CTLFLAG_RD, + &nmaccreds, 0, "number of ucreds in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, ifnets, CTLFLAG_RD, + &nmacifnets, 0, "number of ifnets in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, ipqs, CTLFLAG_RD, + &nmacipqs, 0, "number of ipqs in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, bpfdescs, CTLFLAG_RD, + &nmacbpfdescs, 0, "number of bpfdescs in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, sockets, CTLFLAG_RD, + &nmacsockets, 0, "number of sockets in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, pipes, CTLFLAG_RD, + &nmacpipes, 0, "number of pipes in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, mounts, CTLFLAG_RD, + &nmacmounts, 0, "number of mounts in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, temp, CTLFLAG_RD, + &nmactemp, 0, "number of temporary labels in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, vnodes, CTLFLAG_RD, + &nmacvnodes, 0, "number of vnodes in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, devfsdirents, CTLFLAG_RD, + &nmacdevfsdirents, 0, "number of devfs dirents inuse"); + static int error_select(int error1, int error2); static int mac_externalize(struct label *label, struct mac *mac); static int mac_policy_register(struct mac_policy_conf *mpc); @@ -1358,32 +1384,6 @@ /* label->l_flags &= ~MAC_FLAG_INITIALIZED; */ } -static unsigned int nmacmbufs, nmaccreds, nmacifnets, nmacbpfdescs, - nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, - nmacipqs, nmacpipes; -SYSCTL_UINT(_security_mac_debug, OID_AUTO, mbufs, CTLFLAG_RD, - &nmacmbufs, 0, "number of mbufs in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, creds, CTLFLAG_RD, - &nmaccreds, 0, "number of ucreds in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, ifnets, CTLFLAG_RD, - &nmacifnets, 0, "number of ifnets in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, ipqs, CTLFLAG_RD, - &nmacipqs, 0, "number of ipqs in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, bpfdescs, CTLFLAG_RD, - &nmacbpfdescs, 0, "number of bpfdescs in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, sockets, CTLFLAG_RD, - &nmacsockets, 0, "number of sockets in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, pipes, CTLFLAG_RD, - &nmacpipes, 0, "number of pipes in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, mounts, CTLFLAG_RD, - &nmacmounts, 0, "number of mounts in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, temp, CTLFLAG_RD, - &nmactemp, 0, "number of temporary labels in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, vnodes, CTLFLAG_RD, - &nmacvnodes, 0, "number of vnodes in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, devfsdirents, CTLFLAG_RD, - &nmacdevfsdirents, 0, "number of devfs dirents inuse"); - int mac_init_mbuf(struct mbuf *m, int how) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 19:33:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B542837B401; Sun, 28 Jul 2002 19:33:23 -0700 (PDT) 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 4FF5537B400 for ; Sun, 28 Jul 2002 19:33:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC8AD43E42 for ; Sun, 28 Jul 2002 19:33:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T2XMJU043050 for ; Sun, 28 Jul 2002 19:33:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T2XMAs043047 for perforce@freebsd.org; Sun, 28 Jul 2002 19:33:22 -0700 (PDT) Date: Sun, 28 Jul 2002 19:33:22 -0700 (PDT) Message-Id: <200207290233.g6T2XMAs043047@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15092 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15092 Change 15092 by rwatson@rwatson_paprika on 2002/07/28 19:33:05 Note that the removal of the initialized flag for labels on destruction is implicit. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#211 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#211 (text+ko) ==== @@ -1381,7 +1381,7 @@ ("destroying uninitialized label")); bzero(label, sizeof(*label)); -/* label->l_flags &= ~MAC_FLAG_INITIALIZED; */ + /* implicit: label->l_flags &= ~MAC_FLAG_INITIALIZED; */ } int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 19:44:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AD14B37B401; Sun, 28 Jul 2002 19:44:37 -0700 (PDT) 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 60C7837B400 for ; Sun, 28 Jul 2002 19:44:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DB9F43E5E for ; Sun, 28 Jul 2002 19:44:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T2iaJU043911 for ; Sun, 28 Jul 2002 19:44:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T2iaUu043908 for perforce@freebsd.org; Sun, 28 Jul 2002 19:44:36 -0700 (PDT) Date: Sun, 28 Jul 2002 19:44:36 -0700 (PDT) Message-Id: <200207290244.g6T2iaUu043908@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15093 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15093 Change 15093 by rwatson@rwatson_paprika on 2002/07/28 19:44:30 Move vnode_op check to join the rest of the access control check entry points. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#212 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#212 (text+ko) ==== @@ -1858,6 +1858,25 @@ } int +mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op) +{ + int error; + + if (!mac_enforce_fs) + return (0); + + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_op"); + + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + + MAC_CHECK(check_vnode_op, cred, vp, &vp->v_label, op); + + return (error); +} + +int mac_check_vnode_open(struct ucred *cred, struct vnode *vp, mode_t acc_mode) { int error; @@ -2674,25 +2693,6 @@ } int -mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op) -{ - int error; - - if (!mac_enforce_fs) - return (0); - - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_op"); - - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - - MAC_CHECK(check_vnode_op, cred, vp, &vp->v_label, op); - - return (error); -} - -int mac_setsockopt_label_set(struct ucred *cred, struct socket *so, struct mac *extmac) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 19:51:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 726B237B401; Sun, 28 Jul 2002 19:51:47 -0700 (PDT) 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 1832E37B400 for ; Sun, 28 Jul 2002 19:51:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CBD3143E4A for ; Sun, 28 Jul 2002 19:51:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T2pkJU044805 for ; Sun, 28 Jul 2002 19:51:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T2pkVt044799 for perforce@freebsd.org; Sun, 28 Jul 2002 19:51:46 -0700 (PDT) Date: Sun, 28 Jul 2002 19:51:46 -0700 (PDT) Message-Id: <200207290251.g6T2pkVt044799@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15095 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15095 Change 15095 by rwatson@rwatson_paprika on 2002/07/28 19:50:47 Remove unused code. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#213 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#213 (text+ko) ==== @@ -2625,17 +2625,6 @@ return (error); } -#if 0 -/* XXX What should this do? */ -void -mac_print_label(struct label *label) -{ - - printf("MAC label: %s\n", (label->l_flags & MAC_FLAG_INITIALIZED) - ? "" : "not initialized"); -} -#endif - void mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 20:31: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B091337B401; Sun, 28 Jul 2002 20:30:37 -0700 (PDT) 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 24D8237B400 for ; Sun, 28 Jul 2002 20:30:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC0B243E5E for ; Sun, 28 Jul 2002 20:30:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T3UaJU051810 for ; Sun, 28 Jul 2002 20:30:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T3UZev051796 for perforce@freebsd.org; Sun, 28 Jul 2002 20:30:35 -0700 (PDT) Date: Sun, 28 Jul 2002 20:30:35 -0700 (PDT) Message-Id: <200207290330.g6T3UZev051796@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15096 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15096 Change 15096 by rwatson@rwatson_paprika on 2002/07/28 20:30:28 More cosmetic changes. Relocate the memory map sweep during revocation to just below the subject relabeling code where it is used, and away from the framework/module initialization at the top. Rename some functions to match new naming conventions. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#214 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#214 (text+ko) ==== @@ -188,9 +188,9 @@ static int mac_policy_unregister(struct mac_policy_conf *mpc); static int mac_stdcreatevnode_ea(struct vnode *vp); -static void mac_subject_mmapped_drop_perms(struct thread *td, +static void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred); -static void mac_subject_mmapped_drop_perms_recurse(struct thread *td, +static void mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred, struct vm_map *map); /* @@ -284,160 +284,6 @@ const size_t maxlabelsize = 65536; /* - * When relabeling a subject, call out to the policies for the maximum - * permission allowed for each object type we know about in its - * memory space, and revoke access (in the least surprising ways we - * know) when necessary. The process lock is not held here. - */ -static void -mac_subject_mmapped_drop_perms(struct thread *td, struct ucred *cred) -{ - - /* XXX freeze all other threads */ - mtx_lock(&Giant); - mac_subject_mmapped_drop_perms_recurse(td, cred, - &td->td_proc->p_vmspace->vm_map); - mtx_unlock(&Giant); - /* XXX allow other threads to continue */ -} - -static __inline const char * -prot2str(vm_prot_t prot) -{ - - switch (prot & VM_PROT_ALL) { - case VM_PROT_READ: - return ("r--"); - case VM_PROT_READ | VM_PROT_WRITE: - return ("rw-"); - case VM_PROT_READ | VM_PROT_EXECUTE: - return ("r-x"); - case VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE: - return ("rwx"); - case VM_PROT_WRITE: - return ("-w-"); - case VM_PROT_EXECUTE: - return ("--x"); - case VM_PROT_WRITE | VM_PROT_EXECUTE: - return ("-wx"); - default: - return ("---"); - } -} - -static void -mac_subject_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred, - struct vm_map *map) -{ - struct vm_map_entry *vme; - vm_prot_t result, revokeperms; - vm_object_t object; - vm_ooffset_t offset; - struct vnode *vp; - - vm_map_lock_read(map); - for (vme = map->header.next; vme != &map->header; vme = vme->next) { - if (vme->eflags & MAP_ENTRY_IS_SUB_MAP) { - mac_subject_mmapped_drop_perms_recurse(td, cred, - vme->object.sub_map); - continue; - } - /* - * Skip over entries that obviously are not shared. - */ - if (vme->eflags & (MAP_ENTRY_COW | MAP_ENTRY_NOSYNC) || - !vme->max_protection) - continue; - /* - * Drill down to the deepest backing object. - */ - offset = vme->offset; - object = vme->object.vm_object; - if (object == NULL) - continue; - while (object->backing_object != NULL) { - object = object->backing_object; - offset += object->backing_object_offset; - } - /* - * At the moment, vm_maps and objects aren't considered - * by the MAC system, so only things with backing by a - * normal object (read: vnodes) are checked. - */ - if (object->type != OBJT_VNODE) - continue; - vp = (struct vnode *)object->handle; - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - result = mac_check_vnode_mmap_prot(cred, vp, 0); - VOP_UNLOCK(vp, 0, td); - /* - * Find out what maximum protection we may be allowing - * now but a policy needs to get removed. - */ - revokeperms = vme->max_protection & ~result; - if (!revokeperms) - continue; - printf("pid %d: revoking %s perms from %#lx:%d " - "(max %s/cur %s)\n", td->td_proc->p_pid, - prot2str(revokeperms), vme->start, vme->end - vme->start, - prot2str(vme->max_protection), prot2str(vme->protection)); - vm_map_lock_upgrade(map); - /* - * This is the really simple case: if a map has more - * max_protection than is allowed, but it's not being - * actually used (that is, the current protection is - * still allowed), we can just wipe it out and do - * nothing more. - */ - if ((vme->protection & revokeperms) == 0) { - vme->max_protection -= revokeperms; - } else { - if (revokeperms & VM_PROT_WRITE) { - /* - * In the more complicated case, flush out all - * pending changes to the object then turn it - * copy-on-write. - */ - vm_object_reference(object); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - vm_object_page_clean(object, - OFF_TO_IDX(offset), - OFF_TO_IDX(offset + vme->end - vme->start + - PAGE_MASK), - OBJPC_SYNC); - VOP_UNLOCK(vp, 0, td); - vm_object_deallocate(object); - /* - * Why bother if there's no read permissions - * anymore? For the rest, we need to leave - * the write permissions on for COW, or - * remove them entirely if configured to. - */ - if (!mac_mmap_revocation_via_cow) { - vme->max_protection &= ~VM_PROT_WRITE; - vme->protection &= ~VM_PROT_WRITE; - } if ((revokeperms & VM_PROT_READ) == 0) - vme->eflags |= MAP_ENTRY_COW | - MAP_ENTRY_NEEDS_COPY; - } - if (revokeperms & VM_PROT_EXECUTE) { - vme->max_protection &= ~VM_PROT_EXECUTE; - vme->protection &= ~VM_PROT_EXECUTE; - } - if (revokeperms & VM_PROT_READ) { - vme->max_protection = 0; - vme->protection = 0; - } - pmap_protect(map->pmap, vme->start, vme->end, - vme->protection & ~revokeperms); - vm_map_simplify_entry(map, vme); - } - vm_map_lock_downgrade(map); - } - vm_map_unlock_read(map); -} - -/* * Initialize the MAC subsystem, including appropriate SMP locks. */ static void @@ -2147,6 +1993,160 @@ } /* + * When relabeling a process, call out to the policies for the maximum + * permission allowed for each object type we know about in its + * memory space, and revoke access (in the least surprising ways we + * know) when necessary. The process lock is not held here. + */ +static void +mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred) +{ + + /* XXX freeze all other threads */ + mtx_lock(&Giant); + mac_cred_mmapped_drop_perms_recurse(td, cred, + &td->td_proc->p_vmspace->vm_map); + mtx_unlock(&Giant); + /* XXX allow other threads to continue */ +} + +static __inline const char * +prot2str(vm_prot_t prot) +{ + + switch (prot & VM_PROT_ALL) { + case VM_PROT_READ: + return ("r--"); + case VM_PROT_READ | VM_PROT_WRITE: + return ("rw-"); + case VM_PROT_READ | VM_PROT_EXECUTE: + return ("r-x"); + case VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE: + return ("rwx"); + case VM_PROT_WRITE: + return ("-w-"); + case VM_PROT_EXECUTE: + return ("--x"); + case VM_PROT_WRITE | VM_PROT_EXECUTE: + return ("-wx"); + default: + return ("---"); + } +} + +static void +mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred, + struct vm_map *map) +{ + struct vm_map_entry *vme; + vm_prot_t result, revokeperms; + vm_object_t object; + vm_ooffset_t offset; + struct vnode *vp; + + vm_map_lock_read(map); + for (vme = map->header.next; vme != &map->header; vme = vme->next) { + if (vme->eflags & MAP_ENTRY_IS_SUB_MAP) { + mac_cred_mmapped_drop_perms_recurse(td, cred, + vme->object.sub_map); + continue; + } + /* + * Skip over entries that obviously are not shared. + */ + if (vme->eflags & (MAP_ENTRY_COW | MAP_ENTRY_NOSYNC) || + !vme->max_protection) + continue; + /* + * Drill down to the deepest backing object. + */ + offset = vme->offset; + object = vme->object.vm_object; + if (object == NULL) + continue; + while (object->backing_object != NULL) { + object = object->backing_object; + offset += object->backing_object_offset; + } + /* + * At the moment, vm_maps and objects aren't considered + * by the MAC system, so only things with backing by a + * normal object (read: vnodes) are checked. + */ + if (object->type != OBJT_VNODE) + continue; + vp = (struct vnode *)object->handle; + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + result = mac_check_vnode_mmap_prot(cred, vp, 0); + VOP_UNLOCK(vp, 0, td); + /* + * Find out what maximum protection we may be allowing + * now but a policy needs to get removed. + */ + revokeperms = vme->max_protection & ~result; + if (!revokeperms) + continue; + printf("pid %d: revoking %s perms from %#lx:%d " + "(max %s/cur %s)\n", td->td_proc->p_pid, + prot2str(revokeperms), vme->start, vme->end - vme->start, + prot2str(vme->max_protection), prot2str(vme->protection)); + vm_map_lock_upgrade(map); + /* + * This is the really simple case: if a map has more + * max_protection than is allowed, but it's not being + * actually used (that is, the current protection is + * still allowed), we can just wipe it out and do + * nothing more. + */ + if ((vme->protection & revokeperms) == 0) { + vme->max_protection -= revokeperms; + } else { + if (revokeperms & VM_PROT_WRITE) { + /* + * In the more complicated case, flush out all + * pending changes to the object then turn it + * copy-on-write. + */ + vm_object_reference(object); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vm_object_page_clean(object, + OFF_TO_IDX(offset), + OFF_TO_IDX(offset + vme->end - vme->start + + PAGE_MASK), + OBJPC_SYNC); + VOP_UNLOCK(vp, 0, td); + vm_object_deallocate(object); + /* + * Why bother if there's no read permissions + * anymore? For the rest, we need to leave + * the write permissions on for COW, or + * remove them entirely if configured to. + */ + if (!mac_mmap_revocation_via_cow) { + vme->max_protection &= ~VM_PROT_WRITE; + vme->protection &= ~VM_PROT_WRITE; + } if ((revokeperms & VM_PROT_READ) == 0) + vme->eflags |= MAP_ENTRY_COW | + MAP_ENTRY_NEEDS_COPY; + } + if (revokeperms & VM_PROT_EXECUTE) { + vme->max_protection &= ~VM_PROT_EXECUTE; + vme->protection &= ~VM_PROT_EXECUTE; + } + if (revokeperms & VM_PROT_READ) { + vme->max_protection = 0; + vme->protection = 0; + } + pmap_protect(map->pmap, vme->start, vme->end, + vme->protection & ~revokeperms); + vm_map_simplify_entry(map, vme); + } + vm_map_lock_downgrade(map); + } + vm_map_unlock_read(map); +} + +/* * When the subject's label changes, it may require revocation of privilege * to mapped objects. This can't be done on-the-fly later with a unified * buffer cache. @@ -2156,7 +2156,7 @@ { MAC_PERFORM(relabel_cred, cred, newlabel); - mac_subject_mmapped_drop_perms(curthread, cred); + mac_cred_mmapped_drop_perms(curthread, cred); } void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 20:32:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86C0D37B401; Sun, 28 Jul 2002 20:32:40 -0700 (PDT) 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 1ED3D37B400 for ; Sun, 28 Jul 2002 20:32:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2E8E43E42 for ; Sun, 28 Jul 2002 20:32:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T3WdJU052067 for ; Sun, 28 Jul 2002 20:32:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T3WdLl052064 for perforce@freebsd.org; Sun, 28 Jul 2002 20:32:39 -0700 (PDT) Date: Sun, 28 Jul 2002 20:32:39 -0700 (PDT) Message-Id: <200207290332.g6T3WdLl052064@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15097 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15097 Change 15097 by rwatson@rwatson_paprika on 2002/07/28 20:32:21 Comment update. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#215 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#215 (text+ko) ==== @@ -40,7 +40,9 @@ */ /* * Developed by the TrustedBSD Project. - * Userland/kernel interface, policy merging for various access models. + * + * Framework for extensible kernel access control. Kernel and userland + * interface to the framework, policy registration and composition. */ #include "opt_mac.h" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 20:48:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C42A37B401; Sun, 28 Jul 2002 20:48:00 -0700 (PDT) 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 B5D0A37B400 for ; Sun, 28 Jul 2002 20:47:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 163AB43E4A for ; Sun, 28 Jul 2002 20:47:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T3lwJU053215 for ; Sun, 28 Jul 2002 20:47:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T3lwOY053207 for perforce@freebsd.org; Sun, 28 Jul 2002 20:47:58 -0700 (PDT) Date: Sun, 28 Jul 2002 20:47:58 -0700 (PDT) Message-Id: <200207290347.g6T3lwOY053207@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15098 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15098 Change 15098 by rwatson@rwatson_paprika on 2002/07/28 20:47:15 Reorder vnode checks to match canonical mac_policy order to improve readability. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#63 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#63 (text+ko) ==== @@ -1088,6 +1088,200 @@ } static int +mac_te_check_vnode_access(struct ucred *cred, struct vnode *vp, + struct label *label, mode_t flags) +{ + + return (mac_te_check_open_vnode(cred, vp, label, flags)); +} + +static int +mac_te_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + + return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_CHDIR)); +} + +static int +mac_te_check_vnode_chroot(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + + return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_CHROOT)); +} + +static int +mac_te_check_vnode_create(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct componentname *cnp, struct vattr *vap) +{ + + return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_WRITE)); +} + +static int +mac_te_check_vnode_delete(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) +{ + int error; + + error = mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_WRITE); + if (error) + return (error); + switch (vp->v_type) { + case VDIR: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETE)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETE)); + default: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETE)); + } +} + +static int +mac_te_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + + switch (vp->v_type) { + case VDIR: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETEACL)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETEACL)); + default: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETEACL)); + } +} + +static int +mac_te_check_exec_vnode(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_EXEC)); +} + +static int +mac_te_check_vnode_getacl(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + + switch (vp->v_type) { + case VDIR: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_GETACL)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_GETACL)); + default: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_GETACL)); + } +} + +static int +mac_te_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, + struct label *label, int attrnamespace, const char *name, struct uio *uio) +{ + + switch (vp->v_type) { + case VDIR: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_DIR_GETEXTATTR)); + case VLNK: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_GETEXTATTR)); + default: + return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_GETEXTATTR)); + } +} + +static int +mac_te_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct componentname *cnp) +{ + + return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_LOOKUP)); +} + +static vm_prot_t +mac_te_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, + struct label *label, int newmapping) +{ + struct mac_te *subj, *obj; + vm_prot_t prot = 0; + + if (!mac_te_enabled || (!mac_te_revocation_enabled && !newmapping)) + return (VM_PROT_ALL); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_FILE_READ) == 0) + prot |= VM_PROT_READ; + if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_FILE_EXEC) == 0) + prot |= VM_PROT_EXECUTE; + if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_FILE_WRITE) == 0) + prot |= VM_PROT_WRITE; + return (prot); +} + +static int +mac_te_check_vnode_op(struct ucred *cred, struct vnode *vp, + struct label *label, int op) +{ + struct mac_te *subj, *obj; + int error, te_class, te_op; + + if (!mac_te_revocation_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + te_class = MAC_TE_CLASS_FILE; + switch (op) { + case MAC_OP_VNODE_POLL: + te_op = MAC_TE_OPERATION_FILE_POLL; + break; + + case MAC_OP_VNODE_READ: + te_op = MAC_TE_OPERATION_FILE_READ; + break; + + case MAC_OP_VNODE_WRITE: + te_op = MAC_TE_OPERATION_FILE_WRITE; + break; + + default: + printf("mac_te_check_vnode_op: unknown operation %d\n", + op); + return (EINVAL); + } + + error = mac_te_check(subj, obj, MAC_TE_CLASS_FILE, te_op); + + return (error); +} + +static int mac_te_check_open_vnode(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) { @@ -1203,60 +1397,6 @@ } static int -mac_te_check_exec_vnode(struct ucred *cred, struct vnode *vp, - struct label *label) -{ - - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_EXEC)); -} - -static int -mac_te_check_vnode_getacl(struct ucred *cred, struct vnode *vp, - struct label *label, acl_type_t type) -{ - - switch (vp->v_type) { - case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_GETACL)); - case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_GETACL)); - default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_GETACL)); - } -} - -static int -mac_te_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, - struct label *label, int attrnamespace, const char *name, struct uio *uio) -{ - - switch (vp->v_type) { - case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_FILE, MAC_TE_OPERATION_DIR_GETEXTATTR)); - case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_GETEXTATTR)); - default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_GETEXTATTR)); - } -} - -static int -mac_te_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct componentname *cnp) -{ - - return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_LOOKUP)); -} - -static int mac_te_check_vnode_revoke(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -1371,83 +1511,6 @@ } static int -mac_te_check_vnode_access(struct ucred *cred, struct vnode *vp, - struct label *label, mode_t flags) -{ - - return (mac_te_check_open_vnode(cred, vp, label, flags)); -} - -static int -mac_te_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) -{ - - return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_CHDIR)); -} - -static int -mac_te_check_vnode_chroot(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) -{ - - return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_CHROOT)); -} - -static int -mac_te_check_vnode_create(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct componentname *cnp, struct vattr *vap) -{ - - return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_WRITE)); -} - -static int -mac_te_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *label, - struct componentname *cnp) -{ - int error; - - error = mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_WRITE); - if (error) - return (error); - switch (vp->v_type) { - case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETE)); - case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETE)); - default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETE)); - } -} - -static int -mac_te_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, - struct label *label, acl_type_t type) -{ - - switch (vp->v_type) { - case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETEACL)); - case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETEACL)); - default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETEACL)); - } -} - -static int mac_te_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) @@ -1567,69 +1630,6 @@ return (0); } -static vm_prot_t -mac_te_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, - struct label *label, int newmapping) -{ - struct mac_te *subj, *obj; - vm_prot_t prot = 0; - - if (!mac_te_enabled || (!mac_te_revocation_enabled && !newmapping)) - return (VM_PROT_ALL); - - subj = SLOT(&cred->cr_label); - obj = SLOT(label); - - if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, - MAC_TE_OPERATION_FILE_READ) == 0) - prot |= VM_PROT_READ; - if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, - MAC_TE_OPERATION_FILE_EXEC) == 0) - prot |= VM_PROT_EXECUTE; - if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, - MAC_TE_OPERATION_FILE_WRITE) == 0) - prot |= VM_PROT_WRITE; - return (prot); -} - -static int -mac_te_check_vnode_op(struct ucred *cred, struct vnode *vp, - struct label *label, int op) -{ - struct mac_te *subj, *obj; - int error, te_class, te_op; - - if (!mac_te_revocation_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(label); - - te_class = MAC_TE_CLASS_FILE; - switch (op) { - case MAC_OP_VNODE_POLL: - te_op = MAC_TE_OPERATION_FILE_POLL; - break; - - case MAC_OP_VNODE_READ: - te_op = MAC_TE_OPERATION_FILE_READ; - break; - - case MAC_OP_VNODE_WRITE: - te_op = MAC_TE_OPERATION_FILE_WRITE; - break; - - default: - printf("mac_te_check_vnode_op: unknown operation %d\n", - op); - return (EINVAL); - } - - error = mac_te_check(subj, obj, MAC_TE_CLASS_FILE, te_op); - - return (error); -} - static void mac_te_update_devfsdirent_from_vnode(struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Jul 28 20:49: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8448637B401; Sun, 28 Jul 2002 20:49:01 -0700 (PDT) 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 21FC537B400 for ; Sun, 28 Jul 2002 20:49:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5B6243E31 for ; Sun, 28 Jul 2002 20:49:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6T3n0JU053247 for ; Sun, 28 Jul 2002 20:49:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6T3n0EK053242 for perforce@freebsd.org; Sun, 28 Jul 2002 20:49:00 -0700 (PDT) Date: Sun, 28 Jul 2002 20:49:00 -0700 (PDT) Message-Id: <200207290349.g6T3n0EK053242@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15099 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15099 Change 15099 by rwatson@rwatson_paprika on 2002/07/28 20:48:52 Forwarded declare prototype for mac_te_check_open_vnode() since it's invoked by mac_te_check_access_vnode(). Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#64 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#64 (text+ko) ==== @@ -115,6 +115,9 @@ int tr_operation; }; +static int mac_te_check_open_vnode(struct ucred *cred, struct vnode *vp, + struct label *filelabel, mode_t acc_mode); + /* * Temporary rule structure to permit basic stuff, this can and will * be replaced. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 5:52:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EEAC37B401; Mon, 29 Jul 2002 05:52:41 -0700 (PDT) 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 E138C37B400 for ; Mon, 29 Jul 2002 05:52:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A44DD43E4A for ; Mon, 29 Jul 2002 05:52:40 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TCqeJU049930 for ; Mon, 29 Jul 2002 05:52:40 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TCqenw049927 for perforce@freebsd.org; Mon, 29 Jul 2002 05:52:40 -0700 (PDT) Date: Mon, 29 Jul 2002 05:52:40 -0700 (PDT) Message-Id: <200207291252.g6TCqenw049927@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 15119 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15119 Change 15119 by green@green_crash2 on 2002/07/29 05:51:46 Hack: install the perl5 port, as it is not depended on when needed. Affected files ... .. //depot/projects/trustedbsd/mac/release/Makefile#19 edit Differences ... ==== //depot/projects/trustedbsd/mac/release/Makefile#19 (text+ko) ==== @@ -113,7 +113,7 @@ # in English only. The language for the release notes is controlled # by the RELNOTES_LANG variable above. ALLLANG?= yes -DOCPORTS= textproc/docproj +DOCPORTS= lang/perl5 textproc/docproj # Set this to wherever the distfiles required by release procedures. .if defined(DOCDISTFILES) # Respect DOCDISTFILES which is used before. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 7: 1:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F6CA37B405; Mon, 29 Jul 2002 07:01:06 -0700 (PDT) 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 B1D4637B401 for ; Mon, 29 Jul 2002 07:01:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E96343E42 for ; Mon, 29 Jul 2002 07:01:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TE15JU065477 for ; Mon, 29 Jul 2002 07:01:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TE14B6065467 for perforce@freebsd.org; Mon, 29 Jul 2002 07:01:04 -0700 (PDT) Date: Mon, 29 Jul 2002 07:01:04 -0700 (PDT) Message-Id: <200207291401.g6TE14B6065467@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15120 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15120 Change 15120 by rwatson@rwatson_paprika on 2002/07/29 07:00:03 Remove unused definitions; relocate MALLOC_DEFINE's to before non-constant macros for consistency. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#216 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#216 (text+ko) ==== @@ -195,6 +195,9 @@ static void mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred, struct vm_map *map); +MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); +MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); + /* * mac_policy_list_lock protects the consistency of 'mac_policy_list', * the linked list of attached policy modules. Read-only consumers of @@ -280,11 +283,6 @@ MAC_POLICY_LIST_UNBUSY(); \ } while (0) -MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); -MALLOC_DEFINE(M_TMPLABEL, "tmplabel", "temporary user-label copied storage"); -MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); -const size_t maxlabelsize = 65536; - /* * Initialize the MAC subsystem, including appropriate SMP locks. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 7: 9:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6939A37B401; Mon, 29 Jul 2002 07:09:16 -0700 (PDT) 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 06A0D37B400 for ; Mon, 29 Jul 2002 07:09:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7E1A43E42 for ; Mon, 29 Jul 2002 07:09:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TE9FJU070396 for ; Mon, 29 Jul 2002 07:09:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TE9FT9070393 for perforce@freebsd.org; Mon, 29 Jul 2002 07:09:15 -0700 (PDT) Date: Mon, 29 Jul 2002 07:09:15 -0700 (PDT) Message-Id: <200207291409.g6TE9FT9070393@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15121 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15121 Change 15121 by rwatson@rwatson_paprika on 2002/07/29 07:08:55 Expand comment in the setlabel_ea implementation to indicate that we require the EA interface to allow us to write out multiple EAs on the same file in a single transaction rather than multiple transactions for consistency reasons. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#217 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#217 (text+ko) ==== @@ -2753,7 +2753,10 @@ * XXX: Eventually call out to EA check/set calls here. * Be particularly careful to avoid race conditions, * consistency problems, and stability problems when - * dealing with multiple EAs. + * dealing with multiple EAs. In particular, we require + * the ability to write multiple EAs on the same file in + * a single transaction, which the current EA interface + * does not provide. */ error = mac_externalize(intlabel, &extmac); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 7:24:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 605E537B405; Mon, 29 Jul 2002 07:24:36 -0700 (PDT) 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 DB71F37B401 for ; Mon, 29 Jul 2002 07:24:35 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F16643E42 for ; Mon, 29 Jul 2002 07:24:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TEOZJU072094 for ; Mon, 29 Jul 2002 07:24:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TEOYeE072091 for perforce@freebsd.org; Mon, 29 Jul 2002 07:24:35 -0700 (PDT) Date: Mon, 29 Jul 2002 07:24:35 -0700 (PDT) Message-Id: <200207291424.g6TEOYeE072091@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15122 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15122 Change 15122 by rwatson@rwatson_paprika on 2002/07/29 07:24:09 Re-sort the entry points to more closely match the canonical order in mac_policy.h. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#133 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#133 (text+ko) ==== @@ -248,8 +248,6 @@ void mac_destroy_mbuf(struct mbuf *); void mac_destroy_mount(struct mount *); void mac_destroy_vnode(struct vnode *); -void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, - struct label *newlabel); /* Non-authorizational event hooks. */ void mac_execve_transition(struct ucred *old, struct ucred *new, @@ -258,10 +256,23 @@ /* Authorizational event hooks. */ int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); +int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); +int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m); int mac_check_mount_stat(struct ucred *cred, struct mount *mp); int mac_check_pipe_op(struct ucred *cred, struct pipe *pipe, int op); int mac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, unsigned long cmd, void *data); +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_signal(struct ucred *cred, struct proc *proc, + int signum); +int mac_check_socket_bind(struct ucred *cred, struct socket *so, + struct sockaddr *sockaddr); +int mac_check_socket_connect(struct ucred *cred, struct socket *so, + struct sockaddr *sockaddr); +int mac_check_socket_listen(struct ucred *cred, struct socket *so); +int mac_check_socket_receive(struct socket *so, struct mbuf *m); +int mac_check_socket_visible(struct ucred *cred, struct socket *so); int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int flags); int mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp); @@ -363,26 +374,11 @@ int mac_fragment_matches_ipq(struct mbuf *fragment, struct ipq *ipq); void mac_update_ipq_from_fragment(struct mbuf *fragment, struct ipq *ipq); -int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m); - -int mac_check_socket_bind(struct ucred *cred, struct socket *so, - struct sockaddr *sockaddr); -int mac_check_socket_connect(struct ucred *cred, struct socket *so, - struct sockaddr *sockaddr); -int mac_check_socket_listen(struct ucred *cred, struct socket *so); -int mac_check_socket_receive(struct socket *so, struct mbuf *m); - -/* Hooks for the proc-based "can"-checks. */ -int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); -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_signal(struct ucred *cred, struct proc *proc, - int signum); -int mac_check_socket_visible(struct ucred *cred, struct socket *so); - /* Calls to help various file systems implement labeling using EAs. */ struct vop_refreshlabel_args; struct vop_setlabel_args; +void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, + struct label *newlabel); int vop_stdcreatevnode_ea(struct vnode *dvp, struct vnode *tvp, struct ucred *cred); int vop_stdrefreshlabel_ea(struct vop_refreshlabel_args *ap); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 7:36: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B5B037B401; Mon, 29 Jul 2002 07:35:50 -0700 (PDT) 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 3717937B400 for ; Mon, 29 Jul 2002 07:35:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2D0D43E42 for ; Mon, 29 Jul 2002 07:35:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TEZnJU073376 for ; Mon, 29 Jul 2002 07:35:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TEZn0r073373 for perforce@freebsd.org; Mon, 29 Jul 2002 07:35:49 -0700 (PDT) Date: Mon, 29 Jul 2002 07:35:49 -0700 (PDT) Message-Id: <200207291435.g6TEZn0r073373@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15123 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15123 Change 15123 by rwatson@rwatson_paprika on 2002/07/29 07:34:53 Re-sort all entry point declarations to match this in mac_policy.h; likewise update the comments. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#134 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#134 (text+ko) ==== @@ -227,7 +227,12 @@ #include /* XXX acl_type_t */ -/* Label-based operations. */ +struct vop_refreshlabel_args; +struct vop_setlabel_args; + +/* + * Label operations. + */ void mac_init_bpfdesc(struct bpf_d *); void mac_init_cred(struct ucred *); void mac_init_devfsdirent(struct devfs_dirent *); @@ -249,12 +254,71 @@ void mac_destroy_mount(struct mount *); void mac_destroy_vnode(struct vnode *); -/* Non-authorizational event hooks. */ +/* + * Labeling event operations: file system objects, and things that + * look a lot like file system objects. + */ +void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de); +void mac_create_devfs_directory(char *dirname, int dirnamelen, + struct devfs_dirent *de); +void mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp); +void mac_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, + struct vnode *child); +void mac_create_mount(struct ucred *cred, struct mount *mp); +void mac_create_root_mount(struct ucred *cred, struct mount *mp); +void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, + struct label *newlabel); +void mac_update_devfsdirent_from_vnode(struct devfs_dirent *de, + struct vnode *vp); +void mac_update_procfsvnode_from_cred(struct vnode *vp, struct ucred *cred); +void mac_update_vnode_from_mount(struct vnode *vp, struct mount *mp); + + +/* + * Labeling event operations: IPC objects. + */ +void mac_create_mbuf_from_socket(struct socket *so, struct mbuf *m); +void mac_create_socket(struct ucred *cred, struct socket *socket); +void mac_create_socket_from_socket(struct socket *oldsocket, + struct socket *newsocket); +void mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, + struct socket *socket); +void mac_set_socket_peer_from_socket(struct socket *oldsocket, + struct socket *newsocket); +void mac_create_pipe(struct ucred *cred, struct pipe *pipe); + +/* + * Labeling event operations: network objects. + */ +void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d); +void mac_create_ifnet(struct ifnet *ifp); +void mac_create_ipq_from_fragment(struct mbuf *fragment, struct ipq *ipq); +void mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram); +void mac_create_fragment_from_datagram(struct mbuf *datagram, + struct mbuf *fragment); +void mac_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf); +void mac_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, + struct mbuf *m); +void mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m); +void mac_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *m); +void mac_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, + struct ifnet *ifnet, struct mbuf *newmbuf); +void mac_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, + struct mbuf *newmbuf); +int mac_fragment_matches_ipq(struct mbuf *fragment, struct ipq *ipq); +void mac_update_ipq_from_fragment(struct mbuf *fragment, struct ipq *ipq); + +/* + * Labeling event operations: processes. + */ +void mac_create_cred(struct ucred *cred_parent, struct ucred *cred_child); void mac_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp); int mac_execve_will_transition(struct ucred *old, struct vnode *vp); +void mac_create_proc0(struct ucred *cred); +void mac_create_proc1(struct ucred *cred); -/* Authorizational event hooks. */ +/* Access control checks. */ int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m); @@ -329,56 +393,10 @@ int mac_pipe_label_set(struct ucred *cred, struct pipe *pipe, struct label *label); -/* Label creation events. */ -void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d); -void mac_create_cred(struct ucred *cred_parent, struct ucred *cred_child); -void mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram); -void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de); -void mac_create_devfs_directory(char *dirname, int dirnamelen, - struct devfs_dirent *de); -void mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp); -void mac_create_fragment_from_datagram(struct mbuf *datagram, - struct mbuf *fragment); -void mac_create_ifnet(struct ifnet *ifp); -void mac_create_ipq_from_fragment(struct mbuf *fragment, struct ipq *ipq); -void mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m); -void mac_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *m); -void mac_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf); -void mac_create_mbuf_from_socket(struct socket *so, struct mbuf *m); -void mac_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct mbuf *m); -void mac_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, - struct ifnet *ifnet, struct mbuf *newmbuf); -void mac_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, - struct mbuf *newmbuf); -void mac_create_mount(struct ucred *cred, struct mount *mp); -void mac_create_proc0(struct ucred *cred); -void mac_create_proc1(struct ucred *cred); -void mac_create_root_mount(struct ucred *cred, struct mount *mp); -void mac_create_socket(struct ucred *cred, struct socket *socket); -void mac_create_socket_from_socket(struct socket *oldsocket, - struct socket *newsocket); -void mac_create_pipe(struct ucred *cred, struct pipe *pipe); -void mac_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, - struct vnode *child); -void mac_set_socket_peer_from_mbuf(struct mbuf *mbuf, - struct socket *socket); -void mac_set_socket_peer_from_socket(struct socket *oldsocket, - struct socket *newsocket); -void mac_update_devfsdirent_from_vnode(struct devfs_dirent *de, - struct vnode *vp); -void mac_update_procfsvnode_from_cred(struct vnode *vp, struct ucred *cred); -void mac_update_vnode_from_mount(struct vnode *vp, struct mount *mp); - -/* Network event miscellany. */ -int mac_fragment_matches_ipq(struct mbuf *fragment, struct ipq *ipq); -void mac_update_ipq_from_fragment(struct mbuf *fragment, struct ipq *ipq); - -/* Calls to help various file systems implement labeling using EAs. */ -struct vop_refreshlabel_args; -struct vop_setlabel_args; -void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, - struct label *newlabel); +/* + * Calls to help various file systems implement labeling functionality + * using their existing EA implementation. + */ int vop_stdcreatevnode_ea(struct vnode *dvp, struct vnode *tvp, struct ucred *cred); int vop_stdrefreshlabel_ea(struct vop_refreshlabel_args *ap); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 8:34: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC8B637B401; Mon, 29 Jul 2002 08:33:00 -0700 (PDT) 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 80FE237B400 for ; Mon, 29 Jul 2002 08:33:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC1F043E42 for ; Mon, 29 Jul 2002 08:32:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TFWxJU083096 for ; Mon, 29 Jul 2002 08:32:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TFWxaw083092 for perforce@freebsd.org; Mon, 29 Jul 2002 08:32:59 -0700 (PDT) Date: Mon, 29 Jul 2002 08:32:59 -0700 (PDT) Message-Id: <200207291532.g6TFWxaw083092@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15124 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15124 Change 15124 by rwatson@rwatson_paprika on 2002/07/29 08:32:31 Various entry point naming simplifications: mac_create_vnode_from_vnode -> mac_create_vnode While there are other vnode creation events, this is the standard entry point for creating a vnode, and vnodes are always instantiated in the context of another vnode (parent directory), so remove the from_vnode. mac_create_ipq_from_fragment -> mac_create_ipq IP reassembly queues are always created in the context of an IP fragment, so remove explicit mention of that. mac_create_fragment_from_datagram -> mac_create_fragment IP fragments are always created in the context of an IP datagram, so remove explicit mention of that. mac_fragment_matches_ipq -> mac_fragment_match IP fragment matching only occurs in the context of an IP reassembly queue. Arguably it should be mac_ipq_match, however. mac_update_ipq_from_fragment -> mac_update_ipq IP reassembly queues are only ever updated when a new IP fragment arrives, so don't mention it explicitly. mac_update_devfsdirent_from_vnode -> mac_update_devfsdirent devfs directory entries are only ever updated from vnodes, so don't explicitly mention it. mac_update_procfsvnode_from_cred -> mac_update_procfsvnode procfs entries are only ever updated from credentials when handled explicitly as procfs entries, so don't mention that. Procfs entries can be updated from the mountpoint also, but in that context we use the generic update_vnode_from_mount entry point. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#19 edit .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#6 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#218 edit .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#16 edit .. //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#15 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#83 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#71 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#58 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#65 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#28 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#135 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#100 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#19 (text+ko) ==== @@ -823,7 +823,7 @@ de = vp->v_data; mac_relabel_vnode(ap->a_cred, vp, ap->a_label); - mac_update_devfsdirent_from_vnode(de, vp); + mac_update_devfsdirent(de, vp); return (0); } @@ -862,8 +862,8 @@ TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); devfs_allocv(de, ap->a_dvp->v_mount, ap->a_vpp, 0); #ifdef MAC - mac_create_vnode_from_vnode(ap->a_cnp->cn_cred, ap->a_dvp, *ap->a_vpp); - mac_update_devfsdirent_from_vnode(de, *ap->a_vpp); + mac_create_vnode(ap->a_cnp->cn_cred, ap->a_dvp, *ap->a_vpp); + mac_update_devfsdirent(de, *ap->a_vpp); #endif /* MAC */ lockmgr(&dmp->dm_lock, LK_RELEASE, 0, curthread); return (0); ==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#6 (text+ko) ==== @@ -60,7 +60,7 @@ mac_update_vnode_from_mount(vp, vp->v_mount); else { PROC_LOCK(p); - mac_update_procfsvnode_from_cred(vp, p->p_ucred); + mac_update_procfsvnode(vp, p->p_ucred); PROC_UNLOCK(p); } ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#218 (text+ko) ==== @@ -482,8 +482,8 @@ mpc->mpc_ops->mpo_stdcreatevnode_ea = mpe->mpe_function; break; - case MAC_CREATE_VNODE_FROM_VNODE: - mpc->mpc_ops->mpo_create_vnode_from_vnode = + case MAC_CREATE_VNODE: + mpc->mpc_ops->mpo_create_vnode = mpe->mpe_function; break; case MAC_CREATE_MOUNT: @@ -498,12 +498,12 @@ mpc->mpc_ops->mpo_relabel_vnode = mpe->mpe_function; break; - case MAC_UPDATE_DEVFSDIRENT_FROM_VNODE: - mpc->mpc_ops->mpo_update_devfsdirent_from_vnode = + case MAC_UPDATE_DEVFSDIRENT: + mpc->mpc_ops->mpo_update_devfsdirent = mpe->mpe_function; break; - case MAC_UPDATE_PROCFSVNODE_FROM_CRED: - mpc->mpc_ops->mpo_update_procfsvnode_from_cred = + case MAC_UPDATE_PROCFSVNODE: + mpc->mpc_ops->mpo_update_procfsvnode = mpe->mpe_function; break; case MAC_UPDATE_VNODE_FROM_EXTATTR: @@ -558,16 +558,16 @@ mpc->mpc_ops->mpo_create_datagram_from_ipq = mpe->mpe_function; break; - case MAC_CREATE_FRAGMENT_FROM_DATAGRAM: - mpc->mpc_ops->mpo_create_fragment_from_datagram = + case MAC_CREATE_FRAGMENT: + mpc->mpc_ops->mpo_create_fragment = mpe->mpe_function; break; case MAC_CREATE_IFNET: mpc->mpc_ops->mpo_create_ifnet = mpe->mpe_function; break; - case MAC_CREATE_IPQ_FROM_FRAGMENT: - mpc->mpc_ops->mpo_create_ipq_from_fragment = + case MAC_CREATE_IPQ: + mpc->mpc_ops->mpo_create_ipq = mpe->mpe_function; break; case MAC_CREATE_MBUF_FROM_MBUF: @@ -594,16 +594,16 @@ mpc->mpc_ops->mpo_create_mbuf_netlayer_from_mbuf = mpe->mpe_function; break; - case MAC_FRAGMENT_MATCHES_IPQ: - mpc->mpc_ops->mpo_fragment_matches_ipq = + case MAC_FRAGMENT_MATCH: + mpc->mpc_ops->mpo_fragment_match = mpe->mpe_function; break; case MAC_RELABEL_IFNET: mpc->mpc_ops->mpo_relabel_ifnet = mpe->mpe_function; break; - case MAC_UPDATE_IPQ_FROM_FRAGMENT: - mpc->mpc_ops->mpo_update_ipq_from_fragment = + case MAC_UPDATE_IPQ: + mpc->mpc_ops->mpo_update_ipq = mpe->mpe_function; break; case MAC_CREATE_CRED: @@ -924,18 +924,17 @@ } void -mac_update_devfsdirent_from_vnode(struct devfs_dirent *de, struct vnode *vp) +mac_update_devfsdirent(struct devfs_dirent *de, struct vnode *vp) { - MAC_PERFORM(update_devfsdirent_from_vnode, de, &de->de_label, vp, - &vp->v_label); + MAC_PERFORM(update_devfsdirent, de, &de->de_label, vp, &vp->v_label); } void -mac_update_procfsvnode_from_cred(struct vnode *vp, struct ucred *cred) +mac_update_procfsvnode(struct vnode *vp, struct ucred *cred) { - MAC_PERFORM(update_procfsvnode_from_cred, vp, &vp->v_label, cred); + MAC_PERFORM(update_procfsvnode, vp, &vp->v_label, cred); } /* @@ -1138,7 +1137,7 @@ * happen except in fairly unusual circumstances (out * of disk, etc). */ - mac_create_vnode_from_vnode(cred, dvp, tvp); + mac_create_vnode(cred, dvp, tvp); error = mac_stdcreatevnode_ea(tvp); if (error) @@ -2244,19 +2243,19 @@ } void -mac_create_fragment_from_datagram(struct mbuf *datagram, struct mbuf *fragment) +mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment) { - MAC_PERFORM(create_fragment_from_datagram, datagram, - &datagram->m_pkthdr.label, fragment, &fragment->m_pkthdr.label); + MAC_PERFORM(create_fragment, datagram, &datagram->m_pkthdr.label, + fragment, &fragment->m_pkthdr.label); } void -mac_create_ipq_from_fragment(struct mbuf *fragment, struct ipq *ipq) +mac_create_ipq(struct mbuf *fragment, struct ipq *ipq) { - MAC_PERFORM(create_ipq_from_fragment, fragment, - &fragment->m_pkthdr.label, ipq, &ipq->ipq_label); + MAC_PERFORM(create_ipq, fragment, &fragment->m_pkthdr.label, ipq, + &ipq->ipq_label); } void @@ -2310,23 +2309,23 @@ } int -mac_fragment_matches_ipq(struct mbuf *fragment, struct ipq *ipq) +mac_fragment_match(struct mbuf *fragment, struct ipq *ipq) { int result; result = 1; - MAC_BOOLEAN(fragment_matches_ipq, &&, fragment, - &fragment->m_pkthdr.label, ipq, &ipq->ipq_label); + MAC_BOOLEAN(fragment_match, &&, fragment, &fragment->m_pkthdr.label, + ipq, &ipq->ipq_label); return (result); } void -mac_update_ipq_from_fragment(struct mbuf *fragment, struct ipq *ipq) +mac_update_ipq(struct mbuf *fragment, struct ipq *ipq) { - MAC_PERFORM(update_ipq_from_fragment, fragment, - &fragment->m_pkthdr.label, ipq, &ipq->ipq_label); + MAC_PERFORM(update_ipq, fragment, &fragment->m_pkthdr.label, ipq, + &ipq->ipq_label); } void @@ -2662,23 +2661,23 @@ * When a new vnode is created, this call will initialize its label. */ void -mac_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, +mac_create_vnode(struct ucred *cred, struct vnode *parent, struct vnode *child) { int error; - ASSERT_VOP_LOCKED(parent, "mac_create_vnode_from_vnode"); - ASSERT_VOP_LOCKED(child, "mac_create_vnode_from_vnode"); + ASSERT_VOP_LOCKED(parent, "mac_create_vnode"); + ASSERT_VOP_LOCKED(child, "mac_create_vnode"); error = vn_refreshlabel(parent, cred); if (error) { - printf("mac_create_vnode_from_vnode: vn_refreshlabel returned" - " %d\n", error); - printf("mac_create_vnode_from_vnode: using old vnode label\n"); + printf("mac_create_vnode: vn_refreshlabel returned %d\n", + error); + printf("mac_create_vnode: using old vnode label\n"); } - MAC_PERFORM(create_vnode_from_vnode, cred, parent, &parent->v_label, - child, &child->v_label); + MAC_PERFORM(create_vnode, cred, parent, &parent->v_label, child, + &child->v_label); } int ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#16 (text+ko) ==== @@ -696,7 +696,7 @@ ip->ip_src.s_addr == fp->ipq_src.s_addr && ip->ip_dst.s_addr == fp->ipq_dst.s_addr && #ifdef MAC - mac_fragment_matches_ipq(m, fp) && + mac_fragment_match(m, fp) && #endif ip->ip_p == fp->ipq_p) goto found; @@ -909,7 +909,7 @@ fp = mtod(t, struct ipq *); #ifdef MAC mac_init_ipq(fp); - mac_create_ipq_from_fragment(m, fp); + mac_create_ipq(m, fp); #endif TAILQ_INSERT_HEAD(head, fp, ipq_list); nipq++; @@ -927,7 +927,7 @@ goto inserted; } else { #ifdef MAC - mac_update_ipq_from_fragment(m, fp); + mac_update_ipq(m, fp); #endif } ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#15 (text+ko) ==== @@ -1004,7 +1004,7 @@ m->m_pkthdr.len = mhlen + len; m->m_pkthdr.rcvif = (struct ifnet *)0; #ifdef MAC - mac_create_fragment_from_datagram(m0, m); + mac_create_fragment(m0, m); #endif m->m_pkthdr.csum_flags = m0->m_pkthdr.csum_flags; mhip->ip_off = htons(mhip->ip_off); ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#83 (text+ko) ==== @@ -661,9 +661,8 @@ } static void -mac_biba_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, - struct label *parentlabel, struct vnode *child, - struct label *childlabel) +mac_biba_create_vnode(struct ucred *cred, struct vnode *parent, + struct label *parentlabel, struct vnode *child, struct label *childlabel) { struct mac_biba *source, *dest; @@ -712,7 +711,7 @@ } static void -mac_biba_update_devfsdirent_from_vnode(struct devfs_dirent *devfs_dirent, +mac_biba_update_devfsdirent(struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { struct mac_biba *source, *dest; @@ -724,8 +723,8 @@ } static void -mac_biba_update_procfsvnode_from_cred(struct vnode *vp, - struct label *vnodelabel, struct ucred *cred) +mac_biba_update_procfsvnode(struct vnode *vp, struct label *vnodelabel, + struct ucred *cred) { struct mac_biba *source, *dest; @@ -946,8 +945,8 @@ } static void -mac_biba_create_ipq_from_fragment(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_biba_create_ipq(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { struct mac_biba *source, *dest; @@ -971,9 +970,8 @@ } static void -mac_biba_create_fragment_from_datagram(struct mbuf *datagram, - struct label *datagramlabel, struct mbuf *fragment, - struct label *fragmentlabel) +mac_biba_create_fragment(struct mbuf *datagram, struct label *datagramlabel, + struct mbuf *fragment, struct label *fragmentlabel) { struct mac_biba *source, *dest; @@ -1058,8 +1056,8 @@ } static int -mac_biba_fragment_matches_ipq(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_biba_fragment_match(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { struct mac_biba *a, *b; @@ -1083,8 +1081,8 @@ } static void -mac_biba_update_ipq_from_fragment(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_biba_update_ipq(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { /* NOOP: we only accept matching labels, so no need to update */ @@ -2068,18 +2066,18 @@ (macop_t)mac_biba_create_devfs_directory }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_biba_create_devfs_vnode }, - { MAC_CREATE_VNODE_FROM_VNODE, - (macop_t)mac_biba_create_vnode_from_vnode }, + { MAC_CREATE_VNODE, + (macop_t)mac_biba_create_vnode }, { MAC_CREATE_MOUNT, (macop_t)mac_biba_create_mount }, { MAC_CREATE_ROOT_MOUNT, (macop_t)mac_biba_create_root_mount }, { MAC_RELABEL_VNODE, (macop_t)mac_biba_relabel_vnode }, - { MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, - (macop_t)mac_biba_update_devfsdirent_from_vnode }, - { MAC_UPDATE_PROCFSVNODE_FROM_CRED, - (macop_t)mac_biba_update_procfsvnode_from_cred }, + { MAC_UPDATE_DEVFSDIRENT, + (macop_t)mac_biba_update_devfsdirent }, + { MAC_UPDATE_PROCFSVNODE, + (macop_t)mac_biba_update_procfsvnode }, { MAC_UPDATE_VNODE_FROM_EXTERNALIZED, (macop_t)mac_biba_update_vnode_from_externalized }, { MAC_UPDATE_VNODE_FROM_MOUNT, @@ -2104,12 +2102,12 @@ (macop_t)mac_biba_create_bpfdesc }, { MAC_CREATE_DATAGRAM_FROM_IPQ, (macop_t)mac_biba_create_datagram_from_ipq }, - { MAC_CREATE_FRAGMENT_FROM_DATAGRAM, - (macop_t)mac_biba_create_fragment_from_datagram }, + { MAC_CREATE_FRAGMENT, + (macop_t)mac_biba_create_fragment }, { MAC_CREATE_IFNET, (macop_t)mac_biba_create_ifnet }, - { MAC_CREATE_IPQ_FROM_FRAGMENT, - (macop_t)mac_biba_create_ipq_from_fragment }, + { MAC_CREATE_IPQ, + (macop_t)mac_biba_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_biba_create_mbuf_from_mbuf }, { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, @@ -2122,12 +2120,12 @@ (macop_t)mac_biba_create_mbuf_multicast_encap_from_mbuf }, { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, (macop_t)mac_biba_create_mbuf_netlayer_from_mbuf }, - { MAC_FRAGMENT_MATCHES_IPQ, - (macop_t)mac_biba_fragment_matches_ipq }, + { MAC_FRAGMENT_MATCH, + (macop_t)mac_biba_fragment_match }, { MAC_RELABEL_IFNET, (macop_t)mac_biba_relabel_ifnet }, - { MAC_UPDATE_IPQ_FROM_FRAGMENT, - (macop_t)mac_biba_update_ipq_from_fragment }, + { MAC_UPDATE_IPQ, + (macop_t)mac_biba_update_ipq }, { MAC_CREATE_CRED, (macop_t)mac_biba_create_cred }, { MAC_EXECVE_TRANSITION, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#71 (text+ko) ==== @@ -646,9 +646,8 @@ } static void -mac_mls_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, - struct label *parentlabel, struct vnode *child, - struct label *childlabel) +mac_mls_create_vnode(struct ucred *cred, struct vnode *parent, + struct label *parentlabel, struct vnode *child, struct label *childlabel) { struct mac_mls *source, *dest; @@ -697,7 +696,7 @@ } static void -mac_mls_update_devfsdirent_from_vnode(struct devfs_dirent *devfs_dirent, +mac_mls_update_devfsdirent(struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { struct mac_mls *source, *dest; @@ -709,8 +708,8 @@ } static void -mac_mls_update_procfsvnode_from_cred(struct vnode *vp, - struct label *vnodelabel, struct ucred *cred) +mac_mls_update_procfsvnode(struct vnode *vp, struct label *vnodelabel, + struct ucred *cred) { struct mac_mls *source, *dest; @@ -895,8 +894,8 @@ } static void -mac_mls_create_ipq_from_fragment(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_mls_create_ipq(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { struct mac_mls *source, *dest; @@ -920,9 +919,8 @@ } static void -mac_mls_create_fragment_from_datagram(struct mbuf *datagram, - struct label *datagramlabel, struct mbuf *fragment, - struct label *fragmentlabel) +mac_mls_create_fragment(struct mbuf *datagram, struct label *datagramlabel, + struct mbuf *fragment, struct label *fragmentlabel) { struct mac_mls *source, *dest; @@ -1007,8 +1005,8 @@ } static int -mac_mls_fragment_matches_ipq(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_mls_fragment_match(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { struct mac_mls *a, *b; @@ -1032,8 +1030,8 @@ } static void -mac_mls_update_ipq_from_fragment(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_mls_update_ipq(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { /* NOOP: we only accept matching labels, so no need to update */ @@ -2019,18 +2017,18 @@ (macop_t)mac_mls_create_devfs_directory }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_mls_create_devfs_vnode }, - { MAC_CREATE_VNODE_FROM_VNODE, - (macop_t)mac_mls_create_vnode_from_vnode }, + { MAC_CREATE_VNODE, + (macop_t)mac_mls_create_vnode }, { MAC_CREATE_MOUNT, (macop_t)mac_mls_create_mount }, { MAC_CREATE_ROOT_MOUNT, (macop_t)mac_mls_create_root_mount }, { MAC_RELABEL_VNODE, (macop_t)mac_mls_relabel_vnode }, - { MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, - (macop_t)mac_mls_update_devfsdirent_from_vnode }, - { MAC_UPDATE_PROCFSVNODE_FROM_CRED, - (macop_t)mac_mls_update_procfsvnode_from_cred }, + { MAC_UPDATE_DEVFSDIRENT, + (macop_t)mac_mls_update_devfsdirent }, + { MAC_UPDATE_PROCFSVNODE, + (macop_t)mac_mls_update_procfsvnode }, { MAC_UPDATE_VNODE_FROM_EXTERNALIZED, (macop_t)mac_mls_update_vnode_from_externalized }, { MAC_UPDATE_VNODE_FROM_MOUNT, @@ -2055,12 +2053,12 @@ (macop_t)mac_mls_create_bpfdesc }, { MAC_CREATE_DATAGRAM_FROM_IPQ, (macop_t)mac_mls_create_datagram_from_ipq }, - { MAC_CREATE_FRAGMENT_FROM_DATAGRAM, - (macop_t)mac_mls_create_fragment_from_datagram }, + { MAC_CREATE_FRAGMENT, + (macop_t)mac_mls_create_fragment }, { MAC_CREATE_IFNET, (macop_t)mac_mls_create_ifnet }, - { MAC_CREATE_IPQ_FROM_FRAGMENT, - (macop_t)mac_mls_create_ipq_from_fragment }, + { MAC_CREATE_IPQ, + (macop_t)mac_mls_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_mls_create_mbuf_from_mbuf }, { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, @@ -2073,12 +2071,12 @@ (macop_t)mac_mls_create_mbuf_multicast_encap_from_mbuf }, { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, (macop_t)mac_mls_create_mbuf_netlayer_from_mbuf }, - { MAC_FRAGMENT_MATCHES_IPQ, - (macop_t)mac_mls_fragment_matches_ipq }, + { MAC_FRAGMENT_MATCH, + (macop_t)mac_mls_fragment_match }, { MAC_RELABEL_IFNET, (macop_t)mac_mls_relabel_ifnet }, - { MAC_UPDATE_IPQ_FROM_FRAGMENT, - (macop_t)mac_mls_update_ipq_from_fragment }, + { MAC_UPDATE_IPQ, + (macop_t)mac_mls_update_ipq }, { MAC_CREATE_CRED, (macop_t)mac_mls_create_cred }, { MAC_EXECVE_TRANSITION, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#58 (text+ko) ==== @@ -280,7 +280,7 @@ } static void -mac_none_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, +mac_none_create_vnode(struct ucred *cred, struct vnode *parent, struct label *parentlabel, struct vnode *child, struct label *childlabel) { @@ -416,9 +416,8 @@ } static void -mac_none_create_fragment_from_datagram(struct mbuf *datagram, - struct label *datagramlabel, struct mbuf *fragment, - struct label *fragmentlabel) +mac_none_create_fragment(struct mbuf *datagram, struct label *datagramlabel, + struct mbuf *fragment, struct label *fragmentlabel) { } @@ -430,8 +429,8 @@ } static void -mac_none_create_ipq_from_fragment(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_none_create_ipq(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { } @@ -482,8 +481,8 @@ } static int -mac_none_fragment_matches_ipq(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_none_fragment_match(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { return (1); @@ -497,8 +496,8 @@ } static void -mac_none_update_ipq_from_fragment(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_none_update_ipq(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { } @@ -942,8 +941,8 @@ (macop_t)mac_none_create_devfs_directory }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_none_create_devfs_vnode }, - { MAC_CREATE_VNODE_FROM_VNODE, - (macop_t)mac_none_create_vnode_from_vnode }, + { MAC_CREATE_VNODE, + (macop_t)mac_none_create_vnode }, { MAC_CREATE_MOUNT, (macop_t)mac_none_create_mount }, { MAC_CREATE_ROOT_MOUNT, @@ -978,14 +977,14 @@ (macop_t)mac_none_create_bpfdesc }, { MAC_CREATE_IFNET, (macop_t)mac_none_create_ifnet }, - { MAC_CREATE_IPQ_FROM_FRAGMENT, - (macop_t)mac_none_create_ipq_from_fragment }, + { MAC_CREATE_IPQ, + (macop_t)mac_none_create_ipq }, { MAC_CREATE_DATAGRAM_FROM_IPQ, (macop_t)mac_none_create_datagram_from_ipq }, - { MAC_CREATE_FRAGMENT_FROM_DATAGRAM, - (macop_t)mac_none_create_fragment_from_datagram }, - { MAC_CREATE_IPQ_FROM_FRAGMENT, - (macop_t)mac_none_create_ipq_from_fragment }, + { MAC_CREATE_FRAGMENT, + (macop_t)mac_none_create_fragment }, + { MAC_CREATE_IPQ, + (macop_t)mac_none_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_none_create_mbuf_from_mbuf }, { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, @@ -998,12 +997,12 @@ (macop_t)mac_none_create_mbuf_multicast_encap_from_mbuf }, { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, (macop_t)mac_none_create_mbuf_netlayer_from_mbuf }, - { MAC_FRAGMENT_MATCHES_IPQ, - (macop_t)mac_none_fragment_matches_ipq }, + { MAC_FRAGMENT_MATCH, + (macop_t)mac_none_fragment_match }, { MAC_RELABEL_IFNET, (macop_t)mac_none_relabel_ifnet }, - { MAC_UPDATE_IPQ_FROM_FRAGMENT, - (macop_t)mac_none_update_ipq_from_fragment }, + { MAC_UPDATE_IPQ, + (macop_t)mac_none_update_ipq }, { MAC_CREATE_CRED, (macop_t)mac_none_create_cred }, { MAC_EXECVE_TRANSITION, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#65 (text+ko) ==== @@ -857,9 +857,8 @@ } static void -mac_te_create_fragment_from_datagram(struct mbuf *datagram, - struct label *datagramlabel, struct mbuf *fragment, - struct label *fragmentlabel) +mac_te_create_fragment(struct mbuf *datagram, struct label *datagramlabel, + struct mbuf *fragment, struct label *fragmentlabel) { mac_te_init_label(SLOT(fragmentlabel)); @@ -867,8 +866,8 @@ } static void -mac_te_create_ipq_from_fragment(struct mbuf *fragment, - struct label *fragmentlabel, struct mbuf *ipq, struct label *ipqlabel) +mac_te_create_ipq(struct mbuf *fragment, struct label *fragmentlabel, + struct mbuf *ipq, struct label *ipqlabel) { mac_te_copy_label(SLOT(fragmentlabel), SLOT(ipqlabel)); @@ -917,8 +916,8 @@ } static int -mac_te_fragment_matches_ipq(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_te_fragment_match(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { return (mac_te_equal(fragmentlabel, ipqlabel)); @@ -1083,7 +1082,7 @@ } static void -mac_te_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, +mac_te_create_vnode(struct ucred *cred, struct vnode *parent, struct label *parentlabel, struct vnode *child, struct label *childlabel) { @@ -1634,7 +1633,7 @@ } static void -mac_te_update_devfsdirent_from_vnode(struct devfs_dirent *devfs_dirent, +mac_te_update_devfsdirent(struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { @@ -1642,7 +1641,7 @@ } static void -mac_te_update_procfsvnode_from_cred(struct vnode *vp, struct label *vnodelabel, +mac_te_update_procfsvnode(struct vnode *vp, struct label *vnodelabel, struct ucred *cred) { @@ -1666,8 +1665,8 @@ } static void -mac_te_update_ipq_from_fragment(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_te_update_ipq(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { mac_te_copy_label(SLOT(fragmentlabel), SLOT(ipqlabel)); @@ -1700,8 +1699,8 @@ { MAC_CREATE_DEVFS_DEVICE, (macop_t)mac_te_create_devfs_device }, { MAC_CREATE_DEVFS_DIRECTORY, (macop_t)mac_te_create_devfs_directory }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_te_create_devfs_vnode }, - { MAC_CREATE_VNODE_FROM_VNODE, - (macop_t)mac_te_create_vnode_from_vnode }, + { MAC_CREATE_VNODE, + (macop_t)mac_te_create_vnode }, { MAC_CREATE_MOUNT, (macop_t)mac_te_create_mount }, { MAC_CREATE_ROOT_MOUNT, (macop_t)mac_te_create_root_mount }, { MAC_CREATE_MBUF_FROM_SOCKET, @@ -1720,10 +1719,10 @@ { MAC_CREATE_IFNET, (macop_t)mac_te_create_ifnet }, { MAC_CREATE_DATAGRAM_FROM_IPQ, (macop_t)mac_te_create_datagram_from_ipq }, - { MAC_CREATE_FRAGMENT_FROM_DATAGRAM, - (macop_t)mac_te_create_fragment_from_datagram }, - { MAC_CREATE_IPQ_FROM_FRAGMENT, - (macop_t)mac_te_create_ipq_from_fragment }, + { MAC_CREATE_FRAGMENT, + (macop_t)mac_te_create_fragment }, + { MAC_CREATE_IPQ, + (macop_t)mac_te_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_te_create_mbuf_from_mbuf }, { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, @@ -1736,7 +1735,8 @@ (macop_t)mac_te_create_mbuf_multicast_encap_from_mbuf }, { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, (macop_t)mac_te_create_mbuf_netlayer_from_mbuf }, - { MAC_FRAGMENT_MATCHES_IPQ, (macop_t)mac_te_fragment_matches_ipq }, + { MAC_FRAGMENT_MATCH, + (macop_t)mac_te_fragment_match }, { MAC_RELABEL_IFNET, (macop_t)mac_te_relabel_ifnet }, { MAC_CREATE_CRED, (macop_t)mac_te_create_cred }, { MAC_EXECVE_TRANSITION, (macop_t)mac_te_execve_transition }, @@ -1834,16 +1834,16 @@ (macop_t)mac_te_check_vnode_op }, { MAC_EXTERNALIZE, (macop_t)mac_te_externalize }, { MAC_INTERNALIZE, (macop_t)mac_te_internalize }, - { MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, - (macop_t)mac_te_update_devfsdirent_from_vnode }, - { MAC_UPDATE_PROCFSVNODE_FROM_CRED, - (macop_t)mac_te_update_procfsvnode_from_cred }, + { MAC_UPDATE_DEVFSDIRENT, + (macop_t)mac_te_update_devfsdirent }, + { MAC_UPDATE_PROCFSVNODE, + (macop_t)mac_te_update_procfsvnode }, { MAC_UPDATE_VNODE_FROM_EXTERNALIZED, (macop_t)mac_te_update_vnode_from_externalized }, { MAC_UPDATE_VNODE_FROM_MOUNT, (macop_t)mac_te_update_vnode_from_mount }, - { MAC_UPDATE_IPQ_FROM_FRAGMENT, - (macop_t)mac_te_update_ipq_from_fragment }, + { MAC_UPDATE_IPQ, + (macop_t)mac_te_update_ipq }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#28 (text+ko) ==== @@ -488,9 +488,8 @@ } static void -mac_test_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, - struct label *parentlabel, struct vnode *child, - struct label *childlabel) +mac_test_create_vnode(struct ucred *cred, struct vnode *parent, + struct label *parentlabel, struct vnode *child, struct label *childlabel) { } @@ -517,15 +516,15 @@ } static void -mac_test_update_devfsdirent_from_vnode(struct devfs_dirent *devfs_dirent, +mac_test_update_devfsdirent(struct devfs_dirent *devfs_dirent, struct vnode *vp) { } static void -mac_test_update_procfsvnode_from_cred(struct vnode *vp, - struct label *vnodelabel, struct ucred *cred) +mac_test_update_procfsvnode(struct vnode *vp, struct label *vnodelabel, + struct ucred *cred) { } @@ -624,9 +623,8 @@ } static void -mac_test_create_fragment_from_datagram(struct mbuf *datagram, - struct label *datagramlabel, struct mbuf *fragment, - struct label *fragmentlabel) +mac_test_create_fragment(struct mbuf *datagram, struct label *datagramlabel, + struct mbuf *fragment, struct label *fragmentlabel) { } @@ -638,8 +636,8 @@ } static void -mac_test_create_ipq_from_fragment(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_test_create_ipq(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { } @@ -690,8 +688,8 @@ } static int -mac_test_fragment_matches_ipq(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_test_fragment_match(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { return (1); @@ -705,8 +703,8 @@ } static void -mac_test_update_ipq_from_fragment(struct mbuf *fragment, - struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) +mac_test_update_ipq(struct mbuf *fragment, struct label *fragmentlabel, + struct ipq *ipq, struct label *ipqlabel) { } @@ -1158,10 +1156,10 @@ (macop_t)mac_test_create_root_mount }, { MAC_RELABEL_VNODE, (macop_t)mac_test_relabel_vnode }, - { MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, - (macop_t)mac_test_update_devfsdirent_from_vnode }, - { MAC_UPDATE_PROCFSVNODE_FROM_CRED, - (macop_t)mac_test_update_procfsvnode_from_cred }, + { MAC_UPDATE_DEVFSDIRENT, + (macop_t)mac_test_update_devfsdirent }, + { MAC_UPDATE_PROCFSVNODE, + (macop_t)mac_test_update_procfsvnode }, { MAC_UPDATE_VNODE_FROM_EXTERNALIZED, (macop_t)mac_test_update_vnode_from_externalized }, { MAC_UPDATE_VNODE_FROM_MOUNT, @@ -1188,10 +1186,10 @@ (macop_t)mac_test_create_ifnet }, { MAC_CREATE_DATAGRAM_FROM_IPQ, (macop_t)mac_test_create_datagram_from_ipq }, - { MAC_CREATE_FRAGMENT_FROM_DATAGRAM, - (macop_t)mac_test_create_fragment_from_datagram }, - { MAC_CREATE_IPQ_FROM_FRAGMENT, - (macop_t)mac_test_create_ipq_from_fragment }, + { MAC_CREATE_FRAGMENT, + (macop_t)mac_test_create_fragment }, + { MAC_CREATE_IPQ, + (macop_t)mac_test_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_test_create_mbuf_from_mbuf }, { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, @@ -1204,12 +1202,12 @@ (macop_t)mac_test_create_mbuf_multicast_encap_from_mbuf }, { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, (macop_t)mac_test_create_mbuf_netlayer_from_mbuf }, - { MAC_FRAGMENT_MATCHES_IPQ, - (macop_t)mac_test_fragment_matches_ipq }, + { MAC_FRAGMENT_MATCH, + (macop_t)mac_test_fragment }, { MAC_RELABEL_IFNET, (macop_t)mac_test_relabel_ifnet }, - { MAC_UPDATE_IPQ_FROM_FRAGMENT, - (macop_t)mac_test_update_ipq_from_fragment }, + { MAC_UPDATE_IPQ, + (macop_t)mac_test_update_ipq }, { MAC_CREATE_CRED, (macop_t)mac_test_create_cred }, { MAC_EXECVE_TRANSITION, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#135 (text+ko) ==== @@ -262,15 +262,14 @@ void mac_create_devfs_directory(char *dirname, int dirnamelen, struct devfs_dirent *de); void mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp); -void mac_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, +void mac_create_vnode(struct ucred *cred, struct vnode *parent, struct vnode *child); void mac_create_mount(struct ucred *cred, struct mount *mp); void mac_create_root_mount(struct ucred *cred, struct mount *mp); void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *newlabel); -void mac_update_devfsdirent_from_vnode(struct devfs_dirent *de, - struct vnode *vp); -void mac_update_procfsvnode_from_cred(struct vnode *vp, struct ucred *cred); +void mac_update_devfsdirent(struct devfs_dirent *de, struct vnode *vp); +void mac_update_procfsvnode(struct vnode *vp, struct ucred *cred); void mac_update_vnode_from_mount(struct vnode *vp, struct mount *mp); @@ -292,10 +291,9 @@ */ void mac_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 9:27:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88E6937B401; Mon, 29 Jul 2002 09:27:07 -0700 (PDT) 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 2F32437B400 for ; Mon, 29 Jul 2002 09:27:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E169843E31 for ; Mon, 29 Jul 2002 09:27:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TGR6JU092581 for ; Mon, 29 Jul 2002 09:27:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TGR6mm092578 for perforce@freebsd.org; Mon, 29 Jul 2002 09:27:06 -0700 (PDT) Date: Mon, 29 Jul 2002 09:27:06 -0700 (PDT) Message-Id: <200207291627.g6TGR6mm092578@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15127 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15127 Change 15127 by rwatson@rwatson_paprika on 2002/07/29 09:26:41 In mac_create_vnode_from_vnode update, missed sebsd. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#19 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#19 (text+ko) ==== @@ -499,8 +499,8 @@ (macop_t)sebsd_init_vnode }, { MAC_DESTROY_VNODE, (macop_t)sebsd_destroy_vnode }, - { MAC_CREATE_VNODE_FROM_VNODE, - (macop_t)sebsd_create_vnode_from_vnode }, + { MAC_CREATE_VNODE, + (macop_t)sebsd_create_vnode }, { MAC_UPDATE_VNODE_FROM_EXTATTR, (macop_t)sebsd_update_vnode_from_extattr }, { MAC_RELABEL_VNODE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 9:28:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFF8B37B401; Mon, 29 Jul 2002 09:28:09 -0700 (PDT) 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 6208237B400 for ; Mon, 29 Jul 2002 09:28:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD06343E31 for ; Mon, 29 Jul 2002 09:28:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TGS8JU092645 for ; Mon, 29 Jul 2002 09:28:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TGS8gg092642 for perforce@freebsd.org; Mon, 29 Jul 2002 09:28:08 -0700 (PDT) Date: Mon, 29 Jul 2002 09:28:08 -0700 (PDT) Message-Id: <200207291628.g6TGS8gg092642@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15128 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15128 Change 15128 by rwatson@rwatson_paprika on 2002/07/29 09:27:43 Further update from mac_create_vnode_from_vnode rename. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#20 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#20 (text+ko) ==== @@ -282,9 +282,9 @@ } static void -sebsd_create_vnode_from_vnode(struct ucred *cred, struct vnode *parent, - struct label *parentlabel, struct vnode *child, - struct label *childlabel) +sebsd_create_vnode(struct ucred *cred, struct vnode *parent, + struct label *parentlabel, struct vnode *child, + struct label *childlabel) { struct vnode_security_struct *dir, *vsec; struct task_security_struct *task; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 9:41:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DB0137B405; Mon, 29 Jul 2002 09:40:27 -0700 (PDT) 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 C210E37B401 for ; Mon, 29 Jul 2002 09:40:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DBAF43E4A for ; Mon, 29 Jul 2002 09:40:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TGeQJU093874 for ; Mon, 29 Jul 2002 09:40:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TGeP9q093871 for perforce@freebsd.org; Mon, 29 Jul 2002 09:40:25 -0700 (PDT) Date: Mon, 29 Jul 2002 09:40:25 -0700 (PDT) Message-Id: <200207291640.g6TGeP9q093871@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15129 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15129 Change 15129 by rwatson@rwatson_paprika on 2002/07/29 09:39:31 Further entry point naming improvements: mac_create_mbuf_linklayer_for_ifnet -> mac_create_mbuf_linklayer All packets created for the link layer are created in the context of a specific interface, therefore drop the interface from the entry point name. mac_create_mbuf_multicast_encap_from_mbuf -> mac_create_mbuf_multicast_encap All packets created (currently) in the context of multicast encapsulation are created in the context of an existing mbuf, so drop that from the name. mac_create_mbuf_netlayer_from_mbuf -> mac_create_mbuf_netlayer All packets created (currently) in the context of the network layer without a socket are done in the context of a specific existing mbuf, so drop that from the name. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#219 edit .. //depot/projects/trustedbsd/mac/sys/netatalk/aarp.c#4 edit .. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#12 edit .. //depot/projects/trustedbsd/mac/sys/netinet/igmp.c#6 edit .. //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.c#12 edit .. //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.c#11 edit .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#8 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#84 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#72 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#59 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#66 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#29 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#136 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#101 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#219 (text+ko) ==== @@ -574,8 +574,8 @@ mpc->mpc_ops->mpo_create_mbuf_from_mbuf = mpe->mpe_function; break; - case MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET: - mpc->mpc_ops->mpo_create_mbuf_linklayer_for_ifnet = + case MAC_CREATE_MBUF_LINKLAYER: + mpc->mpc_ops->mpo_create_mbuf_linklayer = mpe->mpe_function; break; case MAC_CREATE_MBUF_FROM_BPFDESC: @@ -586,12 +586,12 @@ mpc->mpc_ops->mpo_create_mbuf_from_ifnet = mpe->mpe_function; break; - case MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF: - mpc->mpc_ops->mpo_create_mbuf_multicast_encap_from_mbuf = + case MAC_CREATE_MBUF_MULTICAST_ENCAP: + mpc->mpc_ops->mpo_create_mbuf_multicast_encap = mpe->mpe_function; break; - case MAC_CREATE_MBUF_NETLAYER_FROM_MBUF: - mpc->mpc_ops->mpo_create_mbuf_netlayer_from_mbuf = + case MAC_CREATE_MBUF_NETLAYER: + mpc->mpc_ops->mpo_create_mbuf_netlayer = mpe->mpe_function; break; case MAC_FRAGMENT_MATCH: @@ -2275,11 +2275,11 @@ } void -mac_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, struct mbuf *mbuf) +mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *mbuf) { - MAC_PERFORM(create_mbuf_linklayer_for_ifnet, ifnet, &ifnet->if_label, - mbuf, &mbuf->m_pkthdr.label); + MAC_PERFORM(create_mbuf_linklayer, ifnet, &ifnet->if_label, mbuf, + &mbuf->m_pkthdr.label); } void @@ -2291,21 +2291,21 @@ } void -mac_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, - struct ifnet *ifnet, struct mbuf *newmbuf) +mac_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct ifnet *ifnet, + struct mbuf *newmbuf) { - MAC_PERFORM(create_mbuf_multicast_encap_from_mbuf, oldmbuf, + MAC_PERFORM(create_mbuf_multicast_encap, oldmbuf, &oldmbuf->m_pkthdr.label, ifnet, &ifnet->if_label, newmbuf, &newmbuf->m_pkthdr.label); } void -mac_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf) +mac_create_mbuf_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf) { - MAC_PERFORM(create_mbuf_netlayer_from_mbuf, oldmbuf, - &oldmbuf->m_pkthdr.label, newmbuf, &newmbuf->m_pkthdr.label); + MAC_PERFORM(create_mbuf_netlayer, oldmbuf, &oldmbuf->m_pkthdr.label, + newmbuf, &newmbuf->m_pkthdr.label); } int ==== //depot/projects/trustedbsd/mac/sys/netatalk/aarp.c#4 (text+ko) ==== @@ -131,7 +131,7 @@ return; } #ifdef MAC - mac_create_mbuf_linklayer_for_ifnet(ac->ac_if, m); + mac_create_mbuf_linklayer(ac->ac_if, m); #endif m->m_len = sizeof( *ea ); m->m_pkthdr.len = sizeof( *ea ); @@ -555,7 +555,7 @@ return; } #ifdef MAC - mac_create_mbuf_linklayer_for_ifnet(ac->ac_if, m); + mac_create_mbuf_linklayer(ac->ac_if, m); #endif m->m_len = sizeof( *ea ); m->m_pkthdr.len = sizeof( *ea ); ==== //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#12 (text+ko) ==== @@ -307,7 +307,7 @@ return; m->m_pkthdr.rcvif = (struct ifnet *)0; #ifdef MAC - mac_create_mbuf_linklayer_for_ifnet(ifp, m); + mac_create_mbuf_linklayer(ifp, m); #endif switch (ifp->if_type) { case IFT_ARCNET: ==== //depot/projects/trustedbsd/mac/sys/netinet/igmp.c#6 (text+ko) ==== @@ -451,7 +451,7 @@ m->m_pkthdr.rcvif = loif; #ifdef MAC - mac_create_mbuf_linklayer_for_ifnet(inm->inm_ifp, m); + mac_create_mbuf_linklayer(inm->inm_ifp, m); #endif m->m_pkthdr.len = sizeof(struct ip) + IGMP_MINLEN; MH_ALIGN(m, IGMP_MINLEN + sizeof(struct ip)); ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.c#12 (text+ko) ==== @@ -160,7 +160,7 @@ */ m = m_gethdr(M_DONTWAIT, MT_HEADER); #ifdef MAC - mac_create_mbuf_netlayer_from_mbuf(n, m); + mac_create_mbuf_netlayer(n, m); #endif if (m == NULL) goto freeit; ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.c#11 (text+ko) ==== @@ -1632,7 +1632,7 @@ if (mb_copy == NULL) return; #ifdef MAC - mac_create_mbuf_multicast_encap_from_mbuf(m, vifp, mb_copy); + mac_create_mbuf_multicast_encap(m, vifp, mb_copy); #endif mb_copy->m_data += max_linkhdr; mb_copy->m_len = sizeof(multicast_encap_iphdr); ==== //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#8 (text+ko) ==== @@ -2018,7 +2018,7 @@ sendpkt: #ifdef MAC - mac_create_mbuf_linklayer_for_ifnet(ifp, m); + mac_create_mbuf_linklayer(ifp, m); #endif if ((ifp->if_flags & IFF_LOOPBACK) != 0) { return((*ifp->if_output)(origifp, m, (struct sockaddr *)dst, ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#84 (text+ko) ==== @@ -995,8 +995,8 @@ } static void -mac_biba_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) +mac_biba_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *mbuf, struct label *mbuflabel) { struct mac_biba *dest; @@ -1030,7 +1030,7 @@ } static void -mac_biba_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, +mac_biba_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -1043,9 +1043,8 @@ } static void -mac_biba_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, - struct label *oldmbuflabel, struct mbuf *newmbuf, - struct label *newmbuflabel) +mac_biba_create_mbuf_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, + struct mbuf *newmbuf, struct label *newmbuflabel) { struct mac_biba *source, *dest; @@ -2110,16 +2109,16 @@ (macop_t)mac_biba_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_biba_create_mbuf_from_mbuf }, - { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, - (macop_t)mac_biba_create_mbuf_linklayer_for_ifnet }, + { MAC_CREATE_MBUF_LINKLAYER, + (macop_t)mac_biba_create_mbuf_linklayer }, { MAC_CREATE_MBUF_FROM_BPFDESC, (macop_t)mac_biba_create_mbuf_from_bpfdesc }, { MAC_CREATE_MBUF_FROM_IFNET, (macop_t)mac_biba_create_mbuf_from_ifnet }, - { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, - (macop_t)mac_biba_create_mbuf_multicast_encap_from_mbuf }, - { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, - (macop_t)mac_biba_create_mbuf_netlayer_from_mbuf }, + { MAC_CREATE_MBUF_MULTICAST_ENCAP, + (macop_t)mac_biba_create_mbuf_multicast_encap }, + { MAC_CREATE_MBUF_NETLAYER, + (macop_t)mac_biba_create_mbuf_netlayer }, { MAC_FRAGMENT_MATCH, (macop_t)mac_biba_fragment_match }, { MAC_RELABEL_IFNET, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#72 (text+ko) ==== @@ -944,8 +944,8 @@ } static void -mac_mls_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) +mac_mls_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *mbuf, struct label *mbuflabel) { struct mac_mls *dest; @@ -979,7 +979,7 @@ } static void -mac_mls_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, +mac_mls_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -992,9 +992,8 @@ } static void -mac_mls_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, - struct label *oldmbuflabel, struct mbuf *newmbuf, - struct label *newmbuflabel) +mac_mls_create_mbuf_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, + struct mbuf *newmbuf, struct label *newmbuflabel) { struct mac_mls *source, *dest; @@ -2061,16 +2060,16 @@ (macop_t)mac_mls_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_mls_create_mbuf_from_mbuf }, - { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, - (macop_t)mac_mls_create_mbuf_linklayer_for_ifnet }, + { MAC_CREATE_MBUF_LINKLAYER, + (macop_t)mac_mls_create_mbuf_linklayer }, { MAC_CREATE_MBUF_FROM_BPFDESC, (macop_t)mac_mls_create_mbuf_from_bpfdesc }, { MAC_CREATE_MBUF_FROM_IFNET, (macop_t)mac_mls_create_mbuf_from_ifnet }, - { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, - (macop_t)mac_mls_create_mbuf_multicast_encap_from_mbuf }, - { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, - (macop_t)mac_mls_create_mbuf_netlayer_from_mbuf }, + { MAC_CREATE_MBUF_MULTICAST_ENCAP, + (macop_t)mac_mls_create_mbuf_multicast_encap }, + { MAC_CREATE_MBUF_NETLAYER, + (macop_t)mac_mls_create_mbuf_netlayer }, { MAC_FRAGMENT_MATCH, (macop_t)mac_mls_fragment_match }, { MAC_RELABEL_IFNET, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#59 (text+ko) ==== @@ -309,15 +309,15 @@ } static void -mac_none_update_devfsdirent_from_vnode(struct devfs_dirent *devfs_dirent, +mac_none_update_devfsdirent(struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { } static void -mac_none_update_procfsvnode_from_cred(struct vnode *vp, - struct label *vnodelabel, struct ucred *cred) +mac_none_update_procfsvnode(struct vnode *vp, struct label *vnodelabel, + struct ucred *cred) { } @@ -444,8 +444,8 @@ } static void -mac_none_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) +mac_none_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *mbuf, struct label *mbuflabel) { } @@ -465,7 +465,7 @@ } static void -mac_none_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, +mac_none_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -473,9 +473,8 @@ } static void -mac_none_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, - struct label *oldmbuflabel, struct mbuf *newmbuf, - struct label *newmbuflabel) +mac_none_create_mbuf_netlayer(struct mbuf *oldmbuf, + struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) { } @@ -949,10 +948,10 @@ (macop_t)mac_none_create_root_mount }, { MAC_RELABEL_VNODE, (macop_t)mac_none_relabel_vnode }, - { MAC_UPDATE_DEVFSDIRENT_FROM_VNODE, - (macop_t)mac_none_update_devfsdirent_from_vnode }, - { MAC_UPDATE_PROCFSVNODE_FROM_CRED, - (macop_t)mac_none_update_procfsvnode_from_cred }, + { MAC_UPDATE_DEVFSDIRENT, + (macop_t)mac_none_update_devfsdirent }, + { MAC_UPDATE_PROCFSVNODE, + (macop_t)mac_none_update_procfsvnode }, { MAC_UPDATE_VNODE_FROM_EXTERNALIZED, (macop_t)mac_none_update_vnode_from_externalized }, { MAC_UPDATE_VNODE_FROM_MOUNT, @@ -987,16 +986,16 @@ (macop_t)mac_none_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_none_create_mbuf_from_mbuf }, - { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, - (macop_t)mac_none_create_mbuf_linklayer_for_ifnet }, + { MAC_CREATE_MBUF_LINKLAYER, + (macop_t)mac_none_create_mbuf_linklayer }, { MAC_CREATE_MBUF_FROM_BPFDESC, (macop_t)mac_none_create_mbuf_from_bpfdesc }, { MAC_CREATE_MBUF_FROM_IFNET, (macop_t)mac_none_create_mbuf_from_ifnet }, - { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, - (macop_t)mac_none_create_mbuf_multicast_encap_from_mbuf }, - { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, - (macop_t)mac_none_create_mbuf_netlayer_from_mbuf }, + { MAC_CREATE_MBUF_MULTICAST_ENCAP, + (macop_t)mac_none_create_mbuf_multicast_encap }, + { MAC_CREATE_MBUF_NETLAYER, + (macop_t)mac_none_create_mbuf_netlayer }, { MAC_FRAGMENT_MATCH, (macop_t)mac_none_fragment_match }, { MAC_RELABEL_IFNET, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#66 (text+ko) ==== @@ -883,8 +883,8 @@ } static void -mac_te_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct label *iflabel, struct mbuf *mbuf, struct label *mblabel) +mac_te_create_mbuf_linklayer(struct ifnet *ifnet, struct label *iflabel, + struct mbuf *mbuf, struct label *mblabel) { mac_te_init_label_as(SLOT(mblabel), MAC_TE_TYPE_EQUAL); @@ -899,7 +899,7 @@ } static void -mac_te_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, +mac_te_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct label *oldmblabel, struct ifnet *ifnet, struct label *iflabel, struct mbuf *newmbuf, struct label *nmblabel) { @@ -908,8 +908,8 @@ } static void -mac_te_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, - struct label *oldmblabel, struct mbuf *newmbuf, struct label *nmblabel) +mac_te_create_mbuf_netlayer(struct mbuf *oldmbuf, struct label *oldmblabel, + struct mbuf *newmbuf, struct label *nmblabel) { mac_te_copy_label(SLOT(oldmblabel), SLOT(nmblabel)); @@ -1725,16 +1725,16 @@ (macop_t)mac_te_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_te_create_mbuf_from_mbuf }, - { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, - (macop_t)mac_te_create_mbuf_linklayer_for_ifnet }, + { MAC_CREATE_MBUF_LINKLAYER, + (macop_t)mac_te_create_mbuf_linklayer }, { MAC_CREATE_MBUF_FROM_BPFDESC, (macop_t)mac_te_create_mbuf_from_bpfdesc }, { MAC_CREATE_MBUF_FROM_IFNET, (macop_t)mac_te_create_mbuf_from_ifnet }, - { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, - (macop_t)mac_te_create_mbuf_multicast_encap_from_mbuf }, - { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, - (macop_t)mac_te_create_mbuf_netlayer_from_mbuf }, + { MAC_CREATE_MBUF_MULTICAST_ENCAP, + (macop_t)mac_te_create_mbuf_multicast_encap }, + { MAC_CREATE_MBUF_NETLAYER, + (macop_t)mac_te_create_mbuf_netlayer }, { MAC_FRAGMENT_MATCH, (macop_t)mac_te_fragment_match }, { MAC_RELABEL_IFNET, (macop_t)mac_te_relabel_ifnet }, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#29 (text+ko) ==== @@ -651,8 +651,8 @@ } static void -mac_test_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel) +mac_test_create_mbuf_linklayer(struct ifnet *ifnet, struct label *ifnetlabel, + struct mbuf *mbuf, struct label *mbuflabel) { } @@ -672,7 +672,7 @@ } static void -mac_test_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, +mac_test_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -680,7 +680,7 @@ } static void -mac_test_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, +mac_test_create_mbuf_netlayer(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel) { @@ -1148,8 +1148,8 @@ (macop_t)mac_test_create_devfs_directory }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_test_create_devfs_vnode }, - { MAC_CREATE_VNODE_FROM_VNODE, - (macop_t)mac_test_create_vnode_from_vnode }, + { MAC_CREATE_VNODE, + (macop_t)mac_test_create_vnode }, { MAC_CREATE_MOUNT, (macop_t)mac_test_create_mount }, { MAC_CREATE_ROOT_MOUNT, @@ -1192,18 +1192,18 @@ (macop_t)mac_test_create_ipq }, { MAC_CREATE_MBUF_FROM_MBUF, (macop_t)mac_test_create_mbuf_from_mbuf }, - { MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, - (macop_t)mac_test_create_mbuf_linklayer_for_ifnet }, + { MAC_CREATE_MBUF_LINKLAYER, + (macop_t)mac_test_create_mbuf_linklayer }, { MAC_CREATE_MBUF_FROM_BPFDESC, (macop_t)mac_test_create_mbuf_from_bpfdesc }, { MAC_CREATE_MBUF_FROM_IFNET, (macop_t)mac_test_create_mbuf_from_ifnet }, - { MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, - (macop_t)mac_test_create_mbuf_multicast_encap_from_mbuf }, - { MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, - (macop_t)mac_test_create_mbuf_netlayer_from_mbuf }, + { MAC_CREATE_MBUF_MULTICAST_ENCAP, + (macop_t)mac_test_create_mbuf_multicast_encap }, + { MAC_CREATE_MBUF_NETLAYER, + (macop_t)mac_test_create_mbuf_netlayer }, { MAC_FRAGMENT_MATCH, - (macop_t)mac_test_fragment }, + (macop_t)mac_test_fragment_match }, { MAC_RELABEL_IFNET, (macop_t)mac_test_relabel_ifnet }, { MAC_UPDATE_IPQ, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#136 (text+ko) ==== @@ -295,14 +295,12 @@ void mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram); void mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment); void mac_create_mbuf_from_mbuf(struct mbuf *oldmbuf, struct mbuf *newmbuf); -void mac_create_mbuf_linklayer_for_ifnet(struct ifnet *ifnet, - struct mbuf *m); +void mac_create_mbuf_linklayer(struct ifnet *ifnet, struct mbuf *m); void mac_create_mbuf_from_bpfdesc(struct bpf_d *bpf_d, struct mbuf *m); void mac_create_mbuf_from_ifnet(struct ifnet *ifnet, struct mbuf *m); -void mac_create_mbuf_multicast_encap_from_mbuf(struct mbuf *oldmbuf, +void mac_create_mbuf_multicast_encap(struct mbuf *oldmbuf, struct ifnet *ifnet, struct mbuf *newmbuf); -void mac_create_mbuf_netlayer_from_mbuf(struct mbuf *oldmbuf, - struct mbuf *newmbuf); +void mac_create_mbuf_netlayer(struct mbuf *oldmbuf, struct mbuf *newmbuf); int mac_fragment_match(struct mbuf *fragment, struct ipq *ipq); void mac_update_ipq(struct mbuf *fragment, struct ipq *ipq); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#101 (text+ko) ==== @@ -176,7 +176,7 @@ void (*mpo_create_mbuf_from_mbuf)(struct mbuf *oldmbuf, struct label *oldlabel, struct mbuf *newmbuf, struct label *newlabel); - void (*mpo_create_mbuf_linklayer_for_ifnet)(struct ifnet *ifnet, + void (*mpo_create_mbuf_linklayer)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel); void (*mpo_create_mbuf_from_bpfdesc)(struct bpf_d *bpf_d, @@ -185,11 +185,11 @@ void (*mpo_create_mbuf_from_ifnet)(struct ifnet *ifnet, struct label *ifnetlabel, struct mbuf *mbuf, struct label *mbuflabel); - void (*mpo_create_mbuf_multicast_encap_from_mbuf) - (struct mbuf *oldmbuf, struct label *oldmbuflabel, - struct ifnet *ifnet, struct label *ifnetlabel, - struct mbuf *newmbuf, struct label *newmbuflabel); - void (*mpo_create_mbuf_netlayer_from_mbuf)(struct mbuf *oldmbuf, + void (*mpo_create_mbuf_multicast_encap)(struct mbuf *oldmbuf, + struct label *oldmbuflabel, struct ifnet *ifnet, + struct label *ifnetlabel, struct mbuf *newmbuf, + struct label *newmbuflabel); + void (*mpo_create_mbuf_netlayer)(struct mbuf *oldmbuf, struct label *oldmbuflabel, struct mbuf *newmbuf, struct label *newmbuflabel); int (*mpo_fragment_match)(struct mbuf *fragment, @@ -384,11 +384,11 @@ MAC_CREATE_IPQ, MAC_CREATE_FRAGMENT, MAC_CREATE_MBUF_FROM_MBUF, - MAC_CREATE_MBUF_LINKLAYER_FOR_IFNET, + MAC_CREATE_MBUF_LINKLAYER, MAC_CREATE_MBUF_FROM_BPFDESC, MAC_CREATE_MBUF_FROM_IFNET, - MAC_CREATE_MBUF_MULTICAST_ENCAP_FROM_MBUF, - MAC_CREATE_MBUF_NETLAYER_FROM_MBUF, + MAC_CREATE_MBUF_MULTICAST_ENCAP, + MAC_CREATE_MBUF_NETLAYER, MAC_FRAGMENT_MATCH, MAC_RELABEL_IFNET, MAC_UPDATE_IPQ, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 10: 1: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8797B37B401; Mon, 29 Jul 2002 10:00:59 -0700 (PDT) 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 E438337B400 for ; Mon, 29 Jul 2002 10:00:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A583F43E3B for ; Mon, 29 Jul 2002 10:00:55 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TH0tJU096881 for ; Mon, 29 Jul 2002 10:00:55 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TH0sbf096871 for perforce@freebsd.org; Mon, 29 Jul 2002 10:00:54 -0700 (PDT) Date: Mon, 29 Jul 2002 10:00:54 -0700 (PDT) Message-Id: <200207291700.g6TH0sbf096871@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 15131 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15131 Change 15131 by green@green_crash2 on 2002/07/29 10:00:41 Scrap most of the environment when building ports for the release process, as some environment variables will interfere with port building processes. Affected files ... .. //depot/projects/trustedbsd/mac/release/Makefile#20 edit Differences ... ==== //depot/projects/trustedbsd/mac/release/Makefile#20 (text+ko) ==== @@ -828,7 +828,10 @@ doc.1: @echo "Making docs..." @for i in ${DOCPORTS}; do \ - cd /usr/ports/$$i && make all install clean BATCH=yes JADETEX=no WITHOUT_PYTHON=yes FORCE_PKG_REGISTER=yes; \ + cd /usr/ports/$$i && env -i \ + PATH="/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}:${X11BASE}/bin" \ + TMPDIR="/tmp" make all install clean BATCH=yes JADETEX=no \ + WITHOUT_PYTHON=yes FORCE_PKG_REGISTER=yes; \ done @cd /usr/doc && make all install 'FORMATS=html html-split txt' INSTALL_COMPRESSED='' DOCDIR=${RD}/trees/base/usr/share/doc touch doc.1 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 10: 4:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA87837B41F; Mon, 29 Jul 2002 10:04:06 -0700 (PDT) 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 DC17737B405 for ; Mon, 29 Jul 2002 10:04:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E45343E4A for ; Mon, 29 Jul 2002 10:04:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TH43JU097877 for ; Mon, 29 Jul 2002 10:04:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TH43qI097873 for perforce@freebsd.org; Mon, 29 Jul 2002 10:04:03 -0700 (PDT) Date: Mon, 29 Jul 2002 10:04:03 -0700 (PDT) Message-Id: <200207291704.g6TH43qI097873@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15132 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15132 Change 15132 by rwatson@rwatson_paprika on 2002/07/29 10:04:00 A bit more sorting. The entry points were really unsorted before. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#137 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#137 (text+ko) ==== @@ -339,6 +339,8 @@ int mac_check_vnode_chroot(struct ucred *cred, struct vnode *dvp); int mac_check_vnode_create(struct ucred *cred, struct vnode *dvp, struct componentname *cnp, struct vattr *vap); +int mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp, + struct vnode *vp, struct componentname *cnp); int mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, acl_type_t type); int mac_check_vnode_exec(struct ucred *cred, struct vnode *vp); @@ -348,6 +350,19 @@ int attrnamespace, const char *name, struct uio *uio); int mac_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct componentname *cnp); +/* XXX This u_char should be vm_prot_t! */ +u_char mac_check_vnode_mmap_prot(struct ucred *cred, struct vnode *vp, + int newmapping); +int mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op); +int mac_check_vnode_open(struct ucred *cred, struct vnode *vp, + mode_t acc_mode); +int mac_check_vnode_readdir(struct ucred *cred, struct vnode *vp); +int mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp); +int mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, + struct vnode *vp, struct componentname *cnp); +int mac_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, + struct vnode *vp, int samedir, struct componentname *cnp); +int mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp); int mac_check_vnode_setacl(struct ucred *cred, struct vnode *vp, acl_type_t type, struct acl *acl); int mac_check_vnode_setextattr(struct ucred *cred, struct vnode *vp, @@ -361,21 +376,6 @@ int mac_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, struct timespec atime, struct timespec mtime); int mac_check_vnode_stat(struct ucred *cred, struct vnode *vp); -int mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, struct componentname *cnp); -int mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, struct componentname *cnp); -int mac_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, - struct vnode *vp, int samedir, struct componentname *cnp); -/* XXX This u_char should be vm_prot_t! */ -u_char mac_check_vnode_mmap_prot(struct ucred *cred, struct vnode *vp, - int newmapping); -int mac_check_vnode_open(struct ucred *cred, struct vnode *vp, - mode_t acc_mode); -int mac_check_vnode_readdir(struct ucred *cred, struct vnode *vp); -int mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp); -int mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp); -int mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op); int mac_getsockopt_label_get(struct ucred *cred, struct socket *so, struct mac *extmac); int mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 10:57:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C333537B401; Mon, 29 Jul 2002 10:57:16 -0700 (PDT) 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 614D937B400 for ; Mon, 29 Jul 2002 10:57:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EE0043E42 for ; Mon, 29 Jul 2002 10:57:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6THvGJU019886 for ; Mon, 29 Jul 2002 10:57:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6THvFk8019883 for perforce@freebsd.org; Mon, 29 Jul 2002 10:57:15 -0700 (PDT) Date: Mon, 29 Jul 2002 10:57:15 -0700 (PDT) Message-Id: <200207291757.g6THvFk8019883@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15135 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15135 Change 15135 by rwatson@rwatson_curry on 2002/07/29 10:56:25 Incorrect symbol in forward declaration could result in a linker failure at boot. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#85 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#85 (text+ko) ==== @@ -111,7 +111,7 @@ MALLOC_DEFINE(M_MACBIBA, "biba label", "MAC/Biba labels"); -static int mac_biba_check_open(struct ucred *cred, struct vnode *vp, +static int mac_biba_check_vnode_open(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, mode_t acc_mode); static struct mac_biba * @@ -1492,7 +1492,7 @@ struct label *label, mode_t flags) { - return (mac_biba_check_open(cred, vp, label, flags)); + return (mac_biba_check_vnode_open(cred, vp, label, flags)); } static int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 12: 3:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80F0237B401; Mon, 29 Jul 2002 12:02:42 -0700 (PDT) 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 1BE0637B400 for ; Mon, 29 Jul 2002 12:02:42 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E790343E6A for ; Mon, 29 Jul 2002 12:02:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TJ2eJU032762 for ; Mon, 29 Jul 2002 12:02:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TJ2dQb032758 for perforce@freebsd.org; Mon, 29 Jul 2002 12:02:39 -0700 (PDT) Date: Mon, 29 Jul 2002 12:02:39 -0700 (PDT) Message-Id: <200207291902.g6TJ2dQb032758@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15139 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15139 Change 15139 by rwatson@rwatson_tislabs on 2002/07/29 12:02:03 Additional integ as I prepare to integ the mac tree. Affected files ... .. //depot/projects/trustedbsd/base/UPDATING#16 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.c#4 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#19 integrate .. //depot/projects/trustedbsd/base/etc/isdn/Makefile#3 integrate .. //depot/projects/trustedbsd/base/etc/mail/Makefile#8 integrate .. //depot/projects/trustedbsd/base/etc/sendmail/Makefile#8 integrate .. //depot/projects/trustedbsd/base/games/battlestar/Makefile#3 integrate .. //depot/projects/trustedbsd/base/games/canfield/canfield/Makefile#3 integrate .. //depot/projects/trustedbsd/base/games/cribbage/Makefile#4 integrate .. //depot/projects/trustedbsd/base/games/hack/Makefile#4 integrate .. //depot/projects/trustedbsd/base/games/larn/Makefile#4 integrate .. //depot/projects/trustedbsd/base/games/phantasia/Makefile#2 integrate .. //depot/projects/trustedbsd/base/games/robots/Makefile#3 integrate .. //depot/projects/trustedbsd/base/games/rogue/Makefile#3 integrate .. //depot/projects/trustedbsd/base/games/sail/Makefile#3 integrate .. //depot/projects/trustedbsd/base/games/snake/snake/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/csu/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/strip/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/contrib/mm/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/font/Makefile.dev#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/utils/indxbib/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/rcs/rcsfreeze/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberosIV/share/info/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat1x/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat20/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat21/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat22/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat3x.i386/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.alpha/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat4x.i386/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/csu/alpha/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/csu/i386-elf/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/csu/i386/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/csu/ia64/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/csu/powerpc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/csu/sparc64/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#4 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#10 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#29 integrate .. //depot/projects/trustedbsd/base/sbin/devfs/devfs.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount_msdosfs/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/colldef/Makefile#7 integrate .. //depot/projects/trustedbsd/base/share/examples/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#10 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/i4brunppp/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/examples/ses/getencstat/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/ses/sesd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/ses/setencstat/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/ses/setobjstat/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/info/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#10 integrate .. //depot/projects/trustedbsd/base/share/man/man7/firewall.7#4 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.doc.mk#6 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.files.mk#3 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.info.mk#6 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#13 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.man.mk#6 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#5 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#11 integrate .. //depot/projects/trustedbsd/base/share/mklocale/Makefile#6 integrate .. //depot/projects/trustedbsd/base/share/monetdef/Makefile#7 integrate .. //depot/projects/trustedbsd/base/share/msgdef/Makefile#7 integrate .. //depot/projects/trustedbsd/base/share/numericdef/Makefile#7 integrate .. //depot/projects/trustedbsd/base/share/sendmail/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/skel/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/syscons/fonts/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/syscons/scrnmaps/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/timedef/Makefile#6 integrate .. //depot/projects/trustedbsd/base/share/zoneinfo/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/base/sys/alpha/include/ansi.h#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/base/sys/arm/include/ansi.h#7 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/boot2/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot2/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#12 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#11 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-all.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-fd.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-tape.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#19 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ctl.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/base/sys/i386/include/ansi.h#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/base/sys/ia64/include/ansi.h#7 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb_conn.c#4 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/base/sys/powerpc/include/ansi.h#7 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/include/ansi.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/asmacros.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/profile.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#14 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/locore.s#6 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#17 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/prof_machdep.c#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/support.s#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/stdint.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#15 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#13 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#11 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#11 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#8 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#10 integrate .. //depot/projects/trustedbsd/base/sys/x86_64/include/_stdint.h#1 branch .. //depot/projects/trustedbsd/base/sys/x86_64/include/ansi.h#2 integrate .. //depot/projects/trustedbsd/base/sys/x86_64/include/limits.h#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/Makefile#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/io.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/cap_mkdb/cap_mkdb.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/checknr/checknr.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/chkey/chkey.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/cksum/cksum.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/cksum/crc.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/cksum/crc32.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/cksum/print.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/cksum/sum1.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/cksum/sum2.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/cmp/cmp.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/cmp/misc.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/cmp/regular.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/cmp/special.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/colldef/parse.y#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/colrm/colrm.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/column/column.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/comm/comm.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/compress/compress.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/compress/zopen.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/csplit/csplit.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/ctags/C.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/ctags/ctags.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/ctags/fortran.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/ctags/lisp.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/ctags/print.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/ctags/tree.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/ctags/yacc.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/dirname/dirname.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/doscmd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/du/du.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/fetch/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/fetch/fetch.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/kdump/kdump.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/locate/locate/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/login/login.c#15 integrate .. //depot/projects/trustedbsd/base/usr.bin/mail/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/strip/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/tr/tr.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/units/units.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/vi/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/xinstall/xinstall.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4b.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4bctl.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4bing.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4bipr.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4bisppp.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4bq921.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4bq931.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4brbch.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4btel.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/i4btrc.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/iavc.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/ifpi.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/ifpi2.4#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/ifpnp.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/ihfc.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/isic.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/man/iwic.4#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mailwrapper/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pcvt/keycap/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.yppasswdd/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/Makefile#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/UPDATING#16 (text+ko) ==== @@ -22,6 +22,12 @@ integrity. Re-enabling write caching can substantially improve performance. +20020729: + COPY is being deprecated. The 20010530 change was reverted, as + it causes far more pain than was expected, and to always compare + before installing, please use INSTALL="install -C" again. The + -C option is now silently ignored when used with the -d option. + 20020702: Problems with libc_r clients like KDE and GNOME have been resolved. There are still some minor problems with some signals but the @@ -1051,4 +1057,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.213 2002/07/03 04:23:38 julian Exp $ +$FreeBSD: src/UPDATING,v 1.214 2002/07/29 08:51:03 ru Exp $ ==== //depot/projects/trustedbsd/base/crypto/openssh/auth.c#4 (text+ko) ==== @@ -24,6 +24,7 @@ #include "includes.h" RCSID("$OpenBSD: auth.c,v 1.43 2002/05/17 14:27:55 millert Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/auth.c,v 1.11 2002/07/29 00:36:24 fanf Exp $"); #ifdef HAVE_LOGIN_H #include @@ -479,7 +480,7 @@ if (pw == NULL || !allowed_user(pw)) return (NULL); #ifdef HAVE_LOGIN_CAP - if ((lc = login_getclass(pw->pw_class)) == NULL) { + if ((lc = login_getpwclass(pw)) == NULL) { debug("unable to get login class: %s", user); return (NULL); } ==== //depot/projects/trustedbsd/base/etc/Makefile#19 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.290 2002/07/18 12:07:44 ru Exp $ +# $FreeBSD: src/etc/Makefile,v 1.291 2002/07/29 09:40:04 ru Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -63,20 +63,20 @@ .if defined(OBJFORMAT) echo OBJFORMAT=${OBJFORMAT} > ${DISTDIR}/${DISTRIBUTION}/etc/objformat .endif - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/../sys/${MACHINE}/conf/GENERIC.hints \ ${DISTDIR}/${DISTRIBUTION}/boot/device.hints distribution: cd ${.CURDIR}; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${BIN1} ${DESTDIR}/etc; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \ ${BIN2} ${DESTDIR}/etc; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd - cd ${.CURDIR}/defaults; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}/defaults; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${DEFAULTS} ${DESTDIR}/etc/defaults cd ${.CURDIR}/periodic; ${MAKE} install cd ${.CURDIR}/rc.d; ${MAKE} install @@ -92,73 +92,73 @@ .endif .if exists(${.CURDIR}/../crypto) && !defined(NO_OPENSSL) .if !defined(NO_OPENSSH) - cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SSH} ${DESTDIR}/etc/ssh .endif - cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SSL} ${DESTDIR}/etc/ssl .endif .if !defined(NO_MAKEDEV_INSTALL) - cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 555 \ + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 555 \ MAKEDEV.local MAKEDEV ${DESTDIR}/dev .if !defined(NO_MAKEDEV_RUN) cd ${DESTDIR}/dev; sh MAKEDEV all .endif .endif cd ${.CURDIR}/root; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.cshrc ${DESTDIR}/root/.cshrc; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.klogin ${DESTDIR}/root/.klogin; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.login ${DESTDIR}/root/.login; \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.profile ${DESTDIR}/root/.profile; \ rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile; \ ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \ ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile - cd ${.CURDIR}/mtree; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${MTREE} ${DESTDIR}/etc/mtree - cd ${.CURDIR}/namedb; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${NAMEDB} ${DESTDIR}/etc/namedb - cd ${.CURDIR}/ppp; ${INSTALL} ${COPY} -o root -g ${BINGRP} -m 600 \ + cd ${.CURDIR}/ppp; ${INSTALL} -o root -g ${BINGRP} -m 600 \ ${PPPCNF} ${DESTDIR}/etc/ppp - cd ${.CURDIR}/mail; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${ETCMAIL} ${DESTDIR}/etc/mail @if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \ ! -f ${DESTDIR}/etc/aliases ]; then \ set -x; \ ln -s mail/aliases ${DESTDIR}/etc/aliases; \ fi - ${INSTALL} ${COPY} -o ${BINOWN} -g operator -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \ ${DESTDIR}/etc/dumpdates - ${INSTALL} ${COPY} -o nobody -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/db/locate.database - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ ${DESTDIR}/var/log/auth.log - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ ${DESTDIR}/var/log/cron - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/lpd-errs - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ ${DESTDIR}/var/log/maillog - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/lastlog - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/messages - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ ${DESTDIR}/var/log/security - ${INSTALL} ${COPY} -o ${BINOWN} -g network -m 640 /dev/null \ + ${INSTALL} -o ${BINOWN} -g network -m 640 /dev/null \ ${DESTDIR}/var/log/slip.log - ${INSTALL} ${COPY} -o ${BINOWN} -g network -m 640 /dev/null \ + ${INSTALL} -o ${BINOWN} -g network -m 640 /dev/null \ ${DESTDIR}/var/log/ppp.log - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/wtmp - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/run/utmp - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \ ${DESTDIR}/var/crash - cd ${.CURDIR}/..; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${FREEBSD} ${DESTDIR}/ .if !defined(NOMAN) cd ${.CURDIR}/../share/man; ${MAKE} makedb @@ -214,10 +214,10 @@ done etc-examples: - cd ${.CURDIR}; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${BIN1} ${BIN2} nsmb.conf opieaccess \ ${DESTDIR}/usr/share/examples/etc - cd ${.CURDIR}/defaults; ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + cd ${.CURDIR}/defaults; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${DEFAULTS} ${DESTDIR}/usr/share/examples/etc/defaults .include ==== //depot/projects/trustedbsd/base/etc/isdn/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/isdn/Makefile,v 1.7 2002/07/20 10:56:00 ru Exp $ +# $FreeBSD: src/etc/isdn/Makefile,v 1.8 2002/07/29 09:40:05 ru Exp $ I4BETCPROG= answer \ isdntel.sh \ @@ -18,10 +18,10 @@ install: for i in ${I4BETCPROG} ; do \ - ${INSTALL} ${COPY} -o root -g wheel -m 700 $$i ${DESTDIR}/etc/isdn ; \ + ${INSTALL} -o root -g wheel -m 700 $$i ${DESTDIR}/etc/isdn ; \ done ; \ for i in ${I4BETCFILE} ; do \ - ${INSTALL} ${COPY} -o root -g wheel -m 600 $$i ${DESTDIR}/etc/isdn ; \ + ${INSTALL} -o root -g wheel -m 600 $$i ${DESTDIR}/etc/isdn ; \ done # Suck in the ${COPY} definition. ==== //depot/projects/trustedbsd/base/etc/mail/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/mail/Makefile,v 1.31 2002/07/18 12:07:44 ru Exp $ +# $FreeBSD: src/etc/mail/Makefile,v 1.32 2002/07/29 09:40:05 ru Exp $ # # This Makefile provides an easy way to generate the configuration # file and database maps for the sendmail(8) daemon. @@ -187,7 +187,7 @@ install-cf: ${INSTALL_CF} .if ${INSTALL_CF} != /etc/mail/sendmail.cf - ${INSTALL} ${COPY} -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf + ${INSTALL} -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf .endif @@ -199,7 +199,7 @@ @false .else .if ${INSTALL_SUBMIT_CF} != /etc/mail/submit.cf - ${INSTALL} ${COPY} -m ${SHAREMODE} ${INSTALL_SUBMIT_CF} /etc/mail/submit.cf + ${INSTALL} -m ${SHAREMODE} ${INSTALL_SUBMIT_CF} /etc/mail/submit.cf .endif .endif ==== //depot/projects/trustedbsd/base/etc/sendmail/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.19 (Berkeley) 1/14/97 -# $FreeBSD: src/etc/sendmail/Makefile,v 1.20 2002/07/18 12:07:44 ru Exp $ +# $FreeBSD: src/etc/sendmail/Makefile,v 1.21 2002/07/29 09:40:06 ru Exp $ M4= m4 CHMOD= chmod @@ -80,18 +80,18 @@ .endif .if defined(INSTALL_CF) .if ${INSTALL_CF} != ${DEST_CF} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \ ${DEST_CF} .endif .endif .if defined(SENDMAIL_ADDITIONAL_CF) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail .endif .ifndef SENDMAIL_SET_USER_ID .if defined(INSTALL_SUBMIT_CF) .if ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF} .endif .endif @@ -103,37 +103,37 @@ @echo ">>> ERROR: Both SENDMAIL_CF and SENDMAIL_MC can not be set" @false .endif - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/freebsd.mc \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/freebsd.mc \ ${DESTDIR}/etc/mail/freebsd.mc - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ ${DESTDIR}/etc/mail/freebsd.cf .if defined(INSTALL_CF) .if ${INSTALL_CF} != ${DEST_CF} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \ ${DEST_CF} .endif .else - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \ ${DEST_CF} .endif - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.mc \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.mc \ ${DESTDIR}/etc/mail/freebsd.submit.mc - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \ ${DESTDIR}/etc/mail/freebsd.submit.cf .ifndef SENDMAIL_SET_USER_ID .if defined(INSTALL_SUBMIT_CF) .if ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF} .endif .else - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \ ${DEST_SUBMIT_CF} .endif .endif - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \ ${DESTDIR}/etc/mail/helpfile - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ ${DESTDIR}/var/log/sendmail.st .include ==== //depot/projects/trustedbsd/base/games/battlestar/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/battlestar/Makefile,v 1.9 2002/07/18 12:07:44 ru Exp $ +# $FreeBSD: src/games/battlestar/Makefile,v 1.10 2002/07/29 09:40:06 ru Exp $ PROG= battlestar SRCS= battlestar.c com1.c com2.c com3.c com4.c com5.c com6.c com7.c \ @@ -13,7 +13,7 @@ beforeinstall: .if !exists(${DESTDIR}/var/games/battlestar.log) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/battlestar.log .endif ==== //depot/projects/trustedbsd/base/games/canfield/canfield/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/canfield/canfield/Makefile,v 1.9 2002/07/18 12:07:44 ru Exp $ +# $FreeBSD: src/games/canfield/canfield/Makefile,v 1.10 2002/07/29 09:40:06 ru Exp $ PROG= canfield MAN= canfield.6 @@ -10,7 +10,7 @@ beforeinstall: .if !exists(${DESTDIR}/var/games/cfscores) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/cfscores .endif ==== //depot/projects/trustedbsd/base/games/cribbage/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/cribbage/Makefile,v 1.13 2002/07/18 12:07:45 ru Exp $ +# $FreeBSD: src/games/cribbage/Makefile,v 1.14 2002/07/29 09:40:06 ru Exp $ PROG= cribbage DPADD= ${LIBCURSES} ${LIBCOMPAT} @@ -12,7 +12,7 @@ beforeinstall: .if !exists(${DESTDIR}/var/games/criblog) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/criblog .endif ==== //depot/projects/trustedbsd/base/games/hack/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/hack/Makefile,v 1.24 2002/07/18 12:07:45 ru Exp $ +# $FreeBSD: src/games/hack/Makefile,v 1.25 2002/07/29 09:40:06 ru Exp $ PROG= hack SRCS= alloc.c hack.Decl.c hack.apply.c hack.bones.c hack.c hack.cmd.c \ @@ -34,10 +34,10 @@ ${CC} -static ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC} beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} /dev/null \ ${DESTDIR}/var/games/hackdir/perm .if !exists(${DESTDIR}/var/games/hackdir/record) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 460 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 460 /dev/null \ ${DESTDIR}/var/games/hackdir/record .endif # rm -f ${DESTDIR}/var/games/hackdir/bones* \ ==== //depot/projects/trustedbsd/base/games/larn/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 5.12 (Berkeley) 5/30/93 -# $FreeBSD: src/games/larn/Makefile,v 1.11 2002/07/18 12:07:45 ru Exp $ +# $FreeBSD: src/games/larn/Makefile,v 1.12 2002/07/29 09:40:06 ru Exp $ # EXTRA # Incorporates code to gather additional performance statistics @@ -68,11 +68,11 @@ beforeinstall: .if !exists(${DESTDIR}/var/games/larn/lscore12.0) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \ ${DESTDIR}/var/games/larn/lscore12.0 .endif .if !exists(${DESTDIR}/var/games/larn/llog12.0) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 660 /dev/null \ ${DESTDIR}/var/games/larn/llog12.0 .endif ==== //depot/projects/trustedbsd/base/games/phantasia/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/phantasia/Makefile,v 1.19 2001/03/26 14:20:58 ru Exp $ +# $FreeBSD: src/games/phantasia/Makefile,v 1.20 2002/07/29 09:40:07 ru Exp $ PROG= phantasia SRCS= main.c fight.c io.c interplayer.c gamesupport.c misc.c phantglobs.c @@ -27,7 +27,7 @@ beforeinstall: .for file in ${DATAFILES} .if !exists(${DESTDIR}/var/games/phantasia/${file}) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 660 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 660 \ ${file} ${DESTDIR}/var/games/phantasia .endif .endfor ==== //depot/projects/trustedbsd/base/games/robots/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/robots/Makefile,v 1.9 2002/07/18 12:07:45 ru Exp $ +# $FreeBSD: src/games/robots/Makefile,v 1.10 2002/07/29 09:40:07 ru Exp $ PROG= robots CFLAGS+=-DMAX_PER_UID=5 @@ -12,7 +12,7 @@ beforeinstall: .if !exists(${DESTDIR}/var/games/robots_roll) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/robots_roll .endif ==== //depot/projects/trustedbsd/base/games/rogue/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/rogue/Makefile,v 1.11 2002/07/18 12:07:45 ru Exp $ +# $FreeBSD: src/games/rogue/Makefile,v 1.12 2002/07/29 09:40:07 ru Exp $ PROG= rogue CFLAGS+=-DUNIX -fwritable-strings @@ -13,7 +13,7 @@ beforeinstall: .if !exists(${DESTDIR}/var/games/rogue.scores) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/rogue.scores .endif ==== //depot/projects/trustedbsd/base/games/sail/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/sail/Makefile,v 1.8 2002/07/18 12:07:45 ru Exp $ +# $FreeBSD: src/games/sail/Makefile,v 1.9 2002/07/29 09:40:07 ru Exp $ PROG= sail SRCS= main.c pl_main.c pl_1.c pl_2.c pl_3.c pl_4.c pl_5.c pl_6.c pl_7.c \ @@ -12,7 +12,7 @@ beforeinstall: .if !exists(${DESTDIR}/var/games/saillog) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/saillog .endif ==== //depot/projects/trustedbsd/base/games/snake/snake/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/snake/snake/Makefile,v 1.8 2002/07/18 12:07:45 ru Exp $ +# $FreeBSD: src/games/snake/snake/Makefile,v 1.9 2002/07/29 09:40:07 ru Exp $ PROG= snake SRCS= snake.c move.c @@ -11,11 +11,11 @@ beforeinstall: .if !exists(${DESTDIR}/var/games/snakerawscores) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/snakerawscores .endif .if !exists(${DESTDIR}/var/games/snake.log) - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \ ${DESTDIR}/var/games/snake.log .endif ==== //depot/projects/trustedbsd/base/gnu/lib/csu/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.14 2002/05/26 17:16:21 obrien Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.15 2002/07/29 09:40:07 ru Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc CCDIR= ${.CURDIR}/../../usr.bin/cc @@ -61,7 +61,7 @@ realinstall: .for file in ${OBJS} ${SOBJS} ${TGTOBJS} - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${file} ${DESTDIR}${LIBDIR}/${file:S/.So$/S.o/} .endfor ==== //depot/projects/trustedbsd/base/gnu/lib/libdialog/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # Makefile for libdialog -# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.36 2002/07/18 12:07:45 ru Exp $ +# $FreeBSD: src/gnu/lib/libdialog/Makefile,v 1.37 2002/07/29 09:40:08 ru Exp $ LIB= dialog INCS= dialog.h @@ -24,7 +24,7 @@ .if !defined(NOHTML) afterinstall: .for file in ${EXAMPLES} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${.CURDIR}/TESTS/${file} ${DESTDIR}/usr/share/examples/libdialog .endfor .endif ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#4 (text+ko) ==== @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.39 2002/07/10 06:58:25 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.40 2002/07/28 18:46:49 peter Exp $ */ /* * This works like "remote" but, you use it like this: @@ -415,7 +415,8 @@ #define KSYM_TRAP "calltrap" #define KSYM_INTR "Xintr" #define KSYM_FASTINTR "Xfastintr" -#define KSYM_SYSCALL "Xsyscall" +#define KSYM_OLDSYSCALL "Xlcall_syscall" +#define KSYM_SYSCALL "Xint0x80_syscall" /* @@ -444,7 +445,8 @@ strlen(KSYM_INTR)) == 0 || strncmp (SYMBOL_NAME(sym), KSYM_FASTINTR, strlen(KSYM_FASTINTR)) == 0) frametype = tf_interrupt; - else if (strcmp (SYMBOL_NAME(sym), KSYM_SYSCALL) == 0) + else if (strcmp (SYMBOL_NAME(sym), KSYM_SYSCALL) == 0 || + strcmp (SYMBOL_NAME(sym), KSYM_OLDSYSCALL) == 0) frametype = tf_syscall; } ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/ld/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.22 2002/03/29 00:41:01 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.23 2002/07/29 09:40:08 ru Exp $ .include "../Makefile.inc0" @@ -52,7 +52,7 @@ ln -sf ${SRCDIR}/ld/emultempl/astring.sed ${.TARGET} afterinstall: - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${LDSCRIPTS:S|^|ldscripts/|} ${DESTDIR}${SCRIPTDIR} .include ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/strip/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/strip/Makefile,v 1.10 2002/03/20 23:05:19 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/strip/Makefile,v 1.11 2002/07/29 09:40:08 ru Exp $ .include "../Makefile.inc0" @@ -26,7 +26,7 @@ .endif realinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ maybe_stripped ${DESTDIR}${BINDIR}/strip .include ==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/contrib/mm/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/contrib/mm/Makefile,v 1.4 2002/07/18 12:07:46 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/contrib/mm/Makefile,v 1.5 2002/07/29 09:40:08 ru Exp $ SCRIPTS= mmroff.pl MAN= mmroff.7 @@ -24,7 +24,7 @@ beforeinstall: .for locale in ${LOCALE} .if !exists(${DESTDIR}${TMACDIR}/mm/${locale}) - ${INSTALL} ${COPY} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \ + ${INSTALL} -o ${FILESOWN} -g ${FILESGRP} -m ${FILESMODE} \ /dev/null ${DESTDIR}${TMACDIR}/mm/${locale} .endif .endfor ==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/font/Makefile.dev#3 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.9 2002/07/18 12:07:46 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.10 2002/07/29 09:40:08 ru Exp $ DEVICEDIR?= ${fontdir}/dev${DEV} all: ${DEVFILES} beforeinstall: ${DEVFILES} - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${.ALLSRC} ${DESTDIR}${DEVICEDIR} .include ==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/utils/indxbib/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.5 2002/07/18 12:07:46 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/utils/indxbib/Makefile,v 1.6 2002/07/29 09:40:08 ru Exp $ PROG_CXX= indxbib SRCS= indxbib.cc signal.c @@ -7,7 +7,7 @@ CLEANFILES= ${MAN} beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ ${DIST_DIR}/eign ${DESTDIR}${SHAREDIR}/dict/ .include ==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.32 2002/07/18 12:07:46 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.33 2002/07/29 09:40:09 ru Exp $ TMACOWN?= ${BINOWN} TMACGRP?= ${BINGRP} @@ -53,22 +53,22 @@ beforeinstall: cd ${DIST_DIR}; \ - ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ ${NORMALFILES} ${DESTDIR}${TMACDIR} cd ${.CURDIR}; \ - ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ hyphen.us-ru ${DESTDIR}${TMACDIR} cd ${.OBJDIR} .for f in ${STRIPFILES} ${SPECIALFILES} - ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ $f-s ${DESTDIR}${TMACDIR}/$f .endfor .for f in ${MDOCFILES} - ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ $f-s ${DESTDIR}${MDOCDIR}/$f .endfor .if !exists(${DESTDIR}${TMACDIR}/man.local) - ${INSTALL} ${COPY} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ ${DIST_DIR}/man.local ${DESTDIR}${TMACDIR} .endif ==== //depot/projects/trustedbsd/base/gnu/usr.bin/rcs/rcsfreeze/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/Makefile,v 1.7 2002/07/18 12:07:46 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/rcs/rcsfreeze/Makefile,v 1.8 2002/07/29 09:40:09 ru Exp $ MAN= rcsfreeze.1 afterinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ ${.CURDIR}/rcsfreeze.sh ${DESTDIR}${BINDIR}/rcsfreeze .include "../../Makefile.inc" ==== //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/send-pr/Makefile,v 1.16 2002/07/18 12:07:47 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/send-pr/Makefile,v 1.17 2002/07/29 09:40:09 ru Exp $ # # Makefile for building a standalone send-pr. # @@ -29,7 +29,7 @@ # called from /usr/src/etc/Makefile etc-gnats-freefall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 0644 \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0644 \ ${.CURDIR}/categories ${DESTDIR}/etc/gnats/freefall .include ==== //depot/projects/trustedbsd/base/kerberosIV/share/info/Makefile#3 (text+ko) ==== @@ -1,15 +1,15 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/kerberosIV/share/info/Makefile,v 1.2 2002/07/18 12:07:47 ru Exp $ +# $FreeBSD: src/kerberosIV/share/info/Makefile,v 1.3 2002/07/29 09:40:09 ru Exp $ NOOBJ= noobj all clean cleandir depend lint tags: beforeinstall: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \ ${DESTDIR}${BINDIR}/info/dir-tmpl if [ ! -f ${DESTDIR}${BINDIR}/info/dir ]; then \ - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 dir-tmpl \ ${DESTDIR}${BINDIR}/info/dir ; \ fi ==== //depot/projects/trustedbsd/base/lib/compat/compat1x/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/compat/compat1x/Makefile,v 1.13 2001/09/21 11:32:40 ru Exp $ +# $FreeBSD: src/lib/compat/compat1x/Makefile,v 1.14 2002/07/29 09:40:09 ru Exp $ DISTRIBUTION= compat1x @@ -20,7 +20,7 @@ .endfor beforeinstall: - ${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \ ${DESTDIR}${LIBCOMPATDIR}/aout >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 13:29:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBA5537B401; Mon, 29 Jul 2002 13:27:54 -0700 (PDT) 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 549D737B400 for ; Mon, 29 Jul 2002 13:27:54 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E437143E5E for ; Mon, 29 Jul 2002 13:27:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TKRpJU050977 for ; Mon, 29 Jul 2002 13:27:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TKR3s1050773 for perforce@freebsd.org; Mon, 29 Jul 2002 13:27:03 -0700 (PDT) Date: Mon, 29 Jul 2002 13:27:03 -0700 (PDT) Message-Id: <200207292027.g6TKR3s1050773@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15141 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15141 Change 15141 by rwatson@rwatson_tislabs on 2002/07/29 13:26:18 First pass at integrating from the trustedbsd_base tree, including KSE-III, nmount, mbuf allocator changes and more. WARNING: This is known not to work, and may not actually compile. In particular, cleanup is required for the vaccess man pages, mbuf header allocation, nmount handling of mount labels, and a stray mac reference in an image activator. Extreme caution is advised. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#6 integrate .. //depot/projects/trustedbsd/mac/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#19 integrate .. //depot/projects/trustedbsd/mac/README#3 integrate .. //depot/projects/trustedbsd/mac/UPDATING#13 integrate .. //depot/projects/trustedbsd/mac/bin/cat/cat.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/chio/chio.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/chmod/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/cp/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.1#2 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/cp/extern.h#4 integrate .. //depot/projects/trustedbsd/mac/bin/cp/utils.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/date/date.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/date/netdate.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/date/vary.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/dd/args.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/dd/conv.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/dd/conv_tab.c#2 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/dd/misc.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/dd/position.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/domainname/domainname.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/echo/echo.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/ed/buf.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/ed/cbc.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/ed/ed.1#4 integrate .. //depot/projects/trustedbsd/mac/bin/ed/glbl.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/ed/io.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/ed/main.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/ed/re.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/ed/sub.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/ed/undo.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/getfacl/getfacl.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/hostname/hostname.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/kill/kill.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/ls/cmp.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/ls/lomac.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/ls/print.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/ls/util.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/mkdir/mkdir.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/mkdir/mkdir.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.1#4 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/pax/ar_io.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/ar_subs.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/pax/buf_subs.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/pax/cache.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/cpio.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/file_subs.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/pax/ftree.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/pax/gen_subs.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/getoldopt.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/options.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pat_rep.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pax.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/pax/sel_subs.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tables.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tar.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tty_subs.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/ps/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/bin/ps/fmt.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/ps/lomac.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/ps/nlist.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/ps/print.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/pwd/pwd.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/rcp.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/util.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/rm/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/rmdir/rmdir.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/file.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/mask.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/merge.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/remove.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/setfacl.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/setfacl/util.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/alias.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/builtins.def#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/cd.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/error.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/error.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/eval.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/eval.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/exec.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/expand.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/histedit.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/input.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.h#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mail.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/main.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/memalloc.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/miscbltin.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mkinit.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mknodes.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mksyntax.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/myhistedit.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mystring.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/options.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/options.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/output.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/redir.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/shell.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/show.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/trap.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/trap.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/sh/var.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/sleep/sleep.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/stty/cchar.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/stty/gfmt.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/stty/key.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/stty/modes.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/stty/print.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/stty/stty.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/stty/util.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/sync/sync.8#3 integrate .. //depot/projects/trustedbsd/mac/bin/sync/sync.c#3 integrate .. //depot/projects/trustedbsd/mac/bin/test/test.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/CHANGES#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/FREEBSD-Upgrade#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/Version#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/addr/addr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/dig/dig.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/host/host.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named-xfer/named-xfer.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_defs.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_glue.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_save.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_tsig.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/named.conf#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_config.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_ctl.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_defs.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_forw.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_glob.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_ixfr.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_lexer.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_main.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_maint.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_parser.y#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_req.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_resp.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_signal.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_update.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_xfr.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/ndc/ndc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/commands.l#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/getinfo.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/main.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/nslookup/send.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/00macs.me#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/00title.me#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/Makefile#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/ack.me#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/build.me#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/files.me#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/intro.me#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/manage.me#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/named.boot.cache#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/named.boot.primary#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/named.boot.secondary#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/named.local#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/ns.me#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/resolv.conf#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/root.cache#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/setup.me#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/types.me#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/ucbhosts#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/bog/ucbhosts.rev#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/html/server.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/dig.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/dnsquery.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/host.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/man/named.conf.5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/doc/misc/rfc2317-notes.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/bind/doc/notes/data#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/notes/db_names.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/doc/notes/irp.txt#2 delete .. //depot/projects/trustedbsd/mac/contrib/bind/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/isc/list.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/include/resolv.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_ho.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/dns_nw.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/irs/gethostent.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_name.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_debug.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_init.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/resolv/res_private.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/Makefile.set#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/port/freebsd/include/port_before.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/client.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-format.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/arm/tm-arm.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/i386/tm-fbsd.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/aix.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/aix.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/gdbserve.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/linux.mh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/nm-aix.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/ppc-eabi.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/ppc-sim.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/ppcle-eabi.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/ppcle-sim.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-ppc-aix.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-ppc-eabi.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-ppc-sim.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-ppcle-eabi.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/tm-ppcle-sim.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/xm-aix.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/powerpc/xm-linux.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/linux.mh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/linux.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nbsd.mh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nbsd.mt#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nm-linux.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nm-nbsd.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nm-sparclynx.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nm-sun4os4.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/nm-sun4sol2.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/sp64.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/sp64sim.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/sp64sol2.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/sparc-em.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/sparclet.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/sparclite.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/sparclynx.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/sparclynx.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/sun4os4.mh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/sun4os4.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/sun4sol2.mh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/sun4sol2.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-linux.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-nbsd.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sp64.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sp64sim.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sparc.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sparclet.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sparclite.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sparclynx.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-spc-em.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sun4os4.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-sun4sol2.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/tm-vxsparc.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/vxsparc.mt#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/xm-linux.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/xm-nbsd.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/config/sparc/xm-sun4sol2.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/gdbserver/gdbreplay.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-common#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_mdoc.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/CREDITS#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/LICENSE#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/MANIFEST#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/bin/su/su.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.man#1 branch .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_borrow_cred.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_data.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_restore_cred.3#4 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.man#1 branch .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_conv.3#1 branch .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam_version.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_appl.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_constants.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_modules.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_types.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_configure.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dispatch.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dynamic.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_findenv.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_get_option.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_impl.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_load.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_log.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_nullconv.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_set_option.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_static.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_acct_mgmt.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_authenticate_secondary.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_chauthtok.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_close_session.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_end.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_error.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_authtok.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_data.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_item.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_mapped_authtok.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_mapped_username.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_get_user.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_getenv.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_getenvlist.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_info.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_open_session.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_prompt.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_putenv.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_data.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_item.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_mapped_authtok.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_mapped_username.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_setcred.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_setenv.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_acct_mgmt.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_authenticate.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_authenticate_secondary.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_chauthtok.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_close_session.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_get_mapped_username.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_open_session.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_set_mapped_username.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_sm_setcred.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_start.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_strerror.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_verror.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vinfo.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_vprompt.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/misc/gendoc.pl#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_deny/pam_deny.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_dummy/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_dummy/pam_dummy.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_permit/pam_permit.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_unix/Makefile#1 branch .. //depot/projects/trustedbsd/mac/contrib/openpam/modules/pam_unix/pam_unix.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/smbfs/HISTORY#4 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/nls.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tar/lib/error.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tar/src/compare.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tar/src/extract.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/mac/contrib/tcsh/Fixes#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Imakefile#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Makefile.std#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Makefile.vms#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/Ported#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/complete.tcsh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/config.guess#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/config.sub#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/config/bsd4.4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/config_f.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/configure#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/configure.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.chared.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.decls.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.defns.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.init.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.inputl.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.refresh.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.screen.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.term.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.term.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/ed.xmap.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/gethost.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/glob.3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/glob.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/glob.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/host.defs#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/finnish/set1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/finnish/set20#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set13#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set17#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set19#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set2#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set20#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set21#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set22#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set23#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set26#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set30#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set7#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/pl/set9#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set10#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set13#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set17#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set18#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set19#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set2#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set20#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set22#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set23#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set26#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set27#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set30#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set31#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set6#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set7#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/russian/set9#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set1#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set10#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set11#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set12#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set13#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set14#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set15#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set16#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set17#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set18#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set19#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set2#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set20#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set21#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set22#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set23#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set24#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set25#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set26#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set27#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set29#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set3#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set30#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set31#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set6#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set7#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/nls/ukrainian/set9#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/patchlevel.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/pathnames.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.char.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.char.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.decls.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.dir.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.dir.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.dol.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.err.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.exec.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.exp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.file.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.func.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.glob.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.hist.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.init.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.misc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.parse.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.print.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.proc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.proc.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.sem.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.set.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.time.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/sh.types.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.alloc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.bind.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.const.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.decls.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.disc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.func.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.os.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.os.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.printf.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.prompt.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.sched.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.sig.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.sig.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.str.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.vers.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.wait.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tc.who.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tcsh.man#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.color.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.comp.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.decls.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.help.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.init.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.parse.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/tcsh/tw.spell.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/FREEBSD-Xlist#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/INTRODUCTION#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/NEWS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/TODO#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/config.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/config.h.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/fdl.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info-stnd.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/install-info.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/makeinfo.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/texindex.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/texinfo.txi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/version-stnd.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/version.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/display.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/filesys.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/indices.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info-utils.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infokey.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infokey.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/search.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/window.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/libintl.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/cmds.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/defun.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/html.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/html.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/index.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/insertion.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/insertion.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/makeinfo.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/makeinfo.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/node.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/texinfo.dtd#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/texinfo.xsl#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/toc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/xml.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/xml.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/util/install-info.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/util/texindex.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/CHANGES#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/FILES#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/INSTALL#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/VERSION#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/aclocal.m4#1 branch .. //depot/projects/trustedbsd/mac/contrib/traceroute/config.guess#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/config.sub#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/configure#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/configure.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/findsaddr-generic.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/traceroute/findsaddr-linux.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/traceroute/findsaddr-mib.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/traceroute/findsaddr-socket.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/traceroute/findsaddr.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/traceroute/ifaddrlist.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/traceroute/ifaddrlist.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/traceroute/install-sh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/lbl/os-solaris2.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/lbl/os-sunos4.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/strerror.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/traceroute.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/traceroute/traceroute.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/traceroute/usleep.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/CREDITS#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/FREEBSD-Xlist#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/FREEBSD-upgrade#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/INSTALL#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/LICENCE#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/OVERVIEW#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/README.privsep#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/README.smartcard#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/RFC.nroff#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/TODO#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/WARNING.RNG#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/acconfig.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/aclocal.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/atomicio.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/atomicio.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-bsdauth.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-chall.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-krb4.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-krb5.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-options.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-options.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-pam.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-pam.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-passwd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-rh-rsa.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-rhosts.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-rsa.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-sia.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-sia.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth-skey.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth1.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth2-chall.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth2-hostbased.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth2-kbdint.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth2-none.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth2-pam-freebsd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth2-pam.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth2-pam.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth2-passwd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth2-pubkey.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/auth2.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/authfd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/authfd.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/authfile.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/authfile.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/bufaux.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/bufaux.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/buffer.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/buffer.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/canohost.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/canohost.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/channels.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/channels.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/cipher.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/cipher.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/clientloop.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/clientloop.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/compat.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/compat.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/compress.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/compress.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/config.guess#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/config.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/config.sub#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/configure.ac#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/crc32.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/crc32.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/deattack.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/deattack.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/defines.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/dh.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/dh.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/dispatch.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/dispatch.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/entropy.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/entropy.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/fatal.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/fixpaths#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/fixprogs#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/getput.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/groupaccess.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/groupaccess.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/hostfile.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/hostfile.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/includes.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/install-sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/kex.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/kex.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/kexdh.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/kexgex.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/key.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/key.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/log.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/log.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/loginrec.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/loginrec.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/logintest.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/mac.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/mac.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/match.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/match.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/md5crypt.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/md5crypt.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/mdoc2man.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/misc.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/misc.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/moduli#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/monitor.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/monitor.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/monitor_fdpass.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/monitor_fdpass.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/monitor_mm.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/monitor_mm.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/monitor_wrap.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/monitor_wrap.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/mpaux.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/mpaux.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/msg.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/msg.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/myproposal.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/nchan.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/nchan.ms#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/nchan2.ms#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/base64.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/base64.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bindresvport.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bindresvport.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-arc4random.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-arc4random.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-cray.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-cray.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-cygwin_util.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-cygwin_util.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-misc.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-misc.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-nextstep.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-nextstep.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-snprintf.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-snprintf.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-waitpid.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/bsd-waitpid.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/daemon.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/daemon.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/dirname.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/dirname.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/fake-gai-errnos.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/fake-getaddrinfo.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/fake-getaddrinfo.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/fake-getnameinfo.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/fake-getnameinfo.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/fake-queue.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/fake-socket.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/getcwd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/getcwd.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/getgrouplist.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/getgrouplist.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/getopt.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/getopt.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/glob.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/glob.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/inet_aton.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/inet_aton.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/inet_ntoa.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/inet_ntoa.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/inet_ntop.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/inet_ntop.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/mktemp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/mktemp.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/openbsd-compat.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/port-aix.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/port-aix.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/port-irix.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/port-irix.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/readpassphrase.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/readpassphrase.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/realpath.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/realpath.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/rresvport.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/rresvport.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/setenv.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/setenv.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/setproctitle.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/setproctitle.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/sigact.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/sigact.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/strlcat.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/strlcat.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/strlcpy.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/strlcpy.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/strmode.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/strmode.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/strsep.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/strsep.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/openbsd-compat/tree.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/packet.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/packet.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/pathnames.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/radix.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/radix.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/readconf.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/readconf.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/readpass.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/readpass.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/Makefile#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/agent.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/authorized_keys_root#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/broken-pipe.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/bsd.regress.mk#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/connect-privsep.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/connect.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/copy.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/copy.2#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/dsa_ssh2.prv#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/dsa_ssh2.pub#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/exit-status.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/forwarding.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/keyscan.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/proto-mismatch.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/proto-version.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/proxy-connect.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/rsa_openssh.prv#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/rsa_openssh.pub#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/rsa_ssh2.prv#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/runtests.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/sftp.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/ssh-com-client.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/ssh-com-keygen.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/ssh-com-sftp.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/ssh-com.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/stderr-after-eof.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/stderr-data.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/t4.ok#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/t5.ok#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/test-exec.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/transfer.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/try-ciphers.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/regress/yes-head.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/rijndael.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/rijndael.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/rsa.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/rsa.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/scard-opensc.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/scard.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/scard.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/scard/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/scard/Ssh.bin#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/scard/Ssh.bin.uu#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/scard/Ssh.java#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/scp.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/scp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/servconf.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/servconf.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/serverloop.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/serverloop.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/session.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/session.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sftp-client.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sftp-client.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sftp-common.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sftp-common.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sftp-glob.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sftp-glob.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sftp-int.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sftp-int.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sftp-server.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sftp-server.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sftp.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sftp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sftp.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-add.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-add.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-agent.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-agent.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-dss.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-dss.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-keygen.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-keygen.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-keyscan.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-keyscan.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-keysign.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-keysign.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-rand-helper.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-rand-helper.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-rsa.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh-rsa.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh1.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh2.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh_config#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh_config.5#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ssh_prng_cmds.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshconnect.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshconnect.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshconnect1.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshconnect2.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshd.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshd_config#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshd_config.5#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshlogin.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshlogin.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshpty.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshpty.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshtty.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/sshtty.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/tildexpand.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/tildexpand.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ttymodes.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/ttymodes.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/uidswap.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/uidswap.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/uuencode.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/uuencode.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/version.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/version.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/xmalloc.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh-portable/xmalloc.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-Xlist#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-upgrade#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/INSTALL#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README.privsep#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/TODO#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/acconfig.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-krb5.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-passwd.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-skey.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-chall.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam-freebsd.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/authfd.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/authfile.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/bufaux.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/buffer.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/configure.ac#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/defines.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/includes.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kex.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/key.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_fdpass.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_mm.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 13:54:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D65437B401; Mon, 29 Jul 2002 13:54:27 -0700 (PDT) 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 9EB1737B400 for ; Mon, 29 Jul 2002 13:54:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D26B43E3B for ; Mon, 29 Jul 2002 13:54:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TKsQJU072943 for ; Mon, 29 Jul 2002 13:54:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TKsPce072940 for perforce@freebsd.org; Mon, 29 Jul 2002 13:54:25 -0700 (PDT) Date: Mon, 29 Jul 2002 13:54:25 -0700 (PDT) Message-Id: <200207292054.g6TKsPce072940@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15142 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15142 Change 15142 by rwatson@rwatson_tislabs on 2002/07/29 13:53:38 First pass at adding back in 'struct mount' labeling with nmount in the tree. Once the historical cruft associated with the old mount is gone, this whole chunk of VFS code should be very clean. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#2 (text+ko) ==== @@ -563,6 +563,9 @@ vput(vp); goto bad; } + /* + * XXXMAC: It could be this should be a VADMIN check. + */ if (va.va_uid != td->td_ucred->cr_uid) { error = suser(td); if (error) { @@ -643,8 +646,12 @@ mp->mnt_stat.f_owner = td->td_ucred->cr_uid; strncpy(mp->mnt_stat.f_mntonname, fspath, MNAMELEN); mp->mnt_iosize_max = DFLTPHYS; +#ifdef MAC + mac_init_mount(mp); + mac_create_mount(td->td_ucred, mp); +#endif VOP_UNLOCK(vp, 0, td); - mp->mnt_optnew = optlist; + mp->mnt_optnew = optlist; /* XXXMAC: should this be above? */ update: /* @@ -662,6 +669,9 @@ else { mp->mnt_vfc->vfc_refcount--; vfs_unbusy(mp, td); +#ifdef MAC + mac_destroy_mount(mp); +#endif free(mp, M_MOUNT); } vrele(vp); @@ -752,6 +762,9 @@ mtx_unlock(&vp->v_interlock); mp->mnt_vfc->vfc_refcount--; vfs_unbusy(mp, td); +#ifdef MAC + mac_destroy_mount(mp); +#endif free(mp, M_MOUNT); vput(vp); goto bad; @@ -999,6 +1012,10 @@ mp->mnt_stat.f_owner = td->td_ucred->cr_uid; strncpy(mp->mnt_stat.f_mntonname, fspath, MNAMELEN); mp->mnt_iosize_max = DFLTPHYS; +#ifdef MAC + mac_init_mount(mp); + mac_create_mount(td->td_ucred, mp); +#endif VOP_UNLOCK(vp, 0, td); update: /* @@ -1016,6 +1033,9 @@ else { mp->mnt_vfc->vfc_refcount--; vfs_unbusy(mp, td); +#ifdef MAC + mac_destroy_mount(mp); +#endif free(mp, M_MOUNT); } vrele(vp); @@ -1093,6 +1113,9 @@ mtx_unlock(&vp->v_interlock); mp->mnt_vfc->vfc_refcount--; vfs_unbusy(mp, td); +#ifdef MAC + mac_destroy_mount(mp); +#endif free(mp, M_MOUNT); vput(vp); } @@ -1304,6 +1327,9 @@ vrele(coveredvp); if (mp->mnt_kern_flag & MNTK_MWAIT) wakeup(mp); +#ifdef MAC + mac_destroy_mount(mp); +#endif if (mp->mnt_op->vfs_mount == NULL) vfs_freeopts(mp->mnt_opt); free(mp, M_MOUNT); @@ -1350,6 +1376,10 @@ mp->mnt_stat.f_mntonname[0] = '/'; mp->mnt_stat.f_mntonname[1] = 0; (void) copystr(devname, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, 0); +#ifdef MAC + mac_init_mount(mp); + mac_create_mount(td->td_ucred, mp); +#endif *mpp = mp; return (0); } @@ -1502,6 +1532,9 @@ if (error != 0) { if (mp != NULL) { vfs_unbusy(mp, curthread); +#ifdef MAC + mac_destroy_mount(mp); +#endif free(mp, M_MOUNT); } printf("Root mount failed: %d\n", error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 13:59:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD98637B405; Mon, 29 Jul 2002 13:59:33 -0700 (PDT) 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 5F7F437B400 for ; Mon, 29 Jul 2002 13:59:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD8A543E5E for ; Mon, 29 Jul 2002 13:59:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TKxWJU073771 for ; Mon, 29 Jul 2002 13:59:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TKxWov073768 for perforce@freebsd.org; Mon, 29 Jul 2002 13:59:32 -0700 (PDT) Date: Mon, 29 Jul 2002 13:59:32 -0700 (PDT) Message-Id: <200207292059.g6TKxWov073768@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15143 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15143 Change 15143 by rwatson@rwatson_tislabs on 2002/07/29 13:59:16 Merge changes from GENERIC. I really should have created MAC by integ'ing GENERIC. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#33 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#33 (text+ko) ==== @@ -12,10 +12,11 @@ # latest information. # # An exhaustive list of options and more detailed explanations of the -# device lines is also present in the NOTES configuration file. If you are -# in doubt as to the purpose or necessity of a line, check first in NOTES. +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.345 2002/06/06 16:35:58 gibbs Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.352 2002/07/23 06:35:08 peter Exp $ machine i386 cpu I486_CPU @@ -47,6 +48,7 @@ options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] +options COMPAT_FREEBSD4 #Compatible with FreeBSD4 options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) support options SYSVSHM #SYSV-style shared memory @@ -57,12 +59,13 @@ options KBD_INSTALL_CDEV # install a CDEV entry in /dev # Debugging for use in -current +options ALT_BREAK_TO_DEBUGGER +options BREAK_TO_DEBUGGER options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed -options ALT_BREAK_TO_DEBUGGER # To make an SMP kernel, the next two are needed #options SMP # Symmetric MultiProcessor Kernel @@ -128,14 +131,13 @@ device twe # 3ware ATA RAID # atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc 1 # At keyboard controller -device atkbd # at keyboard -device psm # psm mouse +device atkbdc 1 # AT keyboard controller +device atkbd # AT keyboard +device psm # PS/2 mouse -device vga # VGA screen +device vga # VGA video card driver -# splash screen/screen saver -device splash +device splash # Splash screen and screen saver support # syscons is the default console driver, resembling an SCO console device sc 1 @@ -149,13 +151,16 @@ device npx # Power management support (see NOTES for more options) -device apm +#device apm # Add suspend/resume support for the i8254. device pmtimer # PCCARD (PCMCIA) support -device card # pccard bus -device pcic # PCMCIA bridge +# Pcmcia and cardbus bridge support +device pccbb # cardbus (yenta) bridge +#device pcic # ExCA ISA and PCI bridges +device pccard # PC Card (16-bit) bus +device cardbus # CardBus (32-bit) bus # Serial (COM) ports device sio # 8250, 16[45]50 based serial ports To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 14:36:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 508D037B401; Mon, 29 Jul 2002 14:36:18 -0700 (PDT) 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 96A6E37B400 for ; Mon, 29 Jul 2002 14:36:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 545C943E3B for ; Mon, 29 Jul 2002 14:36:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TLaHJU081201 for ; Mon, 29 Jul 2002 14:36:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TLaH1X081198 for perforce@freebsd.org; Mon, 29 Jul 2002 14:36:17 -0700 (PDT) Date: Mon, 29 Jul 2002 14:36:17 -0700 (PDT) Message-Id: <200207292136.g6TLaH1X081198@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15144 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15144 Change 15144 by rwatson@rwatson_tislabs on 2002/07/29 14:35:24 During the IFC, we managed to lose the VSUID constant. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#32 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#32 (text+ko) ==== @@ -248,6 +248,7 @@ #define VREAD 000400 /* read permission */ #define VSVTX 001000 /* save swapped text even after use */ #define VSGID 002000 /* set group id on execution */ +#define VSUID 004000 /* set user id on execution */ #define VADMIN 010000 /* permission to administer */ #define VSTAT 020000 /* permission to retrieve attrs */ #define VAPPEND 040000 /* permission to write/append */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 15:37:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE14037B401; Mon, 29 Jul 2002 15:37:32 -0700 (PDT) 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 4B8E737B400 for ; Mon, 29 Jul 2002 15:37:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E89DD43E5E for ; Mon, 29 Jul 2002 15:37:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TMbVJU092129 for ; Mon, 29 Jul 2002 15:37:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TMbVUM092126 for perforce@freebsd.org; Mon, 29 Jul 2002 15:37:31 -0700 (PDT) Date: Mon, 29 Jul 2002 15:37:31 -0700 (PDT) Message-Id: <200207292237.g6TMbVUM092126@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15146 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15146 Change 15146 by rwatson@rwatson_paprika on 2002/07/29 15:36:52 Oops, include opt_mac.h. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#3 (text+ko) ==== @@ -86,6 +86,7 @@ #include "opt_rootdevname.h" #include "opt_ddb.h" +#include "opt_mac.h" #ifdef DDB #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 16:19:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB9CD37B401; Mon, 29 Jul 2002 16:19:23 -0700 (PDT) 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 512F737B400 for ; Mon, 29 Jul 2002 16:19:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 885F743E42 for ; Mon, 29 Jul 2002 16:19:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TNJMJU099777 for ; Mon, 29 Jul 2002 16:19:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TNJMJB099774 for perforce@freebsd.org; Mon, 29 Jul 2002 16:19:22 -0700 (PDT) Date: Mon, 29 Jul 2002 16:19:22 -0700 (PDT) Message-Id: <200207292319.g6TNJMJB099774@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15147 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15147 Change 15147 by rwatson@rwatson_paprika on 2002/07/29 16:18:51 Entry point renames missed in i386 build. Affected files ... .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_mount.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_mount.c#6 (text+ko) ==== @@ -134,7 +134,7 @@ sp = &mp->mnt_stat; vrele(nd.ni_vp); #ifdef MAC - error = mac_check_statfs(td->td_proc->p_ucred, mp); + error = mac_check_mount_stat(td->td_proc->p_ucred, mp); if (error) return (error); #endif @@ -161,7 +161,7 @@ return (error); mp = ((struct vnode *)fp->f_data)->v_mount; #ifdef MAC - error = mac_check_statfs(td->td_proc->p_ucred, mp); + error = mac_check_mount_stat(td->td_proc->p_ucred, mp); if (error) { drop(fp, td); return (error); @@ -199,7 +199,7 @@ nmp = TAILQ_NEXT(mp, mnt_list); if (osf_sfsp && count < maxcount) { #ifdef MAC - error = mac_check_statfs(td->td_proc->p_ucred, mp); + error = mac_check_mount_stat(td->td_proc->p_ucred, mp); if (error) continue; #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 16:28:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFEB137B401; Mon, 29 Jul 2002 16:28:34 -0700 (PDT) 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 7149137B400 for ; Mon, 29 Jul 2002 16:28:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1889A43E6A for ; Mon, 29 Jul 2002 16:28:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TNSXJU000634 for ; Mon, 29 Jul 2002 16:28:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TNSXVM000630 for perforce@freebsd.org; Mon, 29 Jul 2002 16:28:33 -0700 (PDT) Date: Mon, 29 Jul 2002 16:28:33 -0700 (PDT) Message-Id: <200207292328.g6TNSXVM000630@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15148 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15148 Change 15148 by rwatson@rwatson_paprika on 2002/07/29 16:28:28 Remove stale definition of __mac_get_peer() in the non-MAC code. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#220 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#220 (text+ko) ==== @@ -3106,11 +3106,4 @@ return (ENOSYS); } -int -__mac_get_peer(struct thread *td, struct __mac_get_peer_args *uap) -{ - - return (ENOSYS); -} - #endif /* !MAC */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 16:30:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF46537B401; Mon, 29 Jul 2002 16:30:37 -0700 (PDT) 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 6919137B400 for ; Mon, 29 Jul 2002 16:30:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1276143E3B for ; Mon, 29 Jul 2002 16:30:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TNUaJU001117 for ; Mon, 29 Jul 2002 16:30:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TNUaOi001114 for perforce@freebsd.org; Mon, 29 Jul 2002 16:30:36 -0700 (PDT) Date: Mon, 29 Jul 2002 16:30:36 -0700 (PDT) Message-Id: <200207292330.g6TNUaOi001114@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15149 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15149 Change 15149 by rwatson@rwatson_paprika on 2002/07/29 16:29:57 'error' is unused in cttypoll() in the non-MAC case. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#8 (text+ko) ==== @@ -219,7 +219,9 @@ struct thread *td; { struct vnode *ttyvp; +#ifdef MAC int error; +#endif PROC_LOCK(td->td_proc); SESS_LOCK(td->td_proc->p_session); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 16:32:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF1B537B401; Mon, 29 Jul 2002 16:32:40 -0700 (PDT) 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 68E6637B400 for ; Mon, 29 Jul 2002 16:32:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10C5743E65 for ; Mon, 29 Jul 2002 16:32:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TNWdJU001288 for ; Mon, 29 Jul 2002 16:32:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TNWdYn001285 for perforce@freebsd.org; Mon, 29 Jul 2002 16:32:39 -0700 (PDT) Date: Mon, 29 Jul 2002 16:32:39 -0700 (PDT) Message-Id: <200207292332.g6TNWdYn001285@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15150 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15150 Change 15150 by rwatson@rwatson_paprika on 2002/07/29 16:31:40 'error' is only used in the MAC case in vn_poll(). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#33 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#33 (text+ko) ==== @@ -789,7 +789,9 @@ struct thread *td; { struct vnode *vp; +#ifdef MAC int error; +#endif vp = (struct vnode *)fp->f_data; #ifdef MAC To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 16:49:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE5ED37B401; Mon, 29 Jul 2002 16:48:13 -0700 (PDT) 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 0262837B400 for ; Mon, 29 Jul 2002 16:48:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC95743E4A for ; Mon, 29 Jul 2002 16:48:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TNmAJU002158 for ; Mon, 29 Jul 2002 16:48:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TNm2v7002149 for perforce@freebsd.org; Mon, 29 Jul 2002 16:48:02 -0700 (PDT) Date: Mon, 29 Jul 2002 16:48:02 -0700 (PDT) Message-Id: <200207292348.g6TNm2v7002149@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15151 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15151 Change 15151 by peter@peter_daintree on 2002/07/29 16:47:51 IFC @15150 Affected files ... .. //depot/projects/ia64/Makefile.inc1#34 integrate .. //depot/projects/ia64/README#3 integrate .. //depot/projects/ia64/UPDATING#16 integrate .. //depot/projects/ia64/bin/cp/cp.1#2 integrate .. //depot/projects/ia64/bin/cp/cp.c#8 integrate .. //depot/projects/ia64/bin/cp/extern.h#3 integrate .. //depot/projects/ia64/bin/cp/utils.c#5 integrate .. //depot/projects/ia64/bin/csh/Makefile#5 integrate .. //depot/projects/ia64/bin/sh/builtins.def#4 integrate .. //depot/projects/ia64/bin/sh/cd.c#7 integrate .. //depot/projects/ia64/bin/sh/eval.c#5 integrate .. //depot/projects/ia64/bin/sh/eval.h#3 integrate .. //depot/projects/ia64/bin/sh/histedit.c#5 integrate .. //depot/projects/ia64/bin/sh/input.c#4 integrate .. //depot/projects/ia64/bin/sh/jobs.c#10 integrate .. //depot/projects/ia64/bin/sh/myhistedit.h#3 integrate .. //depot/projects/ia64/bin/sh/options.h#3 integrate .. //depot/projects/ia64/bin/sh/parser.c#6 integrate .. //depot/projects/ia64/bin/sh/sh.1#12 integrate .. //depot/projects/ia64/bin/sh/trap.c#5 integrate .. //depot/projects/ia64/bin/sh/trap.h#3 integrate .. //depot/projects/ia64/bin/sh/var.c#6 integrate .. //depot/projects/ia64/bin/test/test.c#9 integrate .. //depot/projects/ia64/contrib/smbfs/HISTORY#4 integrate .. //depot/projects/ia64/contrib/smbfs/lib/smb/nls.c#3 integrate .. //depot/projects/ia64/contrib/tcsh/FREEBSD-Xlist#1 branch .. //depot/projects/ia64/contrib/tcsh/FREEBSD-upgrade#1 branch .. //depot/projects/ia64/contrib/tcsh/Fixes#2 integrate .. //depot/projects/ia64/contrib/tcsh/Imakefile#2 integrate .. //depot/projects/ia64/contrib/tcsh/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/tcsh/Makefile.std#2 integrate .. //depot/projects/ia64/contrib/tcsh/Makefile.vms#2 integrate .. //depot/projects/ia64/contrib/tcsh/Ported#2 integrate .. //depot/projects/ia64/contrib/tcsh/README#2 integrate .. //depot/projects/ia64/contrib/tcsh/complete.tcsh#2 integrate .. //depot/projects/ia64/contrib/tcsh/config.guess#2 integrate .. //depot/projects/ia64/contrib/tcsh/config.sub#2 integrate .. //depot/projects/ia64/contrib/tcsh/config/bsd4.4#2 integrate .. //depot/projects/ia64/contrib/tcsh/config_f.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/configure#2 integrate .. //depot/projects/ia64/contrib/tcsh/configure.in#2 integrate .. //depot/projects/ia64/contrib/tcsh/ed.chared.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/ed.decls.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/ed.defns.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/ed.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/ed.init.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/ed.inputl.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/ed.refresh.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/ed.screen.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/ed.term.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/ed.term.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/ed.xmap.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/gethost.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/glob.3#2 integrate .. //depot/projects/ia64/contrib/tcsh/glob.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/glob.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/host.defs#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set1#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/finnish/set20#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set1#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set13#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set17#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set19#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set2#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set20#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set21#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set22#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set23#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set26#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set3#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set30#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set4#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set7#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/pl/set9#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set1#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set10#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set13#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set17#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set18#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set19#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set2#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set20#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set22#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set23#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set26#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set27#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set3#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set30#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set31#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set4#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set6#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set7#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/russian/set9#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set1#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set10#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set11#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set12#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set13#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set14#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set15#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set16#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set17#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set18#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set19#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set2#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set20#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set21#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set22#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set23#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set24#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set25#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set26#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set27#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set29#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set3#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set30#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set31#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set4#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set5#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set6#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set7#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set8#2 integrate .. //depot/projects/ia64/contrib/tcsh/nls/ukrainian/set9#2 integrate .. //depot/projects/ia64/contrib/tcsh/patchlevel.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/pathnames.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.char.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.char.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.decls.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.dir.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.dir.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.dol.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.err.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.exec.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.exp.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.file.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.func.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.glob.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.hist.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.init.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.lex.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.misc.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.parse.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.print.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.proc.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.proc.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.sem.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.set.c#3 integrate .. //depot/projects/ia64/contrib/tcsh/sh.time.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/sh.types.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.alloc.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.bind.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.const.c#3 integrate .. //depot/projects/ia64/contrib/tcsh/tc.decls.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.disc.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.func.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.os.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.os.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.printf.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.prompt.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.sched.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.sig.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.sig.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.str.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.vers.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.wait.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/tc.who.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tcsh.man#2 integrate .. //depot/projects/ia64/contrib/tcsh/tw.color.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tw.comp.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tw.decls.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/tw.h#2 integrate .. //depot/projects/ia64/contrib/tcsh/tw.help.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tw.init.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tw.parse.c#2 integrate .. //depot/projects/ia64/contrib/tcsh/tw.spell.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/texinfo/FREEBSD-Xlist#3 integrate .. //depot/projects/ia64/contrib/texinfo/FREEBSD-upgrade#3 integrate .. //depot/projects/ia64/contrib/texinfo/INTRODUCTION#3 integrate .. //depot/projects/ia64/contrib/texinfo/NEWS#3 integrate .. //depot/projects/ia64/contrib/texinfo/README#3 integrate .. //depot/projects/ia64/contrib/texinfo/TODO#3 integrate .. //depot/projects/ia64/contrib/texinfo/config.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/config.h.in#3 integrate .. //depot/projects/ia64/contrib/texinfo/doc/README#3 integrate .. //depot/projects/ia64/contrib/texinfo/doc/fdl.texi#1 branch .. //depot/projects/ia64/contrib/texinfo/doc/info-stnd.texi#3 integrate .. //depot/projects/ia64/contrib/texinfo/doc/info.1#3 integrate .. //depot/projects/ia64/contrib/texinfo/doc/info.texi#3 integrate .. //depot/projects/ia64/contrib/texinfo/doc/install-info.1#3 integrate .. //depot/projects/ia64/contrib/texinfo/doc/makeinfo.1#3 integrate .. //depot/projects/ia64/contrib/texinfo/doc/texindex.1#3 integrate .. //depot/projects/ia64/contrib/texinfo/doc/texinfo.txi#3 integrate .. //depot/projects/ia64/contrib/texinfo/doc/version-stnd.texi#2 integrate .. //depot/projects/ia64/contrib/texinfo/doc/version.texi#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/display.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/filesys.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/indices.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/info-utils.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/info.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/info/infokey.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/infokey.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/search.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/info/window.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/lib/libintl.h#2 delete .. //depot/projects/ia64/contrib/texinfo/makeinfo/cmds.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/defun.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/html.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/html.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/index.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/insertion.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/insertion.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/makeinfo.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/makeinfo.h#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/node.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/texinfo.dtd#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/texinfo.xsl#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/toc.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/xml.c#2 integrate .. //depot/projects/ia64/contrib/texinfo/makeinfo/xml.h#2 integrate .. //depot/projects/ia64/contrib/texinfo/util/install-info.c#3 integrate .. //depot/projects/ia64/contrib/texinfo/util/texindex.c#3 integrate .. //depot/projects/ia64/contrib/traceroute/CHANGES#2 integrate .. //depot/projects/ia64/contrib/traceroute/FILES#2 integrate .. //depot/projects/ia64/contrib/traceroute/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/contrib/traceroute/INSTALL#2 integrate .. //depot/projects/ia64/contrib/traceroute/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/traceroute/README#2 integrate .. //depot/projects/ia64/contrib/traceroute/VERSION#2 integrate .. //depot/projects/ia64/contrib/traceroute/aclocal.m4#1 branch .. //depot/projects/ia64/contrib/traceroute/config.guess#2 integrate .. //depot/projects/ia64/contrib/traceroute/config.sub#2 integrate .. //depot/projects/ia64/contrib/traceroute/configure#2 integrate .. //depot/projects/ia64/contrib/traceroute/configure.in#2 integrate .. //depot/projects/ia64/contrib/traceroute/findsaddr-generic.c#1 branch .. //depot/projects/ia64/contrib/traceroute/findsaddr-linux.c#1 branch .. //depot/projects/ia64/contrib/traceroute/findsaddr-mib.c#1 branch .. //depot/projects/ia64/contrib/traceroute/findsaddr-socket.c#1 branch .. //depot/projects/ia64/contrib/traceroute/findsaddr.h#1 branch .. //depot/projects/ia64/contrib/traceroute/ifaddrlist.c#1 branch .. //depot/projects/ia64/contrib/traceroute/ifaddrlist.h#1 branch .. //depot/projects/ia64/contrib/traceroute/install-sh#2 integrate .. //depot/projects/ia64/contrib/traceroute/lbl/os-solaris2.h#2 integrate .. //depot/projects/ia64/contrib/traceroute/lbl/os-sunos4.h#2 integrate .. //depot/projects/ia64/contrib/traceroute/strerror.c#2 integrate .. //depot/projects/ia64/contrib/traceroute/traceroute.8#2 integrate .. //depot/projects/ia64/contrib/traceroute/traceroute.c#3 integrate .. //depot/projects/ia64/contrib/traceroute/traceroute.h#1 branch .. //depot/projects/ia64/contrib/traceroute/usleep.c#1 branch .. //depot/projects/ia64/crypto/openssh/auth.c#4 integrate .. //depot/projects/ia64/crypto/openssh/auth2-pam-freebsd.c#3 integrate .. //depot/projects/ia64/crypto/openssh/session.c#11 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config#7 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config.5#3 integrate .. //depot/projects/ia64/crypto/openssh/sshd.8#6 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config#8 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config.5#3 integrate .. //depot/projects/ia64/etc/Makefile#15 integrate .. //depot/projects/ia64/etc/defaults/pccard.conf#11 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#15 integrate .. //depot/projects/ia64/etc/isdn/Makefile#4 integrate .. //depot/projects/ia64/etc/mail/Makefile#11 integrate .. //depot/projects/ia64/etc/rc.d/atm1#2 integrate .. //depot/projects/ia64/etc/rc.d/atm2.sh#2 integrate .. //depot/projects/ia64/etc/rc.d/atm3.sh#2 integrate .. //depot/projects/ia64/etc/rc.d/bgfsck#2 integrate .. //depot/projects/ia64/etc/rc.d/diskless#3 integrate .. //depot/projects/ia64/etc/rc.d/initdiskless#2 integrate .. //depot/projects/ia64/etc/rc.d/isdnd#3 integrate .. //depot/projects/ia64/etc/rc.d/network1#4 integrate .. //depot/projects/ia64/etc/rc.d/network2#2 integrate .. //depot/projects/ia64/etc/rc.d/network3#2 integrate .. //depot/projects/ia64/etc/rc.d/network_ipv6#2 integrate .. //depot/projects/ia64/etc/rc.d/pccard#2 integrate .. //depot/projects/ia64/etc/rc.d/route6d#3 integrate .. //depot/projects/ia64/etc/rc.d/serial#3 integrate .. //depot/projects/ia64/etc/rc.d/syscons#3 integrate .. //depot/projects/ia64/etc/rc.d/sysctl#4 integrate .. //depot/projects/ia64/etc/rc.diskless1#4 integrate .. //depot/projects/ia64/etc/sendmail/Makefile#9 integrate .. //depot/projects/ia64/games/battlestar/Makefile#3 integrate .. //depot/projects/ia64/games/canfield/canfield/Makefile#3 integrate .. //depot/projects/ia64/games/cribbage/Makefile#4 integrate .. //depot/projects/ia64/games/hack/Makefile#4 integrate .. //depot/projects/ia64/games/larn/Makefile#4 integrate .. //depot/projects/ia64/games/phantasia/Makefile#2 integrate .. //depot/projects/ia64/games/robots/Makefile#3 integrate .. //depot/projects/ia64/games/rogue/Makefile#3 integrate .. //depot/projects/ia64/games/sail/Makefile#3 integrate .. //depot/projects/ia64/games/snake/snake/Makefile#3 integrate .. //depot/projects/ia64/gnu/lib/csu/Makefile#11 integrate .. //depot/projects/ia64/gnu/lib/libdialog/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#3 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/ld/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/strip/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/contrib/mm/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/font/Makefile.dev#3 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/src/utils/indxbib/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/rcs/rcsfreeze/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/Makefile#3 integrate .. //depot/projects/ia64/include/rpc/clnt.h#5 integrate .. //depot/projects/ia64/kerberosIV/share/info/Makefile#3 integrate .. //depot/projects/ia64/lib/compat/compat1x/Makefile#2 integrate .. //depot/projects/ia64/lib/compat/compat20/Makefile#2 integrate .. //depot/projects/ia64/lib/compat/compat21/Makefile#2 integrate .. //depot/projects/ia64/lib/compat/compat22/Makefile#2 integrate .. //depot/projects/ia64/lib/compat/compat3x.i386/Makefile#3 integrate .. //depot/projects/ia64/lib/compat/compat4x.alpha/Makefile#6 integrate .. //depot/projects/ia64/lib/compat/compat4x.i386/Makefile#6 integrate .. //depot/projects/ia64/lib/csu/alpha/Makefile#5 integrate .. //depot/projects/ia64/lib/csu/i386-elf/Makefile#5 integrate .. //depot/projects/ia64/lib/csu/i386/Makefile#3 integrate .. //depot/projects/ia64/lib/csu/ia64/Makefile#4 integrate .. //depot/projects/ia64/lib/csu/powerpc/Makefile#4 integrate .. //depot/projects/ia64/lib/csu/sparc64/Makefile#7 integrate .. //depot/projects/ia64/lib/libalias/alias.c#5 integrate .. //depot/projects/ia64/lib/libc/net/getifaddrs.c#3 integrate .. //depot/projects/ia64/lib/libc/net/getnameinfo.c#4 integrate .. //depot/projects/ia64/lib/libc/rpc/rpcb_clnt.c#5 integrate .. //depot/projects/ia64/lib/libfetch/fetch.h#4 integrate .. //depot/projects/ia64/lib/libncurses/Makefile#6 integrate .. //depot/projects/ia64/lib/libpam/libpam/Makefile#15 integrate .. //depot/projects/ia64/libexec/fingerd/fingerd.8#4 integrate .. //depot/projects/ia64/libexec/ftpd/ftpcmd.y#6 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.8#3 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#7 integrate .. //depot/projects/ia64/libexec/ftpd/logwtmp.c#3 integrate .. //depot/projects/ia64/release/Makefile#17 integrate .. //depot/projects/ia64/release/Makefile.inc.docports#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#35 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml#5 integrate .. //depot/projects/ia64/release/i386/drivers.conf#4 integrate .. //depot/projects/ia64/sbin/Makefile#18 integrate .. //depot/projects/ia64/sbin/devfs/Makefile#2 integrate .. //depot/projects/ia64/sbin/devfs/devfs.8#2 integrate .. //depot/projects/ia64/sbin/devfs/devfs.c#2 integrate .. //depot/projects/ia64/sbin/devfs/extern.h#2 integrate .. //depot/projects/ia64/sbin/devfs/rule.c#2 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#6 integrate .. //depot/projects/ia64/sbin/mount_msdosfs/Makefile#5 integrate .. //depot/projects/ia64/sbin/nfsiod/Makefile#3 integrate .. //depot/projects/ia64/sbin/nfsiod/nfsiod.c#4 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile#7 integrate .. //depot/projects/ia64/share/colldef/Makefile#8 integrate .. //depot/projects/ia64/share/dict/freebsd#2 integrate .. //depot/projects/ia64/share/examples/Makefile#5 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#16 integrate .. //depot/projects/ia64/share/examples/isdn/i4brunppp/Makefile#3 integrate .. //depot/projects/ia64/share/examples/ses/getencstat/Makefile#2 integrate .. //depot/projects/ia64/share/examples/ses/sesd/Makefile#2 integrate .. //depot/projects/ia64/share/examples/ses/setencstat/Makefile#2 integrate .. //depot/projects/ia64/share/examples/ses/setobjstat/Makefile#2 integrate .. //depot/projects/ia64/share/info/Makefile#4 integrate .. //depot/projects/ia64/share/man/man1/Makefile#2 integrate .. //depot/projects/ia64/share/man/man1/builtin.1#5 integrate .. //depot/projects/ia64/share/man/man4/em.4#7 integrate .. //depot/projects/ia64/share/man/man4/inet6.4#3 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#16 integrate .. //depot/projects/ia64/share/man/man7/firewall.7#4 integrate .. //depot/projects/ia64/share/man/man7/release.7#10 integrate .. //depot/projects/ia64/share/man/man9/namei.9#3 integrate .. //depot/projects/ia64/share/man/man9/style.9#10 integrate .. //depot/projects/ia64/share/man/man9/ucred.9#6 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#7 integrate .. //depot/projects/ia64/share/mk/bsd.doc.mk#5 integrate .. //depot/projects/ia64/share/mk/bsd.files.mk#3 integrate .. //depot/projects/ia64/share/mk/bsd.info.mk#5 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#16 integrate .. //depot/projects/ia64/share/mk/bsd.man.mk#6 integrate .. //depot/projects/ia64/share/mk/bsd.own.mk#5 integrate .. //depot/projects/ia64/share/mk/bsd.prog.mk#13 integrate .. //depot/projects/ia64/share/mklocale/Makefile#6 integrate .. //depot/projects/ia64/share/monetdef/Makefile#6 integrate .. //depot/projects/ia64/share/msgdef/Makefile#6 integrate .. //depot/projects/ia64/share/numericdef/Makefile#6 integrate .. //depot/projects/ia64/share/sendmail/Makefile#3 integrate .. //depot/projects/ia64/share/skel/Makefile#3 integrate .. //depot/projects/ia64/share/skel/dot.shrc#2 integrate .. //depot/projects/ia64/share/syscons/fonts/Makefile#4 integrate .. //depot/projects/ia64/share/syscons/keymaps/Makefile#5 integrate .. //depot/projects/ia64/share/syscons/scrnmaps/Makefile#3 integrate .. //depot/projects/ia64/share/timedef/Makefile#6 integrate .. //depot/projects/ia64/share/zoneinfo/Makefile#3 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#12 integrate .. //depot/projects/ia64/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/ia64/sys/alpha/conf/SIMOS#5 integrate .. //depot/projects/ia64/sys/alpha/conf/gethints.awk#1 branch .. //depot/projects/ia64/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/ia64/sys/alpha/include/ansi.h#9 integrate .. //depot/projects/ia64/sys/alpha/include/limits.h#3 integrate .. //depot/projects/ia64/sys/arm/include/_stdint.h#1 branch .. //depot/projects/ia64/sys/arm/include/ansi.h#7 integrate .. //depot/projects/ia64/sys/arm/include/limits.h#2 integrate .. //depot/projects/ia64/sys/boot/i386/boot2/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/pc98/boot2/Makefile#6 integrate .. //depot/projects/ia64/sys/conf/NOTES#17 integrate .. //depot/projects/ia64/sys/conf/files#35 integrate .. //depot/projects/ia64/sys/conf/files.alpha#9 integrate .. //depot/projects/ia64/sys/conf/files.i386#13 integrate .. //depot/projects/ia64/sys/conf/files.ia64#12 integrate .. //depot/projects/ia64/sys/conf/files.pc98#11 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#17 integrate .. //depot/projects/ia64/sys/conf/files.x86_64#2 integrate .. //depot/projects/ia64/sys/conf/gethints.awk#2 delete .. //depot/projects/ia64/sys/conf/kern.post.mk#15 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#10 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#13 integrate .. //depot/projects/ia64/sys/conf/options#24 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_button.c#6 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#7 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_lid.c#5 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_gram.y#4 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#9 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#14 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#10 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.h#4 integrate .. //depot/projects/ia64/sys/dev/ata/ata-isa.c#5 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-all.c#7 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-all.h#4 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#11 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-fd.c#8 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-tape.c#7 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#6 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_core.c#4 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_os.c#5 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt.c#3 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#7 integrate .. //depot/projects/ia64/sys/dev/exca/exca.c#3 integrate .. //depot/projects/ia64/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/ia64/sys/dev/exca/excavar.h#2 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/ia64/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#10 integrate .. //depot/projects/ia64/sys/dev/isp/isp_pci.c#8 integrate .. //depot/projects/ia64/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/ia64/sys/dev/lmc/if_lmc.c#4 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#10 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbdevid.h#4 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbreg.h#4 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbvar.h#4 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#7 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#4 integrate .. //depot/projects/ia64/sys/dev/si/si.c#3 integrate .. //depot/projects/ia64/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/ia64/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/ia64/sys/dev/sn/if_sn_pccard.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sound.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudio.c#1 branch .. //depot/projects/ia64/sys/dev/sound/usb/uaudio.h#1 branch .. //depot/projects/ia64/sys/dev/sound/usb/uaudio_pcm.c#1 branch .. //depot/projects/ia64/sys/dev/sound/usb/uaudioreg.h#1 branch .. //depot/projects/ia64/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#15 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#15 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#20 integrate .. //depot/projects/ia64/sys/dev/wi/if_wivar.h#9 integrate .. //depot/projects/ia64/sys/dev/wi/wi_hostap.c#10 integrate .. //depot/projects/ia64/sys/dev/xe/if_xe_pccard.c#3 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs.h#4 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_ctl.c#8 integrate .. //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#6 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#16 integrate .. //depot/projects/ia64/sys/i386/conf/NEWCARD#7 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#18 integrate .. //depot/projects/ia64/sys/i386/conf/OLDCARD#3 integrate .. //depot/projects/ia64/sys/i386/conf/gethints.awk#1 branch .. //depot/projects/ia64/sys/i386/i386/db_trace.c#5 integrate .. //depot/projects/ia64/sys/i386/i386/exception.s#5 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#15 integrate .. //depot/projects/ia64/sys/i386/i386/swtch.s#6 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#14 integrate .. //depot/projects/ia64/sys/i386/include/_stdint.h#1 branch .. //depot/projects/ia64/sys/i386/include/ansi.h#9 integrate .. //depot/projects/ia64/sys/i386/include/cpufunc.h#10 integrate .. //depot/projects/ia64/sys/i386/include/limits.h#3 integrate .. //depot/projects/ia64/sys/i386/isa/cx.c#3 integrate .. //depot/projects/ia64/sys/i386/isa/stallion.c#3 integrate .. //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#7 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#14 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#30 integrate .. //depot/projects/ia64/sys/ia64/include/_stdint.h#1 branch .. //depot/projects/ia64/sys/ia64/include/ansi.h#9 integrate .. //depot/projects/ia64/sys/ia64/include/limits.h#3 integrate .. //depot/projects/ia64/sys/kern/bus_if.m#4 integrate .. //depot/projects/ia64/sys/kern/kern_acct.c#8 integrate .. //depot/projects/ia64/sys/kern/kern_acl.c#10 integrate .. //depot/projects/ia64/sys/kern/kern_condvar.c#10 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_linker.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#10 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_resource.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_sysctl.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#4 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#7 integrate .. //depot/projects/ia64/sys/kern/subr_diskslice.c#10 integrate .. //depot/projects/ia64/sys/kern/subr_mbuf.c#10 integrate .. //depot/projects/ia64/sys/kern/sys_generic.c#15 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#16 integrate .. //depot/projects/ia64/sys/kern/sysv_msg.c#6 integrate .. //depot/projects/ia64/sys/kern/sysv_sem.c#6 integrate .. //depot/projects/ia64/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/ia64/sys/kern/uipc_jumbo.c#3 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/ia64/sys/kern/uipc_socket2.c#14 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#14 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#8 integrate .. //depot/projects/ia64/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#17 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#22 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#15 integrate .. //depot/projects/ia64/sys/modules/bktr/bktr/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/sound/driver/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/sound/driver/uaudio/Makefile#1 branch .. //depot/projects/ia64/sys/net/netisr.h#4 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#16 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#16 integrate .. //depot/projects/ia64/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#15 integrate .. //depot/projects/ia64/sys/netinet6/in6.h#7 integrate .. //depot/projects/ia64/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/ia64/sys/netinet6/ip6_output.c#6 integrate .. //depot/projects/ia64/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/ia64/sys/netinet6/udp6_usrreq.c#11 integrate .. //depot/projects/ia64/sys/netipx/spx_debug.h#3 integrate .. //depot/projects/ia64/sys/netncp/ncp_conn.c#3 integrate .. //depot/projects/ia64/sys/netncp/ncp_lib.h#3 integrate .. //depot/projects/ia64/sys/netsmb/smb_conn.c#4 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/ia64/sys/nfsserver/nfs.h#5 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#6 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/ia64/sys/pc98/conf/gethints.awk#1 branch .. //depot/projects/ia64/sys/pccard/cardinfo.h#4 integrate .. //depot/projects/ia64/sys/pccard/pccard.c#9 integrate .. //depot/projects/ia64/sys/pccard/pcic_pci.c#11 integrate .. //depot/projects/ia64/sys/pccard/pcic_pci.h#4 integrate .. //depot/projects/ia64/sys/pccard/slot.h#5 integrate .. //depot/projects/ia64/sys/pci/agp.c#5 integrate .. //depot/projects/ia64/sys/pci/agp_i810.c#3 integrate .. //depot/projects/ia64/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/ia64/sys/powerpc/include/_stdint.h#1 branch .. //depot/projects/ia64/sys/powerpc/include/ansi.h#9 integrate .. //depot/projects/ia64/sys/powerpc/include/limits.h#3 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#17 integrate .. //depot/projects/ia64/sys/sparc64/include/_stdint.h#1 branch .. //depot/projects/ia64/sys/sparc64/include/ansi.h#9 integrate .. //depot/projects/ia64/sys/sparc64/include/asmacros.h#7 integrate .. //depot/projects/ia64/sys/sparc64/include/cpu.h#3 integrate .. //depot/projects/ia64/sys/sparc64/include/limits.h#3 integrate .. //depot/projects/ia64/sys/sparc64/include/pmap.h#6 integrate .. //depot/projects/ia64/sys/sparc64/include/profile.h#3 integrate .. //depot/projects/ia64/sys/sparc64/include/smp.h#7 integrate .. //depot/projects/ia64/sys/sparc64/include/tlb.h#8 integrate .. //depot/projects/ia64/sys/sparc64/include/tte.h#5 integrate .. //depot/projects/ia64/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/exception.s#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#12 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/locore.s#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_exception.s#5 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#17 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/prof_machdep.c#1 branch .. //depot/projects/ia64/sys/sparc64/sparc64/support.s#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/tsb.c#7 integrate .. //depot/projects/ia64/sys/sys/bus.h#4 integrate .. //depot/projects/ia64/sys/sys/mutex.h#9 integrate .. //depot/projects/ia64/sys/sys/param.h#15 integrate .. //depot/projects/ia64/sys/sys/proc.h#23 integrate .. //depot/projects/ia64/sys/sys/resourcevar.h#4 integrate .. //depot/projects/ia64/sys/sys/socketvar.h#18 integrate .. //depot/projects/ia64/sys/sys/stdint.h#3 integrate .. //depot/projects/ia64/sys/sys/sysctl.h#8 integrate .. //depot/projects/ia64/sys/sys/ucred.h#9 integrate .. //depot/projects/ia64/sys/sys/vnode.h#15 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_readwrite.c#11 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#10 integrate .. //depot/projects/ia64/sys/vm/vm_contig.c#7 integrate .. //depot/projects/ia64/sys/vm/vm_extern.h#10 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#16 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#13 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#10 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#29 integrate .. //depot/projects/ia64/sys/vm/vm_map.h#16 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#17 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#16 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#10 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#13 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#13 integrate .. //depot/projects/ia64/sys/x86_64/include/_stdint.h#1 branch .. //depot/projects/ia64/sys/x86_64/include/ansi.h#2 integrate .. //depot/projects/ia64/sys/x86_64/include/limits.h#2 integrate .. //depot/projects/ia64/tools/regression/usr.bin/make/Makefile#5 integrate .. //depot/projects/ia64/usr.bin/at/at.c#7 integrate .. //depot/projects/ia64/usr.bin/biff/biff.1#5 integrate .. //depot/projects/ia64/usr.bin/biff/biff.c#7 integrate .. //depot/projects/ia64/usr.bin/calendar/Makefile#9 integrate .. //depot/projects/ia64/usr.bin/calendar/calendar.1#5 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.music#3 integrate .. //depot/projects/ia64/usr.bin/calendar/io.c#4 integrate .. //depot/projects/ia64/usr.bin/cap_mkdb/cap_mkdb.c#5 integrate .. //depot/projects/ia64/usr.bin/chat/chat.8#2 integrate .. //depot/projects/ia64/usr.bin/checknr/checknr.c#4 integrate .. //depot/projects/ia64/usr.bin/chkey/chkey.c#4 integrate .. //depot/projects/ia64/usr.bin/cksum/cksum.c#5 integrate .. //depot/projects/ia64/usr.bin/cksum/crc.c#4 integrate .. //depot/projects/ia64/usr.bin/cksum/crc32.c#4 integrate .. //depot/projects/ia64/usr.bin/cksum/print.c#3 integrate .. //depot/projects/ia64/usr.bin/cksum/sum1.c#4 integrate .. //depot/projects/ia64/usr.bin/cksum/sum2.c#4 integrate .. //depot/projects/ia64/usr.bin/cmp/cmp.c#7 integrate .. //depot/projects/ia64/usr.bin/cmp/misc.c#5 integrate .. //depot/projects/ia64/usr.bin/cmp/regular.c#6 integrate .. //depot/projects/ia64/usr.bin/cmp/special.c#5 integrate .. //depot/projects/ia64/usr.bin/colldef/parse.y#5 integrate .. //depot/projects/ia64/usr.bin/colrm/colrm.c#5 integrate .. //depot/projects/ia64/usr.bin/column/column.c#5 integrate .. //depot/projects/ia64/usr.bin/comm/comm.c#7 integrate .. //depot/projects/ia64/usr.bin/compress/compress.c#7 integrate .. //depot/projects/ia64/usr.bin/compress/zopen.c#5 integrate .. //depot/projects/ia64/usr.bin/csplit/csplit.c#5 integrate .. //depot/projects/ia64/usr.bin/ctags/C.c#7 integrate .. //depot/projects/ia64/usr.bin/ctags/ctags.c#7 integrate .. //depot/projects/ia64/usr.bin/ctags/fortran.c#7 integrate .. //depot/projects/ia64/usr.bin/ctags/lisp.c#5 integrate .. //depot/projects/ia64/usr.bin/ctags/print.c#4 integrate .. //depot/projects/ia64/usr.bin/ctags/tree.c#6 integrate .. //depot/projects/ia64/usr.bin/ctags/yacc.c#5 integrate .. //depot/projects/ia64/usr.bin/cut/cut.1#5 integrate .. //depot/projects/ia64/usr.bin/dirname/dirname.c#4 integrate .. //depot/projects/ia64/usr.bin/doscmd/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/du/du.c#6 integrate .. //depot/projects/ia64/usr.bin/fetch/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.c#8 integrate .. //depot/projects/ia64/usr.bin/find/ls.c#6 integrate .. //depot/projects/ia64/usr.bin/finger/finger.1#4 integrate .. //depot/projects/ia64/usr.bin/finger/finger.c#6 integrate .. //depot/projects/ia64/usr.bin/finger/net.c#4 integrate .. //depot/projects/ia64/usr.bin/head/head.c#8 integrate .. //depot/projects/ia64/usr.bin/kdump/Makefile#6 integrate .. //depot/projects/ia64/usr.bin/kdump/kdump.c#3 integrate .. //depot/projects/ia64/usr.bin/last/last.1#4 integrate .. //depot/projects/ia64/usr.bin/locate/locate/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/locate/locate/mklocatedb.sh#3 integrate .. //depot/projects/ia64/usr.bin/lock/lock.1#3 integrate .. //depot/projects/ia64/usr.bin/lock/lock.c#5 integrate .. //depot/projects/ia64/usr.bin/login/login.c#11 integrate .. //depot/projects/ia64/usr.bin/mail/Makefile#5 integrate .. //depot/projects/ia64/usr.bin/make/main.c#8 integrate .. //depot/projects/ia64/usr.bin/make/parse.c#7 integrate .. //depot/projects/ia64/usr.bin/mesg/mesg.1#4 integrate .. //depot/projects/ia64/usr.bin/netstat/atalk.c#2 integrate .. //depot/projects/ia64/usr.bin/netstat/inet.c#4 integrate .. //depot/projects/ia64/usr.bin/netstat/ipx.c#2 integrate .. //depot/projects/ia64/usr.bin/netstat/iso.c#2 integrate .. //depot/projects/ia64/usr.bin/netstat/netgraph.c#2 integrate .. //depot/projects/ia64/usr.bin/netstat/ns.c#2 integrate .. //depot/projects/ia64/usr.bin/netstat/unix.c#2 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_clntout.c#4 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_cout.c#4 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_hout.c#5 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_main.c#4 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_parse.c#4 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_parse.h#3 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_sample.c#4 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_scan.c#4 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_scan.h#3 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_svcout.c#5 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_tblout.c#3 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_util.c#3 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpc_util.h#3 integrate .. //depot/projects/ia64/usr.bin/rpcgen/rpcgen.1#4 integrate .. //depot/projects/ia64/usr.bin/strip/Makefile#5 integrate .. //depot/projects/ia64/usr.bin/systat/netstat.c#4 integrate .. //depot/projects/ia64/usr.bin/touch/touch.c#4 integrate .. //depot/projects/ia64/usr.bin/tr/tr.c#6 integrate .. //depot/projects/ia64/usr.bin/unifdef/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/units/units.c#2 integrate .. //depot/projects/ia64/usr.bin/vi/Makefile#6 integrate .. //depot/projects/ia64/usr.bin/whereis/pathnames.h#2 integrate .. //depot/projects/ia64/usr.bin/whereis/whereis.1#3 integrate .. //depot/projects/ia64/usr.bin/whereis/whereis.c#2 integrate .. //depot/projects/ia64/usr.bin/xinstall/xinstall.c#9 integrate .. //depot/projects/ia64/usr.sbin/apm/apm.c#2 integrate .. //depot/projects/ia64/usr.sbin/arp/arp.c#8 integrate .. //depot/projects/ia64/usr.sbin/config/mkheaders.c#2 integrate .. //depot/projects/ia64/usr.sbin/getextattr/getextattr.c#5 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4b.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4bctl.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4bing.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4bipr.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4bisppp.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4bq921.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4bq931.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4brbch.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4btel.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/i4btrc.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/iavc.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/ifpi.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/ifpi2.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/ifpnp.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/ihfc.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/isic.4#2 integrate .. //depot/projects/ia64/usr.sbin/i4b/man/iwic.4#2 integrate .. //depot/projects/ia64/usr.sbin/inetd/builtins.c#4 integrate .. //depot/projects/ia64/usr.sbin/inetd/inetd.c#6 integrate .. //depot/projects/ia64/usr.sbin/lpr/lpd/lpd.c#5 integrate .. //depot/projects/ia64/usr.sbin/mailwrapper/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/mountd/mountd.c#3 integrate .. //depot/projects/ia64/usr.sbin/ndp/ndp.c#2 integrate .. //depot/projects/ia64/usr.sbin/nfsd/nfsd.c#2 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardd/cardd.c#4 integrate .. //depot/projects/ia64/usr.sbin/pccard/pccardd/cardd.h#3 integrate .. //depot/projects/ia64/usr.sbin/pcvt/keycap/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/rpc.yppasswdd/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/rpcbind/rpcbind.c#4 integrate .. //depot/projects/ia64/usr.sbin/setkey/setkey.8#3 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/disks.c#4 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#14 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#6 integrate .. //depot/projects/ia64/usr.sbin/traceroute/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/ypserv/Makefile#4 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#34 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.295 2002/07/11 16:43:59 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.297 2002/07/24 23:08:57 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -572,21 +572,13 @@ .if exists(${.CURDIR}/games) && !defined(NOGAMES) _strfile= games/fortune/strfile .endif -# This horrible kludge should be deleted in about 2 weeks, say July 9, 2002 -_cxx_version!= ${CXX} -v 2>&1 | awk '$$0 ~ /^gcc version/ {print $$3}' -_cc_version!= ${CC} -v 2>&1 | awk '$$0 ~ /^gcc version/ {print $$3}' -.if ${CXX:T} != "c++" || \ - (${_cxx_version} == ${_cc_version} && ${_cxx_version} != "3.1") || \ - exists(/usr/lib/libstdc++.so.4) -_cxx_consumers= gnu/usr.bin/gperf gnu/usr.bin/groff -.endif bootstrap-tools: .for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef \ usr.bin/makewhatis usr.bin/rpcgen usr.bin/uudecode \ usr.bin/xargs usr.bin/xinstall \ usr.sbin/config usr.sbin/kbdcontrol \ - ${_cxx_consumers} gnu/usr.bin/texinfo + gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ${MAKE} DIRPRFX=${_tool}/ depend; \ ==== //depot/projects/ia64/README#3 (text+ko) ==== @@ -1,6 +1,6 @@ This is the top level of the FreeBSD source directory. This file was last revised on: -$FreeBSD: src/README,v 1.20 2002/03/26 12:35:49 ru Exp $ +$FreeBSD: src/README,v 1.21 2002/07/21 16:45:30 wosch Exp $ For copyright information, please see the file COPYRIGHT in this directory (additional copyright information also exists for some @@ -19,7 +19,7 @@ Building a kernel is a somewhat more involved process, documentation for which can be found at: - http://www.FreeBSD.org/handbook/kernelconfig.html + http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html And in the config(8) man page. Note: If you want to build and install the kernel with the ``buildkernel'' and ``installkernel'' targets, you might need to build @@ -79,4 +79,4 @@ For information on synchronizing your source tree with one or more of the FreeBSD Project's development branches, please see: - http://www.FreeBSD.org/handbook/synching.html + http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/synching.html ==== //depot/projects/ia64/UPDATING#16 (text+ko) ==== @@ -22,6 +22,12 @@ integrity. Re-enabling write caching can substantially improve performance. +20020729: + COPY is being deprecated. The 20010530 change was reverted, as + it causes far more pain than was expected, and to always compare + before installing, please use INSTALL="install -C" again. The + -C option is now silently ignored when used with the -d option. + 20020702: Problems with libc_r clients like KDE and GNOME have been resolved. There are still some minor problems with some signals but the @@ -1051,4 +1057,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.213 2002/07/03 04:23:38 julian Exp $ +$FreeBSD: src/UPDATING,v 1.214 2002/07/29 08:51:03 ru Exp $ ==== //depot/projects/ia64/bin/cp/cp.1#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.22 2001/08/15 09:09:34 ru Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.23 2002/07/23 00:42:56 johan Exp $ .\" .Dd April 18, 1994 .Dt CP 1 @@ -47,7 +47,7 @@ .Fl R .Op Fl H | Fl L | Fl P .Oc -.Op Fl f | i +.Op Fl f | i | n .Op Fl pv .Ar source_file target_file .Nm @@ -55,7 +55,7 @@ .Fl R .Op Fl H | Fl L | Fl P .Oc -.Op Fl f | i +.Op Fl f | i | n .Op Fl pv .Ar source_file ... target_directory .Sh DESCRIPTION @@ -121,6 +121,8 @@ .Fl f option overrides any previous .Fl i +or +.Fl n options.) .It Fl i Cause @@ -136,7 +138,18 @@ .Fl i option overrides any previous .Fl f +or +.Fl n options.) +.It Fl n +Do not overwriting an existing file. +(The +.Fl n +option overrides any previous +.Fl f +or +.Fl i +options.) .It Fl p Cause .Nm @@ -226,7 +239,9 @@ .Pp The .Fl v -option is non-standard and its use in scripts is not recommended. +and +.Fl n +options are non-standard and their use in scripts is not recommended. .Sh SEE ALSO .Xr mv 1 , .Xr rcp 1 , ==== //depot/projects/ia64/bin/cp/cp.c#8 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.39 2002/07/10 20:44:55 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.40 2002/07/23 00:42:56 johan Exp $"); /* * Cp copies source files to target files. @@ -86,8 +86,8 @@ PATH_T to = { to.p_path, emptystring, "" }; -int iflag, pflag, fflag; -static int Rflag, rflag, vflag; +int fflag, iflag, nflag, pflag, vflag; +static int Rflag, rflag; enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE }; @@ -103,7 +103,7 @@ char *target; Hflag = Lflag = Pflag = 0; - while ((ch = getopt(argc, argv, "HLPRfiprv")) != -1) + while ((ch = getopt(argc, argv, "HLPRfinprv")) != -1) switch (ch) { case 'H': Hflag = 1; @@ -122,11 +122,15 @@ break; case 'f': fflag = 1; - iflag = 0; + iflag = nflag = 0; break; case 'i': iflag = 1; - fflag = 0; + fflag = nflag = 0; + break; + case 'n': + nflag = 1; + fflag = iflag = 0; break; case 'p': pflag = 1; ==== //depot/projects/ia64/bin/cp/extern.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/1/94 - * $FreeBSD: src/bin/cp/extern.h,v 1.14 2002/02/23 17:05:32 bde Exp $ + * $FreeBSD: src/bin/cp/extern.h,v 1.15 2002/07/23 00:42:56 johan Exp $ */ typedef struct { @@ -41,7 +41,7 @@ } PATH_T; extern PATH_T to; -extern int fflag, iflag, pflag; +extern int fflag, iflag, nflag, pflag, vflag; __BEGIN_DECLS int copy_fifo(struct stat *, int); ==== //depot/projects/ia64/bin/cp/utils.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.36 2002/07/03 16:35:20 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.37 2002/07/23 00:42:56 johan Exp $"); #include #include @@ -87,7 +87,11 @@ */ if (!dne) { #define YESNO "(y/n [n]) " - if (iflag) { + if (nflag) { + if (vflag) + printf("%s not overwritten\n", to.p_path); + return (0); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 16:55:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BCFD37B401; Mon, 29 Jul 2002 16:55:25 -0700 (PDT) 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 626CC37B400 for ; Mon, 29 Jul 2002 16:55:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B23F043E5E for ; Mon, 29 Jul 2002 16:54:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6TNsIJU005456 for ; Mon, 29 Jul 2002 16:54:18 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6TNsI0c005453 for perforce@freebsd.org; Mon, 29 Jul 2002 16:54:18 -0700 (PDT) Date: Mon, 29 Jul 2002 16:54:18 -0700 (PDT) Message-Id: <200207292354.g6TNsI0c005453@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15152 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15152 Change 15152 by peter@peter_mckinley on 2002/07/29 16:53:35 Attack the kstack problem with a sledge hammer. This isn't pretty folks. Affected files ... .. //depot/projects/ia64/sys/kern/kern_thread.c#5 edit Differences ... ==== //depot/projects/ia64/sys/kern/kern_thread.c#5 (text+ko) ==== @@ -198,7 +198,10 @@ thread_zone = uma_zcreate("THREAD", sizeof (struct thread), thread_ctor, thread_dtor, thread_init, thread_fini, - UMA_ALIGN_CACHE, 0); + UMA_ALIGN_CACHE, UMA_ZONE_NOFREE); +#ifdef __ia64__ + uma_prealloc(thread_zone, 512); +#endif } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 17:45:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5DE5237B401; Mon, 29 Jul 2002 17:43:43 -0700 (PDT) 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 C229F37B400 for ; Mon, 29 Jul 2002 17:43:42 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81A9543E5E for ; Mon, 29 Jul 2002 17:43:41 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6U0hfJU016405 for ; Mon, 29 Jul 2002 17:43:41 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6U0hSjZ016377 for perforce@freebsd.org; Mon, 29 Jul 2002 17:43:28 -0700 (PDT) Date: Mon, 29 Jul 2002 17:43:28 -0700 (PDT) Message-Id: <200207300043.g6U0hSjZ016377@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 15154 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15154 Change 15154 by mini@freefall on 2002/07/29 17:42:52 IFC, and also bring in libc_r, libc, and headers. Affected files ... .. //depot/projects/kse/bin/ps/Makefile#6 integrate .. //depot/projects/kse/bin/ps/fmt.c#7 integrate .. //depot/projects/kse/bin/ps/keyword.c#8 integrate .. //depot/projects/kse/bin/ps/lomac.c#5 integrate .. //depot/projects/kse/bin/ps/nlist.c#4 integrate .. //depot/projects/kse/bin/ps/print.c#12 integrate .. //depot/projects/kse/bin/ps/ps.c#11 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb-x86_64.h#1 branch .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/i386/version.c#3 delete .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#2 integrate .. //depot/projects/kse/include/Makefile#1 branch .. //depot/projects/kse/include/a.out.h#1 branch .. //depot/projects/kse/include/ar.h#1 branch .. //depot/projects/kse/include/arpa/Makefile#1 branch .. //depot/projects/kse/include/arpa/ftp.h#1 branch .. //depot/projects/kse/include/arpa/inet.h#1 branch .. //depot/projects/kse/include/arpa/nameser.h#1 branch .. //depot/projects/kse/include/arpa/nameser_compat.h#1 branch .. //depot/projects/kse/include/arpa/telnet.h#1 branch .. //depot/projects/kse/include/arpa/tftp.h#1 branch .. //depot/projects/kse/include/assert.h#1 branch .. //depot/projects/kse/include/bitstring.h#1 branch .. //depot/projects/kse/include/complex.h#1 branch .. //depot/projects/kse/include/ctype.h#1 branch .. //depot/projects/kse/include/db.h#1 branch .. //depot/projects/kse/include/dirent.h#1 branch .. //depot/projects/kse/include/dlfcn.h#1 branch .. //depot/projects/kse/include/elf-hints.h#1 branch .. //depot/projects/kse/include/elf.h#1 branch .. //depot/projects/kse/include/err.h#1 branch .. //depot/projects/kse/include/fnmatch.h#1 branch .. //depot/projects/kse/include/fstab.h#1 branch .. //depot/projects/kse/include/fts.h#1 branch .. //depot/projects/kse/include/glob.h#1 branch .. //depot/projects/kse/include/grp.h#1 branch .. //depot/projects/kse/include/hesiod.h#1 branch .. //depot/projects/kse/include/histedit.h#1 branch .. //depot/projects/kse/include/ieeefp.h#1 branch .. //depot/projects/kse/include/ifaddrs.h#1 branch .. //depot/projects/kse/include/inttypes.h#1 branch .. //depot/projects/kse/include/iso646.h#1 branch .. //depot/projects/kse/include/kenv.h#1 branch .. //depot/projects/kse/include/langinfo.h#1 branch .. //depot/projects/kse/include/libgen.h#1 branch .. //depot/projects/kse/include/limits.h#1 branch .. //depot/projects/kse/include/link.h#1 branch .. //depot/projects/kse/include/locale.h#1 branch .. //depot/projects/kse/include/malloc.h#1 branch .. //depot/projects/kse/include/math.h#1 branch .. //depot/projects/kse/include/memory.h#1 branch .. //depot/projects/kse/include/monetary.h#1 branch .. //depot/projects/kse/include/mpool.h#1 branch .. //depot/projects/kse/include/ndbm.h#1 branch .. //depot/projects/kse/include/netconfig.h#1 branch .. //depot/projects/kse/include/netdb.h#1 branch .. //depot/projects/kse/include/nl_types.h#1 branch .. //depot/projects/kse/include/nlist.h#1 branch .. //depot/projects/kse/include/nsswitch.h#1 branch .. //depot/projects/kse/include/objformat.h#1 branch .. //depot/projects/kse/include/paths.h#1 branch .. //depot/projects/kse/include/protocols/Makefile#1 branch .. //depot/projects/kse/include/protocols/dumprestore.h#1 branch .. //depot/projects/kse/include/protocols/routed.h#1 branch .. //depot/projects/kse/include/protocols/rwhod.h#1 branch .. //depot/projects/kse/include/protocols/talkd.h#1 branch .. //depot/projects/kse/include/protocols/timed.h#1 branch .. //depot/projects/kse/include/pthread.h#1 branch .. //depot/projects/kse/include/pthread_np.h#1 branch .. //depot/projects/kse/include/pwd.h#1 branch .. //depot/projects/kse/include/ranlib.h#1 branch .. //depot/projects/kse/include/readpassphrase.h#1 branch .. //depot/projects/kse/include/regex.h#1 branch .. //depot/projects/kse/include/regexp.h#1 branch .. //depot/projects/kse/include/resolv.h#1 branch .. //depot/projects/kse/include/rpc/Makefile#1 branch .. //depot/projects/kse/include/rpc/auth.h#1 branch .. //depot/projects/kse/include/rpc/auth_des.h#1 branch .. //depot/projects/kse/include/rpc/auth_kerb.h#1 branch .. //depot/projects/kse/include/rpc/auth_unix.h#1 branch .. //depot/projects/kse/include/rpc/clnt.h#1 branch .. //depot/projects/kse/include/rpc/clnt_soc.h#1 branch .. //depot/projects/kse/include/rpc/clnt_stat.h#1 branch .. //depot/projects/kse/include/rpc/des.h#1 branch .. //depot/projects/kse/include/rpc/des_crypt.h#1 branch .. //depot/projects/kse/include/rpc/nettype.h#1 branch .. //depot/projects/kse/include/rpc/pmap_clnt.h#1 branch .. //depot/projects/kse/include/rpc/pmap_prot.h#1 branch .. //depot/projects/kse/include/rpc/pmap_rmt.h#1 branch .. //depot/projects/kse/include/rpc/raw.h#1 branch .. //depot/projects/kse/include/rpc/rpc.h#1 branch .. //depot/projects/kse/include/rpc/rpc_com.h#1 branch .. //depot/projects/kse/include/rpc/rpc_msg.h#1 branch .. //depot/projects/kse/include/rpc/rpcb_clnt.h#1 branch .. //depot/projects/kse/include/rpc/rpcb_prot.x#1 branch .. //depot/projects/kse/include/rpc/rpcent.h#1 branch .. //depot/projects/kse/include/rpc/svc.h#1 branch .. //depot/projects/kse/include/rpc/svc_auth.h#1 branch .. //depot/projects/kse/include/rpc/svc_dg.h#1 branch .. //depot/projects/kse/include/rpc/svc_soc.h#1 branch .. //depot/projects/kse/include/rpc/types.h#1 branch .. //depot/projects/kse/include/rpc/xdr.h#1 branch .. //depot/projects/kse/include/rpcsvc/Makefile#1 branch .. //depot/projects/kse/include/rpcsvc/bootparam_prot.x#1 branch .. //depot/projects/kse/include/rpcsvc/crypt.x#1 branch .. //depot/projects/kse/include/rpcsvc/key_prot.x#1 branch .. //depot/projects/kse/include/rpcsvc/klm_prot.x#1 branch .. //depot/projects/kse/include/rpcsvc/mount.x#1 branch .. //depot/projects/kse/include/rpcsvc/nfs_prot.x#1 branch .. //depot/projects/kse/include/rpcsvc/nis.x#1 branch .. //depot/projects/kse/include/rpcsvc/nis_cache.x#1 branch .. //depot/projects/kse/include/rpcsvc/nis_callback.x#1 branch .. //depot/projects/kse/include/rpcsvc/nis_db.h#1 branch .. //depot/projects/kse/include/rpcsvc/nis_object.x#1 branch .. //depot/projects/kse/include/rpcsvc/nis_tags.h#1 branch .. //depot/projects/kse/include/rpcsvc/nislib.h#1 branch .. //depot/projects/kse/include/rpcsvc/nlm_prot.x#1 branch .. //depot/projects/kse/include/rpcsvc/pmap_prot.x#1 branch .. //depot/projects/kse/include/rpcsvc/rex.x#1 branch .. //depot/projects/kse/include/rpcsvc/rnusers.x#1 branch .. //depot/projects/kse/include/rpcsvc/rquota.x#1 branch .. //depot/projects/kse/include/rpcsvc/rstat.x#1 branch .. //depot/projects/kse/include/rpcsvc/rwall.x#1 branch .. //depot/projects/kse/include/rpcsvc/sm_inter.x#1 branch .. //depot/projects/kse/include/rpcsvc/spray.x#1 branch .. //depot/projects/kse/include/rpcsvc/yp.x#1 branch .. //depot/projects/kse/include/rpcsvc/yp_prot.h#1 branch .. //depot/projects/kse/include/rpcsvc/ypclnt.h#1 branch .. //depot/projects/kse/include/rpcsvc/yppasswd.x#1 branch .. //depot/projects/kse/include/rpcsvc/ypupdate_prot.x#1 branch .. //depot/projects/kse/include/rpcsvc/ypxfrd.x#1 branch .. //depot/projects/kse/include/rune.h#1 branch .. //depot/projects/kse/include/runetype.h#1 branch .. //depot/projects/kse/include/search.h#1 branch .. //depot/projects/kse/include/setjmp.h#1 branch .. //depot/projects/kse/include/sgtty.h#1 branch .. //depot/projects/kse/include/signal.h#1 branch .. //depot/projects/kse/include/stab.h#1 branch .. //depot/projects/kse/include/stdbool.h#1 branch .. //depot/projects/kse/include/stddef.h#1 branch .. //depot/projects/kse/include/stdio.h#1 branch .. //depot/projects/kse/include/stdlib.h#1 branch .. //depot/projects/kse/include/strhash.h#1 branch .. //depot/projects/kse/include/string.h#1 branch .. //depot/projects/kse/include/stringlist.h#1 branch .. //depot/projects/kse/include/strings.h#1 branch .. //depot/projects/kse/include/sysexits.h#1 branch .. //depot/projects/kse/include/tar.h#1 branch .. //depot/projects/kse/include/time.h#1 branch .. //depot/projects/kse/include/timeconv.h#1 branch .. //depot/projects/kse/include/timers.h#1 branch .. //depot/projects/kse/include/ttyent.h#1 branch .. //depot/projects/kse/include/unistd.h#1 branch .. //depot/projects/kse/include/utime.h#1 branch .. //depot/projects/kse/include/utmp.h#1 branch .. //depot/projects/kse/include/vis.h#1 branch .. //depot/projects/kse/include/wchar.h#1 branch .. //depot/projects/kse/include/wctype.h#1 branch .. //depot/projects/kse/lib/libc/Makefile#1 branch .. //depot/projects/kse/lib/libc/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/alpha/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/alpha/SYS.h#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/_ctx_start.S#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/_setjmp.S#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/divrem.m4#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/fabs.S#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/flt_rounds.c#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/fpgetmask.c#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/fpgetround.c#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/fpgetsticky.c#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/fpsetmask.c#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/fpsetround.c#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/fpsetsticky.c#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/frexp.c#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/getcontext.S#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/infinity.c#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/isinf.c#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/ldexp.c#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/makecontext.c#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/modf.c#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/rfork_thread.S#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/setjmp.S#1 branch .. //depot/projects/kse/lib/libc/alpha/gen/sigsetjmp.S#1 branch .. //depot/projects/kse/lib/libc/alpha/net/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/alpha/net/byte_swap_2.S#1 branch .. //depot/projects/kse/lib/libc/alpha/net/byte_swap_4.S#1 branch .. //depot/projects/kse/lib/libc/alpha/net/htonl.S#1 branch .. //depot/projects/kse/lib/libc/alpha/net/htons.S#1 branch .. //depot/projects/kse/lib/libc/alpha/net/ntohl.S#1 branch .. //depot/projects/kse/lib/libc/alpha/net/ntohs.S#1 branch .. //depot/projects/kse/lib/libc/alpha/stdlib/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/alpha/string/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/alpha/string/bcopy.S#1 branch .. //depot/projects/kse/lib/libc/alpha/string/bzero.S#1 branch .. //depot/projects/kse/lib/libc/alpha/string/ffs.S#1 branch .. //depot/projects/kse/lib/libc/alpha/string/memcpy.S#1 branch .. //depot/projects/kse/lib/libc/alpha/string/memmove.S#1 branch .. //depot/projects/kse/lib/libc/alpha/sys/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/alpha/sys/Ovfork.S#1 branch .. //depot/projects/kse/lib/libc/alpha/sys/brk.S#1 branch .. //depot/projects/kse/lib/libc/alpha/sys/cerror.S#1 branch .. //depot/projects/kse/lib/libc/alpha/sys/exect.S#1 branch .. //depot/projects/kse/lib/libc/alpha/sys/fork.S#1 branch .. //depot/projects/kse/lib/libc/alpha/sys/pipe.S#1 branch .. //depot/projects/kse/lib/libc/alpha/sys/ptrace.S#1 branch .. //depot/projects/kse/lib/libc/alpha/sys/sbrk.S#1 branch .. //depot/projects/kse/lib/libc/alpha/sys/setlogin.S#1 branch .. //depot/projects/kse/lib/libc/alpha/sys/sigreturn.S#1 branch .. //depot/projects/kse/lib/libc/compat-43/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/compat-43/creat.2#1 branch .. //depot/projects/kse/lib/libc/compat-43/creat.c#1 branch .. //depot/projects/kse/lib/libc/compat-43/gethostid.3#1 branch .. //depot/projects/kse/lib/libc/compat-43/gethostid.c#1 branch .. //depot/projects/kse/lib/libc/compat-43/getwd.c#1 branch .. //depot/projects/kse/lib/libc/compat-43/killpg.2#1 branch .. //depot/projects/kse/lib/libc/compat-43/killpg.c#1 branch .. //depot/projects/kse/lib/libc/compat-43/sethostid.c#1 branch .. //depot/projects/kse/lib/libc/compat-43/setpgrp.c#1 branch .. //depot/projects/kse/lib/libc/compat-43/setrgid.c#1 branch .. //depot/projects/kse/lib/libc/compat-43/setruid.3#1 branch .. //depot/projects/kse/lib/libc/compat-43/setruid.c#1 branch .. //depot/projects/kse/lib/libc/compat-43/sigcompat.c#1 branch .. //depot/projects/kse/lib/libc/compat-43/sigpause.2#1 branch .. //depot/projects/kse/lib/libc/compat-43/sigsetmask.2#1 branch .. //depot/projects/kse/lib/libc/compat-43/sigvec.2#1 branch .. //depot/projects/kse/lib/libc/db/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/db/README#1 branch .. //depot/projects/kse/lib/libc/db/btree/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/db/btree/bt_close.c#1 branch .. //depot/projects/kse/lib/libc/db/btree/bt_conv.c#1 branch .. //depot/projects/kse/lib/libc/db/btree/bt_debug.c#1 branch .. //depot/projects/kse/lib/libc/db/btree/bt_delete.c#1 branch .. //depot/projects/kse/lib/libc/db/btree/bt_get.c#1 branch .. //depot/projects/kse/lib/libc/db/btree/bt_open.c#1 branch .. //depot/projects/kse/lib/libc/db/btree/bt_overflow.c#1 branch .. //depot/projects/kse/lib/libc/db/btree/bt_page.c#1 branch .. //depot/projects/kse/lib/libc/db/btree/bt_put.c#1 branch .. //depot/projects/kse/lib/libc/db/btree/bt_search.c#1 branch .. //depot/projects/kse/lib/libc/db/btree/bt_seq.c#1 branch .. //depot/projects/kse/lib/libc/db/btree/bt_split.c#1 branch .. //depot/projects/kse/lib/libc/db/btree/bt_utils.c#1 branch .. //depot/projects/kse/lib/libc/db/btree/btree.h#1 branch .. //depot/projects/kse/lib/libc/db/btree/extern.h#1 branch .. //depot/projects/kse/lib/libc/db/changelog#1 branch .. //depot/projects/kse/lib/libc/db/db/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/db/db/db.c#1 branch .. //depot/projects/kse/lib/libc/db/docs/hash.usenix.ps#1 branch .. //depot/projects/kse/lib/libc/db/docs/libtp.usenix.ps#1 branch .. //depot/projects/kse/lib/libc/db/hash/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/db/hash/README#1 branch .. //depot/projects/kse/lib/libc/db/hash/extern.h#1 branch .. //depot/projects/kse/lib/libc/db/hash/hash.c#1 branch .. //depot/projects/kse/lib/libc/db/hash/hash.h#1 branch .. //depot/projects/kse/lib/libc/db/hash/hash_bigkey.c#1 branch .. //depot/projects/kse/lib/libc/db/hash/hash_buf.c#1 branch .. //depot/projects/kse/lib/libc/db/hash/hash_func.c#1 branch .. //depot/projects/kse/lib/libc/db/hash/hash_log2.c#1 branch .. //depot/projects/kse/lib/libc/db/hash/hash_page.c#1 branch .. //depot/projects/kse/lib/libc/db/hash/ndbm.c#1 branch .. //depot/projects/kse/lib/libc/db/hash/page.h#1 branch .. //depot/projects/kse/lib/libc/db/man/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/db/man/btree.3#1 branch .. //depot/projects/kse/lib/libc/db/man/dbm.3#1 branch .. //depot/projects/kse/lib/libc/db/man/dbopen.3#1 branch .. //depot/projects/kse/lib/libc/db/man/hash.3#1 branch .. //depot/projects/kse/lib/libc/db/man/mpool.3#1 branch .. //depot/projects/kse/lib/libc/db/man/recno.3#1 branch .. //depot/projects/kse/lib/libc/db/mpool/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/db/mpool/README#1 branch .. //depot/projects/kse/lib/libc/db/mpool/mpool.c#1 branch .. //depot/projects/kse/lib/libc/db/mpool/mpool.libtp#1 branch .. //depot/projects/kse/lib/libc/db/recno/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/db/recno/extern.h#1 branch .. //depot/projects/kse/lib/libc/db/recno/rec_close.c#1 branch .. //depot/projects/kse/lib/libc/db/recno/rec_delete.c#1 branch .. //depot/projects/kse/lib/libc/db/recno/rec_get.c#1 branch .. //depot/projects/kse/lib/libc/db/recno/rec_open.c#1 branch .. //depot/projects/kse/lib/libc/db/recno/rec_put.c#1 branch .. //depot/projects/kse/lib/libc/db/recno/rec_search.c#1 branch .. //depot/projects/kse/lib/libc/db/recno/rec_seq.c#1 branch .. //depot/projects/kse/lib/libc/db/recno/rec_utils.c#1 branch .. //depot/projects/kse/lib/libc/db/recno/recno.h#1 branch .. //depot/projects/kse/lib/libc/db/test/Makefile#1 branch .. //depot/projects/kse/lib/libc/db/test/README#1 branch .. //depot/projects/kse/lib/libc/db/test/btree.tests/main.c#1 branch .. //depot/projects/kse/lib/libc/db/test/dbtest.c#1 branch .. //depot/projects/kse/lib/libc/db/test/hash.tests/driver2.c#1 branch .. //depot/projects/kse/lib/libc/db/test/hash.tests/makedb.sh#1 branch .. //depot/projects/kse/lib/libc/db/test/hash.tests/tcreat3.c#1 branch .. //depot/projects/kse/lib/libc/db/test/hash.tests/tdel.c#1 branch .. //depot/projects/kse/lib/libc/db/test/hash.tests/testit#1 branch .. //depot/projects/kse/lib/libc/db/test/hash.tests/thash4.c#1 branch .. //depot/projects/kse/lib/libc/db/test/hash.tests/tread2.c#1 branch .. //depot/projects/kse/lib/libc/db/test/hash.tests/tseq.c#1 branch .. //depot/projects/kse/lib/libc/db/test/hash.tests/tverify.c#1 branch .. //depot/projects/kse/lib/libc/db/test/run.test#1 branch .. //depot/projects/kse/lib/libc/gen/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/gen/__xuname.c#1 branch .. //depot/projects/kse/lib/libc/gen/_pthread_stubs.c#1 branch .. //depot/projects/kse/lib/libc/gen/_rand48.c#1 branch .. //depot/projects/kse/lib/libc/gen/_spinlock_stub.c#1 branch .. //depot/projects/kse/lib/libc/gen/_thread_init.c#1 branch .. //depot/projects/kse/lib/libc/gen/alarm.3#1 branch .. //depot/projects/kse/lib/libc/gen/alarm.c#1 branch .. //depot/projects/kse/lib/libc/gen/arc4random.3#1 branch .. //depot/projects/kse/lib/libc/gen/arc4random.c#1 branch .. //depot/projects/kse/lib/libc/gen/assert.c#1 branch .. //depot/projects/kse/lib/libc/gen/basename.3#1 branch .. //depot/projects/kse/lib/libc/gen/basename.c#1 branch .. //depot/projects/kse/lib/libc/gen/clock.3#1 branch .. //depot/projects/kse/lib/libc/gen/clock.c#1 branch .. //depot/projects/kse/lib/libc/gen/closedir.c#1 branch .. //depot/projects/kse/lib/libc/gen/confstr.3#1 branch .. //depot/projects/kse/lib/libc/gen/confstr.c#1 branch .. //depot/projects/kse/lib/libc/gen/crypt.c#1 branch .. //depot/projects/kse/lib/libc/gen/ctermid.3#1 branch .. //depot/projects/kse/lib/libc/gen/ctermid.c#1 branch .. //depot/projects/kse/lib/libc/gen/daemon.3#1 branch .. //depot/projects/kse/lib/libc/gen/daemon.c#1 branch .. //depot/projects/kse/lib/libc/gen/devname.3#1 branch .. //depot/projects/kse/lib/libc/gen/devname.c#1 branch .. //depot/projects/kse/lib/libc/gen/directory.3#1 branch .. //depot/projects/kse/lib/libc/gen/dirname.3#1 branch .. //depot/projects/kse/lib/libc/gen/dirname.c#1 branch .. //depot/projects/kse/lib/libc/gen/disklabel.c#1 branch .. //depot/projects/kse/lib/libc/gen/dladdr.3#1 branch .. //depot/projects/kse/lib/libc/gen/dlfcn.c#1 branch .. //depot/projects/kse/lib/libc/gen/dlfunc.c#1 branch .. //depot/projects/kse/lib/libc/gen/dllockinit.3#1 branch .. //depot/projects/kse/lib/libc/gen/dlopen.3#1 branch .. //depot/projects/kse/lib/libc/gen/drand48.c#1 branch .. //depot/projects/kse/lib/libc/gen/erand48.c#1 branch .. //depot/projects/kse/lib/libc/gen/err.3#1 branch .. //depot/projects/kse/lib/libc/gen/err.c#1 branch .. //depot/projects/kse/lib/libc/gen/errlst.c#1 branch .. //depot/projects/kse/lib/libc/gen/exec.3#1 branch .. //depot/projects/kse/lib/libc/gen/exec.c#1 branch .. //depot/projects/kse/lib/libc/gen/fmtcheck.3#1 branch .. //depot/projects/kse/lib/libc/gen/fmtcheck.c#1 branch .. //depot/projects/kse/lib/libc/gen/fnmatch.3#1 branch .. //depot/projects/kse/lib/libc/gen/fnmatch.c#1 branch .. //depot/projects/kse/lib/libc/gen/frexp.3#1 branch .. //depot/projects/kse/lib/libc/gen/fstab.c#1 branch .. //depot/projects/kse/lib/libc/gen/ftok.3#1 branch .. //depot/projects/kse/lib/libc/gen/ftok.c#1 branch .. //depot/projects/kse/lib/libc/gen/fts.3#1 branch .. //depot/projects/kse/lib/libc/gen/fts.c#1 branch .. //depot/projects/kse/lib/libc/gen/getbootfile.3#1 branch .. //depot/projects/kse/lib/libc/gen/getbootfile.c#1 branch .. //depot/projects/kse/lib/libc/gen/getbsize.3#1 branch .. //depot/projects/kse/lib/libc/gen/getbsize.c#1 branch .. //depot/projects/kse/lib/libc/gen/getcap.3#1 branch .. //depot/projects/kse/lib/libc/gen/getcap.c#1 branch .. //depot/projects/kse/lib/libc/gen/getcwd.3#1 branch .. //depot/projects/kse/lib/libc/gen/getcwd.c#1 branch .. //depot/projects/kse/lib/libc/gen/getdiskbyname.3#1 branch .. //depot/projects/kse/lib/libc/gen/getdomainname.3#1 branch .. //depot/projects/kse/lib/libc/gen/getdomainname.c#1 branch .. //depot/projects/kse/lib/libc/gen/getfsent.3#1 branch .. //depot/projects/kse/lib/libc/gen/getgrent.3#1 branch .. //depot/projects/kse/lib/libc/gen/getgrent.c#1 branch .. //depot/projects/kse/lib/libc/gen/getgrouplist.3#1 branch .. //depot/projects/kse/lib/libc/gen/getgrouplist.c#1 branch .. //depot/projects/kse/lib/libc/gen/gethostname.3#1 branch .. //depot/projects/kse/lib/libc/gen/gethostname.c#1 branch .. //depot/projects/kse/lib/libc/gen/getloadavg.3#1 branch .. //depot/projects/kse/lib/libc/gen/getloadavg.c#1 branch .. //depot/projects/kse/lib/libc/gen/getlogin.c#1 branch .. //depot/projects/kse/lib/libc/gen/getmntinfo.3#1 branch .. //depot/projects/kse/lib/libc/gen/getmntinfo.c#1 branch .. //depot/projects/kse/lib/libc/gen/getnetgrent.3#1 branch .. //depot/projects/kse/lib/libc/gen/getnetgrent.c#1 branch .. //depot/projects/kse/lib/libc/gen/getobjformat.3#1 branch .. //depot/projects/kse/lib/libc/gen/getobjformat.c#1 branch .. //depot/projects/kse/lib/libc/gen/getosreldate.c#1 branch .. //depot/projects/kse/lib/libc/gen/getpagesize.3#1 branch .. //depot/projects/kse/lib/libc/gen/getpagesize.c#1 branch .. //depot/projects/kse/lib/libc/gen/getpass.3#1 branch .. //depot/projects/kse/lib/libc/gen/getpeereid.3#1 branch .. //depot/projects/kse/lib/libc/gen/getpeereid.c#1 branch .. //depot/projects/kse/lib/libc/gen/getprogname.3#1 branch .. //depot/projects/kse/lib/libc/gen/getprogname.c#1 branch .. //depot/projects/kse/lib/libc/gen/getpwent.3#1 branch .. //depot/projects/kse/lib/libc/gen/getpwent.c#1 branch .. //depot/projects/kse/lib/libc/gen/getttyent.3#1 branch .. //depot/projects/kse/lib/libc/gen/getttyent.c#1 branch .. //depot/projects/kse/lib/libc/gen/getusershell.3#1 branch .. //depot/projects/kse/lib/libc/gen/getusershell.c#1 branch .. //depot/projects/kse/lib/libc/gen/getvfsbyname.3#1 branch .. //depot/projects/kse/lib/libc/gen/getvfsbyname.c#1 branch .. //depot/projects/kse/lib/libc/gen/getvfsent.3#1 branch .. //depot/projects/kse/lib/libc/gen/getvfsent.c#1 branch .. //depot/projects/kse/lib/libc/gen/glob.3#1 branch .. //depot/projects/kse/lib/libc/gen/glob.c#1 branch .. //depot/projects/kse/lib/libc/gen/initgroups.3#1 branch .. //depot/projects/kse/lib/libc/gen/initgroups.c#1 branch .. //depot/projects/kse/lib/libc/gen/isatty.c#1 branch .. //depot/projects/kse/lib/libc/gen/isinf.3#1 branch .. //depot/projects/kse/lib/libc/gen/jrand48.c#1 branch .. //depot/projects/kse/lib/libc/gen/lcong48.c#1 branch .. //depot/projects/kse/lib/libc/gen/ldexp.3#1 branch .. //depot/projects/kse/lib/libc/gen/lockf.3#1 branch .. //depot/projects/kse/lib/libc/gen/lockf.c#1 branch .. //depot/projects/kse/lib/libc/gen/lrand48.c#1 branch .. //depot/projects/kse/lib/libc/gen/modf.3#1 branch .. //depot/projects/kse/lib/libc/gen/mrand48.c#1 branch .. //depot/projects/kse/lib/libc/gen/msgctl.3#1 branch .. //depot/projects/kse/lib/libc/gen/msgget.3#1 branch .. //depot/projects/kse/lib/libc/gen/msgrcv.3#1 branch .. //depot/projects/kse/lib/libc/gen/msgsnd.3#1 branch .. //depot/projects/kse/lib/libc/gen/nice.3#1 branch .. //depot/projects/kse/lib/libc/gen/nice.c#1 branch .. //depot/projects/kse/lib/libc/gen/nlist.3#1 branch .. //depot/projects/kse/lib/libc/gen/nlist.c#1 branch .. //depot/projects/kse/lib/libc/gen/nrand48.c#1 branch .. //depot/projects/kse/lib/libc/gen/ntp_gettime.c#1 branch .. //depot/projects/kse/lib/libc/gen/opendir.c#1 branch .. //depot/projects/kse/lib/libc/gen/pause.3#1 branch .. //depot/projects/kse/lib/libc/gen/pause.c#1 branch .. //depot/projects/kse/lib/libc/gen/pmadvise.c#1 branch .. //depot/projects/kse/lib/libc/gen/popen.3#1 branch .. //depot/projects/kse/lib/libc/gen/popen.c#1 branch .. //depot/projects/kse/lib/libc/gen/posixshm.c#1 branch .. //depot/projects/kse/lib/libc/gen/pselect.3#1 branch .. //depot/projects/kse/lib/libc/gen/pselect.c#1 branch .. //depot/projects/kse/lib/libc/gen/psignal.3#1 branch .. //depot/projects/kse/lib/libc/gen/psignal.c#1 branch .. //depot/projects/kse/lib/libc/gen/pw_scan.c#1 branch .. //depot/projects/kse/lib/libc/gen/pw_scan.h#1 branch .. //depot/projects/kse/lib/libc/gen/pwcache.3#1 branch .. //depot/projects/kse/lib/libc/gen/pwcache.c#1 branch .. //depot/projects/kse/lib/libc/gen/raise.3#1 branch .. //depot/projects/kse/lib/libc/gen/raise.c#1 branch .. //depot/projects/kse/lib/libc/gen/rand48.3#1 branch .. //depot/projects/kse/lib/libc/gen/rand48.h#1 branch .. //depot/projects/kse/lib/libc/gen/readdir.c#1 branch .. //depot/projects/kse/lib/libc/gen/readpassphrase.3#1 branch .. //depot/projects/kse/lib/libc/gen/readpassphrase.c#1 branch .. //depot/projects/kse/lib/libc/gen/rewinddir.c#1 branch .. //depot/projects/kse/lib/libc/gen/rfork_thread.3#1 branch .. //depot/projects/kse/lib/libc/gen/scandir.3#1 branch .. //depot/projects/kse/lib/libc/gen/scandir.c#1 branch .. //depot/projects/kse/lib/libc/gen/seed48.c#1 branch .. //depot/projects/kse/lib/libc/gen/seekdir.c#1 branch .. //depot/projects/kse/lib/libc/gen/semctl.c#1 branch .. //depot/projects/kse/lib/libc/gen/setdomainname.c#1 branch .. //depot/projects/kse/lib/libc/gen/sethostname.c#1 branch .. //depot/projects/kse/lib/libc/gen/setjmp.3#1 branch .. //depot/projects/kse/lib/libc/gen/setjmperr.c#1 branch .. //depot/projects/kse/lib/libc/gen/setmode.3#1 branch .. //depot/projects/kse/lib/libc/gen/setmode.c#1 branch .. //depot/projects/kse/lib/libc/gen/setproctitle.3#1 branch .. //depot/projects/kse/lib/libc/gen/setproctitle.c#1 branch .. //depot/projects/kse/lib/libc/gen/setprogname.c#1 branch .. //depot/projects/kse/lib/libc/gen/shm_open.3#1 branch .. //depot/projects/kse/lib/libc/gen/siginterrupt.3#1 branch .. //depot/projects/kse/lib/libc/gen/siginterrupt.c#1 branch .. //depot/projects/kse/lib/libc/gen/siglist.c#1 branch .. //depot/projects/kse/lib/libc/gen/signal.3#1 branch .. //depot/projects/kse/lib/libc/gen/signal.c#1 branch .. //depot/projects/kse/lib/libc/gen/sigsetops.3#1 branch .. //depot/projects/kse/lib/libc/gen/sigsetops.c#1 branch .. //depot/projects/kse/lib/libc/gen/sleep.3#1 branch .. //depot/projects/kse/lib/libc/gen/sleep.c#1 branch .. //depot/projects/kse/lib/libc/gen/srand48.c#1 branch .. //depot/projects/kse/lib/libc/gen/statvfs.3#1 branch .. //depot/projects/kse/lib/libc/gen/statvfs.c#1 branch .. //depot/projects/kse/lib/libc/gen/stringlist.3#1 branch .. //depot/projects/kse/lib/libc/gen/stringlist.c#1 branch .. //depot/projects/kse/lib/libc/gen/strtofflags.3#1 branch .. //depot/projects/kse/lib/libc/gen/strtofflags.c#1 branch .. //depot/projects/kse/lib/libc/gen/swapcontext.c#1 branch .. //depot/projects/kse/lib/libc/gen/sysconf.3#1 branch .. //depot/projects/kse/lib/libc/gen/sysconf.c#1 branch .. //depot/projects/kse/lib/libc/gen/sysctl.3#1 branch .. //depot/projects/kse/lib/libc/gen/sysctl.c#1 branch .. //depot/projects/kse/lib/libc/gen/sysctlbyname.c#1 branch .. //depot/projects/kse/lib/libc/gen/sysctlnametomib.c#1 branch .. //depot/projects/kse/lib/libc/gen/syslog.3#1 branch .. //depot/projects/kse/lib/libc/gen/syslog.c#1 branch .. //depot/projects/kse/lib/libc/gen/tcgetpgrp.3#1 branch .. //depot/projects/kse/lib/libc/gen/tcsendbreak.3#1 branch .. //depot/projects/kse/lib/libc/gen/tcsetattr.3#1 branch .. //depot/projects/kse/lib/libc/gen/tcsetpgrp.3#1 branch .. //depot/projects/kse/lib/libc/gen/telldir.c#1 branch .. //depot/projects/kse/lib/libc/gen/telldir.h#1 branch .. //depot/projects/kse/lib/libc/gen/termios.c#1 branch .. //depot/projects/kse/lib/libc/gen/time.3#1 branch .. //depot/projects/kse/lib/libc/gen/time.c#1 branch .. //depot/projects/kse/lib/libc/gen/times.3#1 branch .. //depot/projects/kse/lib/libc/gen/times.c#1 branch .. //depot/projects/kse/lib/libc/gen/timezone.3#1 branch .. //depot/projects/kse/lib/libc/gen/timezone.c#1 branch .. //depot/projects/kse/lib/libc/gen/ttyname.3#1 branch .. //depot/projects/kse/lib/libc/gen/ttyname.c#1 branch .. //depot/projects/kse/lib/libc/gen/ttyslot.c#1 branch .. //depot/projects/kse/lib/libc/gen/tzset.3#1 branch .. //depot/projects/kse/lib/libc/gen/ualarm.3#1 branch .. //depot/projects/kse/lib/libc/gen/ualarm.c#1 branch .. //depot/projects/kse/lib/libc/gen/uname.3#1 branch .. //depot/projects/kse/lib/libc/gen/uname.c#1 branch .. //depot/projects/kse/lib/libc/gen/unvis.3#1 branch .. //depot/projects/kse/lib/libc/gen/unvis.c#1 branch .. //depot/projects/kse/lib/libc/gen/usleep.3#1 branch .. //depot/projects/kse/lib/libc/gen/usleep.c#1 branch .. //depot/projects/kse/lib/libc/gen/utime.3#1 branch .. //depot/projects/kse/lib/libc/gen/utime.c#1 branch .. //depot/projects/kse/lib/libc/gen/valloc.3#1 branch .. //depot/projects/kse/lib/libc/gen/valloc.c#1 branch .. //depot/projects/kse/lib/libc/gen/vis.3#1 branch .. //depot/projects/kse/lib/libc/gen/vis.c#1 branch .. //depot/projects/kse/lib/libc/gen/wait.c#1 branch .. //depot/projects/kse/lib/libc/gen/wait3.c#1 branch .. //depot/projects/kse/lib/libc/gen/waitpid.c#1 branch .. //depot/projects/kse/lib/libc/gmon/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/gmon/gmon.c#1 branch .. //depot/projects/kse/lib/libc/gmon/mcount.c#1 branch .. //depot/projects/kse/lib/libc/gmon/moncontrol.3#1 branch .. //depot/projects/kse/lib/libc/i386/SYS.h#1 branch .. //depot/projects/kse/lib/libc/i386/gen/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/i386/gen/_ctx_start.S#1 branch .. //depot/projects/kse/lib/libc/i386/gen/_setjmp.S#1 branch .. //depot/projects/kse/lib/libc/i386/gen/alloca.S#1 branch .. //depot/projects/kse/lib/libc/i386/gen/fabs.S#1 branch .. //depot/projects/kse/lib/libc/i386/gen/frexp.c#1 branch .. //depot/projects/kse/lib/libc/i386/gen/getcontext.S#1 branch .. //depot/projects/kse/lib/libc/i386/gen/infinity.c#1 branch .. //depot/projects/kse/lib/libc/i386/gen/isinf.c#1 branch .. //depot/projects/kse/lib/libc/i386/gen/ldexp.c#1 branch .. //depot/projects/kse/lib/libc/i386/gen/makecontext.c#1 branch .. //depot/projects/kse/lib/libc/i386/gen/modf.S#1 branch .. //depot/projects/kse/lib/libc/i386/gen/rfork_thread.S#1 branch .. //depot/projects/kse/lib/libc/i386/gen/setjmp.S#1 branch .. //depot/projects/kse/lib/libc/i386/gen/sigsetjmp.S#1 branch .. //depot/projects/kse/lib/libc/i386/net/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/i386/net/htonl.S#1 branch .. //depot/projects/kse/lib/libc/i386/net/htons.S#1 branch .. //depot/projects/kse/lib/libc/i386/net/ntohl.S#1 branch .. //depot/projects/kse/lib/libc/i386/net/ntohs.S#1 branch .. //depot/projects/kse/lib/libc/i386/stdlib/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/i386/stdlib/abs.S#1 branch .. //depot/projects/kse/lib/libc/i386/stdlib/div.S#1 branch .. //depot/projects/kse/lib/libc/i386/stdlib/labs.S#1 branch .. //depot/projects/kse/lib/libc/i386/stdlib/ldiv.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/i386/string/bcmp.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/bcopy.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/bzero.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/ffs.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/index.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/memchr.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/memcmp.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/memcpy.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/memmove.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/memset.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/rindex.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/strcat.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/strchr.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/strcmp.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/strcpy.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/strlen.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/strncmp.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/strrchr.S#1 branch .. //depot/projects/kse/lib/libc/i386/string/swab.S#1 branch .. //depot/projects/kse/lib/libc/i386/sys/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/i386/sys/Ovfork.S#1 branch .. //depot/projects/kse/lib/libc/i386/sys/brk.S#1 branch .. //depot/projects/kse/lib/libc/i386/sys/cerror.S#1 branch .. //depot/projects/kse/lib/libc/i386/sys/exect.S#1 branch .. //depot/projects/kse/lib/libc/i386/sys/i386_clr_watch.c#1 branch .. //depot/projects/kse/lib/libc/i386/sys/i386_get_ioperm.2#1 branch .. //depot/projects/kse/lib/libc/i386/sys/i386_get_ioperm.c#1 branch .. //depot/projects/kse/lib/libc/i386/sys/i386_get_ldt.2#1 branch .. //depot/projects/kse/lib/libc/i386/sys/i386_get_ldt.c#1 branch .. //depot/projects/kse/lib/libc/i386/sys/i386_set_ioperm.c#1 branch .. //depot/projects/kse/lib/libc/i386/sys/i386_set_ldt.c#1 branch .. //depot/projects/kse/lib/libc/i386/sys/i386_set_watch.3#1 branch .. //depot/projects/kse/lib/libc/i386/sys/i386_set_watch.c#1 branch .. //depot/projects/kse/lib/libc/i386/sys/i386_vm86.2#1 branch .. //depot/projects/kse/lib/libc/i386/sys/i386_vm86.c#1 branch .. //depot/projects/kse/lib/libc/i386/sys/pipe.S#1 branch .. //depot/projects/kse/lib/libc/i386/sys/ptrace.S#1 branch .. //depot/projects/kse/lib/libc/i386/sys/reboot.S#1 branch .. //depot/projects/kse/lib/libc/i386/sys/sbrk.S#1 branch .. //depot/projects/kse/lib/libc/i386/sys/setlogin.S#1 branch .. //depot/projects/kse/lib/libc/i386/sys/sigreturn.S#1 branch .. //depot/projects/kse/lib/libc/i386/sys/syscall.S#1 branch .. //depot/projects/kse/lib/libc/ia64/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/ia64/SYS.h#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/__divdf3.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/__divdi3.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/__divsf3.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/__divsi3.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/__moddi3.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/__modsi3.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/__udivdi3.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/__udivsi3.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/__umoddi3.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/__umodsi3.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/_setjmp.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/fabs.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/fpgetmask.c#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/fpsetmask.c#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/frexp.c#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/infinity.c#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/isinf.c#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/ldexp.c#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/modf.c#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/setjmp.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/sigsetjmp.S#1 branch .. //depot/projects/kse/lib/libc/ia64/gen/unwind.c#1 branch .. //depot/projects/kse/lib/libc/ia64/net/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/ia64/net/byte_swap_2.S#1 branch .. //depot/projects/kse/lib/libc/ia64/net/byte_swap_4.S#1 branch .. //depot/projects/kse/lib/libc/ia64/net/htonl.S#1 branch .. //depot/projects/kse/lib/libc/ia64/net/htons.S#1 branch .. //depot/projects/kse/lib/libc/ia64/net/ntohl.S#1 branch .. //depot/projects/kse/lib/libc/ia64/net/ntohs.S#1 branch .. //depot/projects/kse/lib/libc/ia64/stdlib/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/ia64/string/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/ia64/string/bcopy.S#1 branch .. //depot/projects/kse/lib/libc/ia64/string/bzero.S#1 branch .. //depot/projects/kse/lib/libc/ia64/string/ffs.S#1 branch .. //depot/projects/kse/lib/libc/ia64/string/memcpy.S#1 branch .. //depot/projects/kse/lib/libc/ia64/string/memmove.S#1 branch .. //depot/projects/kse/lib/libc/ia64/sys/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/ia64/sys/Ovfork.S#1 branch .. //depot/projects/kse/lib/libc/ia64/sys/brk.S#1 branch .. //depot/projects/kse/lib/libc/ia64/sys/cerror.S#1 branch .. //depot/projects/kse/lib/libc/ia64/sys/exect.S#1 branch .. //depot/projects/kse/lib/libc/ia64/sys/fork.S#1 branch .. //depot/projects/kse/lib/libc/ia64/sys/pipe.S#1 branch .. //depot/projects/kse/lib/libc/ia64/sys/ptrace.S#1 branch .. //depot/projects/kse/lib/libc/ia64/sys/sbrk.S#1 branch .. //depot/projects/kse/lib/libc/ia64/sys/setlogin.S#1 branch .. //depot/projects/kse/lib/libc/ia64/sys/sigreturn.S#1 branch .. //depot/projects/kse/lib/libc/include/libc_private.h#1 branch .. //depot/projects/kse/lib/libc/include/namespace.h#1 branch .. //depot/projects/kse/lib/libc/include/reentrant.h#1 branch .. //depot/projects/kse/lib/libc/include/spinlock.h#1 branch .. //depot/projects/kse/lib/libc/include/un-namespace.h#1 branch .. //depot/projects/kse/lib/libc/locale/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/locale/ansi.c#1 branch .. //depot/projects/kse/lib/libc/locale/big5.c#1 branch .. //depot/projects/kse/lib/libc/locale/collate.c#1 branch .. //depot/projects/kse/lib/libc/locale/collate.h#1 branch .. //depot/projects/kse/lib/libc/locale/collcmp.c#1 branch .. //depot/projects/kse/lib/libc/locale/ctype.3#1 branch .. //depot/projects/kse/lib/libc/locale/digittoint.3#1 branch .. //depot/projects/kse/lib/libc/locale/euc.4#1 branch .. //depot/projects/kse/lib/libc/locale/euc.c#1 branch .. //depot/projects/kse/lib/libc/locale/fix_grouping.c#1 branch .. //depot/projects/kse/lib/libc/locale/frune.c#1 branch .. //depot/projects/kse/lib/libc/locale/isalnum.3#1 branch .. //depot/projects/kse/lib/libc/locale/isalpha.3#1 branch .. //depot/projects/kse/lib/libc/locale/isascii.3#1 branch .. //depot/projects/kse/lib/libc/locale/isblank.3#1 branch .. //depot/projects/kse/lib/libc/locale/iscntrl.3#1 branch .. //depot/projects/kse/lib/libc/locale/isctype.c#1 branch .. //depot/projects/kse/lib/libc/locale/isdigit.3#1 branch .. //depot/projects/kse/lib/libc/locale/isgraph.3#1 branch .. //depot/projects/kse/lib/libc/locale/islower.3#1 branch .. //depot/projects/kse/lib/libc/locale/isprint.3#1 branch .. //depot/projects/kse/lib/libc/locale/ispunct.3#1 branch .. //depot/projects/kse/lib/libc/locale/isspace.3#1 branch .. //depot/projects/kse/lib/libc/locale/isupper.3#1 branch .. //depot/projects/kse/lib/libc/locale/isxdigit.3#1 branch .. //depot/projects/kse/lib/libc/locale/ldpart.c#1 branch .. //depot/projects/kse/lib/libc/locale/ldpart.h#1 branch .. //depot/projects/kse/lib/libc/locale/lmessages.c#1 branch .. //depot/projects/kse/lib/libc/locale/lmessages.h#1 branch .. //depot/projects/kse/lib/libc/locale/lmonetary.c#1 branch .. //depot/projects/kse/lib/libc/locale/lmonetary.h#1 branch .. //depot/projects/kse/lib/libc/locale/lnumeric.c#1 branch .. //depot/projects/kse/lib/libc/locale/lnumeric.h#1 branch .. //depot/projects/kse/lib/libc/locale/localeconv.c#1 branch .. //depot/projects/kse/lib/libc/locale/mbrune.3#1 branch .. //depot/projects/kse/lib/libc/locale/mbrune.c#1 branch .. //depot/projects/kse/lib/libc/locale/mskanji.c#1 branch .. //depot/projects/kse/lib/libc/locale/multibyte.3#1 branch .. //depot/projects/kse/lib/libc/locale/nl_langinfo.3#1 branch .. //depot/projects/kse/lib/libc/locale/nl_langinfo.c#1 branch .. //depot/projects/kse/lib/libc/locale/nomacros.c#1 branch .. //depot/projects/kse/lib/libc/locale/none.c#1 branch .. //depot/projects/kse/lib/libc/locale/rune.3#1 branch .. //depot/projects/kse/lib/libc/locale/rune.c#1 branch .. //depot/projects/kse/lib/libc/locale/runetype.c#1 branch .. //depot/projects/kse/lib/libc/locale/setinvalidrune.c#1 branch .. //depot/projects/kse/lib/libc/locale/setlocale.3#1 branch .. //depot/projects/kse/lib/libc/locale/setlocale.c#1 branch .. //depot/projects/kse/lib/libc/locale/setlocale.h#1 branch .. //depot/projects/kse/lib/libc/locale/setrunelocale.c#1 branch .. //depot/projects/kse/lib/libc/locale/table.c#1 branch .. //depot/projects/kse/lib/libc/locale/toascii.3#1 branch .. //depot/projects/kse/lib/libc/locale/tolower.3#1 branch .. //depot/projects/kse/lib/libc/locale/tolower.c#1 branch .. //depot/projects/kse/lib/libc/locale/toupper.3#1 branch .. //depot/projects/kse/lib/libc/locale/toupper.c#1 branch .. //depot/projects/kse/lib/libc/locale/utf2.4#1 branch .. //depot/projects/kse/lib/libc/locale/utf2.c#1 branch .. //depot/projects/kse/lib/libc/net/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/net/addr2ascii.3#1 branch .. //depot/projects/kse/lib/libc/net/addr2ascii.c#1 branch .. //depot/projects/kse/lib/libc/net/ascii2addr.c#1 branch .. //depot/projects/kse/lib/libc/net/base64.c#1 branch .. //depot/projects/kse/lib/libc/net/byteorder.3#1 branch .. //depot/projects/kse/lib/libc/net/ether_addr.c#1 branch .. //depot/projects/kse/lib/libc/net/ethers.3#1 branch .. //depot/projects/kse/lib/libc/net/getaddrinfo.3#1 branch .. //depot/projects/kse/lib/libc/net/getaddrinfo.c#1 branch .. //depot/projects/kse/lib/libc/net/gethostbydns.c#1 branch .. //depot/projects/kse/lib/libc/net/gethostbyht.c#1 branch .. //depot/projects/kse/lib/libc/net/gethostbyname.3#1 branch .. //depot/projects/kse/lib/libc/net/gethostbynis.c#1 branch .. //depot/projects/kse/lib/libc/net/gethostnamadr.c#1 branch .. //depot/projects/kse/lib/libc/net/getifaddrs.3#1 branch .. //depot/projects/kse/lib/libc/net/getifaddrs.c#1 branch .. //depot/projects/kse/lib/libc/net/getipnodebyname.3#1 branch .. //depot/projects/kse/lib/libc/net/getnameinfo.3#1 branch .. //depot/projects/kse/lib/libc/net/getnameinfo.c#1 branch .. //depot/projects/kse/lib/libc/net/getnetbydns.c#1 branch .. //depot/projects/kse/lib/libc/net/getnetbyht.c#1 branch .. //depot/projects/kse/lib/libc/net/getnetbynis.c#1 branch .. //depot/projects/kse/lib/libc/net/getnetent.3#1 branch .. //depot/projects/kse/lib/libc/net/getnetnamadr.c#1 branch .. //depot/projects/kse/lib/libc/net/getproto.c#1 branch .. //depot/projects/kse/lib/libc/net/getprotoent.3#1 branch .. //depot/projects/kse/lib/libc/net/getprotoent.c#1 branch .. //depot/projects/kse/lib/libc/net/getprotoname.c#1 branch .. //depot/projects/kse/lib/libc/net/getservbyname.c#1 branch .. //depot/projects/kse/lib/libc/net/getservbyport.c#1 branch .. //depot/projects/kse/lib/libc/net/getservent.3#1 branch .. //depot/projects/kse/lib/libc/net/getservent.c#1 branch .. //depot/projects/kse/lib/libc/net/herror.c#1 branch .. //depot/projects/kse/lib/libc/net/hesiod.3#1 branch .. //depot/projects/kse/lib/libc/net/hesiod.c#1 branch .. //depot/projects/kse/lib/libc/net/if_indextoname.3#1 branch .. //depot/projects/kse/lib/libc/net/if_indextoname.c#1 branch .. //depot/projects/kse/lib/libc/net/if_nameindex.c#1 branch .. //depot/projects/kse/lib/libc/net/if_nametoindex.c#1 branch .. //depot/projects/kse/lib/libc/net/inet.3#1 branch .. //depot/projects/kse/lib/libc/net/inet6_option_space.3#1 branch .. //depot/projects/kse/lib/libc/net/inet6_rthdr_space.3#1 branch .. //depot/projects/kse/lib/libc/net/inet_addr.c#1 branch .. //depot/projects/kse/lib/libc/net/inet_lnaof.c#1 branch .. //depot/projects/kse/lib/libc/net/inet_makeaddr.c#1 branch .. //depot/projects/kse/lib/libc/net/inet_net.3#1 branch .. //depot/projects/kse/lib/libc/net/inet_net_ntop.c#1 branch .. //depot/projects/kse/lib/libc/net/inet_net_pton.c#1 branch .. //depot/projects/kse/lib/libc/net/inet_neta.c#1 branch .. //depot/projects/kse/lib/libc/net/inet_netof.c#1 branch .. //depot/projects/kse/lib/libc/net/inet_network.c#1 branch .. //depot/projects/kse/lib/libc/net/inet_ntoa.c#1 branch .. //depot/projects/kse/lib/libc/net/inet_ntop.c#1 branch .. //depot/projects/kse/lib/libc/net/inet_pton.c#1 branch .. //depot/projects/kse/lib/libc/net/ip6opt.c#1 branch .. //depot/projects/kse/lib/libc/net/iso_addr.3#1 branch .. //depot/projects/kse/lib/libc/net/iso_addr.c#1 branch .. //depot/projects/kse/lib/libc/net/linkaddr.3#1 branch .. //depot/projects/kse/lib/libc/net/linkaddr.c#1 branch .. //depot/projects/kse/lib/libc/net/map_v4v6.c#1 branch .. //depot/projects/kse/lib/libc/net/name6.c#1 branch .. //depot/projects/kse/lib/libc/net/ns.3#1 branch .. //depot/projects/kse/lib/libc/net/ns_addr.c#1 branch .. //depot/projects/kse/lib/libc/net/ns_name.c#1 branch .. //depot/projects/kse/lib/libc/net/ns_netint.c#1 branch .. //depot/projects/kse/lib/libc/net/ns_ntoa.c#1 branch .. //depot/projects/kse/lib/libc/net/ns_parse.c#1 branch .. //depot/projects/kse/lib/libc/net/ns_print.c#1 branch .. //depot/projects/kse/lib/libc/net/ns_ttl.c#1 branch .. //depot/projects/kse/lib/libc/net/nsap_addr.c#1 branch .. //depot/projects/kse/lib/libc/net/nsdispatch.3#1 branch .. //depot/projects/kse/lib/libc/net/nsdispatch.c#1 branch .. //depot/projects/kse/lib/libc/net/nslexer.l#1 branch .. //depot/projects/kse/lib/libc/net/nsparser.y#1 branch .. //depot/projects/kse/lib/libc/net/rcmd.3#1 branch .. //depot/projects/kse/lib/libc/net/rcmd.c#1 branch .. //depot/projects/kse/lib/libc/net/rcmdsh.3#1 branch .. //depot/projects/kse/lib/libc/net/rcmdsh.c#1 branch .. //depot/projects/kse/lib/libc/net/recv.c#1 branch .. //depot/projects/kse/lib/libc/net/res_comp.c#1 branch .. //depot/projects/kse/lib/libc/net/res_config.h#1 branch .. //depot/projects/kse/lib/libc/net/res_data.c#1 branch .. //depot/projects/kse/lib/libc/net/res_debug.c#1 branch .. //depot/projects/kse/lib/libc/net/res_init.c#1 branch .. //depot/projects/kse/lib/libc/net/res_mkquery.c#1 branch .. //depot/projects/kse/lib/libc/net/res_mkupdate.c#1 branch .. //depot/projects/kse/lib/libc/net/res_query.c#1 branch .. //depot/projects/kse/lib/libc/net/res_send.c#1 branch .. //depot/projects/kse/lib/libc/net/res_update.c#1 branch .. //depot/projects/kse/lib/libc/net/resolver.3#1 branch .. //depot/projects/kse/lib/libc/net/rthdr.c#1 branch .. //depot/projects/kse/lib/libc/net/send.c#1 branch .. //depot/projects/kse/lib/libc/net/vars.c#1 branch .. //depot/projects/kse/lib/libc/nls/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/nls/catclose.3#1 branch .. //depot/projects/kse/lib/libc/nls/catgets.3#1 branch .. //depot/projects/kse/lib/libc/nls/catopen.3#1 branch .. //depot/projects/kse/lib/libc/nls/msgcat.c#1 branch .. //depot/projects/kse/lib/libc/nls/msgcat.h#1 branch .. //depot/projects/kse/lib/libc/posix1e/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_add_perm.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_calc_mask.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_calc_mask.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_clear_perms.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_copy.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_copy_entry.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_create_entry.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_delete.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_delete.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_delete_entry.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_delete_entry.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_delete_perm.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_dup.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_entry.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_free.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_free.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_from_text.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_from_text.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_get.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_get.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_get_entry.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_get_perm_np.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_get_permset.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_get_qualifier.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_get_tag_type.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_init.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_init.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_perm.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_set.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_set.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_set_permset.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_set_qualifier.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_set_tag_type.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_size.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_support.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_support.h#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_to_text.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_to_text.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_valid.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/acl_valid.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/extattr.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/extattr.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/posix1e.3#1 branch .. //depot/projects/kse/lib/libc/powerpc/SYS.h#1 branch .. //depot/projects/kse/lib/libc/powerpc/net/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/powerpc/net/htonl.S#1 branch .. //depot/projects/kse/lib/libc/powerpc/net/htons.S#1 branch .. //depot/projects/kse/lib/libc/powerpc/net/ntohl.S#1 branch .. //depot/projects/kse/lib/libc/powerpc/net/ntohs.S#1 branch .. //depot/projects/kse/lib/libc/quad/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/quad/TESTS/Makefile#1 branch .. //depot/projects/kse/lib/libc/quad/TESTS/divrem.c#1 branch .. //depot/projects/kse/lib/libc/quad/TESTS/mul.c#1 branch .. //depot/projects/kse/lib/libc/quad/adddi3.c#1 branch .. //depot/projects/kse/lib/libc/quad/anddi3.c#1 branch .. //depot/projects/kse/lib/libc/quad/ashldi3.c#1 branch .. //depot/projects/kse/lib/libc/quad/ashrdi3.c#1 branch .. //depot/projects/kse/lib/libc/quad/cmpdi2.c#1 branch .. //depot/projects/kse/lib/libc/quad/divdi3.c#1 branch .. //depot/projects/kse/lib/libc/quad/fixdfdi.c#1 branch .. //depot/projects/kse/lib/libc/quad/fixsfdi.c#1 branch .. //depot/projects/kse/lib/libc/quad/fixunsdfdi.c#1 branch .. //depot/projects/kse/lib/libc/quad/fixunssfdi.c#1 branch .. //depot/projects/kse/lib/libc/quad/floatdidf.c#1 branch .. //depot/projects/kse/lib/libc/quad/floatdisf.c#1 branch .. //depot/projects/kse/lib/libc/quad/floatunsdidf.c#1 branch .. //depot/projects/kse/lib/libc/quad/iordi3.c#1 branch .. //depot/projects/kse/lib/libc/quad/lshldi3.c#1 branch .. //depot/projects/kse/lib/libc/quad/lshrdi3.c#1 branch .. //depot/projects/kse/lib/libc/quad/moddi3.c#1 branch .. //depot/projects/kse/lib/libc/quad/muldi3.c#1 branch .. //depot/projects/kse/lib/libc/quad/negdi2.c#1 branch .. //depot/projects/kse/lib/libc/quad/notdi2.c#1 branch .. //depot/projects/kse/lib/libc/quad/qdivrem.c#1 branch .. //depot/projects/kse/lib/libc/quad/quad.h#1 branch .. //depot/projects/kse/lib/libc/quad/subdi3.c#1 branch .. //depot/projects/kse/lib/libc/quad/ucmpdi2.c#1 branch .. //depot/projects/kse/lib/libc/quad/udivdi3.c#1 branch .. //depot/projects/kse/lib/libc/quad/umoddi3.c#1 branch .. //depot/projects/kse/lib/libc/quad/xordi3.c#1 branch .. //depot/projects/kse/lib/libc/regex/COPYRIGHT#1 branch .. //depot/projects/kse/lib/libc/regex/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/regex/WHATSNEW#1 branch .. //depot/projects/kse/lib/libc/regex/cclass.h#1 branch .. //depot/projects/kse/lib/libc/regex/cname.h#1 branch .. //depot/projects/kse/lib/libc/regex/engine.c#1 branch .. //depot/projects/kse/lib/libc/regex/grot/Makefile#1 branch .. //depot/projects/kse/lib/libc/regex/grot/debug.c#1 branch .. //depot/projects/kse/lib/libc/regex/grot/limits.h#1 branch .. //depot/projects/kse/lib/libc/regex/grot/main.c#1 branch .. //depot/projects/kse/lib/libc/regex/grot/mkh#1 branch .. //depot/projects/kse/lib/libc/regex/grot/split.c#1 branch .. //depot/projects/kse/lib/libc/regex/grot/stdlib.h#1 branch .. //depot/projects/kse/lib/libc/regex/grot/tests#1 branch .. //depot/projects/kse/lib/libc/regex/re_format.7#1 branch .. //depot/projects/kse/lib/libc/regex/regcomp.c#1 branch .. //depot/projects/kse/lib/libc/regex/regerror.c#1 branch .. //depot/projects/kse/lib/libc/regex/regex.3#1 branch .. //depot/projects/kse/lib/libc/regex/regex2.h#1 branch .. //depot/projects/kse/lib/libc/regex/regexec.c#1 branch .. //depot/projects/kse/lib/libc/regex/regfree.c#1 branch .. //depot/projects/kse/lib/libc/regex/utils.h#1 branch .. //depot/projects/kse/lib/libc/rpc/DISCLAIMER#1 branch .. //depot/projects/kse/lib/libc/rpc/LICENSE#1 branch .. //depot/projects/kse/lib/libc/rpc/Makefile.inc#1 branch .. //depot/projects/kse/lib/libc/rpc/PSD.doc/nfs.rfc.ms#1 branch .. //depot/projects/kse/lib/libc/rpc/PSD.doc/rpc.prog.ms#1 branch .. //depot/projects/kse/lib/libc/rpc/PSD.doc/rpc.rfc.ms#1 branch .. //depot/projects/kse/lib/libc/rpc/PSD.doc/rpcgen.ms#1 branch .. //depot/projects/kse/lib/libc/rpc/PSD.doc/stubs#1 branch .. //depot/projects/kse/lib/libc/rpc/PSD.doc/xdr.nts.ms#1 branch .. //depot/projects/kse/lib/libc/rpc/PSD.doc/xdr.rfc.ms#1 branch .. //depot/projects/kse/lib/libc/rpc/README#1 branch .. //depot/projects/kse/lib/libc/rpc/auth_des.c#1 branch .. //depot/projects/kse/lib/libc/rpc/auth_none.c#1 branch .. //depot/projects/kse/lib/libc/rpc/auth_time.c#1 branch .. //depot/projects/kse/lib/libc/rpc/auth_unix.c#1 branch .. //depot/projects/kse/lib/libc/rpc/authdes_prot.c#1 branch .. //depot/projects/kse/lib/libc/rpc/authunix_prot.c#1 branch .. //depot/projects/kse/lib/libc/rpc/bindresvport.3#1 branch .. //depot/projects/kse/lib/libc/rpc/bindresvport.c#1 branch .. //depot/projects/kse/lib/libc/rpc/clnt_bcast.c#1 branch .. //depot/projects/kse/lib/libc/rpc/clnt_dg.c#1 branch .. //depot/projects/kse/lib/libc/rpc/clnt_generic.c#1 branch .. //depot/projects/kse/lib/libc/rpc/clnt_perror.c#1 branch .. //depot/projects/kse/lib/libc/rpc/clnt_raw.c#1 branch .. //depot/projects/kse/lib/libc/rpc/clnt_simple.c#1 branch .. //depot/projects/kse/lib/libc/rpc/clnt_vc.c#1 branch .. //depot/projects/kse/lib/libc/rpc/crypt_client.c#1 branch .. //depot/projects/kse/lib/libc/rpc/des_crypt.3#1 branch .. //depot/projects/kse/lib/libc/rpc/des_crypt.c#1 branch .. //depot/projects/kse/lib/libc/rpc/des_soft.c#1 branch .. //depot/projects/kse/lib/libc/rpc/getnetconfig.3#1 branch .. //depot/projects/kse/lib/libc/rpc/getnetconfig.c#1 branch .. //depot/projects/kse/lib/libc/rpc/getnetpath.3#1 branch .. //depot/projects/kse/lib/libc/rpc/getnetpath.c#1 branch .. //depot/projects/kse/lib/libc/rpc/getpublickey.c#1 branch .. //depot/projects/kse/lib/libc/rpc/getrpcent.3#1 branch .. //depot/projects/kse/lib/libc/rpc/getrpcent.c#1 branch .. //depot/projects/kse/lib/libc/rpc/getrpcport.3#1 branch .. //depot/projects/kse/lib/libc/rpc/getrpcport.c#1 branch .. //depot/projects/kse/lib/libc/rpc/key_call.c#1 branch .. //depot/projects/kse/lib/libc/rpc/key_prot_xdr.c#1 branch .. //depot/projects/kse/lib/libc/rpc/mt_misc.c#1 branch .. //depot/projects/kse/lib/libc/rpc/netconfig.5#1 branch .. //depot/projects/kse/lib/libc/rpc/netname.c#1 branch .. //depot/projects/kse/lib/libc/rpc/netnamer.c#1 branch .. //depot/projects/kse/lib/libc/rpc/pmap_clnt.c#1 branch .. //depot/projects/kse/lib/libc/rpc/pmap_getmaps.c#1 branch .. //depot/projects/kse/lib/libc/rpc/pmap_getport.c#1 branch .. //depot/projects/kse/lib/libc/rpc/pmap_prot.c#1 branch .. //depot/projects/kse/lib/libc/rpc/pmap_prot2.c#1 branch .. //depot/projects/kse/lib/libc/rpc/pmap_rmt.c#1 branch .. //depot/projects/kse/lib/libc/rpc/publickey.3#1 branch .. //depot/projects/kse/lib/libc/rpc/publickey.5#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc.3#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc.5#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_callmsg.c#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_clnt_auth.3#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_clnt_calls.3#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_clnt_create.3#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_com.h#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_commondata.c#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_dtablesize.c#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_generic.c#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_prot.c#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_secure.3#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_soc.3#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_soc.c#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_svc_calls.3#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_svc_create.3#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_svc_err.3#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_svc_reg.3#1 branch .. //depot/projects/kse/lib/libc/rpc/rpc_xdr.3#1 branch .. //depot/projects/kse/lib/libc/rpc/rpcb_clnt.c#1 branch .. //depot/projects/kse/lib/libc/rpc/rpcb_prot.c#1 branch .. //depot/projects/kse/lib/libc/rpc/rpcb_st_xdr.c#1 branch .. //depot/projects/kse/lib/libc/rpc/rpcbind.3#1 branch .. //depot/projects/kse/lib/libc/rpc/rpcdname.c#1 branch .. //depot/projects/kse/lib/libc/rpc/rtime.3#1 branch .. //depot/projects/kse/lib/libc/rpc/rtime.c#1 branch .. //depot/projects/kse/lib/libc/rpc/svc.c#1 branch .. //depot/projects/kse/lib/libc/rpc/svc_auth.c#1 branch .. //depot/projects/kse/lib/libc/rpc/svc_auth_des.c#1 branch .. //depot/projects/kse/lib/libc/rpc/svc_auth_unix.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 17:48:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BE3437B401; Mon, 29 Jul 2002 17:48:40 -0700 (PDT) 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 B626537B400 for ; Mon, 29 Jul 2002 17:48:39 -0700 (PDT) Received: from mail.speakeasy.net (mail17.speakeasy.net [216.254.0.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54B5743E42 for ; Mon, 29 Jul 2002 17:48:39 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 17561 invoked from network); 30 Jul 2002 00:48:36 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail17.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 30 Jul 2002 00:48:36 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g6U0mSuR052088; Mon, 29 Jul 2002 20:48:28 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200207292354.g6TNsI0c005453@freefall.freebsd.org> Date: Mon, 29 Jul 2002 20:48:32 -0400 (EDT) From: John Baldwin To: Peter Wemm Subject: RE: PERFORCE change 15152 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 29-Jul-2002 Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15152 > > Change 15152 by peter@peter_mckinley on 2002/07/29 16:53:35 > > Attack the kstack problem with a sledge hammer. This isn't > pretty folks. *puke* -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 18: 0: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3DB737B401; Mon, 29 Jul 2002 18:00:03 -0700 (PDT) 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 C09FE37B400 for ; Mon, 29 Jul 2002 18:00:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6760B43E4A for ; Mon, 29 Jul 2002 18:00:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6U102JU044422 for ; Mon, 29 Jul 2002 18:00:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6U1023R044417 for perforce@freebsd.org; Mon, 29 Jul 2002 18:00:02 -0700 (PDT) Date: Mon, 29 Jul 2002 18:00:02 -0700 (PDT) Message-Id: <200207300100.g6U1023R044417@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15155 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15155 Change 15155 by rwatson@rwatson_paprika on 2002/07/29 17:59:16 'struct mac' forward declare no longer required since we don't explicitly store the image label in the image activator reference for it. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/imgact.h#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/imgact.h#7 (text+ko) ==== @@ -38,7 +38,6 @@ #define MAXSHELLCMDLEN 128 -struct mac; struct vm_object; struct image_params { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 18: 1: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D89D837B401; Mon, 29 Jul 2002 18:01:04 -0700 (PDT) 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 92E6D37B400 for ; Mon, 29 Jul 2002 18:01:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A10E43E31 for ; Mon, 29 Jul 2002 18:01:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6U114JU044634 for ; Mon, 29 Jul 2002 18:01:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6U113pV044624 for perforce@freebsd.org; Mon, 29 Jul 2002 18:01:03 -0700 (PDT) Date: Mon, 29 Jul 2002 18:01:03 -0700 (PDT) Message-Id: <200207300101.g6U113pV044624@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15156 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15156 Change 15156 by rwatson@rwatson_paprika on 2002/07/29 18:01:00 vnode.h no longer requires a struct mac forward declare. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#33 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#33 (text+ko) ==== @@ -585,7 +585,6 @@ struct proc; struct stat; struct nstat; -struct mac; struct ucred; struct uio; struct vattr; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 18: 8:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90DF137B401; Mon, 29 Jul 2002 18:08:14 -0700 (PDT) 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 2B05E37B400 for ; Mon, 29 Jul 2002 18:08:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD49443E4A for ; Mon, 29 Jul 2002 18:08:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6U18DJU049399 for ; Mon, 29 Jul 2002 18:08:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6U18D9N049396 for perforce@freebsd.org; Mon, 29 Jul 2002 18:08:13 -0700 (PDT) Date: Mon, 29 Jul 2002 18:08:13 -0700 (PDT) Message-Id: <200207300108.g6U18D9N049396@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15158 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15158 Change 15158 by rwatson@rwatson_paprika on 2002/07/29 18:07:56 Slight diff synchronization with -CURRENT. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#29 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#29 (text+ko) ==== @@ -3227,8 +3227,7 @@ * vnode's type, "mode", uid and gid, requested access mode, credentials, * and optional call-by-reference privused argument allowing vaccess() * to indicate to the caller whether privilege was used to satisfy the - * request (obsoleted). Returns 0 on success, or an error value on - * failure. + * request (obsoleted). Returns 0 on success, or an errno on failure. */ int vaccess(type, file_mode, file_uid, file_gid, acc_mode, cred, privused) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 18:23:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D2C637B401; Mon, 29 Jul 2002 18:23:10 -0700 (PDT) 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 8636C37B400; Mon, 29 Jul 2002 18:23:09 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AAF743E4A; Mon, 29 Jul 2002 18:23:09 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 2A3152A7D6; Mon, 29 Jul 2002 18:23:09 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 15152 for review In-Reply-To: Date: Mon, 29 Jul 2002 18:23:09 -0700 From: Peter Wemm Message-Id: <20020730012309.2A3152A7D6@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin wrote: > > On 29-Jul-2002 Peter Wemm wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15152 > > > > Change 15152 by peter@peter_mckinley on 2002/07/29 16:53:35 > > > > Attack the kstack problem with a sledge hammer. This isn't > > pretty folks. > > *puke* Actually, the first half is needed for -current for selwakeup(). Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 19: 7:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7656C37B401; Mon, 29 Jul 2002 19:07:50 -0700 (PDT) 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 1520037B400 for ; Mon, 29 Jul 2002 19:07:50 -0700 (PDT) Received: from mail.speakeasy.net (mail16.speakeasy.net [216.254.0.216]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6FB343E31 for ; Mon, 29 Jul 2002 19:07:49 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 12770 invoked from network); 30 Jul 2002 02:07:49 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail16.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 30 Jul 2002 02:07:49 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g6U27luR052258; Mon, 29 Jul 2002 22:07:47 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20020730012309.2A3152A7D6@canning.wemm.org> Date: Mon, 29 Jul 2002 22:07:51 -0400 (EDT) From: John Baldwin To: Peter Wemm Subject: Re: PERFORCE change 15152 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 30-Jul-2002 Peter Wemm wrote: > John Baldwin wrote: >> >> On 29-Jul-2002 Peter Wemm wrote: >> > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15152 >> > >> > Change 15152 by peter@peter_mckinley on 2002/07/29 16:53:35 >> > >> > Attack the kstack problem with a sledge hammer. This isn't >> > pretty folks. >> >> *puke* > > Actually, the first half is needed for -current for selwakeup(). Yeah, I know. I'll put in the DP2 branch if it doesn't get fixed for real by the time DP2 is branched. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 21:21: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED4C337B406; Mon, 29 Jul 2002 21:20:09 -0700 (PDT) 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 7263D37B405 for ; Mon, 29 Jul 2002 21:20:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A041E43E42 for ; Mon, 29 Jul 2002 21:20:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6U4K8JU077290 for ; Mon, 29 Jul 2002 21:20:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6U4K8qO077287 for perforce@freebsd.org; Mon, 29 Jul 2002 21:20:08 -0700 (PDT) Date: Mon, 29 Jul 2002 21:20:08 -0700 (PDT) Message-Id: <200207300420.g6U4K8qO077287@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15164 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15164 Change 15164 by rwatson@rwatson_paprika on 2002/07/29 21:19:36 Make the ugidfw command link against the new libugidfw rather than implementing the various sysctl-frobbing/parsing/... calls itself. Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/Makefile#2 edit .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/Makefile#2 (text+ko) ==== @@ -2,5 +2,6 @@ PROG= ugidfw NOMAN= yes +LDADD= -lugidfw .include ==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#7 (text+ko) ==== @@ -41,21 +41,10 @@ #include -#include -#include #include #include #include - -/* - * Text format for rules: rules contain subjectand object elements, mode. - * Each element takes the form "[not] [uid number] [gid number]". - * The total form is "subject [element] object [element] mode [mode]". - * At least * one of a uid or gid entry must be present; both may also be - * present. - */ - -#define MIB "security.mac.bsdextended" +#include void usage(void) @@ -63,432 +52,60 @@ fprintf(stderr, "ugidfw list\n"); fprintf(stderr, "ugidfw set rulenum [subject [not] [uid uid] [gid gid]]" - " [object [not] [uid uid] [gid gid]] mode arswxn\n"); + " [object [not] \\\n"); + fprintf(stderr, " [uid uid] [gid gid]] mode arswxn\n"); fprintf(stderr, "ugidfw remove rulenum\n"); - exit (-1); -} -void -print_rule(int rulenum, struct mac_bsdextended_rule *rule) -{ - struct group *grp; - struct passwd *pwd; - int anymode, unknownmode; - - printf("%d ", rulenum); - if (rule->mbr_subject.mbi_flags & (MBI_UID_DEFINED | - MBI_GID_DEFINED)) { - printf("subject "); - if (rule->mbr_subject.mbi_flags & MBI_NEGATED) - printf("not "); - if (rule->mbr_subject.mbi_flags & MBI_UID_DEFINED) { - pwd = getpwuid(rule->mbr_subject.mbi_uid); - if (pwd != NULL) - printf("uid %s ", pwd->pw_name); - else - printf("uid %u ", rule->mbr_subject.mbi_uid); - } - if (rule->mbr_subject.mbi_flags & MBI_GID_DEFINED) { - grp = getgrgid(rule->mbr_subject.mbi_gid); - if (grp != NULL) - printf("gid %s ", grp->gr_name); - else - printf("gid %u ", rule->mbr_subject.mbi_gid); - } - } - if (rule->mbr_object.mbi_flags & (MBI_UID_DEFINED | - MBI_GID_DEFINED)) { - printf("object "); - if (rule->mbr_object.mbi_flags & MBI_NEGATED) - printf("not "); - if (rule->mbr_object.mbi_flags & MBI_UID_DEFINED) { - pwd = getpwuid(rule->mbr_object.mbi_uid); - if (pwd != NULL) - printf("uid %s ", pwd->pw_name); - else - printf("uid %u ", rule->mbr_object.mbi_uid); - } - if (rule->mbr_object.mbi_flags & MBI_GID_DEFINED) { - grp = getgrgid(rule->mbr_object.mbi_gid); - if (grp != NULL) - printf("gid %s ", grp->gr_name); - else - printf("gid %u ", rule->mbr_object.mbi_gid); - } - } - - printf("mode "); - anymode = (rule->mbr_mode & VALLPERM); - unknownmode = (rule->mbr_mode & ~VALLPERM); - - if (rule->mbr_mode & VADMIN) - printf("a"); - if (rule->mbr_mode & VREAD) - printf("r"); - if (rule->mbr_mode & VSTAT) - printf("s"); - if (rule->mbr_mode & VWRITE) - printf("w"); - if (rule->mbr_mode & VEXEC) - printf("x"); - if (!anymode) - printf("n"); - if (unknownmode) - printf("?"); - - printf("\n"); -} - -int -parse_identity(int argc, char *argv[], - struct mac_bsdextended_identity *identity) -{ - struct group *grp; - struct passwd *pwd; - int uid_seen, gid_seen, not_seen; - int current; - char *endp; - long value; - uid_t uid; - gid_t gid; - - if (argc == 0) { - fprintf(stderr, "Identity must not be empty\n"); - return (-1); - } - - current = 0; - - /* First element might be "not". */ - if (strcmp("not", argv[0]) == 0) { - not_seen = 1; - current++; - } else - not_seen = 0; - - if (current >= argc) { - fprintf(stderr, "Identity short.\n"); - return (-1); - } - - uid_seen = 0; - gid_seen = 0; - - /* First phrase: uid [uid] or gid[gid]. */ - if (strcmp("uid", argv[current]) == 0) { - if (current + 2 > argc) { - fprintf(stderr, "uid short.\n"); - return (-1); - } - pwd = getpwnam(argv[current+1]); - if (pwd != NULL) - uid = pwd->pw_uid; - else { - value = strtol(argv[current+1], &endp, 10); - if (*endp != '\0') { - fprintf(stderr, "invalid uid: '%s'\n", - argv[current+1]); - return (-1); - } - uid = value; - } - uid_seen = 1; - current += 2; - } else if (strcmp("gid", argv[current]) == 0) { - if (current + 2 > argc) { - fprintf(stderr, "gid short.\n"); - return (-1); - } - grp = getgrnam(argv[current+1]); - if (grp != NULL) - gid = grp->gr_gid; - else { - value = strtol(argv[current+1], &endp, 10); - if (*endp != '\0') { - fprintf(stderr, "invalid gid: '%s'\n", - argv[current+1]); - return (-1); - } - gid = value; - } - gid_seen = 1; - current += 2; - } else { - fprintf(stderr, "'%s' not expected.\n", argv[current]); - return (-1); - } - - /* Onto optional second phrase. */ - if (current + 1 < argc) { - /* Second phrase: uid [uid] or gid [gid], but not a repeat. */ - if (strcmp("uid", argv[current]) == 0) { - if (uid_seen) { - fprintf(stderr, "Only one uid permitted per " - "identity clause.\n"); - return (-1); - } - if (current + 2 > argc) { - fprintf(stderr, "uid short.\n"); - return (-1); - } - value = strtol(argv[current+1], &endp, 10); - if (*endp != '\0') { - fprintf(stderr, "invalid uid: '%s'\n", - argv[current+1]); - return (-1); - } - uid = value; - uid_seen = 1; - current += 2; - } else if (strcmp("gid", argv[current]) == 0) { - if (gid_seen) { - fprintf(stderr, "Only one gid permitted per " - "identity clause.\n"); - return (-1); - } - if (current + 2 > argc) { - fprintf(stderr, "gid short.\n"); - return (-1); - } - value = strtol(argv[current+1], &endp, 10); - if (*endp != '\0') { - fprintf(stderr, "invalid gid: '%s'\n", - argv[current+1]); - return (-1); - } - gid = value; - gid_seen = 1; - current += 2; - } else { - fprintf(stderr, "'%s' not expected.\n", argv[current]); - return (-1); - } - } - - if (current +1 < argc) { - fprintf(stderr, "'%s' not expected.\n", argv[current]); - return (-1); - } - - /* Fill out the identity. */ - identity->mbi_flags = 0; - - if (not_seen) - identity->mbi_flags |= MBI_NEGATED; - - if (uid_seen) { - identity->mbi_flags |= MBI_UID_DEFINED; - identity->mbi_uid = uid; - } else - identity->mbi_uid = 0; - - if (gid_seen) { - identity->mbi_flags |= MBI_GID_DEFINED; - identity->mbi_gid = gid; - } else - identity->mbi_gid = 0; - - return (0); -} - -int -parse_mode(int argc, char *argv[], mode_t *mode) -{ - int i; - - if (argc == 0) { - fprintf(stderr, "mode expects mode value.\n"); - return (-1); - } - - if (argc != 1) { - fprintf(stderr, "'%s' unexpected.\n", argv[1]); - return (-1); - } - - *mode = 0; - for (i = 0; i < strlen(argv[0]); i++) { - char c; - - switch (argv[0][i]) { - case 'a': - *mode |= VADMIN; - break; - case 'r': - *mode |= VREAD; - break; - case 's': - *mode |= VSTAT; - break; - case 'w': - *mode |= VWRITE; - break; - case 'x': - *mode |= VEXEC; - break; - case 'n': - /* ignore */ - break; - default: - fprintf(stderr, "Unknown mode letter: %c\n", - argv[0][i]); - return (-1); - } - } - - return (0); + exit(-1); } -int -parse_rule(int argc, char *argv[], struct mac_bsdextended_rule *rule) -{ - int subject, subject_elements, subject_elements_length; - int object, object_elements, object_elements_length; - int mode, mode_elements, mode_elements_length; - int error, i; - - bzero(rule, sizeof(*rule)); - - if (argc < 1) { - fprintf(stderr, "Rule must begin with subject.\n"); - return (-1); - } - - if (strcmp(argv[0], "subject") != 0) { - fprintf(stderr, "Rule must begin with subject.\n"); - return (-1); - } - subject = 0; - subject_elements = 1; - - /* Search forward for object. */ - - object = -1; - for (i = 1; i < argc; i++) - if (strcmp(argv[i], "object") == 0) - object = i; - - if (object == -1) { - fprintf(stderr, "Rule must contain an object.\n"); - return (-1); - } - - /* Search forward for mode. */ - mode = -1; - for (i = object; i < argc; i++) - if (strcmp(argv[i], "mode") == 0) - mode = i; - - if (mode == -1) { - fprintf(stderr, "Rule must contain mode.\n"); - return (-1); - } - - subject_elements_length = object - subject - 1; - object_elements = object + 1; - object_elements_length = mode - object_elements; - mode_elements = mode + 1; - mode_elements_length = argc - mode_elements; - - error = parse_identity(subject_elements_length, - argv + subject_elements, &rule->mbr_subject); - if (error) - return (-1); - - error = parse_identity(object_elements_length, argv + object_elements, - &rule->mbr_object); - if (error) - return (-1); - - error = parse_mode(mode_elements_length, argv + mode_elements, - &rule->mbr_mode); - if (error) - return (-1); - - return (0); -} - -int -get_mib(const char *string, int *name, int *namelen) -{ - int error, len; - - len = *namelen; - error = sysctlnametomib(string, name, &len); - if (error) - return (error); - - *namelen = len; - return (0); -} - void list_rules(void) { + char errstr[BUFSIZ], charstr[BUFSIZ]; struct mac_bsdextended_rule rule; - size_t size; - int name[10]; - int error, i, len, rule_count, rule_slots; + int error, i, rule_count, rule_slots; - len = sizeof(rule_slots); - error = sysctlbyname(MIB ".rule_slots", &rule_slots, &len, NULL, NULL); - if (error) { - perror(MIB ".rule_slots"); - return; + rule_slots = bsde_get_rule_slots(BUFSIZ, errstr); + if (rule_slots == -1) { + fprintf(stderr, errstr); + exit (-1); } - if (len != sizeof(rule_slots)) { - fprintf(stderr, "rule_slots wrong size\n"); - return; - } - len = sizeof(rule_count); - error = sysctlbyname(MIB ".rule_count", &rule_count, &len, NULL, NULL); - if (error) { - perror(MIB ".rule_count"); - return; + rule_count = bsde_get_rule_count(BUFSIZ, errstr); + if (rule_count == -1) { + fprintf(stderr, errstr); + exit (-1); } - if (len != sizeof(rule_count)) { - fprintf(stderr, "rule_count wrong size\n"); - return; - } -/* - if (rule_count == 1) - printf("%d rule\n", rule_count); - else - printf("%d rules\n", rule_count); -*/ + printf("%d slots, %d rules\n", rule_slots, rule_count); - len = 10; - error = get_mib(MIB ".rules", name, &len); - if (error) { - perror(MIB ".rules"); - return; - } + for (i = 0; i <= rule_slots; i++) { + error = bsde_get_rule(i, &rule, BUFSIZ, errstr); + switch (error) { + case -2: + continue; + case -1: + fprintf(stderr, "rule %d: %s\n", i, errstr); + continue; + case 0: + break; + } - len++; - for (i = 0; i <= rule_slots; i++) { - name[len-1] = i; - size = sizeof(rule); - error = sysctl(name, len, &rule, &size, NULL, 0); - if (error) { - if (errno != ENOENT) - perror(MIB); - } else if (size != sizeof(rule)) - fprintf(stderr, "rule size mismatch\n"); + if (bsde_rule_to_string(&rule, charstr, BUFSIZ) == -1) + printf("oops!\n"); else - print_rule(i, &rule); + printf("%d %s\n", i, charstr); } } void set_rule(int argc, char *argv[]) { + char errstr[BUFSIZ]; struct mac_bsdextended_rule rule; long value; - size_t size; - int name[10]; - int error, len, rulenum; + int error, rulenum; char *endp; if (argc < 1) @@ -503,33 +120,25 @@ rulenum = value; - error = parse_rule(argc - 1, argv + 1, &rule); - if (error) + error = bsde_parse_rule(argc - 1, argv + 1, &rule, BUFSIZ, errstr); + if (error) { + fprintf(stderr, "%s\n", errstr); return; + } - len = 10; - error = get_mib(MIB ".rules", name, &len); + error = bsde_set_rule(rulenum, &rule, BUFSIZ, errstr); if (error) { - perror(MIB ".rules"); + fprintf(stderr, "%s\n", errstr); return; } - - name[len] = rulenum; - len++; - - size = sizeof(rule); - error = sysctl(name, len, NULL, NULL, &rule, size); - if (error) - perror(MIB ".rules"); } void remove_rule(int argc, char *argv[]) { - struct mac_bsdextended_rule rule; + char errstr[BUFSIZ]; long value; - int name[10]; - int error, len, rulenum; + int error, rulenum; char *endp; if (argc != 1) @@ -544,18 +153,9 @@ rulenum = value; - len = 10; - error = get_mib(MIB ".rules", name, &len); - if (error) { - perror(MIB ".rules"); - return; - } - - name[len] = rulenum; - len++; - error = sysctl(name, len, NULL, NULL, &rule, 0); + error = bsde_delete_rule(rulenum, BUFSIZ, errstr); if (error) - perror("sysctl"); + fprintf(stderr, "%s\n", errstr); } int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Jul 29 21:29:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CE0E37B401; Mon, 29 Jul 2002 21:28:27 -0700 (PDT) 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 AE1CA37B400 for ; Mon, 29 Jul 2002 21:28:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C714943E42 for ; Mon, 29 Jul 2002 21:28:25 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6U4SPJU078305 for ; Mon, 29 Jul 2002 21:28:25 -0700 (PDT) (envelope-from bmilekic@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6U4SOBJ078302 for perforce@freebsd.org; Mon, 29 Jul 2002 21:28:24 -0700 (PDT) Date: Mon, 29 Jul 2002 21:28:24 -0700 (PDT) Message-Id: <200207300428.g6U4SOBJ078302@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bmilekic@freebsd.org using -f From: Bosko Milekic Subject: PERFORCE change 15168 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15168 Change 15168 by bmilekic@bmilekic_euclid on 2002/07/29 21:27:46 We are we are we are we are the engineers we can we can we can we can demolish forty beers so come so come so come so come alooong with us for we don't give a damn for any old man who don't give a damn for us (also: integ) Affected files ... .. //depot/projects/interrupt/sys/alpha/conf/gethints.awk#2 integrate .. //depot/projects/interrupt/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/alpha/include/ansi.h#5 integrate .. //depot/projects/interrupt/sys/alpha/include/limits.h#2 integrate .. //depot/projects/interrupt/sys/arm/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/arm/include/ansi.h#4 integrate .. //depot/projects/interrupt/sys/arm/include/limits.h#2 integrate .. //depot/projects/interrupt/sys/boot/i386/boot2/Makefile#4 integrate .. //depot/projects/interrupt/sys/boot/pc98/boot2/Makefile#4 integrate .. //depot/projects/interrupt/sys/conf/NOTES#4 integrate .. //depot/projects/interrupt/sys/conf/files#12 integrate .. //depot/projects/interrupt/sys/conf/files.sparc64#8 integrate .. //depot/projects/interrupt/sys/conf/gethints.awk#2 delete .. //depot/projects/interrupt/sys/conf/kern.post.mk#6 integrate .. //depot/projects/interrupt/sys/conf/kmod.mk#7 integrate .. //depot/projects/interrupt/sys/conf/options#9 integrate .. //depot/projects/interrupt/sys/dev/an/if_an.c#5 integrate .. //depot/projects/interrupt/sys/dev/ata/atapi-all.c#7 integrate .. //depot/projects/interrupt/sys/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/interrupt/sys/dev/ata/atapi-fd.c#7 integrate .. //depot/projects/interrupt/sys/dev/ata/atapi-tape.c#6 integrate .. //depot/projects/interrupt/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/interrupt/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/interrupt/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/interrupt/sys/dev/exca/exca.c#3 integrate .. //depot/projects/interrupt/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/interrupt/sys/dev/exca/excavar.h#2 integrate .. //depot/projects/interrupt/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/interrupt/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/interrupt/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/interrupt/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/interrupt/sys/dev/pccbb/pccbbdevid.h#3 integrate .. //depot/projects/interrupt/sys/dev/pccbb/pccbbreg.h#4 integrate .. //depot/projects/interrupt/sys/dev/pccbb/pccbbvar.h#4 integrate .. //depot/projects/interrupt/sys/dev/pci/pci.c#5 integrate .. //depot/projects/interrupt/sys/dev/si/si.c#3 integrate .. //depot/projects/interrupt/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/interrupt/sys/dev/wi/if_wi.c#9 integrate .. //depot/projects/interrupt/sys/dev/wi/if_wivar.h#4 integrate .. //depot/projects/interrupt/sys/dev/wi/wi_hostap.c#3 integrate .. //depot/projects/interrupt/sys/fs/devfs/devfs.h#4 integrate .. //depot/projects/interrupt/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/interrupt/sys/fs/procfs/procfs_ctl.c#5 integrate .. //depot/projects/interrupt/sys/fs/specfs/spec_vnops.c#6 integrate .. //depot/projects/interrupt/sys/i386/conf/NOTES#7 integrate .. //depot/projects/interrupt/sys/i386/conf/gethints.awk#2 integrate .. //depot/projects/interrupt/sys/i386/i386/db_trace.c#4 integrate .. //depot/projects/interrupt/sys/i386/i386/exception.s#9 integrate .. //depot/projects/interrupt/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/interrupt/sys/i386/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/i386/include/ansi.h#5 integrate .. //depot/projects/interrupt/sys/i386/include/limits.h#3 integrate .. //depot/projects/interrupt/sys/ia64/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/ia64/include/ansi.h#5 integrate .. //depot/projects/interrupt/sys/ia64/include/limits.h#2 integrate .. //depot/projects/interrupt/sys/kern/init_sysent.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/interrupt/sys/kern/kern_descrip.c#8 integrate .. //depot/projects/interrupt/sys/kern/kern_exec.c#9 integrate .. //depot/projects/interrupt/sys/kern/kern_fork.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_mac.c#1 branch .. //depot/projects/interrupt/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_proc.c#6 integrate .. //depot/projects/interrupt/sys/kern/kern_synch.c#7 integrate .. //depot/projects/interrupt/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/interrupt/sys/kern/syscalls.c#7 integrate .. //depot/projects/interrupt/sys/kern/syscalls.master#7 integrate .. //depot/projects/interrupt/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/interrupt/sys/kern/vfs_default.c#5 integrate .. //depot/projects/interrupt/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/interrupt/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/interrupt/sys/net/netisr.h#3 integrate .. //depot/projects/interrupt/sys/netinet/in_pcb.c#6 integrate .. //depot/projects/interrupt/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/interrupt/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/interrupt/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/interrupt/sys/netinet6/in6.h#5 integrate .. //depot/projects/interrupt/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/interrupt/sys/netinet6/udp6_usrreq.c#7 integrate .. //depot/projects/interrupt/sys/netipx/spx_debug.h#3 integrate .. //depot/projects/interrupt/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/interrupt/sys/netncp/ncp_lib.h#3 integrate .. //depot/projects/interrupt/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/interrupt/sys/pc98/conf/gethints.awk#2 integrate .. //depot/projects/interrupt/sys/pccard/pcic_pci.c#8 integrate .. //depot/projects/interrupt/sys/pccard/pcic_pci.h#4 integrate .. //depot/projects/interrupt/sys/powerpc/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/powerpc/include/ansi.h#5 integrate .. //depot/projects/interrupt/sys/powerpc/include/limits.h#2 integrate .. //depot/projects/interrupt/sys/sparc64/conf/GENERIC#8 integrate .. //depot/projects/interrupt/sys/sparc64/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/sparc64/include/ansi.h#5 integrate .. //depot/projects/interrupt/sys/sparc64/include/asmacros.h#4 integrate .. //depot/projects/interrupt/sys/sparc64/include/cpu.h#2 integrate .. //depot/projects/interrupt/sys/sparc64/include/limits.h#2 integrate .. //depot/projects/interrupt/sys/sparc64/include/pmap.h#6 integrate .. //depot/projects/interrupt/sys/sparc64/include/profile.h#3 integrate .. //depot/projects/interrupt/sys/sparc64/include/smp.h#7 integrate .. //depot/projects/interrupt/sys/sparc64/include/tlb.h#5 integrate .. //depot/projects/interrupt/sys/sparc64/include/tte.h#4 integrate .. //depot/projects/interrupt/sys/sparc64/sbus/sbus.c#4 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/cache.c#4 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/exception.s#6 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/genassym.c#9 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/locore.s#4 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/mp_exception.s#5 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/mp_locore.s#3 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/prof_machdep.c#1 branch .. //depot/projects/interrupt/sys/sparc64/sparc64/support.s#6 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/interrupt/sys/sparc64/sparc64/tsb.c#6 integrate .. //depot/projects/interrupt/sys/sys/mutex.h#5 integrate .. //depot/projects/interrupt/sys/sys/proc.h#7 integrate .. //depot/projects/interrupt/sys/sys/socketvar.h#8 integrate .. //depot/projects/interrupt/sys/sys/stdint.h#3 integrate .. //depot/projects/interrupt/sys/sys/syscall.h#7 integrate .. //depot/projects/interrupt/sys/sys/syscall.mk#7 integrate .. //depot/projects/interrupt/sys/sys/sysproto.h#7 integrate .. //depot/projects/interrupt/sys/sys/ucred.h#8 integrate .. //depot/projects/interrupt/sys/sys/vnode.h#7 integrate .. //depot/projects/interrupt/sys/ufs/ufs/ufs_readwrite.c#8 integrate .. //depot/projects/interrupt/sys/vm/vm_contig.c#6 integrate .. //depot/projects/interrupt/sys/vm/vm_fault.c#8 integrate .. //depot/projects/interrupt/sys/vm/vm_glue.c#8 integrate .. //depot/projects/interrupt/sys/vm/vm_kern.c#8 integrate .. //depot/projects/interrupt/sys/vm/vm_object.c#9 integrate .. //depot/projects/interrupt/sys/vm/vm_page.c#8 integrate .. //depot/projects/interrupt/sys/vm/vm_page.h#9 integrate .. //depot/projects/interrupt/sys/vm/vm_pageout.c#7 integrate .. //depot/projects/interrupt/sys/vm/vnode_pager.c#7 integrate .. //depot/projects/interrupt/sys/x86_64/include/_stdint.h#1 branch .. //depot/projects/interrupt/sys/x86_64/include/ansi.h#2 integrate .. //depot/projects/interrupt/sys/x86_64/include/limits.h#2 integrate Differences ... ==== //depot/projects/interrupt/sys/alpha/conf/gethints.awk#2 (text+ko) ==== @@ -6,7 +6,7 @@ # 'hints' directive. See how GENERIC and GENERIC.hints fit together for # a static example. You should use loader(8) if at all possible. # -# $FreeBSD: src/sys/alpha/conf/gethints.awk,v 1.1 2002/07/16 09:28:24 markm Exp $ +# $FreeBSD: src/sys/alpha/conf/gethints.awk,v 1.2 2002/07/26 03:52:29 peter Exp $ # skip commented lines, empty lines and not "device" lines /^[ \t]*#/ || /^[ \t]*$/ || !/[ \t]*device/ { next; } ==== //depot/projects/interrupt/sys/alpha/include/ansi.h#5 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.30 2002/07/08 16:41:46 mike Exp $ + * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.31 2002/07/29 17:41:06 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -155,19 +155,6 @@ typedef long __intmax_t; typedef unsigned long __uintmax_t; -#define __INT8_C(c) (c) -#define __INT16_C(c) (c) -#define __INT32_C(c) (c) -#define __INT64_C(c) (c ## L) - -#define __UINT8_C(c) (c) -#define __UINT16_C(c) (c) -#define __UINT32_C(c) (c ## U) -#define __UINT64_C(c) (c ## UL) - -#define __INTMAX_C(c) (c ## L) -#define __UINTMAX_C(c) (c ## UL) - /* * mbstate_t is an opaque object to keep conversion state, during multibyte * stream conversions. The content must not be referenced by user programs. ==== //depot/projects/interrupt/sys/alpha/include/limits.h#2 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/limits.h,v 1.8 2001/11/02 18:05:42 mike Exp $ + * $FreeBSD: src/sys/alpha/include/limits.h,v 1.9 2002/07/29 17:41:06 mike Exp $ */ #ifndef _MACHINE_LIMITS_H_ @@ -89,115 +89,6 @@ #define UQUAD_MAX (ULONG_MAX) /* max value for a uquad_t */ #define QUAD_MAX (LONG_MAX) /* max value for a quad_t */ #define QUAD_MIN (LONG_MIN) /* min value for a quad_t */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) -/* - * ISO/IEC 9899:1999 - * 7.18.2.1 Limits of exact-width integer types - */ -/* Minimum values of exact-width signed integer types. */ -#define INT8_MIN (-0x7f-1) -#define INT16_MIN (-0x7fff-1) -#define INT32_MIN (-0x7fffffff-1) -#define INT64_MIN (-0x7fffffffffffffffL-1) - -/* Maximum values of exact-width signed integer types. */ -#define INT8_MAX 0x7f -#define INT16_MAX 0x7fff -#define INT32_MAX 0x7fffffff -#define INT64_MAX 0x7fffffffffffffffL - -/* Maximum values of exact-width unsigned integer types. */ -#define UINT8_MAX 0xff -#define UINT16_MAX 0xffff -#define UINT32_MAX 0xffffffffU -#define UINT64_MAX 0xffffffffffffffffUL - -/* - * ISO/IEC 9899:1999 - * 7.18.2.2 Limits of minimum-width integer types - */ -/* Minimum values of minimum-width signed integer types. */ -#define INT_LEAST8_MIN SCHAR_MIN -#define INT_LEAST16_MIN SHRT_MIN -#define INT_LEAST32_MIN INT_MIN -#define INT_LEAST64_MIN LONG_MIN - -/* Maximum values of minimum-width signed integer types. */ -#define INT_LEAST8_MAX SCHAR_MAX -#define INT_LEAST16_MAX SHRT_MAX -#define INT_LEAST32_MAX INT_MAX -#define INT_LEAST64_MAX LONG_MAX - -/* Maximum values of minimum-width unsigned integer types. */ -#define UINT_LEAST8_MAX UCHAR_MAX -#define UINT_LEAST16_MAX USHRT_MAX -#define UINT_LEAST32_MAX UINT_MAX -#define UINT_LEAST64_MAX ULONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.2.3 Limits of fastest minimum-width integer types - */ -/* Minimum values of fastest minimum-width signed integer types. */ -#define INT_FAST8_MIN INT_MIN -#define INT_FAST16_MIN INT_MIN -#define INT_FAST32_MIN INT_MIN -#define INT_FAST64_MIN LONG_MIN - -/* Maximum values of fastest minimum-width signed integer types. */ -#define INT_FAST8_MAX INT_MAX -#define INT_FAST16_MAX INT_MAX -#define INT_FAST32_MAX INT_MAX -#define INT_FAST64_MAX LONG_MAX - -/* Maximum values of fastest minimum-width unsigned integer types. */ -#define UINT_FAST8_MAX UINT_MAX -#define UINT_FAST16_MAX UINT_MAX -#define UINT_FAST32_MAX UINT_MAX -#define UINT_FAST64_MAX ULONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.2.4 Limits of integer types capable of holding object pointers - */ -#define INTPTR_MIN LONG_MIN -#define INTPTR_MAX LONG_MAX -#define UINTPTR_MAX ULONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.2.5 Limits of greatest-width integer types - */ -#define INTMAX_MIN LONG_MIN -#define INTMAX_MAX LONG_MAX -#define UINTMAX_MAX ULONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.3 Limits of other integer types - */ -/* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN LONG_MIN -#define PTRDIFF_MAX LONG_MAX - -/* Limits of sig_atomic_t. */ -#define SIG_ATOMIC_MIN INT_MIN -#define SIG_ATOMIC_MAX INT_MAX - -/* Limit of size_t. */ -#define SIZE_MAX ULONG_MAX - -#ifndef WCHAR_MIN /* Also possibly defined in */ -/* Limits of wchar_t. */ -#define WCHAR_MIN INT_MIN -#define WCHAR_MAX INT_MAX - -/* Limits of wint_t. */ -#define WINT_MIN INT_MIN -#define WINT_MAX INT_MAX -#endif -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ #endif /* !_POSIX_SOURCE && !_XOPEN_SOURCE */ #endif /* !_ANSI_SOURCE */ ==== //depot/projects/interrupt/sys/arm/include/ansi.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/ansi.h,v 1.18 2002/07/08 16:41:46 mike Exp $ + * $FreeBSD: src/sys/arm/include/ansi.h,v 1.19 2002/07/29 17:41:07 mike Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -162,19 +162,6 @@ typedef __int64_t __intmax_t; typedef __uint64_t __uintmax_t; -#define __INT8_C(c) (c) -#define __INT16_C(c) (c) -#define __INT32_C(c) (c) -#define __INT64_C(c) (c ## LL) - -#define __UINT8_C(c) (c) -#define __UINT16_C(c) (c) -#define __UINT32_C(c) (c ## U) -#define __UINT64_C(c) (c ## ULL) - -#define __INTMAX_C(c) (c ## LL) -#define __UINTMAX_C(c) (c ## ULL) - /* * mbstate_t is an opaque object to keep conversion state, during multibyte * stream conversions. The content must not be referenced by user programs. ==== //depot/projects/interrupt/sys/arm/include/limits.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/limits.h,v 1.1 2001/12/09 18:30:04 obrien Exp $ + * $FreeBSD: src/sys/arm/include/limits.h,v 1.2 2002/07/29 17:41:07 mike Exp $ */ #ifndef _MACHINE_LIMITS_H_ @@ -100,115 +100,6 @@ #define UQUAD_MAX ULLONG_MAX /* max value for a uquad_t */ #define QUAD_MAX LLONG_MAX /* max value for a quad_t */ #define QUAD_MIN LLONG_MIN /* min value for a quad_t */ - -#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) -/* - * ISO/IEC 9899:1999 - * 7.18.2.1 Limits of exact-width integer types - */ -/* Minimum values of exact-width signed integer types. */ -#define INT8_MIN (-0x7f-1) -#define INT16_MIN (-0x7fff-1) -#define INT32_MIN (-0x7fffffff-1) -#define INT64_MIN (-0x7fffffffffffffffLL-1) - -/* Maximum values of exact-width signed integer types. */ -#define INT8_MAX 0x7f -#define INT16_MAX 0x7fff -#define INT32_MAX 0x7fffffff -#define INT64_MAX 0x7fffffffffffffffLL - -/* Maximum values of exact-width unsigned integer types. */ -#define UINT8_MAX 0xff -#define UINT16_MAX 0xffff -#define UINT32_MAX 0xffffffffU -#define UINT64_MAX 0xffffffffffffffffULL - -/* - * ISO/IEC 9899:1999 - * 7.18.2.2 Limits of minimum-width integer types - */ -/* Minimum values of minimum-width signed integer types. */ -#define INT_LEAST8_MIN SCHAR_MIN -#define INT_LEAST16_MIN SHRT_MIN -#define INT_LEAST32_MIN INT_MIN -#define INT_LEAST64_MIN LLONG_MIN - -/* Maximum values of minimum-width signed integer types. */ -#define INT_LEAST8_MAX SCHAR_MAX -#define INT_LEAST16_MAX SHRT_MAX -#define INT_LEAST32_MAX INT_MAX -#define INT_LEAST64_MAX LLONG_MAX - -/* Maximum values of minimum-width unsigned integer types. */ -#define UINT_LEAST8_MAX UCHAR_MAX -#define UINT_LEAST16_MAX USHRT_MAX -#define UINT_LEAST32_MAX UINT_MAX -#define UINT_LEAST64_MAX ULLONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.2.3 Limits of fastest minimum-width integer types - */ -/* Minimum values of fastest minimum-width signed integer types. */ -#define INT_FAST8_MIN INT_MIN -#define INT_FAST16_MIN INT_MIN -#define INT_FAST32_MIN INT_MIN -#define INT_FAST64_MIN LLONG_MIN - -/* Maximum values of fastest minimum-width signed integer types. */ -#define INT_FAST8_MAX INT_MAX -#define INT_FAST16_MAX INT_MAX -#define INT_FAST32_MAX INT_MAX -#define INT_FAST64_MAX LLONG_MAX - -/* Maximum values of fastest minimum-width unsigned integer types. */ -#define UINT_FAST8_MAX UINT_MAX -#define UINT_FAST16_MAX UINT_MAX -#define UINT_FAST32_MAX UINT_MAX -#define UINT_FAST64_MAX ULLONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.2.4 Limits of integer types capable of holding object pointers - */ -#define INTPTR_MIN INT_MIN -#define INTPTR_MAX INT_MAX -#define UINTPTR_MAX UINT_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.2.5 Limits of greatest-width integer types - */ -#define INTMAX_MIN LLONG_MIN -#define INTMAX_MAX LLONG_MAX -#define UINTMAX_MAX ULLONG_MAX - -/* - * ISO/IEC 9899:1999 - * 7.18.3 Limits of other integer types - */ -/* Limits of ptrdiff_t. */ -#define PTRDIFF_MIN INT_MIN -#define PTRDIFF_MAX INT_MAX - -/* Limits of sig_atomic_t. */ -#define SIG_ATOMIC_MIN INT_MIN -#define SIG_ATOMIC_MAX INT_MAX - -/* Limit of size_t. */ -#define SIZE_MAX UINT_MAX - -#ifndef WCHAR_MIN /* Also possibly defined in */ -/* Limits of wchar_t. */ -#define WCHAR_MIN INT_MIN -#define WCHAR_MAX INT_MAX - -/* Limits of wint_t. */ -#define WINT_MIN INT_MIN -#define WINT_MAX INT_MAX -#endif -#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ #endif /* !_POSIX_SOURCE */ #endif /* !_ANSI_SOURCE */ ==== //depot/projects/interrupt/sys/boot/i386/boot2/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.31 2002/06/21 11:00:00 phk Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.32 2002/07/29 09:40:14 ru Exp $ PROG= boot2 NOMAN= @@ -86,9 +86,9 @@ ${.IMPSRC} -o ${.TARGET} install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot1 ${DESTDIR}${BINDIR}/boot1 - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot2 ${DESTDIR}${BINDIR}/boot2 .include ==== //depot/projects/interrupt/sys/boot/pc98/boot2/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.9 2002/05/26 10:11:17 n_hibma Exp $ +# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.10 2002/07/29 09:40:15 ru Exp $ # PROG= boot @@ -83,7 +83,7 @@ all: boot1 boot2 install: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ boot1 boot2 ${DESTDIR}${BINDIR} .include ==== //depot/projects/interrupt/sys/conf/NOTES#4 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1059 2002/07/21 23:20:29 peter Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1060 2002/07/27 19:50:28 rwatson Exp $ # # @@ -725,6 +725,14 @@ ##################################################################### +# SECURITY POLICY PARAMETERS + +# Support for Mandatory Access Control (MAC) +#options MAC +#options MAC_NONE # Statically link mac_none policy + + +##################################################################### # CLOCK OPTIONS # The granularity of operation is controlled by the kernel option HZ whose ==== //depot/projects/interrupt/sys/conf/files#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.674 2002/07/24 12:43:27 jhb Exp $ +# $FreeBSD: src/sys/conf/files,v 1.675 2002/07/30 02:04:56 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -873,6 +873,7 @@ kern/kern_linker.c standard kern/kern_lock.c standard kern/kern_lockf.c standard +kern/kern_mac.c standard kern/kern_malloc.c standard kern/kern_mib.c standard kern/kern_module.c standard ==== //depot/projects/interrupt/sys/conf/files.sparc64#8 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.27 2002/07/24 12:43:27 jhb Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.28 2002/07/29 00:45:13 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -56,6 +56,7 @@ sparc64/sparc64/ofw_bus.c standard sparc64/sparc64/ofw_machdep.c standard sparc64/sparc64/pmap.c standard +sparc64/sparc64/prof_machdep.c optional profiling-routine sparc64/sparc64/rwindow.c standard sparc64/sparc64/sparcbus_if.m standard sparc64/sparc64/support.s standard ==== //depot/projects/interrupt/sys/conf/kern.post.mk#6 (text+ko) ==== @@ -6,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.22 2002/07/18 12:02:20 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.23 2002/07/29 09:40:15 ru Exp $ # # XXX why are only some phony targets marked phony? @@ -157,17 +157,17 @@ .endif mkdir -p ${DESTDIR}${KODIR} .if defined(DEBUG) && defined(INSTALL_DEBUG) - ${INSTALL} ${COPY} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} + ${INSTALL} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} .else - ${INSTALL} ${COPY} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} + ${INSTALL} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} .endif kernel-reinstall: @-chflags -R noschg ${DESTDIR}${KODIR} .if defined(DEBUG) && defined(INSTALL_DEBUG) - ${INSTALL} ${COPY} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} + ${INSTALL} -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR} .else - ${INSTALL} ${COPY} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} + ${INSTALL} -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR} .endif .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules) ==== //depot/projects/interrupt/sys/conf/kmod.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.127 2002/07/17 08:21:50 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.128 2002/07/29 09:40:15 ru Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -205,11 +205,11 @@ .ORDER: beforeinstall _kmodinstall .if defined(DEBUG) && defined(INSTALL_DEBUG) _kmodinstall: - ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ + ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR} .else _kmodinstall: - ${INSTALL} ${COPY} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ + ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \ ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR} .include ==== //depot/projects/interrupt/sys/conf/options#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.338 2002/07/21 21:37:09 peter Exp $ +# $FreeBSD: src/sys/conf/options,v 1.340 2002/07/27 19:50:28 rwatson Exp $ # # On the handling of kernel options # @@ -120,7 +120,12 @@ _KPOSIX_PRIORITY_SCHEDULING opt_posix.h _KPOSIX_VERSION opt_posix.h -# TrustedBSD and POSIX.1e Kernel Options +##################################################################### +# SECURITY POLICY PARAMETERS + +# Support for Mandatory Access Control (MAC) +MAC opt_mac.h +MAC_NONE opt_dontuse.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h @@ -443,7 +448,6 @@ MSGBUF_SIZE opt_msgbuf.h # PCI related options -PCI_ENABLE_IO_MODES opt_pci.h PCI_ALLOW_UNSUPPORTED_IO_RANGE opt_pci.h # NFS options ==== //depot/projects/interrupt/sys/dev/an/if_an.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/an/if_an.c,v 1.35 2002/04/04 21:03:14 jhb Exp $ + * $FreeBSD: src/sys/dev/an/if_an.c,v 1.36 2002/07/27 21:28:40 fenner Exp $ */ /* @@ -43,7 +43,7 @@ /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. * This driver supports all three device types (PCI devices are supported - * through an extra PCI shim: /sys/pci/if_an_p.c). ISA devices can be + * through an extra PCI shim: /sys/dev/an/if_an_pci.c). ISA devices can be * supported either using hard-coded IO port/IRQ settings or via Plug * and Play. The 4500 series devices support 1Mbps and 2Mbps data rates. * The 4800 devices support 1, 2, 5.5 and 11Mbps rates. @@ -132,7 +132,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/an/if_an.c,v 1.35 2002/04/04 21:03:14 jhb Exp $"; + "$FreeBSD: src/sys/dev/an/if_an.c,v 1.36 2002/07/27 21:28:40 fenner Exp $"; #endif /* These are global because we need them in sys/pci/if_an_p.c. */ ==== //depot/projects/interrupt/sys/dev/ata/atapi-all.c#7 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-all.c,v 1.90 2002/07/22 18:36:14 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-all.c,v 1.91 2002/07/28 23:59:00 sos Exp $ */ #include "opt_ata.h" @@ -274,7 +274,9 @@ /* if DMA enabled setup DMA hardware */ request->flags &= ~ATPR_F_DMA_USED; if ((atadev->mode >= ATA_DMA) && - (request->ccb[0] == ATAPI_READ || request->ccb[0] == ATAPI_READ_BIG || + (request->ccb[0] == ATAPI_READ || + request->ccb[0] == ATAPI_READ_BIG || + request->ccb[0] == ATAPI_READ_CD || ((request->ccb[0] == ATAPI_WRITE || request->ccb[0] == ATAPI_WRITE_BIG) && !(atadev->channel->flags & ATA_ATAPI_DMA_RO))) && @@ -283,7 +285,8 @@ } /* start ATAPI operation */ - if (ata_command(atadev, ATA_C_PACKET_CMD, (request->bytecount << 8), 0, + if (ata_command(atadev, ATA_C_PACKET_CMD, + min(request->bytecount, 65534) << 8, 0, (request->flags & ATPR_F_DMA_USED) ? ATA_F_DMA : 0, ATA_IMMEDIATE)) ata_prtdev(atadev, "failure to send ATAPI packet command\n"); ==== //depot/projects/interrupt/sys/dev/ata/atapi-cd.c#6 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.119 2002/05/28 17:39:17 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.122 2002/07/28 23:59:00 sos Exp $ */ #include "opt_ata.h" @@ -74,6 +74,7 @@ /* prototypes */ static struct acd_softc *acd_init_lun(struct ata_device *); static void acd_make_dev(struct acd_softc *); +static void acd_set_ioparm(struct acd_softc *); static void acd_describe(struct acd_softc *); static void lba2msf(u_int32_t, u_int8_t *, u_int8_t *, u_int8_t *); static u_int32_t msf2lba(u_int8_t, u_int8_t, u_int8_t); @@ -282,13 +283,19 @@ make_dev_alias(dev, "acd%da", cdp->lun); make_dev_alias(dev, "acd%dc", cdp->lun); dev->si_drv1 = cdp; - dev->si_iosize_max = 252 * DEV_BSIZE; - dev->si_bsize_phys = 2048; /* XXX SOS */ cdp->dev = dev; cdp->device->flags |= ATA_D_MEDIA_CHANGED; cdp->clone_evh = EVENTHANDLER_REGISTER(dev_clone, acd_clone, cdp, 1000); + acd_set_ioparm(cdp); } +static void +acd_set_ioparm(struct acd_softc *cdp) +{ + cdp->dev->si_iosize_max = ((256*DEV_BSIZE)/cdp->block_size)*cdp->block_size; + cdp->dev->si_bsize_phys = cdp->block_size; +} + static void acd_describe(struct acd_softc *cdp) { @@ -1011,6 +1018,7 @@ case CDRIOCSETBLOCKSIZE: cdp->block_size = *(int *)addr; + acd_set_ioparm(cdp); break; case CDRIOCGETPROGRESS: @@ -1255,6 +1263,7 @@ cdp->toc.hdr.len = ntohs(cdp->toc.hdr.len); cdp->block_size = (cdp->toc.tab[0].control & 4) ? 2048 : 2352; + acd_set_ioparm(cdp); bzero(ccb, sizeof(ccb)); ccb[0] = ATAPI_READ_CAPACITY; if (atapi_queue_cmd(cdp->device, ccb, (caddr_t)sizes, sizeof(sizes), @@ -1515,7 +1524,7 @@ param.session_format = CDR_SESS_CDROM_XA; break; } - + acd_set_ioparm(cdp); return acd_mode_select(cdp, (caddr_t)¶m, param.page_length + 10); } ==== //depot/projects/interrupt/sys/dev/ata/atapi-fd.c#7 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.74 2002/07/22 18:37:33 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.77 2002/07/28 23:59:00 sos Exp $ */ #include @@ -107,13 +107,8 @@ dev = disk_create(fdp->lun, &fdp->disk, 0, &afd_cdevsw, &afddisk_cdevsw); dev->si_drv1 = fdp; fdp->dev = dev; + fdp->dev->si_iosize_max = 256 * DEV_BSIZE; - if (!strncmp(atadev->param->model, "IOMEGA ZIP", 10) || - !strncmp(atadev->param->model, "IOMEGA Clik!", 12)) - fdp->dev->si_iosize_max = 64 * DEV_BSIZE; - else - fdp->dev->si_iosize_max = 252 * DEV_BSIZE; - afd_describe(fdp); atadev->flags |= ATA_D_MEDIA_CHANGED; atadev->driver = fdp; @@ -328,7 +323,7 @@ } lba = bp->bio_pblkno; - count = min(bp->bio_bcount, fdp->dev->si_iosize_max) / fdp->cap.sector_size; + count = bp->bio_bcount / fdp->cap.sector_size; data_ptr = bp->bio_data; bp->bio_resid = bp->bio_bcount; ==== //depot/projects/interrupt/sys/dev/ata/atapi-tape.c#6 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.67 2002/04/05 13:13:56 sos Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.70 2002/07/28 23:59:00 sos Exp $ */ #include "opt_ata.h" @@ -132,12 +132,12 @@ dev = make_dev(&ast_cdevsw, dkmakeminor(stp->lun, 0, 0), UID_ROOT, GID_OPERATOR, 0640, "ast%d", stp->lun); dev->si_drv1 = stp; - dev->si_iosize_max = 252 * DEV_BSIZE; + dev->si_iosize_max = 256 * DEV_BSIZE; stp->dev1 = dev; dev = make_dev(&ast_cdevsw, dkmakeminor(stp->lun, 0, 1), UID_ROOT, GID_OPERATOR, 0640, "nast%d", stp->lun); dev->si_drv1 = stp; - dev->si_iosize_max = 252 * DEV_BSIZE; + dev->si_iosize_max = 256 * DEV_BSIZE; stp->dev2 = dev; stp->device->flags |= ATA_D_MEDIA_CHANGED; ast_describe(stp); ==== //depot/projects/interrupt/sys/dev/bge/if_bge.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.17 2002/07/04 23:19:20 jdp Exp $ + * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.18 2002/07/26 03:47:07 jdp Exp $ */ /* @@ -122,7 +122,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.17 2002/07/04 23:19:20 jdp Exp $"; + "$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.18 2002/07/26 03:47:07 jdp Exp $"; #endif /* @@ -145,6 +145,8 @@ "SysKonnect Gigabit Ethernet" }, { ALTIMA_VENDORID, ALTIMA_DEVICE_AC1000, "Altima AC1000 Gigabit Ethernet" }, + { ALTIMA_VENDORID, ALTIMA_DEVICE_AC9100, + "Altima AC9100 Gigabit Ethernet" }, { 0, 0, NULL } }; ==== //depot/projects/interrupt/sys/dev/bge/if_bgereg.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.5 2002/06/24 22:04:15 jdp Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.6 2002/07/26 03:47:08 jdp Exp $ */ /* @@ -1811,6 +1811,7 @@ */ #define ALTIMA_VENDORID 0x173b #define ALTIMA_DEVICE_AC1000 0x03e8 +#define ALTIMA_DEVICE_AC9100 0x03ea /* * Offset of MAC address inside EEPROM. ==== //depot/projects/interrupt/sys/dev/ed/if_ed_isa.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.10 2002/03/20 02:07:18 alfred Exp $ + * $FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.11 2002/07/26 17:33:58 takawata Exp $ */ #include @@ -56,6 +56,7 @@ { 0x19808c4a, NULL }, /* RTL8019 */ { 0x0090252a, NULL }, /* JQE9000 */ { 0x0020832e, NULL }, /* KTC2000 */ + { 0x4cf48906, NULL }, /* ATIf44c */ { 0, NULL } }; ==== //depot/projects/interrupt/sys/dev/exca/exca.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/exca/exca.c,v 1.4 2002/06/01 16:21:26 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/exca/exca.c,v 1.5 2002/07/26 08:01:08 imp Exp $ */ /* * Copyright (c) 2002 M Warner Losh. All rights reserved. @@ -82,7 +82,6 @@ #define DPRINTF(fmt, args...) #endif - /* memory */ #define EXCA_MEMINFO(NUM) { \ @@ -198,6 +197,11 @@ } if (win >= EXCA_MEM_WINS) return (1); + if (((rman_get_start(res) >> EXCA_CARDMEM_ADDRX_SHIFT) & 0xff) != 0 && + (sc->flags & EXCA_HAS_MEMREG_WIN) == 0) { + device_printf(sc->dev, "Does not support mapping above 24M."); + return (1); + } sc->mem[win].cardaddr = 0; sc->mem[win].memt = rman_get_bustag(res); @@ -555,13 +559,10 @@ * Initialize the exca_softc data structure for the first time. */ void -exca_init(struct exca_softc *sc, device_t dev, exca_write_t *wrfn, - exca_read_t *rdfn, bus_space_tag_t bst, bus_space_handle_t bsh, - uint32_t offset) +exca_init(struct exca_softc *sc, device_t dev, + bus_space_tag_t bst, bus_space_handle_t bsh, uint32_t offset) { sc->dev = dev; - sc->write_exca = wrfn; - sc->read_exca = rdfn; sc->memalloc = 0; sc->ioalloc = 0; sc->bst = bst; @@ -580,8 +581,7 @@ * "exca" parameter. */ int -exca_probe_slots(device_t dev, struct exca_softc *exca, exca_write_t writefnp, - exca_read_t readfnp) +exca_probe_slots(device_t dev, struct exca_softc *exca) { int rid; struct resource *res; @@ -599,8 +599,7 @@ iot = rman_get_bustag(res); ioh = rman_get_bushandle(res); for (i = 0; i < EXCA_NSLOTS; i++) { - exca_init(&exca[i], dev, writefnp, readfnp, iot, ioh, - i * EXCA_SOCKET_SIZE); + exca_init(&exca[i], dev, iot, ioh, i * EXCA_SOCKET_SIZE); if (exca_is_pcic(&exca[i])) { err = 0; exca[i].flags |= EXCA_SOCKET_PRESENT; ==== //depot/projects/interrupt/sys/dev/exca/excareg.h#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 9:32:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5130C37B401; Tue, 30 Jul 2002 09:31:38 -0700 (PDT) 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 CE71237B400 for ; Tue, 30 Jul 2002 09:31:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6DEF43E42 for ; Tue, 30 Jul 2002 09:31:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UGVZJU009423 for ; Tue, 30 Jul 2002 09:31:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UGVYT2009419 for perforce@freebsd.org; Tue, 30 Jul 2002 09:31:34 -0700 (PDT) Date: Tue, 30 Jul 2002 09:31:34 -0700 (PDT) Message-Id: <200207301631.g6UGVYT2009419@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15198 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15198 Change 15198 by rwatson@rwatson_tislabs on 2002/07/30 09:30:42 Integrate -CURRENT changes since yesterday, including the kern_mac.c stubs and system call changes I committed. Affected files ... .. //depot/projects/trustedbsd/base/contrib/traceroute/findsaddr-socket.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/CHANGES#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Configure#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FAQ#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/INSTALL#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/LICENSE#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.org#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/NEWS#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/README#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/STATUS#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/TABLE#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/apps/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/apps/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ca.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dgst.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/dsaparam.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/eay.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/apps/enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/openssl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pem_mail.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pkcs12.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/req.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rsa/01.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rsa/1.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rsa/SecureServer.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/apps/rsa/s.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/apps/s_time.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/smime.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/tkca#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/certs/rsa-ssca.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/config#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_bitstr.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_gentm.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_sign.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_time.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_utctm.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/pkcs8.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bf/Makefile.uni#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_print.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_sock.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bf_lbuf.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bio.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_bio.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_log.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_comba.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_opts.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/comba.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/d.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/new#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/old/b_sqr.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/old/bn_com.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/old/bn_high.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/old/bn_ka.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/old/bn_low.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/old/bn_m.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/old/bn_mul.c.works#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/old/bn_wmul.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/old/build#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/old/info#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/old/test.works#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/buffer/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cast/Makefile.uni#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/comp/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_api.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_def.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_lcl.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/keysets.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/DES.pod#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/MODES.DES#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/Makefile.PL#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/Makefile.lit#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/Makefile.uni#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/PC1#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/PC2#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des.man#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des_crypt.man#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/doIP#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/doPC1#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/doPC2#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/fcrypt.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/podd.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/read_pwd.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/shifts.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/sk.h#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/supp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/testdes.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dh_gen.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dh/dhtest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/err/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cbc_3d.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cbc_bf.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cbc_c.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cbc_d.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cbc_i.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cbc_r2.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cbc_r5.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cfb_3d.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cfb_bf.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cfb_c.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cfb_d.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cfb_i.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cfb_r2.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_cfb_r5.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ecb_3d.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ecb_bf.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ecb_c.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ecb_d.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ecb_i.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ecb_r2.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ecb_r5.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ofb_3d.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ofb_bf.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ofb_c.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ofb_d.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ofb_i.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ofb_r2.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/e_ofb_r5.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/encode.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/hmac/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/idea/Makefile.uni#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/lhash/lh_test.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md2/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md4/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/md5/Makefile.uni#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mdc2/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_mac.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/objects.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/objects.txt#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslv.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_info.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/README#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_doit.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_egd.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rand/rand_win.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc2/Makefile.uni#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc4/Makefile.uni#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc5/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rc5/Makefile.uni#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ripemd/Makefile.uni#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_oaep.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_oaep_test.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/sha/Makefile.uni#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/stack/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/tmdiff.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/txt_db/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/README#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_utl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/b64.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/maurice/example1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/dep/crypto.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/dep/files#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/dep/gen.pl#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/dep/ssl.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto.pod#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BN_bn2bin.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/RSA_generate_key.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/blowfish.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/crypto.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/des_modes.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/openssl.pod#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl.pod#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_clear.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/ssl.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/e_os.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/e_os2.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/mt/README#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/mt/mttest.c#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/mt/profile.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/mt/pthread.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/mt/purify.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/mt/solaris.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/openssl.spec#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/shlib/Makefile.hpux10-cc#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/shlib/hpux10-cc.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/shlib/irix.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/shlib/solaris-sc4.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/shlib/solaris.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/shlib/sun.sh#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_both.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_clnt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_pkt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_srvr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl3.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_cert.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_sess.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/t1_enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/Makefile.save#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/test/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/dsa-ca.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/test/dsa-pca.pem#2 delete .. //depot/projects/trustedbsd/base/crypto/openssl/util/libeay.num#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/selftest.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/sep_lib.sh#2 delete .. //depot/projects/trustedbsd/base/lib/libc/sys/fork.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/rfork.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_opie/pam_opie.c#9 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#30 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/dir.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsck.h#6 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsutil.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/inode.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/main.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass1.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass2.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass5.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/utilities.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/fsdb.h#6 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/des_crypt.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/wi.4#4 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs_data.h#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#1 branch .. //depot/projects/trustedbsd/base/sys/kern/kern_switch.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#8 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/profile.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/cache.c#7 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.S#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/locore.S#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_exception.S#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_locore.S#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_locore.s#4 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/support.S#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/support.s#10 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/swtch.S#1 branch .. //depot/projects/trustedbsd/base/sys/sys/proc.h#17 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#16 integrate .. //depot/projects/trustedbsd/base/sys/tools/vnode_if.awk#4 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_alloc.c#11 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_extern.h#7 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_subr.c#5 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#14 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#12 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#12 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/tr/tr.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kgmon/kgmon.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/chap.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pppd/main.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/base/contrib/traceroute/findsaddr-socket.c#2 (text+ko) ==== @@ -29,6 +29,8 @@ * 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. + * + * $FreeBSD: src/contrib/traceroute/findsaddr-socket.c,v 1.2 2002/07/30 04:49:13 fenner Exp $ */ /* XXX Yes this is WAY too complicated */ @@ -193,9 +195,9 @@ } if (SALEN(sa) == 0) - cp += sizeof(u_int32_t); + cp += sizeof(long); else - cp += roundup(SALEN(sa), sizeof(u_int32_t)); + cp += roundup(SALEN(sa), sizeof(long)); } return ("failed!"); ==== //depot/projects/trustedbsd/base/crypto/openssl/CHANGES#3 (text+ko) ==== @@ -2,6 +2,126 @@ OpenSSL CHANGES _______________ + Changes between 0.9.6c and 0.9.6d [9 May 2002] + + *) Fix crypto/asn1/a_sign.c so that 'parameters' is omitted (not + encoded as NULL) with id-dsa-with-sha1. + [Nils Larsch ; problem pointed out by Bodo Moeller] + + *) Check various X509_...() return values in apps/req.c. + [Nils Larsch ] + + *) Fix BASE64 decode (EVP_DecodeUpdate) for data with CR/LF ended lines: + an end-of-file condition would erronously be flagged, when the CRLF + was just at the end of a processed block. The bug was discovered when + processing data through a buffering memory BIO handing the data to a + BASE64-decoding BIO. Bug fund and patch submitted by Pavel Tsekov + and Nedelcho Stanev. + [Lutz Jaenicke] + + *) Implement a countermeasure against a vulnerability recently found + in CBC ciphersuites in SSL 3.0/TLS 1.0: Send an empty fragment + before application data chunks to avoid the use of known IVs + with data potentially chosen by the attacker. + [Bodo Moeller] + + *) Fix length checks in ssl3_get_client_hello(). + [Bodo Moeller] + + *) TLS/SSL library bugfix: use s->s3->in_read_app_data differently + to prevent ssl3_read_internal() from incorrectly assuming that + ssl3_read_bytes() found application data while handshake + processing was enabled when in fact s->s3->in_read_app_data was + merely automatically cleared during the initial handshake. + [Bodo Moeller; problem pointed out by Arne Ansper ] + + *) Fix object definitions for Private and Enterprise: they were not + recognized in their shortname (=lowercase) representation. Extend + obj_dat.pl to issue an error when using undefined keywords instead + of silently ignoring the problem (Svenning Sorensen + ). + [Lutz Jaenicke] + + *) Fix DH_generate_parameters() so that it works for 'non-standard' + generators, i.e. generators other than 2 and 5. (Previously, the + code did not properly initialise the 'add' and 'rem' values to + BN_generate_prime().) + + In the new general case, we do not insist that 'generator' is + actually a primitive root: This requirement is rather pointless; + a generator of the order-q subgroup is just as good, if not + better. + [Bodo Moeller] + + *) Map new X509 verification errors to alerts. Discovered and submitted by + Tom Wu . + [Lutz Jaenicke] + + *) Fix ssl3_pending() (ssl/s3_lib.c) to prevent SSL_pending() from + returning non-zero before the data has been completely received + when using non-blocking I/O. + [Bodo Moeller; problem pointed out by John Hughes] + + *) Some of the ciphers missed the strength entry (SSL_LOW etc). + [Ben Laurie, Lutz Jaenicke] + + *) Fix bug in SSL_clear(): bad sessions were not removed (found by + Yoram Zahavi ). + [Lutz Jaenicke] + + *) Add information about CygWin 1.3 and on, and preserve proper + configuration for the versions before that. + [Corinna Vinschen and Richard Levitte] + + *) Make removal from session cache (SSL_CTX_remove_session()) more robust: + check whether we deal with a copy of a session and do not delete from + the cache in this case. Problem reported by "Izhar Shoshani Levi" + . + [Lutz Jaenicke] + + *) Do not store session data into the internal session cache, if it + is never intended to be looked up (SSL_SESS_CACHE_NO_INTERNAL_LOOKUP + flag is set). Proposed by Aslam . + [Lutz Jaenicke] + + *) Have ASN1_BIT_STRING_set_bit() really clear a bit when the requested + value is 0. + [Richard Levitte] + + *) [In 0.9.6c-engine release:] + Fix a crashbug and a logic bug in hwcrhk_load_pubkey() + [Toomas Kiisk via Richard Levitte] + + *) Add the configuration target linux-s390x. + [Neale Ferguson via Richard Levitte] + + *) The earlier bugfix for the SSL3_ST_SW_HELLO_REQ_C case of + ssl3_accept (ssl/s3_srvr.c) incorrectly used a local flag + variable as an indication that a ClientHello message has been + received. As the flag value will be lost between multiple + invocations of ssl3_accept when using non-blocking I/O, the + function may not be aware that a handshake has actually taken + place, thus preventing a new session from being added to the + session cache. + + To avoid this problem, we now set s->new_session to 2 instead of + using a local variable. + [Lutz Jaenicke, Bodo Moeller] + + *) Bugfix: Return -1 from ssl3_get_server_done (ssl3/s3_clnt.c) + if the SSL_R_LENGTH_MISMATCH error is detected. + [Geoff Thorpe, Bodo Moeller] + + *) New 'shared_ldflag' column in Configure platform table. + [Richard Levitte] + + *) Fix EVP_CIPHER_mode macro. + ["Dan S. Camper" ] + + *) Fix ssl3_read_bytes (ssl/s3_pkt.c): To ignore messages of unknown + type, we must throw them away by setting rr->length to 0. + [D P Chang ] + Changes between 0.9.6b and 0.9.6c [21 dec 2001] *) Fix BN_rand_range bug pointed out by Dominikus Scherkl ==== //depot/projects/trustedbsd/base/crypto/openssl/Configure#3 (text+ko) ==== @@ -10,7 +10,7 @@ # see INSTALL for instructions. -my $usage="Usage: Configure [no- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [rsaref] [no-threads] [no-asm] [no-dso] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] os/compiler[:flags]\n"; +my $usage="Usage: Configure [no- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [rsaref] [no-threads] [no-asm] [no-dso] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--test-sanity] os/compiler[:flags]\n"; # Options: # @@ -23,6 +23,9 @@ # default). This needn't be set in advance, you can # just as well use "make INSTALL_PREFIX=/whatever install". # +# --test-sanity Make a number of sanity checks on the data in this file. +# This is a debugging tool for OpenSSL developers. +# # rsaref use RSAref # [no-]threads [don't] try to create a library that is suitable for # multithreaded applications (default is "threads" if we @@ -97,7 +100,7 @@ # -DB_ENDIAN slows things down on a sparc for md5, but helps sha1. # So the md5_locl.h file has an undef B_ENDIAN if sun is defined -#config-string $cc : $cflags : $unistd : $thread_cflag : $lflags : $bn_ops : $bn_obj : $des_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $dso_scheme : $shared_target : $shared_cflag +#config-string $cc : $cflags : $unistd : $thread_cflag : $lflags : $bn_ops : $bn_obj : $des_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib my %table=( # File 'TABLE' (created by 'make TABLE') contains the data from this list, @@ -132,35 +135,35 @@ # surrounds it with #APP #NO_APP comment pair which (at least Solaris # 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic" # error message. -"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DNO_INLINE_ASM::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DNO_INLINE_ASM::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### Solaris x86 with Sun C setups -"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### SPARC Solaris with GNU C setups -"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8 # but keep the assembler modules. -"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### -"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### SPARC Solaris with Sun C setups # DO NOT use /xO[34] on sparc with SC3.0. It is broken, and will not pass the tests -"solaris-sparc-sc3","cc:-fast -O -Xa -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparc-sc3","cc:-fast -O -Xa -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # SC4.0 doesn't pass 'make test', upgrade to SC5.0 or SC4.2. # SC4.2 is ok, better than gcc even on bn as long as you tell it -xarch=v8 # SC5.0 note: Compiler common patch 107357-01 or later is required! -"solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", +"solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:-xarch=v9:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", #### -"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### SPARC Linux setups "linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::", @@ -169,7 +172,7 @@ "linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o::::", # it's a real mess with -mcpu=ultrasparc option under Linux, but # -Wa,-Av8plus should do the trick no matter what. -"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o:", +"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # !!!Folowing can't be even tested yet!!! # We have to wait till 64-bit glibc for SPARC is operational!!! #"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:", @@ -180,17 +183,17 @@ #### IRIX 5.x configs # -mips2 flag is added by ./config when appropriate. -"irix-gcc","gcc:-O3 -DTERMIOS -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR::::::::::dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"irix-cc", "cc:-O2 -use_readonly_const -DTERMIOS -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR::::::::::dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix-gcc","gcc:-O3 -DTERMIOS -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR::::::::::dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix-cc", "cc:-O2 -use_readonly_const -DTERMIOS -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR::::::::::dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### IRIX 6.x configs # Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke # './Configure irix-[g]cc' manually. # -mips4 flag is added by ./config when appropriate. -"irix-mips3-gcc","gcc:-mabi=n32 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"irix-mips3-cc", "cc:-n32 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix-mips3-gcc","gcc:-mabi=n32 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix-mips3-cc", "cc:-n32 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # N64 ABI builds. -"irix64-mips4-gcc","gcc:-mabi=64 -mips4 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_irix_asm}:dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_irix_asm}:dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix64-mips4-gcc","gcc:-mabi=64 -mips4 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### Unified HP-UX ANSI C configs. # Special notes: @@ -222,44 +225,44 @@ # #!#"hpux-parisc-cc","cc:-Ae +O3 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl", # Since there is mention of this in shlib/hpux10-cc.sh -"hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn:hpux64-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn:hpux64-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # More attempts at unified 10.X and 11.X targets for HP C compiler. # # Chris Ruemmler # Kevin Steves -"hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2.o:::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2W.o:::::::::dlfcn:hpux64-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux-parisc1_1-cc","cc:+DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2.o:::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2W.o:::::::::dlfcn:hpux64-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-parisc1_1-cc","cc:+DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # HPUX 9.X config. # Don't use the bundled cc. It is broken. Use HP ANSI C if possible, or # egcs. gcc 2.8.1 is also broken. -"hpux-cc", "cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z::(unknown):-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-cc", "cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z::(unknown):-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # If hpux-cc fails (e.g. during "make test"), try the next one; otherwise, # please report your OS and compiler version to the openssl-bugs@openssl.org # mailing list. -"hpux-brokencc", "cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-brokencc", "cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # If hpux-gcc fails, try this one: -"hpux-brokengcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-brokengcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # HPUX 9.X on Motorola 68k platforms with gcc "hpux-m68k-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown)::BN_LLONG DES_PTR DES_UNROLL:::", # HPUX 10.X config. Supports threads. -"hpux10-cc", "cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux10-cc", "cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # If hpux10-cc fails, try this one (if still fails, try deleting BN_LLONG): -"hpux10-brokencc", "cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux10-brokencc", "cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux10-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux10-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # If hpux10-gcc fails, try this one: -"hpux10-brokengcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux10-brokengcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # HPUX 11.X from www.globus.org. # Only works on PA-RISC 2.0 cpus, and not optimized. Why? @@ -270,6 +273,9 @@ #### HP MPE/iX http://jazz.external.hp.com/src/openssl/ "MPE/iX-gcc", "gcc:-D_ENDIAN -DBN_DIV2W -O3 -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB::(unknown):-L/SYSLOG/PUB -lsyslog -lsocket -lcurses:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::", +#### PARISC Linux setups +"linux-parisc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::", + # Dec Alpha, OSF/1 - the alpha164-cc is historical, for the conversion # from the older DEC C Compiler to the newer compiler. It's now the # same as the preferred entry, alpha-cc. If you are still using the @@ -295,15 +301,15 @@ # # For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version # -"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:alpha-osf1-shared::.so", -"alphaold-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::.so", -"alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared::.so", -"alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared::.so", -"alpha-cc-rpath", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared-rpath::.so", +"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", +"alphaold-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", +"alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared:::.so", +"alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared:::.so", +"alpha-cc-rpath", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared-rpath:::.so", # # This probably belongs in a different section. # -"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### Alpha Linux with GNU C and Compaq C setups # Special notes: @@ -318,8 +324,8 @@ # # # -"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", @@ -328,23 +334,24 @@ # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the # bn86-elf.o file file since it is hand tweaked assembler. -"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", +"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", "linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", "linux-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::", "linux-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::", -"linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-m68k", "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::", "linux-s390", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::", -"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::SIXTY_FOUR_BIT_LONG:::::::::::linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}", -"bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "nextstep", "cc:-O -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", "nextstep3.3", "cc:-O3 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # NCR MP-RAS UNIX ver 02.03.01 @@ -357,7 +364,7 @@ "qnx6", "cc:-DL_ENDIAN -DTERMIOS::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:", # Linux on ARM -"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # UnixWare 2.0x fails destest with -O "unixware-2.0","cc:-DFILIO_H::-Kthread:-lsocket -lnsl -lx:${x86_gcc_des} ${x86_gcc_opts}:::", @@ -372,7 +379,7 @@ "unixware-7","cc:-O -DFILIO_H -Kalloca::-Kthread:-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}::", "unixware-7-pentium","cc:-O -DFILIO_H -Kalloca -Kpentium::-Kthread:-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}::", "unixware-7-pentium_pro","cc:-O -DFILIO_H -Kalloca -Kpentium_pro::-Kthread:-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}::", -"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:gnu-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # OpenUNIX 8 "OpenUNIX-8","cc:-O -DFILIO_H -Kalloca::-Kthread:-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}::", @@ -389,7 +396,7 @@ "aix43-gcc", "gcc:-O3 -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR::::::::::dlfcn:", # -# Cray T90 (SDSC) +# Cray T90 and similar (SDSC) # It's Big-endian, but the algorithms work properly when B_ENDIAN is NOT # defined. The T90 ints and longs are 8 bytes long, and apparently the # B_ENDIAN code assumes 4 byte ints. Fortunately, the non-B_ENDIAN and @@ -399,7 +406,10 @@ #'Taking the address of a bit field is not allowed. ' #'An expression with bit field exists as the operand of "sizeof" ' # (written by Wayne Schroeder ) -"cray-t90-cc", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT:::", +# +# j90 is considered the base machine type for unicos machines, +# so this configuration is now called "cray-j90" ... +"cray-j90", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT:::", # # Cray T3E (Research Center Juelich, beckman@acl.lanl.gov) @@ -421,9 +431,11 @@ # SCO 5 - Ben Laurie says the -O breaks the # SCO cc. -"sco5-cc", "cc:::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options? +"sco5-cc", "cc:-belf::(unknown):-lsocket -lresolv:${x86_gcc_des} ${x86_gcc_opts}:::", # des options? "sco5-cc-pentium", "cc:-Kpentium::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options? "sco5-gcc", "gcc:-O3 -fomit-frame-pointer::(unknown):-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # the SCO assembler doesn't seem to like our assembler files ... +"sco5-cc-shared","cc:-belf:::-lsocket -lresolv -lnsl:MD2_CHAR RC4_INDEX ${x86_gcc_des}::::::::::dlfcn:svr3-shared:-Kpic", +"sco5-gcc-shared","gcc:-O3 -DFILIO_H -fomit-frame-pointer:::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to like our assembler files ... # Sinix/ReliantUNIX RM400 # NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer problem. Better use -g */ @@ -458,8 +470,9 @@ # and its library files in util/pl/*) "Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", -# CygWin32 -"CygWin32", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", +# Cygwin +"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", +"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32:cygwin-shared:::.dll", # Ultrix from Bernhard Simon "ultrix-cc","cc:-std1 -O -Olimit 1000 -DL_ENDIAN::(unknown)::::::", @@ -468,23 +481,49 @@ ##"ultrix","cc:-O2 -DNOPROTO -DNOCONST -DL_ENDIAN::(unknown)::::::", # Some OpenBSD from Bob Beck -"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"OpenBSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"OpenBSD", "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"OpenBSD-mips","gcc:-O2 -DL_ENDIAN::(unknown):BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"OpenBSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"OpenBSD", "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"OpenBSD-mips","gcc:-O2 -DL_ENDIAN::(unknown):BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ##### MacOS X (a.k.a. Rhapsody or Darwin) setup "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", -"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", +"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ##### Sony NEWS-OS 4.x "newsos4-gcc","gcc:-O -DB_ENDIAN -DNEWS4::(unknown):-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::", +##### VxWorks for various targets +"vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DVXWORKS -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::-r:::::", + ); my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32 BC-16 Mingw32); +my $idx = 0; +my $idx_cc = $idx++; +my $idx_cflags = $idx++; +my $idx_unistd = $idx++; +my $idx_thread_cflag = $idx++; +my $idx_lflags = $idx++; +my $idx_bn_ops = $idx++; +my $idx_bn_obj = $idx++; +my $idx_des_obj = $idx++; +my $idx_bf_obj = $idx++; +my $idx_md5_obj = $idx++; +my $idx_sha1_obj = $idx++; +my $idx_cast_obj = $idx++; +my $idx_rc4_obj = $idx++; +my $idx_rmd160_obj = $idx++; +my $idx_rc5_obj = $idx++; +my $idx_dso_scheme = $idx++; +my $idx_shared_target = $idx++; +my $idx_shared_cflag = $idx++; +my $idx_shared_ldflag = $idx++; +my $idx_shared_extension = $idx++; +my $idx_ranlib = $idx++; + my $prefix=""; my $openssldir=""; my $exe_ext=""; @@ -557,7 +596,11 @@ foreach (@argvcopy) { s /^-no-/no-/; # some people just can't read the instructions - if (/^no-asm$/) + if (/^--test-sanity$/) + { + exit(&test_sanity()); + } + elsif (/^no-asm$/) { $no_asm=1; $flags .= "-DNO_ASM "; @@ -686,13 +729,17 @@ exit 0; } +if ($target =~ m/^CygWin32(-.*)$/) { + $target = "Cygwin".$1; +} + print "Configuring for $target\n"; &usage if (!defined($table{$target})); my $IsWindows=scalar grep /^$target$/,@WinTargets; -$exe_ext=".exe" if ($target eq "CygWin32"); +$exe_ext=".exe" if ($target eq "Cygwin"); $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq ""); $prefix=$openssldir if $prefix eq ""; @@ -705,9 +752,29 @@ print "IsWindows=$IsWindows\n"; -(my $cc,my $cflags,my $unistd,my $thread_cflag,my $lflags,my $bn_ops,my $bn_obj,my $des_obj,my $bf_obj, - $md5_obj,$sha1_obj,my $cast_obj,my $rc4_obj,$rmd160_obj,my $rc5_obj,my $dso_scheme,my $shared_target,my $shared_cflag,my $shared_extension,my $ranlib)= - split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); +my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); +my $cc = $fields[$idx_cc]; +my $cflags = $fields[$idx_cflags]; +my $unistd = $fields[$idx_unistd]; +my $thread_cflag = $fields[$idx_thread_cflag]; +my $lflags = $fields[$idx_lflags]; +my $bn_ops = $fields[$idx_bn_ops]; +my $bn_obj = $fields[$idx_bn_obj]; +my $des_obj = $fields[$idx_des_obj]; +my $bf_obj = $fields[$idx_bf_obj]; +my $md5_obj = $fields[$idx_md5_obj]; +my $sha1_obj = $fields[$idx_sha1_obj]; +my $cast_obj = $fields[$idx_cast_obj]; +my $rc4_obj = $fields[$idx_rc4_obj]; +my $rmd160_obj = $fields[$idx_rmd160_obj]; +my $rc5_obj = $fields[$idx_rc5_obj]; +my $dso_scheme = $fields[$idx_dso_scheme]; +my $shared_target = $fields[$idx_shared_target]; +my $shared_cflag = $fields[$idx_shared_cflag]; +my $shared_ldflag = $fields[$idx_shared_ldflag]; +my $shared_extension = $fields[$idx_shared_extension]; +my $ranlib = $fields[$idx_ranlib]; + $cflags="$flags$cflags" if ($flags ne ""); # The DSO code currently always implements all functions so that no @@ -921,6 +988,7 @@ my $sotmp = $1; s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; } + s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/; print OUT $_."\n"; } close(IN); @@ -1208,7 +1276,7 @@ my $bn_obj,my $des_obj,my $bf_obj, my $md5_obj,my $sha1_obj,my $cast_obj,my $rc4_obj,my $rmd160_obj, my $rc5_obj,my $dso_scheme,my $shared_target,my $shared_cflag, - my $shared_extension,my $ranlib)= + my $shared_ldflag,my $shared_extension,my $ranlib)= split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); print <. -OpenSSL 0.9.6b was released on December 21st, 2001. +OpenSSL 0.9.6d was released on 9 May, 2002. In addition to the current stable release, you can also access daily snapshots of the OpenSSL development version at >> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 9:32:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8146437B400; Tue, 30 Jul 2002 09:32:38 -0700 (PDT) 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 2292D37B405 for ; Tue, 30 Jul 2002 09:32:38 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A119B43E5E for ; Tue, 30 Jul 2002 09:32:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UGWbJU009820 for ; Tue, 30 Jul 2002 09:32:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UGWbFP009812 for perforce@freebsd.org; Tue, 30 Jul 2002 09:32:37 -0700 (PDT) Date: Tue, 30 Jul 2002 09:32:37 -0700 (PDT) Message-Id: <200207301632.g6UGWbFP009812@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15199 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15199 Change 15199 by rwatson@rwatson_tislabs on 2002/07/30 09:31:53 Sigh. Two build fixes I forgot to commit last night. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#15 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#15 (text+ko) ==== @@ -1271,8 +1271,8 @@ if (mb != NULL) { _mbhdr_setup(mb, type); #ifdef MAC - if (mac_init_mbuf(m, how) != 0) - mb_free(&mb_list_mbuf, mb, how, type, 0, NULL); + if (mac_init_mbuf(mb, how) != 0) { + mb_free(&mb_list_mbuf, mb, type, 0, NULL); return (NULL); } #endif @@ -1320,8 +1320,8 @@ if (mb != NULL) { _mbhdr_setup(mb, type); #ifdef MAC - if (mac_init_mbuf(m, how) != 0) { - mb_free(&mb_list_mbuf, mb, how, type, 0, NULL); + if (mac_init_mbuf(mb, how) != 0) { + mb_free(&mb_list_mbuf, mb, type, 0, NULL); return (NULL); } #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 9:43: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A52CF37B401; Tue, 30 Jul 2002 09:41:55 -0700 (PDT) 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 0CF5537B400 for ; Tue, 30 Jul 2002 09:41:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D8CC43E5E for ; Tue, 30 Jul 2002 09:41:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UGfrJU012292 for ; Tue, 30 Jul 2002 09:41:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UGfoOe012289 for perforce@freebsd.org; Tue, 30 Jul 2002 09:41:50 -0700 (PDT) Date: Tue, 30 Jul 2002 09:41:50 -0700 (PDT) Message-Id: <200207301641.g6UGfoOe012289@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15200 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15200 Change 15200 by rwatson@rwatson_tislabs on 2002/07/30 09:41:18 Further IFC from trustedbsd_base to bring into account kern_mac, system call changes in main tree. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/traceroute/findsaddr-socket.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Configure#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FAQ#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FREEBSD-Xlist#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/INSTALL#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/LICENSE#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.org#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/NEWS#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/README#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/STATUS#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/TABLE#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ca.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dgst.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/dsaparam.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/eay.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/openssl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pem_mail.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pkcs12.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/req.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rsa/01.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rsa/1.txt#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rsa/SecureServer.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/rsa/s.txt#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/s_time.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/smime.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/tkca#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/certs/rsa-ssca.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/config#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_bitstr.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_gentm.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_sign.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_time.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_utctm.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/pkcs8.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bf/Makefile.uni#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_print.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_sock.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bf_lbuf.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bio.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_bio.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_log.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_comba.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_opts.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/comba.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/d.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/new#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/b_sqr.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_com.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_high.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_ka.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_low.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_m.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_mul.c.works#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/bn_wmul.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/build#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/info#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/old/test.works#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/buffer/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cast/Makefile.uni#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/comp/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_api.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_def.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_lcl.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/keysets.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/DES.pod#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/MODES.DES#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/Makefile.PL#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/Makefile.lit#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/Makefile.uni#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/PC1#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/PC2#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des.man#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des_crypt.man#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/doIP#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/doPC1#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/doPC2#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/fcrypt.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/podd.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/read_pwd.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/shifts.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/sk.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/supp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/testdes.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dh_gen.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dh/dhtest.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/err/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_3d.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_bf.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_c.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_d.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_i.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_r2.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cbc_r5.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_3d.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_bf.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_c.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_d.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_i.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_r2.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_cfb_r5.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_3d.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_bf.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_c.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_d.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_i.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_r2.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ecb_r5.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_3d.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_bf.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_c.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_d.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_i.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_r2.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/e_ofb_r5.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/encode.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/hmac/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/idea/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/idea/Makefile.uni#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/lhash/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/lhash/lh_test.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md2/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md4/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/md5/Makefile.uni#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mdc2/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_dat.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_dat.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_mac.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/objects.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/objects.txt#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslv.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_info.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_doit.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_egd.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rand/rand_win.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc2/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc2/Makefile.uni#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc4/Makefile.uni#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc5/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rc5/Makefile.uni#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ripemd/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ripemd/Makefile.uni#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_oaep.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_oaep_test.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/sha/Makefile.uni#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/stack/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/tmdiff.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/txt_db/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_utl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/b64.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/maurice/example1.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/dep/crypto.txt#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/dep/files#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/dep/gen.pl#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/dep/ssl.txt#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto.pod#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/BN_bn2bin.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/RSA_generate_key.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/blowfish.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/crypto.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/des_modes.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/openssl.pod#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl.pod#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_clear.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/ssl.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/e_os.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/e_os2.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/mt/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/mt/mttest.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/mt/profile.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/mt/pthread.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/mt/purify.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/mt/solaris.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/openssl.spec#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/shlib/Makefile.hpux10-cc#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/shlib/hpux10-cc.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/shlib/irix.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/shlib/solaris-sc4.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/shlib/solaris.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/shlib/sun.sh#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_both.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_clnt.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_enc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_pkt.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_srvr.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl3.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_cert.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_sess.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/t1_enc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/Makefile.save#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/test/Makefile.ssl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/dsa-ca.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/test/dsa-pca.pem#2 delete .. //depot/projects/trustedbsd/mac/crypto/openssl/util/libeay.num#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/selftest.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/sep_lib.sh#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/sys/fork.2#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/rfork.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_opie/pam_opie.c#8 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#23 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/dir.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/fsck.h#6 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/fsutil.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/inode.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/main.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass1.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass2.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass5.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/setup.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/utilities.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/fsdb/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/fsdb/fsdb.h#6 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/des_crypt.3#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/wi.4#4 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#37 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs_data.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#21 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_condvar.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#221 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_switch.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#21 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#18 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vnode_if.src#10 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/profile.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/cache.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.S#1 branch .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/locore.S#1 branch .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_exception.S#1 branch .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_locore.S#1 branch .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_locore.s#4 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/support.S#1 branch .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/support.s#8 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/swtch.S#1 branch .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#22 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#22 edit .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#23 edit .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#34 integrate .. //depot/projects/trustedbsd/mac/sys/tools/vnode_if.awk#4 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_alloc.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_extern.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_subr.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_glue.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.h#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/tr/tr.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/kgmon/kgmon.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/chap.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pppd/main.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/mac/contrib/traceroute/findsaddr-socket.c#2 (text+ko) ==== @@ -29,6 +29,8 @@ * 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. + * + * $FreeBSD: src/contrib/traceroute/findsaddr-socket.c,v 1.2 2002/07/30 04:49:13 fenner Exp $ */ /* XXX Yes this is WAY too complicated */ @@ -193,9 +195,9 @@ } if (SALEN(sa) == 0) - cp += sizeof(u_int32_t); + cp += sizeof(long); else - cp += roundup(SALEN(sa), sizeof(u_int32_t)); + cp += roundup(SALEN(sa), sizeof(long)); } return ("failed!"); ==== //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#3 (text+ko) ==== @@ -2,6 +2,126 @@ OpenSSL CHANGES _______________ + Changes between 0.9.6c and 0.9.6d [9 May 2002] + + *) Fix crypto/asn1/a_sign.c so that 'parameters' is omitted (not + encoded as NULL) with id-dsa-with-sha1. + [Nils Larsch ; problem pointed out by Bodo Moeller] + + *) Check various X509_...() return values in apps/req.c. + [Nils Larsch ] + + *) Fix BASE64 decode (EVP_DecodeUpdate) for data with CR/LF ended lines: + an end-of-file condition would erronously be flagged, when the CRLF + was just at the end of a processed block. The bug was discovered when + processing data through a buffering memory BIO handing the data to a + BASE64-decoding BIO. Bug fund and patch submitted by Pavel Tsekov + and Nedelcho Stanev. + [Lutz Jaenicke] + + *) Implement a countermeasure against a vulnerability recently found + in CBC ciphersuites in SSL 3.0/TLS 1.0: Send an empty fragment + before application data chunks to avoid the use of known IVs + with data potentially chosen by the attacker. + [Bodo Moeller] + + *) Fix length checks in ssl3_get_client_hello(). + [Bodo Moeller] + + *) TLS/SSL library bugfix: use s->s3->in_read_app_data differently + to prevent ssl3_read_internal() from incorrectly assuming that + ssl3_read_bytes() found application data while handshake + processing was enabled when in fact s->s3->in_read_app_data was + merely automatically cleared during the initial handshake. + [Bodo Moeller; problem pointed out by Arne Ansper ] + + *) Fix object definitions for Private and Enterprise: they were not + recognized in their shortname (=lowercase) representation. Extend + obj_dat.pl to issue an error when using undefined keywords instead + of silently ignoring the problem (Svenning Sorensen + ). + [Lutz Jaenicke] + + *) Fix DH_generate_parameters() so that it works for 'non-standard' + generators, i.e. generators other than 2 and 5. (Previously, the + code did not properly initialise the 'add' and 'rem' values to + BN_generate_prime().) + + In the new general case, we do not insist that 'generator' is + actually a primitive root: This requirement is rather pointless; + a generator of the order-q subgroup is just as good, if not + better. + [Bodo Moeller] + + *) Map new X509 verification errors to alerts. Discovered and submitted by + Tom Wu . + [Lutz Jaenicke] + + *) Fix ssl3_pending() (ssl/s3_lib.c) to prevent SSL_pending() from + returning non-zero before the data has been completely received + when using non-blocking I/O. + [Bodo Moeller; problem pointed out by John Hughes] + + *) Some of the ciphers missed the strength entry (SSL_LOW etc). + [Ben Laurie, Lutz Jaenicke] + + *) Fix bug in SSL_clear(): bad sessions were not removed (found by + Yoram Zahavi ). + [Lutz Jaenicke] + + *) Add information about CygWin 1.3 and on, and preserve proper + configuration for the versions before that. + [Corinna Vinschen and Richard Levitte] + + *) Make removal from session cache (SSL_CTX_remove_session()) more robust: + check whether we deal with a copy of a session and do not delete from + the cache in this case. Problem reported by "Izhar Shoshani Levi" + . + [Lutz Jaenicke] + + *) Do not store session data into the internal session cache, if it + is never intended to be looked up (SSL_SESS_CACHE_NO_INTERNAL_LOOKUP + flag is set). Proposed by Aslam . + [Lutz Jaenicke] + + *) Have ASN1_BIT_STRING_set_bit() really clear a bit when the requested + value is 0. + [Richard Levitte] + + *) [In 0.9.6c-engine release:] + Fix a crashbug and a logic bug in hwcrhk_load_pubkey() + [Toomas Kiisk via Richard Levitte] + + *) Add the configuration target linux-s390x. + [Neale Ferguson via Richard Levitte] + + *) The earlier bugfix for the SSL3_ST_SW_HELLO_REQ_C case of + ssl3_accept (ssl/s3_srvr.c) incorrectly used a local flag + variable as an indication that a ClientHello message has been + received. As the flag value will be lost between multiple + invocations of ssl3_accept when using non-blocking I/O, the + function may not be aware that a handshake has actually taken + place, thus preventing a new session from being added to the + session cache. + + To avoid this problem, we now set s->new_session to 2 instead of + using a local variable. + [Lutz Jaenicke, Bodo Moeller] + + *) Bugfix: Return -1 from ssl3_get_server_done (ssl3/s3_clnt.c) + if the SSL_R_LENGTH_MISMATCH error is detected. + [Geoff Thorpe, Bodo Moeller] + + *) New 'shared_ldflag' column in Configure platform table. + [Richard Levitte] + + *) Fix EVP_CIPHER_mode macro. + ["Dan S. Camper" ] + + *) Fix ssl3_read_bytes (ssl/s3_pkt.c): To ignore messages of unknown + type, we must throw them away by setting rr->length to 0. + [D P Chang ] + Changes between 0.9.6b and 0.9.6c [21 dec 2001] *) Fix BN_rand_range bug pointed out by Dominikus Scherkl ==== //depot/projects/trustedbsd/mac/crypto/openssl/Configure#3 (text+ko) ==== @@ -10,7 +10,7 @@ # see INSTALL for instructions. -my $usage="Usage: Configure [no- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [rsaref] [no-threads] [no-asm] [no-dso] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] os/compiler[:flags]\n"; +my $usage="Usage: Configure [no- ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [rsaref] [no-threads] [no-asm] [no-dso] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--test-sanity] os/compiler[:flags]\n"; # Options: # @@ -23,6 +23,9 @@ # default). This needn't be set in advance, you can # just as well use "make INSTALL_PREFIX=/whatever install". # +# --test-sanity Make a number of sanity checks on the data in this file. +# This is a debugging tool for OpenSSL developers. +# # rsaref use RSAref # [no-]threads [don't] try to create a library that is suitable for # multithreaded applications (default is "threads" if we @@ -97,7 +100,7 @@ # -DB_ENDIAN slows things down on a sparc for md5, but helps sha1. # So the md5_locl.h file has an undef B_ENDIAN if sun is defined -#config-string $cc : $cflags : $unistd : $thread_cflag : $lflags : $bn_ops : $bn_obj : $des_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $dso_scheme : $shared_target : $shared_cflag +#config-string $cc : $cflags : $unistd : $thread_cflag : $lflags : $bn_ops : $bn_obj : $des_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib my %table=( # File 'TABLE' (created by 'make TABLE') contains the data from this list, @@ -132,35 +135,35 @@ # surrounds it with #APP #NO_APP comment pair which (at least Solaris # 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic" # error message. -"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DNO_INLINE_ASM::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DNO_INLINE_ASM::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### Solaris x86 with Sun C setups -"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### SPARC Solaris with GNU C setups -"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8 # but keep the assembler modules. -"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### -"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:solaris-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### SPARC Solaris with Sun C setups # DO NOT use /xO[34] on sparc with SC3.0. It is broken, and will not pass the tests -"solaris-sparc-sc3","cc:-fast -O -Xa -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparc-sc3","cc:-fast -O -Xa -DB_ENDIAN::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # SC4.0 doesn't pass 'make test', upgrade to SC5.0 or SC4.2. # SC4.2 is ok, better than gcc even on bn as long as you tell it -xarch=v8 # SC5.0 note: Compiler common patch 107357-01 or later is required! -"solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", +"solaris-sparcv7-cc","cc:-xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv8-cc","cc:-xarch=v8 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris-sparcv9-cc","cc:-xtarget=ultra -xarch=v8plus -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris64-sparcv9-cc","cc:-xtarget=ultra -xarch=v9 -xO5 -xstrconst -xdepend -Xa -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-KPIC:-xarch=v9:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):/usr/ccs/bin/ar rs", #### -"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-solaris-sparcv8-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xarch=v8 -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-solaris-sparcv9-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -xtarget=ultra -xarch=v8plus -g -O -xstrconst -Xa -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK_LL DES_PTR DES_RISC1 DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### SPARC Linux setups "linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::", @@ -169,7 +172,7 @@ "linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o::::", # it's a real mess with -mcpu=ultrasparc option under Linux, but # -Wa,-Av8plus should do the trick no matter what. -"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o:", +"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # !!!Folowing can't be even tested yet!!! # We have to wait till 64-bit glibc for SPARC is operational!!! #"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:", @@ -180,17 +183,17 @@ #### IRIX 5.x configs # -mips2 flag is added by ./config when appropriate. -"irix-gcc","gcc:-O3 -DTERMIOS -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR::::::::::dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"irix-cc", "cc:-O2 -use_readonly_const -DTERMIOS -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR::::::::::dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix-gcc","gcc:-O3 -DTERMIOS -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK DES_UNROLL DES_RISC2 DES_PTR BF_PTR::::::::::dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix-cc", "cc:-O2 -use_readonly_const -DTERMIOS -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC2 DES_UNROLL BF_PTR::::::::::dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### IRIX 6.x configs # Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke # './Configure irix-[g]cc' manually. # -mips4 flag is added by ./config when appropriate. -"irix-mips3-gcc","gcc:-mabi=n32 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"irix-mips3-cc", "cc:-n32 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix-mips3-gcc","gcc:-mabi=n32 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::MD2_CHAR RC4_INDEX RC4_CHAR RC4_CHUNK_LL DES_UNROLL DES_RISC2 DES_PTR BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix-mips3-cc", "cc:-n32 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::DES_PTR RC4_CHAR RC4_CHUNK_LL DES_RISC2 DES_UNROLL BF_PTR SIXTY_FOUR_BIT:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # N64 ABI builds. -"irix64-mips4-gcc","gcc:-mabi=64 -mips4 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_irix_asm}:dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_irix_asm}:dlfcn:irix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix64-mips4-gcc","gcc:-mabi=64 -mips4 -mmips-as -O3 -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"irix64-mips4-cc", "cc:-64 -mips4 -O2 -use_readonly_const -DTERMIOS -DB_ENDIAN -DBN_DIV3W::-D_SGI_MP_SOURCE::RC4_CHAR RC4_CHUNK DES_RISC2 DES_UNROLL SIXTY_FOUR_BIT_LONG:${mips3_irix_asm}:dlfcn:irix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### Unified HP-UX ANSI C configs. # Special notes: @@ -222,44 +225,44 @@ # #!#"hpux-parisc-cc","cc:-Ae +O3 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl", # Since there is mention of this in shlib/hpux10-cc.sh -"hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn:hpux64-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn:hpux64-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # More attempts at unified 10.X and 11.X targets for HP C compiler. # # Chris Ruemmler # Kevin Steves -"hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2.o:::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2W.o:::::::::dlfcn:hpux64-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux-parisc1_1-cc","cc:+DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-parisc-cc","cc:+O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-parisc2-cc","cc:+DA2.0 +DS2.0 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:SIXTY_FOUR_BIT MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2.o:::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux64-parisc2-cc","cc:+DD64 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT:asm/pa-risc2W.o:::::::::dlfcn:hpux64-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-parisc1_1-cc","cc:+DA1.1 +DS1.1 +O3 +Optrs_strongly_typed +Olibcalls -Ae +ESlit -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldld:MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # HPUX 9.X config. # Don't use the bundled cc. It is broken. Use HP ANSI C if possible, or # egcs. gcc 2.8.1 is also broken. -"hpux-cc", "cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z::(unknown):-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-cc", "cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z::(unknown):-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # If hpux-cc fails (e.g. during "make test"), try the next one; otherwise, # please report your OS and compiler version to the openssl-bugs@openssl.org # mailing list. -"hpux-brokencc", "cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-brokencc", "cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # If hpux-gcc fails, try this one: -"hpux-brokengcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux-brokengcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown):-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # HPUX 9.X on Motorola 68k platforms with gcc "hpux-m68k-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::(unknown)::BN_LLONG DES_PTR DES_UNROLL:::", # HPUX 10.X config. Supports threads. -"hpux10-cc", "cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux10-cc", "cc:-DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY -Ae +ESlit +O3 -z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # If hpux10-cc fails, try this one (if still fails, try deleting BN_LLONG): -"hpux10-brokencc", "cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux10-brokencc", "cc:-DB_ENDIAN -DBN_DIV2W -Ae +ESlit +O2 -z::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"hpux10-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux10-gcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # If hpux10-gcc fails, try this one: -"hpux10-brokengcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC:.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux10-brokengcc", "gcc:-DB_ENDIAN -DBN_DIV2W -O3::-D_REENTRANT:-ldld:DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # HPUX 11.X from www.globus.org. # Only works on PA-RISC 2.0 cpus, and not optimized. Why? @@ -270,6 +273,9 @@ #### HP MPE/iX http://jazz.external.hp.com/src/openssl/ "MPE/iX-gcc", "gcc:-D_ENDIAN -DBN_DIV2W -O3 -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE -I/SYSLOG/PUB::(unknown):-L/SYSLOG/PUB -lsyslog -lsocket -lcurses:BN_LLONG DES_PTR DES_UNROLL DES_RISC1:::", +#### PARISC Linux setups +"linux-parisc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::", + # Dec Alpha, OSF/1 - the alpha164-cc is historical, for the conversion # from the older DEC C Compiler to the newer compiler. It's now the # same as the preferred entry, alpha-cc. If you are still using the @@ -295,15 +301,15 @@ # # For gcc, the following gave a %50 speedup on a 164 over the 'DES_INT' version # -"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:alpha-osf1-shared::.so", -"alphaold-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared::.so", -"alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared::.so", -"alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared::.so", -"alpha-cc-rpath", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared-rpath::.so", +"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", +"alphaold-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:alpha-osf1-shared:::.so", +"alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared:::.so", +"alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared:::.so", +"alpha-cc-rpath", "cc:-std1 -tune host -fast -readonly_strings::-pthread::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${alpha_asm}:dlfcn:tru64-shared-rpath:::.so", # # This probably belongs in a different section. # -"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### Alpha Linux with GNU C and Compaq C setups # Special notes: @@ -318,8 +324,8 @@ # # # -"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-alpha-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-alpha+bwx-gcc","gcc:-O3 -DL_ENDIAN -DTERMIO::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}", @@ -328,23 +334,24 @@ # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the # bn86-elf.o file file since it is hand tweaked assembler. -"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", +"linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", "linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", "linux-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::", "linux-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::", -"linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "linux-m68k", "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::", "linux-s390", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::", -"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::SIXTY_FOUR_BIT_LONG:::::::::::linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}", -"bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "nextstep", "cc:-O -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", "nextstep3.3", "cc:-O3 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # NCR MP-RAS UNIX ver 02.03.01 @@ -357,7 +364,7 @@ "qnx6", "cc:-DL_ENDIAN -DTERMIOS::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:", # Linux on ARM -"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # UnixWare 2.0x fails destest with -O "unixware-2.0","cc:-DFILIO_H::-Kthread:-lsocket -lnsl -lx:${x86_gcc_des} ${x86_gcc_opts}:::", @@ -372,7 +379,7 @@ "unixware-7","cc:-O -DFILIO_H -Kalloca::-Kthread:-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}::", "unixware-7-pentium","cc:-O -DFILIO_H -Kalloca -Kpentium::-Kthread:-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}::", "unixware-7-pentium_pro","cc:-O -DFILIO_H -Kalloca -Kpentium_pro::-Kthread:-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}::", -"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:gnu-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:gnu-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # OpenUNIX 8 "OpenUNIX-8","cc:-O -DFILIO_H -Kalloca::-Kthread:-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}::", @@ -389,7 +396,7 @@ "aix43-gcc", "gcc:-O3 -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR::::::::::dlfcn:", # -# Cray T90 (SDSC) +# Cray T90 and similar (SDSC) # It's Big-endian, but the algorithms work properly when B_ENDIAN is NOT # defined. The T90 ints and longs are 8 bytes long, and apparently the # B_ENDIAN code assumes 4 byte ints. Fortunately, the non-B_ENDIAN and @@ -399,7 +406,10 @@ #'Taking the address of a bit field is not allowed. ' #'An expression with bit field exists as the operand of "sizeof" ' # (written by Wayne Schroeder ) -"cray-t90-cc", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT:::", +# +# j90 is considered the base machine type for unicos machines, +# so this configuration is now called "cray-j90" ... +"cray-j90", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT:::", # # Cray T3E (Research Center Juelich, beckman@acl.lanl.gov) @@ -421,9 +431,11 @@ # SCO 5 - Ben Laurie says the -O breaks the # SCO cc. -"sco5-cc", "cc:::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options? +"sco5-cc", "cc:-belf::(unknown):-lsocket -lresolv:${x86_gcc_des} ${x86_gcc_opts}:::", # des options? "sco5-cc-pentium", "cc:-Kpentium::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options? "sco5-gcc", "gcc:-O3 -fomit-frame-pointer::(unknown):-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # the SCO assembler doesn't seem to like our assembler files ... +"sco5-cc-shared","cc:-belf:::-lsocket -lresolv -lnsl:MD2_CHAR RC4_INDEX ${x86_gcc_des}::::::::::dlfcn:svr3-shared:-Kpic", +"sco5-gcc-shared","gcc:-O3 -DFILIO_H -fomit-frame-pointer:::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to like our assembler files ... # Sinix/ReliantUNIX RM400 # NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer problem. Better use -g */ @@ -458,8 +470,9 @@ # and its library files in util/pl/*) "Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", -# CygWin32 -"CygWin32", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", +# Cygwin +"Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", +"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32:cygwin-shared:::.dll", # Ultrix from Bernhard Simon "ultrix-cc","cc:-std1 -O -Olimit 1000 -DL_ENDIAN::(unknown)::::::", @@ -468,23 +481,49 @@ ##"ultrix","cc:-O2 -DNOPROTO -DNOCONST -DL_ENDIAN::(unknown)::::::", # Some OpenBSD from Bob Beck -"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"OpenBSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"OpenBSD", "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"OpenBSD-mips","gcc:-O2 -DL_ENDIAN::(unknown):BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"OpenBSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"OpenBSD", "gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"OpenBSD-mips","gcc:-O2 -DL_ENDIAN::(unknown):BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ##### MacOS X (a.k.a. Rhapsody or Darwin) setup "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", -"darwin-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", +"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ##### Sony NEWS-OS 4.x "newsos4-gcc","gcc:-O -DB_ENDIAN -DNEWS4::(unknown):-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::", +##### VxWorks for various targets +"vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DVXWORKS -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::-r:::::", + ); my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32 BC-16 Mingw32); +my $idx = 0; +my $idx_cc = $idx++; +my $idx_cflags = $idx++; +my $idx_unistd = $idx++; +my $idx_thread_cflag = $idx++; +my $idx_lflags = $idx++; +my $idx_bn_ops = $idx++; +my $idx_bn_obj = $idx++; +my $idx_des_obj = $idx++; +my $idx_bf_obj = $idx++; +my $idx_md5_obj = $idx++; +my $idx_sha1_obj = $idx++; +my $idx_cast_obj = $idx++; +my $idx_rc4_obj = $idx++; +my $idx_rmd160_obj = $idx++; +my $idx_rc5_obj = $idx++; +my $idx_dso_scheme = $idx++; +my $idx_shared_target = $idx++; +my $idx_shared_cflag = $idx++; +my $idx_shared_ldflag = $idx++; +my $idx_shared_extension = $idx++; +my $idx_ranlib = $idx++; + my $prefix=""; my $openssldir=""; my $exe_ext=""; @@ -557,7 +596,11 @@ foreach (@argvcopy) { s /^-no-/no-/; # some people just can't read the instructions - if (/^no-asm$/) + if (/^--test-sanity$/) + { + exit(&test_sanity()); + } + elsif (/^no-asm$/) { $no_asm=1; $flags .= "-DNO_ASM "; @@ -686,13 +729,17 @@ exit 0; } +if ($target =~ m/^CygWin32(-.*)$/) { + $target = "Cygwin".$1; +} + print "Configuring for $target\n"; &usage if (!defined($table{$target})); my $IsWindows=scalar grep /^$target$/,@WinTargets; -$exe_ext=".exe" if ($target eq "CygWin32"); +$exe_ext=".exe" if ($target eq "Cygwin"); $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq ""); $prefix=$openssldir if $prefix eq ""; @@ -705,9 +752,29 @@ print "IsWindows=$IsWindows\n"; -(my $cc,my $cflags,my $unistd,my $thread_cflag,my $lflags,my $bn_ops,my $bn_obj,my $des_obj,my $bf_obj, - $md5_obj,$sha1_obj,my $cast_obj,my $rc4_obj,$rmd160_obj,my $rc5_obj,my $dso_scheme,my $shared_target,my $shared_cflag,my $shared_extension,my $ranlib)= - split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); +my @fields = split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); +my $cc = $fields[$idx_cc]; +my $cflags = $fields[$idx_cflags]; +my $unistd = $fields[$idx_unistd]; +my $thread_cflag = $fields[$idx_thread_cflag]; +my $lflags = $fields[$idx_lflags]; +my $bn_ops = $fields[$idx_bn_ops]; +my $bn_obj = $fields[$idx_bn_obj]; +my $des_obj = $fields[$idx_des_obj]; +my $bf_obj = $fields[$idx_bf_obj]; +my $md5_obj = $fields[$idx_md5_obj]; +my $sha1_obj = $fields[$idx_sha1_obj]; +my $cast_obj = $fields[$idx_cast_obj]; +my $rc4_obj = $fields[$idx_rc4_obj]; +my $rmd160_obj = $fields[$idx_rmd160_obj]; +my $rc5_obj = $fields[$idx_rc5_obj]; +my $dso_scheme = $fields[$idx_dso_scheme]; +my $shared_target = $fields[$idx_shared_target]; +my $shared_cflag = $fields[$idx_shared_cflag]; +my $shared_ldflag = $fields[$idx_shared_ldflag]; +my $shared_extension = $fields[$idx_shared_extension]; +my $ranlib = $fields[$idx_ranlib]; + $cflags="$flags$cflags" if ($flags ne ""); # The DSO code currently always implements all functions so that no @@ -921,6 +988,7 @@ my $sotmp = $1; s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; } + s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/; print OUT $_."\n"; } close(IN); @@ -1208,7 +1276,7 @@ my $bn_obj,my $des_obj,my $bf_obj, my $md5_obj,my $sha1_obj,my $cast_obj,my $rc4_obj,my $rmd160_obj, my $rc5_obj,my $dso_scheme,my $shared_target,my $shared_cflag, - my $shared_extension,my $ranlib)= + my $shared_ldflag,my $shared_extension,my $ranlib)= split(/\s*:\s*/,$table{$target} . ":" x 30 , -1); print <. -OpenSSL 0.9.6b was released on December 21st, 2001. +OpenSSL 0.9.6d was released on 9 May, 2002. In addition to the current stable release, you can also access daily snapshots of the OpenSSL development version at >> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 10:32: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DCDE37B401; Tue, 30 Jul 2002 10:32:00 -0700 (PDT) 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 1C30637B400 for ; Tue, 30 Jul 2002 10:32:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDCB843E31 for ; Tue, 30 Jul 2002 10:31:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UHVxJU023645 for ; Tue, 30 Jul 2002 10:31:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UHVxnG023642 for perforce@freebsd.org; Tue, 30 Jul 2002 10:31:59 -0700 (PDT) Date: Tue, 30 Jul 2002 10:31:59 -0700 (PDT) Message-Id: <200207301731.g6UHVxnG023642@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15204 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15204 Change 15204 by rwatson@rwatson_paprika on 2002/07/30 10:31:30 Improve error reporting formatting and content. Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#8 (text+ko) ==== @@ -68,13 +68,15 @@ rule_slots = bsde_get_rule_slots(BUFSIZ, errstr); if (rule_slots == -1) { - fprintf(stderr, errstr); + fprintf(stderr, "Unable to get rule slots; mac_bsdextended.ko " + "may not be loaded.\n"); + fprintf(stderr, "bsde_get_rule_slots: %s\n", errstr); exit (-1); } rule_count = bsde_get_rule_count(BUFSIZ, errstr); if (rule_count == -1) { - fprintf(stderr, errstr); + fprintf(stderr, "bsde_get_rule_count: %s\n", errstr); exit (-1); } @@ -93,7 +95,8 @@ } if (bsde_rule_to_string(&rule, charstr, BUFSIZ) == -1) - printf("oops!\n"); + fprintf(stderr, + "Unable to translate rule %d to string\n", i); else printf("%d %s\n", i, charstr); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 11: 8:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DF5D37B401; Tue, 30 Jul 2002 11:08:47 -0700 (PDT) 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 F331237B400 for ; Tue, 30 Jul 2002 11:08:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B268643E31 for ; Tue, 30 Jul 2002 11:08:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UI8kJU032002 for ; Tue, 30 Jul 2002 11:08:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UI8kRE031999 for perforce@freebsd.org; Tue, 30 Jul 2002 11:08:46 -0700 (PDT) Date: Tue, 30 Jul 2002 11:08:46 -0700 (PDT) Message-Id: <200207301808.g6UI8kRE031999@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15207 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15207 Change 15207 by rwatson@rwatson_tislabs on 2002/07/30 11:08:36 Options MAC got duplicated in the integ when it trickled back through the main tree. Remove. Affected files ... .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/NOTES#11 (text+ko) ==== @@ -723,12 +723,6 @@ options _KPOSIX_PRIORITY_SCHEDULING options _KPOSIX_VERSION=199309L -##################################################################### -# SECURITY POLICY PARAMETERS - -# Support for Mandatory Access Control (MAC) -options MAC - ##################################################################### # SECURITY POLICY PARAMETERS To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 12:48:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DB2337B40B; Tue, 30 Jul 2002 12:48:33 -0700 (PDT) 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 CB83D37B405 for ; Tue, 30 Jul 2002 12:48:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 931B643E3B for ; Tue, 30 Jul 2002 12:46:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UJknJU049263 for ; Tue, 30 Jul 2002 12:46:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UJkn2b049260 for perforce@freebsd.org; Tue, 30 Jul 2002 12:46:49 -0700 (PDT) Date: Tue, 30 Jul 2002 12:46:49 -0700 (PDT) Message-Id: <200207301946.g6UJkn2b049260@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15213 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15213 Change 15213 by rwatson@rwatson_tislabs on 2002/07/30 12:46:17 Comment and content cleanup for mac.h; also, don't export mac_debug_label_fallback outside of kern_mac.c. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#222 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#138 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#222 (text+ko) ==== @@ -93,7 +93,7 @@ SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, "TrustedBSD MAC debug info"); -int mac_debug_label_fallback = 0; +static int mac_debug_label_fallback = 0; SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, &mac_debug_label_fallback, 0, "Filesystems should fall back to fs label" "when label is corrupted."); ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#138 (text+ko) ==== @@ -49,15 +49,25 @@ #define _POSIX_MAC #endif +/* + * XXXMAC: The single MAC extended attribute will be deprecated once + * compound EA writes on a single target file can be performed cleanly + * with UFS2. + */ #define FREEBSD_MAC_EXTATTR_NAME "freebsd.mac" #define FREEBSD_MAC_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM /* + * XXXMAC: Per-policy structures will be moved from mac.h to per-policy + * include files once the revised user interface is available. + */ + +/* * Structures and constants associated with a Biba Integrity policy. * mac_biba represents a Biba label, with mb_type determining its properties, * and mb_grade represents the hierarchal grade if valid for the current * mb_type. These structures will move to mac_biba.h once we have dymamic - * labels. + * labels exposed to userland. */ struct mac_biba_element { u_short mbe_type; @@ -81,7 +91,7 @@ * mac_mls represents an MLS label, with mm_type determining its properties, * and mm_level represents the hierarchal sensitivity level if valid for the * current mm_type. These structures will move to mac_mls.h once we have - * dynamic labels. + * dynamic labels exposed to userland. */ struct mac_mls_element { u_short mme_type; @@ -154,6 +164,7 @@ * Extensions to POSIX.1e visible in the application namespace. */ int mac_is_present_np(const char *_policyname); +int mac_policy(const char *_policyname, int call, void *arg); /* * System calls wrapped by some POSIX.1e functions. @@ -169,7 +180,7 @@ #endif /* _KERNEL */ /* - * XXX: This shouldn't be exported to userland, but is because of ucred.h + * XXXMAC: This shouldn't be exported to userland, but is because of ucred.h * and various other messes. */ @@ -186,12 +197,6 @@ #ifdef _KERNEL /* - * Policy flags exported to consumers of MAC APIs. Probably, this shouldn't - * be done. - */ -extern int mac_debug_label_fallback; - -/* * MAC entry point operations */ enum mac_ep_ops { @@ -272,7 +277,6 @@ void mac_update_procfsvnode(struct vnode *vp, struct ucred *cred); void mac_update_vnode_from_mount(struct vnode *vp, struct mount *mp); - /* * Labeling event operations: IPC objects. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 12:53: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5722C37B42F; Tue, 30 Jul 2002 12:50:31 -0700 (PDT) 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 8918737B42B for ; Tue, 30 Jul 2002 12:50:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4495543E97 for ; Tue, 30 Jul 2002 12:49:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UJmsJU049458 for ; Tue, 30 Jul 2002 12:48:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UJmqKb049455 for perforce@freebsd.org; Tue, 30 Jul 2002 12:48:52 -0700 (PDT) Date: Tue, 30 Jul 2002 12:48:52 -0700 (PDT) Message-Id: <200207301948.g6UJmqKb049455@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15214 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15214 Change 15214 by rwatson@rwatson_tislabs on 2002/07/30 12:48:06 Integ the trustedbsd_base tree to pull in new OpenSSL, as well as the mac_policy() system call. Affected files ... .. //depot/projects/trustedbsd/base/crypto/openssl/CHANGES#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Configure#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FAQ#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/INSTALL#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.org#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/NEWS#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/PROBLEMS#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/README#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/apps.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/asn1pars.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/ca.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/der_chop#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/pkcs7.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/config#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_bitstr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_enum.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_int.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_set.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/a_utctm.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_dhp.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_dsap.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/d2i_r_pr.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/t_pkey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/x_pubkey.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_print.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bf_nbio.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/bss_bio.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_div.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_gcd.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mont.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bn/bn_mul.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/conf/conf_def.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cryptlib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cryptlib.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/des/des.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dsa/dsa_asn1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/dso/dso_dlfcn.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/ebcdic.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/bio_enc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/c_allc.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/c_alld.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/evp/evp.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/o_names.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/objects/obj_dat.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslv.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem2.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pem/pem_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/perlasm/x86nasm.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs12/pkcs12.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/pk7_doit.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/pkcs7/verify.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/rsa/rsa_eay.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/txt_db/txt_db.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/x509v3/v3_ia5.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/demos/maurice/loadkeys.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/crl2pkcs7.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/apps/smime.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/BN_rand.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/DH_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_DigestInit.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_SignInit.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/EVP_VerifyInit.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/RSA_check_key.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/err.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/crypto/rsa.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_sess_set_cache_size.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_sess_set_get_cb.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_accept.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_connect.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_do_handshake.pod#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_get_error.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_set_connect_state.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/SSL_write.pod#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/doc/ssl/ssl.pod#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/e_os.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_clnt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_lib.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_srvr.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_clnt.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_enc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_srvr.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_asn1.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_err.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_sess.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/t1_enc.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/test/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/tools/c_rehash#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/dirname.pl#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/util/domd#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mk1mf.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/BC-32.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pl/VC-32.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pod2man.pl#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/pod2mantest#1 branch .. //depot/projects/trustedbsd/base/crypto/openssl/util/pod2mantest.pod#1 branch .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile#8 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_ctrl.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_f_base64.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_f_buffer.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_f_cipher.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_f_md.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_f_null.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_f_ssl.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_find_type.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_new.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_new_bio_pair.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_push.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_read.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_accept.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_bio.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_connect.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_fd.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_file.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_mem.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_null.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_s_socket.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_set_callback.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BIO_should_retry.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_CTX_new.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_CTX_start.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_add.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_add_word.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_bn2bin.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_cmp.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_copy.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_generate_prime.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_mod_inverse.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_new.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_num_bytes.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_rand.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_set_bit.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/BN_zero.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/CA.pl.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DH_generate_key.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DH_generate_parameters.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DH_get_ex_new_index.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DH_new.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DH_set_method.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DH_size.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_SIG_new.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_do_sign.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_dup_DH.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_generate_key.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_generate_parameters.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_new.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_set_method.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_sign.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/DSA_size.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_GET_LIB.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_clear_error.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_error_string.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_get_error.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_load_strings.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_print_errors.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_put_error.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ERR_remove_state.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_DigestInit.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_EncryptInit.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_OpenInit.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_SealInit.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_SignInit.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/EVP_VerifyInit.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RAND_add.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RAND_bytes.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RAND_cleanup.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RAND_egd.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RAND_load_file.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RAND_set_rand_method.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_blinding_on.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_check_key.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_generate_key.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_new.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_print.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_private_encrypt.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_public_encrypt.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_set_method.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_sign.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/RSA_size.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CIPHER_get_name.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_COMP_add_compression_method.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_add_extra_chain_cert.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_add_session.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_ctrl.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_flush_sessions.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_free.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_get_ex_new_index.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_get_verify_mode.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_load_verify_locations.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_new.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_sess_number.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_sess_set_cache_size.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_sess_set_get_cb.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_sessions.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_cert_store.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_cert_verify_callback.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_cipher_list.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_client_CA_list.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_client_cert_cb.3#1 branch .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_default_passwd_cb.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_info_callback.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_mode.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_options.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_quiet_shutdown.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_session_cache_mode.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_session_id_context.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_ssl_version.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_timeout.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_tmp_dh_callback.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_tmp_rsa_callback.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_set_verify.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_CTX_use_certificate.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_SESSION_free.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_SESSION_get_ex_new_index.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_SESSION_get_time.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_accept.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_alert_type_string.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_clear.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_connect.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_do_handshake.3#1 branch .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_free.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_SSL_CTX.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_ciphers.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_client_CA_list.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_current_cipher.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_default_timeout.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_error.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_ex_new_index.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_fd.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_peer_cert_chain.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_peer_certificate.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_rbio.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_session.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_verify_result.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_get_version.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_library_init.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_load_client_CA_file.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_new.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_pending.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_read.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_rstate_string.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_session_reused.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_set_bio.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_set_connect_state.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_set_fd.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_set_session.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_set_shutdown.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_set_verify_result.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_shutdown.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_state_string.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_want.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/SSL_write.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/asn1parse.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/bio.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/blowfish.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/bn.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/bn_internal.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/buffer.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ca.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ciphers.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/config.5#1 branch .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/crl.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/crl2pkcs7.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/crypto.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_DHparams.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/d2i_SSL_SESSION.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/des.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/des_modes.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/dgst.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/dh.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/dhparam.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/dsa.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/dsa.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/dsaparam.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/enc.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/err.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/evp.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/gendsa.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/genrsa.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/hmac.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/lh_stats.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/lhash.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/md5.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/mdc2.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/nseq.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/openssl.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/passwd.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/pkcs12.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/pkcs7.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/pkcs8.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/rand.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/rand.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/rc4.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/req.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ripemd.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/rsa.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/rsa.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/rsautl.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/s_client.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/s_server.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/sess_id.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/sha.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/smime.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/speed.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/spkac.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/ssl.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/threads.3#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/verify.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/version.1#2 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/man/x509.1#2 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/README#2 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/doc-supfile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/gnats-supfile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/ports-supfile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/trustedbsd/base/share/examples/cvsup/www-supfile#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#23 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acdebug.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acglobal.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/aclocal.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acmacros.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acnamesp.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acparser.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/actables.h#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/actbl.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/actypes.h#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/amlcode.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/amlresrc.h#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbcmds.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbdisply.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbexec.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbxface.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dmbuffer.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dmnames.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dmopcode.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dmresrc.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dmresrcl.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dmresrcs.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dmutils.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dmwalk.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dsmethod.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dsobject.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dsutils.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dswload.c#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dswstate.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exconfig.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/excreate.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exdump.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exmisc.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exoparg1.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exoparg2.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exresnte.c#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exresolv.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exresop.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exstore.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/exutils.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/nsdump.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/nsdumpdv.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/nseval.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/nsload.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/nsnames.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/nsxfeval.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/nsxfobj.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/psargs.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/psfind.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/psopcode.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/psutils.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/psxface.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/rsio.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/rsirq.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/rslist.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/tbconvrt.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/tbgetall.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/tbinstal.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/tbrsdt.c#1 branch .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/tbutils.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/tbxface.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/tbxfroot.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/utcopy.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/utxface.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvisor.c#1 branch .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#19 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#17 integrate .. //depot/projects/trustedbsd/base/sys/modules/uvisor/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/pci/if_rl.c#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/sed/compile.c#6 integrate Differences ... ==== //depot/projects/trustedbsd/base/crypto/openssl/CHANGES#4 (text+ko) ==== @@ -2,6 +2,58 @@ OpenSSL CHANGES _______________ + Changes between 0.9.6d and 0.9.6e [30 Jul 2002] + + *) Fix cipher selection routines: ciphers without encryption had no flags + for the cipher strength set and where therefore not handled correctly + by the selection routines (PR #130). + [Lutz Jaenicke] + + *) Fix EVP_dsa_sha macro. + [Nils Larsch] + + *) New option + SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS + for disabling the SSL 3.0/TLS 1.0 CBC vulnerability countermeasure + that was added in OpenSSL 0.9.6d. + + As the countermeasure turned out to be incompatible with some + broken SSL implementations, the new option is part of SSL_OP_ALL. + SSL_OP_ALL is usually employed when compatibility with weird SSL + implementations is desired (e.g. '-bugs' option to 's_client' and + 's_server'), so the new option is automatically set in many + applications. + [Bodo Moeller] + + *) Changes in security patch: + + Changes marked "(CHATS)" were sponsored by the Defense Advanced + Research Projects Agency (DARPA) and Air Force Research Laboratory, + Air Force Materiel Command, USAF, under agreement number + F30602-01-2-0537. + + *) Add various sanity checks to asn1_get_length() to reject + the ASN1 length bytes if they exceed sizeof(long), will appear + negative or the content length exceeds the length of the + supplied buffer. + [Steve Henson, Adi Stav , James Yonan ] + + *) Assertions for various potential buffer overflows, not known to + happen in practice. + [Ben Laurie (CHATS)] + + *) Various temporary buffers to hold ASCII versions of integers were + too small for 64 bit platforms. (CAN-2002-0655) + [Matthew Byng-Maddick and Ben Laurie (CHATS)> + + *) Remote buffer overflow in SSL3 protocol - an attacker could + supply an oversized session ID to a client. (CAN-2002-0656) + [Ben Laurie (CHATS)] + + *) Remote buffer overflow in SSL2 protocol - an attacker could + supply an oversized client master key. (CAN-2002-0656) + [Ben Laurie (CHATS)] + Changes between 0.9.6c and 0.9.6d [9 May 2002] *) Fix crypto/asn1/a_sign.c so that 'parameters' is omitted (not ==== //depot/projects/trustedbsd/base/crypto/openssl/Configure#4 (text+ko) ==== @@ -144,6 +144,7 @@ "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris64-sparcv9-gcc31","gcc:-mcpu=ultrasparc -m64 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8 # but keep the assembler modules. "solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -169,10 +170,10 @@ "linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::", # Ray Miller has patiently # assisted with debugging of following two configs. -"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o::::", +"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # it's a real mess with -mcpu=ultrasparc option under Linux, but # -Wa,-Av8plus should do the trick no matter what. -"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # !!!Folowing can't be even tested yet!!! # We have to wait till 64-bit glibc for SPARC is operational!!! #"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:", @@ -228,6 +229,7 @@ "hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn:hpux64-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux64-parisc-gcc","gcc:-DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn:hpux64-shared:-fpic::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # More attempts at unified 10.X and 11.X targets for HP C compiler. # @@ -335,7 +337,7 @@ # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the # bn86-elf.o file file since it is hand tweaked assembler. "linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", "linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", "linux-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::", @@ -435,7 +437,7 @@ "sco5-cc-pentium", "cc:-Kpentium::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options? "sco5-gcc", "gcc:-O3 -fomit-frame-pointer::(unknown):-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # the SCO assembler doesn't seem to like our assembler files ... "sco5-cc-shared","cc:-belf:::-lsocket -lresolv -lnsl:MD2_CHAR RC4_INDEX ${x86_gcc_des}::::::::::dlfcn:svr3-shared:-Kpic", -"sco5-gcc-shared","gcc:-O3 -DFILIO_H -fomit-frame-pointer:::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to like our assembler files ... +"sco5-gcc-shared","gcc:-O3 -fomit-frame-pointer:::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to like our assembler files ... # Sinix/ReliantUNIX RM400 # NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer problem. Better use -g */ @@ -470,6 +472,9 @@ # and its library files in util/pl/*) "Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", +# UWIN +"UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", + # Cygwin "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32:cygwin-shared:::.dll", @@ -488,7 +493,7 @@ ##### MacOS X (a.k.a. Rhapsody or Darwin) setup "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", -"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN -fno-common::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ##### Sony NEWS-OS 4.x "newsos4-gcc","gcc:-O -DB_ENDIAN -DNEWS4::(unknown):-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::", @@ -899,6 +904,10 @@ $cflags.=" -DRMD160_ASM"; } +# "Stringify" the C flags string. This permits it to be made part of a string +# and works as well on command lines. +$cflags =~ s/([\\\"])/\\\1/g; + my $version = "unknown"; my $major = "unknown"; my $minor = "unknown"; @@ -981,13 +990,21 @@ if ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*$/) { my $sotmp = $1; - s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/ + s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/; + } + elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.dylib$/) + { + s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.dylib/; } elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) { my $sotmp = $1; s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; } + elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) + { + s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.\$(SHLIB_MAJOR).dylib .dylib/; + } s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/; print OUT $_."\n"; } ==== //depot/projects/trustedbsd/base/crypto/openssl/FAQ#4 (text+ko) ==== @@ -38,6 +38,8 @@ * Why does the OpenSSL compilation fail on Alpha Tru64 Unix? * Why does the OpenSSL compilation fail with "ar: command not found"? * Why does the OpenSSL compilation fail on Win32 with VC++? +* What is special about OpenSSL on Redhat? +* Why does the OpenSSL test suite fail on MacOS X? [PROG] Questions about programming with OpenSSL @@ -59,7 +61,7 @@ * Which is the current version of OpenSSL? The current version is available from . -OpenSSL 0.9.6d was released on 9 May, 2002. +OpenSSL 0.9.6e was released on 30 May, 2002. In addition to the current stable release, you can also access daily snapshots of the OpenSSL development version at (note that your - message will be forwarded to a public mailing list). Include the - output of "make report" in your message. + message will be recorded in the request tracker publicly readable + via http://www.openssl.org/rt2.html and will be forwarded to a public + mailing list). Include the output of "make report" in your message. + Please check out the request tracker. Maybe the bug was already + reported or has already been fixed. [If you encounter assembler error messages, try the "no-asm" configuration option as an immediate fix.] @@ -147,7 +150,8 @@ try removing any compiler optimization flags from the CFLAGS line in Makefile.ssl and run "make clean; make". Please send a bug report to , including the output of - "make report". + "make report" in order to be added to the request tracker at + http://www.openssl.org/rt2.html. 4. If everything tests ok, install OpenSSL with ==== //depot/projects/trustedbsd/base/crypto/openssl/Makefile.org#4 (text+ko) ==== @@ -420,6 +420,7 @@ -b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -Fl lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \ + chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \ libs="$$libs -L. -l$$i"; \ done @@ -430,6 +431,7 @@ -b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +forceload lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \ + chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \ libs="$$libs -L. -l$$i"; \ done @@ -545,7 +547,7 @@ tests: rehash @(cd test && echo "testing..." && \ - $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PERL='${PERL}' EXE_EXT='${EXE_EXT}' tests ); + $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' OPENSSL_DEBUG_MEMORY=on tests ); @apps/openssl version -a report: @@ -556,7 +558,7 @@ do \ if [ -d "$$i" ]; then \ (cd $$i && echo "making dependencies $$i..." && \ - $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' depend ) || exit 1; \ + $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' PERL='${PERL}' depend ) || exit 1; \ fi; \ done; @@ -601,20 +603,26 @@ update: depend errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h TABLE +# Build distribution tar-file. As the list of files returned by "find" is +# pretty long, on several platforms a "too many arguments" error or similar +# would occur. Therefore the list of files is temporarily stored into a file +# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal +# tar does not support the --files-from option. tar: - @$(TAR) $(TARFLAGS) -cvf - \ - `find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort` |\ + find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \ + $(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \ tardy --user_number=0 --user_name=openssl \ --group_number=0 --group_name=openssl \ --prefix=openssl-$(VERSION) - |\ gzip --best >../$(TARFILE).gz; \ + rm -f ../$(TARFILE).list; \ ls -l ../$(TARFILE).gz dist: $(PERL) Configure dist @$(MAKE) dist_pem_h @$(MAKE) SDIRS='${SDIRS}' clean - @$(MAKE) tar + @$(MAKE) TAR='${TAR}' TARFLAGS='${TARFLAGS}' tar dist_pem_h: (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean) @@ -656,7 +664,7 @@ ( echo installing $$i; \ if [ "$(PLATFORM)" != "Cygwin" ]; then \ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ else \ c=`echo $$i | sed 's/^lib/cyg/'`; \ cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ @@ -681,18 +689,20 @@ fn=`basename $$i .pod`; \ if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ - (cd `dirname $$i`; \ - $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \ - --release=$(VERSION) `basename $$i`) \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$(PERL) `cd ../../util; ./pod2mantest ignore` \ + --section=$$sec --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \ done @for i in doc/crypto/*.pod doc/ssl/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ - (cd `dirname $$i`; \ - $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \ - --release=$(VERSION) `basename $$i`) \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$(PERL) `cd ../../util; ./pod2mantest ignore` \ + --section=$$sec --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \ done ==== //depot/projects/trustedbsd/base/crypto/openssl/Makefile.ssl#4 (text+ko) ==== @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=0.9.6d +VERSION=0.9.6e MAJOR=0 MINOR=9.6 SHLIB_VERSION_NUMBER=0.9.6 @@ -64,7 +64,7 @@ EXE_EXT= AR=ar r RANLIB= /usr/bin/ranlib -PERL= /usr/local/bin/perl +PERL= /usr/local/bin/perl5 TAR= tar TARFLAGS= --no-recursion @@ -422,6 +422,7 @@ -b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -Fl lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \ + chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \ libs="$$libs -L. -l$$i"; \ done @@ -432,6 +433,7 @@ -b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +forceload lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \ + chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \ libs="$$libs -L. -l$$i"; \ done @@ -547,7 +549,7 @@ tests: rehash @(cd test && echo "testing..." && \ - $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PERL='${PERL}' EXE_EXT='${EXE_EXT}' tests ); + $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' OPENSSL_DEBUG_MEMORY=on tests ); @apps/openssl version -a report: @@ -558,7 +560,7 @@ do \ if [ -d "$$i" ]; then \ (cd $$i && echo "making dependencies $$i..." && \ - $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' depend ) || exit 1; \ + $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' PERL='${PERL}' depend ) || exit 1; \ fi; \ done; @@ -603,20 +605,26 @@ update: depend errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h TABLE +# Build distribution tar-file. As the list of files returned by "find" is +# pretty long, on several platforms a "too many arguments" error or similar +# would occur. Therefore the list of files is temporarily stored into a file +# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal +# tar does not support the --files-from option. tar: - @$(TAR) $(TARFLAGS) -cvf - \ - `find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort` |\ + find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \ + $(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \ tardy --user_number=0 --user_name=openssl \ --group_number=0 --group_name=openssl \ --prefix=openssl-$(VERSION) - |\ gzip --best >../$(TARFILE).gz; \ + rm -f ../$(TARFILE).list; \ ls -l ../$(TARFILE).gz dist: $(PERL) Configure dist @$(MAKE) dist_pem_h @$(MAKE) SDIRS='${SDIRS}' clean - @$(MAKE) tar + @$(MAKE) TAR='${TAR}' TARFLAGS='${TARFLAGS}' tar dist_pem_h: (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean) @@ -658,7 +666,7 @@ ( echo installing $$i; \ if [ "$(PLATFORM)" != "Cygwin" ]; then \ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ else \ c=`echo $$i | sed 's/^lib/cyg/'`; \ cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ @@ -683,18 +691,20 @@ fn=`basename $$i .pod`; \ if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ - (cd `dirname $$i`; \ - $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \ - --release=$(VERSION) `basename $$i`) \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$(PERL) `cd ../../util; ./pod2mantest ignore` \ + --section=$$sec --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \ done @for i in doc/crypto/*.pod doc/ssl/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ - (cd `dirname $$i`; \ - $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \ - --release=$(VERSION) `basename $$i`) \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$(PERL) `cd ../../util; ./pod2mantest ignore` \ + --section=$$sec --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \ done ==== //depot/projects/trustedbsd/base/crypto/openssl/NEWS#4 (text+ko) ==== @@ -56,7 +56,7 @@ o Bug fixes for Win32, HP/UX and Irix. o Bug fixes in BIGNUM, SSL, PKCS#7, PKCS#12, X.509, CONF and memory checking routines. - o Bug fixes for RSA operations in threaded enviroments. + o Bug fixes for RSA operations in threaded environments. o Bug fixes in misc. openssl applications. o Remove a few potential memory leaks. o Add tighter checks of BIGNUM routines. ==== //depot/projects/trustedbsd/base/crypto/openssl/README#4 (text+ko) ==== @@ -1,5 +1,5 @@ - OpenSSL 0.9.6d 9 May 2002 + OpenSSL 0.9.6e 30 July 2002 Copyright (c) 1998-2002 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson @@ -122,6 +122,13 @@ lists the functions; you will probably have to look at the code to work out how to use them. Look at the example programs. + PROBLEMS + -------- + + For some platforms, there are some known problems that may affect the user + or application author. We try to collect those in doc/PROBLEMS, with current + thoughts on how they should be solved in a future of OpenSSL. + SUPPORT ------- @@ -146,11 +153,13 @@ - Problem Description (steps that will reproduce the problem, if known) - Stack Traceback (if the application dumps core) - Report the bug to the OpenSSL project at: + Report the bug to the OpenSSL project via the Request Tracker + (http://www.openssl.org/rt2.html) by mail to: openssl-bugs@openssl.org - Note that mail to openssl-bugs@openssl.org is forwarded to a public + Note that mail to openssl-bugs@openssl.org is recorded in the publicly + readable request tracker database and is forwarded to a public mailing list. Confidential mail may be sent to openssl-security@openssl.org (PGP key available from the key servers). @@ -164,7 +173,9 @@ textual explanation of what your patch does. Note: For legal reasons, contributions from the US can be accepted only - if a copy of the patch is sent to crypt@bxa.doc.gov + if a TSA notification and a copy of the patch is sent to crypt@bis.doc.gov; + see http://www.bis.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html [sic] + and http://w3.access.gpo.gov/bis/ear/pdf/740.pdf (EAR Section 740.13(e)). The preferred format for changes is "diff -u" output. You might >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 12:53:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25A9A37B47A; Tue, 30 Jul 2002 12:50:38 -0700 (PDT) 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 B600437B43B for ; Tue, 30 Jul 2002 12:50:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C25243E31 for ; Tue, 30 Jul 2002 12:50:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UJntJU050010 for ; Tue, 30 Jul 2002 12:49:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UJntVM050004 for perforce@freebsd.org; Tue, 30 Jul 2002 12:49:55 -0700 (PDT) Date: Tue, 30 Jul 2002 12:49:55 -0700 (PDT) Message-Id: <200207301949.g6UJntVM050004@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15215 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15215 Change 15215 by rwatson@rwatson_tislabs on 2002/07/30 12:49:21 Clarification of comments. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#102 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#102 (text+ko) ==== @@ -48,12 +48,11 @@ * List of operations that are performed as part of the implementation * of a MAC policy. Policy implementors declare operations with a * mac_policy_ops structure, and using the MAC_POLICY_SET() macro. - * Individual operation function pointers may be set to NULL if not - * required for a policy implementation, in which case they will be - * ignored during that composite MAC policy operation. + * If an entry point is not declared, then then the policy will be ignored + * during evaluation of that event or check. * - * Operations are sorted first by general class of operation, then by - * target object type, and then alphabetically. + * Operations are sorted first by general class of operation, then + * alphabetically. */ struct mac_policy_conf; struct mac_policy_ops { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 12:54:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF88137B401; Tue, 30 Jul 2002 12:53:01 -0700 (PDT) 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 8090F37B400 for ; Tue, 30 Jul 2002 12:53:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CD4843E67 for ; Tue, 30 Jul 2002 12:53:00 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UJr0JU052108 for ; Tue, 30 Jul 2002 12:53:00 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UJr0mQ052105 for perforce@freebsd.org; Tue, 30 Jul 2002 12:53:00 -0700 (PDT) Date: Tue, 30 Jul 2002 12:53:00 -0700 (PDT) Message-Id: <200207301953.g6UJr0mQ052105@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 15216 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15216 Change 15216 by chris@chris_holly on 2002/07/30 12:52:01 Synchronize with rwatson's latest renaming changes: 15035, 15040, 15053, 15058, 15063, 15073, 15078, 15085, 15124, 15129. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#11 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#11 (text+ko) ==== @@ -481,13 +481,13 @@ socket. - - <function>&mac.mpo;_init_subject</function> + + <function>&mac.mpo;_init_cred</function> void - &mac.mpo;_init_subject + &mac.mpo;_init_cred struct ucred *cred @@ -873,13 +873,13 @@ destroyed. - - <function>&mac.mpo;_destroy_subject</function> + + <function>&mac.mpo;_destroy_cred</function> void - &mac.mpo;_destroy_subject + &mac.mpo;_destroy_cred struct ucred *cred @@ -1219,13 +1219,13 @@ mounted devfs instance. - - <function>&mac.mpo;_create_vnode_from_vnode</function> + + <function>&mac.mpo;_vnode_create_from_vnode</function> void - &mac.mpo;_create_vnode_from_vnode + &mac.mpo;_vnode_create_from_vnode struct ucred *cred @@ -1377,13 +1377,13 @@ the root file system is mounted. - - <function>&mac.mpo;_relabel_vnode</function> + + <function>&mac.mpo;_vnode_relabel</function> void - &mac.mpo;_relabel_vnode + &mac.mpo;_vnode_relabel struct ucred *cred @@ -1479,12 +1479,12 @@ above documentation as development progresses. - - <function>&mac.mpo;_update_devfsdirent_from_vnode</function> + + <function>&mac.mpo;_update_devfsdirent</function> void - &mac.mpo;_update_devfsdirent_from_vnode + &mac.mpo;_update_devfsdirent struct devfs_dirent *devfs_dirent @@ -1535,17 +1535,17 @@ the label change such that it lasts even if the vnode is recycled. It will also be made when when a symlink is created in devfs, following a call to - mac_create_vnode_from_vnode to + mac_vnode_create_from_vnode to initialize the vnode label. - - <function>&mac.mpo;_update_procfs_vnode_from_subject</function> + + <function>&mac.mpo;_update_procfsvnode</function> void - &mac.mpo;_update_procfs_vnode_from_subject + &mac.mpo;_update_procfsvnode struct vnode *vp @@ -1924,12 +1924,12 @@ - <function>&mac.mpo;_relabel_socket</function> + <function>&mac.mpo;_socket_relabel</function> void - &mac.mpo;_relabel_socket + &mac.mpo;_socket_relabel struct ucred *cred @@ -2181,13 +2181,13 @@ during the boot or as a result of a user action. - - <function>&mac.mpo;_create_ipq_from_fragment</function> + + <function>&mac.mpo;_create_ipq</function> void - &mac.mpo;_create_ipq_from_fragment + &mac.mpo;_create_ipq struct mbuf *fragment @@ -2289,13 +2289,13 @@ generated. - - <function>&mac.mpo;_create_fragment_from_datagram</function> + + <function>&mac.mpo;_create_fragment</function> void - &mac.mpo;_create_fragment_from_datagram + &mac.mpo;_create_fragment struct mbuf *datagram @@ -2398,13 +2398,13 @@ an mbuf is re-allocated for alignment purposes. - - <function>&mac.mpo;_create_mbuf_linklayer_for_ifnet</function> + + <function>&mac.mpo;_create_mbuf_linklayer</function> void - &mac.mpo;_create_mbuf_linklayer_for_ifnet + &mac.mpo;_create_mbuf_linklayer struct ifnet *ifnet @@ -2562,13 +2562,13 @@ datagram generated from the passed network interface. - - <function>&mac.mpo;_create_mbuf_multicast_encap_from_mbuf</function> + + <function>&mac.mpo;_create_mbuf_multicast_encap</function> void - &mac.mpo;_create_mbuf_multicast_encap_from_mbuf + &mac.mpo;_create_mbuf_multicast_encap struct mbuf *oldmbuf @@ -2634,13 +2634,13 @@ delivered using the virtual interface. - - <function>&mac.mpo;_create_mbuf_netlayer_from_mbuf</function> + + <function>&mac.mpo;_create_mbuf_netlayer</function> void - &mac.mpo;_create_mbuf_netlayer_from_mbuf + &mac.mpo;_create_mbuf_netlayer struct mbuf *oldmbuf @@ -2690,13 +2690,13 @@ when responding to ICMP request datagrams. - - <function>&mac.mpo;_fragment_matches_ipq</function> + + <function>&mac.mpo;_fragment_match</function> int - &mac.mpo;_fragment_matches_ipq + &mac.mpo;_fragment_match struct mbuf *fragment @@ -2754,13 +2754,13 @@ label or other information. - - <function>&mac.mpo;_relabel_ifnet</function> + + <function>&mac.mpo;_ifnet_relabel</function> void - &mac.mpo;_relabel_ifnet + &mac.mpo;_ifnet_relabel struct ucred *cred @@ -2809,13 +2809,13 @@ subject credential, cred. - - <function>&mac.mpo;_update_ipq_from_fragment</function> + + <function>&mac.mpo;_update_ipq</function> void - &mac.mpo;_update_ipq_from_fragment + &mac.mpo;_update_ipq struct mbuf *fragment @@ -2870,13 +2870,13 @@ ... - - <function>&mac.mpo;_create_subject</function> + + <function>&mac.mpo;_create_cred</function> void - &mac.mpo;_create_subject + &mac.mpo;_create_cred struct ucred *parent_cred @@ -2970,11 +2970,11 @@ returns a success from the mpo_execve_will_transition entry point. Policies may choose to implement this call simply by - invoking mpo_create_subject and passing + invoking mpo_create_cred and passing the two subject credentials so as not to implement a transitioning event. Policies should not leave this entry point unimplemented if they implement - mpo_create_subject, even if they do not + mpo_create_cred, even if they do not implement mpo_execve_will_transition. @@ -3094,13 +3094,13 @@ of all kernel processes. - - <function>&mac.mpo;_relabel_subject</function> + + <function>&mac.mpo;_cred_relabel</function> void - &mac.mpo;_relabel_subject + &mac.mpo;_cred_relabel struct ucred *cred @@ -3197,13 +3197,13 @@ EPERM for lack of privilege. - - <function>&mac.mpo;_check_bind_socket</function> + + <function>&mac.mpo;_check_socket_bind</function> int - &mac.mpo;_check_bind_socket + &mac.mpo;_check_socket_bind struct ucred *cred @@ -3307,13 +3307,13 @@ EPERM for lack of privilege. - - <function>&mac.mpo;_check_see_cred</function> + + <function>&mac.mpo;_check_cred_visible</function> int - &mac.mpo;_check_see_cred + &mac.mpo;_check_cred_visible struct ucred *u1 @@ -3354,13 +3354,13 @@ and in procfs lookups. - - <function>&mac.mpo;_check_see_socket</function> + + <function>&mac.mpo;_check_socket_visible</function> int - &mac.mpo;_check_see_socket + &mac.mpo;_check_socket_visible struct ucred *cred @@ -3397,13 +3397,13 @@ - - <function>&mac.mpo;_check_relabel_ifnet</function> + + <function>&mac.mpo;_check_ifnet_relabel</function> int - &mac.mpo;_check_relabel_ifnet + &mac.mpo;_check_ifnet_relabel struct ucred *cred @@ -3450,13 +3450,13 @@ passed network interface to the passed label update. - - <function>&mac.mpo;_check_relabel_socket</function> + + <function>&mac.mpo;_check_socket_relabel</function> int - &mac.mpo;_check_relabel_socket + &mac.mpo;_check_socket_relabel struct ucred *cred @@ -3503,13 +3503,13 @@ passed socket to the passed label update. - - <function>&mac.mpo;_check_relabel_subject</function> + + <function>&mac.mpo;_check_cred_relabel</function> int - &mac.mpo;_check_relabel_subject + &mac.mpo;_check_cred_relabel struct ucred *cred @@ -3541,13 +3541,13 @@ itself to the passed label update. - - <function>&mac.mpo;_check_relabel_vnode</function> + + <function>&mac.mpo;_check_vnode_relabel</function> int - &mac.mpo;_check_relabel_vnode + &mac.mpo;_check_vnode_relabel struct ucred *cred @@ -3596,12 +3596,12 @@ passed vnode to the passed label update. - - <function>&mac.mpo;_check_statfs</function> + + <function>&mac.mpo;_check_mount_stat</function> - int &mac.mpo;_check_statfs + int &mac.mpo;_check_mount_stat struct ucred *cred @@ -3636,6 +3636,7 @@ + Determine whether the subject credential can see the results of a statfs performed on the file system. Return 0 for success, or an @@ -3648,13 +3649,13 @@ systems, such as when &man.getfsstat.2; is invoked. - - <function>&mac.mpo;_check_debug_proc</function> + + <function>&mac.mpo;_check_proc_debug</function> int - &mac.mpo;_check_debug_proc + &mac.mpo;_check_proc_debug struct ucred *cred @@ -3694,13 +3695,13 @@ operations. - - <function>&mac.mpo;_check_access_vnode</function> + + <function>&mac.mpo;_check_vnode_access</function> int - &mac.mpo;_check_access_vnode + &mac.mpo;_check_vnode_access struct ucred *cred @@ -3751,13 +3752,13 @@ privilege. - - <function>&mac.mpo;_check_chdir_vnode</function> + + <function>&mac.mpo;_check_vnode_chdir</function> int - &mac.mpo;_check_chdir_vnode + &mac.mpo;_check_vnode_chdir struct ucred *cred @@ -3801,13 +3802,13 @@ privilege. - - <function>&mac.mpo;_check_create_vnode</function> + + <function>&mac.mpo;_check_vnode_create</function> int - &mac.mpo;_check_create_vnode + &mac.mpo;_check_vnode_create struct ucred *cred @@ -3870,13 +3871,13 @@ others. - - <function>&mac.mpo;_check_delete_vnode</function> + + <function>&mac.mpo;_check_vnode_delete</function> int - &mac.mpo;_check_delete_vnode + &mac.mpo;_check_vnode_delete struct ucred *cred @@ -3948,13 +3949,13 @@ rename. - - <function>&mac.mpo;_check_deleteacl_vnode</function> + + <function>&mac.mpo;_check_vnode_deleteacl</function> int - &mac.mpo;_check_deleteacl_vnode + &mac.mpo;_check_vnode_deleteacl struct ucred *cred struct vnode *vp @@ -4003,13 +4004,13 @@ privilege. - - <function>&mac.mpo;_check_exec_vnode</function> + + <function>&mac.mpo;_check_vnode_exec</function> int - &mac.mpo;_check_exec_vnode + &mac.mpo;_check_vnode_exec struct ucred *cred @@ -4054,13 +4055,13 @@ privilege. - - <function>&mac.mpo;_check_getacl_vnode</function> + + <function>&mac.mpo;_check_vnode_getacl</function> int - &mac.mpo;_check_getacl_vnode + &mac.mpo;_check_vnode_getacl struct ucred *cred @@ -4111,13 +4112,13 @@ privilege. - - <function>&mac.mpo;_check_getextattr_vnode</function> + + <function>&mac.mpo;_check_vnode_getextattr</function> int - &mac.mpo;_check_getextattr_vnode + &mac.mpo;_check_vnode_getextattr struct ucred *cred @@ -4185,13 +4186,13 @@ privilege. - - <function>&mac.mpo;_check_listen_socket</function> + + <function>&mac.mpo;_check_socket_listen</function> int - &mac.mpo;_check_listen_socket + &mac.mpo;_check_socket_listen struct ucred *cred @@ -4234,13 +4235,13 @@ privilege. - - <function>&mac.mpo;_check_lookup_vnode</function> + + <function>&mac.mpo;_check_vnode_lookup</function> int - &mac.mpo;_check_lookup_vnode + &mac.mpo;_check_vnode_lookup struct ucred *cred @@ -4291,13 +4292,13 @@ privilege. - - <function>&mac.mpo;_check_open_vnode</function> + + <function>&mac.mpo;_check_vnode_open</function> int - &mac.mpo;_check_open_vnode + &mac.mpo;_check_vnode_open struct ucred *cred @@ -4347,13 +4348,13 @@ EPERM for lack of privilege. - - <function>&mac.mpo;_check_readdir_vnode</function> + + <function>&mac.mpo;_check_vnode_readdir</function> int - &mac.mpo;_check_readdir_vnode + &mac.mpo;_check_vnode_readdir struct ucred *cred @@ -4397,13 +4398,13 @@ privilege. - - <function>&mac.mpo;_check_readlink_vnode</function> + + <function>&mac.mpo;_check_vnode_readlink</function> int - &mac.mpo;_check_readlink_vnode + &mac.mpo;_check_vnode_readlink struct ucred *cred @@ -4604,13 +4605,13 @@ privilege. - - <function>&mac.mpo;_check_revoke_vnode</function> + + <function>&mac.mpo;_check_vnode_revoke</function> int - &mac.mpo;_check_revoke_vnode + &mac.mpo;_check_vnode_revoke struct ucred *cred @@ -4654,13 +4655,13 @@ privilege. - - <function>&mac.mpo;_check_setacl_vnode</function> + + <function>&mac.mpo;_check_vnode_setacl</function> int - &mac.mpo;_check_setacl_vnode + &mac.mpo;_check_vnode_setacl struct ucred *cred @@ -4718,13 +4719,13 @@ privilege. - - <function>&mac.mpo;_check_setextattr_vnode</function> + + <function>&mac.mpo;_check_vnode_setextattr</function> int - &mac.mpo;_check_setextattr_vnode + &mac.mpo;_check_vnode_setextattr struct ucred *cred @@ -4791,13 +4792,13 @@ privilege. - - <function>&mac.mpo;_check_setflags_vnode</function> + + <function>&mac.mpo;_check_vnode_setflags</function> int - &mac.mpo;_check_setflags_vnode + &mac.mpo;_check_vnode_setflags struct ucred *cred @@ -4847,13 +4848,13 @@ privilege. - - <function>&mac.mpo;_check_setmode_vnode</function> + + <function>&mac.mpo;_check_vnode_setmode</function> int - &mac.mpo;_check_setmode_vnode + &mac.mpo;_check_vnode_setmode struct ucred *cred @@ -4902,13 +4903,13 @@ privilege. - - <function>&mac.mpo;_check_setowner_vnode</function> + + <function>&mac.mpo;_check_vnode_setowner</function> int - &mac.mpo;_check_setowner_vnode + &mac.mpo;_check_vnode_setowner struct ucred *cred @@ -4964,13 +4965,13 @@ of privilege. - - <function>&mac.mpo;_check_setutimes_vnode</function> + + <function>&mac.mpo;_check_vnode_setutimes</function> int - &mac.mpo;_check_setutimes_vnode + &mac.mpo;_check_vnode_setutimes struct ucred *cred @@ -5028,13 +5029,13 @@ privilege. - - <function>&mac.mpo;_check_sched_proc</function> + + <function>&mac.mpo;_check_proc_sched</function> int - &mac.mpo;_check_sched_proc + &mac.mpo;_check_proc_sched struct ucred *ucred @@ -5070,13 +5071,13 @@ ESRCH to limit visibility. - - <function>&mac.mpo;_check_signal_proc</function> + + <function>&mac.mpo;_check_proc_signal</function> int - &mac.mpo;_check_signal_proc + &mac.mpo;_check_proc_signal struct ucred *cred @@ -5118,13 +5119,13 @@ ESRCH to limit visibility. - - <function>&mac.mpo;_check_stat_vnode</function> + + <function>&mac.mpo;_check_vnode_stat</function> int - &mac.mpo;_check_stat_vnode + &mac.mpo;_check_vnode_stat struct ucred *cred @@ -5168,13 +5169,13 @@ privilege. - - <function>&mac.mpo;_check_send_mbuf</function> + + <function>&mac.mpo;_check_ifnet_transmit</function> int - &mac.mpo;_check_send_mbuf + &mac.mpo;_check_ifnet_transmit struct ucred *cred @@ -5232,13 +5233,13 @@ privilege. - - <function>&mac.mpo;_check_receive_mbuf</function> + + <function>&mac.mpo;_check_socket_receive</function> int - &mac.mpo;_check_receive_mbuf + &mac.mpo;_check_socket_receive struct ucred *cred To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 13: 6:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EE2037B401; Tue, 30 Jul 2002 13:05:26 -0700 (PDT) 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 BD51337B400 for ; Tue, 30 Jul 2002 13:05:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6ADA843E3B for ; Tue, 30 Jul 2002 13:05:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UK5HJU054403 for ; Tue, 30 Jul 2002 13:05:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UK5FBP054324 for perforce@freebsd.org; Tue, 30 Jul 2002 13:05:15 -0700 (PDT) Date: Tue, 30 Jul 2002 13:05:15 -0700 (PDT) Message-Id: <200207302005.g6UK5FBP054324@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15217 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15217 Change 15217 by rwatson@rwatson_tislabs on 2002/07/30 13:04:46 Integ trustedbsd_base into trustedbsd_mac, including recent mbuf merges, system call addition of mac_policy, et al. Affected files ... .. //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Configure#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FAQ#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/INSTALL#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.org#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.ssl#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/NEWS#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/PROBLEMS#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/README#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/CA.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/apps.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/asn1pars.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/ca.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/der_chop#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/pkcs7.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/config#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_bitstr.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_enum.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_int.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_set.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/a_utctm.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/d2i_dhp.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/d2i_dsap.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/d2i_r_pr.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/t_pkey.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/x_pubkey.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_print.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bf_nbio.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/bss_bio.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_div.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_gcd.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_mont.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bn/bn_mul.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/conf/conf_def.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cryptlib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cryptlib.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/des/des.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dsa/dsa_asn1.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/dso/dso_dlfcn.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/ebcdic.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/bio_enc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/c_allc.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/c_alld.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/evp/evp.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/o_names.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/objects/obj_dat.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslv.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem2.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pem/pem_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/perlasm/x86nasm.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs12/pkcs12.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/pk7_doit.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/pkcs7/verify.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/rsa/rsa_eay.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/txt_db/txt_db.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/x509v3/v3_ia5.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/demos/maurice/loadkeys.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/crl2pkcs7.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/apps/smime.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/BN_rand.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/DH_get_ex_new_index.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/EVP_DigestInit.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/EVP_SignInit.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/EVP_VerifyInit.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/RSA_check_key.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/err.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/crypto/rsa.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_sess_set_cache_size.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_sess_set_get_cb.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_accept.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_connect.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_do_handshake.pod#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_get_error.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_set_connect_state.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/SSL_write.pod#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/doc/ssl/ssl.pod#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/e_os.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_clnt.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_lib.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_srvr.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_clnt.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_enc.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_srvr.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_asn1.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_err.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_locl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_sess.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/t1_enc.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/test/Makefile.ssl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/tools/c_rehash#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/dirname.pl#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/util/domd#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/mk1mf.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/BC-32.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pl/VC-32.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pod2man.pl#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pod2mantest#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssl/util/pod2mantest.pod#1 branch .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_ctrl.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_f_base64.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_f_buffer.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_f_cipher.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_f_md.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_f_null.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_f_ssl.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_find_type.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_new.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_new_bio_pair.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_push.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_read.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_s_accept.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_s_bio.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_s_connect.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_s_fd.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_s_file.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_s_mem.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_s_null.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_s_socket.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_set_callback.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BIO_should_retry.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_CTX_new.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_CTX_start.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_add.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_add_word.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_bn2bin.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_cmp.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_copy.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_generate_prime.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_mod_inverse.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_new.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_num_bytes.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_rand.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_set_bit.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/BN_zero.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/CA.pl.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DH_generate_key.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DH_generate_parameters.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DH_get_ex_new_index.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DH_new.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DH_set_method.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DH_size.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DSA_SIG_new.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DSA_do_sign.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DSA_dup_DH.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DSA_generate_key.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DSA_generate_parameters.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DSA_new.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DSA_set_method.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DSA_sign.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/DSA_size.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/ERR_GET_LIB.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/ERR_clear_error.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/ERR_error_string.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/ERR_get_error.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/ERR_load_strings.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/ERR_print_errors.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/ERR_put_error.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/ERR_remove_state.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/EVP_DigestInit.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/EVP_EncryptInit.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/EVP_OpenInit.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/EVP_SealInit.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/EVP_SignInit.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/EVP_VerifyInit.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RAND_add.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RAND_bytes.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RAND_cleanup.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RAND_egd.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RAND_load_file.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RAND_set_rand_method.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RSA_blinding_on.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RSA_check_key.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RSA_generate_key.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RSA_new.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RSA_print.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RSA_private_encrypt.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RSA_public_encrypt.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RSA_set_method.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RSA_sign.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/RSA_size.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CIPHER_get_name.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_COMP_add_compression_method.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_add_extra_chain_cert.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_add_session.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_ctrl.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_flush_sessions.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_free.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_get_ex_new_index.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_get_verify_mode.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_load_verify_locations.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_new.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_sess_number.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_sess_set_cache_size.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_sess_set_get_cb.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_sessions.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_cert_store.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_cert_verify_callback.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_cipher_list.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_client_CA_list.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_client_cert_cb.3#1 branch .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_default_passwd_cb.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_info_callback.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_mode.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_options.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_quiet_shutdown.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_session_cache_mode.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_session_id_context.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_ssl_version.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_timeout.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_tmp_dh_callback.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_tmp_rsa_callback.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_set_verify.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_CTX_use_certificate.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_SESSION_free.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_SESSION_get_ex_new_index.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_SESSION_get_time.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_accept.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_alert_type_string.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_clear.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_connect.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_do_handshake.3#1 branch .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_free.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_SSL_CTX.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_ciphers.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_client_CA_list.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_current_cipher.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_default_timeout.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_error.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_ex_new_index.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_fd.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_peer_cert_chain.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_peer_certificate.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_rbio.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_session.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_verify_result.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_get_version.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_library_init.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_load_client_CA_file.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_new.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_pending.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_read.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_rstate_string.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_session_reused.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_set_bio.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_set_connect_state.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_set_fd.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_set_session.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_set_shutdown.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_set_verify_result.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_shutdown.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_state_string.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_want.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/SSL_write.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/asn1parse.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/bio.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/blowfish.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/bn.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/bn_internal.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/buffer.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/ca.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/ciphers.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/config.5#1 branch .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/crl.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/crl2pkcs7.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/crypto.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/d2i_DHparams.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/d2i_SSL_SESSION.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/des.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/des_modes.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/dgst.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/dh.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/dhparam.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/dsa.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/dsa.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/dsaparam.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/enc.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/err.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/evp.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/gendsa.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/genrsa.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/hmac.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/lh_stats.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/lhash.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/md5.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/mdc2.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/nseq.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/openssl.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/passwd.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/pkcs12.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/pkcs7.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/pkcs8.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/rand.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/rand.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/rc4.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/req.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/ripemd.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/rsa.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/rsa.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/rsautl.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/s_client.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/s_server.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/sess_id.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/sha.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/smime.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/speed.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/spkac.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/ssl.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/threads.3#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/verify.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/version.1#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/man/x509.1#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/README#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/doc-supfile#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/gnats-supfile#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/ports-supfile#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/cvsup/www-supfile#2 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#38 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acdebug.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acglobal.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/aclocal.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acmacros.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acnamesp.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acparser.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/actables.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/actbl.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/actypes.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/amlcode.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/amlresrc.h#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dbcmds.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dbdisply.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dbexec.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dbxface.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dmbuffer.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dmnames.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dmopcode.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dmresrc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dmresrcl.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dmresrcs.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dmutils.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dmwalk.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dsmethod.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dsobject.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dsutils.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dswload.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dswstate.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/exconfig.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/excreate.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/exdump.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/exmisc.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/exoparg1.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/exoparg2.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/exresnte.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/exresolv.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/exresop.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/exstore.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/exutils.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/nsdump.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/nsdumpdv.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/nseval.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/nsload.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/nsnames.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/nsxfeval.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/nsxfobj.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/psargs.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/psfind.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/psopcode.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/psutils.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/psxface.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/rsio.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/rsirq.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/rslist.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/tbconvrt.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/tbgetall.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/tbinstal.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/tbrsdt.c#1 branch .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/tbutils.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/tbxface.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/tbxfroot.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/utcopy.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/utxface.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uvisor.c#1 branch .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#22 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#22 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#19 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#67 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#27 integrate .. //depot/projects/trustedbsd/mac/sys/modules/uvisor/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/pci/if_rl.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#23 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#23 edit .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#24 edit .. //depot/projects/trustedbsd/mac/usr.bin/sed/compile.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#4 (text+ko) ==== @@ -2,6 +2,58 @@ OpenSSL CHANGES _______________ + Changes between 0.9.6d and 0.9.6e [30 Jul 2002] + + *) Fix cipher selection routines: ciphers without encryption had no flags + for the cipher strength set and where therefore not handled correctly + by the selection routines (PR #130). + [Lutz Jaenicke] + + *) Fix EVP_dsa_sha macro. + [Nils Larsch] + + *) New option + SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS + for disabling the SSL 3.0/TLS 1.0 CBC vulnerability countermeasure + that was added in OpenSSL 0.9.6d. + + As the countermeasure turned out to be incompatible with some + broken SSL implementations, the new option is part of SSL_OP_ALL. + SSL_OP_ALL is usually employed when compatibility with weird SSL + implementations is desired (e.g. '-bugs' option to 's_client' and + 's_server'), so the new option is automatically set in many + applications. + [Bodo Moeller] + + *) Changes in security patch: + + Changes marked "(CHATS)" were sponsored by the Defense Advanced + Research Projects Agency (DARPA) and Air Force Research Laboratory, + Air Force Materiel Command, USAF, under agreement number + F30602-01-2-0537. + + *) Add various sanity checks to asn1_get_length() to reject + the ASN1 length bytes if they exceed sizeof(long), will appear + negative or the content length exceeds the length of the + supplied buffer. + [Steve Henson, Adi Stav , James Yonan ] + + *) Assertions for various potential buffer overflows, not known to + happen in practice. + [Ben Laurie (CHATS)] + + *) Various temporary buffers to hold ASCII versions of integers were + too small for 64 bit platforms. (CAN-2002-0655) + [Matthew Byng-Maddick and Ben Laurie (CHATS)> + + *) Remote buffer overflow in SSL3 protocol - an attacker could + supply an oversized session ID to a client. (CAN-2002-0656) + [Ben Laurie (CHATS)] + + *) Remote buffer overflow in SSL2 protocol - an attacker could + supply an oversized client master key. (CAN-2002-0656) + [Ben Laurie (CHATS)] + Changes between 0.9.6c and 0.9.6d [9 May 2002] *) Fix crypto/asn1/a_sign.c so that 'parameters' is omitted (not ==== //depot/projects/trustedbsd/mac/crypto/openssl/Configure#4 (text+ko) ==== @@ -144,6 +144,7 @@ "solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "solaris-sparcv9-gcc","gcc:-mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"solaris64-sparcv9-gcc31","gcc:-mcpu=ultrasparc -m64 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8 # but keep the assembler modules. "solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W -DULTRASPARC::-D_REENTRANT:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -169,10 +170,10 @@ "linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::", # Ray Miller has patiently # assisted with debugging of following two configs. -"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o::::", +"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # it's a real mess with -mcpu=ultrasparc option under Linux, but # -Wa,-Av8plus should do the trick no matter what. -"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DULTRASPARC -DBN_DIV2W::-D_REENTRANT:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # !!!Folowing can't be even tested yet!!! # We have to wait till 64-bit glibc for SPARC is operational!!! #"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:", @@ -228,6 +229,7 @@ "hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W:::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn:hpux64-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"hpux64-parisc-gcc","gcc:-DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT:-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn:hpux64-shared:-fpic::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # More attempts at unified 10.X and 11.X targets for HP C compiler. # @@ -335,7 +337,7 @@ # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the # bn86-elf.o file file since it is hand tweaked assembler. "linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT:-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn", "linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", "linux-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::", @@ -435,7 +437,7 @@ "sco5-cc-pentium", "cc:-Kpentium::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options? "sco5-gcc", "gcc:-O3 -fomit-frame-pointer::(unknown):-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # the SCO assembler doesn't seem to like our assembler files ... "sco5-cc-shared","cc:-belf:::-lsocket -lresolv -lnsl:MD2_CHAR RC4_INDEX ${x86_gcc_des}::::::::::dlfcn:svr3-shared:-Kpic", -"sco5-gcc-shared","gcc:-O3 -DFILIO_H -fomit-frame-pointer:::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to like our assembler files ... +"sco5-gcc-shared","gcc:-O3 -fomit-frame-pointer:::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to like our assembler files ... # Sinix/ReliantUNIX RM400 # NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer problem. Better use -g */ @@ -470,6 +472,9 @@ # and its library files in util/pl/*) "Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", +# UWIN +"UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", + # Cygwin "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32", "Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -m486 -Wall::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32:cygwin-shared:::.dll", @@ -488,7 +493,7 @@ ##### MacOS X (a.k.a. Rhapsody or Darwin) setup "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::", -"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", +"darwin-ppc-cc","cc:-O3 -D_DARWIN -DB_ENDIAN -fno-common::-D_REENTRANT::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", ##### Sony NEWS-OS 4.x "newsos4-gcc","gcc:-O -DB_ENDIAN -DNEWS4::(unknown):-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::", @@ -899,6 +904,10 @@ $cflags.=" -DRMD160_ASM"; } +# "Stringify" the C flags string. This permits it to be made part of a string +# and works as well on command lines. +$cflags =~ s/([\\\"])/\\\1/g; + my $version = "unknown"; my $major = "unknown"; my $minor = "unknown"; @@ -981,13 +990,21 @@ if ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*$/) { my $sotmp = $1; - s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/ + s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/; + } + elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.dylib$/) + { + s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.dylib/; } elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) { my $sotmp = $1; s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/; } + elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/) + { + s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.\$(SHLIB_MAJOR).dylib .dylib/; + } s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/; print OUT $_."\n"; } ==== //depot/projects/trustedbsd/mac/crypto/openssl/FAQ#4 (text+ko) ==== @@ -38,6 +38,8 @@ * Why does the OpenSSL compilation fail on Alpha Tru64 Unix? * Why does the OpenSSL compilation fail with "ar: command not found"? * Why does the OpenSSL compilation fail on Win32 with VC++? +* What is special about OpenSSL on Redhat? +* Why does the OpenSSL test suite fail on MacOS X? [PROG] Questions about programming with OpenSSL @@ -59,7 +61,7 @@ * Which is the current version of OpenSSL? The current version is available from . -OpenSSL 0.9.6d was released on 9 May, 2002. +OpenSSL 0.9.6e was released on 30 May, 2002. In addition to the current stable release, you can also access daily snapshots of the OpenSSL development version at (note that your - message will be forwarded to a public mailing list). Include the - output of "make report" in your message. + message will be recorded in the request tracker publicly readable + via http://www.openssl.org/rt2.html and will be forwarded to a public + mailing list). Include the output of "make report" in your message. + Please check out the request tracker. Maybe the bug was already + reported or has already been fixed. [If you encounter assembler error messages, try the "no-asm" configuration option as an immediate fix.] @@ -147,7 +150,8 @@ try removing any compiler optimization flags from the CFLAGS line in Makefile.ssl and run "make clean; make". Please send a bug report to , including the output of - "make report". + "make report" in order to be added to the request tracker at + http://www.openssl.org/rt2.html. 4. If everything tests ok, install OpenSSL with ==== //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.org#4 (text+ko) ==== @@ -420,6 +420,7 @@ -b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -Fl lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \ + chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \ libs="$$libs -L. -l$$i"; \ done @@ -430,6 +431,7 @@ -b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +forceload lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \ + chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \ libs="$$libs -L. -l$$i"; \ done @@ -545,7 +547,7 @@ tests: rehash @(cd test && echo "testing..." && \ - $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PERL='${PERL}' EXE_EXT='${EXE_EXT}' tests ); + $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' OPENSSL_DEBUG_MEMORY=on tests ); @apps/openssl version -a report: @@ -556,7 +558,7 @@ do \ if [ -d "$$i" ]; then \ (cd $$i && echo "making dependencies $$i..." && \ - $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' depend ) || exit 1; \ + $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' PERL='${PERL}' depend ) || exit 1; \ fi; \ done; @@ -601,20 +603,26 @@ update: depend errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h TABLE +# Build distribution tar-file. As the list of files returned by "find" is +# pretty long, on several platforms a "too many arguments" error or similar +# would occur. Therefore the list of files is temporarily stored into a file +# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal +# tar does not support the --files-from option. tar: - @$(TAR) $(TARFLAGS) -cvf - \ - `find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort` |\ + find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \ + $(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \ tardy --user_number=0 --user_name=openssl \ --group_number=0 --group_name=openssl \ --prefix=openssl-$(VERSION) - |\ gzip --best >../$(TARFILE).gz; \ + rm -f ../$(TARFILE).list; \ ls -l ../$(TARFILE).gz dist: $(PERL) Configure dist @$(MAKE) dist_pem_h @$(MAKE) SDIRS='${SDIRS}' clean - @$(MAKE) tar + @$(MAKE) TAR='${TAR}' TARFLAGS='${TARFLAGS}' tar dist_pem_h: (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean) @@ -656,7 +664,7 @@ ( echo installing $$i; \ if [ "$(PLATFORM)" != "Cygwin" ]; then \ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ else \ c=`echo $$i | sed 's/^lib/cyg/'`; \ cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ @@ -681,18 +689,20 @@ fn=`basename $$i .pod`; \ if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ - (cd `dirname $$i`; \ - $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \ - --release=$(VERSION) `basename $$i`) \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$(PERL) `cd ../../util; ./pod2mantest ignore` \ + --section=$$sec --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \ done @for i in doc/crypto/*.pod doc/ssl/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ - (cd `dirname $$i`; \ - $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \ - --release=$(VERSION) `basename $$i`) \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$(PERL) `cd ../../util; ./pod2mantest ignore` \ + --section=$$sec --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \ done ==== //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.ssl#4 (text+ko) ==== @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=0.9.6d +VERSION=0.9.6e MAJOR=0 MINOR=9.6 SHLIB_VERSION_NUMBER=0.9.6 @@ -64,7 +64,7 @@ EXE_EXT= AR=ar r RANLIB= /usr/bin/ranlib -PERL= /usr/local/bin/perl +PERL= /usr/local/bin/perl5 TAR= tar TARFLAGS= --no-recursion @@ -422,6 +422,7 @@ -b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ -Fl lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \ + chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \ libs="$$libs -L. -l$$i"; \ done @@ -432,6 +433,7 @@ -b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \ +forceload lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \ + chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \ libs="$$libs -L. -l$$i"; \ done @@ -547,7 +549,7 @@ tests: rehash @(cd test && echo "testing..." && \ - $(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PERL='${PERL}' EXE_EXT='${EXE_EXT}' tests ); + $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' OPENSSL_DEBUG_MEMORY=on tests ); @apps/openssl version -a report: @@ -558,7 +560,7 @@ do \ if [ -d "$$i" ]; then \ (cd $$i && echo "making dependencies $$i..." && \ - $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' depend ) || exit 1; \ + $(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' PERL='${PERL}' depend ) || exit 1; \ fi; \ done; @@ -603,20 +605,26 @@ update: depend errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h TABLE +# Build distribution tar-file. As the list of files returned by "find" is +# pretty long, on several platforms a "too many arguments" error or similar +# would occur. Therefore the list of files is temporarily stored into a file +# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal +# tar does not support the --files-from option. tar: - @$(TAR) $(TARFLAGS) -cvf - \ - `find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort` |\ + find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \ + $(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \ tardy --user_number=0 --user_name=openssl \ --group_number=0 --group_name=openssl \ --prefix=openssl-$(VERSION) - |\ gzip --best >../$(TARFILE).gz; \ + rm -f ../$(TARFILE).list; \ ls -l ../$(TARFILE).gz dist: $(PERL) Configure dist @$(MAKE) dist_pem_h @$(MAKE) SDIRS='${SDIRS}' clean - @$(MAKE) tar + @$(MAKE) TAR='${TAR}' TARFLAGS='${TARFLAGS}' tar dist_pem_h: (cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean) @@ -658,7 +666,7 @@ ( echo installing $$i; \ if [ "$(PLATFORM)" != "Cygwin" ]; then \ cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \ else \ c=`echo $$i | sed 's/^lib/cyg/'`; \ cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \ @@ -683,18 +691,20 @@ fn=`basename $$i .pod`; \ if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \ echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ - (cd `dirname $$i`; \ - $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \ - --release=$(VERSION) `basename $$i`) \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$(PERL) `cd ../../util; ./pod2mantest ignore` \ + --section=$$sec --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \ done @for i in doc/crypto/*.pod doc/ssl/*.pod; do \ fn=`basename $$i .pod`; \ if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \ echo "installing man$$sec/`basename $$i .pod`.$$sec"; \ - (cd `dirname $$i`; \ - $(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \ - --release=$(VERSION) `basename $$i`) \ + (cd `$(PERL) util/dirname.pl $$i`; \ + sh -c "$(PERL) `cd ../../util; ./pod2mantest ignore` \ + --section=$$sec --center=OpenSSL \ + --release=$(VERSION) `basename $$i`") \ > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \ done ==== //depot/projects/trustedbsd/mac/crypto/openssl/NEWS#4 (text+ko) ==== @@ -56,7 +56,7 @@ o Bug fixes for Win32, HP/UX and Irix. o Bug fixes in BIGNUM, SSL, PKCS#7, PKCS#12, X.509, CONF and memory checking routines. - o Bug fixes for RSA operations in threaded enviroments. + o Bug fixes for RSA operations in threaded environments. o Bug fixes in misc. openssl applications. o Remove a few potential memory leaks. o Add tighter checks of BIGNUM routines. ==== //depot/projects/trustedbsd/mac/crypto/openssl/README#4 (text+ko) ==== @@ -1,5 +1,5 @@ - OpenSSL 0.9.6d 9 May 2002 + OpenSSL 0.9.6e 30 July 2002 Copyright (c) 1998-2002 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson @@ -122,6 +122,13 @@ lists the functions; you will probably have to look at the code to work out how to use them. Look at the example programs. + PROBLEMS + -------- + + For some platforms, there are some known problems that may affect the user + or application author. We try to collect those in doc/PROBLEMS, with current + thoughts on how they should be solved in a future of OpenSSL. + SUPPORT ------- @@ -146,11 +153,13 @@ - Problem Description (steps that will reproduce the problem, if known) - Stack Traceback (if the application dumps core) - Report the bug to the OpenSSL project at: + Report the bug to the OpenSSL project via the Request Tracker + (http://www.openssl.org/rt2.html) by mail to: openssl-bugs@openssl.org - Note that mail to openssl-bugs@openssl.org is forwarded to a public + Note that mail to openssl-bugs@openssl.org is recorded in the publicly + readable request tracker database and is forwarded to a public mailing list. Confidential mail may be sent to openssl-security@openssl.org (PGP key available from the key servers). @@ -164,7 +173,9 @@ textual explanation of what your patch does. Note: For legal reasons, contributions from the US can be accepted only - if a copy of the patch is sent to crypt@bxa.doc.gov + if a TSA notification and a copy of the patch is sent to crypt@bis.doc.gov; + see http://www.bis.doc.gov/Encryption/PubAvailEncSourceCodeNofify.html [sic] + and http://w3.access.gpo.gov/bis/ear/pdf/740.pdf (EAR Section 740.13(e)). The preferred format for changes is "diff -u" output. You might >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 13: 6:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E73AC37B406; Tue, 30 Jul 2002 13:06:19 -0700 (PDT) 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 8903637B400 for ; Tue, 30 Jul 2002 13:06:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C52643E42 for ; Tue, 30 Jul 2002 13:06:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UK6IJU057443 for ; Tue, 30 Jul 2002 13:06:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UK6INI057438 for perforce@freebsd.org; Tue, 30 Jul 2002 13:06:18 -0700 (PDT) Date: Tue, 30 Jul 2002 13:06:18 -0700 (PDT) Message-Id: <200207302006.g6UK6INI057438@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15218 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15218 Change 15218 by rwatson@rwatson_tislabs on 2002/07/30 13:06:17 Remove duplicated code from trustedbsd_base that came in during the integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#10 (text+ko) ==== @@ -64,6 +64,11 @@ SYSCTL_INT(_kern_ipc, KIPC_MAX_DATALEN, max_datalen, CTLFLAG_RW, &max_datalen, 0, ""); +/* + * Copy mbuf pkthdr from "from" to "to". + * "from" must have M_PKTHDR set, and "to" must be empty. + * aux pointer will be moved to "to". + */ void m_copy_pkthdr(struct mbuf *to, struct mbuf *from) { @@ -87,25 +92,6 @@ } /* - * Copy mbuf pkthdr from "from" to "to". - * "from" must have M_PKTHDR set, and "to" must be empty. - * aux pointer will be moved to "to". - */ -void -m_copy_pkthdr(struct mbuf *to, struct mbuf *from) -{ - -#if 0 - KASSERT(to->m_flags & M_PKTHDR, - ("m_copy_pkthdr() called on non-header")); -#endif - to->m_data = to->m_pktdat; - to->m_flags = from->m_flags & M_COPYFLAGS; - to->m_pkthdr = from->m_pkthdr; - from->m_pkthdr.aux = NULL; -} - -/* * Lesser-used path for M_PREPEND: * allocate new mbuf to prepend to chain, * copy junk along. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 13:37:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EE4937B401; Tue, 30 Jul 2002 13:36:58 -0700 (PDT) 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 C584037B400 for ; Tue, 30 Jul 2002 13:36:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5779843E42 for ; Tue, 30 Jul 2002 13:36:57 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UKavJU064062 for ; Tue, 30 Jul 2002 13:36:57 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UKau1L064059 for perforce@freebsd.org; Tue, 30 Jul 2002 13:36:56 -0700 (PDT) Date: Tue, 30 Jul 2002 13:36:56 -0700 (PDT) Message-Id: <200207302036.g6UKau1L064059@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 15220 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15220 Change 15220 by jhb@jhb_laptop on 2002/07/30 13:36:34 - Move all of the common functionality of dup(), dup2(), and fcntl(F_DUPFD) into do_dup(). dup() and dup2() are now just wrapper functions. fcntl() performs one fcntl-specific error test before calling do_dup() to do the rest. - Handle the possible race between threads in a KSE process or between rfork'd processes sharing filedesc tables in which one process/thread tries to dup a fd and while it is extending the file table in fdalloc() (which drops the filedesc lock while it does so) another process/thread closes that fd. If that happens we return EBADF to the first proecss/thread. That case is really a user bug due to lack of proper locking in userland. - In fdalloc(), bail out with EMFILE if the requested new descriptor is too large instead of waiting until the fd table grows too large. - In fdalloc(), go ahead and grow the table up to at least want size so we avoid calling malloc lots of times for, say, dup2(1, 1024) on a new process. - malloc() and free() don't need Giant. We don't have to drop the filedesc lock when calling free() either. - Make the bzero/bcopy slightly more readable in fdalloc(). - In falloc(), do the fdalloc() last so we don't have to hold the filelist_lock as long. Affected files ... .. //depot/projects/smpng/sys/kern/kern_descrip.c#32 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_descrip.c#32 (text+ko) ==== @@ -96,7 +96,11 @@ /* flags */ 0, }; -static int do_dup(struct filedesc *fdp, int old, int new, register_t *retval, struct thread *td); +/* How to treat 'new' parameter when allocating a fd for do_dup(). */ +enum dup_type { DUP_VARIABLE, DUP_FIXED }; + +static int do_dup(struct thread *td, enum dup_type type, int old, int new, + register_t *retval); static int badfo_readwrite(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td); static int badfo_ioctl(struct file *fp, u_long com, void *data, @@ -163,37 +167,9 @@ struct thread *td; struct dup2_args *uap; { - struct proc *p = td->td_proc; - register struct filedesc *fdp = td->td_proc->p_fd; - register u_int old = uap->from, new = uap->to; - int i, error; - FILEDESC_LOCK(fdp); -retry: - if (old >= fdp->fd_nfiles || - fdp->fd_ofiles[old] == NULL || - new >= p->p_rlimit[RLIMIT_NOFILE].rlim_cur || - new >= maxfilesperproc) { - FILEDESC_UNLOCK(fdp); - return (EBADF); - } - if (old == new) { - td->td_retval[0] = new; - FILEDESC_UNLOCK(fdp); - return (0); - } - if (new >= fdp->fd_nfiles) { - if ((error = fdalloc(td, new, &i))) { - FILEDESC_UNLOCK(fdp); - return (error); - } - /* - * fdalloc() may block, retest everything. - */ - goto retry; - } - error = do_dup(fdp, (int)old, (int)new, td->td_retval, td); - return(error); + return (do_dup(td, DUP_FIXED, (int)uap->from, (int)uap->to, + td->td_retval)); } /* @@ -213,23 +189,8 @@ struct thread *td; struct dup_args *uap; { - register struct filedesc *fdp; - u_int old; - int new, error; - old = uap->fd; - fdp = td->td_proc->p_fd; - FILEDESC_LOCK(fdp); - if (old >= fdp->fd_nfiles || fdp->fd_ofiles[old] == NULL) { - FILEDESC_UNLOCK(fdp); - return (EBADF); - } - if ((error = fdalloc(td, 0, &new))) { - FILEDESC_UNLOCK(fdp); - return (error); - } - error = do_dup(fdp, (int)old, new, td->td_retval, td); - return (error); + return (do_dup(td, DUP_VARIABLE, (int)uap->fd, 0, td->td_retval)); } /* @@ -256,7 +217,7 @@ register struct file *fp; register char *pop; struct vnode *vp; - int i, tmp, error = 0, flg = F_POSIX; + int tmp, error = 0, flg = F_POSIX; struct flock fl; u_int newmin; struct proc *leaderp; @@ -275,18 +236,15 @@ switch (uap->cmd) { case F_DUPFD: + FILEDESC_UNLOCK(fdp); newmin = uap->arg; if (newmin >= p->p_rlimit[RLIMIT_NOFILE].rlim_cur || newmin >= maxfilesperproc) { - FILEDESC_UNLOCK(fdp); error = EINVAL; break; } - if ((error = fdalloc(td, newmin, &i))) { - FILEDESC_UNLOCK(fdp); - break; - } - error = do_dup(fdp, uap->fd, i, td->td_retval, td); + error = do_dup(td, DUP_VARIABLE, uap->fd, newmin, + td->td_retval); break; case F_GETFD: @@ -478,16 +436,72 @@ * filedesc must be locked, but will be unlocked as a side effect. */ static int -do_dup(fdp, old, new, retval, td) - register struct filedesc *fdp; - register int old, new; +do_dup(td, type, old, new, retval) + enum dup_type type; + int old, new; register_t *retval; struct thread *td; { + register struct filedesc *fdp; + struct proc *p; struct file *fp; struct file *delfp; + int error, newfd; + + p = td->td_proc; + fdp = p->p_fd; + + /* + * Verify we have a valid descriptor to dup from and possibly to + * dup to. + */ + FILEDESC_LOCK(fdp); + if (old >= fdp->fd_nfiles || fdp->fd_ofiles[old] == NULL || + new >= p->p_rlimit[RLIMIT_NOFILE].rlim_cur || + new >= maxfilesperproc) { + FILEDESC_UNLOCK(fdp); + return (EBADF); + } + if (type == DUP_FIXED && old == new) { + *retval = new; + FILEDESC_UNLOCK(fdp); + return (0); + } + fp = fdp->fd_ofiles[old]; + fhold(fp); + + /* + * Expand the table for the new descriptor if needed. This may + * block and drop and reacquire the filedesc lock. + */ + if (type == DUP_VARIABLE || new >= fdp->fd_nfiles) { + error = fdalloc(td, new, &newfd); + if (error) { + FILEDESC_UNLOCK(fdp); + return (error); + } + } + if (type == DUP_VARIABLE) + new = newfd; - FILEDESC_LOCK_ASSERT(fdp, MA_OWNED); + /* + * If the old file changed out from under us then treat it as a + * bad file descriptor. Userland should do its own locking to + * avoid this case. + */ + if (fdp->fd_ofiles[old] != fp) { + if (fdp->fd_ofiles[new] == NULL) { + if (new < fdp->fd_freefile) + fdp->fd_freefile = new; + while (fdp->fd_lastfile > 0 && + fdp->fd_ofiles[fdp->fd_lastfile] == NULL) + fdp->fd_lastfile--; + } + FILEDESC_UNLOCK(fdp); + fdrop(fp, td); + return (EBADF); + } + KASSERT(old != new, ("new fd is same as old")); /* * Save info on the descriptor being overwritten. We have @@ -495,6 +509,8 @@ * introducing an ownership race for the slot. */ delfp = fdp->fd_ofiles[new]; + KASSERT(delfp == NULL || type == DUP_FIXED, + ("dup() picked an open file")); #if 0 if (delfp && (fdp->fd_ofileflags[new] & UF_MAPPED)) (void) munmapfd(td, new); @@ -503,16 +519,13 @@ /* * Duplicate the source descriptor, update lastfile */ - fp = fdp->fd_ofiles[old]; fdp->fd_ofiles[new] = fp; - fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE; - fhold(fp); + fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE; if (new > fdp->fd_lastfile) fdp->fd_lastfile = new; + FILEDESC_UNLOCK(fdp); *retval = new; - FILEDESC_UNLOCK(fdp); - /* * If we dup'd over a valid file, we now own the reference to it * and must dispose of it using closef() semantics (as if a @@ -992,8 +1005,7 @@ lim = min((int)p->p_rlimit[RLIMIT_NOFILE].rlim_cur, maxfilesperproc); for (;;) { last = min(fdp->fd_nfiles, lim); - if ((i = want) < fdp->fd_freefile) - i = fdp->fd_freefile; + i = max(want, fdp->fd_freefile); for (; i < last; i++) { if (fdp->fd_ofiles[i] == NULL) { fdp->fd_ofileflags[i] = 0; @@ -1009,29 +1021,24 @@ /* * No space in current array. Expand? */ - if (fdp->fd_nfiles >= lim) + if (i >= lim) return (EMFILE); if (fdp->fd_nfiles < NDEXTENT) nfiles = NDEXTENT; else nfiles = 2 * fdp->fd_nfiles; + while (nfiles < want) + nfiles <<= 1; FILEDESC_UNLOCK(fdp); - mtx_lock(&Giant); - MALLOC(newofile, struct file **, nfiles * OFILESIZE, - M_FILEDESC, M_WAITOK); - mtx_unlock(&Giant); - FILEDESC_LOCK(fdp); + newofile = malloc(nfiles * OFILESIZE, M_FILEDESC, M_WAITOK); /* - * deal with file-table extend race that might have occured - * when malloc was blocked. + * Deal with file-table extend race that might have + * occurred while filedesc was unlocked. */ + FILEDESC_LOCK(fdp); if (fdp->fd_nfiles >= nfiles) { - FILEDESC_UNLOCK(fdp); - mtx_lock(&Giant); - FREE(newofile, M_FILEDESC); - mtx_unlock(&Giant); - FILEDESC_LOCK(fdp); + free(newofile, M_FILEDESC); continue; } newofileflags = (char *) &newofile[nfiles]; @@ -1039,11 +1046,12 @@ * Copy the existing ofile and ofileflags arrays * and zero the new portion of each array. */ - bcopy(fdp->fd_ofiles, newofile, - (i = sizeof(struct file *) * fdp->fd_nfiles)); - bzero((char *)newofile + i, nfiles * sizeof(struct file *) - i); - bcopy(fdp->fd_ofileflags, newofileflags, - (i = sizeof(char) * fdp->fd_nfiles)); + i = fdp->fd_nfiles * sizeof(struct file *); + bcopy(fdp->fd_ofiles, newofile, i); + bzero((char *)newofile + i, + nfiles * sizeof(struct file *) - i); + i = fdp->fd_nfiles * sizeof(char); + bcopy(fdp->fd_ofileflags, newofileflags, i); bzero(newofileflags + i, nfiles * sizeof(char) - i); if (fdp->fd_nfiles > NDFILE) oldofile = fdp->fd_ofiles; @@ -1053,13 +1061,8 @@ fdp->fd_ofileflags = newofileflags; fdp->fd_nfiles = nfiles; fdexpand++; - if (oldofile != NULL) { - FILEDESC_UNLOCK(fdp); - mtx_lock(&Giant); - FREE(oldofile, M_FILEDESC); - mtx_unlock(&Giant); - FILEDESC_LOCK(fdp); - } + if (oldofile != NULL) + free(oldofile, M_FILEDESC); } return (0); } @@ -1122,28 +1125,26 @@ * descriptor to the list of open files at that point, otherwise * put it at the front of the list of open files. */ - FILEDESC_LOCK(p->p_fd); - if ((error = fdalloc(td, 0, &i))) { - FILEDESC_UNLOCK(p->p_fd); - nfiles--; - sx_xunlock(&filelist_lock); - uma_zfree(file_zone, fp); - return (error); - } fp->f_mtxp = mtx_pool_alloc(); fp->f_gcflag = 0; fp->f_count = 1; fp->f_cred = crhold(td->td_ucred); fp->f_ops = &badfileops; fp->f_seqcount = 1; + FILEDESC_LOCK(p->p_fd); if ((fq = p->p_fd->fd_ofiles[0])) { LIST_INSERT_AFTER(fq, fp, f_list); } else { LIST_INSERT_HEAD(&filehead, fp, f_list); } + sx_xunlock(&filelist_lock); + if ((error = fdalloc(td, 0, &i))) { + FILEDESC_UNLOCK(p->p_fd); + fdrop(fp, td); + return (error); + } p->p_fd->fd_ofiles[i] = fp; FILEDESC_UNLOCK(p->p_fd); - sx_xunlock(&filelist_lock); if (resultfp) *resultfp = fp; if (resultfd) @@ -1538,13 +1539,14 @@ error = falloc(td, &fp, &fd); if (error != 0) break; + KASSERT(fd == i, ("oof, we didn't get our fd")); NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, "/dev/null", td); flags = FREAD | FWRITE; error = vn_open(&nd, &flags, 0); if (error != 0) { FILEDESC_LOCK(fdp); - fdp->fd_ofiles[i] = NULL; + fdp->fd_ofiles[fd] = NULL; FILEDESC_UNLOCK(fdp); fdrop(fp, td); break; @@ -1557,13 +1559,7 @@ VOP_UNLOCK(nd.ni_vp, 0, td); devnull = fd; } else { - FILEDESC_LOCK(fdp); - error = fdalloc(td, 0, &fd); - if (error != 0) { - FILEDESC_UNLOCK(fdp); - break; - } - error = do_dup(fdp, devnull, fd, &retval, td); + error = do_dup(td, DUP_FIXED, devnull, i, &retval); if (error != 0) break; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 13:56:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE2B137B401; Tue, 30 Jul 2002 13:55:23 -0700 (PDT) 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 5841E37B400 for ; Tue, 30 Jul 2002 13:55:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DF4943E65 for ; Tue, 30 Jul 2002 13:55:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UKtMJU066054 for ; Tue, 30 Jul 2002 13:55:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UKtLAk066051 for perforce@freebsd.org; Tue, 30 Jul 2002 13:55:21 -0700 (PDT) Date: Tue, 30 Jul 2002 13:55:21 -0700 (PDT) Message-Id: <200207302055.g6UKtLAk066051@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15222 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15222 Change 15222 by rwatson@rwatson_tislabs on 2002/07/30 13:54:48 Further integ. Apparently I previously integ'd in the middle of an ACPI import, so we got a broken ACPI build since it was before the conflicts were resolved. Try again. Affected files ... .. //depot/projects/trustedbsd/base/sys/conf/files#24 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acconfig.h#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acenv.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acpiosxf.h#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acpixf.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acutils.h#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbcmds.c#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbdisasm.c#5 delete .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbfileio.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbxface.c#6 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/psparse.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/rscreate.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/tbget.c#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/utglobal.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/acpica_machdep.h#1 branch .. //depot/projects/trustedbsd/base/sys/ia64/include/acpica_machdep.h#1 branch .. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/trustedbsd/base/sys/modules/acpi/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/sed/main.c#7 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/conf/files#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.676 2002/07/30 17:44:28 joe Exp $ +# $FreeBSD: src/sys/conf/files,v 1.677 2002/07/30 19:35:20 iwasaki Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -56,7 +56,6 @@ coda/coda_vnops.c optional vcoda compat/linprocfs/linprocfs.c optional linprocfs contrib/dev/acpica/dbcmds.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbdisasm.c optional acpica acpi_debug nowerror contrib/dev/acpica/dbdisply.c optional acpica acpi_debug nowerror contrib/dev/acpica/dbexec.c optional acpica acpi_debug nowerror contrib/dev/acpica/dbfileio.c optional acpica acpi_debug nowerror @@ -65,6 +64,14 @@ contrib/dev/acpica/dbstats.c optional acpica acpi_debug nowerror contrib/dev/acpica/dbutils.c optional acpica acpi_debug nowerror contrib/dev/acpica/dbxface.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmbuffer.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmnames.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmopcode.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmresrc.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmresrcl.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmresrcs.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmutils.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmwalk.c optional acpica acpi_debug nowerror contrib/dev/acpica/dsfield.c optional acpica nowerror contrib/dev/acpica/dsmethod.c optional acpica contrib/dev/acpica/dsmthdat.c optional acpica @@ -122,8 +129,9 @@ contrib/dev/acpica/nssearch.c optional acpica contrib/dev/acpica/nsutils.c optional acpica contrib/dev/acpica/nswalk.c optional acpica +contrib/dev/acpica/nsxfeval.c optional acpica nowerror contrib/dev/acpica/nsxfname.c optional acpica nowerror -contrib/dev/acpica/nsxfobj.c optional acpica +contrib/dev/acpica/nsxfobj.c optional acpica nowerror contrib/dev/acpica/psargs.c optional acpica contrib/dev/acpica/psfind.c optional acpica contrib/dev/acpica/psopcode.c optional acpica @@ -146,7 +154,9 @@ contrib/dev/acpica/rsxface.c optional acpica contrib/dev/acpica/tbconvrt.c optional acpica contrib/dev/acpica/tbget.c optional acpica +contrib/dev/acpica/tbgetall.c optional acpica contrib/dev/acpica/tbinstal.c optional acpica +contrib/dev/acpica/tbrsdt.c optional acpica contrib/dev/acpica/tbutils.c optional acpica contrib/dev/acpica/tbxface.c optional acpica contrib/dev/acpica/tbxfroot.c optional acpica ==== //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acconfig.h#6 (text+ko) ==== @@ -145,7 +145,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20020611 +#define ACPI_CA_VERSION 0x20020725 /* Version of ACPI supported */ @@ -243,6 +243,15 @@ #define ACPI_MAX_ADDRESS_SPACE 255 +/* Array sizes. Used for range checking also */ + +#define NUM_ACCESS_TYPES 6 +#define NUM_UPDATE_RULES 3 +#define NUM_LOCK_RULES 2 +#define NUM_MATCH_OPS 6 +#define NUM_OPCODES 256 +#define NUM_FIELD_NAMES 2 + /* RSDP checksums */ #define ACPI_RSDP_CHECKSUM_LENGTH 20 ==== //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acenv.h#5 (text+ko) ==== @@ -123,11 +123,13 @@ */ #ifdef _ACPI_DUMP_APP +#ifndef MSDOS #define ACPI_DEBUG +#endif #define ACPI_APPLICATION -#define ENABLE_DEBUGGER +#define ACPI_DISASSEMBLER +#define ACPI_NO_METHOD_EXECUTION #define ACPI_USE_SYSTEM_CLIBRARY -#define PARSER_ONLY #endif #ifdef _ACPI_EXEC_APP @@ -136,13 +138,15 @@ #define ACPI_DEBUG #define ACPI_APPLICATION #define ENABLE_DEBUGGER +#define ACPI_DISASSEMBLER #define ACPI_USE_SYSTEM_CLIBRARY #endif #ifdef _ACPI_ASL_COMPILER #define ACPI_DEBUG #define ACPI_APPLICATION -/* #define ENABLE_DEBUGGER */ +#define ACPI_DISASSEMBLER +#define ACPI_CONSTANT_EVAL_ONLY #define ACPI_USE_SYSTEM_CLIBRARY #endif @@ -276,7 +280,6 @@ /* * Use the standard C library headers. * We want to keep these to a minimum. - * */ #ifdef ACPI_USE_STANDARD_HEADERS @@ -306,12 +309,16 @@ #define ACPI_STRTOUL(d,s,n) strtoul((d), (s), (ACPI_SIZE)(n)) #define ACPI_MEMCPY(d,s,n) (void) memcpy((d), (s), (ACPI_SIZE)(n)) #define ACPI_MEMSET(d,s,n) (void) memset((d), (s), (ACPI_SIZE)(n)) + #define ACPI_TOUPPER toupper #define ACPI_TOLOWER tolower #define ACPI_IS_XDIGIT isxdigit #define ACPI_IS_DIGIT isdigit #define ACPI_IS_SPACE isspace #define ACPI_IS_UPPER isupper +#define ACPI_IS_PRINT isprint +#define ACPI_IS_ALPHA isalpha +#define ACPI_IS_ASCII isascii /****************************************************************************** * ==== //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acfreebsd.h#4 (text+ko) ==== @@ -126,6 +126,7 @@ /* FreeBSD uses GCC */ #include "acgcc.h" +#include #ifdef _KERNEL #include "opt_acpi.h" @@ -136,160 +137,6 @@ #include #include -#ifdef __ia64__ -#define _IA64 - -/* - * Calling conventions: - * - * ACPI_SYSTEM_XFACE - Interfaces to host OS (handlers, threads) - * ACPI_EXTERNAL_XFACE - External ACPI interfaces - * ACPI_INTERNAL_XFACE - Internal ACPI interfaces - * ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces - */ -#define ACPI_SYSTEM_XFACE -#define ACPI_EXTERNAL_XFACE -#define ACPI_INTERNAL_XFACE -#define ACPI_INTERNAL_VAR_XFACE - -/* Asm macros */ - -#define ACPI_ASM_MACROS -#define BREAKPOINT3 -#define ACPI_DISABLE_IRQS() disable_intr() -#define ACPI_ENABLE_IRQS() enable_intr() - -#define ACPI_FLUSH_CPU_CACHE() /* XXX ia64_fc()? */ - -/*! [Begin] no source code translation */ - -#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ - do { \ - __asm__ volatile ("1: ld4 r29=%1\n" \ - ";;\n" \ - "mov ar.ccv=r29\n" \ - "mov r2=r29\n" \ - "shr.u r30=r29,1\n" \ - "and r29=-4,r29\n" \ - ";;\n" \ - "add r29=2,r29\n" \ - "and r30=1,r30\n" \ - ";;\n" \ - "add r29=r29,r30\n" \ - ";;\n" \ - "cmpxchg4.acq r30=%1,r29,ar.ccv\n" \ - ";;\n" \ - "cmp.eq p6,p7=r2,r30\n" \ - "(p7) br.dpnt.few 1b\n" \ - "cmp.gt p8,p9=3,r29\n" \ - ";;\n" \ - "(p8) mov %0=-1\n" \ - "(p9) mov %0=r0\n" \ - :"=r"(Acq):"m"(GLptr):"r2","r29","r30","memory"); \ - } while (0) - -#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \ - do { \ - __asm__ volatile ("1: ld4 r29=%1\n" \ - ";;\n" \ - "mov ar.ccv=r29\n" \ - "mov r2=r29\n" \ - "and r29=-4,r29\n" \ - ";;\n" \ - "cmpxchg4.acq r30=%1,r29,ar.ccv\n" \ - ";;\n" \ - "cmp.eq p6,p7=r2,r30\n" \ - "(p7) br.dpnt.few 1b\n" \ - "and %0=1,r2\n" \ - ";;\n" \ - :"=r"(Acq):"m"(GLptr):"r2","r29","r30","memory"); \ - } while (0) -/*! [End] no source code translation !*/ - - -#else /* DO IA32 */ - -/* - * Calling conventions: - * - * ACPI_SYSTEM_XFACE - Interfaces to host OS (handlers, threads) - * ACPI_EXTERNAL_XFACE - External ACPI interfaces - * ACPI_INTERNAL_XFACE - Internal ACPI interfaces - * ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces - */ -#define ACPI_SYSTEM_XFACE -#define ACPI_EXTERNAL_XFACE -#define ACPI_INTERNAL_XFACE -#define ACPI_INTERNAL_VAR_XFACE - -/* Asm macros */ - -#define ACPI_ASM_MACROS -#define BREAKPOINT3 -#define ACPI_DISABLE_IRQS() disable_intr() -#define ACPI_ENABLE_IRQS() enable_intr() - -#define ACPI_FLUSH_CPU_CACHE() wbinvd() - -#define asm __asm -/*! [Begin] no source code translation - * - * A brief explanation as GNU inline assembly is a bit hairy - * %0 is the output parameter in EAX ("=a") - * %1 and %2 are the input parameters in ECX ("c") - * and an immediate value ("i") respectively - * All actual register references are preceded with "%%" as in "%%edx" - * Immediate values in the assembly are preceded by "$" as in "$0x1" - * The final asm parameter are the operation altered non-output registers. - */ -#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ - do { \ - int dummy; \ - asm("1: movl (%1),%%eax;" \ - "movl %%eax,%%edx;" \ - "andl %2,%%edx;" \ - "btsl $0x1,%%edx;" \ - "adcl $0x0,%%edx;" \ - "lock; cmpxchgl %%edx,(%1);" \ - "jnz 1b;" \ - "cmpb $0x3,%%dl;" \ - "sbbl %%eax,%%eax" \ - :"=a"(Acq),"=c"(dummy):"c"(GLptr),"i"(~1L):"dx"); \ - } while(0) - -#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \ - do { \ - int dummy; \ - asm("1: movl (%1),%%eax;" \ - "movl %%eax,%%edx;" \ - "andl %2,%%edx;" \ - "lock; cmpxchgl %%edx,(%1);" \ - "jnz 1b;" \ - "andl $0x1,%%eax" \ - :"=a"(Acq),"=c"(dummy):"c"(GLptr),"i"(~3L):"dx"); \ - } while(0) - - -/* - * Math helper asm macros - */ -#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ - asm("divl %2;" \ - :"=a"(q32), "=d"(r32) \ - :"r"(d32), \ - "0"(n_lo), "1"(n_hi)) - - -#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \ - asm("shrl $1,%2;" \ - "rcrl $1,%3;" \ - :"=r"(n_hi), "=r"(n_lo) \ - :"0"(n_hi), "1"(n_lo)) - -/*! [End] no source code translation !*/ - -#endif /* IA 32 */ - #ifdef DEBUGGER_THREADING #undef DEBUGGER_THREADING #endif /* DEBUGGER_THREADING */ @@ -349,15 +196,4 @@ } #endif /* _KERNEL */ -#if defined(__ia64__) || defined(__x86_64__) -#define ACPI_MACHINE_WIDTH 64 -#define COMPILER_DEPENDENT_INT64 long -#define COMPILER_DEPENDENT_UINT64 unsigned long -#else -#define ACPI_MACHINE_WIDTH 32 -#define COMPILER_DEPENDENT_INT64 long long -#define COMPILER_DEPENDENT_UINT64 unsigned long long -#define ACPI_USE_NATIVE_DIVIDE -#endif - #endif /* __ACFREEBSD_H__ */ ==== //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acpiosxf.h#6 (text+ko) ==== @@ -296,7 +296,6 @@ void *Value, UINT32 Width); - ACPI_STATUS AcpiOsWritePort ( ACPI_IO_ADDRESS Address, @@ -314,7 +313,6 @@ void *Value, UINT32 Width); - ACPI_STATUS AcpiOsWriteMemory ( ACPI_PHYSICAL_ADDRESS Address, @@ -333,7 +331,6 @@ void *Value, UINT32 Width); - ACPI_STATUS AcpiOsWritePciConfiguration ( ACPI_PCI_ID *PciId, @@ -351,7 +348,6 @@ void *Pointer, UINT32 Length); - BOOLEAN AcpiOsWritable ( void *Pointer, @@ -380,6 +376,10 @@ const NATIVE_CHAR *Format, va_list Args); +void +AcpiOsRedirectOutput ( + void *Destination); + /* * Debug input ==== //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acpixf.h#5 (text+ko) ==== @@ -135,6 +135,10 @@ UINT32 Flags); ACPI_STATUS +AcpiInitializeObjects ( + UINT32 Flags); + +ACPI_STATUS AcpiTerminate ( void); ==== //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acutils.h#6 (text+ko) ==== @@ -193,7 +193,6 @@ #endif - NATIVE_CHAR * AcpiUtGetTypeName ( ACPI_OBJECT_TYPE Type); @@ -316,6 +315,9 @@ #define ACPI_IS_XDIGIT(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_XD)) #define ACPI_IS_UPPER(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_UP)) #define ACPI_IS_LOWER(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO)) +#define ACPI_IS_PRINT(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP | _ACPI_DI | _ACPI_SP | _ACPI_PU)) +#define ACPI_IS_ALPHA(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP)) +#define ACPI_IS_ASCII(c) ((c) < 0x80) #endif /* ACPI_USE_SYSTEM_CLIBRARY */ ==== //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbcmds.c#6 (text+ko) ==== @@ -449,7 +449,9 @@ NumStatements = ACPI_STRTOUL (Statements, NULL, 0); } +#ifdef ACPI_DISASSEMBLER AcpiDmDisassemble (NULL, Op, NumStatements); +#endif } ==== //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbfileio.c#5 (text+ko) ==== @@ -121,7 +121,7 @@ #include "acnamesp.h" #include "actables.h" -#ifdef ENABLE_DEBUGGER +#if (defined ENABLE_DEBUGGER || defined ACPI_DISASSEMBLER) #define _COMPONENT ACPI_DEBUGGER ACPI_MODULE_NAME ("dbfileio") @@ -177,6 +177,7 @@ } +#ifdef ENABLE_DEBUGGER /******************************************************************************* * * FUNCTION: AcpiDbCloseDebugFile @@ -242,6 +243,7 @@ #endif } +#endif #ifdef ACPI_APPLICATION @@ -285,7 +287,7 @@ Status = AcpiTbValidateTableHeader (&TableHeader); if ((ACPI_FAILURE (Status)) || - (TableHeader.Length > 524288)) /* 1/2 Mbyte should be enough */ + (TableHeader.Length > 0x800000)) /* 8 Mbyte should be enough */ { AcpiOsPrintf ("Table header is invalid!\n"); return (AE_ERROR); @@ -380,10 +382,15 @@ return_ACPI_STATUS (AE_BAD_PARAMETER); } + TableInfo.Pointer = TablePtr; + Status = AcpiTbRecognizeTable (&TableInfo, ACPI_TABLE_SECONDARY); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } + /* Install the new table into the local data structures */ - TableInfo.Pointer = TablePtr; - Status = AcpiTbInstallTable (&TableInfo); if (ACPI_FAILURE (Status)) { @@ -394,7 +401,7 @@ } -#ifndef PARSER_ONLY +#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY)) Status = AcpiNsLoadTable (TableInfo.InstalledDesc, AcpiGbl_RootNode); if (ACPI_FAILURE (Status)) { @@ -430,7 +437,7 @@ /* Get the entire file */ - AcpiOsPrintf ("Loading Acpi table from file %s\n", Filename); + fprintf (stderr, "Loading Acpi table from file %s\n", Filename); Status = AcpiDbLoadTable (fp, &AcpiGbl_DbTablePtr, &TableLength); fclose(fp); @@ -489,8 +496,8 @@ return (Status); } - AcpiOsPrintf ("%4.4s at %p successfully installed and loaded\n", - AcpiGbl_DbTablePtr->Signature, AcpiGbl_DbTablePtr); + fprintf (stderr, "Acpi table [%4.4s] successfully installed and loaded\n", + AcpiGbl_DbTablePtr->Signature); AcpiGbl_AcpiHardwarePresent = FALSE; ==== //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/dbxface.c#6 (text+ko) ==== @@ -269,7 +269,9 @@ /* Now we can display it */ +#ifdef ACPI_DISASSEMBLER AcpiDmDisassemble (WalkState, DisplayOp, ACPI_UINT32_MAX); +#endif if ((Op->Common.AmlOpcode == AML_IF_OP) || (Op->Common.AmlOpcode == AML_WHILE_OP)) @@ -425,9 +427,11 @@ AcpiGbl_DbOutputFlags = ACPI_DB_CONSOLE_OUTPUT; AcpiGbl_DbOpt_tables = FALSE; + AcpiGbl_DbOpt_stats = FALSE; +#ifdef ACPI_DISASSEMBLER AcpiGbl_DbOpt_disasm = FALSE; - AcpiGbl_DbOpt_stats = FALSE; AcpiGbl_DbOpt_verbose = TRUE; +#endif AcpiGbl_DbOpt_ini_methods = TRUE; AcpiGbl_DbBuffer = AcpiOsAllocate (ACPI_DEBUG_BUFFER_SIZE); @@ -475,11 +479,13 @@ } } +#ifdef ACPI_DISASSEMBLER if (!AcpiGbl_DbOpt_verbose) { AcpiGbl_DbOpt_disasm = TRUE; AcpiGbl_DbOpt_stats = FALSE; } +#endif return (AE_OK); } ==== //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/psparse.c#5 (text+ko) ==== @@ -590,7 +590,7 @@ ParserState = &WalkState->ParserState; WalkState->ArgTypes = 0; -#ifndef PARSER_ONLY +#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY)) if (WalkState->WalkType & ACPI_WALK_METHOD_RESTART) { /* We are restarting a preempted control method */ @@ -708,6 +708,10 @@ PreOp.Common.Value.Arg = NULL; PreOp.Common.AmlOpcode = WalkState->Opcode; + /* + * Get and append arguments until we find the node that contains + * the name (the type ARGP_NAME). + */ while (GET_CURRENT_ARG_TYPE (WalkState->ArgTypes) != ARGP_NAME) { Arg = AcpiPsGetNextArg (ParserState, @@ -1297,7 +1301,6 @@ /* We are done with this walk, move on to the parent if any */ WalkState = AcpiDsPopWalkState (Thread); - /* Save the last effective return value */ if (CallerReturnDesc && WalkState->ReturnDesc) ==== //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/rscreate.c#5 (text+ko) ==== @@ -132,7 +132,6 @@ * * PARAMETERS: ByteStreamBuffer - Pointer to the resource byte stream * OutputBuffer - Pointer to the user's buffer - * OutputBufferLength - Pointer to the size of OutputBuffer * * RETURN: Status - AE_OK if okay, else a valid ACPI_STATUS code * If OutputBuffer is not large enough, OutputBufferLength @@ -212,7 +211,6 @@ * PARAMETERS: PackageObject - Pointer to an ACPI_OPERAND_OBJECT * package * OutputBuffer - Pointer to the user's buffer - * OutputBufferLength - Size of OutputBuffer * * RETURN: Status AE_OK if okay, else a valid ACPI_STATUS code. * If the OutputBuffer is too small, the error will be @@ -349,7 +347,7 @@ if ((*SubObjectList)->Reference.Opcode != AML_INT_NAMEPATH_OP) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Need name, found reference op %X\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Need name, found reference op %X\n", (*SubObjectList)->Reference.Opcode)); return_ACPI_STATUS (AE_BAD_DATA); } ==== //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/tbget.c#5 (text+ko) ==== @@ -126,233 +126,158 @@ /******************************************************************************* * - * FUNCTION: AcpiTbTableOverride + * FUNCTION: AcpiTbGetTable * - * PARAMETERS: *TableInfo - Info for current table + * PARAMETERS: Address - Address of table to retrieve. Can be + * Logical or Physical + * TableInfo - Where table info is returned * * RETURN: None * - * DESCRIPTION: Attempts override of current table with a new one if provided - * by the host OS. + * DESCRIPTION: Get entire table of unknown size. * ******************************************************************************/ -void -AcpiTbTableOverride ( +ACPI_STATUS +AcpiTbGetTable ( + ACPI_POINTER *Address, ACPI_TABLE_DESC *TableInfo) { - ACPI_TABLE_HEADER *NewTable; ACPI_STATUS Status; - ACPI_POINTER Address; - ACPI_TABLE_DESC NewTableInfo; + ACPI_TABLE_HEADER Header; - ACPI_FUNCTION_TRACE ("AcpiTbTableOverride"); + ACPI_FUNCTION_TRACE ("TbGetTable"); - Status = AcpiOsTableOverride (TableInfo->Pointer, &NewTable); + /* + * Get the header in order to get signature and table size + */ + Status = AcpiTbGetTableHeader (Address, &Header); if (ACPI_FAILURE (Status)) { - /* Some severe error from the OSL, but we basically ignore it */ - - ACPI_REPORT_ERROR (("Could not override ACPI table, %s\n", - AcpiFormatException (Status))); - return_VOID; + return_ACPI_STATUS (Status); } - if (!NewTable) - { - /* No table override */ + /* Get the entire table */ - return_VOID; - } - - /* - * We have a new table to override the old one. Get a copy of - * the new one. We know that the new table has a logical pointer. - */ - Address.PointerType = ACPI_LOGICAL_POINTER; - Address.Pointer.Logical = NewTable; - - Status = AcpiTbGetTable (&Address, &NewTableInfo); + Status = AcpiTbGetTableBody (Address, &Header, TableInfo); if (ACPI_FAILURE (Status)) { - ACPI_REPORT_ERROR (("Could not copy ACPI table override\n")); - return_VOID; + ACPI_REPORT_ERROR (("Could not get ACPI table (size %X), %s\n", + Header.Length, AcpiFormatException (Status))); + return_ACPI_STATUS (Status); } - /* - * Delete the original table - */ - AcpiTbDeleteSingleTable (TableInfo); - - /* Copy the table info */ - - ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Successful table override [%4.4s]\n", - ((ACPI_TABLE_HEADER *) NewTableInfo.Pointer)->Signature)); - - ACPI_MEMCPY (TableInfo, &NewTableInfo, sizeof (ACPI_TABLE_DESC)); - return_VOID; + return_ACPI_STATUS (AE_OK); } /******************************************************************************* * - * FUNCTION: AcpiTbGetTableWithOverride + * FUNCTION: AcpiTbGetTableHeader * - * PARAMETERS: Address - Physical or logical address of table - * *TableInfo - Where the table info is returned + * PARAMETERS: Address - Address of table to retrieve. Can be + * Logical or Physical + * ReturnHeader - Where the table header is returned * * RETURN: Status * - * DESCRIPTION: Gets and installs the table with possible table override by OS. + * DESCRIPTION: Get an ACPI table header. Works in both physical or virtual + * addressing mode. Works with both physical or logical pointers. + * Table is either copied or mapped, depending on the pointer + * type and mode of the processor. * ******************************************************************************/ ACPI_STATUS -AcpiTbGetTableWithOverride ( +AcpiTbGetTableHeader ( ACPI_POINTER *Address, - ACPI_TABLE_DESC *TableInfo) + ACPI_TABLE_HEADER *ReturnHeader) { - ACPI_STATUS Status; + ACPI_STATUS Status = AE_OK; + ACPI_TABLE_HEADER *Header = NULL; - ACPI_FUNCTION_TRACE ("AcpiTbGetTableWithOverride"); - + ACPI_FUNCTION_TRACE ("TbGetTableHeader"); - Status = AcpiTbGetTable (Address, TableInfo); - if (ACPI_FAILURE (Status)) - { - ACPI_REPORT_ERROR (("Could not get ACPI table, %s\n", - AcpiFormatException (Status))); - return_ACPI_STATUS (Status); - } /* - * Attempt override. It either happens or it doesn't, no status + * Flags contains the current processor mode (Virtual or Physical addressing) + * The PointerType is either Logical or Physical */ - AcpiTbTableOverride (TableInfo); + switch (Address->PointerType) + { + case ACPI_PHYSMODE_PHYSPTR: + case ACPI_LOGMODE_LOGPTR: - /* Install the table */ + /* Pointer matches processor mode, copy the header */ - Status = AcpiTbInstallTable (TableInfo); - if (ACPI_FAILURE (Status)) - { - ACPI_REPORT_ERROR (("Could not install ACPI table, %s\n", - AcpiFormatException (Status))); - } + ACPI_MEMCPY (ReturnHeader, Address->Pointer.Logical, sizeof (ACPI_TABLE_HEADER)); + break; - return_ACPI_STATUS (Status); -} + case ACPI_LOGMODE_PHYSPTR: -/******************************************************************************* - * - * FUNCTION: AcpiTbGetTablePtr - * - * PARAMETERS: TableType - one of the defined table types - * Instance - Which table of this type - * TablePtrLoc - pointer to location to place the pointer for - * return - * - * RETURN: Status - * - * DESCRIPTION: This function is called to get the pointer to an ACPI table. - * - ******************************************************************************/ + /* Create a logical address for the physical pointer*/ -ACPI_STATUS -AcpiTbGetTablePtr ( - ACPI_TABLE_TYPE TableType, - UINT32 Instance, - ACPI_TABLE_HEADER **TablePtrLoc) -{ - ACPI_TABLE_DESC *TableDesc; - UINT32 i; + Status = AcpiOsMapMemory (Address->Pointer.Physical, sizeof (ACPI_TABLE_HEADER), + (void **) &Header); + if (ACPI_FAILURE (Status)) + { + ACPI_REPORT_ERROR (("Could not map memory at %p for length %X\n", + Address->Pointer.Physical, sizeof (ACPI_TABLE_HEADER))); + return_ACPI_STATUS (Status); + } + /* Copy header and delete mapping */ - ACPI_FUNCTION_TRACE ("TbGetTablePtr"); + ACPI_MEMCPY (ReturnHeader, Header, sizeof (ACPI_TABLE_HEADER)); + AcpiOsUnmapMemory (Header, sizeof (ACPI_TABLE_HEADER)); + break; - if (!AcpiGbl_DSDT) - { - return_ACPI_STATUS (AE_NO_ACPI_TABLES); - } + default: - if (TableType > ACPI_TABLE_MAX) - { + ACPI_REPORT_ERROR (("Invalid address flags %X\n", + Address->PointerType)); return_ACPI_STATUS (AE_BAD_PARAMETER); } - /* - * For all table types (Single/Multiple), the first - * instance is always in the list head. - */ - if (Instance == 1) - { - /* - * Just pluck the pointer out of the global table! - * Will be null if no table is present - */ - *TablePtrLoc = AcpiGbl_AcpiTables[TableType].Pointer; - return_ACPI_STATUS (AE_OK); - } - - /* - * Check for instance out of range - */ - if (Instance > AcpiGbl_AcpiTables[TableType].Count) - { - return_ACPI_STATUS (AE_NOT_EXIST); - } - - /* Walk the list to get the desired table - * Since the if (Instance == 1) check above checked for the - * first table, setting TableDesc equal to the .Next member - * is actually pointing to the second table. Therefore, we - * need to walk from the 2nd table until we reach the Instance - * that the user is looking for and return its table pointer. - */ - TableDesc = AcpiGbl_AcpiTables[TableType].Next; - for (i = 2; i < Instance; i++) - { - TableDesc = TableDesc->Next; - } - - /* We are now pointing to the requested table's descriptor */ - - *TablePtrLoc = TableDesc->Pointer; - return_ACPI_STATUS (AE_OK); } /******************************************************************************* * - * FUNCTION: AcpiTbGetTable + * FUNCTION: AcpiTbGetTableBody * - * PARAMETERS: Address - Physical address of table to retrieve - * *TableInfo - Where the table info is returned + * PARAMETERS: Address - Address of table to retrieve. Can be + * Logical or Physical + * Header - Header of the table to retrieve + * TableInfo - Where the table info is returned * * RETURN: Status * - * DESCRIPTION: Maps the physical address of table into a logical address + * DESCRIPTION: Get an entire ACPI table with support to allow the host OS to + * replace the table with a newer version (table override.) + * Works in both physical or virtual + * addressing mode. Works with both physical or logical pointers. + * Table is either copied or mapped, depending on the pointer + * type and mode of the processor. * ******************************************************************************/ ACPI_STATUS -AcpiTbGetTable ( +AcpiTbGetTableBody ( ACPI_POINTER *Address, + ACPI_TABLE_HEADER *Header, ACPI_TABLE_DESC *TableInfo) { - ACPI_TABLE_HEADER *TableHeader = NULL; - ACPI_TABLE_HEADER *FullTable = NULL; - ACPI_SIZE Size; - UINT8 Allocation; - ACPI_STATUS Status = AE_OK; + ACPI_STATUS Status; - ACPI_FUNCTION_TRACE ("TbGetTable"); + ACPI_FUNCTION_TRACE ("TbGetTableBody"); if (!TableInfo || !Address) @@ -360,587 +285,298 @@ return_ACPI_STATUS (AE_BAD_PARAMETER); } - switch (Address->PointerType) + /* + * Attempt table override. + */ + Status = AcpiTbTableOverride (Header, TableInfo); + if (ACPI_SUCCESS (Status)) { - case ACPI_LOGICAL_POINTER: + /* Table was overridden by the host OS */ - /* - * Getting data from a buffer, not BIOS tables - */ - TableHeader = Address->Pointer.Logical; - - /* Allocate buffer for the entire table */ - - FullTable = ACPI_MEM_ALLOCATE (TableHeader->Length); - if (!FullTable) - { - return_ACPI_STATUS (AE_NO_MEMORY); - } - - /* Copy the entire table (including header) to the local buffer */ - - Size = (ACPI_SIZE) TableHeader->Length; - ACPI_MEMCPY (FullTable, TableHeader, Size); - - /* Save allocation type */ - - Allocation = ACPI_MEM_ALLOCATED; - break; - - - case ACPI_PHYSICAL_POINTER: - - /* - * Not reading from a buffer, just map the table's physical memory - * into our address space. - */ - Size = SIZE_IN_HEADER; - - Status = AcpiTbMapAcpiTable (Address->Pointer.Physical, &Size, &FullTable); - if (ACPI_FAILURE (Status)) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 13:57:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0F7D37B405; Tue, 30 Jul 2002 13:56:25 -0700 (PDT) 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 52A5D37B400 for ; Tue, 30 Jul 2002 13:56:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DFE143E3B for ; Tue, 30 Jul 2002 13:56:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UKuOJU066337 for ; Tue, 30 Jul 2002 13:56:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UKuNfu066333 for perforce@freebsd.org; Tue, 30 Jul 2002 13:56:23 -0700 (PDT) Date: Tue, 30 Jul 2002 13:56:23 -0700 (PDT) Message-Id: <200207302056.g6UKuNfu066333@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15223 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15223 Change 15223 by rwatson@rwatson_tislabs on 2002/07/30 13:56:21 Follow-up integ from trustedbsd_base: pick up acpi build fixes from the main tree. Affected files ... .. //depot/projects/trustedbsd/mac/sys/conf/files#39 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acconfig.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acenv.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acpiosxf.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acpixf.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acutils.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dbcmds.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dbdisasm.c#5 delete .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dbfileio.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dbxface.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/psparse.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/rscreate.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/tbget.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/utglobal.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/acpica_machdep.h#1 branch .. //depot/projects/trustedbsd/mac/sys/ia64/include/acpica_machdep.h#1 branch .. //depot/projects/trustedbsd/mac/sys/kern/kern_condvar.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/modules/acpi/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/sed/main.c#7 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/files#39 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.676 2002/07/30 17:44:28 joe Exp $ +# $FreeBSD: src/sys/conf/files,v 1.677 2002/07/30 19:35:20 iwasaki Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -56,7 +56,6 @@ coda/coda_vnops.c optional vcoda compat/linprocfs/linprocfs.c optional linprocfs contrib/dev/acpica/dbcmds.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbdisasm.c optional acpica acpi_debug nowerror contrib/dev/acpica/dbdisply.c optional acpica acpi_debug nowerror contrib/dev/acpica/dbexec.c optional acpica acpi_debug nowerror contrib/dev/acpica/dbfileio.c optional acpica acpi_debug nowerror @@ -65,6 +64,14 @@ contrib/dev/acpica/dbstats.c optional acpica acpi_debug nowerror contrib/dev/acpica/dbutils.c optional acpica acpi_debug nowerror contrib/dev/acpica/dbxface.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmbuffer.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmnames.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmopcode.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmresrc.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmresrcl.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmresrcs.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmutils.c optional acpica acpi_debug nowerror +contrib/dev/acpica/dmwalk.c optional acpica acpi_debug nowerror contrib/dev/acpica/dsfield.c optional acpica nowerror contrib/dev/acpica/dsmethod.c optional acpica contrib/dev/acpica/dsmthdat.c optional acpica @@ -122,8 +129,9 @@ contrib/dev/acpica/nssearch.c optional acpica contrib/dev/acpica/nsutils.c optional acpica contrib/dev/acpica/nswalk.c optional acpica +contrib/dev/acpica/nsxfeval.c optional acpica nowerror contrib/dev/acpica/nsxfname.c optional acpica nowerror -contrib/dev/acpica/nsxfobj.c optional acpica +contrib/dev/acpica/nsxfobj.c optional acpica nowerror contrib/dev/acpica/psargs.c optional acpica contrib/dev/acpica/psfind.c optional acpica contrib/dev/acpica/psopcode.c optional acpica @@ -146,7 +154,9 @@ contrib/dev/acpica/rsxface.c optional acpica contrib/dev/acpica/tbconvrt.c optional acpica contrib/dev/acpica/tbget.c optional acpica +contrib/dev/acpica/tbgetall.c optional acpica contrib/dev/acpica/tbinstal.c optional acpica +contrib/dev/acpica/tbrsdt.c optional acpica contrib/dev/acpica/tbutils.c optional acpica contrib/dev/acpica/tbxface.c optional acpica contrib/dev/acpica/tbxfroot.c optional acpica ==== //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acconfig.h#6 (text+ko) ==== @@ -145,7 +145,7 @@ /* Version string */ -#define ACPI_CA_VERSION 0x20020611 +#define ACPI_CA_VERSION 0x20020725 /* Version of ACPI supported */ @@ -243,6 +243,15 @@ #define ACPI_MAX_ADDRESS_SPACE 255 +/* Array sizes. Used for range checking also */ + +#define NUM_ACCESS_TYPES 6 +#define NUM_UPDATE_RULES 3 +#define NUM_LOCK_RULES 2 +#define NUM_MATCH_OPS 6 +#define NUM_OPCODES 256 +#define NUM_FIELD_NAMES 2 + /* RSDP checksums */ #define ACPI_RSDP_CHECKSUM_LENGTH 20 ==== //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acenv.h#5 (text+ko) ==== @@ -123,11 +123,13 @@ */ #ifdef _ACPI_DUMP_APP +#ifndef MSDOS #define ACPI_DEBUG +#endif #define ACPI_APPLICATION -#define ENABLE_DEBUGGER +#define ACPI_DISASSEMBLER +#define ACPI_NO_METHOD_EXECUTION #define ACPI_USE_SYSTEM_CLIBRARY -#define PARSER_ONLY #endif #ifdef _ACPI_EXEC_APP @@ -136,13 +138,15 @@ #define ACPI_DEBUG #define ACPI_APPLICATION #define ENABLE_DEBUGGER +#define ACPI_DISASSEMBLER #define ACPI_USE_SYSTEM_CLIBRARY #endif #ifdef _ACPI_ASL_COMPILER #define ACPI_DEBUG #define ACPI_APPLICATION -/* #define ENABLE_DEBUGGER */ +#define ACPI_DISASSEMBLER +#define ACPI_CONSTANT_EVAL_ONLY #define ACPI_USE_SYSTEM_CLIBRARY #endif @@ -276,7 +280,6 @@ /* * Use the standard C library headers. * We want to keep these to a minimum. - * */ #ifdef ACPI_USE_STANDARD_HEADERS @@ -306,12 +309,16 @@ #define ACPI_STRTOUL(d,s,n) strtoul((d), (s), (ACPI_SIZE)(n)) #define ACPI_MEMCPY(d,s,n) (void) memcpy((d), (s), (ACPI_SIZE)(n)) #define ACPI_MEMSET(d,s,n) (void) memset((d), (s), (ACPI_SIZE)(n)) + #define ACPI_TOUPPER toupper #define ACPI_TOLOWER tolower #define ACPI_IS_XDIGIT isxdigit #define ACPI_IS_DIGIT isdigit #define ACPI_IS_SPACE isspace #define ACPI_IS_UPPER isupper +#define ACPI_IS_PRINT isprint +#define ACPI_IS_ALPHA isalpha +#define ACPI_IS_ASCII isascii /****************************************************************************** * ==== //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acfreebsd.h#4 (text+ko) ==== @@ -126,6 +126,7 @@ /* FreeBSD uses GCC */ #include "acgcc.h" +#include #ifdef _KERNEL #include "opt_acpi.h" @@ -136,160 +137,6 @@ #include #include -#ifdef __ia64__ -#define _IA64 - -/* - * Calling conventions: - * - * ACPI_SYSTEM_XFACE - Interfaces to host OS (handlers, threads) - * ACPI_EXTERNAL_XFACE - External ACPI interfaces - * ACPI_INTERNAL_XFACE - Internal ACPI interfaces - * ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces - */ -#define ACPI_SYSTEM_XFACE -#define ACPI_EXTERNAL_XFACE -#define ACPI_INTERNAL_XFACE -#define ACPI_INTERNAL_VAR_XFACE - -/* Asm macros */ - -#define ACPI_ASM_MACROS -#define BREAKPOINT3 -#define ACPI_DISABLE_IRQS() disable_intr() -#define ACPI_ENABLE_IRQS() enable_intr() - -#define ACPI_FLUSH_CPU_CACHE() /* XXX ia64_fc()? */ - -/*! [Begin] no source code translation */ - -#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ - do { \ - __asm__ volatile ("1: ld4 r29=%1\n" \ - ";;\n" \ - "mov ar.ccv=r29\n" \ - "mov r2=r29\n" \ - "shr.u r30=r29,1\n" \ - "and r29=-4,r29\n" \ - ";;\n" \ - "add r29=2,r29\n" \ - "and r30=1,r30\n" \ - ";;\n" \ - "add r29=r29,r30\n" \ - ";;\n" \ - "cmpxchg4.acq r30=%1,r29,ar.ccv\n" \ - ";;\n" \ - "cmp.eq p6,p7=r2,r30\n" \ - "(p7) br.dpnt.few 1b\n" \ - "cmp.gt p8,p9=3,r29\n" \ - ";;\n" \ - "(p8) mov %0=-1\n" \ - "(p9) mov %0=r0\n" \ - :"=r"(Acq):"m"(GLptr):"r2","r29","r30","memory"); \ - } while (0) - -#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \ - do { \ - __asm__ volatile ("1: ld4 r29=%1\n" \ - ";;\n" \ - "mov ar.ccv=r29\n" \ - "mov r2=r29\n" \ - "and r29=-4,r29\n" \ - ";;\n" \ - "cmpxchg4.acq r30=%1,r29,ar.ccv\n" \ - ";;\n" \ - "cmp.eq p6,p7=r2,r30\n" \ - "(p7) br.dpnt.few 1b\n" \ - "and %0=1,r2\n" \ - ";;\n" \ - :"=r"(Acq):"m"(GLptr):"r2","r29","r30","memory"); \ - } while (0) -/*! [End] no source code translation !*/ - - -#else /* DO IA32 */ - -/* - * Calling conventions: - * - * ACPI_SYSTEM_XFACE - Interfaces to host OS (handlers, threads) - * ACPI_EXTERNAL_XFACE - External ACPI interfaces - * ACPI_INTERNAL_XFACE - Internal ACPI interfaces - * ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces - */ -#define ACPI_SYSTEM_XFACE -#define ACPI_EXTERNAL_XFACE -#define ACPI_INTERNAL_XFACE -#define ACPI_INTERNAL_VAR_XFACE - -/* Asm macros */ - -#define ACPI_ASM_MACROS -#define BREAKPOINT3 -#define ACPI_DISABLE_IRQS() disable_intr() -#define ACPI_ENABLE_IRQS() enable_intr() - -#define ACPI_FLUSH_CPU_CACHE() wbinvd() - -#define asm __asm -/*! [Begin] no source code translation - * - * A brief explanation as GNU inline assembly is a bit hairy - * %0 is the output parameter in EAX ("=a") - * %1 and %2 are the input parameters in ECX ("c") - * and an immediate value ("i") respectively - * All actual register references are preceded with "%%" as in "%%edx" - * Immediate values in the assembly are preceded by "$" as in "$0x1" - * The final asm parameter are the operation altered non-output registers. - */ -#define ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq) \ - do { \ - int dummy; \ - asm("1: movl (%1),%%eax;" \ - "movl %%eax,%%edx;" \ - "andl %2,%%edx;" \ - "btsl $0x1,%%edx;" \ - "adcl $0x0,%%edx;" \ - "lock; cmpxchgl %%edx,(%1);" \ - "jnz 1b;" \ - "cmpb $0x3,%%dl;" \ - "sbbl %%eax,%%eax" \ - :"=a"(Acq),"=c"(dummy):"c"(GLptr),"i"(~1L):"dx"); \ - } while(0) - -#define ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq) \ - do { \ - int dummy; \ - asm("1: movl (%1),%%eax;" \ - "movl %%eax,%%edx;" \ - "andl %2,%%edx;" \ - "lock; cmpxchgl %%edx,(%1);" \ - "jnz 1b;" \ - "andl $0x1,%%eax" \ - :"=a"(Acq),"=c"(dummy):"c"(GLptr),"i"(~3L):"dx"); \ - } while(0) - - -/* - * Math helper asm macros - */ -#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \ - asm("divl %2;" \ - :"=a"(q32), "=d"(r32) \ - :"r"(d32), \ - "0"(n_lo), "1"(n_hi)) - - -#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \ - asm("shrl $1,%2;" \ - "rcrl $1,%3;" \ - :"=r"(n_hi), "=r"(n_lo) \ - :"0"(n_hi), "1"(n_lo)) - -/*! [End] no source code translation !*/ - -#endif /* IA 32 */ - #ifdef DEBUGGER_THREADING #undef DEBUGGER_THREADING #endif /* DEBUGGER_THREADING */ @@ -349,15 +196,4 @@ } #endif /* _KERNEL */ -#if defined(__ia64__) || defined(__x86_64__) -#define ACPI_MACHINE_WIDTH 64 -#define COMPILER_DEPENDENT_INT64 long -#define COMPILER_DEPENDENT_UINT64 unsigned long -#else -#define ACPI_MACHINE_WIDTH 32 -#define COMPILER_DEPENDENT_INT64 long long -#define COMPILER_DEPENDENT_UINT64 unsigned long long -#define ACPI_USE_NATIVE_DIVIDE -#endif - #endif /* __ACFREEBSD_H__ */ ==== //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acpiosxf.h#6 (text+ko) ==== @@ -296,7 +296,6 @@ void *Value, UINT32 Width); - ACPI_STATUS AcpiOsWritePort ( ACPI_IO_ADDRESS Address, @@ -314,7 +313,6 @@ void *Value, UINT32 Width); - ACPI_STATUS AcpiOsWriteMemory ( ACPI_PHYSICAL_ADDRESS Address, @@ -333,7 +331,6 @@ void *Value, UINT32 Width); - ACPI_STATUS AcpiOsWritePciConfiguration ( ACPI_PCI_ID *PciId, @@ -351,7 +348,6 @@ void *Pointer, UINT32 Length); - BOOLEAN AcpiOsWritable ( void *Pointer, @@ -380,6 +376,10 @@ const NATIVE_CHAR *Format, va_list Args); +void +AcpiOsRedirectOutput ( + void *Destination); + /* * Debug input ==== //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acpixf.h#5 (text+ko) ==== @@ -135,6 +135,10 @@ UINT32 Flags); ACPI_STATUS +AcpiInitializeObjects ( + UINT32 Flags); + +ACPI_STATUS AcpiTerminate ( void); ==== //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/acutils.h#6 (text+ko) ==== @@ -193,7 +193,6 @@ #endif - NATIVE_CHAR * AcpiUtGetTypeName ( ACPI_OBJECT_TYPE Type); @@ -316,6 +315,9 @@ #define ACPI_IS_XDIGIT(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_XD)) #define ACPI_IS_UPPER(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_UP)) #define ACPI_IS_LOWER(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO)) +#define ACPI_IS_PRINT(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP | _ACPI_DI | _ACPI_SP | _ACPI_PU)) +#define ACPI_IS_ALPHA(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO | _ACPI_UP)) +#define ACPI_IS_ASCII(c) ((c) < 0x80) #endif /* ACPI_USE_SYSTEM_CLIBRARY */ ==== //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dbcmds.c#6 (text+ko) ==== @@ -449,7 +449,9 @@ NumStatements = ACPI_STRTOUL (Statements, NULL, 0); } +#ifdef ACPI_DISASSEMBLER AcpiDmDisassemble (NULL, Op, NumStatements); +#endif } ==== //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dbfileio.c#5 (text+ko) ==== @@ -121,7 +121,7 @@ #include "acnamesp.h" #include "actables.h" -#ifdef ENABLE_DEBUGGER +#if (defined ENABLE_DEBUGGER || defined ACPI_DISASSEMBLER) #define _COMPONENT ACPI_DEBUGGER ACPI_MODULE_NAME ("dbfileio") @@ -177,6 +177,7 @@ } +#ifdef ENABLE_DEBUGGER /******************************************************************************* * * FUNCTION: AcpiDbCloseDebugFile @@ -242,6 +243,7 @@ #endif } +#endif #ifdef ACPI_APPLICATION @@ -285,7 +287,7 @@ Status = AcpiTbValidateTableHeader (&TableHeader); if ((ACPI_FAILURE (Status)) || - (TableHeader.Length > 524288)) /* 1/2 Mbyte should be enough */ + (TableHeader.Length > 0x800000)) /* 8 Mbyte should be enough */ { AcpiOsPrintf ("Table header is invalid!\n"); return (AE_ERROR); @@ -380,10 +382,15 @@ return_ACPI_STATUS (AE_BAD_PARAMETER); } + TableInfo.Pointer = TablePtr; + Status = AcpiTbRecognizeTable (&TableInfo, ACPI_TABLE_SECONDARY); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } + /* Install the new table into the local data structures */ - TableInfo.Pointer = TablePtr; - Status = AcpiTbInstallTable (&TableInfo); if (ACPI_FAILURE (Status)) { @@ -394,7 +401,7 @@ } -#ifndef PARSER_ONLY +#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY)) Status = AcpiNsLoadTable (TableInfo.InstalledDesc, AcpiGbl_RootNode); if (ACPI_FAILURE (Status)) { @@ -430,7 +437,7 @@ /* Get the entire file */ - AcpiOsPrintf ("Loading Acpi table from file %s\n", Filename); + fprintf (stderr, "Loading Acpi table from file %s\n", Filename); Status = AcpiDbLoadTable (fp, &AcpiGbl_DbTablePtr, &TableLength); fclose(fp); @@ -489,8 +496,8 @@ return (Status); } - AcpiOsPrintf ("%4.4s at %p successfully installed and loaded\n", - AcpiGbl_DbTablePtr->Signature, AcpiGbl_DbTablePtr); + fprintf (stderr, "Acpi table [%4.4s] successfully installed and loaded\n", + AcpiGbl_DbTablePtr->Signature); AcpiGbl_AcpiHardwarePresent = FALSE; ==== //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/dbxface.c#6 (text+ko) ==== @@ -269,7 +269,9 @@ /* Now we can display it */ +#ifdef ACPI_DISASSEMBLER AcpiDmDisassemble (WalkState, DisplayOp, ACPI_UINT32_MAX); +#endif if ((Op->Common.AmlOpcode == AML_IF_OP) || (Op->Common.AmlOpcode == AML_WHILE_OP)) @@ -425,9 +427,11 @@ AcpiGbl_DbOutputFlags = ACPI_DB_CONSOLE_OUTPUT; AcpiGbl_DbOpt_tables = FALSE; + AcpiGbl_DbOpt_stats = FALSE; +#ifdef ACPI_DISASSEMBLER AcpiGbl_DbOpt_disasm = FALSE; - AcpiGbl_DbOpt_stats = FALSE; AcpiGbl_DbOpt_verbose = TRUE; +#endif AcpiGbl_DbOpt_ini_methods = TRUE; AcpiGbl_DbBuffer = AcpiOsAllocate (ACPI_DEBUG_BUFFER_SIZE); @@ -475,11 +479,13 @@ } } +#ifdef ACPI_DISASSEMBLER if (!AcpiGbl_DbOpt_verbose) { AcpiGbl_DbOpt_disasm = TRUE; AcpiGbl_DbOpt_stats = FALSE; } +#endif return (AE_OK); } ==== //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/psparse.c#5 (text+ko) ==== @@ -590,7 +590,7 @@ ParserState = &WalkState->ParserState; WalkState->ArgTypes = 0; -#ifndef PARSER_ONLY +#if (!defined (ACPI_NO_METHOD_EXECUTION) && !defined (ACPI_CONSTANT_EVAL_ONLY)) if (WalkState->WalkType & ACPI_WALK_METHOD_RESTART) { /* We are restarting a preempted control method */ @@ -708,6 +708,10 @@ PreOp.Common.Value.Arg = NULL; PreOp.Common.AmlOpcode = WalkState->Opcode; + /* + * Get and append arguments until we find the node that contains + * the name (the type ARGP_NAME). + */ while (GET_CURRENT_ARG_TYPE (WalkState->ArgTypes) != ARGP_NAME) { Arg = AcpiPsGetNextArg (ParserState, @@ -1297,7 +1301,6 @@ /* We are done with this walk, move on to the parent if any */ WalkState = AcpiDsPopWalkState (Thread); - /* Save the last effective return value */ if (CallerReturnDesc && WalkState->ReturnDesc) ==== //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/rscreate.c#5 (text+ko) ==== @@ -132,7 +132,6 @@ * * PARAMETERS: ByteStreamBuffer - Pointer to the resource byte stream * OutputBuffer - Pointer to the user's buffer - * OutputBufferLength - Pointer to the size of OutputBuffer * * RETURN: Status - AE_OK if okay, else a valid ACPI_STATUS code * If OutputBuffer is not large enough, OutputBufferLength @@ -212,7 +211,6 @@ * PARAMETERS: PackageObject - Pointer to an ACPI_OPERAND_OBJECT * package * OutputBuffer - Pointer to the user's buffer - * OutputBufferLength - Size of OutputBuffer * * RETURN: Status AE_OK if okay, else a valid ACPI_STATUS code. * If the OutputBuffer is too small, the error will be @@ -349,7 +347,7 @@ if ((*SubObjectList)->Reference.Opcode != AML_INT_NAMEPATH_OP) { - ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Need name, found reference op %X\n", + ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Need name, found reference op %X\n", (*SubObjectList)->Reference.Opcode)); return_ACPI_STATUS (AE_BAD_DATA); } ==== //depot/projects/trustedbsd/mac/sys/contrib/dev/acpica/tbget.c#5 (text+ko) ==== @@ -126,233 +126,158 @@ /******************************************************************************* * - * FUNCTION: AcpiTbTableOverride + * FUNCTION: AcpiTbGetTable * - * PARAMETERS: *TableInfo - Info for current table + * PARAMETERS: Address - Address of table to retrieve. Can be + * Logical or Physical + * TableInfo - Where table info is returned * * RETURN: None * - * DESCRIPTION: Attempts override of current table with a new one if provided - * by the host OS. + * DESCRIPTION: Get entire table of unknown size. * ******************************************************************************/ -void -AcpiTbTableOverride ( +ACPI_STATUS +AcpiTbGetTable ( + ACPI_POINTER *Address, ACPI_TABLE_DESC *TableInfo) { - ACPI_TABLE_HEADER *NewTable; ACPI_STATUS Status; - ACPI_POINTER Address; - ACPI_TABLE_DESC NewTableInfo; + ACPI_TABLE_HEADER Header; - ACPI_FUNCTION_TRACE ("AcpiTbTableOverride"); + ACPI_FUNCTION_TRACE ("TbGetTable"); - Status = AcpiOsTableOverride (TableInfo->Pointer, &NewTable); + /* + * Get the header in order to get signature and table size + */ + Status = AcpiTbGetTableHeader (Address, &Header); if (ACPI_FAILURE (Status)) { - /* Some severe error from the OSL, but we basically ignore it */ - - ACPI_REPORT_ERROR (("Could not override ACPI table, %s\n", - AcpiFormatException (Status))); - return_VOID; + return_ACPI_STATUS (Status); } - if (!NewTable) - { - /* No table override */ + /* Get the entire table */ - return_VOID; - } - - /* - * We have a new table to override the old one. Get a copy of - * the new one. We know that the new table has a logical pointer. - */ - Address.PointerType = ACPI_LOGICAL_POINTER; - Address.Pointer.Logical = NewTable; - - Status = AcpiTbGetTable (&Address, &NewTableInfo); + Status = AcpiTbGetTableBody (Address, &Header, TableInfo); if (ACPI_FAILURE (Status)) { - ACPI_REPORT_ERROR (("Could not copy ACPI table override\n")); - return_VOID; + ACPI_REPORT_ERROR (("Could not get ACPI table (size %X), %s\n", + Header.Length, AcpiFormatException (Status))); + return_ACPI_STATUS (Status); } - /* - * Delete the original table - */ - AcpiTbDeleteSingleTable (TableInfo); - - /* Copy the table info */ - - ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Successful table override [%4.4s]\n", - ((ACPI_TABLE_HEADER *) NewTableInfo.Pointer)->Signature)); - - ACPI_MEMCPY (TableInfo, &NewTableInfo, sizeof (ACPI_TABLE_DESC)); - return_VOID; + return_ACPI_STATUS (AE_OK); } /******************************************************************************* * - * FUNCTION: AcpiTbGetTableWithOverride + * FUNCTION: AcpiTbGetTableHeader * - * PARAMETERS: Address - Physical or logical address of table - * *TableInfo - Where the table info is returned + * PARAMETERS: Address - Address of table to retrieve. Can be + * Logical or Physical + * ReturnHeader - Where the table header is returned * * RETURN: Status * - * DESCRIPTION: Gets and installs the table with possible table override by OS. + * DESCRIPTION: Get an ACPI table header. Works in both physical or virtual + * addressing mode. Works with both physical or logical pointers. + * Table is either copied or mapped, depending on the pointer + * type and mode of the processor. * ******************************************************************************/ ACPI_STATUS -AcpiTbGetTableWithOverride ( +AcpiTbGetTableHeader ( ACPI_POINTER *Address, - ACPI_TABLE_DESC *TableInfo) + ACPI_TABLE_HEADER *ReturnHeader) { - ACPI_STATUS Status; + ACPI_STATUS Status = AE_OK; + ACPI_TABLE_HEADER *Header = NULL; - ACPI_FUNCTION_TRACE ("AcpiTbGetTableWithOverride"); - + ACPI_FUNCTION_TRACE ("TbGetTableHeader"); - Status = AcpiTbGetTable (Address, TableInfo); - if (ACPI_FAILURE (Status)) - { - ACPI_REPORT_ERROR (("Could not get ACPI table, %s\n", - AcpiFormatException (Status))); - return_ACPI_STATUS (Status); - } /* - * Attempt override. It either happens or it doesn't, no status + * Flags contains the current processor mode (Virtual or Physical addressing) + * The PointerType is either Logical or Physical */ - AcpiTbTableOverride (TableInfo); + switch (Address->PointerType) + { + case ACPI_PHYSMODE_PHYSPTR: + case ACPI_LOGMODE_LOGPTR: - /* Install the table */ + /* Pointer matches processor mode, copy the header */ - Status = AcpiTbInstallTable (TableInfo); - if (ACPI_FAILURE (Status)) - { - ACPI_REPORT_ERROR (("Could not install ACPI table, %s\n", - AcpiFormatException (Status))); - } + ACPI_MEMCPY (ReturnHeader, Address->Pointer.Logical, sizeof (ACPI_TABLE_HEADER)); + break; - return_ACPI_STATUS (Status); -} + case ACPI_LOGMODE_PHYSPTR: -/******************************************************************************* - * - * FUNCTION: AcpiTbGetTablePtr - * - * PARAMETERS: TableType - one of the defined table types - * Instance - Which table of this type - * TablePtrLoc - pointer to location to place the pointer for - * return - * - * RETURN: Status - * - * DESCRIPTION: This function is called to get the pointer to an ACPI table. - * - ******************************************************************************/ + /* Create a logical address for the physical pointer*/ -ACPI_STATUS -AcpiTbGetTablePtr ( - ACPI_TABLE_TYPE TableType, - UINT32 Instance, - ACPI_TABLE_HEADER **TablePtrLoc) -{ - ACPI_TABLE_DESC *TableDesc; - UINT32 i; + Status = AcpiOsMapMemory (Address->Pointer.Physical, sizeof (ACPI_TABLE_HEADER), + (void **) &Header); + if (ACPI_FAILURE (Status)) + { + ACPI_REPORT_ERROR (("Could not map memory at %p for length %X\n", + Address->Pointer.Physical, sizeof (ACPI_TABLE_HEADER))); + return_ACPI_STATUS (Status); + } + /* Copy header and delete mapping */ - ACPI_FUNCTION_TRACE ("TbGetTablePtr"); + ACPI_MEMCPY (ReturnHeader, Header, sizeof (ACPI_TABLE_HEADER)); + AcpiOsUnmapMemory (Header, sizeof (ACPI_TABLE_HEADER)); + break; - if (!AcpiGbl_DSDT) - { - return_ACPI_STATUS (AE_NO_ACPI_TABLES); - } + default: - if (TableType > ACPI_TABLE_MAX) - { + ACPI_REPORT_ERROR (("Invalid address flags %X\n", + Address->PointerType)); return_ACPI_STATUS (AE_BAD_PARAMETER); } - /* - * For all table types (Single/Multiple), the first - * instance is always in the list head. - */ - if (Instance == 1) - { - /* - * Just pluck the pointer out of the global table! - * Will be null if no table is present - */ - *TablePtrLoc = AcpiGbl_AcpiTables[TableType].Pointer; - return_ACPI_STATUS (AE_OK); - } - - /* - * Check for instance out of range - */ - if (Instance > AcpiGbl_AcpiTables[TableType].Count) - { - return_ACPI_STATUS (AE_NOT_EXIST); - } - - /* Walk the list to get the desired table - * Since the if (Instance == 1) check above checked for the - * first table, setting TableDesc equal to the .Next member - * is actually pointing to the second table. Therefore, we - * need to walk from the 2nd table until we reach the Instance - * that the user is looking for and return its table pointer. - */ - TableDesc = AcpiGbl_AcpiTables[TableType].Next; - for (i = 2; i < Instance; i++) - { - TableDesc = TableDesc->Next; - } - - /* We are now pointing to the requested table's descriptor */ - - *TablePtrLoc = TableDesc->Pointer; - return_ACPI_STATUS (AE_OK); } /******************************************************************************* * - * FUNCTION: AcpiTbGetTable + * FUNCTION: AcpiTbGetTableBody * - * PARAMETERS: Address - Physical address of table to retrieve - * *TableInfo - Where the table info is returned + * PARAMETERS: Address - Address of table to retrieve. Can be + * Logical or Physical + * Header - Header of the table to retrieve + * TableInfo - Where the table info is returned * * RETURN: Status * - * DESCRIPTION: Maps the physical address of table into a logical address + * DESCRIPTION: Get an entire ACPI table with support to allow the host OS to + * replace the table with a newer version (table override.) + * Works in both physical or virtual + * addressing mode. Works with both physical or logical pointers. + * Table is either copied or mapped, depending on the pointer + * type and mode of the processor. * ******************************************************************************/ ACPI_STATUS -AcpiTbGetTable ( +AcpiTbGetTableBody ( ACPI_POINTER *Address, + ACPI_TABLE_HEADER *Header, ACPI_TABLE_DESC *TableInfo) { - ACPI_TABLE_HEADER *TableHeader = NULL; - ACPI_TABLE_HEADER *FullTable = NULL; - ACPI_SIZE Size; - UINT8 Allocation; - ACPI_STATUS Status = AE_OK; + ACPI_STATUS Status; - ACPI_FUNCTION_TRACE ("TbGetTable"); + ACPI_FUNCTION_TRACE ("TbGetTableBody"); if (!TableInfo || !Address) @@ -360,587 +285,298 @@ return_ACPI_STATUS (AE_BAD_PARAMETER); } - switch (Address->PointerType) + /* + * Attempt table override. + */ + Status = AcpiTbTableOverride (Header, TableInfo); + if (ACPI_SUCCESS (Status)) { - case ACPI_LOGICAL_POINTER: + /* Table was overridden by the host OS */ - /* - * Getting data from a buffer, not BIOS tables - */ - TableHeader = Address->Pointer.Logical; - - /* Allocate buffer for the entire table */ - - FullTable = ACPI_MEM_ALLOCATE (TableHeader->Length); - if (!FullTable) - { - return_ACPI_STATUS (AE_NO_MEMORY); - } - - /* Copy the entire table (including header) to the local buffer */ - - Size = (ACPI_SIZE) TableHeader->Length; - ACPI_MEMCPY (FullTable, TableHeader, Size); - - /* Save allocation type */ - - Allocation = ACPI_MEM_ALLOCATED; - break; - - - case ACPI_PHYSICAL_POINTER: - - /* - * Not reading from a buffer, just map the table's physical memory - * into our address space. - */ - Size = SIZE_IN_HEADER; - - Status = AcpiTbMapAcpiTable (Address->Pointer.Physical, &Size, &FullTable); - if (ACPI_FAILURE (Status)) - { >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 14:14:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0602B37B401; Tue, 30 Jul 2002 14:14:48 -0700 (PDT) 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 9E24937B400 for ; Tue, 30 Jul 2002 14:14:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AC0343E31 for ; Tue, 30 Jul 2002 14:14:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6ULElJU072785 for ; Tue, 30 Jul 2002 14:14:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6ULElIo072769 for perforce@freebsd.org; Tue, 30 Jul 2002 14:14:47 -0700 (PDT) Date: Tue, 30 Jul 2002 14:14:47 -0700 (PDT) Message-Id: <200207302114.g6ULElIo072769@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15225 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15225 Change 15225 by rwatson@rwatson_tislabs on 2002/07/30 14:13:51 Improved consistency with the base tree. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#35 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#35 (text+ko) ==== @@ -628,11 +628,11 @@ (p)->p_textvp, rb, rfb) int vn_fullpath(struct thread *td, struct vnode *optional_dvp, struct vnode *vn, char **retbuf, char **freebuf); +int vaccess(enum vtype type, mode_t file_mode, uid_t uid, gid_t gid, + mode_t acc_mode, struct ucred *cred, int *privused); int vaccess_acl_posix1e(enum vtype type, uid_t file_uid, gid_t file_gid, struct acl *acl, mode_t acc_mode, struct ucred *cred, int *privused); -int vaccess(enum vtype type, mode_t file_mode, uid_t uid, - gid_t gid, mode_t acc_mode, struct ucred *cred, int *privused); void vattr_null(struct vattr *vap); int vcount(struct vnode *vp); void vdrop(struct vnode *); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 14:18:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 134C137B401; Tue, 30 Jul 2002 14:18:54 -0700 (PDT) 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 AA57237B400 for ; Tue, 30 Jul 2002 14:18:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6736443E3B for ; Tue, 30 Jul 2002 14:18:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6ULIrJU073170 for ; Tue, 30 Jul 2002 14:18:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6ULIrw3073167 for perforce@freebsd.org; Tue, 30 Jul 2002 14:18:53 -0700 (PDT) Date: Tue, 30 Jul 2002 14:18:53 -0700 (PDT) Message-Id: <200207302118.g6ULIrw3073167@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15227 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15227 Change 15227 by rwatson@rwatson_tislabs on 2002/07/30 14:18:40 Sync the module sample entries list in the loader configuration with the real module set. Affected files ... .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#11 (text+ko) ==== @@ -281,12 +281,12 @@ ### TrustedBSD MAC settings ################################## ############################################################## -babyaudit_load="NO" # Baby auditing module mac_biba_load="NO" # Biba MAC policy mac_bsdextended_load="NO" # BSD/extended MAC policy mac_ifoff="NO" # Interface silencing policy mac_mls_load="NO" # MLS MAC policy mac_none_load="NO" # Null MAC policy +mac_partition_load="NO" # Partition MAC policy mac_seeotheruids_load="NO" # UID visbility MAC policy mac_te_load="NO" # Type Enforcement policy sebsd_load="NO" # Security-Enhanced BSD module To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 15:51:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8AF637B401; Tue, 30 Jul 2002 15:49:50 -0700 (PDT) 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 6B32B37B400 for ; Tue, 30 Jul 2002 15:49:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABA8D43E31 for ; Tue, 30 Jul 2002 15:49:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UMnnJU088606 for ; Tue, 30 Jul 2002 15:49:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UMnn6T088603 for perforce@freebsd.org; Tue, 30 Jul 2002 15:49:49 -0700 (PDT) Date: Tue, 30 Jul 2002 15:49:49 -0700 (PDT) Message-Id: <200207302249.g6UMnn6T088603@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15238 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15238 Change 15238 by rwatson@rwatson_tislabs on 2002/07/30 15:49:14 Integrate from the main FreeBSD tree. Largely these changes are from committing MAC changes to the main tree, so they'll get re-merged. Affected files ... .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass5.c#8 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/FAQ#3 integrate .. //depot/projects/trustedbsd/base/share/man/man7/ports.7#4 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/vnode_if.src#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/pipe.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/ucred.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#17 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mergemaster/mergemaster.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/ppp.8.m4#9 integrate Differences ... ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.10 2001/12/04 02:19:46 obrien Exp $ +# $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.11 2002/07/30 20:49:29 phk Exp $ # @(#)Makefile 8.2 (Berkeley) 4/27/95 PROG= fsck_ffs @@ -7,7 +7,8 @@ MAN= fsck_ffs.8 SRCS= dir.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c -WARNS= 0 +WARNS= 2 +CFLAGS+= -I${.CURDIR} .PATH: ${.CURDIR}/../../sys/ufs/ffs ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass5.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)pass5.c 8.9 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.29 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.30 2002/07/30 20:49:29 phk Exp $"; #endif /* not lint */ #include @@ -382,7 +382,6 @@ aend = n; continue; } - returntosingle = 1; if (astart == aend) (*msg)("ALLOCATED %s %d MARKED FREE\n", name, astart); @@ -419,7 +418,6 @@ pwarn("%s %sS %d-%ld MARKED USED\n", "UNALLOCATED", name, ustart, ustart + size - 1); - returntosingle = 1; if (bkgrdflag != 0) { cmd.value = ustart; cmd.size = size; @@ -462,7 +460,6 @@ pwarn("UNALLOCATED %sS %d-%ld MARKED USED\n", name, ustart, ustart + size - 1); } - returntosingle = 1; if (bkgrdflag != 0) { cmd.value = ustart; cmd.size = size; ==== //depot/projects/trustedbsd/base/share/examples/isdn/FAQ#3 (text+ko) ==== @@ -5,7 +5,7 @@ last edit-date: [Wed Nov 1 15:08:03 2000] - $FreeBSD: src/share/examples/isdn/FAQ,v 1.11 2002/05/11 06:06:11 dd Exp $ + $FreeBSD: src/share/examples/isdn/FAQ,v 1.12 2002/07/30 21:14:15 blackend Exp $ -------------------------------------------------------------------------------- @@ -910,8 +910,8 @@ More information to ppp setup can be found at http://www.Awfulhak.org/ppp.html - http://www.freebsd.org/handbook/ppp-and-slip.html - http://www.freebsd.org/FAQ/userppp.html + http://www.freebsd.org/doc/handbook/ppp-and-slip.html + http://www.freebsd.org/doc/faq/ppp.html and in the directory "user-ppp" of the isdn4bsd distribution. ==== //depot/projects/trustedbsd/base/share/man/man7/ports.7#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/share/man/man7/ports.7,v 1.31 2002/03/18 10:07:22 ru Exp $ +.\" $FreeBSD: src/share/man/man7/ports.7,v 1.32 2002/07/30 21:04:26 blackend Exp $ .\" .Dd January 25, 1998 .Dt PORTS 7 @@ -75,12 +75,12 @@ .%B "The FreeBSD Handbook" , .Pa ( file:/usr/share/doc/handbook/ports.html or -.Pa http://www.FreeBSD.org/handbook/ports.html ) . +.Pa http://www.FreeBSD.org/doc/handbook/ports.html ) . For information about creating new ports, see .%B "The Porter's Handbook" .Pa ( file:/usr/share/doc/porters-handbook/index.html or -.Pa http://www.FreeBSD.org/porters-handbook/index.html ) . +.Pa http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/porters-handbook/ ) . .Sh TARGETS Some of the targets work recursively through subdirectories. This lets you, for example, install all of the ==== //depot/projects/trustedbsd/base/sys/conf/files#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.677 2002/07/30 19:35:20 iwasaki Exp $ +# $FreeBSD: src/sys/conf/files,v 1.678 2002/07/30 22:28:43 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -984,11 +984,12 @@ # of the files in libkern/ are only needed on some architectures, e.g., # libkern/divdi3.c is needed by i386 but not alpha. Also, some of these # routines may be optimized for a particular platform. In either case, -# the file should be moved to /conf/files. from here. +# the file should be moved to conf/files. from here. # libkern/arc4random.c standard libkern/bcd.c standard libkern/bsearch.c standard +libkern/crc32.c standard libkern/iconv.c optional libiconv libkern/iconv_converter_if.m optional libiconv libkern/iconv_xlat.c optional libiconv @@ -1011,7 +1012,6 @@ libkern/strtoul.c standard libkern/strtouq.c standard libkern/strvalid.c standard -libkern/crc32.c standard net/bpf.c standard net/bpf_filter.c optional bpf bpf.h standard \ ==== //depot/projects/trustedbsd/base/sys/dev/hme/if_hme.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ * * from: NetBSD: hme.c,v 1.20 2000/12/14 06:27:25 thorpej Exp * - * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.5 2002/07/14 12:09:48 tmm Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.6 2002/07/30 21:47:14 fenner Exp $ */ /* @@ -70,6 +70,7 @@ #include #include +#include #include #include #include @@ -1052,8 +1053,11 @@ ifp->if_flags |= IFF_OACTIVE; IF_PREPEND(&ifp->if_snd, m); break; - } else + } else { enq = 1; + if (ifp->if_bpf) + bpf_mtap(ifp, m); + } } if (sc->sc_rb.rb_td_nbusy == HME_NTXDESC || error == -1) ==== //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_mac.c,v 1.1 2002/07/30 02:04:05 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_mac.c,v 1.2 2002/07/30 21:36:05 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -47,13 +47,3027 @@ #include "opt_mac.h" #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include + +#include +#include +#include +#include + +#include +#include + +#ifdef MAC + +SYSCTL_DECL(_security); + +SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, + "TrustedBSD MAC policy controls"); +SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, + "TrustedBSD MAC debug info"); + +static int mac_debug_label_fallback = 0; +SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, + &mac_debug_label_fallback, 0, "Filesystems should fall back to fs label" + "when label is corrupted."); +TUNABLE_INT("security.mac.debug_label_fallback", + &mac_debug_label_fallback); + +#ifndef MAC_MAX_POLICIES +#define MAC_MAX_POLICIES 8 +#endif +#if MAC_MAX_POLICIES > 32 +#error "MAC_MAX_POLICIES too large" +#endif +static unsigned int mac_max_policies = MAC_MAX_POLICIES; +static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1; +SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD, + &mac_max_policies, 0, ""); + +static int mac_late = 0; + +static int mac_enforce_fs = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_fs, CTLFLAG_RW, + &mac_enforce_fs, 0, "Enforce MAC policy on file system objects"); +TUNABLE_INT("security.mac.enforce_fs", &mac_enforce_fs); + +static int mac_enforce_network = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_network, CTLFLAG_RW, + &mac_enforce_network, 0, "Enforce MAC policy on network packets"); +TUNABLE_INT("security.mac.enforce_network", &mac_enforce_network); + +static int mac_enforce_process = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_process, CTLFLAG_RW, + &mac_enforce_process, 0, "Enforce MAC policy on inter-process operations"); +TUNABLE_INT("security.mac.enforce_process", &mac_enforce_process); + +static int mac_enforce_socket = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_socket, CTLFLAG_RW, + &mac_enforce_socket, 0, "Enforce MAC policy on socket operations"); +TUNABLE_INT("security.mac.enforce_socket", &mac_enforce_socket); + +static int mac_enforce_pipe = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_pipe, CTLFLAG_RW, + &mac_enforce_pipe, 0, "Enforce MAC policy on pipe operations"); + +static int mac_label_size = sizeof(struct mac); +SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, + &mac_label_size, 0, "Pre-compiled MAC label size"); + +static int mac_cache_fslabel_in_vnode = 1; +SYSCTL_INT(_security_mac, OID_AUTO, cache_fslabel_in_vnode, CTLFLAG_RW, + &mac_cache_fslabel_in_vnode, 0, "Cache mount fslabel in vnode"); +TUNABLE_INT("security.mac.cache_fslabel_in_vnode", + &mac_cache_fslabel_in_vnode); + +static int mac_vnode_label_cache_hits = 0; +SYSCTL_INT(_security_mac, OID_AUTO, vnode_label_cache_hits, CTLFLAG_RD, + &mac_vnode_label_cache_hits, 0, "Cache hits on vnode labels"); +static int mac_vnode_label_cache_misses = 0; +SYSCTL_INT(_security_mac, OID_AUTO, vnode_label_cache_misses, CTLFLAG_RD, + &mac_vnode_label_cache_misses, 0, "Cache misses on vnode labels"); +static int mac_mmap_revocation_via_cow = 1; +SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation_via_cow, CTLFLAG_RW, + &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " + "copy-on-write semantics, or by removing all write access"); + +static unsigned int nmacmbufs, nmaccreds, nmacifnets, nmacbpfdescs, + nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, + nmacipqs, nmacpipes; +SYSCTL_UINT(_security_mac_debug, OID_AUTO, mbufs, CTLFLAG_RD, + &nmacmbufs, 0, "number of mbufs in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, creds, CTLFLAG_RD, + &nmaccreds, 0, "number of ucreds in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, ifnets, CTLFLAG_RD, + &nmacifnets, 0, "number of ifnets in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, ipqs, CTLFLAG_RD, + &nmacipqs, 0, "number of ipqs in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, bpfdescs, CTLFLAG_RD, + &nmacbpfdescs, 0, "number of bpfdescs in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, sockets, CTLFLAG_RD, + &nmacsockets, 0, "number of sockets in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, pipes, CTLFLAG_RD, + &nmacpipes, 0, "number of pipes in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, mounts, CTLFLAG_RD, + &nmacmounts, 0, "number of mounts in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, temp, CTLFLAG_RD, + &nmactemp, 0, "number of temporary labels in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, vnodes, CTLFLAG_RD, + &nmacvnodes, 0, "number of vnodes in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, devfsdirents, CTLFLAG_RD, + &nmacdevfsdirents, 0, "number of devfs dirents inuse"); + +static int error_select(int error1, int error2); +static int mac_externalize(struct label *label, struct mac *mac); +static int mac_policy_register(struct mac_policy_conf *mpc); +static int mac_policy_unregister(struct mac_policy_conf *mpc); + +static int mac_stdcreatevnode_ea(struct vnode *vp); +static void mac_cred_mmapped_drop_perms(struct thread *td, + struct ucred *cred); +static void mac_cred_mmapped_drop_perms_recurse(struct thread *td, + struct ucred *cred, struct vm_map *map); + +MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); +MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); + +/* + * mac_policy_list_lock protects the consistency of 'mac_policy_list', + * the linked list of attached policy modules. Read-only consumers of + * the list must acquire a shared lock for the duration of their use; + * writers must acquire an exclusive lock. Note that for compound + * operations, locks should be held for the entire compound operation, + * and that this is not yet done for relabel requests. + */ +static struct mtx mac_policy_list_lock; +static LIST_HEAD(, mac_policy_conf) mac_policy_list; +static int mac_policy_list_busy; +#define MAC_POLICY_LIST_LOCKINIT() mtx_init(&mac_policy_list_lock, \ + "mac_policy_list_lock", NULL, MTX_DEF); +#define MAC_POLICY_LIST_LOCK() mtx_lock(&mac_policy_list_lock); +#define MAC_POLICY_LIST_UNLOCK() mtx_unlock(&mac_policy_list_lock); + +#define MAC_POLICY_LIST_BUSY() do { \ + MAC_POLICY_LIST_LOCK(); \ + mac_policy_list_busy++; \ + MAC_POLICY_LIST_UNLOCK(); \ +} while (0) + +#define MAC_POLICY_LIST_UNBUSY() do { \ + MAC_POLICY_LIST_LOCK(); \ + mac_policy_list_busy--; \ + if (mac_policy_list_busy < 0) \ + panic("Extra mac_policy_list_busy--"); \ + MAC_POLICY_LIST_UNLOCK(); \ +} while (0) + +/* + * MAC_CHECK performs the designated check by walking the policy + * module list and checking with each as to how it feels about the + * request. Note that it returns its value via 'error' in the scope + * of the caller. + */ +#define MAC_CHECK(check, args...) do { \ + struct mac_policy_conf *mpc; \ + \ + error = 0; \ + MAC_POLICY_LIST_BUSY(); \ + LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ + if (mpc->mpc_ops->mpo_ ## check != NULL) \ + error = error_select( \ + mpc->mpc_ops->mpo_ ## check (args), \ + error); \ + } \ + MAC_POLICY_LIST_UNBUSY(); \ +} while (0) + +/* + * MAC_BOOLEAN performs the designated boolean composition by walking + * the module list, invoking each instance of the operation, and + * combining the results using the passed C operator. Note that it + * returns its value via 'result' in the scope of the caller, which + * should be initialized by the caller in a meaningful way to get + * a meaningful result. + */ +#define MAC_BOOLEAN(operation, composition, args...) do { \ + struct mac_policy_conf *mpc; \ + \ + MAC_POLICY_LIST_BUSY(); \ + LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ + if (mpc->mpc_ops->mpo_ ## operation != NULL) \ + result = result composition \ + mpc->mpc_ops->mpo_ ## operation (args); \ + } \ + MAC_POLICY_LIST_UNBUSY(); \ +} while (0) + +/* + * MAC_PERFORM performs the designated operation by walking the policy + * module list and invoking that operation for each policy. + */ +#define MAC_PERFORM(operation, args...) do { \ + struct mac_policy_conf *mpc; \ + \ + MAC_POLICY_LIST_BUSY(); \ + LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ + if (mpc->mpc_ops->mpo_ ## operation != NULL) \ + mpc->mpc_ops->mpo_ ## operation (args); \ + } \ + MAC_POLICY_LIST_UNBUSY(); \ +} while (0) + +/* + * Initialize the MAC subsystem, including appropriate SMP locks. + */ +static void +mac_init(void) +{ + + LIST_INIT(&mac_policy_list); + MAC_POLICY_LIST_LOCKINIT(); +} + +/* + * For the purposes of modules that want to know if they were loaded + * "early", set the mac_late flag once we've processed modules either + * linked into the kernel, or loaded before the kernel startup. + */ +static void +mac_late_init(void) +{ + + mac_late = 1; +} + +/* + * Allow MAC policy modules to register during boot, etc. + */ +int +mac_policy_modevent(module_t mod, int type, void *data) +{ + struct mac_policy_conf *mpc; + int error; + + error = 0; + mpc = (struct mac_policy_conf *) data; + + switch (type) { + case MOD_LOAD: + if (mpc->mpc_loadtime_flags & MPC_LOADTIME_FLAG_NOTLATE && + mac_late) { + printf("mac_policy_modevent: can't load %s policy " + "after booting\n", mpc->mpc_name); + error = EBUSY; + break; + } + error = mac_policy_register(mpc); + break; + case MOD_UNLOAD: + /* Don't unregister the module if it was never registered. */ + if ((mpc->mpc_runtime_flags & MPC_RUNTIME_FLAG_REGISTERED) + != 0) + error = mac_policy_unregister(mpc); + else + error = 0; + break; + default: + break; + } + + return (error); +} + +static int +mac_policy_register(struct mac_policy_conf *mpc) +{ + struct mac_policy_conf *tmpc; + struct mac_policy_ops *ops; + struct mac_policy_op_entry *mpe; + int slot; + + MALLOC(mpc->mpc_ops, struct mac_policy_ops *, sizeof(*ops), M_MACOPVEC, + M_WAITOK | M_ZERO); + for (mpe = mpc->mpc_entries; mpe->mpe_constant != MAC_OP_LAST; mpe++) { + switch (mpe->mpe_constant) { + case MAC_OP_LAST: + /* + * Doesn't actually happen, but this allows checking + * that all enumerated values are handled. + */ + break; + case MAC_DESTROY: + mpc->mpc_ops->mpo_destroy = + mpe->mpe_function; + break; + case MAC_INIT: + mpc->mpc_ops->mpo_init = + mpe->mpe_function; + break; + case MAC_INIT_BPFDESC: + mpc->mpc_ops->mpo_init_bpfdesc = + mpe->mpe_function; + break; + case MAC_INIT_CRED: + mpc->mpc_ops->mpo_init_cred = + mpe->mpe_function; + break; + case MAC_INIT_DEVFSDIRENT: + mpc->mpc_ops->mpo_init_devfsdirent = + mpe->mpe_function; + break; + case MAC_INIT_IFNET: + mpc->mpc_ops->mpo_init_ifnet = + mpe->mpe_function; + break; + case MAC_INIT_IPQ: + mpc->mpc_ops->mpo_init_ipq = + mpe->mpe_function; + break; + case MAC_INIT_MBUF: + mpc->mpc_ops->mpo_init_mbuf = + mpe->mpe_function; + break; + case MAC_INIT_MOUNT: + mpc->mpc_ops->mpo_init_mount = + mpe->mpe_function; + break; + case MAC_INIT_PIPE: + mpc->mpc_ops->mpo_init_pipe = + mpe->mpe_function; + break; + case MAC_INIT_SOCKET: + mpc->mpc_ops->mpo_init_socket = + mpe->mpe_function; + break; + case MAC_INIT_TEMP: + mpc->mpc_ops->mpo_init_temp = + mpe->mpe_function; + break; + case MAC_INIT_VNODE: + mpc->mpc_ops->mpo_init_vnode = + mpe->mpe_function; + break; + case MAC_DESTROY_BPFDESC: + mpc->mpc_ops->mpo_destroy_bpfdesc = + mpe->mpe_function; + break; + case MAC_DESTROY_CRED: + mpc->mpc_ops->mpo_destroy_cred = + mpe->mpe_function; + break; + case MAC_DESTROY_DEVFSDIRENT: + mpc->mpc_ops->mpo_destroy_devfsdirent = + mpe->mpe_function; + break; + case MAC_DESTROY_IFNET: + mpc->mpc_ops->mpo_destroy_ifnet = + mpe->mpe_function; + break; + case MAC_DESTROY_IPQ: + mpc->mpc_ops->mpo_destroy_ipq = + mpe->mpe_function; + break; + case MAC_DESTROY_MBUF: + mpc->mpc_ops->mpo_destroy_mbuf = + mpe->mpe_function; + break; + case MAC_DESTROY_MOUNT: + mpc->mpc_ops->mpo_destroy_mount = + mpe->mpe_function; + break; + case MAC_DESTROY_PIPE: + mpc->mpc_ops->mpo_destroy_pipe = + mpe->mpe_function; + break; + case MAC_DESTROY_SOCKET: + mpc->mpc_ops->mpo_destroy_socket = + mpe->mpe_function; + break; + case MAC_DESTROY_TEMP: + mpc->mpc_ops->mpo_destroy_temp = + mpe->mpe_function; + break; + case MAC_DESTROY_VNODE: + mpc->mpc_ops->mpo_destroy_vnode = + mpe->mpe_function; + break; + case MAC_EXTERNALIZE: + mpc->mpc_ops->mpo_externalize = + mpe->mpe_function; + break; + case MAC_INTERNALIZE: + mpc->mpc_ops->mpo_internalize = + mpe->mpe_function; + break; + case MAC_CREATE_DEVFS_DEVICE: + mpc->mpc_ops->mpo_create_devfs_device = + mpe->mpe_function; + break; + case MAC_CREATE_DEVFS_DIRECTORY: + mpc->mpc_ops->mpo_create_devfs_directory = + mpe->mpe_function; + break; + case MAC_CREATE_DEVFS_VNODE: + mpc->mpc_ops->mpo_create_devfs_vnode = + mpe->mpe_function; + break; + case MAC_STDCREATEVNODE_EA: + mpc->mpc_ops->mpo_stdcreatevnode_ea = + mpe->mpe_function; + break; + case MAC_CREATE_VNODE: + mpc->mpc_ops->mpo_create_vnode = + mpe->mpe_function; + break; + case MAC_CREATE_MOUNT: + mpc->mpc_ops->mpo_create_mount = + mpe->mpe_function; + break; + case MAC_CREATE_ROOT_MOUNT: + mpc->mpc_ops->mpo_create_root_mount = + mpe->mpe_function; + break; + case MAC_RELABEL_VNODE: + mpc->mpc_ops->mpo_relabel_vnode = + mpe->mpe_function; + break; + case MAC_UPDATE_DEVFSDIRENT: + mpc->mpc_ops->mpo_update_devfsdirent = + mpe->mpe_function; + break; + case MAC_UPDATE_PROCFSVNODE: + mpc->mpc_ops->mpo_update_procfsvnode = + mpe->mpe_function; + break; + case MAC_UPDATE_VNODE_FROM_EXTATTR: + mpc->mpc_ops->mpo_update_vnode_from_extattr = + mpe->mpe_function; + break; + case MAC_UPDATE_VNODE_FROM_EXTERNALIZED: + mpc->mpc_ops->mpo_update_vnode_from_externalized = + mpe->mpe_function; + break; + case MAC_UPDATE_VNODE_FROM_MOUNT: + mpc->mpc_ops->mpo_update_vnode_from_mount = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_FROM_SOCKET: + mpc->mpc_ops->mpo_create_mbuf_from_socket = + mpe->mpe_function; + break; + case MAC_CREATE_PIPE: + mpc->mpc_ops->mpo_create_pipe = + mpe->mpe_function; + break; + case MAC_CREATE_SOCKET: + mpc->mpc_ops->mpo_create_socket = + mpe->mpe_function; + break; + case MAC_CREATE_SOCKET_FROM_SOCKET: + mpc->mpc_ops->mpo_create_socket_from_socket = + mpe->mpe_function; + break; + case MAC_RELABEL_PIPE: + mpc->mpc_ops->mpo_relabel_pipe = + mpe->mpe_function; + break; + case MAC_RELABEL_SOCKET: + mpc->mpc_ops->mpo_relabel_socket = + mpe->mpe_function; + break; + case MAC_SET_SOCKET_PEER_FROM_MBUF: + mpc->mpc_ops->mpo_set_socket_peer_from_mbuf = + mpe->mpe_function; + break; + case MAC_SET_SOCKET_PEER_FROM_SOCKET: + mpc->mpc_ops->mpo_set_socket_peer_from_socket = + mpe->mpe_function; + break; + case MAC_CREATE_BPFDESC: + mpc->mpc_ops->mpo_create_bpfdesc = + mpe->mpe_function; + break; + case MAC_CREATE_DATAGRAM_FROM_IPQ: + mpc->mpc_ops->mpo_create_datagram_from_ipq = + mpe->mpe_function; + break; + case MAC_CREATE_FRAGMENT: + mpc->mpc_ops->mpo_create_fragment = + mpe->mpe_function; + break; + case MAC_CREATE_IFNET: + mpc->mpc_ops->mpo_create_ifnet = + mpe->mpe_function; + break; + case MAC_CREATE_IPQ: + mpc->mpc_ops->mpo_create_ipq = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_FROM_MBUF: + mpc->mpc_ops->mpo_create_mbuf_from_mbuf = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_LINKLAYER: + mpc->mpc_ops->mpo_create_mbuf_linklayer = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_FROM_BPFDESC: + mpc->mpc_ops->mpo_create_mbuf_from_bpfdesc = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_FROM_IFNET: + mpc->mpc_ops->mpo_create_mbuf_from_ifnet = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_MULTICAST_ENCAP: + mpc->mpc_ops->mpo_create_mbuf_multicast_encap = + mpe->mpe_function; + break; + case MAC_CREATE_MBUF_NETLAYER: + mpc->mpc_ops->mpo_create_mbuf_netlayer = + mpe->mpe_function; + break; + case MAC_FRAGMENT_MATCH: + mpc->mpc_ops->mpo_fragment_match = + mpe->mpe_function; + break; + case MAC_RELABEL_IFNET: + mpc->mpc_ops->mpo_relabel_ifnet = + mpe->mpe_function; + break; + case MAC_UPDATE_IPQ: + mpc->mpc_ops->mpo_update_ipq = + mpe->mpe_function; + break; + case MAC_CREATE_CRED: + mpc->mpc_ops->mpo_create_cred = + mpe->mpe_function; + break; + case MAC_EXECVE_TRANSITION: + mpc->mpc_ops->mpo_execve_transition = + mpe->mpe_function; + break; + case MAC_EXECVE_WILL_TRANSITION: + mpc->mpc_ops->mpo_execve_will_transition = + mpe->mpe_function; + break; + case MAC_CREATE_PROC0: + mpc->mpc_ops->mpo_create_proc0 = mpe->mpe_function; + break; + case MAC_CREATE_PROC1: + mpc->mpc_ops->mpo_create_proc1 = mpe->mpe_function; + break; + case MAC_RELABEL_CRED: + mpc->mpc_ops->mpo_relabel_cred = + mpe->mpe_function; + break; + case MAC_CHECK_BPFDESC_RECEIVE: + mpc->mpc_ops->mpo_check_bpfdesc_receive = + mpe->mpe_function; + break; + case MAC_CHECK_CRED_RELABEL: + mpc->mpc_ops->mpo_check_cred_relabel = + mpe->mpe_function; + break; + case MAC_CHECK_CRED_VISIBLE: + mpc->mpc_ops->mpo_check_cred_visible = + mpe->mpe_function; + break; + case MAC_CHECK_IFNET_RELABEL: + mpc->mpc_ops->mpo_check_ifnet_relabel = + mpe->mpe_function; + break; + case MAC_CHECK_IFNET_TRANSMIT: + mpc->mpc_ops->mpo_check_ifnet_transmit = + mpe->mpe_function; + break; + case MAC_CHECK_MOUNT_STAT: + mpc->mpc_ops->mpo_check_mount_stat = + mpe->mpe_function; + break; + case MAC_CHECK_PIPE_IOCTL: + mpc->mpc_ops->mpo_check_pipe_ioctl = + mpe->mpe_function; + break; + case MAC_CHECK_PIPE_OP: + mpc->mpc_ops->mpo_check_pipe_op = + mpe->mpe_function; + break; + case MAC_CHECK_PIPE_RELABEL: + mpc->mpc_ops->mpo_check_pipe_relabel = + mpe->mpe_function; + break; + case MAC_CHECK_PROC_DEBUG: + mpc->mpc_ops->mpo_check_proc_debug = + mpe->mpe_function; + break; + case MAC_CHECK_PROC_SCHED: + mpc->mpc_ops->mpo_check_proc_sched = + mpe->mpe_function; + break; + case MAC_CHECK_PROC_SIGNAL: + mpc->mpc_ops->mpo_check_proc_signal = + mpe->mpe_function; + break; + case MAC_CHECK_SOCKET_BIND: + mpc->mpc_ops->mpo_check_socket_bind = + mpe->mpe_function; + break; + case MAC_CHECK_SOCKET_CONNECT: + mpc->mpc_ops->mpo_check_socket_connect = + mpe->mpe_function; + break; + case MAC_CHECK_SOCKET_LISTEN: + mpc->mpc_ops->mpo_check_socket_listen = + mpe->mpe_function; + break; + case MAC_CHECK_SOCKET_RECEIVE: + mpc->mpc_ops->mpo_check_socket_receive = + mpe->mpe_function; + break; + case MAC_CHECK_SOCKET_RELABEL: + mpc->mpc_ops->mpo_check_socket_relabel = + mpe->mpe_function; + break; + case MAC_CHECK_SOCKET_VISIBLE: + mpc->mpc_ops->mpo_check_socket_visible = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_ACCESS: + mpc->mpc_ops->mpo_check_vnode_access = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_CHDIR: + mpc->mpc_ops->mpo_check_vnode_chdir = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_CHROOT: + mpc->mpc_ops->mpo_check_vnode_chroot = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_CREATE: + mpc->mpc_ops->mpo_check_vnode_create = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_DELETE: + mpc->mpc_ops->mpo_check_vnode_delete = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_DELETEACL: + mpc->mpc_ops->mpo_check_vnode_deleteacl = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_EXEC: + mpc->mpc_ops->mpo_check_vnode_exec = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_GETACL: + mpc->mpc_ops->mpo_check_vnode_getacl = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_GETEXTATTR: + mpc->mpc_ops->mpo_check_vnode_getextattr = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_LOOKUP: + mpc->mpc_ops->mpo_check_vnode_lookup = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_MMAP_PERMS: + mpc->mpc_ops->mpo_check_vnode_mmap_perms = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_OP: + mpc->mpc_ops->mpo_check_vnode_op = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_OPEN: + mpc->mpc_ops->mpo_check_vnode_open = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_READDIR: + mpc->mpc_ops->mpo_check_vnode_readdir = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_READLINK: + mpc->mpc_ops->mpo_check_vnode_readlink = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_RELABEL: + mpc->mpc_ops->mpo_check_vnode_relabel = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_RENAME_FROM: + mpc->mpc_ops->mpo_check_vnode_rename_from = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_RENAME_TO: + mpc->mpc_ops->mpo_check_vnode_rename_to = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_REVOKE: + mpc->mpc_ops->mpo_check_vnode_revoke = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_SETACL: + mpc->mpc_ops->mpo_check_vnode_setacl = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_SETEXTATTR: + mpc->mpc_ops->mpo_check_vnode_setextattr = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_SETFLAGS: + mpc->mpc_ops->mpo_check_vnode_setflags = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_SETMODE: + mpc->mpc_ops->mpo_check_vnode_setmode = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_SETOWNER: + mpc->mpc_ops->mpo_check_vnode_setowner = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_SETUTIMES: + mpc->mpc_ops->mpo_check_vnode_setutimes = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_STAT: + mpc->mpc_ops->mpo_check_vnode_stat = + mpe->mpe_function; + break; +/* + default: + printf("MAC policy `%s': unknown operation %d\n", + mpc->mpc_name, mpe->mpe_constant); + return (EINVAL); +*/ + } + } + MAC_POLICY_LIST_LOCK(); + if (mac_policy_list_busy > 0) { + MAC_POLICY_LIST_UNLOCK(); + FREE(mpc->mpc_ops, M_MACOPVEC); + mpc->mpc_ops = NULL; + return (EBUSY); + } + LIST_FOREACH(tmpc, &mac_policy_list, mpc_list) { + if (strcmp(tmpc->mpc_name, mpc->mpc_name) == 0) { + MAC_POLICY_LIST_UNLOCK(); + FREE(mpc->mpc_ops, M_MACOPVEC); + mpc->mpc_ops = NULL; + return (EEXIST); + } + } + if (mpc->mpc_field_off != NULL) { + slot = ffs(mac_policy_offsets_free); + if (slot == 0) { + MAC_POLICY_LIST_UNLOCK(); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 15:55:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 276C537B401; Tue, 30 Jul 2002 15:54:45 -0700 (PDT) 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 B536637B400 for ; Tue, 30 Jul 2002 15:54:44 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6845343E67 for ; Tue, 30 Jul 2002 15:54:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UMrtJU089381 for ; Tue, 30 Jul 2002 15:53:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UMrsIl089378 for perforce@freebsd.org; Tue, 30 Jul 2002 15:53:54 -0700 (PDT) Date: Tue, 30 Jul 2002 15:53:54 -0700 (PDT) Message-Id: <200207302253.g6UMrsIl089378@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15239 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15239 Change 15239 by rwatson@rwatson_tislabs on 2002/07/30 15:53:52 Integ MAC changes trickling back from the main FreeBSD tree. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass5.c#8 integrate .. //depot/projects/trustedbsd/mac/share/examples/isdn/FAQ#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/ports.7#4 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#40 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#223 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#20 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vnode_if.src#11 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#139 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#103 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mount.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/sys/pipe.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ucred.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#36 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mergemaster/mergemaster.8#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/ppp.8.m4#9 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sbin/fsck_ffs/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.10 2001/12/04 02:19:46 obrien Exp $ +# $FreeBSD: src/sbin/fsck_ffs/Makefile,v 1.11 2002/07/30 20:49:29 phk Exp $ # @(#)Makefile 8.2 (Berkeley) 4/27/95 PROG= fsck_ffs @@ -7,7 +7,8 @@ MAN= fsck_ffs.8 SRCS= dir.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c -WARNS= 0 +WARNS= 2 +CFLAGS+= -I${.CURDIR} .PATH: ${.CURDIR}/../../sys/ufs/ffs ==== //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass5.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)pass5.c 8.9 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.29 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/pass5.c,v 1.30 2002/07/30 20:49:29 phk Exp $"; #endif /* not lint */ #include @@ -382,7 +382,6 @@ aend = n; continue; } - returntosingle = 1; if (astart == aend) (*msg)("ALLOCATED %s %d MARKED FREE\n", name, astart); @@ -419,7 +418,6 @@ pwarn("%s %sS %d-%ld MARKED USED\n", "UNALLOCATED", name, ustart, ustart + size - 1); - returntosingle = 1; if (bkgrdflag != 0) { cmd.value = ustart; cmd.size = size; @@ -462,7 +460,6 @@ pwarn("UNALLOCATED %sS %d-%ld MARKED USED\n", name, ustart, ustart + size - 1); } - returntosingle = 1; if (bkgrdflag != 0) { cmd.value = ustart; cmd.size = size; ==== //depot/projects/trustedbsd/mac/share/examples/isdn/FAQ#3 (text+ko) ==== @@ -5,7 +5,7 @@ last edit-date: [Wed Nov 1 15:08:03 2000] - $FreeBSD: src/share/examples/isdn/FAQ,v 1.11 2002/05/11 06:06:11 dd Exp $ + $FreeBSD: src/share/examples/isdn/FAQ,v 1.12 2002/07/30 21:14:15 blackend Exp $ -------------------------------------------------------------------------------- @@ -910,8 +910,8 @@ More information to ppp setup can be found at http://www.Awfulhak.org/ppp.html - http://www.freebsd.org/handbook/ppp-and-slip.html - http://www.freebsd.org/FAQ/userppp.html + http://www.freebsd.org/doc/handbook/ppp-and-slip.html + http://www.freebsd.org/doc/faq/ppp.html and in the directory "user-ppp" of the isdn4bsd distribution. ==== //depot/projects/trustedbsd/mac/share/man/man7/ports.7#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/share/man/man7/ports.7,v 1.31 2002/03/18 10:07:22 ru Exp $ +.\" $FreeBSD: src/share/man/man7/ports.7,v 1.32 2002/07/30 21:04:26 blackend Exp $ .\" .Dd January 25, 1998 .Dt PORTS 7 @@ -75,12 +75,12 @@ .%B "The FreeBSD Handbook" , .Pa ( file:/usr/share/doc/handbook/ports.html or -.Pa http://www.FreeBSD.org/handbook/ports.html ) . +.Pa http://www.FreeBSD.org/doc/handbook/ports.html ) . For information about creating new ports, see .%B "The Porter's Handbook" .Pa ( file:/usr/share/doc/porters-handbook/index.html or -.Pa http://www.FreeBSD.org/porters-handbook/index.html ) . +.Pa http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/porters-handbook/ ) . .Sh TARGETS Some of the targets work recursively through subdirectories. This lets you, for example, install all of the ==== //depot/projects/trustedbsd/mac/sys/conf/files#40 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.677 2002/07/30 19:35:20 iwasaki Exp $ +# $FreeBSD: src/sys/conf/files,v 1.678 2002/07/30 22:28:43 imp Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -985,11 +985,12 @@ # of the files in libkern/ are only needed on some architectures, e.g., # libkern/divdi3.c is needed by i386 but not alpha. Also, some of these # routines may be optimized for a particular platform. In either case, -# the file should be moved to /conf/files. from here. +# the file should be moved to conf/files. from here. # libkern/arc4random.c standard libkern/bcd.c standard libkern/bsearch.c standard +libkern/crc32.c standard libkern/iconv.c optional libiconv libkern/iconv_converter_if.m optional libiconv libkern/iconv_xlat.c optional libiconv @@ -1012,7 +1013,6 @@ libkern/strtoul.c standard libkern/strtouq.c standard libkern/strvalid.c standard -libkern/crc32.c standard net/bpf.c standard net/bpf_filter.c optional bpf bpf.h standard \ ==== //depot/projects/trustedbsd/mac/sys/dev/hme/if_hme.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ * * from: NetBSD: hme.c,v 1.20 2000/12/14 06:27:25 thorpej Exp * - * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.5 2002/07/14 12:09:48 tmm Exp $ + * $FreeBSD: src/sys/dev/hme/if_hme.c,v 1.6 2002/07/30 21:47:14 fenner Exp $ */ /* @@ -70,6 +70,7 @@ #include #include +#include #include #include #include @@ -1052,8 +1053,11 @@ ifp->if_flags |= IFF_OACTIVE; IF_PREPEND(&ifp->if_snd, m); break; - } else + } else { enq = 1; + if (ifp->if_bpf) + bpf_mtap(ifp, m); + } } if (sc->sc_rb.rb_td_nbusy == HME_NTXDESC || error == -1) ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#223 (text+ko) ==== @@ -36,7 +36,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/sys/kern/kern_mac.c,v 1.2 2002/07/30 21:36:05 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. ==== //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#16 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.176 2002/07/24 07:23:41 julian Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.177 2002/07/30 21:13:48 julian Exp $ */ #include "opt_compat.h" @@ -1434,9 +1434,7 @@ if (!(p->p_pptr->p_procsig->ps_flag & PS_NOCLDSTOP)) psignal(p->p_pptr, SIGCHLD); PROC_UNLOCK(p->p_pptr); - mtx_lock_spin(&sched_lock); stop(p); - mtx_unlock_spin(&sched_lock); goto out; } else goto runfast; @@ -1598,7 +1596,7 @@ psignal(p->p_pptr, SIGCHLD); PROC_UNLOCK(p->p_pptr); mtx_lock_spin(&sched_lock); - stop(p); + stop(p); /* uses schedlock too eventually */ td->td_state = TDS_UNQUEUED; PROC_UNLOCK(p); DROP_GIANT(); @@ -1676,9 +1674,7 @@ psignal(p->p_pptr, SIGCHLD); } PROC_UNLOCK(p->p_pptr); - mtx_lock_spin(&sched_lock); stop(p); - mtx_unlock_spin(&sched_lock); break; } else if (prop & SA_IGNORE) { @@ -1726,7 +1722,6 @@ { PROC_LOCK_ASSERT(p, MA_OWNED); - mtx_assert(&sched_lock, MA_OWNED); p->p_flag |= P_STOPPED_SGNL; p->p_flag &= ~P_WAITED; wakeup(p->p_pptr); ==== //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.23 2002/07/24 15:11:23 bmilekic Exp $ + * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.24 2002/07/30 21:06:27 bmilekic Exp $ */ #include "opt_param.h" @@ -202,6 +202,7 @@ }; static struct mb_lstmngr mb_list_mbuf, mb_list_clust; static struct mtx mbuf_gen, mbuf_pcpu[NCPU]; +u_int *cl_refcntmap; /* * Local macros for internal allocator structure manipulations. @@ -341,9 +342,11 @@ /* * Set up all the submaps, for each type of object that we deal - * with in this allocator. + * with in this allocator. We also allocate space for the cluster + * ref. counts in the mbuf map (and not the cluster map) in order to + * give clusters a nice contiguous address space without any holes. */ - mb_map_size = (vm_size_t)(nmbufs * MSIZE); + mb_map_size = (vm_size_t)(nmbufs * MSIZE + nmbclusters * sizeof(u_int)); mb_map_size = rounddown(mb_map_size, PAGE_SIZE); mb_list_mbuf.ml_btable = malloc((unsigned long)mb_map_size / PAGE_SIZE * sizeof(struct mb_bucket *), M_MBUF, M_NOWAIT); @@ -413,6 +416,15 @@ SLIST_INIT(&(mb_list_clust.ml_genlist->mb_cont.mc_bhead)); /* + * Allocate all the required counters for clusters. This makes + * cluster allocations/deallocations much faster. + */ + cl_refcntmap = (u_int *)kmem_malloc(mb_list_clust.ml_map, + roundup(nmbclusters * sizeof(u_int), MSIZE), M_NOWAIT); + if (cl_refcntmap == NULL) + goto bad; + + /* * Initialize general mbuf statistics. */ mbstat.m_msize = MSIZE; @@ -1043,14 +1055,20 @@ (m)->m_ext.ext_type = EXT_CLUSTER; \ } while (0) -#define _mext_init_ref(m) do { \ - (m)->m_ext.ref_cnt = malloc(sizeof(u_int), M_MBUF, M_NOWAIT); \ +#define _mext_init_ref(m, ref) do { \ + if ((ref) == NULL) \ + malloc(sizeof(u_int), M_MBUF, M_NOWAIT); \ + else \ + (m)->m_ext.ref_cnt = (u_int *)(ref); \ if ((m)->m_ext.ref_cnt != NULL) { \ *((m)->m_ext.ref_cnt) = 0; \ MEXT_ADD_REF((m)); \ } \ } while (0) +#define cl2ref(cl) \ + (((uintptr_t)(cl) - (uintptr_t)cl_refcntmap) >> MCLSHIFT) + #define _mext_dealloc_ref(m) \ free((m)->m_ext.ref_cnt, M_MBUF) @@ -1065,36 +1083,25 @@ * - _mext_free(): frees associated storage when the ref. count is * exactly one and we're freeing. * - * - _mclfree(): wraps an mb_free() of a cluster to avoid inlining the - * mb_free() in some exported routines. - * * - _mgetm_internal(): common "persistent-lock" routine that allocates * an mbuf and a cluster in one shot, but where the lock is already * held coming in (which is what makes it different from the exported * m_getcl()). The lock is dropped when done. This is used by m_getm() * and, therefore, is very m_getm()-specific. */ -static void _mclfree(struct mbuf *); static struct mbuf *_mgetm_internal(int, short, short, int); void _mext_free(struct mbuf *mb) { - if (mb->m_ext.ext_type == EXT_CLUSTER) + if (mb->m_ext.ext_type == EXT_CLUSTER) { mb_free(&mb_list_clust, (caddr_t)mb->m_ext.ext_buf, MT_NOTMBUF, 0, NULL); - else + } else { (*(mb->m_ext.ext_free))(mb->m_ext.ext_buf, mb->m_ext.ext_args); - _mext_dealloc_ref(mb); -} - -static void -_mclfree(struct mbuf *mb) -{ - - mb_free(&mb_list_clust, (caddr_t)mb->m_ext.ext_buf, MT_NOTMBUF, 0,NULL); - mb->m_ext.ext_buf = NULL; + _mext_dealloc_ref(mb); + } } static struct mbuf * @@ -1114,13 +1121,8 @@ (void)m_free(mb); mb = NULL; } - _mext_init_ref(mb); - if (mb->m_ext.ref_cnt == NULL) { - _mclfree(mb); - (void)m_free(mb); - return NULL; - } else - _mcl_setup(mb); + _mcl_setup(mb); + _mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]); } return (mb); } @@ -1206,15 +1208,8 @@ (void)m_free(mb); goto failed; } - _mext_init_ref(mb); - if (mb->m_ext.ref_cnt == NULL) { - /* XXX: PROBLEM! lock may be held here! */ - panic("m_getm(): FATAL ERROR! Sorry!"); - _mclfree(mb); - (void)m_free(mb); - goto failed; - } _mcl_setup(mb); + _mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]); persist = MBP_PERSISTENT; if (cur == NULL) @@ -1356,7 +1351,6 @@ if ((mb->m_flags & M_EXT) != 0) { MEXT_REM_REF(mb); if (atomic_cmpset_int(mb->m_ext.ref_cnt, 0, 1)) { - _mext_dealloc_ref(mb); if (mb->m_ext.ext_type == EXT_CLUSTER) { mb_free(&mb_list_clust, (caddr_t)mb->m_ext.ext_buf, MT_NOTMBUF, @@ -1365,6 +1359,7 @@ } else { (*(mb->m_ext.ext_free))(mb->m_ext.ext_buf, mb->m_ext.ext_args); + _mext_dealloc_ref(mb); persist = 0; } } @@ -1404,7 +1399,6 @@ if ((m->m_flags & M_EXT) != 0) { MEXT_REM_REF(m); if (atomic_cmpset_int(m->m_ext.ref_cnt, 0, 1)) { - _mext_dealloc_ref(m); if (m->m_ext.ext_type == EXT_CLUSTER) { mb_free(&mb_list_clust, (caddr_t)m->m_ext.ext_buf, @@ -1413,6 +1407,7 @@ } else { (*(m->m_ext.ext_free))(m->m_ext.ext_buf, m->m_ext.ext_args); + _mext_dealloc_ref(m); persist = 0; } } @@ -1461,13 +1456,8 @@ (void)m_free(mb); mb = NULL; } else { - _mext_init_ref(mb); - if (mb->m_ext.ref_cnt == NULL) { - _mclfree(mb); - (void)m_free(mb); - mb = NULL; - } else - _mcl_setup(mb); + _mcl_setup(mb); + _mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]); } return (mb); } @@ -1490,11 +1480,8 @@ mb->m_ext.ext_buf= (caddr_t)mb_alloc(&mb_list_clust,how,MT_NOTMBUF, 0, NULL); if (mb->m_ext.ext_buf != NULL) { - _mext_init_ref(mb); - if (mb->m_ext.ref_cnt == NULL) - _mclfree(mb); - else - _mcl_setup(mb); + _mcl_setup(mb); + _mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]); } } @@ -1520,7 +1507,8 @@ void (*freef)(void *, void *), void *args, short flags, int type) { - _mext_init_ref(mb); + _mext_init_ref(mb, ((type != EXT_CLUSTER) ? + NULL : &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)])); if (mb->m_ext.ref_cnt != NULL) { mb->m_flags |= (M_EXT | flags); mb->m_ext.ext_buf = buf; ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#20 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.118 2002/07/30 16:50:25 rwatson Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.119 2002/07/30 22:43:20 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -556,9 +556,11 @@ 384 MSTD BSD { int __mac_get_proc(struct mac *mac_p); } 385 MSTD BSD { int __mac_set_proc(struct mac *mac_p); } 386 MSTD BSD { int __mac_get_fd(int fd, struct mac *mac_p); } -387 MSTD BSD { int __mac_get_file(const char *path_p, struct mac *mac_p); } +387 MSTD BSD { int __mac_get_file(const char *path_p, \ + struct mac *mac_p); } 388 MSTD BSD { int __mac_set_fd(int fd, struct mac *mac_p); } -389 MSTD BSD { int __mac_set_file(const char *path_p, struct mac *mac_p); } +389 MSTD BSD { int __mac_set_file(const char *path_p, \ + struct mac *mac_p); } 390 STD BSD { int kenv(int what, const char *name, char *value, \ int len); } 391 STD BSD { int lchflags(const char *path, int flags); } ==== //depot/projects/trustedbsd/mac/sys/kern/vnode_if.src#11 (text+ko) ==== @@ -31,7 +31,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.src 8.12 (Berkeley) 5/14/95 -# $FreeBSD: src/sys/kern/vnode_if.src,v 1.53 2002/07/30 08:50:52 jeff Exp $ +# $FreeBSD: src/sys/kern/vnode_if.src,v 1.54 2002/07/30 22:15:09 rwatson Exp $ # # ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#139 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#103 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/mbuf.h,v 1.97 2002/07/30 18:28:58 rwatson Exp $ + * $FreeBSD: src/sys/sys/mbuf.h,v 1.98 2002/07/30 22:03:57 rwatson Exp $ */ #ifndef _SYS_MBUF_H_ @@ -40,6 +40,12 @@ #include /* + * XXXMAC: Possibly this recursive include is a bad idea, but a lot + * of code exists that assumes it is sufficient to include just mbuf.h + */ +#include + +/* * Mbufs are of a single size, MSIZE (machine/param.h), which * includes overhead. An mbuf may add a single "mbuf cluster" of size * MCLBYTES (also in machine/param.h), which has no additional overhead @@ -87,7 +93,7 @@ int csum_flags; /* flags regarding checksum */ int csum_data; /* data field used by csum routines */ struct mbuf *aux; /* extra data buffer; ipsec/others */ - struct label label; /* label of data in packet */ + struct label label; /* MAC label of data in packet */ }; /* ==== //depot/projects/trustedbsd/mac/sys/sys/mount.h#16 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mount.h 8.21 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/sys/mount.h,v 1.132 2002/07/09 22:50:29 mux Exp $ + * $FreeBSD: src/sys/sys/mount.h,v 1.133 2002/07/30 22:22:35 rwatson Exp $ */ #ifndef _SYS_MOUNT_H_ @@ -152,6 +152,8 @@ time_t mnt_time; /* last time written*/ u_int mnt_iosize_max; /* max IO request size */ struct netexport *mnt_export; /* export list */ + struct label mnt_mntlabel; /* MAC label for the mount */ + struct label mnt_fslabel; /* MAC label for the fs */ }; #endif /* _KERNEL */ ==== //depot/projects/trustedbsd/mac/sys/sys/pipe.h#4 (text+ko) ==== @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file if the above conditions * are met. * - * $FreeBSD: src/sys/sys/pipe.h,v 1.18 2002/02/27 07:35:59 alfred Exp $ + * $FreeBSD: src/sys/sys/pipe.h,v 1.19 2002/07/30 22:33:28 rwatson Exp $ */ #ifndef _SYS_PIPE_H_ @@ -28,6 +28,7 @@ #include /* for struct timespec */ #include /* for struct selinfo */ #include /* for vm_page_t */ +#include /* for struct label */ #include /* for PAGE_SIZE */ #endif /* _KERNEL */ #include /* for struct label */ @@ -107,7 +108,7 @@ struct pipe *pipe_peer; /* link with other direction */ u_int pipe_state; /* pipe status info */ int pipe_busy; /* busy flag, mostly to handle rundown sanely */ - struct label *pipe_label; /* pipe MAC label */ + struct label *pipe_label; /* pipe MAC label - shared */ struct mtx *pipe_mtxp; /* shared mutex between both pipes */ }; ==== //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#19 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)socketvar.h 8.3 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/socketvar.h,v 1.88 2002/07/27 19:54:15 rwatson Exp $ + * $FreeBSD: src/sys/sys/socketvar.h,v 1.89 2002/07/30 22:39:28 rwatson Exp $ */ #ifndef _SYS_SOCKETVAR_H_ @@ -123,8 +123,8 @@ void (*so_upcall)(struct socket *, void *, int); void *so_upcallarg; struct ucred *so_cred; /* user credentials */ - struct label so_label; /* socket MAC label */ - struct label so_peerlabel; /* socket peer MAC label */ + struct label so_label; /* MAC label for socket */ + struct label so_peerlabel; /* cached MAC label for socket peer */ /* NB: generation count must not be first; easiest to make it last. */ so_gen_t so_gencnt; /* generation count */ void *so_emuldata; /* private data for emulators */ ==== //depot/projects/trustedbsd/mac/sys/sys/ucred.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ucred.h 8.4 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/ucred.h,v 1.41 2002/07/27 16:51:00 jhb Exp $ + * $FreeBSD: src/sys/sys/ucred.h,v 1.42 2002/07/30 22:28:28 rwatson Exp $ */ #ifndef _SYS_UCRED_H_ @@ -40,6 +40,14 @@ #include /* + * XXXMAC: Recursively include mac.h due to an API assumption that it + * it is sufficient to include types.h and ucred.h to have a defined + * struct ucred. This should be changed so that struct ucred is not + * exported to userland via _KERNEL. + */ +#include + +/* * Credentials. * * Please do not inspect cr_uid directly to determine superuserness. @@ -59,7 +67,7 @@ struct uidinfo *cr_ruidinfo; /* per ruid resource consumption */ struct prison *cr_prison; /* jail(4) */ #define cr_endcopy cr_label - struct label cr_label; /* mandatory access control */ + struct label cr_label; /* MAC label */ struct mtx *cr_mtxp; /* protect refcount */ }; #define NOCRED ((struct ucred *)0) /* no credential available */ ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#36 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $FreeBSD: src/sys/sys/vnode.h,v 1.195 2002/07/30 09:57:37 jeff Exp $ + * $FreeBSD: src/sys/sys/vnode.h,v 1.196 2002/07/30 22:08:12 rwatson Exp $ */ #ifndef _SYS_VNODE_H_ ==== //depot/projects/trustedbsd/mac/usr.sbin/mergemaster/mergemaster.8#6 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.23 2002/07/14 14:44:15 charnier Exp $ +.\" $FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.24 2002/07/30 21:04:09 blackend Exp $ .\" .Dd February 5, 2001 .Dt MERGEMASTER 8 @@ -347,7 +347,7 @@ .Pp .Pa /usr/src/etc/Makefile .Rs -.%O http://www.FreeBSD.org/handbook/makeworld.html +.%O http://www.FreeBSD.org/doc/handbook/makeworld.html .%T The Cutting Edge (using make world) .%A Nik Clayton .Re ==== //depot/projects/trustedbsd/mac/usr.sbin/ppp/ppp.8.m4#9 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.sbin/ppp/ppp.8.m4,v 1.297 2002/06/12 23:45:15 brian Exp $ +.\" $FreeBSD: src/usr.sbin/ppp/ppp.8.m4,v 1.298 2002/07/30 21:04:21 blackend Exp $ .\" .Dd September 20, 1995 .Dt PPP 8 @@ -5774,9 +5774,9 @@ The following URLs contain useful information: .Bl -bullet -compact .It -http://www.FreeBSD.org/FAQ/userppp.html +http://www.FreeBSD.org/doc/faq/ppp.html .It -http://www.FreeBSD.org/handbook/userppp.html +http://www.FreeBSD.org/doc/handbook/userppp.html .El .Pp .El To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 15:56: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CCC737B401; Tue, 30 Jul 2002 15:55:59 -0700 (PDT) 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 C869737B400 for ; Tue, 30 Jul 2002 15:55:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 682BB43E42 for ; Tue, 30 Jul 2002 15:55:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UMtwJU089708 for ; Tue, 30 Jul 2002 15:55:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UMtwm9089705 for perforce@freebsd.org; Tue, 30 Jul 2002 15:55:58 -0700 (PDT) Date: Tue, 30 Jul 2002 15:55:58 -0700 (PDT) Message-Id: <200207302255.g6UMtwm9089705@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15240 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15240 Change 15240 by rwatson@rwatson_tislabs on 2002/07/30 15:55:51 label entry in structure moved during commit to base tree, remove duplicates from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mount.h#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mount.h#17 (text+ko) ==== @@ -139,8 +139,6 @@ struct vnodelst mnt_nvnodelist; /* list of vnodes this mount */ struct vnodelst mnt_reservedvnlist; /* (future) dirty vnode list */ struct lock mnt_lock; /* mount structure lock */ - struct label mnt_mntlabel; /* label for the mount itself */ - struct label mnt_fslabel; /* label for file system */ int mnt_writeopcount; /* write syscalls in progress */ int mnt_flag; /* flags shared with user */ struct vfsoptlist *mnt_opt; /* current mount options */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 15:58: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4405437B405; Tue, 30 Jul 2002 15:58:02 -0700 (PDT) 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 F20C937B400 for ; Tue, 30 Jul 2002 15:58:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7BF5643E31 for ; Tue, 30 Jul 2002 15:58:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UMw1JU089888 for ; Tue, 30 Jul 2002 15:58:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UMw1rj089885 for perforce@freebsd.org; Tue, 30 Jul 2002 15:58:01 -0700 (PDT) Date: Tue, 30 Jul 2002 15:58:01 -0700 (PDT) Message-Id: <200207302258.g6UMw1rj089885@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15241 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15241 Change 15241 by rwatson@rwatson_tislabs on 2002/07/30 15:57:06 Remove dup mac.h include from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#14 (text+ko) ==== @@ -37,8 +37,6 @@ #ifndef _SYS_MBUF_H_ #define _SYS_MBUF_H_ -#include - /* * XXXMAC: Possibly this recursive include is a bad idea, but a lot * of code exists that assumes it is sufficient to include just mbuf.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 15:58: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B48537B407; Tue, 30 Jul 2002 15:58:03 -0700 (PDT) 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 2190737B401 for ; Tue, 30 Jul 2002 15:58:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD64743E3B for ; Tue, 30 Jul 2002 15:58:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UMw1JU089902 for ; Tue, 30 Jul 2002 15:58:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UMw1Qw089892 for perforce@freebsd.org; Tue, 30 Jul 2002 15:58:01 -0700 (PDT) Date: Tue, 30 Jul 2002 15:58:01 -0700 (PDT) Message-Id: <200207302258.g6UMw1Qw089892@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15242 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15242 Change 15242 by rwatson@rwatson_tislabs on 2002/07/30 15:57:57 Remove dup #include mac.h due to integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/pipe.h#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/pipe.h#5 (text+ko) ==== @@ -30,8 +30,7 @@ #include /* for vm_page_t */ #include /* for struct label */ #include /* for PAGE_SIZE */ -#endif /* _KERNEL */ -#include /* for struct label */ +#endif /* * Pipe buffer size, keep moderate in value, pipes take kva space. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 15:59: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84BB537B405; Tue, 30 Jul 2002 15:59:04 -0700 (PDT) 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 0E32137B401 for ; Tue, 30 Jul 2002 15:59:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C01F43E4A for ; Tue, 30 Jul 2002 15:59:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6UMx3JU090023 for ; Tue, 30 Jul 2002 15:59:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6UMx3Kw090020 for perforce@freebsd.org; Tue, 30 Jul 2002 15:59:03 -0700 (PDT) Date: Tue, 30 Jul 2002 15:59:03 -0700 (PDT) Message-Id: <200207302259.g6UMx3Kw090020@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15243 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15243 Change 15243 by rwatson@rwatson_tislabs on 2002/07/30 15:58:39 Remove dup include mac.h from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/ucred.h#15 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/ucred.h#15 (text+ko) ==== @@ -37,8 +37,6 @@ #ifndef _SYS_UCRED_H_ #define _SYS_UCRED_H_ -#include - /* * XXXMAC: Recursively include mac.h due to an API assumption that it * it is sufficient to include types.h and ucred.h to have a defined To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 17: 8:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFC2E37B401; Tue, 30 Jul 2002 17:08:32 -0700 (PDT) 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 4395737B400 for ; Tue, 30 Jul 2002 17:08:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D30C643E42 for ; Tue, 30 Jul 2002 17:08:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V08VJU005126 for ; Tue, 30 Jul 2002 17:08:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V08Ub7005120 for perforce@freebsd.org; Tue, 30 Jul 2002 17:08:30 -0700 (PDT) Date: Tue, 30 Jul 2002 17:08:30 -0700 (PDT) Message-Id: <200207310008.g6V08Ub7005120@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15250 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15250 Change 15250 by rwatson@rwatson_tislabs on 2002/07/30 17:08:16 Trickle-down IFC more TrustedBSD MAC features back into the TrustedBSD branch. Affected files ... .. //depot/projects/trustedbsd/base/sys/dev/usb/if_aue.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs.h#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs_data.h#15 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs.h#5 integrate .. //depot/projects/trustedbsd/base/sys/net/bpfdesc.h#3 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_var.h#6 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/dev/usb/if_aue.c#9 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.61 2002/07/09 16:45:03 joe Exp $ + * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.62 2002/07/30 23:30:14 joe Exp $ */ /* @@ -99,7 +99,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.61 2002/07/09 16:45:03 joe Exp $"; + "$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.62 2002/07/30 23:30:14 joe Exp $"; #endif /* @@ -114,6 +114,7 @@ }; Static const struct aue_type aue_devs[] = { + {{ USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B}, PII }, {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1}, PNA|PII }, {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX2}, PII }, {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UFE1000}, LSYS }, @@ -129,6 +130,7 @@ {{ USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001}, PII }, {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS}, PNA }, {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII}, PII }, + {{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN}, PII }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100}, 0 }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBLP100}, PNA }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBEL100}, 0 }, ==== //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#15 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uhci.c,v 1.160 2002/05/28 12:42:39 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.122 2002/05/28 20:51:43 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.123 2002/07/30 23:26:22 iedowse Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -581,32 +581,8 @@ usbd_status uhci_allocm(struct usbd_bus *bus, usb_dma_t *dma, u_int32_t size) { - struct uhci_softc *sc = (struct uhci_softc *)bus; - u_int32_t n; - - /* - * XXX - * Since we are allocating a buffer we can assume that we will - * need TDs for it. Since we don't want to allocate those from - * an interrupt context, we allocate them here and free them again. - * This is no guarantee that we'll get the TDs next time... - */ - n = size / 8; - if (n > 16) { - u_int32_t i; - uhci_soft_td_t **stds; - DPRINTF(("uhci_allocm: get %d TDs\n", n)); - stds = malloc(sizeof(uhci_soft_td_t *) * n, M_TEMP, - M_WAITOK|M_ZERO); - for(i=0; i < n; i++) - stds[i] = uhci_alloc_std(sc); - for(i=0; i < n; i++) - if (stds[i] != NULL) - uhci_free_std(sc, stds[i]); - free(stds, M_TEMP); - } - - return (usb_allocmem(&sc->sc_bus, size, 0, dma)); + return (usb_allocmem(&((struct uhci_softc *)bus)->sc_bus, size, 0, + dma)); } void ==== //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#15 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.95 2002/07/30 11:02:35 sobomax Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.96 2002/07/30 23:30:15 joe Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -460,6 +460,7 @@ /* Belkin products */ /*product BELKIN F5U111 0x???? F5U111 Ethernet adapter*/ product BELKIN2 F5U002 0x0002 F5U002 Parallel printer adapter +product BELKIN USB2LAN 0x0121 USB to LAN Converter /* Billionton products */ product BILLIONTON USB100 0x0986 USB100N 10/100 FastEthernet Adapter ==== //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs.h#15 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.107 2002/07/30 11:03:50 sobomax Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.108 2002/07/30 23:30:56 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.95 2002/07/30 11:02:35 sobomax Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.96 2002/07/30 23:30:15 joe Exp */ /* @@ -467,6 +467,7 @@ /* Belkin products */ /*product BELKIN F5U111 0x???? F5U111 Ethernet adapter*/ #define USB_PRODUCT_BELKIN2_F5U002 0x0002 /* F5U002 Parallel printer adapter */ +#define USB_PRODUCT_BELKIN_USB2LAN 0x0121 /* USB to LAN Converter */ /* Billionton products */ #define USB_PRODUCT_BILLIONTON_USB100 0x0986 /* USB100N 10/100 FastEthernet Adapter */ ==== //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs_data.h#15 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.107 2002/07/30 11:03:50 sobomax Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.108 2002/07/30 23:30:56 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.95 2002/07/30 11:02:35 sobomax Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.96 2002/07/30 23:30:15 joe Exp */ /* @@ -430,6 +430,12 @@ "F5U002 Parallel printer adapter", }, { + USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN, + 0, + "Belkin Components", + "USB to LAN Converter", + }, + { USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100, 0, "Billionton Systems", ==== //depot/projects/trustedbsd/base/sys/fs/devfs/devfs.h#5 (text+ko) ==== @@ -33,7 +33,7 @@ * @(#)kernfs.h 8.6 (Berkeley) 3/29/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs.h 1.14 * - * $FreeBSD: src/sys/fs/devfs/devfs.h,v 1.11 2002/07/28 06:57:57 dd Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs.h,v 1.12 2002/07/30 23:12:37 rwatson Exp $ */ #ifndef _FS_DEVFS_DEVFS_H_ @@ -159,6 +159,7 @@ mode_t de_mode; uid_t de_uid; gid_t de_gid; + struct label de_label; struct timespec de_atime; struct timespec de_mtime; struct timespec de_ctime; ==== //depot/projects/trustedbsd/base/sys/net/bpfdesc.h#3 (text+ko) ==== @@ -37,13 +37,14 @@ * * @(#)bpfdesc.h 8.1 (Berkeley) 6/10/93 * - * $FreeBSD: src/sys/net/bpfdesc.h,v 1.19 2001/12/14 22:17:54 jdp Exp $ + * $FreeBSD: src/sys/net/bpfdesc.h,v 1.20 2002/07/30 23:03:29 rwatson Exp $ */ #ifndef _NET_BPFDESC_H_ #define _NET_BPFDESC_H_ #include +#include #include /* @@ -92,6 +93,7 @@ #endif struct mtx bd_mtx; /* mutex for this descriptor */ struct callout bd_callout; /* for BPF timeouts with select */ + struct label bd_label; /* MAC label for descriptor */ }; /* Values for bd_state */ ==== //depot/projects/trustedbsd/base/sys/net/if_var.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_var.h,v 1.46 2002/05/07 18:11:55 imp Exp $ + * $FreeBSD: src/sys/net/if_var.h,v 1.47 2002/07/30 23:06:07 rwatson Exp $ */ #ifndef _NET_IF_VAR_H_ @@ -74,6 +74,7 @@ struct ether_header; #endif +#include /* struct label */ #include /* get TAILQ macros */ #ifdef _KERNEL @@ -174,6 +175,7 @@ struct ifqueue *if_poll_slowq; /* input queue for slow devices */ struct ifprefixhead if_prefixhead; /* list of prefixes per if */ u_int8_t *if_broadcastaddr; /* linklevel broadcast bytestring */ + struct label if_label; /* interface MAC label */ }; typedef void if_init_f_t(void *); ==== //depot/projects/trustedbsd/base/sys/netinet/ip_var.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/ip_var.h,v 1.63 2002/07/20 22:46:20 rwatson Exp $ + * $FreeBSD: src/sys/netinet/ip_var.h,v 1.64 2002/07/30 23:09:20 rwatson Exp $ */ #ifndef _NETINET_IP_VAR_H_ @@ -68,6 +68,7 @@ u_int32_t ipq_div_info; /* ipfw divert port & flags */ u_int16_t ipq_div_cookie; /* ipfw divert cookie */ #endif + struct label ipq_label; /* MAC label */ }; #endif /* _KERNEL */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 17:13:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 947A337B401; Tue, 30 Jul 2002 17:13:39 -0700 (PDT) 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 3708737B400 for ; Tue, 30 Jul 2002 17:13:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA6F343E42 for ; Tue, 30 Jul 2002 17:13:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V0DcJU005806 for ; Tue, 30 Jul 2002 17:13:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V0Dciv005803 for perforce@freebsd.org; Tue, 30 Jul 2002 17:13:38 -0700 (PDT) Date: Tue, 30 Jul 2002 17:13:38 -0700 (PDT) Message-Id: <200207310013.g6V0Dciv005803@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15251 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15251 Change 15251 by rwatson@rwatson_tislabs on 2002/07/30 17:13:17 Trickle-down MFC the MAC changes back from the FreeBSD tree. Affected files ... .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs_data.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/net/bpfdesc.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_var.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#8 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.61 2002/07/09 16:45:03 joe Exp $ + * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.62 2002/07/30 23:30:14 joe Exp $ */ /* @@ -99,7 +99,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.61 2002/07/09 16:45:03 joe Exp $"; + "$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.62 2002/07/30 23:30:14 joe Exp $"; #endif /* @@ -114,6 +114,7 @@ }; Static const struct aue_type aue_devs[] = { + {{ USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B}, PII }, {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1}, PNA|PII }, {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX2}, PII }, {{ USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UFE1000}, LSYS }, @@ -129,6 +130,7 @@ {{ USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001}, PII }, {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS}, PNA }, {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII}, PII }, + {{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN}, PII }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100}, 0 }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBLP100}, PNA }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBEL100}, 0 }, ==== //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uhci.c,v 1.160 2002/05/28 12:42:39 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.122 2002/05/28 20:51:43 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.123 2002/07/30 23:26:22 iedowse Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -581,32 +581,8 @@ usbd_status uhci_allocm(struct usbd_bus *bus, usb_dma_t *dma, u_int32_t size) { - struct uhci_softc *sc = (struct uhci_softc *)bus; - u_int32_t n; - - /* - * XXX - * Since we are allocating a buffer we can assume that we will - * need TDs for it. Since we don't want to allocate those from - * an interrupt context, we allocate them here and free them again. - * This is no guarantee that we'll get the TDs next time... - */ - n = size / 8; - if (n > 16) { - u_int32_t i; - uhci_soft_td_t **stds; - DPRINTF(("uhci_allocm: get %d TDs\n", n)); - stds = malloc(sizeof(uhci_soft_td_t *) * n, M_TEMP, - M_WAITOK|M_ZERO); - for(i=0; i < n; i++) - stds[i] = uhci_alloc_std(sc); - for(i=0; i < n; i++) - if (stds[i] != NULL) - uhci_free_std(sc, stds[i]); - free(stds, M_TEMP); - } - - return (usb_allocmem(&sc->sc_bus, size, 0, dma)); + return (usb_allocmem(&((struct uhci_softc *)bus)->sc_bus, size, 0, + dma)); } void ==== //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#15 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.95 2002/07/30 11:02:35 sobomax Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.96 2002/07/30 23:30:15 joe Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -460,6 +460,7 @@ /* Belkin products */ /*product BELKIN F5U111 0x???? F5U111 Ethernet adapter*/ product BELKIN2 F5U002 0x0002 F5U002 Parallel printer adapter +product BELKIN USB2LAN 0x0121 USB to LAN Converter /* Billionton products */ product BILLIONTON USB100 0x0986 USB100N 10/100 FastEthernet Adapter ==== //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs.h#15 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.107 2002/07/30 11:03:50 sobomax Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.108 2002/07/30 23:30:56 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.95 2002/07/30 11:02:35 sobomax Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.96 2002/07/30 23:30:15 joe Exp */ /* @@ -467,6 +467,7 @@ /* Belkin products */ /*product BELKIN F5U111 0x???? F5U111 Ethernet adapter*/ #define USB_PRODUCT_BELKIN2_F5U002 0x0002 /* F5U002 Parallel printer adapter */ +#define USB_PRODUCT_BELKIN_USB2LAN 0x0121 /* USB to LAN Converter */ /* Billionton products */ #define USB_PRODUCT_BILLIONTON_USB100 0x0986 /* USB100N 10/100 FastEthernet Adapter */ ==== //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs_data.h#15 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.107 2002/07/30 11:03:50 sobomax Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.108 2002/07/30 23:30:56 joe Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.95 2002/07/30 11:02:35 sobomax Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.96 2002/07/30 23:30:15 joe Exp */ /* @@ -430,6 +430,12 @@ "F5U002 Parallel printer adapter", }, { + USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN, + 0, + "Belkin Components", + "USB to LAN Converter", + }, + { USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100, 0, "Billionton Systems", ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs.h#6 (text+ko) ==== @@ -33,7 +33,7 @@ * @(#)kernfs.h 8.6 (Berkeley) 3/29/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs.h 1.14 * - * $FreeBSD: src/sys/fs/devfs/devfs.h,v 1.11 2002/07/28 06:57:57 dd Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs.h,v 1.12 2002/07/30 23:12:37 rwatson Exp $ */ #ifndef _FS_DEVFS_DEVFS_H_ @@ -159,7 +159,7 @@ mode_t de_mode; uid_t de_uid; gid_t de_gid; - struct label de_label; + struct label de_label; struct timespec de_atime; struct timespec de_mtime; struct timespec de_ctime; ==== //depot/projects/trustedbsd/mac/sys/net/bpfdesc.h#5 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)bpfdesc.h 8.1 (Berkeley) 6/10/93 * - * $FreeBSD: src/sys/net/bpfdesc.h,v 1.19 2001/12/14 22:17:54 jdp Exp $ + * $FreeBSD: src/sys/net/bpfdesc.h,v 1.20 2002/07/30 23:03:29 rwatson Exp $ */ #ifndef _NET_BPFDESC_H_ ==== //depot/projects/trustedbsd/mac/sys/net/if_var.h#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if_var.h,v 1.46 2002/05/07 18:11:55 imp Exp $ + * $FreeBSD: src/sys/net/if_var.h,v 1.47 2002/07/30 23:06:07 rwatson Exp $ */ #ifndef _NET_IF_VAR_H_ ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_var.h 8.2 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/netinet/ip_var.h,v 1.63 2002/07/20 22:46:20 rwatson Exp $ + * $FreeBSD: src/sys/netinet/ip_var.h,v 1.64 2002/07/30 23:09:20 rwatson Exp $ */ #ifndef _NETINET_IP_VAR_H_ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 17:52:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AB3037B401; Tue, 30 Jul 2002 17:52:28 -0700 (PDT) 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 1CC2637B400 for ; Tue, 30 Jul 2002 17:52:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4A7143E31 for ; Tue, 30 Jul 2002 17:52:27 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V0qRJU009144 for ; Tue, 30 Jul 2002 17:52:27 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V0qR1r009141 for perforce@freebsd.org; Tue, 30 Jul 2002 17:52:27 -0700 (PDT) Date: Tue, 30 Jul 2002 17:52:27 -0700 (PDT) Message-Id: <200207310052.g6V0qR1r009141@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15255 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15255 Change 15255 by rwatson@rwatson_tislabs on 2002/07/30 17:51:47 Trickle IFC recent MAC commits back into the TrustedBSD tree. Affected files ... .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#15 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vnops.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_vnops.c,v 1.30 2002/05/16 21:25:39 trhodes Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vnops.c,v 1.31 2002/07/31 00:42:57 semenu Exp $ * */ @@ -101,7 +101,9 @@ register struct ntnode *ip = FTONT(fp); struct uio *uio = ap->a_uio; struct ntfsmount *ntmp = ip->i_mp; - u_int64_t toread; + struct buf *bp; + daddr_t cn; + int resid, off, toread; int error; dprintf(("ntfs_read: ino: %d, off: %d resid: %d, segflg: %d\n",ip->i_number,(u_int32_t)uio->uio_offset,uio->uio_resid,uio->uio_segflg)); @@ -110,23 +112,36 @@ /* don't allow reading after end of file */ if (uio->uio_offset > fp->f_size) - toread = 0; - else - toread = min( uio->uio_resid, fp->f_size - uio->uio_offset ); + return (0); + + resid = min(uio->uio_resid, fp->f_size - uio->uio_offset); + + dprintf((", resid: %d\n", resid)); + + error = 0; + while (resid) { + cn = ntfs_btocn(uio->uio_offset); + off = ntfs_btocnoff(uio->uio_offset); + + toread = min(off + resid, ntfs_cntob(1)); - dprintf((", toread: %d\n",(u_int32_t)toread)); + error = bread(vp, cn, ntfs_cntob(1), NOCRED, &bp); + if (error) { + brelse(bp); + break; + } - if (toread == 0) - return (0); + error = uiomove(bp->b_data + off, toread - off, uio); + if(error) { + brelse(bp); + break; + } + brelse(bp); - error = ntfs_readattr(ntmp, ip, fp->f_attrtype, - fp->f_attrname, uio->uio_offset, toread, NULL, uio); - if (error) { - printf("ntfs_read: ntfs_readattr failed: %d\n",error); - return (error); + resid -= toread - off; } - return (0); + return (error); } static int ==== //depot/projects/trustedbsd/base/sys/kern/init_main.c#13 (text+ko) ==== @@ -39,10 +39,11 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/init_main.c,v 1.199 2002/07/20 02:56:11 peter Exp $ + * $FreeBSD: src/sys/kern/init_main.c,v 1.200 2002/07/31 00:39:19 rwatson Exp $ */ #include "opt_init_path.h" +#include "opt_mac.h" #include #include @@ -50,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -362,6 +364,9 @@ p->p_ucred->cr_uidinfo = uifind(0); p->p_ucred->cr_ruidinfo = uifind(0); p->p_ucred->cr_prison = NULL; /* Don't jail it. */ +#ifdef MAC + mac_create_proc0(p->p_ucred); +#endif td->td_ucred = crhold(p->p_ucred); /* Create procsig. */ @@ -657,6 +662,9 @@ initproc->p_flag |= P_SYSTEM; oldcred = initproc->p_ucred; crcopy(newcred, oldcred); +#ifdef MAC + mac_create_proc1(newcred); +#endif initproc->p_ucred = newcred; PROC_UNLOCK(initproc); crfree(oldcred); ==== //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.128 2002/07/30 16:52:21 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.118 2002/07/30 16:50:25 rwatson Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.129 2002/07/31 00:16:58 rwatson Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.119 2002/07/30 22:43:20 rwatson Exp */ #include "opt_compat.h" ==== //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#16 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_prot.c,v 1.161 2002/07/11 02:18:33 mini Exp $ + * $FreeBSD: src/sys/kern/kern_prot.c,v 1.162 2002/07/31 00:39:19 rwatson Exp $ */ /* @@ -45,6 +45,7 @@ */ #include "opt_compat.h" +#include "opt_mac.h" #include #include @@ -52,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -1670,6 +1672,9 @@ MALLOC(cr, struct ucred *, sizeof(*cr), M_CRED, M_WAITOK | M_ZERO); cr->cr_ref = 1; cr->cr_mtxp = mtx_pool_find(cr); +#ifdef MAC + mac_init_cred(cr); +#endif return (cr); } @@ -1714,6 +1719,9 @@ */ if (jailed(cr)) prison_free(cr->cr_prison); +#ifdef MAC + mac_destroy_cred(cr); +#endif FREE(cr, M_CRED); mtx_unlock(&Giant); } else { @@ -1750,6 +1758,9 @@ uihold(dest->cr_ruidinfo); if (jailed(dest)) prison_hold(dest->cr_prison); +#ifdef MAC + mac_create_cred(src, dest); +#endif } /* ==== //depot/projects/trustedbsd/base/sys/kern/syscalls.c#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.114 2002/07/30 16:52:22 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.118 2002/07/30 16:50:25 rwatson Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.115 2002/07/31 00:16:58 rwatson Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.119 2002/07/30 22:43:20 rwatson Exp */ char *syscallnames[] = { ==== //depot/projects/trustedbsd/base/sys/sys/mac.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/mac.h,v 1.1 2002/07/30 21:32:34 rwatson Exp $ + * $FreeBSD: src/sys/sys/mac.h,v 1.2 2002/07/31 00:03:26 rwatson Exp $ */ /* * Userland/kernel interface for Mandatory Access Control. @@ -184,7 +184,7 @@ * and various other messes. */ -#define MAC_MAX_POLICIES 8 +#define MAC_MAX_POLICIES 4 struct label { int l_flags; ==== //depot/projects/trustedbsd/base/sys/sys/syscall.h#14 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.113 2002/07/30 16:52:22 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.118 2002/07/30 16:50:25 rwatson Exp + * $FreeBSD: src/sys/sys/syscall.h,v 1.114 2002/07/31 00:16:58 rwatson Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.119 2002/07/30 22:43:20 rwatson Exp */ #define SYS_syscall 0 ==== //depot/projects/trustedbsd/base/sys/sys/syscall.mk#14 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.68 2002/07/30 16:52:22 rwatson Exp $ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.118 2002/07/30 16:50:25 rwatson Exp +# $FreeBSD: src/sys/sys/syscall.mk,v 1.69 2002/07/31 00:16:58 rwatson Exp $ +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.119 2002/07/30 22:43:20 rwatson Exp MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/trustedbsd/base/sys/sys/sysproto.h#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.105 2002/07/30 16:52:22 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.118 2002/07/30 16:50:25 rwatson Exp + * $FreeBSD: src/sys/sys/sysproto.h,v 1.106 2002/07/31 00:16:58 rwatson Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.119 2002/07/30 22:43:20 rwatson Exp */ #ifndef _SYS_SYSPROTO_H_ @@ -1075,26 +1075,26 @@ register_t dummy; }; struct __mac_get_proc_args { - char dummy_l_[PADL_(void *)]; void * dummy; char dummy_r_[PADR_(void *)]; + char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; }; struct __mac_set_proc_args { - char dummy_l_[PADL_(void *)]; void * dummy; char dummy_r_[PADR_(void *)]; + char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; }; struct __mac_get_fd_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char dummy_l_[PADL_(void *)]; void * dummy; char dummy_r_[PADR_(void *)]; + char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; }; struct __mac_get_file_args { char path_p_l_[PADL_(const char *)]; const char * path_p; char path_p_r_[PADR_(const char *)]; - char dummy_l_[PADL_(void *)]; void * dummy; char dummy_r_[PADR_(void *)]; + char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; }; struct __mac_set_fd_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char dummy_l_[PADL_(void *)]; void * dummy; char dummy_r_[PADR_(void *)]; + char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; }; struct __mac_set_file_args { char path_p_l_[PADL_(const char *)]; const char * path_p; char path_p_r_[PADR_(const char *)]; - char dummy_l_[PADL_(void *)]; void * dummy; char dummy_r_[PADR_(void *)]; + char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)]; }; struct kenv_args { char what_l_[PADL_(int)]; int what; char what_r_[PADR_(int)]; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 17:57:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 512B037B401; Tue, 30 Jul 2002 17:57:35 -0700 (PDT) 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 D83E037B400 for ; Tue, 30 Jul 2002 17:57:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78F9A43E31 for ; Tue, 30 Jul 2002 17:57:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V0vYJU009506 for ; Tue, 30 Jul 2002 17:57:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V0vYQT009501 for perforce@freebsd.org; Tue, 30 Jul 2002 17:57:34 -0700 (PDT) Date: Tue, 30 Jul 2002 17:57:34 -0700 (PDT) Message-Id: <200207310057.g6V0vYQT009501@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15256 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15256 Change 15256 by rwatson@rwatson_tislabs on 2002/07/30 17:57:23 Trickle IFC MAC changes back into the MAC tree. Preserve the policy count of 8 in the MAC tree, whereas the main tree uses 4. Fix one cosmetic #ifdef bug in the process. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vnops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_main.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#23 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#23 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#140 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#24 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#24 edit .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#25 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vnops.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs_vnops.c,v 1.30 2002/05/16 21:25:39 trhodes Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_vnops.c,v 1.31 2002/07/31 00:42:57 semenu Exp $ * */ @@ -101,7 +101,9 @@ register struct ntnode *ip = FTONT(fp); struct uio *uio = ap->a_uio; struct ntfsmount *ntmp = ip->i_mp; - u_int64_t toread; + struct buf *bp; + daddr_t cn; + int resid, off, toread; int error; dprintf(("ntfs_read: ino: %d, off: %d resid: %d, segflg: %d\n",ip->i_number,(u_int32_t)uio->uio_offset,uio->uio_resid,uio->uio_segflg)); @@ -110,23 +112,36 @@ /* don't allow reading after end of file */ if (uio->uio_offset > fp->f_size) - toread = 0; - else - toread = min( uio->uio_resid, fp->f_size - uio->uio_offset ); + return (0); + + resid = min(uio->uio_resid, fp->f_size - uio->uio_offset); + + dprintf((", resid: %d\n", resid)); + + error = 0; + while (resid) { + cn = ntfs_btocn(uio->uio_offset); + off = ntfs_btocnoff(uio->uio_offset); + + toread = min(off + resid, ntfs_cntob(1)); - dprintf((", toread: %d\n",(u_int32_t)toread)); + error = bread(vp, cn, ntfs_cntob(1), NOCRED, &bp); + if (error) { + brelse(bp); + break; + } - if (toread == 0) - return (0); + error = uiomove(bp->b_data + off, toread - off, uio); + if(error) { + brelse(bp); + break; + } + brelse(bp); - error = ntfs_readattr(ntmp, ip, fp->f_attrtype, - fp->f_attrname, uio->uio_offset, toread, NULL, uio); - if (error) { - printf("ntfs_read: ntfs_readattr failed: %d\n",error); - return (error); + resid -= toread - off; } - return (0); + return (error); } static int ==== //depot/projects/trustedbsd/mac/sys/kern/init_main.c#24 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/init_main.c,v 1.199 2002/07/20 02:56:11 peter Exp $ + * $FreeBSD: src/sys/kern/init_main.c,v 1.200 2002/07/31 00:39:19 rwatson Exp $ */ #include "opt_init_path.h" @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -369,6 +370,9 @@ p->p_ucred->cr_uidinfo = uifind(0); p->p_ucred->cr_ruidinfo = uifind(0); p->p_ucred->cr_prison = NULL; /* Don't jail it. */ +#ifdef MAC + mac_create_proc0(p->p_ucred); +#endif td->td_ucred = crhold(p->p_ucred); /* Create procsig. */ @@ -667,6 +671,9 @@ initproc->p_flag |= P_SYSTEM; oldcred = initproc->p_ucred; crcopy(newcred, oldcred); +#ifdef MAC + mac_create_proc1(newcred); +#endif initproc->p_ucred = newcred; PROC_UNLOCK(initproc); crfree(oldcred); ==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#23 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.118 2002/07/30 16:50:25 rwatson Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.119 2002/07/30 22:43:20 rwatson Exp */ #include "opt_compat.h" ==== //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#27 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_prot.c,v 1.161 2002/07/11 02:18:33 mini Exp $ + * $FreeBSD: src/sys/kern/kern_prot.c,v 1.162 2002/07/31 00:39:19 rwatson Exp $ */ /* @@ -1695,7 +1695,7 @@ cr->cr_mtxp = mtx_pool_find(cr); #ifdef MAC mac_init_cred(cr); -#endif /* MAC */ +#endif return (cr); } @@ -1742,7 +1742,7 @@ prison_free(cr->cr_prison); #ifdef MAC mac_destroy_cred(cr); -#endif /* MAC */ +#endif FREE(cr, M_CRED); mtx_unlock(&Giant); } else { @@ -1779,7 +1779,7 @@ uihold(dest->cr_ruidinfo); if (jailed(dest)) prison_hold(dest->cr_prison); -#if MAC +#ifdef MAC mac_create_cred(src, dest); #endif } ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#23 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.118 2002/07/30 16:50:25 rwatson Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.119 2002/07/30 22:43:20 rwatson Exp */ char *syscallnames[] = { ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#140 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/sys/sys/mac.h,v 1.2 2002/07/31 00:03:26 rwatson Exp $ */ /* * Userland/kernel interface for Mandatory Access Control. ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.h#24 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.118 2002/07/30 16:50:25 rwatson Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.119 2002/07/30 22:43:20 rwatson Exp */ #define SYS_syscall 0 ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#24 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. # $FreeBSD$ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.118 2002/07/30 16:50:25 rwatson Exp +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.119 2002/07/30 22:43:20 rwatson Exp MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#25 (text+ko) ==== @@ -3,7 +3,7 @@ * * DO NOT EDIT-- this file is automatically generated. * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.118 2002/07/30 16:50:25 rwatson Exp + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.119 2002/07/30 22:43:20 rwatson Exp */ #ifndef _SYS_SYSPROTO_H_ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 17:59:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0856837B401; Tue, 30 Jul 2002 17:59:38 -0700 (PDT) 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 B886C37B400 for ; Tue, 30 Jul 2002 17:59:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7696C43E42 for ; Tue, 30 Jul 2002 17:59:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V0xbJU009675 for ; Tue, 30 Jul 2002 17:59:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V0xbh4009672 for perforce@freebsd.org; Tue, 30 Jul 2002 17:59:37 -0700 (PDT) Date: Tue, 30 Jul 2002 17:59:37 -0700 (PDT) Message-Id: <200207310059.g6V0xbh4009672@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15257 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15257 Change 15257 by rwatson@rwatson_tislabs on 2002/07/30 17:59:25 Remove code dup'd in integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/init_main.c#25 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_main.c#25 (text+ko) ==== @@ -362,11 +362,6 @@ /* Create credentials. */ p->p_ucred = crget(); p->p_ucred->cr_ngroups = 1; /* group 0 */ - -#ifdef MAC - mac_create_proc0(p->p_ucred); -#endif - p->p_ucred->cr_uidinfo = uifind(0); p->p_ucred->cr_ruidinfo = uifind(0); p->p_ucred->cr_prison = NULL; /* Don't jail it. */ @@ -681,9 +676,6 @@ initproc->p_sflag |= PS_INMEM; mtx_unlock_spin(&sched_lock); cpu_set_fork_handler(FIRST_THREAD_IN_PROC(initproc), start_init, NULL); -#ifdef MAC - mac_create_proc1(initproc->p_ucred); -#endif } SYSINIT(init, SI_SUB_CREATE_INIT, SI_ORDER_FIRST, create_init, NULL) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 18:54:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0217737B405; Tue, 30 Jul 2002 18:54:46 -0700 (PDT) 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 AF0F037B400 for ; Tue, 30 Jul 2002 18:54:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D218543E6A for ; Tue, 30 Jul 2002 18:54:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V1sjJU018983 for ; Tue, 30 Jul 2002 18:54:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V1sjne018980 for perforce@freebsd.org; Tue, 30 Jul 2002 18:54:45 -0700 (PDT) Date: Tue, 30 Jul 2002 18:54:45 -0700 (PDT) Message-Id: <200207310154.g6V1sjne018980@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15261 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15261 Change 15261 by rwatson@rwatson_tislabs on 2002/07/30 18:54:28 Since there is no longer any MAC-specific code in vfs_default.c, remove the opt_mac include. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#9 (text+ko) ==== @@ -39,8 +39,6 @@ * $FreeBSD: src/sys/kern/vfs_default.c,v 1.63 2002/07/27 05:16:20 jeff Exp $ */ -#include "opt_mac.h" - #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 19:15:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3898037B400; Tue, 30 Jul 2002 19:15:13 -0700 (PDT) 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 BB98E37B401 for ; Tue, 30 Jul 2002 19:15:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA93043E42 for ; Tue, 30 Jul 2002 19:15:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V2FBJU025142 for ; Tue, 30 Jul 2002 19:15:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V2FBfC025139 for perforce@freebsd.org; Tue, 30 Jul 2002 19:15:11 -0700 (PDT) Date: Tue, 30 Jul 2002 19:15:11 -0700 (PDT) Message-Id: <200207310215.g6V2FBfC025139@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15264 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15264 Change 15264 by rwatson@rwatson_tislabs on 2002/07/30 19:14:19 Trickle IFC MAC changes back into the TrustedBSD source tree. Affected files ... .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#20 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/kern/init_main.c#14 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/init_main.c,v 1.200 2002/07/31 00:39:19 rwatson Exp $ + * $FreeBSD: src/sys/kern/init_main.c,v 1.201 2002/07/31 01:11:29 rwatson Exp $ */ #include "opt_init_path.h" @@ -519,6 +519,9 @@ VREF(p->p_fd->fd_rdir); FILEDESC_UNLOCK(p->p_fd); VOP_UNLOCK(rootvnode, 0, td); +#ifdef MAC + mac_create_root_mount(td->td_ucred, TAILQ_FIRST(&mountlist)); +#endif if (devfs_present) { /* ==== //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#17 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_prot.c,v 1.162 2002/07/31 00:39:19 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_prot.c,v 1.163 2002/07/31 00:48:24 rwatson Exp $ */ /* @@ -1379,6 +1379,10 @@ if ((error = prison_check(u1, u2))) return (error); +#ifdef MAC + if ((error = mac_check_cred_visible(u1, u2))) + return (error); +#endif if ((error = cr_seeotheruids(u1, u2))) return (error); return (0); @@ -1420,6 +1424,10 @@ error = prison_check(cred, proc->p_ucred); if (error) return (error); +#ifdef MAC + if ((error = mac_check_proc_signal(cred, proc, signum))) + return (error); +#endif error = cr_seeotheruids(cred, proc->p_ucred); if (error) return (error); @@ -1521,6 +1529,10 @@ return (0); if ((error = prison_check(td->td_ucred, p->p_ucred))) return (error); +#ifdef MAC + if ((error = mac_check_proc_sched(td->td_ucred, p))) + return (error); +#endif if ((error = cr_seeotheruids(td->td_ucred, p->p_ucred))) return (error); if (td->td_ucred->cr_ruid == p->p_ucred->cr_ruid) @@ -1578,6 +1590,10 @@ return (0); if ((error = prison_check(td->td_ucred, p->p_ucred))) return (error); +#ifdef MAC + if ((error = mac_check_proc_debug(td->td_ucred, p))) + return (error); +#endif if ((error = cr_seeotheruids(td->td_ucred, p->p_ucred))) return (error); @@ -1652,11 +1668,13 @@ error = prison_check(cred, so->so_cred); if (error) return (ENOENT); +#ifdef MAC + error = mac_check_socket_visible(cred, so); + if (error) + return (error); +#endif if (cr_seeotheruids(cred, so->so_cred)) return (ENOENT); -#ifdef MAC - /* XXX: error = mac_cred_check_seesocket() here. */ -#endif return (0); } ==== //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#11 (text+ko) ==== @@ -25,13 +25,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.24 2002/07/30 21:06:27 bmilekic Exp $ + * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.25 2002/07/31 01:42:19 rwatson Exp $ */ +#include "opt_mac.h" #include "opt_param.h" + #include #include #include +#include #include #include #include @@ -802,6 +805,11 @@ struct mb_bucket *bucket; u_int owner; +#ifdef MAC + if (type != MT_NOTMBUF && ((struct mbuf *)m)->m_flags & M_PKTHDR) + mac_destroy_mbuf((struct mbuf *)m); +#endif + bucket = mb_list->ml_btable[MB_BUCKET_INDX(m, mb_list)]; /* @@ -1254,8 +1262,15 @@ struct mbuf *mb; mb = (struct mbuf *)mb_alloc(&mb_list_mbuf, how, type, 0, NULL); - if (mb != NULL) + if (mb != NULL) { _mbhdr_setup(mb, type); +#ifdef MAC + if (mac_init_mbuf(mb, how) != 0) { + mb_free(&mb_list_mbuf, mb, type, 0, NULL); + return (NULL); + } +#endif + } return (mb); } @@ -1298,6 +1313,12 @@ mb = (struct mbuf *)mb_alloc(&mb_list_mbuf, how, type, 0, NULL); if (mb != NULL) { _mbhdr_setup(mb, type); +#ifdef MAC + if (mac_init_mbuf(mb, how) != 0) { + mb_free(&mb_list_mbuf, mb, type, 0, NULL); + return (NULL); + } +#endif bzero(mtod(mb, caddr_t), MHLEN); } return (mb); ==== //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#8 (text+ko) ==== @@ -31,15 +31,18 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.95 2002/07/30 18:28:58 rwatson Exp $ + * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.96 2002/07/31 01:51:34 rwatson Exp $ */ +#include "opt_mac.h" #include "opt_param.h" + #include #include #include #include #include +#include #include #include #include @@ -75,9 +78,17 @@ KASSERT(to->m_flags & M_PKTHDR, ("m_copy_pkthdr() called on non-header")); #endif +#ifdef MAC + if (to->m_flags & M_PKTHDR) + mac_destroy_mbuf(to); +#endif to->m_data = to->m_pktdat; to->m_flags = from->m_flags & M_COPYFLAGS; to->m_pkthdr = from->m_pkthdr; +#ifdef MAC + mac_init_mbuf(to, 1); /* XXXMAC no way to fail */ + mac_create_mbuf_from_mbuf(from, to); +#endif from->m_pkthdr.aux = NULL; } @@ -98,6 +109,9 @@ } if (m->m_flags & M_PKTHDR) { M_COPY_PKTHDR(mn, m); +#ifdef MAC + mac_destroy_mbuf(m); +#endif m->m_flags &= ~M_PKTHDR; } mn->m_next = m; ==== //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#3 (text+ko) ==== @@ -61,7 +61,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/vfs_mount.c,v 1.78 2002/07/29 06:26:55 jeff Exp $ + * $FreeBSD: src/sys/kern/vfs_mount.c,v 1.79 2002/07/31 01:11:29 rwatson Exp $ */ #include @@ -70,6 +70,7 @@ #include #include #include +#include #include #include #include @@ -86,6 +87,7 @@ #include "opt_rootdevname.h" #include "opt_ddb.h" +#include "opt_mac.h" #ifdef DDB #include @@ -643,8 +645,12 @@ mp->mnt_stat.f_owner = td->td_ucred->cr_uid; strncpy(mp->mnt_stat.f_mntonname, fspath, MNAMELEN); mp->mnt_iosize_max = DFLTPHYS; +#ifdef MAC + mac_init_mount(mp); + mac_create_mount(td->td_ucred, mp); +#endif VOP_UNLOCK(vp, 0, td); - mp->mnt_optnew = optlist; + mp->mnt_optnew = optlist; /* XXXMAC: should this be above? */ update: /* @@ -662,6 +668,9 @@ else { mp->mnt_vfc->vfc_refcount--; vfs_unbusy(mp, td); +#ifdef MAC + mac_destroy_mount(mp); +#endif free(mp, M_MOUNT); } vrele(vp); @@ -752,6 +761,9 @@ mtx_unlock(&vp->v_interlock); mp->mnt_vfc->vfc_refcount--; vfs_unbusy(mp, td); +#ifdef MAC + mac_destroy_mount(mp); +#endif free(mp, M_MOUNT); vput(vp); goto bad; @@ -999,6 +1011,10 @@ mp->mnt_stat.f_owner = td->td_ucred->cr_uid; strncpy(mp->mnt_stat.f_mntonname, fspath, MNAMELEN); mp->mnt_iosize_max = DFLTPHYS; +#ifdef MAC + mac_init_mount(mp); + mac_create_mount(td->td_ucred, mp); +#endif VOP_UNLOCK(vp, 0, td); update: /* @@ -1016,6 +1032,9 @@ else { mp->mnt_vfc->vfc_refcount--; vfs_unbusy(mp, td); +#ifdef MAC + mac_destroy_mount(mp); +#endif free(mp, M_MOUNT); } vrele(vp); @@ -1093,6 +1112,9 @@ mtx_unlock(&vp->v_interlock); mp->mnt_vfc->vfc_refcount--; vfs_unbusy(mp, td); +#ifdef MAC + mac_destroy_mount(mp); +#endif free(mp, M_MOUNT); vput(vp); } @@ -1304,6 +1326,9 @@ vrele(coveredvp); if (mp->mnt_kern_flag & MNTK_MWAIT) wakeup(mp); +#ifdef MAC + mac_destroy_mount(mp); +#endif if (mp->mnt_op->vfs_mount == NULL) vfs_freeopts(mp->mnt_opt); free(mp, M_MOUNT); @@ -1350,6 +1375,10 @@ mp->mnt_stat.f_mntonname[0] = '/'; mp->mnt_stat.f_mntonname[1] = 0; (void) copystr(devname, mp->mnt_stat.f_mntfromname, MNAMELEN - 1, 0); +#ifdef MAC + mac_init_mount(mp); + mac_create_mount(td->td_ucred, mp); +#endif *mpp = mp; return (0); } @@ -1502,6 +1531,9 @@ if (error != 0) { if (mp != NULL) { vfs_unbusy(mp, curthread); +#ifdef MAC + mac_destroy_mount(mp); +#endif free(mp, M_MOUNT); } printf("Root mount failed: %d\n", error); ==== //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#17 (text+ko) ==== @@ -36,13 +36,14 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.382 2002/07/29 06:26:55 jeff Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.384 2002/07/31 02:05:12 rwatson Exp $ */ /* * External virtual filesystem routines */ #include "opt_ddb.h" +#include "opt_mac.h" #include #include @@ -54,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -801,6 +803,9 @@ uma_zfree(vnodepoll_zone, vp->v_pollinfo); } vp->v_pollinfo = NULL; +#ifdef MAC + mac_destroy_vnode(vp); +#endif vp->v_flag = 0; vp->v_lastw = 0; vp->v_lasta = 0; @@ -827,6 +832,9 @@ vp->v_tag = tag; vp->v_op = vops; lockinit(&vp->v_lock, PVFS, "vnlock", VLKTIMEOUT, LK_NOPAUSE); +#ifdef MAC + mac_init_vnode(vp); +#endif insmntque(vp, mp); *vpp = vp; vp->v_usecount = 1; @@ -3218,7 +3226,7 @@ * vnode's type, "mode", uid and gid, requested access mode, credentials, * and optional call-by-reference privused argument allowing vaccess() * to indicate to the caller whether privilege was used to satisfy the - * request. Returns 0 on success, or an errno on failure. + * request (obsoleted). Returns 0 on success, or an errno on failure. */ int vaccess(type, file_mode, file_uid, file_gid, acc_mode, cred, privused) ==== //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#20 (text+ko) ==== @@ -36,11 +36,12 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.272 2002/07/30 18:48:25 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.273 2002/07/31 01:27:33 rwatson Exp $ */ /* For 4.3 integer FS ID compatibility */ #include "opt_compat.h" +#include "opt_mac.h" #include #include @@ -48,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -225,6 +227,11 @@ sp = &mp->mnt_stat; NDFREE(&nd, NDF_ONLY_PNBUF); vrele(nd.ni_vp); +#ifdef MAC + error = mac_check_mount_stat(td->td_ucred, mp); + if (error) + return (error); +#endif error = VFS_STATFS(mp, sp, td); if (error) return (error); @@ -267,6 +274,11 @@ fdrop(fp, td); if (mp == NULL) return (EBADF); +#ifdef MAC + error = mac_check_mount_stat(td->td_ucred, mp); + if (error) + return (error); +#endif sp = &mp->mnt_stat; error = VFS_STATFS(mp, sp, td); if (error) @@ -309,6 +321,12 @@ count = 0; mtx_lock(&mountlist_mtx); for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) { +#ifdef MAC + if (mac_check_mount_stat(td->td_ucred, mp) != 0) { + nmp = TAILQ_NEXT(mp, mnt_list); + continue; + } +#endif if (vfs_busy(mp, LK_NOWAIT, &mountlist_mtx, td)) { nmp = TAILQ_NEXT(mp, mnt_list); continue; @@ -3415,6 +3433,11 @@ mp = vp->v_mount; sp = &mp->mnt_stat; vput(vp); +#ifdef MAC + error = mac_check_mount_stat(td->td_ucred, mp); + if (error) + return (error); +#endif if ((error = VFS_STATFS(mp, sp, td)) != 0) return (error); sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 19:29:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F08A37B401; Tue, 30 Jul 2002 19:29:31 -0700 (PDT) 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 B46B237B400 for ; Tue, 30 Jul 2002 19:29:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BA9F43E3B for ; Tue, 30 Jul 2002 19:29:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V2TUJU026066 for ; Tue, 30 Jul 2002 19:29:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V2TTbp026063 for perforce@freebsd.org; Tue, 30 Jul 2002 19:29:29 -0700 (PDT) Date: Tue, 30 Jul 2002 19:29:29 -0700 (PDT) Message-Id: <200207310229.g6V2TTbp026063@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15265 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15265 Change 15265 by rwatson@rwatson_tislabs on 2002/07/30 19:29:03 Trickle IFC MAC changes back into the MAC tree. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/init_main.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#68 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_main.c#26 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/init_main.c,v 1.200 2002/07/31 00:39:19 rwatson Exp $ + * $FreeBSD: src/sys/kern/init_main.c,v 1.201 2002/07/31 01:11:29 rwatson Exp $ */ #include "opt_init_path.h" @@ -522,7 +522,7 @@ VOP_UNLOCK(rootvnode, 0, td); #ifdef MAC mac_create_root_mount(td->td_ucred, TAILQ_FIRST(&mountlist)); -#endif /* MAC */ +#endif if (devfs_present) { /* ==== //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#28 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_prot.c,v 1.162 2002/07/31 00:39:19 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_prot.c,v 1.163 2002/07/31 00:48:24 rwatson Exp $ */ /* @@ -1424,6 +1424,10 @@ error = prison_check(cred, proc->p_ucred); if (error) return (error); +#ifdef MAC + if ((error = mac_check_proc_signal(cred, proc, signum))) + return (error); +#endif error = cr_seeotheruids(cred, proc->p_ucred); if (error) return (error); @@ -1591,6 +1595,10 @@ return (0); if ((error = prison_check(td->td_ucred, p->p_ucred))) return (error); +#ifdef MAC + if ((error = mac_check_proc_debug(td->td_ucred, p))) + return (error); +#endif if ((error = cr_seeotheruids(td->td_ucred, p->p_ucred))) return (error); @@ -1671,13 +1679,13 @@ error = prison_check(cred, so->so_cred); if (error) return (ENOENT); - if (cr_seeotheruids(cred, so->so_cred)) - return (ENOENT); #ifdef MAC error = mac_check_socket_visible(cred, so); if (error) return (error); #endif + if (cr_seeotheruids(cred, so->so_cred)) + return (ENOENT); return (0); } ==== //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#17 (text+ko) ==== @@ -25,16 +25,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.24 2002/07/30 21:06:27 bmilekic Exp $ + * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.25 2002/07/31 01:42:19 rwatson Exp $ */ +#include "opt_mac.h" #include "opt_param.h" -#include "opt_mac.h" #include #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#11 (text+ko) ==== @@ -31,17 +31,19 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.95 2002/07/30 18:28:58 rwatson Exp $ + * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.96 2002/07/31 01:51:34 rwatson Exp $ */ #include "opt_mac.h" #include "opt_param.h" + #include #include #include #include #include #include +#include #include #include #include @@ -81,11 +83,15 @@ mac_destroy_mbuf(to); #endif #endif +#ifdef MAC + if (to->m_flags & M_PKTHDR) + mac_destroy_mbuf(to); +#endif to->m_data = to->m_pktdat; to->m_flags = from->m_flags & M_COPYFLAGS; to->m_pkthdr = from->m_pkthdr; #ifdef MAC - mac_init_mbuf(to, 1); + mac_init_mbuf(to, 1); /* XXXMAC no way to fail */ mac_create_mbuf_from_mbuf(from, to); #endif from->m_pkthdr.aux = NULL; @@ -108,6 +114,9 @@ } if (m->m_flags & M_PKTHDR) { M_COPY_PKTHDR(mn, m); +#ifdef MAC + mac_destroy_mbuf(m); +#endif m->m_flags &= ~M_PKTHDR; #ifdef MAC mac_destroy_mbuf(m); ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#4 (text+ko) ==== @@ -61,7 +61,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/vfs_mount.c,v 1.78 2002/07/29 06:26:55 jeff Exp $ + * $FreeBSD: src/sys/kern/vfs_mount.c,v 1.79 2002/07/31 01:11:29 rwatson Exp $ */ #include @@ -70,6 +70,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#30 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.382 2002/07/29 06:26:55 jeff Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.384 2002/07/31 02:05:12 rwatson Exp $ */ /* @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -805,7 +806,7 @@ vp->v_pollinfo = NULL; #ifdef MAC mac_destroy_vnode(vp); -#endif /* MAC */ +#endif vp->v_flag = 0; vp->v_lastw = 0; vp->v_lasta = 0; @@ -836,6 +837,9 @@ mac_init_vnode(vp); #endif lockinit(&vp->v_lock, PVFS, "vnlock", VLKTIMEOUT, LK_NOPAUSE); +#ifdef MAC + mac_init_vnode(vp); +#endif insmntque(vp, mp); *vpp = vp; vp->v_usecount = 1; ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#68 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.272 2002/07/30 18:48:25 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.273 2002/07/31 01:27:33 rwatson Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -50,6 +50,7 @@ #include #include #include +#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 19:32:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13EDF37B401; Tue, 30 Jul 2002 19:32:13 -0700 (PDT) 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 ABB6537B400 for ; Tue, 30 Jul 2002 19:32:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 53D0443E31 for ; Tue, 30 Jul 2002 19:32:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V2WCJU027422 for ; Tue, 30 Jul 2002 19:32:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V2WBUX027419 for perforce@freebsd.org; Tue, 30 Jul 2002 19:32:11 -0700 (PDT) Date: Tue, 30 Jul 2002 19:32:11 -0700 (PDT) Message-Id: <200207310232.g6V2WBUX027419@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15266 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15266 Change 15266 by rwatson@rwatson_tislabs on 2002/07/30 19:31:11 Trim dup include from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/init_main.c#27 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_main.c#27 (text+ko) ==== @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 19:36:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D802C37B401; Tue, 30 Jul 2002 19:36:19 -0700 (PDT) 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 7CC0037B400 for ; Tue, 30 Jul 2002 19:36:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BBDC43E3B for ; Tue, 30 Jul 2002 19:36:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V2aJJU027755 for ; Tue, 30 Jul 2002 19:36:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V2aInA027752 for perforce@freebsd.org; Tue, 30 Jul 2002 19:36:18 -0700 (PDT) Date: Tue, 30 Jul 2002 19:36:18 -0700 (PDT) Message-Id: <200207310236.g6V2aInA027752@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15267 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15267 Change 15267 by rwatson@rwatson_tislabs on 2002/07/30 19:36:06 Strategic diff reduction: mac.h no longer required since we don't do special MAC handling in the image activator structure. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/imgact_aout.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/imgact_aout.c#7 (text+ko) ==== @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 19:42:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A89137B405; Tue, 30 Jul 2002 19:42:40 -0700 (PDT) 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 A087737B400 for ; Tue, 30 Jul 2002 19:42:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 557AB43E65 for ; Tue, 30 Jul 2002 19:42:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V2gdJU028298 for ; Tue, 30 Jul 2002 19:42:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V2gdlA028295 for perforce@freebsd.org; Tue, 30 Jul 2002 19:42:39 -0700 (PDT) Date: Tue, 30 Jul 2002 19:42:39 -0700 (PDT) Message-Id: <200207310242.g6V2gdlA028295@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15268 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15268 Change 15268 by rwatson@rwatson_paprika on 2002/07/30 19:41:38 Trim dup checks from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#29 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#29 (text+ko) ==== @@ -1432,11 +1432,6 @@ if (error) return (error); -#ifdef MAC - if ((error = mac_check_proc_signal(cred, proc, signum))) - return (error); -#endif - /* * UNIX signal semantics depend on the status of the P_SUGID * bit on the target process. If the bit is set, then additional @@ -1602,12 +1597,6 @@ if ((error = cr_seeotheruids(td->td_ucred, p->p_ucred))) return (error); -#ifdef MAC - error = mac_check_proc_debug(td->td_ucred, p); - if (error) - return (error); -#endif - /* * Is p's group set a subset of td's effective group set? This * includes p's egid, group access list, rgid, and svgid. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 19:42:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A1C437B400; Tue, 30 Jul 2002 19:42:41 -0700 (PDT) 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 ECEB837B401 for ; Tue, 30 Jul 2002 19:42:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC6A543E65 for ; Tue, 30 Jul 2002 19:42:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V2gdJU028305 for ; Tue, 30 Jul 2002 19:42:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V2gd0n028302 for perforce@freebsd.org; Tue, 30 Jul 2002 19:42:39 -0700 (PDT) Date: Tue, 30 Jul 2002 19:42:39 -0700 (PDT) Message-Id: <200207310242.g6V2gd0n028302@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15269 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15269 Change 15269 by rwatson@rwatson_paprika on 2002/07/30 19:42:17 Remove dup mac.h includes from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#18 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#18 (text+ko) ==== @@ -33,14 +33,12 @@ #include #include -#include #include #include #include #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 19:46:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D993137B401; Tue, 30 Jul 2002 19:46:45 -0700 (PDT) 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 7A4BA37B400 for ; Tue, 30 Jul 2002 19:46:45 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3904E43E67 for ; Tue, 30 Jul 2002 19:46:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V2kjJU028665 for ; Tue, 30 Jul 2002 19:46:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V2kiaf028662 for perforce@freebsd.org; Tue, 30 Jul 2002 19:46:44 -0700 (PDT) Date: Tue, 30 Jul 2002 19:46:44 -0700 (PDT) Message-Id: <200207310246.g6V2kiaf028662@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15270 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15270 Change 15270 by rwatson@rwatson_paprika on 2002/07/30 19:45:52 Remove mbuf destroys due to integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#12 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#12 (text+ko) ==== @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -78,11 +77,7 @@ #if 0 KASSERT(to->m_flags & M_PKTHDR, ("m_copy_pkthdr() called on non-header")); -#ifdef MAC - if (to->m_flags & M_PKTHDR) - mac_destroy_mbuf(to); #endif -#endif #ifdef MAC if (to->m_flags & M_PKTHDR) mac_destroy_mbuf(to); @@ -118,9 +113,6 @@ mac_destroy_mbuf(m); #endif m->m_flags &= ~M_PKTHDR; -#ifdef MAC - mac_destroy_mbuf(m); -#endif } mn->m_next = m; m = mn; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 19:59:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A59D37B405; Tue, 30 Jul 2002 19:59:30 -0700 (PDT) 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 24D8737B400 for ; Tue, 30 Jul 2002 19:59:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7BC943E4A for ; Tue, 30 Jul 2002 19:59:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V2xTJU031720 for ; Tue, 30 Jul 2002 19:59:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V2xTU5031717 for perforce@freebsd.org; Tue, 30 Jul 2002 19:59:29 -0700 (PDT) Date: Tue, 30 Jul 2002 19:59:29 -0700 (PDT) Message-Id: <200207310259.g6V2xTU5031717@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15271 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15271 Change 15271 by rwatson@rwatson_paprika on 2002/07/30 19:58:30 Remove dup mac_init_vnode() due to integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#31 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#31 (text+ko) ==== @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -832,10 +831,6 @@ vp->v_type = VNON; vp->v_tag = tag; vp->v_op = vops; -#ifdef MAC - /* Initialize before it goes anywhere much. */ - mac_init_vnode(vp); -#endif lockinit(&vp->v_lock, PVFS, "vnlock", VLKTIMEOUT, LK_NOPAUSE); #ifdef MAC mac_init_vnode(vp); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Jul 30 21:27:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7968D37B401; Tue, 30 Jul 2002 21:27:22 -0700 (PDT) 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 0326337B400 for ; Tue, 30 Jul 2002 21:27:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A248943E6E for ; Tue, 30 Jul 2002 21:27:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6V4RLJU048067 for ; Tue, 30 Jul 2002 21:27:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6V4RLkq048064 for perforce@freebsd.org; Tue, 30 Jul 2002 21:27:21 -0700 (PDT) Date: Tue, 30 Jul 2002 21:27:21 -0700 (PDT) Message-Id: <200207310427.g6V4RLkq048064@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15274 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15274 Change 15274 by rwatson@rwatson_tislabs on 2002/07/30 21:26:53 Strategic diff reduction: mac.h no longer required as a dependency of mbuf.h. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_iface.c#6 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ip_input.c#4 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ksocket.c#11 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_lmi.c#5 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_mppc.c#7 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_one2many.c#6 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ppp.c#8 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_pppoe.c#8 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_pptpgre.c#7 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_rfc1490.c#6 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_sample.c#5 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_split.c#5 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_tee.c#6 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_tty.c#7 edit .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_vjc.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_iface.c#6 (text+ko) ==== @@ -55,7 +55,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_ip_input.c#4 (text+ko) ==== @@ -72,7 +72,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_ksocket.c#11 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_lmi.c#5 (text+ko) ==== @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_mppc.c#7 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_one2many.c#6 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_ppp.c#8 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_pppoe.c#8 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_pptpgre.c#7 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_rfc1490.c#6 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_sample.c#5 (text+ko) ==== @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_split.c#5 (text+ko) ==== @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_tee.c#6 (text+ko) ==== @@ -53,7 +53,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_tty.c#7 (text+ko) ==== @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/netgraph/ng_vjc.c#6 (text+ko) ==== @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 6:42:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5839137B401; Wed, 31 Jul 2002 06:42:20 -0700 (PDT) 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 CA15937B400 for ; Wed, 31 Jul 2002 06:42:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77B9043E3B for ; Wed, 31 Jul 2002 06:42:19 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VDgJJU050317 for ; Wed, 31 Jul 2002 06:42:19 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VDgJ75050314 for perforce@freebsd.org; Wed, 31 Jul 2002 06:42:19 -0700 (PDT) Date: Wed, 31 Jul 2002 06:42:19 -0700 (PDT) Message-Id: <200207311342.g6VDgJ75050314@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 15296 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15296 Change 15296 by jhb@jhb_zion on 2002/07/31 06:41:35 This option doesn't work anymore. Affected files ... .. //depot/projects/smpng/sys/sparc64/conf/SPARC64#6 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/conf/SPARC64#6 (text+ko) ==== @@ -60,7 +60,7 @@ makeoptions NO_WERROR=true makeoptions NO_MODULES=true -options PCI_ENABLE_IO_MODES +#options PCI_ENABLE_IO_MODES #options ATA_ENABLE_BUSMASTER options DEBUGGER_ON_POWERFAIL To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 6:52:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E7E837B401; Wed, 31 Jul 2002 06:52:34 -0700 (PDT) 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 D7D1937B400 for ; Wed, 31 Jul 2002 06:52:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93E5643E31 for ; Wed, 31 Jul 2002 06:52:33 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VDqXJU051435 for ; Wed, 31 Jul 2002 06:52:33 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VDqXOW051432 for perforce@freebsd.org; Wed, 31 Jul 2002 06:52:33 -0700 (PDT) Date: Wed, 31 Jul 2002 06:52:33 -0700 (PDT) Message-Id: <200207311352.g6VDqXOW051432@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 15299 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15299 Change 15299 by jhb@jhb_zion on 2002/07/31 06:51:40 Compiling is good. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#42 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#42 (text+ko) ==== @@ -317,8 +317,8 @@ MPASS(curthread != NULL); KASSERT(m->mtx_object->lo_class == &lock_class_mtx_sleep, - "mtx_lock() of spin mutex %s @ %s:%d", m->mtx_object->lo_name, - file, line); + ("mtx_lock() of spin mutex %s @ %s:%d", m->mtx_object->lo_name, + file, line)); _get_sleep_lock(m, curthread, opts, file, line); LOCK_LOG_LOCK("LOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); @@ -340,8 +340,8 @@ MPASS(curthread != NULL); KASSERT(m->mtx_object->lo_class == &lock_class_mtx_sleep, - "mtx_unlock() of spin mutex %s @ %s:%d", m->mtx_object->lo_name, - file, line); + ("mtx_unlock() of spin mutex %s @ %s:%d", m->mtx_object->lo_name, + file, line)); WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); @@ -410,8 +410,8 @@ MPASS(curthread != NULL); KASSERT(m->mtx_object->lo_class == &lock_class_mtx_sleep, - "mtx_lock_spin() of sleep mutex %s @ %s:%d", m->mtx_object->lo_name, - file, line); + ("mtx_lock_spin() of sleep mutex %s @ %s:%d", + m->mtx_object->lo_name, file, line)); #if defined(SMP) || LOCK_DEBUG > 0 _get_spin_lock(m, curthread, opts, file, line); #else @@ -428,8 +428,8 @@ MPASS(curthread != NULL); KASSERT(m->mtx_object->lo_class == &lock_class_mtx_sleep, - "mtx_unlock_spin() of sleep mutex %s @ %s:%d", - m->mtx_object->lo_name, file, line); + ("mtx_unlock_spin() of sleep mutex %s @ %s:%d", + m->mtx_object->lo_name, file, line)); WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 7: 9: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CF3C37B401; Wed, 31 Jul 2002 07:08:56 -0700 (PDT) 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 171E637B400 for ; Wed, 31 Jul 2002 07:08:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B07B043E6E for ; Wed, 31 Jul 2002 07:08:55 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VE8tJU058707 for ; Wed, 31 Jul 2002 07:08:55 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VE8ttL058704 for perforce@freebsd.org; Wed, 31 Jul 2002 07:08:55 -0700 (PDT) Date: Wed, 31 Jul 2002 07:08:55 -0700 (PDT) Message-Id: <200207311408.g6VE8ttL058704@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 15301 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15301 Change 15301 by jhb@jhb_zion on 2002/07/31 07:08:20 Bah, more bogons. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#43 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#43 (text+ko) ==== @@ -316,8 +316,8 @@ { MPASS(curthread != NULL); - KASSERT(m->mtx_object->lo_class == &lock_class_mtx_sleep, - ("mtx_lock() of spin mutex %s @ %s:%d", m->mtx_object->lo_name, + KASSERT(m->mtx_object.lo_class == &lock_class_mtx_sleep, + ("mtx_lock() of spin mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); _get_sleep_lock(m, curthread, opts, file, line); LOCK_LOG_LOCK("LOCK", &m->mtx_object, opts, m->mtx_recurse, file, @@ -339,8 +339,8 @@ { MPASS(curthread != NULL); - KASSERT(m->mtx_object->lo_class == &lock_class_mtx_sleep, - ("mtx_unlock() of spin mutex %s @ %s:%d", m->mtx_object->lo_name, + KASSERT(m->mtx_object.lo_class == &lock_class_mtx_sleep, + ("mtx_unlock() of spin mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, @@ -409,9 +409,9 @@ { MPASS(curthread != NULL); - KASSERT(m->mtx_object->lo_class == &lock_class_mtx_sleep, + KASSERT(m->mtx_object.lo_class == &lock_class_mtx_sleep, ("mtx_lock_spin() of sleep mutex %s @ %s:%d", - m->mtx_object->lo_name, file, line)); + m->mtx_object.lo_name, file, line)); #if defined(SMP) || LOCK_DEBUG > 0 _get_spin_lock(m, curthread, opts, file, line); #else @@ -427,9 +427,9 @@ { MPASS(curthread != NULL); - KASSERT(m->mtx_object->lo_class == &lock_class_mtx_sleep, + KASSERT(m->mtx_object.lo_class == &lock_class_mtx_sleep, ("mtx_unlock_spin() of sleep mutex %s @ %s:%d", - m->mtx_object->lo_name, file, line)); + m->mtx_object.lo_name, file, line)); WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 7:15:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 759AC37B401; Wed, 31 Jul 2002 07:14:06 -0700 (PDT) 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 F122037B400 for ; Wed, 31 Jul 2002 07:14:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B38C43E70 for ; Wed, 31 Jul 2002 07:14:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VEE3JU059368 for ; Wed, 31 Jul 2002 07:14:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VEE2DC059361 for perforce@freebsd.org; Wed, 31 Jul 2002 07:14:02 -0700 (PDT) Date: Wed, 31 Jul 2002 07:14:02 -0700 (PDT) Message-Id: <200207311414.g6VEE2DC059361@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15302 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15302 Change 15302 by rwatson@rwatson_tislabs on 2002/07/31 07:13:40 IFC to begin another day of wild MAC merging Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#19 integrate .. //depot/projects/trustedbsd/base/etc/printcap#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/fhopen.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_array.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#8 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#31 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsutil.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/inode.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/main.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass1.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass2.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snp.4#4 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ufm.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhub.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umodem.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ums.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/urio.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_port.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs_data.h#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvscom.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/md_var.h#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cluster.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#17 integrate .. //depot/projects/trustedbsd/base/sys/sys/file.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#18 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_subr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/sockstat/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.1#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.pl#3 delete .. //depot/projects/trustedbsd/base/usr.sbin/ppp/README.devel#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.297 2002/07/24 23:08:57 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.298 2002/07/31 03:56:03 jhb Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -126,8 +126,10 @@ TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} +TARGET_CPUTYPE?= ${CPUTYPE} .else TARGET?= ${TARGET_ARCH} +TARGET_CPUTYPE?= .endif .if make(buildworld) BUILD_ARCH!= sysctl -n hw.machine_arch @@ -184,13 +186,14 @@ INSTALL="sh ${.CURDIR}/tools/install.sh" BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ - -DNO_WERROR + -DNO_CPU_CFLAGS -DNO_WERROR # build-tool stage TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING +TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ + -DNO_CPU_CFLAGS # cross-tool stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB ==== //depot/projects/trustedbsd/base/etc/printcap#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)printcap 5.3 (Berkeley) 6/30/90 -# $FreeBSD: src/etc/printcap,v 1.11 2000/11/01 13:30:24 andreas Exp $ +# $FreeBSD: src/etc/printcap,v 1.12 2002/07/31 10:05:37 blackend Exp $ # # This enables a simple local "raw" printer, hooked up to the first @@ -22,7 +22,7 @@ # # Do also refer to the "printing" section of the handbook. # -# http://www.freebsd.org/handbook/printing.html +# http://www.freebsd.org/doc/handbook/printing.html # # A local copy can be found under # ==== //depot/projects/trustedbsd/base/lib/libc/sys/fhopen.2#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: fhopen.2,v 1.1 1999/06/30 01:32:15 wrstuden Exp $ -.\" $FreeBSD: src/lib/libc/sys/fhopen.2,v 1.11 2001/10/01 16:09:01 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/fhopen.2,v 1.12 2002/07/31 06:40:34 chris Exp $ .\" .\" Copyright (c) 1999 National Aeronautics & Space Administration .\" All rights reserved. @@ -130,7 +130,7 @@ .Fn fhstatfs functions first appeared in .Nx 1.5 -and was adapted to +and were adapted to .Fx 4.0 by Alfred Perlstein. .Sh AUTHORS ==== //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_array.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)xdr_array.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.10 2002/03/22 21:53:26 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.11 2002/07/31 12:50:28 darrenr Exp $"); /* * xdr_array.c, Generic XDR routines impelmentation. @@ -78,11 +78,12 @@ u_int nodesize; /* like strings, arrays are really counted arrays */ - if (! xdr_u_int(xdrs, sizep)) { + if (!xdr_u_int(xdrs, sizep)) { return (FALSE); } c = *sizep; - if ((c > maxsize) && (xdrs->x_op != XDR_FREE)) { + if ((c > maxsize && UINT_MAX/elsize < c) && + (xdrs->x_op != XDR_FREE)) { return (FALSE); } nodesize = c * elsize; @@ -152,7 +153,7 @@ elptr = basep; for (i = 0; i < nelem; i++) { - if (! (*xdr_elem)(xdrs, elptr)) { + if (!(*xdr_elem)(xdrs, elptr)) { return(FALSE); } elptr += elemsize; ==== //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#8 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.35 2002/07/25 17:41:47 yar Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.36 2002/07/31 10:55:31 yar Exp $"; #endif /* not lint */ #include @@ -1068,6 +1068,8 @@ #define MAXGLOBARGS 1000 +#define MAXASIZE 10240 /* Deny ASCII SIZE on files larger than that */ + struct tab { char *name; short token; @@ -1589,6 +1591,10 @@ reply(550, "%s: not a plain file.", filename); (void) fclose(fin); return; + } else if (stbuf.st_size > MAXASIZE) { + reply(550, "%s: too large for type A SIZE.", filename); + (void) fclose(fin); + return; } count = 0; ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#31 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.396 2002/07/30 04:32:14 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.399 2002/07/31 04:01:12 bmah Exp $ 2000 @@ -122,12 +122,12 @@ can be disabled by the NODEVFS kernel option. - The DEVFS "rule" subsystem has been introduced. DEVFS rules - permit the administrator to define certain properties of new devfs - nodes before they become visible to the userland. Both static (e.g., - /dev/speaker) and dynamic (e.g., + The &man.devfs.5; rule subsystem has been introduced. DEVFS rules + permit the administrator to define certain properties of new device + nodes before they become visible to the userland. Both static (e.g. + /dev/speaker) and dynamic (e.g. /dev/bpf*, some removable devices) nodes are - supported. Each DEVFS mount may have a different ruleset assigned to + supported. Each &man.devfs.5; mount may have a different ruleset assigned to it, permitting different policies to be implemented for things like jails. Rules and rulesets are manipulated with the &man.devfs.8; utility. @@ -333,6 +333,9 @@ use an AT keyboard if you are not using a serial console. &merged; + The uaudio driver, for USB audio devices, has been + added. + The &man.umodem.4; driver for USB modems has been added. Support is provided for the 3Com 5605 and Metricom Ricochet GS wireless USB modems. &merged; @@ -361,6 +364,9 @@ The USER_LDT kernel option is now activated by default. + The uvisor driver for connecting Handspring Visors via USB + has been added. + A VESA S3 linear framebuffer driver has been added. The &man.viapm.4; driver for VIA SMBus @@ -1493,7 +1499,7 @@ (ACPI), a multi-vendor standard for configuration and power management, has been added. This functionality has been provided by the Intel ACPI Component - Architecture project, as of the ACPI CA 20020611 + Architecture project, as of the ACPI CA 20020725 snapshot. Some backward compatability for applications using the older APM standard has been provided. @@ -2309,6 +2315,9 @@ With this change, properly-compiled KLD modules are now able to be profiled. + The gpt tool for manipulating EFI GPT + partitions has been added. + &man.growfs.8;, a utility for growing FFS filesystems, has been added. &man.ffsinfo.8;, a utility for dump all the meta-information of an existing filesystem, has also been @@ -2623,6 +2632,9 @@ manpages) or if the running user is root. + The mca utility, for decoding machine check + records, has been added. + The &man.mdmfs.8; command has been added; it is a wrapper around &man.mdconfig.8;, &man.disklabel.8;, &man.newfs.8;, and &man.mount.8; that mimics the command line option set of the @@ -3207,7 +3219,7 @@ net/freebsd-uucp. &man.unexpand.1; now supports a to - specify tabstabs analogous to &man.expand.1;. &merged; + specify tabstops analogous to &man.expand.1;. &merged; &man.units.1; has received some updates and bugfixes. &merged; @@ -3763,7 +3775,7 @@ OpenSSL OpenSSL has been updated to - 0.9.6c. + 0.9.6e. &merged; OpenSSL now has support for machine-dependent ASM optimizations, activated by the new ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsutil.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.15 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.16 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #include @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -360,11 +361,11 @@ if (read(fd, cp, (int)secsize) != secsize) { (void)lseek(fd, offset + i + secsize, 0); if (secsize != dev_bsize && dev_bsize != 1) - printf(" %lld (%lld),", - (long long)(blk * dev_bsize + i) / secsize, - (long long)blk + i / dev_bsize); + printf(" %jd (%jd),", + (intmax_t)(blk * dev_bsize + i) / secsize, + (intmax_t)blk + i / dev_bsize); else - printf(" %lld,", (long long)blk + i / dev_bsize); + printf(" %jd,", (intmax_t)blk + i / dev_bsize); errs++; } } @@ -399,7 +400,7 @@ for (cp = buf, i = 0; i < size; i += dev_bsize, cp += dev_bsize) if (write(fd, cp, (int)dev_bsize) != dev_bsize) { (void)lseek(fd, offset + i + dev_bsize, 0); - printf(" %lld,", (long long)blk + i / dev_bsize); + printf(" %jd,", (intmax_t)blk + i / dev_bsize); } printf("\n"); return; ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/inode.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.32 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.33 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #include @@ -562,7 +562,7 @@ printf("MODE=%o\n", DIP(dp, di_mode)); if (preen) printf("%s: ", cdevname); - printf("SIZE=%qu ", DIP(dp, di_size)); + printf("SIZE=%ju ", (uintmax_t)DIP(dp, di_size)); t = DIP(dp, di_mtime); p = ctime(&t); printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]); @@ -572,7 +572,7 @@ blkerror(ino_t ino, const char *type, ufs2_daddr_t blk) { - pfatal("%lld %s I=%lu", (intmax_t)blk, type, (u_long)ino); + pfatal("%jd %s I=%ju", (intmax_t)blk, type, (uintmax_t)ino); printf("\n"); switch (inoinfo(ino)->ino_state) { ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/main.c#9 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.34 2002/07/30 13:01:21 phk Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.35 2002/07/31 12:01:14 mux Exp $"); #include #include @@ -63,6 +63,7 @@ #include #include #include +#include #include #include "fsck.h" @@ -190,8 +191,9 @@ struct statfs *mntp; struct zlncnt *zlnp; ufs2_daddr_t blks; - int cylno, size, ret; + int cylno, ret; ino_t files; + size_t size; cdevname = filesys; if (debug && preen) @@ -372,11 +374,12 @@ pwarn("Reclaimed: %ld directories, %ld files, %lld fragments\n", countdirs, (long)files - countdirs, (long long)blks); } - pwarn("%ld files, %lld used, %llu free ", - (long)n_files, (long long)n_blks, - n_ffree + sblock.fs_frag * n_bfree); - printf("(%qu frags, %qu blocks, %.1f%% fragmentation)\n", - n_ffree, n_bfree, n_ffree * 100.0 / sblock.fs_dsize); + pwarn("%ld files, %jd used, %ju free ", + (long)n_files, (intmax_t)n_blks, + (uintmax_t)n_ffree + sblock.fs_frag * n_bfree); + printf("(%ju frags, %ju blocks, %.1f%% fragmentation)\n", + (uintmax_t)n_ffree, (uintmax_t)n_bfree, + n_ffree * 100.0 / sblock.fs_dsize); if (debug) { if (files < 0) printf("%d inodes missing\n", -files); ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass1.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)pass1.c 8.6 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.32 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.33 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #include @@ -48,6 +48,7 @@ #include #include +#include #include #include "fsck.h" @@ -228,7 +229,7 @@ DIP(dp, di_size) > sblock.fs_maxfilesize || (mode == IFDIR && DIP(dp, di_size) > MAXDIRSIZE)) { if (debug) - printf("bad size %qu:", DIP(dp, di_size)); + printf("bad size %ju:", (uintmax_t)DIP(dp, di_size)); goto unknown; } if (!preen && mode == IFMT && reply("HOLD BAD BLOCK") == 1) { @@ -240,7 +241,8 @@ if ((mode == IFBLK || mode == IFCHR || mode == IFIFO || mode == IFSOCK) && DIP(dp, di_size) != 0) { if (debug) - printf("bad special-file size %qu:", DIP(dp, di_size)); + printf("bad special-file size %ju:", + (uintmax_t)DIP(dp, di_size)); goto unknown; } if ((mode == IFBLK || mode == IFCHR) && @@ -252,8 +254,8 @@ ndb = howmany(DIP(dp, di_size), sblock.fs_bsize); if (ndb < 0) { if (debug) - printf("bad size %qu ndb %qu:", - DIP(dp, di_size), ndb); + printf("bad size %ju ndb %ju:", + (uintmax_t)DIP(dp, di_size), (uintmax_t)ndb); goto unknown; } if (mode == IFBLK || mode == IFCHR) @@ -281,8 +283,8 @@ for (j = ndb; ndb < NDADDR && j < NDADDR; j++) if (DIP(dp, di_db[j]) != 0) { if (debug) - printf("bad direct addr[%d]: %qu\n", j, - (ufs2_daddr_t)DIP(dp, di_db[j])); + printf("bad direct addr[%d]: %ju\n", j, + (uintmax_t)DIP(dp, di_db[j])); goto unknown; } for (j = 0, ndb -= NDADDR; ndb > 0; j++) @@ -290,8 +292,8 @@ for (; j < NIADDR; j++) if (DIP(dp, di_ib[j]) != 0) { if (debug) - printf("bad indirect addr: %qu\n", - DIP(dp, di_ib[j])); + printf("bad indirect addr: %ju\n", + (uintmax_t)DIP(dp, di_ib[j])); goto unknown; } if (ftypeok(dp) == 0) @@ -331,9 +333,9 @@ (void)ckinode(dp, idesc); idesc->id_entryno *= btodb(sblock.fs_fsize); if (DIP(dp, di_blocks) != idesc->id_entryno) { - pwarn("INCORRECT BLOCK COUNT I=%lu (%qu should be %qu)", - (u_long)inumber, DIP(dp, di_blocks), - idesc->id_entryno); + pwarn("INCORRECT BLOCK COUNT I=%lu (%ju should be %ju)", + (u_long)inumber, (uintmax_t)DIP(dp, di_blocks), + (uintmax_t)idesc->id_entryno); if (preen) printf(" (CORRECTED)\n"); else if (reply("CORRECT") == 0) @@ -346,8 +348,8 @@ cmd.value = idesc->id_number; cmd.size = idesc->id_entryno - DIP(dp, di_blocks); if (debug) - printf("adjblkcnt ino %qu amount %lld\n", - cmd.value, (long long)cmd.size); + printf("adjblkcnt ino %ju amount %lld\n", + (uintmax_t)cmd.value, (long long)cmd.size); if (sysctl(adjblkcnt, MIBSIZE, 0, 0, &cmd, sizeof cmd) == -1) rwerror("ADJUST INODE BLOCK COUNT", cmd.value); ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass2.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)pass2.c 8.9 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.19 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.20 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #include @@ -46,6 +46,7 @@ #include #include +#include #include #include "fsck.h" @@ -134,7 +135,7 @@ inpend = &inpsort[inplast]; for (inpp = inpsort; inpp < inpend; inpp++) { if (got_siginfo) { - printf("%s: phase 2: dir %d of %d (%d%%)\n", cdevname, + printf("%s: phase 2: dir %td of %d (%d%%)\n", cdevname, inpp - inpsort, (int)inplast, (int)((inpp - inpsort) * 100 / inplast)); got_siginfo = 0; @@ -153,13 +154,13 @@ } else if ((inp->i_isize & (DIRBLKSIZ - 1)) != 0) { getpathname(pathbuf, inp->i_number, inp->i_number); if (usedsoftdep) - pfatal("%s %s: LENGTH %d NOT MULTIPLE OF %d", - "DIRECTORY", pathbuf, inp->i_isize, - DIRBLKSIZ); + pfatal("%s %s: LENGTH %jd NOT MULTIPLE OF %d", + "DIRECTORY", pathbuf, + (intmax_t)inp->i_isize, DIRBLKSIZ); else - pwarn("%s %s: LENGTH %d NOT MULTIPLE OF %d", - "DIRECTORY", pathbuf, inp->i_isize, - DIRBLKSIZ); + pwarn("%s %s: LENGTH %jd NOT MULTIPLE OF %d", + "DIRECTORY", pathbuf, + (intmax_t)inp->i_isize, DIRBLKSIZ); if (preen) printf(" (ADJUSTED)\n"); inp->i_isize = roundup(inp->i_isize, DIRBLKSIZ); ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.34 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.35 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #define DKTYPENAMES @@ -52,6 +52,7 @@ #include #include #include +#include #include #include "fsck.h" @@ -269,8 +270,8 @@ inphead = (struct inoinfo **)calloc((unsigned)numdirs, sizeof(struct inoinfo *)); if (inpsort == NULL || inphead == NULL) { - printf("cannot alloc %u bytes for inphead\n", - (unsigned)numdirs * sizeof(struct inoinfo *)); + printf("cannot alloc %ju bytes for inphead\n", + (uintmax_t)numdirs * sizeof(struct inoinfo *)); goto badsb; } bufinit(); ==== //depot/projects/trustedbsd/base/share/man/man4/snp.4#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/share/man/man4/snp.4,v 1.22 2002/01/21 12:09:13 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/snp.4,v 1.23 2002/07/31 09:32:22 schweikh Exp $ .\" .Dd February 24, 1995 .Dt SNP 4 @@ -16,7 +16,7 @@ .Ft int .Fn ioctl fd FIONREAD &result .Sh DESCRIPTION -/dev/snp? are snoop devices which allow user to attach to any tty +/dev/snp? are snoop devices which allow users to attach to any tty and watch activities on it. The kernel must be compiled with .Cd "device snp" , @@ -27,13 +27,12 @@ .Pp To associate a given .Nm -device with a tty to be observed, open the +device with a tty to be observed, open the .Nm device and then use the SNPSTTY ioctl. -The argument passed to the IOCTL is the address of a variable of type +The argument passed to the ioctl is the address of a variable of type dev_t. -By setting the value of the variable pointed to -1, the user may detach -the snp device from a tty. +To detach the snp device from a tty use a pointer to a value of (dev_t)-1. .Pp The SNPGTTY ioctl returns information about the current tty attached to the open ==== //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#5 (text+ko) ==== @@ -1,10 +1,16 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.14 2002/07/27 22:15:42 jhb Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.15 2002/07/31 03:56:03 jhb Exp $ + +# Allow TARGET_CPUTYPE to override CPUTYPE to handle the cross-build case. + +.if defined(TARGET_CPUTYPE) +CPUTYPE = ${TARGET_CPUTYPE} +.endif # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but # may tune support for more advanced processors. -.if !defined(CPUTYPE) +.if !defined(CPUTYPE) || ${CPUTYPE} == "" . if ${MACHINE_ARCH} == "i386" _CPUCFLAGS = -mcpu=pentiumpro CPUTYPE = i386 @@ -43,11 +49,7 @@ . if ${MACHINE_ARCH} == "i386" . if ${CPUTYPE} == "k7" -. if defined(BOOTSTRAPPING) -_CPUCFLAGS = -march=k6 # gcc 2.95.x didn't support athlon -. else _CPUCFLAGS = -march=athlon -. endif . elif ${CPUTYPE} == "k6-2" _CPUCFLAGS = -march=k6 . elif ${CPUTYPE} == "k6" ==== //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.41 2001/01/23 14:04:13 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.2 2002/07/22 00:11:35 peter Exp $: */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.3 2002/07/31 13:33:55 joe Exp $: */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -66,6 +66,7 @@ #include #endif #include +#include #if defined(__NetBSD__) || defined(__OpenBSD__) #include @@ -89,6 +90,8 @@ #define DPRINTF(x) if (uaudiodebug) logprintf x #define DPRINTFN(n,x) if (uaudiodebug>(n)) logprintf x int uaudiodebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, uaudio, CTLFLAG_RW, + &uaudiodebug, 0, "uaudio debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ohci.c,v 1.125 2002/05/28 12:42:38 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.108 2002/05/28 20:51:43 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.109 2002/07/31 13:33:54 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -64,6 +64,7 @@ #endif #include #include +#include #include #include @@ -93,6 +94,8 @@ #define DPRINTF(x) if (ohcidebug) logprintf x #define DPRINTFN(n,x) if (ohcidebug>(n)) logprintf x int ohcidebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, ohci, CTLFLAG_RW, + &ohcidebug, 0, "ohci debug level"); #ifndef __NetBSD__ #define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f)) #endif ==== //depot/projects/trustedbsd/base/sys/dev/usb/ucom.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ucom.c,v 1.39 2001/08/16 22:31:24 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.21 2002/07/15 11:22:37 ume Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.22 2002/07/31 13:33:54 joe Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . @@ -88,6 +88,7 @@ #include #include #include +#include #include #include @@ -100,14 +101,9 @@ #include #ifdef UCOM_DEBUG -#include - static int ucomdebug = 1; - -SYSCTL_NODE(_debug, OID_AUTO, usb, CTLFLAG_RW, 0, "USB debugging"); SYSCTL_INT(_debug_usb, OID_AUTO, ucom, CTLFLAG_RW, &ucomdebug, 0, "ucom debug level"); - #define DPRINTF(x) do { \ if (ucomdebug) \ logprintf x; \ ==== //depot/projects/trustedbsd/base/sys/dev/usb/udbp.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/udbp.c,v 1.15 2002/06/01 07:18:32 alfred Exp $ + * $FreeBSD: src/sys/dev/usb/udbp.c,v 1.16 2002/07/31 13:33:55 joe Exp $ */ /* Driver for arbitrary double bulk pipe devices. @@ -87,6 +87,7 @@ #include #include #include +#include #include #include @@ -107,6 +108,8 @@ #define DPRINTF(x) if (udbpdebug) logprintf x #define DPRINTFN(n,x) if (udbpdebug>(n)) logprintf x int udbpdebug = 9; +SYSCTL_INT(_debug_usb, OID_AUTO, udbp, CTLFLAG_RW, + &udbpdebug, 0, "udbp debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/ufm.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ * its contributors. */ -/* $FreeBSD: src/sys/dev/usb/ufm.c,v 1.5 2002/05/06 18:23:35 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ufm.c,v 1.6 2002/07/31 13:33:55 joe Exp $ */ #include #include @@ -55,6 +55,7 @@ #endif #include #include +#include #include #include @@ -67,6 +68,8 @@ #define DPRINTF(x) if (ufmdebug) logprintf x #define DPRINTFN(n,x) if (ufmdebug>(n)) logprintf x int ufmdebug = 100; +SYSCTL_INT(_debug_usb, OID_AUTO, ufm, CTLFLAG_RW, + &ufmdebug, 0, "ufm debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ugen.c,v 1.57 2002/02/11 15:11:49 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.61 2002/07/09 01:01:25 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.62 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -63,6 +63,7 @@ #endif #include #include +#include #include #include @@ -72,6 +73,8 @@ #define DPRINTF(x) if (ugendebug) logprintf x #define DPRINTFN(n,x) if (ugendebug>(n)) logprintf x int ugendebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, ugen, CTLFLAG_RW, + &ugendebug, 0, "ugen debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#16 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uhci.c,v 1.160 2002/05/28 12:42:39 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.123 2002/07/30 23:26:22 iedowse Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.124 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,6 +66,7 @@ #endif #include #include +#include #include #include @@ -102,6 +103,8 @@ #define DPRINTFN(n,x) if (uhcidebug>(n)) printf x int uhcidebug = 0; int uhcinoloop = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, uhci, CTLFLAG_RW, + &uhcidebug, 0, "uhci debug level"); #ifndef __NetBSD__ #define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f)) #endif ==== //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uhid.c,v 1.45 2001/10/26 17:58:21 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhid.c,v 1.49 2002/04/07 17:13:00 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhid.c,v 1.50 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -70,6 +70,7 @@ #include #include #include +#include #include #include @@ -86,6 +87,8 @@ #define DPRINTF(x) if (uhiddebug) logprintf x #define DPRINTFN(n,x) if (uhiddebug>(n)) logprintf x int uhiddebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, uhid, CTLFLAG_RW, + &uhiddebug, 0, "uhid debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/uhub.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uhub.c,v 1.57 2001/11/20 16:08:37 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.43 2002/06/17 20:57:54 n_hibma Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.44 2002/07/31 13:58:15 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -67,7 +67,9 @@ #ifdef UHUB_DEBUG #define DPRINTF(x) if (uhubdebug) logprintf x #define DPRINTFN(n,x) if (uhubdebug>(n)) logprintf x -int uhubdebug; +int uhubdebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, uhub, CTLFLAG_RW, + &uhubdebug, 0, "uhub debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/ukbd.c,v 1.37 2002/04/07 13:16:17 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ukbd.c,v 1.38 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -57,6 +57,7 @@ #include #endif #include +#include #include #include @@ -79,6 +80,8 @@ #define DPRINTF(x) if (ukbddebug) logprintf x #define DPRINTFN(n,x) if (ukbddebug>(n)) logprintf x int ukbddebug = 1; +SYSCTL_INT(_debug_usb, OID_AUTO, ukbd, CTLFLAG_RW, + &ukbddebug, 0, "ukbd debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ulpt.c,v 1.48 2002/02/11 15:11:49 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.44 2002/05/06 18:23:35 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.45 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -75,6 +76,8 @@ #define DPRINTF(x) if (ulptdebug) logprintf x #define DPRINTFN(n,x) if (ulptdebug>(n)) logprintf x int ulptdebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, ulpt, CTLFLAG_RW, + &ulptdebug, 0, "ulpt debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#12 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.62 2002/06/17 20:44:37 n_hibma Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.63 2002/07/31 13:33:55 joe Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -104,6 +104,7 @@ #include #include #include +#include #include #include @@ -134,6 +135,8 @@ #define UDMASS_WIRE (UDMASS_BBB|UDMASS_CBI) #define UDMASS_ALL 0xffff0000 /* all of the above */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 7:18:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6205037B400; Wed, 31 Jul 2002 07:18:10 -0700 (PDT) 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 A582B37B410 for ; Wed, 31 Jul 2002 07:18:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5064343E3B for ; Wed, 31 Jul 2002 07:18:09 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VEI9JU060177 for ; Wed, 31 Jul 2002 07:18:09 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VEI83e060173 for perforce@freebsd.org; Wed, 31 Jul 2002 07:18:08 -0700 (PDT) Date: Wed, 31 Jul 2002 07:18:08 -0700 (PDT) Message-Id: <200207311418.g6VEI83e060173@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 15303 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15303 Change 15303 by jhb@jhb_zion on 2002/07/31 07:18:06 Compile bogon. Affected files ... .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#24 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/vm_machdep.c#24 (text+ko) ==== @@ -139,7 +139,7 @@ struct proc_ldt *pldt; mtx_lock_spin(&sched_lock); - pltd = mdp1->md_ldt; + pldt = mdp1->md_ldt; if (pldt && pldt->ldt_refcnt > 1) { pldt = user_ldt_alloc(mdp1, pldt->ldt_len); if (pldt == NULL) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 7:24:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B3E637B401; Wed, 31 Jul 2002 07:23:19 -0700 (PDT) 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 323FD37B400 for ; Wed, 31 Jul 2002 07:23:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4786143E3B for ; Wed, 31 Jul 2002 07:23:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VENIJU060965 for ; Wed, 31 Jul 2002 07:23:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VENG9S060961 for perforce@freebsd.org; Wed, 31 Jul 2002 07:23:16 -0700 (PDT) Date: Wed, 31 Jul 2002 07:23:16 -0700 (PDT) Message-Id: <200207311423.g6VENG9S060961@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15305 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15305 Change 15305 by rwatson@rwatson_tislabs on 2002/07/31 07:23:12 Freshen the MAC tree with a trickle down IFC or two, et al, in preparation for merging more MAC to the main tree. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#20 integrate .. //depot/projects/trustedbsd/mac/etc/printcap#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/fhopen.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_array.c#3 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpcmd.y#7 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#24 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/fsutil.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/inode.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/main.c#9 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass1.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass2.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/setup.c#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snp.4#4 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.cpu.mk#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/udbp.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ufm.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ugen.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhid.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhub.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ukbd.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ulpt.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umodem.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ums.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/urio.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_port.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs_data.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uscanner.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uvisor.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uvscom.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/identcpu.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/md_var.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/sys/file.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#37 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_subr.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/sockstat/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/sockstat/sockstat.1#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/sockstat/sockstat.c#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/sockstat/sockstat.pl#3 delete .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/README.devel#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pstat/pstat.8#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pstat/pstat.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.297 2002/07/24 23:08:57 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.298 2002/07/31 03:56:03 jhb Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -126,8 +126,10 @@ TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} +TARGET_CPUTYPE?= ${CPUTYPE} .else TARGET?= ${TARGET_ARCH} +TARGET_CPUTYPE?= .endif .if make(buildworld) BUILD_ARCH!= sysctl -n hw.machine_arch @@ -184,13 +186,14 @@ INSTALL="sh ${.CURDIR}/tools/install.sh" BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ - -DNO_WERROR + -DNO_CPU_CFLAGS -DNO_WERROR # build-tool stage TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING +TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ + -DNO_CPU_CFLAGS # cross-tool stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB ==== //depot/projects/trustedbsd/mac/etc/printcap#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)printcap 5.3 (Berkeley) 6/30/90 -# $FreeBSD: src/etc/printcap,v 1.11 2000/11/01 13:30:24 andreas Exp $ +# $FreeBSD: src/etc/printcap,v 1.12 2002/07/31 10:05:37 blackend Exp $ # # This enables a simple local "raw" printer, hooked up to the first @@ -22,7 +22,7 @@ # # Do also refer to the "printing" section of the handbook. # -# http://www.freebsd.org/handbook/printing.html +# http://www.freebsd.org/doc/handbook/printing.html # # A local copy can be found under # ==== //depot/projects/trustedbsd/mac/lib/libc/sys/fhopen.2#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: fhopen.2,v 1.1 1999/06/30 01:32:15 wrstuden Exp $ -.\" $FreeBSD: src/lib/libc/sys/fhopen.2,v 1.11 2001/10/01 16:09:01 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/fhopen.2,v 1.12 2002/07/31 06:40:34 chris Exp $ .\" .\" Copyright (c) 1999 National Aeronautics & Space Administration .\" All rights reserved. @@ -130,7 +130,7 @@ .Fn fhstatfs functions first appeared in .Nx 1.5 -and was adapted to +and were adapted to .Fx 4.0 by Alfred Perlstein. .Sh AUTHORS ==== //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_array.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)xdr_array.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.10 2002/03/22 21:53:26 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.11 2002/07/31 12:50:28 darrenr Exp $"); /* * xdr_array.c, Generic XDR routines impelmentation. @@ -78,11 +78,12 @@ u_int nodesize; /* like strings, arrays are really counted arrays */ - if (! xdr_u_int(xdrs, sizep)) { + if (!xdr_u_int(xdrs, sizep)) { return (FALSE); } c = *sizep; - if ((c > maxsize) && (xdrs->x_op != XDR_FREE)) { + if ((c > maxsize && UINT_MAX/elsize < c) && + (xdrs->x_op != XDR_FREE)) { return (FALSE); } nodesize = c * elsize; @@ -152,7 +153,7 @@ elptr = basep; for (i = 0; i < nelem; i++) { - if (! (*xdr_elem)(xdrs, elptr)) { + if (!(*xdr_elem)(xdrs, elptr)) { return(FALSE); } elptr += elemsize; ==== //depot/projects/trustedbsd/mac/libexec/ftpd/ftpcmd.y#7 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.35 2002/07/25 17:41:47 yar Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.36 2002/07/31 10:55:31 yar Exp $"; #endif /* not lint */ #include @@ -1068,6 +1068,8 @@ #define MAXGLOBARGS 1000 +#define MAXASIZE 10240 /* Deny ASCII SIZE on files larger than that */ + struct tab { char *name; short token; @@ -1589,6 +1591,10 @@ reply(550, "%s: not a plain file.", filename); (void) fclose(fin); return; + } else if (stbuf.st_size > MAXASIZE) { + reply(550, "%s: too large for type A SIZE.", filename); + (void) fclose(fin); + return; } count = 0; ==== //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#24 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.396 2002/07/30 04:32:14 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.399 2002/07/31 04:01:12 bmah Exp $ 2000 @@ -122,12 +122,12 @@ can be disabled by the NODEVFS kernel option. - The DEVFS "rule" subsystem has been introduced. DEVFS rules - permit the administrator to define certain properties of new devfs - nodes before they become visible to the userland. Both static (e.g., - /dev/speaker) and dynamic (e.g., + The &man.devfs.5; rule subsystem has been introduced. DEVFS rules + permit the administrator to define certain properties of new device + nodes before they become visible to the userland. Both static (e.g. + /dev/speaker) and dynamic (e.g. /dev/bpf*, some removable devices) nodes are - supported. Each DEVFS mount may have a different ruleset assigned to + supported. Each &man.devfs.5; mount may have a different ruleset assigned to it, permitting different policies to be implemented for things like jails. Rules and rulesets are manipulated with the &man.devfs.8; utility. @@ -333,6 +333,9 @@ use an AT keyboard if you are not using a serial console. &merged; + The uaudio driver, for USB audio devices, has been + added. + The &man.umodem.4; driver for USB modems has been added. Support is provided for the 3Com 5605 and Metricom Ricochet GS wireless USB modems. &merged; @@ -361,6 +364,9 @@ The USER_LDT kernel option is now activated by default. + The uvisor driver for connecting Handspring Visors via USB + has been added. + A VESA S3 linear framebuffer driver has been added. The &man.viapm.4; driver for VIA SMBus @@ -1493,7 +1499,7 @@ (ACPI), a multi-vendor standard for configuration and power management, has been added. This functionality has been provided by the Intel ACPI Component - Architecture project, as of the ACPI CA 20020611 + Architecture project, as of the ACPI CA 20020725 snapshot. Some backward compatability for applications using the older APM standard has been provided. @@ -2309,6 +2315,9 @@ With this change, properly-compiled KLD modules are now able to be profiled. + The gpt tool for manipulating EFI GPT + partitions has been added. + &man.growfs.8;, a utility for growing FFS filesystems, has been added. &man.ffsinfo.8;, a utility for dump all the meta-information of an existing filesystem, has also been @@ -2623,6 +2632,9 @@ manpages) or if the running user is root. + The mca utility, for decoding machine check + records, has been added. + The &man.mdmfs.8; command has been added; it is a wrapper around &man.mdconfig.8;, &man.disklabel.8;, &man.newfs.8;, and &man.mount.8; that mimics the command line option set of the @@ -3207,7 +3219,7 @@ net/freebsd-uucp. &man.unexpand.1; now supports a to - specify tabstabs analogous to &man.expand.1;. &merged; + specify tabstops analogous to &man.expand.1;. &merged; &man.units.1; has received some updates and bugfixes. &merged; @@ -3763,7 +3775,7 @@ OpenSSL OpenSSL has been updated to - 0.9.6c. + 0.9.6e. &merged; OpenSSL now has support for machine-dependent ASM optimizations, activated by the new ==== //depot/projects/trustedbsd/mac/sbin/fsck_ffs/fsutil.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)utilities.c 8.6 (Berkeley) 5/19/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.15 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/fsutil.c,v 1.16 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #include @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -360,11 +361,11 @@ if (read(fd, cp, (int)secsize) != secsize) { (void)lseek(fd, offset + i + secsize, 0); if (secsize != dev_bsize && dev_bsize != 1) - printf(" %lld (%lld),", - (long long)(blk * dev_bsize + i) / secsize, - (long long)blk + i / dev_bsize); + printf(" %jd (%jd),", + (intmax_t)(blk * dev_bsize + i) / secsize, + (intmax_t)blk + i / dev_bsize); else - printf(" %lld,", (long long)blk + i / dev_bsize); + printf(" %jd,", (intmax_t)blk + i / dev_bsize); errs++; } } @@ -399,7 +400,7 @@ for (cp = buf, i = 0; i < size; i += dev_bsize, cp += dev_bsize) if (write(fd, cp, (int)dev_bsize) != dev_bsize) { (void)lseek(fd, offset + i + dev_bsize, 0); - printf(" %lld,", (long long)blk + i / dev_bsize); + printf(" %jd,", (intmax_t)blk + i / dev_bsize); } printf("\n"); return; ==== //depot/projects/trustedbsd/mac/sbin/fsck_ffs/inode.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.32 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/inode.c,v 1.33 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #include @@ -562,7 +562,7 @@ printf("MODE=%o\n", DIP(dp, di_mode)); if (preen) printf("%s: ", cdevname); - printf("SIZE=%qu ", DIP(dp, di_size)); + printf("SIZE=%ju ", (uintmax_t)DIP(dp, di_size)); t = DIP(dp, di_mtime); p = ctime(&t); printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]); @@ -572,7 +572,7 @@ blkerror(ino_t ino, const char *type, ufs2_daddr_t blk) { - pfatal("%lld %s I=%lu", (intmax_t)blk, type, (u_long)ino); + pfatal("%jd %s I=%ju", (intmax_t)blk, type, (uintmax_t)ino); printf("\n"); switch (inoinfo(ino)->ino_state) { ==== //depot/projects/trustedbsd/mac/sbin/fsck_ffs/main.c#9 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.34 2002/07/30 13:01:21 phk Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.35 2002/07/31 12:01:14 mux Exp $"); #include #include @@ -63,6 +63,7 @@ #include #include #include +#include #include #include "fsck.h" @@ -190,8 +191,9 @@ struct statfs *mntp; struct zlncnt *zlnp; ufs2_daddr_t blks; - int cylno, size, ret; + int cylno, ret; ino_t files; + size_t size; cdevname = filesys; if (debug && preen) @@ -372,11 +374,12 @@ pwarn("Reclaimed: %ld directories, %ld files, %lld fragments\n", countdirs, (long)files - countdirs, (long long)blks); } - pwarn("%ld files, %lld used, %llu free ", - (long)n_files, (long long)n_blks, - n_ffree + sblock.fs_frag * n_bfree); - printf("(%qu frags, %qu blocks, %.1f%% fragmentation)\n", - n_ffree, n_bfree, n_ffree * 100.0 / sblock.fs_dsize); + pwarn("%ld files, %jd used, %ju free ", + (long)n_files, (intmax_t)n_blks, + (uintmax_t)n_ffree + sblock.fs_frag * n_bfree); + printf("(%ju frags, %ju blocks, %.1f%% fragmentation)\n", + (uintmax_t)n_ffree, (uintmax_t)n_bfree, + n_ffree * 100.0 / sblock.fs_dsize); if (debug) { if (files < 0) printf("%d inodes missing\n", -files); ==== //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass1.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)pass1.c 8.6 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.32 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/pass1.c,v 1.33 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #include @@ -48,6 +48,7 @@ #include #include +#include #include #include "fsck.h" @@ -228,7 +229,7 @@ DIP(dp, di_size) > sblock.fs_maxfilesize || (mode == IFDIR && DIP(dp, di_size) > MAXDIRSIZE)) { if (debug) - printf("bad size %qu:", DIP(dp, di_size)); + printf("bad size %ju:", (uintmax_t)DIP(dp, di_size)); goto unknown; } if (!preen && mode == IFMT && reply("HOLD BAD BLOCK") == 1) { @@ -240,7 +241,8 @@ if ((mode == IFBLK || mode == IFCHR || mode == IFIFO || mode == IFSOCK) && DIP(dp, di_size) != 0) { if (debug) - printf("bad special-file size %qu:", DIP(dp, di_size)); + printf("bad special-file size %ju:", + (uintmax_t)DIP(dp, di_size)); goto unknown; } if ((mode == IFBLK || mode == IFCHR) && @@ -252,8 +254,8 @@ ndb = howmany(DIP(dp, di_size), sblock.fs_bsize); if (ndb < 0) { if (debug) - printf("bad size %qu ndb %qu:", - DIP(dp, di_size), ndb); + printf("bad size %ju ndb %ju:", + (uintmax_t)DIP(dp, di_size), (uintmax_t)ndb); goto unknown; } if (mode == IFBLK || mode == IFCHR) @@ -281,8 +283,8 @@ for (j = ndb; ndb < NDADDR && j < NDADDR; j++) if (DIP(dp, di_db[j]) != 0) { if (debug) - printf("bad direct addr[%d]: %qu\n", j, - (ufs2_daddr_t)DIP(dp, di_db[j])); + printf("bad direct addr[%d]: %ju\n", j, + (uintmax_t)DIP(dp, di_db[j])); goto unknown; } for (j = 0, ndb -= NDADDR; ndb > 0; j++) @@ -290,8 +292,8 @@ for (; j < NIADDR; j++) if (DIP(dp, di_ib[j]) != 0) { if (debug) - printf("bad indirect addr: %qu\n", - DIP(dp, di_ib[j])); + printf("bad indirect addr: %ju\n", + (uintmax_t)DIP(dp, di_ib[j])); goto unknown; } if (ftypeok(dp) == 0) @@ -331,9 +333,9 @@ (void)ckinode(dp, idesc); idesc->id_entryno *= btodb(sblock.fs_fsize); if (DIP(dp, di_blocks) != idesc->id_entryno) { - pwarn("INCORRECT BLOCK COUNT I=%lu (%qu should be %qu)", - (u_long)inumber, DIP(dp, di_blocks), - idesc->id_entryno); + pwarn("INCORRECT BLOCK COUNT I=%lu (%ju should be %ju)", + (u_long)inumber, (uintmax_t)DIP(dp, di_blocks), + (uintmax_t)idesc->id_entryno); if (preen) printf(" (CORRECTED)\n"); else if (reply("CORRECT") == 0) @@ -346,8 +348,8 @@ cmd.value = idesc->id_number; cmd.size = idesc->id_entryno - DIP(dp, di_blocks); if (debug) - printf("adjblkcnt ino %qu amount %lld\n", - cmd.value, (long long)cmd.size); + printf("adjblkcnt ino %ju amount %lld\n", + (uintmax_t)cmd.value, (long long)cmd.size); if (sysctl(adjblkcnt, MIBSIZE, 0, 0, &cmd, sizeof cmd) == -1) rwerror("ADJUST INODE BLOCK COUNT", cmd.value); ==== //depot/projects/trustedbsd/mac/sbin/fsck_ffs/pass2.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)pass2.c 8.9 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.19 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/pass2.c,v 1.20 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #include @@ -46,6 +46,7 @@ #include #include +#include #include #include "fsck.h" @@ -134,7 +135,7 @@ inpend = &inpsort[inplast]; for (inpp = inpsort; inpp < inpend; inpp++) { if (got_siginfo) { - printf("%s: phase 2: dir %d of %d (%d%%)\n", cdevname, + printf("%s: phase 2: dir %td of %d (%d%%)\n", cdevname, inpp - inpsort, (int)inplast, (int)((inpp - inpsort) * 100 / inplast)); got_siginfo = 0; @@ -153,13 +154,13 @@ } else if ((inp->i_isize & (DIRBLKSIZ - 1)) != 0) { getpathname(pathbuf, inp->i_number, inp->i_number); if (usedsoftdep) - pfatal("%s %s: LENGTH %d NOT MULTIPLE OF %d", - "DIRECTORY", pathbuf, inp->i_isize, - DIRBLKSIZ); + pfatal("%s %s: LENGTH %jd NOT MULTIPLE OF %d", + "DIRECTORY", pathbuf, + (intmax_t)inp->i_isize, DIRBLKSIZ); else - pwarn("%s %s: LENGTH %d NOT MULTIPLE OF %d", - "DIRECTORY", pathbuf, inp->i_isize, - DIRBLKSIZ); + pwarn("%s %s: LENGTH %jd NOT MULTIPLE OF %d", + "DIRECTORY", pathbuf, + (intmax_t)inp->i_isize, DIRBLKSIZ); if (preen) printf(" (ADJUSTED)\n"); inp->i_isize = roundup(inp->i_isize, DIRBLKSIZ); ==== //depot/projects/trustedbsd/mac/sbin/fsck_ffs/setup.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.34 2002/07/30 13:01:21 phk Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.35 2002/07/31 12:01:14 mux Exp $"; #endif /* not lint */ #define DKTYPENAMES @@ -52,6 +52,7 @@ #include #include #include +#include #include #include "fsck.h" @@ -269,8 +270,8 @@ inphead = (struct inoinfo **)calloc((unsigned)numdirs, sizeof(struct inoinfo *)); if (inpsort == NULL || inphead == NULL) { - printf("cannot alloc %u bytes for inphead\n", - (unsigned)numdirs * sizeof(struct inoinfo *)); + printf("cannot alloc %ju bytes for inphead\n", + (uintmax_t)numdirs * sizeof(struct inoinfo *)); goto badsb; } bufinit(); ==== //depot/projects/trustedbsd/mac/share/man/man4/snp.4#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/share/man/man4/snp.4,v 1.22 2002/01/21 12:09:13 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/snp.4,v 1.23 2002/07/31 09:32:22 schweikh Exp $ .\" .Dd February 24, 1995 .Dt SNP 4 @@ -16,7 +16,7 @@ .Ft int .Fn ioctl fd FIONREAD &result .Sh DESCRIPTION -/dev/snp? are snoop devices which allow user to attach to any tty +/dev/snp? are snoop devices which allow users to attach to any tty and watch activities on it. The kernel must be compiled with .Cd "device snp" , @@ -27,13 +27,12 @@ .Pp To associate a given .Nm -device with a tty to be observed, open the +device with a tty to be observed, open the .Nm device and then use the SNPSTTY ioctl. -The argument passed to the IOCTL is the address of a variable of type +The argument passed to the ioctl is the address of a variable of type dev_t. -By setting the value of the variable pointed to -1, the user may detach -the snp device from a tty. +To detach the snp device from a tty use a pointer to a value of (dev_t)-1. .Pp The SNPGTTY ioctl returns information about the current tty attached to the open ==== //depot/projects/trustedbsd/mac/share/mk/bsd.cpu.mk#5 (text+ko) ==== @@ -1,10 +1,16 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.14 2002/07/27 22:15:42 jhb Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.15 2002/07/31 03:56:03 jhb Exp $ + +# Allow TARGET_CPUTYPE to override CPUTYPE to handle the cross-build case. + +.if defined(TARGET_CPUTYPE) +CPUTYPE = ${TARGET_CPUTYPE} +.endif # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but # may tune support for more advanced processors. -.if !defined(CPUTYPE) +.if !defined(CPUTYPE) || ${CPUTYPE} == "" . if ${MACHINE_ARCH} == "i386" _CPUCFLAGS = -mcpu=pentiumpro CPUTYPE = i386 @@ -43,11 +49,7 @@ . if ${MACHINE_ARCH} == "i386" . if ${CPUTYPE} == "k7" -. if defined(BOOTSTRAPPING) -_CPUCFLAGS = -march=k6 # gcc 2.95.x didn't support athlon -. else _CPUCFLAGS = -march=athlon -. endif . elif ${CPUTYPE} == "k6-2" _CPUCFLAGS = -march=k6 . elif ${CPUTYPE} == "k6" ==== //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudio.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.41 2001/01/23 14:04:13 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.2 2002/07/22 00:11:35 peter Exp $: */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.3 2002/07/31 13:33:55 joe Exp $: */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -66,6 +66,7 @@ #include #endif #include +#include #if defined(__NetBSD__) || defined(__OpenBSD__) #include @@ -89,6 +90,8 @@ #define DPRINTF(x) if (uaudiodebug) logprintf x #define DPRINTFN(n,x) if (uaudiodebug>(n)) logprintf x int uaudiodebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, uaudio, CTLFLAG_RW, + &uaudiodebug, 0, "uaudio debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#11 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ohci.c,v 1.125 2002/05/28 12:42:38 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.108 2002/05/28 20:51:43 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.109 2002/07/31 13:33:54 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -64,6 +64,7 @@ #endif #include #include +#include #include #include @@ -93,6 +94,8 @@ #define DPRINTF(x) if (ohcidebug) logprintf x #define DPRINTFN(n,x) if (ohcidebug>(n)) logprintf x int ohcidebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, ohci, CTLFLAG_RW, + &ohcidebug, 0, "ohci debug level"); #ifndef __NetBSD__ #define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f)) #endif ==== //depot/projects/trustedbsd/mac/sys/dev/usb/ucom.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ucom.c,v 1.39 2001/08/16 22:31:24 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.21 2002/07/15 11:22:37 ume Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.22 2002/07/31 13:33:54 joe Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . @@ -88,6 +88,7 @@ #include #include #include +#include #include #include @@ -100,14 +101,9 @@ #include #ifdef UCOM_DEBUG -#include - static int ucomdebug = 1; - -SYSCTL_NODE(_debug, OID_AUTO, usb, CTLFLAG_RW, 0, "USB debugging"); SYSCTL_INT(_debug_usb, OID_AUTO, ucom, CTLFLAG_RW, &ucomdebug, 0, "ucom debug level"); - #define DPRINTF(x) do { \ if (ucomdebug) \ logprintf x; \ ==== //depot/projects/trustedbsd/mac/sys/dev/usb/udbp.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/udbp.c,v 1.15 2002/06/01 07:18:32 alfred Exp $ + * $FreeBSD: src/sys/dev/usb/udbp.c,v 1.16 2002/07/31 13:33:55 joe Exp $ */ /* Driver for arbitrary double bulk pipe devices. @@ -87,6 +87,7 @@ #include #include #include +#include #include #include @@ -107,6 +108,8 @@ #define DPRINTF(x) if (udbpdebug) logprintf x #define DPRINTFN(n,x) if (udbpdebug>(n)) logprintf x int udbpdebug = 9; +SYSCTL_INT(_debug_usb, OID_AUTO, udbp, CTLFLAG_RW, + &udbpdebug, 0, "udbp debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/mac/sys/dev/usb/ufm.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ * its contributors. */ -/* $FreeBSD: src/sys/dev/usb/ufm.c,v 1.5 2002/05/06 18:23:35 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ufm.c,v 1.6 2002/07/31 13:33:55 joe Exp $ */ #include #include @@ -55,6 +55,7 @@ #endif #include #include +#include #include #include @@ -67,6 +68,8 @@ #define DPRINTF(x) if (ufmdebug) logprintf x #define DPRINTFN(n,x) if (ufmdebug>(n)) logprintf x int ufmdebug = 100; +SYSCTL_INT(_debug_usb, OID_AUTO, ufm, CTLFLAG_RW, + &ufmdebug, 0, "ufm debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/mac/sys/dev/usb/ugen.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ugen.c,v 1.57 2002/02/11 15:11:49 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.61 2002/07/09 01:01:25 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.62 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -63,6 +63,7 @@ #endif #include #include +#include #include #include @@ -72,6 +73,8 @@ #define DPRINTF(x) if (ugendebug) logprintf x #define DPRINTFN(n,x) if (ugendebug>(n)) logprintf x int ugendebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, ugen, CTLFLAG_RW, + &ugendebug, 0, "ugen debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#14 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uhci.c,v 1.160 2002/05/28 12:42:39 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.123 2002/07/30 23:26:22 iedowse Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.124 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,6 +66,7 @@ #endif #include #include +#include #include #include @@ -102,6 +103,8 @@ #define DPRINTFN(n,x) if (uhcidebug>(n)) printf x int uhcidebug = 0; int uhcinoloop = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, uhci, CTLFLAG_RW, + &uhcidebug, 0, "uhci debug level"); #ifndef __NetBSD__ #define bitmask_snprintf(q,f,b,l) snprintf((b), (l), "%b", (q), (f)) #endif ==== //depot/projects/trustedbsd/mac/sys/dev/usb/uhid.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uhid.c,v 1.45 2001/10/26 17:58:21 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhid.c,v 1.49 2002/04/07 17:13:00 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhid.c,v 1.50 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -70,6 +70,7 @@ #include #include #include +#include #include #include @@ -86,6 +87,8 @@ #define DPRINTF(x) if (uhiddebug) logprintf x #define DPRINTFN(n,x) if (uhiddebug>(n)) logprintf x int uhiddebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, uhid, CTLFLAG_RW, + &uhiddebug, 0, "uhid debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/mac/sys/dev/usb/uhub.c#7 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uhub.c,v 1.57 2001/11/20 16:08:37 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.43 2002/06/17 20:57:54 n_hibma Exp $ */ +/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.44 2002/07/31 13:58:15 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -67,7 +67,9 @@ #ifdef UHUB_DEBUG #define DPRINTF(x) if (uhubdebug) logprintf x #define DPRINTFN(n,x) if (uhubdebug>(n)) logprintf x -int uhubdebug; +int uhubdebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, uhub, CTLFLAG_RW, + &uhubdebug, 0, "uhub debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/mac/sys/dev/usb/ukbd.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/ukbd.c,v 1.37 2002/04/07 13:16:17 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ukbd.c,v 1.38 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -57,6 +57,7 @@ #include #endif #include +#include #include #include @@ -79,6 +80,8 @@ #define DPRINTF(x) if (ukbddebug) logprintf x #define DPRINTFN(n,x) if (ukbddebug>(n)) logprintf x int ukbddebug = 1; +SYSCTL_INT(_debug_usb, OID_AUTO, ukbd, CTLFLAG_RW, + &ukbddebug, 0, "ukbd debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/mac/sys/dev/usb/ulpt.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: ulpt.c,v 1.48 2002/02/11 15:11:49 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.44 2002/05/06 18:23:35 joe Exp $ */ +/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.45 2002/07/31 13:33:55 joe Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -75,6 +76,8 @@ #define DPRINTF(x) if (ulptdebug) logprintf x #define DPRINTFN(n,x) if (ulptdebug>(n)) logprintf x int ulptdebug = 0; +SYSCTL_INT(_debug_usb, OID_AUTO, ulpt, CTLFLAG_RW, + &ulptdebug, 0, "ulpt debug level"); #else #define DPRINTF(x) #define DPRINTFN(n,x) ==== //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#11 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/umass.c,v 1.62 2002/06/17 20:44:37 n_hibma Exp $ + * $FreeBSD: src/sys/dev/usb/umass.c,v 1.63 2002/07/31 13:33:55 joe Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -104,6 +104,7 @@ #include #include #include +#include #include #include @@ -134,6 +135,8 @@ #define UDMASS_WIRE (UDMASS_BBB|UDMASS_CBI) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 7:35:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E56C37B401; Wed, 31 Jul 2002 07:35:40 -0700 (PDT) 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 032FD37B400 for ; Wed, 31 Jul 2002 07:35:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B89A543E31 for ; Wed, 31 Jul 2002 07:35:39 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VEZdJU066982 for ; Wed, 31 Jul 2002 07:35:39 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VEZdkp066979 for perforce@freebsd.org; Wed, 31 Jul 2002 07:35:39 -0700 (PDT) Date: Wed, 31 Jul 2002 07:35:39 -0700 (PDT) Message-Id: <200207311435.g6VEZdkp066979@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 15307 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15307 Change 15307 by jhb@jhb_zion on 2002/07/31 07:35:31 Once again, I'm a moron. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#44 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#44 (text+ko) ==== @@ -409,7 +409,7 @@ { MPASS(curthread != NULL); - KASSERT(m->mtx_object.lo_class == &lock_class_mtx_sleep, + KASSERT(m->mtx_object.lo_class == &lock_class_mtx_spin, ("mtx_lock_spin() of sleep mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); #if defined(SMP) || LOCK_DEBUG > 0 @@ -427,7 +427,7 @@ { MPASS(curthread != NULL); - KASSERT(m->mtx_object.lo_class == &lock_class_mtx_sleep, + KASSERT(m->mtx_object.lo_class == &lock_class_mtx_spin, ("mtx_unlock_spin() of sleep mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 7:39:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FFE137B401; Wed, 31 Jul 2002 07:39:49 -0700 (PDT) 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 EA9A237B400 for ; Wed, 31 Jul 2002 07:39:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92FC643E42 for ; Wed, 31 Jul 2002 07:39:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VEdmJU075094 for ; Wed, 31 Jul 2002 07:39:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VEdml0075090 for perforce@freebsd.org; Wed, 31 Jul 2002 07:39:48 -0700 (PDT) Date: Wed, 31 Jul 2002 07:39:48 -0700 (PDT) Message-Id: <200207311439.g6VEdml0075090@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15309 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15309 Change 15309 by rwatson@rwatson_tislabs on 2002/07/31 07:38:45 Remove dup include from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#22 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#22 (text+ko) ==== @@ -44,7 +44,6 @@ #include /* for maxfiles */ #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 8:27: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 264F137B407; Wed, 31 Jul 2002 08:26:47 -0700 (PDT) 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 1B5BF37B400 for ; Wed, 31 Jul 2002 08:26:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0E2143E31 for ; Wed, 31 Jul 2002 08:26:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VFQkJU084432 for ; Wed, 31 Jul 2002 08:26:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VFQk4x084429 for perforce@freebsd.org; Wed, 31 Jul 2002 08:26:46 -0700 (PDT) Date: Wed, 31 Jul 2002 08:26:46 -0700 (PDT) Message-Id: <200207311526.g6VFQk4x084429@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15311 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15311 Change 15311 by rwatson@rwatson_tislabs on 2002/07/31 08:26:17 Update MAC notes. Affected files ... .. //depot/projects/trustedbsd/mac/MACREADME#20 edit Differences ... ==== //depot/projects/trustedbsd/mac/MACREADME#20 (text+ko) ==== @@ -22,21 +22,16 @@ others may be loaded when needed before or after the boot. The following loader.conf lines are currently relevant: -babyaudit_load="NO" # Baby auditing module mac_biba_load="NO" # Biba MAC policy (boot only) mac_bsdextended_load="NO" # BSD/extended MAC policy mac_ifoff="NO" # Interface silencing policy mac_mls_load="NO" # MLS MAC policy (boot only) mac_none_load="NO" # Null MAC policy +mac_partition_load="NO" # Partition MAC policy mac_seeotheruids_load="NO" # UID visbility MAC policy mac_te_load="NO" # Type Enforcement policy (boot only) - -To include support for SEBSD, a port of the NSA FLASK and SELinux TE -implementations, add the following kernel option: +sebsd_load="NO" # Port of SELinux/FLASK (boot only) -options SEBSD - -This will be available as a module also in due course. Kernel options known not to work with MAC ----------------------------------------- @@ -54,6 +49,7 @@ Using those options may result in incorrect security behavior, memory corruption, or a kernel panic. They do not work with MAC at this time. +They should work correctly using GENERIC. Kernel SLIP support may not work correctly, as outgoing mbufs are not labeled due to lack of a label to apply. Probably, the label should be @@ -82,13 +78,15 @@ The NFS server code in many places currently ignores MAC protection. This may or may not be the best behavior, as in the past NFS could always override discretionary access control due to running in the -kernel as root all the time. CODA support is probably in the same +kernel as root all the time. However, because NFS sometimes invokes +higher level VFS functionality, such as namei(), MAC protections +may be inconsistently enforced. CODA support is probably in the same condition. -Currently, non-FreeBSD ABIs are not supported. This includes the Linux -compatibility layer, and other related components (SCO, et al). They -will likely not correctly check MAC operations in all cases that the -normal FreeBSD ABI code does. +Currently, non-FreeBSD ABIs are not fully supported. This includes +the Linux compatibility layer, and other related components (SCO, et al). +They will likely not correctly check MAC operations in all cases that the +normal FreeBSD ABI code does; the status of the ABIs is improving. Client-side NFS locking is known to Do The Wrong Thing, for a variety of reasons. Unlike the other components of the kernel NFS client, @@ -118,7 +116,7 @@ Don't use netboot without setting the loader.conf setting to indicate to Biba which interface is trusted. Otherwise, the NFS client will -fail as it cannot send packets via the interface. +fail as it cannot send packets via the interface. (This may be broken). Things that look like they should work but don't ------------------------------------------------ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 8:48:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48B1537B420; Wed, 31 Jul 2002 08:47:43 -0700 (PDT) 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 C603E37B41E for ; Wed, 31 Jul 2002 08:47:42 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 982EB43E6E for ; Wed, 31 Jul 2002 08:47:15 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VFlBJU087044 for ; Wed, 31 Jul 2002 08:47:11 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VFlBv5087041 for perforce@freebsd.org; Wed, 31 Jul 2002 08:47:11 -0700 (PDT) Date: Wed, 31 Jul 2002 08:47:11 -0700 (PDT) Message-Id: <200207311547.g6VFlBv5087041@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 15313 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15313 Change 15313 by mini@mini_stylus on 2002/07/31 08:46:11 Convert uthreads from setjmp()/longjmp() to swapcontext() and friends. Affected files ... .. //depot/projects/kse/lib/libc_r/uthread/Makefile.inc#2 edit .. //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_create.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_jmp.c#2 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_sig.c#2 edit Differences ... ==== //depot/projects/kse/lib/libc_r/uthread/Makefile.inc#2 (text+ko) ==== @@ -69,7 +69,6 @@ uthread_info.c \ uthread_init.c \ uthread_ioctl.c \ - uthread_jmp.c \ uthread_join.c \ uthread_kern.c \ uthread_kevent.c \ ==== //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#2 (text+ko) ==== @@ -49,7 +49,6 @@ /* * Include files. */ -#include #include #include #include @@ -62,47 +61,15 @@ #include /* - * Define machine dependent macros to get and set the stack pointer - * from the supported contexts. Also define a macro to set the return - * address in a jmp_buf context. - * - * XXX - These need to be moved into architecture dependent support files. + * XXX - Grovelling around in the machine-dependant context only serves + * to get our hands dirty. */ #if defined(__i386__) -#define GET_STACK_JB(jb) ((unsigned long)((jb)[0]._jb[2])) -#define GET_STACK_SJB(sjb) ((unsigned long)((sjb)[0]._sjb[2])) -#define GET_STACK_UC(ucp) ((unsigned long)((ucp)->uc_mcontext.mc_esp)) -#define SET_STACK_JB(jb, stk) (jb)[0]._jb[2] = (int)(stk) -#define SET_STACK_SJB(sjb, stk) (sjb)[0]._sjb[2] = (int)(stk) -#define SET_STACK_UC(ucp, stk) (ucp)->uc_mcontext.mc_esp = (int)(stk) -#define FP_SAVE_UC(ucp) do { \ - char *fdata; \ - fdata = (char *) (ucp)->uc_mcontext.mc_fpregs; \ - __asm__("fnsave %0": :"m"(*fdata)); \ -} while (0) -#define FP_RESTORE_UC(ucp) do { \ - char *fdata; \ - fdata = (char *) (ucp)->uc_mcontext.mc_fpregs; \ - __asm__("frstor %0": :"m"(*fdata)); \ -} while (0) -#define SET_RETURN_ADDR_JB(jb, ra) (jb)[0]._jb[0] = (int)(ra) +#define UCP_STACK(ucp) ((unsigned long)((ucp)->uc_mcontext.mc_esp)) #elif defined(__alpha__) -#include -#define GET_STACK_JB(jb) ((unsigned long)((jb)[0]._jb[R_SP + 4])) -#define GET_STACK_SJB(sjb) ((unsigned long)((sjb)[0]._sjb[R_SP + 4])) -#define GET_STACK_UC(ucp) ((ucp)->uc_mcontext.mc_regs[R_SP]) -#define SET_STACK_JB(jb, stk) (jb)[0]._jb[R_SP + 4] = (long)(stk) -#define SET_STACK_SJB(sjb, stk) (sjb)[0]._sjb[R_SP + 4] = (long)(stk) -#define SET_STACK_UC(ucp, stk) (ucp)->uc_mcontext.mc_regs[R_SP] = (unsigned long)(stk) -#define FP_SAVE_UC(ucp) -#define FP_RESTORE_UC(ucp) -#define SET_RETURN_ADDR_JB(jb, ra) do { \ - (jb)[0]._jb[2] = (long)(ra); \ - (jb)[0]._jb[R_RA + 4] = (long)(ra); \ - (jb)[0]._jb[R_T12 + 4] = (long)(ra); \ -} while (0) +#define UCP_STACK(ucp) ((ucp)->uc_mcontext.mc_regs[R_SP]) #else -#error "Don't recognize this architecture!" +#error "Don't recognize this architecture!" #endif /* @@ -595,22 +562,12 @@ * up the thread to run a signal handler. */ struct pthread_signal_frame { - /* - * This stores the threads state before the signal. - */ - struct pthread_state_data saved_state; - - /* - * Threads return context; we use only jmp_buf's for now. - */ - union { - jmp_buf jb; - ucontext_t uc; - } ctx; - int signo; /* signal, arg 1 to sighandler */ - int sig_has_args; /* use signal args if true */ - ucontext_t uc; - siginfo_t siginfo; + struct pthread_state_data saved_state; /* State before the signal. */ + ucontext_t ctx; /* Thread's return context. */ + int signo; /* Signal, arg 1 to sighandler. */ + int sig_has_args; /* Use signal args if true. */ + ucontext_t uc; /* Pre-signal context. */ + siginfo_t siginfo; }; struct pthread_specific_elem { @@ -652,12 +609,9 @@ struct pthread_attr attr; /* - * Threads return context; we use only jmp_buf's for now. + * Machine context. */ - union { - jmp_buf jb; - ucontext_t uc; - } ctx; + ucontext_t ctx; /* * Used for tracking delivery of signal handlers. @@ -1096,9 +1050,9 @@ /* * Declare the kernel scheduler jump buffer and stack: */ -SCLASS jmp_buf _thread_kern_sched_jb; +SCLASS ucontext_t _thread_kern_sched_ctx; -SCLASS void * _thread_kern_sched_stack +SCLASS void * _thread_kern_sched_stack #ifdef GLOBAL_PTHREAD_PRIVATE = NULL #endif @@ -1322,12 +1276,6 @@ ssize_t __sys_write(int, const void *, size_t); #endif -/* #include */ -#ifdef _SETJMP_H_ -extern void __siglongjmp(sigjmp_buf, int) __dead2; -extern void __longjmp(jmp_buf, int) __dead2; -extern void ___longjmp(jmp_buf, int) __dead2; -#endif __END_DECLS #endif /* !_PTHREAD_PRIVATE_H */ ==== //depot/projects/kse/lib/libc_r/uthread/uthread_create.c#2 (text+ko) ==== @@ -128,21 +128,13 @@ /* Initialize the signal frame: */ new_thread->curframe = NULL; - /* Initialise the jump buffer: */ - _setjmp(new_thread->ctx.jb); - - /* - * Set up new stack frame so that it looks like it - * returned from a longjmp() to the beginning of - * _thread_start(). - */ - SET_RETURN_ADDR_JB(new_thread->ctx.jb, _thread_start); + /* Initialise the machine context: */ + getcontext(&new_thread->ctx); + new_thread->ctx.uc_stack.ss_sp = new_thread->stack; + new_thread->ctx.uc_stack.ss_size = + pattr->stacksize_attr; + makecontext(&new_thread->ctx, _thread_start, 1); - /* The stack starts high and builds down: */ - SET_STACK_JB(new_thread->ctx.jb, - (long)new_thread->stack + pattr->stacksize_attr - - sizeof(double)); - /* Copy the thread attributes: */ memcpy(&new_thread->attr, pattr, sizeof(struct pthread_attr)); @@ -257,7 +249,7 @@ { struct pthread *curthread = _get_curthread(); - /* We just left the scheduler via longjmp: */ + /* We just left the scheduler via swapcontext: */ _thread_kern_in_sched = 0; /* Run the current thread's start routine with argument: */ ==== //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#2 (text+ko) ==== @@ -312,15 +312,16 @@ /* Set the main thread stack pointer. */ _thread_initial->stack = _usrstack - PTHREAD_STACK_INITIAL; - /* Set the stack attributes: */ + /* Set the stack attributes. */ _thread_initial->attr.stackaddr_attr = _thread_initial->stack; _thread_initial->attr.stacksize_attr = PTHREAD_STACK_INITIAL; /* Setup the context for the scheduler: */ - _setjmp(_thread_kern_sched_jb); - SET_STACK_JB(_thread_kern_sched_jb, _thread_kern_sched_stack + - sched_stack_size - sizeof(double)); - SET_RETURN_ADDR_JB(_thread_kern_sched_jb, _thread_kern_scheduler); + getcontext(&_thread_kern_sched_ctx); + _thread_kern_sched_ctx.uc_stack.ss_sp = + _thread_kern_sched_stack; + _thread_kern_sched_ctx.uc_stack.ss_size = sched_stack_size; + makecontext(&_thread_kern_sched_ctx, _thread_kern_scheduler, 1); /* * Write a magic value to the thread structure @@ -332,6 +333,11 @@ _thread_initial->cancelflags = PTHREAD_CANCEL_ENABLE | PTHREAD_CANCEL_DEFERRED; + /* Setup the context for initial thread. */ + getcontext(&_thread_initial->ctx); + _thread_kern_sched_ctx.uc_stack.ss_sp = _thread_initial->stack; + _thread_kern_sched_ctx.uc_stack.ss_size = PTHREAD_STACK_INITIAL; + /* Default the priority of the initial thread: */ _thread_initial->base_priority = PTHREAD_DEFAULT_PRIORITY; _thread_initial->active_priority = PTHREAD_DEFAULT_PRIORITY; ==== //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#2 (text+ko) ==== @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -95,7 +94,7 @@ curthread->check_pending = 1; /* Switch to the thread scheduler: */ - ___longjmp(_thread_kern_sched_jb, 1); + swapcontext(&curthread->ctx, &_thread_kern_sched_ctx); } @@ -113,64 +112,56 @@ /* Check if this function was called from the signal handler: */ if (ucp != NULL) { - /* XXX - Save FP registers? */ - FP_SAVE_UC(ucp); called_from_handler = 1; DBG_MSG("Entering scheduler due to signal\n"); } - /* Save the state of the current thread: */ - if (_setjmp(curthread->ctx.jb) != 0) { - DBG_MSG("Returned from ___longjmp, thread %p\n", - curthread); - /* - * This point is reached when a longjmp() is called - * to restore the state of a thread. - * - * This is the normal way out of the scheduler. - */ - _thread_kern_in_sched = 0; + /* Switch into the scheduler's context. */ + swapcontext(&curthread->ctx, &_thread_kern_sched_ctx); + DBG_MSG("Returned from swapcontext, thread %p\n", curthread); - if (curthread->sig_defer_count == 0) { - if (((curthread->cancelflags & - PTHREAD_AT_CANCEL_POINT) == 0) && - ((curthread->cancelflags & - PTHREAD_CANCEL_ASYNCHRONOUS) != 0)) - /* - * Cancellations override signals. - * - * Stick a cancellation point at the - * start of each async-cancellable - * thread's resumption. - * - * We allow threads woken at cancel - * points to do their own checks. - */ - pthread_testcancel(); - } + /* + * This point is reached when swapcontext() is called + * to restore the state of a thread. + * + * This is the normal way out of the scheduler. + */ + _thread_kern_in_sched = 0; - if (_sched_switch_hook != NULL) { - /* Run the installed switch hook: */ - thread_run_switch_hook(_last_user_thread, curthread); - } - if (ucp == NULL) - return; - else { - /* XXX - Restore FP registers? */ - FP_RESTORE_UC(ucp); - + if (curthread->sig_defer_count == 0) { + if (((curthread->cancelflags & + PTHREAD_AT_CANCEL_POINT) == 0) && + ((curthread->cancelflags & + PTHREAD_CANCEL_ASYNCHRONOUS) != 0)) /* - * Set the process signal mask in the context; it - * could have changed by the handler. + * Cancellations override signals. + * + * Stick a cancellation point at the + * start of each async-cancellable + * thread's resumption. + * + * We allow threads woken at cancel + * points to do their own checks. */ - ucp->uc_sigmask = _process_sigmask; + pthread_testcancel(); + } + + if (_sched_switch_hook != NULL) { + /* Run the installed switch hook: */ + thread_run_switch_hook(_last_user_thread, curthread); + } + if (ucp == NULL) + return; + else { + /* + * Set the process signal mask in the context; it + * could have changed by the handler. + */ + ucp->uc_sigmask = _process_sigmask; - /* Resume the interrupted thread: */ - __sys_sigreturn(ucp); - } + /* Resume the interrupted thread: */ + __sys_sigreturn(ucp); } - /* Switch to the thread scheduler: */ - ___longjmp(_thread_kern_sched_jb, 1); } void @@ -193,30 +184,31 @@ unsigned int current_tick; int add_to_prioq; - /* If the currently running thread is a user thread, save it: */ - if ((curthread->flags & PTHREAD_FLAGS_PRIVATE) == 0) - _last_user_thread = curthread; - - if (called_from_handler != 0) { - called_from_handler = 0; - - /* - * We were called from a signal handler; restore the process - * signal mask. - */ - if (__sys_sigprocmask(SIG_SETMASK, - &_process_sigmask, NULL) != 0) - PANIC("Unable to restore process mask after signal"); - } - /* * Enter a scheduling loop that finds the next thread that is * ready to run. This loop completes when there are no more threads - * in the global list or when a thread has its state restored by - * either a sigreturn (if the state was saved as a sigcontext) or a - * longjmp (if the state was saved by a setjmp). + * in the global list. It is interrupted each time a thread is + * scheduled, but will continue when we return. */ while (!(TAILQ_EMPTY(&_thread_list))) { + + /* If the currently running thread is a user thread, save it: */ + if ((curthread->flags & PTHREAD_FLAGS_PRIVATE) == 0) + _last_user_thread = curthread; + + if (called_from_handler != 0) { + called_from_handler = 0; + + /* + * We were called from a signal handler; restore + * the process signal mask. + */ + if (__sys_sigprocmask(SIG_SETMASK, + &_process_sigmask, NULL) != 0) + PANIC( + "Unable to restore process mask after signal"); + } + /* Get the current time of day: */ GET_CURRENT_TOD(tv); TIMEVAL_TO_TIMESPEC(&tv, &ts); @@ -584,13 +576,7 @@ /* * Continue the thread at its current frame: */ -#if NOT_YET - _setcontext(&curthread->ctx.uc); -#else - ___longjmp(curthread->ctx.jb, 1); -#endif - /* This point should not be reached. */ - PANIC("Thread has returned from sigreturn or longjmp"); + swapcontext(&_thread_kern_sched_ctx, &curthread->ctx); } } ==== //depot/projects/kse/lib/libc_r/uthread/uthread_sig.c#2 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include "pthread_private.h" @@ -1008,7 +1007,7 @@ /* * Lower the priority before calling the handler in case - * it never returns (longjmps back): + * it never returns (e.g., it switchcontext()s): */ thread->active_priority &= ~PTHREAD_SIGNAL_PRIORITY; @@ -1038,9 +1037,11 @@ { struct pthread_signal_frame *psf = NULL; unsigned long stackp; + size_t stacksize; + char *stackbase; /* Get the top of the threads stack: */ - stackp = GET_STACK_JB(thread->ctx.jb); + stackp = UCP_STACK(&thread->ctx); /* * Leave a little space on the stack and round down to the @@ -1080,9 +1081,13 @@ * Set up the context: */ stackp -= sizeof(double); - _setjmp(thread->ctx.jb); - SET_STACK_JB(thread->ctx.jb, stackp); - SET_RETURN_ADDR_JB(thread->ctx.jb, _thread_sig_wrapper); + stackbase = thread->ctx.uc_stack.ss_sp; + stacksize = thread->ctx.uc_stack.ss_size; + getcontext(&thread->ctx); + thread->ctx.uc_stack.ss_sp = stackbase; + thread->ctx.uc_stack.ss_size = stacksize; + makecontext(&thread->ctx, _thread_sig_wrapper, 1); + UCP_STACK(&thread->ctx) = stackp; } void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 10:25:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F06437B405; Wed, 31 Jul 2002 10:25:13 -0700 (PDT) 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 C797537B401 for ; Wed, 31 Jul 2002 10:25:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86CBE43E65 for ; Wed, 31 Jul 2002 10:25:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VHPCJU009540 for ; Wed, 31 Jul 2002 10:25:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VHPC7Z009537 for perforce@freebsd.org; Wed, 31 Jul 2002 10:25:12 -0700 (PDT) Date: Wed, 31 Jul 2002 10:25:12 -0700 (PDT) Message-Id: <200207311725.g6VHPC7Z009537@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15326 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15326 Change 15326 by rwatson@rwatson_tislabs on 2002/07/31 10:24:57 Short-circuit the MAC check on receiving raw IP packets if the IPsec check has already failed. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#14 (text+ko) ==== @@ -158,7 +158,8 @@ } #endif /*IPSEC*/ #ifdef MAC - if (mac_check_socket_receive(last->inp_socket, + if (policyfail == 0 && + mac_check_socket_receive(last->inp_socket, n) != 0) policyfail = 1; #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 10:28:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CCE837B405; Wed, 31 Jul 2002 10:28:18 -0700 (PDT) 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 B1CEA37B401 for ; Wed, 31 Jul 2002 10:28:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6265B43E5E for ; Wed, 31 Jul 2002 10:28:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VHSHJU009696 for ; Wed, 31 Jul 2002 10:28:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VHSHXA009693 for perforce@freebsd.org; Wed, 31 Jul 2002 10:28:17 -0700 (PDT) Date: Wed, 31 Jul 2002 10:28:17 -0700 (PDT) Message-Id: <200207311728.g6VHSHXA009693@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15328 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15328 Change 15328 by rwatson@rwatson_tislabs on 2002/07/31 10:28:15 Change the logic for IPsec and MAC policy composition a little so that it looks a bit more like the existing logic. Fix a bug wherein n might be freed but not nulled (possibly not possible). Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#15 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#15 (text+ko) ==== @@ -145,10 +145,9 @@ continue; if (last) { struct mbuf *n = m_copy(m, 0, (int)M_COPYALL); - int policyfail; + int policyfail = 0; if (n != NULL) { - policyfail = 0; #ifdef IPSSEC /* check AH/ESP integrity. */ if (ipsec4_in_reject_so(n, last->inp_socket)) { @@ -163,10 +162,10 @@ n) != 0) policyfail = 1; #endif - if (policyfail) - m_freem(n); } - if (n) { + if (policyfail) + m_freem(n); + else if (n) { if (last->inp_flags & INP_CONTROLOPTS || last->inp_socket->so_options & SO_TIMESTAMP) ip_savecontrol(last, &opts, ip, n); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 11:55:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1296337B401; Wed, 31 Jul 2002 11:54:09 -0700 (PDT) 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 95D8C37B400 for ; Wed, 31 Jul 2002 11:54:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D080643E65 for ; Wed, 31 Jul 2002 11:54:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VIs7JU024332 for ; Wed, 31 Jul 2002 11:54:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VIs6tq024300 for perforce@freebsd.org; Wed, 31 Jul 2002 11:54:06 -0700 (PDT) Date: Wed, 31 Jul 2002 11:54:06 -0700 (PDT) Message-Id: <200207311854.g6VIs6tq024300@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15336 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15336 Change 15336 by rwatson@rwatson_tislabs on 2002/07/31 11:53:09 IFC -CURRENT into trustedbsd base tree. Pick up hoards of MAC changes trickling back through, etc. Also, libc compile fix. Affected files ... .. //depot/projects/trustedbsd/base/bin/cat/cat.c#7 integrate .. //depot/projects/trustedbsd/base/bin/cp/utils.c#6 integrate .. //depot/projects/trustedbsd/base/bin/ed/cbc.c#4 integrate .. //depot/projects/trustedbsd/base/bin/ed/ed.h#4 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.c#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipsec#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_array.c#4 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#32 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.c#6 integrate .. //depot/projects/trustedbsd/base/share/dict/propernames#2 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#11 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.alpha#6 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.i386#7 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.ia64#9 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.pc98#6 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.powerpc#7 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.sparc64#11 integrate .. //depot/projects/trustedbsd/base/sys/conf/Makefile.x86_64#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#14 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.sparc64#13 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/pst/pst-iop.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/pst/pst-iop.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/pst/pst-pci.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/pst/pst-raid.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/hid.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ucom.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/udbp.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ufm.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhub.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umodem.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ums.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/urio.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_port.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvscom.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vfsops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#14 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/bsd_comp.c#4 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#11 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#12 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/if_ether.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/igmp.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_output.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.h#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.h#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac_ifoff/mac_ifoff.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.h#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac_seeotheruids/mac_seeotheruids.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#1 branch .. //depot/projects/trustedbsd/base/sys/sparc64/include/emul.h#2 delete .. //depot/projects/trustedbsd/base/sys/sparc64/include/pv.h#5 delete .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/emul.c#4 delete .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.s#12 delete .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/fp.c#4 delete .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/locore.s#7 delete .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_exception.s#6 delete .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_locore.s#5 delete .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pv.c#8 delete .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/support.s#11 delete .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/swtch.s#8 delete .. //depot/projects/trustedbsd/base/sys/sys/unistd.h#5 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_glue.c#15 integrate Differences ... ==== //depot/projects/trustedbsd/base/bin/cat/cat.c#7 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.26 2002/06/30 05:13:51 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.27 2002/07/31 16:50:21 markm Exp $"); #include #include @@ -121,6 +121,7 @@ if (fclose(stdout)) err(1, "stdout"); exit(rval); + /* NOTREACHED */ } static void @@ -128,6 +129,7 @@ { fprintf(stderr, "usage: cat [-benstuv] [file ...]\n"); exit(1); + /* NOTREACHED */ } void ==== //depot/projects/trustedbsd/base/bin/cp/utils.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.37 2002/07/23 00:42:56 johan Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.38 2002/07/31 16:52:16 markm Exp $"); #include #include @@ -140,10 +140,10 @@ for (bufp = p, wresid = fs->st_size; ; bufp += wcount, wresid -= (size_t)wcount) { wcount = write(to_fd, bufp, wresid); - if (wcount >= wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid || wcount <= 0) break; } - if (wcount != wresid) { + if (wcount != (ssize_t)wresid) { warn("%s", to.p_path); rval = 1; } @@ -160,10 +160,10 @@ for (bufp = buf, wresid = rcount; ; bufp += wcount, wresid -= wcount) { wcount = write(to_fd, bufp, wresid); - if (wcount >= wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid || wcount <= 0) break; } - if (wcount != wresid) { + if (wcount != (ssize_t)wresid) { warn("%s", to.p_path); rval = 1; break; ==== //depot/projects/trustedbsd/base/bin/ed/cbc.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.16 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.17 2002/07/31 16:49:01 markm Exp $"); #include #include @@ -56,11 +56,11 @@ #define MEMZERO(dest,len) memset((dest), 0, (len)) /* Hide the calls to the primitive encryption routines. */ -#define DES_KEY(buf) \ - if (des_setkey(buf)) \ +#define DES_KEY(buf) \ + if (des_setkey(buf)) \ des_error("des_setkey"); -#define DES_XFORM(buf) \ - if (des_cipher(buf, buf, 0L, (inverse ? -1 : 1))) \ +#define DES_XFORM(buf) \ + if (des_cipher((char *)buf, (char *)buf, 0L, inverse ? -1 : 1)) \ des_error("des_cipher"); /* @@ -332,7 +332,7 @@ * This encrypts using the Cipher Block Chaining mode of DES */ int -cbc_encode(char *msgbuf, int n, FILE *fp) +cbc_encode(unsigned char *msgbuf, int n, FILE *fp) { int inverse = 0; /* 0 to encrypt, 1 to decrypt */ @@ -370,7 +370,7 @@ * fp input file descriptor */ int -cbc_decode(char *msgbuf, FILE *fp) +cbc_decode(unsigned char *msgbuf, FILE *fp) { Desbuf tbuf; /* temp buffer for initialization vector */ int n; /* number of bytes actually read */ ==== //depot/projects/trustedbsd/base/bin/ed/ed.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp - * $FreeBSD: src/bin/ed/ed.h,v 1.17 2002/06/20 05:28:02 jmallett Exp $ + * $FreeBSD: src/bin/ed/ed.h,v 1.18 2002/07/31 16:49:01 markm Exp $ */ #include @@ -180,8 +180,8 @@ int append_lines(long); int apply_subst_template(const char *, regmatch_t *, int, int); int build_active_list(int); -int cbc_decode(char *, FILE *); -int cbc_encode(char *, int, FILE *); +int cbc_decode(unsigned char *, FILE *); +int cbc_encode(unsigned char *, int, FILE *); int check_addr_range(long, long); void clear_active_list(void); void clear_undo_stack(void); ==== //depot/projects/trustedbsd/base/bin/ln/ln.c#7 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.28 2002/06/30 05:13:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.29 2002/07/31 16:53:59 markm Exp $"); #include #include @@ -190,7 +190,7 @@ else ++p; if (snprintf(path, sizeof(path), "%s/%s", source, p) >= - sizeof(path)) { + (ssize_t)sizeof(path)) { errno = ENAMETOOLONG; warn("%s", target); return (1); ==== //depot/projects/trustedbsd/base/etc/rc.d/ipsec#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.3 2002/07/31 16:39:19 ume Exp $ # # PROVIDE: ipsec @@ -24,6 +24,15 @@ reload_cmd="ipsec_reload" extra_commands="reload" +case `${CMD_OSTYPE}` in +FreeBSD) + ipsec_program="/usr/sbin/setkey" + ;; +NetBSD) + ipsec_program="/sbin/setkey" + ;; +esac + ipsec_prestart() { if [ ! -f "$ipsec_file" ]; then @@ -45,7 +54,7 @@ ipsec_start() { echo "Installing ipsec manual keys/policies." - /sbin/setkey -f $ipsec_file + ${ipsec_program} -f $ipsec_file } ipsec_stop() @@ -56,16 +65,16 @@ # it is very questionable to do this during shutdown session, since # it can hang any of remaining IPv4/v6 session. # - /sbin/setkey -F - /sbin/setkey -FP + ${ipsec_program} -F + ${ipsec_program} -FP } ipsec_reload() { echo "Reloading ipsec manual keys/policies." - /sbin/setkey -F - /sbin/setkey -FP - /sbin/setkey -f "$ipsec_file" + ${ipsec_program} -F + ${ipsec_program} -FP + ${ipsec_program} -f "$ipsec_file" } load_rc_config $name ==== //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_array.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)xdr_array.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.11 2002/07/31 12:50:28 darrenr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.13 2002/07/31 15:09:49 nectar Exp $"); /* * xdr_array.c, Generic XDR routines impelmentation. @@ -47,6 +47,7 @@ #include "namespace.h" #include +#include #include #include #include ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#32 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.399 2002/07/31 04:01:12 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.400 2002/07/31 16:13:59 bmah Exp $ 2000 @@ -1945,6 +1945,12 @@ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:30.ktrace.asc">FreeBSD-SA-02:30 for more details. &merged; + A race condition in &man.pppd.8;, which could be used to + change the permissions of an arbitrary file, has been corrected. + For more information, see security advisory FreeBSD-SA-02:32. + &merged; + ==== //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.c#6 (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. * - * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.16 2002/04/05 21:51:03 sos Exp $ + * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.17 2002/07/31 18:30:38 sos Exp $ */ #include @@ -119,6 +119,7 @@ printf("\n"); printf("ATA/ATAPI revision %d\n", version(parm->version_major)); printf("device model %.40s\n", parm->model); + printf("serial number %.20s\n", parm->serial); printf("firmware revision %.8s\n", parm->revision); printf("cylinders %d\n", parm->cylinders); ==== //depot/projects/trustedbsd/base/share/dict/propernames#2 (text+ko) ==== @@ -6,8 +6,6 @@ Ahmed Ahmet Aimee -Amy -Ami Al Alain Alan @@ -73,8 +71,8 @@ Bart Barton Bea +Beckie Becky -Beckie Belinda Ben Benjamin @@ -88,8 +86,8 @@ Betty Beverly Bill +Billie Billy -Billie Bjorne Blaine Blair @@ -136,19 +134,15 @@ Caroline Carolyn Carsten -Kirsten -Cristi -Kristi Carter Cary Case Casey -Leith Casper -Cathy Catherine Cathrin Cathryn +Cathy Cecilia Celeste Celia @@ -167,12 +161,11 @@ Christophe Christopher Chuck -Charles Cindie Cindy +Claire Clara Clare -Claire Clarence Clarissa Clark @@ -181,12 +174,11 @@ Claudio Clay Clayton -Samuel +Clem Cliff Clifford Clyde Cole -Clem Coleen Colin Collin @@ -197,7 +189,7 @@ Courtney Craig Cris -Kris +Cristi Cristina Cristopher Curt @@ -208,15 +200,14 @@ Dalton Damon Damone -Ramon Dan Dana Dani Daniel Daniele Danielle +Dannie Danny -Dannie Darci Daren Darin @@ -240,17 +231,13 @@ Dennis Derek Devon -Huey Dewey -Louis -Louie Diana Diane Dick -Richard Dieter +Dimetry Dimitry -Dimetry Dion Dirk Dominic @@ -259,14 +246,14 @@ Donal Donald Donn +Donna Donne -Donna Donnie Donovan Dori -Dory Dorian Dorothy +Dory Doug Douglas Doyle @@ -281,22 +268,17 @@ Earl Earle Earnie -Ernie Ed +Eddie Eddy Edgar -Eddie Edith Edmond Edmund Eduardo Edward Edwin -Eva Eileen -Erick -Erik -Eric Elaine Eli Elias @@ -310,12 +292,13 @@ Elric Elsa Elvis +Elwood Emil Emily -Elwood Emma Emmett Eric +Erick Erik Ernest Ernie @@ -323,12 +306,12 @@ Erwin Ethan Eugene +Eva Evan Evelyn Everett Farouk Fay -Frederick Felix Fletcher Floria @@ -340,8 +323,6 @@ Francois Frank Franklin -Jerrie -Jerry Fred Frederic Frederick @@ -354,22 +335,16 @@ Gene Geoff Geoffrey -Jeff -Jeffrey -Jeffie George Gerald -Jerald -Hazel Gerard Gideon Gigi Gil +Giles Gill Gilles -Giles Ginny -Jinny Giovanni Glen Glenn @@ -404,6 +379,7 @@ Hartmann Harv Harvey +Hazel Heather Hector Heidi @@ -437,6 +413,7 @@ Hsuan Huashi Hubert +Huey Hugh Hughes Hui @@ -495,14 +472,17 @@ Jef Jeff Jeffery +Jeffie Jeffrey Jelske Jem Jenine Jennie Jennifer +Jerald Jeremy Jerome +Jerrie Jerry Jesper Jess @@ -516,6 +496,7 @@ Jin Jinchao Jingbai +Jinny Jiri Jisheng Jitendra @@ -606,6 +587,7 @@ Kinch King Kirk +Kirsten Kit Kitty Klaudia @@ -651,9 +633,10 @@ Leif Leigh Leila +Leith Len +Lenny Lenora -Lenny Leo Leon Leonard @@ -688,6 +671,7 @@ Lorien Lorraine Lou +Louie Louiqa Louis Louise @@ -971,6 +955,7 @@ Ramesh Ramiro Ramneek +Ramon Ramsey Rand Randal @@ -1305,8 +1290,8 @@ Warren Wayne Wendell +Wendi Wendy -Wendi Werner Wes Will ==== //depot/projects/trustedbsd/base/share/examples/etc/make.conf#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.195 2002/07/29 08:51:04 ru Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.196 2002/07/31 15:06:09 ume Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -293,7 +293,7 @@ # sendmail and its related utilities. For example, SASL support can be # added with settings such as: # -# SENDMAIL_CFLAGS=-I/usr/local/include/sasl -DSASL +# SENDMAIL_CFLAGS=-I/usr/local/include/sasl1 -DSASL # SENDMAIL_LDFLAGS=-L/usr/local/lib # SENDMAIL_LDADD=-lsasl # ==== //depot/projects/trustedbsd/base/sys/conf/Makefile.alpha#6 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.124 2002/07/13 19:36:13 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.125 2002/07/31 14:59:05 jake Exp $ # # Makefile for FreeBSD # @@ -90,6 +90,9 @@ @(echo "define(NAME,\`__reml')define(OP,\`rem')define(S,\`true')"; \ echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET} +locore.o: $S/$M/$M/locore.s assym.s + ${NORMAL_S} + %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/trustedbsd/base/sys/conf/Makefile.i386#7 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.i386,v 1.256 2002/07/13 19:36:13 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.i386,v 1.257 2002/07/31 14:59:05 jake Exp $ # # Makefile for FreeBSD # @@ -44,6 +44,9 @@ %CLEAN +locore.o: $S/$M/$M/locore.s assym.s + ${NORMAL_S} + %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/trustedbsd/base/sys/conf/Makefile.ia64#9 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.51 2002/07/13 19:36:13 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.52 2002/07/31 14:59:05 jake Exp $ # # Makefile for FreeBSD # @@ -46,6 +46,9 @@ %CLEAN +locore.o: $S/$M/$M/locore.s assym.s + ${NORMAL_S} + %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/trustedbsd/base/sys/conf/Makefile.pc98#6 (text+ko) ==== @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.157 2002/07/13 19:36:13 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.158 2002/07/31 14:59:05 jake Exp $ # # Makefile for FreeBSD # @@ -45,6 +45,9 @@ %CLEAN +locore.o: $S/$M/$M/locore.s assym.s + ${NORMAL_S} + %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/trustedbsd/base/sys/conf/Makefile.powerpc#7 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.262 2002/07/13 19:36:13 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.263 2002/07/31 14:59:05 jake Exp $ # # Makefile for FreeBSD # @@ -54,6 +54,9 @@ %CLEAN +locore.o: $S/$M/$M/locore.s assym.s + ${NORMAL_S} + %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/trustedbsd/base/sys/conf/Makefile.sparc64#11 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.20 2002/07/13 19:36:14 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.22 2002/07/31 15:52:04 jake Exp $ # # Makefile for FreeBSD # @@ -39,7 +39,7 @@ # XXX: this should probably go somewhere else COPTS+= -mcmodel=medlow -msoft-float -SYSTEM_SFILES= $S/$M/$M/locore.s $S/$M/$M/exception.s +SYSTEM_SFILES= $S/$M/$M/locore.S $S/$M/$M/exception.S SYSTEM_OBJS= locore.o exception.o vnode_if.o ${OBJS} hints.o env.o config.o hack.So %BEFORE_DEPEND @@ -60,7 +60,10 @@ # grep -v 'struct/union .* never defined' | \ # grep -v 'possible pointer alignment problem' -exception.o: $S/$M/$M/exception.s assym.s +exception.o: $S/$M/$M/exception.S assym.s + ${NORMAL_S} + +locore.o: $S/$M/$M/locore.S assym.s ${NORMAL_S} %RULES ==== //depot/projects/trustedbsd/base/sys/conf/Makefile.x86_64#2 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.x86_64,v 1.2 2002/07/13 19:36:14 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.x86_64,v 1.3 2002/07/31 14:59:05 jake Exp $ # # Makefile for FreeBSD # @@ -45,6 +45,9 @@ %CLEAN +locore.o: $S/$M/$M/locore.s assym.s + ${NORMAL_S} + %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/trustedbsd/base/sys/conf/files.i386#14 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.408 2002/07/24 12:35:52 jhb Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.409 2002/07/31 18:27:30 sos Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -118,6 +118,9 @@ dev/kbd/kbd.c optional ukbd dev/kbd/kbd.c optional vt dev/lnc/if_lnc_isa.c optional lnc isa +dev/pst/pst-pci.c optional pst pci +dev/pst/pst-iop.c optional pst +dev/pst/pst-raid.c optional pst dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_isa.c optional sbni isa dev/sbni/if_sbni_pci.c optional sbni pci ==== //depot/projects/trustedbsd/base/sys/conf/files.sparc64#13 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.28 2002/07/29 00:45:13 jake Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.29 2002/07/31 15:52:04 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -36,10 +36,10 @@ sparc64/sparc64/db_trace.c optional ddb sparc64/sparc64/db_hwwatch.c optional ddb sparc64/sparc64/elf_machdep.c standard -# locore.s and exception.s need to be handled in Makefile to put them first. -# Otherwise it's they're normal. -# sparc64/sparc64/locore.s standard -# sparc64/sparc64/exception.s standard +# locore.S and exception.S need to be handled in the Makefile to put them +# first. Otherwise they're normal. +# sparc64/sparc64/locore.S standard +# sparc64/sparc64/exception.S standard sparc64/sparc64/eeprom.c optional eeprom sparc64/sparc64/eeprom_ebus.c optional eeprom ebus sparc64/sparc64/eeprom_sbus.c optional eeprom sbus @@ -49,8 +49,8 @@ sparc64/sparc64/iommu.c standard sparc64/sparc64/machdep.c standard sparc64/sparc64/mem.c standard -sparc64/sparc64/mp_exception.s optional smp -sparc64/sparc64/mp_locore.s optional smp +sparc64/sparc64/mp_exception.S optional smp +sparc64/sparc64/mp_locore.S optional smp sparc64/sparc64/mp_machdep.c optional smp sparc64/sparc64/nexus.c standard sparc64/sparc64/ofw_bus.c standard @@ -59,9 +59,9 @@ sparc64/sparc64/prof_machdep.c optional profiling-routine sparc64/sparc64/rwindow.c standard sparc64/sparc64/sparcbus_if.m standard -sparc64/sparc64/support.s standard +sparc64/sparc64/support.S standard sparc64/sparc64/sys_machdep.c standard -sparc64/sparc64/swtch.s standard +sparc64/sparc64/swtch.S standard sparc64/sparc64/tick.c standard sparc64/sparc64/tlb.c standard sparc64/sparc64/trap.c standard ==== //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#12 (text+ko) ==== @@ -6,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.23 2002/07/29 09:40:15 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.24 2002/07/31 14:59:05 jake Exp $ # # XXX why are only some phony targets marked phony? @@ -60,9 +60,6 @@ lint: ${CFILES} ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC} -locore.o: $S/$M/$M/locore.s assym.s - ${NORMAL_S} - # This is a hack. BFD "optimizes" away dynamic mode if there are no # dynamic references. We could probably do a '-Bforcedynamic' mode like # in the a.out ld. For now, this works. ==== //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#14 (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. * - * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.151 2002/07/22 18:35:01 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.152 2002/07/31 18:29:34 sos Exp $ */ #include "opt_ata.h" @@ -509,6 +509,9 @@ bswap(ata_parm->revision, sizeof(ata_parm->revision)); btrim(ata_parm->revision, sizeof(ata_parm->revision)); bpack(ata_parm->revision, ata_parm->revision, sizeof(ata_parm->revision)); + bswap(ata_parm->serial, sizeof(ata_parm->serial)); + btrim(ata_parm->serial, sizeof(ata_parm->serial)); + bpack(ata_parm->serial, ata_parm->serial, sizeof(ata_parm->serial)); atadev->param = ata_parm; return 0; } ==== //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.41 2001/01/23 14:04:13 augustss Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 12: 3:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B981F37B401; Wed, 31 Jul 2002 12:02:20 -0700 (PDT) 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 4072237B400 for ; Wed, 31 Jul 2002 12:02:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78D1A43E3B for ; Wed, 31 Jul 2002 12:02:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VJ2JJU025498 for ; Wed, 31 Jul 2002 12:02:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VJ2I87025495 for perforce@freebsd.org; Wed, 31 Jul 2002 12:02:18 -0700 (PDT) Date: Wed, 31 Jul 2002 12:02:18 -0700 (PDT) Message-Id: <200207311902.g6VJ2I87025495@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15337 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15337 Change 15337 by rwatson@rwatson_tislabs on 2002/07/31 12:02:10 IFC from trustedbsd_base. Trickle back in many of the MAC bits. Also, libc compile fix. There are probably integ nits. Affected files ... .. //depot/projects/trustedbsd/mac/bin/cat/cat.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/cp/utils.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/ed/cbc.c#4 integrate .. //depot/projects/trustedbsd/mac/bin/ed/ed.h#4 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.c#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ipsec#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_array.c#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#25 integrate .. //depot/projects/trustedbsd/mac/sbin/atacontrol/atacontrol.c#6 integrate .. //depot/projects/trustedbsd/mac/share/dict/propernames#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#10 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.alpha#5 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.i386#6 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.ia64#8 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.pc98#5 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.powerpc#6 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.sparc64#9 integrate .. //depot/projects/trustedbsd/mac/sys/conf/Makefile.x86_64#2 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#12 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#10 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pst/pst-iop.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/pst/pst-iop.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/pst/pst-pci.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/pst/pst-raid.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/hid.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ucom.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/udbp.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ufm.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ugen.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhid.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhub.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ulpt.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umodem.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ums.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/urio.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_port.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uscanner.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uvscom.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/net/bpf.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/net/bsd_comp.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/net/if.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_tun.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/if_ether.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/igmp.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#86 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#48 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#73 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#60 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/emul.h#2 delete .. //depot/projects/trustedbsd/mac/sys/sparc64/include/pv.h#5 delete .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/emul.c#4 delete .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.s#12 delete .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/fp.c#4 delete .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/locore.s#7 delete .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_exception.s#6 delete .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_locore.s#5 delete .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pv.c#8 delete .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/support.s#9 delete .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/swtch.s#8 delete .. //depot/projects/trustedbsd/mac/sys/sys/unistd.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_glue.c#14 integrate Differences ... ==== //depot/projects/trustedbsd/mac/bin/cat/cat.c#7 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.26 2002/06/30 05:13:51 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.27 2002/07/31 16:50:21 markm Exp $"); #include #include @@ -121,6 +121,7 @@ if (fclose(stdout)) err(1, "stdout"); exit(rval); + /* NOTREACHED */ } static void @@ -128,6 +129,7 @@ { fprintf(stderr, "usage: cat [-benstuv] [file ...]\n"); exit(1); + /* NOTREACHED */ } void ==== //depot/projects/trustedbsd/mac/bin/cp/utils.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.37 2002/07/23 00:42:56 johan Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/utils.c,v 1.38 2002/07/31 16:52:16 markm Exp $"); #include #include @@ -140,10 +140,10 @@ for (bufp = p, wresid = fs->st_size; ; bufp += wcount, wresid -= (size_t)wcount) { wcount = write(to_fd, bufp, wresid); - if (wcount >= wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid || wcount <= 0) break; } - if (wcount != wresid) { + if (wcount != (ssize_t)wresid) { warn("%s", to.p_path); rval = 1; } @@ -160,10 +160,10 @@ for (bufp = buf, wresid = rcount; ; bufp += wcount, wresid -= wcount) { wcount = write(to_fd, bufp, wresid); - if (wcount >= wresid || wcount <= 0) + if (wcount >= (ssize_t)wresid || wcount <= 0) break; } - if (wcount != wresid) { + if (wcount != (ssize_t)wresid) { warn("%s", to.p_path); rval = 1; break; ==== //depot/projects/trustedbsd/mac/bin/ed/cbc.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.16 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/cbc.c,v 1.17 2002/07/31 16:49:01 markm Exp $"); #include #include @@ -56,11 +56,11 @@ #define MEMZERO(dest,len) memset((dest), 0, (len)) /* Hide the calls to the primitive encryption routines. */ -#define DES_KEY(buf) \ - if (des_setkey(buf)) \ +#define DES_KEY(buf) \ + if (des_setkey(buf)) \ des_error("des_setkey"); -#define DES_XFORM(buf) \ - if (des_cipher(buf, buf, 0L, (inverse ? -1 : 1))) \ +#define DES_XFORM(buf) \ + if (des_cipher((char *)buf, (char *)buf, 0L, inverse ? -1 : 1)) \ des_error("des_cipher"); /* @@ -332,7 +332,7 @@ * This encrypts using the Cipher Block Chaining mode of DES */ int -cbc_encode(char *msgbuf, int n, FILE *fp) +cbc_encode(unsigned char *msgbuf, int n, FILE *fp) { int inverse = 0; /* 0 to encrypt, 1 to decrypt */ @@ -370,7 +370,7 @@ * fp input file descriptor */ int -cbc_decode(char *msgbuf, FILE *fp) +cbc_decode(unsigned char *msgbuf, FILE *fp) { Desbuf tbuf; /* temp buffer for initialization vector */ int n; /* number of bytes actually read */ ==== //depot/projects/trustedbsd/mac/bin/ed/ed.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp - * $FreeBSD: src/bin/ed/ed.h,v 1.17 2002/06/20 05:28:02 jmallett Exp $ + * $FreeBSD: src/bin/ed/ed.h,v 1.18 2002/07/31 16:49:01 markm Exp $ */ #include @@ -180,8 +180,8 @@ int append_lines(long); int apply_subst_template(const char *, regmatch_t *, int, int); int build_active_list(int); -int cbc_decode(char *, FILE *); -int cbc_encode(char *, int, FILE *); +int cbc_decode(unsigned char *, FILE *); +int cbc_encode(unsigned char *, int, FILE *); int check_addr_range(long, long); void clear_active_list(void); void clear_undo_stack(void); ==== //depot/projects/trustedbsd/mac/bin/ln/ln.c#7 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.28 2002/06/30 05:13:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/ln/ln.c,v 1.29 2002/07/31 16:53:59 markm Exp $"); #include #include @@ -190,7 +190,7 @@ else ++p; if (snprintf(path, sizeof(path), "%s/%s", source, p) >= - sizeof(path)) { + (ssize_t)sizeof(path)) { errno = ENAMETOOLONG; warn("%s", target); return (1); ==== //depot/projects/trustedbsd/mac/etc/rc.d/ipsec#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.3 2002/07/31 16:39:19 ume Exp $ # # PROVIDE: ipsec @@ -24,6 +24,15 @@ reload_cmd="ipsec_reload" extra_commands="reload" +case `${CMD_OSTYPE}` in +FreeBSD) + ipsec_program="/usr/sbin/setkey" + ;; +NetBSD) + ipsec_program="/sbin/setkey" + ;; +esac + ipsec_prestart() { if [ ! -f "$ipsec_file" ]; then @@ -45,7 +54,7 @@ ipsec_start() { echo "Installing ipsec manual keys/policies." - /sbin/setkey -f $ipsec_file + ${ipsec_program} -f $ipsec_file } ipsec_stop() @@ -56,16 +65,16 @@ # it is very questionable to do this during shutdown session, since # it can hang any of remaining IPv4/v6 session. # - /sbin/setkey -F - /sbin/setkey -FP + ${ipsec_program} -F + ${ipsec_program} -FP } ipsec_reload() { echo "Reloading ipsec manual keys/policies." - /sbin/setkey -F - /sbin/setkey -FP - /sbin/setkey -f "$ipsec_file" + ${ipsec_program} -F + ${ipsec_program} -FP + ${ipsec_program} -f "$ipsec_file" } load_rc_config $name ==== //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_array.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)xdr_array.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.11 2002/07/31 12:50:28 darrenr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.13 2002/07/31 15:09:49 nectar Exp $"); /* * xdr_array.c, Generic XDR routines impelmentation. @@ -47,6 +47,7 @@ #include "namespace.h" #include +#include #include #include #include ==== //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#25 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.399 2002/07/31 04:01:12 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.400 2002/07/31 16:13:59 bmah Exp $ 2000 @@ -1945,6 +1945,12 @@ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:30.ktrace.asc">FreeBSD-SA-02:30 for more details. &merged; + A race condition in &man.pppd.8;, which could be used to + change the permissions of an arbitrary file, has been corrected. + For more information, see security advisory FreeBSD-SA-02:32. + &merged; + ==== //depot/projects/trustedbsd/mac/sbin/atacontrol/atacontrol.c#6 (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. * - * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.16 2002/04/05 21:51:03 sos Exp $ + * $FreeBSD: src/sbin/atacontrol/atacontrol.c,v 1.17 2002/07/31 18:30:38 sos Exp $ */ #include @@ -119,6 +119,7 @@ printf("\n"); printf("ATA/ATAPI revision %d\n", version(parm->version_major)); printf("device model %.40s\n", parm->model); + printf("serial number %.20s\n", parm->serial); printf("firmware revision %.8s\n", parm->revision); printf("cylinders %d\n", parm->cylinders); ==== //depot/projects/trustedbsd/mac/share/dict/propernames#2 (text+ko) ==== @@ -6,8 +6,6 @@ Ahmed Ahmet Aimee -Amy -Ami Al Alain Alan @@ -73,8 +71,8 @@ Bart Barton Bea +Beckie Becky -Beckie Belinda Ben Benjamin @@ -88,8 +86,8 @@ Betty Beverly Bill +Billie Billy -Billie Bjorne Blaine Blair @@ -136,19 +134,15 @@ Caroline Carolyn Carsten -Kirsten -Cristi -Kristi Carter Cary Case Casey -Leith Casper -Cathy Catherine Cathrin Cathryn +Cathy Cecilia Celeste Celia @@ -167,12 +161,11 @@ Christophe Christopher Chuck -Charles Cindie Cindy +Claire Clara Clare -Claire Clarence Clarissa Clark @@ -181,12 +174,11 @@ Claudio Clay Clayton -Samuel +Clem Cliff Clifford Clyde Cole -Clem Coleen Colin Collin @@ -197,7 +189,7 @@ Courtney Craig Cris -Kris +Cristi Cristina Cristopher Curt @@ -208,15 +200,14 @@ Dalton Damon Damone -Ramon Dan Dana Dani Daniel Daniele Danielle +Dannie Danny -Dannie Darci Daren Darin @@ -240,17 +231,13 @@ Dennis Derek Devon -Huey Dewey -Louis -Louie Diana Diane Dick -Richard Dieter +Dimetry Dimitry -Dimetry Dion Dirk Dominic @@ -259,14 +246,14 @@ Donal Donald Donn +Donna Donne -Donna Donnie Donovan Dori -Dory Dorian Dorothy +Dory Doug Douglas Doyle @@ -281,22 +268,17 @@ Earl Earle Earnie -Ernie Ed +Eddie Eddy Edgar -Eddie Edith Edmond Edmund Eduardo Edward Edwin -Eva Eileen -Erick -Erik -Eric Elaine Eli Elias @@ -310,12 +292,13 @@ Elric Elsa Elvis +Elwood Emil Emily -Elwood Emma Emmett Eric +Erick Erik Ernest Ernie @@ -323,12 +306,12 @@ Erwin Ethan Eugene +Eva Evan Evelyn Everett Farouk Fay -Frederick Felix Fletcher Floria @@ -340,8 +323,6 @@ Francois Frank Franklin -Jerrie -Jerry Fred Frederic Frederick @@ -354,22 +335,16 @@ Gene Geoff Geoffrey -Jeff -Jeffrey -Jeffie George Gerald -Jerald -Hazel Gerard Gideon Gigi Gil +Giles Gill Gilles -Giles Ginny -Jinny Giovanni Glen Glenn @@ -404,6 +379,7 @@ Hartmann Harv Harvey +Hazel Heather Hector Heidi @@ -437,6 +413,7 @@ Hsuan Huashi Hubert +Huey Hugh Hughes Hui @@ -495,14 +472,17 @@ Jef Jeff Jeffery +Jeffie Jeffrey Jelske Jem Jenine Jennie Jennifer +Jerald Jeremy Jerome +Jerrie Jerry Jesper Jess @@ -516,6 +496,7 @@ Jin Jinchao Jingbai +Jinny Jiri Jisheng Jitendra @@ -606,6 +587,7 @@ Kinch King Kirk +Kirsten Kit Kitty Klaudia @@ -651,9 +633,10 @@ Leif Leigh Leila +Leith Len +Lenny Lenora -Lenny Leo Leon Leonard @@ -688,6 +671,7 @@ Lorien Lorraine Lou +Louie Louiqa Louis Louise @@ -971,6 +955,7 @@ Ramesh Ramiro Ramneek +Ramon Ramsey Rand Randal @@ -1305,8 +1290,8 @@ Warren Wayne Wendell +Wendi Wendy -Wendi Werner Wes Will ==== //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.195 2002/07/29 08:51:04 ru Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.196 2002/07/31 15:06:09 ume Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -293,7 +293,7 @@ # sendmail and its related utilities. For example, SASL support can be # added with settings such as: # -# SENDMAIL_CFLAGS=-I/usr/local/include/sasl -DSASL +# SENDMAIL_CFLAGS=-I/usr/local/include/sasl1 -DSASL # SENDMAIL_LDFLAGS=-L/usr/local/lib # SENDMAIL_LDADD=-lsasl # ==== //depot/projects/trustedbsd/mac/sys/conf/Makefile.alpha#5 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.alpha -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.alpha 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.124 2002/07/13 19:36:13 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.125 2002/07/31 14:59:05 jake Exp $ # # Makefile for FreeBSD # @@ -90,6 +90,9 @@ @(echo "define(NAME,\`__reml')define(OP,\`rem')define(S,\`true')"; \ echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET} +locore.o: $S/$M/$M/locore.s assym.s + ${NORMAL_S} + %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/trustedbsd/mac/sys/conf/Makefile.i386#6 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.i386,v 1.256 2002/07/13 19:36:13 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.i386,v 1.257 2002/07/31 14:59:05 jake Exp $ # # Makefile for FreeBSD # @@ -44,6 +44,9 @@ %CLEAN +locore.o: $S/$M/$M/locore.s assym.s + ${NORMAL_S} + %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/trustedbsd/mac/sys/conf/Makefile.ia64#8 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.51 2002/07/13 19:36:13 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.52 2002/07/31 14:59:05 jake Exp $ # # Makefile for FreeBSD # @@ -46,6 +46,9 @@ %CLEAN +locore.o: $S/$M/$M/locore.s assym.s + ${NORMAL_S} + %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/trustedbsd/mac/sys/conf/Makefile.pc98#5 (text+ko) ==== @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.157 2002/07/13 19:36:13 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.158 2002/07/31 14:59:05 jake Exp $ # # Makefile for FreeBSD # @@ -45,6 +45,9 @@ %CLEAN +locore.o: $S/$M/$M/locore.s assym.s + ${NORMAL_S} + %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/trustedbsd/mac/sys/conf/Makefile.powerpc#6 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.262 2002/07/13 19:36:13 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.263 2002/07/31 14:59:05 jake Exp $ # # Makefile for FreeBSD # @@ -54,6 +54,9 @@ %CLEAN +locore.o: $S/$M/$M/locore.s assym.s + ${NORMAL_S} + %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/trustedbsd/mac/sys/conf/Makefile.sparc64#9 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.20 2002/07/13 19:36:14 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.22 2002/07/31 15:52:04 jake Exp $ # # Makefile for FreeBSD # @@ -39,7 +39,7 @@ # XXX: this should probably go somewhere else COPTS+= -mcmodel=medlow -msoft-float -SYSTEM_SFILES= $S/$M/$M/locore.s $S/$M/$M/exception.s +SYSTEM_SFILES= $S/$M/$M/locore.S $S/$M/$M/exception.S SYSTEM_OBJS= locore.o exception.o vnode_if.o ${OBJS} hints.o env.o config.o hack.So %BEFORE_DEPEND @@ -60,7 +60,10 @@ # grep -v 'struct/union .* never defined' | \ # grep -v 'possible pointer alignment problem' -exception.o: $S/$M/$M/exception.s assym.s +exception.o: $S/$M/$M/exception.S assym.s + ${NORMAL_S} + +locore.o: $S/$M/$M/locore.S assym.s ${NORMAL_S} %RULES ==== //depot/projects/trustedbsd/mac/sys/conf/Makefile.x86_64#2 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.x86_64,v 1.2 2002/07/13 19:36:14 bde Exp $ +# $FreeBSD: src/sys/conf/Makefile.x86_64,v 1.3 2002/07/31 14:59:05 jake Exp $ # # Makefile for FreeBSD # @@ -45,6 +45,9 @@ %CLEAN +locore.o: $S/$M/$M/locore.s assym.s + ${NORMAL_S} + %RULES .include "$S/conf/kern.post.mk" ==== //depot/projects/trustedbsd/mac/sys/conf/files.i386#12 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.408 2002/07/24 12:35:52 jhb Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.409 2002/07/31 18:27:30 sos Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -118,6 +118,9 @@ dev/kbd/kbd.c optional ukbd dev/kbd/kbd.c optional vt dev/lnc/if_lnc_isa.c optional lnc isa +dev/pst/pst-pci.c optional pst pci +dev/pst/pst-iop.c optional pst +dev/pst/pst-raid.c optional pst dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_isa.c optional sbni isa dev/sbni/if_sbni_pci.c optional sbni pci ==== //depot/projects/trustedbsd/mac/sys/conf/files.sparc64#10 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.28 2002/07/29 00:45:13 jake Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.29 2002/07/31 15:52:04 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -36,10 +36,10 @@ sparc64/sparc64/db_trace.c optional ddb sparc64/sparc64/db_hwwatch.c optional ddb sparc64/sparc64/elf_machdep.c standard -# locore.s and exception.s need to be handled in Makefile to put them first. -# Otherwise it's they're normal. -# sparc64/sparc64/locore.s standard -# sparc64/sparc64/exception.s standard +# locore.S and exception.S need to be handled in the Makefile to put them +# first. Otherwise they're normal. +# sparc64/sparc64/locore.S standard +# sparc64/sparc64/exception.S standard sparc64/sparc64/eeprom.c optional eeprom sparc64/sparc64/eeprom_ebus.c optional eeprom ebus sparc64/sparc64/eeprom_sbus.c optional eeprom sbus @@ -49,8 +49,8 @@ sparc64/sparc64/iommu.c standard sparc64/sparc64/machdep.c standard sparc64/sparc64/mem.c standard -sparc64/sparc64/mp_exception.s optional smp -sparc64/sparc64/mp_locore.s optional smp +sparc64/sparc64/mp_exception.S optional smp +sparc64/sparc64/mp_locore.S optional smp sparc64/sparc64/mp_machdep.c optional smp sparc64/sparc64/nexus.c standard sparc64/sparc64/ofw_bus.c standard @@ -59,9 +59,9 @@ sparc64/sparc64/prof_machdep.c optional profiling-routine sparc64/sparc64/rwindow.c standard sparc64/sparc64/sparcbus_if.m standard -sparc64/sparc64/support.s standard +sparc64/sparc64/support.S standard sparc64/sparc64/sys_machdep.c standard -sparc64/sparc64/swtch.s standard +sparc64/sparc64/swtch.S standard sparc64/sparc64/tick.c standard sparc64/sparc64/tlb.c standard sparc64/sparc64/trap.c standard ==== //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#10 (text+ko) ==== @@ -6,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.23 2002/07/29 09:40:15 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.24 2002/07/31 14:59:05 jake Exp $ # # XXX why are only some phony targets marked phony? @@ -60,9 +60,6 @@ lint: ${CFILES} ${LINT} ${LINTKERNFLAGS} ${CFLAGS:M-[DILU]*} ${.ALLSRC} -locore.o: $S/$M/$M/locore.s assym.s - ${NORMAL_S} - # This is a hack. BFD "optimizes" away dynamic mode if there are no # dynamic references. We could probably do a '-Bforcedynamic' mode like # in the a.out ld. For now, this works. ==== //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#12 (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. * - * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.151 2002/07/22 18:35:01 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.152 2002/07/31 18:29:34 sos Exp $ */ #include "opt_ata.h" @@ -509,6 +509,9 @@ bswap(ata_parm->revision, sizeof(ata_parm->revision)); btrim(ata_parm->revision, sizeof(ata_parm->revision)); bpack(ata_parm->revision, ata_parm->revision, sizeof(ata_parm->revision)); + bswap(ata_parm->serial, sizeof(ata_parm->serial)); + btrim(ata_parm->serial, sizeof(ata_parm->serial)); + bpack(ata_parm->serial, ata_parm->serial, sizeof(ata_parm->serial)); atadev->param = ata_parm; return 0; } ==== //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudio.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.41 2001/01/23 14:04:13 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.3 2002/07/31 13:33:55 joe Exp $: */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 12:27:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8858037B401; Wed, 31 Jul 2002 12:27:52 -0700 (PDT) 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 37C7437B400 for ; Wed, 31 Jul 2002 12:27:52 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC15D43E31 for ; Wed, 31 Jul 2002 12:27:51 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VJRpJU032399 for ; Wed, 31 Jul 2002 12:27:51 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VJRpJw032396 for perforce@freebsd.org; Wed, 31 Jul 2002 12:27:51 -0700 (PDT) Date: Wed, 31 Jul 2002 12:27:51 -0700 (PDT) Message-Id: <200207311927.g6VJRpJw032396@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 15340 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15340 Change 15340 by jhb@jhb_laptop on 2002/07/31 12:27:13 IFC. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#45 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#45 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.103 2002/07/03 01:50:27 des Exp $ + * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.104 2002/07/27 16:54:23 jhb Exp $ */ /* @@ -412,7 +412,7 @@ KASSERT(m->mtx_object.lo_class == &lock_class_mtx_spin, ("mtx_lock_spin() of sleep mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); -#if defined(SMP) || LOCK_DEBUG > 0 +#if defined(SMP) || LOCK_DEBUG > 0 || 1 _get_spin_lock(m, curthread, opts, file, line); #else critical_enter(); @@ -434,7 +434,7 @@ LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); mtx_assert(m, MA_OWNED); -#if defined(SMP) || LOCK_DEBUG > 0 +#if defined(SMP) || LOCK_DEBUG > 0 || 1 _rel_spin_lock(m); #else critical_exit(); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 14:31:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31FFA37B401; Wed, 31 Jul 2002 14:31:32 -0700 (PDT) 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 C6DF837B400 for ; Wed, 31 Jul 2002 14:31:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86F5C43E42 for ; Wed, 31 Jul 2002 14:31:31 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g6VLVVJU053039 for ; Wed, 31 Jul 2002 14:31:31 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g6VLVV8L053036 for perforce@freebsd.org; Wed, 31 Jul 2002 14:31:31 -0700 (PDT) Date: Wed, 31 Jul 2002 14:31:31 -0700 (PDT) Message-Id: <200207312131.g6VLVV8L053036@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 15347 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15347 Change 15347 by green@green_laptop_2 on 2002/07/31 14:31:24 mac_cred_canexec() no longer exists; use mac_check_vnode_exec(). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#28 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#28 (text+ko) ==== @@ -398,10 +398,12 @@ attr.va_gid; #ifdef MAC + PROC_UNLOCK(p); vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); will_transition = mac_execve_will_transition(oldcred, imgp->vp); credential_changing |= will_transition; VOP_UNLOCK(imgp->vp, 0, td); + PROC_LOCK(p); #endif if (credential_changing && @@ -438,11 +440,13 @@ change_egid(newcred, attr.va_gid); #ifdef MAC if (will_transition) { + PROC_UNLOCK(p); vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); mac_execve_transition(oldcred, newcred, imgp->vp); VOP_UNLOCK(imgp->vp, 0, td); + PROC_LOCK(p); } -#endif +#endif /* MAC */ /* * Implement correct POSIX saved-id behavior. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 14:57:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3924B37B401; Wed, 31 Jul 2002 14:57:53 -0700 (PDT) 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 A307F37B400; Wed, 31 Jul 2002 14:57:52 -0700 (PDT) Received: from holly.calldei.com (adsl-208-191-149-232.dsl.hstntx.swbell.net [208.191.149.232]) by mx1.FreeBSD.org (Postfix) with ESMTP id 325CE43E31; Wed, 31 Jul 2002 14:57:52 -0700 (PDT) (envelope-from chris@holly.dyndns.org) Received: by holly.calldei.com (Postfix, from userid 1001) id CBA4AB00; Wed, 31 Jul 2002 16:58:45 -0500 (CDT) Date: Wed, 31 Jul 2002 16:58:45 -0500 From: Chris Costello To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 15347 for review Message-ID: <20020731215844.GD7042@holly.calldei.com> Reply-To: chris@FreeBSD.org References: <200207312131.g6VLVV8L053036@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200207312131.g6VLVV8L053036@freefall.freebsd.org> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wednesday, July 31, 2002, Brian Feldman wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15347 > > Change 15347 by green@green_laptop_2 on 2002/07/31 14:31:24 > > mac_cred_canexec() no longer exists; use mac_check_vnode_exec(). You misspelled "Unlock `p' when locking the vnode to transition the credential" or something like that... > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#28 edit > > Differences ... > > #ifdef MAC > + PROC_UNLOCK(p); > vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); > will_transition = mac_execve_will_transition(oldcred, imgp->vp); > credential_changing |= will_transition; > VOP_UNLOCK(imgp->vp, 0, td); > + PROC_LOCK(p); > #endif > > if (credential_changing && > @@ -438,11 +440,13 @@ > change_egid(newcred, attr.va_gid); > #ifdef MAC > if (will_transition) { > + PROC_UNLOCK(p); > vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); > mac_execve_transition(oldcred, newcred, imgp->vp); > VOP_UNLOCK(imgp->vp, 0, td); > + PROC_LOCK(p); > } > -#endif > +#endif /* MAC */ -- Chris Costello FreeBSD Project http://www.FreeBSD.org/ TrustedBSD Project http://www.TrustedBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 18:19:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98AD337B401; Wed, 31 Jul 2002 18:19:09 -0700 (PDT) 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 260C337B400 for ; Wed, 31 Jul 2002 18:19:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C303E43E4A for ; Wed, 31 Jul 2002 18:19:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g711J8JU088419 for ; Wed, 31 Jul 2002 18:19:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g711J8M0088416 for perforce@freebsd.org; Wed, 31 Jul 2002 18:19:08 -0700 (PDT) Date: Wed, 31 Jul 2002 18:19:08 -0700 (PDT) Message-Id: <200208010119.g711J8M0088416@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15354 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15354 Change 15354 by rwatson@rwatson_paprika on 2002/07/31 18:19:04 Remove dup from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#21 (text+ko) ==== @@ -744,11 +744,6 @@ mac_set_socket_peer_from_socket(so3, so); #endif -#ifdef MAC - mac_set_socket_peer_from_socket(so, so3); - mac_set_socket_peer_from_socket(so3, so); -#endif - so2 = so3; } error = unp_connect2(so, so2); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 19:20:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5A5237B401; Wed, 31 Jul 2002 19:19:28 -0700 (PDT) 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 2DDDE37B400 for ; Wed, 31 Jul 2002 19:19:27 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7DAC43E4A for ; Wed, 31 Jul 2002 19:19:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g712JQJU098407 for ; Wed, 31 Jul 2002 19:19:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g712JQGP098404 for perforce@freebsd.org; Wed, 31 Jul 2002 19:19:26 -0700 (PDT) Date: Wed, 31 Jul 2002 19:19:26 -0700 (PDT) Message-Id: <200208010219.g712JQGP098404@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15361 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15361 Change 15361 by rwatson@rwatson_paprika on 2002/07/31 19:18:47 Integ the TrustedBSD base branch from the main FreeBSD tree to pick up recent changes, including many MAC commits. Affected files ... .. //depot/projects/trustedbsd/base/lib/libstand/nfs.c#4 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#33 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/exception.s#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/genassym.c#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#13 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/sys_machdep.c#5 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#13 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/vm_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/proc.h#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_signal.c#6 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#26 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_eisa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs.h#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_mac.c#1 branch .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.h#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acl.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_tty.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#21 integrate .. //depot/projects/trustedbsd/base/sys/modules/aic7xxx/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/aic7xxx/ahc/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/aic7xxx/ahc/ahc_pci/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/aic7xxx/ahd/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/aic7xxx/aicasm/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/if_ppp/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_tun/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/procfs/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/pseudofs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#15 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#12 integrate .. //depot/projects/trustedbsd/base/sys/pccard/pccard_nbk.c#5 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/cache.c#8 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#18 integrate Differences ... ==== //depot/projects/trustedbsd/base/lib/libstand/nfs.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.9 2002/07/07 23:01:36 jake Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.10 2002/07/31 20:17:06 jake Exp $"); #include #include @@ -387,10 +387,14 @@ { struct iodesc *desc; struct nfs_iodesc *currfd; + char buf[2 * NFS_FHSIZE + 3]; + u_char *fh; + char *cp; + int i; #ifndef NFS_NOSYMLINK struct nfs_iodesc *newfd; struct nfsv2_fattrs *fa; - char *cp, *ncp; + char *ncp; int c; char namebuf[NFS_MAXPATHLEN + 1]; char linkbuf[NFS_MAXPATHLEN + 1]; @@ -422,6 +426,16 @@ return (error); nfs_root_node.iodesc = desc; + fh = &nfs_root_node.fh[0]; + buf[0] = 'X'; + cp = &buf[1]; + for (i = 0; i < NFS_FHSIZE; i++, cp += 2) + sprintf(cp, "%02x", fh[i]); + sprintf(cp, "X"); + setenv("boot.nfsroot.server", inet_ntoa(rootip), 1); + setenv("boot.nfsroot.path", rootpath, 1); + setenv("boot.nfsroot.nfshandle", buf, 1); + #ifndef NFS_NOSYMLINK /* Fake up attributes for the root dir. */ fa = &nfs_root_node.fa; ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#33 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.400 2002/07/31 16:13:59 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.401 2002/07/31 20:09:07 bmah Exp $ 2000 @@ -1951,6 +1951,14 @@ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:32.pppd.asc">FreeBSD-SA-02:32. &merged; + Multiple buffer overflows in + OpenSSL have been corrected, by way + of an upgrade to the base system version of + OpenSSL. More details can be found + in security advisory FreeBSD-SA-02:33. + &merged; + ==== //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#3 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.4 2002/07/13 15:57:23 luigi Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.6 2002/07/31 22:42:08 luigi Exp $ */ #include @@ -996,7 +996,7 @@ printf(" iplen %u", cmd->arg1 ); break; - case O_IPOPTS: + case O_IPOPT: print_flags("ipoptions", cmd, f_ipopts); break; @@ -1569,9 +1569,7 @@ d = (u_int32_t *)&cmd->mask; cmd->o.opcode = O_IP_DST_SET; /* default */ cmd->o.len |= F_INSN_SIZE(ipfw_insn_u32) + (cmd->o.arg1+31)/32; - fprintf(stderr,"-- set size %d cmdlen %d\n", - cmd->o.arg1, cmd->o.len ); - for (i = 0; i < cmd->o.arg1/32 ; i++) + for (i = 0; i < (cmd->o.arg1+31)/32 ; i++) d[i] = 0; /* clear masks */ av = p+1; @@ -2170,7 +2168,7 @@ * various flags used to record that we entered some fields. */ int have_mac = 0; /* set if we have a MAC address */ - int have_state = 0; /* check-state or keep-state */ + ipfw_insn *have_state = NULL; /* check-state or keep-state */ int i; @@ -2219,7 +2217,7 @@ action->len = 1; /* default */ switch(i) { case TOK_CHECKSTATE: - have_state = 1; + have_state = action; action->opcode = O_CHECK_STATE; break; @@ -2344,10 +2342,8 @@ cmd = next_cmd(cmd); } - if (have_state) { - have_state = 0; + if (have_state) /* must be a check-state, we are done */ goto done; - } #define OR_START(target) \ if (ac && (*av[0] == '(' || *av[0] == '{')) { \ @@ -2610,13 +2606,13 @@ case TOK_IPOPTS: NEED1("missing argument for ipoptions"); - fill_flags(cmd, O_IPOPTS, f_ipopts, *av); + fill_flags(cmd, O_IPOPT, f_ipopts, *av); ac--; av++; break; case TOK_IPTOS: NEED1("missing argument for iptos"); - fill_flags(cmd, O_IPOPTS, f_iptos, *av); + fill_flags(cmd, O_IPTOS, f_iptos, *av); ac--; av++; break; @@ -2697,17 +2693,18 @@ case TOK_KEEPSTATE: if (have_state) - errx(EX_USAGE, "only one of check-state " + errx(EX_USAGE, "only one of keep-state " "and limit is allowed"); - have_state = 1; + have_state = cmd; fill_cmd(cmd, O_KEEP_STATE, 0, 0); break; case TOK_LIMIT: NEED1("limit needs mask and # of connections"); if (have_state) - errx(EX_USAGE, "only one of check-state " + errx(EX_USAGE, "only one of keep-state " "and limit is allowed"); + have_state = cmd; { ipfw_insn_limit *c = (ipfw_insn_limit *)cmd; @@ -2730,7 +2727,6 @@ if (c->limit_mask == 0) errx(EX_USAGE, "missing limit mask"); ac--; av++; - have_state = 1; } break; @@ -2756,23 +2752,36 @@ /* * generate O_PROBE_STATE if necessary */ - if (have_state) { + if (have_state && have_state->opcode != O_CHECK_STATE) { fill_cmd(dst, O_PROBE_STATE, 0, 0); dst = next_cmd(dst); } /* - * copy all commands but O_LOG + * copy all commands but O_LOG, O_KEEP_STATE, O_LIMIT */ for (src = (ipfw_insn *)cmdbuf; src != cmd; src += i) { i = F_LEN(src); - if (src->opcode != O_LOG) { + switch (src->opcode) { + case O_LOG: + case O_KEEP_STATE: + case O_LIMIT: + break; + default: bcopy(src, dst, i * sizeof(u_int32_t)); dst += i; } } /* + * put back the have_state command as last opcode + */ + if (have_state) { + i = F_LEN(have_state); + bcopy(have_state, dst, i * sizeof(u_int32_t)); + dst += i; + } + /* * start action section */ rule->act_ofs = dst - rule->cmd; ==== //depot/projects/trustedbsd/base/sys/alpha/alpha/exception.s#4 (text+ko) ==== @@ -24,7 +24,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ - * $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.15 2002/03/29 16:35:25 jake Exp $ + * $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.16 2002/07/31 19:37:02 jhb Exp $ */ #include @@ -151,7 +151,7 @@ /* set the hae register if this process has specified a value */ ldq t1, TD_MD_FLAGS(s0) - and t1, MDP_HAEUSED + and t1, MDTD_HAEUSED beq t1, 3f ldq a0, TD_MD_HAE(s0) ldq pv, chipset + CHIPSET_WRITE_HAE @@ -302,7 +302,7 @@ Lrestoreregs: /* set the hae register if this process has specified a value */ ldq t1, TD_MD_FLAGS(s0) - and t1, MDP_HAEUSED + and t1, MDTD_HAEUSED beq t1, Lnohae ldq a0, TD_MD_HAE(t0) ldq pv, chipset + CHIPSET_WRITE_HAE ==== //depot/projects/trustedbsd/base/sys/alpha/alpha/genassym.c#7 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.39 2002/07/12 18:34:21 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.40 2002/07/31 19:37:02 jhb Exp $ */ #include @@ -92,7 +92,7 @@ #ifdef SMP ASSYM(TD_MD_KERNNEST, offsetof(struct thread, td_md.md_kernnest)); #endif -ASSYM(MDP_HAEUSED, MDP_HAEUSED); +ASSYM(MDTD_HAEUSED, MDTD_HAEUSED); ASSYM(CHIPSET_WRITE_HAE, offsetof(struct alpha_chipset, write_hae)); ==== //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.179 2002/04/17 13:06:32 mux Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.180 2002/07/31 19:37:02 jhb Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1209,7 +1209,7 @@ /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); /* XXX maybe write=0 */ - ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDP_FPUSED; + ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; bcopy(&td->td_pcb->pcb_fp, (struct fpreg *)ksi.si_sc.sc_fpregs, sizeof(struct fpreg)); ksi.si_sc.sc_fp_control = td->td_pcb->pcb_fp_control; @@ -1332,7 +1332,7 @@ #endif /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); - sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDP_FPUSED; + sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; bcopy(&td->td_pcb->pcb_fp, (struct fpreg *)sf.sf_uc.uc_mcontext.mc_fpregs, sizeof(struct fpreg)); @@ -1606,7 +1606,7 @@ tfp->tf_regs[FRAME_T12] = tfp->tf_regs[FRAME_PC]; /* a.k.a. PV */ tfp->tf_regs[FRAME_FLAGS] = 0; /* full restore */ - td->td_md.md_flags &= ~MDP_FPUSED; + td->td_md.md_flags &= ~MDTD_FPUSED; alpha_fpstate_drop(td); } @@ -1720,13 +1720,13 @@ int ptrace_clear_single_step(struct thread *td) { - if (td->td_md.md_flags & MDP_STEP2) { + if (td->td_md.md_flags & MDTD_STEP2) { ptrace_clear_bpt(td, &td->td_md.md_sstep[1]); ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); - td->td_md.md_flags &= ~MDP_STEP2; - } else if (td->td_md.md_flags & MDP_STEP1) { + td->td_md.md_flags &= ~MDTD_STEP2; + } else if (td->td_md.md_flags & MDTD_STEP1) { ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); - td->td_md.md_flags &= ~MDP_STEP1; + td->td_md.md_flags &= ~MDTD_STEP1; } return 0; } @@ -1740,7 +1740,7 @@ vm_offset_t addr[2]; /* places to set breakpoints */ int count = 0; /* count of breakpoints */ - if (td->td_md.md_flags & (MDP_STEP1|MDP_STEP2)) + if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) panic("ptrace_single_step: step breakpoints not removed"); error = ptrace_read_int(td, pc, &ins.bits); @@ -1793,9 +1793,9 @@ ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); return error; } - td->td_md.md_flags |= MDP_STEP2; + td->td_md.md_flags |= MDTD_STEP2; } else - td->td_md.md_flags |= MDP_STEP1; + td->td_md.md_flags |= MDTD_STEP1; return 0; } @@ -2132,7 +2132,7 @@ SET_FEN(td); } - td->td_md.md_flags |= MDP_FPUSED; + td->td_md.md_flags |= MDTD_FPUSED; intr_restore(s); } ==== //depot/projects/trustedbsd/base/sys/alpha/alpha/sys_machdep.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.17 2002/04/01 21:30:29 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.18 2002/07/31 19:37:02 jhb Exp $ * */ @@ -122,7 +122,7 @@ if (error) return (error); - td->td_md.md_flags |= MDP_HAEUSED; + td->td_md.md_flags |= MDTD_HAEUSED; td->td_md.md_hae = ua.hae; return (0); @@ -169,8 +169,7 @@ { int error; unsigned long uac; - struct proc *p; - struct thread *td2; + struct proc *p, *pp; error = copyin(args, &uac, sizeof(uac)); if (error) @@ -178,13 +177,11 @@ p = td->td_proc; PROC_LOCK(p); - if (p->p_pptr) { - PROC_LOCK(p->p_pptr); - /* XXXKSE which threads? */ - td2 = FIRST_THREAD_IN_PROC(p->p_pptr); - td2->td_md.md_flags &= ~MDP_UAC_MASK; - td2->td_md.md_flags |= uac & MDP_UAC_MASK; - PROC_UNLOCK(p->p_pptr); + pp = p->p_pptr; + if (pp != NULL) { + PROC_LOCK(pp); + pp->p_md.md_uac = uac & MDP_UAC_MASK; + PROC_UNLOCK(pp); } PROC_UNLOCK(p); return 0; @@ -193,20 +190,18 @@ static int alpha_get_uac(struct thread *td, char *args) { - struct proc *p; - struct thread *td2; + struct proc *p, *pp; int error; unsigned long uac; p = td->td_proc; error = ESRCH; PROC_LOCK(p); - if (p->p_pptr) { - PROC_LOCK(p->p_pptr); - /* XXXKSE which threads? */ - td2 = FIRST_THREAD_IN_PROC(p->p_pptr); - uac = td2->td_md.md_flags & MDP_UAC_MASK; - PROC_UNLOCK(p->p_pptr); + pp = p->p_pptr; + if (pp != NULL) { + PROC_LOCK(pp); + uac = p->p_md.md_uac; + PROC_UNLOCK(pp); PROC_UNLOCK(p); error = copyout(&uac, args, sizeof(uac)); } else ==== //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.98 2002/07/13 04:36:30 mini Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.99 2002/07/31 19:37:02 jhb Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -407,7 +407,7 @@ /* FALLTHROUTH */ case ALPHA_IF_CODE_BPT: case ALPHA_IF_CODE_BUGCHK: - if (td->td_md.md_flags & (MDP_STEP1|MDP_STEP2)) { + if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) { mtx_lock(&Giant); ptrace_clear_single_step(td); td->td_frame->tf_regs[FRAME_PC] -= 4; @@ -1033,8 +1033,8 @@ */ if (td) { - uac = td->td_md.md_flags & MDP_UAC_MASK; p = td->td_proc; + uac = p->p_md.md_uac; } else { uac = 0; p = NULL; ==== //depot/projects/trustedbsd/base/sys/alpha/alpha/vm_machdep.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.68 2002/06/29 17:26:11 julian Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.69 2002/07/31 19:37:02 jhb Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -133,7 +133,8 @@ p1 = td1->td_proc; td2->td_pcb = (struct pcb *) (td2->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - td2->td_md.md_flags = td1->td_md.md_flags & (MDP_FPUSED | MDP_UAC_MASK); + td2->td_md.md_flags = td1->td_md.md_flags & MDTD_FPUSED; + p2->p_md.md_uac = p1->p_md.md_uac; /* * Cache the physical address of the pcb, so we can ==== //depot/projects/trustedbsd/base/sys/alpha/include/proc.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/proc.h,v 1.14 2002/03/27 05:39:16 dillon Exp $ */ +/* $FreeBSD: src/sys/alpha/include/proc.h,v 1.15 2002/07/31 19:37:02 jhb Exp $ */ /* From: NetBSD: proc.h,v 1.3 1997/04/06 08:47:36 cgd Exp */ /* @@ -40,6 +40,11 @@ u_int32_t contents; }; +#define MDTD_FPUSED 0x0001 /* Process used the FPU */ +#define MDTD_STEP1 0x0002 /* Single step normal instruction */ +#define MDTD_STEP2 0x0004 /* Single step branch instruction */ +#define MDTD_HAEUSED 0x0008 /* Process used the HAE */ + struct mdthread { u_long md_flags; struct pcb *md_pcbpaddr; /* phys addr of the pcb */ @@ -50,17 +55,14 @@ register_t md_savecrit; /* save PSL for critical section */ }; -#define MDP_FPUSED 0x0001 /* Process used the FPU */ -#define MDP_STEP1 0x0002 /* Single step normal instruction */ -#define MDP_STEP2 0x0004 /* Single step branch instruction */ -#define MDP_HAEUSED 0x0008 /* Process used the HAE */ -#define MDP_UAC_NOPRINT 0x0010 /* Don't print unaligned traps */ -#define MDP_UAC_NOFIX 0x0020 /* Don't fixup unaligned traps */ -#define MDP_UAC_SIGBUS 0x0040 /* Deliver SIGBUS upon +#define MDP_UAC_NOPRINT 0x0010 /* Don't print unaligned traps */ +#define MDP_UAC_NOFIX 0x0020 /* Don't fixup unaligned traps */ +#define MDP_UAC_SIGBUS 0x0040 /* Deliver SIGBUS upon unaligned access */ -#define MDP_UAC_MASK (MDP_UAC_NOPRINT | MDP_UAC_NOFIX | MDP_UAC_SIGBUS) +#define MDP_UAC_MASK (MDP_UAC_NOPRINT | MDP_UAC_NOFIX | MDP_UAC_SIGBUS) struct mdproc { + u_int md_uac; /* Unaligned Access Check flags. */ }; #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_signal.c#6 (text+ko) ==== @@ -30,7 +30,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/alpha/osf1/osf1_signal.c,v 1.18 2002/06/02 20:05:41 schweikh Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.19 2002/07/31 19:37:03 jhb Exp $ */ #include @@ -631,7 +631,7 @@ /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); /* XXX maybe write=0 */ - ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDP_FPUSED; + ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; bcopy(&td->td_pcb->pcb_fp, (struct fpreg *)ksi.si_sc.sc_fpregs, sizeof(struct fpreg)); ksi.si_sc.sc_fp_control = td->td_pcb->pcb_fp_control; ==== //depot/projects/trustedbsd/base/sys/boot/common/dev_net.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/boot/common/dev_net.c,v 1.10 2000/11/10 06:37:43 benno Exp $ + * $FreeBSD: src/sys/boot/common/dev_net.c,v 1.11 2002/07/31 20:17:06 jake Exp $ * From: $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $ */ @@ -209,6 +209,7 @@ { char buf[MAXHOSTNAMELEN]; char temp[FNAME_SIZE]; + struct iodesc *d; int i; n_long smask; @@ -284,6 +285,14 @@ bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1); } printf("net_open: server path: %s\n", rootpath); + + d = socktodesc(sock); + sprintf(temp, "%6D", d->myea, ":"); + setenv("boot.netif.ip", inet_ntoa(myip), 1); + setenv("boot.netif.netmask", intoa(netmask), 1); + setenv("boot.netif.gateway", inet_ntoa(gateip), 1); + setenv("boot.netif.hwaddr", temp, 1); + return (0); } ==== //depot/projects/trustedbsd/base/sys/conf/files#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.678 2002/07/30 22:28:43 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.679 2002/08/01 02:03:21 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -730,6 +730,7 @@ fs/procfs/procfs_dbregs.c optional procfs fs/procfs/procfs_fpregs.c optional procfs fs/procfs/procfs_ioctl.c optional procfs +fs/procfs/procfs_mac.c optional procfs fs/procfs/procfs_map.c optional procfs fs/procfs/procfs_mem.c optional procfs fs/procfs/procfs_note.c optional procfs ==== //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_eisa.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * * $Id$ * - * $FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.23 2002/04/24 16:58:51 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.24 2002/08/01 01:36:30 scottl Exp $ */ #include @@ -203,13 +203,13 @@ }; static driver_t ahc_eisa_driver = { - "ahc", + "ahc_eisa", ahc_eisa_device_methods, sizeof(struct ahc_softc) }; -static devclass_t ahc_devclass; +static devclass_t ahc_eisa_devclass; -DRIVER_MODULE(ahc, eisa, ahc_eisa_driver, ahc_devclass, 0, 0); +DRIVER_MODULE(ahc_eisa, eisa, ahc_eisa_driver, ahc_eisa_devclass, 0, 0); MODULE_DEPEND(ahc_eisa, ahc, 1, 1, 1); MODULE_VERSION(ahc_eisa, 1); ==== //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_pci.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * * $Id$ * - * $FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.45 2002/04/24 16:58:51 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.46 2002/08/01 01:36:30 scottl Exp $ */ #include @@ -50,15 +50,15 @@ }; static driver_t ahc_pci_driver = { - "ahc", + "ahc_pci", ahc_pci_device_methods, sizeof(struct ahc_softc) }; -static devclass_t ahc_devclass; +static devclass_t ahc_pci_devclass; -DRIVER_MODULE(ahc, pci, ahc_pci_driver, ahc_devclass, 0, 0); -DRIVER_MODULE(ahc, cardbus, ahc_pci_driver, ahc_devclass, 0, 0); +DRIVER_MODULE(ahc_pci, pci, ahc_pci_driver, ahc_pci_devclass, 0, 0); +DRIVER_MODULE(ahc_pci, cardbus, ahc_pci_driver, ahc_pci_devclass, 0, 0); MODULE_DEPEND(ahc_pci, ahc, 1, 1, 1); MODULE_VERSION(ahc_pci, 1); ==== //depot/projects/trustedbsd/base/sys/fs/procfs/procfs.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95 * - * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.5 2002/05/19 00:14:47 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.6 2002/08/01 02:03:20 rwatson Exp $ */ #include @@ -153,6 +153,7 @@ dir = pfs_create_dir(root, "pid", &procfs_attr, NULL, PFS_PROCDEP); + dir->pn_refreshlabel = &procfs_piddir_refreshlabel; pfs_create_file(dir, "cmdline", &procfs_doproccmdline, NULL, NULL, PFS_RD); pfs_create_file(dir, "ctl", &procfs_doprocctl, ==== //depot/projects/trustedbsd/base/sys/fs/procfs/procfs.h#5 (text+ko) ==== @@ -37,7 +37,7 @@ * @(#)procfs.h 8.9 (Berkeley) 5/14/95 * * From: - * $FreeBSD: src/sys/fs/procfs/procfs.h,v 1.43 2002/04/20 01:14:25 rwatson Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs.h,v 1.44 2002/08/01 02:03:20 rwatson Exp $ */ #ifdef _KERNEL @@ -61,6 +61,9 @@ /* Attributes */ int procfs_attr(PFS_ATTR_ARGS); +/* MAC */ +int procfs_piddir_refreshlabel(PFS_REFRESHLABEL_ARGS); + /* Visibility */ int procfs_notsystem(PFS_VIS_ARGS); int procfs_candebug(PFS_VIS_ARGS); ==== //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.h#7 (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. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.19 2002/06/06 16:59:24 des Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.20 2002/08/01 01:33:12 rwatson Exp $ */ #ifndef _PSEUDOFS_H_INCLUDED @@ -145,6 +145,15 @@ typedef int (*pfs_getextattr_t)(PFS_GETEXTATTR_ARGS); /* + * Getlabel callback + */ +#define PFS_REFRESHLABEL_ARGS \ + struct thread *td, struct proc *p, struct vnode *vp, \ + struct pfs_node *pn, struct ucred *cred +struct mac; +typedef int (*pfs_refreshlabel_t)(PFS_REFRESHLABEL_ARGS); + +/* * Last-close callback */ #define PFS_CLOSE_ARGS \ @@ -185,6 +194,7 @@ pfs_attr_t pn_attr; pfs_vis_t pn_vis; pfs_getextattr_t pn_getextattr; + pfs_refreshlabel_t pn_refreshlabel; void *pn_data; int pn_flags; ==== //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#11 (text+ko) ==== @@ -25,9 +25,11 @@ * (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/fs/pseudofs/pseudofs_vnops.c,v 1.29 2002/07/08 01:50:14 jeff Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.30 2002/08/01 01:33:12 rwatson Exp $ */ +#include "opt_mac.h" + #include #include #include @@ -35,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -729,6 +732,50 @@ return (pfs_vncache_free(va->a_vp)); } +#ifdef MAC +/* + * Refresh the vnode label as appropriate for the pseudo-file system. + */ +static int +pfs_refreshlabel(struct vop_refreshlabel_args *va) +{ + struct vnode *vn = va->a_vp; + struct pfs_vdata *pvd = (struct pfs_vdata *)vn->v_data; + struct pfs_node *pn = pvd->pvd_pn; + struct proc *proc = NULL; + int error; + + PFS_TRACE((pd->pn_name)); + + if (pn->pn_refreshlabel == NULL) { + mac_update_vnode_from_mount(vn, vn->v_mount); + return (0); + } + + /* + * This is necessary because either process' privileges may + * have changed since the last open() call. + */ + if (!pfs_visible(curthread, pn, pvd->pvd_pid)) + PFS_RETURN (EIO); + + /* XXX duplicate bits of pfs_visible() */ + if (pvd->pvd_pid != NO_PID) { + if ((proc = pfind(pvd->pvd_pid)) == NULL) + PFS_RETURN (EIO); + _PHOLD(proc); + PROC_UNLOCK(proc); + } + + error = (pn->pn_refreshlabel)(curthread, proc, vn, pn, va->a_cred); + + if (proc != NULL) + PRELE(proc); + + PFS_RETURN (error); +} +#endif + /* * Set attributes */ @@ -821,6 +868,9 @@ { &vop_readdir_desc, (vop_t *)pfs_readdir }, { &vop_readlink_desc, (vop_t *)pfs_readlink }, { &vop_reclaim_desc, (vop_t *)pfs_reclaim }, +#ifdef MAC + { &vop_refreshlabel_desc, (vop_t *)pfs_refreshlabel }, +#endif { &vop_remove_desc, (vop_t *)vop_eopnotsupp }, { &vop_rename_desc, (vop_t *)vop_eopnotsupp }, { &vop_rmdir_desc, (vop_t *)vop_eopnotsupp }, ==== //depot/projects/trustedbsd/base/sys/kern/kern_acl.c#10 (text+ko) ==== @@ -25,17 +25,20 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_acl.c,v 1.31 2002/07/22 03:57:07 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_acl.c,v 1.32 2002/08/01 01:04:16 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. * Support for POSIX.1e access control lists. */ +#include "opt_mac.h" + #include #include #include #include +#include #include #include #include @@ -582,7 +585,15 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); +#ifdef MAC + error = mac_check_vnode_setacl(td->td_ucred, vp, type, &inkernacl); + if (error != 0) + goto out; +#endif error = VOP_SETACL(vp, type, &inkernacl, td->td_ucred, td); +#ifdef MAC +out: +#endif VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return(error); @@ -600,7 +611,15 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); +#ifdef MAC + error = mac_check_vnode_getacl(td->td_ucred, vp, type); + if (error != 0) + goto out; +#endif error = VOP_GETACL(vp, type, &inkernelacl, td->td_ucred, td); +#ifdef MAC +out: +#endif VOP_UNLOCK(vp, 0, td); if (error == 0) error = copyout(&inkernelacl, aclp, sizeof(struct acl)); @@ -621,7 +640,15 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_SETACL(vp, type, NULL, td->td_ucred, td); +#ifdef MAC + error = mac_check_vnode_deleteacl(td->td_ucred, vp, type); + if (error) + goto out; +#endif + error = VOP_SETACL(vp, type, 0, td->td_ucred, td); +#ifdef MAC +out: +#endif VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return (error); ==== //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#8 (text+ko) ==== @@ -31,10 +31,11 @@ * SUCH DAMAGE. * * @(#)kern_ktrace.c 8.2 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/kern/kern_ktrace.c,v 1.68 2002/06/29 01:50:24 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_ktrace.c,v 1.69 2002/08/01 01:07:03 rwatson Exp $ */ #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -44,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -766,7 +768,11 @@ vn_start_write(vp, &mp, V_WAIT); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); (void)VOP_LEASE(vp, td, cred, LEASE_WRITE); - error = VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, cred); +#ifdef MAC + error = mac_check_vnode_op(cred, vp, MAC_OP_VNODE_WRITE); + if (error == 0) +#endif + error = VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, cred); if (error == 0 && uio != NULL) { (void)VOP_LEASE(vp, td, cred, LEASE_WRITE); error = VOP_WRITE(vp, uio, IO_UNIT | IO_APPEND, cred); ==== //depot/projects/trustedbsd/base/sys/kern/tty_tty.c#4 (text+ko) ==== @@ -31,19 +31,22 @@ * SUCH DAMAGE. * * @(#)tty_tty.c 8.2 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/kern/tty_tty.c,v 1.39 2002/03/19 21:24:06 alfred Exp $ + * $FreeBSD: src/sys/kern/tty_tty.c,v 1.40 2002/08/01 01:09:54 rwatson Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 19:39:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7563837B401; Wed, 31 Jul 2002 19:38:52 -0700 (PDT) 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 CF3AD37B400 for ; Wed, 31 Jul 2002 19:38:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F04DC43E6A for ; Wed, 31 Jul 2002 19:38:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g712coJU001101 for ; Wed, 31 Jul 2002 19:38:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g712conp001098 for perforce@freebsd.org; Wed, 31 Jul 2002 19:38:50 -0700 (PDT) Date: Wed, 31 Jul 2002 19:38:50 -0700 (PDT) Message-Id: <200208010238.g712conp001098@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15362 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15362 Change 15362 by rwatson@rwatson_paprika on 2002/07/31 19:38:19 IFC from trustedbsd base, bringing in a variety of fixes, as well as many MAC commits now trickling back through. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libstand/nfs.c#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#26 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/exception.s#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/genassym.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/sys_machdep.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/proc.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_signal.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#41 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/ahc_eisa.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#69 integrate .. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahc/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahc/ahc_pci/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahd/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/aicasm/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/if_ppp/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_tun/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/procfs/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/modules/pseudofs/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/pccard/pccard_nbk.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/cache.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#16 integrate Differences ... ==== //depot/projects/trustedbsd/mac/lib/libstand/nfs.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.9 2002/07/07 23:01:36 jake Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.10 2002/07/31 20:17:06 jake Exp $"); #include #include @@ -387,10 +387,14 @@ { struct iodesc *desc; struct nfs_iodesc *currfd; + char buf[2 * NFS_FHSIZE + 3]; + u_char *fh; + char *cp; + int i; #ifndef NFS_NOSYMLINK struct nfs_iodesc *newfd; struct nfsv2_fattrs *fa; - char *cp, *ncp; + char *ncp; int c; char namebuf[NFS_MAXPATHLEN + 1]; char linkbuf[NFS_MAXPATHLEN + 1]; @@ -422,6 +426,16 @@ return (error); nfs_root_node.iodesc = desc; + fh = &nfs_root_node.fh[0]; + buf[0] = 'X'; + cp = &buf[1]; + for (i = 0; i < NFS_FHSIZE; i++, cp += 2) + sprintf(cp, "%02x", fh[i]); + sprintf(cp, "X"); + setenv("boot.nfsroot.server", inet_ntoa(rootip), 1); + setenv("boot.nfsroot.path", rootpath, 1); + setenv("boot.nfsroot.nfshandle", buf, 1); + #ifndef NFS_NOSYMLINK /* Fake up attributes for the root dir. */ fa = &nfs_root_node.fa; ==== //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#26 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.400 2002/07/31 16:13:59 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.401 2002/07/31 20:09:07 bmah Exp $ 2000 @@ -1951,6 +1951,14 @@ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:32.pppd.asc">FreeBSD-SA-02:32. &merged; + Multiple buffer overflows in + OpenSSL have been corrected, by way + of an upgrade to the base system version of + OpenSSL. More details can be found + in security advisory FreeBSD-SA-02:33. + &merged; + ==== //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#3 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.4 2002/07/13 15:57:23 luigi Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.6 2002/07/31 22:42:08 luigi Exp $ */ #include @@ -996,7 +996,7 @@ printf(" iplen %u", cmd->arg1 ); break; - case O_IPOPTS: + case O_IPOPT: print_flags("ipoptions", cmd, f_ipopts); break; @@ -1569,9 +1569,7 @@ d = (u_int32_t *)&cmd->mask; cmd->o.opcode = O_IP_DST_SET; /* default */ cmd->o.len |= F_INSN_SIZE(ipfw_insn_u32) + (cmd->o.arg1+31)/32; - fprintf(stderr,"-- set size %d cmdlen %d\n", - cmd->o.arg1, cmd->o.len ); - for (i = 0; i < cmd->o.arg1/32 ; i++) + for (i = 0; i < (cmd->o.arg1+31)/32 ; i++) d[i] = 0; /* clear masks */ av = p+1; @@ -2170,7 +2168,7 @@ * various flags used to record that we entered some fields. */ int have_mac = 0; /* set if we have a MAC address */ - int have_state = 0; /* check-state or keep-state */ + ipfw_insn *have_state = NULL; /* check-state or keep-state */ int i; @@ -2219,7 +2217,7 @@ action->len = 1; /* default */ switch(i) { case TOK_CHECKSTATE: - have_state = 1; + have_state = action; action->opcode = O_CHECK_STATE; break; @@ -2344,10 +2342,8 @@ cmd = next_cmd(cmd); } - if (have_state) { - have_state = 0; + if (have_state) /* must be a check-state, we are done */ goto done; - } #define OR_START(target) \ if (ac && (*av[0] == '(' || *av[0] == '{')) { \ @@ -2610,13 +2606,13 @@ case TOK_IPOPTS: NEED1("missing argument for ipoptions"); - fill_flags(cmd, O_IPOPTS, f_ipopts, *av); + fill_flags(cmd, O_IPOPT, f_ipopts, *av); ac--; av++; break; case TOK_IPTOS: NEED1("missing argument for iptos"); - fill_flags(cmd, O_IPOPTS, f_iptos, *av); + fill_flags(cmd, O_IPTOS, f_iptos, *av); ac--; av++; break; @@ -2697,17 +2693,18 @@ case TOK_KEEPSTATE: if (have_state) - errx(EX_USAGE, "only one of check-state " + errx(EX_USAGE, "only one of keep-state " "and limit is allowed"); - have_state = 1; + have_state = cmd; fill_cmd(cmd, O_KEEP_STATE, 0, 0); break; case TOK_LIMIT: NEED1("limit needs mask and # of connections"); if (have_state) - errx(EX_USAGE, "only one of check-state " + errx(EX_USAGE, "only one of keep-state " "and limit is allowed"); + have_state = cmd; { ipfw_insn_limit *c = (ipfw_insn_limit *)cmd; @@ -2730,7 +2727,6 @@ if (c->limit_mask == 0) errx(EX_USAGE, "missing limit mask"); ac--; av++; - have_state = 1; } break; @@ -2756,23 +2752,36 @@ /* * generate O_PROBE_STATE if necessary */ - if (have_state) { + if (have_state && have_state->opcode != O_CHECK_STATE) { fill_cmd(dst, O_PROBE_STATE, 0, 0); dst = next_cmd(dst); } /* - * copy all commands but O_LOG + * copy all commands but O_LOG, O_KEEP_STATE, O_LIMIT */ for (src = (ipfw_insn *)cmdbuf; src != cmd; src += i) { i = F_LEN(src); - if (src->opcode != O_LOG) { + switch (src->opcode) { + case O_LOG: + case O_KEEP_STATE: + case O_LIMIT: + break; + default: bcopy(src, dst, i * sizeof(u_int32_t)); dst += i; } } /* + * put back the have_state command as last opcode + */ + if (have_state) { + i = F_LEN(have_state); + bcopy(have_state, dst, i * sizeof(u_int32_t)); + dst += i; + } + /* * start action section */ rule->act_ofs = dst - rule->cmd; ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/exception.s#4 (text+ko) ==== @@ -24,7 +24,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ - * $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.15 2002/03/29 16:35:25 jake Exp $ + * $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.16 2002/07/31 19:37:02 jhb Exp $ */ #include @@ -151,7 +151,7 @@ /* set the hae register if this process has specified a value */ ldq t1, TD_MD_FLAGS(s0) - and t1, MDP_HAEUSED + and t1, MDTD_HAEUSED beq t1, 3f ldq a0, TD_MD_HAE(s0) ldq pv, chipset + CHIPSET_WRITE_HAE @@ -302,7 +302,7 @@ Lrestoreregs: /* set the hae register if this process has specified a value */ ldq t1, TD_MD_FLAGS(s0) - and t1, MDP_HAEUSED + and t1, MDTD_HAEUSED beq t1, Lnohae ldq a0, TD_MD_HAE(t0) ldq pv, chipset + CHIPSET_WRITE_HAE ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/genassym.c#7 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.39 2002/07/12 18:34:21 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.40 2002/07/31 19:37:02 jhb Exp $ */ #include @@ -92,7 +92,7 @@ #ifdef SMP ASSYM(TD_MD_KERNNEST, offsetof(struct thread, td_md.md_kernnest)); #endif -ASSYM(MDP_HAEUSED, MDP_HAEUSED); +ASSYM(MDTD_HAEUSED, MDTD_HAEUSED); ASSYM(CHIPSET_WRITE_HAE, offsetof(struct alpha_chipset, write_hae)); ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#11 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.179 2002/04/17 13:06:32 mux Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.180 2002/07/31 19:37:02 jhb Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1209,7 +1209,7 @@ /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); /* XXX maybe write=0 */ - ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDP_FPUSED; + ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; bcopy(&td->td_pcb->pcb_fp, (struct fpreg *)ksi.si_sc.sc_fpregs, sizeof(struct fpreg)); ksi.si_sc.sc_fp_control = td->td_pcb->pcb_fp_control; @@ -1332,7 +1332,7 @@ #endif /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); - sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDP_FPUSED; + sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; bcopy(&td->td_pcb->pcb_fp, (struct fpreg *)sf.sf_uc.uc_mcontext.mc_fpregs, sizeof(struct fpreg)); @@ -1606,7 +1606,7 @@ tfp->tf_regs[FRAME_T12] = tfp->tf_regs[FRAME_PC]; /* a.k.a. PV */ tfp->tf_regs[FRAME_FLAGS] = 0; /* full restore */ - td->td_md.md_flags &= ~MDP_FPUSED; + td->td_md.md_flags &= ~MDTD_FPUSED; alpha_fpstate_drop(td); } @@ -1720,13 +1720,13 @@ int ptrace_clear_single_step(struct thread *td) { - if (td->td_md.md_flags & MDP_STEP2) { + if (td->td_md.md_flags & MDTD_STEP2) { ptrace_clear_bpt(td, &td->td_md.md_sstep[1]); ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); - td->td_md.md_flags &= ~MDP_STEP2; - } else if (td->td_md.md_flags & MDP_STEP1) { + td->td_md.md_flags &= ~MDTD_STEP2; + } else if (td->td_md.md_flags & MDTD_STEP1) { ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); - td->td_md.md_flags &= ~MDP_STEP1; + td->td_md.md_flags &= ~MDTD_STEP1; } return 0; } @@ -1740,7 +1740,7 @@ vm_offset_t addr[2]; /* places to set breakpoints */ int count = 0; /* count of breakpoints */ - if (td->td_md.md_flags & (MDP_STEP1|MDP_STEP2)) + if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) panic("ptrace_single_step: step breakpoints not removed"); error = ptrace_read_int(td, pc, &ins.bits); @@ -1793,9 +1793,9 @@ ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); return error; } - td->td_md.md_flags |= MDP_STEP2; + td->td_md.md_flags |= MDTD_STEP2; } else - td->td_md.md_flags |= MDP_STEP1; + td->td_md.md_flags |= MDTD_STEP1; return 0; } @@ -2132,7 +2132,7 @@ SET_FEN(td); } - td->td_md.md_flags |= MDP_FPUSED; + td->td_md.md_flags |= MDTD_FPUSED; intr_restore(s); } ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/sys_machdep.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)sys_machdep.c 5.5 (Berkeley) 1/19/91 - * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.17 2002/04/01 21:30:29 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.18 2002/07/31 19:37:02 jhb Exp $ * */ @@ -122,7 +122,7 @@ if (error) return (error); - td->td_md.md_flags |= MDP_HAEUSED; + td->td_md.md_flags |= MDTD_HAEUSED; td->td_md.md_hae = ua.hae; return (0); @@ -169,8 +169,7 @@ { int error; unsigned long uac; - struct proc *p; - struct thread *td2; + struct proc *p, *pp; error = copyin(args, &uac, sizeof(uac)); if (error) @@ -178,13 +177,11 @@ p = td->td_proc; PROC_LOCK(p); - if (p->p_pptr) { - PROC_LOCK(p->p_pptr); - /* XXXKSE which threads? */ - td2 = FIRST_THREAD_IN_PROC(p->p_pptr); - td2->td_md.md_flags &= ~MDP_UAC_MASK; - td2->td_md.md_flags |= uac & MDP_UAC_MASK; - PROC_UNLOCK(p->p_pptr); + pp = p->p_pptr; + if (pp != NULL) { + PROC_LOCK(pp); + pp->p_md.md_uac = uac & MDP_UAC_MASK; + PROC_UNLOCK(pp); } PROC_UNLOCK(p); return 0; @@ -193,20 +190,18 @@ static int alpha_get_uac(struct thread *td, char *args) { - struct proc *p; - struct thread *td2; + struct proc *p, *pp; int error; unsigned long uac; p = td->td_proc; error = ESRCH; PROC_LOCK(p); - if (p->p_pptr) { - PROC_LOCK(p->p_pptr); - /* XXXKSE which threads? */ - td2 = FIRST_THREAD_IN_PROC(p->p_pptr); - uac = td2->td_md.md_flags & MDP_UAC_MASK; - PROC_UNLOCK(p->p_pptr); + pp = p->p_pptr; + if (pp != NULL) { + PROC_LOCK(pp); + uac = p->p_md.md_uac; + PROC_UNLOCK(pp); PROC_UNLOCK(p); error = copyout(&uac, args, sizeof(uac)); } else ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#13 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.98 2002/07/13 04:36:30 mini Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.99 2002/07/31 19:37:02 jhb Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -407,7 +407,7 @@ /* FALLTHROUTH */ case ALPHA_IF_CODE_BPT: case ALPHA_IF_CODE_BUGCHK: - if (td->td_md.md_flags & (MDP_STEP1|MDP_STEP2)) { + if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) { mtx_lock(&Giant); ptrace_clear_single_step(td); td->td_frame->tf_regs[FRAME_PC] -= 4; @@ -1033,8 +1033,8 @@ */ if (td) { - uac = td->td_md.md_flags & MDP_UAC_MASK; p = td->td_proc; + uac = p->p_md.md_uac; } else { uac = 0; p = NULL; ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.68 2002/06/29 17:26:11 julian Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.69 2002/07/31 19:37:02 jhb Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -133,7 +133,8 @@ p1 = td1->td_proc; td2->td_pcb = (struct pcb *) (td2->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - td2->td_md.md_flags = td1->td_md.md_flags & (MDP_FPUSED | MDP_UAC_MASK); + td2->td_md.md_flags = td1->td_md.md_flags & MDTD_FPUSED; + p2->p_md.md_uac = p1->p_md.md_uac; /* * Cache the physical address of the pcb, so we can ==== //depot/projects/trustedbsd/mac/sys/alpha/include/proc.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/proc.h,v 1.14 2002/03/27 05:39:16 dillon Exp $ */ +/* $FreeBSD: src/sys/alpha/include/proc.h,v 1.15 2002/07/31 19:37:02 jhb Exp $ */ /* From: NetBSD: proc.h,v 1.3 1997/04/06 08:47:36 cgd Exp */ /* @@ -40,6 +40,11 @@ u_int32_t contents; }; +#define MDTD_FPUSED 0x0001 /* Process used the FPU */ +#define MDTD_STEP1 0x0002 /* Single step normal instruction */ +#define MDTD_STEP2 0x0004 /* Single step branch instruction */ +#define MDTD_HAEUSED 0x0008 /* Process used the HAE */ + struct mdthread { u_long md_flags; struct pcb *md_pcbpaddr; /* phys addr of the pcb */ @@ -50,17 +55,14 @@ register_t md_savecrit; /* save PSL for critical section */ }; -#define MDP_FPUSED 0x0001 /* Process used the FPU */ -#define MDP_STEP1 0x0002 /* Single step normal instruction */ -#define MDP_STEP2 0x0004 /* Single step branch instruction */ -#define MDP_HAEUSED 0x0008 /* Process used the HAE */ -#define MDP_UAC_NOPRINT 0x0010 /* Don't print unaligned traps */ -#define MDP_UAC_NOFIX 0x0020 /* Don't fixup unaligned traps */ -#define MDP_UAC_SIGBUS 0x0040 /* Deliver SIGBUS upon +#define MDP_UAC_NOPRINT 0x0010 /* Don't print unaligned traps */ +#define MDP_UAC_NOFIX 0x0020 /* Don't fixup unaligned traps */ +#define MDP_UAC_SIGBUS 0x0040 /* Deliver SIGBUS upon unaligned access */ -#define MDP_UAC_MASK (MDP_UAC_NOPRINT | MDP_UAC_NOFIX | MDP_UAC_SIGBUS) +#define MDP_UAC_MASK (MDP_UAC_NOPRINT | MDP_UAC_NOFIX | MDP_UAC_SIGBUS) struct mdproc { + u_int md_uac; /* Unaligned Access Check flags. */ }; #endif /* !_MACHINE_PROC_H_ */ ==== //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_signal.c#6 (text+ko) ==== @@ -30,7 +30,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/alpha/osf1/osf1_signal.c,v 1.18 2002/06/02 20:05:41 schweikh Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.19 2002/07/31 19:37:03 jhb Exp $ */ #include @@ -631,7 +631,7 @@ /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); /* XXX maybe write=0 */ - ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDP_FPUSED; + ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; bcopy(&td->td_pcb->pcb_fp, (struct fpreg *)ksi.si_sc.sc_fpregs, sizeof(struct fpreg)); ksi.si_sc.sc_fp_control = td->td_pcb->pcb_fp_control; ==== //depot/projects/trustedbsd/mac/sys/boot/common/dev_net.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/boot/common/dev_net.c,v 1.10 2000/11/10 06:37:43 benno Exp $ + * $FreeBSD: src/sys/boot/common/dev_net.c,v 1.11 2002/07/31 20:17:06 jake Exp $ * From: $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $ */ @@ -209,6 +209,7 @@ { char buf[MAXHOSTNAMELEN]; char temp[FNAME_SIZE]; + struct iodesc *d; int i; n_long smask; @@ -284,6 +285,14 @@ bcopy(&temp[0], &rootpath[0], strlen(&rootpath[i])+1); } printf("net_open: server path: %s\n", rootpath); + + d = socktodesc(sock); + sprintf(temp, "%6D", d->myea, ":"); + setenv("boot.netif.ip", inet_ntoa(myip), 1); + setenv("boot.netif.netmask", intoa(netmask), 1); + setenv("boot.netif.gateway", inet_ntoa(gateip), 1); + setenv("boot.netif.hwaddr", temp, 1); + return (0); } ==== //depot/projects/trustedbsd/mac/sys/conf/files#41 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.678 2002/07/30 22:28:43 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.679 2002/08/01 02:03:21 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/ahc_eisa.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * * $Id$ * - * $FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.23 2002/04/24 16:58:51 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.24 2002/08/01 01:36:30 scottl Exp $ */ #include @@ -203,13 +203,13 @@ }; static driver_t ahc_eisa_driver = { - "ahc", + "ahc_eisa", ahc_eisa_device_methods, sizeof(struct ahc_softc) }; -static devclass_t ahc_devclass; +static devclass_t ahc_eisa_devclass; -DRIVER_MODULE(ahc, eisa, ahc_eisa_driver, ahc_devclass, 0, 0); +DRIVER_MODULE(ahc_eisa, eisa, ahc_eisa_driver, ahc_eisa_devclass, 0, 0); MODULE_DEPEND(ahc_eisa, ahc, 1, 1, 1); MODULE_VERSION(ahc_eisa, 1); ==== //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/ahc_pci.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * * $Id$ * - * $FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.45 2002/04/24 16:58:51 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.46 2002/08/01 01:36:30 scottl Exp $ */ #include @@ -50,15 +50,15 @@ }; static driver_t ahc_pci_driver = { - "ahc", + "ahc_pci", ahc_pci_device_methods, sizeof(struct ahc_softc) }; -static devclass_t ahc_devclass; +static devclass_t ahc_pci_devclass; -DRIVER_MODULE(ahc, pci, ahc_pci_driver, ahc_devclass, 0, 0); -DRIVER_MODULE(ahc, cardbus, ahc_pci_driver, ahc_devclass, 0, 0); +DRIVER_MODULE(ahc_pci, pci, ahc_pci_driver, ahc_pci_devclass, 0, 0); +DRIVER_MODULE(ahc_pci, cardbus, ahc_pci_driver, ahc_pci_devclass, 0, 0); MODULE_DEPEND(ahc_pci, ahc, 1, 1, 1); MODULE_VERSION(ahc_pci, 1); ==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.c#8 (text+ko) ==== @@ -37,7 +37,7 @@ * * @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95 * - * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.5 2002/05/19 00:14:47 jhb Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs.c,v 1.6 2002/08/01 02:03:20 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.h#7 (text+ko) ==== @@ -37,7 +37,7 @@ * @(#)procfs.h 8.9 (Berkeley) 5/14/95 * * From: - * $FreeBSD: src/sys/fs/procfs/procfs.h,v 1.43 2002/04/20 01:14:25 rwatson Exp $ + * $FreeBSD: src/sys/fs/procfs/procfs.h,v 1.44 2002/08/01 02:03:20 rwatson Exp $ */ #ifdef _KERNEL ==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#7 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.h#10 (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. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.19 2002/06/06 16:59:24 des Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs.h,v 1.20 2002/08/01 01:33:12 rwatson Exp $ */ #ifndef _PSEUDOFS_H_INCLUDED ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#16 (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. * - * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.29 2002/07/08 01:50:14 jeff Exp $ + * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.30 2002/08/01 01:33:12 rwatson Exp $ */ #include "opt_mac.h" ==== //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_acl.c,v 1.31 2002/07/22 03:57:07 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_acl.c,v 1.32 2002/08/01 01:04:16 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_ktrace.c 8.2 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/kern/kern_ktrace.c,v 1.68 2002/06/29 01:50:24 alfred Exp $ + * $FreeBSD: src/sys/kern/kern_ktrace.c,v 1.69 2002/08/01 01:07:03 rwatson Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_tty.c 8.2 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/kern/tty_tty.c,v 1.39 2002/03/19 21:24:06 alfred Exp $ + * $FreeBSD: src/sys/kern/tty_tty.c,v 1.40 2002/08/01 01:09:54 rwatson Exp $ */ /* @@ -204,10 +204,8 @@ PROC_UNLOCK(td->td_proc); return (error); } -#ifdef MAC + /* XXXMAC: Should this be td->td_ucred below? */ /* XXXMAC: Ioctl authorization check here. */ - /* XXX: Should this be td->td_ucred below? */ -#endif return (VOP_IOCTL(ttyvp, cmd, addr, flag, NOCRED, td)); } ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_usrreq.c#22 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.94 2002/07/31 03:03:22 rwatson Exp $ + * $FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.96 2002/08/01 01:18:42 rwatson Exp $ */ #include "opt_mac.h" @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#22 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_lookup.c 8.4 (Berkeley) 2/16/94 - * $FreeBSD: src/sys/kern/vfs_lookup.c,v 1.55 2002/07/24 15:42:22 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_lookup.c,v 1.56 2002/08/01 01:21:40 rwatson Exp $ */ #include "opt_ktrace.h" @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#69 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.273 2002/07/31 01:27:33 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.275 2002/08/01 01:29:03 rwatson Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/modules/if_ppp/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/if_ppp/Makefile,v 1.29 2002/01/11 15:48:48 ru Exp $ +# $FreeBSD: src/sys/modules/if_ppp/Makefile,v 1.30 2002/07/31 20:19:28 rwatson Exp $ .PATH: ${.CURDIR}/../../net ==== //depot/projects/trustedbsd/mac/sys/modules/if_tun/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/if_tun/Makefile,v 1.25 2002/01/11 15:48:48 ru Exp $ +# $FreeBSD: src/sys/modules/if_tun/Makefile,v 1.26 2002/07/31 20:19:28 rwatson Exp $ .PATH: ${.CURDIR}/../../net ==== //depot/projects/trustedbsd/mac/sys/modules/procfs/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/procfs/Makefile,v 1.26 2002/02/06 10:23:02 des Exp $ +# $FreeBSD: src/sys/modules/procfs/Makefile,v 1.27 2002/08/01 02:03:20 rwatson Exp $ .PATH: ${.CURDIR}/../../fs/procfs ==== //depot/projects/trustedbsd/mac/sys/modules/pseudofs/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/pseudofs/Makefile,v 1.2 2002/02/06 10:23:02 des Exp $ +# $FreeBSD: src/sys/modules/pseudofs/Makefile,v 1.3 2002/08/01 01:33:12 rwatson Exp $ .PATH: ${.CURDIR}/../../fs/pseudofs ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#19 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.166 2002/07/22 22:31:09 ru Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.167 2002/07/31 19:06:49 rwatson Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -43,6 +43,7 @@ #include #include +#include #include #include #include /* for proc0 declaration */ ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_output.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.65 2002/06/23 21:25:36 luigi Exp $ + * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.66 2002/07/31 19:06:49 rwatson Exp $ */ #include "opt_inet6.h" ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#16 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.138 2002/07/28 19:59:31 truckman Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.139 2002/07/31 19:06:49 rwatson Exp $ */ #include "opt_compat.h" @@ -457,7 +457,8 @@ } else { /* * XXXMAC: This will need to call a mac function that - * modifies the mbuf label in place. + * modifies the mbuf label in place for TCP datagrams + * not associated with a PCB. */ } #endif ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.23 2002/06/28 19:12:38 jlemon Exp $ + * $FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.24 2002/07/31 19:06:49 rwatson Exp $ */ #include "opt_inet6.h" ==== //depot/projects/trustedbsd/mac/sys/pccard/pccard_nbk.c#5 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/pccard/pccard_nbk.c,v 1.41 2002/07/17 05:50:06 imp Exp $ + * $FreeBSD: src/sys/pccard/pccard_nbk.c,v 1.42 2002/07/31 20:01:11 imp Exp $ */ /* @@ -119,7 +119,7 @@ static int pccard_probe(device_t dev) { - device_set_desc(dev, "PC Card bus (classic)"); + device_set_desc(dev, "PC Card 16-bit bus (classic)"); return (0); } ==== //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#8 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 19:41:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A547937B401; Wed, 31 Jul 2002 19:41:38 -0700 (PDT) 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 5827B37B400; Wed, 31 Jul 2002 19:41:38 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE80243E5E; Wed, 31 Jul 2002 19:41:37 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g712fROo073609; Wed, 31 Jul 2002 22:41:28 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Wed, 31 Jul 2002 22:41:27 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 15347 for review In-Reply-To: <200207312131.g6VLVV8L053036@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, 31 Jul 2002, Brian Feldman wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15347 > > Change 15347 by green@green_laptop_2 on 2002/07/31 14:31:24 > > mac_cred_canexec() no longer exists; use mac_check_vnode_exec(). Hmm. I see the problem you're trying to address by making these locking changes (proc lock ordering relationship to vnode locks), but I'm not sure the result of the changes is correct either. Releasing the proc lock here may have undesirable consequences, since we're in the middle of a process credential change... > > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#28 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#28 (text+ko) ==== > > @@ -398,10 +398,12 @@ > attr.va_gid; > > #ifdef MAC > + PROC_UNLOCK(p); > vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); > will_transition = mac_execve_will_transition(oldcred, imgp->vp); > credential_changing |= will_transition; > VOP_UNLOCK(imgp->vp, 0, td); > + PROC_LOCK(p); > #endif > > if (credential_changing && > @@ -438,11 +440,13 @@ > change_egid(newcred, attr.va_gid); > #ifdef MAC > if (will_transition) { > + PROC_UNLOCK(p); > vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); > mac_execve_transition(oldcred, newcred, imgp->vp); > VOP_UNLOCK(imgp->vp, 0, td); > + PROC_LOCK(p); > } > -#endif > +#endif /* MAC */ > /* > * Implement correct POSIX saved-id behavior. > */ > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Jul 31 22:19:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9386137B401; Wed, 31 Jul 2002 22:19:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 0424B37B400; Wed, 31 Jul 2002 22:19:07 -0700 (PDT) Received: from localhost (green@localhost) by green.bikeshed.org (8.11.6/8.11.6) with ESMTP id g715J5u26137; Thu, 1 Aug 2002 01:19:06 -0400 (EDT) (envelope-from green@green.bikeshed.org) Message-Id: <200208010519.g715J5u26137@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Robert Watson Cc: Brian Feldman , Perforce Change Reviews Subject: Re: PERFORCE change 15347 for review In-Reply-To: Your message of "Wed, 31 Jul 2002 22:41:27 EDT." From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 01 Aug 2002 01:19:05 -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson wrote: > > On Wed, 31 Jul 2002, Brian Feldman wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15347 > > > > Change 15347 by green@green_laptop_2 on 2002/07/31 14:31:24 > > > > mac_cred_canexec() no longer exists; use mac_check_vnode_exec(). > > Hmm. I see the problem you're trying to address by making these locking > changes (proc lock ordering relationship to vnode locks), but I'm not sure > the result of the changes is correct either. Releasing the proc lock here > may have undesirable consequences, since we're in the middle of a process > credential change... There's really nothing bad that can happen that I can tell. -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 2: 7:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C50C37B401; Thu, 1 Aug 2002 02:05:44 -0700 (PDT) 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 097B137B400 for ; Thu, 1 Aug 2002 02:05:44 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1269E43E75 for ; Thu, 1 Aug 2002 02:05:43 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7195hJU063518 for ; Thu, 1 Aug 2002 02:05:43 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7195f4S063515 for perforce@freebsd.org; Thu, 1 Aug 2002 02:05:41 -0700 (PDT) Date: Thu, 1 Aug 2002 02:05:41 -0700 (PDT) Message-Id: <200208010905.g7195f4S063515@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 15369 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15369 Change 15369 by mini@mini_stylus on 2002/08/01 02:04:59 - Rip out the old signal logic; sadly, it won't suit our needs. - Remove the scheduler interval timer (_ITIMER_SCHED_TIMER). - Remove the poorly-named "kernel pipe" (_thread_kern_pipe). Affected files ... .. //depot/projects/kse/lib/libc_r/uthread/Makefile.inc#3 edit .. //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_accept.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_acl_delete_fd.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_acl_get_fd.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_acl_set_fd.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_aio_suspend.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_destroy.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getdetachstate.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getguardsize.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getinheritsched.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getschedparam.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getschedpolicy.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getscope.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getstackaddr.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getstacksize.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_init.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setdetachstate.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setguardsize.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setinheritsched.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setschedparam.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setschedpolicy.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setscope.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setstackaddr.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setstacksize.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_autoinit.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_bind.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_cancel.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_clean.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_close.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_cond.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_condattr_destroy.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_condattr_init.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_connect.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_creat.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_create.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_detach.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_dup.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_dup2.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_equal.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_execve.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_exit.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_fchflags.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_fchmod.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_fchown.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_fcntl.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_fd.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_file.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_find_thread.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_flock.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_fork.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_fpathconf.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_fstat.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_fstatfs.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_fsync.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_gc.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_getdirentries.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_getpeername.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_getprio.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_getschedparam.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_getsockname.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_getsockopt.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_info.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_ioctl.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_join.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_kevent.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_kill.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_listen.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_main_np.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_mattr_init.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_mattr_kind_np.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_msync.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_multi_np.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_mutex.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_mutex_prioceiling.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_mutex_protocol.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_mutexattr_destroy.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_once.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_open.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_pause.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_pipe.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_poll.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_priority_queue.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_pselect.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_read.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_readv.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_recvfrom.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_recvmsg.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_resume_np.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_rwlock.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_rwlockattr.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_select.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_self.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_sem.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_sendfile.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_sendmsg.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_sendto.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_seterrno.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_setprio.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_setschedparam.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_setsockopt.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_shutdown.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_sig.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_sigaction.c#2 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_sigmask.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_sigpending.c#2 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_sigprocmask.c#2 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_sigsuspend.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_sigwait.c#2 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_single_np.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_sleep.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_socket.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_socketpair.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_spec.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_spinlock.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_stack.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_suspend_np.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_switch_np.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_system.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_tcdrain.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_vfork.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_wait.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_wait4.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_waitpid.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_write.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_writev.c#2 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_yield.c#2 edit Differences ... ==== //depot/projects/kse/lib/libc_r/uthread/Makefile.inc#3 (text+ko) ==== @@ -109,13 +109,8 @@ uthread_setschedparam.c \ uthread_setsockopt.c \ uthread_shutdown.c \ - uthread_sig.c \ - uthread_sigaction.c \ uthread_sigmask.c \ - uthread_sigpending.c \ - uthread_sigprocmask.c \ uthread_sigsuspend.c \ - uthread_sigwait.c \ uthread_single_np.c \ uthread_sleep.c \ uthread_socket.c \ ==== //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#3 (text+ko) ==== @@ -61,18 +61,6 @@ #include /* - * XXX - Grovelling around in the machine-dependant context only serves - * to get our hands dirty. - */ -#if defined(__i386__) -#define UCP_STACK(ucp) ((unsigned long)((ucp)->uc_mcontext.mc_esp)) -#elif defined(__alpha__) -#define UCP_STACK(ucp) ((ucp)->uc_mcontext.mc_regs[R_SP]) -#else -#error "Don't recognize this architecture!" -#endif - -/* * Kernel fatal error handler macro. */ #define PANIC(string) _thread_exit(__FILE__,__LINE__,string) @@ -184,17 +172,6 @@ #endif /* - * Define the signals to be used for scheduling. - */ -#if defined(_PTHREADS_COMPAT_SCHED) -#define _ITIMER_SCHED_TIMER ITIMER_VIRTUAL -#define _SCHED_SIGNAL SIGVTALRM -#else -#define _ITIMER_SCHED_TIMER ITIMER_PROF -#define _SCHED_SIGNAL SIGPROF -#endif - -/* * Priority queues. * * XXX It'd be nice if these were contained in uthread_priority_queue.[ch]. @@ -534,42 +511,12 @@ */ typedef void (*thread_continuation_t) (void *); -struct pthread_signal_frame; - -struct pthread_state_data { - struct pthread_signal_frame *psd_curframe; - sigset_t psd_sigmask; - struct timespec psd_wakeup_time; - union pthread_wait_data psd_wait_data; - enum pthread_state psd_state; - int psd_flags; - int psd_interrupted; - int psd_longjmp_val; - int psd_sigmask_seqno; - int psd_signo; - int psd_sig_defer_count; - /* XXX - What about thread->timeout and/or thread->error? */ -}; - struct join_status { struct pthread *thread; void *ret; int error; }; -/* - * The frame that is added to the top of a threads stack when setting up - * up the thread to run a signal handler. - */ -struct pthread_signal_frame { - struct pthread_state_data saved_state; /* State before the signal. */ - ucontext_t ctx; /* Thread's return context. */ - int signo; /* Signal, arg 1 to sighandler. */ - int sig_has_args; /* Use signal args if true. */ - ucontext_t uc; /* Pre-signal context. */ - siginfo_t siginfo; -}; - struct pthread_specific_elem { const void *data; int seqno; @@ -609,16 +556,11 @@ struct pthread_attr attr; /* - * Machine context. + * Machine context, including signal state. */ ucontext_t ctx; /* - * Used for tracking delivery of signal handlers. - */ - struct pthread_signal_frame *curframe; - - /* * Cancelability flags - the lower 2 bits are used by cancel * definitions in pthread.h */ @@ -629,14 +571,6 @@ thread_continuation_t continuation; - /* - * Current signal mask and pending signals. - */ - sigset_t sigmask; - sigset_t sigpend; - int sigmask_seqno; - int check_pending; - /* Thread state: */ enum pthread_state state; @@ -726,12 +660,6 @@ */ int sig_defer_count; - /* - * Set to TRUE if this thread should yield after undeferring - * signals. - */ - int yield_on_sig_undefer; - /* Miscellaneous flags; only set with signals deferred. */ int flags; #define PTHREAD_FLAGS_PRIVATE 0x0001 @@ -830,25 +758,6 @@ ; #endif -/* - * Array of kernel pipe file descriptors that are used to ensure that - * no signals are missed in calls to _select. - */ -SCLASS int _thread_kern_pipe[2] -#ifdef GLOBAL_PTHREAD_PRIVATE -= { - -1, - -1 -}; -#else -; -#endif -SCLASS int volatile _queue_signals -#ifdef GLOBAL_PTHREAD_PRIVATE -= 0; -#else -; -#endif SCLASS int _thread_kern_in_sched #ifdef GLOBAL_PTHREAD_PRIVATE = 0; @@ -856,13 +765,6 @@ ; #endif -SCLASS int _sig_in_handler -#ifdef GLOBAL_PTHREAD_PRIVATE -= 0; -#else -; -#endif - /* Time of day at last scheduling timer signal: */ SCLASS struct timeval volatile _sched_tod #ifdef GLOBAL_PTHREAD_PRIVATE @@ -979,28 +881,6 @@ ; /* - * Array of signal actions for this process. - */ -SCLASS struct sigaction _thread_sigact[NSIG]; - -/* - * Array of counts of dummy handlers for SIG_DFL signals. This is used to - * assure that there is always a dummy signal handler installed while there is a - * thread sigwait()ing on the corresponding signal. - */ -SCLASS int _thread_dfl_count[NSIG]; - -/* - * Pending signals and mask for this process: - */ -SCLASS sigset_t _process_sigpending; -SCLASS sigset_t _process_sigmask -#ifdef GLOBAL_PTHREAD_PRIVATE -= { {0, 0, 0, 0} } -#endif -; - -/* * Scheduling queues: */ SCLASS pq_queue_t _readyq; @@ -1018,28 +898,6 @@ #endif ; -/* Used to maintain pending and active signals: */ -struct sigstatus { - int pending; /* Is this a pending signal? */ - int blocked; /* - * A handler is currently active for - * this signal; ignore subsequent - * signals until the handler is done. - */ - int signo; /* arg 1 to signal handler */ - siginfo_t siginfo; /* arg 2 to signal handler */ - ucontext_t uc; /* arg 3 to signal handler */ -}; - -SCLASS struct sigstatus _thread_sigq[NSIG]; - -/* Indicates that the signal queue needs to be checked. */ -SCLASS volatile int _sigq_check_reqd -#ifdef GLOBAL_PTHREAD_PRIVATE -= 0 -#endif -; - /* Thread switch hook. */ SCLASS pthread_switch_routine_t _sched_switch_hook #ifdef GLOBAL_PTHREAD_PRIVATE @@ -1138,23 +996,14 @@ void _thread_cleanupspecific(void); void _thread_dump_info(void); void _thread_init(void); -void _thread_kern_sched(ucontext_t *); +void _thread_kern_sched(void); void _thread_kern_scheduler(void); -void _thread_kern_sched_frame(struct pthread_signal_frame *psf); -void _thread_kern_sched_sig(void); void _thread_kern_sched_state(enum pthread_state, char *fname, int lineno); void _thread_kern_sched_state_unlock(enum pthread_state state, spinlock_t *lock, char *fname, int lineno); void _thread_kern_set_timeout(const struct timespec *); void _thread_kern_sig_defer(void); void _thread_kern_sig_undefer(void); -void _thread_sig_handler(int, siginfo_t *, ucontext_t *); -void _thread_sig_check_pending(struct pthread *pthread); -void _thread_sig_handle_pending(void); -void _thread_sig_send(struct pthread *pthread, int sig); -void _thread_sig_wrapper(void); -void _thread_sigframe_restore(struct pthread *thread, - struct pthread_signal_frame *psf); void _thread_start(void); void _thread_seterrno(pthread_t, int); int _thread_fd_table_init(int fd); ==== //depot/projects/kse/lib/libc_r/uthread/uthread_accept.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_acl_delete_fd.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_acl_get_fd.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_acl_set_fd.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_aio_suspend.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_destroy.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getdetachstate.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getguardsize.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getinheritsched.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getschedparam.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getschedpolicy.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getscope.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getstackaddr.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getstacksize.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_init.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setdetachstate.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setguardsize.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setinheritsched.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setschedparam.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setschedpolicy.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setscope.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setstackaddr.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setstacksize.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_autoinit.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_bind.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_cancel.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_clean.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_close.c#2 (text+ko) ==== @@ -49,18 +49,11 @@ struct stat sb; struct fd_table_entry *entry; - if ((fd == _thread_kern_pipe[0]) || (fd == _thread_kern_pipe[1])) { - /* - * Don't allow silly programs to close the kernel pipe. - */ - errno = EBADF; - ret = -1; - } /* * Lock the file descriptor while the file is closed and get * the file descriptor status: */ - else if (((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) && + if (((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) && ((ret = __sys_fstat(fd, &sb)) == 0)) { /* * Check if the file should be left as blocking. ==== //depot/projects/kse/lib/libc_r/uthread/uthread_cond.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_condattr_destroy.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_condattr_init.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_connect.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_creat.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_create.c#3 (text+ko) ==== @@ -121,13 +121,6 @@ */ new_thread->magic = PTHREAD_MAGIC; - /* Initialise the thread for signals: */ - new_thread->sigmask = curthread->sigmask; - new_thread->sigmask_seqno = 0; - - /* Initialize the signal frame: */ - new_thread->curframe = NULL; - /* Initialise the machine context: */ getcontext(&new_thread->ctx); new_thread->ctx.uc_stack.ss_sp = new_thread->stack; @@ -216,18 +209,8 @@ /* Return a pointer to the thread structure: */ (*thread) = new_thread; - if (f_gc != 0) { - /* Install the scheduling timer: */ - itimer.it_interval.tv_sec = 0; - itimer.it_interval.tv_usec = _clock_res_usec; - itimer.it_value = itimer.it_interval; - if (setitimer(_ITIMER_SCHED_TIMER, &itimer, - NULL) != 0) - PANIC("Cannot set interval timer"); - } - /* Schedule the new user thread: */ - _thread_kern_sched(NULL); + _thread_kern_sched(); /* * Start a garbage collector thread ==== //depot/projects/kse/lib/libc_r/uthread/uthread_detach.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_dup.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_dup2.c#2 (text+ko) ==== @@ -44,16 +44,8 @@ int ret; int newfd_opened; - /* Check if the file descriptor is out of range: */ - if (newfd < 0 || newfd >= _thread_dtablesize || - newfd == _thread_kern_pipe[0] || newfd == _thread_kern_pipe[1]) { - /* Return a bad file descriptor error: */ - errno = EBADF; - ret = -1; - } - /* Lock the file descriptor: */ - else if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) { + if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) { /* Lock the file descriptor: */ if (!(newfd_opened = (_thread_fd_table[newfd] != NULL)) || (ret = _FD_LOCK(newfd, FD_RDWR, NULL)) == 0) { ==== //depot/projects/kse/lib/libc_r/uthread/uthread_equal.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_execve.c#2 (text+ko) ==== @@ -48,18 +48,6 @@ int ret; struct sigaction act; struct sigaction oact; - struct itimerval itimer; - - /* Disable the interval timer: */ - itimer.it_interval.tv_sec = 0; - itimer.it_interval.tv_usec = 0; - itimer.it_value.tv_sec = 0; - itimer.it_value.tv_usec = 0; - setitimer(_ITIMER_SCHED_TIMER, &itimer, NULL); - - /* Close the pthread kernel pipe: */ - __sys_close(_thread_kern_pipe[0]); - __sys_close(_thread_kern_pipe[1]); /* * Enter a loop to set all file descriptors to blocking @@ -76,33 +64,6 @@ } } - /* Enter a loop to adopt the signal actions for the running thread: */ - for (i = 1; i < NSIG; i++) { - /* Check for signals which cannot be caught: */ - if (i == SIGKILL || i == SIGSTOP) { - /* Don't do anything with these signals. */ - } else { - /* Check if ignoring this signal: */ - if (_thread_sigact[i - 1].sa_handler == SIG_IGN) { - /* Continue to ignore this signal: */ - act.sa_handler = SIG_IGN; - } else { - /* Use the default handler for this signal: */ - act.sa_handler = SIG_DFL; - } - - /* Copy the mask and flags for this signal: */ - act.sa_mask = _thread_sigact[i - 1].sa_mask; - act.sa_flags = _thread_sigact[i - 1].sa_flags; - - /* Change the signal action for the process: */ - __sys_sigaction(i, &act, &oact); - } - } - - /* Set the signal mask: */ - __sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL); - /* Execute the process: */ ret = __sys_execve(name, argv, envp); ==== //depot/projects/kse/lib/libc_r/uthread/uthread_exit.c#2 (text+ko) ==== @@ -49,18 +49,6 @@ { int flags; int i; - struct itimerval itimer; - - /* Disable the interval timer: */ - itimer.it_interval.tv_sec = 0; - itimer.it_interval.tv_usec = 0; - itimer.it_value.tv_sec = 0; - itimer.it_value.tv_usec = 0; - setitimer(_ITIMER_SCHED_TIMER, &itimer, NULL); - - /* Close the pthread kernel pipe: */ - __sys_close(_thread_kern_pipe[0]); - __sys_close(_thread_kern_pipe[1]); /* * Enter a loop to set all file descriptors to blocking ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fchflags.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fchmod.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fchown.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fcntl.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fd.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_file.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_find_thread.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_flock.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fork.c#2 (text+ko) ==== @@ -63,44 +63,8 @@ if ((ret = __sys_fork()) != 0) { /* Parent process or error. Nothing to do here. */ } else { - /* Close the pthread kernel pipe: */ - __sys_close(_thread_kern_pipe[0]); - __sys_close(_thread_kern_pipe[1]); - - /* Reset signals pending for the running thread: */ - sigemptyset(&curthread->sigpend); - - /* - * Create a pipe that is written to by the signal handler to - * prevent signals being missed in calls to - * __sys_select: - */ - if (__sys_pipe(_thread_kern_pipe) != 0) { - /* Cannot create pipe, so abort: */ - PANIC("Cannot create pthread kernel pipe for forked process"); - } - /* Get the flags for the read pipe: */ - else if ((flags = __sys_fcntl(_thread_kern_pipe[0], F_GETFL, NULL)) == -1) { - /* Abort this application: */ - abort(); - } - /* Make the read pipe non-blocking: */ - else if (__sys_fcntl(_thread_kern_pipe[0], F_SETFL, flags | O_NONBLOCK) == -1) { - /* Abort this application: */ - abort(); - } - /* Get the flags for the write pipe: */ - else if ((flags = __sys_fcntl(_thread_kern_pipe[1], F_GETFL, NULL)) == -1) { - /* Abort this application: */ - abort(); - } - /* Make the write pipe non-blocking: */ - else if (__sys_fcntl(_thread_kern_pipe[1], F_SETFL, flags | O_NONBLOCK) == -1) { - /* Abort this application: */ - abort(); - } /* Reinitialize the GC mutex: */ - else if (_mutex_reinit(&_gc_mutex) != 0) { + if (_mutex_reinit(&_gc_mutex) != 0) { /* Abort this application: */ PANIC("Cannot initialize GC mutex for forked process"); } @@ -180,9 +144,6 @@ /* No spinlocks yet: */ _spinblock_count = 0; - /* Don't queue signals yet: */ - _queue_signals = 0; - /* Initialize the scheduling switch hook routine: */ _sched_switch_hook = NULL; ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fpathconf.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fstat.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fstatfs.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fsync.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_gc.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_getdirentries.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_getpeername.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_getprio.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_getschedparam.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_getsockname.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_getsockopt.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_info.c#2 (text+ko) ==== @@ -254,15 +254,6 @@ __sys_write(fd, s, strlen(s)); break; case PS_SIGWAIT: - snprintf(s, sizeof(s), "sigmask (hi)"); - __sys_write(fd, s, strlen(s)); - for (i = _SIG_WORDS - 1; i >= 0; i--) { - snprintf(s, sizeof(s), "%08x\n", - pthread->sigmask.__bits[i]); - __sys_write(fd, s, strlen(s)); - } - snprintf(s, sizeof(s), "(lo)\n"); - __sys_write(fd, s, strlen(s)); break; /* * Trap other states that are not explicitly ==== //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#3 (text+ko) ==== @@ -163,7 +163,6 @@ int sched_stack_size; /* Size of scheduler stack. */ struct clockinfo clockinfo; - struct sigaction act; _pthread_page_size = getpagesize(); _pthread_guard_default = getpagesize(); @@ -217,49 +216,9 @@ PANIC("Cannot get stdio flags"); } - /* - * Create a pipe that is written to by the signal handler to prevent - * signals being missed in calls to _select: - */ - if (__sys_pipe(_thread_kern_pipe) != 0) { - /* Cannot create pipe, so abort: */ - PANIC("Cannot create kernel pipe"); - } - - /* - * Make sure the pipe does not get in the way of stdio: - */ - for (i = 0; i < 2; i++) { - if (_thread_kern_pipe[i] < 3) { - fd = __sys_fcntl(_thread_kern_pipe[i], F_DUPFD, 3); - if (fd == -1) - PANIC("Cannot create kernel pipe"); - __sys_close(_thread_kern_pipe[i]); - _thread_kern_pipe[i] = fd; - } - } - /* Get the flags for the read pipe: */ - if ((flags = __sys_fcntl(_thread_kern_pipe[0], F_GETFL, NULL)) == -1) { - /* Abort this application: */ - PANIC("Cannot get kernel read pipe flags"); - } - /* Make the read pipe non-blocking: */ - else if (__sys_fcntl(_thread_kern_pipe[0], F_SETFL, flags | O_NONBLOCK) == -1) { - /* Abort this application: */ - PANIC("Cannot make kernel read pipe non-blocking"); - } - /* Get the flags for the write pipe: */ - else if ((flags = __sys_fcntl(_thread_kern_pipe[1], F_GETFL, NULL)) == -1) { - /* Abort this application: */ - PANIC("Cannot get kernel write pipe flags"); - } - /* Make the write pipe non-blocking: */ - else if (__sys_fcntl(_thread_kern_pipe[1], F_SETFL, flags | O_NONBLOCK) == -1) { - /* Abort this application: */ - PANIC("Cannot get kernel write pipe flags"); - } /* Allocate and initialize the ready queue: */ - else if (_pq_alloc(&_readyq, PTHREAD_MIN_PRIORITY, PTHREAD_LAST_PRIORITY) != 0) { + if (_pq_alloc(&_readyq, PTHREAD_MIN_PRIORITY, PTHREAD_LAST_PRIORITY) != + 0) { /* Abort this application: */ PANIC("Cannot allocate priority ready queue."); } @@ -363,14 +322,10 @@ /* Initialize last active: */ _thread_initial->last_active = (long) _sched_ticks; - /* Initialize the initial context: */ - _thread_initial->curframe = NULL; - /* Initialise the rest of the fields: */ _thread_initial->poll_data.nfds = 0; _thread_initial->poll_data.fds = NULL; _thread_initial->sig_defer_count = 0; - _thread_initial->yield_on_sig_undefer = 0; _thread_initial->specific = NULL; _thread_initial->cleanup = NULL; _thread_initial->flags = 0; @@ -379,57 +334,6 @@ TAILQ_INSERT_HEAD(&_thread_list, _thread_initial, tle); _set_curthread(_thread_initial); - /* Initialise the global signal action structure: */ - sigfillset(&act.sa_mask); - act.sa_handler = (void (*) ()) _thread_sig_handler; - act.sa_flags = SA_SIGINFO | SA_ONSTACK; - - /* Clear pending signals for the process: */ - sigemptyset(&_process_sigpending); - - /* Clear the signal queue: */ - memset(_thread_sigq, 0, sizeof(_thread_sigq)); - - /* Enter a loop to get the existing signal status: */ - for (i = 1; i < NSIG; i++) { - /* Check for signals which cannot be trapped: */ - if (i == SIGKILL || i == SIGSTOP) { - } - - /* Get the signal handler details: */ - else if (__sys_sigaction(i, NULL, - &_thread_sigact[i - 1]) != 0) { - /* - * Abort this process if signal - * initialisation fails: - */ - PANIC("Cannot read signal handler info"); - } - - /* Initialize the SIG_DFL dummy handler count. */ - _thread_dfl_count[i] = 0; - } - - /* - * Install the signal handler for the most important - * signals that the user-thread kernel needs. Actually - * SIGINFO isn't really needed, but it is nice to have. - */ - if (__sys_sigaction(_SCHED_SIGNAL, &act, NULL) != 0 || - __sys_sigaction(SIGINFO, &act, NULL) != 0 || - __sys_sigaction(SIGCHLD, &act, NULL) != 0) { - /* - * Abort this process if signal initialisation fails: - */ - PANIC("Cannot initialise signal handler"); - } - _thread_sigact[_SCHED_SIGNAL - 1].sa_flags = SA_SIGINFO; - _thread_sigact[SIGINFO - 1].sa_flags = SA_SIGINFO; - _thread_sigact[SIGCHLD - 1].sa_flags = SA_SIGINFO; - - /* Get the process signal mask: */ - __sys_sigprocmask(SIG_SETMASK, NULL, &_process_sigmask); - /* Get the kernel clockrate: */ mib[0] = CTL_KERN; mib[1] = KERN_CLOCKRATE; ==== //depot/projects/kse/lib/libc_r/uthread/uthread_ioctl.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_join.c#2 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#3 (text+ko) ==== @@ -69,37 +69,9 @@ /* Static variables: */ static int last_tick = 0; -static int called_from_handler = 0; -/* - * This is called when a signal handler finishes and wants to - * return to a previous frame. - */ void -_thread_kern_sched_frame(struct pthread_signal_frame *psf) -{ - struct pthread *curthread = _get_curthread(); - - /* - * Flag the pthread kernel as executing scheduler code - * to avoid a signal from interrupting this execution and - * corrupting the (soon-to-be) current frame. - */ - _thread_kern_in_sched = 1; - - /* Restore the signal frame: */ - _thread_sigframe_restore(curthread, psf); - - /* The signal mask was restored; check for any pending signals: */ - curthread->check_pending = 1; - - /* Switch to the thread scheduler: */ - swapcontext(&curthread->ctx, &_thread_kern_sched_ctx); -} - - -void -_thread_kern_sched(ucontext_t *ucp) +_thread_kern_sched(void) { struct pthread *curthread = _get_curthread(); @@ -110,12 +82,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 2:55:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B77237B401; Thu, 1 Aug 2002 02:55:47 -0700 (PDT) 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 B4A8C37B400 for ; Thu, 1 Aug 2002 02:55:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60EFC43E70 for ; Thu, 1 Aug 2002 02:55:46 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g719tkJU069325 for ; Thu, 1 Aug 2002 02:55:46 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g719tk8o069321 for perforce@freebsd.org; Thu, 1 Aug 2002 02:55:46 -0700 (PDT) Date: Thu, 1 Aug 2002 02:55:46 -0700 (PDT) Message-Id: <200208010955.g719tk8o069321@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 15371 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15371 Change 15371 by mini@mini_stylus on 2002/08/01 02:55:33 Remove the struct pthread sigwait field; we're no longer using it. Affected files ... .. //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#4 edit Differences ... ==== //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#4 (text+ko) ==== @@ -493,7 +493,6 @@ union pthread_wait_data { pthread_mutex_t mutex; pthread_cond_t cond; - const sigset_t *sigwait; /* Waiting on a signal in sigwait */ struct { short fd; /* Used when thread waiting on fd */ short branch; /* Line number, for debugging. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 2:56:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D95C337B401; Thu, 1 Aug 2002 02:56:49 -0700 (PDT) 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 77E9537B400 for ; Thu, 1 Aug 2002 02:56:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 346C343E77 for ; Thu, 1 Aug 2002 02:56:49 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g719unJU069462 for ; Thu, 1 Aug 2002 02:56:49 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g719umI6069449 for perforce@freebsd.org; Thu, 1 Aug 2002 02:56:48 -0700 (PDT) Date: Thu, 1 Aug 2002 02:56:48 -0700 (PDT) Message-Id: <200208010956.g719umI6069449@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 15372 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15372 Change 15372 by mini@mini_stylus on 2002/08/01 02:56:23 Block all signals from the scheduler. Affected files ... .. //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#4 edit Differences ... ==== //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#4 (text+ko) ==== @@ -282,6 +282,9 @@ _thread_kern_sched_ctx.uc_stack.ss_size = sched_stack_size; makecontext(&_thread_kern_sched_ctx, _thread_kern_scheduler, 1); + /* Block all signals to the scheduler's context. */ + sigfillset(&_thread_kern_sched_ctx.uc_sigmask); + /* * Write a magic value to the thread structure * to help identify valid ones: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 2:57:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1EFA37B401; Thu, 1 Aug 2002 02:57:51 -0700 (PDT) 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 6E32837B400 for ; Thu, 1 Aug 2002 02:57:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A7DF43E65 for ; Thu, 1 Aug 2002 02:57:51 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g719voJU069638 for ; Thu, 1 Aug 2002 02:57:50 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g719voJK069634 for perforce@freebsd.org; Thu, 1 Aug 2002 02:57:50 -0700 (PDT) Date: Thu, 1 Aug 2002 02:57:50 -0700 (PDT) Message-Id: <200208010957.g719voJK069634@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 15373 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15373 Change 15373 by mini@mini_stylus on 2002/08/01 02:57:18 Add the sigwait(3) function back; its implemented here, not in libc. Affected files ... .. //depot/projects/kse/lib/libc_r/uthread/Makefile.inc#4 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_sigwait.c#3 add Differences ... ==== //depot/projects/kse/lib/libc_r/uthread/Makefile.inc#4 (text+ko) ==== @@ -111,6 +111,7 @@ uthread_shutdown.c \ uthread_sigmask.c \ uthread_sigsuspend.c \ + uthread_sigwait.c \ uthread_single_np.c \ uthread_sleep.c \ uthread_socket.c \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 6:41:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C896D37B401; Thu, 1 Aug 2002 06:41:34 -0700 (PDT) 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 6BBF737B400 for ; Thu, 1 Aug 2002 06:41:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2AE4C43E5E for ; Thu, 1 Aug 2002 06:41:34 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g71DfYJU059439 for ; Thu, 1 Aug 2002 06:41:34 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g71DfXSW059436 for perforce@freebsd.org; Thu, 1 Aug 2002 06:41:33 -0700 (PDT) Date: Thu, 1 Aug 2002 06:41:33 -0700 (PDT) Message-Id: <200208011341.g71DfXSW059436@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 15378 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15378 Change 15378 by jhb@jhb_laptop on 2002/08/01 06:41:10 Replace panic_cpu with panic_thread and make the panic spin lock be thread-based since if a panic'ing thread migrates and another thread panics on the same CPU the spinlock doesn't DTRT. Affected files ... .. //depot/projects/smpng/sys/kern/kern_shutdown.c#25 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_shutdown.c#25 (text+ko) ==== @@ -420,7 +420,7 @@ } #ifdef SMP -static u_int panic_cpu = NOCPU; +static uintptr_t panic_thread = NULL; #endif /* @@ -441,15 +441,17 @@ #ifdef SMP /* * We don't want multiple CPU's to panic at the same time, so we - * use panic_cpu as a simple spinlock. We have to keep checking - * panic_cpu if we are spinning in case the panic on the first + * use panic_thread as a simple spinlock. We have to keep checking + * panic_thread if we are spinning in case the panic on the first * CPU is canceled. */ - if (panic_cpu != PCPU_GET(cpuid)) - while (atomic_cmpset_int(&panic_cpu, NOCPU, - PCPU_GET(cpuid)) == 0) - while (panic_cpu != NOCPU) - ; /* nothing */ + if (panic_thread != curthread) + while (atomic_cmpset_ptr(&panic_thread, NULL, curthread) == 0) + while (panic_thread != NULL) { +#ifdef __i386__ + ia32_pause(); +#endif + } #endif bootopt = RB_AUTOBOOT | RB_DUMP; @@ -481,7 +483,7 @@ /* See if the user aborted the panic, in which case we continue. */ if (panicstr == NULL) { #ifdef SMP - atomic_store_rel_int(&panic_cpu, NOCPU); + atomic_store_rel_ptr(&panic_thread, NULL); #endif return; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 7:12:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED5FF37B407; Thu, 1 Aug 2002 07:12:00 -0700 (PDT) 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 551D337B405 for ; Thu, 1 Aug 2002 07:12:00 -0700 (PDT) Received: from mail.speakeasy.net (mail17.speakeasy.net [216.254.0.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9140543E6A for ; Thu, 1 Aug 2002 07:11:59 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 24169 invoked from network); 1 Aug 2002 14:11:58 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail17.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 1 Aug 2002 14:11:58 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g71EBvuR060702; Thu, 1 Aug 2002 10:11:57 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200207312131.g6VLVV8L053036@freefall.freebsd.org> Date: Thu, 01 Aug 2002 10:11:59 -0400 (EDT) From: John Baldwin To: Brian Feldman Subject: RE: PERFORCE change 15347 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 31-Jul-2002 Brian Feldman wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15347 > > Change 15347 by green@green_laptop_2 on 2002/07/31 14:31:24 > > mac_cred_canexec() no longer exists; use mac_check_vnode_exec(). Dropping the proc lock invalidates the credential changes and any earlier credential changes you just made unless you ensure that the process is single threaded before you do any of the credential checks and before you get here. > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#28 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#28 (text+ko) ==== > > @@ -398,10 +398,12 @@ > attr.va_gid; > > #ifdef MAC > + PROC_UNLOCK(p); > vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); > will_transition = mac_execve_will_transition(oldcred, imgp->vp); > credential_changing |= will_transition; > VOP_UNLOCK(imgp->vp, 0, td); > + PROC_LOCK(p); > #endif > > if (credential_changing && > @@ -438,11 +440,13 @@ > change_egid(newcred, attr.va_gid); > #ifdef MAC > if (will_transition) { > + PROC_UNLOCK(p); > vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); > mac_execve_transition(oldcred, newcred, imgp->vp); > VOP_UNLOCK(imgp->vp, 0, td); > + PROC_LOCK(p); > } > -#endif > +#endif /* MAC */ > /* > * Implement correct POSIX saved-id behavior. > */ -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 8: 7:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1451C37B405; Thu, 1 Aug 2002 08:06:21 -0700 (PDT) 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 82ACA37B401 for ; Thu, 1 Aug 2002 08:06:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D04343E65 for ; Thu, 1 Aug 2002 08:06:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g71F6IJU076681 for ; Thu, 1 Aug 2002 08:06:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g71F6IX0076665 for perforce@freebsd.org; Thu, 1 Aug 2002 08:06:18 -0700 (PDT) Date: Thu, 1 Aug 2002 08:06:18 -0700 (PDT) Message-Id: <200208011506.g71F6IX0076665@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15382 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15382 Change 15382 by rwatson@rwatson_paprika on 2002/08/01 08:05:27 Integ from main tree, including various MAC changes, and other tree changes overnight, in preparation for more MAC merging. Affected files ... .. //depot/projects/trustedbsd/base/include/Makefile#11 integrate .. //depot/projects/trustedbsd/base/include/cpio.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_array.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libz/minigzip.c#3 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#20 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_shutdown.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#22 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_icmp.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/doc.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/base/include/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.171 2002/06/17 01:42:33 wollman Exp $ +# $FreeBSD: src/include/Makefile,v 1.172 2002/08/01 07:18:38 mike Exp $ # # Doing a make install builds /usr/include # @@ -8,7 +8,7 @@ CLEANFILES= osreldate.h version vers.c SUBDIR= arpa protocols rpcsvc rpc -INCS= a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \ +INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h db.h \ dirent.h \ dlfcn.h elf.h elf-hints.h err.h fnmatch.h fstab.h \ fts.h glob.h grp.h \ ==== //depot/projects/trustedbsd/base/lib/libc/xdr/xdr_array.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)xdr_array.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.13 2002/07/31 15:09:49 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.14 2002/08/01 12:23:04 nectar Exp $"); /* * xdr_array.c, Generic XDR routines impelmentation. @@ -83,7 +83,7 @@ return (FALSE); } c = *sizep; - if ((c > maxsize && UINT_MAX/elsize < c) && + if ((c > maxsize || UINT_MAX/elsize < c) && (xdrs->x_op != XDR_FREE)) { return (FALSE); } ==== //depot/projects/trustedbsd/base/lib/libz/minigzip.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libz/minigzip.c,v 1.11 2002/03/11 22:36:45 green Exp $"); +__FBSDID("$FreeBSD: src/lib/libz/minigzip.c,v 1.12 2002/08/01 11:29:05 markm Exp $"); #include #include "zlib.h" @@ -235,7 +235,7 @@ char *infile, *outfile; FILE *out; gzFile in; - int len = strlen(file); + size_t len = strlen(file); if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) { fprintf(stderr, "%s: filename too long\n", prog); ==== //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#13 (text+ko) ==== @@ -6,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.24 2002/07/31 14:59:05 jake Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.25 2002/08/01 03:13:10 peter Exp $ # # XXX why are only some phony targets marked phony? @@ -208,9 +208,6 @@ modules-install modules-reinstall: cd $S/modules ; ${MKMODULESENV} ${MAKE} install -modules-tags: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags - config.o: ${NORMAL_C} ==== //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#20 (text+ko) ==== @@ -103,7 +103,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.108 2002/07/29 15:36:22 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.109 2002/08/01 07:37:52 imp Exp $"; #endif static void wi_intr(void *); @@ -1655,19 +1655,22 @@ break; case SIOCSIFFLAGS: /* - * Can't do promisc and hostap at the same time. + * Can't do promisc and hostap at the same time. If all that's + * changing is the promisc flag, try to short-circuit a call to + * wi_init() by just setting PROMISC in the hardware. */ - if (sc->wi_ptype == WI_PORTTYPE_AP) - ifp->if_flags &= ~IFF_PROMISC; if (ifp->if_flags & IFF_UP) { - if (ifp->if_flags & IFF_RUNNING && - ifp->if_flags & IFF_PROMISC && - !(sc->wi_if_flags & IFF_PROMISC)) { - WI_SETVAL(WI_RID_PROMISC, 1); - } else if (ifp->if_flags & IFF_RUNNING && - !(ifp->if_flags & IFF_PROMISC) && - sc->wi_if_flags & IFF_PROMISC) { - WI_SETVAL(WI_RID_PROMISC, 0); + if (sc->wi_ptype != WI_PORTTYPE_AP && + ifp->if_flags & IFF_RUNNING) { + if (ifp->if_flags & IFF_PROMISC && + !(sc->wi_if_flags & IFF_PROMISC)) { + WI_SETVAL(WI_RID_PROMISC, 1); + } else if (!(ifp->if_flags & IFF_PROMISC) && + sc->wi_if_flags & IFF_PROMISC) { + WI_SETVAL(WI_RID_PROMISC, 0); + } else { + wi_init(sc); + } } else { wi_init(sc); } @@ -2091,12 +2094,7 @@ * and always reset promisc mode in Host-AP regime, * it shows us all the packets anyway. */ - /* - * Can't do promisc and hostap at the same time. - */ - if (sc->wi_ptype == WI_PORTTYPE_AP) - ifp->if_flags &= ~IFF_PROMISC; - if (ifp->if_flags & IFF_PROMISC) + if (sc->wi_ptype != WI_PORTTYPE_AP && ifp->if_flags & IFF_PROMISC) WI_SETVAL(WI_RID_PROMISC, 1); else WI_SETVAL(WI_RID_PROMISC, 0); ==== //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.10 2002/05/19 06:42:29 peter Exp $ + * $FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.11 2002/08/01 09:48:01 iwasaki Exp $ */ #include @@ -93,6 +93,7 @@ movl r_esi,%esi \n\ movl r_edi,%edi \n\ movl r_esp,%esp \n\ + popl %eax \n\ \n\ pushl r_efl \n\ popfl \n\ ==== //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#17 (text+ko) ==== @@ -23,10 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_exec.c,v 1.178 2002/07/30 15:38:29 nectar Exp $ + * $FreeBSD: src/sys/kern/kern_exec.c,v 1.179 2002/08/01 14:31:58 rwatson Exp $ */ #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -35,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -909,6 +911,13 @@ int error; td = curthread; /* XXXKSE */ + +#ifdef MAC + error = mac_check_vnode_exec(td->td_ucred, imgp->vp); + if (error) + return (error); +#endif + /* Get file attributes */ error = VOP_GETATTR(vp, attr, td->td_ucred, td); if (error) ==== //depot/projects/trustedbsd/base/sys/kern/kern_exit.c#16 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 - * $FreeBSD: src/sys/kern/kern_exit.c,v 1.170 2002/06/29 17:26:18 julian Exp $ + * $FreeBSD: src/sys/kern/kern_exit.c,v 1.172 2002/08/01 13:44:33 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_ktrace.c 8.2 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/kern/kern_ktrace.c,v 1.69 2002/08/01 01:07:03 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_ktrace.c,v 1.70 2002/08/01 13:35:38 jhb Exp $ */ #include "opt_ktrace.h" @@ -271,9 +271,11 @@ { crfree(req->ktr_cred); - mtx_lock(&Giant); - vrele(req->ktr_vp); - mtx_unlock(&Giant); + if (req->ktr_vp != NULL) { + mtx_lock(&Giant); + vrele(req->ktr_vp); + mtx_unlock(&Giant); + } mtx_lock(&ktrace_mtx); STAILQ_INSERT_HEAD(&ktr_free, req, ktr_list); mtx_unlock(&ktrace_mtx); ==== //depot/projects/trustedbsd/base/sys/kern/kern_shutdown.c#10 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.131 2002/07/17 02:23:44 gallatin Exp $ + * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.133 2002/08/01 13:39:33 jhb Exp $ */ #include "opt_ddb.h" ==== //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.25 2002/07/31 01:42:19 rwatson Exp $ + * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.26 2002/08/01 14:24:41 bmilekic Exp $ */ #include "opt_mac.h" @@ -805,11 +805,6 @@ struct mb_bucket *bucket; u_int owner; -#ifdef MAC - if (type != MT_NOTMBUF && ((struct mbuf *)m)->m_flags & M_PKTHDR) - mac_destroy_mbuf((struct mbuf *)m); -#endif - bucket = mb_list->ml_btable[MB_BUCKET_INDX(m, mb_list)]; /* @@ -1266,8 +1261,8 @@ _mbhdr_setup(mb, type); #ifdef MAC if (mac_init_mbuf(mb, how) != 0) { - mb_free(&mb_list_mbuf, mb, type, 0, NULL); - return (NULL); + m_free(mb); + return NULL; } #endif } @@ -1315,8 +1310,8 @@ _mbhdr_setup(mb, type); #ifdef MAC if (mac_init_mbuf(mb, how) != 0) { - mb_free(&mb_list_mbuf, mb, type, 0, NULL); - return (NULL); + m_free(mb); + return NULL; } #endif bzero(mtod(mb, caddr_t), MHLEN); @@ -1345,7 +1340,11 @@ m_freem(mb->m_pkthdr.aux); mb->m_pkthdr.aux = NULL; } - +#ifdef MAC + if ((mb->m_flags & M_PKTHDR) && + (mb->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED)) + mac_destroy_mbuf(mb); +#endif nb = mb->m_next; if ((mb->m_flags & M_EXT) != 0) { MEXT_REM_REF(mb); @@ -1392,6 +1391,11 @@ m_freem(mb->m_pkthdr.aux); mb->m_pkthdr.aux = NULL; } +#ifdef MAC + if ((mb->m_flags & M_PKTHDR) && + (mb->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED)) + mac_destroy_mbuf(mb); +#endif persist = 0; m = mb; mb = mb->m_next; @@ -1458,6 +1462,12 @@ _mcl_setup(mb); _mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]); } +#ifdef MAC + if ((type & M_PKTHDR) && (mac_init_mbuf(mb, how) != 0)) { + m_free(mb); + return NULL; + } +#endif return (mb); } ==== //depot/projects/trustedbsd/base/sys/kern/subr_taskqueue.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.12 2002/04/04 21:03:26 jhb Exp $ + * $FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.14 2002/08/01 13:37:22 jhb Exp $ */ #include @@ -94,6 +94,7 @@ { mtx_lock(&queue->tq_mutex); + KASSERT(queue->tq_draining == 0, ("free'ing a draining taskqueue")); queue->tq_draining = 1; mtx_unlock(&queue->tq_mutex); ==== //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#16 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.127 2002/07/31 03:03:22 rwatson Exp $ + * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.128 2002/08/01 03:45:40 rwatson Exp $ */ #include "opt_inet.h" @@ -1255,6 +1255,9 @@ struct linger l; struct timeval tv; u_long val; +#ifdef MAC + struct mac extmac; +#endif /* MAC */ error = 0; if (sopt->sopt_level != SOL_SOCKET) { @@ -1379,6 +1382,20 @@ break; } break; + case SO_LABEL: +#ifdef MAC + error = sooptcopyin(sopt, &extmac, sizeof extmac, + sizeof extmac); + if (error) + goto bad; + + error = mac_setsockopt_label_set( + sopt->sopt_td->td_ucred, so, &extmac); + +#else /* MAC */ + error = EOPNOTSUPP; +#endif /* MAC */ + break; default: error = ENOPROTOOPT; break; @@ -1435,6 +1452,9 @@ #ifdef INET struct accept_filter_arg *afap; #endif +#ifdef MAC + struct mac extmac; +#endif /* MAC */ error = 0; if (sopt->sopt_level != SOL_SOCKET) { @@ -1516,7 +1536,28 @@ tv.tv_usec = (optval % hz) * tick; error = sooptcopyout(sopt, &tv, sizeof tv); break; - + case SO_LABEL: +#ifdef MAC + error = mac_getsockopt_label_get( + sopt->sopt_td->td_ucred, so, &extmac); + if (error) + return (error); + error = sooptcopyout(sopt, &extmac, sizeof extmac); +#else /* MAC */ + error = EOPNOTSUPP; +#endif /* MAC */ + break; + case SO_PEERLABEL: +#ifdef MAC + error = mac_getsockopt_peerlabel_get( + sopt->sopt_td->td_ucred, so, &extmac); + if (error) + return (error); + error = sooptcopyout(sopt, &extmac, sizeof extmac); +#else /* MAC */ + error = EOPNOTSUPP; +#endif /* MAC */ + break; default: error = ENOPROTOOPT; break; ==== //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#22 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.275 2002/08/01 01:29:03 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.276 2002/08/01 03:50:08 rwatson Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -397,6 +397,10 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); if (vp->v_type != VDIR) error = ENOTDIR; +#ifdef MAC + else if ((error = mac_check_vnode_chdir(td->td_ucred, vp)) != 0) { + } +#endif else error = VOP_ACCESS(vp, VEXEC, td->td_ucred, td); while (!error && (mp = vp->v_mountedhere) != NULL) { @@ -524,6 +528,10 @@ mtx_lock(&Giant); if ((error = change_dir(&nd, td)) != 0) goto error; +#ifdef MAC + if ((error = mac_check_vnode_chroot(td->td_ucred, nd.ni_vp))) + goto error; +#endif FILEDESC_LOCK(fdp); if (chroot_allow_open_directories == 0 || (chroot_allow_open_directories == 1 && fdp->fd_rdir != rootvnode)) { @@ -567,6 +575,10 @@ vp = ndp->ni_vp; if (vp->v_type != VDIR) error = ENOTDIR; +#ifdef MAC + else if ((error = mac_check_vnode_chdir(td->td_ucred, vp)) != 0) { + } +#endif else error = VOP_ACCESS(vp, VEXEC, td->td_ucred, td); if (error) ==== //depot/projects/trustedbsd/base/sys/netinet/ip_icmp.c#8 (text+ko) ==== @@ -31,13 +31,15 @@ * SUCH DAMAGE. * * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.69 2002/03/22 16:45:54 ru Exp $ + * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.70 2002/08/01 03:53:04 rwatson Exp $ */ #include "opt_ipsec.h" +#include "opt_mac.h" #include #include +#include #include #include #include @@ -159,6 +161,9 @@ m = m_gethdr(M_DONTWAIT, MT_HEADER); if (m == NULL) goto freeit; +#ifdef MAC + mac_create_mbuf_netlayer(n, m); +#endif icmplen = min(oiplen + 8, oip->ip_len); if (icmplen < sizeof(struct ip)) panic("icmp_error: bad length"); ==== //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.139 2002/07/31 19:06:49 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.140 2002/08/01 03:54:43 rwatson Exp $ */ #include "opt_compat.h" @@ -347,6 +347,8 @@ #endif /* INET6 */ int ipflags = 0; + KASSERT(tp != NULL || m != NULL, ("tcp_respond: tp and m both NULL")); + #ifdef INET6 isipv6 = IP_VHL_V(((struct ip *)ipgen)->ip_vhl) == 6; ip6 = ipgen; ==== //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.1 2002/07/31 12:32:03 des Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.2 2002/08/01 11:02:30 des Exp $"); #include #include @@ -258,6 +258,20 @@ } if ((inp->inp_vflag & vflag) == 0) continue; + if (inp->inp_vflag & INP_IPV4) { + if ((inp->inp_fport == 0 && !opt_l) || + (inp->inp_fport != 0 && !opt_c)) + continue; + } else if (inp->inp_vflag & INP_IPV6) { + if ((inp->in6p_fport == 0 && !opt_l) || + (inp->in6p_fport != 0 && !opt_c)) + continue; + } else { + if (opt_v) + warnx("invalid vflag 0x%x", inp->inp_vflag); + free(sock); + continue; + } if ((sock = calloc(1, sizeof *sock)) == NULL) err(1, "malloc()"); sock->socket = so->xso_so; @@ -274,11 +288,6 @@ &inp->in6p_laddr, inp->in6p_lport); sockaddr(&sock->faddr, sock->family, &inp->in6p_faddr, inp->in6p_fport); - } else { - if (opt_v) - warnx("invalid vflag 0x%x", inp->inp_vflag); - free(sock); - continue; } sock->vflag = inp->inp_vflag; sock->protoname = protoname; @@ -348,6 +357,9 @@ warnx("struct xunpcb size mismatch"); goto out; } + if ((xup->xu_unp.unp_conn == NULL && !opt_l) || + (xup->xu_unp.unp_conn != NULL && !opt_c)) + continue; if ((sock = calloc(1, sizeof *sock)) == NULL) err(1, "malloc()"); sock->socket = xup->xu_socket.xso_so; @@ -454,7 +466,6 @@ setpassent(1); for (xf = xfiles, n = 0; n < nxfiles; ++n, ++xf) { hash = (int)((uintptr_t)xf->xf_data % HASHSIZE); - /*xprintf("%p %d\n", xf->xf_data, hash);*/ for (s = sockhash[hash]; s != NULL; s = s->next) if (s->socket == xf->xf_data) break; ==== //depot/projects/trustedbsd/base/usr.sbin/sysinstall/doc.c#3 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/doc.c,v 1.30 2002/04/23 22:16:41 obrien Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/doc.c,v 1.31 2002/08/01 10:20:59 blackend Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -105,12 +105,12 @@ else if (strstr(str, "FAQ")) { where = strcpy(target, "/usr/share/doc/faq/index.html"); if (!file_readable(target)) - where = strcpy(target, "http://www.freebsd.org/FAQ"); + where = strcpy(target, "http://www.freebsd.org/doc/en_US.ISO8859-1/books/faq"); } else if (strstr(str, "Handbook")) { where = strcpy(target, "/usr/share/doc/handbook/index.html"); if (!file_readable(target)) - where = strcpy(target, "http://www.freebsd.org/handbook"); + where = strcpy(target, "http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook"); } if (where) { sprintf(tmp, "%s %s", browser, target); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 8:14:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2400437B405; Thu, 1 Aug 2002 08:13:31 -0700 (PDT) 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 4652B37B401 for ; Thu, 1 Aug 2002 08:13:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23D9C43E3B for ; Thu, 1 Aug 2002 08:13:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g71FDSJU077687 for ; Thu, 1 Aug 2002 08:13:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g71FDSgB077682 for perforce@freebsd.org; Thu, 1 Aug 2002 08:13:28 -0700 (PDT) Date: Thu, 1 Aug 2002 08:13:28 -0700 (PDT) Message-Id: <200208011513.g71FDSgB077682@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15384 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15384 Change 15384 by rwatson@rwatson_paprika on 2002/08/01 08:13:16 Integ trustedbsd base into trustedbsd_mac, trickling back in various MAC commits, etc. Affected files ... .. //depot/projects/trustedbsd/mac/include/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/include/cpio.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_array.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libz/minigzip.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_wakeup.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_shutdown.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#70 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#17 integrate .. //depot/projects/trustedbsd/mac/usr.bin/sockstat/sockstat.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/doc.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac/include/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.171 2002/06/17 01:42:33 wollman Exp $ +# $FreeBSD: src/include/Makefile,v 1.172 2002/08/01 07:18:38 mike Exp $ # # Doing a make install builds /usr/include # @@ -8,7 +8,7 @@ CLEANFILES= osreldate.h version vers.c SUBDIR= arpa protocols rpcsvc rpc -INCS= a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \ +INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h db.h \ dirent.h \ dlfcn.h elf.h elf-hints.h err.h fnmatch.h fstab.h \ fts.h glob.h grp.h \ ==== //depot/projects/trustedbsd/mac/lib/libc/xdr/xdr_array.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)xdr_array.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.13 2002/07/31 15:09:49 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_array.c,v 1.14 2002/08/01 12:23:04 nectar Exp $"); /* * xdr_array.c, Generic XDR routines impelmentation. @@ -83,7 +83,7 @@ return (FALSE); } c = *sizep; - if ((c > maxsize && UINT_MAX/elsize < c) && + if ((c > maxsize || UINT_MAX/elsize < c) && (xdrs->x_op != XDR_FREE)) { return (FALSE); } ==== //depot/projects/trustedbsd/mac/lib/libz/minigzip.c#3 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libz/minigzip.c,v 1.11 2002/03/11 22:36:45 green Exp $"); +__FBSDID("$FreeBSD: src/lib/libz/minigzip.c,v 1.12 2002/08/01 11:29:05 markm Exp $"); #include #include "zlib.h" @@ -235,7 +235,7 @@ char *infile, *outfile; FILE *out; gzFile in; - int len = strlen(file); + size_t len = strlen(file); if (len + strlen(GZ_SUFFIX) >= sizeof(buf)) { fprintf(stderr, "%s: filename too long\n", prog); ==== //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#11 (text+ko) ==== @@ -6,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.24 2002/07/31 14:59:05 jake Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.25 2002/08/01 03:13:10 peter Exp $ # # XXX why are only some phony targets marked phony? @@ -208,9 +208,6 @@ modules-install modules-reinstall: cd $S/modules ; ${MKMODULESENV} ${MAKE} install -modules-tags: - cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags - config.o: ${NORMAL_C} ==== //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#20 (text+ko) ==== @@ -103,7 +103,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.108 2002/07/29 15:36:22 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.109 2002/08/01 07:37:52 imp Exp $"; #endif static void wi_intr(void *); @@ -1655,19 +1655,22 @@ break; case SIOCSIFFLAGS: /* - * Can't do promisc and hostap at the same time. + * Can't do promisc and hostap at the same time. If all that's + * changing is the promisc flag, try to short-circuit a call to + * wi_init() by just setting PROMISC in the hardware. */ - if (sc->wi_ptype == WI_PORTTYPE_AP) - ifp->if_flags &= ~IFF_PROMISC; if (ifp->if_flags & IFF_UP) { - if (ifp->if_flags & IFF_RUNNING && - ifp->if_flags & IFF_PROMISC && - !(sc->wi_if_flags & IFF_PROMISC)) { - WI_SETVAL(WI_RID_PROMISC, 1); - } else if (ifp->if_flags & IFF_RUNNING && - !(ifp->if_flags & IFF_PROMISC) && - sc->wi_if_flags & IFF_PROMISC) { - WI_SETVAL(WI_RID_PROMISC, 0); + if (sc->wi_ptype != WI_PORTTYPE_AP && + ifp->if_flags & IFF_RUNNING) { + if (ifp->if_flags & IFF_PROMISC && + !(sc->wi_if_flags & IFF_PROMISC)) { + WI_SETVAL(WI_RID_PROMISC, 1); + } else if (!(ifp->if_flags & IFF_PROMISC) && + sc->wi_if_flags & IFF_PROMISC) { + WI_SETVAL(WI_RID_PROMISC, 0); + } else { + wi_init(sc); + } } else { wi_init(sc); } @@ -2091,12 +2094,7 @@ * and always reset promisc mode in Host-AP regime, * it shows us all the packets anyway. */ - /* - * Can't do promisc and hostap at the same time. - */ - if (sc->wi_ptype == WI_PORTTYPE_AP) - ifp->if_flags &= ~IFF_PROMISC; - if (ifp->if_flags & IFF_PROMISC) + if (sc->wi_ptype != WI_PORTTYPE_AP && ifp->if_flags & IFF_PROMISC) WI_SETVAL(WI_RID_PROMISC, 1); else WI_SETVAL(WI_RID_PROMISC, 0); ==== //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_wakeup.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.10 2002/05/19 06:42:29 peter Exp $ + * $FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.11 2002/08/01 09:48:01 iwasaki Exp $ */ #include @@ -93,6 +93,7 @@ movl r_esi,%esi \n\ movl r_edi,%edi \n\ movl r_esp,%esp \n\ + popl %eax \n\ \n\ pushl r_efl \n\ popfl \n\ ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#29 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_exec.c,v 1.178 2002/07/30 15:38:29 nectar Exp $ + * $FreeBSD: src/sys/kern/kern_exec.c,v 1.179 2002/08/01 14:31:58 rwatson Exp $ */ #include "opt_ktrace.h" @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -949,6 +950,13 @@ int error; td = curthread; /* XXXKSE */ + +#ifdef MAC + error = mac_check_vnode_exec(td->td_ucred, imgp->vp); + if (error) + return (error); +#endif + /* Get file attributes */ error = VOP_GETATTR(vp, attr, td->td_ucred, td); if (error) ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#17 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 - * $FreeBSD: src/sys/kern/kern_exit.c,v 1.170 2002/06/29 17:26:18 julian Exp $ + * $FreeBSD: src/sys/kern/kern_exit.c,v 1.172 2002/08/01 13:44:33 jhb Exp $ */ #include "opt_compat.h" ==== //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_ktrace.c 8.2 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/kern/kern_ktrace.c,v 1.69 2002/08/01 01:07:03 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_ktrace.c,v 1.70 2002/08/01 13:35:38 jhb Exp $ */ #include "opt_ktrace.h" @@ -271,9 +271,11 @@ { crfree(req->ktr_cred); - mtx_lock(&Giant); - vrele(req->ktr_vp); - mtx_unlock(&Giant); + if (req->ktr_vp != NULL) { + mtx_lock(&Giant); + vrele(req->ktr_vp); + mtx_unlock(&Giant); + } mtx_lock(&ktrace_mtx); STAILQ_INSERT_HEAD(&ktr_free, req, ktr_list); mtx_unlock(&ktrace_mtx); ==== //depot/projects/trustedbsd/mac/sys/kern/kern_shutdown.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_shutdown.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.131 2002/07/17 02:23:44 gallatin Exp $ + * $FreeBSD: src/sys/kern/kern_shutdown.c,v 1.133 2002/08/01 13:39:33 jhb Exp $ */ #include "opt_ddb.h" ==== //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#19 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.25 2002/07/31 01:42:19 rwatson Exp $ + * $FreeBSD: src/sys/kern/subr_mbuf.c,v 1.26 2002/08/01 14:24:41 bmilekic Exp $ */ #include "opt_mac.h" @@ -805,11 +805,6 @@ struct mb_bucket *bucket; u_int owner; -#ifdef MAC - if (type != MT_NOTMBUF && ((struct mbuf *)m)->m_flags & M_PKTHDR) - mac_destroy_mbuf((struct mbuf *)m); -#endif - bucket = mb_list->ml_btable[MB_BUCKET_INDX(m, mb_list)]; /* @@ -1266,8 +1261,8 @@ _mbhdr_setup(mb, type); #ifdef MAC if (mac_init_mbuf(mb, how) != 0) { - mb_free(&mb_list_mbuf, mb, type, 0, NULL); - return (NULL); + m_free(mb); + return NULL; } #endif } @@ -1315,8 +1310,8 @@ _mbhdr_setup(mb, type); #ifdef MAC if (mac_init_mbuf(mb, how) != 0) { - mb_free(&mb_list_mbuf, mb, type, 0, NULL); - return (NULL); + m_free(mb); + return NULL; } #endif bzero(mtod(mb, caddr_t), MHLEN); @@ -1345,7 +1340,11 @@ m_freem(mb->m_pkthdr.aux); mb->m_pkthdr.aux = NULL; } - +#ifdef MAC + if ((mb->m_flags & M_PKTHDR) && + (mb->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED)) + mac_destroy_mbuf(mb); +#endif nb = mb->m_next; if ((mb->m_flags & M_EXT) != 0) { MEXT_REM_REF(mb); @@ -1392,6 +1391,11 @@ m_freem(mb->m_pkthdr.aux); mb->m_pkthdr.aux = NULL; } +#ifdef MAC + if ((mb->m_flags & M_PKTHDR) && + (mb->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED)) + mac_destroy_mbuf(mb); +#endif persist = 0; m = mb; mb = mb->m_next; @@ -1458,6 +1462,12 @@ _mcl_setup(mb); _mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]); } +#ifdef MAC + if ((type & M_PKTHDR) && (mac_init_mbuf(mb, how) != 0)) { + m_free(mb); + return NULL; + } +#endif return (mb); } ==== //depot/projects/trustedbsd/mac/sys/kern/subr_taskqueue.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.12 2002/04/04 21:03:26 jhb Exp $ + * $FreeBSD: src/sys/kern/subr_taskqueue.c,v 1.14 2002/08/01 13:37:22 jhb Exp $ */ #include @@ -94,6 +94,7 @@ { mtx_lock(&queue->tq_mutex); + KASSERT(queue->tq_draining == 0, ("free'ing a draining taskqueue")); queue->tq_draining = 1; mtx_unlock(&queue->tq_mutex); ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#31 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.127 2002/07/31 03:03:22 rwatson Exp $ + * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.128 2002/08/01 03:45:40 rwatson Exp $ */ #include "opt_inet.h" ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#70 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.275 2002/08/01 01:29:03 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.276 2002/08/01 03:50:08 rwatson Exp $ */ /* For 4.3 integer FS ID compatibility */ ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.69 2002/03/22 16:45:54 ru Exp $ + * $FreeBSD: src/sys/netinet/ip_icmp.c,v 1.70 2002/08/01 03:53:04 rwatson Exp $ */ #include "opt_ipsec.h" @@ -164,6 +164,9 @@ #endif if (m == NULL) goto freeit; +#ifdef MAC + mac_create_mbuf_netlayer(n, m); +#endif icmplen = min(oiplen + 8, oip->ip_len); if (icmplen < sizeof(struct ip)) panic("icmp_error: bad length"); ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#17 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.139 2002/07/31 19:06:49 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.140 2002/08/01 03:54:43 rwatson Exp $ */ #include "opt_compat.h" ==== //depot/projects/trustedbsd/mac/usr.bin/sockstat/sockstat.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.1 2002/07/31 12:32:03 des Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.2 2002/08/01 11:02:30 des Exp $"); #include #include @@ -258,6 +258,20 @@ } if ((inp->inp_vflag & vflag) == 0) continue; + if (inp->inp_vflag & INP_IPV4) { + if ((inp->inp_fport == 0 && !opt_l) || + (inp->inp_fport != 0 && !opt_c)) + continue; + } else if (inp->inp_vflag & INP_IPV6) { + if ((inp->in6p_fport == 0 && !opt_l) || + (inp->in6p_fport != 0 && !opt_c)) + continue; + } else { + if (opt_v) + warnx("invalid vflag 0x%x", inp->inp_vflag); + free(sock); + continue; + } if ((sock = calloc(1, sizeof *sock)) == NULL) err(1, "malloc()"); sock->socket = so->xso_so; @@ -274,11 +288,6 @@ &inp->in6p_laddr, inp->in6p_lport); sockaddr(&sock->faddr, sock->family, &inp->in6p_faddr, inp->in6p_fport); - } else { - if (opt_v) - warnx("invalid vflag 0x%x", inp->inp_vflag); - free(sock); - continue; } sock->vflag = inp->inp_vflag; sock->protoname = protoname; @@ -348,6 +357,9 @@ warnx("struct xunpcb size mismatch"); goto out; } + if ((xup->xu_unp.unp_conn == NULL && !opt_l) || + (xup->xu_unp.unp_conn != NULL && !opt_c)) + continue; if ((sock = calloc(1, sizeof *sock)) == NULL) err(1, "malloc()"); sock->socket = xup->xu_socket.xso_so; @@ -454,7 +466,6 @@ setpassent(1); for (xf = xfiles, n = 0; n < nxfiles; ++n, ++xf) { hash = (int)((uintptr_t)xf->xf_data % HASHSIZE); - /*xprintf("%p %d\n", xf->xf_data, hash);*/ for (s = sockhash[hash]; s != NULL; s = s->next) if (s->socket == xf->xf_data) break; ==== //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/doc.c#3 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/doc.c,v 1.30 2002/04/23 22:16:41 obrien Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/doc.c,v 1.31 2002/08/01 10:20:59 blackend Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -105,12 +105,12 @@ else if (strstr(str, "FAQ")) { where = strcpy(target, "/usr/share/doc/faq/index.html"); if (!file_readable(target)) - where = strcpy(target, "http://www.freebsd.org/FAQ"); + where = strcpy(target, "http://www.freebsd.org/doc/en_US.ISO8859-1/books/faq"); } else if (strstr(str, "Handbook")) { where = strcpy(target, "/usr/share/doc/handbook/index.html"); if (!file_readable(target)) - where = strcpy(target, "http://www.freebsd.org/handbook"); + where = strcpy(target, "http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook"); } if (where) { sprintf(tmp, "%s %s", browser, target); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 8:15:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D984A37B401; Thu, 1 Aug 2002 08:15:32 -0700 (PDT) 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 71B1737B400 for ; Thu, 1 Aug 2002 08:15:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2ED0D43E3B for ; Thu, 1 Aug 2002 08:15:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g71FFWJU078132 for ; Thu, 1 Aug 2002 08:15:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g71FFV91078129 for perforce@freebsd.org; Thu, 1 Aug 2002 08:15:31 -0700 (PDT) Date: Thu, 1 Aug 2002 08:15:31 -0700 (PDT) Message-Id: <200208011515.g71FFV91078129@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15385 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15385 Change 15385 by rwatson@rwatson_paprika on 2002/08/01 08:14:33 Remove dups from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#30 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#30 (text+ko) ==== @@ -30,7 +30,6 @@ #include "opt_mac.h" #include -#include #include #include #include @@ -988,17 +987,6 @@ if (error) return (error); -#ifdef MAC - /* - * Check that we can execute the file, and hold onto the lock so - * that the label is retained for use later for MAC models that - * support subject domain transitions at execve()-time. - */ - error = mac_check_vnode_exec(curthread->td_ucred, imgp->vp); - if (error) - return (error); -#endif - /* * Check number of open-for-writes on the file and deny execution * if there are any. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 9:45:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 133A837B401; Thu, 1 Aug 2002 09:45:30 -0700 (PDT) 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 A754737B400 for ; Thu, 1 Aug 2002 09:45:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4615043E6E for ; Thu, 1 Aug 2002 09:45:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g71GjTJU000879 for ; Thu, 1 Aug 2002 09:45:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g71GjT6t000871 for perforce@freebsd.org; Thu, 1 Aug 2002 09:45:29 -0700 (PDT) Date: Thu, 1 Aug 2002 09:45:29 -0700 (PDT) Message-Id: <200208011645.g71GjT6t000871@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15388 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15388 Change 15388 by rwatson@rwatson_paprika on 2002/08/01 09:45:20 Alternate formulate of security checks in vn_open_cred() that does enforce appropriate protections at open-time for MAC despite O_CREAT being set or not. As with other failures during the O_CREAT case, a dud file is left around to be cleaned up by the user. Remove various comments about problems that this change should fix. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#35 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#35 (text+ko) ==== @@ -196,32 +196,29 @@ error = EOPNOTSUPP; goto bad; } + mode = 0; + if (fmode & (VWRITE | O_TRUNC)) { + if (vp->v_type == VDIR) { + error = EISDIR; + goto bad; + } + mode |= VWRITE; + } + if (fmode & FREAD) + mode |= VREAD; + if (fmode & O_APPEND) + mode |= VAPPEND; +#ifdef MAC + error = mac_check_vnode_open(cred, vp, mode); + if (error) + goto bad; +#endif if ((fmode & O_CREAT) == 0) { - mode = 0; - if (fmode & (FWRITE | O_TRUNC)) { - if (vp->v_type == VDIR) { - error = EISDIR; - goto bad; - } + if (mode & VWRITE) { error = vn_writechk(vp); if (error) goto bad; - mode |= VWRITE; } - if (fmode & FREAD) - mode |= VREAD; - if (fmode & O_APPEND) - mode |= VAPPEND; -#ifdef MAC - /* - * XXXMAC: Note that for newly created files, we never - * perform an open check. This is probably wrong, but if - * we add it, the failure modes need to be right. - */ - error = mac_check_vnode_open(cred, vp, mode); - if (error) - goto bad; -#endif /* MAC */ if (mode) { error = VOP_ACCESS(vp, mode, cred, td); if (error) @@ -232,11 +229,6 @@ vp->v_cachedfs = vap->va_fsid; vp->v_cachedid = vap->va_fileid; } -#ifdef MAC - /* - * XXXMAC: Open check should probably be here. - */ -#endif if ((error = VOP_OPEN(vp, fmode, cred, td)) != 0) goto bad; /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 9:56:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00A6737B401; Thu, 1 Aug 2002 09:56:43 -0700 (PDT) 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 9AF1837B400 for ; Thu, 1 Aug 2002 09:56:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5636543E3B for ; Thu, 1 Aug 2002 09:56:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g71GuhJU002806 for ; Thu, 1 Aug 2002 09:56:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g71GuhQO002803 for perforce@freebsd.org; Thu, 1 Aug 2002 09:56:43 -0700 (PDT) Date: Thu, 1 Aug 2002 09:56:43 -0700 (PDT) Message-Id: <200208011656.g71GuhQO002803@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15389 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15389 Change 15389 by rwatson@rwatson_paprika on 2002/08/01 09:56:40 Make macop_t explicitly const, and use macop_t in the entry point definition structure. This should eliminate the hundreds of warnings associated with MAC operation vector arrays in modules. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#104 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#104 (text+ko) ==== @@ -326,7 +326,7 @@ struct label *label, int op); }; -typedef void *macop_t; +typedef const void *macop_t; enum mac_op_constant { MAC_OP_LAST, @@ -445,7 +445,7 @@ struct mac_policy_op_entry { enum mac_op_constant mpe_constant; /* what this hook implements */ - void *mpe_function; /* hook's implementation */ + macop_t mpe_function; /* hook's implementation */ }; struct mac_policy_conf { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 10: 9: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 547A537B400; Thu, 1 Aug 2002 10:09:02 -0700 (PDT) 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 AD68137B405 for ; Thu, 1 Aug 2002 10:09:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A58343E4A for ; Thu, 1 Aug 2002 10:08:58 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g71H8wJU008309 for ; Thu, 1 Aug 2002 10:08:58 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g71H8wNR008306 for perforce@freebsd.org; Thu, 1 Aug 2002 10:08:58 -0700 (PDT) Date: Thu, 1 Aug 2002 10:08:58 -0700 (PDT) Message-Id: <200208011708.g71H8wNR008306@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 15390 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15390 Change 15390 by cvance@cvance_laptop on 2002/08/01 10:08:27 Don't modify the label on files when the specs say <> Affected files ... .. //depot/projects/trustedbsd/mac/sbin/sebsd_setfiles/setfiles.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/sebsd_setfiles/setfiles.c#2 (text+ko) ==== @@ -157,6 +157,13 @@ spec[idx].context); } + if (strcmp(spec[idx].context, "<>") == 0) { + printf("File %s matches spec <>, Not labeling it!\n", + path); + return; + } + + /* * TBD: Files can have hard links and be labeled multiple * times. To stop this from happening, we need to keep track To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 10:59:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34C4137B407; Thu, 1 Aug 2002 10:58:04 -0700 (PDT) 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 D91B437B401 for ; Thu, 1 Aug 2002 10:58:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B5B0243E7B for ; Thu, 1 Aug 2002 10:58:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g71Hw2JU020808 for ; Thu, 1 Aug 2002 10:58:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g71Hw2E1020805 for perforce@freebsd.org; Thu, 1 Aug 2002 10:58:02 -0700 (PDT) Date: Thu, 1 Aug 2002 10:58:02 -0700 (PDT) Message-Id: <200208011758.g71Hw2E1020805@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15399 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15399 Change 15399 by rwatson@rwatson_paprika on 2002/08/01 10:57:22 Integ MAC changes back in from the main tree. Affected files ... .. //depot/projects/trustedbsd/base/contrib/tar/src/extract.c#3 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#34 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_tty.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#18 integrate .. //depot/projects/trustedbsd/base/sys/modules/mac_biba/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/mac_bsdextended/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/mac_ifoff/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/mac_mls/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/mac_none/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/mac_seeotheruids/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/mac_test/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/base/contrib/tar/src/extract.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/extract.c,v 1.4 2002/07/03 12:44:31 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/extract.c,v 1.5 2002/08/01 17:32:08 sobomax Exp $ */ #include "system.h" #include @@ -129,6 +129,9 @@ { umask (newdir_umask); /* restore the kernel umask */ current_umask = newdir_umask; +#ifdef __FreeBSD__ + same_permissions_option++; +#endif } } @@ -184,7 +187,7 @@ mode = current_stat_info->st_mode ^ invert_permissions; } - if (chmod (file_name, mode) != 0) + if (chmod (file_name, mode & ~ current_umask) != 0) chmod_error_details (file_name, mode); } ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#34 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.401 2002/07/31 20:09:07 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.402 2002/08/01 15:27:51 bmah Exp $ 2000 @@ -1959,6 +1959,11 @@ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:33.openssl.asc">FreeBSD-SA-02:33. &merged; + A heap buffer overflow in the XDR decoder has been fixed. + For more details, see security advisory FreeBSD-SA-02:34. + &merged; + ==== //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#12 (text+ko) ==== @@ -4,7 +4,7 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/handbook/kernelconfig-config.html +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.146 2002/07/23 06:36:23 peter Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.147 2002/08/01 17:21:03 blackend Exp $ machine alpha cpu EV4 ==== //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#14 (text+ko) ==== @@ -4,7 +4,7 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/handbook/kernelconfig-config.html +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.352 2002/07/23 06:35:08 peter Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.353 2002/08/01 17:21:09 blackend Exp $ machine i386 cpu I486_CPU ==== //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_mac.c,v 1.2 2002/07/30 21:36:05 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_mac.c,v 1.3 2002/08/01 17:47:55 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -46,6 +46,7 @@ */ #include "opt_mac.h" + #include #include #include ==== //depot/projects/trustedbsd/base/sys/kern/kern_prot.c#18 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_prot.c,v 1.163 2002/07/31 00:48:24 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_prot.c,v 1.164 2002/08/01 17:47:55 rwatson Exp $ */ /* @@ -52,8 +52,8 @@ #include #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/base/sys/kern/tty_tty.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_tty.c 8.2 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/kern/tty_tty.c,v 1.40 2002/08/01 01:09:54 rwatson Exp $ + * $FreeBSD: src/sys/kern/tty_tty.c,v 1.41 2002/08/01 17:47:55 rwatson Exp $ */ /* @@ -45,8 +45,8 @@ #include #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.96 2002/07/31 01:51:34 rwatson Exp $ + * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.97 2002/08/01 17:47:55 rwatson Exp $ */ #include "opt_mac.h" @@ -41,8 +41,8 @@ #include #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#17 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.128 2002/08/01 03:45:40 rwatson Exp $ + * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.129 2002/08/01 17:47:56 rwatson Exp $ */ #include "opt_inet.h" @@ -42,8 +42,8 @@ #include #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#17 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/kern/uipc_socket2.c,v 1.100 2002/07/31 03:03:22 rwatson Exp $ + * $FreeBSD: src/sys/kern/uipc_socket2.c,v 1.101 2002/08/01 17:47:56 rwatson Exp $ */ #include "opt_mac.h" @@ -44,8 +44,8 @@ #include /* for maxfiles */ #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#15 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.121 2002/07/31 16:39:49 rwatson Exp $ + * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.122 2002/08/01 17:47:56 rwatson Exp $ */ #include "opt_compat.h" @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#4 (text+ko) ==== @@ -61,7 +61,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/vfs_mount.c,v 1.79 2002/07/31 01:11:29 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_mount.c,v 1.80 2002/08/01 17:47:56 rwatson Exp $ */ #include @@ -69,8 +69,8 @@ #include #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#19 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.386 2002/07/31 12:25:28 des Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.387 2002/08/01 17:47:56 rwatson Exp $ */ /* @@ -54,8 +54,8 @@ #include #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#23 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.276 2002/08/01 03:50:08 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.278 2002/08/01 17:47:56 rwatson Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -48,8 +48,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -733,7 +733,12 @@ VATTR_NULL(&vat); vat.va_size = 0; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_SETATTR(vp, &vat, td->td_ucred, td); +#ifdef MAC + error = mac_check_vnode_op(td->td_ucred, vp, + MAC_OP_VNODE_WRITE); + if (error == 0) +#endif + error = VOP_SETATTR(vp, &vat, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); if (error) @@ -1305,6 +1310,11 @@ flags |= VWRITE; if (user_flags & X_OK) flags |= VEXEC; +#ifdef MAC + error = mac_check_vnode_access(cred, vp, flags); + if (error) + return (error); +#endif if ((flags & VWRITE) == 0 || (error = vn_writechk(vp)) == 0) error = VOP_ACCESS(vp, flags, cred, td); } @@ -1746,6 +1756,13 @@ return (error); NDFREE(&nd, NDF_ONLY_PNBUF); vp = nd.ni_vp; +#ifdef MAC + error = mac_check_vnode_readlink(td->td_ucred, vp); + if (error) { + vput(vp); + return (error); + } +#endif if (vp->v_type != VLNK) error = EINVAL; else { @@ -1794,9 +1811,16 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - VATTR_NULL(&vattr); - vattr.va_flags = flags; - error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); +#ifdef MAC + error = mac_check_vnode_setflags(td->td_ucred, vp, vattr.va_flags); + if (error == 0) { +#endif + VATTR_NULL(&vattr); + vattr.va_flags = flags; + error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); +#ifdef MAC + } +#endif VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return (error); @@ -1902,7 +1926,11 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); VATTR_NULL(&vattr); vattr.va_mode = mode & ALLPERMS; - error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); +#ifdef MAC + error = mac_check_vnode_setmode(td->td_ucred, vp, vattr.va_mode); + if (error == 0) +#endif + error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return error; @@ -2019,7 +2047,12 @@ VATTR_NULL(&vattr); vattr.va_uid = uid; vattr.va_gid = gid; - error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); +#ifdef MAC + error = mac_check_vnode_setowner(td->td_ucred, vp, vattr.va_uid, + vattr.va_gid); + if (error == 0) +#endif + error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return error; @@ -2178,7 +2211,12 @@ vattr.va_birthtime = ts[2]; if (nullflag) vattr.va_vaflags |= VA_UTIMES_NULL; - error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); +#ifdef MAC + error = mac_check_vnode_setutimes(td->td_ucred, vp, vattr.va_atime, + vattr.va_mtime); + if (error == 0) +#endif + error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return error; @@ -2328,6 +2366,10 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); if (vp->v_type == VDIR) error = EISDIR; +#ifdef MAC + else if ((error = mac_check_vnode_op(td->td_ucred, vp, + MAC_OP_VNODE_WRITE))) {} +#endif else if ((error = vn_writechk(vp)) == 0 && (error = VOP_ACCESS(vp, VWRITE, td->td_ucred, td)) == 0) { VATTR_NULL(&vattr); @@ -2382,6 +2424,10 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); if (vp->v_type == VDIR) error = EISDIR; +#ifdef MAC + else if ((error = mac_check_vnode_op(td->td_ucred, vp, + MAC_OP_VNODE_WRITE))) {} +#endif else if ((error = vn_writechk(vp)) == 0) { VATTR_NULL(&vattr); vattr.va_size = SCARG(uap, length); @@ -3073,6 +3119,13 @@ vput(vp); return (EINVAL); } +#ifdef MAC + error = mac_check_vnode_revoke(td->td_ucred, vp); + if (error) { + vput(vp); + return (error); + } +#endif error = VOP_GETATTR(vp, &vattr, td->td_ucred, td); if (error) { vput(vp); @@ -3257,6 +3310,11 @@ mode |= VREAD; if (fmode & O_APPEND) mode |= VAPPEND; +#ifdef MAC + error = mac_check_vnode_open(td->td_ucred, vp, mode); + if (error) + goto bad; +#endif if (mode) { error = VOP_ACCESS(vp, mode, td->td_ucred, td); if (error) @@ -3270,9 +3328,17 @@ } VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); /* XXX */ - VATTR_NULL(vap); - vap->va_size = 0; - error = VOP_SETATTR(vp, vap, td->td_ucred, td); +#ifdef MAC + error = mac_check_vnode_op(td->td_ucred, vp, + MAC_OP_VNODE_WRITE); + if (error == 0) { +#endif + VATTR_NULL(vap); + vap->va_size = 0; + error = VOP_SETATTR(vp, vap, td->td_ucred, td); +#ifdef MAC + } +#endif vn_finished_write(mp); if (error) goto bad; @@ -3584,6 +3650,13 @@ auio.uio_td = td; cnt = nbytes; +#ifdef MAC + error = mac_check_vnode_setextattr(td->td_ucred, vp, attrnamespace, + attrname, &auio); + if (error) + goto done; +#endif + error = VOP_SETEXTATTR(vp, attrnamespace, attrname, &auio, td->td_ucred, td); cnt -= auio.uio_resid; @@ -3704,6 +3777,13 @@ } else sizep = &size; +#ifdef MAC + error = mac_check_vnode_getextattr(td->td_ucred, vp, attrnamespace, + attrname, &auio); + if (error) + goto done; +#endif + error = VOP_GETEXTATTR(vp, attrnamespace, attrname, auiop, sizep, td->td_ucred, td); @@ -3800,6 +3880,11 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); +#ifdef MAC + error = mac_check_vnode_setextattr(td->td_ucred, vp, attrnamespace, + attrname, NULL); +#endif + error = VOP_SETEXTATTR(vp, attrnamespace, attrname, NULL, td->td_ucred, td); ==== //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#18 (text+ko) ==== @@ -36,9 +36,11 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.154 2002/07/31 12:19:49 des Exp $ + * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.156 2002/08/01 17:23:22 rwatson Exp $ */ +#include "opt_mac.h" + #include #include #include @@ -46,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -187,22 +190,29 @@ error = EOPNOTSUPP; goto bad; } + mode = 0; + if (fmode & (FWRITE | O_TRUNC)) { + if (vp->v_type == VDIR) { + error = EISDIR; + goto bad; + } + mode |= VWRITE; + } + if (fmode & FREAD) + mode |= VREAD; + if (fmode & O_APPEND) + mode |= VAPPEND; +#ifdef MAC + error = mac_check_vnode_open(cred, vp, mode); + if (error) + goto bad; +#endif if ((fmode & O_CREAT) == 0) { - mode = 0; - if (fmode & (FWRITE | O_TRUNC)) { - if (vp->v_type == VDIR) { - error = EISDIR; - goto bad; - } + if (mode & VWRITE) { error = vn_writechk(vp); if (error) goto bad; - mode |= VWRITE; } - if (fmode & FREAD) - mode |= VREAD; - if (fmode & O_APPEND) - mode |= VAPPEND; if (mode) { error = VOP_ACCESS(vp, mode, cred, td); if (error) @@ -383,9 +393,17 @@ auio.uio_rw = rw; auio.uio_td = td; if (rw == UIO_READ) { - error = VOP_READ(vp, &auio, ioflg, cred); +#ifdef MAC + error = mac_check_vnode_op(cred, vp, MAC_OP_VNODE_READ); + if (error == 0) +#endif + error = VOP_READ(vp, &auio, ioflg, cred); } else { - error = VOP_WRITE(vp, &auio, ioflg, cred); +#ifdef MAC + error = mac_check_vnode_op(cred, vp, MAC_OP_VNODE_WRITE); + if (error == 0) +#endif + error = VOP_WRITE(vp, &auio, ioflg, cred); } if (aresid) *aresid = auio.uio_resid; @@ -472,7 +490,11 @@ ioflag |= sequential_heuristic(uio, fp); - error = VOP_READ(vp, uio, ioflag, cred); +#ifdef MAC + error = mac_check_vnode_op(cred, vp, MAC_OP_VNODE_READ); + if (error == 0) +#endif + error = VOP_READ(vp, uio, ioflag, cred); if ((flags & FOF_OFFSET) == 0) fp->f_offset = uio->uio_offset; fp->f_nextoff = uio->uio_offset; @@ -523,7 +545,11 @@ if ((flags & FOF_OFFSET) == 0) uio->uio_offset = fp->f_offset; ioflag |= sequential_heuristic(uio, fp); - error = VOP_WRITE(vp, uio, ioflag, cred); +#ifdef MAC + error = mac_check_vnode_op(cred, vp, MAC_OP_VNODE_WRITE); + if (error == 0) +#endif + error = VOP_WRITE(vp, uio, ioflag, cred); if ((flags & FOF_OFFSET) == 0) fp->f_offset = uio->uio_offset; fp->f_nextoff = uio->uio_offset; @@ -566,6 +592,12 @@ int error; u_short mode; +#ifdef MAC + error = mac_check_vnode_stat(td->td_ucred, vp); + if (error) + return (error); +#endif + vap = &vattr; error = VOP_GETATTR(vp, vap, td->td_ucred, td); if (error) @@ -747,6 +779,19 @@ struct ucred *cred; struct thread *td; { + struct vnode *vp; +#ifdef MAC + int error; +#endif + + vp = (struct vnode *)fp->f_data; +#ifdef MAC + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + error = mac_check_vnode_op(cred, vp, MAC_OP_VNODE_POLL); + VOP_UNLOCK(vp, 0, td); + if (error) + return (error); +#endif return (VOP_POLL(((struct vnode *)fp->f_data), events, cred, td)); } ==== //depot/projects/trustedbsd/base/sys/modules/Makefile#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.247 2002/07/30 17:44:28 joe Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.248 2002/08/01 17:41:26 rwatson Exp $ .if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) _random= random @@ -48,6 +48,13 @@ libmchain \ lnc \ lpt \ + mac_biba \ + mac_bsdextended \ + mac_ifoff \ + mac_mls \ + mac_none \ + mac_seeotheruids \ + mac_test \ md \ mii \ mlx \ ==== //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#13 (text+ko) ==== @@ -4,7 +4,7 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/handbook/kernelconfig-config.html +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.210 2002/07/23 06:37:14 peter Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.211 2002/08/01 17:20:58 blackend Exp $ machine pc98 #cpu I386_CPU #Do not enable with other cpu types ==== //depot/projects/trustedbsd/base/sys/powerpc/conf/GENERIC#6 (text+ko) ==== @@ -4,7 +4,7 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/handbook/kernelconfig-config.html +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/powerpc/conf/GENERIC,v 1.10 2002/07/23 06:38:21 peter Exp $ +# $FreeBSD: src/sys/powerpc/conf/GENERIC,v 1.11 2002/08/01 17:21:13 blackend Exp $ machine powerpc cpu MPC750 ==== //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#13 (text+ko) ==== @@ -4,7 +4,7 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/handbook/kernelconfig-config.html +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.28 2002/07/27 15:28:35 mike Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.29 2002/08/01 17:21:18 blackend Exp $ machine sparc64 cpu SUN4U ==== //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/mac_policy.h,v 1.1 2002/07/30 21:32:34 rwatson Exp $ + * $FreeBSD: src/sys/sys/mac_policy.h,v 1.2 2002/08/01 17:32:01 rwatson Exp $ */ /* * Kernel interface for MAC policy modules. @@ -326,7 +326,7 @@ struct label *label, int op); }; -typedef void *macop_t; +typedef const void *macop_t; enum mac_op_constant { MAC_OP_LAST, @@ -445,7 +445,7 @@ struct mac_policy_op_entry { enum mac_op_constant mpe_constant; /* what this hook implements */ - void *mpe_function; /* hook's implementation */ + macop_t mpe_function; /* hook's implementation */ }; struct mac_policy_conf { ==== //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.2 2002/08/01 11:02:30 des Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.3 2002/08/01 16:49:31 des Exp $"); #include #include @@ -39,6 +39,8 @@ #include #include +#include + #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 11:27:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F50637B401; Thu, 1 Aug 2002 11:26:39 -0700 (PDT) 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 2323737B400 for ; Thu, 1 Aug 2002 11:26:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D3F943E88 for ; Thu, 1 Aug 2002 11:26:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g71IQcJU027674 for ; Thu, 1 Aug 2002 11:26:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g71IQbOD027669 for perforce@freebsd.org; Thu, 1 Aug 2002 11:26:37 -0700 (PDT) Date: Thu, 1 Aug 2002 11:26:37 -0700 (PDT) Message-Id: <200208011826.g71IQbOD027669@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15401 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15401 Change 15401 by rwatson@rwatson_paprika on 2002/08/01 11:25:54 Integ from the TrustedBSD base tree -- merge back in various MAC'isms that were comitted there, as well as a few fixes. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/tar/src/extract.c#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#224 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#71 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#28 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_biba/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_bsdextended/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_ifoff/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_mls/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_none/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_seeotheruids/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_test/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/conf/GENERIC#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#105 integrate .. //depot/projects/trustedbsd/mac/usr.bin/sockstat/sockstat.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac/contrib/tar/src/extract.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/extract.c,v 1.4 2002/07/03 12:44:31 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/extract.c,v 1.5 2002/08/01 17:32:08 sobomax Exp $ */ #include "system.h" #include @@ -129,6 +129,9 @@ { umask (newdir_umask); /* restore the kernel umask */ current_umask = newdir_umask; +#ifdef __FreeBSD__ + same_permissions_option++; +#endif } } @@ -184,7 +187,7 @@ mode = current_stat_info->st_mode ^ invert_permissions; } - if (chmod (file_name, mode) != 0) + if (chmod (file_name, mode & ~ current_umask) != 0) chmod_error_details (file_name, mode); } ==== //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#27 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.401 2002/07/31 20:09:07 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.402 2002/08/01 15:27:51 bmah Exp $ 2000 @@ -1959,6 +1959,11 @@ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:33.openssl.asc">FreeBSD-SA-02:33. &merged; + A heap buffer overflow in the XDR decoder has been fixed. + For more details, see security advisory FreeBSD-SA-02:34. + &merged; + ==== //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#12 (text+ko) ==== @@ -4,7 +4,7 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/handbook/kernelconfig-config.html +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.146 2002/07/23 06:36:23 peter Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.147 2002/08/01 17:21:03 blackend Exp $ machine alpha cpu EV4 ==== //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#14 (text+ko) ==== @@ -4,7 +4,7 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/handbook/kernelconfig-config.html +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.352 2002/07/23 06:35:08 peter Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.353 2002/08/01 17:21:09 blackend Exp $ machine i386 cpu I486_CPU ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#224 (text+ko) ==== @@ -36,7 +36,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_mac.c,v 1.2 2002/07/30 21:36:05 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_mac.c,v 1.3 2002/08/01 17:47:55 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -46,6 +46,7 @@ */ #include "opt_mac.h" + #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/kern_prot.c#30 (text+ko) ==== @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)kern_prot.c 8.6 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_prot.c,v 1.163 2002/07/31 00:48:24 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_prot.c,v 1.164 2002/08/01 17:47:55 rwatson Exp $ */ /* @@ -52,8 +52,8 @@ #include #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_tty.c 8.2 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/kern/tty_tty.c,v 1.40 2002/08/01 01:09:54 rwatson Exp $ + * $FreeBSD: src/sys/kern/tty_tty.c,v 1.41 2002/08/01 17:47:55 rwatson Exp $ */ /* @@ -45,8 +45,8 @@ #include #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.96 2002/07/31 01:51:34 rwatson Exp $ + * $FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.97 2002/08/01 17:47:55 rwatson Exp $ */ #include "opt_mac.h" @@ -41,8 +41,8 @@ #include #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#32 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.128 2002/08/01 03:45:40 rwatson Exp $ + * $FreeBSD: src/sys/kern/uipc_socket.c,v 1.129 2002/08/01 17:47:56 rwatson Exp $ */ #include "opt_inet.h" @@ -42,8 +42,8 @@ #include #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#23 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/kern/uipc_socket2.c,v 1.100 2002/07/31 03:03:22 rwatson Exp $ + * $FreeBSD: src/sys/kern/uipc_socket2.c,v 1.101 2002/08/01 17:47:56 rwatson Exp $ */ #include "opt_mac.h" @@ -44,8 +44,8 @@ #include /* for maxfiles */ #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#18 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.121 2002/07/31 16:39:49 rwatson Exp $ + * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.122 2002/08/01 17:47:56 rwatson Exp $ */ #include "opt_compat.h" @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#5 (text+ko) ==== @@ -61,7 +61,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/vfs_mount.c,v 1.79 2002/07/31 01:11:29 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_mount.c,v 1.80 2002/08/01 17:47:56 rwatson Exp $ */ #include @@ -69,8 +69,8 @@ #include #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#33 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.386 2002/07/31 12:25:28 des Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.387 2002/08/01 17:47:56 rwatson Exp $ */ /* @@ -54,8 +54,8 @@ #include #include #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#71 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.276 2002/08/01 03:50:08 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.278 2002/08/01 17:47:56 rwatson Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -1843,16 +1843,15 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - VATTR_NULL(&vattr); - vattr.va_flags = flags; -#if MAC +#ifdef MAC error = mac_check_vnode_setflags(td->td_ucred, vp, vattr.va_flags); - if (error != 0) - goto out; + if (error == 0) { #endif - error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); + VATTR_NULL(&vattr); + vattr.va_flags = flags; + error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); #ifdef MAC -out: + } #endif VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); @@ -1961,13 +1960,9 @@ vattr.va_mode = mode & ALLPERMS; #ifdef MAC error = mac_check_vnode_setmode(td->td_ucred, vp, vattr.va_mode); - if (error != 0) - goto out; + if (error == 0) #endif - error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); -#ifdef MAC -out: -#endif + error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return error; @@ -2084,16 +2079,12 @@ VATTR_NULL(&vattr); vattr.va_uid = uid; vattr.va_gid = gid; -#if MAC +#ifdef MAC error = mac_check_vnode_setowner(td->td_ucred, vp, vattr.va_uid, vattr.va_gid); - if (error != 0) - goto out; + if (error == 0) #endif - error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); -#ifdef MAC -out: -#endif + error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return error; @@ -2255,13 +2246,9 @@ #ifdef MAC error = mac_check_vnode_setutimes(td->td_ucred, vp, vattr.va_atime, vattr.va_mtime); - if (error != 0) - goto out; + if (error == 0) #endif - error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); -#ifdef MAC -out: -#endif + error = VOP_SETATTR(vp, &vattr, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return error; @@ -2469,6 +2456,10 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); if (vp->v_type == VDIR) error = EISDIR; +#ifdef MAC + else if ((error = mac_check_vnode_op(td->td_ucred, vp, + MAC_OP_VNODE_WRITE))) {} +#endif else if ((error = vn_writechk(vp)) == 0) { VATTR_NULL(&vattr); vattr.va_size = SCARG(uap, length); @@ -3431,14 +3422,14 @@ #ifdef MAC error = mac_check_vnode_op(td->td_ucred, vp, MAC_OP_VNODE_WRITE); - if (error) { - vn_finished_write(mp); - goto bad; + if (error == 0) { +#endif + VATTR_NULL(vap); + vap->va_size = 0; + error = VOP_SETATTR(vp, vap, td->td_ucred, td); +#ifdef MAC } #endif - VATTR_NULL(vap); - vap->va_size = 0; - error = VOP_SETATTR(vp, vap, td->td_ucred, td); vn_finished_write(mp); if (error) goto bad; @@ -3982,8 +3973,8 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_vnode_setextattr(td->td_ucred, vp, - attrnamespace, attrname, NULL); + error = mac_check_vnode_setextattr(td->td_ucred, vp, attrnamespace, + attrname, NULL); #endif error = VOP_SETEXTATTR(vp, attrnamespace, attrname, NULL, td->td_ucred, ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#36 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.154 2002/07/31 12:19:49 des Exp $ + * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.156 2002/08/01 17:23:22 rwatson Exp $ */ #include "opt_mac.h" @@ -197,7 +197,7 @@ goto bad; } mode = 0; - if (fmode & (VWRITE | O_TRUNC)) { + if (fmode & (FWRITE | O_TRUNC)) { if (vp->v_type == VDIR) { error = EISDIR; goto bad; ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.247 2002/07/30 17:44:28 joe Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.248 2002/08/01 17:41:26 rwatson Exp $ .if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) _random= random ==== //depot/projects/trustedbsd/mac/sys/modules/mac_biba/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/modules/mac_bsdextended/Makefile#3 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/modules/mac_ifoff/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/modules/mac_mls/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/modules/mac_none/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/modules/mac_seeotheruids/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/modules/mac_test/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC#13 (text+ko) ==== @@ -4,7 +4,7 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/handbook/kernelconfig-config.html +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.210 2002/07/23 06:37:14 peter Exp $ +# $FreeBSD: src/sys/pc98/conf/GENERIC,v 1.211 2002/08/01 17:20:58 blackend Exp $ machine pc98 #cpu I386_CPU #Do not enable with other cpu types ==== //depot/projects/trustedbsd/mac/sys/powerpc/conf/GENERIC#6 (text+ko) ==== @@ -4,7 +4,7 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/handbook/kernelconfig-config.html +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/powerpc/conf/GENERIC,v 1.10 2002/07/23 06:38:21 peter Exp $ +# $FreeBSD: src/sys/powerpc/conf/GENERIC,v 1.11 2002/08/01 17:21:13 blackend Exp $ machine powerpc cpu MPC750 ==== //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#12 (text+ko) ==== @@ -4,7 +4,7 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/handbook/kernelconfig-config.html +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.28 2002/07/27 15:28:35 mike Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.29 2002/08/01 17:21:18 blackend Exp $ machine sparc64 cpu SUN4U ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#105 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/sys/sys/mac_policy.h,v 1.2 2002/08/01 17:32:01 rwatson Exp $ */ /* * Kernel interface for MAC policy modules. ==== //depot/projects/trustedbsd/mac/usr.bin/sockstat/sockstat.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.2 2002/08/01 11:02:30 des Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.3 2002/08/01 16:49:31 des Exp $"); #include #include @@ -39,6 +39,8 @@ #include #include +#include + #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 11:27:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B76B37B406; Thu, 1 Aug 2002 11:27:41 -0700 (PDT) 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 A02B437B405 for ; Thu, 1 Aug 2002 11:27:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4974143E84 for ; Thu, 1 Aug 2002 11:27:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g71IReJU027861 for ; Thu, 1 Aug 2002 11:27:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g71IRd7a027858 for perforce@freebsd.org; Thu, 1 Aug 2002 11:27:39 -0700 (PDT) Date: Thu, 1 Aug 2002 11:27:39 -0700 (PDT) Message-Id: <200208011827.g71IRd7a027858@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15402 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15402 Change 15402 by rwatson@rwatson_paprika on 2002/08/01 11:27:22 kern_malloc.c doesn't need mac.h Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#13 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 14:23:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CA1A37B401; Thu, 1 Aug 2002 14:23:34 -0700 (PDT) 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 014D337B400 for ; Thu, 1 Aug 2002 14:23:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 704B343E75 for ; Thu, 1 Aug 2002 14:23:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g71LNXJU058989 for ; Thu, 1 Aug 2002 14:23:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g71LNXx6058986 for perforce@freebsd.org; Thu, 1 Aug 2002 14:23:33 -0700 (PDT) Date: Thu, 1 Aug 2002 14:23:33 -0700 (PDT) Message-Id: <200208012123.g71LNXx6058986@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15416 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15416 Change 15416 by rwatson@rwatson_paprika on 2002/08/01 14:23:03 Remove dup from integ. Note that the old MAC hook was actually in the wrong place, as it was before the check for mbuf allocation failure. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.c#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_icmp.c#14 (text+ko) ==== @@ -159,9 +159,6 @@ * First, formulate icmp message */ m = m_gethdr(M_DONTWAIT, MT_HEADER); -#ifdef MAC - mac_create_mbuf_netlayer(n, m); -#endif if (m == NULL) goto freeit; #ifdef MAC To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 15:31: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AF9437B401; Thu, 1 Aug 2002 15:30:58 -0700 (PDT) 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 A320B37B400 for ; Thu, 1 Aug 2002 15:30:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 615B743E42 for ; Thu, 1 Aug 2002 15:30:57 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g71MUvJU069689 for ; Thu, 1 Aug 2002 15:30:57 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g71MUvqG069686 for perforce@freebsd.org; Thu, 1 Aug 2002 15:30:57 -0700 (PDT) Date: Thu, 1 Aug 2002 15:30:57 -0700 (PDT) Message-Id: <200208012230.g71MUvqG069686@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15422 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15422 Change 15422 by rwatson@rwatson_paprika on 2002/08/01 15:30:38 Remove an old MACism no longer required due to our restoring the way vnodeop arrays work. Missed because nwfs isn't highly connected to the build. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_node.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_node.c#5 (text+ko) ==== @@ -170,7 +170,7 @@ * elsewhere if MALLOC should block. */ MALLOC(np, struct nwnode *, sizeof *np, M_NWNODE, M_WAITOK | M_ZERO); - error = getnewvnode(VT_NWFS, mp, &nwfs_vnodeop_p, &vp); + error = getnewvnode(VT_NWFS, mp, nwfs_vnodeop_p, &vp); if (error) { *vpp = NULL; FREE(np, M_NWNODE); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 15:32: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEAA837B401; Thu, 1 Aug 2002 15:31:59 -0700 (PDT) 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 723BE37B400 for ; Thu, 1 Aug 2002 15:31:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 292FA43E72 for ; Thu, 1 Aug 2002 15:31:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g71MVxJU069831 for ; Thu, 1 Aug 2002 15:31:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g71MVwCK069826 for perforce@freebsd.org; Thu, 1 Aug 2002 15:31:58 -0700 (PDT) Date: Thu, 1 Aug 2002 15:31:58 -0700 (PDT) Message-Id: <200208012231.g71MVwCK069826@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15423 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15423 Change 15423 by rwatson@rwatson_paprika on 2002/08/01 15:31:37 Remove a license blurb that didn't need to be in this file. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#8 (text+ko) ==== @@ -2,9 +2,6 @@ * Copyright (c) 2002 Network Associates Technology, Inc. * All rights reserved. * - * This software was developed by Robert Watson for the TrustedBSD - * Project. - * * This software was developed in part by NAI Labs, the Security Research * Division of Network Associates, Inc. under DARPA/SPAWAR contract * N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research program. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 18: 5:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1002737B406; Thu, 1 Aug 2002 18:05:06 -0700 (PDT) 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 3364637B401 for ; Thu, 1 Aug 2002 18:05:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C4AC543E4A for ; Thu, 1 Aug 2002 18:05:04 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g72154JU089868 for ; Thu, 1 Aug 2002 18:05:04 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g72154i9089777 for perforce@freebsd.org; Thu, 1 Aug 2002 18:05:04 -0700 (PDT) Date: Thu, 1 Aug 2002 18:05:04 -0700 (PDT) Message-Id: <200208020105.g72154i9089777@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 15425 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15425 Change 15425 by cvance@cvance_laptop on 2002/08/01 18:04:47 Add support for a basic mac_policy syscall handler. Things to think about: - who guarantees MPSAFE, trustedbsd harness or the modules? - the module must perform the copyin on the arg parameter. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#225 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#21 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#141 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#106 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#225 (text+ko) ==== @@ -363,6 +363,9 @@ * that all enumerated values are handled. */ break; + case MAC_SYSCALL: + mpc->mpc_ops->mpo_mac_policy = + mpe->mpe_function; case MAC_DESTROY: mpc->mpc_ops->mpo_destroy = mpe->mpe_function; @@ -3060,6 +3063,40 @@ return (error); } +/* + * MPSAFE + */ +int +mac_policy(struct thread *td, struct mac_policy_args *uap) +{ + int error; + char target[128]; /* TBD: should be MAX_MAXNAME or some such */ + struct mac_policy_conf *mpc; + + error = copyinstr(uap->policy, target, sizeof(target), NULL); + if (error == ENAMETOOLONG) { + return (EINVAL); + } + if (error) { + return (error); + } + + error = ENOSYS; + MAC_POLICY_LIST_BUSY(); + LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { + if (strcmp(mpc->mpc_name, target) == 0 && + mpc->mpc_ops->mpo_mac_policy) { + error = mpc->mpc_ops->mpo_mac_policy(SCARG(uap, call), + SCARG(uap, arg)); + goto out; + } + } + + out: + MAC_POLICY_LIST_UNBUSY(); + return (error); +} + SYSINIT(mac, SI_SUB_MAC, SI_ORDER_FIRST, mac_init, NULL); SYSINIT(mac_late, SI_SUB_MAC_LATE, SI_ORDER_FIRST, mac_late_init, NULL); @@ -3107,4 +3144,11 @@ return (ENOSYS); } +int +mac_policy(struct thread *td, struct mac_policy *uap) +{ + + return (ENOSYS); +} + #endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#21 (text+ko) ==== @@ -567,5 +567,5 @@ 392 STD BSD { int uuidgen(struct uuid *store, int count); } 393 MSTD BSD { int sendfile(int fd, int s, off_t offset, size_t nbytes, \ struct sf_hdtr *hdtr, off_t *sbytes, int flags); } -394 MNOIMPL BSD { int mac_policy(const char *policy, int call, \ +394 MSTD BSD { int mac_policy(const char *policy, int call, \ void *arg); } ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#141 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#106 (text+ko) ==== @@ -63,6 +63,11 @@ void (*mpo_init)(struct mac_policy_conf *mpc); /* + * Generic policy-directed security syscall + */ + int (*mpo_mac_policy)(int call, void *arg); + + /* * Label operations. */ void (*mpo_init_bpfdesc)(struct bpf_d *, struct label *label); @@ -330,6 +335,7 @@ enum mac_op_constant { MAC_OP_LAST, + MAC_SYSCALL, MAC_DESTROY, MAC_INIT, MAC_INIT_BPFDESC, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 19:18:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E628737B401; Thu, 1 Aug 2002 19:18:09 -0700 (PDT) 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 3DE1B37B400; Thu, 1 Aug 2002 19:18:09 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A36B43E3B; Thu, 1 Aug 2002 19:18:08 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g722HsOo093392; Thu, 1 Aug 2002 22:17:54 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Thu, 1 Aug 2002 22:17:54 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Chris Vance Cc: Perforce Change Reviews Subject: Re: PERFORCE change 15425 for review In-Reply-To: <200208020105.g72154i9089777@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, 1 Aug 2002, Chris Vance wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15425 > > Change 15425 by cvance@cvance_laptop on 2002/08/01 18:04:47 > > Add support for a basic mac_policy syscall handler. > Things to think about: > - who guarantees MPSAFE, trustedbsd harness or the modules? Right now, modules are assumed to be MPSAFE, although they can grab Giant if they need it. > - the module must perform the copyin on the arg parameter. Probably unavoidable > + case MAC_SYSCALL: > + mpc->mpc_ops->mpo_mac_policy = > + mpe->mpe_function; Looks like you're missing a "break;" here. Should we rename mac_policy() to mac_syscall()? > case MAC_DESTROY: > mpc->mpc_ops->mpo_destroy = > mpe->mpe_function; > @@ -3060,6 +3063,40 @@ > return (error); > } > > +/* > + * MPSAFE > + */ > +int > +mac_policy(struct thread *td, struct mac_policy_args *uap) > +{ > + int error; > + char target[128]; /* TBD: should be MAX_MAXNAME or some such */ We probably should define a MAC_POLICY_MAXNAME or something and use that, as well as bound the policy name provided by the policy to that length during registration. > + error = copyinstr(uap->policy, target, sizeof(target), NULL); > + if (error == ENAMETOOLONG) { > + return (EINVAL); > + } I would imagine it's OK to return the error verbatim..? > + LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { > + if (strcmp(mpc->mpc_name, target) == 0 && > + mpc->mpc_ops->mpo_mac_policy) { > + error = mpc->mpc_ops->mpo_mac_policy(SCARG(uap, call), > + SCARG(uap, arg)); > + goto out; Looks good, thanks! Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 19:53:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DE4937B401; Thu, 1 Aug 2002 19:52:17 -0700 (PDT) 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 0112B37B400 for ; Thu, 1 Aug 2002 19:52:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E5E943E4A for ; Thu, 1 Aug 2002 19:52:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g722qFJU006353 for ; Thu, 1 Aug 2002 19:52:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g722qFWP006350 for perforce@freebsd.org; Thu, 1 Aug 2002 19:52:15 -0700 (PDT) Date: Thu, 1 Aug 2002 19:52:15 -0700 (PDT) Message-Id: <200208020252.g722qFWP006350@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15427 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15427 Change 15427 by rwatson@rwatson_paprika on 2002/08/01 19:51:41 Integ from main tree: pick up various MACisms. Affected files ... .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/setlocale.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_getcwd.c#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#27 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_idle.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#19 integrate .. //depot/projects/trustedbsd/base/sys/modules/linux/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/net/if.c#12 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.c#9 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ppp.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#11 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/pmap.h#10 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#14 integrate Differences ... ==== //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.55 2002/05/29 00:46:33 peter Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.56 2002/08/01 22:37:08 rwatson Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -126,6 +126,12 @@ security lomac .. + mac_biba + .. + mac_bsdextended + .. + mac_mls + .. .. sys .. ==== //depot/projects/trustedbsd/base/lib/libc/locale/setlocale.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)setlocale.c 8.1 (Berkeley) 7/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.34 2002/03/22 21:52:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.35 2002/08/02 01:04:49 ache Exp $"); #include #include @@ -129,33 +129,29 @@ if (!env || !*env || strchr(env, '/')) env = "C"; - (void) strncpy(new_categories[category], env, ENCODING_LEN); - new_categories[category][ENCODING_LEN] = '\0'; + (void)strlcpy(new_categories[category], env, ENCODING_LEN + 1); if (category == LC_ALL) { for (i = 1; i < _LC_LAST; ++i) { if (!(env = getenv(categories[i])) || !*env) env = new_categories[LC_ALL]; - (void)strncpy(new_categories[i], env, ENCODING_LEN); - new_categories[i][ENCODING_LEN] = '\0'; + (void)strlcpy(new_categories[i], env, ENCODING_LEN + 1); } } - } else if (category != LC_ALL) { - (void)strncpy(new_categories[category], locale, ENCODING_LEN); - new_categories[category][ENCODING_LEN] = '\0'; - } else { + } else if (category != LC_ALL) + (void)strlcpy(new_categories[category], locale, ENCODING_LEN + 1); + else { if ((r = strchr(locale, '/')) == NULL) { - for (i = 1; i < _LC_LAST; ++i) { - (void)strncpy(new_categories[i], locale, ENCODING_LEN); - new_categories[i][ENCODING_LEN] = '\0'; - } + for (i = 1; i < _LC_LAST; ++i) + (void)strlcpy(new_categories[i], locale, ENCODING_LEN + 1); } else { for (i = 1; r[1] == '/'; ++r); if (!r[1]) return (NULL); /* Hmm, just slashes... */ do { + if (i == _LC_LAST) + return(NULL); /* Too many slashes... */ len = r - locale > ENCODING_LEN ? ENCODING_LEN : r - locale; - (void)strncpy(new_categories[i], locale, len); - new_categories[i][len] = '\0'; + (void)strlcpy(new_categories[i], locale, len + 1); i++; locale = r; while (*locale == '/') ==== //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#9 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.61 2002/07/16 18:16:01 mp Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.62 2002/08/01 22:03:19 rwatson Exp $ ############################################################## ### Basic configuration options ############################ @@ -278,6 +278,18 @@ # Override DSDT in BIOS by this file ############################################################## +### TrustedBSD MAC settings ################################## +############################################################## + +mac_biba_load="NO" # Biba MAC policy +mac_bsdextended_load="NO" # BSD/extended MAC policy +mac_ifoff="NO" # Interface silencing policy +mac_mls_load="NO" # MLS MAC policy +mac_none_load="NO" # Null MAC policy +mac_partition_load="NO" # Partition MAC policy +mac_seeotheruids_load="NO" # UID visbility MAC policy + +############################################################## ### Module loading syntax example ########################## ############################################################## ==== //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#6 (text+ko) ==== @@ -25,10 +25,11 @@ * (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/compat/linux/linux_file.c,v 1.66 2002/07/09 19:25:43 robert Exp $ + * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.67 2002/08/01 22:23:02 rwatson Exp $ */ #include "opt_compat.h" +#include "opt_mac.h" #include #include @@ -38,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -325,6 +327,13 @@ cookies = NULL; } +#ifdef MAC + /* + * Do directory search MAC check using non-cached credentials. + */ + if ((error = mac_check_vnode_readdir(td->td_proc->p_ucred, vp)) + goto out; +#endif /* MAC */ if ((error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, &ncookies, &cookies))) goto out; ==== //depot/projects/trustedbsd/base/sys/compat/linux/linux_getcwd.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.5 2002/03/20 05:42:02 alfred Exp $ */ +/* $FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.6 2002/08/01 22:23:02 rwatson Exp $ */ /* $OpenBSD: linux_getcwd.c,v 1.2 2001/05/16 12:50:21 ho Exp $ */ /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */ @@ -38,6 +38,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include "opt_compat.h" +#include "opt_mac.h" #include #include @@ -51,6 +52,7 @@ #include #include #include +#include #include #include #include /* XXX only for DIRBLKSIZ */ @@ -200,7 +202,12 @@ eofflag = 0; - error = VOP_READDIR(uvp, &uio, td->td_ucred, &eofflag, 0, 0); +#ifdef MAC + error = mac_check_vnode_readdir(td->td_ucred, uvp); + if (error == 0) +#endif /* MAC */ + error = VOP_READDIR(uvp, &uio, td->td_ucred, &eofflag, + 0, 0); off = uio.uio_offset; ==== //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#11 (text+ko) ==== @@ -25,10 +25,11 @@ * (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/compat/linux/linux_misc.c,v 1.123 2002/06/14 07:24:01 rwatson Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.124 2002/08/01 22:23:02 rwatson Exp $ */ #include "opt_compat.h" +#include "opt_mac.h" #include #include @@ -37,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -250,7 +252,7 @@ vp = NULL; /* - * XXX This code should make use of vn_open(), rather than doing + * XXX: This code should make use of vn_open(), rather than doing * all this stuff itself. */ NDINIT(&ni, LOOKUP, FOLLOW|LOCKLEAF, UIO_USERSPACE, args->library, td); @@ -306,6 +308,11 @@ * XXX: This should use vn_open() so that it is properly authorized, * and to reduce code redundancy all over the place here. */ +#ifdef MAC + error = mac_check_vnode_open(td->td_ucred, vp, FREAD); + if (error) + goto cleanup; +#endif error = VOP_OPEN(vp, FREAD, td->td_ucred, td); if (error) goto cleanup; ==== //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#4 (text+ko) ==== @@ -25,15 +25,18 @@ * (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/compat/linux/linux_stats.c,v 1.41 2002/06/02 20:05:42 schweikh Exp $ + * $FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.42 2002/08/01 22:23:02 rwatson Exp $ */ +#include "opt_mac.h" + #include #include #include #include #include #include +#include #include #include #include @@ -247,6 +250,11 @@ mp = ndp->ni_vp->v_mount; bsd_statfs = &mp->mnt_stat; vrele(ndp->ni_vp); +#ifdef MAC + error = mac_check_mount_stat(td->td_proc->p_ucred, mp); + if (error) + return (error); +#endif error = VFS_STATFS(mp, bsd_statfs, td); if (error) return error; @@ -282,6 +290,13 @@ if (error) return error; mp = ((struct vnode *)fp->f_data)->v_mount; +#ifdef MAC + error = mac_check_mount_stat(td->td_proc->p_ucred, mp); + if (error) { + fdrop(fp, td); + return (error); + } +#endif bsd_statfs = &mp->mnt_stat; error = VFS_STATFS(mp, bsd_statfs, td); if (error) { @@ -344,6 +359,11 @@ if (vfinddev(dev, VCHR, &vp)) { if (vp->v_mount == NULL) return (EINVAL); +#ifdef MAC + error = mac_check_mount_stat(td->td_proc->p_ucred, mp); + if (error) + return (error); +#endif stat = &(vp->v_mount->mnt_stat); error = VFS_STATFS(vp->v_mount, stat, td); if (error) ==== //depot/projects/trustedbsd/base/sys/conf/files#27 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.679 2002/08/01 02:03:21 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.680 2002/08/01 22:26:38 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1349,6 +1349,7 @@ posix4/ksched.c optional _kposix_priority_scheduling posix4/p1003_1b.c standard posix4/posix4_mib.c standard +security/mac_none/mac_none.c optional mac_none ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_balloc.c optional ffs ufs/ffs/ffs_inode.c optional ffs ==== //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.42 2002/07/31 15:45:16 rwatson Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.43 2002/08/01 22:27:57 rwatson Exp $ */ /* @@ -918,6 +918,7 @@ { &vop_getattr_desc, (vop_t *) devfs_getattr }, { &vop_islocked_desc, (vop_t *) vop_stdislocked }, { &vop_lock_desc, (vop_t *) vop_stdlock }, + { &vop_pathconf_desc, (vop_t *) devfs_pathconf }, { &vop_print_desc, (vop_t *) devfs_print }, { &vop_reclaim_desc, (vop_t *) devfs_reclaim }, #ifdef MAC ==== //depot/projects/trustedbsd/base/sys/kern/kern_idle.c#6 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 2000, All rights reserved. See /usr/src/COPYRIGHT * - * $FreeBSD: src/sys/kern/kern_idle.c,v 1.25 2002/07/17 19:18:45 julian Exp $ + * $FreeBSD: src/sys/kern/kern_idle.c,v 1.26 2002/08/01 18:45:10 julian Exp $ */ #include "opt_ktrace.h" @@ -63,7 +63,7 @@ p->p_flag |= P_NOLOAD; p->p_state = PRS_NORMAL; td = FIRST_THREAD_IN_PROC(p); - td->td_state = TDS_UNQUEUED; + td->td_state = TDS_UNQUEUED; td->td_kse->ke_flags |= KEF_IDLEKSE; #ifdef SMP } @@ -112,6 +112,7 @@ mtx_lock_spin(&sched_lock); p->p_stats->p_ru.ru_nvcsw++; + td->td_state = TDS_UNQUEUED; mi_switch(); mtx_unlock_spin(&sched_lock); } ==== //depot/projects/trustedbsd/base/sys/kern/kern_intr.c#12 (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/sys/kern/kern_intr.c,v 1.76 2002/06/29 17:26:18 julian Exp $ + * $FreeBSD: src/sys/kern/kern_intr.c,v 1.77 2002/08/01 18:45:10 julian Exp $ * */ @@ -351,6 +351,7 @@ { struct int_entropy entropy; struct thread *td; + struct thread *ctd; struct proc *p; /* @@ -359,13 +360,14 @@ if ((ithread == NULL) || TAILQ_EMPTY(&ithread->it_handlers)) return (EINVAL); + ctd = curthread; /* * If any of the handlers for this ithread claim to be good * sources of entropy, then gather some. */ if (harvest.interrupt && ithread->it_flags & IT_ENTROPY) { entropy.vector = ithread->it_vector; - entropy.proc = curthread->td_proc;; + entropy.proc = ctd->td_proc;; random_harvest(&entropy, sizeof(entropy), 2, 0, RANDOM_INTERRUPT); } @@ -390,13 +392,12 @@ CTR2(KTR_INTR, "%s: setrunqueue %d", __func__, p->p_pid); setrunqueue(td); if (do_switch && - (curthread->td_critnest == 1)/* && - (curthread->td_state == TDS_RUNNING) XXXKSE*/) { -#if 0 /* not needed in KSE */ - if (curthread != PCPU_GET(idlethread)) - setrunqueue(curthread); -#endif - curthread->td_proc->p_stats->p_ru.ru_nivcsw++; + (ctd->td_critnest == 1) ) { + KASSERT((ctd->td_state == TDS_RUNNING), + ("ithread_schedule: Bad state for curthread.")); + ctd->td_proc->p_stats->p_ru.ru_nivcsw++; + if (ctd->td_kse->ke_flags & KEF_IDLEKSE) + ctd->td_state = TDS_UNQUEUED; mi_switch(); } else { curthread->td_kse->ke_flags |= KEF_NEEDRESCHED; ==== //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#17 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.177 2002/07/30 21:13:48 julian Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.178 2002/08/01 18:45:10 julian Exp $ */ #include "opt_compat.h" @@ -1364,7 +1364,7 @@ * The signal is not ignored or caught. */ mtx_lock_spin(&sched_lock); - thread_unsuspend(p); /* Checks if should do it. */ + thread_unsuspend(p); mtx_unlock_spin(&sched_lock); goto out; } @@ -1373,7 +1373,9 @@ /* * Already stopped, don't need to stop again * (If we did the shell could get confused). + * Just make sure the signal STOP bit set. */ + p->p_flag |= P_STOPPED_SGNL; SIGDELSET(p->p_siglist, sig); goto out; } @@ -1383,10 +1385,8 @@ * If a thread is sleeping interruptibly, simulate a * wakeup so that when it is continued it will be made * runnable and can look at the signal. However, don't make - * the process runnable, leave it stopped. + * the PROCESS runnable, leave it stopped. * It may run a bit until it hits a thread_suspend_check(). - * - * XXXKSE I don't understand this at all. */ mtx_lock_spin(&sched_lock); FOREACH_THREAD_IN_PROC(p, td) { @@ -1403,6 +1403,8 @@ /* * XXXKSE What about threads that are waiting on mutexes? * Shouldn't they abort too? + * No, hopefully mutexes are short lived.. They'll + * eventually hit thread_suspend_check(). */ } else if (p->p_state == PRS_NORMAL) { if (prop & SA_CONT) { @@ -1419,6 +1421,7 @@ * cause the process to run. */ if (prop & SA_STOP) { + int should_signal = 1; if (action != SIG_DFL) goto runfast; @@ -1430,8 +1433,22 @@ goto out; SIGDELSET(p->p_siglist, sig); p->p_xstat = sig; - PROC_LOCK(p->p_pptr); - if (!(p->p_pptr->p_procsig->ps_flag & PS_NOCLDSTOP)) + PROC_LOCK(p->p_pptr); /* XXX un-needed? */ +#if 0 + FOREACH_THREAD_IN_PROC(p, td) { + if (td->td_state == TDS_RUNNING) { + /* + * all other states must be in + * the kernel + */ + should_signal = 0; + break; + } + } +/* don't enable until the equivalent code is in thread_suspend_check() */ +#endif + if (!(p->p_pptr->p_procsig->ps_flag & PS_NOCLDSTOP) && + should_signal) psignal(p->p_pptr, SIGCHLD); PROC_UNLOCK(p->p_pptr); stop(p); ==== //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.192 2002/07/30 10:12:11 tanimura Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.193 2002/08/01 18:45:10 julian Exp $ */ #include "opt_ddb.h" @@ -807,6 +807,7 @@ mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED); KASSERT((ke->ke_state == KES_THREAD), ("mi_switch: kse state?")); + KASSERT((td->td_state != TDS_RUNQ), ("mi_switch: called by old code")); #ifdef INVARIANTS if (td->td_state != TDS_MTX && td->td_state != TDS_RUNQ && @@ -866,7 +867,7 @@ #endif /* - * Pick a new current process and record its start time. + * Finish up stats for outgoing thread. */ cnt.v_swtch++; PCPU_SET(switchtime, new_switchtime); @@ -877,23 +878,33 @@ ke->ke_oncpu = NOCPU; ke->ke_flags &= ~KEF_NEEDRESCHED; /* - * At the last moment: if this KSE is not on the run queue, - * it needs to be freed correctly and the thread treated accordingly. + * At the last moment, if this thread is still marked RUNNING, + * then put it back on the run queue as it has not been suspended + * or stopped or any thing else similar. */ - if ((td->td_state == TDS_RUNNING) && - ((ke->ke_flags & KEF_IDLEKSE) == 0)) { + if (td->td_state == TDS_RUNNING) { + KASSERT(((ke->ke_flags & KEF_IDLEKSE) == 0), + ("Idle thread in mi_switch with wrong state")); /* Put us back on the run queue (kse and all). */ setrunqueue(td); - } else if ((td->td_flags & TDF_UNBOUND) && - (td->td_state != TDS_RUNQ)) { /* in case of old code */ + } else if (td->td_flags & TDF_UNBOUND) { /* - * We will not be on the run queue. - * Someone else can use the KSE if they need it. + * We will not be on the run queue. So we must be + * sleeping or similar. If it's available, + * someone else can use the KSE if they need it. + * XXXKSE KSE loaning will change this. */ td->td_kse = NULL; kse_reassign(ke); } - cpu_switch(); + + cpu_switch(); /* SHAZAM!!*/ + + /* + * Start setting up stats etc. for the incoming thread. + * Similar code in fork_exit() is returned to by cpu_switch() + * in the case of a new thread/process. + */ td->td_kse->ke_oncpu = PCPU_GET(cpuid); sched_lock.mtx_recurse = sched_nest; sched_lock.mtx_lock = (uintptr_t)td; ==== //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/kern/kern_thread.c,v 1.13 2002/07/25 03:21:35 julian Exp $ + * $FreeBSD: src/sys/kern/kern_thread.c,v 1.14 2002/08/01 19:10:40 julian Exp $ */ #include @@ -213,7 +213,7 @@ } /* - * reap any zombie threads for this Processor. + * reap any zombie threads. */ void thread_reap(void) ==== //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#14 (text+ko) ==== @@ -11,7 +11,7 @@ * 2. Absolutely no warranty of function or purpose is made by the author * John S. Dyson. * - * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.324 2002/07/30 20:41:10 alc Exp $ + * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.325 2002/08/01 17:57:42 alc Exp $ */ /* @@ -2944,7 +2944,7 @@ !(bp->b_ioflags & BIO_ERROR)) { bp->b_flags |= B_CACHE; } - + vm_page_lock_queues(); for (i = 0; i < bp->b_npages; i++) { int bogusflag = 0; int resid; @@ -3012,6 +3012,7 @@ foff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK; iosize -= resid; } + vm_page_unlock_queues(); if (obj) vm_object_pip_wakeupn(obj, 0); } @@ -3050,7 +3051,7 @@ vm_object_t obj; obj = bp->b_object; - + vm_page_lock_queues(); for (i = 0; i < bp->b_npages; i++) { vm_page_t m = bp->b_pages[i]; @@ -3066,6 +3067,7 @@ vm_page_flag_clear(m, PG_ZERO); vm_page_io_finish(m); } + vm_page_unlock_queues(); vm_object_pip_wakeupn(obj, 0); } } ==== //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#24 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.278 2002/08/01 17:47:56 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.279 2002/08/01 20:44:52 rwatson Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -2865,6 +2865,14 @@ auio.uio_resid = SCARG(uap, count); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); loff = auio.uio_offset = fp->f_offset; +#ifdef MAC + error = mac_check_vnode_readdir(td->td_ucred, vp); + if (error) { + VOP_UNLOCK(vp, 0, td); + fdrop(fp, td); + return (error); + } +#endif # if (BYTE_ORDER != LITTLE_ENDIAN) if (vp->v_mount->mnt_maxsymlinklen <= 0) { error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, @@ -3000,7 +3008,12 @@ /* vn_lock(vp, LK_SHARED | LK_RETRY, td); */ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); loff = auio.uio_offset = fp->f_offset; - error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, NULL, NULL); +#ifdef MAC + error = mac_check_vnode_readdir(td->td_ucred, vp); + if (error == 0) +#endif + error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, NULL, + NULL); fp->f_offset = auio.uio_offset; VOP_UNLOCK(vp, 0, td); if (error) { ==== //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#19 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.156 2002/08/01 17:23:22 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.157 2002/08/01 18:29:30 rwatson Exp $ */ #include "opt_mac.h" @@ -793,7 +793,7 @@ return (error); #endif - return (VOP_POLL(((struct vnode *)fp->f_data), events, cred, td)); + return (VOP_POLL(vp, events, cred, td)); } /* ==== //depot/projects/trustedbsd/base/sys/modules/linux/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/linux/Makefile,v 1.57 2002/05/19 01:27:14 marcel Exp $ +# $FreeBSD: src/sys/modules/linux/Makefile,v 1.58 2002/08/01 22:23:02 rwatson Exp $ MAINTAINER= emulation@FreeBSD.org @@ -8,7 +8,8 @@ SRCS= linux_dummy.c linux_file.c linux_getcwd.c linux_ioctl.c linux_ipc.c \ linux_machdep.c linux_mib.c linux_misc.c linux_signal.c linux_socket.c \ linux_stats.c linux_sysctl.c linux_sysent.c linux_sysvec.c \ - linux_util.c opt_compat.h opt_linux.h opt_vmpage.h vnode_if.h + linux_util.c opt_compat.h opt_linux.h opt_mac.h opt_vmpage.h \ + vnode_if.h OBJS= linux_locore.o .if ${MACHINE_ARCH} == "i386" ==== //depot/projects/trustedbsd/base/sys/net/if.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.143 2002/07/31 16:16:03 rwatson Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.144 2002/08/01 21:15:53 rwatson Exp $ */ #include "opt_compat.h" @@ -1250,6 +1250,12 @@ ifr->ifr_curcap = ifp->if_capenable; break; +#ifdef MAC + case SIOCGIFMAC: + error = mac_ioctl_ifnet_get(td->td_proc->p_ucred, ifr, ifp); + break; +#endif + case SIOCGIFMETRIC: ifr->ifr_metric = ifp->if_metric; break; @@ -1296,6 +1302,12 @@ (void) (*ifp->if_ioctl)(ifp, cmd, data); break; +#ifdef MAC + case SIOCSIFMAC: + error = mac_ioctl_ifnet_set(td->td_proc->p_ucred, ifr, ifp); + break; +#endif + case SIOCSIFMETRIC: error = suser(td); if (error) ==== //depot/projects/trustedbsd/base/sys/net/if_gif.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_gif.c,v 1.24 2002/05/25 20:17:04 brooks Exp $ */ +/* $FreeBSD: src/sys/net/if_gif.c,v 1.25 2002/08/01 21:00:05 rwatson Exp $ */ /* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ /* @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -340,6 +341,12 @@ int error = 0; static int called = 0; /* XXX: MUTEX */ +#ifdef MAC + error = mac_check_ifnet_transmit(ifp, m); + if (error) + senderr(error); +#endif + /* * gif may cause infinite recursion calls when misconfigured. * We'll prevent this by introducing upper limit. @@ -429,7 +436,11 @@ } m->m_pkthdr.rcvif = gifp; - + +#ifdef MAC + mac_create_mbuf_from_ifnet(gifp, m); +#endif + if (gifp->if_bpf) { /* * We need to prepend the address family as ==== //depot/projects/trustedbsd/base/sys/net/if_ppp.c#7 (text+ko) ==== @@ -69,7 +69,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $FreeBSD: src/sys/net/if_ppp.c,v 1.79 2002/04/04 21:03:28 jhb Exp $ */ +/* $FreeBSD: src/sys/net/if_ppp.c,v 1.80 2002/08/01 21:13:47 rwatson Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ @@ -77,6 +77,7 @@ #include "opt_inet.h" #include "opt_ipx.h" +#include "opt_mac.h" #include "opt_ppp.h" #ifdef INET @@ -93,6 +94,7 @@ #include #include #include +#include #include #include @@ -714,6 +716,12 @@ int len; struct mbuf *m; +#ifdef MAC + error = mac_check_ifnet_transmit(ifp, m0); + if (error) + goto bad; +#endif + if (sc->sc_devp == NULL || (ifp->if_flags & IFF_RUNNING) == 0 || ((ifp->if_flags & IFF_UP) == 0 && dst->sa_family != AF_UNSPEC)) { error = ENETDOWN; /* sort of */ @@ -1104,6 +1112,9 @@ splx(s); if (m == NULL) break; +#ifdef MAC + mac_create_mbuf_from_ifnet(&sc->sc_if, m); +#endif ppp_inproc(sc, m); } } @@ -1383,6 +1394,9 @@ goto bad; /* lose if big headers and no clusters */ } } +#ifdef MAC + mac_create_mbuf_from_mbuf(m, mp); +#endif cp = mtod(mp, u_char *); cp[0] = adrs; cp[1] = ctrl; @@ -1435,6 +1449,9 @@ if (ilen <= MHLEN && M_IS_CLUSTER(m)) { MGETHDR(mp, M_DONTWAIT, MT_DATA); if (mp != NULL) { +#ifdef MAC + mac_create_mbuf_from_mbuf(m, mp); +#endif m_copydata(m, 0, ilen, mtod(mp, caddr_t)); m_freem(m); m = mp; ==== //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#11 (text+ko) ==== @@ -31,11 +31,12 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.118 2002/07/28 19:59:31 truckman Exp $ + * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.119 2002/08/01 21:37:34 rwatson Exp $ */ #include "opt_ipsec.h" #include "opt_inet6.h" +#include "opt_mac.h" #include #include @@ -43,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -166,6 +168,9 @@ int len; struct ip save_ip; struct sockaddr *append_sa; +#ifdef MAC + int error; +#endif udpstat.udps_ipackets++; @@ -303,18 +308,29 @@ if (last != NULL) { struct mbuf *n; + int policyfail; + policyfail = 0; #ifdef IPSEC /* check AH/ESP integrity. */ - if (ipsec4_in_reject_so(m, last->inp_socket)) + if (ipsec4_in_reject_so(m, last->inp_socket)) { ipsecstat.in_polvio++; + policyfail = 1; /* do not inject data to pcb */ - else + } #endif /*IPSEC*/ - if ((n = m_copy(m, 0, M_COPYALL)) != NULL) - udp_append(last, ip, n, +#ifdef MAC + if (mac_check_socket_receive(last->inp_socket, + m) != 0) + policyfail = 1; +#endif + if (!policyfail) { + if ((n = m_copy(m, 0, M_COPYALL)) + != NULL) + udp_append(last, ip, n, iphlen + sizeof(struct udphdr)); + } INP_UNLOCK(last); } last = inp; @@ -389,6 +405,11 @@ goto bad; } #endif /*IPSEC*/ +#ifdef MAC + error = mac_check_socket_receive(inp->inp_socket, m); + if (error) + goto bad; +#endif /* * Construct sockaddr format source address. @@ -718,6 +739,10 @@ struct sockaddr_in *sin; int s = 0, error = 0; +#ifdef MAC + mac_create_mbuf_from_socket(inp->inp_socket, m); +#endif + if (control) m_freem(control); /* XXX */ ==== //depot/projects/trustedbsd/base/sys/sparc64/include/pmap.h#10 (text+ko) ==== @@ -37,7 +37,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 20: 5:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5667837B401; Thu, 1 Aug 2002 20:05:33 -0700 (PDT) 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 02E8D37B400 for ; Thu, 1 Aug 2002 20:05:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CC3143E3B for ; Thu, 1 Aug 2002 20:05:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7235WJU010559 for ; Thu, 1 Aug 2002 20:05:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7235Wv2010481 for perforce@freebsd.org; Thu, 1 Aug 2002 20:05:32 -0700 (PDT) Date: Thu, 1 Aug 2002 20:05:32 -0700 (PDT) Message-Id: <200208020305.g7235Wv2010481@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15428 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15428 Change 15428 by rwatson@rwatson_paprika on 2002/08/01 20:04:35 Change include source. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#4 (text+ko) ==== @@ -47,7 +47,7 @@ #include #include -#include "ugidfw.h" +#include /* * Text format for rules: rules contain subjectand object elements, mode. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 20: 6:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E03437B400; Thu, 1 Aug 2002 20:05:35 -0700 (PDT) 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 3EF7437B40A for ; Thu, 1 Aug 2002 20:05:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6B8CE43E3B for ; Thu, 1 Aug 2002 20:05:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7235XJU010733 for ; Thu, 1 Aug 2002 20:05:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7235W65010599 for perforce@freebsd.org; Thu, 1 Aug 2002 20:05:32 -0700 (PDT) Date: Thu, 1 Aug 2002 20:05:32 -0700 (PDT) Message-Id: <200208020305.g7235W65010599@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15429 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15429 Change 15429 by rwatson@rwatson_paprika on 2002/08/01 20:05:06 IFC trickle back several MAC changes to the MAC tree. At the same time, pick up some MAC fixes in the linux code. Affected files ... .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/setlocale.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#42 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_idle.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_intr.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#72 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#37 integrate .. //depot/projects/trustedbsd/mac/sys/modules/linux/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/sys/net/if.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gif.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/pmap.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#13 integrate Differences ... ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.55 2002/05/29 00:46:33 peter Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.56 2002/08/01 22:37:08 rwatson Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -126,12 +126,12 @@ security lomac .. - mac_biba - .. + mac_biba + .. mac_bsdextended .. - mac_mls - .. + mac_mls + .. .. sys .. ==== //depot/projects/trustedbsd/mac/lib/libc/locale/setlocale.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)setlocale.c 8.1 (Berkeley) 7/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.34 2002/03/22 21:52:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.35 2002/08/02 01:04:49 ache Exp $"); #include #include @@ -129,33 +129,29 @@ if (!env || !*env || strchr(env, '/')) env = "C"; - (void) strncpy(new_categories[category], env, ENCODING_LEN); - new_categories[category][ENCODING_LEN] = '\0'; + (void)strlcpy(new_categories[category], env, ENCODING_LEN + 1); if (category == LC_ALL) { for (i = 1; i < _LC_LAST; ++i) { if (!(env = getenv(categories[i])) || !*env) env = new_categories[LC_ALL]; - (void)strncpy(new_categories[i], env, ENCODING_LEN); - new_categories[i][ENCODING_LEN] = '\0'; + (void)strlcpy(new_categories[i], env, ENCODING_LEN + 1); } } - } else if (category != LC_ALL) { - (void)strncpy(new_categories[category], locale, ENCODING_LEN); - new_categories[category][ENCODING_LEN] = '\0'; - } else { + } else if (category != LC_ALL) + (void)strlcpy(new_categories[category], locale, ENCODING_LEN + 1); + else { if ((r = strchr(locale, '/')) == NULL) { - for (i = 1; i < _LC_LAST; ++i) { - (void)strncpy(new_categories[i], locale, ENCODING_LEN); - new_categories[i][ENCODING_LEN] = '\0'; - } + for (i = 1; i < _LC_LAST; ++i) + (void)strlcpy(new_categories[i], locale, ENCODING_LEN + 1); } else { for (i = 1; r[1] == '/'; ++r); if (!r[1]) return (NULL); /* Hmm, just slashes... */ do { + if (i == _LC_LAST) + return(NULL); /* Too many slashes... */ len = r - locale > ENCODING_LEN ? ENCODING_LEN : r - locale; - (void)strncpy(new_categories[i], locale, len); - new_categories[i][len] = '\0'; + (void)strlcpy(new_categories[i], locale, len + 1); i++; locale = r; while (*locale == '/') ==== //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#12 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.61 2002/07/16 18:16:01 mp Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.62 2002/08/01 22:03:19 rwatson Exp $ ############################################################## ### Basic configuration options ############################ ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#10 (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. * - * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.66 2002/07/09 19:25:43 robert Exp $ + * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.67 2002/08/01 22:23:02 rwatson Exp $ */ #include "opt_compat.h" ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.5 2002/03/20 05:42:02 alfred Exp $ */ +/* $FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.6 2002/08/01 22:23:02 rwatson Exp $ */ /* $OpenBSD: linux_getcwd.c,v 1.2 2001/05/16 12:50:21 ho Exp $ */ /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */ ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#15 (text+ko) ==== @@ -25,10 +25,11 @@ * (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/compat/linux/linux_misc.c,v 1.123 2002/06/14 07:24:01 rwatson Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.124 2002/08/01 22:23:02 rwatson Exp $ */ #include "opt_compat.h" +#include "opt_mac.h" #include #include @@ -37,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -250,7 +252,7 @@ vp = NULL; /* - * XXX This code should make use of vn_open(), rather than doing + * XXX: This code should make use of vn_open(), rather than doing * all this stuff itself. */ NDINIT(&ni, LOOKUP, FOLLOW|LOCKLEAF, UIO_USERSPACE, args->library, td); ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#7 (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. * - * $FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.41 2002/06/02 20:05:42 schweikh Exp $ + * $FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.42 2002/08/01 22:23:02 rwatson Exp $ */ #include "opt_mac.h" @@ -251,7 +251,7 @@ bsd_statfs = &mp->mnt_stat; vrele(ndp->ni_vp); #ifdef MAC - error = mac_check_statfs(td->td_proc->p_ucred, mp); + error = mac_check_mount_stat(td->td_proc->p_ucred, mp); if (error) return (error); #endif @@ -291,7 +291,7 @@ return error; mp = ((struct vnode *)fp->f_data)->v_mount; #ifdef MAC - error = mac_check_statfs(td->td_proc->p_ucred, mp); + error = mac_check_mount_stat(td->td_proc->p_ucred, mp); if (error) { fdrop(fp, td); return (error); @@ -360,7 +360,7 @@ if (vp->v_mount == NULL) return (EINVAL); #ifdef MAC - error = mac_check_statfs(td->td_proc->p_ucred, mp); + error = mac_check_mount_stat(td->td_proc->p_ucred, mp); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac/sys/conf/files#42 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.679 2002/08/01 02:03:21 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.680 2002/08/01 22:26:38 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1350,7 +1350,6 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard security/mac_none/mac_none.c optional mac_none - ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_balloc.c optional ffs ufs/ffs/ffs_inode.c optional ffs ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#22 (text+ko) ==== @@ -31,7 +31,7 @@ * @(#)kernfs_vnops.c 8.15 (Berkeley) 5/21/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vnops.c 1.43 * - * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.42 2002/07/31 15:45:16 rwatson Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vnops.c,v 1.43 2002/08/01 22:27:57 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/mac/sys/kern/kern_idle.c#6 (text+ko) ==== @@ -1,7 +1,7 @@ /*- * Copyright (c) 2000, All rights reserved. See /usr/src/COPYRIGHT * - * $FreeBSD: src/sys/kern/kern_idle.c,v 1.25 2002/07/17 19:18:45 julian Exp $ + * $FreeBSD: src/sys/kern/kern_idle.c,v 1.26 2002/08/01 18:45:10 julian Exp $ */ #include "opt_ktrace.h" @@ -63,7 +63,7 @@ p->p_flag |= P_NOLOAD; p->p_state = PRS_NORMAL; td = FIRST_THREAD_IN_PROC(p); - td->td_state = TDS_UNQUEUED; + td->td_state = TDS_UNQUEUED; td->td_kse->ke_flags |= KEF_IDLEKSE; #ifdef SMP } @@ -112,6 +112,7 @@ mtx_lock_spin(&sched_lock); p->p_stats->p_ru.ru_nvcsw++; + td->td_state = TDS_UNQUEUED; mi_switch(); mtx_unlock_spin(&sched_lock); } ==== //depot/projects/trustedbsd/mac/sys/kern/kern_intr.c#12 (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/sys/kern/kern_intr.c,v 1.76 2002/06/29 17:26:18 julian Exp $ + * $FreeBSD: src/sys/kern/kern_intr.c,v 1.77 2002/08/01 18:45:10 julian Exp $ * */ @@ -351,6 +351,7 @@ { struct int_entropy entropy; struct thread *td; + struct thread *ctd; struct proc *p; /* @@ -359,13 +360,14 @@ if ((ithread == NULL) || TAILQ_EMPTY(&ithread->it_handlers)) return (EINVAL); + ctd = curthread; /* * If any of the handlers for this ithread claim to be good * sources of entropy, then gather some. */ if (harvest.interrupt && ithread->it_flags & IT_ENTROPY) { entropy.vector = ithread->it_vector; - entropy.proc = curthread->td_proc;; + entropy.proc = ctd->td_proc;; random_harvest(&entropy, sizeof(entropy), 2, 0, RANDOM_INTERRUPT); } @@ -390,13 +392,12 @@ CTR2(KTR_INTR, "%s: setrunqueue %d", __func__, p->p_pid); setrunqueue(td); if (do_switch && - (curthread->td_critnest == 1)/* && - (curthread->td_state == TDS_RUNNING) XXXKSE*/) { -#if 0 /* not needed in KSE */ - if (curthread != PCPU_GET(idlethread)) - setrunqueue(curthread); -#endif - curthread->td_proc->p_stats->p_ru.ru_nivcsw++; + (ctd->td_critnest == 1) ) { + KASSERT((ctd->td_state == TDS_RUNNING), + ("ithread_schedule: Bad state for curthread.")); + ctd->td_proc->p_stats->p_ru.ru_nivcsw++; + if (ctd->td_kse->ke_flags & KEF_IDLEKSE) + ctd->td_state = TDS_UNQUEUED; mi_switch(); } else { curthread->td_kse->ke_flags |= KEF_NEEDRESCHED; ==== //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#17 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.177 2002/07/30 21:13:48 julian Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.178 2002/08/01 18:45:10 julian Exp $ */ #include "opt_compat.h" @@ -1364,7 +1364,7 @@ * The signal is not ignored or caught. */ mtx_lock_spin(&sched_lock); - thread_unsuspend(p); /* Checks if should do it. */ + thread_unsuspend(p); mtx_unlock_spin(&sched_lock); goto out; } @@ -1373,7 +1373,9 @@ /* * Already stopped, don't need to stop again * (If we did the shell could get confused). + * Just make sure the signal STOP bit set. */ + p->p_flag |= P_STOPPED_SGNL; SIGDELSET(p->p_siglist, sig); goto out; } @@ -1383,10 +1385,8 @@ * If a thread is sleeping interruptibly, simulate a * wakeup so that when it is continued it will be made * runnable and can look at the signal. However, don't make - * the process runnable, leave it stopped. + * the PROCESS runnable, leave it stopped. * It may run a bit until it hits a thread_suspend_check(). - * - * XXXKSE I don't understand this at all. */ mtx_lock_spin(&sched_lock); FOREACH_THREAD_IN_PROC(p, td) { @@ -1403,6 +1403,8 @@ /* * XXXKSE What about threads that are waiting on mutexes? * Shouldn't they abort too? + * No, hopefully mutexes are short lived.. They'll + * eventually hit thread_suspend_check(). */ } else if (p->p_state == PRS_NORMAL) { if (prop & SA_CONT) { @@ -1419,6 +1421,7 @@ * cause the process to run. */ if (prop & SA_STOP) { + int should_signal = 1; if (action != SIG_DFL) goto runfast; @@ -1430,8 +1433,22 @@ goto out; SIGDELSET(p->p_siglist, sig); p->p_xstat = sig; - PROC_LOCK(p->p_pptr); - if (!(p->p_pptr->p_procsig->ps_flag & PS_NOCLDSTOP)) + PROC_LOCK(p->p_pptr); /* XXX un-needed? */ +#if 0 + FOREACH_THREAD_IN_PROC(p, td) { + if (td->td_state == TDS_RUNNING) { + /* + * all other states must be in + * the kernel + */ + should_signal = 0; + break; + } + } +/* don't enable until the equivalent code is in thread_suspend_check() */ +#endif + if (!(p->p_pptr->p_procsig->ps_flag & PS_NOCLDSTOP) && + should_signal) psignal(p->p_pptr, SIGCHLD); PROC_UNLOCK(p->p_pptr); stop(p); ==== //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#10 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.192 2002/07/30 10:12:11 tanimura Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.193 2002/08/01 18:45:10 julian Exp $ */ #include "opt_ddb.h" @@ -807,6 +807,7 @@ mtx_assert(&sched_lock, MA_OWNED | MA_NOTRECURSED); KASSERT((ke->ke_state == KES_THREAD), ("mi_switch: kse state?")); + KASSERT((td->td_state != TDS_RUNQ), ("mi_switch: called by old code")); #ifdef INVARIANTS if (td->td_state != TDS_MTX && td->td_state != TDS_RUNQ && @@ -866,7 +867,7 @@ #endif /* - * Pick a new current process and record its start time. + * Finish up stats for outgoing thread. */ cnt.v_swtch++; PCPU_SET(switchtime, new_switchtime); @@ -877,23 +878,33 @@ ke->ke_oncpu = NOCPU; ke->ke_flags &= ~KEF_NEEDRESCHED; /* - * At the last moment: if this KSE is not on the run queue, - * it needs to be freed correctly and the thread treated accordingly. + * At the last moment, if this thread is still marked RUNNING, + * then put it back on the run queue as it has not been suspended + * or stopped or any thing else similar. */ - if ((td->td_state == TDS_RUNNING) && - ((ke->ke_flags & KEF_IDLEKSE) == 0)) { + if (td->td_state == TDS_RUNNING) { + KASSERT(((ke->ke_flags & KEF_IDLEKSE) == 0), + ("Idle thread in mi_switch with wrong state")); /* Put us back on the run queue (kse and all). */ setrunqueue(td); - } else if ((td->td_flags & TDF_UNBOUND) && - (td->td_state != TDS_RUNQ)) { /* in case of old code */ + } else if (td->td_flags & TDF_UNBOUND) { /* - * We will not be on the run queue. - * Someone else can use the KSE if they need it. + * We will not be on the run queue. So we must be + * sleeping or similar. If it's available, + * someone else can use the KSE if they need it. + * XXXKSE KSE loaning will change this. */ td->td_kse = NULL; kse_reassign(ke); } - cpu_switch(); + + cpu_switch(); /* SHAZAM!!*/ + + /* + * Start setting up stats etc. for the incoming thread. + * Similar code in fork_exit() is returned to by cpu_switch() + * in the case of a new thread/process. + */ td->td_kse->ke_oncpu = PCPU_GET(cpuid); sched_lock.mtx_recurse = sched_nest; sched_lock.mtx_lock = (uintptr_t)td; ==== //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/kern/kern_thread.c,v 1.13 2002/07/25 03:21:35 julian Exp $ + * $FreeBSD: src/sys/kern/kern_thread.c,v 1.14 2002/08/01 19:10:40 julian Exp $ */ #include @@ -213,7 +213,7 @@ } /* - * reap any zombie threads for this Processor. + * reap any zombie threads. */ void thread_reap(void) ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#13 (text+ko) ==== @@ -11,7 +11,7 @@ * 2. Absolutely no warranty of function or purpose is made by the author * John S. Dyson. * - * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.324 2002/07/30 20:41:10 alc Exp $ + * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.325 2002/08/01 17:57:42 alc Exp $ */ /* @@ -2944,7 +2944,7 @@ !(bp->b_ioflags & BIO_ERROR)) { bp->b_flags |= B_CACHE; } - + vm_page_lock_queues(); for (i = 0; i < bp->b_npages; i++) { int bogusflag = 0; int resid; @@ -3012,6 +3012,7 @@ foff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK; iosize -= resid; } + vm_page_unlock_queues(); if (obj) vm_object_pip_wakeupn(obj, 0); } @@ -3050,7 +3051,7 @@ vm_object_t obj; obj = bp->b_object; - + vm_page_lock_queues(); for (i = 0; i < bp->b_npages; i++) { vm_page_t m = bp->b_pages[i]; @@ -3066,6 +3067,7 @@ vm_page_flag_clear(m, PG_ZERO); vm_page_io_finish(m); } + vm_page_unlock_queues(); vm_object_pip_wakeupn(obj, 0); } } ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#72 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.278 2002/08/01 17:47:56 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.279 2002/08/01 20:44:52 rwatson Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -2947,6 +2947,14 @@ } #endif /* MAC */ loff = auio.uio_offset = fp->f_offset; +#ifdef MAC + error = mac_check_vnode_readdir(td->td_ucred, vp); + if (error) { + VOP_UNLOCK(vp, 0, td); + fdrop(fp, td); + return (error); + } +#endif # if (BYTE_ORDER != LITTLE_ENDIAN) if (vp->v_mount->mnt_maxsymlinklen <= 0) { error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, @@ -3083,13 +3091,9 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); loff = auio.uio_offset = fp->f_offset; #ifdef MAC - /* - * Here also, don't use cached credentials for checking directory - * search MAC. - */ error = mac_check_vnode_readdir(td->td_ucred, vp); if (error == 0) -#endif /* MAC */ +#endif error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, NULL, NULL); fp->f_offset = auio.uio_offset; ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#37 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.156 2002/08/01 17:23:22 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.157 2002/08/01 18:29:30 rwatson Exp $ */ #include "opt_mac.h" @@ -801,6 +801,7 @@ if (error) return (error); #endif + return (VOP_POLL(vp, events, cred, td)); } ==== //depot/projects/trustedbsd/mac/sys/modules/linux/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/linux/Makefile,v 1.57 2002/05/19 01:27:14 marcel Exp $ +# $FreeBSD: src/sys/modules/linux/Makefile,v 1.58 2002/08/01 22:23:02 rwatson Exp $ MAINTAINER= emulation@FreeBSD.org @@ -8,7 +8,8 @@ SRCS= linux_dummy.c linux_file.c linux_getcwd.c linux_ioctl.c linux_ipc.c \ linux_machdep.c linux_mib.c linux_misc.c linux_signal.c linux_socket.c \ linux_stats.c linux_sysctl.c linux_sysent.c linux_sysvec.c \ - linux_util.c opt_compat.h opt_linux.h opt_mac.h opt_vmpage.h vnode_if.h + linux_util.c opt_compat.h opt_linux.h opt_mac.h opt_vmpage.h \ + vnode_if.h OBJS= linux_locore.o .if ${MACHINE_ARCH} == "i386" ==== //depot/projects/trustedbsd/mac/sys/net/if.c#21 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.143 2002/07/31 16:16:03 rwatson Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.144 2002/08/01 21:15:53 rwatson Exp $ */ #include "opt_compat.h" ==== //depot/projects/trustedbsd/mac/sys/net/if_gif.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/if_gif.c,v 1.24 2002/05/25 20:17:04 brooks Exp $ */ +/* $FreeBSD: src/sys/net/if_gif.c,v 1.25 2002/08/01 21:00:05 rwatson Exp $ */ /* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ /* ==== //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#9 (text+ko) ==== @@ -69,7 +69,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $FreeBSD: src/sys/net/if_ppp.c,v 1.79 2002/04/04 21:03:28 jhb Exp $ */ +/* $FreeBSD: src/sys/net/if_ppp.c,v 1.80 2002/08/01 21:13:47 rwatson Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ @@ -95,6 +95,7 @@ #include #include #include +#include #include #include @@ -716,6 +717,12 @@ int len; struct mbuf *m; +#ifdef MAC + error = mac_check_ifnet_transmit(ifp, m0); + if (error) + goto bad; +#endif + if (sc->sc_devp == NULL || (ifp->if_flags & IFF_RUNNING) == 0 || ((ifp->if_flags & IFF_UP) == 0 && dst->sa_family != AF_UNSPEC)) { error = ENETDOWN; /* sort of */ @@ -1106,6 +1113,9 @@ splx(s); if (m == NULL) break; +#ifdef MAC + mac_create_mbuf_from_ifnet(&sc->sc_if, m); +#endif ppp_inproc(sc, m); } } ==== //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.118 2002/07/28 19:59:31 truckman Exp $ + * $FreeBSD: src/sys/netinet/udp_usrreq.c,v 1.119 2002/08/01 21:37:34 rwatson Exp $ */ #include "opt_ipsec.h" @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/mac/sys/sparc64/include/pmap.h#10 (text+ko) ==== @@ -37,7 +37,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 - * $FreeBSD: src/sys/sparc64/include/pmap.h,v 1.22 2002/07/27 21:57:38 jake Exp $ + * $FreeBSD: src/sys/sparc64/include/pmap.h,v 1.23 2002/08/01 21:39:54 jake Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -49,11 +49,11 @@ #define DCACHE_COLORS (1 << DCACHE_COLOR_BITS) #define DCACHE_COLOR_MASK (DCACHE_COLORS - 1) #define DCACHE_COLOR(va) (((va) >> PAGE_SHIFT) & DCACHE_COLOR_MASK) +#define DCACHE_OTHER_COLOR(color) \ + ((color) ^ DCACHE_COLOR_BITS) #define PMAP_CONTEXT_MAX 8192 -#define PG_UNCACHEABLE (1<<0) - #define pmap_resident_count(pm) (pm->pm_stats.resident_count) typedef struct pmap *pmap_t; ==== //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#13 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91 - * $FreeBSD: src/sys/vm/vm_page.c,v 1.204 2002/07/31 07:27:08 alc Exp $ + * $FreeBSD: src/sys/vm/vm_page.c,v 1.205 2002/08/01 17:57:42 alc Exp $ */ /* @@ -404,7 +404,8 @@ void vm_page_io_finish(vm_page_t m) { - GIANT_REQUIRED; + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); m->busy--; if (m->busy == 0) vm_page_flash(m); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 1 20:16:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEBA237B401; Thu, 1 Aug 2002 20:16:42 -0700 (PDT) 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 5573F37B400; Thu, 1 Aug 2002 20:16:42 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id AEDFD43E70; Thu, 1 Aug 2002 20:16:41 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g723GVOo095513; Thu, 1 Aug 2002 23:16:31 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Thu, 1 Aug 2002 23:16:31 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Chris Vance Cc: Perforce Change Reviews Subject: Re: PERFORCE change 15425 for review In-Reply-To: <200208020105.g72154i9089777@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, 1 Aug 2002, Chris Vance wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15425 > > Change 15425 by cvance@cvance_laptop on 2002/08/01 18:04:47 > > Add support for a basic mac_policy syscall handler. > Things to think about: > - who guarantees MPSAFE, trustedbsd harness or the modules? > - the module must perform the copyin on the arg parameter. Also, you need to rebuild and commit the rebuilt init_sysent.c, syscalls.c, and related sys/sys/ stuff. > > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#225 edit > .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#21 edit > .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#141 edit > .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#106 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#225 (text+ko) ==== > > @@ -363,6 +363,9 @@ > * that all enumerated values are handled. > */ > break; > + case MAC_SYSCALL: > + mpc->mpc_ops->mpo_mac_policy = > + mpe->mpe_function; > case MAC_DESTROY: > mpc->mpc_ops->mpo_destroy = > mpe->mpe_function; > @@ -3060,6 +3063,40 @@ > return (error); > } > > +/* > + * MPSAFE > + */ > +int > +mac_policy(struct thread *td, struct mac_policy_args *uap) > +{ > + int error; > + char target[128]; /* TBD: should be MAX_MAXNAME or some such */ > + struct mac_policy_conf *mpc; > + > + error = copyinstr(uap->policy, target, sizeof(target), NULL); > + if (error == ENAMETOOLONG) { > + return (EINVAL); > + } > + if (error) { > + return (error); > + } > + > + error = ENOSYS; > + MAC_POLICY_LIST_BUSY(); > + LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { > + if (strcmp(mpc->mpc_name, target) == 0 && > + mpc->mpc_ops->mpo_mac_policy) { > + error = mpc->mpc_ops->mpo_mac_policy(SCARG(uap, call), > + SCARG(uap, arg)); > + goto out; > + } > + } > + > + out: > + MAC_POLICY_LIST_UNBUSY(); > + return (error); > +} > + > SYSINIT(mac, SI_SUB_MAC, SI_ORDER_FIRST, mac_init, NULL); > SYSINIT(mac_late, SI_SUB_MAC_LATE, SI_ORDER_FIRST, mac_late_init, NULL); > > @@ -3107,4 +3144,11 @@ > return (ENOSYS); > } > > +int > +mac_policy(struct thread *td, struct mac_policy *uap) > +{ > + > + return (ENOSYS); > +} > + > #endif /* !MAC */ > > ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#21 (text+ko) ==== > > @@ -567,5 +567,5 @@ > 392 STD BSD { int uuidgen(struct uuid *store, int count); } > 393 MSTD BSD { int sendfile(int fd, int s, off_t offset, size_t nbytes, \ > struct sf_hdtr *hdtr, off_t *sbytes, int flags); } > -394 MNOIMPL BSD { int mac_policy(const char *policy, int call, \ > +394 MSTD BSD { int mac_policy(const char *policy, int call, \ > void *arg); } > > ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#141 (text+ko) ==== > > > ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#106 (text+ko) ==== > > @@ -63,6 +63,11 @@ > void (*mpo_init)(struct mac_policy_conf *mpc); > > /* > + * Generic policy-directed security syscall > + */ > + int (*mpo_mac_policy)(int call, void *arg); > + > + /* > * Label operations. > */ > void (*mpo_init_bpfdesc)(struct bpf_d *, struct label *label); > @@ -330,6 +335,7 @@ > > enum mac_op_constant { > MAC_OP_LAST, > + MAC_SYSCALL, > MAC_DESTROY, > MAC_INIT, > MAC_INIT_BPFDESC, > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 2 0:27:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC0D837B401; Fri, 2 Aug 2002 00:26:07 -0700 (PDT) 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 7053D37B400 for ; Fri, 2 Aug 2002 00:26:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A315D43E6E for ; Fri, 2 Aug 2002 00:26:06 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g727Q6JU062604 for ; Fri, 2 Aug 2002 00:26:06 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g727Q6vi062600 for perforce@freebsd.org; Fri, 2 Aug 2002 00:26:06 -0700 (PDT) Date: Fri, 2 Aug 2002 00:26:06 -0700 (PDT) Message-Id: <200208020726.g727Q6vi062600@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 15438 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15438 Change 15438 by mini@mini_stylus on 2002/08/02 00:25:05 Axe the fd table, the fd table locks, wonky fd handling, and the kernel polling stuff. Affected files ... .. //depot/projects/kse/lib/libc_r/uthread/Makefile.inc#5 edit .. //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#5 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_accept.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_acl_delete_fd.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_acl_get_fd.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_acl_set_fd.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_bind.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_cancel.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_close.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_connect.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_create.c#4 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_dup.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_dup2.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_execve.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_exit.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_fchflags.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_fchmod.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_fchown.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_fcntl.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_fd.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_file.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_flock.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_fork.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_fpathconf.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_fstat.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_fstatfs.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_fsync.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_getdirentries.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_getpeername.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_getsockname.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_getsockopt.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_info.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#5 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_ioctl.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#4 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_kevent.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_listen.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_open.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_pipe.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_poll.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_pselect.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_read.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_readv.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_recvfrom.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_recvmsg.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_select.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_sendfile.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_sendmsg.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_sendto.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_setsockopt.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_shutdown.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_socket.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_socketpair.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_write.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_writev.c#3 edit Differences ... ==== //depot/projects/kse/lib/libc_r/uthread/Makefile.inc#5 (text+ko) ==== @@ -4,11 +4,6 @@ .PATH: ${.CURDIR}/uthread SRCS+= \ - uthread_accept.c \ - uthread_acl_delete_fd.c \ - uthread_acl_get_fd.c \ - uthread_acl_set_fd.c \ - uthread_acl_aclcheck_fd.c \ uthread_aio_suspend.c \ uthread_attr_destroy.c \ uthread_attr_init.c \ @@ -30,50 +25,29 @@ uthread_attr_setstackaddr.c \ uthread_attr_setstacksize.c \ uthread_autoinit.c \ - uthread_bind.c \ uthread_cancel.c \ uthread_clean.c \ uthread_close.c \ uthread_cond.c \ uthread_condattr_destroy.c \ uthread_condattr_init.c \ - uthread_connect.c \ uthread_creat.c \ uthread_create.c \ uthread_detach.c \ - uthread_dup.c \ - uthread_dup2.c \ uthread_equal.c \ - uthread_execve.c \ uthread_exit.c \ - uthread_fchflags.c \ - uthread_fchmod.c \ - uthread_fchown.c \ uthread_fcntl.c \ - uthread_fd.c \ - uthread_file.c \ uthread_find_thread.c \ - uthread_flock.c \ uthread_fork.c \ - uthread_fpathconf.c \ - uthread_fstat.c \ - uthread_fstatfs.c \ uthread_fsync.c \ uthread_gc.c \ - uthread_getdirentries.c \ - uthread_getpeername.c \ uthread_getprio.c \ uthread_getschedparam.c \ - uthread_getsockname.c \ - uthread_getsockopt.c \ uthread_info.c \ uthread_init.c \ - uthread_ioctl.c \ uthread_join.c \ uthread_kern.c \ - uthread_kevent.c \ uthread_kill.c \ - uthread_listen.c \ uthread_main_np.c \ uthread_mattr_init.c \ uthread_mattr_kind_np.c \ @@ -87,35 +61,25 @@ uthread_once.c \ uthread_open.c \ uthread_pause.c \ - uthread_pipe.c \ uthread_poll.c \ uthread_priority_queue.c \ uthread_pselect.c \ uthread_read.c \ uthread_readv.c \ - uthread_recvfrom.c \ - uthread_recvmsg.c \ uthread_resume_np.c \ uthread_rwlock.c \ uthread_rwlockattr.c \ uthread_select.c \ uthread_self.c \ uthread_sem.c \ - uthread_sendfile.c \ - uthread_sendmsg.c \ - uthread_sendto.c \ uthread_seterrno.c \ uthread_setprio.c \ uthread_setschedparam.c \ - uthread_setsockopt.c \ - uthread_shutdown.c \ uthread_sigmask.c \ uthread_sigsuspend.c \ uthread_sigwait.c \ uthread_single_np.c \ uthread_sleep.c \ - uthread_socket.c \ - uthread_socketpair.c \ uthread_spec.c \ uthread_spinlock.c \ uthread_stack.c \ ==== //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#5 (text+ko) ==== @@ -434,13 +434,6 @@ PS_SIGTHREAD, PS_MUTEX_WAIT, PS_COND_WAIT, - PS_FDLR_WAIT, - PS_FDLW_WAIT, - PS_FDR_WAIT, - PS_FDW_WAIT, - PS_FILE_WAIT, - PS_POLL_WAIT, - PS_SELECT_WAIT, PS_SLEEP_WAIT, PS_WAIT_WAIT, PS_SIGSUSPEND, @@ -461,45 +454,9 @@ #define FD_WRITE 0x2 #define FD_RDWR (FD_READ | FD_WRITE) -/* - * File descriptor table structure. - */ -struct fd_table_entry { - /* - * Lock for accesses to this file descriptor table - * entry. This is passed to _spinlock() to provide atomic - * access to this structure. It does *not* represent the - * state of the lock on the file descriptor. - */ - spinlock_t lock; - TAILQ_HEAD(, pthread) r_queue; /* Read queue. */ - TAILQ_HEAD(, pthread) w_queue; /* Write queue. */ - struct pthread *r_owner; /* Ptr to thread owning read lock. */ - struct pthread *w_owner; /* Ptr to thread owning write lock. */ - char *r_fname; /* Ptr to read lock source file name */ - int r_lineno; /* Read lock source line number. */ - char *w_fname; /* Ptr to write lock source file name */ - int w_lineno; /* Write lock source line number. */ - int r_lockcount; /* Count for FILE read locks. */ - int w_lockcount; /* Count for FILE write locks. */ - int flags; /* Flags used in open. */ -}; - -struct pthread_poll_data { - int nfds; - struct pollfd *fds; -}; - union pthread_wait_data { pthread_mutex_t mutex; pthread_cond_t cond; - struct { - short fd; /* Used when thread waiting on fd */ - short branch; /* Line number, for debugging. */ - char *fname; /* Source file name for debugging.*/ - } fd; - FILE *fp; - struct pthread_poll_data *poll_data; spinlock_t *spinlock; struct pthread *thread; }; @@ -587,7 +544,7 @@ /* * Time to wake up thread. This is used for sleeping threads and - * for any operation which may time out (such as select). + * for any operation which may time out. */ struct timespec wakeup_time; @@ -640,11 +597,6 @@ union pthread_wait_data data; /* - * Allocated for converting select into poll. - */ - struct pthread_poll_data poll_data; - - /* * Set to TRUE if a blocking operation was * interrupted by a signal: */ @@ -667,7 +619,7 @@ #define PTHREAD_FLAGS_IN_PRIOQ 0x0008 /* in priority queue using pqe link */ #define PTHREAD_FLAGS_IN_WORKQ 0x0010 /* in work queue using qe link */ #define PTHREAD_FLAGS_IN_FILEQ 0x0020 /* in file lock queue using qe link */ -#define PTHREAD_FLAGS_IN_FDQ 0x0040 /* in fd lock queue using qe link */ + /* 0x0040 Unused. */ #define PTHREAD_FLAGS_IN_CONDQ 0x0080 /* in condition queue using sqe link*/ #define PTHREAD_FLAGS_IN_MUTEXQ 0x0100 /* in mutex queue using sqe link */ #define PTHREAD_FLAGS_SUSPENDED 0x0200 /* thread is suspended */ @@ -824,42 +776,6 @@ ; #endif -/* - * Standard I/O file descriptors need special flag treatment since - * setting one to non-blocking does all on *BSD. Sigh. This array - * is used to store the initial flag settings. - */ -SCLASS int _pthread_stdio_flags[3]; - -/* File table information: */ -SCLASS struct fd_table_entry **_thread_fd_table -#ifdef GLOBAL_PTHREAD_PRIVATE -= NULL; -#else -; -#endif - -/* Table for polling file descriptors: */ -SCLASS struct pollfd *_thread_pfd_table -#ifdef GLOBAL_PTHREAD_PRIVATE -= NULL; -#else -; -#endif - -SCLASS const int dtablecount -#ifdef GLOBAL_PTHREAD_PRIVATE -= 4096/sizeof(struct fd_table_entry); -#else -; -#endif -SCLASS int _thread_dtablesize /* Descriptor table size. */ -#ifdef GLOBAL_PTHREAD_PRIVATE -= 0; -#else -; -#endif - SCLASS int _clock_res_usec /* Clock resolution in usec. */ #ifdef GLOBAL_PTHREAD_PRIVATE = CLOCK_RES_USEC; @@ -926,16 +842,6 @@ /* Undefine the storage class specifier: */ #undef SCLASS -#ifdef _LOCK_DEBUG -#define _FD_LOCK(_fd,_type,_ts) _thread_fd_lock_debug(_fd, _type, \ - _ts, __FILE__, __LINE__) -#define _FD_UNLOCK(_fd,_type) _thread_fd_unlock_debug(_fd, _type, \ - __FILE__, __LINE__) -#else -#define _FD_LOCK(_fd,_type,_ts) _thread_fd_lock(_fd, _type, _ts) -#define _FD_UNLOCK(_fd,_type) _thread_fd_unlock(_fd, _type) -#endif - /* * Function prototype definitions. */ @@ -944,15 +850,12 @@ char *__ttyname_r_basic(int, char *, size_t); char *ttyname_r(int, char *, size_t); void _cond_wait_backout(pthread_t); -void _fd_lock_backout(pthread_t); int _find_thread(pthread_t); struct pthread *_get_curthread(void); void _set_curthread(struct pthread *); void *_thread_stack_alloc(size_t, size_t); void _thread_stack_free(void *, size_t, size_t); int _thread_create(pthread_t *,const pthread_attr_t *,void *(*start_routine)(void *),void *,pthread_t); -int _thread_fd_lock(int, int, struct timespec *); -int _thread_fd_lock_debug(int, int, struct timespec *,char *fname,int lineno); int _mutex_cv_lock(pthread_mutex_t *); int _mutex_cv_unlock(pthread_mutex_t *); void _mutex_lock_backout(pthread_t); @@ -988,9 +891,6 @@ #endif void _thread_exit(char *, int, char *); void _thread_exit_cleanup(void); -void _thread_fd_unlock(int, int); -void _thread_fd_unlock_debug(int, int, char *, int); -void _thread_fd_unlock_owned(pthread_t); void *_thread_cleanup(pthread_t); void _thread_cleanupspecific(void); void _thread_dump_info(void); @@ -1005,19 +905,11 @@ void _thread_kern_sig_undefer(void); void _thread_start(void); void _thread_seterrno(pthread_t, int); -int _thread_fd_table_init(int fd); pthread_addr_t _thread_gc(pthread_addr_t); void _thread_enter_cancellation_point(void); void _thread_leave_cancellation_point(void); void _thread_cancellation_point(void); -/* #include */ -#ifdef _SYS_ACL_H -int __sys___acl_aclcheck_fd(int, acl_type_t, struct acl *); -int __sys___acl_delete_fd(int, acl_type_t); -int __sys___acl_get_fd(int, acl_type_t, struct acl *); -int __sys___acl_set_fd(int, acl_type_t, struct acl *); -#endif /* #include */ #ifdef _SYS_AIO_H_ ==== //depot/projects/kse/lib/libc_r/uthread/uthread_cancel.c#3 (text+ko) ==== @@ -44,10 +44,6 @@ break; case PS_SPINBLOCK: - case PS_FDR_WAIT: - case PS_FDW_WAIT: - case PS_POLL_WAIT: - case PS_SELECT_WAIT: /* Remove these threads from the work queue: */ if ((pthread->flags & PTHREAD_FLAGS_IN_WORKQ) != 0) @@ -80,9 +76,6 @@ case PS_SUSPENDED: case PS_MUTEX_WAIT: case PS_COND_WAIT: - case PS_FDLR_WAIT: - case PS_FDLW_WAIT: - case PS_FILE_WAIT: /* * Threads in these states may be in queues. * In order to preserve queue integrity, the ==== //depot/projects/kse/lib/libc_r/uthread/uthread_close.c#3 (text+ko) ==== @@ -42,65 +42,12 @@ __weak_reference(__close, close); int -_close(int fd) -{ - int flags; - int ret; - struct stat sb; - struct fd_table_entry *entry; - - /* - * Lock the file descriptor while the file is closed and get - * the file descriptor status: - */ - if (((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) && - ((ret = __sys_fstat(fd, &sb)) == 0)) { - /* - * Check if the file should be left as blocking. - * - * This is so that the file descriptors shared with a parent - * process aren't left set to non-blocking if the child - * closes them prior to exit. An example where this causes - * problems with /bin/sh is when a child closes stdin. - * - * Setting a file as blocking causes problems if a threaded - * parent accesses the file descriptor before the child exits. - * Once the threaded parent receives a SIGCHLD then it resets - * all of its files to non-blocking, and so it is then safe - * to access them. - * - * Pipes are not set to blocking when they are closed, as - * the parent and child will normally close the file - * descriptor of the end of the pipe that they are not - * using, which would then cause any reads to block - * indefinitely. - */ - if ((S_ISREG(sb.st_mode) || S_ISCHR(sb.st_mode)) && (_thread_fd_table[fd]->flags & O_NONBLOCK) == 0) { - /* Get the current flags: */ - flags = __sys_fcntl(fd, F_GETFL, NULL); - /* Clear the nonblocking file descriptor flag: */ - __sys_fcntl(fd, F_SETFL, flags & ~O_NONBLOCK); - } - - /* XXX: Assumes well behaved threads. */ - /* XXX: Defer real close to avoid race condition */ - entry = _thread_fd_table[fd]; - _thread_fd_table[fd] = NULL; - free(entry); - - /* Close the file descriptor: */ - ret = __sys_close(fd); - } - return (ret); -} - -int __close(int fd) { int ret; _thread_enter_cancellation_point(); - ret = _close(fd); + ret = __sys_close(fd); _thread_leave_cancellation_point(); return ret; ==== //depot/projects/kse/lib/libc_r/uthread/uthread_create.c#4 (text+ko) ==== @@ -167,8 +167,6 @@ new_thread->specific = NULL; new_thread->cleanup = NULL; new_thread->flags = 0; - new_thread->poll_data.nfds = 0; - new_thread->poll_data.fds = NULL; new_thread->continuation = NULL; /* ==== //depot/projects/kse/lib/libc_r/uthread/uthread_exit.c#3 (text+ko) ==== @@ -45,30 +45,6 @@ __weak_reference(_pthread_exit, pthread_exit); -void _exit(int status) -{ - int flags; - int i; - - /* - * Enter a loop to set all file descriptors to blocking - * if they were not created as non-blocking: - */ - for (i = 0; i < _thread_dtablesize; i++) { - /* Check if this file descriptor is in use: */ - if (_thread_fd_table[i] != NULL && - !(_thread_fd_table[i]->flags & O_NONBLOCK)) { - /* Get the current flags: */ - flags = __sys_fcntl(i, F_GETFL, NULL); - /* Clear the nonblocking file descriptor flag: */ - __sys_fcntl(i, F_SETFL, flags & ~O_NONBLOCK); - } - } - - /* Call the _exit syscall: */ - __sys_exit(status); -} - void _thread_exit(char *fname, int lineno, char *string) { @@ -108,9 +84,6 @@ * internal to the threads library, including file and fd locks, * are not visible to the application and need to be released. */ - /* Unlock all owned fd locks: */ - _thread_fd_unlock_owned(curthread); - /* Unlock all private mutexes: */ _mutex_unlock_private(curthread); @@ -151,12 +124,6 @@ _thread_cleanupspecific(); } - /* Free thread-specific poll_data structure, if allocated: */ - if (curthread->poll_data.fds != NULL) { - free(curthread->poll_data.fds); - curthread->poll_data.fds = NULL; - } - /* * Lock the garbage collector mutex to ensure that the garbage * collector is not using the dead thread list. ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fcntl.c#3 (text+ko) ==== @@ -40,107 +40,6 @@ __weak_reference(__fcntl, fcntl); int -_fcntl(int fd, int cmd,...) -{ - int flags = 0; - int nonblock; - int oldfd; - int ret; - va_list ap; - - /* Lock the file descriptor: */ - if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) { - /* Initialise the variable argument list: */ - va_start(ap, cmd); - - /* Process according to file control command type: */ - switch (cmd) { - /* Duplicate a file descriptor: */ - case F_DUPFD: - /* - * Get the file descriptor that the caller wants to - * use: - */ - oldfd = va_arg(ap, int); - - /* Initialise the file descriptor table entry: */ - if ((ret = __sys_fcntl(fd, cmd, oldfd)) < 0) { - } - /* Initialise the file descriptor table entry: */ - else if (_thread_fd_table_init(ret) != 0) { - /* Quietly close the file: */ - __sys_close(ret); - - /* Reset the file descriptor: */ - ret = -1; - } else { - /* - * Save the file open flags so that they can - * be checked later: - */ - _thread_fd_table[ret]->flags = _thread_fd_table[fd]->flags; - } - break; - case F_SETFD: - flags = va_arg(ap, int); - ret = __sys_fcntl(fd, cmd, flags); - break; - case F_GETFD: - ret = __sys_fcntl(fd, cmd, 0); - break; - case F_GETFL: - ret = _thread_fd_table[fd]->flags; - break; - case F_SETFL: - /* - * Get the file descriptor flags passed by the - * caller: - */ - flags = va_arg(ap, int); - - /* - * Check if the user wants a non-blocking file - * descriptor: - */ - nonblock = flags & O_NONBLOCK; - - /* Set the file descriptor flags: */ - if ((ret = __sys_fcntl(fd, cmd, flags | O_NONBLOCK)) != 0) { - - /* Get the flags so that we behave like the kernel: */ - } else if ((flags = __sys_fcntl(fd, - F_GETFL, 0)) == -1) { - /* Error getting flags: */ - ret = -1; - - /* - * Check if the file descriptor is non-blocking - * with respect to the user: - */ - } else if (nonblock) - /* A non-blocking descriptor: */ - _thread_fd_table[fd]->flags = flags | O_NONBLOCK; - else - /* Save the flags: */ - _thread_fd_table[fd]->flags = flags & ~O_NONBLOCK; - break; - default: - /* Might want to make va_arg use a union */ - ret = __sys_fcntl(fd, cmd, va_arg(ap, void *)); - break; - } - - /* Free variable arguments: */ - va_end(ap); - - /* Unlock the file descriptor: */ - _FD_UNLOCK(fd, FD_RDWR); - } - /* Return the completion status: */ - return (ret); -} - -int __fcntl(int fd, int cmd,...) { int ret; @@ -153,14 +52,14 @@ case F_DUPFD: case F_SETFD: case F_SETFL: - ret = _fcntl(fd, cmd, va_arg(ap, int)); + ret = __sys_fcntl(fd, cmd, va_arg(ap, int)); break; case F_GETFD: case F_GETFL: - ret = _fcntl(fd, cmd); + ret = __sys_fcntl(fd, cmd); break; default: - ret = _fcntl(fd, cmd, va_arg(ap, void *)); + ret = __sys_fcntl(fd, cmd, va_arg(ap, void *)); } va_end(ap); ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fork.c#3 (text+ko) ==== @@ -146,27 +146,6 @@ /* Initialize the scheduling switch hook routine: */ _sched_switch_hook = NULL; - - /* Clear out any locks in the file descriptor table: */ - for (i = 0; i < _thread_dtablesize; i++) { - if (_thread_fd_table[i] != NULL) { - /* Initialise the file locks: */ - memset(&_thread_fd_table[i]->lock, 0, - sizeof(_thread_fd_table[i]->lock)); - _thread_fd_table[i]->r_owner = NULL; - _thread_fd_table[i]->w_owner = NULL; - _thread_fd_table[i]->r_fname = NULL; - _thread_fd_table[i]->w_fname = NULL; - _thread_fd_table[i]->r_lineno = 0;; - _thread_fd_table[i]->w_lineno = 0;; - _thread_fd_table[i]->r_lockcount = 0;; - _thread_fd_table[i]->w_lockcount = 0;; - - /* Initialise the read/write queues: */ - TAILQ_INIT(&_thread_fd_table[i]->r_queue); - TAILQ_INIT(&_thread_fd_table[i]->w_queue); - } - } } } @@ -197,8 +176,5 @@ if (thread->specific != NULL) free(thread->specific); - if (thread->poll_data.fds != NULL) - free(thread->poll_data.fds); - free(thread); } ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fsync.c#3 (text+ko) ==== @@ -38,24 +38,12 @@ __weak_reference(__fsync, fsync); int -_fsync(int fd) -{ - int ret; - - if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) { - ret = __sys_fsync(fd); - _FD_UNLOCK(fd, FD_RDWR); - } - return (ret); -} - -int __fsync(int fd) { int ret; _thread_enter_cancellation_point(); - ret = _fsync(fd); + ret = __sys_fsync(fd); _thread_leave_cancellation_point(); return ret; ==== //depot/projects/kse/lib/libc_r/uthread/uthread_info.c#3 (text+ko) ==== @@ -59,13 +59,6 @@ {PS_SIGTHREAD , "Waiting on signal thread"}, {PS_MUTEX_WAIT , "Waiting on a mutex"}, {PS_COND_WAIT , "Waiting on a condition variable"}, - {PS_FDLR_WAIT , "Waiting for a file read lock"}, - {PS_FDLW_WAIT , "Waiting for a file write lock"}, - {PS_FDR_WAIT , "Waiting for read"}, - {PS_FDW_WAIT , "Waiting for write"}, - {PS_FILE_WAIT , "Waiting for FILE lock"}, - {PS_POLL_WAIT , "Waiting on poll"}, - {PS_SELECT_WAIT , "Waiting on select"}, {PS_SLEEP_WAIT , "Sleeping"}, {PS_WAIT_WAIT , "Waiting process"}, {PS_SIGSUSPEND , "Suspended, waiting for a signal"}, @@ -169,34 +162,6 @@ } } - /* Output a header for file descriptors: */ - snprintf(s, sizeof(s), "\n\n=============\nFILE DESCRIPTOR " - "TABLE (table size %d)\n\n", _thread_dtablesize); - __sys_write(fd, s, strlen(s)); - - /* Enter a loop to report file descriptor lock usage: */ - for (i = 0; i < _thread_dtablesize; i++) { - /* - * Check if memory is allocated for this file - * descriptor: - */ - if (_thread_fd_table[i] != NULL) { - /* Report the file descriptor lock status: */ - snprintf(s, sizeof(s), - "fd[%3d] read owner %p count %d [%s:%d]\n" - " write owner %p count %d [%s:%d]\n", - i, _thread_fd_table[i]->r_owner, - _thread_fd_table[i]->r_lockcount, - _thread_fd_table[i]->r_fname, - _thread_fd_table[i]->r_lineno, - _thread_fd_table[i]->w_owner, - _thread_fd_table[i]->w_lockcount, - _thread_fd_table[i]->w_fname, - _thread_fd_table[i]->w_lineno); - __sys_write(fd, s, strlen(s)); - } - } - /* Close the dump file: */ __sys_close(fd); } @@ -238,21 +203,6 @@ /* Process according to thread state: */ switch (pthread->state) { /* File descriptor read lock wait: */ - case PS_FDLR_WAIT: - case PS_FDLW_WAIT: - case PS_FDR_WAIT: - case PS_FDW_WAIT: - /* Write the lock details: */ - snprintf(s, sizeof(s), "fd %d[%s:%d]", - pthread->data.fd.fd, - pthread->data.fd.fname, - pthread->data.fd.branch); - __sys_write(fd, s, strlen(s)); - snprintf(s, sizeof(s), "owner %pr/%pw\n", - _thread_fd_table[pthread->data.fd.fd]->r_owner, - _thread_fd_table[pthread->data.fd.fd]->w_owner); - __sys_write(fd, s, strlen(s)); - break; case PS_SIGWAIT: break; /* ==== //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#5 (text+ko) ==== @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include @@ -208,14 +207,6 @@ PANIC("Can't dup2"); } - /* Get the standard I/O flags before messing with them : */ - for (i = 0; i < 3; i++) { - if (((_pthread_stdio_flags[i] = - __sys_fcntl(i, F_GETFL, NULL)) == -1) && - (errno != EBADF)) - PANIC("Cannot get stdio flags"); - } - /* Allocate and initialize the ready queue: */ if (_pq_alloc(&_readyq, PTHREAD_MIN_PRIORITY, PTHREAD_LAST_PRIORITY) != 0) { @@ -326,8 +317,6 @@ _thread_initial->last_active = (long) _sched_ticks; /* Initialise the rest of the fields: */ - _thread_initial->poll_data.nfds = 0; - _thread_initial->poll_data.fds = NULL; _thread_initial->sig_defer_count = 0; _thread_initial->specific = NULL; _thread_initial->cleanup = NULL; @@ -345,50 +334,6 @@ _clock_res_usec = clockinfo.tick > CLOCK_RES_USEC_MIN ? clockinfo.tick : CLOCK_RES_USEC_MIN; - /* Get the table size: */ - if ((_thread_dtablesize = getdtablesize()) < 0) { - /* - * Cannot get the system defined table size, so abort - * this process. - */ - PANIC("Cannot get dtablesize"); - } - /* Allocate memory for the file descriptor table: */ - if ((_thread_fd_table = (struct fd_table_entry **) malloc(sizeof(struct fd_table_entry *) * _thread_dtablesize)) == NULL) { - /* Avoid accesses to file descriptor table on exit: */ - _thread_dtablesize = 0; - - /* - * Cannot allocate memory for the file descriptor - * table, so abort this process. - */ - PANIC("Cannot allocate memory for file descriptor table"); - } - /* Allocate memory for the pollfd table: */ - if ((_thread_pfd_table = (struct pollfd *) malloc(sizeof(struct pollfd) * _thread_dtablesize)) == NULL) { - /* - * Cannot allocate memory for the file descriptor - * table, so abort this process. - */ - PANIC("Cannot allocate memory for pollfd table"); - } else { - /* - * Enter a loop to initialise the file descriptor - * table: - */ - for (i = 0; i < _thread_dtablesize; i++) { - /* Initialise the file descriptor table: */ - _thread_fd_table[i] = NULL; - } - - /* Initialize stdio file descriptor table entries: */ - for (i = 0; i < 3; i++) { - if ((_thread_fd_table_init(i) != 0) && - (errno != EBADF)) - PANIC("Cannot initialize stdio file " - "descriptor table entry"); - } - } } /* Initialise the garbage collector mutex and condition variable. */ ==== //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#4 (text+ko) ==== @@ -59,7 +59,7 @@ /* Static function prototype definitions: */ static void -thread_kern_poll(int wait_reqd); +thread_kern_idle(void); static void dequeue_signals(void); @@ -191,9 +191,6 @@ * operations or timeouts: */ case PS_DEADLOCK: - case PS_FDLR_WAIT: - case PS_FDLW_WAIT: - case PS_FILE_WAIT: case PS_JOIN: case PS_MUTEX_WAIT: case PS_SIGSUSPEND: @@ -231,41 +228,9 @@ _spinblock_count++; /* FALLTHROUGH */ - case PS_FDR_WAIT: - case PS_FDW_WAIT: - case PS_POLL_WAIT: - case PS_SELECT_WAIT: - /* Restart the time slice: */ - curthread->slice_usec = -1; - - /* Insert into the waiting queue: */ - PTHREAD_WAITQ_INSERT(curthread); - - /* Insert into the work queue: */ - PTHREAD_WORKQ_INSERT(curthread); - break; } } - /* - * Avoid polling file descriptors if there are none - * waiting: - */ - if (TAILQ_EMPTY(&_workq) != 0) { - } - /* - * Poll file descriptors only if a new scheduling signal - * has occurred or if we have no more runnable threads. - */ - else if (((current_tick = _sched_ticks) != last_tick) || - ((curthread->state != PS_RUNNING) && - (PTHREAD_PRIOQ_FIRST() == NULL))) { - /* - * Poll file descriptors to update the state of threads - * waiting on file I/O where data may be available: - */ - thread_kern_poll(0); - } last_tick = current_tick; /* @@ -281,25 +246,16 @@ (pthread->wakeup_time.tv_sec < ts.tv_sec) || ((pthread->wakeup_time.tv_sec == ts.tv_sec) && (pthread->wakeup_time.tv_nsec <= ts.tv_nsec)))) { - switch (pthread->state) { - case PS_POLL_WAIT: - case PS_SELECT_WAIT: - /* Return zero file descriptors ready: */ - pthread->data.poll_data->nfds = 0; - /* fall through */ - default: - /* - * Remove this thread from the waiting queue - * (and work queue if necessary) and place it - * in the ready queue. - */ - PTHREAD_WAITQ_CLEARACTIVE(); - if (pthread->flags & PTHREAD_FLAGS_IN_WORKQ) - PTHREAD_WORKQ_REMOVE(pthread); - PTHREAD_NEW_STATE(pthread, PS_RUNNING); - PTHREAD_WAITQ_SETACTIVE(); - break; - } + /* + * Remove this thread from the waiting queue + * (and work queue if necessary) and place it + * in the ready queue. + */ + PTHREAD_WAITQ_CLEARACTIVE(); + if (pthread->flags & PTHREAD_FLAGS_IN_WORKQ) + PTHREAD_WORKQ_REMOVE(pthread); + PTHREAD_NEW_STATE(pthread, PS_RUNNING); + PTHREAD_WAITQ_SETACTIVE(); /* * Flag the timeout in the thread structure: */ @@ -379,7 +335,7 @@ * There are no threads ready to run, so wait until * something happens that changes this condition: */ - thread_kern_poll(1); + thread_kern_idle(); /* * This process' usage will likely be very small @@ -486,9 +442,8 @@ } static void -thread_kern_poll(int wait_reqd) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 2 1: 6: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C5B037B401; Fri, 2 Aug 2002 01:05:56 -0700 (PDT) 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 D6BC637B400 for ; Fri, 2 Aug 2002 01:05:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7832843E70 for ; Fri, 2 Aug 2002 01:05:55 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7285tJU069931 for ; Fri, 2 Aug 2002 01:05:55 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7285trK069928 for perforce@freebsd.org; Fri, 2 Aug 2002 01:05:55 -0700 (PDT) Date: Fri, 2 Aug 2002 01:05:55 -0700 (PDT) Message-Id: <200208020805.g7285trK069928@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 15440 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15440 Change 15440 by mini@mini_stylus on 2002/08/02 01:05:32 Remove some things now unused for signals. Affected files ... .. //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#6 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_cancel.c#4 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_info.c#4 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#5 edit Differences ... ==== //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#6 (text+ko) ==== @@ -431,13 +431,10 @@ */ enum pthread_state { PS_RUNNING, - PS_SIGTHREAD, PS_MUTEX_WAIT, PS_COND_WAIT, PS_SLEEP_WAIT, PS_WAIT_WAIT, - PS_SIGSUSPEND, - PS_SIGWAIT, PS_SPINBLOCK, PS_JOIN, PS_SUSPENDED, @@ -602,9 +599,6 @@ */ int interrupted; - /* Signal number when in state PS_SIGWAIT: */ - int signo; - /* * Set to non-zero when this thread has deferred signals. * We allow for recursive deferral. ==== //depot/projects/kse/lib/libc_r/uthread/uthread_cancel.c#4 (text+ko) ==== @@ -49,11 +49,8 @@ != 0) PTHREAD_WORKQ_REMOVE(pthread); /* Fall through: */ - case PS_SIGTHREAD: case PS_SLEEP_WAIT: case PS_WAIT_WAIT: - case PS_SIGSUSPEND: - case PS_SIGWAIT: /* Interrupt and resume: */ pthread->interrupted = 1; pthread->cancelflags |= PTHREAD_CANCELLING; ==== //depot/projects/kse/lib/libc_r/uthread/uthread_info.c#4 (text+ko) ==== @@ -56,13 +56,10 @@ /* Static variables: */ static const struct s_thread_info thread_info[] = { {PS_RUNNING , "Running"}, - {PS_SIGTHREAD , "Waiting on signal thread"}, {PS_MUTEX_WAIT , "Waiting on a mutex"}, {PS_COND_WAIT , "Waiting on a condition variable"}, {PS_SLEEP_WAIT , "Sleeping"}, {PS_WAIT_WAIT , "Waiting process"}, - {PS_SIGSUSPEND , "Suspended, waiting for a signal"}, - {PS_SIGWAIT , "Waiting for a signal"}, {PS_SPINBLOCK , "Waiting for a spinlock"}, {PS_JOIN , "Waiting to join"}, {PS_SUSPENDED , "Suspended"}, @@ -202,9 +199,6 @@ } /* Process according to thread state: */ switch (pthread->state) { - /* File descriptor read lock wait: */ - case PS_SIGWAIT: - break; /* * Trap other states that are not explicitly * coded to dump information: ==== //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#5 (text+ko) ==== @@ -193,9 +193,6 @@ case PS_DEADLOCK: case PS_JOIN: case PS_MUTEX_WAIT: - case PS_SIGSUSPEND: - case PS_SIGTHREAD: - case PS_SIGWAIT: case PS_WAIT_WAIT: /* No timeouts for these states: */ curthread->wakeup_time.tv_sec = -1; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 2 6:17:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B80EC37B401; Fri, 2 Aug 2002 06:17:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 8A55B37B400; Fri, 2 Aug 2002 06:17:29 -0700 (PDT) Received: from localhost (green@localhost) by green.bikeshed.org (8.11.6/8.11.6) with ESMTP id g72D6w535383; Fri, 2 Aug 2002 09:06:58 -0400 (EDT) (envelope-from green@green.bikeshed.org) Message-Id: <200208021306.g72D6w535383@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: John Baldwin Cc: Brian Feldman , Perforce Change Reviews Subject: Re: PERFORCE change 15347 for review In-Reply-To: Your message of "Thu, 01 Aug 2002 10:11:59 EDT." From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 02 Aug 2002 09:06:58 -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin wrote: > > On 31-Jul-2002 Brian Feldman wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15347 > > > > Change 15347 by green@green_laptop_2 on 2002/07/31 14:31:24 > > > > mac_cred_canexec() no longer exists; use mac_check_vnode_exec(). > > Dropping the proc lock invalidates the credential changes and any > earlier credential changes you just made unless you ensure that the > process is single threaded before you do any of the credential > checks and before you get here. This is something that needs to be fixed by people that understand teh KSE stuff by, like you said, ensuring that the process is single-threaded here. That should be the very first thing exec does... I personally had no idea whether it should return an error, destroy all the other threads, fork off a new process surreptititiously (eek!), or whatever else could possibly be the answer for it. -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 2 6:43: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73B3A37B401; Fri, 2 Aug 2002 06:43:04 -0700 (PDT) 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 2F18A37B400 for ; Fri, 2 Aug 2002 06:43:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E335F43E4A for ; Fri, 2 Aug 2002 06:43:03 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g72Dh3JU033789 for ; Fri, 2 Aug 2002 06:43:03 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g72Dh3FB033786 for perforce@freebsd.org; Fri, 2 Aug 2002 06:43:03 -0700 (PDT) Date: Fri, 2 Aug 2002 06:43:03 -0700 (PDT) Message-Id: <200208021343.g72Dh3FB033786@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 15446 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15446 Change 15446 by cvance@cvance_laptop on 2002/08/02 06:42:56 Fix minor bug in mac_policy syscall handler (missing break) Commit changes to syscall.master generated stuff. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#24 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#226 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#24 (text+ko) ==== @@ -422,5 +422,5 @@ { AS(lchflags_args), (sy_call_t *)lchflags }, /* 391 = lchflags */ { AS(uuidgen_args), (sy_call_t *)uuidgen }, /* 392 = uuidgen */ { SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile }, /* 393 = sendfile */ - { SYF_MPSAFE | AS(mac_policy_args), (sy_call_t *)nosys }, /* 394 = mac_policy */ + { SYF_MPSAFE | AS(mac_policy_args), (sy_call_t *)mac_policy }, /* 394 = mac_policy */ }; ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#226 (text+ko) ==== @@ -366,6 +366,7 @@ case MAC_SYSCALL: mpc->mpc_ops->mpo_mac_policy = mpe->mpe_function; + break; case MAC_DESTROY: mpc->mpc_ops->mpo_destroy = mpe->mpe_function; ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#24 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 2 6:46:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D222737B405; Fri, 2 Aug 2002 06:46:17 -0700 (PDT) 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 5DEBB37B400; Fri, 2 Aug 2002 06:46:17 -0700 (PDT) Received: from sentry.gw.tislabs.com (sentry.gw.tislabs.com [192.94.214.100]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DB5843E3B; Fri, 2 Aug 2002 06:46:16 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: by sentry.gw.tislabs.com; id JAA18375; Fri, 2 Aug 2002 09:45:45 -0400 (EDT) Received: from zorg.gw.tislabs.com(10.33.60.104) by sentry.gw.tislabs.com via smap (V5.5) id xma018370; Fri, 2 Aug 02 13:45:03 GMT Received: from localhost (cvance@localhost) by zorg.gw.tislabs.com (8.11.2/8.11.2) with ESMTP id g72Dkxt10425; Fri, 2 Aug 2002 09:46:59 -0400 X-Authentication-Warning: zorg.gw.tislabs.com: cvance owned process doing -bs Date: Fri, 2 Aug 2002 09:46:59 -0400 (EDT) From: Chris Vance X-X-Sender: To: Robert Watson Cc: Chris Vance , Perforce Change Reviews Subject: Re: PERFORCE change 15425 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, 1 Aug 2002, Robert Watson wrote: > On Thu, 1 Aug 2002, Chris Vance wrote: [deleted] > > + case MAC_SYSCALL: > > + mpc->mpc_ops->mpo_mac_policy = > > + mpe->mpe_function; > > Looks like you're missing a "break;" here. Should we rename mac_policy() > to mac_syscall()? Yes, I am. But nobody calls the destroy hook anyway :) > > case MAC_DESTROY: > > mpc->mpc_ops->mpo_destroy = > > mpe->mpe_function; > > @@ -3060,6 +3063,40 @@ > > return (error); > > } > > > > +/* > > + * MPSAFE > > + */ > > +int > > +mac_policy(struct thread *td, struct mac_policy_args *uap) > > +{ > > + int error; > > + char target[128]; /* TBD: should be MAX_MAXNAME or some such */ > > We probably should define a MAC_POLICY_MAXNAME or something and use that, > as well as bound the policy name provided by the policy to that length > during registration. I'll fix this monday. > > + error = copyinstr(uap->policy, target, sizeof(target), NULL); > > + if (error == ENAMETOOLONG) { > > + return (EINVAL); > > + } > > I would imagine it's OK to return the error verbatim..? I wasn't sure what the standard practice for syscalls was, I didn't think I've ever seen one return ENAMETOOLONG. It doesn't much matter to me. chris. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 3 7:51:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1E4837B401; Sat, 3 Aug 2002 07:51:40 -0700 (PDT) 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 28AC537B400 for ; Sat, 3 Aug 2002 07:51:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA19743E42 for ; Sat, 3 Aug 2002 07:51:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g73EpdJU091577 for ; Sat, 3 Aug 2002 07:51:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g73Epd98091566 for perforce@freebsd.org; Sat, 3 Aug 2002 07:51:39 -0700 (PDT) Date: Sat, 3 Aug 2002 07:51:39 -0700 (PDT) Message-Id: <200208031451.g73Epd98091566@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15484 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15484 Change 15484 by rwatson@rwatson_curry on 2002/08/03 07:51:32 Prod a bit at the userland MAC library to accept partial MAC labels in which not all policies are present, and to print partial labels without policies with null labels. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_te.c#5 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#22 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_te.c#5 (text+ko) ==== @@ -54,8 +54,6 @@ { bzero(&label->m_te, sizeof(label->m_te)); - if (strlen(string) == 0) - return (EINVAL); if (strlcpy(label->m_te.mt_type, string, sizeof(label->m_te.mt_type)) >= sizeof(label->m_te.mt_type)) return (EINVAL); ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#22 (text+ko) ==== @@ -68,7 +68,7 @@ mac_to_text(struct mac *mac_p, size_t *len_p) { char *biba = NULL, *mls = NULL, *string = NULL, *te = NULL; - int len = -1; + int len = -1, before; biba = mac_biba_string_from_label(mac_p); if (biba == NULL) @@ -82,10 +82,49 @@ if (te == NULL) goto out; - len = asprintf(&string, "%s%s%s%s%s%s%s%s%s%s%s", - STRING_BIBA, STRING_ELEMENTSEP, biba, STRING_LISTSEP, - STRING_MLS, STRING_ELEMENTSEP, mls, STRING_LISTSEP, - STRING_TE, STRING_ELEMENTSEP, te); + len = 0; + if (strlen(biba) != 0) + len += strlen(STRING_LISTSEP) + strlen(STRING_BIBA) + + strlen(STRING_ELEMENTSEP) + strlen(biba); + if (strlen(mls) != 0) + len += strlen(STRING_LISTSEP) + strlen(STRING_MLS) + + strlen(STRING_ELEMENTSEP) + strlen(mls); + if (strlen(te) != 0) + len += strlen(STRING_LISTSEP) + strlen(STRING_TE) + + strlen(STIRNG_ELEMENTSEP) + strlen(te); + + if (len == 0) { + string = strdup(""); + goto out; + } + + string = (char *) malloc(len+1); + if (string == NULL) + return (NULL); + + len = 0; + + if (strlen(biba) != 0) { + if (before) + len += sprintf(string + len, "%s", STRING_LISTSEP); + len += sprintf(string + len, "%s%s%s", STRING_BIBA, + STRING_ELEMENTSEP, biba); + before = 1; + } + if (strlen(mls) != 0) { + if (before) + len += sprintf(string + len, "%s", STRING_LISTSEP); + len += sprintf(string + len, "%s%s%s", STRING_MLS, + STRING_ELEMENTSEP, mls); + before = 1; + } + if (strlen(te) != 0) { + if (before) + len += sprintf(string + len, "%s", STRING_LISTSEP); + len += sprintf(string + len, "%s%s%s", STRING_TE, + STRING_ELEMENTSEP, te); + before = 1; + } out: if (biba != NULL) @@ -165,7 +204,29 @@ } } - if (biba_seen != 1 || mls_seen != 1 || te_seen != 1) { + if (biba_seen == 0) { + error = mac_biba_label_from_string("", label); + if (error) { + errno = error; + goto exit2; + } + } + if (mls_seen == 0) { + error = mac_mls_label_from_string("", label); + if (error) { + errno = error; + goto exit2; + } + } + if (te_seen == 0) { + error = mac_te_label_from_string("", label); + if (error) { + errno = error; + goto exit2; + } + } + + if (biba_seen > 1 || mls_seen > 1 || te_seen > 1) { errno = EINVAL; goto exit2; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 3 7:53:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89DCD37B401; Sat, 3 Aug 2002 07:53:46 -0700 (PDT) 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 2984B37B400 for ; Sat, 3 Aug 2002 07:53:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6B6843E42 for ; Sat, 3 Aug 2002 07:53:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g73ErjJU091973 for ; Sat, 3 Aug 2002 07:53:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g73ErjR1091970 for perforce@freebsd.org; Sat, 3 Aug 2002 07:53:45 -0700 (PDT) Date: Sat, 3 Aug 2002 07:53:45 -0700 (PDT) Message-Id: <200208031453.g73ErjR1091970@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15485 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15485 Change 15485 by rwatson@rwatson_tislabs on 2002/08/03 07:52:44 Spelling fix. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#23 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#23 (text+ko) ==== @@ -91,7 +91,7 @@ strlen(STRING_ELEMENTSEP) + strlen(mls); if (strlen(te) != 0) len += strlen(STRING_LISTSEP) + strlen(STRING_TE) + - strlen(STIRNG_ELEMENTSEP) + strlen(te); + strlen(STRING_ELEMENTSEP) + strlen(te); if (len == 0) { string = strdup(""); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 3 15: 4:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A762537B401; Sat, 3 Aug 2002 15:04:34 -0700 (PDT) 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 357DB37B400 for ; Sat, 3 Aug 2002 15:04:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D33C243E5E for ; Sat, 3 Aug 2002 15:04:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g73M4XJU059686 for ; Sat, 3 Aug 2002 15:04:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g73M4X2T059683 for perforce@freebsd.org; Sat, 3 Aug 2002 15:04:33 -0700 (PDT) Date: Sat, 3 Aug 2002 15:04:33 -0700 (PDT) Message-Id: <200208032204.g73M4X2T059683@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15498 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15498 Change 15498 by rwatson@rwatson_tislabs on 2002/08/03 15:04:26 Make sure to initialize the 'before' variable so that a comma is not printed before the first item in the list. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#24 (text+ko) ==== @@ -103,6 +103,7 @@ return (NULL); len = 0; + before = 0; if (strlen(biba) != 0) { if (before) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 3 15:32:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E64BC37B401; Sat, 3 Aug 2002 15:32:08 -0700 (PDT) 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 5962337B400 for ; Sat, 3 Aug 2002 15:32:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A21843E42 for ; Sat, 3 Aug 2002 15:32:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g73MW7JU065977 for ; Sat, 3 Aug 2002 15:32:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g73MW7iQ065974 for perforce@freebsd.org; Sat, 3 Aug 2002 15:32:07 -0700 (PDT) Date: Sat, 3 Aug 2002 15:32:07 -0700 (PDT) Message-Id: <200208032232.g73MW7iQ065974@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15499 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15499 Change 15499 by rwatson@rwatson_curry on 2002/08/03 15:31:46 Teach Biba to prevent equal labels from being set by subjects without EQUAL already set (a special case will be needed to permit low-high processes to set EQUAL). Teach Biba to support partial updates of labels that contain both low and high, as well as to ignore update requests that don't set any Biba components. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#87 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#87 (text+ko) ==== @@ -135,6 +135,15 @@ } static int +biba_atmostflags(struct mac_biba *mac_biba, int flags) +{ + + if (((mac_biba->mb_flags & MAC_BIBA_FLAGS_BOTH) & flags) != flags) + return (EINVAL); + return (0); +} + +static int mac_biba_dominate_element(struct mac_biba_element *a, struct mac_biba_element *b) { @@ -263,6 +272,24 @@ } static int +mac_biba_contains_equal(struct mac_biba *mac_biba) +{ + + if (mac_biba->mb_flags & MAC_BIBA_FLAG_SINGLE) + if (mac_biba->mb_single.mbe_type == MAC_BIBA_TYPE_EQUAL) + return (1); + + if (mac_biba->mb_flags & MAC_BIBA_FLAG_RANGE) { + if (mac_biba->mb_rangelow.mbe_type == MAC_BIBA_TYPE_EQUAL) + return (1); + if (mac_biba->mb_rangehigh.mbe_type == MAC_BIBA_TYPE_EQUAL) + return (1); + } + + return (0); +} + +static int mac_biba_valid(struct mac_biba *mac_biba) { @@ -384,6 +411,16 @@ labelto->mb_flags |= MAC_BIBA_FLAG_RANGE; } +static void +mac_biba_copy(struct mac_biba *source, struct mac_biba *dest) +{ + + if (source->mb_flags & MAC_BIBA_FLAG_SINGLE) + mac_biba_copy_single(source, dest); + if (source->mb_flags & MAC_BIBA_FLAG_RANGE) + mac_biba_copy_range(source, dest); +} + /* * Policy module operations. */ @@ -707,7 +744,7 @@ source = SLOT(label); dest = SLOT(vnodelabel); - mac_biba_copy_single(source, dest); + mac_biba_copy(source, dest); } static void @@ -719,7 +756,7 @@ source = SLOT(vnodelabel); dest = SLOT(direntlabel); - mac_biba_copy_single(source, dest); + mac_biba_copy(source, dest); } static void @@ -835,8 +872,7 @@ source = SLOT(newlabel); dest = SLOT(socketlabel); - mac_biba_copy_single(source, dest); - mac_biba_copy_range(source, dest); + mac_biba_copy(source, dest); } static void @@ -1075,8 +1111,7 @@ source = SLOT(newlabel); dest = SLOT(ifnetlabel); - mac_biba_copy_single(source, dest); - mac_biba_copy_range(source, dest); + mac_biba_copy(source, dest); } static void @@ -1153,8 +1188,7 @@ source = SLOT(newlabel); dest = SLOT(&cred->cr_label); - mac_biba_copy_single(source, dest); - mac_biba_copy_range(source, dest); + mac_biba_copy(source, dest); } /* @@ -1181,12 +1215,14 @@ mac_biba_check_cred_relabel(struct ucred *cred, struct label *newlabel) { struct mac_biba *subj, *new; + int error; subj = SLOT(&cred->cr_label); new = SLOT(newlabel); - if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAGS_BOTH) - return (EINVAL); + error = mac_biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); + if (error) + return (error); /* * XXX: Allow processes with root privilege to set labels outside @@ -1199,18 +1235,23 @@ /* * The new single must be in the old range. */ - if (!mac_biba_single_in_range(new, subj)) + if (new->mb_flags & MAC_BIBA_FLAG_SINGLE && + !mac_biba_single_in_range(new, subj)) return (EPERM); /* * The new range must be in the old range. */ - if (!mac_biba_range_in_range(new, subj)) + if (new->mb_flags & MAC_BIBA_FLAG_RANGE && + !mac_biba_range_in_range(new, subj)) return (EPERM); /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + * If the old subject label doesn't contain EQUAL, don't let the + * new subject label contain EQUAL. */ + if (mac_biba_contains_equal(new) && !mac_biba_contains_equal(subj)) + return (EPERM); return (0); } @@ -1238,12 +1279,14 @@ struct label *ifnetlabel, struct label *newlabel) { struct mac_biba *subj, *new; + int error; subj = SLOT(&cred->cr_label); new = SLOT(newlabel); - if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAGS_BOTH) - return (EINVAL); + error = mac_biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); + if (error) + return (error); /* * XXX: Only Biba HIGH subjects may relabel interfaces. */ @@ -1258,7 +1301,7 @@ struct mbuf *m, struct label *mbuflabel) { struct mac_biba *p, *i; - + if (!mac_biba_enabled) return (0); @@ -1334,13 +1377,15 @@ struct label *pipelabel, struct label *newlabel) { struct mac_biba *subj, *obj, *new; + int error; new = SLOT(newlabel); subj = SLOT(&cred->cr_label); obj = SLOT(pipelabel); - if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) - return (EINVAL); + error = mac_biba_atmostflags(new, MAC_BIBA_FLAG_SINGLE); + if (error) + return (error); /* * To relabel a pipe, the old pipe label must be in the subject @@ -1353,12 +1398,16 @@ * To relabel a pipe, the new pipe label must be in the subject * range. */ - if (!mac_biba_single_in_range(new, subj)) + if (new->mb_flags & MAC_BIBA_FLAGS_SINGLE && + !mac_biba_single_in_range(new, subj)) return (EPERM); /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + * If the subject label doesn't contain equal, don't let the new + * pipe label contain equal. */ + if (mac_biba_contains_equal(new) && !mac_biba_contains_equal(subj)) + return (EPERM); return (0); } @@ -1443,13 +1492,15 @@ struct label *socketlabel, struct label *newlabel) { struct mac_biba *subj, *obj, *new; + int error; new = SLOT(newlabel); subj = SLOT(&cred->cr_label); obj = SLOT(socketlabel); - if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) - return (EINVAL); + error = mac_biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); + if (error) + return (error); /* * To relabel a socket, the old socket label must be in the subject @@ -1459,16 +1510,27 @@ return (EPERM); /* - * To relabel a socket, the new socket label must be in the subject + * To relabel a socket, the new socket single must be in the subject * range. */ - if (!mac_biba_single_in_range(new, subj)) + if (new->mb_flags & MAC_BIBA_FLAG_SINGLE && + !mac_biba_single_in_range(new, subj)) return (EPERM); /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + * The new range must be in the subject range. */ + if (new->mb_flags & MAC_BIBA_FLAG_RANGE && + !mac_biba_range_in_range(new, subj)) + return (EPERM); + /* + * If the subject label doesn't contain EQUAL, don't let the new + * socket label contain EQUAL. + */ + if (mac_biba_contains_equal(new) && !mac_biba_contains_equal(subj)) + return (EPERM); + return (0); } @@ -1729,13 +1791,15 @@ struct label *vnodelabel, struct label *newlabel) { struct mac_biba *old, *new, *subj; + int error; old = SLOT(vnodelabel); new = SLOT(newlabel); subj = SLOT(&cred->cr_label); - if ((new->mb_flags & MAC_BIBA_FLAGS_BOTH) != MAC_BIBA_FLAG_SINGLE) - return (EINVAL); + error = mac_biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); + if (error) + return (error); /* * To relabel a vnode, the old vnode label must be in the subject @@ -1748,12 +1812,16 @@ * To relabel a vnode, the new vnode label must be in the subject * range. */ - if (!mac_biba_single_in_range(new, subj)) + if (new->mb_flags & MAC_BIBA_FLAG_SINGLE && + !mac_biba_single_in_range(new, subj)) return (EPERM); /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + * If the subject label doesn't contain EQUAL, don't let the new + * vnode label contain EQUAL. */ + if (mac_biba_contains_equal(new) && !mac_biba_contains_equal(subj)) + return (EPERM); return (suser_cred(cred, 0)); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 3 15:38:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78F9537B400; Sat, 3 Aug 2002 15:38:48 -0700 (PDT) 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 3035237B405 for ; Sat, 3 Aug 2002 15:38:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D54EA43EB1 for ; Sat, 3 Aug 2002 15:38:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g73McGJU066296 for ; Sat, 3 Aug 2002 15:38:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g73McFLb066293 for perforce@freebsd.org; Sat, 3 Aug 2002 15:38:15 -0700 (PDT) Date: Sat, 3 Aug 2002 15:38:15 -0700 (PDT) Message-Id: <200208032238.g73McFLb066293@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15500 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15500 Change 15500 by rwatson@rwatson_curry on 2002/08/03 15:37:28 Revise logic so that we allow equal labels to be set based on the subject single being equal, the range starting or ending with equal, or the range being LOW-HIGH. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#88 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#88 (text+ko) ==== @@ -290,6 +290,28 @@ } static int +mac_biba_subj_equal_ok(struct mac_biba *mac_biba) +{ + + /* If the single is EQUAL, it's ok */ + if (mac_biba->mb_single.mbe_type == MAC_BIBA_TYPE_EQUAL) + return (0); + + /* If either range endpoint is EQUAL, it's ok */ + if (mac_biba->mb_rangelow.mbe_type == MAC_BIBA_TYPE_EQUAL || + mac_biba->mb_rangehigh.mbe_type == MAC_BIBA_TYPE_EQUAL) + return (0); + + /* If the range is low-high, it's ok */ + if (mac_biba->mb_rangelow.mbe_type == MAC_BIBA_TYPE_LOW && + mac_biba->mb_rangehigh.mbe_type == MAC_BIBA_TYPE_HIGH) + return (0); + + /* It's not OK. */ + return (EPERM); +} + +static int mac_biba_valid(struct mac_biba *mac_biba) { @@ -1250,7 +1272,7 @@ * If the old subject label doesn't contain EQUAL, don't let the * new subject label contain EQUAL. */ - if (mac_biba_contains_equal(new) && !mac_biba_contains_equal(subj)) + if (mac_biba_contains_equal(new) && !mac_biba_subj_equal_ok(subj)) return (EPERM); return (0); @@ -1406,7 +1428,7 @@ * If the subject label doesn't contain equal, don't let the new * pipe label contain equal. */ - if (mac_biba_contains_equal(new) && !mac_biba_contains_equal(subj)) + if (mac_biba_contains_equal(new) && !mac_biba_subj_equal_ok(subj)) return (EPERM); return (0); @@ -1528,7 +1550,7 @@ * If the subject label doesn't contain EQUAL, don't let the new * socket label contain EQUAL. */ - if (mac_biba_contains_equal(new) && !mac_biba_contains_equal(subj)) + if (mac_biba_contains_equal(new) && !mac_biba_subj_equal_ok(subj)) return (EPERM); return (0); @@ -1820,7 +1842,7 @@ * If the subject label doesn't contain EQUAL, don't let the new * vnode label contain EQUAL. */ - if (mac_biba_contains_equal(new) && !mac_biba_contains_equal(subj)) + if (mac_biba_contains_equal(new) && !mac_biba_subj_equal_ok(subj)) return (EPERM); return (suser_cred(cred, 0)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 3 19:51:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0D3537B401; Sat, 3 Aug 2002 19:51:24 -0700 (PDT) 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 8694137B400 for ; Sat, 3 Aug 2002 19:51:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33E4643E6E for ; Sat, 3 Aug 2002 19:51:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g742pOJU002174 for ; Sat, 3 Aug 2002 19:51:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g742pNsS002171 for perforce@freebsd.org; Sat, 3 Aug 2002 19:51:23 -0700 (PDT) Date: Sat, 3 Aug 2002 19:51:23 -0700 (PDT) Message-Id: <200208040251.g742pNsS002171@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15506 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15506 Change 15506 by rwatson@rwatson_tislabs on 2002/08/03 19:51:15 Fix some spelling, add KASSERTs, fix some logic in the various relabel checks relating to EQUAL labels. It's now possible to do partial label updates with Biba, relabel vnodes as an unprivileged user, and the ability to set equal labels is limited to privilege. Remove the suser() call in the vnode relabel check: as long as the labels match up well, we consider it OK for unprivileged processes to relabel. The suser() call is still present in the subject relabel case, but we'd probably like to get rid of that once we figure out how we want to deal with the notion of privilege and role in MLS. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#89 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#89 (text+ko) ==== @@ -138,7 +138,7 @@ biba_atmostflags(struct mac_biba *mac_biba, int flags) { - if (((mac_biba->mb_flags & MAC_BIBA_FLAGS_BOTH) & flags) != flags) + if ((mac_biba->mb_flags & flags) != mac_biba->mb_flags) return (EINVAL); return (0); } @@ -290,9 +290,13 @@ } static int -mac_biba_subj_equal_ok(struct mac_biba *mac_biba) +mac_biba_subject_equal_ok(struct mac_biba *mac_biba) { + KASSERT((mac_biba->mb_flags & MAC_BIBA_FLAGS_BOTH == + MAC_BIBA_FLAGS_BOTH), + ("mac_biba_subject_equal_ok: subject doesn't have both labels")); + /* If the single is EQUAL, it's ok */ if (mac_biba->mb_single.mbe_type == MAC_BIBA_TYPE_EQUAL) return (0); @@ -1242,7 +1246,7 @@ subj = SLOT(&cred->cr_label); new = SLOT(newlabel); - error = mac_biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); + error = biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); if (error) return (error); @@ -1272,8 +1276,11 @@ * If the old subject label doesn't contain EQUAL, don't let the * new subject label contain EQUAL. */ - if (mac_biba_contains_equal(new) && !mac_biba_subj_equal_ok(subj)) - return (EPERM); + if (mac_biba_contains_equal(new)) { + error = mac_biba_subject_equal_ok(subj); + if (error) + return (error); + } return (0); } @@ -1306,7 +1313,7 @@ subj = SLOT(&cred->cr_label); new = SLOT(newlabel); - error = mac_biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); + error = biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); if (error) return (error); @@ -1405,7 +1412,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(pipelabel); - error = mac_biba_atmostflags(new, MAC_BIBA_FLAG_SINGLE); + error = biba_atmostflags(new, MAC_BIBA_FLAG_SINGLE); if (error) return (error); @@ -1420,7 +1427,7 @@ * To relabel a pipe, the new pipe label must be in the subject * range. */ - if (new->mb_flags & MAC_BIBA_FLAGS_SINGLE && + if (new->mb_flags & MAC_BIBA_FLAG_SINGLE && !mac_biba_single_in_range(new, subj)) return (EPERM); @@ -1428,8 +1435,11 @@ * If the subject label doesn't contain equal, don't let the new * pipe label contain equal. */ - if (mac_biba_contains_equal(new) && !mac_biba_subj_equal_ok(subj)) - return (EPERM); + if (mac_biba_contains_equal(new)) { + error = mac_biba_subject_equal_ok(subj); + if (error) + return (error); + } return (0); } @@ -1520,7 +1530,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(socketlabel); - error = mac_biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); + error = biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); if (error) return (error); @@ -1550,9 +1560,11 @@ * If the subject label doesn't contain EQUAL, don't let the new * socket label contain EQUAL. */ - if (mac_biba_contains_equal(new) && !mac_biba_subj_equal_ok(subj)) - return (EPERM); - + if (mac_biba_contains_equal(new)) { + error = mac_biba_subject_equal_ok(subj); + if (error) + return (error); + } return (0); } @@ -1819,7 +1831,7 @@ new = SLOT(newlabel); subj = SLOT(&cred->cr_label); - error = mac_biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); + error = biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); if (error) return (error); @@ -1842,10 +1854,13 @@ * If the subject label doesn't contain EQUAL, don't let the new * vnode label contain EQUAL. */ - if (mac_biba_contains_equal(new) && !mac_biba_subj_equal_ok(subj)) - return (EPERM); + if (mac_biba_contains_equal(new)) { + error = mac_biba_subject_equal_ok(subj); + if (error) + return (error); + } - return (suser_cred(cred, 0)); + return (0); } static int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Aug 4 14: 4:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 288A637B401; Sun, 4 Aug 2002 14:04:29 -0700 (PDT) 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 B786E37B400 for ; Sun, 4 Aug 2002 14:04:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7495C43E65 for ; Sun, 4 Aug 2002 14:04:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g74L4SJU018704 for ; Sun, 4 Aug 2002 14:04:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g74L4SiX018701 for perforce@freebsd.org; Sun, 4 Aug 2002 14:04:28 -0700 (PDT) Date: Sun, 4 Aug 2002 14:04:28 -0700 (PDT) Message-Id: <200208042104.g74L4SiX018701@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15537 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15537 Change 15537 by rwatson@rwatson_curry on 2002/08/04 14:04:20 During conversion to biba_atmostflags(), FLAG_SINGLE became _FLAGS_BOTH. Revert. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#90 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#90 (text+ko) ==== @@ -1831,7 +1831,7 @@ new = SLOT(newlabel); subj = SLOT(&cred->cr_label); - error = biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); + error = biba_atmostflags(new, MAC_BIBA_FLAG_SINGLE); if (error) return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 5 6: 7:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C76837B401; Mon, 5 Aug 2002 06:07:53 -0700 (PDT) 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 3F09437B400 for ; Mon, 5 Aug 2002 06:07:52 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E03A343E75 for ; Mon, 5 Aug 2002 06:07:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g75D7pJU085273 for ; Mon, 5 Aug 2002 06:07:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g75D7puv085266 for perforce@freebsd.org; Mon, 5 Aug 2002 06:07:51 -0700 (PDT) Date: Mon, 5 Aug 2002 06:07:51 -0700 (PDT) Message-Id: <200208051307.g75D7puv085266@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15564 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15564 Change 15564 by rwatson@rwatson_tislabs on 2002/08/05 06:07:27 At some point, we stopped permitting security.mac.biba.enabled to be modified using a tunable. Probably an editing error, so put it back so that loader.conf can be used to configure the boot-time behavior of the Biba module. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#91 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#91 (text+ko) ==== @@ -84,6 +84,7 @@ static int mac_biba_enabled = 0; SYSCTL_INT(_security_mac_biba, OID_AUTO, enabled, CTLFLAG_RW, &mac_biba_enabled, 0, "Enforce MAC/Biba policy"); +TUNABLE_INT("security.mac.biba.enabled", &mac_biba_enabled); static int destroyed_not_inited; SYSCTL_INT(_security_mac_biba, OID_AUTO, destroyed_not_inited, CTLFLAG_RD, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 5 6:17:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 654DA37B401; Mon, 5 Aug 2002 06:17:05 -0700 (PDT) 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 D689B37B400 for ; Mon, 5 Aug 2002 06:17:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 933B043E65 for ; Mon, 5 Aug 2002 06:17:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g75DH3JU087826 for ; Mon, 5 Aug 2002 06:17:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g75DH32N087809 for perforce@freebsd.org; Mon, 5 Aug 2002 06:17:03 -0700 (PDT) Date: Mon, 5 Aug 2002 06:17:03 -0700 (PDT) Message-Id: <200208051317.g75DH32N087809@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15565 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15565 Change 15565 by rwatson@rwatson_tislabs on 2002/08/05 06:16:44 Sync up label change policy with mac_biba, and improve on it. This adds support for relative label updates in MLS, seperates the decision making process concerning "allowed to make a label change on this object" and "allowed to make this MLS change on this object" so that updates without MLS components can be made subject to MLS's whim. Some policy sync up on the Biba side is now required. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#74 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#74 (text+ko) ==== @@ -123,6 +123,16 @@ atomic_add_int(&destroyed_not_inited, 1); } + +static int +mls_atmostflags(struct mac_mls *mac_mls, int flags) +{ + + if ((mac_mls->mm_flags & flags) != mac_mls->mm_flags) + return (EINVAL); + return (0); +} + static int mac_mls_dominate_element(struct mac_mls_element *a, struct mac_mls_element *b) @@ -245,6 +255,49 @@ } static int +mac_mls_contains_equal(struct mac_mls *mac_mls) +{ + + if (mac_mls->mm_flags & MAC_MLS_FLAG_SINGLE) + if (mac_mls->mm_single.mme_type == MAC_MLS_TYPE_EQUAL) + return (1); + + if (mac_mls->mm_flags & MAC_MLS_FLAG_RANGE) { + if (mac_mls->mm_rangelow.mme_type == MAC_MLS_TYPE_EQUAL) + return (1); + if (mac_mls->mm_rangehigh.mme_type == MAC_MLS_TYPE_EQUAL) + return (1); + } + + return (0); +} + +static int +mac_mls_subject_equal_ok(struct mac_mls *mac_mls) +{ + + KASSERT((mac_mls->mm_flags & MAC_MLS_FLAGS_BOTH == MAC_MLS_FLAGS_BOTH), + ("mac_mls_subject_equal_ok: subject doesn't have both labels")); + + /* If the single is EQUAL, it's ok. */ + if (mac_mls->mm_single.mme_type == MAC_MLS_TYPE_EQUAL) + return (0); + + /* If either range endpoint is EQUAL, it's ok. */ + if (mac_mls->mm_rangelow.mme_type == MAC_MLS_TYPE_EQUAL || + mac_mls->mm_rangehigh.mme_type == MAC_MLS_TYPE_EQUAL) + return (0); + + /* If the range is low-high, it's ok. */ + if (mac_mls->mm_rangelow.mme_type == MAC_MLS_TYPE_LOW && + mac_mls->mm_rangehigh.mme_type == MAC_MLS_TYPE_HIGH) + return (0); + + /* It's not ok. */ + return (EPERM); +} + +static int mac_mls_valid(struct mac_mls *mac_mls) { @@ -366,6 +419,16 @@ labelto->mm_flags |= MAC_MLS_FLAG_RANGE; } +static void +mac_mls_copy(struct mac_mls *source, struct mac_mls *dest) +{ + + if (source->mm_flags & MAC_MLS_FLAG_SINGLE) + mac_mls_copy_single(source, dest); + if (source->mm_flags & MAC_MLS_FLAG_RANGE) + mac_mls_copy_range(source, dest); +} + /* * Policy module operations. */ @@ -692,7 +755,7 @@ source = SLOT(label); dest = SLOT(vnodelabel); - mac_mls_copy_single(source, dest); + mac_mls_copy(source, dest); } static void @@ -820,8 +883,7 @@ source = SLOT(newlabel); dest = SLOT(socketlabel); - mac_mls_copy_single(source, dest); - mac_mls_copy_range(source, dest); + mac_mls_copy(source, dest); } static void @@ -833,7 +895,7 @@ source = SLOT(newlabel); dest = SLOT(pipelabel); - mac_mls_copy_single(source, dest); + mac_mls_copy(source, dest); } static void @@ -1024,8 +1086,7 @@ source = SLOT(newlabel); dest = SLOT(ifnetlabel); - mac_mls_copy_single(source, dest); - mac_mls_copy_range(source, dest); + mac_mls_copy(source, dest); } static void @@ -1102,8 +1163,7 @@ source = SLOT(newlabel); dest = SLOT(&cred->cr_label); - mac_mls_copy_single(source, dest); - mac_mls_copy_range(source, dest); + mac_mls_copy(source, dest); } /* @@ -1130,41 +1190,66 @@ mac_mls_check_cred_relabel(struct ucred *cred, struct label *newlabel) { struct mac_mls *subj, *new; + int error; subj = SLOT(&cred->cr_label); new = SLOT(newlabel); - if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAGS_BOTH) - return (EINVAL); - /* - * XXX: Allow processes with root privilege to set labels outside - * their range, so suid things like "su" work. This WILL go away - * when we figure out the 'correct' solution... + * If there is an MLS label update for the credential, it may be + * an update of single, range, or both. */ - if (!suser_cred(cred, 0)) - return (0); + error = mls_atmostflags(new, MAC_MLS_FLAGS_BOTH); + if (error) + return (error); /* - * The new single must be in the old range. + * If the MLS label is to be changed, authorize as appropriate. */ - if (!mac_mls_single_in_range(new, subj)) - return (EPERM); + if (new->mm_flags & MAC_MLS_FLAGS_BOTH) { + /* + * Exempt traditional superuser processes from the MLS + * relabel requirements. XXXMAC: This will go away. + */ + if (suser_cred(cred, 0) == 0) + return (0); + + /* + * To change the MLS single label on a credential, the + * new single label must be in the current range. + */ + if (new->mm_flags & MAC_MLS_FLAG_SINGLE && + !mac_mls_single_in_range(new, subj)) + return (EPERM); + + /* + * To change the MLS range label on a credential, the + * new range label must be in the current range. + */ + if (new->mm_flags & MAC_MLS_FLAG_RANGE && + !mac_mls_range_in_range(new, subj)) + return (EPERM); - /* - * The new range must be in the old range. - */ - if (!mac_mls_range_in_range(new, subj)) - return (EPERM); + /* + * To have EQUAL in any component of the new credential + * MLS label, the subject must already have EQUAL in + * their label. + */ + if (mac_mls_contains_equal(new)) { + error = mac_mls_subject_equal_ok(subj); + if (error) + return (error); + } - /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. - */ + /* + * XXXMAC: Additional consistency tests regarding the single + * and range of the new label might be performed here. + */ + } return (0); } - static int mac_mls_check_cred_visible(struct ucred *u1, struct ucred *u2) { @@ -1188,16 +1273,39 @@ struct label *ifnetlabel, struct label *newlabel) { struct mac_mls *subj, *new; + int error; subj = SLOT(&cred->cr_label); new = SLOT(newlabel); - if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAGS_BOTH) - return (EINVAL); + /* + * If there is an MLS label update for the interface, it may + * be an update of single, range, or both. + */ + error = mls_atmostflags(new, MAC_MLS_FLAGS_BOTH); + if (error) + return (error); + + /* + * If the MLS label is to be changed, authorize as appropriate. + */ + if (new->mm_flags & MAC_MLS_FLAGS_BOTH) { + /* + * Rely on traditional superuser status for the MLS + * interface relabel requirements. XXX: This will go + * away. + */ + error = suser_cred(cred, 0); + if (error) + return (EPERM); - /* XXX: privilege model here? */ + /* + * XXXMAC: Additional consistency tests regarding the single + * and the range of the new label might be performed here. + */ + } - return (suser_cred(cred, 0)); + return (0); } static int @@ -1281,31 +1389,48 @@ struct label *pipelabel, struct label *newlabel) { struct mac_mls *subj, *obj, *new; + int error; new = SLOT(newlabel); subj = SLOT(&cred->cr_label); obj = SLOT(pipelabel); - if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAG_SINGLE) - return (EINVAL); + /* + * If there is an MLS label update for a pipe, it must be a + * single update. + */ + error = mls_atmostflags(new, MAC_MLS_FLAG_SINGLE); + if (error) + return (error); /* - * To relabel a pipe, the old pipe label must be in the subject - * range. + * To perform a relabel of a pipe (MLS label or not), MLS must + * authorize the relabel. */ if (!mac_mls_single_in_range(obj, subj)) return (EPERM); /* - * To relabel a pipe, the new pipe label must be in the subject - * range. + * If the MLS label is to be changed, authorize as appropriate. */ - if (!mac_mls_single_in_range(new, subj)) - return (EPERM); + if (new->mm_flags & MAC_MLS_FLAG_SINGLE) { + /* + * To change the MLS label on a pipe, the new pipe label + * must be in the subject range. + */ + if (!mac_mls_single_in_range(new, subj)) + return (EPERM); - /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. - */ + /* + * To change the MLS label on a pipe to be EQUAL, the + * subject must have appropriate privilege. + */ + if (mac_mls_contains_equal(new)) { + error = mac_mls_subject_equal_ok(subj); + if (error) + return (error); + } + } return (0); } @@ -1390,32 +1515,70 @@ struct label *socketlabel, struct label *newlabel) { struct mac_mls *subj, *obj, *new; + int error; new = SLOT(newlabel); subj = SLOT(&cred->cr_label); obj = SLOT(socketlabel); - if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAG_SINGLE) - return (EINVAL); + /* + * If there is an MLS label update for the socket, it may be + * an update of single, range, or both. + */ + error = mls_atmostflags(new, MAC_MLS_FLAGS_BOTH); + if (error) + return (error); /* - * To relabel a socket, the old socket label must be in the subject + * To relabel a socket, the old socket single must be in the subject * range. */ if (!mac_mls_single_in_range(obj, subj)) return (EPERM); /* - * To relabel a socket, the new socket label must be in the subject + * To relabel a socket, the old socket range must be in the subject * range. */ - if (!mac_mls_single_in_range(new, subj)) + if (!mac_mls_range_in_range(obj, subj)) return (EPERM); /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. + * If the MLS label is to be changed, authorize as appropriate. */ + if (new->mm_flags & MAC_MLS_FLAGS_BOTH) { + /* + * To relabel a socket, the new socket single must be in + * the subject range. + */ + if (new->mm_flags & MAC_MLS_FLAG_SINGLE && + !mac_mls_single_in_range(new, subj)) + return (EPERM); + + /* + * To change the MLS range on the socket, the new socket + * range must be in the subject range. + */ + if (new->mm_flags & MAC_MLS_FLAG_RANGE && + !mac_mls_range_in_range(new, subj)) + return (EPERM); + + /* + * To change the MLS label on the socket to contain EQUAL, + * the subject must have appropriate privilege. + */ + if (mac_mls_contains_equal(new)) { + error = mac_mls_subject_equal_ok(subj); + if (error) + return (error); + } + /* + * XXXMAC: Additional consistency tests regarding the single + * and range of the new label might be performed here. + */ + } + return (0); } @@ -1679,33 +1842,50 @@ struct label *vnodelabel, struct label *newlabel) { struct mac_mls *old, *new, *subj; + int error; old = SLOT(vnodelabel); new = SLOT(newlabel); subj = SLOT(&cred->cr_label); - if ((new->mm_flags & MAC_MLS_FLAGS_BOTH) != MAC_MLS_FLAG_SINGLE) - return (EINVAL); + /* + * If there is an MLS label update for the vnode, it must be a + * single label. + */ + error = mls_atmostflags(new, MAC_MLS_FLAG_SINGLE); + if (error) + return (error); /* - * To relabel a vnode, the old vnode label must be in the subject - * range. + * To perform a relabel of the vnode (MLS label or not), MLS must + * authorize the relabel. */ if (!mac_mls_single_in_range(old, subj)) return (EPERM); /* - * To relabel a vnode, the new vnode label must be in the subject - * range. + * If the MLS label is to be changed, authorize as appropriate. */ - if (!mac_mls_single_in_range(new, subj)) - return (EPERM); + if (new->mm_flags & MAC_MLS_FLAG_SINGLE) { + /* + * To change the MLS label on a vnode, the new vnode label + * must be in the subject range. + */ + if (!mac_mls_single_in_range(new, subj)) + return (EPERM); - /* - * XXX: Don't permit EQUAL in a label unless the subject has EQUAL. - */ + /* + * To change the MLS label on the vnode to be EQUAL, + * the subject must have appropriate privilege. + */ + if (mac_mls_contains_equal(new)) { + error = mac_mls_subject_equal_ok(subj); + if (error) + return (error); + } + } - return (suser_cred(cred, 0)); + return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 5 6:21:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC6EF37B401; Mon, 5 Aug 2002 06:21:09 -0700 (PDT) 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 340C937B400 for ; Mon, 5 Aug 2002 06:21:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E82B243E5E for ; Mon, 5 Aug 2002 06:21:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g75DL8JU088692 for ; Mon, 5 Aug 2002 06:21:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g75DL8gN088684 for perforce@freebsd.org; Mon, 5 Aug 2002 06:21:08 -0700 (PDT) Date: Mon, 5 Aug 2002 06:21:08 -0700 (PDT) Message-Id: <200208051321.g75DL8gN088684@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15566 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15566 Change 15566 by rwatson@rwatson_tislabs on 2002/08/05 06:20:24 Re-export security.mac.mls.enabled as a tunable -- lost at some point. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#75 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#75 (text+ko) ==== @@ -84,6 +84,7 @@ static int mac_mls_enabled = 0; SYSCTL_INT(_security_mac_mls, OID_AUTO, enabled, CTLFLAG_RW, &mac_mls_enabled, 0, "Enforce MAC/MLS policy"); +TUNABLE_INT("security.mac.mls.enabled", &mac_mls_enabled); static int destroyed_not_inited; SYSCTL_INT(_security_mac_mls, OID_AUTO, destroyed_not_inited, CTLFLAG_RD, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 5 12:33:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7B5637B401; Mon, 5 Aug 2002 12:33:47 -0700 (PDT) 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 4CC6F37B400 for ; Mon, 5 Aug 2002 12:33:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C28643E3B for ; Mon, 5 Aug 2002 12:33:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g75JXkJU053435 for ; Mon, 5 Aug 2002 12:33:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g75JXkOu053431 for perforce@freebsd.org; Mon, 5 Aug 2002 12:33:46 -0700 (PDT) Date: Mon, 5 Aug 2002 12:33:46 -0700 (PDT) Message-Id: <200208051933.g75JXkOu053431@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15583 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15583 Change 15583 by rwatson@rwatson_freefall on 2002/08/05 12:33:31 Spelling fixes in the Alpha OSF/1 emulation code. Discovered by: beast.FreeBSD.org Affected files ... .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_mount.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_mount.c#7 (text+ko) ==== @@ -163,7 +163,7 @@ #ifdef MAC error = mac_check_mount_stat(td->td_proc->p_ucred, mp); if (error) { - drop(fp, td); + fdrop(fp, td); return (error); } #endif @@ -188,7 +188,6 @@ struct mount *mp, *nmp; struct statfs *sp; struct osf1_statfs osfs; - int error; if (SCARG(uap, flags) & ~OSF1_GETFSSTAT_FLAGS) return (EINVAL); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 5 12:35:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5B2737B401; Mon, 5 Aug 2002 12:35:50 -0700 (PDT) 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 4B09037B400 for ; Mon, 5 Aug 2002 12:35:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A62B43E42 for ; Mon, 5 Aug 2002 12:35:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g75JZnJU053647 for ; Mon, 5 Aug 2002 12:35:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g75JZngD053644 for perforce@freebsd.org; Mon, 5 Aug 2002 12:35:49 -0700 (PDT) Date: Mon, 5 Aug 2002 12:35:49 -0700 (PDT) Message-Id: <200208051935.g75JZngD053644@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15584 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15584 Change 15584 by rwatson@rwatson_freefall on 2002/08/05 12:34:57 Syntax fix. Discovered by: beast.FreeBSD.org Affected files ... .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#11 (text+ko) ==== @@ -331,7 +331,7 @@ /* * Do directory search MAC check using non-cached credentials. */ - if ((error = mac_check_vnode_readdir(td->td_proc->p_ucred, vp)) + if ((error = mac_check_vnode_readdir(td->td_proc->p_ucred, vp))) goto out; #endif /* MAC */ if ((error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, &ncookies, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 5 12:42:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C80037B401; Mon, 5 Aug 2002 12:42:11 -0700 (PDT) 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 9D7FC37B400 for ; Mon, 5 Aug 2002 12:42:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31F2243E5E for ; Mon, 5 Aug 2002 12:42:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g75Jg0JU054268 for ; Mon, 5 Aug 2002 12:42:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g75Jfxpl054250 for perforce@freebsd.org; Mon, 5 Aug 2002 12:41:59 -0700 (PDT) Date: Mon, 5 Aug 2002 12:41:59 -0700 (PDT) Message-Id: <200208051941.g75Jfxpl054250@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15585 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15585 Change 15585 by rwatson@rwatson_freefall on 2002/08/05 12:40:58 Spelling fixes. Spotted by: beast.FreeBSD.org Affected files ... .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#8 (text+ko) ==== @@ -360,7 +360,8 @@ if (vp->v_mount == NULL) return (EINVAL); #ifdef MAC - error = mac_check_mount_stat(td->td_proc->p_ucred, mp); + error = mac_check_mount_stat(td->td_proc->p_ucred, + vp->v_mount); if (error) return (error); #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 6 7:19:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 558E637B401; Tue, 6 Aug 2002 07:18:54 -0700 (PDT) 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 C8FB937B400 for ; Tue, 6 Aug 2002 07:18:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60F2243E42 for ; Tue, 6 Aug 2002 07:18:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g76EIrJU052090 for ; Tue, 6 Aug 2002 07:18:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g76EIqVU052087 for perforce@freebsd.org; Tue, 6 Aug 2002 07:18:52 -0700 (PDT) Date: Tue, 6 Aug 2002 07:18:52 -0700 (PDT) Message-Id: <200208061418.g76EIqVU052087@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15611 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15611 Change 15611 by rwatson@rwatson_tislabs on 2002/08/06 07:18:22 Synchronize mac_biba policy checks during relable to mac_mls. Further improve handling of partial label updates between policies. Revert Biba from "high" to "suser" check for interface relabeling since how to handle privilege is not yet clear. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#92 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#92 (text+ko) ==== @@ -1247,40 +1247,57 @@ subj = SLOT(&cred->cr_label); new = SLOT(newlabel); + /* + * If there is a Biba label update for the credential, it may + * be an update of the single, range, or both. + */ error = biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); if (error) return (error); /* - * XXX: Allow processes with root privilege to set labels outside - * their range, so suid things like "su" work. This WILL go away - * when we figure out the 'correct' solution... + * If the Biba label is to be changed, authorize as appropriate. */ - if (!suser_cred(cred, 0)) - return (0); + if (new->mb_flags & MAC_BIBA_FLAGS_BOTH) { + /* + * Exempt traditional superuser processes from the Biba + * relabel requirements. XXXMAC: This will go away. + */ + if (suser_cred(cred, 0) == 0) + return (0); + + /* + * To change the Biba single label on a credential, the + * new single label must be in the current range. + */ + if (new->mb_flags & MAC_BIBA_FLAG_SINGLE && + !mac_biba_single_in_range(new, subj)) + return (EPERM); - /* - * The new single must be in the old range. - */ - if (new->mb_flags & MAC_BIBA_FLAG_SINGLE && - !mac_biba_single_in_range(new, subj)) - return (EPERM); + /* + * To change the Biba range on a credential, the new + * range label must be in the current range. + */ + if (new->mb_flags & MAC_BIBA_FLAG_RANGE && + !mac_biba_range_in_range(new, subj)) + return (EPERM); - /* - * The new range must be in the old range. - */ - if (new->mb_flags & MAC_BIBA_FLAG_RANGE && - !mac_biba_range_in_range(new, subj)) - return (EPERM); + /* + * To have EQUAL in any components of the new credential + * Biba label, the subject must already have EQUAL in + * their label. + */ + if (mac_biba_contains_equal(new)) { + error = mac_biba_subject_equal_ok(subj); + if (error) + return (error); + } - /* - * If the old subject label doesn't contain EQUAL, don't let the - * new subject label contain EQUAL. - */ - if (mac_biba_contains_equal(new)) { - error = mac_biba_subject_equal_ok(subj); - if (error) - return (error); + /* + * XXXMAC: Additional consistency tests regarding the + * single and range of the new label might be performed + * here. + */ } return (0); @@ -1314,16 +1331,29 @@ subj = SLOT(&cred->cr_label); new = SLOT(newlabel); + /* + * If there is a Biba label update for the interface, it may + * be an update of the single, range, or both. + */ error = biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); if (error) return (error); /* - * XXX: Only Biba HIGH subjects may relabel interfaces. */ - if (!mac_biba_high_single(subj)) - return (EPERM); + * If the Biba label is to be changed, authorize as appropriate. + */ + if (new->mb_flags & MAC_BIBA_FLAGS_BOTH) { + /* + * Rely on the traditional superuser status for the Biba + * interface relabel requirements. XXXMAC: This will go + * away. + */ + error = suser_cred(cred, 0); + if (error) + return (EPERM); + } - return (suser_cred(cred, 0)); + return (0); } static int @@ -1413,33 +1443,41 @@ subj = SLOT(&cred->cr_label); obj = SLOT(pipelabel); + /* + * If there is a Biba label update for a pipe, it must be a + * single update. + */ error = biba_atmostflags(new, MAC_BIBA_FLAG_SINGLE); if (error) return (error); /* - * To relabel a pipe, the old pipe label must be in the subject - * range. + * To perform a relabel of a pipe (Biba label or not), Biba must + * authorize the relabel. */ if (!mac_biba_single_in_range(obj, subj)) return (EPERM); /* - * To relabel a pipe, the new pipe label must be in the subject - * range. + * If the Biba label is to be changed, authorize as appropriate. */ - if (new->mb_flags & MAC_BIBA_FLAG_SINGLE && - !mac_biba_single_in_range(new, subj)) - return (EPERM); + if (new->mb_flags & MAC_BIBA_FLAG_SINGLE) { + /* + * To change the Biba label on a pipe, the new pipe label + * must be in the subject range. + */ + if (!mac_biba_single_in_range(new, subj)) + return (EPERM); - /* - * If the subject label doesn't contain equal, don't let the new - * pipe label contain equal. - */ - if (mac_biba_contains_equal(new)) { - error = mac_biba_subject_equal_ok(subj); - if (error) - return (error); + /* + * To change the Biba label on a pipe to be EQUAL, the + * subject must have appropriate privilege. + */ + if (mac_biba_contains_equal(new)) { + error = mac_biba_subject_equal_ok(subj); + if (error) + return (error); + } } return (0); @@ -1531,41 +1569,64 @@ subj = SLOT(&cred->cr_label); obj = SLOT(socketlabel); + /* + * If there is a Biba label update for the socket, it may be + * an update of single, range, or both. + */ error = biba_atmostflags(new, MAC_BIBA_FLAGS_BOTH); if (error) return (error); /* - * To relabel a socket, the old socket label must be in the subject + * To relabel a socket, the old socket single must be in the subject * range. */ if (!mac_biba_single_in_range(obj, subj)) return (EPERM); /* - * To relabel a socket, the new socket single must be in the subject + * To relabel a socket, the old socket range must be in the subject * range. */ - if (new->mb_flags & MAC_BIBA_FLAG_SINGLE && - !mac_biba_single_in_range(new, subj)) + if (!mac_biba_range_in_range(obj, subj)) return (EPERM); /* - * The new range must be in the subject range. + * If the Biba label is to be changed, authorize as appropriate. */ - if (new->mb_flags & MAC_BIBA_FLAG_RANGE && - !mac_biba_range_in_range(new, subj)) - return (EPERM); + if (new->mb_flags & MAC_BIBA_FLAGS_BOTH) { + /* + * To relabel a socket, the new socket single must be in + * the subject range. + */ + if (new->mb_flags & MAC_BIBA_FLAG_SINGLE && + !mac_biba_single_in_range(new, subj)) + return (EPERM); + + /* + * To change the Biba range on the socket, the new socket + * range must be in the subject range. + */ + if (new->mb_flags & MAC_BIBA_FLAG_RANGE && + !mac_biba_range_in_range(new, subj)) + return (EPERM); + + /* + * To change the Biba label on the socket to contain EQUAL, + * the subject must have appropriate privilege. + */ + if (mac_biba_contains_equal(new)) { + error = mac_biba_subject_equal_ok(subj); + if (error) + return (error); + } - /* - * If the subject label doesn't contain EQUAL, don't let the new - * socket label contain EQUAL. - */ - if (mac_biba_contains_equal(new)) { - error = mac_biba_subject_equal_ok(subj); - if (error) - return (error); + /* + * XXXMAC: Additional consistency tests regarding the single + * and range of the new label might be performed here. + */ } + return (0); } @@ -1832,33 +1893,42 @@ new = SLOT(newlabel); subj = SLOT(&cred->cr_label); + /* + * If there is a Biba label update for the vnode, it must be a + * single label. + */ error = biba_atmostflags(new, MAC_BIBA_FLAG_SINGLE); if (error) return (error); /* - * To relabel a vnode, the old vnode label must be in the subject - * range. + * To perform a relabel of the vnode (Biba label or not), Biba must + * authorize the relabel. */ if (!mac_biba_single_in_range(old, subj)) return (EPERM); /* - * To relabel a vnode, the new vnode label must be in the subject - * range. + * If the Biba label is to be changed, authorize as appropriate. */ - if (new->mb_flags & MAC_BIBA_FLAG_SINGLE && - !mac_biba_single_in_range(new, subj)) - return (EPERM); + if (new->mb_flags & MAC_BIBA_FLAG_SINGLE) { + /* + * To change the Biba label on a vnode, the new vnode label + * must be in the subject range. + */ + if (new->mb_flags & MAC_BIBA_FLAG_SINGLE && + !mac_biba_single_in_range(new, subj)) + return (EPERM); - /* - * If the subject label doesn't contain EQUAL, don't let the new - * vnode label contain EQUAL. - */ - if (mac_biba_contains_equal(new)) { - error = mac_biba_subject_equal_ok(subj); - if (error) - return (error); + /* + * To change the Biba label on the vnode to be EQUAL, + * the subject must have appropriate privilege. + */ + if (mac_biba_contains_equal(new)) { + error = mac_biba_subject_equal_ok(subj); + if (error) + return (error); + } } return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 6 7:56:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3D1237B406; Tue, 6 Aug 2002 07:56:40 -0700 (PDT) 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 4F79237B405 for ; Tue, 6 Aug 2002 07:56:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09AE343E81 for ; Tue, 6 Aug 2002 07:56:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g76EudJU055179 for ; Tue, 6 Aug 2002 07:56:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g76Euduf055176 for perforce@freebsd.org; Tue, 6 Aug 2002 07:56:39 -0700 (PDT) Date: Tue, 6 Aug 2002 07:56:39 -0700 (PDT) Message-Id: <200208061456.g76Euduf055176@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15612 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15612 Change 15612 by rwatson@rwatson_tislabs on 2002/08/06 07:56:11 Sort vnode_mmap() and vnode_op() checks properly. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#142 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#107 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#142 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#107 (text+ko) ==== @@ -289,6 +289,10 @@ int (*mpo_check_vnode_lookup)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp); + vm_prot_t (*mpo_check_vnode_mmap_perms)(struct ucred *cred, + struct vnode *vp, struct label *label, int newmapping); + int (*mpo_check_vnode_op)(struct ucred *cred, struct vnode *vp, + struct label *label, int op); int (*mpo_check_vnode_open)(struct ucred *cred, struct vnode *vp, struct label *label, mode_t acc_mode); int (*mpo_check_vnode_readdir)(struct ucred *cred, @@ -325,10 +329,6 @@ struct timespec atime, struct timespec mtime); int (*mpo_check_vnode_stat)(struct ucred *cred, struct vnode *vp, struct label *label); - vm_prot_t (*mpo_check_vnode_mmap_perms)(struct ucred *cred, - struct vnode *vp, struct label *label, int newmapping); - int (*mpo_check_vnode_op)(struct ucred *cred, struct vnode *vp, - struct label *label, int op); }; typedef const void *macop_t; @@ -431,7 +431,9 @@ MAC_CHECK_VNODE_GETACL, MAC_CHECK_VNODE_GETEXTATTR, MAC_CHECK_VNODE_LOOKUP, + MAC_CHECK_VNODE_OP, MAC_CHECK_VNODE_OPEN, + MAC_CHECK_VNODE_MMAP_PERMS, MAC_CHECK_VNODE_READDIR, MAC_CHECK_VNODE_READLINK, MAC_CHECK_VNODE_RELABEL, @@ -445,8 +447,6 @@ MAC_CHECK_VNODE_SETOWNER, MAC_CHECK_VNODE_SETUTIMES, MAC_CHECK_VNODE_STAT, - MAC_CHECK_VNODE_MMAP_PERMS, - MAC_CHECK_VNODE_OP, }; struct mac_policy_op_entry { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 6 10:13:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56A7B37B401; Tue, 6 Aug 2002 10:12:32 -0700 (PDT) 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 09CA337B400 for ; Tue, 6 Aug 2002 10:12:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D9C343E3B for ; Tue, 6 Aug 2002 10:12:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g76HCVJU080904 for ; Tue, 6 Aug 2002 10:12:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g76HCU0G080900 for perforce@freebsd.org; Tue, 6 Aug 2002 10:12:30 -0700 (PDT) Date: Tue, 6 Aug 2002 10:12:30 -0700 (PDT) Message-Id: <200208061712.g76HCU0G080900@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15617 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15617 Change 15617 by rwatson@rwatson_tislabs on 2002/08/06 10:11:56 Break mac_check_vnode_op() out into mac_check_vnode_poll(), mac_check_vnode_read(), and mac_check_vnode_write(). While I'm doing this, break out the single cred argument into two credentials: active_cred, the credential requesting the operation, and saved_cred, and optional credential that has been saved as part of the object access path (usually struct file, but not always). This permits policies to make access control decisions based on either of the two, permitting policies to select a traditional "use the rights at open" model, or "use the rights at each operation" model. While here, convert mac_{biba,mls,te} to use the 'rights at each operation' model for vnode operations. Pipe operations remain to be addressed. Introduce a few XXXMAC's and XXX's where there are questionable credential choices. In particular, we need to modify the file_op array calls in the file descriptor handling code to select both an active and a saved credential, not just the saved credential. This is a first step towards cleaning up some nasty credential behavior in the VFS code. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#13 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#227 edit .. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#11 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#73 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#38 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#93 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#76 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#61 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#67 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#31 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#143 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#108 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#13 (text+ko) ==== @@ -771,7 +771,7 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); (void)VOP_LEASE(vp, td, cred, LEASE_WRITE); #ifdef MAC - error = mac_check_vnode_op(cred, vp, MAC_OP_VNODE_WRITE); + error = mac_check_vnode_write(cred, NULL, vp); if (error == 0) #endif error = VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, cred); ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#227 (text+ko) ==== @@ -749,12 +749,16 @@ mpc->mpc_ops->mpo_check_vnode_mmap_perms = mpe->mpe_function; break; - case MAC_CHECK_VNODE_OP: - mpc->mpc_ops->mpo_check_vnode_op = + case MAC_CHECK_VNODE_OPEN: + mpc->mpc_ops->mpo_check_vnode_open = + mpe->mpe_function; + break; + case MAC_CHECK_VNODE_POLL: + mpc->mpc_ops->mpo_check_vnode_poll = mpe->mpe_function; break; - case MAC_CHECK_VNODE_OPEN: - mpc->mpc_ops->mpo_check_vnode_open = + case MAC_CHECK_VNODE_READ: + mpc->mpc_ops->mpo_check_vnode_read = mpe->mpe_function; break; case MAC_CHECK_VNODE_READDIR: @@ -809,6 +813,10 @@ mpc->mpc_ops->mpo_check_vnode_stat = mpe->mpe_function; break; + case MAC_CHECK_VNODE_WRITE: + mpc->mpc_ops->mpo_check_vnode_write = + mpe->mpe_function; + break; /* default: printf("MAC policy `%s': unknown operation %d\n", @@ -1708,39 +1716,60 @@ } int -mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op) +mac_check_vnode_open(struct ucred *cred, struct vnode *vp, mode_t acc_mode) +{ + int error; + + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_open"); + + if (!mac_enforce_fs) + return (0); + + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + + MAC_CHECK(check_vnode_open, cred, vp, &vp->v_label, acc_mode); + return (error); +} + +int +mac_check_vnode_poll(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp) { int error; if (!mac_enforce_fs) return (0); - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_op"); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_poll"); error = vn_refreshlabel(vp, cred); if (error) return (error); - MAC_CHECK(check_vnode_op, cred, vp, &vp->v_label, op); + MAC_CHECK(check_vnode_poll, active_cred, saved_cred, vp, &vp->v_label); return (error); } int -mac_check_vnode_open(struct ucred *cred, struct vnode *vp, mode_t acc_mode) +mac_check_vnode_read(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp) { int error; - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_open"); - if (!mac_enforce_fs) return (0); + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_read"); + error = vn_refreshlabel(vp, cred); if (error) return (error); - MAC_CHECK(check_vnode_open, cred, vp, &vp->v_label, acc_mode); + MAC_CHECK(check_vnode_read, active_cred, saved_cred, vp, &vp->v_label); + return (error); } @@ -1996,6 +2025,26 @@ return (error); } +int +mac_check_vnode_write(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp) +{ + int error; + + if (!mac_enforce_fs) + return (0); + + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_write"); + + error = vn_refreshlabel(vp, cred); + if (error) + return (error); + + MAC_CHECK(check_vnode_write, active_cred, saved_cred, vp, &vp->v_label); + + return (error); +} + /* * When relabeling a process, call out to the policies for the maximum * permission allowed for each object type we know about in its ==== //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#11 (text+ko) ==== @@ -129,7 +129,12 @@ if (ttyvp == NULL) return (EIO); vn_lock(ttyvp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_READ(ttyvp, uio, flag, NOCRED); +#ifdef MAC + error = mac_check_vnode_read(td->td_ucred, NOCRED, ttyvp); + if (error == 0) +#endif + /* XXX: Should this NOCRED be td->td_ucred? */ + error = VOP_READ(ttyvp, uio, flag, NOCRED); VOP_UNLOCK(ttyvp, 0, td); return (error); } @@ -160,10 +165,10 @@ return (error); vn_lock(ttyvp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - /* XXX: shouldn't the cred below be td->td_ucred not NOCRED? */ - error = mac_check_vnode_op(td->td_ucred, ttyvp, MAC_OP_VNODE_WRITE); + error = mac_check_vnode_write(td->td_ucred, NOCRED, ttyvp); if (error == 0) #endif + /* XXX: Should this NOCRED be td->td_ucred? */ error = VOP_WRITE(ttyvp, uio, flag, NOCRED); VOP_UNLOCK(ttyvp, 0, td); vn_finished_write(mp); @@ -232,7 +237,7 @@ return (seltrue(dev, events, td)); #ifdef MAC vn_lock(ttyvp, LK_EXCLUSIVE | LK_RETRY, td); - error = mac_check_vnode_op(td->td_ucred, ttyvp, MAC_OP_VNODE_POLL); + error = mac_check_vnode_poll(td->td_ucred, NOCRED, ttyvp); VOP_UNLOCK(ttyvp, 0, td); if (error) return (error); ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#73 (text+ko) ==== @@ -734,8 +734,7 @@ vat.va_size = 0; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - error = mac_check_vnode_op(td->td_ucred, vp, - MAC_OP_VNODE_WRITE); + error = mac_check_vnode_write(td->td_ucred, fp->f_cred, vp); if (error == 0) #endif error = VOP_SETATTR(vp, &vat, td->td_ucred, td); @@ -2399,8 +2398,8 @@ if (vp->v_type == VDIR) error = EISDIR; #ifdef MAC - else if ((error = mac_check_vnode_op(td->td_ucred, vp, - MAC_OP_VNODE_WRITE))) {} + else if ((error = mac_check_vnode_write(td->td_ucred, NOCRED, vp) { + } #endif else if ((error = vn_writechk(vp)) == 0 && (error = VOP_ACCESS(vp, VWRITE, td->td_ucred, td)) == 0) { @@ -2457,8 +2456,8 @@ if (vp->v_type == VDIR) error = EISDIR; #ifdef MAC - else if ((error = mac_check_vnode_op(td->td_ucred, vp, - MAC_OP_VNODE_WRITE))) {} + else if ((error = mac_check_vnode_write(td->td_ucred, fp->f_cred, vp) { + } #endif else if ((error = vn_writechk(vp)) == 0) { VATTR_NULL(&vattr); @@ -3424,8 +3423,11 @@ VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); /* XXX */ #ifdef MAC - error = mac_check_vnode_op(td->td_ucred, vp, - MAC_OP_VNODE_WRITE); + /* + * We don't yet have fp->f_cred, so use td->td_ucred, which + * should be right. + */ + error = mac_check_vnode_write(td->td_ucred, td->td_ucred, vp); if (error == 0) { #endif VATTR_NULL(vap); ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#38 (text+ko) ==== @@ -400,13 +400,15 @@ auio.uio_td = td; if (rw == UIO_READ) { #ifdef MAC - error = mac_check_vnode_op(cred, vp, MAC_OP_VNODE_READ); + /* XXXMAC: we should pass in active_cred to vn_rdwr(). */ + error = mac_check_vnode_read(td->td_ucred, cred, vp); if (error == 0) #endif error = VOP_READ(vp, &auio, ioflg, cred); } else { #ifdef MAC - error = mac_check_vnode_op(cred, vp, MAC_OP_VNODE_WRITE); + /* XXXMAC: we should pass in active_cred to vn_rdwr(). */ + error = mac_check_vnode_write(td->td_ucred, cred, vp); if (error == 0) #endif error = VOP_WRITE(vp, &auio, ioflg, cred); @@ -497,7 +499,8 @@ ioflag |= sequential_heuristic(uio, fp); #ifdef MAC - error = mac_check_vnode_op(cred, vp, MAC_OP_VNODE_READ); + /* XXXMAC: We should pass active_cred into vn_read(). */ + error = mac_check_vnode_read(td->td_ucred, cred, vp); if (error == 0) #endif error = VOP_READ(vp, uio, ioflag, cred); @@ -552,7 +555,8 @@ uio->uio_offset = fp->f_offset; ioflag |= sequential_heuristic(uio, fp); #ifdef MAC - error = mac_check_vnode_op(cred, vp, MAC_OP_VNODE_WRITE); + /* XXXMAC: We should pass active_cred into vn_write(). + error = mac_check_vnode_write(td->td_ucred, cred, vp); if (error == 0) #endif error = VOP_WRITE(vp, uio, ioflag, cred); @@ -796,7 +800,8 @@ vp = (struct vnode *)fp->f_data; #ifdef MAC vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = mac_check_vnode_op(cred, vp, MAC_OP_VNODE_POLL); + /* XXXMAC: We should pass active_cred into vn_poll(). */ + error = mac_check_vnode_poll(td->td_ucred, cred, vp); VOP_UNLOCK(vp, 0, td); if (error) return (error); ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#93 (text+ko) ==== @@ -1847,6 +1847,40 @@ } static int +mac_biba_check_vnode_poll(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled || !mac_biba_revocation_enabled) + return (0); + + subj = SLOT(&active_cred->cr_label); + obj = SLOT(label); + + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + return (0); +} + +static int +mac_biba_check_vnode_read(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled || !mac_biba_revocation_enabled) + return (0); + + subj = SLOT(&active_cred->cr_label); + obj = SLOT(label); + + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + return (0); +} + +static int mac_biba_check_vnode_readdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -2131,6 +2165,23 @@ return (0); } +static int +mac_biba_check_vnode_write(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled || !mac_biba_revocation_enabled) + return (0); + + subj = SLOT(&active_cred->cr_label); + obj = SLOT(label); + + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + return (0); +} + static vm_prot_t mac_biba_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, struct label *label, int newmapping) @@ -2151,36 +2202,6 @@ return (prot); } -static int -mac_biba_check_vnode_op(struct ucred *cred, struct vnode *vp, - struct label *label, int op) -{ - struct mac_biba *subj, *obj; - - if (!mac_biba_enabled || !mac_biba_revocation_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(label); - - switch (op) { - case MAC_OP_VNODE_POLL: - case MAC_OP_VNODE_READ: - if (!mac_biba_dominate_single(obj, subj)) - return (EACCES); - return (0); - - case MAC_OP_VNODE_WRITE: - if (!mac_biba_dominate_single(subj, obj)) - return (EACCES); - return (0); - - default: - printf("mac_biba_check_vnode_op: unknown operation %d\n", op); - return (EINVAL); - } -} - static struct mac_policy_op_entry mac_biba_ops[] = { { MAC_DESTROY, @@ -2365,6 +2386,10 @@ (macop_t)mac_biba_check_vnode_lookup }, { MAC_CHECK_VNODE_OPEN, (macop_t)mac_biba_check_vnode_open }, + { MAC_CHECK_VNODE_POLL, + (macop_t)mac_biba_check_vnode_poll }, + { MAC_CHECK_VNODE_READ, + (macop_t)mac_biba_check_vnode_read }, { MAC_CHECK_VNODE_READDIR, (macop_t)mac_biba_check_vnode_readdir }, { MAC_CHECK_VNODE_READLINK, @@ -2391,10 +2416,10 @@ (macop_t)mac_biba_check_vnode_setutimes }, { MAC_CHECK_VNODE_STAT, (macop_t)mac_biba_check_vnode_stat }, + { MAC_CHECK_VNODE_WRITE, + (macop_t)mac_biba_check_vnode_write }, { MAC_CHECK_VNODE_MMAP_PERMS, (macop_t)mac_biba_check_vnode_mmap_perms }, - { MAC_CHECK_VNODE_OP, - (macop_t)mac_biba_check_vnode_op }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#76 (text+ko) ==== @@ -1803,6 +1803,40 @@ } static int +mac_mls_check_vnode_poll(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled || !mac_mls_revocation_enabled) + return (0); + + subj = SLOT(&active_cred->cr_label); + obj = SLOT(label); + + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + return (0); +} + +static int +mac_mls_check_vnode_read(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled || !mac_mls_revocation_enabled) + return (0); + + subj = SLOT(&active_cred->cr_label); + obj = SLOT(label); + + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + return (0); +} + +static int mac_mls_check_vnode_readdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -2087,6 +2121,23 @@ return (0); } +static int +mac_mls_check_vnode_write(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled || !mac_mls_revocation_enabled) + return (0); + + subj = SLOT(&active_cred->cr_label); + obj = SLOT(label); + + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + return (0); +} + static vm_prot_t mac_mls_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, struct label *label, int newmapping) @@ -2107,36 +2158,6 @@ return (prot); } -static int -mac_mls_check_vnode_op(struct ucred *cred, struct vnode *vp, - struct label *label, int op) -{ - struct mac_mls *subj, *obj; - - if (!mac_mls_enabled || !mac_mls_revocation_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(label); - - switch (op) { - case MAC_OP_VNODE_POLL: - case MAC_OP_VNODE_READ: - if (!mac_mls_dominate_single(subj, obj)) - return (EACCES); - return (0); - - case MAC_OP_VNODE_WRITE: - if (!mac_mls_dominate_single(obj, subj)) - return (EACCES); - return (0); - - default: - printf("mac_mls_check_vnode_op: unknown operation %d\n", op); - return (EINVAL); - } -} - static struct mac_policy_op_entry mac_mls_ops[] = { { MAC_DESTROY, @@ -2321,6 +2342,10 @@ (macop_t)mac_mls_check_vnode_lookup }, { MAC_CHECK_VNODE_OPEN, (macop_t)mac_mls_check_vnode_open }, + { MAC_CHECK_VNODE_POLL, + (macop_t)mac_mls_check_vnode_poll }, + { MAC_CHECK_VNODE_READ, + (macop_t)mac_mls_check_vnode_read }, { MAC_CHECK_VNODE_READDIR, (macop_t)mac_mls_check_vnode_readdir }, { MAC_CHECK_VNODE_READLINK, @@ -2347,10 +2372,10 @@ (macop_t)mac_mls_check_vnode_setutimes }, { MAC_CHECK_VNODE_STAT, (macop_t)mac_mls_check_vnode_stat }, + { MAC_CHECK_VNODE_WRITE, + (macop_t)mac_mls_check_vnode_write }, { MAC_CHECK_VNODE_MMAP_PERMS, (macop_t)mac_mls_check_vnode_mmap_perms }, - { MAC_CHECK_VNODE_OP, - (macop_t)mac_mls_check_vnode_op }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#61 (text+ko) ==== @@ -775,6 +775,22 @@ } static int +mac_none_check_vnode_poll(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + + return (0); +} + +static int +mac_none_check_vnode_read(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + + return (0); +} + +static int mac_none_check_vnode_readdir(struct ucred *cred, struct vnode *vp, struct label *dlabel) { @@ -880,6 +896,14 @@ return (0); } +static int +mac_none_check_vnode_write(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + + return (0); +} + static struct mac_policy_op_entry mac_none_ops[] = { { MAC_DESTROY, @@ -1072,6 +1096,10 @@ (macop_t)mac_none_check_vnode_lookup }, { MAC_CHECK_VNODE_OPEN, (macop_t)mac_none_check_vnode_open }, + { MAC_CHECK_VNODE_POLL, + (macop_t)mac_none_check_vnode_poll }, + { MAC_CHECK_VNODE_READ, + (macop_t)mac_none_check_vnode_read }, { MAC_CHECK_VNODE_READDIR, (macop_t)mac_none_check_vnode_readdir }, { MAC_CHECK_VNODE_READLINK, @@ -1098,6 +1126,8 @@ (macop_t)mac_none_check_vnode_setutimes }, { MAC_CHECK_VNODE_STAT, (macop_t)mac_none_check_vnode_stat }, + { MAC_CHECK_VNODE_WRITE, + (macop_t)mac_none_check_vnode_write }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#67 (text+ko) ==== @@ -115,7 +115,7 @@ int tr_operation; }; -static int mac_te_check_open_vnode(struct ucred *cred, struct vnode *vp, +static int mac_te_check_vnode_open(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode); /* @@ -1094,7 +1094,7 @@ struct label *label, mode_t flags) { - return (mac_te_check_open_vnode(cred, vp, label, flags)); + return (mac_te_check_vnode_open(cred, vp, label, flags)); } static int @@ -1246,45 +1246,7 @@ } static int -mac_te_check_vnode_op(struct ucred *cred, struct vnode *vp, - struct label *label, int op) -{ - struct mac_te *subj, *obj; - int error, te_class, te_op; - - if (!mac_te_revocation_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(label); - - te_class = MAC_TE_CLASS_FILE; - switch (op) { - case MAC_OP_VNODE_POLL: - te_op = MAC_TE_OPERATION_FILE_POLL; - break; - - case MAC_OP_VNODE_READ: - te_op = MAC_TE_OPERATION_FILE_READ; - break; - - case MAC_OP_VNODE_WRITE: - te_op = MAC_TE_OPERATION_FILE_WRITE; - break; - - default: - printf("mac_te_check_vnode_op: unknown operation %d\n", - op); - return (EINVAL); - } - - error = mac_te_check(subj, obj, MAC_TE_CLASS_FILE, te_op); - - return (error); -} - -static int -mac_te_check_open_vnode(struct ucred *cred, struct vnode *vp, +mac_te_check_vnode_open(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) { struct mac_te *subj, *obj; @@ -1353,6 +1315,44 @@ } static int +mac_te_check_vnode_poll(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + struct mac_te *subj, *obj; + int error; + + if (!mac_te_revocation_enabled) + return (0); + + subj = SLOT(&active_cred->cr_label); + obj = SLOT(label); + + error = mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_FILE_POLL); + + return (error); +} + +static int +mac_te_check_vnode_read(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + struct mac_te *subj, *obj; + int error; + + if (!mac_te_revocation_enabled) + return (0); + + subj = SLOT(&active_cred->cr_label); + obj = SLOT(label); + + error = mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_FILE_READ); + + return (error); +} + +static int mac_te_check_vnode_readdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -1563,7 +1563,7 @@ } static int -mac_te_check_stat_vnode(struct ucred *cred, struct vnode *vp, +mac_te_check_vnode_stat(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -1580,6 +1580,25 @@ } } +static int +mac_te_check_vnode_write(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + struct mac_te *subj, *obj; + int error; + + if (!mac_te_revocation_enabled) + return (0); + + subj = SLOT(&active_cred->cr_label); + obj = SLOT(label); + + error = mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_FILE_WRITE); + + return (error); +} + static void mac_te_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *filelabel) @@ -1801,7 +1820,12 @@ (macop_t)mac_te_check_vnode_getextattr }, { MAC_CHECK_VNODE_LOOKUP, (macop_t)mac_te_check_vnode_lookup }, - { MAC_CHECK_VNODE_OPEN, (macop_t)mac_te_check_open_vnode }, + { MAC_CHECK_VNODE_OPEN, + (macop_t)mac_te_check_vnode_open }, + { MAC_CHECK_VNODE_POLL, + (macop_t)mac_te_check_vnode_poll }, + { MAC_CHECK_VNODE_READ, + (macop_t)mac_te_check_vnode_read }, { MAC_CHECK_VNODE_READDIR, (macop_t)mac_te_check_vnode_readdir }, { MAC_CHECK_VNODE_READLINK, @@ -1827,13 +1851,15 @@ { MAC_CHECK_VNODE_SETUTIMES, (macop_t)mac_te_check_vnode_setutimes }, { MAC_CHECK_VNODE_STAT, - (macop_t)mac_te_check_stat_vnode }, + (macop_t)mac_te_check_vnode_stat }, + { MAC_CHECK_VNODE_WRITE, + (macop_t)mac_te_check_vnode_write }, { MAC_CHECK_VNODE_MMAP_PERMS, (macop_t)mac_te_check_vnode_mmap_perms }, - { MAC_CHECK_VNODE_OP, - (macop_t)mac_te_check_vnode_op }, - { MAC_EXTERNALIZE, (macop_t)mac_te_externalize }, - { MAC_INTERNALIZE, (macop_t)mac_te_internalize }, + { MAC_EXTERNALIZE, + (macop_t)mac_te_externalize }, + { MAC_INTERNALIZE, + (macop_t)mac_te_internalize }, { MAC_UPDATE_DEVFSDIRENT, (macop_t)mac_te_update_devfsdirent }, { MAC_UPDATE_PROCFSVNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#31 (text+ko) ==== @@ -983,6 +983,22 @@ } static int +mac_test_check_vnode_poll(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + + return (0); +} + +static int +mac_test_check_vnode_read(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + + return (0); +} + +static int mac_test_check_vnode_readdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -1088,6 +1104,14 @@ return (0); } +static int +mac_test_check_vnode_write(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) +{ + + return (0); +} + static struct mac_policy_op_entry mac_test_ops[] = { { MAC_DESTROY, @@ -1278,6 +1302,10 @@ (macop_t)mac_test_check_vnode_lookup }, { MAC_CHECK_VNODE_OPEN, (macop_t)mac_test_check_vnode_open }, + { MAC_CHECK_VNODE_POLL, + (macop_t)mac_test_check_vnode_poll }, + { MAC_CHECK_VNODE_READ, + (macop_t)mac_test_check_vnode_read }, { MAC_CHECK_VNODE_READDIR, (macop_t)mac_test_check_vnode_readdir }, { MAC_CHECK_VNODE_READLINK, @@ -1304,6 +1332,8 @@ (macop_t)mac_test_check_vnode_setutimes }, { MAC_CHECK_VNODE_STAT, (macop_t)mac_test_check_vnode_stat }, + { MAC_CHECK_VNODE_WRITE, + (macop_t)mac_test_check_vnode_write }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#143 (text+ko) ==== @@ -357,9 +357,12 @@ /* XXX This u_char should be vm_prot_t! */ u_char mac_check_vnode_mmap_prot(struct ucred *cred, struct vnode *vp, int newmapping); -int mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op); int mac_check_vnode_open(struct ucred *cred, struct vnode *vp, mode_t acc_mode); +int mac_check_vnode_poll(struct ucred *active_cred, + struct ucred *saved_cred, struct vnode *vp, struct label *label); +int mac_check_vnode_read(struct ucred *active_cred, + struct ucred *saved_cred, struct vnode *vp, struct label *label); int mac_check_vnode_readdir(struct ucred *cred, struct vnode *vp); int mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp); int mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, @@ -392,6 +395,8 @@ struct mac *extmac); int mac_pipe_label_set(struct ucred *cred, struct pipe *pipe, struct label *label); +int mac_check_vnode_write(struct ucred *active_cred, + struct ucred *saved_cred, struct vnode *vp, struct label *label); /* * Calls to help various file systems implement labeling functionality ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#108 (text+ko) ==== @@ -291,10 +291,14 @@ struct componentname *cnp); vm_prot_t (*mpo_check_vnode_mmap_perms)(struct ucred *cred, struct vnode *vp, struct label *label, int newmapping); - int (*mpo_check_vnode_op)(struct ucred *cred, struct vnode *vp, - struct label *label, int op); int (*mpo_check_vnode_open)(struct ucred *cred, struct vnode *vp, struct label *label, mode_t acc_mode); + int (*mpo_check_vnode_poll)(struct ucred *active_cred, + struct ucred *saved_cred, struct vnode *vp, + struct label *label); + int (*mpo_check_vnode_read)(struct ucred *active_cred, + struct ucred *saved_cred, struct vnode *vp, + struct label *label); int (*mpo_check_vnode_readdir)(struct ucred *cred, struct vnode *dvp, struct label *dlabel); int (*mpo_check_vnode_readlink)(struct ucred *cred, @@ -329,6 +333,9 @@ struct timespec atime, struct timespec mtime); int (*mpo_check_vnode_stat)(struct ucred *cred, struct vnode *vp, struct label *label); + int (*mpo_check_vnode_write)(struct ucred *active_cred, + struct ucred *saved_cred, struct vnode *vp, + struct label *label); }; typedef const void *macop_t; @@ -431,9 +438,10 @@ MAC_CHECK_VNODE_GETACL, MAC_CHECK_VNODE_GETEXTATTR, MAC_CHECK_VNODE_LOOKUP, - MAC_CHECK_VNODE_OP, + MAC_CHECK_VNODE_MMAP_PERMS, MAC_CHECK_VNODE_OPEN, - MAC_CHECK_VNODE_MMAP_PERMS, + MAC_CHECK_VNODE_POLL, + MAC_CHECK_VNODE_READ, MAC_CHECK_VNODE_READDIR, MAC_CHECK_VNODE_READLINK, MAC_CHECK_VNODE_RELABEL, @@ -447,6 +455,7 @@ MAC_CHECK_VNODE_SETOWNER, MAC_CHECK_VNODE_SETUTIMES, MAC_CHECK_VNODE_STAT, + MAC_CHECK_VNODE_WRITE, }; struct mac_policy_op_entry { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 6 10:33:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55AE837B401; Tue, 6 Aug 2002 10:32:03 -0700 (PDT) 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 06FE137B400 for ; Tue, 6 Aug 2002 10:32:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 032F443E6A for ; Tue, 6 Aug 2002 10:32:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g76HW1JU082877 for ; Tue, 6 Aug 2002 10:32:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g76HVsPB082860 for perforce@freebsd.org; Tue, 6 Aug 2002 10:31:54 -0700 (PDT) Date: Tue, 6 Aug 2002 10:31:54 -0700 (PDT) Message-Id: <200208061731.g76HVsPB082860@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15618 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15618 Change 15618 by rwatson@rwatson_tislabs on 2002/08/06 10:31:29 IFC main tree into TrustedBSD base tree to trickle back in additional MAC changes, etc. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#20 integrate .. //depot/projects/trustedbsd/base/bin/Makefile#4 integrate .. //depot/projects/trustedbsd/base/bin/chmod/chmod.1#4 integrate .. //depot/projects/trustedbsd/base/bin/chmod/chmod.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_lib.c#3 integrate .. //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/100.chksetuid#3 integrate .. //depot/projects/trustedbsd/base/include/Makefile#12 integrate .. //depot/projects/trustedbsd/base/include/fmtmsg.h#1 branch .. //depot/projects/trustedbsd/base/include/wchar.h#4 integrate .. //depot/projects/trustedbsd/base/include/wctype.h#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/hpropd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-master/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-slave/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/k5admind/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/k5passwdd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/kdc/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5admin/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5destroy/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5init/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5list/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5passwd/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5su/Makefile#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.sbin/k5stash/Makefile#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.sbin/ktutil/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#8 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat22/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/compat/compat22/libc.so.3.1.bz2.uu#1 branch .. //depot/projects/trustedbsd/base/lib/compat/compat22/libc.so.3.1.gz.uu#2 delete .. //depot/projects/trustedbsd/base/lib/compat/compat22/libc_r.so.3.0.bz2.uu#1 branch .. //depot/projects/trustedbsd/base/lib/compat/compat22/libc_r.so.3.0.gz.uu#2 delete .. //depot/projects/trustedbsd/base/lib/libc/gen/Makefile.inc#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/err.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fmtmsg.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/fmtmsg.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/btowc.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/btowc.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/iswalnum.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/iswctype.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/ldpart.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/multibyte.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/rune.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/setlocale.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/setlocale.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/setrunelocale.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/towlower.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wctob.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wctrans.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wctrans.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wctype.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wctype.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/nls/msgcat.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_biba.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_free.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_free.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_get.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_get.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_internal.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_is_present_np.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_is_present_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_mls.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_sebsd.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_set.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_set.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_te.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_text.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_text.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/calloc.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.c#1 branch .. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.h#1 branch .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#9 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#3 integrate .. //depot/projects/trustedbsd/base/release/Makefile#17 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#35 integrate .. //depot/projects/trustedbsd/base/release/i386/dokern.sh#6 integrate .. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#8 integrate .. //depot/projects/trustedbsd/base/sbin/init/init.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mntopts.h#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount_ufs.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount_cd9660/mount_cd9660.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount_ext2fs/mount_ext2fs.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/mount_hpfs/mount_hpfs.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/mount_ntfs/mount_ntfs.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nullfs/mount_nullfs.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nwfs/mount_nwfs.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/mount_portalfs/mount_portalfs.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount_std/mount_std.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/mount_udf/mount_udf.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount_umapfs/mount_umapfs.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/mount_unionfs/mount_unionfs.c#5 integrate .. //depot/projects/trustedbsd/base/share/examples/drivers/make_device_driver.sh#3 integrate .. //depot/projects/trustedbsd/base/share/examples/drivers/make_pseudo_driver.sh#3 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#12 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#11 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#6 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#6 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#8 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#13 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/pmap.h#6 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/imgact_osf1.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_namecache.c#3 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_subr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/coda/coda_vfsops.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_getcwd.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/trustedbsd/base/sys/compat/pecoff/imgact_pecoff.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/imgact_svr4.c#5 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#28 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#15 integrate .. //depot/projects/trustedbsd/base/sys/conf/majors#6 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/null/null.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sab/sab.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sab/sab82532reg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sbni/if_sbni_isa.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sbni/if_sbni_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sbni/if_sbnivar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/se/se_console.c#2 delete .. //depot/projects/trustedbsd/base/sys/dev/se/sereg.h#2 delete .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wavelan_ieee.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wireg.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/spectrum24t_cf.h#1 branch .. //depot/projects/trustedbsd/base/sys/fs/deadfs/dead_vnops.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vfsops.c#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vfsops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vfsops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_denode.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/ntfs/ntfs_vfsops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vfsops.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_node.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/base/sys/fs/portalfs/portal_vfsops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/portalfs/portal_vnops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vncache.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_node.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vfsops.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/specfs/spec_vnops.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/umapfs/umap_vfsops.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_subr.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vnops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/OLDCARD#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/elan-mmcr.c#1 branch .. //depot/projects/trustedbsd/base/sys/i386/i386/mem.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#16 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/imgact_coff.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/cputypes.h#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/md_var.h#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/pmap.h#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/imgact_linux.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#6 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#17 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vfsops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_aout.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_elf.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_poll.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_sem.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_cache.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_lookup.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#20 integrate .. //depot/projects/trustedbsd/base/sys/modules/mii/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/wi/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_debug.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6.c#6 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#11 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vnops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_serv.c#12 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_mn.c#2 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#11 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#7 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap.c#10 integrate .. //depot/projects/trustedbsd/base/sys/security/lomac/kernel_interface.c#4 integrate .. //depot/projects/trustedbsd/base/sys/security/lomac/kernel_util.c#7 integrate .. //depot/projects/trustedbsd/base/sys/security/lomac/lomacfs_subr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/lomac/lomacfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/lomac/lomacfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#14 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#19 integrate .. //depot/projects/trustedbsd/base/sys/sys/linker.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/pioctl.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/queue.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#19 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_alloc.c#12 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_inode.c#9 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#9 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#12 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extattr.c#11 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_quota.c#9 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#12 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_contig.c#6 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#13 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#15 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_swap.c#7 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.holiday#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/alpha-fbsd.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/extern.h#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/i386-fbsd.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/i386-linux.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/main.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/setup.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/sparc64-fbsd.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/truss/syscall.h#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/syscalls.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/truss.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/truss.h#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cron/lib/misc.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchgen/crunched_main.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mergemaster/mergemaster.sh#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/add/extract.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/perform.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/create/pkg_create.1#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/file.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ugidfw/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/ugidfw/ugidfw.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/wicontrol/wicontrol.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.298 2002/07/31 03:56:03 jhb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.300 2002/08/05 08:54:26 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -126,11 +126,16 @@ TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} -TARGET_CPUTYPE?= ${CPUTYPE} +TARGET_CPUTYPE?=${CPUTYPE} .else TARGET?= ${TARGET_ARCH} TARGET_CPUTYPE?= .endif +_CPUTYPE!= cd ${.CURDIR}; ${MAKE} -m ${.CURDIR}/share/mk \ + CPUTYPE=X${TARGET_CPUTYPE} -V CPUTYPE +.if ${_CPUTYPE} != X${TARGET_CPUTYPE} +.error CPUTYPE global should be set with ?=. +.endif .if make(buildworld) BUILD_ARCH!= sysctl -n hw.machine_arch .if ${MACHINE_ARCH} != ${BUILD_ARCH} @@ -175,6 +180,7 @@ CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ MACHINE_ARCH=${TARGET_ARCH} \ MACHINE=${TARGET} \ + CPUTYPE=${TARGET_CPUTYPE} \ OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \ GROFF_BIN_PATH=${WORLDTMP}/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \ @@ -476,7 +482,7 @@ .endif cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KRNLSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} -DBOOTSTRAPPING -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile + ${MAKE} -DNO_CPU_CFLAGS -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile .if !defined(NO_KERNELDEPEND) cd ${KRNLOBJDIR}/${_kernel}; \ ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend ==== //depot/projects/trustedbsd/base/bin/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.20 2002/04/09 18:25:37 bmilekic Exp $ +# $FreeBSD: src/bin/Makefile,v 1.21 2002/08/02 10:55:51 markm Exp $ SUBDIR= cat \ chio \ @@ -40,7 +40,7 @@ SUBDIR+=csh .endif -.if !defined(NO_SENDMAIL) && !defined(NOUUCP) +.if !defined(NO_SENDMAIL) SUBDIR+=rmail .endif ==== //depot/projects/trustedbsd/base/bin/chmod/chmod.1#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.29 2002/07/12 01:57:44 keramida Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.30 2002/08/04 05:29:13 obrien Exp $ .\" .Dd March 31, 1994 .Dt CHMOD 1 @@ -86,7 +86,10 @@ .It Fl v Cause .Nm -to be verbose, showing files as the mode is modified. +to be verbose, showing filenames as the mode is modified. If the +.Fl v +flag is specified more than once, the old and new modes of the file +will also be printed, in both octal and symbolic notation. .El .Pp The ==== //depot/projects/trustedbsd/base/bin/chmod/chmod.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.26 2002/07/10 20:36:25 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.27 2002/08/04 05:29:13 obrien Exp $"); #include #include @@ -121,7 +121,7 @@ --optind; goto done; case 'v': - vflag = 1; + vflag++; break; case '?': default: @@ -208,8 +208,24 @@ warn("%s", p->fts_path); rval = 1; } else { - if (vflag) - (void)printf("%s\n", p->fts_accpath); + if (vflag) { + (void)printf("%s", p->fts_accpath); + + if (vflag > 1) { + char m1[12], m2[12]; + + strmode(p->fts_statp->st_mode, m1); + strmode((p->fts_statp->st_mode & + S_IFMT) | newmode, m2); + + (void)printf(": 0%o [%s] -> 0%o [%s]", + p->fts_statp->st_mode, m1, + (p->fts_statp->st_mode & S_IFMT) | + newmode, m2); + } + (void)printf("\n"); + } + } } if (errno) ==== //depot/projects/trustedbsd/base/crypto/openssh/session.c#11 (text+ko) ==== @@ -34,7 +34,7 @@ #include "includes.h" RCSID("$OpenBSD: session.c,v 1.142 2002/06/26 13:49:26 deraadt Exp $"); -RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.35 2002/07/26 02:20:00 ache Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.36 2002/08/05 16:06:35 ache Exp $"); #include "ssh.h" #include "ssh1.h" @@ -1288,6 +1288,9 @@ const char *shell, *shell0, *hostname = NULL; struct passwd *pw = s->pw; u_int i; +#ifdef HAVE_LOGIN_CAP + int lc_requirehome; +#endif /* remove hostkey from the child's memory */ destroy_sensitive_data(); @@ -1346,6 +1349,10 @@ /* XXX better use close-on-exec? -markus */ channel_close_all(); +#ifdef HAVE_LOGIN_CAP + lc_requirehome = login_getcapbool(lc, "requirehome", 0); + login_close(lc); +#endif /* * Close any extra file descriptors. Note that there may still be * descriptors left by system functions. They will be closed later. @@ -1384,7 +1391,7 @@ fprintf(stderr, "Could not chdir to home directory %s: %s\n", pw->pw_dir, strerror(errno)); #ifdef HAVE_LOGIN_CAP - if (login_getcapbool(lc, "requirehome", 0)) + if (lc_requirehome) exit(1); #endif } ==== //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_lib.c#3 (text+ko) ==== @@ -124,7 +124,7 @@ (int)(omax+ *pp)); #endif - if (*plength > (omax - (*pp - p))) + if (*plength > (omax - (p - *pp))) { ASN1err(ASN1_F_ASN1_GET_OBJECT,ASN1_R_TOO_LONG); /* Set this so that even if things are not long enough ==== //depot/projects/trustedbsd/base/etc/etc.sparc64/ttys#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.2 2002/04/17 10:42:41 gerald Exp $ +# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.3 2002/08/04 19:16:13 jake Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -46,6 +46,8 @@ #ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. +ttya "/usr/libexec/getty local.9600" dialup off secure +ttyb "/usr/libexec/getty local.9600" dialup off secure ttyd0 "/usr/libexec/getty std.9600" dialup off secure ttyd1 "/usr/libexec/getty std.9600" dialup off secure ttyd2 "/usr/libexec/getty std.9600" dialup off secure ==== //depot/projects/trustedbsd/base/etc/periodic/security/100.chksetuid#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.3 2002/05/17 11:34:12 brian Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.4 2002/08/03 22:33:34 gshapiro Exp $ # # If there is a global system configuration file, suck it in. @@ -45,14 +45,17 @@ echo 'Checking setuid files and devices:' # XXX Note that there is the possibility of overrunning the args to ls MP=`mount -t ufs | grep -v " nosuid" | awk '{ print $3 }' | sort` - set ${MP} - while [ $# -ge 1 ]; do - mount=$1 - shift - find $mount -xdev -type f \ - \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \ - \( -perm -u+s -or -perm -g+s \) -print0 - done | xargs -0 -n 20 ls -liTd | sed 's/^ *//' | sort +10 > ${TMP} + if [ -n "${MP}" ] + then + set ${MP} + while [ $# -ge 1 ]; do + mount=$1 + shift + find $mount -xdev -type f \ + \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \ + \( -perm -u+s -or -perm -g+s \) -print0 + done | xargs -0 -n 20 ls -liTd | sed 's/^ *//' | sort +10 > ${TMP} + fi if [ ! -f ${LOG}/setuid.today ]; then rc=1 ==== //depot/projects/trustedbsd/base/include/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.172 2002/08/01 07:18:38 mike Exp $ +# $FreeBSD: src/include/Makefile,v 1.174 2002/08/05 06:49:58 mike Exp $ # # Doing a make install builds /usr/include # @@ -10,7 +10,7 @@ SUBDIR= arpa protocols rpcsvc rpc INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h db.h \ dirent.h \ - dlfcn.h elf.h elf-hints.h err.h fnmatch.h fstab.h \ + dlfcn.h elf.h elf-hints.h err.h fnmatch.h fmtmsg.h fstab.h \ fts.h glob.h grp.h \ hesiod.h histedit.h ieeefp.h ifaddrs.h inttypes.h iso646.h kenv.h \ langinfo.h \ @@ -39,8 +39,8 @@ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ - security/lomac \ - ufs/ffs ufs/ufs + security/lomac security/mac_biba security/mac_bsdextended \ + security/mac_mls ufs/ffs ufs/ufs # For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/* # are taken care of ==== //depot/projects/trustedbsd/base/include/wchar.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.5 2002/07/09 05:13:30 obrien Exp $ + * $FreeBSD: src/include/wchar.h,v 1.10 2002/08/06 06:26:06 tjr Exp $ */ /*- @@ -73,6 +73,16 @@ #define NULL 0 #endif +#ifdef _BSD_MBSTATE_T_ +typedef _BSD_MBSTATE_T_ mbstate_t; +#undef _BSD_MBSTATE_T_ +#endif + +#ifdef _BSD_SIZE_T_ +typedef _BSD_SIZE_T_ size_t; +#undef _BSD_SIZE_T_ +#endif + #ifndef __cplusplus #ifdef _BSD_WCHAR_T_ typedef _BSD_WCHAR_T_ wchar_t; @@ -80,9 +90,9 @@ #endif #endif -#ifdef _BSD_MBSTATE_T_ -typedef _BSD_MBSTATE_T_ mbstate_t; -#undef _BSD_MBSTATE_T_ +#ifndef _WCTYPE_T +typedef unsigned long wctype_t; +#define _WCTYPE_T #endif #ifdef _BSD_WINT_T_ @@ -90,16 +100,12 @@ #undef _BSD_WINT_T_ #endif -#ifdef _BSD_SIZE_T_ -typedef _BSD_SIZE_T_ size_t; -#undef _BSD_SIZE_T_ -#endif - #ifndef WEOF #define WEOF ((wint_t)-1) #endif __BEGIN_DECLS +wint_t btowc(int); #if 0 /* XXX: not implemented */ size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict); @@ -115,6 +121,8 @@ int wcscmp(const wchar_t *, const wchar_t *); wchar_t *wcscpy(wchar_t * __restrict, const wchar_t * __restrict); size_t wcscspn(const wchar_t *, const wchar_t *); +size_t wcslcat(wchar_t *, const wchar_t *, size_t); +size_t wcslcpy(wchar_t *, const wchar_t *, size_t); size_t wcslen(const wchar_t *); wchar_t *wcsncat(wchar_t * __restrict, const wchar_t * __restrict, size_t); @@ -129,19 +137,17 @@ #endif size_t wcsspn(const wchar_t *, const wchar_t *); wchar_t *wcsstr(const wchar_t *, const wchar_t *); +#if 0 +/* XXX: not implemented */ +int wcswidth(const wchar_t *, size_t); +int wcwidth(wchar_t); +#endif +int wctob(wint_t); wchar_t *wmemchr(const wchar_t *, wchar_t, size_t); int wmemcmp(const wchar_t *, const wchar_t *, size_t); wchar_t *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t); wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t); wchar_t *wmemset(wchar_t *, wchar_t, size_t); - -size_t wcslcat(wchar_t *, const wchar_t *, size_t); -size_t wcslcpy(wchar_t *, const wchar_t *, size_t); -#if 0 -/* XXX: not implemented */ -int wcswidth(const wchar_t *, size_t); -int wcwidth(wchar_t); -#endif __END_DECLS #endif /* !_WCHAR_H_ */ ==== //depot/projects/trustedbsd/base/include/wctype.h#3 (text+ko) ==== @@ -25,17 +25,27 @@ * * citrus Id: wctype.h,v 1.4 2000/12/21 01:50:21 itojun Exp * $NetBSD: wctype.h,v 1.3 2000/12/22 14:16:16 itojun Exp $ - * $FreeBSD: src/include/wctype.h,v 1.4 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/wctype.h,v 1.9 2002/08/06 05:19:33 tjr Exp $ */ -#if 0 -/* XXX: not implemented */ #ifndef _WCTYPE_H_ #define _WCTYPE_H_ #include #include +#include + +#ifndef _WCTRANS_T +typedef int wctrans_t; +#define _WCTRANS_T +#endif + +#ifndef _WCTYPE_T +typedef unsigned long wctype_t; +#define _WCTYPE_T +#endif + #ifdef _BSD_WINT_T_ typedef _BSD_WINT_T_ wint_t; #undef _BSD_WINT_T_ @@ -50,6 +60,7 @@ int iswalpha(wint_t); int iswblank(wint_t); int iswcntrl(wint_t); +int iswctype(wint_t, wctype_t); int iswdigit(wint_t); int iswgraph(wint_t); int iswlower(wint_t); @@ -58,9 +69,49 @@ int iswspace(wint_t); int iswupper(wint_t); int iswxdigit(wint_t); +wint_t towctrans(wint_t, wctrans_t); wint_t towlower(wint_t); wint_t towupper(wint_t); +wctrans_t + wctrans(const char *); +wctype_t + wctype(const char *); + +#if __BSD_VISIBLE +wint_t iswascii(wint_t); +wint_t iswhexnumber(wint_t); +wint_t iswideogram(wint_t); +wint_t iswnumber(wint_t); +wint_t iswphonogram(wint_t); +wint_t iswrune(wint_t); +wint_t iswspecial(wint_t); +#endif __END_DECLS +#define iswalnum(wc) __istype((wc), _CTYPE_A|_CTYPE_D) +#define iswalpha(wc) __istype((wc), _CTYPE_A) +#define iswblank(wc) __istype((wc), _CTYPE_B) +#define iswcntrl(wc) __istype((wc), _CTYPE_C) +#define iswctype(wc, charclass) __istype((wc), (charclass)) +#define iswdigit(wc) __istype((wc), _CTYPE_D) +#define iswgraph(wc) __istype((wc), _CTYPE_G) +#define iswlower(wc) __istype((wc), _CTYPE_L) +#define iswprint(wc) __istype((wc), _CTYPE_R) +#define iswpunct(wc) __istype((wc), _CTYPE_P) +#define iswspace(wc) __istype((wc), _CTYPE_S) +#define iswupper(wc) __istype((wc), _CTYPE_U) +#define iswxdigit(wc) __istype((wc), _CTYPE_X) +#define towlower(wc) __tolower(wc) +#define towupper(wc) __toupper(wc) + +#if __BSD_VISIBLE +#define iswascii(wc) (((wc) & ~0x7F) == 0) +#define iswhexnumber(wc) __istype((wc), _CTYPE_X) +#define iswideogram(wc) __istype((wc), _CTYPE_I) +#define iswnumber(wc) __istype((wc), _CTYPE_D) +#define iswphonogram(wc) __istype((wc), _CTYPE_Q) +#define iswrune(wc) __istype((wc), 0xFFFFFF00L) +#define iswspecial(wc) __istype((wc), _CTYPE_T) +#endif + #endif /* _WCTYPE_H_ */ -#endif ==== //depot/projects/trustedbsd/base/kerberos5/libexec/hpropd/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.7 2002/04/26 17:55:22 ru Exp $ +# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.8 2002/08/04 22:23:46 fjoe Exp $ PROG= hpropd SRCS= hpropd.c hprop.h hdb_err.h @@ -20,9 +20,9 @@ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN= hpropd.8 .include ==== //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-master/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.6 2002/04/26 17:55:22 ru Exp $ +# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.7 2002/08/04 22:23:46 fjoe Exp $ PROG= ipropd-master SRCS= ipropd_master.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h @@ -21,9 +21,9 @@ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} NOMAN= yes .include ==== //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-slave/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.6 2002/04/26 17:55:22 ru Exp $ +# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.7 2002/08/04 22:23:46 fjoe Exp $ PROG= ipropd-slave SRCS= ipropd_slave.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h @@ -21,9 +21,9 @@ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} NOMAN= yes .include ==== //depot/projects/trustedbsd/base/kerberos5/libexec/k5admind/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/k5admind/Makefile,v 1.7 2002/04/26 17:55:23 ru Exp $ +# $FreeBSD: src/kerberos5/libexec/k5admind/Makefile,v 1.8 2002/08/04 22:23:47 fjoe Exp $ PROG= k5admind SRCS= kadmind.c server.c kadm_conn.c \ @@ -25,10 +25,10 @@ ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} NOMAN= yes .include ==== //depot/projects/trustedbsd/base/kerberos5/libexec/k5passwdd/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/k5passwdd/Makefile,v 1.8 2002/04/26 17:55:23 ru Exp $ +# $FreeBSD: src/kerberos5/libexec/k5passwdd/Makefile,v 1.9 2002/08/04 22:23:47 fjoe Exp $ PROG= k5passwdd SRCS= kpasswdd.c krb5_err.h heim_err.h hdb_err.h \ @@ -21,9 +21,9 @@ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ -L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN= kpasswdd.8 .include ==== //depot/projects/trustedbsd/base/kerberos5/libexec/kdc/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.8 2002/04/26 17:55:23 ru Exp $ +# $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.9 2002/08/04 22:23:47 fjoe Exp $ PROG= kdc SRCS= \ @@ -29,9 +29,9 @@ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN= kdc.8 .include ==== //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5admin/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/k5admin/Makefile,v 1.8 2002/07/03 14:31:52 markm Exp $ +# $FreeBSD: src/kerberos5/usr.bin/k5admin/Makefile,v 1.9 2002/08/04 22:23:47 fjoe Exp $ PROG= k5admin SRCS= \ @@ -43,11 +43,11 @@ ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lmd -lcom_err \ + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \ -L${SLOBJDIR} -lsl -lreadline DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMD} ${LIBCOM_ERR} \ + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ ${LIBSL} ${LIBREADLINE} MAN= k5admin.8 ==== //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5destroy/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/k5destroy/Makefile,v 1.8 2002/04/26 17:55:24 ru Exp $ +# $FreeBSD: src/kerberos5/usr.bin/k5destroy/Makefile,v 1.9 2002/08/04 22:23:47 fjoe Exp $ PROG= k5destroy SRCS= kdestroy.c krb5_err.h heim_err.h k524_err.h @@ -18,9 +18,9 @@ -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include ==== //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5init/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/k5init/Makefile,v 1.8 2002/04/26 17:55:24 ru Exp $ +# $FreeBSD: src/kerberos5/usr.bin/k5init/Makefile,v 1.9 2002/08/04 22:23:47 fjoe Exp $ PROG= k5init SRCS= kinit.c asn1_err.h krb5_err.h heim_err.h \ @@ -19,9 +19,9 @@ -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include ==== //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5list/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/k5list/Makefile,v 1.8 2002/04/26 17:55:25 ru Exp $ +# $FreeBSD: src/kerberos5/usr.bin/k5list/Makefile,v 1.9 2002/08/04 22:23:48 fjoe Exp $ PROG= k5list SRCS= klist.c krb5_err.h heim_err.h k524_err.h @@ -18,9 +18,9 @@ -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include ==== //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5passwd/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/k5passwd/Makefile,v 1.8 2002/04/26 17:55:25 ru Exp $ +# $FreeBSD: src/kerberos5/usr.bin/k5passwd/Makefile,v 1.9 2002/08/04 22:23:48 fjoe Exp $ PROG= k5passwd SRCS= kpasswd.c krb5_err.h heim_err.h k524_err.h @@ -16,9 +16,9 @@ LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include ==== //depot/projects/trustedbsd/base/kerberos5/usr.bin/k5su/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/k5su/Makefile,v 1.6 2002/05/12 03:17:21 nectar Exp $ +# $FreeBSD: src/kerberos5/usr.bin/k5su/Makefile,v 1.7 2002/08/04 22:23:48 fjoe Exp $ PROG= k5su SRCS= su.c asn1_err.h krb5_err.h heim_err.h k524_err.h @@ -19,9 +19,9 @@ -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 6 11:14: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACF2F37B401; Tue, 6 Aug 2002 11:13:53 -0700 (PDT) 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 68DD937B400 for ; Tue, 6 Aug 2002 11:13:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 234C443E7B for ; Tue, 6 Aug 2002 11:13:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g76IDrJU094177 for ; Tue, 6 Aug 2002 11:13:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g76IDqqb094174 for perforce@freebsd.org; Tue, 6 Aug 2002 11:13:52 -0700 (PDT) Date: Tue, 6 Aug 2002 11:13:52 -0700 (PDT) Message-Id: <200208061813.g76IDqqb094174@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15620 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15620 Change 15620 by rwatson@rwatson_tislabs on 2002/08/06 11:13:22 Various fixes from last submit. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#228 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#74 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#228 (text+ko) ==== @@ -1744,7 +1744,7 @@ ASSERT_VOP_LOCKED(vp, "mac_check_vnode_poll"); - error = vn_refreshlabel(vp, cred); + error = vn_refreshlabel(vp, active_cred); if (error) return (error); @@ -1764,7 +1764,7 @@ ASSERT_VOP_LOCKED(vp, "mac_check_vnode_read"); - error = vn_refreshlabel(vp, cred); + error = vn_refreshlabel(vp, active_cred); if (error) return (error); @@ -2036,7 +2036,7 @@ ASSERT_VOP_LOCKED(vp, "mac_check_vnode_write"); - error = vn_refreshlabel(vp, cred); + error = vn_refreshlabel(vp, active_cred); if (error) return (error); ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#74 (text+ko) ==== @@ -2398,7 +2398,7 @@ if (vp->v_type == VDIR) error = EISDIR; #ifdef MAC - else if ((error = mac_check_vnode_write(td->td_ucred, NOCRED, vp) { + else if ((error = mac_check_vnode_write(td->td_ucred, NOCRED, vp))) { } #endif else if ((error = vn_writechk(vp)) == 0 && @@ -2456,7 +2456,8 @@ if (vp->v_type == VDIR) error = EISDIR; #ifdef MAC - else if ((error = mac_check_vnode_write(td->td_ucred, fp->f_cred, vp) { + else if ((error = mac_check_vnode_write(td->td_ucred, fp->f_cred, + vp))) { } #endif else if ((error = vn_writechk(vp)) == 0) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 6 11:14: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15DBE37B400; Tue, 6 Aug 2002 11:13:55 -0700 (PDT) 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 BF6EF37B409 for ; Tue, 6 Aug 2002 11:13:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77A6343E42 for ; Tue, 6 Aug 2002 11:13:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g76IDrJU094184 for ; Tue, 6 Aug 2002 11:13:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g76IDr2U094181 for perforce@freebsd.org; Tue, 6 Aug 2002 11:13:53 -0700 (PDT) Date: Tue, 6 Aug 2002 11:13:53 -0700 (PDT) Message-Id: <200208061813.g76IDr2U094181@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15621 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15621 Change 15621 by rwatson@rwatson_tislabs on 2002/08/06 11:13:41 Fix prototypes for exposed vnode check calls to not include labels. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#144 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#144 (text+ko) ==== @@ -360,9 +360,9 @@ int mac_check_vnode_open(struct ucred *cred, struct vnode *vp, mode_t acc_mode); int mac_check_vnode_poll(struct ucred *active_cred, - struct ucred *saved_cred, struct vnode *vp, struct label *label); + struct ucred *saved_cred, struct vnode *vp); int mac_check_vnode_read(struct ucred *active_cred, - struct ucred *saved_cred, struct vnode *vp, struct label *label); + struct ucred *saved_cred, struct vnode *vp); int mac_check_vnode_readdir(struct ucred *cred, struct vnode *vp); int mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp); int mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, @@ -396,7 +396,7 @@ int mac_pipe_label_set(struct ucred *cred, struct pipe *pipe, struct label *label); int mac_check_vnode_write(struct ucred *active_cred, - struct ucred *saved_cred, struct vnode *vp, struct label *label); + struct ucred *saved_cred, struct vnode *vp); /* * Calls to help various file systems implement labeling functionality To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 6 11:16: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20ABA37B401; Tue, 6 Aug 2002 11:15:57 -0700 (PDT) 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 C22E237B400 for ; Tue, 6 Aug 2002 11:15:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7559343E70 for ; Tue, 6 Aug 2002 11:15:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g76IFuJU094401 for ; Tue, 6 Aug 2002 11:15:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g76IFuO8094398 for perforce@freebsd.org; Tue, 6 Aug 2002 11:15:56 -0700 (PDT) Date: Tue, 6 Aug 2002 11:15:56 -0700 (PDT) Message-Id: <200208061815.g76IFuO8094398@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15622 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15622 Change 15622 by rwatson@rwatson_tislabs on 2002/08/06 11:15:09 Missing comment close. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#39 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#39 (text+ko) ==== @@ -555,7 +555,7 @@ uio->uio_offset = fp->f_offset; ioflag |= sequential_heuristic(uio, fp); #ifdef MAC - /* XXXMAC: We should pass active_cred into vn_write(). + /* XXXMAC: We should pass active_cred into vn_write(). */ error = mac_check_vnode_write(td->td_ucred, cred, vp); if (error == 0) #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 6 13: 1:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D25237B401; Tue, 6 Aug 2002 13:01:15 -0700 (PDT) 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 A4A8037B400 for ; Tue, 6 Aug 2002 13:01:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61EE043E4A for ; Tue, 6 Aug 2002 13:01:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g76K1EJU009985 for ; Tue, 6 Aug 2002 13:01:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g76K1E6X009982 for perforce@freebsd.org; Tue, 6 Aug 2002 13:01:14 -0700 (PDT) Date: Tue, 6 Aug 2002 13:01:14 -0700 (PDT) Message-Id: <200208062001.g76K1E6X009982@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15626 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15626 Change 15626 by rwatson@rwatson_tislabs on 2002/08/06 13:00:34 Introduce module dependencies to prevent MAC modules from getting loaded with a kernel that doesn't support MAC. Largely the evil of: peter Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#229 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#109 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#229 (text+ko) ==== @@ -87,6 +87,13 @@ #ifdef MAC +/* + * Declare that the kernel provides MAC support, version 1. This permits + * modules to refuse to be loaded if the necessary support isn't present, + * even if it's pre-boot. + */ +MODULE_VERSION(kernel_mac_support, 1); + SYSCTL_DECL(_security); SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#109 (text+ko) ==== @@ -496,6 +496,7 @@ mac_policy_modevent, \ &mpname##_mac_policy_conf \ }; \ + MODULE_DEPEND(mpname, kernel_mac_support, 1, 1, 1); \ DECLARE_MODULE(mpname, mpname##_mod, SI_SUB_MAC_POLICY, \ SI_ORDER_MIDDLE) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 6 14:45:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBA7D37B401; Tue, 6 Aug 2002 14:45:20 -0700 (PDT) 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 7AB9937B400 for ; Tue, 6 Aug 2002 14:45:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 376FA43E5E for ; Tue, 6 Aug 2002 14:45:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g76LjKJU027307 for ; Tue, 6 Aug 2002 14:45:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g76LjJik027304 for perforce@freebsd.org; Tue, 6 Aug 2002 14:45:19 -0700 (PDT) Date: Tue, 6 Aug 2002 14:45:19 -0700 (PDT) Message-Id: <200208062145.g76LjJik027304@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15628 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15628 Change 15628 by rwatson@rwatson_tislabs on 2002/08/06 14:44:22 Temporarily disable the checks in vn_rdwr() since they appear to cause problems when the active_cred is used rather than the saved_cred during NFS mounting. I'll debug this more later. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#40 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#40 (text+ko) ==== @@ -399,18 +399,22 @@ auio.uio_rw = rw; auio.uio_td = td; if (rw == UIO_READ) { +#if 0 #ifdef MAC /* XXXMAC: we should pass in active_cred to vn_rdwr(). */ error = mac_check_vnode_read(td->td_ucred, cred, vp); if (error == 0) #endif +#endif error = VOP_READ(vp, &auio, ioflg, cred); } else { +#if 0 #ifdef MAC /* XXXMAC: we should pass in active_cred to vn_rdwr(). */ error = mac_check_vnode_write(td->td_ucred, cred, vp); if (error == 0) #endif +#endif error = VOP_WRITE(vp, &auio, ioflg, cred); } if (aresid) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 7 5:45:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1623F37B401; Wed, 7 Aug 2002 05:45:02 -0700 (PDT) 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 0349237B400 for ; Wed, 7 Aug 2002 05:45:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 924BE43E3B for ; Wed, 7 Aug 2002 05:45:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g77Cj0JU074163 for ; Wed, 7 Aug 2002 05:45:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g77Cj0Nk074160 for perforce@freebsd.org; Wed, 7 Aug 2002 05:45:00 -0700 (PDT) Date: Wed, 7 Aug 2002 05:45:00 -0700 (PDT) Message-Id: <200208071245.g77Cj0Nk074160@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15637 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15637 Change 15637 by rwatson@rwatson_tislabs on 2002/08/07 05:44:19 Teach the accounting system to cache the credential used for file system activity. This permits accounting to operate with a high integrity credential when logging data on low-integrity processes (et al). The credential will be preserved in the same manner as normal accounting configuration information when disk space runs low (etc). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_acct.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_acct.c#7 (text+ko) ==== @@ -86,8 +86,10 @@ * Accounting vnode pointer, saved vnode pointer, and flags for each. */ static struct vnode *acctp; +static struct ucred *acctcred; static int acctflags; static struct vnode *savacctp; +static struct ucred *savacctcred; static int savacctflags; /* @@ -155,8 +157,10 @@ callout_stop(&acctwatch_callout); error = vn_close((acctp != NULLVP ? acctp : savacctp), (acctp != NULLVP ? acctflags : savacctflags), - td->td_ucred, td); + (acctcred != NOCRED ? acctcred : savacctcred), td); acctp = savacctp = NULLVP; + crfree(acctcred != NOCRED ? acctcred : savacctcred); + acctcred = savacctcred = NOCRED; } if (SCARG(uap, path) == NULL) goto done2; @@ -166,6 +170,7 @@ * free space watcher. */ acctp = nd.ni_vp; + acctcred = crhold(td->td_ucred); acctflags = flags; callout_init(&acctwatch_callout, 0); acctwatch(NULL); @@ -260,9 +265,9 @@ /* * Write the accounting information to the file. */ - VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); + VOP_LEASE(vp, td, acctcred, LEASE_WRITE); return (vn_rdwr(UIO_WRITE, vp, (caddr_t)&acct, sizeof (acct), - (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, td->td_ucred, + (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, acctcred, (int *)0, td)); } @@ -320,23 +325,29 @@ if (savacctp != NULLVP) { if (savacctp->v_type == VBAD) { - (void) vn_close(savacctp, savacctflags, NOCRED, NULL); + (void) vn_close(savacctp, savacctflags, savacctcred, + NULL); savacctp = NULLVP; + savacctcred = NOCRED; return; } (void)VFS_STATFS(savacctp->v_mount, &sb, (struct thread *)0); if (sb.f_bavail > acctresume * sb.f_blocks / 100) { acctp = savacctp; + acctcred = savacctcred; acctflags = savacctflags; savacctp = NULLVP; + savacctcred = NOCRED; log(LOG_NOTICE, "Accounting resumed\n"); } } else { if (acctp == NULLVP) return; if (acctp->v_type == VBAD) { - (void) vn_close(acctp, acctflags, NOCRED, NULL); + (void) vn_close(acctp, acctflags, acctcred, NULL); acctp = NULLVP; + crfree(acctcred); + acctcred = NOCRED; return; } (void)VFS_STATFS(acctp->v_mount, &sb, (struct thread *)0); @@ -344,6 +355,7 @@ savacctp = acctp; savacctflags = acctflags; acctp = NULLVP; + acctcred = NOCRED; log(LOG_NOTICE, "Accounting suspended\n"); } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 7 8: 1:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 338BC37B401; Wed, 7 Aug 2002 08:01:47 -0700 (PDT) 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 8F1C237B400 for ; Wed, 7 Aug 2002 08:01:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E3DE43E42 for ; Wed, 7 Aug 2002 08:01:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g77F1kJU000352 for ; Wed, 7 Aug 2002 08:01:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g77F1kqX000349 for perforce@freebsd.org; Wed, 7 Aug 2002 08:01:46 -0700 (PDT) Date: Wed, 7 Aug 2002 08:01:46 -0700 (PDT) Message-Id: <200208071501.g77F1kqX000349@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15640 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15640 Change 15640 by rwatson@rwatson_tislabs on 2002/08/07 08:01:14 Fix (I believe) support for the trusted_interfaces variable by bzero'ing a buffer in the stack to truncate strings by default. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#94 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#94 (text+ko) ==== @@ -980,6 +980,7 @@ !strvalid(trusted_interfaces, sizeof(trusted_interfaces))) goto set; + bzero(tiflist, sizeof(tiflist)); for (p = trusted_interfaces, q = tiflist; *p != '\0'; p++, q++) if(*p != ' ' && *p != '\t') *q = *p; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 7 8:27:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66B1C37B401; Wed, 7 Aug 2002 08:27:50 -0700 (PDT) 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 DBE1837B400; Wed, 7 Aug 2002 08:27:49 -0700 (PDT) Received: from holly.calldei.com (adsl-208-191-149-232.dsl.hstntx.swbell.net [208.191.149.232]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7503743E75; Wed, 7 Aug 2002 08:27:49 -0700 (PDT) (envelope-from chris@holly.dyndns.org) Received: by holly.calldei.com (Postfix, from userid 1001) id 65964B78; Wed, 7 Aug 2002 10:28:56 -0500 (CDT) Date: Wed, 7 Aug 2002 10:28:56 -0500 From: Chris Costello To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 15640 for review Message-ID: <20020807152856.GB1620@holly.calldei.com> Reply-To: chris@FreeBSD.org References: <200208071501.g77F1kqX000349@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200208071501.g77F1kqX000349@freefall.freebsd.org> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wednesday, August 07, 2002, Robert Watson wrote: > Fix (I believe) support for the trusted_interfaces variable by > bzero'ing a buffer in the stack to truncate strings by default. > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#94 (text+ko) ==== > > @@ -980,6 +980,7 @@ > !strvalid(trusted_interfaces, sizeof(trusted_interfaces))) > goto set; > > + bzero(tiflist, sizeof(tiflist)); > for (p = trusted_interfaces, q = tiflist; *p != '\0'; p++, q++) > if(*p != ' ' && *p != '\t') > *q = *p; I wonder if just placing *++p = '\0'; wouldn't be better and/or faster, instead of zeroing the whole thing beforehand... -- Chris Costello FreeBSD Project http://www.FreeBSD.org/ TrustedBSD Project http://www.TrustedBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 7 10: 9:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D2B537B401; Wed, 7 Aug 2002 10:09:24 -0700 (PDT) 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 A0DA037B400 for ; Wed, 7 Aug 2002 10:09:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F35043E77 for ; Wed, 7 Aug 2002 10:09:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g77H9NJU029361 for ; Wed, 7 Aug 2002 10:09:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g77H9NxV029358 for perforce@freebsd.org; Wed, 7 Aug 2002 10:09:23 -0700 (PDT) Date: Wed, 7 Aug 2002 10:09:23 -0700 (PDT) Message-Id: <200208071709.g77H9NxV029358@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15643 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15643 Change 15643 by rwatson@rwatson_tislabs on 2002/08/07 10:08:52 Use the cred passed to socreate() to label newly created sockets, rather than the one associated with td. This allows socreate() to function on behalf of a no-curthread credential. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#33 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#33 (text+ko) ==== @@ -196,7 +196,7 @@ so->so_cred = crhold(cred); so->so_proto = prp; #ifdef MAC - mac_create_socket(td->td_ucred, so); + mac_create_socket(cred, so); #endif soref(so); error = (*prp->pr_usrreqs->pru_attach)(so, proto, td); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 7 10:41: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F326537B401; Wed, 7 Aug 2002 10:41:02 -0700 (PDT) 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 78D4637B400 for ; Wed, 7 Aug 2002 10:41:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 948D043E72 for ; Wed, 7 Aug 2002 10:41:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g77Hf1JU033669 for ; Wed, 7 Aug 2002 10:41:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g77Hf1K6033666 for perforce@freebsd.org; Wed, 7 Aug 2002 10:41:01 -0700 (PDT) Date: Wed, 7 Aug 2002 10:41:01 -0700 (PDT) Message-Id: <200208071741.g77Hf1K6033666@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15646 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15646 Change 15646 by rwatson@rwatson_tislabs on 2002/08/07 10:40:23 Make sure that the thread credential for initproc is kept in sync with the process credential following credential divorcing, or we'll use the cached credential until init first hits userland, resulting in the proc0 cred being used instead of proc1 for the root mount process. Discussed with/suggested by: julian Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/init_main.c#28 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_main.c#28 (text+ko) ==== @@ -671,6 +671,7 @@ initproc->p_ucred = newcred; PROC_UNLOCK(initproc); crfree(oldcred); + cred_update_thread(FIRST_THREAD_IN_PROC(initproc)); mtx_lock_spin(&sched_lock); initproc->p_sflag |= PS_INMEM; mtx_unlock_spin(&sched_lock); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 7 13:53:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F0F437B401; Wed, 7 Aug 2002 13:53:17 -0700 (PDT) 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 B434E37B400 for ; Wed, 7 Aug 2002 13:53:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51F9B43E70 for ; Wed, 7 Aug 2002 13:53:16 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g77KrGJU066919 for ; Wed, 7 Aug 2002 13:53:16 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g77KrFoJ066916 for perforce@freebsd.org; Wed, 7 Aug 2002 13:53:15 -0700 (PDT) Date: Wed, 7 Aug 2002 13:53:15 -0700 (PDT) Message-Id: <200208072053.g77KrFoJ066916@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 15659 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15659 Change 15659 by chris@chris_holly on 2002/08/07 13:52:26 o Clarify create_root_mount vs. create_mount o Minor spelling and markup fixes o Fix one entry point missed in the action_object -> object_action thing o Note that the access(2) checks should be the same as in mpo_check_open. o Make note of race conditions involved in dealing with UIO_USERSPACE uio, and that the `uio' parameter to mpo_check_setextattr might be NULL. o Add some man page references. o `_' is an illegal character for section ids. o Add mpo_check_socket_visible. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#12 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#12 (text+ko) ==== @@ -1336,8 +1336,7 @@ Fill out the labels on the mount point being created by the passed subject credential. This call will be made when - a new file system is mounted, other than the root file - system. + a new file system is mounted. @@ -1374,7 +1373,8 @@ Fill out the labels on the mount point being created by the passed subject credential. This call will be made when - the root file system is mounted. + the root file system is mounted, after + &mac.mpo;_create_mount;. @@ -1906,7 +1906,7 @@ newsocket - Object; phild socket; incoming connection + Object; child socket; incoming connection @@ -3248,13 +3248,14 @@ - - <function>&mac.mpo;_check_connect_socket</function> + + + <function>&mac.mpo;_check_socket_connect</function> int - &mac.mpo;_check_connect_socket + &mac.mpo;_check_socket_connect struct ucred *cred @@ -3744,8 +3745,10 @@ Determine how invocations of &man.access.2; and related calls by the subject credential should return when performed - on the passed vnode using the passed access flags. Return - 0 for success, or an + on the passed vnode using the passed access flags. This + should generally be implemented using the same semantics + used in &mac.mpo;_check_vnode_open. + Return 0 for success, or an errno value for failure. Suggested failure: EACCES for label mismatches or EPERM for lack of @@ -4649,7 +4652,7 @@ Determine whether the subject credential can revoke access to the passed vnode. Return 0 for success, or an - errno value for failure. Suggested + errno value for failure. Suggested failure: EACCES for label mismatch, or EPERM for lack of privilege. @@ -4784,9 +4787,14 @@ extended attribute of passed name and passed namespace on the passed vnode. Policies implementing security labels backed into extended attributes may want to provide - additional protections for those attributes. Return - 0 for success, or an - errno value for failure. Suggested + additional protections for those attributes. Additionally, + policies should avoid making decisions based on the data + referenced from uio, as there is a + potential race condition between this check and the actual + operation. The uio may also be + NULL if a delete operation is being + performed. Return 0 for success, + or an errno value for failure. Suggested failure: EACCES for label mismatch, or EPERM for lack of privilege. @@ -5009,12 +5017,12 @@ atime - Access time + Access time; see &man.utimes.2; mtime - Modification time + Modification time; see &man.utimes.2; @@ -5069,9 +5077,11 @@ failure: EACCES for label mismatch, EPERM for lack of privilege, or ESRCH to limit visibility. + + See &man.setpriority.2; for more information. - + <function>&mac.mpo;_check_proc_signal</function> @@ -5104,7 +5114,7 @@ signal - Signal; see &man.sigaction.2; + Signal; see &man.kill.2; @@ -5163,10 +5173,12 @@ Determine whether the subject credential can stat the passed vnode. Return 0 for success, or an - errno value for failure. Suggested + errno value for failure. Suggested failure: EACCES for label mismatch, or EPERM for lack of privilege. + + See &man.stat.2; for more information. @@ -5297,6 +5309,59 @@ or EPERM for lack of privilege. + + + <function>&mac.mpo;_check_socket_visible</function> + + + + int + &mac.mpo;_check_socket_visible + + struct ucred + *cred + struct socket + *so + struct label + *socketlabel + + + + + + &mac.thead; + + + + cred + Subject credential + Immutable + + + + so + Object; socket + + + + socketlabel + Policy label for + so + + + + + + Determine whether the subject credential cred can "see" + the passed socket (socket) using + system monitoring functions, such as those employed by + &man.netstat.8; and &man.sockstat.1;. Return + 0 for success, or an + errno value for failure. Suggested + failure: EACCES for label mismatches, + EPERM for lack of privilege, or + ESRCH to hide visibility. + To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 5:37: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAD5D37B401; Thu, 8 Aug 2002 05:37:00 -0700 (PDT) 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 8A02637B400 for ; Thu, 8 Aug 2002 05:37:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4652E43E42 for ; Thu, 8 Aug 2002 05:37:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78Cb0JU019101 for ; Thu, 8 Aug 2002 05:37:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78Cb0wZ019095 for perforce@freebsd.org; Thu, 8 Aug 2002 05:37:00 -0700 (PDT) Date: Thu, 8 Aug 2002 05:37:00 -0700 (PDT) Message-Id: <200208081237.g78Cb0wZ019095@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15677 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15677 Change 15677 by rwatson@rwatson_tislabs on 2002/08/08 05:36:35 If no command line is passed to setpmac, default to executing the user's shell in an identical style to chroot(8). Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/setpmac/setpmac.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/setpmac/setpmac.c#4 (text+ko) ==== @@ -1,7 +1,10 @@ #include #include +#include +#include #include +#include #include extern char **environ; @@ -9,10 +12,11 @@ int main(int argc, char *argv[]) { + const char *shell; struct mac *label; int error; - if (argc < 3) { + if (argc < 2) { fprintf(stderr, "setpmac [label] [binary] [args...]\n"); return (-1); } @@ -31,11 +35,14 @@ mac_free(label); - error = execve(argv[2], argv + 2, environ); - if (error) { - perror(argv[2]); - return (-1); + if (argc >= 3) { + execvp(argv[2], argv + 2); + err(1, "%s", argv[2]); + } else { + if (!(shell = getenv("SHELL"))) + shell = _PATH_BSHELL; + execlp(shell, shell, "-i", (char *)NULL); + err(1, "%s", shell); } - - return (0); + /* NOTREACHED */ } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 7:53:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 040A537B401; Thu, 8 Aug 2002 07:52:51 -0700 (PDT) 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 5568137B400 for ; Thu, 8 Aug 2002 07:52:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A2C043E3B for ; Thu, 8 Aug 2002 07:52:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78EqlJU046841 for ; Thu, 8 Aug 2002 07:52:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78EqlN7046838 for perforce@freebsd.org; Thu, 8 Aug 2002 07:52:47 -0700 (PDT) Date: Thu, 8 Aug 2002 07:52:47 -0700 (PDT) Message-Id: <200208081452.g78EqlN7046838@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15682 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15682 Change 15682 by rwatson@rwatson_paprika on 2002/08/08 07:52:26 Push down the SLOT() mapping from the entry point implementations to the supporting functions (mac_te_check(), copy(), et al), simplifying the entry point implementations. Teach TE how to see a "null" TE label, which requests no update during a relabel operation. Allow null TE relabels without privilege so that relative label updates dealing only with other policies will function correctly. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#68 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#68 (text+ko) ==== @@ -506,11 +506,15 @@ } static int -mac_te_check(struct mac_te *subject, struct mac_te *object, int object_class, +mac_te_check(struct label *lsubject, struct label *lobject, int object_class, int operation) { + struct mac_te *subject, *object; int match; int rule; + + subject = SLOT(lsubject); + object = SLOT(lobject); if (!mac_te_enabled) return (0); @@ -549,11 +553,11 @@ } static void -mac_te_init_label_as(struct mac_te *telabel, char *type) +mac_te_init_label_as(struct mac_te *mac_te, char *type) { - bzero(&telabel->mt_type, MAC_TE_TYPE_MAXLEN+1); - strncpy(telabel->mt_type, type, MAC_TE_TYPE_MAXLEN); + bzero(&mac_te->mt_type, MAC_TE_TYPE_MAXLEN+1); + strncpy(mac_te->mt_type, type, MAC_TE_TYPE_MAXLEN); } static void @@ -564,18 +568,24 @@ } static void -mac_te_copy_label_teonly(const struct mac_te *labelfrom, - struct mac_te *labelto) +mac_te_copy_label_teonly(const struct mac_te *from, struct mac_te *to) { - bcopy(labelfrom, labelto, sizeof(*labelto)); + bcopy(from, to, sizeof(*to)); } static void -mac_te_copy_label(struct mac_te *tefrom, struct mac_te *teto) +mac_te_copy_label(const struct label *from, struct label *to) +{ + + mac_te_copy_label_teonly(SLOT(from), SLOT(to)); +} + +static int +mac_te_null_label(struct label *label) { - mac_te_copy_label_teonly(tefrom, teto); + return (strlen(SLOT(label)->mt_type) == 0); } static void @@ -596,15 +606,15 @@ mac_te_create_cred(struct ucred *cred_parent, struct ucred *cred_child) { - mac_te_copy_label(SLOT(&cred_parent->cr_label), - SLOT(&cred_child->cr_label)); + mac_te_copy_label(&cred_parent->cr_label, &cred_child->cr_label); } static void mac_te_relabel_cred(struct ucred *cred, struct label *newlabel) { - mac_te_copy_label(SLOT(newlabel), SLOT(&cred->cr_label)); + if (!mac_te_null_label(newlabel)) + mac_te_copy_label(newlabel, &cred->cr_label); } static void @@ -612,7 +622,8 @@ struct label *ifnetlabel, struct label *newlabel) { - mac_te_copy_label(SLOT(newlabel), SLOT(ifnetlabel)); + if (!mac_te_null_label(newlabel)) + mac_te_copy_label(newlabel, ifnetlabel); } static int @@ -623,42 +634,43 @@ if (!mac_te_enabled) return (0); - return (mac_te_check(SLOT(bpflabel), SLOT(ifnetlabel), - MAC_TE_CLASS_BPF, MAC_TE_OPERATION_BPF_RECEIVE)); + return (mac_te_check(bpflabel, ifnetlabel, MAC_TE_CLASS_BPF, + MAC_TE_OPERATION_BPF_RECEIVE)); } static int mac_te_check_cred_relabel(struct ucred *cred, struct label *newlabel) { - int error, privilege_needed; - /* Allow no-op updates without privilege. */ - privilege_needed = 0; - if (!mac_te_equal(&cred->cr_label, newlabel)) - privilege_needed = 1; + /* Don't prevent relabel if no-op. */ + if (mac_te_null_label(newlabel)) + return (0); + if (mac_te_equal(&cred->cr_label, newlabel)) + return (0); - if (privilege_needed) { - error = suser_cred(cred, 0); - if (error) - return (error); - } - - return (0); + /* We should check the TE policy here, but instead we require root. */ + return (suser_cred(cred, 0)); } static int mac_te_check_cred_visible(struct ucred *u1, struct ucred *u2) { - return (mac_te_check(SLOT(&u1->cr_label), SLOT(&u2->cr_label), - MAC_TE_CLASS_PROC, MAC_TE_OPERATION_PROC_SEE)); + return (mac_te_check(&u1->cr_label, &u2->cr_label, MAC_TE_CLASS_PROC, + MAC_TE_OPERATION_PROC_SEE)); } static int mac_te_check_ifnet_relabel(struct ucred *cred, struct ifnet *ifnet, - struct label *newlabel) + struct label *ifnetlabel, struct label *newlabel) { + /* Don't prevent relabel if no-op. */ + if (mac_te_null_label(newlabel)) + return (0); + if (mac_te_equal(ifnetlabel, newlabel)) + return (0); + /* We should check the TE policy here, but instead we require root. */ return (suser_cred(cred, 0)); } @@ -672,8 +684,8 @@ * mbuf as an object. Since sockets are objects, this is * probably wrong. */ - return (mac_te_check(SLOT(ifnetlabel), SLOT(mbuflabel), - MAC_TE_CLASS_MBUF, MAC_TE_OPERATION_MBUF_SEND)); + return (mac_te_check(ifnetlabel, mbuflabel, MAC_TE_CLASS_MBUF, + MAC_TE_OPERATION_MBUF_SEND)); } static int @@ -682,8 +694,8 @@ { int error; - error = mac_te_check(SLOT(&cred->cr_label), SLOT(mplabel), - MAC_TE_CLASS_FS, MAC_TE_OPERATION_FS_STATFS); + error = mac_te_check(&cred->cr_label, mplabel, MAC_TE_CLASS_FS, + MAC_TE_OPERATION_FS_STATFS); return (error); } @@ -712,40 +724,39 @@ mac_te_check_pipe_relabel(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, struct label *newlabel) { - int error; - error = suser_cred(cred, 0); - if (error) - return (error); + /* Don't prevent relabel if no-op. */ + if (mac_te_null_label(newlabel)) + return (0); + if (mac_te_equal(newlabel, pipelabel)) + return (0); - return (0); + /* We should check the TE policy here, but instead we require root. */ + return (suser_cred(cred, 0)); } static int mac_te_check_proc_debug(struct ucred *cred, struct proc *proc) { - return (mac_te_check(SLOT(&cred->cr_label), - SLOT(&proc->p_ucred->cr_label), MAC_TE_CLASS_PROC, - MAC_TE_OPERATION_PROC_DEBUG)); + return (mac_te_check(&cred->cr_label, &proc->p_ucred->cr_label, + MAC_TE_CLASS_PROC, MAC_TE_OPERATION_PROC_DEBUG)); } static int mac_te_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) { - return (mac_te_check(SLOT(&cred->cr_label), - SLOT(&proc->p_ucred->cr_label), MAC_TE_CLASS_PROC, - MAC_TE_OPERATION_PROC_SIGNAL)); + return (mac_te_check(&cred->cr_label, &proc->p_ucred->cr_label, + MAC_TE_CLASS_PROC, MAC_TE_OPERATION_PROC_SIGNAL)); } static int mac_te_check_proc_sched(struct ucred *cred, struct proc *proc) { - return (mac_te_check(SLOT(&cred->cr_label), - SLOT(&proc->p_ucred->cr_label), MAC_TE_CLASS_PROC, - MAC_TE_OPERATION_PROC_SCHED)); + return (mac_te_check(&cred->cr_label, &proc->p_ucred->cr_label, + MAC_TE_CLASS_PROC, MAC_TE_OPERATION_PROC_SCHED)); } static int @@ -756,7 +767,7 @@ if (!mac_te_enabled) return (0); - return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), + return (mac_te_check(&cred->cr_label, socketlabel, MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_BIND)); } @@ -768,7 +779,7 @@ if (!mac_te_enabled) return (0); - return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), + return (mac_te_check(&cred->cr_label, socketlabel, MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_CONNECT)); } @@ -780,7 +791,7 @@ if (!mac_te_enabled) return (0); - return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), + return (mac_te_check(&cred->cr_label, socketlabel, MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_LISTEN)); } @@ -789,21 +800,23 @@ struct mbuf *m, struct label *mbuflabel) { - return (mac_te_check(SLOT(socketlabel), SLOT(mbuflabel), - MAC_TE_CLASS_MBUF, MAC_TE_OPERATION_MBUF_RECEIVE)); + return (mac_te_check(socketlabel, mbuflabel, MAC_TE_CLASS_MBUF, + MAC_TE_OPERATION_MBUF_RECEIVE)); } static int mac_te_check_socket_relabel(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { - int error; - error = suser_cred(cred, 0); - if (error) - return (error); + /* Don't prevent relabel if no-op. */ + if (mac_te_null_label(newlabel)) + return (0); + if (mac_te_equal(newlabel, socketlabel)) + return (0); - return (0); + /* We should check the TE policy here, but instead we require root. */ + return (suser_cred(cred, 0)); } static int @@ -811,7 +824,7 @@ struct label *socketlabel) { - return (mac_te_check(SLOT(&cred->cr_label), SLOT(socketlabel), + return (mac_te_check(&cred->cr_label, socketlabel, MAC_TE_CLASS_SOCKET, MAC_TE_OPERATION_SOCKET_SEE)); } @@ -831,21 +844,22 @@ struct label *bdlabel) { - mac_te_copy_label(SLOT(&cred->cr_label), SLOT(bdlabel)); + mac_te_copy_label(&cred->cr_label, bdlabel); } static void mac_te_create_object(struct ucred *cred, struct label *label) { - mac_te_copy_label(SLOT(&cred->cr_label), SLOT(label)); + mac_te_copy_label(&cred->cr_label, label); } static void -mac_te_create_object_from_object(struct label *oldlabel, struct label *newlabel) +mac_te_create_object_from_object(struct label *oldlabel, + struct label *newlabel) { - mac_te_copy_label(SLOT(oldlabel), SLOT(newlabel)); + mac_te_copy_label(oldlabel, newlabel); } static void @@ -853,7 +867,7 @@ struct mbuf *datagram, struct label *datagramlabel) { - mac_te_copy_label(SLOT(ipqlabel), SLOT(datagramlabel)); + mac_te_copy_label(ipqlabel, datagramlabel); } static void @@ -862,7 +876,7 @@ { mac_te_init_label(SLOT(fragmentlabel)); - mac_te_copy_label(SLOT(datagramlabel), SLOT(fragmentlabel)); + mac_te_copy_label(datagramlabel, fragmentlabel); } static void @@ -870,7 +884,7 @@ struct mbuf *ipq, struct label *ipqlabel) { - mac_te_copy_label(SLOT(fragmentlabel), SLOT(ipqlabel)); + mac_te_copy_label(fragmentlabel, ipqlabel); } static void @@ -879,7 +893,7 @@ struct label *newmbuflabel) { - mac_te_copy_label(SLOT(oldmbuflabel), SLOT(newmbuflabel)); + mac_te_copy_label(oldmbuflabel, newmbuflabel); } static void @@ -895,7 +909,7 @@ struct mbuf *m, struct label *mlabel) { - mac_te_copy_label(SLOT(iflabel), SLOT(mlabel)); + mac_te_copy_label(iflabel, mlabel); } static void @@ -904,7 +918,7 @@ struct mbuf *newmbuf, struct label *nmblabel) { - mac_te_copy_label(SLOT(oldmblabel), SLOT(nmblabel)); + mac_te_copy_label(oldmblabel, nmblabel); } static void @@ -912,7 +926,7 @@ struct mbuf *newmbuf, struct label *nmblabel) { - mac_te_copy_label(SLOT(oldmblabel), SLOT(nmblabel)); + mac_te_copy_label(oldmblabel, nmblabel); } static int @@ -928,7 +942,7 @@ struct mbuf *m, struct label *mlabel) { - mac_te_copy_label(SLOT(solabel), SLOT(mlabel)); + mac_te_copy_label(solabel, mlabel); } static void @@ -962,7 +976,8 @@ struct label *oldlabel, struct label *newlabel) { - mac_te_copy_label(SLOT(newlabel), SLOT(oldlabel)); + if (!mac_te_null_label(newlabel)) + mac_te_copy_label(newlabel, oldlabel); } static void @@ -970,7 +985,8 @@ struct label *pipelabel, struct label *newlabel) { - mac_te_copy_label(SLOT(newlabel), SLOT(pipelabel)); + if (!mac_te_null_label(newlabel)) + mac_te_copy_label(newlabel, pipelabel); } static void @@ -978,7 +994,7 @@ struct socket *socket, struct label *sopeerlabel) { - mac_te_copy_label(SLOT(mlabel), SLOT(sopeerlabel)); + mac_te_copy_label(mlabel, sopeerlabel); } static void @@ -987,7 +1003,7 @@ struct label *newpeerlabel) { - mac_te_copy_label(SLOT(oldlabel), SLOT(newpeerlabel)); + mac_te_copy_label(oldlabel, newpeerlabel); } static void @@ -995,7 +1011,7 @@ struct mbuf *mbuf, struct label *mblabel) { - mac_te_copy_label(SLOT(bdlabel), SLOT(mblabel)); + mac_te_copy_label(bdlabel, mblabel); } static void @@ -1019,10 +1035,11 @@ static void mac_te_relabel_vnode(struct ucred *cred, struct vnode *vp, - struct label *vnodelabel, struct label *label) + struct label *vnodelabel, struct label *newlabel) { - mac_te_copy_label(SLOT(label), SLOT(vnodelabel)); + if (!mac_te_null_label(newlabel)) + mac_te_copy_label(newlabel, vnodelabel); } @@ -1078,7 +1095,7 @@ struct vnode *vp, struct label *vnodelabel) { - mac_te_copy_label(SLOT(direntlabel), SLOT(vnodelabel)); + mac_te_copy_label(direntlabel, vnodelabel); } static void @@ -1102,8 +1119,8 @@ struct label *dlabel) { - return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_CHDIR)); + return (mac_te_check(&cred->cr_label, dlabel, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_CHDIR)); } static int @@ -1111,8 +1128,8 @@ struct label *dlabel) { - return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_CHROOT)); + return (mac_te_check(&cred->cr_label, dlabel, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_CHROOT)); } static int @@ -1120,8 +1137,8 @@ struct label *dlabel, struct componentname *cnp, struct vattr *vap) { - return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_WRITE)); + return (mac_te_check(&cred->cr_label, dlabel, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_WRITE)); } static int @@ -1131,19 +1148,19 @@ { int error; - error = mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_WRITE); + error = mac_te_check(&cred->cr_label, dlabel, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_WRITE); if (error) return (error); switch (vp->v_type) { case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETE)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_DELETE)); case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETE)); default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETE)); } } @@ -1155,13 +1172,13 @@ switch (vp->v_type) { case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETEACL)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_DELETEACL)); case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETEACL)); default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETEACL)); } } @@ -1171,8 +1188,8 @@ struct label *label) { - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_EXEC)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_FILE_EXEC)); } static int @@ -1182,13 +1199,13 @@ switch (vp->v_type) { case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_GETACL)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_GETACL)); case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_GETACL)); default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_GETACL)); } } @@ -1200,13 +1217,13 @@ switch (vp->v_type) { case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_DIR_GETEXTATTR)); case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_GETEXTATTR)); default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_GETEXTATTR)); } } @@ -1216,30 +1233,26 @@ struct label *dlabel, struct componentname *cnp) { - return (mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_LOOKUP)); + return (mac_te_check(&cred->cr_label, dlabel, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_LOOKUP)); } static vm_prot_t mac_te_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, struct label *label, int newmapping) { - struct mac_te *subj, *obj; vm_prot_t prot = 0; if (!mac_te_enabled || (!mac_te_revocation_enabled && !newmapping)) return (VM_PROT_ALL); - subj = SLOT(&cred->cr_label); - obj = SLOT(label); - - if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + if (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_READ) == 0) prot |= VM_PROT_READ; - if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + if (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_EXEC) == 0) prot |= VM_PROT_EXECUTE; - if (mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + if (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_WRITE) == 0) prot |= VM_PROT_WRITE; return (prot); @@ -1249,12 +1262,9 @@ mac_te_check_vnode_open(struct ucred *cred, struct vnode *vp, struct label *filelabel, mode_t acc_mode) { - struct mac_te *subj, *obj; int object_class, operation; int error; - subj = SLOT(&cred->cr_label); - obj = SLOT(filelabel); /* * Treat all vnode types as files, for the time being, except * for directories. @@ -1277,7 +1287,8 @@ default: panic("mac_te_vaccess: invalid object_class"); } - error = mac_te_check(subj, obj, object_class, operation); + error = mac_te_check(&cred->cr_label, filelabel, object_class, + operation); if (error) return (error); } @@ -1292,7 +1303,8 @@ default: panic("mac_te_vaccess: invalid object_class"); } - error = mac_te_check(subj, obj, object_class, operation); + error = mac_te_check(&cred->cr_label, filelabel, object_class, + operation); if (error) return (error); } @@ -1307,7 +1319,8 @@ default: panic("mac_te_vaccess: invalid object_class"); } - error = mac_te_check(subj, obj, object_class, operation); + error = mac_te_check(&cred->cr_label, filelabel, object_class, + operation); if (error) return (error); } @@ -1318,16 +1331,12 @@ mac_te_check_vnode_poll(struct ucred *active_cred, struct ucred *saved_cred, struct vnode *vp, struct label *label) { - struct mac_te *subj, *obj; int error; if (!mac_te_revocation_enabled) return (0); - subj = SLOT(&active_cred->cr_label); - obj = SLOT(label); - - error = mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + error = mac_te_check(&active_cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_POLL); return (error); @@ -1337,16 +1346,12 @@ mac_te_check_vnode_read(struct ucred *active_cred, struct ucred *saved_cred, struct vnode *vp, struct label *label) { - struct mac_te *subj, *obj; int error; if (!mac_te_revocation_enabled) return (0); - subj = SLOT(&active_cred->cr_label); - obj = SLOT(label); - - error = mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + error = mac_te_check(&active_cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_READ); return (error); @@ -1356,12 +1361,8 @@ mac_te_check_vnode_readdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { - struct mac_te *subj, *obj; - subj = SLOT(&cred->cr_label); - obj = SLOT(dlabel); - - return (mac_te_check(subj, obj, MAC_TE_CLASS_DIR, + return (mac_te_check(&cred->cr_label, dlabel, MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_READDIR)); } @@ -1369,33 +1370,24 @@ mac_te_check_vnode_readlink(struct ucred *cred, struct vnode *vp, struct label *vnodelabel) { - struct mac_te *subj, *obj; - subj = SLOT(&cred->cr_label); - obj = SLOT(vnodelabel); - - return (mac_te_check(subj, obj, MAC_TE_CLASS_SYMLINK, - MAC_TE_OPERATION_SYMLINK_READLINK)); + return (mac_te_check(&cred->cr_label, vnodelabel, + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_READLINK)); } static int mac_te_check_vnode_relabel(struct ucred *cred, struct vnode *vp, struct label *oldlabel, struct label *newlabel) { - int error, privilege_needed; - /* Allow no-op updates without privilege. */ - privilege_needed = 0; - if (!mac_te_equal(&cred->cr_label, newlabel)) - privilege_needed = 1; + /* Don't prevent relabel if no-op. */ + if (mac_te_null_label(newlabel)) + return (0); + if (mac_te_equal(&cred->cr_label, newlabel)) + return (0); - if (privilege_needed) { - error = suser_cred(cred, 0); - if (error) - return (error); - } - - return (0); + /* We should check the TE policy here, but instead we require root. */ + return (suser_cred(cred, 0)); } static int @@ -1403,8 +1395,8 @@ struct label *label) { - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_ADMIN)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, + MAC_TE_OPERATION_FILE_ADMIN)); } static int @@ -1414,13 +1406,13 @@ switch (vp->v_type) { case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_SETACL)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_SETACL)); case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_SETACL)); default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_SETACL)); } } @@ -1432,10 +1424,10 @@ switch (vp->v_type) { case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_SETEXTATTR)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_SETEXTATTR)); default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_SETEXTATTR)); } } @@ -1447,13 +1439,13 @@ switch (vp->v_type) { case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_ADMIN)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_ADMIN)); case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_ADMIN)); default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_ADMIN)); } } @@ -1465,13 +1457,13 @@ switch (vp->v_type) { case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_ADMIN)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_ADMIN)); case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_ADMIN)); default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_ADMIN)); } } @@ -1483,13 +1475,13 @@ switch (vp->v_type) { case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_ADMIN)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_ADMIN)); case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_ADMIN)); default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_ADMIN)); } } @@ -1501,13 +1493,13 @@ switch (vp->v_type) { case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_ADMIN)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_ADMIN)); case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_ADMIN)); default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_ADMIN)); } } @@ -1519,20 +1511,20 @@ { int error; - error = mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_WRITE); + error = mac_te_check(&cred->cr_label, dlabel, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_WRITE); if (error) return (error); /* Not really correct. */ switch (vp->v_type) { case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETE)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_DELETE)); case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETE)); default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETE)); } } @@ -1544,20 +1536,20 @@ { int error; - error = mac_te_check(SLOT(&cred->cr_label), SLOT(dlabel), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_WRITE); + error = mac_te_check(&cred->cr_label, dlabel, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_WRITE); if (error || label == NULL || vp == NULL) return (error); /* Not really correct. */ switch (vp->v_type) { case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_DELETE)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_DELETE)); case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_DELETE)); default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_DELETE)); } } @@ -1569,13 +1561,13 @@ switch (vp->v_type) { case VDIR: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), - MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_STAT)); + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_STAT)); case VLNK: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_STAT)); default: - return (mac_te_check(SLOT(&cred->cr_label), SLOT(label), + return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_STAT)); } } @@ -1584,16 +1576,12 @@ mac_te_check_vnode_write(struct ucred *active_cred, struct ucred *saved_cred, struct vnode *vp, struct label *label) { - struct mac_te *subj, *obj; int error; if (!mac_te_revocation_enabled) return (0); - subj = SLOT(&active_cred->cr_label); - obj = SLOT(label); - - error = mac_te_check(subj, obj, MAC_TE_CLASS_FILE, + error = mac_te_check(&active_cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_WRITE); return (error); @@ -1628,7 +1616,7 @@ } } - mac_te_copy_label(SLOT(&old->cr_label), SLOT(&new->cr_label)); + mac_te_copy_label(&old->cr_label, &new->cr_label); } static int @@ -1656,7 +1644,7 @@ struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { - mac_te_copy_label(SLOT(vnodelabel), SLOT(direntlabel)); + mac_te_copy_label(vnodelabel, direntlabel); } >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 8:25:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0885A37B401; Thu, 8 Aug 2002 08:25:28 -0700 (PDT) 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 B12FA37B400 for ; Thu, 8 Aug 2002 08:25:27 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5360E43E4A for ; Thu, 8 Aug 2002 08:25:27 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78FPRJU056676 for ; Thu, 8 Aug 2002 08:25:27 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78FPQaI056673 for perforce@freebsd.org; Thu, 8 Aug 2002 08:25:26 -0700 (PDT) Date: Thu, 8 Aug 2002 08:25:26 -0700 (PDT) Message-Id: <200208081525.g78FPQaI056673@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15683 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15683 Change 15683 by rwatson@rwatson_paprika on 2002/08/08 08:25:24 Add an IO_NOMACCHECK vnode operation flag to vn_rdwr(), which permits callers to specify that MAC checks are not required. This is needed because vn_rdwr() is used both to service user requests directly, and as a utility function inside UFS and ext2fs. Set the flag when invoking vn_rdwr() inside file systems, but otherwise not. Note that vn_rdwr() still needs an active_cred/saved_cred argument. Affected files ... .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_lookup.c#5 edit .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#5 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#41 edit .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#38 edit .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_lookup.c#7 edit .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#44 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_lookup.c#5 (text+ko) ==== @@ -1009,8 +1009,9 @@ #define MINDIRSIZ (sizeof (struct dirtemplate) / 2) for (off = 0; off < ip->i_size; off += dp->rec_len) { - error = vn_rdwr(UIO_READ, ITOV(ip), (caddr_t)dp, MINDIRSIZ, off, - UIO_SYSSPACE, IO_NODELOCKED, cred, &count, (struct thread *)0); + error = vn_rdwr(UIO_READ, ITOV(ip), (caddr_t)dp, MINDIRSIZ, + off, UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACCHECK, cred, + &count, (struct thread *)0); /* * Since we read MINDIRSIZ, residual must * be 0 unless we're at end of file. @@ -1074,7 +1075,8 @@ } error = vn_rdwr(UIO_READ, vp, (caddr_t)&dirbuf, sizeof (struct dirtemplate), (off_t)0, UIO_SYSSPACE, - IO_NODELOCKED, cred, (int *)0, (struct thread *)0); + IO_NODELOCKED | IO_NOMACCHEK, cred, (int *)0, + (struct thread *)0); if (error != 0) break; namlen = dirbuf.dotdot_type; /* like ufs little-endian */ ==== //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#5 (text+ko) ==== @@ -1220,7 +1220,7 @@ dp->i_flag |= IN_CHANGE; error = vn_rdwr(UIO_READ, fvp, (caddr_t)&dirbuf, sizeof (struct dirtemplate), (off_t)0, - UIO_SYSSPACE, IO_NODELOCKED, + UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACCHECK, tcnp->cn_cred, (int *)0, (struct thread *)0); if (error == 0) { /* Like ufs little-endian: */ @@ -1236,9 +1236,9 @@ (caddr_t)&dirbuf, sizeof (struct dirtemplate), (off_t)0, UIO_SYSSPACE, - IO_NODELOCKED|IO_SYNC, - tcnp->cn_cred, (int *)0, - (struct thread *)0); + IO_NODELOCKED | IO_SYNC | + IO_NOMACCHECK, tcnp->cn_cred, + (int *)0, (struct thread *)0); cache_purge(fdvp); } } @@ -1373,7 +1373,8 @@ dirtemplate.dotdot_reclen = DIRBLKSIZ - 12; error = vn_rdwr(UIO_WRITE, tvp, (caddr_t)&dirtemplate, sizeof (dirtemplate), (off_t)0, UIO_SYSSPACE, - IO_NODELOCKED|IO_SYNC, cnp->cn_cred, (int *)0, (struct thread *)0); + IO_NODELOCKED | IO_SYNC | IO_NOMACCHECK, cnp->cn_cred, (int *)0, + (struct thread *)0); if (error) { dp->i_nlink--; dp->i_flag |= IN_CHANGE; @@ -1509,8 +1510,8 @@ ip->i_flag |= IN_CHANGE | IN_UPDATE; } else error = vn_rdwr(UIO_WRITE, vp, ap->a_target, len, (off_t)0, - UIO_SYSSPACE, IO_NODELOCKED, ap->a_cnp->cn_cred, (int *)0, - (struct thread *)0); + UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACHCHECK, + ap->a_cnp->cn_cred, (int *)0, (struct thread *)0); if (error) vput(vp); return (error); ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#41 (text+ko) ==== @@ -398,23 +398,19 @@ auio.uio_segflg = segflg; auio.uio_rw = rw; auio.uio_td = td; - if (rw == UIO_READ) { -#if 0 + error = 0; #ifdef MAC - /* XXXMAC: we should pass in active_cred to vn_rdwr(). */ - error = mac_check_vnode_read(td->td_ucred, cred, vp); - if (error == 0) + if ((ioflg & IO_NOMACCHECK) == 0) { + if (rw == UIO_READ) + error = mac_check_vnode_read(td->td_ucred, cred, vp); + else + error = mac_check_vnode_write(td->td_ucred, cred, vp); + } #endif -#endif + if (error == 0) { + if (rw == UIO_READ) error = VOP_READ(vp, &auio, ioflg, cred); - } else { -#if 0 -#ifdef MAC - /* XXXMAC: we should pass in active_cred to vn_rdwr(). */ - error = mac_check_vnode_write(td->td_ucred, cred, vp); - if (error == 0) -#endif -#endif + else error = VOP_WRITE(vp, &auio, ioflg, cred); } if (aresid) ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#38 (text+ko) ==== @@ -271,6 +271,7 @@ #define IO_NOWDRAIN 0x0200 /* do not block on wdrain */ #define IO_EXT 0x0400 /* operate on external attributes */ #define IO_NORMAL 0x0800 /* operate on regular data */ +#define IO_NOMACCHECK 0x1000 /* MAC checks unnecessary */ /* * Modes. Some values same as Ixxx entries from inode.h for now. ==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_lookup.c#7 (text+ko) ==== @@ -1151,8 +1151,9 @@ #define MINDIRSIZ (sizeof (struct dirtemplate) / 2) for (off = 0; off < ip->i_size; off += dp->d_reclen) { - error = vn_rdwr(UIO_READ, ITOV(ip), (caddr_t)dp, MINDIRSIZ, off, - UIO_SYSSPACE, IO_NODELOCKED, cred, &count, (struct thread *)0); + error = vn_rdwr(UIO_READ, ITOV(ip), (caddr_t)dp, MINDIRSIZ, + off, UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACCHECK, cred, + &count, (struct thread *)0); /* * Since we read MINDIRSIZ, residual must * be 0 unless we're at end of file. @@ -1224,7 +1225,8 @@ } error = vn_rdwr(UIO_READ, vp, (caddr_t)&dirbuf, sizeof (struct dirtemplate), (off_t)0, UIO_SYSSPACE, - IO_NODELOCKED, cred, (int *)0, (struct thread *)0); + IO_NODELOCKED | IO_NOMACCHECK, cred, (int *)0, + (struct thread *)0); if (error != 0) break; # if (BYTE_ORDER == LITTLE_ENDIAN) ==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#44 (text+ko) ==== @@ -1824,8 +1824,8 @@ ip->i_flag |= IN_CHANGE | IN_UPDATE; } else error = vn_rdwr(UIO_WRITE, vp, ap->a_target, len, (off_t)0, - UIO_SYSSPACE, IO_NODELOCKED, ap->a_cnp->cn_cred, (int *)0, - (struct thread *)0); + UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACCHEKC, + ap->a_cnp->cn_cred, (int *)0, (struct thread *)0); if (error) vput(vp); return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 13:26:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67C4337B401; Thu, 8 Aug 2002 13:25:34 -0700 (PDT) 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 EBDAF37B400 for ; Thu, 8 Aug 2002 13:25:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D3F043E3B for ; Thu, 8 Aug 2002 13:25:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78KPXJU007351 for ; Thu, 8 Aug 2002 13:25:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78KPW25007346 for perforce@freebsd.org; Thu, 8 Aug 2002 13:25:32 -0700 (PDT) Date: Thu, 8 Aug 2002 13:25:32 -0700 (PDT) Message-Id: <200208082025.g78KPW25007346@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15693 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15693 Change 15693 by rwatson@rwatson_paprika on 2002/08/08 13:24:54 Restructure credential handling for a number of struct file operations so that both the file credential and active "requesting" credential are available for access control. This will permit us to have policies that are sensitive to this distinction, either following the traditional UNIX cached credential model, or a live request model. This required changing the arguments to a number of file_op's to use the active credential rather than fp->f_cred, since fp is also passed. In particular, stat, ioctl, and poll didn't already take a credential argument. Affected files ... .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#8 edit .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_misc.c#9 edit .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#12 edit .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ioctl.c#9 edit .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#9 edit .. //depot/projects/trustedbsd/mac/sys/compat/pecoff/imgact_pecoff.c#9 edit .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#9 edit .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_filio.c#5 edit .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_sockio.c#3 edit .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_stream.c#6 edit .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_termios.c#3 edit .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_ttold.c#3 edit .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#8 edit .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.h#3 edit .. //depot/projects/trustedbsd/mac/sys/dev/streams/streams.c#6 edit .. //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_pci.c#4 edit .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#7 edit .. //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#11 edit .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#10 edit .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_fcntl.c#4 edit .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_ioctl.c#6 edit .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/vm_machdep.c#11 edit .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vnops.c#6 edit .. //depot/projects/trustedbsd/mac/sys/kern/imgact_aout.c#8 edit .. //depot/projects/trustedbsd/mac/sys/kern/imgact_elf.c#9 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_acct.c#8 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#23 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#8 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#11 edit .. //depot/projects/trustedbsd/mac/sys/kern/link_aout.c#4 edit .. //depot/projects/trustedbsd/mac/sys/kern/link_elf.c#7 edit .. //depot/projects/trustedbsd/mac/sys/kern/sys_generic.c#12 edit .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#17 edit .. //depot/projects/trustedbsd/mac/sys/kern/sys_socket.c#9 edit .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#34 edit .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#19 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#75 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#42 edit .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_lock.c#8 edit .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/vm_machdep.c#9 edit .. //depot/projects/trustedbsd/mac/sys/sys/file.h#9 edit .. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#20 edit .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#39 edit .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_lookup.c#8 edit .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#45 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#8 (text+ko) ==== @@ -408,12 +408,12 @@ /* XXXKSE this is totally bogus! (and insecure) */ error = vn_rdwr(UIO_WRITE, vp, (caddr_t) td->td_proc->p_uarea, ctob(UAREA_PAGES), (off_t)0, - UIO_SYSSPACE, IO_UNIT, cred, (int *)NULL, td); + UIO_SYSSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); if (error) return error; error = vn_rdwr(UIO_WRITE, vp, (caddr_t) td->td_kstack, ctob(KSTACK_PAGES), (off_t)ctob(UAREA_PAGES), - UIO_SYSSPACE, IO_UNIT, cred, (int *)NULL, td); + UIO_SYSSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); return error; } ==== //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_misc.c#9 (text+ko) ==== @@ -618,7 +618,7 @@ SCARG(uap, path), td); if ((error = namei(&nd))) return (error); - error = vn_stat(nd.ni_vp, &sb, td); + error = vn_stat(nd.ni_vp, &sb, td->td_ucred, NOCRED, td); vput(nd.ni_vp); if (error) return (error); @@ -649,7 +649,7 @@ SCARG(uap, path), td); if ((error = namei(&nd))) return (error); - error = vn_stat(nd.ni_vp, &sb, td); + error = vn_stat(nd.ni_vp, &sb, td->td_ucred, NOCRED, td); vput(nd.ni_vp); if (error) return (error); @@ -674,7 +674,7 @@ if ((error = fget(td, uap->fd, &fp)) != 0) return (error); - error = fo_stat(fp, &ub, td); + error = fo_stat(fp, &ub, td->td_ucred, td); fdrop(fp, td); cvtstat2osf1(&ub, &oub); if (error == 0) ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#12 (text+ko) ==== @@ -143,7 +143,8 @@ PROC_UNLOCK(p); if (!error) { if (fp->f_type == DTYPE_VNODE) - fo_ioctl(fp, TIOCSCTTY, (caddr_t) 0, td); + fo_ioctl(fp, TIOCSCTTY, (caddr_t) 0, td->td_ucred, + td); fdrop(fp, td); } } else { ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ioctl.c#9 (text+ko) ==== @@ -113,7 +113,8 @@ return (error); switch (args->cmd & 0xffff) { case LINUX_BLKGETSIZE: - error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td); + error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td->td_ucred, + td); fdrop(fp, td); if (error) return (error); @@ -560,7 +561,8 @@ switch (args->cmd & 0xffff) { case LINUX_TCGETS: - error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, td); + error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, td->td_ucred, + td); if (error) break; bsd_to_linux_termios(&bios, &lios); @@ -572,7 +574,8 @@ if (error) break; linux_to_bsd_termios(&lios, &bios); - error = (fo_ioctl(fp, TIOCSETA, (caddr_t)&bios, td)); + error = (fo_ioctl(fp, TIOCSETA, (caddr_t)&bios, td->td_ucred, + td)); break; case LINUX_TCSETSW: @@ -580,7 +583,8 @@ if (error) break; linux_to_bsd_termios(&lios, &bios); - error = (fo_ioctl(fp, TIOCSETAW, (caddr_t)&bios, td)); + error = (fo_ioctl(fp, TIOCSETAW, (caddr_t)&bios, td->td_ucred, + td)); break; case LINUX_TCSETSF: @@ -588,11 +592,13 @@ if (error) break; linux_to_bsd_termios(&lios, &bios); - error = (fo_ioctl(fp, TIOCSETAF, (caddr_t)&bios, td)); + error = (fo_ioctl(fp, TIOCSETAF, (caddr_t)&bios, td->td_ucred, + td)); break; case LINUX_TCGETA: - error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, td); + error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, td->td_ucred, + td); if (error) break; bsd_to_linux_termio(&bios, &lio); @@ -604,7 +610,8 @@ if (error) break; linux_to_bsd_termio(&lio, &bios); - error = (fo_ioctl(fp, TIOCSETA, (caddr_t)&bios, td)); + error = (fo_ioctl(fp, TIOCSETA, (caddr_t)&bios, td->td_ucred, + td)); break; case LINUX_TCSETAW: @@ -612,7 +619,8 @@ if (error) break; linux_to_bsd_termio(&lio, &bios); - error = (fo_ioctl(fp, TIOCSETAW, (caddr_t)&bios, td)); + error = (fo_ioctl(fp, TIOCSETAW, (caddr_t)&bios, td->td_ucred, + td)); break; case LINUX_TCSETAF: @@ -620,7 +628,8 @@ if (error) break; linux_to_bsd_termio(&lio, &bios); - error = (fo_ioctl(fp, TIOCSETAF, (caddr_t)&bios, td)); + error = (fo_ioctl(fp, TIOCSETAF, (caddr_t)&bios, td->td_ucred, + td)); break; /* LINUX_TCSBRK */ @@ -637,7 +646,8 @@ case LINUX_TCION: { int c; struct write_args wr; - error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, td); + error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, + td->td_ucred, td); if (error) break; fdrop(fp, td); @@ -799,14 +809,16 @@ fdrop(fp, td); return (EINVAL); } - error = (fo_ioctl(fp, TIOCSETD, (caddr_t)&line, td)); + error = (fo_ioctl(fp, TIOCSETD, (caddr_t)&line, td->td_ucred, + td)); break; } case LINUX_TIOCGETD: { int linux_line; int bsd_line = TTYDISC; - error = fo_ioctl(fp, TIOCGETD, (caddr_t)&bsd_line, td); + error = fo_ioctl(fp, TIOCGETD, (caddr_t)&bsd_line, + td->td_ucred, td); if (error) return (error); switch (bsd_line) { @@ -1275,7 +1287,8 @@ case LINUX_CDROMREADTOCHDR: { struct ioc_toc_header th; struct linux_cdrom_tochdr lth; - error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&th, td); + error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&th, + td->td_ucred, td); if (!error) { lth.cdth_trk0 = th.starting_track; lth.cdth_trk1 = th.ending_track; @@ -1290,7 +1303,8 @@ struct ioc_read_toc_single_entry irtse; irtse.address_format = ltep->cdte_format; irtse.track = ltep->cdte_track; - error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&irtse, td); + error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&irtse, + td->td_ucred, td); if (!error) { lte = *ltep; lte.cdte_ctrl = irtse.entry.control; @@ -1331,7 +1345,8 @@ bsdsc.track = 0; bsdsc.data_len = sizeof(struct cd_sub_channel_info); bsdsc.data = bsdinfo; - error = fo_ioctl(fp, CDIOCREADSUBCHANNEL, (caddr_t)&bsdsc, td); + error = fo_ioctl(fp, CDIOCREADSUBCHANNEL, (caddr_t)&bsdsc, + td->td_ucred, td); if (error) break; error = copyin((caddr_t)args->arg, &sc, @@ -1397,7 +1412,8 @@ error = linux_to_bsd_dvd_struct(&lds, &bds); if (error) break; - error = fo_ioctl(fp, DVDIOCREADSTRUCTURE, (caddr_t)&bds, td); + error = fo_ioctl(fp, DVDIOCREADSTRUCTURE, (caddr_t)&bds, + td->td_ucred, td); if (error) break; error = bsd_to_linux_dvd_struct(&bds, &lds); @@ -1422,7 +1438,7 @@ error = linux_to_bsd_dvd_authinfo(&lda, &bcode, &bda); if (error) break; - error = fo_ioctl(fp, bcode, (caddr_t)&bda, td); + error = fo_ioctl(fp, bcode, (caddr_t)&bda, td->td_ucred, td); if (error) { if (lda.type == LINUX_DVD_HOST_SEND_KEY2) { lda.type = LINUX_DVD_AUTH_FAILURE; @@ -1759,7 +1775,8 @@ fdrop(fp, td); return (EINVAL); } - error = (fo_ioctl(fp, KDSKBMODE, (caddr_t)&kbdmode, td)); + error = (fo_ioctl(fp, KDSKBMODE, (caddr_t)&kbdmode, + td->td_ucred, td)); break; } ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#9 (text+ko) ==== @@ -112,7 +112,7 @@ return (error); NDFREE(&nd, NDF_ONLY_PNBUF); - error = vn_stat(nd.ni_vp, &buf, td); + error = vn_stat(nd.ni_vp, &buf, td->td_ucred, NOCRED, td); vput(nd.ni_vp); if (error) return (error); @@ -143,7 +143,7 @@ return (error); NDFREE(&nd, NDF_ONLY_PNBUF); - error = vn_stat(nd.ni_vp, &sb, td); + error = vn_stat(nd.ni_vp, &sb, td->td_ucred, NOCRED, td); vput(nd.ni_vp); if (error) return (error); @@ -166,7 +166,7 @@ if ((error = fget(td, args->fd, &fp)) != 0) return (error); - error = fo_stat(fp, &buf, td); + error = fo_stat(fp, &buf, td->td_ucred, td); fdrop(fp, td); if (!error) error = newstat_copyout(&buf, args->buf); @@ -433,7 +433,7 @@ return (error); NDFREE(&nd, NDF_ONLY_PNBUF); - error = vn_stat(nd.ni_vp, &buf, td); + error = vn_stat(nd.ni_vp, &buf, td->td_ucred, NOCRED, td); vput(nd.ni_vp); if (error) return (error); @@ -464,7 +464,7 @@ return (error); NDFREE(&nd, NDF_ONLY_PNBUF); - error = vn_stat(nd.ni_vp, &sb, td); + error = vn_stat(nd.ni_vp, &sb, td->td_ucred, NOCRED, td); vput(nd.ni_vp); if (error) return (error); @@ -490,7 +490,7 @@ (fp = fdp->fd_ofiles[args->fd]) == NULL) return (EBADF); - error = fo_stat(fp, &buf, td); + error = fo_stat(fp, &buf, td->td_ucred, td); if (!error) error = stat64_copyout(&buf, args->statbuf); ==== //depot/projects/trustedbsd/mac/sys/compat/pecoff/imgact_pecoff.c#9 (text+ko) ==== @@ -192,14 +192,14 @@ error = vn_rdwr_inchunks(UIO_WRITE, vp, vm->vm_daddr, (int)ctob(vm->vm_dsize), (off_t)ctob((UAREA_PAGES+KSTACK_PAGES)), - UIO_USERSPACE, IO_UNIT, cred, (int *)NULL, td); + UIO_USERSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); if (error == 0) error = vn_rdwr_inchunks(UIO_WRITE, vp, (caddr_t)trunc_page(USRSTACK - ctob(vm->vm_ssize)), round_page(ctob(vm->vm_ssize)), (off_t)ctob((UAREA_PAGES+KSTACK_PAGES)) + ctob(vm->vm_dsize), - UIO_USERSPACE, IO_UNIT, cred, (int *)NULL, td); + UIO_USERSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); return (error); } @@ -609,7 +609,7 @@ size_t resid; error = vn_rdwr(UIO_READ, vp, buf, siz, pos, - UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, + UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, &resid, td); if (error) return error; ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#9 (text+ko) ==== @@ -399,7 +399,8 @@ return (EBADF); /* XXX: correct errno? */ /* ignore any error, just give it a try */ if (fp->f_type == DTYPE_VNODE) - fo_ioctl(fp, TIOCSCTTY, (caddr_t) 0, td); + fo_ioctl(fp, TIOCSCTTY, (caddr_t) 0, td->td_ucred, + td); fdrop(fp, td); } else { PROC_UNLOCK(p); ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_filio.c#5 (text+ko) ==== @@ -219,7 +219,7 @@ #ifdef SVR4_DEBUG if (cmd == FIOASYNC) DPRINTF(("FIOASYNC\n")); #endif - error = fo_ioctl(fp, cmd, (caddr_t) &num, td); + error = fo_ioctl(fp, cmd, (caddr_t) &num, td->td_ucred, td); if (error) return error; ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ==== @@ -125,7 +125,8 @@ (void) strncpy(br.ifr_name, sr.svr4_ifr_name, sizeof(br.ifr_name)); if ((error = fo_ioctl(fp, SIOCGIFFLAGS, - (caddr_t) &br, td)) != 0) { + (caddr_t) &br, td->td_ucred, + td)) != 0) { DPRINTF(("SIOCGIFFLAGS (%s) %s: error %d\n", br.ifr_name, sr.svr4_ifr_name, error)); return error; @@ -148,8 +149,8 @@ sizeof(struct ifreq), sizeof(struct svr4_ifreq), sc.svr4_ifc_len)); - if ((error = fo_ioctl(fp, OSIOCGIFCONF, - (caddr_t) &sc, td)) != 0) + if ((error = fo_ioctl(fp, OSIOCGIFCONF, (caddr_t) &sc, + td->td_ucred, td)) != 0) return error; DPRINTF(("SIOCGIFCONF\n")); ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_stream.c#6 (text+ko) ==== @@ -1267,7 +1267,8 @@ * for us, and if we do, then we assume that we have at least one * message waiting for us. */ - if ((error = fo_ioctl(fp, FIONREAD, (caddr_t) &nread, td)) != 0) + if ((error = fo_ioctl(fp, FIONREAD, (caddr_t) &nread, td->td_ucred, + td)) != 0) return error; if (nread != 0) ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_termios.c#3 (text+ko) ==== @@ -499,7 +499,8 @@ case SVR4_TCGETA: case SVR4_TCGETS: DPRINTF(("ioctl(TCGET%c);\n", cmd == SVR4_TCGETA ? 'A' : 'S')); - if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t) &bt, td)) != 0) + if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t) &bt, + td->td_ucred, td)) != 0) return error; memset(&st, 0, sizeof(st)); @@ -526,7 +527,8 @@ case SVR4_TCSETSF: DPRINTF(("TCSET{A,S,AW,SW,AF,SF}\n")); /* get full BSD termios so we don't lose information */ - if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t) &bt, td)) != 0) + if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t) &bt, + td->td_ucred, td)) != 0) return error; switch (cmd) { @@ -577,14 +579,15 @@ print_svr4_termios(&st); #endif /* DEBUG_SVR4 */ - return fo_ioctl(fp, cmd, (caddr_t) &bt, td); + return fo_ioctl(fp, cmd, (caddr_t) &bt, td->td_ucred, td); case SVR4_TIOCGWINSZ: DPRINTF(("TIOCGWINSZ\n")); { struct svr4_winsize ws; - error = fo_ioctl(fp, TIOCGWINSZ, (caddr_t) &ws, td); + error = fo_ioctl(fp, TIOCGWINSZ, (caddr_t) &ws, + td->td_ucred, td); if (error) return error; return copyout(&ws, data, sizeof(ws)); @@ -597,7 +600,8 @@ if ((error = copyin(data, &ws, sizeof(ws))) != 0) return error; - return fo_ioctl(fp, TIOCSWINSZ, (caddr_t) &ws, td); + return fo_ioctl(fp, TIOCSWINSZ, (caddr_t) &ws, + td->td_ucred, td); } default: ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_ttold.c#3 (text+ko) ==== @@ -192,7 +192,8 @@ { pid_t pid; - if ((error = fo_ioctl(fp, TIOCGPGRP, (caddr_t) &pid, td)) != 0) + if ((error = fo_ioctl(fp, TIOCGPGRP, (caddr_t) &pid, + td->td_ucred, td)) != 0) return error; DPRINTF(("TIOCGPGRP %d\n", pid)); @@ -211,14 +212,16 @@ DPRINTF(("TIOCSPGRP %d\n", pid)); - return fo_ioctl(fp, TIOCSPGRP, (caddr_t) &pid, td); + return fo_ioctl(fp, TIOCSPGRP, (caddr_t) &pid, + td->td_ucred, td); } case SVR4_TIOCGSID: { #if defined(TIOCGSID) pid_t pid; - if ((error = fo_ioctl(fp, TIOCGSID, (caddr_t) &pid, td)) != 0) + if ((error = fo_ioctl(fp, TIOCGSID, (caddr_t) &pid, + td->td_ucred, td)) != 0) return error; DPRINTF(("TIOCGSID %d\n", pid)); @@ -235,7 +238,8 @@ struct sgttyb bs; struct svr4_sgttyb ss; - error = fo_ioctl(fp, TIOCGETP, (caddr_t) &bs, td); + error = fo_ioctl(fp, TIOCGETP, (caddr_t) &bs, + td->td_ucred, td); if (error) return error; @@ -260,7 +264,8 @@ print_svr4_sgttyb("SVR4_TIOCSET{P,N}", &ss); #endif /* DEBUG_SVR4 */ cmd = (cmd == SVR4_TIOCSETP) ? TIOCSETP : TIOCSETN; - return fo_ioctl(fp, cmd, (caddr_t) &bs, td); + return fo_ioctl(fp, cmd, (caddr_t) &bs, td->td_ucred, + td); } case SVR4_TIOCGETC: @@ -268,7 +273,8 @@ struct tchars bt; struct svr4_tchars st; - error = fo_ioctl(fp, TIOCGETC, (caddr_t) &bt, td); + error = fo_ioctl(fp, TIOCGETC, (caddr_t) &bt, + td->td_ucred, td); if (error) return error; @@ -291,7 +297,8 @@ #ifdef DEBUG_SVR4 print_svr4_tchars("SVR4_TIOCSETC", &st); #endif /* DEBUG_SVR4 */ - return fo_ioctl(fp, TIOCSETC, (caddr_t) &bt, td); + return fo_ioctl(fp, TIOCSETC, (caddr_t) &bt, + td->td_ucred, td); } case SVR4_TIOCGLTC: @@ -299,7 +306,8 @@ struct ltchars bl; struct svr4_ltchars sl; - error = fo_ioctl(fp, TIOCGLTC, (caddr_t) &bl, td); + error = fo_ioctl(fp, TIOCGLTC, (caddr_t) &bl, + td->td_ucred, td); if (error) return error; @@ -322,13 +330,15 @@ #ifdef DEBUG_SVR4 print_svr4_ltchars("SVR4_TIOCSLTC", &sl); #endif /* DEBUG_SVR4 */ - return fo_ioctl(fp, TIOCSLTC, (caddr_t) &bl, td); + return fo_ioctl(fp, TIOCSLTC, (caddr_t) &bl, + td->td_ucred, td); } case SVR4_TIOCLGET: { int flags; - if ((error = fo_ioctl(fp, TIOCLGET, (caddr_t) &flags, td)) != 0) + if ((error = fo_ioctl(fp, TIOCLGET, (caddr_t) &flags, + td->td_ucred, td)) != 0) return error; DPRINTF(("SVR4_TIOCLGET %o\n", flags)); return copyout(&flags, data, sizeof(flags)); @@ -356,7 +366,8 @@ } DPRINTF(("SVR4_TIOCL{SET,BIS,BIC} %o\n", flags)); - return fo_ioctl(fp, cmd, (caddr_t) &flags, td); + return fo_ioctl(fp, cmd, (caddr_t) &flags, + td->td_ucred, td); } default: ==== //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#8 (text+ko) ==== @@ -2535,7 +2535,7 @@ /* * Pass the ioctl off to our standard handler. */ - error = (fo_ioctl(fp, cmd, (caddr_t)args->arg, td)); + error = (fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td)); fdrop(fp, td); return (error); } ==== //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.h#3 (text+ko) ==== @@ -1439,7 +1439,11 @@ /* * Pass the ioctl off to our standard handler. */ +#if (__FreeBSD_version >= 500000) + return(fo_ioctl(fp, cmd, data, p->td_ucred)); +#else return(fo_ioctl(fp, cmd, data, p)); +#endif } #endif /* DRM_LINUX */ #endif /* __FreeBSD__ */ ==== //depot/projects/trustedbsd/mac/sys/dev/streams/streams.c#6 (text+ko) ==== @@ -61,7 +61,7 @@ #include #include -static int svr4_soo_close(struct file *, struct thread *); +static int svr4_soo_close(struct file *, struct ucred *, struct thread *); static int svr4_ptm_alloc(struct thread *); static d_open_t streamsopen; @@ -416,7 +416,7 @@ } static int -svr4_soo_close(struct file *fp, struct thread *td) +svr4_soo_close(struct file *fp, struct ucred *active_cred, struct thread *td) { struct socket *so = (struct socket *)fp->f_data; @@ -424,5 +424,5 @@ svr4_delete_socket(td->td_proc, fp); free(so->so_emuldata, M_TEMP); - return soo_close(fp, td); + return soo_close(fp, active_cred, td); } ==== //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_pci.c#4 (text+ko) ==== @@ -848,7 +848,7 @@ return (error); /* We simply copy the data and send it right to ioctl */ copyin((caddr_t)args->arg, &d_pio, sizeof(d_pio)); - error = fo_ioctl(fp, cmd, (caddr_t)&d_pio, td); + error = fo_ioctl(fp, cmd, (caddr_t)&d_pio, td->td_ucred, td); fdrop(fp, td); return error; } ==== //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#7 (text+ko) ==== @@ -302,7 +302,7 @@ return (error); bzero(&stb, sizeof(stb)); - error = fo_stat(fp, &stb, ap->a_td); + error = fo_stat(fp, &stb, ap->a_td->td_ucred, ap->a_td); fdrop(fp, ap->a_td); if (error == 0) { VATTR_NULL(vap); ==== //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#11 (text+ko) ==== @@ -348,13 +348,17 @@ return (0); if (ap->a_fflag & FREAD) { filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_readsock; - error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_td); + filetmp.f_cred = ap->a_cred; + error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, + ap->a_td->td_ucred, ap->a_td); if (error) return (error); } if (ap->a_fflag & FWRITE) { filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_writesock; - error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_td); + filetmp.f_cred = ap->a_cred; + error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, + ap->a_td->td_ucred, ap->a_td); if (error) return (error); } @@ -488,9 +492,10 @@ events = ap->a_events & (POLLOUT | POLLWRNORM | POLLWRBAND); if (events) { filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_writesock; + filetmp.f_cred = ap->a_cred; if (filetmp.f_data) - revents |= soo_poll(&filetmp, events, ap->a_cred, - ap->a_td); + revents |= soo_poll(&filetmp, events, + ap->a_td->td_ucred, ap->a_td); } return (revents); } ==== //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#10 (text+ko) ==== @@ -470,7 +470,8 @@ error = vn_rdwr(UIO_WRITE, vp, (caddr_t) tempuser, ctob(UAREA_PAGES + KSTACK_PAGES), - (off_t)0, UIO_SYSSPACE, IO_UNIT, cred, (int *)NULL, td); + (off_t)0, UIO_SYSSPACE, IO_UNIT, cred, NOCRED, + (int *)NULL, td); free(tempuser, M_TEMP); ==== //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_fcntl.c#4 (text+ko) ==== @@ -203,7 +203,8 @@ /* ignore any error, just give it a try */ if (fp->f_type == DTYPE_VNODE) - fo_ioctl(fp, TIOCSCTTY, (caddr_t) 0, td); + fo_ioctl(fp, TIOCSCTTY, (caddr_t) 0, td->td_ucred, + td); fdrop(fp, td); } else PROC_UNLOCK(p); ==== //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_ioctl.c#6 (text+ko) ==== @@ -365,7 +365,8 @@ struct ibcs2_termios sts; struct ibcs2_termio st; - if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bts, td)) != 0) + if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bts, + td->td_ucred, td)) != 0) break; btios2stios (&bts, &sts); @@ -403,7 +404,8 @@ } /* get full BSD termios so we don't lose information */ - if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bts, td)) != 0) { + if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bts, + td->td_ucred, td)) != 0) { DPRINTF(("ibcs2_ioctl(%d): TCSET ctl failed fd %d ", p->p_pid, SCARG(uap, fd))); break; @@ -418,7 +420,7 @@ stios2btios(&sts, &bts); error = fo_ioctl(fp, SCARG(uap, cmd) - IBCS2_TCSETA + TIOCSETA, - (caddr_t)&bts, td); + (caddr_t)&bts, td->td_ucred, td); break; } @@ -434,7 +436,7 @@ break; stios2btios (&sts, &bts); error = fo_ioctl(fp, SCARG(uap, cmd) - IBCS2_XCSETA + TIOCSETA, - (caddr_t)&bts, td); + (caddr_t)&bts, td->td_ucred, td); break; } @@ -450,7 +452,7 @@ break; stios2btios (&sts, &bts); error = fo_ioctl(fp, SCARG(uap, cmd) - IBCS2_OXCSETA + TIOCSETA, - (caddr_t)&bts, td); + (caddr_t)&bts, td->td_ucred, td); break; } @@ -468,10 +470,12 @@ error = ENOSYS; break; case 2: - error = fo_ioctl(fp, TIOCSTOP, (caddr_t)0, td); + error = fo_ioctl(fp, TIOCSTOP, (caddr_t)0, + td->td_ucred, td); break; case 3: - error = fo_ioctl(fp, TIOCSTART, (caddr_t)1, td); + error = fo_ioctl(fp, TIOCSTART, (caddr_t)1, + td->td_ucred, td); break; default: error = EINVAL; @@ -498,7 +502,8 @@ fdrop(fp, td); return EINVAL; } - error = fo_ioctl(fp, TIOCFLUSH, (caddr_t)&arg, td); + error = fo_ioctl(fp, TIOCFLUSH, (caddr_t)&arg, td->td_ucred, + td); break; } ==== //depot/projects/trustedbsd/mac/sys/ia64/ia64/vm_machdep.c#11 (text+ko) ==== @@ -375,12 +375,12 @@ error = vn_rdwr(UIO_WRITE, vp, (caddr_t) td->td_proc->p_uarea, ctob(UAREA_PAGES), (off_t)0, - UIO_SYSSPACE, IO_UNIT, cred, (int *)NULL, td); + UIO_SYSSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); if (error) return error; error = vn_rdwr(UIO_WRITE, vp, (caddr_t) td->td_kstack, ctob(KSTACK_PAGES), (off_t)0, - UIO_SYSSPACE, IO_UNIT, cred, (int *)NULL, td); + UIO_SYSSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); return error; } ==== //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vnops.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/kern/imgact_aout.c#8 (text+ko) ==== @@ -271,14 +271,14 @@ error = vn_rdwr(UIO_WRITE, vp, vm->vm_daddr, (int)ctob(vm->vm_dsize), (off_t)ctob(UAREA_PAGES + KSTACK_PAGES), UIO_USERSPACE, - IO_UNIT | IO_DIRECT, cred, (int *) NULL, td); + IO_UNIT | IO_DIRECT, cred, NOCRED, (int *) NULL, td); if (error == 0) error = vn_rdwr_inchunks(UIO_WRITE, vp, (caddr_t) trunc_page(USRSTACK - ctob(vm->vm_ssize)), round_page(ctob(vm->vm_ssize)), (off_t)ctob(UAREA_PAGES + KSTACK_PAGES) + ctob(vm->vm_dsize), UIO_USERSPACE, - IO_UNIT | IO_DIRECT, cred, (int *) NULL, td); + IO_UNIT | IO_DIRECT, cred, NOCRED, (int *) NULL, td); return (error); } ==== //depot/projects/trustedbsd/mac/sys/kern/imgact_elf.c#9 (text+ko) ==== @@ -972,7 +972,8 @@ error = vn_rdwr_inchunks(UIO_WRITE, vp, (caddr_t)(uintptr_t)php->p_vaddr, php->p_filesz, offset, UIO_USERSPACE, - IO_UNIT | IO_DIRECT, cred, (int *)NULL, curthread); /* XXXKSE */ + IO_UNIT | IO_DIRECT, cred, NOCRED, (int *)NULL, + curthread); /* XXXKSE */ if (error != 0) break; offset += php->p_filesz; @@ -1136,7 +1137,8 @@ /* Write it to the core file. */ return vn_rdwr_inchunks(UIO_WRITE, vp, hdr, hdrsize, (off_t)0, - UIO_SYSSPACE, IO_UNIT | IO_DIRECT, cred, NULL, td); /* XXXKSE */ + UIO_SYSSPACE, IO_UNIT | IO_DIRECT, cred, NOCRED, NULL, + td); /* XXXKSE */ } static void ==== //depot/projects/trustedbsd/mac/sys/kern/kern_acct.c#8 (text+ko) ==== @@ -267,7 +267,7 @@ */ VOP_LEASE(vp, td, acctcred, LEASE_WRITE); return (vn_rdwr(UIO_WRITE, vp, (caddr_t)&acct, sizeof (acct), - (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, acctcred, + (off_t)0, UIO_SYSSPACE, IO_APPEND|IO_UNIT, acctcred, NOCRED, (int *)0, td)); } ==== //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#23 (text+ko) ==== @@ -98,16 +98,19 @@ /* flags */ 0, }; -static int do_dup(struct filedesc *fdp, int old, int new, register_t *retval, struct thread *td); +static int do_dup(struct filedesc *fdp, int old, int new, register_t *retval, + struct thread *td); static int badfo_readwrite(struct file *fp, struct uio *uio, - struct ucred *cred, int flags, struct thread *td); + struct ucred *active_cred, int flags, struct thread *td); static int badfo_ioctl(struct file *fp, u_long com, void *data, + struct ucred *active_cred, struct thread *td); +static int badfo_poll(struct file *fp, int events, struct ucred *active_cred, struct thread *td); -static int badfo_poll(struct file *fp, int events, - struct ucred *cred, struct thread *td); static int badfo_kqfilter(struct file *fp, struct knote *kn); -static int badfo_stat(struct file *fp, struct stat *sb, struct thread *td); -static int badfo_close(struct file *fp, struct thread *td); +static int badfo_stat(struct file *fp, struct stat *sb, + struct ucred *active_cred, struct thread *td); +static int badfo_close(struct file *fp, struct ucred *active_cred, + struct thread *td); /* * Descriptor management. @@ -343,34 +346,35 @@ fp->f_flag &= ~FCNTLFLAGS; fp->f_flag |= FFLAGS(uap->arg & ~O_ACCMODE) & FCNTLFLAGS; tmp = fp->f_flag & FNONBLOCK; - error = fo_ioctl(fp, FIONBIO, &tmp, td); + error = fo_ioctl(fp, FIONBIO, &tmp, td->td_ucred, td); if (error) { fdrop(fp, td); break; } tmp = fp->f_flag & FASYNC; - error = fo_ioctl(fp, FIOASYNC, &tmp, td); + error = fo_ioctl(fp, FIOASYNC, &tmp, td->td_ucred, td); if (!error) { fdrop(fp, td); break; } fp->f_flag &= ~FNONBLOCK; tmp = 0; - (void)fo_ioctl(fp, FIONBIO, &tmp, td); + (void)fo_ioctl(fp, FIONBIO, &tmp, td->td_ucred, td); fdrop(fp, td); break; case F_GETOWN: fhold(fp); FILEDESC_UNLOCK(fdp); - error = fo_ioctl(fp, FIOGETOWN, (void *)td->td_retval, td); + error = fo_ioctl(fp, FIOGETOWN, (void *)td->td_retval, + td->td_ucred, td); fdrop(fp, td); break; case F_SETOWN: fhold(fp); FILEDESC_UNLOCK(fdp); - error = fo_ioctl(fp, FIOSETOWN, &uap->arg, td); + error = fo_ioctl(fp, FIOSETOWN, &uap->arg, td->td_ucred, td); fdrop(fp, td); break; @@ -860,7 +864,7 @@ mtx_lock(&Giant); if ((error = fget(td, uap->fd, &fp)) != 0) goto done2; - error = fo_stat(fp, &ub, td); + error = fo_stat(fp, &ub, td->td_ucred, td); if (error == 0) { cvtstat(&ub, &oub); error = copyout(&oub, uap->sb, sizeof (oub)); @@ -897,7 +901,7 @@ mtx_lock(&Giant); if ((error = fget(td, uap->fd, &fp)) != 0) goto done2; - error = fo_stat(fp, &ub, td); + error = fo_stat(fp, &ub, td->td_ucred, td); if (error == 0) error = copyout(&ub, uap->sb, sizeof (ub)); fdrop(fp, td); @@ -932,7 +936,7 @@ mtx_lock(&Giant); if ((error = fget(td, uap->fd, &fp)) != 0) goto done2; - error = fo_stat(fp, &ub, td); + error = fo_stat(fp, &ub, td->td_ucred, td); if (error == 0) { cvtnstat(&ub, &nub); error = copyout(&nub, uap->sb, sizeof (nub)); @@ -1844,7 +1848,7 @@ } else >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 14: 7:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62FFE37B401; Thu, 8 Aug 2002 14:07:24 -0700 (PDT) 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 E05C137B400 for ; Thu, 8 Aug 2002 14:07:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88B8E43E65 for ; Thu, 8 Aug 2002 14:07:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78L7NJU015076 for ; Thu, 8 Aug 2002 14:07:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78L7NW9015073 for perforce@freebsd.org; Thu, 8 Aug 2002 14:07:23 -0700 (PDT) Date: Thu, 8 Aug 2002 14:07:23 -0700 (PDT) Message-Id: <200208082107.g78L7NW9015073@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15694 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15694 Change 15694 by rwatson@rwatson_paprika on 2002/08/08 14:06:54 Spell mac_policy_args correctly. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#230 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#230 (text+ko) ==== @@ -3202,7 +3202,7 @@ } int -mac_policy(struct thread *td, struct mac_policy *uap) +mac_policy(struct thread *td, struct mac_policy_args *uap) { return (ENOSYS); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 14: 8:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E7AD37B401; Thu, 8 Aug 2002 14:08:26 -0700 (PDT) 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 B5AF437B400 for ; Thu, 8 Aug 2002 14:08:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CECE43E3B for ; Thu, 8 Aug 2002 14:08:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78L8PJU015212 for ; Thu, 8 Aug 2002 14:08:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78L8Pd6015209 for perforce@freebsd.org; Thu, 8 Aug 2002 14:08:25 -0700 (PDT) Date: Thu, 8 Aug 2002 14:08:25 -0700 (PDT) Message-Id: <200208082108.g78L8Pd6015209@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15695 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15695 Change 15695 by rwatson@rwatson_paprika on 2002/08/08 14:07:27 Build MAC as part of NOTES/LINT. Affected files ... .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#12 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/NOTES#12 (text+ko) ==== @@ -728,7 +728,7 @@ # SECURITY POLICY PARAMETERS # Support for Mandatory Access Control (MAC) -#options MAC +options MAC #options MAC_NONE # Statically link mac_none policy To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 14:22:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E17DD37B405; Thu, 8 Aug 2002 14:22:43 -0700 (PDT) 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 534BA37B400 for ; Thu, 8 Aug 2002 14:22:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E13F43E42 for ; Thu, 8 Aug 2002 14:22:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78LMgJU016680 for ; Thu, 8 Aug 2002 14:22:42 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78LMg4G016677 for perforce@freebsd.org; Thu, 8 Aug 2002 14:22:42 -0700 (PDT) Date: Thu, 8 Aug 2002 14:22:42 -0700 (PDT) Message-Id: <200208082122.g78LMg4G016677@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15696 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15696 Change 15696 by rwatson@rwatson_paprika on 2002/08/08 14:22:34 Compile fixes to MAC support in AppleTalk. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netatalk/aarp.c#5 edit .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_input.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netatalk/aarp.c#5 (text+ko) ==== @@ -131,7 +131,7 @@ return; } #ifdef MAC - mac_create_mbuf_linklayer(ac->ac_if, m); + mac_create_mbuf_linklayer(&ac->ac_if, m); #endif m->m_len = sizeof( *ea ); m->m_pkthdr.len = sizeof( *ea ); @@ -555,7 +555,7 @@ return; } #ifdef MAC - mac_create_mbuf_linklayer(ac->ac_if, m); + mac_create_mbuf_linklayer(&ac->ac_if, m); #endif m->m_len = sizeof( *ea ); m->m_pkthdr.len = sizeof( *ea ); ==== //depot/projects/trustedbsd/mac/sys/netatalk/ddp_input.c#7 (text+ko) ==== @@ -398,7 +398,7 @@ } #ifdef MAC - if (mac_check_socket_receive(&ddp->ddp_socket, m) != 0) { + if (mac_check_socket_receive(ddp->ddp_socket, m) != 0) { m_freem( m ); return; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 14:26:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0363337B401; Thu, 8 Aug 2002 14:26:49 -0700 (PDT) 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 A53AD37B400 for ; Thu, 8 Aug 2002 14:26:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6251443E6E for ; Thu, 8 Aug 2002 14:26:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78LQmJU017076 for ; Thu, 8 Aug 2002 14:26:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78LQm0N017073 for perforce@freebsd.org; Thu, 8 Aug 2002 14:26:48 -0700 (PDT) Date: Thu, 8 Aug 2002 14:26:48 -0700 (PDT) Message-Id: <200208082126.g78LQm0N017073@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15697 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15697 Change 15697 by rwatson@rwatson_paprika on 2002/08/08 14:25:55 Compile fix for multicast encapsulation mac labeling. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.c#12 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.c#12 (text+ko) ==== @@ -1632,7 +1632,7 @@ if (mb_copy == NULL) return; #ifdef MAC - mac_create_mbuf_multicast_encap(m, vifp, mb_copy); + mac_create_mbuf_multicast_encap(m, vifp->v_ifp, mb_copy); #endif mb_copy->m_data += max_linkhdr; mb_copy->m_len = sizeof(multicast_encap_iphdr); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 14:26:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1865037B400; Thu, 8 Aug 2002 14:26:51 -0700 (PDT) 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 24A1437B409 for ; Thu, 8 Aug 2002 14:26:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB0C643E6E for ; Thu, 8 Aug 2002 14:26:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78LQmJU017083 for ; Thu, 8 Aug 2002 14:26:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78LQmqf017080 for perforce@freebsd.org; Thu, 8 Aug 2002 14:26:48 -0700 (PDT) Date: Thu, 8 Aug 2002 14:26:48 -0700 (PDT) Message-Id: <200208082126.g78LQmqf017080@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15698 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15698 Change 15698 by rwatson@rwatson_paprika on 2002/08/08 14:26:20 Compile fix for TCP debugging, due to inclusion of IP fragmentation header (?). Parallel fix to an identical fix in the main tree. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_debug.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_debug.c#3 (text+ko) ==== @@ -51,6 +51,7 @@ #endif #include +#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 14:35: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 01D1F37B405; Thu, 8 Aug 2002 14:34:59 -0700 (PDT) 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 668D937B400 for ; Thu, 8 Aug 2002 14:34:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1716043E5E for ; Thu, 8 Aug 2002 14:34:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78LYwJU017909 for ; Thu, 8 Aug 2002 14:34:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78LYw2U017906 for perforce@freebsd.org; Thu, 8 Aug 2002 14:34:58 -0700 (PDT) Date: Thu, 8 Aug 2002 14:34:58 -0700 (PDT) Message-Id: <200208082134.g78LYw2U017906@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15699 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15699 Change 15699 by rwatson@rwatson_paprika on 2002/08/08 14:34:27 Various fixes for compilation relating to recent vn_rdwr() and fo_ioctl() argument changes for modules not compiled by default. Affected files ... .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.h#4 edit .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_lookup.c#6 edit .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.h#4 (text+ko) ==== @@ -1440,7 +1440,7 @@ * Pass the ioctl off to our standard handler. */ #if (__FreeBSD_version >= 500000) - return(fo_ioctl(fp, cmd, data, p->td_ucred)); + return(fo_ioctl(fp, cmd, data, p->td_ucred, p)); #else return(fo_ioctl(fp, cmd, data, p)); #endif ==== //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_lookup.c#6 (text+ko) ==== @@ -1011,7 +1011,7 @@ for (off = 0; off < ip->i_size; off += dp->rec_len) { error = vn_rdwr(UIO_READ, ITOV(ip), (caddr_t)dp, MINDIRSIZ, off, UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACCHECK, cred, - &count, (struct thread *)0); + NOCRED, &count, (struct thread *)0); /* * Since we read MINDIRSIZ, residual must * be 0 unless we're at end of file. @@ -1075,7 +1075,7 @@ } error = vn_rdwr(UIO_READ, vp, (caddr_t)&dirbuf, sizeof (struct dirtemplate), (off_t)0, UIO_SYSSPACE, - IO_NODELOCKED | IO_NOMACCHEK, cred, (int *)0, + IO_NODELOCKED | IO_NOMACCHECK, cred, NOCRED, (int *)0, (struct thread *)0); if (error != 0) break; ==== //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#6 (text+ko) ==== @@ -1221,7 +1221,8 @@ error = vn_rdwr(UIO_READ, fvp, (caddr_t)&dirbuf, sizeof (struct dirtemplate), (off_t)0, UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACCHECK, - tcnp->cn_cred, (int *)0, (struct thread *)0); + tcnp->cn_cred, NOCRED, (int *)0, + (struct thread *)0); if (error == 0) { /* Like ufs little-endian: */ namlen = dirbuf.dotdot_type; @@ -1238,7 +1239,8 @@ (off_t)0, UIO_SYSSPACE, IO_NODELOCKED | IO_SYNC | IO_NOMACCHECK, tcnp->cn_cred, - (int *)0, (struct thread *)0); + NOCRED, (int *)0, + (struct thread *)0); cache_purge(fdvp); } } @@ -1373,8 +1375,8 @@ dirtemplate.dotdot_reclen = DIRBLKSIZ - 12; error = vn_rdwr(UIO_WRITE, tvp, (caddr_t)&dirtemplate, sizeof (dirtemplate), (off_t)0, UIO_SYSSPACE, - IO_NODELOCKED | IO_SYNC | IO_NOMACCHECK, cnp->cn_cred, (int *)0, - (struct thread *)0); + IO_NODELOCKED | IO_SYNC | IO_NOMACCHECK, cnp->cn_cred, NOCRED, + (int *)0, (struct thread *)0); if (error) { dp->i_nlink--; dp->i_flag |= IN_CHANGE; @@ -1510,8 +1512,9 @@ ip->i_flag |= IN_CHANGE | IN_UPDATE; } else error = vn_rdwr(UIO_WRITE, vp, ap->a_target, len, (off_t)0, - UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACHCHECK, - ap->a_cnp->cn_cred, (int *)0, (struct thread *)0); + UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACCHECK, + ap->a_cnp->cn_cred, NOCRED, (int *)0, + (struct thread *)0); if (error) vput(vp); return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 14:56:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 268AB37B401; Thu, 8 Aug 2002 14:56:26 -0700 (PDT) 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 A978337B400 for ; Thu, 8 Aug 2002 14:56:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 649FF43E70 for ; Thu, 8 Aug 2002 14:56:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78LuPJU019616 for ; Thu, 8 Aug 2002 14:56:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78LuP4C019613 for perforce@freebsd.org; Thu, 8 Aug 2002 14:56:25 -0700 (PDT) Date: Thu, 8 Aug 2002 14:56:25 -0700 (PDT) Message-Id: <200208082156.g78LuP4C019613@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15700 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15700 Change 15700 by rwatson@rwatson_paprika on 2002/08/08 14:56:24 In vn_rdwr(), use the saved_cred to authorize calls into VOP_READ() and VOP_WRITE(), except in the case where no saved_cred is provided, in which case we authorize using active_cred. This provides compability with the old behavior by making sure a credential is always available. It should always also be the same credential seen previously. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#43 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#43 (text+ko) ==== @@ -378,6 +378,7 @@ struct uio auio; struct iovec aiov; struct mount *mp; + struct ucred *cred; int error; if ((ioflg & IO_NODELOCKED) == 0) { @@ -414,6 +415,11 @@ } #endif if (error == 0) { + if (saved_cred) + cred = saved_cred; + else + cred = active_cred; + if (rw == UIO_READ) error = VOP_READ(vp, &auio, ioflg, saved_cred); else To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 15: 6:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDFE237B401; Thu, 8 Aug 2002 15:06:38 -0700 (PDT) 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 7990537B400 for ; Thu, 8 Aug 2002 15:06:38 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 361CE43E6E for ; Thu, 8 Aug 2002 15:06:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78M6cJU024540 for ; Thu, 8 Aug 2002 15:06:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78M6b5a024535 for perforce@freebsd.org; Thu, 8 Aug 2002 15:06:37 -0700 (PDT) Date: Thu, 8 Aug 2002 15:06:37 -0700 (PDT) Message-Id: <200208082206.g78M6b5a024535@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15701 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15701 Change 15701 by rwatson@rwatson_tislabs on 2002/08/08 15:06:02 Actually pass cred to VOP_READ() and VOP_WRITE(). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#44 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#44 (text+ko) ==== @@ -421,9 +421,9 @@ cred = active_cred; if (rw == UIO_READ) - error = VOP_READ(vp, &auio, ioflg, saved_cred); + error = VOP_READ(vp, &auio, ioflg, cred); else - error = VOP_WRITE(vp, &auio, ioflg, saved_cred); + error = VOP_WRITE(vp, &auio, ioflg, cred); } if (aresid) *aresid = auio.uio_resid; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 15:13:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08B6B37B401; Thu, 8 Aug 2002 15:13:48 -0700 (PDT) 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 9E13137B400 for ; Thu, 8 Aug 2002 15:13:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B89143E65 for ; Thu, 8 Aug 2002 15:13:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78MDlJU025245 for ; Thu, 8 Aug 2002 15:13:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78MDlw0025242 for perforce@freebsd.org; Thu, 8 Aug 2002 15:13:47 -0700 (PDT) Date: Thu, 8 Aug 2002 15:13:47 -0700 (PDT) Message-Id: <200208082213.g78MDlw0025242@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15702 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15702 Change 15702 by rwatson@rwatson_tislabs on 2002/08/08 15:12:47 Permit an empty string as a label, as that's now the "noop" change request for TE labels. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#69 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#69 (text+ko) ==== @@ -477,11 +477,7 @@ } if (i == MAC_TE_TYPE_MAXLEN + 1) return (EINVAL); - /* Check that it's a non-nul string. */ - if (strlen(label->mt_type) == 0) - return (EINVAL); - else - return (0); + return (0); } static int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 15:19: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2C9837B401; Thu, 8 Aug 2002 15:18:54 -0700 (PDT) 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 5601E37B400 for ; Thu, 8 Aug 2002 15:18:54 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DC9643E70 for ; Thu, 8 Aug 2002 15:18:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g78MIrJU025584 for ; Thu, 8 Aug 2002 15:18:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g78MIrBo025581 for perforce@freebsd.org; Thu, 8 Aug 2002 15:18:53 -0700 (PDT) Date: Thu, 8 Aug 2002 15:18:53 -0700 (PDT) Message-Id: <200208082218.g78MIrBo025581@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15703 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15703 Change 15703 by rwatson@rwatson_tislabs on 2002/08/08 15:18:28 Remove suser() exemptions for subject credential relabeling-- these were for debugging/development purposes only. The root user is no longer given special privilege to bypass label requirements for processes. Su and other user programs manipulating labels will still try to set the label based on user class policy, but they may fail if their own labels can't be relabeled to the requested user label for policy reasons. The only remaining explicit exemption for the superuser is for interface relabeling, and that probably requires us to have some notion of a security administrator role for MLS and Biba. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#95 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#77 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#95 (text+ko) ==== @@ -1261,13 +1261,6 @@ */ if (new->mb_flags & MAC_BIBA_FLAGS_BOTH) { /* - * Exempt traditional superuser processes from the Biba - * relabel requirements. XXXMAC: This will go away. - */ - if (suser_cred(cred, 0) == 0) - return (0); - - /* * To change the Biba single label on a credential, the * new single label must be in the current range. */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#77 (text+ko) ==== @@ -1209,13 +1209,6 @@ */ if (new->mm_flags & MAC_MLS_FLAGS_BOTH) { /* - * Exempt traditional superuser processes from the MLS - * relabel requirements. XXXMAC: This will go away. - */ - if (suser_cred(cred, 0) == 0) - return (0); - - /* * To change the MLS single label on a credential, the * new single label must be in the current range. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 19:53:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E5F237B401; Thu, 8 Aug 2002 19:53:38 -0700 (PDT) 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 D305C37B400 for ; Thu, 8 Aug 2002 19:53:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FFD343E77 for ; Thu, 8 Aug 2002 19:53:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g792rbJU075004 for ; Thu, 8 Aug 2002 19:53:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g792rbOD075001 for perforce@freebsd.org; Thu, 8 Aug 2002 19:53:37 -0700 (PDT) Date: Thu, 8 Aug 2002 19:53:37 -0700 (PDT) Message-Id: <200208090253.g792rbOD075001@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15706 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15706 Change 15706 by rwatson@rwatson_paprika on 2002/08/08 19:52:52 Synchronize $FreeBSD$ which gets silently dropped in the baseless merge. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#15 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.3#6 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_biba.c#5 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.3#5 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.c#3 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.3#6 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.8 2002/06/13 23:40:13 rwatson Exp $ +# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.9 2002/08/02 21:14:42 rwatson Exp $ MAINTAINER= rwatson@FreeBSD.org ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.3#6 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libc/posix1e/mac.3,v 1.1 2002/08/02 21:14:42 rwatson Exp $ .Dd December 21, 2001 .Dt MAC 3 .Sh NAME ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_biba.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/lib/libc/posix1e/mac_biba.c,v 1.1 2002/08/02 21:14:42 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.3#5 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libc/posix1e/mac_free.3,v 1.1 2002/08/02 21:14:42 rwatson Exp $ .Dd December 21, 2001 .Dt MAC_FREE 3 .Os ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/lib/libc/posix1e/mac_free.c,v 1.1 2002/08/02 21:14:42 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.3#6 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libc/posix1e/mac_get.3,v 1.1 2002/08/02 21:14:42 rwatson Exp $ .Dd December 21, 2001 .Dt MAC_GET 3 .Sh NAME ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/lib/libc/posix1e/mac_get.c,v 1.1 2002/08/02 21:14:42 rwatson Exp $ */ #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 19:57:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 236DD37B405; Thu, 8 Aug 2002 19:57:21 -0700 (PDT) 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 BC41E37B401 for ; Thu, 8 Aug 2002 19:57:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB3DF43E3B for ; Thu, 8 Aug 2002 19:56:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g792ufJU075201 for ; Thu, 8 Aug 2002 19:56:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g792ufXD075198 for perforce@freebsd.org; Thu, 8 Aug 2002 19:56:41 -0700 (PDT) Date: Thu, 8 Aug 2002 19:56:41 -0700 (PDT) Message-Id: <200208090256.g792ufXD075198@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15707 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15707 Change 15707 by rwatson@rwatson_paprika on 2002/08/08 19:55:57 More $FreeBSD$ synchronization. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_internal.h#3 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_is_present_np.3#4 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_is_present_np.c#5 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_mls.c#4 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_sebsd.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_internal.h#3 (text+ko) ==== @@ -34,7 +34,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/lib/libc/posix1e/mac_internal.h,v 1.1 2002/08/02 21:14:42 rwatson Exp $ + */ + +/* + * Eventually, these per-policy interfaces will be handled via a + * standard userland MAC module interface. */ int mac_biba_label_from_string __P((char *string, struct mac *label)); ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_is_present_np.3#4 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libc/posix1e/mac_is_present_np.3,v 1.1 2002/08/02 21:14:42 rwatson Exp $ .Dd January 9, 2002 .Dt MAC_IS_PRESENT_NP 3 .Sh NAME ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_is_present_np.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/lib/libc/posix1e/mac_is_present_np.c,v 1.1 2002/08/02 21:14:42 rwatson Exp $ */ #include #include ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_mls.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/lib/libc/posix1e/mac_mls.c,v 1.1 2002/08/02 21:14:42 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_sebsd.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/lib/libc/posix1e/mac_sebsd.c,v 1.1 2002/08/02 21:14:42 rwatson Exp $ */ #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 20: 8: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5140237B401; Thu, 8 Aug 2002 20:07:56 -0700 (PDT) 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 0C96937B400 for ; Thu, 8 Aug 2002 20:07:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A242743E5E for ; Thu, 8 Aug 2002 20:07:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7937tJU080360 for ; Thu, 8 Aug 2002 20:07:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7937tMA080357 for perforce@freebsd.org; Thu, 8 Aug 2002 20:07:55 -0700 (PDT) Date: Thu, 8 Aug 2002 20:07:55 -0700 (PDT) Message-Id: <200208090307.g7937tMA080357@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15708 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15708 Change 15708 by rwatson@rwatson_paprika on 2002/08/08 20:07:36 Last batch: $FreeBSD$ synchronization from the main tree. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.3#5 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.c#3 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_te.c#6 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.3#7 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#25 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.3#5 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libc/posix1e/mac_set.3,v 1.1 2002/08/02 21:14:42 rwatson Exp $ .Dd December 21, 2001 .Dt MAC_SET 3 .Sh NAME ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/lib/libc/posix1e/mac_set.c,v 1.1 2002/08/02 21:14:42 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_te.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/lib/libc/posix1e/mac_te.c,v 1.1 2002/08/02 21:14:42 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.3#7 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/lib/libc/posix1e/mac_text.3,v 1.1 2002/08/02 21:14:42 rwatson Exp $ .Dd December 21, 2001 .Dt MAC_TEXT 3 .Sh NAME ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#25 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/lib/libc/posix1e/mac_text.c,v 1.1 2002/08/02 21:14:42 rwatson Exp $ */ #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 20:12:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CB5D37B401; Thu, 8 Aug 2002 20:12:02 -0700 (PDT) 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 C3B9837B400 for ; Thu, 8 Aug 2002 20:12:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 689ED43E5E for ; Thu, 8 Aug 2002 20:12:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g793C1JU080934 for ; Thu, 8 Aug 2002 20:12:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g793C0bs080931 for perforce@freebsd.org; Thu, 8 Aug 2002 20:12:00 -0700 (PDT) Date: Thu, 8 Aug 2002 20:12:00 -0700 (PDT) Message-Id: <200208090312.g793C0bs080931@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15709 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15709 Change 15709 by rwatson@rwatson_tislabs on 2002/08/08 20:11:51 Pass both active and saved credentials into the MAC vnode stat check. Update policies to recognize the change: for now, always use the active cred. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#231 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#45 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#96 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#49 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#78 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#62 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#70 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#32 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#145 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#110 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#231 (text+ko) ==== @@ -2015,7 +2015,8 @@ } int -mac_check_vnode_stat(struct ucred *cred, struct vnode *vp) +mac_check_vnode_stat(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp) { int error; @@ -2024,11 +2025,12 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); + error = vn_refreshlabel(vp, active_cred); if (error) return (error); - MAC_CHECK(check_vnode_stat, cred, vp, &vp->v_label); + MAC_CHECK(check_vnode_stat, active_cred, saved_cred, vp, + &vp->v_label); return (error); } ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#45 (text+ko) ==== @@ -619,7 +619,7 @@ #ifdef MAC /* XXXMAC: Should pass in saved_cred. */ - error = mac_check_vnode_stat(active_cred, vp); + error = mac_check_vnode_stat(active_cred, saved_cred, vp); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#96 (text+ko) ==== @@ -2142,15 +2142,15 @@ } static int -mac_biba_check_vnode_stat(struct ucred *cred, struct vnode *vp, - struct label *vnodelabel) +mac_biba_check_vnode_stat(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *vnodelabel) { struct mac_biba *subj, *obj; if (!mac_biba_enabled) return (0); - subj = SLOT(&cred->cr_label); + subj = SLOT(&active_cred->cr_label); obj = SLOT(vnodelabel); if (!mac_biba_dominate_single(obj, subj)) ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#49 (text+ko) ==== @@ -675,8 +675,8 @@ } static int -mac_bsdextended_check_vnode_stat(struct ucred *cred, struct vnode *vp, - struct label *label) +mac_bsdextended_check_vnode_stat(struct ucred *active_cred, + struct ucred *saved_cred, struct vnode *vp, struct label *label) { struct vattr vap; int error; @@ -684,10 +684,11 @@ if (!mac_bsdextended_enabled) return (0); - error = VOP_GETATTR(vp, &vap, cred, curthread); + error = VOP_GETATTR(vp, &vap, active_cred, curthread); if (error) return (error); - return (mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VSTAT)); + return (mac_bsdextended_check(active_cred, vap.va_uid, vap.va_gid, + VSTAT)); } static struct mac_policy_op_entry mac_bsdextended_ops[] = ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#78 (text+ko) ==== @@ -2097,15 +2097,15 @@ } static int -mac_mls_check_vnode_stat(struct ucred *cred, struct vnode *vp, - struct label *vnodelabel) +mac_mls_check_vnode_stat(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *vnodelabel) { struct mac_mls *subj, *obj; if (!mac_mls_enabled) return (0); - subj = SLOT(&cred->cr_label); + subj = SLOT(&active_cred->cr_label); obj = SLOT(vnodelabel); if (!mac_mls_dominate_single(subj, obj)) ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#62 (text+ko) ==== @@ -889,8 +889,8 @@ } static int -mac_none_check_vnode_stat(struct ucred *cred, struct vnode *vp, - struct label *label) +mac_none_check_vnode_stat(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) { return (0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#70 (text+ko) ==== @@ -1551,19 +1551,19 @@ } static int -mac_te_check_vnode_stat(struct ucred *cred, struct vnode *vp, - struct label *label) +mac_te_check_vnode_stat(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) { switch (vp->v_type) { case VDIR: - return (mac_te_check(&cred->cr_label, label, MAC_TE_CLASS_DIR, - MAC_TE_OPERATION_DIR_STAT)); + return (mac_te_check(&active_cred->cr_label, label, + MAC_TE_CLASS_DIR, MAC_TE_OPERATION_DIR_STAT)); case VLNK: - return (mac_te_check(&cred->cr_label, label, + return (mac_te_check(&active_cred->cr_label, label, MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_STAT)); default: - return (mac_te_check(&cred->cr_label, label, + return (mac_te_check(&active_cred->cr_label, label, MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_STAT)); } } ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#32 (text+ko) ==== @@ -1097,8 +1097,8 @@ } static int -mac_test_check_vnode_stat(struct ucred *cred, struct vnode *vp, - struct label *label) +mac_test_check_vnode_stat(struct ucred *active_cred, struct ucred *saved_cred, + struct vnode *vp, struct label *label) { return (0); ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#145 (text+ko) ==== @@ -382,7 +382,8 @@ uid_t uid, gid_t gid); int mac_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, struct timespec atime, struct timespec mtime); -int mac_check_vnode_stat(struct ucred *cred, struct vnode *vp); +int mac_check_vnode_stat(struct ucred *active_cred, + struct ucred *saved_cred, struct vnode *vp); int mac_getsockopt_label_get(struct ucred *cred, struct socket *so, struct mac *extmac); int mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#110 (text+ko) ==== @@ -331,7 +331,8 @@ int (*mpo_check_vnode_setutimes)(struct ucred *cred, struct vnode *vp, struct label *label, struct timespec atime, struct timespec mtime); - int (*mpo_check_vnode_stat)(struct ucred *cred, struct vnode *vp, + int (*mpo_check_vnode_stat)(struct ucred *active_cred, + struct ucred *saved_cred, struct vnode *vp, struct label *label); int (*mpo_check_vnode_write)(struct ucred *active_cred, struct ucred *saved_cred, struct vnode *vp, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 23: 0:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7451B37B401; Thu, 8 Aug 2002 22:59:28 -0700 (PDT) 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 28F3037B400 for ; Thu, 8 Aug 2002 22:59:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50B0643E65 for ; Thu, 8 Aug 2002 22:59:27 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g795xRJU001110 for ; Thu, 8 Aug 2002 22:59:27 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g795xQbu001107 for perforce@freebsd.org; Thu, 8 Aug 2002 22:59:26 -0700 (PDT) Date: Thu, 8 Aug 2002 22:59:26 -0700 (PDT) Message-Id: <200208090559.g795xQbu001107@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15713 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15713 Change 15713 by rwatson@rwatson_tislabs on 2002/08/08 22:59:03 Integ main -CURRENT tree into trustedbsd base. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#21 integrate .. //depot/projects/trustedbsd/base/bin/kenv/Makefile#1 branch .. //depot/projects/trustedbsd/base/bin/kenv/kenv.1#1 branch .. //depot/projects/trustedbsd/base/bin/kenv/kenv.c#1 branch .. //depot/projects/trustedbsd/base/etc/isdn/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/koi8-r#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/apropos/apropos.man#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/apropos/apropos.sh#2 integrate .. //depot/projects/trustedbsd/base/include/Makefile#13 integrate .. //depot/projects/trustedbsd/base/include/ulimit.h#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/Makefile.inc#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ulimit.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/ulimit.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/i386/sys/sbrk.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/collate.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/collate.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/euc.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/ldpart.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/ldpart.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/lmessages.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/lmonetary.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/lnumeric.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/rune.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/setlocale.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/setrunelocale.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/nls/msgcat.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_te.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_text.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/posix1e.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/timelocal.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strsep.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/execve.2#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getrlimit.2#2 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.8#4 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#11 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.c#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/nge.4#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/pmap.h#7 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/i386_module.c#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod_syms.awk#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cd.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/mii.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_ngereg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sn/if_sn_pccard.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/udbp.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ufm.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ugen.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhid.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhub.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umass.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/umodem.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ums.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uplcom.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/urio.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_port.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvscom.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#16 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/OLDCARD#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/pmap.h#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_main.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_clock.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_cons.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#21 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#12 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ste.c#5 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_stereg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/pmap.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/cdrio.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#18 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#20 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#16 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/main.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/quota/quota.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/quota/quota.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/su/su.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/syscalls.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/burncd/burncd.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/burncd/burncd.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchgen/crunched_main.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/edquota/edquota.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.h#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/anonFTP.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/config.c#7 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#21 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.300 2002/08/05 08:54:26 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.302 2002/08/08 15:43:23 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -131,9 +131,14 @@ TARGET?= ${TARGET_ARCH} TARGET_CPUTYPE?= .endif -_CPUTYPE!= cd ${.CURDIR}; ${MAKE} -m ${.CURDIR}/share/mk \ - CPUTYPE=X${TARGET_CPUTYPE} -V CPUTYPE -.if ${_CPUTYPE} != X${TARGET_CPUTYPE} +.if !empty(TARGET_CPUTYPE) +_TARGET_CPUTYPE=${TARGET_CPUTYPE} +.else +_TARGET_CPUTYPE=dummy +.endif +_CPUTYPE!= ${MAKE} -f /dev/null -m ${.CURDIR}/share/mk \ + CPUTYPE=${_TARGET_CPUTYPE} -V CPUTYPE +.if ${_CPUTYPE} != ${_TARGET_CPUTYPE} .error CPUTYPE global should be set with ?=. .endif .if make(buildworld) ==== //depot/projects/trustedbsd/base/etc/isdn/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/isdn/Makefile,v 1.8 2002/07/29 09:40:05 ru Exp $ +# $FreeBSD: src/etc/isdn/Makefile,v 1.9 2002/08/07 16:01:06 ru Exp $ I4BETCPROG= answer \ isdntel.sh \ @@ -23,6 +23,3 @@ for i in ${I4BETCFILE} ; do \ ${INSTALL} -o root -g wheel -m 600 $$i ${DESTDIR}/etc/isdn ; \ done - -# Suck in the ${COPY} definition. -.include ==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/koi8-r#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/gnu/usr.bin/groff/tmac/koi8-r,v 1.6 2002/01/11 11:42:16 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/koi8-r,v 1.7 2002/08/07 17:47:24 ru Exp $ .\" .\" %beginstrip% . @@ -119,6 +119,15 @@ .as doc-str-Rv-std0 " Á ËÏÄ ÏÛÉÂËÉ ÓÏÈÒÁÎÑÅÔÓÑ × ÇÌÏÂÁÌØÎÏÊ .as doc-str-Rv-std0 " ÐÅÒÅÍÅÎÎÏÊ \*[doc-Va-font]errno\f[P]. . +.\" ÌÏËÁÌÉÚÁÃÉÑ .Ex +.ds doc-str-Ex-std-prefix "õÔÉÌÉÔÁ +.ds doc-str-Ex-std-suffix "×ÏÚ×ÒÁÝÁÅÔ\~0 × ÓÌÕÞÁÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ +.as doc-str-Ex-std-suffix " É\~>0 × ÓÌÕÞÁÅ ×ÏÚÎÉËÎÏ×ÅÎÉÑ ÏÛÉÂËÉ. +. +.ds doc-str-Ex-stds-prefix "õÔÉÌÉÔÙ +.ds doc-str-Ex-stds-suffix "×ÏÚ×ÒÁÝÁÀÔ\~0 × ÓÌÕÞÁÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ +.as doc-str-Ex-stds-suffix " É\~>0 × ÓÌÕÞÁÅ ×ÏÚÎÉËÎÏ×ÅÎÉÑ ÏÛÉÂËÉ. +. .\" ÌÏËÁÌÉÚÁÃÉÑ .Ar .ds doc-str-Ar-default "ÆÁÊÌ\ .\|.\|. . ==== //depot/projects/trustedbsd/base/gnu/usr.bin/man/apropos/apropos.man#4 (text+ko) ==== @@ -12,7 +12,7 @@ .\" The University of Texas at Austin .\" Austin, Texas 78712 .\" -.\" $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.man,v 1.10 2002/03/12 20:00:52 charnier Exp $ +.\" $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.man,v 1.11 2002/08/07 17:39:35 ru Exp $ .Dd January 15, 1991 .Dt APROPOS 1 .Os @@ -34,7 +34,7 @@ displays only complete word matches. .Pp .Ar keyword -really is a regular expression, please read +really is an extended regular expression, please read .Xr grep 1 manual page for more information about its format. .Sh DIAGNOSTICS ==== //depot/projects/trustedbsd/base/gnu/usr.bin/man/apropos/apropos.sh#2 (text+ko) ==== @@ -15,7 +15,7 @@ # The University of Texas at Austin # Austin, Texas 78712 # -# $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.sh,v 1.14 2001/03/30 10:44:29 wosch Exp $ +# $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.sh,v 1.15 2002/08/07 17:39:35 ru Exp $ PATH=/bin:/usr/bin:$PATH @@ -84,7 +84,7 @@ for manpage do - if grep -hi $grepopt -- "$manpage" $mandir; then : + if grep -Ehi $grepopt -- "$manpage" $mandir; then : else echo "$manpage: nothing appropriate" fi ==== //depot/projects/trustedbsd/base/include/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.174 2002/08/05 06:49:58 mike Exp $ +# $FreeBSD: src/include/Makefile,v 1.175 2002/08/08 04:50:36 mike Exp $ # # Doing a make install builds /usr/include # @@ -21,7 +21,8 @@ search.h setjmp.h sgtty.h \ signal.h stab.h stdbool.h stddef.h stdio.h stdlib.h strhash.h \ string.h stringlist.h strings.h sysexits.h tar.h time.h timeconv.h \ - timers.h ttyent.h unistd.h utime.h utmp.h vis.h wchar.h wctype.h + timers.h ttyent.h ulimit.h unistd.h utime.h utmp.h vis.h wchar.h \ + wctype.h MHDRS= float.h floatingpoint.h stdarg.h varargs.h ==== //depot/projects/trustedbsd/base/lib/libc/gen/Makefile.inc#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.93 2002/08/05 06:49:58 mike Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.94 2002/08/08 04:50:36 mike Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen @@ -28,8 +28,8 @@ sigsetops.c sleep.c srand48.c statvfs.c stringlist.c strtofflags.c \ sysconf.c sysctl.c sysctlbyname.c sysctlnametomib.c \ syslog.c telldir.c termios.c time.c times.c timezone.c ttyname.c \ - ttyslot.c ualarm.c uname.c unvis.c usleep.c utime.c valloc.c vis.c \ - wait.c wait3.c waitpid.c + ttyslot.c ualarm.c ulimit.c uname.c unvis.c usleep.c utime.c \ + valloc.c vis.c wait.c wait3.c waitpid.c # machine-dependent gen sources .if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc) @@ -56,7 +56,7 @@ siginterrupt.3 signal.3 sigsetops.3 sleep.3 statvfs.3 stringlist.3 \ strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \ tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 time.3 times.3 timezone.3 \ - ttyname.3 tzset.3 ualarm.3 uname.3 unvis.3 usleep.3 utime.3 \ + ttyname.3 tzset.3 ualarm.3 ulimit.3 uname.3 unvis.3 usleep.3 utime.3 \ valloc.3 vis.3 MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3 ==== //depot/projects/trustedbsd/base/lib/libc/i386/sys/sbrk.S#4 (text+ko) ==== @@ -38,17 +38,17 @@ .asciz "@(#)sbrk.s 5.1 (Berkeley) 4/23/90" #endif /* SYSLIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/sys/sbrk.S,v 1.10 2002/03/23 02:10:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/sys/sbrk.S,v 1.11 2002/08/08 17:28:07 kan Exp $"); #include "SYS.h" - .globl CNAME(end) + .globl CNAME(_end) .globl HIDENAME(minbrk) .globl HIDENAME(curbrk) .data -HIDENAME(minbrk): .long CNAME(end) -HIDENAME(curbrk): .long CNAME(end) +HIDENAME(minbrk): .long CNAME(_end) +HIDENAME(curbrk): .long CNAME(_end) .text ENTRY(sbrk) ==== //depot/projects/trustedbsd/base/lib/libc/locale/collate.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.24 2002/03/29 22:43:42 markm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.26 2002/08/08 05:51:54 ache Exp $"); #include "namespace.h" #include @@ -40,68 +40,115 @@ #include "collate.h" #include "setlocale.h" +#include "ldpart.h" #include "libc_private.h" int __collate_load_error = 1; int __collate_substitute_nontrivial; -char __collate_version[STR_LEN]; + u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN]; struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1]; struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE]; -#define FREAD(a, b, c, d) \ - do { \ - if (fread(a, b, c, d) != c) { \ - fclose(d); \ - return -1; \ - } \ - } while(0) - void __collate_err(int ex, const char *f) __dead2; int -__collate_load_tables(encoding) - char *encoding; +__collate_load_tables(const char *encoding) { + FILE *fp; + int i, saverr; + char collate_version[STR_LEN]; char buf[PATH_MAX]; - FILE *fp; - int i, save_load_error; + char *TMP_substitute_table, *TMP_char_pri_table, *TMP_chain_pri_table; + static char collate_encoding[ENCODING_LEN + 1]; - save_load_error = __collate_load_error; - __collate_load_error = 1; - if (!encoding) { - __collate_load_error = save_load_error; - return -1; + /* 'encoding' must be already checked. */ + if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) { + __collate_load_error = 1; + return (_LDP_CACHE); } - if (!strcmp(encoding, "C") || !strcmp(encoding, "POSIX")) - return 0; - if (!_PathLocale) { - __collate_load_error = save_load_error; - return -1; + + /* + * If the locale name is the same as our cache, use the cache. + */ + if (strcmp(encoding, collate_encoding) == 0) { + __collate_load_error = 0; + return (_LDP_CACHE); } + + /* + * Slurp the locale file into the cache. + */ + + /* 'PathLocale' must be already set & checked. */ /* Range checking not needed, encoding has fixed size */ - (void) strcpy(buf, _PathLocale); - (void) strcat(buf, "/"); - (void) strcat(buf, encoding); - (void) strcat(buf, "/LC_COLLATE"); - if ((fp = fopen(buf, "r")) == NULL) { - __collate_load_error = save_load_error; - return -1; + (void)strcpy(buf, _PathLocale); + (void)strcat(buf, "/"); + (void)strcat(buf, encoding); + (void)strcat(buf, "/LC_COLLATE"); + if ((fp = fopen(buf, "r")) == NULL) + return (_LDP_ERROR); + + if ((TMP_substitute_table = + malloc(sizeof(__collate_substitute_table))) == NULL) { + (void)fclose(fp); + errno = ENOMEM; + return (_LDP_ERROR); + } + if ((TMP_char_pri_table = + malloc(sizeof(__collate_char_pri_table))) == NULL) { + free(TMP_substitute_table); + (void)fclose(fp); + errno = ENOMEM; + return (_LDP_ERROR); + } + if ((TMP_chain_pri_table = + malloc(sizeof(__collate_chain_pri_table))) == NULL) { + free(TMP_substitute_table); + free(TMP_char_pri_table); + (void)fclose(fp); + errno = ENOMEM; + return (_LDP_ERROR); } - FREAD(__collate_version, sizeof(__collate_version), 1, fp); - if (strcmp(__collate_version, COLLATE_VERSION) != 0) { - fclose(fp); - return -1; + +#define FREAD(a, b, c, d) \ +{ \ + if (fread(a, b, c, d) != c) { \ + saverr = errno; \ + free(TMP_substitute_table); \ + free(TMP_char_pri_table); \ + free(TMP_chain_pri_table); \ + (void)fclose(d); \ + errno = saverr; \ + return (_LDP_ERROR); \ + } \ +} + + FREAD(collate_version, sizeof(collate_version), 1, fp); + if (strcmp(collate_version, COLLATE_VERSION) != 0) { + free(TMP_substitute_table); + free(TMP_char_pri_table); + free(TMP_chain_pri_table); + (void)fclose(fp); + errno = EFTYPE; + return (_LDP_ERROR); } - FREAD(__collate_substitute_table, sizeof(__collate_substitute_table), - 1, fp); - FREAD(__collate_char_pri_table, sizeof(__collate_char_pri_table), 1, - fp); - FREAD(__collate_chain_pri_table, sizeof(__collate_chain_pri_table), 1, - fp); - fclose(fp); - __collate_load_error = 0; + FREAD(TMP_substitute_table, sizeof(__collate_substitute_table), 1, fp); + FREAD(TMP_char_pri_table, sizeof(__collate_char_pri_table), 1, fp); + FREAD(TMP_chain_pri_table, sizeof(__collate_chain_pri_table), 1, fp); + (void)fclose(fp); + + (void)strcpy(collate_encoding, encoding); + (void)memcpy(__collate_substitute_table, TMP_substitute_table, + sizeof(__collate_substitute_table)); + (void)memcpy(__collate_char_pri_table, TMP_char_pri_table, + sizeof(__collate_char_pri_table)); + (void)memcpy(__collate_chain_pri_table, TMP_chain_pri_table, + sizeof(__collate_chain_pri_table)); + free(TMP_substitute_table); + free(TMP_char_pri_table); + free(TMP_chain_pri_table); __collate_substitute_nontrivial = 0; for (i = 0; i < UCHAR_MAX + 1; i++) { @@ -111,8 +158,9 @@ break; } } + __collate_load_error = 0; - return 0; + return (_LDP_LOADED); } u_char * @@ -123,24 +171,24 @@ int delta = strlen(s); u_char *dest_str = NULL; - if(s == NULL || *s == '\0') - return __collate_strdup(""); + if (s == NULL || *s == '\0') + return (__collate_strdup("")); delta += delta / 8; dest_str = malloc(dest_len = delta); - if(dest_str == NULL) + if (dest_str == NULL) __collate_err(EX_OSERR, __FUNCTION__); len = 0; - while(*s) { + while (*s) { nlen = len + strlen(__collate_substitute_table[*s]); if (dest_len <= nlen) { dest_str = reallocf(dest_str, dest_len = nlen + delta); - if(dest_str == NULL) + if (dest_str == NULL) __collate_err(EX_OSERR, __FUNCTION__); } - strcpy(dest_str + len, __collate_substitute_table[*s++]); + (void)strcpy(dest_str + len, __collate_substitute_table[*s++]); len = nlen; } - return dest_str; + return (dest_str); } void @@ -152,8 +200,8 @@ *len = 1; *prim = *sec = 0; - for(p2 = __collate_chain_pri_table; p2->str[0]; p2++) { - if(strncmp(t, p2->str, strlen(p2->str)) == 0) { + for (p2 = __collate_chain_pri_table; p2->str[0]; p2++) { + if (strncmp(t, p2->str, strlen(p2->str)) == 0) { *len = strlen(p2->str); *prim = p2->prim; *sec = p2->sec; @@ -172,7 +220,7 @@ if (t == NULL) __collate_err(EX_OSERR, __FUNCTION__); - return t; + return (t); } void ==== //depot/projects/trustedbsd/base/lib/libc/locale/collate.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/locale/collate.h,v 1.11 2002/03/21 22:46:54 obrien Exp $ + * $FreeBSD: src/lib/libc/locale/collate.h,v 1.12 2002/08/08 05:51:54 ache Exp $ */ #ifndef _COLLATE_H_ @@ -48,7 +48,6 @@ extern int __collate_load_error; extern int __collate_substitute_nontrivial; -extern char __collate_version[STR_LEN]; extern u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN]; extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1]; extern struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE]; @@ -56,7 +55,7 @@ __BEGIN_DECLS u_char *__collate_strdup(u_char *); u_char *__collate_substitute(const u_char *); -int __collate_load_tables(char *); +int __collate_load_tables(const char *); void __collate_lookup(const u_char *, int *, int *, int *); int __collate_range_cmp(int, int); #ifdef COLLATE_DEBUG ==== //depot/projects/trustedbsd/base/lib/libc/locale/euc.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)euc.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.8 2002/04/14 10:55:42 asmodai Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.10 2002/08/08 05:51:54 ache Exp $"); #include @@ -63,40 +63,36 @@ _RuneLocale *rl; { _EucInfo *ei; - int x; + int x, new__mb_cur_max; char *v, *e; rl->sgetrune = _EUC_sgetrune; rl->sputrune = _EUC_sputrune; - if (!rl->variable) { - free(rl); + if (rl->variable == NULL) return (EFTYPE); - } - v = (char *) rl->variable; + + v = (char *)rl->variable; while (*v == ' ' || *v == '\t') ++v; - if ((ei = malloc(sizeof(_EucInfo))) == NULL) { - free(rl); + if ((ei = malloc(sizeof(_EucInfo))) == NULL) return (ENOMEM); - } - __mb_cur_max = 0; + + new__mb_cur_max = 0; for (x = 0; x < 4; ++x) { - ei->count[x] = (int) strtol(v, &e, 0); + ei->count[x] = (int)strtol(v, &e, 0); if (v == e || !(v = e)) { - free(rl); free(ei); return (EFTYPE); } - if (__mb_cur_max < ei->count[x]) - __mb_cur_max = ei->count[x]; + if (new__mb_cur_max < ei->count[x]) + new__mb_cur_max = ei->count[x]; while (*v == ' ' || *v == '\t') ++v; - ei->bits[x] = (int) strtol(v, &e, 0); + ei->bits[x] = (int)strtol(v, &e, 0); if (v == e || !(v = e)) { - free(rl); free(ei); return (EFTYPE); } @@ -105,18 +101,13 @@ } ei->mask = (int)strtol(v, &e, 0); if (v == e || !(v = e)) { - free(rl); free(ei); return (EFTYPE); } - if (sizeof(_EucInfo) <= rl->variable_len) { - memcpy(rl->variable, ei, sizeof(_EucInfo)); - free(ei); - } else { - rl->variable = &ei; - } + rl->variable = ei; rl->variable_len = sizeof(_EucInfo); _CurrentRuneLocale = rl; + __mb_cur_max = new__mb_cur_max; return (0); } ==== //depot/projects/trustedbsd/base/lib/libc/locale/ldpart.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/ldpart.c,v 1.9 2002/08/04 09:37:28 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/ldpart.c,v 1.11 2002/08/08 05:51:54 ache Exp $"); #include "namespace.h" #include @@ -42,7 +42,6 @@ #include "ldpart.h" static int split_lines(char *, const char *); -static void set_from_buf(const char *, int, const char **); int __part_load_locale(const char *name, @@ -53,35 +52,25 @@ int locale_buf_size_min, const char **dst_localebuf) { - static char locale_buf_C[] = "C"; - static int num_lines; - int saverr; - int fd; - char *lbuf; - char *p; - const char *plim; - char filename[PATH_MAX]; - struct stat st; - size_t namesize; - size_t bufsize; - int save_using_locale; - - save_using_locale = *using_locale; - *using_locale = 0; + int saverr, fd, i, num_lines; + char *lbuf, *p; + const char *plim; + char filename[PATH_MAX]; + struct stat st; + size_t namesize, bufsize; /* 'name' must be already checked. */ + if (strcmp(name, "C") == 0 || strcmp(name, "POSIX") == 0) { + *using_locale = 0; + return (_LDP_CACHE); + } - if (!strcmp(name, "C") || !strcmp(name, "POSIX")) - return 0; - /* * If the locale name is the same as our cache, use the cache. */ - lbuf = locale_buf; - if (lbuf != NULL && strcmp(name, lbuf) == 0) { - set_from_buf(lbuf, num_lines, dst_localebuf); + if (locale_buf != NULL && strcmp(name, locale_buf) == 0) { *using_locale = 1; - return 0; + return (_LDP_CACHE); } /* @@ -90,16 +79,14 @@ namesize = strlen(name) + 1; /* 'PathLocale' must be already set & checked. */ - /* Range checking not needed, 'name' size is limited */ strcpy(filename, _PathLocale); strcat(filename, "/"); strcat(filename, name); strcat(filename, "/"); strcat(filename, category_filename); - fd = _open(filename, O_RDONLY); - if (fd < 0) - goto no_locale; + if ((fd = _open(filename, O_RDONLY)) < 0) + return (_LDP_ERROR); if (_fstat(fd, &st) != 0) goto bad_locale; if (st.st_size <= 0) { @@ -107,18 +94,15 @@ goto bad_locale; } bufsize = namesize + st.st_size; - locale_buf = NULL; - lbuf = (lbuf == NULL || lbuf == locale_buf_C) ? - malloc(bufsize) : reallocf(lbuf, bufsize); - if (lbuf == NULL) + if ((lbuf = malloc(bufsize)) == NULL) { + errno = ENOMEM; goto bad_locale; - (void) strcpy(lbuf, name); + } + (void)strcpy(lbuf, name); p = lbuf + namesize; plim = p + st.st_size; if (_read(fd, p, (size_t) st.st_size) != st.st_size) goto bad_lbuf; - if (_close(fd) != 0) - goto bad_lbuf; /* * Parse the locale file into localebuf. */ @@ -133,48 +117,44 @@ num_lines = locale_buf_size_min; else { errno = EFTYPE; - goto reset_locale; + goto bad_lbuf; } - set_from_buf(lbuf, num_lines, dst_localebuf); + (void)_close(fd); /* * Record the successful parse in the cache. */ + if (locale_buf != NULL) + free(locale_buf); locale_buf = lbuf; + for (p = locale_buf, i = 0; i < num_lines; i++) + dst_localebuf[i] = (p += strlen(p) + 1); + for (i = num_lines; i < locale_buf_size_max; i++) + dst_localebuf[i] = NULL; + *using_locale = 1; - *using_locale = 1; - return 0; + return (_LDP_LOADED); -reset_locale: - locale_buf = locale_buf_C; - save_using_locale = 0; bad_lbuf: - saverr = errno; free(lbuf); errno = saverr; + saverr = errno; + free(lbuf); + errno = saverr; bad_locale: - saverr = errno; (void)_close(fd); errno = saverr; -no_locale: - *using_locale = save_using_locale; - return -1; + saverr = errno; + (void)_close(fd); + errno = saverr; + + return (_LDP_ERROR); } static int -split_lines(char *p, const char *plim) { - +split_lines(char *p, const char *plim) +{ int i; for (i = 0; p < plim; i++) { p = strchr(p, '\n'); *p++ = '\0'; } - return i; -} - -static void -set_from_buf(const char *p, int num_lines, const char **dst_localebuf) { - - const char **ap; - int i; - - for (ap = dst_localebuf, i = 0; i < num_lines; ++ap, ++i) - *ap = p += strlen(p) + 1; + return (i); } ==== //depot/projects/trustedbsd/base/lib/libc/locale/ldpart.h#4 (text+ko) ==== @@ -23,12 +23,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/locale/ldpart.h,v 1.4 2001/12/20 18:28:52 phantom Exp $ + * $FreeBSD: src/lib/libc/locale/ldpart.h,v 1.5 2002/08/08 05:51:54 ache Exp $ */ #ifndef _LDPART_H_ #define _LDPART_H_ +#define _LDP_LOADED 0 +#define _LDP_ERROR (-1) +#define _LDP_CACHE 1 + int __part_load_locale(const char *, int*, char *, const char *, int, int, const char **); ==== //depot/projects/trustedbsd/base/lib/libc/locale/lmessages.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/lmessages.c,v 1.10 2002/03/22 21:52:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/lmessages.c,v 1.12 2002/08/08 05:51:54 ache Exp $"); #include @@ -50,25 +50,26 @@ static char *_messages_locale_buf; int -__messages_load_locale(const char *name) { +__messages_load_locale(const char *name) +{ + int ret; - /* - * Propose that we can have incomplete locale file (w/o "{yes,no}str"). - * Initialize them before loading. In case of complete locale, they'll - * be initialized to loaded value, otherwise they'll not be touched. - */ - _messages_locale.yesstr = empty; - _messages_locale.nostr = empty; - - return __part_load_locale(name, &_messages_using_locale, - _messages_locale_buf, "LC_MESSAGES", - LCMESSAGES_SIZE_FULL, LCMESSAGES_SIZE_MIN, - (const char **)&_messages_locale); + ret = __part_load_locale(name, &_messages_using_locale, + _messages_locale_buf, "LC_MESSAGES", + LCMESSAGES_SIZE_FULL, LCMESSAGES_SIZE_MIN, + (const char **)&_messages_locale); + if (ret == _LDP_LOADED) { + if (_messages_locale.yesstr == NULL) + _messages_locale.yesstr = empty; + if (_messages_locale.nostr == NULL) + _messages_locale.nostr = empty; + } + return (ret); } struct lc_messages_T * -__get_current_messages_locale(void) { - +__get_current_messages_locale(void) +{ return (_messages_using_locale ? &_messages_locale : (struct lc_messages_T *)&_C_messages_locale); ==== //depot/projects/trustedbsd/base/lib/libc/locale/lmonetary.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/lmonetary.c,v 1.13 2002/03/22 21:52:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/lmonetary.c,v 1.15 2002/08/08 05:51:54 ache Exp $"); #include #include @@ -63,23 +63,27 @@ static char *_monetary_locale_buf; static char -cnv(const char *str) { +cnv(const char *str) +{ int i = strtol(str, NULL, 10); + if (i == -1) i = CHAR_MAX; - return (char)i; + return ((char)i); } int -__monetary_load_locale(const char *name) { +__monetary_load_locale(const char *name) +{ + int ret; - int ret; - __mlocale_changed = 1; ret = __part_load_locale(name, &_monetary_using_locale, _monetary_locale_buf, "LC_MONETARY", LCMONETARY_SIZE, LCMONETARY_SIZE, (const char **)&_monetary_locale); - if (ret == 0 && _monetary_using_locale) { + if (ret != _LDP_ERROR) + __mlocale_changed = 1; + if (ret == _LDP_LOADED) { _monetary_locale.mon_grouping = __fix_locale_grouping_str(_monetary_locale.mon_grouping); @@ -95,12 +99,12 @@ M_ASSIGN_CHAR(p_sign_posn); M_ASSIGN_CHAR(n_sign_posn); } - return ret; + return (ret); } struct lc_monetary_T * -__get_current_monetary_locale(void) { - +__get_current_monetary_locale(void) +{ return (_monetary_using_locale ? &_monetary_locale : (struct lc_monetary_T *)&_C_monetary_locale); ==== //depot/projects/trustedbsd/base/lib/libc/locale/lnumeric.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/lnumeric.c,v 1.11 2002/03/22 21:52:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/lnumeric.c,v 1.13 2002/08/08 05:51:54 ache Exp $"); #include #include "lnumeric.h" @@ -49,24 +49,25 @@ static char *_numeric_locale_buf; int -__numeric_load_locale(const char *name) { - +__numeric_load_locale(const char *name) +{ int ret; - __nlocale_changed = 1; ret = __part_load_locale(name, &_numeric_using_locale, _numeric_locale_buf, "LC_NUMERIC", LCNUMERIC_SIZE, LCNUMERIC_SIZE, (const char **)&_numeric_locale); - if (ret == 0 && _numeric_using_locale) + if (ret != _LDP_ERROR) + __nlocale_changed = 1; + if (ret == _LDP_LOADED) _numeric_locale.grouping = >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 23:16:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAE4B37B400; Thu, 8 Aug 2002 23:14:53 -0700 (PDT) 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 3ECB937B405 for ; Thu, 8 Aug 2002 23:14:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3477C43E5E for ; Thu, 8 Aug 2002 23:14:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g796EpJU007690 for ; Thu, 8 Aug 2002 23:14:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g796EkVs007687 for perforce@freebsd.org; Thu, 8 Aug 2002 23:14:46 -0700 (PDT) Date: Thu, 8 Aug 2002 23:14:46 -0700 (PDT) Message-Id: <200208090614.g796EkVs007687@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15715 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15715 Change 15715 by rwatson@rwatson_tislabs on 2002/08/08 23:14:35 Integ trustedbsd_base into trustedbsd_mac. Bring in various things, including VFS locking cleanups, mac_policy -> mac_syscall, etc. Possible merge targets/problems: additional instances of mac_policy to rename. vn_fullpath() conflicts. VV_flag renaming changes that need to be propagated. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#21 integrate .. //depot/projects/trustedbsd/mac/bin/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#4 integrate .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/kenv/Makefile#1 branch .. //depot/projects/trustedbsd/mac/bin/kenv/kenv.1#1 branch .. //depot/projects/trustedbsd/mac/bin/kenv/kenv.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/session.c#12 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/trustedbsd/mac/etc/isdn/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/100.chksetuid#3 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/koi8-r#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/apropos.man#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/apropos.sh#2 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#14 integrate .. //depot/projects/trustedbsd/mac/include/fmtmsg.h#1 branch .. //depot/projects/trustedbsd/mac/include/ulimit.h#1 branch .. //depot/projects/trustedbsd/mac/include/wchar.h#4 integrate .. //depot/projects/trustedbsd/mac/include/wctype.h#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/hpropd/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-master/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-slave/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/k5admind/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/k5passwdd/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/libexec/kdc/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5admin/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5destroy/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5init/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5list/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5passwd/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.bin/k5su/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.sbin/k5stash/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/usr.sbin/ktutil/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/lib/compat/compat22/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/lib/compat/compat22/libc.so.3.1.bz2.uu#1 branch .. //depot/projects/trustedbsd/mac/lib/compat/compat22/libc.so.3.1.gz.uu#2 delete .. //depot/projects/trustedbsd/mac/lib/compat/compat22/libc_r.so.3.0.bz2.uu#1 branch .. //depot/projects/trustedbsd/mac/lib/compat/compat22/libc_r.so.3.0.gz.uu#2 delete .. //depot/projects/trustedbsd/mac/lib/libc/gen/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/err.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/fmtmsg.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gen/fmtmsg.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gen/ulimit.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/gen/ulimit.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/sbrk.S#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/btowc.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/btowc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/collate.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/collate.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/euc.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/iswalnum.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/iswctype.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/ldpart.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/ldpart.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/lmessages.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/lmonetary.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/lnumeric.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/multibyte.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/rune.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/rune.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/setlocale.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/setlocale.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/setrunelocale.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/towlower.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctob.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctrans.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctrans.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctype.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctype.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/nls/msgcat.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#16 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_biba.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_internal.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_is_present_np.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_is_present_np.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_mls.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_sebsd.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_te.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#26 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/posix1e.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/calloc.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/timelocal.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strsep.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/execve.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/getrlimit.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#2 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpcmd.y#8 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.8#3 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#10 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#22 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#28 integrate .. //depot/projects/trustedbsd/mac/release/i386/dokern.sh#6 integrate .. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#8 integrate .. //depot/projects/trustedbsd/mac/sbin/init/init.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mntopts.h#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount_ufs.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_cd9660/mount_cd9660.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_ext2fs/mount_ext2fs.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_hpfs/mount_hpfs.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nfs/mount_nfs.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_ntfs/mount_ntfs.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nullfs/mount_nullfs.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nwfs/mount_nwfs.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_portalfs/mount_portalfs.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_std/mount_std.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_udf/mount_udf.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_umapfs/mount_umapfs.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_unionfs/mount_unionfs.c#5 integrate .. //depot/projects/trustedbsd/mac/share/examples/drivers/make_device_driver.sh#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/drivers/make_pseudo_driver.sh#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/nge.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#10 integrate .. //depot/projects/trustedbsd/mac/share/misc/bsd-family-tree#6 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.cpu.mk#6 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.libnames.mk#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/pmap.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/imgact_osf1.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/i386_module.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_namecache.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_subr.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/coda/coda_vfsops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_getcwd.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_misc.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/compat/pecoff/imgact_pecoff.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/imgact_svr4.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#43 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#13 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kmod_syms.awk#4 integrate .. //depot/projects/trustedbsd/mac/sys/conf/majors#6 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cd.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cd.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mii/mii.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_ngereg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/null/null.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sab/sab.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/sab/sab82532reg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni_isa.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbnivar.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/se/se_console.c#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/se/sereg.h#2 delete .. //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn_pccard.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/udbp.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ufm.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ugen.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhid.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhub.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ulpt.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umodem.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ums.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uplcom.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/urio.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_port.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uvscom.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wavelan_ieee.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wireg.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/spectrum24t_cf.h#1 branch .. //depot/projects/trustedbsd/mac/sys/fs/deadfs/dead_vnops.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vfsops.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vnops.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_denode.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/fs/ntfs/ntfs_vfsops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vfsops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_node.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vfsops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/portalfs/portal_vnops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vncache.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_node.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_vfsops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/fs/specfs/spec_vnops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/fs/umapfs/umap_vfsops.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_subr.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/acpica/acpi_wakeup.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#15 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#20 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/OLDCARD#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/elan-mmcr.c#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/i386/mem.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/imgact_coff.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/cputypes.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/md_var.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/pmap.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/imgact_linux.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/pmap.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_aout.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_elf.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_main.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#25 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_acct.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#232 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_poll.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_subr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_clock.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#25 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty_cons.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_cache.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_lookup.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#34 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#76 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mii/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/wi/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/nd6.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_mn.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sis.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ste.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_stereg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/pmap.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_interface.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_util.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs_subr.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/lomac/lomacfs_vnops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/pmap.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/sys/cdrio.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sys/linker.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#111 integrate .. //depot/projects/trustedbsd/mac/sys/sys/pioctl.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/sys/queue.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#25 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#25 edit .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#26 edit .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#40 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_alloc.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_inode.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_snapshot.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_softdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_quota.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_contig.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_swap.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.holiday#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/main.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/quota/quota.1#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/quota/quota.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/sockstat/sockstat.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/su/su.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/alpha-fbsd.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/extern.h#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/i386-fbsd.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/i386-linux.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/main.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/setup.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/sparc64-fbsd.c#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/truss/syscall.h#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/syscalls.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/truss.1#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/truss.h#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/burncd/burncd.8#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/burncd/burncd.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/cron/lib/misc.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchgen/crunched_main.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/edquota/edquota.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.8#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.h#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mergemaster/mergemaster.sh#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/add/extract.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/create/perform.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/create/pkg_create.1#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/file.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/anonFTP.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/config.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/wicontrol/wicontrol.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#21 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.298 2002/07/31 03:56:03 jhb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.302 2002/08/08 15:43:23 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -126,11 +126,21 @@ TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} -TARGET_CPUTYPE?= ${CPUTYPE} +TARGET_CPUTYPE?=${CPUTYPE} .else TARGET?= ${TARGET_ARCH} TARGET_CPUTYPE?= .endif +.if !empty(TARGET_CPUTYPE) +_TARGET_CPUTYPE=${TARGET_CPUTYPE} +.else +_TARGET_CPUTYPE=dummy +.endif +_CPUTYPE!= ${MAKE} -f /dev/null -m ${.CURDIR}/share/mk \ + CPUTYPE=${_TARGET_CPUTYPE} -V CPUTYPE +.if ${_CPUTYPE} != ${_TARGET_CPUTYPE} +.error CPUTYPE global should be set with ?=. +.endif .if make(buildworld) BUILD_ARCH!= sysctl -n hw.machine_arch .if ${MACHINE_ARCH} != ${BUILD_ARCH} @@ -175,6 +185,7 @@ CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ MACHINE_ARCH=${TARGET_ARCH} \ MACHINE=${TARGET} \ + CPUTYPE=${TARGET_CPUTYPE} \ OBJFORMAT_PATH=${WORLDTMP}/usr/libexec \ GROFF_BIN_PATH=${WORLDTMP}/usr/bin \ GROFF_FONT_PATH=${WORLDTMP}/usr/share/groff_font \ @@ -476,7 +487,7 @@ .endif cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KRNLSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} -DBOOTSTRAPPING -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile + ${MAKE} -DNO_CPU_CFLAGS -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile .if !defined(NO_KERNELDEPEND) cd ${KRNLOBJDIR}/${_kernel}; \ ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend ==== //depot/projects/trustedbsd/mac/bin/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.20 2002/04/09 18:25:37 bmilekic Exp $ +# $FreeBSD: src/bin/Makefile,v 1.21 2002/08/02 10:55:51 markm Exp $ SUBDIR= cat \ chio \ @@ -40,7 +40,7 @@ SUBDIR+=csh .endif -.if !defined(NO_SENDMAIL) && !defined(NOUUCP) +.if !defined(NO_SENDMAIL) SUBDIR+=rmail .endif ==== //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.29 2002/07/12 01:57:44 keramida Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.30 2002/08/04 05:29:13 obrien Exp $ .\" .Dd March 31, 1994 .Dt CHMOD 1 @@ -86,7 +86,10 @@ .It Fl v Cause .Nm -to be verbose, showing files as the mode is modified. +to be verbose, showing filenames as the mode is modified. If the +.Fl v +flag is specified more than once, the old and new modes of the file +will also be printed, in both octal and symbolic notation. .El .Pp The ==== //depot/projects/trustedbsd/mac/bin/chmod/chmod.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.26 2002/07/10 20:36:25 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/chmod/chmod.c,v 1.27 2002/08/04 05:29:13 obrien Exp $"); #include #include @@ -121,7 +121,7 @@ --optind; goto done; case 'v': - vflag = 1; + vflag++; break; case '?': default: @@ -208,8 +208,24 @@ warn("%s", p->fts_path); rval = 1; } else { - if (vflag) - (void)printf("%s\n", p->fts_accpath); + if (vflag) { + (void)printf("%s", p->fts_accpath); + + if (vflag > 1) { + char m1[12], m2[12]; + + strmode(p->fts_statp->st_mode, m1); + strmode((p->fts_statp->st_mode & + S_IFMT) | newmode, m2); + + (void)printf(": 0%o [%s] -> 0%o [%s]", + p->fts_statp->st_mode, m1, + (p->fts_statp->st_mode & S_IFMT) | + newmode, m2); + } + (void)printf("\n"); + } + } } if (errno) ==== //depot/projects/trustedbsd/mac/crypto/openssh/session.c#12 (text+ko) ==== @@ -34,7 +34,7 @@ #include "includes.h" RCSID("$OpenBSD: session.c,v 1.142 2002/06/26 13:49:26 deraadt Exp $"); -RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.35 2002/07/26 02:20:00 ache Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.36 2002/08/05 16:06:35 ache Exp $"); #include "ssh.h" #include "ssh1.h" @@ -1288,6 +1288,9 @@ const char *shell, *shell0, *hostname = NULL; struct passwd *pw = s->pw; u_int i; +#ifdef HAVE_LOGIN_CAP + int lc_requirehome; +#endif /* remove hostkey from the child's memory */ destroy_sensitive_data(); @@ -1346,6 +1349,10 @@ /* XXX better use close-on-exec? -markus */ channel_close_all(); +#ifdef HAVE_LOGIN_CAP + lc_requirehome = login_getcapbool(lc, "requirehome", 0); + login_close(lc); +#endif /* * Close any extra file descriptors. Note that there may still be * descriptors left by system functions. They will be closed later. @@ -1384,7 +1391,7 @@ fprintf(stderr, "Could not chdir to home directory %s: %s\n", pw->pw_dir, strerror(errno)); #ifdef HAVE_LOGIN_CAP - if (login_getcapbool(lc, "requirehome", 0)) + if (lc_requirehome) exit(1); #endif } ==== //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_lib.c#3 (text+ko) ==== @@ -124,7 +124,7 @@ (int)(omax+ *pp)); #endif - if (*plength > (omax - (*pp - p))) + if (*plength > (omax - (p - *pp))) { ASN1err(ASN1_F_ASN1_GET_OBJECT,ASN1_R_TOO_LONG); /* Set this so that even if things are not long enough ==== //depot/projects/trustedbsd/mac/etc/etc.sparc64/ttys#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.2 2002/04/17 10:42:41 gerald Exp $ +# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.3 2002/08/04 19:16:13 jake Exp $ # @(#)ttys 5.1 (Berkeley) 4/17/89 # # This file specifies various information about terminals on the system. @@ -46,6 +46,8 @@ #ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. +ttya "/usr/libexec/getty local.9600" dialup off secure +ttyb "/usr/libexec/getty local.9600" dialup off secure ttyd0 "/usr/libexec/getty std.9600" dialup off secure ttyd1 "/usr/libexec/getty std.9600" dialup off secure ttyd2 "/usr/libexec/getty std.9600" dialup off secure ==== //depot/projects/trustedbsd/mac/etc/isdn/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/isdn/Makefile,v 1.8 2002/07/29 09:40:05 ru Exp $ +# $FreeBSD: src/etc/isdn/Makefile,v 1.9 2002/08/07 16:01:06 ru Exp $ I4BETCPROG= answer \ isdntel.sh \ @@ -23,6 +23,3 @@ for i in ${I4BETCFILE} ; do \ ${INSTALL} -o root -g wheel -m 600 $$i ${DESTDIR}/etc/isdn ; \ done - -# Suck in the ${COPY} definition. -.include ==== //depot/projects/trustedbsd/mac/etc/periodic/security/100.chksetuid#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.3 2002/05/17 11:34:12 brian Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.4 2002/08/03 22:33:34 gshapiro Exp $ # # If there is a global system configuration file, suck it in. @@ -45,14 +45,17 @@ echo 'Checking setuid files and devices:' # XXX Note that there is the possibility of overrunning the args to ls MP=`mount -t ufs | grep -v " nosuid" | awk '{ print $3 }' | sort` - set ${MP} - while [ $# -ge 1 ]; do - mount=$1 - shift - find $mount -xdev -type f \ - \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \ - \( -perm -u+s -or -perm -g+s \) -print0 - done | xargs -0 -n 20 ls -liTd | sed 's/^ *//' | sort +10 > ${TMP} + if [ -n "${MP}" ] + then + set ${MP} + while [ $# -ge 1 ]; do + mount=$1 + shift + find $mount -xdev -type f \ + \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \ + \( -perm -u+s -or -perm -g+s \) -print0 + done | xargs -0 -n 20 ls -liTd | sed 's/^ *//' | sort +10 > ${TMP} + fi if [ ! -f ${LOG}/setuid.today ]; then rc=1 ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/koi8-r#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/gnu/usr.bin/groff/tmac/koi8-r,v 1.6 2002/01/11 11:42:16 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/koi8-r,v 1.7 2002/08/07 17:47:24 ru Exp $ .\" .\" %beginstrip% . @@ -119,6 +119,15 @@ .as doc-str-Rv-std0 " Á ËÏÄ ÏÛÉÂËÉ ÓÏÈÒÁÎÑÅÔÓÑ × ÇÌÏÂÁÌØÎÏÊ .as doc-str-Rv-std0 " ÐÅÒÅÍÅÎÎÏÊ \*[doc-Va-font]errno\f[P]. . +.\" ÌÏËÁÌÉÚÁÃÉÑ .Ex +.ds doc-str-Ex-std-prefix "õÔÉÌÉÔÁ +.ds doc-str-Ex-std-suffix "×ÏÚ×ÒÁÝÁÅÔ\~0 × ÓÌÕÞÁÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ +.as doc-str-Ex-std-suffix " É\~>0 × ÓÌÕÞÁÅ ×ÏÚÎÉËÎÏ×ÅÎÉÑ ÏÛÉÂËÉ. +. +.ds doc-str-Ex-stds-prefix "õÔÉÌÉÔÙ +.ds doc-str-Ex-stds-suffix "×ÏÚ×ÒÁÝÁÀÔ\~0 × ÓÌÕÞÁÅ ÕÓÐÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ +.as doc-str-Ex-stds-suffix " É\~>0 × ÓÌÕÞÁÅ ×ÏÚÎÉËÎÏ×ÅÎÉÑ ÏÛÉÂËÉ. +. .\" ÌÏËÁÌÉÚÁÃÉÑ .Ar .ds doc-str-Ar-default "ÆÁÊÌ\ .\|.\|. . ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/apropos.man#4 (text+ko) ==== @@ -12,7 +12,7 @@ .\" The University of Texas at Austin .\" Austin, Texas 78712 .\" -.\" $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.man,v 1.10 2002/03/12 20:00:52 charnier Exp $ +.\" $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.man,v 1.11 2002/08/07 17:39:35 ru Exp $ .Dd January 15, 1991 .Dt APROPOS 1 .Os @@ -34,7 +34,7 @@ displays only complete word matches. .Pp .Ar keyword -really is a regular expression, please read +really is an extended regular expression, please read .Xr grep 1 manual page for more information about its format. .Sh DIAGNOSTICS ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/apropos.sh#2 (text+ko) ==== @@ -15,7 +15,7 @@ # The University of Texas at Austin # Austin, Texas 78712 # -# $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.sh,v 1.14 2001/03/30 10:44:29 wosch Exp $ +# $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.sh,v 1.15 2002/08/07 17:39:35 ru Exp $ PATH=/bin:/usr/bin:$PATH @@ -84,7 +84,7 @@ for manpage do - if grep -hi $grepopt -- "$manpage" $mandir; then : + if grep -Ehi $grepopt -- "$manpage" $mandir; then : else echo "$manpage: nothing appropriate" fi ==== //depot/projects/trustedbsd/mac/include/Makefile#14 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.172 2002/08/01 07:18:38 mike Exp $ +# $FreeBSD: src/include/Makefile,v 1.175 2002/08/08 04:50:36 mike Exp $ # # Doing a make install builds /usr/include # @@ -10,7 +10,7 @@ SUBDIR= arpa protocols rpcsvc rpc INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h db.h \ dirent.h \ - dlfcn.h elf.h elf-hints.h err.h fnmatch.h fstab.h \ + dlfcn.h elf.h elf-hints.h err.h fnmatch.h fmtmsg.h fstab.h \ fts.h glob.h grp.h \ hesiod.h histedit.h ieeefp.h ifaddrs.h inttypes.h iso646.h kenv.h \ langinfo.h \ @@ -21,7 +21,8 @@ search.h setjmp.h sgtty.h \ signal.h stab.h stdbool.h stddef.h stdio.h stdlib.h strhash.h \ string.h stringlist.h strings.h sysexits.h tar.h time.h timeconv.h \ - timers.h ttyent.h unistd.h utime.h utmp.h vis.h wchar.h wctype.h + timers.h ttyent.h ulimit.h unistd.h utime.h utmp.h vis.h wchar.h \ + wctype.h MHDRS= float.h floatingpoint.h stdarg.h varargs.h ==== //depot/projects/trustedbsd/mac/include/wchar.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.5 2002/07/09 05:13:30 obrien Exp $ + * $FreeBSD: src/include/wchar.h,v 1.10 2002/08/06 06:26:06 tjr Exp $ */ /*- @@ -73,6 +73,16 @@ #define NULL 0 #endif +#ifdef _BSD_MBSTATE_T_ +typedef _BSD_MBSTATE_T_ mbstate_t; +#undef _BSD_MBSTATE_T_ +#endif + +#ifdef _BSD_SIZE_T_ +typedef _BSD_SIZE_T_ size_t; +#undef _BSD_SIZE_T_ +#endif + #ifndef __cplusplus #ifdef _BSD_WCHAR_T_ typedef _BSD_WCHAR_T_ wchar_t; @@ -80,9 +90,9 @@ #endif #endif -#ifdef _BSD_MBSTATE_T_ -typedef _BSD_MBSTATE_T_ mbstate_t; -#undef _BSD_MBSTATE_T_ +#ifndef _WCTYPE_T +typedef unsigned long wctype_t; +#define _WCTYPE_T #endif #ifdef _BSD_WINT_T_ @@ -90,16 +100,12 @@ #undef _BSD_WINT_T_ #endif -#ifdef _BSD_SIZE_T_ -typedef _BSD_SIZE_T_ size_t; -#undef _BSD_SIZE_T_ -#endif - #ifndef WEOF #define WEOF ((wint_t)-1) #endif __BEGIN_DECLS +wint_t btowc(int); #if 0 /* XXX: not implemented */ size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict); @@ -115,6 +121,8 @@ int wcscmp(const wchar_t *, const wchar_t *); wchar_t *wcscpy(wchar_t * __restrict, const wchar_t * __restrict); size_t wcscspn(const wchar_t *, const wchar_t *); +size_t wcslcat(wchar_t *, const wchar_t *, size_t); +size_t wcslcpy(wchar_t *, const wchar_t *, size_t); size_t wcslen(const wchar_t *); wchar_t *wcsncat(wchar_t * __restrict, const wchar_t * __restrict, size_t); @@ -129,19 +137,17 @@ #endif size_t wcsspn(const wchar_t *, const wchar_t *); wchar_t *wcsstr(const wchar_t *, const wchar_t *); +#if 0 +/* XXX: not implemented */ +int wcswidth(const wchar_t *, size_t); +int wcwidth(wchar_t); +#endif +int wctob(wint_t); wchar_t *wmemchr(const wchar_t *, wchar_t, size_t); int wmemcmp(const wchar_t *, const wchar_t *, size_t); wchar_t *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t); wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t); wchar_t *wmemset(wchar_t *, wchar_t, size_t); - -size_t wcslcat(wchar_t *, const wchar_t *, size_t); -size_t wcslcpy(wchar_t *, const wchar_t *, size_t); -#if 0 -/* XXX: not implemented */ -int wcswidth(const wchar_t *, size_t); -int wcwidth(wchar_t); -#endif __END_DECLS #endif /* !_WCHAR_H_ */ ==== //depot/projects/trustedbsd/mac/include/wctype.h#3 (text+ko) ==== @@ -25,17 +25,27 @@ * * citrus Id: wctype.h,v 1.4 2000/12/21 01:50:21 itojun Exp * $NetBSD: wctype.h,v 1.3 2000/12/22 14:16:16 itojun Exp $ - * $FreeBSD: src/include/wctype.h,v 1.4 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/wctype.h,v 1.9 2002/08/06 05:19:33 tjr Exp $ */ -#if 0 -/* XXX: not implemented */ #ifndef _WCTYPE_H_ #define _WCTYPE_H_ #include #include +#include + +#ifndef _WCTRANS_T +typedef int wctrans_t; +#define _WCTRANS_T +#endif + +#ifndef _WCTYPE_T +typedef unsigned long wctype_t; +#define _WCTYPE_T +#endif + #ifdef _BSD_WINT_T_ typedef _BSD_WINT_T_ wint_t; #undef _BSD_WINT_T_ @@ -50,6 +60,7 @@ int iswalpha(wint_t); int iswblank(wint_t); int iswcntrl(wint_t); +int iswctype(wint_t, wctype_t); int iswdigit(wint_t); int iswgraph(wint_t); int iswlower(wint_t); @@ -58,9 +69,49 @@ int iswspace(wint_t); int iswupper(wint_t); int iswxdigit(wint_t); +wint_t towctrans(wint_t, wctrans_t); wint_t towlower(wint_t); wint_t towupper(wint_t); +wctrans_t + wctrans(const char *); +wctype_t + wctype(const char *); + +#if __BSD_VISIBLE +wint_t iswascii(wint_t); +wint_t iswhexnumber(wint_t); +wint_t iswideogram(wint_t); +wint_t iswnumber(wint_t); +wint_t iswphonogram(wint_t); +wint_t iswrune(wint_t); +wint_t iswspecial(wint_t); +#endif __END_DECLS +#define iswalnum(wc) __istype((wc), _CTYPE_A|_CTYPE_D) +#define iswalpha(wc) __istype((wc), _CTYPE_A) +#define iswblank(wc) __istype((wc), _CTYPE_B) +#define iswcntrl(wc) __istype((wc), _CTYPE_C) +#define iswctype(wc, charclass) __istype((wc), (charclass)) +#define iswdigit(wc) __istype((wc), _CTYPE_D) +#define iswgraph(wc) __istype((wc), _CTYPE_G) +#define iswlower(wc) __istype((wc), _CTYPE_L) +#define iswprint(wc) __istype((wc), _CTYPE_R) +#define iswpunct(wc) __istype((wc), _CTYPE_P) +#define iswspace(wc) __istype((wc), _CTYPE_S) +#define iswupper(wc) __istype((wc), _CTYPE_U) +#define iswxdigit(wc) __istype((wc), _CTYPE_X) +#define towlower(wc) __tolower(wc) +#define towupper(wc) __toupper(wc) + +#if __BSD_VISIBLE +#define iswascii(wc) (((wc) & ~0x7F) == 0) +#define iswhexnumber(wc) __istype((wc), _CTYPE_X) +#define iswideogram(wc) __istype((wc), _CTYPE_I) +#define iswnumber(wc) __istype((wc), _CTYPE_D) +#define iswphonogram(wc) __istype((wc), _CTYPE_Q) +#define iswrune(wc) __istype((wc), 0xFFFFFF00L) +#define iswspecial(wc) __istype((wc), _CTYPE_T) +#endif + #endif /* _WCTYPE_H_ */ -#endif ==== //depot/projects/trustedbsd/mac/kerberos5/libexec/hpropd/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.7 2002/04/26 17:55:22 ru Exp $ +# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.8 2002/08/04 22:23:46 fjoe Exp $ PROG= hpropd SRCS= hpropd.c hprop.h hdb_err.h @@ -20,9 +20,9 @@ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN= hpropd.8 .include ==== //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-master/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.6 2002/04/26 17:55:22 ru Exp $ +# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.7 2002/08/04 22:23:46 fjoe Exp $ PROG= ipropd-master SRCS= ipropd_master.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h @@ -21,9 +21,9 @@ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} NOMAN= yes .include ==== //depot/projects/trustedbsd/mac/kerberos5/libexec/ipropd-slave/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.6 2002/04/26 17:55:22 ru Exp $ +# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.7 2002/08/04 22:23:46 fjoe Exp $ PROG= ipropd-slave SRCS= ipropd_slave.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h @@ -21,9 +21,9 @@ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} NOMAN= yes .include ==== //depot/projects/trustedbsd/mac/kerberos5/libexec/k5admind/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/k5admind/Makefile,v 1.7 2002/04/26 17:55:23 ru Exp $ +# $FreeBSD: src/kerberos5/libexec/k5admind/Makefile,v 1.8 2002/08/04 22:23:47 fjoe Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 23:20: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AF5E37B401; Thu, 8 Aug 2002 23:19:58 -0700 (PDT) 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 3708A37B400 for ; Thu, 8 Aug 2002 23:19:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6C8343E6A for ; Thu, 8 Aug 2002 23:19:57 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g796JvJU010780 for ; Thu, 8 Aug 2002 23:19:57 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g796Jvlg010777 for perforce@freebsd.org; Thu, 8 Aug 2002 23:19:57 -0700 (PDT) Date: Thu, 8 Aug 2002 23:19:57 -0700 (PDT) Message-Id: <200208090619.g796Jvlg010777@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15716 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15716 Change 15716 by rwatson@rwatson_paprika on 2002/08/08 23:19:27 Catch additional mac_policy() -> mac_syscall() from the integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#233 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#233 (text+ko) ==== @@ -371,7 +371,7 @@ */ break; case MAC_SYSCALL: - mpc->mpc_ops->mpo_mac_policy = + mpc->mpc_ops->mpo_mac_syscall = mpe->mpe_function; break; case MAC_DESTROY: @@ -3128,7 +3128,7 @@ * MPSAFE */ int -mac_policy(struct thread *td, struct mac_policy_args *uap) +mac_syscall(struct thread *td, struct mac_syscall_args *uap) { int error; char target[128]; /* TBD: should be MAX_MAXNAME or some such */ @@ -3146,8 +3146,8 @@ MAC_POLICY_LIST_BUSY(); LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { if (strcmp(mpc->mpc_name, target) == 0 && - mpc->mpc_ops->mpo_mac_policy) { - error = mpc->mpc_ops->mpo_mac_policy(SCARG(uap, call), + mpc->mpc_ops->mpo_mac_syscall) { + error = mpc->mpc_ops->mpo_mac_syscall(SCARG(uap, call), SCARG(uap, arg)); goto out; } @@ -3206,7 +3206,7 @@ } int -mac_policy(struct thread *td, struct mac_policy_args *uap) +mac_syscall(struct thread *td, struct mac_policy_args *uap) { return (ENOSYS); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 23:24: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED92837B401; Thu, 8 Aug 2002 23:24:03 -0700 (PDT) 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 A707D37B400 for ; Thu, 8 Aug 2002 23:24:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60B6E43E4A for ; Thu, 8 Aug 2002 23:24:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g796O3JU011950 for ; Thu, 8 Aug 2002 23:24:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g796O3Fj011947 for perforce@freebsd.org; Thu, 8 Aug 2002 23:24:03 -0700 (PDT) Date: Thu, 8 Aug 2002 23:24:03 -0700 (PDT) Message-Id: <200208090624.g796O3Fj011947@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15717 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15717 Change 15717 by rwatson@rwatson_paprika on 2002/08/08 23:23:09 sync to recently integ'd GENERIC. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#34 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#34 (text+ko) ==== @@ -4,7 +4,7 @@ # For more information on this file, please read the handbook section on # Kernel Configuration Files: # -# http://www.FreeBSD.org/handbook/kernelconfig-config.html +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # # The handbook is also available locally in /usr/share/doc/handbook # if you've installed the doc distribution, otherwise always see the @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.352 2002/07/23 06:35:08 peter Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.356 2002/08/07 05:40:34 imp Exp $ machine i386 cpu I486_CPU @@ -74,7 +74,6 @@ device isa device eisa device pci -#options PCI_ENABLE_IO_MODES # Enable pci resources left off by a "lazy BIOS" # Floppy drives device fdc @@ -147,6 +146,8 @@ #options XSERVER # support for X server on a vt console #options FAT_CURSOR # start with block cursor +device agp # support several AGP chipsets + # Floating point support - do not disable. device npx @@ -213,7 +214,7 @@ # Wireless NIC cards device an # Aironet 4500/4800 802.11 wireless NICs. device awi # BayStack 660 and others -device wi # WaveLAN/IEEE 802.11 wireless NICs. +device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. #device wl # Older non 802.11 Wavelan wireless NIC. # Pseudo devices - the number indicates how many units to allocate. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 8 23:25: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B107837B401; Thu, 8 Aug 2002 23:25:05 -0700 (PDT) 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 6DD5F37B400 for ; Thu, 8 Aug 2002 23:25:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CCEB43E42 for ; Thu, 8 Aug 2002 23:25:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g796P5JU012041 for ; Thu, 8 Aug 2002 23:25:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g796P4Pr012038 for perforce@freebsd.org; Thu, 8 Aug 2002 23:25:04 -0700 (PDT) Date: Thu, 8 Aug 2002 23:25:04 -0700 (PDT) Message-Id: <200208090625.g796P4Pr012038@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15718 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15718 Change 15718 by rwatson@rwatson_paprika on 2002/08/08 23:24:03 Hopefully the last mac_policy() -> mac_syscall() from the integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#146 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#146 (text+ko) ==== @@ -164,7 +164,7 @@ * Extensions to POSIX.1e visible in the application namespace. */ int mac_is_present_np(const char *_policyname); -int mac_policy(const char *_policyname, int call, void *arg); +int mac_syscall(const char *_policyname, int call, void *arg); /* * System calls wrapped by some POSIX.1e functions. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 9 0:25:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C51B37B401; Fri, 9 Aug 2002 00:25:20 -0700 (PDT) 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 E13E837B400 for ; Fri, 9 Aug 2002 00:25:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A111A43E6A for ; Fri, 9 Aug 2002 00:25:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g797PJJU021302 for ; Fri, 9 Aug 2002 00:25:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g797PJ8C021299 for perforce@freebsd.org; Fri, 9 Aug 2002 00:25:19 -0700 (PDT) Date: Fri, 9 Aug 2002 00:25:19 -0700 (PDT) Message-Id: <200208090725.g797PJ8C021299@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15722 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15722 Change 15722 by rwatson@rwatson_tislabs on 2002/08/09 00:24:33 Catch one more merge issue from the integ: vp->v_flag is now vp->v_vflag for vnode lock protected flags. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_cache.c#12 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_cache.c#12 (text+ko) ==== @@ -882,7 +882,7 @@ if (vp == rootvnode || vp == fd_rdir) break; ASSERT_VOP_LOCKED(vp, "vn_fullpath"); - if (vp->v_flag & VV_ROOT) { + if (vp->v_vflag & VV_ROOT) { if (vp->v_mount == NULL) { /* forced unmount */ error = EBADF; goto out; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 9 0:33:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D59A37B401; Fri, 9 Aug 2002 00:33:17 -0700 (PDT) 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 2F44637B400 for ; Fri, 9 Aug 2002 00:33:17 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5658143E70 for ; Fri, 9 Aug 2002 00:33:16 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g797X1Oo026869 for ; Fri, 9 Aug 2002 03:33:01 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Fri, 9 Aug 2002 03:33:01 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Perforce Change Reviews Subject: Re: PERFORCE change 15722 for review In-Reply-To: <200208090725.g797PJ8C021299@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG This seems to have gotten the post-integ kernel up and running fine on my test box. After a few more changes to mac_mls and mac_biba and running some stability tests, I'll start syncing up the main FreeBSD tree again. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Fri, 9 Aug 2002, Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15722 > > Change 15722 by rwatson@rwatson_tislabs on 2002/08/09 00:24:33 > > Catch one more merge issue from the integ: vp->v_flag is now > vp->v_vflag for vnode lock protected flags. > > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/kern/vfs_cache.c#12 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_cache.c#12 (text+ko) ==== > > @@ -882,7 +882,7 @@ > if (vp == rootvnode || vp == fd_rdir) > break; > ASSERT_VOP_LOCKED(vp, "vn_fullpath"); > - if (vp->v_flag & VV_ROOT) { > + if (vp->v_vflag & VV_ROOT) { > if (vp->v_mount == NULL) { /* forced unmount */ > error = EBADF; > goto out; > To Unsubscribe: send mail to majordomo@trustedbsd.org > with "unsubscribe trustedbsd-cvs" in the body of the message > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 9 7:57:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CA8E37B42A; Fri, 9 Aug 2002 07:57:06 -0700 (PDT) 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 EB92D37B405 for ; Fri, 9 Aug 2002 07:57:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8561C43E5E for ; Fri, 9 Aug 2002 07:57:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g79Ev3JU006218 for ; Fri, 9 Aug 2002 07:57:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g79Ev3T4006215 for perforce@freebsd.org; Fri, 9 Aug 2002 07:57:03 -0700 (PDT) Date: Fri, 9 Aug 2002 07:57:03 -0700 (PDT) Message-Id: <200208091457.g79Ev3T4006215@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15740 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15740 Change 15740 by rwatson@rwatson_paprika on 2002/08/09 07:56:52 Modify su interaction with setusercontext() so that the MAC label is not set by default, only if -s is specified. This changes the default so that only UNIX credential elements are set, improving compatibility. If setting the MAC label fails, su will fail. Affected files ... .. //depot/projects/trustedbsd/mac/usr.bin/su/su.1#4 edit .. //depot/projects/trustedbsd/mac/usr.bin/su/su.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.bin/su/su.1#4 (text+ko) ==== @@ -41,7 +41,7 @@ .Sh SYNOPSIS .Nm .Op Fl -.Op Fl flm +.Op Fl flms .Op Fl c Ar class .Op Ar login Op Ar args .Sh DESCRIPTION @@ -122,6 +122,14 @@ non-zero, .Nm will fail. +.It Fl s +Set the MAC label to the user's default label as part of the user +credential setup. +Setting the MAC label may fail if the MAC label of the invoking process +isn't sufficient to transition to the user's default MAC label. +If the label cannot be set, +.Nm +will fail. .It Fl c Ar class Use the settings of the specified login class. Only allowed for the super-user. ==== //depot/projects/trustedbsd/mac/usr.bin/su/su.c#8 (text+ko) ==== @@ -128,7 +128,7 @@ uid_t ruid; gid_t gid; int asme, ch, asthem, fastlogin, prio, i, setwhat, retcode, - statusp, child_pid, child_pgrp, ret_pid; + statusp, child_pid, child_pgrp, ret_pid, setmaclabel; char *username, *cleanenv, *class, shellbuf[MAXPATHLEN]; const char *p, *user, *shell, *mytty, **nargv; @@ -138,8 +138,9 @@ asme = asthem = fastlogin = statusp = 0; user = "root"; iscsh = UNSET; + setmaclabel = 0; - while ((ch = getopt(argc, argv, "-flmc:")) != -1) + while ((ch = getopt(argc, argv, "-flmsc:")) != -1) switch ((char)ch) { case 'f': fastlogin = 1; @@ -153,6 +154,9 @@ asme = 1; asthem = 0; break; + case 's': + setmaclabel = 1; + break; case 'c': class = optarg; break; @@ -355,7 +359,13 @@ * Umask Login records (wtmp, etc) Path */ setwhat = LOGIN_SETALL & ~(LOGIN_SETENV | LOGIN_SETUMASK | - LOGIN_SETLOGIN | LOGIN_SETPATH | LOGIN_SETGROUP); + LOGIN_SETLOGIN | LOGIN_SETPATH | LOGIN_SETGROUP | + LOGIN_SETLABEL); + /* + * If -l is present, also set the MAC label. + */ + if (setmaclabel) + setwhat |= LOGIN_SETLABEL; /* * Don't touch resource/priority settings if -m has been used * or -l and -c hasn't, and we're not su'ing to root. @@ -458,7 +468,7 @@ usage(void) { - fprintf(stderr, "usage: su [-] [-flm] [-c class] [login [args]]\n"); + fprintf(stderr, "usage: su [-] [-flms] [-c class] [login [args]]\n"); exit(1); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 9 8:26:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D52537B401; Fri, 9 Aug 2002 08:26:42 -0700 (PDT) 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 C19C637B400 for ; Fri, 9 Aug 2002 08:26:41 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F57C43E42 for ; Fri, 9 Aug 2002 08:26:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g79FQfJU013672 for ; Fri, 9 Aug 2002 08:26:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g79FQfZ5013663 for perforce@freebsd.org; Fri, 9 Aug 2002 08:26:41 -0700 (PDT) Date: Fri, 9 Aug 2002 08:26:41 -0700 (PDT) Message-Id: <200208091526.g79FQfZ5013663@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15742 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15742 Change 15742 by rwatson@rwatson_paprika on 2002/08/09 08:26:01 Fix a note in the comment: originally I used -l locally, but when merging to the trustedbsd_mac tree, I renamed to -s, but missed this comment. No functional change. Submitted by: jmallett Affected files ... .. //depot/projects/trustedbsd/mac/usr.bin/su/su.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.bin/su/su.c#9 (text+ko) ==== @@ -362,7 +362,7 @@ LOGIN_SETLOGIN | LOGIN_SETPATH | LOGIN_SETGROUP | LOGIN_SETLABEL); /* - * If -l is present, also set the MAC label. + * If -s is present, also set the MAC label. */ if (setmaclabel) setwhat |= LOGIN_SETLABEL; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 9 20:51:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2F8837B401; Fri, 9 Aug 2002 20:50:13 -0700 (PDT) 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 E964237B400 for ; Fri, 9 Aug 2002 20:50:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76C4D43E72 for ; Fri, 9 Aug 2002 20:49:30 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7A3nKJU038994 for ; Fri, 9 Aug 2002 20:49:20 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7A3nCwA038971 for perforce@freebsd.org; Fri, 9 Aug 2002 20:49:12 -0700 (PDT) Date: Fri, 9 Aug 2002 20:49:12 -0700 (PDT) Message-Id: <200208100349.g7A3nCwA038971@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" Subject: PERFORCE change 15764 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15764 Change 15764 by obrien@obrien_hammer on 2002/08/09 20:45:57 Create the "Hammer" branch for AMD x86-64 work. Affected files ... .. //depot/projects/hammer/COPYRIGHT#1 branch .. //depot/projects/hammer/MAINTAINERS#1 branch .. //depot/projects/hammer/Makefile#1 branch .. //depot/projects/hammer/Makefile.inc1#1 branch .. //depot/projects/hammer/Makefile.upgrade#1 branch .. //depot/projects/hammer/README#1 branch .. //depot/projects/hammer/UPDATING#1 branch .. //depot/projects/hammer/bin/Makefile#1 branch .. //depot/projects/hammer/bin/Makefile.inc#1 branch .. //depot/projects/hammer/bin/cat/Makefile#1 branch .. //depot/projects/hammer/bin/cat/cat.1#1 branch .. //depot/projects/hammer/bin/cat/cat.c#1 branch .. //depot/projects/hammer/bin/chio/Makefile#1 branch .. //depot/projects/hammer/bin/chio/chio.1#1 branch .. //depot/projects/hammer/bin/chio/chio.c#1 branch .. //depot/projects/hammer/bin/chio/defs.h#1 branch .. //depot/projects/hammer/bin/chio/pathnames.h#1 branch .. //depot/projects/hammer/bin/chmod/Makefile#1 branch .. //depot/projects/hammer/bin/chmod/chmod.1#1 branch .. //depot/projects/hammer/bin/chmod/chmod.c#1 branch .. //depot/projects/hammer/bin/cp/Makefile#1 branch .. //depot/projects/hammer/bin/cp/cp.1#1 branch .. //depot/projects/hammer/bin/cp/cp.c#1 branch .. //depot/projects/hammer/bin/cp/extern.h#1 branch .. //depot/projects/hammer/bin/cp/utils.c#1 branch .. //depot/projects/hammer/bin/csh/Makefile#1 branch .. //depot/projects/hammer/bin/csh/USD.doc/Makefile#1 branch .. //depot/projects/hammer/bin/csh/USD.doc/csh.1#1 branch .. //depot/projects/hammer/bin/csh/USD.doc/csh.2#1 branch .. //depot/projects/hammer/bin/csh/USD.doc/csh.3#1 branch .. //depot/projects/hammer/bin/csh/USD.doc/csh.4#1 branch .. //depot/projects/hammer/bin/csh/USD.doc/csh.a#1 branch .. //depot/projects/hammer/bin/csh/USD.doc/csh.g#1 branch .. //depot/projects/hammer/bin/csh/USD.doc/tabs#1 branch .. //depot/projects/hammer/bin/csh/config.h#1 branch .. //depot/projects/hammer/bin/csh/host.defs#1 branch .. //depot/projects/hammer/bin/date/Makefile#1 branch .. //depot/projects/hammer/bin/date/date.1#1 branch .. //depot/projects/hammer/bin/date/date.c#1 branch .. //depot/projects/hammer/bin/date/extern.h#1 branch .. //depot/projects/hammer/bin/date/netdate.c#1 branch .. //depot/projects/hammer/bin/date/vary.c#1 branch .. //depot/projects/hammer/bin/date/vary.h#1 branch .. //depot/projects/hammer/bin/dd/Makefile#1 branch .. //depot/projects/hammer/bin/dd/args.c#1 branch .. //depot/projects/hammer/bin/dd/conv.c#1 branch .. //depot/projects/hammer/bin/dd/conv_tab.c#1 branch .. //depot/projects/hammer/bin/dd/dd.1#1 branch .. //depot/projects/hammer/bin/dd/dd.c#1 branch .. //depot/projects/hammer/bin/dd/dd.h#1 branch .. //depot/projects/hammer/bin/dd/extern.h#1 branch .. //depot/projects/hammer/bin/dd/misc.c#1 branch .. //depot/projects/hammer/bin/dd/position.c#1 branch .. //depot/projects/hammer/bin/df/Makefile#1 branch .. //depot/projects/hammer/bin/df/df.1#1 branch .. //depot/projects/hammer/bin/df/df.c#1 branch .. //depot/projects/hammer/bin/domainname/Makefile#1 branch .. //depot/projects/hammer/bin/domainname/domainname.1#1 branch .. //depot/projects/hammer/bin/domainname/domainname.c#1 branch .. //depot/projects/hammer/bin/echo/Makefile#1 branch .. //depot/projects/hammer/bin/echo/echo.1#1 branch .. //depot/projects/hammer/bin/echo/echo.c#1 branch .. //depot/projects/hammer/bin/ed/Makefile#1 branch .. //depot/projects/hammer/bin/ed/POSIX#1 branch .. //depot/projects/hammer/bin/ed/README#1 branch .. //depot/projects/hammer/bin/ed/buf.c#1 branch .. //depot/projects/hammer/bin/ed/cbc.c#1 branch .. //depot/projects/hammer/bin/ed/ed.1#1 branch .. //depot/projects/hammer/bin/ed/ed.h#1 branch .. //depot/projects/hammer/bin/ed/glbl.c#1 branch .. //depot/projects/hammer/bin/ed/io.c#1 branch .. //depot/projects/hammer/bin/ed/main.c#1 branch .. //depot/projects/hammer/bin/ed/re.c#1 branch .. //depot/projects/hammer/bin/ed/sub.c#1 branch .. //depot/projects/hammer/bin/ed/test/=.err#1 branch .. //depot/projects/hammer/bin/ed/test/Makefile#1 branch .. //depot/projects/hammer/bin/ed/test/README#1 branch .. //depot/projects/hammer/bin/ed/test/TODO#1 branch .. //depot/projects/hammer/bin/ed/test/a.d#1 branch .. //depot/projects/hammer/bin/ed/test/a.r#1 branch .. //depot/projects/hammer/bin/ed/test/a.t#1 branch .. //depot/projects/hammer/bin/ed/test/a1.err#1 branch .. //depot/projects/hammer/bin/ed/test/a2.err#1 branch .. //depot/projects/hammer/bin/ed/test/addr.d#1 branch .. //depot/projects/hammer/bin/ed/test/addr.r#1 branch .. //depot/projects/hammer/bin/ed/test/addr.t#1 branch .. //depot/projects/hammer/bin/ed/test/addr1.err#1 branch .. //depot/projects/hammer/bin/ed/test/addr2.err#1 branch .. //depot/projects/hammer/bin/ed/test/ascii.d.uu#1 branch .. //depot/projects/hammer/bin/ed/test/ascii.r.uu#1 branch .. //depot/projects/hammer/bin/ed/test/ascii.t#1 branch .. //depot/projects/hammer/bin/ed/test/bang1.d#1 branch .. //depot/projects/hammer/bin/ed/test/bang1.err#1 branch .. //depot/projects/hammer/bin/ed/test/bang1.r#1 branch .. //depot/projects/hammer/bin/ed/test/bang1.t#1 branch .. //depot/projects/hammer/bin/ed/test/bang2.err#1 branch .. //depot/projects/hammer/bin/ed/test/c.d#1 branch .. //depot/projects/hammer/bin/ed/test/c.r#1 branch .. //depot/projects/hammer/bin/ed/test/c.t#1 branch .. //depot/projects/hammer/bin/ed/test/c1.err#1 branch .. //depot/projects/hammer/bin/ed/test/c2.err#1 branch .. //depot/projects/hammer/bin/ed/test/ckscripts.sh#1 branch .. //depot/projects/hammer/bin/ed/test/d.d#1 branch .. //depot/projects/hammer/bin/ed/test/d.err#1 branch .. //depot/projects/hammer/bin/ed/test/d.r#1 branch .. //depot/projects/hammer/bin/ed/test/d.t#1 branch .. //depot/projects/hammer/bin/ed/test/e1.d#1 branch .. //depot/projects/hammer/bin/ed/test/e1.err#1 branch .. //depot/projects/hammer/bin/ed/test/e1.r#1 branch .. //depot/projects/hammer/bin/ed/test/e1.t#1 branch .. //depot/projects/hammer/bin/ed/test/e2.d#1 branch .. //depot/projects/hammer/bin/ed/test/e2.err#1 branch .. //depot/projects/hammer/bin/ed/test/e2.r#1 branch .. //depot/projects/hammer/bin/ed/test/e2.t#1 branch .. //depot/projects/hammer/bin/ed/test/e3.d#1 branch .. //depot/projects/hammer/bin/ed/test/e3.err#1 branch .. //depot/projects/hammer/bin/ed/test/e3.r#1 branch .. //depot/projects/hammer/bin/ed/test/e3.t#1 branch .. //depot/projects/hammer/bin/ed/test/e4.d#1 branch .. //depot/projects/hammer/bin/ed/test/e4.r#1 branch .. //depot/projects/hammer/bin/ed/test/e4.t#1 branch .. //depot/projects/hammer/bin/ed/test/f1.err#1 branch .. //depot/projects/hammer/bin/ed/test/f2.err#1 branch .. //depot/projects/hammer/bin/ed/test/g1.d#1 branch .. //depot/projects/hammer/bin/ed/test/g1.err#1 branch .. //depot/projects/hammer/bin/ed/test/g1.r#1 branch .. //depot/projects/hammer/bin/ed/test/g1.t#1 branch .. //depot/projects/hammer/bin/ed/test/g2.d#1 branch .. //depot/projects/hammer/bin/ed/test/g2.err#1 branch .. //depot/projects/hammer/bin/ed/test/g2.r#1 branch .. //depot/projects/hammer/bin/ed/test/g2.t#1 branch .. //depot/projects/hammer/bin/ed/test/g3.d#1 branch .. //depot/projects/hammer/bin/ed/test/g3.err#1 branch .. //depot/projects/hammer/bin/ed/test/g3.r#1 branch .. //depot/projects/hammer/bin/ed/test/g3.t#1 branch .. //depot/projects/hammer/bin/ed/test/g4.d#1 branch .. //depot/projects/hammer/bin/ed/test/g4.r#1 branch .. //depot/projects/hammer/bin/ed/test/g4.t#1 branch .. //depot/projects/hammer/bin/ed/test/g5.d#1 branch .. //depot/projects/hammer/bin/ed/test/g5.r#1 branch .. //depot/projects/hammer/bin/ed/test/g5.t#1 branch .. //depot/projects/hammer/bin/ed/test/h.err#1 branch .. //depot/projects/hammer/bin/ed/test/i.d#1 branch .. //depot/projects/hammer/bin/ed/test/i.r#1 branch .. //depot/projects/hammer/bin/ed/test/i.t#1 branch .. //depot/projects/hammer/bin/ed/test/i1.err#1 branch .. //depot/projects/hammer/bin/ed/test/i2.err#1 branch .. //depot/projects/hammer/bin/ed/test/i3.err#1 branch .. //depot/projects/hammer/bin/ed/test/j.d#1 branch .. //depot/projects/hammer/bin/ed/test/j.r#1 branch .. //depot/projects/hammer/bin/ed/test/j.t#1 branch .. //depot/projects/hammer/bin/ed/test/k.d#1 branch .. //depot/projects/hammer/bin/ed/test/k.r#1 branch .. //depot/projects/hammer/bin/ed/test/k.t#1 branch .. //depot/projects/hammer/bin/ed/test/k1.err#1 branch .. //depot/projects/hammer/bin/ed/test/k2.err#1 branch .. //depot/projects/hammer/bin/ed/test/k3.err#1 branch .. //depot/projects/hammer/bin/ed/test/k4.err#1 branch .. //depot/projects/hammer/bin/ed/test/l.d#1 branch .. //depot/projects/hammer/bin/ed/test/l.r#1 branch .. //depot/projects/hammer/bin/ed/test/l.t#1 branch .. //depot/projects/hammer/bin/ed/test/m.d#1 branch .. //depot/projects/hammer/bin/ed/test/m.err#1 branch .. //depot/projects/hammer/bin/ed/test/m.r#1 branch .. //depot/projects/hammer/bin/ed/test/m.t#1 branch .. //depot/projects/hammer/bin/ed/test/mkscripts.sh#1 branch .. //depot/projects/hammer/bin/ed/test/n.d#1 branch .. //depot/projects/hammer/bin/ed/test/n.r#1 branch .. //depot/projects/hammer/bin/ed/test/n.t#1 branch .. //depot/projects/hammer/bin/ed/test/nl.err#1 branch .. //depot/projects/hammer/bin/ed/test/nl1.d#1 branch .. //depot/projects/hammer/bin/ed/test/nl1.r#1 branch .. //depot/projects/hammer/bin/ed/test/nl1.t#1 branch .. //depot/projects/hammer/bin/ed/test/nl2.d#1 branch .. //depot/projects/hammer/bin/ed/test/nl2.r#1 branch .. //depot/projects/hammer/bin/ed/test/nl2.t#1 branch .. //depot/projects/hammer/bin/ed/test/p.d#1 branch .. //depot/projects/hammer/bin/ed/test/p.r#1 branch .. //depot/projects/hammer/bin/ed/test/p.t#1 branch .. //depot/projects/hammer/bin/ed/test/q.d#1 branch .. //depot/projects/hammer/bin/ed/test/q.r#1 branch .. //depot/projects/hammer/bin/ed/test/q.t#1 branch .. //depot/projects/hammer/bin/ed/test/q1.err#1 branch .. //depot/projects/hammer/bin/ed/test/r1.d#1 branch .. //depot/projects/hammer/bin/ed/test/r1.err#1 branch .. //depot/projects/hammer/bin/ed/test/r1.r#1 branch .. //depot/projects/hammer/bin/ed/test/r1.t#1 branch .. //depot/projects/hammer/bin/ed/test/r2.d#1 branch .. //depot/projects/hammer/bin/ed/test/r2.err#1 branch .. //depot/projects/hammer/bin/ed/test/r2.r#1 branch .. //depot/projects/hammer/bin/ed/test/r2.t#1 branch .. //depot/projects/hammer/bin/ed/test/r3.d#1 branch .. //depot/projects/hammer/bin/ed/test/r3.r#1 branch .. //depot/projects/hammer/bin/ed/test/r3.t#1 branch .. //depot/projects/hammer/bin/ed/test/s1.d#1 branch .. //depot/projects/hammer/bin/ed/test/s1.err#1 branch .. //depot/projects/hammer/bin/ed/test/s1.r#1 branch .. //depot/projects/hammer/bin/ed/test/s1.t#1 branch .. //depot/projects/hammer/bin/ed/test/s10.err#1 branch .. //depot/projects/hammer/bin/ed/test/s2.d#1 branch .. //depot/projects/hammer/bin/ed/test/s2.err#1 branch .. //depot/projects/hammer/bin/ed/test/s2.r#1 branch .. //depot/projects/hammer/bin/ed/test/s2.t#1 branch .. //depot/projects/hammer/bin/ed/test/s3.d#1 branch .. //depot/projects/hammer/bin/ed/test/s3.err#1 branch .. //depot/projects/hammer/bin/ed/test/s3.r#1 branch .. //depot/projects/hammer/bin/ed/test/s3.t#1 branch .. //depot/projects/hammer/bin/ed/test/s4.err#1 branch .. //depot/projects/hammer/bin/ed/test/s5.err#1 branch .. //depot/projects/hammer/bin/ed/test/s6.err#1 branch .. //depot/projects/hammer/bin/ed/test/s7.err#1 branch .. //depot/projects/hammer/bin/ed/test/s8.err#1 branch .. //depot/projects/hammer/bin/ed/test/s9.err#1 branch .. //depot/projects/hammer/bin/ed/test/t.d#1 branch .. //depot/projects/hammer/bin/ed/test/t.r#1 branch .. //depot/projects/hammer/bin/ed/test/t1.d#1 branch .. //depot/projects/hammer/bin/ed/test/t1.err#1 branch .. //depot/projects/hammer/bin/ed/test/t1.r#1 branch .. //depot/projects/hammer/bin/ed/test/t1.t#1 branch .. //depot/projects/hammer/bin/ed/test/t2.d#1 branch .. //depot/projects/hammer/bin/ed/test/t2.err#1 branch .. //depot/projects/hammer/bin/ed/test/t2.r#1 branch .. //depot/projects/hammer/bin/ed/test/t2.t#1 branch .. //depot/projects/hammer/bin/ed/test/u.d#1 branch .. //depot/projects/hammer/bin/ed/test/u.err#1 branch .. //depot/projects/hammer/bin/ed/test/u.r#1 branch .. //depot/projects/hammer/bin/ed/test/u.t#1 branch .. //depot/projects/hammer/bin/ed/test/v.d#1 branch .. //depot/projects/hammer/bin/ed/test/v.r#1 branch .. //depot/projects/hammer/bin/ed/test/v.t#1 branch .. //depot/projects/hammer/bin/ed/test/w.d#1 branch .. //depot/projects/hammer/bin/ed/test/w.r#1 branch .. //depot/projects/hammer/bin/ed/test/w.t#1 branch .. //depot/projects/hammer/bin/ed/test/w1.err#1 branch .. //depot/projects/hammer/bin/ed/test/w2.err#1 branch .. //depot/projects/hammer/bin/ed/test/w3.err#1 branch .. //depot/projects/hammer/bin/ed/test/x.err#1 branch .. //depot/projects/hammer/bin/ed/test/z.err#1 branch .. //depot/projects/hammer/bin/ed/undo.c#1 branch .. //depot/projects/hammer/bin/expr/Makefile#1 branch .. //depot/projects/hammer/bin/expr/expr.1#1 branch .. //depot/projects/hammer/bin/expr/expr.y#1 branch .. //depot/projects/hammer/bin/getfacl/Makefile#1 branch .. //depot/projects/hammer/bin/getfacl/getfacl.1#1 branch .. //depot/projects/hammer/bin/getfacl/getfacl.c#1 branch .. //depot/projects/hammer/bin/hostname/Makefile#1 branch .. //depot/projects/hammer/bin/hostname/hostname.1#1 branch .. //depot/projects/hammer/bin/hostname/hostname.c#1 branch .. //depot/projects/hammer/bin/kenv/Makefile#1 branch .. //depot/projects/hammer/bin/kenv/kenv.1#1 branch .. //depot/projects/hammer/bin/kenv/kenv.c#1 branch .. //depot/projects/hammer/bin/kill/Makefile#1 branch .. //depot/projects/hammer/bin/kill/kill.1#1 branch .. //depot/projects/hammer/bin/kill/kill.c#1 branch .. //depot/projects/hammer/bin/ln/Makefile#1 branch .. //depot/projects/hammer/bin/ln/ln.1#1 branch .. //depot/projects/hammer/bin/ln/ln.c#1 branch .. //depot/projects/hammer/bin/ln/symlink.7#1 branch .. //depot/projects/hammer/bin/ls/Makefile#1 branch .. //depot/projects/hammer/bin/ls/cmp.c#1 branch .. //depot/projects/hammer/bin/ls/extern.h#1 branch .. //depot/projects/hammer/bin/ls/lomac.c#1 branch .. //depot/projects/hammer/bin/ls/lomac.h#1 branch .. //depot/projects/hammer/bin/ls/ls.1#1 branch .. //depot/projects/hammer/bin/ls/ls.c#1 branch .. //depot/projects/hammer/bin/ls/ls.h#1 branch .. //depot/projects/hammer/bin/ls/print.c#1 branch .. //depot/projects/hammer/bin/ls/util.c#1 branch .. //depot/projects/hammer/bin/mkdir/Makefile#1 branch .. //depot/projects/hammer/bin/mkdir/mkdir.1#1 branch .. //depot/projects/hammer/bin/mkdir/mkdir.c#1 branch .. //depot/projects/hammer/bin/mv/Makefile#1 branch .. //depot/projects/hammer/bin/mv/mv.1#1 branch .. //depot/projects/hammer/bin/mv/mv.c#1 branch .. //depot/projects/hammer/bin/mv/pathnames.h#1 branch .. //depot/projects/hammer/bin/pax/Makefile#1 branch .. //depot/projects/hammer/bin/pax/ar_io.c#1 branch .. //depot/projects/hammer/bin/pax/ar_subs.c#1 branch .. //depot/projects/hammer/bin/pax/buf_subs.c#1 branch .. //depot/projects/hammer/bin/pax/cache.c#1 branch .. //depot/projects/hammer/bin/pax/cache.h#1 branch .. //depot/projects/hammer/bin/pax/cpio.1#1 branch .. //depot/projects/hammer/bin/pax/cpio.c#1 branch .. //depot/projects/hammer/bin/pax/cpio.h#1 branch .. //depot/projects/hammer/bin/pax/extern.h#1 branch .. //depot/projects/hammer/bin/pax/file_subs.c#1 branch .. //depot/projects/hammer/bin/pax/ftree.c#1 branch .. //depot/projects/hammer/bin/pax/ftree.h#1 branch .. //depot/projects/hammer/bin/pax/gen_subs.c#1 branch .. //depot/projects/hammer/bin/pax/getoldopt.c#1 branch .. //depot/projects/hammer/bin/pax/options.c#1 branch .. //depot/projects/hammer/bin/pax/options.h#1 branch .. //depot/projects/hammer/bin/pax/pat_rep.c#1 branch .. //depot/projects/hammer/bin/pax/pat_rep.h#1 branch .. //depot/projects/hammer/bin/pax/pax.1#1 branch .. //depot/projects/hammer/bin/pax/pax.c#1 branch .. //depot/projects/hammer/bin/pax/pax.h#1 branch .. //depot/projects/hammer/bin/pax/sel_subs.c#1 branch .. //depot/projects/hammer/bin/pax/sel_subs.h#1 branch .. //depot/projects/hammer/bin/pax/tables.c#1 branch .. //depot/projects/hammer/bin/pax/tables.h#1 branch .. //depot/projects/hammer/bin/pax/tar.1#1 branch .. //depot/projects/hammer/bin/pax/tar.c#1 branch .. //depot/projects/hammer/bin/pax/tar.h#1 branch .. //depot/projects/hammer/bin/pax/tty_subs.c#1 branch .. //depot/projects/hammer/bin/ps/Makefile#1 branch .. //depot/projects/hammer/bin/ps/extern.h#1 branch .. //depot/projects/hammer/bin/ps/fmt.c#1 branch .. //depot/projects/hammer/bin/ps/keyword.c#1 branch .. //depot/projects/hammer/bin/ps/lomac.c#1 branch .. //depot/projects/hammer/bin/ps/lomac.h#1 branch .. //depot/projects/hammer/bin/ps/nlist.c#1 branch .. //depot/projects/hammer/bin/ps/print.c#1 branch .. //depot/projects/hammer/bin/ps/ps.1#1 branch .. //depot/projects/hammer/bin/ps/ps.c#1 branch .. //depot/projects/hammer/bin/ps/ps.h#1 branch .. //depot/projects/hammer/bin/pwd/Makefile#1 branch .. //depot/projects/hammer/bin/pwd/pwd.1#1 branch .. //depot/projects/hammer/bin/pwd/pwd.c#1 branch .. //depot/projects/hammer/bin/rcp/Makefile#1 branch .. //depot/projects/hammer/bin/rcp/extern.h#1 branch .. //depot/projects/hammer/bin/rcp/rcp.1#1 branch .. //depot/projects/hammer/bin/rcp/rcp.c#1 branch .. //depot/projects/hammer/bin/rcp/util.c#1 branch .. //depot/projects/hammer/bin/realpath/Makefile#1 branch .. //depot/projects/hammer/bin/realpath/realpath.1#1 branch .. //depot/projects/hammer/bin/realpath/realpath.c#1 branch .. //depot/projects/hammer/bin/rm/Makefile#1 branch .. //depot/projects/hammer/bin/rm/rm.1#1 branch .. //depot/projects/hammer/bin/rm/rm.c#1 branch .. //depot/projects/hammer/bin/rmail/Makefile#1 branch .. //depot/projects/hammer/bin/rmdir/Makefile#1 branch .. //depot/projects/hammer/bin/rmdir/rmdir.1#1 branch .. //depot/projects/hammer/bin/rmdir/rmdir.c#1 branch .. //depot/projects/hammer/bin/setfacl/Makefile#1 branch .. //depot/projects/hammer/bin/setfacl/file.c#1 branch .. //depot/projects/hammer/bin/setfacl/mask.c#1 branch .. //depot/projects/hammer/bin/setfacl/merge.c#1 branch .. //depot/projects/hammer/bin/setfacl/remove.c#1 branch .. //depot/projects/hammer/bin/setfacl/setfacl.1#1 branch .. //depot/projects/hammer/bin/setfacl/setfacl.c#1 branch .. //depot/projects/hammer/bin/setfacl/setfacl.h#1 branch .. //depot/projects/hammer/bin/setfacl/util.c#1 branch .. //depot/projects/hammer/bin/sh/Makefile#1 branch .. //depot/projects/hammer/bin/sh/TOUR#1 branch .. //depot/projects/hammer/bin/sh/alias.c#1 branch .. //depot/projects/hammer/bin/sh/alias.h#1 branch .. //depot/projects/hammer/bin/sh/arith.h#1 branch .. //depot/projects/hammer/bin/sh/arith.y#1 branch .. //depot/projects/hammer/bin/sh/arith_lex.l#1 branch .. //depot/projects/hammer/bin/sh/bltin/bltin.h#1 branch .. //depot/projects/hammer/bin/sh/bltin/echo.1#1 branch .. //depot/projects/hammer/bin/sh/bltin/echo.c#1 branch .. //depot/projects/hammer/bin/sh/builtins.def#1 branch .. //depot/projects/hammer/bin/sh/cd.c#1 branch .. //depot/projects/hammer/bin/sh/cd.h#1 branch .. //depot/projects/hammer/bin/sh/error.c#1 branch .. //depot/projects/hammer/bin/sh/error.h#1 branch .. //depot/projects/hammer/bin/sh/eval.c#1 branch .. //depot/projects/hammer/bin/sh/eval.h#1 branch .. //depot/projects/hammer/bin/sh/exec.c#1 branch .. //depot/projects/hammer/bin/sh/exec.h#1 branch .. //depot/projects/hammer/bin/sh/expand.c#1 branch .. //depot/projects/hammer/bin/sh/expand.h#1 branch .. //depot/projects/hammer/bin/sh/funcs/cmv#1 branch .. //depot/projects/hammer/bin/sh/funcs/dirs#1 branch .. //depot/projects/hammer/bin/sh/funcs/kill#1 branch .. //depot/projects/hammer/bin/sh/funcs/login#1 branch .. //depot/projects/hammer/bin/sh/funcs/newgrp#1 branch .. //depot/projects/hammer/bin/sh/funcs/popd#1 branch .. //depot/projects/hammer/bin/sh/funcs/pushd#1 branch .. //depot/projects/hammer/bin/sh/funcs/suspend#1 branch .. //depot/projects/hammer/bin/sh/histedit.c#1 branch .. //depot/projects/hammer/bin/sh/init.h#1 branch .. //depot/projects/hammer/bin/sh/input.c#1 branch .. //depot/projects/hammer/bin/sh/input.h#1 branch .. //depot/projects/hammer/bin/sh/jobs.c#1 branch .. //depot/projects/hammer/bin/sh/jobs.h#1 branch .. //depot/projects/hammer/bin/sh/machdep.h#1 branch .. //depot/projects/hammer/bin/sh/mail.c#1 branch .. //depot/projects/hammer/bin/sh/mail.h#1 branch .. //depot/projects/hammer/bin/sh/main.c#1 branch .. //depot/projects/hammer/bin/sh/main.h#1 branch .. //depot/projects/hammer/bin/sh/memalloc.c#1 branch .. //depot/projects/hammer/bin/sh/memalloc.h#1 branch .. //depot/projects/hammer/bin/sh/miscbltin.c#1 branch .. //depot/projects/hammer/bin/sh/mkbuiltins#1 branch .. //depot/projects/hammer/bin/sh/mkinit.c#1 branch .. //depot/projects/hammer/bin/sh/mknodes.c#1 branch .. //depot/projects/hammer/bin/sh/mksyntax.c#1 branch .. //depot/projects/hammer/bin/sh/mktokens#1 branch .. //depot/projects/hammer/bin/sh/myhistedit.h#1 branch .. //depot/projects/hammer/bin/sh/mystring.c#1 branch .. //depot/projects/hammer/bin/sh/mystring.h#1 branch .. //depot/projects/hammer/bin/sh/nodes.c.pat#1 branch .. //depot/projects/hammer/bin/sh/nodetypes#1 branch .. //depot/projects/hammer/bin/sh/options.c#1 branch .. //depot/projects/hammer/bin/sh/options.h#1 branch .. //depot/projects/hammer/bin/sh/output.c#1 branch .. //depot/projects/hammer/bin/sh/output.h#1 branch .. //depot/projects/hammer/bin/sh/parser.c#1 branch .. //depot/projects/hammer/bin/sh/parser.h#1 branch .. //depot/projects/hammer/bin/sh/redir.c#1 branch .. //depot/projects/hammer/bin/sh/redir.h#1 branch .. //depot/projects/hammer/bin/sh/sh.1#1 branch .. //depot/projects/hammer/bin/sh/shell.h#1 branch .. //depot/projects/hammer/bin/sh/show.c#1 branch .. //depot/projects/hammer/bin/sh/show.h#1 branch .. //depot/projects/hammer/bin/sh/trap.c#1 branch .. //depot/projects/hammer/bin/sh/trap.h#1 branch .. //depot/projects/hammer/bin/sh/var.c#1 branch .. //depot/projects/hammer/bin/sh/var.h#1 branch .. //depot/projects/hammer/bin/sleep/Makefile#1 branch .. //depot/projects/hammer/bin/sleep/sleep.1#1 branch .. //depot/projects/hammer/bin/sleep/sleep.c#1 branch .. //depot/projects/hammer/bin/stty/Makefile#1 branch .. //depot/projects/hammer/bin/stty/cchar.c#1 branch .. //depot/projects/hammer/bin/stty/extern.h#1 branch .. //depot/projects/hammer/bin/stty/gfmt.c#1 branch .. //depot/projects/hammer/bin/stty/key.c#1 branch .. //depot/projects/hammer/bin/stty/modes.c#1 branch .. //depot/projects/hammer/bin/stty/print.c#1 branch .. //depot/projects/hammer/bin/stty/stty.1#1 branch .. //depot/projects/hammer/bin/stty/stty.c#1 branch .. //depot/projects/hammer/bin/stty/stty.h#1 branch .. //depot/projects/hammer/bin/stty/util.c#1 branch .. //depot/projects/hammer/bin/sync/Makefile#1 branch .. //depot/projects/hammer/bin/sync/sync.8#1 branch .. //depot/projects/hammer/bin/sync/sync.c#1 branch .. //depot/projects/hammer/bin/test/Makefile#1 branch .. //depot/projects/hammer/bin/test/TEST.README#1 branch .. //depot/projects/hammer/bin/test/TEST.csh#1 branch .. //depot/projects/hammer/bin/test/TEST.sh#1 branch .. //depot/projects/hammer/bin/test/test.1#1 branch .. //depot/projects/hammer/bin/test/test.c#1 branch .. //depot/projects/hammer/contrib/amd/AUTHORS#1 branch .. //depot/projects/hammer/contrib/amd/BUGS#1 branch .. //depot/projects/hammer/contrib/amd/COPYING#1 branch .. //depot/projects/hammer/contrib/amd/ChangeLog#1 branch .. //depot/projects/hammer/contrib/amd/FREEBSD-Xlist#1 branch .. //depot/projects/hammer/contrib/amd/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/contrib/amd/INSTALL#1 branch .. //depot/projects/hammer/contrib/amd/MIRRORS#1 branch .. //depot/projects/hammer/contrib/amd/NEWS#1 branch .. //depot/projects/hammer/contrib/amd/README#1 branch .. //depot/projects/hammer/contrib/amd/README.ldap#1 branch .. //depot/projects/hammer/contrib/amd/README.y2k#1 branch .. //depot/projects/hammer/contrib/amd/amd/am_ops.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amd.8#1 branch .. //depot/projects/hammer/contrib/amd/amd/amd.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amd.h#1 branch .. //depot/projects/hammer/contrib/amd/amd/amfs_auto.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amfs_direct.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amfs_error.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amfs_host.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amfs_inherit.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amfs_link.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amfs_linkx.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amfs_nfsl.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amfs_nfsx.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amfs_program.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amfs_root.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amfs_toplvl.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amfs_union.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amq_subr.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/amq_svc.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/autil.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/clock.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/conf.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/conf_parse.y#1 branch .. //depot/projects/hammer/contrib/amd/amd/conf_tok.l#1 branch .. //depot/projects/hammer/contrib/amd/amd/get_args.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/info_file.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/info_hesiod.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/info_ldap.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/info_ndbm.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/info_nis.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/info_nisplus.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/info_passwd.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/info_union.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/map.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/mapc.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/mntfs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/nfs_prot_svc.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/nfs_start.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/nfs_subr.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_TEMPLATE.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_autofs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_cachefs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_cdfs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_efs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_lofs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_mfs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_nfs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_nfs3.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_nullfs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_pcfs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_tfs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_tmpfs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_ufs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_umapfs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_unionfs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/ops_xfs.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/opts.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/restart.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/rpc_fwd.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/sched.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/srvr_amfs_auto.c#1 branch .. //depot/projects/hammer/contrib/amd/amd/srvr_nfs.c#1 branch .. //depot/projects/hammer/contrib/amd/amq/amq.8#1 branch .. //depot/projects/hammer/contrib/amd/amq/amq.c#1 branch .. //depot/projects/hammer/contrib/amd/amq/amq.h#1 branch .. //depot/projects/hammer/contrib/amd/amq/amq_clnt.c#1 branch .. //depot/projects/hammer/contrib/amd/amq/amq_xdr.c#1 branch .. //depot/projects/hammer/contrib/amd/amq/pawd.1#1 branch .. //depot/projects/hammer/contrib/amd/amq/pawd.c#1 branch .. //depot/projects/hammer/contrib/amd/aux_conf.h.in#1 branch .. //depot/projects/hammer/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch .. //depot/projects/hammer/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch .. //depot/projects/hammer/contrib/amd/conf/hn_dref/hn_dref_default.h#1 branch .. //depot/projects/hammer/contrib/amd/conf/mtab/mtab_bsd.c#1 branch .. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_darwin.h#1 branch .. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch .. //depot/projects/hammer/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch .. //depot/projects/hammer/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch .. //depot/projects/hammer/contrib/amd/conf/transp/transp_sockets.c#1 branch .. //depot/projects/hammer/contrib/amd/conf/trap/trap_default.h#1 branch .. //depot/projects/hammer/contrib/amd/conf/umount/umount_bsd44.c#1 branch .. //depot/projects/hammer/contrib/amd/doc/am-utils.texi#1 branch .. //depot/projects/hammer/contrib/amd/doc/stamp-vti#1 branch .. //depot/projects/hammer/contrib/amd/doc/texinfo.tex#1 branch .. //depot/projects/hammer/contrib/amd/doc/version.texi#1 branch .. //depot/projects/hammer/contrib/amd/fixmount/fixmount.8#1 branch .. //depot/projects/hammer/contrib/amd/fixmount/fixmount.c#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/fsi_analyze.c#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/fsi_data.h#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/fsi_dict.c#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/fsi_gram.y#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/fsi_lex.l#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/fsi_util.c#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.c#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.h#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/wr_atab.c#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/wr_bparam.c#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/wr_dumpset.c#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/wr_exportfs.c#1 branch .. //depot/projects/hammer/contrib/amd/fsinfo/wr_fstab.c#1 branch .. //depot/projects/hammer/contrib/amd/hlfsd/hlfsd.8#1 branch .. //depot/projects/hammer/contrib/amd/hlfsd/hlfsd.c#1 branch .. //depot/projects/hammer/contrib/amd/hlfsd/hlfsd.h#1 branch .. //depot/projects/hammer/contrib/amd/hlfsd/homedir.c#1 branch .. //depot/projects/hammer/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch .. //depot/projects/hammer/contrib/amd/hlfsd/stubs.c#1 branch .. //depot/projects/hammer/contrib/amd/include/am_compat.h#1 branch .. //depot/projects/hammer/contrib/amd/include/am_defs.h#1 branch .. //depot/projects/hammer/contrib/amd/include/am_utils.h#1 branch .. //depot/projects/hammer/contrib/amd/include/am_xdr_func.h#1 branch .. //depot/projects/hammer/contrib/amd/include/amq_defs.h#1 branch .. //depot/projects/hammer/contrib/amd/include/mount_headers1.h#1 branch .. //depot/projects/hammer/contrib/amd/include/mount_headers2.h#1 branch .. //depot/projects/hammer/contrib/amd/ldap-id.ms#1 branch .. //depot/projects/hammer/contrib/amd/ldap-id.txt#1 branch .. //depot/projects/hammer/contrib/amd/libamu/alloca.c#1 branch .. //depot/projects/hammer/contrib/amd/libamu/amu.h#1 branch .. //depot/projects/hammer/contrib/amd/libamu/hasmntopt.c#1 branch .. //depot/projects/hammer/contrib/amd/libamu/misc_rpc.c#1 branch .. //depot/projects/hammer/contrib/amd/libamu/mount_fs.c#1 branch .. //depot/projects/hammer/contrib/amd/libamu/mtab.c#1 branch .. //depot/projects/hammer/contrib/amd/libamu/nfs_prot_xdr.c#1 branch .. //depot/projects/hammer/contrib/amd/libamu/util.c#1 branch .. //depot/projects/hammer/contrib/amd/libamu/wire.c#1 branch .. //depot/projects/hammer/contrib/amd/libamu/xdr_func.c#1 branch .. //depot/projects/hammer/contrib/amd/libamu/xutil.c#1 branch .. //depot/projects/hammer/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch .. //depot/projects/hammer/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch .. //depot/projects/hammer/contrib/amd/scripts/Makefile.am#1 branch .. //depot/projects/hammer/contrib/amd/scripts/Makefile.in#1 branch .. //depot/projects/hammer/contrib/amd/scripts/am-eject.in#1 branch .. //depot/projects/hammer/contrib/amd/scripts/amd.conf-sample#1 branch .. //depot/projects/hammer/contrib/amd/scripts/amd.conf.5#1 branch .. //depot/projects/hammer/contrib/amd/scripts/amd2ldif.in#1 branch .. //depot/projects/hammer/contrib/amd/scripts/amd2sun.in#1 branch .. //depot/projects/hammer/contrib/amd/scripts/automount2amd.8#1 branch .. //depot/projects/hammer/contrib/amd/scripts/automount2amd.in#1 branch .. //depot/projects/hammer/contrib/amd/scripts/ctl-amd.in#1 branch .. //depot/projects/hammer/contrib/amd/scripts/ctl-hlfsd.in#1 branch .. //depot/projects/hammer/contrib/amd/scripts/expn.1#1 branch .. //depot/projects/hammer/contrib/amd/scripts/expn.in#1 branch .. //depot/projects/hammer/contrib/amd/scripts/fix-amd-map.in#1 branch .. //depot/projects/hammer/contrib/amd/scripts/fixrmtab.in#1 branch .. //depot/projects/hammer/contrib/amd/scripts/lostaltmail.conf-sample#1 branch .. //depot/projects/hammer/contrib/amd/scripts/lostaltmail.in#1 branch .. //depot/projects/hammer/contrib/amd/scripts/wait4amd.in#1 branch .. //depot/projects/hammer/contrib/amd/scripts/wait4amd2die.in#1 branch .. //depot/projects/hammer/contrib/amd/tasks#1 branch .. //depot/projects/hammer/contrib/amd/wire-test/wire-test.8#1 branch .. //depot/projects/hammer/contrib/amd/wire-test/wire-test.c#1 branch .. //depot/projects/hammer/contrib/bc/AUTHORS#1 branch .. //depot/projects/hammer/contrib/bc/ChangeLog#1 branch .. //depot/projects/hammer/contrib/bc/Examples/ckbook.b#1 branch .. //depot/projects/hammer/contrib/bc/Examples/pi.b#1 branch .. //depot/projects/hammer/contrib/bc/Examples/primes.b#1 branch .. //depot/projects/hammer/contrib/bc/Examples/twins.b#1 branch .. //depot/projects/hammer/contrib/bc/FAQ#1 branch .. //depot/projects/hammer/contrib/bc/FREEBSD-upgrade#1 branch .. //depot/projects/hammer/contrib/bc/INSTALL#1 branch .. //depot/projects/hammer/contrib/bc/Makefile.am#1 branch .. //depot/projects/hammer/contrib/bc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bc/NEWS#1 branch .. //depot/projects/hammer/contrib/bc/README#1 branch .. //depot/projects/hammer/contrib/bc/Test/BUG.bc#1 branch .. //depot/projects/hammer/contrib/bc/Test/array.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/arrayp.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/aryprm.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/atan.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/checklib.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/div.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/exp.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/fact.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/jn.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/ln.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/mul.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/raise.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/signum#1 branch .. //depot/projects/hammer/contrib/bc/Test/sine.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/sqrt.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/sqrt1.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/sqrt2.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/testfn.b#1 branch .. //depot/projects/hammer/contrib/bc/Test/timetest#1 branch .. //depot/projects/hammer/contrib/bc/acconfig.h#1 branch .. //depot/projects/hammer/contrib/bc/aclocal.m4#1 branch .. //depot/projects/hammer/contrib/bc/bc/Makefile.am#1 branch .. //depot/projects/hammer/contrib/bc/bc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bc/bc/bc.y#1 branch .. //depot/projects/hammer/contrib/bc/bc/bcdefs.h#1 branch .. //depot/projects/hammer/contrib/bc/bc/const.h#1 branch .. //depot/projects/hammer/contrib/bc/bc/execute.c#1 branch .. //depot/projects/hammer/contrib/bc/bc/fix-libmath_h#1 branch .. //depot/projects/hammer/contrib/bc/bc/global.c#1 branch .. //depot/projects/hammer/contrib/bc/bc/global.h#1 branch .. //depot/projects/hammer/contrib/bc/bc/libmath.b#1 branch .. //depot/projects/hammer/contrib/bc/bc/libmath.h#1 branch .. //depot/projects/hammer/contrib/bc/bc/load.c#1 branch .. //depot/projects/hammer/contrib/bc/bc/main.c#1 branch .. //depot/projects/hammer/contrib/bc/bc/proto.h#1 branch .. //depot/projects/hammer/contrib/bc/bc/sbc.y#1 branch .. //depot/projects/hammer/contrib/bc/bc/scan.l#1 branch .. //depot/projects/hammer/contrib/bc/bc/storage.c#1 branch .. //depot/projects/hammer/contrib/bc/bc/util.c#1 branch .. //depot/projects/hammer/contrib/bc/config.h.in#1 branch .. //depot/projects/hammer/contrib/bc/configure#1 branch .. //depot/projects/hammer/contrib/bc/configure.in#1 branch .. //depot/projects/hammer/contrib/bc/dc/Makefile.am#1 branch .. //depot/projects/hammer/contrib/bc/dc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bc/dc/array.c#1 branch .. //depot/projects/hammer/contrib/bc/dc/dc-proto.h#1 branch .. //depot/projects/hammer/contrib/bc/dc/dc-regdef.h#1 branch .. //depot/projects/hammer/contrib/bc/dc/dc.c#1 branch .. //depot/projects/hammer/contrib/bc/dc/dc.h#1 branch .. //depot/projects/hammer/contrib/bc/dc/eval.c#1 branch .. //depot/projects/hammer/contrib/bc/dc/misc.c#1 branch .. //depot/projects/hammer/contrib/bc/dc/numeric.c#1 branch .. //depot/projects/hammer/contrib/bc/dc/stack.c#1 branch .. //depot/projects/hammer/contrib/bc/dc/string.c#1 branch .. //depot/projects/hammer/contrib/bc/doc/Makefile.am#1 branch .. //depot/projects/hammer/contrib/bc/doc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bc/doc/bc.1#1 branch .. //depot/projects/hammer/contrib/bc/doc/bc.texi#1 branch .. //depot/projects/hammer/contrib/bc/doc/dc.1#1 branch .. //depot/projects/hammer/contrib/bc/doc/dc.texi#1 branch .. //depot/projects/hammer/contrib/bc/h/getopt.h#1 branch .. //depot/projects/hammer/contrib/bc/h/number.h#1 branch .. //depot/projects/hammer/contrib/bc/install-sh#1 branch .. //depot/projects/hammer/contrib/bc/lib/Makefile.am#1 branch .. //depot/projects/hammer/contrib/bc/lib/Makefile.in#1 branch .. //depot/projects/hammer/contrib/bc/lib/getopt.c#1 branch .. //depot/projects/hammer/contrib/bc/lib/getopt1.c#1 branch .. //depot/projects/hammer/contrib/bc/lib/number.c#1 branch .. //depot/projects/hammer/contrib/bc/lib/testmul.c#1 branch .. //depot/projects/hammer/contrib/bc/lib/vfprintf.c#1 branch .. //depot/projects/hammer/contrib/bc/missing#1 branch .. //depot/projects/hammer/contrib/bc/mkinstalldirs#1 branch .. //depot/projects/hammer/contrib/bc/stamp-h.in#1 branch .. //depot/projects/hammer/contrib/bind/CHANGES#1 branch .. //depot/projects/hammer/contrib/bind/DNSSEC#1 branch .. //depot/projects/hammer/contrib/bind/FREEBSD-Upgrade#1 branch .. //depot/projects/hammer/contrib/bind/FREEBSD-Xlist#1 branch .. //depot/projects/hammer/contrib/bind/INSTALL#1 branch .. //depot/projects/hammer/contrib/bind/LICENSE#1 branch .. //depot/projects/hammer/contrib/bind/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/README#1 branch .. //depot/projects/hammer/contrib/bind/SUPPORT#1 branch .. //depot/projects/hammer/contrib/bind/TODO#1 branch .. //depot/projects/hammer/contrib/bind/Version#1 branch .. //depot/projects/hammer/contrib/bind/bin/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/addr/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/addr/addr.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/dig/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/dig/dig.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/dnskeygen/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/dnskeygen/dnskeygen.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/dnsquery/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/dnsquery/dnsquery.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/host/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/host/host.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/irpd/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/irpd/irpd.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/irpd/irs-irpd.conf#1 branch .. //depot/projects/hammer/contrib/bind/bin/irpd/version.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/mkservdb/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/mkservdb/mkservdb.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named-bootconf/Grot/named-bootconf.pl#1 branch .. //depot/projects/hammer/contrib/bind/bin/named-bootconf/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/named-bootconf/named-bootconf.sh#1 branch .. //depot/projects/hammer/contrib/bind/bin/named-bootconf/test.boot#1 branch .. //depot/projects/hammer/contrib/bind/bin/named-xfer/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/named-xfer/named-xfer.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/db_defs.h#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/db_dump.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/db_func.h#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/db_glob.h#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/db_glue.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/db_ixfr.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/db_load.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/db_lookup.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/db_save.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/db_sec.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/db_tsig.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/db_update.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/named.conf#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/named.h#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_config.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_ctl.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_defs.h#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_forw.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_func.h#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_glob.h#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_glue.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_init.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_ixfr.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_lexer.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_lexer.h#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_main.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_maint.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_ncache.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_notify.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_parser.y#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_parseutil.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_parseutil.h#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_req.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_resp.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_signal.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_sort.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_stats.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_udp.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_update.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/ns_xfr.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/pathtemplate.h#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/test/127.0.0.zone#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/test/localhost.zone#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/test/named.conf#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/test/root.hint#1 branch .. //depot/projects/hammer/contrib/bind/bin/named/version.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/ndc/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/ndc/ndc.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/nslookup/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/nslookup/commands.l#1 branch .. //depot/projects/hammer/contrib/bind/bin/nslookup/debug.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/nslookup/getinfo.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/nslookup/list.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/nslookup/main.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/nslookup/nslookup.help#1 branch .. //depot/projects/hammer/contrib/bind/bin/nslookup/pathnames.h#1 branch .. //depot/projects/hammer/contrib/bind/bin/nslookup/res.h#1 branch .. //depot/projects/hammer/contrib/bind/bin/nslookup/send.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/nslookup/skip.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/nslookup/subr.c#1 branch .. //depot/projects/hammer/contrib/bind/bin/nsupdate/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/bin/nsupdate/nsupdate.c#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/acl.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/address_list.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/comments.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/config.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/controls.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/docdef.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/example.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/include.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/index.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/key.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/logging.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/master.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/options.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/server.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/trusted-keys.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/html/zone.html#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/dig.1#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/dnskeygen.1#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/dnsquery.1#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/getaddrinfo.3#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/gethostbyname.3#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/getipnodebyname.3#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/getnameinfo.3#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/getnetent.3#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/hesiod.3#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/host.1#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/hostname.7#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/inet_cidr.3#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/irs.conf.5#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/mailaddr.7#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/mkdep.1#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/named-bootconf.8#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/named-xfer.8#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/named.8#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/named.conf.5#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/ndc.8#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/nslookup.8#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/nsupdate.8#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/resolver.3#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/resolver.5#1 branch .. //depot/projects/hammer/contrib/bind/doc/man/tsig.3#1 branch .. //depot/projects/hammer/contrib/bind/doc/misc/DynamicUpdate#1 branch .. //depot/projects/hammer/contrib/bind/doc/misc/FAQ.1of2#1 branch .. //depot/projects/hammer/contrib/bind/doc/misc/FAQ.2of2#1 branch .. //depot/projects/hammer/contrib/bind/doc/misc/rfc2317-notes.txt#1 branch .. //depot/projects/hammer/contrib/bind/doc/misc/style.txt#1 branch .. //depot/projects/hammer/contrib/bind/include/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/include/arpa/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/include/arpa/inet.h#1 branch .. //depot/projects/hammer/contrib/bind/include/arpa/nameser.h#1 branch .. //depot/projects/hammer/contrib/bind/include/arpa/nameser_compat.h#1 branch .. //depot/projects/hammer/contrib/bind/include/fd_setsize.h#1 branch .. //depot/projects/hammer/contrib/bind/include/hesiod.h#1 branch .. //depot/projects/hammer/contrib/bind/include/irp.h#1 branch .. //depot/projects/hammer/contrib/bind/include/irs.h#1 branch .. //depot/projects/hammer/contrib/bind/include/isc/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/include/isc/assertions.h#1 branch .. //depot/projects/hammer/contrib/bind/include/isc/ctl.h#1 branch .. //depot/projects/hammer/contrib/bind/include/isc/dst.h#1 branch .. //depot/projects/hammer/contrib/bind/include/isc/eventlib.h#1 branch .. //depot/projects/hammer/contrib/bind/include/isc/heap.h#1 branch .. //depot/projects/hammer/contrib/bind/include/isc/irpmarshall.h#1 branch .. //depot/projects/hammer/contrib/bind/include/isc/list.h#1 branch .. //depot/projects/hammer/contrib/bind/include/isc/logging.h#1 branch .. //depot/projects/hammer/contrib/bind/include/isc/memcluster.h#1 branch .. //depot/projects/hammer/contrib/bind/include/isc/misc.h#1 branch .. //depot/projects/hammer/contrib/bind/include/isc/tree.h#1 branch .. //depot/projects/hammer/contrib/bind/include/netdb.h#1 branch .. //depot/projects/hammer/contrib/bind/include/netgroup.h#1 branch .. //depot/projects/hammer/contrib/bind/include/res_update.h#1 branch .. //depot/projects/hammer/contrib/bind/include/resolv.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/README#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/bsafe_link.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/cylink_link.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/dst_api.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/dst_internal.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/eay_dss_link.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/hmac_link.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/md5.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/md5_dgst.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/md5_locl.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/prandom.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/rsaref_link.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/dst/support.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_addr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_cidr_ntop.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_cidr_pton.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_data.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_lnaof.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_makeaddr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_net_ntop.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_net_pton.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_neta.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_netof.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_network.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_ntoa.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_ntop.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/inet_pton.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/inet/nsap_addr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/Makefile.BSD#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/README#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/dns.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/dns_gr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/dns_ho.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/dns_nw.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/dns_p.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/dns_pr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/dns_pw.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/dns_sv.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/gai_strerror.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/gen.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/gen_gr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/gen_ho.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/gen_ng.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/gen_nw.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/gen_p.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/gen_pr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/gen_pw.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/gen_sv.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getaddrinfo.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getgrent.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getgrent_r.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/gethostent.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/gethostent_r.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getnameinfo.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getnetent.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getnetent_r.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getnetgrent.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getnetgrent_r.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getprotoent.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getprotoent_r.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getpwent.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getpwent_r.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getservent.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/getservent_r.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/hesiod.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/hesiod_p.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/irp.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/irp_gr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/irp_ho.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/irp_ng.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/irp_nw.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/irp_p.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/irp_pr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/irp_pw.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/irp_sv.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/irpmarshall.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/irs_data.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/irs_data.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/irs_p.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/lcl.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/lcl_gr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/lcl_ho.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/lcl_ng.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/lcl_nw.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/lcl_p.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/lcl_pr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/lcl_pw.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/lcl_sv.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/nis.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/nis_gr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/nis_ho.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/nis_ng.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/nis_nw.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/nis_p.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/nis_pr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/nis_pw.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/nis_sv.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/nul_ng.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/pathnames.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/irs/util.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/assertions.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/assertions.mdoc#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/base64.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/bitncmp.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/bitncmp.mdoc#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/ctl_clnt.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/ctl_p.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/ctl_p.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/ctl_srvr.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/ev_connects.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/ev_files.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/ev_streams.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/ev_timers.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/ev_waits.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/eventlib.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/eventlib.mdoc#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/eventlib_p.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/heap.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/heap.mdoc#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/hex.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/logging.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/logging.mdoc#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/logging_p.h#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/memcluster.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/memcluster.mdoc#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/movefile.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/tree.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/isc/tree.mdoc#1 branch .. //depot/projects/hammer/contrib/bind/lib/nameser/Makefile#1 branch .. //depot/projects/hammer/contrib/bind/lib/nameser/ns_date.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/nameser/ns_name.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/nameser/ns_netint.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/nameser/ns_parse.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/nameser/ns_print.c#1 branch .. //depot/projects/hammer/contrib/bind/lib/nameser/ns_samedomain.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 10 0:28:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 984E737B401; Sat, 10 Aug 2002 00:27:53 -0700 (PDT) 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 2F3CD37B400 for ; Sat, 10 Aug 2002 00:27:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08D2743E42 for ; Sat, 10 Aug 2002 00:27:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7A7RqJU072678 for ; Sat, 10 Aug 2002 00:27:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7A7RmMZ072675 for perforce@freebsd.org; Sat, 10 Aug 2002 00:27:48 -0700 (PDT) Date: Sat, 10 Aug 2002 00:27:48 -0700 (PDT) Message-Id: <200208100727.g7A7RmMZ072675@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15772 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15772 Change 15772 by peter@peter_overcee on 2002/08/10 00:27:18 IFC @15768 Affected files ... .. //depot/projects/pmap/sys/alpha/alpha/elf_machdep.c#4 integrate .. //depot/projects/pmap/sys/alpha/alpha/exception.s#3 integrate .. //depot/projects/pmap/sys/alpha/alpha/genassym.c#5 integrate .. //depot/projects/pmap/sys/alpha/alpha/machdep.c#6 integrate .. //depot/projects/pmap/sys/alpha/alpha/pmap.c#8 integrate .. //depot/projects/pmap/sys/alpha/alpha/sys_machdep.c#5 integrate .. //depot/projects/pmap/sys/alpha/alpha/trap.c#8 integrate .. //depot/projects/pmap/sys/alpha/alpha/vm_machdep.c#4 integrate .. //depot/projects/pmap/sys/alpha/conf/GENERIC#6 integrate .. //depot/projects/pmap/sys/alpha/conf/NOTES#2 integrate .. //depot/projects/pmap/sys/alpha/conf/SIMOS#4 integrate .. //depot/projects/pmap/sys/alpha/conf/gethints.awk#1 branch .. //depot/projects/pmap/sys/alpha/conf/gethints.pl#2 delete .. //depot/projects/pmap/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/pmap/sys/alpha/include/ansi.h#4 integrate .. //depot/projects/pmap/sys/alpha/include/limits.h#2 integrate .. //depot/projects/pmap/sys/alpha/include/pmap.h#5 integrate .. //depot/projects/pmap/sys/alpha/include/proc.h#3 integrate .. //depot/projects/pmap/sys/alpha/linux/linux_sysvec.c#4 integrate .. //depot/projects/pmap/sys/alpha/osf1/imgact_osf1.c#4 integrate .. //depot/projects/pmap/sys/alpha/osf1/osf1_signal.c#3 integrate .. //depot/projects/pmap/sys/arm/include/_stdint.h#1 branch .. //depot/projects/pmap/sys/arm/include/ansi.h#3 integrate .. //depot/projects/pmap/sys/arm/include/limits.h#2 integrate .. //depot/projects/pmap/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/pmap/sys/boot/common/loader.8#6 integrate .. //depot/projects/pmap/sys/boot/efi/Makefile.inc#3 integrate .. //depot/projects/pmap/sys/boot/efi/libefi/efinet.c#3 integrate .. //depot/projects/pmap/sys/boot/efi/loader/conf.c#3 integrate .. //depot/projects/pmap/sys/boot/efi/loader/main.c#3 integrate .. //depot/projects/pmap/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/pmap/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/pmap/sys/boot/i386/libi386/i386_module.c#2 integrate .. //depot/projects/pmap/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/pmap/sys/boot/ofw/libofw/elf_freebsd.c#4 integrate .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_disk.c#4 integrate .. //depot/projects/pmap/sys/boot/ofw/libofw/ofw_memory.c#2 integrate .. //depot/projects/pmap/sys/boot/ofw/libofw/openfirm.c#3 integrate .. //depot/projects/pmap/sys/boot/ofw/libofw/openfirm.h#3 integrate .. //depot/projects/pmap/sys/boot/pc98/Makefile#3 integrate .. //depot/projects/pmap/sys/boot/pc98/boot2/Makefile#4 integrate .. //depot/projects/pmap/sys/boot/pc98/boot2/boot.h#3 integrate .. //depot/projects/pmap/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/pmap/sys/coda/coda_namecache.c#3 integrate .. //depot/projects/pmap/sys/coda/coda_subr.c#3 integrate .. //depot/projects/pmap/sys/coda/coda_vfsops.c#4 integrate .. //depot/projects/pmap/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/pmap/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/pmap/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/pmap/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/pmap/sys/compat/pecoff/imgact_pecoff.c#5 integrate .. //depot/projects/pmap/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/pmap/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/pmap/sys/conf/Makefile.alpha#4 integrate .. //depot/projects/pmap/sys/conf/Makefile.i386#5 integrate .. //depot/projects/pmap/sys/conf/Makefile.ia64#5 integrate .. //depot/projects/pmap/sys/conf/Makefile.pc98#4 integrate .. //depot/projects/pmap/sys/conf/Makefile.powerpc#5 integrate .. //depot/projects/pmap/sys/conf/Makefile.sparc64#5 integrate .. //depot/projects/pmap/sys/conf/Makefile.x86_64#3 integrate .. //depot/projects/pmap/sys/conf/NOTES#6 integrate .. //depot/projects/pmap/sys/conf/files#12 integrate .. //depot/projects/pmap/sys/conf/files.alpha#7 integrate .. //depot/projects/pmap/sys/conf/files.i386#10 integrate .. //depot/projects/pmap/sys/conf/files.ia64#6 integrate .. //depot/projects/pmap/sys/conf/files.pc98#9 integrate .. //depot/projects/pmap/sys/conf/files.sparc64#7 integrate .. //depot/projects/pmap/sys/conf/files.x86_64#3 integrate .. //depot/projects/pmap/sys/conf/kern.post.mk#10 integrate .. //depot/projects/pmap/sys/conf/kern.pre.mk#11 integrate .. //depot/projects/pmap/sys/conf/kmod.mk#7 integrate .. //depot/projects/pmap/sys/conf/kmod_syms.awk#3 integrate .. //depot/projects/pmap/sys/conf/majors#6 integrate .. //depot/projects/pmap/sys/conf/options#8 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acconfig.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acdebug.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/acenv.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acglobal.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/aclocal.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acmacros.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acnamesp.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acparser.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acpiosxf.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acpixf.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/actables.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/actbl.h#3 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/actypes.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/acutils.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/amlcode.h#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/amlresrc.h#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/dbcmds.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbdisasm.c#4 delete .. //depot/projects/pmap/sys/contrib/dev/acpica/dbdisply.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbexec.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbfileio.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dbxface.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dmbuffer.c#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/dmnames.c#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/dmopcode.c#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/dmresrc.c#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/dmresrcl.c#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/dmresrcs.c#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/dmutils.c#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/dmwalk.c#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/dsmethod.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dsobject.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dsutils.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dswload.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/dswstate.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exconfig.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/excreate.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exdump.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exmisc.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exoparg1.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exoparg2.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exresnte.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exresolv.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exresop.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exstore.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/exutils.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsdump.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsdumpdv.c#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/nseval.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsload.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsnames.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/nsxfeval.c#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/nsxfobj.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/psargs.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/psfind.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/psopcode.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/psparse.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/psutils.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/psxface.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rscreate.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rsio.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rsirq.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/rslist.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/tbconvrt.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/tbget.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/tbgetall.c#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/tbinstal.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/tbrsdt.c#1 branch .. //depot/projects/pmap/sys/contrib/dev/acpica/tbutils.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/tbxface.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/tbxfroot.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utcopy.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utglobal.c#4 integrate .. //depot/projects/pmap/sys/contrib/dev/acpica/utxface.c#4 integrate .. //depot/projects/pmap/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi_button.c#5 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi_cmbat.c#4 integrate .. //depot/projects/pmap/sys/dev/acpica/acpi_lid.c#5 integrate .. //depot/projects/pmap/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/pmap/sys/dev/acpica/acpivar.h#7 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/ahc_eisa.c#3 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/pmap/sys/dev/aic7xxx/aicasm/aicasm_gram.y#3 integrate .. //depot/projects/pmap/sys/dev/an/if_an.c#6 integrate .. //depot/projects/pmap/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/pmap/sys/dev/ata/ata-disk.c#7 integrate .. //depot/projects/pmap/sys/dev/ata/ata-disk.h#6 integrate .. //depot/projects/pmap/sys/dev/ata/ata-dma.c#5 integrate .. //depot/projects/pmap/sys/dev/ata/ata-isa.c#4 integrate .. //depot/projects/pmap/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/pmap/sys/dev/ata/atapi-all.c#5 integrate .. //depot/projects/pmap/sys/dev/ata/atapi-all.h#4 integrate .. //depot/projects/pmap/sys/dev/ata/atapi-cam.c#1 branch .. //depot/projects/pmap/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/pmap/sys/dev/ata/atapi-cd.h#4 integrate .. //depot/projects/pmap/sys/dev/ata/atapi-fd.c#4 integrate .. //depot/projects/pmap/sys/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/pmap/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/pmap/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/pmap/sys/dev/bktr/bktr_core.c#3 integrate .. //depot/projects/pmap/sys/dev/bktr/bktr_i2c.c#3 integrate .. //depot/projects/pmap/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/pmap/sys/dev/buslogic/bt.c#2 integrate .. //depot/projects/pmap/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/pmap/sys/dev/ed/if_ed_pccard.c#4 integrate .. //depot/projects/pmap/sys/dev/em/README#2 integrate .. //depot/projects/pmap/sys/dev/em/if_em.c#4 integrate .. //depot/projects/pmap/sys/dev/em/if_em.h#4 integrate .. //depot/projects/pmap/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/pmap/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/pmap/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/pmap/sys/dev/exca/exca.c#3 integrate .. //depot/projects/pmap/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/pmap/sys/dev/exca/excavar.h#2 integrate .. //depot/projects/pmap/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/pmap/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/pmap/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/pmap/sys/dev/isp/isp_freebsd.c#7 integrate .. //depot/projects/pmap/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/pmap/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/pmap/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/pmap/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/pmap/sys/dev/mii/mii.c#3 integrate .. //depot/projects/pmap/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/pmap/sys/dev/nge/if_ngereg.h#3 integrate .. //depot/projects/pmap/sys/dev/null/null.c#3 integrate .. //depot/projects/pmap/sys/dev/pccard/card_if.m#4 integrate .. //depot/projects/pmap/sys/dev/pccard/pccard_common.c#2 delete .. //depot/projects/pmap/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/pmap/sys/dev/pccard/pccarddevs.h#5 integrate .. //depot/projects/pmap/sys/dev/pccard/pccardvar.h#5 integrate .. //depot/projects/pmap/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/pmap/sys/dev/pccbb/pccbbdevid.h#3 integrate .. //depot/projects/pmap/sys/dev/pccbb/pccbbreg.h#5 integrate .. //depot/projects/pmap/sys/dev/pccbb/pccbbvar.h#5 integrate .. //depot/projects/pmap/sys/dev/pci/pci.c#5 integrate .. //depot/projects/pmap/sys/dev/pst/pst-iop.c#1 branch .. //depot/projects/pmap/sys/dev/pst/pst-iop.h#1 branch .. //depot/projects/pmap/sys/dev/pst/pst-pci.c#1 branch .. //depot/projects/pmap/sys/dev/pst/pst-raid.c#1 branch .. //depot/projects/pmap/sys/dev/puc/puc.c#4 integrate .. //depot/projects/pmap/sys/dev/sab/sab.c#1 branch .. //depot/projects/pmap/sys/dev/sab/sab82532reg.h#1 branch .. //depot/projects/pmap/sys/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/pmap/sys/dev/sbni/if_sbni_isa.c#4 integrate .. //depot/projects/pmap/sys/dev/sbni/if_sbni_pci.c#3 integrate .. //depot/projects/pmap/sys/dev/sbni/if_sbnivar.h#3 integrate .. //depot/projects/pmap/sys/dev/se/se_console.c#2 delete .. //depot/projects/pmap/sys/dev/se/sereg.h#2 delete .. //depot/projects/pmap/sys/dev/si/si.c#3 integrate .. //depot/projects/pmap/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/pmap/sys/dev/sio/sio_ebus.c#2 integrate .. //depot/projects/pmap/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/pmap/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/pci/csa.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/sndstat.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/pmap/sys/dev/sound/usb/uaudio.c#1 branch .. //depot/projects/pmap/sys/dev/sound/usb/uaudio.h#1 branch .. //depot/projects/pmap/sys/dev/sound/usb/uaudio_pcm.c#1 branch .. //depot/projects/pmap/sys/dev/sound/usb/uaudioreg.h#1 branch .. //depot/projects/pmap/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/pmap/sys/dev/usb/hid.c#3 integrate .. //depot/projects/pmap/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/pmap/sys/dev/usb/ohci.c#5 integrate .. //depot/projects/pmap/sys/dev/usb/ucom.c#5 integrate .. //depot/projects/pmap/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/pmap/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/pmap/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/pmap/sys/dev/usb/ugen.c#5 integrate .. //depot/projects/pmap/sys/dev/usb/uhci.c#8 integrate .. //depot/projects/pmap/sys/dev/usb/uhid.c#5 integrate .. //depot/projects/pmap/sys/dev/usb/uhub.c#4 integrate .. //depot/projects/pmap/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/pmap/sys/dev/usb/ulpt.c#5 integrate .. //depot/projects/pmap/sys/dev/usb/umass.c#5 integrate .. //depot/projects/pmap/sys/dev/usb/umodem.c#4 integrate .. //depot/projects/pmap/sys/dev/usb/ums.c#4 integrate .. //depot/projects/pmap/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/pmap/sys/dev/usb/urio.c#3 integrate .. //depot/projects/pmap/sys/dev/usb/usb.c#5 integrate .. //depot/projects/pmap/sys/dev/usb/usb_port.h#5 integrate .. //depot/projects/pmap/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/pmap/sys/dev/usb/usbdevs.h#6 integrate .. //depot/projects/pmap/sys/dev/usb/usbdevs_data.h#6 integrate .. //depot/projects/pmap/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/pmap/sys/dev/usb/uvisor.c#1 branch .. //depot/projects/pmap/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/pmap/sys/dev/wi/if_wavelan_ieee.h#3 integrate .. //depot/projects/pmap/sys/dev/wi/if_wi.c#6 integrate .. //depot/projects/pmap/sys/dev/wi/if_wi_pccard.c#2 integrate .. //depot/projects/pmap/sys/dev/wi/if_wireg.h#5 integrate .. //depot/projects/pmap/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/pmap/sys/dev/wi/spectrum24t_cf.h#1 branch .. //depot/projects/pmap/sys/dev/wi/wi_hostap.c#2 integrate .. //depot/projects/pmap/sys/dev/xe/if_xe_pccard.c#3 integrate .. //depot/projects/pmap/sys/fs/deadfs/dead_vnops.c#3 integrate .. //depot/projects/pmap/sys/fs/devfs/devfs.h#3 integrate .. //depot/projects/pmap/sys/fs/devfs/devfs_devs.c#3 integrate .. //depot/projects/pmap/sys/fs/devfs/devfs_rule.c#1 branch .. //depot/projects/pmap/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/pmap/sys/fs/devfs/devfs_vnops.c#3 integrate .. //depot/projects/pmap/sys/fs/fdescfs/fdesc_vfsops.c#4 integrate .. //depot/projects/pmap/sys/fs/hpfs/hpfs_vfsops.c#4 integrate .. //depot/projects/pmap/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/pmap/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/pmap/sys/fs/msdosfs/msdosfs_lookup.c#3 integrate .. //depot/projects/pmap/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/pmap/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate .. //depot/projects/pmap/sys/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/pmap/sys/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/pmap/sys/fs/nullfs/null_vfsops.c#3 integrate .. //depot/projects/pmap/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/pmap/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/pmap/sys/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/pmap/sys/fs/nwfs/nwfs_vfsops.c#4 integrate .. //depot/projects/pmap/sys/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/pmap/sys/fs/portalfs/portal_vfsops.c#4 integrate .. //depot/projects/pmap/sys/fs/portalfs/portal_vnops.c#5 integrate .. //depot/projects/pmap/sys/fs/procfs/procfs.c#4 integrate .. //depot/projects/pmap/sys/fs/procfs/procfs.h#3 integrate .. //depot/projects/pmap/sys/fs/procfs/procfs_ctl.c#5 integrate .. //depot/projects/pmap/sys/fs/procfs/procfs_mac.c#1 branch .. //depot/projects/pmap/sys/fs/pseudofs/pseudofs.h#4 integrate .. //depot/projects/pmap/sys/fs/pseudofs/pseudofs_vncache.c#5 integrate .. //depot/projects/pmap/sys/fs/pseudofs/pseudofs_vnops.c#4 integrate .. //depot/projects/pmap/sys/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/pmap/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/pmap/sys/fs/smbfs/smbfs_vfsops.c#4 integrate .. //depot/projects/pmap/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/pmap/sys/fs/specfs/spec_vnops.c#7 integrate .. //depot/projects/pmap/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/pmap/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/pmap/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/pmap/sys/fs/umapfs/umap_vfsops.c#3 integrate .. //depot/projects/pmap/sys/fs/unionfs/union_subr.c#5 integrate .. //depot/projects/pmap/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/pmap/sys/gnu/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/pmap/sys/i386/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/pmap/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/pmap/sys/i386/conf/NEWCARD#5 integrate .. //depot/projects/pmap/sys/i386/conf/NOTES#9 integrate .. //depot/projects/pmap/sys/i386/conf/OLDCARD#2 integrate .. //depot/projects/pmap/sys/i386/conf/gethints.awk#1 branch .. //depot/projects/pmap/sys/i386/conf/gethints.pl#2 delete .. //depot/projects/pmap/sys/i386/i386/db_interface.c#6 integrate .. //depot/projects/pmap/sys/i386/i386/db_trace.c#4 integrate .. //depot/projects/pmap/sys/i386/i386/elan-mmcr.c#1 branch .. //depot/projects/pmap/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/pmap/sys/i386/i386/exception.s#7 integrate .. //depot/projects/pmap/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/pmap/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/pmap/sys/i386/i386/mem.c#4 integrate .. //depot/projects/pmap/sys/i386/i386/pmap.c#29 integrate .. //depot/projects/pmap/sys/i386/i386/swtch.s#7 integrate .. //depot/projects/pmap/sys/i386/i386/trap.c#8 integrate .. //depot/projects/pmap/sys/i386/ibcs2/imgact_coff.c#5 integrate .. //depot/projects/pmap/sys/i386/include/_stdint.h#1 branch .. //depot/projects/pmap/sys/i386/include/acpica_machdep.h#1 branch .. //depot/projects/pmap/sys/i386/include/ansi.h#4 integrate .. //depot/projects/pmap/sys/i386/include/atomic.h#4 integrate .. //depot/projects/pmap/sys/i386/include/cpufunc.h#14 integrate .. //depot/projects/pmap/sys/i386/include/cputypes.h#2 integrate .. //depot/projects/pmap/sys/i386/include/limits.h#2 integrate .. //depot/projects/pmap/sys/i386/include/md_var.h#5 integrate .. //depot/projects/pmap/sys/i386/include/pmap.h#12 integrate .. //depot/projects/pmap/sys/i386/isa/cx.c#3 integrate .. //depot/projects/pmap/sys/i386/isa/stallion.c#3 integrate .. //depot/projects/pmap/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/pmap/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/pmap/sys/i386/linux/linux_sysvec.c#5 integrate .. //depot/projects/pmap/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/pmap/sys/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/pmap/sys/ia64/acpica/madt.c#3 integrate .. //depot/projects/pmap/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/pmap/sys/ia64/ia32/ia32.h#1 branch .. //depot/projects/pmap/sys/ia64/ia32/ia32_misc.c#1 branch .. //depot/projects/pmap/sys/ia64/ia32/ia32_proto.h#2 integrate .. //depot/projects/pmap/sys/ia64/ia32/ia32_syscall.h#2 integrate .. //depot/projects/pmap/sys/ia64/ia32/ia32_sysent.c#2 integrate .. //depot/projects/pmap/sys/ia64/ia32/ia32_sysvec.c#1 branch .. //depot/projects/pmap/sys/ia64/ia32/ia32_util.h#1 branch .. //depot/projects/pmap/sys/ia64/ia32/imgact_ia32.c#2 delete .. //depot/projects/pmap/sys/ia64/ia32/imgact_ia32.h#2 delete .. //depot/projects/pmap/sys/ia64/ia32/syscalls.master#2 integrate .. //depot/projects/pmap/sys/ia64/ia64/efi.c#2 integrate .. //depot/projects/pmap/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/pmap/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/pmap/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/pmap/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/pmap/sys/ia64/ia64/sapic.c#3 integrate .. //depot/projects/pmap/sys/ia64/include/_stdint.h#1 branch .. //depot/projects/pmap/sys/ia64/include/acpica_machdep.h#1 branch .. //depot/projects/pmap/sys/ia64/include/ansi.h#4 integrate .. //depot/projects/pmap/sys/ia64/include/elf.h#3 integrate .. //depot/projects/pmap/sys/ia64/include/limits.h#2 integrate .. //depot/projects/pmap/sys/ia64/include/pmap.h#3 integrate .. //depot/projects/pmap/sys/isofs/cd9660/cd9660_vfsops.c#4 integrate .. //depot/projects/pmap/sys/kern/bus_if.m#3 integrate .. //depot/projects/pmap/sys/kern/imgact_aout.c#4 integrate .. //depot/projects/pmap/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/pmap/sys/kern/imgact_elf32.c#1 branch .. //depot/projects/pmap/sys/kern/imgact_elf64.c#1 branch .. //depot/projects/pmap/sys/kern/imgact_elfN.c#1 branch .. //depot/projects/pmap/sys/kern/imgact_gzip.c#3 integrate .. //depot/projects/pmap/sys/kern/init_main.c#10 integrate .. //depot/projects/pmap/sys/kern/init_sysent.c#6 integrate .. //depot/projects/pmap/sys/kern/kern_acct.c#6 integrate .. //depot/projects/pmap/sys/kern/kern_acl.c#6 integrate .. //depot/projects/pmap/sys/kern/kern_condvar.c#5 integrate .. //depot/projects/pmap/sys/kern/kern_descrip.c#7 integrate .. //depot/projects/pmap/sys/kern/kern_exec.c#10 integrate .. //depot/projects/pmap/sys/kern/kern_exit.c#8 integrate .. //depot/projects/pmap/sys/kern/kern_fork.c#11 integrate .. //depot/projects/pmap/sys/kern/kern_idle.c#5 integrate .. //depot/projects/pmap/sys/kern/kern_intr.c#5 integrate .. //depot/projects/pmap/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/pmap/sys/kern/kern_linker.c#6 integrate .. //depot/projects/pmap/sys/kern/kern_mac.c#1 branch .. //depot/projects/pmap/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/pmap/sys/kern/kern_poll.c#4 integrate .. //depot/projects/pmap/sys/kern/kern_proc.c#9 integrate .. //depot/projects/pmap/sys/kern/kern_prot.c#9 integrate .. //depot/projects/pmap/sys/kern/kern_resource.c#7 integrate .. //depot/projects/pmap/sys/kern/kern_shutdown.c#7 integrate .. //depot/projects/pmap/sys/kern/kern_sig.c#10 integrate .. //depot/projects/pmap/sys/kern/kern_subr.c#6 integrate .. //depot/projects/pmap/sys/kern/kern_switch.c#9 integrate .. //depot/projects/pmap/sys/kern/kern_synch.c#8 integrate .. //depot/projects/pmap/sys/kern/kern_sysctl.c#5 integrate .. //depot/projects/pmap/sys/kern/kern_thread.c#3 integrate .. //depot/projects/pmap/sys/kern/subr_bus.c#5 integrate .. //depot/projects/pmap/sys/kern/subr_clock.c#2 integrate .. //depot/projects/pmap/sys/kern/subr_diskslice.c#4 integrate .. //depot/projects/pmap/sys/kern/subr_eventhandler.c#3 integrate .. //depot/projects/pmap/sys/kern/subr_mbuf.c#5 integrate .. //depot/projects/pmap/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/pmap/sys/kern/sys_generic.c#5 integrate .. //depot/projects/pmap/sys/kern/sys_pipe.c#7 integrate .. //depot/projects/pmap/sys/kern/sys_process.c#9 integrate .. //depot/projects/pmap/sys/kern/syscalls.c#6 integrate .. //depot/projects/pmap/sys/kern/syscalls.master#7 integrate .. //depot/projects/pmap/sys/kern/sysv_msg.c#5 integrate .. //depot/projects/pmap/sys/kern/sysv_sem.c#6 integrate .. //depot/projects/pmap/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/pmap/sys/kern/tty.c#6 integrate .. //depot/projects/pmap/sys/kern/tty_cons.c#4 integrate .. //depot/projects/pmap/sys/kern/tty_tty.c#5 integrate .. //depot/projects/pmap/sys/kern/uipc_jumbo.c#2 integrate .. //depot/projects/pmap/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/pmap/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/pmap/sys/kern/uipc_socket2.c#6 integrate .. //depot/projects/pmap/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/pmap/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/pmap/sys/kern/vfs_aio.c#9 integrate .. //depot/projects/pmap/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/pmap/sys/kern/vfs_cache.c#6 integrate .. //depot/projects/pmap/sys/kern/vfs_cluster.c#5 integrate .. //depot/projects/pmap/sys/kern/vfs_default.c#4 integrate .. //depot/projects/pmap/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/pmap/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/pmap/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/pmap/sys/kern/vfs_syscalls.c#10 integrate .. //depot/projects/pmap/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/pmap/sys/kern/vnode_if.src#4 integrate .. //depot/projects/pmap/sys/modules/Makefile#7 integrate .. //depot/projects/pmap/sys/modules/acpi/Makefile#4 integrate .. //depot/projects/pmap/sys/modules/aic7xxx/Makefile#1 branch .. //depot/projects/pmap/sys/modules/aic7xxx/ahc/Makefile#1 branch .. //depot/projects/pmap/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#1 branch .. //depot/projects/pmap/sys/modules/aic7xxx/ahc/ahc_pci/Makefile#1 branch .. //depot/projects/pmap/sys/modules/aic7xxx/ahd/Makefile#1 branch .. //depot/projects/pmap/sys/modules/aic7xxx/aicasm/Makefile#1 branch .. //depot/projects/pmap/sys/modules/bktr/bktr/Makefile#3 integrate .. //depot/projects/pmap/sys/modules/if_ppp/Makefile#3 integrate .. //depot/projects/pmap/sys/modules/if_tun/Makefile#3 integrate .. //depot/projects/pmap/sys/modules/linux/Makefile#5 integrate .. //depot/projects/pmap/sys/modules/mac_biba/Makefile#1 branch .. //depot/projects/pmap/sys/modules/mac_bsdextended/Makefile#1 branch .. //depot/projects/pmap/sys/modules/mac_ifoff/Makefile#1 branch .. //depot/projects/pmap/sys/modules/mac_mls/Makefile#1 branch .. //depot/projects/pmap/sys/modules/mac_none/Makefile#1 branch .. //depot/projects/pmap/sys/modules/mac_seeotheruids/Makefile#1 branch .. //depot/projects/pmap/sys/modules/mac_test/Makefile#1 branch .. //depot/projects/pmap/sys/modules/mii/Makefile#3 integrate .. //depot/projects/pmap/sys/modules/procfs/Makefile#2 integrate .. //depot/projects/pmap/sys/modules/pseudofs/Makefile#2 integrate .. //depot/projects/pmap/sys/modules/sound/driver/Makefile#3 integrate .. //depot/projects/pmap/sys/modules/sound/driver/uaudio/Makefile#1 branch .. //depot/projects/pmap/sys/modules/uvisor/Makefile#1 branch .. //depot/projects/pmap/sys/modules/wi/Makefile#3 integrate .. //depot/projects/pmap/sys/net/bpf.c#3 integrate .. //depot/projects/pmap/sys/net/bpfdesc.h#2 integrate .. //depot/projects/pmap/sys/net/bsd_comp.c#3 integrate .. //depot/projects/pmap/sys/net/if.c#6 integrate .. //depot/projects/pmap/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/pmap/sys/net/if_gif.c#6 integrate .. //depot/projects/pmap/sys/net/if_ppp.c#6 integrate .. //depot/projects/pmap/sys/net/if_pppvar.h#4 integrate .. //depot/projects/pmap/sys/net/if_tun.c#5 integrate .. //depot/projects/pmap/sys/net/if_var.h#3 integrate .. //depot/projects/pmap/sys/net/netisr.h#3 integrate .. //depot/projects/pmap/sys/net/ppp_tty.c#4 integrate .. //depot/projects/pmap/sys/netgraph/ng_base.c#4 integrate .. //depot/projects/pmap/sys/netinet/if_ether.c#3 integrate .. //depot/projects/pmap/sys/netinet/igmp.c#3 integrate .. //depot/projects/pmap/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/pmap/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/pmap/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/pmap/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/pmap/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/pmap/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/pmap/sys/netinet/ip_icmp.c#5 integrate .. //depot/projects/pmap/sys/netinet/ip_input.c#6 integrate .. //depot/projects/pmap/sys/netinet/ip_output.c#6 integrate .. //depot/projects/pmap/sys/netinet/ip_var.h#3 integrate .. //depot/projects/pmap/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/pmap/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/pmap/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/pmap/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/pmap/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/pmap/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/pmap/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/pmap/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/pmap/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/pmap/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/pmap/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/pmap/sys/netinet6/esp_input.c#4 integrate .. //depot/projects/pmap/sys/netinet6/in6.h#3 integrate .. //depot/projects/pmap/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/pmap/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/pmap/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/pmap/sys/netinet6/nd6.c#4 integrate .. //depot/projects/pmap/sys/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/pmap/sys/netipx/spx_debug.h#3 integrate .. //depot/projects/pmap/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/pmap/sys/netncp/ncp_lib.h#3 integrate .. //depot/projects/pmap/sys/netsmb/smb_conn.c#3 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_socket.c#7 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/pmap/sys/nfsserver/nfs.h#5 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_serv.c#8 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_syscalls.c#6 integrate .. //depot/projects/pmap/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/pmap/sys/pc98/conf/gethints.awk#1 branch .. //depot/projects/pmap/sys/pc98/conf/gethints.pl#2 delete .. //depot/projects/pmap/sys/pc98/i386/machdep.c#8 integrate .. //depot/projects/pmap/sys/pc98/pc98/fd.c#4 integrate .. //depot/projects/pmap/sys/pccard/cardinfo.h#4 integrate .. //depot/projects/pmap/sys/pccard/i82365.h#3 integrate .. //depot/projects/pmap/sys/pccard/pccard.c#6 integrate .. //depot/projects/pmap/sys/pccard/pccard_nbk.c#4 integrate .. //depot/projects/pmap/sys/pccard/pcic.c#5 integrate .. //depot/projects/pmap/sys/pccard/pcic_pci.c#5 integrate .. //depot/projects/pmap/sys/pccard/pcic_pci.h#3 integrate .. //depot/projects/pmap/sys/pccard/pcicvar.h#2 integrate .. //depot/projects/pmap/sys/pccard/slot.h#4 integrate .. //depot/projects/pmap/sys/pci/agp.c#4 integrate .. //depot/projects/pmap/sys/pci/agp_i810.c#4 integrate .. //depot/projects/pmap/sys/pci/agp_intel.c#3 integrate .. //depot/projects/pmap/sys/pci/if_mn.c#2 integrate .. //depot/projects/pmap/sys/pci/if_rl.c#4 integrate .. //depot/projects/pmap/sys/pci/if_sis.c#5 integrate .. //depot/projects/pmap/sys/pci/if_ste.c#3 integrate .. //depot/projects/pmap/sys/pci/if_stereg.h#2 integrate .. //depot/projects/pmap/sys/pci/if_vr.c#3 integrate .. //depot/projects/pmap/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/pmap/sys/pci/uhci_pci.c#3 integrate .. //depot/projects/pmap/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/pmap/sys/powerpc/include/_stdint.h#1 branch .. //depot/projects/pmap/sys/powerpc/include/ansi.h#4 integrate .. //depot/projects/pmap/sys/powerpc/include/limits.h#2 integrate .. //depot/projects/pmap/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/pmap/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/pmap/sys/powerpc/powerpc/pmap.c#7 integrate .. //depot/projects/pmap/sys/security/lomac/kernel_interface.c#3 integrate .. //depot/projects/pmap/sys/security/lomac/kernel_util.c#5 integrate .. //depot/projects/pmap/sys/security/lomac/lomacfs_subr.c#3 integrate .. //depot/projects/pmap/sys/security/lomac/lomacfs_vfsops.c#3 integrate .. //depot/projects/pmap/sys/security/lomac/lomacfs_vnops.c#4 integrate .. //depot/projects/pmap/sys/security/mac_biba/mac_biba.c#1 branch .. //depot/projects/pmap/sys/security/mac_biba/mac_biba.h#1 branch .. //depot/projects/pmap/sys/security/mac_bsdextended/mac_bsdextended.c#1 branch .. //depot/projects/pmap/sys/security/mac_bsdextended/mac_bsdextended.h#1 branch .. //depot/projects/pmap/sys/security/mac_ifoff/mac_ifoff.c#1 branch .. //depot/projects/pmap/sys/security/mac_mls/mac_mls.c#1 branch .. //depot/projects/pmap/sys/security/mac_mls/mac_mls.h#1 branch .. //depot/projects/pmap/sys/security/mac_none/mac_none.c#1 branch .. //depot/projects/pmap/sys/security/mac_seeotheruids/mac_seeotheruids.c#1 branch .. //depot/projects/pmap/sys/security/mac_test/mac_test.c#1 branch .. //depot/projects/pmap/sys/sparc64/conf/GENERIC#5 integrate .. //depot/projects/pmap/sys/sparc64/include/_stdint.h#1 branch .. //depot/projects/pmap/sys/sparc64/include/ansi.h#4 integrate .. //depot/projects/pmap/sys/sparc64/include/asi.h#3 integrate .. //depot/projects/pmap/sys/sparc64/include/asmacros.h#4 integrate .. //depot/projects/pmap/sys/sparc64/include/cpu.h#3 integrate .. //depot/projects/pmap/sys/sparc64/include/emul.h#2 delete .. //depot/projects/pmap/sys/sparc64/include/instr.h#3 integrate .. //depot/projects/pmap/sys/sparc64/include/iommuvar.h#4 integrate .. //depot/projects/pmap/sys/sparc64/include/limits.h#2 integrate .. //depot/projects/pmap/sys/sparc64/include/lsu.h#2 integrate .. //depot/projects/pmap/sys/sparc64/include/pmap.h#7 integrate .. //depot/projects/pmap/sys/sparc64/include/profile.h#3 integrate .. //depot/projects/pmap/sys/sparc64/include/pv.h#3 delete .. //depot/projects/pmap/sys/sparc64/include/smp.h#8 integrate .. //depot/projects/pmap/sys/sparc64/include/tlb.h#5 integrate .. //depot/projects/pmap/sys/sparc64/include/tte.h#5 integrate .. //depot/projects/pmap/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/pmap/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/cache.c#4 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/emul.c#3 delete .. //depot/projects/pmap/sys/sparc64/sparc64/exception.S#1 branch .. //depot/projects/pmap/sys/sparc64/sparc64/exception.s#6 delete .. //depot/projects/pmap/sys/sparc64/sparc64/fp.c#2 delete .. //depot/projects/pmap/sys/sparc64/sparc64/genassym.c#9 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/iommu.c#4 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/locore.S#1 branch .. //depot/projects/pmap/sys/sparc64/sparc64/locore.s#5 delete .. //depot/projects/pmap/sys/sparc64/sparc64/mp_exception.S#1 branch .. //depot/projects/pmap/sys/sparc64/sparc64/mp_exception.s#4 delete .. //depot/projects/pmap/sys/sparc64/sparc64/mp_locore.S#1 branch .. //depot/projects/pmap/sys/sparc64/sparc64/mp_locore.s#3 delete .. //depot/projects/pmap/sys/sparc64/sparc64/pmap.c#12 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/prof_machdep.c#1 branch .. //depot/projects/pmap/sys/sparc64/sparc64/pv.c#6 delete .. //depot/projects/pmap/sys/sparc64/sparc64/support.S#1 branch .. //depot/projects/pmap/sys/sparc64/sparc64/support.s#5 delete .. //depot/projects/pmap/sys/sparc64/sparc64/swtch.S#1 branch .. //depot/projects/pmap/sys/sparc64/sparc64/swtch.s#8 delete .. //depot/projects/pmap/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/tsb.c#8 integrate .. //depot/projects/pmap/sys/sys/buf.h#6 integrate .. //depot/projects/pmap/sys/sys/bus.h#3 integrate .. //depot/projects/pmap/sys/sys/cdrio.h#3 integrate .. //depot/projects/pmap/sys/sys/elf_generic.h#3 integrate .. //depot/projects/pmap/sys/sys/errno.h#5 integrate .. //depot/projects/pmap/sys/sys/file.h#6 integrate .. //depot/projects/pmap/sys/sys/imgact.h#3 integrate .. //depot/projects/pmap/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/pmap/sys/sys/linker.h#3 integrate .. //depot/projects/pmap/sys/sys/mac.h#1 branch .. //depot/projects/pmap/sys/sys/mac_policy.h#1 branch .. //depot/projects/pmap/sys/sys/mbuf.h#5 integrate .. //depot/projects/pmap/sys/sys/mount.h#4 integrate .. //depot/projects/pmap/sys/sys/mutex.h#5 integrate .. //depot/projects/pmap/sys/sys/param.h#7 integrate .. //depot/projects/pmap/sys/sys/pioctl.h#2 integrate .. //depot/projects/pmap/sys/sys/pipe.h#3 integrate .. //depot/projects/pmap/sys/sys/proc.h#9 integrate .. //depot/projects/pmap/sys/sys/queue.h#3 integrate .. //depot/projects/pmap/sys/sys/resourcevar.h#5 integrate .. //depot/projects/pmap/sys/sys/socketvar.h#5 integrate .. //depot/projects/pmap/sys/sys/stat.h#5 integrate .. //depot/projects/pmap/sys/sys/stdint.h#3 integrate .. //depot/projects/pmap/sys/sys/syscall.h#6 integrate .. //depot/projects/pmap/sys/sys/syscall.mk#6 integrate .. //depot/projects/pmap/sys/sys/sysctl.h#5 integrate .. //depot/projects/pmap/sys/sys/sysent.h#3 integrate .. //depot/projects/pmap/sys/sys/sysproto.h#6 integrate .. //depot/projects/pmap/sys/sys/ucred.h#6 integrate .. //depot/projects/pmap/sys/sys/unistd.h#2 integrate .. //depot/projects/pmap/sys/sys/vnode.h#5 integrate .. //depot/projects/pmap/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/pmap/sys/ufs/ffs/ffs_alloc.c#5 integrate .. //depot/projects/pmap/sys/ufs/ffs/ffs_balloc.c#4 integrate .. //depot/projects/pmap/sys/ufs/ffs/ffs_extern.h#4 integrate .. //depot/projects/pmap/sys/ufs/ffs/ffs_inode.c#5 integrate .. //depot/projects/pmap/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/pmap/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/pmap/sys/ufs/ffs/ffs_softdep_stub.c#4 integrate .. //depot/projects/pmap/sys/ufs/ffs/ffs_subr.c#3 integrate .. //depot/projects/pmap/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/pmap/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/pmap/sys/ufs/ffs/softdep.h#3 integrate .. //depot/projects/pmap/sys/ufs/ufs/dinode.h#4 integrate .. //depot/projects/pmap/sys/ufs/ufs/ufs_bmap.c#3 integrate .. //depot/projects/pmap/sys/ufs/ufs/ufs_extattr.c#6 integrate .. //depot/projects/pmap/sys/ufs/ufs/ufs_extern.h#3 integrate .. //depot/projects/pmap/sys/ufs/ufs/ufs_inode.c#4 integrate .. //depot/projects/pmap/sys/ufs/ufs/ufs_lookup.c#5 integrate .. //depot/projects/pmap/sys/ufs/ufs/ufs_quota.c#5 integrate .. //depot/projects/pmap/sys/ufs/ufs/ufs_readwrite.c#5 integrate .. //depot/projects/pmap/sys/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/pmap/sys/vm/swap_pager.c#5 integrate .. //depot/projects/pmap/sys/vm/uma.h#2 integrate .. //depot/projects/pmap/sys/vm/vm_contig.c#6 integrate .. //depot/projects/pmap/sys/vm/vm_extern.h#4 integrate .. //depot/projects/pmap/sys/vm/vm_fault.c#5 integrate .. //depot/projects/pmap/sys/vm/vm_glue.c#12 integrate .. //depot/projects/pmap/sys/vm/vm_kern.c#6 integrate .. //depot/projects/pmap/sys/vm/vm_map.c#7 integrate .. //depot/projects/pmap/sys/vm/vm_map.h#5 integrate .. //depot/projects/pmap/sys/vm/vm_object.c#4 integrate .. //depot/projects/pmap/sys/vm/vm_page.c#8 integrate .. //depot/projects/pmap/sys/vm/vm_page.h#6 integrate .. //depot/projects/pmap/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/pmap/sys/vm/vm_pageq.c#8 integrate .. //depot/projects/pmap/sys/vm/vm_swap.c#4 integrate .. //depot/projects/pmap/sys/vm/vm_zeroidle.c#8 integrate .. //depot/projects/pmap/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/pmap/sys/x86_64/include/_stdint.h#1 branch .. //depot/projects/pmap/sys/x86_64/include/ansi.h#2 integrate .. //depot/projects/pmap/sys/x86_64/include/limits.h#2 integrate Differences ... ==== //depot/projects/pmap/sys/alpha/alpha/elf_machdep.c#4 (text+ko) ==== @@ -22,7 +22,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/alpha/alpha/elf_machdep.c,v 1.9 2002/04/25 01:22:15 marcel Exp $ + * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.10 2002/07/20 02:56:09 peter Exp $ */ #include @@ -32,10 +32,48 @@ #include #include #include +#include +#include +#include +#include #include #include #include +#include + +struct sysentvec elf64_freebsd_sysvec = { + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf64_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, + "FreeBSD ELF64", + __elfN(coredump), + NULL, + MINSIGSTKSZ +}; +static Elf64_Brandinfo freebsd_brand_info = { + ELFOSABI_FREEBSD, + EM_ALPHA, + "FreeBSD", + "", + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec + }; + +SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_info); + /* Process one elf relocation with addend. */ int elf_reloc(linker_file_t lf, const void *data, int type) @@ -85,7 +123,7 @@ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return -1; - addr += addend; + addr += addend; if (*where != addr) *where = addr; break; ==== //depot/projects/pmap/sys/alpha/alpha/exception.s#3 (text+ko) ==== @@ -24,7 +24,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * $NetBSD: locore.s,v 1.47 1998/03/22 07:26:32 thorpej Exp $ - * $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.15 2002/03/29 16:35:25 jake Exp $ + * $FreeBSD: src/sys/alpha/alpha/exception.s,v 1.16 2002/07/31 19:37:02 jhb Exp $ */ #include @@ -151,7 +151,7 @@ /* set the hae register if this process has specified a value */ ldq t1, TD_MD_FLAGS(s0) - and t1, MDP_HAEUSED + and t1, MDTD_HAEUSED beq t1, 3f ldq a0, TD_MD_HAE(s0) ldq pv, chipset + CHIPSET_WRITE_HAE @@ -302,7 +302,7 @@ Lrestoreregs: /* set the hae register if this process has specified a value */ ldq t1, TD_MD_FLAGS(s0) - and t1, MDP_HAEUSED + and t1, MDTD_HAEUSED beq t1, Lnohae ldq a0, TD_MD_HAE(t0) ldq pv, chipset + CHIPSET_WRITE_HAE ==== //depot/projects/pmap/sys/alpha/alpha/genassym.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.39 2002/07/12 18:34:21 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.40 2002/07/31 19:37:02 jhb Exp $ */ #include @@ -92,7 +92,7 @@ #ifdef SMP ASSYM(TD_MD_KERNNEST, offsetof(struct thread, td_md.md_kernnest)); #endif -ASSYM(MDP_HAEUSED, MDP_HAEUSED); +ASSYM(MDTD_HAEUSED, MDTD_HAEUSED); ASSYM(CHIPSET_WRITE_HAE, offsetof(struct alpha_chipset, write_hae)); ==== //depot/projects/pmap/sys/alpha/alpha/machdep.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.179 2002/04/17 13:06:32 mux Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.180 2002/07/31 19:37:02 jhb Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1209,7 +1209,7 @@ /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); /* XXX maybe write=0 */ - ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDP_FPUSED; + ksi.si_sc.sc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; bcopy(&td->td_pcb->pcb_fp, (struct fpreg *)ksi.si_sc.sc_fpregs, sizeof(struct fpreg)); ksi.si_sc.sc_fp_control = td->td_pcb->pcb_fp_control; @@ -1332,7 +1332,7 @@ #endif /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); - sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDP_FPUSED; + sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; bcopy(&td->td_pcb->pcb_fp, (struct fpreg *)sf.sf_uc.uc_mcontext.mc_fpregs, sizeof(struct fpreg)); @@ -1606,7 +1606,7 @@ tfp->tf_regs[FRAME_T12] = tfp->tf_regs[FRAME_PC]; /* a.k.a. PV */ tfp->tf_regs[FRAME_FLAGS] = 0; /* full restore */ - td->td_md.md_flags &= ~MDP_FPUSED; + td->td_md.md_flags &= ~MDTD_FPUSED; alpha_fpstate_drop(td); } @@ -1720,13 +1720,13 @@ int ptrace_clear_single_step(struct thread *td) { - if (td->td_md.md_flags & MDP_STEP2) { + if (td->td_md.md_flags & MDTD_STEP2) { ptrace_clear_bpt(td, &td->td_md.md_sstep[1]); ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); - td->td_md.md_flags &= ~MDP_STEP2; - } else if (td->td_md.md_flags & MDP_STEP1) { + td->td_md.md_flags &= ~MDTD_STEP2; + } else if (td->td_md.md_flags & MDTD_STEP1) { ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); - td->td_md.md_flags &= ~MDP_STEP1; + td->td_md.md_flags &= ~MDTD_STEP1; } return 0; } @@ -1740,7 +1740,7 @@ vm_offset_t addr[2]; /* places to set breakpoints */ int count = 0; /* count of breakpoints */ - if (td->td_md.md_flags & (MDP_STEP1|MDP_STEP2)) + if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) panic("ptrace_single_step: step breakpoints not removed"); error = ptrace_read_int(td, pc, &ins.bits); @@ -1793,9 +1793,9 @@ ptrace_clear_bpt(td, &td->td_md.md_sstep[0]); return error; } - td->td_md.md_flags |= MDP_STEP2; + td->td_md.md_flags |= MDTD_STEP2; } else - td->td_md.md_flags |= MDP_STEP1; + td->td_md.md_flags |= MDTD_STEP1; return 0; } @@ -2132,7 +2132,7 @@ SET_FEN(td); } - td->td_md.md_flags |= MDP_FPUSED; + td->td_md.md_flags |= MDTD_FPUSED; intr_restore(s); } ==== //depot/projects/pmap/sys/alpha/alpha/pmap.c#8 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.100 2002/07/14 23:51:55 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.103 2002/08/05 00:04:18 alc Exp $ */ /* @@ -949,13 +949,8 @@ /* * Get a kernel stack page */ - m = vm_page_grab(ksobj, i, VM_ALLOC_NORMAL | VM_ALLOC_RETRY); - - /* - * Wire the page - */ - m->wire_count++; - cnt.v_wire_count++; + m = vm_page_grab(ksobj, i, + VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED); /* * Enter the page into the kernel address space. @@ -968,7 +963,6 @@ vm_page_wakeup(m); vm_page_flag_clear(m, PG_ZERO); - vm_page_flag_set(m, PG_MAPPED | PG_WRITEABLE); m->valid = VM_PAGE_BITS_ALL; } } @@ -1073,7 +1067,6 @@ vm_page_lock_queues(); vm_page_wire(m); vm_page_wakeup(m); - vm_page_flag_set(m, PG_MAPPED | PG_WRITEABLE); vm_page_unlock_queues(); } @@ -1561,14 +1554,14 @@ if (!pmap_pte_v(pte)) { int pindex = NKLEV3MAPS + pmap_lev1_index(kernel_vm_end) - K1SEGLEV1I; - nkpg = vm_page_alloc(kptobj, pindex, VM_ALLOC_SYSTEM); + nkpg = vm_page_alloc(kptobj, pindex, + VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED); if (!nkpg) panic("pmap_growkernel: no memory to grow kernel"); printf("pmap_growkernel: growing to %lx\n", addr); printf("pmap_growkernel: adding new level2 page table\n"); nklev2++; - vm_page_wire(nkpg); pmap_zero_page(nkpg); pa = VM_PAGE_TO_PHYS(nkpg); @@ -1596,13 +1589,12 @@ /* * This index is bogus, but out of the way */ - nkpg = vm_page_alloc(kptobj, nklev3, VM_ALLOC_SYSTEM); + nkpg = vm_page_alloc(kptobj, nklev3, + VM_ALLOC_INTERRUPT | VM_ALLOC_WIRED); if (!nkpg) panic("pmap_growkernel: no memory to grow kernel"); nklev3++; - - vm_page_wire(nkpg); pmap_zero_page(nkpg); pa = VM_PAGE_TO_PHYS(nkpg); newlev2 = pmap_phys_to_pte(pa) | PG_V | PG_ASM | PG_KRE | PG_KWE; @@ -2313,17 +2305,21 @@ cnt.v_free_count < cnt.v_free_reserved) { break; } + vm_page_lock_queues(); if (((p->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL) && (p->busy == 0) && (p->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { if ((p->queue - p->pc) == PQ_CACHE) vm_page_deactivate(p); vm_page_busy(p); + vm_page_unlock_queues(); mpte = pmap_enter_quick(pmap, addr + alpha_ptob(tmpidx), p, mpte); + vm_page_lock_queues(); vm_page_flag_set(p, PG_MAPPED); vm_page_wakeup(p); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 10 0:34: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6744037B406; Sat, 10 Aug 2002 00:34:01 -0700 (PDT) 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 DDF7937B401 for ; Sat, 10 Aug 2002 00:34:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F41EA43EAA for ; Sat, 10 Aug 2002 00:33:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7A7XxJU073277 for ; Sat, 10 Aug 2002 00:33:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7A7Xx8j073274 for perforce@freebsd.org; Sat, 10 Aug 2002 00:33:59 -0700 (PDT) Date: Sat, 10 Aug 2002 00:33:59 -0700 (PDT) Message-Id: <200208100733.g7A7Xx8j073274@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15773 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15773 Change 15773 by peter@peter_overcee on 2002/08/10 00:33:16 revert to freebsd Affected files ... .. //depot/projects/pmap/sys/i386/i386/pmap.c#30 edit Differences ... ==== //depot/projects/pmap/sys/i386/i386/pmap.c#30 (text+ko) ==== @@ -2738,13 +2738,6 @@ { vm_offset_t phys; - /* - * Note that we do not use PG_G here, in case we get preempted - * and end up on another CPU. In doing so, we will have had an - * implied invltlb() by the cpu_switch() routine. This only works - * if we do not use PG_G here. With this concession, we do not - * need to do any IPI shootdowns from here. - */ phys = VM_PAGE_TO_PHYS(m); if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); @@ -2780,13 +2773,6 @@ { vm_offset_t phys; - /* - * Note that we do not use PG_G here, in case we get preempted - * and end up on another CPU. In doing so, we will have had an - * implied invltlb() by the cpu_switch() routine. This only works - * if we do not use PG_G here. With this concession, we do not - * need to do any IPI shootdowns from here. - */ phys = VM_PAGE_TO_PHYS(m); if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); @@ -2822,13 +2808,6 @@ { vm_offset_t phys; - /* - * Note that we do not use PG_G here, in case we get preempted - * and end up on another CPU. In doing so, we will have had an - * implied invltlb() by the cpu_switch() routine. This only works - * if we do not use PG_G here. With this concession, we do not - * need to do any IPI shootdowns from here. - */ phys = VM_PAGE_TO_PHYS(m); if (*CMAP3) panic("pmap_zero_page: CMAP3 busy"); @@ -2987,7 +2966,7 @@ if (tpte == 0) { printf("TPTE at %p IS ZERO @ VA %08x\n", pte, pv->pv_va); - panic("bad peter"); + panic("bad pte"); } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 10 0:36: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C456737B401; Sat, 10 Aug 2002 00:36:03 -0700 (PDT) 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 68D8437B400 for ; Sat, 10 Aug 2002 00:36:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E38BE43E3B for ; Sat, 10 Aug 2002 00:36:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7A7a2JU073422 for ; Sat, 10 Aug 2002 00:36:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7A7a2E0073419 for perforce@freebsd.org; Sat, 10 Aug 2002 00:36:02 -0700 (PDT) Date: Sat, 10 Aug 2002 00:36:02 -0700 (PDT) Message-Id: <200208100736.g7A7a2E0073419@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15774 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15774 Change 15774 by peter@peter_overcee on 2002/08/10 00:35:26 un-revert this. I tweaked the assertions elsewhere. Affected files ... .. //depot/projects/pmap/sys/vm/vm_zeroidle.c#9 edit Differences ... ==== //depot/projects/pmap/sys/vm/vm_zeroidle.c#9 (text+ko) ==== @@ -82,7 +82,7 @@ mtx_unlock_spin(&vm_page_queue_free_mtx); pmap_zero_page_idle(m); mtx_lock_spin(&vm_page_queue_free_mtx); - m->flags |= PG_ZERO; + vm_page_flag_set(m, PG_ZERO; vm_pageq_enqueue(PQ_FREE + m->pc, m); ++vm_page_zero_count; ++cnt_prezero; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 10 0:41:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E2FE37B401; Sat, 10 Aug 2002 00:41:10 -0700 (PDT) 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 D3A1037B400 for ; Sat, 10 Aug 2002 00:41:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91C0343E42 for ; Sat, 10 Aug 2002 00:41:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7A7f9JU073876 for ; Sat, 10 Aug 2002 00:41:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7A7f9rs073871 for perforce@freebsd.org; Sat, 10 Aug 2002 00:41:09 -0700 (PDT) Date: Sat, 10 Aug 2002 00:41:09 -0700 (PDT) Message-Id: <200208100741.g7A7f9rs073871@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15775 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15775 Change 15775 by peter@peter_overcee on 2002/08/10 00:40:47 On second thoughts, dont merge these out. I'd feel happier with the assertions in while I'm tinkering with this stuff. Affected files ... .. //depot/projects/pmap/sys/vm/vm_pageq.c#9 edit Differences ... ==== //depot/projects/pmap/sys/vm/vm_pageq.c#9 (text+ko) ==== @@ -24,6 +24,22 @@ #include struct vpgqueues vm_page_queues[PQ_COUNT]; +static struct mtx vm_pageq_mtx[PQ_COUNT]; + +#ifdef INVARIANTS +static __inline void +vm_pageq_lockcheck(int queue) +{ + + if (queue >= PQ_FREE && queue < PQ_INACTIVE) + mtx_assert(&vm_page_queue_free_mtx, MA_OWNED); + else + mtx_assert(&Giant, MA_OWNED); +} +#define LOCKCHECK(queue) vm_pageq_lockcheck(queue) +#else +#define LOCKCHECK(queue) do { } while(0) +#endif void vm_pageq_init(void) @@ -76,6 +92,7 @@ { struct vpgqueues *vpq; + LOCKCHECK(queue); vpq = &vm_page_queues[queue]; m->queue = queue; TAILQ_INSERT_TAIL(&vpq->pl, m, pageq); @@ -94,6 +111,7 @@ { vm_page_t m; + LOCKCHECK(PQ_FREE); ++cnt.v_page_count; m = PHYS_TO_VM_PAGE(pa); m->phys_addr = pa; @@ -118,6 +136,7 @@ struct vpgqueues *pq; if (queue != PQ_NONE) { + LOCKCHECK(queue); pq = &vm_page_queues[queue]; m->queue = PQ_NONE; TAILQ_REMOVE(&pq->pl, m, pageq); @@ -141,6 +160,7 @@ struct vpgqueues *pq; if (queue != PQ_NONE) { + LOCKCHECK(queue); m->queue = PQ_NONE; pq = &vm_page_queues[queue]; TAILQ_REMOVE(&pq->pl, m, pageq); @@ -179,6 +199,7 @@ vm_page_t m = NULL; struct vpgqueues *pq; + LOCKCHECK(basequeue); pq = &vm_page_queues[basequeue]; /* * Note that for the first loop, index+i and index-i wind up at the @@ -201,6 +222,7 @@ { vm_page_t m; + LOCKCHECK(basequeue); #if PQ_L2_SIZE > 1 if (prefer_zero) { m = TAILQ_LAST(&vm_page_queues[basequeue+index].pl, pglist); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 10 0:44:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B10CB37B401; Sat, 10 Aug 2002 00:43:13 -0700 (PDT) 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 4C92A37B400 for ; Sat, 10 Aug 2002 00:43:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F0F443E3B for ; Sat, 10 Aug 2002 00:43:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7A7hCJU074179 for ; Sat, 10 Aug 2002 00:43:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7A7hCdC074176 for perforce@freebsd.org; Sat, 10 Aug 2002 00:43:12 -0700 (PDT) Date: Sat, 10 Aug 2002 00:43:12 -0700 (PDT) Message-Id: <200208100743.g7A7hCdC074176@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15776 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15776 Change 15776 by peter@peter_overcee on 2002/08/10 00:42:29 Checkpoint some WIP before I lose it again. GRRRR. Affected files ... .. //depot/projects/pmap/sys/i386/i386/pmap.c#31 edit .. //depot/projects/pmap/sys/i386/include/pmap.h#13 edit .. //depot/projects/pmap/sys/i386/include/types.h#4 edit .. //depot/projects/pmap/sys/vm/pmap.h#4 edit Differences ... ==== //depot/projects/pmap/sys/i386/i386/pmap.c#31 (text+ko) ==== @@ -127,28 +127,6 @@ #define PMAP_INLINE #endif -/* - * Get PDEs and PTEs for user/kernel address space - */ -#define pmap_pde(m, v) (&((m)->pm_pdir[(vm_offset_t)(v) >> PDRSHIFT])) -#define pdir_pde(m, v) (m[(vm_offset_t)(v) >> PDRSHIFT]) - -#define pmap_pde_v(pte) ((*(int *)pte & PG_V) != 0) -#define pmap_pte_w(pte) ((*(int *)pte & PG_W) != 0) -#define pmap_pte_m(pte) ((*(int *)pte & PG_M) != 0) -#define pmap_pte_u(pte) ((*(int *)pte & PG_A) != 0) -#define pmap_pte_v(pte) ((*(int *)pte & PG_V) != 0) - -#define pmap_pte_set_w(pte, v) ((v)?(*(int *)pte |= PG_W):(*(int *)pte &= ~PG_W)) -#define pmap_pte_set_prot(pte, v) ((*(int *)pte &= ~PG_PROT), (*(int *)pte |= (v))) - -/* - * Given a map and a machine independent protection code, - * convert to a vax protection code. - */ -#define pte_prot(m, p) (protection_codes[p]) -static int protection_codes[8]; - struct pmap kernel_pmap_store; LIST_HEAD(pmaplist, pmap); struct pmaplist allpmaps; @@ -200,16 +178,14 @@ static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pt_entry_t *get_ptbase(pmap_t pmap); static pv_entry_t get_pv_entry(void); -static void i386_protection_init(void); static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem); static void pmap_remove_all(vm_page_t m); static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); -static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); -static int pmap_remove_entry(struct pmap *pmap, vm_page_t m, - vm_offset_t va); +static void pmap_remove_page(pmap_t pmap, vm_offset_t va); +static int pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va); static boolean_t pmap_testbit(vm_page_t m, int bit); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m); @@ -226,7 +202,139 @@ static pd_entry_t pdir4mb; +pt_entry_t phys_to_pte(vm_physaddr_t pa); + +pt_entry_t pmap_pte_set(pt_entry_t *ptep, pt_entry_t newval); +pt_entry_t pmap_pte_get(pt_entry_t *ptep); +pt_entry_t pmap_pte_setbits(pt_entry_t *ptep, u_int32_t newbits); +u_int32_t pmap_pte_getbits(pt_entry_t *ptep); +pt_entry_t pmap_pte_clearbits(pt_entry_t *ptep, u_int32_t clearbits); +boolean_t pmap_pte_testbits(pt_entry_t *ptep, u_int32_t testbits); + +pd_entry_t pmap_pde_set(pd_entry_t *pdep, pd_entry_t newval); +pd_entry_t pmap_pde_get(pd_entry_t *pdep); +pd_entry_t pmap_pde_setbits(pd_entry_t *pdep, u_int32_t newbits); +u_int32_t pmap_pde_getbits(pd_entry_t *pdep); +pd_entry_t pmap_pde_clearbits(pd_entry_t *pdep, u_int32_t clearbits); +boolean_t pmap_pde_testbits(pd_entry_t *pdep, u_int32_t testbits); + +#ifndef PAE + +PMAP_INLINE pt_entry_t +phys_to_pte(vm_physaddr_t pa) +{ + pt_entry_t newpte; + + newpte.pte = pa; + return newpte; +} + +PMAP_INLINE pt_entry_t +pmap_pte_set(pt_entry_t *ptep, pt_entry_t newval) +{ + pt_entry_t oldval; + + oldval = *ptep; + *ptep = newval; + return oldval; +} + +PMAP_INLINE pt_entry_t +pmap_pte_get(pt_entry_t *ptep) +{ + + return *ptep; +} + +PMAP_INLINE pt_entry_t +pmap_pte_setbits(pt_entry_t *ptep, u_int32_t newbits) +{ + pt_entry_t oldval; + + oldval = *ptep; + ptep->pte |= newbits; + return oldval; +} + +PMAP_INLINE u_int32_t +pmap_pte_getbits(pt_entry_t *ptep) +{ + + return ptep->pte; +} + +PMAP_INLINE pt_entry_t +pmap_pte_clearbits(pt_entry_t *ptep, u_int32_t clearbits) +{ + pt_entry_t oldval; + + oldval = *ptep; + ptep->pte &= ~clearbits; + return oldval; +} + +PMAP_INLINE boolean_t +pmap_pte_testbits(pt_entry_t *ptep, u_int32_t testbits) +{ + + return (ptep->pte & testbits) ? 1 : 0; +} + +#else + +PMAP_INLINE pt_entry_t +phys_to_pte(vm_physaddr_t pa) +{ + + return (pt_entry_t)pa; +} + /* + * CMPXHCH8B + * This is a larger and more unwieldy version of CMPXCHG: it compares + * the 64-bit (eight-byte) value stored at [mem] with the value in EDX:EAX. + * If they are equal, it sets the zero flag and stores ECX:EBX into the + * memory area. If they are unequal, it clears the zero flag and leaves + * the memory area untouched. + */ +PMAP_INLINE pt_entry_t +pmap_ptep_set(pt_entry_t *ptep, pt_entry_t newval) +{ + pt_entry_t old; + u_int32_t newlo; + u_int32_t newhi; + + newlo = newval; + newhi = newval >> 32; + __asm __volatile( + "1: movl (%1), %%eax\n\t" + "movl 4(%1), %%edx\n\t" + "cmpxchg8b (%1)\n\t" + "jnz 1b" + : "=A,A"(old) : "D,S"(ptep), "b,b"(newlo), "c,c"(newhi) : "memory"); + return old; +} + +PMAP_INLINE pt_entry_t +pmap_ptep_get(pt_entry_t *ptep) +{ + + return *ptep; +} + +#endif + +/* + * Get PDEs for user/kernel address space + */ +static __inline pd_entry_t * +pmap_pde(pmap_t pmap, vm_offset_t va) +{ + + return &(pmap->pm_pdir[va >> PDRSHIFT]); +} + +/* * Routine: pmap_pte * Function: * Extract the page table entry associated @@ -234,21 +342,20 @@ */ PMAP_INLINE pt_entry_t * -pmap_pte(pmap, va) - register pmap_t pmap; - vm_offset_t va; +pmap_pte(pmap_t pmap, vm_offset_t va) { pd_entry_t *pdeaddr; + u_int32_t pdebits; - if (pmap) { - pdeaddr = pmap_pde(pmap, va); - if (*pdeaddr & PG_PS) - return pdeaddr; - if (*pdeaddr) { - return get_ptbase(pmap) + i386_btop(va); - } - } - return (0); + if (pmap == NULL) + return 0; + pdeaddr = pmap_pde(pmap, va); + pdebits = pmap_pde_getbits(pdeaddr); + if (pdebits & PG_PS) /* 4MB page, special case */ + return (pt_entry_t *)pdeaddr; + if (pdebits & PG_V) + return get_ptbase(pmap) + i386_btop(va); + return 0; } /* @@ -280,9 +387,7 @@ * (physical) address starting relative to 0] */ void -pmap_bootstrap(firstaddr, loadaddr) - vm_offset_t firstaddr; - vm_offset_t loadaddr; +pmap_bootstrap(vm_offset_t firstaddr, vm_offset_t loadaddr) { vm_offset_t va; pt_entry_t *pte; @@ -304,11 +409,6 @@ virtual_end = VM_MAX_KERNEL_ADDRESS; /* - * Initialize protection array. - */ - i386_protection_init(); - - /* * Initialize the kernel pmap (which is statically allocated). */ kernel_pmap->pm_pdir = (pd_entry_t *) (KERNBASE + (u_int)IdlePTD); @@ -361,9 +461,9 @@ virtual_avail = va; - *CMAP1 = *CMAP2 = 0; + CMAP1->pte = CMAP2->pte = 0; for (i = 0; i < NKPT; i++) - PTD[i] = 0; + PTD[i].pde = 0; pgeflag = 0; #ifndef DISABLE_PG_G @@ -379,7 +479,7 @@ * The 4MB page version of the initial * kernel page mapping. */ - pdir4mb = 0; + pdir4mb.pde = 0; #ifndef DISABLE_PSE if (cpu_feature & CPUID_PSE) { @@ -388,9 +488,10 @@ * Note that we have enabled PSE mode */ pseflag = PG_PS; - ptditmp = *(PTmap + i386_btop(KERNBASE)); - ptditmp &= ~(NBPDR - 1); - ptditmp |= PG_V | PG_RW | PG_PS | PG_U | pgeflag; + /* XXXPAE FIXME */ + ptditmp.pde = PTmap[i386_btop(KERNBASE)].pte; + ptditmp.pde &= ~(NBPDR - 1); + ptditmp.pde |= PG_V | PG_RW | PG_PS | PG_U | pgeflag; pdir4mb = ptditmp; } #endif @@ -435,7 +536,7 @@ #endif if (PCPU_GET(cpuid) == 0) { #ifndef DISABLE_PSE - if (pdir4mb) { + if (pdir4mb.pde) { kernel_pmap->pm_pdir[KPTDI] = PTD[KPTDI] = pdir4mb; invltlb(); /* Insurance */ } @@ -452,8 +553,8 @@ endva = KERNBASE + KERNend; while (va < endva) { pte = vtopte(va); - if (*pte) - *pte |= pgeflag; + if (pmap_pte_get(pte).pte) + pmap_pte_setbits(pte, pgeflag); va += PAGE_SIZE; } invltlb(); /* Insurance */ @@ -469,6 +570,7 @@ void * pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { + *flags = UMA_SLAB_PRIV; return (void *)kmem_alloc(kernel_map, bytes); } @@ -481,8 +583,7 @@ * way, discontiguous physical memory. */ void -pmap_init(phys_start, phys_end) - vm_offset_t phys_start, phys_end; +pmap_init(vm_offset_t phys_start, vm_offset_t phys_end) { int i; int initial_pvs; @@ -528,7 +629,7 @@ * numbers of pv entries. */ void -pmap_init2() +pmap_init2(void) { int shpgperproc = PMAP_SHPGPERPROC; @@ -553,11 +654,8 @@ static int pmap_nw_modified(pt_entry_t ptea) { - int pte; - pte = (int) ptea; - - if ((pte & (PG_M|PG_RW)) == PG_M) + if ((ptep & (PG_M|PG_RW)) == PG_M) return 1; else return 0; @@ -572,6 +670,7 @@ static PMAP_INLINE int pmap_track_modified(vm_offset_t va) { + if ((va < kmi.clean_sva) || (va >= kmi.clean_eva)) return 1; else @@ -735,8 +834,7 @@ * It will map in the alternate PTE space if needed. */ static pt_entry_t * -get_ptbase(pmap) - pmap_t pmap; +get_ptbase(pmap_t pmap) { pd_entry_t frame; @@ -763,9 +861,7 @@ */ static pt_entry_t * -pmap_pte_quick(pmap, va) - register pmap_t pmap; - vm_offset_t va; +pmap_pte_quick(pmap_t pmap, vm_offset_t va) { pd_entry_t pde, newpf; pde = pmap->pm_pdir[va >> PDRSHIFT]; @@ -792,9 +888,7 @@ * with the given map/virtual_address pair. */ vm_offset_t -pmap_extract(pmap, va) - register pmap_t pmap; - vm_offset_t va; +pmap_extract(pmap_t pmap, vm_offset_t va) { vm_offset_t rtval; /* XXX FIXME */ vm_offset_t pdirindex; @@ -990,8 +1084,7 @@ * This routine directly impacts the exit perf of a process and thread. */ void -pmap_dispose_thread(td) - struct thread *td; +pmap_dispose_thread(struct thread *td) { int i; vm_object_t ksobj; @@ -1027,8 +1120,7 @@ * Allow the Kernel stack for a thread to be prejudicially paged out. */ void -pmap_swapout_thread(td) - struct thread *td; +pmap_swapout_thread(struct thread *td) { int i; vm_object_t ksobj; @@ -1053,8 +1145,7 @@ * Bring the kernel stack for a specified thread back in. */ void -pmap_swapin_thread(td) - struct thread *td; +pmap_swapin_thread(struct thread *td) { int i, rv; vm_page_t ma[KSTACK_PAGES]; @@ -1169,8 +1260,7 @@ } void -pmap_pinit0(pmap) - struct pmap *pmap; +pmap_pinit0(pmap_t pmap) { pmap->pm_pdir = (pd_entry_t *)kmem_alloc_pageable(kernel_map, PAGE_SIZE); @@ -1192,8 +1282,7 @@ * such as one in a vmspace structure. */ void -pmap_pinit(pmap) - register struct pmap *pmap; +pmap_pinit(pmap_t pmap) { vm_page_t ptdpg; @@ -1220,8 +1309,20 @@ ptdpg->valid = VM_PAGE_BITS_ALL; pmap_qenter((vm_offset_t) pmap->pm_pdir, &ptdpg, 1); - if ((ptdpg->flags & PG_ZERO) == 0) + if ((ptdpg->flags & PG_ZERO) == 0) { +#if defined(I686_CPU) +#if defined(I486_CPU) || defined(I586_CPU) + if (cpu_class == CPUCLASS_686) + i686_pagezero(pmap->pm_pdir); + else + bzero(pmap->pm_pdir, PAGE_SIZE); +#else + i686_pagezero(pmap->pm_pdir); +#endif +#else bzero(pmap->pm_pdir, PAGE_SIZE); +#endif + } LIST_INSERT_HEAD(&allpmaps, pmap, pm_list); /* Wire in kernel global address entries. */ @@ -1248,8 +1349,7 @@ * but before this pmap is activated. */ void -pmap_pinit2(pmap) - struct pmap *pmap; +pmap_pinit2(pmap_t pmap) { /* XXX: Remove this stub when no longer called */ } @@ -1258,6 +1358,7 @@ pmap_release_free_page(pmap_t pmap, vm_page_t p) { pd_entry_t *pde = pmap->pm_pdir; + /* * This code optimizes the case of freeing non-busy * page-table pages. Those pages are zero now, and @@ -1306,9 +1407,7 @@ * mapped correctly. */ static vm_page_t -_pmap_allocpte(pmap, ptepindex) - pmap_t pmap; - unsigned ptepindex; +_pmap_allocpte(pmap_t pmap, unsigned ptepindex) { vm_offset_t pteva, ptepa; /* XXXPA */ vm_page_t m; @@ -1352,7 +1451,18 @@ if ((pmap->pm_pdir[PTDPTDI] & PG_FRAME) == (PTDpde & PG_FRAME)) { pteva = VM_MAXUSER_ADDRESS + i386_ptob(ptepindex); - bzero((caddr_t) pteva, PAGE_SIZE); +#if defined(I686_CPU) +#if defined(I486_CPU) || defined(I586_CPU) + if (cpu_class == CPUCLASS_686) + i686_pagezero((void *)pteva); + else + bzero((void *)pteva, PAGE_SIZE); +#else + i686_pagezero((void *)pteva); +#endif +#else + bzero((void *)pteva, PAGE_SIZE); +#endif } else { pmap_zero_page(m); } @@ -1380,7 +1490,7 @@ /* * Get the page directory entry */ - ptepa = (vm_offset_t) pmap->pm_pdir[ptepindex]; + ptepa = pmap->pm_pdir[ptepindex]; /* * This supports switching from a 4MB page to a @@ -1486,24 +1596,26 @@ void pmap_growkernel(vm_offset_t addr) { - struct pmap *pmap; + pmap_t pmap; int s; vm_offset_t ptppaddr; vm_page_t nkpg; pd_entry_t newpdir; + u_int32_t pdirindex; s = splhigh(); if (kernel_vm_end == 0) { kernel_vm_end = KERNBASE; nkpt = 0; - while (pdir_pde(PTD, kernel_vm_end)) { + while (PTD[kernel_vm_end >> PDRSHIFT]) { kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); nkpt++; } } addr = (addr + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); while (kernel_vm_end < addr) { - if (pdir_pde(PTD, kernel_vm_end)) { + pdirindex = kernel_vm_end >> PDRSHIFT; + if (PTD[pdirindex]) { kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); continue; } @@ -1521,11 +1633,9 @@ pmap_zero_page(nkpg); ptppaddr = VM_PAGE_TO_PHYS(nkpg); newpdir = (pd_entry_t) (ptppaddr | PG_V | PG_RW | PG_A | PG_M); - pdir_pde(PTD, kernel_vm_end) = newpdir; - - LIST_FOREACH(pmap, &allpmaps, pm_list) { - *pmap_pde(pmap, kernel_vm_end) = newpdir; - } + PTD[pdirindex] = newpdir; + LIST_FOREACH(pmap, &allpmaps, pm_list) + pmap->pm_pdir[pdirindex] = newpdir; kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1); } splx(s); @@ -1542,6 +1652,7 @@ static PMAP_INLINE void free_pv_entry(pv_entry_t pv) { + pv_entry_count--; uma_zfree(pvzone, pv); } @@ -1555,10 +1666,11 @@ static pv_entry_t get_pv_entry(void) { + pv_entry_count++; if (pv_entry_high_water && - (pv_entry_count > pv_entry_high_water) && - (pmap_pagedaemon_waken == 0)) { + (pv_entry_count > pv_entry_high_water) && + (pmap_pagedaemon_waken == 0)) { pmap_pagedaemon_waken = 1; wakeup (&vm_pages_needed); } @@ -1570,7 +1682,7 @@ * in a pinch. */ void -pmap_collect() +pmap_collect(void) { int i; vm_page_t m; @@ -1672,7 +1784,7 @@ vm_page_t m; oldpte = atomic_readandclear_int(ptq); - if (oldpte & PG_W) + if (oldpte & PG_WIRED) pmap->pm_stats.wired_count -= 1; /* * Machines that don't support invlpg, also don't support @@ -1682,7 +1794,7 @@ pmap_invalidate_page(kernel_pmap, va); pmap->pm_stats.resident_count -= 1; if (oldpte & PG_MANAGED) { - m = PHYS_TO_VM_PAGE(oldpte); + m = PHYS_TO_VM_PAGE(pte_to_phys(oldpte)); if (oldpte & PG_M) { #if defined(PMAP_DIAGNOSTIC) if (pmap_nw_modified((pt_entry_t) oldpte)) { @@ -1710,7 +1822,7 @@ static void pmap_remove_page(pmap_t pmap, vm_offset_t va) { - register pt_entry_t *ptq; + pt_entry_t *ptq; /* * if there is no pte for this address, just skip it!!! @@ -1739,7 +1851,7 @@ void pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { - register pt_entry_t *ptbase; + pt_entry_t *ptbase; vm_offset_t pdnxt; pd_entry_t ptpaddr; vm_offset_t sindex, eindex; @@ -1842,8 +1954,8 @@ static void pmap_remove_all(vm_page_t m) { - register pv_entry_t pv; - pt_entry_t *pte, tpte; + pv_entry_t pv; + pt_entry_t *pte, oldpte; int s; #if defined(PMAP_DIAGNOSTIC) @@ -1862,22 +1974,22 @@ pte = pmap_pte_quick(pv->pv_pmap, pv->pv_va); - tpte = atomic_readandclear_int(pte); - if (tpte & PG_W) + oldpte = atomic_readandclear_int(pte); + if (oldpte & PG_WIRED) pv->pv_pmap->pm_stats.wired_count--; - if (tpte & PG_A) + if (oldpte & PG_A) vm_page_flag_set(m, PG_REFERENCED); /* * Update the vm_page_t clean and reference bits. */ - if (tpte & PG_M) { + if (oldpte & PG_M) { #if defined(PMAP_DIAGNOSTIC) - if (pmap_nw_modified((pt_entry_t) tpte)) { + if (pmap_nw_modified(oldpte)) { printf( "pmap_remove_all: modified page not writable: va: 0x%x, pte: 0x%x\n", - pv->pv_va, tpte); + pv->pv_va, oldpte); } #endif if (pmap_track_modified(pv->pv_va)) @@ -1904,7 +2016,7 @@ void pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot) { - register pt_entry_t *ptbase; + pt_entry_t *ptbase; vm_offset_t pdnxt; pd_entry_t ptpaddr; vm_offset_t sindex, eindex; @@ -1913,6 +2025,7 @@ if (pmap == NULL) return; + /* Removing read access means unmap totally */ if ((prot & VM_PROT_READ) == VM_PROT_NONE) { pmap_remove(pmap, sva, eva); return; @@ -1921,6 +2034,7 @@ if (prot & VM_PROT_WRITE) return; + /* We are removing write access */ anychanged = 0; ptbase = get_ptbase(pmap); @@ -1950,9 +2064,8 @@ if (ptpaddr == 0) continue; - if (pdnxt > eindex) { + if (pdnxt > eindex) pdnxt = eindex; - } for (; sindex != pdnxt; sindex++) { @@ -1964,14 +2077,14 @@ if (pbits & PG_MANAGED) { m = NULL; if (pbits & PG_A) { - m = PHYS_TO_VM_PAGE(pbits); + m = PHYS_TO_VM_PAGE(pte_to_phys(pbits)); vm_page_flag_set(m, PG_REFERENCED); pbits &= ~PG_A; } if (pbits & PG_M) { if (pmap_track_modified(i386_ptob(sindex))) { if (m == NULL) - m = PHYS_TO_VM_PAGE(pbits); + m = PHYS_TO_VM_PAGE(pte_to_phys(pbits)); vm_page_dirty(m); pbits &= ~PG_M; } @@ -2007,10 +2120,11 @@ boolean_t wired) { vm_offset_t pa; - register pt_entry_t *pte; + pt_entry_t *pte; vm_offset_t opa; pt_entry_t origpte, newpte; vm_page_t mpte; + u_int32_t bits; if (pmap == NULL) return; @@ -2069,9 +2183,9 @@ * are valid mappings in them. Hence, if a user page is wired, * the PT page will be also. */ - if (wired && ((origpte & PG_W) == 0)) + if (wired && ((origpte & PG_WIRED) == 0)) pmap->pm_stats.wired_count++; - else if (!wired && (origpte & PG_W)) + else if (!wired && (origpte & PG_WIRED)) pmap->pm_stats.wired_count--; #if defined(PMAP_DIAGNOSTIC) @@ -2101,12 +2215,8 @@ * so we go ahead and sense modify status. */ if (origpte & PG_MANAGED) { - if ((origpte & PG_M) && pmap_track_modified(va)) { - vm_page_t om; - om = PHYS_TO_VM_PAGE(opa); - vm_page_dirty(om); - } - pa |= PG_MANAGED; + if ((origpte & PG_M) && pmap_track_modified(va)) + vm_page_dirty(m); } goto validate; } @@ -2127,10 +2237,8 @@ * called at interrupt time. */ if (pmap_initialized && - (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) { + (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) pmap_insert_entry(pmap, va, mpte, m); - pa |= PG_MANAGED; - } /* * Increment counters @@ -2143,24 +2251,28 @@ /* * Now validate mapping with desired protection/wiring. */ - newpte = (vm_offset_t) (pa | pte_prot(pmap, prot) | PG_V); - + newpte = phys_to_pte(pa); + bits = PG_V; + if (prot & PROT_WRITE) + bits |= PG_RW; + if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) + bits |= PG_MANAGED; if (wired) - newpte |= PG_W; + bits |= PG_WIRED; if (va < VM_MAXUSER_ADDRESS) - newpte |= PG_U; + bits |= PG_U; if (pmap == kernel_pmap) - newpte |= pgeflag; + bits |= pgeflag; + pmap_pte_setbits(&newpte, bits); /* * if the mapping or permission bits are different, we need * to update the pte. */ if ((origpte & ~(PG_M|PG_A)) != newpte) { - *pte = newpte | PG_A; - /*if (origpte)*/ { - pmap_invalidate_page(pmap, va); - } + pmap_pte_setbits(&newpte, PG_A); + pmap_pte_set(pte, newpte); + pmap_invalidate_page(pmap, va); } } @@ -2178,8 +2290,7 @@ static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { - pt_entry_t *pte; - vm_offset_t pa; + pt_entry_t *pte, newpte; /* * In the case that a page table page is not @@ -2210,7 +2321,7 @@ if (ptepa & PG_PS) panic("pmap_enter_quick: unexpected mapping into 4MB page"); if (pmap->pm_ptphint && - (pmap->pm_ptphint->pindex == ptepindex)) { + (pmap->pm_ptphint->pindex == ptepindex)) { mpte = pmap->pm_ptphint; } else { mpte = pmap_page_lookup(pmap->pm_pteobj, ptepindex); @@ -2253,15 +2364,14 @@ */ pmap->pm_stats.resident_count++; - pa = VM_PAGE_TO_PHYS(m); - + newpte = phys_to_pte(VM_PAGE_TO_PHYS(m)); + newpte |= PG_V | PG_U; /* * Now validate mapping with RO protection */ - if (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) - *pte = pa | PG_V | PG_U; - else - *pte = pa | PG_V | PG_U | PG_MANAGED; + if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) + newpte |= PG_MANAGED; + pmap_pte_set(pte, newpte); return mpte; } @@ -2471,10 +2581,7 @@ }; void -pmap_prefault(pmap, addra, entry) - pmap_t pmap; - vm_offset_t addra; - vm_map_entry_t entry; +pmap_prefault(pmap_t pmap, vm_offset_t addra, vm_map_entry_t entry) { int i; vm_offset_t starta; @@ -2557,28 +2664,26 @@ * The mapping must already exist in the pmap. */ void -pmap_change_wiring(pmap, va, wired) - register pmap_t pmap; - vm_offset_t va; - boolean_t wired; +pmap_change_wiring(pmap_t pmap, vm_offset_t va, boolean_t wired) { - register pt_entry_t *pte; + pt_entry_t *pte; if (pmap == NULL) return; - pte = pmap_pte(pmap, va); - - if (wired && !pmap_pte_w(pte)) + if (wired && !pmap_pte_testbits(pte, PG_WIRED)) pmap->pm_stats.wired_count++; - else if (!wired && pmap_pte_w(pte)) + else if (!wired && pmap_pte_testbits(pte, PG_WIRED)) pmap->pm_stats.wired_count--; /* * Wiring is not a hardware characteristic so there is no need to * invalidate TLB. */ - pmap_pte_set_w(pte, wired); + if (wired) + pmap_pte_setbits(pte, PG_WIRED); + else + pmap_pte_clearbits(pte, PG_WIRED); } @@ -2711,6 +2816,7 @@ static void pmap_zpi_switchin12(void) { + invlpg((u_int)CADDR1); invlpg((u_int)CADDR2); } @@ -2718,12 +2824,14 @@ static void pmap_zpi_switchin2(void) { + invlpg((u_int)CADDR2); } static void pmap_zpi_switchin3(void) { + invlpg((u_int)CADDR3); } @@ -2751,11 +2859,17 @@ invlpg((u_int)CADDR2); #endif #if defined(I686_CPU) +#if defined(I486_CPU) || defined(I586_CPU) if (cpu_class == CPUCLASS_686) i686_pagezero(CADDR2); else + bzero(CADDR2, PAGE_SIZE); +#else + i686_pagezero(CADDR2); #endif - bzero(CADDR2, PAGE_SIZE); +#else + bzero(CADDR2, PAGE_SIZE); +#endif #ifdef SMP curthread->td_switchin = NULL; #endif @@ -2786,11 +2900,20 @@ invlpg((u_int)CADDR2); #endif #if defined(I686_CPU) +#if defined(I486_CPU) || defined(I586_CPU) if (cpu_class == CPUCLASS_686 && off == 0 && size == PAGE_SIZE) i686_pagezero(CADDR2); else + bzero(CADDR2 + off, size); +#else + if (off == 0 && size == PAGE_SIZE) + i686_pagezero(CADDR2); + else + bzero(CADDR2 + off, size); #endif - bzero((char *)CADDR2 + off, size); +#else + bzero(CADDR2 + off, size); +#endif #ifdef SMP curthread->td_switchin = NULL; #endif @@ -2821,11 +2944,17 @@ invlpg((u_int)CADDR3); #endif #if defined(I686_CPU) +#if defined(I486_CPU) || defined(I586_CPU) if (cpu_class == CPUCLASS_686) i686_pagezero(CADDR3); else + bzero(CADDR3, PAGE_SIZE); +#else + i686_pagezero(CADDR3); #endif - bzero(CADDR3, PAGE_SIZE); +#else + bzero(CADDR3, PAGE_SIZE); +#endif #ifdef SMP curthread->td_switchin = NULL; #endif @@ -2881,10 +3010,7 @@ * down (or not) as appropriate. */ void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vm_offset_t sva, eva; - boolean_t pageable; +pmap_pageable(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, boolean_t pageable) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 10 18: 7:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D83A37B401; Sat, 10 Aug 2002 18:07:14 -0700 (PDT) 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 AF31037B400 for ; Sat, 10 Aug 2002 18:07:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DF9743E65 for ; Sat, 10 Aug 2002 18:07:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7B17DJU054057 for ; Sat, 10 Aug 2002 18:07:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7B17Dvq054054 for perforce@freebsd.org; Sat, 10 Aug 2002 18:07:13 -0700 (PDT) Date: Sat, 10 Aug 2002 18:07:13 -0700 (PDT) Message-Id: <200208110107.g7B17Dvq054054@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15804 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15804 Change 15804 by peter@peter_overcee on 2002/08/10 18:06:30 scottl > peter :-). Add missing ) Affected files ... .. //depot/projects/pmap/sys/vm/vm_zeroidle.c#10 edit Differences ... ==== //depot/projects/pmap/sys/vm/vm_zeroidle.c#10 (text+ko) ==== @@ -82,7 +82,7 @@ mtx_unlock_spin(&vm_page_queue_free_mtx); pmap_zero_page_idle(m); mtx_lock_spin(&vm_page_queue_free_mtx); - vm_page_flag_set(m, PG_ZERO; + vm_page_flag_set(m, PG_ZERO); vm_pageq_enqueue(PQ_FREE + m->pc, m); ++vm_page_zero_count; ++cnt_prezero; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Aug 11 18:34:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66EE537B401; Sun, 11 Aug 2002 18:34:48 -0700 (PDT) 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 DD6AC37B400 for ; Sun, 11 Aug 2002 18:34:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8562843E70 for ; Sun, 11 Aug 2002 18:34:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7C1YlJU003940 for ; Sun, 11 Aug 2002 18:34:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7C1Ylmq003937 for perforce@freebsd.org; Sun, 11 Aug 2002 18:34:47 -0700 (PDT) Date: Sun, 11 Aug 2002 18:34:47 -0700 (PDT) Message-Id: <200208120134.g7C1Ylmq003937@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15840 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15840 Change 15840 by rwatson@rwatson_paprika on 2002/08/11 18:34:35 Remove dup include of mman.h Affected files ... .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#13 (text+ko) ==== @@ -49,7 +49,6 @@ #include /* Must come after sys/malloc.h */ #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Aug 11 18:41: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59CA037B401; Sun, 11 Aug 2002 18:40:56 -0700 (PDT) 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 C7A8437B400 for ; Sun, 11 Aug 2002 18:40:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 826BB43E3B for ; Sun, 11 Aug 2002 18:40:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7C1etJU004500 for ; Sun, 11 Aug 2002 18:40:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7C1etBe004497 for perforce@freebsd.org; Sun, 11 Aug 2002 18:40:55 -0700 (PDT) Date: Sun, 11 Aug 2002 18:40:55 -0700 (PDT) Message-Id: <200208120140.g7C1etBe004497@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15841 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15841 Change 15841 by rwatson@rwatson_paprika on 2002/08/11 18:40:49 Sync to the version of the MAC checks in -CURRENT: use the thread not process credential (we don't hold appropriate locks for that, and it's inconsistent with other checks), and since it's a short #ifdef, drop the comment on #endif. Affected files ... .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#14 (text+ko) ==== @@ -314,11 +314,10 @@ } #ifdef MAC - /* Use process's credentials to check directory search MAC. */ - error = mac_check_vnode_readdir(td->td_proc->p_ucred, vp); + error = mac_check_vnode_readdir(td->td_ucred, vp); if (error) goto out; -#endif /* MAC */ +#endif error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, &ncookies, &cookies); @@ -477,11 +476,10 @@ * we massage it into user space, one record at a time. */ #ifdef MAC - /* Use process's credentials to check directory search MAC. */ - error = mac_check_vnode_readdir(td->td_proc->p_ucred, vp); + error = mac_check_vnode_readdir(td->td_ucred, vp); if (error) goto out; -#endif /* MAC */ +#endif error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, &ncookies, &cookiebuf); if (error) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Aug 11 18:47:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D45737B401; Sun, 11 Aug 2002 18:47:05 -0700 (PDT) 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 C654237B400 for ; Sun, 11 Aug 2002 18:47:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 825F843E6E for ; Sun, 11 Aug 2002 18:47:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7C1l4JU005281 for ; Sun, 11 Aug 2002 18:47:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7C1l4Tw005278 for perforce@freebsd.org; Sun, 11 Aug 2002 18:47:04 -0700 (PDT) Date: Sun, 11 Aug 2002 18:47:04 -0700 (PDT) Message-Id: <200208120147.g7C1l4Tw005278@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15844 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15844 Change 15844 by rwatson@rwatson_paprika on 2002/08/11 18:46:06 Sync MAC readdir() checks to the main tree: use thread credentials not process credentials (for locking and consistency reasons), style sync, etc. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_misc.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_misc.c#8 (text+ko) ==== @@ -352,10 +352,11 @@ } #ifdef MAC - error = mac_check_vnode_readdir(td->td_proc->p_ucred, vp); + error = mac_check_vnode_readdir(td->td_ucred, vp); if (error) goto out; -#endif /* MAC */ +#endif + /* * First we read into the malloc'ed buffer, then * we massage it into user space, one record at a time. @@ -512,10 +513,11 @@ } #ifdef MAC - error = mac_check_vnode_readdir(td->td_proc->p_ucred, vp); + error = mac_check_vnode_readdir(td->td_ucred, vp); if (error) goto out; -#endif /* MAC */ +#endif + /* * First we read into the malloc'ed buffer, then * we massage it into user space, one record at a time. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 12 13:52:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9382937B401; Mon, 12 Aug 2002 13:52:06 -0700 (PDT) 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 044FA37B400 for ; Mon, 12 Aug 2002 13:52:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F085D43E3B for ; Mon, 12 Aug 2002 13:52:03 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7CKq3JU002961 for ; Mon, 12 Aug 2002 13:52:03 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7CKq3Mw002958 for perforce@freebsd.org; Mon, 12 Aug 2002 13:52:03 -0700 (PDT) Date: Mon, 12 Aug 2002 13:52:03 -0700 (PDT) Message-Id: <200208122052.g7CKq3Mw002958@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 15878 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15878 Change 15878 by green@green_laptop_2 on 2002/08/12 13:51:22 Add a new entry point and system call, mac_get_pid()/MAC_EXTERNALIZE_PID, which allow for a process to retrieve an externalized representation of the label on a process. Any combination of policies can be queried for the information via this interface; not all have to be. This is halfway between a stopgap and a prototype for a slightly better externalization/internalization interface. Affected files ... .. //depot/projects/trustedbsd/mac/bin/ps/extern.h#6 edit .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#8 edit .. //depot/projects/trustedbsd/mac/bin/ps/print.c#8 edit .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#7 edit .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#10 edit .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#26 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#234 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#26 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#23 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#21 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#147 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#112 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#26 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#26 edit .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#27 edit Differences ... ==== //depot/projects/trustedbsd/mac/bin/ps/extern.h#6 (text+ko) ==== @@ -74,6 +74,7 @@ int s_rgroupname(KINFO *); int s_runame(KINFO *); int s_uname(KINFO *); +void sebsd(KINFO *, VARENT *); void showkey(void); void started(KINFO *, VARENT *); void state(KINFO *, VARENT *); ==== //depot/projects/trustedbsd/mac/bin/ps/keyword.c#8 (text+ko) ==== @@ -164,6 +164,7 @@ UINT, UIDFMT, 0}, {"ruser", "RUSER", NULL, LJUST|DSIZ, runame, s_runame, USERLEN, 0, CHAR, NULL, 0}, + {"sebsd", "SEBSD", NULL, LJUST, sebsd, NULL, 0, 0, CHAR, NULL, 0}, {"sid", "SID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_sid), UINT, PIDFMT, 0}, {"sig", "PENDING", NULL, 0, kvar, NULL, 8, KOFF(ki_siglist), INT, ==== //depot/projects/trustedbsd/mac/bin/ps/print.c#8 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include +#include #include #include @@ -742,3 +743,21 @@ v = ve->var; (void)printf("%-*d", v->width, get_lattr(k->ki_p->ki_pid)); } + +void +sebsd(KINFO *k, VARENT *ve) +{ + char buf[128]; + struct mac_pid_data mpd; + size_t datalen; + VAR *v; + + strcpy(buf, "<>"); + strcpy(mpd.mpd_name, "trustedbsd_sebsd"); + mpd.mpd_data = buf; + datalen = sizeof(buf); + mpd.mpd_datalen = &datalen; + (void)mac_get_pid(k->ki_p->ki_pid, &mpd, 1); + v = ve->var; + (void)printf("%*s", v->width, mpd.mpd_data); +} ==== //depot/projects/trustedbsd/mac/bin/ps/ps.1#7 (text+ko) ==== @@ -144,6 +144,10 @@ .It Fl r Sort by current cpu usage, instead of by process .Tn ID . +.It Fl s +Add sebsd to the list of keywords for which +.Nm +will display information. .It Fl S Change the way the process time is calculated by summing all exited children to their parent process. @@ -334,6 +338,8 @@ .It X The process is being traced or debugged. .El +.It sebsd +The SEBSD security context of the process. .It tt An abbreviation for the pathname of the controlling terminal, if any. The abbreviation consists of the three letters following ==== //depot/projects/trustedbsd/mac/bin/ps/ps.c#10 (text+ko) ==== @@ -109,13 +109,14 @@ static char ufmt[] = "user,pid,%cpu,%mem,vsz,rss,tt,state,start,time,command"; static char vfmt[] = "pid,state,time,sl,re,pagein,vsz,rss,lim,tsiz,%cpu,%mem,command"; static char Zfmt[] = "lvl"; +static char sfmt[] = "sebsd"; static kvm_t *kd; #if defined(LAZY_PS) -#define PS_ARGS "aCcefghjLlM:mN:O:o:p:rSTt:U:uvwxZ" +#define PS_ARGS "aCcefghjLlM:mN:O:o:p:rsSTt:U:uvwxZ" #else -#define PS_ARGS "aCceghjLlM:mN:O:o:p:rSTt:U:uvwxZ" +#define PS_ARGS "aCceghjLlM:mN:O:o:p:rsSTt:U:uvwxZ" #endif int @@ -241,6 +242,10 @@ case 'r': sortby = SORTCPU; break; + case 's': + parsefmt(sfmt); + sfmt[0] = '\0'; + break; case 'S': sumrusage = 1; break; @@ -646,7 +651,7 @@ { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ps [-aChjlmrSTuvwx] [-O|o fmt] [-p pid] [-t tty] [-U user]", + "usage: ps [-aChjlmrsSTuvwx] [-O|o fmt] [-p pid] [-t tty] [-U user]", " [-M core] [-N system]", " ps [-L]"); exit(1); ==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#26 (text+ko) ==== @@ -423,4 +423,5 @@ { AS(uuidgen_args), (sy_call_t *)uuidgen }, /* 392 = uuidgen */ { SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile }, /* 393 = sendfile */ { SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)mac_syscall }, /* 394 = mac_syscall */ + { SYF_MPSAFE | AS(mac_get_pid_args), (sy_call_t *)mac_get_pid }, /* 395 = mac_get_pid */ }; ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#234 (text+ko) ==== @@ -198,7 +198,7 @@ static int mac_policy_unregister(struct mac_policy_conf *mpc); static int mac_stdcreatevnode_ea(struct vnode *vp); -static void mac_cred_mmapped_drop_perms(struct thread *td, +void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred); static void mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred, struct vm_map *map); @@ -474,6 +474,10 @@ mpc->mpc_ops->mpo_externalize = mpe->mpe_function; break; + case MAC_EXTERNALIZE_PID: + mpc->mpc_ops->mpo_externalize_pid = + mpe->mpe_function; + break; case MAC_INTERNALIZE: mpc->mpc_ops->mpo_internalize = mpe->mpe_function; @@ -2062,7 +2066,7 @@ * memory space, and revoke access (in the least surprising ways we * know) when necessary. The process lock is not held here. */ -static void +void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred) { @@ -2899,6 +2903,55 @@ return (error); } +#if 0 +395 MSTD BSD { int __mac_get_pid(pid_t pid, + struct mac_pid_data *mpd, size_t mpdcnt) }; +#endif + +int +mac_get_pid(struct thread *td, struct mac_get_pid_args *uap) +{ + struct mac_pid_data mpd; + struct mac_policy_conf *mpc; + struct proc *tproc; + struct ucred *tcred; + int error; + int i; + + tproc = pfind(uap->pid); + if (tproc == NULL) + return (ESRCH); + tcred = crhold(tproc->p_ucred); + PROC_UNLOCK(tproc); + MAC_POLICY_LIST_BUSY(); + error = mac_check_cred_visible(td->td_ucred, tcred); + if (error) + goto out; + for (i = 0; i < uap->mpdcnt; i++) { + error = copyin(&uap->mpd[i], &mpd, sizeof(mpd)); + if (error) + goto out; + LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { + if (strcmp(mpc->mpc_name, mpd.mpd_name) == 0) + break; + } + if (mpc == NULL) { + error = ENOENT; + goto out; + } + if (mpc->mpc_ops->mpo_externalize_pid == NULL) { + error = ENOSYS; + goto out; + } + error = mpc->mpc_ops->mpo_externalize_pid(uap->pid, + tcred, mpd.mpd_data, mpd.mpd_datalen); + } +out: + MAC_POLICY_LIST_UNBUSY(); + crfree(tcred); + return (error); +} + /* * MPSAFE * ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#26 (text+ko) ==== @@ -402,4 +402,5 @@ "uuidgen", /* 392 = uuidgen */ "sendfile", /* 393 = sendfile */ "mac_syscall", /* 394 = mac_syscall */ + "mac_get_pid", /* 395 = mac_get_pid */ }; ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#23 (text+ko) ==== @@ -569,3 +569,5 @@ struct sf_hdtr *hdtr, off_t *sbytes, int flags); } 394 MSTD BSD { int mac_syscall(const char *policy, int call, \ void *arg); } +395 MSTD BSD { int mac_get_pid(pid_t pid, \ + struct mac_pid_data *mpd, size_t mpdcnt); } ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#21 (text+ko) ==== @@ -457,6 +457,36 @@ return 0; } +static int +sebsd_externalize_pid(pid_t pid, struct ucred *cred, char *data, + size_t *datalenp) +{ + size_t datalen; + security_context_t scontext; + u_int32_t context_len; + int error; + + error = copyin(datalenp, &datalen, sizeof(datalen)); + if (error) + return (error); + error = security_sid_to_context(((struct task_security_struct *) + SLOT(&cred->cr_label))->sid, &scontext, &context_len); + if (error) + return (error); + if (context_len > datalen) { + error = ENOMEM; + goto out; + } + error = copyout(scontext, data, context_len); + if (error == 0) { + datalen = context_len; + error = copyout(&datalen, datalenp, sizeof(datalen)); + } +out: + security_free_context(scontext); + return (error); +} + /* * Initialize the SEBSD security server after the root partition has * been mounted; policy is located on root partition. @@ -518,6 +548,8 @@ { MAC_EXTERNALIZE, (macop_t)sebsd_externalize }, + { MAC_EXTERNALIZE_PID, + (macop_t)sebsd_externalize_pid }, { MAC_CREATE_ROOT_MOUNT, (macop_t)sebsd_create_root_mount }, { MAC_OP_LAST, NULL } ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#147 (text+ko) ==== @@ -150,6 +150,7 @@ mac_t mac_from_text(const char *_text_p); mac_t mac_get_fd(int _fildes); mac_t mac_get_file(const char *_path_p); +int mac_get_pid(pid_t, struct mac_pid_data *, size_t); mac_t mac_get_proc(void); mac_t mac_glb(const mac_t _labela, const mac_t _labelb); mac_t mac_lub(const mac_t _labela, const mac_t _labelb); @@ -194,6 +195,12 @@ } l_perpolicy[MAC_MAX_POLICIES]; }; +struct mac_pid_data { + char mpd_name[128]; /* arbitrarily-sized */ + char *mpd_data; /* label data to export */ + size_t *mpd_datalen; /* passed both in and out */ +}; + #ifdef _KERNEL /* ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#112 (text+ko) ==== @@ -99,6 +99,8 @@ void (*mpo_destroy_temp)(struct label *label); void (*mpo_destroy_vnode)(struct vnode *, struct label *label); int (*mpo_externalize)(struct label *label, struct mac *extmac); + int (*mpo_externalize_pid)(pid_t pid, struct ucred *cred, + char *data, size_t *datalen); int (*mpo_internalize)(struct label *label, struct mac *extmac); /* @@ -369,6 +371,7 @@ MAC_DESTROY_TEMP, MAC_DESTROY_VNODE, MAC_EXTERNALIZE, + MAC_EXTERNALIZE_PID, MAC_INTERNALIZE, MAC_CREATE_DEVFS_DEVICE, MAC_CREATE_DEVFS_DIRECTORY, ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.h#26 (text+ko) ==== @@ -308,4 +308,5 @@ #define SYS_uuidgen 392 #define SYS_sendfile 393 #define SYS_mac_syscall 394 -#define SYS_MAXSYSCALL 395 +#define SYS_mac_get_pid 395 +#define SYS_MAXSYSCALL 396 ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#26 (text+ko) ==== @@ -256,4 +256,5 @@ lchflags.o \ uuidgen.o \ sendfile.o \ - mac_syscall.o + mac_syscall.o \ + mac_get_pid.o ==== //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#27 (text+ko) ==== @@ -1125,6 +1125,11 @@ char call_l_[PADL_(int)]; int call; char call_r_[PADR_(int)]; char arg_l_[PADL_(void *)]; void * arg; char arg_r_[PADR_(void *)]; }; +struct mac_get_pid_args { + char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)]; + char mpd_l_[PADL_(struct mac_pid_data *)]; struct mac_pid_data * mpd; char mpd_r_[PADR_(struct mac_pid_data *)]; + char mpdcnt_l_[PADL_(size_t)]; size_t mpdcnt; char mpdcnt_r_[PADR_(size_t)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1378,6 +1383,7 @@ int uuidgen(struct thread *, struct uuidgen_args *); int sendfile(struct thread *, struct sendfile_args *); int mac_syscall(struct thread *, struct mac_syscall_args *); +int mac_get_pid(struct thread *, struct mac_get_pid_args *); #ifdef COMPAT_43 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 12 14:12:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E82037B401; Mon, 12 Aug 2002 14:11:00 -0700 (PDT) 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 9962037B400 for ; Mon, 12 Aug 2002 14:10:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22DA043E6E for ; Mon, 12 Aug 2002 14:10:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7CLAwJU009103 for ; Mon, 12 Aug 2002 14:10:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7CLAkhP009047 for perforce@freebsd.org; Mon, 12 Aug 2002 14:10:46 -0700 (PDT) Date: Mon, 12 Aug 2002 14:10:46 -0700 (PDT) Message-Id: <200208122110.g7CLAkhP009047@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15879 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15879 Change 15879 by peter@peter_daintree on 2002/08/12 14:10:18 IFC @15877 (Yay Fusion/MPT!) Affected files ... .. //depot/projects/ia64/Makefile.inc1#35 integrate .. //depot/projects/ia64/bin/Makefile#4 integrate .. //depot/projects/ia64/bin/cat/cat.c#6 integrate .. //depot/projects/ia64/bin/chmod/chmod.1#4 integrate .. //depot/projects/ia64/bin/chmod/chmod.c#4 integrate .. //depot/projects/ia64/bin/cp/cp.1#3 integrate .. //depot/projects/ia64/bin/cp/utils.c#6 integrate .. //depot/projects/ia64/bin/df/df.c#8 integrate .. //depot/projects/ia64/bin/ed/cbc.c#4 integrate .. //depot/projects/ia64/bin/ed/ed.h#4 integrate .. //depot/projects/ia64/bin/kenv/Makefile#1 branch .. //depot/projects/ia64/bin/kenv/kenv.1#1 branch .. //depot/projects/ia64/bin/kenv/kenv.c#1 branch .. //depot/projects/ia64/bin/ln/ln.1#4 integrate .. //depot/projects/ia64/bin/ln/ln.c#7 integrate .. //depot/projects/ia64/bin/ls/ls.c#8 integrate .. //depot/projects/ia64/bin/mv/mv.1#5 integrate .. //depot/projects/ia64/bin/ps/ps.1#9 integrate .. //depot/projects/ia64/bin/rcp/rcp.1#3 integrate .. //depot/projects/ia64/bin/rcp/rcp.c#6 integrate .. //depot/projects/ia64/bin/sh/parser.c#7 integrate .. //depot/projects/ia64/bin/sh/sh.1#13 integrate .. //depot/projects/ia64/contrib/pnpinfo/pnpinfo.c#2 integrate .. //depot/projects/ia64/contrib/tar/src/extract.c#3 integrate .. //depot/projects/ia64/contrib/top/display.c#3 integrate .. //depot/projects/ia64/contrib/traceroute/findsaddr-socket.c#2 integrate .. //depot/projects/ia64/crypto/openssh/session.c#12 integrate .. //depot/projects/ia64/crypto/openssl/CHANGES#3 integrate .. //depot/projects/ia64/crypto/openssl/Configure#3 integrate .. //depot/projects/ia64/crypto/openssl/FAQ#3 integrate .. //depot/projects/ia64/crypto/openssl/FREEBSD-Xlist#2 integrate .. //depot/projects/ia64/crypto/openssl/INSTALL#2 integrate .. //depot/projects/ia64/crypto/openssl/LICENSE#2 integrate .. //depot/projects/ia64/crypto/openssl/Makefile.org#3 integrate .. //depot/projects/ia64/crypto/openssl/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/NEWS#3 integrate .. //depot/projects/ia64/crypto/openssl/PROBLEMS#1 branch .. //depot/projects/ia64/crypto/openssl/README#3 integrate .. //depot/projects/ia64/crypto/openssl/STATUS#2 delete .. //depot/projects/ia64/crypto/openssl/TABLE#2 delete .. //depot/projects/ia64/crypto/openssl/apps/CA.pl#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/apps/Makefile.ssl#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/apps.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/asn1pars.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/ca.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/der_chop#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/dgst.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/dsaparam.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/eay.c#2 delete .. //depot/projects/ia64/crypto/openssl/apps/enc.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/openssl.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/pem_mail.c#2 delete .. //depot/projects/ia64/crypto/openssl/apps/pkcs12.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/pkcs7.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/req.c#3 integrate .. //depot/projects/ia64/crypto/openssl/apps/rsa/01.pem#2 delete .. //depot/projects/ia64/crypto/openssl/apps/rsa/1.txt#2 delete .. //depot/projects/ia64/crypto/openssl/apps/rsa/SecureServer.pem#2 delete .. //depot/projects/ia64/crypto/openssl/apps/rsa/s.txt#2 delete .. //depot/projects/ia64/crypto/openssl/apps/s_time.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/smime.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/ia64/crypto/openssl/apps/tkca#2 delete .. //depot/projects/ia64/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/ia64/crypto/openssl/certs/rsa-ssca.pem#2 delete .. //depot/projects/ia64/crypto/openssl/config#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/Makefile.ssl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/asn1/Makefile.ssl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_bitstr.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_enum.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_gentm.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_int.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_set.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_sign.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_time.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/a_utctm.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/asn1_lib.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/d2i_dhp.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/d2i_dsap.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/d2i_r_pr.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/pkcs8.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/asn1/t_pkey.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/asn1/x_pubkey.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bf/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bf/Makefile.uni#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bio/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bio/b_print.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/b_sock.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bf_lbuf.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bf_nbio.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bio.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bss_bio.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bio/bss_log.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_comba.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_div.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_gcd.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_mont.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_mul.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/bn/bn_opts.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/comba.pl#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/d.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/new#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/old/b_sqr.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/old/bn_com.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/old/bn_high.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/old/bn_ka.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/old/bn_low.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/old/bn_m.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/old/bn_mul.c.works#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/old/bn_wmul.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/old/build#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/old/info#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/bn/old/test.works#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/buffer/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/cast/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/cast/Makefile.uni#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/comp/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/conf/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/conf/Makefile.ssl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/conf/conf.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/conf/conf.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/conf/conf_api.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/conf/conf_def.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/conf/conf_def.h#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/conf/conf_lcl.h#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/conf/keysets.pl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/cryptlib.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/cryptlib.h#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/DES.pod#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/MODES.DES#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/Makefile.PL#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/Makefile.lit#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/Makefile.uni#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/PC1#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/PC2#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/des.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/des.man#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/des.pl#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/des_crypt.man#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/doIP#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/doPC1#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/doPC2#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/fcrypt.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/podd.h#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/read_pwd.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/des/shifts.pl#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/sk.h#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/supp.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/des/testdes.pl#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/dh/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/dh/dh.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dh/dh_err.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dh/dh_gen.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dh/dhtest.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dsa/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/dsa/dsa_asn1.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/dso/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/dso/dso_dlfcn.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/ebcdic.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/err/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/err/Makefile.ssl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/bio_enc.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/c_allc.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/c_alld.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cbc_3d.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cbc_bf.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cbc_c.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cbc_d.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cbc_i.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cbc_r2.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cbc_r5.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cfb_3d.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cfb_bf.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cfb_c.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cfb_d.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cfb_i.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cfb_r2.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_cfb_r5.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ecb_3d.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ecb_bf.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ecb_c.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ecb_d.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ecb_i.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ecb_r2.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ecb_r5.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ofb_3d.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ofb_bf.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ofb_c.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ofb_d.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ofb_i.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ofb_r2.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/e_ofb_r5.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/evp/encode.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/evp/evp.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/hmac/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/idea/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/idea/Makefile.uni#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/lhash/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/lhash/lh_test.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md2/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/md2/Makefile.ssl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/md4/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/md5/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/md5/Makefile.uni#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/mdc2/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/mem.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/objects/Makefile.ssl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/o_names.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/obj_dat.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/obj_dat.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/obj_mac.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/objects.pl#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/objects/objects.txt#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/opensslv.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pem/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/pem/pem2.h#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pem/pem_info.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pem/pem_lib.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/perlasm/x86nasm.pl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs12/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/pkcs12/pkcs12.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/Makefile.ssl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/README#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/pk7_doit.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/pkcs7/verify.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rand/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/rand/rand_egd.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rand/rand_win.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rc2/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/rc2/Makefile.uni#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/rc4/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/rc4/Makefile.uni#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/rc5/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/rc5/Makefile.uni#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/ripemd/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/ripemd/Makefile.uni#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/rsa/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa.h#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_eay.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_oaep.c#3 integrate .. //depot/projects/ia64/crypto/openssl/crypto/rsa/rsa_oaep_test.c#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/sha/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/sha/Makefile.uni#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/stack/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/tmdiff.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/txt_db/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/txt_db/txt_db.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/x509/Makefile.ssl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/Makefile.ssl#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/README#2 delete .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_ia5.c#2 integrate .. //depot/projects/ia64/crypto/openssl/crypto/x509v3/v3_utl.c#2 integrate .. //depot/projects/ia64/crypto/openssl/demos/b64.c#2 integrate .. //depot/projects/ia64/crypto/openssl/demos/maurice/example1.c#2 integrate .. //depot/projects/ia64/crypto/openssl/demos/maurice/loadkeys.c#2 integrate .. //depot/projects/ia64/crypto/openssl/dep/crypto.txt#2 delete .. //depot/projects/ia64/crypto/openssl/dep/files#2 delete .. //depot/projects/ia64/crypto/openssl/dep/gen.pl#2 delete .. //depot/projects/ia64/crypto/openssl/dep/ssl.txt#2 delete .. //depot/projects/ia64/crypto/openssl/doc/apps/crl2pkcs7.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/apps/smime.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto.pod#2 delete .. //depot/projects/ia64/crypto/openssl/doc/crypto/BN_bn2bin.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/BN_rand.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/DH_get_ex_new_index.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/EVP_DigestInit.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/EVP_SignInit.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/EVP_VerifyInit.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/RSA_check_key.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/RSA_generate_key.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/blowfish.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/crypto.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/des_modes.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/err.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/crypto/rsa.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/openssl.pod#2 delete .. //depot/projects/ia64/crypto/openssl/doc/ssl.pod#2 delete .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_add_extra_chain_cert.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_sess_set_cache_size.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_sess_set_get_cb.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_set_client_cert_cb.pod#1 branch .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_accept.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_clear.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_connect.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_do_handshake.pod#1 branch .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#2 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_get_error.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_set_connect_state.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/SSL_write.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/doc/ssl/ssl.pod#3 integrate .. //depot/projects/ia64/crypto/openssl/e_os.h#3 integrate .. //depot/projects/ia64/crypto/openssl/e_os2.h#2 integrate .. //depot/projects/ia64/crypto/openssl/mt/README#2 delete .. //depot/projects/ia64/crypto/openssl/mt/mttest.c#2 delete .. //depot/projects/ia64/crypto/openssl/mt/profile.sh#2 delete .. //depot/projects/ia64/crypto/openssl/mt/pthread.sh#2 delete .. //depot/projects/ia64/crypto/openssl/mt/purify.sh#2 delete .. //depot/projects/ia64/crypto/openssl/mt/solaris.sh#2 delete .. //depot/projects/ia64/crypto/openssl/openssl.spec#3 integrate .. //depot/projects/ia64/crypto/openssl/shlib/Makefile.hpux10-cc#2 delete .. //depot/projects/ia64/crypto/openssl/shlib/hpux10-cc.sh#2 delete .. //depot/projects/ia64/crypto/openssl/shlib/irix.sh#2 delete .. //depot/projects/ia64/crypto/openssl/shlib/solaris-sc4.sh#2 delete .. //depot/projects/ia64/crypto/openssl/shlib/solaris.sh#2 delete .. //depot/projects/ia64/crypto/openssl/shlib/sun.sh#2 delete .. //depot/projects/ia64/crypto/openssl/ssl/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/ssl/Makefile.ssl#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s2_clnt.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s2_enc.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s2_lib.c#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s2_srvr.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_both.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_clnt.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_enc.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_lib.c#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_pkt.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/s3_srvr.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl.h#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl3.h#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_asn1.c#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_cert.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_err.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_lib.c#3 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_locl.h#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssl_sess.c#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/ssltest.c#2 integrate .. //depot/projects/ia64/crypto/openssl/ssl/t1_enc.c#3 integrate .. //depot/projects/ia64/crypto/openssl/test/Makefile.save#2 delete .. //depot/projects/ia64/crypto/openssl/test/Makefile.ssl#2 integrate .. //depot/projects/ia64/crypto/openssl/test/dsa-ca.pem#2 delete .. //depot/projects/ia64/crypto/openssl/test/dsa-pca.pem#2 delete .. //depot/projects/ia64/crypto/openssl/tools/c_rehash#2 integrate .. //depot/projects/ia64/crypto/openssl/util/dirname.pl#1 branch .. //depot/projects/ia64/crypto/openssl/util/domd#2 integrate .. //depot/projects/ia64/crypto/openssl/util/libeay.num#3 integrate .. //depot/projects/ia64/crypto/openssl/util/mk1mf.pl#2 integrate .. //depot/projects/ia64/crypto/openssl/util/mkerr.pl#3 integrate .. //depot/projects/ia64/crypto/openssl/util/pl/BC-32.pl#2 integrate .. //depot/projects/ia64/crypto/openssl/util/pl/VC-32.pl#2 integrate .. //depot/projects/ia64/crypto/openssl/util/pod2man.pl#2 integrate .. //depot/projects/ia64/crypto/openssl/util/pod2mantest#1 branch .. //depot/projects/ia64/crypto/openssl/util/pod2mantest.pod#1 branch .. //depot/projects/ia64/crypto/openssl/util/selftest.pl#2 integrate .. //depot/projects/ia64/crypto/openssl/util/sep_lib.sh#2 delete .. //depot/projects/ia64/etc/MAKEDEV#11 integrate .. //depot/projects/ia64/etc/defaults/periodic.conf#4 integrate .. //depot/projects/ia64/etc/etc.sparc64/ttys#3 integrate .. //depot/projects/ia64/etc/inetd.conf#6 integrate .. //depot/projects/ia64/etc/isdn/Makefile#5 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/ia64/etc/periodic/daily/150.clean-hoststat#2 integrate .. //depot/projects/ia64/etc/periodic/security/100.chksetuid#4 integrate .. //depot/projects/ia64/etc/printcap#3 integrate .. //depot/projects/ia64/etc/rc.d/ipsec#3 integrate .. //depot/projects/ia64/etc/rc.d/network#3 integrate .. //depot/projects/ia64/etc/rc.d/network1#5 integrate .. //depot/projects/ia64/etc/rc.d/othermta#2 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#16 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2#10 integrate .. //depot/projects/ia64/games/trek/DOC/trekmanual.nr#2 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/koi8-r#3 integrate .. //depot/projects/ia64/gnu/usr.bin/man/apropos/apropos.man#4 integrate .. //depot/projects/ia64/gnu/usr.bin/man/apropos/apropos.sh#2 integrate .. //depot/projects/ia64/include/Makefile#13 integrate .. //depot/projects/ia64/include/cpio.h#1 branch .. //depot/projects/ia64/include/fmtmsg.h#1 branch .. //depot/projects/ia64/include/ulimit.h#1 branch .. //depot/projects/ia64/include/wchar.h#4 integrate .. //depot/projects/ia64/include/wctype.h#3 integrate .. //depot/projects/ia64/kerberos5/libexec/hpropd/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-master/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-slave/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/libexec/k5admind/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/libexec/k5passwdd/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/libexec/kdc/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/usr.bin/k5admin/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/usr.bin/k5destroy/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/usr.bin/k5init/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/usr.bin/k5list/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/usr.bin/k5passwd/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/usr.bin/k5su/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/usr.sbin/k5stash/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.sbin/ktutil/Makefile#4 integrate .. //depot/projects/ia64/lib/Makefile#14 integrate .. //depot/projects/ia64/lib/compat/compat22/Makefile#3 integrate .. //depot/projects/ia64/lib/compat/compat22/libc.so.3.1.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat22/libc.so.3.1.gz.uu#2 delete .. //depot/projects/ia64/lib/compat/compat22/libc_r.so.3.0.bz2.uu#1 branch .. //depot/projects/ia64/lib/compat/compat22/libc_r.so.3.0.gz.uu#2 delete .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#11 integrate .. //depot/projects/ia64/lib/libc/gen/dlopen.3#4 integrate .. //depot/projects/ia64/lib/libc/gen/err.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/errlst.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/fmtmsg.3#1 branch .. //depot/projects/ia64/lib/libc/gen/fmtmsg.c#1 branch .. //depot/projects/ia64/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/getvfsbyname.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/getvfsent.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/semctl.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/ulimit.3#1 branch .. //depot/projects/ia64/lib/libc/gen/ulimit.c#1 branch .. //depot/projects/ia64/lib/libc/i386/sys/sbrk.S#4 integrate .. //depot/projects/ia64/lib/libc/locale/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/locale/btowc.3#1 branch .. //depot/projects/ia64/lib/libc/locale/btowc.c#1 branch .. //depot/projects/ia64/lib/libc/locale/collate.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/collate.h#4 integrate .. //depot/projects/ia64/lib/libc/locale/euc.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/iswalnum.3#1 branch .. //depot/projects/ia64/lib/libc/locale/iswctype.c#1 branch .. //depot/projects/ia64/lib/libc/locale/ldpart.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/ldpart.h#4 integrate .. //depot/projects/ia64/lib/libc/locale/lmessages.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/lmonetary.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/lnumeric.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/multibyte.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/rune.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/rune.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/setlocale.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/setlocale.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/setrunelocale.c#3 integrate .. //depot/projects/ia64/lib/libc/locale/towlower.3#1 branch .. //depot/projects/ia64/lib/libc/locale/wctob.c#1 branch .. //depot/projects/ia64/lib/libc/locale/wctrans.3#1 branch .. //depot/projects/ia64/lib/libc/locale/wctrans.c#1 branch .. //depot/projects/ia64/lib/libc/locale/wctype.3#1 branch .. //depot/projects/ia64/lib/libc/locale/wctype.c#1 branch .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#4 integrate .. //depot/projects/ia64/lib/libc/net/if_indextoname.3#3 integrate .. //depot/projects/ia64/lib/libc/nls/msgcat.c#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac.3#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_biba.c#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_free.3#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_free.c#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_get.3#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_get.c#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_internal.h#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_is_present_np.3#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_is_present_np.c#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_mls.c#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_sebsd.c#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_set.3#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_set.c#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_te.c#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_text.3#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_text.c#1 branch .. //depot/projects/ia64/lib/libc/posix1e/posix1e.3#2 integrate .. //depot/projects/ia64/lib/libc/rpc/rpc_clnt_create.3#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fwide.3#1 branch .. //depot/projects/ia64/lib/libc/stdio/getwc.3#1 branch .. //depot/projects/ia64/lib/libc/stdio/printf.3#9 integrate .. //depot/projects/ia64/lib/libc/stdio/putwc.3#1 branch .. //depot/projects/ia64/lib/libc/stdio/ungetwc.3#1 branch .. //depot/projects/ia64/lib/libc/stdlib/calloc.c#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#12 integrate .. //depot/projects/ia64/lib/libc/stdtime/timelocal.c#5 integrate .. //depot/projects/ia64/lib/libc/string/strsep.3#2 integrate .. //depot/projects/ia64/lib/libc/sys/execve.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/fhopen.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/fork.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/getrlimit.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/intro.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/rfork.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/utimes.2#3 integrate .. //depot/projects/ia64/lib/libc/xdr/xdr_array.c#3 integrate .. //depot/projects/ia64/lib/libkvm/kvm_sparc64.c#4 integrate .. //depot/projects/ia64/lib/libncurses/termcap.c#3 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_opie/pam_opie.c#7 integrate .. //depot/projects/ia64/lib/libradius/libradius.3#5 integrate .. //depot/projects/ia64/lib/libstand/nfs.c#4 integrate .. //depot/projects/ia64/lib/libufs/type.c#2 integrate .. //depot/projects/ia64/lib/libugidfw/Makefile#1 branch .. //depot/projects/ia64/lib/libugidfw/ugidfw.c#1 branch .. //depot/projects/ia64/lib/libugidfw/ugidfw.h#1 branch .. //depot/projects/ia64/lib/libutil/login.conf.5#4 integrate .. //depot/projects/ia64/lib/libutil/login_cap.h#4 integrate .. //depot/projects/ia64/lib/libz/minigzip.c#3 integrate .. //depot/projects/ia64/libexec/ftpd/ftpcmd.y#7 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.8#4 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#8 integrate .. //depot/projects/ia64/libexec/revnetgroup/revnetgroup.8#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.c#5 integrate .. //depot/projects/ia64/release/Makefile#18 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#16 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#36 integrate .. //depot/projects/ia64/release/i386/dokern.sh#6 integrate .. //depot/projects/ia64/release/i386/drivers.conf#5 integrate .. //depot/projects/ia64/release/scripts/driver-copy2.awk#2 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#12 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.c#6 integrate .. //depot/projects/ia64/sbin/dumpfs/dumpfs.c#6 integrate .. //depot/projects/ia64/sbin/fsck_ffs/Makefile#3 integrate .. //depot/projects/ia64/sbin/fsck_ffs/dir.c#6 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsck.h#6 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsutil.c#7 integrate .. //depot/projects/ia64/sbin/fsck_ffs/inode.c#7 integrate .. //depot/projects/ia64/sbin/fsck_ffs/main.c#8 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass1.c#6 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass2.c#6 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass5.c#7 integrate .. //depot/projects/ia64/sbin/fsck_ffs/preen.c#4 delete .. //depot/projects/ia64/sbin/fsck_ffs/setup.c#8 integrate .. //depot/projects/ia64/sbin/fsck_ffs/utilities.c#4 integrate .. //depot/projects/ia64/sbin/fsdb/Makefile#3 integrate .. //depot/projects/ia64/sbin/fsdb/fsdb.h#6 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#9 integrate .. //depot/projects/ia64/sbin/init/init.c#3 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#7 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/ia64/sbin/mount/mntopts.h#3 integrate .. //depot/projects/ia64/sbin/mount/mount.8#5 integrate .. //depot/projects/ia64/sbin/mount/mount.c#5 integrate .. //depot/projects/ia64/sbin/mount/mount_ufs.c#3 integrate .. //depot/projects/ia64/sbin/mount_cd9660/mount_cd9660.c#3 integrate .. //depot/projects/ia64/sbin/mount_ext2fs/mount_ext2fs.c#4 integrate .. //depot/projects/ia64/sbin/mount_hpfs/mount_hpfs.c#3 integrate .. //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.c#6 integrate .. //depot/projects/ia64/sbin/mount_ntfs/mount_ntfs.c#3 integrate .. //depot/projects/ia64/sbin/mount_nullfs/mount_nullfs.c#4 integrate .. //depot/projects/ia64/sbin/mount_nwfs/mount_nwfs.c#2 integrate .. //depot/projects/ia64/sbin/mount_portalfs/mount_portalfs.c#3 integrate .. //depot/projects/ia64/sbin/mount_std/mount_std.8#4 integrate .. //depot/projects/ia64/sbin/mount_std/mount_std.c#6 integrate .. //depot/projects/ia64/sbin/mount_udf/mount_udf.c#3 integrate .. //depot/projects/ia64/sbin/mount_umapfs/mount_umapfs.c#3 integrate .. //depot/projects/ia64/sbin/mount_unionfs/mount_unionfs.c#5 integrate .. //depot/projects/ia64/sbin/nfsiod/Makefile#4 integrate .. //depot/projects/ia64/sbin/nfsiod/nfsiod.8#5 integrate .. //depot/projects/ia64/sbin/nfsiod/nfsiod.c#5 integrate .. //depot/projects/ia64/sbin/ping/ping.c#7 integrate .. //depot/projects/ia64/sbin/quotacheck/preen.c#1 branch .. //depot/projects/ia64/sbin/umount/umount.c#3 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile#8 integrate .. //depot/projects/ia64/secure/lib/libcrypto/des_crypt.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_ctrl.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_f_base64.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_f_buffer.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_f_cipher.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_f_md.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_f_null.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_f_ssl.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_find_type.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_new.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_new_bio_pair.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_push.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_read.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_accept.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_bio.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_connect.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_fd.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_file.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_mem.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_null.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_s_socket.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_set_callback.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BIO_should_retry.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_CTX_new.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_CTX_start.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_add.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_add_word.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_bn2bin.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_cmp.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_copy.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_generate_prime.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_mod_inverse.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_new.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_num_bytes.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_rand.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_set_bit.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/BN_zero.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/CA.pl.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DH_generate_key.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DH_generate_parameters.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DH_get_ex_new_index.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DH_new.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DH_set_method.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DH_size.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_SIG_new.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_do_sign.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_dup_DH.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_generate_key.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_generate_parameters.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_get_ex_new_index.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_new.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_set_method.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_sign.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/DSA_size.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_GET_LIB.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_clear_error.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_error_string.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_get_error.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_load_crypto_strings.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_load_strings.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_print_errors.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_put_error.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ERR_remove_state.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_DigestInit.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_EncryptInit.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_OpenInit.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_SealInit.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_SignInit.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/EVP_VerifyInit.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RAND_add.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RAND_bytes.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RAND_cleanup.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RAND_egd.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RAND_load_file.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RAND_set_rand_method.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_blinding_on.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_check_key.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_generate_key.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_get_ex_new_index.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_new.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_print.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_private_encrypt.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_public_encrypt.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_set_method.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_sign.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/RSA_size.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CIPHER_get_name.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_COMP_add_compression_method.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_add_extra_chain_cert.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_add_session.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_ctrl.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_flush_sessions.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_free.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_get_ex_new_index.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_get_verify_mode.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_load_verify_locations.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_new.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_sess_number.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_sess_set_cache_size.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_sess_set_get_cb.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_sessions.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_cert_store.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_cert_verify_callback.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_cipher_list.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_client_CA_list.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_client_cert_cb.3#1 branch .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_default_passwd_cb.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_info_callback.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_mode.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_options.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_quiet_shutdown.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_session_cache_mode.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_session_id_context.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_ssl_version.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_timeout.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_tmp_dh_callback.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_tmp_rsa_callback.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_set_verify.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_CTX_use_certificate.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_SESSION_free.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_SESSION_get_ex_new_index.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_SESSION_get_time.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_accept.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_alert_type_string.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_clear.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_connect.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_do_handshake.3#1 branch .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_free.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_SSL_CTX.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_ciphers.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_client_CA_list.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_current_cipher.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_default_timeout.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_error.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_ex_data_X509_STORE_CTX_idx.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_ex_new_index.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_fd.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_peer_cert_chain.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_peer_certificate.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_rbio.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_session.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_verify_result.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_get_version.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_library_init.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_load_client_CA_file.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_new.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_pending.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_read.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_rstate_string.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_session_reused.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_set_bio.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_set_connect_state.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_set_fd.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_set_session.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_set_shutdown.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_set_verify_result.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_shutdown.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_state_string.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_want.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/SSL_write.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/asn1parse.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/bio.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/blowfish.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/bn.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/bn_internal.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/buffer.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ca.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ciphers.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/config.5#1 branch .. //depot/projects/ia64/secure/lib/libcrypto/man/crl.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/crl2pkcs7.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/crypto.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_DHparams.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_RSAPublicKey.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/d2i_SSL_SESSION.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/des.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/des_modes.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/dgst.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/dh.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/dhparam.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/dsa.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/dsa.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/dsaparam.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/enc.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/err.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/evp.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/gendsa.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/genrsa.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/hmac.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/lh_stats.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/lhash.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/md5.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/mdc2.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/nseq.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/openssl.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/passwd.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/pkcs12.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/pkcs7.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/pkcs8.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/rand.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/rand.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/rc4.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/req.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ripemd.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/rsa.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/rsa.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/rsautl.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/s_client.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/s_server.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/sess_id.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/sha.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/smime.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/speed.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/spkac.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/ssl.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/threads.3#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/verify.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/version.1#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/man/x509.1#2 integrate .. //depot/projects/ia64/share/dict/propernames#2 integrate .. //depot/projects/ia64/share/examples/cvsup/README#2 integrate .. //depot/projects/ia64/share/examples/cvsup/cvs-supfile#2 integrate .. //depot/projects/ia64/share/examples/cvsup/doc-supfile#2 integrate .. //depot/projects/ia64/share/examples/cvsup/gnats-supfile#2 integrate .. //depot/projects/ia64/share/examples/cvsup/ports-supfile#2 integrate .. //depot/projects/ia64/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/ia64/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/ia64/share/examples/cvsup/www-supfile#2 integrate .. //depot/projects/ia64/share/examples/drivers/make_device_driver.sh#3 integrate .. //depot/projects/ia64/share/examples/drivers/make_pseudo_driver.sh#3 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#17 integrate .. //depot/projects/ia64/share/examples/isdn/FAQ#3 integrate .. //depot/projects/ia64/share/examples/isdn/README#3 integrate .. //depot/projects/ia64/share/examples/isdn/ROADMAP#2 integrate .. //depot/projects/ia64/share/examples/isdn/ReleaseNotes#3 integrate .. //depot/projects/ia64/share/examples/isdn/ThankYou#4 integrate .. //depot/projects/ia64/share/man/man4/Makefile#12 integrate .. //depot/projects/ia64/share/man/man4/ichsmb.4#2 integrate .. //depot/projects/ia64/share/man/man4/nge.4#3 integrate .. //depot/projects/ia64/share/man/man4/ppp.4#2 integrate .. //depot/projects/ia64/share/man/man4/snp.4#4 integrate .. //depot/projects/ia64/share/man/man4/uftdi.4#1 branch .. //depot/projects/ia64/share/man/man4/wi.4#6 integrate .. //depot/projects/ia64/share/man/man5/device.hints.5#2 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#17 integrate .. //depot/projects/ia64/share/man/man7/ports.7#4 integrate .. //depot/projects/ia64/share/me/tmac.orig_me#2 integrate .. //depot/projects/ia64/share/misc/bsd-family-tree#5 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#8 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#8 integrate .. //depot/projects/ia64/share/termcap/termcap.5#2 integrate .. //depot/projects/ia64/share/termcap/termcap.src#5 integrate .. //depot/projects/ia64/sys/alpha/alpha/exception.s#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/genassym.c#6 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#14 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#13 integrate .. //depot/projects/ia64/sys/alpha/alpha/sys_machdep.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#14 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#7 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#13 integrate .. //depot/projects/ia64/sys/alpha/include/pmap.h#5 integrate .. //depot/projects/ia64/sys/alpha/include/proc.h#4 integrate .. //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#5 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_mount.c#4 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_signal.c#6 integrate .. //depot/projects/ia64/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#8 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf#8 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/i386_module.c#2 integrate .. //depot/projects/ia64/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/main.c#7 integrate .. //depot/projects/ia64/sys/coda/coda_namecache.c#3 integrate .. //depot/projects/ia64/sys/coda/coda_subr.c#4 integrate .. //depot/projects/ia64/sys/coda/coda_vfsops.c#6 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/ia64/sys/compat/linux/linux_getcwd.c#5 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#7 integrate .. //depot/projects/ia64/sys/compat/svr4/imgact_svr4.c#6 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#5 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#8 integrate .. //depot/projects/ia64/sys/conf/Makefile.alpha#7 integrate .. //depot/projects/ia64/sys/conf/Makefile.i386#7 integrate .. //depot/projects/ia64/sys/conf/Makefile.ia64#14 integrate .. //depot/projects/ia64/sys/conf/Makefile.pc98#7 integrate .. //depot/projects/ia64/sys/conf/Makefile.powerpc#9 integrate .. //depot/projects/ia64/sys/conf/Makefile.sparc64#12 integrate .. //depot/projects/ia64/sys/conf/Makefile.x86_64#2 integrate .. //depot/projects/ia64/sys/conf/NOTES#18 integrate .. //depot/projects/ia64/sys/conf/files#36 integrate .. //depot/projects/ia64/sys/conf/files.i386#14 integrate .. //depot/projects/ia64/sys/conf/files.sparc64#18 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#16 integrate .. //depot/projects/ia64/sys/conf/kmod_syms.awk#4 integrate .. //depot/projects/ia64/sys/conf/majors#7 integrate .. //depot/projects/ia64/sys/conf/options#25 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acconfig.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdebug.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/acenv.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acglobal.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/aclocal.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acnamesp.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acparser.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpiosxf.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpixf.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actables.h#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actbl.h#3 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/actypes.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acutils.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/amlcode.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/amlresrc.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/dbcmds.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbdisasm.c#5 delete .. //depot/projects/ia64/sys/contrib/dev/acpica/dbdisply.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbexec.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbfileio.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbxface.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmbuffer.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/dmnames.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/dmopcode.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/dmresrc.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/dmresrcl.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/dmresrcs.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/dmutils.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/dmwalk.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmethod.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsobject.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsutils.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswload.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswstate.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exconfig.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/excreate.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exdump.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exmisc.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg1.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg2.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresnte.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresolv.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresop.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exstore.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exutils.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsdump.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsdumpdv.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/nseval.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsload.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsnames.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfeval.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfobj.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psargs.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psfind.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psopcode.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psparse.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psutils.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psxface.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rscreate.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsio.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsirq.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rslist.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbconvrt.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbget.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbgetall.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/tbinstal.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbrsdt.c#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/tbutils.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbxface.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbxfroot.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utcopy.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utglobal.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utxface.c#5 integrate .. //depot/projects/ia64/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/ia64/sys/dev/aac/aac_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#15 integrate .. //depot/projects/ia64/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_eisa.c#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#15 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-all.c#8 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-all.h#5 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#1 branch .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#12 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.h#5 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#10 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/ia64/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/mii/mii.c#4 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/fc_log.h#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi.h#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_cnfg.h#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_fc.h#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_init.h#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_ioc.h#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_lan.h#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_raid.h#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_targ.h#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_type.h#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpt.c#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpt.h#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpt_debug.c#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.c#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.h#1 branch .. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#1 branch .. //depot/projects/ia64/sys/dev/nge/if_nge.c#11 integrate .. //depot/projects/ia64/sys/dev/nge/if_ngereg.h#3 integrate .. //depot/projects/ia64/sys/dev/null/null.c#5 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbdevid.h#5 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbvar.h#5 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#8 integrate .. //depot/projects/ia64/sys/dev/pst/pst-iop.c#1 branch .. //depot/projects/ia64/sys/dev/pst/pst-iop.h#1 branch .. //depot/projects/ia64/sys/dev/pst/pst-pci.c#1 branch .. //depot/projects/ia64/sys/dev/pst/pst-raid.c#1 branch .. //depot/projects/ia64/sys/dev/sab/sab.c#1 branch .. //depot/projects/ia64/sys/dev/sab/sab82532reg.h#1 branch .. //depot/projects/ia64/sys/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/ia64/sys/dev/sbni/if_sbni_isa.c#4 integrate .. //depot/projects/ia64/sys/dev/sbni/if_sbni_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/sbni/if_sbnivar.h#3 integrate .. //depot/projects/ia64/sys/dev/se/se_console.c#2 delete .. //depot/projects/ia64/sys/dev/se/sereg.h#2 delete .. //depot/projects/ia64/sys/dev/sn/if_sn_pccard.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/isa/sb16.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/ia64/sys/dev/usb/hid.c#4 integrate .. //depot/projects/ia64/sys/dev/usb/if_aue.c#13 integrate .. //depot/projects/ia64/sys/dev/usb/ohci.c#10 integrate .. //depot/projects/ia64/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/ia64/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/ia64/sys/dev/usb/udbp.c#4 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 12 15:28: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C96E537B401; Mon, 12 Aug 2002 15:27:58 -0700 (PDT) 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 4214937B400; Mon, 12 Aug 2002 15:27:58 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3F0943E6A; Mon, 12 Aug 2002 15:27:56 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g7CMRhOo069046; Mon, 12 Aug 2002 18:27:43 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Mon, 12 Aug 2002 18:27:43 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 15878 for review In-Reply-To: <200208122052.g7CKq3Mw002958@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, 12 Aug 2002, Brian Feldman wrote: > +void > +sebsd(KINFO *k, VARENT *ve) > +{ > + char buf[128]; > + struct mac_pid_data mpd; > + size_t datalen; > + VAR *v; > + > + strcpy(buf, "<>"); > + strcpy(mpd.mpd_name, "trustedbsd_sebsd"); > + mpd.mpd_data = buf; > + datalen = sizeof(buf); > + mpd.mpd_datalen = &datalen; > + (void)mac_get_pid(k->ki_p->ki_pid, &mpd, 1); > + v = ve->var; > + (void)printf("%*s", v->width, mpd.mpd_data); > +} This looks like it will do distinctly the wrong thing when applied to a core dump. You probably need to provide a way to disable printing of sebsd information when ps is running on a core rather than a live kernel, or you get the labels from the live kernel processes instead of the core. > -static void mac_cred_mmapped_drop_perms(struct thread *td, > +void mac_cred_mmapped_drop_perms(struct thread *td, > struct ucred *cred); This seems like a somewhat gratuitous change and is clearly unrelated to your commit message :-). > static void mac_cred_mmapped_drop_perms_recurse(struct thread *td, > struct ucred *cred, struct vm_map *map); > @@ -474,6 +474,10 @@ > mpc->mpc_ops->mpo_externalize = > mpe->mpe_function; > break; > + case MAC_EXTERNALIZE_PID: > + mpc->mpc_ops->mpo_externalize_pid = > + mpe->mpe_function; > + break; > case MAC_INTERNALIZE: > mpc->mpc_ops->mpo_internalize = > mpe->mpe_function; > @@ -2062,7 +2066,7 @@ > * memory space, and revoke access (in the least surprising ways we > * know) when necessary. The process lock is not held here. > */ > -static void > +void > mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred) > { > > @@ -2899,6 +2903,55 @@ > return (error); > } > > +#if 0 > +395 MSTD BSD { int __mac_get_pid(pid_t pid, > + struct mac_pid_data *mpd, size_t mpdcnt) }; > +#endif Don't put unparsable code in #if's, it breaks indent and other C parsing and analysis tools (such as lint). If you must put this information in, use a comment. > +int > +mac_get_pid(struct thread *td, struct mac_get_pid_args *uap) Once we get the new user<->kernel labeling API in, hopefully we can move to using that here. It will presumably look similar but be gratuitously different :-). Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 12 15:41:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35C5637B405; Mon, 12 Aug 2002 15:40:49 -0700 (PDT) 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 B114F37B400 for ; Mon, 12 Aug 2002 15:40:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF5AF43E70 for ; Mon, 12 Aug 2002 15:40:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7CMelJU031395 for ; Mon, 12 Aug 2002 15:40:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7CMelJc031392 for perforce@freebsd.org; Mon, 12 Aug 2002 15:40:47 -0700 (PDT) Date: Mon, 12 Aug 2002 15:40:47 -0700 (PDT) Message-Id: <200208122240.g7CMelJc031392@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15883 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15883 Change 15883 by rwatson@rwatson_curry on 2002/08/12 15:40:43 Generally rename mac_*_check_socket_receive() to mac_*_check_socket_deliver(), including MAC_CHECK_SOCKET_RECEIVE and mpo_check_socket_receive(). This allows us to introduce a socket receive check named intuitively. We may also want to rename the bpfdesc_receive() check. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#235 edit .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_input.c#8 edit .. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#17 edit .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#20 edit .. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#17 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#97 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#13 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#79 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#63 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#71 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#33 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#148 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#113 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#235 (text+ko) ==== @@ -700,14 +700,14 @@ mpc->mpc_ops->mpo_check_socket_connect = mpe->mpe_function; break; + case MAC_CHECK_SOCKET_DELIVER: + mpc->mpc_ops->mpo_check_socket_deliver = + mpe->mpe_function; + break; case MAC_CHECK_SOCKET_LISTEN: mpc->mpc_ops->mpo_check_socket_listen = mpe->mpe_function; break; - case MAC_CHECK_SOCKET_RECEIVE: - mpc->mpc_ops->mpo_check_socket_receive = - mpe->mpe_function; - break; case MAC_CHECK_SOCKET_RELABEL: mpc->mpc_ops->mpo_check_socket_relabel = mpe->mpe_function; @@ -2592,28 +2592,28 @@ } int -mac_check_socket_listen(struct ucred *cred, struct socket *socket) +mac_check_socket_deliver(struct socket *socket, struct mbuf *mbuf) { int error; if (!mac_enforce_socket) return (0); - MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label); + MAC_CHECK(check_socket_deliver, socket, &socket->so_label, mbuf, + &mbuf->m_pkthdr.label); + return (error); } int -mac_check_socket_receive(struct socket *socket, struct mbuf *mbuf) +mac_check_socket_listen(struct ucred *cred, struct socket *socket) { int error; if (!mac_enforce_socket) return (0); - MAC_CHECK(check_socket_receive, socket, &socket->so_label, mbuf, - &mbuf->m_pkthdr.label); - + MAC_CHECK(check_socket_listen, cred, socket, &socket->so_label); return (error); } ==== //depot/projects/trustedbsd/mac/sys/netatalk/ddp_input.c#8 (text+ko) ==== @@ -398,7 +398,7 @@ } #ifdef MAC - if (mac_check_socket_receive(ddp->ddp_socket, m) != 0) { + if (mac_check_socket_deliver(ddp->ddp_socket, m) != 0) { m_freem( m ); return; } ==== //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#17 (text+ko) ==== @@ -158,7 +158,7 @@ #endif /*IPSEC*/ #ifdef MAC if (policyfail == 0 && - mac_check_socket_receive(last->inp_socket, + mac_check_socket_deliver(last->inp_socket, n) != 0) policyfail = 1; #endif @@ -195,7 +195,7 @@ } #endif /*IPSEC*/ #ifdef MAC - if (mac_check_socket_receive(last->inp_socket, m) != 0) { + if (mac_check_socket_deliver(last->inp_socket, m) != 0) { m_freem(m); ipstat.ips_delivered--; return; ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#20 (text+ko) ==== @@ -657,7 +657,7 @@ so = inp->inp_socket; #ifdef MAC - error = mac_check_socket_receive(so, m); + error = mac_check_socket_deliver(so, m); if (error) goto drop; #endif ==== //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#17 (text+ko) ==== @@ -325,7 +325,7 @@ } #endif /*IPSEC*/ #ifdef MAC - if (mac_check_socket_receive(last->inp_socket, + if (mac_check_socket_deliver(last->inp_socket, m) != 0) policyfail = 1; #endif @@ -411,7 +411,7 @@ } #endif /*IPSEC*/ #ifdef MAC - error = mac_check_socket_receive(inp->inp_socket, m); + error = mac_check_socket_deliver(inp->inp_socket, m); if (error) goto bad; #endif ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#97 (text+ko) ==== @@ -1538,7 +1538,7 @@ } static int -mac_biba_check_socket_receive(struct socket *so, struct label *socketlabel, +mac_biba_check_socket_deliver(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_biba *p, *s; @@ -2352,8 +2352,8 @@ (macop_t)mac_biba_check_proc_sched }, { MAC_CHECK_PROC_SIGNAL, (macop_t)mac_biba_check_proc_signal }, - { MAC_CHECK_SOCKET_RECEIVE, - (macop_t)mac_biba_check_socket_receive }, + { MAC_CHECK_SOCKET_DELIVER, + (macop_t)mac_biba_check_socket_deliver }, { MAC_CHECK_SOCKET_RELABEL, (macop_t)mac_biba_check_socket_relabel }, { MAC_CHECK_SOCKET_VISIBLE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#13 (text+ko) ==== @@ -146,7 +146,7 @@ } static int -mac_ifoff_check_socket_receive(struct socket *so, struct label *socketlabel, +mac_ifoff_check_socket_deliver(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { @@ -164,8 +164,8 @@ (macop_t)mac_ifoff_check_bpfdesc_receive }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_ifoff_check_ifnet_transmit }, - { MAC_CHECK_SOCKET_RECEIVE, - (macop_t)mac_ifoff_check_socket_receive }, + { MAC_CHECK_SOCKET_DELIVER, + (macop_t)mac_ifoff_check_socket_deliver }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#79 (text+ko) ==== @@ -1490,7 +1490,7 @@ } static int -mac_mls_check_socket_receive(struct socket *so, struct label *socketlabel, +mac_mls_check_socket_deliver(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_mls *p, *s; @@ -2307,8 +2307,8 @@ (macop_t)mac_mls_check_proc_sched }, { MAC_CHECK_PROC_SIGNAL, (macop_t)mac_mls_check_proc_signal }, - { MAC_CHECK_SOCKET_RECEIVE, - (macop_t)mac_mls_check_socket_receive }, + { MAC_CHECK_SOCKET_DELIVER, + (macop_t)mac_mls_check_socket_deliver }, { MAC_CHECK_SOCKET_RELABEL, (macop_t)mac_mls_check_socket_relabel }, { MAC_CHECK_SOCKET_VISIBLE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#63 (text+ko) ==== @@ -654,16 +654,16 @@ } static int -mac_none_check_socket_listen(struct ucred *cred, struct vnode *vp, - struct label *socketlabel) +mac_none_check_socket_deliver(struct socket *so, struct label *socketlabel, + struct mbuf *m, struct label *mbuflabel) { return (0); } static int -mac_none_check_socket_receive(struct socket *so, struct label *socketlabel, - struct mbuf *m, struct label *mbuflabel) +mac_none_check_socket_listen(struct ucred *cred, struct vnode *vp, + struct label *socketlabel) { return (0); @@ -1066,10 +1066,10 @@ (macop_t)mac_none_check_socket_bind }, { MAC_CHECK_SOCKET_CONNECT, (macop_t)mac_none_check_socket_connect }, + { MAC_CHECK_SOCKET_DELIVER, + (macop_t)mac_none_check_socket_deliver }, { MAC_CHECK_SOCKET_LISTEN, (macop_t)mac_none_check_socket_listen }, - { MAC_CHECK_SOCKET_RECEIVE, - (macop_t)mac_none_check_socket_receive }, { MAC_CHECK_SOCKET_RELABEL, (macop_t)mac_none_check_socket_relabel }, { MAC_CHECK_SOCKET_VISIBLE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#71 (text+ko) ==== @@ -780,6 +780,15 @@ } static int +mac_te_check_socket_deliver(struct socket *so, struct label *socketlabel, + struct mbuf *m, struct label *mbuflabel) +{ + + return (mac_te_check(socketlabel, mbuflabel, MAC_TE_CLASS_MBUF, + MAC_TE_OPERATION_MBUF_RECEIVE)); +} + +static int mac_te_check_socket_listen(struct ucred *cred, struct socket *socket, struct label *socketlabel) { @@ -792,15 +801,6 @@ } static int -mac_te_check_socket_receive(struct socket *so, struct label *socketlabel, - struct mbuf *m, struct label *mbuflabel) -{ - - return (mac_te_check(socketlabel, mbuflabel, MAC_TE_CLASS_MBUF, - MAC_TE_OPERATION_MBUF_RECEIVE)); -} - -static int mac_te_check_socket_relabel(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { @@ -1781,10 +1781,10 @@ (macop_t)mac_te_check_socket_bind }, { MAC_CHECK_SOCKET_CONNECT, (macop_t)mac_te_check_socket_connect }, + { MAC_CHECK_SOCKET_DELIVER, + (macop_t)mac_te_check_socket_deliver }, { MAC_CHECK_SOCKET_LISTEN, (macop_t)mac_te_check_socket_listen }, - { MAC_CHECK_SOCKET_RECEIVE, - (macop_t)mac_te_check_socket_receive }, { MAC_CHECK_SOCKET_RELABEL, (macop_t)mac_te_check_socket_relabel }, { MAC_CHECK_SOCKET_VISIBLE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#33 (text+ko) ==== @@ -862,16 +862,16 @@ } static int -mac_test_check_socket_listen(struct ucred *cred, struct socket *socket, - struct label *socketlabel, struct sockaddr *sockaddr) +mac_test_check_socket_deliver(struct socket *socket, struct label *socketlabel, + struct mbuf *m, struct label *mbuflabel) { return (0); } static int -mac_test_check_socket_receive(struct socket *socket, struct label *socketlabel, - struct mbuf *m, struct label *mbuflabel) +mac_test_check_socket_listen(struct ucred *cred, struct socket *socket, + struct label *socketlabel, struct sockaddr *sockaddr) { return (0); @@ -1272,10 +1272,10 @@ (macop_t)mac_test_check_socket_bind }, { MAC_CHECK_SOCKET_CONNECT, (macop_t)mac_test_check_socket_connect }, + { MAC_CHECK_SOCKET_DELIVER, + (macop_t)mac_test_check_socket_deliver }, { MAC_CHECK_SOCKET_LISTEN, (macop_t)mac_test_check_socket_listen }, - { MAC_CHECK_SOCKET_RECEIVE, - (macop_t)mac_test_check_socket_receive }, { MAC_CHECK_SOCKET_RELABEL, (macop_t)mac_test_check_socket_relabel }, { MAC_CHECK_SOCKET_VISIBLE, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#148 (text+ko) ==== @@ -341,8 +341,8 @@ struct sockaddr *sockaddr); int mac_check_socket_connect(struct ucred *cred, struct socket *so, struct sockaddr *sockaddr); +int mac_check_socket_deliver(struct socket *so, struct mbuf *m); int mac_check_socket_listen(struct ucred *cred, struct socket *so); -int mac_check_socket_receive(struct socket *so, struct mbuf *m); int mac_check_socket_visible(struct ucred *cred, struct socket *so); int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int flags); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#113 (text+ko) ==== @@ -257,11 +257,11 @@ int (*mpo_check_socket_connect)(struct ucred *cred, struct socket *so, struct label *socketlabel, struct sockaddr *sockaddr); + int (*mpo_check_socket_deliver)(struct socket *so, + struct label *socketlabel, struct mbuf *m, + struct label *mbuflabel); int (*mpo_check_socket_listen)(struct ucred *cred, struct socket *so, struct label *socketlabel); - int (*mpo_check_socket_receive)(struct socket *so, - struct label *socketlabel, struct mbuf *m, - struct label *mbuflabel); int (*mpo_check_socket_relabel)(struct ucred *cred, struct socket *so, struct label *socketlabel, struct label *newlabel); @@ -428,9 +428,9 @@ MAC_CHECK_PROC_SIGNAL, MAC_CHECK_SOCKET_BIND, MAC_CHECK_SOCKET_CONNECT, + MAC_CHECK_SOCKET_DELIVER, MAC_CHECK_SOCKET_LISTEN, MAC_CHECK_SOCKET_RELABEL, - MAC_CHECK_SOCKET_RECEIVE, MAC_CHECK_SOCKET_VISIBLE, MAC_CHECK_VNODE_ACCESS, MAC_CHECK_VNODE_CHDIR, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 12 18: 5:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95F0037B401; Mon, 12 Aug 2002 18:05:48 -0700 (PDT) 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 3923D37B400 for ; Mon, 12 Aug 2002 18:05:48 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6F6443E6A for ; Mon, 12 Aug 2002 18:05:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7D15lJU055531 for ; Mon, 12 Aug 2002 18:05:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7D15l5d055528 for perforce@freebsd.org; Mon, 12 Aug 2002 18:05:47 -0700 (PDT) Date: Mon, 12 Aug 2002 18:05:47 -0700 (PDT) Message-Id: <200208130105.g7D15l5d055528@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15886 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15886 Change 15886 by rwatson@rwatson_tislabs on 2002/08/12 18:05:04 Change the default behavior when revoking a mapping from "fail not-stop" to "fail-stop". This is the expected behavior for most policies for consistency with other platforms -- we may want to investigate whether we can find a way to allow policies to express a preference on downgrade behavior. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#236 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#236 (text+ko) ==== @@ -161,7 +161,7 @@ static int mac_vnode_label_cache_misses = 0; SYSCTL_INT(_security_mac, OID_AUTO, vnode_label_cache_misses, CTLFLAG_RD, &mac_vnode_label_cache_misses, 0, "Cache misses on vnode labels"); -static int mac_mmap_revocation_via_cow = 1; +static int mac_mmap_revocation_via_cow = 0; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation_via_cow, CTLFLAG_RW, &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " "copy-on-write semantics, or by removing all write access"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 12 19:19:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F267A37B401; Mon, 12 Aug 2002 19:19:17 -0700 (PDT) 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 93AA237B400 for ; Mon, 12 Aug 2002 19:19:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 209AB43E6A for ; Mon, 12 Aug 2002 19:19:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7D2JHJU066453 for ; Mon, 12 Aug 2002 19:19:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7D2JGqi066450 for perforce@freebsd.org; Mon, 12 Aug 2002 19:19:16 -0700 (PDT) Date: Mon, 12 Aug 2002 19:19:16 -0700 (PDT) Message-Id: <200208130219.g7D2JGqi066450@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15888 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15888 Change 15888 by peter@peter_daintree on 2002/08/12 19:18:50 un-destroy IFC botch Affected files ... .. //depot/projects/ia64/sys/contrib/dev/acpica/rsirq.c#8 integrate Differences ... ==== //depot/projects/ia64/sys/contrib/dev/acpica/rsirq.c#8 (text+ko) ==== @@ -75,60 +75,57 @@ * * 3.5. Neither the name Intel nor any other trademark owned or controlled by * Intel shall be used in advertising or otherwise to promote the sale, use or - * other dealings in products derived from ; - } + * other dealings in products derived from or relating to the Covered Code + * without prior written authorization from Intel. + * + * 4. Disclaimer and Export Compliance + * + * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED + * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE + * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, + * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY + * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY + * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A + * PARTICULAR PURPOSE. + * + * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES + * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR + * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, + * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY + * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL + * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS + * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY + * LIMITED REMEDY. + * + * 4.3. Licensee shall not export, either directly or indirectly, any of this + * software or system incorporating such software without first obtaining any + * required license or other approval from the U. S. Department of Commerce or + * any other agency or department of the United States Government. In the + * event Licensee exports any such software from the United States or + * re-exports any such software from a foreign destination, Licensee shall + * ensure that the distribution and export/re-export of the software is in + * compliance with all laws, regulations, orders, or other restrictions of the + * U.S. Export Administration Regulations. Licensee agrees that neither it nor + * any of its subsidiaries will export/re-export any technical data, process, + * software, or service, directly or indirectly, to any country for which the + * United States government or any agency thereof requires an export license, + * other governmental approval, or letter of assurance, without first obtaining + * such license, approval or letter. + * + *****************************************************************************/ - Buffer += 1; - Temp16 = 0; +#define __RSIRQ_C__ - /* - * Loop through all of the interrupts and set the mask bits - */ - for(Index = 0; - Index < LinkedList->Data.Irq.NumberOfInterrupts; - Index++) - { - Temp8 = (UINT8) LinkedList->Data.Irq.Interrupts[Index]; - Temp16 |= 0x1 << Temp8; - } +#include "acpi.h" +#include "acresrc.h" - ACPI_MOVE_UNALIGNED16_TO_16 (Buffer, &Temp16); - Buffer += 2; - - /* - * Set the IRQ Info byte if needed. - */ - if (IRQInfoByteNeeded) - { - Temp8 = 0; - Temp8 = (UINT8) ((LinkedList->Data.Irq.SharedExclusive & - 0x01) << 4); - - if (ACPI_LEVEL_SENSITIVE == LinkedList->Data.Irq.EdgeLevel && - ACPI_ACTIVE_LOW == LinkedList->Data.Irq.ActiveHighLow) - { - Temp8 |= 0x08; - } - else - { - Temp8 |= 0x01; - } - - *Buffer = Temp8; - Buffer += 1; - } - - /* - * Return the number of bytes consumed in this operation - */ - *BytesConsumed = ACPI_PTR_DIFF (Buffer, *OutputBuffer); - return_ACPI_STATUS (AE_OK); -} +#define _COMPONENT ACPI_RESOURCES + ACPI_MODULE_NAME ("rsirq") /******************************************************************************* * - * FUNCTION: AcpiRsExtendedIrqResource + * FUNCTION: AcpiRsIrqResource * * PARAMETERS: ByteStreamBuffer - Pointer to the resource input byte * stream @@ -148,7 +145,7 @@ ******************************************************************************/ ACPI_STATUS -AcpiRsExtendedIrqResource ( +AcpiRsIrqResource ( UINT8 *ByteStreamBuffer, ACPI_SIZE *BytesConsumed, UINT8 **OutputBuffer, @@ -158,68 +155,16 @@ ACPI_RESOURCE *OutputStruct = (void *) *OutputBuffer; UINT16 Temp16 = 0; UINT8 Temp8 = 0; - UINT8 *TempPtr; UINT8 Index; - ACPI_SIZE StructSize = ACPI_SIZEOF_RESOURCE (ACPI_RESOURCE_EXT_IRQ); + UINT8 i; + ACPI_SIZE StructSize = ACPI_SIZEOF_RESOURCE (ACPI_RESOURCE_IRQ); - ACPI_FUNCTION_TRACE ("RsExtendedIrqResource"); + ACPI_FUNCTION_TRACE ("RsIrqResource"); /* - * Point past the Descriptor to get the number of bytes consumed - */ - Buffer += 1; - ACPI_MOVE_UNALIGNED16_TO_16 (&Temp16, Buffer); - - *BytesConsumed = Temp16 + 3; - OutputStruct->Id = ACPI_RSTYPE_EXT_IRQ; - - /* - * Point to the Byte3 - */ - Buffer += 2; - Temp8 = *Buffer; - - OutputStruct->Data.ExtendedIrq.ProducerConsumer = Temp8 & 0x01; - - /* - * Check for Interrupt Mode - * - * The definition of an Extended IRQ changed between ACPI spec v1.0b - * and ACPI spec 2.0 (section 6.4.3.6 in both). - * - * - Edge/Level are defined opposite in the table vs the headers - */ - OutputStruct->Data.ExtendedIrq.EdgeLevel = - (Temp8 & 0x2) ? ACPI_EDGE_SENSITIVE : ACPI_LEVEL_SENSITIVE; - - /* - * Check Interrupt Polarity - */ - OutputStruct->Data.ExtendedIrq.ActiveHighLow = (Temp8 >> 2) & 0x1; - - /* - * Check for sharable - */ - OutputStruct->Data.ExtendedIrq.SharedExclusive = (Temp8 >> 3) & 0x01; - - /* - * Point to Byte4 (IRQ Table length) - */ - Buffer += 1; - Temp8 = *Buffer; - - OutputStruct->Data.ExtendedIrq.NumberOfInterrupts = Temp8; - - /* - * Add any additional structure size to properly calculate - * the next pointer at the end of this function - */ - StructSize += (Temp8 - 1) * 4; - - /* - * Point to Byte5 (First IRed are contained in the descriptor + * The number of bytes consumed are contained in the descriptor * (Bits:0-1) */ Temp8 = *Buffer; @@ -654,35 +599,73 @@ * Set the Interrupt Mode * * The definition of an Extended IRQ changed between ACPI spec v1.0b - * and ACPI spec 2.0 (section 6.4.3.6 from or relating to the Covered Code - * without prior written authorization from Intel. - * - * 4. Disclaimer and Export Compliance - * - * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED - * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE - * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, - * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY - * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY - * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A - * PARTICULAR PURPOSE. - * - * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES - * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR - * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, - * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY - * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL - * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS - * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY - * LIMITED REMEDY. - * - * 4.3. Licensee shall not export, either directly or indirectly, any of this - * software or system incorporating such software without first obtaining any - * required license or other approval from the U. S. Department of Commerce or - * any other agency or department of the United States Government. In the - * event Licensee exports any such software from the United States or - * re-exports any such software from a foreign destination, Licensee shall - * ensure that the distribution and export/re-export of the software is in - * compliance with all laws, regulations, orders, or other restrictions of the - * U.S. Export Administration Regulations. Licensee agrees that neither it nor - *+ * and ACPI spec 2.0 (section 6.4.3.6 in both). This code does not + * implement the more restrictive definition of 1.0b + * + * - Edge/Level are defined opposite in the table vs the headers + */ + if (ACPI_EDGE_SENSITIVE == LinkedList->Data.ExtendedIrq.EdgeLevel) + { + Temp8 |= 0x2; + } + + /* + * Set the Interrupt Polarity + */ + Temp8 |= ((LinkedList->Data.ExtendedIrq.ActiveHighLow & 0x1) << 2); + + *Buffer = Temp8; + Buffer += 1; + + /* + * Set the Interrupt table length + */ + Temp8 = (UINT8) LinkedList->Data.ExtendedIrq.NumberOfInterrupts; + + *Buffer = Temp8; + Buffer += 1; + + for (Index = 0; Index < LinkedList->Data.ExtendedIrq.NumberOfInterrupts; + Index++) + { + ACPI_MOVE_UNALIGNED32_TO_32 (Buffer, + &LinkedList->Data.ExtendedIrq.Interrupts[Index]); + Buffer += 4; + } + + /* + * Resource Source Index and Resource Source are optional + */ + if (0 != LinkedList->Data.ExtendedIrq.ResourceSource.StringLength) + { + *Buffer = (UINT8) LinkedList->Data.ExtendedIrq.ResourceSource.Index; + Buffer += 1; + + TempPointer = (NATIVE_CHAR *) Buffer; + + /* + * Copy the string + */ + ACPI_STRCPY (TempPointer, + LinkedList->Data.ExtendedIrq.ResourceSource.StringPtr); + + /* + * Buffer needs to be set to the length of the sting + one for the + * terminating null + */ + Buffer += (ACPI_STRLEN (LinkedList->Data.ExtendedIrq.ResourceSource.StringPtr) + 1); + } + + /* + * Return the number of bytes consumed in this operation + */ + *BytesConsumed = ACPI_PTR_DIFF (Buffer, *OutputBuffer); + + /* + * Set the length field to the number of bytes consumed + * minus the header size (3 bytes) + */ + *LengthField = (UINT16) (*BytesConsumed - 3); + return_ACPI_STATUS (AE_OK); +} + To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 12 19:23:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 995DA37B401; Mon, 12 Aug 2002 19:23:23 -0700 (PDT) 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 3B0FC37B400 for ; Mon, 12 Aug 2002 19:23:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A881043E81 for ; Mon, 12 Aug 2002 19:23:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7D2NMJU067104 for ; Mon, 12 Aug 2002 19:23:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7D2NMkD067101 for perforce@freebsd.org; Mon, 12 Aug 2002 19:23:22 -0700 (PDT) Date: Mon, 12 Aug 2002 19:23:22 -0700 (PDT) Message-Id: <200208130223.g7D2NMkD067101@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15889 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15889 Change 15889 by peter@peter_daintree on 2002/08/12 19:23:06 un-fubar this file too Affected files ... .. //depot/projects/ia64/crypto/openssl/ssl/s3_enc.c#4 integrate Differences ... ==== //depot/projects/ia64/crypto/openssl/ssl/s3_enc.c#4 (text+ko) ==== @@ -528,212 +528,143 @@ EVP_DigestUpdate(&ctx,ssl3_pad_1,npad); EVP_DigestFinal(&ctx,md_buf,&i); -d); + EVP_DigestInit(&ctx,EVP_MD_CTX_md(&ctx)); + EVP_DigestUpdate(&ctx,s->session->master_key, + s->session->master_key_length); + EVP_DigestUpdate(&ctx,ssl3_pad_2,npad); + EVP_DigestUpdate(&ctx,md_buf,i); + EVP_DigestFinal(&ctx,p,&ret); - s->state=SSL3_ST_CW_KEY_EXCH_B; - /* number of bytes to write */ - s->init_num=n+4; - s->init_off=0; - } + memset(&ctx,0,sizeof(EVP_MD_CTX)); - /* SSL3_ST_CW_KEY_EXCH_B */ - return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); -err: - return(-1); + return((int)ret); } -static int ssl3_send_client_verify(SSL *s) +int ssl3_mac(SSL *ssl, unsigned char *md, int send) { - unsigned char *p,*d; - unsigned char data[MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH]; - EVP_PKEY *pkey; -#ifndef NO_RSA - unsigned u=0; -#endif - unsigned long n; -#ifndef NO_DSA - int j; -#endif + SSL3_RECORD *rec; + unsigned char *mac_sec,*seq; + EVP_MD_CTX md_ctx; + const EVP_MD *hash; + unsigned char *p,rec_char; + unsigned int md_size; + int npad,i; - if (s->state == SSL3_ST_CW_CERT_VRFY_A) + if (send) { - d=(unsigned char *)s->init_buf->data; - p= &(d[4]); - pkey=s->cert->key->privatekey; - - s->method->ssl3_enc->cert_verify_mac(s,&(s->s3->finish_dgst2), - &(data[MD5_DIGEST_LENGTH])); - -#ifndef NO_RSA - if (pkey->type == EVP_PKEY_RSA) - { - s->method->ssl3_enc->cert_verify_mac(s, - &(s->s3->finish_dgst1),&(data[0])); - if (RSA_sign(NID_md5_sha1, data, - MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH, - &(p[2]), &u, pkey->pkey.rsa) <= 0 ) - { - SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_RSA_LIB); - goto err; - } - s2n(u,p); - n=u+2; - } - else -#endif -#ifndef NO_DSA - if (pkey->type == EVP_PKEY_DSA) - { - if (!DSA_sign(pkey->save_type, - &(data[MD5_DIGEST_LENGTH]), - SHA_DIGEST_LENGTH,&(p[2]), - (unsigned int *)&j,pkey->pkey.dsa)) - { - SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,ERR_R_DSA_LIB); - goto err; - } - s2n(j,p); - n=j+2; - } - else -#endif - { - SSLerr(SSL_F_SSL3_SEND_CLIENT_VERIFY,SSL_R_INTERNAL_ERROR); - goto err; - } - *(d++)=SSL3_MT_CERTIFICATE_VERIFY; - l2n3(n,d); - - s->init_num=(int)n+4; - s->init_off=0; + rec= &(ssl->s3->wrec); + mac_sec= &(ssl->s3->write_mac_secret[0]); + seq= &(ssl->s3->write_sequence[0]); + hash=ssl->write_hash; } - return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); -err: - return(-1); - } - -static int ssl3_send_client_certificate(SSL *s) - { - X509 *x509=NULL; - EVP_PKEY *pkey=NULL; - int i; - unsigned long l; - - if (s->state == SSL3_ST_CW_CERT_A) + else { - if ((s->cert == NULL) || - (s->cert->key->x509 == NULL) || - (s->cert->key->privatekey == NULL)) - s->state=SSL3_ST_CW_CERT_B; - else - s->state=SSL3_ST_CW_CERT_C; + rec= &(ssl->s3->rrec); + mac_sec= &(ssl->s3->read_mac_secret[0]); + seq= &(ssl->s3->read_sequence[0]); + hash=ssl->read_hash; } - /* We need to get a client cert */ - if (s->state == SSL3_ST_CW_CERT_B) - { - /* If we get an error, we need to - * ssl->rwstate=SSL_X509_LOOKUP; return(-1); - * We then get retied later */ - i=0; - if (s->ctx->client_cert_cb != NULL) - i=s->ctx->client_cert_cb(s,&(x509),&(pkey)); - if (i < 0) - { - s->rwstate=SSL_X509_LOOKUP; - return(-1); - } - s->rwstate=SSL_NOTHING; - if ((i == 1) && (pkey != NULL) && (x509 != NULL)) - { - s->state=SSL3_ST_CW_CERT_B; - if ( !SSL_use_certificate(s,x509) || - !SSL_use_PrivateKey(s,pkey)) - i=0; - } - else if (i == 1) - { - i=0; - SSLerr(SSL_F_SSL3_SEND_CLIENT_CERTIFICATE,SSL_R_BAD_DATA_RETURNED_BY_CALLBACK); - } + md_size=EVP_MD_size(hash); + npad=(48/md_size)*md_size; + + /* Chop the digest off the end :-) */ - if (x509 != NULL) X509_free(x509); - if (pkey != NULL) EVP_PKEY_free(pkey); - if (i == 0) - { - if (s->version == SSL3_VERSION) - { - s->s3->tmp.cert_req=0; - ssl3_send_alert(s,SSL3_AL_WARNING,SSL_AD_NO_CERTIFICATE); - return(1); - } - else - { - s->s3->tmp.cert_req=2; - } - } + EVP_DigestInit( &md_ctx,hash); + EVP_DigestUpdate(&md_ctx,mac_sec,md_size); + EVP_DigestUpdate(&md_ctx,ssl3_pad_1,npad); + EVP_DigestUpdate(&md_ctx,seq,8); + rec_char=rec->type; + EVP_DigestUpdate(&md_ctx,&rec_char,1); + p=md; + s2n(rec->length,p); + EVP_DigestUpdate(&md_ctx,md,2); + EVP_DigestUpdate(&md_ctx,rec->input,rec->length); + EVP_DigestFinal( &md_ctx,md,NULL); - /* Ok, we have a cert */ - s->state=SSL3_ST_CW_CERT_C; - } + EVP_DigestInit( &md_ctx,hash); + EVP_DigestUpdate(&md_ctx,mac_sec,md_size); + EVP_DigestUpdate(&md_ctx,ssl3_pad_2,npad); + EVP_DigestUpdate(&md_ctx,md,md_size); + EVP_DigestFinal( &md_ctx,md,&md_size); - if (s->state == SSL3_ST_CW_CERT_C) + for (i=7; i>=0; i--) { - s->state=SSL3_ST_CW_CERT_D; - l=ssl3_output_cert_chain(s, - (s->s3->tmp.cert_req == 2)?NULL:s->cert->key->x509); - s->init_num=(int)l; - s->init_off=0; + ++seq[i]; + if (seq[i] != 0) break; } - /* SSL3_ST_CW_CERT_D */ - return(ssl3_do_write(s,SSL3_RT_HANDSHAKE)); + + return(md_size); } -#define has_bits(i,m) (((i)&(m)) == (m)) - -static int ssl3_check_cert_and_algorithm(SSL *s) +int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p, + int len) { - int i,idx; - long algs; - EVP_PKEY *pkey=NULL; - SESS_CERT *sc; -#ifndef NO_RSA - RSA *rsa; + static const unsigned char *salt[3]={ +#ifndef CHARSET_EBCDIC + (const unsigned char *)"A", + (const unsigned char *)"BB", + (const unsigned char *)"CCC", +#else + (const unsigned char *)"\x41", + (const unsigned char *)"\x42\x42", + (const unsigned char *)"\x43\x43\x43", #endif -#ifndef NO_DH - DH *dh; -#endif + }; + unsigned char buf[EVP_MAX_MD_SIZE]; + EVP_MD_CTX ctx; + int i,ret=0; + unsigned int n; - sc=s->session->sess_cert; + for (i=0; i<3; i++) + { + EVP_DigestInit(&ctx,s->ctx->sha1); + EVP_DigestUpdate(&ctx,salt[i],strlen((const char *)salt[i])); + EVP_DigestUpdate(&ctx,p,len); + EVP_DigestUpdate(&ctx,&(s->s3->client_random[0]), + SSL3_RANDOM_SIZE); + EVP_DigestUpdate(&ctx,&(s->s3->server_random[0]), + SSL3_RANDOM_SIZE); + EVP_DigestFinal(&ctx,buf,&n); - if (sc == NULL) - { - SSLerr(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM,SSL_R_INTERNAL_ERROR); - goto err; + EVP_DigestInit(&ctx,s->ctx->md5); + EVP_DigestUpdate(&ctx,p,len); + EVP_DigestUpdate(&ctx,buf,n); + EVP_DigestFinal(&ctx,out,&n); + out+=n; + ret+=n; } + return(ret); + } - algs=s->s3->tmp.new_cipher->algorithms; - - /* we don't have a certificate */ - if (algs & (SSL_aDH|SSL_aNULL)) - return(1); - -#ifndef NO_RSA - rsa=s->session->sess_cert->peer_rsa_tmp; -#endif -#ifndef NO_DH - dh=s->session->sess_cert->peer_dh_tmp; -#endif - - /* This is the passed certificate */ - - idx=sc->peer_cert_type; - pkey=X509_get_pubkey(sc->peer_pkeys[idx].x509); - i=X509_certificate_type(sc->peer_pkeys[idx].x509,pkey); - EVP_PKEY_free(pkey); - - - /* Check that we have a certificate SSL_AD_NO_RENEGOTIATION: return(-1); /* Don't send it :-) */ +int ssl3_alert_code(int code) + { + switch (code) + { + case SSL_AD_CLOSE_NOTIFY: return(SSL3_AD_CLOSE_NOTIFY); + case SSL_AD_UNEXPECTED_MESSAGE: return(SSL3_AD_UNEXPECTED_MESSAGE); + case SSL_AD_BAD_RECORD_MAC: return(SSL3_AD_BAD_RECORD_MAC); + case SSL_AD_DECRYPTION_FAILED: return(SSL3_AD_BAD_RECORD_MAC); + case SSL_AD_RECORD_OVERFLOW: return(SSL3_AD_BAD_RECORD_MAC); + case SSL_AD_DECOMPRESSION_FAILURE:return(SSL3_AD_DECOMPRESSION_FAILURE); + case SSL_AD_HANDSHAKE_FAILURE: return(SSL3_AD_HANDSHAKE_FAILURE); + case SSL_AD_NO_CERTIFICATE: return(SSL3_AD_NO_CERTIFICATE); + case SSL_AD_BAD_CERTIFICATE: return(SSL3_AD_BAD_CERTIFICATE); + case SSL_AD_UNSUPPORTED_CERTIFICATE:return(SSL3_AD_UNSUPPORTED_CERTIFICATE); + case SSL_AD_CERTIFICATE_REVOKED:return(SSL3_AD_CERTIFICATE_REVOKED); + case SSL_AD_CERTIFICATE_EXPIRED:return(SSL3_AD_CERTIFICATE_EXPIRED); + case SSL_AD_CERTIFICATE_UNKNOWN:return(SSL3_AD_CERTIFICATE_UNKNOWN); + case SSL_AD_ILLEGAL_PARAMETER: return(SSL3_AD_ILLEGAL_PARAMETER); + case SSL_AD_UNKNOWN_CA: return(SSL3_AD_BAD_CERTIFICATE); + case SSL_AD_ACCESS_DENIED: return(SSL3_AD_HANDSHAKE_FAILURE); + case SSL_AD_DECODE_ERROR: return(SSL3_AD_HANDSHAKE_FAILURE); + case SSL_AD_DECRYPT_ERROR: return(SSL3_AD_HANDSHAKE_FAILURE); + case SSL_AD_EXPORT_RESTRICTION: return(SSL3_AD_HANDSHAKE_FAILURE); + case SSL_AD_PROTOCOL_VERSION: return(SSL3_AD_HANDSHAKE_FAILURE); + case SSL_AD_INSUFFICIENT_SECURITY:return(SSL3_AD_HANDSHAKE_FAILURE); + case SSL_AD_INTERNAL_ERROR: return(SSL3_AD_HANDSHAKE_FAILURE); + case SSL_AD_USER_CANCELLED: return(SSL3_AD_HANDSHAKE_FAILURE); + case SSL_AD_NO_RENEGOTIATION: return(-1); /* Don't send it :-) */ default: return(-1); } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 12 19:25:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 686D137B401; Mon, 12 Aug 2002 19:25:26 -0700 (PDT) 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 0B49537B400 for ; Mon, 12 Aug 2002 19:25:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C010A43E77 for ; Mon, 12 Aug 2002 19:25:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7D2PPJU067312 for ; Mon, 12 Aug 2002 19:25:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7D2PPJ3067309 for perforce@freebsd.org; Mon, 12 Aug 2002 19:25:25 -0700 (PDT) Date: Mon, 12 Aug 2002 19:25:25 -0700 (PDT) Message-Id: <200208130225.g7D2PPJ3067309@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15890 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15890 Change 15890 by peter@peter_daintree on 2002/08/12 19:25:05 revert to vendor (committed in main tree, but this is almost obsolete now that the real problem is understood) Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#43 integrate Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#43 (text+ko) ==== @@ -570,15 +570,6 @@ if (mdp->Type != EfiConventionalMemory) continue; - if (pfn0 >= ia64_btop(0x100000000UL)) { - printf("skipping memory chunk start 0x%lx\n", mdp->PhysicalStart); - continue; - } - if (pfn1 >= ia64_btop(0x100000000UL)) { - printf("skipping memory chunk end 0x%lx\n", mdp->PhysicalStart + mdp->NumberOfPages * 4096); - continue; - } - /* * Wimp out for now since we do not DTRT here with * pci bus mastering (no bounce buffering, for example). To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 12 19:27:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84DEC37B401; Mon, 12 Aug 2002 19:26:28 -0700 (PDT) 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 20B3A37B400 for ; Mon, 12 Aug 2002 19:26:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91D9943E4A for ; Mon, 12 Aug 2002 19:26:27 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7D2QRJU067428 for ; Mon, 12 Aug 2002 19:26:27 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7D2QRpH067425 for perforce@freebsd.org; Mon, 12 Aug 2002 19:26:27 -0700 (PDT) Date: Mon, 12 Aug 2002 19:26:27 -0700 (PDT) Message-Id: <200208130226.g7D2QRpH067425@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15891 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15891 Change 15891 by peter@peter_daintree on 2002/08/12 19:26:09 un-fubar Affected files ... .. //depot/projects/ia64/sys/netinet/tcp_subr.c#18 integrate Differences ... ==== //depot/projects/ia64/sys/netinet/tcp_subr.c#18 (text+ko) ==== @@ -743,157 +743,178 @@ } inp->inp_ppcb = NULL; soisdisconnected(so); -#c = IPV6_VERSION; - ip6->ip6_nxt = IPPROTO_TCP; - ip6->ip6_plen = htons((u_short)(sizeof (struct tcphdr) + - tlen)); - tlen += sizeof (struct ip6_hdr) + sizeof (struct tcphdr); - } else -#endif - { - tlen += sizeof (struct tcpiphdr); - ip->ip_len = tlen; - ip->ip_ttl = ip_defttl; - } - m->m_len = tlen; - m->m_pkthdr.len = tlen; - m->m_pkthdr.rcvif = (struct ifnet *) 0; - nth->th_seq = htonl(seq); - nth->th_ack = htonl(ack); - nth->th_x2 = 0; - nth->th_off = sizeof (struct tcphdr) >> 2; - nth->th_flags = flags; - if (tp) - nth->th_win = htons((u_short) (win >> tp->rcv_scale)); +#ifdef INET6 + if (INP_CHECK_SOCKAF(so, AF_INET6)) + in6_pcbdetach(inp); else - nth->th_win = htons((u_short)win); - nth->th_urp = 0; -#ifdef INET6 - if (isipv6) { - nth->th_sum = 0; - nth->th_sum = in6_cksum(m, IPPROTO_TCP, - sizeof(struct ip6_hdr), - tlen - sizeof(struct ip6_hdr)); - ip6->ip6_hlim = in6_selecthlim(tp ? tp->t_inpcb : NULL, - ro6 && ro6->ro_rt ? - ro6->ro_rt->rt_ifp : - NULL); - } else #endif /* INET6 */ - { - nth->th_sum = in_pseudo(ip->ip_src.s_addr, ip->ip_dst.s_addr, - htons((u_short)(tlen - sizeof(struct ip) + ip->ip_p))); - m->m_pkthdr.csum_flags = CSUM_TCP; - m->m_pkthdr.csum_data = offsetof(struct tcphdr, th_sum); - } -#ifdef TCPDEBUG - if (tp == NULL || (tp->t_inpcb->inp_socket->so_options & SO_DEBUG)) - tcp_trace(TA_OUTPUT, 0, tp, mtod(m, void *), th, 0); -#endif -#ifdef IPSEC - if (ipsec_setsocket(m, tp ? tp->t_inpcb->inp_socket : NULL) != 0) { - m_freem(m); - return; - } -#endif -#ifdef INET6 - if (isipv6) { - (void)ip6_output(m, NULL, ro6, ipflags, NULL, NULL); - if (ro6 == &sro6 && ro6->ro_rt) { - RTFREE(ro6->ro_rt); - ro6->ro_rt = NULL; + in_pcbdetach(inp); + tcpstat.tcps_closed++; + return ((struct tcpcb *)0); +} + +void +tcp_drain() +{ + if (do_tcpdrain) + { + struct inpcb *inpb; + struct tcpcb *tcpb; + struct tseg_qent *te; + + /* + * Walk the tcpbs, if existing, and flush the reassembly queue, + * if there is one... + * XXX: The "Net/3" implementation doesn't imply that the TCP + * reassembly queue should be flushed, but in a situation + * where we're really low on mbufs, this is potentially + * usefull. + */ + INP_INFO_RLOCK(&tcbinfo); + LIST_FOREACH(inpb, tcbinfo.listhead, inp_list) { + INP_LOCK(inpb); + if ((tcpb = intotcpcb(inpb))) { + while ((te = LIST_FIRST(&tcpb->t_segq)) + != NULL) { + LIST_REMOVE(te, tqe_q); + m_freem(te->tqe_m); + FREE(te, M_TSEGQ); + } + } + INP_UNLOCK(inpb); } - } else -#endif /* INET6 */ - { - (void) ip_output(m, NULL, ro, ipflags, NULL); - if (ro == &sro && ro->ro_rt) { - RTFREE(ro->ro_rt); - ro->ro_rt = NULL; + INP_INFO_RUNLOCK(&tcbinfo); } - } } /* - * Create a new TCP control block, making an - * empty reassembly queue and hooking it to the argument - * protocol control block. The `inp' parameter must have - * come from the zone allocator set up in tcp_init(). + * Notify a tcp user of an asynchronous error; + * store error as soft error, but wake up user + * (for now, won't do anything until can select for soft error). + * + * Do not wake up user since there currently is no mechanism for + * reporting soft errors (yet - a kqueue filter may be added). */ -struct tcpcb * -tcp_newtcpcb(inp) +static struct inpcb * +tcp_notify(inp, error) struct inpcb *inp; + int error; { - struct inp_tp *it; - register struct tcpcb *tp; -#ifdef INET6 - int isipv6 = (inp->inp_vflag & INP_IPV6) != 0; -#endif /* INET6 */ + struct tcpcb *tp = (struct tcpcb *)inp->inp_ppcb; - it = (struct inp_tp *)inp; - tp = &it->tcb; - bzero((char *) tp, sizeof(struct tcpcb)); - LIST_INIT(&tp->t_segq); - tp->t_maxseg = tp->t_maxopd = -#ifdef INET6 - isipv6 ? tcp_v6mssdflt : -#endif /* INET6 */ - tcp_mssdflt; + /* + * Ignore some errors if we are hooked up. + * If connection hasn't completed, has retransmitted several times, + * and receives a second error, give up now. This is better + * than waiting a long time to establish a connection that + * can never complete. + */ + if (tp->t_state == TCPS_ESTABLISHED && + (error == EHOSTUNREACH || error == ENETUNREACH || + error == EHOSTDOWN)) { + return inp; + } else if (tp->t_state < TCPS_ESTABLISHED && tp->t_rxtshift > 3 && + tp->t_softerror) { + tcp_drop(tp, error); + return (struct inpcb *)0; + } else { + tp->t_softerror = error; + return inp; + } +#if 0 + wakeup((caddr_t) &so->so_timeo); + sorwakeup(so); + sowwakeup(so); +#endif +} - /* Set up our timeouts. */ - callout_init(tp->tt_rexmt = &it->inp_tp_rexmt, 0); - callout_init(tp->tt_persist = &it->inp_tp_persist, 0); - callout_init(tp->tt_keep = &it->inp_tp_keep, 0); - callout_init(tp->tt_2msl = &it->inp_tp_2msl, 0); - callout_init(tp->tt_delack = &it->inp_tp_delack, 0); +static int +tcp_pcblist(SYSCTL_HANDLER_ARGS) +{ + int error, i, n, s; + struct inpcb *inp, **inp_list; + inp_gen_t gencnt; + struct xinpgen xig; - if (tcp_do_rfc1323) - tp->t_flags = (TF_REQ_SCALE|TF_REQ_TSTMP); - if (tcp_do_rfc1644) - tp->t_flags |= TF_REQ_CC; - tp->t_inpcb = inp; /* XXX */ /* - * Init srtt to TCPTV_SRTTBASE (0), so we can tell that we have no - * rtt estimate. Set rttvar so that srtt + 4 * rttvar gives - * reasonable initial retransmit time. + * The process of preparing the TCB list is too time-consuming and + * resource-intensive to repeat twice on every request. */ - tp->t_srtt = TCPTV_SRTTBASE; - tp->t_rttvar = ((TCPTV_RTOBASE - TCPTV_SRTTBASE) << TCP_RTTVAR_SHIFT) / 4; - tp->t_rttmin = tcp_rexmit_min; - tp->t_rxtcur = TCPTV_RTOBASE; - tp->snd_cwnd = TCP_MAXWIN << TCP_MAX_WINSHIFT; - tp->snd_ssthresh = TCP_MAXWIN << TCP_MAX_WINSHIFT; - tp->t_rcvtime = ticks; - /* - * IPv4 TTL initialization is necessary for an IPv6 socket as well, - * because the socket may be bound to an IPv6 wildcard address, - * which may match an IPv4-mapped IPv6 address. + if (req->oldptr == 0) { + n = tcbinfo.ipi_count; + req->oldidx = 2 * (sizeof xig) + + (n + n/8) * sizeof(struct xtcpcb); + return 0; + } + + if (req->newptr != 0) + return EPERM; + + /* + * OK, now we're committed to doing something. */ - inp->inp_ip_ttl = ip_defttl; - inp->inp_ppcb = (caddr_t)tp; - return (tp); /* XXX */ -} + s = splnet(); + INP_INFO_RLOCK(&tcbinfo); + gencnt = tcbinfo.ipi_gencnt; + n = tcbinfo.ipi_count; + INP_INFO_RUNLOCK(&tcbinfo); + splx(s); + + sysctl_wire_old_buffer(req, 2 * (sizeof xig) + + n * sizeof(struct xtcpcb)); + + xig.xig_len = sizeof xig; + xig.xig_count = n; + xig.xig_gen = gencnt; + xig.xig_sogen = so_gencnt; + error = SYSCTL_OUT(req, &xig, sizeof xig); + if (error) + return error; -/* - * Drop a TCP connection, reporting - * the specified error. If connection is synchronized, - * then send a RST to peer. - */ -struct tcpcb * -tcp_drop(tp, errno) - register struct tcpcb *tp; - int errno; -{ - struct socket *so = tp->t_inpcb->inp_socket; + inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK); + if (inp_list == 0) + return ENOMEM; + + s = splnet(); + INP_INFO_RLOCK(&tcbinfo); + for (inp = LIST_FIRST(tcbinfo.listhead), i = 0; inp && i < n; + inp = LIST_NEXT(inp, inp_list)) { + INP_LOCK(inp); + if (inp->inp_gencnt <= gencnt && + cr_canseesocket(req->td->td_ucred, inp->inp_socket) == 0) + inp_list[i++] = inp; + INP_UNLOCK(inp); + } + INP_INFO_RUNLOCK(&tcbinfo); + splx(s); + n = i; - if (TCPS_HAVERCVDSYN(tp->t_state)) { - tp->t_state = TCPS_CLOSED; - (void) tcp_output(tp); - tcpstat.tcps_drops++; - } else - tcpstat.tcps_conndrops++; - if (errno == ETIMEDOUT && tp->t_softerror) - errno = nows that something happened + error = 0; + for (i = 0; i < n; i++) { + inp = inp_list[i]; + INP_LOCK(inp); + if (inp->inp_gencnt <= gencnt) { + struct xtcpcb xt; + caddr_t inp_ppcb; + xt.xt_len = sizeof xt; + /* XXX should avoid extra copy */ + bcopy(inp, &xt.xt_inp, sizeof *inp); + inp_ppcb = inp->inp_ppcb; + if (inp_ppcb != NULL) + bcopy(inp_ppcb, &xt.xt_tp, sizeof xt.xt_tp); + else + bzero((char *) &xt.xt_tp, sizeof xt.xt_tp); + if (inp->inp_socket) + sotoxsocket(inp->inp_socket, &xt.xt_socket); + error = SYSCTL_OUT(req, &xt, sizeof xt); + } + INP_UNLOCK(inp); + } + if (!error) { + /* + * Give the user an updated idea of our state. + * If the generation differs from what we told + * her before, she knows that something happened * while we were processing this request, and it * might be necessary to retry. */ @@ -1369,127 +1390,144 @@ tcpstat.tcps_mturesent++; tp->t_rtttime = 0; - tof(mss)); - optlen = TCPOLEN_MAXSEG; + tp->snd_nxt = tp->snd_una; + tcp_output(tp); + } + return inp; +} + +/* + * Look-up the routing entry to the peer of this inpcb. If no route + * is found and it cannot be allocated the return NULL. This routine + * is called by TCP routines that access the rmx structure and by tcp_mss + * to get the interface MTU. + */ +struct rtentry * +tcp_rtlookup(inc) + struct in_conninfo *inc; +{ + struct route *ro; + struct rtentry *rt; - if ((tp->t_flags & TF_REQ_SCALE) && - ((flags & TH_ACK) == 0 || - (tp->t_flags & TF_RCVD_SCALE))) { - *((u_int32_t *)(opt + optlen)) = htonl( - TCPOPT_NOP << 24 | - TCPOPT_WINDOW << 16 | - TCPOLEN_WINDOW << 8 | - tp->request_r_scale); - optlen += 4; - } + ro = &inc->inc_route; + rt = ro->ro_rt; + if (rt == NULL || !(rt->rt_flags & RTF_UP)) { + /* No route yet, so try to acquire one */ + if (inc->inc_faddr.s_addr != INADDR_ANY) { + ro->ro_dst.sa_family = AF_INET; + ro->ro_dst.sa_len = sizeof(struct sockaddr_in); + ((struct sockaddr_in *) &ro->ro_dst)->sin_addr = + inc->inc_faddr; + rtalloc(ro); + rt = ro->ro_rt; } - } + } + return rt; +} - /* - * Send a timestamp and echo-reply if this is a SYN and our side - * wants to use timestamps (TF_REQ_TSTMP is set) or both our side - * and our peer have sent timestamps in our SYN's. - */ - if ((tp->t_flags & (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP && - (flags & TH_RST) == 0 && - ((flags & TH_ACK) == 0 || - (tp->t_flags & TF_RCVD_TSTMP))) { - u_int32_t *lp = (u_int32_t *)(opt + optlen); +#ifdef INET6 +struct rtentry * +tcp_rtlookup6(inc) + struct in_conninfo *inc; +{ + struct route_in6 *ro6; + struct rtentry *rt; - /* Form timestamp option as shown in appendix A of RFC 1323. */ - *lp++ = htonl(TCPOPT_TSTAMP_HDR); - *lp++ = htonl(ticks); - *lp = htonl(tp->ts_recent); - optlen += TCPOLEN_TSTAMP_APPA; - } + ro6 = &inc->inc6_route; + rt = ro6->ro_rt; + if (rt == NULL || !(rt->rt_flags & RTF_UP)) { + /* No route yet, so try to acquire one */ + if (!IN6_IS_ADDR_UNSPECIFIED(&inc->inc6_faddr)) { + ro6->ro_dst.sin6_family = AF_INET6; + ro6->ro_dst.sin6_len = sizeof(struct sockaddr_in6); + ro6->ro_dst.sin6_addr = inc->inc6_faddr; + rtalloc((struct route *)ro6); + rt = ro6->ro_rt; + } + } + return rt; +} +#endif /* INET6 */ - /* - * Send `CC-family' options if our side wants to use them (TF_REQ_CC), - * options are allowed (!TF_NOOPT) and it's not a RST. - */ - if ((tp->t_flags & (TF_REQ_CC|TF_NOOPT)) == TF_REQ_CC && - (flags & TH_RST) == 0) { - switch (flags & (TH_SYN|TH_ACK)) { - /* - * This is a normal ACK, send CC if we received CC before - * from our peer. - */ - case TH_ACK: - if (!(tp->t_flags & TF_RCVD_CC)) - break; - /*FALLTHROUGH*/ +#ifdef IPSEC +/* compute ESP/AH header size for TCP, including outer IP header. */ +size_t +ipsec_hdrsiz_tcp(tp) + struct tcpcb *tp; +{ + struct inpcb *inp; + struct mbuf *m; + size_t hdrsiz; + struct ip *ip; +#ifdef INET6 + struct ip6_hdr *ip6; +#endif /* INET6 */ + struct tcphdr *th; - /* - * We can only get here in T/TCP's SYN_SENT* state, when - * we're a sending a non-SYN segment without waiting for - * the ACK of our SYN. A check above assures that we only - * do this if our peer understands T/TCP. - */ - case 0: - opt[optlen++] = TCPOPT_NOP; - opt[optlen++] = TCPOPT_NOP; - opt[optlen++] = TCPOPT_CC; - opt[optlen++] = TCPOLEN_CC; - *(u_int32_t *)&opt[optlen] = htonl(tp->cc_send); + if ((tp == NULL) || ((inp = tp->t_inpcb) == NULL)) + return 0; + MGETHDR(m, M_DONTWAIT, MT_DATA); + if (!m) + return 0; - optlen += 4; - break; +#ifdef INET6 + if ((inp->inp_vflag & INP_IPV6) != 0) { + ip6 = mtod(m, struct ip6_hdr *); + th = (struct tcphdr *)(ip6 + 1); + m->m_pkthdr.len = m->m_len = + sizeof(struct ip6_hdr) + sizeof(struct tcphdr); + tcp_fillheaders(tp, ip6, th); + hdrsiz = ipsec6_hdrsiz(m, IPSEC_DIR_OUTBOUND, inp); + } else +#endif /* INET6 */ + { + ip = mtod(m, struct ip *); + th = (struct tcphdr *)(ip + 1); + m->m_pkthdr.len = m->m_len = sizeof(struct tcpiphdr); + tcp_fillheaders(tp, ip, th); + hdrsiz = ipsec4_hdrsiz(m, IPSEC_DIR_OUTBOUND, inp); + } - /* - * This is our initial SYN, check whether we have to use - * CC or CC.new. - */ - case TH_SYN: - opt[optlen++] = TCPOPT_NOP; - opt[optlen++] = TCPOPT_NOP; - opt[optlen++] = tp->t_flags & TF_SENDCCNEW ? - TCPOPT_CCNEW : TCPOPT_CC; - opt[optlen++] = TCPOLEN_CC; - *(u_int32_t *)&opt[optlen] = htonl(tp->cc_send); - optlen += 4; - break; + m_free(m); + return hdrsiz; +} +#endif /*IPSEC*/ - /* - * This is a SYN,ACK; send CC and CC.echo if we received - * CC from our peer. - */ - case (TH_SYN|TH_ACK): - if (tp->t_flags & TF_RCVD_CC) { - opt[optlen++] = TCPOPT_NOP; - opt[optlen++] = TCPOPT_NOP; - opt[optlen++] = TCPOPT_CC; - opt[optlen++] = TCPOLEN_CC; - *(u_int32_t *)&opt[optlen] = - htonl(tp->cc_send); - optlen += 4; - opt[optlen++] = TCPOPT_NOP; - opt[optlen++] = TCPOPT_NOP; - opt[optlen++] = TCPOPT_CCECHO; - opt[optlen++] = TCPOLEN_CC; - *(u_int32_t *)&opt[optlen] = - htonl(tp->cc_recv); - optlen += 4; - } - break; - } - } +/* + * Return a pointer to the cached information about the remote host. + * The cached information is stored in the protocol specific part of + * the route metrics. + */ +struct rmxp_tao * +tcp_gettaocache(inc) + struct in_conninfo *inc; +{ + struct rtentry *rt; - hdrlen += optlen; - #ifdef INET6 - if (isipv6) - ipoptlen = ip6_optlen(tp->t_inpcb); + if (inc->inc_isipv6) + rt = tcp_rtlookup6(inc); else -#endif - if (tp->t_inpcb->inp_options) - ipoptlen = tp->t_inpcb->inp_options->m_len - - offsetof(struct ipoption, ipopt_list); - else - ipoptlen = 0; -#ifdef IPSEC - ipoptlen += ipsec_hdrsiz_tcp(tp); -#endif +#endif /* INET6 */ + rt = tcp_rtlookup(inc); + + /* Make sure this is a host route and is up. */ + if (rt == NULL || + (rt->rt_flags & (RTF_UP|RTF_HOST)) != (RTF_UP|RTF_HOST)) + return NULL; + + return rmx_taop(rt->rt_rmx); +} - /* - * Adjust data length if insertion of options will - * bump the packet length beyond the t_maxo+/* + * Clear all the TAO cache entries, called from tcp_init. + * + * XXX + * This routine is just an empty one, because we assume that the routing + * routing tables are initialized at the same time when TCP, so there is + * nothing in the cache left over. + */ +static void +tcp_cleartaocache() +{ +} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 12 19:28:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3603C37B401; Mon, 12 Aug 2002 19:28:31 -0700 (PDT) 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 CDBC637B400 for ; Mon, 12 Aug 2002 19:28:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77C4243E4A for ; Mon, 12 Aug 2002 19:28:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7D2SUJU067611 for ; Mon, 12 Aug 2002 19:28:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7D2SUQD067608 for perforce@freebsd.org; Mon, 12 Aug 2002 19:28:30 -0700 (PDT) Date: Mon, 12 Aug 2002 19:28:30 -0700 (PDT) Message-Id: <200208130228.g7D2SUQD067608@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15892 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15892 Change 15892 by peter@peter_daintree on 2002/08/12 19:27:49 revert to vendor, this is in the main tree now. Affected files ... .. //depot/projects/ia64/sys/conf/files.ia64#13 integrate Differences ... ==== //depot/projects/ia64/sys/conf/files.ia64#13 (text+ko) ==== @@ -75,8 +75,6 @@ crypto/des/des_enc.c optional ipsec ipsec_esp dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa -dev/em/if_em.c optional em -dev/em/if_em_hw.c optional em dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 13 7:49:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C566437B401; Tue, 13 Aug 2002 07:49:38 -0700 (PDT) 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 4FA8F37B400 for ; Tue, 13 Aug 2002 07:49:38 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB2C043E72 for ; Tue, 13 Aug 2002 07:49:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7DEnbJU009027 for ; Tue, 13 Aug 2002 07:49:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7DEnb8j009024 for perforce@freebsd.org; Tue, 13 Aug 2002 07:49:37 -0700 (PDT) Date: Tue, 13 Aug 2002 07:49:37 -0700 (PDT) Message-Id: <200208131449.g7DEnb8j009024@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15922 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15922 Change 15922 by rwatson@rwatson_curry on 2002/08/13 07:49:18 Remove vnode operations from mac_ep_ops enum, they are no longer needed. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#149 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#149 (text+ko) ==== @@ -207,9 +207,6 @@ * MAC entry point operations */ enum mac_ep_ops { - MAC_OP_VNODE_READ, - MAC_OP_VNODE_WRITE, - MAC_OP_VNODE_POLL, MAC_OP_PIPE_READ, MAC_OP_PIPE_WRITE, MAC_OP_PIPE_STAT, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 13 8:14:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EB1437B401; Tue, 13 Aug 2002 08:14:09 -0700 (PDT) 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 A6F7037B400 for ; Tue, 13 Aug 2002 08:14:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6457C43E70 for ; Tue, 13 Aug 2002 08:14:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7DFE8JU015767 for ; Tue, 13 Aug 2002 08:14:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7DFE8WX015764 for perforce@freebsd.org; Tue, 13 Aug 2002 08:14:08 -0700 (PDT) Date: Tue, 13 Aug 2002 08:14:08 -0700 (PDT) Message-Id: <200208131514.g7DFE8WX015764@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15924 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15924 Change 15924 by rwatson@rwatson_tislabs on 2002/08/13 08:13:30 Forward declare 'struct mac_pid_data' to unbreak world from the commit of the mac_get_pid() call. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#150 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#150 (text+ko) ==== @@ -144,6 +144,7 @@ /* * POSIX.1e functions visible in the application namespace. */ +struct mac_pid_data; int mac_dominate(const mac_t _labela, const mac_t _labelb); int mac_equal(const mac_t labela, const mac_t _labelb); int mac_free(void *_buf_p); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 13 8:45:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A8C137B401; Tue, 13 Aug 2002 08:45:08 -0700 (PDT) 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 83CDC37B400 for ; Tue, 13 Aug 2002 08:45:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9DD543E4A for ; Tue, 13 Aug 2002 08:44:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7DFijJU018769 for ; Tue, 13 Aug 2002 08:44:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7DFijkZ018764 for perforce@freebsd.org; Tue, 13 Aug 2002 08:44:45 -0700 (PDT) Date: Tue, 13 Aug 2002 08:44:45 -0700 (PDT) Message-Id: <200208131544.g7DFijkZ018764@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15925 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15925 Change 15925 by rwatson@rwatson_paprika on 2002/08/13 08:44:13 Rename saved_cred to file_cred for vnode check calls accepting a cached credential. This better reflects the source of the credential, increasing the chances that people will get it right when adding these checks in new situations, especially those where an operation occurs without a struct file but where there is a credential that could conceivably be thought of as "saved". Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#237 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#47 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#98 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#50 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#80 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#64 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#72 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#34 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#151 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#114 edit .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#41 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#237 (text+ko) ==== @@ -1747,7 +1747,7 @@ } int -mac_check_vnode_poll(struct ucred *active_cred, struct ucred *saved_cred, +mac_check_vnode_poll(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp) { int error; @@ -1761,13 +1761,13 @@ if (error) return (error); - MAC_CHECK(check_vnode_poll, active_cred, saved_cred, vp, &vp->v_label); + MAC_CHECK(check_vnode_poll, active_cred, file_cred, vp, &vp->v_label); return (error); } int -mac_check_vnode_read(struct ucred *active_cred, struct ucred *saved_cred, +mac_check_vnode_read(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp) { int error; @@ -1781,7 +1781,7 @@ if (error) return (error); - MAC_CHECK(check_vnode_read, active_cred, saved_cred, vp, &vp->v_label); + MAC_CHECK(check_vnode_read, active_cred, file_cred, vp, &vp->v_label); return (error); } @@ -2021,7 +2021,7 @@ } int -mac_check_vnode_stat(struct ucred *active_cred, struct ucred *saved_cred, +mac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp) { int error; @@ -2035,13 +2035,13 @@ if (error) return (error); - MAC_CHECK(check_vnode_stat, active_cred, saved_cred, vp, + MAC_CHECK(check_vnode_stat, active_cred, file_cred, vp, &vp->v_label); return (error); } int -mac_check_vnode_write(struct ucred *active_cred, struct ucred *saved_cred, +mac_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp) { int error; @@ -2055,7 +2055,7 @@ if (error) return (error); - MAC_CHECK(check_vnode_write, active_cred, saved_cred, vp, &vp->v_label); + MAC_CHECK(check_vnode_write, active_cred, file_cred, vp, &vp->v_label); return (error); } ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#47 (text+ko) ==== @@ -303,17 +303,17 @@ * Vnode close call */ int -vn_close(vp, flags, saved_cred, td) +vn_close(vp, flags, file_cred, td) register struct vnode *vp; int flags; - struct ucred *saved_cred; + struct ucred *file_cred; struct thread *td; { int error; if (flags & FWRITE) vp->v_writecount--; - error = VOP_CLOSE(vp, flags, saved_cred, td); + error = VOP_CLOSE(vp, flags, file_cred, td); /* * XXX - In certain instances VOP_CLOSE has to do the vrele * itself. If the vrele has been done, it will return EAGAIN @@ -363,7 +363,7 @@ * Package up an I/O request on a vnode into a uio and do it. */ int -vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, active_cred, saved_cred, +vn_rdwr(rw, vp, base, len, offset, segflg, ioflg, active_cred, file_cred, aresid, td) enum uio_rw rw; struct vnode *vp; @@ -373,7 +373,7 @@ enum uio_seg segflg; int ioflg; struct ucred *active_cred; - struct ucred *saved_cred; + struct ucred *file_cred; int *aresid; struct thread *td; { @@ -409,16 +409,16 @@ #ifdef MAC if ((ioflg & IO_NOMACCHECK) == 0) { if (rw == UIO_READ) - error = mac_check_vnode_read(active_cred, saved_cred, + error = mac_check_vnode_read(active_cred, file_cred, vp); else - error = mac_check_vnode_write(active_cred, saved_cred, + error = mac_check_vnode_write(active_cred, file_cred, vp); } #endif if (error == 0) { - if (saved_cred) - cred = saved_cred; + if (file_cred) + cred = file_cred; else cred = active_cred; @@ -450,7 +450,7 @@ */ int vn_rdwr_inchunks(rw, vp, base, len, offset, segflg, ioflg, active_cred, - saved_cred, aresid, td) + file_cred, aresid, td) enum uio_rw rw; struct vnode *vp; caddr_t base; @@ -459,7 +459,7 @@ enum uio_seg segflg; int ioflg; struct ucred *active_cred; - struct ucred *saved_cred; + struct ucred *file_cred; int *aresid; struct thread *td; { @@ -471,7 +471,7 @@ if (rw != UIO_READ && vp->v_type == VREG) bwillwrite(); error = vn_rdwr(rw, vp, base, chunk, offset, segflg, - ioflg, active_cred, saved_cred, aresid, td); + ioflg, active_cred, file_cred, aresid, td); len -= chunk; /* aresid calc already includes length */ if (error) break; @@ -607,11 +607,11 @@ * Stat a vnode; implementation for the stat syscall */ int -vn_stat(vp, sb, active_cred, saved_cred, td) +vn_stat(vp, sb, active_cred, file_cred, td) struct vnode *vp; register struct stat *sb; struct ucred *active_cred; - struct ucred *saved_cred; + struct ucred *file_cred; struct thread *td; { struct vattr vattr; @@ -620,8 +620,7 @@ u_short mode; #ifdef MAC - /* XXXMAC: Should pass in saved_cred. */ - error = mac_check_vnode_stat(active_cred, saved_cred, vp); + error = mac_check_vnode_stat(active_cred, file_cred, vp); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#98 (text+ko) ==== @@ -1841,7 +1841,7 @@ } static int -mac_biba_check_vnode_poll(struct ucred *active_cred, struct ucred *saved_cred, +mac_biba_check_vnode_poll(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { struct mac_biba *subj, *obj; @@ -1858,7 +1858,7 @@ } static int -mac_biba_check_vnode_read(struct ucred *active_cred, struct ucred *saved_cred, +mac_biba_check_vnode_read(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { struct mac_biba *subj, *obj; @@ -2142,7 +2142,7 @@ } static int -mac_biba_check_vnode_stat(struct ucred *active_cred, struct ucred *saved_cred, +mac_biba_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *vnodelabel) { struct mac_biba *subj, *obj; @@ -2160,7 +2160,7 @@ } static int -mac_biba_check_vnode_write(struct ucred *active_cred, struct ucred *saved_cred, +mac_biba_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { struct mac_biba *subj, *obj; ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#50 (text+ko) ==== @@ -676,7 +676,7 @@ static int mac_bsdextended_check_vnode_stat(struct ucred *active_cred, - struct ucred *saved_cred, struct vnode *vp, struct label *label) + struct ucred *file_cred, struct vnode *vp, struct label *label) { struct vattr vap; int error; ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#80 (text+ko) ==== @@ -1796,7 +1796,7 @@ } static int -mac_mls_check_vnode_poll(struct ucred *active_cred, struct ucred *saved_cred, +mac_mls_check_vnode_poll(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { struct mac_mls *subj, *obj; @@ -1813,7 +1813,7 @@ } static int -mac_mls_check_vnode_read(struct ucred *active_cred, struct ucred *saved_cred, +mac_mls_check_vnode_read(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { struct mac_mls *subj, *obj; @@ -2097,7 +2097,7 @@ } static int -mac_mls_check_vnode_stat(struct ucred *active_cred, struct ucred *saved_cred, +mac_mls_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *vnodelabel) { struct mac_mls *subj, *obj; @@ -2115,7 +2115,7 @@ } static int -mac_mls_check_vnode_write(struct ucred *active_cred, struct ucred *saved_cred, +mac_mls_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { struct mac_mls *subj, *obj; ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#64 (text+ko) ==== @@ -775,7 +775,7 @@ } static int -mac_none_check_vnode_poll(struct ucred *active_cred, struct ucred *saved_cred, +mac_none_check_vnode_poll(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { @@ -783,7 +783,7 @@ } static int -mac_none_check_vnode_read(struct ucred *active_cred, struct ucred *saved_cred, +mac_none_check_vnode_read(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { @@ -889,7 +889,7 @@ } static int -mac_none_check_vnode_stat(struct ucred *active_cred, struct ucred *saved_cred, +mac_none_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { @@ -897,7 +897,7 @@ } static int -mac_none_check_vnode_write(struct ucred *active_cred, struct ucred *saved_cred, +mac_none_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#72 (text+ko) ==== @@ -1324,7 +1324,7 @@ } static int -mac_te_check_vnode_poll(struct ucred *active_cred, struct ucred *saved_cred, +mac_te_check_vnode_poll(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { int error; @@ -1339,7 +1339,7 @@ } static int -mac_te_check_vnode_read(struct ucred *active_cred, struct ucred *saved_cred, +mac_te_check_vnode_read(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { int error; @@ -1551,7 +1551,7 @@ } static int -mac_te_check_vnode_stat(struct ucred *active_cred, struct ucred *saved_cred, +mac_te_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { @@ -1569,7 +1569,7 @@ } static int -mac_te_check_vnode_write(struct ucred *active_cred, struct ucred *saved_cred, +mac_te_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { int error; ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#34 (text+ko) ==== @@ -983,7 +983,7 @@ } static int -mac_test_check_vnode_poll(struct ucred *active_cred, struct ucred *saved_cred, +mac_test_check_vnode_poll(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { @@ -991,7 +991,7 @@ } static int -mac_test_check_vnode_read(struct ucred *active_cred, struct ucred *saved_cred, +mac_test_check_vnode_read(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { @@ -1097,7 +1097,7 @@ } static int -mac_test_check_vnode_stat(struct ucred *active_cred, struct ucred *saved_cred, +mac_test_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { @@ -1105,7 +1105,7 @@ } static int -mac_test_check_vnode_write(struct ucred *active_cred, struct ucred *saved_cred, +mac_test_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label) { ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#151 (text+ko) ==== @@ -365,9 +365,9 @@ int mac_check_vnode_open(struct ucred *cred, struct vnode *vp, mode_t acc_mode); int mac_check_vnode_poll(struct ucred *active_cred, - struct ucred *saved_cred, struct vnode *vp); + struct ucred *file_cred, struct vnode *vp); int mac_check_vnode_read(struct ucred *active_cred, - struct ucred *saved_cred, struct vnode *vp); + struct ucred *file_cred, struct vnode *vp); int mac_check_vnode_readdir(struct ucred *cred, struct vnode *vp); int mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp); int mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, @@ -388,7 +388,7 @@ int mac_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, struct timespec atime, struct timespec mtime); int mac_check_vnode_stat(struct ucred *active_cred, - struct ucred *saved_cred, struct vnode *vp); + struct ucred *file_cred, struct vnode *vp); int mac_getsockopt_label_get(struct ucred *cred, struct socket *so, struct mac *extmac); int mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so, @@ -402,7 +402,7 @@ int mac_pipe_label_set(struct ucred *cred, struct pipe *pipe, struct label *label); int mac_check_vnode_write(struct ucred *active_cred, - struct ucred *saved_cred, struct vnode *vp); + struct ucred *file_cred, struct vnode *vp); /* * Calls to help various file systems implement labeling functionality ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#114 (text+ko) ==== @@ -296,10 +296,10 @@ int (*mpo_check_vnode_open)(struct ucred *cred, struct vnode *vp, struct label *label, mode_t acc_mode); int (*mpo_check_vnode_poll)(struct ucred *active_cred, - struct ucred *saved_cred, struct vnode *vp, + struct ucred *file_cred, struct vnode *vp, struct label *label); int (*mpo_check_vnode_read)(struct ucred *active_cred, - struct ucred *saved_cred, struct vnode *vp, + struct ucred *file_cred, struct vnode *vp, struct label *label); int (*mpo_check_vnode_readdir)(struct ucred *cred, struct vnode *dvp, struct label *dlabel); @@ -334,10 +334,10 @@ struct vnode *vp, struct label *label, struct timespec atime, struct timespec mtime); int (*mpo_check_vnode_stat)(struct ucred *active_cred, - struct ucred *saved_cred, struct vnode *vp, + struct ucred *file_cred, struct vnode *vp, struct label *label); int (*mpo_check_vnode_write)(struct ucred *active_cred, - struct ucred *saved_cred, struct vnode *vp, + struct ucred *file_cred, struct vnode *vp, struct label *label); }; ==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#41 (text+ko) ==== @@ -701,7 +701,7 @@ void vprint(char *label, struct vnode *vp); int vrecycle(struct vnode *vp, struct mtx *inter_lkp, struct thread *td); -int vn_close(struct vnode *vp, int flags, struct ucred *saved_cred, +int vn_close(struct vnode *vp, int flags, struct ucred *file_cred, struct thread *td); void vn_finished_write(struct mount *mp); int vn_isdisk(struct vnode *vp, int *errp); @@ -720,14 +720,14 @@ int vn_pollrecord(struct vnode *vp, struct thread *p, int events); int vn_rdwr(enum uio_rw rw, struct vnode *vp, caddr_t base, int len, off_t offset, enum uio_seg segflg, int ioflg, - struct ucred *active_cred, struct ucred *saved_cred, + struct ucred *active_cred, struct ucred *file_cred, int *aresid, struct thread *td); int vn_rdwr_inchunks(enum uio_rw rw, struct vnode *vp, caddr_t base, int len, off_t offset, enum uio_seg segflg, int ioflg, - struct ucred *active_cred, struct ucred *saved_cred, + struct ucred *active_cred, struct ucred *file_cred, int *aresid, struct thread *td); int vn_stat(struct vnode *vp, struct stat *sb, struct ucred *active_cred, - struct ucred *saved_cred, struct thread *td); + struct ucred *file_cred, struct thread *td); int vn_start_write(struct vnode *vp, struct mount **mpp, int flags); dev_t vn_todev(struct vnode *vp); int vn_write_suspend_wait(struct vnode *vp, struct mount *mp, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 13 17: 6:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB6D937B405; Tue, 13 Aug 2002 17:06:37 -0700 (PDT) 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 48CE537B400 for ; Tue, 13 Aug 2002 17:06:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D7AF543E4A for ; Tue, 13 Aug 2002 17:06:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7E06aJU015683 for ; Tue, 13 Aug 2002 17:06:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7E06ak4015680 for perforce@freebsd.org; Tue, 13 Aug 2002 17:06:36 -0700 (PDT) Date: Tue, 13 Aug 2002 17:06:36 -0700 (PDT) Message-Id: <200208140006.g7E06ak4015680@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15946 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15946 Change 15946 by rwatson@rwatson_paprika on 2002/08/13 17:05:37 When I added active_cred arguments to the file op function prototypes, I figured I'd add one to fo_close() also for consistency. As it turns out, this wasn't such a good idea: there isn't always an active credential available due to the way the current code is constructed (td==NULL may get passed into higher level file descriptor code, resulting in a NULL pointer dereference in a couple of odd-ball cases, such as the NFS server code). Since the MAC implementation doesn't currently have a close-related event, back out the addition of active_cred to fo_close() its implementations. Keep the use of active_cred in vn_close() while removing it from vn_closefile() as similar credential code already existed there and keeping the new naming scheme increases consistency. This should fix the panic on shutdown when the NFS server is running. Affected files ... .. //depot/projects/trustedbsd/mac/sys/dev/streams/streams.c#7 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#24 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#9 edit .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#19 edit .. //depot/projects/trustedbsd/mac/sys/kern/sys_socket.c#10 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#48 edit .. //depot/projects/trustedbsd/mac/sys/sys/file.h#10 edit .. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/dev/streams/streams.c#7 (text+ko) ==== @@ -61,7 +61,7 @@ #include #include -static int svr4_soo_close(struct file *, struct ucred *, struct thread *); +static int svr4_soo_close(struct file *, struct thread *); static int svr4_ptm_alloc(struct thread *); static d_open_t streamsopen; @@ -416,7 +416,7 @@ } static int -svr4_soo_close(struct file *fp, struct ucred *active_cred, struct thread *td) +svr4_soo_close(struct file *fp, struct thread *td) { struct socket *so = (struct socket *)fp->f_data; @@ -424,5 +424,5 @@ svr4_delete_socket(td->td_proc, fp); free(so->so_emuldata, M_TEMP); - return soo_close(fp, active_cred, td); + return soo_close(fp, td); } ==== //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#24 (text+ko) ==== @@ -109,8 +109,7 @@ static int badfo_kqfilter(struct file *fp, struct knote *kn); static int badfo_stat(struct file *fp, struct stat *sb, struct ucred *active_cred, struct thread *td); -static int badfo_close(struct file *fp, struct ucred *active_cred, - struct thread *td); +static int badfo_close(struct file *fp, struct thread *td); /* * Descriptor management. @@ -1848,7 +1847,7 @@ } else FILE_UNLOCK(fp); if (fp->f_ops != &badfileops) - error = fo_close(fp, td->td_ucred, td); + error = fo_close(fp, td); else error = 0; ffree(fp); @@ -2234,9 +2233,8 @@ } static int -badfo_close(fp, active_cred, td) +badfo_close(fp, td) struct file *fp; - struct ucred *active_cred; struct thread *td; { ==== //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#9 (text+ko) ==== @@ -67,8 +67,7 @@ static int kqueue_kqfilter(struct file *fp, struct knote *kn); static int kqueue_stat(struct file *fp, struct stat *st, struct ucred *active_cred, struct thread *td); -static int kqueue_close(struct file *fp, struct ucred *active_cred, - struct thread *td); +static int kqueue_close(struct file *fp, struct thread *td); static void kqueue_wakeup(struct kqueue *kq); static struct fileops kqueueops = { @@ -840,7 +839,7 @@ /*ARGSUSED*/ static int -kqueue_close(struct file *fp, struct ucred *active_cred, struct thread *td) +kqueue_close(struct file *fp, struct thread *td) { struct kqueue *kq = (struct kqueue *)fp->f_data; struct filedesc *fdp = td->td_proc->p_fd; ==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#19 (text+ko) ==== @@ -98,8 +98,7 @@ struct ucred *active_cred, int flags, struct thread *td); static int pipe_write(struct file *fp, struct uio *uio, struct ucred *active_cred, int flags, struct thread *td); -static int pipe_close(struct file *fp, struct ucred *active_cred, - struct thread *td); +static int pipe_close(struct file *fp, struct thread *td); static int pipe_poll(struct file *fp, int events, struct ucred *active_cred, struct thread *td); static int pipe_kqfilter(struct file *fp, struct knote *kn); @@ -1305,9 +1304,8 @@ /* ARGSUSED */ static int -pipe_close(fp, active_cred, td) +pipe_close(fp, td) struct file *fp; - struct ucred *active_cred; struct thread *td; { struct pipe *cpipe = (struct pipe *)fp->f_data; ==== //depot/projects/trustedbsd/mac/sys/kern/sys_socket.c#10 (text+ko) ==== @@ -203,9 +203,8 @@ */ /* ARGSUSED */ int -soo_close(fp, active_cred, td) +soo_close(fp, td) struct file *fp; - struct ucred *active_cred; struct thread *td; { int error = 0; ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#48 (text+ko) ==== @@ -63,8 +63,7 @@ #include -static int vn_closefile(struct file *fp, struct ucred *active_cred, - struct thread *td); +static int vn_closefile(struct file *fp, struct thread *td); static int vn_ioctl(struct file *fp, u_long com, void *data, struct ucred *active_cred, struct thread *td); static int vn_read(struct file *fp, struct uio *uio, @@ -883,9 +882,8 @@ * File table vnode close routine. */ static int -vn_closefile(fp, active_cred, td) +vn_closefile(fp, td) struct file *fp; - struct ucred *active_cred; struct thread *td; { ==== //depot/projects/trustedbsd/mac/sys/sys/file.h#10 (text+ko) ==== @@ -94,8 +94,7 @@ int (*fo_kqfilter)(struct file *fp, struct knote *kn); int (*fo_stat)(struct file *fp, struct stat *sb, struct ucred *active_cred, struct thread *td); - int (*fo_close)(struct file *fp, - struct ucred *active_cred, struct thread *td); + int (*fo_close)(struct file *fp, struct thread *td); } *f_ops; int f_seqcount; /* * count of sequential accesses -- cleared @@ -186,8 +185,7 @@ struct ucred *active_cred, struct thread *td); static __inline int fo_stat(struct file *fp, struct stat *sb, struct ucred *active_cred, struct thread *td); -static __inline int fo_close(struct file *fp, struct ucred *active_cred, - struct thread *td); +static __inline int fo_close(struct file *fp, struct thread *td); static __inline int fo_kqfilter(struct file *fp, struct knote *kn); struct proc; @@ -196,12 +194,11 @@ struct file *fp; struct uio *uio; struct ucred *active_cred; + int flags; struct thread *td; - int flags; { - return ((*fp->f_ops->fo_read)(fp, uio, active_cred, flags, - td)); + return ((*fp->f_ops->fo_read)(fp, uio, active_cred, flags, td)); } static __inline int @@ -251,13 +248,12 @@ } static __inline int -fo_close(fp, active_cred, td) +fo_close(fp, td) struct file *fp; - struct ucred *active_cred; struct thread *td; { - return ((*fp->f_ops->fo_close)(fp, active_cred, td)); + return ((*fp->f_ops->fo_close)(fp, td)); } static __inline int ==== //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#21 (text+ko) ==== @@ -349,8 +349,7 @@ int flags, struct thread *td); int soo_write(struct file *fp, struct uio *uio, struct ucred *active_cred, int flags, struct thread *td); -int soo_close(struct file *fp, struct ucred *active_cred, - struct thread *td); +int soo_close(struct file *fp, struct thread *td); int soo_ioctl(struct file *fp, u_long cmd, void *data, struct ucred *active_cred, struct thread *td); int soo_poll(struct file *fp, int events, struct ucred *active_cred, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 13 18:41:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FB8837B405; Tue, 13 Aug 2002 18:41:53 -0700 (PDT) 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 D7F3237B400 for ; Tue, 13 Aug 2002 18:41:52 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 94BB443E42 for ; Tue, 13 Aug 2002 18:41:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7E1fqJU030976 for ; Tue, 13 Aug 2002 18:41:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7E1fqvC030973 for perforce@freebsd.org; Tue, 13 Aug 2002 18:41:52 -0700 (PDT) Date: Tue, 13 Aug 2002 18:41:52 -0700 (PDT) Message-Id: <200208140141.g7E1fqvC030973@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15950 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15950 Change 15950 by rwatson@rwatson_paprika on 2002/08/13 18:40:51 Restore rc's sendmail startup for vi recovery to its pre-MAC state: labeling of processes in the boot sequence is not yet something we're highly ready to do. This commit makes this invocation of sendmail consistent with the others where we also removed the setpmac call. Affected files ... .. //depot/projects/trustedbsd/mac/etc/rc#16 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/rc#16 (text+ko) ==== @@ -802,8 +802,7 @@ # Else send mail to the user. recfile=`awk '/^X-vi-recover-path:/{print $2}' < "${i}"` if [ -n "${recfile}" -a -s "${recfile}" ]; then - /usr/sbin/setpmac ${sendmail_label} sendmail \ - -t < "${i}" + sendmail -t < "${i}" else rm -f "${i}" fi To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 13 19:52:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56CF837B401; Tue, 13 Aug 2002 19:52:18 -0700 (PDT) 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 8952F37B400 for ; Tue, 13 Aug 2002 19:52:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 376D043E42 for ; Tue, 13 Aug 2002 19:52:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7E2qHJU041146 for ; Tue, 13 Aug 2002 19:52:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7E2qG3s041143 for perforce@freebsd.org; Tue, 13 Aug 2002 19:52:16 -0700 (PDT) Date: Tue, 13 Aug 2002 19:52:16 -0700 (PDT) Message-Id: <200208140252.g7E2qG3s041143@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15954 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15954 Change 15954 by peter@peter_mckinley on 2002/08/13 19:51:59 We shall overcome (somehow) Affected files ... .. //depot/projects/ia64/sys/ia64/conf/I2#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/I2#2 (text+ko) ==== @@ -55,6 +55,7 @@ device pass device isp #device sym +device mpt # ATA and ATAPI devices #device ata To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 7:17:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 463F037B401; Wed, 14 Aug 2002 07:17:30 -0700 (PDT) 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 C678137B400 for ; Wed, 14 Aug 2002 07:17:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8406443E65 for ; Wed, 14 Aug 2002 07:17:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7EEHTJU069051 for ; Wed, 14 Aug 2002 07:17:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7EEHTRh069048 for perforce@freebsd.org; Wed, 14 Aug 2002 07:17:29 -0700 (PDT) Date: Wed, 14 Aug 2002 07:17:29 -0700 (PDT) Message-Id: <200208141417.g7EEHTRh069048@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15964 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15964 Change 15964 by rwatson@rwatson_tislabs on 2002/08/14 07:16:44 Disable the MAC check in fcntl's file flag changing call since it seems to be resulting in panics due to a null pointer dereference. I'll debug this one more. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#25 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#25 (text+ko) ==== @@ -314,6 +314,7 @@ case F_SETFL: fhold(fp); FILEDESC_UNLOCK(fdp); +#if 0 #ifdef MAC if (fp->f_type == DTYPE_VNODE) { int fflag = (fp->f_flag & ~FCNTLFLAGS) | @@ -342,6 +343,7 @@ } } #endif /* MAC */ +#endif fp->f_flag &= ~FCNTLFLAGS; fp->f_flag |= FFLAGS(uap->arg & ~O_ACCMODE) & FCNTLFLAGS; tmp = fp->f_flag & FNONBLOCK; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 7:38:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7AC237B405; Wed, 14 Aug 2002 07:37:55 -0700 (PDT) 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 766B037B401 for ; Wed, 14 Aug 2002 07:37:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22C0F43E65 for ; Wed, 14 Aug 2002 07:37:55 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7EEbsJU071030 for ; Wed, 14 Aug 2002 07:37:55 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7EEbsDK071027 for perforce@freebsd.org; Wed, 14 Aug 2002 07:37:54 -0700 (PDT) Date: Wed, 14 Aug 2002 07:37:54 -0700 (PDT) Message-Id: <200208141437.g7EEbsDK071027@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 15965 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15965 Change 15965 by cvance@cvance_laptop on 2002/08/14 07:37:43 Don't print out labeling messages unless the verbose flag is used Also clean up lame use of argv[0] instead of programname. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/sebsd_setfiles/setfiles.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/sebsd_setfiles/setfiles.c#3 (text+ko) ==== @@ -50,16 +50,14 @@ #include #include -/* - * Program name and error message buffer. - */ -static char errbuf[255 + 1]; +static char errbuf[255 + 1]; /* Error message buffer */ +static int verbose = 0; /* * A file security context specification. */ typedef struct spec { - char *regex_str; /* regular expession string for diagnostic messages */ + char *regex_str; /* regular expession string for diagnostics messages */ char *type_str; /* type string for diagnostic messages */ char *context; /* context string */ int contextlen; /* length of context string */ @@ -147,16 +145,17 @@ * But not now, just always label. */ - if (spec[idx].type_str) { - printf("%s matched by (%s,%s,%s)\n", - path, spec[idx].regex_str, - spec[idx].type_str, spec[idx].context); - } else { - printf("%s matched by (%s,%s)\n", - path, spec[idx].regex_str, - spec[idx].context); + if (verbose) { + if (spec[idx].type_str) { + printf("%s matched by (%s,%s,%s)\n", + path, spec[idx].regex_str, + spec[idx].type_str, spec[idx].context); + } else { + printf("%s matched by (%s,%s)\n", + path, spec[idx].regex_str, + spec[idx].context); + } } - if (strcmp(spec[idx].context, "<>") == 0) { printf("File %s matches spec <>, Not labeling it!\n", path); @@ -188,26 +187,49 @@ return; } +void +printUsage() +{ + fprintf(stderr, "Invalid Argument.\n"); + fprintf(stderr, "sebsd_setfiles: [-v] " + " [ ... ]\n"); + fprintf(stderr, " -v\tverbose reporting\n"); +} + int main(int argc, char **argv) { FILE *fp; char buf[255 + 1], *buf_p; char regex[1024], type[1024], context[1024]; char *anchored_regex; - int items, len, lineno, pass, nerr, regerr; + int ch, items, len, lineno, pass, nerr, regerr; char **fts_path; FTSENT *ftsent; FTS *fts; - if (argc < 3) { - fprintf(stderr, "Invalid Argument.\n"); - fprintf(stderr, "%s: [ ... ]\n", argv[0]); + while ((ch = getopt(argc, argv, "vh")) != -1) { + switch (ch) { + case 'v': + verbose = 1; + break; + case 'h': + case '?': + default: + printUsage(); + } + } + argc -= optind; + argv += optind; + printf("optind = %d, argc now %d\n", optind, argc); + + if (argc < 2) { + printUsage(); return (-1); } - fts_path = &argv[2]; + fts_path = &argv[1]; /* Open the specification file. */ - if ((fp = fopen(argv[1], "r")) == NULL) { - perror(argv[1]); + if ((fp = fopen(argv[0], "r")) == NULL) { + perror(argv[0]); exit(1); } @@ -228,8 +250,8 @@ len = strlen(buf); if (buf[len - 1] != '\n') { fprintf(stderr, - "%s: no newline on line number %d (only read %s)\n", - argv[0], lineno, buf); + "sebsd_setfiles: no newline on line number %d (only read %s)\n", + lineno, buf); nerr++; continue; } @@ -243,9 +265,7 @@ items = sscanf(buf, "%s %s %s", regex, type, context); if (items < 2) { - fprintf(stderr, - "%s: line number %d is missing fields (only read %s)\n", - argv[0], lineno, buf); + fprintf(stderr, "sebsd_setfiles: line number %d is missing fields (only read %s)\n", lineno, buf); nerr++; if (items == 1) regex[0] = '\0'; @@ -265,8 +285,7 @@ anchored_regex = malloc(len + 3); if (!anchored_regex) { fprintf(stderr, - "%s: insufficient memory for anchored regexp on line %d\n", - argv[0], lineno); + "sebsd_setfiles: insufficient memory for anchored regexp on line %d\n", lineno); exit(1); } sprintf(anchored_regex, "^%s$", regex); @@ -281,8 +300,7 @@ &spec[nspec].regex, errbuf, sizeof errbuf); fprintf(stderr, - "%s: unable to compile regular expression %s on line number %d: %s\n", - argv[0], regex, lineno, + "sebsd_setfiles: unable to compile regular expression %s on line number %d: %s\n", regex, lineno, errbuf); nerr++; } @@ -296,8 +314,7 @@ len = strlen(type); if (type[0] != '-' || len != 2) { fprintf(stderr, - "%s: invalid type specifier %s on line number %d\n", - argv[0], type, lineno); + "sebsd_setfiles: invalid type specifier %s on line number %d\n", type, lineno); nerr++; goto skip_type; } @@ -324,9 +341,7 @@ spec[nspec].mode = S_IFREG; break; default: - fprintf(stderr, - "%s: invalid type specifier %s on line number %d\n", - argv[0], type, lineno); + fprintf(stderr, "sebsd_setfiles: invalid type specifier %s on line number %d\n", type, lineno); nerr++; } @@ -365,15 +380,12 @@ exit(1); if (pass == 0) { - printf("%s: read %d specifications\n", argv[0], - nspec); + printf("sebsd_setfiles: read %d specifications\n", nspec); if (nspec == 0) exit(0); if ((spec = malloc(sizeof(spec_t) * nspec)) == NULL) { - fprintf(stderr, - "%s: insufficient memory for specifications\n", - argv[0]); + fprintf(stderr,"sebsd_setfiles: insufficient memory for specifications\n"); exit(1); } bzero(spec, sizeof(spec_t) * nspec); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 7:39: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9343337B401; Wed, 14 Aug 2002 07:38:57 -0700 (PDT) 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 38DF337B400 for ; Wed, 14 Aug 2002 07:38:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E729A43E6A for ; Wed, 14 Aug 2002 07:38:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7EEcuJU071111 for ; Wed, 14 Aug 2002 07:38:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7EEcuFO071108 for perforce@freebsd.org; Wed, 14 Aug 2002 07:38:56 -0700 (PDT) Date: Wed, 14 Aug 2002 07:38:56 -0700 (PDT) Message-Id: <200208141438.g7EEcuFO071108@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15966 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15966 Change 15966 by rwatson@rwatson_tislabs on 2002/08/14 07:37:57 Updates to the MAC notes, including commenting on the fact that running X11 with MLS can result in problems, as kernel memory is currently labeled as mls/high by default, but user processes run at mls/low by default. Affected files ... .. //depot/projects/trustedbsd/mac/MACREADME#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/MACREADME#21 (text+ko) ==== @@ -92,7 +92,8 @@ of reasons. Unlike the other components of the kernel NFS client, it doesn't use the mount-time credential to authorize out-going RPC delivery, uses an odd selection of kernel credential to act on the -FIFO, etc. +FIFO, etc. (This is now largely fixed due to moving VFS protections +higher in the stack) Things not to do with MAC ------------------------- @@ -116,7 +117,12 @@ Don't use netboot without setting the loader.conf setting to indicate to Biba which interface is trusted. Otherwise, the NFS client will -fail as it cannot send packets via the interface. (This may be broken). +fail as it cannot send packets via the interface. + +Don't expect X11 to work with MLS enabled if you try to run X11 at +mls/low (the default). This won't work because XFree86 expects to +be able to map video memory, and by default video memory is labeled +as mls/high so as to be conservative. Things that look like they should work but don't ------------------------------------------------ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 7:53:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 48DDC37B401; Wed, 14 Aug 2002 07:53:16 -0700 (PDT) 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 DF0E337B400 for ; Wed, 14 Aug 2002 07:53:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8565443E75 for ; Wed, 14 Aug 2002 07:53:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7EErFJU072539 for ; Wed, 14 Aug 2002 07:53:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7EErFLO072536 for perforce@freebsd.org; Wed, 14 Aug 2002 07:53:15 -0700 (PDT) Date: Wed, 14 Aug 2002 07:53:15 -0700 (PDT) Message-Id: <200208141453.g7EErFLO072536@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15968 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15968 Change 15968 by rwatson@rwatson_sproing on 2002/08/14 07:52:57 Prefer NULL to 0 when declaring that no slot is required for a policy. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#65 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#65 (text+ko) ==== @@ -1132,4 +1132,4 @@ }; MAC_POLICY_SET(mac_none_ops, trustedbsd_mac_none, "TrustedBSD MAC/None", - MPC_LOADTIME_FLAG_UNLOADOK, 0); + MPC_LOADTIME_FLAG_UNLOADOK, NULL); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 13:50: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB0DC37B401; Wed, 14 Aug 2002 13:49:42 -0700 (PDT) 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 5B5C637B400 for ; Wed, 14 Aug 2002 13:49:42 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F039243E4A for ; Wed, 14 Aug 2002 13:49:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7EKnfJU038512 for ; Wed, 14 Aug 2002 13:49:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7EKnf7N038508 for perforce@freebsd.org; Wed, 14 Aug 2002 13:49:41 -0700 (PDT) Date: Wed, 14 Aug 2002 13:49:41 -0700 (PDT) Message-Id: <200208142049.g7EKnf7N038508@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15977 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15977 Change 15977 by rwatson@rwatson_tislabs on 2002/08/14 13:48:59 Wrap the maintenance of nmac* object counters in options MAC_DEBUG, so that for performance purposes you can avoid the cost of two atomic operations per object instance (init, destroy). Default to MAC_DEBUG on in the shipped MAC kernel configuration. Affected files ... .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#13 edit .. //depot/projects/trustedbsd/mac/sys/conf/options#23 edit .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#35 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#238 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/NOTES#13 (text+ko) ==== @@ -729,6 +729,7 @@ # Support for Mandatory Access Control (MAC) options MAC +options MAC_DEBUG #options MAC_NONE # Statically link mac_none policy ==== //depot/projects/trustedbsd/mac/sys/conf/options#23 (text+ko) ==== @@ -125,6 +125,7 @@ # Support for Mandatory Access Control (MAC) MAC opt_mac.h +MAC_DEBUG opt_mac.h MAC_NONE opt_dontuse.h # Do we want the config file compiled into the kernel? ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#35 (text+ko) ==== @@ -31,6 +31,7 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options MAC +options MAC_DEBUG options UFS_ACL options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#238 (text+ko) ==== @@ -166,6 +166,7 @@ &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " "copy-on-write semantics, or by removing all write access"); +#ifdef MAC_DEBUG static unsigned int nmacmbufs, nmaccreds, nmacifnets, nmacbpfdescs, nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, nmacipqs, nmacpipes; @@ -191,6 +192,7 @@ &nmacvnodes, 0, "number of vnodes in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, devfsdirents, CTLFLAG_RD, &nmacdevfsdirents, 0, "number of devfs dirents inuse"); +#endif static int error_select(int error1, int error2); static int mac_externalize(struct label *label, struct mac *mac); @@ -1263,7 +1265,9 @@ /* "how" is one of M_(TRY|DONT)WAIT */ mac_init_label(&m->m_pkthdr.label); MAC_PERFORM(init_mbuf, m, how, &m->m_pkthdr.label); +#ifdef MAC_DEBUG atomic_add_int(&nmacmbufs, 1); +#endif return (0); } @@ -1273,7 +1277,9 @@ MAC_PERFORM(destroy_mbuf, m, &m->m_pkthdr.label); mac_destroy_label(&m->m_pkthdr.label); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacmbufs, 1); +#endif } void @@ -1282,7 +1288,9 @@ mac_init_label(&cr->cr_label); MAC_PERFORM(init_cred, cr, &cr->cr_label); +#ifdef MAC_DEBUG atomic_add_int(&nmaccreds, 1); +#endif } void @@ -1291,7 +1299,9 @@ MAC_PERFORM(destroy_cred, cr, &cr->cr_label); mac_destroy_label(&cr->cr_label); +#ifdef MAC_DEBUG atomic_subtract_int(&nmaccreds, 1); +#endif } void @@ -1300,7 +1310,9 @@ mac_init_label(&ifp->if_label); MAC_PERFORM(init_ifnet, ifp, &ifp->if_label); +#ifdef MAC_DEBUG atomic_add_int(&nmacifnets, 1); +#endif } void @@ -1309,7 +1321,9 @@ MAC_PERFORM(destroy_ifnet, ifp, &ifp->if_label); mac_destroy_label(&ifp->if_label); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacifnets, 1); +#endif } void @@ -1318,7 +1332,9 @@ mac_init_label(&ipq->ipq_label); MAC_PERFORM(init_ipq, ipq, &ipq->ipq_label); +#ifdef MAC_DEBUG atomic_add_int(&nmacipqs, 1); +#endif } void @@ -1327,7 +1343,9 @@ MAC_PERFORM(destroy_ipq, ipq, &ipq->ipq_label); mac_destroy_label(&ipq->ipq_label); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacipqs, 1); +#endif } void @@ -1338,7 +1356,9 @@ mac_init_label(&socket->so_peerlabel); MAC_PERFORM(init_socket, socket, &socket->so_label, &socket->so_peerlabel); +#ifdef MAC_DEBUG atomic_add_int(&nmacsockets, 1); +#endif } void @@ -1349,7 +1369,9 @@ &socket->so_peerlabel); mac_destroy_label(&socket->so_label); mac_destroy_label(&socket->so_peerlabel); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacsockets, 1); +#endif } void @@ -1362,7 +1384,9 @@ pipe->pipe_label = label; pipe->pipe_peer->pipe_label = label; MAC_PERFORM(init_pipe, pipe, pipe->pipe_label); +#ifdef MAC_DEBUG atomic_add_int(&nmacpipes, 1); +#endif } void @@ -1372,7 +1396,9 @@ MAC_PERFORM(destroy_pipe, pipe, pipe->pipe_label); mac_destroy_label(pipe->pipe_label); free(pipe->pipe_label, M_MACPIPELABEL); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacpipes, 1); +#endif } void @@ -1381,7 +1407,9 @@ mac_init_label(&bpf_d->bd_label); MAC_PERFORM(init_bpfdesc, bpf_d, &bpf_d->bd_label); +#ifdef MAC_DEBUG atomic_add_int(&nmacbpfdescs, 1); +#endif } void @@ -1390,7 +1418,9 @@ MAC_PERFORM(destroy_bpfdesc, bpf_d, &bpf_d->bd_label); mac_destroy_label(&bpf_d->bd_label); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacbpfdescs, 1); +#endif } void @@ -1400,7 +1430,9 @@ mac_init_label(&mp->mnt_mntlabel); mac_init_label(&mp->mnt_fslabel); MAC_PERFORM(init_mount, mp, &mp->mnt_mntlabel, &mp->mnt_fslabel); +#ifdef MAC_DEBUG atomic_add_int(&nmacmounts, 1); +#endif } void @@ -1410,7 +1442,9 @@ MAC_PERFORM(destroy_mount, mp, &mp->mnt_mntlabel, &mp->mnt_fslabel); mac_destroy_label(&mp->mnt_fslabel); mac_destroy_label(&mp->mnt_mntlabel); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacmounts, 1); +#endif } static void @@ -1419,7 +1453,9 @@ mac_init_label(label); MAC_PERFORM(init_temp, label); +#ifdef MAC_DEBUG atomic_add_int(&nmactemp, 1); +#endif } static void @@ -1428,7 +1464,9 @@ MAC_PERFORM(destroy_temp, label); mac_destroy_label(label); +#ifdef MAC_DEBUG atomic_subtract_int(&nmactemp, 1); +#endif } void @@ -1437,7 +1475,9 @@ mac_init_label(&vp->v_label); MAC_PERFORM(init_vnode, vp, &vp->v_label); +#ifdef MAC_DEBUG atomic_add_int(&nmacvnodes, 1); +#endif } void @@ -1446,7 +1486,9 @@ MAC_PERFORM(destroy_vnode, vp, &vp->v_label); mac_destroy_label(&vp->v_label); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacvnodes, 1); +#endif } void @@ -1455,7 +1497,9 @@ mac_init_label(&de->de_label); MAC_PERFORM(init_devfsdirent, de, &de->de_label); +#ifdef MAC_DEBUG atomic_add_int(&nmacdevfsdirents, 1); +#endif } void @@ -1464,7 +1508,9 @@ MAC_PERFORM(destroy_devfsdirent, de, &de->de_label); mac_destroy_label(&de->de_label); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacdevfsdirents, 1); +#endif } static int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 14:24:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADC9537B401; Wed, 14 Aug 2002 14:23:30 -0700 (PDT) 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 2BC3F37B400 for ; Wed, 14 Aug 2002 14:23:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC4A543E70 for ; Wed, 14 Aug 2002 14:23:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7ELNSJU046116 for ; Wed, 14 Aug 2002 14:23:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7ELNPgl046113 for perforce@freebsd.org; Wed, 14 Aug 2002 14:23:25 -0700 (PDT) Date: Wed, 14 Aug 2002 14:23:25 -0700 (PDT) Message-Id: <200208142123.g7ELNPgl046113@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15978 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15978 Change 15978 by rwatson@rwatson_tislabs on 2002/08/14 14:22:40 Integ base FreeBSD tree into TrustedBSD base branch. Bring in various things, including some recent MAC merges, including the merge of vn_rdwr()/IO_NOMACCHECK and pipe labeling. Affected files ... .. //depot/projects/trustedbsd/base/bin/chmod/chmod.1#5 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.1#3 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#9 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.1#4 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#8 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.1#5 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#8 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.1#3 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#6 integrate .. //depot/projects/trustedbsd/base/contrib/pnpinfo/pnpinfo.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/top/display.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/CHANGES#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Configure#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/FAQ#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.org#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/NEWS#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/PROBLEMS#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/README#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/CA.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/apps/der_chop#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/config#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/asn1/asn1_lib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/bio/b_print.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cryptlib.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/cryptlib.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/mem.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/crypto/opensslv.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/openssl.spec#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_clnt.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_enc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_lib.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s2_srvr.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_clnt.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/s3_srvr.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_asn1.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_err.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/ssl/ssl_sess.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/tools/c_rehash#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssl/util/mkerr.pl#3 integrate .. //depot/projects/trustedbsd/base/etc/MAKEDEV#14 integrate .. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#4 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#14 integrate .. //depot/projects/trustedbsd/base/etc/inetd.conf#6 integrate .. //depot/projects/trustedbsd/base/etc/periodic/daily/150.clean-hoststat#2 integrate .. //depot/projects/trustedbsd/base/etc/rc#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/amd#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/keyserv#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/mountd#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/network#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/network1#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nfsd#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ntpd#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/othermta#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/rpcbind#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/yppasswdd#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ypserv#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ypset#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ypupdated#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ypxfrd#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.network#12 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#4 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#16 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2#9 integrate .. //depot/projects/trustedbsd/base/games/trek/DOC/trekmanual.nr#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/ld.1#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/ld.1aout#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/man/makewhatis/makewhatis.1#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/send-pr/send-pr.1#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/tar/tar.1#2 integrate .. //depot/projects/trustedbsd/base/include/wchar.h#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/include/config.h#3 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libasn1/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libhdb/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dlopen.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/errlst.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fmtcheck.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fmtmsg.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getvfsbyname.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getvfsent.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/semctl.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/collate.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/collate.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/euc.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/rune.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/setrunelocale.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/if_indextoname.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/nls/msgcat.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_clnt_create.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/asprintf.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fgetc.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fgets.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fgetwc.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/fgetws.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/fgetws.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/findfp.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fputc.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fputs.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fputwc.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/fputws.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/fputws.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/fread.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fwide.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/fwide.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/fwrite.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/getc.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/getchar.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/gets.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/getwc.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/getwc.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/getwchar.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/local.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/printf.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/putc.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/putchar.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/putwc.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/putwc.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/putwchar.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/refill.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/snprintf.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/sprintf.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/ungetc.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/ungetwc.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/ungetwc.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/vasprintf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfscanf.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vsnprintf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vsprintf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vsscanf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/wbuf.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtod.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/acct.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getrlimit.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/intro.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/utimes.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_sparc64.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/termcap.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libradius/libradius.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libufs/type.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login.conf.5#4 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_cap.h#3 integrate .. //depot/projects/trustedbsd/base/libexec/Makefile#3 integrate .. //depot/projects/trustedbsd/base/libexec/bootpd/bootpd.8#3 integrate .. //depot/projects/trustedbsd/base/libexec/comsat/comsat.8#3 integrate .. //depot/projects/trustedbsd/base/libexec/fingerd/fingerd.8#4 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpcmd.y#10 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#12 integrate .. //depot/projects/trustedbsd/base/libexec/getty/gettytab.5#2 integrate .. //depot/projects/trustedbsd/base/libexec/revnetgroup/revnetgroup.8#4 integrate .. //depot/projects/trustedbsd/base/release/Makefile#18 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#21 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#36 integrate .. //depot/projects/trustedbsd/base/release/i386/dokern.sh#7 integrate .. //depot/projects/trustedbsd/base/release/i386/drivers.conf#4 integrate .. //depot/projects/trustedbsd/base/release/scripts/driver-copy2.awk#2 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/dumpfs/dumpfs.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/dumpon/dumpon.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/preen.c#4 delete .. //depot/projects/trustedbsd/base/sbin/fsck_msdosfs/fsck_msdosfs.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/fsirand/fsirand.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/growfs/growfs.8#6 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/init/init.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#9 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/mount/mount.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/mount_ext2fs/mount_ext2fs.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nullfs/mount_nullfs.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/mount_std/mount_std.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/mount_udf/mount_udf.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/mount_unionfs/mount_unionfs.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/natd/natd.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/newfs.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/nfsiod/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/nfsiod/nfsiod.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/nfsiod/nfsiod.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/quotacheck/preen.c#1 branch .. //depot/projects/trustedbsd/base/sbin/tunefs/tunefs.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/umount/umount.c#3 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/README#3 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/ROADMAP#2 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/ReleaseNotes#3 integrate .. //depot/projects/trustedbsd/base/share/examples/isdn/ThankYou#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#14 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/gif.4#7 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ichsmb.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/pcic.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ppp.4#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sio.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snp.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ti.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ucom.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uftdi.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/uvisor.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/wi.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man5/device.hints.5#2 integrate .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#12 integrate .. //depot/projects/trustedbsd/base/share/man/man7/tuning.7#11 integrate .. //depot/projects/trustedbsd/base/share/man/man8/man8.alpha/MAKEDEV.8#4 integrate .. //depot/projects/trustedbsd/base/share/man/man8/man8.i386/MAKEDEV.8#5 integrate .. //depot/projects/trustedbsd/base/share/man/man8/picobsd.8#7 integrate .. //depot/projects/trustedbsd/base/share/man/man8/yp.8#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mi_switch.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/style.9#11 integrate .. //depot/projects/trustedbsd/base/share/man/man9/ucred.9#7 integrate .. //depot/projects/trustedbsd/base/share/man/man9/uidinfo.9#4 integrate .. //depot/projects/trustedbsd/base/share/me/tmac.orig_me#2 integrate .. //depot/projects/trustedbsd/base/share/termcap/termcap.5#2 integrate .. //depot/projects/trustedbsd/base/share/termcap/termcap.src#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#14 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/imgact_osf1.c#6 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_mount.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/loader.8#11 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.4th.8#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/libi386/i386_module.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/pecoff/imgact_pecoff.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/imgact_svr4.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_fcntl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#9 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#9 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#29 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#14 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.pre.mk#12 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#14 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_ps.c#5 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_sym.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac_pci.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-all.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-all.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/fc_log.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_cnfg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_fc.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_init.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_ioc.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_lan.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_raid.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_targ.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpilib/mpi_type.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_debug.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_freebsd.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_freebsd.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mpt/mpt_pci.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbdevid.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbvar.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uftdi.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/uftdireg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs_data.h#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uvisor.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumioctl.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#22 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wireg.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/wi_hostap.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vfsops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_lookup.c#5 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vnops.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_misc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/imgact_coff.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/i4b_ioctl.h#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/imgact_linux.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i4b/include/i4b_l3l4.h#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer3/i4b_l2if.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer3/i4b_q931.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer4/i4b_i4bdrv.c#5 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer4/i4b_l4.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i4b/layer4/i4b_l4mgmt.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#18 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/sapic.c#4 integrate .. //depot/projects/trustedbsd/base/sys/isofs/cd9660/cd9660_vfsops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_aout.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_elf.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_lockf.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_msg.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_sem.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_tty.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#22 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#19 integrate .. //depot/projects/trustedbsd/base/sys/modules/ibcs2/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_ppp/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/svr4/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/uftdi/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/bpfdesc.h#4 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.c#10 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ppp.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_pppvar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#7 integrate .. //depot/projects/trustedbsd/base/sys/net/ppp_tty.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw.h#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_lock.c#7 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#12 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp.c#5 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_i810.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#15 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/tsb.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/vmparam.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#15 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#20 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tsb.c#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/_label.h#1 branch .. //depot/projects/trustedbsd/base/sys/sys/elf_common.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/errno.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/pipe.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#17 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/ucred.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#21 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_extern.h#8 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#13 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/quota.h#5 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_extern.h#6 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_ihash.c#6 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_lookup.c#7 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_readwrite.c#9 delete .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#13 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#13 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_kern.c#9 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#14 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#17 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#10 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#10 integrate .. //depot/projects/trustedbsd/base/tools/tools/kdrv/sample.drvinfo#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/at/at.man#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/biff/biff.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendar.1#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendar.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/colldef/parse.y#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/colldef/scan.l#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/csplit/csplit.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/find/function.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/fstat/fstat.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/join/join.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/lsvfs/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/lsvfs/lsvfs.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/main.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/paste/paste.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/rsh/rsh.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/sed/process.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/stat/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/stat/stat.1#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/stat/stat.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/su/su.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/vmstat/vmstat.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/wc/wc.1#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/wc/wc.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/xargs/xargs.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/acpi/amldb/amldb.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/adduser/adduser.perl#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/config/config.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/isdnd/isdnd.h#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/isdnd/isdnd.rc.5#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/isdnd/msghdl.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/isdnd/rc_config.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/isdnd/rc_parse.y#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/isdnd/rc_scan.l#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/i4b/isdnd/support.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/inetd/inetd.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/keyserv/keyserv.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lpr/common_source/matchjobs.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/nfsd/nfsd.8#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pciconf/pciconf.8#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/plist.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/version.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ppp/ppp.8.m4#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/system.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/watch/watch.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wicontrol/wicontrol.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/ypserv.8#5 integrate Differences ... ==== //depot/projects/trustedbsd/base/bin/chmod/chmod.1#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.30 2002/08/04 05:29:13 obrien Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.31 2002/08/09 10:34:57 ru Exp $ .\" .Dd March 31, 1994 .Dt CHMOD 1 @@ -86,7 +86,8 @@ .It Fl v Cause .Nm -to be verbose, showing filenames as the mode is modified. If the +to be verbose, showing filenames as the mode is modified. +If the .Fl v flag is specified more than once, the old and new modes of the file will also be printed, in both octal and symbolic notation. @@ -126,7 +127,7 @@ option to .Xr mount 8 . .It Li 2000 -(the set-group-ID-on-execution bit) Executable files with this bit set +(the set-group-ID-on-execution bit) Executable files with this bit set will run with effective gid set to the gid of the file owner. .It Li 1000 (the sticky bit) @@ -139,21 +140,24 @@ .It Li 0200 Allow write by owner. .It Li 0100 -For files, allow execution by owner. For directories, allow the owner to +For files, allow execution by owner. +For directories, allow the owner to search in the directory. .It Li 0040 Allow read by group members. .It Li 0020 Allow write by group members. .It Li 0010 -For files, allow execution by group members. For directories, allow +For files, allow execution by group members. +For directories, allow group members to search in the directory. .It Li 0004 Allow read by others. .It Li 0002 Allow write by others. .It Li 0001 -For files, allow execution by others. For directories allow others to +For files, allow execution by others. +For directories allow others to search in the directory. .El .Pp ==== //depot/projects/trustedbsd/base/bin/cp/cp.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.23 2002/07/23 00:42:56 johan Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.24 2002/08/09 10:38:34 ru Exp $ .\" .Dd April 18, 1994 .Dt CP 1 @@ -142,7 +142,7 @@ .Fl n options.) .It Fl n -Do not overwriting an existing file. +Do not overwrite an existing file. (The .Fl n option overrides any previous ==== //depot/projects/trustedbsd/base/bin/df/df.c#9 (text+ko) ==== @@ -48,7 +48,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.40 2002/06/30 05:13:52 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.41 2002/08/10 20:19:02 mux Exp $"); #include #include @@ -491,31 +491,40 @@ makenetvfslist(void) { char *str, *strptr, **listptr; - int mib[3], maxvfsconf, cnt=0, i; - size_t miblen; - struct ovfsconf *ptr; + struct xvfsconf *xvfsp; + size_t buflen; + int cnt, i, maxvfsconf; - mib[0] = CTL_VFS; mib[1] = VFS_GENERIC; mib[2] = VFS_MAXTYPENUM; - miblen=sizeof(maxvfsconf); - if (sysctl(mib, (unsigned int)(sizeof(mib) / sizeof(mib[0])), - &maxvfsconf, &miblen, NULL, 0)) { - warnx("sysctl failed"); + if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) { + warn("sysctl(vfs.conflist)"); + return (NULL); + } + xvfsp = malloc(buflen); + if (xvfsp == NULL) { + warnx("malloc failed"); + return (NULL); + } + if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { + warn("sysctl(vfs.conflist)"); return (NULL); } + maxvfsconf = buflen / sizeof(struct xvfsconf); if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) { warnx("malloc failed"); return (NULL); } - for (ptr = getvfsent(); ptr; ptr = getvfsent()) - if (ptr->vfc_flags & VFCF_NETWORK) { - listptr[cnt++] = strdup(ptr->vfc_name); + for (cnt = 0, i = 0; i < maxvfsconf; i++) { + if (xvfsp->vfc_flags & VFCF_NETWORK) { + listptr[cnt++] = strdup(xvfsp->vfc_name); if (listptr[cnt-1] == NULL) { warnx("malloc failed"); return (NULL); } } + xvfsp++; + } if (cnt == 0 || (str = malloc(sizeof(char) * (32 * cnt + cnt + 2))) == NULL) { ==== //depot/projects/trustedbsd/base/bin/ln/ln.1#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.23 2002/06/25 10:02:12 tjr Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.24 2002/08/12 12:34:03 tjr Exp $ .\" .Dd December 30, 1993 .Dt LN 1 @@ -191,7 +191,7 @@ The .Nm utility conforms to -.St -p1003.1-2001 . +.St -p1003.2-92 . .Pp The simplified .Nm link ==== //depot/projects/trustedbsd/base/bin/ls/ls.c#8 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.63 2002/07/10 20:44:54 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.64 2002/08/11 13:05:17 schweikh Exp $"); #include #include @@ -114,7 +114,7 @@ int f_slash; /* similar to f_type, but only for dirs */ int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ - int f_stream; /* stream the output, seperate with commas */ + int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ ==== //depot/projects/trustedbsd/base/bin/mv/mv.1#5 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.22 2002/07/09 17:45:13 johan Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.23 2002/08/09 10:46:00 ru Exp $ .\" -.Dd May 31, 1993 +.Dd July 9, 2002 .Dt MV 1 .Os .Sh NAME @@ -43,11 +43,11 @@ .Nd move files .Sh SYNOPSIS .Nm -.Op Fl f | Fl i | Fl n +.Op Fl f | i | n .Op Fl v .Ar source target .Nm -.Op Fl f | Fl i | Fl n +.Op Fl f | i | n .Op Fl v .Ar source ... directory .Sh DESCRIPTION @@ -73,7 +73,7 @@ component of the named file. .Pp The following options are available: -.Bl -tag -width flag +.Bl -tag -width indent .It Fl f Do not prompt for confirmation before overwriting the destination path. @@ -90,9 +90,9 @@ to write a prompt to standard error before moving a file that would overwrite an existing file. If the response from the standard input begins with the character -.Sq Li y +.Ql y or -.Sq Li Y , +.Ql Y , the move is attempted. (The .Fl i @@ -127,7 +127,7 @@ option. .Pp As the -.Xr rename 2 +.Xr rename 2 call does not work across filesystems, .Nm uses @@ -138,8 +138,8 @@ The effect is equivalent to: .Bd -literal -offset indent rm -f destination_path && \e -\tcp -pRP source_file destination && \e -\trm -rf source_file +cp -pRP source_file destination && \e +rm -rf source_file .Ed .Sh DIAGNOSTICS .Ex -std ==== //depot/projects/trustedbsd/base/bin/ps/ps.1#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.55 2002/06/10 22:48:51 jmallett Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.56 2002/08/09 10:49:50 ru Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -241,7 +241,8 @@ is displayed. .It mwchan The event name if the process is blocked normally, or the mutex name if -the process is blocked on a mutex. See the wchan and mtxname keywords +the process is blocked on a mutex. +See the wchan and mtxname keywords for details. .It nice The process scheduling increment (see @@ -376,7 +377,7 @@ .It args command and arguments .It comm -command +command .It command command and arguments .It cpu ==== //depot/projects/trustedbsd/base/bin/rcp/rcp.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rcp.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.14 2002/04/16 20:07:10 charnier Exp $ +.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.15 2002/08/09 16:12:08 ume Exp $ .\" .Dd May 31, 1993 .Dt RCP 1 @@ -40,11 +40,11 @@ .Nd remote file copy .Sh SYNOPSIS .Nm -.Op Fl Kpx +.Op Fl 46Kpx .Op Fl k Ar realm .Ar file1 file2 .Nm -.Op Fl Kprx +.Op Fl 46Kprx .Op Fl k Ar realm .Ar .Ar directory @@ -63,6 +63,10 @@ .Pp The following options are available: .Bl -tag -width indent +.It Fl 4 +Use IPv4 addresses only. +.It Fl 6 +Use IPv6 addresses only. .It Fl K Turn off all Kerberos authentication. .It Fl k ==== //depot/projects/trustedbsd/base/bin/rcp/rcp.c#6 (text+ko) ==== @@ -50,7 +50,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.34 2002/07/10 20:44:55 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.35 2002/08/09 16:12:08 ume Exp $"); #include #include @@ -92,12 +92,12 @@ extern char *krb_realmofhost(); #ifdef CRYPT int doencrypt = 0; -#define OPTIONS "dfKk:prtx" +#define OPTIONS "46dfKk:prtx" #else -#define OPTIONS "dfKk:prt" +#define OPTIONS "46dfKk:prt" #endif #else -#define OPTIONS "dfprt" +#define OPTIONS "46dfprt" #endif struct passwd *pwd; @@ -105,6 +105,7 @@ uid_t userid; int errs, rem; int pflag, iamremote, iamrecursive, targetshouldbedirectory; +int family = PF_UNSPEC; static int argc_copy; static char **argv_copy; @@ -154,6 +155,14 @@ fflag = tflag = 0; while ((ch = getopt(argc, argv, OPTIONS)) != -1) switch(ch) { /* User-visible flags. */ + case '4': + family = PF_INET; + break; + + case '6': + family = PF_INET6; + break; + case 'K': #ifdef KERBEROS use_kerberos = 0; @@ -344,15 +353,18 @@ tuser ? tuser : pwd->pw_name); else #endif - rem = rcmd(&host, port, pwd->pw_name, + rem = rcmd_af(&host, port, + pwd->pw_name, tuser ? tuser : pwd->pw_name, - bp, 0); + bp, 0, family); if (rem < 0) exit(1); - tos = IPTOS_THROUGHPUT; - if (setsockopt(rem, IPPROTO_IP, IP_TOS, - &tos, sizeof(int)) < 0) - warn("TOS (ignored)"); + if (family == PF_INET) { + tos = IPTOS_THROUGHPUT; + if (setsockopt(rem, IPPROTO_IP, IP_TOS, + &tos, sizeof(int)) < 0) + warn("TOS (ignored)"); + } if (response() < 0) exit(1); (void)free(bp); @@ -408,16 +420,20 @@ use_kerberos ? kerberos(&host, bp, pwd->pw_name, suser) : #endif - rcmd(&host, port, pwd->pw_name, suser, bp, 0); + rcmd_af(&host, port, pwd->pw_name, suser, bp, 0, + family); (void)free(bp); if (rem < 0) { ++errs; continue; } (void)seteuid(userid); - tos = IPTOS_THROUGHPUT; - if (setsockopt(rem, IPPROTO_IP, IP_TOS, &tos, sizeof(int)) < 0) - warn("TOS (ignored)"); + if (family == PF_INET) { + tos = IPTOS_THROUGHPUT; + if (setsockopt(rem, IPPROTO_IP, IP_TOS, &tos, + sizeof(int)) < 0) + warn("TOS (ignored)"); + } sink(1, argv + argc - 1); (void)seteuid(0); (void)close(rem); @@ -834,7 +850,7 @@ errx(1, "the -x option requires Kerberos authentication"); #endif - rem = rcmd(host, port, locuser, user, bp, 0); + rem = rcmd_af(host, port, locuser, user, bp, 0, family); } return (rem); } @@ -879,17 +895,17 @@ #ifdef KERBEROS #ifdef CRYPT (void)fprintf(stderr, "%s\n%s\n", - "usage: rcp [-Kpx] [-k realm] f1 f2", - " rcp [-Kprx] [-k realm] f1 ... fn directory"); + "usage: rcp [-46Kpx] [-k realm] f1 f2", + " rcp [-46Kprx] [-k realm] f1 ... fn directory"); #else (void)fprintf(stderr, "%s\n%s\n", - "usage: rcp [-Kp] [-k realm] f1 f2", - " rcp [-Kpr] [-k realm] f1 ... fn directory"); + "usage: rcp [-46Kp] [-k realm] f1 f2", + " rcp [-46Kpr] [-k realm] f1 ... fn directory"); #endif #else (void)fprintf(stderr, "%s\n%s\n", - "usage: rcp [-p] f1 f2", - " rcp [-pr] f1 ... fn directory"); + "usage: rcp [-46p] f1 f2", + " rcp [-46pr] f1 ... fn directory"); #endif exit(1); } ==== //depot/projects/trustedbsd/base/bin/sh/parser.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.42 2002/07/22 05:50:12 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.43 2002/08/11 03:04:23 tjr Exp $"); #include @@ -478,15 +478,14 @@ break; /* Handle an empty command like other simple commands. */ case TSEMI: + case TAND: + case TOR: /* * An empty command before a ; doesn't make much sense, and * should certainly be disallowed in the case of `if ;'. */ if (!redir) synexpect(-1); - case TAND: - case TOR: - synexpect(-1); case TNL: case TEOF: case TWORD: ==== //depot/projects/trustedbsd/base/bin/sh/sh.1#6 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.75 2002/07/25 10:57:39 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.76 2002/08/09 10:59:20 ru Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -1280,7 +1280,7 @@ (see .Ic unalias ) . Alias values are written with appropriate quoting so that they are -suitable for reinput to the shell. +suitable for re-input to the shell. .It Ic bg Op Ar job ... Continue the specified jobs (or the current job if no jobs are given) @@ -1305,7 +1305,7 @@ If .Ar directory does not begin with -.Pa / , . , +.Pa / , \&. , or .Pa .. , then the directories listed in the @@ -1347,14 +1347,7 @@ A synonym for the .Ic cd builtin command. -.It Xo -.Ic command -.Op Fl p -.Oo -.Ar utility -.Op Ar argument ... -.Oc -.Xc +.It Ic command Oo Fl p Oc Op Ar utility Op Ar argument ... Execute the specified .Ar utility as a simple command (see the @@ -1367,11 +1360,7 @@ default value of .Ev PATH that is guaranteed to find all of the standard utilities. -.It Xo -.Ic echo -.Op Fl e | Fl n -.Op Ar string -.Xc +.It Ic echo Oo Fl e | n Oc Op Ar string Print .Ar string to the standard output with a newline appended. @@ -1453,11 +1442,7 @@ is given it is used as the exit status of the shell; otherwise the exit status of the preceding command is used. -.It Xo -.Ic export -.Op Fl p -.Op Ar name ... -.Xc +.It Ic export Oo Fl p Oc Op Ar name ... The specified names are exported so that they will appear in the environment of subsequent commands. The only way to un-export a variable is to @@ -1628,11 +1613,7 @@ If the .Ar job >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 16: 5:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AA1037B405; Wed, 14 Aug 2002 16:05:34 -0700 (PDT) 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 206A937B400 for ; Wed, 14 Aug 2002 16:05:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB4AA43E6A for ; Wed, 14 Aug 2002 16:05:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7EN5XJU067261 for ; Wed, 14 Aug 2002 16:05:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7EN5XfB067220 for perforce@freebsd.org; Wed, 14 Aug 2002 16:05:33 -0700 (PDT) Date: Wed, 14 Aug 2002 16:05:33 -0700 (PDT) Message-Id: <200208142305.g7EN5XfB067220@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15982 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15982 Change 15982 by rwatson@rwatson_curry on 2002/08/14 16:05:14 Fix GENERIC build: missed a mac_policy->mac_syscall change. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#239 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#239 (text+ko) ==== @@ -3305,7 +3305,7 @@ } int -mac_syscall(struct thread *td, struct mac_policy_args *uap) +mac_syscall(struct thread *td, struct mac_syscall_args *uap) { return (ENOSYS); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 16:59:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9370337B401; Wed, 14 Aug 2002 16:58:40 -0700 (PDT) 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 41FFA37B400 for ; Wed, 14 Aug 2002 16:58:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5474F43E4A for ; Wed, 14 Aug 2002 16:58:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7ENwdJU072038 for ; Wed, 14 Aug 2002 16:58:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7ENwcIA072022 for perforce@freebsd.org; Wed, 14 Aug 2002 16:58:38 -0700 (PDT) Date: Wed, 14 Aug 2002 16:58:38 -0700 (PDT) Message-Id: <200208142358.g7ENwcIA072022@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15984 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15984 Change 15984 by peter@peter_daintree on 2002/08/14 16:58:07 IFC @15983 Affected files ... .. //depot/projects/ia64/etc/defaults/rc.conf#16 integrate .. //depot/projects/ia64/etc/rc#15 integrate .. //depot/projects/ia64/etc/rc.d/amd#4 integrate .. //depot/projects/ia64/etc/rc.d/keyserv#2 integrate .. //depot/projects/ia64/etc/rc.d/mountd#5 integrate .. //depot/projects/ia64/etc/rc.d/nfsd#4 integrate .. //depot/projects/ia64/etc/rc.d/ntpd#3 integrate .. //depot/projects/ia64/etc/rc.d/rpcbind#4 integrate .. //depot/projects/ia64/etc/rc.d/yppasswdd#3 integrate .. //depot/projects/ia64/etc/rc.d/ypserv#3 integrate .. //depot/projects/ia64/etc/rc.d/ypset#2 integrate .. //depot/projects/ia64/etc/rc.d/ypupdated#2 integrate .. //depot/projects/ia64/etc/rc.d/ypxfrd#2 integrate .. //depot/projects/ia64/etc/rc.network#15 integrate .. //depot/projects/ia64/etc/rc.subr#4 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate .. //depot/projects/ia64/gnu/usr.bin/ld/ld.1#2 integrate .. //depot/projects/ia64/gnu/usr.bin/ld/ld.1aout#2 integrate .. //depot/projects/ia64/gnu/usr.bin/man/makewhatis/makewhatis.1#2 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#4 integrate .. //depot/projects/ia64/gnu/usr.bin/tar/tar.1#2 integrate .. //depot/projects/ia64/include/arpa/inet.h#8 integrate .. //depot/projects/ia64/include/search.h#3 integrate .. //depot/projects/ia64/include/time.h#6 integrate .. //depot/projects/ia64/include/wchar.h#5 integrate .. //depot/projects/ia64/kerberos5/include/config.h#3 integrate .. //depot/projects/ia64/kerberos5/lib/libasn1/Makefile#5 integrate .. //depot/projects/ia64/kerberos5/lib/libhdb/Makefile#5 integrate .. //depot/projects/ia64/lib/libc/gen/fmtcheck.3#3 integrate .. //depot/projects/ia64/lib/libc/locale/collate.c#5 integrate .. //depot/projects/ia64/lib/libc/locale/collate.h#5 integrate .. //depot/projects/ia64/lib/libc/net/inet.3#3 integrate .. //depot/projects/ia64/lib/libc/net/inet_ntop.c#4 integrate .. //depot/projects/ia64/lib/libc/net/inet_pton.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/stdio/asprintf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/fgetc.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fgets.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fgetwc.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/fgetws.3#1 branch .. //depot/projects/ia64/lib/libc/stdio/fgetws.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/findfp.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fputc.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fputs.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fputwc.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/fputws.3#1 branch .. //depot/projects/ia64/lib/libc/stdio/fputws.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/fread.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/fwide.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/fwide.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/fwrite.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/getc.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/getchar.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/gets.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/getwc.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/getwc.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/getwchar.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/local.h#3 integrate .. //depot/projects/ia64/lib/libc/stdio/putc.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/putchar.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/putwc.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/putwc.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/putwchar.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/refill.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/snprintf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/sprintf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/ungetc.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/ungetwc.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/ungetwc.c#1 branch .. //depot/projects/ia64/lib/libc/stdio/vasprintf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#8 integrate .. //depot/projects/ia64/lib/libc/stdio/vfscanf.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/vsnprintf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/vsprintf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/vsscanf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/wbuf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtod.c#10 integrate .. //depot/projects/ia64/lib/libc/stdlib/tdelete.c#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/tsearch.3#2 integrate .. //depot/projects/ia64/lib/libc/stdtime/strftime.3#3 integrate .. //depot/projects/ia64/lib/libc/stdtime/strftime.c#4 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.3#2 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.c#3 integrate .. //depot/projects/ia64/lib/libc/string/strcat.3#3 integrate .. //depot/projects/ia64/lib/libc/string/strcat.c#4 integrate .. //depot/projects/ia64/lib/libc/string/strcpy.3#3 integrate .. //depot/projects/ia64/lib/libc/string/strcpy.c#4 integrate .. //depot/projects/ia64/lib/libc/string/strncat.c#4 integrate .. //depot/projects/ia64/lib/libc/string/strncpy.c#4 integrate .. //depot/projects/ia64/lib/libc/string/strxfrm.3#2 integrate .. //depot/projects/ia64/lib/libc/string/strxfrm.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/acct.2#3 integrate .. //depot/projects/ia64/lib/libugidfw/ugidfw.c#2 integrate .. //depot/projects/ia64/libexec/Makefile#5 integrate .. //depot/projects/ia64/libexec/bootpd/bootpd.8#3 integrate .. //depot/projects/ia64/libexec/comsat/comsat.8#3 integrate .. //depot/projects/ia64/libexec/fingerd/fingerd.8#5 integrate .. //depot/projects/ia64/libexec/ftpd/ftpcmd.y#8 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#9 integrate .. //depot/projects/ia64/libexec/getty/gettytab.5#2 integrate .. //depot/projects/ia64/release/Makefile#19 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.8#8 integrate .. //depot/projects/ia64/sbin/dumpon/dumpon.8#5 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/fsck_msdosfs.8#4 integrate .. //depot/projects/ia64/sbin/fsirand/fsirand.8#3 integrate .. //depot/projects/ia64/sbin/growfs/growfs.8#5 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#10 integrate .. //depot/projects/ia64/sbin/init/init.8#3 integrate .. //depot/projects/ia64/sbin/mount/mount.8#6 integrate .. //depot/projects/ia64/sbin/mount_ext2fs/mount_ext2fs.c#5 integrate .. //depot/projects/ia64/sbin/mount_nullfs/mount_nullfs.c#5 integrate .. //depot/projects/ia64/sbin/mount_udf/mount_udf.c#4 integrate .. //depot/projects/ia64/sbin/mount_unionfs/mount_unionfs.c#6 integrate .. //depot/projects/ia64/sbin/natd/natd.8#5 integrate .. //depot/projects/ia64/sbin/newfs/newfs.8#10 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.8#8 integrate .. //depot/projects/ia64/share/man/man4/Makefile#13 integrate .. //depot/projects/ia64/share/man/man4/acpi.4#3 integrate .. //depot/projects/ia64/share/man/man4/gif.4#6 integrate .. //depot/projects/ia64/share/man/man4/pcic.4#4 integrate .. //depot/projects/ia64/share/man/man4/sio.4#4 integrate .. //depot/projects/ia64/share/man/man4/snp.4#5 integrate .. //depot/projects/ia64/share/man/man4/ti.4#3 integrate .. //depot/projects/ia64/share/man/man4/ucom.4#3 integrate .. //depot/projects/ia64/share/man/man4/uvisor.4#1 branch .. //depot/projects/ia64/share/man/man4/wi.4#7 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#18 integrate .. //depot/projects/ia64/share/man/man7/tuning.7#10 integrate .. //depot/projects/ia64/share/man/man8/man8.alpha/MAKEDEV.8#4 integrate .. //depot/projects/ia64/share/man/man8/man8.i386/MAKEDEV.8#5 integrate .. //depot/projects/ia64/share/man/man8/picobsd.8#10 integrate .. //depot/projects/ia64/share/man/man8/yp.8#2 integrate .. //depot/projects/ia64/share/man/man9/mi_switch.9#3 integrate .. //depot/projects/ia64/share/man/man9/style.9#11 integrate .. //depot/projects/ia64/share/man/man9/ucred.9#7 integrate .. //depot/projects/ia64/share/man/man9/uidinfo.9#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#14 integrate .. //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#6 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#9 integrate .. //depot/projects/ia64/sys/boot/forth/loader.4th.8#5 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#8 integrate .. //depot/projects/ia64/sys/compat/svr4/imgact_svr4.c#7 integrate .. //depot/projects/ia64/sys/conf/NOTES#19 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#17 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#11 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#5 integrate .. //depot/projects/ia64/sys/ddb/db_sym.h#4 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#16 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#5 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumioctl.c#5 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vfsops.c#6 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#9 integrate .. //depot/projects/ia64/sys/i386/linux/imgact_linux.c#7 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#10 integrate .. //depot/projects/ia64/sys/kern/imgact_aout.c#9 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_lockf.c#5 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#18 integrate .. //depot/projects/ia64/sys/kern/sysv_msg.c#7 integrate .. //depot/projects/ia64/sys/kern/sysv_sem.c#8 integrate .. //depot/projects/ia64/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#16 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#10 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/ia64/sys/net/bpfdesc.h#4 integrate .. //depot/projects/ia64/sys/net/if_var.h#8 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/ia64/sys/nfsclient/nfs.h#6 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#9 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#16 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#19 integrate .. //depot/projects/ia64/sys/sys/_label.h#1 branch .. //depot/projects/ia64/sys/sys/mac.h#2 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#8 integrate .. //depot/projects/ia64/sys/sys/mount.h#14 integrate .. //depot/projects/ia64/sys/sys/pipe.h#4 integrate .. //depot/projects/ia64/sys/sys/socketvar.h#20 integrate .. //depot/projects/ia64/sys/sys/ucred.h#11 integrate .. //depot/projects/ia64/sys/sys/vnode.h#17 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_extern.h#9 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#19 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/ia64/sys/ufs/ufs/quota.h#5 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extern.h#10 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_ihash.c#6 integrate .. //depot/projects/ia64/usr.bin/at/at.man#8 integrate .. //depot/projects/ia64/usr.bin/biff/biff.1#6 integrate .. //depot/projects/ia64/usr.bin/calendar/calendar.1#6 integrate .. //depot/projects/ia64/usr.bin/calendar/calendar.c#5 integrate .. //depot/projects/ia64/usr.bin/colldef/parse.y#6 integrate .. //depot/projects/ia64/usr.bin/colldef/scan.l#5 integrate .. //depot/projects/ia64/usr.bin/csplit/csplit.1#5 integrate .. //depot/projects/ia64/usr.bin/fstat/fstat.c#9 integrate .. //depot/projects/ia64/usr.bin/join/join.1#5 integrate .. //depot/projects/ia64/usr.bin/rsh/rsh.c#6 integrate .. //depot/projects/ia64/usr.bin/stat/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/stat/stat.1#2 integrate .. //depot/projects/ia64/usr.bin/stat/stat.c#2 integrate .. //depot/projects/ia64/usr.sbin/acpi/amldb/amldb.8#3 integrate .. //depot/projects/ia64/usr.sbin/config/config.8#4 integrate .. //depot/projects/ia64/usr.sbin/inetd/inetd.8#6 integrate .. //depot/projects/ia64/usr.sbin/keyserv/keyserv.8#3 integrate .. //depot/projects/ia64/usr.sbin/pciconf/pciconf.8#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/ppp.8.m4#12 integrate .. //depot/projects/ia64/usr.sbin/ypserv/ypserv.8#4 integrate Differences ... ==== //depot/projects/ia64/etc/defaults/rc.conf#16 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.154 2002/07/25 15:44:00 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.155 2002/08/14 05:37:15 gordon Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -167,7 +167,7 @@ sshd_program="/usr/sbin/sshd" # path to sshd, if you want a different one. sshd_flags="" # Additional flags for sshd. -### Network daemon (NFS): All need portmap_enable="YES" ### +### Network daemon (NFS): All need rpcbind_enable="YES" ### amd_enable="NO" # Run amd service with $amd_flags (or NO). amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map" amd_map_program="NO" # Can be set to "ypcat -k amd.master" @@ -175,16 +175,16 @@ nfs_access_cache="2" # Client cache timeout in seconds nfs_server_enable="NO" # This host is an NFS server (or NO). nfs_server_flags="-u -t -n 4" # Flags to nfsd (if enabled). -single_mountd_enable="NO" # Run mountd only (or NO). +mountd_enable="NO" # Run mountd (or NO). mountd_flags="-r" # Flags to mountd (if NFS server enabled). weak_mountd_authentication="NO" # Allow non-root mount requests to be served. nfs_reserved_port_only="NO" # Provide NFS only on secure port (or NO). nfs_bufpackets="DEFAULT" # bufspace (in packets) for client (or DEFAULT) rpc_lockd_enable="NO" # Run NFS rpc.lockd needed for client/server. rpc_statd_enable="NO" # Run NFS rpc.statd needed for client/server. -portmap_enable="NO" # Run the portmapper service (YES/NO). -portmap_program="/usr/sbin/rpcbind" # path to portmap, if you want a different one. -portmap_flags="" # Flags to portmap (if enabled). +rpcbind_enable="NO" # Run the portmapper service (YES/NO). +rpcbind_program="/usr/sbin/rpcbind" # path to rpcbind, if you want a different one. +rpcbind_flags="" # Flags to rpcbind (if enabled). rpc_ypupdated_enable="NO" # Run if NIS master and SecureRPC (or NO). keyserv_enable="NO" # Run the SecureRPC keyserver (or NO). keyserv_flags="" # Flags to keyserv (if enabled). @@ -195,11 +195,11 @@ ntpdate_enable="NO" # Run ntpdate to sync time on boot (or NO). ntpdate_program="/usr/sbin/ntpdate" # path to ntpdate, if you want a different one. ntpdate_flags="-b" # Flags to ntpdate (if enabled). -xntpd_enable="NO" # Run ntpd Network Time Protocol (or NO). -xntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one. -xntpd_flags="-p /var/run/ntpd.pid" # Flags to ntpd (if enabled). +ntpd_enable="NO" # Run ntpd Network Time Protocol (or NO). +ntpd_program="/usr/sbin/ntpd" # path to ntpd, if you want a different one. +ntpd_flags="-p /var/run/ntpd.pid" # Flags to ntpd (if enabled). -# Network Information Services (NIS) options: All need portmap_enable="YES" ### +# Network Information Services (NIS) options: All need rpcbind_enable="YES" ### nis_client_enable="NO" # We're an NIS client (or NO). nis_client_flags="" # Flags to ypbind (if enabled). nis_ypset_enable="NO" # Run ypset at boot time (or NO). ==== //depot/projects/ia64/etc/rc#15 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.314 2002/06/13 22:30:02 gordon Exp $ +# $FreeBSD: src/etc/rc,v 1.316 2002/08/14 05:58:44 gordon Exp $ # # System startup script run by init on autoboot @@ -78,8 +78,6 @@ autoboot=yes _boot="faststart" rc_fast=yes # run_rc_command(): do fast booting - export autoboot - export rc_fast else autoboot=no _boot="start" @@ -122,6 +120,17 @@ . /etc/rc.conf fi +# XXX - Deprecated variable name support +# for rpcbind and ntpd +# +[ -n "$portmap_enable" ] && rpcbind_enable="$portmap_enable" +[ -n "$portmap_program" ] && rpcbind_program="$portmap_program" +[ -n "$portmap_flags" ] && rpcbind_flags="$portmap_flags" +[ -n "$single_mountd_enable" ] && mountd_enable="$single_mountd_enable" +[ -n "$xntpd_enable" ] && ntpd_enable="$xntpd_enable" +[ -n "$xntpd_program" ] && ntpd_program="$xntpd_program" +[ -n "$xntpd_flags" ] && ntpd_flags="$xntpd_flags" + feed_dev_random() { if [ -f "${1}" -a -r "${1}" -a -s "${1}" ]; then # echo "Using ${1} as an entropy file" @@ -153,11 +162,12 @@ esac } -chkdepend amd amd_enable portmap portmap_enable +chkdepend amd amd_enable rpcbind rpcbind_enable chkdepend amd amd_enable NFS nfs_client_enable -chkdepend NFS nfs_server_enable portmap portmap_enable -chkdepend NIS nis_server_enable portmap portmap_enable -chkdepend NIS nis_client_enable portmap portmap_enable +chkdepend NFS nfs_server_enable rpcbind rpcbind_enable +chkdepend NFS nfs_server_enable rpcbind rpcbind_enable +chkdepend NIS nis_server_enable rpcbind rpcbind_enable +chkdepend NIS nis_client_enable rpcbind rpcbind_enable # Enable dumpdev early so that a crash during the boot process can be caught. # ==== //depot/projects/ia64/etc/rc.d/amd#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.5 2002/06/24 19:50:56 jdp Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.6 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: amd @@ -36,7 +36,7 @@ force_depend nfsclient || return 1 fi - if ! checkyesno portmap_enable && \ + if ! checkyesno rpcbind_enable && \ ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 then force_depend rpcbind || return 1 ==== //depot/projects/ia64/etc/rc.d/keyserv#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/keyserv,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/keyserv,v 1.2 2002/08/14 05:44:32 gordon Exp $ # # Start keyserv if we are running Secure RPC @@ -16,7 +16,18 @@ name="keyserv" rcvar=`set_rcvar` command="/usr/sbin/${name}" -required_vars="portmap_enable" +start_precmd="keyserv_prestart" + +keyserv_prestart() +{ + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + + return 0 +} load_rc_config $name run_rc_command "$1" ==== //depot/projects/ia64/etc/rc.d/mountd#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: mountd,v 1.11 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountd,v 1.5 2002/07/07 22:19:08 gordon Exp $ +# $FreeBSD: src/etc/rc.d/mountd,v 1.6 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: mountd @@ -11,29 +11,17 @@ . /etc/rc.subr name="mountd" +rcvar=`set_rcvar` command="/usr/sbin/${name}" required_files="/etc/exports" start_precmd="mountd_precmd" extra_commands="reload" -case `${CMD_OSTYPE}` in -FreeBSD) - rcvar=`set_rcvar nfs_server` - ;; -NetBSD) - rcvar=`set_rcvar` - ;; -esac - mountd_precmd() { case `${CMD_OSTYPE}` in FreeBSD) - if ! sysctl vfs.nfsrv >/dev/null 2>&1; then - force_depend nfsserver || return 1 - fi - - if ! checkyesno portmap_enable && \ + if ! checkyesno rpcbind_enable && \ ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 then force_depend rpcbind || return 1 ==== //depot/projects/ia64/etc/rc.d/nfsd#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: nfsd,v 1.4 2001/06/16 06:13:10 lukem Exp $ -# $FreeBSD: src/etc/rc.d/nfsd,v 1.3 2002/07/07 22:19:08 gordon Exp $ +# $FreeBSD: src/etc/rc.d/nfsd,v 1.4 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: nfsd @@ -17,7 +17,6 @@ case `${CMD_OSTYPE}` in FreeBSD) command_args="${nfs_server_flags}" - required_vars="portmap_enable" start_precmd="nfsd_precmd" ;; NetBSD) @@ -32,6 +31,18 @@ force_depend nfsserver || return 1 fi + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + + if ! checkyesno mountd_enable && \ + ! /etc/rc.d/mountd forcestatus 1>/dev/null 2>&1 + then + force_depend mountd || return 1 + fi + if checkyesno nfs_reserved_port_only ; then echo -n ' NFS on reserved port only=YES' sysctl vfs.nfsrv.nfs_privport=1 > /dev/null ==== //depot/projects/ia64/etc/rc.d/ntpd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ntpd,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ntpd,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ntpd,v 1.3 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: ntpd @@ -11,21 +11,18 @@ . /etc/rc.subr +name=ntpd +rcvar=`set_rcvar` +command="/usr/sbin/${name}" +pidfile="/var/run/${name}.pid" +required_files="/etc/ntp.conf" + case `${CMD_OSTYPE}` in -FreeBSD) - name="xntpd" - ;; NetBSD) - name="ntpd" start_precmd="ntpd_precmd" ;; esac -rcvar=`set_rcvar` -command="/usr/sbin/ntpd" -pidfile="/var/run/ntpd.pid" -required_files="/etc/ntp.conf" - ntpd_precmd() { if [ -z "$ntpd_chrootdir" ]; then ==== //depot/projects/ia64/etc/rc.d/rpcbind#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: rpcbind,v 1.6 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/rpcbind,v 1.4 2002/06/21 19:50:01 dougb Exp $ +# $FreeBSD: src/etc/rc.d/rpcbind,v 1.5 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: rpcbind @@ -11,25 +11,14 @@ . /etc/rc.subr name="rpcbind" - -# XXX - Executable may be in a different location. The $name variable -# is different from the variable in rc.conf(5) so the -# subroutines in rc.subr won't catch it. -# -load_rc_config $name +rcvar=`set_rcvar` +command="/usr/sbin/${name}" case `${CMD_OSTYPE}` in -FreeBSD) - pidfile= - rcvar="portmap_enable" - command="${portmap_program:-/usr/sbin/${name}}" - eval ${name}_flags=\"${portmap_flags}\" - ;; NetBSD) - rcvar=$name - command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" ;; esac +load_rc_config $name run_rc_command "$1" ==== //depot/projects/ia64/etc/rc.d/yppasswdd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: yppasswdd,v 1.6 2002/03/22 04:34:01 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/yppasswdd,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/yppasswdd,v 1.3 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: yppasswdd @@ -18,7 +18,6 @@ case `${CMD_OSTYPE}` in FreeBSD) rcvar="nis_yppasswdd_enable" - required_vars="portmap_enable nis_server_enable" command_args="${nis_yppasswdd_flags}" ;; NetBSD) @@ -29,6 +28,21 @@ yppasswdd_precmd() { + case `${CMD_OSTYPE}` in + FreeBSD) + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + if ! checkyesno nis_server_enable && \ + ! /etc/rc.d/ypserv forcestatus 1>/dev/null 2>&1 + then + force_depend ypserv || return 1 + fi + ;; + esac + _domain=`domainname` if [ -z "$_domain" ]; then warn "domainname(1) is not set." ==== //depot/projects/ia64/etc/rc.d/ypserv#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ypserv,v 1.5 2000/09/19 13:04:39 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ypserv,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ypserv,v 1.3 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: ypserv @@ -17,7 +17,6 @@ case `${CMD_OSTYPE}` in FreeBSD) rcvar="nis_server_enable" - required_vars="portmap_enable" command_args="${nis_server_flags}" ;; NetBSD) @@ -28,6 +27,16 @@ ypserv_precmd() { + case `${CMD_OSTYPE}` in + FreeBSD) + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + ;; + esac + _domain=`domainname` if [ -z "$_domain" ]; then warn "domainname(1) is not set." ==== //depot/projects/ia64/etc/rc.d/ypset#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ypset,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ypset,v 1.2 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: ypset @@ -13,11 +13,21 @@ rcvar="nis_ypset_enable" command="/usr/sbin/${name}" command_args="${nis_ypset_flags}" -required_vars="portmap_enable nis_client_enable" start_precmd="ypset_precmd" ypset_precmd() { + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + if ! checkyesno nis_client_enable && \ + ! /etc/rc.d/ypbind forcestatus 1>/dev/null 2>&1 + then + force_depend ypbind || return 1 + fi + _domain=`domainname` if [ -z "$_domain" ]; then warn "domainname(1) is not set." ==== //depot/projects/ia64/etc/rc.d/ypupdated#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ypupdated,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ypupdated,v 1.2 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: ypupdated @@ -12,11 +12,21 @@ name="ypupdated" rcvar="rpc_ypupdated_enable" command="/usr/sbin/rpc.${name}" -required_vars="portmap_enable nis_server_enable" start_precmd="rpc_ypupdated_precmd" rpc_ypupdated_precmd() { + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + if ! checkyesno nis_server_enable && \ + ! /etc/rc.d/ypserv forcestatus 1>/dev/null 2>&1 + then + force_depend ypserv || return 1 + fi + _domain=`domainname` if [ -z "$_domain" ]; then warn "domainname(1) is not set." ==== //depot/projects/ia64/etc/rc.d/ypxfrd#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.1 2002/06/13 22:14:37 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.2 2002/08/14 05:44:32 gordon Exp $ # # PROVIDE: ypxfrd @@ -13,11 +13,21 @@ rcvar="nis_ypxfrd_enable" command="/usr/sbin/rpc.${name}" command_args="${nis_ypxfrd_flags}" -required_vars="portmap_enable nis_server_enable" start_precmd="ypxfrd_precmd" ypxfrd_precmd() { + if ! checkyesno rpcbind_enable && \ + ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 + then + force_depend rpcbind || return 1 + fi + if ! checkyesno nis_server_enable && \ + ! /etc/rc.d/ypserv forcestatus 1>/dev/null 2>&1 + then + force_depend ypserv || return 1 + fi + _domain=`domainname` if [ -z "$_domain" ]; then warn "domainname(1) is not set." ==== //depot/projects/ia64/etc/rc.network#15 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.network,v 1.134 2002/04/11 22:06:27 des Exp $ +# $FreeBSD: src/etc/rc.network,v 1.135 2002/08/14 05:44:29 gordon Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -561,9 +561,9 @@ ;; esac - case ${xntpd_enable} in + case ${ntpd_enable} in [Yy][Ee][Ss]) - echo -n ' ntpd'; ${xntpd_program:-ntpd} ${xntpd_flags} + echo -n ' ntpd'; ${ntpd_program:-ntpd} ${ntpd_flags} ;; esac @@ -573,10 +573,10 @@ ;; esac - case ${portmap_enable} in + case ${rpcbind_enable} in [Yy][Ee][Ss]) - echo -n ' rpcbind'; ${portmap_program:-/usr/sbin/rpcbind} \ - ${portmap_flags} + echo -n ' rpcbind'; ${rpcbind_program:-/usr/sbin/rpcbind} \ + ${rpcbind_flags} # Start ypserv if we're an NIS server. # Run rpc.ypxfrd and rpc.yppasswdd only on the NIS master server. @@ -645,7 +645,7 @@ network_pass3() { echo -n 'Starting final network daemons:' - case ${portmap_enable} in + case ${rpcbind_enable} in [Yy][Ee][Ss]) case ${nfs_server_enable} in [Yy][Ee][Ss]) ==== //depot/projects/ia64/etc/rc.subr#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.3 2002/06/13 22:19:42 gordon Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.4 2002/08/14 05:37:07 gordon Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -814,9 +814,23 @@ debug "Sourcing /etc/rc.conf.d/${_command}" . /etc/rc.conf.d/"$_command" fi + + # XXX - Deprecated variable name support + # + case `${CMD_OSTYPE}` in + FreeBSD) + [ -n "$portmap_enable" ] && rpcbind_enable="$portmap_enable" + [ -n "$portmap_program" ] && rpcbind_program="$portmap_program" + [ -n "$portmap_flags" ] && rpcbind_flags="$portmap_flags" + [ -n "$single_mountd_enable" ] && mountd_enable="$single_mountd_enable" + [ -n "$xntpd_enable" ] && ntpd_enable="$xntpd_enable" + [ -n "$xntpd_program" ] && ntpd_program="$xntpd_program" + [ -n "$xntpd_flags" ] && ntpd_flags="$xntpd_flags" + ;; + esac + } - # # rc_usage commands # Print a usage string for $0, with `commands' being a list of ==== //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#9 (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.14 2002/07/18 09:32:15 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.16 2002/08/14 16:57:14 ru Exp $ .\" .\" %beginstrip% . @@ -55,7 +55,7 @@ . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-4.6 4.6 -.ds doc-operating-system-FreeBSD-4.6.1 4.6.1 +.ds doc-operating-system-FreeBSD-4.6.2 4.6.2 .ds doc-operating-system-FreeBSD-4.7 4.7 .ds doc-operating-system-FreeBSD-4.8 4.8 . ==== //depot/projects/ia64/gnu/usr.bin/ld/ld.1#2 (text+ko) ==== @@ -27,7 +27,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/gnu/usr.bin/ld/ld.1,v 1.29 2001/08/14 10:01:44 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/ld/ld.1,v 1.30 2002/08/13 14:10:34 ru Exp $ .\" .Dd October 14, 1993 .Dt LD 1 @@ -93,7 +93,7 @@ (see the .Fl l option) -according to the search rules in effect. If such a file can not be +according to the search rules in effect. If such a file cannot be found a traditional archive is looked for. This options can appear anywhere on the command line and is complementary to ==== //depot/projects/ia64/gnu/usr.bin/ld/ld.1aout#2 (text+ko) ==== @@ -27,7 +27,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/gnu/usr.bin/ld/ld.1aout,v 1.28 2001/08/14 10:01:44 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/ld/ld.1aout,v 1.29 2002/08/13 14:10:34 ru Exp $ .\" .Dd October 14, 1993 .Dt LD 1 @@ -93,7 +93,7 @@ (see the .Fl l option) -according to the search rules in effect. If such a file can not be +according to the search rules in effect. If such a file cannot be found a traditional archive is looked for. This options can appear anywhere on the command line and is complementary to ==== //depot/projects/ia64/gnu/usr.bin/man/makewhatis/makewhatis.1#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/gnu/usr.bin/man/makewhatis/makewhatis.1,v 1.21 2001/08/07 15:48:29 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/man/makewhatis/makewhatis.1,v 1.22 2002/08/13 16:07:25 ru Exp $ .Dd January 12, 1995 .Dt MAKEWHATIS 1 .Os @@ -76,12 +76,12 @@ Use .Ar name instead of -.Pa whatis Ns . +.Pa whatis . .It Fl o , Fl outfile Ar file Write all output to .Ar file instead of -.Pa dirname/whatis Ns . +.Pa dirname/whatis . .It Fl v , Fl verbose Issue more warnings (to stderr). @@ -97,7 +97,7 @@ .Ic makewhatis $MANPATH .Pp Create whatis database for all directories in your -.Pa $MANPATH Ns . +.Pa $MANPATH . .Pp .Ic makewhatis -outfile /tmp/mywhatis /usr/local/man $HOME/man .Pp @@ -106,18 +106,18 @@ Traverse directories .Pa /usr/local/man and -.Pa $HOME/man Ns . +.Pa $HOME/man . Don't create .Pa /usr/local/man/whatis or -.Pa $HOME/man/whatis Ns . +.Pa $HOME/man/whatis . .Pp .Ic makewhatis -name windex $HOME/man .Pp Create whatis database .Pa windex instead of -.Pa whatis Ns . +.Pa whatis . May be useful for Solaris. .Sh FILES .Bl -tag -width /etc/master.passwdxx -compact ==== //depot/projects/ia64/gnu/usr.bin/send-pr/send-pr.1#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" .\" --------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.13 2002/07/03 00:35:09 des Exp $ +.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.14 2002/08/13 10:30:55 blackend Exp $ .nh .TH SEND-PR 1 3.113 "February 1993" .SH NAME @@ -209,6 +209,9 @@ .B ports Corrections or enhancements (including new ports) to the ports collection. .TP +.B powerpc +PowerPC processor specific problems. +.TP .B sparc64 SPARC processor specific problems. .TP ==== //depot/projects/ia64/gnu/usr.bin/tar/tar.1#2 (text+ko) ==== @@ -4,7 +4,7 @@ .\" Written by John F. Woods .\" Updated by Robert Eckardt .\" -.\" $FreeBSD: src/gnu/usr.bin/tar/tar.1,v 1.40 2001/07/10 10:42:19 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/tar/tar.1,v 1.41 2002/08/13 14:10:35 ru Exp $ .\" .Dd December 23, 2000 .Os @@ -570,4 +570,4 @@ .Nm file format is a semi fixed width field format, and the field for device numbers were designed for 16 bit (8 major, 8 minor) -and can not absorb our 32 bit (8 major, 16+8 minor) numbers. +and cannot absorb our 32 bit (8 major, 16+8 minor) numbers. ==== //depot/projects/ia64/include/arpa/inet.h#8 (text+ko) ==== @@ -50,7 +50,7 @@ * * @(#)inet.h 8.1 (Berkeley) 6/2/93 * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $ - * $FreeBSD: src/include/arpa/inet.h,v 1.22 2002/04/10 10:51:53 mike Exp $ + * $FreeBSD: src/include/arpa/inet.h,v 1.23 2002/08/14 20:40:35 robert Exp $ */ #ifndef _ARPA_INET_H_ @@ -139,8 +139,9 @@ in_addr_t inet_addr(const char *); char *inet_ntoa(struct in_addr); -const char *inet_ntop(int, const void *, char *, socklen_t); -int inet_pton(int, const char *, void *); +const char *inet_ntop(int, const void *__restrict, char *__restrict, + socklen_t); +int inet_pton(int, const char *__restrict, void *__restrict); #if __BSD_VISIBLE int ascii2addr(int, const char *, void *); ==== //depot/projects/ia64/include/search.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 17: 9: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0015E37B401; Wed, 14 Aug 2002 17:08:53 -0700 (PDT) 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 9196337B400 for ; Wed, 14 Aug 2002 17:08:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EB0943E42 for ; Wed, 14 Aug 2002 17:08:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7F08qJU078724 for ; Wed, 14 Aug 2002 17:08:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7F08pi1078721 for perforce@freebsd.org; Wed, 14 Aug 2002 17:08:51 -0700 (PDT) Date: Wed, 14 Aug 2002 17:08:51 -0700 (PDT) Message-Id: <200208150008.g7F08pi1078721@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15985 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15985 Change 15985 by rwatson@rwatson_curry on 2002/08/14 17:08:14 Provide a mac_get_pid() stub so that we can build a kernel without options MAC. Sort mac_get_pid() before mac_get_proc() for reasons of the alphabet. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#240 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#240 (text+ko) ==== @@ -2933,22 +2933,6 @@ return (0); } -/* - * MPSAFE - */ -int -__mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap) -{ - struct mac extmac; - int error; - - error = mac_externalize(&td->td_ucred->cr_label, &extmac); - if (error == 0) - error = copyout(&extmac, SCARG(uap, mac_p), sizeof(extmac)); - - return (error); -} - #if 0 395 MSTD BSD { int __mac_get_pid(pid_t pid, struct mac_pid_data *mpd, size_t mpdcnt) }; @@ -2998,8 +2982,26 @@ return (error); } + + /* * MPSAFE + */ +int +__mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap) +{ + struct mac extmac; + int error; + + error = mac_externalize(&td->td_ucred->cr_label, &extmac); + if (error == 0) + error = copyout(&extmac, SCARG(uap, mac_p), sizeof(extmac)); + + return (error); +} + +/* + * MPSAFE * * XXX: Needs to be re-written for proc locking. */ @@ -3263,6 +3265,13 @@ #else /* !MAC */ int +mac_get_pid(struct thread *td, struct mac_get_pid_args *uap) +{ + + return (ENOSYS); +} + +int __mac_get_proc(struct thread *td, struct __mac_get_proc_args *uap) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 17:19: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C72D437B401; Wed, 14 Aug 2002 17:19:06 -0700 (PDT) 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 67FEC37B400 for ; Wed, 14 Aug 2002 17:19:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1456243E4A for ; Wed, 14 Aug 2002 17:19:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7F0J5JU079695 for ; Wed, 14 Aug 2002 17:19:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7F0J53u079692 for perforce@freebsd.org; Wed, 14 Aug 2002 17:19:05 -0700 (PDT) Date: Wed, 14 Aug 2002 17:19:05 -0700 (PDT) Message-Id: <200208150019.g7F0J53u079692@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15986 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15986 Change 15986 by peter@peter_mckinley on 2002/08/14 17:18:04 Check in Affected files ... .. //depot/projects/ia64/sys/ia64/conf/I3#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 17:55: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF41D37B401; Wed, 14 Aug 2002 17:53:57 -0700 (PDT) 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 9DD1E37B400 for ; Wed, 14 Aug 2002 17:53:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AAF243E65 for ; Wed, 14 Aug 2002 17:53:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7F0ruJU082742 for ; Wed, 14 Aug 2002 17:53:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7F0rp24082735 for perforce@freebsd.org; Wed, 14 Aug 2002 17:53:51 -0700 (PDT) Date: Wed, 14 Aug 2002 17:53:51 -0700 (PDT) Message-Id: <200208150053.g7F0rp24082735@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15989 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15989 Change 15989 by rwatson@rwatson_tislabs on 2002/08/14 17:52:56 Integ trustedbsd_mac from trustedbsd base. Various changes including trickle back of IO_NOMACCHECK, sys_pipes changes, etc. Probably some merge-o's due to conflicts that I'll resolve in follow-up commits. This integ as a prep for merging cred changes back to the main tree. Affected files ... .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.1#4 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#8 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/rcp.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/rcp.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#6 integrate .. //depot/projects/trustedbsd/mac/contrib/pnpinfo/pnpinfo.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/top/display.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/CHANGES#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Configure#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/FAQ#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.org#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/Makefile.ssl#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/NEWS#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/PROBLEMS#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/README#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/CA.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/apps/der_chop#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/config#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/asn1/asn1_lib.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/bio/b_print.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cryptlib.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/cryptlib.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/mem.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/crypto/opensslv.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/openssl.spec#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_clnt.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_enc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_lib.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s2_srvr.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_clnt.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/s3_srvr.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_asn1.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_err.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_locl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/ssl/ssl_sess.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/tools/c_rehash#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssl/util/mkerr.pl#3 integrate .. //depot/projects/trustedbsd/mac/etc/MAKEDEV#12 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/periodic.conf#4 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#16 integrate .. //depot/projects/trustedbsd/mac/etc/inetd.conf#6 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/daily/150.clean-hoststat#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc#17 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/amd#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/keyserv#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/mountd#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/network#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/network1#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/nfsd#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ntpd#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/othermta#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/rpcbind#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/yppasswdd#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ypserv#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ypset#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ypupdated#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/ypxfrd#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.network#11 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#4 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes#15 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/fortunes2#9 integrate .. //depot/projects/trustedbsd/mac/games/trek/DOC/trekmanual.nr#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/ld/ld.1#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/ld/ld.1aout#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/makewhatis/makewhatis.1#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/send-pr/send-pr.1#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/tar/tar.1#2 integrate .. //depot/projects/trustedbsd/mac/include/wchar.h#5 integrate .. //depot/projects/trustedbsd/mac/kerberos5/include/config.h#3 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libasn1/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libhdb/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/dlopen.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/errlst.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/fmtcheck.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/fmtmsg.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getvfsbyname.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getvfsent.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/semctl.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/collate.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/collate.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/euc.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/rune.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/setrunelocale.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/if_indextoname.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/nls/msgcat.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/rpc/rpc_clnt_create.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/asprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fgetc.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fgets.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fgetwc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fgetws.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fgetws.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/findfp.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fputc.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fputs.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fputwc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fputws.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fputws.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fread.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fwide.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fwide.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fwrite.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/getc.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/getchar.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/gets.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/getwc.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/getwc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/getwchar.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/local.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/printf.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/putc.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/putchar.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/putwc.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/putwc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/putwchar.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/refill.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/snprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/sprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/ungetc.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/ungetwc.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/ungetwc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vasprintf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfscanf.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vsnprintf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vsprintf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vsscanf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/wbuf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/malloc.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtod.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/acct.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/getrlimit.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/intro.2#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/utimes.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_sparc64.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libncurses/termcap.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libradius/libradius.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/type.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login.conf.5#4 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_cap.h#4 integrate .. //depot/projects/trustedbsd/mac/libexec/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/libexec/bootpd/bootpd.8#3 integrate .. //depot/projects/trustedbsd/mac/libexec/comsat/comsat.8#3 integrate .. //depot/projects/trustedbsd/mac/libexec/fingerd/fingerd.8#4 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpcmd.y#9 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#11 integrate .. //depot/projects/trustedbsd/mac/libexec/getty/gettytab.5#2 integrate .. //depot/projects/trustedbsd/mac/libexec/revnetgroup/revnetgroup.8#4 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#23 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#18 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#29 integrate .. //depot/projects/trustedbsd/mac/release/i386/dokern.sh#7 integrate .. //depot/projects/trustedbsd/mac/release/i386/drivers.conf#4 integrate .. //depot/projects/trustedbsd/mac/release/scripts/driver-copy2.awk#2 integrate .. //depot/projects/trustedbsd/mac/sbin/atacontrol/atacontrol.8#8 integrate .. //depot/projects/trustedbsd/mac/sbin/dumpfs/dumpfs.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/dumpon/dumpon.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/preen.c#4 delete .. //depot/projects/trustedbsd/mac/sbin/fsck_msdosfs/fsck_msdosfs.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/fsirand/fsirand.8#3 integrate .. //depot/projects/trustedbsd/mac/sbin/growfs/growfs.8#6 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#10 integrate .. //depot/projects/trustedbsd/mac/sbin/init/init.8#3 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount/mount.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_ext2fs/mount_ext2fs.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_nullfs/mount_nullfs.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_std/mount_std.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_udf/mount_udf.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_unionfs/mount_unionfs.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/natd/natd.8#5 integrate .. //depot/projects/trustedbsd/mac/sbin/newfs/newfs.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/nfsiod/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sbin/nfsiod/nfsiod.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/nfsiod/nfsiod.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ping/ping.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/quotacheck/preen.c#1 branch .. //depot/projects/trustedbsd/mac/sbin/tunefs/tunefs.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/umount/umount.c#3 integrate .. //depot/projects/trustedbsd/mac/share/examples/isdn/README#3 integrate .. //depot/projects/trustedbsd/mac/share/examples/isdn/ROADMAP#2 integrate .. //depot/projects/trustedbsd/mac/share/examples/isdn/ReleaseNotes#3 integrate .. //depot/projects/trustedbsd/mac/share/examples/isdn/ThankYou#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/gif.4#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ichsmb.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/pcic.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ppp.4#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/sio.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snp.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ti.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/ucom.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uftdi.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/uvisor.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/wi.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/device.hints.5#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/make.conf.5#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/tuning.7#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/man8.alpha/MAKEDEV.8#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/man8.i386/MAKEDEV.8#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/picobsd.8#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man8/yp.8#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/mi_switch.9#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/style.9#11 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/ucred.9#7 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/uidinfo.9#4 integrate .. //depot/projects/trustedbsd/mac/share/me/tmac.orig_me#2 integrate .. //depot/projects/trustedbsd/mac/share/termcap/termcap.5#2 integrate .. //depot/projects/trustedbsd/mac/share/termcap/termcap.src#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#13 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/imgact_osf1.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_mount.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/loader.8#10 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.4th.8#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/libi386/i386_module.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/i386/loader/help.i386#2 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/pecoff/imgact_pecoff.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/imgact_svr4.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#14 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#44 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#12 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.pre.mk#11 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#24 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_ps.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/ddb/db_sym.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac_pci.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-all.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-all.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cam.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/fc_log.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_cnfg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_fc.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_init.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_ioc.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_lan.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_raid.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_targ.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpilib/mpi_type.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_debug.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_freebsd.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_freebsd.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/mpt/mpt_pci.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccard.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbbdevid.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbbvar.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/ich.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uftdi.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/usb/uftdireg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usbdevs_data.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uvisor.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumioctl.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wireg.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/wi_hostap.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_vfsops.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_lookup.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#16 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_misc.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/imgact_coff.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/i4b_ioctl.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/linux/imgact_linux.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/include/i4b_l3l4.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/layer3/i4b_l2if.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/layer3/i4b_q931.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/layer4/i4b_i4bdrv.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/layer4/i4b_l4.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/layer4/i4b_l4mgmt.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/sapic.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/isofs/cd9660/cd9660_vfsops.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_aout.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_elf.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_lockf.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#241 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_prf.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_msg.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_sem.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#35 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#49 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#29 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ibcs2/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/if_ppp/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sys/modules/svr4/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/uftdi/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/net/bpfdesc.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gif.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_pppvar.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_var.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/net/ppp_tty.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_lock.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_vfsops.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC#14 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp_i810.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#14 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/tsb.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/vmparam.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/genassym.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/tsb.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/sys/_label.h#1 branch .. //depot/projects/trustedbsd/mac/sys/sys/elf_common.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sys/errno.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#152 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#115 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mount.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/sys/pipe.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sysctl.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ucred.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#42 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_extern.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/quota.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extern.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_ihash.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_lookup.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_readwrite.c#8 delete .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#47 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_kern.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/trustedbsd/mac/tools/tools/kdrv/sample.drvinfo#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/Makefile#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/at/at.man#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/biff/biff.1#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendar.1#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendar.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/colldef/parse.y#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/colldef/scan.l#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/csplit/csplit.1#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/find/function.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/fstat/fstat.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/join/join.1#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/lsvfs/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/lsvfs/lsvfs.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/main.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/paste/paste.1#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/rsh/rsh.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/sed/process.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/stat/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/stat/stat.1#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/stat/stat.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/su/su.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/vmstat/vmstat.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/wc/wc.1#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/wc/wc.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/xargs/xargs.c#11 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/acpi/amldb/amldb.8#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/adduser/adduser.perl#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/config/config.8#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/isdnd.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/isdnd.rc.5#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/msghdl.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/rc_config.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/rc_parse.y#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/rc_scan.l#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/i4b/isdnd/support.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.8#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/keyserv/keyserv.8#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/lpr/common_source/matchjobs.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/nfsd/nfsd.8#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pciconf/pciconf.8#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/plist.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/version.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ppp/ppp.8.m4#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/system.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/watch/watch.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/wicontrol/wicontrol.8#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/ypserv/ypserv.8#5 integrate Differences ... ==== //depot/projects/trustedbsd/mac/bin/chmod/chmod.1#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.30 2002/08/04 05:29:13 obrien Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.31 2002/08/09 10:34:57 ru Exp $ .\" .Dd March 31, 1994 .Dt CHMOD 1 @@ -86,7 +86,8 @@ .It Fl v Cause .Nm -to be verbose, showing filenames as the mode is modified. If the +to be verbose, showing filenames as the mode is modified. +If the .Fl v flag is specified more than once, the old and new modes of the file will also be printed, in both octal and symbolic notation. @@ -126,7 +127,7 @@ option to .Xr mount 8 . .It Li 2000 -(the set-group-ID-on-execution bit) Executable files with this bit set +(the set-group-ID-on-execution bit) Executable files with this bit set will run with effective gid set to the gid of the file owner. .It Li 1000 (the sticky bit) @@ -139,21 +140,24 @@ .It Li 0200 Allow write by owner. .It Li 0100 -For files, allow execution by owner. For directories, allow the owner to +For files, allow execution by owner. +For directories, allow the owner to search in the directory. .It Li 0040 Allow read by group members. .It Li 0020 Allow write by group members. .It Li 0010 -For files, allow execution by group members. For directories, allow +For files, allow execution by group members. +For directories, allow group members to search in the directory. .It Li 0004 Allow read by others. .It Li 0002 Allow write by others. .It Li 0001 -For files, allow execution by others. For directories allow others to +For files, allow execution by others. +For directories allow others to search in the directory. .El .Pp ==== //depot/projects/trustedbsd/mac/bin/cp/cp.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.23 2002/07/23 00:42:56 johan Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.24 2002/08/09 10:38:34 ru Exp $ .\" .Dd April 18, 1994 .Dt CP 1 @@ -142,7 +142,7 @@ .Fl n options.) .It Fl n -Do not overwriting an existing file. +Do not overwrite an existing file. (The .Fl n option overrides any previous ==== //depot/projects/trustedbsd/mac/bin/df/df.c#9 (text+ko) ==== @@ -48,7 +48,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.40 2002/06/30 05:13:52 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.41 2002/08/10 20:19:02 mux Exp $"); #include #include @@ -491,31 +491,40 @@ makenetvfslist(void) { char *str, *strptr, **listptr; - int mib[3], maxvfsconf, cnt=0, i; - size_t miblen; - struct ovfsconf *ptr; + struct xvfsconf *xvfsp; + size_t buflen; + int cnt, i, maxvfsconf; - mib[0] = CTL_VFS; mib[1] = VFS_GENERIC; mib[2] = VFS_MAXTYPENUM; - miblen=sizeof(maxvfsconf); - if (sysctl(mib, (unsigned int)(sizeof(mib) / sizeof(mib[0])), - &maxvfsconf, &miblen, NULL, 0)) { - warnx("sysctl failed"); + if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0) { + warn("sysctl(vfs.conflist)"); + return (NULL); + } + xvfsp = malloc(buflen); + if (xvfsp == NULL) { + warnx("malloc failed"); + return (NULL); + } + if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { + warn("sysctl(vfs.conflist)"); return (NULL); } + maxvfsconf = buflen / sizeof(struct xvfsconf); if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) { warnx("malloc failed"); return (NULL); } - for (ptr = getvfsent(); ptr; ptr = getvfsent()) - if (ptr->vfc_flags & VFCF_NETWORK) { - listptr[cnt++] = strdup(ptr->vfc_name); + for (cnt = 0, i = 0; i < maxvfsconf; i++) { + if (xvfsp->vfc_flags & VFCF_NETWORK) { + listptr[cnt++] = strdup(xvfsp->vfc_name); if (listptr[cnt-1] == NULL) { warnx("malloc failed"); return (NULL); } } + xvfsp++; + } if (cnt == 0 || (str = malloc(sizeof(char) * (32 * cnt + cnt + 2))) == NULL) { ==== //depot/projects/trustedbsd/mac/bin/ln/ln.1#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ln.1 8.2 (Berkeley) 12/30/93 -.\" $FreeBSD: src/bin/ln/ln.1,v 1.23 2002/06/25 10:02:12 tjr Exp $ +.\" $FreeBSD: src/bin/ln/ln.1,v 1.24 2002/08/12 12:34:03 tjr Exp $ .\" .Dd December 30, 1993 .Dt LN 1 @@ -191,7 +191,7 @@ The .Nm utility conforms to -.St -p1003.1-2001 . +.St -p1003.2-92 . .Pp The simplified .Nm link ==== //depot/projects/trustedbsd/mac/bin/ls/ls.c#8 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.63 2002/07/10 20:44:54 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.64 2002/08/11 13:05:17 schweikh Exp $"); #include #include @@ -114,7 +114,7 @@ int f_slash; /* similar to f_type, but only for dirs */ int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ - int f_stream; /* stream the output, seperate with commas */ + int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ ==== //depot/projects/trustedbsd/mac/bin/mv/mv.1#5 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.22 2002/07/09 17:45:13 johan Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.23 2002/08/09 10:46:00 ru Exp $ .\" -.Dd May 31, 1993 +.Dd July 9, 2002 .Dt MV 1 .Os .Sh NAME @@ -43,11 +43,11 @@ .Nd move files .Sh SYNOPSIS .Nm -.Op Fl f | Fl i | Fl n +.Op Fl f | i | n .Op Fl v .Ar source target .Nm -.Op Fl f | Fl i | Fl n +.Op Fl f | i | n .Op Fl v .Ar source ... directory .Sh DESCRIPTION @@ -73,7 +73,7 @@ component of the named file. .Pp The following options are available: -.Bl -tag -width flag +.Bl -tag -width indent .It Fl f Do not prompt for confirmation before overwriting the destination path. @@ -90,9 +90,9 @@ to write a prompt to standard error before moving a file that would overwrite an existing file. If the response from the standard input begins with the character -.Sq Li y +.Ql y or -.Sq Li Y , +.Ql Y , the move is attempted. (The .Fl i @@ -127,7 +127,7 @@ option. .Pp As the -.Xr rename 2 +.Xr rename 2 call does not work across filesystems, .Nm uses @@ -138,8 +138,8 @@ The effect is equivalent to: .Bd -literal -offset indent rm -f destination_path && \e -\tcp -pRP source_file destination && \e -\trm -rf source_file +cp -pRP source_file destination && \e +rm -rf source_file .Ed .Sh DIAGNOSTICS .Ex -std ==== //depot/projects/trustedbsd/mac/bin/ps/ps.1#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.55 2002/06/10 22:48:51 jmallett Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.56 2002/08/09 10:49:50 ru Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -245,7 +245,8 @@ is displayed. .It mwchan The event name if the process is blocked normally, or the mutex name if -the process is blocked on a mutex. See the wchan and mtxname keywords +the process is blocked on a mutex. +See the wchan and mtxname keywords for details. .It nice The process scheduling increment (see @@ -382,7 +383,7 @@ .It args command and arguments .It comm -command +command .It command command and arguments .It cpu ==== //depot/projects/trustedbsd/mac/bin/rcp/rcp.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rcp.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.14 2002/04/16 20:07:10 charnier Exp $ +.\" $FreeBSD: src/bin/rcp/rcp.1,v 1.15 2002/08/09 16:12:08 ume Exp $ .\" .Dd May 31, 1993 .Dt RCP 1 @@ -40,11 +40,11 @@ .Nd remote file copy .Sh SYNOPSIS .Nm -.Op Fl Kpx +.Op Fl 46Kpx .Op Fl k Ar realm .Ar file1 file2 .Nm -.Op Fl Kprx +.Op Fl 46Kprx .Op Fl k Ar realm .Ar .Ar directory @@ -63,6 +63,10 @@ .Pp The following options are available: .Bl -tag -width indent +.It Fl 4 +Use IPv4 addresses only. +.It Fl 6 +Use IPv6 addresses only. .It Fl K Turn off all Kerberos authentication. .It Fl k ==== //depot/projects/trustedbsd/mac/bin/rcp/rcp.c#6 (text+ko) ==== @@ -50,7 +50,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.34 2002/07/10 20:44:55 dillon Exp $"); +__FBSDID("$FreeBSD: src/bin/rcp/rcp.c,v 1.35 2002/08/09 16:12:08 ume Exp $"); #include #include @@ -92,12 +92,12 @@ extern char *krb_realmofhost(); #ifdef CRYPT int doencrypt = 0; -#define OPTIONS "dfKk:prtx" +#define OPTIONS "46dfKk:prtx" #else -#define OPTIONS "dfKk:prt" +#define OPTIONS "46dfKk:prt" #endif #else -#define OPTIONS "dfprt" +#define OPTIONS "46dfprt" #endif struct passwd *pwd; @@ -105,6 +105,7 @@ uid_t userid; int errs, rem; int pflag, iamremote, iamrecursive, targetshouldbedirectory; +int family = PF_UNSPEC; static int argc_copy; static char **argv_copy; @@ -154,6 +155,14 @@ fflag = tflag = 0; while ((ch = getopt(argc, argv, OPTIONS)) != -1) switch(ch) { /* User-visible flags. */ + case '4': + family = PF_INET; + break; + + case '6': + family = PF_INET6; + break; + case 'K': #ifdef KERBEROS use_kerberos = 0; @@ -344,15 +353,18 @@ tuser ? tuser : pwd->pw_name); else #endif - rem = rcmd(&host, port, pwd->pw_name, + rem = rcmd_af(&host, port, + pwd->pw_name, tuser ? tuser : pwd->pw_name, - bp, 0); + bp, 0, family); if (rem < 0) exit(1); - tos = IPTOS_THROUGHPUT; - if (setsockopt(rem, IPPROTO_IP, IP_TOS, - &tos, sizeof(int)) < 0) - warn("TOS (ignored)"); + if (family == PF_INET) { + tos = IPTOS_THROUGHPUT; + if (setsockopt(rem, IPPROTO_IP, IP_TOS, + &tos, sizeof(int)) < 0) + warn("TOS (ignored)"); + } if (response() < 0) exit(1); (void)free(bp); @@ -408,16 +420,20 @@ use_kerberos ? kerberos(&host, bp, pwd->pw_name, suser) : #endif - rcmd(&host, port, pwd->pw_name, suser, bp, 0); + rcmd_af(&host, port, pwd->pw_name, suser, bp, 0, + family); (void)free(bp); if (rem < 0) { ++errs; continue; } (void)seteuid(userid); - tos = IPTOS_THROUGHPUT; - if (setsockopt(rem, IPPROTO_IP, IP_TOS, &tos, sizeof(int)) < 0) - warn("TOS (ignored)"); + if (family == PF_INET) { + tos = IPTOS_THROUGHPUT; + if (setsockopt(rem, IPPROTO_IP, IP_TOS, &tos, + sizeof(int)) < 0) + warn("TOS (ignored)"); + } sink(1, argv + argc - 1); (void)seteuid(0); (void)close(rem); @@ -834,7 +850,7 @@ errx(1, "the -x option requires Kerberos authentication"); #endif - rem = rcmd(host, port, locuser, user, bp, 0); + rem = rcmd_af(host, port, locuser, user, bp, 0, family); } return (rem); } @@ -879,17 +895,17 @@ #ifdef KERBEROS #ifdef CRYPT (void)fprintf(stderr, "%s\n%s\n", - "usage: rcp [-Kpx] [-k realm] f1 f2", - " rcp [-Kprx] [-k realm] f1 ... fn directory"); + "usage: rcp [-46Kpx] [-k realm] f1 f2", + " rcp [-46Kprx] [-k realm] f1 ... fn directory"); #else (void)fprintf(stderr, "%s\n%s\n", - "usage: rcp [-Kp] [-k realm] f1 f2", - " rcp [-Kpr] [-k realm] f1 ... fn directory"); + "usage: rcp [-46Kp] [-k realm] f1 f2", + " rcp [-46Kpr] [-k realm] f1 ... fn directory"); #endif #else (void)fprintf(stderr, "%s\n%s\n", - "usage: rcp [-p] f1 f2", - " rcp [-pr] f1 ... fn directory"); + "usage: rcp [-46p] f1 f2", + " rcp [-46pr] f1 ... fn directory"); #endif exit(1); } ==== //depot/projects/trustedbsd/mac/bin/sh/parser.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.42 2002/07/22 05:50:12 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.43 2002/08/11 03:04:23 tjr Exp $"); #include @@ -478,15 +478,14 @@ break; /* Handle an empty command like other simple commands. */ case TSEMI: + case TAND: + case TOR: /* * An empty command before a ; doesn't make much sense, and * should certainly be disallowed in the case of `if ;'. */ if (!redir) synexpect(-1); - case TAND: - case TOR: - synexpect(-1); case TNL: case TEOF: case TWORD: ==== //depot/projects/trustedbsd/mac/bin/sh/sh.1#6 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.75 2002/07/25 10:57:39 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.76 2002/08/09 10:59:20 ru Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -1280,7 +1280,7 @@ (see .Ic unalias ) . Alias values are written with appropriate quoting so that they are -suitable for reinput to the shell. +suitable for re-input to the shell. .It Ic bg Op Ar job ... Continue the specified jobs (or the current job if no jobs are given) @@ -1305,7 +1305,7 @@ If .Ar directory does not begin with -.Pa / , . , +.Pa / , \&. , or .Pa .. , then the directories listed in the @@ -1347,14 +1347,7 @@ A synonym for the .Ic cd builtin command. -.It Xo -.Ic command -.Op Fl p -.Oo -.Ar utility -.Op Ar argument ... -.Oc -.Xc +.It Ic command Oo Fl p Oc Op Ar utility Op Ar argument ... Execute the specified .Ar utility as a simple command (see the @@ -1367,11 +1360,7 @@ default value of .Ev PATH that is guaranteed to find all of the standard utilities. -.It Xo -.Ic echo -.Op Fl e | Fl n -.Op Ar string -.Xc +.It Ic echo Oo Fl e | n Oc Op Ar string Print .Ar string to the standard output with a newline appended. @@ -1453,11 +1442,7 @@ is given it is used as the exit status of the shell; otherwise the exit status of the preceding command is used. -.It Xo -.Ic export -.Op Fl p -.Op Ar name ... -.Xc +.It Ic export Oo Fl p Oc Op Ar name ... The specified names are exported so that they will appear in the environment of subsequent commands. The only way to un-export a variable is to @@ -1628,11 +1613,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 17:57: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5486237B401; Wed, 14 Aug 2002 17:57:01 -0700 (PDT) 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 0F7C637B400 for ; Wed, 14 Aug 2002 17:57:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C176A43E3B for ; Wed, 14 Aug 2002 17:57:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7F0v0JU084696 for ; Wed, 14 Aug 2002 17:57:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7F0v0T9084693 for perforce@freebsd.org; Wed, 14 Aug 2002 17:57:00 -0700 (PDT) Date: Wed, 14 Aug 2002 17:57:00 -0700 (PDT) Message-Id: <200208150057.g7F0v0T9084693@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15990 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15990 Change 15990 by rwatson@rwatson_tislabs on 2002/08/14 17:56:46 Sort includes. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#26 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#26 (text+ko) ==== @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -65,7 +66,6 @@ #include #include #include -#include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 18:45: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D66B837B401; Wed, 14 Aug 2002 18:44:08 -0700 (PDT) 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 670B837B400 for ; Wed, 14 Aug 2002 18:44:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BBEB643E4A for ; Wed, 14 Aug 2002 18:44:07 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7F1i7JU095313 for ; Wed, 14 Aug 2002 18:44:07 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7F1i799095310 for perforce@freebsd.org; Wed, 14 Aug 2002 18:44:07 -0700 (PDT) Date: Wed, 14 Aug 2002 18:44:07 -0700 (PDT) Message-Id: <200208150144.g7F1i799095310@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15991 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15991 Change 15991 by peter@peter_daintree on 2002/08/14 18:43:44 IFC @15988 Affected files ... .. //depot/projects/ia64/include/stdio.h#5 integrate .. //depot/projects/ia64/lib/libc/stdio/setbuf.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/setbuf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/setvbuf.c#3 integrate .. //depot/projects/ia64/sys/fs/udf/udf.h#2 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vnops.c#6 integrate Differences ... ==== //depot/projects/ia64/include/stdio.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.41 2002/07/15 19:38:45 wollman Exp $ + * $FreeBSD: src/include/stdio.h,v 1.42 2002/08/14 23:45:42 robert Exp $ */ #ifndef _STDIO_H_ @@ -243,8 +243,8 @@ int rename(const char *, const char *); void rewind(FILE *); int scanf(const char *, ...); -void setbuf(FILE *, char *); -int setvbuf(FILE *, char *, int, size_t); +void setbuf(FILE *__restrict, char *__restrict); +int setvbuf(FILE *__restrict, char *__restrict, int, size_t); int sprintf(char *, const char *, ...); int sscanf(const char *, const char *, ...); FILE *tmpfile(void); ==== //depot/projects/ia64/lib/libc/stdio/setbuf.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)setbuf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.10 2001/10/01 16:08:59 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.11 2002/08/14 23:45:42 robert Exp $ .\" .Dd June 4, 1993 .Dt SETBUF 3 @@ -50,13 +50,13 @@ .Sh SYNOPSIS .In stdio.h .Ft void -.Fn setbuf "FILE *stream" "char *buf" +.Fn setbuf "FILE *restrict stream" "char *restrict buf" .Ft void .Fn setbuffer "FILE *stream" "char *buf" "int size" .Ft int .Fn setlinebuf "FILE *stream" .Ft int -.Fn setvbuf "FILE *stream" "char *buf" "int mode" "size_t size" +.Fn setvbuf "FILE *restrict stream" "char *restrict buf" "int mode" "size_t size" .Sh DESCRIPTION The three types of buffering available are unbuffered, block buffered, and line buffered. ==== //depot/projects/ia64/lib/libc/stdio/setbuf.c#3 (text+ko) ==== @@ -38,15 +38,13 @@ static char sccsid[] = "@(#)setbuf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuf.c,v 1.2 2002/03/22 21:53:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuf.c,v 1.3 2002/08/14 23:45:42 robert Exp $"); #include #include "local.h" void -setbuf(fp, buf) - FILE *fp; - char *buf; +setbuf(FILE *__restrict fp, char *__restrict buf) { (void) setvbuf(fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ); } ==== //depot/projects/ia64/lib/libc/stdio/setvbuf.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)setvbuf.c 8.2 (Berkeley) 11/16/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/setvbuf.c,v 1.11 2002/03/22 21:53:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/setvbuf.c,v 1.12 2002/08/14 23:45:42 robert Exp $"); #include "namespace.h" #include @@ -52,11 +52,7 @@ * a buffer. */ int -setvbuf(fp, buf, mode, size) - FILE *fp; - char *buf; - int mode; - size_t size; +setvbuf(FILE *__restrict fp, char *__restrict buf, int mode, size_t size) { int ret, flags; size_t iosize; ==== //depot/projects/ia64/sys/fs/udf/udf.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf.h,v 1.2 2002/04/15 19:49:15 asmodai Exp $ + * $FreeBSD: src/sys/fs/udf/udf.h,v 1.3 2002/08/15 00:43:43 scottl Exp $ */ struct udf_node { @@ -57,6 +57,21 @@ struct udf_sparing_table *s_table; }; +struct udf_dirstream { + struct udf_node *node; + struct udf_mnt *udfmp; + struct buf *bp; + uint8_t *data; + uint8_t *buf; + int fsize; + int off; + int this_off; + int offset; + int size; + int error; + int fid_fragment; +}; + #define VFSTOUDFFS(mp) ((struct udf_mnt *)((mp)->mnt_data)) #define VTON(vp) ((struct udf_node *)((vp)->v_data)) @@ -113,3 +128,4 @@ extern uma_zone_t udf_zone_trans; extern uma_zone_t udf_zone_node; +extern uma_zone_t udf_zone_ds; ==== //depot/projects/ia64/sys/fs/udf/udf_vfsops.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.5 2002/08/04 10:29:31 jeff Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.6 2002/08/15 00:43:43 scottl Exp $ */ /* udf_vfsops.c */ @@ -100,6 +100,7 @@ /* Zones */ uma_zone_t udf_zone_trans = NULL; uma_zone_t udf_zone_node = NULL; +uma_zone_t udf_zone_ds = NULL; static int udf_init(struct vfsconf *); static int udf_uninit(struct vfsconf *); @@ -147,7 +148,11 @@ udf_zone_node = uma_zcreate("UDF Node zone", sizeof(struct udf_node), NULL, NULL, NULL, NULL, 0, 0); - if ((udf_zone_node == NULL) || (udf_zone_trans == NULL)) { + udf_zone_ds = uma_zcreate("UDF Dirstream zone", + sizeof(struct udf_dirstream), NULL, NULL, NULL, NULL, 0, 0); + + if ((udf_zone_node == NULL) || (udf_zone_trans == NULL) || + (udf_zone_ds == NULL)) { printf("Cannot create allocation zones.\n"); return (ENOMEM); } @@ -169,6 +174,11 @@ udf_zone_node = NULL; } + if (udf_zone_ds != NULL) { + uma_zdestroy(udf_zone_ds); + udf_zone_ds = NULL; + } + return (0); } ==== //depot/projects/ia64/sys/fs/udf/udf_vnops.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.10 2002/08/04 16:42:20 scottl Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.11 2002/08/15 00:43:43 scottl Exp $ */ /* udf_vnops.c */ @@ -91,6 +91,7 @@ VNODEOP_SET(udf_vnodeop_opv_desc); MALLOC_DEFINE(M_UDFFID, "UDF FID", "UDF FileId structure"); +MALLOC_DEFINE(M_UDFDS, "UDF DS", "UDF Dirstream structure"); #define INVALID_BMAP -1 @@ -528,6 +529,146 @@ return (uiomove((caddr_t)uiodir->dirent, de_size, uio)); } +static struct udf_dirstream * +udf_opendir(struct udf_node *node, int offset, int fsize, struct udf_mnt *udfmp) +{ + struct udf_dirstream *ds; + + ds = uma_zalloc(udf_zone_ds, M_WAITOK | M_ZERO); + + ds->node = node; + ds->offset = offset; + ds->udfmp = udfmp; + ds->fsize = fsize; + + return (ds); +} + +static struct fileid_desc * +udf_getfid(struct udf_dirstream *ds) +{ + struct fileid_desc *fid; + int error, frag_size = 0, total_fid_size; + + /* End of directory? */ + if (ds->offset + ds->off >= ds->fsize) { + ds->error = 0; + return (NULL); + } + + /* Grab the first extent of the directory */ + if (ds->off == 0) { + ds->size = 0; + error = udf_readatoffset(ds->node, &ds->size, ds->offset, + &ds->bp, &ds->data); + if (error) { + ds->error = error; + return (NULL); + } + } + + /* XXX Is this the right place for this? */ + if (ds->fid_fragment && ds->buf != NULL) { + ds->fid_fragment = 0; + FREE(ds->buf, M_UDFFID); + } + + fid = (struct fileid_desc*)&ds->data[ds->off]; + + /* + * Check to see if the fid is fragmented. The first test + * ensures that we don't wander off the end of the buffer + * looking for the l_iu and l_fi fields. + */ + if (ds->off + UDF_FID_SIZE > ds->size || + ds->off + fid->l_iu + fid->l_fi + UDF_FID_SIZE > ds->size) { + + /* Copy what we have of the fid into a buffer */ + frag_size = ds->size - ds->off; + if (frag_size >= ds->udfmp->bsize) { + printf("udf: invalid FID fragment\n"); + ds->error = EINVAL; + return (NULL); + } + + /* + * File ID descriptors can only be at most one + * logical sector in size. + */ + MALLOC(ds->buf, uint8_t*, ds->udfmp->bsize, M_UDFFID, + M_WAITOK | M_ZERO); + bcopy(fid, ds->buf, frag_size); + + /* Reduce all of the casting magic */ + fid = (struct fileid_desc*)ds->buf; + + if (ds->bp != NULL) + brelse(ds->bp); + + /* Fetch the next allocation */ + ds->offset += ds->size; + ds->size = 0; + error = udf_readatoffset(ds->node, &ds->size, ds->offset, + &ds->bp, &ds->data); + if (error) { + ds->error = error; + return (NULL); + } + + /* + * If the fragment was so small that we didn't get + * the l_iu and l_fi fields, copy those in. + */ + if (frag_size < UDF_FID_SIZE) + bcopy(ds->data, &ds->buf[frag_size], + UDF_FID_SIZE - frag_size); + + /* + * Now that we have enough of the fid to work with, + * copy in the rest of the fid from the new + * allocation. + */ + total_fid_size = UDF_FID_SIZE + fid->l_iu + fid->l_fi; + if (total_fid_size > ds->udfmp->bsize) { + printf("udf: invalid FID\n"); + ds->error = EIO; + return (NULL); + } + bcopy(ds->data, &ds->buf[frag_size], + total_fid_size - frag_size); + + ds->fid_fragment = 1; + } else { + total_fid_size = fid->l_iu + fid->l_fi + UDF_FID_SIZE; + } + + /* + * Update the offset. Align on a 4 byte boundary because the + * UDF spec says so. If it was a fragmented entry, clean up. + */ + ds->this_off = ds->off; + if (!ds->fid_fragment) { + ds->off += (total_fid_size + 3) & ~0x03; + } else { + ds->off = (total_fid_size - frag_size + 3) & ~0x03; + } + + return (fid); +} + +static void +udf_closedir(struct udf_dirstream *ds) +{ + + if (ds->bp != NULL) + brelse(ds->bp); + + if (ds->fid_fragment && ds->buf != NULL) + FREE(ds->buf, M_UDFFID); + + uma_zfree(udf_zone_ds, ds); +} + /* Prebuild the . and .. dirents. d_fileno will need to be filled in */ static struct dirent udf_de_dot = { 0, sizeof(struct dirent), DT_DIR, 1, "." }; @@ -538,26 +679,20 @@ udf_readdir(struct vop_readdir_args *a) { struct vnode *vp; - struct buf *bp; struct uio *uio; struct dirent dir; struct udf_node *node; - struct udf_mnt *udfmp; struct fileid_desc *fid; struct udf_uiodir uiodir; + struct udf_dirstream *ds; u_long *cookies = NULL; - uint8_t *data, *buf; int ncookies; - int error = 0, offset, off, size, de_size, fid_size, fsize; - int total_fid_size = 0, frag_size = 0, fid_fragment = 0; + int error = 0, de_size; vp = a->a_vp; uio = a->a_uio; node = VTON(vp); - udfmp = node->udfmp; de_size = sizeof(struct dirent); - fid_size = UDF_FID_SIZE; - fsize = node->fentry->inf_len; uiodir.eofflag = 1; if (a->a_ncookies != NULL) { @@ -579,109 +714,28 @@ } /* - * offset is the absolute offset into the file data. off is the offset - * into the data, minus the blocks that weren't read because they fell - * before offset. - */ - offset = uio->uio_offset; - off = 0; - - /* * Iterate through the file id descriptors. Give the parent dir * entry special attention. size will be the size of the extent * returned in data. If there is more than one extent, things get * ugly. */ - size = 0; - error = udf_readatoffset(node, &size, offset, &bp, &data); - if (error) { - if (a->a_ncookies != NULL) - FREE(cookies, M_TEMP); - return (error); - } + ds = udf_opendir(node, uio->uio_offset, node->fentry->inf_len, + node->udfmp); - while (offset + off < fsize) { + while ((fid = udf_getfid(ds)) != NULL) { - fid = (struct fileid_desc*)&data[off]; - - /* - * Check to see if the fid is fragmented. The first test - * ensures that we don't wander off the end of the buffer - * looking for the l_iu and l_fi fields. - */ - if (off + fid_size > size || - off + fid->l_iu + fid->l_fi + fid_size > size) { - - /* Copy what we have of the fid into a buffer */ - frag_size = size - off; - if (frag_size >= udfmp->bsize) { - printf("udf: invalid FID fragment\n"); - break; - } - - /* - * File ID descriptors can only be at most one - * logical sector in size. - */ - MALLOC(buf, uint8_t*, udfmp->bsize, M_UDFFID, - M_WAITOK | M_ZERO); - bcopy(fid, buf, frag_size); - - /* Reduce all of the casting magic */ - fid = (struct fileid_desc*)buf; - - if (bp != NULL) - brelse(bp); - - /* Fetch the next allocation */ - offset += size; - size = 0; - error = udf_readatoffset(node, &size, offset, &bp, - &data); - if (error) - break; - - /* - * If the fragment was so small that we didn't get - * the l_iu and l_fi fields, copy those in. - */ - if (fid_size > frag_size) - bcopy(data, &buf[frag_size], - fid_size - frag_size); - - /* - * Now that we have enough of the fid to work with, - * copy in the rest of the fid from the new - * allocation. - */ - total_fid_size = fid_size + fid->l_iu + fid->l_fi; - if (total_fid_size > udfmp->bsize) { - printf("udf: invalid FID\n"); - break; - } - bcopy(data, &buf[frag_size], - total_fid_size - frag_size); - - fid_fragment = 1; - } else { - total_fid_size = fid->l_iu + fid->l_fi + fid_size; - } - /* XXX Should we return an error on a bad fid? */ if (udf_checktag(&fid->tag, TAGID_FID)) { printf("Invalid FID tag\n"); + udf_dumpblock(fid, UDF_FID_SIZE); + error = EIO; break; } /* Is this a deleted file? */ if (fid->file_char & UDF_FILE_CHAR_DEL) - goto update_offset; + continue; - if (fid->l_iu != 0) { - printf("Possibly invalid fid found.\n"); - goto update_offset; - } - if ((fid->l_fi == 0) && (fid->file_char & UDF_FILE_CHAR_PAR)) { /* Do up the '.' and '..' entries. Dummy values are * used for the cookies since the offset here is @@ -705,36 +759,28 @@ DT_DIR : DT_UNKNOWN; dir.d_reclen = GENERIC_DIRSIZ(&dir); uiodir.dirent = &dir; - error = udf_uiodir(&uiodir, dir.d_reclen, uio, off); + error = udf_uiodir(&uiodir, dir.d_reclen, uio, + ds->this_off); } if (error) { printf("uiomove returned %d\n", error); break; } -update_offset: /* - * Update the offset. Align on a 4 byte boundary because the - * UDF spec says so. If it was a fragmented entry, clean up. - */ - if (fid_fragment) { - off = (total_fid_size - frag_size + 3) & ~0x03; - FREE(fid, M_UDFFID); - fid_fragment = 0; - } else { - off += (total_fid_size + 3) & ~0x03; - } } /* tell the calling layer whether we need to be called again */ *a->a_eofflag = uiodir.eofflag; - uio->uio_offset = offset + off; + uio->uio_offset = ds->offset + ds->off; + + if (!error) + error = ds->error; - if (bp != NULL) - brelse(bp); + udf_closedir(ds); if (a->a_ncookies != NULL) { if (error) - free(cookies, M_TEMP); + FREE(cookies, M_TEMP); else { *a->a_ncookies = uiodir.acookies; *a->a_cookies = cookies; @@ -834,20 +880,18 @@ struct vnode *dvp; struct vnode *tdp = NULL; struct vnode **vpp = a->a_vpp; - struct buf *bp = NULL; struct udf_node *node; struct udf_mnt *udfmp; struct fileid_desc *fid = NULL; + struct udf_dirstream *ds; struct thread *td; u_long nameiop; u_long flags; char *nameptr; long namelen; ino_t id = 0; - uint8_t *data, *buf; - int offset, off, error, size; - int numdirpasses, fid_size, fsize, icb_len; - int total_fid_size = 0, fid_fragment = 0, frag_size = 0; + int offset, error = 0; + int numdirpasses, fsize; dvp = a->a_dvp; node = VTON(dvp); @@ -856,9 +900,7 @@ flags = a->a_cnp->cn_flags; nameptr = a->a_cnp->cn_nameptr; namelen = a->a_cnp->cn_namelen; - fid_size = UDF_FID_SIZE; fsize = node->fentry->inf_len; - icb_len = sizeof(struct long_ad); td = a->a_cnp->cn_thread; /* @@ -867,7 +909,7 @@ * directory may need to be searched twice. For a full description, * see /sys/isofs/cd9660/cd9660_lookup.c:cd9660_lookup() */ - if (nameiop != LOOKUP || node->diroff == 0 || node->diroff > size) { + if (nameiop != LOOKUP || node->diroff == 0 || node->diroff > fsize) { offset = 0; numdirpasses = 1; } else { @@ -881,91 +923,20 @@ * Can this be broken out and shared? */ lookloop: - size = 0; - off = 0; - error = udf_readatoffset(node, &size, offset, &bp, &data); - if (error) - return (error); + ds = udf_opendir(node, offset, fsize, udfmp); - while (offset + off < fsize) { - fid = (struct fileid_desc*)&data[off]; + while ((fid = udf_getfid(ds)) != NULL) { - /* - * Check to see if the fid is fragmented. The first test - * ensures that we don't wander off the end of the buffer - * looking for the l_iu and l_fi fields. - */ - if (off + fid_size > size || - off + fid_size + fid->l_iu + fid->l_fi > size) { - - frag_size = size - off; - if (frag_size >= udfmp->bsize) { - printf("udf: invalid FID fragment\n"); - break; - } - - /* - * File ID descriptors can only be at most one - * logical sector in size. - * Copy what we have of the fid into a buffer - */ - MALLOC(buf, uint8_t*, udfmp->bsize, M_UDFFID, - M_WAITOK | M_ZERO); - bcopy(fid, buf, frag_size); - - /* Reduce all of the casting magic */ - fid = (struct fileid_desc*)buf; - - if (bp != NULL) - brelse(bp); - - /* Fetch the next allocation */ - offset += size; - size = 0; - error = udf_readatoffset(node, &size, offset, &bp, - &data); - if (error) - return (error); - - /* - * If the fragment was so small that we didn't get - * the l_iu and l_fi fields, copy those in. - */ - if (fid_size > frag_size) - bcopy(data, &buf[frag_size], - fid_size - frag_size); - - /* - * Now that we have enough of the fid to work with, - * copy the rest of the fid from the new - * allocation. - */ - total_fid_size = fid_size + fid->l_iu + fid->l_fi; - if (total_fid_size > udfmp->bsize) { - printf("udf: invalid FID\n"); - break; - } - bcopy(data, &buf[frag_size], - total_fid_size - frag_size); - - off = (total_fid_size - frag_size + 3) & ~0x03; - fid_fragment = 1; - } else { - /* - * Update the offset here to avoid looking at this fid - * again on a subsequent lookup. - */ - total_fid_size = fid->l_iu + fid->l_fi + fid_size; - off += (total_fid_size + 3) & ~0x03; + /* XXX Should we return an error on a bad fid? */ + if (udf_checktag(&fid->tag, TAGID_FID)) { + printf("udf_lookup: Invalid tag\n"); + error = EIO; + break; } - /* XXX Should we return an error on a bad fid? */ - if (udf_checktag(&fid->tag, TAGID_FID)) - goto continue_lookup; - /* Is this a deleted file? */ if (fid->file_char & UDF_FILE_CHAR_DEL) - goto continue_lookup; + continue; if ((fid->l_fi == 0) && (fid->file_char & UDF_FILE_CHAR_PAR)) { if (flags & ISDOTDOT) { @@ -979,67 +950,63 @@ break; } } + } - /* - * If we got this far then this fid isn't what we were - * looking for. It's therefore safe to clean up from a - * fragmented fid. - */ -continue_lookup: - if (fid_fragment) { - FREE(fid, M_UDFFID); - fid_fragment = 0; - } + if (!error) + error = ds->error; + + /* XXX Bail out here? */ + if (error) { + udf_closedir(ds); + return (error); } /* Did we have a match? */ if (id) { error = udf_vget(udfmp->im_mountp, id, LK_EXCLUSIVE, &tdp); - if (bp != NULL) - brelse(bp); - if (error) - return (error); + if (!error) { + /* + * Remember where this entry was if it's the final + * component. + */ + if ((flags & ISLASTCN) && nameiop == LOOKUP) + node->diroff = ds->offset + ds->off; + if (numdirpasses == 2) + nchstats.ncs_pass2++; + if (!(flags & LOCKPARENT) || !(flags & ISLASTCN)) { + a->a_cnp->cn_flags |= PDIRUNLOCK; + VOP_UNLOCK(dvp, 0, td); + } + + *vpp = tdp; - /* Remember where this entry was if it's the final component */ - if ((flags & ISLASTCN) && nameiop == LOOKUP) - node->diroff = offset + off; - if (numdirpasses == 2) - nchstats.ncs_pass2++; - if (!(flags & LOCKPARENT) || !(flags & ISLASTCN)) { - a->a_cnp->cn_flags |= PDIRUNLOCK; - VOP_UNLOCK(dvp, 0, td); + /* Put this entry in the cache */ + if (flags & MAKEENTRY) + cache_enter(dvp, *vpp, a->a_cnp); + } + } else { + /* Name wasn't found on this pass. Do another pass? */ + if (numdirpasses == 2) { + numdirpasses--; + offset = 0; + udf_closedir(ds); + goto lookloop; } - *vpp = tdp; - - /* Put this entry in the cache */ + /* Enter name into cache as non-existant */ if (flags & MAKEENTRY) cache_enter(dvp, *vpp, a->a_cnp); - if (fid_fragment) - FREE(fid, M_UDFFID); - - return (0); + if ((flags & ISLASTCN) && + (nameiop == CREATE || nameiop == RENAME)) { + error = EROFS; + } else { + error = ENOENT; + } } - /* Name wasn't found on this pass. Do another pass? */ - if (numdirpasses == 2) { - numdirpasses--; - offset = 0; - goto lookloop; - } - - if (bp != NULL) - brelse(bp); - - /* Enter name into cache as non-existant */ - if (flags & MAKEENTRY) - cache_enter(dvp, *vpp, a->a_cnp); - - if ((flags & ISLASTCN) && (nameiop == CREATE || nameiop == RENAME)) - return (EROFS); - return (ENOENT); - + udf_closedir(ds); + return (error); } static int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 18:46:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D8EB37B401; Wed, 14 Aug 2002 18:46:11 -0700 (PDT) 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 3F50037B400 for ; Wed, 14 Aug 2002 18:46:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF78543E65 for ; Wed, 14 Aug 2002 18:46:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7F1kAJU095457 for ; Wed, 14 Aug 2002 18:46:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7F1kA20095454 for perforce@freebsd.org; Wed, 14 Aug 2002 18:46:10 -0700 (PDT) Date: Wed, 14 Aug 2002 18:46:10 -0700 (PDT) Message-Id: <200208150146.g7F1kA20095454@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 15992 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15992 Change 15992 by peter@peter_daintree on 2002/08/14 18:45:14 Hmm. Another freshly spammed file. :-( Affected files ... .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#17 integrate Differences ... ==== //depot/projects/ia64/sys/kern/uipc_syscalls.c#17 (text+ko) ==== @@ -937,170 +937,213 @@ len = MIN(len, fromsa->sa_len); #ifdef COMPAT_OLDSOCK if (mp->msg_flags & MSG_COMPAT) - ((struct osockaddr *)fromsa)->sa_famil Initial pass thru sops to see what permissions are needed. - * Also perform any checks that don't need repeating on each - * attempt to satisfy the request vector. - */ - j = 0; /* permission needed */ - do_undos = 0; - for (i = 0; i < nsops; i++) { - sopptr = &sops[i]; - if (sopptr->sem_num >= semaptr->sem_nsems) { - error = EFBIG; - goto done2; + ((struct osockaddr *)fromsa)->sa_family = + fromsa->sa_family; +#endif + error = copyout(fromsa, mp->msg_name, (unsigned)len); + if (error) + goto out; + } + mp->msg_namelen = len; + if (namelenp && + (error = copyout(&len, namelenp, sizeof (int)))) { +#ifdef COMPAT_OLDSOCK + if (mp->msg_flags & MSG_COMPAT) + error = 0; /* old recvfrom didn't check */ + else +#endif + goto out; } - if (sopptr->sem_flg & SEM_UNDO && sopptr->sem_op != 0) - do_undos = 1; - j |= (sopptr->sem_op == 0) ? SEM_R : SEM_A; } + if (mp->msg_control) { +#ifdef COMPAT_OLDSOCK + /* + * We assume that old recvmsg calls won't receive access + * rights and other control info, esp. as control info + * is always optional and those options didn't exist in 4.3. + * If we receive rights, trim the cmsghdr; anything else + * is tossed. + */ + if (control && mp->msg_flags & MSG_COMPAT) { + if (mtod(control, struct cmsghdr *)->cmsg_level != + SOL_SOCKET || + mtod(control, struct cmsghdr *)->cmsg_type != + SCM_RIGHTS) { + mp->msg_controllen = 0; + goto out; + } + control->m_len -= sizeof (struct cmsghdr); + control->m_data += sizeof (struct cmsghdr); + } +#endif + len = mp->msg_controllen; + m = control; + mp->msg_controllen = 0; + ctlbuf = mp->msg_control; - if ((error = ipcperm(td, &semaptr->sem_perm, j))) { - DPRINTF(("error = %d from ipaccess\n", error)); - goto done2; - } + while (m && len > 0) { + unsigned int tocopy; - /* - * Loop trying to satisfy the vector of requests. - * If we reach a point where we must wait, any requests already - * performed are rolled back and we go to sleep until some other - * process wakes us up. At this point, we start all over again. - * - * This ensures that from the perspective of other tasks, a set - * of requests is atomic (never partially satisfied). - */ - for (;;) { - do_wakeup = 0; - error = 0; /* error return if necessary */ + if (len >= m->m_len) + tocopy = m->m_len; + else { + mp->msg_flags |= MSG_CTRUNC; + tocopy = len; + } + + if ((error = copyout(mtod(m, caddr_t), + ctlbuf, tocopy)) != 0) + goto out; - for (i = 0; i < nsops; i++) { - sopptr = &sops[i]; - semptr = &semaptr->sem_base[sopptr->sem_num]; + ctlbuf += tocopy; + len -= tocopy; + m = m->m_next; + } + mp->msg_controllen = ctlbuf - (caddr_t)mp->msg_control; + } +out: + fputsock(so); + if (fromsa) + FREE(fromsa, M_SONAME); + if (control) + m_freem(control); + return (error); +} - DPRINTF(( - "semop: semaptr=%x, sem_base=%x, " - "semptr=%x, sem[%d]=%d : op=%d, flag=%s\n", - semaptr, semaptr->sem_base, semptr, - sopptr->sem_num, semptr->semval, sopptr->sem_op, - (sopptr->sem_flg & IPC_NOWAIT) ? - "nowait" : "wait")); +/* + * MPSAFE + */ +int +recvfrom(td, uap) + struct thread *td; + register struct recvfrom_args /* { + int s; + caddr_t buf; + size_t len; + int flags; + caddr_t from; + int *fromlenaddr; + } */ *uap; +{ + struct msghdr msg; + struct iovec aiov; + int error; - if (sopptr->sem_op < 0) { - if (semptr->semval + sopptr->sem_op < 0) { - DPRINTF(("semop: can't do it now\n")); - break; - } else { - semptr->semval += sopptr->sem_op; - if (semptr->semval == 0 && - semptr->semzcnt > 0) - do_wakeup = 1; - } - } else if (sopptr->sem_op == 0) { - if (semptr->semval != 0) { - DPRINTF(("semop: not zero now\n")); - break; - } - } else if (semptr->semval + sopptr->sem_op > - seminfo.semvmx) { - error = ERANGE; - break; - } else { - if (semptr->semncnt > 0) - do_wakeup = 1; - semptr->semval += sopptr->sem_op; - } - } + mtx_lock(&Giant); + if (uap->fromlenaddr) { + error = copyin(uap->fromlenaddr, + &msg.msg_namelen, sizeof (msg.msg_namelen)); + if (error) + goto done2; + } else { + msg.msg_namelen = 0; + } + msg.msg_name = uap->from; + msg.msg_iov = &aiov; + msg.msg_iovlen = 1; + aiov.iov_base = uap->buf; + aiov.iov_len = uap->len; + msg.msg_control = 0; + msg.msg_flags = uap->flags; + error = recvit(td, uap->s, &msg, uap->fromlenaddr); +done2: + mtx_unlock(&Giant); + return(error); +} - /* - * Did we get through the entire vector? - */ - if (i >= nsops) - goto done; +#ifdef COMPAT_OLDSOCK +/* + * MPSAFE + */ +int +orecvfrom(td, uap) + struct thread *td; + struct recvfrom_args *uap; +{ - /* - * No ... rollback anything that we've already done - */ - DPRINTF(("semop: rollback 0 through %d\n", i-1)); - for (j = 0; j < i; j++) - semaptr->sem_base[sops[j].sem_num].semval -= - sops[j].sem_op; + uap->flags |= MSG_COMPAT; + return (recvfrom(td, uap)); +} +#endif - /* If we detected an error, return it */ - if (error != 0) - goto done2; - /* - * If the request that we couldn't satisfy has the - * NOWAIT flag set then return with EAGAIN. - */ - if (sopptr->sem_flg & IPC_NOWAIT) { - error = EAGAIN; - goto done2; - } +#ifdef COMPAT_OLDSOCK +/* + * MPSAFE + */ +int +orecv(td, uap) + struct thread *td; + register struct orecv_args /* { + int s; + caddr_t buf; + int len; + int flags; + } */ *uap; +{ + struct msghdr msg; + struct iovec aiov; + int error; - if (sopptr->sem_op == 0) - semptr->semzcnt++; - else - semptr->semncnt++; + mtx_lock(&Giant); + msg.msg_name = 0; + msg.msg_namelen = 0; + msg.msg_iov = &aiov; + msg.msg_iovlen = 1; + aiov.iov_base = uap->buf; + aiov.iov_len = uap->len; + msg.msg_control = 0; + msg.msg_flags = uap->flags; + error = recvit(td, uap->s, &msg, NULL); + mtx_unlock(&Giant); + return (error); +} - DPRINTF(("semop: good night!\n")); - error = tsleep(semaptr, (PZERO - 4) | PCATCH, "semwait", 0); - DPRINTF(("semop: good morning (error=%d)!\n", error)); +/* + * Old recvmsg. This code takes advantage of the fact that the old msghdr + * overlays the new one, missing only the flags, and with the (old) access + * rights where the control fields are now. + * + * MPSAFE + */ +int +orecvmsg(td, uap) + struct thread *td; + register struct orecvmsg_args /* { + int s; + struct omsghdr *msg; + int flags; + } */ *uap; +{ + struct msghdr msg; + struct iovec aiov[UIO_SMALLIOV], *iov; + int error; - if (error != 0) { - error = EINTR; - goto done2; - } - DPRINTF(("semop: good morning!\n")); + error = copyin(uap->msg, &msg, sizeof (struct omsghdr)); + if (error) + return (error); - /* - * Make sure that the semaphore still exists - */ - if ((semaptr->sem_perm.mode & SEM_ALLOC) == 0 || - semaptr->sem_perm.seq != IPCID_TO_SEQ(uap->semid)) { - error = EIDRM; + mtx_lock(&Giant); + if ((u_int)msg.msg_iovlen >= UIO_SMALLIOV) { + if ((u_int)msg.msg_iovlen >= UIO_MAXIOV) { + error = EMSGSIZE; goto done2; } - - /* - * The semaphore is still alive. Readjust the count of - * waiting processes. - */ - if (sopptr->sem_op == 0) - semptr->semzcnt--; - else - semptr->semncnt--; + MALLOC(iov, struct iovec *, + sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV, + M_WAITOK); + } else { + iov = aiov; } + msg.msg_flags = uap->flags | MSG_COMPAT; + error = copyin(msg.msg_iov, iov, + (unsigned)(msg.msg_iovlen * sizeof (struct iovec))); + if (error) + goto done; + msg.msg_iov = iov; + error = recvit(td, uap->s, &msg, &uap->msg->msg_namelen); -done: - /* - * Process any SEM_UNDO requests. - */ - if (do_undos) { - suptr = NULL; - for (i = 0; i < nsops; i++) { - /* - * We only need to deal with SEM_UNDO's for non-zero - * op's. - */ - int adjval; - - if ((sops[i].sem_flg & SEM_UNDO) == 0) - continue; - adjval = sops[i].sem_op; - if (adjval == 0) - continue; - error = semundo_adjust(td, &suptr, semid, - sops[i].sem_num, -adjval); - if (error == 0) - continue; - - /* - * Oh-Oh! We ran out of either sem_undo's or undo's. - * Rollback the adjustments to this point and then - * rollback the semaphore ups and down so we can return - * with an error with all structures restored. We - * rollback the undo's in the exact reverse order that - * we applied them. This gu0) + if (msg.msg_controllen && error == 0) error = copyout(&msg.msg_controllen, &uap->msg->msg_accrightslen, sizeof (int)); done: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 19:17:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 095D937B401; Wed, 14 Aug 2002 19:17:51 -0700 (PDT) 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 B782E37B400 for ; Wed, 14 Aug 2002 19:17:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 716DC43E6A for ; Wed, 14 Aug 2002 19:17:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7F2HoJU002515 for ; Wed, 14 Aug 2002 19:17:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7F2Hora002512 for perforce@freebsd.org; Wed, 14 Aug 2002 19:17:50 -0700 (PDT) Date: Wed, 14 Aug 2002 19:17:50 -0700 (PDT) Message-Id: <200208150217.g7F2Hora002512@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15995 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15995 Change 15995 by rwatson@rwatson_tislabs on 2002/08/14 19:17:27 Improve merge of recent kern_exec.c locking changes by jeff@FreeBSD.org. In particular, since the vnode lock and the proc lock are held throughout exec in the right lock order, we can now avoid racy dropping and grabbing of proc/vnode locks for MAC entry points. Probably not quite right yet due to the addition of textdvp which is not in the main tree and causes conflicts. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#32 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#32 (text+ko) ==== @@ -357,6 +357,7 @@ /* Get a reference to the vnode prior to locking the proc */ VREF(ndp->ni_vp); + VREF(ndp->ni_dvp); /* * For security and other reasons, signal handlers cannot @@ -420,12 +421,8 @@ attr.va_gid; #ifdef MAC - PROC_UNLOCK(p); - vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); will_transition = mac_execve_will_transition(oldcred, imgp->vp); credential_changing |= will_transition; - VOP_UNLOCK(imgp->vp, 0, td); - PROC_LOCK(p); #endif if (credential_changing && @@ -462,13 +459,9 @@ change_egid(newcred, attr.va_gid); #ifdef MAC if (will_transition) { - PROC_UNLOCK(p); - vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); mac_execve_transition(oldcred, newcred, imgp->vp); - VOP_UNLOCK(imgp->vp, 0, td); - PROC_LOCK(p); } -#endif /* MAC */ +#endif /* * Implement correct POSIX saved-id behavior. */ @@ -597,7 +590,7 @@ if (imgp->vp) { NDFREE(ndp, NDF_ONLY_PNBUF); vput(imgp->vp); - vput(ndp->ni_dvp); + vrele(ndp->ni_dvp); } if (imgp->object) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 14 20:24:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAF6837B401; Wed, 14 Aug 2002 20:24:16 -0700 (PDT) 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 8313937B400 for ; Wed, 14 Aug 2002 20:24:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 409C443E6A for ; Wed, 14 Aug 2002 20:24:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7F3OGJU011945 for ; Wed, 14 Aug 2002 20:24:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7F3OFpM011942 for perforce@freebsd.org; Wed, 14 Aug 2002 20:24:15 -0700 (PDT) Date: Wed, 14 Aug 2002 20:24:15 -0700 (PDT) Message-Id: <200208150324.g7F3OFpM011942@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 15997 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15997 Change 15997 by rwatson@rwatson_tislabs on 2002/08/14 20:23:40 Sync the ffs extattrctl wrapper with the modified version in the MAC tree with lsattr support. Affected files ... .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#17 (text+ko) ==== @@ -1453,14 +1453,15 @@ static int ffs_extattrctl(struct mount *mp, int cmd, struct vnode *filename_vp, - int attrnamespace, const char *attrname, struct thread *td) + int attrnamespace, const char *attrname, void *extended, + struct thread *td) { #ifdef UFS_EXTATTR return (ufs_extattrctl(mp, cmd, filename_vp, attrnamespace, - attrname, td)); + attrname, extended, td)); #else return (vfs_stdextattrctl(mp, cmd, filename_vp, attrnamespace, - attrname, td)); + attrname, extended, td)); #endif } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 15 6:52:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 237E137B401; Thu, 15 Aug 2002 06:52:37 -0700 (PDT) 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 05BF637B400 for ; Thu, 15 Aug 2002 06:52:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B525E43E65 for ; Thu, 15 Aug 2002 06:52:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FDqZJU033735 for ; Thu, 15 Aug 2002 06:52:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FDqZrE033732 for perforce@freebsd.org; Thu, 15 Aug 2002 06:52:35 -0700 (PDT) Date: Thu, 15 Aug 2002 06:52:35 -0700 (PDT) Message-Id: <200208151352.g7FDqZrE033732@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16021 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16021 Change 16021 by rwatson@rwatson_tislabs on 2002/08/15 06:52:30 Modify diskless mount so that it unmounts and remounts md UFS1 file systems when enabling labeling -- this will prevent cached mount labels from interfering with retrieving labels now available via EAs. This assumes UFS_EXTATTR_AUTOSTART. Affected files ... .. //depot/projects/trustedbsd/mac/etc/rc.diskless2#26 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/rc.diskless2#26 (text+ko) ==== @@ -46,15 +46,20 @@ /sbin/mount /dev/md$3c $2 } +# Enable label support on a UFS1 md file system +# $1 = mountpoint +# $2 = md device +# XXX: Assumes auto-start multilabel_md() { labelsize=`/sbin/sysctl -n security.mac.label_size` /bin/mkdir -p $1/.attribute/system /usr/sbin/extattrctl initattr -f -p $1 ${labelsize} \ $1/.attribute/system/freebsd.mac - /usr/sbin/extattrctl start $1 - /usr/sbin/extattrctl enable $1 system freebsd.mac \ - $1/.attribute/system/freebsd.mac - /sbin/mount -u -o multilabel $1 + #/usr/sbin/extattrctl start $1 + #/usr/sbin/extattrctl enable $1 system freebsd.mac \ + # $1/.attribute/system/freebsd.mac + /sbin/umount $1 + /sbin/mount -o multilabel /dev/md$2c $1 } # If there is a global system configuration file, suck it in. @@ -71,7 +76,7 @@ # If running with MAC support, must configure labeling for /var if sysctl security.mac > /dev/null 2>& 1 ; then - multilabel_md /var + multilabel_md /var 1 fi echo "+++ populate /var using /etc/mtree/BSD.var.dist" @@ -125,7 +130,7 @@ # If running with MAC support, must appropriately label /tmp if sysctl security.mac > /dev/null 2>& 1 ; then - multilabel_md /tmp + multilabel_md /tmp 2 /usr/sbin/setfmac biba/equal,mls/equal,te/equal /tmp fi fi To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 15 7:19:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE9D237B401; Thu, 15 Aug 2002 07:19:09 -0700 (PDT) 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 49C3D37B400 for ; Thu, 15 Aug 2002 07:19:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06B0F43E4A for ; Thu, 15 Aug 2002 07:19:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FEJ8JU040508 for ; Thu, 15 Aug 2002 07:19:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FEJ8Wd040505 for perforce@freebsd.org; Thu, 15 Aug 2002 07:19:08 -0700 (PDT) Date: Thu, 15 Aug 2002 07:19:08 -0700 (PDT) Message-Id: <200208151419.g7FEJ8Wd040505@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16023 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16023 Change 16023 by rwatson@rwatson_tislabs on 2002/08/15 07:18:49 Move the invocation of mac_cred_mmapped_drop_perms() to outside of the proc locking window during a process credential update, closing a race condition opened when mmap revocation was introduced. Otherwise, we were susceptible to check-check-change-change races that violated policy module invariants. The revocation now occurs after the atomic proc credential update prior to re-entering userland and the thread changing the credential re-gaining control. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#242 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#242 (text+ko) ==== @@ -2271,7 +2271,6 @@ { MAC_PERFORM(relabel_cred, cred, newlabel); - mac_cred_mmapped_drop_perms(curthread, cred); } void @@ -3003,8 +3002,6 @@ /* * MPSAFE - * - * XXX: Needs to be re-written for proc locking. */ int __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap) @@ -3039,12 +3036,19 @@ setsugid(p); crcopy(newcred, oldcred); - PROC_UNLOCK(p); mac_relabel_cred(newcred, &intlabel); + p->p_ucred = newcred; - PROC_LOCK(p); - p->p_ucred = newcred; + /* + * Grab additional reference for use while revoking mmaps, prior + * to releasing the proc lock and sharing the cred. + */ + crhold(newcred); PROC_UNLOCK(p); + + mac_cred_mmapped_drop_perms(td, newcred); + + crfree(newcred); /* Free revocation reference. */ crfree(oldcred); mac_destroy_temp(&intlabel); return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 15 8:42:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03F2737B401; Thu, 15 Aug 2002 08:42:56 -0700 (PDT) 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 7F0BC37B400 for ; Thu, 15 Aug 2002 08:42:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26AC043E77 for ; Thu, 15 Aug 2002 08:42:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FFgsJU052730 for ; Thu, 15 Aug 2002 08:42:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FFgswq052726 for perforce@freebsd.org; Thu, 15 Aug 2002 08:42:54 -0700 (PDT) Date: Thu, 15 Aug 2002 08:42:54 -0700 (PDT) Message-Id: <200208151542.g7FFgswq052726@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16026 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16026 Change 16026 by rwatson@rwatson_tislabs on 2002/08/15 08:42:44 Remove dup mac.h include. Affected files ... .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#16 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#16 (text+ko) ==== @@ -48,7 +48,6 @@ #include #include #include /* Must come after sys/malloc.h */ -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 15 8:56:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 291D037B401; Thu, 15 Aug 2002 08:56:18 -0700 (PDT) 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 960DC37B400 for ; Thu, 15 Aug 2002 08:56:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 563E343E81 for ; Thu, 15 Aug 2002 08:56:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FFuHJU053870 for ; Thu, 15 Aug 2002 08:56:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FFuGSD053867 for perforce@freebsd.org; Thu, 15 Aug 2002 08:56:16 -0700 (PDT) Date: Thu, 15 Aug 2002 08:56:16 -0700 (PDT) Message-Id: <200208151556.g7FFuGSD053867@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16029 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16029 Change 16029 by rwatson@rwatson_tislabs on 2002/08/15 08:55:28 Assert process locks in the MAC access control check entry points targetting processes. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#243 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#243 (text+ko) ==== @@ -2576,6 +2576,8 @@ if (!mac_enforce_process) return (0); + PROC_LOCK_ASSERT(proc, MA_OWNED); + MAC_CHECK(check_proc_debug, cred, proc); return (error); @@ -2589,6 +2591,8 @@ if (!mac_enforce_process) return (0); + PROC_LOCK_ASSERT(proc, MA_OWNED); + MAC_CHECK(check_proc_sched, cred, proc); return (error); @@ -2602,6 +2606,8 @@ if (!mac_enforce_process) return (0); + PROC_LOCK_ASSERT(proc, MA_OWNED); + MAC_CHECK(check_proc_signal, cred, proc, signum); return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 15 9: 4: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFDBA37B405; Thu, 15 Aug 2002 09:04:03 -0700 (PDT) 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 79AC037B400 for ; Thu, 15 Aug 2002 09:04:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19B7343E9E for ; Thu, 15 Aug 2002 09:03:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FG2OJU054537 for ; Thu, 15 Aug 2002 09:02:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FG2ODW054534 for perforce@freebsd.org; Thu, 15 Aug 2002 09:02:24 -0700 (PDT) Date: Thu, 15 Aug 2002 09:02:24 -0700 (PDT) Message-Id: <200208151602.g7FG2ODW054534@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16030 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16030 Change 16030 by rwatson@rwatson_tislabs on 2002/08/15 09:01:25 Restore the static qualifier to mac_cred_mmapped_drop_perms(), which was lost in the addition of mac_get_pid(), but appears to be correct. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#244 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#244 (text+ko) ==== @@ -201,7 +201,7 @@ static int mac_policy_unregister(struct mac_policy_conf *mpc); static int mac_stdcreatevnode_ea(struct vnode *vp); -void mac_cred_mmapped_drop_perms(struct thread *td, +static void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred); static void mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred, struct vm_map *map); @@ -2113,7 +2113,7 @@ * memory space, and revoke access (in the least surprising ways we * know) when necessary. The process lock is not held here. */ -void +static void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 15 10:22:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7659537B401; Thu, 15 Aug 2002 10:22:27 -0700 (PDT) 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 00E7037B400 for ; Thu, 15 Aug 2002 10:22:27 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DBC043E42 for ; Thu, 15 Aug 2002 10:22:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FHMQJU071147 for ; Thu, 15 Aug 2002 10:22:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FHMQQK071144 for perforce@freebsd.org; Thu, 15 Aug 2002 10:22:26 -0700 (PDT) Date: Thu, 15 Aug 2002 10:22:26 -0700 (PDT) Message-Id: <200208151722.g7FHMQQK071144@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16036 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16036 Change 16036 by rwatson@rwatson_tislabs on 2002/08/15 10:21:35 Diff reduction: dup mac.h. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#21 (text+ko) ==== @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 15 11:55:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFC8437B401; Thu, 15 Aug 2002 11:55:24 -0700 (PDT) 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 61AB137B400 for ; Thu, 15 Aug 2002 11:55:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 083C443E70 for ; Thu, 15 Aug 2002 11:55:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FItNJU084718 for ; Thu, 15 Aug 2002 11:55:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FItNv6084715 for perforce@freebsd.org; Thu, 15 Aug 2002 11:55:23 -0700 (PDT) Date: Thu, 15 Aug 2002 11:55:23 -0700 (PDT) Message-Id: <200208151855.g7FItNv6084715@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16040 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16040 Change 16040 by rwatson@rwatson_tislabs on 2002/08/15 11:55:05 Now that there's less namespace pollution, do include mac.h to get access to the MAC API. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_input.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netatalk/ddp_input.c#9 (text+ko) ==== @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 15 12: 1:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B345437B405; Thu, 15 Aug 2002 12:01:51 -0700 (PDT) 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 61C9237B401 for ; Thu, 15 Aug 2002 12:01:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F272543E7B for ; Thu, 15 Aug 2002 12:01:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FJ1oJU085524 for ; Thu, 15 Aug 2002 12:01:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FJ1oJ2085521 for perforce@freebsd.org; Thu, 15 Aug 2002 12:01:50 -0700 (PDT) Date: Thu, 15 Aug 2002 12:01:50 -0700 (PDT) Message-Id: <200208151901.g7FJ1oJ2085521@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16043 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16043 Change 16043 by rwatson@rwatson_tislabs on 2002/08/15 12:01:14 Diff reduce: remove dup include from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#11 (text+ko) ==== @@ -93,7 +93,6 @@ #include #include #include -#include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 15 12:40:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A661537B400; Thu, 15 Aug 2002 12:40:45 -0700 (PDT) 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 32A8A37B401 for ; Thu, 15 Aug 2002 12:40:45 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A274743E91 for ; Thu, 15 Aug 2002 12:40:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FJeiJU092986 for ; Thu, 15 Aug 2002 12:40:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FJeixX092983 for perforce@freebsd.org; Thu, 15 Aug 2002 12:40:44 -0700 (PDT) Date: Thu, 15 Aug 2002 12:40:44 -0700 (PDT) Message-Id: <200208151940.g7FJeixX092983@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16052 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16052 Change 16052 by rwatson@rwatson_tislabs on 2002/08/15 12:40:36 Remove dup MAC check on readdir() from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#77 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#77 (text+ko) ==== @@ -2935,18 +2935,6 @@ auio.uio_td = td; auio.uio_resid = SCARG(uap, count); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); -#ifdef MAC - /* - * Using the process credentials, not the cached ones owned by the fd, - * check for ability to search in a directory before reading from it. - */ - error = mac_check_vnode_readdir(td->td_ucred, vp); - if (error) { - VOP_UNLOCK(vp, 0, td); - fdrop(fp, td); - return (error); - } -#endif /* MAC */ loff = auio.uio_offset = fp->f_offset; #ifdef MAC error = mac_check_vnode_readdir(td->td_ucred, vp); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 15 13: 1:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9702337B401; Thu, 15 Aug 2002 13:01:11 -0700 (PDT) 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 078C837B400 for ; Thu, 15 Aug 2002 13:01:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB5CE43E77 for ; Thu, 15 Aug 2002 13:01:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FK1AJU095265 for ; Thu, 15 Aug 2002 13:01:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FK1A5n095260 for perforce@freebsd.org; Thu, 15 Aug 2002 13:01:10 -0700 (PDT) Date: Thu, 15 Aug 2002 13:01:10 -0700 (PDT) Message-Id: <200208152001.g7FK1A5n095260@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16055 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16055 Change 16055 by rwatson@rwatson_tislabs on 2002/08/15 13:00:14 Pedandit diff reduction from baseless integ: p4 decided we didn't need the main tree versions of $FreeBSD$, but I'd rather have them. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.h#4 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#51 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.h#7 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#14 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.h#4 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#66 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#15 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#35 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/sys/security/mac_biba/mac_biba.h,v 1.1 2002/07/31 18:07:43 rwatson Exp $ */ /* * Definitions for the TrustedBSD Biba integrity policy module. ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#51 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.c,v 1.1 2002/07/31 18:07:44 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.h#7 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/sys/security/mac_bsdextended/mac_bsdextended.h,v 1.1 2002/07/31 18:07:44 rwatson Exp $ */ #ifndef _SYS_SECURITY_MAC_BSDEXTENDED_H ==== //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#14 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/security/mac_ifoff/mac_ifoff.c,v 1.1 2002/07/31 18:07:44 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: $ + * $FreeBSD: src/sys/security/mac_mls/mac_mls.h,v 1.1 2002/07/31 18:07:44 rwatson Exp $ */ /* * Definitions for the TrustedBSD MLS confidentiality policy module. ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#66 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/security/mac_none/mac_none.c,v 1.1 2002/07/31 18:07:44 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#15 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/security/mac_seeotheruids/mac_seeotheruids.c,v 1.1 2002/07/31 18:07:45 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#35 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.1 2002/07/31 18:07:45 rwatson Exp $ */ /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 15 14:43:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D50037B416; Thu, 15 Aug 2002 14:42:12 -0700 (PDT) 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 1C98337B4FD for ; Thu, 15 Aug 2002 14:42:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59A5643E6E for ; Thu, 15 Aug 2002 14:42:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FLg7JU022296 for ; Thu, 15 Aug 2002 14:42:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FLg5ue022293 for perforce@freebsd.org; Thu, 15 Aug 2002 14:42:05 -0700 (PDT) Date: Thu, 15 Aug 2002 14:42:05 -0700 (PDT) Message-Id: <200208152142.g7FLg5ue022293@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16064 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16064 Change 16064 by rwatson@rwatson_tislabs on 2002/08/15 14:41:25 Integ trustedbsd_mac from trustedbsd base. Trickle back fo_read/fo_write/.../vn_rdwr credential changes, network stack MAC changes, et al. Affected files ... .. //depot/projects/trustedbsd/mac/UPDATING#14 integrate .. //depot/projects/trustedbsd/mac/bin/test/test.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-lex.c#6 integrate .. //depot/projects/trustedbsd/mac/etc/rc#18 integrate .. //depot/projects/trustedbsd/mac/etc/rc.network#12 integrate .. //depot/projects/trustedbsd/mac/include/arpa/inet.h#6 integrate .. //depot/projects/trustedbsd/mac/include/inttypes.h#5 integrate .. //depot/projects/trustedbsd/mac/include/search.h#3 integrate .. //depot/projects/trustedbsd/mac/include/stdio.h#6 integrate .. //depot/projects/trustedbsd/mac/include/stdlib.h#10 integrate .. //depot/projects/trustedbsd/mac/include/time.h#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/gen/makecontext.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_ntop.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_pton.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/fprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/printf.3#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/printf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/setbuf.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/setbuf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/setvbuf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/snprintf.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/sprintf.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vprintf.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vsnprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vsprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtod.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoimax.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtol.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtol.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoll.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoq.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoul.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoul.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoull.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtoumax.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtouq.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/tdelete.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/tsearch.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strftime.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strftime.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strptime.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdtime/strptime.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strcat.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strcat.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strcpy.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strcpy.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strncat.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strncpy.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strxfrm.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strxfrm.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/xdr/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/man4.i386/cy.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/zero_copy.9#2 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/vm_machdep.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_extend.c#2 delete .. //depot/projects/trustedbsd/mac/sys/cam/cam_extend.h#2 delete .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/compat/pecoff/imgact_pecoff.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_misc.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#45 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cardbus/cardbus.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccard.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbbvar.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wavelan_ieee.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi_pccard.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wivar.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_ioctl.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/udf/udf_vnops.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_lookup.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC#17 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NEWCARD#8 delete .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm_machdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/vm_machdep.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_aout.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_acct.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#245 integrate .. //depot/projects/trustedbsd/mac/sys/kern/link_aout.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/kern/link_elf.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_generic.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_socket.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#50 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/aarp.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_input.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_output.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_var.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_debug.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_lock.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vrreg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/vm_machdep.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#99 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#81 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#67 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/pcpu.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/tlb.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/machdep.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/sys/file.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#153 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#116 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#16 integrate .. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#23 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#43 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_lookup.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#48 integrate .. //depot/projects/trustedbsd/mac/tools/regression/README#6 integrate .. //depot/projects/trustedbsd/mac/tools/regression/sysvmsg/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvmsg/README#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvmsg/msgtest.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvsem/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvsem/README#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvsem/semtest.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvshm/Makefile#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvshm/README#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/sysvshm/shmtest.c#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/find/find.1#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/find/option.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/stat/stat.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac/UPDATING#14 (text+ko) ==== @@ -22,6 +22,11 @@ integrity. Re-enabling write caching can substantially improve performance. +20020815: + A "bug" in gcc(1) that was hiding warning in system headers was + fixed. It's probably time to add -DNO_WERROR to your make line + again. + 20020729: COPY is being deprecated. The 20010530 change was reverted, as it causes far more pain than was expected, and to always compare @@ -1057,4 +1062,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.214 2002/07/29 08:51:03 ru Exp $ +$FreeBSD: src/UPDATING,v 1.215 2002/08/15 08:51:24 ru Exp $ ==== //depot/projects/trustedbsd/mac/bin/test/test.c#9 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.50 2002/07/27 22:53:44 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.51 2002/08/15 14:53:20 maxim Exp $"); #include #include @@ -161,6 +161,7 @@ }; struct t_op const *t_wp_op; +int nargc; char **t_wp; static int aexpr(enum token); @@ -182,23 +183,8 @@ int main(int argc, char **argv) { - int i, res; + int res; char *p; - char **nargv; - - /* - * XXX copy the whole contents of argv to a newly allocated - * space with two extra cells filled with NULL's - this source - * code totally depends on their presence. - */ - if ((nargv = (char **)malloc((argc + 2) * sizeof(char *))) == NULL) - error("Out of space"); - - for (i = 0; i < argc; i++) - nargv[i] = argv[i]; - - nargv[i] = nargv[i + 1] = NULL; - argv = nargv; if ((p = rindex(argv[0], '/')) == NULL) p = argv[0]; @@ -210,15 +196,19 @@ argv[argc] = NULL; } + /* no expression => false */ + if (--argc <= 0) + return 1; + #ifndef SHELL (void)setlocale(LC_CTYPE, ""); #endif + nargc = argc; t_wp = &argv[1]; res = !oexpr(t_lex(*t_wp)); - if (*t_wp != NULL && *++t_wp != NULL) + if (--nargc > 0) syntax(*t_wp, "unexpected operator"); - free(nargv); return res; } @@ -239,9 +229,11 @@ int res; res = aexpr(n); - if (t_lex(*++t_wp) == BOR) - return oexpr(t_lex(*++t_wp)) || res; + if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) == BOR) + return oexpr(t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) || + res; t_wp--; + nargc++; return res; } @@ -251,9 +243,11 @@ int res; res = nexpr(n); - if (t_lex(*++t_wp) == BAND) - return aexpr(t_lex(*++t_wp)) && res; + if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) == BAND) + return aexpr(t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) && + res; t_wp--; + nargc++; return res; } @@ -261,7 +255,7 @@ nexpr(enum token n) { if (n == UNOT) - return !nexpr(t_lex(*++t_wp)); + return !nexpr(t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)); return primary(n); } @@ -274,30 +268,32 @@ if (n == EOI) return 0; /* missing expression */ if (n == LPAREN) { - if ((nn = t_lex(*++t_wp)) == RPAREN) + if ((nn = t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) == + RPAREN) return 0; /* missing expression */ res = oexpr(nn); - if (t_lex(*++t_wp) != RPAREN) + if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) != RPAREN) syntax(NULL, "closing paren expected"); return res; } if (t_wp_op && t_wp_op->op_type == UNOP) { /* unary expression */ - if (*++t_wp == NULL) + if (--nargc == 0) syntax(t_wp_op->op_text, "argument expected"); switch (n) { case STREZ: - return strlen(*t_wp) == 0; + return strlen(*++t_wp) == 0; case STRNZ: - return strlen(*t_wp) != 0; + return strlen(*++t_wp) != 0; case FILTT: - return isatty(getn(*t_wp)); + return isatty(getn(*++t_wp)); default: - return filstat(*t_wp, n); + return filstat(*++t_wp, n); } } - if (t_lex(t_wp[1]), t_wp_op && t_wp_op->op_type == BINOP) { + if (t_lex(nargc > 0 ? t_wp[1] : NULL), t_wp_op && t_wp_op->op_type == + BINOP) { return binop(); } @@ -311,10 +307,10 @@ struct t_op const *op; opnd1 = *t_wp; - (void) t_lex(*++t_wp); + (void) t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL); op = t_wp_op; - if ((opnd2 = *++t_wp) == NULL) + if ((opnd2 = nargc > 0 ? (--nargc, *++t_wp) : NULL) == NULL) syntax(op->op_text, "argument expected"); switch (op->op_num) { @@ -415,7 +411,7 @@ while (op->op_text) { if (strcmp(s, op->op_text) == 0) { if ((op->op_type == UNOP && isoperand()) || - (op->op_num == LPAREN && *(t_wp+1) == 0)) + (op->op_num == LPAREN && nargc == 1)) break; t_wp_op = op; return op->op_num; @@ -433,10 +429,12 @@ char *s; char *t; - if ((s = *(t_wp+1)) == 0) + if (nargc == 1) return 1; - if ((t = *(t_wp+2)) == 0) + if (nargc == 2) return 0; + s = *(t_wp + 1); + t = *(t_wp + 2); while (op->op_text) { if (strcmp(s, op->op_text) == 0) return op->op_type == BINOP && ==== //depot/projects/trustedbsd/mac/contrib/gcc/c-lex.c#6 (text+ko) ==== @@ -19,6 +19,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc/c-lex.c,v 1.2 2002/08/15 08:45:49 ru Exp $ */ + #include "config.h" #include "system.h" @@ -315,7 +317,11 @@ } update_header_times (new_map->to_file); +#ifndef FREEBSD_NATIVE in_system_header = new_map->sysp != 0; +#else /* FREEBSD_NATIVE */ + in_system_header = 0; +#endif /* FREEBSD_NATIVE */ input_filename = new_map->to_file; lineno = to_line; map = new_map; ==== //depot/projects/trustedbsd/mac/etc/rc#18 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.316 2002/08/14 05:58:44 gordon Exp $ +# $FreeBSD: src/etc/rc,v 1.317 2002/08/15 03:24:47 gordon Exp $ # # System startup script run by init on autoboot @@ -165,7 +165,6 @@ chkdepend amd amd_enable rpcbind rpcbind_enable chkdepend amd amd_enable NFS nfs_client_enable chkdepend NFS nfs_server_enable rpcbind rpcbind_enable -chkdepend NFS nfs_server_enable rpcbind rpcbind_enable chkdepend NIS nis_server_enable rpcbind rpcbind_enable chkdepend NIS nis_client_enable rpcbind rpcbind_enable ==== //depot/projects/trustedbsd/mac/etc/rc.network#12 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.network,v 1.135 2002/08/14 05:44:29 gordon Exp $ +# $FreeBSD: src/etc/rc.network,v 1.136 2002/08/15 03:29:19 gordon Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -694,7 +694,7 @@ fi ;; *) - case ${single_mountd_enable} in + case ${mountd_enable} in [Yy][Ee][Ss]) if [ -r /etc/exports ]; then echo -n ' mountd' ==== //depot/projects/trustedbsd/mac/include/arpa/inet.h#6 (text+ko) ==== @@ -50,7 +50,7 @@ * * @(#)inet.h 8.1 (Berkeley) 6/2/93 * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $ - * $FreeBSD: src/include/arpa/inet.h,v 1.22 2002/04/10 10:51:53 mike Exp $ + * $FreeBSD: src/include/arpa/inet.h,v 1.23 2002/08/14 20:40:35 robert Exp $ */ #ifndef _ARPA_INET_H_ @@ -139,8 +139,9 @@ in_addr_t inet_addr(const char *); char *inet_ntoa(struct in_addr); -const char *inet_ntop(int, const void *, char *, socklen_t); -int inet_pton(int, const char *, void *); +const char *inet_ntop(int, const void *__restrict, char *__restrict, + socklen_t); +int inet_pton(int, const char *__restrict, void *__restrict); #if __BSD_VISIBLE int ascii2addr(int, const char *, void *); ==== //depot/projects/trustedbsd/mac/include/inttypes.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/inttypes.h,v 1.4 2002/07/09 05:13:30 obrien Exp $ + * $FreeBSD: src/include/inttypes.h,v 1.5 2002/08/15 09:25:03 robert Exp $ */ #ifndef _INTTYPES_H_ @@ -48,9 +48,9 @@ intmax_t imaxabs(intmax_t) __pure2; imaxdiv_t imaxdiv(intmax_t, intmax_t) __pure2; +intmax_t strtoimax(const char *__restrict, char **__restrict, int); +uintmax_t strtoumax(const char *__restrict, char **__restrict, int); /* XXX: The following functions are missing the restrict type qualifier. */ -intmax_t strtoimax(const char *, char **, int); -uintmax_t strtoumax(const char *, char **, int); intmax_t wcstoimax(const wchar_t *, wchar_t **, int); uintmax_t wcstoumax(const wchar_t *, wchar_t **, int); __END_DECLS ==== //depot/projects/trustedbsd/mac/include/search.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $ */ -/* $FreeBSD: src/include/search.h,v 1.4 2002/03/23 17:24:53 imp Exp $ */ +/* $FreeBSD: src/include/search.h,v 1.5 2002/08/14 21:16:41 robert Exp $ */ /* * Written by J.T. Conklin @@ -44,7 +44,8 @@ int hcreate(size_t); void hdestroy(void); ENTRY *hsearch(ENTRY, ACTION); -void *tdelete(const void *, void **, int (*)(const void *, const void *)); +void *tdelete(const void *__restrict, void **__restrict, + int (*)(const void *, const void *)); void *tfind(const void *, void **, int (*)(const void *, const void *)); void *tsearch(const void *, void **, int (*)(const void *, const void *)); void twalk(const void *, void (*)(const void *, VISIT, int)); ==== //depot/projects/trustedbsd/mac/include/stdio.h#6 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.41 2002/07/15 19:38:45 wollman Exp $ + * $FreeBSD: src/include/stdio.h,v 1.44 2002/08/15 10:28:51 robert Exp $ */ #ifndef _STDIO_H_ @@ -221,7 +221,7 @@ int fgetpos(FILE *, fpos_t *); char *fgets(char *, int, FILE *); FILE *fopen(const char *, const char *); -int fprintf(FILE *, const char *, ...); +int fprintf(FILE *__restrict, const char *__restrict, ...); int fputc(int, FILE *); int fputs(const char *, FILE *); size_t fread(void *, size_t, size_t, FILE *); @@ -235,7 +235,7 @@ int getchar(void); char *gets(char *); void perror(const char *); -int printf(const char *, ...); +int printf(const char *__restrict, ...); int putc(int, FILE *); int putchar(int); int puts(const char *); @@ -243,21 +243,24 @@ int rename(const char *, const char *); void rewind(FILE *); int scanf(const char *, ...); -void setbuf(FILE *, char *); -int setvbuf(FILE *, char *, int, size_t); -int sprintf(char *, const char *, ...); +void setbuf(FILE *__restrict, char *__restrict); +int setvbuf(FILE *__restrict, char *__restrict, int, size_t); +int sprintf(char *__restrict, const char *__restrict, ...); int sscanf(const char *, const char *, ...); FILE *tmpfile(void); char *tmpnam(char *); int ungetc(int, FILE *); -int vfprintf(FILE *, const char *, _BSD_VA_LIST_); -int vprintf(const char *, _BSD_VA_LIST_); -int vsprintf(char *, const char *, _BSD_VA_LIST_); +int vfprintf(FILE *__restrict, const char *__restrict, + _BSD_VA_LIST_); +int vprintf(const char *__restrict, _BSD_VA_LIST_); +int vsprintf(char *__restrict, const char *__restrict, + _BSD_VA_LIST_); #if __ISO_C_VISIBLE >= 1999 -int snprintf(char *, size_t, const char *, ...) __printflike(3, 4); -int vsnprintf(char *, size_t, const char *, _BSD_VA_LIST_) - __printflike(3, 0); +int snprintf(char *__restrict, size_t, const char *__restrict, + ...) __printflike(3, 4); +int vsnprintf(char *__restrict, size_t, const char *__restrict, + _BSD_VA_LIST_) __printflike(3, 0); #endif /* ==== //depot/projects/trustedbsd/mac/include/stdlib.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.37 2002/07/09 05:13:30 obrien Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.38 2002/08/15 09:25:03 robert Exp $ */ #ifndef _STDLIB_H_ @@ -114,10 +114,10 @@ int rand(void); void *realloc(void *, size_t); void srand(unsigned); -double strtod(const char *, char **); -long strtol(const char *, char **, int); +double strtod(const char *__restrict, char **__restrict); +long strtol(const char *__restrict, char **__restrict, int); unsigned long - strtoul(const char *, char **, int); + strtoul(const char *__restrict, char **__restrict, int); int system(const char *); int mblen(const char *, size_t); @@ -198,13 +198,13 @@ #ifdef __LONG_LONG_SUPPORTED /* LONGLONG */ long long - strtoll(const char *, char **, int); + strtoll(const char *__restrict, char **__restrict, int); #endif __int64_t strtoq(const char *, char **, int); #ifdef __LONG_LONG_SUPPORTED /* LONGLONG */ unsigned long long - strtoull(const char *, char **, int); + strtoull(const char *__restrict, char **__restrict, int); #endif __uint64_t strtouq(const char *, char **, int); ==== //depot/projects/trustedbsd/mac/include/time.h#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.25 2002/06/27 20:18:45 wollman Exp $ + * $FreeBSD: src/include/time.h,v 1.27 2002/08/14 23:20:48 robert Exp $ */ #ifndef _TIME_H_ @@ -121,7 +121,8 @@ struct tm *gmtime(const time_t *); struct tm *localtime(const time_t *); time_t mktime(struct tm *); -size_t strftime(char *, size_t, const char *, const struct tm *); +size_t strftime(char *__restrict, size_t, const char *__restrict, + const struct tm *__restrict); time_t time(time_t *); #if __POSIX_VISIBLE @@ -143,7 +144,8 @@ #endif #if __XSI_VISIBLE -char *strptime(const char *, const char *, struct tm *); +char *strptime(const char *__restrict, const char *__restrict, + struct tm *__restrict); #endif #if __BSD_VISIBLE ==== //depot/projects/trustedbsd/mac/lib/libc/i386/gen/makecontext.c#2 (text+ko) ==== @@ -25,13 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/makecontext.c,v 1.1 2002/01/10 02:40:59 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/makecontext.c,v 1.2 2002/08/15 11:58:24 robert Exp $"); #include #include #include #include +#include #include #include ==== //depot/projects/trustedbsd/mac/lib/libc/net/inet.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)inet.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.22 2001/12/01 03:43:01 mike Exp $ +.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.24 2002/08/15 20:33:44 robert Exp $ .\" .Dd June 17, 1996 .Dt INET 3 @@ -62,9 +62,14 @@ .Ft char * .Fn inet_ntoa "struct in_addr in" .Ft const char * -.Fn inet_ntop "int af" "const void *src" "char *dst" "socklen_t size" +.Fo inet_ntop +.Fa "int af" +.Fa "const void *restrict src" +.Fa "char *restrict dst" +.Fa "socklen_t size" +.Fc .Ft int -.Fn inet_pton "int af" "const char *src" "void *dst" +.Fn inet_pton "int af" "const char *restrict src" "void *restrict dst" .Ft struct in_addr .Fn inet_makeaddr "in_addr_t net" "in_addr_t lna" .Ft in_addr_t ==== //depot/projects/trustedbsd/mac/lib/libc/net/inet_ntop.c#4 (text+ko) ==== @@ -18,7 +18,7 @@ static char rcsid[] = "$Id: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.9 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.10 2002/08/14 20:40:35 robert Exp $"); #include #include @@ -49,11 +49,8 @@ * Paul Vixie, 1996. */ const char * -inet_ntop(af, src, dst, size) - int af; - const void *src; - char *dst; - socklen_t size; +inet_ntop(int af, const void *__restrict src, char *__restrict dst, + socklen_t size) { switch (af) { case AF_INET: @@ -79,10 +76,7 @@ * Paul Vixie, 1996. */ static const char * -inet_ntop4(src, dst, size) - const u_char *src; - char *dst; - socklen_t size; +inet_ntop4(const u_char *src, char *dst, socklen_t size) { static const char fmt[] = "%u.%u.%u.%u"; char tmp[sizeof "255.255.255.255"]; @@ -102,10 +96,7 @@ * Paul Vixie, 1996. */ static const char * -inet_ntop6(src, dst, size) - const u_char *src; - char *dst; - socklen_t size; +inet_ntop6(const u_char *src, char *dst, socklen_t size) { /* * Note that int32_t and int16_t need only be "at least" large enough ==== //depot/projects/trustedbsd/mac/lib/libc/net/inet_pton.c#4 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.9 2002/04/19 04:46:20 suz Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.10 2002/08/14 20:40:35 robert Exp $"); #include #include @@ -48,10 +48,7 @@ * Paul Vixie, 1996. */ int -inet_pton(af, src, dst) - int af; - const char *src; - void *dst; +inet_pton(int af, const char *__restrict src, void *__restrict dst) { switch (af) { case AF_INET: @@ -76,9 +73,7 @@ * Paul Vixie, 1996. */ static int -inet_pton4(src, dst) - const char *src; - u_char *dst; +inet_pton4(const char *src, u_char *dst) { static const char digits[] = "0123456789"; int saw_digit, octets, ch; @@ -130,9 +125,7 @@ * Paul Vixie, 1996. */ static int -inet_pton6(src, dst) - const char *src; - u_char *dst; +inet_pton6(const char *src, u_char *dst) { static const char xdigits_l[] = "0123456789abcdef", xdigits_u[] = "0123456789ABCDEF"; ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/fprintf.c#4 (text+ko) ==== @@ -38,13 +38,13 @@ static char sccsid[] = "@(#)fprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fprintf.c,v 1.8 2002/05/28 16:59:39 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fprintf.c,v 1.9 2002/08/15 09:47:10 robert Exp $"); #include #include int -fprintf(FILE *fp, const char *fmt, ...) +fprintf(FILE *__restrict fp, const char *__restrict fmt, ...) { int ret; va_list ap; ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/printf.3#9 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.44 2002/08/11 13:05:26 schweikh Exp $ +.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.46 2002/08/15 10:28:51 robert Exp $ .\" .Dd November 8, 2001 .Dt PRINTF 3 @@ -48,24 +48,24 @@ .Sh SYNOPSIS .In stdio.h .Ft int -.Fn printf "const char *format" ... +.Fn printf "const char *restrict format" ... .Ft int -.Fn fprintf "FILE *stream" "const char *format" ... +.Fn fprintf "FILE *restrict stream" "const char *restrict format" ... .Ft int -.Fn sprintf "char *str" "const char *format" ... +.Fn sprintf "char *restrict str" "const char *restrict format" ... .Ft int -.Fn snprintf "char *str" "size_t size" "const char *format" ... +.Fn snprintf "char *restrict str" "size_t size" "const char *restrict format" ... .Ft int .Fn asprintf "char **ret" "const char *format" ... .In stdarg.h .Ft int -.Fn vprintf "const char *format" "va_list ap" +.Fn vprintf "const char *restrict format" "va_list ap" .Ft int -.Fn vfprintf "FILE *stream" "const char *format" "va_list ap" +.Fn vfprintf "FILE *restrict stream" "const char *restrict format" "va_list ap" .Ft int -.Fn vsprintf "char *str" "const char *format" "va_list ap" +.Fn vsprintf "char *restrict str" "const char *restrict format" "va_list ap" .Ft int -.Fn vsnprintf "char *str" "size_t size" "const char *format" "va_list ap" +.Fn vsnprintf "char *restrict str" "size_t size" "const char *restrict format" "va_list ap" .Ft int .Fn vasprintf "char **ret" "const char *format" "va_list ap" .Sh DESCRIPTION ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/printf.c#4 (text+ko) ==== @@ -38,13 +38,13 @@ static char sccsid[] = "@(#)printf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/printf.c,v 1.8 2002/05/28 16:59:39 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/printf.c,v 1.9 2002/08/15 09:47:10 robert Exp $"); #include #include int -printf(char const *fmt, ...) +printf(char const *__restrict fmt, ...) { int ret; va_list ap; ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/setbuf.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)setbuf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.10 2001/10/01 16:08:59 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.11 2002/08/14 23:45:42 robert Exp $ .\" .Dd June 4, 1993 .Dt SETBUF 3 @@ -50,13 +50,13 @@ .Sh SYNOPSIS .In stdio.h .Ft void -.Fn setbuf "FILE *stream" "char *buf" +.Fn setbuf "FILE *restrict stream" "char *restrict buf" .Ft void .Fn setbuffer "FILE *stream" "char *buf" "int size" .Ft int .Fn setlinebuf "FILE *stream" .Ft int -.Fn setvbuf "FILE *stream" "char *buf" "int mode" "size_t size" +.Fn setvbuf "FILE *restrict stream" "char *restrict buf" "int mode" "size_t size" .Sh DESCRIPTION The three types of buffering available are unbuffered, block buffered, and line buffered. ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/setbuf.c#3 (text+ko) ==== @@ -38,15 +38,13 @@ static char sccsid[] = "@(#)setbuf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuf.c,v 1.2 2002/03/22 21:53:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuf.c,v 1.3 2002/08/14 23:45:42 robert Exp $"); #include #include "local.h" void -setbuf(fp, buf) - FILE *fp; - char *buf; +setbuf(FILE *__restrict fp, char *__restrict buf) { (void) setvbuf(fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ); } ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/setvbuf.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)setvbuf.c 8.2 (Berkeley) 11/16/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/setvbuf.c,v 1.11 2002/03/22 21:53:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/setvbuf.c,v 1.12 2002/08/14 23:45:42 robert Exp $"); #include "namespace.h" #include @@ -52,11 +52,7 @@ * a buffer. */ int -setvbuf(fp, buf, mode, size) - FILE *fp; - char *buf; - int mode; - size_t size; +setvbuf(FILE *__restrict fp, char *__restrict buf, int mode, size_t size) { int ret, flags; size_t iosize; ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/snprintf.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)snprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.18 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.19 2002/08/15 09:47:10 robert Exp $"); #include #include @@ -47,7 +47,7 @@ #include "local.h" int -snprintf(char *str, size_t n, char const *fmt, ...) +snprintf(char *__restrict str, size_t n, char const *__restrict fmt, ...) { size_t on; int ret; ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/sprintf.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)sprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.12 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.13 2002/08/15 09:47:10 robert Exp $"); #include #include @@ -46,7 +46,7 @@ #include "local.h" int -sprintf(char *str, char const *fmt, ...) +sprintf(char *__restrict str, char const *__restrict fmt, ...) { int ret; va_list ap; ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/vfprintf.c#9 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.42 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.43 2002/08/15 10:28:52 robert Exp $"); /* * Actual printf innards. @@ -332,7 +332,8 @@ * MT-safe version */ int -vfprintf(FILE *fp, const char *fmt0, va_list ap) +vfprintf(FILE *__restrict fp, const char *__restrict fmt0, va_list ap) + >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 15 14:54:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B302237B401; Thu, 15 Aug 2002 14:54:25 -0700 (PDT) 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 2B9BE37B400 for ; Thu, 15 Aug 2002 14:54:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C513343E42 for ; Thu, 15 Aug 2002 14:54:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FLsOJU025056 for ; Thu, 15 Aug 2002 14:54:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FLsNdT025053 for perforce@freebsd.org; Thu, 15 Aug 2002 14:54:23 -0700 (PDT) Date: Thu, 15 Aug 2002 14:54:23 -0700 (PDT) Message-Id: <200208152154.g7FLsNdT025053@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16067 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16067 Change 16067 by rwatson@rwatson_curry on 2002/08/15 14:53:48 Remove dup include from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netatalk/ddp_output.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netatalk/ddp_output.c#4 (text+ko) ==== @@ -25,8 +25,6 @@ #include "opt_mac.h" -#include "opt_mac.h" - #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 15 14:59:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71DBD37B401; Thu, 15 Aug 2002 14:58:35 -0700 (PDT) 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 F1AEE37B400 for ; Thu, 15 Aug 2002 14:58:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 078DD43E81 for ; Thu, 15 Aug 2002 14:58:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (smmsp@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7FLwXJU025366 for ; Thu, 15 Aug 2002 14:58:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7FLW5Fd019495 for perforce@freebsd.org; Thu, 15 Aug 2002 14:32:05 -0700 (PDT) Date: Thu, 15 Aug 2002 14:32:05 -0700 (PDT) Message-Id: <200208152132.g7FLW5Fd019495@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16063 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16063 Change 16063 by rwatson@rwatson_tislabs on 2002/08/15 14:31:40 Integ trustedbsd_base from the main FreeBSD tree. In particular, trickle back the credential changes to fo_read/fo_write/.../vn_rdwr(). Affected files ... .. //depot/projects/trustedbsd/base/UPDATING#17 integrate .. //depot/projects/trustedbsd/base/bin/test/test.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-lex.c#6 integrate .. //depot/projects/trustedbsd/base/etc/rc#15 integrate .. //depot/projects/trustedbsd/base/etc/rc.network#13 integrate .. //depot/projects/trustedbsd/base/include/arpa/inet.h#6 integrate .. //depot/projects/trustedbsd/base/include/inttypes.h#5 integrate .. //depot/projects/trustedbsd/base/include/search.h#3 integrate .. //depot/projects/trustedbsd/base/include/stdio.h#6 integrate .. //depot/projects/trustedbsd/base/include/stdlib.h#10 integrate .. //depot/projects/trustedbsd/base/include/time.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/makecontext.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet_ntop.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet_pton.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fprintf.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/printf.3#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/printf.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/setbuf.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/setbuf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/setvbuf.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/snprintf.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/sprintf.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vprintf.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vsnprintf.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vsprintf.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtod.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtoimax.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtol.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtol.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtoll.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtoq.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtoul.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtoul.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtoull.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtoumax.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtouq.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/tdelete.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/tsearch.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/strftime.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/strftime.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/strptime.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdtime/strptime.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strcat.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strcat.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strcpy.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strcpy.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strncat.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strncpy.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strxfrm.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strxfrm.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/xdr/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libugidfw/ugidfw.c#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/cy.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/zero_copy.9#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/vm_machdep.c#8 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_extend.c#2 delete .. //depot/projects/trustedbsd/base/sys/cam/cam_extend.h#2 delete .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#13 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/pecoff/imgact_pecoff.c#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_misc.c#10 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbvar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wavelan_ieee.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi_pccard.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wivar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_ioctl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_lookup.c#6 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC#18 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NEWCARD#8 delete .. //depot/projects/trustedbsd/base/sys/i386/i386/vm_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/vm_machdep.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_aout.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_elf.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_linker.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/link_aout.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/link_elf.c#5 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_generic.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_socket.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_shm.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#23 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ppp.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/aarp.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_input.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_var.h#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet/raw_ip.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#16 integrate .. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#13 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_lock.c#8 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vrreg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/vm_machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/pcpu.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/tlb.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#17 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#21 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tlb.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/file.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#18 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#22 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_lookup.c#8 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#14 integrate .. //depot/projects/trustedbsd/base/tools/regression/README#6 integrate .. //depot/projects/trustedbsd/base/tools/regression/sysvmsg/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sysvmsg/README#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sysvmsg/msgtest.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sysvsem/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sysvsem/README#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sysvsem/semtest.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sysvshm/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sysvshm/README#1 branch .. //depot/projects/trustedbsd/base/tools/regression/sysvshm/shmtest.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/find/find.1#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/find/option.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/stat/stat.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/base/UPDATING#17 (text+ko) ==== @@ -22,6 +22,11 @@ integrity. Re-enabling write caching can substantially improve performance. +20020815: + A "bug" in gcc(1) that was hiding warning in system headers was + fixed. It's probably time to add -DNO_WERROR to your make line + again. + 20020729: COPY is being deprecated. The 20010530 change was reverted, as it causes far more pain than was expected, and to always compare @@ -1057,4 +1062,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.214 2002/07/29 08:51:03 ru Exp $ +$FreeBSD: src/UPDATING,v 1.215 2002/08/15 08:51:24 ru Exp $ ==== //depot/projects/trustedbsd/base/bin/test/test.c#11 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.50 2002/07/27 22:53:44 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.51 2002/08/15 14:53:20 maxim Exp $"); #include #include @@ -161,6 +161,7 @@ }; struct t_op const *t_wp_op; +int nargc; char **t_wp; static int aexpr(enum token); @@ -182,23 +183,8 @@ int main(int argc, char **argv) { - int i, res; + int res; char *p; - char **nargv; - - /* - * XXX copy the whole contents of argv to a newly allocated - * space with two extra cells filled with NULL's - this source - * code totally depends on their presence. - */ - if ((nargv = (char **)malloc((argc + 2) * sizeof(char *))) == NULL) - error("Out of space"); - - for (i = 0; i < argc; i++) - nargv[i] = argv[i]; - - nargv[i] = nargv[i + 1] = NULL; - argv = nargv; if ((p = rindex(argv[0], '/')) == NULL) p = argv[0]; @@ -210,15 +196,19 @@ argv[argc] = NULL; } + /* no expression => false */ + if (--argc <= 0) + return 1; + #ifndef SHELL (void)setlocale(LC_CTYPE, ""); #endif + nargc = argc; t_wp = &argv[1]; res = !oexpr(t_lex(*t_wp)); - if (*t_wp != NULL && *++t_wp != NULL) + if (--nargc > 0) syntax(*t_wp, "unexpected operator"); - free(nargv); return res; } @@ -239,9 +229,11 @@ int res; res = aexpr(n); - if (t_lex(*++t_wp) == BOR) - return oexpr(t_lex(*++t_wp)) || res; + if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) == BOR) + return oexpr(t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) || + res; t_wp--; + nargc++; return res; } @@ -251,9 +243,11 @@ int res; res = nexpr(n); - if (t_lex(*++t_wp) == BAND) - return aexpr(t_lex(*++t_wp)) && res; + if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) == BAND) + return aexpr(t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) && + res; t_wp--; + nargc++; return res; } @@ -261,7 +255,7 @@ nexpr(enum token n) { if (n == UNOT) - return !nexpr(t_lex(*++t_wp)); + return !nexpr(t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)); return primary(n); } @@ -274,30 +268,32 @@ if (n == EOI) return 0; /* missing expression */ if (n == LPAREN) { - if ((nn = t_lex(*++t_wp)) == RPAREN) + if ((nn = t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL)) == + RPAREN) return 0; /* missing expression */ res = oexpr(nn); - if (t_lex(*++t_wp) != RPAREN) + if (t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL) != RPAREN) syntax(NULL, "closing paren expected"); return res; } if (t_wp_op && t_wp_op->op_type == UNOP) { /* unary expression */ - if (*++t_wp == NULL) + if (--nargc == 0) syntax(t_wp_op->op_text, "argument expected"); switch (n) { case STREZ: - return strlen(*t_wp) == 0; + return strlen(*++t_wp) == 0; case STRNZ: - return strlen(*t_wp) != 0; + return strlen(*++t_wp) != 0; case FILTT: - return isatty(getn(*t_wp)); + return isatty(getn(*++t_wp)); default: - return filstat(*t_wp, n); + return filstat(*++t_wp, n); } } - if (t_lex(t_wp[1]), t_wp_op && t_wp_op->op_type == BINOP) { + if (t_lex(nargc > 0 ? t_wp[1] : NULL), t_wp_op && t_wp_op->op_type == + BINOP) { return binop(); } @@ -311,10 +307,10 @@ struct t_op const *op; opnd1 = *t_wp; - (void) t_lex(*++t_wp); + (void) t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL); op = t_wp_op; - if ((opnd2 = *++t_wp) == NULL) + if ((opnd2 = nargc > 0 ? (--nargc, *++t_wp) : NULL) == NULL) syntax(op->op_text, "argument expected"); switch (op->op_num) { @@ -415,7 +411,7 @@ while (op->op_text) { if (strcmp(s, op->op_text) == 0) { if ((op->op_type == UNOP && isoperand()) || - (op->op_num == LPAREN && *(t_wp+1) == 0)) + (op->op_num == LPAREN && nargc == 1)) break; t_wp_op = op; return op->op_num; @@ -433,10 +429,12 @@ char *s; char *t; - if ((s = *(t_wp+1)) == 0) + if (nargc == 1) return 1; - if ((t = *(t_wp+2)) == 0) + if (nargc == 2) return 0; + s = *(t_wp + 1); + t = *(t_wp + 2); while (op->op_text) { if (strcmp(s, op->op_text) == 0) return op->op_type == BINOP && ==== //depot/projects/trustedbsd/base/contrib/gcc/c-lex.c#6 (text+ko) ==== @@ -19,6 +19,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gcc/c-lex.c,v 1.2 2002/08/15 08:45:49 ru Exp $ */ + #include "config.h" #include "system.h" @@ -315,7 +317,11 @@ } update_header_times (new_map->to_file); +#ifndef FREEBSD_NATIVE in_system_header = new_map->sysp != 0; +#else /* FREEBSD_NATIVE */ + in_system_header = 0; +#endif /* FREEBSD_NATIVE */ input_filename = new_map->to_file; lineno = to_line; map = new_map; ==== //depot/projects/trustedbsd/base/etc/rc#15 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.316 2002/08/14 05:58:44 gordon Exp $ +# $FreeBSD: src/etc/rc,v 1.317 2002/08/15 03:24:47 gordon Exp $ # # System startup script run by init on autoboot @@ -165,7 +165,6 @@ chkdepend amd amd_enable rpcbind rpcbind_enable chkdepend amd amd_enable NFS nfs_client_enable chkdepend NFS nfs_server_enable rpcbind rpcbind_enable -chkdepend NFS nfs_server_enable rpcbind rpcbind_enable chkdepend NIS nis_server_enable rpcbind rpcbind_enable chkdepend NIS nis_client_enable rpcbind rpcbind_enable ==== //depot/projects/trustedbsd/base/etc/rc.network#13 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.network,v 1.135 2002/08/14 05:44:29 gordon Exp $ +# $FreeBSD: src/etc/rc.network,v 1.136 2002/08/15 03:29:19 gordon Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -694,7 +694,7 @@ fi ;; *) - case ${single_mountd_enable} in + case ${mountd_enable} in [Yy][Ee][Ss]) if [ -r /etc/exports ]; then echo -n ' mountd' ==== //depot/projects/trustedbsd/base/include/arpa/inet.h#6 (text+ko) ==== @@ -50,7 +50,7 @@ * * @(#)inet.h 8.1 (Berkeley) 6/2/93 * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $ - * $FreeBSD: src/include/arpa/inet.h,v 1.22 2002/04/10 10:51:53 mike Exp $ + * $FreeBSD: src/include/arpa/inet.h,v 1.23 2002/08/14 20:40:35 robert Exp $ */ #ifndef _ARPA_INET_H_ @@ -139,8 +139,9 @@ in_addr_t inet_addr(const char *); char *inet_ntoa(struct in_addr); -const char *inet_ntop(int, const void *, char *, socklen_t); -int inet_pton(int, const char *, void *); +const char *inet_ntop(int, const void *__restrict, char *__restrict, + socklen_t); +int inet_pton(int, const char *__restrict, void *__restrict); #if __BSD_VISIBLE int ascii2addr(int, const char *, void *); ==== //depot/projects/trustedbsd/base/include/inttypes.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/inttypes.h,v 1.4 2002/07/09 05:13:30 obrien Exp $ + * $FreeBSD: src/include/inttypes.h,v 1.5 2002/08/15 09:25:03 robert Exp $ */ #ifndef _INTTYPES_H_ @@ -48,9 +48,9 @@ intmax_t imaxabs(intmax_t) __pure2; imaxdiv_t imaxdiv(intmax_t, intmax_t) __pure2; +intmax_t strtoimax(const char *__restrict, char **__restrict, int); +uintmax_t strtoumax(const char *__restrict, char **__restrict, int); /* XXX: The following functions are missing the restrict type qualifier. */ -intmax_t strtoimax(const char *, char **, int); -uintmax_t strtoumax(const char *, char **, int); intmax_t wcstoimax(const wchar_t *, wchar_t **, int); uintmax_t wcstoumax(const wchar_t *, wchar_t **, int); __END_DECLS ==== //depot/projects/trustedbsd/base/include/search.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $ */ -/* $FreeBSD: src/include/search.h,v 1.4 2002/03/23 17:24:53 imp Exp $ */ +/* $FreeBSD: src/include/search.h,v 1.5 2002/08/14 21:16:41 robert Exp $ */ /* * Written by J.T. Conklin @@ -44,7 +44,8 @@ int hcreate(size_t); void hdestroy(void); ENTRY *hsearch(ENTRY, ACTION); -void *tdelete(const void *, void **, int (*)(const void *, const void *)); +void *tdelete(const void *__restrict, void **__restrict, + int (*)(const void *, const void *)); void *tfind(const void *, void **, int (*)(const void *, const void *)); void *tsearch(const void *, void **, int (*)(const void *, const void *)); void twalk(const void *, void (*)(const void *, VISIT, int)); ==== //depot/projects/trustedbsd/base/include/stdio.h#6 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.41 2002/07/15 19:38:45 wollman Exp $ + * $FreeBSD: src/include/stdio.h,v 1.44 2002/08/15 10:28:51 robert Exp $ */ #ifndef _STDIO_H_ @@ -221,7 +221,7 @@ int fgetpos(FILE *, fpos_t *); char *fgets(char *, int, FILE *); FILE *fopen(const char *, const char *); -int fprintf(FILE *, const char *, ...); +int fprintf(FILE *__restrict, const char *__restrict, ...); int fputc(int, FILE *); int fputs(const char *, FILE *); size_t fread(void *, size_t, size_t, FILE *); @@ -235,7 +235,7 @@ int getchar(void); char *gets(char *); void perror(const char *); -int printf(const char *, ...); +int printf(const char *__restrict, ...); int putc(int, FILE *); int putchar(int); int puts(const char *); @@ -243,21 +243,24 @@ int rename(const char *, const char *); void rewind(FILE *); int scanf(const char *, ...); -void setbuf(FILE *, char *); -int setvbuf(FILE *, char *, int, size_t); -int sprintf(char *, const char *, ...); +void setbuf(FILE *__restrict, char *__restrict); +int setvbuf(FILE *__restrict, char *__restrict, int, size_t); +int sprintf(char *__restrict, const char *__restrict, ...); int sscanf(const char *, const char *, ...); FILE *tmpfile(void); char *tmpnam(char *); int ungetc(int, FILE *); -int vfprintf(FILE *, const char *, _BSD_VA_LIST_); -int vprintf(const char *, _BSD_VA_LIST_); -int vsprintf(char *, const char *, _BSD_VA_LIST_); +int vfprintf(FILE *__restrict, const char *__restrict, + _BSD_VA_LIST_); +int vprintf(const char *__restrict, _BSD_VA_LIST_); +int vsprintf(char *__restrict, const char *__restrict, + _BSD_VA_LIST_); #if __ISO_C_VISIBLE >= 1999 -int snprintf(char *, size_t, const char *, ...) __printflike(3, 4); -int vsnprintf(char *, size_t, const char *, _BSD_VA_LIST_) - __printflike(3, 0); +int snprintf(char *__restrict, size_t, const char *__restrict, + ...) __printflike(3, 4); +int vsnprintf(char *__restrict, size_t, const char *__restrict, + _BSD_VA_LIST_) __printflike(3, 0); #endif /* ==== //depot/projects/trustedbsd/base/include/stdlib.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.37 2002/07/09 05:13:30 obrien Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.38 2002/08/15 09:25:03 robert Exp $ */ #ifndef _STDLIB_H_ @@ -114,10 +114,10 @@ int rand(void); void *realloc(void *, size_t); void srand(unsigned); -double strtod(const char *, char **); -long strtol(const char *, char **, int); +double strtod(const char *__restrict, char **__restrict); +long strtol(const char *__restrict, char **__restrict, int); unsigned long - strtoul(const char *, char **, int); + strtoul(const char *__restrict, char **__restrict, int); int system(const char *); int mblen(const char *, size_t); @@ -198,13 +198,13 @@ #ifdef __LONG_LONG_SUPPORTED /* LONGLONG */ long long - strtoll(const char *, char **, int); + strtoll(const char *__restrict, char **__restrict, int); #endif __int64_t strtoq(const char *, char **, int); #ifdef __LONG_LONG_SUPPORTED /* LONGLONG */ unsigned long long - strtoull(const char *, char **, int); + strtoull(const char *__restrict, char **__restrict, int); #endif __uint64_t strtouq(const char *, char **, int); ==== //depot/projects/trustedbsd/base/include/time.h#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.25 2002/06/27 20:18:45 wollman Exp $ + * $FreeBSD: src/include/time.h,v 1.27 2002/08/14 23:20:48 robert Exp $ */ #ifndef _TIME_H_ @@ -121,7 +121,8 @@ struct tm *gmtime(const time_t *); struct tm *localtime(const time_t *); time_t mktime(struct tm *); -size_t strftime(char *, size_t, const char *, const struct tm *); +size_t strftime(char *__restrict, size_t, const char *__restrict, + const struct tm *__restrict); time_t time(time_t *); #if __POSIX_VISIBLE @@ -143,7 +144,8 @@ #endif #if __XSI_VISIBLE -char *strptime(const char *, const char *, struct tm *); +char *strptime(const char *__restrict, const char *__restrict, + struct tm *__restrict); #endif #if __BSD_VISIBLE ==== //depot/projects/trustedbsd/base/lib/libc/i386/gen/makecontext.c#2 (text+ko) ==== @@ -25,13 +25,14 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/makecontext.c,v 1.1 2002/01/10 02:40:59 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/makecontext.c,v 1.2 2002/08/15 11:58:24 robert Exp $"); #include #include #include #include +#include #include #include ==== //depot/projects/trustedbsd/base/lib/libc/net/inet.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)inet.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.22 2001/12/01 03:43:01 mike Exp $ +.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.24 2002/08/15 20:33:44 robert Exp $ .\" .Dd June 17, 1996 .Dt INET 3 @@ -62,9 +62,14 @@ .Ft char * .Fn inet_ntoa "struct in_addr in" .Ft const char * -.Fn inet_ntop "int af" "const void *src" "char *dst" "socklen_t size" +.Fo inet_ntop +.Fa "int af" +.Fa "const void *restrict src" +.Fa "char *restrict dst" +.Fa "socklen_t size" +.Fc .Ft int -.Fn inet_pton "int af" "const char *src" "void *dst" +.Fn inet_pton "int af" "const char *restrict src" "void *restrict dst" .Ft struct in_addr .Fn inet_makeaddr "in_addr_t net" "in_addr_t lna" .Ft in_addr_t ==== //depot/projects/trustedbsd/base/lib/libc/net/inet_ntop.c#4 (text+ko) ==== @@ -18,7 +18,7 @@ static char rcsid[] = "$Id: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.9 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.10 2002/08/14 20:40:35 robert Exp $"); #include #include @@ -49,11 +49,8 @@ * Paul Vixie, 1996. */ const char * -inet_ntop(af, src, dst, size) - int af; - const void *src; - char *dst; - socklen_t size; +inet_ntop(int af, const void *__restrict src, char *__restrict dst, + socklen_t size) { switch (af) { case AF_INET: @@ -79,10 +76,7 @@ * Paul Vixie, 1996. */ static const char * -inet_ntop4(src, dst, size) - const u_char *src; - char *dst; - socklen_t size; +inet_ntop4(const u_char *src, char *dst, socklen_t size) { static const char fmt[] = "%u.%u.%u.%u"; char tmp[sizeof "255.255.255.255"]; @@ -102,10 +96,7 @@ * Paul Vixie, 1996. */ static const char * -inet_ntop6(src, dst, size) - const u_char *src; - char *dst; - socklen_t size; +inet_ntop6(const u_char *src, char *dst, socklen_t size) { /* * Note that int32_t and int16_t need only be "at least" large enough ==== //depot/projects/trustedbsd/base/lib/libc/net/inet_pton.c#4 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.9 2002/04/19 04:46:20 suz Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.10 2002/08/14 20:40:35 robert Exp $"); #include #include @@ -48,10 +48,7 @@ * Paul Vixie, 1996. */ int -inet_pton(af, src, dst) - int af; - const char *src; - void *dst; +inet_pton(int af, const char *__restrict src, void *__restrict dst) { switch (af) { case AF_INET: @@ -76,9 +73,7 @@ * Paul Vixie, 1996. */ static int -inet_pton4(src, dst) - const char *src; - u_char *dst; +inet_pton4(const char *src, u_char *dst) { static const char digits[] = "0123456789"; int saw_digit, octets, ch; @@ -130,9 +125,7 @@ * Paul Vixie, 1996. */ static int -inet_pton6(src, dst) - const char *src; - u_char *dst; +inet_pton6(const char *src, u_char *dst) { static const char xdigits_l[] = "0123456789abcdef", xdigits_u[] = "0123456789ABCDEF"; ==== //depot/projects/trustedbsd/base/lib/libc/stdio/fprintf.c#4 (text+ko) ==== @@ -38,13 +38,13 @@ static char sccsid[] = "@(#)fprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/fprintf.c,v 1.8 2002/05/28 16:59:39 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/fprintf.c,v 1.9 2002/08/15 09:47:10 robert Exp $"); #include #include int -fprintf(FILE *fp, const char *fmt, ...) +fprintf(FILE *__restrict fp, const char *__restrict fmt, ...) { int ret; va_list ap; ==== //depot/projects/trustedbsd/base/lib/libc/stdio/printf.3#9 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.44 2002/08/11 13:05:26 schweikh Exp $ +.\" $FreeBSD: src/lib/libc/stdio/printf.3,v 1.46 2002/08/15 10:28:51 robert Exp $ .\" .Dd November 8, 2001 .Dt PRINTF 3 @@ -48,24 +48,24 @@ .Sh SYNOPSIS .In stdio.h .Ft int -.Fn printf "const char *format" ... +.Fn printf "const char *restrict format" ... .Ft int -.Fn fprintf "FILE *stream" "const char *format" ... +.Fn fprintf "FILE *restrict stream" "const char *restrict format" ... .Ft int -.Fn sprintf "char *str" "const char *format" ... +.Fn sprintf "char *restrict str" "const char *restrict format" ... .Ft int -.Fn snprintf "char *str" "size_t size" "const char *format" ... +.Fn snprintf "char *restrict str" "size_t size" "const char *restrict format" ... .Ft int .Fn asprintf "char **ret" "const char *format" ... .In stdarg.h .Ft int -.Fn vprintf "const char *format" "va_list ap" +.Fn vprintf "const char *restrict format" "va_list ap" .Ft int -.Fn vfprintf "FILE *stream" "const char *format" "va_list ap" +.Fn vfprintf "FILE *restrict stream" "const char *restrict format" "va_list ap" .Ft int -.Fn vsprintf "char *str" "const char *format" "va_list ap" +.Fn vsprintf "char *restrict str" "const char *restrict format" "va_list ap" .Ft int -.Fn vsnprintf "char *str" "size_t size" "const char *format" "va_list ap" +.Fn vsnprintf "char *restrict str" "size_t size" "const char *restrict format" "va_list ap" .Ft int .Fn vasprintf "char **ret" "const char *format" "va_list ap" .Sh DESCRIPTION ==== //depot/projects/trustedbsd/base/lib/libc/stdio/printf.c#4 (text+ko) ==== @@ -38,13 +38,13 @@ static char sccsid[] = "@(#)printf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/printf.c,v 1.8 2002/05/28 16:59:39 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/printf.c,v 1.9 2002/08/15 09:47:10 robert Exp $"); #include #include int -printf(char const *fmt, ...) +printf(char const *__restrict fmt, ...) { int ret; va_list ap; ==== //depot/projects/trustedbsd/base/lib/libc/stdio/setbuf.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)setbuf.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.10 2001/10/01 16:08:59 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdio/setbuf.3,v 1.11 2002/08/14 23:45:42 robert Exp $ .\" .Dd June 4, 1993 .Dt SETBUF 3 @@ -50,13 +50,13 @@ .Sh SYNOPSIS .In stdio.h .Ft void -.Fn setbuf "FILE *stream" "char *buf" +.Fn setbuf "FILE *restrict stream" "char *restrict buf" .Ft void .Fn setbuffer "FILE *stream" "char *buf" "int size" .Ft int .Fn setlinebuf "FILE *stream" .Ft int -.Fn setvbuf "FILE *stream" "char *buf" "int mode" "size_t size" +.Fn setvbuf "FILE *restrict stream" "char *restrict buf" "int mode" "size_t size" .Sh DESCRIPTION The three types of buffering available are unbuffered, block buffered, and line buffered. ==== //depot/projects/trustedbsd/base/lib/libc/stdio/setbuf.c#3 (text+ko) ==== @@ -38,15 +38,13 @@ static char sccsid[] = "@(#)setbuf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuf.c,v 1.2 2002/03/22 21:53:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuf.c,v 1.3 2002/08/14 23:45:42 robert Exp $"); #include #include "local.h" void -setbuf(fp, buf) - FILE *fp; - char *buf; +setbuf(FILE *__restrict fp, char *__restrict buf) { (void) setvbuf(fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ); } ==== //depot/projects/trustedbsd/base/lib/libc/stdio/setvbuf.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)setvbuf.c 8.2 (Berkeley) 11/16/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/setvbuf.c,v 1.11 2002/03/22 21:53:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/setvbuf.c,v 1.12 2002/08/14 23:45:42 robert Exp $"); #include "namespace.h" #include @@ -52,11 +52,7 @@ * a buffer. */ int -setvbuf(fp, buf, mode, size) - FILE *fp; - char *buf; - int mode; - size_t size; +setvbuf(FILE *__restrict fp, char *__restrict buf, int mode, size_t size) { int ret, flags; size_t iosize; ==== //depot/projects/trustedbsd/base/lib/libc/stdio/snprintf.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)snprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.18 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.19 2002/08/15 09:47:10 robert Exp $"); #include #include @@ -47,7 +47,7 @@ #include "local.h" int -snprintf(char *str, size_t n, char const *fmt, ...) +snprintf(char *__restrict str, size_t n, char const *__restrict fmt, ...) { size_t on; int ret; ==== //depot/projects/trustedbsd/base/lib/libc/stdio/sprintf.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)sprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.12 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.13 2002/08/15 09:47:10 robert Exp $"); #include #include @@ -46,7 +46,7 @@ #include "local.h" int -sprintf(char *str, char const *fmt, ...) +sprintf(char *__restrict str, char const *__restrict fmt, ...) { int ret; va_list ap; ==== //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#9 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.42 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.43 2002/08/15 10:28:52 robert Exp $"); /* * Actual printf innards. @@ -332,7 +332,8 @@ * MT-safe version */ int -vfprintf(FILE *fp, const char *fmt0, va_list ap) +vfprintf(FILE *__restrict fp, const char *__restrict fmt0, va_list ap) + >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 5:56:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B89E37B401; Fri, 16 Aug 2002 05:56:39 -0700 (PDT) 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 BD30037B400 for ; Fri, 16 Aug 2002 05:56:38 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F22D43E72 for ; Fri, 16 Aug 2002 05:56:38 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GCucJU083697 for ; Fri, 16 Aug 2002 05:56:38 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GCucub083694 for perforce@freebsd.org; Fri, 16 Aug 2002 05:56:38 -0700 (PDT) Date: Fri, 16 Aug 2002 05:56:38 -0700 (PDT) Message-Id: <200208161256.g7GCucub083694@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 16103 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16103 Change 16103 by cvance@cvance_laptop on 2002/08/16 05:56:11 Install include files for kernel portion of sebsd. Affected files ... .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#11 edit .. //depot/projects/trustedbsd/mac/include/Makefile#15 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#11 (text+ko) ==== @@ -132,6 +132,8 @@ .. mac_mls .. + sebsd + .. .. sys .. ==== //depot/projects/trustedbsd/mac/include/Makefile#15 (text+ko) ==== @@ -41,7 +41,7 @@ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ security/lomac security/mac_biba security/mac_bsdextended \ - security/mac_mls ufs/ffs ufs/ufs + security/mac_mls security/sebsd ufs/ffs ufs/ufs # For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/* # are taken care of To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 6:15: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEF0937B401; Fri, 16 Aug 2002 06:15:02 -0700 (PDT) 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 2BAEC37B400 for ; Fri, 16 Aug 2002 06:15:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CBD8643E6A for ; Fri, 16 Aug 2002 06:15:01 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GDF1JU095561 for ; Fri, 16 Aug 2002 06:15:01 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GDF1oo095558 for perforce@freebsd.org; Fri, 16 Aug 2002 06:15:01 -0700 (PDT) Date: Fri, 16 Aug 2002 06:15:01 -0700 (PDT) Message-Id: <200208161315.g7GDF1oo095558@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 16105 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16105 Change 16105 by cvance@cvance_laptop on 2002/08/16 06:14:45 Pass thread to MAC system call handlers. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#117 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#117 (text+ko) ==== @@ -65,7 +65,7 @@ /* * Generic policy-directed security syscall */ - int (*mpo_mac_syscall)(int call, void *arg); + int (*mpo_mac_syscall)(struct thread *td, int call, void *arg); /* * Label operations. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 6:17: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6680637B401; Fri, 16 Aug 2002 06:17:05 -0700 (PDT) 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 024E637B400 for ; Fri, 16 Aug 2002 06:17:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B831943E6E for ; Fri, 16 Aug 2002 06:17:04 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GDH4JU095708 for ; Fri, 16 Aug 2002 06:17:04 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GDH4xX095705 for perforce@freebsd.org; Fri, 16 Aug 2002 06:17:04 -0700 (PDT) Date: Fri, 16 Aug 2002 06:17:04 -0700 (PDT) Message-Id: <200208161317.g7GDH4xX095705@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 16106 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16106 Change 16106 by cvance@cvance_laptop on 2002/08/16 06:16:17 Oops, after resolving I missed this one: Also pass thread to MAC syscall handlers. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#246 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#246 (text+ko) ==== @@ -3259,8 +3259,9 @@ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { if (strcmp(mpc->mpc_name, target) == 0 && mpc->mpc_ops->mpo_mac_syscall) { - error = mpc->mpc_ops->mpo_mac_syscall(SCARG(uap, call), - SCARG(uap, arg)); + error = mpc->mpc_ops->mpo_mac_syscall(td, + SCARG(uap, call), + SCARG(uap, arg)); goto out; } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 6:23:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 399D837B401; Fri, 16 Aug 2002 06:23:13 -0700 (PDT) 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 E074C37B400 for ; Fri, 16 Aug 2002 06:23:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A130643E72 for ; Fri, 16 Aug 2002 06:23:12 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GDNCJU096360 for ; Fri, 16 Aug 2002 06:23:12 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GDNCUH096357 for perforce@freebsd.org; Fri, 16 Aug 2002 06:23:12 -0700 (PDT) Date: Fri, 16 Aug 2002 06:23:12 -0700 (PDT) Message-Id: <200208161323.g7GDNCUH096357@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 16107 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16107 Change 16107 by cvance@cvance_laptop on 2002/08/16 06:22:36 Add very basic library for SEBSD, mostly placeholders for now. Implements sebsd_enforcing(), sebsd_avc_toggle(), and sebsd_enabled() Affected files ... .. //depot/projects/trustedbsd/mac/lib/Makefile#9 edit .. //depot/projects/trustedbsd/mac/lib/libsebsd/Makefile#1 add .. //depot/projects/trustedbsd/mac/lib/libsebsd/sebsd.h#1 add .. //depot/projects/trustedbsd/mac/lib/libsebsd/sebsd_context.h#1 add .. //depot/projects/trustedbsd/mac/lib/libsebsd/sebsd_fs.h#1 add .. //depot/projects/trustedbsd/mac/lib/libsebsd/sebsd_proc.h#1 add .. //depot/projects/trustedbsd/mac/lib/libsebsd/sebsd_ss.h#1 add .. //depot/projects/trustedbsd/mac/lib/libsebsd/system.c#1 add Differences ... ==== //depot/projects/trustedbsd/mac/lib/Makefile#9 (text+ko) ==== @@ -27,7 +27,7 @@ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libfetch libform libftpio ${_libio} libipsec \ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ - libnetgraph libopie libpam libpanel libpcap \ + libnetgraph libopie libpam libpanel libpcap libsebsd \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ libwrap libxpg4 liby libz To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 6:38:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7487937B401; Fri, 16 Aug 2002 06:37:31 -0700 (PDT) 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 0CBAC37B400 for ; Fri, 16 Aug 2002 06:37:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EF3543E6E for ; Fri, 16 Aug 2002 06:37:30 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GDbUJU097700 for ; Fri, 16 Aug 2002 06:37:30 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GDbU4G097682 for perforce@freebsd.org; Fri, 16 Aug 2002 06:37:30 -0700 (PDT) Date: Fri, 16 Aug 2002 06:37:30 -0700 (PDT) Message-Id: <200208161337.g7GDbU4G097682@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 16108 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16108 Change 16108 by cvance@cvance_laptop on 2002/08/16 06:36:36 Updates to SEBSD module: * Add sebsd_syscall.c to Makefile * Add sebsd_syscall MAC syscall handler * Move flask.h up a level and fix references * Implement avc_toggle() and avc_enforcing system calls * Rework entire execute/transition code, now checks creds at check_exec_vnode(), make correct decision in will_transition(), and only perform the transition in execve_transition(). Assumes entire exec process is "atomic" so permission checks may be performed first phase, and still remain valid when the actual re-label is done. * Add signal permission checks * Cleanup dead code and unused debug statements * Fix extended attribute handling (again) to do the right thing when an attribute isn't located (now uses SECINITSID_UNLABELED) * Add stubs for vnode operations (tagged "TBD: Not Implemented") * Reoganized sysctl handlers and removed/converted to syscall security.mac.sebsd.debug * That's it (I think) Affected files ... .. //depot/projects/trustedbsd/mac/sys/modules/sebsd/Makefile#2 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#4 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#6 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc_ss.h#3 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/flask.h#2 delete .. //depot/projects/trustedbsd/mac/sys/security/sebsd/flask.h#3 branch .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#22 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#6 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_syscall.c#1 add .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_sysctl.c#3 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#4 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/security.h#4 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#6 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/symtab.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/modules/sebsd/Makefile#2 (text+ko) ==== @@ -6,6 +6,7 @@ SRCS= vnode_if.h \ opt_mac.h \ sebsd.c \ + sebsd_syscall.c \ sebsd_sysctl.c \ avc.c \ avtab.c \ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.c#4 (text+ko) ==== @@ -807,3 +807,59 @@ return avc_control(AVC_CALLBACK_AUDITDENY_DISABLE, ssid, tsid, tclass, perms, seqno, 0); } + +int +sys_avc_toggle(struct thread *td) +{ + extern int ss_initialized; + int error; + + /* + * TBD: enforce this: + */ + error = thread_has_system(curthread, SYSTEM__AVC_TOGGLE); + if (error) + return error; + + avc_debug_always_allow = !avc_debug_always_allow; + if (!avc_debug_always_allow) { + avc_ss_reset(avc_cache.latest_notif); + if (!ss_initialized) { + error = security_init(); + if (error) + panic("SELinux: Could not initialize\n"); + } + } + td->td_retval[0] = avc_debug_always_allow; + + return (0); +} + +int +sys_avc_enforcing(struct thread *td) +{ + td->td_retval[0] = !avc_debug_always_allow; + return 0; +} + + +#ifdef CONFIG_SECURITY_SELINUX_DEVELOP +/* + * TBD: should have build-time non development mode that does not permit + * toggling debug mode. + */ +int +sys_avc_toggle(struct thread *td) +{ + td->td_retval[0] = 0; + return (0); +} + +int +sys_avc_enforcing(struct thread *td) +{ + td->td_retval[0] = 1; + return (0); +} + +#endif /* CONFIG_SECURITY_SELINUX_DEVELOP */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#6 (text+ko) ==== @@ -15,7 +15,7 @@ #ifdef __FreeBSD__ -#include +#include #include #include #include @@ -342,5 +342,8 @@ #define AVC_CALLBACK_AUDITDENY_ENABLE 64 #define AVC_CALLBACK_AUDITDENY_DISABLE 128 +extern int sys_avc_toggle(struct thread *td); +extern int sys_avc_enforcing(struct thread *td); + #endif /* _LINUX_AVC_H_ */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc_ss.h#3 (text+ko) ==== @@ -14,7 +14,7 @@ */ #ifdef __FreeBSD__ -#include +#include #else /* __FreeBSD__ */ #include #endif /* __FreeBSD__ */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#22 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include -#include #include #include @@ -80,6 +79,42 @@ printf("sebsd:: destroy\n"); } +static int +cred_has_perm(struct ucred *cred, struct proc *proc, access_vector_t perm) +{ + struct task_security_struct *task, *target; + + task = SLOT(&cred->cr_label); + target = SLOT(&proc->p_ucred->cr_label); + + return avc_has_perm_ref(task->sid, target->sid, SECCLASS_PROCESS, + perm, &target->avcr); +} + +static int +thread_has_perm(struct thread *td, struct proc *proc, access_vector_t perm) +{ + return (cred_has_perm(td->td_proc->p_ucred, proc, perm)); +} + +static int +cred_has_system(struct ucred *cred, access_vector_t perm) +{ + struct task_security_struct *task; + + task = SLOT(&cred->cr_label); + + return avc_has_perm(task->sid, SECINITSID_KERNEL, + SECCLASS_SYSTEM, perm); +} + +int +thread_has_system(struct thread *td, access_vector_t perm) +{ + return (cred_has_system(td->td_proc->p_ucred, perm)); +} + + static void sebsd_init_cred(struct ucred *ucred, struct label *label) { @@ -154,70 +189,52 @@ } static int -sebsd_compute_transition(struct ucred *cred, struct vnode *vp, - struct label *label, security_id_t *newsid) +sebsd_check_proc_signal(struct ucred *cred, struct proc *proc, int signum) { - struct task_security_struct *task; - struct vnode_security_struct *file; - int rc; + access_vector_t perm; - task = SLOT(&cred->cr_label); - file = SLOT(label); - rc = security_transition_sid(task->sid, file->sid, SECCLASS_PROCESS, - newsid); - if (rc) - return EACCES; - - if (sebsd_verbose > 0) { - u_int32_t scontext_len; - security_context_t scontext; - (void)security_sid_to_context(task->sid, &scontext, &scontext_len); - printf("exec_vnode:: tsid (%d) = %s", task->sid, scontext); - security_free_context(scontext); - (void)security_sid_to_context(file->sid, &scontext, &scontext_len); - printf(" fsid (%d) = %s", file->sid, scontext); - security_free_context(scontext); - (void)security_sid_to_context(*newsid, &scontext, &scontext_len); - printf(" newsid (%d) = %s\n", *newsid, scontext); - security_free_context(scontext); + switch (signum) { + case SIGCHLD: + perm = PROCESS__SIGCHLD; + break; + case SIGKILL: + perm = PROCESS__SIGKILL; + break; + case SIGSTOP: + perm = PROCESS__SIGSTOP; + break; + default: + perm = PROCESS__SIGNAL; + break; } - return (*newsid != task->sid); -#ifdef notdef - /* TBD, auditing not really working yet */ - if (newsid == task->sid) { - rc = avc_has_perm(task->sid, file->sid, - SECCLASS_FILE, FILE__EXECUTE_NO_TRANS); - if (rc) - return EACCES; - } else { - /* Check permissions for the transition. */ - rc = avc_has_perm(task->sid, newsid, SECCLASS_PROCESS, - PROCESS__TRANSITION); - if (rc) - return EACCES; + return cred_has_perm(cred, proc, perm); +} - rc = avc_has_perm(newsid, file->sid, - SECCLASS_FILE, FILE__ENTRYPOINT); -/* &file->avcr, &ad); */ - if (rc) - return EACCES; +static void +sebsd_execve_transition(struct ucred *old, struct ucred *new, + struct vnode *vp, struct mac *vnodelabel) +{ + struct task_security_struct *otask, *ntask; + struct vnode_security_struct *file; + int rc; - /* - * TBD: Check ptrace permission between the parent and - * the new SID for this process if this process is - * being traced. - */ + otask = SLOT(&old->cr_label); + ntask = SLOT(&new->cr_label); + file = SLOT(&vp->v_label); - /* - * TBD: Check share permission between the old and new - * SIDs of the process if the process will share - * state. - */ - } + /* + * Should have already checked all the permissions + * Should have no races with file/process labels + * So just make the transition. + */ + ntask->osid = otask->sid; + rc = security_transition_sid(otask->sid, file->sid, SECCLASS_PROCESS, + &ntask->sid); + if (rc) + return; /* TBD: what happens if the previous call failed? */ - task->osid = task->sid; - if (task->sid != newsid) { + if (otask->sid != ntask->sid) { /* * TBD: Need to flush any open files that are now * unauthorized. Likewise, SELinux forced a wait @@ -225,37 +242,31 @@ */ } - task->sid = newsid; -#endif /* notdef */ - return (0); + return; } -static void -sebsd_execve_transition(struct ucred *old, struct ucred *new, - struct vnode *vp, struct mac *vnodelabel) +static int +sebsd_execve_will_transition(struct ucred *old, struct vnode *vp, + struct mac *vnodelabel) { struct task_security_struct *task; + struct vnode_security_struct *file; security_id_t newsid; + int rc; - sebsd_compute_transition(old, vp, &vp->v_label, &newsid); - task = SLOT(&new->cr_label); - task->osid = task->sid; - task->sid = newsid; -} + task = SLOT(&old->cr_label); + file = SLOT(&vp->v_label); -static int -sebsd_execve_will_transition(struct ucred *old, struct vnode *vp, - struct mac *vnodelabel) -{ - security_id_t newsid; - return sebsd_compute_transition(old, vp, &vp->v_label, &newsid); -} + /* + * Should have already checked all the permissions, so just see if + * the SIDS are going to match. + */ + rc = security_transition_sid(task->sid, file->sid, SECCLASS_PROCESS, + &newsid); + if (rc) + return EACCES; -static int -sebsd_check_exec_vnode(struct ucred *cred, struct vnode *vp, - struct label *label) -{ - return 0; + return (newsid != task->sid); } static void @@ -283,8 +294,8 @@ static void sebsd_create_vnode(struct ucred *cred, struct vnode *parent, - struct label *parentlabel, struct vnode *child, - struct label *childlabel) + struct label *parentlabel, struct vnode *child, + struct label *childlabel) { struct vnode_security_struct *dir, *vsec; struct task_security_struct *task; @@ -326,6 +337,32 @@ } +static int +sebsd_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, + struct label *label) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, + struct label *label, int samedir) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_relabel(struct ucred *cred, struct vnode *vp, + struct label *oldlabel, struct label *newlabel) +{ + /* TBD: Not Implemented */ + return 0; +} + static void sebsd_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label) @@ -339,7 +376,6 @@ dest = SLOT(vnodelabel); if (!source) { -/* Debugger("sebsd_relabel_vnode:: source is NULL!\n"); */ printf("sebsd_relabel_vnode:: source is NULL!\n"); return; } @@ -375,18 +411,15 @@ } static int -sebsd_check_create_vnode(struct ucred *cred, struct vnode *dvp, +sebsd_check_vnode_create(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vattr *vap) { + /* TBD: Not Implemented */ struct vnode_security_struct *file, *dir; file = SLOT(&cred->cr_label); dir = SLOT(dlabel); -/* - printf("check_create_vnode:: file=%d, dir=%d\n", file->sid, - dir->sid); -*/ return 0; } @@ -400,51 +433,208 @@ u_int32_t context_len; int error; - /* - * XXX: this check is probably redundant, since we'll only get - * called here for multilabel file systems. - */ - if ((mp->mnt_flag & MNT_MULTILABEL) == 0) { - return (EOPNOTSUPP); - } + vsec = SLOT(vnodelabel); context_len = 128; /* TBD: bad fixed length */ error = vn_extattr_get(vp, IO_NODELOCKED, SEBSD_MAC_EXTATTR_NAMESPACE, SEBSD_MAC_EXTATTR_NAME, &context_len, context, curthread); - if (error) - return (error); + if (error == ENOATTR) { + vsec->sid = SECINITSID_UNLABELED; /* Use the default label */ + struct vattr va; + + VOP_GETATTR(vp, &va, curthread->td_ucred, curthread); + printf("sebsd_update_vnode_from_extattr: no label for inode=%d, fsid=%d\n", va.va_fileid, va.va_fsid); + + return (0); + } + if (error) { + return (error); /* Fail closed */ + } if (sebsd_verbose > 1) { - char *fullpath = "unknown"; - char *freepath = NULL; struct vattr va; - /* - * XXX Releasing the vnode lock here is a very bad idea. - */ VOP_GETATTR(vp, &va, curthread->td_ucred, curthread); - VOP_UNLOCK(vp, 0, curthread); - vn_fullpath(curthread, vp->v_dd, vp, &fullpath, &freepath); - printf("sebsd_vnode_from_extattr: len=%d: context=%s file=%s inode=%d, fsid=%d\n", context_len, context, fullpath, va.va_fileid, va.va_fsid); - if (freepath) - free(freepath, M_TEMP); - vn_lock(vp, LK_EXCLUSIVE, curthread); + printf("sebsd_vnode_from_extattr: len=%d: context=%s inode=%d, fsid=%d\n", context_len, context, va.va_fileid, va.va_fsid); } - vsec = SLOT(vnodelabel); error = security_context_to_sid(context, context_len, &vsec->sid); if (error) { printf("sebsd_update_vnode_from_extattr: ERROR mapping context to sid: %s\n", context); + return (0); /* TBD bad, bad, bad */ } -/* printf("sebsd_update_vnode_from_extattr got sid %d, label size=%d: %s\n", vsec->sid, context_len, context); */ + return (0); +} + +static int +sebsd_check_vnode_exec(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct task_security_struct *task; + struct vnode_security_struct *file; + security_id_t newsid; + int rc; + + task = SLOT(&cred->cr_label); + file = SLOT(label); + rc = security_transition_sid(task->sid, file->sid, SECCLASS_PROCESS, + &newsid); + if (rc) + return EACCES; + + if (newsid == task->sid) { + rc = avc_has_perm(task->sid, file->sid, + SECCLASS_FILE, FILE__EXECUTE_NO_TRANS); + if (rc) + return EACCES; + } else { + /* Check permissions for the transition. */ + rc = avc_has_perm(task->sid, newsid, SECCLASS_PROCESS, + PROCESS__TRANSITION); + if (rc) + return EACCES; + + rc = avc_has_perm(newsid, file->sid, + SECCLASS_FILE, FILE__ENTRYPOINT); + if (rc) + return EACCES; + + /* + * TBD: Check ptrace permission between the parent and + * the new SID for this process if this process is + * being traced. + */ + + /* + * TBD: Check share permission between the old and new + * SIDs of the process if the process will share + * state. + */ + } return (0); } static int +sebsd_check_vnode_getacl(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, + struct label *label, int attrnamespace, + const char *name, struct uio *uio) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_revoke(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_setacl(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type, struct acl *acl) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_setextattr(struct ucred *cred, struct vnode *vp, + struct label *label, int attrnamespace, + const char *name, struct uio *uio) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_setflags(struct ucred *cred, struct vnode *vp, + struct label *label, u_long flags) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_setmode(struct ucred *cred, struct vnode *vp, + struct label *label, mode_t mode) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_setowner(struct ucred *cred, struct vnode *vp, + struct label *label, uid_t uid, gid_t gid) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_setutimes(struct ucred *cred, struct vnode *vp, + struct label *label, struct timespec atime, + struct timespec mtime) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_stat(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_delete(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, + struct label *label) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_open(struct ucred *cred, struct vnode *vp, + struct label *filelabel, mode_t acc_mode) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int sebsd_externalize(struct label *label, struct mac *extmac) { /* TBD: this assumes vnodes only and only stores '5' */ @@ -493,7 +683,7 @@ */ static void sebsd_create_root_mount(struct ucred *cred, struct mount *mp, - struct mount *mntlabel, struct mount *fslabel) + struct mount *mntlabel, struct mount *fslabel) { avc_init(); if (security_init()) { @@ -507,12 +697,15 @@ { MAC_DESTROY, (macop_t)sebsd_destroy }, + { MAC_SYSCALL, + (macop_t)sebsd_syscall }, + /* Process operations */ { MAC_INIT_CRED, (macop_t)sebsd_init_cred }, { MAC_CREATE_CRED, (macop_t)sebsd_create_cred }, - { MAC_CHECK_CRED_RELABEL, + { MAC_CHECK_CRED_RELABEL, (macop_t)sebsd_check_cred_relabel }, { MAC_RELABEL_CRED, (macop_t)sebsd_relabel_cred }, @@ -523,6 +716,9 @@ (macop_t)sebsd_create_proc0 }, { MAC_CREATE_PROC1, (macop_t)sebsd_create_proc1 }, + { MAC_CHECK_PROC_SIGNAL, + (macop_t)sebsd_check_proc_signal }, + /* file operations */ { MAC_INIT_VNODE, @@ -536,10 +732,44 @@ { MAC_RELABEL_VNODE, (macop_t)sebsd_relabel_vnode }, { MAC_CHECK_VNODE_EXEC, - (macop_t)sebsd_check_exec_vnode }, + (macop_t)sebsd_check_vnode_exec }, { MAC_CHECK_VNODE_CREATE, - (macop_t)sebsd_check_create_vnode }, + (macop_t)sebsd_check_vnode_create }, + { MAC_CHECK_VNODE_STAT, + (macop_t)sebsd_check_vnode_stat }, + { MAC_CHECK_VNODE_CHDIR, + (macop_t)sebsd_check_vnode_chdir }, + { MAC_CHECK_VNODE_DELETE, + (macop_t)sebsd_check_vnode_delete }, + { MAC_CHECK_VNODE_DELETEACL, + (macop_t)sebsd_check_vnode_deleteacl }, + { MAC_CHECK_VNODE_GETACL, + (macop_t)sebsd_check_vnode_getacl }, + { MAC_CHECK_VNODE_GETEXTATTR, + (macop_t)sebsd_check_vnode_getextattr }, + { MAC_CHECK_VNODE_OPEN, + (macop_t)sebsd_check_vnode_open }, + { MAC_CHECK_VNODE_RENAME_FROM, + (macop_t)sebsd_check_vnode_rename_from }, + { MAC_CHECK_VNODE_RENAME_TO, + (macop_t)sebsd_check_vnode_rename_to }, + { MAC_CHECK_VNODE_REVOKE, + (macop_t)sebsd_check_vnode_revoke }, + { MAC_CHECK_VNODE_SETACL, + (macop_t)sebsd_check_vnode_setacl }, + { MAC_CHECK_VNODE_SETEXTATTR, + (macop_t)sebsd_check_vnode_setextattr }, + { MAC_CHECK_VNODE_SETFLAGS, + (macop_t)sebsd_check_vnode_setflags }, + { MAC_CHECK_VNODE_SETMODE, + (macop_t)sebsd_check_vnode_setmode }, + { MAC_CHECK_VNODE_SETOWNER, + (macop_t)sebsd_check_vnode_setowner }, + { MAC_CHECK_VNODE_SETUTIMES, + (macop_t)sebsd_check_vnode_setutimes }, + { MAC_CHECK_VNODE_RELABEL, + (macop_t)sebsd_check_vnode_relabel }, { MAC_EXECVE_TRANSITION, (macop_t)sebsd_execve_transition }, ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#6 (text+ko) ==== @@ -37,17 +37,21 @@ #ifndef _SYS_SECURITY_SEBSD_H #define _SYS_SECURITY_SEBSD_H +#include + +#define SELINUX_MAGIC 0xf97cff8c +#define SEBSD_MAC_EXTATTR_NAME "sebsd" +#define SEBSD_MAC_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM + #ifdef _KERNEL MALLOC_DECLARE(M_SEBSD); -#endif /* _KERNEL */ extern int avc_debug_always_allow; -extern int security_init(void); extern int sebsd_verbose; -#define SELINUX_MAGIC 0xf97cff8c - -#define SEBSD_MAC_EXTATTR_NAME "sebsd" -#define SEBSD_MAC_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM +extern int security_init(void); +extern int sebsd_syscall(struct thread *td, int call, void *args); +extern int thread_has_system(struct thread *td, access_vector_t perm); +#endif /* _KERNEL */ #endif /* _SYS_SECURITY_SEBSD_H */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_sysctl.c#3 (text+ko) ==== @@ -46,37 +46,9 @@ #include #include -static int sysctl_list_sids(SYSCTL_HANDLER_ARGS); - -SYSCTL_DECL(_security_mac); -SYSCTL_NODE(_security_mac, OID_AUTO, sebsd, CTLFLAG_RW, 0, - "Security Enhanced BSD policy controls"); - -/* -int sebsd_enabled = 1; -SYSCTL_INT(_security_mac_sebsd, OID_AUTO, enabled, CTLFLAG_RW, - &sebsd_enabled, 0, "Enable Security Enhanced BSD"); -TUNABLE_INT("security.mac.sebsd.enabled", &sebsd_enabled); -*/ - -SYSCTL_INT(_security_mac_sebsd, OID_AUTO, debug, CTLFLAG_RW, - &avc_debug_always_allow, 0, "Debug Security Enhanced BSD policy"); -TUNABLE_INT("security.mac.sebsd.debug", &avc_debug_always_allow); - -SYSCTL_INT(_security_mac_sebsd, OID_AUTO, verbose, CTLFLAG_RW, - &sebsd_verbose, 0, " SEBSD Verbose Debug Stuff"); -TUNABLE_INT("security.mac.sebsd.verbose", &sebsd_verbose); - -SYSCTL_OID(_security_mac_sebsd, OID_AUTO, sids, CTLTYPE_STRING|CTLFLAG_RD, - NULL, 0, sysctl_list_sids, "A", "SEBSD SIDs"); - - /* * Sysctl handler for security.mac.sebsd.sids - * - * Lists the SIDs active in the security server - * - * based on sysctl for vm.zone + * Lists the SIDs currently active in the security server */ static int sysctl_list_sids(SYSCTL_HANDLER_ARGS) @@ -115,3 +87,23 @@ FREE(buffer, M_TEMP); return (error); } + +SYSCTL_DECL(_security_mac); +SYSCTL_NODE(_security_mac, OID_AUTO, sebsd, CTLFLAG_RW, 0, + "Security Enhanced BSD policy controls"); + +#ifdef now_a_syscall +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, debug, CTLTYPE_INT|CTLFLAG_RW, + 0, 0, sysctl_sebsd_debug, "I", + "Debug Security Enhanced BSD policy"); +TUNABLE_INT("security.mac.sebsd.debug", &avc_debug_always_allow); +#endif + +SYSCTL_INT(_security_mac_sebsd, OID_AUTO, verbose, CTLFLAG_RW, + &sebsd_verbose, 0, " SEBSD Verbose Debug Stuff"); +TUNABLE_INT("security.mac.sebsd.verbose", &sebsd_verbose); + +SYSCTL_OID(_security_mac_sebsd, OID_AUTO, sids, CTLTYPE_STRING|CTLFLAG_RD, + NULL, 0, sysctl_list_sids, "A", "SEBSD SIDs"); + + ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/security.h#4 (text+ko) ==== @@ -17,7 +17,7 @@ */ #ifdef __FreeBSD__ -#include +#include #else /* __FreeBSD__ */ #include #endif /* __FreeBSD__ */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#6 (text+ko) ==== @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/symtab.c#4 (text+ko) ==== @@ -14,7 +14,7 @@ #endif /* FreeBSD _KERNEL */ #include -#include +#include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 6:39:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE58737B401; Fri, 16 Aug 2002 06:38:33 -0700 (PDT) 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 4D42737B400 for ; Fri, 16 Aug 2002 06:38:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FA7E43E81 for ; Fri, 16 Aug 2002 06:38:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GDcWJU097823 for ; Fri, 16 Aug 2002 06:38:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GDcV3l097820 for perforce@freebsd.org; Fri, 16 Aug 2002 06:38:31 -0700 (PDT) Date: Fri, 16 Aug 2002 06:38:31 -0700 (PDT) Message-Id: <200208161338.g7GDcV3l097820@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16109 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16109 Change 16109 by rwatson@rwatson_tislabs on 2002/08/16 06:37:53 IFC from the FreeBSD main tree to TrustedBSD base: in particular, merge the fo_stat()/fo_poll() changes back to our branches. Affected files ... .. //depot/projects/trustedbsd/base/bin/cp/cp.1#4 integrate .. //depot/projects/trustedbsd/base/include/stdbool.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/inet_ntop.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_cap.h#4 integrate .. //depot/projects/trustedbsd/base/libexec/comsat/comsat.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#10 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/nfsiod/nfsiod.c#6 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uhid.4#3 integrate .. //depot/projects/trustedbsd/base/share/misc/iso3166#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_misc.c#9 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_stats.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ohci.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/ulpt.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#12 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/msdosfs_denode.c#6 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/vm_machdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#21 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_generic.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_socket.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#24 integrate .. //depot/projects/trustedbsd/base/sys/modules/cam/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_debug.h#2 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet/udp_usrreq.c#14 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_lock.c#9 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_lock.h#4 integrate .. //depot/projects/trustedbsd/base/sys/pci/uhci_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/pcb.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/pmap.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/tlb.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#16 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#22 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/disklabel.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/file.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/msg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/protosw.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#19 integrate .. //depot/projects/trustedbsd/base/sys/sys/ucred.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#23 integrate .. //depot/projects/trustedbsd/base/usr.bin/biff/biff.1#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.lockd/kern.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/base/bin/cp/cp.1#4 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.24 2002/08/09 10:38:34 ru Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.25 2002/08/16 03:13:59 johan Exp $ .\" -.Dd April 18, 1994 +.Dd July 23, 2002 .Dt CP 1 .Os .Sh NAME ==== //depot/projects/trustedbsd/base/include/stdbool.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/stdbool.h,v 1.5 2002/06/19 06:04:37 obrien Exp $ + * $FreeBSD: src/include/stdbool.h,v 1.6 2002/08/16 07:33:14 alfred Exp $ */ #ifndef _STDBOOL_H_ @@ -37,7 +37,7 @@ #define true 1 #define bool _Bool -#if __STDC_VERSION__ < 199901L +#if __STDC_VERSION__ < 199901L && __GNUC__ < 3 typedef int _Bool; #endif ==== //depot/projects/trustedbsd/base/lib/libc/net/inet_ntop.c#5 (text+ko) ==== @@ -18,7 +18,7 @@ static char rcsid[] = "$Id: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.10 2002/08/14 20:40:35 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.11 2002/08/15 21:19:31 robert Exp $"); #include #include @@ -30,8 +30,6 @@ #include #include -#define SPRINTF(x) ((socklen_t)sprintf x) - /* * WARNING: Don't even consider trying to compile this on a system where * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. @@ -79,13 +77,12 @@ inet_ntop4(const u_char *src, char *dst, socklen_t size) { static const char fmt[] = "%u.%u.%u.%u"; - char tmp[sizeof "255.255.255.255"]; - if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size) { + if ((socklen_t)snprintf(dst, size, fmt, src[0], src[1], src[2], src[3]) + >= size) { errno = ENOSPC; return (NULL); } - strcpy(dst, tmp); return (dst); } @@ -164,7 +161,7 @@ tp += strlen(tp); break; } - tp += SPRINTF((tp, "%x", words[i])); + tp += sprintf(tp, "%x", words[i]); } /* Was it a trailing run of 0x00's? */ if (best.base != -1 && (best.base + best.len) == ==== //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#7 (text+ko) ==== @@ -34,11 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.50 2002/06/30 20:13:53 julian Exp $ + * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.51 2002/08/16 07:01:42 alfred Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.50 2002/06/30 20:13:53 julian Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.51 2002/08/16 07:01:42 alfred Exp $"); #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93"; @@ -52,6 +52,9 @@ */ #include +#define _KERNEL +#include +#undef _KERNEL #include #include #include ==== //depot/projects/trustedbsd/base/lib/libutil/login_cap.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * Low-level routines relating to the user capabilities database * * Was login_cap.h,v 1.9 1997/05/07 20:00:01 eivind Exp - * $FreeBSD: src/lib/libutil/login_cap.h,v 1.7 2002/08/11 01:48:43 rwatson Exp $ + * $FreeBSD: src/lib/libutil/login_cap.h,v 1.8 2002/08/16 02:14:21 rwatson Exp $ */ #ifndef _LOGIN_CAP_H_ @@ -47,7 +47,8 @@ #define LOGIN_SETUMASK 0x0020 /* set umask, obviously */ #define LOGIN_SETUSER 0x0040 /* set user (via setuid) */ #define LOGIN_SETENV 0x0080 /* set user environment */ -#define LOGIN_SETALL 0x00ff /* set everything */ +#define LOGIN_SETMAC 0x0100 /* set user default MAC label */ +#define LOGIN_SETALL 0x01ff /* set everything */ #define BI_AUTH "authorize" /* accepted authentication */ #define BI_REJECT "reject" /* rejected authentication */ ==== //depot/projects/trustedbsd/base/libexec/comsat/comsat.8#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)comsat.8 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/libexec/comsat/comsat.8,v 1.11 2002/08/13 11:05:04 ru Exp $ +.\" $FreeBSD: src/libexec/comsat/comsat.8,v 1.12 2002/08/16 03:08:25 johan Exp $ .\" -.Dd June 4, 1993 +.Dd July 9, 2002 .Dt COMSAT 8 .Os .Sh NAME ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#10 (text+ko) ==== @@ -36,10 +36,9 @@ static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.35 2002/07/31 12:01:14 mux Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.36 2002/08/16 07:34:19 alfred Exp $"; #endif /* not lint */ -#define DKTYPENAMES #include #include #include ==== //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#10 (text+ko) ==== @@ -1,7 +1,12 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.105 2002/08/10 15:04:40 luigi Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.106 2002/08/16 10:31:47 luigi Exp $ .\" -.Dd May 31, 2001 +.de NOIPFW +.br +(\\$1 NOT IN IPFW) +.br +.. +.Dd August 13, 2002 .Dt IPFW 8 .Os .Sh NAME @@ -13,11 +18,6 @@ .Cm add .Ar rule .Nm -.Op Fl q -.Cm delete -.Op Cm set -.Op Ar number ... -.Nm .Op Fl adeftNS .Brq Cm list | show .Op Ar number ... @@ -26,16 +26,20 @@ .Cm flush .Nm .Op Fl q -.Brq Cm zero | resetlog +.Brq Cm delete | zero | resetlog .Op Cm set .Op Ar number ... +.Pp +.Nm +.Cm set Oo Cm disable Ar number ... Oc Op Cm enable Ar number ... +.Nm +.Cm set move +.Op Cm rule +.Ar number Cm to Ar number .Nm -.Op Fl q -.Brq Cm disable | enable -.Cm set -.Op Ar number ... +.Cm set swap Ar number number .Nm -.Cm show sets +.Cm set show .Pp .Nm .Brq Cm pipe | queue @@ -68,6 +72,22 @@ traffic shaper in .Fx . .Pp +.Em NOTE: +this manual page refers to the newer version of +.Nm +introduced in July 2002, also known as +.Nm ipfw2 . +The commands listed here are a superset of the old +firewall, which we will call +.Nm ipfw1 +when it is necessary to distinguish between the two. +See the +.Sx IPFW2 ENHANCEMENTS +Section for a list of features which are not present in +.Nm ipfw1 . +This list can also be useful to revise your ruleset and +write them more efficiently. +.Pp An .Nm configuration, or @@ -126,10 +146,10 @@ rule, and are typically used to open the firewall on-demand to legitimate traffic only. See the -.Sx RULE FORMAT +.Sx STATEFUL FIREWALL and .Sx EXAMPLES -sections below for more information on the stateful behaviour of +Sections below for more information on the stateful behaviour of .Nm . .Pp All rules (including dynamic ones) have a few associated counters: @@ -157,6 +177,19 @@ .Cm resetlog commands. .Pp +Also, each rule belongs to one of 32 different +.Em sets +, and there are +.Nm +commands to atomically manipulate sets, such as enable, +disable, swap sets, move all rules in a set to another +one, delete all rules in a set. These can be useful to +install temporary configurations, or to test them. +See Section +.Sx SETS OF RULES +for more information on +.Em sets . +.Pp The following options are available: .Bl -tag -width indent .It Fl a @@ -174,8 +207,7 @@ Don't ask for confirmation for commands that can cause problems if misused, .No i.e. Cm flush . -.Em Note , -if there is no tty associated with the process, this is implied. +If there is no tty associated with the process, this is implied. .It Fl N Try to resolve addresses and service names in output. .It Fl q @@ -206,7 +238,9 @@ and the remainder of the ruleset is not processed. Access to the console would then be required to recover. .It Fl S -While listing rules, show the set each rule belongs to. +While listing rules, show the +.Em set +each rule belongs to. If this flag is not specified, disabled rules will not be listed. .It Fl s Op Ar field @@ -265,7 +299,7 @@ .Cm queue commands are used to configure the traffic shaper, as shown in the .Sx TRAFFIC SHAPER CONFIGURATION -section below. +Section below. .Sh PACKET FLOW .Nm can be invoked from multiple places in the protocol stack, @@ -404,7 +438,7 @@ If this is not possible (e.g. because we would go beyond the maximum allowed rule number), the same number of the last non-default value is used instead. -.It Ar set_number +.It Cm set Ar set_number Each rule is associated to a .Ar set_number in the range 0..31, with the latter reserved for the @@ -535,7 +569,7 @@ (for bandwidth limitation, delay, etc.). See the .Sx TRAFFIC SHAPER CONFIGURATION -section for further information. +Section for further information. The search terminates; however, on exit from the pipe and if the .Xr sysctl 8 @@ -568,7 +602,7 @@ socket bound to port .Ar port . The search terminates and the original packet is accepted -(but see section +(but see Section .Sx BUGS below). .It Cm unreach Ar code @@ -630,13 +664,17 @@ .Op Ar options .br .Cm MAC Ar dst-mac src-mac mac-type +.Op Cm from Ar src Cm to Ar dst .Op Ar options .Ed .Pp -where fields have the following meaning: +where the second format allows you to specify MAC header fields +instead (or in addition) of the IPv4 header fields. +.Pp +Rule fields have the following meaning: .Bl -tag -width indent .It Ar proto -An IP protocol specified by number or name (for a complete +An IPv4 protocol specified by number or name (for a complete list see .Pa /etc/protocols ) . The @@ -652,7 +690,6 @@ containing one or more of them, optionally followed by .Em port numbers. -followed by a set of port numbers. .It Ar ip address : An address (or set of addresses) specified in one of the following ways, optionally preceded by a @@ -699,7 +736,7 @@ bitmask, it takes constant time and dramatically reduces the complexity of rulesets. .El -.It Cm port numbers +.It port numbers With protocols which support port numbers (such as TCP and UDP), optional .Cm ports may be specified as one or more ports or port ranges, separated @@ -741,6 +778,28 @@ See the .Cm frag option for details on matching fragmented packets. +.It dst-mac, src-mac +Destination and source MAC addresses, specified as +groups of hex digits separated by commas, and optionally +followed by a mask indicating how many bits are significant: +.Pp +.Dl "ipfw add allow MAC 10:20:30:40:50:60/30 any any +.Pp +Note that the order of MAC addresses (destination first, +source second) is +the same as on the wire, but the opposite of the one used for +IP addresses. +.It mac-type +The value of the Ethernet Type field, specified in the same way as +.Cm port numbers +(i.e. one or more comma-separated single values or ranges). +You can use symbolic names for known values such as +.Em vlan , ipv4, ipv6 . +The values can be enter as decimal or hexadecimal, but they +are always printed as hexadecimal (unless the +.Cm -N +option is used, in which case symbolic resolution will be +attempted). .El .Ss RULE OPTIONS Additional match patterns can be used within @@ -1016,12 +1075,127 @@ .Ar user may be matched by name or identification number. .El +.Sh SETS OF RULES +Each rule belongs to one of 32 different +.Em sets +, numbered 0 to 31. +Set 31 is reserved for the default rule. +.Pp +By default, rules are put in set 0, unless you use the +.Cm set N +attribute when entering a new rule. +Sets can be individually and atomically enabled or disabled, +so this mechanism permits an easy way to store multiple configurations +of the firewall and quickly (and atomically) switch between them. +The command to enable/disable sets is +.Pp +.Nm +.Cm set disable Ar number ... Op Cm enable Ar number ... +.Pp +where multiple +.Cm enable +or +.Cm disable +sections can be specified. +Command execution is atomic on all the sets specified in the command. +By default, all sets are enabled. +.Pp +When you disable a set, its rules behave as if they were not existing +in the firewall configuration, with only one exception: +.Bl -bullet +.It +dynamic rules created from a rule before it had been disabled +will still be active until they expire. In order to delete +dynamic rules you have to explicitly delete the parent rule +which generated them; +.El +The set number of rules can be changed with the command +.Pp +.Nm +.Cm set move +.Brq Cm rule Ar rule-number | old-set +.Cm to Ar new-set +.Pp +Also, you can atomically swap two rulesets with the command +.Pp +.Nm +.Cm set swap Ar first-set second-set +.Pp +See the +.Sx EXAMPLES +Section on some possible uses of sets of rules. .Sh STATEFUL FIREWALL -To be completed. +Stateful operation is a way for the firewall to dynamically +create rules for specific flows when packets that +match a given pattern are detected. Support for stateful +operation comes through the +.Cm check-state , keep-state +and +.Cm limit +options of +.Nm rules. +.Pp +Dynamic rules are created when a packet matches a +.Cm keep-state +or +.Cm limit +rule, causing the creation of a +.Em dynamic +rule which will match all and only packets with +a given +.Em protocol +between a +.Em src-ip/src-port dst-ip/dst-port +pair of addresses ( +.Em src +and +.Em dst +are used here only to denote the initial match addresses, but they +are completely equivalent afterwards). +Dynamic rules will be checked at the first +.Cm check-state, keep-state +or +.Cm limit +occurrence, and the action performed upon a match will be the same +as in the parent rule. +.Pp +Note that no additional attributes other than protocol and IP addresses +and ports are checked on dynamic rules. +.Pp +The typical use of dynamic rules is to keep a closed firewall configuration, +but let the first TCP SYN packet from the inside network install a +dynamic rule for the flow so that packets belonging to that session +will be allowed through the firewall: +.Pp +.Dl "ipfw add check-state" +.Dl "ipfw add allow tcp from my-subnet to any setup" +.Dl "ipfw add deny tcp from any to any" +.Pp +A similar approach can be used for UDP, where an UDP packet coming +from the inside will install a dynamic rule to let the response through +the firewall: +.Pp +.Dl "ipfw add check-state" +.Dl "ipfw add allow udp from my-subnet to any" +.Dl "ipfw add deny udp from any to any" +.Pp +Dynamic rules expire after some time, which depends on the status +of the flow and the setting of some +.Cm sysctl +variables. +See Section +.Sx SYSCTL VARIABLES +for more details. +For TCP sessions, dynamic rules can be instructed to periodically +send keepalive packets to refresh the state of the rule when it is +about to expire. +.Pp +See Section +.Sx EXAMPLES +for more examples on how to use dynamic rules. .Sh TRAFFIC SHAPER CONFIGURATION -The .Nm -utility is also the user interface for the +is also the user interface for the .Xr dummynet 4 traffic shaper. The shaper operates by dividing packets into @@ -1124,22 +1298,6 @@ .Em net.inet.ip.dummynet.hash_size , allowed range is 16 to 1024. .Pp -.It Cm queue Brq Ar slots | size Ns Cm Kbytes -Queue size, in -.Ar slots -or -.Cm KBytes . -Default value is 50 slots, which -is the typical queue size for Ethernet devices. -Note that for slow speed links you should keep the queue -size short or your traffic might be affected by a significant -queueing delay. -E.g., 50 max-sized ethernet packets (1500 bytes) mean 600Kbit -or 20s of queue on a 30Kbit/s pipe. -Even worse effect can result if you get packets from an -interface with a much larger MTU, e.g. the loopback interface -with its 16KB packets. -.Pp .It Cm mask Ar mask-specifier The .Xr dummynet 4 @@ -1167,6 +1325,14 @@ weight of the queue, and all flows insisting on the same pipe share bandwidth proportionally to their weight. .Pp +.It Cm noerror +When a packet is dropped by a dummynet queue or pipe, the error +is normally reported to the caller routine in the kernel, in the +same way as it happens when a device queue fills up. Setting this +option reports the packet as successfully delivered, which can be +needed for some experimental setups where you want to simulate +loss or congestion at a remote router. +.Pp .It Cm plr Ar packet-loss-rate Packet loss rate. Argument @@ -1175,6 +1341,22 @@ loss, 1 meaning 100% loss. The loss rate is internally represented on 31 bits. .Pp +.It Cm queue Brq Ar slots | size Ns Cm Kbytes +Queue size, in +.Ar slots +or +.Cm KBytes . +Default value is 50 slots, which +is the typical queue size for Ethernet devices. +Note that for slow speed links you should keep the queue +size short or your traffic might be affected by a significant +queueing delay. +E.g., 50 max-sized ethernet packets (1500 bytes) mean 600Kbit +or 20s of queue on a 30Kbit/s pipe. +Even worse effect can result if you get packets from an +interface with a much larger MTU, e.g. the loopback interface +with its 16KB packets. +.Pp .It Cm red | gred Ar w_q Ns / Ns Ar min_th Ns / Ns Ar max_th Ns / Ns Ar max_p Make use of the RED (Random Early Detection) queue management algorithm. .Ar w_q @@ -1290,36 +1472,32 @@ .Xr sysctl 8 command what value is actually in use) and meaning: .Bl -tag -width indent +.It Em net.inet.ip.fw.autoinc_step : No 100 +Delta beween rule numbers when auto-generating them. +The value must be in the range 1..1000. +.It Em net.inet.ip.fw.curr_dyn_buckets : Em net.inet.ip.fw.dyn_buckets +The current number of buckets in the hash table for dynamic rules +(readonly). .It Em net.inet.ip.fw.debug : No 1 Controls debugging messages produced by .Nm . -.It Em net.inet.ip.fw.one_pass : No 1 -When set, the packet exiting from the -.Xr dummynet 4 -pipe is not passed though the firewall again. -Otherwise, after a pipe action, the packet is -reinjected into the firewall at the next rule. -.It Em net.inet.ip.fw.verbose : No 1 -Enables verbose messages. -.It Em net.inet.ip.fw.enable : No 1 -Enables the firewall. -Setting this variable to 0 lets you run your machine without -firewall even if compiled in. -.It Em net.inet.ip.fw.verbose_limit : No 0 -Limits the number of messages produced by a verbose firewall. .It Em net.inet.ip.fw.dyn_buckets : No 256 -.It Em net.inet.ip.fw.curr_dyn_buckets : No 256 -The configured and current size of the hash table used to -hold dynamic rules. -This must be a power of 2. -The table can only be resized when empty, so in order to -resize it on the fly you will probably have to +The number of buckets in the hash table for dynamic rules. +Must be a power of 2, up to 1^^20. +It only takes effect when all dynamic rules have expired, so you +are advised to use a .Cm flush -and reload the ruleset. +command to make sure that the hash table is resized. .It Em net.inet.ip.fw.dyn_count : No 3 Current number of dynamic rules (read-only). -.It Em net.inet.ip.fw.dyn_max : No 1000 +.It Em net.inet.ip.fw.dyn_keepalive : No 1 +Enables generation of keepalive packets for +.Cm keep-state +rules on TCP sessions. A keepalive is generated to both +sides of the connection every 5 seconds for the last 20 +seconds of the lifetime of the rule. +.It Em net.inet.ip.fw.dyn_max : No 8192 Maximum number of dynamic rules. When you hit this limit, no more dynamic rules can be installed until old ones expire. @@ -1333,7 +1511,31 @@ rules. Upon the initial SYN exchange the lifetime is kept short, then increased after both SYN have been seen, then decreased -again during the final FIN exchange or when a RST +again during the final FIN exchange or when a RST is received. +Both +.Em dyn_fin_lifetime +and +.Em dyn_rst_lifetime +must be strictly lower than 5 seconds, the period of +repetition of keepalives. The firewall enforces that. +.It Em net.inet.ip.fw.enable : No 1 +Enables the firewall. +Setting this variable to 0 lets you run your machine without +firewall even if compiled in. +.It Em net.inet.ip.fw.one_pass : No 1 +When set, the packet exiting from the +.Xr dummynet 4 +pipe is not passed though the firewall again. +Otherwise, after a pipe action, the packet is +reinjected into the firewall at the next rule. +.Pp +Note: bridged and layer 2 packets coming out of a pipe +are never reinjected in the firewall irrespective of the +value of this variable. +.It Em net.inet.ip.fw.verbose : No 1 +Enables verbose messages. +.It Em net.inet.ip.fw.verbose_limit : No 0 +Limits the number of messages produced by a verbose firewall. .It Em net.link.ether.ipfw : No 0 Controls whether layer-2 packets are passed to .Nm . @@ -1343,7 +1545,68 @@ .Nm . Default is no. .El +.Sh IPFW2 ENHANCEMENTS +This Section lists the features that have been introduced in +.Nm ipfw2 +and were not present in +.Nm ipfw1 . +We list them in order of the potential impact that they can +have in writing your rulesets. +You might want to consider using these features in order to +write your rulesets in a more efficient way. +.Bl -tag -width indent +.It Address sets +.Nm ipfw1 +does not supports address sets (those in the form +.Ar addr/masklen{num,num,...} +) +.It Port specifications +.Nm ipfw1 +only allows one port range when specifying TCP and UDP ports, and +is limited to 10 entries instead of the 15 allowed by +.Nm ipfw2 . +Also, in +.Nm ipfw1 +you can only specify ports when the rule is requesting +.Cm tcp +or +.Cm udp +packets. With +.Nm ipfw2 +you can put port specifications in rules matching all packets, +and the match will be attempted only on those packets carrying +protocols which include port identifiers. +.It Or-blocks +.Nm ipfw1 +does not support Or-blocks. All match operators are implicitly +connected by +.Cm and +operators. +.It keepalives +.Nm ipfw1 +does not generate keepalives for stateful sessions. +As a consequence, it might cause idle sessions to drop because +the lifetime of the dynamic rules expires. +.It Sets of rules +.Nm ipfw1 +does not implement sets of rules. +.It MAC header filtering and Layer-2 firewalling. +.Nm ipfw1 +does not implement filtering on MAC header fields, nor it is +invoked on packets from +.Cm ether_demux() +and +.Cm ether_output_frame(). +The sysctl variable +.Em net.link.ether.ipfw +has no effect there. +.El .Sh EXAMPLES +There are far too many possible uses of +.Nm +so this Section will only give a small set of examples. +.Pp +.Ss BASIC PACKET FILTERING This command adds an entry which denies all tcp packets from .Em cracker.evil.org to the telnet port of @@ -1375,6 +1638,24 @@ .Cm deny rule. .Pp +If you administer one or more subnets, you can take advantage of the +.Nm ipfw2 +syntax to specify address sets and or-blocks and write extremely +compact rulesets which selectively enable services to blocks +of clients, as below: +.Pp +.Dl "goodguys=\*q{ 10.1.2.0/24{20,35,66,18} or 10.2.3.0/28{6,3,11} }\*q" +.Dl "badguys=\*q10.1.2.0/24{8,38,60}\*q" +.Dl "" +.Dl "ipfw add allow ip from ${goodguys} to any" +.Dl "ipfw add deny ip from ${badguys} to any" +.Dl "... normal policies ..." +.Pp +The +.Nm ipfw1 +syntax would require a separate rule for each IP in the above +example. +.Ss DYNAMIC RULES In order to protect a site from flood attacks involving fake TCP packets, it is safer to use dynamic rules: .Pp @@ -1434,6 +1715,7 @@ .Pp .Dl ipfw divert 5000 ip from 192.168.2.0/24 to any in .Pp +.Ss TRAFFIC SHAPING The following rules show some of the applications of .Nm and @@ -1525,6 +1807,27 @@ .Dl "ipfw add pipe 2 ip from any to 192.168.2.0/24 in" .Dl "ipfw pipe 1 config mask src-ip 0x000000ff bw 200Kbit/s queue 20Kbytes" .Dl "ipfw pipe 2 config mask dst-ip 0x000000ff bw 200Kbit/s queue 20Kbytes" +.Ss SETS OF RULES +To add a set of rules atomically, e.g. set 18: +.Pp +.Dl "ipfw disable set 18" +.Dl "ipfw add NN set 18 ... # repeat as needed" +.Dl "ipfw enable set 18" +.Pp +To delete a set of rules atomically the command is simply: +.Pp +.Dl "ipfw delete set 18" +.Pp +To test a ruleset and disable it and regain control if something goes wrong: +.Pp +.Dl "ipfw disable set 18" +.Dl "ipfw add NN set 18 ... # repeat as needed" +.Dl "ipfw enable set 18 ; echo done; sleep 30 && ipfw disable set 18" +.Pp +Here if everything goes well, you press control-C before the "sleep" +terminates, and your ruleset will be left active. Otherwise, e.g. if +you cannot access your box, the ruleset will be disabled after +the sleep terminates thus restoring the previous situation. .Sh SEE ALSO .Xr cpp 1 , .Xr m4 1 , ==== //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#6 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.9 2002/08/10 15:10:15 luigi Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.10 2002/08/16 10:31:47 luigi Exp $ */ #include @@ -223,6 +223,7 @@ TOK_ICMPTYPES, TOK_PLR, + TOK_NOERROR, TOK_BUCKETS, TOK_DSTIP, TOK_SRCIP, @@ -241,6 +242,7 @@ struct _s_x dummynet_params[] = { { "plr", TOK_PLR }, + { "noerror", TOK_NOERROR }, { "buckets", TOK_BUCKETS }, { "dst-ip", TOK_DSTIP }, { "src-ip", TOK_SRCIP }, @@ -502,8 +504,10 @@ p[1] = b; } else if (*s == ',' || *s == '\0' ) { p[0] = p[1] = a; - } else /* invalid separator */ - break; + } else { /* invalid separator */ + errx(EX_DATAERR, "invalid separator <%c> in <%s>\n", + *s, av); + } av = s+1; } if (i > 0) { @@ -737,17 +741,29 @@ * show_ipfw() prints the body of an ipfw rule. * Because the standard rule has at least proto src_ip dst_ip, we use * a helper function to produce these entries if not provided explicitly. + * + * Special case: if we have provided a MAC header, and no IP specs, + * just leave it alone. + * Also, if we have providea a MAC header and no IP protocol, print it + * as "all" instead of "ip". */ -#define HAVE_PROTO 1 -#define HAVE_SRCIP 2 -#define HAVE_DSTIP 4 -#define HAVE_MAC 8 +#define HAVE_PROTO 0x0001 +#define HAVE_SRCIP 0x0002 +#define HAVE_DSTIP 0x0004 +#define HAVE_MAC 0x0008 +#define HAVE_MACTYPE 0x0010 +#define HAVE_IP (HAVE_PROTO | HAVE_SRCIP | HAVE_DSTIP) static void show_prerequisites(int *flags, int want) { + if ( (*flags & (HAVE_MAC | HAVE_MACTYPE)) == HAVE_MAC) { + printf(" any"); /* MAC type */ + *flags |= HAVE_MACTYPE; + } + if ( !(*flags & HAVE_PROTO) && (want & HAVE_PROTO)) - printf(" ip"); + printf( (*flags & HAVE_MAC) ? " all" : " ip"); if ( !(*flags & HAVE_SRCIP) && (want & HAVE_SRCIP)) printf(" from any"); if ( !(*flags & HAVE_DSTIP) && (want & HAVE_DSTIP)) @@ -907,6 +923,9 @@ break; case O_MAC_TYPE: + if ( (flags & HAVE_MAC) == 0) + printf(" MAC"); + flags |= (HAVE_MAC | HAVE_MACTYPE); print_newports((ipfw_insn_u16 *)cmd, IPPROTO_ETHERTYPE); break; @@ -1340,7 +1359,116 @@ } } +/* + * This one handles all set-related commands + * ipfw set { show | enable | disable } + * ipfw set swap X Y + * ipfw set move X to Y + * ipfw set move rule X to Y + */ static void +sets_handler(int ac, char *av[]) +{ + u_int32_t set_disable, masks[2]; + int i, nbytes; + u_int16_t rulenum; + u_int8_t cmd, new_set; + + ac--; + av++; + + if (!ac) + errx(EX_USAGE, "set needs command"); + if (!strncmp(*av, "show", strlen(*av)) ) { + void *data; + char *msg; + + nbytes = sizeof(struct ip_fw); + if ((data = malloc(nbytes)) == NULL) + err(EX_OSERR, "malloc"); + if (getsockopt(s, IPPROTO_IP, IP_FW_GET, data, &nbytes) < 0) + err(EX_OSERR, "getsockopt(IP_FW_GET)"); + set_disable = (u_int32_t)(((struct ip_fw *)data)->next_rule); + + for (i = 0, msg = "disable" ; i < 31; i++) + if ( (set_disable & (1<>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 6:53: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7437237B401; Fri, 16 Aug 2002 06:51:50 -0700 (PDT) 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 08DBF37B400 for ; Fri, 16 Aug 2002 06:51:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C82743E4A for ; Fri, 16 Aug 2002 06:51:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GDpnJU099980 for ; Fri, 16 Aug 2002 06:51:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GDpmWw099975 for perforce@freebsd.org; Fri, 16 Aug 2002 06:51:48 -0700 (PDT) Date: Fri, 16 Aug 2002 06:51:48 -0700 (PDT) Message-Id: <200208161351.g7GDpmWw099975@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16110 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16110 Change 16110 by rwatson@rwatson_tislabs on 2002/08/16 06:51:26 Integ changes from trustedbsd base tree: include fo_stat/fo_poll credential changes, also libutil SETLABEL->SETMAC rename. Further tweaks will be needed to get all compiling again. Affected files ... .. //depot/projects/trustedbsd/mac/bin/cp/cp.1#4 integrate .. //depot/projects/trustedbsd/mac/include/stdbool.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/inet_ntop.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_proc.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_cap.h#5 integrate .. //depot/projects/trustedbsd/mac/libexec/comsat/comsat.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/setup.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#6 integrate .. //depot/projects/trustedbsd/mac/sbin/nfsiod/nfsiod.c#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/uhid.4#3 integrate .. //depot/projects/trustedbsd/mac/share/misc/iso3166#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_misc.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_stats.c#11 edit .. //depot/projects/trustedbsd/mac/sys/dev/usb/ohci.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ulpt.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fdescfs/fdesc_vnops.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/msdosfs_denode.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/vm_machdep.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_generic.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_socket.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#36 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#78 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#51 integrate .. //depot/projects/trustedbsd/mac/sys/modules/cam/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_debug.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_timer.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_lock.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_lock.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/pci/uhci_pci.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/pcb.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/pmap.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/tlb.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/genassym.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/sys/disklabel.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/sys/file.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/msg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/sys/protosw.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#24 integrate .. //depot/projects/trustedbsd/mac/sys/sys/ucred.h#17 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#44 integrate .. //depot/projects/trustedbsd/mac/usr.bin/biff/biff.1#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.freebsd#12 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/rpc.lockd/kern.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac/bin/cp/cp.1#4 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.24 2002/08/09 10:38:34 ru Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.25 2002/08/16 03:13:59 johan Exp $ .\" -.Dd April 18, 1994 +.Dd July 23, 2002 .Dt CP 1 .Os .Sh NAME ==== //depot/projects/trustedbsd/mac/include/stdbool.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/stdbool.h,v 1.5 2002/06/19 06:04:37 obrien Exp $ + * $FreeBSD: src/include/stdbool.h,v 1.6 2002/08/16 07:33:14 alfred Exp $ */ #ifndef _STDBOOL_H_ @@ -37,7 +37,7 @@ #define true 1 #define bool _Bool -#if __STDC_VERSION__ < 199901L +#if __STDC_VERSION__ < 199901L && __GNUC__ < 3 typedef int _Bool; #endif ==== //depot/projects/trustedbsd/mac/lib/libc/net/inet_ntop.c#5 (text+ko) ==== @@ -18,7 +18,7 @@ static char rcsid[] = "$Id: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.10 2002/08/14 20:40:35 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.11 2002/08/15 21:19:31 robert Exp $"); #include #include @@ -30,8 +30,6 @@ #include #include -#define SPRINTF(x) ((socklen_t)sprintf x) - /* * WARNING: Don't even consider trying to compile this on a system where * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. @@ -79,13 +77,12 @@ inet_ntop4(const u_char *src, char *dst, socklen_t size) { static const char fmt[] = "%u.%u.%u.%u"; - char tmp[sizeof "255.255.255.255"]; - if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) > size) { + if ((socklen_t)snprintf(dst, size, fmt, src[0], src[1], src[2], src[3]) + >= size) { errno = ENOSPC; return (NULL); } - strcpy(dst, tmp); return (dst); } @@ -164,7 +161,7 @@ tp += strlen(tp); break; } - tp += SPRINTF((tp, "%x", words[i])); + tp += sprintf(tp, "%x", words[i]); } /* Was it a trailing run of 0x00's? */ if (best.base != -1 && (best.base + best.len) == ==== //depot/projects/trustedbsd/mac/lib/libkvm/kvm_proc.c#6 (text+ko) ==== @@ -34,11 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.50 2002/06/30 20:13:53 julian Exp $ + * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.51 2002/08/16 07:01:42 alfred Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.50 2002/06/30 20:13:53 julian Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.51 2002/08/16 07:01:42 alfred Exp $"); #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93"; @@ -52,6 +52,9 @@ */ #include +#define _KERNEL +#include +#undef _KERNEL #include #include #include ==== //depot/projects/trustedbsd/mac/lib/libutil/login_cap.h#5 (text+ko) ==== @@ -22,7 +22,7 @@ * Low-level routines relating to the user capabilities database * * Was login_cap.h,v 1.9 1997/05/07 20:00:01 eivind Exp - * $FreeBSD: src/lib/libutil/login_cap.h,v 1.7 2002/08/11 01:48:43 rwatson Exp $ + * $FreeBSD: src/lib/libutil/login_cap.h,v 1.8 2002/08/16 02:14:21 rwatson Exp $ */ #ifndef _LOGIN_CAP_H_ @@ -47,7 +47,7 @@ #define LOGIN_SETUMASK 0x0020 /* set umask, obviously */ #define LOGIN_SETUSER 0x0040 /* set user (via setuid) */ #define LOGIN_SETENV 0x0080 /* set user environment */ -#define LOGIN_SETLABEL 0x0100 /* set user MAC label */ +#define LOGIN_SETMAC 0x0100 /* set user default MAC label */ #define LOGIN_SETALL 0x01ff /* set everything */ #define BI_AUTH "authorize" /* accepted authentication */ ==== //depot/projects/trustedbsd/mac/libexec/comsat/comsat.8#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)comsat.8 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/libexec/comsat/comsat.8,v 1.11 2002/08/13 11:05:04 ru Exp $ +.\" $FreeBSD: src/libexec/comsat/comsat.8,v 1.12 2002/08/16 03:08:25 johan Exp $ .\" -.Dd June 4, 1993 +.Dd July 9, 2002 .Dt COMSAT 8 .Os .Sh NAME ==== //depot/projects/trustedbsd/mac/sbin/fsck_ffs/setup.c#10 (text+ko) ==== @@ -36,10 +36,9 @@ static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.35 2002/07/31 12:01:14 mux Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.36 2002/08/16 07:34:19 alfred Exp $"; #endif /* not lint */ -#define DKTYPENAMES #include #include #include ==== //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#9 (text+ko) ==== @@ -1,7 +1,12 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.105 2002/08/10 15:04:40 luigi Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.106 2002/08/16 10:31:47 luigi Exp $ .\" -.Dd May 31, 2001 +.de NOIPFW +.br +(\\$1 NOT IN IPFW) +.br +.. +.Dd August 13, 2002 .Dt IPFW 8 .Os .Sh NAME @@ -13,11 +18,6 @@ .Cm add .Ar rule .Nm -.Op Fl q -.Cm delete -.Op Cm set -.Op Ar number ... -.Nm .Op Fl adeftNS .Brq Cm list | show .Op Ar number ... @@ -26,16 +26,20 @@ .Cm flush .Nm .Op Fl q -.Brq Cm zero | resetlog +.Brq Cm delete | zero | resetlog .Op Cm set .Op Ar number ... +.Pp +.Nm +.Cm set Oo Cm disable Ar number ... Oc Op Cm enable Ar number ... +.Nm +.Cm set move +.Op Cm rule +.Ar number Cm to Ar number .Nm -.Op Fl q -.Brq Cm disable | enable -.Cm set -.Op Ar number ... +.Cm set swap Ar number number .Nm -.Cm show sets +.Cm set show .Pp .Nm .Brq Cm pipe | queue @@ -68,6 +72,22 @@ traffic shaper in .Fx . .Pp +.Em NOTE: +this manual page refers to the newer version of +.Nm +introduced in July 2002, also known as +.Nm ipfw2 . +The commands listed here are a superset of the old +firewall, which we will call +.Nm ipfw1 +when it is necessary to distinguish between the two. +See the +.Sx IPFW2 ENHANCEMENTS +Section for a list of features which are not present in +.Nm ipfw1 . +This list can also be useful to revise your ruleset and +write them more efficiently. +.Pp An .Nm configuration, or @@ -126,10 +146,10 @@ rule, and are typically used to open the firewall on-demand to legitimate traffic only. See the -.Sx RULE FORMAT +.Sx STATEFUL FIREWALL and .Sx EXAMPLES -sections below for more information on the stateful behaviour of +Sections below for more information on the stateful behaviour of .Nm . .Pp All rules (including dynamic ones) have a few associated counters: @@ -157,6 +177,19 @@ .Cm resetlog commands. .Pp +Also, each rule belongs to one of 32 different +.Em sets +, and there are +.Nm +commands to atomically manipulate sets, such as enable, +disable, swap sets, move all rules in a set to another +one, delete all rules in a set. These can be useful to +install temporary configurations, or to test them. +See Section +.Sx SETS OF RULES +for more information on +.Em sets . +.Pp The following options are available: .Bl -tag -width indent .It Fl a @@ -174,8 +207,7 @@ Don't ask for confirmation for commands that can cause problems if misused, .No i.e. Cm flush . -.Em Note , -if there is no tty associated with the process, this is implied. +If there is no tty associated with the process, this is implied. .It Fl N Try to resolve addresses and service names in output. .It Fl q @@ -206,7 +238,9 @@ and the remainder of the ruleset is not processed. Access to the console would then be required to recover. .It Fl S -While listing rules, show the set each rule belongs to. +While listing rules, show the +.Em set +each rule belongs to. If this flag is not specified, disabled rules will not be listed. .It Fl s Op Ar field @@ -265,7 +299,7 @@ .Cm queue commands are used to configure the traffic shaper, as shown in the .Sx TRAFFIC SHAPER CONFIGURATION -section below. +Section below. .Sh PACKET FLOW .Nm can be invoked from multiple places in the protocol stack, @@ -404,7 +438,7 @@ If this is not possible (e.g. because we would go beyond the maximum allowed rule number), the same number of the last non-default value is used instead. -.It Ar set_number +.It Cm set Ar set_number Each rule is associated to a .Ar set_number in the range 0..31, with the latter reserved for the @@ -535,7 +569,7 @@ (for bandwidth limitation, delay, etc.). See the .Sx TRAFFIC SHAPER CONFIGURATION -section for further information. +Section for further information. The search terminates; however, on exit from the pipe and if the .Xr sysctl 8 @@ -568,7 +602,7 @@ socket bound to port .Ar port . The search terminates and the original packet is accepted -(but see section +(but see Section .Sx BUGS below). .It Cm unreach Ar code @@ -630,13 +664,17 @@ .Op Ar options .br .Cm MAC Ar dst-mac src-mac mac-type +.Op Cm from Ar src Cm to Ar dst .Op Ar options .Ed .Pp -where fields have the following meaning: +where the second format allows you to specify MAC header fields +instead (or in addition) of the IPv4 header fields. +.Pp +Rule fields have the following meaning: .Bl -tag -width indent .It Ar proto -An IP protocol specified by number or name (for a complete +An IPv4 protocol specified by number or name (for a complete list see .Pa /etc/protocols ) . The @@ -652,7 +690,6 @@ containing one or more of them, optionally followed by .Em port numbers. -followed by a set of port numbers. .It Ar ip address : An address (or set of addresses) specified in one of the following ways, optionally preceded by a @@ -699,7 +736,7 @@ bitmask, it takes constant time and dramatically reduces the complexity of rulesets. .El -.It Cm port numbers +.It port numbers With protocols which support port numbers (such as TCP and UDP), optional .Cm ports may be specified as one or more ports or port ranges, separated @@ -741,6 +778,28 @@ See the .Cm frag option for details on matching fragmented packets. +.It dst-mac, src-mac +Destination and source MAC addresses, specified as +groups of hex digits separated by commas, and optionally +followed by a mask indicating how many bits are significant: +.Pp +.Dl "ipfw add allow MAC 10:20:30:40:50:60/30 any any +.Pp +Note that the order of MAC addresses (destination first, +source second) is +the same as on the wire, but the opposite of the one used for +IP addresses. +.It mac-type +The value of the Ethernet Type field, specified in the same way as +.Cm port numbers +(i.e. one or more comma-separated single values or ranges). +You can use symbolic names for known values such as +.Em vlan , ipv4, ipv6 . +The values can be enter as decimal or hexadecimal, but they +are always printed as hexadecimal (unless the +.Cm -N +option is used, in which case symbolic resolution will be +attempted). .El .Ss RULE OPTIONS Additional match patterns can be used within @@ -1016,12 +1075,127 @@ .Ar user may be matched by name or identification number. .El +.Sh SETS OF RULES +Each rule belongs to one of 32 different +.Em sets +, numbered 0 to 31. +Set 31 is reserved for the default rule. +.Pp +By default, rules are put in set 0, unless you use the +.Cm set N +attribute when entering a new rule. +Sets can be individually and atomically enabled or disabled, +so this mechanism permits an easy way to store multiple configurations +of the firewall and quickly (and atomically) switch between them. +The command to enable/disable sets is +.Pp +.Nm +.Cm set disable Ar number ... Op Cm enable Ar number ... +.Pp +where multiple +.Cm enable +or +.Cm disable +sections can be specified. +Command execution is atomic on all the sets specified in the command. +By default, all sets are enabled. +.Pp +When you disable a set, its rules behave as if they were not existing +in the firewall configuration, with only one exception: +.Bl -bullet +.It +dynamic rules created from a rule before it had been disabled +will still be active until they expire. In order to delete +dynamic rules you have to explicitly delete the parent rule +which generated them; +.El +The set number of rules can be changed with the command +.Pp +.Nm +.Cm set move +.Brq Cm rule Ar rule-number | old-set +.Cm to Ar new-set +.Pp +Also, you can atomically swap two rulesets with the command +.Pp +.Nm +.Cm set swap Ar first-set second-set +.Pp +See the +.Sx EXAMPLES +Section on some possible uses of sets of rules. .Sh STATEFUL FIREWALL -To be completed. +Stateful operation is a way for the firewall to dynamically +create rules for specific flows when packets that +match a given pattern are detected. Support for stateful +operation comes through the +.Cm check-state , keep-state +and +.Cm limit +options of +.Nm rules. +.Pp +Dynamic rules are created when a packet matches a +.Cm keep-state +or +.Cm limit +rule, causing the creation of a +.Em dynamic +rule which will match all and only packets with +a given +.Em protocol +between a +.Em src-ip/src-port dst-ip/dst-port +pair of addresses ( +.Em src +and +.Em dst +are used here only to denote the initial match addresses, but they +are completely equivalent afterwards). +Dynamic rules will be checked at the first +.Cm check-state, keep-state +or +.Cm limit +occurrence, and the action performed upon a match will be the same +as in the parent rule. +.Pp +Note that no additional attributes other than protocol and IP addresses +and ports are checked on dynamic rules. +.Pp +The typical use of dynamic rules is to keep a closed firewall configuration, +but let the first TCP SYN packet from the inside network install a +dynamic rule for the flow so that packets belonging to that session +will be allowed through the firewall: +.Pp +.Dl "ipfw add check-state" +.Dl "ipfw add allow tcp from my-subnet to any setup" +.Dl "ipfw add deny tcp from any to any" +.Pp +A similar approach can be used for UDP, where an UDP packet coming +from the inside will install a dynamic rule to let the response through +the firewall: +.Pp +.Dl "ipfw add check-state" +.Dl "ipfw add allow udp from my-subnet to any" +.Dl "ipfw add deny udp from any to any" +.Pp +Dynamic rules expire after some time, which depends on the status +of the flow and the setting of some +.Cm sysctl +variables. +See Section +.Sx SYSCTL VARIABLES +for more details. +For TCP sessions, dynamic rules can be instructed to periodically +send keepalive packets to refresh the state of the rule when it is +about to expire. +.Pp +See Section +.Sx EXAMPLES +for more examples on how to use dynamic rules. .Sh TRAFFIC SHAPER CONFIGURATION -The .Nm -utility is also the user interface for the +is also the user interface for the .Xr dummynet 4 traffic shaper. The shaper operates by dividing packets into @@ -1124,22 +1298,6 @@ .Em net.inet.ip.dummynet.hash_size , allowed range is 16 to 1024. .Pp -.It Cm queue Brq Ar slots | size Ns Cm Kbytes -Queue size, in -.Ar slots -or -.Cm KBytes . -Default value is 50 slots, which -is the typical queue size for Ethernet devices. -Note that for slow speed links you should keep the queue -size short or your traffic might be affected by a significant -queueing delay. -E.g., 50 max-sized ethernet packets (1500 bytes) mean 600Kbit -or 20s of queue on a 30Kbit/s pipe. -Even worse effect can result if you get packets from an -interface with a much larger MTU, e.g. the loopback interface -with its 16KB packets. -.Pp .It Cm mask Ar mask-specifier The .Xr dummynet 4 @@ -1167,6 +1325,14 @@ weight of the queue, and all flows insisting on the same pipe share bandwidth proportionally to their weight. .Pp +.It Cm noerror +When a packet is dropped by a dummynet queue or pipe, the error +is normally reported to the caller routine in the kernel, in the +same way as it happens when a device queue fills up. Setting this +option reports the packet as successfully delivered, which can be +needed for some experimental setups where you want to simulate +loss or congestion at a remote router. +.Pp .It Cm plr Ar packet-loss-rate Packet loss rate. Argument @@ -1175,6 +1341,22 @@ loss, 1 meaning 100% loss. The loss rate is internally represented on 31 bits. .Pp +.It Cm queue Brq Ar slots | size Ns Cm Kbytes +Queue size, in +.Ar slots +or +.Cm KBytes . +Default value is 50 slots, which +is the typical queue size for Ethernet devices. +Note that for slow speed links you should keep the queue +size short or your traffic might be affected by a significant +queueing delay. +E.g., 50 max-sized ethernet packets (1500 bytes) mean 600Kbit +or 20s of queue on a 30Kbit/s pipe. +Even worse effect can result if you get packets from an +interface with a much larger MTU, e.g. the loopback interface +with its 16KB packets. +.Pp .It Cm red | gred Ar w_q Ns / Ns Ar min_th Ns / Ns Ar max_th Ns / Ns Ar max_p Make use of the RED (Random Early Detection) queue management algorithm. .Ar w_q @@ -1290,36 +1472,32 @@ .Xr sysctl 8 command what value is actually in use) and meaning: .Bl -tag -width indent +.It Em net.inet.ip.fw.autoinc_step : No 100 +Delta beween rule numbers when auto-generating them. +The value must be in the range 1..1000. +.It Em net.inet.ip.fw.curr_dyn_buckets : Em net.inet.ip.fw.dyn_buckets +The current number of buckets in the hash table for dynamic rules +(readonly). .It Em net.inet.ip.fw.debug : No 1 Controls debugging messages produced by .Nm . -.It Em net.inet.ip.fw.one_pass : No 1 -When set, the packet exiting from the -.Xr dummynet 4 -pipe is not passed though the firewall again. -Otherwise, after a pipe action, the packet is -reinjected into the firewall at the next rule. -.It Em net.inet.ip.fw.verbose : No 1 -Enables verbose messages. -.It Em net.inet.ip.fw.enable : No 1 -Enables the firewall. -Setting this variable to 0 lets you run your machine without -firewall even if compiled in. -.It Em net.inet.ip.fw.verbose_limit : No 0 -Limits the number of messages produced by a verbose firewall. .It Em net.inet.ip.fw.dyn_buckets : No 256 -.It Em net.inet.ip.fw.curr_dyn_buckets : No 256 -The configured and current size of the hash table used to -hold dynamic rules. -This must be a power of 2. -The table can only be resized when empty, so in order to -resize it on the fly you will probably have to +The number of buckets in the hash table for dynamic rules. +Must be a power of 2, up to 1^^20. +It only takes effect when all dynamic rules have expired, so you +are advised to use a .Cm flush -and reload the ruleset. +command to make sure that the hash table is resized. .It Em net.inet.ip.fw.dyn_count : No 3 Current number of dynamic rules (read-only). -.It Em net.inet.ip.fw.dyn_max : No 1000 +.It Em net.inet.ip.fw.dyn_keepalive : No 1 +Enables generation of keepalive packets for +.Cm keep-state +rules on TCP sessions. A keepalive is generated to both +sides of the connection every 5 seconds for the last 20 +seconds of the lifetime of the rule. +.It Em net.inet.ip.fw.dyn_max : No 8192 Maximum number of dynamic rules. When you hit this limit, no more dynamic rules can be installed until old ones expire. @@ -1333,7 +1511,31 @@ rules. Upon the initial SYN exchange the lifetime is kept short, then increased after both SYN have been seen, then decreased -again during the final FIN exchange or when a RST +again during the final FIN exchange or when a RST is received. +Both +.Em dyn_fin_lifetime +and +.Em dyn_rst_lifetime +must be strictly lower than 5 seconds, the period of +repetition of keepalives. The firewall enforces that. +.It Em net.inet.ip.fw.enable : No 1 +Enables the firewall. +Setting this variable to 0 lets you run your machine without +firewall even if compiled in. +.It Em net.inet.ip.fw.one_pass : No 1 +When set, the packet exiting from the +.Xr dummynet 4 +pipe is not passed though the firewall again. +Otherwise, after a pipe action, the packet is +reinjected into the firewall at the next rule. +.Pp +Note: bridged and layer 2 packets coming out of a pipe +are never reinjected in the firewall irrespective of the +value of this variable. +.It Em net.inet.ip.fw.verbose : No 1 +Enables verbose messages. +.It Em net.inet.ip.fw.verbose_limit : No 0 +Limits the number of messages produced by a verbose firewall. .It Em net.link.ether.ipfw : No 0 Controls whether layer-2 packets are passed to .Nm . @@ -1343,7 +1545,68 @@ .Nm . Default is no. .El +.Sh IPFW2 ENHANCEMENTS +This Section lists the features that have been introduced in +.Nm ipfw2 +and were not present in +.Nm ipfw1 . +We list them in order of the potential impact that they can +have in writing your rulesets. +You might want to consider using these features in order to +write your rulesets in a more efficient way. +.Bl -tag -width indent +.It Address sets +.Nm ipfw1 +does not supports address sets (those in the form +.Ar addr/masklen{num,num,...} +) +.It Port specifications +.Nm ipfw1 +only allows one port range when specifying TCP and UDP ports, and +is limited to 10 entries instead of the 15 allowed by +.Nm ipfw2 . +Also, in +.Nm ipfw1 +you can only specify ports when the rule is requesting +.Cm tcp +or +.Cm udp +packets. With +.Nm ipfw2 +you can put port specifications in rules matching all packets, +and the match will be attempted only on those packets carrying +protocols which include port identifiers. +.It Or-blocks +.Nm ipfw1 +does not support Or-blocks. All match operators are implicitly +connected by +.Cm and +operators. +.It keepalives +.Nm ipfw1 +does not generate keepalives for stateful sessions. +As a consequence, it might cause idle sessions to drop because +the lifetime of the dynamic rules expires. +.It Sets of rules +.Nm ipfw1 +does not implement sets of rules. +.It MAC header filtering and Layer-2 firewalling. +.Nm ipfw1 +does not implement filtering on MAC header fields, nor it is +invoked on packets from +.Cm ether_demux() +and +.Cm ether_output_frame(). +The sysctl variable +.Em net.link.ether.ipfw +has no effect there. +.El .Sh EXAMPLES +There are far too many possible uses of +.Nm +so this Section will only give a small set of examples. +.Pp +.Ss BASIC PACKET FILTERING This command adds an entry which denies all tcp packets from .Em cracker.evil.org to the telnet port of @@ -1375,6 +1638,24 @@ .Cm deny rule. .Pp +If you administer one or more subnets, you can take advantage of the +.Nm ipfw2 +syntax to specify address sets and or-blocks and write extremely +compact rulesets which selectively enable services to blocks +of clients, as below: +.Pp +.Dl "goodguys=\*q{ 10.1.2.0/24{20,35,66,18} or 10.2.3.0/28{6,3,11} }\*q" +.Dl "badguys=\*q10.1.2.0/24{8,38,60}\*q" +.Dl "" +.Dl "ipfw add allow ip from ${goodguys} to any" +.Dl "ipfw add deny ip from ${badguys} to any" +.Dl "... normal policies ..." +.Pp +The +.Nm ipfw1 +syntax would require a separate rule for each IP in the above +example. +.Ss DYNAMIC RULES In order to protect a site from flood attacks involving fake TCP packets, it is safer to use dynamic rules: .Pp @@ -1434,6 +1715,7 @@ .Pp .Dl ipfw divert 5000 ip from 192.168.2.0/24 to any in .Pp +.Ss TRAFFIC SHAPING The following rules show some of the applications of .Nm and @@ -1525,6 +1807,27 @@ .Dl "ipfw add pipe 2 ip from any to 192.168.2.0/24 in" .Dl "ipfw pipe 1 config mask src-ip 0x000000ff bw 200Kbit/s queue 20Kbytes" .Dl "ipfw pipe 2 config mask dst-ip 0x000000ff bw 200Kbit/s queue 20Kbytes" +.Ss SETS OF RULES +To add a set of rules atomically, e.g. set 18: +.Pp +.Dl "ipfw disable set 18" +.Dl "ipfw add NN set 18 ... # repeat as needed" +.Dl "ipfw enable set 18" +.Pp +To delete a set of rules atomically the command is simply: +.Pp +.Dl "ipfw delete set 18" +.Pp +To test a ruleset and disable it and regain control if something goes wrong: +.Pp +.Dl "ipfw disable set 18" +.Dl "ipfw add NN set 18 ... # repeat as needed" +.Dl "ipfw enable set 18 ; echo done; sleep 30 && ipfw disable set 18" +.Pp +Here if everything goes well, you press control-C before the "sleep" +terminates, and your ruleset will be left active. Otherwise, e.g. if +you cannot access your box, the ruleset will be disabled after +the sleep terminates thus restoring the previous situation. .Sh SEE ALSO .Xr cpp 1 , .Xr m4 1 , ==== //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#6 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.9 2002/08/10 15:10:15 luigi Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.10 2002/08/16 10:31:47 luigi Exp $ */ #include @@ -223,6 +223,7 @@ TOK_ICMPTYPES, TOK_PLR, + TOK_NOERROR, TOK_BUCKETS, TOK_DSTIP, TOK_SRCIP, @@ -241,6 +242,7 @@ struct _s_x dummynet_params[] = { { "plr", TOK_PLR }, + { "noerror", TOK_NOERROR }, { "buckets", TOK_BUCKETS }, { "dst-ip", TOK_DSTIP }, { "src-ip", TOK_SRCIP }, @@ -502,8 +504,10 @@ p[1] = b; } else if (*s == ',' || *s == '\0' ) { p[0] = p[1] = a; - } else /* invalid separator */ - break; + } else { /* invalid separator */ + errx(EX_DATAERR, "invalid separator <%c> in <%s>\n", + *s, av); + } av = s+1; } if (i > 0) { @@ -737,17 +741,29 @@ * show_ipfw() prints the body of an ipfw rule. * Because the standard rule has at least proto src_ip dst_ip, we use * a helper function to produce these entries if not provided explicitly. + * + * Special case: if we have provided a MAC header, and no IP specs, + * just leave it alone. + * Also, if we have providea a MAC header and no IP protocol, print it + * as "all" instead of "ip". */ -#define HAVE_PROTO 1 -#define HAVE_SRCIP 2 -#define HAVE_DSTIP 4 -#define HAVE_MAC 8 +#define HAVE_PROTO 0x0001 +#define HAVE_SRCIP 0x0002 +#define HAVE_DSTIP 0x0004 +#define HAVE_MAC 0x0008 +#define HAVE_MACTYPE 0x0010 +#define HAVE_IP (HAVE_PROTO | HAVE_SRCIP | HAVE_DSTIP) static void show_prerequisites(int *flags, int want) { + if ( (*flags & (HAVE_MAC | HAVE_MACTYPE)) == HAVE_MAC) { + printf(" any"); /* MAC type */ + *flags |= HAVE_MACTYPE; + } + if ( !(*flags & HAVE_PROTO) && (want & HAVE_PROTO)) - printf(" ip"); + printf( (*flags & HAVE_MAC) ? " all" : " ip"); if ( !(*flags & HAVE_SRCIP) && (want & HAVE_SRCIP)) printf(" from any"); if ( !(*flags & HAVE_DSTIP) && (want & HAVE_DSTIP)) @@ -907,6 +923,9 @@ break; case O_MAC_TYPE: + if ( (flags & HAVE_MAC) == 0) + printf(" MAC"); + flags |= (HAVE_MAC | HAVE_MACTYPE); print_newports((ipfw_insn_u16 *)cmd, IPPROTO_ETHERTYPE); break; @@ -1340,7 +1359,116 @@ } } +/* + * This one handles all set-related commands + * ipfw set { show | enable | disable } + * ipfw set swap X Y + * ipfw set move X to Y + * ipfw set move rule X to Y + */ static void +sets_handler(int ac, char *av[]) +{ + u_int32_t set_disable, masks[2]; + int i, nbytes; + u_int16_t rulenum; + u_int8_t cmd, new_set; + + ac--; + av++; + + if (!ac) + errx(EX_USAGE, "set needs command"); + if (!strncmp(*av, "show", strlen(*av)) ) { + void *data; + char *msg; + + nbytes = sizeof(struct ip_fw); + if ((data = malloc(nbytes)) == NULL) + err(EX_OSERR, "malloc"); + if (getsockopt(s, IPPROTO_IP, IP_FW_GET, data, &nbytes) < 0) + err(EX_OSERR, "getsockopt(IP_FW_GET)"); + set_disable = (u_int32_t)(((struct ip_fw *)data)->next_rule); + + for (i = 0, msg = "disable" ; i < 31; i++) + if ( (set_disable & (1<>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 7: 5:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D5E637B401; Fri, 16 Aug 2002 07:05:08 -0700 (PDT) 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 4390C37B400 for ; Fri, 16 Aug 2002 07:05:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F37DA43E70 for ; Fri, 16 Aug 2002 07:05:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GE57JU002562 for ; Fri, 16 Aug 2002 07:05:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GE57Rs002509 for perforce@freebsd.org; Fri, 16 Aug 2002 07:05:07 -0700 (PDT) Date: Fri, 16 Aug 2002 07:05:07 -0700 (PDT) Message-Id: <200208161405.g7GE57Rs002509@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16111 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16111 Change 16111 by rwatson@rwatson_tislabs on 2002/08/16 07:04:16 Continue rename of SETLABEL to SETMAC per integ'd change. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libutil/login_class.c#7 edit .. //depot/projects/trustedbsd/mac/usr.bin/su/su.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libutil/login_class.c#7 (text+ko) ==== @@ -377,7 +377,7 @@ } /* Setup the user's MAC label. */ - if (flags & LOGIN_SETLABEL && mac_is_present_np(NULL) == 1) { + if (flags & LOGIN_SETMAC && mac_is_present_np(NULL) == 1) { char *label_string; mac_t label; ==== //depot/projects/trustedbsd/mac/usr.bin/su/su.c#11 (text+ko) ==== @@ -362,12 +362,12 @@ */ setwhat = LOGIN_SETALL & ~(LOGIN_SETENV | LOGIN_SETUMASK | LOGIN_SETLOGIN | LOGIN_SETPATH | LOGIN_SETGROUP | - LOGIN_SETLABEL); + LOGIN_SETMAC); /* * If -s is present, also set the MAC label. */ if (setmaclabel) - setwhat |= LOGIN_SETLABEL; + setwhat |= LOGIN_SETMAC; /* * Don't touch resource/priority settings if -m has been used * or -l and -c hasn't, and we're not su'ing to root. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 7:10:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 008D137B401; Fri, 16 Aug 2002 07:10:15 -0700 (PDT) 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 82FC437B400 for ; Fri, 16 Aug 2002 07:10:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F03843E7B for ; Fri, 16 Aug 2002 07:10:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GEAEJU006505 for ; Fri, 16 Aug 2002 07:10:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GEAEm4006502 for perforce@freebsd.org; Fri, 16 Aug 2002 07:10:14 -0700 (PDT) Date: Fri, 16 Aug 2002 07:10:14 -0700 (PDT) Message-Id: <200208161410.g7GEAEm4006502@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16112 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16112 Change 16112 by rwatson@rwatson_tislabs on 2002/08/16 07:09:59 Add empty mpo_syscall() implementations for mac_none and mac_test, since they do this for all entry points. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#68 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#37 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#68 (text+ko) ==== @@ -98,6 +98,13 @@ } +static int +mac_none_syscall(struct thread *td, int call, void *arg) +{ + + return (0); +} + /* * Label operations. */ @@ -910,6 +917,8 @@ (macop_t)mac_none_destroy }, { MAC_INIT, (macop_t)mac_none_init }, + { MAC_SYSCALL, + (macop_t)mac_none_syscall }, { MAC_INIT_BPFDESC, (macop_t)mac_none_init_bpfdesc }, { MAC_INIT_CRED, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#37 (text+ko) ==== @@ -187,6 +187,13 @@ } +static int +mac_test_syscall(struct thread *td, int call, void *arg) +{ + + return (0); +} + /* * Label operations. */ @@ -1118,6 +1125,8 @@ (macop_t)mac_test_destroy }, { MAC_INIT, (macop_t)mac_test_init }, + { MAC_SYSCALL, + (macop_t)mac_test_syscall }, { MAC_INIT_BPFDESC, (macop_t)mac_test_init_bpfdesc }, { MAC_INIT_CRED, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 7:14:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF84437B401; Fri, 16 Aug 2002 07:14:21 -0700 (PDT) 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 67E2F37B400 for ; Fri, 16 Aug 2002 07:14:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2586E43E4A for ; Fri, 16 Aug 2002 07:14:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GEEKJU007084 for ; Fri, 16 Aug 2002 07:14:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GEEKHH007081 for perforce@freebsd.org; Fri, 16 Aug 2002 07:14:20 -0700 (PDT) Date: Fri, 16 Aug 2002 07:14:20 -0700 (PDT) Message-Id: <200208161414.g7GEEKHH007081@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16113 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16113 Change 16113 by rwatson@rwatson_tislabs on 2002/08/16 07:13:52 Sync minor whitespace/include order nits to the main tree to reduce gratuitous diffs. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#24 (text+ko) ==== @@ -54,12 +54,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include #include @@ -1237,7 +1237,6 @@ if (error) goto locked_error; #endif - if (events & (POLLIN | POLLRDNORM)) if ((rpipe->pipe_state & PIPE_DIRECTW) || (rpipe->pipe_buffer.cnt > 0) || To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 7:15:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD9AA37B406; Fri, 16 Aug 2002 07:15:23 -0700 (PDT) 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 702FE37B405 for ; Fri, 16 Aug 2002 07:15:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E64B743E8A for ; Fri, 16 Aug 2002 07:15:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GEFMJU007134 for ; Fri, 16 Aug 2002 07:15:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GEFMB5007131 for perforce@freebsd.org; Fri, 16 Aug 2002 07:15:22 -0700 (PDT) Date: Fri, 16 Aug 2002 07:15:22 -0700 (PDT) Message-Id: <200208161415.g7GEFMB5007131@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16114 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16114 Change 16114 by rwatson@rwatson_tislabs on 2002/08/16 07:14:56 Remove one more gratuitous whitespace diff between the MAC tree and the main tree. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#25 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#25 (text+ko) ==== @@ -1387,6 +1387,7 @@ cpipe->pipe_state |= PIPE_WANT | PIPE_EOF; msleep(cpipe, PIPE_MTX(cpipe), PRIBIO, "pipecl", 0); } + #ifdef MAC if (cpipe->pipe_label != NULL && cpipe->pipe_peer == NULL) mac_destroy_pipe(cpipe); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 8:35: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05EBC37B401; Fri, 16 Aug 2002 08:35:03 -0700 (PDT) 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 71E4537B400 for ; Fri, 16 Aug 2002 08:35:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1DC4A43E3B for ; Fri, 16 Aug 2002 08:35:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GFZ1JU018747 for ; Fri, 16 Aug 2002 08:35:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GFZ1Pj018744 for perforce@freebsd.org; Fri, 16 Aug 2002 08:35:01 -0700 (PDT) Date: Fri, 16 Aug 2002 08:35:01 -0700 (PDT) Message-Id: <200208161535.g7GFZ1Pj018744@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16117 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16117 Change 16117 by rwatson@rwatson_tislabs on 2002/08/16 08:34:33 Don't set the MAC label in sendmail, instead use the label of the invoking environment. We're not ready to do a multi-level sendmail yet. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#8 (text+ko) ==== @@ -2350,7 +2350,7 @@ if (pwd != NULL) (void) setusercontext(NULL, pwd, pwd->pw_uid, - LOGIN_SETRESOURCES|LOGIN_SETPRIORITY|LOGIN_SETLABEL); + LOGIN_SETRESOURCES|LOGIN_SETPRIORITY); } # endif /* HASSETUSERCONTEXT */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 8:36: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 709BF37B401; Fri, 16 Aug 2002 08:36:04 -0700 (PDT) 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 2D52637B400 for ; Fri, 16 Aug 2002 08:36:04 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DEF2D43E3B for ; Fri, 16 Aug 2002 08:36:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GFa3JU018843 for ; Fri, 16 Aug 2002 08:36:03 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GFa3aD018840 for perforce@freebsd.org; Fri, 16 Aug 2002 08:36:03 -0700 (PDT) Date: Fri, 16 Aug 2002 08:36:03 -0700 (PDT) Message-Id: <200208161536.g7GFa3aD018840@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16118 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16118 Change 16118 by rwatson@rwatson_tislabs on 2002/08/16 08:35:36 Rename LOGIN_SETLABEL to LOGIN_SETMAC. Affected files ... .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#12 edit Differences ... ==== //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#12 (text+ko) ==== @@ -1126,7 +1126,7 @@ #ifdef LOGIN_CAP setusercontext(NULL, getpwuid(0), (uid_t)0, LOGIN_SETPRIORITY|LOGIN_SETRESOURCES|LOGIN_SETUMASK| - LOGIN_SETLABEL); + LOGIN_SETMAC); #endif #ifdef USE_PAM if ((e = pam_setcred(pamh, PAM_DELETE_CRED)) != PAM_SUCCESS) @@ -1389,7 +1389,7 @@ } setusercontext(lc, pw, (uid_t)0, LOGIN_SETLOGIN|LOGIN_SETGROUP|LOGIN_SETPRIORITY| - LOGIN_SETRESOURCES|LOGIN_SETUMASK|LOGIN_SETLABEL); + LOGIN_SETRESOURCES|LOGIN_SETUMASK|LOGIN_SETMAC); #else setlogin(pw->pw_name); (void) initgroups(pw->pw_name, pw->pw_gid); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 10:13:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB3A137B401; Fri, 16 Aug 2002 10:13:09 -0700 (PDT) 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 51F0237B400 for ; Fri, 16 Aug 2002 10:13:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 009FF43E4A for ; Fri, 16 Aug 2002 10:13:09 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GHD8JU035731 for ; Fri, 16 Aug 2002 10:13:08 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GHD8oA035728 for perforce@freebsd.org; Fri, 16 Aug 2002 10:13:08 -0700 (PDT) Date: Fri, 16 Aug 2002 10:13:08 -0700 (PDT) Message-Id: <200208161713.g7GHD8oA035728@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 16121 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16121 Change 16121 by cvance@cvance_laptop on 2002/08/16 10:12:29 Add header file missed with last major commit. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_syscalls.h#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 14:43:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4655337B401; Fri, 16 Aug 2002 14:42:19 -0700 (PDT) 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 E865E37B400 for ; Fri, 16 Aug 2002 14:42:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 821A443E7B for ; Fri, 16 Aug 2002 14:42:17 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GLgHJU075206 for ; Fri, 16 Aug 2002 14:42:17 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GLg5np075132 for perforce@freebsd.org; Fri, 16 Aug 2002 14:42:05 -0700 (PDT) Date: Fri, 16 Aug 2002 14:42:05 -0700 (PDT) Message-Id: <200208162142.g7GLg5np075132@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 16130 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16130 Change 16130 by chris@chris_holly on 2002/08/16 14:41:07 Integ. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributing/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hubs/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pxe/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/branches.pic#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/boot/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/chapters.ent#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/seanc.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/sound/Makefile#2 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/sound/chapter.sgml#4 delete .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-concat.pic#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-mirrored-vol.pic#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-raid10-vol.pic#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-raid5-org.pic#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-simple-vol.pic#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-striped-vol.pic#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/vinum-striped.pic#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/authors.ent#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/backups/chapter.sgml#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/contrib/chapter.sgml#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/hw/chapter.sgml#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/in-progress.sgml#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/adduser1.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/adduser2.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/adduser3.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/boot-mgr.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/console-saver1.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/console-saver2.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/console-saver3.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/console-saver4.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/desktop.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/disklabel-auto.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/disklabel-ed1.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/disklabel-ed2.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/disklabel-fs.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/disklabel-root1.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/disklabel-root2.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/disklabel-root3.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/dist-set.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/dist-set2.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/docmenu1.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/ed0-conf.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/ed0-conf2.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/edit-inetd-conf.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.dot#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.dot#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.dot#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.dot#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.dot#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/fdisk-drive1.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/fdisk-drive2.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/fdisk-edit1.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/fdisk-edit2.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/ftp-anon1.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/ftp-anon2.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/hdwrconf.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/keymap.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/main-doc.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/main-keymap.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/main-options.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/main-std.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/main1.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/mainexit.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/media.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/mouse1.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/mouse2.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/mouse3.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/mouse4.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/mouse5.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/mouse6.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/nfs-server-edit.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/options.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/pkg-cat.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/pkg-confirm.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/pkg-install.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/pkg-sel.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/probstart.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/security.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/sysinstall-exit.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/timezone1.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/timezone2.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/timezone3.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/userconfig.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/userconfig2.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/xf86setup.scr#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/internals/chapter.sgml#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/kernelopts/chapter.sgml#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/policies/chapter.sgml#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/quotas/chapter.sgml#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/staff/chapter.sgml#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/todo.sgml#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/1.png#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/10.png#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/2.png#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/3.png#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/4.png#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/5.png#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/6.png#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/7.png#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/8.png#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/images/callouts/9.png#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/contributors/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/diskless-x/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/fonts/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/ipsec-must/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/articles/multi-os/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/backups/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/basics/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/book.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/kerneldebug/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/linuxemu/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/pgpkeys/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/policies/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/serialcomms/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/sound/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/porters-handbook/freebsd.dsl#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/apply.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/at.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/basename.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/bc.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/biff.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/calendar.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cap_mkdb.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cdcontrol.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/checknr.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chkey.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chmod.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chpass.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/col.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/colcrt.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/colldef.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/colrm.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/comm.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/compress.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/crontab.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/crunchgen.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/crunchide.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ctags.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ctm.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ctm_rmail.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cut.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cvs.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dd.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dig.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dnsquery.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/doscmd.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dtmfdecode.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/du.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ed.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ee.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/enigma.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/expand.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fdformat.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fdwrite.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fetch.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/file.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/find.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/finger.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fmt.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fold.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fontedit.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/from.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/fstat.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/g711conv.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gcore.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/getopt.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/gprof.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/head.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/hexdump.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/host.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/indent.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/info.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/install-info.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/install.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipcrm.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ipcs.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/join.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/jot.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kbdmap.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kcon.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/keylogin.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/keylogout.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/kill.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/killall.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ktrace.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lam.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/last.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lastcomm.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ldd.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/leave.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lex.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/limits.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lint.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ln.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/locate.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lock.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lockf.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/logger.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/login.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/look.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lorder.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lp.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lpq.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lpr.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lprm.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lptest.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ls.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/m4.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mail.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mailq.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/make.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/makeinfo.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/man.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/md5.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/minigzip.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mkdep.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mkdir.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mkfifo.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mkstr.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mktemp.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/msgs.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mt.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ncal.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ncplogin.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ncplogout.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/nice.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/nl.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/objformat.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/od.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/opieinfo.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/opiekey.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/opiepasswd.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pagesize.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/passwd.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/paste.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pax.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_add.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_create.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_delete.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_info.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_sign.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pkg_version.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pr.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/printenv.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/printf.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ps.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pwd.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/quota.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rlogin.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rpcgen.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rs.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rsh.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rtprio.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rup.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ruptime.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/script.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sed.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/send-pr.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sh.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/soelim.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/split.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/startslip.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/su.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/systat.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tail.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/talk.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tar.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tcopy.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tcpslice.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/texindex.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tftp.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/time.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tip.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tr.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/true.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/truss.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tset.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tsort.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tty.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ul.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uname.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/uniq.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/unvis.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/usbhidctl.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/users.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vacation.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vgrind.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vidcontrol.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vis.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vt220keys.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/vttest.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/wall.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/which.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/who.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/whois.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/window.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/write.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/xstr.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/xten.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/yacc.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/yes.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ypcat.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ypmatch.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ypwhich.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/yyfix.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/bind.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/fcntl.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/fork.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/kqueue.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/rfork.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/login.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/make.conf.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/named.conf.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/opieaccess.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/opiekeys.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/printcap.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/ttys.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/firewall.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/groff_mdoc.7#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/ports.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/release.7#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/atacontrol.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/chat.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/comcontrol.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/disklabel.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dump.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fdcontrol.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ffsinfo.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ifconfig.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/intro.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ip6fw.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/kldload.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/loader.4th.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/loader.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/lpc.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mailstats.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mergemaster.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/natd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/nslookup.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ntpd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pam_radius.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pam_ssh.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/picobsd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ppp.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pstat.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pw.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/renice.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/route.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpcinfo.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rtadvd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/savecore.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sendmail.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/setkey.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/smrsh.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sysinstall.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/share/sgml/catalog#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/share/sgml/teams.ent#1 branch .. //depot/projects/trustedbsd/doc/share/sgml/freebsd.ent#3 integrate .. //depot/projects/trustedbsd/doc/share/sgml/man-refs.ent#5 integrate Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributing/article.sgml#3 (text+ko) ==== @@ -14,7 +14,7 @@ Contributing to FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/contributing/article.sgml,v 1.487 2002/07/11 19:07:49 trhodes Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/contributing/article.sgml,v 1.490 2002/08/03 18:59:36 blackend Exp $ This article describes the different ways in which an @@ -107,7 +107,7 @@ - Read the freebsd-questions mailing list and &ng.misc; + Read the &a.questions; and &ng.misc; occasionally (or even regularly). It can be very satisfying to share your expertise and help people solve their problems; sometimes you may even learn something new @@ -119,14 +119,14 @@ Ongoing Programmer Tasks - Most of the tasks listed here require a considerable - investment of time, an in-depth knowledge of the FreeBSD + Most of the tasks listed here require either a considerable + investment of time, or an in-depth knowledge of the FreeBSD kernel, or both. However, there are also many useful tasks which are suitable for weekend hackers. - If you run FreeBSD-current and have a good Internet + If you run FreeBSD-CURRENT and have a good Internet connection, there is a machine current.FreeBSD.org which builds a full release once a day—every now and again, try to @@ -135,7 +135,7 @@ - Read the freebsd-bugs mailing list. There might be a + Read the &a.bugs;. There might be a problem you can comment constructively on or with patches you can test. Or you could even try to fix one of the problems yourself. @@ -143,8 +143,8 @@ If you know of any bug fixes which have been - successfully applied to -current but have not been merged - into -stable after a decent interval (normally a couple of + successfully applied to -CURRENT but have not been merged + into -STABLE after a decent interval (normally a couple of weeks), send the committer a polite reminder. @@ -172,8 +172,8 @@ If you have contributed any ports, send your patches - back to the original author (this will make your life - easier when they bring out the next version) + back to the original authors (this will make your life + easier when they bring out the next version). @@ -235,7 +235,7 @@ technical interest should be mailed to the &a.hackers;. Likewise, people with an interest in such things (and a tolerance for a high volume of mail!) may - subscribe to the hackers mailing list by sending mail to + subscribe to the &a.hackers; by sending mail to &a.majordomo;. See The FreeBSD Handbook for more information about this and @@ -284,7 +284,7 @@ url="../../books/fdp-primer/index.html">FreeBSD Documentation Project Primer for complete instructions. Send submissions and changes (even small ones are welcome!) using - send-pr as described in Bug Reports and General Commentary. @@ -292,18 +292,18 @@ Changes to Existing Source Code - FreeBSD-current + FreeBSD-CURRENT An addition or change to the existing source code is a somewhat trickier affair and depends a lot on how far out of date you are with the current state of FreeBSD development. There is a special on-going release of FreeBSD - known as FreeBSD-current which is made + known as FreeBSD-CURRENT which is made available in a variety of ways for the convenience of developers working actively on the system. See The FreeBSD Handbook for more information about getting and using - FreeBSD-current. + FreeBSD-CURRENT. Working from older sources unfortunately means that your changes may sometimes be too obsolete or too divergent for @@ -315,12 +315,21 @@ Assuming that you can manage to secure fairly up-to-date sources to base your changes on, the next step is to produce a set of diffs to send to the FreeBSD maintainers. This is done with the &man.diff.1; - command, with the context diff form - being preferred. For example: + command. + + The preferred &man.diff.1; format for submitting patches + is the unified output format generated by diff + -u. However, for patches that substantially change a + region of code, a context output format diff generated by + diff -c may be more readable and thus + preferable. diff + + For example: + &prompt.user; diff -c oldfile newfile @@ -329,8 +338,16 @@ &prompt.user; diff -c -r olddir newdir would generate such a set of context diffs for the given - source file or directory hierarchy. See the manual page for - &man.diff.1; for more details. + source file or directory hierarchy. + + Likewise, + &prompt.user; diff -u oldfile newfile + or + &prompt.user; diff -u -r olddir newdir + + would do the same, except in the unified diff format. + + See the manual page for &man.diff.1; for more details. Once you have a set of diffs (which you may test with the &man.patch.1; command), you should submit them for inclusion @@ -359,12 +376,12 @@ distribution or you are simply not ready to release it without a tighter review first, then you should send it to &a.core; directly rather than submitting it with &man.send-pr.1;. The - core mailing list reaches a much smaller group of people who + &a.core; reaches a much smaller group of people who do much of the day-to-day work on FreeBSD. Note that this group is also very busy and so you should only send mail to them where it is truly necessary. - Please refer to &man.intro.9; and &man.style.9; style for + Please refer to &man.intro.9; and &man.style.9; for some information on coding style. We would appreciate it if you were at least aware of this information before submitting code. @@ -426,7 +443,7 @@ work, include the following text at the very beginning of every source code file you wish to protect, replacing the text between the %% with the appropriate - information. + information: Copyright (c) %%proper_years_here%% %%your_name_here%%, %%your_state%% %%your_zip%%. @@ -513,9 +530,9 @@ General purpose hardware such as disk drives, memory - or complete systems should be sent to the FreeBSD, - Inc. address listed in the donating - funds section. + or complete systems should be sent to the FreeBSD + Foundation address listed in the donating + funds section. ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#5 (text+ko) ==== @@ -18,7 +18,7 @@ Contributors to FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.223 2002/07/12 02:59:19 mdodd Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.236 2002/08/15 20:01:12 seanc Exp $ This article lists individuals and organizations who have @@ -530,6 +530,10 @@ + &a.seanc; + + + &a.kjc; @@ -922,6 +926,10 @@ + &a.kan; + + + &a.phk; @@ -994,6 +1002,10 @@ + &a.njl; + + + &a.reg; @@ -1002,6 +1014,10 @@ + &a.leeym; + + + &a.sam; @@ -1626,6 +1642,10 @@ + &a.jennifer; + + + &a.yokota; @@ -2151,7 +2171,7 @@ - Adam Weinberger monkey@crackula.com + Adam Weinberger adam@vectors.cx @@ -2263,10 +2283,6 @@ - Alexander N. Kabaev ak03@gte.com - - - Alexandre Peixoto alexandref@tcoip.com.br @@ -2308,6 +2324,10 @@ + Amar Takhar verm@drunkmonk.net + + + Amir Farah amir@comtrol.com @@ -3611,7 +3631,7 @@ - Gea-Suan Lin gsl@tpts4.seed.net.tw + Gea-Suan Lin gslin@ccca.nctu.edu.tw @@ -4145,10 +4165,6 @@ - Jennifer Yang yangjihui@yahoo.com - - - Jeremy Allison jallison@whistle.com @@ -4742,6 +4758,10 @@ + Landon Fullerlandonf@opendarwin.org + + + Larry Altneu larry@ALR.COM @@ -4767,6 +4787,10 @@ + Lefteris Chatzibarbas lefcha@hellug.gr + + + Leo Kim leo@florida.sarang.net @@ -5043,7 +5067,7 @@ - Matthew Fuller fullermd@futuresouth.com + Matthew Fuller fullermd@over-yonder.net @@ -6477,6 +6501,10 @@ + Steffen Vogelreuter Steffen@Vogelreuter.De + + + Steinar Haug sthaug@nethelp.no @@ -7122,10 +7150,6 @@ - Yen-Ming Lee leeym@bsd.ce.ntu.edu.tw - - - Yen-Shuo Su yssu@CCCA.NCTU.edu.tw ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#2 (text+ko) ==== @@ -22,9 +22,7 @@ Stijn Hoop - $Date$ - - $FreeBSD: doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml,v 1.5 2002/04/10 12:54:25 kuriyama Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml,v 1.7 2002/07/25 17:22:43 fanf Exp $ This article describes the steps I took to setup a CVS repository @@ -183,8 +181,9 @@ checkoutlist - this files lists all files under control of CVS in this - directory. You should edit this to remove some FreeBSD specific - files. + directory, apart from the standard ones created by + cvs init. You should edit this to remove + some FreeBSD-specific files. @@ -196,18 +195,20 @@ commitcheck - this script is invoked - directly from CVS. It first checks if - the committer has access to the specified part of the tree, and - then runs commit_prep.pl for the various - pre-commit checks. If those are OK, CVS - will allow the commit to proceed. You should not have to touch - this file. + directly from CVS. It first checks + if the committer has access to the specified part of the tree + using cvs_acls.pl, and then runs + commit_prep.pl for the various pre-commit + checks. If those are OK, CVS will + allow the commit to proceed. You should not have to touch this + file. commitinfo - this file is used by CVS to determine which script to run - before a commit. You should not have to touch this file. + before a commit—in this case commitcheck. + You should not have to touch this file. @@ -238,63 +239,76 @@ CVS to enable or disable keyword expansion, or whether a file should be considered binary. You can edit this as you wish. More information about this file - is available in the CVS manual. + is available in the CVS manual. + Note that the -t and -f + options don't work correctly with client/server + CVS. edithook - this file is not used - any more, but kept for historic reasons. You should not have to - touch this file. + any more, but kept for historic reasons. You can safely + remove this file. editinfo - CVS uses this file for editor overrides. FreeBSD does not use this - functionality, as parsing the log message is done in the - verifymsg and logcheck - files. You should not have to touch this file. + functionality, as parsing the log message is done by + verifymsg and logcheck. + This is because the editinfo + functionality doesn't work properly with remote commits, or ones + that use the -m or -F + options. You should not have to touch this file. exclude - this file lists regular - expressions that are used to determine files which cannot contain a - revision header. In the FreeBSD setup, all files under revision - control need to have a revision header (like - $FreeBSD$). All filenames that match one of the lines - in this file are exempted from this check. You should add - expressions to this file as you checkin files that cannot have a - revision header. For the purpose of installing the scripts, it - may be best to exclude CVSROOT/ from header - checks. + expressions that are used by commit_prep.pl + to determine files which cannot contain a revision header. In the + FreeBSD setup, all files under revision control need to have a + revision header (like $FreeBSD$). All filenames that + match one of the lines in this file are exempted from this check. + You should add expressions to this file as you checkin files that + cannot have a revision header. For the purpose of installing the + scripts, it may be best to exclude CVSROOT/ + from header checks. - log_accum.pl - this is a script that - takes the log message as provided by the - logcheck script, and appends it to a log file - in the repository for backup purposes. It also handles mailing out a - message to an email address you provide (in - cfg_local.pm). You should not have to touch - this file. + log_accum.pl - this is a script that takes + the log message as provided by the logcheck + script, and appends it to a log file in the repository for backup + purposes. It also handles mailing out a message to an email address + you provide (in cfg_local.pm). It hooks into + CVS via loginfo. + You should not have to touch this file. logcheck - this file parses the commit log message that committers provide, and attempts to sanitize it - somewhat. + somewhat. It hooks into CVS via + verifymsg. You should not have to touch + this file. This script depends on a local FreeBSD hack of CVS: this version reads the log message back in after this script has modified it. The stock version of - CVS apparently does not, which would - make this script useless. + CVS does not do this which makes + logcheck unable to clean up the log message, + although it is still able to check that it is syntactically + OK. CVS 1.11.2 can be configured to + have the same behaviour as FreeBSD's version by setting + RereadLogAfterVerify=always in the + config file. loginfo - this file is used by CVS to control where log - information is sent. You should not have to touch this - file. + information is sent; log_accum.pl hooks + in here. You should not have to touch this file. @@ -315,7 +329,8 @@ options - this file is specific to - the FreeBSD version of CVS. It contains + the FreeBSD version of CVS, and is + also supported by the Debian version. It contains the keyword to expand in revision headers. You should alter this to >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 14:43:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38C4137B405; Fri, 16 Aug 2002 14:43:20 -0700 (PDT) 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 92DBF37B400 for ; Fri, 16 Aug 2002 14:43:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4ED5143E77 for ; Fri, 16 Aug 2002 14:43:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GLhJJU076206 for ; Fri, 16 Aug 2002 14:43:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GLhIWY076200 for perforce@freebsd.org; Fri, 16 Aug 2002 14:43:18 -0700 (PDT) Date: Fri, 16 Aug 2002 14:43:18 -0700 (PDT) Message-Id: <200208162143.g7GLhIWY076200@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16131 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16131 Change 16131 by rwatson@rwatson_tislabs on 2002/08/16 14:42:22 When printing the result of pointer arithmetic, use %#lx rather than %d. For some reason this didn't break axp build, but did break sparc64. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#247 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#247 (text+ko) ==== @@ -2201,7 +2201,7 @@ revokeperms = vme->max_protection & ~result; if (!revokeperms) continue; - printf("pid %d: revoking %s perms from %#lx:%d " + printf("pid %d: revoking %s perms from %#lx:%#lx " "(max %s/cur %s)\n", td->td_proc->p_pid, prot2str(revokeperms), vme->start, vme->end - vme->start, prot2str(vme->max_protection), prot2str(vme->protection)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 14:46:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC0B137B401; Fri, 16 Aug 2002 14:45:23 -0700 (PDT) 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 49BC637B400 for ; Fri, 16 Aug 2002 14:45:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70CC543E42 for ; Fri, 16 Aug 2002 14:45:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GLjMJU078023 for ; Fri, 16 Aug 2002 14:45:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GLjLg9078005 for perforce@freebsd.org; Fri, 16 Aug 2002 14:45:21 -0700 (PDT) Date: Fri, 16 Aug 2002 14:45:21 -0700 (PDT) Message-Id: <200208162145.g7GLjLg9078005@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16132 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16132 Change 16132 by rwatson@rwatson_tislabs on 2002/08/16 14:44:28 Integ main tree to trustedbsd base -- various changes, but in particular trickle MAC_DEBUG back in from its commit to the main tree. Affected files ... .. //depot/projects/trustedbsd/base/include/arpa/inet.h#7 integrate .. //depot/projects/trustedbsd/base/include/ctype.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/disklabel.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/iswctype.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/disklabel/disklabel.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#11 integrate .. //depot/projects/trustedbsd/base/share/misc/pci_vendors#11 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#10 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket2.c#19 integrate .. //depot/projects/trustedbsd/base/usr.bin/mklocale/lex.l#3 integrate Differences ... ==== //depot/projects/trustedbsd/base/include/arpa/inet.h#7 (text+ko) ==== @@ -50,7 +50,7 @@ * * @(#)inet.h 8.1 (Berkeley) 6/2/93 * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $ - * $FreeBSD: src/include/arpa/inet.h,v 1.23 2002/08/14 20:40:35 robert Exp $ + * $FreeBSD: src/include/arpa/inet.h,v 1.24 2002/08/16 16:34:26 mike Exp $ */ #ifndef _ARPA_INET_H_ @@ -77,30 +77,30 @@ #define _UINT32_T_DECLARED #endif -#ifndef _IN_ADDR_T_DECLARED +#ifndef _IN_ADDR_T_DECLARED typedef uint32_t in_addr_t; #define _IN_ADDR_T_DECLARED #endif -#ifndef _IN_PORT_T_DECLARED +#ifndef _IN_PORT_T_DECLARED typedef uint16_t in_port_t; #define _IN_PORT_T_DECLARED #endif -#ifndef _POSIX_SOURCE -#ifdef _BSD_SIZE_T_ +#if __BSD_VISIBLE +#ifdef _BSD_SIZE_T_ typedef _BSD_SIZE_T_ size_t; -#undef _BSD_SIZE_T_ +#undef _BSD_SIZE_T_ +#endif #endif -#endif /* !_POSIX_SOURCE */ /* * XXX socklen_t is used by a POSIX.1-2001 interface, but not required by * POSIX.1-2001. */ -#ifdef _BSD_SOCKLEN_T_ +#ifdef _BSD_SOCKLEN_T_ typedef _BSD_SOCKLEN_T_ socklen_t; -#undef _BSD_SOCKLEN_T_ +#undef _BSD_SOCKLEN_T_ #endif #ifndef _STRUCT_IN_ADDR_DECLARED @@ -139,9 +139,9 @@ in_addr_t inet_addr(const char *); char *inet_ntoa(struct in_addr); -const char *inet_ntop(int, const void *__restrict, char *__restrict, - socklen_t); -int inet_pton(int, const char *__restrict, void *__restrict); +const char *inet_ntop(int, const void * __restrict, char * __restrict, + socklen_t); +int inet_pton(int, const char * __restrict, void * __restrict); #if __BSD_VISIBLE int ascii2addr(int, const char *, void *); ==== //depot/projects/trustedbsd/base/include/ctype.h#4 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/include/ctype.h,v 1.18 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/ctype.h,v 1.19 2002/08/16 13:42:59 keichii Exp $ */ #ifndef _CTYPE_H_ @@ -65,6 +65,12 @@ #define _CTYPE_I 0x00080000L /* Ideogram */ #define _CTYPE_T 0x00100000L /* Special */ #define _CTYPE_Q 0x00200000L /* Phonogram */ +#define _CTYPE_SWM 0xe0000000L /* Mask to get screen width data */ +#define _CTYPE_SWS 30 /* Bits to shift to get width */ +#define _CTYPE_SW0 0x20000000L /* 0 width character */ +#define _CTYPE_SW1 0x00000000L /* 1 width character / default*/ +#define _CTYPE_SW2 0x80000000L /* 2 width character */ +#define _CTYPE_SW3 0xc0000000L /* 3 width character */ __BEGIN_DECLS int isalnum(int); ==== //depot/projects/trustedbsd/base/lib/libc/gen/disklabel.c#5 (text+ko) ==== @@ -35,10 +35,11 @@ static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 5/3/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/disklabel.c,v 1.15 2002/05/12 20:49:33 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/disklabel.c,v 1.16 2002/08/16 15:33:20 bmilekic Exp $"); #include #define DKTYPENAMES +#define FSTYPENAMES #include #include ==== //depot/projects/trustedbsd/base/lib/libc/locale/iswctype.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.1 2002/08/05 10:45:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.2 2002/08/16 13:45:23 keichii Exp $"); #include @@ -211,3 +211,13 @@ { return (__toupper(wc)); } + +#undef wcwidth +int +wcwidth(wc) + wchar_t wc; +{ + int width = (unsigned)__maskrune((wc), _CTYPE_SWM) >> _CTYPE_SWS; + return width ? width : iswprint(wc); +} + ==== //depot/projects/trustedbsd/base/sbin/disklabel/disklabel.c#8 (text+ko) ==== @@ -54,13 +54,14 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/disklabel/disklabel.c,v 1.56 2002/07/03 16:43:11 markm Exp $"); +__FBSDID("$FreeBSD: src/sbin/disklabel/disklabel.c,v 1.57 2002/08/16 16:08:35 bmilekic Exp $"); #include #include #include #include #define DKTYPENAMES +#define FSTYPENAMES #include #ifdef __sparc64__ #include ==== //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#11 (text+ko) ==== @@ -36,11 +36,12 @@ static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.36 2002/08/16 07:34:19 alfred Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.37 2002/08/16 16:08:36 bmilekic Exp $"; #endif /* not lint */ #include #include +#define FSTYPENAMES #include #include #include ==== //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#11 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.106 2002/08/16 10:31:47 luigi Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.107 2002/08/16 14:27:22 luigi Exp $ .\" .de NOIPFW .br @@ -81,11 +81,33 @@ firewall, which we will call .Nm ipfw1 when it is necessary to distinguish between the two. +.Pp +.Nm ipfw2 +is standard in +.Fx +CURRENT, whereas +.Fx +STABLE still uses +.Nm ipfw1 +unless the kernel is compiled with +.Cm options IPFW2 , +and +.Nm /sbin/ipfw +and +.Nm /usr/lib/libalias +are recompiled with +.Cm -DIPFW2 +and reinstalled (the same effect can be achieved by adding +.Cm IPFW2=TRUE +to +.Nm /etc/make.conf +before a buildworld). +.Pp See the .Sx IPFW2 ENHANCEMENTS Section for a list of features which are not present in .Nm ipfw1 . -This list can also be useful to revise your ruleset and +This list can also be useful to revise your rules and write them more efficiently. .Pp An @@ -1466,12 +1488,36 @@ .Sh SYSCTL VARIABLES A set of .Xr sysctl 8 -variables controls the behaviour of the firewall. +variables controls the behaviour of the firewall and +associated modules ( +.Nm dummynet, bridge +). These are shown below together with their default value (but always check with the .Xr sysctl 8 command what value is actually in use) and meaning: .Bl -tag -width indent +.It Em net.inet.ip.dummynet.expire : No 1 +Lazily delete dynamic pipes/queue once they have no pending traffic. +You can disable this by setting the variable to 0, in which case +the pipes/queues will only be deleted when the threshold is reached. +.It Em net.inet.ip.dummynet.hash_size : No 64 +Default size of the hash table used for dynamic pipes/queues. +This value is used when no +.Cm buckets +option is specified when configuring a pipe/queue. +.It Em net.inet.ip.dummynet.max_chain_len : No 16 +Target value for the maximum number of pipes/queues in a hash bucket. +The product +.Cm max_chain_len*hash_size +is used to determine the threshold over which empty pipes/queues +will be expired even when +.Cm net.inet.ip.dummynet.expire=0 . +.It net.inet.ip.dummynet.red_lookup_depth : No 256 +.It net.inet.ip.dummynet.red_avg_pkt_size : No 512 +.It net.inet.ip.dummynet.red_max_pkt_size : No 1500 +Parameters used in the computations of the drop probability +for the RED algorithm. .It Em net.inet.ip.fw.autoinc_step : No 100 Delta beween rule numbers when auto-generating them. The value must be in the range 1..1000. @@ -1483,7 +1529,7 @@ .Nm . .It Em net.inet.ip.fw.dyn_buckets : No 256 The number of buckets in the hash table for dynamic rules. -Must be a power of 2, up to 1^^20. +Must be a power of 2, up to 65536. It only takes effect when all dynamic rules have expired, so you are advised to use a .Cm flush @@ -1559,7 +1605,19 @@ .Nm ipfw1 does not supports address sets (those in the form .Ar addr/masklen{num,num,...} -) +). +.Pp +A minor difference between +.Nm ipfw1 +and +.Nm ipfw2 +is that the former allows addresses to be specified as +.Ar ipno:mask +where the mask can be an arbitrary bitmask instead of +a countiguous set of bits. +.Nm ipfw2 +no longer supports this syntax though it would be trivial +to reintroduce it as it is supported on the kernel side. .It Port specifications .Nm ipfw1 only allows one port range when specifying TCP and UDP ports, and @@ -1576,12 +1634,20 @@ you can put port specifications in rules matching all packets, and the match will be attempted only on those packets carrying protocols which include port identifiers. +.Pp +Finally, +.Nm ipfw1 +allowed the first port entry to be specified as +.Ar port:mask +where +.Ar mask +can be an arbitrary 16-bit mask. +This syntax is of questionable usefulness and it is not +supported anymore in +.Nm ipfw2 . .It Or-blocks .Nm ipfw1 -does not support Or-blocks. All match operators are implicitly -connected by -.Cm and -operators. +does not support Or-blocks. .It keepalives .Nm ipfw1 does not generate keepalives for stateful sessions. @@ -1600,6 +1666,19 @@ The sysctl variable .Em net.link.ether.ipfw has no effect there. +.It Options +The following options are not supported in +.Nm ipfw1 +(RELENG_4) +rules: +.Pp +.Cm layer2, ipid, iplen, ipprecedence, iptos, ipttl, +.Cm ipversion, tcpack, tcpseq, tcpwin . +.It Dummynet options +The following option for +.Nm dummynet +pipes/queues is not supported: +.Cm noerror . .El .Sh EXAMPLES There are far too many possible uses of @@ -1870,9 +1949,11 @@ .%O "RFC 2309" .Re .Sh BUGS -The syntax has grown over the years and it is not very clean. +The syntax has grown over the years and sometimes it might be confusing. +Unfortunately, backward compatibility prevents cleaning up mistakes +done in the definition of the syntax. .Pp -.Em WARNING +.Em !!! WARNING !!! .Pp Misconfiguring the firewall can put your computer in an unusable state, possibly shutting down network services and requiring console access to @@ -1925,3 +2006,5 @@ .Fx 2.2.8 . Stateful extensions were introduced in .Fx 4.0 . +.Nm ipfw2 +was introduced in Summer 2002. ==== //depot/projects/trustedbsd/base/share/misc/pci_vendors#11 (text+ko) ==== @@ -1,4 +1,4 @@ -; $FreeBSD: src/share/misc/pci_vendors,v 1.18 2002/07/09 11:50:14 sheldonh Exp $ +; $FreeBSD: src/share/misc/pci_vendors,v 1.19 2002/08/16 14:55:51 sheldonh Exp $ ; ; Automatically generated by src/tools/tools/pciid/mk_pci_vendors.pl ; (with the -l option), using the following source lists: @@ -118,7 +118,7 @@ 0013 53C875A PCI to Ultra SCSI Controller 0020 53C1010-33 PCI to Dual Channel Ultra3 SCSI Ctrlr 0021 53C1000/1010-66 PCI to Ultra160 SCSI Controller - 0030 53C1030 PCI-X SCSI Controller + 0030 53C1020/1030 PCI-X to Ultra320 SCSI Controller 0031 53C1030ZC PCI-X SCSI Controller 0035 53C1035 PCI-X SCSI Controller 0040 53C1035 PCI-X SCSI Controller @@ -382,7 +382,7 @@ 1204 CL-GD7541 Nordic-lite VGA Cntrlr 4400 CL-CD4400 Communications Controller 6001 Crystal CS4610/11 SoundFusion PCI Audio Accelerator - 6003 Crystal CS4614/22/24 SoundFusion PCI Audio Accelerator + 6003 Crystal CS4614/22/24/30 SoundFusion PCI Audio Accelerator 6004 Crystal CS4615 SoundFusion PCI Audio Accelerator 6005 Crystal CS4281 SoundFusion PCI Audio Accelerator 1014 International Business Machines Corp. @@ -645,6 +645,7 @@ 0520 MGA-G200B Eclipse/Calao 0521 MGA-G200B Chipset (AGP) 0525 MGA-G400/450 Chipset + 0527 Parhelia AGP 0D10 MGA-I Athena (Ultima/Impression board) 1000 MGA-G100 Chipset PCI 1001 MGA-G100 Twister AGP @@ -786,6 +787,7 @@ 103C Hewlett-Packard Company 1005 A4977A Visialize EG 1008 Donner GFX + 100A hpVisualizeFX Hewlett-Packard VisualizeFX Series Video 1028 Tachyon TL Fibre Channel Adapter 1029 HPFC-5200B Tachyon XL2 Fibre Channel Adapter 102A Tach TS Tachyon TS Fibre Channel Host Adapter @@ -807,6 +809,9 @@ 121A NetServer SMIC Controller 121B NetServer Legacy COM Port Decoder 121C NetServer PCI COM Port Decoder + 1229 zx1 System Bus Adapter + 122A zx1 I/O Controller + 122B zx1 Local Bus Adapter 2910 E2910A PCI Bus Exerciser 2920 Fast Host Interface 2924 E2924A PCI Host Interface Adapter @@ -931,6 +936,7 @@ AC40 PCI4450 PC card CardBus Controller AC41 PCI4410 PC card CardBus Controller AC42 PCI4451 PC card CardBus Controller + AC44 PC card & Integrated 1394a-2000 OHCI 2 port PHY/Link Layer Ctrlr AC50 PCI1410 PC card cardBus Controller AC51 PCI1420 PC card CardBus Controller AC52 PCI1451 PC card CardBus Controller @@ -955,14 +961,14 @@ 104F Co-Time Computer Ltd. 104F iatca8392 Multi I/O 1050 Winbond Electronics Corp. - 0000 W6692CF Ethernet Cntrlr + 0000 Ethernet Controller (NE2000 compatible) 0001 W83769F Ethernet Adapter 0105 W82C105 Ethernet Adapter 0628 W83628F/629D PCI to ISA Bridge Set 0840 W89C840F 100/10Mbps Ethernet Controller 0940 W89C940 NE2000-Compatible Ethernet Adapter 5A5A W89C940F ELANC-PCI Twisted-pair Ether-LAN Ctrlr - 6692 W6692A/CF PCI ISDN S/T Controller + 6692 W6692/92A/92CF PCI BusISDN S/T-Controller 9922 W9922PF ISDN Controller 9960 W9960CF Video Codec 9961 W9961CF H.263/H.261 Video Codec @@ -976,7 +982,7 @@ 0001 PCI Bridge 0002 PCI Bus Controller 3505 SH7751 SuperH (SH) 32-Bit RISC MCU/MPU Series -1055 SMSC (Was EFAR Microsystems; bought out in 1996) +1055 SMSC (Was: EFAR Microsystems; bought out in 1996) 0810 EFAR 486 Host Bridge 0922 Pentium/p54c host Bridge 0926 EFAR PCI to ISA Bridge @@ -997,6 +1003,7 @@ 1801 DSP56301 24-bit Digital Signal Processor 1802 DSP56305 24-Bit Digital Signal Processor 18C0 MPC8265A/66 PowerQUICC II PCI Bridge + 3421 56IVMR/Phoenix 56ISMR Modem 4801 Raven PowerPC Chipset 4802 Falcon 4803 Hawk @@ -1010,15 +1017,15 @@ 105A Promise Technology 0D30 PDC20265 FastTrak100 Lite/Ultra100 EIDE Controller 0D38 PDC20263 FastTrak66 EIDE Controller - 1275 PDC20275 FastTrak TX EIDE Controller + 1275 PDC20275 FastTrack TX EIDE Controller 4D30 PDC20267 FastTrack100/Ultra100 EIDE Controller - 4D33 PDC20246 FastTrak/Ultra33 EIDE Controller + 4D33 PDC20246 FastTrak Ultra ATA RAID controller 4D38 PDC20262 FastTrak66/Ultra66 EIDE Controller 4D68 PDC20268 Ultra100 TX2 EIDE Controller 4D69 PDC20269 Ultra133 TX2 EIDE Controller 5275 PDC20276 Ultra133 TX2/FastTrak TX Lite EIDE Controller 5300 DC5300 EIDE Controller - 6268 PDC20268R FastTrak100 TX2/TX4/LP EIDE Controller + 6268 PDC20268R FastTrak100 TX2/TX4/LP EIDE controller 6269 PDC20271 FastTrak TX2000 EIDE controller 7275 PDC20277 FastTrak TX/SBFastTrak133 Lite EIDE Controller 105B Foxconn International @@ -1220,9 +1227,10 @@ 1087 Cache Computer 1088 Microcomputer Systems (M) Son 1089 Data General Corporation -108A Bit3 Computer +108A SBS Technologie (Was: Bit3 Computer) 0001 Model 617 PCI-VME Bus Adapter 0010 Model 618 VME Bridge + 0040 dataBLIZZARD 3000 Model 2106 VME Bridge 108C Elonex PLC c/o Oakleigh Systems Inc. 108D Olicom @@ -1646,6 +1654,7 @@ 2002 MB86606 Fast Wide SCSI Controller 2005 MB86974 10/100 Fast Ethernet Adapter 200C MB86974 IEEE1394 OpenHCI Controller + 2010 OHCI FireWire Controller 2011 MPEG2 R-Engine (MPEG2 Hardware Encoder) 10D0 Fujitsu Limited 10D1 FuturePlus Systems @@ -1721,7 +1730,7 @@ 0179 NV17M GeForce4 440 Go 64M 017A Quadro4 200/400NVS [[NV17GL.2] 017B Quadro4 550XGL [[NV17GL.3] - 017C NV17M-GL + 017C NV17M-GL Quadro4 500 GoGL 01A0 GeForce2 [Crush11] Integrated Graphics 01A4 nForce AGP Controller 01A5 nForce AGP Controller @@ -1899,7 +1908,7 @@ 8938 EV1938 Sound 1103 HighPoint Technologies Inc. 0003 HPT343/5/6,HPT363 UDMA EIDE Controller - 0004 HPT366/8/70 UDMA66/100 EIDE Controller + 0004 HPT366/368/370/372 UDMA66/100 EIDE Controller 0005 HPT370 UDMA/ATA 100 EIDE Controller 0006 HPT302 UDMA/ATA133 EIDE Controller 0007 HPT371 UDMA/ATA133 EIDE Controller @@ -1907,9 +1916,9 @@ 1104 Rasterops 1105 Sigma Designs Inc. 5000 Multimedia - 8300 REALmagic Hollywood Plus MPEG2 DVD Decoder + 8300 EM8300 MPEG-2 Decoder (REALmagic Hollywood Plus) 8400 EM8400 MPEG-2 Decoder - 8475 em8475 ISO MPEG 1/2/4 Decoder Card for Video & Audio + 8475 EM8475 MPEG-1/2/4 Decoder Card for Video & Audio 1106 VIA Technologies Inc 0130 VT6305 VIA Fire 1394.A OHCI Link Layer Ctrlr 0305 VT8363/5 KT133/KM133 System Controller @@ -1959,7 +1968,7 @@ 3109 VT8233C PCI to ISA Bridge 3112 VT8361 Apollo KLE133 System Controller 3113 PCI to PCI Bridge - 3116 CPU-to-PCI Bridge + 3116 Apollo KM266 System Controller 3128 VT8753 Apollo P4X266 System Controller 3133 VT3133 CPU to PCI Bridge 3147 VT8233 PCI to ISA Bridge @@ -2378,6 +2387,7 @@ 0211 OSB4 PCI EIDE Controller 0212 CSB5 PCI EIDE Controller 0220 OSB4 OpenHCI Compliant USB Controller + 0225 CSB5 PCI Bridge 0230 PCI to ISA Bridge 1167 Mutoh Industries Inc 1168 Thine Electronics Inc @@ -2438,6 +2448,7 @@ 0476 RL5C476 II CardBus controller 0477 RL5c477 CardBus Controller 0478 RL5c478 CardBus Controller + 0521 R5C521 1394 Host Controller 0551 IEEE1394 Controller 0552 RL5c552 IEEE-1394 Controller 1181 Telmatics International @@ -2446,10 +2457,10 @@ 1185 Dataworld International Ltd 8929 EIDE Controller 1186 D-Link System Inc - 0100 DC21041 Ethernet Adapter + 0100 DEC DC21041-Based Ethernet Adapter 1002 DFE-550TX Fast Ethernet Adapter - 1100 Fast Ethernet Adapter - 1300 DFE-530TX+ Fast Ethernet Adapter (DL 10038C Chipset) + 1100 DFE-??? Fast Ethernet Adapter + 1300 DFE-530TX+/538TX Fast Ethernet Adapter (DL 10038C Chipset) 1340 DFE-690TXD CardBus PC Card 1561 DRP-32TXD CardBus PC Card 4000 DL2K Ethernet @@ -2594,7 +2605,7 @@ 11BE International Microcircuits Inc 11BF Astrodesign Inc. 11C0 Hewlett-Packard -11C1 Lucent/Agere Systems (Was AT&T MicroElectronics) +11C1 Lucent/Agere Systems (Was: AT&T MicroElectronics) 0440 LT Winmodem 56k Data+Fax+Voice+DSVD 0441 LT Winmodem 56k Data+Fax 0442 1646T00 V.90 Lucent Modem @@ -2609,10 +2620,10 @@ 044B LT Winmodem 044C LT Winmodem 044D LT Winmodem - 044E lucent 1646T00 + 044E lucent 1646T00 LT WinModem 56k Data+Fax 044F 90094-1 LT V.90+DSL WildFire Modem 0450 1456VQH19R-1(INT) LT Winmodem 56K - 0451 LT Winmodem + 0451 LT Winmodem LT WinModem 56k Data+Fax+Voice+DSVD 0452 LT Winmodem 0453 LT Winmodem 0454 LT Winmodem @@ -2834,7 +2845,7 @@ 122D Aztech System Ltd 1206 368DSP 4201 MR2800W AMR 56K modem - 50DC 3328 Audio + 50DC PCI168/3328 Audio Device 80DA 3328 Audio 122E Xyratex 122F Andrew Corp. @@ -2931,10 +2942,12 @@ 199B ES1983 Maestro-3.COMM ES56CVM-PI PCI oice+Fax Modem 2808 ES336H PCI Fax Modem (later model) 2838 ES2838/2839 SuperLink Modem - 2898 ES2898 ES56-PI Family V.90 PCI Modem + 2843 ES2838/2839 SuperLink-MLP Voice Modem + 2847 ES2838/2839 SuperLink-MLP 10 Voice Modem + 2898 ES2898S TelDrive ES56T-PI family V.90 PCI modem 125E Specialvideo Engineering SRL 125F Concurrent Technologies Inc. -1260 Intersil Americas Inc (Was Harris Semiconductor) +1260 Intersil Americas Inc (Was: Harris Semiconductor) 3873 ISL3874A PRISMII.5 IEE802.11B Wireless LAN 8130 HMP8130 NTSC/PAL Video Decoder 8131 HMP8131 NTSC/PAL Video Decoder @@ -2974,6 +2987,7 @@ 1274 Ensoniq (Creative) 1274 5880 multimedia audio device 1371 ES1371, ES1373 AudioPCI + 1373 ES1373 Sound Blaster Audio(PCI) 5000 ES1370 AudioPCI 5880 5880 AudioPCI 1275 Network Appliance Corp @@ -3755,7 +3769,7 @@ 1449 TUT Systems Inc 144A ADLINK Technology Inc 7248 PCI-7248 - 7250 PCI-7250 + 7250 PCI-7250 PLX PCI9052 7296 PCI-7296 7432 PCI-7432 7433 PCI-7433 @@ -3934,6 +3948,7 @@ E001 VScom PCI-010HV2 1 x Printer Controler E010 VScom PCI-100HV2 1 x RS-232 Controller E020 VScom PCI-200HV2 2 x RS-232 Controller + FFFF VScom Dummy Controller 14D3 Cirtech (UK) Ltd 14D4 Panacom Technology Corporation 0400 Panacom 7 Interface chip @@ -4018,7 +4033,7 @@ 14F1 Conexant Systems, Inc. 1002 3251 HCF 56k Modem 1003 HCF 56k Modem - 1004 11242-11 HCF 56k Modem + 1004 11242-11 HCF 56k Modem FCCID=H4TFM-PIB3PC 1005 HCF 56k Modem 1006 HCF 56k Modem 1022 HCF 56k Modem @@ -4591,6 +4606,7 @@ 1678 INH Semiconductor 1679 Tokyo Electron Device Ltd. 168A Utimaco Safeware AG +168F KDS Innotech Corp. 16AE SafeNet Inc. 16CA Cenatek Inc. 0001 Rocket Drive Solid State Disk @@ -4891,14 +4907,15 @@ 0962 80960RM/RN i960RM/RN Microprocessor/Bridge 0964 80960RP i960 RP Microprocessor Bridge 1000 82542 PRO/1000 Gigabit Server Adapter - 1001 82543GC 10/100/1000 Ethernet Controller + 1001 82543 PRO/1000 F Gigabit Ethernet Adapter 1002 Pro 100 LAN+Modem 56 CardBus II - 1004 82543 PRO/1000 Gigabit Server Adapter - 1008 82544 PRO/1000 Gigabit Ethernet Controller - 1009 82544 PRO/1000 Gigabit Ethernet Controller - 100C 82544GC Gigabit Ethernet Controller + 1004 82543 PRO/1000 T Gigabit Server Adapter + 1008 82544 PRO/1000 XT Gigabit Ethernet Controller + 1009 82544 PRO/1000 XF Gigabit Ethernet Controller + 100C 82544 T Desktop Gigabit Ethernet Controller 100D 82544GC based Gigabit Ethernet Controller - 100E 82544XT PRO/1000 MT Desktop Adapter + 100E 82540EM Gigabit Ethernet Controller + 1010 82546EB Dual Gigabit Ethernet Controller 1015 82540EM PRO/1000 MT Mobile Connection 1029 82559 Fast Ethernet PCI/CardBus Controller 1030 82559 PCI Networking device @@ -4913,6 +4930,7 @@ 103A 82801DB (ICH4) LAN Controller with 82562ET/EZ (CNR) PHY 103B 82801DB (ICH4) LAN Controller with 82562EM/EX PHY 103C 82801DB (ICH4) LAN Controller with 82562EM/EX (CNR) PHY + 1040 536EP V.92 PCI Modem 1100 82815 815/E (Solano) Host to I/O Hub Bridge with 100MHz DRAM Controller 1101 82815 815/E (Solano) PCI to AGP Bridge 1102 82815 815/E (Solano) Internal GUI Accelerator @@ -5057,6 +5075,7 @@ 3580 Montara GM Chipset 3584 Montara GM Chipset 3585 Montara GM Chipset + 4000 Creatix V.90 HaM Modem 5001 PRO/DSL 2100 Modem - PPP 5005 PRO/DSL 2200 Modem - PPPoA 5200 EtherExpress PRO/100 Server PCI to PCI Bridge @@ -5109,11 +5128,13 @@ 84C5 82453KX/GX 450KX/GX Memory Controller (Orion) 84CA 82451NX 450NX PCIset Memory & I/O Controller 84CB 82454NX/82467GX 450NX PCI Expander Bridge - 84E0 82461GX System Address controller - 84E1 82462GX System Data Controller - 84E2 82465GX Graphics Expander Bridge - 84E3 82463GX Memory Address Controller - 84E4 82464GX Memory Data Controller + 84E0 82460GX 460GX System Address Controller + 84E1 82460GX 460GX System Data Controller + 84E2 82460GX 460GX AGP Bridge (GXB Function 2) + 84E3 82460GX 460GX Memory Address Controller + 84E4 82460GX 460GX Memory Data Controller + 84E6 82466GX 460GX Wide and fast PCI eXpander Bridge + 84EA 82460GX 460GX AGP Bridge (GXB Function 1) 9620 I2O RAID PCI to PCI Bridge 9621 SRCU21 I2O 1.5 RAID Controller (F/W<6.0) 9622 SRCUxx I2O 1.5 RAID Controller (F/W<6.0) @@ -5272,6 +5293,9 @@ 031C Gunboat x4 Pro Quad PCI Serial Port Controller (High speed) 041C Ironcad x8 Octal PCI Serial Port Controller (Standard speed) 051C Ironcad x8 Pro Octal PCI Serial Port Controller (High speed) + 061C IC 138 PCI + 081C Dreadnought x16 Pro + 091C Dreadnought x16 Lite B1B3 Shiva Europe Ltd. B894 Brown & Sharpe Mfg. Co. C001 TSI Telsys @@ -5325,8 +5349,9 @@ A0B1 ARK2000MI+ GUI Accelerator F5F5 F5 Networks Inc. FA57 Fast Search & Transfer ASA + 0001 PMC Pattern Matching Chip FEBD Ultraview Corp. -FEDA Epigram Inc +FEDA Broadcom (Was: Epigram Inc; Bought out in 1999) A0FA BCM4210 OEM Chip for 10meg/s over phone line FFFE VMWare Inc (Older Product Versions) 0710 Virtual SVGA ==== //depot/projects/trustedbsd/base/sys/conf/NOTES#10 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1063 2002/08/12 21:25:06 joe Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1064 2002/08/16 14:21:37 rwatson Exp $ # # @@ -729,6 +729,7 @@ # Support for Mandatory Access Control (MAC) #options MAC +#options MAC_DEBUG #options MAC_NONE # Statically link mac_none policy ==== //depot/projects/trustedbsd/base/sys/conf/options#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.342 2002/08/09 20:54:06 sos Exp $ +# $FreeBSD: src/sys/conf/options,v 1.343 2002/08/16 14:21:38 rwatson Exp $ # # On the handling of kernel options # @@ -125,6 +125,7 @@ # Support for Mandatory Access Control (MAC) MAC opt_mac.h +MAC_DEBUG opt_mac.h MAC_NONE opt_dontuse.h # Do we want the config file compiled into the kernel? ==== //depot/projects/trustedbsd/base/sys/kern/kern_event.c#11 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_event.c,v 1.43 2002/08/16 12:51:57 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_event.c,v 1.44 2002/08/16 14:12:40 rwatson Exp $ */ #include @@ -802,7 +802,7 @@ /*ARGSUSED*/ static int kqueue_poll(struct file *fp, int events, struct ucred *active_cred, - struct thread *td) + struct thread *td) { struct kqueue *kq; int revents = 0; @@ -824,7 +824,7 @@ /*ARGSUSED*/ static int kqueue_stat(struct file *fp, struct stat *st, struct ucred *active_cred, - struct thread *td) + struct thread *td) { struct kqueue *kq; ==== //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_mac.c,v 1.7 2002/08/15 18:51:26 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_mac.c,v 1.8 2002/08/16 14:21:37 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -167,6 +167,7 @@ &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " "copy-on-write semantics, or by removing all write access"); +#ifdef MAC_DEBUG static unsigned int nmacmbufs, nmaccreds, nmacifnets, nmacbpfdescs, nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, nmacipqs, nmacpipes; @@ -192,6 +193,7 @@ &nmacvnodes, 0, "number of vnodes in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, devfsdirents, CTLFLAG_RD, &nmacdevfsdirents, 0, "number of devfs dirents inuse"); +#endif static int error_select(int error1, int error2); static int mac_externalize(struct label *label, struct mac *mac); @@ -1248,7 +1250,9 @@ /* "how" is one of M_(TRY|DONT)WAIT */ mac_init_label(&m->m_pkthdr.label); MAC_PERFORM(init_mbuf, m, how, &m->m_pkthdr.label); +#ifdef MAC_DEBUG atomic_add_int(&nmacmbufs, 1); +#endif return (0); } @@ -1258,7 +1262,9 @@ MAC_PERFORM(destroy_mbuf, m, &m->m_pkthdr.label); mac_destroy_label(&m->m_pkthdr.label); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacmbufs, 1); +#endif } void @@ -1267,7 +1273,9 @@ mac_init_label(&cr->cr_label); MAC_PERFORM(init_cred, cr, &cr->cr_label); +#ifdef MAC_DEBUG atomic_add_int(&nmaccreds, 1); +#endif } void @@ -1276,7 +1284,9 @@ MAC_PERFORM(destroy_cred, cr, &cr->cr_label); mac_destroy_label(&cr->cr_label); +#ifdef MAC_DEBUG atomic_subtract_int(&nmaccreds, 1); +#endif } void @@ -1285,7 +1295,9 @@ mac_init_label(&ifp->if_label); MAC_PERFORM(init_ifnet, ifp, &ifp->if_label); +#ifdef MAC_DEBUG atomic_add_int(&nmacifnets, 1); +#endif } void @@ -1294,7 +1306,9 @@ MAC_PERFORM(destroy_ifnet, ifp, &ifp->if_label); mac_destroy_label(&ifp->if_label); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacifnets, 1); +#endif } void @@ -1303,7 +1317,9 @@ mac_init_label(&ipq->ipq_label); MAC_PERFORM(init_ipq, ipq, &ipq->ipq_label); +#ifdef MAC_DEBUG atomic_add_int(&nmacipqs, 1); +#endif } void @@ -1312,7 +1328,9 @@ MAC_PERFORM(destroy_ipq, ipq, &ipq->ipq_label); mac_destroy_label(&ipq->ipq_label); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacipqs, 1); +#endif } void @@ -1323,7 +1341,9 @@ mac_init_label(&socket->so_peerlabel); MAC_PERFORM(init_socket, socket, &socket->so_label, &socket->so_peerlabel); +#ifdef MAC_DEBUG atomic_add_int(&nmacsockets, 1); +#endif } void @@ -1334,7 +1354,9 @@ &socket->so_peerlabel); mac_destroy_label(&socket->so_label); mac_destroy_label(&socket->so_peerlabel); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacsockets, 1); +#endif } void @@ -1347,7 +1369,9 @@ pipe->pipe_label = label; pipe->pipe_peer->pipe_label = label; MAC_PERFORM(init_pipe, pipe, pipe->pipe_label); +#ifdef MAC_DEBUG atomic_add_int(&nmacpipes, 1); +#endif } void @@ -1357,7 +1381,9 @@ MAC_PERFORM(destroy_pipe, pipe, pipe->pipe_label); mac_destroy_label(pipe->pipe_label); free(pipe->pipe_label, M_MACPIPELABEL); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacpipes, 1); +#endif } void @@ -1366,7 +1392,9 @@ mac_init_label(&bpf_d->bd_label); MAC_PERFORM(init_bpfdesc, bpf_d, &bpf_d->bd_label); +#ifdef MAC_DEBUG atomic_add_int(&nmacbpfdescs, 1); +#endif } void @@ -1375,7 +1403,9 @@ MAC_PERFORM(destroy_bpfdesc, bpf_d, &bpf_d->bd_label); mac_destroy_label(&bpf_d->bd_label); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacbpfdescs, 1); +#endif } void @@ -1385,7 +1415,9 @@ mac_init_label(&mp->mnt_mntlabel); mac_init_label(&mp->mnt_fslabel); MAC_PERFORM(init_mount, mp, &mp->mnt_mntlabel, &mp->mnt_fslabel); +#ifdef MAC_DEBUG atomic_add_int(&nmacmounts, 1); +#endif } void @@ -1395,7 +1427,9 @@ MAC_PERFORM(destroy_mount, mp, &mp->mnt_mntlabel, &mp->mnt_fslabel); mac_destroy_label(&mp->mnt_fslabel); mac_destroy_label(&mp->mnt_mntlabel); +#ifdef MAC_DEBUG atomic_subtract_int(&nmacmounts, 1); +#endif } static void @@ -1404,7 +1438,9 @@ mac_init_label(label); MAC_PERFORM(init_temp, label); +#ifdef MAC_DEBUG atomic_add_int(&nmactemp, 1); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 14:49:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E2F537B401; Fri, 16 Aug 2002 14:48:28 -0700 (PDT) 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 1433D37B400 for ; Fri, 16 Aug 2002 14:48:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E1A743E72 for ; Fri, 16 Aug 2002 14:48:27 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GLmRJU078958 for ; Fri, 16 Aug 2002 14:48:27 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GLmQBX078949 for perforce@freebsd.org; Fri, 16 Aug 2002 14:48:26 -0700 (PDT) Date: Fri, 16 Aug 2002 14:48:26 -0700 (PDT) Message-Id: <200208162148.g7GLmQBX078949@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16133 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16133 Change 16133 by rwatson@rwatson_tislabs on 2002/08/16 14:47:44 Integ trustedbsd_base to trustedbsd_mac, in particular trickle back in the MAC_DEBUG change from its commit to the main tree. Affected files ... .. //depot/projects/trustedbsd/mac/include/arpa/inet.h#7 integrate .. //depot/projects/trustedbsd/mac/include/ctype.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/disklabel.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/iswctype.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/setup.c#11 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#10 integrate .. //depot/projects/trustedbsd/mac/share/misc/pci_vendors#11 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#15 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#25 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#248 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#25 integrate .. //depot/projects/trustedbsd/mac/usr.bin/mklocale/lex.l#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac/include/arpa/inet.h#7 (text+ko) ==== @@ -50,7 +50,7 @@ * * @(#)inet.h 8.1 (Berkeley) 6/2/93 * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $ - * $FreeBSD: src/include/arpa/inet.h,v 1.23 2002/08/14 20:40:35 robert Exp $ + * $FreeBSD: src/include/arpa/inet.h,v 1.24 2002/08/16 16:34:26 mike Exp $ */ #ifndef _ARPA_INET_H_ @@ -77,30 +77,30 @@ #define _UINT32_T_DECLARED #endif -#ifndef _IN_ADDR_T_DECLARED +#ifndef _IN_ADDR_T_DECLARED typedef uint32_t in_addr_t; #define _IN_ADDR_T_DECLARED #endif -#ifndef _IN_PORT_T_DECLARED +#ifndef _IN_PORT_T_DECLARED typedef uint16_t in_port_t; #define _IN_PORT_T_DECLARED #endif -#ifndef _POSIX_SOURCE -#ifdef _BSD_SIZE_T_ +#if __BSD_VISIBLE +#ifdef _BSD_SIZE_T_ typedef _BSD_SIZE_T_ size_t; -#undef _BSD_SIZE_T_ +#undef _BSD_SIZE_T_ +#endif #endif -#endif /* !_POSIX_SOURCE */ /* * XXX socklen_t is used by a POSIX.1-2001 interface, but not required by * POSIX.1-2001. */ -#ifdef _BSD_SOCKLEN_T_ +#ifdef _BSD_SOCKLEN_T_ typedef _BSD_SOCKLEN_T_ socklen_t; -#undef _BSD_SOCKLEN_T_ +#undef _BSD_SOCKLEN_T_ #endif #ifndef _STRUCT_IN_ADDR_DECLARED @@ -139,9 +139,9 @@ in_addr_t inet_addr(const char *); char *inet_ntoa(struct in_addr); -const char *inet_ntop(int, const void *__restrict, char *__restrict, - socklen_t); -int inet_pton(int, const char *__restrict, void *__restrict); +const char *inet_ntop(int, const void * __restrict, char * __restrict, + socklen_t); +int inet_pton(int, const char * __restrict, void * __restrict); #if __BSD_VISIBLE int ascii2addr(int, const char *, void *); ==== //depot/projects/trustedbsd/mac/include/ctype.h#4 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/include/ctype.h,v 1.18 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/ctype.h,v 1.19 2002/08/16 13:42:59 keichii Exp $ */ #ifndef _CTYPE_H_ @@ -65,6 +65,12 @@ #define _CTYPE_I 0x00080000L /* Ideogram */ #define _CTYPE_T 0x00100000L /* Special */ #define _CTYPE_Q 0x00200000L /* Phonogram */ +#define _CTYPE_SWM 0xe0000000L /* Mask to get screen width data */ +#define _CTYPE_SWS 30 /* Bits to shift to get width */ +#define _CTYPE_SW0 0x20000000L /* 0 width character */ +#define _CTYPE_SW1 0x00000000L /* 1 width character / default*/ +#define _CTYPE_SW2 0x80000000L /* 2 width character */ +#define _CTYPE_SW3 0xc0000000L /* 3 width character */ __BEGIN_DECLS int isalnum(int); ==== //depot/projects/trustedbsd/mac/lib/libc/gen/disklabel.c#5 (text+ko) ==== @@ -35,10 +35,11 @@ static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 5/3/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/disklabel.c,v 1.15 2002/05/12 20:49:33 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/disklabel.c,v 1.16 2002/08/16 15:33:20 bmilekic Exp $"); #include #define DKTYPENAMES +#define FSTYPENAMES #include #include ==== //depot/projects/trustedbsd/mac/lib/libc/locale/iswctype.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.1 2002/08/05 10:45:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.2 2002/08/16 13:45:23 keichii Exp $"); #include @@ -211,3 +211,13 @@ { return (__toupper(wc)); } + +#undef wcwidth +int +wcwidth(wc) + wchar_t wc; +{ + int width = (unsigned)__maskrune((wc), _CTYPE_SWM) >> _CTYPE_SWS; + return width ? width : iswprint(wc); +} + ==== //depot/projects/trustedbsd/mac/sbin/disklabel/disklabel.c#8 (text+ko) ==== @@ -54,13 +54,14 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/disklabel/disklabel.c,v 1.56 2002/07/03 16:43:11 markm Exp $"); +__FBSDID("$FreeBSD: src/sbin/disklabel/disklabel.c,v 1.57 2002/08/16 16:08:35 bmilekic Exp $"); #include #include #include #include #define DKTYPENAMES +#define FSTYPENAMES #include #ifdef __sparc64__ #include ==== //depot/projects/trustedbsd/mac/sbin/fsck_ffs/setup.c#11 (text+ko) ==== @@ -36,11 +36,12 @@ static const char sccsid[] = "@(#)setup.c 8.10 (Berkeley) 5/9/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.36 2002/08/16 07:34:19 alfred Exp $"; + "$FreeBSD: src/sbin/fsck_ffs/setup.c,v 1.37 2002/08/16 16:08:36 bmilekic Exp $"; #endif /* not lint */ #include #include +#define FSTYPENAMES #include #include #include ==== //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#10 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.106 2002/08/16 10:31:47 luigi Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.107 2002/08/16 14:27:22 luigi Exp $ .\" .de NOIPFW .br @@ -81,11 +81,33 @@ firewall, which we will call .Nm ipfw1 when it is necessary to distinguish between the two. +.Pp +.Nm ipfw2 +is standard in +.Fx +CURRENT, whereas +.Fx +STABLE still uses +.Nm ipfw1 +unless the kernel is compiled with +.Cm options IPFW2 , +and +.Nm /sbin/ipfw +and +.Nm /usr/lib/libalias +are recompiled with +.Cm -DIPFW2 +and reinstalled (the same effect can be achieved by adding +.Cm IPFW2=TRUE +to +.Nm /etc/make.conf +before a buildworld). +.Pp See the .Sx IPFW2 ENHANCEMENTS Section for a list of features which are not present in .Nm ipfw1 . -This list can also be useful to revise your ruleset and +This list can also be useful to revise your rules and write them more efficiently. .Pp An @@ -1466,12 +1488,36 @@ .Sh SYSCTL VARIABLES A set of .Xr sysctl 8 -variables controls the behaviour of the firewall. +variables controls the behaviour of the firewall and +associated modules ( +.Nm dummynet, bridge +). These are shown below together with their default value (but always check with the .Xr sysctl 8 command what value is actually in use) and meaning: .Bl -tag -width indent +.It Em net.inet.ip.dummynet.expire : No 1 +Lazily delete dynamic pipes/queue once they have no pending traffic. +You can disable this by setting the variable to 0, in which case +the pipes/queues will only be deleted when the threshold is reached. +.It Em net.inet.ip.dummynet.hash_size : No 64 +Default size of the hash table used for dynamic pipes/queues. +This value is used when no +.Cm buckets +option is specified when configuring a pipe/queue. +.It Em net.inet.ip.dummynet.max_chain_len : No 16 +Target value for the maximum number of pipes/queues in a hash bucket. +The product +.Cm max_chain_len*hash_size +is used to determine the threshold over which empty pipes/queues +will be expired even when +.Cm net.inet.ip.dummynet.expire=0 . +.It net.inet.ip.dummynet.red_lookup_depth : No 256 +.It net.inet.ip.dummynet.red_avg_pkt_size : No 512 +.It net.inet.ip.dummynet.red_max_pkt_size : No 1500 +Parameters used in the computations of the drop probability +for the RED algorithm. .It Em net.inet.ip.fw.autoinc_step : No 100 Delta beween rule numbers when auto-generating them. The value must be in the range 1..1000. @@ -1483,7 +1529,7 @@ .Nm . .It Em net.inet.ip.fw.dyn_buckets : No 256 The number of buckets in the hash table for dynamic rules. -Must be a power of 2, up to 1^^20. +Must be a power of 2, up to 65536. It only takes effect when all dynamic rules have expired, so you are advised to use a .Cm flush @@ -1559,7 +1605,19 @@ .Nm ipfw1 does not supports address sets (those in the form .Ar addr/masklen{num,num,...} -) +). +.Pp +A minor difference between +.Nm ipfw1 +and +.Nm ipfw2 +is that the former allows addresses to be specified as +.Ar ipno:mask +where the mask can be an arbitrary bitmask instead of +a countiguous set of bits. +.Nm ipfw2 +no longer supports this syntax though it would be trivial +to reintroduce it as it is supported on the kernel side. .It Port specifications .Nm ipfw1 only allows one port range when specifying TCP and UDP ports, and @@ -1576,12 +1634,20 @@ you can put port specifications in rules matching all packets, and the match will be attempted only on those packets carrying protocols which include port identifiers. +.Pp +Finally, +.Nm ipfw1 +allowed the first port entry to be specified as +.Ar port:mask +where +.Ar mask +can be an arbitrary 16-bit mask. +This syntax is of questionable usefulness and it is not +supported anymore in +.Nm ipfw2 . .It Or-blocks .Nm ipfw1 -does not support Or-blocks. All match operators are implicitly -connected by -.Cm and -operators. +does not support Or-blocks. .It keepalives .Nm ipfw1 does not generate keepalives for stateful sessions. @@ -1600,6 +1666,19 @@ The sysctl variable .Em net.link.ether.ipfw has no effect there. +.It Options +The following options are not supported in +.Nm ipfw1 +(RELENG_4) +rules: +.Pp +.Cm layer2, ipid, iplen, ipprecedence, iptos, ipttl, +.Cm ipversion, tcpack, tcpseq, tcpwin . +.It Dummynet options +The following option for +.Nm dummynet +pipes/queues is not supported: +.Cm noerror . .El .Sh EXAMPLES There are far too many possible uses of @@ -1870,9 +1949,11 @@ .%O "RFC 2309" .Re .Sh BUGS -The syntax has grown over the years and it is not very clean. +The syntax has grown over the years and sometimes it might be confusing. +Unfortunately, backward compatibility prevents cleaning up mistakes +done in the definition of the syntax. .Pp -.Em WARNING +.Em !!! WARNING !!! .Pp Misconfiguring the firewall can put your computer in an unusable state, possibly shutting down network services and requiring console access to @@ -1925,3 +2006,5 @@ .Fx 2.2.8 . Stateful extensions were introduced in .Fx 4.0 . +.Nm ipfw2 +was introduced in Summer 2002. ==== //depot/projects/trustedbsd/mac/share/misc/pci_vendors#11 (text+ko) ==== @@ -1,4 +1,4 @@ -; $FreeBSD: src/share/misc/pci_vendors,v 1.18 2002/07/09 11:50:14 sheldonh Exp $ +; $FreeBSD: src/share/misc/pci_vendors,v 1.19 2002/08/16 14:55:51 sheldonh Exp $ ; ; Automatically generated by src/tools/tools/pciid/mk_pci_vendors.pl ; (with the -l option), using the following source lists: @@ -118,7 +118,7 @@ 0013 53C875A PCI to Ultra SCSI Controller 0020 53C1010-33 PCI to Dual Channel Ultra3 SCSI Ctrlr 0021 53C1000/1010-66 PCI to Ultra160 SCSI Controller - 0030 53C1030 PCI-X SCSI Controller + 0030 53C1020/1030 PCI-X to Ultra320 SCSI Controller 0031 53C1030ZC PCI-X SCSI Controller 0035 53C1035 PCI-X SCSI Controller 0040 53C1035 PCI-X SCSI Controller @@ -382,7 +382,7 @@ 1204 CL-GD7541 Nordic-lite VGA Cntrlr 4400 CL-CD4400 Communications Controller 6001 Crystal CS4610/11 SoundFusion PCI Audio Accelerator - 6003 Crystal CS4614/22/24 SoundFusion PCI Audio Accelerator + 6003 Crystal CS4614/22/24/30 SoundFusion PCI Audio Accelerator 6004 Crystal CS4615 SoundFusion PCI Audio Accelerator 6005 Crystal CS4281 SoundFusion PCI Audio Accelerator 1014 International Business Machines Corp. @@ -645,6 +645,7 @@ 0520 MGA-G200B Eclipse/Calao 0521 MGA-G200B Chipset (AGP) 0525 MGA-G400/450 Chipset + 0527 Parhelia AGP 0D10 MGA-I Athena (Ultima/Impression board) 1000 MGA-G100 Chipset PCI 1001 MGA-G100 Twister AGP @@ -786,6 +787,7 @@ 103C Hewlett-Packard Company 1005 A4977A Visialize EG 1008 Donner GFX + 100A hpVisualizeFX Hewlett-Packard VisualizeFX Series Video 1028 Tachyon TL Fibre Channel Adapter 1029 HPFC-5200B Tachyon XL2 Fibre Channel Adapter 102A Tach TS Tachyon TS Fibre Channel Host Adapter @@ -807,6 +809,9 @@ 121A NetServer SMIC Controller 121B NetServer Legacy COM Port Decoder 121C NetServer PCI COM Port Decoder + 1229 zx1 System Bus Adapter + 122A zx1 I/O Controller + 122B zx1 Local Bus Adapter 2910 E2910A PCI Bus Exerciser 2920 Fast Host Interface 2924 E2924A PCI Host Interface Adapter @@ -931,6 +936,7 @@ AC40 PCI4450 PC card CardBus Controller AC41 PCI4410 PC card CardBus Controller AC42 PCI4451 PC card CardBus Controller + AC44 PC card & Integrated 1394a-2000 OHCI 2 port PHY/Link Layer Ctrlr AC50 PCI1410 PC card cardBus Controller AC51 PCI1420 PC card CardBus Controller AC52 PCI1451 PC card CardBus Controller @@ -955,14 +961,14 @@ 104F Co-Time Computer Ltd. 104F iatca8392 Multi I/O 1050 Winbond Electronics Corp. - 0000 W6692CF Ethernet Cntrlr + 0000 Ethernet Controller (NE2000 compatible) 0001 W83769F Ethernet Adapter 0105 W82C105 Ethernet Adapter 0628 W83628F/629D PCI to ISA Bridge Set 0840 W89C840F 100/10Mbps Ethernet Controller 0940 W89C940 NE2000-Compatible Ethernet Adapter 5A5A W89C940F ELANC-PCI Twisted-pair Ether-LAN Ctrlr - 6692 W6692A/CF PCI ISDN S/T Controller + 6692 W6692/92A/92CF PCI BusISDN S/T-Controller 9922 W9922PF ISDN Controller 9960 W9960CF Video Codec 9961 W9961CF H.263/H.261 Video Codec @@ -976,7 +982,7 @@ 0001 PCI Bridge 0002 PCI Bus Controller 3505 SH7751 SuperH (SH) 32-Bit RISC MCU/MPU Series -1055 SMSC (Was EFAR Microsystems; bought out in 1996) +1055 SMSC (Was: EFAR Microsystems; bought out in 1996) 0810 EFAR 486 Host Bridge 0922 Pentium/p54c host Bridge 0926 EFAR PCI to ISA Bridge @@ -997,6 +1003,7 @@ 1801 DSP56301 24-bit Digital Signal Processor 1802 DSP56305 24-Bit Digital Signal Processor 18C0 MPC8265A/66 PowerQUICC II PCI Bridge + 3421 56IVMR/Phoenix 56ISMR Modem 4801 Raven PowerPC Chipset 4802 Falcon 4803 Hawk @@ -1010,15 +1017,15 @@ 105A Promise Technology 0D30 PDC20265 FastTrak100 Lite/Ultra100 EIDE Controller 0D38 PDC20263 FastTrak66 EIDE Controller - 1275 PDC20275 FastTrak TX EIDE Controller + 1275 PDC20275 FastTrack TX EIDE Controller 4D30 PDC20267 FastTrack100/Ultra100 EIDE Controller - 4D33 PDC20246 FastTrak/Ultra33 EIDE Controller + 4D33 PDC20246 FastTrak Ultra ATA RAID controller 4D38 PDC20262 FastTrak66/Ultra66 EIDE Controller 4D68 PDC20268 Ultra100 TX2 EIDE Controller 4D69 PDC20269 Ultra133 TX2 EIDE Controller 5275 PDC20276 Ultra133 TX2/FastTrak TX Lite EIDE Controller 5300 DC5300 EIDE Controller - 6268 PDC20268R FastTrak100 TX2/TX4/LP EIDE Controller + 6268 PDC20268R FastTrak100 TX2/TX4/LP EIDE controller 6269 PDC20271 FastTrak TX2000 EIDE controller 7275 PDC20277 FastTrak TX/SBFastTrak133 Lite EIDE Controller 105B Foxconn International @@ -1220,9 +1227,10 @@ 1087 Cache Computer 1088 Microcomputer Systems (M) Son 1089 Data General Corporation -108A Bit3 Computer +108A SBS Technologie (Was: Bit3 Computer) 0001 Model 617 PCI-VME Bus Adapter 0010 Model 618 VME Bridge + 0040 dataBLIZZARD 3000 Model 2106 VME Bridge 108C Elonex PLC c/o Oakleigh Systems Inc. 108D Olicom @@ -1646,6 +1654,7 @@ 2002 MB86606 Fast Wide SCSI Controller 2005 MB86974 10/100 Fast Ethernet Adapter 200C MB86974 IEEE1394 OpenHCI Controller + 2010 OHCI FireWire Controller 2011 MPEG2 R-Engine (MPEG2 Hardware Encoder) 10D0 Fujitsu Limited 10D1 FuturePlus Systems @@ -1721,7 +1730,7 @@ 0179 NV17M GeForce4 440 Go 64M 017A Quadro4 200/400NVS [[NV17GL.2] 017B Quadro4 550XGL [[NV17GL.3] - 017C NV17M-GL + 017C NV17M-GL Quadro4 500 GoGL 01A0 GeForce2 [Crush11] Integrated Graphics 01A4 nForce AGP Controller 01A5 nForce AGP Controller @@ -1899,7 +1908,7 @@ 8938 EV1938 Sound 1103 HighPoint Technologies Inc. 0003 HPT343/5/6,HPT363 UDMA EIDE Controller - 0004 HPT366/8/70 UDMA66/100 EIDE Controller + 0004 HPT366/368/370/372 UDMA66/100 EIDE Controller 0005 HPT370 UDMA/ATA 100 EIDE Controller 0006 HPT302 UDMA/ATA133 EIDE Controller 0007 HPT371 UDMA/ATA133 EIDE Controller @@ -1907,9 +1916,9 @@ 1104 Rasterops 1105 Sigma Designs Inc. 5000 Multimedia - 8300 REALmagic Hollywood Plus MPEG2 DVD Decoder + 8300 EM8300 MPEG-2 Decoder (REALmagic Hollywood Plus) 8400 EM8400 MPEG-2 Decoder - 8475 em8475 ISO MPEG 1/2/4 Decoder Card for Video & Audio + 8475 EM8475 MPEG-1/2/4 Decoder Card for Video & Audio 1106 VIA Technologies Inc 0130 VT6305 VIA Fire 1394.A OHCI Link Layer Ctrlr 0305 VT8363/5 KT133/KM133 System Controller @@ -1959,7 +1968,7 @@ 3109 VT8233C PCI to ISA Bridge 3112 VT8361 Apollo KLE133 System Controller 3113 PCI to PCI Bridge - 3116 CPU-to-PCI Bridge + 3116 Apollo KM266 System Controller 3128 VT8753 Apollo P4X266 System Controller 3133 VT3133 CPU to PCI Bridge 3147 VT8233 PCI to ISA Bridge @@ -2378,6 +2387,7 @@ 0211 OSB4 PCI EIDE Controller 0212 CSB5 PCI EIDE Controller 0220 OSB4 OpenHCI Compliant USB Controller + 0225 CSB5 PCI Bridge 0230 PCI to ISA Bridge 1167 Mutoh Industries Inc 1168 Thine Electronics Inc @@ -2438,6 +2448,7 @@ 0476 RL5C476 II CardBus controller 0477 RL5c477 CardBus Controller 0478 RL5c478 CardBus Controller + 0521 R5C521 1394 Host Controller 0551 IEEE1394 Controller 0552 RL5c552 IEEE-1394 Controller 1181 Telmatics International @@ -2446,10 +2457,10 @@ 1185 Dataworld International Ltd 8929 EIDE Controller 1186 D-Link System Inc - 0100 DC21041 Ethernet Adapter + 0100 DEC DC21041-Based Ethernet Adapter 1002 DFE-550TX Fast Ethernet Adapter - 1100 Fast Ethernet Adapter - 1300 DFE-530TX+ Fast Ethernet Adapter (DL 10038C Chipset) + 1100 DFE-??? Fast Ethernet Adapter + 1300 DFE-530TX+/538TX Fast Ethernet Adapter (DL 10038C Chipset) 1340 DFE-690TXD CardBus PC Card 1561 DRP-32TXD CardBus PC Card 4000 DL2K Ethernet @@ -2594,7 +2605,7 @@ 11BE International Microcircuits Inc 11BF Astrodesign Inc. 11C0 Hewlett-Packard -11C1 Lucent/Agere Systems (Was AT&T MicroElectronics) +11C1 Lucent/Agere Systems (Was: AT&T MicroElectronics) 0440 LT Winmodem 56k Data+Fax+Voice+DSVD 0441 LT Winmodem 56k Data+Fax 0442 1646T00 V.90 Lucent Modem @@ -2609,10 +2620,10 @@ 044B LT Winmodem 044C LT Winmodem 044D LT Winmodem - 044E lucent 1646T00 + 044E lucent 1646T00 LT WinModem 56k Data+Fax 044F 90094-1 LT V.90+DSL WildFire Modem 0450 1456VQH19R-1(INT) LT Winmodem 56K - 0451 LT Winmodem + 0451 LT Winmodem LT WinModem 56k Data+Fax+Voice+DSVD 0452 LT Winmodem 0453 LT Winmodem 0454 LT Winmodem @@ -2834,7 +2845,7 @@ 122D Aztech System Ltd 1206 368DSP 4201 MR2800W AMR 56K modem - 50DC 3328 Audio + 50DC PCI168/3328 Audio Device 80DA 3328 Audio 122E Xyratex 122F Andrew Corp. @@ -2931,10 +2942,12 @@ 199B ES1983 Maestro-3.COMM ES56CVM-PI PCI oice+Fax Modem 2808 ES336H PCI Fax Modem (later model) 2838 ES2838/2839 SuperLink Modem - 2898 ES2898 ES56-PI Family V.90 PCI Modem + 2843 ES2838/2839 SuperLink-MLP Voice Modem + 2847 ES2838/2839 SuperLink-MLP 10 Voice Modem + 2898 ES2898S TelDrive ES56T-PI family V.90 PCI modem 125E Specialvideo Engineering SRL 125F Concurrent Technologies Inc. -1260 Intersil Americas Inc (Was Harris Semiconductor) +1260 Intersil Americas Inc (Was: Harris Semiconductor) 3873 ISL3874A PRISMII.5 IEE802.11B Wireless LAN 8130 HMP8130 NTSC/PAL Video Decoder 8131 HMP8131 NTSC/PAL Video Decoder @@ -2974,6 +2987,7 @@ 1274 Ensoniq (Creative) 1274 5880 multimedia audio device 1371 ES1371, ES1373 AudioPCI + 1373 ES1373 Sound Blaster Audio(PCI) 5000 ES1370 AudioPCI 5880 5880 AudioPCI 1275 Network Appliance Corp @@ -3755,7 +3769,7 @@ 1449 TUT Systems Inc 144A ADLINK Technology Inc 7248 PCI-7248 - 7250 PCI-7250 + 7250 PCI-7250 PLX PCI9052 7296 PCI-7296 7432 PCI-7432 7433 PCI-7433 @@ -3934,6 +3948,7 @@ E001 VScom PCI-010HV2 1 x Printer Controler E010 VScom PCI-100HV2 1 x RS-232 Controller E020 VScom PCI-200HV2 2 x RS-232 Controller + FFFF VScom Dummy Controller 14D3 Cirtech (UK) Ltd 14D4 Panacom Technology Corporation 0400 Panacom 7 Interface chip @@ -4018,7 +4033,7 @@ 14F1 Conexant Systems, Inc. 1002 3251 HCF 56k Modem 1003 HCF 56k Modem - 1004 11242-11 HCF 56k Modem + 1004 11242-11 HCF 56k Modem FCCID=H4TFM-PIB3PC 1005 HCF 56k Modem 1006 HCF 56k Modem 1022 HCF 56k Modem @@ -4591,6 +4606,7 @@ 1678 INH Semiconductor 1679 Tokyo Electron Device Ltd. 168A Utimaco Safeware AG +168F KDS Innotech Corp. 16AE SafeNet Inc. 16CA Cenatek Inc. 0001 Rocket Drive Solid State Disk @@ -4891,14 +4907,15 @@ 0962 80960RM/RN i960RM/RN Microprocessor/Bridge 0964 80960RP i960 RP Microprocessor Bridge 1000 82542 PRO/1000 Gigabit Server Adapter - 1001 82543GC 10/100/1000 Ethernet Controller + 1001 82543 PRO/1000 F Gigabit Ethernet Adapter 1002 Pro 100 LAN+Modem 56 CardBus II - 1004 82543 PRO/1000 Gigabit Server Adapter - 1008 82544 PRO/1000 Gigabit Ethernet Controller - 1009 82544 PRO/1000 Gigabit Ethernet Controller - 100C 82544GC Gigabit Ethernet Controller + 1004 82543 PRO/1000 T Gigabit Server Adapter + 1008 82544 PRO/1000 XT Gigabit Ethernet Controller + 1009 82544 PRO/1000 XF Gigabit Ethernet Controller + 100C 82544 T Desktop Gigabit Ethernet Controller 100D 82544GC based Gigabit Ethernet Controller - 100E 82544XT PRO/1000 MT Desktop Adapter + 100E 82540EM Gigabit Ethernet Controller + 1010 82546EB Dual Gigabit Ethernet Controller 1015 82540EM PRO/1000 MT Mobile Connection 1029 82559 Fast Ethernet PCI/CardBus Controller 1030 82559 PCI Networking device @@ -4913,6 +4930,7 @@ 103A 82801DB (ICH4) LAN Controller with 82562ET/EZ (CNR) PHY 103B 82801DB (ICH4) LAN Controller with 82562EM/EX PHY 103C 82801DB (ICH4) LAN Controller with 82562EM/EX (CNR) PHY + 1040 536EP V.92 PCI Modem 1100 82815 815/E (Solano) Host to I/O Hub Bridge with 100MHz DRAM Controller 1101 82815 815/E (Solano) PCI to AGP Bridge 1102 82815 815/E (Solano) Internal GUI Accelerator @@ -5057,6 +5075,7 @@ 3580 Montara GM Chipset 3584 Montara GM Chipset 3585 Montara GM Chipset + 4000 Creatix V.90 HaM Modem 5001 PRO/DSL 2100 Modem - PPP 5005 PRO/DSL 2200 Modem - PPPoA 5200 EtherExpress PRO/100 Server PCI to PCI Bridge @@ -5109,11 +5128,13 @@ 84C5 82453KX/GX 450KX/GX Memory Controller (Orion) 84CA 82451NX 450NX PCIset Memory & I/O Controller 84CB 82454NX/82467GX 450NX PCI Expander Bridge - 84E0 82461GX System Address controller - 84E1 82462GX System Data Controller - 84E2 82465GX Graphics Expander Bridge - 84E3 82463GX Memory Address Controller - 84E4 82464GX Memory Data Controller + 84E0 82460GX 460GX System Address Controller + 84E1 82460GX 460GX System Data Controller + 84E2 82460GX 460GX AGP Bridge (GXB Function 2) + 84E3 82460GX 460GX Memory Address Controller + 84E4 82460GX 460GX Memory Data Controller + 84E6 82466GX 460GX Wide and fast PCI eXpander Bridge + 84EA 82460GX 460GX AGP Bridge (GXB Function 1) 9620 I2O RAID PCI to PCI Bridge 9621 SRCU21 I2O 1.5 RAID Controller (F/W<6.0) 9622 SRCUxx I2O 1.5 RAID Controller (F/W<6.0) @@ -5272,6 +5293,9 @@ 031C Gunboat x4 Pro Quad PCI Serial Port Controller (High speed) 041C Ironcad x8 Octal PCI Serial Port Controller (Standard speed) 051C Ironcad x8 Pro Octal PCI Serial Port Controller (High speed) + 061C IC 138 PCI + 081C Dreadnought x16 Pro + 091C Dreadnought x16 Lite B1B3 Shiva Europe Ltd. B894 Brown & Sharpe Mfg. Co. C001 TSI Telsys @@ -5325,8 +5349,9 @@ A0B1 ARK2000MI+ GUI Accelerator F5F5 F5 Networks Inc. FA57 Fast Search & Transfer ASA + 0001 PMC Pattern Matching Chip FEBD Ultraview Corp. -FEDA Epigram Inc +FEDA Broadcom (Was: Epigram Inc; Bought out in 1999) A0FA BCM4210 OEM Chip for 10meg/s over phone line FFFE VMWare Inc (Older Product Versions) 0710 Virtual SVGA ==== //depot/projects/trustedbsd/mac/sys/conf/NOTES#15 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1063 2002/08/12 21:25:06 joe Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1064 2002/08/16 14:21:37 rwatson Exp $ # # ==== //depot/projects/trustedbsd/mac/sys/conf/options#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.342 2002/08/09 20:54:06 sos Exp $ +# $FreeBSD: src/sys/conf/options,v 1.343 2002/08/16 14:21:38 rwatson Exp $ # # On the handling of kernel options # ==== //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_event.c,v 1.43 2002/08/16 12:51:57 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_event.c,v 1.44 2002/08/16 14:12:40 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#248 (text+ko) ==== @@ -36,7 +36,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_mac.c,v 1.7 2002/08/15 18:51:26 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_mac.c,v 1.8 2002/08/16 14:21:37 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. ==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#26 (text+ko) ==== @@ -16,7 +16,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.114 2002/08/16 12:51:57 rwatson Exp $ + * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.115 2002/08/16 14:12:40 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#25 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/kern/uipc_socket2.c,v 1.102 2002/08/16 05:08:46 dg Exp $ + * $FreeBSD: src/sys/kern/uipc_socket2.c,v 1.103 2002/08/16 18:41:48 dg Exp $ */ #include "opt_mac.h" @@ -66,7 +66,9 @@ * Primitive routines for operating on sockets and socket buffers */ -u_long sb_max = SB_MAX; /* XXX should be static */ +u_long sb_max = SB_MAX; +u_long sb_max_adj = + SB_MAX * MCLBYTES / (MSIZE + MCLBYTES); /* adjusted sb_max */ static u_long sb_efficiency = 8; /* parameter for sbreserve() */ @@ -375,6 +377,26 @@ return (ENOBUFS); } +static int +sysctl_handle_sb_max(SYSCTL_HANDLER_ARGS) +{ + int error = 0; + u_long old_sb_max = sb_max; + + error = SYSCTL_OUT(req, arg1, sizeof(int)); + if (error || !req->newptr) + return (error); + error = SYSCTL_IN(req, arg1, sizeof(int)); + if (error) + return (error); + if (sb_max < MSIZE + MCLBYTES) { + sb_max = old_sb_max; + return (EINVAL); + } + sb_max_adj = (u_quad_t)sb_max * MCLBYTES / (MSIZE + MCLBYTES); + return (0); +} + /* * Allot mbufs to a sockbuf. * Attempt to scale mbmax so that mbcnt doesn't become limiting @@ -392,7 +414,7 @@ * td will only be NULL when we're in an interrupt * (e.g. in tcp_input()) */ - if (cc > sb_max / (MSIZE + MCLBYTES) * MCLBYTES) + if (cc > sb_max_adj) return (0); if (!chgsbsize(so->so_cred->cr_uidinfo, &sb->sb_hiwat, cc, td ? td->td_proc->p_rlimit[RLIMIT_SBSIZE].rlim_cur : RLIM_INFINITY)) { @@ -971,9 +993,8 @@ /* This takes the place of kern.maxsockbuf, which moved to kern.ipc. */ static int dummy; SYSCTL_INT(_kern, KERN_DUMMY, dummy, CTLFLAG_RW, &dummy, 0, ""); - -SYSCTL_INT(_kern_ipc, KIPC_MAXSOCKBUF, maxsockbuf, CTLFLAG_RW, - &sb_max, 0, "Maximum socket buffer size"); +SYSCTL_OID(_kern_ipc, KIPC_MAXSOCKBUF, maxsockbuf, CTLTYPE_INT|CTLFLAG_RW, + &sb_max, 0, sysctl_handle_sb_max, "I", "Maximum socket buffer size"); SYSCTL_INT(_kern_ipc, OID_AUTO, maxsockets, CTLFLAG_RD, &maxsockets, 0, "Maximum number of sockets avaliable"); SYSCTL_INT(_kern_ipc, KIPC_SOCKBUF_WASTE, sockbuf_waste_factor, CTLFLAG_RW, ==== //depot/projects/trustedbsd/mac/usr.bin/mklocale/lex.l#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/usr.bin/mklocale/lex.l,v 1.6 2002/04/28 12:34:54 markm Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/mklocale/lex.l,v 1.7 2002/08/16 13:46:43 keichii Exp $"); #include #include @@ -118,6 +118,10 @@ return(LIST); } PHONOGRAM { yylval.i = _CTYPE_Q|_CTYPE_R|_CTYPE_G; return(LIST); } +SWIDTH0 { yylval.i = _CTYPE_SW0; return(LIST); } +SWIDTH1 { yylval.i = _CTYPE_SW1; return(LIST); } +SWIDTH2 { yylval.i = _CTYPE_SW2; return(LIST); } +SWIDTH3 { yylval.i = _CTYPE_SW3; return(LIST); } VARIABLE[\t ] { static char vbuf[1024]; char *v = vbuf; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 19:47:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E98E37B401; Fri, 16 Aug 2002 19:46:34 -0700 (PDT) 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 C1C1737B400 for ; Fri, 16 Aug 2002 19:46:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5F5443E6A for ; Fri, 16 Aug 2002 19:46:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7H2kWJU025169 for ; Fri, 16 Aug 2002 19:46:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7H2kVuF025157 for perforce@freebsd.org; Fri, 16 Aug 2002 19:46:31 -0700 (PDT) Date: Fri, 16 Aug 2002 19:46:31 -0700 (PDT) Message-Id: <200208170246.g7H2kVuF025157@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16140 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16140 Change 16140 by rwatson@rwatson_tislabs on 2002/08/16 19:45:47 IFC TrustedBSD base branch from main FreeBSD tree: trickle back in MAC tree commits such as fo_ioctl() credential change. Affected files ... .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#8 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_fcntl.c#7 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_filio.c#5 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_stream.c#6 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_termios.c#3 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_ttold.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/drm/drm_drv.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/mii.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_fcntl.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_ioctl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_event.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_generic.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_socket.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#17 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ste.c#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/file.h#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/socketvar.h#20 integrate Differences ... ==== //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.105 2002/08/15 20:54:02 njl Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.106 2002/08/16 22:05:19 njl Exp $ */ #ifdef _KERNEL @@ -1284,40 +1284,43 @@ struct scsi_rw_6 cmd6; struct scsi_rw_10 *cmd10; struct da_softc *softc; - struct ccb_scsiio *csio; - u_int8_t opcode; + u_int8_t *cdb; + int frozen; - csio = &ccb->csio; - opcode = ((struct scsi_rw_6 *)csio->cdb_io.cdb_bytes)->opcode; + cdb = ccb->csio.cdb_io.cdb_bytes; - if (opcode != READ_6 && opcode != WRITE_6) + /* Translation only possible if CDB is an array and cmd is R/W6 */ + if ((ccb->ccb_h.flags & CAM_CDB_POINTER) != 0 || + (*cdb != READ_6 && *cdb != WRITE_6)) return 0; xpt_print_path(ccb->ccb_h.path); - printf("READ(6)/WRITE(6) failed, " - "minimum_cmd_size is increased to 10.\n"); + printf("READ(6)/WRITE(6) not supported, " + "increasing minimum_cmd_size to 10.\n"); softc = (struct da_softc *)xpt_path_periph(ccb->ccb_h.path)->softc; softc->minimum_cmd_size = 10; - bcopy(&csio->cdb_io.cdb_bytes, &cmd6, sizeof(struct scsi_rw_6)); - cmd10 = (struct scsi_rw_10 *) &csio->cdb_io.cdb_bytes; + bcopy(cdb, &cmd6, sizeof(struct scsi_rw_6)); + cmd10 = (struct scsi_rw_10 *)cdb; cmd10->opcode = (cmd6.opcode == READ_6) ? READ_10 : WRITE_10; cmd10->byte2 = 0; scsi_ulto4b(scsi_3btoul(cmd6.addr), cmd10->addr); cmd10->reserved = 0; scsi_ulto2b(cmd6.length, cmd10->length); cmd10->control = cmd6.control; - csio->cdb_len = sizeof(*cmd10); + ccb->csio.cdb_len = sizeof(*cmd10); - /* requeue */ + /* Requeue request, unfreezing queue if necessary */ + frozen = (ccb->ccb_h.status & CAM_DEV_QFRZN) != 0; ccb->ccb_h.status = CAM_REQUEUE_REQ; xpt_action(ccb); - if ((ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) + if (frozen) { cam_release_devq(ccb->ccb_h.path, /*relsim_flags*/0, /*reduction*/0, /*timeout*/0, /*getcount_only*/0); + } return (ERESTART); } @@ -1595,14 +1598,14 @@ */ error = 0; if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_SCSI_STATUS_ERROR - && ccb->csio.scsi_status == SCSI_STATUS_CHECK_COND) { + && ccb->csio.scsi_status == SCSI_STATUS_CHECK_COND) { scsi_extract_sense(&ccb->csio.sense_data, - &error_code, &sense_key, &asc, &ascq); + &error_code, &sense_key, &asc, &ascq); if (sense_key == SSD_KEY_ILLEGAL_REQUEST) error = cmd6workaround(ccb); } if (error == ERESTART) - return ERESTART; + return (ERESTART); /* * XXX ==== //depot/projects/trustedbsd/base/sys/compat/linux/linux_file.c#8 (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. * - * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.68 2002/08/12 01:18:33 rwatson Exp $ + * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.69 2002/08/17 02:36:14 rwatson Exp $ */ #include "opt_compat.h" @@ -143,7 +143,8 @@ PROC_UNLOCK(p); if (!error) { if (fp->f_type == DTYPE_VNODE) - fo_ioctl(fp, TIOCSCTTY, (caddr_t) 0, td); + fo_ioctl(fp, TIOCSCTTY, (caddr_t) 0, td->td_ucred, + td); fdrop(fp, td); } } else { ==== //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.c#11 (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. * - * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.86 2002/06/26 15:53:11 arr Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.87 2002/08/17 02:36:14 rwatson Exp $ */ #include @@ -113,7 +113,8 @@ return (error); switch (args->cmd & 0xffff) { case LINUX_BLKGETSIZE: - error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td); + error = fo_ioctl(fp, DIOCGDINFO, (caddr_t)&dl, td->td_ucred, + td); fdrop(fp, td); if (error) return (error); @@ -560,7 +561,8 @@ switch (args->cmd & 0xffff) { case LINUX_TCGETS: - error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, td); + error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, td->td_ucred, + td); if (error) break; bsd_to_linux_termios(&bios, &lios); @@ -572,7 +574,8 @@ if (error) break; linux_to_bsd_termios(&lios, &bios); - error = (fo_ioctl(fp, TIOCSETA, (caddr_t)&bios, td)); + error = (fo_ioctl(fp, TIOCSETA, (caddr_t)&bios, td->td_ucred, + td)); break; case LINUX_TCSETSW: @@ -580,7 +583,8 @@ if (error) break; linux_to_bsd_termios(&lios, &bios); - error = (fo_ioctl(fp, TIOCSETAW, (caddr_t)&bios, td)); + error = (fo_ioctl(fp, TIOCSETAW, (caddr_t)&bios, td->td_ucred, + td)); break; case LINUX_TCSETSF: @@ -588,11 +592,13 @@ if (error) break; linux_to_bsd_termios(&lios, &bios); - error = (fo_ioctl(fp, TIOCSETAF, (caddr_t)&bios, td)); + error = (fo_ioctl(fp, TIOCSETAF, (caddr_t)&bios, td->td_ucred, + td)); break; case LINUX_TCGETA: - error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, td); + error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, td->td_ucred, + td); if (error) break; bsd_to_linux_termio(&bios, &lio); @@ -604,7 +610,8 @@ if (error) break; linux_to_bsd_termio(&lio, &bios); - error = (fo_ioctl(fp, TIOCSETA, (caddr_t)&bios, td)); + error = (fo_ioctl(fp, TIOCSETA, (caddr_t)&bios, td->td_ucred, + td)); break; case LINUX_TCSETAW: @@ -612,7 +619,8 @@ if (error) break; linux_to_bsd_termio(&lio, &bios); - error = (fo_ioctl(fp, TIOCSETAW, (caddr_t)&bios, td)); + error = (fo_ioctl(fp, TIOCSETAW, (caddr_t)&bios, td->td_ucred, + td)); break; case LINUX_TCSETAF: @@ -620,7 +628,8 @@ if (error) break; linux_to_bsd_termio(&lio, &bios); - error = (fo_ioctl(fp, TIOCSETAF, (caddr_t)&bios, td)); + error = (fo_ioctl(fp, TIOCSETAF, (caddr_t)&bios, td->td_ucred, + td)); break; /* LINUX_TCSBRK */ @@ -637,7 +646,8 @@ case LINUX_TCION: { int c; struct write_args wr; - error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, td); + error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, + td->td_ucred, td); if (error) break; fdrop(fp, td); @@ -799,14 +809,16 @@ fdrop(fp, td); return (EINVAL); } - error = (fo_ioctl(fp, TIOCSETD, (caddr_t)&line, td)); + error = (fo_ioctl(fp, TIOCSETD, (caddr_t)&line, td->td_ucred, + td)); break; } case LINUX_TIOCGETD: { int linux_line; int bsd_line = TTYDISC; - error = fo_ioctl(fp, TIOCGETD, (caddr_t)&bsd_line, td); + error = fo_ioctl(fp, TIOCGETD, (caddr_t)&bsd_line, + td->td_ucred, td); if (error) return (error); switch (bsd_line) { @@ -1275,7 +1287,8 @@ case LINUX_CDROMREADTOCHDR: { struct ioc_toc_header th; struct linux_cdrom_tochdr lth; - error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&th, td); + error = fo_ioctl(fp, CDIOREADTOCHEADER, (caddr_t)&th, + td->td_ucred, td); if (!error) { lth.cdth_trk0 = th.starting_track; lth.cdth_trk1 = th.ending_track; @@ -1290,7 +1303,8 @@ struct ioc_read_toc_single_entry irtse; irtse.address_format = ltep->cdte_format; irtse.track = ltep->cdte_track; - error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&irtse, td); + error = fo_ioctl(fp, CDIOREADTOCENTRY, (caddr_t)&irtse, + td->td_ucred, td); if (!error) { lte = *ltep; lte.cdte_ctrl = irtse.entry.control; @@ -1331,7 +1345,8 @@ bsdsc.track = 0; bsdsc.data_len = sizeof(struct cd_sub_channel_info); bsdsc.data = bsdinfo; - error = fo_ioctl(fp, CDIOCREADSUBCHANNEL, (caddr_t)&bsdsc, td); + error = fo_ioctl(fp, CDIOCREADSUBCHANNEL, (caddr_t)&bsdsc, + td->td_ucred, td); if (error) break; error = copyin((caddr_t)args->arg, &sc, @@ -1397,7 +1412,8 @@ error = linux_to_bsd_dvd_struct(&lds, &bds); if (error) break; - error = fo_ioctl(fp, DVDIOCREADSTRUCTURE, (caddr_t)&bds, td); + error = fo_ioctl(fp, DVDIOCREADSTRUCTURE, (caddr_t)&bds, + td->td_ucred, td); if (error) break; error = bsd_to_linux_dvd_struct(&bds, &lds); @@ -1422,7 +1438,8 @@ error = linux_to_bsd_dvd_authinfo(&lda, &bcode, &bda); if (error) break; - error = fo_ioctl(fp, bcode, (caddr_t)&bda, td); + error = fo_ioctl(fp, bcode, (caddr_t)&bda, td->td_ucred, + td); if (error) { if (lda.type == LINUX_DVD_HOST_SEND_KEY2) { lda.type = LINUX_DVD_AUTH_FAILURE; @@ -1759,7 +1776,8 @@ fdrop(fp, td); return (EINVAL); } - error = (fo_ioctl(fp, KDSKBMODE, (caddr_t)&kbdmode, td)); + error = (fo_ioctl(fp, KDSKBMODE, (caddr_t)&kbdmode, + td->td_ucred, td)); break; } ==== //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_fcntl.c#7 (text+ko) ==== @@ -28,7 +28,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/compat/svr4/svr4_fcntl.c,v 1.24 2002/08/12 01:42:21 rwatson Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.25 2002/08/17 02:36:15 rwatson Exp $ */ #include "opt_mac.h" @@ -399,7 +399,8 @@ return (EBADF); /* XXX: correct errno? */ /* ignore any error, just give it a try */ if (fp->f_type == DTYPE_VNODE) - fo_ioctl(fp, TIOCSCTTY, (caddr_t) 0, td); + fo_ioctl(fp, TIOCSCTTY, (caddr_t) 0, td->td_ucred, + td); fdrop(fp, td); } else { PROC_UNLOCK(p); ==== //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_filio.c#5 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.15 2002/05/31 11:52:29 tanimura Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.16 2002/08/17 02:36:15 rwatson Exp $ */ #include @@ -219,7 +219,7 @@ #ifdef SVR4_DEBUG if (cmd == FIOASYNC) DPRINTF(("FIOASYNC\n")); #endif - error = fo_ioctl(fp, cmd, (caddr_t) &num, td); + error = fo_ioctl(fp, cmd, (caddr_t) &num, td->td_ucred, td); if (error) return error; ==== //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sockio.c#3 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.11 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.12 2002/08/17 02:36:15 rwatson Exp $ */ #include @@ -125,7 +125,8 @@ (void) strncpy(br.ifr_name, sr.svr4_ifr_name, sizeof(br.ifr_name)); if ((error = fo_ioctl(fp, SIOCGIFFLAGS, - (caddr_t) &br, td)) != 0) { + (caddr_t) &br, td->td_ucred, + td)) != 0) { DPRINTF(("SIOCGIFFLAGS (%s) %s: error %d\n", br.ifr_name, sr.svr4_ifr_name, error)); return error; @@ -149,7 +150,8 @@ sc.svr4_ifc_len)); if ((error = fo_ioctl(fp, OSIOCGIFCONF, - (caddr_t) &sc, td)) != 0) + (caddr_t) &sc, td->td_ucred, + td)) != 0) return error; DPRINTF(("SIOCGIFCONF\n")); ==== //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_stream.c#6 (text+ko) ==== @@ -27,7 +27,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/compat/svr4/svr4_stream.c,v 1.30 2002/06/11 21:14:02 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.31 2002/08/17 02:36:15 rwatson Exp $ */ /* @@ -1267,7 +1267,8 @@ * for us, and if we do, then we assume that we have at least one * message waiting for us. */ - if ((error = fo_ioctl(fp, FIONREAD, (caddr_t) &nread, td)) != 0) + if ((error = fo_ioctl(fp, FIONREAD, (caddr_t) &nread, td->td_ucred, + td)) != 0) return error; if (nread != 0) ==== //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_termios.c#3 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_termios.c,v 1.9 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_termios.c,v 1.10 2002/08/17 02:36:15 rwatson Exp $ */ #include @@ -499,7 +499,8 @@ case SVR4_TCGETA: case SVR4_TCGETS: DPRINTF(("ioctl(TCGET%c);\n", cmd == SVR4_TCGETA ? 'A' : 'S')); - if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t) &bt, td)) != 0) + if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t) &bt, + td->td_ucred, td)) != 0) return error; memset(&st, 0, sizeof(st)); @@ -526,7 +527,8 @@ case SVR4_TCSETSF: DPRINTF(("TCSET{A,S,AW,SW,AF,SF}\n")); /* get full BSD termios so we don't lose information */ - if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t) &bt, td)) != 0) + if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t) &bt, + td->td_ucred, td)) != 0) return error; switch (cmd) { @@ -577,14 +579,15 @@ print_svr4_termios(&st); #endif /* DEBUG_SVR4 */ - return fo_ioctl(fp, cmd, (caddr_t) &bt, td); + return fo_ioctl(fp, cmd, (caddr_t) &bt, td->td_ucred, td); case SVR4_TIOCGWINSZ: DPRINTF(("TIOCGWINSZ\n")); { struct svr4_winsize ws; - error = fo_ioctl(fp, TIOCGWINSZ, (caddr_t) &ws, td); + error = fo_ioctl(fp, TIOCGWINSZ, (caddr_t) &ws, + td->td_ucred, td); if (error) return error; return copyout(&ws, data, sizeof(ws)); @@ -597,7 +600,8 @@ if ((error = copyin(data, &ws, sizeof(ws))) != 0) return error; - return fo_ioctl(fp, TIOCSWINSZ, (caddr_t) &ws, td); + return fo_ioctl(fp, TIOCSWINSZ, (caddr_t) &ws, + td->td_ucred, td); } default: ==== //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_ttold.c#3 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_ttold.c,v 1.10 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_ttold.c,v 1.11 2002/08/17 02:36:15 rwatson Exp $ */ #include @@ -192,8 +192,9 @@ { pid_t pid; - if ((error = fo_ioctl(fp, TIOCGPGRP, (caddr_t) &pid, td)) != 0) - return error; + if ((error = fo_ioctl(fp, TIOCGPGRP, (caddr_t) &pid, + td->td_ucred, td)) != 0) + return error; DPRINTF(("TIOCGPGRP %d\n", pid)); @@ -211,14 +212,16 @@ DPRINTF(("TIOCSPGRP %d\n", pid)); - return fo_ioctl(fp, TIOCSPGRP, (caddr_t) &pid, td); + return fo_ioctl(fp, TIOCSPGRP, (caddr_t) &pid, + td->td_ucred, td); } case SVR4_TIOCGSID: { #if defined(TIOCGSID) pid_t pid; - if ((error = fo_ioctl(fp, TIOCGSID, (caddr_t) &pid, td)) != 0) + if ((error = fo_ioctl(fp, TIOCGSID, (caddr_t) &pid, + td->td_ucred, td)) != 0) return error; DPRINTF(("TIOCGSID %d\n", pid)); @@ -235,7 +238,8 @@ struct sgttyb bs; struct svr4_sgttyb ss; - error = fo_ioctl(fp, TIOCGETP, (caddr_t) &bs, td); + error = fo_ioctl(fp, TIOCGETP, (caddr_t) &bs, + td->td_ucred, td); if (error) return error; @@ -260,7 +264,8 @@ print_svr4_sgttyb("SVR4_TIOCSET{P,N}", &ss); #endif /* DEBUG_SVR4 */ cmd = (cmd == SVR4_TIOCSETP) ? TIOCSETP : TIOCSETN; - return fo_ioctl(fp, cmd, (caddr_t) &bs, td); + return fo_ioctl(fp, cmd, (caddr_t) &bs, + td->td_ucred, td); } case SVR4_TIOCGETC: @@ -268,7 +273,8 @@ struct tchars bt; struct svr4_tchars st; - error = fo_ioctl(fp, TIOCGETC, (caddr_t) &bt, td); + error = fo_ioctl(fp, TIOCGETC, (caddr_t) &bt, + td->td_ucred, td); if (error) return error; @@ -291,7 +297,8 @@ #ifdef DEBUG_SVR4 print_svr4_tchars("SVR4_TIOCSETC", &st); #endif /* DEBUG_SVR4 */ - return fo_ioctl(fp, TIOCSETC, (caddr_t) &bt, td); + return fo_ioctl(fp, TIOCSETC, (caddr_t) &bt, + td->td_ucred, td); } case SVR4_TIOCGLTC: @@ -299,7 +306,8 @@ struct ltchars bl; struct svr4_ltchars sl; - error = fo_ioctl(fp, TIOCGLTC, (caddr_t) &bl, td); + error = fo_ioctl(fp, TIOCGLTC, (caddr_t) &bl, + td->td_ucred, td); if (error) return error; @@ -322,13 +330,15 @@ #ifdef DEBUG_SVR4 print_svr4_ltchars("SVR4_TIOCSLTC", &sl); #endif /* DEBUG_SVR4 */ - return fo_ioctl(fp, TIOCSLTC, (caddr_t) &bl, td); + return fo_ioctl(fp, TIOCSLTC, (caddr_t) &bl, + td->td_ucred, td); } case SVR4_TIOCLGET: { int flags; - if ((error = fo_ioctl(fp, TIOCLGET, (caddr_t) &flags, td)) != 0) + if ((error = fo_ioctl(fp, TIOCLGET, (caddr_t) &flags, + td->td_ucred, td)) != 0) return error; DPRINTF(("SVR4_TIOCLGET %o\n", flags)); return copyout(&flags, data, sizeof(flags)); @@ -356,7 +366,8 @@ } DPRINTF(("SVR4_TIOCL{SET,BIS,BIC} %o\n", flags)); - return fo_ioctl(fp, cmd, (caddr_t) &flags, td); + return fo_ioctl(fp, cmd, (caddr_t) &flags, + td->td_ucred, td); } default: ==== //depot/projects/trustedbsd/base/sys/dev/aac/aac.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac.c,v 1.39 2002/05/03 00:07:50 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aac.c,v 1.40 2002/08/17 02:36:15 rwatson Exp $ */ /* @@ -2535,7 +2535,7 @@ /* * Pass the ioctl off to our standard handler. */ - error = (fo_ioctl(fp, cmd, (caddr_t)args->arg, td)); + error = (fo_ioctl(fp, cmd, (caddr_t)args->arg, td->td_ucred, td)); fdrop(fp, td); return (error); } ==== //depot/projects/trustedbsd/base/sys/dev/drm/drm_drv.h#3 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.4 2002/05/06 19:31:27 alfred Exp $ + * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.5 2002/08/17 02:36:15 rwatson Exp $ */ /* @@ -1439,7 +1439,11 @@ /* * Pass the ioctl off to our standard handler. */ +#if (__FreeBSD_version >= 500000) + return(fo_ioctl(fp, cmd, data, p->td_ucred, p)); +#else return(fo_ioctl(fp, cmd, data, p)); +#endif } #endif /* DRM_LINUX */ #endif /* __FreeBSD__ */ ==== //depot/projects/trustedbsd/base/sys/dev/mii/mii.c#5 (text+ko) ==== @@ -62,7 +62,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/mii.c,v 1.13 2002/08/07 22:18:33 ambrisko Exp $"; + "$FreeBSD: src/sys/dev/mii/mii.c,v 1.14 2002/08/16 23:19:16 ambrisko Exp $"; #endif static int miibus_readreg (device_t, int, int); @@ -110,17 +110,14 @@ { struct mii_attach_args ma, *args; struct mii_data *mii; - device_t child = NULL, parent, *children; - int bmsr, capmask = 0xFFFFFFFF, nchildren; + device_t child = NULL, parent; + int bmsr, capmask = 0xFFFFFFFF; mii = device_get_softc(dev); parent = device_get_parent(dev); LIST_INIT(&mii->mii_phys); for (ma.mii_phyno = 0; ma.mii_phyno < MII_NPHY; ma.mii_phyno++) { - device_get_children(dev, &children, &nchildren); - if (nchildren) - break; /* * Check to see if there is a PHY at this address. Note, * many braindead PHYs report 0/0 in their ID registers, ==== //depot/projects/trustedbsd/base/sys/dev/tdfx/tdfx_pci.c#4 (text+ko) ==== @@ -28,7 +28,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/dev/tdfx/tdfx_pci.c,v 1.18 2002/04/20 01:35:45 marcel Exp $ + * $FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.19 2002/08/17 02:36:15 rwatson Exp $ */ /* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET @@ -848,7 +848,7 @@ return (error); /* We simply copy the data and send it right to ioctl */ copyin((caddr_t)args->arg, &d_pio, sizeof(d_pio)); - error = fo_ioctl(fp, cmd, (caddr_t)&d_pio, td); + error = fo_ioctl(fp, cmd, (caddr_t)&d_pio, td->td_ucred, td); fdrop(fp, td); return error; } ==== //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.71 2002/08/16 12:51:55 rwatson Exp $ + * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.72 2002/08/17 02:36:15 rwatson Exp $ */ #include @@ -348,13 +348,17 @@ return (0); if (ap->a_fflag & FREAD) { filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_readsock; - error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_td); + filetmp.f_cred = ap->a_cred; + error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, + ap->a_td->td_ucred, ap->a_td); if (error) return (error); } if (ap->a_fflag & FWRITE) { filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_writesock; - error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, ap->a_td); + filetmp.f_cred = ap->a_cred; + error = soo_ioctl(&filetmp, ap->a_command, ap->a_data, + ap->a_td->td_ucred, ap->a_td); if (error) return (error); } ==== //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_fcntl.c#4 (text+ko) ==== @@ -24,7 +24,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/i386/ibcs2/ibcs2_fcntl.c,v 1.20 2002/03/20 05:45:58 alfred Exp $ + * $FreeBSD: src/sys/i386/ibcs2/ibcs2_fcntl.c,v 1.21 2002/08/17 02:36:16 rwatson Exp $ */ #include "opt_spx_hack.h" @@ -203,7 +203,8 @@ /* ignore any error, just give it a try */ if (fp->f_type == DTYPE_VNODE) - fo_ioctl(fp, TIOCSCTTY, (caddr_t) 0, td); + fo_ioctl(fp, TIOCSCTTY, (caddr_t) 0, td->td_ucred, + td); fdrop(fp, td); } else PROC_UNLOCK(p); ==== //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_ioctl.c#6 (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. * - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_ioctl.c,v 1.24 2002/03/20 05:45:58 alfred Exp $ + * $FreeBSD: src/sys/i386/ibcs2/ibcs2_ioctl.c,v 1.25 2002/08/17 02:36:16 rwatson Exp $ */ #include @@ -365,7 +365,8 @@ struct ibcs2_termios sts; struct ibcs2_termio st; - if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bts, td)) != 0) + if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bts, + td->td_ucred, td)) != 0) break; btios2stios (&bts, &sts); @@ -403,7 +404,8 @@ } /* get full BSD termios so we don't lose information */ - if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bts, td)) != 0) { + if ((error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bts, + td->td_ucred, td)) != 0) { DPRINTF(("ibcs2_ioctl(%d): TCSET ctl failed fd %d ", p->p_pid, SCARG(uap, fd))); break; @@ -418,7 +420,7 @@ stios2btios(&sts, &bts); error = fo_ioctl(fp, SCARG(uap, cmd) - IBCS2_TCSETA + TIOCSETA, - (caddr_t)&bts, td); + (caddr_t)&bts, td->td_ucred, td); break; } @@ -434,7 +436,7 @@ break; stios2btios (&sts, &bts); error = fo_ioctl(fp, SCARG(uap, cmd) - IBCS2_XCSETA + TIOCSETA, - (caddr_t)&bts, td); + (caddr_t)&bts, td->td_ucred, td); break; } @@ -450,7 +452,7 @@ break; stios2btios (&sts, &bts); error = fo_ioctl(fp, SCARG(uap, cmd) - IBCS2_OXCSETA + TIOCSETA, - (caddr_t)&bts, td); + (caddr_t)&bts, td->td_ucred, td); break; } @@ -468,10 +470,12 @@ error = ENOSYS; break; case 2: - error = fo_ioctl(fp, TIOCSTOP, (caddr_t)0, td); + error = fo_ioctl(fp, TIOCSTOP, (caddr_t)0, + td->td_ucred, td); break; case 3: - error = fo_ioctl(fp, TIOCSTART, (caddr_t)1, td); + error = fo_ioctl(fp, TIOCSTART, (caddr_t)1, + td->td_ucred, td); break; default: error = EINVAL; @@ -498,7 +502,8 @@ fdrop(fp, td); return EINVAL; } - error = fo_ioctl(fp, TIOCFLUSH, (caddr_t)&arg, td); + error = fo_ioctl(fp, TIOCFLUSH, (caddr_t)&arg, td->td_ucred, + td); break; } ==== //depot/projects/trustedbsd/base/sys/kern/kern_descrip.c#22 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.154 2002/08/16 12:51:57 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.155 2002/08/17 02:36:16 rwatson Exp $ */ #include "opt_compat.h" @@ -101,7 +101,7 @@ static int badfo_readwrite(struct file *fp, struct uio *uio, struct ucred *active_cred, int flags, struct thread *td); static int badfo_ioctl(struct file *fp, u_long com, void *data, - struct thread *td); + struct ucred *active_cred, struct thread *td); static int badfo_poll(struct file *fp, int events, struct ucred *active_cred, struct thread *td); static int badfo_kqfilter(struct file *fp, struct knote *kn); @@ -315,34 +315,35 @@ fp->f_flag &= ~FCNTLFLAGS; fp->f_flag |= FFLAGS(uap->arg & ~O_ACCMODE) & FCNTLFLAGS; tmp = fp->f_flag & FNONBLOCK; - error = fo_ioctl(fp, FIONBIO, &tmp, td); + error = fo_ioctl(fp, FIONBIO, &tmp, td->td_ucred, td); if (error) { fdrop(fp, td); break; } tmp = fp->f_flag & FASYNC; - error = fo_ioctl(fp, FIOASYNC, &tmp, td); + error = fo_ioctl(fp, FIOASYNC, &tmp, td->td_ucred, td); if (!error) { fdrop(fp, td); break; } fp->f_flag &= ~FNONBLOCK; tmp = 0; - (void)fo_ioctl(fp, FIONBIO, &tmp, td); + (void)fo_ioctl(fp, FIONBIO, &tmp, td->td_ucred, td); fdrop(fp, td); break; case F_GETOWN: fhold(fp); FILEDESC_UNLOCK(fdp); - error = fo_ioctl(fp, FIOGETOWN, (void *)td->td_retval, td); + error = fo_ioctl(fp, FIOGETOWN, (void *)td->td_retval, + td->td_ucred, td); fdrop(fp, td); break; case F_SETOWN: fhold(fp); FILEDESC_UNLOCK(fdp); - error = fo_ioctl(fp, FIOSETOWN, &uap->arg, td); + error = fo_ioctl(fp, FIOSETOWN, &uap->arg, td->td_ucred, td); fdrop(fp, td); break; @@ -2159,10 +2160,11 @@ } static int -badfo_ioctl(fp, com, data, td) +badfo_ioctl(fp, com, data, active_cred, td) struct file *fp; u_long com; void *data; + struct ucred *active_cred; struct thread *td; { ==== //depot/projects/trustedbsd/base/sys/kern/kern_event.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_event.c,v 1.44 2002/08/16 14:12:40 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_event.c,v 1.45 2002/08/17 02:36:16 rwatson Exp $ */ #include @@ -61,7 +61,7 @@ static int kqueue_write(struct file *fp, struct uio *uio, struct ucred *active_cred, int flags, struct thread *td); static int kqueue_ioctl(struct file *fp, u_long com, void *data, - struct thread *td); + struct ucred *active_cred, struct thread *td); static int kqueue_poll(struct file *fp, int events, struct ucred *active_cred, struct thread *td); static int kqueue_kqfilter(struct file *fp, struct knote *kn); @@ -794,7 +794,8 @@ /*ARGSUSED*/ static int -kqueue_ioctl(struct file *fp, u_long com, void *data, struct thread *td) +kqueue_ioctl(struct file *fp, u_long com, void *data, + struct ucred *active_cred, struct thread *td) { return (ENOTTY); } ==== //depot/projects/trustedbsd/base/sys/kern/sys_generic.c#15 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/sys_generic.c,v 1.109 2002/08/16 12:51:57 rwatson Exp $ + * $FreeBSD: src/sys/kern/sys_generic.c,v 1.110 2002/08/17 02:36:16 rwatson Exp $ */ #include "opt_ktrace.h" @@ -656,7 +656,7 @@ else fp->f_flag &= ~FNONBLOCK; FILE_UNLOCK(fp); - error = fo_ioctl(fp, FIONBIO, &tmp, td); + error = fo_ioctl(fp, FIONBIO, &tmp, td->td_ucred, td); break; case FIOASYNC: @@ -666,11 +666,11 @@ else fp->f_flag &= ~FASYNC; FILE_UNLOCK(fp); - error = fo_ioctl(fp, FIOASYNC, &tmp, td); + error = fo_ioctl(fp, FIOASYNC, &tmp, td->td_ucred, td); break; default: - error = fo_ioctl(fp, com, data, td); + error = fo_ioctl(fp, com, data, td->td_ucred, td); /* * Copy any data to user, size was * already set and checked above. ==== //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#18 (text+ko) ==== @@ -16,7 +16,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.115 2002/08/16 14:12:40 rwatson Exp $ + * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.116 2002/08/17 02:36:16 rwatson Exp $ */ /* @@ -105,7 +105,7 @@ static int pipe_stat(struct file *fp, struct stat *sb, struct ucred *active_cred, struct thread *td); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 16 19:52:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53FD537B401; Fri, 16 Aug 2002 19:51:41 -0700 (PDT) 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 0835537B400 for ; Fri, 16 Aug 2002 19:51:41 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 229B943E70 for ; Fri, 16 Aug 2002 19:51:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7H2peJU026320 for ; Fri, 16 Aug 2002 19:51:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7H2pdfA026317 for perforce@freebsd.org; Fri, 16 Aug 2002 19:51:39 -0700 (PDT) Date: Fri, 16 Aug 2002 19:51:39 -0700 (PDT) Message-Id: <200208170251.g7H2pdfA026317@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16141 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16141 Change 16141 by rwatson@rwatson_tislabs on 2002/08/16 19:51:16 IFC TrustedBSD base to TrustedBSD MAC branch. Trickle back in the fo_ioctl() commit to the main tree. Affected files ... .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ioctl.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_filio.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_sockio.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_stream.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_termios.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_ttold.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mii/mii.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_fcntl.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_ioctl.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_generic.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_socket.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#52 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ste.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/sys/file.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/sys/socketvar.h#25 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_da.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.105 2002/08/15 20:54:02 njl Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.106 2002/08/16 22:05:19 njl Exp $ */ #ifdef _KERNEL @@ -1284,40 +1284,43 @@ struct scsi_rw_6 cmd6; struct scsi_rw_10 *cmd10; struct da_softc *softc; - struct ccb_scsiio *csio; - u_int8_t opcode; + u_int8_t *cdb; + int frozen; - csio = &ccb->csio; - opcode = ((struct scsi_rw_6 *)csio->cdb_io.cdb_bytes)->opcode; + cdb = ccb->csio.cdb_io.cdb_bytes; - if (opcode != READ_6 && opcode != WRITE_6) + /* Translation only possible if CDB is an array and cmd is R/W6 */ + if ((ccb->ccb_h.flags & CAM_CDB_POINTER) != 0 || + (*cdb != READ_6 && *cdb != WRITE_6)) return 0; xpt_print_path(ccb->ccb_h.path); - printf("READ(6)/WRITE(6) failed, " - "minimum_cmd_size is increased to 10.\n"); + printf("READ(6)/WRITE(6) not supported, " + "increasing minimum_cmd_size to 10.\n"); softc = (struct da_softc *)xpt_path_periph(ccb->ccb_h.path)->softc; softc->minimum_cmd_size = 10; - bcopy(&csio->cdb_io.cdb_bytes, &cmd6, sizeof(struct scsi_rw_6)); - cmd10 = (struct scsi_rw_10 *) &csio->cdb_io.cdb_bytes; + bcopy(cdb, &cmd6, sizeof(struct scsi_rw_6)); + cmd10 = (struct scsi_rw_10 *)cdb; cmd10->opcode = (cmd6.opcode == READ_6) ? READ_10 : WRITE_10; cmd10->byte2 = 0; scsi_ulto4b(scsi_3btoul(cmd6.addr), cmd10->addr); cmd10->reserved = 0; scsi_ulto2b(cmd6.length, cmd10->length); cmd10->control = cmd6.control; - csio->cdb_len = sizeof(*cmd10); + ccb->csio.cdb_len = sizeof(*cmd10); - /* requeue */ + /* Requeue request, unfreezing queue if necessary */ + frozen = (ccb->ccb_h.status & CAM_DEV_QFRZN) != 0; ccb->ccb_h.status = CAM_REQUEUE_REQ; xpt_action(ccb); - if ((ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) + if (frozen) { cam_release_devq(ccb->ccb_h.path, /*relsim_flags*/0, /*reduction*/0, /*timeout*/0, /*getcount_only*/0); + } return (ERESTART); } @@ -1595,14 +1598,14 @@ */ error = 0; if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_SCSI_STATUS_ERROR - && ccb->csio.scsi_status == SCSI_STATUS_CHECK_COND) { + && ccb->csio.scsi_status == SCSI_STATUS_CHECK_COND) { scsi_extract_sense(&ccb->csio.sense_data, - &error_code, &sense_key, &asc, &ascq); + &error_code, &sense_key, &asc, &ascq); if (sense_key == SSD_KEY_ILLEGAL_REQUEST) error = cmd6workaround(ccb); } if (error == ERESTART) - return ERESTART; + return (ERESTART); /* * XXX ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_file.c#14 (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. * - * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.68 2002/08/12 01:18:33 rwatson Exp $ + * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.69 2002/08/17 02:36:14 rwatson Exp $ */ #include "opt_compat.h" ==== //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ioctl.c#10 (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. * - * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.86 2002/06/26 15:53:11 arr Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.87 2002/08/17 02:36:14 rwatson Exp $ */ #include @@ -1438,7 +1438,8 @@ error = linux_to_bsd_dvd_authinfo(&lda, &bcode, &bda); if (error) break; - error = fo_ioctl(fp, bcode, (caddr_t)&bda, td->td_ucred, td); + error = fo_ioctl(fp, bcode, (caddr_t)&bda, td->td_ucred, + td); if (error) { if (lda.type == LINUX_DVD_HOST_SEND_KEY2) { lda.type = LINUX_DVD_AUTH_FAILURE; ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_fcntl.c#11 (text+ko) ==== @@ -28,7 +28,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/compat/svr4/svr4_fcntl.c,v 1.24 2002/08/12 01:42:21 rwatson Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.25 2002/08/17 02:36:15 rwatson Exp $ */ #include "opt_mac.h" ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_filio.c#6 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.15 2002/05/31 11:52:29 tanimura Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_filio.c,v 1.16 2002/08/17 02:36:15 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_sockio.c#4 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.11 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.12 2002/08/17 02:36:15 rwatson Exp $ */ #include @@ -149,8 +149,9 @@ sizeof(struct ifreq), sizeof(struct svr4_ifreq), sc.svr4_ifc_len)); - if ((error = fo_ioctl(fp, OSIOCGIFCONF, (caddr_t) &sc, - td->td_ucred, td)) != 0) + if ((error = fo_ioctl(fp, OSIOCGIFCONF, + (caddr_t) &sc, td->td_ucred, + td)) != 0) return error; DPRINTF(("SIOCGIFCONF\n")); ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_stream.c#7 (text+ko) ==== @@ -27,7 +27,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/compat/svr4/svr4_stream.c,v 1.30 2002/06/11 21:14:02 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.31 2002/08/17 02:36:15 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_termios.c#4 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_termios.c,v 1.9 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_termios.c,v 1.10 2002/08/17 02:36:15 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/sys/compat/svr4/svr4_ttold.c#4 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_ttold.c,v 1.10 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_ttold.c,v 1.11 2002/08/17 02:36:15 rwatson Exp $ */ #include @@ -194,7 +194,7 @@ if ((error = fo_ioctl(fp, TIOCGPGRP, (caddr_t) &pid, td->td_ucred, td)) != 0) - return error; + return error; DPRINTF(("TIOCGPGRP %d\n", pid)); @@ -264,8 +264,8 @@ print_svr4_sgttyb("SVR4_TIOCSET{P,N}", &ss); #endif /* DEBUG_SVR4 */ cmd = (cmd == SVR4_TIOCSETP) ? TIOCSETP : TIOCSETN; - return fo_ioctl(fp, cmd, (caddr_t) &bs, td->td_ucred, - td); + return fo_ioctl(fp, cmd, (caddr_t) &bs, + td->td_ucred, td); } case SVR4_TIOCGETC: ==== //depot/projects/trustedbsd/mac/sys/dev/aac/aac.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac.c,v 1.39 2002/05/03 00:07:50 scottl Exp $ + * $FreeBSD: src/sys/dev/aac/aac.c,v 1.40 2002/08/17 02:36:15 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.h#5 (text+ko) ==== @@ -28,7 +28,7 @@ * Rickard E. (Rik) Faith * Gareth Hughes * - * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.4 2002/05/06 19:31:27 alfred Exp $ + * $FreeBSD: src/sys/dev/drm/drm_drv.h,v 1.5 2002/08/17 02:36:15 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/mac/sys/dev/mii/mii.c#7 (text+ko) ==== @@ -62,7 +62,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/mii/mii.c,v 1.13 2002/08/07 22:18:33 ambrisko Exp $"; + "$FreeBSD: src/sys/dev/mii/mii.c,v 1.14 2002/08/16 23:19:16 ambrisko Exp $"; #endif static int miibus_readreg (device_t, int, int); @@ -110,17 +110,14 @@ { struct mii_attach_args ma, *args; struct mii_data *mii; - device_t child = NULL, parent, *children; - int bmsr, capmask = 0xFFFFFFFF, nchildren; + device_t child = NULL, parent; + int bmsr, capmask = 0xFFFFFFFF; mii = device_get_softc(dev); parent = device_get_parent(dev); LIST_INIT(&mii->mii_phys); for (ma.mii_phyno = 0; ma.mii_phyno < MII_NPHY; ma.mii_phyno++) { - device_get_children(dev, &children, &nchildren); - if (nchildren) - break; /* * Check to see if there is a PHY at this address. Note, * many braindead PHYs report 0/0 in their ID registers, ==== //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_pci.c#5 (text+ko) ==== @@ -28,7 +28,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/dev/tdfx/tdfx_pci.c,v 1.18 2002/04/20 01:35:45 marcel Exp $ + * $FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.19 2002/08/17 02:36:15 rwatson Exp $ */ /* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET ==== //depot/projects/trustedbsd/mac/sys/fs/fifofs/fifo_vnops.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.71 2002/08/16 12:51:55 rwatson Exp $ + * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.72 2002/08/17 02:36:15 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_fcntl.c#5 (text+ko) ==== @@ -24,7 +24,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/i386/ibcs2/ibcs2_fcntl.c,v 1.20 2002/03/20 05:45:58 alfred Exp $ + * $FreeBSD: src/sys/i386/ibcs2/ibcs2_fcntl.c,v 1.21 2002/08/17 02:36:16 rwatson Exp $ */ #include "opt_spx_hack.h" ==== //depot/projects/trustedbsd/mac/sys/i386/ibcs2/ibcs2_ioctl.c#7 (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. * - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_ioctl.c,v 1.24 2002/03/20 05:45:58 alfred Exp $ + * $FreeBSD: src/sys/i386/ibcs2/ibcs2_ioctl.c,v 1.25 2002/08/17 02:36:16 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/sys/kern/kern_descrip.c#29 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.154 2002/08/16 12:51:57 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.155 2002/08/17 02:36:16 rwatson Exp $ */ #include "opt_compat.h" ==== //depot/projects/trustedbsd/mac/sys/kern/kern_event.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_event.c,v 1.44 2002/08/16 14:12:40 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_event.c,v 1.45 2002/08/17 02:36:16 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/sys/kern/sys_generic.c#15 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)sys_generic.c 8.5 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/sys_generic.c,v 1.109 2002/08/16 12:51:57 rwatson Exp $ + * $FreeBSD: src/sys/kern/sys_generic.c,v 1.110 2002/08/17 02:36:16 rwatson Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#27 (text+ko) ==== @@ -16,7 +16,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.115 2002/08/16 14:12:40 rwatson Exp $ + * $FreeBSD: src/sys/kern/sys_pipe.c,v 1.116 2002/08/17 02:36:16 rwatson Exp $ */ /* ==== //depot/projects/trustedbsd/mac/sys/kern/sys_socket.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)sys_socket.c 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/kern/sys_socket.c,v 1.43 2002/08/16 12:51:58 rwatson Exp $ + * $FreeBSD: src/sys/kern/sys_socket.c,v 1.44 2002/08/17 02:36:16 rwatson Exp $ */ #include ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#52 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.162 2002/08/16 12:51:58 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.163 2002/08/17 02:36:16 rwatson Exp $ */ #include "opt_mac.h" ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#22 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.169 2002/08/15 18:51:26 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.170 2002/08/17 02:05:25 hsu Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -68,32 +68,25 @@ #include /* for ICMP_BANDLIM */ #include /* for ICMP_BANDLIM */ #include -#ifdef INET6 #include #include #include #include #include -#endif #include #include #include #include #include -#ifdef INET6 #include -#endif #include #ifdef TCPDEBUG #include - #endif /* TCPDEBUG */ #ifdef IPSEC #include -#ifdef INET6 #include -#endif #include #endif /*IPSEC*/ @@ -101,7 +94,7 @@ MALLOC_DEFINE(M_TSEGQ, "tseg_qent", "TCP segment queue entry"); -static int tcprexmtthresh = 3; +static const int tcprexmtthresh = 3; tcp_cc tcp_ccgen; struct tcpstat tcpstat; @@ -138,7 +131,7 @@ static int tcp_reass(struct tcpcb *, struct tcphdr *, int *, struct mbuf *); static void tcp_xmit_timer(struct tcpcb *, int); -static int tcp_newreno(struct tcpcb *, struct tcphdr *); +static void tcp_newreno_partial_ack(struct tcpcb *, struct tcphdr *); /* Neighbor Discovery, Neighbor Unreachability Detection Upper layer hint. */ #ifdef INET6 @@ -350,29 +343,35 @@ struct rmxp_tao *taop; /* pointer to our TAO cache entry */ struct rmxp_tao tao_noncached; /* in case there's no cached entry */ int headlocked = 0; + struct sockaddr_in *next_hop = NULL; + int rstreason; /* For badport_bandlim accounting purposes */ + + struct ip6_hdr *ip6 = NULL; +#ifdef INET6 + int isipv6; +#else + const int isipv6 = 0; +#endif #ifdef TCPDEBUG + /* + * The size of tcp_saveipgen must be the size of the max ip header, + * now IPv6. + */ u_char tcp_saveipgen[40]; - /* the size of the above must be of max ip header, now IPv6 */ struct tcphdr tcp_savetcp; short ostate = 0; #endif -#ifdef INET6 - struct ip6_hdr *ip6 = NULL; - int isipv6; -#endif /* INET6 */ - struct sockaddr_in *next_hop = NULL; + #ifdef MAC int error; #endif - int rstreason; /* For badport_bandlim accounting purposes */ /* Grab info from MT_TAG mbufs prepended to the chain. */ for (;m && m->m_type == MT_TAG; m = m->m_next) { if (m->m_tag_id == PACKET_TAG_IPFORWARD) next_hop = (struct sockaddr_in *)m->m_hdr.mh_data; } - #ifdef INET6 isipv6 = (mtod(m, struct ip *)->ip_v == 6) ? 1 : 0; #endif @@ -380,7 +379,6 @@ tcpstat.tcps_rcvtotal++; -#ifdef INET6 if (isipv6) { /* IP6_EXTHDR_CHECK() is already done at tcp6_input() */ ip6 = mtod(m, struct ip6_hdr *); @@ -403,55 +401,55 @@ /* XXX stat */ goto drop; } - } else -#endif /* INET6 */ - { - /* - * Get IP and TCP header together in first mbuf. - * Note: IP leaves IP header in first mbuf. - */ - if (off0 > sizeof (struct ip)) { - ip_stripoptions(m, (struct mbuf *)0); - off0 = sizeof(struct ip); - } - if (m->m_len < sizeof (struct tcpiphdr)) { - if ((m = m_pullup(m, sizeof (struct tcpiphdr))) == 0) { - tcpstat.tcps_rcvshort++; - return; - } - } - ip = mtod(m, struct ip *); - ipov = (struct ipovly *)ip; - th = (struct tcphdr *)((caddr_t)ip + off0); - tlen = ip->ip_len; - - if (m->m_pkthdr.csum_flags & CSUM_DATA_VALID) { - if (m->m_pkthdr.csum_flags & CSUM_PSEUDO_HDR) - th->th_sum = m->m_pkthdr.csum_data; - else - th->th_sum = in_pseudo(ip->ip_src.s_addr, - ip->ip_dst.s_addr, htonl(m->m_pkthdr.csum_data + - ip->ip_len + IPPROTO_TCP)); - th->th_sum ^= 0xffff; } else { /* - * Checksum extended TCP header and data. + * Get IP and TCP header together in first mbuf. + * Note: IP leaves IP header in first mbuf. */ - len = sizeof (struct ip) + tlen; - bzero(ipov->ih_x1, sizeof(ipov->ih_x1)); - ipov->ih_len = (u_short)tlen; - ipov->ih_len = htons(ipov->ih_len); - th->th_sum = in_cksum(m, len); - } - if (th->th_sum) { - tcpstat.tcps_rcvbadsum++; - goto drop; - } + if (off0 > sizeof (struct ip)) { + ip_stripoptions(m, (struct mbuf *)0); + off0 = sizeof(struct ip); + } + if (m->m_len < sizeof (struct tcpiphdr)) { + if ((m = m_pullup(m, sizeof (struct tcpiphdr))) == 0) { + tcpstat.tcps_rcvshort++; + return; + } + } + ip = mtod(m, struct ip *); + ipov = (struct ipovly *)ip; + th = (struct tcphdr *)((caddr_t)ip + off0); + tlen = ip->ip_len; + + if (m->m_pkthdr.csum_flags & CSUM_DATA_VALID) { + if (m->m_pkthdr.csum_flags & CSUM_PSEUDO_HDR) + th->th_sum = m->m_pkthdr.csum_data; + else + th->th_sum = in_pseudo(ip->ip_src.s_addr, + ip->ip_dst.s_addr, + htonl(m->m_pkthdr.csum_data + + ip->ip_len + + IPPROTO_TCP)); + th->th_sum ^= 0xffff; + } else { + /* + * Checksum extended TCP header and data. + */ + len = sizeof (struct ip) + tlen; + bzero(ipov->ih_x1, sizeof(ipov->ih_x1)); + ipov->ih_len = (u_short)tlen; + ipov->ih_len = htons(ipov->ih_len); + th->th_sum = in_cksum(m, len); + } + if (th->th_sum) { + tcpstat.tcps_rcvbadsum++; + goto drop; + } #ifdef INET6 - /* Re-initialization for later version check */ - ip->ip_v = IPVERSION; + /* Re-initialization for later version check */ + ip->ip_v = IPVERSION; #endif - } + } /* * Check that TCP offset makes sense, @@ -464,24 +462,22 @@ } tlen -= off; /* tlen is used instead of ti->ti_len */ if (off > sizeof (struct tcphdr)) { -#ifdef INET6 if (isipv6) { IP6_EXTHDR_CHECK(m, off0, off, ); ip6 = mtod(m, struct ip6_hdr *); th = (struct tcphdr *)((caddr_t)ip6 + off0); - } else -#endif /* INET6 */ - { - if (m->m_len < sizeof(struct ip) + off) { - if ((m = m_pullup(m, sizeof (struct ip) + off)) == 0) { - tcpstat.tcps_rcvshort++; - return; + } else { + if (m->m_len < sizeof(struct ip) + off) { + if ((m = m_pullup(m, sizeof (struct ip) + off)) + == 0) { + tcpstat.tcps_rcvshort++; + return; + } + ip = mtod(m, struct ip *); + ipov = (struct ipovly *)ip; + th = (struct tcphdr *)((caddr_t)ip + off0); } - ip = mtod(m, struct ip *); - ipov = (struct ipovly *)ip; - th = (struct tcphdr *)((caddr_t)ip + off0); } - } optlen = off - sizeof (struct tcphdr); optp = (u_char *)(th + 1); } @@ -526,60 +522,50 @@ headlocked = 1; findpcb: /* IPFIREWALL_FORWARD section */ - if (next_hop != NULL -#ifdef INET6 - && isipv6 == NULL /* IPv6 support is not yet */ -#endif /* INET6 */ - ) { + if (next_hop != NULL && isipv6 == 0) { /* IPv6 support is not yet */ /* * Transparently forwarded. Pretend to be the destination. * already got one like this? */ inp = in_pcblookup_hash(&tcbinfo, ip->ip_src, th->th_sport, - ip->ip_dst, th->th_dport, 0, m->m_pkthdr.rcvif); + ip->ip_dst, th->th_dport, + 0, m->m_pkthdr.rcvif); if (!inp) { - /* - * No, then it's new. Try find the ambushing socket - */ - if (next_hop->sin_port == 0) { - inp = in_pcblookup_hash(&tcbinfo, ip->ip_src, - th->th_sport, next_hop->sin_addr, - th->th_dport, 1, m->m_pkthdr.rcvif); - } else { - inp = in_pcblookup_hash(&tcbinfo, - ip->ip_src, th->th_sport, - next_hop->sin_addr, - ntohs(next_hop->sin_port), 1, - m->m_pkthdr.rcvif); - } + /* It's new. Try find the ambushing socket. */ + inp = in_pcblookup_hash(&tcbinfo, + ip->ip_src, th->th_sport, + next_hop->sin_addr, + next_hop->sin_port ? + ntohs(next_hop->sin_port) : + th->th_dport, + 1, m->m_pkthdr.rcvif); } - } else - { -#ifdef INET6 - if (isipv6) - inp = in6_pcblookup_hash(&tcbinfo, &ip6->ip6_src, th->th_sport, - &ip6->ip6_dst, th->th_dport, 1, - m->m_pkthdr.rcvif); - else -#endif /* INET6 */ - inp = in_pcblookup_hash(&tcbinfo, ip->ip_src, th->th_sport, - ip->ip_dst, th->th_dport, 1, m->m_pkthdr.rcvif); + } else { + if (isipv6) + inp = in6_pcblookup_hash(&tcbinfo, + &ip6->ip6_src, th->th_sport, + &ip6->ip6_dst, th->th_dport, + 1, m->m_pkthdr.rcvif); + else + inp = in_pcblookup_hash(&tcbinfo, + ip->ip_src, th->th_sport, + ip->ip_dst, th->th_dport, + 1, m->m_pkthdr.rcvif); } #ifdef IPSEC -#ifdef INET6 if (isipv6) { if (inp != NULL && ipsec6_in_reject_so(m, inp->inp_socket)) { ipsec6stat.in_polvio++; goto drop; } - } else -#endif /* INET6 */ - if (inp != NULL && ipsec4_in_reject_so(m, inp->inp_socket)) { - ipsecstat.in_polvio++; - goto drop; + } else { + if (inp != NULL && ipsec4_in_reject_so(m, inp->inp_socket)) { + ipsecstat.in_polvio++; + goto drop; + } } -#endif /*IPSEC*/ +#endif /* * If the state is CLOSED (i.e., TCB does not exist) then @@ -591,34 +577,32 @@ if (log_in_vain) { #ifdef INET6 char dbuf[INET6_ADDRSTRLEN], sbuf[INET6_ADDRSTRLEN]; -#else /* INET6 */ +#else char dbuf[4*sizeof "123"], sbuf[4*sizeof "123"]; -#endif /* INET6 */ +#endif -#ifdef INET6 if (isipv6) { strcpy(dbuf, ip6_sprintf(&ip6->ip6_dst)); strcpy(sbuf, ip6_sprintf(&ip6->ip6_src)); - } else -#endif - { - strcpy(dbuf, inet_ntoa(ip->ip_dst)); - strcpy(sbuf, inet_ntoa(ip->ip_src)); - } + } else { + strcpy(dbuf, inet_ntoa(ip->ip_dst)); + strcpy(sbuf, inet_ntoa(ip->ip_src)); + } switch (log_in_vain) { case 1: - if(thflags & TH_SYN) + if (thflags & TH_SYN) log(LOG_INFO, - "Connection attempt to TCP %s:%d from %s:%d\n", - dbuf, ntohs(th->th_dport), - sbuf, - ntohs(th->th_sport)); + "Connection attempt to TCP %s:%d " + "from %s:%d\n", + dbuf, ntohs(th->th_dport), sbuf, + ntohs(th->th_sport)); break; case 2: log(LOG_INFO, - "Connection attempt to TCP %s:%d from %s:%d flags:0x%x\n", - dbuf, ntohs(th->th_dport), sbuf, - ntohs(th->th_sport), thflags); + "Connection attempt to TCP %s:%d " + "from %s:%d flags:0x%x\n", + dbuf, ntohs(th->th_dport), sbuf, + ntohs(th->th_sport), thflags); break; default: break; @@ -666,13 +650,12 @@ #ifdef TCPDEBUG if (so->so_options & SO_DEBUG) { ostate = tp->t_state; -#ifdef INET6 if (isipv6) bcopy((char *)ip6, (char *)tcp_saveipgen, - sizeof(*ip6)); + sizeof(*ip6)); else -#endif /* INET6 */ - bcopy((char *)ip, (char *)tcp_saveipgen, sizeof(*ip)); + bcopy((char *)ip, (char *)tcp_saveipgen, + sizeof(*ip)); tcp_savetcp = *th; } #endif @@ -681,14 +664,12 @@ goto after_listen; #ifdef INET6 inc.inc_isipv6 = isipv6; +#endif if (isipv6) { inc.inc6_faddr = ip6->ip6_src; inc.inc6_laddr = ip6->ip6_dst; inc.inc6_route.ro_rt = NULL; /* XXX */ - - } else -#endif /* INET6 */ - { + } else { inc.inc_faddr = ip->ip_src; inc.inc_laddr = ip->ip_dst; inc.inc_route.ro_rt = NULL; /* XXX */ @@ -817,15 +798,14 @@ * Don't bother responding if the destination was a broadcast. */ if (th->th_dport == th->th_sport) { -#ifdef INET6 if (isipv6) { if (IN6_ARE_ADDR_EQUAL(&ip6->ip6_dst, &ip6->ip6_src)) goto drop; - } else -#endif /* INET6 */ - if (ip->ip_dst.s_addr == ip->ip_src.s_addr) - goto drop; + } else { + if (ip->ip_dst.s_addr == ip->ip_src.s_addr) + goto drop; + } } /* * RFC1122 4.2.3.10, p. 104: discard bcast/mcast SYN @@ -836,18 +816,17 @@ */ if (m->m_flags & (M_BCAST|M_MCAST)) goto drop; -#ifdef INET6 if (isipv6) { if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst) || IN6_IS_ADDR_MULTICAST(&ip6->ip6_src)) goto drop; - } else -#endif - if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) || - IN_MULTICAST(ntohl(ip->ip_src.s_addr)) || - ip->ip_src.s_addr == htonl(INADDR_BROADCAST) || - in_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) - goto drop; + } else { + if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr)) || + IN_MULTICAST(ntohl(ip->ip_src.s_addr)) || + ip->ip_src.s_addr == htonl(INADDR_BROADCAST) || + in_broadcast(ip->ip_dst, m->m_pkthdr.rcvif)) + goto drop; + } /* * SYN appears to be valid; create compressed TCP state * for syncache, or perform t/tcp connection. @@ -884,20 +863,13 @@ * segment. Otherwise must send ACK now in case * the other side is slow starting. */ - if (DELAY_ACK(tp) && ((thflags & TH_FIN) || - (tlen != 0 && -#ifdef INET6 - ((isipv6 && in6_localaddr(&inp->in6p_faddr)) - || - (!isipv6 && -#endif - in_localaddr(inp->inp_faddr) -#ifdef INET6 - )) -#endif - ))) { - callout_reset(tp->tt_delack, tcp_delacktime, - tcp_timer_delack, tp); + if (DELAY_ACK(tp) && + ((thflags & TH_FIN) || + (tlen != 0 && + ((isipv6 && in6_localaddr(&inp->in6p_faddr)) || + (!isipv6 && in_localaddr(inp->inp_faddr)))))) { + callout_reset(tp->tt_delack, tcp_delacktime, + tcp_timer_delack, tp); tp->t_flags |= TF_NEEDSYN; } else tp->t_flags |= (TF_ACKNOW | TF_NEEDSYN); @@ -984,7 +956,7 @@ * proposal of the tcplw@cray.com list (Braden 1993/04/26). */ if ((to.to_flags & TOF_TS) != 0 && - SEQ_LEQ(th->th_seq, tp->last_ack_sent)) { + SEQ_LEQ(th->th_seq, tp->last_ack_sent)) { tp->ts_recent_age = ticks; tp->ts_recent = to.to_tsval; } @@ -1017,7 +989,8 @@ ticks - to.to_tsecr + 1); else if (tp->t_rtttime && SEQ_GT(th->th_ack, tp->t_rtseq)) - tcp_xmit_timer(tp, ticks - tp->t_rtttime); + tcp_xmit_timer(tp, + ticks - tp->t_rtttime); acked = th->th_ack - tp->snd_una; tcpstat.tcps_rcvackpack++; tcpstat.tcps_rcvackbyte += acked; @@ -1223,15 +1196,16 @@ tcp_timer_keep, tp); } } else { - /* - * Received initial SYN in SYN-SENT[*] state => simul- - * taneous open. If segment contains CC option and there is - * a cached CC, apply TAO test; if it succeeds, connection is - * half-synchronized. Otherwise, do 3-way handshake: - * SYN-SENT -> SYN-RECEIVED - * SYN-SENT* -> SYN-RECEIVED* - * If there was no CC option, clear cached CC value. - */ + /* + * Received initial SYN in SYN-SENT[*] state => + * simultaneous open. If segment contains CC option + * and there is a cached CC, apply TAO test. + * If it succeeds, connection is * half-synchronized. + * Otherwise, do 3-way handshake: + * SYN-SENT -> SYN-RECEIVED + * SYN-SENT* -> SYN-RECEIVED* + * If there was no CC option, clear cached CC value. + */ tp->t_flags |= TF_ACKNOW; callout_stop(tp->tt_rexmt); if (to.to_flags & TOF_CC) { @@ -1282,15 +1256,17 @@ tp->snd_wl1 = th->th_seq - 1; tp->rcv_up = th->th_seq; /* - * Client side of transaction: already sent SYN and data. - * If the remote host used T/TCP to validate the SYN, - * our data will be ACK'd; if so, enter normal data segment - * processing in the middle of step 5, ack processing. - * Otherwise, goto step 6. + * Client side of transaction: already sent SYN and data. + * If the remote host used T/TCP to validate the SYN, + * our data will be ACK'd; if so, enter normal data segment + * processing in the middle of step 5, ack processing. + * Otherwise, goto step 6. */ if (thflags & TH_ACK) goto process_ACK; + goto step6; + /* * If the state is LAST_ACK or CLOSING or TIME_WAIT: * if segment contains a SYN and CC [not CC.NEW] option: >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 17 3:47:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EF0D37B401; Sat, 17 Aug 2002 03:47:22 -0700 (PDT) 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 6E2C337B400 for ; Sat, 17 Aug 2002 03:47:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BCCF43E70 for ; Sat, 17 Aug 2002 03:47:17 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7HAlGJU008551 for ; Sat, 17 Aug 2002 03:47:17 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7HAlGx6008548 for perforce@freebsd.org; Sat, 17 Aug 2002 03:47:16 -0700 (PDT) Date: Sat, 17 Aug 2002 03:47:16 -0700 (PDT) Message-Id: <200208171047.g7HAlGx6008548@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16150 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16150 Change 16150 by mini@mini_stylus on 2002/08/17 03:47:14 Remove additional wrappers. Affected files ... .. //depot/projects/kse/lib/libc_r/uthread/uthread_msync.c#3 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_wait4.c#3 edit Differences ... ==== //depot/projects/kse/lib/libc_r/uthread/uthread_msync.c#3 (text+ko) ==== @@ -14,16 +14,6 @@ __weak_reference(__msync, msync); int -_msync(void *addr, size_t len, int flags) -{ - int ret; - - ret = __sys_msync(addr, len, flags); - - return (ret); -} - -int __msync(void *addr, size_t len, int flags) { int ret; @@ -35,7 +25,7 @@ * a cancellation point, as per the standard. sigh. */ _thread_enter_cancellation_point(); - ret = _msync(addr, len, flags); + ret = __sys_msync(addr, len, flags); _thread_leave_cancellation_point(); return ret; ==== //depot/projects/kse/lib/libc_r/uthread/uthread_wait4.c#3 (text+ko) ==== @@ -41,35 +41,6 @@ __weak_reference(__wait4, wait4); pid_t -_wait4(pid_t pid, int *istat, int options, struct rusage * rusage) -{ - struct pthread *curthread = _get_curthread(); - pid_t ret; - - _thread_kern_sig_defer(); - - /* Perform a non-blocking wait4 syscall: */ - while ((ret = __sys_wait4(pid, istat, options | WNOHANG, rusage)) == 0 && (options & WNOHANG) == 0) { - /* Reset the interrupted operation flag: */ - curthread->interrupted = 0; - - /* Schedule the next thread while this one waits: */ - _thread_kern_sched_state(PS_WAIT_WAIT, __FILE__, __LINE__); - - /* Check if this call was interrupted by a signal: */ - if (curthread->interrupted) { - errno = EINTR; - ret = -1; - break; - } - } - - _thread_kern_sig_undefer(); - - return (ret); -} - -pid_t __wait4(pid_t pid, int *istat, int options, struct rusage *rusage) { pid_t ret; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 17 4:16:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D769437B401; Sat, 17 Aug 2002 04:15:14 -0700 (PDT) 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 7D8B137B400 for ; Sat, 17 Aug 2002 04:15:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 633CF43E77 for ; Sat, 17 Aug 2002 04:15:06 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7HBF1JU018920 for ; Sat, 17 Aug 2002 04:15:01 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7HBEpd1018874 for perforce@freebsd.org; Sat, 17 Aug 2002 04:14:51 -0700 (PDT) Date: Sat, 17 Aug 2002 04:14:51 -0700 (PDT) Message-Id: <200208171114.g7HBEpd1018874@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16151 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16151 Change 16151 by mini@mini_stylus on 2002/08/17 04:14:18 IFC @16149 Affected files ... .. //depot/projects/kse/bin/ps/ps.1#10 integrate .. //depot/projects/kse/include/Makefile#2 integrate .. //depot/projects/kse/include/arpa/inet.h#2 integrate .. //depot/projects/kse/include/cpio.h#1 branch .. //depot/projects/kse/include/ctype.h#2 integrate .. //depot/projects/kse/include/fmtmsg.h#1 branch .. //depot/projects/kse/include/inttypes.h#2 integrate .. //depot/projects/kse/include/search.h#2 integrate .. //depot/projects/kse/include/stdbool.h#2 integrate .. //depot/projects/kse/include/stdio.h#2 integrate .. //depot/projects/kse/include/stdlib.h#2 integrate .. //depot/projects/kse/include/time.h#2 integrate .. //depot/projects/kse/include/ulimit.h#1 branch .. //depot/projects/kse/include/wchar.h#2 integrate .. //depot/projects/kse/include/wctype.h#2 integrate .. //depot/projects/kse/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/gen/disklabel.c#2 integrate .. //depot/projects/kse/lib/libc/gen/dlopen.3#2 integrate .. //depot/projects/kse/lib/libc/gen/err.3#2 integrate .. //depot/projects/kse/lib/libc/gen/errlst.c#2 integrate .. //depot/projects/kse/lib/libc/gen/fmtcheck.3#2 integrate .. //depot/projects/kse/lib/libc/gen/fmtmsg.3#1 branch .. //depot/projects/kse/lib/libc/gen/fmtmsg.c#1 branch .. //depot/projects/kse/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/kse/lib/libc/gen/getvfsbyname.c#2 integrate .. //depot/projects/kse/lib/libc/gen/getvfsent.c#2 integrate .. //depot/projects/kse/lib/libc/gen/semctl.c#2 integrate .. //depot/projects/kse/lib/libc/gen/ulimit.3#1 branch .. //depot/projects/kse/lib/libc/gen/ulimit.c#1 branch .. //depot/projects/kse/lib/libc/i386/gen/makecontext.c#2 integrate .. //depot/projects/kse/lib/libc/i386/sys/sbrk.S#2 integrate .. //depot/projects/kse/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/locale/btowc.3#1 branch .. //depot/projects/kse/lib/libc/locale/btowc.c#1 branch .. //depot/projects/kse/lib/libc/locale/collate.c#2 integrate .. //depot/projects/kse/lib/libc/locale/collate.h#2 integrate .. //depot/projects/kse/lib/libc/locale/euc.c#2 integrate .. //depot/projects/kse/lib/libc/locale/iswalnum.3#1 branch .. //depot/projects/kse/lib/libc/locale/iswctype.c#1 branch .. //depot/projects/kse/lib/libc/locale/ldpart.c#2 integrate .. //depot/projects/kse/lib/libc/locale/ldpart.h#2 integrate .. //depot/projects/kse/lib/libc/locale/lmessages.c#2 integrate .. //depot/projects/kse/lib/libc/locale/lmonetary.c#2 integrate .. //depot/projects/kse/lib/libc/locale/lnumeric.c#2 integrate .. //depot/projects/kse/lib/libc/locale/multibyte.3#2 integrate .. //depot/projects/kse/lib/libc/locale/rune.3#2 integrate .. //depot/projects/kse/lib/libc/locale/rune.c#2 integrate .. //depot/projects/kse/lib/libc/locale/setlocale.3#2 integrate .. //depot/projects/kse/lib/libc/locale/setlocale.c#2 integrate .. //depot/projects/kse/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/kse/lib/libc/locale/towlower.3#1 branch .. //depot/projects/kse/lib/libc/locale/wctob.c#1 branch .. //depot/projects/kse/lib/libc/locale/wctrans.3#1 branch .. //depot/projects/kse/lib/libc/locale/wctrans.c#1 branch .. //depot/projects/kse/lib/libc/locale/wctype.3#1 branch .. //depot/projects/kse/lib/libc/locale/wctype.c#1 branch .. //depot/projects/kse/lib/libc/net/getaddrinfo.c#2 integrate .. //depot/projects/kse/lib/libc/net/if_indextoname.3#2 integrate .. //depot/projects/kse/lib/libc/net/inet.3#2 integrate .. //depot/projects/kse/lib/libc/net/inet_ntop.c#2 integrate .. //depot/projects/kse/lib/libc/net/inet_pton.c#2 integrate .. //depot/projects/kse/lib/libc/nls/msgcat.c#2 integrate .. //depot/projects/kse/lib/libc/posix1e/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/posix1e/mac.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_biba.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_free.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_free.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_get.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_get.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_internal.h#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_is_present_np.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_is_present_np.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_mls.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_sebsd.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_set.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_set.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_te.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_text.3#1 branch .. //depot/projects/kse/lib/libc/posix1e/mac_text.c#1 branch .. //depot/projects/kse/lib/libc/posix1e/posix1e.3#2 integrate .. //depot/projects/kse/lib/libc/rpc/rpc_clnt_create.3#2 integrate .. //depot/projects/kse/lib/libc/stdio/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/stdio/asprintf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/fgetc.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/fgets.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/fgetwc.c#1 branch .. //depot/projects/kse/lib/libc/stdio/fgetws.3#1 branch .. //depot/projects/kse/lib/libc/stdio/fgetws.c#1 branch .. //depot/projects/kse/lib/libc/stdio/findfp.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/fprintf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/fputc.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/fputs.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/fputwc.c#1 branch .. //depot/projects/kse/lib/libc/stdio/fputws.3#1 branch .. //depot/projects/kse/lib/libc/stdio/fputws.c#1 branch .. //depot/projects/kse/lib/libc/stdio/fread.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/fwide.3#1 branch .. //depot/projects/kse/lib/libc/stdio/fwide.c#1 branch .. //depot/projects/kse/lib/libc/stdio/fwrite.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/getc.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/getchar.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/gets.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/getwc.3#1 branch .. //depot/projects/kse/lib/libc/stdio/getwc.c#1 branch .. //depot/projects/kse/lib/libc/stdio/getwchar.c#1 branch .. //depot/projects/kse/lib/libc/stdio/local.h#2 integrate .. //depot/projects/kse/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/kse/lib/libc/stdio/printf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/putc.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/putchar.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/putwc.3#1 branch .. //depot/projects/kse/lib/libc/stdio/putwc.c#1 branch .. //depot/projects/kse/lib/libc/stdio/putwchar.c#1 branch .. //depot/projects/kse/lib/libc/stdio/refill.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/setbuf.3#2 integrate .. //depot/projects/kse/lib/libc/stdio/setbuf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/setvbuf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/snprintf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/sprintf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/kse/lib/libc/stdio/ungetc.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/ungetwc.3#1 branch .. //depot/projects/kse/lib/libc/stdio/ungetwc.c#1 branch .. //depot/projects/kse/lib/libc/stdio/vasprintf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/vfprintf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/vprintf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/vsnprintf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/vsprintf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/vsscanf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/wbuf.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/calloc.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtod.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoimax.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtol.3#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtol.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoll.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoq.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoul.3#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoul.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoull.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoumax.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtouq.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/tdelete.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/tsearch.3#2 integrate .. //depot/projects/kse/lib/libc/stdtime/strftime.3#2 integrate .. //depot/projects/kse/lib/libc/stdtime/strftime.c#2 integrate .. //depot/projects/kse/lib/libc/stdtime/strptime.3#2 integrate .. //depot/projects/kse/lib/libc/stdtime/strptime.c#2 integrate .. //depot/projects/kse/lib/libc/stdtime/timelocal.c#2 integrate .. //depot/projects/kse/lib/libc/string/strcat.3#2 integrate .. //depot/projects/kse/lib/libc/string/strcat.c#2 integrate .. //depot/projects/kse/lib/libc/string/strcpy.3#2 integrate .. //depot/projects/kse/lib/libc/string/strcpy.c#2 integrate .. //depot/projects/kse/lib/libc/string/strncat.c#2 integrate .. //depot/projects/kse/lib/libc/string/strncpy.c#2 integrate .. //depot/projects/kse/lib/libc/string/strsep.3#2 integrate .. //depot/projects/kse/lib/libc/string/strxfrm.3#2 integrate .. //depot/projects/kse/lib/libc/string/strxfrm.c#2 integrate .. //depot/projects/kse/lib/libc/sys/acct.2#2 integrate .. //depot/projects/kse/lib/libc/sys/execve.2#2 integrate .. //depot/projects/kse/lib/libc/sys/fhopen.2#2 integrate .. //depot/projects/kse/lib/libc/sys/fork.2#2 integrate .. //depot/projects/kse/lib/libc/sys/getrlimit.2#2 integrate .. //depot/projects/kse/lib/libc/sys/intro.2#2 integrate .. //depot/projects/kse/lib/libc/sys/rfork.2#2 integrate .. //depot/projects/kse/lib/libc/sys/utimes.2#2 integrate .. //depot/projects/kse/lib/libc/xdr/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/xdr/xdr_array.c#2 integrate .. //depot/projects/kse/lib/libkvm/kvm_proc.c#19 integrate .. //depot/projects/kse/lib/libkvm/kvm_sparc64.c#4 integrate .. //depot/projects/kse/sys/alpha/alpha/exception.s#7 integrate .. //depot/projects/kse/sys/alpha/alpha/genassym.c#18 integrate .. //depot/projects/kse/sys/alpha/alpha/machdep.c#38 integrate .. //depot/projects/kse/sys/alpha/alpha/pmap.c#32 integrate .. //depot/projects/kse/sys/alpha/alpha/sys_machdep.c#11 integrate .. //depot/projects/kse/sys/alpha/alpha/trap.c#33 integrate .. //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#28 integrate .. //depot/projects/kse/sys/alpha/conf/GENERIC#15 integrate .. //depot/projects/kse/sys/alpha/include/pmap.h#12 integrate .. //depot/projects/kse/sys/alpha/include/proc.h#6 integrate .. //depot/projects/kse/sys/alpha/osf1/imgact_osf1.c#7 integrate .. //depot/projects/kse/sys/alpha/osf1/osf1_misc.c#13 integrate .. //depot/projects/kse/sys/alpha/osf1/osf1_mount.c#5 integrate .. //depot/projects/kse/sys/alpha/osf1/osf1_signal.c#8 integrate .. //depot/projects/kse/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/kse/sys/boot/common/loader.8#13 integrate .. //depot/projects/kse/sys/boot/forth/loader.4th.8#6 integrate .. //depot/projects/kse/sys/boot/forth/loader.conf#11 integrate .. //depot/projects/kse/sys/boot/i386/libi386/i386_module.c#4 integrate .. //depot/projects/kse/sys/boot/i386/loader/help.i386#3 integrate .. //depot/projects/kse/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/kse/sys/cam/cam_extend.c#2 delete .. //depot/projects/kse/sys/cam/cam_extend.h#2 delete .. //depot/projects/kse/sys/cam/scsi/scsi_cd.c#8 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_da.c#21 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_pass.c#6 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/kse/sys/coda/coda_namecache.c#4 integrate .. //depot/projects/kse/sys/coda/coda_subr.c#6 integrate .. //depot/projects/kse/sys/coda/coda_vfsops.c#10 integrate .. //depot/projects/kse/sys/compat/linux/linux_file.c#15 integrate .. //depot/projects/kse/sys/compat/linux/linux_getcwd.c#7 integrate .. //depot/projects/kse/sys/compat/linux/linux_ioctl.c#16 integrate .. //depot/projects/kse/sys/compat/linux/linux_misc.c#18 integrate .. //depot/projects/kse/sys/compat/linux/linux_stats.c#9 integrate .. //depot/projects/kse/sys/compat/pecoff/imgact_pecoff.c#12 integrate .. //depot/projects/kse/sys/compat/svr4/imgact_svr4.c#7 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_fcntl.c#9 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_filio.c#8 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_misc.c#16 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_sockio.c#5 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_stream.c#11 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_termios.c#5 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_ttold.c#5 integrate .. //depot/projects/kse/sys/conf/Makefile.alpha#13 integrate .. //depot/projects/kse/sys/conf/Makefile.i386#13 integrate .. //depot/projects/kse/sys/conf/Makefile.ia64#17 integrate .. //depot/projects/kse/sys/conf/Makefile.pc98#12 integrate .. //depot/projects/kse/sys/conf/Makefile.powerpc#13 integrate .. //depot/projects/kse/sys/conf/Makefile.sparc64#16 integrate .. //depot/projects/kse/sys/conf/Makefile.x86_64#2 integrate .. //depot/projects/kse/sys/conf/NOTES#11 integrate .. //depot/projects/kse/sys/conf/files#44 integrate .. //depot/projects/kse/sys/conf/files.i386#25 integrate .. //depot/projects/kse/sys/conf/files.sparc64#20 integrate .. //depot/projects/kse/sys/conf/kern.post.mk#12 integrate .. //depot/projects/kse/sys/conf/kern.pre.mk#14 integrate .. //depot/projects/kse/sys/conf/kmod_syms.awk#4 integrate .. //depot/projects/kse/sys/conf/majors#10 integrate .. //depot/projects/kse/sys/conf/options#23 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acconfig.h#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acdebug.h#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/acenv.h#6 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acglobal.h#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/aclocal.h#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acmacros.h#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acnamesp.h#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acparser.h#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acpiosxf.h#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acpixf.h#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/actables.h#5 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/actbl.h#3 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/actypes.h#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acutils.h#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/amlcode.h#6 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/amlresrc.h#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/dbcmds.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbdisasm.c#8 delete .. //depot/projects/kse/sys/contrib/dev/acpica/dbdisply.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbexec.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbfileio.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbxface.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dmbuffer.c#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/dmnames.c#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/dmopcode.c#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/dmresrc.c#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/dmresrcl.c#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/dmresrcs.c#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/dmutils.c#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/dmwalk.c#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/dsmethod.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dsobject.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dsutils.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dswload.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dswstate.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exconfig.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/excreate.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exdump.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exmisc.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exoparg1.c#5 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exoparg2.c#5 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exresnte.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exresolv.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exresop.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exstore.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exutils.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsdump.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsdumpdv.c#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/nseval.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsload.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsnames.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsxfeval.c#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/nsxfobj.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/psargs.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/psfind.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/psopcode.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/psparse.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/psutils.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/psxface.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/rscreate.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/rsio.c#4 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/rsirq.c#6 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/rslist.c#5 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/tbconvrt.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/tbget.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/tbgetall.c#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/tbinstal.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/tbrsdt.c#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/tbutils.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/tbxface.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/tbxfroot.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/utcopy.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/utglobal.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/utxface.c#8 integrate .. //depot/projects/kse/sys/ddb/db_ps.c#22 integrate .. //depot/projects/kse/sys/ddb/db_sym.h#3 integrate .. //depot/projects/kse/sys/dev/aac/aac.c#22 integrate .. //depot/projects/kse/sys/dev/aac/aac_cam.c#3 integrate .. //depot/projects/kse/sys/dev/aac/aac_pci.c#15 integrate .. //depot/projects/kse/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/kse/sys/dev/acpica/acpi.c#25 integrate .. //depot/projects/kse/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/kse/sys/dev/aic7xxx/ahc_eisa.c#3 integrate .. //depot/projects/kse/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/kse/sys/dev/ata/ata-all.c#21 integrate .. //depot/projects/kse/sys/dev/ata/atapi-all.c#13 integrate .. //depot/projects/kse/sys/dev/ata/atapi-all.h#8 integrate .. //depot/projects/kse/sys/dev/ata/atapi-cam.c#1 branch .. //depot/projects/kse/sys/dev/ata/atapi-cd.c#18 integrate .. //depot/projects/kse/sys/dev/ata/atapi-cd.h#7 integrate .. //depot/projects/kse/sys/dev/cardbus/cardbus.c#9 integrate .. //depot/projects/kse/sys/dev/drm/drm_drv.h#3 integrate .. //depot/projects/kse/sys/dev/fxp/if_fxp.c#16 integrate .. //depot/projects/kse/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/kse/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/kse/sys/dev/mii/mii.c#6 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/fc_log.h#1 branch .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi.h#1 branch .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_cnfg.h#1 branch .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_fc.h#1 branch .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_init.h#1 branch .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_ioc.h#1 branch .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_lan.h#1 branch .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_raid.h#1 branch .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_targ.h#1 branch .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_type.h#1 branch .. //depot/projects/kse/sys/dev/mpt/mpt.c#1 branch .. //depot/projects/kse/sys/dev/mpt/mpt.h#1 branch .. //depot/projects/kse/sys/dev/mpt/mpt_debug.c#1 branch .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.c#1 branch .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.h#1 branch .. //depot/projects/kse/sys/dev/mpt/mpt_pci.c#1 branch .. //depot/projects/kse/sys/dev/nge/if_nge.c#12 integrate .. //depot/projects/kse/sys/dev/nge/if_ngereg.h#4 integrate .. //depot/projects/kse/sys/dev/null/null.c#4 integrate .. //depot/projects/kse/sys/dev/pccard/pccard.c#12 integrate .. //depot/projects/kse/sys/dev/pccbb/pccbb.c#19 integrate .. //depot/projects/kse/sys/dev/pccbb/pccbbdevid.h#7 integrate .. //depot/projects/kse/sys/dev/pccbb/pccbbvar.h#8 integrate .. //depot/projects/kse/sys/dev/pci/pci.c#14 integrate .. //depot/projects/kse/sys/dev/pst/pst-iop.c#1 branch .. //depot/projects/kse/sys/dev/pst/pst-iop.h#1 branch .. //depot/projects/kse/sys/dev/pst/pst-pci.c#1 branch .. //depot/projects/kse/sys/dev/pst/pst-raid.c#1 branch .. //depot/projects/kse/sys/dev/sab/sab.c#1 branch .. //depot/projects/kse/sys/dev/sab/sab82532reg.h#1 branch .. //depot/projects/kse/sys/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/kse/sys/dev/sbni/if_sbni_isa.c#4 integrate .. //depot/projects/kse/sys/dev/sbni/if_sbni_pci.c#3 integrate .. //depot/projects/kse/sys/dev/sbni/if_sbnivar.h#3 integrate .. //depot/projects/kse/sys/dev/se/se_console.c#2 delete .. //depot/projects/kse/sys/dev/se/sereg.h#2 delete .. //depot/projects/kse/sys/dev/sn/if_sn_pccard.c#4 integrate .. //depot/projects/kse/sys/dev/sound/isa/sb16.c#7 integrate .. //depot/projects/kse/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/kse/sys/dev/sound/pci/ich.c#16 integrate .. //depot/projects/kse/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/kse/sys/dev/tdfx/tdfx_pci.c#7 integrate .. //depot/projects/kse/sys/dev/usb/hid.c#4 integrate .. //depot/projects/kse/sys/dev/usb/if_aue.c#13 integrate .. //depot/projects/kse/sys/dev/usb/ohci.c#17 integrate .. //depot/projects/kse/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/kse/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/kse/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/kse/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/kse/sys/dev/usb/uftdi.c#1 branch .. //depot/projects/kse/sys/dev/usb/uftdireg.h#1 branch .. //depot/projects/kse/sys/dev/usb/ugen.c#13 integrate .. //depot/projects/kse/sys/dev/usb/uhci.c#19 integrate .. //depot/projects/kse/sys/dev/usb/uhid.c#12 integrate .. //depot/projects/kse/sys/dev/usb/uhub.c#11 integrate .. //depot/projects/kse/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/kse/sys/dev/usb/ulpt.c#11 integrate .. //depot/projects/kse/sys/dev/usb/umass.c#13 integrate .. //depot/projects/kse/sys/dev/usb/umodem.c#9 integrate .. //depot/projects/kse/sys/dev/usb/ums.c#10 integrate .. //depot/projects/kse/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/kse/sys/dev/usb/urio.c#12 integrate .. //depot/projects/kse/sys/dev/usb/usb.c#16 integrate .. //depot/projects/kse/sys/dev/usb/usb_port.h#11 integrate .. //depot/projects/kse/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/kse/sys/dev/usb/usbdevs.h#20 integrate .. //depot/projects/kse/sys/dev/usb/usbdevs_data.h#20 integrate .. //depot/projects/kse/sys/dev/usb/uscanner.c#10 integrate .. //depot/projects/kse/sys/dev/usb/uvisor.c#1 branch .. //depot/projects/kse/sys/dev/usb/uvscom.c#3 integrate .. //depot/projects/kse/sys/dev/vinum/vinumioctl.c#9 integrate .. //depot/projects/kse/sys/dev/wi/if_wavelan_ieee.h#6 integrate .. //depot/projects/kse/sys/dev/wi/if_wi.c#25 integrate .. //depot/projects/kse/sys/dev/wi/if_wi_pccard.c#5 integrate .. //depot/projects/kse/sys/dev/wi/if_wireg.h#12 integrate .. //depot/projects/kse/sys/dev/wi/if_wivar.h#6 integrate .. //depot/projects/kse/sys/dev/wi/spectrum24t_cf.h#1 branch .. //depot/projects/kse/sys/dev/wi/wi_hostap.c#6 integrate .. //depot/projects/kse/sys/fs/deadfs/dead_vnops.c#4 integrate .. //depot/projects/kse/sys/fs/devfs/devfs.h#6 integrate .. //depot/projects/kse/sys/fs/devfs/devfs_devs.c#7 integrate .. //depot/projects/kse/sys/fs/devfs/devfs_vfsops.c#8 integrate .. //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#15 integrate .. //depot/projects/kse/sys/fs/fdescfs/fdesc_vfsops.c#8 integrate .. //depot/projects/kse/sys/fs/fdescfs/fdesc_vnops.c#9 integrate .. //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#14 integrate .. //depot/projects/kse/sys/fs/hpfs/hpfs_vfsops.c#11 integrate .. //depot/projects/kse/sys/fs/hpfs/hpfs_vnops.c#11 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_denode.c#8 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_lookup.c#6 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_vnops.c#9 integrate .. //depot/projects/kse/sys/fs/ntfs/ntfs_vfsops.c#12 integrate .. //depot/projects/kse/sys/fs/ntfs/ntfs_vnops.c#9 integrate .. //depot/projects/kse/sys/fs/nullfs/null_vfsops.c#7 integrate .. //depot/projects/kse/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/kse/sys/fs/nwfs/nwfs_io.c#6 integrate .. //depot/projects/kse/sys/fs/nwfs/nwfs_node.c#6 integrate .. //depot/projects/kse/sys/fs/nwfs/nwfs_vfsops.c#7 integrate .. //depot/projects/kse/sys/fs/nwfs/nwfs_vnops.c#4 integrate .. //depot/projects/kse/sys/fs/portalfs/portal_vfsops.c#7 integrate .. //depot/projects/kse/sys/fs/portalfs/portal_vnops.c#11 integrate .. //depot/projects/kse/sys/fs/procfs/procfs.c#4 integrate .. //depot/projects/kse/sys/fs/procfs/procfs.h#10 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#8 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_mac.c#1 branch .. //depot/projects/kse/sys/fs/pseudofs/pseudofs.h#13 integrate .. //depot/projects/kse/sys/fs/pseudofs/pseudofs_vncache.c#13 integrate .. //depot/projects/kse/sys/fs/pseudofs/pseudofs_vnops.c#17 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs_node.c#5 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs_vfsops.c#10 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs_vnops.c#11 integrate .. //depot/projects/kse/sys/fs/specfs/spec_vnops.c#15 integrate .. //depot/projects/kse/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/kse/sys/fs/udf/udf.h#2 integrate .. //depot/projects/kse/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/kse/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/kse/sys/fs/umapfs/umap_vfsops.c#6 integrate .. //depot/projects/kse/sys/fs/unionfs/union_subr.c#9 integrate .. //depot/projects/kse/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/kse/sys/gnu/ext2fs/ext2_lookup.c#6 integrate .. //depot/projects/kse/sys/gnu/ext2fs/ext2_vnops.c#6 integrate .. //depot/projects/kse/sys/i386/acpica/acpi_wakeup.c#6 integrate .. //depot/projects/kse/sys/i386/conf/GENERIC#21 integrate .. //depot/projects/kse/sys/i386/conf/NEWCARD#11 delete .. //depot/projects/kse/sys/i386/conf/NOTES#35 integrate .. //depot/projects/kse/sys/i386/conf/OLDCARD#3 integrate .. //depot/projects/kse/sys/i386/i386/elan-mmcr.c#1 branch .. //depot/projects/kse/sys/i386/i386/identcpu.c#13 integrate .. //depot/projects/kse/sys/i386/i386/mem.c#7 integrate .. //depot/projects/kse/sys/i386/i386/pmap.c#42 integrate .. //depot/projects/kse/sys/i386/i386/vm_machdep.c#61 integrate .. //depot/projects/kse/sys/i386/ibcs2/ibcs2_fcntl.c#6 integrate .. //depot/projects/kse/sys/i386/ibcs2/ibcs2_ioctl.c#9 integrate .. //depot/projects/kse/sys/i386/ibcs2/ibcs2_misc.c#6 integrate .. //depot/projects/kse/sys/i386/ibcs2/imgact_coff.c#13 integrate .. //depot/projects/kse/sys/i386/include/acpica_machdep.h#1 branch .. //depot/projects/kse/sys/i386/include/cputypes.h#3 integrate .. //depot/projects/kse/sys/i386/include/i4b_ioctl.h#6 integrate .. //depot/projects/kse/sys/i386/include/md_var.h#12 integrate .. //depot/projects/kse/sys/i386/include/pmap.h#10 integrate .. //depot/projects/kse/sys/i386/isa/vesa.c#5 integrate .. //depot/projects/kse/sys/i386/linux/imgact_linux.c#7 integrate .. //depot/projects/kse/sys/i386/pci/pci_bus.c#7 integrate .. //depot/projects/kse/sys/i4b/include/i4b_l3l4.h#4 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_l2if.c#4 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_q931.c#5 integrate .. //depot/projects/kse/sys/i4b/layer4/i4b_i4bdrv.c#9 integrate .. //depot/projects/kse/sys/i4b/layer4/i4b_l4.c#4 integrate .. //depot/projects/kse/sys/i4b/layer4/i4b_l4mgmt.c#3 integrate .. //depot/projects/kse/sys/ia64/conf/GENERIC#15 integrate .. //depot/projects/kse/sys/ia64/ia64/machdep.c#34 integrate .. //depot/projects/kse/sys/ia64/ia64/pmap.c#28 integrate .. //depot/projects/kse/sys/ia64/ia64/sapic.c#4 integrate .. //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#21 integrate .. //depot/projects/kse/sys/ia64/include/acpica_machdep.h#1 branch .. //depot/projects/kse/sys/ia64/include/pmap.h#7 integrate .. //depot/projects/kse/sys/isofs/cd9660/cd9660_vfsops.c#9 integrate .. //depot/projects/kse/sys/kern/imgact_aout.c#14 integrate .. //depot/projects/kse/sys/kern/imgact_elf.c#20 integrate .. //depot/projects/kse/sys/kern/init_main.c#46 integrate .. //depot/projects/kse/sys/kern/init_sysent.c#23 integrate .. //depot/projects/kse/sys/kern/kern_acct.c#15 integrate .. //depot/projects/kse/sys/kern/kern_acl.c#18 integrate .. //depot/projects/kse/sys/kern/kern_condvar.c#40 integrate .. //depot/projects/kse/sys/kern/kern_descrip.c#34 integrate .. //depot/projects/kse/sys/kern/kern_event.c#13 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#34 integrate .. //depot/projects/kse/sys/kern/kern_exit.c#59 integrate .. //depot/projects/kse/sys/kern/kern_fork.c#76 integrate .. //depot/projects/kse/sys/kern/kern_idle.c#17 integrate .. //depot/projects/kse/sys/kern/kern_intr.c#27 integrate .. //depot/projects/kse/sys/kern/kern_ktrace.c#14 integrate .. //depot/projects/kse/sys/kern/kern_linker.c#18 integrate .. //depot/projects/kse/sys/kern/kern_lockf.c#11 integrate .. //depot/projects/kse/sys/kern/kern_mac.c#1 branch .. //depot/projects/kse/sys/kern/kern_poll.c#9 integrate .. //depot/projects/kse/sys/kern/kern_proc.c#77 integrate .. //depot/projects/kse/sys/kern/kern_prot.c#32 integrate .. //depot/projects/kse/sys/kern/kern_shutdown.c#32 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#60 integrate .. //depot/projects/kse/sys/kern/kern_subr.c#18 integrate .. //depot/projects/kse/sys/kern/kern_switch.c#64 integrate .. //depot/projects/kse/sys/kern/kern_synch.c#77 integrate .. //depot/projects/kse/sys/kern/kern_sysctl.c#16 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#84 integrate .. //depot/projects/kse/sys/kern/link_aout.c#6 integrate .. //depot/projects/kse/sys/kern/link_elf.c#13 integrate .. //depot/projects/kse/sys/kern/subr_clock.c#2 integrate .. //depot/projects/kse/sys/kern/subr_mbuf.c#15 integrate .. //depot/projects/kse/sys/kern/subr_prf.c#17 integrate .. //depot/projects/kse/sys/kern/subr_taskqueue.c#5 integrate .. //depot/projects/kse/sys/kern/sys_generic.c#31 integrate .. //depot/projects/kse/sys/kern/sys_pipe.c#15 integrate .. //depot/projects/kse/sys/kern/sys_socket.c#10 integrate .. //depot/projects/kse/sys/kern/syscalls.c#22 integrate .. //depot/projects/kse/sys/kern/syscalls.master#22 integrate .. //depot/projects/kse/sys/kern/sysv_msg.c#10 integrate .. //depot/projects/kse/sys/kern/sysv_sem.c#16 integrate .. //depot/projects/kse/sys/kern/sysv_shm.c#13 integrate .. //depot/projects/kse/sys/kern/tty_cons.c#9 integrate .. //depot/projects/kse/sys/kern/tty_tty.c#7 integrate .. //depot/projects/kse/sys/kern/uipc_cow.c#4 integrate .. //depot/projects/kse/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/kse/sys/kern/uipc_socket.c#22 integrate .. //depot/projects/kse/sys/kern/uipc_socket2.c#20 integrate .. //depot/projects/kse/sys/kern/uipc_syscalls.c#21 integrate .. //depot/projects/kse/sys/kern/uipc_usrreq.c#21 integrate .. //depot/projects/kse/sys/kern/vfs_aio.c#28 integrate .. //depot/projects/kse/sys/kern/vfs_bio.c#21 integrate .. //depot/projects/kse/sys/kern/vfs_cache.c#15 integrate .. //depot/projects/kse/sys/kern/vfs_cluster.c#10 integrate .. //depot/projects/kse/sys/kern/vfs_default.c#9 integrate .. //depot/projects/kse/sys/kern/vfs_lookup.c#11 integrate .. //depot/projects/kse/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#38 integrate .. //depot/projects/kse/sys/kern/vfs_syscalls.c#32 integrate .. //depot/projects/kse/sys/kern/vfs_vnops.c#30 integrate .. //depot/projects/kse/sys/kern/vnode_if.src#9 integrate .. //depot/projects/kse/sys/modules/Makefile#29 integrate .. //depot/projects/kse/sys/modules/acpi/Makefile#9 integrate .. //depot/projects/kse/sys/modules/aic7xxx/Makefile#1 branch .. //depot/projects/kse/sys/modules/aic7xxx/ahc/Makefile#1 branch .. //depot/projects/kse/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#1 branch .. //depot/projects/kse/sys/modules/aic7xxx/ahc/ahc_pci/Makefile#1 branch .. //depot/projects/kse/sys/modules/aic7xxx/ahd/Makefile#1 branch .. //depot/projects/kse/sys/modules/aic7xxx/aicasm/Makefile#1 branch .. //depot/projects/kse/sys/modules/cam/Makefile#3 integrate .. //depot/projects/kse/sys/modules/ibcs2/Makefile#2 integrate .. //depot/projects/kse/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/kse/sys/modules/if_ppp/Makefile#3 integrate .. //depot/projects/kse/sys/modules/if_tun/Makefile#3 integrate .. //depot/projects/kse/sys/modules/linux/Makefile#8 integrate .. //depot/projects/kse/sys/modules/mac_biba/Makefile#1 branch .. //depot/projects/kse/sys/modules/mac_bsdextended/Makefile#1 branch .. //depot/projects/kse/sys/modules/mac_ifoff/Makefile#1 branch .. //depot/projects/kse/sys/modules/mac_mls/Makefile#1 branch .. //depot/projects/kse/sys/modules/mac_none/Makefile#1 branch .. //depot/projects/kse/sys/modules/mac_seeotheruids/Makefile#1 branch .. //depot/projects/kse/sys/modules/mac_test/Makefile#1 branch .. //depot/projects/kse/sys/modules/mii/Makefile#3 integrate .. //depot/projects/kse/sys/modules/procfs/Makefile#4 integrate .. //depot/projects/kse/sys/modules/pseudofs/Makefile#2 integrate .. //depot/projects/kse/sys/modules/svr4/Makefile#4 integrate .. //depot/projects/kse/sys/modules/uftdi/Makefile#1 branch .. //depot/projects/kse/sys/modules/uvisor/Makefile#1 branch .. //depot/projects/kse/sys/modules/wi/Makefile#6 integrate .. //depot/projects/kse/sys/net/bpf.c#13 integrate .. //depot/projects/kse/sys/net/bpfdesc.h#5 integrate .. //depot/projects/kse/sys/net/bsd_comp.c#4 integrate .. //depot/projects/kse/sys/net/if.c#19 integrate .. //depot/projects/kse/sys/net/if_ethersubr.c#16 integrate .. //depot/projects/kse/sys/net/if_gif.c#12 integrate .. //depot/projects/kse/sys/net/if_ppp.c#10 integrate .. //depot/projects/kse/sys/net/if_pppvar.h#7 integrate .. //depot/projects/kse/sys/net/if_tun.c#13 integrate .. //depot/projects/kse/sys/net/if_var.h#13 integrate .. //depot/projects/kse/sys/net/ppp_tty.c#6 integrate .. //depot/projects/kse/sys/netatalk/aarp.c#3 integrate .. //depot/projects/kse/sys/netatalk/ddp_input.c#6 integrate .. //depot/projects/kse/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/kse/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/kse/sys/netinet/if_ether.c#13 integrate .. //depot/projects/kse/sys/netinet/igmp.c#5 integrate .. //depot/projects/kse/sys/netinet/ip_divert.c#16 integrate .. //depot/projects/kse/sys/netinet/ip_dummynet.c#10 integrate .. //depot/projects/kse/sys/netinet/ip_dummynet.h#7 integrate .. //depot/projects/kse/sys/netinet/ip_fw.h#11 integrate .. //depot/projects/kse/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/kse/sys/netinet/ip_icmp.c#11 integrate .. //depot/projects/kse/sys/netinet/ip_input.c#24 integrate .. //depot/projects/kse/sys/netinet/ip_output.c#26 integrate .. //depot/projects/kse/sys/netinet/ip_var.h#7 integrate .. //depot/projects/kse/sys/netinet/raw_ip.c#16 integrate .. //depot/projects/kse/sys/netinet/tcp_debug.c#3 integrate .. //depot/projects/kse/sys/netinet/tcp_debug.h#2 integrate .. //depot/projects/kse/sys/netinet/tcp_input.c#25 integrate .. //depot/projects/kse/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/kse/sys/netinet/tcp_subr.c#18 integrate .. //depot/projects/kse/sys/netinet/tcp_syncache.c#19 integrate .. //depot/projects/kse/sys/netinet/tcp_timer.h#4 integrate .. //depot/projects/kse/sys/netinet/udp_usrreq.c#19 integrate .. //depot/projects/kse/sys/netinet6/nd6.c#8 integrate .. //depot/projects/kse/sys/nfsclient/nfs.h#11 integrate .. //depot/projects/kse/sys/nfsclient/nfs_bio.c#11 integrate .. //depot/projects/kse/sys/nfsclient/nfs_lock.c#11 integrate .. //depot/projects/kse/sys/nfsclient/nfs_lock.h#6 integrate .. //depot/projects/kse/sys/nfsclient/nfs_vfsops.c#13 integrate .. //depot/projects/kse/sys/nfsclient/nfs_vnops.c#11 integrate .. //depot/projects/kse/sys/nfsserver/nfs_serv.c#14 integrate .. //depot/projects/kse/sys/pc98/conf/GENERIC#18 integrate .. //depot/projects/kse/sys/pccard/pccard_nbk.c#8 integrate .. //depot/projects/kse/sys/pci/agp.c#8 integrate .. //depot/projects/kse/sys/pci/agp_i810.c#3 integrate .. //depot/projects/kse/sys/pci/if_mn.c#2 integrate .. //depot/projects/kse/sys/pci/if_rl.c#11 integrate .. //depot/projects/kse/sys/pci/if_sis.c#13 integrate .. //depot/projects/kse/sys/pci/if_ste.c#7 integrate .. //depot/projects/kse/sys/pci/if_stereg.h#3 integrate .. //depot/projects/kse/sys/pci/if_vr.c#6 integrate .. //depot/projects/kse/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/kse/sys/pci/uhci_pci.c#5 integrate .. //depot/projects/kse/sys/powerpc/conf/GENERIC#7 integrate .. //depot/projects/kse/sys/powerpc/include/pmap.h#8 integrate .. //depot/projects/kse/sys/powerpc/powerpc/pmap.c#19 integrate .. //depot/projects/kse/sys/powerpc/powerpc/vm_machdep.c#14 integrate .. //depot/projects/kse/sys/security/lomac/kernel_interface.c#5 integrate .. //depot/projects/kse/sys/security/lomac/kernel_util.c#8 integrate .. //depot/projects/kse/sys/security/lomac/lomacfs_subr.c#3 integrate .. //depot/projects/kse/sys/security/lomac/lomacfs_vfsops.c#3 integrate .. //depot/projects/kse/sys/security/lomac/lomacfs_vnops.c#6 integrate .. //depot/projects/kse/sys/security/mac_biba/mac_biba.c#1 branch .. //depot/projects/kse/sys/security/mac_biba/mac_biba.h#1 branch .. //depot/projects/kse/sys/security/mac_bsdextended/mac_bsdextended.c#1 branch .. //depot/projects/kse/sys/security/mac_bsdextended/mac_bsdextended.h#1 branch .. //depot/projects/kse/sys/security/mac_ifoff/mac_ifoff.c#1 branch .. //depot/projects/kse/sys/security/mac_mls/mac_mls.c#1 branch .. //depot/projects/kse/sys/security/mac_mls/mac_mls.h#1 branch .. //depot/projects/kse/sys/security/mac_none/mac_none.c#1 branch .. //depot/projects/kse/sys/security/mac_seeotheruids/mac_seeotheruids.c#1 branch .. //depot/projects/kse/sys/security/mac_test/mac_test.c#1 branch .. //depot/projects/kse/sys/sparc64/conf/GENERIC#18 integrate .. //depot/projects/kse/sys/sparc64/include/emul.h#2 delete .. //depot/projects/kse/sys/sparc64/include/pcb.h#9 integrate .. //depot/projects/kse/sys/sparc64/include/pcpu.h#6 integrate .. //depot/projects/kse/sys/sparc64/include/pmap.h#16 integrate .. //depot/projects/kse/sys/sparc64/include/profile.h#4 integrate .. //depot/projects/kse/sys/sparc64/include/pv.h#7 delete .. //depot/projects/kse/sys/sparc64/include/tlb.h#14 integrate .. //depot/projects/kse/sys/sparc64/include/tsb.h#12 integrate .. //depot/projects/kse/sys/sparc64/include/vmparam.h#11 integrate .. //depot/projects/kse/sys/sparc64/sparc64/cache.c#6 integrate .. //depot/projects/kse/sys/sparc64/sparc64/emul.c#4 delete .. //depot/projects/kse/sys/sparc64/sparc64/exception.S#1 branch .. //depot/projects/kse/sys/sparc64/sparc64/exception.s#24 delete .. //depot/projects/kse/sys/sparc64/sparc64/fp.c#9 delete .. //depot/projects/kse/sys/sparc64/sparc64/genassym.c#29 integrate .. //depot/projects/kse/sys/sparc64/sparc64/locore.S#1 branch .. //depot/projects/kse/sys/sparc64/sparc64/locore.s#15 delete .. //depot/projects/kse/sys/sparc64/sparc64/machdep.c#34 integrate .. //depot/projects/kse/sys/sparc64/sparc64/mp_exception.S#1 branch .. //depot/projects/kse/sys/sparc64/sparc64/mp_exception.s#6 delete .. //depot/projects/kse/sys/sparc64/sparc64/mp_locore.S#1 branch .. //depot/projects/kse/sys/sparc64/sparc64/mp_locore.s#3 delete .. //depot/projects/kse/sys/sparc64/sparc64/mp_machdep.c#11 integrate .. //depot/projects/kse/sys/sparc64/sparc64/pmap.c#34 integrate .. //depot/projects/kse/sys/sparc64/sparc64/pv.c#14 delete .. //depot/projects/kse/sys/sparc64/sparc64/support.S#1 branch .. //depot/projects/kse/sys/sparc64/sparc64/support.s#14 delete .. //depot/projects/kse/sys/sparc64/sparc64/swtch.S#1 branch .. //depot/projects/kse/sys/sparc64/sparc64/swtch.s#20 delete .. //depot/projects/kse/sys/sparc64/sparc64/tlb.c#4 integrate .. //depot/projects/kse/sys/sparc64/sparc64/trap.c#36 integrate .. //depot/projects/kse/sys/sparc64/sparc64/tsb.c#15 integrate .. //depot/projects/kse/sys/sys/_label.h#1 branch .. //depot/projects/kse/sys/sys/cdrio.h#6 integrate .. //depot/projects/kse/sys/sys/disklabel.h#12 integrate .. //depot/projects/kse/sys/sys/elf_common.h#3 integrate .. //depot/projects/kse/sys/sys/errno.h#7 integrate .. //depot/projects/kse/sys/sys/file.h#13 integrate .. //depot/projects/kse/sys/sys/linker.h#6 integrate .. //depot/projects/kse/sys/sys/mac.h#1 branch .. //depot/projects/kse/sys/sys/mac_policy.h#1 branch .. //depot/projects/kse/sys/sys/mbuf.h#13 integrate .. //depot/projects/kse/sys/sys/mount.h#14 integrate .. //depot/projects/kse/sys/sys/msg.h#3 integrate .. //depot/projects/kse/sys/sys/pioctl.h#5 integrate .. //depot/projects/kse/sys/sys/pipe.h#3 integrate .. //depot/projects/kse/sys/sys/proc.h#120 integrate .. //depot/projects/kse/sys/sys/protosw.h#10 integrate .. //depot/projects/kse/sys/sys/queue.h#10 integrate .. //depot/projects/kse/sys/sys/socketvar.h#24 integrate .. //depot/projects/kse/sys/sys/syscall.h#22 integrate .. //depot/projects/kse/sys/sys/syscall.mk#22 integrate .. //depot/projects/kse/sys/sys/sysctl.h#11 integrate .. //depot/projects/kse/sys/sys/sysproto.h#26 integrate .. //depot/projects/kse/sys/sys/ucred.h#16 integrate .. //depot/projects/kse/sys/sys/unistd.h#5 integrate .. //depot/projects/kse/sys/sys/vnode.h#28 integrate .. //depot/projects/kse/sys/tools/vnode_if.awk#4 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_alloc.c#13 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_extern.h#9 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_inode.c#12 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_snapshot.c#14 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_softdep.c#15 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_subr.c#5 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_vfsops.c#24 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/kse/sys/ufs/ufs/quota.h#7 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_extattr.c#14 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_extern.h#9 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_ihash.c#9 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_lookup.c#13 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_quota.c#12 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_readwrite.c#13 delete .. //depot/projects/kse/sys/ufs/ufs/ufs_vnops.c#16 integrate .. //depot/projects/kse/sys/vm/vm_contig.c#9 integrate .. //depot/projects/kse/sys/vm/vm_fault.c#15 integrate .. //depot/projects/kse/sys/vm/vm_glue.c#36 integrate .. //depot/projects/kse/sys/vm/vm_kern.c#11 integrate .. //depot/projects/kse/sys/vm/vm_object.c#16 integrate .. //depot/projects/kse/sys/vm/vm_page.c#15 integrate .. //depot/projects/kse/sys/vm/vm_page.h#11 integrate .. //depot/projects/kse/sys/vm/vm_pageout.c#18 integrate .. //depot/projects/kse/sys/vm/vm_swap.c#10 integrate .. //depot/projects/kse/sys/vm/vnode_pager.c#16 integrate Differences ... ==== //depot/projects/kse/bin/ps/ps.1#10 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.55 2002/06/10 22:48:51 jmallett Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.56 2002/08/09 10:49:50 ru Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -241,7 +241,8 @@ is displayed. .It mwchan The event name if the process is blocked normally, or the mutex name if -the process is blocked on a mutex. See the wchan and mtxname keywords +the process is blocked on a mutex. +See the wchan and mtxname keywords for details. .It nice The process scheduling increment (see @@ -376,7 +377,7 @@ .It args command and arguments .It comm -command +command .It command command and arguments .It cpu ==== //depot/projects/kse/include/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.171 2002/06/17 01:42:33 wollman Exp $ +# $FreeBSD: src/include/Makefile,v 1.175 2002/08/08 04:50:36 mike Exp $ # # Doing a make install builds /usr/include # @@ -8,9 +8,9 @@ CLEANFILES= osreldate.h version vers.c SUBDIR= arpa protocols rpcsvc rpc -INCS= a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \ +INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h db.h \ dirent.h \ - dlfcn.h elf.h elf-hints.h err.h fnmatch.h fstab.h \ + dlfcn.h elf.h elf-hints.h err.h fnmatch.h fmtmsg.h fstab.h \ fts.h glob.h grp.h \ hesiod.h histedit.h ieeefp.h ifaddrs.h inttypes.h iso646.h kenv.h \ langinfo.h \ @@ -21,7 +21,8 @@ search.h setjmp.h sgtty.h \ signal.h stab.h stdbool.h stddef.h stdio.h stdlib.h strhash.h \ string.h stringlist.h strings.h sysexits.h tar.h time.h timeconv.h \ - timers.h ttyent.h unistd.h utime.h utmp.h vis.h wchar.h wctype.h + timers.h ttyent.h ulimit.h unistd.h utime.h utmp.h vis.h wchar.h \ + wctype.h MHDRS= float.h floatingpoint.h stdarg.h varargs.h @@ -39,8 +40,8 @@ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ - security/lomac \ - ufs/ffs ufs/ufs + security/lomac security/mac_biba security/mac_bsdextended \ + security/mac_mls ufs/ffs ufs/ufs # For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/* # are taken care of ==== //depot/projects/kse/include/arpa/inet.h#2 (text+ko) ==== @@ -50,7 +50,7 @@ * * @(#)inet.h 8.1 (Berkeley) 6/2/93 * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $ - * $FreeBSD: src/include/arpa/inet.h,v 1.22 2002/04/10 10:51:53 mike Exp $ + * $FreeBSD: src/include/arpa/inet.h,v 1.24 2002/08/16 16:34:26 mike Exp $ */ #ifndef _ARPA_INET_H_ @@ -77,30 +77,30 @@ #define _UINT32_T_DECLARED #endif -#ifndef _IN_ADDR_T_DECLARED +#ifndef _IN_ADDR_T_DECLARED typedef uint32_t in_addr_t; #define _IN_ADDR_T_DECLARED #endif -#ifndef _IN_PORT_T_DECLARED +#ifndef _IN_PORT_T_DECLARED typedef uint16_t in_port_t; #define _IN_PORT_T_DECLARED #endif -#ifndef _POSIX_SOURCE -#ifdef _BSD_SIZE_T_ +#if __BSD_VISIBLE +#ifdef _BSD_SIZE_T_ typedef _BSD_SIZE_T_ size_t; -#undef _BSD_SIZE_T_ +#undef _BSD_SIZE_T_ +#endif #endif -#endif /* !_POSIX_SOURCE */ /* * XXX socklen_t is used by a POSIX.1-2001 interface, but not required by * POSIX.1-2001. */ -#ifdef _BSD_SOCKLEN_T_ +#ifdef _BSD_SOCKLEN_T_ typedef _BSD_SOCKLEN_T_ socklen_t; -#undef _BSD_SOCKLEN_T_ +#undef _BSD_SOCKLEN_T_ #endif #ifndef _STRUCT_IN_ADDR_DECLARED @@ -139,8 +139,9 @@ in_addr_t inet_addr(const char *); char *inet_ntoa(struct in_addr); -const char *inet_ntop(int, const void *, char *, socklen_t); -int inet_pton(int, const char *, void *); +const char *inet_ntop(int, const void * __restrict, char * __restrict, + socklen_t); +int inet_pton(int, const char * __restrict, void * __restrict); #if __BSD_VISIBLE int ascii2addr(int, const char *, void *); ==== //depot/projects/kse/include/ctype.h#2 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/include/ctype.h,v 1.18 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/ctype.h,v 1.19 2002/08/16 13:42:59 keichii Exp $ */ #ifndef _CTYPE_H_ @@ -65,6 +65,12 @@ #define _CTYPE_I 0x00080000L /* Ideogram */ #define _CTYPE_T 0x00100000L /* Special */ #define _CTYPE_Q 0x00200000L /* Phonogram */ +#define _CTYPE_SWM 0xe0000000L /* Mask to get screen width data */ +#define _CTYPE_SWS 30 /* Bits to shift to get width */ +#define _CTYPE_SW0 0x20000000L /* 0 width character */ +#define _CTYPE_SW1 0x00000000L /* 1 width character / default*/ +#define _CTYPE_SW2 0x80000000L /* 2 width character */ +#define _CTYPE_SW3 0xc0000000L /* 3 width character */ __BEGIN_DECLS int isalnum(int); ==== //depot/projects/kse/include/inttypes.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/inttypes.h,v 1.4 2002/07/09 05:13:30 obrien Exp $ + * $FreeBSD: src/include/inttypes.h,v 1.5 2002/08/15 09:25:03 robert Exp $ */ #ifndef _INTTYPES_H_ @@ -48,9 +48,9 @@ intmax_t imaxabs(intmax_t) __pure2; imaxdiv_t imaxdiv(intmax_t, intmax_t) __pure2; +intmax_t strtoimax(const char *__restrict, char **__restrict, int); +uintmax_t strtoumax(const char *__restrict, char **__restrict, int); /* XXX: The following functions are missing the restrict type qualifier. */ -intmax_t strtoimax(const char *, char **, int); -uintmax_t strtoumax(const char *, char **, int); intmax_t wcstoimax(const wchar_t *, wchar_t **, int); uintmax_t wcstoumax(const wchar_t *, wchar_t **, int); __END_DECLS ==== //depot/projects/kse/include/search.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $ */ -/* $FreeBSD: src/include/search.h,v 1.4 2002/03/23 17:24:53 imp Exp $ */ +/* $FreeBSD: src/include/search.h,v 1.5 2002/08/14 21:16:41 robert Exp $ */ /* * Written by J.T. Conklin @@ -44,7 +44,8 @@ int hcreate(size_t); void hdestroy(void); ENTRY *hsearch(ENTRY, ACTION); -void *tdelete(const void *, void **, int (*)(const void *, const void *)); +void *tdelete(const void *__restrict, void **__restrict, + int (*)(const void *, const void *)); void *tfind(const void *, void **, int (*)(const void *, const void *)); void *tsearch(const void *, void **, int (*)(const void *, const void *)); void twalk(const void *, void (*)(const void *, VISIT, int)); ==== //depot/projects/kse/include/stdbool.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/stdbool.h,v 1.5 2002/06/19 06:04:37 obrien Exp $ + * $FreeBSD: src/include/stdbool.h,v 1.6 2002/08/16 07:33:14 alfred Exp $ */ #ifndef _STDBOOL_H_ @@ -37,7 +37,7 @@ #define true 1 #define bool _Bool -#if __STDC_VERSION__ < 199901L +#if __STDC_VERSION__ < 199901L && __GNUC__ < 3 typedef int _Bool; #endif ==== //depot/projects/kse/include/stdio.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.41 2002/07/15 19:38:45 wollman Exp $ + * $FreeBSD: src/include/stdio.h,v 1.44 2002/08/15 10:28:51 robert Exp $ */ #ifndef _STDIO_H_ @@ -221,7 +221,7 @@ int fgetpos(FILE *, fpos_t *); char *fgets(char *, int, FILE *); FILE *fopen(const char *, const char *); -int fprintf(FILE *, const char *, ...); +int fprintf(FILE *__restrict, const char *__restrict, ...); int fputc(int, FILE *); int fputs(const char *, FILE *); size_t fread(void *, size_t, size_t, FILE *); @@ -235,7 +235,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 17 16:16: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F85837B401; Sat, 17 Aug 2002 16:16:05 -0700 (PDT) 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 0143637B400 for ; Sat, 17 Aug 2002 16:16:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0D5C43E70 for ; Sat, 17 Aug 2002 16:16:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7HNG4JU026833 for ; Sat, 17 Aug 2002 16:16:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7HNG4Ol026829 for perforce@freebsd.org; Sat, 17 Aug 2002 16:16:04 -0700 (PDT) Date: Sat, 17 Aug 2002 16:16:04 -0700 (PDT) Message-Id: <200208172316.g7HNG4Ol026829@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16170 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16170 Change 16170 by rwatson@rwatson_tislabs on 2002/08/17 16:15:59 Sync MAC kernel to GENERIC. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#36 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#36 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.356 2002/08/07 05:40:34 imp Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.359 2002/08/15 08:05:40 imp Exp $ machine i386 cpu I486_CPU @@ -93,6 +93,7 @@ device ahd # AHA39320 and onboard AIC79xx devices device amd # AMD 53C974 (Tekram DC-390(T)) device isp # Qlogic family +device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') @@ -159,7 +160,7 @@ # PCCARD (PCMCIA) support # Pcmcia and cardbus bridge support -device pccbb # cardbus (yenta) bridge +device cbb # cardbus (yenta) bridge #device pcic # ExCA ISA and PCI bridges device pccard # PC Card (16-bit) bus device cardbus # CardBus (32-bit) bus To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 17 18: 8: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2455437B401; Sat, 17 Aug 2002 18:07:23 -0700 (PDT) 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 CDDEB37B400 for ; Sat, 17 Aug 2002 18:07:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BB3E43E6A for ; Sat, 17 Aug 2002 18:07:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7I17MJU058849 for ; Sat, 17 Aug 2002 18:07:22 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7I17Lv9058846 for perforce@freebsd.org; Sat, 17 Aug 2002 18:07:21 -0700 (PDT) Date: Sat, 17 Aug 2002 18:07:21 -0700 (PDT) Message-Id: <200208180107.g7I17Lv9058846@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16176 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16176 Change 16176 by rwatson@rwatson_tislabs on 2002/08/17 18:06:27 Break out mac_check_pipe_op() into mac_check_pipe_xxx() and remove the pipe operation enumeration. It seemed like a good idea, but this approach is more consistent with other object types, such as vnode. Implement these entry points for each policy. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#249 edit .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#28 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#100 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#82 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#69 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#73 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#38 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#154 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#118 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#249 (text+ko) ==== @@ -675,14 +675,26 @@ mpc->mpc_ops->mpo_check_pipe_ioctl = mpe->mpe_function; break; - case MAC_CHECK_PIPE_OP: - mpc->mpc_ops->mpo_check_pipe_op = + case MAC_CHECK_PIPE_POLL: + mpc->mpc_ops->mpo_check_pipe_poll = + mpe->mpe_function; + break; + case MAC_CHECK_PIPE_READ: + mpc->mpc_ops->mpo_check_pipe_read = mpe->mpe_function; break; case MAC_CHECK_PIPE_RELABEL: mpc->mpc_ops->mpo_check_pipe_relabel = mpe->mpe_function; break; + case MAC_CHECK_PIPE_STAT: + mpc->mpc_ops->mpo_check_pipe_stat = + mpe->mpe_function; + break; + case MAC_CHECK_PIPE_WRITE: + mpc->mpc_ops->mpo_check_pipe_write = + mpe->mpe_function; + break; case MAC_CHECK_PROC_DEBUG: mpc->mpc_ops->mpo_check_proc_debug = mpe->mpe_function; @@ -2548,11 +2560,21 @@ } int -mac_check_pipe_op(struct ucred *cred, struct pipe *pipe, int op) +mac_check_pipe_poll(struct ucred *cred, struct pipe *pipe) +{ + int error; + + MAC_CHECK(check_pipe_poll, cred, pipe, pipe->pipe_label); + + return (error); +} + +int +mac_check_pipe_read(struct ucred *cred, struct pipe *pipe) { int error; - MAC_CHECK(check_pipe_op, cred, pipe, pipe->pipe_label, op); + MAC_CHECK(check_pipe_read, cred, pipe, pipe->pipe_label); return (error); } @@ -2569,6 +2591,27 @@ } int +mac_check_pipe_stat(struct ucred *cred, struct pipe *pipe) +{ + int error; + + MAC_CHECK(check_pipe_stat, cred, pipe, pipe->pipe_label); + + return (error); +} + +int +mac_check_pipe_write(struct ucred *cred, struct pipe *pipe) +{ + int error; + + MAC_CHECK(check_pipe_write, cred, pipe, pipe->pipe_label); + + return (error); +} + + +int mac_check_proc_debug(struct ucred *cred, struct proc *proc) { int error; ==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#28 (text+ko) ==== @@ -469,7 +469,7 @@ goto unlocked_error; #ifdef MAC - error = mac_check_pipe_op(active_cred, rpipe, MAC_OP_PIPE_READ); + error = mac_check_pipe_read(active_cred, rpipe); if (error) goto locked_error; #endif @@ -885,7 +885,7 @@ return (EPIPE); } #ifdef MAC - error = mac_check_pipe_op(active_cred, wpipe, MAC_OP_PIPE_WRITE); + error = mac_check_pipe_write(active_cred, wpipe); if (error) { PIPE_UNLOCK(rpipe); return (error); @@ -1233,7 +1233,7 @@ wpipe = rpipe->pipe_peer; PIPE_LOCK(rpipe); #ifdef MAC - error = mac_check_pipe_op(active_cred, rpipe, MAC_OP_PIPE_POLL); + error = mac_check_pipe_poll(active_cred, rpipe); if (error) goto locked_error; #endif @@ -1289,7 +1289,7 @@ int error; /* XXXMAC: Pipe should be locked for this check. */ - error = mac_check_pipe_op(active_cred, pipe, MAC_OP_PIPE_STAT); + error = mac_check_pipe_stat(active_cred, pipe); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#100 (text+ko) ==== @@ -1397,8 +1397,26 @@ } static int -mac_biba_check_pipe_op(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, int op) +mac_biba_check_pipe_poll(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((pipelabel)); + + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int +mac_biba_check_pipe_read(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) { struct mac_biba *subj, *obj; @@ -1408,20 +1426,8 @@ subj = SLOT(&cred->cr_label); obj = SLOT((pipelabel)); - switch(op) { - case MAC_OP_PIPE_READ: - case MAC_OP_PIPE_STAT: - case MAC_OP_PIPE_POLL: - if (!mac_biba_dominate_single(obj, subj)) - return (EACCES); - break; - case MAC_OP_PIPE_WRITE: - if (!mac_biba_dominate_single(subj, obj)) - return (EACCES); - break; - default: - panic("mac_biba_check_pipe_op: invalid pipe operation"); - } + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); return (0); } @@ -1478,6 +1484,42 @@ } static int +mac_biba_check_pipe_stat(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((pipelabel)); + + if (!mac_biba_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int +mac_biba_check_pipe_write(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((pipelabel)); + + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int mac_biba_check_proc_debug(struct ucred *cred, struct proc *proc) { struct mac_biba *subj, *obj; @@ -2342,10 +2384,16 @@ (macop_t)mac_biba_check_mount_stat }, { MAC_CHECK_PIPE_IOCTL, (macop_t)mac_biba_check_pipe_ioctl }, - { MAC_CHECK_PIPE_OP, - (macop_t)mac_biba_check_pipe_op }, + { MAC_CHECK_PIPE_POLL, + (macop_t)mac_biba_check_pipe_poll }, + { MAC_CHECK_PIPE_READ, + (macop_t)mac_biba_check_pipe_read }, { MAC_CHECK_PIPE_RELABEL, (macop_t)mac_biba_check_pipe_relabel }, + { MAC_CHECK_PIPE_STAT, + (macop_t)mac_biba_check_pipe_stat }, + { MAC_CHECK_PIPE_WRITE, + (macop_t)mac_biba_check_pipe_write }, { MAC_CHECK_PROC_DEBUG, (macop_t)mac_biba_check_proc_debug }, { MAC_CHECK_PROC_SCHED, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#82 (text+ko) ==== @@ -1349,8 +1349,26 @@ } static int -mac_mls_check_pipe_op(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, int op) +mac_mls_check_pipe_poll(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((pipelabel)); + + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int +mac_mls_check_pipe_read(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) { struct mac_mls *subj, *obj; @@ -1360,20 +1378,8 @@ subj = SLOT(&cred->cr_label); obj = SLOT((pipelabel)); - switch(op) { - case MAC_OP_PIPE_READ: - case MAC_OP_PIPE_STAT: - case MAC_OP_PIPE_POLL: - if (!mac_mls_dominate_single(subj, obj)) - return (EACCES); - break; - case MAC_OP_PIPE_WRITE: - if (!mac_mls_dominate_single(obj, subj)) - return (EACCES); - break; - default: - panic("mac_mls_check_pipe_op: invalid pipe operation"); - } + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); return (0); } @@ -1430,6 +1436,42 @@ } static int +mac_mls_check_pipe_stat(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((pipelabel)); + + if (!mac_mls_dominate_single(subj, obj)) + return (EACCES); + + return (0); +} + +static int +mac_mls_check_pipe_write(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT((pipelabel)); + + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + + return (0); +} + +static int mac_mls_check_proc_debug(struct ucred *cred, struct proc *proc) { struct mac_mls *subj, *obj; @@ -2297,10 +2339,16 @@ (macop_t)mac_mls_check_mount_stat }, { MAC_CHECK_PIPE_IOCTL, (macop_t)mac_mls_check_pipe_ioctl }, - { MAC_CHECK_PIPE_OP, - (macop_t)mac_mls_check_pipe_op }, + { MAC_CHECK_PIPE_POLL, + (macop_t)mac_mls_check_pipe_poll }, + { MAC_CHECK_PIPE_READ, + (macop_t)mac_mls_check_pipe_read }, { MAC_CHECK_PIPE_RELABEL, (macop_t)mac_mls_check_pipe_relabel }, + { MAC_CHECK_PIPE_STAT, + (macop_t)mac_mls_check_pipe_stat }, + { MAC_CHECK_PIPE_WRITE, + (macop_t)mac_mls_check_pipe_write }, { MAC_CHECK_PROC_DEBUG, (macop_t)mac_mls_check_proc_debug }, { MAC_CHECK_PROC_SCHED, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#69 (text+ko) ==== @@ -608,8 +608,16 @@ } static int -mac_none_check_pipe_op(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, int op) +mac_none_check_pipe_poll(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + + return (0); +} + +static int +mac_none_check_pipe_read(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) { return (0); @@ -624,6 +632,22 @@ } static int +mac_none_check_pipe_stat(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + + return (0); +} + +static int +mac_none_check_pipe_write(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + + return (0); +} + +static int mac_none_check_proc_debug(struct ucred *cred, struct proc *proc) { @@ -1061,10 +1085,16 @@ (macop_t)mac_none_check_mount_stat }, { MAC_CHECK_PIPE_IOCTL, (macop_t)mac_none_check_pipe_ioctl }, - { MAC_CHECK_PIPE_OP, - (macop_t)mac_none_check_pipe_op }, + { MAC_CHECK_PIPE_POLL, + (macop_t)mac_none_check_pipe_poll }, + { MAC_CHECK_PIPE_READ, + (macop_t)mac_none_check_pipe_read }, { MAC_CHECK_PIPE_RELABEL, (macop_t)mac_none_check_pipe_relabel }, + { MAC_CHECK_PIPE_STAT, + (macop_t)mac_none_check_pipe_stat }, + { MAC_CHECK_PIPE_WRITE, + (macop_t)mac_none_check_pipe_write }, { MAC_CHECK_PROC_DEBUG, (macop_t)mac_none_check_proc_debug }, { MAC_CHECK_PROC_SCHED, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#73 (text+ko) ==== @@ -707,8 +707,18 @@ } static int -mac_te_check_pipe_op(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, int op) +mac_te_check_pipe_poll(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + + /* XXX: This will be implemented soon... */ + + return (0); +} + +static int +mac_te_check_pipe_read(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) { /* XXX: This will be implemented soon... */ @@ -732,6 +742,26 @@ } static int +mac_te_check_pipe_stat(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + + /* XXX: This will be implemented soon... */ + + return (0); +} + +static int +mac_te_check_pipe_write(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + + /* XXX: This will be implemented soon... */ + + return (0); +} + +static int mac_te_check_proc_debug(struct ucred *cred, struct proc *proc) { @@ -1767,10 +1797,16 @@ (macop_t)mac_te_check_mount_stat }, { MAC_CHECK_PIPE_IOCTL, (macop_t)mac_te_check_pipe_ioctl }, - { MAC_CHECK_PIPE_OP, - (macop_t)mac_te_check_pipe_op }, + { MAC_CHECK_PIPE_POLL, + (macop_t)mac_te_check_pipe_poll }, + { MAC_CHECK_PIPE_READ, + (macop_t)mac_te_check_pipe_read }, { MAC_CHECK_PIPE_RELABEL, (macop_t)mac_te_check_pipe_relabel }, + { MAC_CHECK_PIPE_STAT, + (macop_t)mac_te_check_pipe_stat }, + { MAC_CHECK_PIPE_WRITE, + (macop_t)mac_te_check_pipe_write }, { MAC_CHECK_PROC_DEBUG, (macop_t)mac_te_check_proc_debug }, { MAC_CHECK_PROC_SCHED, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#38 (text+ko) ==== @@ -816,8 +816,16 @@ } static int -mac_test_check_pipe_op(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, int op) +mac_test_check_pipe_poll(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + + return (0); +} + +static int +mac_test_check_pipe_read(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) { return (0); @@ -832,6 +840,22 @@ } static int +mac_test_check_pipe_stat(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + + return (0); +} + +static int +mac_test_check_pipe_write(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel) +{ + + return (0); +} + +static int mac_test_check_proc_debug(struct ucred *cred, struct proc *proc) { @@ -1267,10 +1291,16 @@ (macop_t)mac_test_check_mount_stat }, { MAC_CHECK_PIPE_IOCTL, (macop_t)mac_test_check_pipe_ioctl }, - { MAC_CHECK_PIPE_OP, - (macop_t)mac_test_check_pipe_op }, + { MAC_CHECK_PIPE_POLL, + (macop_t)mac_test_check_pipe_poll }, + { MAC_CHECK_PIPE_READ, + (macop_t)mac_test_check_pipe_read }, { MAC_CHECK_PIPE_RELABEL, (macop_t)mac_test_check_pipe_relabel }, + { MAC_CHECK_PIPE_STAT, + (macop_t)mac_test_check_pipe_stat }, + { MAC_CHECK_PIPE_WRITE, + (macop_t)mac_test_check_pipe_write }, { MAC_CHECK_PROC_DEBUG, (macop_t)mac_test_check_proc_debug }, { MAC_CHECK_PROC_SCHED, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#154 (text+ko) ==== @@ -189,16 +189,6 @@ }; /* - * MAC entry point operations - */ -enum mac_ep_ops { - MAC_OP_PIPE_READ, - MAC_OP_PIPE_WRITE, - MAC_OP_PIPE_STAT, - MAC_OP_PIPE_POLL -}; - -/* * Kernel functions to manage and evaluate labels. */ struct bpf_d; @@ -312,9 +302,12 @@ int mac_check_cred_visible(struct ucred *u1, struct ucred *u2); int mac_check_ifnet_transmit(struct ifnet *ifnet, struct mbuf *m); int mac_check_mount_stat(struct ucred *cred, struct mount *mp); -int mac_check_pipe_op(struct ucred *cred, struct pipe *pipe, int op); int mac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, unsigned long cmd, void *data); +int mac_check_pipe_poll(struct ucred *cred, struct pipe *pipe); +int mac_check_pipe_read(struct ucred *cred, struct pipe *pipe); +int mac_check_pipe_stat(struct ucred *cred, struct pipe *pipe); +int mac_check_pipe_write(struct ucred *cred, struct pipe *pipe); 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_signal(struct ucred *cred, struct proc *proc, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#118 (text+ko) ==== @@ -240,11 +240,17 @@ struct label *mntlabel); int (*mpo_check_pipe_ioctl)(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, unsigned long cmd, void *data); - int (*mpo_check_pipe_op)(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel, int op); + int (*mpo_check_pipe_poll)(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel); + int (*mpo_check_pipe_read)(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel); int (*mpo_check_pipe_relabel)(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, struct label *newlabel); + int (*mpo_check_pipe_stat)(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel); + int (*mpo_check_pipe_write)(struct ucred *cred, struct pipe *pipe, + struct label *pipelabel); int (*mpo_check_proc_debug)(struct ucred *cred, struct proc *proc); int (*mpo_check_proc_sched)(struct ucred *cred, @@ -421,8 +427,11 @@ MAC_CHECK_IFNET_TRANSMIT, MAC_CHECK_MOUNT_STAT, MAC_CHECK_PIPE_IOCTL, - MAC_CHECK_PIPE_OP, + MAC_CHECK_PIPE_POLL, + MAC_CHECK_PIPE_READ, MAC_CHECK_PIPE_RELABEL, + MAC_CHECK_PIPE_STAT, + MAC_CHECK_PIPE_WRITE, MAC_CHECK_PROC_DEBUG, MAC_CHECK_PROC_SCHED, MAC_CHECK_PROC_SIGNAL, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Aug 18 4:19:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1D9F37B401; Sun, 18 Aug 2002 04:18:06 -0700 (PDT) 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 1B39937B400 for ; Sun, 18 Aug 2002 04:18:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 769DA43E3B for ; Sun, 18 Aug 2002 04:18:02 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7IBI2JU008204 for ; Sun, 18 Aug 2002 04:18:02 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7IBI1jX008201 for perforce@freebsd.org; Sun, 18 Aug 2002 04:18:01 -0700 (PDT) Date: Sun, 18 Aug 2002 04:18:01 -0700 (PDT) Message-Id: <200208181118.g7IBI1jX008201@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16190 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16190 Change 16190 by mini@mini_stylus on 2002/08/18 04:17:56 Fix files p4 seems to have corrupted (filled with NULs). How very very icky. Affected files ... .. //depot/projects/kse/sys/dev/fxp/if_fxp.c#17 edit .. //depot/projects/kse/sys/kern/subr_mbuf.c#16 edit .. //depot/projects/kse/sys/netinet/tcp_output.c#11 edit Differences ... ==== //depot/projects/kse/sys/dev/fxp/if_fxp.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.138 2002/08/09 01:48:28 luigi Exp $ + * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.139 2002/08/18 07:04:58 sobomax Exp $ */ /* @@ -1193,7 +1193,7 @@ #ifdef DEVICE_POLLING struct ifnet *ifp = &sc->sc_if; - if (ifp->if_ipending & IFF_POLLING) + if (ifp->if_flags & IFF_POLLING) return; if (ether_poll_register(fxp_poll, ifp)) { /* disable interrupts */ @@ -1785,7 +1785,7 @@ * ... but only do that if we are not polling. And because (presumably) * the default is interrupts on, we need to disable them explicitly! */ - if ( ifp->if_ipending & IFF_POLLING ) + if ( ifp->if_flags & IFF_POLLING ) CSR_WRITE_1(sc, FXP_CSR_SCB_INTRCNTL, FXP_SCB_INTR_DISABLE); else #endif /* DEVICE_POLLING */ @@ -1991,20 +1991,161 @@ } break; - case Sles[args->fd]; + case SIOCADDMULTI: + case SIOCDELMULTI: + if (ifp->if_flags & IFF_ALLMULTI) + sc->flags |= FXP_FLAG_ALL_MCAST; + else + sc->flags &= ~FXP_FLAG_ALL_MCAST; + /* + * Multicast list has changed; set the hardware filter + * accordingly. + */ + if ((sc->flags & FXP_FLAG_ALL_MCAST) == 0) + fxp_mc_setup(sc); + /* + * fxp_mc_setup() can set FXP_FLAG_ALL_MCAST, so check it + * again rather than else {}. + */ + if (sc->flags & FXP_FLAG_ALL_MCAST) + fxp_init(sc); + error = 0; + break; + + case SIOCSIFMEDIA: + case SIOCGIFMEDIA: + if (sc->miibus != NULL) { + mii = device_get_softc(sc->miibus); + error = ifmedia_ioctl(ifp, ifr, + &mii->mii_media, command); + } else { + error = ifmedia_ioctl(ifp, ifr, &sc->sc_media, command); + } + break; + + default: + error = EINVAL; + } + splx(s); + return (error); +} + +/* + * Fill in the multicast address list and return number of entries. + */ +static int +fxp_mc_addrs(struct fxp_softc *sc) +{ + struct fxp_cb_mcs *mcsp = sc->mcsp; + struct ifnet *ifp = &sc->sc_if; + struct ifmultiaddr *ifma; + int nmcasts; + + nmcasts = 0; + if ((sc->flags & FXP_FLAG_ALL_MCAST) == 0) { +#if __FreeBSD_version < 500000 + LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { #else - struct file *fp = p->p_fd->fd_ofiles[args->fd]; + TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { #endif - u_long cmd = args->cmd; - caddr_t data = (caddr_t) args->arg; - /* - * Pass the ioctl off to our standard handler. - */ - return(fo_ioctl(fp, cmd, data, p)); + if (ifma->ifma_addr->sa_family != AF_LINK) + continue; + if (nmcasts >= MAXMCADDR) { + sc->flags |= FXP_FLAG_ALL_MCAST; + nmcasts = 0; + break; + } + bcopy(LLADDR((struct sockaddr_dl *)ifma->ifma_addr), + (void *)(uintptr_t)(volatile void *) + &sc->mcsp->mc_addr[nmcasts][0], 6); + nmcasts++; + } + } + mcsp->mc_cnt = nmcasts * 6; + return (nmcasts); } -#endif /* DRM_LINUX */ -#endif /* __FreeBSD__ */ - ! x_queued = 1; + +/* + * Program the multicast filter. + * + * We have an artificial restriction that the multicast setup command + * must be the first command in the chain, so we take steps to ensure + * this. By requiring this, it allows us to keep up the performance of + * the pre-initialized command ring (esp. link pointers) by not actually + * inserting the mcsetup command in the ring - i.e. its link pointer + * points to the TxCB ring, but the mcsetup descriptor itself is not part + * of it. We then can do 'CU_START' on the mcsetup descriptor and have it + * lead into the regular TxCB ring when it completes. + * + * This function must be called at splimp. + */ +static void +fxp_mc_setup(struct fxp_softc *sc) +{ + struct fxp_cb_mcs *mcsp = sc->mcsp; + struct ifnet *ifp = &sc->sc_if; + int count; + + /* + * If there are queued commands, we must wait until they are all + * completed. If we are already waiting, then add a NOP command + * with interrupt option so that we're notified when all commands + * have been completed - fxp_start() ensures that no additional + * TX commands will be added when need_mcsetup is true. + */ + if (sc->tx_queued) { + struct fxp_cb_tx *txp; + + /* + * need_mcsetup will be true if we are already waiting for the + * NOP command to be completed (see below). In this case, bail. + */ + if (sc->need_mcsetup) + return; + sc->need_mcsetup = 1; + + /* + * Add a NOP command with interrupt so that we are notified + * when all TX commands have been processed. + */ + txp = sc->cbl_last->next; + txp->mb_head = NULL; + txp->cb_status = 0; + txp->cb_command = FXP_CB_COMMAND_NOP | + FXP_CB_COMMAND_S | FXP_CB_COMMAND_I; + /* + * Advance the end of list forward. + */ + sc->cbl_last->cb_command &= ~FXP_CB_COMMAND_S; + sc->cbl_last = txp; + sc->tx_queued++; + /* + * Issue a resume in case the CU has just suspended. + */ + fxp_scb_wait(sc); + fxp_scb_cmd(sc, FXP_SCB_COMMAND_CU_RESUME); + /* + * Set a 5 second timer just in case we don't hear from the + * card again. + */ + ifp->if_timer = 5; + + return; + } + sc->need_mcsetup = 0; + + /* + * Initialize multicast setup descriptor. + */ + mcsp->next = sc->cbl_base; + mcsp->mb_head = NULL; + mcsp->cb_status = 0; + mcsp->cb_command = FXP_CB_COMMAND_MCAS | + FXP_CB_COMMAND_S | FXP_CB_COMMAND_I; + mcsp->link_addr = vtophys(&sc->cbl_base->cb_status); + (void) fxp_mc_addrs(sc); + sc->cbl_first = sc->cbl_last = (struct fxp_cb_tx *) mcsp; + sc->tx_queued = 1; /* * Wait until command unit is not active. This should never ==== //depot/projects/kse/sys/kern/subr_mbuf.c#16 (text+ko) ==== @@ -232,40 +232,110 @@ (mb_objp) = (mb_bckt)->mb_free[((mb_bckt)->mb_numfree)]; \ (*((mb_lst)->mb_cont.mc_objcount))--; \ if ((mb_bckt)->mb_numfree == 0) { \ - SLIST_REMOVs, >)) { - diff = ref; - timespecsub(&ref, &ts); - } else { - diff = ts; - timespecsub(&diff, &ref); - } - if (ts.tv_sec >= 2) { - /* badly off, adjust it */ - tc_setclock(&ts); - } + SLIST_REMOVE_HEAD(_mchd, mb_blist); \ + SLIST_NEXT((mb_bckt), mb_blist) = NULL; \ + (mb_bckt)->mb_owner |= MB_BUCKET_FREE; \ + } \ } +#define MB_PUT_OBJECT(mb_objp, mb_bckt, mb_lst) \ + (mb_bckt)->mb_free[((mb_bckt)->mb_numfree)] = (mb_objp); \ + (mb_bckt)->mb_numfree++; \ + (*((mb_lst)->mb_cont.mc_objcount))++; + +#define MB_MBTYPES_INC(mb_cnt, mb_type, mb_num) \ + if ((mb_type) != MT_NOTMBUF) \ + (*((mb_cnt)->mb_cont.mc_types + (mb_type))) += (mb_num) + +#define MB_MBTYPES_DEC(mb_cnt, mb_type, mb_num) \ + if ((mb_type) != MT_NOTMBUF) \ + (*((mb_cnt)->mb_cont.mc_types + (mb_type))) -= (mb_num) + +/* + * Ownership of buckets/containers is represented by integers. The PCPU + * lists range from 0 to NCPU-1. We need a free numerical id for the general + * list (we use NCPU). We also need a non-conflicting free bit to indicate + * that the bucket is free and removed from a container, while not losing + * the bucket's originating container id. We use the highest bit + * for the free marker. + */ +#define MB_GENLIST_OWNER (NCPU) +#define MB_BUCKET_FREE (1 << (sizeof(int) * 8 - 1)) + +/* Statistics structures for allocator (per-CPU and general). */ +static struct mbpstat mb_statpcpu[NCPU + 1]; +struct mbstat mbstat; + +/* Sleep time for wait code (in ticks). */ +static int mbuf_wait = 64; + +static u_int mbuf_limit = 512; /* Upper limit on # of mbufs per CPU. */ +static u_int clust_limit = 128; /* Upper limit on # of clusters per CPU. */ + +/* + * Objects exported by sysctl(8). + */ +SYSCTL_DECL(_kern_ipc); +SYSCTL_INT(_kern_ipc, OID_AUTO, nmbclusters, CTLFLAG_RD, &nmbclusters, 0, + "Maximum number of mbuf clusters available"); +SYSCTL_INT(_kern_ipc, OID_AUTO, nmbufs, CTLFLAG_RD, &nmbufs, 0, + "Maximum number of mbufs available"); +SYSCTL_INT(_kern_ipc, OID_AUTO, nmbcnt, CTLFLAG_RD, &nmbcnt, 0, + "Number used to scale kmem_map to ensure sufficient space for counters"); +SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufs, CTLFLAG_RD, &nsfbufs, 0, + "Maximum number of sendfile(2) sf_bufs available"); +SYSCTL_INT(_kern_ipc, OID_AUTO, mbuf_wait, CTLFLAG_RW, &mbuf_wait, 0, + "Sleep time of mbuf subsystem wait allocations during exhaustion"); +SYSCTL_UINT(_kern_ipc, OID_AUTO, mbuf_limit, CTLFLAG_RW, &mbuf_limit, 0, + "Upper limit of number of mbufs allowed on each PCPU list"); +SYSCTL_UINT(_kern_ipc, OID_AUTO, clust_limit, CTLFLAG_RW, &clust_limit, 0, + "Upper limit of number of mbuf clusters allowed on each PCPU list"); +SYSCTL_STRUCT(_kern_ipc, OID_AUTO, mbstat, CTLFLAG_RD, &mbstat, mbstat, + "Mbuf general information and statistics"); +SYSCTL_OPAQUE(_kern_ipc, OID_AUTO, mb_statpcpu, CTLFLAG_RD, mb_statpcpu, + sizeof(mb_statpcpu), "S,", "Mbuf allocator per CPU statistics"); + +/* + * Prototypes of local allocator routines. + */ +static void *mb_alloc_wait(struct mb_lstmngr *, short); +static struct mb_bucket *mb_pop_cont(struct mb_lstmngr *, int, + struct mb_pcpu_list *); +static void mb_reclaim(void); +static void mbuf_init(void *); + +/* + * Initial allocation numbers. Each parameter represents the number of buckets + * of each object that will be placed initially in each PCPU container for + * said object. + */ +#define NMB_MBUF_INIT 4 +#define NMB_CLUST_INIT 16 + /* - * Write system time back to RTC + * Internal flags that allow for cache locks to remain "persistent" across + * allocation and free calls. They may be used in combination. + */ +#define MBP_PERSIST 0x1 /* Return with lock still held. */ +#define MBP_PERSISTENT 0x2 /* Cache lock is already held coming in. */ + +/* + * Initialize the mbuf subsystem. + * + * We sub-divide the kmem_map into several submaps; this way, we don't have + * to worry about artificially limiting the number of mbuf or mbuf cluster + * allocations, due to fear of one type of allocation "stealing" address + * space initially reserved for another. + * + * Set up both the general containers and all the PCPU containers. Populate + * the PCPU containers with initial numbers. */ +MALLOC_DEFINE(M_MBUF, "mbufmgr", "mbuf subsystem management structures"); +SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbuf_init, NULL) void -resettodr() +mbuf_init(void *dummy) { - struct timespec ts; - int error; - - if (disable_rtc_set || clock_dev == NULL) - return; - - getnanotime(&ts); - ts.tv_sec -= tz.tz_minuteswest * 60 + (wall_cmos_clock ? adjkerntz : 0); - if ((error = CLOCK_SETTIME(clock_dev, &ts)) != 0) { - printf("warning: clock_settime failed (%d), time-of-day clock " - "not adjusted to system time\n", error); - return; - } -} - ! u_list *pcpu_cnt; + struct mb_pcpu_list *pcpu_cnt; vm_size_t mb_map_size; int i, j; ==== //depot/projects/kse/sys/netinet/tcp_output.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_output.c 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.67 2002/08/12 03:22:46 jennifer Exp $ + * $FreeBSD: src/sys/netinet/tcp_output.c,v 1.68 2002/08/17 18:26:01 dillon Exp $ */ #include "opt_inet6.h" @@ -168,6 +168,7 @@ sendalot = 0; off = tp->snd_nxt - tp->snd_una; win = min(tp->snd_wnd, tp->snd_cwnd); + win = min(win, tp->snd_bwnd); flags = tcp_outflags[tp->t_state]; /* @@ -275,149 +276,140 @@ win = sbspace(&so->so_rcv); /* - * Se, check if there's an initial rtt - * or rttvar. Convert from the route-table units - * to scaled multiples of the slow timeout timer. + * Sender silly window avoidance. We transmit under the following + * conditions when len is non-zero: + * + * - We have a full segment + * - This is the last buffer in a write()/send() and we are + * either idle or running NODELAY + * - we've timed out (e.g. persist timer) + * - we have more then 1/2 the maximum send window's worth of + * data (receiver may be limited the window size) + * - we need to retransmit */ - if (tp->t_srtt == 0 && (rtt = rt->rt_rmx.rmx_rtt)) { + if (len) { + if (len == tp->t_maxseg) + goto send; /* - * XXX the lock bit for RTT indicates that the value - * is also a minimum value; this is subject to time. + * NOTE! on localhost connections an 'ack' from the remote + * end may occur synchronously with the output and cause + * us to flush a buffer queued with moretocome. XXX + * + * note: the len + off check is almost certainly unnecessary. */ - if (rt->rt_rmx.rmx_locks & RTV_RTT) - tp->t_rttmin = rtt / (RTM_RTTUNIT / hz); - tp->t_srtt = rtt / (RTM_RTTUNIT / (hz * TCP_RTT_SCALE)); - tcpstat.tcps_usedrtt++; - if (rt->rt_rmx.rmx_rttvar) { - tp->t_rttvar = rt->rt_rmx.rmx_rttvar / - (RTM_RTTUNIT / (hz * TCP_RTTVAR_SCALE)); - tcpstat.tcps_usedrttvar++; - } else { - /* default variation is +- 1 rtt */ - tp->t_rttvar = - tp->t_srtt * TCP_RTTVAR_SCALE / TCP_RTT_SCALE; + if (!(tp->t_flags & TF_MORETOCOME) && /* normal case */ + (idle || (tp->t_flags & TF_NODELAY)) && + len + off >= so->so_snd.sb_cc && + (tp->t_flags & TF_NOPUSH) == 0) { + goto send; } - TCPT_RANGESET(tp->t_rxtcur, - ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1, - tp->t_rttmin, TCPTV_REXMTMAX); + if (tp->t_force) /* typ. timeout case */ + goto send; + if (len >= tp->max_sndwnd / 2 && tp->max_sndwnd > 0) + goto send; + if (SEQ_LT(tp->snd_nxt, tp->snd_max)) /* retransmit case */ + goto send; } + /* - * if there's an mtu associated with the route, use it - * else, use the link mtu. + * Compare available window to amount of window + * known to peer (as advertised window less + * next expected input). If the difference is at least two + * max size segments, or at least 50% of the maximum possible + * window, then want to send a window update to peer. */ - if (rt->rt_rmx.rmx_mtu) - mss = rt->rt_rmx.rmx_mtu - min_protoh; - else { - if (isipv6) { - mss = nd_ifinfo[rt->rt_ifp->if_index].linkmtu - - min_protoh; - if (!in6_localaddr(&inp->in6p_faddr)) - mss = min(mss, tcp_v6mssdflt); - } else { - mss = ifp->if_mtu - min_protoh; - if (!in_localaddr(inp->inp_faddr)) - mss = min(mss, tcp_mssdflt); - } + if (win > 0) { + /* + * "adv" is the amount we can increase the window, + * taking into account that we are limited by + * TCP_MAXWIN << tp->rcv_scale. + */ + long adv = min(win, (long)TCP_MAXWIN << tp->rcv_scale) - + (tp->rcv_adv - tp->rcv_nxt); + + if (adv >= (long) (2 * tp->t_maxseg)) + goto send; + if (2 * adv >= (long) so->so_rcv.sb_hiwat) + goto send; } - mss = min(mss, offer); + /* - * maxopd stores the maximum length of data AND options - * in a segment; maxseg is the amount of data in a normal - * segment. We need to store this value (maxopd) apart - * from maxseg, because now every segment carries options - * and thus we normally have somewhat less data in segments. + * Send if we owe peer an ACK. */ - tp->t_maxopd = mss; - + if (tp->t_flags & TF_ACKNOW) + goto send; + if ((flags & TH_RST) || + ((flags & TH_SYN) && (tp->t_flags & TF_NEEDSYN) == 0)) + goto send; + if (SEQ_GT(tp->snd_up, tp->snd_una)) + goto send; /* - * In case of T/TCP, origoffer==-1 indicates, that no segments - * were received yet. In this case we just guess, otherwise - * we do the same as before T/TCP. + * If our state indicates that FIN should be sent + * and we have not yet done so, or we're retransmitting the FIN, + * then we need to send. */ - if ((tp->t_flags & (TF_REQ_TSTMP|TF_NOOPT)) == TF_REQ_TSTMP && - (origoffer == -1 || - (tp->t_flags & TF_RCVD_TSTMP) == TF_RCVD_TSTMP)) - mss -= TCPOLEN_TSTAMP_APPA; - if ((tp->t_flags & (TF_REQ_CC|TF_NOOPT)) == TF_REQ_CC && - (origoffer == -1 || - (tp->t_flags & TF_RCVD_CC) == TF_RCVD_CC)) - mss -= TCPOLEN_CC_APPA; + if (flags & TH_FIN && + ((tp->t_flags & TF_SENTFIN) == 0 || tp->snd_nxt == tp->snd_una)) + goto send; -#if (MCLBYTES & (MCLBYTES - 1)) == 0 - if (mss > MCLBYTES) - mss &= ~(MCLBYTES-1); -#else - if (mss > MCLBYTES) - mss = mss / MCLBYTES * MCLBYTES; -#endif /* - * If there's a pipesize, change the socket buffer - * to that size. Make the socket buffers an integral - * number of mss units; if the mss is larger than - * the socket buffer, decrease the mss. + * TCP window updates are not reliable, rather a polling protocol + * using ``persist'' packets is used to insure receipt of window + * updates. The three ``states'' for the output side are: + * idle not doing retransmits or persists + * persisting to move a small or zero window + * (re)transmitting and thereby not persisting + * + * callout_active(tp->tt_persist) + * is true when we are in persist state. + * tp->t_force + * is set when we are called to send a persist packet. + * callout_active(tp->tt_rexmt) + * is set when we are retransmitting + * The output side is idle when both timers are zero. + * + * If send window is too small, there is data to transmit, and no + * retransmit or persist is pending, then go to persist state. + * If nothing happens soon, send when timer expires: + * if window is nonzero, transmit what we can, + * otherwise force out a byte. */ -#ifdef RTV_SPIPE - if ((bufsize = rt->rt_rmx.rmx_sendpipe) == 0) -#endif - bufsize = so->so_snd.sb_hiwat; - if (bufsize < mss) - mss = bufsize; - else { - bufsize = roundup(bufsize, mss); - if (bufsize > sb_max) - bufsize = sb_max; - if (bufsize > so->so_snd.sb_hiwat) - (void)sbreserve(&so->so_snd, bufsize, so, NULL); + if (so->so_snd.sb_cc && !callout_active(tp->tt_rexmt) && + !callout_active(tp->tt_persist)) { + tp->t_rxtshift = 0; + tcp_setpersist(tp); } - tp->t_maxseg = mss; -#ifdef RTV_RPIPE - if ((bufsize = rt->rt_rmx.rmx_recvpipe) == 0) -#endif - bufsize = so->so_rcv.sb_hiwat; - if (bufsize > mss) { - bufsize = roundup(bufsize, mss); - if (bufsize > sb_max) - bufsize = sb_max; - if (bufsize > so->so_rcv.sb_hiwat) - (void)sbreserve(&so->so_rcv, bufsize, so, NULL); - } + /* + * No reason to send a segment, just return. + */ + return (0); +send: /* - * Set the slow-start flight size depending on whether this - * is a local network or not. + * Before ESTABLISHED, force sending of initial options + * unless TCP set not to do any options. + * NOTE: we assume that the IP/TCP header plus TCP options + * always fit in a single mbuf, leaving room for a maximum + * link header, i.e. + * max_linkhdr + sizeof (struct tcpiphdr) + optlen <= MCLBYTES */ - if ((isipv6 && in6_localaddr(&inp->in6p_faddr)) || - (!isipv6 && in_localaddr(inp->inp_faddr))) - tp->snd_cwnd = mss * ss_fltsz_local; - else - tp->snd_cwnd = mss * ss_fltsz; + optlen = 0; +#ifdef INET6 + if (isipv6) + hdrlen = sizeof (struct ip6_hdr) + sizeof (struct tcphdr); + else +#endif + hdrlen = sizeof (struct tcpiphdr); + if (flags & TH_SYN) { + tp->snd_nxt = tp->iss; + if ((tp->t_flags & TF_NOOPT) == 0) { + u_short mss; - if (rt->rt_rmx.rmx_ssthresh) { - /* - * There's some sort of gateway or interface - * buffer limit on the path. Use this to set - * the slow start threshhold, but set the - * threshold to no less than 2*mss. - */ - tp->snd_ssthresh = max(2 * mss, rt->rt_rmx.rmx_ssthresh); - tcpstat.tcps_usedssthresh++; - } -} - -/* - * Determine the MSS option to send on an outgoing SYN. - */ -int -tcp_mssopt(tp) - struct tcpcb *tp; -{ - struct rtentry *rt; -#ifdef INET6 - int isipv6 = ((tp->t_inpcb->inp_vflag & INP_IPV6) != 0) ? 1 : 0; - size_t min_protoh = isipv6 ? - sizeof (struct ip6_hdr) + sizeof (struct tcphdr) : - sizeofof(mss)); + opt[0] = TCPOPT_MAXSEG; + opt[1] = TCPOLEN_MAXSEG; + mss = htons((u_short) tcp_mssopt(tp)); + (void)memcpy(opt + 2, &mss, sizeof(mss)); optlen = TCPOLEN_MAXSEG; if ((tp->t_flags & TF_REQ_SCALE) && To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Aug 18 13:25:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35C6337B401; Sun, 18 Aug 2002 13:24:34 -0700 (PDT) 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 9C83D37B400 for ; Sun, 18 Aug 2002 13:24:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F48B43E3B for ; Sun, 18 Aug 2002 13:24:32 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7IKOWJU057185 for ; Sun, 18 Aug 2002 13:24:32 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7IKOWJ7057182 for perforce@freebsd.org; Sun, 18 Aug 2002 13:24:32 -0700 (PDT) Date: Sun, 18 Aug 2002 13:24:32 -0700 (PDT) Message-Id: <200208182024.g7IKOWJ7057182@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 16219 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16219 Change 16219 by chris@chris_holly on 2002/08/18 13:24:00 Apply introductory text written by Robert Watson, and a few more sections written by same. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#13 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#13 (text+ko) ==== @@ -70,59 +70,180 @@ (Discreationary Access Control) policies of BSD Unix systems. This chapter introduces the MAC policy framework and - provides documentation for an sample MAC policy module. + provides documentation for a sample MAC policy module. - - Architecture - XFIG: .. MAC architecture, the path of process -> syscall -> - MAC_PERFORM -> policy + + Introduction + + The TrustedBSD MAC framework provides a mechanism to allow + the compile-time or run-time extension of the kernel access + control model. New system policies may be implemented as + kernel modules and linked to the kernel; if multiple policy + modules are present, their results will be composed. While the + framework is intended to support a variety of access control + models, its design was derived from the requirements of a set + of specific access control models required for the TrustedBSD + and CBOSS Projects. This includes support for fixed and + floating label Biba integrity policies, the MLS + confidentiality policy, the Type Enforcement rule-based access + control policy, and the ability to support layering of the NSA + FLASK framework above the TrustedBSD MAC framework. This + document describes the rough architecture of the framework, + with the understanding that this is a work-in-progress and may + change subtantially as requirements evolve. + + + + Kernel Architecture + + The TrustedBSD MAC framework provides the opportunity for + policy modules to be augment system access control decisions. + Policies are permitted the opportunity to restrict the set of + rights available for processes at a variety of relevant points + in the kernel. In addition, they are provided the opportunity + to tag processes and various kernel objects with labels storing + access control information. Policy modules may register + interest in a subset of the total available events or objects, + and are not required to implement events or objects that are not + relevant to the policy. Multiple modules may be loaded at once, + and the results of the modules are composed as necessary to + build an over-all system policy. Policy modules may be + implemented such that they can be loaded on-demand at run-time, + or such that they may only be loaded early in the boot process. + This permits policies requiring pervasive labeling of all + objects to prevent improper use. - - - Locking - - - Module writers must be aware of the locking semantics of - entry points that they implement: MAC API entry points will have - specific locking or reference counting semantics for each - argument, and modules must follow the locking and reference - counting protocol or risk a variety of failure modes, including - race conditions, imappropriate pointer dereferences, etc. - - MAC module writers must also be aware that MAC API entry - points will frequently be invoked from deep in a kernel stack, - and as such must be careful to avoid violating more global - locking requirements, such as global lock order requirements. - For example, it may be inappropriate to lock additional objects - not specifically maintained and ordered by the policy module, or - the policy module might violate a global ordering requirement - relating to those additional objects. - - Finally, MAC API module implementors must be careful to - avoid inappropriately calling back into the MAC framework: the - framework makes use of locking to prevent inconsistencies during - policy module attachment and detachment. MAC API modules should - avoid producing scenarios in which deadlocks or inconsistencies - might occur. + + + Userland Architecture + + ... - - Policy Operations + + Entry Point Framework + + Four classes of entry points are offered to policies + registered with the framework: entry points associated with + the registration and management of policies, entry points + denoting initialization, creation, destruction, and other life + cycle events for kernel objects, events assocated with access + control decisions that the policy module may influence, and + calls associated with the management of labels on objects. In + addition, a mac_syscall() entry point is + provided so that policies may extend the kernel interface + without registering new system calls. + + Policy module writers should be aware of the kernel + locking strategy, as well as what object locks are available + during which entry points. Writers should attempt to avoid + deadlock scenarios by avoiding grabbing non-leaf locks inside + of entry points, and also follow the locking protocol for + object access and modification. In particular, writers should + be aware that while necessary locks to access objects and + their labels are generally held, sufficient locks to modify an + object or its label may not be present for all entry points. + Locking information for arguments is documented in the MAC + framework entry point document. + + Policy entry points will pass a reference to the object + label along with the object itself. This permits labeled + policies to be unaware of the internals of the object yet + still make decisions based on the label. The exception to this + is the process credential, which is assumed to be understood + by policies as a first class security object in the kernel. + Policies that do not implement labels on kernel objects will + be passed NULL pointers for label arguments to entry + points. + + + Policy Module Registration + + Modules may be declared using the + MAC_POLICY_SET() macro, which names the + policy, provides a reference to the MAC entry point vector, + provides load-time flags determining how the policy framework + should handle the policy, and optionally requests the + allocation of label state by the framework: + + static struct mac_policy_op_entry mac_none_ops[] = +{ + { MAC_DESTROY, + (macop_t)mac_none_destroy }, + { MAC_INIT, + (macop_t)mac_none_init }, + { MAC_INIT_BPFDESC, + (macop_t)mac_none_init_bpfdesc }, +/* ... */ + { MAC_CHECK_VNODE_STAT, + (macop_t)mac_none_check_vnode_stat }, + { MAC_CHECK_VNODE_WRITE, + (macop_t)mac_none_check_vnode_write }, + { MAC_OP_LAST, NULL } +}; - The MAC policy framework implements policy operation entry - points which supply policy modules with relevant data on a - subject and the operation it is attempting to perform on an - object. - - - Policy Module Operations - - The MAC policy framework includes the ability for policies - to be compiled as separate loadable kernel modules. The - following entry points are defined for module-related - events. + The MAC policy entry point vector, + mac_none_ops in this example, associates + functions defined in the module with specific entry points. A + complete listing of available entry points and their + prototypes may be found in the MAC entry point reference + section. Of specific interest during module registration are + the MAC_DESTROY and MAC_INIT + entry points. MAC_INIT will be invoked once a + policy is successfully registered with the module framework + but prior to any other entry points becoming active. This + permits the policy to perform any policy-specific allocation + and initialization, such as initialization of any data or + locks. MAC_DESTROY will be invoked when a + policy module is unloaded to permit releasing of any allocated + memory and destruction of locks. Currently, these two entry + points are invoked with the MAC policy list mutex held to + prevent any other entry points from being invoked: this will + be changed, but in the mean time, policies should be careful + about what kernel primitives they invoke so as to avoid lock + ordering or sleeping problems. + + The policy declaration's module name field exists so that + the module may be uniquely identified for the purposes of + module dependencies. An appropriate string should be selected. + The full string name of the policy is displayed to the user + via the kernel log during load and unload events, and also + exported when providing status information to userland + processes. + + The policy flags field permits the module to provide the + framework with information about its loader-related + capabilities. Currently, two flags are defined: + + + + MPC_LOADTIME_FLAG_UNLOADOK + + + This flag indicates that the policy module may be + unloaded. If this flag is not provided, then the policy + framework will reject requests to unload the module. + This flag might be used by modules that allocate label + state and are unable to free that state at + runtime. + + + + + MPC_LOADTIME_FLAG_NOTLATE + + This flag indicates that the policy module + must be loaded and initialized early in the boot + process. If the flag is specified, attempts to register + the module following boot will be rejected. The flag + may be used by policies that require pervasive labeling + of all system objects, and cannot handle objects that + have not been properly initialized by the policy. + + + <function>&mac.mpo;_init</function @@ -184,891 +305,82 @@ caution should be applied. + + + Label Events + + This class of entry points is used by the MAC framework to + permit policies to maintain label information on kernel + objects. For each labeled kernel object of interest to a MAC + policy, entry points may be registered for relevant life cycle + events. All objects implement initialization, creation, and + destruction hooks. Some objects will also implement + relabeling, allowing user processes to change the labels on + objects. Some objects will also implement object-specific + events, such as label events associated with IP reassembly. A + typical labeled object will have the following life cycle of + entry points: - - Label Operations + Label initialization o +(object-specific wait) \ +Label creation o + \ +Relabel events, o--<--. +Various object-specific, | | +Access control events ~-->--o + \ +Label destruction o + + Label initialization permits policies to allocate memory + and set initial values for labels without context for the use + of the object. The label slot allocated to a policy will be + zero'd by default, so some policies may not need to perform + initialization. + + Label creation occurs when the kernel structure is + associated with an actual kernel object. For example, mbufs + may be allocated and remain unused in a pool until they are + required. mbuf allocation causes label initialization on the + mbuf to take place, but mbuf creation occurs when the mbuf is + associated with a datagram. Typically, context will be + provided for a creation event, including the circumstances of + the creation, and labels of other relevant objects in the + creation process. For example, when an mbuf is created from a + socket, the socket and its label will be presented to + registered policies in addition to the new mbuf and its label. + Memory allocation in creation events is discouraged, as it may + occur in performance sensitive ports of the kernel; in + addition, creation calls are not permitted to fail so a + failure to allocate memory cannot be reported. + + Object specific events do not generally fall into the + other broad classes of label events, but will generally + provide an opportunity to modify or update the label on an + object based on additional context. For example, the label on + an IP fragment reassembly queue may be updated during the + MAC_UPDATE_IPQ entry point as a result of the + acceptance of an additional mbuf to that queue. + + Access control events are discussed in detail in the + following section. + + Label destruction permits policies to release storage or + state associated with a label during its association with an + object so that the kernel data structures supporting the + object may be reused or released. + + In addition to labels associated with specific kernel + objects, an additional class of labels exists: temporary + labels. These labels are used to store update information + submitted by user processes. These labels are initialized and + destroyed as with other label types, but the creation event is + MAC_INTERNALIZE, which accepts a user label + to be converted to an in-kernel representation. - ... - - - <function>&mac.mpo;_init_bpfdesc</function> - - - - void - &mac.mpo;_init_bpfdesc - - struct bpf_d - *bpf_d - struct label - *label - - - - - - &mac.thead; - - - - bpf_d - Object; bpf descriptor - - - - label - New label to apply - - - - - - Initialize the label on a newly instantiated bpfdesc (BPF - descriptor) - - - - <function>&mac.mpo;_init_devfsdirent</function> - - - - void - &mac.mpo;_init_devfsdirent - - struct devfs_dirent - *devfs_dirent - struct label - *label - - - - - - &mac.thead; - - - - devfs_dirent - Object; devfs directory entry - - - - label - New label to apply - - - - - - Initialize the label on a newly instantiated devfs - entry. - - - - <function>&mac.mpo;_init_ifnet</function> - - - - void - &mac.mpo;_init_ifnet - - struct ifnet - *ifnet - struct label - *label - - - - - - &mac.thead; - - - - ifnet - Object; network interface - - - - label - New label to apply - - - - - - Initialize the label on a newly instantiated network - interface. - - - - <function>&mac.mpo;_init_ipq</function> - - - - void - &mac.mpo;_init_ipq - - struct ipq - *ipq - struct label - *label - - - - - - &mac.thead; - - - - ipq - Object; IP reassembly queue - - - - label - New label to apply - - - - - - Initialize the label on a newly instantiated IP fragment - reassembly queue. - - - - <function>&mac.mpo;_init_mbuf</function> - - - - void - &mac.mpo;_init_mbuf - - struct mbuf - *mbuf - int how - struct label - *label - - - - - - &mac.thead; - - - - mbuf - Object; mbuf - - - - how - Blocking/non-blocking &man.malloc.9; see - below - - - - label - Policy label to initialize - - - - - Initialize the label on a newly instantiated mbuf packet - header (mbuf). The - how field may be one of - M_WAITOK and M_NOWAIT, and - should be employed to avoid performing a blocking - &man.malloc.9; during this initialization call. Mbuf - allocation frequently occurs in performance sensitive - environments, and the implementation should be careful to - avoid blocking or long-lived operations. This entry point - is permitted to fail resulting in the failure to allocate - the mbuf header. - - - - <function>&mac.mpo;_init_mount</function> - - - - void - &mac.mpo;_init_mount - - struct mount - *mount - struct label - *mntlabel - struct label - *fslabel - - - - - - - &mac.thead; - - - - mount - Object; file system mount point - - - - mntlabel - Policy label to be initialized for the mount - itself - - - - fslabel - Policy label to be initialized for the file - system - - - - - - Initialize the labels on a newly instantiated mount - point. - - - - <function>&mac.mpo;_init_socket</function> - - - - void - &mac.mpo;_init_socket - - struct socket - *socket - struct label - *label - struct label - *peerlabel - - - - - - &mac.thead; - - - - socket - Object; socket - - - - label - New label to apply to the socket - - - - peerlabel - New label to apply to the socket's peer - - - - - - Initialize the labels on a newly instantiated - socket. - - - - <function>&mac.mpo;_init_cred</function> - - - - void - &mac.mpo;_init_cred - - struct ucred - *cred - struct label - *label - - - - - - &mac.thead; - - - - cred - Subject; user credetial - - - - label - New label - - - - - - Initialize the labels on a newly instantiated subject. - - - - <function>&mac.mpo;_init_temp</function> - - - - void - &mac.mpo;_init_temp - - struct label - *label - - - - - - &mac.thead; - - - - label - Temporary label - - - - - - Initialize a newly instantiated temporary label; - temporary labels are frequently used to hold label update - requests. - - - - <function>&mac.mpo;_init_vnode</function> - - - - void - &mac.mpo;_init_vnode - - struct vnode - *vp - struct label - *label - - - - - - &mac.thead; - - - - vp - Object; file system object - - - - label - New label to initialize - - - - - - Initialize the label on a newly instantiated vnode. - - - - <function>&mac.mpo;_destroy_bpfdesc</function> - - - - void - &mac.mpo;_destroy_bpfdesc - - struct bpf_d - *bpf_d - struct label - *label - - - - - - &mac.thead; - - - - bpf_d - Object; bpf descriptor - - - - label - Label being destroyed - - - - - - Destroy the label on a BPF descriptor. In this entry - point, a policy module should free any internal storage - associated with label so that it may - be destroyed. - - - - <function>&mac.mpo;_destroy_devfsdirent</function> - - - - void - &mac.mpo;_destroy_devfsdirent - - struct devfs_dirent - *devfs_dirent - struct label - *label - - - - - - &mac.thead; - - - - devfs_dirent - Object; devfs directory entry - - - - label - Label being destroyed - - - - - - Destroy the label on a devfs entry. In this entry - point, a policy module should free any internal storage - asociated with label so that it may - be destroyed. - - - - <function>&mac.mpo;_destroy_ifnet</function> - - - - void - &mac.mpo;_destroy_ifnet - - struct ifnet - *ifnet - struct label - *label - - - - - - &mac.thead; - - - - ifnet - Object; network interface - - - - label - Label being destroyed - - - - - - Destroy the label on a removed interface. In this entry - point, a policy module should free any internal storage - associated with label so that it may - be destroyed. - - - - <function>&mac.mpo;_destroy_ipq</function> - - - - void - &mac.mpo;_destroy_ipq - - struct ipq - *ipq - struct label - *label - - - - - - &mac.thead; - - - - ipq - Object; IP reassembly queue - - - - label - Label being destroyed - - - - - - Destroy the label on an IP fragment queue. In this - entry point, a policy module should free any internal - storage associated with label so that - it may be destroyed. - - - - <function>&mac.mpo;_destroy_mbuf</function> - - - - void - &mac.mpo;_destroy_mbuf - - struct mbuf - *mbuf - struct label - *label - - - - - - &mac.thead; - - - - mbuf - Object; mbuf - - - - label - Label being destroyed - - - - - - Destroy the label on an mbuf header. In this entry - point, a policy module should free any internal storage - associated with label so that it may - be destroyed. - - - - <function>&mac.mpo;_destroy_mount</function> - - - - void - &mac.mpo;_destroy_mount - - struct mount - *mp - struct label - *mntlabel - struct label - *fslabel - - - - - - &mac.thead; - - - - mp - Object; file system mount point - - - - mntlabel - Mount point label being destroyed - - - - fslabel - File system label being destroyed> - - - - - - Destroy the labels on a mount point. In this entry - point, a policy module should free the internal storage - associated with mntlabel and - fslabel so that they may be - destroyed. - - - - <function>&mac.mpo;_destroy_socket</function> - - - - void - &mac.mpo;_destroy_socket - - struct socket - *socket - struct label - *label - struct label - *peerlabel - - - - - - &mac.thead; - - - - socket - Object; socket - - - - label - Socket label being destroyed - - - - peerlabel - Socket peer label being destroyed - - - - - - Destroy the labels on a socket. In this entry point, a - policy module should free any internal storage associated - with label and - peerlabel so that they may be >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Aug 18 13:50:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C69BE37B401; Sun, 18 Aug 2002 13:49:05 -0700 (PDT) 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 78C2537B400 for ; Sun, 18 Aug 2002 13:49:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6BAFD43E3B for ; Sun, 18 Aug 2002 13:49:04 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7IKn4JU061159 for ; Sun, 18 Aug 2002 13:49:04 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7IKn2cG061156 for perforce@freebsd.org; Sun, 18 Aug 2002 13:49:02 -0700 (PDT) Date: Sun, 18 Aug 2002 13:49:02 -0700 (PDT) Message-Id: <200208182049.g7IKn2cG061156@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 16221 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16221 Change 16221 by chris@chris_holly on 2002/08/18 13:48:09 Run through sgml-indent-buffer Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#14 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#14 (text+ko) ==== @@ -41,17 +41,17 @@ Chris Costello - + TrustedBSD Project
    chris@FreeBSD.org
         - + Robert Watson - + TrustedBSD Project
    rwatson@FreeBSD.org
    @@ -59,41 +59,41 @@     - + Writing MAC Policies - + Synopsis - + MAC, or Mandatory Access Control, is a feature introduced by the TrustedBSD Project to supplement the existing standard DAC (Discreationary Access Control) policies of BSD Unix systems. - + This chapter introduces the MAC policy framework and provides documentation for a sample MAC policy module. - - - - Introduction - - The TrustedBSD MAC framework provides a mechanism to allow - the compile-time or run-time extension of the kernel access - control model. New system policies may be implemented as - kernel modules and linked to the kernel; if multiple policy - modules are present, their results will be composed. While the - framework is intended to support a variety of access control - models, its design was derived from the requirements of a set - of specific access control models required for the TrustedBSD - and CBOSS Projects. This includes support for fixed and - floating label Biba integrity policies, the MLS - confidentiality policy, the Type Enforcement rule-based access - control policy, and the ability to support layering of the NSA - FLASK framework above the TrustedBSD MAC framework. This - document describes the rough architecture of the framework, - with the understanding that this is a work-in-progress and may - change subtantially as requirements evolve. - + + + + Introduction + + The TrustedBSD MAC framework provides a mechanism to allow + the compile-time or run-time extension of the kernel access + control model. New system policies may be implemented as + kernel modules and linked to the kernel; if multiple policy + modules are present, their results will be composed. While the + framework is intended to support a variety of access control + models, its design was derived from the requirements of a set + of specific access control models required for the TrustedBSD + and CBOSS Projects. This includes support for fixed and + floating label Biba integrity policies, the MLS + confidentiality policy, the Type Enforcement rule-based access + control policy, and the ability to support layering of the NSA + FLASK framework above the TrustedBSD MAC framework. This + document describes the rough architecture of the framework, + with the understanding that this is a work-in-progress and may + change subtantially as requirements evolve. + Kernel Architecture @@ -121,42 +121,42 @@ ... - - - Entry Point Framework - - Four classes of entry points are offered to policies - registered with the framework: entry points associated with - the registration and management of policies, entry points - denoting initialization, creation, destruction, and other life - cycle events for kernel objects, events assocated with access - control decisions that the policy module may influence, and - calls associated with the management of labels on objects. In - addition, a mac_syscall() entry point is - provided so that policies may extend the kernel interface - without registering new system calls. - - Policy module writers should be aware of the kernel - locking strategy, as well as what object locks are available - during which entry points. Writers should attempt to avoid - deadlock scenarios by avoiding grabbing non-leaf locks inside - of entry points, and also follow the locking protocol for - object access and modification. In particular, writers should - be aware that while necessary locks to access objects and - their labels are generally held, sufficient locks to modify an - object or its label may not be present for all entry points. - Locking information for arguments is documented in the MAC - framework entry point document. - - Policy entry points will pass a reference to the object - label along with the object itself. This permits labeled - policies to be unaware of the internals of the object yet - still make decisions based on the label. The exception to this - is the process credential, which is assumed to be understood - by policies as a first class security object in the kernel. - Policies that do not implement labels on kernel objects will - be passed NULL pointers for label arguments to entry - points. + + + Entry Point Framework + + Four classes of entry points are offered to policies + registered with the framework: entry points associated with + the registration and management of policies, entry points + denoting initialization, creation, destruction, and other life + cycle events for kernel objects, events assocated with access + control decisions that the policy module may influence, and + calls associated with the management of labels on objects. In + addition, a mac_syscall() entry point is + provided so that policies may extend the kernel interface + without registering new system calls. + + Policy module writers should be aware of the kernel + locking strategy, as well as what object locks are available + during which entry points. Writers should attempt to avoid + deadlock scenarios by avoiding grabbing non-leaf locks inside + of entry points, and also follow the locking protocol for + object access and modification. In particular, writers should + be aware that while necessary locks to access objects and + their labels are generally held, sufficient locks to modify an + object or its label may not be present for all entry points. + Locking information for arguments is documented in the MAC + framework entry point document. + + Policy entry points will pass a reference to the object + label along with the object itself. This permits labeled + policies to be unaware of the internals of the object yet + still make decisions based on the label. The exception to this + is the process credential, which is assumed to be understood + by policies as a first class security object in the kernel. + Policies that do not implement labels on kernel objects will + be passed NULL pointers for label arguments to entry + points. Policy Module Registration @@ -183,7 +183,7 @@ (macop_t)mac_none_check_vnode_write }, { MAC_OP_LAST, NULL } }; - + The MAC policy entry point vector, mac_none_ops in this example, associates functions defined in the module with specific entry points. A @@ -244,24 +244,24 @@ - + <function>&mac.mpo;_init</function - + void &mac.mpo;_init - + struct mac_policy_conf *conf - + &mac.thead; - +     conf @@ -270,28 +270,28 @@ - + Policy load event. The policy list mutex is held, so caution should be applied. - + <function>&mac.mpo;_destroy</function> - + void &mac.mpo;_destroy - + struct mac_policy_conf *conf - + &mac.thead; - + conf @@ -300,7 +300,7 @@ - + Policy load event. The policy list mutex is held, so caution should be applied. @@ -320,7 +320,7 @@ events, such as label events associated with IP reassembly. A typical labeled object will have the following life cycle of entry points: - + Label initialization o (object-specific wait) \ Label creation o @@ -376,2073 +376,2073 @@ destroyed as with other label types, but the creation event is MAC_INTERNALIZE, which accepts a user label to be converted to an in-kernel representation. - - - File System Object Labeling Event Operations - - - <function>&mac.mpo;_create_devfs_device</function> - - - - void - &mac.mpo;_create_devfs_device - - dev_t dev - struct devfs_dirent - *devfs_dirent - struct label - *label - - - - - - &mac.thead; - - - - dev - Device corresponding with - devfs_dirent - - - - devfs_dirent - Devfs directory entry to be labeled. - - - - label - Label for devfs_dirent - to be filled in. - - - - - - Fill out the label on a devfs_dirent being created for - the passed device. This call will be made when the device - file system is mounted, regenerated, or a new device is made - available. - - - - <function>&mac.mpo;_create_devfs_directory</function> - - - - void - &mac.mpo;_create_devfs_directory - - char *dirname - int dirnamelen - struct devfs_dirent - *devfs_dirent - struct label - *label - - - - - - &mac.thead; - - - - dirname - Name of directory being created - - - - namelen - Length of string - dirname - - - - devfs_dirent - Devfs directory entry for directory being - created. - - - - - - Fill out the label on a devfs_dirent being created for - the passed directory. This call will be made when the device - file system is mounted, regenerated, or a new device - requiring a specific directory hierarchy is made - available. - - - - <function>&mac.mpo;_create_devfs_vnode</function> - - - - void - &mac.mpo;_create_devfs_vnode - - struct devfs_dirent - *devfs_dirent - struct label - *direntlabel - struct vnode - *vp - struct label - *vnodelabel - - - - - - &mac.thead; - - - - devfs_dirent - Object; devfs directory entry - - - - direntlabel - Policy label for - devfs_dirent - - - - vp - Object; file system object being labeled - - - - vnodelabel - Policy label to be filled in for - vp - - - - - - Fill out the label on the vnode being created for the - passed devfs_dirent. This call will be made when a vnode is - required to represent the specified devfs_dirent in a - mounted devfs instance. - - - - <function>&mac.mpo;_vnode_create_from_vnode</function> - - - - void - &mac.mpo;_vnode_create_from_vnode - - struct ucred - *cred - struct vnode - *parent - struct label - *parentlabel - struct vnode - *child - struct label - *childlabel - - - - - - &mac.thead; - - - - cred - Subject credential - - - - parent - Parent vnode; the directory in which - child is being - created - - - - parentlabel - Policy label for - parent - - - - child - New vnode - - - - childlabel - Label to be filled in for - child - - - - - - Fill out the label on the vnode being created in the - passed vnode parent by the passed subject credential. This - call will be made when a vnode is allocated during a vnode - creation operation. For example, this call is made by - multi-label file systems during the creation of a new file - or directory. - - - - <function>&mac.mpo;_create_mount</function> - - - - void - &mac.mpo;_create_mount - - struct ucred - *cred - struct mount - *mp - struct label - *mnt - struct label - *fslabel - - - - - - &mac.thead; - - - - cred - Subject credential - - - - mp - Object; file system being mounted - - - - mntlabel - Policy label to be filled in for - mp - - - - fslabel - Policy label for the file system - mp mounts. - - - - - - Fill out the labels on the mount point being created by - the passed subject credential. This call will be made when - a new file system is mounted. - - - - <function>&mac.mpo;_create_root_mount</function> - - - - void - &mac.mpo;_create_root_mount - - struct ucred - *cred - struct mount - *mp - struct label - *mntlabel - struct label - *fslabel - - - - - - &mac.thead; - - - - See . - - - - - - Fill out the labels on the mount point being created by - the passed subject credential. This call will be made when - the root file system is mounted, after - &mac.mpo;_create_mount;. - - - - <function>&mac.mpo;_vnode_relabel</function> - - - - void - &mac.mpo;_vnode_relabel - - struct ucred - *cred - struct vnode - *vp - struct label - *vnodelabel - struct label - *newlabel - - - - - - &mac.thead; - - - - cred - Subject credential - - - - vp - vnode to relabel - - - - vnodelabel - Existing policy label for - vp - - - - newlabel - New, possibly partial label to replace - vnodelabel - - - - - - Update the label on the passed vnode given the passed - update vnode label and the passed subject credential. - - - - <function>&mac.mpo;_stdcreatevnode_ea</function> - - - - int - &mac.mpo;_stdcreatevnode_ea - - struct vnode - *vp - struct label - *vnodelabel - - - - - - &mac.thead; - - - - vp - vnode to commit - Locked on entry, locked on exit - - - - vnodelabel - Label associated with - vp - - - - - - - This entry point is called when a vnode is to be - committed to disk via the extended attribute service (see - &man.extattr.9;). If committing to the disk is successful, - a value of 0 should be returned; - otherwise, an appropriate error code should be - returned. - - The current implementation as of July 24, 2002 - commits the data to disk from within the architecture. - The implementation will be updated to be closer to the - above documentation as development progresses. - - - - <function>&mac.mpo;_update_devfsdirent</function> - - - void - &mac.mpo;_update_devfsdirent - - struct devfs_dirent - *devfs_dirent - struct label - *direntlabel - struct vnode - *vp - struct label - *vnodelabel - - - - - - &mac.thead; - - - - devfs_dirent - Object; devfs directory entry - - - - direntlabel - Policy label for - devfs_dirent to be - updated. - - - - vp - Parent vnode - Locked - - - - vnodelabel - Policy label for - vp - - - - - - Update the devfs_dirent label - from the passed devfs vnode label. This call will be made - when a devfs vnode has been successfully relabeled to commit - the label change such that it lasts even if the vnode is - recycled. It will also be made when when a symlink is - created in devfs, following a call to - mac_vnode_create_from_vnode to - initialize the vnode label. - - - - <function>&mac.mpo;_update_procfsvnode</function> - - - - void - &mac.mpo;_update_procfsvnode - - struct vnode - *vp - struct label - *vnodelabel - struct ucred - *cred - - - - - - &mac.thead; - - - - vp - Object; procfs vnode - Locked - - - - vnodelabel - Policy label to be filled in for - vp - - - - cred - Subject; credential for the process - entry - Immutable - - - - - - Update the procfs vnode label from the passed subject - credential. This call will be made when an operation on a - procfs vnode requires a fresh label on a process-derived - vnode. - - - - <function>&mac.mpo;_update_vnode_from_extattr</function> - - - - int - &mac.mpo;_update_vnode_from_extattr - - struct vnode - *vp - struct label - *vnodelabel - struct mount - *mp - struct label - *fslabel - - - - - - &mac.thead; - - - - vp - Object; vnode whose label is being updated - Locked - - - - vnodelabel - Policy label to refresh - - - - mp - Mount point for - vp - - - - fslabel - Policy label for vp's - file system. - - - - - - Update the vnode label by refreshing the label data from - the extended attribute service for the vnode. The mount - point fslabel is also made available - so that the fslabel may be used as a - labeling source if fallback is appropriate for the policy. - This call is permitted to fail; if the call fails, the - associated label refresh will also fail, causing the failure - of the operation requiring the MAC check and vnode label - refresh, permitting a fail closed policy if - labeling data is not available. - - - - <function>&mac.mpo;_update_from_externalized</function> - - - - int - &mac.mpo;_update_from_externalized - - struct vnode - *vp - struct label - *vnodelabel - struct mac - *extmac - - - - - - &mac.thead; - - - - vp - Object; vnode - Locked - - - - vnodelabel - Policy label for - vp - - - - extmac - Externalized MAC policy label - - - - - - Update the vnode label from the passed externalized - label loaded from disk by the MAC framework. This call is - permitted to fail; if the call fails, the associated label - refresh will also fail, causing the failure of the operation - requiring the MAC check and vnode label refresh, permitting - a fail closed policy if labeling data is not - available. This call will be obsoleted by the new extended - attribute labeling interface. - - - - <function>&mac.mpo;_update_vnode_from_mount</function> - - - - void - &mac.mpo;_update_vnode_from_mount - - struct vnode - *vp - struct label - *vnodelabel - struct mount - *mp - struct label - *mountlabel - - - - - - &mac.thead; - - - - vp - Object; vnode - Locked - - - - vnodelabel - Policy label for - vp - - - - mp - Mount point where vp - resides - - - - fslabel - Policy label for the file system where - vp resides. - - - - - - Update the vnode label from the passed mount point - label. This call is made when a single label file system - vnode requires a label, or if the obsoleted MAC framework - externalized extended attribute read fails. - - - - - IPC Object Labeling Event Operations - - - <function>&mac.mpo;_create_mbuf_from_socket</function> - - - - void - &mac.mpo;_create_mbuf_from_socket - - struct socket - *so - struct label - *socketlabel - struct mbuf *m - struct label - *mbuflabel - - - - - - &mac.thead; - - - >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Aug 18 20:29: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBD6B37B401; Sun, 18 Aug 2002 20:28:30 -0700 (PDT) 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 6E2D837B400 for ; Sun, 18 Aug 2002 20:28:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DDC2C43E70 for ; Sun, 18 Aug 2002 20:28:29 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7J3STJU059187 for ; Sun, 18 Aug 2002 20:28:29 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7J3STap059184 for perforce@freebsd.org; Sun, 18 Aug 2002 20:28:29 -0700 (PDT) Date: Sun, 18 Aug 2002 20:28:29 -0700 (PDT) Message-Id: <200208190328.g7J3STap059184@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16241 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16241 Change 16241 by mini@mini_stylus on 2002/08/18 20:28:06 - Add the glue needed to get and save mcontext_t structs from and to a thread (respectively). - Modify the timing of FPU state management so that (among other things)the FPU regs are set from the mcontext_t for a thread just before returning to userland upon delivering a signal. Sadly, this is i386-only. This work is from Daniel Eischen, who wrote alpha MD code as well, but I was unable to include that here (lack of testability, lack of understanding of alpha arch on my part). Affected files ... .. //depot/projects/kse/sys/i386/i386/genassym.c#31 edit .. //depot/projects/kse/sys/i386/i386/machdep.c#51 edit .. //depot/projects/kse/sys/i386/i386/support.s#10 edit .. //depot/projects/kse/sys/i386/include/npx.h#6 edit .. //depot/projects/kse/sys/i386/include/pcb.h#7 edit .. //depot/projects/kse/sys/i386/include/signal.h#4 edit .. //depot/projects/kse/sys/i386/include/ucontext.h#3 edit .. //depot/projects/kse/sys/i386/isa/npx.c#19 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/genassym.c#31 (text+ko) ==== @@ -142,7 +142,6 @@ ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags)); ASSYM(PCB_SAVEFPU, offsetof(struct pcb, pcb_save)); ASSYM(PCB_SAVEFPU_SIZE, sizeof(union savefpu)); -ASSYM(PCB_SAVE87_SIZE, sizeof(struct save87)); ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); ASSYM(PCB_SIZE, sizeof(struct pcb)); ==== //depot/projects/kse/sys/i386/i386/machdep.c#51 (text+ko) ==== @@ -130,6 +130,9 @@ #define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0) static void cpu_startup(void *); +static void fpstate_drop(struct thread *td); +static void get_fpcontext(struct thread *td, mcontext_t *mcp); +static int set_fpcontext(struct thread *td, const mcontext_t *mcp); #ifdef CPU_ENABLE_SSE static void set_fpregs_xmm(struct save87 *, struct savexmm *); static void fill_fpregs_xmm(struct savexmm *, struct save87 *); @@ -428,8 +431,10 @@ ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; sf.sf_uc.uc_mcontext.mc_gs = rgs(); - sf.sf_uc.uc_mcontext.mc_flags = __UC_MC_VALID; /* no FP regs */ bcopy(regs, &sf.sf_uc.uc_mcontext.mc_fs, sizeof(*regs)); + sf.sf_uc.uc_mcontext.mc_len = sizeof(sf.sf_uc.uc_mcontext); /* magic */ + get_fpcontext(td, &sf.sf_uc.uc_mcontext); + fpstate_drop(td); /* Allocate space for the signal handler context. */ if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && @@ -661,7 +666,7 @@ struct proc *p = td->td_proc; struct trapframe *regs; const ucontext_t *ucp; - int cs, eflags, error; + int cs, eflags, error, ret; error = copyin(uap->sigcntxp, &uc, sizeof(uc)); if (error != 0) @@ -735,6 +740,9 @@ return (EINVAL); } + ret = set_fpcontext(td, &ucp->uc_mcontext); + if (ret != 0) + return (ret); bcopy(&ucp->uc_mcontext.mc_fs, regs, sizeof(*regs)); } @@ -895,11 +903,6 @@ */ load_cr0(rcr0() | CR0_MP | CR0_TS); -#ifdef DEV_NPX - /* Initialize the npx (if any) for the current process. */ - npxinit(__INITIAL_NPXCW__); -#endif - /* * XXX - Linux emulator * Make sure sure edx is 0x0 on entry. Linux binaries depend @@ -1989,8 +1992,6 @@ /* FPU registers */ for (i = 0; i < 8; ++i) sv_87->sv_ac[i] = sv_xmm->sv_fp[i].fp_acc; - - sv_87->sv_ex_sw = sv_xmm->sv_ex_sw; } static void @@ -2015,8 +2016,6 @@ /* FPU registers */ for (i = 0; i < 8; ++i) sv_xmm->sv_fp[i].fp_acc = sv_87->sv_ac[i]; - - sv_xmm->sv_ex_sw = sv_87->sv_ex_sw; } #endif /* CPU_ENABLE_SSE */ @@ -2048,6 +2047,113 @@ return (0); } +void +get_mcontext(struct thread *td, mcontext_t *mcp) +{ + struct trapframe *tp; + + tp = td->td_frame; + + mcp->mc_onstack = sigonstack(tp->tf_esp); + mcp->mc_gs = td->td_pcb->pcb_gs; + mcp->mc_fs = tp->tf_fs; + mcp->mc_es = tp->tf_es; + mcp->mc_ds = tp->tf_ds; + mcp->mc_edi = tp->tf_edi; + mcp->mc_esi = tp->tf_esi; + mcp->mc_ebp = tp->tf_ebp; + mcp->mc_isp = tp->tf_isp; + mcp->mc_ebx = tp->tf_ebx; + mcp->mc_edx = tp->tf_edx; + mcp->mc_ecx = tp->tf_ecx; + mcp->mc_eax = tp->tf_eax; + mcp->mc_eip = tp->tf_eip; + mcp->mc_cs = tp->tf_cs; + mcp->mc_eflags = tp->tf_eflags; + mcp->mc_esp = tp->tf_esp; + mcp->mc_ss = tp->tf_ss; + mcp->mc_len = sizeof(*mcp); + get_fpcontext(td, mcp); +} + +int +set_mcontext(struct thread *td, const mcontext_t *mcp) +{ + struct trapframe *tp; + int ret; + + tp = td->td_frame; + + if (!EFL_SECURE(mcp->mc_eflags, tp->tf_eflags) || + !CS_SECURE(mcp->mc_cs)) + ret = EINVAL; + else if (mcp->mc_len != sizeof(*mcp)) + ret = EINVAL; + else if ((ret = set_fpcontext(td, mcp)) == 0) { + tp->tf_fs = mcp->mc_fs; + tp->tf_es = mcp->mc_es; + tp->tf_ds = mcp->mc_ds; + tp->tf_edi = mcp->mc_edi; + tp->tf_esi = mcp->mc_esi; + tp->tf_ebp = mcp->mc_ebp; + tp->tf_ebx = mcp->mc_ebx; + tp->tf_edx = mcp->mc_edx; + tp->tf_ecx = mcp->mc_ecx; + tp->tf_eax = mcp->mc_eax; + tp->tf_eip = mcp->mc_eip; + tp->tf_cs = mcp->mc_cs; + tp->tf_eflags = mcp->mc_eflags; + tp->tf_esp = mcp->mc_esp; + tp->tf_ss = mcp->mc_ss; + td->td_pcb->pcb_gs = mcp->mc_gs; + ret = 0; + } + return (ret); +} + +static void +get_fpcontext(struct thread *td, mcontext_t *mcp) +{ +#ifndef DEV_NPX + mcp->mc_fpformat = _MC_FPFMT_NODEV; + mcp->mc_ownedfp = _MC_FPOWNED_NONE; +#else + mcp->mc_ownedfp = npxgetregs(td, (union savefpu *)&mcp->mc_fpstate); + mcp->mc_fpformat = npxformat(); +#endif +} + +static int +set_fpcontext(struct thread *td, const mcontext_t *mcp) +{ + + if (mcp->mc_fpformat == _MC_FPFMT_NODEV) + return (0); + else if ((mcp->mc_fpformat != _MC_FPFMT_387) && + ((mcp->mc_fpformat != _MC_FPFMT_XMM))) + return (EINVAL); + else if (mcp->mc_ownedfp == _MC_FPOWNED_NONE) + /* We don't care what state is left in the FPU or PCB. */ + fpstate_drop(td); + else if (mcp->mc_ownedfp == _MC_FPOWNED_FPU || + mcp->mc_ownedfp == _MC_FPOWNED_PCB) + npxsetregs(td, (union savefpu *)&mcp->mc_fpstate); + else + return (EINVAL); + return (0); +} + +static void +fpstate_drop(struct thread *td) +{ + register_t s; + + s = intr_disable(); + if (PCPU_GET(fpcurthread) == td) + npxdrop(); + intr_restore(s); +} + int fill_dbregs(struct thread *td, struct dbreg *dbregs) { ==== //depot/projects/kse/sys/i386/i386/support.s#10 (text+ko) ==== @@ -976,7 +976,7 @@ ENTRY(fastmove) pushl %ebp movl %esp,%ebp - subl $PCB_SAVE87_SIZE+3*4,%esp + subl $PCB_SAVEFPU_SIZE+3*4,%esp movl 8(%ebp),%ecx cmpl $63,%ecx @@ -1018,7 +1018,7 @@ movl PCPU(CURPCB),%esi addl $PCB_SAVEFPU,%esi cld - movl $PCB_SAVE87_SIZE>>2,%ecx + movl $PCB_SAVEFPU_SIZE>>2,%ecx rep movsl movl -12(%ebp),%ecx @@ -1102,7 +1102,7 @@ addl $PCB_SAVEFPU,%edi movl %esp,%esi cld - movl $PCB_SAVE87_SIZE>>2,%ecx + movl $PCB_SAVEFPU_SIZE>>2,%ecx rep movsl movl -12(%ebp),%ecx @@ -1147,7 +1147,7 @@ addl $PCB_SAVEFPU,%edi movl %esp,%esi cld - movl $PCB_SAVE87_SIZE>>2,%ecx + movl $PCB_SAVEFPU_SIZE>>2,%ecx rep movsl ==== //depot/projects/kse/sys/i386/include/npx.h#6 (text+ko) ==== @@ -73,7 +73,7 @@ struct save87 { struct env87 sv_env; /* floating point control/status */ struct fpacc87 sv_ac[8]; /* accumulator contents, 0-7 */ - u_long sv_ex_sw; /* status word for last exception */ + u_char sv_pad0[4]; /* padding for (now unused) saved status word */ /* * Bogus padding for emulators. Emulators should use their own * struct and arrange to store into this struct (ending here) @@ -112,8 +112,7 @@ u_char fp_pad[6]; /* padding */ } sv_fp[8]; struct xmmacc sv_xmm[8]; - u_long sv_ex_sw; /* status word for last exception */ - u_char sv_pad[220]; + u_char sv_pad[224]; } __attribute__((aligned(16))); union savefpu { @@ -142,9 +141,13 @@ #ifdef _KERNEL int npxdna(void); +void npxdrop(void); void npxexit(struct thread *td); -void npxinit(int control); +int npxformat(void); +int npxgetregs(struct thread *td, union savefpu *addr); +void npxinit(u_short control); void npxsave(union savefpu *addr); +void npxsetregs(struct thread *td, union savefpu *addr); int npxtrap(void); #endif ==== //depot/projects/kse/sys/i386/include/pcb.h#7 (text+ko) ==== @@ -66,6 +66,7 @@ #define FP_SOFTFP 0x01 /* process using software fltng pnt emulator */ #define PCB_DBREGS 0x02 /* process using debug registers */ #define PCB_NPXTRAP 0x04 /* npx trap pending */ +#define PCB_NPXINITDONE 0x08 /* fpu state is initialized */ caddr_t pcb_onfault; /* copyin/out fault recovery */ int pcb_gs; struct pcb_ext *pcb_ext; /* optional pcb extension */ ==== //depot/projects/kse/sys/i386/include/signal.h#4 (text+ko) ==== @@ -117,13 +117,16 @@ int sc_efl; int sc_esp; int sc_ss; + int sc_len; /* sizeof(struct mcontext_t) */ /* - * XXX FPU state is 27 * 4 bytes h/w, 1 * 4 bytes s/w (probably not - * needed here), or that + 16 * 4 bytes for emulators (probably all - * needed here). The "spare" bytes are mostly not spare. + * XXX - See and for + * the following fields. */ - int sc_fpregs[28]; /* machine state (FPU): */ - int sc_spare[17]; + int sc_fpformat; + int sc_ownedfp; + int sc_spare1[1]; + int sc_fpregs[128]; + int sc_spare2[8]; }; #define sc_sp sc_esp ==== //depot/projects/kse/sys/i386/include/ucontext.h#3 (text+ko) ==== @@ -58,11 +58,25 @@ int mc_esp; /* machine state */ int mc_ss; - int mc_fpregs[28]; /* env87 + fpacc87 + u_long */ -#define __UC_MC_VALID 0x0001 /* mcontext register state is valid */ -#define __UC_FP_VALID 0x0002 /* FP registers have been saved */ - int mc_flags; - int __spare__[16]; + int mc_len; /* sizeof(mcontext_t) */ +#define _MC_FPFMT_NODEV 0 /* device not present or configured */ +#define _MC_FPFMT_387 1 +#define _MC_FPFMT_XMM 2 + int mc_fpformat; +#define _MC_FPOWNED_NONE 0 /* FP state not used */ +#define _MC_FPOWNED_FPU 1 /* FP state came from FPU */ +#define _MC_FPOWNED_PCB 2 /* FP state came from PCB */ + int mc_ownedfp; + int mc_spare1[1]; /* align next field to 16 bytes */ + int mc_fpstate[128]; /* must be multiple of 16 bytes */ + int mc_spare2[8]; } mcontext_t; +#ifdef _KERNEL +struct thread; + +void get_mcontext(struct thread *td, mcontext_t *mcp); +int set_mcontext(struct thread *td, const mcontext_t *mcp); +#endif + #endif /* !_MACHINE_UCONTEXT_H_ */ ==== //depot/projects/kse/sys/i386/isa/npx.c#19 (text+ko) ==== @@ -74,6 +74,7 @@ #include #include #include +#include #ifndef SMP #include @@ -144,17 +145,11 @@ (cpu_fxsr ? \ (thread)->td_pcb->pcb_save.sv_xmm.sv_env.en_sw : \ (thread)->td_pcb->pcb_save.sv_87.sv_env.en_sw) -#define GET_FPU_EXSW_PTR(pcb) \ - (cpu_fxsr ? \ - &(pcb)->pcb_save.sv_xmm.sv_ex_sw : \ - &(pcb)->pcb_save.sv_87.sv_ex_sw) #else /* CPU_ENABLE_SSE */ #define GET_FPU_CW(thread) \ (thread->td_pcb->pcb_save.sv_87.sv_env.en_cw) #define GET_FPU_SW(thread) \ (thread->td_pcb->pcb_save.sv_87.sv_env.en_sw) -#define GET_FPU_EXSW_PTR(pcb) \ - (&(pcb)->pcb_save.sv_87.sv_ex_sw) #endif /* CPU_ENABLE_SSE */ typedef u_char bool_t; @@ -183,6 +178,8 @@ static volatile u_int npx_traps_while_probing; #endif +static union savefpu npx_cleanstate; +static bool_t npx_cleanstate_ready; static bool_t npx_ex16; static bool_t npx_exists; static bool_t npx_irq13; @@ -454,6 +451,7 @@ device_t dev; { int flags; + register_t s; if (resource_int_value("npx", 0, "flags", &flags) != 0) flags = 0; @@ -490,6 +488,14 @@ } npxinit(__INITIAL_NPXCW__); + if (npx_cleanstate_ready == 0) { + s = intr_disable(); + stop_emulating(); + fpusave(&npx_cleanstate); + start_emulating(); + npx_cleanstate_ready = 1; + intr_restore(s); + } #ifdef I586_CPU_XXX if (cpu_class == CPUCLASS_586 && npx_ex16 && npx_exists && timezero("i586_bzero()", i586_bzero) < @@ -536,8 +542,6 @@ fninit(); #endif fldcw(&control); - if (PCPU_GET(curpcb) != NULL) - fpusave(&PCPU_GET(curpcb)->pcb_save); start_emulating(); intr_restore(savecrit); } @@ -559,8 +563,7 @@ if (npx_exists) { u_int masked_exceptions; - masked_exceptions = PCPU_GET(curpcb)->pcb_save.sv_87.sv_env.en_cw - & PCPU_GET(curpcb)->pcb_save.sv_87.sv_env.en_sw & 0x7f; + masked_exceptions = GET_FPU_CW(td) & GET_FPU_SW(td) & 0x7f; /* * Log exceptions that would have trapped with the old * control word (overflow, divide by 0, and invalid operand). @@ -574,6 +577,19 @@ #endif } +int +npxformat() +{ + + if (!npx_exists) + return (_MC_FPFMT_NODEV); +#ifdef CPU_ENABLE_SSE + if (cpu_fxsr) + return (_MC_FPFMT_XMM); +#endif + return (_MC_FPFMT_387); +} + /* * The following mechanism is used to ensure that the FPE_... value * that is passed as a trapcode to the signal handler of the user @@ -767,7 +783,6 @@ { register_t savecrit; u_short control, status; - u_long *exstat; if (!npx_exists) { printf("npxtrap: fpcurthread = %p, curthread = %p, npx_exists = %d\n", @@ -789,11 +804,7 @@ fnstsw(&status); } - exstat = GET_FPU_EXSW_PTR(curthread->td_pcb); - *exstat = status; - if (PCPU_GET(fpcurthread) != curthread) - GET_FPU_SW(curthread) &= ~0x80bf; - else + if (PCPU_GET(fpcurthread) == curthread) fnclex(); intr_restore(savecrit); return (fpetable[status & ((~control & 0x3f) | 0x40)]); @@ -809,8 +820,9 @@ int npxdna() { - u_long *exstat; + struct pcb *pcb; register_t s; + u_short control; if (!npx_exists) return (0); @@ -825,22 +837,35 @@ * Record new context early in case frstor causes an IRQ13. */ PCPU_SET(fpcurthread, curthread); + pcb = PCPU_GET(curpcb); - exstat = GET_FPU_EXSW_PTR(PCPU_GET(curpcb)); - *exstat = 0; - /* - * The following frstor may cause an IRQ13 when the state being - * restored has a pending error. The error will appear to have been - * triggered by the current (npx) user instruction even when that - * instruction is a no-wait instruction that should not trigger an - * error (e.g., fnclex). On at least one 486 system all of the - * no-wait instructions are broken the same as frstor, so our - * treatment does not amplify the breakage. On at least one - * 386/Cyrix 387 system, fnclex works correctly while frstor and - * fnsave are broken, so our treatment breaks fnclex if it is the - * first FPU instruction after a context switch. - */ - fpurstor(&PCPU_GET(curpcb)->pcb_save); + if ((pcb->pcb_flags & PCB_NPXINITDONE) == 0) { + /* + * This is the first time this thread has used the FPU or + * the PCB doesn't contain a clean FPU state. Explicitly + * initialize the FPU and load the default control word. + */ + fninit(); + control = __INITIAL_NPXCW__; + fldcw(&control); + pcb->pcb_flags |= PCB_NPXINITDONE; + } else { + /* + * The following frstor may cause an IRQ13 when the state + * being restored has a pending error. The error will + * appear to have been triggered by the current (npx) user + * instruction even when that instruction is a no-wait + * instruction that should not trigger an error (e.g., + * fnclex). On at least one 486 system all of the no-wait + * instructions are broken the same as frstor, so our + * treatment does not amplify the breakage. On at least + * one 386/Cyrix 387 system, fnclex works correctly while + * frstor and fnsave are broken, so our treatment breaks + * fnclex if it is the first FPU instruction after a context + * switch. + */ + fpurstor(&pcb->pcb_save); + } intr_restore(s); return (1); @@ -881,6 +906,87 @@ PCPU_SET(fpcurthread, NULL); } +/* + * This should be called with interrupts disabled and only when the owning + * FPU thread is non-null. + */ +void +npxdrop() +{ + struct thread *td; + + td = PCPU_GET(fpcurthread); + PCPU_SET(fpcurthread, NULL); + td->td_pcb->pcb_flags &= ~PCB_NPXINITDONE; + start_emulating(); +} + +/* + * Get the state of the FPU without dropping ownership (if possible). + * It returns the FPU ownership status. + */ +int +npxgetregs(td, addr) + struct thread *td; + union savefpu *addr; +{ + register_t s; + + if (!npx_exists) + return (_MC_FPOWNED_NONE); + + if ((td->td_pcb->pcb_flags & PCB_NPXINITDONE) == 0) { + if (npx_cleanstate_ready) + bcopy(&npx_cleanstate, addr, sizeof(npx_cleanstate)); + else + bzero(addr, sizeof(*addr)); + return (_MC_FPOWNED_NONE); + } + + s = intr_disable(); + if (td == PCPU_GET(fpcurthread)) { + fpusave(addr); +#ifdef CPU_ENABLE_SSE + if (!cpu_fxsr) +#endif + /* + * fnsave initializes the FPU and destroys whatever + * context it contains. Make sure the FPU owner + * starts with a clean state next time. + */ + npxdrop(); + intr_restore(s); + return (_MC_FPOWNED_FPU); + } else { + intr_restore(s); + bcopy(&td->td_pcb->pcb_save, addr, sizeof(*addr)); + return (_MC_FPOWNED_PCB); + } +} + +/* + * Set the state of the FPU; this must be called with interrupts disabled. + */ +void +npxsetregs(td, addr) + struct thread *td; + union savefpu *addr; +{ + register_t s; + + if (!npx_exists) + return; + + s = intr_disable(); + if (td == PCPU_GET(fpcurthread)) { + fpurstor(addr); + intr_restore(s); + } else { + intr_restore(s); + bcopy(addr, &td->td_pcb->pcb_save, sizeof(*addr)); + } +} + static void fpusave(addr) union savefpu *addr; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Aug 18 21:36: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15A0E37B401; Sun, 18 Aug 2002 21:35:59 -0700 (PDT) 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 C289837B400 for ; Sun, 18 Aug 2002 21:35:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8245F43E6E for ; Sun, 18 Aug 2002 21:35:58 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7J4ZwJU076454 for ; Sun, 18 Aug 2002 21:35:58 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7J4ZwHe076451 for perforce@freebsd.org; Sun, 18 Aug 2002 21:35:58 -0700 (PDT) Date: Sun, 18 Aug 2002 21:35:58 -0700 (PDT) Message-Id: <200208190435.g7J4ZwHe076451@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16244 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16244 Change 16244 by mini@mini_stylus on 2002/08/18 21:35:41 Add function thread_setcontext(), which does the same thing as setcontext(3) in userland, but from the kernel. This is also Dan's code. Affected files ... .. //depot/projects/kse/sys/kern/kern_thread.c#85 edit .. //depot/projects/kse/sys/sys/kse.h#15 edit .. //depot/projects/kse/sys/sys/proc.h#121 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#85 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -189,6 +190,21 @@ allocated_threads--; /* XXXSMP */ } +int +thread_setcontext(struct thread *td, ucontext_t *uc) +{ + int ret; + + ret = set_mcontext(td, &uc->uc_mcontext); + if (ret == 0) { + SIG_CANTMASK(uc->uc_sigmask); + PROC_LOCK(td->td_proc); + td->td_proc->p_sigmask = uc->uc_sigmask; + PROC_UNLOCK(td->td_proc); + } + return (ret); +} + /* * Initialize global thread allocation resources. */ ==== //depot/projects/kse/sys/sys/kse.h#15 (text+ko) ==== @@ -33,6 +33,7 @@ #ifndef SYS_KSE_H #define SYS_KSE_H #include +#include /* * This file defines the structures needed for communication between * the userland and the kernel when running a KSE-based threading system. @@ -75,4 +76,8 @@ }; #define GMBXF_CRITICAL 0x00000001 +#ifdef _KERNEL +int thread_setcontext(struct thread *td, ucontext_t *uc); +#endif /* _KERNEL */ + #endif ==== //depot/projects/kse/sys/sys/proc.h#121 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 0:19:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CEF237B401; Mon, 19 Aug 2002 00:19:21 -0700 (PDT) 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 C7B6837B400 for ; Mon, 19 Aug 2002 00:19:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40AE443E42 for ; Mon, 19 Aug 2002 00:19:20 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7J7JKJU018346 for ; Mon, 19 Aug 2002 00:19:20 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7J7JJow018343 for perforce@freebsd.org; Mon, 19 Aug 2002 00:19:19 -0700 (PDT) Date: Mon, 19 Aug 2002 00:19:19 -0700 (PDT) Message-Id: <200208190719.g7J7JJow018343@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16252 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16252 Change 16252 by mini@mini_stylus on 2002/08/19 00:19:18 - Use ucontext_t to store state for threads, as well as for the UTS. - Instead of repeatedly returning to the same location in the UTS, act as if we have swapcontext()'d in. Affected files ... .. //depot/projects/kse/sys/i386/i386/trap.c#60 edit .. //depot/projects/kse/sys/i386/i386/vm_machdep.c#62 edit .. //depot/projects/kse/sys/kern/kern_exit.c#60 edit .. //depot/projects/kse/sys/kern/kern_fork.c#77 edit .. //depot/projects/kse/sys/kern/kern_proc.c#78 edit .. //depot/projects/kse/sys/kern/kern_thread.c#86 edit .. //depot/projects/kse/sys/sys/kse.h#16 edit .. //depot/projects/kse/sys/sys/proc.h#122 edit .. //depot/projects/kse/sys/sys/ucontext.h#3 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/trap.c#60 (text+ko) ==== @@ -971,7 +971,7 @@ * but for now do it every time. */ td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox - + offsetof(struct kse_mailbox, kmbx_current_thread)); + + offsetof(struct kse_mailbox, km_curthread)); if ((td->td_mailbox == NULL) || (td->td_mailbox == (void *)-1)) { td->td_mailbox = NULL; /* single thread it.. */ ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#62 (text+ko) ==== @@ -313,132 +313,6 @@ }; void -cpu_save_upcall(struct thread *td, struct kse *newkse) -{ - struct trapframe *tf; - - newkse->ke_mdstorage = malloc(sizeof(struct md_store), M_TEMP, - M_WAITOK); - /* Note: use of M_WAITOK means it won't fail. */ - /* set up shortcuts in MI section */ - newkse->ke_pcb = - &(((struct md_store *)(newkse->ke_mdstorage))->mds_pcb); - newkse->ke_frame = - &(((struct md_store *)(newkse->ke_mdstorage))->mds_frame); - tf = newkse->ke_frame; - - /* Copy the upcall pcb. Kernel mode & fp regs are here. */ - /* XXXKSE this may be un-needed */ - bcopy(td->td_pcb, newkse->ke_pcb, sizeof(struct pcb)); - - /* - * This initialises most of the user mode register values - * to good values. Eventually set them explicitly to know values - */ - bcopy(td->td_frame, newkse->ke_frame, sizeof(struct trapframe)); - tf->tf_edi = 0; - tf->tf_esi = 0; /* trampoline arg */ - tf->tf_ebp = 0; - tf->tf_esp = (int)newkse->ke_stackbase + newkse->ke_stacksize - 16; - tf->tf_ebx = 0; /* trampoline arg */ - tf->tf_eip = (int)newkse->ke_upcall; -} - -void -cpu_set_upcall(struct thread *td, void *pcb) -{ - struct pcb *pcb2; - - td->td_flags |= TDF_UPCALLING; - - /* Point the pcb to the top of the stack. */ - pcb2 = td->td_pcb; - - /* - * Copy the upcall pcb. This loads kernel regs. - * Those not loaded individually below get their default - * values here. - * - * XXXKSE It might be a good idea to simply skip this as - * the values of the other registers may be unimportant. - * This would remove any requirement for knowing the KSE - * at this time (see the matching comment below for - * more analysis) (need a good safe default). - */ - bcopy(pcb, pcb2, sizeof(*pcb2)); - - /* - * Create a new fresh stack for the new thread. - * The -16 is so we can expand the trapframe if we go to vm86. - * Don't forget to set this stack value into whatever supplies - * the address for the fault handlers. - * The contexts are filled in at the time we actually DO the - * upcall as only then do we know which KSE we got. - */ - td->td_frame = (struct trapframe *)((caddr_t)pcb2 - 16) - 1; - - /* - * Set registers for trampoline to user mode. Leave space for the - * return address on stack. These are the kernel mode register values. - */ - pcb2->pcb_cr3 = vtophys(vmspace_pmap(td->td_proc->p_vmspace)->pm_pdir); - pcb2->pcb_edi = 0; - pcb2->pcb_esi = (int)fork_return; /* trampoline arg */ - pcb2->pcb_ebp = 0; - pcb2->pcb_esp = (int)td->td_frame - sizeof(void *); /* trampoline arg */ - pcb2->pcb_ebx = (int)td; /* trampoline arg */ - pcb2->pcb_eip = (int)fork_trampoline; - pcb2->pcb_psl &= ~(PSL_I); /* interrupts must be disabled */ - /* - * If we didn't copy the pcb, we'd need to do the following registers: - * pcb2->pcb_dr*: cloned above. - * pcb2->pcb_savefpu: cloned above. - * pcb2->pcb_flags: cloned above. - * pcb2->pcb_onfault: cloned above (always NULL here?). - * pcb2->pcb_gs: cloned above. XXXKSE ??? - * pcb2->pcb_ext: cleared below. - */ - pcb2->pcb_ext = NULL; -} - -void -cpu_set_args(struct thread *td, struct kse *ke) -{ - suword((void *)(ke->ke_frame->tf_esp + sizeof(void *)), - (int)ke->ke_mailbox); -} - -void -cpu_free_kse_mdstorage(struct kse *kse) -{ - - free(kse->ke_mdstorage, M_TEMP); - kse->ke_mdstorage = NULL; - kse->ke_pcb = NULL; - kse->ke_frame = NULL; -} - -int -cpu_export_context(struct thread *td) -{ - struct trapframe *frame; - struct thread_mailbox *tm; - struct trapframe *uframe; - int error; - - frame = td->td_frame; - tm = td->td_mailbox; - uframe = &tm->ctx.tfrm.tf_tf; - error = copyout(frame, uframe, sizeof(*frame)); - /* - * "What about the fp regs?" I hear you ask.... XXXKSE - * Don't know where gs and "onstack" come from. - * May need to fiddle a few other values too. - */ - return (error); -} - -void cpu_wait(p) struct proc *p; { ==== //depot/projects/kse/sys/kern/kern_exit.c#60 (text+ko) ==== @@ -204,8 +204,6 @@ p->p_flag |= P_WEXIT; PROC_UNLOCK(p); - if (td->td_kse->ke_mdstorage) - cpu_free_kse_mdstorage(td->td_kse); /* Are we a task leader? */ PROC_LOCK(p); ==== //depot/projects/kse/sys/kern/kern_fork.c#77 (text+ko) ==== @@ -490,8 +490,6 @@ bcopy(&p1->p_startcopy, &p2->p_startcopy, (unsigned) RANGEOF(struct proc, p_startcopy, p_endcopy)); - bcopy(&td->td_kse->ke_startcopy, &ke2->ke_startcopy, - (unsigned) RANGEOF(struct kse, ke_startcopy, ke_endcopy)); bcopy(&td->td_startcopy, &td2->td_startcopy, (unsigned) RANGEOF(struct thread, td_startcopy, td_endcopy)); bcopy(&td->td_ksegrp->kg_startcopy, &kg2->kg_startcopy, ==== //depot/projects/kse/sys/kern/kern_proc.c#78 (text+ko) ==== @@ -345,11 +345,7 @@ mtx_lock_spin(&sched_lock); mi_switch(); /* Save current registers to PCB. */ mtx_unlock_spin(&sched_lock); - newkse->ke_upcall = mbx.kmbx_upcall; - newkse->ke_stackbase = mbx.kmbx_stackbase; - newkse->ke_stacksize = mbx.kmbx_stacksize; newkse->ke_mailbox = uap->mbx; - cpu_save_upcall(td, newkse); /* Note that we are the returning syscall */ td->td_retval[0] = 0; td->td_retval[1] = 0; ==== //depot/projects/kse/sys/kern/kern_thread.c#86 (text+ko) ==== @@ -190,6 +190,14 @@ allocated_threads--; /* XXXSMP */ } +void +thread_getcontext(struct thread *td, ucontext_t *uc) +{ + + get_mcontext(td, &uc->uc_mcontext); + uc->uc_sigmask = td->td_proc->p_sigmask; +} + int thread_setcontext(struct thread *td, ucontext_t *uc) { @@ -283,18 +291,29 @@ void *addr1; void *addr2; int error; + ucontext_t uc; #ifdef __ia64__ td2_mbx = 0; /* pacify gcc (!) */ #endif - /* Export the register contents. */ - error = cpu_export_context(td); + /* Export the user/machine context. */ + error = copyin((caddr_t)td->td_mailbox + + offsetof(struct thread_mailbox, tm_context), + &uc, + sizeof(ucontext_t)); + if (error == 0) { + thread_getcontext(td, &uc); + uc.uc_busy = 0; + error = copyout(&uc, (caddr_t)td->td_mailbox + + offsetof(struct thread_mailbox, tm_context), + sizeof(ucontext_t)); + } ke = td->td_kse; addr1 = (caddr_t)ke->ke_mailbox - + offsetof(struct kse_mailbox, kmbx_completed_threads); + + offsetof(struct kse_mailbox, km_completed); addr2 = (caddr_t)td->td_mailbox - + offsetof(struct thread_mailbox , next_completed); + + offsetof(struct thread_mailbox , tm_next); /* Then link it into it's KSE's list of completed threads. */ if (!error) { error = td2_mbx = fuword(addr1); @@ -425,6 +444,8 @@ thread_schedule_upcall(struct thread *td, struct kse *ke) { struct thread *td2; + caddr_t ucp; + ucontext_t uc; mtx_assert(&sched_lock, MA_OWNED); if (ke->ke_tdspare != NULL) { @@ -438,7 +459,17 @@ CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", td, td->td_proc->p_pid, td->td_proc->p_comm); thread_link(td2, ke->ke_ksegrp); - cpu_set_upcall(td2, ke->ke_pcb); + ucp = (caddr_t)ke->ke_mailbox + + offsetof(struct kse_mailbox, km_context); + copyin(ucp, &uc, sizeof(ucontext_t)); + /* + * XXX: It is somewhat bogus to ignore the error + * if copyin fails here, but the end result will be + * that the process will crash from bogus state information, + * which is what we want. + */ + thread_setcontext(td2, &uc); + suword(ucp + offsetof(ucontext_t, uc_busy), 1); td2->td_ucred = crhold(td->td_ucred); td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; td2->td_priority = td->td_priority; @@ -544,6 +575,7 @@ if (td->td_flags & TDF_UPCALLING) { CTR3(KTR_PROC, "userret: upcall thread %p (pid %d, %s)", td, p->p_pid, p->p_comm); +#if 0 /* * Make sure that it has the correct frame loaded. * While we know that we are on the same KSEGRP @@ -569,8 +601,13 @@ */ td->td_flags &= ~TDF_UPCALLING; /* Hmmmm. */ error = suword((caddr_t)td->td_kse->ke_mailbox + - offsetof(struct kse_mailbox, kmbx_current_thread), + offsetof(struct kse_mailbox, km_curthread), 0); +#else + /* + * We are returning to the UTS. + */ +#endif } /* * Stop any chance that we may be separated from ==== //depot/projects/kse/sys/sys/kse.h#16 (text+ko) ==== @@ -9,7 +9,7 @@ * are met: * 1. Redistributions of source code must retain the above copyright * notice(s), this list of conditions and the following disclaimer as - * the first lines of this file unmodified other than the possible + * the first lines of this file unmodified other than the possible * addition of one or more copyright notices. * 2. Redistributions in binary form must reproduce the above copyright * notice(s), this list of conditions and the following disclaimer in the @@ -32,9 +32,11 @@ #ifndef SYS_KSE_H #define SYS_KSE_H + #include #include -/* + +/* * This file defines the structures needed for communication between * the userland and the kernel when running a KSE-based threading system. * The only programs that should see this file are the UTS and the kernel. @@ -42,42 +44,34 @@ struct kse_mailbox; typedef void kse_fn_t(struct kse_mailbox *mbx); -/* - * Each userland thread has one of these buried in it's - * Thread control structure somewhere. +/* + * Thread mailbox. + * + * This describes a user thread ot the kernel scheduler. */ -struct thread_mailbox -{ - struct thread_mailbox *next_completed; - unsigned int flags; - void *UTS_handle; /* The UTS can use this for anything */ - union kse_td_ctx ctx; /* thread's saved context goes here. */ +struct thread_mailbox { + unsigned int tm_flags; /* Thread flags */ + struct thread_mailbox *tm_next; /* Next thread in list */ + ucontext_t tm_context; /* User and machine context */ + void *tm_udata; /* For use by the UTS */ + int tm_spare[8]; }; -/* - * You need to supply one of these as the argument to the - * kse_new() system call. +/* + * KSE mailbox. + * + * Cummunication path between the UTS and the kernel scheduler specific to + * a single KSE. */ -struct kse_mailbox -{ - kse_fn_t *kmbx_upcall; - char *kmbx_stackbase; - unsigned long int kmbx_stacksize; - struct thread_mailbox *kmbx_current_thread; - struct thread_mailbox *kmbx_completed_threads; - unsigned int kmbx_flags; - void *kmbx_UTS_handle; /* UTS can use this for anything */ +struct kse_mailbox { + unsigned int km_flags; /* KSE flags */ +#define KSEKMF_CRITICAL 0x00000001 + ucontext_t km_context; /* UTS context */ + struct thread_mailbox *km_curthread; /* Currently running thread */ + struct thread_mailbox *km_completed; /* Threads back from kernel */ + sigset_t km_sigscaught; /* Caught signals */ + void *km_udata; /* For use by the UTS */ + int tm_spare[8]; }; -#define KEMBXF_CRITICAL 0x00000001 - -struct kse_global_mailbox -{ - unsigned int flags; -}; -#define GMBXF_CRITICAL 0x00000001 - -#ifdef _KERNEL -int thread_setcontext(struct thread *td, ucontext_t *uc); -#endif /* _KERNEL */ #endif ==== //depot/projects/kse/sys/sys/proc.h#122 (text+ko) ==== @@ -55,6 +55,7 @@ #else #include #endif +#include #include #include /* Machine-dependent proc substruct. */ #include @@ -376,18 +377,7 @@ void *ke_mailbox; /* the userland mailbox address */ struct thread *ke_tdspare; /* spare thread for upcalls */ #define ke_endzero ke_dummy - -#define ke_startcopy ke_endzero - u_char ke_dummy; /* */ -#define ke_endcopy ke_mdstorage - - void *ke_upcall; - void *ke_stackbase; - u_long ke_stacksize; - void *ke_mdstorage; /* where we store the pcb and frame */ - struct pcb *ke_pcb; /* the pcb saved for the upcalls */ - struct trapframe *ke_frame; /* the upcall trapframe */ - void *mdkse; /* eventually you load from this in */ + char ke_dummy; /* switch for our extension PCB x86 */ }; /* flags kept in ke_flags */ @@ -845,11 +835,6 @@ /* New in KSE. */ struct thread *thread_alloc(void); void thread_free(struct thread *td); -int cpu_export_context(struct thread *td); -void cpu_free_kse_mdstorage(struct kse *kse); -void cpu_save_upcall(struct thread *td, struct kse *newkse); -void cpu_set_args(struct thread *, struct kse *); -void cpu_set_upcall(struct thread *td, void *pcb); void cpu_thread_exit(struct thread *); void cpu_thread_setup(struct thread *td); void kse_reassign(struct kse *ke); @@ -862,6 +847,8 @@ void thread_link(struct thread *td, struct ksegrp *kg); void thread_reap(void); struct thread *thread_schedule_upcall(struct thread *td, struct kse *ke); +int thread_setcontext(struct thread *td, ucontext_t *uc); +void thread_getcontext(struct thread *td, ucontext_t *uc); int thread_single(int how); #define SNGLE_NO_EXIT 0 /* values for 'how' */ #define SNGLE_EXIT 1 ==== //depot/projects/kse/sys/sys/ucontext.h#3 (text+ko) ==== @@ -47,7 +47,8 @@ struct __ucontext *uc_link; stack_t uc_stack; - int __spare__[8]; + int uc_busy; + int __spare__[6]; } ucontext_t; #ifndef _KERNEL To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 3: 2:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4DDF37B401; Mon, 19 Aug 2002 03:02:52 -0700 (PDT) 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 59A3737B400; Mon, 19 Aug 2002 03:02:52 -0700 (PDT) Received: from srv1.cosmo-project.de (srv1.cosmo-project.de [213.83.6.106]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2203A43E70; Mon, 19 Aug 2002 03:02:51 -0700 (PDT) (envelope-from ticso@cicely9.cicely.de) Received: from cicely5.cicely.de (cicely5.cicely.de [IPv6:3ffe:400:8d0:301:200:92ff:fe9b:20e7]) (authenticated bits=0) by srv1.cosmo-project.de (8.12.5/8.12.5) with ESMTP id g7JA2j0Z082923 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=OK); Mon, 19 Aug 2002 12:02:48 +0200 (CEST) (envelope-from ticso@cicely9.cicely.de) Received: from cicely9.cicely.de (cicely9.cicely.de [IPv6:3ffe:400:8d0:301:210:5aff:fe30:1c1a]) by cicely5.cicely.de (8.12.1/8.12.1) with ESMTP id g7JA2kFJ017915 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Mon, 19 Aug 2002 12:02:46 +0200 (CEST)?g (envelope-from ticso@cicely9.cicely.de) Received: from cicely9.cicely.de (localhost [127.0.0.1]) by cicely9.cicely.de (8.12.5/8.12.5) with ESMTP id g7JA2OXN093725; Mon, 19 Aug 2002 12:02:24 +0200 (CEST) (envelope-from ticso@cicely9.cicely.de) Received: (from ticso@localhost) by cicely9.cicely.de (8.12.5/8.12.5/Submit) id g7JA2O7C093724; Mon, 19 Aug 2002 12:02:24 +0200 (CEST) Date: Mon, 19 Aug 2002 12:02:24 +0200 From: Bernd Walter To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16241 for review Message-ID: <20020819100223.GB93644@cicely9.cicely.de> Reply-To: ticso@cicely.de References: <200208190328.g7J3STap059184@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200208190328.g7J3STap059184@freefall.freebsd.org> X-Operating-System: FreeBSD cicely9.cicely.de 5.0-CURRENT alpha User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Aug 18, 2002 at 08:28:29PM -0700, Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16241 > > Change 16241 by mini@mini_stylus on 2002/08/18 20:28:06 > > - Add the glue needed to get and save mcontext_t structs from and to a > thread (respectively). > - Modify the timing of FPU state management so that (among other > things)the FPU regs are set from the mcontext_t for a thread just > before returning to userland upon delivering a signal. > > Sadly, this is i386-only. This work is from Daniel Eischen, who > wrote alpha MD code as well, but I was unable to include that here > (lack of testability, lack of understanding of alpha arch on my part). I will be out of town for around a week. When I'm back I can spend some time on the alpha part. After all that's a perforce branch. I don't expect anyone to complain if you break alpha in that branch. -- B.Walter COSMO-Project http://www.cosmo-project.de ticso@cicely.de Usergroup info@cosmo-project.de To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 3: 7: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1189537B401; Mon, 19 Aug 2002 03:07:03 -0700 (PDT) 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 A9B1637B400 for ; Mon, 19 Aug 2002 03:07:02 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7244043E3B for ; Mon, 19 Aug 2002 03:07:02 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 51DA3AE027; Mon, 19 Aug 2002 03:07:02 -0700 (PDT) Date: Mon, 19 Aug 2002 03:07:02 -0700 From: Jonathan Mini To: ticso@cicely.de Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16241 for review Message-ID: <20020819100702.GD3751@elvis.mu.org> References: <200208190328.g7J3STap059184@freefall.freebsd.org> <20020819100223.GB93644@cicely9.cicely.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020819100223.GB93644@cicely9.cicely.de> User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Bernd Walter [ticso@cicely9.cicely.de] wrote : > On Sun, Aug 18, 2002 at 08:28:29PM -0700, Jonathan Mini wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16241 > > > > Change 16241 by mini@mini_stylus on 2002/08/18 20:28:06 > > > > - Add the glue needed to get and save mcontext_t structs from and to a > > thread (respectively). > > - Modify the timing of FPU state management so that (among other > > things)the FPU regs are set from the mcontext_t for a thread just > > before returning to userland upon delivering a signal. > > > > Sadly, this is i386-only. This work is from Daniel Eischen, who > > wrote alpha MD code as well, but I was unable to include that here > > (lack of testability, lack of understanding of alpha arch on my part). > > I will be out of town for around a week. > When I'm back I can spend some time on the alpha part. Drop me an email when you get back in. By then, I should have this hack stable on i386. Right now it's like 98% broken. =) > After all that's a perforce branch. > I don't expect anyone to complain if you break alpha in that branch. Nope. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 3:51:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AB4137B401; Mon, 19 Aug 2002 03:51:45 -0700 (PDT) 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 2EA3837B400 for ; Mon, 19 Aug 2002 03:51:45 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D525E43E6E for ; Mon, 19 Aug 2002 03:51:44 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JApiJU072822 for ; Mon, 19 Aug 2002 03:51:44 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JApiB6072812 for perforce@freebsd.org; Mon, 19 Aug 2002 03:51:44 -0700 (PDT) Date: Mon, 19 Aug 2002 03:51:44 -0700 (PDT) Message-Id: <200208191051.g7JApiB6072812@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16255 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16255 Change 16255 by mini@mini_stylus on 2002/08/19 03:51:13 Set the ucontext_t to the UTS when performing an upcall. Affected files ... .. //depot/projects/kse/sys/kern/kern_thread.c#87 edit .. //depot/projects/kse/sys/sys/kse.h#17 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#87 (text+ko) ==== @@ -438,14 +438,11 @@ /* * Set up the upcall pcb in either a given thread or a new one * if none given. Use the upcall for the given KSE - * XXXKSE possibly fix cpu_set_upcall() to not need td->td_kse set. */ struct thread * thread_schedule_upcall(struct thread *td, struct kse *ke) { struct thread *td2; - caddr_t ucp; - ucontext_t uc; mtx_assert(&sched_lock, MA_OWNED); if (ke->ke_tdspare != NULL) { @@ -459,17 +456,16 @@ CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", td, td->td_proc->p_pid, td->td_proc->p_comm); thread_link(td2, ke->ke_ksegrp); - ucp = (caddr_t)ke->ke_mailbox + - offsetof(struct kse_mailbox, km_context); - copyin(ucp, &uc, sizeof(ucontext_t)); /* - * XXX: It is somewhat bogus to ignore the error - * if copyin fails here, but the end result will be - * that the process will crash from bogus state information, - * which is what we want. + * The user context for this thread is selected when we choose + * a KSE and return to userland on it. All we need do here is + * note that the thread exists in order to perform an upcall. + * + * Since selecting a KSE to perform the upcall involves locking + * that KSE's context to our upcall, its best to wait until the + * last possible moment before grabbing a KSE. We do this in + * userret(). */ - thread_setcontext(td2, &uc); - suword(ucp + offsetof(ucontext_t, uc_busy), 1); td2->td_ucred = crhold(td->td_ucred); td2->td_flags = TDF_UNBOUND|TDF_UPCALLING; td2->td_priority = td->td_priority; @@ -493,6 +489,8 @@ struct thread *td, struct trapframe *frame) { int error = 0; + caddr_t ucp; + ucontext_t uc; if (ke->ke_tdspare == NULL) { ke->ke_tdspare = thread_alloc(); @@ -575,39 +573,37 @@ if (td->td_flags & TDF_UPCALLING) { CTR3(KTR_PROC, "userret: upcall thread %p (pid %d, %s)", td, p->p_pid, p->p_comm); -#if 0 /* - * Make sure that it has the correct frame loaded. - * While we know that we are on the same KSEGRP - * as we were created on, we could very easily - * have come in on another KSE. We therefore need - * to do the copy of the frame after the last - * possible switch() (the one above). + * There is no more work to do and we are going to ride + * this thead/KSE up to userland. */ - bcopy(ke->ke_frame, frame, sizeof(struct trapframe)); /* - * Decide what we are sending to the user - * upcall sets one argument. The address of the mbox. + * Set user/machine context to the UTS. */ - cpu_set_args(td, ke); + ucp = (caddr_t)ke->ke_mailbox + + offsetof(struct kse_mailbox, km_context); + if (copyin(ucp, &uc, sizeof(ucontext_t)) != 0) + /* + * If copyin() fails here, act as if it had + * read nothing but nulls. This will cause + * the process to crash from the bogus state + * information. + */ + bzero(&uc, sizeof(ucontext_t)); + thread_setcontext(td, &uc); + /* Mark the context busy (XXXSMP: must be atomic). */ + suword(ucp + offsetof(ucontext_t, uc_busy), 1); /* - * There is no more work to do and we are going to ride - * this thead/KSE up to userland. Make sure the user's - * pointer to the thread mailbox is cleared before we - * re-enter the kernel next time for any reason.. - * We might as well do it here. + * Make sure the user's pointer to the thread + * mailbox is cleared before we re-enter the kernel + * next time for any reason.. */ td->td_flags &= ~TDF_UPCALLING; /* Hmmmm. */ error = suword((caddr_t)td->td_kse->ke_mailbox + offsetof(struct kse_mailbox, km_curthread), 0); -#else - /* - * We are returning to the UTS. - */ -#endif } /* * Stop any chance that we may be separated from ==== //depot/projects/kse/sys/sys/kse.h#17 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 4: 6:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8C6B37B401; Mon, 19 Aug 2002 04:06:08 -0700 (PDT) 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 888AE37B400 for ; Mon, 19 Aug 2002 04:06:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A66943E72 for ; Mon, 19 Aug 2002 04:06:08 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JB68JU084462 for ; Mon, 19 Aug 2002 04:06:08 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JB67vS084459 for perforce@freebsd.org; Mon, 19 Aug 2002 04:06:07 -0700 (PDT) Date: Mon, 19 Aug 2002 04:06:07 -0700 (PDT) Message-Id: <200208191106.g7JB67vS084459@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16256 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16256 Change 16256 by mini@mini_stylus on 2002/08/19 04:05:58 Add a few comments, clarify others. Affected files ... .. //depot/projects/kse/sys/kern/kern_thread.c#88 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#88 (text+ko) ==== @@ -190,6 +190,11 @@ allocated_threads--; /* XXXSMP */ } +/* + * Fill a ucontext_t with a thread's context information. + * + * This is an analogue to getcontext(3). + */ void thread_getcontext(struct thread *td, ucontext_t *uc) { @@ -198,6 +203,11 @@ uc->uc_sigmask = td->td_proc->p_sigmask; } +/* + * Set a thread's context from a ucontext_t. + * + * This is an analogue to setcontext(3). + */ int thread_setcontext(struct thread *td, ucontext_t *uc) { @@ -236,8 +246,8 @@ mtx_unlock_spin(&zombie_thread_lock); } -/* - * reap any zombie threads. +/* + * Reap zombie threads. */ void thread_reap(void) @@ -436,8 +446,7 @@ } /* - * Set up the upcall pcb in either a given thread or a new one - * if none given. Use the upcall for the given KSE + * Create a thread and schedule it for upcall on the KSE given. */ struct thread * thread_schedule_upcall(struct thread *td, struct kse *ke) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 4:18:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3266E37B401; Mon, 19 Aug 2002 04:17:25 -0700 (PDT) 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 BC3E037B400 for ; Mon, 19 Aug 2002 04:17:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9322A43E65 for ; Mon, 19 Aug 2002 04:17:23 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JBHNJU088072 for ; Mon, 19 Aug 2002 04:17:23 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JBHMRB088058 for perforce@freebsd.org; Mon, 19 Aug 2002 04:17:22 -0700 (PDT) Date: Mon, 19 Aug 2002 04:17:22 -0700 (PDT) Message-Id: <200208191117.g7JBHMRB088058@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 16258 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16258 Change 16258 by chris@chris_holly on 2002/08/19 04:16:39 Integ. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hats/article.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#6 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/apropos.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/biff.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/chmod.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/cp.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/dig.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/login.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/paste.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/pax.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/rcp.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/scp.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/send-pr.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sftp.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-add.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-agent.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-keygen.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh-keyscan.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ssh.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tcsh.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/top.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/ssh_config.5#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/sshd_config.5#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/termcap.5#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/Makefile#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/comsat.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ftpd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/inetd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/nsupdate.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/revnetgroup.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sftp-server.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ssh-keysign.8#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sshd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sync.8#2 integrate Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#6 (text+ko) ==== @@ -18,7 +18,7 @@ Contributors to FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.236 2002/08/15 20:01:12 seanc Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.237 2002/08/18 16:39:09 marcus Exp $ This article lists individuals and organizations who have @@ -5114,6 +5114,10 @@ + Maxime Romano verbophobe@hotmail.com + + + Micha Class michael_class@hpbbse.bbn.hp.com ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hats/article.sgml#2 (text+ko) ==== @@ -27,7 +27,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/hats/article.sgml,v 1.1 2002/06/25 16:58:12 mwlucas Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/hats/article.sgml,v 1.3 2002/08/17 20:01:18 ceri Exp $ 2002 @@ -112,7 +112,7 @@ If a committer feels that a hat is abusing his or her power, or being regularly rude to contributors, then they should bring the matter to core. This problem can be technical, social, - process, or some combination or subset of these. Core will hear + procedural, or some combination or subset of these. Core will hear the case and reach a decision, and expects both sides to abide by their decision. Core appreciates specific complaints rather than general ones as those are easier to resolve. @@ -125,4 +125,4 @@ secretly solve vulnerabilities before they are announced.) The hat should be a first among equals, not a chairman. -+ ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/Makefile,v 1.14 2002/07/29 06:19:29 murray Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/Makefile,v 1.15 2002/08/19 04:38:24 chris Exp $ # # Build the FreeBSD Developers' Handbook. # ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 (text+ko) ==== @@ -27,14 +27,14 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml,v 1.5 2001/11/05 07:13:36 murray Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml,v 1.6 2002/08/17 19:58:12 blackend Exp $ --> Using <literal>sgml-mode</literal> with <application>Emacs</application> - Recent versions of Emacs or Xemacs (available from the ports + Recent versions of Emacs or XEmacs (available from the ports collection) contain a very useful package called PSGML. Automatically invoked when a file with the .sgml extension is loaded, or by typing M-x sgml-mode, it is a major mode for ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#3 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.47 2002/05/22 14:17:36 ceri Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.48 2002/08/17 15:23:49 blackend Exp $ --> @@ -1497,8 +1497,8 @@ Some of the things the user will be seeing on the screen - are prompts from the computer (either from the OS, command - shell, or application. These should be marked up using + are prompts from the computer (either from the operating system, command + shell, or application). These should be marked up using prompt. As a special case, the two shell prompts for the normal @@ -1936,7 +1936,7 @@ With no role attribute (i.e., - hostid...hostid the + hostid.../hostid) the marked up information is the simple hostname, such as freefall or wcarchive. You can explicitly specify this with ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#3 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.21 2002/05/30 08:10:27 murray Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml,v 1.22 2002/08/17 19:59:05 blackend Exp $ --> @@ -248,7 +248,7 @@ Emacs or - xemacs + XEmacs (editors/emacs or editors/xemacs) ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 (text+ko) ==== @@ -27,7 +27,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml,v 1.26 2001/12/08 12:12:47 keramida Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml,v 1.28 2002/08/18 00:56:58 bmah Exp $ --> @@ -141,7 +141,7 @@ Always use two spaces at the end of sentences, as this improves readability, and eases use of tools such as - emacs. + Emacs. While it may be argued that a capital letter following a period denotes a new sentence, this is not the case, especially @@ -220,9 +220,9 @@ ]]> If you use Emacs or - Xemacs to edit the files then + XEmacs to edit the files then sgml-mode should be loaded automatically, and the - Emacs local variables at the bottom of each file should enforce these + Emacs local variables at the bottom of each file should enforce these styles. ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -115,7 +115,7 @@ To illustrate different aspects of routing, we will use the following example from netstat: - &prompt.user; netstat -r + &prompt.user; netstat -r Routing tables Destination Gateway Flags Refs Use Netif Expire @@ -5433,7 +5433,7 @@ Sending <application>inetd</application> a HangUP Signal - &prompt.root; kill -HUP `cat /var/run/inetd.pid` + &prompt.root; kill -HUP `cat /var/run/inetd.pid` Each line of the configuration file specifies an ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1316,8 +1316,8 @@ On systems without DEVFS, device nodes are created using the &man.MAKEDEV.8; script as shown below: - &prompt.root; cd /dev -&prompt.root; sh MAKEDEV ad1 + &prompt.root; cd /dev +&prompt.root; sh MAKEDEV ad1 This example would make the proper device nodes ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -889,8 +889,8 @@ now we are only concerned with toggling Soft Updates on and off, which is done by: - &prompt.root; tunefs -n enable /filesystem -&prompt.root; tunefs -n disable /filesystem + &prompt.root; tunefs -n enable /filesystem +&prompt.root; tunefs -n disable /filesystem A filesystem cannot be modified with &man.tunefs.8; while it is mounted. A good time to enable Soft Updates is before any ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -760,7 +760,7 @@ As the superuser, you can execute - &prompt.root; + &prompt.root; shutdown now from a running system, which will drop it to single user mode. @@ -1364,7 +1364,7 @@ Remake all the devices. - &prompt.root; + &prompt.root; sh MAKEDEV all @@ -1428,7 +1428,7 @@ In this case, the fix would be to run: &prompt.root; cd /usr/src/usr.bin/file -&prompt.root; +&prompt.root; make all install ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -234,7 +234,7 @@ Be sure to always check the file /usr/src/UPDATING, before you perform any update steps, in the case you sync your source-tree with the + linkend="cutting-edge">sync your source tree with the latest sources of the FreeBSD project. In this file all important issues with updating FreeBSD are written down. /usr/src/UPDATING always fits @@ -357,7 +357,7 @@ The new kernel will be copied to the root directory as /kernel and the old kernel will be moved to /kernel.old. Now, shutdown the system and - reboot to use your kernel. In case something goes wrong, there are + reboot to use your new kernel. In case something goes wrong, there are some troubleshooting instructions at the end of this chapter. Be sure to read the section which explains how to recover in case your new kernel I586_CPU or I686_CPU), however, for a custom kernel, it is best to specify only the CPU you have. If you are unsure of your CPU type, - you can use the dmesg command to + you can use the &man.dmesg.8; command to view your boot up messages. kernel options @@ -615,10 +615,10 @@ options SOFTUPDATES #Enable FFS soft updates support - This option enables soft updates in the kernel, this will help speed + This option enables Soft Updates in the kernel, this will help speed up write access on the disks. They are enabled by default in the 4.X branch but may not be turned on. Review the output from &man.mount.8; to see - if you have them enabled. If you do not see the soft-updates option then + if you have them enabled. If you do not see the soft-updates option then you will need to activate it using the &man.tunefs.8; or &man.newfs.8; for new filesystems. @@ -702,9 +702,9 @@ options UCONSOLE #Allow users to grab the console Allow users to grab the console, which is useful for X users. - For example, you can create a console xterm by typing xterm - -C, which will display any write, - talk, and any other messages you receive, as well + For example, you can create a console xterm by typing xterm + -C, which will display any &man.write.1;, + &man.talk.1;, and any other messages you receive, as well as any console messages sent by the kernel. options USERCONFIG #boot -c editor @@ -778,8 +778,8 @@ device isa All PCs supported by FreeBSD have one of these. If you have an - IBM PS/2 (Micro Channel Architecture), you cannot run FreeBSD at - this time (support is being worked on). + IBM PS/2 (Micro Channel Architecture), FreeBSD provides some limited support at + this time. For more information about the MCA support, see /usr/src/sys/i386/conf/LINT. device eisa @@ -1112,7 +1112,7 @@ It is used by incoming telnet and rlogin sessions, xterm, and some other applications such - as emacs. A + as Emacs. A number after pty indicates the number of ptys to create. If you need more than the default of 16 simultaneous xterm windows @@ -1123,7 +1123,7 @@ Memory disk pseudo-devices. - pesudo-device gif + pseudo-device gif or @@ -1258,16 +1258,16 @@ config fails: - If the config command fails when you + If the &man.config.8; command fails when you give it your kernel description, you have probably made a simple error somewhere. Fortunately, - config will print the line number that it + &man.config.8; will print the line number that it had trouble with, so you can quickly skip to it with - vi. For example, if you see: + vi. For example, if you see: config: line 17: syntax error - You can skip to the problem in vi by + You can skip to the problem in vi by typing 17G in command mode. Make sure the keyword is typed correctly, by comparing it to the GENERIC kernel or another @@ -1281,7 +1281,7 @@ If the make command fails, it usually signals an error in your kernel description, but not severe - enough for config to catch it. Again, look + enough for &man.config.8; to catch it. Again, look over your configuration, and if you still cannot resolve the problem, send mail to the &a.questions; with your kernel configuration, and it should be diagnosed very quickly. @@ -1289,7 +1289,7 @@ - Installing the new kernel fails + Installing the new kernel fails: If the kernel compiled fine, but failed to install @@ -1306,17 +1306,17 @@ - The kernel will not boot:The kernel does not boot: If your new kernel does not boot, or fails to - recognize your devices, do not panic! Fortunately, BSD has + recognize your devices, do not panic! Fortunately, FreeBSD has an excellent mechanism for recovering from incompatible kernels. Simply choose the kernel you want to boot from at the FreeBSD boot loader. You can access this when the system counts down from 10. Hit any key except for the - enter key, type unload + Enter key, type unload and then type boot kernel.old, or the filename of any other kernel that will boot properly. @@ -1365,8 +1365,8 @@ - The kernel works, but ps does not work - any more!: + The kernel works, but &man.ps.1; does not work + any more: If you have installed a different version of the kernel ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -624,8 +624,8 @@ Test-start maple: - &prompt.user; cd /usr/local/maple/bin -&prompt.user; ./xmaple + &prompt.user; cd /usr/local/maple/bin +&prompt.user; ./xmaple You should be up and running. Make sure to write Maplesoft to let them know you would like a native FreeBSD @@ -1872,7 +1872,7 @@ Then the install-script is started, which will copy nearly all the relevant files into the install-directory: - &prompt.root; /oracle/<SID>/sapreorg/KERNEL/UNIX/INSTTOOL.SH + &prompt.root; /oracle/<SID>/sapreorg/KERNEL/UNIX/INSTTOOL.SH The IDES-Installation (4.6B) comes with a fully customized SAP R/3 Demo-System, so there are six instead of just three @@ -2859,9 +2859,9 @@ To continue with the installation, I created a link and an additional directory: - &prompt.root; pwd + &prompt.root; pwd /compat/linux/usr/sap -&prompt.root; ls -l +&prompt.root; ls -l total 4 drwxr-xr-x 3 idsadm sapsys 512 May 5 11:20 D00 drwxr-x--x 5 idsadm sapsys 512 May 5 11:35 IDS ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -294,7 +294,7 @@ After you reboot, log in and run dmesg | grep pcm as shown below: - &prompt.root; dmesg | grep pcm + &prompt.root; dmesg | grep pcm pcm0: <SB16 DSP 4.11> on sbc0 The output from your system may look different. If no @@ -308,8 +308,8 @@ pcm0, you will have to run the following as root: - &prompt.root; cd /dev -&prompt.root; sh MAKEDEV snd0 + &prompt.root; cd /dev +&prompt.root; sh MAKEDEV snd0 If the command returned pcm1, follow the same steps as shown above, replacing @@ -383,7 +383,7 @@ your soundcard, you can put a CD in the drive and play it with &man.cdcontrol.1;. - &prompt.user; cdcontrol -f /dev/acd0c play 1 + &prompt.user; cdcontrol -f /dev/acd0c play 1 Various applications, such as audio/workman offer a better @@ -470,8 +470,8 @@ To set the number of virtual channels, there are two sysctl knobs which, if you are the root user, can be set like this: - &prompt.root; sysctl hw.snd.pcm0.vchans=4 -&prompt.root; sysctl hw.snd.maxautovchans=4 + &prompt.root; sysctl hw.snd.pcm0.vchans=4 +&prompt.root; sysctl hw.snd.maxautovchans=4 The above example allocates four virtual channels, which is a practical number for everyday use. hw.snd.pcm0.vchans @@ -538,7 +538,7 @@ the sound device and the MP3 file on the command line, as shown below: - &prompt.root; mpg123 -a /dev/dsp1.0 Foobar-GreatestHits.mp3 + &prompt.root; mpg123 -a /dev/dsp1.0 Foobar-GreatestHits.mp3 High Performance MPEG 1.0/2.0/2.5 Audio Player for Layer 1, 2 and 3. Version 0.59r (1999/Jun/15). Written and copyrights by Michael Hipp. Uses code from various people. See 'README' for more! @@ -574,14 +574,14 @@ be issued (as root) to rip an entire CD into individual (per track) WAV files: - &prompt.root; cdda2wav -D 0,1,0 -B + &prompt.root; cdda2wav -D 0,1,0 -B cdda2wav will support ATAPI (IDE) CDROM drives. To rip from an IDE drive, specify the device name in place of the SCSI unit numbers. For example, to rip track 7 from an IDE drive: - &prompt.root; cdda2wav -D /dev/acd0a -t 7 + &prompt.root; cdda2wav -D /dev/acd0a -t 7 The indicates the SCSI device 0,1,0, @@ -591,13 +591,13 @@ To rip individual tracks, make use of the option as shown: - &prompt.root; cdda2wav -D 0,1,0 -t 7 + &prompt.root; cdda2wav -D 0,1,0 -t 7 This example rips track seven of the audio CDROM. To rip a range of tracks, for example, track one to seven, specify a range: - &prompt.root; cdda2wav -D 0,1,0 -t 1+7 + &prompt.root; cdda2wav -D 0,1,0 -t 1+7 @@ -613,14 +613,14 @@ convert audio01.wav to audio01.mp3: - &prompt.root; lame -h -b 128 \ + &prompt.root; lame -h -b 128 \ --tt "Foo Song Title" \ --ta "FooBar Artist" \ --tl "FooBar Album" \ --ty "2001" \ --tc "Ripped and encoded by Foo" \ --tg "Genre" \ -audio01.wav audio01.mp3 +audio01.wav audio01.mp3 128 kbits seems to be the standard MP3 bitrate in use. Many enjoy the higher quality 160, or 192. The higher the @@ -746,14 +746,14 @@ name hardcoded in them, you might find it useful to make symbolic links to the proper devices: - &prompt.root; ln -sf /dev/acd0c /dev/dvd -&prompt.root; ln -sf /dev/racd0c /dev/rdvd + &prompt.root; ln -sf /dev/acd0c /dev/dvd +&prompt.root; ln -sf /dev/racd0c /dev/rdvd On FreeBSD 5.X, which uses &man.devfs.5; there is a slightly different set of recommended links: - &prompt.root; ln -sf /dev/acd0c /dev/dvd -&prompt.root; ln -sf /dev/acd0c /dev/rdvd + &prompt.root; ln -sf /dev/acd0c /dev/dvd +&prompt.root; ln -sf /dev/acd0c /dev/rdvd Additionally, DVD decryption, which requires invoking special DVD-ROM functions, requires write permission on the DVD @@ -851,7 +851,7 @@ To check whether the extension is running, use xvinfo: - &prompt.user; xvinfo + &prompt.user; xvinfo XVideo is supported for your card if the result looks like: X-Video Extension version 2.2 @@ -924,7 +924,7 @@ red, green, blue masks: 0x0, 0x0, 0x0 Also note that the formats listed (YUV2, YUV12, etc) are not - present with every implementation of XVideo and their absense may + present with every implementation of XVideo and their absence may hinder some players. If the result looks like: @@ -1096,8 +1096,8 @@ make which echo at the start of the build. - &prompt.root; cd /usr/ports/graphics/mplayer -&prompt.root; make + &prompt.root; cd /usr/ports/graphics/mplayer +&prompt.root; make You can enable additional compilation optimizations by defining WITH_OPTIMIZED_CFLAGS You can enable GTK GUI by defining WITH_GUI. @@ -1117,7 +1117,7 @@ before enabling this option. . Some reasonable options are: - &prompt.root; make WITH_DVD=yes WITH_SVGALIB=yes + &prompt.root; make WITH_DVD=yes WITH_SVGALIB=yes As of this writing, the MPlayer port will build its HTML documentation and one executable, @@ -1147,8 +1147,8 @@ home directory. To create this necessary subdirectory, you can do the following: -&prompt.user; cd /usr/ports/graphics/mplayer -&prompt.user; make install-user +&prompt.user; cd /usr/ports/graphics/mplayer +&prompt.user; make install-user The command options for mplayer are listed in the manual page. For even more detail there is HTML @@ -1159,11 +1159,11 @@ testfile.avi through one of the various video interfaces set the : - &prompt.user; mplayer -vo xv testfile.avi - &prompt.user; mplayer -vo sdl testfile.avi - &prompt.user; mplayer -vo x11 testfile.avi - &prompt.root; mplayer -vo dga testfile.avi - &prompt.root; mplayer -vo 'sdl:dga' testfile.avi + &prompt.user; mplayer -vo xv testfile.avi + &prompt.user; mplayer -vo sdl testfile.avi + &prompt.user; mplayer -vo x11 testfile.avi + &prompt.root; mplayer -vo dga testfile.avi + &prompt.root; mplayer -vo 'sdl:dga' testfile.avi It is worth trying all of these options, as their relative performance depends on many factors and will vary significantly @@ -1177,7 +1177,7 @@ device node for the DVD-ROM. For example, to play title 3 from /dev/dvd: - &prompt.root; mplayer -vo dga -dvd 2 /dev/dvd + &prompt.root; mplayer -vo dga -dvd 2 /dev/dvd To stop, pause, advance and so on, consult the keybindings, which are output by running mplayer @@ -1198,7 +1198,7 @@ Finally, mplayer can be used to rip a DVD title into a .vob file. To dump out title 2 from a DVD: - &prompt.root; mplayer -dumpstream -dumpfile out.vob -dvd 2 /dev/dvd + &prompt.root; mplayer -dumpstream -dumpfile out.vob -dvd 2 /dev/dvd The output file, out.vob, will be MPEG and can be manipulated by the other packages described @@ -1224,7 +1224,7 @@ or bad performance. Here are a couple of examples to get you going. First a simple copy: - &prompt.user; mencoder input.avi -oac copy -ovc copy -o output.avi + &prompt.user; mencoder input.avi -oac copy -ovc copy -o output.avi It is easy to find examples where the output is unplayable even by mplayer. Thus, if you @@ -1234,8 +1234,8 @@ To convert input.avi to the MPEG4 codec with MPEG3 audio encoding (audio/lame is required): - &prompt.user; mencoder input.avi -oac mp3lame -lameopts br=192 \ - -ovc lavc -lavcopts vcodec=mpeg4:vhq -o output.avi + &prompt.user; mencoder input.avi -oac mp3lame -lameopts br=192 \ + -ovc lavc -lavcopts vcodec=mpeg4:vhq -o output.avi This has produced output playable by mplayer and xine. @@ -1278,13 +1278,13 @@ The xine player can be started by itself: - &prompt.user; xine + &prompt.user; xine The menus can then be used to open a file, or it can be started to play a file immediately without the GUI with the command: - &prompt.user; xine -g -p mymovie.avi + &prompt.user; xine -g -p mymovie.avi @@ -1303,26 +1303,26 @@ many options to the make command. I recommend: - &prompt.root; make WITH_LIBMPEG2=yes + &prompt.root; make WITH_LIBMPEG2=yes If you plan to install graphics/avifile, then add the WITH_AVIFILE option to your make command line, as shown here: - &prompt.root; make WITH_AVIFILE=yes WITH_LIBMPEG2=yes + &prompt.root; make WITH_AVIFILE=yes WITH_LIBMPEG2=yes Here are two examples of using transcode for video conversion which produce rescaled output. The first encodes the output to an openDIVX AVI file, while the second encodes to the much more portable MPEG format. - &prompt.user; transcode -i input.vob -x vob -V -Z 320x240 \ --y opendivx -N 0x55 -o output.avi + &prompt.user; transcode -i input.vob -x vob -V -Z 320x240 \ +-y opendivx -N 0x55 -o output.avi - &prompt.user; transcode -i input.vob -x vob -V -Z 320x240 \ --y mpeg -N 0x55 -o output.tmp -&prompt.user; tcmplex -o output.mpg -i output.tmp.m1v -p output.tmp.mpa -m 1 + &prompt.user; transcode -i input.vob -x vob -V -Z 320x240 \ +-y mpeg -N 0x55 -o output.tmp +&prompt.user; tcmplex -o output.mpg -i output.tmp.m1v -p output.tmp.mpa -m 1 There is a manual page for transcode, but for the various tc* utilities (such as ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -477,7 +477,7 @@ As root, run /stand/sysinstall as shown below: - &prompt.root; /stand/sysinstall + &prompt.root; /stand/sysinstall @@ -556,7 +556,7 @@ Run cvsup: - &prompt.root; cvsup -g -L 2 /root/ports-supfile + &prompt.root; cvsup -g -L 2 /root/ports-supfile ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -222,7 +222,7 @@ role="netmask">255.255.255.255. - + static IP address @@ -326,17 +326,17 @@ We have now started ppp -ppp ON example> set device /dev/cuaa1 +ppp ON example> set device /dev/cuaa1 We set our modem device, in this case it is cuaa1 -ppp ON example> set speed 115200 +ppp ON example> set speed 115200 Set the connection speed, in this case we are using 115,200 kbps -ppp ON example> enable dns +ppp ON example> enable dns Tell ppp to configure our resolver and add the nameserver lines to @@ -344,7 +344,7 @@ cannot determine our hostname, we can set one manually later -ppp ON example> term +ppp ON example> term Switch to "terminal" mode so that we can manually control the modem @@ -406,7 +406,7 @@ We have made an agreement on an IP address and successfully completed our connection -PPP ON example>add default HISADDR +PPP ON example>add default HISADDR Here we add our default route, we need to do this before we can talk to the outside world as currently the ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -522,7 +522,7 @@ Change to the /dev directory: - &prompt.root; cd /dev + &prompt.root; cd /dev ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2545,12 +2545,12 @@ Now try doing the su: - &prompt.user; su + &prompt.user; su Password: and take a look at what tokens we have: - &prompt.root; klist + &prompt.root; klist >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 4:20:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 905C837B405; Mon, 19 Aug 2002 04:20:30 -0700 (PDT) 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 80DC337B405 for ; Mon, 19 Aug 2002 04:20:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7530243E65 for ; Mon, 19 Aug 2002 04:20:28 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JBKSJU088548 for ; Mon, 19 Aug 2002 04:20:28 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JBKSBF088545 for perforce@freebsd.org; Mon, 19 Aug 2002 04:20:28 -0700 (PDT) Date: Mon, 19 Aug 2002 04:20:28 -0700 (PDT) Message-Id: <200208191120.g7JBKSBF088545@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 16259 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16259 Change 16259 by chris@chris_holly on 2002/08/19 04:19:33 Speel "discretionary" properly. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#15 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#15 (text+ko) ==== @@ -67,7 +67,7 @@ MAC, or Mandatory Access Control, is a feature introduced by the TrustedBSD Project to supplement the existing standard DAC - (Discreationary Access Control) policies of BSD Unix systems. + (Discretionary Access Control) policies of BSD Unix systems. This chapter introduces the MAC policy framework and provides documentation for a sample MAC policy module. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 6:28:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8694737B401; Mon, 19 Aug 2002 06:28:37 -0700 (PDT) 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 EDB9037B400 for ; Mon, 19 Aug 2002 06:28:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DC8344282 for ; Mon, 19 Aug 2002 06:15:02 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JDEnJU032837 for ; Mon, 19 Aug 2002 06:14:49 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JDEnV2032834 for perforce@freebsd.org; Mon, 19 Aug 2002 06:14:49 -0700 (PDT) Date: Mon, 19 Aug 2002 06:14:49 -0700 (PDT) Message-Id: <200208191314.g7JDEnV2032834@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16261 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16261 Change 16261 by mini@mini_stylus on 2002/08/19 06:14:31 Hold the sched_lock like we're supposed to. Affected files ... .. //depot/projects/kse/bin/miniuts/Makefile#1 add .. //depot/projects/kse/sys/kern/kern_thread.c#89 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#89 (text+ko) ==== @@ -851,6 +851,8 @@ PROC_LOCK_ASSERT(p, MA_OWNED); p->p_flag &= ~P_STOPPED_SNGL; p->p_singlethread = NULL; + mtx_lock_spin(&sched_lock); thread_unsuspend(p); + mtx_unlock_spin(&sched_lock); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 7:44:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E2AF37B401; Mon, 19 Aug 2002 07:44:13 -0700 (PDT) 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 1F62637B400 for ; Mon, 19 Aug 2002 07:44:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D399143E70 for ; Mon, 19 Aug 2002 07:44:12 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JEiCJU055726 for ; Mon, 19 Aug 2002 07:44:12 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JEiCiM055723 for perforce@freebsd.org; Mon, 19 Aug 2002 07:44:12 -0700 (PDT) Date: Mon, 19 Aug 2002 07:44:12 -0700 (PDT) Message-Id: <200208191444.g7JEiCiM055723@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 16271 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16271 Change 16271 by green@green_laptop_2 on 2002/08/19 07:43:34 Make extattr set/get calls operate on symlinks, not their targets. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#79 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#79 (text+ko) ==== @@ -3777,7 +3777,7 @@ if (error) return (error); - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); + NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td); if ((error = namei(&nd)) != 0) return (error); NDFREE(&nd, NDF_ONLY_PNBUF); @@ -3907,7 +3907,7 @@ if (error) return (error); - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); + NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td); if ((error = namei(&nd)) != 0) return (error); NDFREE(&nd, NDF_ONLY_PNBUF); @@ -4000,7 +4000,7 @@ if (error) return(error); - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); + NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td); if ((error = namei(&nd)) != 0) return(error); NDFREE(&nd, NDF_ONLY_PNBUF); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 10:15:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E15D437B401; Mon, 19 Aug 2002 10:15:41 -0700 (PDT) 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 5949937B400; Mon, 19 Aug 2002 10:15:41 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2532B43E84; Mon, 19 Aug 2002 10:15:40 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g7JHFPOo016502; Mon, 19 Aug 2002 13:15:25 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Mon, 19 Aug 2002 13:15:25 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16271 for review In-Reply-To: <200208191444.g7JEiCiM055723@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Feel free to merge that to the main tree, btw. It might also be worth dropping a note in appropriate man pages. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Mon, 19 Aug 2002, Brian Feldman wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16271 > > Change 16271 by green@green_laptop_2 on 2002/08/19 07:43:34 > > Make extattr set/get calls operate on symlinks, not their > targets. > > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#79 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#79 (text+ko) ==== > > @@ -3777,7 +3777,7 @@ > if (error) > return (error); > > - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); > + NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td); > if ((error = namei(&nd)) != 0) > return (error); > NDFREE(&nd, NDF_ONLY_PNBUF); > @@ -3907,7 +3907,7 @@ > if (error) > return (error); > > - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); > + NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td); > if ((error = namei(&nd)) != 0) > return (error); > NDFREE(&nd, NDF_ONLY_PNBUF); > @@ -4000,7 +4000,7 @@ > if (error) > return(error); > > - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); > + NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td); > if ((error = namei(&nd)) != 0) > return(error); > NDFREE(&nd, NDF_ONLY_PNBUF); > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 10:17:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB69537B401; Mon, 19 Aug 2002 10:17:26 -0700 (PDT) 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 62EDD37B400; Mon, 19 Aug 2002 10:17:26 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22C9D43E75; Mon, 19 Aug 2002 10:17:25 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g7JHHAOo016723; Mon, 19 Aug 2002 13:17:10 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Mon, 19 Aug 2002 13:17:10 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16271 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Although I have to admit it makes one wonder if we shouldn't be considering an API model more like chown/fchown/lchown... Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Mon, 19 Aug 2002, Robert Watson wrote: > Feel free to merge that to the main tree, btw. It might also be worth > dropping a note in appropriate man pages. > > Robert N M Watson FreeBSD Core Team, TrustedBSD Projects > robert@fledge.watson.org Network Associates Laboratories > > On Mon, 19 Aug 2002, Brian Feldman wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16271 > > > > Change 16271 by green@green_laptop_2 on 2002/08/19 07:43:34 > > > > Make extattr set/get calls operate on symlinks, not their > > targets. > > > > Affected files ... > > > > .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#79 edit > > > > Differences ... > > > > ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#79 (text+ko) ==== > > > > @@ -3777,7 +3777,7 @@ > > if (error) > > return (error); > > > > - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); > > + NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td); > > if ((error = namei(&nd)) != 0) > > return (error); > > NDFREE(&nd, NDF_ONLY_PNBUF); > > @@ -3907,7 +3907,7 @@ > > if (error) > > return (error); > > > > - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); > > + NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td); > > if ((error = namei(&nd)) != 0) > > return (error); > > NDFREE(&nd, NDF_ONLY_PNBUF); > > @@ -4000,7 +4000,7 @@ > > if (error) > > return(error); > > > > - NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->path, td); > > + NDINIT(&nd, LOOKUP, NOFOLLOW, UIO_USERSPACE, uap->path, td); > > if ((error = namei(&nd)) != 0) > > return(error); > > NDFREE(&nd, NDF_ONLY_PNBUF); > > > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 11:11: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF16B37B401; Mon, 19 Aug 2002 11:10:51 -0700 (PDT) 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 585C737B400 for ; Mon, 19 Aug 2002 11:10:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A65D43E7B for ; Mon, 19 Aug 2002 11:10:51 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JIAoJU016206 for ; Mon, 19 Aug 2002 11:10:50 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JIAoxE016199 for perforce@freebsd.org; Mon, 19 Aug 2002 11:10:50 -0700 (PDT) Date: Mon, 19 Aug 2002 11:10:50 -0700 (PDT) Message-Id: <200208191810.g7JIAoxE016199@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16284 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16284 Change 16284 by mini@mini_stylus on 2002/08/19 11:09:56 Properly use mcontext_t information from userland. Affected files ... .. //depot/projects/kse/lib/libc/i386/gen/getcontext.S#2 edit .. //depot/projects/kse/lib/libc/i386/gen/makecontext.c#3 edit Differences ... ==== //depot/projects/kse/lib/libc/i386/gen/getcontext.S#2 (text+ko) ==== @@ -30,14 +30,14 @@ /* * Where do we define these? */ -#define UC_MC_VALID 0x0001 /* __UC_MC_VALID */ -#define UC_FP_VALID 0x0002 /* __UC_FP_VALID */ -#define MC_FP_VALID UC_MC_VALID | UC_FP_VALID +#define MC_SIZE 640 /* sizeof mcontext_t */ #define UC_MC_OFFSET 16 /* offset to mcontext from ucontext */ #define UC_FLAGS_OFFSET 208 /* offset to flags from ucontext */ -#define MC_FLAGS_OFFSET 192 /* offset to flags from mcontext */ -#define MC_FP_REGS_OFFSET 80 /* offset to FP regs from mcontext */ -#define MC_FP_CW_OFFSET 80 /* offset to FP control word */ +#define UC_MC_LEN_OFFSET 96 /* offset to mc_len from mcontext */ +#define MC_LEN_OFFSET 80 /* offset to mc_len from mcontext */ +#define MC_FP_REGS_OFFSET 96 /* offset to FP regs from mcontext */ +#define MC_FP_CW_OFFSET 96 /* offset to FP control word */ +#define MC_OWNEDFP_OFFSET 88 /* offset to mc_ownedfp from mcontext */ /* * int setcontext(ucontext_t *ucp); @@ -54,7 +54,7 @@ jne 1f movl $-1, %eax jmp 5f -1: testl $UC_MC_VALID, UC_FLAGS_OFFSET(%eax) /* is context valid? */ +1: cmpl $MC_SIZE, UC_MC_LEN_OFFSET(%eax) /* is context valid? */ jnz 2f movl $-1, %eax /* bzzzt, invalid context */ jmp 5f @@ -73,6 +73,7 @@ movl 8(%edx), %fs movl 12(%edx), %es movl 16(%edx), %ds + movl 76(%edx), %ss movl 20(%edx), %edi movl 24(%edx), %esi movl 28(%edx), %ebp @@ -80,7 +81,7 @@ subl $4, %esp /* leave space for the return address */ movl 60(%edx), %eax /* put return address at top of stack */ movl %eax, (%esp) - testl $UC_FP_VALID, MC_FLAGS_OFFSET(%edx) /* are FP regs valid? */ + cmpl $0, MC_OWNEDFP_OFFSET(%edx) /* are FP regs valid? */ jz 3f frstor MC_FP_REGS_OFFSET(%edx) /* restore FP regs */ jmp 4f @@ -136,6 +137,7 @@ movl %ecx, 44(%edx) movl (%esp), %eax /* get return address */ movl %eax, 60(%edx) /* save return address */ + movl %ss, 76(%edx) /* * XXX - Do we really need to save floating point registers? * @@ -150,7 +152,7 @@ */ #if 1 fnstcw MC_FP_CW_OFFSET(%edx) - movl $UC_MC_VALID, MC_FLAGS_OFFSET(%edx) /* mcontext valid, no FP */ + movl $0, MC_OWNEDFP_OFFSET(%edx) /* no FP */ #else fnsave MC_FP_REGS_OFFSET(%edx) /* save FP regs */ movl $MC_FP_VALID, MC_FLAGS_OFFSET(%edx) /* mcontext and FP valid */ @@ -160,6 +162,7 @@ movl %esp, %eax /* setcontext pushes the return */ addl $4, %eax /* address onto the top of the */ movl %eax, 72(%edx) /* stack; account for this */ + movl $MC_SIZE, MC_LEN_OFFSET(%edx) /* context is now valid */ movl 40(%edx), %edx /* restore edx -- is this needed? */ xorl %eax, %eax /* return 0 */ 2: ret ==== //depot/projects/kse/lib/libc/i386/gen/makecontext.c#3 (text+ko) ==== @@ -53,7 +53,7 @@ * to be restarted without being reinitialized (via * setcontext or swapcontext). */ - ucp->uc_mcontext.mc_flags = 0; + ucp->uc_mcontext.mc_len = 0; /* Set context to next one in link */ /* XXX - what to do for error, abort? */ @@ -80,14 +80,14 @@ * a void function. At least make sure that the context * isn't valid so it can't be used without an error. */ - ucp->uc_mcontext.mc_flags = 0; + ucp->uc_mcontext.mc_len = 0; } /* XXX - Do we want to sanity check argc? */ else if ((argc < 0) || (argc > NCARGS)) { - ucp->uc_mcontext.mc_flags = 0; + ucp->uc_mcontext.mc_len = 0; } /* Make sure the context is valid. */ - else if ((ucp->uc_mcontext.mc_flags & __UC_MC_VALID) != 0) { + else if (ucp->uc_mcontext.mc_len == sizeof(mcontext_t)) { /* * Arrange the stack as follows: * To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 11:11:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A4E537B401; Mon, 19 Aug 2002 11:11:53 -0700 (PDT) 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 1F01237B400 for ; Mon, 19 Aug 2002 11:11:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEBBB43E4A for ; Mon, 19 Aug 2002 11:11:52 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JIBqJU017338 for ; Mon, 19 Aug 2002 11:11:52 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JIBqTO017335 for perforce@freebsd.org; Mon, 19 Aug 2002 11:11:52 -0700 (PDT) Date: Mon, 19 Aug 2002 11:11:52 -0700 (PDT) Message-Id: <200208191811.g7JIBqTO017335@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16285 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16285 Change 16285 by mini@mini_stylus on 2002/08/19 11:10:57 Deal with the kind of mcontext_t that userland is going to give us. Affected files ... .. //depot/projects/kse/sys/i386/i386/machdep.c#52 edit .. //depot/projects/kse/sys/kern/kern_thread.c#90 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/machdep.c#52 (text+ko) ==== @@ -2047,6 +2047,9 @@ return (0); } +/* + * Get machine context. + */ void get_mcontext(struct thread *td, mcontext_t *mcp) { @@ -2076,20 +2079,25 @@ get_fpcontext(td, mcp); } +/* + * Set machine context. + * + * However, we don't set any but the user modifyable flags, and + * we we won't touch the cs selector. + */ int set_mcontext(struct thread *td, const mcontext_t *mcp) { struct trapframe *tp; int ret; + int eflags; tp = td->td_frame; - - if (!EFL_SECURE(mcp->mc_eflags, tp->tf_eflags) || - !CS_SECURE(mcp->mc_cs)) - ret = EINVAL; - else if (mcp->mc_len != sizeof(*mcp)) - ret = EINVAL; - else if ((ret = set_fpcontext(td, mcp)) == 0) { + if (mcp->mc_len != sizeof(*mcp)) + return (EINVAL); + eflags = (mcp->mc_eflags & PSL_USERCHANGE) | + (tp->tf_eflags & ~PSL_USERCHANGE); + if ((ret = set_fpcontext(td, mcp)) == 0) { tp->tf_fs = mcp->mc_fs; tp->tf_es = mcp->mc_es; tp->tf_ds = mcp->mc_ds; @@ -2101,8 +2109,7 @@ tp->tf_ecx = mcp->mc_ecx; tp->tf_eax = mcp->mc_eax; tp->tf_eip = mcp->mc_eip; - tp->tf_cs = mcp->mc_cs; - tp->tf_eflags = mcp->mc_eflags; + tp->tf_eflags = eflags; tp->tf_esp = mcp->mc_esp; tp->tf_ss = mcp->mc_ss; td->td_pcb->pcb_gs = mcp->mc_gs; ==== //depot/projects/kse/sys/kern/kern_thread.c#90 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 12:57:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 31FC437B401; Mon, 19 Aug 2002 12:56:11 -0700 (PDT) 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 C2BBF37B400 for ; Mon, 19 Aug 2002 12:56:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D59B043E4A for ; Mon, 19 Aug 2002 12:56:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JJu9JU041876 for ; Mon, 19 Aug 2002 12:56:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JJu8eK041873 for perforce@freebsd.org; Mon, 19 Aug 2002 12:56:08 -0700 (PDT) Date: Mon, 19 Aug 2002 12:56:08 -0700 (PDT) Message-Id: <200208191956.g7JJu8eK041873@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16292 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16292 Change 16292 by rwatson@rwatson_paprika on 2002/08/19 12:55:43 Integ the FreeBSD 5.0-CURRENT tree into the TrustedBSD base branch, bringing in UFS2 extended attribute supporting, trickling back in break out of vnode and pipe MAC check entry points, active/file cred changes, mac_syscall, and more. Affected files ... .. //depot/projects/trustedbsd/base/bin/ls/ls.1#10 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#6 integrate .. //depot/projects/trustedbsd/base/bin/test/test.c#12 integrate .. //depot/projects/trustedbsd/base/include/ctype.h#5 integrate .. //depot/projects/trustedbsd/base/include/wchar.h#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getcwd.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/vis.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/isctype.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/iswctype.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrlen.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrlen.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrtowc.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrtowc.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/mbsinit.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/mbsinit.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/mbsrtowcs.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/mbsrtowcs.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wcrtomb.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wcrtomb.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wcsrtombs.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wcsrtombs.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wcwidth.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/asprintf.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vasprintf.c#4 integrate .. //depot/projects/trustedbsd/base/libexec/rpc.rstatd/rstat_proc.c#4 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#22 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#37 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/dmesg/dmesg.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#11 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#12 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/ldconfig/ldconfig.8#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/netintro.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/tcp.4#5 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#14 integrate .. //depot/projects/trustedbsd/base/share/man/man7/tuning.7#12 integrate .. //depot/projects/trustedbsd/base/share/man/man9/ifnet.9#4 integrate .. //depot/projects/trustedbsd/base/share/misc/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/misc/latin1#1 branch .. //depot/projects/trustedbsd/base/share/termcap/termcap.src#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ioctl.c#12 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#31 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#15 integrate .. //depot/projects/trustedbsd/base/sys/conf/majors#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-all.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_freebsd.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispmbox.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/pst/pst-iop.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/pst/pst-raid.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via8233.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/via82c686.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/vx/if_vx.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NEWCARD.hints#3 delete .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#18 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_ktrace.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#8 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_poll.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/sys_pipe.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/tty_tty.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_syscalls.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#26 integrate .. //depot/projects/trustedbsd/base/sys/modules/osf1/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/sound/driver/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/sound/driver/via8233/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/if.c#13 integrate .. //depot/projects/trustedbsd/base/sys/net/if.h#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tap.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#8 integrate .. //depot/projects/trustedbsd/base/sys/net/rtsock.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netatm/atm_if.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#14 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/bootp_subr.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_dc.c#13 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rl.c#11 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#13 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ste.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_stereg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/pci/ohci_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pci/uhci_pci.c#5 integrate .. //depot/projects/trustedbsd/base/sys/security/lomac/kernel_util.c#8 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#3 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/asmacros.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/signal.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/tsb.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/tte.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.S#4 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#17 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#23 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tsb.c#11 integrate .. //depot/projects/trustedbsd/base/sys/sys/consio.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/mount.h#12 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/basename/basename.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/chat/chat.c#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/chflags/chflags.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/col/col.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/colcrt/colcrt.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/cut/cut.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/find/find.1#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/find/option.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/hesinfo/hesinfo.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/id/id.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/nonints.h#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/msgs/msgs.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/nl/nl.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/rpcinfo/rpcinfo.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/talk/talk.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/touch/touch.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/unifdef/unifdef.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/whereis/whereis.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kernbb/kernbb.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mrouted/config.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/vidcontrol/vidcontrol.1#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/vidcontrol/vidcontrol.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/base/bin/ls/ls.1#10 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.67 2002/05/29 15:09:49 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.68 2002/08/19 07:15:20 ru Exp $ .\" -.Dd December 29, 2002 +.Dd May 19, 2002 .Dt LS 1 .Os .Sh NAME ==== //depot/projects/trustedbsd/base/bin/sh/jobs.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.54 2002/07/25 10:47:38 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.56 2002/08/18 06:43:44 tjr Exp $"); #include #include @@ -741,9 +741,6 @@ TRACE(("Child shell %d\n", (int)getpid())); wasroot = rootshell; rootshell = 0; - for (i = njobs, p = jobtab ; --i >= 0 ; p++) - if (p->used) - freejob(p); closescript(); INTON; clear_traps(); @@ -785,6 +782,11 @@ } } #endif + INTOFF; + for (i = njobs, p = jobtab ; --i >= 0 ; p++) + if (p->used) + freejob(p); + INTON; if (wasroot && iflag) { setsignal(SIGINT); setsignal(SIGQUIT); @@ -966,13 +968,8 @@ sig = WTERMSIG(status); } if (sig != 0 && sig != SIGINT && sig != SIGPIPE) { - if (jp->foreground) { -#if JOBS - if (WIFSTOPPED(status)) - i = WSTOPSIG(status); - else -#endif - i = WTERMSIG(status); + if (thisjob->foreground && !WIFSTOPPED(status)) { + i = WTERMSIG(status); if ((i & 0x7F) < NSIG && sys_siglist[i & 0x7F]) out1str(sys_siglist[i & 0x7F]); else ==== //depot/projects/trustedbsd/base/bin/test/test.c#12 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.51 2002/08/15 14:53:20 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.52 2002/08/19 09:19:31 maxim Exp $"); #include #include ==== //depot/projects/trustedbsd/base/include/ctype.h#5 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/include/ctype.h,v 1.19 2002/08/16 13:42:59 keichii Exp $ + * $FreeBSD: src/include/ctype.h,v 1.21 2002/08/19 08:58:51 ache Exp $ */ #ifndef _CTYPE_H_ @@ -65,10 +65,8 @@ #define _CTYPE_I 0x00080000L /* Ideogram */ #define _CTYPE_T 0x00100000L /* Special */ #define _CTYPE_Q 0x00200000L /* Phonogram */ -#define _CTYPE_SWM 0xe0000000L /* Mask to get screen width data */ -#define _CTYPE_SWS 30 /* Bits to shift to get width */ #define _CTYPE_SW0 0x20000000L /* 0 width character */ -#define _CTYPE_SW1 0x00000000L /* 1 width character / default*/ +#define _CTYPE_SW1 0x40000000L /* 1 width character */ #define _CTYPE_SW2 0x80000000L /* 2 width character */ #define _CTYPE_SW3 0xc0000000L /* 3 width character */ ==== //depot/projects/trustedbsd/base/include/wchar.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.11 2002/08/13 09:30:40 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.12 2002/08/18 06:30:10 tjr Exp $ */ /*- @@ -117,22 +117,16 @@ int fwide(FILE *, int); wint_t getwc(FILE *); wint_t getwchar(void); -#if 0 -/* XXX: not implemented */ size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict); size_t mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); int mbsinit(const mbstate_t *); size_t mbsrtowcs(wchar_t * __restrict, const char ** __restrict, size_t, mbstate_t * __restrict); -#endif wint_t putwc(wchar_t, FILE *); wint_t putwchar(wchar_t); wint_t ungetwc(wint_t, FILE *); -#if 0 -/* XXX: not implemented */ size_t wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); -#endif wchar_t *wcscat(wchar_t * __restrict, const wchar_t * __restrict); wchar_t *wcschr(const wchar_t *, wchar_t); int wcscmp(const wchar_t *, const wchar_t *); @@ -147,11 +141,8 @@ wchar_t *wcsncpy(wchar_t * __restrict , const wchar_t * __restrict, size_t); wchar_t *wcspbrk(const wchar_t *, const wchar_t *); wchar_t *wcsrchr(const wchar_t *, wchar_t); -#if 0 -/* XXX: not implemented */ size_t wcsrtombs(char * __restrict, const wchar_t ** __restrict, size_t, mbstate_t * __restrict); -#endif size_t wcsspn(const wchar_t *, const wchar_t *); wchar_t *wcsstr(const wchar_t *, const wchar_t *); #if 0 ==== //depot/projects/trustedbsd/base/lib/libc/gen/getcwd.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getcwd.c 8.5 (Berkeley) 2/7/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getcwd.c,v 1.21 2002/02/01 01:08:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getcwd.c,v 1.22 2002/08/19 17:14:58 jmallett Exp $"); #include "namespace.h" #include @@ -155,7 +155,7 @@ /* * Build pointer to the parent directory, allocating memory * as necessary. Max length is 3 for "../", the largest - * possible component name, plus a trailing NULL. + * possible component name, plus a trailing NUL. */ if (bup + 3 + MAXNAMLEN + 1 >= eup) { if ((up = reallocf(up, upsize *= 2)) == NULL) ==== //depot/projects/trustedbsd/base/lib/libc/gen/vis.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 7/19/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/vis.c,v 1.10 2002/05/28 16:59:39 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/vis.c,v 1.11 2002/08/19 17:14:58 jmallett Exp $"); #include #include @@ -159,7 +159,7 @@ * strvis, strvisx - visually encode characters from src into dst * * Dst must be 4 times the size of src to account for possible - * expansion. The length of dst, not including the trailing NULL, + * expansion. The length of dst, not including the trailing NUL, * is returned. * * Strvisx encodes exactly len bytes from src into dst. ==== //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#6 (text+ko) ==== @@ -1,23 +1,29 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.28 2002/08/06 00:49:59 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.30 2002/08/18 06:30:10 tjr Exp $ # locale sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale SRCS+= ansi.c big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \ isctype.c iswctype.c \ - ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mbrune.c \ + ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mbrlen.c \ + mbrtowc.c mbrune.c mbsinit.c mbsrtowcs.c \ mskanji.c nl_langinfo.c nomacros.c none.c rune.c \ runetype.c setinvalidrune.c setlocale.c setrunelocale.c table.c \ - tolower.c toupper.c utf2.c wctob.c wctrans.c wctype.c + tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wctob.c wctrans.c \ + wctype.c wcwidth.c .if ${LIB} == "c" MAN+= btowc.3 \ ctype.3 digittoint.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \ isdigit.3 isgraph.3 islower.3 isprint.3 ispunct.3 isspace.3 \ - isupper.3 iswalnum.3 isxdigit.3 mbrune.3 multibyte.3 nl_langinfo.3 \ + isupper.3 iswalnum.3 isxdigit.3 mbrlen.3 mbrtowc.3 mbrune.3 mbsinit.3 \ + mbsrtowcs.3 multibyte.3 \ + nl_langinfo.3 \ rune.3 \ - setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wctrans.3 wctype.3 + setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wcsrtombs.3 \ + wcrtomb.3 \ + wctrans.3 wctype.3 MAN+= euc.4 utf2.4 MLINKS+=btowc.3 wctob.3 ==== //depot/projects/trustedbsd/base/lib/libc/locale/isctype.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ static char sccsid[] = "@(#)isctype.c 8.3 (Berkeley) 2/24/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.8 2002/03/22 21:52:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.9 2002/08/17 20:03:44 ache Exp $"); #include @@ -52,7 +52,7 @@ digittoint(c) int c; { - return (__maskrune((c), 0xFF)); + return (__maskrune(c, 0xFF)); } #undef isalnum @@ -60,7 +60,7 @@ isalnum(c) int c; { - return (__istype((c), _CTYPE_A|_CTYPE_D)); + return (__istype(c, _CTYPE_A|_CTYPE_D)); } #undef isalpha @@ -68,7 +68,7 @@ isalpha(c) int c; { - return (__istype((c), _CTYPE_A)); + return (__istype(c, _CTYPE_A)); } #undef isascii @@ -76,7 +76,7 @@ isascii(c) int c; { - return (((c) & ~0x7F) == 0); + return ((c & ~0x7F) == 0); } #undef isblank @@ -84,7 +84,7 @@ isblank(c) int c; { - return (__istype((c), _CTYPE_B)); + return (__istype(c, _CTYPE_B)); } #undef iscntrl @@ -92,7 +92,7 @@ iscntrl(c) int c; { - return (__istype((c), _CTYPE_C)); + return (__istype(c, _CTYPE_C)); } #undef isdigit @@ -100,7 +100,7 @@ isdigit(c) int c; { - return (__isctype((c), _CTYPE_D)); + return (__isctype(c, _CTYPE_D)); } #undef isgraph @@ -108,7 +108,7 @@ isgraph(c) int c; { - return (__istype((c), _CTYPE_G)); + return (__istype(c, _CTYPE_G)); } #undef ishexnumber @@ -116,7 +116,7 @@ ishexnumber(c) int c; { - return (__istype((c), _CTYPE_X)); + return (__istype(c, _CTYPE_X)); } #undef isideogram @@ -124,7 +124,7 @@ isideogram(c) int c; { - return (__istype((c), _CTYPE_I)); + return (__istype(c, _CTYPE_I)); } #undef islower @@ -132,7 +132,7 @@ islower(c) int c; { - return (__istype((c), _CTYPE_L)); + return (__istype(c, _CTYPE_L)); } #undef isnumber @@ -140,7 +140,7 @@ isnumber(c) int c; { - return (__istype((c), _CTYPE_D)); + return (__istype(c, _CTYPE_D)); } #undef isphonogram @@ -148,7 +148,7 @@ isphonogram(c) int c; { - return (__istype((c), _CTYPE_Q)); + return (__istype(c, _CTYPE_Q)); } #undef isprint @@ -156,7 +156,7 @@ isprint(c) int c; { - return (__istype((c), _CTYPE_R)); + return (__istype(c, _CTYPE_R)); } #undef ispunct @@ -164,7 +164,7 @@ ispunct(c) int c; { - return (__istype((c), _CTYPE_P)); + return (__istype(c, _CTYPE_P)); } #undef isrune @@ -172,7 +172,7 @@ isrune(c) int c; { - return (__istype((c), 0xFFFFFF00L)); + return (__istype(c, 0xFFFFFF00L)); } #undef isspace @@ -180,7 +180,7 @@ isspace(c) int c; { - return (__istype((c), _CTYPE_S)); + return (__istype(c, _CTYPE_S)); } #undef isspecial @@ -188,7 +188,7 @@ isspecial(c) int c; { - return (__istype((c), _CTYPE_T)); + return (__istype(c, _CTYPE_T)); } #undef isupper @@ -196,7 +196,7 @@ isupper(c) int c; { - return (__istype((c), _CTYPE_U)); + return (__istype(c, _CTYPE_U)); } #undef isxdigit @@ -204,7 +204,7 @@ isxdigit(c) int c; { - return (__isctype((c), _CTYPE_X)); + return (__isctype(c, _CTYPE_X)); } #undef toascii @@ -212,7 +212,7 @@ toascii(c) int c; { - return ((c) & 0x7F); + return (c & 0x7F); } #undef tolower ==== //depot/projects/trustedbsd/base/lib/libc/locale/iswctype.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.2 2002/08/16 13:45:23 keichii Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.6 2002/08/17 20:30:34 ache Exp $"); #include @@ -49,7 +49,7 @@ iswalnum(wc) wint_t wc; { - return (__istype((wc), _CTYPE_A|_CTYPE_D)); + return (__istype(wc, _CTYPE_A|_CTYPE_D)); } #undef iswalpha @@ -57,7 +57,7 @@ iswalpha(wc) wint_t wc; { - return (__istype((wc), _CTYPE_A)); + return (__istype(wc, _CTYPE_A)); } #undef iswascii @@ -65,7 +65,7 @@ iswascii(wc) wint_t wc; { - return (((wc) & ~0x7F) == 0); + return ((wc & ~0x7F) == 0); } #undef iswblank @@ -73,7 +73,7 @@ iswblank(wc) wint_t wc; { - return (__istype((wc), _CTYPE_B)); + return (__istype(wc, _CTYPE_B)); } #undef iswcntrl @@ -81,7 +81,7 @@ iswcntrl(wc) wint_t wc; { - return (__istype((wc), _CTYPE_C)); + return (__istype(wc, _CTYPE_C)); } #undef iswdigit @@ -89,7 +89,7 @@ iswdigit(wc) wint_t wc; { - return (__isctype((wc), _CTYPE_D)); + return (__isctype(wc, _CTYPE_D)); } #undef iswgraph @@ -97,7 +97,7 @@ iswgraph(wc) wint_t wc; { - return (__istype((wc), _CTYPE_G)); + return (__istype(wc, _CTYPE_G)); } #undef iswhexnumber @@ -105,7 +105,7 @@ iswhexnumber(wc) wint_t wc; { - return (__istype((wc), _CTYPE_X)); + return (__istype(wc, _CTYPE_X)); } #undef iswideogram @@ -113,7 +113,7 @@ iswideogram(wc) wint_t wc; { - return (__istype((wc), _CTYPE_I)); + return (__istype(wc, _CTYPE_I)); } #undef iswlower @@ -121,7 +121,7 @@ iswlower(wc) wint_t wc; { - return (__istype((wc), _CTYPE_L)); + return (__istype(wc, _CTYPE_L)); } #undef iswnumber @@ -129,7 +129,7 @@ iswnumber(wc) wint_t wc; { - return (__istype((wc), _CTYPE_D)); + return (__istype(wc, _CTYPE_D)); } #undef iswphonogram @@ -137,7 +137,7 @@ iswphonogram(wc) wint_t wc; { - return (__istype((wc), _CTYPE_Q)); + return (__istype(wc, _CTYPE_Q)); } #undef iswprint @@ -145,7 +145,7 @@ iswprint(wc) wint_t wc; { - return (__istype((wc), _CTYPE_R)); + return (__istype(wc, _CTYPE_R)); } #undef iswpunct @@ -153,7 +153,7 @@ iswpunct(wc) wint_t wc; { - return (__istype((wc), _CTYPE_P)); + return (__istype(wc, _CTYPE_P)); } #undef iswrune @@ -161,7 +161,7 @@ iswrune(wc) wint_t wc; { - return (__istype((wc), 0xFFFFFF00L)); + return (__istype(wc, 0xFFFFFF00L)); } #undef iswspace @@ -169,7 +169,7 @@ iswspace(wc) wint_t wc; { - return (__istype((wc), _CTYPE_S)); + return (__istype(wc, _CTYPE_S)); } #undef iswspecial @@ -177,7 +177,7 @@ iswspecial(wc) wint_t wc; { - return (__istype((wc), _CTYPE_T)); + return (__istype(wc, _CTYPE_T)); } #undef iswupper @@ -185,7 +185,7 @@ iswupper(wc) wint_t wc; { - return (__istype((wc), _CTYPE_U)); + return (__istype(wc, _CTYPE_U)); } #undef iswxdigit @@ -193,7 +193,7 @@ iswxdigit(wc) wint_t wc; { - return (__isctype((wc), _CTYPE_X)); + return (__isctype(wc, _CTYPE_X)); } #undef towlower @@ -212,12 +212,3 @@ return (__toupper(wc)); } -#undef wcwidth -int -wcwidth(wc) - wchar_t wc; -{ - int width = (unsigned)__maskrune((wc), _CTYPE_SWM) >> _CTYPE_SWS; - return width ? width : iswprint(wc); -} - ==== //depot/projects/trustedbsd/base/lib/libc/stdio/asprintf.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.10 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.11 2002/08/19 03:52:36 jmallett Exp $"); #include #include @@ -54,7 +54,7 @@ errno = ENOMEM; return (-1); } - f._bf._size = f._w = 127; /* Leave room for the NULL */ + f._bf._size = f._w = 127; /* Leave room for the NUL */ f._extra = &ext; INITEXTRA(&f); ret = __vfprintf(&f, fmt, ap); /* Use unlocked __vfprintf */ ==== //depot/projects/trustedbsd/base/lib/libc/stdio/vasprintf.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.14 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.15 2002/08/19 03:52:36 jmallett Exp $"); #include #include @@ -53,7 +53,7 @@ errno = ENOMEM; return (-1); } - f._bf._size = f._w = 127; /* Leave room for the NULL */ + f._bf._size = f._w = 127; /* Leave room for the NUL */ f._extra = &ext; INITEXTRA(&f); ret = __vfprintf(&f, fmt, ap); ==== //depot/projects/trustedbsd/base/libexec/rpc.rstatd/rstat_proc.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/rpc.rstatd/rstat_proc.c,v 1.18 2002/04/28 15:18:47 des Exp $"; + "$FreeBSD: src/libexec/rpc.rstatd/rstat_proc.c,v 1.19 2002/08/18 17:57:07 bde Exp $"; #endif /* @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#22 (text+ko) ==== @@ -31,7 +31,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.95 2002/08/12 18:38:26 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.97 2002/08/18 04:08:04 bmah Exp $ Supported Devices @@ -2447,9 +2447,9 @@ - Comtrol Rocketport card (rp driver) + Comtrol Rocketport card (&man.rp.4; driver) - Cyclades Cyclom-y serial board (&man.cy.4; driver) + Cyclades Cyclom-Y serial board (&man.cy.4; driver) STB 4 port card using shared IRQ @@ -2943,7 +2943,7 @@ - Scanners (through SANE) (&man.uscanner.4; driver) + Scanners (through SANE) (&man.uscanner.4; driver) Perfection 636U @@ -3027,8 +3027,8 @@ - PC standardparallel ports (&man.ppc.4; driver) - PC-9821 standardparallel ports (&man.ppc.4; driver) + PC standard parallel ports (&man.ppc.4; driver) + PC-9821 standard parallel ports (&man.ppc.4; driver) PC-compatible joysticks (&man.joy.4; driver) ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#37 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.406 2002/08/10 17:34:42 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.409 2002/08/19 17:13:08 bmah Exp $ 2000 @@ -1988,6 +1988,13 @@ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:37.kqueue.asc">FreeBSD-SA-02:37. &merged; + Several bounds-checking bugs in system calls, which could + result in some system calls returning a large portion of kernel + memory, have been fixed. More information can be found in + security advisory FreeBSD-SA-02:38. + &merged; + @@ -2031,7 +2038,7 @@ &man.biff.1; now accepts a argument to enable bell notification of new mail (which does not disturb the terminal contents as biff y - would). + would). &merged; &man.biff.1; now uses the first terminal associated with the standard input, standard output or standard error file @@ -2104,6 +2111,10 @@ &man.chmod.1; now supports a for changing the mode of a symbolic link. + &man.chmod.1; now also, when the mode is modified, prints + the old and new modes if the option is + specified more than once. + &man.chown.8; now correctly follows symbolic links named as command line arguments if run without . &merged; @@ -2138,7 +2149,7 @@ &man.cp.1; now takes a (nonstandard) option to automatically answer no when it would - ask to overwrite a file. + ask to overwrite a file. &merged; A new &man.csplit.1; utility, which splits files based on context, has been added. @@ -2721,9 +2732,9 @@ This makes it easier to use &man.mtree.8; as a part of an intrusion-detection system. &merged; - &man.mv.1; now takes a (nonstandard) to + &man.mv.1; now takes a (nonstandard) option to automatically answer no when it would ask to - overwrite a file. + overwrite a file. &merged; &man.natd.8; now supports a option to log packets that @@ -2804,6 +2815,13 @@ files, NIS, or Hesiod. The old hosts.conf file is no longer used. + &man.od.1; now supports the option to + specify the input address base, the option to + specify the number of bytes to dump, the + option to specify the number of bytes to skip, the + option to output signed decimal shorts, and + the option to specify output type. &merged; + PAM support has been added for account management and sessions. @@ -3605,7 +3623,7 @@ The &man.csh.1; shell has been replaced by &man.tcsh.1;, although it can still be run as csh. tcsh has been updated to version - 6.12. + 6.12. &merged; The contributed version of tcp_wrappers now includes the @@ -3619,7 +3637,7 @@ 4.2. &merged; top has been updated to version - 3.5b12. + 3.5b12. &merged; traceroute has been updated to LBL version 1.4a12. @@ -3818,7 +3836,7 @@ OpenSSL OpenSSL has been updated to - 0.9.6g. + 0.9.6g. &merged; OpenSSL now has support for >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 13: 0:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9192C37B407; Mon, 19 Aug 2002 13:00:16 -0700 (PDT) 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 338A237B400 for ; Mon, 19 Aug 2002 13:00:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8413643E6A for ; Mon, 19 Aug 2002 13:00:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JK0FJU044012 for ; Mon, 19 Aug 2002 13:00:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JK0Fp8044009 for perforce@freebsd.org; Mon, 19 Aug 2002 13:00:15 -0700 (PDT) Date: Mon, 19 Aug 2002 13:00:15 -0700 (PDT) Message-Id: <200208192000.g7JK0Fp8044009@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16293 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16293 Change 16293 by rwatson@rwatson_paprika on 2002/08/19 13:00:09 Improve naming consistency relating to mac_syscall: change instances of mpo_mac_syscall to mpo_syscall. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#250 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#119 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#250 (text+ko) ==== @@ -373,10 +373,6 @@ * that all enumerated values are handled. */ break; - case MAC_SYSCALL: - mpc->mpc_ops->mpo_mac_syscall = - mpe->mpe_function; - break; case MAC_DESTROY: mpc->mpc_ops->mpo_destroy = mpe->mpe_function; @@ -385,6 +381,10 @@ mpc->mpc_ops->mpo_init = mpe->mpe_function; break; + case MAC_SYSCALL: + mpc->mpc_ops->mpo_syscall = + mpe->mpe_function; + break; case MAC_INIT_BPFDESC: mpc->mpc_ops->mpo_init_bpfdesc = mpe->mpe_function; @@ -3301,10 +3301,9 @@ MAC_POLICY_LIST_BUSY(); LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { if (strcmp(mpc->mpc_name, target) == 0 && - mpc->mpc_ops->mpo_mac_syscall) { - error = mpc->mpc_ops->mpo_mac_syscall(td, - SCARG(uap, call), - SCARG(uap, arg)); + mpc->mpc_ops->mpo_syscall) { + error = mpc->mpc_ops->mpo_syscall(td, + SCARG(uap, call), SCARG(uap, arg)); goto out; } } ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#119 (text+ko) ==== @@ -63,9 +63,11 @@ void (*mpo_init)(struct mac_policy_conf *mpc); /* - * Generic policy-directed security syscall + * General policy-directed security system call so that policies + * may implement new services without reserving explicit + * system call numbers. */ - int (*mpo_mac_syscall)(struct thread *td, int call, void *arg); + int (*mpo_syscall)(struct thread *td, int call, void *arg); /* * Label operations. @@ -351,9 +353,9 @@ enum mac_op_constant { MAC_OP_LAST, - MAC_SYSCALL, MAC_DESTROY, MAC_INIT, + MAC_SYSCALL, MAC_INIT_BPFDESC, MAC_INIT_CRED, MAC_INIT_DEVFSDIRENT, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 13: 7:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B95737B401; Mon, 19 Aug 2002 13:07:27 -0700 (PDT) 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 C2EB437B400 for ; Mon, 19 Aug 2002 13:07:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E2EF43E42 for ; Mon, 19 Aug 2002 13:07:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JK7QJU050092 for ; Mon, 19 Aug 2002 13:07:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JK7Qtp050089 for perforce@freebsd.org; Mon, 19 Aug 2002 13:07:26 -0700 (PDT) Date: Mon, 19 Aug 2002 13:07:26 -0700 (PDT) Message-Id: <200208192007.g7JK7Qtp050089@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16296 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16296 Change 16296 by rwatson@rwatson_paprika on 2002/08/19 13:07:11 Use NOCRED not NULL when calling mac_check_vnode_write() without a struct file context. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#14 (text+ko) ==== @@ -771,7 +771,7 @@ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); (void)VOP_LEASE(vp, td, cred, LEASE_WRITE); #ifdef MAC - error = mac_check_vnode_write(cred, NULL, vp); + error = mac_check_vnode_write(cred, NOCRED, vp); if (error == 0) #endif error = VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, cred); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 13:20:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9877E37B401; Mon, 19 Aug 2002 13:20:43 -0700 (PDT) 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 4A31337B400 for ; Mon, 19 Aug 2002 13:20:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA42343E65 for ; Mon, 19 Aug 2002 13:20:42 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JKKgJU053458 for ; Mon, 19 Aug 2002 13:20:42 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JKKgct053448 for perforce@freebsd.org; Mon, 19 Aug 2002 13:20:42 -0700 (PDT) Date: Mon, 19 Aug 2002 13:20:42 -0700 (PDT) Message-Id: <200208192020.g7JKKgct053448@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16297 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16297 Change 16297 by rwatson@rwatson_paprika on 2002/08/19 13:20:36 Attempt to more consistently perform locking assertions before implementing any code (even enforcement enable checks) in MAC entry points. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#251 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#251 (text+ko) ==== @@ -1811,16 +1811,17 @@ { int error; + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_poll"); + if (!mac_enforce_fs) return (0); - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_poll"); - error = vn_refreshlabel(vp, active_cred); if (error) return (error); - MAC_CHECK(check_vnode_poll, active_cred, file_cred, vp, &vp->v_label); + MAC_CHECK(check_vnode_poll, active_cred, file_cred, vp, + &vp->v_label); return (error); } @@ -1831,16 +1832,17 @@ { int error; + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_read"); + if (!mac_enforce_fs) return (0); - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_read"); - error = vn_refreshlabel(vp, active_cred); if (error) return (error); - MAC_CHECK(check_vnode_read, active_cred, file_cred, vp, &vp->v_label); + MAC_CHECK(check_vnode_read, active_cred, file_cred, vp, + &vp->v_label); return (error); } @@ -2105,16 +2107,17 @@ { int error; + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_write"); + if (!mac_enforce_fs) return (0); - ASSERT_VOP_LOCKED(vp, "mac_check_vnode_write"); - error = vn_refreshlabel(vp, active_cred); if (error) return (error); - MAC_CHECK(check_vnode_write, active_cred, file_cred, vp, &vp->v_label); + MAC_CHECK(check_vnode_write, active_cred, file_cred, vp, + &vp->v_label); return (error); } @@ -2616,11 +2619,11 @@ { int error; + PROC_LOCK_ASSERT(proc, MA_OWNED); + if (!mac_enforce_process) return (0); - PROC_LOCK_ASSERT(proc, MA_OWNED); - MAC_CHECK(check_proc_debug, cred, proc); return (error); @@ -2631,11 +2634,11 @@ { int error; + PROC_LOCK_ASSERT(proc, MA_OWNED); + if (!mac_enforce_process) return (0); - PROC_LOCK_ASSERT(proc, MA_OWNED); - MAC_CHECK(check_proc_sched, cred, proc); return (error); @@ -2646,11 +2649,11 @@ { int error; + PROC_LOCK_ASSERT(proc, MA_OWNED); + if (!mac_enforce_process) return (0); - PROC_LOCK_ASSERT(proc, MA_OWNED); - MAC_CHECK(check_proc_signal, cred, proc, signum); return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 13:21:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 759B337B401; Mon, 19 Aug 2002 13:21:45 -0700 (PDT) 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 153E937B400 for ; Mon, 19 Aug 2002 13:21:45 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF61643E42 for ; Mon, 19 Aug 2002 13:21:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JKLiJU054154 for ; Mon, 19 Aug 2002 13:21:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JKLi05054151 for perforce@freebsd.org; Mon, 19 Aug 2002 13:21:44 -0700 (PDT) Date: Mon, 19 Aug 2002 13:21:44 -0700 (PDT) Message-Id: <200208192021.g7JKLi05054151@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16298 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16298 Change 16298 by rwatson@rwatson_paprika on 2002/08/19 13:21:11 Put in a missing vnode lock assertion in the exec check. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#252 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#252 (text+ko) ==== @@ -1705,6 +1705,8 @@ { int error; + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_exec"); + if (!mac_enforce_process && !mac_enforce_fs) return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 14:15:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D74D637B405; Mon, 19 Aug 2002 14:15:52 -0700 (PDT) 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 75FC337B400 for ; Mon, 19 Aug 2002 14:15:52 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F80643E4A for ; Mon, 19 Aug 2002 14:15:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JLFqJU067897 for ; Mon, 19 Aug 2002 14:15:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JLFpgt067894 for perforce@freebsd.org; Mon, 19 Aug 2002 14:15:51 -0700 (PDT) Date: Mon, 19 Aug 2002 14:15:51 -0700 (PDT) Message-Id: <200208192115.g7JLFpgt067894@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16302 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16302 Change 16302 by rwatson@rwatson_paprika on 2002/08/19 14:15:18 Minor whitespace and formatting nits. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#253 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#253 (text+ko) ==== @@ -2615,7 +2615,6 @@ return (error); } - int mac_check_proc_debug(struct ucred *cred, struct proc *proc) { @@ -2987,11 +2986,6 @@ return (0); } -#if 0 -395 MSTD BSD { int __mac_get_pid(pid_t pid, - struct mac_pid_data *mpd, size_t mpdcnt) }; -#endif - int mac_get_pid(struct thread *td, struct mac_get_pid_args *uap) { @@ -3313,7 +3307,7 @@ } } - out: +out: MAC_POLICY_LIST_UNBUSY(); return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 15:44: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D54537B401; Mon, 19 Aug 2002 15:43:40 -0700 (PDT) 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 DFA4C37B400 for ; Mon, 19 Aug 2002 15:43:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AB1C43E6E for ; Mon, 19 Aug 2002 15:43:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7JMhdJU088674 for ; Mon, 19 Aug 2002 15:43:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7JMhchi088671 for perforce@freebsd.org; Mon, 19 Aug 2002 15:43:38 -0700 (PDT) Date: Mon, 19 Aug 2002 15:43:38 -0700 (PDT) Message-Id: <200208192243.g7JMhchi088671@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16304 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16304 Change 16304 by rwatson@rwatson_paprika on 2002/08/19 15:43:14 Integ more stuff from the main FreeBSD tree: trickled back mac_syscall() changes such as change to MSTD. Affected files ... .. //depot/projects/trustedbsd/base/lib/libc/locale/wcwidth.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/tx/if_tx.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/tx/if_txvar.h#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#15 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ppp.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#19 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#17 integrate Differences ... ==== //depot/projects/trustedbsd/base/lib/libc/locale/wcwidth.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcwidth.c,v 1.2 2002/08/19 09:02:49 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcwidth.c,v 1.5 2002/08/19 20:32:27 ache Exp $"); #include #include @@ -49,10 +49,14 @@ #define _CTYPE_SWS 30 /* Bits to shift to get width */ int -wcwidth(wc) - wchar_t wc; +wcwidth(wchar_t wc) { - int width = __maskrune(wc, _CTYPE_SWM); + int width; + + if (wc == L'\0') + return (0); + + width = __maskrune(wc, _CTYPE_SWM); /* 0 is autowidth (default) */ return (width ? (int)((unsigned)width >> _CTYPE_SWS) ==== //depot/projects/trustedbsd/base/sys/dev/tx/if_tx.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: if_tx.c,v 1.9.2.1 2000/02/21 22:29:13 niklas Exp $ */ -/* $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.57 2002/05/01 19:23:04 semenu Exp $ */ +/* $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.59 2002/08/19 20:36:08 semenu Exp $ */ /*- * Copyright (c) 1997 Semen Ustimenko (semenu@FreeBSD.org) @@ -508,20 +508,12 @@ goto fail; } - /* Bring the chip out of low-power mode and reset it. */ - CSR_WRITE_4( sc, GENCTL, GENCTL_SOFT_RESET ); - DELAY(500); - - /* Workaround for Application Note 7-15 */ - for (i=0; i<16; i++) CSR_WRITE_4(sc, TEST1, TEST1_CLOCK_TEST); - /* Do OS independent part, including chip wakeup and reset */ - if (epic_common_attach(sc)) { - device_printf(dev, "memory distribution error\n"); + error = epic_common_attach(sc); + if (error) { bus_teardown_intr(dev, sc->irq, sc->sc_ih); bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq); bus_release_resource(dev, EPIC_RES, EPIC_RID, sc->res); - error = ENXIO; goto fail; } @@ -589,7 +581,9 @@ bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq); bus_release_resource(dev, EPIC_RES, EPIC_RID, sc->res); - free(sc->pool, M_DEVBUF); + free(sc->tx_flist, M_DEVBUF); + free(sc->tx_desc, M_DEVBUF); + free(sc->rx_desc, M_DEVBUF); splx(s); @@ -763,29 +757,22 @@ epic_softc_t *sc; { int i; - caddr_t pool; - i = sizeof(struct epic_frag_list)*TX_RING_SIZE + - sizeof(struct epic_rx_desc)*RX_RING_SIZE + - sizeof(struct epic_tx_desc)*TX_RING_SIZE + PAGE_SIZE, - sc->pool = (epic_softc_t *) malloc(i, M_DEVBUF, M_NOWAIT | M_ZERO); + sc->tx_flist = malloc(sizeof(struct epic_frag_list)*TX_RING_SIZE, + M_DEVBUF, M_NOWAIT | M_ZERO); + sc->tx_desc = malloc(sizeof(struct epic_tx_desc)*TX_RING_SIZE, + M_DEVBUF, M_NOWAIT | M_ZERO); + sc->rx_desc = malloc(sizeof(struct epic_rx_desc)*RX_RING_SIZE, + M_DEVBUF, M_NOWAIT | M_ZERO); - if (sc->pool == NULL) { - printf(": can't allocate memory for buffers\n"); - return -1; + if (sc->tx_flist == NULL || sc->tx_desc == NULL || sc->rx_desc == NULL){ + device_printf(sc->dev, "Failed to malloc memory\n"); + if (sc->tx_flist) free(sc->tx_flist, M_DEVBUF); + if (sc->tx_desc) free(sc->tx_desc, M_DEVBUF); + if (sc->rx_desc) free(sc->rx_desc, M_DEVBUF); + return (ENOMEM); } - /* Align pool on PAGE_SIZE */ - pool = (caddr_t)sc->pool; - pool = (caddr_t)((uintptr_t)(pool + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)); - - /* Distribute memory */ - sc->tx_flist = (void *)pool; - pool += sizeof(struct epic_frag_list)*TX_RING_SIZE; - sc->rx_desc = (void *)pool; - pool += sizeof(struct epic_rx_desc)*RX_RING_SIZE; - sc->tx_desc = (void *)pool; - /* Bring the chip out of low-power mode. */ CSR_WRITE_4( sc, GENCTL, GENCTL_SOFT_RESET); DELAY(500); ==== //depot/projects/trustedbsd/base/sys/dev/tx/if_txvar.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: if_txvar.h,v 1.7 1999/11/17 05:21:19 jason Exp $ */ -/* $FreeBSD: src/sys/dev/tx/if_txvar.h,v 1.11 2002/04/19 22:43:44 semenu Exp $ */ +/* $FreeBSD: src/sys/dev/tx/if_txvar.h,v 1.12 2002/08/19 20:36:08 semenu Exp $ */ /*- * Copyright (c) 1997 Semen Ustimenko @@ -107,7 +107,6 @@ struct mii_softc *physc; u_int32_t phyid; int serinst; - void *pool; } epic_softc_t; struct epic_type { ==== //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.130 2002/08/06 15:16:55 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.131 2002/08/19 20:02:29 rwatson Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp */ #include "opt_compat.h" @@ -422,5 +422,5 @@ { AS(lchflags_args), (sy_call_t *)lchflags }, /* 391 = lchflags */ { AS(uuidgen_args), (sy_call_t *)uuidgen }, /* 392 = uuidgen */ { SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile }, /* 393 = sendfile */ - { SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)nosys }, /* 394 = mac_syscall */ + { SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)mac_syscall }, /* 394 = mac_syscall */ }; ==== //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_mac.c,v 1.14 2002/08/19 19:04:51 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_mac.c,v 1.15 2002/08/19 20:26:32 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -2120,7 +2120,6 @@ return (error); } - /* * When relabeling a process, call out to the policies for the maximum * permission allowed for each object type we know about in its @@ -2285,7 +2284,6 @@ { MAC_PERFORM(relabel_cred, cred, newlabel); - mac_cred_mmapped_drop_perms(curthread, cred); } void @@ -3002,8 +3000,6 @@ /* * MPSAFE - * - * XXX: Needs to be re-written for proc locking. */ int __mac_set_proc(struct thread *td, struct __mac_set_proc_args *uap) @@ -3038,12 +3034,19 @@ setsugid(p); crcopy(newcred, oldcred); - PROC_UNLOCK(p); mac_relabel_cred(newcred, &intlabel); + p->p_ucred = newcred; - PROC_LOCK(p); - p->p_ucred = newcred; + /* + * Grab additional reference for use while revoking mmaps, prior + * to releasing the proc lock and sharing the cred. + */ + crhold(newcred); PROC_UNLOCK(p); + + mac_cred_mmapped_drop_perms(td, newcred); + + crfree(newcred); /* Free revocation reference. */ crfree(oldcred); mac_destroy_temp(&intlabel); return (0); ==== //depot/projects/trustedbsd/base/sys/kern/syscalls.c#15 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.116 2002/08/06 15:16:55 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.117 2002/08/19 20:02:29 rwatson Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp */ char *syscallnames[] = { ==== //depot/projects/trustedbsd/base/sys/kern/syscalls.master#15 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -567,5 +567,5 @@ 392 STD BSD { int uuidgen(struct uuid *store, int count); } 393 MSTD BSD { int sendfile(int fd, int s, off_t offset, size_t nbytes, \ struct sf_hdtr *hdtr, off_t *sbytes, int flags); } -394 MNOIMPL BSD { int mac_syscall(const char *policy, int call, \ +394 MSTD BSD { int mac_syscall(const char *policy, int call, \ void *arg); } ==== //depot/projects/trustedbsd/base/sys/net/if_ppp.c#10 (text+ko) ==== @@ -69,7 +69,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $FreeBSD: src/sys/net/if_ppp.c,v 1.82 2002/08/15 19:02:17 rwatson Exp $ */ +/* $FreeBSD: src/sys/net/if_ppp.c,v 1.83 2002/08/19 19:22:41 brooks Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ @@ -220,7 +220,7 @@ bpfattach(&sc->sc_if, DLT_PPP, PPP_HDRLEN); LIST_INSERT_HEAD(&ppp_softc_list, sc, sc_list); - return 1; + return (0); } static void @@ -263,8 +263,7 @@ while (!LIST_EMPTY(&ppp_softc_list)) ppp_clone_destroy( &LIST_FIRST(&ppp_softc_list)->sc_if); - - return EINVAL; + break; } return 0; } ==== //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#19 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.171 2002/08/17 18:26:01 dillon Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.172 2002/08/19 19:47:11 jmallett Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -576,14 +576,18 @@ if (inp == NULL) { if (log_in_vain) { #ifdef INET6 - char dbuf[INET6_ADDRSTRLEN], sbuf[INET6_ADDRSTRLEN]; + char dbuf[INET6_ADDRSTRLEN+2], sbuf[INET6_ADDRSTRLEN+2]; #else char dbuf[4*sizeof "123"], sbuf[4*sizeof "123"]; #endif if (isipv6) { - strcpy(dbuf, ip6_sprintf(&ip6->ip6_dst)); - strcpy(sbuf, ip6_sprintf(&ip6->ip6_src)); + strcpy(dbuf, "["); + strcpy(sbuf, "["); + strcat(dbuf, ip6_sprintf(&ip6->ip6_dst)); + strcat(sbuf, ip6_sprintf(&ip6->ip6_src)); + strcat(dbuf, "]"); + strcat(sbuf, "]"); } else { strcpy(dbuf, inet_ntoa(ip->ip_dst)); strcpy(sbuf, inet_ntoa(ip->ip_src)); ==== //depot/projects/trustedbsd/base/sys/netinet6/udp6_usrreq.c#10 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.30 2002/07/25 17:40:45 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.31 2002/08/19 19:47:13 jmallett Exp $ */ /* $KAME: udp6_usrreq.c,v 1.27 2001/05/21 05:45:10 jinmei Exp $ */ /* @@ -346,7 +346,7 @@ strcpy(buf, ip6_sprintf(&ip6->ip6_dst)); log(LOG_INFO, - "Connection attempt to UDP %s:%d from %s:%d\n", + "Connection attempt to UDP [%s]:%d from [%s]:%d\n", buf, ntohs(uh->uh_dport), ip6_sprintf(&ip6->ip6_src), ntohs(uh->uh_sport)); } ==== //depot/projects/trustedbsd/base/sys/sys/syscall.h#16 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.115 2002/08/06 15:16:55 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp + * $FreeBSD: src/sys/sys/syscall.h,v 1.116 2002/08/19 20:02:29 rwatson Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp */ #define SYS_syscall 0 ==== //depot/projects/trustedbsd/base/sys/sys/syscall.mk#16 (text+ko) ==== @@ -1,7 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.70 2002/08/06 15:16:55 rwatson Exp $ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp +# $FreeBSD: src/sys/sys/syscall.mk,v 1.71 2002/08/19 20:02:29 rwatson Exp $ +# created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/trustedbsd/base/sys/sys/sysproto.h#17 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.107 2002/08/06 15:16:55 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp + * $FreeBSD: src/sys/sys/sysproto.h,v 1.108 2002/08/19 20:02:29 rwatson Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp */ #ifndef _SYS_SYSPROTO_H_ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 18:11:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A676E37B405; Mon, 19 Aug 2002 18:10:19 -0700 (PDT) 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 8E7E137B401 for ; Mon, 19 Aug 2002 18:10:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A0D6343E65 for ; Mon, 19 Aug 2002 18:10:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7K1AFJU028992 for ; Mon, 19 Aug 2002 18:10:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7K1ADSS028981 for perforce@freebsd.org; Mon, 19 Aug 2002 18:10:13 -0700 (PDT) Date: Mon, 19 Aug 2002 18:10:13 -0700 (PDT) Message-Id: <200208200110.g7K1ADSS028981@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16315 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16315 Change 16315 by rwatson@rwatson_paprika on 2002/08/19 18:09:52 Integ the MAC branch, including vnode and pipe check break-out from _op, active_cred changes, mac_syscall implementation, etc. Affected files ... .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#9 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/test/test.c#10 integrate .. //depot/projects/trustedbsd/mac/include/ctype.h#5 integrate .. //depot/projects/trustedbsd/mac/include/wchar.h#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getcwd.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/vis.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/isctype.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/iswctype.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbrlen.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbrlen.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbrtowc.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbrtowc.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbsinit.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbsinit.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbsrtowcs.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbsrtowcs.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wcrtomb.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wcrtomb.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wcsrtombs.3#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wcsrtombs.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/locale/wcwidth.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/stdio/asprintf.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/vasprintf.c#4 integrate .. //depot/projects/trustedbsd/mac/libexec/rpc.rstatd/rstat_proc.c#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#19 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#30 integrate .. //depot/projects/trustedbsd/mac/sbin/camcontrol/camcontrol.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/dmesg/dmesg.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#11 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#9 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw.8#11 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/ldconfig/ldconfig.8#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/netintro.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/tcp.4#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#12 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/tuning.7#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/ifnet.9#4 integrate .. //depot/projects/trustedbsd/mac/share/misc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/share/misc/latin1#1 branch .. //depot/projects/trustedbsd/mac/share/termcap/termcap.src#7 integrate .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#13 integrate .. //depot/projects/trustedbsd/mac/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#46 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kern.post.mk#13 integrate .. //depot/projects/trustedbsd/mac/sys/conf/majors#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-all.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_freebsd.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/isp_pci.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispmbox.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/isp/ispvar.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pst/pst-iop.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pst/pst-raid.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/ich.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/ich.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via8233.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via8233.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pci/via82c686.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tx/if_txvar.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vx/if_vx.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NEWCARD.hints#2 delete .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_ktrace.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#254 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_poll.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_time.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#24 integrate .. //depot/projects/trustedbsd/mac/sys/kern/tty_tty.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#80 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#53 integrate .. //depot/projects/trustedbsd/mac/sys/modules/osf1/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/via8233/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/net/if.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/net/if.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_tap.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_var.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/net/rtsock.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_if.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_usrreq.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet6/udp6_usrreq.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/nfsclient/bootp_subr.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_dc.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_rl.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sis.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ste.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_stereg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/pci/ohci_pci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/pci/uhci_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/security/lomac/kernel_util.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#101 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#52 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#83 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#70 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/asmacros.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/signal.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/tsb.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/tte.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.S#4 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/genassym.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/mp_machdep.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/tsb.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/sys/consio.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#155 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#120 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mount.h#19 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#27 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#27 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/basename/basename.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/chat/chat.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/chflags/chflags.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/col/col.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/colcrt/colcrt.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/cut/cut.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/find/find.1#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/find/option.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/hesinfo/hesinfo.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/id/id.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/nonints.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/msgs/msgs.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/nl/nl.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/rpcinfo/rpcinfo.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/talk/talk.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/touch/touch.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/unifdef/unifdef.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/whereis/whereis.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/kernbb/kernbb.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mrouted/config.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/vidcontrol/vidcontrol.1#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/vidcontrol/vidcontrol.c#5 integrate Differences ... ==== //depot/projects/trustedbsd/mac/bin/ls/ls.1#9 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.67 2002/05/29 15:09:49 ru Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.68 2002/08/19 07:15:20 ru Exp $ .\" -.Dd December 29, 2002 +.Dd May 19, 2002 .Dt LS 1 .Os .Sh NAME ==== //depot/projects/trustedbsd/mac/bin/sh/jobs.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.54 2002/07/25 10:47:38 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.56 2002/08/18 06:43:44 tjr Exp $"); #include #include @@ -741,9 +741,6 @@ TRACE(("Child shell %d\n", (int)getpid())); wasroot = rootshell; rootshell = 0; - for (i = njobs, p = jobtab ; --i >= 0 ; p++) - if (p->used) - freejob(p); closescript(); INTON; clear_traps(); @@ -785,6 +782,11 @@ } } #endif + INTOFF; + for (i = njobs, p = jobtab ; --i >= 0 ; p++) + if (p->used) + freejob(p); + INTON; if (wasroot && iflag) { setsignal(SIGINT); setsignal(SIGQUIT); @@ -966,13 +968,8 @@ sig = WTERMSIG(status); } if (sig != 0 && sig != SIGINT && sig != SIGPIPE) { - if (jp->foreground) { -#if JOBS - if (WIFSTOPPED(status)) - i = WSTOPSIG(status); - else -#endif - i = WTERMSIG(status); + if (thisjob->foreground && !WIFSTOPPED(status)) { + i = WTERMSIG(status); if ((i & 0x7F) < NSIG && sys_siglist[i & 0x7F]) out1str(sys_siglist[i & 0x7F]); else ==== //depot/projects/trustedbsd/mac/bin/test/test.c#10 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.51 2002/08/15 14:53:20 maxim Exp $"); +__FBSDID("$FreeBSD: src/bin/test/test.c,v 1.52 2002/08/19 09:19:31 maxim Exp $"); #include #include ==== //depot/projects/trustedbsd/mac/include/ctype.h#5 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/include/ctype.h,v 1.19 2002/08/16 13:42:59 keichii Exp $ + * $FreeBSD: src/include/ctype.h,v 1.21 2002/08/19 08:58:51 ache Exp $ */ #ifndef _CTYPE_H_ @@ -65,10 +65,8 @@ #define _CTYPE_I 0x00080000L /* Ideogram */ #define _CTYPE_T 0x00100000L /* Special */ #define _CTYPE_Q 0x00200000L /* Phonogram */ -#define _CTYPE_SWM 0xe0000000L /* Mask to get screen width data */ -#define _CTYPE_SWS 30 /* Bits to shift to get width */ #define _CTYPE_SW0 0x20000000L /* 0 width character */ -#define _CTYPE_SW1 0x00000000L /* 1 width character / default*/ +#define _CTYPE_SW1 0x40000000L /* 1 width character */ #define _CTYPE_SW2 0x80000000L /* 2 width character */ #define _CTYPE_SW3 0xc0000000L /* 3 width character */ ==== //depot/projects/trustedbsd/mac/include/wchar.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.11 2002/08/13 09:30:40 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.12 2002/08/18 06:30:10 tjr Exp $ */ /*- @@ -117,22 +117,16 @@ int fwide(FILE *, int); wint_t getwc(FILE *); wint_t getwchar(void); -#if 0 -/* XXX: not implemented */ size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict); size_t mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, mbstate_t * __restrict); int mbsinit(const mbstate_t *); size_t mbsrtowcs(wchar_t * __restrict, const char ** __restrict, size_t, mbstate_t * __restrict); -#endif wint_t putwc(wchar_t, FILE *); wint_t putwchar(wchar_t); wint_t ungetwc(wint_t, FILE *); -#if 0 -/* XXX: not implemented */ size_t wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); -#endif wchar_t *wcscat(wchar_t * __restrict, const wchar_t * __restrict); wchar_t *wcschr(const wchar_t *, wchar_t); int wcscmp(const wchar_t *, const wchar_t *); @@ -147,11 +141,8 @@ wchar_t *wcsncpy(wchar_t * __restrict , const wchar_t * __restrict, size_t); wchar_t *wcspbrk(const wchar_t *, const wchar_t *); wchar_t *wcsrchr(const wchar_t *, wchar_t); -#if 0 -/* XXX: not implemented */ size_t wcsrtombs(char * __restrict, const wchar_t ** __restrict, size_t, mbstate_t * __restrict); -#endif size_t wcsspn(const wchar_t *, const wchar_t *); wchar_t *wcsstr(const wchar_t *, const wchar_t *); #if 0 ==== //depot/projects/trustedbsd/mac/lib/libc/gen/getcwd.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getcwd.c 8.5 (Berkeley) 2/7/95"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getcwd.c,v 1.21 2002/02/01 01:08:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getcwd.c,v 1.22 2002/08/19 17:14:58 jmallett Exp $"); #include "namespace.h" #include @@ -155,7 +155,7 @@ /* * Build pointer to the parent directory, allocating memory * as necessary. Max length is 3 for "../", the largest - * possible component name, plus a trailing NULL. + * possible component name, plus a trailing NUL. */ if (bup + 3 + MAXNAMLEN + 1 >= eup) { if ((up = reallocf(up, upsize *= 2)) == NULL) ==== //depot/projects/trustedbsd/mac/lib/libc/gen/vis.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 7/19/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/vis.c,v 1.10 2002/05/28 16:59:39 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/vis.c,v 1.11 2002/08/19 17:14:58 jmallett Exp $"); #include #include @@ -159,7 +159,7 @@ * strvis, strvisx - visually encode characters from src into dst * * Dst must be 4 times the size of src to account for possible - * expansion. The length of dst, not including the trailing NULL, + * expansion. The length of dst, not including the trailing NUL, * is returned. * * Strvisx encodes exactly len bytes from src into dst. ==== //depot/projects/trustedbsd/mac/lib/libc/locale/Makefile.inc#5 (text+ko) ==== @@ -1,23 +1,29 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.28 2002/08/06 00:49:59 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.30 2002/08/18 06:30:10 tjr Exp $ # locale sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale SRCS+= ansi.c big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \ isctype.c iswctype.c \ - ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mbrune.c \ + ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mbrlen.c \ + mbrtowc.c mbrune.c mbsinit.c mbsrtowcs.c \ mskanji.c nl_langinfo.c nomacros.c none.c rune.c \ runetype.c setinvalidrune.c setlocale.c setrunelocale.c table.c \ - tolower.c toupper.c utf2.c wctob.c wctrans.c wctype.c + tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wctob.c wctrans.c \ + wctype.c wcwidth.c .if ${LIB} == "c" MAN+= btowc.3 \ ctype.3 digittoint.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \ isdigit.3 isgraph.3 islower.3 isprint.3 ispunct.3 isspace.3 \ - isupper.3 iswalnum.3 isxdigit.3 mbrune.3 multibyte.3 nl_langinfo.3 \ + isupper.3 iswalnum.3 isxdigit.3 mbrlen.3 mbrtowc.3 mbrune.3 mbsinit.3 \ + mbsrtowcs.3 multibyte.3 \ + nl_langinfo.3 \ rune.3 \ - setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wctrans.3 wctype.3 + setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wcsrtombs.3 \ + wcrtomb.3 \ + wctrans.3 wctype.3 MAN+= euc.4 utf2.4 MLINKS+=btowc.3 wctob.3 ==== //depot/projects/trustedbsd/mac/lib/libc/locale/isctype.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ static char sccsid[] = "@(#)isctype.c 8.3 (Berkeley) 2/24/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.8 2002/03/22 21:52:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.9 2002/08/17 20:03:44 ache Exp $"); #include @@ -52,7 +52,7 @@ digittoint(c) int c; { - return (__maskrune((c), 0xFF)); + return (__maskrune(c, 0xFF)); } #undef isalnum @@ -60,7 +60,7 @@ isalnum(c) int c; { - return (__istype((c), _CTYPE_A|_CTYPE_D)); + return (__istype(c, _CTYPE_A|_CTYPE_D)); } #undef isalpha @@ -68,7 +68,7 @@ isalpha(c) int c; { - return (__istype((c), _CTYPE_A)); + return (__istype(c, _CTYPE_A)); } #undef isascii @@ -76,7 +76,7 @@ isascii(c) int c; { - return (((c) & ~0x7F) == 0); + return ((c & ~0x7F) == 0); } #undef isblank @@ -84,7 +84,7 @@ isblank(c) int c; { - return (__istype((c), _CTYPE_B)); + return (__istype(c, _CTYPE_B)); } #undef iscntrl @@ -92,7 +92,7 @@ iscntrl(c) int c; { - return (__istype((c), _CTYPE_C)); + return (__istype(c, _CTYPE_C)); } #undef isdigit @@ -100,7 +100,7 @@ isdigit(c) int c; { - return (__isctype((c), _CTYPE_D)); + return (__isctype(c, _CTYPE_D)); } #undef isgraph @@ -108,7 +108,7 @@ isgraph(c) int c; { - return (__istype((c), _CTYPE_G)); + return (__istype(c, _CTYPE_G)); } #undef ishexnumber @@ -116,7 +116,7 @@ ishexnumber(c) int c; { - return (__istype((c), _CTYPE_X)); + return (__istype(c, _CTYPE_X)); } #undef isideogram @@ -124,7 +124,7 @@ isideogram(c) int c; { - return (__istype((c), _CTYPE_I)); + return (__istype(c, _CTYPE_I)); } #undef islower @@ -132,7 +132,7 @@ islower(c) int c; { - return (__istype((c), _CTYPE_L)); + return (__istype(c, _CTYPE_L)); } #undef isnumber @@ -140,7 +140,7 @@ isnumber(c) int c; { - return (__istype((c), _CTYPE_D)); + return (__istype(c, _CTYPE_D)); } #undef isphonogram @@ -148,7 +148,7 @@ isphonogram(c) int c; { - return (__istype((c), _CTYPE_Q)); + return (__istype(c, _CTYPE_Q)); } #undef isprint @@ -156,7 +156,7 @@ isprint(c) int c; { - return (__istype((c), _CTYPE_R)); + return (__istype(c, _CTYPE_R)); } #undef ispunct @@ -164,7 +164,7 @@ ispunct(c) int c; { - return (__istype((c), _CTYPE_P)); + return (__istype(c, _CTYPE_P)); } #undef isrune @@ -172,7 +172,7 @@ isrune(c) int c; { - return (__istype((c), 0xFFFFFF00L)); + return (__istype(c, 0xFFFFFF00L)); } #undef isspace @@ -180,7 +180,7 @@ isspace(c) int c; { - return (__istype((c), _CTYPE_S)); + return (__istype(c, _CTYPE_S)); } #undef isspecial @@ -188,7 +188,7 @@ isspecial(c) int c; { - return (__istype((c), _CTYPE_T)); + return (__istype(c, _CTYPE_T)); } #undef isupper @@ -196,7 +196,7 @@ isupper(c) int c; { - return (__istype((c), _CTYPE_U)); + return (__istype(c, _CTYPE_U)); } #undef isxdigit @@ -204,7 +204,7 @@ isxdigit(c) int c; { - return (__isctype((c), _CTYPE_X)); + return (__isctype(c, _CTYPE_X)); } #undef toascii @@ -212,7 +212,7 @@ toascii(c) int c; { - return ((c) & 0x7F); + return (c & 0x7F); } #undef tolower ==== //depot/projects/trustedbsd/mac/lib/libc/locale/iswctype.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.2 2002/08/16 13:45:23 keichii Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.6 2002/08/17 20:30:34 ache Exp $"); #include @@ -49,7 +49,7 @@ iswalnum(wc) wint_t wc; { - return (__istype((wc), _CTYPE_A|_CTYPE_D)); + return (__istype(wc, _CTYPE_A|_CTYPE_D)); } #undef iswalpha @@ -57,7 +57,7 @@ iswalpha(wc) wint_t wc; { - return (__istype((wc), _CTYPE_A)); + return (__istype(wc, _CTYPE_A)); } #undef iswascii @@ -65,7 +65,7 @@ iswascii(wc) wint_t wc; { - return (((wc) & ~0x7F) == 0); + return ((wc & ~0x7F) == 0); } #undef iswblank @@ -73,7 +73,7 @@ iswblank(wc) wint_t wc; { - return (__istype((wc), _CTYPE_B)); + return (__istype(wc, _CTYPE_B)); } #undef iswcntrl @@ -81,7 +81,7 @@ iswcntrl(wc) wint_t wc; { - return (__istype((wc), _CTYPE_C)); + return (__istype(wc, _CTYPE_C)); } #undef iswdigit @@ -89,7 +89,7 @@ iswdigit(wc) wint_t wc; { - return (__isctype((wc), _CTYPE_D)); + return (__isctype(wc, _CTYPE_D)); } #undef iswgraph @@ -97,7 +97,7 @@ iswgraph(wc) wint_t wc; { - return (__istype((wc), _CTYPE_G)); + return (__istype(wc, _CTYPE_G)); } #undef iswhexnumber @@ -105,7 +105,7 @@ iswhexnumber(wc) wint_t wc; { - return (__istype((wc), _CTYPE_X)); + return (__istype(wc, _CTYPE_X)); } #undef iswideogram @@ -113,7 +113,7 @@ iswideogram(wc) wint_t wc; { - return (__istype((wc), _CTYPE_I)); + return (__istype(wc, _CTYPE_I)); } #undef iswlower @@ -121,7 +121,7 @@ iswlower(wc) wint_t wc; { - return (__istype((wc), _CTYPE_L)); + return (__istype(wc, _CTYPE_L)); } #undef iswnumber @@ -129,7 +129,7 @@ iswnumber(wc) wint_t wc; { - return (__istype((wc), _CTYPE_D)); + return (__istype(wc, _CTYPE_D)); } #undef iswphonogram @@ -137,7 +137,7 @@ iswphonogram(wc) wint_t wc; { - return (__istype((wc), _CTYPE_Q)); + return (__istype(wc, _CTYPE_Q)); } #undef iswprint @@ -145,7 +145,7 @@ iswprint(wc) wint_t wc; { - return (__istype((wc), _CTYPE_R)); + return (__istype(wc, _CTYPE_R)); } #undef iswpunct @@ -153,7 +153,7 @@ iswpunct(wc) wint_t wc; { - return (__istype((wc), _CTYPE_P)); + return (__istype(wc, _CTYPE_P)); } #undef iswrune @@ -161,7 +161,7 @@ iswrune(wc) wint_t wc; { - return (__istype((wc), 0xFFFFFF00L)); + return (__istype(wc, 0xFFFFFF00L)); } #undef iswspace @@ -169,7 +169,7 @@ iswspace(wc) wint_t wc; { - return (__istype((wc), _CTYPE_S)); + return (__istype(wc, _CTYPE_S)); } #undef iswspecial @@ -177,7 +177,7 @@ iswspecial(wc) wint_t wc; { - return (__istype((wc), _CTYPE_T)); + return (__istype(wc, _CTYPE_T)); } #undef iswupper @@ -185,7 +185,7 @@ iswupper(wc) wint_t wc; { - return (__istype((wc), _CTYPE_U)); + return (__istype(wc, _CTYPE_U)); } #undef iswxdigit @@ -193,7 +193,7 @@ iswxdigit(wc) wint_t wc; { - return (__isctype((wc), _CTYPE_X)); + return (__isctype(wc, _CTYPE_X)); } #undef towlower @@ -212,12 +212,3 @@ return (__toupper(wc)); } -#undef wcwidth -int -wcwidth(wc) - wchar_t wc; -{ - int width = (unsigned)__maskrune((wc), _CTYPE_SWM) >> _CTYPE_SWS; - return width ? width : iswprint(wc); -} - ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/asprintf.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.10 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.11 2002/08/19 03:52:36 jmallett Exp $"); #include #include @@ -54,7 +54,7 @@ errno = ENOMEM; return (-1); } - f._bf._size = f._w = 127; /* Leave room for the NULL */ + f._bf._size = f._w = 127; /* Leave room for the NUL */ f._extra = &ext; INITEXTRA(&f); ret = __vfprintf(&f, fmt, ap); /* Use unlocked __vfprintf */ ==== //depot/projects/trustedbsd/mac/lib/libc/stdio/vasprintf.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.14 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.15 2002/08/19 03:52:36 jmallett Exp $"); #include #include @@ -53,7 +53,7 @@ errno = ENOMEM; return (-1); } - f._bf._size = f._w = 127; /* Leave room for the NULL */ + f._bf._size = f._w = 127; /* Leave room for the NUL */ f._extra = &ext; INITEXTRA(&f); ret = __vfprintf(&f, fmt, ap); ==== //depot/projects/trustedbsd/mac/libexec/rpc.rstatd/rstat_proc.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/rpc.rstatd/rstat_proc.c,v 1.18 2002/04/28 15:18:47 des Exp $"; + "$FreeBSD: src/libexec/rpc.rstatd/rstat_proc.c,v 1.19 2002/08/18 17:57:07 bde Exp $"; #endif /* @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#19 (text+ko) ==== @@ -31,7 +31,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.95 2002/08/12 18:38:26 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.97 2002/08/18 04:08:04 bmah Exp $ Supported Devices @@ -2447,9 +2447,9 @@ - Comtrol Rocketport card (rp driver) + Comtrol Rocketport card (&man.rp.4; driver) - Cyclades Cyclom-y serial board (&man.cy.4; driver) + Cyclades Cyclom-Y serial board (&man.cy.4; driver) STB 4 port card using shared IRQ @@ -2943,7 +2943,7 @@ - Scanners (through SANE) (&man.uscanner.4; driver) + Scanners (through SANE) (&man.uscanner.4; driver) Perfection 636U @@ -3027,8 +3027,8 @@ - PC standardparallel ports (&man.ppc.4; driver) - PC-9821 standardparallel ports (&man.ppc.4; driver) + PC standard parallel ports (&man.ppc.4; driver) + PC-9821 standard parallel ports (&man.ppc.4; driver) PC-compatible joysticks (&man.joy.4; driver) ==== //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#30 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.406 2002/08/10 17:34:42 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.409 2002/08/19 17:13:08 bmah Exp $ 2000 @@ -1988,6 +1988,13 @@ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:37.kqueue.asc">FreeBSD-SA-02:37. &merged; + Several bounds-checking bugs in system calls, which could + result in some system calls returning a large portion of kernel + memory, have been fixed. More information can be found in + security advisory FreeBSD-SA-02:38. + &merged; + @@ -2031,7 +2038,7 @@ &man.biff.1; now accepts a argument to enable bell notification of new mail (which does not disturb the terminal contents as biff y - would). + would). &merged; &man.biff.1; now uses the first terminal associated with the standard input, standard output or standard error file @@ -2104,6 +2111,10 @@ &man.chmod.1; now supports a for changing the mode of a symbolic link. + &man.chmod.1; now also, when the mode is modified, prints + the old and new modes if the option is + specified more than once. + &man.chown.8; now correctly follows symbolic links named as command line arguments if run without . &merged; @@ -2138,7 +2149,7 @@ &man.cp.1; now takes a (nonstandard) option to automatically answer no when it would - ask to overwrite a file. + ask to overwrite a file. &merged; A new &man.csplit.1; utility, which splits files based on context, has been added. @@ -2721,9 +2732,9 @@ This makes it easier to use &man.mtree.8; as a part of an intrusion-detection system. &merged; - &man.mv.1; now takes a (nonstandard) to + &man.mv.1; now takes a (nonstandard) option to automatically answer no when it would ask to - overwrite a file. + overwrite a file. &merged; &man.natd.8; now supports a option to log packets that @@ -2804,6 +2815,13 @@ files, NIS, or Hesiod. The old hosts.conf file is no longer used. + &man.od.1; now supports the option to + specify the input address base, the option to + specify the number of bytes to dump, the + option to specify the number of bytes to skip, the + option to output signed decimal shorts, and + the option to specify output type. &merged; + PAM support has been added for account management and sessions. @@ -3605,7 +3623,7 @@ The &man.csh.1; shell has been replaced by &man.tcsh.1;, although it can still be run as csh. tcsh has been updated to version - 6.12. + 6.12. &merged; The contributed version of tcp_wrappers now includes the @@ -3619,7 +3637,7 @@ 4.2. &merged; top has been updated to version - 3.5b12. + 3.5b12. &merged; traceroute has been updated to LBL version 1.4a12. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 19 18:12:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0FC5637B406; Mon, 19 Aug 2002 18:12:20 -0700 (PDT) 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 B92DB37B400 for ; Mon, 19 Aug 2002 18:12:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CCCC143E72 for ; Mon, 19 Aug 2002 18:12:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7K1CIJU031439 for ; Mon, 19 Aug 2002 18:12:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7K1CI5U031423 for perforce@freebsd.org; Mon, 19 Aug 2002 18:12:18 -0700 (PDT) Date: Mon, 19 Aug 2002 18:12:18 -0700 (PDT) Message-Id: <200208200112.g7K1CI5U031423@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16316 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16316 Change 16316 by rwatson@rwatson_paprika on 2002/08/19 18:11:54 Regen. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#28 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#28 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#28 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#28 edit .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#29 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#28 (text+ko) ==== @@ -2,16 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL init_sysent.c#14 - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.130 2002/08/06 15:16:55 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp -==== THEIRS init_sysent.c#15 - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.131 2002/08/19 20:02:29 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp -==== YOURS init_sysent.c - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp -<<<< */ #include "opt_compat.h" @@ -430,12 +422,6 @@ { AS(lchflags_args), (sy_call_t *)lchflags }, /* 391 = lchflags */ { AS(uuidgen_args), (sy_call_t *)uuidgen }, /* 392 = uuidgen */ { SYF_MPSAFE | AS(sendfile_args), (sy_call_t *)sendfile }, /* 393 = sendfile */ ->>>> ORIGINAL init_sysent.c#14 - { SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)nosys }, /* 394 = mac_syscall */ -==== THEIRS init_sysent.c#15 - { SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)mac_syscall }, /* 394 = mac_syscall */ -==== YOURS init_sysent.c { SYF_MPSAFE | AS(mac_syscall_args), (sy_call_t *)mac_syscall }, /* 394 = mac_syscall */ { SYF_MPSAFE | AS(mac_get_pid_args), (sy_call_t *)mac_get_pid }, /* 395 = mac_get_pid */ -<<<< }; ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#28 (text+ko) ==== @@ -2,16 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL syscalls.c#14 - * $FreeBSD: src/sys/kern/syscalls.c,v 1.116 2002/08/06 15:16:55 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp -==== THEIRS syscalls.c#15 - * $FreeBSD: src/sys/kern/syscalls.c,v 1.117 2002/08/19 20:02:29 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp -==== YOURS syscalls.c - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp -<<<< */ char *syscallnames[] = { ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.h#28 (text+ko) ==== @@ -2,16 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL syscall.h#15 - * $FreeBSD: src/sys/sys/syscall.h,v 1.115 2002/08/06 15:16:55 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp -==== THEIRS syscall.h#16 - * $FreeBSD: src/sys/sys/syscall.h,v 1.116 2002/08/19 20:02:29 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp -==== YOURS syscall.h - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp -<<<< */ #define SYS_syscall 0 ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#28 (text+ko) ==== @@ -1,15 +1,7 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL syscall.mk#15 -# $FreeBSD: src/sys/sys/syscall.mk,v 1.70 2002/08/06 15:16:55 rwatson Exp $ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp -==== THEIRS syscall.mk#16 -# $FreeBSD: src/sys/sys/syscall.mk,v 1.71 2002/08/19 20:02:29 rwatson Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp -==== YOURS syscall.mk -# $FreeBSD$ -# created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp -<<<< MIASM = \ syscall.o \ exit.o \ ==== //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#29 (text+ko) ==== @@ -2,16 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. ->>>> ORIGINAL sysproto.h#16 - * $FreeBSD: src/sys/sys/sysproto.h,v 1.107 2002/08/06 15:16:55 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp -==== THEIRS sysproto.h#17 - * $FreeBSD: src/sys/sys/sysproto.h,v 1.108 2002/08/19 20:02:29 rwatson Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.121 2002/08/19 20:01:31 rwatson Exp -==== YOURS sysproto.h - * $FreeBSD$ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.120 2002/08/06 15:15:53 rwatson Exp -<<<< */ #ifndef _SYS_SYSPROTO_H_ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 20 9:10:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F2D437B401; Tue, 20 Aug 2002 09:10:01 -0700 (PDT) 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 6805037B400 for ; Tue, 20 Aug 2002 09:10:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 03C7443E70 for ; Tue, 20 Aug 2002 09:10:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7KG9xJU059445 for ; Tue, 20 Aug 2002 09:09:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7KG9xEX059442 for perforce@freebsd.org; Tue, 20 Aug 2002 09:09:59 -0700 (PDT) Date: Tue, 20 Aug 2002 09:09:59 -0700 (PDT) Message-Id: <200208201609.g7KG9xEX059442@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16337 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16337 Change 16337 by rwatson@rwatson_tislabs on 2002/08/20 09:09:27 Rename mac_te_init_label_as() to mac_te_create_label_as() and mac_te_init_label() to mac_te_create_label() to reflect when the calls are use. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#74 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#74 (text+ko) ==== @@ -549,7 +549,7 @@ } static void -mac_te_init_label_as(struct mac_te *mac_te, char *type) +mac_te_create_label_as(struct mac_te *mac_te, char *type) { bzero(&mac_te->mt_type, MAC_TE_TYPE_MAXLEN+1); @@ -557,10 +557,10 @@ } static void -mac_te_init_label(struct mac_te *telabel) +mac_te_create_label(struct mac_te *telabel) { - mac_te_init_label_as(telabel, MAC_TE_TYPE_UNINITIALIZED); + mac_te_create_label_as(telabel, MAC_TE_TYPE_UNINITIALIZED); } static void @@ -588,14 +588,14 @@ mac_te_create_proc0(struct ucred *cred) { - mac_te_init_label_as(SLOT(&cred->cr_label), MAC_TE_TYPE_KPROC); + mac_te_create_label_as(SLOT(&cred->cr_label), MAC_TE_TYPE_KPROC); } static void mac_te_create_proc1(struct ucred *cred) { - mac_te_init_label_as(SLOT(&cred->cr_label), MAC_TE_TYPE_INIT); + mac_te_create_label_as(SLOT(&cred->cr_label), MAC_TE_TYPE_INIT); } static void @@ -859,9 +859,9 @@ { if (ifnet->if_type == IFT_LOOP) { - mac_te_init_label_as(SLOT(ifnetlabel), MAC_TE_TYPE_EQUAL); + mac_te_create_label_as(SLOT(ifnetlabel), MAC_TE_TYPE_EQUAL); } else { - mac_te_init_label(SLOT(ifnetlabel)); + mac_te_create_label(SLOT(ifnetlabel)); } } @@ -901,7 +901,6 @@ struct mbuf *fragment, struct label *fragmentlabel) { - mac_te_init_label(SLOT(fragmentlabel)); mac_te_copy_label(datagramlabel, fragmentlabel); } @@ -927,7 +926,7 @@ struct mbuf *mbuf, struct label *mblabel) { - mac_te_init_label_as(SLOT(mblabel), MAC_TE_TYPE_EQUAL); + mac_te_create_label_as(SLOT(mblabel), MAC_TE_TYPE_EQUAL); } static void @@ -1046,8 +1045,8 @@ { /* mac_te_create_object(cred, label); */ - mac_te_init_label_as(SLOT(mntlabel), MAC_TE_TYPE_FS); - mac_te_init_label_as(SLOT(fslabel), MAC_TE_TYPE_FS); + mac_te_create_label_as(SLOT(mntlabel), MAC_TE_TYPE_FS); + mac_te_create_label_as(SLOT(fslabel), MAC_TE_TYPE_FS); } static void @@ -1055,8 +1054,8 @@ struct label *mntlabel, struct label *fslabel) { - mac_te_init_label_as(SLOT(mntlabel), MAC_TE_TYPE_ROOTFS); - mac_te_init_label_as(SLOT(fslabel), MAC_TE_TYPE_FS); + mac_te_create_label_as(SLOT(mntlabel), MAC_TE_TYPE_ROOTFS); + mac_te_create_label_as(SLOT(fslabel), MAC_TE_TYPE_FS); } static void @@ -1105,7 +1104,7 @@ else te_type = MAC_TE_TYPE_DEVICE; - mac_te_init_label_as(SLOT(devicelabel), te_type); + mac_te_create_label_as(SLOT(devicelabel), te_type); } static void @@ -1113,7 +1112,7 @@ struct devfs_dirent *de, struct label *dirlabel) { - mac_te_init_label_as(SLOT(dirlabel), MAC_TE_TYPE_FS); + mac_te_create_label_as(SLOT(dirlabel), MAC_TE_TYPE_FS); } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 20 10:28:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53F3137B401; Tue, 20 Aug 2002 10:28:16 -0700 (PDT) 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 D55B937B400 for ; Tue, 20 Aug 2002 10:28:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5058343E72 for ; Tue, 20 Aug 2002 10:28:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7KHSFJU078895 for ; Tue, 20 Aug 2002 10:28:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7KHSEFD078892 for perforce@freebsd.org; Tue, 20 Aug 2002 10:28:15 -0700 (PDT) Date: Tue, 20 Aug 2002 10:28:15 -0700 (PDT) Message-Id: <200208201728.g7KHSEFD078892@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16342 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16342 Change 16342 by rwatson@rwatson_tislabs on 2002/08/20 10:27:18 Move a chunk of vnode-related label management code to a more logical location away from label initialization/destruction/... Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#255 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#255 (text+ko) ==== @@ -196,7 +196,6 @@ #endif static int error_select(int error1, int error2); -static int mac_externalize(struct label *label, struct mac *mac); static int mac_policy_register(struct mac_policy_conf *mpc); static int mac_policy_unregister(struct mac_policy_conf *mpc); @@ -962,287 +961,6 @@ return (error2); } -void -mac_update_devfsdirent(struct devfs_dirent *de, struct vnode *vp) -{ - - MAC_PERFORM(update_devfsdirent, de, &de->de_label, vp, &vp->v_label); -} - -void -mac_update_procfsvnode(struct vnode *vp, struct ucred *cred) -{ - - MAC_PERFORM(update_procfsvnode, vp, &vp->v_label, cred); -} - -/* - * Support callout for policies that manage their own externalization - * using extended attributes. - */ -static int -mac_update_vnode_from_extattr(struct vnode *vp, struct mount *mp) -{ - int error; - - MAC_CHECK(update_vnode_from_extattr, vp, &vp->v_label, mp, - &mp->mnt_fslabel); - - return (error); -} - -/* - * Given an externalized mac label, internalize it and stamp it on a - * vnode. - */ -static int -mac_update_vnode_from_externalized(struct vnode *vp, struct mac *extmac) -{ - int error; - - MAC_CHECK(update_vnode_from_externalized, vp, &vp->v_label, extmac); - - return (error); -} - -/* - * Call out to individual policies to update the label in a vnode from - * the mountpoint. - */ -void -mac_update_vnode_from_mount(struct vnode *vp, struct mount *mp) -{ - - MAC_PERFORM(update_vnode_from_mount, vp, &vp->v_label, mp, - &mp->mnt_fslabel); - - ASSERT_VOP_LOCKED(vp, "mac_update_vnode_from_mount"); - if (mac_cache_fslabel_in_vnode) - vp->v_vflag |= VV_CACHEDLABEL; -} - -/* - * Implementation of VOP_REFRESHLABEL() that relies on extended attributes - * to store label data. Can be referenced by filesystems supporting - * extended attributes. - */ -int -vop_stdrefreshlabel_ea(struct vop_refreshlabel_args *ap) -{ - struct vnode *vp = ap->a_vp; - struct mac extmac; - int buflen, error; - - ASSERT_VOP_LOCKED(vp, "vop_stdrefreshlabel_ea"); - - /* - * Call out to external policies first. Order doesn't really - * matter, as long as failure of one assures failure of all. - */ - error = mac_update_vnode_from_extattr(vp, vp->v_mount); - if (error) - return (error); - - buflen = sizeof(extmac); - error = vn_extattr_get(vp, IO_NODELOCKED, - FREEBSD_MAC_EXTATTR_NAMESPACE, FREEBSD_MAC_EXTATTR_NAME, &buflen, - (char *)&extmac, curthread); - switch (error) { - case 0: - /* Got it */ - break; - - case ENOATTR: - /* - * Use the label from the mount point. - */ - mac_update_vnode_from_mount(vp, vp->v_mount); - return (0); - - case EOPNOTSUPP: - default: - /* Fail horribly. */ - return (error); - } - - if (buflen != sizeof(extmac)) - error = EPERM; /* Fail very closed. */ - if (error == 0) - error = mac_update_vnode_from_externalized(vp, &extmac); - if (error == 0) - vp->v_vflag |= VV_CACHEDLABEL; - else { - struct vattr va; - - printf("Corrupted label on %s", - vp->v_mount->mnt_stat.f_mntonname); - if (VOP_GETATTR(vp, &va, curthread->td_ucred, curthread) == 0) - printf(" inum %ld", va.va_fileid); - if (mac_debug_label_fallback) { - printf(", falling back.\n"); - mac_update_vnode_from_mount(vp, vp->v_mount); - error = 0; - } else { - printf(".\n"); - error = EPERM; - } - } - - return (error); -} - -/* - * Make sure the vnode label is up-to-date. If EOPNOTSUPP, then we handle - * the labeling activity outselves. Filesystems should be careful not - * to change their minds regarding whether they support vop_refreshlabel() - * for a vnode or not. Don't cache the vnode here, allow the file - * system code to determine if it's safe to cache. If we update from - * the mount, don't cache since a change to the mount label should affect - * all vnodes. - */ -static int -vn_refreshlabel(struct vnode *vp, struct ucred *cred) -{ - int error; - - ASSERT_VOP_LOCKED(vp, "vn_refreshlabel"); - - if (vp->v_mount == NULL) { -/* - Eventually, we probably want to special-case refreshing - of deadfs vnodes, and if there's a lock-free race somewhere, - that case might be handled here. - - mac_update_vnode_deadfs(vp); - return (0); - */ - /* printf("vn_refreshlabel: null v_mount\n"); */ - if (vp->v_tag != VT_NON) - printf( - "vn_refreshlabel: null v_mount with non-VT_NON\n"); - return (EBADF); - } - - if (vp->v_vflag & VV_CACHEDLABEL) { - mac_vnode_label_cache_hits++; - return (0); - } else - mac_vnode_label_cache_misses++; - - if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { - mac_update_vnode_from_mount(vp, vp->v_mount); - return (0); - } - - error = VOP_REFRESHLABEL(vp, cred, curthread); - switch (error) { - case EOPNOTSUPP: - /* - * If labels are not supported on this vnode, fall back to - * the label in the mount and propagate it to the vnode. - * There should probably be some sort of policy/flag/decision - * about doing this. - */ - mac_update_vnode_from_mount(vp, vp->v_mount); - error = 0; - default: - return (error); - } -} - -/* - * Helper function for file systems using the vop_std*_ea() calls. This - * function must be called after EA service is available for the vnode, - * but before it's hooked up to the namespace so that the node persists - * if there's a crash, or before it can be accessed. On successful - * commit of the label to disk (etc), do cache the label. - */ -int -vop_stdcreatevnode_ea(struct vnode *dvp, struct vnode *tvp, struct ucred *cred) -{ - struct mac extmac; - int error; - - ASSERT_VOP_LOCKED(tvp, "vop_stdcreatevnode_ea"); - if ((dvp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { - mac_update_vnode_from_mount(tvp, tvp->v_mount); - } else { - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); - - /* - * Stick the label in the vnode. Then try to write to - * disk. If we fail, return a failure to abort the - * create operation. Really, this failure shouldn't - * happen except in fairly unusual circumstances (out - * of disk, etc). - */ - mac_create_vnode(cred, dvp, tvp); - - error = mac_stdcreatevnode_ea(tvp); - if (error) - return (error); - - /* - * XXX: Eventually this will go away and all policies will - * directly manage their extended attributes. - */ - error = mac_externalize(&tvp->v_label, &extmac); - if (error) - return (error); - - error = vn_extattr_set(tvp, IO_NODELOCKED, - FREEBSD_MAC_EXTATTR_NAMESPACE, FREEBSD_MAC_EXTATTR_NAME, - sizeof(extmac), (char *)&extmac, curthread); - if (error == 0) - tvp->v_vflag |= VV_CACHEDLABEL; - else { -#if 0 - /* - * In theory, we could have fall-back behavior here. - * It would probably be incorrect. - */ -#endif - return (error); - } - } - - return (0); -} - -void -mac_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp) -{ - int error; - - ASSERT_VOP_LOCKED(vp, "mac_execve_transition"); - - error = vn_refreshlabel(vp, old); - if (error) { - printf("mac_execve_transition: vn_refreshlabel returned %d\n", - error); - printf("mac_execve_transition: using old vnode label\n"); - } - - MAC_PERFORM(execve_transition, old, new, vp, &vp->v_label); -} - -int -mac_execve_will_transition(struct ucred *old, struct vnode *vp) -{ - int error, result; - - error = vn_refreshlabel(vp, old); - if (error) - return (error); - - result = 0; - MAC_BOOLEAN(execve_will_transition, ||, old, vp, &vp->v_label); - - return (result); -} - static void mac_init_label(struct label *label) { @@ -1584,6 +1302,287 @@ MAC_PERFORM(create_cred, parent_cred, child_cred); } +void +mac_update_devfsdirent(struct devfs_dirent *de, struct vnode *vp) +{ + + MAC_PERFORM(update_devfsdirent, de, &de->de_label, vp, &vp->v_label); +} + +void +mac_update_procfsvnode(struct vnode *vp, struct ucred *cred) +{ + + MAC_PERFORM(update_procfsvnode, vp, &vp->v_label, cred); +} + +/* + * Support callout for policies that manage their own externalization + * using extended attributes. + */ +static int +mac_update_vnode_from_extattr(struct vnode *vp, struct mount *mp) +{ + int error; + + MAC_CHECK(update_vnode_from_extattr, vp, &vp->v_label, mp, + &mp->mnt_fslabel); + + return (error); +} + +/* + * Given an externalized mac label, internalize it and stamp it on a + * vnode. + */ +static int +mac_update_vnode_from_externalized(struct vnode *vp, struct mac *extmac) +{ + int error; + + MAC_CHECK(update_vnode_from_externalized, vp, &vp->v_label, extmac); + + return (error); +} + +/* + * Call out to individual policies to update the label in a vnode from + * the mountpoint. + */ +void +mac_update_vnode_from_mount(struct vnode *vp, struct mount *mp) +{ + + MAC_PERFORM(update_vnode_from_mount, vp, &vp->v_label, mp, + &mp->mnt_fslabel); + + ASSERT_VOP_LOCKED(vp, "mac_update_vnode_from_mount"); + if (mac_cache_fslabel_in_vnode) + vp->v_vflag |= VV_CACHEDLABEL; +} + +/* + * Implementation of VOP_REFRESHLABEL() that relies on extended attributes + * to store label data. Can be referenced by filesystems supporting + * extended attributes. + */ +int +vop_stdrefreshlabel_ea(struct vop_refreshlabel_args *ap) +{ + struct vnode *vp = ap->a_vp; + struct mac extmac; + int buflen, error; + + ASSERT_VOP_LOCKED(vp, "vop_stdrefreshlabel_ea"); + + /* + * Call out to external policies first. Order doesn't really + * matter, as long as failure of one assures failure of all. + */ + error = mac_update_vnode_from_extattr(vp, vp->v_mount); + if (error) + return (error); + + buflen = sizeof(extmac); + error = vn_extattr_get(vp, IO_NODELOCKED, + FREEBSD_MAC_EXTATTR_NAMESPACE, FREEBSD_MAC_EXTATTR_NAME, &buflen, + (char *)&extmac, curthread); + switch (error) { + case 0: + /* Got it */ + break; + + case ENOATTR: + /* + * Use the label from the mount point. + */ + mac_update_vnode_from_mount(vp, vp->v_mount); + return (0); + + case EOPNOTSUPP: + default: + /* Fail horribly. */ + return (error); + } + + if (buflen != sizeof(extmac)) + error = EPERM; /* Fail very closed. */ + if (error == 0) + error = mac_update_vnode_from_externalized(vp, &extmac); + if (error == 0) + vp->v_vflag |= VV_CACHEDLABEL; + else { + struct vattr va; + + printf("Corrupted label on %s", + vp->v_mount->mnt_stat.f_mntonname); + if (VOP_GETATTR(vp, &va, curthread->td_ucred, curthread) == 0) + printf(" inum %ld", va.va_fileid); + if (mac_debug_label_fallback) { + printf(", falling back.\n"); + mac_update_vnode_from_mount(vp, vp->v_mount); + error = 0; + } else { + printf(".\n"); + error = EPERM; + } + } + + return (error); +} + +/* + * Make sure the vnode label is up-to-date. If EOPNOTSUPP, then we handle + * the labeling activity outselves. Filesystems should be careful not + * to change their minds regarding whether they support vop_refreshlabel() + * for a vnode or not. Don't cache the vnode here, allow the file + * system code to determine if it's safe to cache. If we update from + * the mount, don't cache since a change to the mount label should affect + * all vnodes. + */ +static int +vn_refreshlabel(struct vnode *vp, struct ucred *cred) +{ + int error; + + ASSERT_VOP_LOCKED(vp, "vn_refreshlabel"); + + if (vp->v_mount == NULL) { +/* + Eventually, we probably want to special-case refreshing + of deadfs vnodes, and if there's a lock-free race somewhere, + that case might be handled here. + + mac_update_vnode_deadfs(vp); + return (0); + */ + /* printf("vn_refreshlabel: null v_mount\n"); */ + if (vp->v_tag != VT_NON) + printf( + "vn_refreshlabel: null v_mount with non-VT_NON\n"); + return (EBADF); + } + + if (vp->v_vflag & VV_CACHEDLABEL) { + mac_vnode_label_cache_hits++; + return (0); + } else + mac_vnode_label_cache_misses++; + + if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { + mac_update_vnode_from_mount(vp, vp->v_mount); + return (0); + } + + error = VOP_REFRESHLABEL(vp, cred, curthread); + switch (error) { + case EOPNOTSUPP: + /* + * If labels are not supported on this vnode, fall back to + * the label in the mount and propagate it to the vnode. + * There should probably be some sort of policy/flag/decision + * about doing this. + */ + mac_update_vnode_from_mount(vp, vp->v_mount); + error = 0; + default: + return (error); + } +} + +/* + * Helper function for file systems using the vop_std*_ea() calls. This + * function must be called after EA service is available for the vnode, + * but before it's hooked up to the namespace so that the node persists + * if there's a crash, or before it can be accessed. On successful + * commit of the label to disk (etc), do cache the label. + */ +int +vop_stdcreatevnode_ea(struct vnode *dvp, struct vnode *tvp, struct ucred *cred) +{ + struct mac extmac; + int error; + + ASSERT_VOP_LOCKED(tvp, "vop_stdcreatevnode_ea"); + if ((dvp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { + mac_update_vnode_from_mount(tvp, tvp->v_mount); + } else { + error = vn_refreshlabel(dvp, cred); + if (error) + return (error); + + /* + * Stick the label in the vnode. Then try to write to + * disk. If we fail, return a failure to abort the + * create operation. Really, this failure shouldn't + * happen except in fairly unusual circumstances (out + * of disk, etc). + */ + mac_create_vnode(cred, dvp, tvp); + + error = mac_stdcreatevnode_ea(tvp); + if (error) + return (error); + + /* + * XXX: Eventually this will go away and all policies will + * directly manage their extended attributes. + */ + error = mac_externalize(&tvp->v_label, &extmac); + if (error) + return (error); + + error = vn_extattr_set(tvp, IO_NODELOCKED, + FREEBSD_MAC_EXTATTR_NAMESPACE, FREEBSD_MAC_EXTATTR_NAME, + sizeof(extmac), (char *)&extmac, curthread); + if (error == 0) + tvp->v_vflag |= VV_CACHEDLABEL; + else { +#if 0 + /* + * In theory, we could have fall-back behavior here. + * It would probably be incorrect. + */ +#endif + return (error); + } + } + + return (0); +} + +void +mac_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp) +{ + int error; + + ASSERT_VOP_LOCKED(vp, "mac_execve_transition"); + + error = vn_refreshlabel(vp, old); + if (error) { + printf("mac_execve_transition: vn_refreshlabel returned %d\n", + error); + printf("mac_execve_transition: using old vnode label\n"); + } + + MAC_PERFORM(execve_transition, old, new, vp, &vp->v_label); +} + +int +mac_execve_will_transition(struct ucred *old, struct vnode *vp) +{ + int error, result; + + error = vn_refreshlabel(vp, old); + if (error) + return (error); + + result = 0; + MAC_BOOLEAN(execve_will_transition, ||, old, vp, &vp->v_label); + + return (result); +} + int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int flags) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 20 13:31:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E38CF37B401; Tue, 20 Aug 2002 13:31:11 -0700 (PDT) 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 6CB0237B400 for ; Tue, 20 Aug 2002 13:31:11 -0700 (PDT) Received: from mail.speakeasy.net (mail13.speakeasy.net [216.254.0.213]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC73743E3B for ; Tue, 20 Aug 2002 13:31:10 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 27666 invoked from network); 20 Aug 2002 20:31:09 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail13.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 20 Aug 2002 20:31:09 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g7KKV7BQ015219; Tue, 20 Aug 2002 16:31:07 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200208062001.g76K1E6X009982@freefall.freebsd.org> Date: Tue, 20 Aug 2002 16:31:13 -0400 (EDT) From: John Baldwin To: Robert Watson Subject: RE: PERFORCE change 15626 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 06-Aug-2002 Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15626 > > Change 15626 by rwatson@rwatson_tislabs on 2002/08/06 13:00:34 > > Introduce module dependencies to prevent MAC modules from getting > loaded with a kernel that doesn't support MAC. > > Largely the evil of: peter That's not evil, that's really cool actually. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 20 13:49:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D58837B401; Tue, 20 Aug 2002 13:49:45 -0700 (PDT) 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 C414F37B400; Tue, 20 Aug 2002 13:49:44 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 824C743E6A; Tue, 20 Aug 2002 13:49:43 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g7KKnOOo019549; Tue, 20 Aug 2002 16:49:24 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Tue, 20 Aug 2002 16:49:24 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: John Baldwin Cc: Perforce Change Reviews Subject: RE: PERFORCE change 15626 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, 20 Aug 2002, John Baldwin wrote: > > On 06-Aug-2002 Robert Watson wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15626 > > > > Change 15626 by rwatson@rwatson_tislabs on 2002/08/06 13:00:34 > > > > Introduce module dependencies to prevent MAC modules from getting > > loaded with a kernel that doesn't support MAC. > > > > Largely the evil of: peter > > That's not evil, that's really cool actually. The evil in particular is that there's currently a bug in our kernel linker where failing to link or initialize a module pre-loaded by the loader results in a kernel panic involving the linker touching memory after freeing it. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 20 15:41:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 834C737B401; Tue, 20 Aug 2002 15:41:37 -0700 (PDT) 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 DF21137B400 for ; Tue, 20 Aug 2002 15:41:36 -0700 (PDT) Received: from mail.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D79A43E6E for ; Tue, 20 Aug 2002 15:41:36 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 21187 invoked from network); 20 Aug 2002 21:00:07 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail14.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 20 Aug 2002 21:00:07 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g7KL04BQ015325; Tue, 20 Aug 2002 17:00:05 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Tue, 20 Aug 2002 17:00:10 -0400 (EDT) From: John Baldwin To: Robert Watson Subject: RE: PERFORCE change 15626 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 20-Aug-2002 Robert Watson wrote: > > On Tue, 20 Aug 2002, John Baldwin wrote: > >> >> On 06-Aug-2002 Robert Watson wrote: >> > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15626 >> > >> > Change 15626 by rwatson@rwatson_tislabs on 2002/08/06 13:00:34 >> > >> > Introduce module dependencies to prevent MAC modules from getting >> > loaded with a kernel that doesn't support MAC. >> > >> > Largely the evil of: peter >> >> That's not evil, that's really cool actually. > > The evil in particular is that there's currently a bug in our kernel > linker where failing to link or initialize a module pre-loaded by the > loader results in a kernel panic involving the linker touching memory > after freeing it. Well, yes, that is evil. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 21 20:56:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C81D37B401; Wed, 21 Aug 2002 20:56:36 -0700 (PDT) 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 2CD4137B400 for ; Wed, 21 Aug 2002 20:56:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D714543E70 for ; Wed, 21 Aug 2002 20:56:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7M3uZJU071554 for ; Wed, 21 Aug 2002 20:56:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7M3uZs2071551 for perforce@freebsd.org; Wed, 21 Aug 2002 20:56:35 -0700 (PDT) Date: Wed, 21 Aug 2002 20:56:35 -0700 (PDT) Message-Id: <200208220356.g7M3uZs2071551@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16406 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16406 Change 16406 by rwatson@rwatson_paprika on 2002/08/21 20:55:48 No need to implement MAC_EXECVE_TRANSITION since we already implement MAC_CREATE_CRED. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#11 (text+ko) ==== @@ -141,14 +141,6 @@ } static void -mac_partition_execve_transition(struct ucred *old, struct ucred *new, - struct vnode *vp, struct label *vnodelabel) -{ - - mac_partition_create_cred(old, new); -} - -static void mac_partition_create_proc0(struct ucred *cred) { @@ -268,8 +260,6 @@ (macop_t)mac_partition_internalize }, { MAC_CREATE_CRED, (macop_t)mac_partition_create_cred }, - { MAC_EXECVE_TRANSITION, - (macop_t)mac_partition_execve_transition }, { MAC_CREATE_PROC0, (macop_t)mac_partition_create_proc0 }, { MAC_CREATE_PROC1, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 22 6:26:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 714D037B406; Thu, 22 Aug 2002 06:26:35 -0700 (PDT) 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 4D2BE37B401 for ; Thu, 22 Aug 2002 06:26:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBDF143E75 for ; Thu, 22 Aug 2002 06:26:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7MDQXJU027663 for ; Thu, 22 Aug 2002 06:26:33 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7MDQXuU027660 for perforce@freebsd.org; Thu, 22 Aug 2002 06:26:33 -0700 (PDT) Date: Thu, 22 Aug 2002 06:26:33 -0700 (PDT) Message-Id: <200208221326.g7MDQXuU027660@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16421 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16421 Change 16421 by rwatson@rwatson_paprika on 2002/08/22 06:26:30 Move mac_pid_data to the common area for structures shared by the kernel and userland, somehow it got moved to kernel-only bit breaking the ps build. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#156 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#156 (text+ko) ==== @@ -144,6 +144,12 @@ }; typedef struct mac *mac_t; +struct mac_pid_data { + char mpd_name[128]; /* arbitrarily-sized */ + char *mpd_data; /* label data to export */ + size_t *mpd_datalen; /* passed both in and out */ +}; + #define MAC_FLAG_INITIALIZED 0x00000001 /* Is initialized. */ #ifndef _KERNEL @@ -151,7 +157,6 @@ /* * POSIX.1e functions visible in the application namespace. */ -struct mac_pid_data; int mac_dominate(const mac_t _labela, const mac_t _labelb); int mac_equal(const mac_t labela, const mac_t _labelb); int mac_free(void *_buf_p); @@ -187,12 +192,6 @@ #else /* _KERNEL */ -struct mac_pid_data { - char mpd_name[128]; /* arbitrarily-sized */ - char *mpd_data; /* label data to export */ - size_t *mpd_datalen; /* passed both in and out */ -}; - /* * Kernel functions to manage and evaluate labels. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 22 10:18:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 432E837B401; Thu, 22 Aug 2002 10:18:19 -0700 (PDT) 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 D539137B400 for ; Thu, 22 Aug 2002 10:18:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9578143E72 for ; Thu, 22 Aug 2002 10:18:18 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7MHIIJU087254 for ; Thu, 22 Aug 2002 10:18:18 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7MHIIip087251 for perforce@freebsd.org; Thu, 22 Aug 2002 10:18:18 -0700 (PDT) Date: Thu, 22 Aug 2002 10:18:18 -0700 (PDT) Message-Id: <200208221718.g7MHIIip087251@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 16428 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16428 Change 16428 by cvance@cvance_laptop on 2002/08/22 10:18:07 Move some definitions into _KERNEL blocks and move one out. Resolves issues compiling userspace sebsd apps (sebsd_checkpolicy) Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#7 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/avc/avc.h#7 (text+ko) ==== @@ -342,8 +342,10 @@ #define AVC_CALLBACK_AUDITDENY_ENABLE 64 #define AVC_CALLBACK_AUDITDENY_DISABLE 128 +#ifdef _KERNEL extern int sys_avc_toggle(struct thread *td); extern int sys_avc_enforcing(struct thread *td); +#endif #endif /* _LINUX_AVC_H_ */ ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#7 (text+ko) ==== @@ -43,10 +43,11 @@ #define SEBSD_MAC_EXTATTR_NAME "sebsd" #define SEBSD_MAC_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM +extern int avc_debug_always_allow; + #ifdef _KERNEL MALLOC_DECLARE(M_SEBSD); -extern int avc_debug_always_allow; extern int sebsd_verbose; extern int security_init(void); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 22 13:24:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C0E737B400; Thu, 22 Aug 2002 13:24:17 -0700 (PDT) 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 A0EDF37B401 for ; Thu, 22 Aug 2002 13:24:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B0E043EB2 for ; Thu, 22 Aug 2002 13:24:11 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7MKOAJU050842 for ; Thu, 22 Aug 2002 13:24:10 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7MKOAdb050839 for perforce@freebsd.org; Thu, 22 Aug 2002 13:24:10 -0700 (PDT) Date: Thu, 22 Aug 2002 13:24:10 -0700 (PDT) Message-Id: <200208222024.g7MKOAdb050839@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 16433 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16433 Change 16433 by green@green_laptop_2 on 2002/08/22 13:23:29 Here's a first pass at implementing Lomac in the TrustedBSD framework. Well, it does some things, and doesn't crash... ;) Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#18 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#17 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#256 edit .. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#11 edit .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#30 edit .. //depot/projects/trustedbsd/mac/sys/modules/mac_lomac/Makefile#1 add .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#1 add .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.h#1 add .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#40 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#157 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#121 edit .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#20 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exit.c#18 (text+ko) ==== @@ -41,6 +41,7 @@ #include "opt_compat.h" #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -61,6 +62,7 @@ #include #include /* for acct_process() function prototype */ #include +#include #include #include #include @@ -745,6 +747,9 @@ */ vm_waitproc(p); mtx_destroy(&p->p_mtx); +#ifdef MAC + mac_destroy_proc(p); +#endif uma_zfree(proc_zone, p); sx_xlock(&allproc_lock); nprocs--; ==== //depot/projects/trustedbsd/mac/sys/kern/kern_fork.c#17 (text+ko) ==== @@ -40,6 +40,7 @@ */ #include "opt_ktrace.h" +#include "opt_mac.h" #include #include @@ -56,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -306,6 +308,9 @@ /* Allocate new proc. */ newproc = uma_zalloc(proc_zone, M_WAITOK); +#ifdef MAC + mac_init_proc(newproc); +#endif /* * Although process entries are dynamically created, we still keep ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#256 (text+ko) ==== @@ -185,6 +185,8 @@ &nmacsockets, 0, "number of sockets in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, pipes, CTLFLAG_RD, &nmacpipes, 0, "number of pipes in use"); +SYSCTL_UINT(_security_mac_debug, OID_AUTO, procs, CTLFLAG_RD, + &nmacprocs, 0, "number of procs in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, mounts, CTLFLAG_RD, &nmacmounts, 0, "number of mounts in use"); SYSCTL_UINT(_security_mac_debug, OID_AUTO, temp, CTLFLAG_RD, @@ -200,7 +202,7 @@ static int mac_policy_unregister(struct mac_policy_conf *mpc); static int mac_stdcreatevnode_ea(struct vnode *vp); -static void mac_cred_mmapped_drop_perms(struct thread *td, +void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred); static void mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred, struct vm_map *map); @@ -416,6 +418,10 @@ mpc->mpc_ops->mpo_init_pipe = mpe->mpe_function; break; + case MAC_INIT_PROC: + mpc->mpc_ops->mpo_init_proc = + mpe->mpe_function; + break; case MAC_INIT_SOCKET: mpc->mpc_ops->mpo_init_socket = mpe->mpe_function; @@ -460,6 +466,10 @@ mpc->mpc_ops->mpo_destroy_pipe = mpe->mpe_function; break; + case MAC_DESTROY_PROC: + mpc->mpc_ops->mpo_destroy_proc = + mpe->mpe_function; + break; case MAC_DESTROY_SOCKET: mpc->mpc_ops->mpo_destroy_socket = mpe->mpe_function; @@ -842,6 +852,10 @@ mpc->mpc_ops->mpo_check_vnode_write = mpe->mpe_function; break; + case MAC_PRE_SYSCALL_RETURN: + mpc->mpc_ops->mpo_pre_syscall_return = + mpe->mpe_function; + break; /* default: printf("MAC policy `%s': unknown operation %d\n", @@ -1133,6 +1147,28 @@ } void +mac_init_proc(struct proc *p) +{ + + mac_init_label(&p->p_label); + MAC_PERFORM(init_proc, p, &p->p_label); +#ifdef MAC_DEBUG + atomic_add_int(&nmacprocs, 1); +#endif +} + +void +mac_destroy_proc(struct proc *p) +{ + + MAC_PERFORM(destroy_proc, p, &p->p_label); + mac_destroy_label(&p->p_label); +#ifdef MAC_DEBUG + atomic_subtract_int(&nmacprocs, 1); +#endif +} + +void mac_init_bpfdesc(struct bpf_d *bpf_d) { @@ -2129,7 +2165,7 @@ * memory space, and revoke access (in the least surprising ways we * know) when necessary. The process lock is not held here. */ -static void +void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred) { @@ -2892,6 +2928,13 @@ return (mac_externalize(&so->so_label, extmac)); } +void +mac_pre_syscall_return(void) +{ + + MAC_PERFORM(pre_syscall_return); +} + int mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so, struct mac *extmac) ==== //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#11 (text+ko) ==== @@ -38,6 +38,7 @@ * $FreeBSD: src/sys/kern/subr_trap.c,v 1.221 2002/07/11 02:18:33 mini Exp $ */ +#include "opt_mac.h" #ifdef __i386__ #include "opt_npx.h" #endif @@ -48,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -88,6 +90,9 @@ mtx_unlock(&Giant); #endif +#ifdef MAC + mac_pre_syscall_return(); +#endif /* * XXX we cheat slightly on the locking here to avoid locking in * the usual case. Setting td_priority here is essentially an ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#30 (text+ko) ==== @@ -51,6 +51,7 @@ mac_biba \ mac_bsdextended \ mac_ifoff \ + mac_lomac \ mac_mls \ mac_none \ mac_partition \ ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#40 (text+ko) ==== @@ -87,6 +87,7 @@ #define MOUNTMAGIC 0xc7c46e47 #define SOCKETMAGIC 0x9199c6cd #define PIPEMAGIC 0xdc6c9919 +#define PROCMAGIC 0x3b4be98f #define CREDMAGIC 0x9a5a4987 #define TEMPMAGIC 0x70336678 #define VNODEMAGIC 0x1a67a45c @@ -124,6 +125,9 @@ static int init_count_pipe; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_pipe, CTLFLAG_RD, &init_count_pipe, 0, "pipe init calls"); +static int init_count_proc; +SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_proc, CTLFLAG_RD, + &init_count_proc, 0, "pipe init calls"); static int init_count_temp; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_temp, CTLFLAG_RD, &init_count_temp, 0, "temp init calls"); @@ -158,6 +162,9 @@ static int destroy_count_pipe; SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_pipe, CTLFLAG_RD, &destroy_count_pipe, 0, "pipe destroy calls"); +static int destroy_count_proc; +SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_proc, CTLFLAG_RD, + &destroy_count_proc, 0, "pipe destroy calls"); static int destroy_count_temp; SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_temp, CTLFLAG_RD, &destroy_count_temp, 0, "temp destroy calls"); @@ -276,6 +283,14 @@ } static void +mac_test_init_proc(struct proc *p, struct label *label) +{ + + SLOT(label) = PROCMAGIC; + atomic_add_int(&init_count_proc, 1); +} + +static void mac_test_init_temp(struct label *label) { @@ -424,6 +439,20 @@ } static void +mac_test_destroy_proc(struct proc *p, struct label *label) +{ + + if ((SLOT(label) == PROCMAGIC || SLOT(label) == 0)) { + atomic_add_int(&destroy_count_proc, 1); + SLOT(label) = EXMAGIC; + } else if (SLOT(label) == EXMAGIC) { + Debugger("mac_test_destroy_proc: dup destroy"); + } else { + Debugger("mac_test_destroy_proc: corrupted label"); + } +} + +static void mac_test_destroy_temp(struct label *label) { @@ -1167,6 +1196,8 @@ (macop_t)mac_test_init_mount }, { MAC_INIT_PIPE, (macop_t)mac_test_init_pipe }, + { MAC_INIT_PROC, + (macop_t)mac_test_init_proc }, { MAC_INIT_SOCKET, (macop_t)mac_test_init_socket }, { MAC_INIT_TEMP, @@ -1189,6 +1220,8 @@ (macop_t)mac_test_destroy_mount }, { MAC_DESTROY_PIPE, (macop_t)mac_test_destroy_pipe }, + { MAC_DESTROY_PROC, + (macop_t)mac_test_destroy_proc }, { MAC_DESTROY_SOCKET, (macop_t)mac_test_destroy_socket }, { MAC_DESTROY_TEMP, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#157 (text+ko) ==== @@ -230,6 +230,7 @@ void mac_init_pipe(struct pipe *); int mac_init_mbuf(struct mbuf *m, int how); void mac_init_mount(struct mount *); +void mac_init_proc(struct proc *); void mac_init_vnode(struct vnode *); void mac_destroy_bpfdesc(struct bpf_d *); void mac_destroy_cred(struct ucred *); @@ -238,6 +239,7 @@ void mac_destroy_ipq(struct ipq *); void mac_destroy_socket(struct socket *); void mac_destroy_pipe(struct pipe *); +void mac_destroy_proc(struct proc *); void mac_destroy_mbuf(struct mbuf *); void mac_destroy_mount(struct mount *); void mac_destroy_vnode(struct vnode *); @@ -300,6 +302,7 @@ int mac_execve_will_transition(struct ucred *old, struct vnode *vp); void mac_create_proc0(struct ucred *cred); void mac_create_proc1(struct ucred *cred); +void mac_pre_syscall_return(void); /* Access control checks. */ int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); @@ -384,6 +387,7 @@ struct mac *extmac); int mac_pipe_label_set(struct ucred *cred, struct pipe *pipe, struct label *label); +void mac_cred_mmapped_drop_perms(struct thread *td, struct ucred *cred); /* * Calls to help various file systems implement labeling functionality ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#121 (text+ko) ==== @@ -81,6 +81,7 @@ int (*mpo_init_mbuf)(struct mbuf *, int how, struct label *label); void (*mpo_init_mount)(struct mount *, struct label *mntlabel, struct label *fslabel); + void (*mpo_init_proc)(struct proc *p, struct label *label); void (*mpo_init_socket)(struct socket *so, struct label *label, struct label *peerlabel); void (*mpo_init_pipe)(struct pipe *pipe, struct label *label); @@ -95,6 +96,7 @@ void (*mpo_destroy_mbuf)(struct mbuf *, struct label *label); void (*mpo_destroy_mount)(struct mount *, struct label *mntlabel, struct label *fslabel); + void (*mpo_destroy_proc)(struct proc *p, struct label *label); void (*mpo_destroy_socket)(struct socket *so, struct label *label, struct label *peerlabel); void (*mpo_destroy_pipe)(struct pipe *pipe, struct label *label); @@ -347,6 +349,7 @@ int (*mpo_check_vnode_write)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); + void (*mpo_pre_syscall_return)(void); }; typedef const void *macop_t; @@ -364,6 +367,7 @@ MAC_INIT_MBUF, MAC_INIT_MOUNT, MAC_INIT_PIPE, + MAC_INIT_PROC, MAC_INIT_SOCKET, MAC_INIT_TEMP, MAC_INIT_VNODE, @@ -375,6 +379,7 @@ MAC_DESTROY_MBUF, MAC_DESTROY_MOUNT, MAC_DESTROY_PIPE, + MAC_DESTROY_PROC, MAC_DESTROY_SOCKET, MAC_DESTROY_TEMP, MAC_DESTROY_VNODE, @@ -471,6 +476,7 @@ MAC_CHECK_VNODE_SETUTIMES, MAC_CHECK_VNODE_STAT, MAC_CHECK_VNODE_WRITE, + MAC_PRE_SYSCALL_RETURN, }; struct mac_policy_op_entry { ==== //depot/projects/trustedbsd/mac/sys/sys/proc.h#20 (text+ko) ==== @@ -50,6 +50,7 @@ #include /* XXX */ #include #include +#include #ifndef _KERNEL #include /* For structs itimerval, timeval. */ #else @@ -537,6 +538,7 @@ struct proc *p_peers; /* (c) */ struct proc *p_leader; /* (b) */ void *p_emuldata; /* (c) Emulator state data. */ + struct label p_label; /* process (not subject) MAC label */ }; #define p_rlimit p_limit->pl_rlimit To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 22 13:50:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EC7037B401; Thu, 22 Aug 2002 13:50:50 -0700 (PDT) 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 CBAC137B400 for ; Thu, 22 Aug 2002 13:50:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8DFC143E9C for ; Thu, 22 Aug 2002 13:50:49 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7MKonJU056763 for ; Thu, 22 Aug 2002 13:50:49 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7MKonc2056756 for perforce@freebsd.org; Thu, 22 Aug 2002 13:50:49 -0700 (PDT) Date: Thu, 22 Aug 2002 13:50:49 -0700 (PDT) Message-Id: <200208222050.g7MKonc2056756@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 16438 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16438 Change 16438 by green@green_laptop_2 on 2002/08/22 13:50:16 For Lomac, don't disallow opening for read under any extra circumstances. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#2 (text+ko) ==== @@ -1916,11 +1916,6 @@ subj = SLOT(&cred->cr_label); obj = SLOT(vnodelabel); - /* XXX privilege override for admin? */ - if (acc_mode & (VREAD | VEXEC | VSTAT)) { - if (!mac_biba_dominate_single(obj, subj)) - return (EACCES); - } if (acc_mode & (VWRITE | VAPPEND | VADMIN)) { if (!mac_biba_dominate_single(subj, obj)) return (EACCES); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 22 15:13:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1405837B405; Thu, 22 Aug 2002 15:11:44 -0700 (PDT) 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 C505537B401 for ; Thu, 22 Aug 2002 15:11:42 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E87143E6A for ; Thu, 22 Aug 2002 15:11:41 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7MMBfJU085628 for ; Thu, 22 Aug 2002 15:11:41 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7MMBYGR085521 for perforce@freebsd.org; Thu, 22 Aug 2002 15:11:34 -0700 (PDT) Date: Thu, 22 Aug 2002 15:11:34 -0700 (PDT) Message-Id: <200208222211.g7MMBYGR085521@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 16444 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16444 Change 16444 by julian@julian_ref on 2002/08/22 15:10:55 MFC Affected files ... .. //depot/projects/kse/bin/ps/ps.1#11 integrate .. //depot/projects/kse/include/arpa/inet.h#3 integrate .. //depot/projects/kse/include/ctype.h#3 integrate .. //depot/projects/kse/include/err.h#2 integrate .. //depot/projects/kse/include/grp.h#2 integrate .. //depot/projects/kse/include/inttypes.h#3 integrate .. //depot/projects/kse/include/link.h#2 integrate .. //depot/projects/kse/include/monetary.h#2 integrate .. //depot/projects/kse/include/netdb.h#2 integrate .. //depot/projects/kse/include/nlist.h#2 integrate .. //depot/projects/kse/include/pwd.h#2 integrate .. //depot/projects/kse/include/runetype.h#2 integrate .. //depot/projects/kse/include/search.h#3 integrate .. //depot/projects/kse/include/signal.h#2 integrate .. //depot/projects/kse/include/stddef.h#2 integrate .. //depot/projects/kse/include/stdio.h#3 integrate .. //depot/projects/kse/include/stdlib.h#3 integrate .. //depot/projects/kse/include/string.h#2 integrate .. //depot/projects/kse/include/strings.h#2 integrate .. //depot/projects/kse/include/time.h#3 integrate .. //depot/projects/kse/include/timeconv.h#2 integrate .. //depot/projects/kse/include/unistd.h#2 integrate .. //depot/projects/kse/include/vis.h#2 integrate .. //depot/projects/kse/include/wchar.h#3 integrate .. //depot/projects/kse/include/wctype.h#3 integrate .. //depot/projects/kse/lib/libc/gen/errlst.c#3 integrate .. //depot/projects/kse/lib/libc/gen/getcwd.c#2 integrate .. //depot/projects/kse/lib/libc/gen/vis.c#2 integrate .. //depot/projects/kse/lib/libc/locale/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/locale/isctype.c#2 integrate .. //depot/projects/kse/lib/libc/locale/iswctype.c#2 integrate .. //depot/projects/kse/lib/libc/locale/mbrlen.3#1 branch .. //depot/projects/kse/lib/libc/locale/mbrlen.c#1 branch .. //depot/projects/kse/lib/libc/locale/mbrtowc.3#1 branch .. //depot/projects/kse/lib/libc/locale/mbrtowc.c#1 branch .. //depot/projects/kse/lib/libc/locale/mbsinit.3#1 branch .. //depot/projects/kse/lib/libc/locale/mbsinit.c#1 branch .. //depot/projects/kse/lib/libc/locale/mbsrtowcs.3#1 branch .. //depot/projects/kse/lib/libc/locale/mbsrtowcs.c#1 branch .. //depot/projects/kse/lib/libc/locale/runetype.c#2 integrate .. //depot/projects/kse/lib/libc/locale/tolower.c#2 integrate .. //depot/projects/kse/lib/libc/locale/toupper.c#2 integrate .. //depot/projects/kse/lib/libc/locale/wcrtomb.3#1 branch .. //depot/projects/kse/lib/libc/locale/wcrtomb.c#1 branch .. //depot/projects/kse/lib/libc/locale/wcsrtombs.3#1 branch .. //depot/projects/kse/lib/libc/locale/wcsrtombs.c#1 branch .. //depot/projects/kse/lib/libc/locale/wcwidth.3#1 branch .. //depot/projects/kse/lib/libc/locale/wcwidth.c#1 branch .. //depot/projects/kse/lib/libc/net/getaddrinfo.c#3 integrate .. //depot/projects/kse/lib/libc/rpc/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/stdio/asprintf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/local.h#3 integrate .. //depot/projects/kse/lib/libc/stdio/vasprintf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/vprintf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/vscanf.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/vsnprintf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/vsprintf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/vsscanf.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/kse/lib/libc/string/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/string/wcswidth.3#1 branch .. //depot/projects/kse/lib/libc/string/wcswidth.c#2 integrate .. //depot/projects/kse/lib/libc/sys/intro.2#3 integrate .. //depot/projects/kse/lib/libkvm/kvm.h#3 integrate .. //depot/projects/kse/sys/alpha/alpha/api_up1000.c#3 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_1000a.c#3 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_2100_a50.c#3 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_2100_a500.c#4 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_axppci_33.c#4 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_eb164.c#3 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_eb64plus.c#3 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_kn20aa.c#3 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_kn300.c#4 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_st550.c#3 integrate .. //depot/projects/kse/sys/alpha/alpha/dec_st6600.c#3 integrate .. //depot/projects/kse/sys/alpha/conf/GENERIC#16 integrate .. //depot/projects/kse/sys/alpha/include/_types.h#1 branch .. //depot/projects/kse/sys/alpha/include/ansi.h#12 integrate .. //depot/projects/kse/sys/alpha/include/endian.h#7 integrate .. //depot/projects/kse/sys/alpha/include/stdarg.h#3 integrate .. //depot/projects/kse/sys/alpha/include/types.h#4 delete .. //depot/projects/kse/sys/alpha/include/varargs.h#3 integrate .. //depot/projects/kse/sys/arm/include/_types.h#1 branch .. //depot/projects/kse/sys/arm/include/ansi.h#9 integrate .. //depot/projects/kse/sys/arm/include/types.h#5 delete .. //depot/projects/kse/sys/boot/ficl/loader.c#5 integrate .. //depot/projects/kse/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/kse/sys/boot/libstand/Makefile#1 branch .. //depot/projects/kse/sys/boot/libstand/__main.c#1 branch .. //depot/projects/kse/sys/boot/libstand/alpha/_setjmp.S#1 branch .. //depot/projects/kse/sys/boot/libstand/arp.c#1 branch .. //depot/projects/kse/sys/boot/libstand/assert.c#1 branch .. //depot/projects/kse/sys/boot/libstand/bcd.c#1 branch .. //depot/projects/kse/sys/boot/libstand/bootp.c#1 branch .. //depot/projects/kse/sys/boot/libstand/bootp.h#1 branch .. //depot/projects/kse/sys/boot/libstand/bootparam.c#1 branch .. //depot/projects/kse/sys/boot/libstand/bootparam.h#1 branch .. //depot/projects/kse/sys/boot/libstand/bswap.c#1 branch .. //depot/projects/kse/sys/boot/libstand/bzipfs.c#1 branch .. //depot/projects/kse/sys/boot/libstand/bzlib.c.diff#1 branch .. //depot/projects/kse/sys/boot/libstand/bzlib.h.diff#1 branch .. //depot/projects/kse/sys/boot/libstand/bzlib_private.h.diff#1 branch .. //depot/projects/kse/sys/boot/libstand/cd9660.c#1 branch .. //depot/projects/kse/sys/boot/libstand/close.c#1 branch .. //depot/projects/kse/sys/boot/libstand/closeall.c#1 branch .. //depot/projects/kse/sys/boot/libstand/dev.c#1 branch .. //depot/projects/kse/sys/boot/libstand/dosfs.c#1 branch .. //depot/projects/kse/sys/boot/libstand/dosfs.h#1 branch .. //depot/projects/kse/sys/boot/libstand/environment.c#1 branch .. //depot/projects/kse/sys/boot/libstand/ether.c#1 branch .. //depot/projects/kse/sys/boot/libstand/ext2fs.c#1 branch .. //depot/projects/kse/sys/boot/libstand/fstat.c#1 branch .. //depot/projects/kse/sys/boot/libstand/getopt.c#1 branch .. //depot/projects/kse/sys/boot/libstand/gets.c#1 branch .. //depot/projects/kse/sys/boot/libstand/globals.c#1 branch .. //depot/projects/kse/sys/boot/libstand/i386/_setjmp.S#1 branch .. //depot/projects/kse/sys/boot/libstand/if_ether.h#1 branch .. //depot/projects/kse/sys/boot/libstand/in_cksum.c#1 branch .. //depot/projects/kse/sys/boot/libstand/inet_ntoa.c#1 branch .. //depot/projects/kse/sys/boot/libstand/ioctl.c#1 branch .. //depot/projects/kse/sys/boot/libstand/iodesc.h#1 branch .. //depot/projects/kse/sys/boot/libstand/libstand.3#1 branch .. //depot/projects/kse/sys/boot/libstand/lseek.c#1 branch .. //depot/projects/kse/sys/boot/libstand/net.c#1 branch .. //depot/projects/kse/sys/boot/libstand/net.h#1 branch .. //depot/projects/kse/sys/boot/libstand/netif.c#1 branch .. //depot/projects/kse/sys/boot/libstand/netif.h#1 branch .. //depot/projects/kse/sys/boot/libstand/nfs.c#1 branch .. //depot/projects/kse/sys/boot/libstand/nfsv2.h#1 branch .. //depot/projects/kse/sys/boot/libstand/nullfs.c#1 branch .. //depot/projects/kse/sys/boot/libstand/open.c#1 branch .. //depot/projects/kse/sys/boot/libstand/pager.c#1 branch .. //depot/projects/kse/sys/boot/libstand/powerpc/_setjmp.S#1 branch .. //depot/projects/kse/sys/boot/libstand/printf.c#1 branch .. //depot/projects/kse/sys/boot/libstand/qdivrem.c#1 branch .. //depot/projects/kse/sys/boot/libstand/quad.h#1 branch .. //depot/projects/kse/sys/boot/libstand/random.c#1 branch .. //depot/projects/kse/sys/boot/libstand/rarp.c#1 branch .. //depot/projects/kse/sys/boot/libstand/read.c#1 branch .. //depot/projects/kse/sys/boot/libstand/readdir.c#1 branch .. //depot/projects/kse/sys/boot/libstand/rpc.c#1 branch .. //depot/projects/kse/sys/boot/libstand/rpc.h#1 branch .. //depot/projects/kse/sys/boot/libstand/rpcv2.h#1 branch .. //depot/projects/kse/sys/boot/libstand/saioctl.h#1 branch .. //depot/projects/kse/sys/boot/libstand/sbrk.c#1 branch .. //depot/projects/kse/sys/boot/libstand/sparc64/_setjmp.S#1 branch .. //depot/projects/kse/sys/boot/libstand/splitfs.c#1 branch .. //depot/projects/kse/sys/boot/libstand/stand.h#1 branch .. //depot/projects/kse/sys/boot/libstand/stat.c#1 branch .. //depot/projects/kse/sys/boot/libstand/strcasecmp.c#1 branch .. //depot/projects/kse/sys/boot/libstand/strdup.c#1 branch .. //depot/projects/kse/sys/boot/libstand/strerror.c#1 branch .. //depot/projects/kse/sys/boot/libstand/strtol.c#1 branch .. //depot/projects/kse/sys/boot/libstand/tftp.c#1 branch .. //depot/projects/kse/sys/boot/libstand/tftp.h#1 branch .. //depot/projects/kse/sys/boot/libstand/twiddle.c#1 branch .. //depot/projects/kse/sys/boot/libstand/udp.c#1 branch .. //depot/projects/kse/sys/boot/libstand/ufs.c#1 branch .. //depot/projects/kse/sys/boot/libstand/write.c#1 branch .. //depot/projects/kse/sys/boot/libstand/zalloc.c#1 branch .. //depot/projects/kse/sys/boot/libstand/zalloc_defs.h#1 branch .. //depot/projects/kse/sys/boot/libstand/zalloc_malloc.c#1 branch .. //depot/projects/kse/sys/boot/libstand/zalloc_mem.h#1 branch .. //depot/projects/kse/sys/boot/libstand/zalloc_protos.h#1 branch .. //depot/projects/kse/sys/boot/libstand/zipfs.c#1 branch .. //depot/projects/kse/sys/boot/libstand/zutil.h.diff#1 branch .. //depot/projects/kse/sys/boot/sparc64/loader/main.c#9 integrate .. //depot/projects/kse/sys/compat/linux/linux_ioctl.c#17 integrate .. //depot/projects/kse/sys/compat/pecoff/imgact_pecoff.c#13 integrate .. //depot/projects/kse/sys/conf/NOTES#12 integrate .. //depot/projects/kse/sys/conf/files#45 integrate .. //depot/projects/kse/sys/conf/files.alpha#16 integrate .. //depot/projects/kse/sys/conf/files.i386#26 integrate .. //depot/projects/kse/sys/conf/files.ia64#15 integrate .. //depot/projects/kse/sys/conf/files.pc98#27 integrate .. //depot/projects/kse/sys/conf/files.x86_64#2 integrate .. //depot/projects/kse/sys/conf/kern.post.mk#13 integrate .. //depot/projects/kse/sys/conf/majors#11 integrate .. //depot/projects/kse/sys/conf/options#24 integrate .. //depot/projects/kse/sys/conf/options.alpha#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_cmbat.c#9 integrate .. //depot/projects/kse/sys/dev/asr/asr.c#10 integrate .. //depot/projects/kse/sys/dev/ata/atapi-all.c#14 integrate .. //depot/projects/kse/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/kse/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/kse/sys/dev/digi/digi_isa.c#5 integrate .. //depot/projects/kse/sys/dev/eisa/eisaconf.h#3 integrate .. //depot/projects/kse/sys/dev/em/README#3 integrate .. //depot/projects/kse/sys/dev/em/if_em.c#9 integrate .. //depot/projects/kse/sys/dev/em/if_em.h#7 integrate .. //depot/projects/kse/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/kse/sys/dev/em/if_em_hw.h#3 integrate .. //depot/projects/kse/sys/dev/em/if_em_osdep.h#6 integrate .. //depot/projects/kse/sys/dev/fxp/if_fxp.c#18 integrate .. //depot/projects/kse/sys/dev/gx/if_gx.c#6 integrate .. //depot/projects/kse/sys/dev/hfa/fore_buffer.c#4 integrate .. //depot/projects/kse/sys/dev/isp/isp.c#22 integrate .. //depot/projects/kse/sys/dev/isp/isp_freebsd.c#15 integrate .. //depot/projects/kse/sys/dev/isp/isp_freebsd.h#13 integrate .. //depot/projects/kse/sys/dev/isp/isp_pci.c#13 integrate .. //depot/projects/kse/sys/dev/isp/ispmbox.h#14 integrate .. //depot/projects/kse/sys/dev/isp/ispvar.h#13 integrate .. //depot/projects/kse/sys/dev/kbd/atkbdc.c#3 integrate .. //depot/projects/kse/sys/dev/md/md.c#23 integrate .. //depot/projects/kse/sys/dev/mly/mly.c#7 integrate .. //depot/projects/kse/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.c#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/kse/sys/dev/nsp/nsp.c#5 integrate .. //depot/projects/kse/sys/dev/pci/pcivar.h#8 integrate .. //depot/projects/kse/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/kse/sys/dev/pst/pst-iop.h#2 integrate .. //depot/projects/kse/sys/dev/pst/pst-raid.c#2 integrate .. //depot/projects/kse/sys/dev/puc/pucdata.c#6 integrate .. //depot/projects/kse/sys/dev/sound/pci/ich.c#17 integrate .. //depot/projects/kse/sys/dev/sound/pci/ich.h#2 integrate .. //depot/projects/kse/sys/dev/sound/pci/via8233.c#1 branch .. //depot/projects/kse/sys/dev/sound/pci/via8233.h#1 branch .. //depot/projects/kse/sys/dev/sound/pci/via82c686.c#8 integrate .. //depot/projects/kse/sys/dev/sound/pci/via82c686.h#3 integrate .. //depot/projects/kse/sys/dev/sound/pcm/channel.c#18 integrate .. //depot/projects/kse/sys/dev/sound/pcm/dsp.c#9 integrate .. //depot/projects/kse/sys/dev/syscons/schistory.c#4 integrate .. //depot/projects/kse/sys/dev/syscons/scmouse.c#7 integrate .. //depot/projects/kse/sys/dev/syscons/scvtb.c#2 integrate .. //depot/projects/kse/sys/dev/syscons/syscons.c#17 integrate .. //depot/projects/kse/sys/dev/twe/twe.c#4 integrate .. //depot/projects/kse/sys/dev/tx/if_tx.c#2 integrate .. //depot/projects/kse/sys/dev/tx/if_txvar.h#2 integrate .. //depot/projects/kse/sys/dev/usb/usbdi_util.c#4 integrate .. //depot/projects/kse/sys/dev/vinum/vinumdaemon.c#3 integrate .. //depot/projects/kse/sys/dev/vinum/vinumio.c#7 integrate .. //depot/projects/kse/sys/dev/vx/if_vx.c#4 integrate .. //depot/projects/kse/sys/dev/wi/if_wi.c#26 integrate .. //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#15 integrate .. //depot/projects/kse/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/kse/sys/i386/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/kse/sys/i386/acpica/acpi_wakeup.c#7 integrate .. //depot/projects/kse/sys/i386/conf/GENERIC#22 integrate .. //depot/projects/kse/sys/i386/conf/NEWCARD.hints#3 delete .. //depot/projects/kse/sys/i386/conf/OLDCARD#4 integrate .. //depot/projects/kse/sys/i386/i386/busdma_machdep.c#5 integrate .. //depot/projects/kse/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/kse/sys/i386/i386/pmap.c#43 integrate .. //depot/projects/kse/sys/i386/include/_types.h#1 branch .. //depot/projects/kse/sys/i386/include/ansi.h#12 integrate .. //depot/projects/kse/sys/i386/include/endian.h#9 integrate .. //depot/projects/kse/sys/i386/include/nexusvar.h#2 integrate .. //depot/projects/kse/sys/i386/include/stdarg.h#5 integrate .. //depot/projects/kse/sys/i386/include/types.h#6 delete .. //depot/projects/kse/sys/i386/include/varargs.h#3 integrate .. //depot/projects/kse/sys/ia64/conf/GENERIC#16 integrate .. //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#22 integrate .. //depot/projects/kse/sys/ia64/include/_types.h#1 branch .. //depot/projects/kse/sys/ia64/include/ansi.h#12 integrate .. //depot/projects/kse/sys/ia64/include/endian.h#8 integrate .. //depot/projects/kse/sys/ia64/include/nexusvar.h#2 integrate .. //depot/projects/kse/sys/ia64/include/stdarg.h#4 integrate .. //depot/projects/kse/sys/ia64/include/types.h#4 delete .. //depot/projects/kse/sys/ia64/include/varargs.h#3 integrate .. //depot/projects/kse/sys/kern/init_sysent.c#24 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#35 integrate .. //depot/projects/kse/sys/kern/kern_fork.c#78 integrate .. //depot/projects/kse/sys/kern/kern_ktrace.c#15 integrate .. //depot/projects/kse/sys/kern/kern_mac.c#2 integrate .. //depot/projects/kse/sys/kern/kern_poll.c#10 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#61 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#91 integrate .. //depot/projects/kse/sys/kern/kern_time.c#11 integrate .. //depot/projects/kse/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/kse/sys/kern/link_aout.c#7 integrate .. //depot/projects/kse/sys/kern/link_elf.c#14 integrate .. //depot/projects/kse/sys/kern/subr_disk.c#11 integrate .. //depot/projects/kse/sys/kern/subr_trap.c#76 integrate .. //depot/projects/kse/sys/kern/sys_pipe.c#16 integrate .. //depot/projects/kse/sys/kern/syscalls.c#23 integrate .. //depot/projects/kse/sys/kern/syscalls.master#23 integrate .. //depot/projects/kse/sys/kern/tty_tty.c#8 integrate .. //depot/projects/kse/sys/kern/vfs_aio.c#29 integrate .. //depot/projects/kse/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#39 integrate .. //depot/projects/kse/sys/kern/vfs_syscalls.c#33 integrate .. //depot/projects/kse/sys/kern/vfs_vnops.c#31 integrate .. //depot/projects/kse/sys/kern/vnode_if.src#10 integrate .. //depot/projects/kse/sys/libkern/bcmp.c#2 integrate .. //depot/projects/kse/sys/libkern/ffs.c#2 integrate .. //depot/projects/kse/sys/libkern/strcat.c#2 integrate .. //depot/projects/kse/sys/libkern/strcmp.c#2 integrate .. //depot/projects/kse/sys/libkern/strcpy.c#2 integrate .. //depot/projects/kse/sys/libkern/strlen.c#2 integrate .. //depot/projects/kse/sys/libkern/strncmp.c#2 integrate .. //depot/projects/kse/sys/libkern/strncpy.c#2 integrate .. //depot/projects/kse/sys/modules/Makefile#30 integrate .. //depot/projects/kse/sys/modules/netgraph/Makefile#7 integrate .. //depot/projects/kse/sys/modules/netgraph/l2tp/Makefile#1 branch .. //depot/projects/kse/sys/modules/osf1/Makefile#3 integrate .. //depot/projects/kse/sys/modules/sound/driver/Makefile#4 integrate .. //depot/projects/kse/sys/modules/sound/driver/via8233/Makefile#1 branch .. //depot/projects/kse/sys/net/if.c#20 integrate .. //depot/projects/kse/sys/net/if.h#11 integrate .. //depot/projects/kse/sys/net/if_ethersubr.c#17 integrate .. //depot/projects/kse/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/kse/sys/net/if_ppp.c#11 integrate .. //depot/projects/kse/sys/net/if_tap.c#13 integrate .. //depot/projects/kse/sys/net/if_var.h#14 integrate .. //depot/projects/kse/sys/net/rtsock.c#18 integrate .. //depot/projects/kse/sys/netatm/atm_if.c#6 integrate .. //depot/projects/kse/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/kse/sys/netgraph/ng_base.c#9 integrate .. //depot/projects/kse/sys/netgraph/ng_cisco.c#4 integrate .. //depot/projects/kse/sys/netgraph/ng_ksocket.c#16 integrate .. //depot/projects/kse/sys/netgraph/ng_l2tp.c#1 branch .. //depot/projects/kse/sys/netgraph/ng_l2tp.h#1 branch .. //depot/projects/kse/sys/netgraph/ng_mppc.c#7 integrate .. //depot/projects/kse/sys/netgraph/ng_pppoe.c#9 integrate .. //depot/projects/kse/sys/netgraph/ng_socket.c#12 integrate .. //depot/projects/kse/sys/netinet/in.h#10 integrate .. //depot/projects/kse/sys/netinet/in_pcb.c#20 integrate .. //depot/projects/kse/sys/netinet/in_pcb.h#14 integrate .. //depot/projects/kse/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/kse/sys/netinet/tcp_input.c#26 integrate .. //depot/projects/kse/sys/netinet/tcp_output.c#12 integrate .. //depot/projects/kse/sys/netinet/tcp_subr.c#19 integrate .. //depot/projects/kse/sys/netinet/tcp_usrreq.c#13 integrate .. //depot/projects/kse/sys/netinet/tcp_var.h#12 integrate .. //depot/projects/kse/sys/netinet6/in6.h#8 integrate .. //depot/projects/kse/sys/netinet6/in6_pcb.c#17 integrate .. //depot/projects/kse/sys/netinet6/in6_pcb.h#7 integrate .. //depot/projects/kse/sys/netinet6/in6_var.h#5 integrate .. //depot/projects/kse/sys/netinet6/ip6_mroute.c#8 integrate .. //depot/projects/kse/sys/netinet6/ip6_output.c#9 integrate .. //depot/projects/kse/sys/netinet6/udp6_usrreq.c#14 integrate .. //depot/projects/kse/sys/nfsclient/bootp_subr.c#11 integrate .. //depot/projects/kse/sys/nfsserver/nfs_srvsubs.c#9 integrate .. //depot/projects/kse/sys/pc98/conf/GENERIC#19 integrate .. //depot/projects/kse/sys/pc98/pc98/pc98kbd.c#2 integrate .. //depot/projects/kse/sys/pc98/pc98/scvtbpc98.c#3 integrate .. //depot/projects/kse/sys/pc98/pc98/syscons.c#12 integrate .. //depot/projects/kse/sys/pci/if_dc.c#18 integrate .. //depot/projects/kse/sys/pci/if_rl.c#12 integrate .. //depot/projects/kse/sys/pci/if_sis.c#14 integrate .. //depot/projects/kse/sys/pci/if_ste.c#8 integrate .. //depot/projects/kse/sys/pci/if_stereg.h#4 integrate .. //depot/projects/kse/sys/pci/ohci_pci.c#5 integrate .. //depot/projects/kse/sys/pci/uhci_pci.c#6 integrate .. //depot/projects/kse/sys/powerpc/include/_types.h#1 branch .. //depot/projects/kse/sys/powerpc/include/ansi.h#12 integrate .. //depot/projects/kse/sys/powerpc/include/endian.h#7 integrate .. //depot/projects/kse/sys/powerpc/include/stdarg.h#4 integrate .. //depot/projects/kse/sys/powerpc/include/types.h#5 delete .. //depot/projects/kse/sys/powerpc/include/varargs.h#3 integrate .. //depot/projects/kse/sys/security/lomac/kernel_util.c#9 integrate .. //depot/projects/kse/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/kse/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/kse/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/kse/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/kse/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/kse/sys/sparc64/conf/GENERIC#19 integrate .. //depot/projects/kse/sys/sparc64/include/_types.h#1 branch .. //depot/projects/kse/sys/sparc64/include/ansi.h#13 integrate .. //depot/projects/kse/sys/sparc64/include/asmacros.h#12 integrate .. //depot/projects/kse/sys/sparc64/include/endian.h#9 integrate .. //depot/projects/kse/sys/sparc64/include/signal.h#6 integrate .. //depot/projects/kse/sys/sparc64/include/stdarg.h#3 integrate .. //depot/projects/kse/sys/sparc64/include/tsb.h#13 integrate .. //depot/projects/kse/sys/sparc64/include/tte.h#12 integrate .. //depot/projects/kse/sys/sparc64/include/types.h#4 delete .. //depot/projects/kse/sys/sparc64/include/varargs.h#3 integrate .. //depot/projects/kse/sys/sparc64/sbus/sbusvar.h#2 integrate .. //depot/projects/kse/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/kse/sys/sparc64/sparc64/genassym.c#30 integrate .. //depot/projects/kse/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/kse/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/kse/sys/sparc64/sparc64/mp_machdep.c#12 integrate .. //depot/projects/kse/sys/sparc64/sparc64/pmap.c#35 integrate .. //depot/projects/kse/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/kse/sys/sparc64/sparc64/tsb.c#16 integrate .. //depot/projects/kse/sys/sys/_timespec.h#2 integrate .. //depot/projects/kse/sys/sys/_types.h#4 integrate .. //depot/projects/kse/sys/sys/consio.h#6 integrate .. //depot/projects/kse/sys/sys/dirent.h#2 integrate .. //depot/projects/kse/sys/sys/errno.h#8 integrate .. //depot/projects/kse/sys/sys/link_aout.h#1 branch .. //depot/projects/kse/sys/sys/link_elf.h#1 branch .. //depot/projects/kse/sys/sys/mac.h#2 integrate .. //depot/projects/kse/sys/sys/mac_policy.h#2 integrate .. //depot/projects/kse/sys/sys/mount.h#15 integrate .. //depot/projects/kse/sys/sys/nlist_aout.h#1 branch .. //depot/projects/kse/sys/sys/pcpu.h#13 integrate .. //depot/projects/kse/sys/sys/sbuf.h#5 integrate .. //depot/projects/kse/sys/sys/signal.h#7 integrate .. //depot/projects/kse/sys/sys/socket.h#10 integrate .. //depot/projects/kse/sys/sys/stat.h#7 integrate .. //depot/projects/kse/sys/sys/statvfs.h#2 integrate .. //depot/projects/kse/sys/sys/stdint.h#4 integrate .. //depot/projects/kse/sys/sys/syscall.h#23 integrate .. //depot/projects/kse/sys/sys/syscall.mk#23 integrate .. //depot/projects/kse/sys/sys/syslog.h#3 integrate .. //depot/projects/kse/sys/sys/sysproto.h#27 integrate .. //depot/projects/kse/sys/sys/systm.h#29 integrate .. //depot/projects/kse/sys/sys/times.h#3 integrate .. //depot/projects/kse/sys/sys/timespec.h#2 integrate .. //depot/projects/kse/sys/sys/types.h#17 integrate .. //depot/projects/kse/sys/sys/un.h#8 integrate .. //depot/projects/kse/sys/sys/vnode.h#29 integrate .. //depot/projects/kse/sys/tools/makeobjops.awk#2 integrate .. //depot/projects/kse/sys/tools/vnode_if.awk#5 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_vnops.c#8 integrate .. //depot/projects/kse/sys/vm/uma_core.c#13 integrate .. //depot/projects/kse/sys/x86_64/include/_types.h#1 branch .. //depot/projects/kse/sys/x86_64/include/ansi.h#2 integrate .. //depot/projects/kse/sys/x86_64/include/endian.h#2 integrate .. //depot/projects/kse/sys/x86_64/include/stdarg.h#2 integrate .. //depot/projects/kse/sys/x86_64/include/types.h#2 delete Differences ... ==== //depot/projects/kse/bin/ps/ps.1#11 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.56 2002/08/09 10:49:50 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.57 2002/08/21 17:32:40 trhodes Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -73,7 +73,7 @@ controlling terminal, cpu time (including both user and system time), state, and associated command. .Pp -The process filesystem (see +The process file system (see .Xr procfs 5 ) should be mounted when .Nm ==== //depot/projects/kse/include/arpa/inet.h#3 (text+ko) ==== @@ -50,7 +50,7 @@ * * @(#)inet.h 8.1 (Berkeley) 6/2/93 * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $ - * $FreeBSD: src/include/arpa/inet.h,v 1.24 2002/08/16 16:34:26 mike Exp $ + * $FreeBSD: src/include/arpa/inet.h,v 1.25 2002/08/21 16:19:56 mike Exp $ */ #ifndef _ARPA_INET_H_ @@ -59,7 +59,7 @@ /* External definitions for functions in inet(3), addr2ascii(3) */ #include -#include +#include /* Required for byteorder(3) functions. */ #include @@ -88,9 +88,9 @@ #endif #if __BSD_VISIBLE -#ifdef _BSD_SIZE_T_ -typedef _BSD_SIZE_T_ size_t; -#undef _BSD_SIZE_T_ +#ifndef _SIZE_T_DECLARED +typedef __size_t size_t; +#define _SIZE_T_DECLARED #endif #endif @@ -98,9 +98,9 @@ * XXX socklen_t is used by a POSIX.1-2001 interface, but not required by * POSIX.1-2001. */ -#ifdef _BSD_SOCKLEN_T_ -typedef _BSD_SOCKLEN_T_ socklen_t; -#undef _BSD_SOCKLEN_T_ +#ifndef _SOCKLEN_T_DECLARED +typedef __socklen_t socklen_t; +#define _SOCKLEN_T_DECLARED #endif #ifndef _STRUCT_IN_ADDR_DECLARED ==== //depot/projects/kse/include/ctype.h#3 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/include/ctype.h,v 1.19 2002/08/16 13:42:59 keichii Exp $ + * $FreeBSD: src/include/ctype.h,v 1.22 2002/08/21 16:19:55 mike Exp $ */ #ifndef _CTYPE_H_ @@ -65,10 +65,8 @@ #define _CTYPE_I 0x00080000L /* Ideogram */ #define _CTYPE_T 0x00100000L /* Special */ #define _CTYPE_Q 0x00200000L /* Phonogram */ -#define _CTYPE_SWM 0xe0000000L /* Mask to get screen width data */ -#define _CTYPE_SWS 30 /* Bits to shift to get width */ #define _CTYPE_SW0 0x20000000L /* 0 width character */ -#define _CTYPE_SW1 0x00000000L /* 1 width character / default*/ +#define _CTYPE_SW1 0x40000000L /* 1 width character */ #define _CTYPE_SW2 0x80000000L /* 2 width character */ #define _CTYPE_SW3 0xc0000000L /* 3 width character */ @@ -128,11 +126,11 @@ #define toascii(c) ((c) & 0x7F) #endif -/* See comments in about _BSD_CT_RUNE_T_. */ +/* See comments in about __ct_rune_t. */ __BEGIN_DECLS -unsigned long ___runetype(_BSD_CT_RUNE_T_); -_BSD_CT_RUNE_T_ ___tolower(_BSD_CT_RUNE_T_); -_BSD_CT_RUNE_T_ ___toupper(_BSD_CT_RUNE_T_); +unsigned long ___runetype(__ct_rune_t); +__ct_rune_t ___tolower(__ct_rune_t); +__ct_rune_t ___toupper(__ct_rune_t); __END_DECLS /* @@ -151,34 +149,34 @@ #if !defined(_DONT_USE_CTYPE_INLINE_) && \ (defined(_USE_CTYPE_INLINE_) || defined(__GNUC__) || defined(__cplusplus)) static __inline int -__maskrune(_BSD_CT_RUNE_T_ _c, unsigned long _f) +__maskrune(__ct_rune_t _c, unsigned long _f) { return ((_c < 0 || _c >= _CACHED_RUNES) ? ___runetype(_c) : _CurrentRuneLocale->runetype[_c]) & _f; } static __inline int -__istype(_BSD_CT_RUNE_T_ _c, unsigned long _f) +__istype(__ct_rune_t _c, unsigned long _f) { return (!!__maskrune(_c, _f)); } static __inline int -__isctype(_BSD_CT_RUNE_T_ _c, unsigned long _f) +__isctype(__ct_rune_t _c, unsigned long _f) { return (_c < 0 || _c >= _CACHED_RUNES) ? 0 : !!(_DefaultRuneLocale.runetype[_c] & _f); } -static __inline _BSD_CT_RUNE_T_ -__toupper(_BSD_CT_RUNE_T_ _c) +static __inline __ct_rune_t +__toupper(__ct_rune_t _c) { return (_c < 0 || _c >= _CACHED_RUNES) ? ___toupper(_c) : _CurrentRuneLocale->mapupper[_c]; } -static __inline _BSD_CT_RUNE_T_ -__tolower(_BSD_CT_RUNE_T_ _c) +static __inline __ct_rune_t +__tolower(__ct_rune_t _c) { return (_c < 0 || _c >= _CACHED_RUNES) ? ___tolower(_c) : _CurrentRuneLocale->maplower[_c]; @@ -187,11 +185,11 @@ #else /* not using inlines */ __BEGIN_DECLS -int __maskrune(_BSD_CT_RUNE_T_, unsigned long); -int __istype(_BSD_CT_RUNE_T_, unsigned long); -int __isctype(_BSD_CT_RUNE_T_, unsigned long); -_BSD_CT_RUNE_T_ __toupper(_BSD_CT_RUNE_T_); -_BSD_CT_RUNE_T_ __tolower(_BSD_CT_RUNE_T_); +int __maskrune(__ct_rune_t, unsigned long); +int __istype(__ct_rune_t, unsigned long); +int __isctype(__ct_rune_t, unsigned long); +__ct_rune_t __toupper(__ct_rune_t); +__ct_rune_t __tolower(__ct_rune_t); __END_DECLS #endif /* using inlines */ ==== //depot/projects/kse/include/err.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)err.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/err.h,v 1.10 2002/03/26 01:37:03 bde Exp $ + * $FreeBSD: src/include/err.h,v 1.11 2002/08/21 16:19:55 mike Exp $ */ #ifndef _ERR_H_ @@ -42,25 +42,25 @@ * places ( and ), so if we include one * of them here we may collide with the utility's includes. It's unreasonable * for utilities to have to include one of them to include err.h, so we get - * _BSD_VA_LIST_ from and use it. + * __va_list from and use it. */ -#include #include +#include __BEGIN_DECLS void err(int, const char *, ...) __dead2 __printf0like(2, 3); -void verr(int, const char *, _BSD_VA_LIST_) __dead2 __printf0like(2, 0); +void verr(int, const char *, __va_list) __dead2 __printf0like(2, 0); void errc(int, int, const char *, ...) __dead2 __printf0like(3, 4); -void verrc(int, int, const char *, _BSD_VA_LIST_) __dead2 +void verrc(int, int, const char *, __va_list) __dead2 __printf0like(3, 0); void errx(int, const char *, ...) __dead2 __printf0like(2, 3); -void verrx(int, const char *, _BSD_VA_LIST_) __dead2 __printf0like(2, 0); +void verrx(int, const char *, __va_list) __dead2 __printf0like(2, 0); void warn(const char *, ...) __printf0like(1, 2); -void vwarn(const char *, _BSD_VA_LIST_) __printf0like(1, 0); +void vwarn(const char *, __va_list) __printf0like(1, 0); void warnc(int, const char *, ...) __printf0like(2, 3); -void vwarnc(int, const char *, _BSD_VA_LIST_) __printf0like(2, 0); +void vwarnc(int, const char *, __va_list) __printf0like(2, 0); void warnx(const char *, ...) __printflike(1, 2); -void vwarnx(const char *, _BSD_VA_LIST_) __printflike(1, 0); +void vwarnx(const char *, __va_list) __printflike(1, 0); void err_set_file(void *); void err_set_exit(void (*)(int)); __END_DECLS ==== //depot/projects/kse/include/grp.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)grp.h 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/include/grp.h,v 1.14 2002/04/15 03:33:27 mike Exp $ + * $FreeBSD: src/include/grp.h,v 1.15 2002/08/21 16:19:55 mike Exp $ */ #ifndef _GRP_H_ @@ -49,9 +49,9 @@ #define _PATH_GROUP "/etc/group" #endif -#ifdef _BSD_GID_T_ -typedef _BSD_GID_T_ gid_t; -#undef _BSD_GID_T_ +#ifndef _GID_T_DECLARED +typedef __gid_t gid_t; +#define _GID_T_DECLARED #endif struct group { ==== //depot/projects/kse/include/inttypes.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/inttypes.h,v 1.5 2002/08/15 09:25:03 robert Exp $ + * $FreeBSD: src/include/inttypes.h,v 1.6 2002/08/21 16:19:55 mike Exp $ */ #ifndef _INTTYPES_H_ @@ -33,9 +33,9 @@ #include #ifndef __cplusplus -#ifdef _BSD_WCHAR_T_ -typedef _BSD_WCHAR_T_ wchar_t; -#undef _BSD_WCHAR_T_ +#ifndef _WCHAR_T_DECLARED +typedef __wchar_t wchar_t; +#define _WCHAR_T_DECLARED #endif #endif ==== //depot/projects/kse/include/link.h#2 (text+ko) ==== @@ -27,292 +27,11 @@ * (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/include/link.h,v 1.23 2002/03/23 17:24:53 imp Exp $ - */ - -/* - * RRS section definitions. - * - * The layout of some data structures defined in this header file is - * such that we can provide compatibility with the SunOS 4.x shared - * library scheme. + * $FreeBSD: src/include/link.h,v 1.24 2002/08/22 20:37:30 peter Exp $ */ -#ifndef _LINK_H_ -#define _LINK_H_ - #if (defined(FREEBSD_ELF) || defined(__ELF__)) && !defined(FREEBSD_AOUT) - -#include - -struct link_map { - caddr_t l_addr; /* Base Address of library */ -#ifdef __mips__ - caddr_t l_offs; /* Load Offset of library */ +#include +#else +#include #endif - const char *l_name; /* Absolute Path to Library */ - const void *l_ld; /* Pointer to .dynamic in memory */ - struct link_map *l_next, *l_prev; /* linked list of of mapped libs */ -}; - -struct r_debug { - int r_version; /* not used */ - struct link_map *r_map; /* list of loaded images */ - void (*r_brk)(struct r_debug *, struct link_map *); - /* pointer to break point */ - enum { - RT_CONSISTENT, /* things are stable */ - RT_ADD, /* adding a shared library */ - RT_DELETE /* removing a shared library */ - } r_state; -}; - -#else /* !__ELF__ */ - -struct dl_info; - -/* - * A `Shared Object Descriptor' describes a shared object that is needed - * to complete the link edit process of the object containing it. - * A list of such objects (chained through `sod_next') is pointed at - * by `sdt_sods' in the section_dispatch_table structure. - */ - -struct sod { /* Shared Object Descriptor */ - long sod_name; /* name (relative to load address) */ - u_int sod_library : 1, /* Searched for by library rules */ - sod_reserved : 31; - short sod_major; /* major version number */ - short sod_minor; /* minor version number */ - long sod_next; /* next sod */ -}; - -/* - * `Shared Object Map's are used by the run-time link editor (ld.so) to - * keep track of all shared objects loaded into a process' address space. - * These structures are only used at run-time and do not occur within - * the text or data segment of an executable or shared library. - */ -struct so_map { /* Shared Object Map */ - caddr_t som_addr; /* Address at which object mapped */ - char *som_path; /* Path to mmap'ed file */ - struct so_map *som_next; /* Next map in chain */ - struct sod *som_sod; /* Sod responsible for this map */ - caddr_t som_sodbase; /* Base address of this sod */ - u_int som_write : 1; /* Text is currently writable */ - struct _dynamic *som_dynamic; /* _dynamic structure */ - caddr_t som_spd; /* Private data */ -}; - -/* - * Symbol description with size. This is simply an `nlist' with - * one field (nz_size) added. - * Used to convey size information on items in the data segment - * of shared objects. An array of these live in the shared object's - * text segment and is addressed by the `sdt_nzlist' field. - */ -struct nzlist { - struct nlist nlist; - u_long nz_size; -}; - -#define nz_un nlist.n_un -#define nz_strx nlist.n_un.n_strx -#define nz_name nlist.n_un.n_name -#define nz_type nlist.n_type -#define nz_value nlist.n_value -#define nz_desc nlist.n_desc -#define nz_other nlist.n_other - -/* - * The `section_dispatch_table' structure contains offsets to various data - * structures needed to do run-time relocation. - */ -struct section_dispatch_table { - struct so_map *sdt_loaded; /* List of loaded objects */ - long sdt_sods; /* List of shared objects descriptors */ - long sdt_paths; /* Library search paths */ - long sdt_got; /* Global offset table */ - long sdt_plt; /* Procedure linkage table */ - long sdt_rel; /* Relocation table */ - long sdt_hash; /* Symbol hash table */ - long sdt_nzlist; /* Symbol table itself */ - long sdt_filler2; /* Unused (was: stab_hash) */ - long sdt_buckets; /* Number of hash buckets */ - long sdt_strings; /* Symbol strings */ - long sdt_str_sz; /* Size of symbol strings */ - long sdt_text_sz; /* Size of text area */ - long sdt_plt_sz; /* Size of procedure linkage table */ -}; - -/* - * RRS symbol hash table, addressed by `sdt_hash' in section_dispatch_table. - * Used to quickly lookup symbols of the shared object by hashing - * on the symbol's name. `rh_symbolnum' is the index of the symbol - * in the shared object's symbol list (`sdt_nzlist'), `rh_next' is - * the next symbol in the hash bucket (in case of collisions). - */ -struct rrs_hash { - int rh_symbolnum; /* Symbol number */ - int rh_next; /* Next hash entry */ -}; - -/* - * `rt_symbols' is used to keep track of run-time allocated commons - * and data items copied from shared objects. - */ -struct rt_symbol { - struct nzlist *rt_sp; /* The symbol */ - struct rt_symbol *rt_next; /* Next in linear list */ - struct rt_symbol *rt_link; /* Next in bucket */ - caddr_t rt_srcaddr; /* Address of "master" copy */ - struct so_map *rt_smp; /* Originating map */ -}; - -/* - * Debugger interface structure. - */ -struct so_debug { - int dd_version; /* Version # of interface */ - int dd_in_debugger; /* Set when run by debugger */ - int dd_sym_loaded; /* Run-time linking brought more - symbols into scope */ - char *dd_bpt_addr; /* Address of rtld-generated bpt */ - int dd_bpt_shadow; /* Original contents of bpt */ - struct rt_symbol *dd_cc; /* Allocated commons/copied data */ -}; - -/* - * Version returned to crt0 from ld.so - */ -#define LDSO_VERSION_NONE 0 /* FreeBSD2.0, 2.0.5 */ -#define LDSO_VERSION_HAS_DLEXIT 1 /* includes dlexit in ld_entry */ -#define LDSO_VERSION_HAS_DLSYM3 2 /* includes 3-argument dlsym */ -#define LDSO_VERSION_HAS_DLADDR 3 /* includes dladdr in ld_entry */ - -/* - * Entry points into ld.so - user interface to the run-time linker. - * Entries are valid for the given version numbers returned by ld.so - * to crt0. - */ -struct ld_entry { - void *(*dlopen)(const char *, int); /* NONE */ - int (*dlclose)(void *); /* NONE */ - void *(*dlsym)(void *, const char *); /* NONE */ - const char *(*dlerror)(void); /* NONE */ - void (*dlexit)(void); /* HAS_DLEXIT */ - void *(*dlsym3)(void *, const char *, void *); /* HAS_DLSYM3 */ - int (*dladdr)(const void *, struct dl_info *); /* HAS_DLADDR */ -}; - -/* - * This is the structure pointed at by the __DYNAMIC symbol if an - * executable requires the attention of the run-time link editor. - * __DYNAMIC is given the value zero if no run-time linking needs to - * be done (it is always present in shared objects). - * The union `d_un' provides for different versions of the dynamic - * linking mechanism (switched on by `d_version'). The last version - * used by Sun is 3. We leave some room here and go to version number - * 8 for NetBSD, the main difference lying in the support for the - * `nz_list' type of symbols. - */ - -struct _dynamic { - int d_version; /* version # of this interface */ - struct so_debug *d_debug; - union { - struct section_dispatch_table *d_sdt; - } d_un; - struct ld_entry *d_entry; /* XXX */ -}; - -#define LD_VERSION_SUN (3) -#define LD_VERSION_BSD (8) -#define LD_VERSION_NZLIST_P(v) ((v) >= 8) - -#define LD_GOT(x) ((x)->d_un.d_sdt->sdt_got) -#define LD_PLT(x) ((x)->d_un.d_sdt->sdt_plt) -#define LD_REL(x) ((x)->d_un.d_sdt->sdt_rel) -#define LD_SYMBOL(x) ((x)->d_un.d_sdt->sdt_nzlist) -#define LD_HASH(x) ((x)->d_un.d_sdt->sdt_hash) -#define LD_STRINGS(x) ((x)->d_un.d_sdt->sdt_strings) -#define LD_NEED(x) ((x)->d_un.d_sdt->sdt_sods) -#define LD_BUCKETS(x) ((x)->d_un.d_sdt->sdt_buckets) -#define LD_PATHS(x) ((x)->d_un.d_sdt->sdt_paths) - -#define LD_GOTSZ(x) ((x)->d_un.d_sdt->sdt_plt - (x)->d_un.d_sdt->sdt_got) -#define LD_RELSZ(x) ((x)->d_un.d_sdt->sdt_hash - (x)->d_un.d_sdt->sdt_rel) -#define LD_HASHSZ(x) ((x)->d_un.d_sdt->sdt_nzlist - (x)->d_un.d_sdt->sdt_hash) -#define LD_STABSZ(x) ((x)->d_un.d_sdt->sdt_strings - (x)->d_un.d_sdt->sdt_nzlist) -#define LD_PLTSZ(x) ((x)->d_un.d_sdt->sdt_plt_sz) -#define LD_STRSZ(x) ((x)->d_un.d_sdt->sdt_str_sz) -#define LD_TEXTSZ(x) ((x)->d_un.d_sdt->sdt_text_sz) - -/* - * Interface to ld.so - */ -struct crt_ldso { - int crt_ba; /* Base address of ld.so */ - int crt_dzfd; /* "/dev/zero" file descriptor (SunOS) */ - int crt_ldfd; /* ld.so file descriptor */ - struct _dynamic *crt_dp; /* Main's __DYNAMIC */ - char **crt_ep; /* environment strings */ - caddr_t crt_bp; /* Breakpoint if run from debugger */ - char *crt_prog; /* Program name (v3) */ - char *crt_ldso; /* Link editor name (v4) */ - struct ld_entry *crt_ldentry; /* dl*() access (v4) */ - char **crt_argv; /* argument strings (v5) */ -}; - -/* - * Version passed from crt0 to ld.so (1st argument to _rtld()). - */ -#define CRT_VERSION_SUN 1 -#define CRT_VERSION_BSD_2 2 -#define CRT_VERSION_BSD_3 3 -#define CRT_VERSION_BSD_4 4 -#define CRT_VERSION_BSD_5 5 - -/* - * Maximum number of recognized shared object version numbers. - */ -#define MAXDEWEY 8 - -/* - * Header of the hints file. - */ -struct hints_header { - long hh_magic; -#define HH_MAGIC 011421044151 - long hh_version; /* Interface version number */ -#define LD_HINTS_VERSION_1 1 -#define LD_HINTS_VERSION_2 2 - long hh_hashtab; /* Location of hash table */ - long hh_nbucket; /* Number of buckets in hashtab */ - long hh_strtab; /* Location of strings */ - long hh_strtab_sz; /* Size of strings */ - long hh_ehints; /* End of hints (max offset in file) */ - long hh_dirlist; /* Colon-separated list of srch dirs */ -}; - -#define HH_BADMAG(hdr) ((hdr).hh_magic != HH_MAGIC) - -/* - * Hash table element in hints file. - */ -struct hints_bucket { - /* namex and pathx are indices into the string table */ - int hi_namex; /* Library name */ - int hi_pathx; /* Full path */ - int hi_dewey[MAXDEWEY]; /* The versions */ - int hi_ndewey; /* Number of version numbers */ -#define hi_major hi_dewey[0] -#define hi_minor hi_dewey[1] - int hi_next; /* Next in this bucket */ -}; - -#define _PATH_LD_HINTS "/var/run/ld.so.hints" - -#endif /* !__ELF__ */ - -#endif /* _LINK_H_ */ ==== //depot/projects/kse/include/monetary.h#2 (text+ko) ==== @@ -23,23 +23,23 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/monetary.h,v 1.5 2001/12/12 15:41:08 phantom Exp $ + * $FreeBSD: src/include/monetary.h,v 1.6 2002/08/21 16:19:55 mike Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 23 7: 5:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 288AF37B400; Fri, 23 Aug 2002 07:05:41 -0700 (PDT) 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 B9DFC37B401 for ; Fri, 23 Aug 2002 07:05:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31BE943E6E for ; Fri, 23 Aug 2002 07:05:40 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7NE5eJU067683 for ; Fri, 23 Aug 2002 07:05:40 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7NE5dOK067653 for perforce@freebsd.org; Fri, 23 Aug 2002 07:05:39 -0700 (PDT) Date: Fri, 23 Aug 2002 07:05:39 -0700 (PDT) Message-Id: <200208231405.g7NE5dOK067653@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 16462 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16462 Change 16462 by green@green_laptop_2 on 2002/08/23 07:04:41 * Don't grab Giant implicitly in mac_cred_mmapped_drop_perms(9). * Select a good default label (read: "equal") for tty devices. * Don't crhold(9) before calling crcopy(9) due to undocumented reference-count assertions. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#257 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#3 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.h#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#257 (text+ko) ==== @@ -202,8 +202,6 @@ static int mac_policy_unregister(struct mac_policy_conf *mpc); static int mac_stdcreatevnode_ea(struct vnode *vp); -void mac_cred_mmapped_drop_perms(struct thread *td, - struct ucred *cred); static void mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred, struct vm_map *map); @@ -2170,10 +2168,8 @@ { /* XXX freeze all other threads */ - mtx_lock(&Giant); mac_cred_mmapped_drop_perms_recurse(td, cred, &td->td_proc->p_vmspace->vm_map); - mtx_unlock(&Giant); /* XXX allow other threads to continue */ } @@ -3136,7 +3132,9 @@ crhold(newcred); PROC_UNLOCK(p); + mtx_lock(&Giant); mac_cred_mmapped_drop_perms(td, newcred); + mtx_unlock(&Giant); crfree(newcred); /* Free revocation reference. */ crfree(oldcred); ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#3 (text+ko) ==== @@ -743,7 +743,9 @@ if (strcmp(dev->si_name, "null") == 0 || strcmp(dev->si_name, "zero") == 0 || strcmp(dev->si_name, "random") == 0 || - strncmp(dev->si_name, "fd/", strlen("fd/")) == 0) + strcmp(dev->si_name, "ctty") == 0 || + strncmp(dev->si_name, "fd/", strlen("fd/")) == 0 || + strncmp(dev->si_name, "tty", strlen("tty")) == 0) biba_type = MAC_BIBA_TYPE_EQUAL; else biba_type = MAC_BIBA_TYPE_HIGH; @@ -2294,7 +2296,12 @@ if (subj->mac_biba.mb_flags & MAC_BIBA_FLAG_UPDATESUBJ) { mtx_unlock(&subj->mtx); newcred = crget(); - crhold(newcred); + /* + * Prevent a lock order reversal in + * mac_cred_mmapped_drop_perms; ideally, the other + * user of subj->mtx wouldn't be holding Giant. + */ + mtx_lock(&Giant); mtx_lock(&subj->mtx); /* * Check if we lost the race while allocating the cred. @@ -2304,12 +2311,14 @@ PROC_LOCK(p); oldcred = p->p_ucred; crcopy(newcred, oldcred); + crhold(newcred); mac_biba_copy(&subj->mac_biba, SLOT(&newcred->cr_label)); p->p_ucred = newcred; crfree(oldcred); PROC_UNLOCK(p); mac_cred_mmapped_drop_perms(curthread, newcred); out: + mtx_unlock(&Giant); crfree(newcred); } mtx_unlock(&subj->mtx); ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.h#2 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 23 8:34:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 786AE37B4EB; Fri, 23 Aug 2002 08:34:29 -0700 (PDT) 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 EB77637B432 for ; Fri, 23 Aug 2002 08:34:20 -0700 (PDT) Received: from mail.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E80243E65 for ; Fri, 23 Aug 2002 08:34:19 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 23841 invoked from network); 23 Aug 2002 15:34:19 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail14.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 23 Aug 2002 15:34:19 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g7NFYHBQ024949; Fri, 23 Aug 2002 11:34:17 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200208231405.g7NE5dOK067653@freefall.freebsd.org> Date: Fri, 23 Aug 2002 11:34:21 -0400 (EDT) From: John Baldwin To: Brian Feldman Subject: RE: PERFORCE change 16462 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 23-Aug-2002 Brian Feldman wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16462 > > Change 16462 by green@green_laptop_2 on 2002/08/23 07:04:41 > > * Don't grab Giant implicitly in mac_cred_mmapped_drop_perms(9). > * Select a good default label (read: "equal") for tty devices. > * Don't crhold(9) before calling crcopy(9) due to undocumented > reference-count assertions. Eh, crcopy() doesn't change the reference count. However, since we have to bump reference counts on things like uidinfo's, etc. it needs to ensure that you only do a crcopy() onto a "blank" ucred. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 23 9:32:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50A2F37B401; Fri, 23 Aug 2002 09:32:01 -0700 (PDT) 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 CC92037B400 for ; Fri, 23 Aug 2002 09:32:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8307043E42 for ; Fri, 23 Aug 2002 09:32:00 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7NGW0JU090524 for ; Fri, 23 Aug 2002 09:32:00 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7NGW0Gt090521 for perforce@freebsd.org; Fri, 23 Aug 2002 09:32:00 -0700 (PDT) Date: Fri, 23 Aug 2002 09:32:00 -0700 (PDT) Message-Id: <200208231632.g7NGW0Gt090521@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 16466 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16466 Change 16466 by green@green_laptop_2 on 2002/08/23 09:31:19 Add basic support for TrustedBSD/Lomac in ps(1), which should now work similarly for both versions of Lomac in the tree. Affected files ... .. //depot/projects/trustedbsd/mac/bin/ps/lomac.c#7 edit .. //depot/projects/trustedbsd/mac/include/Makefile#16 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/bin/ps/lomac.c#7 (text+ko) ==== @@ -43,6 +43,7 @@ __FBSDID("$FreeBSD: src/bin/ps/lomac.c,v 1.8 2002/07/10 20:44:55 dillon Exp $"); #include +#include #include #include @@ -57,7 +58,7 @@ #define LOMAC_DEVICE "/dev/lomac" -static int devlomac = -1; /* file descriptor for LOMAC_DEVICE */ +static int devlomac = -2; /* file descriptor for LOMAC_DEVICE */ /* lomac_start() * @@ -71,8 +72,10 @@ static void lomac_start(void) { - if ((devlomac = open(LOMAC_DEVICE, O_RDWR)) == -1) - err(1, "cannot open %s", LOMAC_DEVICE); + if ((devlomac = open(LOMAC_DEVICE, O_RDWR)) == -1 && + mac_is_present_np("lomac") != 1) + err(1, "cannot open %s or TrustedBSD/Lomac not loaded", + LOMAC_DEVICE); } /* lomac_stop() @@ -88,7 +91,7 @@ lomac_stop(void) { - if (devlomac != -1 && close(devlomac) == -1) + if (devlomac >= 0 && close(devlomac) == -1) err(1, "cannot close %s", LOMAC_DEVICE); } @@ -110,8 +113,21 @@ get_lattr(int pid) { - if (devlomac == -1) + if (devlomac == -2) lomac_start(); + if (devlomac == -1) { + struct mac_biba mb; + struct mac_pid_data mpd; + size_t datalen; + + strcpy(mpd.mpd_name, "trustedbsd_mac_lomac"); + mpd.mpd_data = (void *)&mb; + datalen = sizeof(mb); + mpd.mpd_datalen = &datalen; + if (mac_get_pid(pid, &mpd, 1) != 0) + err(1, "mac_get_pid"); + return (mb.mb_single.mbe_type); + } if (ioctl(devlomac, LIOGETPLEVEL, &pid) == -1) err(1, "ioctl"); return (pid); ==== //depot/projects/trustedbsd/mac/include/Makefile#16 (text+ko) ==== @@ -41,7 +41,7 @@ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ security/lomac security/mac_biba security/mac_bsdextended \ - security/mac_mls security/sebsd ufs/ffs ufs/ufs + security/mac_lomac security/mac_mls security/sebsd ufs/ffs ufs/ufs # For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/* # are taken care of ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#4 (text+ko) ==== @@ -486,7 +486,8 @@ goto out; } bzero(&subj->mac_biba, sizeof(subj->mac_biba)); - mac_biba_copy(objlabel, &subj->mac_biba); + mac_biba_copy_single(objlabel, &subj->mac_biba); + mac_biba_copy_single_to_range(objlabel, &subj->mac_biba); subj->mac_biba.mb_flags |= MAC_BIBA_FLAG_UPDATESUBJ; out: mtx_unlock(&subj->mtx); @@ -712,6 +713,27 @@ } static int +mac_lomac_externalize_pid(pid_t pid, struct ucred *cred, char *data, + size_t *datalenp) +{ + struct mac_biba *target = SLOT(&cred->cr_label); + size_t datalen; + int error; + + error = copyin(datalenp, &datalen, sizeof(datalen)); + if (error) + return (error); + if (datalen < sizeof(struct mac_biba)) + return (ENOMEM); + error = copyout(target, data, sizeof(*target)); + if (error == 0) { + datalen = sizeof(*target); + error = copyout(&datalen, datalenp, sizeof(datalen)); + } + return (error); +} + +static int mac_biba_internalize(struct label *label, struct mac *extmac) { struct mac_biba *mac_biba; @@ -2376,6 +2398,8 @@ (macop_t)mac_biba_destroy_vnode }, { MAC_EXTERNALIZE, (macop_t)mac_biba_externalize }, + { MAC_EXTERNALIZE_PID, + (macop_t)mac_lomac_externalize_pid }, { MAC_INTERNALIZE, (macop_t)mac_biba_internalize }, { MAC_CREATE_DEVFS_DEVICE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 23 18: 1: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B05F937B401; Fri, 23 Aug 2002 17:59:43 -0700 (PDT) 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 094CD37B400 for ; Fri, 23 Aug 2002 17:59:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C45F743E6A for ; Fri, 23 Aug 2002 17:59:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7O0xfJU084997 for ; Fri, 23 Aug 2002 17:59:41 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7O0xXbE084963 for perforce@freebsd.org; Fri, 23 Aug 2002 17:59:33 -0700 (PDT) Date: Fri, 23 Aug 2002 17:59:33 -0700 (PDT) Message-Id: <200208240059.g7O0xXbE084963@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16488 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16488 Change 16488 by peter@peter_daintree on 2002/08/23 17:58:58 IFC @16487 Affected files ... .. //depot/projects/ia64/Makefile.inc1#36 integrate .. //depot/projects/ia64/UPDATING#17 integrate .. //depot/projects/ia64/bin/cp/cp.1#4 integrate .. //depot/projects/ia64/bin/csh/USD.doc/csh.g#2 integrate .. //depot/projects/ia64/bin/df/df.1#3 integrate .. //depot/projects/ia64/bin/df/df.c#9 integrate .. //depot/projects/ia64/bin/ln/ln.1#5 integrate .. //depot/projects/ia64/bin/ln/symlink.7#5 integrate .. //depot/projects/ia64/bin/ls/ls.1#10 integrate .. //depot/projects/ia64/bin/mv/mv.1#6 integrate .. //depot/projects/ia64/bin/pax/ar_subs.c#5 integrate .. //depot/projects/ia64/bin/pax/buf_subs.c#5 integrate .. //depot/projects/ia64/bin/pax/cache.h#3 integrate .. //depot/projects/ia64/bin/pax/file_subs.c#5 integrate .. //depot/projects/ia64/bin/pax/ftree.c#5 integrate .. //depot/projects/ia64/bin/pax/options.c#6 integrate .. //depot/projects/ia64/bin/pax/pat_rep.c#5 integrate .. //depot/projects/ia64/bin/pax/pax.1#4 integrate .. //depot/projects/ia64/bin/pax/pax.c#5 integrate .. //depot/projects/ia64/bin/pax/pax.h#3 integrate .. //depot/projects/ia64/bin/pax/tables.h#3 integrate .. //depot/projects/ia64/bin/pax/tar.1#4 integrate .. //depot/projects/ia64/bin/pax/tar.c#5 integrate .. //depot/projects/ia64/bin/ps/ps.1#10 integrate .. //depot/projects/ia64/bin/rm/rm.1#4 integrate .. //depot/projects/ia64/bin/rm/rm.c#7 integrate .. //depot/projects/ia64/bin/sh/error.c#7 integrate .. //depot/projects/ia64/bin/sh/jobs.c#11 integrate .. //depot/projects/ia64/bin/sh/sh.1#14 integrate .. //depot/projects/ia64/bin/test/test.c#10 integrate .. //depot/projects/ia64/contrib/gcc/c-lex.c#4 integrate .. //depot/projects/ia64/crypto/telnet/libtelnet/pk.c#3 integrate .. //depot/projects/ia64/etc/rc#16 integrate .. //depot/projects/ia64/etc/rc.d/nfsd#5 integrate .. //depot/projects/ia64/etc/rc.network#16 integrate .. //depot/projects/ia64/include/arpa/inet.h#9 integrate .. //depot/projects/ia64/include/ctype.h#4 integrate .. //depot/projects/ia64/include/err.h#3 integrate .. //depot/projects/ia64/include/grp.h#7 integrate .. //depot/projects/ia64/include/inttypes.h#5 integrate .. //depot/projects/ia64/include/link.h#3 integrate .. //depot/projects/ia64/include/monetary.h#3 integrate .. //depot/projects/ia64/include/netdb.h#4 integrate .. //depot/projects/ia64/include/nlist.h#3 integrate .. //depot/projects/ia64/include/pwd.h#7 integrate .. //depot/projects/ia64/include/runetype.h#4 integrate .. //depot/projects/ia64/include/search.h#4 integrate .. //depot/projects/ia64/include/signal.h#4 integrate .. //depot/projects/ia64/include/stdbool.h#3 integrate .. //depot/projects/ia64/include/stddef.h#3 integrate .. //depot/projects/ia64/include/stdio.h#6 integrate .. //depot/projects/ia64/include/stdlib.h#10 integrate .. //depot/projects/ia64/include/string.h#6 integrate .. //depot/projects/ia64/include/strings.h#3 integrate .. //depot/projects/ia64/include/time.h#7 integrate .. //depot/projects/ia64/include/timeconv.h#2 integrate .. //depot/projects/ia64/include/unistd.h#9 integrate .. //depot/projects/ia64/include/utime.h#3 integrate .. //depot/projects/ia64/include/vis.h#3 integrate .. //depot/projects/ia64/include/wchar.h#6 integrate .. //depot/projects/ia64/include/wctype.h#4 integrate .. //depot/projects/ia64/lib/libc/gen/disklabel.c#6 integrate .. //depot/projects/ia64/lib/libc/gen/errlst.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/getcwd.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/vis.c#4 integrate .. //depot/projects/ia64/lib/libc/i386/gen/makecontext.c#2 integrate .. //depot/projects/ia64/lib/libc/ia64/sys/sbrk.S#2 integrate .. //depot/projects/ia64/lib/libc/locale/Makefile.inc#5 integrate .. //depot/projects/ia64/lib/libc/locale/isctype.c#3 integrate .. //depot/projects/ia64/lib/libc/locale/iswctype.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbrlen.3#1 branch .. //depot/projects/ia64/lib/libc/locale/mbrlen.c#1 branch .. //depot/projects/ia64/lib/libc/locale/mbrtowc.3#1 branch .. //depot/projects/ia64/lib/libc/locale/mbrtowc.c#1 branch .. //depot/projects/ia64/lib/libc/locale/mbsinit.3#1 branch .. //depot/projects/ia64/lib/libc/locale/mbsinit.c#1 branch .. //depot/projects/ia64/lib/libc/locale/mbsrtowcs.3#1 branch .. //depot/projects/ia64/lib/libc/locale/mbsrtowcs.c#1 branch .. //depot/projects/ia64/lib/libc/locale/runetype.c#3 integrate .. //depot/projects/ia64/lib/libc/locale/tolower.c#3 integrate .. //depot/projects/ia64/lib/libc/locale/toupper.c#3 integrate .. //depot/projects/ia64/lib/libc/locale/wcrtomb.3#1 branch .. //depot/projects/ia64/lib/libc/locale/wcrtomb.c#1 branch .. //depot/projects/ia64/lib/libc/locale/wcsrtombs.3#1 branch .. //depot/projects/ia64/lib/libc/locale/wcsrtombs.c#1 branch .. //depot/projects/ia64/lib/libc/locale/wcwidth.3#1 branch .. //depot/projects/ia64/lib/libc/locale/wcwidth.c#1 branch .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#5 integrate .. //depot/projects/ia64/lib/libc/net/inet.3#4 integrate .. //depot/projects/ia64/lib/libc/net/inet_ntop.c#5 integrate .. //depot/projects/ia64/lib/libc/rpc/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libc/stdio/asprintf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/fprintf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/local.h#4 integrate .. //depot/projects/ia64/lib/libc/stdio/printf.3#10 integrate .. //depot/projects/ia64/lib/libc/stdio/printf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/snprintf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/sprintf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/vasprintf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#9 integrate .. //depot/projects/ia64/lib/libc/stdio/vprintf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/vscanf.c#3 integrate .. //depot/projects/ia64/lib/libc/stdio/vsnprintf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/vsprintf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/vsscanf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#13 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtod.c#11 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoimax.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtol.3#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtol.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoll.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoq.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoul.3#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoul.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoull.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoumax.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtouq.c#4 integrate .. //depot/projects/ia64/lib/libc/stdtime/strftime.3#4 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.3#3 integrate .. //depot/projects/ia64/lib/libc/string/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libc/string/wcswidth.3#1 branch .. //depot/projects/ia64/lib/libc/string/wcswidth.c#4 integrate .. //depot/projects/ia64/lib/libc/sys/intro.2#4 integrate .. //depot/projects/ia64/lib/libc/xdr/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libdevinfo/devinfo.h#2 integrate .. //depot/projects/ia64/lib/libkvm/kvm.h#3 integrate .. //depot/projects/ia64/lib/libkvm/kvm_proc.c#7 integrate .. //depot/projects/ia64/lib/libncurses/Makefile#7 integrate .. //depot/projects/ia64/lib/libstand/stand.h#10 integrate .. //depot/projects/ia64/lib/libufs/libufs.h#2 integrate .. //depot/projects/ia64/lib/libutil/login_cap.h#5 integrate .. //depot/projects/ia64/libexec/comsat/comsat.8#4 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.8#5 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#10 integrate .. //depot/projects/ia64/libexec/rpc.rstatd/rstat_proc.c#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/ia64/reloc.c#7 integrate .. //depot/projects/ia64/libexec/rtld-elf/malloc.c#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#17 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#37 integrate .. //depot/projects/ia64/sbin/adjkerntz/adjkerntz.8#4 integrate .. //depot/projects/ia64/sbin/badsect/badsect.8#4 integrate .. //depot/projects/ia64/sbin/badsect/badsect.c#6 integrate .. //depot/projects/ia64/sbin/camcontrol/camcontrol.c#6 integrate .. //depot/projects/ia64/sbin/ccdconfig/ccdconfig.8#4 integrate .. //depot/projects/ia64/sbin/clri/clri.8#4 integrate .. //depot/projects/ia64/sbin/clri/clri.c#6 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.5#5 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.8#7 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.c#14 integrate .. //depot/projects/ia64/sbin/dmesg/dmesg.8#3 integrate .. //depot/projects/ia64/sbin/dmesg/dmesg.c#3 integrate .. //depot/projects/ia64/sbin/dump/Makefile#5 integrate .. //depot/projects/ia64/sbin/dump/dump.8#7 integrate .. //depot/projects/ia64/sbin/dump/dump.h#9 integrate .. //depot/projects/ia64/sbin/dump/main.c#9 integrate .. //depot/projects/ia64/sbin/dump/optr.c#8 integrate .. //depot/projects/ia64/sbin/dump/tape.c#8 integrate .. //depot/projects/ia64/sbin/dump/traverse.c#9 integrate .. //depot/projects/ia64/sbin/dumpfs/dumpfs.8#4 integrate .. //depot/projects/ia64/sbin/dumpon/dumpon.8#6 integrate .. //depot/projects/ia64/sbin/fdisk/fdisk.8#4 integrate .. //depot/projects/ia64/sbin/fdisk/fdisk.c#9 integrate .. //depot/projects/ia64/sbin/fdisk_pc98/fdisk.8#3 integrate .. //depot/projects/ia64/sbin/fdisk_pc98/fdisk.c#3 integrate .. //depot/projects/ia64/sbin/ffsinfo/ffsinfo.8#6 integrate .. //depot/projects/ia64/sbin/ffsinfo/ffsinfo.c#2 integrate .. //depot/projects/ia64/sbin/fsck/fsck.8#4 integrate .. //depot/projects/ia64/sbin/fsck/fsck.c#6 integrate .. //depot/projects/ia64/sbin/fsck/preen.c#3 integrate .. //depot/projects/ia64/sbin/fsck_ffs/SMM.doc/0.t#3 integrate .. //depot/projects/ia64/sbin/fsck_ffs/SMM.doc/1.t#3 integrate .. //depot/projects/ia64/sbin/fsck_ffs/SMM.doc/2.t#3 integrate .. //depot/projects/ia64/sbin/fsck_ffs/SMM.doc/3.t#3 integrate .. //depot/projects/ia64/sbin/fsck_ffs/SMM.doc/4.t#3 integrate .. //depot/projects/ia64/sbin/fsck_ffs/dir.c#7 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsck.h#7 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsck_ffs.8#3 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsutil.c#8 integrate .. //depot/projects/ia64/sbin/fsck_ffs/main.c#9 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass1.c#7 integrate .. //depot/projects/ia64/sbin/fsck_ffs/setup.c#9 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/boot.c#2 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/check.c#3 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/dosfs.h#2 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/ext.h#4 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/fat.c#3 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/fsck_msdosfs.8#5 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/main.c#4 integrate .. //depot/projects/ia64/sbin/fsdb/fsdb.8#6 integrate .. //depot/projects/ia64/sbin/fsdb/fsdb.c#8 integrate .. //depot/projects/ia64/sbin/fsirand/fsirand.8#4 integrate .. //depot/projects/ia64/sbin/fsirand/fsirand.c#4 integrate .. //depot/projects/ia64/sbin/growfs/debug.c#3 integrate .. //depot/projects/ia64/sbin/growfs/growfs.8#6 integrate .. //depot/projects/ia64/sbin/growfs/growfs.c#5 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#11 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.c#7 integrate .. //depot/projects/ia64/sbin/init/init.8#4 integrate .. //depot/projects/ia64/sbin/ip6fw/ip6fw.8#5 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/ia64/sbin/kldconfig/kldconfig.8#3 integrate .. //depot/projects/ia64/sbin/ldconfig/ldconfig.8#3 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.8#3 integrate .. //depot/projects/ia64/sbin/mdconfig/mdconfig.c#5 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.8#3 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.c#3 integrate .. //depot/projects/ia64/sbin/mknod/mknod.8#5 integrate .. //depot/projects/ia64/sbin/mount/getmntopts.3#2 integrate .. //depot/projects/ia64/sbin/mount/mount.8#7 integrate .. //depot/projects/ia64/sbin/mount/mount.c#6 integrate .. //depot/projects/ia64/sbin/mount_cd9660/mount_cd9660.8#5 integrate .. //depot/projects/ia64/sbin/mount_cd9660/mount_cd9660.c#4 integrate .. //depot/projects/ia64/sbin/mount_ext2fs/mount_ext2fs.8#4 integrate .. //depot/projects/ia64/sbin/mount_hpfs/mount_hpfs.8#4 integrate .. //depot/projects/ia64/sbin/mount_msdosfs/mount_msdosfs.8#4 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.8#5 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.c#7 integrate .. //depot/projects/ia64/sbin/mount_ntfs/mount_ntfs.8#5 integrate .. //depot/projects/ia64/sbin/mount_nullfs/mount_nullfs.8#4 integrate .. //depot/projects/ia64/sbin/mount_nwfs/mount_nwfs.8#6 integrate .. //depot/projects/ia64/sbin/mount_portalfs/mount_portalfs.8#3 integrate .. //depot/projects/ia64/sbin/mount_std/mount_std.8#5 integrate .. //depot/projects/ia64/sbin/mount_std/mount_std.c#7 integrate .. //depot/projects/ia64/sbin/mount_udf/mount_udf.8#3 integrate .. //depot/projects/ia64/sbin/mount_udf/mount_udf.c#5 integrate .. //depot/projects/ia64/sbin/mount_umapfs/mount_umapfs.8#4 integrate .. //depot/projects/ia64/sbin/mount_unionfs/mount_unionfs.8#3 integrate .. //depot/projects/ia64/sbin/newfs/mkfs.c#14 integrate .. //depot/projects/ia64/sbin/newfs/newfs.8#11 integrate .. //depot/projects/ia64/sbin/newfs/newfs.c#13 integrate .. //depot/projects/ia64/sbin/newfs/newfs.h#7 integrate .. //depot/projects/ia64/sbin/newfs_msdos/newfs_msdos.8#4 integrate .. //depot/projects/ia64/sbin/newfs_msdos/newfs_msdos.c#3 integrate .. //depot/projects/ia64/sbin/nfsiod/nfsiod.c#6 integrate .. //depot/projects/ia64/sbin/quotacheck/preen.c#2 integrate .. //depot/projects/ia64/sbin/quotacheck/quotacheck.8#4 integrate .. //depot/projects/ia64/sbin/quotacheck/quotacheck.c#6 integrate .. //depot/projects/ia64/sbin/reboot/boot_i386.8#7 integrate .. //depot/projects/ia64/sbin/reboot/reboot.8#6 integrate .. //depot/projects/ia64/sbin/restore/main.c#5 integrate .. //depot/projects/ia64/sbin/restore/restore.8#5 integrate .. //depot/projects/ia64/sbin/restore/restore.c#6 integrate .. //depot/projects/ia64/sbin/restore/restore.h#5 integrate .. //depot/projects/ia64/sbin/restore/symtab.c#4 integrate .. //depot/projects/ia64/sbin/routed/trace.c#2 integrate .. //depot/projects/ia64/sbin/savecore/savecore.8#5 integrate .. //depot/projects/ia64/sbin/shutdown/shutdown.8#4 integrate .. //depot/projects/ia64/sbin/swapon/swapon.8#3 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.8#9 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.c#5 integrate .. //depot/projects/ia64/sbin/umount/umount.8#3 integrate .. //depot/projects/ia64/sbin/umount/umount.c#4 integrate .. //depot/projects/ia64/sbin/vinum/v.c#3 integrate .. //depot/projects/ia64/sbin/vinum/vinum.8#6 integrate .. //depot/projects/ia64/share/dict/README#4 integrate .. //depot/projects/ia64/share/man/man4/Makefile#14 integrate .. //depot/projects/ia64/share/man/man4/man4.i386/cy.4#3 integrate .. //depot/projects/ia64/share/man/man4/netintro.4#5 integrate .. //depot/projects/ia64/share/man/man4/ng_l2tp.4#1 branch .. //depot/projects/ia64/share/man/man4/tcp.4#5 integrate .. //depot/projects/ia64/share/man/man4/uhid.4#3 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#14 integrate .. //depot/projects/ia64/share/man/man7/tuning.7#11 integrate .. //depot/projects/ia64/share/man/man8/rc.8#5 integrate .. //depot/projects/ia64/share/man/man9/ifnet.9#3 integrate .. //depot/projects/ia64/share/man/man9/style.9#12 integrate .. //depot/projects/ia64/share/man/man9/zero_copy.9#2 integrate .. //depot/projects/ia64/share/misc/Makefile#3 integrate .. //depot/projects/ia64/share/misc/iso3166#4 integrate .. //depot/projects/ia64/share/misc/latin1#1 branch .. //depot/projects/ia64/share/misc/pci_vendors#12 integrate .. //depot/projects/ia64/share/mk/bsd.man.mk#7 integrate .. //depot/projects/ia64/share/syscons/fonts/INDEX.fonts#5 integrate .. //depot/projects/ia64/share/termcap/termcap.src#6 integrate .. //depot/projects/ia64/sys/alpha/alpha/api_up1000.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_1000a.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a50.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a500.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_axppci_33.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_eb164.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_eb64plus.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_kn20aa.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_kn300.c#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_st550.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/dec_st6600.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#8 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#14 integrate .. //depot/projects/ia64/sys/alpha/include/_types.h#1 branch .. //depot/projects/ia64/sys/alpha/include/ansi.h#10 integrate .. //depot/projects/ia64/sys/alpha/include/endian.h#6 integrate .. //depot/projects/ia64/sys/alpha/include/stdarg.h#3 integrate .. //depot/projects/ia64/sys/alpha/include/types.h#4 delete .. //depot/projects/ia64/sys/alpha/include/varargs.h#3 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#9 integrate .. //depot/projects/ia64/sys/arm/include/_types.h#1 branch .. //depot/projects/ia64/sys/arm/include/ansi.h#8 integrate .. //depot/projects/ia64/sys/arm/include/types.h#5 delete .. //depot/projects/ia64/sys/boot/ficl/loader.c#4 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/ia64/sys/boot/libstand/Makefile#1 branch .. //depot/projects/ia64/sys/boot/libstand/__main.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/alpha/_setjmp.S#1 branch .. //depot/projects/ia64/sys/boot/libstand/arp.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/assert.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/bcd.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/bootp.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/bootp.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/bootparam.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/bootparam.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/bswap.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/bzipfs.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/bzlib.c.diff#1 branch .. //depot/projects/ia64/sys/boot/libstand/bzlib.h.diff#1 branch .. //depot/projects/ia64/sys/boot/libstand/bzlib_private.h.diff#1 branch .. //depot/projects/ia64/sys/boot/libstand/cd9660.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/close.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/closeall.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/dev.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/dosfs.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/dosfs.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/environment.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/ether.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/ext2fs.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/fstat.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/getopt.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/gets.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/globals.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/i386/_setjmp.S#1 branch .. //depot/projects/ia64/sys/boot/libstand/if_ether.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/in_cksum.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/inet_ntoa.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/ioctl.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/iodesc.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/libstand.3#1 branch .. //depot/projects/ia64/sys/boot/libstand/lseek.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/net.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/net.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/netif.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/netif.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/nfs.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/nfsv2.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/nullfs.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/open.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/pager.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/powerpc/_setjmp.S#1 branch .. //depot/projects/ia64/sys/boot/libstand/printf.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/qdivrem.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/quad.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/random.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/rarp.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/read.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/readdir.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/rpc.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/rpc.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/rpcv2.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/saioctl.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/sbrk.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/sparc64/_setjmp.S#1 branch .. //depot/projects/ia64/sys/boot/libstand/splitfs.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/stand.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/stat.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/strcasecmp.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/strdup.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/strerror.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/strtol.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/tftp.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/tftp.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/twiddle.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/udp.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/ufs.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/write.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/zalloc.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/zalloc_defs.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/zalloc_malloc.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/zalloc_mem.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/zalloc_protos.h#1 branch .. //depot/projects/ia64/sys/boot/libstand/zipfs.c#1 branch .. //depot/projects/ia64/sys/boot/libstand/zutil.h.diff#1 branch .. //depot/projects/ia64/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/ia64/sys/cam/cam_extend.c#2 delete .. //depot/projects/ia64/sys/cam/cam_extend.h#2 delete .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#15 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_target.c#2 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#6 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#10 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#9 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#6 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_filio.c#5 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#9 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sockio.c#3 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_stream.c#6 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_termios.c#3 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_ttold.c#3 integrate .. //depot/projects/ia64/sys/conf/NOTES#20 integrate .. //depot/projects/ia64/sys/conf/files#37 integrate .. //depot/projects/ia64/sys/conf/files.alpha#10 integrate .. //depot/projects/ia64/sys/conf/files.i386#15 integrate .. //depot/projects/ia64/sys/conf/files.ia64#14 integrate .. //depot/projects/ia64/sys/conf/files.pc98#12 integrate .. //depot/projects/ia64/sys/conf/files.x86_64#3 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#18 integrate .. //depot/projects/ia64/sys/conf/majors#8 integrate .. //depot/projects/ia64/sys/conf/options#26 integrate .. //depot/projects/ia64/sys/conf/options.alpha#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_frag.c#5 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#7 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#8 integrate .. //depot/projects/ia64/sys/dev/asr/asr.c#7 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-all.c#9 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus.c#6 integrate .. //depot/projects/ia64/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/ia64/sys/dev/digi/digi_isa.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/drm_drv.h#3 integrate .. //depot/projects/ia64/sys/dev/eisa/eisaconf.h#3 integrate .. //depot/projects/ia64/sys/dev/em/README#3 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#9 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#6 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.h#3 integrate .. //depot/projects/ia64/sys/dev/em/if_em_osdep.h#6 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/ia64/sys/dev/gx/if_gx.c#5 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_buffer.c#4 integrate .. //depot/projects/ia64/sys/dev/isp/isp.c#10 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#8 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#11 integrate .. //depot/projects/ia64/sys/dev/isp/isp_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/isp/ispmbox.h#7 integrate .. //depot/projects/ia64/sys/dev/isp/ispvar.h#8 integrate .. //depot/projects/ia64/sys/dev/kbd/atkbdc.c#5 integrate .. //depot/projects/ia64/sys/dev/md/md.c#12 integrate .. //depot/projects/ia64/sys/dev/mii/mii.c#5 integrate .. //depot/projects/ia64/sys/dev/mly/mly.c#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_debug.c#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.c#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.h#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/nsp/nsp.c#4 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#6 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#12 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbvar.h#6 integrate .. //depot/projects/ia64/sys/dev/pci/pcivar.h#5 integrate .. //depot/projects/ia64/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/ia64/sys/dev/pst/pst-iop.h#2 integrate .. //depot/projects/ia64/sys/dev/pst/pst-raid.c#2 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ich.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/pci/ich.h#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/via8233.c#1 branch .. //depot/projects/ia64/sys/dev/sound/pci/via8233.h#1 branch .. //depot/projects/ia64/sys/dev/sound/pci/via82c686.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pci/via82c686.h#3 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/ac97.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/ac97.h#3 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/channel.c#6 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/ia64/sys/dev/syscons/schistory.c#2 integrate .. //depot/projects/ia64/sys/dev/syscons/scmouse.c#4 integrate .. //depot/projects/ia64/sys/dev/syscons/scvtb.c#2 integrate .. //depot/projects/ia64/sys/dev/syscons/syscons.c#10 integrate .. //depot/projects/ia64/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/twe/twe.c#3 integrate .. //depot/projects/ia64/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/ia64/sys/dev/tx/if_txvar.h#2 integrate .. //depot/projects/ia64/sys/dev/usb/ohci.c#11 integrate .. //depot/projects/ia64/sys/dev/usb/ulpt.c#6 integrate .. //depot/projects/ia64/sys/dev/usb/usbdi_util.c#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumdaemon.c#3 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#6 integrate .. //depot/projects/ia64/sys/dev/vx/if_vx.c#4 integrate .. //depot/projects/ia64/sys/dev/wi/if_wavelan_ieee.h#8 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#22 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#8 integrate .. //depot/projects/ia64/sys/dev/wi/if_wivar.h#10 integrate .. //depot/projects/ia64/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#11 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_denode.c#6 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_ioctl.c#5 integrate .. //depot/projects/ia64/sys/fs/udf/osta.c#2 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vnops.c#7 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_lookup.c#7 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_vnops.c#9 integrate .. //depot/projects/ia64/sys/i386/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_wakeup.c#8 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#18 integrate .. //depot/projects/ia64/sys/i386/conf/NEWCARD#8 delete .. //depot/projects/ia64/sys/i386/conf/NEWCARD.hints#3 delete .. //depot/projects/ia64/sys/i386/conf/OLDCARD#5 integrate .. //depot/projects/ia64/sys/i386/i386/busdma_machdep.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#18 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_fcntl.c#4 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_ioctl.c#5 integrate .. //depot/projects/ia64/sys/i386/include/_types.h#1 branch .. //depot/projects/ia64/sys/i386/include/ansi.h#10 integrate .. //depot/projects/ia64/sys/i386/include/endian.h#6 integrate .. //depot/projects/ia64/sys/i386/include/nexusvar.h#2 integrate .. //depot/projects/ia64/sys/i386/include/stdarg.h#4 integrate .. //depot/projects/ia64/sys/i386/include/types.h#6 delete .. //depot/projects/ia64/sys/i386/include/varargs.h#3 integrate .. //depot/projects/ia64/sys/i386/isa/apic_vector.s#5 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#16 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#11 integrate .. //depot/projects/ia64/sys/ia64/include/_types.h#1 branch .. //depot/projects/ia64/sys/ia64/include/ansi.h#10 integrate .. //depot/projects/ia64/sys/ia64/include/endian.h#5 integrate .. //depot/projects/ia64/sys/ia64/include/nexusvar.h#2 integrate .. //depot/projects/ia64/sys/ia64/include/stdarg.h#4 integrate .. //depot/projects/ia64/sys/ia64/include/types.h#4 delete .. //depot/projects/ia64/sys/ia64/include/varargs.h#3 integrate .. //depot/projects/ia64/sys/kern/imgact_aout.c#10 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#15 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_acct.c#10 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#28 integrate .. //depot/projects/ia64/sys/kern/kern_event.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_ktrace.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_linker.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#2 integrate .. //depot/projects/ia64/sys/kern/kern_poll.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_time.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_uuid.c#6 integrate .. //depot/projects/ia64/sys/kern/link_aout.c#5 integrate .. //depot/projects/ia64/sys/kern/link_elf.c#7 integrate .. //depot/projects/ia64/sys/kern/subr_disk.c#7 integrate .. //depot/projects/ia64/sys/kern/subr_mbuf.c#12 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#11 integrate .. //depot/projects/ia64/sys/kern/sys_generic.c#16 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#19 integrate .. //depot/projects/ia64/sys/kern/sys_socket.c#8 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#13 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#14 integrate .. //depot/projects/ia64/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/ia64/sys/kern/tty_tty.c#5 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#17 integrate .. //depot/projects/ia64/sys/kern/uipc_socket2.c#16 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#18 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#17 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#20 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#24 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#17 integrate .. //depot/projects/ia64/sys/kern/vnode_if.src#7 integrate .. //depot/projects/ia64/sys/libkern/bcmp.c#2 integrate .. //depot/projects/ia64/sys/libkern/ffs.c#2 integrate .. //depot/projects/ia64/sys/libkern/strcat.c#2 integrate .. //depot/projects/ia64/sys/libkern/strcmp.c#2 integrate .. //depot/projects/ia64/sys/libkern/strcpy.c#2 integrate .. //depot/projects/ia64/sys/libkern/strlen.c#2 integrate .. //depot/projects/ia64/sys/libkern/strncmp.c#2 integrate .. //depot/projects/ia64/sys/libkern/strncpy.c#2 integrate .. //depot/projects/ia64/sys/modules/Makefile#17 integrate .. //depot/projects/ia64/sys/modules/cam/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/netgraph/l2tp/Makefile#1 branch .. //depot/projects/ia64/sys/modules/osf1/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/sound/driver/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/sound/driver/via8233/Makefile#1 branch .. //depot/projects/ia64/sys/net/if.c#12 integrate .. //depot/projects/ia64/sys/net/if.h#7 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#13 integrate .. //depot/projects/ia64/sys/net/if_iso88025subr.c#4 integrate .. //depot/projects/ia64/sys/net/if_ppp.c#7 integrate .. //depot/projects/ia64/sys/net/if_tap.c#10 integrate .. //depot/projects/ia64/sys/net/if_var.h#9 integrate .. //depot/projects/ia64/sys/net/rtsock.c#10 integrate .. //depot/projects/ia64/sys/netatalk/aarp.c#3 integrate .. //depot/projects/ia64/sys/netatalk/ddp_input.c#6 integrate .. //depot/projects/ia64/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/ia64/sys/netatm/atm_if.c#5 integrate .. //depot/projects/ia64/sys/netgraph/netgraph.h#3 integrate .. //depot/projects/ia64/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/ia64/sys/netgraph/ng_cisco.c#4 integrate .. //depot/projects/ia64/sys/netgraph/ng_ksocket.c#7 integrate .. //depot/projects/ia64/sys/netgraph/ng_l2tp.c#1 branch .. //depot/projects/ia64/sys/netgraph/ng_l2tp.h#1 branch .. //depot/projects/ia64/sys/netgraph/ng_mppc.c#4 integrate .. //depot/projects/ia64/sys/netgraph/ng_pppoe.c#8 integrate .. //depot/projects/ia64/sys/netgraph/ng_socket.c#9 integrate .. //depot/projects/ia64/sys/netinet/in.h#12 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#17 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.h#11 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#8 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.h#6 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/ia64/sys/netinet/ip_var.h#7 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#14 integrate .. //depot/projects/ia64/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/ia64/sys/netinet/tcp_debug.h#2 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#20 integrate .. //depot/projects/ia64/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#19 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.h#5 integrate .. //depot/projects/ia64/sys/netinet/tcp_usrreq.c#10 integrate .. //depot/projects/ia64/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#17 integrate .. //depot/projects/ia64/sys/netinet6/in6.h#8 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.c#10 integrate .. //depot/projects/ia64/sys/netinet6/in6_pcb.h#4 integrate .. //depot/projects/ia64/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/ia64/sys/netinet6/ip6_mroute.c#7 integrate .. //depot/projects/ia64/sys/netinet6/ip6_output.c#7 integrate .. //depot/projects/ia64/sys/netinet6/udp6_usrreq.c#12 integrate .. //depot/projects/ia64/sys/nfsclient/bootp_subr.c#8 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_lock.c#8 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_lock.h#4 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC#17 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98kbd.c#2 integrate .. //depot/projects/ia64/sys/pc98/pc98/scvtbpc98.c#3 integrate .. //depot/projects/ia64/sys/pc98/pc98/syscons.c#8 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#13 integrate .. //depot/projects/ia64/sys/pci/if_pcn.c#6 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#13 integrate .. //depot/projects/ia64/sys/pci/if_sf.c#5 integrate .. //depot/projects/ia64/sys/pci/if_sis.c#10 integrate .. //depot/projects/ia64/sys/pci/if_sk.c#7 integrate .. //depot/projects/ia64/sys/pci/if_ste.c#6 integrate .. //depot/projects/ia64/sys/pci/if_stereg.h#3 integrate .. //depot/projects/ia64/sys/pci/if_ti.c#10 integrate .. //depot/projects/ia64/sys/pci/if_tl.c#5 integrate .. //depot/projects/ia64/sys/pci/if_vr.c#7 integrate .. //depot/projects/ia64/sys/pci/if_vrreg.h#3 integrate .. //depot/projects/ia64/sys/pci/if_wb.c#6 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#7 integrate .. //depot/projects/ia64/sys/pci/ohci_pci.c#4 integrate .. //depot/projects/ia64/sys/pci/uhci_pci.c#6 integrate .. //depot/projects/ia64/sys/powerpc/include/_types.h#1 branch .. //depot/projects/ia64/sys/powerpc/include/ansi.h#10 integrate .. //depot/projects/ia64/sys/powerpc/include/endian.h#6 integrate .. //depot/projects/ia64/sys/powerpc/include/stdarg.h#3 integrate .. //depot/projects/ia64/sys/powerpc/include/types.h#5 delete .. //depot/projects/ia64/sys/powerpc/include/varargs.h#3 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#8 integrate .. //depot/projects/ia64/sys/security/lomac/kernel_util.c#7 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/ia64/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/ia64/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/ia64/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/ia64/sys/sparc64/conf/GENERIC#19 integrate .. //depot/projects/ia64/sys/sparc64/include/_types.h#1 branch .. //depot/projects/ia64/sys/sparc64/include/ansi.h#10 integrate .. //depot/projects/ia64/sys/sparc64/include/asmacros.h#8 integrate .. //depot/projects/ia64/sys/sparc64/include/bus.h#5 integrate .. //depot/projects/ia64/sys/sparc64/include/endian.h#7 integrate .. //depot/projects/ia64/sys/sparc64/include/pcb.h#4 integrate .. //depot/projects/ia64/sys/sparc64/include/pcpu.h#5 integrate .. //depot/projects/ia64/sys/sparc64/include/pmap.h#8 integrate .. //depot/projects/ia64/sys/sparc64/include/signal.h#2 integrate .. //depot/projects/ia64/sys/sparc64/include/stdarg.h#3 integrate .. //depot/projects/ia64/sys/sparc64/include/tlb.h#9 integrate .. //depot/projects/ia64/sys/sparc64/include/tsb.h#7 integrate .. //depot/projects/ia64/sys/sparc64/include/tte.h#6 integrate .. //depot/projects/ia64/sys/sparc64/include/types.h#4 delete .. //depot/projects/ia64/sys/sparc64/include/varargs.h#3 integrate .. //depot/projects/ia64/sys/sparc64/sbus/sbusvar.h#2 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#14 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#17 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_machdep.c#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#20 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/tlb.c#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#14 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/tsb.c#9 integrate .. //depot/projects/ia64/sys/sys/_timespec.h#2 integrate .. //depot/projects/ia64/sys/sys/_types.h#4 integrate .. //depot/projects/ia64/sys/sys/consio.h#5 integrate .. //depot/projects/ia64/sys/sys/dirent.h#2 integrate .. //depot/projects/ia64/sys/sys/disklabel.h#15 integrate .. //depot/projects/ia64/sys/sys/errno.h#6 integrate .. //depot/projects/ia64/sys/sys/file.h#10 integrate .. //depot/projects/ia64/sys/sys/link_aout.h#1 branch .. //depot/projects/ia64/sys/sys/link_elf.h#1 branch .. //depot/projects/ia64/sys/sys/mac.h#3 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#2 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#9 integrate .. //depot/projects/ia64/sys/sys/mman.h#3 integrate .. //depot/projects/ia64/sys/sys/mount.h#15 integrate .. //depot/projects/ia64/sys/sys/msg.h#3 integrate .. //depot/projects/ia64/sys/sys/nlist_aout.h#1 branch .. //depot/projects/ia64/sys/sys/pcpu.h#6 integrate .. //depot/projects/ia64/sys/sys/proc.h#25 integrate .. //depot/projects/ia64/sys/sys/protosw.h#4 integrate .. //depot/projects/ia64/sys/sys/sbuf.h#4 integrate .. //depot/projects/ia64/sys/sys/signal.h#6 integrate .. //depot/projects/ia64/sys/sys/socket.h#8 integrate .. //depot/projects/ia64/sys/sys/socketvar.h#21 integrate .. //depot/projects/ia64/sys/sys/stat.h#7 integrate .. //depot/projects/ia64/sys/sys/statvfs.h#2 integrate .. //depot/projects/ia64/sys/sys/stdint.h#4 integrate .. //depot/projects/ia64/sys/sys/syscall.h#13 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#13 integrate .. //depot/projects/ia64/sys/sys/syslog.h#3 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#15 integrate .. //depot/projects/ia64/sys/sys/systm.h#17 integrate .. //depot/projects/ia64/sys/sys/times.h#3 integrate .. //depot/projects/ia64/sys/sys/timespec.h#2 integrate .. //depot/projects/ia64/sys/sys/types.h#14 integrate .. //depot/projects/ia64/sys/sys/ucred.h#12 integrate .. //depot/projects/ia64/sys/sys/un.h#5 integrate .. //depot/projects/ia64/sys/sys/vnode.h#18 integrate .. //depot/projects/ia64/sys/tools/makeobjops.awk#2 integrate .. //depot/projects/ia64/sys/tools/vnode_if.awk#5 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#8 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_lookup.c#8 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#16 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#21 integrate .. //depot/projects/ia64/sys/x86_64/include/_types.h#1 branch .. //depot/projects/ia64/sys/x86_64/include/ansi.h#3 integrate .. //depot/projects/ia64/sys/x86_64/include/endian.h#2 integrate .. //depot/projects/ia64/sys/x86_64/include/stdarg.h#2 integrate .. //depot/projects/ia64/sys/x86_64/include/types.h#2 delete .. //depot/projects/ia64/tools/regression/README#6 integrate .. //depot/projects/ia64/tools/regression/sysvmsg/Makefile#1 branch .. //depot/projects/ia64/tools/regression/sysvmsg/README#1 branch .. //depot/projects/ia64/tools/regression/sysvmsg/msgtest.c#1 branch .. //depot/projects/ia64/tools/regression/sysvsem/Makefile#1 branch .. //depot/projects/ia64/tools/regression/sysvsem/README#1 branch .. //depot/projects/ia64/tools/regression/sysvsem/semtest.c#1 branch .. //depot/projects/ia64/tools/regression/sysvshm/Makefile#1 branch .. //depot/projects/ia64/tools/regression/sysvshm/README#1 branch .. //depot/projects/ia64/tools/regression/sysvshm/shmtest.c#1 branch .. //depot/projects/ia64/usr.bin/basename/basename.c#6 integrate .. //depot/projects/ia64/usr.bin/biff/biff.1#7 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#17 integrate .. //depot/projects/ia64/usr.bin/chat/chat.c#3 integrate .. //depot/projects/ia64/usr.bin/chflags/chflags.c#5 integrate .. //depot/projects/ia64/usr.bin/col/col.c#5 integrate .. //depot/projects/ia64/usr.bin/colcrt/colcrt.c#5 integrate .. //depot/projects/ia64/usr.bin/colldef/colldef.1#3 integrate .. //depot/projects/ia64/usr.bin/colldef/parse.y#7 integrate .. //depot/projects/ia64/usr.bin/colldef/scan.l#6 integrate .. //depot/projects/ia64/usr.bin/cut/cut.c#6 integrate .. //depot/projects/ia64/usr.bin/find/find.1#9 integrate .. //depot/projects/ia64/usr.bin/find/option.c#5 integrate .. //depot/projects/ia64/usr.bin/hesinfo/hesinfo.c#6 integrate .. //depot/projects/ia64/usr.bin/id/id.c#4 integrate .. //depot/projects/ia64/usr.bin/login/login.c#12 integrate .. //depot/projects/ia64/usr.bin/make/nonints.h#6 integrate .. //depot/projects/ia64/usr.bin/make/parse.c#8 integrate .. //depot/projects/ia64/usr.bin/mklocale/lex.l#3 integrate .. //depot/projects/ia64/usr.bin/mklocale/mklocale.1#2 integrate .. //depot/projects/ia64/usr.bin/msgs/msgs.c#5 integrate .. //depot/projects/ia64/usr.bin/nl/nl.c#4 integrate .. //depot/projects/ia64/usr.bin/perl/pathnames.h#1 branch .. //depot/projects/ia64/usr.bin/perl/perl.c#3 integrate .. //depot/projects/ia64/usr.bin/rpcinfo/rpcinfo.c#4 integrate .. //depot/projects/ia64/usr.bin/stat/stat.c#3 integrate .. //depot/projects/ia64/usr.bin/talk/talk.c#5 integrate .. //depot/projects/ia64/usr.bin/touch/touch.c#5 integrate .. //depot/projects/ia64/usr.bin/unifdef/unifdef.c#6 integrate .. //depot/projects/ia64/usr.bin/w/w.c#6 integrate .. //depot/projects/ia64/usr.bin/whereis/pathnames.h#3 integrate .. //depot/projects/ia64/usr.bin/whereis/whereis.1#4 integrate .. //depot/projects/ia64/usr.bin/whereis/whereis.c#3 integrate .. //depot/projects/ia64/usr.sbin/getextattr/getextattr.c#6 integrate .. //depot/projects/ia64/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/ia64/usr.sbin/kernbb/kernbb.c#2 integrate .. //depot/projects/ia64/usr.sbin/mrouted/config.c#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/prompt.h#2 integrate .. //depot/projects/ia64/usr.sbin/rpc.lockd/kern.c#6 integrate .. //depot/projects/ia64/usr.sbin/vidcontrol/vidcontrol.1#7 integrate .. //depot/projects/ia64/usr.sbin/vidcontrol/vidcontrol.c#5 integrate .. //depot/projects/ia64/usr.sbin/vipw/vipw.c#4 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#36 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.302 2002/08/08 15:43:23 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.303 2002/08/23 12:49:16 johan Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -593,7 +593,8 @@ usr.bin/xargs usr.bin/xinstall \ usr.sbin/config usr.sbin/kbdcontrol \ gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo - cd ${.CURDIR}/${_tool}; \ + ${ECHODIR} "===> ${_tool}"; \ + cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ${MAKE} DIRPRFX=${_tool}/ depend; \ ${MAKE} DIRPRFX=${_tool}/ all; \ @@ -630,7 +631,8 @@ .for _tool in bin/csh bin/sh ${_games} gnu/usr.bin/cc/cc_tools ${_fortran} \ ${_libroken4} ${_libkrb5} lib/libncurses ${_share} \ usr.bin/awk usr.bin/file usr.sbin/sysinstall - cd ${.CURDIR}/${_tool}; ${MAKE} DIRPRFX=${_tool}/ build-tools + ${ECHODIR} "===> ${_tool}"; \ + cd ${.CURDIR}/${_tool}; ${MAKE} DIRPRFX=${_tool}/ build-tools .endfor # @@ -654,7 +656,8 @@ .for _tool in ${_btxld} ${_elf2aout} ${_elf2exe} \ gnu/usr.bin/binutils usr.bin/objformat usr.sbin/crunch/crunchide \ gnu/usr.bin/cc ${_xlint} - cd ${.CURDIR}/${_tool}; \ + ${ECHODIR} "===> ${_tool}"; \ + cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ${MAKE} DIRPRFX=${_tool}/ depend; \ ${MAKE} DIRPRFX=${_tool}/ all; \ @@ -740,7 +743,8 @@ .for _lib in ${_startup_libs} ${_prebuild_libs} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) - cd ${.CURDIR}/${_lib}; \ + ${ECHODIR} "===> ${_lib}"; \ + cd ${.CURDIR}/${_lib}; \ ${MAKE} DIRPRFX=${_lib}/ depend; \ ${MAKE} DIRPRFX=${_lib}/ all; \ ${MAKE} DIRPRFX=${_lib}/ install ==== //depot/projects/ia64/UPDATING#17 (text+ko) ==== @@ -22,6 +22,11 @@ integrity. Re-enabling write caching can substantially improve performance. +20020815: + A "bug" in gcc(1) that was hiding warning in system headers was + fixed. It's probably time to add -DNO_WERROR to your make line + again. + 20020729: COPY is being deprecated. The 20010530 change was reverted, as it causes far more pain than was expected, and to always compare @@ -1057,4 +1062,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.214 2002/07/29 08:51:03 ru Exp $ +$FreeBSD: src/UPDATING,v 1.215 2002/08/15 08:51:24 ru Exp $ ==== //depot/projects/ia64/bin/cp/cp.1#4 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)cp.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/cp/cp.1,v 1.24 2002/08/09 10:38:34 ru Exp $ +.\" $FreeBSD: src/bin/cp/cp.1,v 1.25 2002/08/16 03:13:59 johan Exp $ .\" -.Dd April 18, 1994 +.Dd July 23, 2002 .Dt CP 1 .Os .Sh NAME ==== //depot/projects/ia64/bin/csh/USD.doc/csh.g#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)csh.g 8.1 (Berkeley) 6/8/93 -.\" $FreeBSD: src/bin/csh/USD.doc/csh.g,v 1.5 1999/08/27 23:13:56 peter Exp $ +.\" $FreeBSD: src/bin/csh/USD.doc/csh.g,v 1.6 2002/08/21 17:32:29 trhodes Exp $ .\" .SH Glossary @@ -1181,7 +1181,7 @@ which begin with the character `/' are interpreted relative to the .I root -directory in the filesystem. +directory in the file system. Other .I pathnames are interpreted relative to the current directory ==== //depot/projects/ia64/bin/df/df.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.26 2002/04/16 20:00:45 charnier Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.27 2002/08/21 17:32:31 trhodes Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -46,19 +46,19 @@ .Oc .Op Fl ailn .Op Fl t Ar type -.Op Ar file | filesystem ... +.Op Ar file | file system ... .Sh DESCRIPTION The .Nm utility displays statistics about the amount of free disk space on the specified -.Ar filesystem -or on the filesystem of which +.Ar file system +or on the file system of which .Ar file is a part. Values are displayed in 512-byte per block counts. -If neither a file or a filesystem operand is specified, -statistics for all mounted filesystems are displayed +If neither a file or a file system operand is specified, +statistics for all mounted file systems are displayed (subject to the .Fl t option below). @@ -94,20 +94,20 @@ .Ev BLOCKSIZE specification from the environment. .It Fl l -Only display information about locally-mounted filesystems. +Only display information about locally-mounted file systems. .It Fl m Use 1048576-byte (1-Mbyte) blocks rather than the default. Note that this overrides the .Ev BLOCKSIZE specification from the environment. .It Fl n -Print out the previously obtained statistics from the filesystems. +Print out the previously obtained statistics from the file systems. This option should be used if it is possible that one or more -filesystems are in a state such that they will not be able to provide +file systems are in a state such that they will not be able to provide statistics without a long delay. When this option is specified, .Nm -will not request new statistics from the filesystems, but will respond +will not request new statistics from the file systems, but will respond with the possibly stale statistics that were previously obtained. .It Fl P Use POSIX compliant output of 512-byte blocks rather than the default. @@ -115,11 +115,11 @@ .Ev BLOCKSIZE specification from the environment. .It Fl t -Only print out statistics for filesystems of the specified types. +Only print out statistics for file systems of the specified types. More than one type may be specified in a comma separated list. -The list of filesystem types can be prefixed with +The list of file system types can be prefixed with .Dq no -to specify the filesystem types for which action should +to specify the file system types for which action should .Em not be taken. For example, the @@ -129,13 +129,13 @@ df -t nonfs,nullfs .Ed .Pp -lists all filesystems except those of type +lists all file systems except those of type .Tn NFS and .Tn NULLFS . The .Xr lsvfs 1 -command can be used to find out the types of filesystems +command can be used to find out the types of file systems that are available on the system. .El .Sh ENVIRONMENT >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 23 23:44:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE7A537B401; Fri, 23 Aug 2002 23:43:39 -0700 (PDT) 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 3830637B400 for ; Fri, 23 Aug 2002 23:43:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 943CA43E75 for ; Fri, 23 Aug 2002 23:43:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7O6hcJU043460 for ; Fri, 23 Aug 2002 23:43:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7O6hcYE043457 for perforce@freebsd.org; Fri, 23 Aug 2002 23:43:38 -0700 (PDT) Date: Fri, 23 Aug 2002 23:43:38 -0700 (PDT) Message-Id: <200208240643.g7O6hcYE043457@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16495 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16495 Change 16495 by peter@peter_daintree on 2002/08/23 23:43:12 IFC @16494 Affected files ... .. //depot/projects/ia64/lib/libc/gen/utime.3#2 integrate .. //depot/projects/ia64/lib/libc/sys/madvise.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/mincore.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/mlock.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/mmap.2#5 integrate .. //depot/projects/ia64/lib/libc/sys/mprotect.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/msync.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/munmap.2#3 integrate .. //depot/projects/ia64/release/picobsd/bridge/crunch.conf#5 integrate .. //depot/projects/ia64/release/picobsd/dial/config#3 integrate .. //depot/projects/ia64/release/picobsd/dial/crunch.conf#3 integrate .. //depot/projects/ia64/secure/lib/libcipher/crypt.c#3 integrate .. //depot/projects/ia64/sys/cam/cam_periph.c#3 integrate .. //depot/projects/ia64/sys/kern/link_elf.c#8 integrate .. //depot/projects/ia64/sys/netinet6/esp_input.c#6 integrate Differences ... ==== //depot/projects/ia64/lib/libc/gen/utime.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)utime.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/utime.3,v 1.10 2001/10/01 16:08:51 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/utime.3,v 1.11 2002/08/24 00:39:43 mike Exp $ .\" .Dd June 4, 1993 .Dt UTIME 3 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In utime.h .Ft int .Fn utime "const char *file" "const struct utimbuf *timep" ==== //depot/projects/ia64/lib/libc/sys/madvise.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)madvise.2 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.23 2001/10/01 16:09:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.24 2002/08/24 00:39:43 mike Exp $ .\" .Dd July 19, 1996 .Dt MADVISE 2 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft int .Fn madvise "void *addr" "size_t len" "int behav" ==== //depot/projects/ia64/lib/libc/sys/mincore.2#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mincore.2 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/sys/mincore.2,v 1.19 2002/03/09 07:05:22 dd Exp $ +.\" $FreeBSD: src/lib/libc/sys/mincore.2,v 1.20 2002/08/24 00:39:43 mike Exp $ .\" .Dd June 9, 1993 .Dt MINCORE 2 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft int .Fn mincore "const void *addr" "size_t len" "char *vec" ==== //depot/projects/ia64/lib/libc/sys/mlock.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mlock.2 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/sys/mlock.2,v 1.11 2001/10/01 16:09:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/mlock.2,v 1.12 2002/08/24 00:39:43 mike Exp $ .\" .Dd June 2, 1993 .Dt MLOCK 2 @@ -42,7 +42,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft int .Fn mlock "const void *addr" "size_t len" ==== //depot/projects/ia64/lib/libc/sys/mmap.2#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 -.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.43 2002/03/15 18:04:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.44 2002/08/24 00:39:43 mike Exp $ .\" .Dd November 17, 2001 .Dt MMAP 2 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft void * .Fn mmap "void *addr" "size_t len" "int prot" "int flags" "int fd" "off_t offset" ==== //depot/projects/ia64/lib/libc/sys/mprotect.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mprotect.2 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/sys/mprotect.2,v 1.13 2001/10/01 16:09:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/mprotect.2,v 1.14 2002/08/24 00:39:43 mike Exp $ .\" .Dd June 9, 1993 .Dt MPROTECT 2 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft int .Fn mprotect "const void *addr" "size_t len" "int prot" ==== //depot/projects/ia64/lib/libc/sys/msync.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)msync.2 8.2 (Berkeley) 6/21/94 -.\" $FreeBSD: src/lib/libc/sys/msync.2,v 1.21 2001/10/01 16:09:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/msync.2,v 1.22 2002/08/24 00:39:43 mike Exp $ .\" .Dd June 21, 1994 .Dt MSYNC 2 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft int .Fn msync "void *addr" "size_t len" "int flags" ==== //depot/projects/ia64/lib/libc/sys/munmap.2#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)munmap.2 8.3 (Berkeley) 5/27/94 -.\" $FreeBSD: src/lib/libc/sys/munmap.2,v 1.15 2002/01/07 06:12:25 dd Exp $ +.\" $FreeBSD: src/lib/libc/sys/munmap.2,v 1.16 2002/08/24 00:39:43 mike Exp $ .\" .Dd May 27, 1994 .Dt MUNMAP 2 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft int .Fn munmap "void *addr" "size_t len" ==== //depot/projects/ia64/release/picobsd/bridge/crunch.conf#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.11 2002/04/19 12:39:08 ru Exp $ +# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.12 2002/08/24 03:33:31 luigi Exp $ # # configuration file for "bridge" floppy. # Depending on your needs, almost surely you will need to @@ -21,11 +21,18 @@ buildopts -DNOPAM -DRELEASE_CRUNCH -DNONETGRAPH -DNOIPSEC -DNOINET6 # directories where to look for sources of various binaries. +# @__CWD__@ is a magic keyword in the picobsd's (Makefile.conf) +# which is replaced with the picobsd directory. +srcdirs @__CWD__@/src + # Some programs are especially written for PicoBSD and reside here # Make this first in the list so we can override standard programs # with the picobsd-specific ones. srcdirs /usr/src/release/picobsd/tinyware -# Other places to look. + +# +# standard locations +# srcdirs /usr/src/bin srcdirs /usr/src/sbin/i386 srcdirs /usr/src/sbin @@ -85,7 +92,6 @@ progs w # 0KB. progs msg # 0KB. ln msg dmesg -progs kget # 0KB. progs reboot # 0KB. #progs less # 36KB #ln less more @@ -160,6 +166,7 @@ # Check the ssh license! If you want to use this, # go to /usr/ports/security/ssh-picobsd, do a make extract configure +# You also need to install /usr/ports/math/libgmp-freebsd progs sshd # includes ssh and scp special sshd objvar SSHD_OBJS special sshd srcdir /usr/ports/picobsd/ssh-picobsd/work/ssh-1.2.27 @@ -169,6 +176,7 @@ ln sshd scp ### ee uses ncurses instead of curses -libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm +libs -ledit -lutil -lmd -lcrypt -lmp -lm -lkvm +libs /usr/local/lib/libgmp.a libs -lmytinfo -lipx -lz -lpcap -lwrap libs -ltermcap -lgnuregex # -lcurses ==== //depot/projects/ia64/release/picobsd/dial/config#3 (text+ko) ==== @@ -1,2 +1,5 @@ +# $FreeBSD: src/release/picobsd/dial/config,v 1.5 2002/08/24 03:54:38 luigi Exp $ STAND_LINKS="bin sbin usr/bin usr/sbin usr/libexec" o_no_devfs="" # we have devfs +#fd_size=2880 +#import_files="/usr/libexec/ld-elf.so.1 /usr/lib/libc.so.4 /usr/lib/libm.so.2" ==== //depot/projects/ia64/release/picobsd/dial/crunch.conf#3 (text+ko) ==== @@ -1,12 +1,27 @@ -# $FreeBSD: src/release/picobsd/dial/crunch.conf,v 1.4 2002/04/19 12:39:09 ru Exp $ +# $FreeBSD: src/release/picobsd/dial/crunch.conf,v 1.5 2002/08/24 03:54:38 luigi Exp $ # -# NOTE1: the string "/usr/src" will be automatically replaced with the -# correct value set in 'build' script - you should change it there +# NOTE: This configuration is not very up to date. You may want +# to check the "bridge" configuration instead. # Default build options buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC -# other sources +# The string "/usr/src" will be automatically replaced with the +# correct value set in 'build' script. + +# directories where to look for sources of various binaries. +# @__CWD__@ is a magic keyword in the picobsd's (Makefile.conf) +# which is replaced with the picobsd directory. +srcdirs @__CWD__@/src + +# Some programs are especially written for PicoBSD and reside here +# Make this first in the list so we can override standard programs +# with the picobsd-specific ones. +srcdirs /usr/src/release/picobsd/tinyware + +# +# standard locations +# srcdirs /usr/src/bin srcdirs /usr/src/sbin/i386 srcdirs /usr/src/sbin @@ -15,17 +30,20 @@ srcdirs /usr/src/usr.sbin srcdirs /usr/src/libexec -# ns, vm etc... -srcdirs /usr/src/release/picobsd/tinyware - -progs ppp ftp telnet ee gzip less -#progs ssh +progs ppp +progs ee +progs gzip +#progs ftp # 38KB +progs telnet +#ln minigzip gzip ln gzip gunzip ln gzip zcat ln gzip gzcat -ln less more +#progs less # 36KB +#ln less more +#progs ssh -progs sh test kget echo pwd msg stty +progs sh test echo pwd msg stty progs hostname cat kill sps vm ns progs chmod chown help getty progs cp df fsck ping mv ln traceroute @@ -43,6 +61,8 @@ ln mount_ext2fs ext2fs ln chown chgrp -libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lgnuregex -lmp -lgmp -lm +libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lgnuregex -lmp -lm +# you need to install libgmp-freebsd from ports/math +libs /usr/local/lib/libgmp.a libs -lncurses -lmytinfo -lipx -lz libs -ltermcap -lalias ==== //depot/projects/ia64/secure/lib/libcipher/crypt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/secure/lib/libcipher/crypt.c,v 1.8 2002/02/18 20:35:20 mike Exp $ + * $FreeBSD: src/secure/lib/libcipher/crypt.c,v 1.9 2002/08/24 02:53:23 nectar Exp $ * * This is an original implementation of the DES and the crypt(3) interfaces * by David Burren . @@ -45,10 +45,8 @@ * posted to the sci.crypt newsgroup by the author and is available for FTP. * * ARCHITECTURE ASSUMPTIONS: - * This code assumes that u_longs are 32 bits. It will probably not - * operate on 64-bit machines without modifications. * It is assumed that the 8-byte arrays passed by reference can be - * addressed as arrays of u_longs (ie. the CPU is not picky about + * addressed as arrays of uint32_t (ie. the CPU is not picky about * alignment). */ #include @@ -151,7 +149,7 @@ 2, 8, 24, 14, 32, 27, 3, 9, 19, 13, 30, 6, 22, 11, 4, 25 }; -static u_long bits32[32] = +static uint32_t bits32[32] = { 0x80000000, 0x40000000, 0x20000000, 0x10000000, 0x08000000, 0x04000000, 0x02000000, 0x01000000, @@ -165,20 +163,20 @@ static u_char bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; -static u_long saltbits; +static uint32_t saltbits; static long old_salt; -static u_long *bits28, *bits24; +static uint32_t *bits28, *bits24; static u_char init_perm[64], final_perm[64]; -static u_long en_keysl[16], en_keysr[16]; -static u_long de_keysl[16], de_keysr[16]; +static uint32_t en_keysl[16], en_keysr[16]; +static uint32_t de_keysl[16], de_keysr[16]; static int des_initialised = 0; static u_char m_sbox[4][4096]; -static u_long psbox[4][256]; -static u_long ip_maskl[8][256], ip_maskr[8][256]; -static u_long fp_maskl[8][256], fp_maskr[8][256]; -static u_long key_perm_maskl[8][128], key_perm_maskr[8][128]; -static u_long comp_maskl[8][128], comp_maskr[8][128]; -static u_long old_rawkey0, old_rawkey1; +static uint32_t psbox[4][256]; +static uint32_t ip_maskl[8][256], ip_maskr[8][256]; +static uint32_t fp_maskl[8][256], fp_maskr[8][256]; +static uint32_t key_perm_maskl[8][128], key_perm_maskr[8][128]; +static uint32_t comp_maskl[8][128], comp_maskr[8][128]; +static uint32_t old_rawkey0, old_rawkey1; static u_char ascii64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; @@ -208,7 +206,7 @@ des_init() { int i, j, b, k, inbit, obit; - u_long *p, *il, *ir, *fl, *fr; + uint32_t *p, *il, *ir, *fl, *fr; old_rawkey0 = old_rawkey1 = 0L; saltbits = 0L; @@ -338,7 +336,7 @@ static void setup_salt(long salt) { - u_long obit, saltbit; + uint32_t obit, saltbit; int i; if (salt == old_salt) @@ -360,14 +358,14 @@ int des_setkey(const char *key) { - u_long k0, k1, rawkey0, rawkey1; + uint32_t k0, k1, rawkey0, rawkey1; int shifts, i, b, round; if (!des_initialised) des_init(); - rawkey0 = ntohl(*(u_long *) key); - rawkey1 = ntohl(*(u_long *) (key + 4)); + rawkey0 = ntohl(*(uint32_t *) key); + rawkey1 = ntohl(*(uint32_t *) (key + 4)); if ((rawkey0 | rawkey1) && rawkey0 == old_rawkey0 @@ -407,7 +405,7 @@ */ shifts = 0; for (round = 0; round < 16; round++) { - u_long t0, t1; + uint32_t t0, t1; int bit; shifts += key_shifts[round]; @@ -440,13 +438,14 @@ static int -do_des( u_long l_in, u_long r_in, u_long *l_out, u_long *r_out, int count) +do_des( uint32_t l_in, uint32_t r_in, uint32_t *l_out, uint32_t *r_out, + int count) { /* * l_in, r_in, l_out, and r_out are in pseudo-"big-endian" format. */ - u_long mask, rawl, rawr, l, r, *kl, *kr, *kl1, *kr1; - u_long f, r48l, r48r; + uint32_t mask, rawl, rawr, l, r, *kl, *kr, *kl1, *kr1; + uint32_t f, r48l, r48r; int i, j, b, round; if (count == 0) { @@ -559,7 +558,7 @@ int des_cipher(const char *in, char *out, long salt, int count) { - u_long l_out, r_out, rawl, rawr; + uint32_t l_out, r_out, rawl, rawr; int retval; if (!des_initialised) @@ -567,13 +566,13 @@ setup_salt(salt); - rawl = ntohl(*((u_long *) in)++); - rawr = ntohl(*((u_long *) in)); + rawl = ntohl(*((uint32_t *) in)++); + rawr = ntohl(*((uint32_t *) in)); retval = do_des(rawl, rawr, &l_out, &r_out, count); - *((u_long *) out)++ = htonl(l_out); - *((u_long *) out) = htonl(r_out); + *((uint32_t *) out)++ = htonl(l_out); + *((uint32_t *) out) = htonl(r_out); return(retval); } @@ -582,7 +581,7 @@ setkey(char *key) { int i, j; - u_long packed_keys[2]; + uint32_t packed_keys[2]; u_char *p; p = (u_char *) packed_keys; @@ -600,7 +599,7 @@ int encrypt(char *block, int flag) { - u_long io[2]; + uint32_t io[2]; u_char *p; int i, j, retval; ==== //depot/projects/ia64/sys/cam/cam_periph.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.c,v 1.39 2002/06/07 23:51:30 mjacob Exp $ + * $FreeBSD: src/sys/cam/cam_periph.c,v 1.41 2002/08/24 02:51:28 peter Exp $ */ #include @@ -363,34 +363,33 @@ target_id_t target, lun_id_t lun) { u_int unit; - int hit, i, val, dunit; + int wired, i, val, dunit; const char *dname, *strval; char pathbuf[32], *periph_name; - unit = 0; - hit = 0; - periph_name = p_drv->driver_name; snprintf(pathbuf, sizeof(pathbuf), "scbus%d", pathid); + unit = 0; i = 0; dname = periph_name; - while ((resource_find_dev(&i, dname, &dunit, NULL, NULL)) == 0) { + for (wired = 0; resource_find_dev(&i, dname, &dunit, NULL, NULL) == 0; + wired = 0) { if (resource_string_value(dname, dunit, "at", &strval) == 0) { if (strcmp(strval, pathbuf) != 0) continue; - hit++; + wired++; } if (resource_int_value(dname, dunit, "target", &val) == 0) { if (val != target) continue; - hit++; + wired++; } if (resource_int_value(dname, dunit, "lun", &val) == 0) { if (val != lun) continue; - hit++; + wired++; } - if (hit != 0) { + if (wired != 0) { unit = dunit; break; } @@ -402,8 +401,7 @@ * if we have wildcard matches, we don't return the same * unit number twice. */ - unit = camperiphnextunit(p_drv, unit, /*wired*/hit, pathid, - target, lun); + unit = camperiphnextunit(p_drv, unit, wired, pathid, target, lun); return (unit); } @@ -1554,25 +1552,25 @@ case CAM_CMD_TIMEOUT: if (bootverbose && printed == 0) { xpt_print_path(ccb->ccb_h.path); - printf("Command timed out"); + printf("Command timed out\n"); printed++; } case CAM_UNEXP_BUSFREE: if (bootverbose && printed == 0) { xpt_print_path(ccb->ccb_h.path); - printf("Unexpected Bus Free"); + printf("Unexpected Bus Free\n"); printed++; } case CAM_UNCOR_PARITY: if (bootverbose && printed == 0) { xpt_print_path(ccb->ccb_h.path); - printf("Uncorrected Parity Error"); + printf("Uncorrected Parity Error\n"); printed++; } case CAM_DATA_RUN_ERR: if (bootverbose && printed == 0) { xpt_print_path(ccb->ccb_h.path); - printf("Data Overrun"); + printf("Data Overrun\n"); printed++; } error = EIO; /* we have to kill the command */ @@ -1602,7 +1600,7 @@ error = ERESTART; if (bootverbose && printed == 0) { xpt_print_path(ccb->ccb_h.path); - printf("Selection Timeout"); + printf("Selection Timeout\n"); printed++; } ==== //depot/projects/ia64/sys/kern/link_elf.c#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/link_elf.c,v 1.57 2002/08/22 22:01:53 peter Exp $ + * $FreeBSD: src/sys/kern/link_elf.c,v 1.58 2002/08/24 05:01:33 marcel Exp $ */ #include "opt_ddb.h" @@ -1051,7 +1051,7 @@ elf_file_t ef = (elf_file_t) lf; const Elf_Sym* es = (const Elf_Sym*) sym; - if (es >= ef->symtab && ((es - ef->symtab) < ef->nchains)) { + if (es >= ef->symtab && es < (ef->symtab + ef->nchains)) { symval->name = ef->strtab + es->st_name; symval->value = (caddr_t) ef->address + es->st_value; symval->size = es->st_size; @@ -1059,7 +1059,7 @@ } if (ef->symtab == ef->ddbsymtab) return ENOENT; - if (es >= ef->ddbsymtab && ((es - ef->ddbsymtab) < ef->ddbsymcnt)) { + if (es >= ef->ddbsymtab && es < (ef->ddbsymtab + ef->ddbsymcnt)) { symval->name = ef->ddbstrtab + es->st_name; symval->value = (caddr_t) ef->address + es->st_value; symval->size = es->st_size; ==== //depot/projects/ia64/sys/netinet6/esp_input.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/esp_input.c,v 1.13 2002/07/18 04:18:56 ume Exp $ */ +/* $FreeBSD: src/sys/netinet6/esp_input.c,v 1.14 2002/08/24 04:48:13 ume Exp $ */ /* $KAME: esp_input.c,v 1.62 2002/01/07 11:39:57 kjc Exp $ */ /* @@ -217,6 +217,10 @@ if (!sumalgo) goto noreplaycheck; siz = (((*sumalgo->sumsiz)(sav) + 3) & ~(4 - 1)); + if (m->m_pkthdr.len < off + ESPMAXLEN + siz) { + ipsecstat.in_inval++; + goto bad; + } if (AH_MAXSUMSIZE < siz) { ipseclog((LOG_DEBUG, "internal error: AH_MAXSUMSIZE must be larger than %lu\n", @@ -572,6 +576,10 @@ if (!sumalgo) goto noreplaycheck; siz = (((*sumalgo->sumsiz)(sav) + 3) & ~(4 - 1)); + if (m->m_pkthdr.len < off + ESPMAXLEN + siz) { + ipsecstat.in_inval++; + goto bad; + } if (AH_MAXSUMSIZE < siz) { ipseclog((LOG_DEBUG, "internal error: AH_MAXSUMSIZE must be larger than %lu\n", To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 24 3:26:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8907737B401; Sat, 24 Aug 2002 03:26:10 -0700 (PDT) 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 1C0B737B400 for ; Sat, 24 Aug 2002 03:26:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D228743E6E for ; Sat, 24 Aug 2002 03:26:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7OAQ9JU077707 for ; Sat, 24 Aug 2002 03:26:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7OAQ9s6077704 for perforce@freebsd.org; Sat, 24 Aug 2002 03:26:09 -0700 (PDT) Date: Sat, 24 Aug 2002 03:26:09 -0700 (PDT) Message-Id: <200208241026.g7OAQ9s6077704@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16499 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16499 Change 16499 by peter@peter_daintree on 2002/08/24 03:25:33 Well, that was painless. I could boot 64 bit time_t kernel with a 32 bit time_t userland without much excitement at all. This is probably mostly because gettimeofday etc have 'long tv_sec' etc in struct timeval. The trouble only started after installing a new libc which tries to write a 64 bit long in time(&foo) and find(1) tripped it up right at the end of the install (and continued). This probably breaks ia32 emulation. Affected files ... .. //depot/projects/ia64/sys/ia64/include/_types.h#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/_types.h#2 (text+ko) ==== @@ -72,7 +72,7 @@ typedef __int64_t __segsz_t; /* segment size (in pages) */ typedef __uint64_t __size_t; /* sizeof() */ typedef __int64_t __ssize_t; /* byte count or error */ -typedef __int32_t __time_t; /* time()... */ +typedef __int64_t __time_t; /* time()... */ typedef __uint64_t __uintfptr_t; typedef __uint64_t __uintmax_t; typedef __uint64_t __uintptr_t; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 24 3:37:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC39337B401; Sat, 24 Aug 2002 03:37:24 -0700 (PDT) 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 80F4637B400 for ; Sat, 24 Aug 2002 03:37:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F8AD43E65 for ; Sat, 24 Aug 2002 03:37:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7OAbOJU078511 for ; Sat, 24 Aug 2002 03:37:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7OAbOED078508 for perforce@freebsd.org; Sat, 24 Aug 2002 03:37:24 -0700 (PDT) Date: Sat, 24 Aug 2002 03:37:24 -0700 (PDT) Message-Id: <200208241037.g7OAbOED078508@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16500 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16500 Change 16500 by peter@peter_mckinley on 2002/08/24 03:37:13 stop this from failing the compile Affected files ... .. //depot/projects/ia64/sys/ia64/include/signal.h#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/include/signal.h#3 (text+ko) ==== @@ -74,7 +74,9 @@ * representations of 'struct reg' and 'struct fpreg', respectively. */ typedef unsigned int osigset_t; -struct osigcontext {}; +struct osigcontext { + int _not_used; +}; /* * The sequence of the fields should match those in To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 24 3:38:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9096437B401; Sat, 24 Aug 2002 03:38:26 -0700 (PDT) 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 4CE8C37B400 for ; Sat, 24 Aug 2002 03:38:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEC9243E65 for ; Sat, 24 Aug 2002 03:38:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7OAcPJU078543 for ; Sat, 24 Aug 2002 03:38:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7OAcP2W078540 for perforce@freebsd.org; Sat, 24 Aug 2002 03:38:25 -0700 (PDT) Date: Sat, 24 Aug 2002 03:38:25 -0700 (PDT) Message-Id: <200208241038.g7OAcP2W078540@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16501 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16501 Change 16501 by peter@peter_mckinley on 2002/08/24 03:37:59 make this compile. Affected files ... .. //depot/projects/ia64/contrib/binutils/bfd/elf-eh-frame.c#3 edit Differences ... ==== //depot/projects/ia64/contrib/binutils/bfd/elf-eh-frame.c#3 (text+ko) ==== @@ -414,7 +414,7 @@ /* 64-bit .eh_frame is not supported. */ goto free_no_table; buf += 4; - if ((buf - ehbuf) + hdr.length > sec->_raw_size) + if ((bfd_size_type) (buf - ehbuf) + hdr.length > sec->_raw_size) /* CIE/FDE not contained fully in this .eh_frame input section. */ goto free_no_table; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 24 3:39:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92EBA37B401; Sat, 24 Aug 2002 03:39:28 -0700 (PDT) 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 4DAB737B400 for ; Sat, 24 Aug 2002 03:39:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF2D143E65 for ; Sat, 24 Aug 2002 03:39:27 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7OAdRJU078685 for ; Sat, 24 Aug 2002 03:39:27 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7OAdR48078682 for perforce@freebsd.org; Sat, 24 Aug 2002 03:39:27 -0700 (PDT) Date: Sat, 24 Aug 2002 03:39:27 -0700 (PDT) Message-Id: <200208241039.g7OAdR48078682@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16502 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16502 Change 16502 by peter@peter_mckinley on 2002/08/24 03:38:50 make this compile Affected files ... .. //depot/projects/ia64/contrib/binutils/gas/read.c#3 edit Differences ... ==== //depot/projects/ia64/contrib/binutils/gas/read.c#3 (text+ko) ==== @@ -1196,9 +1196,11 @@ frag_align_pattern (n, fill, len, max); } +#ifndef __ia64__ #ifdef md_do_align just_record_alignment: #endif +#endif record_alignment (now_seg, n - OCTETS_PER_BYTE_POWER); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 24 3:39:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4431D37B400; Sat, 24 Aug 2002 03:39:30 -0700 (PDT) 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 A6DE337B409 for ; Sat, 24 Aug 2002 03:39:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 518CE43E6A for ; Sat, 24 Aug 2002 03:39:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7OAdSJU078692 for ; Sat, 24 Aug 2002 03:39:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7OAdRDT078689 for perforce@freebsd.org; Sat, 24 Aug 2002 03:39:27 -0700 (PDT) Date: Sat, 24 Aug 2002 03:39:27 -0700 (PDT) Message-Id: <200208241039.g7OAdRDT078689@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16503 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16503 Change 16503 by peter@peter_mckinley on 2002/08/24 03:39:17 make this compile Affected files ... .. //depot/projects/ia64/sbin/gpt/recover.c#3 edit Differences ... ==== //depot/projects/ia64/sbin/gpt/recover.c#3 (text+ko) ==== @@ -52,7 +52,7 @@ } static void -recover(int fd) +recover(int fd __unused) { /* TODO */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 24 5:19:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF53037B401; Sat, 24 Aug 2002 05:19:09 -0700 (PDT) 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 3D01C37B400 for ; Sat, 24 Aug 2002 05:19:09 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08BEF43E4A for ; Sat, 24 Aug 2002 05:19:09 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id D2EA82A7D6 for ; Sat, 24 Aug 2002 05:19:08 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Perforce Change Reviews Subject: Re: PERFORCE change 16499 for review In-Reply-To: <200208241026.g7OAQ9s6077704@freefall.freebsd.org> Date: Sat, 24 Aug 2002 05:19:08 -0700 From: Peter Wemm Message-Id: <20020824121908.D2EA82A7D6@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16499 > > Change 16499 by peter@peter_daintree on 2002/08/24 03:25:33 > > Well, that was painless. I could boot 64 bit time_t kernel with a > 32 bit time_t userland without much excitement at all. This is > probably mostly because gettimeofday etc have 'long tv_sec' etc > in struct timeval. The trouble only started after installing a new > libc which tries to write a 64 bit long in time(&foo) and find(1) > tripped it up right at the end of the install (and continued). > This probably breaks ia32 emulation. Well, almost painless. :-) I have a slight problem with something getting into an infinite loop. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 24 10: 7:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BA7537B401; Sat, 24 Aug 2002 10:07:51 -0700 (PDT) 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 082A037B400 for ; Sat, 24 Aug 2002 10:07:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADE3643E42 for ; Sat, 24 Aug 2002 10:07:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7OH7oJU061079 for ; Sat, 24 Aug 2002 10:07:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7OH7ox4061076 for perforce@freebsd.org; Sat, 24 Aug 2002 10:07:50 -0700 (PDT) Date: Sat, 24 Aug 2002 10:07:50 -0700 (PDT) Message-Id: <200208241707.g7OH7ox4061076@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16509 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16509 Change 16509 by rwatson@rwatson_paprika on 2002/08/24 10:07:48 Move various debugging object counters to security.mac.debug.counters for consistency with the tutorial I'm giving on Monday. It makes more sense. Add nmacprocs to the list of counter variables. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#258 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#258 (text+ko) ==== @@ -101,6 +101,8 @@ "TrustedBSD MAC policy controls"); SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, "TrustedBSD MAC debug info"); +SYSCTL_NODE(_security_mac_debug, OID_AUTO, counters, CTLFLAG_RW, 0, + "TrustedBSD MAC object counters"); static int mac_debug_label_fallback = 0; SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, @@ -170,30 +172,30 @@ #ifdef MAC_DEBUG static unsigned int nmacmbufs, nmaccreds, nmacifnets, nmacbpfdescs, nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, - nmacipqs, nmacpipes; -SYSCTL_UINT(_security_mac_debug, OID_AUTO, mbufs, CTLFLAG_RD, + nmacipqs, nmacpipes, nmacprocs; +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, mbufs, CTLFLAG_RD, &nmacmbufs, 0, "number of mbufs in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, creds, CTLFLAG_RD, +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, creds, CTLFLAG_RD, &nmaccreds, 0, "number of ucreds in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, ifnets, CTLFLAG_RD, +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ifnets, CTLFLAG_RD, &nmacifnets, 0, "number of ifnets in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, ipqs, CTLFLAG_RD, +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipqs, CTLFLAG_RD, &nmacipqs, 0, "number of ipqs in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, bpfdescs, CTLFLAG_RD, +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, bpfdescs, CTLFLAG_RD, &nmacbpfdescs, 0, "number of bpfdescs in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, sockets, CTLFLAG_RD, +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, sockets, CTLFLAG_RD, &nmacsockets, 0, "number of sockets in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, pipes, CTLFLAG_RD, +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, pipes, CTLFLAG_RD, &nmacpipes, 0, "number of pipes in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, procs, CTLFLAG_RD, +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, procs, CTLFLAG_RD, &nmacprocs, 0, "number of procs in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, mounts, CTLFLAG_RD, +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, mounts, CTLFLAG_RD, &nmacmounts, 0, "number of mounts in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, temp, CTLFLAG_RD, +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, temp, CTLFLAG_RD, &nmactemp, 0, "number of temporary labels in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, vnodes, CTLFLAG_RD, +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, vnodes, CTLFLAG_RD, &nmacvnodes, 0, "number of vnodes in use"); -SYSCTL_UINT(_security_mac_debug, OID_AUTO, devfsdirents, CTLFLAG_RD, +SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, devfsdirents, CTLFLAG_RD, &nmacdevfsdirents, 0, "number of devfs dirents inuse"); #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 24 10:10: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59C3C37B401; Sat, 24 Aug 2002 10:10:03 -0700 (PDT) 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 1370D37B400 for ; Sat, 24 Aug 2002 10:10:03 -0700 (PDT) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id E935943E6A for ; Sat, 24 Aug 2002 10:10:01 -0700 (PDT) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.11.6/8.11.4) with ESMTP id g7OH9nt21445; Sat, 24 Aug 2002 10:09:49 -0700 (PDT) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.5/8.12.5) with ESMTP id g7OHA06h000332; Sat, 24 Aug 2002 10:10:00 -0700 (PDT) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.5/8.12.5/Submit) id g7OH9xVs000331; Sat, 24 Aug 2002 10:09:59 -0700 (PDT) (envelope-from marcel) Date: Sat, 24 Aug 2002 10:09:59 -0700 From: Marcel Moolenaar To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16499 for review Message-ID: <20020824170959.GA315@dhcp01.pn.xcllnt.net> References: <200208241026.g7OAQ9s6077704@freefall.freebsd.org> <20020824121908.D2EA82A7D6@canning.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020824121908.D2EA82A7D6@canning.wemm.org> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, Aug 24, 2002 at 05:19:08AM -0700, Peter Wemm wrote: > Peter Wemm wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16499 > > > > Change 16499 by peter@peter_daintree on 2002/08/24 03:25:33 > > > > Well, that was painless. I could boot 64 bit time_t kernel with a > > 32 bit time_t userland without much excitement at all. This is > > probably mostly because gettimeofday etc have 'long tv_sec' etc > > in struct timeval. The trouble only started after installing a new > > libc which tries to write a 64 bit long in time(&foo) and find(1) > > tripped it up right at the end of the install (and continued). > > This probably breaks ia32 emulation. > > Well, almost painless. :-) I have a slight problem with something > getting into an infinite loop. If it's userland, let me know. I have ski working with static and dynamic binaries with only a minimal set of syscalls. I just have to put it where you can grab it. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 24 10:10:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7967037B401; Sat, 24 Aug 2002 10:10:55 -0700 (PDT) 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 368B337B400 for ; Sat, 24 Aug 2002 10:10:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5E6943E6E for ; Sat, 24 Aug 2002 10:10:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7OHAsJU061594 for ; Sat, 24 Aug 2002 10:10:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7OHAsAj061591 for perforce@freebsd.org; Sat, 24 Aug 2002 10:10:54 -0700 (PDT) Date: Sat, 24 Aug 2002 10:10:54 -0700 (PDT) Message-Id: <200208241710.g7OHAsAj061591@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16510 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16510 Change 16510 by rwatson@rwatson_paprika on 2002/08/24 10:10:37 Add 'security.mac.mmap_revocation' to enable/disable revocation of mmaps on subject relabel. Default to enable (current behavior). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#259 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#259 (text+ko) ==== @@ -164,6 +164,10 @@ static int mac_vnode_label_cache_misses = 0; SYSCTL_INT(_security_mac, OID_AUTO, vnode_label_cache_misses, CTLFLAG_RD, &mac_vnode_label_cache_misses, 0, "Cache misses on vnode labels"); +static int mac_mmap_revocation = 1; +SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, + &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " + "relabel"); static int mac_mmap_revocation_via_cow = 0; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation_via_cow, CTLFLAG_RW, &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " @@ -2209,6 +2213,9 @@ vm_ooffset_t offset; struct vnode *vp; + if (!mac_mmap_revocation) + return; + vm_map_lock_read(map); for (vme = map->header.next; vme != &map->header; vme = vme->next) { if (vme->eflags & MAP_ENTRY_IS_SUB_MAP) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 24 19:45:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D22A37B405; Sat, 24 Aug 2002 19:45:06 -0700 (PDT) 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 F0EE137B401 for ; Sat, 24 Aug 2002 19:45:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC61C43E6E for ; Sat, 24 Aug 2002 19:45:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7P2j5JU059631 for ; Sat, 24 Aug 2002 19:45:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7P2j5fq059628 for perforce@freebsd.org; Sat, 24 Aug 2002 19:45:05 -0700 (PDT) Date: Sat, 24 Aug 2002 19:45:05 -0700 (PDT) Message-Id: <200208250245.g7P2j5fq059628@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16532 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16532 Change 16532 by peter@peter_mckinley on 2002/08/24 19:44:31 make this work with 64 bit time_t. XXX what is /usr/include/timeconv.h for? Affected files ... .. //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#8 edit Differences ... ==== //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#8 (text+ko) ==== @@ -71,6 +71,7 @@ struct passwd *pwd; struct utmp utmp; struct lastlog ll; + time_t t; const char *rhost, *user, *tty; off_t llpos; int fd, pam_err; @@ -109,13 +110,14 @@ goto file_err; if ((flags & PAM_SILENT) == 0) { if (read(fd, &ll, sizeof ll) == sizeof ll && ll.ll_time != 0) { + t = ll.ll_time; if (*ll.ll_host != '\0') pam_info(pamh, "Last login: %.*s from %.*s", - 24 - 5, ctime(&ll.ll_time), + 24 - 5, ctime(&t), (int)sizeof(ll.ll_host), ll.ll_host); else pam_info(pamh, "Last login: %.*s on %.*s", - 24 - 5, ctime(&ll.ll_time), + 24 - 5, ctime(&t), (int)sizeof(ll.ll_line), ll.ll_line); } if (lseek(fd, llpos, L_SET) != llpos) @@ -123,7 +125,8 @@ } bzero(&ll, sizeof(ll)); - time(&ll.ll_time); + time(&t); + ll.ll_time = t; /* note: does not need to be NUL-terminated */ strncpy(ll.ll_line, tty, sizeof(ll.ll_line)); @@ -140,7 +143,8 @@ * Record session in utmp(5) and wtmp(5). */ bzero(&utmp, sizeof(utmp)); - time(&utmp.ut_time); + time(&t); + utmp.ut_time = t; /* note: does not need to be NUL-terminated */ strncpy(utmp.ut_name, user, sizeof(utmp.ut_name)); if (rhost != NULL) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 24 19:49:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52E6837B401; Sat, 24 Aug 2002 19:49:12 -0700 (PDT) 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 E81F537B400 for ; Sat, 24 Aug 2002 19:49:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B6C443E6A for ; Sat, 24 Aug 2002 19:49:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7P2nAJU060090 for ; Sat, 24 Aug 2002 19:49:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7P2nAIn060087 for perforce@freebsd.org; Sat, 24 Aug 2002 19:49:10 -0700 (PDT) Date: Sat, 24 Aug 2002 19:49:10 -0700 (PDT) Message-Id: <200208250249.g7P2nAIn060087@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16533 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16533 Change 16533 by peter@peter_mckinley on 2002/08/24 19:48:32 OK, timeconv.h is actually what I wanted. Affected files ... .. //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#9 edit Differences ... ==== //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#9 (text+ko) ==== @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -110,7 +111,7 @@ goto file_err; if ((flags & PAM_SILENT) == 0) { if (read(fd, &ll, sizeof ll) == sizeof ll && ll.ll_time != 0) { - t = ll.ll_time; + t = _time32_to_time(ll.ll_time); if (*ll.ll_host != '\0') pam_info(pamh, "Last login: %.*s from %.*s", 24 - 5, ctime(&t), @@ -126,7 +127,7 @@ bzero(&ll, sizeof(ll)); time(&t); - ll.ll_time = t; + ll.ll_time = _time_to_time32(t); /* note: does not need to be NUL-terminated */ strncpy(ll.ll_line, tty, sizeof(ll.ll_line)); @@ -144,7 +145,7 @@ */ bzero(&utmp, sizeof(utmp)); time(&t); - utmp.ut_time = t; + utmp.ut_time = _time_to_time32(t); /* note: does not need to be NUL-terminated */ strncpy(utmp.ut_name, user, sizeof(utmp.ut_name)); if (rhost != NULL) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Aug 25 13: 5:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED0E237B401; Sun, 25 Aug 2002 13:05:40 -0700 (PDT) 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 8ADB437B400 for ; Sun, 25 Aug 2002 13:05:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 256EB43E77 for ; Sun, 25 Aug 2002 13:05:40 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7PK5eJU064176 for ; Sun, 25 Aug 2002 13:05:40 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7PK5d80064166 for perforce@freebsd.org; Sun, 25 Aug 2002 13:05:39 -0700 (PDT) Date: Sun, 25 Aug 2002 13:05:39 -0700 (PDT) Message-Id: <200208252005.g7PK5d80064166@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16552 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16552 Change 16552 by mini@mini_stylus on 2002/08/25 13:04:59 Add the concept of being busy (currently in use) to a ucontext_t, and make the userland functions obey its constraints. Affected files ... .. //depot/projects/kse/lib/libc/gen/swapcontext.c#2 edit .. //depot/projects/kse/lib/libc/i386/gen/getcontext.S#3 edit .. //depot/projects/kse/sys/sys/ucontext.h#4 edit Differences ... ==== //depot/projects/kse/lib/libc/gen/swapcontext.c#2 (text+ko) ==== @@ -30,26 +30,29 @@ #include #include #include -#include +#include __weak_reference(__swapcontext, swapcontext); int __swapcontext(ucontext_t *oucp, const ucontext_t *ucp) { - volatile int swapping; int ret; - if (oucp == NULL || ucp == NULL) { + + if ((oucp == NULL) || + (oucp->uc_mcontext.mc_len != sizeof(mcontext_t)) || + (ucp == NULL) || + (ucp->uc_mcontext.mc_len != sizeof(mcontext_t))) { errno = EINVAL; - ret = -1; - } else { - swapping = 0; - ret = getcontext(oucp); - if (ret == 0 && swapping == 0) { - swapping = 1; - ret = setcontext(ucp); - } + return (-1); + } + oucp->uc_flags &= ~UCF_SWAPPED; + ret = getcontext(oucp); + if ((ret == 0) && !(oucp->uc_flags & UCF_SWAPPED)) { + oucp->uc_flags |= UCF_SWAPPED; + oucp->uc_busy = 0; + ret = setcontext(ucp); } return (ret); } ==== //depot/projects/kse/lib/libc/i386/gen/getcontext.S#3 (text+ko) ==== @@ -32,12 +32,15 @@ */ #define MC_SIZE 640 /* sizeof mcontext_t */ #define UC_MC_OFFSET 16 /* offset to mcontext from ucontext */ -#define UC_FLAGS_OFFSET 208 /* offset to flags from ucontext */ #define UC_MC_LEN_OFFSET 96 /* offset to mc_len from mcontext */ +#define MC_FLAGS_OFFSET 660 /* offset to uc_flags from ucontext */ +#define MC_BUSY_OFFSET 656 /* offset to uc_busy from ucontext */ #define MC_LEN_OFFSET 80 /* offset to mc_len from mcontext */ #define MC_FP_REGS_OFFSET 96 /* offset to FP regs from mcontext */ #define MC_FP_CW_OFFSET 96 /* offset to FP control word */ #define MC_OWNEDFP_OFFSET 88 /* offset to mc_ownedfp from mcontext */ +#define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ +#define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ /* * int setcontext(ucontext_t *ucp); @@ -53,12 +56,14 @@ cmpl $0, %eax /* check for null pointer */ jne 1f movl $-1, %eax - jmp 5f + jmp 7f 1: cmpl $MC_SIZE, UC_MC_LEN_OFFSET(%eax) /* is context valid? */ jnz 2f movl $-1, %eax /* bzzzt, invalid context */ - jmp 5f -2: PIC_PROLOGUE + jmp 7f +2: testl $UCF_SKIPSIGMASK, MC_FLAGS_OFFSET(%edx) /* Restore sigmask? */ + jnz 3f + PIC_PROLOGUE pushl $0 /* oset = NULL */ pushl %eax /* set = &ucp->uc_sigmask */ pushl $3 /* how = SIG_SETMASK */ @@ -66,8 +71,8 @@ addl $12, %esp PIC_EPILOGUE testl %eax, %eax /* check for error */ - jnz 5f - movl 4(%esp), %edx /* get address of context */ + jnz 7f +3: movl 4(%esp), %edx /* get address of context */ addl $UC_MC_OFFSET, %edx /* add offset to mcontext */ movl 4(%edx), %gs movl 8(%edx), %fs @@ -82,18 +87,22 @@ movl 60(%edx), %eax /* put return address at top of stack */ movl %eax, (%esp) cmpl $0, MC_OWNEDFP_OFFSET(%edx) /* are FP regs valid? */ - jz 3f + jz 4f frstor MC_FP_REGS_OFFSET(%edx) /* restore FP regs */ - jmp 4f -3: fninit + jmp 5f +4: fninit fldcw MC_FP_CW_OFFSET(%edx) -4: movl 68(%edx), %eax /* restore flags register */ - sahf - movl 48(%edx), %eax /* restore ax, bx, cx, and dx last */ +5: movl 48(%edx), %eax /* restore ax, bx, cx */ movl 36(%edx), %ebx movl 44(%edx), %ecx - movl 40(%edx), %edx -5: ret + pushl 68(%edx) /* flags on stack */ + pushl 40(%edx) /* %edx on stack */ + testl $UCF_OBEYBUSY, MC_FLAGS_OFFSET(%edx) /* set uc_busy? */ + jz 6f + movl $1, MC_BUSY_OFFSET(%edx) /* set uc_busy */ +6: popl %edx /* %edx off stack */ + popf /* flags off stack */ +7: ret /* * int getcontext(ucontext_t *ucp); @@ -139,24 +148,15 @@ movl %eax, 60(%edx) /* save return address */ movl %ss, 76(%edx) /* - * XXX - Do we really need to save floating point registers? + * Don't save floating point registers here. * * This is an explicit call to get the current context, so - * shouldn't the caller be done with the floating point registers? + * the caller is done with the floating point registers. * Contexts formed by involuntary switches, such as signal delivery, - * should have floating point registers saved by the kernel. - * - * As of this writing, the kernel doesn't yet save the FPU state - * on signal delivery, so a setcontext on the interrupted context - * may yield incorrect results regardless. + * have floating point registers saved by the kernel. */ -#if 1 fnstcw MC_FP_CW_OFFSET(%edx) movl $0, MC_OWNEDFP_OFFSET(%edx) /* no FP */ -#else - fnsave MC_FP_REGS_OFFSET(%edx) /* save FP regs */ - movl $MC_FP_VALID, MC_FLAGS_OFFSET(%edx) /* mcontext and FP valid */ -#endif lahf /* get eflags */ movl %eax, 68(%edx) /* store eflags */ movl %esp, %eax /* setcontext pushes the return */ ==== //depot/projects/kse/sys/sys/ucontext.h#4 (text+ko) ==== @@ -47,8 +47,12 @@ struct __ucontext *uc_link; stack_t uc_stack; - int uc_busy; - int __spare__[6]; + intptr_t uc_busy; + int uc_flags; +#define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ +#define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ +#define UCF_SWAPPED 0x00000004 /* Used by swapcontext(3). */ + int __spare__[4]; } ucontext_t; #ifndef _KERNEL To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 7:14:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9EB737B401; Mon, 26 Aug 2002 07:14:28 -0700 (PDT) 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 6A57E37B400 for ; Mon, 26 Aug 2002 07:14:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15C1A43E65 for ; Mon, 26 Aug 2002 07:14:28 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QEERJU050528 for ; Mon, 26 Aug 2002 07:14:27 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QEER7A050525 for perforce@freebsd.org; Mon, 26 Aug 2002 07:14:27 -0700 (PDT) Date: Mon, 26 Aug 2002 07:14:27 -0700 (PDT) Message-Id: <200208261414.g7QEER7A050525@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 16575 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16575 Change 16575 by green@green_laptop_2 on 2002/08/26 07:13:26 Branch off Lomac's PLM for the TrustedBSD/Lomac implementation. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/kernel_plm.c#1 branch .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/kernel_plm.h#1 branch .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/policy_plm.h#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 13: 5:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DDAC37B401; Mon, 26 Aug 2002 13:03:50 -0700 (PDT) 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 E481C37B400 for ; Mon, 26 Aug 2002 13:03:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF91B43E6A for ; Mon, 26 Aug 2002 13:03:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QK3mJU007705 for ; Mon, 26 Aug 2002 13:03:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QK3lpE007702 for perforce@freebsd.org; Mon, 26 Aug 2002 13:03:47 -0700 (PDT) Date: Mon, 26 Aug 2002 13:03:47 -0700 (PDT) Message-Id: <200208262003.g7QK3lpE007702@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16599 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16599 Change 16599 by peter@peter_daintree on 2002/08/26 13:03:02 IFC @16595 (acpi pci routing) - could be a bit shakey due to merge conflicts Affected files ... .. //depot/projects/ia64/bin/df/df.1#4 integrate .. //depot/projects/ia64/bin/df/df.c#10 integrate .. //depot/projects/ia64/bin/ed/main.c#5 integrate .. //depot/projects/ia64/bin/ls/ls.c#9 integrate .. //depot/projects/ia64/bin/mv/mv.1#7 integrate .. //depot/projects/ia64/bin/sh/expand.c#5 integrate .. //depot/projects/ia64/bin/sh/jobs.c#12 integrate .. //depot/projects/ia64/bin/sh/parser.c#8 integrate .. //depot/projects/ia64/bin/sh/sh.1#15 integrate .. //depot/projects/ia64/etc/periodic/security/100.chksetuid#5 integrate .. //depot/projects/ia64/etc/periodic/security/200.chkmounts#4 integrate .. //depot/projects/ia64/etc/periodic/security/500.ipfwdenied#3 integrate .. //depot/projects/ia64/etc/periodic/security/550.ipfwlimit#4 integrate .. //depot/projects/ia64/etc/periodic/security/600.ip6fwdenied#3 integrate .. //depot/projects/ia64/etc/periodic/security/650.ip6fwlimit#4 integrate .. //depot/projects/ia64/etc/periodic/security/700.kernelmsg#4 integrate .. //depot/projects/ia64/games/hack/hack.apply.c#2 integrate .. //depot/projects/ia64/games/hack/hack.c#3 integrate .. //depot/projects/ia64/games/hack/hack.do_name.c#2 integrate .. //depot/projects/ia64/games/hack/hack.dog.c#3 integrate .. //depot/projects/ia64/games/hack/hack.eat.c#3 integrate .. //depot/projects/ia64/games/hack/hack.mkobj.c#3 integrate .. //depot/projects/ia64/games/hack/hack.objnam.c#2 integrate .. //depot/projects/ia64/games/hack/hack.trap.c#3 integrate .. //depot/projects/ia64/games/hack/hack.wizard.c#2 integrate .. //depot/projects/ia64/games/phantasia/fight.c#2 integrate .. //depot/projects/ia64/games/phantasia/misc.c#3 integrate .. //depot/projects/ia64/gnu/usr.bin/diff/diff.1#3 integrate .. //depot/projects/ia64/lib/libc/net/ns_addr.c#4 integrate .. //depot/projects/ia64/lib/libc/net/ns_ntoa.c#4 integrate .. //depot/projects/ia64/lib/libc/net/rcmd.c#3 integrate .. //depot/projects/ia64/lib/libc/regex/regcomp.c#4 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_kern.c#3 integrate .. //depot/projects/ia64/lib/libipx/ipx_addr.c#4 integrate .. //depot/projects/ia64/lib/libkvm/kvm_proc.c#8 integrate .. //depot/projects/ia64/lib/libutil/login_cap.c#4 integrate .. //depot/projects/ia64/lib/libutil/property.c#2 integrate .. //depot/projects/ia64/libexec/bootpd/readfile.c#3 integrate .. //depot/projects/ia64/libexec/telnetd/state.c#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#18 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#38 integrate .. //depot/projects/ia64/sbin/clri/clri.c#7 integrate .. //depot/projects/ia64/sbin/dump/dump.8#8 integrate .. //depot/projects/ia64/sbin/dump/traverse.c#10 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass2.c#7 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass5.c#8 integrate .. //depot/projects/ia64/sbin/gpt/recover.c#4 integrate .. //depot/projects/ia64/sbin/ip6fw/ip6fw.c#4 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.c#8 integrate .. //depot/projects/ia64/sbin/restore/interactive.c#3 integrate .. //depot/projects/ia64/sbin/restore/restore.c#7 integrate .. //depot/projects/ia64/sbin/routed/output.c#3 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.c#8 integrate .. //depot/projects/ia64/share/man/man4/fxp.4#4 integrate .. //depot/projects/ia64/share/man/man4/tcp.4#6 integrate .. //depot/projects/ia64/share/man/man5/device.hints.5#3 integrate .. //depot/projects/ia64/share/man/man7/tuning.7#12 integrate .. //depot/projects/ia64/share/man/man9/vfs_unmountall.9#4 integrate .. //depot/projects/ia64/share/mk/bsd.kern.mk#4 integrate .. //depot/projects/ia64/share/termcap/termcap.src#7 integrate .. //depot/projects/ia64/sys/alpha/alpha/db_disasm.c#3 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#15 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#15 integrate .. //depot/projects/ia64/sys/alpha/include/ansi.h#11 integrate .. //depot/projects/ia64/sys/arm/include/ansi.h#9 integrate .. //depot/projects/ia64/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.c#8 integrate .. //depot/projects/ia64/sys/conf/files#38 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#17 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci.c#1 branch .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#7 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#1 branch .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_pci.c#1 branch .. //depot/projects/ia64/sys/dev/acpica/acpi_pcibvar.h#1 branch .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#8 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#10 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#7 integrate .. //depot/projects/ia64/sys/dev/fb/vga.c#3 integrate .. //depot/projects/ia64/sys/dev/kbd/atkbd.c#3 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#13 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#9 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/ia64/sys/dev/pci/pcib_private.h#1 branch .. //depot/projects/ia64/sys/dev/pdq/pdq.c#3 integrate .. //depot/projects/ia64/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sound.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/ia64/sys/dev/syscons/scvidctl.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/ukbd.c#6 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate .. //depot/projects/ia64/sys/geom/geom_gpt.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#19 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#15 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_signal.c#4 integrate .. //depot/projects/ia64/sys/i386/isa/scd.c#5 integrate .. //depot/projects/ia64/sys/i386/isa/stallion.c#4 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_rbch.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#32 integrate .. //depot/projects/ia64/sys/isa/psm.c#6 integrate .. //depot/projects/ia64/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_rrip.c#4 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#24 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#6 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#24 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#16 integrate .. //depot/projects/ia64/sys/kern/sys_process.c#13 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#19 integrate .. //depot/projects/ia64/sys/kern/vfs_cluster.c#10 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#21 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#18 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#6 integrate .. //depot/projects/ia64/sys/net/if_spppsubr.c#6 integrate .. //depot/projects/ia64/sys/net/rtsock.c#11 integrate .. //depot/projects/ia64/sys/net/slcompress.c#2 integrate .. //depot/projects/ia64/sys/netatm/atm_cm.c#8 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/ia64/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#21 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#20 integrate .. //depot/projects/ia64/sys/netinet6/ip6_fw.c#5 integrate .. //depot/projects/ia64/sys/netipx/ipx_ip.c#2 integrate .. //depot/projects/ia64/sys/netns/ns_ip.c#2 integrate .. //depot/projects/ia64/sys/netns/spp_usrreq.c#5 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98gdc.c#2 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98kbd.c#3 integrate .. //depot/projects/ia64/sys/pci/agp.c#7 integrate .. //depot/projects/ia64/sys/pci/agp_i810.c#5 integrate .. //depot/projects/ia64/sys/pci/if_de.c#4 integrate .. //depot/projects/ia64/sys/pci/ncr.c#2 integrate .. //depot/projects/ia64/sys/powerpc/include/ansi.h#11 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#15 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#21 integrate .. //depot/projects/ia64/sys/sys/_types.h#5 integrate .. //depot/projects/ia64/sys/sys/ktr.h#5 integrate .. //depot/projects/ia64/sys/sys/lock.h#5 integrate .. //depot/projects/ia64/sys/sys/proc.h#26 integrate .. //depot/projects/ia64/sys/sys/types.h#15 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vfsops.c#8 integrate .. //depot/projects/ia64/sys/vm/phys_pager.c#6 integrate .. //depot/projects/ia64/sys/vm/pmap.h#8 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#18 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#12 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#30 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#19 integrate .. //depot/projects/ia64/sys/vm/vm_object.h#7 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#18 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#12 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#15 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.history#3 integrate .. //depot/projects/ia64/usr.bin/chat/chat.c#4 integrate .. //depot/projects/ia64/usr.bin/doscmd/trap.c#3 integrate .. //depot/projects/ia64/usr.bin/lex/initscan.c#3 integrate .. //depot/projects/ia64/usr.bin/mail/aux.c#5 integrate .. //depot/projects/ia64/usr.bin/make/Makefile#5 integrate .. //depot/projects/ia64/usr.bin/make/main.c#10 integrate .. //depot/projects/ia64/usr.bin/make/make.1#6 integrate .. //depot/projects/ia64/usr.bin/telnet/telnet.c#3 integrate .. //depot/projects/ia64/usr.bin/top/machine.c#3 integrate .. //depot/projects/ia64/usr.bin/touch/touch.c#6 integrate .. //depot/projects/ia64/usr.bin/ul/ul.c#4 integrate .. //depot/projects/ia64/usr.bin/yacc/reader.c#9 integrate .. //depot/projects/ia64/usr.sbin/apm/apm.c#3 integrate .. //depot/projects/ia64/usr.sbin/edquota/edquota.c#5 integrate .. //depot/projects/ia64/usr.sbin/moused/moused.c#5 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/main.c#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/perform.c#4 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/create/perform.c#11 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/file.c#5 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/async.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/datalink.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/fsm.c#8 integrate .. //depot/projects/ia64/usr.sbin/ppp/prompt.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/slcompress.c#4 integrate .. //depot/projects/ia64/usr.sbin/pppd/fsm.c#2 integrate .. //depot/projects/ia64/usr.sbin/stallion/stlstats/stlstats.c#2 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#7 integrate Differences ... ==== //depot/projects/ia64/bin/df/df.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.27 2002/08/21 17:32:31 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.28 2002/08/26 04:56:23 trhodes Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -46,7 +46,7 @@ .Oc .Op Fl ailn .Op Fl t Ar type -.Op Ar file | file system ... +.Op Ar file | filesystem ... .Sh DESCRIPTION The .Nm ==== //depot/projects/ia64/bin/df/df.c#10 (text+ko) ==== @@ -48,7 +48,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.42 2002/08/21 17:32:31 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.43 2002/08/26 04:56:23 trhodes Exp $"); #include #include @@ -483,7 +483,7 @@ { (void)fprintf(stderr, - "usage: df [-b | -H | -h | -k | -m | -P] [-ailn] [-t type] [file | file system ...]\n"); + "usage: df [-b | -H | -h | -k | -m | -P] [-ailn] [-t type] [file | filesystem ...]\n"); exit(EX_USAGE); } ==== //depot/projects/ia64/bin/ed/main.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.24 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/ed/main.c,v 1.25 2002/08/25 13:01:43 charnier Exp $"); /* * CREDITS @@ -355,7 +355,7 @@ addr = addr_last; break; } - /* FALL THROUGH */ + /* FALLTHROUGH */ default: if (ibufp == hd) return EOF; @@ -489,7 +489,7 @@ case 'e': if (modified && !scripted) return EMOD; - /* fall through */ + /* FALLTHROUGH */ case 'E': if (addr_cnt > 0) { errmsg = "unexpected address"; ==== //depot/projects/ia64/bin/ls/ls.c#9 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.64 2002/08/11 13:05:17 schweikh Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.65 2002/08/25 13:01:45 charnier Exp $"); #include #include @@ -565,36 +565,36 @@ switch (ninitmax) { case 0: maxinode = 0; - /* fall through */ + /* FALLTHROUGH */ case 1: maxblock = 0; - /* fall through */ + /* FALLTHROUGH */ case 2: maxnlink = 0; - /* fall through */ + /* FALLTHROUGH */ case 3: maxuser = 0; - /* fall through */ + /* FALLTHROUGH */ case 4: maxgroup = 0; - /* fall through */ + /* FALLTHROUGH */ case 5: maxflags = 0; - /* fall through */ + /* FALLTHROUGH */ case 6: maxsize = 0; - /* fall through */ + /* FALLTHROUGH */ case 7: maxlen = 0; - /* fall through */ + /* FALLTHROUGH */ case 8: maxlattr = 0; - /* fall through */ + /* FALLTHROUGH */ #ifdef COLORLS if (!f_color) #endif f_notabs = 0; - /* fall through */ + /* FALLTHROUGH */ default: break; } ==== //depot/projects/ia64/bin/mv/mv.1#7 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.24 2002/08/21 17:32:35 trhodes Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.25 2002/08/26 06:16:51 keramida Exp $ .\" .Dd July 9, 2002 .Dt MV 1 @@ -102,7 +102,7 @@ .Fl n options.) .It Fl n -Do not overwriting an existing file. +Do not overwrite an existing file. (The .Fl n option overrides any previous ==== //depot/projects/ia64/bin/sh/expand.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.37 2002/06/30 05:15:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.38 2002/08/25 13:01:47 charnier Exp $"); #include #include @@ -893,7 +893,7 @@ } break; } - /* fall through */ + /* FALLTHROUGH */ case '*': if (ifsset() != 0) sep = ifsval()[0]; ==== //depot/projects/ia64/bin/sh/jobs.c#12 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.56 2002/08/18 06:43:44 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.57 2002/08/24 07:19:01 tjr Exp $"); #include #include @@ -978,7 +978,7 @@ out1str(" (core dumped)"); out1c('\n'); } else - showjob(thisjob, pid, 0, 1); + showjob(thisjob, pid, 0, 0); } } else { TRACE(("Not printing status, rootshell=%d, job=0x%x\n", rootshell, job)); ==== //depot/projects/ia64/bin/sh/parser.c#8 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.43 2002/08/11 03:04:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.44 2002/08/25 13:01:47 charnier Exp $"); #include @@ -193,7 +193,7 @@ case TBACKGND: case TSEMI: tok = readtoken(); - /* fall through */ + /* FALLTHROUGH */ case TNL: if (tok == TNL) { parseheredoc(); ==== //depot/projects/ia64/bin/sh/sh.1#15 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.78 2002/08/21 17:32:44 trhodes Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.79 2002/08/24 12:41:23 tjr Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -1285,7 +1285,7 @@ Continue the specified jobs (or the current job if no jobs are given) in the background. -.It Ic built-in Ar cmd Op Ar arg ... +.It Ic builtin Ar cmd Op Ar arg ... Execute the specified built-in command, .Ar cmd . This is useful when the user wishes to override a shell function ==== //depot/projects/ia64/etc/periodic/security/100.chksetuid#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.4 2002/08/03 22:33:34 gshapiro Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.5 2002/08/25 04:09:17 cjc Exp $ # # If there is a global system configuration file, suck it in. @@ -35,12 +35,12 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" rc=0 case "$daily_status_security_chksetuid_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` echo "" echo 'Checking setuid files and devices:' # XXX Note that there is the possibility of overrunning the args to ls ==== //depot/projects/ia64/etc/periodic/security/200.chkmounts#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.3 2002/05/17 11:34:12 brian Exp $ +# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.4 2002/08/25 04:09:17 cjc Exp $ # # Show changes in the way filesystems are mounted @@ -38,13 +38,13 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" ignore="${daily_status_security_chkmounts_ignore}" rc=0 case "$daily_status_security_chkmounts_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` case "$daily_status_security_noamd" in [Yy][Ee][Ss]) ignore="${ignore}|^amd:" ==== //depot/projects/ia64/etc/periodic/security/500.ipfwdenied#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.2 2002/05/17 11:34:12 brian Exp $ +# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.3 2002/08/25 04:09:17 cjc Exp $ # # Show denied packets @@ -39,12 +39,12 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" rc=0 case "$daily_status_security_ipfwdenied_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` if ipfw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then if [ ! -f ${LOG}/ipfw.today ]; then rc=1 ==== //depot/projects/ia64/etc/periodic/security/550.ipfwlimit#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.3 2002/05/17 11:34:12 brian Exp $ +# $FreeBSD: src/etc/periodic/security/550.ipfwlimit,v 1.4 2002/08/25 04:09:17 cjc Exp $ # # Show ipfw rules which have reached the log limit @@ -38,11 +38,11 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` rc=0 case "$daily_status_security_ipfwlimit_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` IPFW_LOG_LIMIT=`sysctl -n net.inet.ip.fw.verbose_limit 2> /dev/null` if [ $? -eq 0 ] && [ "${IPFW_LOG_LIMIT}" -ne 0 ]; then ipfw -a l | grep " log " | perl -n -e \ ==== //depot/projects/ia64/etc/periodic/security/600.ip6fwdenied#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.2 2002/05/17 11:34:12 brian Exp $ +# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.3 2002/08/25 04:09:17 cjc Exp $ # # Show IPv6 denied packets @@ -38,12 +38,12 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" rc=0 case "$daily_status_security_ip6fwdenied_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` if ip6fw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then if [ ! -f ${LOG}/ip6fw.today ]; then rc=1 ==== //depot/projects/ia64/etc/periodic/security/650.ip6fwlimit#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.3 2002/05/17 11:34:12 brian Exp $ +# $FreeBSD: src/etc/periodic/security/650.ip6fwlimit,v 1.4 2002/08/25 04:09:17 cjc Exp $ # # Show ip6fw rules which have reached the log limit @@ -38,11 +38,11 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` rc=0 case "$daily_status_security_ip6fwlimit_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` IP6FW_LOG_LIMIT=`sysctl -n net.inet6.ip6.fw.verbose_limit 2> /dev/null` if [ $? -eq 0 ] && [ "${IP6FW_LOG_LIMIT}" -ne 0 ]; then ip6fw -a l | grep " log " | perl -n -e \ ==== //depot/projects/ia64/etc/periodic/security/700.kernelmsg#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.4 2002/06/28 10:32:18 brian Exp $ +# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.5 2002/08/25 04:09:17 cjc Exp $ # # Show kernel log messages @@ -38,12 +38,12 @@ source_periodic_confs fi -TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` LOG="${daily_status_security_logdir}" rc=0 case "$daily_status_security_kernelmsg_enable" in [Yy][Ee][Ss]) + TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` if dmesg 2>/dev/null > ${TMP}; then if [ ! -f ${LOG}/dmesg.today ]; then rc=1 ==== //depot/projects/ia64/games/hack/hack.apply.c#2 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.apply.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.apply.c,v 1.5 2000/11/26 09:51:46 kris Exp $ */ + +#include +__FBSDID("$FreeBSD: src/games/hack/hack.apply.c,v 1.6 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" #include "def.edog.h" @@ -37,7 +39,7 @@ use_magic_whistle(obj); break; } - /* fall into next case */ + /* FALLTHROUGH */ case WHISTLE: use_whistle(obj); break; ==== //depot/projects/ia64/games/hack/hack.c#3 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.c,v 1.5 2002/05/23 00:38:07 des Exp $ */ + +#include +__FBSDID("$FreeBSD: src/games/hack/hack.c,v 1.6 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" #include @@ -496,7 +498,7 @@ case '+': if(x != u.ux && y != u.uy) break; if(flags.run != 1) goto stop; - /* fall into next case */ + /* FALLTHROUGH */ case CORR_SYM: corr: if(flags.run == 1 || flags.run == 3) { ==== //depot/projects/ia64/games/hack/hack.do_name.c#2 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.do_name.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.do_name.c,v 1.5 1999/11/16 10:26:36 marcel Exp $ */ + +#include +__FBSDID("$FreeBSD: src/games/hack/hack.do_name.c,v 1.6 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" #include @@ -209,7 +211,7 @@ (void) strcpy(buf, shkname(mtmp)); break; } - /* fall into next case */ + /* FALLTHROUGH */ default: (void) sprintf(buf, "the %s%s", mtmp->minvis ? "invisible " : "", ==== //depot/projects/ia64/games/hack/hack.dog.c#3 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.dog.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.dog.c,v 1.4 2002/05/23 00:38:07 des Exp $ */ + +#include +__FBSDID("$FreeBSD: src/games/hack/hack.dog.c,v 1.5 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" #include "hack.mfndpos.h" @@ -96,7 +98,7 @@ ); default: if(!obj->cursed) return(APPORT); - /* fall into next case */ + /* FALLTHROUGH */ case BALL_SYM: case CHAIN_SYM: case ROCK_SYM: @@ -180,7 +182,7 @@ /* first we look for food */ gtyp = UNDEF; /* no goal as yet */ -#ifdef LINT +#ifdef lint gx = gy = 0; /* suppress 'used before set' message */ #endif /* LINT */ for(obj = fobj; obj; obj = obj->nobj) { ==== //depot/projects/ia64/games/hack/hack.eat.c#3 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.eat.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.eat.c,v 1.5 2002/05/23 00:38:07 des Exp $ */ + +#include +__FBSDID("$FreeBSD: src/games/hack/hack.eat.c,v 1.6 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" char POISONOUS[] = "ADKSVabhks"; @@ -394,11 +396,11 @@ case 'n': u.uhp = u.uhpmax; flags.botl = 1; - /* fall into next case */ + /* FALLTHROUGH */ case '@': pline("You cannibal! You will be sorry for this!"); /* not tp++; */ - /* fall into next case */ + /* FALLTHROUGH */ case 'd': Aggravate_monster |= INTRINSIC; break; @@ -411,12 +413,12 @@ Invis |= INTRINSIC; See_invisible |= INTRINSIC; } - /* fall into next case */ + /* FALLTHROUGH */ case 'y': #ifdef QUEST u.uhorizon++; #endif /* QUEST */ - /* fall into next case */ + /* FALLTHROUGH */ case 'B': Confusion = 50; break; ==== //depot/projects/ia64/games/hack/hack.mkobj.c#3 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.mkobj.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.mkobj.c,v 1.6 2002/05/23 00:38:07 des Exp $ */ + +#include +__FBSDID("$FreeBSD: src/games/hack/hack.mkobj.c,v 1.7 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" @@ -76,7 +78,7 @@ if(otmp->otyp == TIN) otmp->spe = rnd(...); #endif /* NOT_YET_IMPLEMENTED */ - /* fall into next case */ + /* FALLTHROUGH */ case GEM_SYM: otmp->quan = rn2(6) ? 1 : 2; case TOOL_SYM: ==== //depot/projects/ia64/games/hack/hack.objnam.c#2 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.objnam.c - version 1.0.2 */ -/* $FreeBSD: src/games/hack/hack.objnam.c,v 1.3 1999/11/16 02:57:08 billf Exp $ */ + +#include +__FBSDID("$FreeBSD: src/games/hack/hack.objnam.c,v 1.4 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" #define Sprintf (void) sprintf @@ -112,7 +114,7 @@ break; } /* fungis ? */ - /* fall into next case */ + /* FALLTHROUGH */ case WEAPON_SYM: if(obj->otyp == WORM_TOOTH && pl) { pl = 0; @@ -124,7 +126,7 @@ Strcpy(buf, "crysknives"); break; } - /* fall into next case */ + /* FALLTHROUGH */ case ARMOR_SYM: case CHAIN_SYM: case ROCK_SYM: @@ -258,7 +260,7 @@ case ARMOR_SYM: if(obj->owornmask & W_ARMOR) Strcat(bp, " (being worn)"); - /* fall into next case */ + /* FALLTHROUGH */ case WEAPON_SYM: if(obj->known) { Strcat(prefix, sitoa(obj->spe)); ==== //depot/projects/ia64/games/hack/hack.trap.c#3 (text+ko) ==== @@ -1,6 +1,8 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.trap.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.trap.c,v 1.6 2002/05/23 00:38:07 des Exp $ */ + +#include +__FBSDID("$FreeBSD: src/games/hack/hack.trap.c,v 1.7 2002/08/25 13:03:59 charnier Exp $"); #include "hack.h" @@ -256,7 +258,7 @@ break; case TRAPDOOR: if(!xdnstair || u.ustuck) break; - /* fall into next case */ + /* FALLTHROUGH */ default: dotrap(trap); } ==== //depot/projects/ia64/games/hack/hack.wizard.c#2 (text+ko) ==== @@ -1,9 +1,11 @@ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* hack.wizard.c - version 1.0.3 */ -/* $FreeBSD: src/games/hack/hack.wizard.c,v 1.3 1999/11/16 02:57:14 billf Exp $ */ /* wizard code - inspired by rogue code from Merlyn Leroy (digi-g!brian) */ +#include +__FBSDID("$FreeBSD: src/games/hack/hack.wizard.c,v 1.4 2002/08/25 13:03:59 charnier Exp $"); + #include "hack.h" extern struct permonst pm_wizard; extern struct monst *makemon(); @@ -137,7 +139,7 @@ case 1: pline("\"Destroy the thief, my pets!\""); aggravate(); /* aggravate all the monsters */ - /* fall into next case */ + /* FALLTHROUGH */ case 2: if (flags.no_of_wizards == 1 && rnd(5) == 0) /* if only 1 wizard, clone himself */ ==== //depot/projects/ia64/games/phantasia/fight.c#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* * fight.c Phantasia monster fighting routines * - * $FreeBSD: src/games/phantasia/fight.c,v 1.7 1999/11/16 02:57:33 billf Exp $ + * $FreeBSD: src/games/phantasia/fight.c,v 1.8 2002/08/25 13:04:03 charnier Exp $ */ #include @@ -1549,7 +1549,7 @@ } } /* end treasure types 10 - 13 */ - /* fall through to treasure type 9 if no treasure from above */ + /* FALLTHROUGH to treasure type 9 if no treasure from above */ case 9: /* treasure type 9 */ switch (whichtreasure) @@ -1563,7 +1563,7 @@ ++Player.p_crowns; break; } - /* fall through otherwise */ + /* FALLTHROUGH */ case 2: addstr("You've been blessed!\n"); ==== //depot/projects/ia64/games/phantasia/misc.c#3 (text+ko) ==== @@ -1,7 +1,7 @@ /* * misc.c Phantasia miscellaneous support routines * - * $FreeBSD: src/games/phantasia/misc.c,v 1.9 2002/02/18 05:15:16 imp Exp $ + * $FreeBSD: src/games/phantasia/misc.c,v 1.10 2002/08/25 13:04:03 charnier Exp $ */ #include @@ -1114,7 +1114,7 @@ case A_NEAR: /* pick random coordinates near */ xnew = Player.p_x + ROLL(1.0, 5.0); ynew = Player.p_y - ROLL(1.0, 5.0); - /* fall through for check */ + /* FALLTHROUGH for check */ case A_SPECIFIC: /* just move player */ if (Beyond && fabs(xnew) < D_BEYOND && fabs(ynew) < D_BEYOND) ==== //depot/projects/ia64/gnu/usr.bin/diff/diff.1#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/gnu/usr.bin/diff/diff.1,v 1.7 2002/07/11 21:11:26 keramida Exp $ +.\" $FreeBSD: src/gnu/usr.bin/diff/diff.1,v 1.8 2002/08/26 00:13:06 keramida Exp $ .TH DIFF 1 "22sep1993" "GNU Tools" "GNU Tools" .SH NAME diff \- find differences between two files @@ -317,6 +317,9 @@ to output a line taken from just the first file in if-then-else format. .TP +.B \-p +Show which C function each change is in. +.TP .B \-P When comparing directories, if a file appears only in the second directory of the two, treat it as present but empty in the other. ==== //depot/projects/ia64/lib/libc/net/ns_addr.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ns_addr.c 8.1 (Berkeley) 6/7/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/ns_addr.c,v 1.10 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ns_addr.c,v 1.11 2002/08/25 13:06:23 charnier Exp $"); #include #include @@ -167,7 +167,7 @@ case 'h': case 'H': base16 = 1; - /* fall into */ + /* FALLTHROUGH */ default: *--bp = 0; /* Ends Loop */ ==== //depot/projects/ia64/lib/libc/net/ns_ntoa.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)ns_ntoa.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/ns_ntoa.c,v 1.5 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ns_ntoa.c,v 1.6 2002/08/25 13:06:23 charnier Exp $"); #include #include @@ -91,7 +91,7 @@ case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': *p += ('A' - 'a'); - /* fall into . . . */ + /* FALLTHROUGH */ case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': ok = 1; case '1': case '2': case '3': case '4': case '5': ==== //depot/projects/ia64/lib/libc/net/rcmd.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/rcmd.c,v 1.36 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/rcmd.c,v 1.37 2002/08/24 17:37:42 jdp Exp $"); #include "namespace.h" #include @@ -621,7 +621,7 @@ /* We need to get the damn hostname back for netgroup matching. */ if (getnameinfo(raddr, salen, hname, sizeof(hname), NULL, 0, NI_NAMEREQD) != 0) - return (-1); + hname[0] = '\0'; while (fgets(buf, sizeof(buf), hostf)) { p = buf; @@ -660,16 +660,16 @@ break; } if (buf[1] == '@') /* match a host by netgroup */ - hostok = innetgr((char *)&buf[2], - (char *)&hname, NULL, ypdomain); + hostok = hname[0] != '\0' && + innetgr(&buf[2], hname, NULL, ypdomain); else /* match a host by addr */ hostok = __icheckhost(raddr, salen, (char *)&buf[1]); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 13: 5:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BC1D37B405; Mon, 26 Aug 2002 13:04:51 -0700 (PDT) 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 2EED537B400 for ; Mon, 26 Aug 2002 13:04:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8E2A43E7B for ; Mon, 26 Aug 2002 13:04:50 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QK4oJU007840 for ; Mon, 26 Aug 2002 13:04:50 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QK4orU007834 for perforce@freebsd.org; Mon, 26 Aug 2002 13:04:50 -0700 (PDT) Date: Mon, 26 Aug 2002 13:04:50 -0700 (PDT) Message-Id: <200208262004.g7QK4orU007834@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 16600 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16600 Change 16600 by green@green_laptop_2 on 2002/08/26 13:04:05 Snapshot changes to make TrustedBSD/Lomac PLM work. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/kernel_plm.c#2 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/kernel_plm.h#2 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/policy_plm.h#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/kernel_plm.c#2 (text+ko) ==== @@ -95,7 +95,8 @@ struct lomac_node_entry lomac_node_entry_root = { SLIST_HEAD_INITIALIZER(lomac_node_entry), { NULL }, - LN_HIGHEST_LEVEL | LN_INHERIT_HIGH, + {}, /* finish filling in during lomac_plm_initialize() */ + {}, "/" }; @@ -130,21 +131,22 @@ * This is called from inside getnewvnode() before the vnode is in use. */ void -lomac_plm_init_lomacfs_vnode(struct vnode *dvp, struct vnode *vp, - struct componentname *cnp, lattr_t *subjlattr) { - struct lomac_node *ln = VTOLOMAC(vp); +lomac_plm_init_lomacfs_vnode(struct vnode *dvp, struct lomac_node *dln, + struct vnode *vp, struct lomac_node *ln, struct componentname *cnp) +{ struct lomac_node_entry *mlne = NULL; /* * Only "/" has no parent, so inherit directly from our PLM root. */ if (dvp == NULL) { - ln->ln_flags = lomac_node_entry_root.ln_flags; + mac_biba_copy(&lomac_node_entry_root.ln_child_label, + &ln->ln_child_label); + mac_biba_copy(&lomac_node_entry_root.ln_label, + &ln->ln_label); ln->ln_entry = ln->ln_underpolicy = &lomac_node_entry_root; } else { - struct lomac_node *dln = VTOLOMAC(dvp); struct lomac_node_entry *dlne = dln->ln_entry; - int fixup_inherit = 0; /* * If we have no directory-specific entry, we inherit @@ -153,64 +155,40 @@ * from the corresponding lomac_node_entry. */ if (dlne == NULL) { - ln->ln_flags = dln->ln_flags & LN_INHERIT_MASK; - fixup_inherit = 1; + mac_biba_copy(&dln->ln_child_label, + &ln->ln_child_label); + mac_biba_copy(&dln->ln_child_label, &ln->ln_label); ln->ln_underpolicy = dln->ln_underpolicy; ln->ln_entry = NULL; } else if ((mlne = lomac_plm_subtree_find_cnp(dlne, cnp)) == NULL) { - ln->ln_flags = dlne->ln_flags & LN_INHERIT_MASK; - fixup_inherit = 2; + mac_biba_copy(&dlne->ln_child_label, + &ln->ln_child_label); + mac_biba_copy(&dlne->ln_child_label, &ln->ln_label); ln->ln_underpolicy = dlne; ln->ln_entry = NULL; +#ifdef notyet + ln->ln_flags |= + (dlne->ln_flags & LN_CHILD_ATTR_MASK) >> + LN_CHILD_ATTR_SHIFT; +#endif } else { + mac_biba_copy(&mlne->ln_child_label, + &ln->ln_child_label); + mac_biba_copy(&mlne->ln_label, &ln->ln_label); ln->ln_entry = ln->ln_underpolicy = mlne; } - if (fixup_inherit) { - switch (ln->ln_flags) { - case LN_INHERIT_LOW: - ln->ln_flags |= LN_LOWEST_LEVEL; - break; - case LN_INHERIT_SUBJ: - if (subjlattr->level == LOMAC_HIGHEST_LEVEL) - ln->ln_flags |= LN_HIGHEST_LEVEL; - else { - ln->ln_flags &= ~LN_INHERIT_MASK; - ln->ln_flags |= LN_INHERIT_LOW | - LN_LOWEST_LEVEL; - } - break; - case LN_INHERIT_HIGH: - ln->ln_flags |= LN_HIGHEST_LEVEL; - break; - } - if (fixup_inherit == 2) - ln->ln_flags |= - (dlne->ln_flags & LN_CHILD_ATTR_MASK) >> - LN_CHILD_ATTR_SHIFT; - } else { - /* this is the only case where mlne != NULL */ - ln->ln_flags &= ~(LN_INHERIT_MASK | LN_ATTR_MASK); - ln->ln_flags |= mlne->ln_flags & - (LN_INHERIT_MASK | LN_ATTR_MASK); - if ((mlne->ln_flags & LN_LEVEL_MASK) == - LN_SUBJ_LEVEL) { - if (subjlattr->level == LOMAC_HIGHEST_LEVEL) - ln->ln_flags |= LN_HIGHEST_LEVEL; - else - ln->ln_flags |= LN_LOWEST_LEVEL; - } else - ln->ln_flags |= mlne->ln_flags & LN_LEVEL_MASK; - } } - KASSERT(ln->ln_flags & LN_LEVEL_MASK, ("lomac_node has no level")); - KASSERT(ln->ln_flags & LN_INHERIT_MASK, ("lomac_node has no inherit")); + KASSERT(ln->ln_label.mb_flags & MAC_BIBA_FLAG_SINGLE, + ("lomac_node has no level")); + KASSERT(ln->ln_child_label.mb_flags & MAC_BIBA_FLAG_SINGLE, + ("lomac_node has no inherit")); #ifdef INVARIANTS if (mlne != NULL) { - KASSERT(mlne->ln_flags & LN_LEVEL_MASK, + KASSERT(mlne->ln_label.mb_flags & MAC_BIBA_FLAG_SINGLE, ("lomac_node_entry has no level")); - KASSERT(mlne->ln_flags & LN_INHERIT_MASK, + KASSERT(mlne->ln_child_label.mb_flags & MAC_BIBA_FLAG_SINGLE, ("lomac_node_entry has no inherit")); } #endif /* INVARIANTS */ @@ -225,35 +203,12 @@ lne = malloc(sizeof(*lne), M_LOMACPLM, M_WAITOK); bcopy(&head_init, &lne->ln_children, sizeof(head_init)); lne->ln_name = name; - lne->ln_flags = plne->ln_flags & LN_INHERIT_MASK; - switch (lne->ln_flags) { - case LN_INHERIT_LOW: - lne->ln_flags |= LN_LOWEST_LEVEL; - break; - case LN_INHERIT_HIGH: - lne->ln_flags |= LN_HIGHEST_LEVEL; - break; - case LN_INHERIT_SUBJ: - lne->ln_flags |= LN_SUBJ_LEVEL; - break; - } + mac_biba_copy(&plne->ln_child_label, &lne->ln_child_label); + mac_biba_copy(&plne->ln_child_label, &lne->ln_label); SLIST_INSERT_HEAD(&plne->ln_children, lne, ln_chain); return (lne); } -static void -lomac_plm_subtree_free(struct lomac_node_entry *lneself) { - struct lomac_node_entry_head *head = &lneself->ln_children; - struct lomac_node_entry *lne; - - while (!SLIST_EMPTY(head)) { - lne = SLIST_FIRST(head); - SLIST_REMOVE_HEAD(head, ln_chain); - lomac_plm_subtree_free(lne); - } - free(lneself, M_LOMACPLM); -} - struct string_list { SLIST_ENTRY(string_list) entries; char string[1]; @@ -272,29 +227,15 @@ return (sl->string); } -static void -lomac_plm_uninitialize(void) { - struct lomac_node_entry_head *head = &lomac_node_entry_root.ln_children; - struct lomac_node_entry *lne; - struct string_list *sl; - - while (!SLIST_EMPTY(head)) { - lne = SLIST_FIRST(head); - SLIST_REMOVE_HEAD(head, ln_chain); - lomac_plm_subtree_free(lne); - } - while (!SLIST_EMPTY(&string_list_head)) { - sl = SLIST_FIRST(&string_list_head); - SLIST_REMOVE_HEAD(&string_list_head, entries); - free(sl, M_LOMACPLM); - } -} - static int lomac_plm_initialize(void) { struct lomac_node_entry *plne, *lne; plm_rule_t *pr; + mac_biba_set_single(&lomac_node_entry_root.ln_label, + MAC_BIBA_TYPE_HIGH, 0); + mac_biba_set_single(&lomac_node_entry_root.ln_child_label, + MAC_BIBA_TYPE_HIGH, 0); for (pr = plm; pr->path != NULL; pr++) { char *path; char *comp; @@ -339,44 +280,18 @@ } lne->ln_path = pr->path; if (pr->flags == PLM_NOFLAGS) - lne->ln_flags &= ~LN_LEVEL_MASK; + mac_biba_set_single(&lne->ln_label, pr->type, + pr->grade); else - lne->ln_flags &= ~LN_INHERIT_MASK; - lne->ln_flags |= - plm_levelflags_to_node_flags[pr->level][pr->flags]; + mac_biba_set_single(&lne->ln_child_label, pr->type, + pr->grade); +#ifdef notyet if (pr->flags == PLM_NOFLAGS) lne->ln_flags |= pr->attr; else lne->ln_flags |= (pr->attr & LN_ATTR_MASK) << LN_CHILD_ATTR_SHIFT; +#endif } return (0); } - -int lomac_plm_initialized = 0; - -static int -lomac_plm_modevent(module_t module, int event, void *unused) { - int error = 0; - - switch ((enum modeventtype)event) { - case MOD_LOAD: - error = lomac_plm_initialize(); - if (error == 0) - lomac_plm_initialized = 1; - break; - case MOD_UNLOAD: - lomac_plm_uninitialize(); - case MOD_SHUTDOWN: - break; - } - return (error); -} - -static moduledata_t lomac_plm_moduledata = { - "lomac_plm", - &lomac_plm_modevent, - NULL -}; -DECLARE_MODULE(lomac_plm, lomac_plm_moduledata, SI_SUB_VFS, SI_ORDER_ANY); -MODULE_VERSION(lomac_plm, 1); ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/kernel_plm.h#2 (text+ko) ==== @@ -38,7 +38,40 @@ #ifndef KERNEL_PLM_H #define KERNEL_PLM_H -extern int lomac_plm_initialized; /* set to 1 if successfully initialized */ +/* + * This is the "placeholder" structure initialized from the PLM that + * holds the level information for all named objects. + */ +struct lomac_node_entry { + SLIST_HEAD(lomac_node_entry_head, lomac_node_entry) ln_children; + SLIST_ENTRY(lomac_node_entry) ln_chain; /* chain of current level */ + struct mac_biba ln_label; /* label for this node */ + struct mac_biba ln_child_label; /* label for this node's children */ +#if 0 +#define LN_CHILD_ATTR_LOWWRITE 0x0200 /* lower levels may write to */ +#define LN_CHILD_ATTR_LOWNOOPEN 0x0400 /* lower levels may not open */ +#define LN_CHILD_ATTR_NONETDEMOTE 0x0800 /* will not demote on net read */ +#define LN_CHILD_ATTR_NODEMOTE 0x1000 /* subject won't demote on other read */ + u_int ln_flags; +#endif + char *ln_name; /* last component name (to search) */ + const char *ln_path; /* in "stable" storage */ +}; + +/* + * Make certain the mac_biba is at the beginning so we can use obscene + * coding practices for the time being and pretend they're equal for + * vnodes. + */ +struct lomac_node { + struct mac_biba ln_label; + struct mac_biba ln_child_label; + /* What's the last node explicitly specifying policy for this? */ + struct lomac_node_entry *ln_underpolicy; + /* If non-NULL, this corresponds 1:1 to a specific PLM node entry. */ + struct lomac_node_entry *ln_entry; +}; + void lomac_plm_init_lomacfs_vnode(struct vnode *dvp, struct vnode *vp, struct componentname *cnp, lattr_t *subjlattr); ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/policy_plm.h#2 (text+ko) ==== @@ -38,11 +38,9 @@ #ifndef LOMAC_PLM_H #define LOMAC_PLM_H -enum plm_level { - LOW, - SUBJ, - HIGH -}; +#define LOW MAC_BIBA_TYPE_LOW, 0 +#define HIGH MAC_BIBA_TYPE_HIGH, 0 +#define SUBJ MAC_BIBA_TYPE_EQUAL, 0 enum plm_flags { PLM_NOFLAGS, /* rule applies to this node and its children */ PLM_CHILDOF /* rule applies to node's children, not the node */ @@ -52,14 +50,10 @@ #define NONETDEMOTE LN_ATTR_NONETDEMOTE #define NODEMOTE LN_ATTR_NODEMOTE -static u_int plm_levelflags_to_node_flags[3][2] = { - { LN_LOWEST_LEVEL, LN_INHERIT_LOW }, - { LN_SUBJ_LEVEL, LN_INHERIT_SUBJ }, - { LN_HIGHEST_LEVEL, LN_INHERIT_HIGH } -}; - typedef struct plm_rule { - enum plm_level level; /* LOMAC level */ + /* struct mac_biba_element ... */ + u_short type; /* same as mbe_type */ + u_short grade; /* same as mbe_grade */ enum plm_flags flags; /* flags for PLM evaluation */ unsigned int attr; /* LN_ATTR_MASK of flags */ const char *path; /* absolute path for this PLM rule */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 13: 8: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B41D437B401; Mon, 26 Aug 2002 13:07:55 -0700 (PDT) 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 5498037B400 for ; Mon, 26 Aug 2002 13:07:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 149BF43E6E for ; Mon, 26 Aug 2002 13:07:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QK7sJU014326 for ; Mon, 26 Aug 2002 13:07:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QK7sjB014319 for perforce@freebsd.org; Mon, 26 Aug 2002 13:07:54 -0700 (PDT) Date: Mon, 26 Aug 2002 13:07:54 -0700 (PDT) Message-Id: <200208262007.g7QK7sjB014319@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16601 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16601 Change 16601 by peter@peter_daintree on 2002/08/26 13:07:26 this might compile better Affected files ... .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#8 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#8 (text+ko) ==== @@ -27,7 +27,6 @@ * $FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.23 2002/08/26 18:30:27 jhb Exp $ */ #include "opt_acpi.h" -#include "opt_tiger4.h" #include #include #include @@ -83,7 +82,7 @@ if (ACPI_FAILURE(status)) /* This is not an error, but it may reduce functionality. */ device_printf(dev, "could not get PCI interrupt routing table for %s - %s\n", - acpi_name(sc->ap_handle), AcpiFormatException(status)); + acpi_name(acpi_get_handle(dev), AcpiFormatException(status)); /* * Attach the PCI bus proper. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 15: 9:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 299EE37B401; Mon, 26 Aug 2002 15:09:24 -0700 (PDT) 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 D0B3937B400 for ; Mon, 26 Aug 2002 15:09:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A19443E6E for ; Mon, 26 Aug 2002 15:09:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QM9NJU034940 for ; Mon, 26 Aug 2002 15:09:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QM9Nur034937 for perforce@freebsd.org; Mon, 26 Aug 2002 15:09:23 -0700 (PDT) Date: Mon, 26 Aug 2002 15:09:23 -0700 (PDT) Message-Id: <200208262209.g7QM9Nur034937@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16605 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16605 Change 16605 by peter@peter_mckinley on 2002/08/26 15:08:49 turn mpt back off, it is badly hosed. Affected files ... .. //depot/projects/ia64/sys/ia64/conf/I3#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/I3#2 (text+ko) ==== @@ -50,7 +50,7 @@ device pass device isp #device sym -device mpt +#device mpt # ATA and ATAPI devices #device ata @@ -59,7 +59,7 @@ #device atapifd # ATAPI floppy drives device vga -device sc 1 +device sc # Serial (COM) ports device sio To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 15:10:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8C6937B401; Mon, 26 Aug 2002 15:10:25 -0700 (PDT) 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 8BE8E37B400 for ; Mon, 26 Aug 2002 15:10:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C21643E65 for ; Mon, 26 Aug 2002 15:10:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QMAPJU035149 for ; Mon, 26 Aug 2002 15:10:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QMAO0Z035141 for perforce@freebsd.org; Mon, 26 Aug 2002 15:10:24 -0700 (PDT) Date: Mon, 26 Aug 2002 15:10:24 -0700 (PDT) Message-Id: <200208262210.g7QMAO0Z035141@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16606 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16606 Change 16606 by peter@peter_mckinley on 2002/08/26 15:09:42 remove defunct TIGER4 option Affected files ... .. //depot/projects/ia64/sys/ia64/conf/I2#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/I2#3 (text+ko) ==== @@ -8,8 +8,6 @@ #To statically compile in device wiring instead of /boot/device.hints #hints "I2.hints" -options TIGER4 - makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions NO_CPU_COPTFLAGS=true #Ignore any x86 CPUTYPE @@ -64,7 +62,7 @@ #device atapifd # ATAPI floppy drives device vga -device sc 1 +device sc # Serial (COM) ports device sio To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 15:12:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1DD337B406; Mon, 26 Aug 2002 15:12:29 -0700 (PDT) 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 ADE5A37B400 for ; Mon, 26 Aug 2002 15:12:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A4DB43EAF for ; Mon, 26 Aug 2002 15:12:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QMCSJU035535 for ; Mon, 26 Aug 2002 15:12:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QMCSxS035530 for perforce@freebsd.org; Mon, 26 Aug 2002 15:12:28 -0700 (PDT) Date: Mon, 26 Aug 2002 15:12:28 -0700 (PDT) Message-Id: <200208262212.g7QMCSxS035530@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16607 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16607 Change 16607 by peter@peter_mckinley on 2002/08/26 15:11:31 TIGER4 option OBE Affected files ... .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#8 edit Differences ... ==== //depot/projects/ia64/sys/dev/pci/pci_pci.c#8 (text+ko) ==== @@ -47,7 +47,6 @@ #include "pcib_if.h" #include "opt_pci.h" -#include "opt_tiger4.h" static int pcib_probe(device_t dev); static int pcib_attach(device_t dev); @@ -407,51 +406,6 @@ int parent_intpin; int intnum; -#ifdef TIGER4 -int childslot = pci_get_slot(dev); -int childpin = pin - 1; -int childbus = pci_get_bus(dev); -intnum = 255; -#if 0 /* XXX need to hack this at acpi level */ - if (childbus == 1 && childslot == 29 && childpin == 0) - intnum = 50; /* usb */ - if (childbus == 1 && childslot == 29 && childpin == 1) - intnum = 49; /* usb */ -#endif - if (childbus == 1 && childslot == 0 && childpin == 0) - intnum = 18; /* em 51 */ - if (childbus == 3 && childslot == 2 && childpin == 0) - intnum = 52; /* fxp0 63 */ - if (childbus == 5 && childslot == 1 && childpin == 0) - intnum = 24; /* fxp1 52 */ - if (childbus == 10 && childslot == 2 && childpin == 0) - intnum = 76; /* isp0 72 */ - if (childbus == 13 && childslot == 1 && childpin == 0) - intnum = 16; /* fxp2 86 */ -#if 0 - if (childbus == 3 && childslot == 31 && childpin == 0) - intnum = 67; /* hotplug */ - if (childbus == 5 && childslot == 2 && childpin == 0) - intnum = 56; /* mpt0 */ - if (childbus == 5 && childslot == 2 && childpin == 1) - intnum = 57; /* mpt1 */ - if (childbus == 5 && childslot == 31 && childpin == 0) - intnum = 58; /* hotplug */ - if (childbus == 8 && childslot == 31 && childpin == 0) - intnum = 80; /* hotplug */ - if (childbus == 10 && childslot == 31 && childpin == 0) - intnum = 75; /* hotplug */ - if (childbus == 13 && childslot == 31 && childpin == 0) - intnum = 90; /* hotplug */ - if (childbus == 14 && childslot == 31 && childpin == 0) - intnum = 85; /* hotplug */ -#endif -if (intnum != 255) { -device_printf(dev, "pcib_route_interrupt: pci%d:%d:%d - Hardwiring to IRQ %d\n", childbus, childslot, childpin, intnum); -return intnum; -} -#endif - /* * * The PCI standard defines a swizzle of the child-side device/intpin to To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 15:12:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA8AF37B41E; Mon, 26 Aug 2002 15:12:30 -0700 (PDT) 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 F325037B401 for ; Mon, 26 Aug 2002 15:12:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CA0443EB1 for ; Mon, 26 Aug 2002 15:12:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QMCSJU035548 for ; Mon, 26 Aug 2002 15:12:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QMCSs8035542 for perforce@freebsd.org; Mon, 26 Aug 2002 15:12:28 -0700 (PDT) Date: Mon, 26 Aug 2002 15:12:28 -0700 (PDT) Message-Id: <200208262212.g7QMCSs8035542@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16608 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16608 Change 16608 by peter@peter_mckinley on 2002/08/26 15:12:14 opt_tiger4.h OBE Affected files ... .. //depot/projects/ia64/sys/conf/options#27 edit Differences ... ==== //depot/projects/ia64/sys/conf/options#27 (text+ko) ==== @@ -567,6 +567,3 @@ # Log SYSINIT() execution SYSINIT_TRACE opt_sysinit.h - -# MD hacks -TIGER4 opt_tiger4.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 15:22:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA17C37B408; Mon, 26 Aug 2002 15:22:06 -0700 (PDT) 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 52F5437B407 for ; Mon, 26 Aug 2002 15:22:06 -0700 (PDT) Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7AC543E4A for ; Mon, 26 Aug 2002 15:22:05 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 31650 invoked from network); 26 Aug 2002 22:22:05 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 26 Aug 2002 22:22:05 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g7QMM4BQ036600; Mon, 26 Aug 2002 18:22:04 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200208262212.g7QMCSxS035530@freefall.freebsd.org> Date: Mon, 26 Aug 2002 18:22:07 -0400 (EDT) From: John Baldwin To: Peter Wemm Subject: RE: PERFORCE change 16607 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 26-Aug-2002 Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16607 > > Change 16607 by peter@peter_mckinley on 2002/08/26 15:11:31 > > TIGER4 option OBE Wow, that was gross. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 15:31:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DCBE37B401; Mon, 26 Aug 2002 15:31:53 -0700 (PDT) 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 CD52E37B400 for ; Mon, 26 Aug 2002 15:31:52 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6546443E6A for ; Mon, 26 Aug 2002 15:31:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QMVqJU037255 for ; Mon, 26 Aug 2002 15:31:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QMVq0d037252 for perforce@freebsd.org; Mon, 26 Aug 2002 15:31:52 -0700 (PDT) Date: Mon, 26 Aug 2002 15:31:52 -0700 (PDT) Message-Id: <200208262231.g7QMVq0d037252@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16609 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16609 Change 16609 by peter@peter_mckinley on 2002/08/26 15:30:57 really make this compile. Affected files ... .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#9 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#9 (text+ko) ==== @@ -82,7 +82,7 @@ if (ACPI_FAILURE(status)) /* This is not an error, but it may reduce functionality. */ device_printf(dev, "could not get PCI interrupt routing table for %s - %s\n", - acpi_name(acpi_get_handle(dev), AcpiFormatException(status)); + acpi_name(acpi_get_handle(dev)), AcpiFormatException(status)); /* * Attach the PCI bus proper. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 15:37:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE5FA37B401; Mon, 26 Aug 2002 15:37:18 -0700 (PDT) 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 3BE1737B400; Mon, 26 Aug 2002 15:37:18 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0781643E6A; Mon, 26 Aug 2002 15:37:18 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 666D12A7D6; Mon, 26 Aug 2002 15:37:14 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16607 for review In-Reply-To: Date: Mon, 26 Aug 2002 15:37:14 -0700 From: Peter Wemm Message-Id: <20020826223714.666D12A7D6@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin wrote: > > On 26-Aug-2002 Peter Wemm wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16607 > > > > Change 16607 by peter@peter_mckinley on 2002/08/26 15:11:31 > > > > TIGER4 option OBE > > Wow, that was gross. Hey, it worked :-) Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 15:47:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14B6D37B401; Mon, 26 Aug 2002 15:47:12 -0700 (PDT) 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 99C3C37B400 for ; Mon, 26 Aug 2002 15:47:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43CB743E4A for ; Mon, 26 Aug 2002 15:47:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QMlBJU039123 for ; Mon, 26 Aug 2002 15:47:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QMlAGb039120 for perforce@freebsd.org; Mon, 26 Aug 2002 15:47:10 -0700 (PDT) Date: Mon, 26 Aug 2002 15:47:10 -0700 (PDT) Message-Id: <200208262247.g7QMlAGb039120@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16610 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16610 Change 16610 by peter@peter_mckinley on 2002/08/26 15:46:44 revert some crud Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#11 edit .. //depot/projects/ia64/sys/ia64/ia64/sapic.c#11 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#11 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include #include -#include #include #include @@ -88,8 +87,6 @@ static u_int schedclk2; -time_t lts; -u_int64_t lv; void interrupt(u_int64_t vector, struct trapframe *framep) @@ -151,20 +148,8 @@ CTR1(KTR_SMP, "IPI_TEST, cpuid=%d", PCPU_GET(cpuid)); mp_ipi_test++; #endif - } else { -#if 0 -if (1 || vector < 48) { -if (lts != time_second || lv != vector) { - printf(">I%ld<", vector - 32); - lts = time_second; - lv = vector; -} -} else { -cnputc('I'); -} -#endif + } else ia64_dispatch_intr(framep, vector); - } out: atomic_subtract_int(&td->td_intr_nesting_level, 1); @@ -210,11 +195,10 @@ } SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL); - void ia64_add_sapic(struct sapic *sa) { - printf("SAPIC %d is %p, %d-%d\n", ia64_sapic_count, sa, sa->sa_base, sa->sa_limit); + ia64_sapics[ia64_sapic_count++] = sa; } @@ -226,8 +210,7 @@ irq = vector - IA64_HARDWARE_IRQ_BASE; for (i = 0; i < ia64_sapic_count; i++) { struct sapic *sa = ia64_sapics[i]; - if (irq >= sa->sa_base && irq <= sa->sa_limit) { -/* printf("ia64_enable: vector %d -> hw int %d apic %d input %d\n", vector, irq, i, irq - sa->sa_base); */ + if (irq >= sa->sa_base && irq <= sa->sa_limit) sapic_enable(sa, irq - sa->sa_base, vector, (irq < 16 ? SAPIC_TRIGGER_EDGE @@ -235,46 +218,10 @@ (irq < 16 ? SAPIC_POLARITY_HIGH : SAPIC_POLARITY_LOW)); - } } } -#if 0 -#if 0 -long fakecnt; static void -fakeihand(void *junk) -{ - printf(">FAKE %d<", (int)(uintptr_t)junk); -} -#endif -static void -ithds_init2(void *dummy) -{ -#if 0 - void *cookie; - void *arg; -#endif - int i; - - printf("SETTING UP FAKE INTERRUPTS\n"); - for (i = 16; i < 128; i++) { -#if 0 - if (ia64_intrs[i + IA64_HARDWARE_IRQ_BASE]) - continue; - arg = (void *)(uintptr_t)i; - ia64_setup_intr("fake", i + IA64_HARDWARE_IRQ_BASE, fakeihand, arg, INTR_TYPE_TTY, &cookie, &fakecnt); -#else - ia64_enable(i + IA64_HARDWARE_IRQ_BASE); -#endif - } - printf("SETTING UP DONE\n"); - -} -SYSINIT(ithds_init2, SI_SUB_PSEUDO, SI_ORDER_ANY, ithds_init2, NULL); -#endif - -static void ia64_send_eoi(int vector) { int irq, i; @@ -312,7 +259,6 @@ if (i == NULL) return ENOMEM; i->cntp = cntp; -/* printf("ia64_setup_intr: creating ithread for vector %d\n", vector); */ errcode = ithread_create(&i->ithd, vector, 0, 0, ia64_send_eoi, "intr:"); if (errcode) { @@ -325,14 +271,12 @@ mtx_unlock_spin(&ia64_intrs_lock); } -/* printf("ia64_setup_intr: add handler for vector %d\n", vector); */ /* Second, add this handler. */ errcode = ithread_add_handler(i->ithd, name, handler, arg, ithread_priority(flags), flags, cookiep); if (errcode) return errcode; -/* printf("ia64_setup_intr: enable vector %d\n", vector); */ ia64_enable(vector); return 0; } @@ -352,15 +296,12 @@ struct intrhand *ih; int error; - /* * Find the interrupt thread for this vector. */ i = ia64_intrs[vector]; - if (i == NULL) { -printf(">>STRAY IRQ VECTOR %ld (IRQ %ld)<<\n", vector, vector - 32); + if (i == NULL) return; /* no ithread for this vector */ - } ithd = i->ithd; KASSERT(ithd != NULL, ("interrupt vector without a thread")); @@ -369,10 +310,8 @@ * As an optimization, if an ithread has no handlers, don't * schedule it to run. */ - if (TAILQ_EMPTY(&ithd->it_handlers)) { -printf(">>STRAY HANDLER VECTOR %ld (IRQ %ld)<<\n", vector, vector - 32); + if (TAILQ_EMPTY(&ithd->it_handlers)) return; -} if (i->cntp) atomic_add_long(i->cntp, 1); ==== //depot/projects/ia64/sys/ia64/ia64/sapic.c#11 (text+ko) ==== @@ -102,7 +102,6 @@ u_int32_t *p = (u_int32_t *) rte; register_t c; -/* printf("sapic_write_rte: input %d low 0x%08x high 0x%08x\n", which, p[0], p[1]); */ c = intr_disable(); sapic_write(sa, SAPIC_RTE_BASE + 2*which, p[0]); sapic_write(sa, SAPIC_RTE_BASE + 2*which + 1, p[1]); @@ -138,11 +137,9 @@ struct sapic_rte rte; u_int64_t lid = ia64_get_lid(); -/* printf("sapic_enable: input %d vector %d mylid 0x%lx\n", input, vector, lid); */ bzero(&rte, sizeof(rte)); rte.rte_destination_id = (lid >> 24) & 255; rte.rte_destination_eid = (lid >> 16) & 255; -/* printf("sapic_enable: dest_id 0x%x dest_eid 0x%x\n", rte.rte_destination_id, rte.rte_destination_eid); */ rte.rte_trigger_mode = trigger_mode; rte.rte_polarity = polarity; rte.rte_delivery_mode = SAPIC_DELMODE_FIXED; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 16:32:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB64137B405; Mon, 26 Aug 2002 16:32:06 -0700 (PDT) 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 9ECCF37B400 for ; Mon, 26 Aug 2002 16:32:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4071D43E6E for ; Mon, 26 Aug 2002 16:32:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QNW6JU048150 for ; Mon, 26 Aug 2002 16:32:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QNW50o048147 for perforce@freebsd.org; Mon, 26 Aug 2002 16:32:05 -0700 (PDT) Date: Mon, 26 Aug 2002 16:32:05 -0700 (PDT) Message-Id: <200208262332.g7QNW50o048147@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16612 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16612 Change 16612 by peter@peter_mckinley on 2002/08/26 16:31:15 Activate the clock on all AP's. Otherwise the only cpu to get ticks and statclk is the BSP. This is kinda gross, but is rougly copied from alpha, except they have a self-rearming timer. The two divides here should definately go. Secondly, it should compensate for delays by calculating the time to the next tick from when the last tick was supposed to happen. Otherwise we will run slow over time. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/clock.c#7 edit .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#12 edit .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#19 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/clock.c#7 (text+ko) ==== ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#12 (text+ko) ==== @@ -87,6 +87,7 @@ static u_int schedclk2; +extern u_int64_t itc_frequency; void interrupt(u_int64_t vector, struct trapframe *framep) @@ -117,11 +118,25 @@ intrcnt[INTRCNT_CLOCK]++; #endif critical_enter(); - handleclock(framep); - - /* divide hz (1024) by 8 to get stathz (128) */ - if((++schedclk2 & 0x7) == 0) - statclock((struct clockframe *)framep); +#ifdef SMP + /* Only the BSP runs the real clock */ + if (PCPU_GET(cpuid) == 0) { +#endif + handleclock(framep); + /* divide hz (1024) by 8 to get stathz (128) */ + if((++schedclk2 & 0x7) == 0) + statclock((struct clockframe *)framep); +#ifdef SMP + } else { + ia64_set_itm(ia64_get_itc() + (itc_frequency + hz/2) / hz); + mtx_lock_spin(&sched_lock); + hardclock_process(curthread, TRAPF_USERMODE(framep)); + if ((schedclk2 & 0x7) == 0) + statclock_process(curkse, TRAPF_PC(framep), + TRAPF_USERMODE(framep)); + mtx_unlock_spin(&sched_lock); + } +#endif critical_exit(); #ifdef SMP } else if (vector == ipi_vector[IPI_AST]) { ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#19 (text+ko) ==== @@ -58,6 +58,7 @@ void ia64_ap_startup(void); +extern u_int64_t itc_frequency; extern vm_offset_t vhpt_base, vhpt_size; #define LID_SAPIC_ID(x) ((int)((x) >> 24) & 0xff) @@ -116,6 +117,10 @@ PCPU_SET(switchticks, ticks); mtx_lock_spin(&sched_lock); + + /* kick off the clock on this AP */ + ia64_set_itm(ia64_get_itc() + (itc_frequency + hz/2) / hz); + ia64_set_itv(255); cpu_throw(); panic("ia64_ap_startup: cpu_throw() returned"); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 16:32:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7735537B400; Mon, 26 Aug 2002 16:32:08 -0700 (PDT) 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 EB79D37B401 for ; Mon, 26 Aug 2002 16:32:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9354443E72 for ; Mon, 26 Aug 2002 16:32:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QNW6JU048157 for ; Mon, 26 Aug 2002 16:32:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QNW65Z048154 for perforce@freebsd.org; Mon, 26 Aug 2002 16:32:06 -0700 (PDT) Date: Mon, 26 Aug 2002 16:32:06 -0700 (PDT) Message-Id: <200208262332.g7QNW65Z048154@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16613 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16613 Change 16613 by peter@peter_mckinley on 2002/08/26 16:31:43 try and round-robin the hardware interrupts. I dont know if this is working or not. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/sapic.c#12 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/sapic.c#12 (text+ko) ==== @@ -142,7 +142,7 @@ rte.rte_destination_eid = (lid >> 16) & 255; rte.rte_trigger_mode = trigger_mode; rte.rte_polarity = polarity; - rte.rte_delivery_mode = SAPIC_DELMODE_FIXED; + rte.rte_delivery_mode = SAPIC_DELMODE_LOWPRI; rte.rte_vector = vector; sapic_write_rte(sa, input, &rte); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 16:41:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5A9537B406; Mon, 26 Aug 2002 16:41:18 -0700 (PDT) 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 4D5DA37B400 for ; Mon, 26 Aug 2002 16:41:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D69543E42 for ; Mon, 26 Aug 2002 16:41:18 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QNfHJU049132 for ; Mon, 26 Aug 2002 16:41:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QNfHkK049128 for perforce@freebsd.org; Mon, 26 Aug 2002 16:41:17 -0700 (PDT) Date: Mon, 26 Aug 2002 16:41:17 -0700 (PDT) Message-Id: <200208262341.g7QNfHkK049128@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16614 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16614 Change 16614 by peter@peter_daintree on 2002/08/26 16:41:05 it seems that libopie's abuse of utmp.ut_time and lastlog.ll_time are not actually compiled in anywhere. Remove them from the lib. Unfortunately, __getutmpentry() is used from opiepasswd via insecure.c Affected files ... .. //depot/projects/ia64/lib/libopie/Makefile#2 edit Differences ... ==== //depot/projects/ia64/lib/libopie/Makefile#2 (text+ko) ==== @@ -16,7 +16,7 @@ keycrunch.c lock.c lookup.c newseed.c parsechallenge.c passcheck.c \ passwd.c randomchallenge.c readpass.c unlock.c verify.c version.c \ btoe.c accessfile.c generator.c insecure.c getutmpentry.c \ - readrec.c writerec.c login.c open.c logwtmp.c \ + readrec.c writerec.c open.c \ getutline.c pututline.c endutent.c setutent.c # from libmissing SRCS+= opieextra.c INCS= ${OPIE_DIST}/opie.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 16:43:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37DCF37B401; Mon, 26 Aug 2002 16:43:27 -0700 (PDT) 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 DF1D037B400 for ; Mon, 26 Aug 2002 16:43:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BF0243E86 for ; Mon, 26 Aug 2002 16:43:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QNhKJU049581 for ; Mon, 26 Aug 2002 16:43:20 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QNhKbu049578 for perforce@freebsd.org; Mon, 26 Aug 2002 16:43:20 -0700 (PDT) Date: Mon, 26 Aug 2002 16:43:20 -0700 (PDT) Message-Id: <200208262343.g7QNhKbu049578@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16615 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16615 Change 16615 by peter@peter_daintree on 2002/08/26 16:42:32 lastlog.ll_time and utmp.ut_time are actually int32_t, not time_t. Get it right. Affected files ... .. //depot/projects/ia64/share/man/man5/utmp.5#4 edit Differences ... ==== //depot/projects/ia64/share/man/man5/utmp.5#4 (text+ko) ==== @@ -67,7 +67,7 @@ #define UT_HOSTSIZE 16 struct lastlog { - time_t ll_time; /* When user logged in */ + int32_t ll_time; /* When user logged in */ char ll_line[UT_LINESIZE]; /* Terminal line name */ char ll_host[UT_HOSTSIZE]; /* Host user came from */ }; @@ -76,7 +76,7 @@ char ut_line[UT_LINESIZE]; /* Terminal line name */ char ut_name[UT_NAMESIZE]; /* User's login name */ char ut_host[UT_HOSTSIZE]; /* Host user came from */ - time_t ut_time; /* When user logged in */ + int32_t ut_time; /* When user logged in */ }; .Ed .Pp To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 16:45:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6AA937B401; Mon, 26 Aug 2002 16:45:24 -0700 (PDT) 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 7D49137B400 for ; Mon, 26 Aug 2002 16:45:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00DBA43E4A for ; Mon, 26 Aug 2002 16:45:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QNjNJU049706 for ; Mon, 26 Aug 2002 16:45:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QNjNm0049703 for perforce@freebsd.org; Mon, 26 Aug 2002 16:45:23 -0700 (PDT) Date: Mon, 26 Aug 2002 16:45:23 -0700 (PDT) Message-Id: <200208262345.g7QNjNm0049703@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16616 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16616 Change 16616 by peter@peter_daintree on 2002/08/26 16:45:18 patch up some abuse of ut_time Affected files ... .. //depot/projects/ia64/usr.bin/who/who.c#8 edit Differences ... ==== //depot/projects/ia64/usr.bin/who/who.c#8 (text+ko) ==== @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -160,7 +161,7 @@ { char buf[80], tty[sizeof(_PATH_DEV) + UT_LINESIZE]; struct stat sb; - time_t idle; + time_t idle, t; static int d_first = -1; struct tm *tm; char state; @@ -184,7 +185,8 @@ if (Tflag) printf("%c ", state); printf("%-*.*s ", UT_LINESIZE, UT_LINESIZE, ut->ut_line); - tm = localtime(&ut->ut_time); + t = _time32_to_time(ut->ut_time); + tm = localtime(&t); strftime(buf, sizeof(buf), d_first ? "%e %b %R" : "%b %e %R", tm); printf("%-*s ", 12, buf); if (uflag) { @@ -265,7 +267,7 @@ name = "?"; strncpy(ut.ut_name, name, UT_NAMESIZE); strncpy(ut.ut_line, tty, UT_LINESIZE); - time(&ut.ut_time); + ut.ut_time = _time_to_time32(time(NULL)); row(&ut); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 16:47:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0EE6F37B400; Mon, 26 Aug 2002 16:47:30 -0700 (PDT) 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 A37ED37B401 for ; Mon, 26 Aug 2002 16:47:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1245543E6E for ; Mon, 26 Aug 2002 16:47:27 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QNlQJU049868 for ; Mon, 26 Aug 2002 16:47:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QNlQKB049865 for perforce@freebsd.org; Mon, 26 Aug 2002 16:47:26 -0700 (PDT) Date: Mon, 26 Aug 2002 16:47:26 -0700 (PDT) Message-Id: <200208262347.g7QNlQKB049865@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16617 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16617 Change 16617 by peter@peter_daintree on 2002/08/26 16:47:07 try and stop abuse of ut_time Affected files ... .. //depot/projects/ia64/usr.sbin/pppd/auth.c#3 edit Differences ... ==== //depot/projects/ia64/usr.sbin/pppd/auth.c#3 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include #if defined(_PATH_LASTLOG) && defined(_linux_) #include #endif @@ -995,7 +996,7 @@ #endif memset((void *)&utmp, 0, sizeof(utmp)); - (void)time(&utmp.ut_time); + utmp.ut_time = _time_to_time32(time(NULL)); (void)strncpy(utmp.ut_name, user, sizeof(utmp.ut_name)); (void)strncpy(utmp.ut_host, ":PPP", sizeof(utmp.ut_host)); (void)strncpy(utmp.ut_line, tty, sizeof(utmp.ut_line)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 16:49:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F60C37B401; Mon, 26 Aug 2002 16:49:30 -0700 (PDT) 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 3762A37B400 for ; Mon, 26 Aug 2002 16:49:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA95443E75 for ; Mon, 26 Aug 2002 16:49:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7QNnTJU049971 for ; Mon, 26 Aug 2002 16:49:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7QNnTZn049968 for perforce@freebsd.org; Mon, 26 Aug 2002 16:49:29 -0700 (PDT) Date: Mon, 26 Aug 2002 16:49:29 -0700 (PDT) Message-Id: <200208262349.g7QNnTZn049968@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16618 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16618 Change 16618 by peter@peter_daintree on 2002/08/26 16:49:19 Stop abusing utmp.ut_time Affected files ... .. //depot/projects/ia64/usr.sbin/ppp/physical.c#7 edit Differences ... ==== //depot/projects/ia64/usr.sbin/ppp/physical.c#7 (text+ko) ==== @@ -44,6 +44,11 @@ #else #include #endif +#if defined(__FreeBSD__) +#include +#else +#define _time_to_time32(t) (t) +#endif #include "layer.h" #ifndef NONAT @@ -915,7 +920,7 @@ char *colon; memset(&ut, 0, sizeof ut); - time(&ut.ut_time); + ut.ut_time = _time_to_time32(time(NULL)); strncpy(ut.ut_name, name, sizeof ut.ut_name); if (p->handler && (p->handler->type == TCP_DEVICE || p->handler->type == UDP_DEVICE)) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 17:56: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D796037B401; Mon, 26 Aug 2002 17:55:51 -0700 (PDT) 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 7D21D37B400 for ; Mon, 26 Aug 2002 17:55:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FF6143E4A for ; Mon, 26 Aug 2002 17:55:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7R0tpJU059953 for ; Mon, 26 Aug 2002 17:55:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7R0to80059950 for perforce@freebsd.org; Mon, 26 Aug 2002 17:55:50 -0700 (PDT) Date: Mon, 26 Aug 2002 17:55:50 -0700 (PDT) Message-Id: <200208270055.g7R0to80059950@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16621 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16621 Change 16621 by peter@peter_mckinley on 2002/08/26 17:55:15 slight optimization. Precalculate the reload amount once, since we do not have integer divide. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/clock.c#8 edit .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#13 edit .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#20 edit .. //depot/projects/ia64/sys/ia64/include/clock.h#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/clock.c#8 (text+ko) ==== @@ -78,10 +78,9 @@ int adjkerntz; /* local offset from GMT in seconds */ int disable_rtc_set; /* disable resettodr() if != 0 */ int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ +u_int64_t itm_reload; /* reload ticks for clock */ static int beeping = 0; -extern u_int64_t itc_frequency; - #ifndef SMP static timecounter_get_t ia64_get_timecount; @@ -192,7 +191,8 @@ tc_init(&ia64_timecounter); #endif - ia64_set_itm(ia64_get_itc() + (itc_frequency + hz/2) / hz); + itm_reload = (itc_frequency + hz/2) / hz; + ia64_set_itm(ia64_get_itc() + itm_reload); ia64_set_itv(255); /* highest priority class */ stathz = 128; ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#13 (text+ko) ==== @@ -87,7 +87,6 @@ static u_int schedclk2; -extern u_int64_t itc_frequency; void interrupt(u_int64_t vector, struct trapframe *framep) @@ -128,7 +127,7 @@ statclock((struct clockframe *)framep); #ifdef SMP } else { - ia64_set_itm(ia64_get_itc() + (itc_frequency + hz/2) / hz); + ia64_set_itm(ia64_get_itc() + itm_reload); mtx_lock_spin(&sched_lock); hardclock_process(curthread, TRAPF_USERMODE(framep)); if ((schedclk2 & 0x7) == 0) ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#20 (text+ko) ==== @@ -58,7 +58,6 @@ void ia64_ap_startup(void); -extern u_int64_t itc_frequency; extern vm_offset_t vhpt_base, vhpt_size; #define LID_SAPIC_ID(x) ((int)((x) >> 24) & 0xff) @@ -119,7 +118,7 @@ mtx_lock_spin(&sched_lock); /* kick off the clock on this AP */ - ia64_set_itm(ia64_get_itc() + (itc_frequency + hz/2) / hz); + ia64_set_itm(ia64_get_itc() + itm_reload); ia64_set_itv(255); cpu_throw(); panic("ia64_ap_startup: cpu_throw() returned"); ==== //depot/projects/ia64/sys/ia64/include/clock.h#3 (text+ko) ==== @@ -15,6 +15,9 @@ extern int wall_cmos_clock; extern int adjkerntz; +extern u_int64_t itc_frequency; +extern u_int64_t itm_reload; + int sysbeep(int pitch, int period); int acquire_timer2(int mode); int release_timer2(void); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Aug 26 19:20:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1355937B401; Mon, 26 Aug 2002 19:20:41 -0700 (PDT) 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 B81A737B400 for ; Mon, 26 Aug 2002 19:20:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 71CA943E65 for ; Mon, 26 Aug 2002 19:20:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7R2KeJU075760 for ; Mon, 26 Aug 2002 19:20:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7R2KeaU075757 for perforce@freebsd.org; Mon, 26 Aug 2002 19:20:40 -0700 (PDT) Date: Mon, 26 Aug 2002 19:20:40 -0700 (PDT) Message-Id: <200208270220.g7R2KeaU075757@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16624 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16624 Change 16624 by peter@peter_mckinley on 2002/08/26 19:20:04 I do not believe this. The algorithm goes into high orbit if time_t is 64 bit while it tries to iteratively figure out things like whether the year with time_t 2^62 is a leap year or not. If sizeof(time_t) is > 32 bit, use the 32nd bit as the center of the search. Otherwise, the various other while() loops will still be running when the 32 bit time_t clocks over. Affected files ... .. //depot/projects/ia64/lib/libc/stdtime/localtime.c#5 edit Differences ... ==== //depot/projects/ia64/lib/libc/stdtime/localtime.c#5 (text+ko) ==== @@ -1476,6 +1476,12 @@ */ bits = TYPE_BIT(time_t) - 1; /* + * Limit to 32 bits or the things go crazy + * when it tries to figure out times near 2^62 etc. + */ + if (bits > 31) + bits = 31; + /* ** If time_t is signed, then 0 is just above the median, ** assuming two's complement arithmetic. ** If time_t is unsigned, then (1 << bits) is just above the median. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 27 8:10: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F6BE37B401; Tue, 27 Aug 2002 08:08:33 -0700 (PDT) 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 B319037B400 for ; Tue, 27 Aug 2002 08:08:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FB3B43E72 for ; Tue, 27 Aug 2002 08:08:31 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7RF8VJU036590 for ; Tue, 27 Aug 2002 08:08:31 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7RF86BV036549 for perforce@freebsd.org; Tue, 27 Aug 2002 08:08:06 -0700 (PDT) Date: Tue, 27 Aug 2002 08:08:06 -0700 (PDT) Message-Id: <200208271508.g7RF86BV036549@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 16645 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16645 Change 16645 by jhb@jhb_laptop on 2002/08/27 08:07:29 IFC @16643. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/api_up1000.c#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_1000a.c#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_2100_a50.c#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_2100_a500.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_axppci_33.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_eb164.c#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_eb64plus.c#4 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_kn20aa.c#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_kn300.c#5 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_st550.c#6 integrate .. //depot/projects/smpng/sys/alpha/alpha/dec_st6600.c#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/exception.s#7 integrate .. //depot/projects/smpng/sys/alpha/alpha/genassym.c#13 integrate .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#45 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#34 integrate .. //depot/projects/smpng/sys/alpha/alpha/sys_machdep.c#11 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#37 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#14 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#22 integrate .. //depot/projects/smpng/sys/alpha/include/_stdint.h#1 branch .. //depot/projects/smpng/sys/alpha/include/_types.h#1 branch .. //depot/projects/smpng/sys/alpha/include/ansi.h#14 integrate .. //depot/projects/smpng/sys/alpha/include/endian.h#9 integrate .. //depot/projects/smpng/sys/alpha/include/limits.h#4 integrate .. //depot/projects/smpng/sys/alpha/include/pmap.h#10 integrate .. //depot/projects/smpng/sys/alpha/include/proc.h#6 integrate .. //depot/projects/smpng/sys/alpha/include/stdarg.h#3 integrate .. //depot/projects/smpng/sys/alpha/include/types.h#4 delete .. //depot/projects/smpng/sys/alpha/include/varargs.h#3 integrate .. //depot/projects/smpng/sys/alpha/osf1/imgact_osf1.c#6 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#17 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_mount.c#5 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#11 integrate .. //depot/projects/smpng/sys/arm/include/_stdint.h#1 branch .. //depot/projects/smpng/sys/arm/include/_types.h#1 branch .. //depot/projects/smpng/sys/arm/include/ansi.h#11 integrate .. //depot/projects/smpng/sys/arm/include/limits.h#2 integrate .. //depot/projects/smpng/sys/arm/include/types.h#5 delete .. //depot/projects/smpng/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#14 integrate .. //depot/projects/smpng/sys/boot/ficl/loader.c#5 integrate .. //depot/projects/smpng/sys/boot/forth/loader.4th.8#6 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#11 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf.5#5 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/i386_module.c#4 integrate .. //depot/projects/smpng/sys/boot/i386/loader/help.i386#3 integrate .. //depot/projects/smpng/sys/boot/libstand/Makefile#1 branch .. //depot/projects/smpng/sys/boot/libstand/__main.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/alpha/_setjmp.S#1 branch .. //depot/projects/smpng/sys/boot/libstand/arp.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/assert.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/bcd.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/bootp.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/bootp.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/bootparam.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/bootparam.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/bswap.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/bzipfs.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/bzlib.c.diff#1 branch .. //depot/projects/smpng/sys/boot/libstand/bzlib.h.diff#1 branch .. //depot/projects/smpng/sys/boot/libstand/bzlib_private.h.diff#1 branch .. //depot/projects/smpng/sys/boot/libstand/cd9660.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/close.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/closeall.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/dev.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/dosfs.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/dosfs.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/environment.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/ether.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/ext2fs.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/fstat.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/getopt.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/gets.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/globals.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/i386/_setjmp.S#1 branch .. //depot/projects/smpng/sys/boot/libstand/if_ether.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/in_cksum.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/inet_ntoa.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/ioctl.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/iodesc.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/libstand.3#1 branch .. //depot/projects/smpng/sys/boot/libstand/lseek.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/net.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/net.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/netif.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/netif.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/nfs.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/nfsv2.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/nullfs.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/open.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/pager.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/powerpc/_setjmp.S#1 branch .. //depot/projects/smpng/sys/boot/libstand/printf.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/qdivrem.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/quad.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/random.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/rarp.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/read.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/readdir.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/rpc.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/rpc.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/rpcv2.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/saioctl.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/sbrk.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/sparc64/_setjmp.S#1 branch .. //depot/projects/smpng/sys/boot/libstand/splitfs.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/stand.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/stat.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/strcasecmp.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/strdup.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/strerror.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/strtol.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/tftp.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/tftp.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/twiddle.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/udp.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/ufs.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/write.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/zalloc.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/zalloc_defs.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/zalloc_malloc.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/zalloc_mem.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/zalloc_protos.h#1 branch .. //depot/projects/smpng/sys/boot/libstand/zipfs.c#1 branch .. //depot/projects/smpng/sys/boot/libstand/zutil.h.diff#1 branch .. //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#9 integrate .. //depot/projects/smpng/sys/cam/cam_extend.c#2 delete .. //depot/projects/smpng/sys/cam/cam_extend.h#2 delete .. //depot/projects/smpng/sys/cam/cam_periph.c#4 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#7 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#23 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#6 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#6 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/smpng/sys/coda/coda_namecache.c#5 integrate .. //depot/projects/smpng/sys/coda/coda_subr.c#6 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.c#9 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#12 integrate .. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#7 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#16 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#25 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#7 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#12 integrate .. //depot/projects/smpng/sys/compat/svr4/imgact_svr4.c#7 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_fcntl.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#6 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#18 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sockio.c#4 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#9 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_termios.c#5 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_ttold.c#4 integrate .. //depot/projects/smpng/sys/conf/Makefile.alpha#15 integrate .. //depot/projects/smpng/sys/conf/Makefile.i386#15 integrate .. //depot/projects/smpng/sys/conf/Makefile.ia64#20 integrate .. //depot/projects/smpng/sys/conf/Makefile.pc98#14 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#16 integrate .. //depot/projects/smpng/sys/conf/Makefile.sparc64#17 integrate .. //depot/projects/smpng/sys/conf/Makefile.x86_64#2 integrate .. //depot/projects/smpng/sys/conf/NOTES#20 integrate .. //depot/projects/smpng/sys/conf/files#47 integrate .. //depot/projects/smpng/sys/conf/files.alpha#17 integrate .. //depot/projects/smpng/sys/conf/files.i386#28 integrate .. //depot/projects/smpng/sys/conf/files.ia64#18 integrate .. //depot/projects/smpng/sys/conf/files.pc98#28 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#19 integrate .. //depot/projects/smpng/sys/conf/files.x86_64#3 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#14 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#15 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#13 integrate .. //depot/projects/smpng/sys/conf/kmod_syms.awk#4 integrate .. //depot/projects/smpng/sys/conf/majors#11 integrate .. //depot/projects/smpng/sys/conf/options#33 integrate .. //depot/projects/smpng/sys/conf/options.alpha#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actables.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlresrc.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisasm.c#8 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/dmnames.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcl.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcs.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/dmutils.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfobj.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psfind.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psutils.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsio.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rslist.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#9 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.c#6 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#9 integrate .. //depot/projects/smpng/sys/ddb/db_sym.h#4 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#15 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#4 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#30 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_pci.c#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_pcibvar.h#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi_powerres.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_thermal.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#17 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#3 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#22 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#13 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#22 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-all.c#14 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-all.h#8 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#1 branch .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#24 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.h#7 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#11 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#11 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#8 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/smpng/sys/dev/digi/digi_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#3 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/eisa/eisaconf.h#3 integrate .. //depot/projects/smpng/sys/dev/em/README#3 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#10 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#7 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.h#3 integrate .. //depot/projects/smpng/sys/dev/em/if_em_osdep.h#6 integrate .. //depot/projects/smpng/sys/dev/fb/vga.c#7 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#17 integrate .. //depot/projects/smpng/sys/dev/gx/if_gx.c#7 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_buffer.c#4 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#6 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#22 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#16 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#15 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#12 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#15 integrate .. //depot/projects/smpng/sys/dev/kbd/atkbd.c#5 integrate .. //depot/projects/smpng/sys/dev/kbd/atkbdc.c#4 integrate .. //depot/projects/smpng/sys/dev/md/md.c#23 integrate .. //depot/projects/smpng/sys/dev/mii/mii.c#5 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#9 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/fc_log.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_cnfg.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_fc.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_init.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_ioc.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_lan.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_raid.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_targ.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_type.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpt.c#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpt.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpt_debug.c#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpt_freebsd.c#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpt_freebsd.h#1 branch .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#1 branch .. //depot/projects/smpng/sys/dev/nge/if_nge.c#16 integrate .. //depot/projects/smpng/sys/dev/nge/if_ngereg.h#4 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp.c#5 integrate .. //depot/projects/smpng/sys/dev/null/null.c#7 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#10 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#17 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#7 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#7 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#14 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_private.h#1 branch .. //depot/projects/smpng/sys/dev/pci/pcivar.h#7 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq.c#3 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppi.c#4 integrate .. //depot/projects/smpng/sys/dev/pst/pst-iop.c#1 branch .. //depot/projects/smpng/sys/dev/pst/pst-iop.h#1 branch .. //depot/projects/smpng/sys/dev/pst/pst-pci.c#1 branch .. //depot/projects/smpng/sys/dev/pst/pst-raid.c#1 branch .. //depot/projects/smpng/sys/dev/puc/pucdata.c#6 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#1 branch .. //depot/projects/smpng/sys/dev/sab/sab82532reg.h#1 branch .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#6 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbnivar.h#3 integrate .. //depot/projects/smpng/sys/dev/se/se_console.c#2 delete .. //depot/projects/smpng/sys/dev/se/sereg.h#2 delete .. //depot/projects/smpng/sys/dev/si/si.c#6 integrate .. //depot/projects/smpng/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn_pccard.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cs4281.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.h#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/via8233.h#1 branch .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/ac97.h#4 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/smpng/sys/dev/syscons/schistory.c#3 integrate .. //depot/projects/smpng/sys/dev/syscons/scmouse.c#6 integrate .. //depot/projects/smpng/sys/dev/syscons/scvidctl.c#5 integrate .. //depot/projects/smpng/sys/dev/syscons/scvtb.c#2 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#22 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/twe/twe.c#4 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/smpng/sys/dev/tx/if_txvar.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/hid.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/ohci.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/ucomvar.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/udbp.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#1 branch .. //depot/projects/smpng/sys/dev/usb/uftdireg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/ugen.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/ulpt.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#16 integrate .. //depot/projects/smpng/sys/dev/usb/umodem.c#12 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/urio.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usb_port.h#12 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#23 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#23 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi_util.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#1 branch .. //depot/projects/smpng/sys/dev/usb/uvscom.c#4 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumdaemon.c#3 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#8 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#7 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#5 integrate .. //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#9 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#37 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#8 integrate .. //depot/projects/smpng/sys/dev/wi/if_wireg.h#15 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#10 integrate .. //depot/projects/smpng/sys/dev/wi/spectrum24t_cf.h#1 branch .. //depot/projects/smpng/sys/dev/wi/wi_hostap.c#9 integrate .. //depot/projects/smpng/sys/fs/deadfs/dead_vnops.c#4 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs.h#5 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_devs.c#6 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#7 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#18 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#7 integrate .. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vnops.c#7 integrate .. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#15 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#12 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#11 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#7 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_lookup.c#4 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#13 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#12 integrate .. //depot/projects/smpng/sys/fs/ntfs/ntfs_vnops.c#8 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#6 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#7 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_io.c#6 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_node.c#6 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#7 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vnops.c#3 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#6 integrate .. //depot/projects/smpng/sys/fs/portalfs/portal_vnops.c#10 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs.c#5 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs.h#9 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#13 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#8 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_mac.c#1 branch .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#13 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vncache.c#11 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#19 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#7 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_node.c#6 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#11 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#11 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#15 integrate .. //depot/projects/smpng/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/smpng/sys/fs/udf/osta.c#2 integrate .. //depot/projects/smpng/sys/fs/udf/udf.h#2 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#9 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_subr.c#9 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#5 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#7 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#10 integrate .. //depot/projects/smpng/sys/i386/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#9 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#25 integrate .. //depot/projects/smpng/sys/i386/conf/NEWCARD#15 delete .. //depot/projects/smpng/sys/i386/conf/NEWCARD.hints#3 delete .. //depot/projects/smpng/sys/i386/conf/NOTES#39 integrate .. //depot/projects/smpng/sys/i386/conf/OLDCARD#4 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/db_trace.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#1 branch .. //depot/projects/smpng/sys/i386/i386/exception.s#9 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#25 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#42 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#25 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_fcntl.c#5 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_ioctl.c#9 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_misc.c#7 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_signal.c#5 integrate .. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#10 integrate .. //depot/projects/smpng/sys/i386/include/_stdint.h#1 branch .. //depot/projects/smpng/sys/i386/include/_types.h#1 branch .. //depot/projects/smpng/sys/i386/include/acpica_machdep.h#1 branch .. //depot/projects/smpng/sys/i386/include/ansi.h#14 integrate .. //depot/projects/smpng/sys/i386/include/cputypes.h#3 integrate .. //depot/projects/smpng/sys/i386/include/endian.h#9 integrate .. //depot/projects/smpng/sys/i386/include/i4b_ioctl.h#9 integrate .. //depot/projects/smpng/sys/i386/include/limits.h#4 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#12 integrate .. //depot/projects/smpng/sys/i386/include/nexusvar.h#2 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#9 integrate .. //depot/projects/smpng/sys/i386/include/stdarg.h#5 integrate .. //depot/projects/smpng/sys/i386/include/types.h#6 delete .. //depot/projects/smpng/sys/i386/include/varargs.h#3 integrate .. //depot/projects/smpng/sys/i386/isa/apic_vector.s#13 integrate .. //depot/projects/smpng/sys/i386/isa/scd.c#6 integrate .. //depot/projects/smpng/sys/i386/isa/stallion.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/vesa.c#4 integrate .. //depot/projects/smpng/sys/i386/linux/imgact_linux.c#6 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#7 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_rbch.c#7 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_tel.c#5 integrate .. //depot/projects/smpng/sys/i4b/include/i4b_l3l4.h#5 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l2if.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_q931.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#10 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4mgmt.c#3 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#19 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#40 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#34 integrate .. //depot/projects/smpng/sys/ia64/ia64/sapic.c#8 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#16 integrate .. //depot/projects/smpng/sys/ia64/include/_stdint.h#1 branch .. //depot/projects/smpng/sys/ia64/include/_types.h#1 branch .. //depot/projects/smpng/sys/ia64/include/acpica_machdep.h#1 branch .. //depot/projects/smpng/sys/ia64/include/ansi.h#14 integrate .. //depot/projects/smpng/sys/ia64/include/endian.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/limits.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/nexusvar.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/pmap.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/stdarg.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/types.h#4 delete .. //depot/projects/smpng/sys/ia64/include/varargs.h#3 integrate .. //depot/projects/smpng/sys/isa/psm.c#10 integrate .. //depot/projects/smpng/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_rrip.c#4 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#14 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#14 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#16 integrate .. //depot/projects/smpng/sys/kern/init_main.c#21 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_acl.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#24 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_lockf.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#1 branch .. //depot/projects/smpng/sys/kern/kern_mutex.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#7 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#34 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#66 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#3 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_uuid.c#3 integrate .. //depot/projects/smpng/sys/kern/link_aout.c#7 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#13 integrate .. //depot/projects/smpng/sys/kern/subr_clock.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#18 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#18 integrate .. //depot/projects/smpng/sys/kern/subr_taskqueue.c#9 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#37 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#58 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#18 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#21 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#22 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#10 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#18 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#17 integrate .. //depot/projects/smpng/sys/kern/sysv_msg.c#15 integrate .. //depot/projects/smpng/sys/kern/sysv_sem.c#15 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#12 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#14 integrate .. //depot/projects/smpng/sys/kern/tty_tty.c#7 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#3 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#9 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#26 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#19 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#24 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#22 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#26 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#26 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#14 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#12 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#8 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#13 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#30 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#42 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#29 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#8 integrate .. //depot/projects/smpng/sys/libkern/bcmp.c#2 integrate .. //depot/projects/smpng/sys/libkern/ffs.c#2 integrate .. //depot/projects/smpng/sys/libkern/strcat.c#2 integrate .. //depot/projects/smpng/sys/libkern/strcmp.c#2 integrate .. //depot/projects/smpng/sys/libkern/strcpy.c#2 integrate .. //depot/projects/smpng/sys/libkern/strlen.c#2 integrate .. //depot/projects/smpng/sys/libkern/strncmp.c#2 integrate .. //depot/projects/smpng/sys/libkern/strncpy.c#2 integrate .. //depot/projects/smpng/sys/modules/Makefile#30 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/Makefile#1 branch .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#1 branch .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/ahc_pci/Makefile#1 branch .. //depot/projects/smpng/sys/modules/aic7xxx/ahd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/aic7xxx/aicasm/Makefile#1 branch .. //depot/projects/smpng/sys/modules/cam/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ibcs2/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/if_ppp/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/if_tun/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/linux/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/mac_biba/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mac_bsdextended/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mac_ifoff/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mac_mls/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mac_none/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mac_seeotheruids/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mac_test/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mii/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/netgraph/l2tp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/osf1/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/procfs/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/pseudofs/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/sound/driver/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/sound/driver/via8233/Makefile#1 branch .. //depot/projects/smpng/sys/modules/svr4/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/uftdi/Makefile#1 branch .. //depot/projects/smpng/sys/modules/uvisor/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wi/Makefile#6 integrate .. //depot/projects/smpng/sys/net/bpf.c#16 integrate .. //depot/projects/smpng/sys/net/bpfdesc.h#4 integrate .. //depot/projects/smpng/sys/net/bsd_comp.c#5 integrate .. //depot/projects/smpng/sys/net/if.c#26 integrate .. //depot/projects/smpng/sys/net/if.h#10 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#19 integrate .. //depot/projects/smpng/sys/net/if_gif.c#10 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#15 integrate .. //depot/projects/smpng/sys/net/if_pppvar.h#6 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/smpng/sys/net/if_tap.c#15 integrate .. //depot/projects/smpng/sys/net/if_tun.c#14 integrate .. //depot/projects/smpng/sys/net/if_var.h#12 integrate .. //depot/projects/smpng/sys/net/netisr.h#4 integrate .. //depot/projects/smpng/sys/net/ppp_tty.c#8 integrate .. //depot/projects/smpng/sys/net/rtsock.c#21 integrate .. //depot/projects/smpng/sys/net/slcompress.c#2 integrate .. //depot/projects/smpng/sys/netatalk/aarp.c#3 integrate .. //depot/projects/smpng/sys/netatalk/ddp_input.c#6 integrate .. //depot/projects/smpng/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/smpng/sys/netatm/atm_cm.c#7 integrate .. //depot/projects/smpng/sys/netatm/atm_if.c#6 integrate .. //depot/projects/smpng/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/smpng/sys/netgraph/ng_cisco.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_l2tp.h#1 branch .. //depot/projects/smpng/sys/netgraph/ng_mppc.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#11 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#15 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#15 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#5 integrate .. //depot/projects/smpng/sys/netinet/in.h#14 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#28 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#13 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#18 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#10 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#7 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#10 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#13 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#22 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#15 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#26 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#7 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#21 integrate .. //depot/projects/smpng/sys/netinet/tcp_debug.c#3 integrate .. //depot/projects/smpng/sys/netinet/tcp_debug.h#2 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#22 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#24 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#12 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.h#4 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#15 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#10 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#24 integrate .. //depot/projects/smpng/sys/netinet6/esp_input.c#8 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#8 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#17 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.h#6 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#4 integrate .. //depot/projects/smpng/sys/netinet6/ip6_fw.c#7 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#9 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#12 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#8 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#18 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.c#3 integrate .. //depot/projects/smpng/sys/netipx/spx_debug.h#3 integrate .. //depot/projects/smpng/sys/netncp/ncp_conn.c#5 integrate .. //depot/projects/smpng/sys/netncp/ncp_lib.h#4 integrate .. //depot/projects/smpng/sys/netns/ns_ip.c#2 integrate .. //depot/projects/smpng/sys/netns/spp_usrreq.c#5 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.c#5 integrate .. //depot/projects/smpng/sys/netsmb/smb_conn.h#5 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.h#9 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#13 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#9 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#14 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#19 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.h#5 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#15 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#15 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#19 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#11 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#24 integrate .. //depot/projects/smpng/sys/pc98/pc98/pc98gdc.c#4 integrate .. //depot/projects/smpng/sys/pc98/pc98/pc98kbd.c#2 integrate .. //depot/projects/smpng/sys/pc98/pc98/scvtbpc98.c#4 integrate .. //depot/projects/smpng/sys/pc98/pc98/syscons.c#17 integrate .. //depot/projects/smpng/sys/pccard/pccard_nbk.c#9 integrate .. //depot/projects/smpng/sys/pci/agp.c#7 integrate .. //depot/projects/smpng/sys/pci/agp_ali.c#2 integrate .. //depot/projects/smpng/sys/pci/agp_amd.c#5 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#4 integrate .. //depot/projects/smpng/sys/pci/agp_intel.c#6 integrate .. //depot/projects/smpng/sys/pci/agp_sis.c#2 integrate .. //depot/projects/smpng/sys/pci/agp_via.c#3 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#18 integrate .. //depot/projects/smpng/sys/pci/if_de.c#4 integrate .. //depot/projects/smpng/sys/pci/if_mn.c#2 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#8 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#14 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#8 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#14 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#9 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#8 integrate .. //depot/projects/smpng/sys/pci/if_stereg.h#3 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#14 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#6 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#7 integrate .. //depot/projects/smpng/sys/pci/if_vrreg.h#2 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#7 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#11 integrate .. //depot/projects/smpng/sys/pci/ncr.c#3 integrate .. //depot/projects/smpng/sys/pci/ohci_pci.c#4 integrate .. //depot/projects/smpng/sys/pci/uhci_pci.c#5 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/smpng/sys/powerpc/include/_stdint.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/_types.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/ansi.h#14 integrate .. //depot/projects/smpng/sys/powerpc/include/endian.h#8 integrate .. //depot/projects/smpng/sys/powerpc/include/limits.h#4 integrate .. //depot/projects/smpng/sys/powerpc/include/pmap.h#8 integrate .. //depot/projects/smpng/sys/powerpc/include/stdarg.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/types.h#5 delete .. //depot/projects/smpng/sys/powerpc/include/varargs.h#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#21 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#16 integrate .. //depot/projects/smpng/sys/security/lomac/kernel_interface.c#5 integrate .. //depot/projects/smpng/sys/security/lomac/kernel_util.c#10 integrate .. //depot/projects/smpng/sys/security/lomac/lomacfs_subr.c#3 integrate .. //depot/projects/smpng/sys/security/lomac/lomacfs_vfsops.c#3 integrate .. //depot/projects/smpng/sys/security/lomac/lomacfs_vnops.c#6 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#1 branch .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.h#1 branch .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#1 branch .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.h#1 branch .. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#1 branch .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#1 branch .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.h#1 branch .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#1 branch .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#1 branch .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#1 branch .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#18 integrate .. //depot/projects/smpng/sys/sparc64/include/_stdint.h#1 branch .. //depot/projects/smpng/sys/sparc64/include/_types.h#1 branch .. //depot/projects/smpng/sys/sparc64/include/ansi.h#15 integrate .. //depot/projects/smpng/sys/sparc64/include/asmacros.h#11 integrate .. //depot/projects/smpng/sys/sparc64/include/bus.h#6 integrate .. //depot/projects/smpng/sys/sparc64/include/cpu.h#10 integrate .. //depot/projects/smpng/sys/sparc64/include/emul.h#2 delete .. //depot/projects/smpng/sys/sparc64/include/endian.h#10 integrate .. //depot/projects/smpng/sys/sparc64/include/limits.h#4 integrate .. //depot/projects/smpng/sys/sparc64/include/pcb.h#8 integrate .. //depot/projects/smpng/sys/sparc64/include/pcpu.h#6 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#14 integrate .. //depot/projects/smpng/sys/sparc64/include/profile.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/pv.h#8 delete .. //depot/projects/smpng/sys/sparc64/include/signal.h#5 integrate .. //depot/projects/smpng/sys/sparc64/include/stdarg.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/tlb.h#14 integrate .. //depot/projects/smpng/sys/sparc64/include/tsb.h#9 integrate .. //depot/projects/smpng/sys/sparc64/include/tte.h#10 integrate .. //depot/projects/smpng/sys/sparc64/include/types.h#4 delete .. //depot/projects/smpng/sys/sparc64/include/varargs.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/vmparam.h#11 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbusvar.h#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/cache.c#7 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/emul.c#4 delete .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/exception.s#20 delete .. //depot/projects/smpng/sys/sparc64/sparc64/fp.c#7 delete .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#23 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/locore.S#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/locore.s#14 delete .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#31 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.S#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.s#6 delete .. //depot/projects/smpng/sys/sparc64/sparc64/mp_locore.S#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/mp_locore.s#3 delete .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#27 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/prof_machdep.c#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/pv.c#13 delete .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/support.s#15 delete .. //depot/projects/smpng/sys/sparc64/sparc64/swtch.S#1 branch .. //depot/projects/smpng/sys/sparc64/sparc64/swtch.s#15 delete .. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#38 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#15 integrate .. //depot/projects/smpng/sys/sys/_label.h#1 branch .. //depot/projects/smpng/sys/sys/_timespec.h#2 integrate .. //depot/projects/smpng/sys/sys/_types.h#4 integrate .. //depot/projects/smpng/sys/sys/cdrio.h#6 integrate .. //depot/projects/smpng/sys/sys/consio.h#7 integrate .. //depot/projects/smpng/sys/sys/dirent.h#2 integrate .. //depot/projects/smpng/sys/sys/disklabel.h#18 integrate .. //depot/projects/smpng/sys/sys/elf_common.h#3 integrate .. //depot/projects/smpng/sys/sys/errno.h#7 integrate .. //depot/projects/smpng/sys/sys/file.h#11 integrate .. //depot/projects/smpng/sys/sys/ktr.h#10 integrate .. //depot/projects/smpng/sys/sys/link_aout.h#1 branch .. //depot/projects/smpng/sys/sys/link_elf.h#1 branch .. //depot/projects/smpng/sys/sys/linker.h#7 integrate .. //depot/projects/smpng/sys/sys/lock.h#16 integrate .. //depot/projects/smpng/sys/sys/mac.h#1 branch .. //depot/projects/smpng/sys/sys/mac_policy.h#1 branch .. //depot/projects/smpng/sys/sys/mbuf.h#11 integrate .. //depot/projects/smpng/sys/sys/mman.h#4 integrate .. //depot/projects/smpng/sys/sys/mount.h#15 integrate .. //depot/projects/smpng/sys/sys/msg.h#3 integrate .. //depot/projects/smpng/sys/sys/mutex.h#29 integrate .. //depot/projects/smpng/sys/sys/nlist_aout.h#1 branch .. //depot/projects/smpng/sys/sys/pcpu.h#8 integrate .. //depot/projects/smpng/sys/sys/pioctl.h#4 integrate .. //depot/projects/smpng/sys/sys/pipe.h#3 integrate .. //depot/projects/smpng/sys/sys/proc.h#55 integrate .. //depot/projects/smpng/sys/sys/protosw.h#7 integrate .. //depot/projects/smpng/sys/sys/queue.h#7 integrate .. //depot/projects/smpng/sys/sys/sbuf.h#6 integrate .. //depot/projects/smpng/sys/sys/signal.h#7 integrate .. //depot/projects/smpng/sys/sys/socket.h#8 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#24 integrate .. //depot/projects/smpng/sys/sys/stat.h#7 integrate .. //depot/projects/smpng/sys/sys/statvfs.h#2 integrate .. //depot/projects/smpng/sys/sys/stdint.h#3 integrate .. //depot/projects/smpng/sys/sys/syscall.h#18 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#18 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#12 integrate .. //depot/projects/smpng/sys/sys/syslog.h#3 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#20 integrate .. //depot/projects/smpng/sys/sys/systm.h#33 integrate .. //depot/projects/smpng/sys/sys/times.h#3 integrate .. //depot/projects/smpng/sys/sys/timespec.h#2 integrate .. //depot/projects/smpng/sys/sys/types.h#16 integrate .. //depot/projects/smpng/sys/sys/ucred.h#18 integrate .. //depot/projects/smpng/sys/sys/un.h#8 integrate .. //depot/projects/smpng/sys/sys/unistd.h#5 integrate .. //depot/projects/smpng/sys/sys/vnode.h#22 integrate .. //depot/projects/smpng/sys/tools/makeobjops.awk#2 integrate .. //depot/projects/smpng/sys/tools/vnode_if.awk#4 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#15 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#9 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#9 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#14 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#17 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_subr.c#5 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#29 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#7 integrate .. //depot/projects/smpng/sys/ufs/ufs/quota.h#6 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#17 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#10 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_ihash.c#8 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#12 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#15 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_readwrite.c#12 delete .. //depot/projects/smpng/sys/ufs/ufs/ufs_vfsops.c#13 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#19 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#7 integrate .. //depot/projects/smpng/sys/vm/pmap.h#9 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#18 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#9 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#15 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#16 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#8 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#20 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#17 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#8 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#20 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#12 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#14 integrate .. //depot/projects/smpng/sys/vm/vm_swap.c#14 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#17 integrate .. //depot/projects/smpng/sys/x86_64/include/_stdint.h#1 branch .. //depot/projects/smpng/sys/x86_64/include/_types.h#1 branch .. //depot/projects/smpng/sys/x86_64/include/ansi.h#2 integrate .. //depot/projects/smpng/sys/x86_64/include/endian.h#2 integrate .. //depot/projects/smpng/sys/x86_64/include/limits.h#2 integrate .. //depot/projects/smpng/sys/x86_64/include/stdarg.h#2 integrate .. //depot/projects/smpng/sys/x86_64/include/types.h#2 delete Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/api_up1000.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.5 2002/03/20 18:58:44 obrien Exp $ + * $FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.6 2002/08/22 19:52:15 peter Exp $ */ #include "opt_ddb.h" @@ -45,7 +45,7 @@ #include #include -#include "sc.h" +#include "opt_dev_sc.h" #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED @@ -109,7 +109,7 @@ case 3: /* display console ... */ /* XXX */ -#if NSC > 0 +#ifdef DEV_SC sccnattach(); #else panic("not configured to use display && keyboard console"); ==== //depot/projects/smpng/sys/alpha/alpha/db_disasm.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.6 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.7 2002/08/25 13:16:45 charnier Exp $ */ /* $NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $ */ /* @@ -1012,7 +1012,7 @@ case op_sts: case op_stt: fstore = TRUE; - /* fall through */ + /* FALLTHROUGH */ case op_ldl: case op_ldq: case op_ldl_l: >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 27 10:53:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 443FC37B401; Tue, 27 Aug 2002 10:53:13 -0700 (PDT) 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 EFE9037B400 for ; Tue, 27 Aug 2002 10:53:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9084043E6A for ; Tue, 27 Aug 2002 10:53:12 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7RHrCJU061824 for ; Tue, 27 Aug 2002 10:53:12 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7RHrCOq061821 for perforce@freebsd.org; Tue, 27 Aug 2002 10:53:12 -0700 (PDT) Date: Tue, 27 Aug 2002 10:53:12 -0700 (PDT) Message-Id: <200208271753.g7RHrCOq061821@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 16658 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16658 Change 16658 by jhb@jhb_zion on 2002/08/27 10:52:46 Fix up kernel configs. Affected files ... .. //depot/projects/smpng/sys/alpha/conf/ALPHA#4 edit .. //depot/projects/smpng/sys/alpha/conf/ALPHA-up#3 edit .. //depot/projects/smpng/sys/i386/conf/X86#3 edit .. //depot/projects/smpng/sys/i386/conf/X86-up#3 edit .. //depot/projects/smpng/sys/sparc64/conf/SPARC64#7 edit Differences ... ==== //depot/projects/smpng/sys/alpha/conf/ALPHA#4 (text+ko) ==== @@ -73,7 +73,7 @@ device ses # SCSI Environmental Services (and SAF-TE) # atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc 1 # At keyboard controller +device atkbdc # At keyboard controller device atkbd # at keyboard device psm # psm mouse @@ -83,7 +83,7 @@ device splash # syscons is the default console driver, resembling an SCO console -device sc 1 +device sc # real time clock device mcclock ==== //depot/projects/smpng/sys/alpha/conf/ALPHA-up#3 (text+ko) ==== @@ -73,7 +73,7 @@ device ses # SCSI Environmental Services (and SAF-TE) # atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc 1 # At keyboard controller +device atkbdc # At keyboard controller device atkbd # at keyboard device psm # psm mouse @@ -83,7 +83,7 @@ device splash # syscons is the default console driver, resembling an SCO console -device sc 1 +device sc # real time clock device mcclock ==== //depot/projects/smpng/sys/i386/conf/X86#3 (text+ko) ==== @@ -80,7 +80,7 @@ device ses # SCSI Environmental Services (and SAF-TE) # atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc 1 # At keyboard controller +device atkbdc # At keyboard controller device atkbd # at keyboard device psm # psm mouse @@ -90,7 +90,7 @@ device splash # syscons is the default console driver, resembling an SCO console -device sc 1 +device sc options SC_HISTORY_SIZE=1024 # Floating point support - do not disable. ==== //depot/projects/smpng/sys/i386/conf/X86-up#3 (text+ko) ==== @@ -76,7 +76,7 @@ device ses # SCSI Environmental Services (and SAF-TE) # atkbdc0 controls both the keyboard and the PS/2 mouse -device atkbdc 1 # At keyboard controller +device atkbdc # At keyboard controller device atkbd # at keyboard device psm # psm mouse @@ -86,7 +86,7 @@ device splash # syscons is the default console driver, resembling an SCO console -device sc 1 +device sc options SC_HISTORY_SIZE=1024 # Floating point support - do not disable. ==== //depot/projects/smpng/sys/sparc64/conf/SPARC64#7 (text+ko) ==== @@ -60,8 +60,7 @@ makeoptions NO_WERROR=true makeoptions NO_MODULES=true -#options PCI_ENABLE_IO_MODES -#options ATA_ENABLE_BUSMASTER +#options ATA_ENABLE_BUSMASTER options DEBUGGER_ON_POWERFAIL options KTR To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 27 11: 5:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1171537B401; Tue, 27 Aug 2002 11:05:44 -0700 (PDT) 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 AB89937B400 for ; Tue, 27 Aug 2002 11:05:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55E1943E65 for ; Tue, 27 Aug 2002 11:05:43 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7RI5hJU066319 for ; Tue, 27 Aug 2002 11:05:43 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7RI5hpm066314 for perforce@freebsd.org; Tue, 27 Aug 2002 11:05:43 -0700 (PDT) Date: Tue, 27 Aug 2002 11:05:43 -0700 (PDT) Message-Id: <200208271805.g7RI5hpm066314@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 16663 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16663 Change 16663 by jhb@jhb_laptop on 2002/08/27 11:05:23 Make this compile a bit better. Affected files ... .. //depot/projects/smpng/sys/kern/kern_shutdown.c#27 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_shutdown.c#27 (text+ko) ==== @@ -420,7 +420,7 @@ } #ifdef SMP -static uintptr_t panic_thread = NULL; +static struct thread *panic_thread = NULL; #endif /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 27 22: 2:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF88837B401; Tue, 27 Aug 2002 22:02:41 -0700 (PDT) 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 4CD0737B400 for ; Tue, 27 Aug 2002 22:02:41 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CBF4743E65 for ; Tue, 27 Aug 2002 22:02:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7S52eJU070586 for ; Tue, 27 Aug 2002 22:02:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7S52eCm070583 for perforce@freebsd.org; Tue, 27 Aug 2002 22:02:40 -0700 (PDT) Date: Tue, 27 Aug 2002 22:02:40 -0700 (PDT) Message-Id: <200208280502.g7S52eCm070583@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16682 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16682 Change 16682 by rwatson@rwatson_paprika on 2002/08/27 22:01:58 Spell proc as proc instead of pipe. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#41 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#41 (text+ko) ==== @@ -127,7 +127,7 @@ &init_count_pipe, 0, "pipe init calls"); static int init_count_proc; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_proc, CTLFLAG_RD, - &init_count_proc, 0, "pipe init calls"); + &init_count_proc, 0, "proc init calls"); static int init_count_temp; SYSCTL_INT(_security_mac_test, OID_AUTO, init_count_temp, CTLFLAG_RD, &init_count_temp, 0, "temp init calls"); @@ -164,7 +164,7 @@ &destroy_count_pipe, 0, "pipe destroy calls"); static int destroy_count_proc; SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_proc, CTLFLAG_RD, - &destroy_count_proc, 0, "pipe destroy calls"); + &destroy_count_proc, 0, "proc destroy calls"); static int destroy_count_temp; SYSCTL_INT(_security_mac_test, OID_AUTO, destroy_count_temp, CTLFLAG_RD, &destroy_count_temp, 0, "temp destroy calls"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 27 22:17: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1DF237B401; Tue, 27 Aug 2002 22:16:59 -0700 (PDT) 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 70F1337B400 for ; Tue, 27 Aug 2002 22:16:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B44443E3B for ; Tue, 27 Aug 2002 22:16:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7S5GxJU076040 for ; Tue, 27 Aug 2002 22:16:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7S5Gw4x076037 for perforce@freebsd.org; Tue, 27 Aug 2002 22:16:58 -0700 (PDT) Date: Tue, 27 Aug 2002 22:16:58 -0700 (PDT) Message-Id: <200208280516.g7S5Gw4x076037@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16684 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16684 Change 16684 by rwatson@rwatson_paprika on 2002/08/27 22:16:33 Adopt consistent sorting of new pre-syscall entry point as found in mac (store with other process-related entry points rather than in the access control section). Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#122 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#122 (text+ko) ==== @@ -222,6 +222,7 @@ struct vnode *vp, struct label *vnodelabel); void (*mpo_create_proc0)(struct ucred *cred); void (*mpo_create_proc1)(struct ucred *cred); + void (*mpo_pre_syscall_return)(void); void (*mpo_relabel_cred)(struct ucred *cred, struct label *newlabel); @@ -349,7 +350,6 @@ int (*mpo_check_vnode_write)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); - void (*mpo_pre_syscall_return)(void); }; typedef const void *macop_t; @@ -426,6 +426,7 @@ MAC_EXECVE_WILL_TRANSITION, MAC_CREATE_PROC0, MAC_CREATE_PROC1, + MAC_PRE_SYSCALL_RETURN, MAC_RELABEL_CRED, MAC_CHECK_BPFDESC_RECEIVE, MAC_CHECK_CRED_RELABEL, @@ -476,7 +477,6 @@ MAC_CHECK_VNODE_SETUTIMES, MAC_CHECK_VNODE_STAT, MAC_CHECK_VNODE_WRITE, - MAC_PRE_SYSCALL_RETURN, }; struct mac_policy_op_entry { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Aug 27 22:20:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BBD237B401; Tue, 27 Aug 2002 22:20:33 -0700 (PDT) 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 DD51237B400 for ; Tue, 27 Aug 2002 22:20:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9719343E3B for ; Tue, 27 Aug 2002 22:20:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7S5KWJU076352 for ; Tue, 27 Aug 2002 22:20:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7S5KWgR076345 for perforce@freebsd.org; Tue, 27 Aug 2002 22:20:32 -0700 (PDT) Date: Tue, 27 Aug 2002 22:20:32 -0700 (PDT) Message-Id: <200208280520.g7S5KWgR076345@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16685 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16685 Change 16685 by rwatson@rwatson_paprika on 2002/08/27 22:19:39 Adopt sorting parallel to mac.h for pre_syscall, placing it with other process-related events. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#260 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#260 (text+ko) ==== @@ -656,6 +656,10 @@ case MAC_CREATE_PROC1: mpc->mpc_ops->mpo_create_proc1 = mpe->mpe_function; break; + case MAC_PRE_SYSCALL_RETURN: + mpc->mpc_ops->mpo_pre_syscall_return = + mpe->mpe_function; + break; case MAC_RELABEL_CRED: mpc->mpc_ops->mpo_relabel_cred = mpe->mpe_function; @@ -856,10 +860,6 @@ mpc->mpc_ops->mpo_check_vnode_write = mpe->mpe_function; break; - case MAC_PRE_SYSCALL_RETURN: - mpc->mpc_ops->mpo_pre_syscall_return = - mpe->mpe_function; - break; /* default: printf("MAC policy `%s': unknown operation %d\n", @@ -1330,6 +1330,13 @@ MAC_PERFORM(create_proc1, cred); } +void +mac_pre_syscall_return(void) +{ + + MAC_PERFORM(pre_syscall_return); +} + /* * When a new process is created, its label must be initialized. Generally, * this involves inheritence from the parent process, modulo possible @@ -2933,13 +2940,6 @@ return (mac_externalize(&so->so_label, extmac)); } -void -mac_pre_syscall_return(void) -{ - - MAC_PERFORM(pre_syscall_return); -} - int mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so, struct mac *extmac) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 28 17: 1: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8596837B413; Wed, 28 Aug 2002 17:00:16 -0700 (PDT) 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 F127237B405 for ; Wed, 28 Aug 2002 17:00:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24BB143E8A for ; Wed, 28 Aug 2002 16:59:15 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7SNx4JU022843 for ; Wed, 28 Aug 2002 16:59:04 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7SNx4Qa022840 for perforce@freebsd.org; Wed, 28 Aug 2002 16:59:04 -0700 (PDT) Date: Wed, 28 Aug 2002 16:59:04 -0700 (PDT) Message-Id: <200208282359.g7SNx4Qa022840@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16716 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16716 Change 16716 by mini@mini_stylus on 2002/08/28 16:58:11 - Invert the logic in thread_userret(), so that we don't have so many nested blocks. - Split out the logic to determine whether we upcall on the current thread or just discard it into thread_consider_upcalling(). - Don't upcall on a thread when its UTS is busy. Affected files ... .. //depot/projects/kse/sys/kern/kern_thread.c#92 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#92 (text+ko) ==== @@ -483,145 +483,194 @@ } /* - * The extra work we go through if we are a threaded process when we - * return to userland + * Consider whether or not an upcall should be made, and update the + * TDF_UPCALLING flag appropriately. + * + * This function is called when the current thread had been bound to a user + * thread that performed a syscall that blocked, and is now returning. + * Got that? syscall -> msleep -> wakeup -> syscall_return -> us. + * + * This thread will be returned to the UTS in its mailbox as a completed + * thread. We need to decide whether or not to perform an upcall now, + * or simply queue the thread for later. + * + * XXXKSE Future enhancement: We could also return back to + * the thread if we haven't had to do an upcall since then. + * If the KSE's copy is == the thread's copy, and there are + * no other completed threads. + */ +static int +thread_consider_upcalling(struct proc *p, struct ksegrp *kg, struct kse *ke, + struct thread *td, struct trapframe *frame) +{ + int discard, error; + + /* + * Save the thread's context, and link it + * into the KSE's list of completed threads. + */ + error = thread_export_context(td); + td->td_mailbox = NULL; + if (error) + /* + * Failing to do the KSE operation just defaults + * back to synchonous operation, so just return from + * the syscall. + */ + return (error); + + /* + * Second, decide whether to perfom an upcall now. + */ + discard = 0; + + /* Make sure there are no other threads waiting to run. */ + if (TAILQ_FIRST(&kg->kg_runq)) + /* + * Another thread in this KSEG needs to run. + * Switch to it instead of performing an upcall, + * abondoning this thread. + * + * XXXKSE - As for the other threads to run; + * we COULD rush through all the threads + * in this KSEG at this priority, or we + * could throw the ball back into the court + * and just run the highest prio kse available. + * What is OUR priority? The priority of the highest + * sycall waiting to be returned? + * For now, just let another KSE run (easiest). + */ + discard = 1; + + /* Make sure the KSE's UTS context is free for use. */ + if (fuword((caddr_t)ke->ke_mailbox + + offsetof(struct kse_mailbox, km_context) + + offsetof(ucontext_t, uc_busy)) != 0) + /* + * The KSE's UTS context is currently marked busy. This + * means the UTS is currently running, so switch to it + * instead of performing another upcall (abandon this + * thread). + */ + discard = 1; + + /* Discard thread or mark for upcall. */ + if (discard) { + /* + * Perform the upcall later; discard this thread for + * now. + * + * XXXKSE Future enhancement: Shove threads in this + * state onto a list of completed threads hanging + * off the KSEG. Then, collect them before performing + * an upcall. This way, we don't commit to an upcall + * on a particular KSE, but report completed threads on + * the next upcall to any KSE in this KSEG. + * + */ + PROC_LOCK(p); + mtx_lock_spin(&sched_lock); + thread_exit(); /* Abandon current thread. */ + /* NOTREACHED */ + } else + /* + * Perform an upcall now. + * + * XXXKSE - Assumes we are going to userland, and not + * nested in the kernel. + */ + td->td_flags |= TDF_UPCALLING; + return (0); +} + +/* + * The extra work we go through if we are a threaded process when we + * return to userland. * * If we are a KSE process and returning to user mode, check for * extra work to do before we return (e.g. for more syscalls * to complete first). If we were in a critical section, we should * just return to let it finish. Same if we were in the UTS (in - * which case we will have no thread mailbox registered). The only - * traps we suport will have set the mailbox. We will clear it here. + * which case the mailbox's context's busy indicator will equal the + * struct thread address). The only traps we suport will have set the + * mailbox. We will clear it here. */ int thread_userret(struct proc *p, struct ksegrp *kg, struct kse *ke, struct thread *td, struct trapframe *frame) { - int error = 0; + int error; caddr_t ucp; ucontext_t uc; + /* + * Ensure that we have a spare thread available. + */ if (ke->ke_tdspare == NULL) { ke->ke_tdspare = thread_alloc(); } - if (td->td_flags & TDF_UNBOUND) { + + /* + * Bound threads need no additional work. + */ + if ((td->td_flags & TDF_UNBOUND) == 0) { + return (0); + } + error = 0; + + /* + * Decide whether or not we should perform an upcall now. + */ + if (((td->td_flags & TDF_UPCALLING) == 0) && td->td_mailbox) { + error = thread_consider_upcalling(p, kg, ke, td, frame); + if (error != 0) + goto cont; + } + if (td->td_flags & TDF_UPCALLING) { /* - * Are we returning from a thread that had a mailbox? - * - * XXX Maybe this should be in a separate function. + * There is no more work to do and we are going to ride + * this thead/KSE up to userland. */ - if (((td->td_flags & TDF_UPCALLING) == 0) && td->td_mailbox) { - /* - * [XXXKSE Future enhancement] - * We could also go straight back to the syscall - * if we never had to do an upcall since then. - * If the KSE's copy is == the thread's copy.. - * AND there are no other completed threads. - */ - /* - * We will go back as an upcall or go do another thread. - * Either way we need to save the context back to - * the user thread mailbox. - * So the UTS can restart it later. - */ - error = thread_export_context(td); - td->td_mailbox = NULL; - if (error) { - /* - * Failing to do the KSE - * operation just defaults operation - * back to synchonous operation. - */ - goto cont; - } + CTR3(KTR_PROC, "userret: upcall thread %p (pid %d, %s)", + td, p->p_pid, p->p_comm); - if (TAILQ_FIRST(&kg->kg_runq)) { - /* - * Uh-oh.. don't return to the user. - * Instead, switch to the thread that - * needs to run. The question is: - * What do we do with the thread we have now? - * We have put the completion block - * on the kse mailbox. If we had more energy, - * we could lazily do so, assuming someone - * else might get to userland earlier - * and deliver it earlier than we could. - * To do that we could save it off the KSEG. - * An upcalling KSE would 'reap' all completed - * threads. - * Being in a hurry, we'll do nothing and - * leave it on the current KSE for now. - * - * As for the other threads to run; - * we COULD rush through all the threads - * in this KSEG at this priority, or we - * could throw the ball back into the court - * and just run the highest prio kse available. - * What is OUR priority? - * the priority of the highest sycall waiting - * to be returned? - * For now, just let another KSE run (easiest). - */ - PROC_LOCK(p); - mtx_lock_spin(&sched_lock); - thread_exit(); /* Abandon current thread. */ - /* NOTREACHED */ - } else { /* if (number of returning syscalls = 1) */ - /* - * Swap our frame for the upcall frame. - * - * XXXKSE Assumes we are going to user land - * and not nested in the kernel - */ - td->td_flags |= TDF_UPCALLING; - } - } /* - * This is NOT just an 'else' clause for the above test... + * Fetch the current UTS context from userland. */ - if (td->td_flags & TDF_UPCALLING) { - CTR3(KTR_PROC, "userret: upcall thread %p (pid %d, %s)", - td, p->p_pid, p->p_comm); + ucp = (caddr_t)ke->ke_mailbox + + offsetof(struct kse_mailbox, km_context); + error = copyin(ucp, &uc, sizeof(ucontext_t)); + if (error) /* - * There is no more work to do and we are going to ride - * this thead/KSE up to userland. + * Failing to do the KSE operation just defaults + * back to synchonous operation, so just return from + * the syscall. */ + goto cont; - /* - * Set user/machine context to the UTS. - */ - ucp = (caddr_t)ke->ke_mailbox + - offsetof(struct kse_mailbox, km_context); - if (copyin(ucp, &uc, sizeof(ucontext_t)) != 0) - /* - * If copyin() fails here, act as if it had - * read nothing but nulls. This will cause - * the process to crash from the bogus state - * information. - */ - bzero(&uc, sizeof(ucontext_t)); - thread_setcontext(td, &uc); - /* Mark the context busy (XXXSMP: must be atomic). */ - suword(ucp + offsetof(ucontext_t, uc_busy), 1); + /* + * Set user context to the UTS's. + * + * XXX - Add the busy marker to thread_setcontext(). + */ + thread_setcontext(td, &uc); + suword(ucp + offsetof(ucontext_t, uc_busy), (intptr_t)td); - /* - * Make sure the user's pointer to the thread - * mailbox is cleared before we re-enter the kernel - * next time for any reason.. - */ - td->td_flags &= ~TDF_UPCALLING; /* Hmmmm. */ - error = suword((caddr_t)td->td_kse->ke_mailbox + - offsetof(struct kse_mailbox, km_curthread), - 0); - } /* - * Stop any chance that we may be separated from - * the KSE we are currently on. This is "biting the bullet", - * we are committing to go to user space as as THIS KSE here. + * Set state and mailbox. */ + td->td_flags &= ~TDF_UPCALLING; + error = suword((caddr_t)td->td_kse->ke_mailbox + + offsetof(struct kse_mailbox, km_curthread), + 0); + } cont: - td->td_flags &= ~TDF_UNBOUND; - } + /* + * Stop any chance that we may be separated from + * the KSE we are currently on. This is "biting the bullet", + * we are committing to go to user space as as this KSE here. + */ + td->td_flags &= ~TDF_UNBOUND; /* Bind to this user thread. */ return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 28 19:52:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51D2737B401; Wed, 28 Aug 2002 19:52:53 -0700 (PDT) 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 B273E37B400 for ; Wed, 28 Aug 2002 19:52:52 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5968143E6A for ; Wed, 28 Aug 2002 19:52:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7T2qqJU053638 for ; Wed, 28 Aug 2002 19:52:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7T2qqWX053633 for perforce@freebsd.org; Wed, 28 Aug 2002 19:52:52 -0700 (PDT) Date: Wed, 28 Aug 2002 19:52:52 -0700 (PDT) Message-Id: <200208290252.g7T2qqWX053633@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16728 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16728 Change 16728 by rwatson@rwatson_paprika on 2002/08/28 19:52:32 Hook up various include file directories to the include mtree file. Affected files ... .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#12 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#12 (text+ko) ==== @@ -132,6 +132,10 @@ .. mac_mls .. + mac_partition + .. + mac_te + .. sebsd .. .. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 28 19:53:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0B0837B401; Wed, 28 Aug 2002 19:53:54 -0700 (PDT) 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 6550C37B400 for ; Wed, 28 Aug 2002 19:53:54 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21DF743E4A for ; Wed, 28 Aug 2002 19:53:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7T2rsJU053687 for ; Wed, 28 Aug 2002 19:53:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7T2rrlg053684 for perforce@freebsd.org; Wed, 28 Aug 2002 19:53:53 -0700 (PDT) Date: Wed, 28 Aug 2002 19:53:53 -0700 (PDT) Message-Id: <200208290253.g7T2rrlg053684@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16729 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16729 Change 16729 by rwatson@rwatson_paprika on 2002/08/28 19:53:28 Hook up partition, te to the include file install. Affected files ... .. //depot/projects/trustedbsd/mac/include/Makefile#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/include/Makefile#17 (text+ko) ==== @@ -41,7 +41,8 @@ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ security/lomac security/mac_biba security/mac_bsdextended \ - security/mac_lomac security/mac_mls security/sebsd ufs/ffs ufs/ufs + security/mac_lomac security/mac_mls security/mac_partition \ + security/mac_te security/sebsd ufs/ffs ufs/ufs # For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/* # are taken care of To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 28 19:55: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DDB337B401; Wed, 28 Aug 2002 19:54:56 -0700 (PDT) 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 4276537B400 for ; Wed, 28 Aug 2002 19:54:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC97F43E65 for ; Wed, 28 Aug 2002 19:54:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7T2stJU053817 for ; Wed, 28 Aug 2002 19:54:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7T2st5s053814 for perforce@freebsd.org; Wed, 28 Aug 2002 19:54:55 -0700 (PDT) Date: Wed, 28 Aug 2002 19:54:55 -0700 (PDT) Message-Id: <200208290254.g7T2st5s053814@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16730 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16730 Change 16730 by rwatson@rwatson_paprika on 2002/08/28 19:54:24 Since mac_lomac appears to be in the include makefile, add it here also. Affected files ... .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#13 (text+ko) ==== @@ -130,6 +130,8 @@ .. mac_bsdextended .. + mac_lomac + .. mac_mls .. mac_partition To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 28 20:21:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40C0637B408; Wed, 28 Aug 2002 20:21:34 -0700 (PDT) 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 D6D3C37B401 for ; Wed, 28 Aug 2002 20:21:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB6AD43E72 for ; Wed, 28 Aug 2002 20:21:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7T3LWJU060753 for ; Wed, 28 Aug 2002 20:21:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7T3LWmo060749 for perforce@freebsd.org; Wed, 28 Aug 2002 20:21:32 -0700 (PDT) Date: Wed, 28 Aug 2002 20:21:32 -0700 (PDT) Message-Id: <200208290321.g7T3LWmo060749@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16739 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16739 Change 16739 by peter@peter_mckinley on 2002/08/28 20:21:10 record per-cpu interrupt counts and export it via sysctl arrays. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#14 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#14 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include #include +#include #include #include @@ -86,6 +87,15 @@ void (*perf_irq)(unsigned long, struct trapframe *) = dummy_perf; +static unsigned int ints[MAXCPU]; +static unsigned int clks[MAXCPU]; +static unsigned int asts[MAXCPU]; +static unsigned int rdvs[MAXCPU]; +SYSCTL_OPAQUE(_debug, OID_AUTO, ints, CTLFLAG_RW, &ints, sizeof(ints), "IU", ""); +SYSCTL_OPAQUE(_debug, OID_AUTO, clks, CTLFLAG_RW, &clks, sizeof(clks), "IU", ""); +SYSCTL_OPAQUE(_debug, OID_AUTO, asts, CTLFLAG_RW, &asts, sizeof(asts), "IU", ""); +SYSCTL_OPAQUE(_debug, OID_AUTO, rdvs, CTLFLAG_RW, &rdvs, sizeof(rdvs), "IU", ""); + static u_int schedclk2; void @@ -118,6 +128,7 @@ #endif critical_enter(); #ifdef SMP + clks[PCPU_GET(cpuid)]++; /* Only the BSP runs the real clock */ if (PCPU_GET(cpuid) == 0) { #endif @@ -139,8 +150,10 @@ critical_exit(); #ifdef SMP } else if (vector == ipi_vector[IPI_AST]) { + asts[PCPU_GET(cpuid)]++; CTR1(KTR_SMP, "IPI_AST, cpuid=%d", PCPU_GET(cpuid)); } else if (vector == ipi_vector[IPI_RENDEZVOUS]) { + rdvs[PCPU_GET(cpuid)]++; CTR1(KTR_SMP, "IPI_RENDEZVOUS, cpuid=%d", PCPU_GET(cpuid)); smp_rendezvous_action(); } else if (vector == ipi_vector[IPI_STOP]) { @@ -162,8 +175,10 @@ CTR1(KTR_SMP, "IPI_TEST, cpuid=%d", PCPU_GET(cpuid)); mp_ipi_test++; #endif - } else + } else { + ints[PCPU_GET(cpuid)]++; ia64_dispatch_intr(framep, vector); + } out: atomic_subtract_int(&td->td_intr_nesting_level, 1); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 28 20:26: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19B0637B401; Wed, 28 Aug 2002 20:24:57 -0700 (PDT) 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 44E0837B400 for ; Wed, 28 Aug 2002 20:24:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 482EA43E4A for ; Wed, 28 Aug 2002 20:24:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7T3OtJU061220 for ; Wed, 28 Aug 2002 20:24:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7T3OnG4061189 for perforce@freebsd.org; Wed, 28 Aug 2002 20:24:49 -0700 (PDT) Date: Wed, 28 Aug 2002 20:24:49 -0700 (PDT) Message-Id: <200208290324.g7T3OnG4061189@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16741 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16741 Change 16741 by peter@peter_daintree on 2002/08/28 20:24:25 IFC @16736 Affected files ... .. //depot/projects/ia64/UPDATING#18 integrate .. //depot/projects/ia64/contrib/ipfilter/BSD/Makefile#5 integrate .. //depot/projects/ia64/contrib/ipfilter/HISTORY#5 integrate .. //depot/projects/ia64/contrib/ipfilter/fils.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/ip_sfil.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/ipf.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/ipft_ef.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ipft_td.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ipft_tx.c#3 integrate .. //depot/projects/ia64/contrib/ipfilter/ipmon.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/kmem.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/man/ipmon.8#4 integrate .. //depot/projects/ia64/contrib/ipfilter/man/ipnat.5#5 integrate .. //depot/projects/ia64/contrib/ipfilter/parse.c#4 integrate .. //depot/projects/ia64/contrib/ipfilter/printnat.c#5 integrate .. //depot/projects/ia64/contrib/ipfilter/rules/example.9#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/expected/f13#2 integrate .. //depot/projects/ia64/contrib/ipfilter/test/input/f13#2 integrate .. //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#10 integrate .. //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#7 integrate .. //depot/projects/ia64/contrib/sendmail/cf/README#7 integrate .. //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#6 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#7 integrate .. //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#7 integrate .. //depot/projects/ia64/contrib/sendmail/contrib/etrn.0#1 branch .. //depot/projects/ia64/contrib/sendmail/contrib/etrn.pl#2 integrate .. //depot/projects/ia64/contrib/sendmail/contrib/expn.pl#2 integrate .. //depot/projects/ia64/contrib/sendmail/doc/op/op.me#7 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/conf.h#6 integrate .. //depot/projects/ia64/contrib/sendmail/include/sm/varargs.h#4 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/comm.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/engine.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/clock.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/libsm/ldap.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/mail.local/mail.local.8#5 integrate .. //depot/projects/ia64/contrib/sendmail/mail.local/mail.local.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/mailstats/mailstats.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/makemap/makemap.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/praliases/praliases.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/rmail/rmail.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/smrsh/smrsh.8#5 integrate .. //depot/projects/ia64/contrib/sendmail/smrsh/smrsh.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/Makefile.m4#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/TRACEFLAGS#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/aliases.5#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/collect.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/conf.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/conf.h#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/deliver.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/domain.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/err.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/headers.c#3 integrate .. //depot/projects/ia64/contrib/sendmail/src/mailq.1#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/main.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/map.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/mci.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/milter.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/parseaddr.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/queue.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/readcf.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/sasl.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/savemail.c#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/sendmail.8#5 integrate .. //depot/projects/ia64/contrib/sendmail/src/sendmail.h#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/sfsasl.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/srvrsmtp.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/src/usersmtp.c#6 integrate .. //depot/projects/ia64/contrib/sendmail/src/version.c#7 integrate .. //depot/projects/ia64/contrib/sendmail/vacation/vacation.1#7 integrate .. //depot/projects/ia64/contrib/sendmail/vacation/vacation.c#6 integrate .. //depot/projects/ia64/gnu/usr.bin/man/man/man.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#10 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_kern.c#4 integrate .. //depot/projects/ia64/lib/libkvm/kvm_proc.c#9 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#11 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#39 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/share/sgml/release.dsl#3 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/share/sgml/release.dsl#3 integrate .. //depot/projects/ia64/sbin/dump/dump.8#9 integrate .. //depot/projects/ia64/sbin/fsck_ffs/fsck_ffs.8#4 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/fsck_msdosfs.8#6 integrate .. //depot/projects/ia64/sbin/fsck_msdosfs/main.c#5 integrate .. //depot/projects/ia64/sbin/newfs/newfs.8#12 integrate .. //depot/projects/ia64/sbin/ping/ping.c#8 integrate .. //depot/projects/ia64/sbin/quotacheck/quotacheck.8#5 integrate .. //depot/projects/ia64/sbin/quotacheck/quotacheck.c#7 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.8#10 integrate .. //depot/projects/ia64/share/man/man4/ukbd.4#3 integrate .. //depot/projects/ia64/share/man/man4/vlan.4#5 integrate .. //depot/projects/ia64/share/man/man9/ifnet.9#4 integrate .. //depot/projects/ia64/share/termcap/reorder#2 integrate .. //depot/projects/ia64/share/termcap/termcap.src#8 integrate .. //depot/projects/ia64/sys/boot/common/Makefile.inc#3 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf.5#5 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/i386/loader/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/i386/loader/conf.c#4 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/pc98/loader/Makefile#5 integrate .. //depot/projects/ia64/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/ia64/sys/conf/files.i386#16 integrate .. //depot/projects/ia64/sys/conf/files.pc98#13 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/CHANGES.txt#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/acapps.h#1 branch .. //depot/projects/ia64/sys/contrib/dev/acpica/acconfig.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acefi.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acenv.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acfreebsd.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acgcc.h#9 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acglobal.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/aclocal.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acmacros.h#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acobject.h#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acoutput.h#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acparser.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acpiosxf.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acresrc.h#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acutils.h#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/amlcode.h#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbcmds.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbdisply.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbexec.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbfileio.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbhistry.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbinput.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbstats.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbutils.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dbxface.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsfield.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmethod.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsmthdat.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsobject.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dsopcode.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswexec.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswload.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/dswstate.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evevent.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evmisc.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evregion.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evrgnini.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxface.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/evxfevnt.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exdump.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exfldio.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exmisc.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg1.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exoparg2.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exprep.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exregion.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exresop.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exstore.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exsystem.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/exutils.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwacpi.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwgpe.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwregs.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/hwsleep.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsaccess.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsdump.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nseval.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsinit.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsload.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsnames.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nssearch.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsutils.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psargs.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psopcode.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/psparse.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/pstree.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rscreate.c#8 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/rsdump.c#4 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbconvrt.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbget.c#7 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbinstal.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/tbutils.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utdebug.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/uteval.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utglobal.c#6 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utinit.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utmisc.c#5 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/utxface.c#6 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/fil.c#7 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_compat.h#6 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_fil.c#6 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_frag.c#6 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_frag.h#3 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#5 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_nat.c#8 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_nat.h#4 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_proxy.c#8 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_proxy.h#3 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_state.c#7 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ip_state.h#4 integrate .. //depot/projects/ia64/sys/contrib/ipfilter/netinet/ipl.h#6 integrate .. //depot/projects/ia64/sys/dev/acpica/Osd/OsdDebug.c#3 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#18 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_powerres.c#4 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_thermal.c#7 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#9 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#10 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#12 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#10 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_tel.c#3 integrate .. //depot/projects/ia64/sys/kern/kern_condvar.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#14 integrate .. //depot/projects/ia64/sys/kern/link_elf.c#9 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#19 integrate .. //depot/projects/ia64/sys/modules/acpi/Makefile#7 integrate .. //depot/projects/ia64/sys/modules/cbb/Makefile#3 integrate .. //depot/projects/ia64/sys/net/if.h#8 integrate .. //depot/projects/ia64/sys/netinet/ip_h323_pxy.c#1 branch .. //depot/projects/ia64/sys/netinet/ip_ipsec_pxy.c#1 branch .. //depot/projects/ia64/sys/netinet/ip_netbios_pxy.c#1 branch .. //depot/projects/ia64/sys/netsmb/smb_conn.h#4 integrate .. //depot/projects/ia64/sys/netsmb/smb_subr.h#6 integrate .. //depot/projects/ia64/sys/pci/agp.c#8 integrate .. //depot/projects/ia64/sys/pci/agp_ali.c#2 integrate .. //depot/projects/ia64/sys/pci/agp_amd.c#4 integrate .. //depot/projects/ia64/sys/pci/agp_i810.c#6 integrate .. //depot/projects/ia64/sys/pci/agp_intel.c#6 integrate .. //depot/projects/ia64/sys/pci/agp_sis.c#2 integrate .. //depot/projects/ia64/sys/pci/agp_via.c#2 integrate .. //depot/projects/ia64/sys/pci/uhci_pci.c#7 integrate .. //depot/projects/ia64/sys/sparc64/include/md_var.h#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#9 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/locore.S#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#18 integrate .. //depot/projects/ia64/sys/sys/lock.h#6 integrate .. //depot/projects/ia64/sys/sys/proc.h#27 integrate .. //depot/projects/ia64/sys/sys/ucred.h#13 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.history#4 integrate .. //depot/projects/ia64/usr.bin/chkey/chkey.c#5 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.c#9 integrate .. //depot/projects/ia64/usr.bin/find/find.1#10 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdnphone/isdnphone.8#4 integrate .. //depot/projects/ia64/usr.sbin/i4b/isdnphone/main.c#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/README.devel#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/bundle.c#9 integrate .. //depot/projects/ia64/usr.sbin/ppp/ccp.c#8 integrate .. //depot/projects/ia64/usr.sbin/ppp/command.c#11 integrate .. //depot/projects/ia64/usr.sbin/ppp/datalink.c#7 integrate .. //depot/projects/ia64/usr.sbin/ppp/filter.c#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/hdlc.c#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/iface.c#7 integrate .. //depot/projects/ia64/usr.sbin/ppp/ipcp.c#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/ipv6cp.c#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/lcp.c#8 integrate .. //depot/projects/ia64/usr.sbin/ppp/link.c#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/main.c#7 integrate .. //depot/projects/ia64/usr.sbin/ppp/mbuf.c#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/mp.c#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/nat_cmd.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/ncp.c#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/physical.c#8 integrate .. //depot/projects/ia64/usr.sbin/ppp/ppp.8.m4#13 integrate .. //depot/projects/ia64/usr.sbin/ppp/prompt.h#3 integrate .. //depot/projects/ia64/usr.sbin/ppp/radius.c#8 integrate .. //depot/projects/ia64/usr.sbin/ppp/route.c#6 integrate .. //depot/projects/ia64/usr.sbin/ppp/server.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/slcompress.c#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/throughput.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/timer.c#5 integrate Differences ... ==== //depot/projects/ia64/UPDATING#18 (text+ko) ==== @@ -22,6 +22,12 @@ integrity. Re-enabling write caching can substantially improve performance. +20020827: + Our /etc/termcap now has all the entries from the XFree86 xterm + almost unchanged. This means xterm now supports color by default. + If you used TERM=xterm-color in the past you now should use + TERM=xterm. (xterm-color will lead to benign warnings). + 20020815: A "bug" in gcc(1) that was hiding warning in system headers was fixed. It's probably time to add -DNO_WERROR to your make line @@ -1062,4 +1068,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.215 2002/08/15 08:51:24 ru Exp $ +$FreeBSD: src/UPDATING,v 1.216 2002/08/28 19:34:49 schweikh Exp $ ==== //depot/projects/ia64/contrib/ipfilter/BSD/Makefile#5 (text+ko) ==== @@ -231,7 +231,7 @@ ${RM} -f *.core *.o ipt fils ipf ipfstat ipftest ipmon if_ipl ipnat \ vnode_if.h $(LKM) ioconf.h *.ko setdef1.c setdef0.c setdefs.h \ y.tab.? lex.yy.c ipfs - ${RM} -f ../opt_inet6.h + ${RM} -f ../opt_inet6.h ../ipftest ../ipmon ../ipf ../ipnat ${MAKE} -f Makefile.ipsend ${MFLAGS} clean -(for i in *; do \ @@ -243,8 +243,11 @@ done) install: - -$(CP) $(TOP)/ip_fil.h /usr/include/netinet/ip_fil.h - -$(CHMOD) 444 /usr/include/netinet/ip_fil.h + for i in ip_compat.h ip_fil.h ip_nat.h ip_state.h ip_proxy.h \ + ip_frag.h ip_auth.h; do \ + /bin/cp $(TOP)/$$i /usr/include/netinet/; \ + -$(CHMOD) 444 /usr/include/netinet/$$i; \ + done -if [ -d /lkm -a -f if_ipl.o ] ; then \ cp if_ipl.o /lkm; \ fi ==== //depot/projects/ia64/contrib/ipfilter/HISTORY#5 (text+ko) ==== @@ -22,6 +22,29 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +3.4.29 28/8/2002 - Released + +Make substantial changes to the FTP proxy to improve reliability, security +and functionality. + +don't send ICMP errors/TCP RST's in response to blocked proxy packets + +fix potential memory leaks when unloading ipfilter from kernel + +fix bug in SIOCGNATL handler that did not preserve the expected +byte order from earlier versions in the port number + +set do not fragment flag in generated packets according to system flags, +where available. + +preserve filter rule number and group number in state structure + +fix bug in ipmon printing of p/P/b/B + +make some changes to the kmem.c code for IRIX compatibility + +add code to specifically handle ip.tun* interfaces on Solaris + 3.4.28 6/6/2002 - Released Fix for H.323 proxy to work on little endian boxes ==== //depot/projects/ia64/contrib/ipfilter/fils.c#4 (text+ko) ==== @@ -94,7 +94,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fils.c 1.21 4/20/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$Id: fils.c,v 2.21.2.35 2002/04/03 14:18:36 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: fils.c,v 2.21.2.36 2002/06/27 14:29:16 darrenr Exp $"; #endif extern char *optarg; @@ -197,7 +197,7 @@ ipfrstat_t *ifrstp = &ifrst; char *device = IPL_NAME, *memf = NULL; char *kern = NULL; - int c, fd, myoptind; + int c, myoptind; struct protoent *proto; int protocol = -1; /* -1 = wild card for any protocol */ @@ -354,8 +354,8 @@ bzero((char *)&ipsst, sizeof(ipsst)); bzero((char *)&ifrst, sizeof(ifrst)); - fd = ipfstate_live(device, &fiop, &ipsstp, &ifrstp, - &frauthstp, &frf); + ipfstate_live(device, &fiop, &ipsstp, &ifrstp, + &frauthstp, &frf); } else ipfstate_dead(kern, &fiop, &ipsstp, &ifrstp, &frauthstp, &frf); ==== //depot/projects/ia64/contrib/ipfilter/ip_sfil.c#5 (text+ko) ==== @@ -7,7 +7,7 @@ */ #if !defined(lint) static const char sccsid[] = "%W% %G% (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ip_sfil.c,v 2.23.2.18 2002/06/06 10:47:26 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ip_sfil.c,v 2.23.2.20 2002/08/28 12:42:44 darrenr Exp $"; #endif #include @@ -63,8 +63,10 @@ static int frzerostats __P((caddr_t)); #if SOLARIS2 >= 7 static u_int *ip_ttl_ptr; +static u_int *ip_mtudisc; #else static u_long *ip_ttl_ptr; +static u_long *ip_mtudisc; #endif static int frrequest __P((minor_t, int, caddr_t, int)); @@ -86,8 +88,8 @@ for (i = IPL_LOGMAX; i >= 0; i--) ipflog_clear(i); #endif - i = FR_INQUE|FR_OUTQUE; - (void) frflush(IPL_LOGIPF, FR_INQUE|FR_OUTQUE); + i = frflush(IPL_LOGIPF, FR_INQUE|FR_OUTQUE|FR_INACTIVE); + i += frflush(IPL_LOGIPF, FR_INQUE|FR_OUTQUE); ipfr_unload(); fr_stateunload(); ip_natunload(); @@ -142,16 +144,22 @@ return -1; ip_ttl_ptr = NULL; + ip_mtudisc = NULL; /* * XXX - There is no terminator for this array, so it is not possible * to tell if what we are looking for is missing and go off the end * of the array. */ for (i = 0; ; i++) { - if (!strcmp(ip_param_arr[i].ip_param_name, "ip_def_ttl")) { + if (strcmp(ip_param_arr[i].ip_param_name, "ip_def_ttl") == 0) { ip_ttl_ptr = &ip_param_arr[i].ip_param_value; + } else if (strcmp(ip_param_arr[i].ip_param_name, + "ip_path_mtu_discovery") == 0) { + ip_mtudisc = &ip_param_arr[i].ip_param_value; + } + + if (ip_mtudisc != NULL && ip_ttl_ptr != NULL) break; - } } return 0; } @@ -799,6 +807,7 @@ ip = (ip_t *)m->b_rptr; ip->ip_v = IPVERSION; ip->ip_ttl = (u_char)(*ip_ttl_ptr); + ip->ip_off = htons(*ip_mtudisc ? IP_DF : 0); ip_wput(((qif_t *)fin->fin_qif)->qf_ill->ill_wq, m); } READ_ENTER(&ipf_solaris); ==== //depot/projects/ia64/contrib/ipfilter/ipf.c#5 (text+ko) ==== @@ -50,7 +50,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ipf.c 1.23 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipf.c,v 2.10.2.16 2002/06/06 10:48:35 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ipf.c,v 2.10.2.17 2002/06/27 14:29:17 darrenr Exp $"; #endif #if SOLARIS @@ -389,7 +389,7 @@ static void packetlogon(opt) char *opt; { - int flag, err; + int flag; flag = get_flags(); if (flag != 0) { @@ -415,7 +415,7 @@ printf("set log flag: block\n"); } - if (opendevice(ipfname) != -2 && (err = ioctl(fd, SIOCSETFF, &flag))) + if (opendevice(ipfname) != -2 && (ioctl(fd, SIOCSETFF, &flag) != 0)) perror("ioctl(SIOCSETFF)"); if ((opts & (OPT_DONOTHING|OPT_VERBOSE)) == OPT_VERBOSE) { ==== //depot/projects/ia64/contrib/ipfilter/ipft_ef.c#3 (text+ko) ==== @@ -52,7 +52,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ipft_ef.c 1.6 2/4/96 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipft_ef.c,v 2.2.2.2 2002/02/22 15:32:53 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ipft_ef.c,v 2.2.2.3 2002/06/27 14:29:17 darrenr Exp $"; #endif static int etherf_open __P((char *)); @@ -97,7 +97,7 @@ struct protoent *p = NULL; char src[16], dst[16], sprt[16], dprt[16]; char lbuf[128], len[8], prot[8], time[8], *s; - int slen, extra = 0, i, n; + int slen, extra = 0, i; if (!fgets(lbuf, sizeof(lbuf) - 1, efp)) return 0; @@ -108,10 +108,10 @@ bzero(&pkt, sizeof(pkt)); - if ((n = sscanf(lbuf, "%s %s %s %s %s %s", len, prot, src, dst, - sprt, dprt)) != 6) - if ((n = sscanf(lbuf, "%s %s %s %s %s %s %s", time, - len, prot, src, dst, sprt, dprt)) != 7) + if (sscanf(lbuf, "%s %s %s %s %s %s", len, prot, src, dst, + sprt, dprt) != 6) + if (sscanf(lbuf, "%s %s %s %s %s %s %s", time, + len, prot, src, dst, sprt, dprt) != 7) return -1; ip->ip_p = atoi(prot); ==== //depot/projects/ia64/contrib/ipfilter/ipft_td.c#3 (text+ko) ==== @@ -61,7 +61,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ipft_td.c 1.8 2/4/96 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipft_td.c,v 2.2.2.2 2002/02/22 15:32:54 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ipft_td.c,v 2.2.2.3 2002/06/27 14:29:17 darrenr Exp $"; #endif static int tcpd_open __P((char *)); @@ -120,7 +120,7 @@ struct protoent *p; char src[32], dst[32], misc[256], time[32], link1[32], link2[32]; char lbuf[160], *s; - int n, dots, slen, extra = 0; + int n, slen, extra = 0; if (!fgets(lbuf, sizeof(lbuf) - 1, tfp)) return 0; @@ -142,7 +142,7 @@ return -1; } - if ((dots = count_dots(dst)) == 4) { + if (count_dots(dst) == 4) { s = strrchr(src, '.'); *s++ = '\0'; (void) inet_aton(src, &ip->ip_src); ==== //depot/projects/ia64/contrib/ipfilter/ipft_tx.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ipft_tx.c 1.7 6/5/96 (C) 1993 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 2.3.2.6 2002/03/13 03:55:15 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ipft_tx.c,v 2.3.2.7 2002/06/27 14:29:17 darrenr Exp $"; #endif extern int opts; @@ -177,10 +177,8 @@ int cnt, *dir; { register char *s; - ip_t *ip; char line[513]; - ip = (ip_t *)buf; *ifn = NULL; while (fgets(line, sizeof(line)-1, tfp)) { if ((s = index(line, '\n'))) @@ -197,7 +195,7 @@ *dir = 0; if (!parseline(line, (ip_t *)buf, ifn, dir)) #if 0 - return sizeof(*ip) + sizeof(tcphdr_t); + return sizeof(ip_t) + sizeof(tcphdr_t); #else return sizeof(ip_t); #endif ==== //depot/projects/ia64/contrib/ipfilter/ipmon.c#4 (text+ko) ==== @@ -70,7 +70,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)ipmon.c 1.21 6/5/96 (C)1993-2000 Darren Reed"; /* static const char rcsid[] = "@(#)$Id: ipmon.c,v 2.12.2.13 2001/07/19 12:24:59 darrenr Exp $"; */ -static const char rcsid[] = "@(#)$FreeBSD: src/contrib/ipfilter/ipmon.c,v 1.14 2002/06/07 09:01:41 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/contrib/ipfilter/ipmon.c,v 1.15 2002/08/28 13:45:32 darrenr Exp $"; #endif @@ -961,13 +961,13 @@ *t++ = 'S'; lvl = LOG_ERR; } else if (ipf->fl_flags & FR_PASS) { - if (ipf->fl_flags & FR_LOGP) + if (ipf->fl_flags & FR_LOG) *t++ = 'p'; else *t++ = 'P'; lvl = LOG_NOTICE; } else if (ipf->fl_flags & FR_BLOCK) { - if (ipf->fl_flags & FR_LOGB) + if (ipf->fl_flags & FR_LOG) *t++ = 'b'; else *t++ = 'B'; ==== //depot/projects/ia64/contrib/ipfilter/kmem.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)kmem.c 1.4 1/12/96 (C) 1992 Darren Reed"; -static const char rcsid[] = "@(#)$Id: kmem.c,v 2.2.2.14 2002/04/17 17:44:44 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: kmem.c,v 2.2.2.15 2002/07/27 15:59:37 darrenr Exp $"; #endif #ifdef __sgi @@ -55,7 +55,7 @@ static int kvm_fd = -1; static char *kvm_errstr; -kvm_t kvm_open(kernel, core, swap, mode, errstr) +kvm_t *kvm_open(kernel, core, swap, mode, errstr) char *kernel, *core, *swap; int mode; char *errstr; @@ -65,17 +65,18 @@ if (core == NULL) core = "/dev/kmem"; kvm_fd = open(core, mode); - return (kvm_fd >= 0) ? (kvm_t)&kvm_fd : NULL; + return (kvm_fd >= 0) ? (kvm_t *)&kvm_fd : NULL; } int kvm_read(kvm, pos, buffer, size) -kvm_t kvm; +kvm_t *kvm; u_long pos; char *buffer; size_t size; { - int r, left; + size_t left; char *bufp; + int r; if (lseek(*kvm, pos, 0) == -1) { fprintf(stderr, "%s", kvm_errstr); @@ -97,13 +98,19 @@ int openkmem(kern, core) char *kern, *core; { + union { + int ui; + kvm_t *uk; + } k; + kvm_f = kvm_open(kern, core, NULL, O_RDONLY, ""); if (kvm_f == NULL) { perror("openkmem:open"); return -1; } - return (int)kvm_f; + k.uk = kvm_f; + return k.ui; } int kmemcpy(buf, pos, n) @@ -120,7 +127,7 @@ if (openkmem(NULL, NULL) == -1) return -1; - while ((r = kvm_read(kvm_f, pos, buf, n)) < n) + while ((r = kvm_read(kvm_f, pos, buf, (size_t)n)) < n) if (r <= 0) { fprintf(stderr, "pos=0x%x ", (u_int)pos); @@ -152,7 +159,7 @@ while (n > 0) { - r = kvm_read(kvm_f, pos, buf, 1); + r = kvm_read(kvm_f, pos, buf, (size_t)1); if (r <= 0) { fprintf(stderr, "pos=0x%x ", (u_int)pos); ==== //depot/projects/ia64/contrib/ipfilter/man/ipmon.8#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/contrib/ipfilter/man/ipmon.8,v 1.10 2002/04/25 03:36:26 darrenr Exp $ +.\" $FreeBSD: src/contrib/ipfilter/man/ipmon.8,v 1.11 2002/08/28 13:45:36 darrenr Exp $ .TH ipmon 8 .SH NAME ipmon \- monitors /dev/ipl for logged packets @@ -47,8 +47,11 @@ 4. The group and rule number of the rule, e.g., \fB@0:17\fP. These can be viewed with \fBipfstat -n\fP. .LP -5. The action: \fBp\fP for passed, \fBb\fP for blocked, \fB\fP for a short -packet, \fBn\fP did not match any rules or \fBL\fP for a log rule. +5. The action: \fBp\fP for passed, \fBb\fP for blocked, \fBS\fP for a short +packet, \fBn\fP did not match any rules, \fBL\fP for a log rule. The order +of precedence in showing flags is: S, p, b, n, L. A capital \fBP\fP or +\fBB\fP means that the packet has been logged due to a global logging +setting, not a particular rule. .LP 6. The addresses. This is actually three fields: the source address and port ==== //depot/projects/ia64/contrib/ipfilter/man/ipnat.5#5 (text+ko) ==== @@ -96,6 +96,15 @@ map de0 from 10.1.0.0/16 to any -> 201.2.3.4/32 .fi .LP +For even greater control, one may negate either of the "from" or "to" clauses +with a preceding exclamation mark ("!"). Please note that one may not use a +negated "from" within a \fBmap\fP rule or a negated "to" within a \fBrdr\fP +rule. Such a rule might look like the following: +.LP +.nf ++map de0 from 10.1.0.0/16 ! to 10.1.0.0/16 -> 201.2.3.4/32 +.fi +.PP Only IP address and port numbers can be compared against. This is available with all NAT rules. .SH TRANSLATION ==== //depot/projects/ia64/contrib/ipfilter/parse.c#4 (text+ko) ==== @@ -935,7 +935,6 @@ u_short secmsk = sec[0], secbits = sec[1]; struct ipopt_names *io, *so; char *s; - int secflag = 0; s = " opt "; for (io = ionames; io->on_name; io++) @@ -947,8 +946,7 @@ if (io->on_value == IPOPT_SECURITY) io++; s = ","; - } else - secflag = 1; + } } ==== //depot/projects/ia64/contrib/ipfilter/printnat.c#5 (text+ko) ==== @@ -58,7 +58,7 @@ #endif #if !defined(lint) -static const char rcsid[] = "@(#)$Id: printnat.c,v 1.1.2.9 2002/05/03 11:48:49 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: printnat.c,v 1.1.2.10 2002/08/28 12:45:51 darrenr Exp $"; #endif @@ -242,9 +242,10 @@ 0xffffffff), hv2 = NAT_HASH_FN(nat->nat_oip.s_addr, hv2 + nat->nat_oport, NAT_TABLE_SZ), - printf("%s pr %u bkt %d/%d flags %x\n", + printf("%s pr %u bkt %d/%d flags %x drop %d/%d\n", getsumd(nat->nat_sumd[1]), nat->nat_p, - hv1, hv2, nat->nat_flags); + hv1, hv2, nat->nat_flags, + nat->nat_drop[0], nat->nat_drop[1]); printf("\tifp %s ", getifname(nat->nat_ifp)); #ifdef USE_QUAD_T printf("bytes %qu pkts %qu", ==== //depot/projects/ia64/contrib/ipfilter/rules/example.9#2 (text+ko) ==== @@ -4,7 +4,7 @@ block in all pass in all with opt sec # -# only allow packets in and out on le0 which are top secret +# only allow packets in and out on le1 which are top secret # block out on le1 all pass out on le1 all with opt sec-class topsecret ==== //depot/projects/ia64/contrib/ipfilter/test/expected/f13#2 (text+ko) ==== @@ -9,6 +9,8 @@ nomatch nomatch nomatch +nomatch +nomatch -------- block nomatch @@ -21,6 +23,8 @@ nomatch nomatch nomatch +nomatch +nomatch -------- nomatch nomatch @@ -32,6 +36,8 @@ pass pass nomatch +nomatch +nomatch pass -------- nomatch @@ -44,6 +50,8 @@ block block nomatch +nomatch +nomatch block -------- pass @@ -57,6 +65,8 @@ nomatch nomatch nomatch +nomatch +nomatch -------- block nomatch @@ -69,4 +79,6 @@ nomatch nomatch nomatch +nomatch +nomatch -------- ==== //depot/projects/ia64/contrib/ipfilter/test/input/f13#2 (text+ko) ==== @@ -29,15 +29,23 @@ 45 00 0018 0007 2000 3f 11 0000 01010101 02010101 0035 0035 -# 1.1.1.1,1 -> 2.1.1.1,1 TTL=63 UDP MF FO=0 +# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP MF FO=0 45 00 001c 0008 2000 3f 11 0000 01010101 02010101 0035003500040000 -# 1.1.1.1,1 -> 2.1.1.1,1 TTL=63 UDP MF FO=0 (short) +# 1.1.1.1,53 -> 2.1.1.1,54 TTL=63 UDP MF FO=0 (short) 45 00 0018 0008 2000 3f 11 0000 01010101 02010101 00350036 -# 1.1.1.1,53 -> 2.1.1.1,53 TTL=63 UDP FO=1 +# 1.1.1.1,21 -> 2.1.1.1,54 TTL=63 UDP MF FO=0 +45 00 001c 0008 2000 3f 11 0000 01010101 02010101 +0015003600040000 + +# 1.1.1.1,21 -> 2.1.1.1,54 TTL=63 TCP MF FO=0 +45 00 001c 0008 2000 3f 06 0000 01010101 02010101 +0015 0036 00000000 00000000 50 02 2000 0000 0000 + +# 1.1.1.1 -> 2.1.1.1 TTL=63 UDP FO=1 45 00 001c 0008 0001 3f 11 0000 01010101 02010101 0000000000000000 ==== //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#10 (text+ko) ==== @@ -1,6 +1,6 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.17 2002/06/26 02:52:59 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.18 2002/08/28 17:59:45 gshapiro Exp $ -sendmail 8.12.5 +sendmail 8.12.6 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ For the import of sendmail, the following files were removed: @@ -11,7 +11,7 @@ devtools/* doc/op/op.ps */Build - */*.0 + [e-v]*/*.0 sendmail/makesendmail sendmail/sysexits.h @@ -21,8 +21,8 @@ Imported using: - cvs import -m 'Import sendmail 8.12.5' \ - src/contrib/sendmail SENDMAIL v8_12_5 + cvs import -m 'Import sendmail 8.12.6' \ + src/contrib/sendmail SENDMAIL v8_12_6 To make local changes to sendmail, simply patch and commit to the main @@ -92,4 +92,4 @@ usr.sbin/mailwrapper/Makefile gshapiro@FreeBSD.org -25-June-2002 +28-August-2002 ==== //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#7 (text+ko) ==== @@ -1,11 +1,91 @@ SENDMAIL RELEASE NOTES - $Id: RELEASE_NOTES,v 8.1340.2.9 2002/06/25 22:53:32 ca Exp $ + $Id: RELEASE_NOTES,v 8.1340.2.43 2002/08/26 21:53:31 gshapiro Exp $ This listing shows the version of the sendmail binary, the version of the sendmail configuration files, the date of release, and a summary of the changes in that release. +8.12.6/8.12.6 2002/08/26 + Do not add the FallbackMXhost (or its MX records) to the list + returned by the bestmx map when -z is used as option. + Otherwise sendmail may act as an open relay if FallbackMXhost + and FEATURE(`relay_based_on_MX') are used together. + Problem noted by Alexander Ignatyev. + Properly split owner- mailing list messages when SuperSafe is set + to interactive. Problem noted by Todd C. Miller of + Courtesan Consulting. + Make sure that an envelope is queued in the selected queue group + even if some recipients are deleted or invalid. Problem + found by Chris Adams of HiWAAY Informations Services. + Do not send a bounce message if a message is completely collected + from the SMTP client. Problem noted by Kari Hurtta of the + Finnish Meteorological Institute. + Provide an 'install-submit-st' target for sendmail/Makefile to + install the MSP statistics file using the file named in the + confMSP_STFILE devtools variable. Requested by Jeff + Earickson of Colby College. + Queue up mail with a temporary error if setusercontext() fails + during a delivery attempt. Patch from Todd C. Miller of + Courtesan Consulting. + Fix handling of base64 encoded client authentication data for + SMTP AUTH. Patch from Elena Slobodnik of life medien GmbH. + Set the OpenLDAP option LDAP_OPT_RESTART so the client libraries + restart interrupted system calls. Problem noted by Luiz + Henrique Duma of BSIOne. + Prevent a segmentation fault if a program passed a NULL envp using + execve(). + Document a problem with the counting of queue runners that may + cause delays if MaxQueueChildren is set too low. Problem + noted by Ian Duplisse of Cable Television Laboratories, Inc. + If discarding a message based on a recipient, don't try to look up + the recipient in the mailbox database if F=w is set. This + allows users to discard bogus recipients when dealing with + spammers without tipping them off. Problem noted by Neil + Rickert of Northern Illinois University. + If applying a header check to a header with unstructured data, + e.g., Subject:, then do not run syntax checks that are + supposed for addresses on the header content. + Count messages rejected/discarded via the check_data ruleset. + Portability: + Fix compilation on systems which do not allow simple + copying of the variable argument va_list. Based on + fix from Scott Walters. + Fix NSD map open bug. From Michel Bourget of SGI. + Add some additional IRIX shells to the default shell + list. From Michel Bourget of SGI. + Fix compilation issues on Mac OS X 10.2 (Darwin 6.0). + NETISO support has been dropped. + CONFIG: There was a seemingly minor change in 8.12.4 with respect + to handling entries of IP nets/addresses with RHS REJECT. + These would be rejected in check_rcpt instead of only + being activated in check_relay. This change has been made to + avoid potential bogus temporary rejection of relay attempts >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Aug 28 21:26:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A591537B401; Wed, 28 Aug 2002 21:26:12 -0700 (PDT) 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 41DC737B400 for ; Wed, 28 Aug 2002 21:26:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD3B343E6A for ; Wed, 28 Aug 2002 21:26:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7T4QBJU072512 for ; Wed, 28 Aug 2002 21:26:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7T4QB7O072509 for perforce@freebsd.org; Wed, 28 Aug 2002 21:26:11 -0700 (PDT) Date: Wed, 28 Aug 2002 21:26:11 -0700 (PDT) Message-Id: <200208290426.g7T4QB7O072509@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 16745 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16745 Change 16745 by rwatson@rwatson_paprika on 2002/08/28 21:26:02 Improve buildability from lomac module changes -- add struct thread to pre-declared structures so that tcp_input.o can build. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#158 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#158 (text+ko) ==== @@ -207,6 +207,7 @@ struct sockaddr; struct socket; struct pipe; +struct thread; struct timespec; struct ucred; struct uio; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 29 11:14:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FACC37B401; Thu, 29 Aug 2002 11:14:42 -0700 (PDT) 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 E52E637B400 for ; Thu, 29 Aug 2002 11:14:41 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87FBD43E77 for ; Thu, 29 Aug 2002 11:14:41 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7TIEfJU023517 for ; Thu, 29 Aug 2002 11:14:41 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7TIEfdL023514 for perforce@freebsd.org; Thu, 29 Aug 2002 11:14:41 -0700 (PDT) Date: Thu, 29 Aug 2002 11:14:41 -0700 (PDT) Message-Id: <200208291814.g7TIEfdL023514@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 16771 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16771 Change 16771 by jhb@jhb_zion on 2002/08/29 11:13:42 Fix crack-smoking code that was panicing on the quad xeon: - If either of proc or kse are NULL during thread_exit(), then the kernel is going to fault because parts of the function assume they aren't NULL. Instead, just assert they aren't NULL (as well as the kse group) and assume they are in all of the code. It doesn't make sense for them to be NULL here anyways. - Move the PROC_UNLOCK(p) up above clearing td_proc, etc. since otherwise we will panic if the proc's lock is contested. Affected files ... .. //depot/projects/smpng/sys/kern/kern_thread.c#4 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_thread.c#4 (text+ko) ==== @@ -320,6 +320,9 @@ ke = td->td_kse; mtx_assert(&sched_lock, MA_OWNED); + KASSERT(p != NULL, ("thread exiting without a process")); + KASSERT(ke != NULL, ("thread exiting without a kse")); + KASSERT(kg != NULL, ("thread exiting without a kse group")); PROC_LOCK_ASSERT(p, MA_OWNED); CTR1(KTR_PROC, "thread_exit: thread %p", td); KASSERT(!mtx_owned(&Giant), ("dying thread owns giant")); @@ -331,41 +334,35 @@ cpu_thread_exit(td); /* XXXSMP */ /* Reassign this thread's KSE. */ - if (ke != NULL) { - ke->ke_thread = NULL; - td->td_kse = NULL; - ke->ke_state = KES_UNQUEUED; - kse_reassign(ke); - } + ke->ke_thread = NULL; + td->td_kse = NULL; + ke->ke_state = KES_UNQUEUED; + kse_reassign(ke); /* Unlink this thread from its proc. and the kseg */ - if (p != NULL) { - TAILQ_REMOVE(&p->p_threads, td, td_plist); - p->p_numthreads--; - if (kg != NULL) { - TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); - kg->kg_numthreads--; - } - /* - * The test below is NOT true if we are the - * sole exiting thread. P_STOPPED_SNGL is unset - * in exit1() after it is the only survivor. - */ - if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { - if (p->p_numthreads == p->p_suspcount) { - TAILQ_REMOVE(&p->p_suspended, - p->p_singlethread, td_runq); - setrunqueue(p->p_singlethread); - p->p_suspcount--; - } + TAILQ_REMOVE(&p->p_threads, td, td_plist); + p->p_numthreads--; + TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); + kg->kg_numthreads--; + /* + * The test below is NOT true if we are the + * sole exiting thread. P_STOPPED_SNGL is unset + * in exit1() after it is the only survivor. + */ + if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { + if (p->p_numthreads == p->p_suspcount) { + TAILQ_REMOVE(&p->p_suspended, + p->p_singlethread, td_runq); + setrunqueue(p->p_singlethread); + p->p_suspcount--; } } + PROC_UNLOCK(p); td->td_state = TDS_SURPLUS; td->td_proc = NULL; td->td_ksegrp = NULL; td->td_last_kse = NULL; ke->ke_tdspare = td; - PROC_UNLOCK(p); cpu_throw(); /* NOTREACHED */ } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 29 14:33:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E7E537B401; Thu, 29 Aug 2002 14:33:31 -0700 (PDT) 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 D640E37B400; Thu, 29 Aug 2002 14:33:30 -0700 (PDT) Received: from sccrmhc02.attbi.com (sccrmhc02.attbi.com [204.127.202.62]) by mx1.FreeBSD.org (Postfix) with ESMTP id B566943E3B; Thu, 29 Aug 2002 14:33:29 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc02.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020829184009.PVQM13899.sccrmhc02.attbi.com@InterJet.elischer.org>; Thu, 29 Aug 2002 18:40:09 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id LAA98719; Thu, 29 Aug 2002 11:23:34 -0700 (PDT) Date: Thu, 29 Aug 2002 11:23:33 -0700 (PDT) From: Julian Elischer To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16771 for review In-Reply-To: <200208291814.g7TIEfdL023514@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I'd be happy to see this merged into -current now.. Any objections? BTW the extra tests were at one stage necessary when thread/proc teardown was done differently. Thread_exit did at one time take a td argument and it was possible to call it on a thread other than curthread in the case where thread-setup failed and we were backing out of creating a new thread. This was all discovered to be "A Bad Thing" (TM) but the tests remained. Also, peter and I discussed over the weekend some changes that may affect this a little. On Thu, 29 Aug 2002, John Baldwin wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16771 > > Change 16771 by jhb@jhb_zion on 2002/08/29 11:13:42 > > Fix crack-smoking code that was panicing on the quad xeon: > - If either of proc or kse are NULL during thread_exit(), then > the kernel is going to fault because parts of the function > assume they aren't NULL. Instead, just assert they aren't NULL > (as well as the kse group) and assume they are in all of the > code. It doesn't make sense for them to be NULL here anyways. > - Move the PROC_UNLOCK(p) up above clearing td_proc, etc. since > otherwise we will panic if the proc's lock is contested. > > Affected files ... > > .. //depot/projects/smpng/sys/kern/kern_thread.c#4 edit > > Differences ... > > ==== //depot/projects/smpng/sys/kern/kern_thread.c#4 (text+ko) ==== > > @@ -320,6 +320,9 @@ > ke = td->td_kse; > > mtx_assert(&sched_lock, MA_OWNED); > + KASSERT(p != NULL, ("thread exiting without a process")); > + KASSERT(ke != NULL, ("thread exiting without a kse")); > + KASSERT(kg != NULL, ("thread exiting without a kse group")); > PROC_LOCK_ASSERT(p, MA_OWNED); > CTR1(KTR_PROC, "thread_exit: thread %p", td); > KASSERT(!mtx_owned(&Giant), ("dying thread owns giant")); > @@ -331,41 +334,35 @@ > cpu_thread_exit(td); /* XXXSMP */ > > /* Reassign this thread's KSE. */ > - if (ke != NULL) { > - ke->ke_thread = NULL; > - td->td_kse = NULL; > - ke->ke_state = KES_UNQUEUED; > - kse_reassign(ke); > - } > + ke->ke_thread = NULL; > + td->td_kse = NULL; > + ke->ke_state = KES_UNQUEUED; > + kse_reassign(ke); > > /* Unlink this thread from its proc. and the kseg */ > - if (p != NULL) { > - TAILQ_REMOVE(&p->p_threads, td, td_plist); > - p->p_numthreads--; > - if (kg != NULL) { > - TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); > - kg->kg_numthreads--; > - } > - /* > - * The test below is NOT true if we are the > - * sole exiting thread. P_STOPPED_SNGL is unset > - * in exit1() after it is the only survivor. > - */ > - if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { > - if (p->p_numthreads == p->p_suspcount) { > - TAILQ_REMOVE(&p->p_suspended, > - p->p_singlethread, td_runq); > - setrunqueue(p->p_singlethread); > - p->p_suspcount--; > - } > + TAILQ_REMOVE(&p->p_threads, td, td_plist); > + p->p_numthreads--; > + TAILQ_REMOVE(&kg->kg_threads, td, td_kglist); > + kg->kg_numthreads--; > + /* > + * The test below is NOT true if we are the > + * sole exiting thread. P_STOPPED_SNGL is unset > + * in exit1() after it is the only survivor. > + */ > + if (P_SHOULDSTOP(p) == P_STOPPED_SNGL) { > + if (p->p_numthreads == p->p_suspcount) { > + TAILQ_REMOVE(&p->p_suspended, > + p->p_singlethread, td_runq); > + setrunqueue(p->p_singlethread); > + p->p_suspcount--; > } > } > + PROC_UNLOCK(p); > td->td_state = TDS_SURPLUS; > td->td_proc = NULL; > td->td_ksegrp = NULL; > td->td_last_kse = NULL; > ke->ke_tdspare = td; > - PROC_UNLOCK(p); > cpu_throw(); > /* NOTREACHED */ > } > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 29 15: 0:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C864D37B406; Thu, 29 Aug 2002 15:00:20 -0700 (PDT) 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 045D637B400; Thu, 29 Aug 2002 15:00:19 -0700 (PDT) Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3ECF43E72; Thu, 29 Aug 2002 15:00:17 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc53.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020829220015.LMCD12118.rwcrmhc53.attbi.com@InterJet.elischer.org>; Thu, 29 Aug 2002 22:00:15 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id OAA99515; Thu, 29 Aug 2002 14:46:49 -0700 (PDT) Date: Thu, 29 Aug 2002 14:46:48 -0700 (PDT) From: Julian Elischer To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16771 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, 29 Aug 2002, Julian Elischer wrote: > I'd be happy to see this merged into -current now.. > Any objections? just did it anyway. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 29 17:51:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22D1D37B401; Thu, 29 Aug 2002 17:49:40 -0700 (PDT) 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 AF3C737B400 for ; Thu, 29 Aug 2002 17:49:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFF1843E6E for ; Thu, 29 Aug 2002 17:49:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7U0ncJU007886 for ; Thu, 29 Aug 2002 17:49:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7U0nbWG007883 for perforce@freebsd.org; Thu, 29 Aug 2002 17:49:37 -0700 (PDT) Date: Thu, 29 Aug 2002 17:49:37 -0700 (PDT) Message-Id: <200208300049.g7U0nbWG007883@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16779 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16779 Change 16779 by peter@peter_daintree on 2002/08/29 17:49:03 IFC @16778 Affected files ... .. //depot/projects/ia64/bin/ls/print.c#7 integrate .. //depot/projects/ia64/bin/sh/eval.c#6 integrate .. //depot/projects/ia64/games/wargames/wargames.6#2 integrate .. //depot/projects/ia64/gnu/usr.bin/send-pr/doc/fields.texi#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#9 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_accept.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_close.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_connect.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_dup.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_dup2.c#4 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_execve.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_exit.c#5 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_fcntl.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_fd.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_ioctl.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_read.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_readv.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_recvfrom.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_recvmsg.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_select.c#4 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_sendfile.c#4 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_sendmsg.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_sendto.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_sig.c#5 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_write.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_writev.c#3 integrate .. //depot/projects/ia64/libexec/ftpd/ftpcmd.y#9 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#12 integrate .. //depot/projects/ia64/sbin/growfs/growfs.8#7 integrate .. //depot/projects/ia64/share/man/man7/tuning.7#13 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#15 integrate .. //depot/projects/ia64/sys/alpha/include/reg.h#3 integrate .. //depot/projects/ia64/sys/boot/common/load_aout.c#2 delete .. //depot/projects/ia64/sys/boot/i386/libi386/aout_freebsd.c#2 delete .. //depot/projects/ia64/sys/boot/i386/loader/Makefile#7 integrate .. //depot/projects/ia64/sys/boot/i386/pxeldr/Makefile#2 integrate .. //depot/projects/ia64/sys/contrib/dev/acpica/acfreebsd.h#6 integrate .. //depot/projects/ia64/sys/dev/sound/pci/maestro3.c#6 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#22 integrate .. //depot/projects/ia64/sys/i386/include/reg.h#3 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#44 integrate .. //depot/projects/ia64/sys/ia64/ia64/mca.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/sal.c#8 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#33 integrate .. //depot/projects/ia64/sys/ia64/include/reg.h#7 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_switch.c#10 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#15 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#8 integrate .. //depot/projects/ia64/sys/kern/link_aout.c#6 delete .. //depot/projects/ia64/sys/kern/subr_rman.c#5 integrate .. //depot/projects/ia64/sys/netinet/ip_h323_pxy.c#2 delete .. //depot/projects/ia64/sys/netinet/ip_ipsec_pxy.c#2 delete .. //depot/projects/ia64/sys/netinet/ip_netbios_pxy.c#2 delete .. //depot/projects/ia64/sys/pc98/i386/machdep.c#20 integrate .. //depot/projects/ia64/sys/powerpc/include/reg.h#3 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#14 integrate .. //depot/projects/ia64/sys/sparc64/include/reg.h#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#19 integrate .. //depot/projects/ia64/sys/sys/imgact.h#7 integrate .. //depot/projects/ia64/sys/sys/param.h#16 integrate .. //depot/projects/ia64/sys/sys/proc.h#28 integrate .. //depot/projects/ia64/usr.sbin/gifconfig/gifconfig.c#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/command.c#12 integrate .. //depot/projects/ia64/usr.sbin/ppp/iface.c#8 integrate .. //depot/projects/ia64/usr.sbin/ppp/ipv6cp.c#4 integrate .. //depot/projects/ia64/usr.sbin/ppp/ipv6cp.h#2 integrate .. //depot/projects/ia64/usr.sbin/ppp/ncpaddr.c#5 integrate .. //depot/projects/ia64/usr.sbin/ppp/ppp.8.m4#14 integrate Differences ... ==== //depot/projects/ia64/bin/ls/print.c#7 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.56 2002/06/30 05:13:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.57 2002/08/29 14:29:09 keramida Exp $"); #include #include @@ -306,8 +306,7 @@ if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size)) (void)printf("total %lu\n", howmany(dp->btotal, blocksize)); - if (f_sortacross) - base = 0; + base = 0; for (row = 0; row < numrows; ++row) { endcol = colwidth; if (!f_sortacross) ==== //depot/projects/ia64/bin/sh/eval.c#6 (text+ko) ==== @@ -40,10 +40,11 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.35 2002/07/25 10:47:38 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.36 2002/08/29 14:26:49 keramida Exp $"); #include #include +#include #include #include /* For WIFSIGNALED(status) */ #include ==== //depot/projects/ia64/games/wargames/wargames.6#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/games/wargames/wargames.6,v 1.4 2000/12/19 15:46:46 ru Exp $ +.\" $FreeBSD: src/games/wargames/wargames.6,v 1.5 2002/08/29 04:07:20 jmallett Exp $ .\" .Dd February 22, 1998 .Dt WARGAMES 6 @@ -46,6 +46,6 @@ resulting is much smaller.... .Sh SEE ALSO Wargames, -the movie (an MGM production, PGP 13, directed by John Badham, 1983). +the movie (an MGM production, PG-13, directed by John Badham, 1983). .Sh AUTHORS This manual page was written by Joey Hess . ==== //depot/projects/ia64/gnu/usr.bin/send-pr/doc/fields.texi#2 (text+ko) ==== @@ -1,4 +1,4 @@ -@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/fields.texi,v 1.2 2000/10/29 22:05:52 steve Exp $ +@c $FreeBSD: src/gnu/usr.bin/send-pr/doc/fields.texi,v 1.3 2002/08/29 22:59:22 keramida Exp $ @node Fields @section Problem Report format @@ -250,7 +250,7 @@ for confidentiality, then if the value of this field is @samp{yes} the support organization treats the PR as confidential; any code samples provided are not made publicly available (e.g., in regression test -suites). The default value is @samp{yes}. +suites). The default value is @samp{no}. @cindex @code{Synopsis} field @cindex @code{>Synopsis:} ==== //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#9 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.72 2002/06/14 04:02:25 rwatson Exp $ + * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.73 2002/08/29 23:06:06 deischen Exp $ */ #ifndef _PTHREAD_PRIVATE_H @@ -1151,8 +1151,6 @@ void *_thread_stack_alloc(size_t, size_t); void _thread_stack_free(void *, size_t, size_t); int _thread_create(pthread_t *,const pthread_attr_t *,void *(*start_routine)(void *),void *,pthread_t); -int _thread_fd_lock(int, int, struct timespec *); -int _thread_fd_lock_debug(int, int, struct timespec *,char *fname,int lineno); int _mutex_cv_lock(pthread_mutex_t *); int _mutex_cv_unlock(pthread_mutex_t *); void _mutex_lock_backout(pthread_t); @@ -1188,6 +1186,11 @@ #endif void _thread_exit(char *, int, char *); void _thread_exit_cleanup(void); +int _thread_fd_getflags(int); +int _thread_fd_lock(int, int, struct timespec *); +int _thread_fd_lock_debug(int, int, struct timespec *,char *fname,int lineno); +void _thread_fd_setflags(int, int); +int _thread_fd_table_init(int fd); void _thread_fd_unlock(int, int); void _thread_fd_unlock_debug(int, int, char *, int); void _thread_fd_unlock_owned(pthread_t); @@ -1214,7 +1217,6 @@ struct pthread_signal_frame *psf); void _thread_start(void); void _thread_seterrno(pthread_t, int); -int _thread_fd_table_init(int fd); pthread_addr_t _thread_gc(pthread_addr_t); void _thread_enter_cancellation_point(void); void _thread_leave_cancellation_point(void); ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_accept.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_accept.c,v 1.15 2001/04/10 04:19:19 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_accept.c,v 1.16 2002/08/29 23:06:06 deischen Exp $ */ #include #include @@ -52,7 +52,8 @@ /* Enter a loop to wait for a connection request: */ while ((ret = __sys_accept(fd, name, namelen)) < 0) { /* Check if the socket is to block: */ - if ((_thread_fd_table[fd]->flags & O_NONBLOCK) == 0 && (errno == EWOULDBLOCK || errno == EAGAIN)) { + if ((_thread_fd_getflags(fd) & O_NONBLOCK) == 0 + && (errno == EWOULDBLOCK || errno == EAGAIN)) { /* Save the socket file descriptor: */ curthread->data.fd.fd = fd; curthread->data.fd.fname = __FILE__; @@ -99,9 +100,9 @@ * set the new socket flags to non-blocking, as that * will be the inherited state of the new socket. */ - if((ret > 0) && (_thread_fd_table[fd]->flags & O_NONBLOCK) == 0) - _thread_fd_table[ret]->flags &= ~O_NONBLOCK; - + if((ret > 0) && (_thread_fd_getflags(fd) & O_NONBLOCK) == 0) + _thread_fd_setflags(ret, + _thread_fd_getflags(ret) & ~O_NONBLOCK); /* Unlock the file descriptor: */ _FD_UNLOCK(fd, FD_RDWR); } ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_close.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_close.c,v 1.12 2001/04/10 04:19:19 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_close.c,v 1.13 2002/08/29 23:06:06 deischen Exp $ */ #include #include @@ -82,7 +82,8 @@ * using, which would then cause any reads to block * indefinitely. */ - if ((S_ISREG(sb.st_mode) || S_ISCHR(sb.st_mode)) && (_thread_fd_table[fd]->flags & O_NONBLOCK) == 0) { + if ((S_ISREG(sb.st_mode) || S_ISCHR(sb.st_mode)) + && (_thread_fd_getflags(fd) & O_NONBLOCK) == 0) { /* Get the current flags: */ flags = __sys_fcntl(fd, F_GETFL, NULL); /* Clear the nonblocking file descriptor flag: */ ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_connect.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_connect.c,v 1.12 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_connect.c,v 1.13 2002/08/29 23:06:07 deischen Exp $ */ #include #include @@ -49,9 +49,9 @@ if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) { if ((ret = __sys_connect(fd, name, namelen)) < 0) { - if (!(_thread_fd_table[fd]->flags & O_NONBLOCK) && - ((errno == EWOULDBLOCK) || (errno == EINPROGRESS) || - (errno == EALREADY) || (errno == EAGAIN))) { + if ((_thread_fd_getflags(fd) & O_NONBLOCK) == 0 + && ((errno == EWOULDBLOCK) || (errno == EINPROGRESS) + || (errno == EALREADY) || (errno == EAGAIN))) { curthread->data.fd.fd = fd; /* Set the timeout: */ ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_dup.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_dup.c,v 1.10 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_dup.c,v 1.11 2002/08/29 23:06:07 deischen Exp $ */ #include #include @@ -59,7 +59,7 @@ * Save the file open flags so that they can be * checked later: */ - _thread_fd_table[ret]->flags = _thread_fd_table[fd]->flags; + _thread_fd_setflags(ret, _thread_fd_getflags(fd)); } /* Unlock the file descriptor: */ ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_dup2.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_dup2.c,v 1.13 2002/06/23 20:41:30 robert Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_dup2.c,v 1.14 2002/08/29 23:06:07 deischen Exp $ */ #include #include @@ -81,8 +81,8 @@ * Save the file open flags so that * they can be checked later: */ - _thread_fd_table[ret]->flags = - _thread_fd_table[fd]->flags; + _thread_fd_setflags(ret, + _thread_fd_getflags(fd)); } } ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_execve.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_execve.c,v 1.14 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_execve.c,v 1.15 2002/08/29 23:06:07 deischen Exp $ */ #include #include @@ -68,7 +68,7 @@ for (i = 0; i < _thread_dtablesize; i++) { /* Check if this file descriptor is in use: */ if (_thread_fd_table[i] != NULL && - !(_thread_fd_table[i]->flags & O_NONBLOCK)) { + (_thread_fd_getflags(i) & O_NONBLOCK) == 0) { /* Get the current flags: */ flags = __sys_fcntl(i, F_GETFL, NULL); /* Clear the nonblocking file descriptor flag: */ ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_exit.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_exit.c,v 1.26 2002/05/24 04:32:28 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_exit.c,v 1.27 2002/08/29 23:06:07 deischen Exp $ */ #include #include @@ -69,7 +69,7 @@ for (i = 0; i < _thread_dtablesize; i++) { /* Check if this file descriptor is in use: */ if (_thread_fd_table[i] != NULL && - !(_thread_fd_table[i]->flags & O_NONBLOCK)) { + (_thread_fd_getflags(i) & O_NONBLOCK) == 0) { /* Get the current flags: */ flags = __sys_fcntl(i, F_GETFL, NULL); /* Clear the nonblocking file descriptor flag: */ ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_fcntl.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.14 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.15 2002/08/29 23:06:07 deischen Exp $ */ #include #include @@ -76,9 +76,10 @@ } else { /* * Save the file open flags so that they can - * be checked later: + * be checked later: */ - _thread_fd_table[ret]->flags = _thread_fd_table[fd]->flags; + _thread_fd_setflags(ret, + _thread_fd_getflags(fd)); } break; case F_SETFD: @@ -89,7 +90,7 @@ ret = __sys_fcntl(fd, cmd, 0); break; case F_GETFL: - ret = _thread_fd_table[fd]->flags; + ret = _thread_fd_getflags(fd); break; case F_SETFL: /* @@ -119,10 +120,10 @@ */ } else if (nonblock) /* A non-blocking descriptor: */ - _thread_fd_table[fd]->flags = flags | O_NONBLOCK; + _thread_fd_setflags(fd, flags | O_NONBLOCK); else /* Save the flags: */ - _thread_fd_table[fd]->flags = flags & ~O_NONBLOCK; + _thread_fd_setflags(fd, flags & ~O_NONBLOCK); break; default: /* Might want to make va_arg use a union */ ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_fd.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_fd.c,v 1.21 2001/10/21 18:23:50 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_fd.c,v 1.22 2002/08/29 23:06:07 deischen Exp $ * */ #include @@ -182,6 +182,22 @@ return (ret); } +int +_thread_fd_getflags(int fd) +{ + if (_thread_fd_table[fd] != NULL) + return (_thread_fd_table[fd]->flags); + else + return (0); +} + +void +_thread_fd_setflags(int fd, int flags) +{ + if (_thread_fd_table[fd] != NULL) + _thread_fd_table[fd]->flags = flags; +} + #ifdef _FDLOCKS_ENABLED void _thread_fd_unlock(int fd, int lock_type) ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_ioctl.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_ioctl.c,v 1.11 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_ioctl.c,v 1.12 2002/08/29 23:06:07 deischen Exp $ */ #include #include @@ -43,6 +43,7 @@ _ioctl(int fd, unsigned long request,...) { int ret; + int flags; int *op; va_list ap; @@ -58,8 +59,12 @@ * twiddling the flag based on the request */ op = va_arg(ap, int *); - _thread_fd_table[fd]->flags &= ~O_NONBLOCK; - _thread_fd_table[fd]->flags |= ((*op) ? O_NONBLOCK : 0); + flags = _thread_fd_getflags(fd); + if (*op == 0) + flags &= ~O_NONBLOCK; + else + flags |= O_NONBLOCK; + _thread_fd_setflags(fd, flags); ret = 0; break; default: ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_read.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_read.c,v 1.13 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_read.c,v 1.14 2002/08/29 23:06:07 deischen Exp $ * */ #include @@ -57,7 +57,7 @@ /* Lock the file descriptor for read: */ if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) { /* Get the read/write mode type: */ - type = _thread_fd_table[fd]->flags & O_ACCMODE; + type = _thread_fd_getflags(fd) & O_ACCMODE; /* Check if the file is not open for read: */ if (type != O_RDONLY && type != O_RDWR) { @@ -69,7 +69,7 @@ /* Perform a non-blocking read syscall: */ while ((ret = __sys_read(fd, buf, nbytes)) < 0) { - if ((_thread_fd_table[fd]->flags & O_NONBLOCK) == 0 && + if ((_thread_fd_getflags(fd) & O_NONBLOCK) == 0 && (errno == EWOULDBLOCK || errno == EAGAIN)) { curthread->data.fd.fd = fd; _thread_kern_set_timeout(NULL); ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_readv.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_readv.c,v 1.14 2002/05/02 19:58:43 archie Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_readv.c,v 1.15 2002/08/29 23:06:07 deischen Exp $ * */ #include @@ -52,7 +52,7 @@ /* Lock the file descriptor for read: */ if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) { /* Get the read/write mode type: */ - type = _thread_fd_table[fd]->flags & O_ACCMODE; + type = _thread_fd_getflags(fd) & O_ACCMODE; /* Check if the file is not open for read: */ if (type != O_RDONLY && type != O_RDWR) { @@ -64,7 +64,7 @@ /* Perform a non-blocking readv syscall: */ while ((ret = __sys_readv(fd, iov, iovcnt)) < 0) { - if ((_thread_fd_table[fd]->flags & O_NONBLOCK) == 0 && + if ((_thread_fd_getflags(fd) & O_NONBLOCK) == 0 && (errno == EWOULDBLOCK || errno == EAGAIN)) { curthread->data.fd.fd = fd; _thread_kern_set_timeout(NULL); ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_recvfrom.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_recvfrom.c,v 1.11 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_recvfrom.c,v 1.12 2002/08/29 23:06:07 deischen Exp $ */ #include #include @@ -49,7 +49,8 @@ if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) { while ((ret = __sys_recvfrom(fd, buf, len, flags, from, from_len)) < 0) { - if (!(_thread_fd_table[fd]->flags & O_NONBLOCK) && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) { + if (((_thread_fd_getflags(fd) & O_NONBLOCK) == 0) + && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) { curthread->data.fd.fd = fd; /* Set the timeout: */ ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_recvmsg.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_recvmsg.c,v 1.9 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_recvmsg.c,v 1.10 2002/08/29 23:06:07 deischen Exp $ */ #include #include @@ -48,7 +48,8 @@ if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) { while ((ret = __sys_recvmsg(fd, msg, flags)) < 0) { - if (!(_thread_fd_table[fd]->flags & O_NONBLOCK) && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) { + if (((_thread_fd_getflags(fd) & O_NONBLOCK) == 0) + && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) { curthread->data.fd.fd = fd; /* Set the timeout: */ ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_select.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_select.c,v 1.20 2002/05/02 19:58:43 archie Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_select.c,v 1.21 2002/08/29 21:39:19 archie Exp $ */ #include #include @@ -179,8 +179,9 @@ got_events = 0; if (readfds != NULL) { if (FD_ISSET(data.fds[i].fd, readfds)) { - if (data.fds[i].revents & (POLLIN | - POLLRDNORM)) + if ((data.fds[i].revents & (POLLIN + | POLLRDNORM | POLLERR + | POLLHUP | POLLNVAL)) != 0) got_events++; else FD_CLR(data.fds[i].fd, readfds); @@ -188,8 +189,9 @@ } if (writefds != NULL) { if (FD_ISSET(data.fds[i].fd, writefds)) { - if (data.fds[i].revents & (POLLOUT | - POLLWRNORM | POLLWRBAND)) + if ((data.fds[i].revents & (POLLOUT + | POLLWRNORM | POLLWRBAND | POLLERR + | POLLHUP | POLLNVAL)) != 0) got_events++; else FD_CLR(data.fds[i].fd, ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_sendfile.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * 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/libc_r/uthread/uthread_sendfile.c,v 1.9 2002/02/22 04:26:54 jb Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_sendfile.c,v 1.10 2002/08/29 23:06:07 deischen Exp $ */ #include @@ -83,14 +83,14 @@ } /* Check the descriptor access modes. */ - type = _thread_fd_table[fd]->flags & O_ACCMODE; + type = _thread_fd_getflags(fd) & O_ACCMODE; if (type != O_RDONLY && type != O_RDWR) { /* File is not open for read. */ ret = -1; errno = EBADF; goto ERROR_2; } - type = _thread_fd_table[s]->flags & O_ACCMODE; + type = _thread_fd_getflags(s) & O_ACCMODE; if (type != O_WRONLY && type != O_RDWR) { /* File is not open for write. */ ret = -1; @@ -99,7 +99,7 @@ } /* Check if file operations are to block */ - blocking = ((_thread_fd_table[s]->flags & O_NONBLOCK) == 0); + blocking = ((_thread_fd_getflags(s) & O_NONBLOCK) == 0); /* * Loop while no error occurs and until the expected number of bytes are ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_sendmsg.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_sendmsg.c,v 1.9 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_sendmsg.c,v 1.10 2002/08/29 23:06:07 deischen Exp $ */ #include #include @@ -48,7 +48,8 @@ if ((ret = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) { while ((ret = __sys_sendmsg(fd, msg, flags)) < 0) { - if (!(_thread_fd_table[fd]->flags & O_NONBLOCK) && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) { + if (!(_thread_fd_getflags(fd) & O_NONBLOCK) + && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) { curthread->data.fd.fd = fd; /* Set the timeout: */ ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_sendto.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_sendto.c,v 1.11 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_sendto.c,v 1.12 2002/08/29 23:06:07 deischen Exp $ */ #include #include @@ -49,7 +49,8 @@ if ((ret = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) { while ((ret = __sys_sendto(fd, msg, len, flags, to, to_len)) < 0) { - if (!(_thread_fd_table[fd]->flags & O_NONBLOCK) && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) { + if (((_thread_fd_getflags(fd) & O_NONBLOCK) == 0) + && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) { curthread->data.fd.fd = fd; /* Set the timeout: */ ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_sig.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_sig.c,v 1.41 2002/05/24 04:32:28 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_sig.c,v 1.42 2002/08/29 23:06:07 deischen Exp $ */ #include #include @@ -536,7 +536,7 @@ * Set the file descriptor to non-blocking: */ __sys_fcntl(i, F_SETFL, - _thread_fd_table[i]->flags | O_NONBLOCK); + _thread_fd_getflags(i) | O_NONBLOCK); } } /* ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_write.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_write.c,v 1.19 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_write.c,v 1.20 2002/08/29 23:06:07 deischen Exp $ * */ #include @@ -59,7 +59,7 @@ /* Lock the file descriptor for write: */ if ((ret = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) { /* Get the read/write mode type: */ - type = _thread_fd_table[fd]->flags & O_ACCMODE; + type = _thread_fd_getflags(fd) & O_ACCMODE; /* Check if the file is not open for write: */ if (type != O_WRONLY && type != O_RDWR) { @@ -70,7 +70,7 @@ } /* Check if file operations are to block */ - blocking = ((_thread_fd_table[fd]->flags & O_NONBLOCK) == 0); + blocking = ((_thread_fd_getflags(fd) & O_NONBLOCK) == 0); /* * Loop while no error occurs and until the expected number ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_writev.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_writev.c,v 1.19 2002/05/02 19:58:43 archie Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_writev.c,v 1.20 2002/08/29 23:06:07 deischen Exp $ * */ #include @@ -75,7 +75,7 @@ /* Lock the file descriptor for write: */ if ((ret = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) { /* Get the read/write mode type: */ - type = _thread_fd_table[fd]->flags & O_ACCMODE; + type = _thread_fd_getflags(fd) & O_ACCMODE; /* Check if the file is not open for write: */ if (type != O_WRONLY && type != O_RDWR) { @@ -86,7 +86,7 @@ } /* Check if file operations are to block */ - blocking = ((_thread_fd_table[fd]->flags & O_NONBLOCK) == 0); + blocking = ((_thread_fd_getflags(fd) & O_NONBLOCK) == 0); /* * Loop while no error occurs and until the expected number ==== //depot/projects/ia64/libexec/ftpd/ftpcmd.y#9 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)ftpcmd.y 8.3 (Berkeley) 4/6/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.41 2002/08/13 13:56:42 yar Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpcmd.y,v 1.42 2002/08/29 09:23:08 yar Exp $"; #endif /* not lint */ #include @@ -136,7 +136,7 @@ UMASK IDLE CHMOD MDFIVE - LEXERR + LEXERR NOTIMPL %token STRING %token NUMBER @@ -145,7 +145,7 @@ %type check_login_ro check_login_epsv %type struct_code mode_code type_code form_code %type pathstring pathname password username -%type ALL +%type ALL NOTIMPL %start cmd_list @@ -752,11 +752,15 @@ reply(221, "Goodbye."); dologout(0); } + | NOTIMPL + { + nack($1); + } | error { yyclearin; /* discard lookahead data */ yyerrok; /* clear error condition */ - state = 0; /* reset lexer state */ + state = CMD; /* reset lexer state */ } ; rcmd @@ -1289,12 +1293,10 @@ p = lookup(cmdtab, cbuf); cbuf[cpos] = c; if (p != 0) { - if (p->implemented == 0) { - nack(p->name); - return (LEXERR); - } + yylval.s = p->name; + if (!p->implemented) + return (NOTIMPL); /* state remains CMD */ state = p->state; - yylval.s = p->name; return (p->token); } break; @@ -1313,13 +1315,12 @@ p = lookup(sitetab, cp); cbuf[cpos] = c; if (guest == 0 && p != 0) { - if (p->implemented == 0) { + yylval.s = p->name; + if (!p->implemented) { state = CMD; - nack(p->name); - return (LEXERR); + return (NOTIMPL); } state = p->state; - yylval.s = p->name; return (p->token); } state = CMD; ==== //depot/projects/ia64/libexec/ftpd/ftpd.c#12 (text+ko) ==== @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.127 2002/08/27 09:05:03 yar Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.128 2002/08/29 09:53:51 yar Exp $"; #endif /* not lint */ /* @@ -1697,7 +1697,7 @@ data = -1; pdata = -1; done: - LOGBYTES(*mode == 'w' ? "put" : "append", name, byte_count); + LOGBYTES(*mode == 'a' ? "append" : "put", name, byte_count); (*closefunc)(fout); return; err: ==== //depot/projects/ia64/sbin/growfs/growfs.8#7 (text+ko) ==== @@ -35,7 +35,7 @@ .\" SUCH DAMAGE. .\" .\" $TSHeader: src/sbin/growfs/growfs.8,v 1.3 2000/12/12 19:31:00 tomsoft Exp $ -.\" $FreeBSD: src/sbin/growfs/growfs.8,v 1.15 2002/08/21 18:10:38 trhodes Exp $ +.\" $FreeBSD: src/sbin/growfs/growfs.8,v 1.16 2002/08/29 08:12:09 keramida Exp $ .\" .Dd September 8, 2000 .Dt GROWFS 8 @@ -58,6 +58,11 @@ .Nm the disk must be labeled to a bigger size using .Xr disklabel 8 . +If you wish to grow a filesystem beyound the boundary of +the slice it resides in, you must re-size the slice using +.Xr fdisk 8 +before running +.Nm . If you are using volumes you must enlarge them by using .Xr vinum 8 . The @@ -173,6 +178,7 @@ .Sh SEE ALSO .Xr disklabel 8 , .Xr dumpfs 8 , +.Xr fdisk 8 , .Xr ffsinfo 8 , .Xr fsck 8 , .Xr newfs 8 , ==== //depot/projects/ia64/share/man/man7/tuning.7#13 (text+ko) ==== @@ -2,7 +2,7 @@ .\" the BSD Copyright as specified in the file "/usr/src/COPYRIGHT" in .\" the source tree. .\" -.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.52 2002/08/25 18:54:04 dillon Exp $ +.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.53 2002/08/29 20:34:06 dillon Exp $ .\" .Dd June 25, 2002 .Dt TUNING 7 @@ -222,7 +222,7 @@ .Dq Li "newfs -f 1024 -b 8192 ..." . .Pp If a large partition is intended to be used to hold fewer, larger files, such -as a database files, you can increase the +as database files, you can increase the .Em bytes/i-node ratio which reduces the number of i-nodes (maximum number of files and directories that can be created) for that partition. @@ -273,7 +273,7 @@ determining whether to use it on a filesystem. First, softupdates guarantees filesystem consistency in the case of a crash but could very easily be several seconds (even a minute!) -behind updating the physical disk. +behind on pending write to the physical disk. If you crash you may lose more work than otherwise. Secondly, softupdates delays the freeing of filesystem @@ -291,7 +291,7 @@ options exist that can help you tune the system. The most obvious and most dangerous one is .Cm async . -Do not ever use it, it is far too dangerous. +Do not ever use it; it is far too dangerous. A less dangerous and more useful .Xr mount 8 @@ -455,7 +455,7 @@ .Va net.inet.tcp.recvspace sysctls are of particular interest if you are running network intensive applications. -This controls the amount of send and receive buffer space +They control the amount of send and receive buffer space allowed for any given TCP connection. The default sending buffer is 32K; the default receiving buffer is 64K. @@ -499,7 +499,7 @@ .Va net.inet.tcp.rfc1323 sysctl. These extensions should be enabled and the TCP buffer size should be set -to a value larger than 65536 in order to obtain good performance out of +to a value larger than 65536 in order to obtain good performance from certain types of network links; specifically, gigabit WAN links and high-latency satellite links. RFC1323 support is enabled by default. @@ -524,6 +524,29 @@ TCP session disconnections. .Pp The +.Va net.inet.tcp.delayed_ack +TCP feature is largly misunderstood. Historically speaking this feature +was designed to allow the acknowledgement to transmitted data to be returned +along with the response. For example, when you type over a remote shell +the acknowledgement to the character you send can be returned along with the +data representing the echo of the character. With delayed acks turned off +the acknowledgement may be sent in its own packet before the remote service +has a chance to echo the data it just received. This same concept also +applies to any interactive protocol (e.g. SMTP, WWW, POP3) and can cut the +number of tiny packets flowing across the network in half. The FreeBSD +delayed-ack implementation also follows the TCP protocol rule that +at least every other packet be acknowledged even if the standard 100ms +timeout has not yet passed. Normally the worst a delayed ack can do is +slightly delay the teardown of a connection, or slightly delay the ramp-up +of a slow-start TCP connection. While we aren't sure we believe that +the several FAQs related to packages such as SAMBA and SQUID which advise +turning off delayed acks may be refering to the slow-start issue. In FreeBSD +it would be more beneficial to increase the slow-start flightsize via +the +.Va net.inet.tcp.slowstart_flightsize +sysctl rather then disable delayed acks. +.Pp +The .Va net.inet.tcp.inflight_enable >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 29 18:16:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABB1C37B401; Thu, 29 Aug 2002 18:15:17 -0700 (PDT) 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 32F7B37B400 for ; Thu, 29 Aug 2002 18:15:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3947143E42 for ; Thu, 29 Aug 2002 18:15:16 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7U1FFJU014712 for ; Thu, 29 Aug 2002 18:15:16 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7U1F9ac014694 for perforce@freebsd.org; Thu, 29 Aug 2002 18:15:09 -0700 (PDT) Date: Thu, 29 Aug 2002 18:15:09 -0700 (PDT) Message-Id: <200208300115.g7U1F9ac014694@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16780 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16780 Change 16780 by mini@mini_stylus on 2002/08/29 18:15:01 IFC @16778. Affected files ... .. //depot/projects/kse/include/utime.h#2 integrate .. //depot/projects/kse/lib/libc/gen/utime.3#2 integrate .. //depot/projects/kse/lib/libc/ia64/sys/sbrk.S#2 integrate .. //depot/projects/kse/lib/libc/net/ns_addr.c#2 integrate .. //depot/projects/kse/lib/libc/net/ns_ntoa.c#2 integrate .. //depot/projects/kse/lib/libc/net/rcmd.c#2 integrate .. //depot/projects/kse/lib/libc/regex/regcomp.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/vfprintf.c#3 integrate .. //depot/projects/kse/lib/libc/sys/madvise.2#2 integrate .. //depot/projects/kse/lib/libc/sys/mincore.2#2 integrate .. //depot/projects/kse/lib/libc/sys/mlock.2#2 integrate .. //depot/projects/kse/lib/libc/sys/mmap.2#2 integrate .. //depot/projects/kse/lib/libc/sys/mprotect.2#2 integrate .. //depot/projects/kse/lib/libc/sys/msync.2#2 integrate .. //depot/projects/kse/lib/libc/sys/munmap.2#2 integrate .. //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#7 integrate .. //depot/projects/kse/lib/libc_r/uthread/uthread_close.c#4 integrate .. //depot/projects/kse/lib/libc_r/uthread/uthread_exit.c#4 integrate .. //depot/projects/kse/lib/libc_r/uthread/uthread_fcntl.c#4 integrate .. //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#6 integrate .. //depot/projects/kse/lib/libc_r/uthread/uthread_read.c#4 integrate .. //depot/projects/kse/lib/libc_r/uthread/uthread_readv.c#4 integrate .. //depot/projects/kse/lib/libc_r/uthread/uthread_select.c#4 integrate .. //depot/projects/kse/lib/libc_r/uthread/uthread_write.c#4 integrate .. //depot/projects/kse/lib/libc_r/uthread/uthread_writev.c#4 integrate .. //depot/projects/kse/lib/libkvm/kvm_proc.c#20 integrate .. //depot/projects/kse/sys/alpha/alpha/db_disasm.c#3 integrate .. //depot/projects/kse/sys/alpha/alpha/machdep.c#39 integrate .. //depot/projects/kse/sys/alpha/alpha/pmap.c#33 integrate .. //depot/projects/kse/sys/alpha/alpha/trap.c#34 integrate .. //depot/projects/kse/sys/alpha/include/_types.h#2 integrate .. //depot/projects/kse/sys/alpha/include/ansi.h#13 integrate .. //depot/projects/kse/sys/alpha/include/reg.h#6 integrate .. //depot/projects/kse/sys/arm/include/_types.h#2 integrate .. //depot/projects/kse/sys/arm/include/ansi.h#10 integrate .. //depot/projects/kse/sys/boot/common/Makefile.inc#3 integrate .. //depot/projects/kse/sys/boot/common/load_aout.c#3 delete .. //depot/projects/kse/sys/boot/forth/loader.conf.5#5 integrate .. //depot/projects/kse/sys/boot/i386/libi386/Makefile#6 integrate .. //depot/projects/kse/sys/boot/i386/libi386/aout_freebsd.c#2 delete .. //depot/projects/kse/sys/boot/i386/loader/Makefile#10 integrate .. //depot/projects/kse/sys/boot/i386/loader/conf.c#5 integrate .. //depot/projects/kse/sys/boot/i386/pxeldr/Makefile#2 integrate .. //depot/projects/kse/sys/boot/pc98/libpc98/Makefile#6 integrate .. //depot/projects/kse/sys/boot/pc98/loader/Makefile#7 integrate .. //depot/projects/kse/sys/cam/cam_periph.c#3 integrate .. //depot/projects/kse/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_all.c#10 integrate .. //depot/projects/kse/sys/conf/NOTES#13 integrate .. //depot/projects/kse/sys/conf/files#46 integrate .. //depot/projects/kse/sys/conf/files.i386#27 integrate .. //depot/projects/kse/sys/conf/files.pc98#28 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/CHANGES.txt#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/acapps.h#1 branch .. //depot/projects/kse/sys/contrib/dev/acpica/acconfig.h#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acefi.h#5 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acenv.h#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acfreebsd.h#5 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acgcc.h#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acglobal.h#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/aclocal.h#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acmacros.h#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acobject.h#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acoutput.h#6 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acparser.h#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acpiosxf.h#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acresrc.h#4 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/acutils.h#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/amlcode.h#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbcmds.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbdisply.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbexec.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbfileio.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbhistry.c#5 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbinput.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbstats.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbutils.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dbxface.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dsfield.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dsmethod.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dsmthdat.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dsobject.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dsopcode.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dswexec.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dswload.c#11 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/dswstate.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evevent.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evmisc.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evregion.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evrgnini.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evxface.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/evxfevnt.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exdump.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exfldio.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exmisc.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exoparg1.c#6 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exoparg2.c#6 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exprep.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exregion.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exresop.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exstore.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exsystem.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/exutils.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/hwacpi.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/hwgpe.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/hwregs.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/hwsleep.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsaccess.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsdump.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nseval.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsinit.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsload.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsnames.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nssearch.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsutils.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/psargs.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/psopcode.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/psparse.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/pstree.c#7 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/rscreate.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/rsdump.c#6 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/tbconvrt.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/tbget.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/tbinstal.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/tbutils.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/utdebug.c#10 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/uteval.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/utglobal.c#9 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/utinit.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/utmisc.c#8 integrate .. //depot/projects/kse/sys/contrib/dev/acpica/utxface.c#9 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/fil.c#7 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_compat.h#5 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_fil.c#9 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_frag.c#5 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_frag.h#3 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#5 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_nat.c#8 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_nat.h#4 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_proxy.c#6 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_proxy.h#3 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_state.c#6 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ip_state.h#4 integrate .. //depot/projects/kse/sys/contrib/ipfilter/netinet/ipl.h#5 integrate .. //depot/projects/kse/sys/dev/acpica/Osd/OsdDebug.c#3 integrate .. //depot/projects/kse/sys/dev/acpica/acpi.c#26 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pci.c#1 branch .. //depot/projects/kse/sys/dev/acpica/acpi_pcib.c#9 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pcib_acpi.c#1 branch .. //depot/projects/kse/sys/dev/acpica/acpi_pcib_pci.c#1 branch .. //depot/projects/kse/sys/dev/acpica/acpi_pcibvar.h#1 branch .. //depot/projects/kse/sys/dev/acpica/acpi_powerres.c#9 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_thermal.c#12 integrate .. //depot/projects/kse/sys/dev/acpica/acpivar.h#15 integrate .. //depot/projects/kse/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/kse/sys/dev/em/if_em.c#10 integrate .. //depot/projects/kse/sys/dev/em/if_em.h#8 integrate .. //depot/projects/kse/sys/dev/fb/vga.c#7 integrate .. //depot/projects/kse/sys/dev/kbd/atkbd.c#3 integrate .. //depot/projects/kse/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.c#3 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.h#3 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/kse/sys/dev/pccbb/pccbb.c#20 integrate .. //depot/projects/kse/sys/dev/pci/pci.c#15 integrate .. //depot/projects/kse/sys/dev/pci/pci_pci.c#11 integrate .. //depot/projects/kse/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/kse/sys/dev/pci/pcib_private.h#1 branch .. //depot/projects/kse/sys/dev/pdq/pdq.c#3 integrate .. //depot/projects/kse/sys/dev/ppbus/ppi.c#5 integrate .. //depot/projects/kse/sys/dev/sio/sio.c#17 integrate .. //depot/projects/kse/sys/dev/sound/pci/cmi.c#9 integrate .. //depot/projects/kse/sys/dev/sound/pci/cs4281.c#5 integrate .. //depot/projects/kse/sys/dev/sound/pci/maestro3.c#9 integrate .. //depot/projects/kse/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/kse/sys/dev/sound/pcm/ac97.c#8 integrate .. //depot/projects/kse/sys/dev/sound/pcm/ac97.h#4 integrate .. //depot/projects/kse/sys/dev/sound/pcm/dsp.c#10 integrate .. //depot/projects/kse/sys/dev/sound/pcm/sound.c#13 integrate .. //depot/projects/kse/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/kse/sys/dev/syscons/scvidctl.c#6 integrate .. //depot/projects/kse/sys/dev/usb/ukbd.c#8 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_vfsops.c#11 integrate .. //depot/projects/kse/sys/fs/udf/osta.c#2 integrate .. //depot/projects/kse/sys/geom/geom_gpt.c#5 integrate .. //depot/projects/kse/sys/i386/i386/machdep.c#53 integrate .. //depot/projects/kse/sys/i386/i386/mp_machdep.c#24 integrate .. //depot/projects/kse/sys/i386/i386/pmap.c#44 integrate .. //depot/projects/kse/sys/i386/i386/trap.c#61 integrate .. //depot/projects/kse/sys/i386/ibcs2/ibcs2_signal.c#6 integrate .. //depot/projects/kse/sys/i386/include/_types.h#2 integrate .. //depot/projects/kse/sys/i386/include/reg.h#6 integrate .. //depot/projects/kse/sys/i386/isa/apic_vector.s#13 integrate .. //depot/projects/kse/sys/i386/isa/scd.c#7 integrate .. //depot/projects/kse/sys/i386/isa/stallion.c#7 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_rbch.c#7 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_tel.c#6 integrate .. //depot/projects/kse/sys/ia64/ia64/machdep.c#35 integrate .. //depot/projects/kse/sys/ia64/ia64/mca.c#3 integrate .. //depot/projects/kse/sys/ia64/ia64/pmap.c#29 integrate .. //depot/projects/kse/sys/ia64/ia64/sal.c#8 integrate .. //depot/projects/kse/sys/ia64/ia64/trap.c#28 integrate .. //depot/projects/kse/sys/ia64/include/_types.h#2 integrate .. //depot/projects/kse/sys/ia64/include/reg.h#8 integrate .. //depot/projects/kse/sys/isa/psm.c#11 integrate .. //depot/projects/kse/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/kse/sys/isofs/cd9660/cd9660_rrip.c#3 integrate .. //depot/projects/kse/sys/kern/imgact_elf.c#21 integrate .. //depot/projects/kse/sys/kern/kern_condvar.c#41 integrate .. //depot/projects/kse/sys/kern/kern_descrip.c#35 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#36 integrate .. //depot/projects/kse/sys/kern/kern_lock.c#14 integrate .. //depot/projects/kse/sys/kern/kern_mutex.c#32 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#62 integrate .. //depot/projects/kse/sys/kern/kern_switch.c#65 integrate .. //depot/projects/kse/sys/kern/kern_synch.c#78 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#93 integrate .. //depot/projects/kse/sys/kern/link_aout.c#8 delete .. //depot/projects/kse/sys/kern/link_elf.c#15 integrate .. //depot/projects/kse/sys/kern/subr_rman.c#7 integrate .. //depot/projects/kse/sys/kern/subr_witness.c#30 integrate .. //depot/projects/kse/sys/kern/sys_generic.c#32 integrate .. //depot/projects/kse/sys/kern/sys_process.c#29 integrate .. //depot/projects/kse/sys/kern/uipc_syscalls.c#22 integrate .. //depot/projects/kse/sys/kern/vfs_bio.c#22 integrate .. //depot/projects/kse/sys/kern/vfs_cluster.c#11 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#40 integrate .. //depot/projects/kse/sys/kern/vfs_vnops.c#32 integrate .. //depot/projects/kse/sys/modules/acpi/Makefile#10 integrate .. //depot/projects/kse/sys/modules/cbb/Makefile#3 integrate .. //depot/projects/kse/sys/net/if.h#12 integrate .. //depot/projects/kse/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/kse/sys/net/rtsock.c#19 integrate .. //depot/projects/kse/sys/net/slcompress.c#2 integrate .. //depot/projects/kse/sys/netatm/atm_cm.c#7 integrate .. //depot/projects/kse/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/kse/sys/netinet/ip_mroute.c#12 integrate .. //depot/projects/kse/sys/netinet/tcp_input.c#27 integrate .. //depot/projects/kse/sys/netinet/tcp_subr.c#20 integrate .. //depot/projects/kse/sys/netinet6/esp_input.c#8 integrate .. //depot/projects/kse/sys/netinet6/ip6_fw.c#7 integrate .. //depot/projects/kse/sys/netipx/ipx_ip.c#4 integrate .. //depot/projects/kse/sys/netns/ns_ip.c#2 integrate .. //depot/projects/kse/sys/netns/spp_usrreq.c#5 integrate .. //depot/projects/kse/sys/netsmb/smb_conn.h#6 integrate .. //depot/projects/kse/sys/netsmb/smb_subr.h#7 integrate .. //depot/projects/kse/sys/pc98/i386/machdep.c#30 integrate .. //depot/projects/kse/sys/pc98/pc98/pc98gdc.c#4 integrate .. //depot/projects/kse/sys/pc98/pc98/pc98kbd.c#3 integrate .. //depot/projects/kse/sys/pci/agp.c#9 integrate .. //depot/projects/kse/sys/pci/agp_ali.c#2 integrate .. //depot/projects/kse/sys/pci/agp_amd.c#5 integrate .. //depot/projects/kse/sys/pci/agp_i810.c#4 integrate .. //depot/projects/kse/sys/pci/agp_intel.c#6 integrate .. //depot/projects/kse/sys/pci/agp_sis.c#2 integrate .. //depot/projects/kse/sys/pci/agp_via.c#3 integrate .. //depot/projects/kse/sys/pci/if_dc.c#19 integrate .. //depot/projects/kse/sys/pci/if_de.c#4 integrate .. //depot/projects/kse/sys/pci/if_pcn.c#7 integrate .. //depot/projects/kse/sys/pci/if_rl.c#13 integrate .. //depot/projects/kse/sys/pci/if_sf.c#9 integrate .. //depot/projects/kse/sys/pci/if_sis.c#15 integrate .. //depot/projects/kse/sys/pci/if_sk.c#8 integrate .. //depot/projects/kse/sys/pci/if_ste.c#9 integrate .. //depot/projects/kse/sys/pci/if_ti.c#13 integrate .. //depot/projects/kse/sys/pci/if_tl.c#5 integrate .. //depot/projects/kse/sys/pci/if_vr.c#7 integrate .. //depot/projects/kse/sys/pci/if_wb.c#6 integrate .. //depot/projects/kse/sys/pci/if_xl.c#10 integrate .. //depot/projects/kse/sys/pci/ncr.c#2 integrate .. //depot/projects/kse/sys/pci/uhci_pci.c#7 integrate .. //depot/projects/kse/sys/powerpc/include/_types.h#2 integrate .. //depot/projects/kse/sys/powerpc/include/ansi.h#13 integrate .. //depot/projects/kse/sys/powerpc/include/reg.h#5 integrate .. //depot/projects/kse/sys/powerpc/powerpc/machdep.c#21 integrate .. //depot/projects/kse/sys/powerpc/powerpc/pmap.c#20 integrate .. //depot/projects/kse/sys/sparc64/include/_types.h#2 integrate .. //depot/projects/kse/sys/sparc64/include/bus.h#6 integrate .. //depot/projects/kse/sys/sparc64/include/md_var.h#11 integrate .. //depot/projects/kse/sys/sparc64/include/reg.h#12 integrate .. //depot/projects/kse/sys/sparc64/sparc64/elf_machdep.c#7 integrate .. //depot/projects/kse/sys/sparc64/sparc64/locore.S#3 integrate .. //depot/projects/kse/sys/sparc64/sparc64/machdep.c#35 integrate .. //depot/projects/kse/sys/sparc64/sparc64/pmap.c#36 integrate .. //depot/projects/kse/sys/sys/_types.h#5 integrate .. //depot/projects/kse/sys/sys/imgact.h#7 integrate .. //depot/projects/kse/sys/sys/ktr.h#7 integrate .. //depot/projects/kse/sys/sys/lock.h#12 integrate .. //depot/projects/kse/sys/sys/mman.h#5 integrate .. //depot/projects/kse/sys/sys/param.h#23 integrate .. //depot/projects/kse/sys/sys/proc.h#123 integrate .. //depot/projects/kse/sys/sys/types.h#18 integrate .. //depot/projects/kse/sys/sys/ucred.h#17 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_vfsops.c#9 integrate .. //depot/projects/kse/sys/vm/phys_pager.c#6 integrate .. //depot/projects/kse/sys/vm/pmap.h#13 integrate .. //depot/projects/kse/sys/vm/vm_fault.c#16 integrate .. //depot/projects/kse/sys/vm/vm_kern.c#12 integrate .. //depot/projects/kse/sys/vm/vm_map.c#25 integrate .. //depot/projects/kse/sys/vm/vm_object.c#17 integrate .. //depot/projects/kse/sys/vm/vm_object.h#8 integrate .. //depot/projects/kse/sys/vm/vm_page.c#16 integrate .. //depot/projects/kse/sys/vm/vm_page.h#12 integrate .. //depot/projects/kse/sys/vm/vnode_pager.c#17 integrate .. //depot/projects/kse/sys/x86_64/include/_types.h#2 integrate .. //depot/projects/kse/usr.bin/w/w.c#8 integrate Differences ... ==== //depot/projects/kse/include/utime.h#2 (text+ko) ==== @@ -31,19 +31,25 @@ * SUCH DAMAGE. * * @(#)utime.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/utime.h,v 1.4 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/utime.h,v 1.5 2002/08/24 00:11:52 mike Exp $ */ #ifndef _UTIME_H_ #define _UTIME_H_ +#include +#include + +#ifndef _TIME_T_DECLARED +typedef __time_t time_t; +#define _TIME_T_DECLARED +#endif + struct utimbuf { time_t actime; /* Access time */ time_t modtime; /* Modification time */ }; -#include - __BEGIN_DECLS int utime(const char *, const struct utimbuf *); __END_DECLS ==== //depot/projects/kse/lib/libc/gen/utime.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)utime.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/utime.3,v 1.10 2001/10/01 16:08:51 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/utime.3,v 1.11 2002/08/24 00:39:43 mike Exp $ .\" .Dd June 4, 1993 .Dt UTIME 3 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In utime.h .Ft int .Fn utime "const char *file" "const struct utimbuf *timep" ==== //depot/projects/kse/lib/libc/ia64/sys/sbrk.S#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libc/ia64/sys/sbrk.S,v 1.2 2001/10/10 10:35:01 dfr Exp $ */ +/* $FreeBSD: src/lib/libc/ia64/sys/sbrk.S,v 1.3 2002/08/23 03:47:50 marcel Exp $ */ /* $NetBSD: sbrk.S,v 1.4 1996/10/17 03:08:20 cgd Exp $ */ /* @@ -38,16 +38,21 @@ .text ENTRY(sbrk, 1) - alloc r14=ar.pfs,1,2,0,0 - - add loc0=@ltoff(curbrk),gp ;; - ld8 loc0=[loc0] ;; - ld8 loc1=[loc0] - cmp.eq p6,p0=in0,r0 -(p6) br.dpnt.few 1f - add in0=r14,in0 + add r14 = @ltoff(curbrk), gp + ;; + ld8 r14 = [r14] + cmp.eq p6, p0 = in0, r0 + ;; + ld8 ret0 = [r14] +(p6) br.ret.sptk.few rp + ;; + add in0 = ret0, in0 CALLSYS_ERROR(break) - st8 [loc0]=in0 -1: mov ret0=loc1 - br.ret.sptk.few rp + add r14 = @ltoff(curbrk), gp + ;; + ld8 r14 = [r14] + ;; + ld8 ret0 = [r14] + st8 [r14] = in0 + br.ret.sptk.few rp END(sbrk) ==== //depot/projects/kse/lib/libc/net/ns_addr.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ns_addr.c 8.1 (Berkeley) 6/7/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/ns_addr.c,v 1.10 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ns_addr.c,v 1.11 2002/08/25 13:06:23 charnier Exp $"); #include #include @@ -167,7 +167,7 @@ case 'h': case 'H': base16 = 1; - /* fall into */ + /* FALLTHROUGH */ default: *--bp = 0; /* Ends Loop */ ==== //depot/projects/kse/lib/libc/net/ns_ntoa.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)ns_ntoa.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/ns_ntoa.c,v 1.5 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ns_ntoa.c,v 1.6 2002/08/25 13:06:23 charnier Exp $"); #include #include @@ -91,7 +91,7 @@ case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': *p += ('A' - 'a'); - /* fall into . . . */ + /* FALLTHROUGH */ case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': ok = 1; case '1': case '2': case '3': case '4': case '5': ==== //depot/projects/kse/lib/libc/net/rcmd.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)rcmd.c 8.3 (Berkeley) 3/26/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/rcmd.c,v 1.36 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/rcmd.c,v 1.37 2002/08/24 17:37:42 jdp Exp $"); #include "namespace.h" #include @@ -621,7 +621,7 @@ /* We need to get the damn hostname back for netgroup matching. */ if (getnameinfo(raddr, salen, hname, sizeof(hname), NULL, 0, NI_NAMEREQD) != 0) - return (-1); + hname[0] = '\0'; while (fgets(buf, sizeof(buf), hostf)) { p = buf; @@ -660,16 +660,16 @@ break; } if (buf[1] == '@') /* match a host by netgroup */ - hostok = innetgr((char *)&buf[2], - (char *)&hname, NULL, ypdomain); + hostok = hname[0] != '\0' && + innetgr(&buf[2], hname, NULL, ypdomain); else /* match a host by addr */ hostok = __icheckhost(raddr, salen, (char *)&buf[1]); break; case '-': /* reject '-' hosts and all their users */ if (buf[1] == '@') { - if (innetgr((char *)&buf[2], - (char *)&hname, NULL, ypdomain)) + if (hname[0] == '\0' || + innetgr(&buf[2], hname, NULL, ypdomain)) return(-1); } else { if (__icheckhost(raddr, salen, ==== //depot/projects/kse/lib/libc/regex/regcomp.c#2 (text+ko) ==== @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.27 2002/03/22 21:52:47 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.28 2002/08/25 13:06:26 charnier Exp $"); #include #include @@ -1741,7 +1741,7 @@ return; } } while (OP(s) != O_QUEST && OP(s) != O_CH); - /* fallthrough */ + /* FALLTHROUGH */ case OBOW: /* things that break a sequence */ case OEOW: case OBOL: ==== //depot/projects/kse/lib/libc/stdio/vfprintf.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.43 2002/08/15 10:28:52 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.44 2002/08/27 20:11:08 schweikh Exp $"); /* * Actual printf innards. @@ -1409,13 +1409,8 @@ ndigits++; mode = 2; /* ndigits significant digits */ } - if (value < 0) { - value = -value; - *sign = '-'; - } else - *sign = '\000'; - digits = __dtoa(value, mode, ndigits, decpt, &dsgn, &rve, - dtoaresultp); + digits = __dtoa(value, mode, ndigits, decpt, &dsgn, &rve, dtoaresultp); + *sign = dsgn != 0; if ((ch != 'g' && ch != 'G') || flags & ALT) { /* print trailing zeros */ bp = digits + ndigits; ==== //depot/projects/kse/lib/libc/sys/madvise.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)madvise.2 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.23 2001/10/01 16:09:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/madvise.2,v 1.24 2002/08/24 00:39:43 mike Exp $ .\" .Dd July 19, 1996 .Dt MADVISE 2 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft int .Fn madvise "void *addr" "size_t len" "int behav" ==== //depot/projects/kse/lib/libc/sys/mincore.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mincore.2 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/sys/mincore.2,v 1.19 2002/03/09 07:05:22 dd Exp $ +.\" $FreeBSD: src/lib/libc/sys/mincore.2,v 1.20 2002/08/24 00:39:43 mike Exp $ .\" .Dd June 9, 1993 .Dt MINCORE 2 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft int .Fn mincore "const void *addr" "size_t len" "char *vec" ==== //depot/projects/kse/lib/libc/sys/mlock.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mlock.2 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/sys/mlock.2,v 1.11 2001/10/01 16:09:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/mlock.2,v 1.12 2002/08/24 00:39:43 mike Exp $ .\" .Dd June 2, 1993 .Dt MLOCK 2 @@ -42,7 +42,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft int .Fn mlock "const void *addr" "size_t len" ==== //depot/projects/kse/lib/libc/sys/mmap.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 -.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.43 2002/03/15 18:04:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.44 2002/08/24 00:39:43 mike Exp $ .\" .Dd November 17, 2001 .Dt MMAP 2 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft void * .Fn mmap "void *addr" "size_t len" "int prot" "int flags" "int fd" "off_t offset" ==== //depot/projects/kse/lib/libc/sys/mprotect.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mprotect.2 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/sys/mprotect.2,v 1.13 2001/10/01 16:09:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/mprotect.2,v 1.14 2002/08/24 00:39:43 mike Exp $ .\" .Dd June 9, 1993 .Dt MPROTECT 2 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft int .Fn mprotect "const void *addr" "size_t len" "int prot" ==== //depot/projects/kse/lib/libc/sys/msync.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)msync.2 8.2 (Berkeley) 6/21/94 -.\" $FreeBSD: src/lib/libc/sys/msync.2,v 1.21 2001/10/01 16:09:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/msync.2,v 1.22 2002/08/24 00:39:43 mike Exp $ .\" .Dd June 21, 1994 .Dt MSYNC 2 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft int .Fn msync "void *addr" "size_t len" "int flags" ==== //depot/projects/kse/lib/libc/sys/munmap.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)munmap.2 8.3 (Berkeley) 5/27/94 -.\" $FreeBSD: src/lib/libc/sys/munmap.2,v 1.15 2002/01/07 06:12:25 dd Exp $ +.\" $FreeBSD: src/lib/libc/sys/munmap.2,v 1.16 2002/08/24 00:39:43 mike Exp $ .\" .Dd May 27, 1994 .Dt MUNMAP 2 @@ -41,7 +41,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In sys/mman.h .Ft int .Fn munmap "void *addr" "size_t len" ==== //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * * Private thread definitions for the uthread kernel. * - * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.72 2002/06/14 04:02:25 rwatson Exp $ + * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.73 2002/08/29 23:06:06 deischen Exp $ */ #ifndef _PTHREAD_PRIVATE_H ==== //depot/projects/kse/lib/libc_r/uthread/uthread_close.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_close.c,v 1.12 2001/04/10 04:19:19 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_close.c,v 1.13 2002/08/29 23:06:06 deischen Exp $ */ #include #include ==== //depot/projects/kse/lib/libc_r/uthread/uthread_exit.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_exit.c,v 1.26 2002/05/24 04:32:28 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_exit.c,v 1.27 2002/08/29 23:06:07 deischen Exp $ */ #include #include ==== //depot/projects/kse/lib/libc_r/uthread/uthread_fcntl.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.14 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_fcntl.c,v 1.15 2002/08/29 23:06:07 deischen Exp $ */ #include #include ==== //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_kern.c,v 1.40 2002/02/09 19:58:41 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_kern.c,v 1.42 2002/08/29 00:44:11 archie Exp $ * */ #include ==== //depot/projects/kse/lib/libc_r/uthread/uthread_read.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_read.c,v 1.13 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_read.c,v 1.14 2002/08/29 23:06:07 deischen Exp $ * */ #include ==== //depot/projects/kse/lib/libc_r/uthread/uthread_readv.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_readv.c,v 1.14 2002/05/02 19:58:43 archie Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_readv.c,v 1.15 2002/08/29 23:06:07 deischen Exp $ * */ #include ==== //depot/projects/kse/lib/libc_r/uthread/uthread_select.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_select.c,v 1.20 2002/05/02 19:58:43 archie Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_select.c,v 1.21 2002/08/29 21:39:19 archie Exp $ */ #include #include ==== //depot/projects/kse/lib/libc_r/uthread/uthread_write.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_write.c,v 1.19 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_write.c,v 1.20 2002/08/29 23:06:07 deischen Exp $ * */ #include ==== //depot/projects/kse/lib/libc_r/uthread/uthread_writev.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_writev.c,v 1.19 2002/05/02 19:58:43 archie Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_writev.c,v 1.20 2002/08/29 23:06:07 deischen Exp $ * */ #include ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#20 (text+ko) ==== @@ -34,11 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.51 2002/08/16 07:01:42 alfred Exp $ + * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.53 2002/08/28 20:39:48 alfred Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.51 2002/08/16 07:01:42 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.53 2002/08/28 20:39:48 alfred Exp $"); #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93"; @@ -52,9 +52,8 @@ */ #include -#define _KERNEL +#define _WANT_UCRED /* make ucred.h give us 'struct ucred' */ #include -#undef _KERNEL #include #include #include @@ -254,7 +253,7 @@ if (tty.t_pgrp != NULL) { if (KREAD(kd, (u_long)tty.t_pgrp, &pgrp)) { _kvm_err(kd, kd->program, - "can't read tpgrp at &x", + "can't read tpgrp at %x", tty.t_pgrp); return (-1); } ==== //depot/projects/kse/sys/alpha/alpha/db_disasm.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.6 2002/03/20 18:58:44 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.7 2002/08/25 13:16:45 charnier Exp $ */ /* $NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $ */ /* @@ -1012,7 +1012,7 @@ case op_sts: case op_stt: fstore = TRUE; - /* fall through */ + /* FALLTHROUGH */ case op_ldl: case op_ldq: case op_ldl_l: ==== //depot/projects/kse/sys/alpha/alpha/machdep.c#39 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.180 2002/07/31 19:37:02 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.181 2002/08/29 06:17:46 jake Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -97,6 +97,7 @@ #include #include #include +#include #include #include #include @@ -131,7 +132,6 @@ #include #include #include -#include #include #include #include @@ -1583,7 +1583,7 @@ * Clear registers on exec */ void -setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) +exec_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) { struct trapframe *tfp = td->td_frame; ==== //depot/projects/kse/sys/alpha/alpha/pmap.c#33 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.105 2002/08/13 06:22:11 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.106 2002/08/25 04:20:01 alc Exp $ */ /* @@ -2556,29 +2556,6 @@ bcopy((caddr_t) src, (caddr_t) dst, PAGE_SIZE); } - -/* - * Routine: pmap_pageable - * Function: - * Make the specified pages (by pmap, offset) - * pageable (or not) as requested. - * - * A page which is not pageable may not take - * a fault; therefore, its page table entry - * must remain valid for the duration. - * - * This routine is merely advisory; pmap_enter - * will specify that these pages are to be wired - * down (or not) as appropriate. - */ -void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vm_offset_t sva, eva; - boolean_t pageable; -{ -} - /* * Returns true if the pmap's pv is one of the first * 16 pvs linked to from this page. This count may ==== //depot/projects/kse/sys/alpha/alpha/trap.c#34 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.99 2002/07/31 19:37:02 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.100 2002/08/25 13:16:45 charnier Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -404,7 +404,7 @@ ucode = a0; /* exception summary */ break; } - /* FALLTHROUTH */ + /* FALLTHROUGH */ case ALPHA_IF_CODE_BPT: case ALPHA_IF_CODE_BUGCHK: if (td->td_md.md_flags & (MDTD_STEP1|MDTD_STEP2)) { ==== //depot/projects/kse/sys/alpha/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.1 2002/08/21 16:19:58 mike Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.2 2002/08/23 16:49:04 mike Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -55,13 +55,10 @@ * Standard type definitions. */ typedef __int32_t __clock_t; /* clock()... */ -typedef __int32_t __clockid_t; /* clock_gettime()... */ typedef __int64_t __critical_t; -typedef __uint32_t __fflags_t; /* file flags */ typedef __int64_t __intfptr_t; typedef __int64_t __intmax_t; typedef __int64_t __intptr_t; -typedef __uint32_t __intrmask_t; typedef __int32_t __int_fast8_t; typedef __int32_t __int_fast16_t; typedef __int32_t __int_fast32_t; @@ -70,16 +67,12 @@ typedef __int16_t __int_least16_t; typedef __int32_t __int_least32_t; typedef __int64_t __int_least64_t; -typedef __int64_t __off_t; /* file offset */ -typedef __int32_t __pid_t; /* process [group] */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 29 18:58:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E29737B401; Thu, 29 Aug 2002 18:58:09 -0700 (PDT) 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 A9FF237B400 for ; Thu, 29 Aug 2002 18:58:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4952743E77 for ; Thu, 29 Aug 2002 18:58:08 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7U1w8JU020138 for ; Thu, 29 Aug 2002 18:58:08 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7U1w7fE020135 for perforce@freebsd.org; Thu, 29 Aug 2002 18:58:07 -0700 (PDT) Date: Thu, 29 Aug 2002 18:58:07 -0700 (PDT) Message-Id: <200208300158.g7U1w7fE020135@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16781 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16781 Change 16781 by mini@mini_stylus on 2002/08/29 18:57:55 Fix a munged file from the previous integ (change 16780). Affected files ... .. //depot/projects/kse/sys/i386/i386/machdep.c#54 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/machdep.c#54 (text+ko) ==== @@ -125,134 +125,175 @@ extern void earlysetcpuclass(void); /* same header file */ extern void finishidentcpu(void); extern void panicifcpuunsupported(void); -rintf(sb, "%s", indent); - sbuf_printf_uuid(sb, uuid); - sbuf_printf(sb, "\n"); - } +extern void initializecpu(void); + +#define CS_SECURE(cs) (ISPL(cs) == SEL_UPL) +#define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0) + +static void cpu_startup(void *); +static void fpstate_drop(struct thread *td); +static void get_fpcontext(struct thread *td, mcontext_t *mcp); +static int set_fpcontext(struct thread *td, const mcontext_t *mcp); +#ifdef CPU_ENABLE_SSE +static void set_fpregs_xmm(struct save87 *, struct savexmm *); +static void fill_fpregs_xmm(struct savexmm *, struct save87 *); +#endif /* CPU_ENABLE_SSE */ +SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) + +int _udatasel, _ucodesel; +u_int atdevbase; + +#if defined(SWTCH_OPTIM_STATS) +extern int swtch_optim_stats; +SYSCTL_INT(_debug, OID_AUTO, swtch_optim_stats, + CTLFLAG_RD, &swtch_optim_stats, 0, ""); +SYSCTL_INT(_debug, OID_AUTO, tlb_flush_count, + CTLFLAG_RD, &tlb_flush_count, 0, ""); +#endif + +int physmem = 0; +int cold = 1; + +#ifdef COMPAT_43 +static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); +#endif + +static int +sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) +{ + int error = sysctl_handle_int(oidp, 0, ctob(physmem), req); + return (error); +} + +SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_INT|CTLFLAG_RD, + 0, 0, sysctl_hw_physmem, "IU", ""); + +static int +sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) +{ + int error = sysctl_handle_int(oidp, 0, + ctob(physmem - cnt.v_wire_count), req); + return (error); } -static struct g_geom * -g_gpt_taste(struct g_class *mp, struct g_provider *pp, int insist) +SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD, + 0, 0, sysctl_hw_usermem, "IU", ""); + +static int +sysctl_hw_availpages(SYSCTL_HANDLER_ARGS) { - struct g_consumer *cp; - struct g_geom *gp; - struct g_gpt_softc *gs; - struct g_slicer *gsp; - u_char *buf, *mbr; - struct gpt_ent *ent; - struct gpt_hdr *hdr; - u_int i, npart, secsz, tblsz; - int error, ps; + int error = sysctl_handle_int(oidp, 0, + i386_btop(avail_end - avail_start), req); + return (error); +} - g_trace(G_T_TOPOLOGY, "g_gpt_taste(%s,%s)", mp->name, pp->name); - g_topology_assert(); +SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_INT|CTLFLAG_RD, + 0, 0, sysctl_hw_availpages, "I", ""); - /* - * XXX: I don't like to hardcode a maximum number of slices, since - * it's wasting space most of the time and insufficient any time. - * It's easier for now... - */ - gp = g_slice_new(mp, GPT_MAX_SLICES, pp, &cp, &gs, sizeof(*gs), - g_gpt_start); - if (gp == NULL) - return (NULL); +int Maxmem = 0; - gsp = gp->softc; - g_topology_unlock(); - gp->dumpconf = g_gpt_dumpconf; +vm_offset_t phys_avail[10]; - npart = 0; - mbr = NULL; +/* must be 2 less so 0 0 can signal end of chunks */ +#define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2) - if (gp->rank != 2 && insist == 0) - goto out; +struct kva_md_info kmi; - error = g_getattr("GEOM::sectorsize", cp, &secsz); - if (error) - goto out; +static struct trapframe proc0_tf; +#ifndef SMP +static struct pcpu __pcpu; +#endif - /* XXX: we need to get the media size as well. */ +struct mtx icu_lock; - /* Read both the MBR sector and the GPT sector. */ - mbr = g_read_data(cp, 0, 2 * secsz, &error); - if (mbr == NULL || error != 0) - goto out; -#if 0 +static void +cpu_startup(dummy) + void *dummy; +{ /* - * XXX: we should ignore the GPT if there's a MBR and the MBR is - * not a PMBR (Protective MBR). I believe this is what the EFI - * spec is going to say eventually (this is hearsay :-) - * Currently EFI (version 1.02) accepts and uses the GPT even - * though there's a valid MBR. We do this too, because it allows - * us to test this code without first nuking the only partitioning - * scheme we grok until this is working. + * Good {morning,afternoon,evening,night}. */ - if (!is_pmbr((void*)mbr)) - goto out; + earlysetcpuclass(); + startrtclock(); + printcpuinfo(); + panicifcpuunsupported(); +#ifdef PERFMON + perfmon_init(); #endif - - hdr = (void*)(mbr + secsz); - + printf("real memory = %u (%uK bytes)\n", ptoa(Maxmem), + ptoa(Maxmem) / 1024); /* - * XXX: if we don't have a GPT header at LBA 1, we should check if - * there's a backup GPT at the end of the medium. If we have a valid - * backup GPT, we should restore the primary GPT and claim this lunch. + * Display any holes after the first chunk of extended memory. */ - if (!is_gpt_hdr(hdr)) - goto out; + if (bootverbose) { + int indx; - tblsz = (hdr->hdr_entries * hdr->hdr_entsz + secsz - 1) & ~(secsz - 1); - buf = g_read_data(cp, hdr->hdr_lba_table * secsz, tblsz, &error); + printf("Physical memory chunk(s):\n"); + for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) { + unsigned int size1; - gsp->frontstuff = hdr->hdr_lba_start * secsz; - - for (i = 0; i < hdr->hdr_entries; i++) { - struct uuid unused = GPT_ENT_TYPE_UNUSED; - struct uuid freebsd = GPT_ENT_TYPE_FREEBSD; - if (i >= GPT_MAX_SLICES) - break; - ent = (void*)(buf + i * hdr->hdr_entsz); - if (!memcmp(&ent->ent_type, &unused, sizeof(unused))) - continue; - gs->part[i] = g_malloc(hdr->hdr_entsz, M_WAITOK); - if (gs->part[i] == NULL) - break; - bcopy(ent, gs->part[i], hdr->hdr_entsz); - ps = (!memcmp(&ent->ent_type, &freebsd, sizeof(freebsd))) - ? 's' : 'p'; - (void)g_slice_addslice(gp, i, ent->ent_lba_start * secsz, - (ent->ent_lba_end - ent->ent_lba_start + 1ULL) * secsz, - "%s%c%d", gp->name, ps, i + 1); - npart++; + size1 = phys_avail[indx + 1] - phys_avail[indx]; + printf("0x%08x - 0x%08x, %u bytes (%u pages)\n", + phys_avail[indx], phys_avail[indx + 1] - 1, size1, + size1 / PAGE_SIZE); + } } - g_free(buf); + vm_ksubmap_init(&kmi); - out: - if (mbr != NULL) - g_free(mbr); + printf("avail memory = %u (%uK bytes)\n", ptoa(cnt.v_free_count), + ptoa(cnt.v_free_count) / 1024); - g_topology_lock(); - error = g_access_rel(cp, -1, 0, 0); + /* + * Set up buffers, so they can be used to read disk labels. + */ + bufinit(); + vm_pager_bufferinit(); - if (npart > 0) { - LIST_FOREACH(pp, &gp->provider, provider) - g_error_provider(pp, 0); - return (gp); - } - g_std_spoiled(cp); - return (NULL); +#ifndef SMP + /* For SMP, we delay the cpu_setregs() until after SMP startup. */ + cpu_setregs(); +#endif } -static struct g_class g_gpt_class = { - "GPT", - g_gpt_taste, - NULL, - G_CLASS_INITIALIZER -}; +/* + * Send an interrupt to process. + * + * Stack is set up to allow sigcode stored + * at top to call routine, followed by kcall + * to sigreturn routine below. After sigreturn + * resets the signal mask, the stack, and the + * frame pointer, it returns to the user + * specified pc, psl. + */ +#ifdef COMPAT_43 +static void +osendsig(catcher, sig, mask, code) + sig_t catcher; + int sig; + sigset_t *mask; + u_long code; +{ + struct osigframe sf; + struct osigframe *fp; + struct proc *p; + struct thread *td; + struct sigacts *psp; + struct trapframe *regs; + int oonstack; + + td = curthread; + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); + psp = p->p_sigacts; + regs = td->td_frame; + oonstack = sigonstack(regs->tf_esp); -DECLARE_GEOM_CLASS(g_gpt_class, g_gpt); - + /* Allocate space for the signal handler context. */ + if ((p->p_flag & P_ALTSTACK) && !oonstack && + SIGISMEMBER(psp->ps_sigonstack, sig)) { + fp = (struct osigframe *)(p->p_sigstk.ss_sp + + p->p_sigstk.ss_size - sizeof(struct osigframe)); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) p->p_sigstk.ss_flags |= SS_ONSTACK; #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 29 20:27:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C96BE37B401; Thu, 29 Aug 2002 20:27:07 -0700 (PDT) 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 49DCC37B400 for ; Thu, 29 Aug 2002 20:27:07 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 177A343E3B for ; Thu, 29 Aug 2002 20:27:07 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id DBCEDAE03F; Thu, 29 Aug 2002 20:27:06 -0700 (PDT) Date: Thu, 29 Aug 2002 20:27:06 -0700 From: Jonathan Mini To: Perforce Change Reviews Subject: Re: PERFORCE change 16781 for review Message-ID: <20020830032706.GE3751@elvis.mu.org> References: <200208300158.g7U1w7fE020135@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200208300158.g7U1w7fE020135@freefall.freebsd.org> User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jonathan Mini [mini@FreeBSD.org] wrote : > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16781 > > Change 16781 by mini@mini_stylus on 2002/08/29 18:57:55 > > Fix a munged file from the previous integ (change 16780). > > Affected files ... > > .. //depot/projects/kse/sys/i386/i386/machdep.c#54 edit This is the second time this has happened to me. Anyone else run into this? -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 29 21: 5:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E79137B405; Thu, 29 Aug 2002 21:05:32 -0700 (PDT) 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 8CCA737B401; Thu, 29 Aug 2002 21:05:31 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABDD043E65; Thu, 29 Aug 2002 21:05:27 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 7BA122A893; Thu, 29 Aug 2002 21:05:22 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16781 for review In-Reply-To: <20020830032706.GE3751@elvis.mu.org> Date: Thu, 29 Aug 2002 21:05:22 -0700 From: Peter Wemm Message-Id: <20020830040522.7BA122A893@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jonathan Mini wrote: > Jonathan Mini [mini@FreeBSD.org] wrote : > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16781 > > > > Change 16781 by mini@mini_stylus on 2002/08/29 18:57:55 > > > > Fix a munged file from the previous integ (change 16780). > > > > Affected files ... > > > > .. //depot/projects/kse/sys/i386/i386/machdep.c#54 edit > > This is the second time this has happened to me. > > Anyone else run into this? Are you running -current? Either on a SMP box with a kernel more than a few days old, or on a penitum4? Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 29 21:10:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 320D037B401; Thu, 29 Aug 2002 21:10:13 -0700 (PDT) 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 AD00137B400 for ; Thu, 29 Aug 2002 21:10:12 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74CAB43E42 for ; Thu, 29 Aug 2002 21:10:12 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 4048EAE147; Thu, 29 Aug 2002 21:10:12 -0700 (PDT) Date: Thu, 29 Aug 2002 21:10:12 -0700 From: Jonathan Mini To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16781 for review Message-ID: <20020830041012.GF3751@elvis.mu.org> References: <20020830032706.GE3751@elvis.mu.org> <20020830040522.7BA122A893@canning.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020830040522.7BA122A893@canning.wemm.org> User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Peter Wemm [peter@wemm.org] wrote : > Jonathan Mini wrote: > > Jonathan Mini [mini@FreeBSD.org] wrote : > > > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16781 > > > > > > Change 16781 by mini@mini_stylus on 2002/08/29 18:57:55 > > > > > > Fix a munged file from the previous integ (change 16780). > > > > > > Affected files ... > > > > > > .. //depot/projects/kse/sys/i386/i386/machdep.c#54 edit > > > > This is the second time this has happened to me. > > > > Anyone else run into this? > > Are you running -current? Either on a SMP box with a kernel more than > a few days old, or on a penitum4? Yeah: stylus:~/p4/kse/sys$ uname -a FreeBSD stylus.haikugeek.com 5.0-CURRENT FreeBSD 5.0-CURRENT #1: Mon Aug 19 20:11:42 PDT 2002 mini@stylus.haikugeek.com:/usr/src/sys/i386/compile/STYLUS i386 On a dual Athlon. Is it time to upgrade again? -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 29 21:15:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DE5037B401; Thu, 29 Aug 2002 21:15:43 -0700 (PDT) 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 B0C9D37B400; Thu, 29 Aug 2002 21:15:42 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7958143E65; Thu, 29 Aug 2002 21:15:42 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 672012A893; Thu, 29 Aug 2002 21:15:42 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16781 for review In-Reply-To: <20020830041012.GF3751@elvis.mu.org> Date: Thu, 29 Aug 2002 21:15:42 -0700 From: Peter Wemm Message-Id: <20020830041542.672012A893@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jonathan Mini wrote: > Peter Wemm [peter@wemm.org] wrote : > > > Jonathan Mini wrote: > > > Jonathan Mini [mini@FreeBSD.org] wrote : > > > > > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16781 > > > > > > > > Change 16781 by mini@mini_stylus on 2002/08/29 18:57:55 > > > > > > > > Fix a munged file from the previous integ (change 16780). > > > > > > > > Affected files ... > > > > > > > > .. //depot/projects/kse/sys/i386/i386/machdep.c#54 edit > > > > > > This is the second time this has happened to me. > > > > > > Anyone else run into this? > > > > Are you running -current? Either on a SMP box with a kernel more than > > a few days old, or on a penitum4? > > Yeah: > > stylus:~/p4/kse/sys$ uname -a > FreeBSD stylus.haikugeek.com 5.0-CURRENT FreeBSD 5.0-CURRENT #1: Mon Aug 19 2 0:11:42 PDT 2002 mini@stylus.haikugeek.com:/usr/src/sys/i386/compile/ST YLUS i386 > > On a dual Athlon. > > Is it time to upgrade again? Absolutely. I was getting the same corruption on my dual athlon. Fixed here (i386/isa/apic_vector.s): revision 1.85 date: 2002/08/23 21:45:59; author: peter; state: Exp; lines: +1 -1 Ok, somebody please shoot me. The asm I wrote for the ranged IPI shootdown was wrong. It only ever invalidated one page due to me getting the loop terminator wrong. This explains the DISABLE_PG_G effect on SMP. @@ -352,5 +352,5 @@ 1: invlpg (%edx) /* invalidate single page */ addl $PAGE_SIZE, %edx - cmpl %edx, %eax + cmpl %eax, %edx jb 1b You can make just that change if you do not want new adventures. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 29 21:18: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE78537B401; Thu, 29 Aug 2002 21:18:03 -0700 (PDT) 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 8386937B400 for ; Thu, 29 Aug 2002 21:18:03 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F0A943E4A for ; Thu, 29 Aug 2002 21:18:03 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 1F54EAE272; Thu, 29 Aug 2002 21:18:03 -0700 (PDT) Date: Thu, 29 Aug 2002 21:18:03 -0700 From: Jonathan Mini To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16781 for review Message-ID: <20020830041803.GG3751@elvis.mu.org> References: <20020830041012.GF3751@elvis.mu.org> <20020830041542.672012A893@canning.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020830041542.672012A893@canning.wemm.org> User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Peter Wemm [peter@wemm.org] wrote : > You can make just that change if you do not want new adventures. Thanks. New adventures tomorrow night. For now, I think I'll just fix this botched integ from freefall. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 29 22:23:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C40AD37B401; Thu, 29 Aug 2002 22:22:34 -0700 (PDT) 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 5E93D37B400 for ; Thu, 29 Aug 2002 22:22:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93CC843E42 for ; Thu, 29 Aug 2002 22:22:33 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7U5MXJU055368 for ; Thu, 29 Aug 2002 22:22:33 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7U5MXuq055365 for perforce@freebsd.org; Thu, 29 Aug 2002 22:22:33 -0700 (PDT) Date: Thu, 29 Aug 2002 22:22:33 -0700 (PDT) Message-Id: <200208300522.g7U5MXuq055365@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16788 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16788 Change 16788 by mini@freefall on 2002/08/29 22:22:14 Fix corruption from previous integ. Affected files ... .. //depot/projects/kse/sys/cam/scsi/scsi_da.c#22 edit .. //depot/projects/kse/sys/dev/ppbus/ppi.c#6 edit .. //depot/projects/kse/sys/dev/usb/ugen.c#14 edit Differences ... ==== //depot/projects/kse/sys/cam/scsi/scsi_da.c#22 (text+ko) ==== @@ -1753,79 +1753,64 @@ if ((ccb.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { if (((ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_SCSI_STATUS_ERROR) - && (ccb.csio.scsi_status == SCSI_STATUS_CHECK_COND)that a tag must be sent. - */ -#ifndef DA_ORDEREDTAG_INTERVAL -#define DA_ORDEREDTAG_INTERVAL 4 -#endif + && (ccb.csio.scsi_status == SCSI_STATUS_CHECK_COND)){ + int error_code, sense_key, asc, ascq; -static struct periph_driver dadriver = -{ - dainit, "da", - TAILQ_HEAD_INITIALIZER(dadriver.units), /* generation */ 0 -}; + scsi_extract_sense(&ccb.csio.sense_data, + &error_code, &sense_key, + &asc, &ascq); -PERIPHDRIVER_DECLARE(da, dadriver); + if (sense_key != SSD_KEY_ILLEGAL_REQUEST) + scsi_sense_print(&ccb.csio); + } else { + xpt_print_path(periph->path); + printf("Synchronize cache failed, status " + "== 0x%x, scsi status == 0x%x\n", + ccb.ccb_h.status, ccb.csio.scsi_status); + } + } -#define DA_CDEV_MAJOR 13 + if ((ccb.ccb_h.status & CAM_DEV_QFRZN) != 0) + cam_release_devq(ccb.ccb_h.path, + /*relsim_flags*/0, + /*reduction*/0, + /*timeout*/0, + /*getcount_only*/0); -/* For 2.2-stable support */ -#ifndef D_DISK -#define D_DISK 0 -#endif + } +} -static struct cdevsw da_cdevsw = { - /* open */ daopen, - /* close */ daclose, - /* read */ physread, - /* write */ physwrite, - /* ioctl */ daioctl, - /* poll */ nopoll, - /* mmap */ nommap, - /* strategy */ dastrategy, - /* name */ "da", - /* maj */ DA_CDEV_MAJOR, - /* dump */ dadump, - /* psize */ nopsize, - /* flags */ D_DISK, -}; +#else /* !_KERNEL */ -static struct cdevsw dadisk_cdevsw; - -static SLIST_HEAD(,da_softc) softc_list; -static struct extend_array *daperiphs; - -static int -daopen(dev_t dev, int flags __unused, int fmt __unused, struct thread *td __unused) +/* + * XXX This is only left out of the kernel build to silence warnings. If, + * for some reason this function is used in the kernel, the ifdefs should + * be moved so it is included both in the kernel and userland. + */ +void +scsi_format_unit(struct ccb_scsiio *csio, u_int32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + u_int8_t tag_action, u_int8_t byte2, u_int16_t ileave, + u_int8_t *data_ptr, u_int32_t dxfer_len, u_int8_t sense_len, + u_int32_t timeout) { - struct cam_periph *periph; - struct da_softc *softc; - struct disklabel *label; - struct scsi_read_capacity_data *rcap; - union ccb *ccb; - int unit; - int part; - int error; - int s; + struct scsi_format_unit *scsi_cmd; - unit = dkunit(dev); - part = dkpart(dev); - s = splsoftcam(); - periph = cam_extend_get(daperiphs, unit); - if (periph == NULL) { - splx(s); - return (ENXIO); - } + scsi_cmd = (struct scsi_format_unit *)&csio->cdb_io.cdb_bytes; + scsi_cmd->opcode = FORMAT_UNIT; + scsi_cmd->byte2 = byte2; + scsi_ulto2b(ileave, scsi_cmd->interleave); - softc = (struct da_softc *)periph->softc; + cam_fill_csio(csio, + retries, + cbfcnp, + /*flags*/ (dxfer_len > 0) ? CAM_DIR_OUT : CAM_DIR_NONE, + tag_action, + data_ptr, + dxfer_len, + sense_len, + sizeof(*scsi_cmd), + timeout); +} - CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, - ("daopen: dev=%s (unit %d , partition %d)\n", devtoname(dev), - unit, part)); - - if ((error = cam_periph_lock(periph, PRIBIO|PCATCH)) != 0) - return (error); /* error code from tsleep */ - - if (cam_periph_acquire(periph) != CAM_REQ_CMP) - return(ENXIO); - softc-+#endif /* _KERNEL */ ==== //depot/projects/kse/sys/dev/ppbus/ppi.c#6 (text+ko) ==== @@ -544,20 +544,35 @@ case PPISECR: /* set ECP bits */ ppb_wecr(ppbus, *val); break; - case PPISFIFO: /* write FIFO (pdq->pdq_host_smt_info.rx_completion << 8)); - } - pdq->pdq_command_info.ci_pending_commands = PDQ_BITMASK(PDQC_FILTER_SET) - | PDQ_BITMASK(PDQC_ADDR_FILTER_SET) - | PDQ_BITMASK(PDQC_SNMP_SET) - | PDQ_BITMASK(PDQC_START); - if (pdq->pdq_flags & PDQ_PRINTCHARS) - pdq->pdq_command_info.ci_pending_commands |= PDQ_BITMASK(PDQC_STATUS_CHARS_GET); - pdq_queue_commands(pdq); - break; + case PPISFIFO: /* write FIFO */ + ppb_wfifo(ppbus, *val); + break; + case PPIGEPPA: /* get EPP address bits */ + *val = ppb_repp_A(ppbus); + break; + case PPISEPPA: /* set EPP address bits */ + ppb_wepp_A(ppbus, *val); + break; + default: + error = ENOTTY; + break; } - case PDQS_LINK_UNAVAILABLE: - case PDQS_LINK_AVAILABLE: { - pdq->pdq_command_info.ci_pending_commands = PDQ_BITMASK(PDQC_FILTER_SET) - | PDQ_BITMASK(PDQC_ADDR_FILTER_SET) - | PDQ_BITMASK(PDQC_SNMP_SET); - + + return (error); +} + +static device_method_t ppi_methods[] = { + /* device interface */ + DEVMETHOD(device_identify, ppi_identify), + DEVMETHOD(device_probe, ppi_probe), + DEVMETHOD(device_attach, ppi_attach), + + { 0, 0 } +}; + +static driver_t ppi_driver = { + "ppi", + ppi_methods, + sizeof(struct ppi_data), +}; +DRIVER_MODULE(ppi, ppbus, ppi_driver, ppi_devclass, 0, 0); ==== //depot/projects/kse/sys/dev/usb/ugen.c#14 (text+ko) ==== @@ -953,145 +953,169 @@ buf += n; actlen -= n; sce->fill += n; - if(sce->fi - u_int8_t ret; - - if (ufm_do_req(sc, UT_READ_VENDOR_DEVICE, FM_CMD0, 0x16, 0x1C, - 1, &ret)) - return (EIO); - if (ufm_do_req(sc, UT_READ_VENDOR_DEVICE, FM_CMD2, 0x00, 0x00, - 1, &ret)) - return (EIO); - return (0); + if(sce->fill == sce->limit) + sce->fill = sce->ibuf; + } + + /* setup size for next transfer */ + req->sizes[i] = isize; + } + + usbd_setup_isoc_xfer(xfer, sce->pipeh, req, req->sizes, UGEN_NISORFRMS, + USBD_NO_COPY, ugen_isoc_rintr); + (void)usbd_transfer(xfer); + + if (sce->state & UGEN_ASLP) { + sce->state &= ~UGEN_ASLP; + DPRINTFN(5, ("ugen_isoc_rintr: waking %p\n", sce)); + wakeup(sce); + } + selwakeup(&sce->rsel); } -static int -ufm_get_stat(struct ufm_softc *sc, caddr_t addr) +Static usbd_status +ugen_set_interface(struct ugen_softc *sc, int ifaceidx, int altno) { - u_int8_t ret; - - /* - * Note, there's a 240ms settle time before the status - * will be valid, so tsleep that amount. hz/4 is a good - * approximation of that. Since this is a short sleep - * we don't try to catch any signals to keep things - * simple. - */ - tsleep(sc, 0, "ufmwait", hz/4); - if (ufm_do_req(sc, UT_READ_VENDOR_DEVICE, FM_CMD0, 0x00, 0x24, - 1, &ret)) - return (EIO); - *(int *)addr = ret; - - return (0); -} + usbd_interface_handle iface; + usb_endpoint_descriptor_t *ed; + usbd_status err; + struct ugen_endpoint *sce; + u_int8_t niface, nendpt, endptno, endpt; + int dir; -int -ufmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr td) -{ - struct ufm_softc *sc; + DPRINTFN(15, ("ugen_set_interface %d %d\n", ifaceidx, altno)); - int unit = UFMUNIT(dev); - int error = 0; + err = usbd_interface_count(sc->sc_udev, &niface); + if (err) + return (err); + if (ifaceidx < 0 || ifaceidx >= niface) + return (USBD_INVAL); + + err = usbd_device2interface_handle(sc->sc_udev, ifaceidx, &iface); + if (err) + return (err); + err = usbd_endpoint_count(iface, &nendpt); + if (err) + return (err); + /* XXX should only do this after setting new altno has succeeded */ + for (endptno = 0; endptno < nendpt; endptno++) { + ed = usbd_interface2endpoint_descriptor(iface,endptno); + endpt = ed->bEndpointAddress; + dir = UE_GET_DIR(endpt) == UE_DIR_IN ? IN : OUT; + sce = &sc->sc_endpoints[UE_GET_ADDR(endpt)][dir]; + sce->sc = 0; + sce->edesc = 0; + sce->iface = 0; + } - USB_GET_SC(ufm, unit, sc); + /* change setting */ + err = usbd_set_interface(iface, altno); + if (err) + return (err); - switch (cmd) { - case FM_SET_FREQ: - error = ufm_set_freq(sc, addr); - break; - case FM_GET_FREQ: - error = ufm_get_freq(sc, addr); - break; - case FM_START: - error = ufm_start(sc, addr); - break; - case FM_STOP: - error = ufm_stop(sc, addr); - break; - case FM_GET_STAT: - error = ufm_get_stat(sc, addr); - break; - default: - return ENOTTY; - break; + err = usbd_endpoint_count(iface, &nendpt); + if (err) + return (err); + for (endptno = 0; endptno < nendpt; endptno++) { + ed = usbd_interface2endpoint_descriptor(iface,endptno); + endpt = ed->bEndpointAddress; + dir = UE_GET_DIR(endpt) == UE_DIR_IN ? IN : OUT; + sce = &sc->sc_endpoints[UE_GET_ADDR(endpt)][dir]; + sce->sc = sc; + sce->edesc = ed; + sce->iface = iface; } - return error; + return (0); } - -#if defined(__NetBSD__) || defined(__OpenBSD__) -int -ufm_activate(device_ptr_t self, enum devact act) +/* Retrieve a complete descriptor for a certain device and index. */ +Static usb_config_descriptor_t * +ugen_get_cdesc(struct ugen_softc *sc, int index, int *lenp) { - struct ufm_softc *sc = (struct ufm_softc *)self; + usb_config_descriptor_t *cdesc, *tdesc, cdescr; + int len; + usbd_status err; - switch (act) { - case DVACT_ACTIVATE: - return (EOPNOTSUPP); - break; - - case DVACT_DEACTIVATE: - sc->sc_dying = 1; - break; + if (index == USB_CURRENT_CONFIG_INDEX) { + tdesc = usbd_get_config_descriptor(sc->sc_udev); + len = UGETW(tdesc->wTotalLength); + if (lenp) + *lenp = len; + cdesc = malloc(len, M_TEMP, M_WAITOK); + memcpy(cdesc, tdesc, len); + DPRINTFN(5,("ugen_get_cdesc: current, len=%d\n", len)); + } else { + err = usbd_get_config_desc(sc->sc_udev, index, &cdescr); + if (err) + return (0); + len = UGETW(cdescr.wTotalLength); + DPRINTFN(5,("ugen_get_cdesc: index=%d, len=%d\n", index, len)); + if (lenp) + *lenp = len; + cdesc = malloc(len, M_TEMP, M_WAITOK); + err = usbd_get_config_desc_full(sc->sc_udev, index, cdesc, len); + if (err) { + free(cdesc, M_TEMP); + return (0); + } } - return (0); + return (cdesc); } -USB_DETACH(ufm) +Static int +ugen_get_alt_index(struct ugen_softc *sc, int ifaceidx) { - USB_DETACH_START(ufm, sc); - struct ufm_endpoint *sce; - int i, dir; - int s; -#if defined(__NetBSD__) || defined(__OpenBSD__) - int maj, mn; + usbd_interface_handle iface; + usbd_status err; - DPRINTF(("ufm_detach: sc=%p flags=%d\n", sc, flags)); -#elif defined(__FreeBSD__) - DPRINTF(("ufm_detach: sc=%p\n", sc)); -#endif + err = usbd_device2interface_handle(sc->sc_udev, ifaceidx, &iface); + if (err) + return (-1); + return (usbd_get_interface_altindex(iface)); +} - sc->sc_dying = 1; +Static int +ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd, + caddr_t addr, int flag, usb_proc_ptr p) +{ + struct ugen_endpoint *sce; + usbd_status err; + usbd_interface_handle iface; + struct usb_config_desc *cd; + usb_config_descriptor_t *cdesc; + struct usb_interface_desc *id; + usb_interface_descriptor_t *idesc; + struct usb_endpoint_desc *ed; + usb_endpoint_descriptor_t *edesc; + struct usb_alt_interface *ai; + struct usb_string_desc *si; + u_int8_t conf, alt; - s = splusb(); - if (--sc->sc_refcnt >= 0) { - /* Wait for processes to go away. */ - usb_detach_wait(USBDEV(sc->sc_dev)); - } - splx(s); + DPRINTFN(5, ("ugenioctl: cmd=%08lx\n", cmd)); + if (sc->sc_dying) + return (EIO); -#if defined(__NetBSD__) || defined(__OpenBSD__) - /* locate the major number */ - for (maj = 0; maj < nchrdev; maj++) - if (cdevsw[maj].d_open == ufmopen) - break; + switch (cmd) { + case FIONBIO: + /* All handled in the upper FS layer. */ + return (0); + case USB_SET_SHORT_XFER: + /* This flag only affects read */ + if (endpt == USB_CONTROL_ENDPOINT) + return (EINVAL); + sce = &sc->sc_endpoints[endpt][IN]; + if (sce == NULL) + return (EINVAL); - /* Nuke the vnodes for any open instances (calls close). */ - mn = self->dv_unit * USB_MAX_ENDPOINTS; - vdevgone(maj, mn, mn + USB_MAX_ENDPOINTS - 1, VCHR); -#elif defined(__FreeBSD__) - /* XXX not implemented yet */ -#endif + if (sce->pipeh == NULL) { + printf("ugenioctl: USB_SET_SHORT_XFER, no pipe\n"); + return (EIO); + } - usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, - USBDEV(sc->sc_dev)); - - return (0); -} -#endif /* defined(__NetBSD__) || defined(__OpenBSD__) */ - -#if defined(__FreeBSD__) -Static int -ufm_detach(device_t self) -{ - DPRINTF(("%s: disconnected\n", USBDEVNAME(self))); - return 0; -} - -DRIVER_MODULE(ufm, uhub, ufm_driver, ufm_devclass, usbd_driver_load, 0); -#endif - state &= ~UGEN_SHORT_OK; + if (*(int *)addr) + sce->state |= UGEN_SHORT_OK; + else + sce->state &= ~UGEN_SHORT_OK; return (0); case USB_SET_TIMEOUT: sce = &sc->sc_endpoints[endpt][IN]; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Aug 29 23:18:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9874B37B401; Thu, 29 Aug 2002 23:18:42 -0700 (PDT) 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 505ED37B400 for ; Thu, 29 Aug 2002 23:18:42 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 105E943E42 for ; Thu, 29 Aug 2002 23:18:42 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7U6IfJU064047 for ; Thu, 29 Aug 2002 23:18:41 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7U6IfJQ064044 for perforce@freebsd.org; Thu, 29 Aug 2002 23:18:41 -0700 (PDT) Date: Thu, 29 Aug 2002 23:18:41 -0700 (PDT) Message-Id: <200208300618.g7U6IfJQ064044@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16790 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16790 Change 16790 by mini@mini_stylus on 2002/08/29 23:18:41 Comment cleanup. Affected files ... .. //depot/projects/kse/sys/kern/kern_thread.c#94 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#94 (text+ko) ==== @@ -588,9 +588,9 @@ * extra work to do before we return (e.g. for more syscalls * to complete first). If we were in a critical section, we should * just return to let it finish. Same if we were in the UTS (in - * which case the mailbox's context's busy indicator will equal the - * struct thread address). The only traps we suport will have set the - * mailbox. We will clear it here. + * which case the mailbox's context's busy indicator will be set). + * The only traps we suport will have set the mailbox. + * We will clear it here. */ int thread_userret(struct proc *p, struct ksegrp *kg, struct kse *ke, @@ -621,6 +621,11 @@ if (((td->td_flags & TDF_UPCALLING) == 0) && td->td_mailbox) { error = thread_consider_upcalling(p, kg, ke, td, frame); if (error != 0) + /* + * Failing to do the KSE operation just defaults + * back to synchonous operation, so just return from + * the syscall. + */ goto cont; } if (td->td_flags & TDF_UPCALLING) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 7:31:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13A0137B401; Fri, 30 Aug 2002 07:31:38 -0700 (PDT) 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 8712137B400 for ; Fri, 30 Aug 2002 07:31:37 -0700 (PDT) Received: from mail.speakeasy.net (mail17.speakeasy.net [216.254.0.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id 412E743E72 for ; Fri, 30 Aug 2002 07:31:36 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 9214 invoked from network); 30 Aug 2002 14:31:35 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail17.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 30 Aug 2002 14:31:35 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g7UEVYBQ049085; Fri, 30 Aug 2002 10:31:34 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Fri, 30 Aug 2002 10:31:36 -0400 (EDT) From: John Baldwin To: Julian Elischer Subject: Re: PERFORCE change 16771 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 29-Aug-2002 Julian Elischer wrote: > > > On Thu, 29 Aug 2002, Julian Elischer wrote: > >> I'd be happy to see this merged into -current now.. >> Any objections? > > just did it anyway. I would not personally have used quite the same language in the CVS commmit message (I guess I tend to view p4 submits as a bit more private and a place where I can let off a bit of steam sometimes) but other than that it is ok. My quad xeon hasn't been able to boot an smpng kernel since KSE3 because of this. :-P It did boot CVS kernels ok though. I think maybe cause I don't have witness in my CVS config though. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 8:48:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A00E37B401; Fri, 30 Aug 2002 08:48:50 -0700 (PDT) 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 B446737B400 for ; Fri, 30 Aug 2002 08:48:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 728EB43E42 for ; Fri, 30 Aug 2002 08:48:49 -0700 (PDT) (envelope-from green@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7UFmnJU074469 for ; Fri, 30 Aug 2002 08:48:49 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7UFmneY074466 for perforce@freebsd.org; Fri, 30 Aug 2002 08:48:49 -0700 (PDT) Date: Fri, 30 Aug 2002 08:48:49 -0700 (PDT) Message-Id: <200208301548.g7UFmneY074466@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 16802 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16802 Change 16802 by green@green_laptop_2 on 2002/08/30 08:48:10 Allow for the option of compiling MAC_LOMAC into a kernel. Affected files ... .. //depot/projects/trustedbsd/mac/sys/conf/files#47 edit .. //depot/projects/trustedbsd/mac/sys/conf/options#26 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/files#47 (text+ko) ==== @@ -1357,6 +1357,8 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard security/mac_none/mac_none.c optional mac_none +security/mac_lomac/mac_lomac.c optional mac_lomac +security/mac_lomac/kernel_plm.c optional mac_lomac ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_balloc.c optional ffs ufs/ffs/ffs_inode.c optional ffs ==== //depot/projects/trustedbsd/mac/sys/conf/options#26 (text+ko) ==== @@ -126,6 +126,7 @@ # Support for Mandatory Access Control (MAC) MAC opt_mac.h MAC_DEBUG opt_mac.h +MAC_LOMAC opt_dontuse.h MAC_NONE opt_dontuse.h # Do we want the config file compiled into the kernel? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 13:46:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F05837B401; Fri, 30 Aug 2002 13:46:12 -0700 (PDT) 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 CA09D37B400 for ; Fri, 30 Aug 2002 13:46:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7663543E6E for ; Fri, 30 Aug 2002 13:46:11 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7UKkBJU026194 for ; Fri, 30 Aug 2002 13:46:11 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7UKkBTe026191 for perforce@freebsd.org; Fri, 30 Aug 2002 13:46:11 -0700 (PDT) Date: Fri, 30 Aug 2002 13:46:11 -0700 (PDT) Message-Id: <200208302046.g7UKkBTe026191@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16815 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16815 Change 16815 by mini@mini_stylus on 2002/08/30 13:45:38 ucontext_t comes from the kernel. Affected files ... .. //depot/projects/kse/lib/libc/i386/gen/makecontext.c#4 edit Differences ... ==== //depot/projects/kse/lib/libc/i386/gen/makecontext.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include /* Prototypes */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 14: 0:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DCA637B400; Fri, 30 Aug 2002 14:00:46 -0700 (PDT) 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 A64D237B435 for ; Fri, 30 Aug 2002 14:00:44 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 793B143E6E for ; Fri, 30 Aug 2002 14:00:43 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7UL0hJU027563 for ; Fri, 30 Aug 2002 14:00:43 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7UL0hW3027550 for perforce@freebsd.org; Fri, 30 Aug 2002 14:00:43 -0700 (PDT) Date: Fri, 30 Aug 2002 14:00:43 -0700 (PDT) Message-Id: <200208302100.g7UL0hW3027550@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16816 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16816 Change 16816 by mini@mini_stylus on 2002/08/30 13:59:58 -> Affected files ... .. //depot/projects/kse/lib/libc/alpha/gen/makecontext.c#2 edit Differences ... ==== //depot/projects/kse/lib/libc/alpha/gen/makecontext.c#2 (text+ko) ==== @@ -29,10 +29,10 @@ #include #include +#include #include #include -#include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 14: 1:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFDFF37B401; Fri, 30 Aug 2002 14:01:45 -0700 (PDT) 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 6994E37B400 for ; Fri, 30 Aug 2002 14:01:45 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C34F43E4A for ; Fri, 30 Aug 2002 14:01:45 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7UL1jJU027999 for ; Fri, 30 Aug 2002 14:01:45 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7UL1iMJ027996 for perforce@freebsd.org; Fri, 30 Aug 2002 14:01:44 -0700 (PDT) Date: Fri, 30 Aug 2002 14:01:44 -0700 (PDT) Message-Id: <200208302101.g7UL1iMJ027996@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16817 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16817 Change 16817 by mini@mini_stylus on 2002/08/30 14:00:43 Reorder includes (sys/* first). Affected files ... .. //depot/projects/kse/lib/libc/gen/swapcontext.c#3 edit .. //depot/projects/kse/lib/libc/i386/gen/makecontext.c#5 edit Differences ... ==== //depot/projects/kse/lib/libc/gen/swapcontext.c#3 (text+ko) ==== @@ -27,10 +27,11 @@ #include __FBSDID("$FreeBSD: src/lib/libc/gen/swapcontext.c,v 1.2 2002/01/11 19:46:08 deischen Exp $"); +#include + #include #include #include -#include __weak_reference(__swapcontext, swapcontext); ==== //depot/projects/kse/lib/libc/i386/gen/makecontext.c#5 (text+ko) ==== @@ -29,11 +29,11 @@ #include #include +#include #include #include #include -#include #include /* Prototypes */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 14:12:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CEDE37B401; Fri, 30 Aug 2002 14:10:59 -0700 (PDT) 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 B259E37B400 for ; Fri, 30 Aug 2002 14:10:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D66E343E6E for ; Fri, 30 Aug 2002 14:10:57 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7ULAvJU033638 for ; Fri, 30 Aug 2002 14:10:57 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7ULAvTU033623 for perforce@freebsd.org; Fri, 30 Aug 2002 14:10:57 -0700 (PDT) Date: Fri, 30 Aug 2002 14:10:57 -0700 (PDT) Message-Id: <200208302110.g7ULAvTU033623@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 16819 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16819 Change 16819 by julian@julian_ref on 2002/08/30 14:10:24 IFC automatic part Affected files ... .. //depot/projects/kse/lib/libc/locale/collate.c#3 integrate .. //depot/projects/kse/lib/libc/locale/collate.h#3 integrate .. //depot/projects/kse/lib/libc/string/ffs.3#2 integrate .. //depot/projects/kse/lib/libc/string/ffs.c#2 integrate .. //depot/projects/kse/lib/libc/string/index.3#2 integrate .. //depot/projects/kse/lib/libc/string/index.c#2 integrate .. //depot/projects/kse/lib/libc/string/rindex.3#2 integrate .. //depot/projects/kse/lib/libc/string/rindex.c#2 integrate .. //depot/projects/kse/lib/libc/string/strcasecmp.3#2 integrate .. //depot/projects/kse/lib/libc/string/strcasecmp.c#2 integrate .. //depot/projects/kse/lib/libc/string/swab.c#2 integrate .. //depot/projects/kse/lib/libkvm/kvm_proc.c#21 integrate .. //depot/projects/kse/sys/alpha/alpha/machdep.c#40 integrate .. //depot/projects/kse/sys/alpha/include/md_var.h#7 integrate .. //depot/projects/kse/sys/alpha/osf1/osf1_misc.c#14 integrate .. //depot/projects/kse/sys/boot/common/loader.8#14 integrate .. //depot/projects/kse/sys/boot/i386/libi386/i386_module.c#5 integrate .. //depot/projects/kse/sys/boot/i386/loader/Makefile#11 integrate .. //depot/projects/kse/sys/boot/i386/loader/help.i386#4 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_misc.c#17 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_resource.c#6 integrate .. //depot/projects/kse/sys/conf/majors#12 integrate .. //depot/projects/kse/sys/dev/aac/aac.c#23 integrate .. //depot/projects/kse/sys/dev/acpica/acpi.c#27 integrate .. //depot/projects/kse/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/fc_log.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_fc.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_lan.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/kse/sys/dev/sound/pci/fm801.c#5 integrate .. //depot/projects/kse/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/kse/sys/i386/i386/machdep.c#55 integrate .. //depot/projects/kse/sys/i386/include/md_var.h#13 integrate .. //depot/projects/kse/sys/ia64/ia64/machdep.c#36 integrate .. //depot/projects/kse/sys/ia64/include/md_var.h#9 integrate .. //depot/projects/kse/sys/kern/imgact_elf.c#22 integrate .. //depot/projects/kse/sys/kern/subr_param.c#11 integrate .. //depot/projects/kse/sys/kern/vfs_bio.c#23 integrate .. //depot/projects/kse/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/kse/sys/pc98/i386/machdep.c#31 integrate .. //depot/projects/kse/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/kse/sys/powerpc/powerpc/machdep.c#22 integrate .. //depot/projects/kse/sys/sparc64/include/md_var.h#12 integrate .. //depot/projects/kse/sys/sparc64/sparc64/machdep.c#36 integrate .. //depot/projects/kse/sys/sys/buf.h#16 integrate .. //depot/projects/kse/sys/sys/systm.h#30 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/kse/sys/vm/vm_init.c#5 integrate Differences ... ==== //depot/projects/kse/lib/libc/locale/collate.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.28 2002/08/13 14:55:17 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.29 2002/08/30 20:26:02 ache Exp $"); #include "namespace.h" #include @@ -49,7 +49,7 @@ u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN]; struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1]; -struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE]; +struct __collate_st_chain_pri *__collate_chain_pri_table; void __collate_err(int ex, const char *f) __dead2; @@ -57,9 +57,8 @@ __collate_load_tables(const char *encoding) { FILE *fp; - int i, saverr; - char collate_version[STR_LEN]; - char buf[PATH_MAX]; + int i, saverr, chains; + char strbuf[STR_LEN], buf[PATH_MAX]; void *TMP_substitute_table, *TMP_char_pri_table, *TMP_chain_pri_table; static char collate_encoding[ENCODING_LEN + 1]; @@ -90,6 +89,37 @@ if ((fp = fopen(buf, "r")) == NULL) return (_LDP_ERROR); + if (fread(strbuf, sizeof(strbuf), 1, fp) != 1) { + saverr = errno; + (void)fclose(fp); + errno = saverr; + return (_LDP_ERROR); + } + chains = -1; + if (strcmp(strbuf, COLLATE_VERSION) == 0) + chains = 0; + else if (strcmp(strbuf, COLLATE_VERSION1_1) == 0) + chains = 1; + if (chains < 0) { + (void)fclose(fp); + errno = EFTYPE; + return (_LDP_ERROR); + } + if (chains) { + if (fread(strbuf, sizeof(strbuf), 1, fp) != 1) { + saverr = errno; + (void)fclose(fp); + errno = saverr; + return (_LDP_ERROR); + } + if ((chains = atoi(strbuf)) < 1) { + (void)fclose(fp); + errno = EFTYPE; + return (_LDP_ERROR); + } + } else + chains = TABLE_SIZE; + if ((TMP_substitute_table = malloc(sizeof(__collate_substitute_table))) == NULL) { saverr = errno; @@ -106,7 +136,7 @@ return (_LDP_ERROR); } if ((TMP_chain_pri_table = - malloc(sizeof(__collate_chain_pri_table))) == NULL) { + malloc(sizeof(*__collate_chain_pri_table) * chains)) == NULL) { saverr = errno; free(TMP_substitute_table); free(TMP_char_pri_table); @@ -128,18 +158,10 @@ } \ } - FREAD(collate_version, sizeof(collate_version), 1, fp); - if (strcmp(collate_version, COLLATE_VERSION) != 0) { - free(TMP_substitute_table); - free(TMP_char_pri_table); - free(TMP_chain_pri_table); - (void)fclose(fp); - errno = EFTYPE; - return (_LDP_ERROR); - } FREAD(TMP_substitute_table, sizeof(__collate_substitute_table), 1, fp); FREAD(TMP_char_pri_table, sizeof(__collate_char_pri_table), 1, fp); - FREAD(TMP_chain_pri_table, sizeof(__collate_chain_pri_table), 1, fp); + FREAD(TMP_chain_pri_table, + sizeof(*__collate_chain_pri_table) * chains, 1, fp); (void)fclose(fp); (void)strcpy(collate_encoding, encoding); @@ -149,9 +171,9 @@ if (__collate_char_pri_table_ptr != NULL) free(__collate_char_pri_table_ptr); __collate_char_pri_table_ptr = TMP_char_pri_table; - if (__collate_chain_pri_table_ptr != NULL) - free(__collate_chain_pri_table_ptr); - __collate_chain_pri_table_ptr = TMP_chain_pri_table; + if (__collate_chain_pri_table != NULL) + free(__collate_chain_pri_table); + __collate_chain_pri_table = TMP_chain_pri_table; __collate_substitute_nontrivial = 0; for (i = 0; i < UCHAR_MAX + 1; i++) { @@ -203,8 +225,9 @@ *len = 1; *prim = *sec = 0; - for (p2 = __collate_chain_pri_table; p2->str[0]; p2++) { - if (strncmp(t, p2->str, strlen(p2->str)) == 0) { + for (p2 = __collate_chain_pri_table; p2->str[0] != '\0'; p2++) { + if (*t == p2->str[0] && + strncmp(t, p2->str, strlen(p2->str)) == 0) { *len = strlen(p2->str); *prim = p2->prim; *sec = p2->sec; ==== //depot/projects/kse/lib/libc/locale/collate.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/locale/collate.h,v 1.13 2002/08/13 14:55:17 ache Exp $ + * $FreeBSD: src/lib/libc/locale/collate.h,v 1.14 2002/08/30 20:26:02 ache Exp $ */ #ifndef _COLLATE_H_ @@ -36,7 +36,8 @@ #define STR_LEN 10 #define TABLE_SIZE 100 -#define COLLATE_VERSION "1.0\n" +#define COLLATE_VERSION "1.0\n" +#define COLLATE_VERSION1_1 "1.1\n" struct __collate_st_char_pri { int prim, sec; @@ -52,8 +53,7 @@ extern u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN]; #define __collate_char_pri_table (*__collate_char_pri_table_ptr) extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1]; -#define __collate_chain_pri_table (*__collate_chain_pri_table_ptr) -extern struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE]; +extern struct __collate_st_chain_pri *__collate_chain_pri_table; __BEGIN_DECLS u_char *__collate_strdup(u_char *); ==== //depot/projects/kse/lib/libc/string/ffs.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ffs.3 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.5 2001/10/01 16:09:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/ffs.3,v 1.6 2002/08/30 19:08:53 robert Exp $ .\" .Dd April 19, 1994 .Dt FFS 3 @@ -43,7 +43,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In strings.h .Ft int .Fn ffs "int value" .Sh DESCRIPTION @@ -62,3 +62,10 @@ .Fn ffs function appeared in .Bx 4.3 . +Its prototype existed previously in +.Aq Pa string.h +before it was moved to +.Aq Pa strings.h +for +.St -p1003.1-2001 +compliance. ==== //depot/projects/kse/lib/libc/string/ffs.c#2 (text+ko) ==== @@ -35,16 +35,15 @@ static char sccsid[] = "@(#)ffs.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/ffs.c,v 1.4 2002/03/21 18:44:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/ffs.c,v 1.5 2002/08/30 19:08:53 robert Exp $"); -#include +#include /* * ffs -- vax ffs instruction */ int -ffs(mask) - int mask; +ffs(int mask) { int bit; ==== //depot/projects/kse/lib/libc/string/index.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)index.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/index.3,v 1.6 2001/10/01 16:09:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/index.3,v 1.7 2002/08/30 19:42:07 robert Exp $ .\" .Dd June 4, 1993 .Dt INDEX 3 @@ -43,7 +43,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In strings.h .Ft char * .Fn index "const char *s" "int c" .Sh DESCRIPTION @@ -81,3 +81,10 @@ .Fn index function appeared in .At v6 . +Its prototype existed previously in +.Aq Pa string.h +before it was moved to +.Aq Pa strings.h +for +.St -p1003.1-2001 +compliance. ==== //depot/projects/kse/lib/libc/string/index.c#2 (text+ko) ==== @@ -35,24 +35,28 @@ static char sccsid[] = "@(#)index.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/index.c,v 1.4 2002/03/21 18:44:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/index.c,v 1.5 2002/08/30 19:42:07 robert Exp $"); + +#include +#ifdef STRCHR #include -#include char * -#ifdef STRCHR -strchr(p, ch) +strchr #else -index(p, ch) +#include + +char * +index #endif - const char *p, ch; +(const char *p, int ch) { for (;; ++p) { if (*p == ch) - return((char *)p); - if (!*p) - return((char *)NULL); + return ((char *)p); + if (*p == '\0') + return (NULL); } /* NOTREACHED */ } ==== //depot/projects/kse/lib/libc/string/rindex.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rindex.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/rindex.3,v 1.6 2001/10/01 16:09:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/rindex.3,v 1.7 2002/08/30 19:42:07 robert Exp $ .\" .Dd June 4, 1993 .Dt RINDEX 3 @@ -43,7 +43,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In strings.h .Ft char * .Fn rindex "const char *s" "int c" .Sh DESCRIPTION @@ -83,3 +83,10 @@ .Fn rindex function appeared in .At v6 . +Its prototype existed previously in +.Aq Pa string.h +before it was moved to +.Aq Pa strings.h +for +.St -p1003.1-2001 +compliance. ==== //depot/projects/kse/lib/libc/string/rindex.c#2 (text+ko) ==== @@ -35,27 +35,30 @@ static char sccsid[] = "@(#)rindex.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/rindex.c,v 1.4 2002/03/21 18:44:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/rindex.c,v 1.5 2002/08/30 19:42:07 robert Exp $"); #include + +#ifdef STRRCHR #include char * -#ifdef STRRCHR -strrchr(p, ch) +strrchr #else -rindex(p, ch) +#include + +char * +rindex #endif - const char *p; - int ch; +(const char *p, int ch) { char *save; for (save = NULL;; ++p) { if (*p == ch) save = (char *)p; - if (!*p) - return(save); + if (*p == '\0') + return (save); } /* NOTREACHED */ } ==== //depot/projects/kse/lib/libc/string/strcasecmp.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strcasecmp.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/string/strcasecmp.3,v 1.9 2001/10/01 16:09:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/strcasecmp.3,v 1.10 2002/08/30 15:40:01 robert Exp $ .\" .Dd June 9, 1993 .Dt STRCASECMP 3 @@ -44,7 +44,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In strings.h .Ft int .Fn strcasecmp "const char *s1" "const char *s2" .Ft int @@ -95,3 +95,10 @@ .Fn strncasecmp functions first appeared in .Bx 4.4 . +Their prototypes existed previously in +.Aq Pa string.h +before they were moved to +.Aq Pa strings.h +for +.St -p1003.1-2001 +compliance. ==== //depot/projects/kse/lib/libc/string/strcasecmp.c#2 (text+ko) ==== @@ -35,9 +35,9 @@ static char sccsid[] = "@(#)strcasecmp.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/strcasecmp.c,v 1.5 2002/03/21 18:44:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/strcasecmp.c,v 1.6 2002/08/30 15:40:01 robert Exp $"); -#include +#include #include typedef unsigned char u_char; ==== //depot/projects/kse/lib/libc/string/swab.c#2 (text+ko) ==== @@ -38,29 +38,25 @@ static char sccsid[] = "@(#)swab.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.4 2002/03/21 18:44:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.5 2002/08/30 20:33:05 robert Exp $"); #include void -swab(from, to, len) - const void *from; - void *to; - size_t len; +swab(const void * __restrict from, void * __restrict to, size_t len) { unsigned long temp; int n; char *fp, *tp; - n = (len >> 1) + 1; + n = len >> 1; fp = (char *)from; tp = (char *)to; #define STEP temp = *fp++,*tp++ = *fp++,*tp++ = temp /* round to multiple of 8 */ - while ((--n) & 07) + for (; n & 0x7; --n) STEP; - n >>= 3; - while (--n >= 0) { + for (n >>= 3; n > 0; --n) { STEP; STEP; STEP; STEP; STEP; STEP; STEP; STEP; } ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#21 (text+ko) ==== @@ -34,11 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.53 2002/08/28 20:39:48 alfred Exp $ + * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.54 2002/08/30 02:18:38 peter Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.53 2002/08/28 20:39:48 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.54 2002/08/30 02:18:38 peter Exp $"); #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93"; @@ -331,7 +331,7 @@ if (proc.p_state != PRS_ZOMBIE) { kp->ki_pctcpu = proc.p_kse.ke_pctcpu; kp->ki_estcpu = proc.p_ksegrp.kg_estcpu; - kp->ki_slptime = proc.p_kse.ke_slptime; + kp->ki_slptime = proc.p_ksegrp.kg_slptime; kp->ki_swtime = proc.p_swtime; kp->ki_flag = proc.p_flag; kp->ki_sflag = proc.p_sflag; ==== //depot/projects/kse/sys/alpha/alpha/machdep.c#40 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.181 2002/08/29 06:17:46 jake Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.182 2002/08/30 04:04:33 peter Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -189,13 +189,13 @@ struct msgbuf *msgbufp=0; -int Maxmem = 0; +long Maxmem = 0; -int totalphysmem; /* total amount of physical memory in system */ -int physmem; /* physical memory used by NetBSD + some rsvd */ -int resvmem; /* amount of memory reserved for PROM */ -int unusedmem; /* amount of memory for OS that we don't use */ -int unknownmem; /* amount of memory with an unknown use */ +long totalphysmem; /* total amount of physical memory in system */ +long physmem; /* physical memory used by NetBSD + some rsvd */ +long resvmem; /* amount of memory reserved for PROM */ +long unusedmem; /* amount of memory for OS that we don't use */ +long unknownmem; /* amount of memory with an unknown use */ int ncpus; /* number of cpus */ vm_offset_t phys_avail[10]; @@ -203,23 +203,30 @@ static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) { - int error = sysctl_handle_int(oidp, 0, alpha_ptob(physmem), req); + int error; + unsigned long val; + + val = alpha_ptob(physmem); + error = sysctl_handle_long(oidp, &val, 0, req); return (error); } -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_INT|CTLFLAG_RD, - 0, 0, sysctl_hw_physmem, "I", ""); +SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD, + 0, 0, sysctl_hw_physmem, "LU", ""); static int sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) { - int error = sysctl_handle_int(oidp, 0, - alpha_ptob(physmem - cnt.v_wire_count), req); + int error; + unsigned long val; + + val = alpha_ptob(physmem - cnt.v_wire_count); + error = sysctl_handle_long(oidp, &val, 0, req); return (error); } -SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD, - 0, 0, sysctl_hw_usermem, "I", ""); +SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD, + 0, 0, sysctl_hw_usermem, "LU", ""); SYSCTL_INT(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); ==== //depot/projects/kse/sys/alpha/include/md_var.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.19 2002/03/20 18:58:45 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.20 2002/08/30 04:04:34 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -36,7 +36,7 @@ extern char sigcode[]; extern char esigcode[]; extern int szsigcode; -extern int Maxmem; +extern long Maxmem; extern int busdma_swi_pending; struct fpreg; ==== //depot/projects/kse/sys/alpha/osf1/osf1_misc.c#14 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.32 2002/08/16 12:51:51 rwatson Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.33 2002/08/30 04:04:34 peter Exp $ */ @@ -256,7 +256,7 @@ return open(td, &a); } -extern int totalphysmem; +extern long totalphysmem; int osf1_getsysinfo(td, uap) ==== //depot/projects/kse/sys/boot/common/loader.8#14 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.46 2002/08/13 15:06:48 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.47 2002/08/30 11:10:59 iwasaki Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -313,7 +313,7 @@ .It Va acpi_load Unset this to disable automatic loading of the ACPI module. See also -.Va hint.acpi.0.disable +.Va hint.acpi.0.disabled in .Xr device.hints 5 . .It Va autoboot_delay ==== //depot/projects/kse/sys/boot/i386/libi386/i386_module.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.7 2002/08/09 06:07:33 obrien Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.8 2002/08/30 11:11:02 iwasaki Exp $ */ /* @@ -49,7 +49,7 @@ /* autoload ACPI support */ /* XXX should be in 4th keyed off acpi_load */ - if ((getenv("acpi_load") && !getenv("hint.acpi.0.disable"))) { + if ((getenv("acpi_load") && !getenv("hint.acpi.0.disabled"))) { error = mod_load("acpi", NULL, 0, NULL); if (error != 0) printf("ACPI autoload failed - %s\n", strerror(error)); ==== //depot/projects/kse/sys/boot/i386/loader/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.61 2002/08/29 23:37:44 peter Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.62 2002/08/30 14:59:47 jhb Exp $ BASE= loader PROG= ${BASE} @@ -89,7 +89,7 @@ ${CC} -c vers.c ${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT} - btxld -v -f elf -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ + btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ -b ${BTXKERN} ${BASE}.bin # /usr/bin/kzip ${.TARGET} # mv ${.TARGET}.kz ${.TARGET} ==== //depot/projects/kse/sys/boot/i386/loader/help.i386#4 (text+ko) ==== @@ -7,7 +7,7 @@ unset acpi_load - $hint.acpi.0.disable="1" + $hint.acpi.0.disabled="1" If set, the ACPI module won't be loaded. ==== //depot/projects/kse/sys/compat/svr4/svr4_misc.c#17 (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. * - * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.49 2002/08/15 15:46:10 rwatson Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.50 2002/08/30 18:09:46 dillon Exp $ */ /* @@ -846,10 +846,9 @@ if (new > old) { vm_size_t diff; - if (swap_pager_full) { - return (ENOMEM); - } diff = new - old; + if (vm->vm_map.size + diff > p->p_rlimit[RLIMIT_VMEM].rlim_cur) + return(ENOMEM); rv = vm_map_find(&vm->vm_map, NULL, 0, &old, diff, FALSE, VM_PROT_ALL, VM_PROT_ALL, 0); if (rv != KERN_SUCCESS) { ==== //depot/projects/kse/sys/compat/svr4/svr4_resource.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/svr4_resource.c,v 1.10 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_resource.c,v 1.11 2002/08/30 18:09:46 dillon Exp $ */ /* @@ -108,7 +108,7 @@ case SVR4_RLIMIT_NOFILE: return RLIMIT_NOFILE; case SVR4_RLIMIT_VMEM: - return RLIMIT_RSS; + return RLIMIT_VMEM; default: return -1; } ==== //depot/projects/kse/sys/conf/majors#12 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/conf/majors,v 1.138 2002/08/18 12:19:32 sos Exp $ +$FreeBSD: src/sys/conf/majors,v 1.139 2002/08/30 16:54:02 gibbs Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. @@ -186,6 +186,8 @@ 168 sab Siemens SAB82532 serial chip 169 ofwd OpenFirmware disk 170 pst Promise SuperTrak +171 mide LSI MegaRAID IDE (control device) +172 mided LSI MegaRAID IDE (disk device) 200 ?? entries from 200-252 are reserved for local use 252 ?? entries from 200-252 are reserved for local use 254 internal Used internally by the kernel ==== //depot/projects/kse/sys/dev/aac/aac.c#23 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aac/aac.c,v 1.40 2002/08/17 02:36:15 rwatson Exp $ + * $FreeBSD: src/sys/dev/aac/aac.c,v 1.41 2002/08/30 05:02:07 scottl Exp $ */ /* @@ -1115,8 +1115,9 @@ /* allocate the FIBs in DMAable memory and load them */ if (bus_dmamem_alloc(sc->aac_fib_dmat, (void **)&sc->aac_fibs, - BUS_DMA_NOWAIT, &sc->aac_fibmap)) { - return(ENOMEM); + BUS_DMA_NOWAIT, &sc->aac_fibmap)) { + printf("Not enough contiguous memory available.\n"); + return (ENOMEM); } bus_dmamap_load(sc->aac_fib_dmat, sc->aac_fibmap, sc->aac_fibs, AAC_FIB_COUNT * sizeof(struct aac_fib), @@ -1132,7 +1133,7 @@ if (!bus_dmamap_create(sc->aac_buffer_dmat, 0, &cm->cm_datamap)) aac_release_command(cm); } - return(0); + return (0); } /* ==== //depot/projects/kse/sys/dev/acpica/acpi.c#27 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.71 2002/08/29 01:52:26 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.72 2002/08/30 11:11:07 iwasaki Exp $ */ #include "opt_acpi.h" @@ -2118,6 +2118,11 @@ static void acpi_pm_register(void *arg) { + int error; + + if (!resource_int_value("acpi", 0, "disabled", &error) && + (error != 0)) + return; power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, NULL); } ==== //depot/projects/kse/sys/dev/amr/amr_pci.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.9 2002/01/08 06:47:02 msmith Exp $ + * $FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.10 2002/08/30 18:28:00 gibbs Exp $ */ #include @@ -95,8 +95,10 @@ } amr_device_ids[] = { {0x101e, 0x9010, 0}, {0x101e, 0x9060, 0}, - {0x8086, 0x1960, PROBE_SIGNATURE}, /* generic i960RD, check for signature */ + {0x8086, 0x1960, PROBE_SIGNATURE},/* generic i960RD, check for signature */ {0x101e, 0x1960, 0}, + {0x1000, 0x1960, 0}, + {0x1000, 0x0407, 0}, {0, 0, 0} }; ==== //depot/projects/kse/sys/dev/mpt/mpilib/fc_log.h#2 (text+ko) ==== @@ -1,6 +1,27 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/fc_log.h,v 1.1 2002/08/11 23:34:20 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/fc_log.h,v 1.3 2002/08/30 03:36:50 mjacob Exp $ */ /* - * Copyright (c) 2000-2001 LSI Logic Corporation. All rights reserved. + * Copyright (c) 2000, 2001 by LSI Logic Corporation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice immediately at the beginning of the file, without modification, + * this list of conditions, and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. * * NAME: fc_log.h * SUMMARY: MPI IocLogInfo definitions for the SYMFC9xx chips @@ -11,7 +32,6 @@ * ID: $Id: fc_log.h,v 4.6 2001/07/26 14:41:33 sschremm Exp $ */ - /* * MpiIocLogInfo_t enum * ==== //depot/projects/kse/sys/dev/mpt/mpilib/mpi.h#2 (text+ko) ==== @@ -1,6 +1,27 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi.h,v 1.1 2002/08/11 23:34:20 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi.h,v 1.3 2002/08/30 03:36:50 mjacob Exp $ */ /* - * Copyright (c) 2000-2001 LSI Logic Corporation. + * Copyright (c) 2000, 2001 by LSI Logic Corporation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice immediately at the beginning of the file, without modification, + * this list of conditions, and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. * * * Name: MPI.H ==== //depot/projects/kse/sys/dev/mpt/mpilib/mpi_cnfg.h#2 (text+ko) ==== @@ -1,6 +1,27 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_cnfg.h,v 1.1 2002/08/11 23:34:20 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_cnfg.h,v 1.3 2002/08/30 03:36:50 mjacob Exp $ */ /* - * Copyright (c) 2000-2001 LSI Logic Corporation. + * Copyright (c) 2000, 2001 by LSI Logic Corporation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice immediately at the beginning of the file, without modification, + * this list of conditions, and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. * * * Name: MPI_CNFG.H ==== //depot/projects/kse/sys/dev/mpt/mpilib/mpi_fc.h#2 (text+ko) ==== @@ -1,6 +1,27 @@ -/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_fc.h,v 1.1 2002/08/11 23:34:20 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpilib/mpi_fc.h,v 1.3 2002/08/30 03:36:50 mjacob Exp $ */ /* - * Copyright (c) 2000-2001 LSI Logic Corporation. + * Copyright (c) 2000, 2001 by LSI Logic Corporation + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice immediately at the beginning of the file, without modification, + * this list of conditions, and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 14:32:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B57537B401; Fri, 30 Aug 2002 14:32:25 -0700 (PDT) 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 80A6737B400 for ; Fri, 30 Aug 2002 14:32:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D04843E3B for ; Fri, 30 Aug 2002 14:32:24 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7ULWNJU037495 for ; Fri, 30 Aug 2002 14:32:23 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7ULWNe3037492 for perforce@freebsd.org; Fri, 30 Aug 2002 14:32:23 -0700 (PDT) Date: Fri, 30 Aug 2002 14:32:23 -0700 (PDT) Message-Id: <200208302132.g7ULWNe3037492@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 16820 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16820 Change 16820 by julian@julian_ref on 2002/08/30 14:31:34 remove the test program from here.. it's checked in t -current in 'src/tools' get it from there.. Affected files ... .. //depot/projects/kse/bin/ksetest/Makefile#5 delete .. //depot/projects/kse/bin/ksetest/kse_asm.S#5 delete .. //depot/projects/kse/bin/ksetest/kse_threads_test.c#10 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 14:36:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A6D537B401; Fri, 30 Aug 2002 14:36:51 -0700 (PDT) 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 3D07F37B400; Fri, 30 Aug 2002 14:36:51 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 096C043E4A; Fri, 30 Aug 2002 14:36:51 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 69826AE275; Fri, 30 Aug 2002 14:36:47 -0700 (PDT) Date: Fri, 30 Aug 2002 14:36:47 -0700 From: Jon Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16820 for review Message-ID: <20020830213647.GH3751@elvis.mu.org> References: <200208302132.g7ULWNe3037492@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200208302132.g7ULWNe3037492@freefall.freebsd.org> User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I was about to do this anyways. The old test program doesn't work with the stuff currently in the branch. Actually, I'll just add my test stuff now. Julian Elischer [julian@FreeBSD.org] wrote : > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16820 > > Change 16820 by julian@julian_ref on 2002/08/30 14:31:34 > > remove the test program from here.. it's checked in t -current in > 'src/tools' get it from there.. > > Affected files ... > > .. //depot/projects/kse/bin/ksetest/Makefile#5 delete > .. //depot/projects/kse/bin/ksetest/kse_asm.S#5 delete > .. //depot/projects/kse/bin/ksetest/kse_threads_test.c#10 delete > > Differences ... -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 14:38:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C661537B401; Fri, 30 Aug 2002 14:38:32 -0700 (PDT) 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 6AEC837B400 for ; Fri, 30 Aug 2002 14:38:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AA9543E4A for ; Fri, 30 Aug 2002 14:38:32 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7ULcVJU038358 for ; Fri, 30 Aug 2002 14:38:31 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7ULcVav038355 for perforce@freebsd.org; Fri, 30 Aug 2002 14:38:31 -0700 (PDT) Date: Fri, 30 Aug 2002 14:38:31 -0700 (PDT) Message-Id: <200208302138.g7ULcVav038355@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16821 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16821 Change 16821 by mini@mini_stylus on 2002/08/30 14:38:25 Add test version of a ucontext_t-based UTS. Affected files ... .. //depot/projects/kse/bin/uts/Makefile#1 add .. //depot/projects/kse/bin/uts/uts.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 15: 0:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59CDD37B400; Fri, 30 Aug 2002 15:00:20 -0700 (PDT) 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 B8FA637B401; Fri, 30 Aug 2002 15:00:19 -0700 (PDT) Received: from sccrmhc02.attbi.com (sccrmhc02.attbi.com [204.127.202.62]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4926B43E77; Fri, 30 Aug 2002 15:00:18 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc02.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020830220017.MIXL13899.sccrmhc02.attbi.com@InterJet.elischer.org>; Fri, 30 Aug 2002 22:00:17 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id OAA05040; Fri, 30 Aug 2002 14:44:41 -0700 (PDT) Date: Fri, 30 Aug 2002 14:44:40 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16821 for review In-Reply-To: <200208302138.g7ULcVav038355@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG NNNOOOOOOOOO put it in src/tools/KSE to match where they are in teh CVS tree. On Fri, 30 Aug 2002, Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16821 > > Change 16821 by mini@mini_stylus on 2002/08/30 14:38:25 > > Add test version of a ucontext_t-based UTS. > > Affected files ... > > .. //depot/projects/kse/bin/uts/Makefile#1 add > .. //depot/projects/kse/bin/uts/uts.c#1 add > > Differences ... > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 15: 0:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC07337B407; Fri, 30 Aug 2002 15:00:25 -0700 (PDT) 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 7861037B406; Fri, 30 Aug 2002 15:00:25 -0700 (PDT) Received: from sccrmhc02.attbi.com (sccrmhc02.attbi.com [204.127.202.62]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA72843E4A; Fri, 30 Aug 2002 15:00:24 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc02.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020830220024.MJAM13899.sccrmhc02.attbi.com@InterJet.elischer.org>; Fri, 30 Aug 2002 22:00:24 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id OAA05037; Fri, 30 Aug 2002 14:43:44 -0700 (PDT) Date: Fri, 30 Aug 2002 14:43:44 -0700 (PDT) From: Julian Elischer To: Jon Mini Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 16820 for review In-Reply-To: <20020830213647.GH3751@elvis.mu.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG can you start by bringing in the original from -current in src/tools/KSE then either migrate to yours or add yours alongside.. On Fri, 30 Aug 2002, Jon Mini wrote: > I was about to do this anyways. The old test program doesn't work > with the stuff currently in the branch. > > Actually, I'll just add my test stuff now. > > Julian Elischer [julian@FreeBSD.org] wrote : > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16820 > > > > Change 16820 by julian@julian_ref on 2002/08/30 14:31:34 > > > > remove the test program from here.. it's checked in t -current in > > 'src/tools' get it from there.. > > > > Affected files ... > > > > .. //depot/projects/kse/bin/ksetest/Makefile#5 delete > > .. //depot/projects/kse/bin/ksetest/kse_asm.S#5 delete > > .. //depot/projects/kse/bin/ksetest/kse_threads_test.c#10 delete > > > > Differences ... > > -- > Jonathan Mini > http://www.freebsd.org/ > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 15: 6:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 172D737B400; Fri, 30 Aug 2002 15:06:47 -0700 (PDT) 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 9745E37B401 for ; Fri, 30 Aug 2002 15:06:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4585443E75 for ; Fri, 30 Aug 2002 15:06:46 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7UM6kJU047293 for ; Fri, 30 Aug 2002 15:06:46 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7UM6j1F047290 for perforce@freebsd.org; Fri, 30 Aug 2002 15:06:45 -0700 (PDT) Date: Fri, 30 Aug 2002 15:06:45 -0700 (PDT) Message-Id: <200208302206.g7UM6j1F047290@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16824 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16824 Change 16824 by mini@mini_stylus on 2002/08/30 15:06:44 Test version of userland thread schuduler. Affected files ... .. //depot/projects/kse/bin/uts/Makefile#2 delete .. //depot/projects/kse/bin/uts/uts.c#2 delete .. //depot/projects/kse/tools/KSE/Makefile#1 add .. //depot/projects/kse/tools/KSE/uts.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 15: 6:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FB4437B405; Fri, 30 Aug 2002 15:06:49 -0700 (PDT) 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 9132D37B401 for ; Fri, 30 Aug 2002 15:06:48 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 530D443E75 for ; Fri, 30 Aug 2002 15:06:48 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 1E83DAE25C; Fri, 30 Aug 2002 15:06:48 -0700 (PDT) Date: Fri, 30 Aug 2002 15:06:48 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16821 for review Message-ID: <20020830220648.GI3751@elvis.mu.org> References: <200208302138.g7ULcVav038355@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > NNNOOOOOOOOO > > put it in src/tools/KSE to match where they are in teh CVS tree. Heh. ok =) > On Fri, 30 Aug 2002, Jonathan Mini wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16821 > > > > Change 16821 by mini@mini_stylus on 2002/08/30 14:38:25 > > > > Add test version of a ucontext_t-based UTS. > > > > Affected files ... > > > > .. //depot/projects/kse/bin/uts/Makefile#1 add > > .. //depot/projects/kse/bin/uts/uts.c#1 add > > > > Differences ... > > > -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 15:12: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B6FB37B401; Fri, 30 Aug 2002 15:12:02 -0700 (PDT) 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 B165437B400; Fri, 30 Aug 2002 15:12:01 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79EE143E3B; Fri, 30 Aug 2002 15:12:01 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 53906AE25C; Fri, 30 Aug 2002 15:12:01 -0700 (PDT) Date: Fri, 30 Aug 2002 15:12:01 -0700 From: Jon Mini To: Julian Elischer Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 16820 for review Message-ID: <20020830221201.GJ3751@elvis.mu.org> References: <20020830213647.GH3751@elvis.mu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > can you start by bringing in the original from -current > in src/tools/KSE > > then either migrate to yours or add yours alongside.. Oh, hmm. Looks like I jumped the gun again. Grr. =/ It looks like I did the whole change wrong. *sigh* Ok. Round three. And what did we learn in class today, baka? -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 15:15: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63BB937B401; Fri, 30 Aug 2002 15:14:57 -0700 (PDT) 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 F0D6337B400 for ; Fri, 30 Aug 2002 15:14:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FD1A43E3B for ; Fri, 30 Aug 2002 15:14:56 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7UMEuJU048018 for ; Fri, 30 Aug 2002 15:14:56 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7UMEuHo048015 for perforce@freebsd.org; Fri, 30 Aug 2002 15:14:56 -0700 (PDT) Date: Fri, 30 Aug 2002 15:14:56 -0700 (PDT) Message-Id: <200208302214.g7UMEuHo048015@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16825 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16825 Change 16825 by mini@mini_stylus on 2002/08/30 15:14:46 Test version of userland thread schuduler. Affected files ... .. //depot/projects/kse/tools/KSE/Makefile#2 delete .. //depot/projects/kse/tools/KSE/uts.c#2 delete .. //depot/projects/kse/tools/KSE/uts/Makefile#1 add .. //depot/projects/kse/tools/KSE/uts/uts.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 15:17: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A55F37B401; Fri, 30 Aug 2002 15:16:56 -0700 (PDT) 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 2D48537B400 for ; Fri, 30 Aug 2002 15:16:56 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id F09AB43E6E for ; Fri, 30 Aug 2002 15:16:55 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id C5E71AE160; Fri, 30 Aug 2002 15:16:55 -0700 (PDT) Date: Fri, 30 Aug 2002 15:16:55 -0700 From: Jonathan Mini To: Perforce Change Reviews Subject: Re: PERFORCE change 16825 for review Message-ID: <20020830221655.GK3751@elvis.mu.org> References: <200208302214.g7UMEuHo048015@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200208302214.g7UMEuHo048015@freefall.freebsd.org> User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Maybe this time I got the location right. *sigh* Jonathan Mini [mini@FreeBSD.org] wrote : > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16825 > > Change 16825 by mini@mini_stylus on 2002/08/30 15:14:46 > > Test version of userland thread schuduler. > > Affected files ... > > .. //depot/projects/kse/tools/KSE/Makefile#2 delete > .. //depot/projects/kse/tools/KSE/uts.c#2 delete > .. //depot/projects/kse/tools/KSE/uts/Makefile#1 add > .. //depot/projects/kse/tools/KSE/uts/uts.c#1 add > > Differences ... -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 15:40:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C066537B405; Fri, 30 Aug 2002 15:40:11 -0700 (PDT) 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 0588937B400; Fri, 30 Aug 2002 15:40:11 -0700 (PDT) Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67CD243E6E; Fri, 30 Aug 2002 15:40:10 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc51.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020830224010.ZWAK12451.rwcrmhc51.attbi.com@InterJet.elischer.org>; Fri, 30 Aug 2002 22:40:10 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id PAA05238; Fri, 30 Aug 2002 15:22:34 -0700 (PDT) Date: Fri, 30 Aug 2002 15:22:34 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16825 for review In-Reply-To: <20020830221655.GK3751@elvis.mu.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG looks good. I wonder if the original test program can be 'upgraded' or is it not worth teh trouble? On Fri, 30 Aug 2002, Jonathan Mini wrote: > Maybe this time I got the location right. *sigh* > > Jonathan Mini [mini@FreeBSD.org] wrote : > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16825 > > > > Change 16825 by mini@mini_stylus on 2002/08/30 15:14:46 > > > > Test version of userland thread schuduler. > > > > Affected files ... > > > > .. //depot/projects/kse/tools/KSE/Makefile#2 delete > > .. //depot/projects/kse/tools/KSE/uts.c#2 delete > > .. //depot/projects/kse/tools/KSE/uts/Makefile#1 add > > .. //depot/projects/kse/tools/KSE/uts/uts.c#1 add > > > > Differences ... > > -- > Jonathan Mini > http://www.freebsd.org/ > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 15:45:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2955E37B401; Fri, 30 Aug 2002 15:45:30 -0700 (PDT) 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 B396437B400 for ; Fri, 30 Aug 2002 15:45:29 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26A6543E77 for ; Fri, 30 Aug 2002 15:45:29 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 8B308AE255; Fri, 30 Aug 2002 15:45:25 -0700 (PDT) Date: Fri, 30 Aug 2002 15:45:25 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16825 for review Message-ID: <20020830224525.GL3751@elvis.mu.org> References: <20020830221655.GK3751@elvis.mu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > looks good. > I wonder if the original test program can be 'upgraded' or is it not worth > teh trouble? I started in that frame of mind, but decided a rewrite would be easier. It took me an afternoon; it's not like we're talking about much code. > On Fri, 30 Aug 2002, Jonathan Mini wrote: > > > Maybe this time I got the location right. *sigh* > > > > Jonathan Mini [mini@FreeBSD.org] wrote : > > > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16825 > > > > > > Change 16825 by mini@mini_stylus on 2002/08/30 15:14:46 > > > > > > Test version of userland thread schuduler. > > > > > > Affected files ... > > > > > > .. //depot/projects/kse/tools/KSE/Makefile#2 delete > > > .. //depot/projects/kse/tools/KSE/uts.c#2 delete > > > .. //depot/projects/kse/tools/KSE/uts/Makefile#1 add > > > .. //depot/projects/kse/tools/KSE/uts/uts.c#1 add > > > > > > Differences ... > > > > -- > > Jonathan Mini > > http://www.freebsd.org/ > > > -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Aug 30 20:57: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AEBF37B401; Fri, 30 Aug 2002 20:55:50 -0700 (PDT) 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 8F59F37B400 for ; Fri, 30 Aug 2002 20:55:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E5F643E4A for ; Fri, 30 Aug 2002 20:55:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7V3tmJU005598 for ; Fri, 30 Aug 2002 20:55:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7V3sqGY005128 for perforce@freebsd.org; Fri, 30 Aug 2002 20:54:52 -0700 (PDT) Date: Fri, 30 Aug 2002 20:54:52 -0700 (PDT) Message-Id: <200208310354.g7V3sqGY005128@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16835 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16835 Change 16835 by peter@peter_daintree on 2002/08/30 20:54:09 IFC @16834 (my fingers keep wanting to type 16384) Affected files ... .. //depot/projects/ia64/crypto/heimdal/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/ChangeLog.2001#1 branch .. //depot/projects/ia64/crypto/heimdal/Makefile.am.common#2 integrate .. //depot/projects/ia64/crypto/heimdal/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/NEWS#3 integrate .. //depot/projects/ia64/crypto/heimdal/acconfig.h#3 delete .. //depot/projects/ia64/crypto/heimdal/aclocal.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/admin/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/admin/copy.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/admin/ktutil.8#3 integrate .. //depot/projects/ia64/crypto/heimdal/admin/ktutil.cat8#2 integrate .. //depot/projects/ia64/crypto/heimdal/admin/srvconvert.c#2 delete .. //depot/projects/ia64/crypto/heimdal/admin/srvcreate.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/afsutil/ChangeLog#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/afsutil/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/afsutil/pagsh.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/dceutils/ChangeLog#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/dceutils/Makefile.am#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/dceutils/Makefile.in#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/dceutils/README.dcedfs#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/dceutils/README.original#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/dceutils/compile#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/dceutils/dfspag.exp#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/dceutils/dpagaix.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/dceutils/k5dce.h#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/dceutils/k5dcecon.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/dceutils/testpag.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/common/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/ftp.1#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/ftp.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/ftp.cat1#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/gssapi.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/main.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/extern.h#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ftpd.8#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ftpd.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ftpusers.5#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ls.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/pathnames.h#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/popen.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/kauth/ChangeLog#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kauth/Makefile.am#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kauth/Makefile.in#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kauth/encdata.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kauth/kauth.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kauth/kauth.h#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kauth/kauthd.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kauth/ksrvtgt.in#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kauth/marshall.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kauth/rkinit.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kauth/zrefresh#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kf/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/kf/kf.cat1#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/kf/kfd.8#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/kf/kfd.cat8#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/kx/ChangeLog#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/Makefile.am#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/Makefile.in#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/common.c#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/context.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/krb4.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/krb5.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/kx.1#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/kx.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/kx.cat1#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/kx.h#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/kxd.8#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/kxd.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/kxd.cat8#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/rxtelnet.1#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/rxtelnet.cat1#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/rxtelnet.in#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/rxterm.1#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/rxterm.cat1#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/rxterm.in#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/tenletxr.1#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/tenletxr.cat1#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/tenletxr.in#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/kx/writeauth.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/login/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/login/Makefile.am#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/login/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/login/login.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/login/login_locl.h#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/login/login_protos.h#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/otp/ChangeLog#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/otp/Makefile.am#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/otp/Makefile.in#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/otp/otp.1#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/otp/otp.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/otp/otp.cat1#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/otp/otp_locl.h#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/otp/otpprint.1#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/otp/otpprint.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/otp/otpprint.cat1#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/ChangeLog#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/Makefile.am#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/Makefile.in#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/README#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/README-FIRST#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/README-KRB4#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/maildir.c#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop3.rfc1081#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop3e.rfc1082#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_auth.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_debug.c#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_dele.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_dropcopy.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_dropinfo.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_get_command.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_init.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_last.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_list.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_log.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_msg.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_parse.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_pass.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_quit.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_rset.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_send.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_stat.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_uidl.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_updt.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_user.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/pop_xover.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/popper.8#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/popper.README.release#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/popper.c#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/popper.h#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/popper/version.h#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/push/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/push/pfrom.1#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/push/pfrom.cat1#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/push/push.8#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/push/push.cat8#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rcp/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rsh/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rsh/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rsh/common.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rsh/rsh.1#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rsh/rsh.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rsh/rsh_locl.h#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rsh/rshd.8#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rsh/rshd.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/su/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/su/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/su/su.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/libtelnet/auth-proto.h#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/libtelnet/rsaencpwd.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/commands.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/externs.h#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/main.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/sys_bsd.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/telnet.1#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/telnet.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/telnet.cat1#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnetd/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnetd/telnetd.8#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/test/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/ChangeLog#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/Makefile.am#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/Makefile.in#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/README#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/nose.0.left#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/nose.0.right#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/nose.1.left#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/nose.1.right#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/nose.down#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/nose.front#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/nose.left.front#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/nose.right.front#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/xnlock.1#2 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/xnlock.c#3 delete .. //depot/projects/ia64/crypto/heimdal/appl/xnlock/xnlock.cat1#2 delete .. //depot/projects/ia64/crypto/heimdal/cf/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/Makefile.am.common#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/aix.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/auth-modules.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/broken-getaddrinfo.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/broken.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/broken2.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/crypto.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/db.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/destdirs.m4#1 branch .. //depot/projects/ia64/crypto/heimdal/cf/dlopen.m4#1 branch .. //depot/projects/ia64/crypto/heimdal/cf/find-if-not-broken.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/irix.m4#1 branch .. //depot/projects/ia64/crypto/heimdal/cf/krb-bigendian.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-func-getcwd-broken.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-ipv6.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-irix.m4#2 delete .. //depot/projects/ia64/crypto/heimdal/cf/krb-readline.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-sys-nextstep.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-version.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/make-proto.pl#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/mips-abi.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/misc.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/need-proto.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/osfc2.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/otp.m4#1 branch .. //depot/projects/ia64/crypto/heimdal/cf/roken-frag.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/roken.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/sunos.m4#1 branch .. //depot/projects/ia64/crypto/heimdal/cf/telnet.m4#1 branch .. //depot/projects/ia64/crypto/heimdal/cf/test-package.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/config.guess#3 integrate .. //depot/projects/ia64/crypto/heimdal/config.sub#3 integrate .. //depot/projects/ia64/crypto/heimdal/configure#3 integrate .. //depot/projects/ia64/crypto/heimdal/configure.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/doc/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/include/Makefile.am#2 integrate .. //depot/projects/ia64/crypto/heimdal/include/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/include/bits.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/include/config.h.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/include/kadm5/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/include/stamp-h.in#2 delete .. //depot/projects/ia64/crypto/heimdal/install-sh#2 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/ank.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmin.8#2 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmin.cat8#2 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmind.8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmind.cat8#2 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/server.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/util.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/version4.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/524.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/config.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/connect.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/hprop-common.c#2 delete .. //depot/projects/ia64/crypto/heimdal/kdc/hprop.8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/hprop.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/hprop.cat8#2 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/hpropd.8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/hpropd.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/hpropd.cat8#2 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kaserver.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kdc.8#2 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kdc.cat8#2 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kdc_locl.h#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kerberos4.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kerberos4.h#2 delete .. //depot/projects/ia64/crypto/heimdal/kdc/kerberos5.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kstash.8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kstash.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kstash.cat8#2 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/log.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/main.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/string2key.8#2 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/string2key.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/string2key.cat8#2 integrate .. //depot/projects/ia64/crypto/heimdal/kpasswd/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/kpasswd/kpasswd.1#2 integrate .. //depot/projects/ia64/crypto/heimdal/kpasswd/kpasswd.cat1#2 integrate .. //depot/projects/ia64/crypto/heimdal/kpasswd/kpasswdd.8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kpasswd/kpasswdd.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kpasswd/kpasswdd.cat8#2 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kdestroy.cat1#2 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kgetcred.1#2 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kgetcred.cat1#2 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kinit.1#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kinit.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kinit.cat1#2 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/klist.1#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/klist.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/klist.cat1#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/45/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/45/mk_req.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/Makefile.am#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/asn1_print.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/check-der.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/der_get.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/gen.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/gen_decode.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/k5.asn1#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/pam/Makefile.am#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/pam/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/sia/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/com_err/ChangeLog#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/com_err/Makefile.am#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/com_err/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/com_err/com_err.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/com_err/compile_et.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/editline/ChangeLog#3 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/Makefile.am#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/Makefile.in#3 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/README#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/complete.c#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/edit_compat.c#3 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/edit_compat.h#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/editline.3#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/editline.c#3 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/editline.cat3#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/editline.h#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/roken_rename.h#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/sysunix.c#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/testit.c#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/editline/unix.h#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/8003.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/Makefile.am#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/acquire_cred.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/import_name.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/inquire_cred.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/release_cred.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/unwrap.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/verify_mic.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/Makefile.am#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/hdb-private.h#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/hdb-protos.h#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/keytab.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/mkey.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/print.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/Makefile.am#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/context_s.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/dump_log.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/init_c.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/iprop.h#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/ipropd_master.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/ipropd_slave.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/kadm5-private.h#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/kadm5-protos.h#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/log.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/private.h#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/replay_log.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/send_recv.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kafs/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kafs/Makefile.am#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kafs/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kafs/common.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kafs/kafs.3#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kafs/kafs.cat3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kafs/roken_rename.h#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/Makefile.am#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/acl.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/addr_families.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/aname_to_localname.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/auth_context.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/cache.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/changepw.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/config_file.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/constants.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/context.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/crypto.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/fcache.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/get_addrs.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/get_cred.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/get_for_creds.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/get_host_realm.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/get_in_tkt.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/init_creds_pw.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/kerberos.8#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/keytab.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/keytab_any.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/keytab_file.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/keytab_keyfile.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/keytab_krb4.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5-private.h#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5-protos.h#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5.conf.5#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5.h#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_425_conv_principal.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_appdefault.3#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_auth_context.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_build_principal.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_config.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_context.3#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_create_checksum.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_crypto_init.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_encrypt.3#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_free_addresses.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_free_principal.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_get_all_client_addrs.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_get_krbhst.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_init_context.3#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_keytab.3#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_krbhst_init.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_locl.h#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_openlog.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_parse_name.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_principal_get_realm.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_sname_to_principal.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_timeofday.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_unparse_name.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_verify_user.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_warn.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krbhst-test.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krbhst.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/log.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/mcache.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/mk_error.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/net_read.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/net_write.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/parse-name-test.c#1 branch .. //depot/projects/ia64/crypto/heimdal/lib/krb5/principal.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/rd_cred.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/recvauth.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/send_to_kdc.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/store-int.h#1 branch .. //depot/projects/ia64/crypto/heimdal/lib/krb5/store.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/store_emem.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/store_fd.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/store_mem.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/test_get_addrs.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/verify_init.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/verify_krb5_conf.8#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/verify_krb5_conf.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/verify_user.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/otp/ChangeLog#3 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/Makefile.am#3 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/Makefile.in#3 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/otp.c#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/otp.h#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/otp_challenge.c#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/otp_db.c#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/otp_locl.h#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/otp_md.c#3 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/otp_md.h#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/otp_parse.c#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/otp_print.c#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/otp_verify.c#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/otptest.c#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/otp/roken_rename.h#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/roken/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/Makefile.am#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/err.h#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/roken/fnmatch.h#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/roken/getarg.3#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/getarg.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/getarg.h#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/glob.h#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/roken/localtime_r.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/make-print-version.c#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/roken/mini_inetd.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/ndbm_wrap.c#1 branch .. //depot/projects/ia64/crypto/heimdal/lib/roken/ndbm_wrap.h#1 branch .. //depot/projects/ia64/crypto/heimdal/lib/roken/resolve.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/resolve.h#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/roken-common.h#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/roken.def#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/roken/roken.dsp#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/roken/roken.h.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/roken.mak#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/roken/roken.rc#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/roken/snprintf.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/strftime.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/strlcat.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/strlcpy.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/strsep_copy.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/xdbm.h#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/sl/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/sl/Makefile.am#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/sl/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/vers/ChangeLog#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/vers/Makefile.am#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/vers/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/vers/print_version.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/ltmain.sh#3 integrate .. //depot/projects/ia64/crypto/heimdal/missing#2 integrate .. //depot/projects/ia64/crypto/heimdal/mkinstalldirs#2 integrate .. //depot/projects/ia64/crypto/heimdal/tools/Makefile.in#3 integrate .. //depot/projects/ia64/crypto/heimdal/tools/krb5-config.cat1#2 integrate .. //depot/projects/ia64/crypto/heimdal/ylwrap#2 delete .. //depot/projects/ia64/etc/defaults/rc.conf#17 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#4 integrate .. //depot/projects/ia64/etc/rc.d/pcvt#1 branch .. //depot/projects/ia64/games/wargames/Makefile#2 integrate .. //depot/projects/ia64/games/wargames/wargames.c#1 branch .. //depot/projects/ia64/games/wargames/wargames.sh#2 delete .. //depot/projects/ia64/gnu/usr.bin/grep/grep.1#4 integrate .. //depot/projects/ia64/kerberos5/include/config.h#4 integrate .. //depot/projects/ia64/kerberos5/include/krb5-private.h#2 integrate .. //depot/projects/ia64/kerberos5/include/krb5-types.h#2 integrate .. //depot/projects/ia64/kerberos5/include/version.h#3 integrate .. //depot/projects/ia64/kerberos5/lib/Makefile.inc#3 integrate .. //depot/projects/ia64/kerberos5/lib/libroken/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/libexec/k5passwdd/Makefile#4 integrate .. //depot/projects/ia64/lib/libc/locale/collate.c#6 integrate .. //depot/projects/ia64/lib/libc/locale/collate.h#6 integrate .. //depot/projects/ia64/lib/libc/string/bcmp.3#2 integrate .. //depot/projects/ia64/lib/libc/string/bcmp.c#4 integrate .. //depot/projects/ia64/lib/libc/string/ffs.3#2 integrate .. //depot/projects/ia64/lib/libc/string/ffs.c#4 integrate .. //depot/projects/ia64/lib/libc/string/index.3#2 integrate .. //depot/projects/ia64/lib/libc/string/index.c#4 integrate .. //depot/projects/ia64/lib/libc/string/rindex.3#2 integrate .. //depot/projects/ia64/lib/libc/string/rindex.c#4 integrate .. //depot/projects/ia64/lib/libc/string/strcasecmp.3#2 integrate .. //depot/projects/ia64/lib/libc/string/strcasecmp.c#4 integrate .. //depot/projects/ia64/lib/libc/string/swab.3#2 integrate .. //depot/projects/ia64/lib/libc/string/swab.c#4 integrate .. //depot/projects/ia64/lib/libkvm/kvm_proc.c#10 integrate .. //depot/projects/ia64/libexec/lukemftpd/Makefile#6 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/share/sgml/release.dsl#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#40 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/share/sgml/release.dsl#4 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/share/sgml/release.dsl#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/share/sgml/release.dsl#4 integrate .. //depot/projects/ia64/share/man/man4/ifmib.4#3 integrate .. //depot/projects/ia64/share/man/man5/device.hints.5#4 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#15 integrate .. //depot/projects/ia64/share/mk/bsd.obj.mk#7 integrate .. //depot/projects/ia64/sys/alpha/alpha/dump_machdep.c#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#16 integrate .. //depot/projects/ia64/sys/alpha/include/md_var.h#3 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#10 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#10 integrate .. //depot/projects/ia64/sys/boot/ficl/prefix.c#3 integrate .. //depot/projects/ia64/sys/boot/ficl/words.c#3 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/i386_module.c#3 integrate .. //depot/projects/ia64/sys/boot/i386/loader/Makefile#8 integrate .. //depot/projects/ia64/sys/boot/i386/loader/help.i386#3 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#10 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_resource.c#3 integrate .. //depot/projects/ia64/sys/conf/majors#9 integrate .. //depot/projects/ia64/sys/dev/aac/aac.c#8 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#19 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/fc_log.h#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_fc.h#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_lan.h#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#23 integrate .. //depot/projects/ia64/sys/i386/include/md_var.h#8 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#45 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#33 integrate .. //depot/projects/ia64/sys/ia64/include/md_var.h#4 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#17 integrate .. //depot/projects/ia64/sys/kern/subr_param.c#7 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#20 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#21 integrate .. //depot/projects/ia64/sys/powerpc/include/md_var.h#4 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#15 integrate .. //depot/projects/ia64/sys/sparc64/include/md_var.h#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#20 integrate .. //depot/projects/ia64/sys/sys/buf.h#11 integrate .. //depot/projects/ia64/sys/sys/systm.h#18 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#10 integrate .. //depot/projects/ia64/sys/vm/vm_init.c#6 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.history#5 integrate .. //depot/projects/ia64/usr.bin/colldef/parse.y#8 integrate .. //depot/projects/ia64/usr.sbin/extattr/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/extattr/rmextattr.8#1 branch .. //depot/projects/ia64/usr.sbin/extattr/rmextattr.c#1 branch Differences ... ==== //depot/projects/ia64/crypto/heimdal/ChangeLog#3 (text+ko) ==== @@ -1,1170 +1,478 @@ -2002-02-15 Johan Danielsson +2002-08-28 Assar Westerlund - * lib/krb5/keytab_keyfile.c (akf_add_entry): don't create the file - before we need to write to it - (from Åke Sandgren) + * kdc/config.c: add missing ifdef DAEMON -2002-02-14 Johan Danielsson +2002-08-28 Johan Danielsson - * configure.in: rk_RETSIGTYPE and rk_BROKEN_REALLOC are called via - rk_ROKEN (from Gombas Gabor); find inttypes by CHECK_TYPES - directly + * configure.in: use rk_SUNOS - * lib/krb5/rd_safe.c: actually use the correct key (from Daniel - Kouril) + * kdc/config.c: add detach options -2002-02-12 Johan Danielsson + * kdc/main.c: maybe detach from console? - * lib/krb5/context.c (krb5_get_err_text): protect against NULL - context + * kdc/kdc.8: markup changes -2002-02-11 Johan Danielsson + * configure.in: AC_TEST_PACKAGE_NEW -> rk_TEST_PACKAGE - * admin/ktutil.c: no need to use the "modify" keytab anymore + * configure.in: use rk_TELNET, rename some other macros, and don't + add -ldes to krb4 link command - * lib/krb5/keytab_any.c: implement add and remove + * kuser/kinit.1: whitespace fix (from NetBSD) - * lib/krb5/keytab_krb4.c: implement add and remove + * include/bits.c: we may need unistd.h for ssize_t - * lib/krb5/store_emem.c (emem_free): clear memory before freeing - (this should perhaps be selectable with a flag) +2002-08-26 Assar Westerlund -2002-02-04 Johan Danielsson + * lib/krb5/principal.c (krb5_425_conv_principal_ext): lookup AAAA + rrs before A ones when using the resolver to verify a mapping, + also use getaddrinfo when resolver is not available - * kdc/config.c (get_dbinfo): if there are database specifications - in the config file, don't automatically try to use the default - values (from Gombas Gabor) + * lib/hdb/keytab.c (find_db): const-correctness in parameters to + krb5_config_get_next - * lib/krb5/log.c (krb5_closelog): don't pass pointer to pointer - (from Gombas Gabor) + * lib/asn1/gen.c: include in the generated files (for + memset) -2002-01-30 Johan Danielsson +2002-08-22 Assar Westerlund - * admin/list.c: get the default keytab from krb5.conf, and list - all parts of an ANY type keytab + * lib/krb5/test_get_addrs.c, lib/krb5/krbhst-test.c: make it use + getarg so that it can handle --help and --version (and thus make + check can pass) - * lib/krb5/context.c: default default_keytab_modify to NULL + * lib/asn1/check-der.c: make this build again - * lib/krb5/keytab.c (krb5_kt_default_modify_name): if no modify - name is specified take it from the first component of the default - keytab name +2002-08-22 Assar Westerlund -2002-01-29 Johan Danielsson + * lib/asn1/der_get.c (der_get_int): handle len == 0. based on a + patch from Love - * lib/krb5/keytab.c: compare keytab types case insensitively +2002-08-22 Johan Danielsson -2002-01-07 Assar Westerlund + * lib/krb5/krb5.h: we seem to call KRB5KDC_ERR_KEY_EXP + KRB5KDC_ERR_KEY_EXPIRED, so define the former to the latter + + * kdc/kdc.8: add blurb about adding and removing addresses; update + kdc.conf section to match reality - * lib/krb5/crypto.c (create_checksum): make usage `unsigned' (it's - not really a krb5_key_usage). From Ben Harris - * lib/krb5/get_in_tkt.c: use krb5_enctype consistently. From Ben - Harris - * lib/krb5/crypto.c: use krb5_enctype consistently. From Ben - Harris - * kdc/kerberos5.c: use krb5_enctype consistently. From Ben Harris - + * configure.in: KRB_SENDAUTH_VLEN seems to always have existed, so + don't define it + +2002-08-21 Assar Westerlund + + * lib/asn1/asn1_print.c: print OIDs too, based on a patch from + Love -2001-12-20 Johan Danielsson +2002-08-21 Johan Danielsson - * lib/krb5/crypto.c: use our own des string-to-key function, since - the one from openssl sometimes generates wrong output + * kuser/kinit.c (do_v4_fallback): don't use krb_get_pw_in_tkt2 + since it might not exist, and we don't actually care about the key + +2002-08-20 Johan Danielsson -2001-12-05 Jacques Vidrine + * lib/krb5/krb5.conf.5: correct documentation for + verify_ap_req_nofail - * lib/hdb/mkey.c: fix a bug in which kstash would crash if - there were no /etc/krb5.conf + * lib/krb5/log.c: rename syslog_data to avoid name conflicts (from + Mattias Amnefelt) -2001-10-29 Jacques Vidrine + * kuser/klist.c (display_tokens): increase token buffer size, and + add more checks of the kernel data (from Love) - * admin/get.c: fix a bug in which a reference to a data - structure on the stack was being kept after the containing - function's lifetime, resulting in a segfault during `ktutil - get'. +2002-08-19 Johan Danielsson -2001-10-22 Assar Westerlund + * fix-export: use make to parse Makefile.am instead of perl - * lib/krb5/crypto.c: make all high-level encrypting and decrypting - functions check the return value of the underlying function and - handle errors more consistently. noted by Sam Hartman - + * configure.in: use argument-less AM_INIT_AUTOMAKE, now that it + groks AC_INIT with package name etc. -2001-10-21 Assar Westerlund + * kpasswd/kpasswdd.c: include - * lib/krb5/crypto.c (enctype_arcfour_hmac_md5): actually use a - non-keyed checksum when it should be non-keyed + * lib/asn1/asn1_print.c: include com_right.h -2001-09-29 Assar Westerlund + * lib/krb5/addr_families.c: socklen_t -> krb5_socklen_t - * kuser/kinit.1: add the kauth alias - * kuser/kinit.c: allow specification of afslog in krb5.conf, noted - by jhutz@cs.cmu.edu + * include/bits.c: define krb5_socklen_t type; this should really + go someplace else, but this was easy -2001-09-27 Assar Westerlund + * lib/krb5/verify_krb5_conf.c: don't bail out if parsing of a file + fails, just warn about it - * lib/asn1/gen.c: remove the need for libasn1.h, also make - generated files include all files from IMPORTed modules + * kdc/log.c (kdc_openlog): no need for a config_file parameter - * lib/krb5/krb5.h (KRB5_KPASSWD_*): set correct values - * kpasswd/kpasswd.c: improve error message printing - * lib/krb5/changepw.c (krb5_passwd_result_to_string): add change - to use sequence numbers connect the udp socket so that we can - figure out the local address + * kdc/config.c: just treat kdc.conf like any other config file -2001-09-25 Assar Westerlund + * lib/krb5/context.c (krb5_get_default_config_files): ignore + duplicate files - * lib/asn1: implement OBJECT IDENTIFIER and ENUMERATED +2002-08-16 Johan Danielsson -2001-09-20 Johan Danielsson + * lib/krb5/krb5.h: turn strings into pointers, so we can assign to + them - * lib/krb5/principal.c (krb5_425_conv_principal_ext): try using - lower case realm as domain, but only when given a verification - function + * lib/krb5/constants.c: turn strings into pointers, so we can + assign to them -2001-09-20 Assar Westerlund + * lib/krb5/get_addrs.c (get_addrs_int): initialise res if + SCAN_INTERFACES is not set - * lib/asn1/der_put.c (der_put_length): do not even try writing - anything when len == 0 + * lib/krb5/context.c: fix various borked stuff in previous commits -2001-09-18 Johan Danielsson +2002-08-16 Jacques Vidrine - * kdc/hpropd.c: add realm override option + * lib/krb5/krbhst.c (kpasswd_get_next): if we fall back to using + the `admin_server' entry for kpasswd, override the `proto' result + to be UDP. - * lib/krb5/set_default_realm.c (krb5_set_default_realm): make - realm parameter const +2002-08-15 Johan Danielsson - * kdc/hprop.c: more free's + * lib/krb5/auth_context.c: check return value of + krb5_sockaddr2address - * lib/krb5/init_creds_pw.c (krb5_get_init_creds_keytab): free key - proc data + * lib/krb5/addr_families.c: check return value of + krb5_sockaddr2address - * lib/krb5/expand_hostname.c (krb5_expand_hostname_realms): free - addrinfo + * lib/krb5/context.c: get the default keytab from KRB5_KTNAME - * lib/hdb/mkey.c (hdb_set_master_keyfile): clear error string when - not returning error +2002-08-14 Johan Danielsson -2001-09-16 Assar Westerlund + * lib/krb5/verify_krb5_conf.c: allow parsing of more than one file - * lib/krb5/appdefault.c (krb5_appdefault_{boolean,string,time): - make realm const + * lib/krb5/context.c: allow changing config files with the + function krb5_set_config_files, there are also related functions + krb5_get_default_config_files and krb5_free_config_files; these + should work similar to their MIT counterparts - * lib/krb5/crypto.c: use des functions to avoid generating - warnings with openssl's prototypes + * lib/krb5/config_file.c: allow the use of more than one config + file by using the new function krb5_config_parse_file_multi -2001-09-05 Johan Danielsson +2002-08-12 Johan Danielsson - * configure.in: check for termcap.h + * use sysconfdir instead of /etc - * lib/asn1/lex.l: add another undef ECHO to keep AIX lex happy + * configure.in: require autoconf 2.53; rename dpagaix_LDFLAGS etc + to appease automake; force sysconfdir and localstatedir to /etc + and /var/heimdal for now -2001-09-03 Assar Westerlund + * kdc/connect.c (addr_to_string): check return value of + sockaddr2address - * lib/krb5/addr_families.c (krb5_print_address): handle snprintf - returning < 0. noticed by hin@stacken.kth.se +2002-08-09 Johan Danielsson -2001-09-03 Assar Westerlund + * lib/krb5/rd_cred.c: if the remote address isn't an addrport, + don't try comparing to one; this should make old clients work with + new servers - * Release 0.4e + * lib/asn1/gen_decode.c: remove unused variable -2001-09-02 Johan Danielsson +2002-07-31 Johan Danielsson - * kuser/Makefile.am: install kauth as a symlink to kinit + * kdc/{kerberos5,524}.c: ENOENT -> HDB_ERR_NOENTRY (from Derrick + Brashear) - * kuser/kinit.c: get v4_tickets by default + * lib/krb5/principal.c: actually lower case the lower case + instance name (spotted by Derrick Brashear) - * lib/asn1/Makefile.am: fix for broken automake +2002-07-24 Johan Danielsson -2001-08-31 Johan Danielsson + * fix-export: if DATEDVERSION is set, change the version to + current date - * lib/hdb/hdb-ldap.c: some pretty much untested changes from Luke - Howard + * configure.in: don't use AC_PROG_RANLIB, and use magic foo to set + LTLIBOBJS - * kuser/kinit.1: remove references to kauth +2002-07-04 Johan Danielsson - * kuser/Makefile.am: kauth is no more + * kdc/connect.c: add some cache-control-foo to the http responses + (from Gombas Gabor) - * kuser/kinit.c: use appdefaults for everything. defaults are now - as in kauth. + * lib/krb5/addr_families.c (krb5_print_address): don't copy size + if ret_len == NULL - * lib/krb5/appdefault.c: also check libdefaults, and realms/realm +2002-06-28 Johan Danielsson - * lib/krb5/context.c (krb5_free_context): free more stuff + * kuser/klist.c (display_tokens): don't bail out before we get + EDOM (signaling the end of the tokens), the kernel can also return + ENOTCONN, meaning that the index does not exist anymore (for + example if the token has expired) -2001-08-30 Johan Danielsson +2002-06-06 Johan Danielsson - * lib/krb5/verify_krb5_conf.c: do some checks of the values in the - file + * lib/krb5/changepw.c: make sure we return an error if there are + no changepw hosts found; from Wynn Wilkes - * lib/krb5/krb5.conf.5: remove srv_try_txt, fix spelling +2002-05-29 Johan Danielsson - * lib/krb5/context.c: don't init srv_try_txt, since it isn't used - anymore + * lib/krb5/cache.c (krb5_cc_register): break out of loop when the + same type is found; spotted by Wynn Wilkes -2001-08-29 Jacques Vidrine +2002-05-15 Johan Danielsson - * configure.in: Check for already-installed com_err. + * kdc/kerberos5.c: don't free encrypted padata until we're really + done with it -2001-08-28 Assar Westerlund +2002-05-07 Johan Danielsson - * lib/krb5/Makefile.am (libkrb5_la_LDFLAGS): set versoin to 18:2:1 + * kdc/kerberos5.c: when decrypting pa-data, try all keys matching + enctype -2001-08-24 Assar Westerlund + * kuser/kinit.1: document -a - * kuser/Makefile.am: remove CHECK_LOCAL - non bin programs require - no special treatment now + * kuser/kinit.c: add command line switch for extra addresses - * kuser/generate-requests.c: parse arguments in a useful way - * kuser/kverify.c: add --help/--verify +2002-04-30 Johan Danielsson -2001-08-22 Assar Westerlund + * configure.in: remove some duplicate tests - * configure.in: bump prereq to 2.52 remove unused test_LIB_KRB4 + * configure.in: use AC_HELP_STRING - * configure.in: re-write the handling of crypto libraries. try to - use the one of openssl's libcrypto or krb4's libdes that has all - the required functionality (md4, md5, sha1, des, rc4). if there - is no such library, the included lib/des is built. +2002-04-29 Johan Danielsson - * kdc/headers.h: include libutil.h if it exists - * kpasswd/kpasswd_locl.h: include libutil.h if it exists - * kdc/kerberos4.c (get_des_key): check for null keys even if - is_server + * lib/krb5/crypto.c (usage2arcfour): don't abort if the usage is + unknown -2001-08-21 Assar Westerlund +2002-04-25 Johan Danielsson - * lib/asn1/asn1_print.c: print some size_t correctly - * configure.in: remove extra space after -L check for libutil.h + * configure.in: use rk_DESTDIRS -2001-08-17 Johan Danielsson +2002-04-22 Johan Danielsson - * kdc/kdc_locl.h: fix prototype for get_des_key + * lib/krb5/krb5_verify_user.3: make it clear that _lrealm modifies + the principal - * kdc/kaserver.c: fix call to get_des_key +2002-04-19 Johan Danielsson - * kdc/524.c: fix call to get_des_key + * lib/krb5/verify_init.c: fix typo in error string - * kdc/kerberos4.c (get_des_key): if getting a key for a server, - return any des-key not just keys that can be string-to-keyed by - the client +2002-04-18 Johan Danielsson -2001-08-10 Assar Westerlund + * acconfig.h: remove some stuff that is defined elsewhere >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 31 13:27:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F105037B401; Sat, 31 Aug 2002 13:27:47 -0700 (PDT) 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 831F237B400 for ; Sat, 31 Aug 2002 13:27:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2665243E4A for ; Sat, 31 Aug 2002 13:27:47 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7VKRlJU009873 for ; Sat, 31 Aug 2002 13:27:47 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7VKRklx009870 for perforce@freebsd.org; Sat, 31 Aug 2002 13:27:46 -0700 (PDT) Date: Sat, 31 Aug 2002 13:27:46 -0700 (PDT) Message-Id: <200208312027.g7VKRklx009870@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16862 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16862 Change 16862 by mini@mini_stylus on 2002/08/31 13:27:40 - Look for uc_flags in the right place. - A context is valid when mc_len == sizeof(mcontext_t), not when (mc_len - sizeof(mcontext_t) != 0 (i.e., je, not jnz). - Obey SKIPSIGMASK in getcontext() too. This makes getcontext()/setcontext() work again. Affected files ... .. //depot/projects/kse/lib/libc/i386/gen/getcontext.S#4 edit Differences ... ==== //depot/projects/kse/lib/libc/i386/gen/getcontext.S#4 (text+ko) ==== @@ -33,6 +33,7 @@ #define MC_SIZE 640 /* sizeof mcontext_t */ #define UC_MC_OFFSET 16 /* offset to mcontext from ucontext */ #define UC_MC_LEN_OFFSET 96 /* offset to mc_len from mcontext */ +#define UC_FLAGS_OFFSET 676 /* offset to uc_flags from ucontext */ #define MC_FLAGS_OFFSET 660 /* offset to uc_flags from ucontext */ #define MC_BUSY_OFFSET 656 /* offset to uc_busy from ucontext */ #define MC_LEN_OFFSET 80 /* offset to mc_len from mcontext */ @@ -58,10 +59,10 @@ movl $-1, %eax jmp 7f 1: cmpl $MC_SIZE, UC_MC_LEN_OFFSET(%eax) /* is context valid? */ - jnz 2f + je 2f movl $-1, %eax /* bzzzt, invalid context */ jmp 7f -2: testl $UCF_SKIPSIGMASK, MC_FLAGS_OFFSET(%edx) /* Restore sigmask? */ +2: testl $UCF_SKIPSIGMASK, UC_FLAGS_OFFSET(%eax) /* Restore sigmask? */ jnz 3f PIC_PROLOGUE pushl $0 /* oset = NULL */ @@ -118,9 +119,11 @@ cmpl $0, %eax /* check for null pointer */ jne 1f movl $-1, %eax - jmp 2f + jmp 3f movl 4(%esp), %eax /* get address of context and sigset */ -1: PIC_PROLOGUE +1: testl $UCF_SKIPSIGMASK, UC_FLAGS_OFFSET(%eax) /* Save sigmask? */ + jnz 2f + PIC_PROLOGUE pushl %eax /* oset = &ucp->uc_sigmask */ pushl $0 /* set = NULL */ pushl $3 /* how = SIG_SETMASK */ @@ -128,8 +131,8 @@ addl $12, %esp PIC_EPILOGUE testl %eax, %eax /* check for error */ - jnz 2f - pushl %edx /* save value of edx */ + jnz 3f +2: pushl %edx /* save value of edx */ movl 8(%esp), %edx /* get address of context */ addl $UC_MC_OFFSET, %edx /* add offset to mcontext */ movl %gs, 4(%edx) @@ -165,4 +168,4 @@ movl $MC_SIZE, MC_LEN_OFFSET(%edx) /* context is now valid */ movl 40(%edx), %edx /* restore edx -- is this needed? */ xorl %eax, %eax /* return 0 */ -2: ret +3: ret To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 31 13:30: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDE9E37B401; Sat, 31 Aug 2002 13:29:50 -0700 (PDT) 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 64F2637B401 for ; Sat, 31 Aug 2002 13:29:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 273B243E42 for ; Sat, 31 Aug 2002 13:29:50 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7VKToJU010156 for ; Sat, 31 Aug 2002 13:29:50 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7VKTnVT010152 for perforce@freebsd.org; Sat, 31 Aug 2002 13:29:49 -0700 (PDT) Date: Sat, 31 Aug 2002 13:29:49 -0700 (PDT) Message-Id: <200208312029.g7VKTnVT010152@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16863 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16863 Change 16863 by mini@mini_stylus on 2002/08/31 13:29:17 Ick. sys/ucontext.h relies on all sorts of evil namespace pollution. For now, move it out of order. Affected files ... .. //depot/projects/kse/lib/libc/gen/swapcontext.c#4 edit Differences ... ==== //depot/projects/kse/lib/libc/gen/swapcontext.c#4 (text+ko) ==== @@ -27,11 +27,11 @@ #include __FBSDID("$FreeBSD: src/lib/libc/gen/swapcontext.c,v 1.2 2002/01/11 19:46:08 deischen Exp $"); -#include #include #include #include +#include __weak_reference(__swapcontext, swapcontext); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 31 13:33: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CD4F37B401; Sat, 31 Aug 2002 13:32:56 -0700 (PDT) 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 9169B37B400 for ; Sat, 31 Aug 2002 13:32:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E91D343E75 for ; Sat, 31 Aug 2002 13:32:54 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7VKWsJU010968 for ; Sat, 31 Aug 2002 13:32:54 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7VKWspv010965 for perforce@freebsd.org; Sat, 31 Aug 2002 13:32:54 -0700 (PDT) Date: Sat, 31 Aug 2002 13:32:54 -0700 (PDT) Message-Id: <200208312032.g7VKWspv010965@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16865 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16865 Change 16865 by mini@mini_stylus on 2002/08/31 13:32:37 Add a test and warning against a proc with no threads. Such a proc should never exist, but it caused 'ps ax' to kernel panic when I did that accidentally. Affected files ... .. //depot/projects/kse/sys/kern/kern_proc.c#79 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_proc.c#79 (text+ko) ==== @@ -825,6 +825,13 @@ } if (p->p_state != PRS_ZOMBIE) { td = FIRST_THREAD_IN_PROC(p); + if (td == NULL) { + /* XXXKSE: This should never happen. */ + printf("fill_kinfo_proc(): pid %d has no threads!\n", + p->p_pid); + mtx_unlock_spin(&sched_lock); + return; + } if (!(p->p_flag & P_KSES)) { if (td->td_wmesg != NULL) { strncpy(kp->ki_wmesg, td->td_wmesg, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 31 13:35:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE79C37B401; Sat, 31 Aug 2002 13:34:58 -0700 (PDT) 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 361D637B400 for ; Sat, 31 Aug 2002 13:34:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E11B243E6A for ; Sat, 31 Aug 2002 13:34:57 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7VKYvJU011073 for ; Sat, 31 Aug 2002 13:34:57 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7VKYvZO011070 for perforce@freebsd.org; Sat, 31 Aug 2002 13:34:57 -0700 (PDT) Date: Sat, 31 Aug 2002 13:34:57 -0700 (PDT) Message-Id: <200208312034.g7VKYvZO011070@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16866 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16866 Change 16866 by mini@mini_stylus on 2002/08/31 13:33:58 Add some extra debugging info, and move swapcontext() into here for now (while tweaking the context switch operation order). Affected files ... .. //depot/projects/kse/tools/KSE/uts/uts.c#2 edit Differences ... ==== //depot/projects/kse/tools/KSE/uts/uts.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#1 $ + * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#2 $ */ #include @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -44,6 +45,8 @@ static struct kse_mailbox uts_mb; static struct thread_mailbox *run_queue; +static int progress = 0; + static void init_uts(void); static void pchar(char c); static void pfmt(const char *fmt, ...); @@ -53,9 +56,13 @@ static void thread_start(const void *func); static void uts(void); +static int myswapcontext(ucontext_t *oucp, const ucontext_t *ucp, + struct thread_mailbox *p); + void aaaa(void) { + progress++; for (;;) { pchar('.'); sleep(1); @@ -70,7 +77,8 @@ { int i; - thread_start(aaaa); + pfmt("ofs: %d\n", offsetof(ucontext_t, uc_flags) - offsetof(ucontext_t, uc_mcontext)); + //thread_start(aaaa); init_uts(); for (i = 0;i < 5;i++) { pfmt("main(): %d\n", i); @@ -98,6 +106,7 @@ /* Throw us into its context. */ getcontext(&tm->tm_context); + tm->tm_context.uc_flags = UCF_SKIPSIGMASK | UCF_OBEYBUSY; /* Find our stack. */ mib[0] = CTL_KERN; @@ -276,11 +285,18 @@ p = runq_remove(); if (p != NULL) { pfmt("-- uts() scheduling 0x%x--\n", p); - pfmt("eip -> 0x%x\n", p->tm_context.uc_mcontext.mc_eip); - uts_mb.km_curthread = p; - ret = swapcontext(&uts_mb.km_context, &p->tm_context); + pfmt("eip -> 0x%x progress -> %d\n", + p->tm_context.uc_mcontext.mc_eip, progress); + pstr("curthread set\n"); + ret = myswapcontext(&uts_mb.km_context, &p->tm_context, + p); pfmt("\n-- uts() back from swapcontext() [%d] --\n", ret); + if (ret) + /* + * Invalid thread context. Exit. + */ + exit(ret); } else kse_yield(); } @@ -307,3 +323,30 @@ tm->tm_context.uc_flags = UCF_SKIPSIGMASK | UCF_OBEYBUSY; runq_insert(tm); } + +static int +myswapcontext(ucontext_t *oucp, const ucontext_t *ucp, struct thread_mailbox *p) +{ + int ret; + + pfmt("msctx(%x,%x,%x) - %d %d, %x %x, %x %x\n", oucp, ucp, p, + oucp->uc_mcontext.mc_len, ucp->uc_mcontext.mc_len, + oucp->uc_busy, ucp->uc_busy, + oucp->uc_flags, ucp->uc_flags); + if ((oucp == NULL) || + (oucp->uc_mcontext.mc_len != sizeof(mcontext_t)) || + (ucp == NULL) || + (ucp->uc_mcontext.mc_len != sizeof(mcontext_t))) { + pstr("msctx: EINVAL\n"); + return (-1); + } + oucp->uc_flags &= ~UCF_SWAPPED; + ret = getcontext(oucp); + if ((ret == 0) && !(oucp->uc_flags & UCF_SWAPPED)) { + oucp->uc_flags |= UCF_SWAPPED; + uts_mb.km_curthread = p; + oucp->uc_busy = 0; + ret = setcontext(ucp); + } + return (ret); +} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 31 14:53:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B07237B401; Sat, 31 Aug 2002 14:53:36 -0700 (PDT) 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 B942337B400 for ; Sat, 31 Aug 2002 14:53:35 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA1A643E3B for ; Sat, 31 Aug 2002 14:53:34 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7VLrYJU023543 for ; Sat, 31 Aug 2002 14:53:34 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7VLrYd9023540 for perforce@freebsd.org; Sat, 31 Aug 2002 14:53:34 -0700 (PDT) Date: Sat, 31 Aug 2002 14:53:34 -0700 (PDT) Message-Id: <200208312153.g7VLrYd9023540@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16871 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16871 Change 16871 by mini@mini_stylus on 2002/08/31 14:53:33 - Make ke_mailbox a pointer to the right type, so we can use -> instead of offsetof() to perform address calculations. - Add a UCF_CRITICAL flag to denote critical sections in a ucontext. - Split flags in to options and states, and add the option UCF_CLEARSTATE to request that setcontext() clear the state flags when entering the context. - Change the context-switch method from the UTS to a thread to mark itself as a critical section, swap into the section, and unset the critical flag at the last moment before jumping into the new context's code. Now we needn't fear entering the kernel at any time during the UTS's operation, including swapping contexts. Affected files ... .. //depot/projects/kse/lib/libc/i386/gen/getcontext.S#5 edit .. //depot/projects/kse/sys/kern/kern_thread.c#95 edit .. //depot/projects/kse/sys/sys/proc.h#124 edit .. //depot/projects/kse/sys/sys/ucontext.h#5 edit .. //depot/projects/kse/tools/KSE/uts/uts.c#3 edit Differences ... ==== //depot/projects/kse/lib/libc/i386/gen/getcontext.S#5 (text+ko) ==== @@ -40,8 +40,14 @@ #define MC_FP_REGS_OFFSET 96 /* offset to FP regs from mcontext */ #define MC_FP_CW_OFFSET 96 /* offset to FP control word */ #define MC_OWNEDFP_OFFSET 88 /* offset to mc_ownedfp from mcontext */ -#define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ -#define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ +#define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ +#define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ +#define UCF_CLEARSTATE 0x00000004 /* Clear UCF_STATE in setcontext. */ +#define UCF_SWAPPED 0x00000100 /* Used by swapcontext(3). */ +#define UCF_CRITICAL 0x00000200 /* In a critical section. */ +#define UCF_STATE 0x0000ff00 /* State-related flags. */ +#define UCF_OPTIONS 0x000000ff /* Behaviour-related flags. */ + /* * int setcontext(ucontext_t *ucp); @@ -57,11 +63,11 @@ cmpl $0, %eax /* check for null pointer */ jne 1f movl $-1, %eax - jmp 7f + jmp 8f 1: cmpl $MC_SIZE, UC_MC_LEN_OFFSET(%eax) /* is context valid? */ je 2f movl $-1, %eax /* bzzzt, invalid context */ - jmp 7f + jmp 8f 2: testl $UCF_SKIPSIGMASK, UC_FLAGS_OFFSET(%eax) /* Restore sigmask? */ jnz 3f PIC_PROLOGUE @@ -72,7 +78,7 @@ addl $12, %esp PIC_EPILOGUE testl %eax, %eax /* check for error */ - jnz 7f + jnz 8f 3: movl 4(%esp), %edx /* get address of context */ addl $UC_MC_OFFSET, %edx /* add offset to mcontext */ movl 4(%edx), %gs @@ -98,12 +104,15 @@ movl 44(%edx), %ecx pushl 68(%edx) /* flags on stack */ pushl 40(%edx) /* %edx on stack */ - testl $UCF_OBEYBUSY, MC_FLAGS_OFFSET(%edx) /* set uc_busy? */ + testl $UCF_CLEARSTATE, MC_FLAGS_OFFSET(%edx) /* clear flag state? */ jz 6f + andl $UCF_OPTIONS, MX_FLAGS_OFFSET(%edx) +6: testl $UCF_OBEYBUSY, MC_FLAGS_OFFSET(%edx) /* set uc_busy? */ + jz 7f movl $1, MC_BUSY_OFFSET(%edx) /* set uc_busy */ -6: popl %edx /* %edx off stack */ +7: popl %edx /* %edx off stack */ popf /* flags off stack */ -7: ret +8: ret /* * int getcontext(ucontext_t *ucp); ==== //depot/projects/kse/sys/kern/kern_thread.c#95 (text+ko) ==== @@ -501,6 +501,15 @@ struct thread *td, struct trapframe *frame) { int discard, error; + struct thread_mailbox *tmp; + + /* + * If we are in a critical section, return to this thread. + */ + tmp = (struct thread_mailbox *)fuword(&ke->ke_mailbox->km_curthread); + if ((tmp != NULL) && + (fuword(&tmp->tm_context.uc_flags) & UCF_CRITICAL)) + return (0); /* * Save the thread's context, and link it @@ -517,7 +526,7 @@ return (error); /* - * Second, decide whether to perfom an upcall now. + * Decide whether to perfom an upcall now. */ discard = 0; @@ -540,9 +549,7 @@ discard = 1; /* Make sure the KSE's UTS context is free for use. */ - if (fuword((caddr_t)ke->ke_mailbox + - offsetof(struct kse_mailbox, km_context) + - offsetof(ucontext_t, uc_busy)) != 0) + if (fuword(&ke->ke_mailbox->km_context.uc_busy) != 0) /* * The KSE's UTS context is currently marked busy. This * means the UTS is currently running, so switch to it @@ -597,22 +604,19 @@ struct thread *td, struct trapframe *frame) { int error; - caddr_t ucp; ucontext_t uc; /* * Ensure that we have a spare thread available. */ - if (ke->ke_tdspare == NULL) { + if (ke->ke_tdspare == NULL) ke->ke_tdspare = thread_alloc(); - } /* * Bound threads need no additional work. */ - if ((td->td_flags & TDF_UNBOUND) == 0) { + if ((td->td_flags & TDF_UNBOUND) == 0) return (0); - } error = 0; /* @@ -639,9 +643,8 @@ /* * Fetch the current UTS context from userland. */ - ucp = (caddr_t)ke->ke_mailbox + - offsetof(struct kse_mailbox, km_context); - error = copyin(ucp, &uc, sizeof(ucontext_t)); + error = copyin(&ke->ke_mailbox->km_context, &uc, + sizeof(ucontext_t)); if (error) /* * Failing to do the KSE operation just defaults @@ -655,8 +658,15 @@ * * XXX - Add the busy marker to thread_setcontext(). */ - thread_setcontext(td, &uc); - suword(ucp + offsetof(ucontext_t, uc_busy), (intptr_t)td); + error = thread_setcontext(td, &uc); + if (error) + /* + * Failing to do the KSE operation just defaults + * back to synchonous operation, so just return from + * the syscall. + */ + goto cont; + suword(&ke->ke_mailbox->km_context.uc_busy, (intptr_t)td); /* * Set state and mailbox. ==== //depot/projects/kse/sys/sys/proc.h#124 (text+ko) ==== @@ -372,7 +372,7 @@ KES_UNQUEUED, /* in transit */ KES_THREAD /* slaved to thread state */ } ke_state; /* (j) S* process status. */ - void *ke_mailbox; /* the userland mailbox address */ + struct kse_mailbox *ke_mailbox; /* the userland mailbox address */ struct thread *ke_tdspare; /* spare thread for upcalls */ #define ke_endzero ke_dummy char ke_dummy; ==== //depot/projects/kse/sys/sys/ucontext.h#5 (text+ko) ==== @@ -51,7 +51,11 @@ int uc_flags; #define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ #define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ -#define UCF_SWAPPED 0x00000004 /* Used by swapcontext(3). */ +#define UCF_CLEARSTATE 0x00000004 /* Clear UCF_STATE in setcontext. */ +#define UCF_SWAPPED 0x00000100 /* Used by swapcontext(3). */ +#define UCF_CRITICAL 0x00000200 /* In a critical section. */ +#define UCF_STATE 0x0000ff00 /* State-related flags. */ +#define UCF_OPTIONS 0x000000ff /* Behaviour-related flags. */ int __spare__[4]; } ucontext_t; ==== //depot/projects/kse/tools/KSE/uts/uts.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#2 $ + * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#3 $ */ #include @@ -287,6 +287,10 @@ pfmt("-- uts() scheduling 0x%x--\n", p); pfmt("eip -> 0x%x progress -> %d\n", p->tm_context.uc_mcontext.mc_eip, progress); + if ((p->tm_context.uc_flags & UCF_CRITICAL) == 0) + p->tm_context.uc_flags |= + UCF_CRITICAL | UCF_CLEARSTATE; + uts_mb.km_curthread = p; pstr("curthread set\n"); ret = myswapcontext(&uts_mb.km_context, &p->tm_context, p); @@ -344,7 +348,6 @@ ret = getcontext(oucp); if ((ret == 0) && !(oucp->uc_flags & UCF_SWAPPED)) { oucp->uc_flags |= UCF_SWAPPED; - uts_mb.km_curthread = p; oucp->uc_busy = 0; ret = setcontext(ucp); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 31 15:20:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25BF037B401; Sat, 31 Aug 2002 15:20:11 -0700 (PDT) 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 6DEFC37B400; Sat, 31 Aug 2002 15:20:10 -0700 (PDT) Received: from sccrmhc01.attbi.com (sccrmhc01.attbi.com [204.127.202.61]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6620C43E4A; Sat, 31 Aug 2002 15:20:09 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc01.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020831222008.NAQQ11061.sccrmhc01.attbi.com@InterJet.elischer.org>; Sat, 31 Aug 2002 22:20:08 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id PAA10643; Sat, 31 Aug 2002 15:02:03 -0700 (PDT) Date: Sat, 31 Aug 2002 15:02:02 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16871 for review In-Reply-To: <200208312153.g7VLrYd9023540@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG sounds good, but I'd apreciate a 3 or 4 paragraph description of what you are doing as it varies a little from what we discussed.. pitty you aren't in the bay area any more.. A whiteboard would be good... On Sat, 31 Aug 2002, Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16871 > > Change 16871 by mini@mini_stylus on 2002/08/31 14:53:33 > > - Make ke_mailbox a pointer to the right type, so we can use -> > instead of offsetof() to perform address calculations. > - Add a UCF_CRITICAL flag to denote critical sections in a ucontext. > - Split flags in to options and states, and add the option > UCF_CLEARSTATE to request that setcontext() clear the state flags > when entering the context. > - Change the context-switch method from the UTS to a thread to > mark itself as a critical section, swap into the section, and > unset the critical flag at the last moment before jumping into > the new context's code. > > Now we needn't fear entering the kernel at any time during the > UTS's operation, including swapping contexts. > > Affected files ... > > .. //depot/projects/kse/lib/libc/i386/gen/getcontext.S#5 edit > .. //depot/projects/kse/sys/kern/kern_thread.c#95 edit > .. //depot/projects/kse/sys/sys/proc.h#124 edit > .. //depot/projects/kse/sys/sys/ucontext.h#5 edit > .. //depot/projects/kse/tools/KSE/uts/uts.c#3 edit > > Differences ... > > ==== //depot/projects/kse/lib/libc/i386/gen/getcontext.S#5 (text+ko) ==== > > @@ -40,8 +40,14 @@ > #define MC_FP_REGS_OFFSET 96 /* offset to FP regs from mcontext */ > #define MC_FP_CW_OFFSET 96 /* offset to FP control word */ > #define MC_OWNEDFP_OFFSET 88 /* offset to mc_ownedfp from mcontext */ > -#define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ > -#define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ > +#define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ > +#define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ > +#define UCF_CLEARSTATE 0x00000004 /* Clear UCF_STATE in setcontext. */ > +#define UCF_SWAPPED 0x00000100 /* Used by swapcontext(3). */ > +#define UCF_CRITICAL 0x00000200 /* In a critical section. */ > +#define UCF_STATE 0x0000ff00 /* State-related flags. */ > +#define UCF_OPTIONS 0x000000ff /* Behaviour-related flags. */ > + > > /* > * int setcontext(ucontext_t *ucp); > @@ -57,11 +63,11 @@ > cmpl $0, %eax /* check for null pointer */ > jne 1f > movl $-1, %eax > - jmp 7f > + jmp 8f > 1: cmpl $MC_SIZE, UC_MC_LEN_OFFSET(%eax) /* is context valid? */ > je 2f > movl $-1, %eax /* bzzzt, invalid context */ > - jmp 7f > + jmp 8f > 2: testl $UCF_SKIPSIGMASK, UC_FLAGS_OFFSET(%eax) /* Restore sigmask? */ > jnz 3f > PIC_PROLOGUE > @@ -72,7 +78,7 @@ > addl $12, %esp > PIC_EPILOGUE > testl %eax, %eax /* check for error */ > - jnz 7f > + jnz 8f > 3: movl 4(%esp), %edx /* get address of context */ > addl $UC_MC_OFFSET, %edx /* add offset to mcontext */ > movl 4(%edx), %gs > @@ -98,12 +104,15 @@ > movl 44(%edx), %ecx > pushl 68(%edx) /* flags on stack */ > pushl 40(%edx) /* %edx on stack */ > - testl $UCF_OBEYBUSY, MC_FLAGS_OFFSET(%edx) /* set uc_busy? */ > + testl $UCF_CLEARSTATE, MC_FLAGS_OFFSET(%edx) /* clear flag state? */ > jz 6f > + andl $UCF_OPTIONS, MX_FLAGS_OFFSET(%edx) > +6: testl $UCF_OBEYBUSY, MC_FLAGS_OFFSET(%edx) /* set uc_busy? */ > + jz 7f > movl $1, MC_BUSY_OFFSET(%edx) /* set uc_busy */ > -6: popl %edx /* %edx off stack */ > +7: popl %edx /* %edx off stack */ > popf /* flags off stack */ > -7: ret > +8: ret > > /* > * int getcontext(ucontext_t *ucp); > > ==== //depot/projects/kse/sys/kern/kern_thread.c#95 (text+ko) ==== > > @@ -501,6 +501,15 @@ > struct thread *td, struct trapframe *frame) > { > int discard, error; > + struct thread_mailbox *tmp; > + > + /* > + * If we are in a critical section, return to this thread. > + */ > + tmp = (struct thread_mailbox *)fuword(&ke->ke_mailbox->km_curthread); > + if ((tmp != NULL) && > + (fuword(&tmp->tm_context.uc_flags) & UCF_CRITICAL)) > + return (0); > > /* > * Save the thread's context, and link it > @@ -517,7 +526,7 @@ > return (error); > > /* > - * Second, decide whether to perfom an upcall now. > + * Decide whether to perfom an upcall now. > */ > discard = 0; > > @@ -540,9 +549,7 @@ > discard = 1; > > /* Make sure the KSE's UTS context is free for use. */ > - if (fuword((caddr_t)ke->ke_mailbox + > - offsetof(struct kse_mailbox, km_context) + > - offsetof(ucontext_t, uc_busy)) != 0) > + if (fuword(&ke->ke_mailbox->km_context.uc_busy) != 0) > /* > * The KSE's UTS context is currently marked busy. This > * means the UTS is currently running, so switch to it > @@ -597,22 +604,19 @@ > struct thread *td, struct trapframe *frame) > { > int error; > - caddr_t ucp; > ucontext_t uc; > > /* > * Ensure that we have a spare thread available. > */ > - if (ke->ke_tdspare == NULL) { > + if (ke->ke_tdspare == NULL) > ke->ke_tdspare = thread_alloc(); > - } > > /* > * Bound threads need no additional work. > */ > - if ((td->td_flags & TDF_UNBOUND) == 0) { > + if ((td->td_flags & TDF_UNBOUND) == 0) > return (0); > - } > error = 0; > > /* > @@ -639,9 +643,8 @@ > /* > * Fetch the current UTS context from userland. > */ > - ucp = (caddr_t)ke->ke_mailbox + > - offsetof(struct kse_mailbox, km_context); > - error = copyin(ucp, &uc, sizeof(ucontext_t)); > + error = copyin(&ke->ke_mailbox->km_context, &uc, > + sizeof(ucontext_t)); > if (error) > /* > * Failing to do the KSE operation just defaults > @@ -655,8 +658,15 @@ > * > * XXX - Add the busy marker to thread_setcontext(). > */ > - thread_setcontext(td, &uc); > - suword(ucp + offsetof(ucontext_t, uc_busy), (intptr_t)td); > + error = thread_setcontext(td, &uc); > + if (error) > + /* > + * Failing to do the KSE operation just defaults > + * back to synchonous operation, so just return from > + * the syscall. > + */ > + goto cont; > + suword(&ke->ke_mailbox->km_context.uc_busy, (intptr_t)td); > > /* > * Set state and mailbox. > > ==== //depot/projects/kse/sys/sys/proc.h#124 (text+ko) ==== > > @@ -372,7 +372,7 @@ > KES_UNQUEUED, /* in transit */ > KES_THREAD /* slaved to thread state */ > } ke_state; /* (j) S* process status. */ > - void *ke_mailbox; /* the userland mailbox address */ > + struct kse_mailbox *ke_mailbox; /* the userland mailbox address */ > struct thread *ke_tdspare; /* spare thread for upcalls */ > #define ke_endzero ke_dummy > char ke_dummy; > > ==== //depot/projects/kse/sys/sys/ucontext.h#5 (text+ko) ==== > > @@ -51,7 +51,11 @@ > int uc_flags; > #define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ > #define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ > -#define UCF_SWAPPED 0x00000004 /* Used by swapcontext(3). */ > +#define UCF_CLEARSTATE 0x00000004 /* Clear UCF_STATE in setcontext. */ > +#define UCF_SWAPPED 0x00000100 /* Used by swapcontext(3). */ > +#define UCF_CRITICAL 0x00000200 /* In a critical section. */ > +#define UCF_STATE 0x0000ff00 /* State-related flags. */ > +#define UCF_OPTIONS 0x000000ff /* Behaviour-related flags. */ > int __spare__[4]; > } ucontext_t; > > > ==== //depot/projects/kse/tools/KSE/uts/uts.c#3 (text+ko) ==== > > @@ -23,7 +23,7 @@ > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > * SUCH DAMAGE. > * > - * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#2 $ > + * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#3 $ > */ > > #include > @@ -287,6 +287,10 @@ > pfmt("-- uts() scheduling 0x%x--\n", p); > pfmt("eip -> 0x%x progress -> %d\n", > p->tm_context.uc_mcontext.mc_eip, progress); > + if ((p->tm_context.uc_flags & UCF_CRITICAL) == 0) > + p->tm_context.uc_flags |= > + UCF_CRITICAL | UCF_CLEARSTATE; > + uts_mb.km_curthread = p; > pstr("curthread set\n"); > ret = myswapcontext(&uts_mb.km_context, &p->tm_context, > p); > @@ -344,7 +348,6 @@ > ret = getcontext(oucp); > if ((ret == 0) && !(oucp->uc_flags & UCF_SWAPPED)) { > oucp->uc_flags |= UCF_SWAPPED; > - uts_mb.km_curthread = p; > oucp->uc_busy = 0; > ret = setcontext(ucp); > } > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 31 15:48: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 183EC37B401; Sat, 31 Aug 2002 15:47:58 -0700 (PDT) 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 9BAE637B400 for ; Sat, 31 Aug 2002 15:47:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C83443E6E for ; Sat, 31 Aug 2002 15:47:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7VMlvJU033745 for ; Sat, 31 Aug 2002 15:47:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7VMlvjR033742 for perforce@freebsd.org; Sat, 31 Aug 2002 15:47:57 -0700 (PDT) Date: Sat, 31 Aug 2002 15:47:57 -0700 (PDT) Message-Id: <200208312247.g7VMlvjR033742@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16873 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16873 Change 16873 by peter@peter_mckinley on 2002/08/31 15:46:55 fix printf format warnings I added Affected files ... .. //depot/projects/ia64/sys/ia64/acpica/OsdEnvironment.c#4 edit Differences ... ==== //depot/projects/ia64/sys/ia64/acpica/OsdEnvironment.c#4 (text+ko) ==== @@ -55,10 +55,10 @@ { if (ia64_efi_acpi20_table) { -printf("ACPI 2.0 table at %p\n", ia64_efi_acpi20_table); +printf("ACPI 2.0 table at 0x%lx\n", ia64_efi_acpi20_table); } if (ia64_efi_acpi_table) { -printf("ACPI 1.x table at %p\n", ia64_efi_acpi_table); +printf("ACPI 1.x table at 0x%lx\n", ia64_efi_acpi_table); } if (ia64_efi_acpi20_table) { printf("Using ACPI2.0 table\n"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 31 15:59:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87C1937B401; Sat, 31 Aug 2002 15:59:45 -0700 (PDT) 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 0210337B400 for ; Sat, 31 Aug 2002 15:59:45 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9334343E72 for ; Sat, 31 Aug 2002 15:59:44 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 6D883AE211; Sat, 31 Aug 2002 15:59:44 -0700 (PDT) Date: Sat, 31 Aug 2002 15:59:44 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16871 for review Message-ID: <20020831225944.GR3751@elvis.mu.org> References: <200208312153.g7VLrYd9023540@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > sounds good, but I'd apreciate a 3 or 4 paragraph description of what you > are doing as it varies a little from what we discussed.. > > pitty you aren't in the bay area any more.. > A whiteboard would be good... Yeah. Whiteboards are nice. Again, from the top: The kse_mailbox and thread_mailboxe maintain a ucontext_t. This ucontext_t has a bit of optional behaviour, which does this: - SKIPSIGMASK skips the signal mask get/sets, so that we can swapcontext() w/o making any syscalls. Also, caught signals will be handled via an upcall to the UTS later. - OBEYBUSY which makes setcontext() fail if uc_busy is set. By now, I'm thinking we might not need this. - CLEARSTATE, which requests that setcontext() clear any state flags. The state flags are: - CRITICAL: in a critical section. This causes thread_userret() to return to the thread instead of doing an upcall, basically enforsing synchronous syscalls for that thread for that time period. CRITICAL on the UTS's context isn't honored. It's assumed that a uc_busy uts context is also CRITICAL. - SWAPPED: used by swapcontext() isntead of the int swapped on the stack. I think this is kind of broken at the moment. The reason for this is related to objections by jake (among others) about using the stack during swapcontext(). uc_busy is a seperate int because it needs to be set/checked atmoically. These are optional so that default *context functions work just like they do on solaris or wherever. So, the way a thread is scheduled is like this: 1) An upcall is made, doing a thread_setcontext() on the ucontext_t in the kse_maibox in userland. 2) The UTS comes out of the state in the ucontext_t, either from the inital state set by makecontext() or the state saved the last time it swapcontext()'d out. 3) The UTS checks for any threads in the completed list, and adds them to the run queue. 4) The UTS grabs a thread from the run queue. 5) We know the thread wasn't in a CRITICAL state already, or it wouldn't have been passed in via the upcall, so we don't have to worry about stomping on the changes to CRITICAL made by the thread itself. We set CRITICAL and CLEARSTATE on it. 6) We set kse_mailbox.km_curthread to the thread_mailbox we selected. 7) We swapcontext() into the thread's ucontext_t: a) we getcontext() for the UTS context. b) then, we mark uc_busy 0, freeing the UTS for further calls. However, at this point, we are seen by the kernel as in a critical section for the thread we're about to switch to, so any traps in the kernel (such as syscalls) will return to us instead of doing another upcall. c) we setcontext() to the thread's ucontext_t, which restores machine state, and clears the CRITICAL flag because it sees CLEARSTATE set. 8) execution continues as the scheduled thread. Upon reviewing this, I see that CLEARSTATE needs to be a flag, not an option, so that it is also cleared when setcontext clears the CRITICAL flag. So, I guess the right terminoligy would be persistent/temporary, and not option/flag. My current plan is that signals will work like this: 1) The process will request signal delivery via the uts. 2) A catchable signal is delivered to the process and added to a sigset kept in the kse_mailbox. 1) An upcall is made to notify the UTS of the signal. 2) The uts sees the signals caught thus far, and selects a thread to receive the signal. 3) It adds a signal frame to the context of the thread by calling signalcontext(), which will do the same thing the kernel does to a ucontext_t when delivering a signal to a process on that arch. 4) It adds the signal to the runqueue, and it gets scheduled normally. Signals are a bit more complex than that, because of sigaltstack, and a few other complications, but you get the basic idea. I hope all of that is clear. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 31 19:37:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A929637B401; Sat, 31 Aug 2002 19:37:37 -0700 (PDT) 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 5C7EE37B400 for ; Sat, 31 Aug 2002 19:37:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0AD5A43E75 for ; Sat, 31 Aug 2002 19:37:37 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g812baJU074818 for ; Sat, 31 Aug 2002 19:37:36 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g812bant074815 for perforce@freebsd.org; Sat, 31 Aug 2002 19:37:36 -0700 (PDT) Date: Sat, 31 Aug 2002 19:37:36 -0700 (PDT) Message-Id: <200209010237.g812bant074815@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16879 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16879 Change 16879 by mini@mini_stylus on 2002/08/31 19:37:11 Make UCF_CLEARSTATE clear itself, but not UCF_SWAPPED. Affected files ... .. //depot/projects/kse/lib/libc/i386/gen/getcontext.S#6 edit .. //depot/projects/kse/sys/kern/kern_thread.c#96 edit .. //depot/projects/kse/sys/sys/ucontext.h#6 edit Differences ... ==== //depot/projects/kse/lib/libc/i386/gen/getcontext.S#6 (text+ko) ==== @@ -40,13 +40,14 @@ #define MC_FP_REGS_OFFSET 96 /* offset to FP regs from mcontext */ #define MC_FP_CW_OFFSET 96 /* offset to FP control word */ #define MC_OWNEDFP_OFFSET 88 /* offset to mc_ownedfp from mcontext */ -#define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ -#define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ -#define UCF_CLEARSTATE 0x00000004 /* Clear UCF_STATE in setcontext. */ -#define UCF_SWAPPED 0x00000100 /* Used by swapcontext(3). */ -#define UCF_CRITICAL 0x00000200 /* In a critical section. */ -#define UCF_STATE 0x0000ff00 /* State-related flags. */ -#define UCF_OPTIONS 0x000000ff /* Behaviour-related flags. */ +#define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ +#define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ +#define UCF_SWAPPED 0x00000080 /* Used by swapcontext(3). */ +#define UCF_CRITICAL 0x00000200 /* In a critical section. */ +#define UCF_CLEARSTATE 0x00000400 /* Clear UCF_STATE in setcontext. */ +#define UCF_STATE 0x0000ff00 /* State-related flags. */ +#define UCF_OPTIONS 0x000000ff /* Behaviour-related flags. */ + /* @@ -106,7 +107,7 @@ pushl 40(%edx) /* %edx on stack */ testl $UCF_CLEARSTATE, MC_FLAGS_OFFSET(%edx) /* clear flag state? */ jz 6f - andl $UCF_OPTIONS, MX_FLAGS_OFFSET(%edx) + andl $UCF_OPTIONS, MC_FLAGS_OFFSET(%edx) 6: testl $UCF_OBEYBUSY, MC_FLAGS_OFFSET(%edx) /* set uc_busy? */ jz 7f movl $1, MC_BUSY_OFFSET(%edx) /* set uc_busy */ ==== //depot/projects/kse/sys/kern/kern_thread.c#96 (text+ko) ==== @@ -503,13 +503,16 @@ int discard, error; struct thread_mailbox *tmp; + printf("consider - "); /* * If we are in a critical section, return to this thread. */ tmp = (struct thread_mailbox *)fuword(&ke->ke_mailbox->km_curthread); if ((tmp != NULL) && - (fuword(&tmp->tm_context.uc_flags) & UCF_CRITICAL)) + (fuword(&tmp->tm_context.uc_flags) & UCF_CRITICAL)) { + printf("CRITICAL - "); return (0); + } /* * Save the thread's context, and link it @@ -522,8 +525,10 @@ * Failing to do the KSE operation just defaults * back to synchonous operation, so just return from * the syscall. - */ + */{ + printf("error - "); return (error); + } /* * Decide whether to perfom an upcall now. @@ -545,9 +550,10 @@ * What is OUR priority? The priority of the highest * sycall waiting to be returned? * For now, just let another KSE run (easiest). - */ + */ { + printf("runq - "); discard = 1; - + } /* Make sure the KSE's UTS context is free for use. */ if (fuword(&ke->ke_mailbox->km_context.uc_busy) != 0) /* @@ -555,8 +561,9 @@ * means the UTS is currently running, so switch to it * instead of performing another upcall (abandon this * thread). - */ - discard = 1; + */ { + printf("busy - "); + discard = 1; } /* Discard thread or mark for upcall. */ if (discard) { @@ -572,6 +579,7 @@ * the next upcall to any KSE in this KSEG. * */ + printf("discard\n"); PROC_LOCK(p); mtx_lock_spin(&sched_lock); thread_exit(); /* Abandon current thread. */ @@ -606,17 +614,22 @@ int error; ucontext_t uc; + printf("thread_userret - "); /* * Ensure that we have a spare thread available. */ - if (ke->ke_tdspare == NULL) + if (ke->ke_tdspare == NULL) { + printf("thread_alloc - "); ke->ke_tdspare = thread_alloc(); + } /* * Bound threads need no additional work. */ - if ((td->td_flags & TDF_UNBOUND) == 0) + if ((td->td_flags & TDF_UNBOUND) == 0) { + printf("bound\n"); return (0); + } error = 0; /* @@ -639,6 +652,7 @@ */ CTR3(KTR_PROC, "userret: upcall thread %p (pid %d, %s)", td, p->p_pid, p->p_comm); + printf("upcall - "); /* * Fetch the current UTS context from userland. @@ -683,6 +697,7 @@ * we are committing to go to user space as as this KSE here. */ td->td_flags &= ~TDF_UNBOUND; /* Bind to this user thread. */ + printf("binding\n"); return (error); } ==== //depot/projects/kse/sys/sys/ucontext.h#6 (text+ko) ==== @@ -51,9 +51,9 @@ int uc_flags; #define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ #define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ -#define UCF_CLEARSTATE 0x00000004 /* Clear UCF_STATE in setcontext. */ -#define UCF_SWAPPED 0x00000100 /* Used by swapcontext(3). */ +#define UCF_SWAPPED 0x00000080 /* Used by swapcontext(3). */ #define UCF_CRITICAL 0x00000200 /* In a critical section. */ +#define UCF_CLEARSTATE 0x00000400 /* Clear UCF_STATE in setcontext. */ #define UCF_STATE 0x0000ff00 /* State-related flags. */ #define UCF_OPTIONS 0x000000ff /* Behaviour-related flags. */ int __spare__[4]; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 31 19:39:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB0F137B401; Sat, 31 Aug 2002 19:39:40 -0700 (PDT) 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 6DFAA37B400 for ; Sat, 31 Aug 2002 19:39:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D57943E3B for ; Sat, 31 Aug 2002 19:39:40 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g812ddJU074976 for ; Sat, 31 Aug 2002 19:39:39 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g812ddXj074973 for perforce@freebsd.org; Sat, 31 Aug 2002 19:39:39 -0700 (PDT) Date: Sat, 31 Aug 2002 19:39:39 -0700 (PDT) Message-Id: <200209010239.g812ddXj074973@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16880 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16880 Change 16880 by mini@mini_stylus on 2002/08/31 19:39:07 Revert previous change (accidentally committed). Affected files ... .. //depot/projects/kse/sys/kern/kern_thread.c#97 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#97 (text+ko) ==== @@ -1,3 +1,4 @@ +//depot/projects/kse/sys/kern/kern_thread.c#95 - edit change 16871 (text+ko) /* * Copyright (C) 2001 Julian Elischer . * All rights reserved. @@ -503,16 +504,13 @@ int discard, error; struct thread_mailbox *tmp; - printf("consider - "); /* * If we are in a critical section, return to this thread. */ tmp = (struct thread_mailbox *)fuword(&ke->ke_mailbox->km_curthread); if ((tmp != NULL) && - (fuword(&tmp->tm_context.uc_flags) & UCF_CRITICAL)) { - printf("CRITICAL - "); + (fuword(&tmp->tm_context.uc_flags) & UCF_CRITICAL)) return (0); - } /* * Save the thread's context, and link it @@ -525,10 +523,8 @@ * Failing to do the KSE operation just defaults * back to synchonous operation, so just return from * the syscall. - */{ - printf("error - "); + */ return (error); - } /* * Decide whether to perfom an upcall now. @@ -550,10 +546,9 @@ * What is OUR priority? The priority of the highest * sycall waiting to be returned? * For now, just let another KSE run (easiest). - */ { - printf("runq - "); + */ discard = 1; - } + /* Make sure the KSE's UTS context is free for use. */ if (fuword(&ke->ke_mailbox->km_context.uc_busy) != 0) /* @@ -561,9 +556,8 @@ * means the UTS is currently running, so switch to it * instead of performing another upcall (abandon this * thread). - */ { - printf("busy - "); - discard = 1; } + */ + discard = 1; /* Discard thread or mark for upcall. */ if (discard) { @@ -579,7 +573,6 @@ * the next upcall to any KSE in this KSEG. * */ - printf("discard\n"); PROC_LOCK(p); mtx_lock_spin(&sched_lock); thread_exit(); /* Abandon current thread. */ @@ -614,22 +607,17 @@ int error; ucontext_t uc; - printf("thread_userret - "); /* * Ensure that we have a spare thread available. */ - if (ke->ke_tdspare == NULL) { - printf("thread_alloc - "); + if (ke->ke_tdspare == NULL) ke->ke_tdspare = thread_alloc(); - } /* * Bound threads need no additional work. */ - if ((td->td_flags & TDF_UNBOUND) == 0) { - printf("bound\n"); + if ((td->td_flags & TDF_UNBOUND) == 0) return (0); - } error = 0; /* @@ -652,7 +640,6 @@ */ CTR3(KTR_PROC, "userret: upcall thread %p (pid %d, %s)", td, p->p_pid, p->p_comm); - printf("upcall - "); /* * Fetch the current UTS context from userland. @@ -697,7 +684,6 @@ * we are committing to go to user space as as this KSE here. */ td->td_flags &= ~TDF_UNBOUND; /* Bind to this user thread. */ - printf("binding\n"); return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Aug 31 19:45:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7975137B401; Sat, 31 Aug 2002 19:45:49 -0700 (PDT) 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 082FD37B400 for ; Sat, 31 Aug 2002 19:45:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A6D0B43E4A for ; Sat, 31 Aug 2002 19:45:48 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g812jmJU075775 for ; Sat, 31 Aug 2002 19:45:48 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g812jmxA075772 for perforce@freebsd.org; Sat, 31 Aug 2002 19:45:48 -0700 (PDT) Date: Sat, 31 Aug 2002 19:45:48 -0700 (PDT) Message-Id: <200209010245.g812jmxA075772@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16882 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16882 Change 16882 by mini@mini_stylus on 2002/08/31 19:44:50 Fix botch in previous revert. Affected files ... .. //depot/projects/kse/sys/kern/kern_thread.c#98 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#98 (text+ko) ==== @@ -1,4 +1,3 @@ -//depot/projects/kse/sys/kern/kern_thread.c#95 - edit change 16871 (text+ko) /* * Copyright (C) 2001 Julian Elischer . * All rights reserved. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 1 0:12:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97D8E37B40F; Sun, 1 Sep 2002 00:12:41 -0700 (PDT) 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 81F3B37B40E for ; Sun, 1 Sep 2002 00:12:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F21E43E77 for ; Sun, 1 Sep 2002 00:12:39 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g817CdJU021826 for ; Sun, 1 Sep 2002 00:12:39 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g817CcoZ021823 for perforce@freebsd.org; Sun, 1 Sep 2002 00:12:38 -0700 (PDT) Date: Sun, 1 Sep 2002 00:12:38 -0700 (PDT) Message-Id: <200209010712.g817CcoZ021823@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16888 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16888 Change 16888 by mini@mini_stylus on 2002/09/01 00:11:59 Add cpu_set_upcall() back, which we need to initialize the pcb and initial trampoline for a kernel thread. Affected files ... .. //depot/projects/kse/sys/kern/kern_thread.c#99 edit .. //depot/projects/kse/sys/sys/proc.h#125 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#99 (text+ko) ==== @@ -462,6 +462,7 @@ CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", td, td->td_proc->p_pid, td->td_proc->p_comm); thread_link(td2, ke->ke_ksegrp); + cpu_set_upcall(td2, td->td_pcb); /* * The user context for this thread is selected when we choose * a KSE and return to userland on it. All we need do here is ==== //depot/projects/kse/sys/sys/proc.h#125 (text+ko) ==== @@ -834,6 +834,7 @@ /* New in KSE. */ struct thread *thread_alloc(void); void thread_free(struct thread *td); +void cpu_set_upcall(struct thread *td, void *pcb); void cpu_thread_exit(struct thread *); void cpu_thread_setup(struct thread *td); void kse_reassign(struct kse *ke); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 1 0:24: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D27E37B401; Sun, 1 Sep 2002 00:23:54 -0700 (PDT) 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 E6E5F37B400 for ; Sun, 1 Sep 2002 00:23:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88D8043E6E for ; Sun, 1 Sep 2002 00:23:53 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g817NrJU024465 for ; Sun, 1 Sep 2002 00:23:53 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g817Nrm3024462 for perforce@freebsd.org; Sun, 1 Sep 2002 00:23:53 -0700 (PDT) Date: Sun, 1 Sep 2002 00:23:53 -0700 (PDT) Message-Id: <200209010723.g817Nrm3024462@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16890 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16890 Change 16890 by mini@mini_stylus on 2002/09/01 00:22:54 Add cpu_set_upcall() back, which we need to initialize the pcb and inital trampoline for a kernel thread. Affected files ... .. //depot/projects/kse/sys/i386/i386/vm_machdep.c#63 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#63 (text+ko) ==== @@ -307,10 +307,66 @@ td->td_frame = (struct trapframe *)((caddr_t)td->td_pcb - 16) - 1; } -struct md_store { - struct pcb mds_pcb; - struct trapframe mds_frame; -}; +/* + * Initialize machine state (pcb and trap frame) for a new thread about to + * upcall. + */ +void +cpu_set_upcall(struct thread *td, void *pcb) +{ + struct pcb *pcb2; + + td->td_flags |= TDF_UPCALLING; + + /* Point the pcb to the top of the stack. */ + pcb2 = td->td_pcb; + + /* + * Copy the upcall pcb. This loads kernel regs. + * Those not loaded individually below get their default + * values here. + * + * XXXKSE It might be a good idea to simply skip this as + * the values of the other registers may be unimportant. + * This would remove any requirement for knowing the KSE + * at this time (see the matching comment below for + * more analysis) (need a good safe default). + */ + bcopy(pcb, pcb2, sizeof(*pcb2)); + + /* + * Create a new fresh stack for the new thread. + * The -16 is so we can expand the trapframe if we go to vm86. + * Don't forget to set this stack value into whatever supplies + * the address for the fault handlers. + * The contexts are filled in at the time we actually DO the + * upcall as only then do we know which KSE we got. + */ + td->td_frame = (struct trapframe *)((caddr_t)pcb2 - 16) - 1; + + /* + * Set registers for trampoline to user mode. Leave space for the + * return address on stack. These are the kernel mode register values. + */ + pcb2->pcb_cr3 = vtophys(vmspace_pmap(td->td_proc->p_vmspace)->pm_pdir); + pcb2->pcb_edi = 0; + pcb2->pcb_esi = (int)fork_return; /* trampoline arg */ + pcb2->pcb_ebp = 0; + pcb2->pcb_esp = (int)td->td_frame - sizeof(void *); /* trampoline arg */ + pcb2->pcb_ebx = (int)td; /* trampoline arg */ + pcb2->pcb_eip = (int)fork_trampoline; + pcb2->pcb_psl &= ~(PSL_I); /* interrupts must be disabled */ + /* + * If we didn't copy the pcb, we'd need to do the following registers: + * pcb2->pcb_dr*: cloned above. + * pcb2->pcb_savefpu: cloned above. + * pcb2->pcb_flags: cloned above. + * pcb2->pcb_onfault: cloned above (always NULL here?). + * pcb2->pcb_gs: cloned above. XXXKSE ??? + * pcb2->pcb_ext: cleared below. + */ + pcb2->pcb_ext = NULL; +} void cpu_wait(p) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 1 1:21:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BACCA37B401; Sun, 1 Sep 2002 01:21:09 -0700 (PDT) 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 3C9AB37B400 for ; Sun, 1 Sep 2002 01:21:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E24ED43E3B for ; Sun, 1 Sep 2002 01:21:08 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g818L8JU034287 for ; Sun, 1 Sep 2002 01:21:08 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g818L8Xa034277 for perforce@freebsd.org; Sun, 1 Sep 2002 01:21:08 -0700 (PDT) Date: Sun, 1 Sep 2002 01:21:08 -0700 (PDT) Message-Id: <200209010821.g818L8Xa034277@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16894 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16894 Change 16894 by mini@mini_stylus on 2002/09/01 01:20:50 - Remove myswapcontext(). Start using the one from libc again. - Add macros to wrap debugging output from the UTS, and disable the output. - Add a thread that continiously performs a trivial syscall. Affected files ... .. //depot/projects/kse/tools/KSE/uts/uts.c#4 edit Differences ... ==== //depot/projects/kse/tools/KSE/uts/uts.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#3 $ + * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#4 $ */ #include @@ -39,6 +39,16 @@ #include #include +#ifdef TRACE_UTS +#define UPFMT(fmt...) pfmt(#fmt) +#define UPSTR(s) pstr(s) +#define UPCHAR(c) pchar(s) +#else +#define UPFMT(fmt...) /* Nothing. */ +#define UPSTR(s) /* Nothing. */ +#define UPCHAR(c) /* Nothing. */ +#endif + #define MAIN_STACK_SIZE (1024 * 1024) #define THREAD_STACK_SIZE (32 * 1024) @@ -56,9 +66,6 @@ static void thread_start(const void *func); static void uts(void); -static int myswapcontext(ucontext_t *oucp, const ucontext_t *ucp, - struct thread_mailbox *p); - void aaaa(void) { @@ -69,6 +76,12 @@ } } +void +spin(void) +{ + for (;;) sched_yield(); +} + /* * Test Userland Thread Scheduler (UTS) suite for KSE. */ @@ -77,14 +90,15 @@ { int i; - pfmt("ofs: %d\n", offsetof(ucontext_t, uc_flags) - offsetof(ucontext_t, uc_mcontext)); - //thread_start(aaaa); + thread_start(aaaa); + thread_start(spin); init_uts(); - for (i = 0;i < 5;i++) { - pfmt("main(): %d\n", i); - sleep(2); + for (i = 0;1;i++) { + progress++; + pchar('a' + (i % 26)); + sleep(5); } - pstr("** main() exiting **\n"); + pstr("\n** main() exiting **\n"); return (EX_OK); } @@ -261,9 +275,9 @@ struct thread_mailbox *tm, *p; int ret; - pstr("\n--uts() start--\n"); + UPSTR("\n--uts() start--\n"); for (;;) { - pfmt("km_curthread -> 0x%x\n", uts_mb.km_curthread); + UPFMT("km_curthread -> 0x%x\n", uts_mb.km_curthread); /* * Insert any processes back from being blocked @@ -271,30 +285,29 @@ */ p = uts_mb.km_completed; uts_mb.km_completed = NULL; - pfmt("km_completed -> 0x%x", p); + UPFMT("km_completed -> 0x%x", p); while ((tm = p) != NULL) { p = tm->tm_next; - pfmt(" 0x%x", p); + UPFMT(" 0x%x", p); runq_insert(tm); } - pchar('\n'); + UPCHAR('\n'); /* * Pull a process off the run queue. */ p = runq_remove(); if (p != NULL) { - pfmt("-- uts() scheduling 0x%x--\n", p); - pfmt("eip -> 0x%x progress -> %d\n", + UPFMT("\n-- uts() scheduling 0x%x--\n", p); + UPFMT("eip -> 0x%x progress -> %d\n", p->tm_context.uc_mcontext.mc_eip, progress); if ((p->tm_context.uc_flags & UCF_CRITICAL) == 0) p->tm_context.uc_flags |= UCF_CRITICAL | UCF_CLEARSTATE; uts_mb.km_curthread = p; - pstr("curthread set\n"); - ret = myswapcontext(&uts_mb.km_context, &p->tm_context, - p); - pfmt("\n-- uts() back from swapcontext() [%d] --\n", + UPSTR("curthread set\n"); + ret = swapcontext(&uts_mb.km_context, &p->tm_context); + UPFMT("\n-- uts() back from swapcontext() [%d] --\n", ret); if (ret) /* @@ -327,29 +340,3 @@ tm->tm_context.uc_flags = UCF_SKIPSIGMASK | UCF_OBEYBUSY; runq_insert(tm); } - -static int -myswapcontext(ucontext_t *oucp, const ucontext_t *ucp, struct thread_mailbox *p) -{ - int ret; - - pfmt("msctx(%x,%x,%x) - %d %d, %x %x, %x %x\n", oucp, ucp, p, - oucp->uc_mcontext.mc_len, ucp->uc_mcontext.mc_len, - oucp->uc_busy, ucp->uc_busy, - oucp->uc_flags, ucp->uc_flags); - if ((oucp == NULL) || - (oucp->uc_mcontext.mc_len != sizeof(mcontext_t)) || - (ucp == NULL) || - (ucp->uc_mcontext.mc_len != sizeof(mcontext_t))) { - pstr("msctx: EINVAL\n"); - return (-1); - } - oucp->uc_flags &= ~UCF_SWAPPED; - ret = getcontext(oucp); - if ((ret == 0) && !(oucp->uc_flags & UCF_SWAPPED)) { - oucp->uc_flags |= UCF_SWAPPED; - oucp->uc_busy = 0; - ret = setcontext(ucp); - } - return (ret); -} To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 1 1:58: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 347B537B401; Sun, 1 Sep 2002 01:57:55 -0700 (PDT) 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 CD29437B400 for ; Sun, 1 Sep 2002 01:57:54 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90B3843E6A for ; Sun, 1 Sep 2002 01:57:53 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g818vrJU037436 for ; Sun, 1 Sep 2002 01:57:53 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g818vrMi037433 for perforce@freebsd.org; Sun, 1 Sep 2002 01:57:53 -0700 (PDT) Date: Sun, 1 Sep 2002 01:57:53 -0700 (PDT) Message-Id: <200209010857.g818vrMi037433@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16895 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16895 Change 16895 by mini@mini_stylus on 2002/09/01 01:57:00 Don't spin. Affected files ... .. //depot/projects/kse/tools/KSE/uts/uts.c#5 edit Differences ... ==== //depot/projects/kse/tools/KSE/uts/uts.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#4 $ + * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#5 $ */ #include @@ -91,7 +91,7 @@ int i; thread_start(aaaa); - thread_start(spin); + // thread_start(spin); init_uts(); for (i = 0;1;i++) { progress++; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 1 2: 0: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C65B37B401; Sun, 1 Sep 2002 01:59:57 -0700 (PDT) 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 C79C037B400 for ; Sun, 1 Sep 2002 01:59:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 895EC43E65 for ; Sun, 1 Sep 2002 01:59:56 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g818xuJU037565 for ; Sun, 1 Sep 2002 01:59:56 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g818xuUZ037562 for perforce@freebsd.org; Sun, 1 Sep 2002 01:59:56 -0700 (PDT) Date: Sun, 1 Sep 2002 01:59:56 -0700 (PDT) Message-Id: <200209010859.g818xuUZ037562@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16896 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16896 Change 16896 by mini@mini_stylus on 2002/09/01 01:59:23 Save UTS context in kse_yield(2) and clear uc_busy, so that other upcall may take place later on. Affected files ... .. //depot/projects/kse/sys/kern/kern_proc.c#80 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_proc.c#80 (text+ko) ==== @@ -279,12 +279,29 @@ int kse_yield(struct thread *td, struct kse_yield_args *uap) { + int error; + ucontext_t uc; + struct kse *ke; + /* Save UTS context. */ + ke = td->td_kse; + if (ke == NULL) + return (EFAULT); + error = copyin(&ke->ke_mailbox->km_context, &uc, sizeof(ucontext_t)); + if (error) + return (error); + thread_getcontext(td, &uc); + uc.uc_busy = 0; + error = copyout(&uc, &ke->ke_mailbox->km_context, sizeof(ucontext_t)); + if (error) + return (error); + + /* Abandon thread. */ PROC_LOCK(td->td_proc); mtx_lock_spin(&sched_lock); thread_exit(); /* NOTREACHED */ - return(0); + return (0); } int kse_wakeup(struct thread *td, struct kse_wakeup_args *uap) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 1 12:50: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42C4637B401; Sun, 1 Sep 2002 12:49:56 -0700 (PDT) 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 A9A0837B400 for ; Sun, 1 Sep 2002 12:49:55 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76C4F43E4A for ; Sun, 1 Sep 2002 12:49:55 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 57AD5AE211; Sun, 1 Sep 2002 12:49:55 -0700 (PDT) Date: Sun, 1 Sep 2002 12:49:55 -0700 From: Jonathan Mini To: Perforce Change Reviews Subject: Re: PERFORCE change 16896 for review Message-ID: <20020901194955.GV3751@elvis.mu.org> References: <200209010859.g818xuUZ037562@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200209010859.g818xuUZ037562@freefall.freebsd.org> User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jonathan Mini [mini@FreeBSD.org] wrote : > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16896 > > Change 16896 by mini@mini_stylus on 2002/09/01 01:59:23 > > Save UTS context in kse_yield(2) and clear uc_busy, so that > other upcall may take place later on. This seems to be the last piece required to make the ucontext_t changes work. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 1 17:12: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37FD337B401; Sun, 1 Sep 2002 17:11:56 -0700 (PDT) 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 CEAE337B400 for ; Sun, 1 Sep 2002 17:11:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D3C743E65 for ; Sun, 1 Sep 2002 17:11:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g820BtJU068582 for ; Sun, 1 Sep 2002 17:11:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g820Btep068579 for perforce@freebsd.org; Sun, 1 Sep 2002 17:11:55 -0700 (PDT) Date: Sun, 1 Sep 2002 17:11:55 -0700 (PDT) Message-Id: <200209020011.g820Btep068579@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16925 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16925 Change 16925 by peter@peter_mckinley on 2002/09/01 17:11:54 Still dont know why interrupts only go to cpu 0. I tried this but it doesn't seem to make any difference. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#46 edit .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#21 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#46 (text+ko) ==== @@ -732,6 +732,7 @@ breakpoint(); } #endif + ia64_set_tpr(0); } int ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#21 (text+ko) ==== @@ -120,6 +120,7 @@ /* kick off the clock on this AP */ ia64_set_itm(ia64_get_itc() + itm_reload); ia64_set_itv(255); + ia64_set_tpr(0); cpu_throw(); panic("ia64_ap_startup: cpu_throw() returned"); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 1 17:13: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 075EF37B401; Sun, 1 Sep 2002 17:12:58 -0700 (PDT) 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 B2CE137B400 for ; Sun, 1 Sep 2002 17:12:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BB1243E6E for ; Sun, 1 Sep 2002 17:12:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g820CvJU068939 for ; Sun, 1 Sep 2002 17:12:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g820Cv1X068936 for perforce@freebsd.org; Sun, 1 Sep 2002 17:12:57 -0700 (PDT) Date: Sun, 1 Sep 2002 17:12:57 -0700 (PDT) Message-Id: <200209020012.g820Cv1X068936@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16926 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16926 Change 16926 by peter@peter_mckinley on 2002/09/01 17:12:45 turn off smp on I3 kernel Affected files ... .. //depot/projects/ia64/sys/ia64/conf/I3#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/I3#3 (text+ko) ==== @@ -32,7 +32,7 @@ options CONSPEED=115200 #options GEOM -options SMP +#options SMP options DDB options INVARIANTS options INVARIANT_SUPPORT To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 1 17:14: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9E2237B405; Sun, 1 Sep 2002 17:13:59 -0700 (PDT) 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 6B19E37B401 for ; Sun, 1 Sep 2002 17:13:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A6D343E75 for ; Sun, 1 Sep 2002 17:13:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g820DxJU069183 for ; Sun, 1 Sep 2002 17:13:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g820Dwgg069179 for perforce@freebsd.org; Sun, 1 Sep 2002 17:13:58 -0700 (PDT) Date: Sun, 1 Sep 2002 17:13:58 -0700 (PDT) Message-Id: <200209020013.g820Dwgg069179@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16927 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16927 Change 16927 by peter@peter_mckinley on 2002/09/01 17:13:09 tidy up and remove mpt from I2 kernel for now Affected files ... .. //depot/projects/ia64/sys/ia64/conf/I2#4 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/I2#4 (text+ko) ==== @@ -5,9 +5,6 @@ ident I2 maxusers 32 -#To statically compile in device wiring instead of /boot/device.hints -#hints "I2.hints" - makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions NO_CPU_COPTFLAGS=true #Ignore any x86 CPUTYPE @@ -53,7 +50,7 @@ device pass device isp #device sym -device mpt +#device mpt # ATA and ATAPI devices #device ata To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 1 17:14:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 019E137B401; Sun, 1 Sep 2002 17:14:01 -0700 (PDT) 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 1C14F37B412 for ; Sun, 1 Sep 2002 17:14:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8789D43E75 for ; Sun, 1 Sep 2002 17:13:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g820DxJU069190 for ; Sun, 1 Sep 2002 17:13:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g820DxTF069187 for perforce@freebsd.org; Sun, 1 Sep 2002 17:13:59 -0700 (PDT) Date: Sun, 1 Sep 2002 17:13:59 -0700 (PDT) Message-Id: <200209020013.g820DxTF069187@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16928 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16928 Change 16928 by peter@peter_mckinley on 2002/09/01 17:13:57 Fix up warning printfs, some of these are 64 bit time_t related. Affected files ... .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#10 edit .. //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#4 edit .. //depot/projects/ia64/sys/ia64/ia64/clock.c#9 edit .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#11 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#10 (text+ko) ==== @@ -216,8 +216,8 @@ AcpiFormatException(status)); /* this is not fatal, since it may be hardwired */ } - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "got %d bytes for %s._CRS\n", crsbuf.Length, acpi_name(lnkdev))); - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "got %d bytes for %s._PRS\n", prsbuf.Length, acpi_name(lnkdev))); + ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "got %ld bytes for %s._CRS\n", crsbuf.Length, acpi_name(lnkdev))); + ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "got %ld bytes for %s._PRS\n", prsbuf.Length, acpi_name(lnkdev))); /* * The interrupt may already be routed, so check _CRS first. We don't check the ==== //depot/projects/ia64/sys/dev/acpica/acpi_resource.c#4 (text+ko) ==== @@ -87,7 +87,7 @@ acpi_name(handle), AcpiFormatException(status)); return_ACPI_STATUS(status); } - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s - got %d bytes of resources\n", + ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "%s - got %ld bytes of resources\n", acpi_name(handle), buf.Length)); set->set_init(dev, &context); ==== //depot/projects/ia64/sys/ia64/ia64/clock.c#9 (text+ko) ==== @@ -353,7 +353,7 @@ deltat = -deltat; if (deltat < 2 * SECDAY) return; - printf("WARNING: clock %s %d days", + printf("WARNING: clock %s %ld days", ts.tv_sec < base ? "lost" : "gained", deltat / SECDAY); } bad: ==== //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#11 (text+ko) ==== @@ -473,8 +473,8 @@ if (collectsnapstats && starttime.tv_sec > 0) { nanotime(&endtime); timespecsub(&endtime, &starttime); - printf("%s: suspended %d.%03ld sec, redo %ld of %d\n", - vp->v_mount->mnt_stat.f_mntonname, endtime.tv_sec, + printf("%s: suspended %ld.%03ld sec, redo %ld of %d\n", + vp->v_mount->mnt_stat.f_mntonname, (long)endtime.tv_sec, endtime.tv_nsec / 1000000, redo, fs->fs_ncg); } if (sbp == NULL) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 1 17:26: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9772837B401; Sun, 1 Sep 2002 17:24:34 -0700 (PDT) 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 1F7B737B400 for ; Sun, 1 Sep 2002 17:24:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C47B43E4A for ; Sun, 1 Sep 2002 17:24:33 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g820OXJU071921 for ; Sun, 1 Sep 2002 17:24:33 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g820OClW071625 for perforce@freebsd.org; Sun, 1 Sep 2002 17:24:12 -0700 (PDT) Date: Sun, 1 Sep 2002 17:24:12 -0700 (PDT) Message-Id: <200209020024.g820OClW071625@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16929 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16929 Change 16929 by mini@freefall on 2002/09/01 17:23:13 IFC @16924 Affected files ... .. //depot/projects/kse/include/stddef.h#3 integrate .. //depot/projects/kse/include/stdlib.h#4 integrate .. //depot/projects/kse/lib/libc/gen/fmtmsg.c#2 integrate .. //depot/projects/kse/lib/libc/locale/Makefile.inc#4 integrate .. //depot/projects/kse/lib/libc/locale/ansi.c#2 delete .. //depot/projects/kse/lib/libc/locale/collate.c#4 integrate .. //depot/projects/kse/lib/libc/locale/mblen.c#1 branch .. //depot/projects/kse/lib/libc/locale/mbstowcs.c#1 branch .. //depot/projects/kse/lib/libc/locale/mbtowc.c#1 branch .. //depot/projects/kse/lib/libc/locale/multibyte.3#3 integrate .. //depot/projects/kse/lib/libc/locale/wcstombs.c#1 branch .. //depot/projects/kse/lib/libc/locale/wctomb.c#1 branch .. //depot/projects/kse/lib/libc/string/bcmp.3#2 integrate .. //depot/projects/kse/lib/libc/string/bcmp.c#2 integrate .. //depot/projects/kse/lib/libc/string/bcopy.3#2 integrate .. //depot/projects/kse/lib/libc/string/bcopy.c#2 integrate .. //depot/projects/kse/lib/libc/string/bzero.3#2 integrate .. //depot/projects/kse/lib/libc/string/memset.c#2 integrate .. //depot/projects/kse/lib/libc/string/swab.3#2 integrate .. //depot/projects/kse/sys/alpha/alpha/dump_machdep.c#2 integrate .. //depot/projects/kse/sys/alpha/alpha/elf_machdep.c#5 integrate .. //depot/projects/kse/sys/alpha/alpha/machdep.c#41 integrate .. //depot/projects/kse/sys/alpha/linux/linux_sysvec.c#8 integrate .. //depot/projects/kse/sys/alpha/osf1/osf1_sysvec.c#4 integrate .. //depot/projects/kse/sys/boot/ficl/prefix.c#3 integrate .. //depot/projects/kse/sys/boot/ficl/words.c#4 integrate .. //depot/projects/kse/sys/boot/i386/boot2/boot2.c#12 integrate .. //depot/projects/kse/sys/compat/linux/linux_file.c#16 integrate .. //depot/projects/kse/sys/compat/linux/linux_misc.c#19 integrate .. //depot/projects/kse/sys/compat/linux/linux_signal.c#7 integrate .. //depot/projects/kse/sys/compat/linux/linux_stats.c#10 integrate .. //depot/projects/kse/sys/compat/linux/linux_sysctl.c#4 integrate .. //depot/projects/kse/sys/compat/linux/linux_uid16.c#8 integrate .. //depot/projects/kse/sys/compat/linux/linux_util.c#6 integrate .. //depot/projects/kse/sys/compat/linux/linux_util.h#8 integrate .. //depot/projects/kse/sys/compat/pecoff/imgact_pecoff.c#14 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_misc.c#18 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/kse/sys/conf/NOTES#14 integrate .. //depot/projects/kse/sys/conf/files#47 integrate .. //depot/projects/kse/sys/conf/options#25 integrate .. //depot/projects/kse/sys/ddb/db_ps.c#23 integrate .. //depot/projects/kse/sys/dev/aic7xxx/ahc_eisa.c#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/ahc_pci.c#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7770.c#3 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx.reg#2 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx.c#6 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx.h#3 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx.reg#3 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx.seq#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_93cx6.c#3 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_93cx6.h#3 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_inline.h#3 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_osm.h#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_pci.c#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aicasm/Makefile#5 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm.c#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm.h#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_gram.y#5 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_scan.l#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#5 integrate .. //depot/projects/kse/sys/dev/drm/drm_drv.h#4 integrate .. //depot/projects/kse/sys/dev/drm/drm_linux.h#2 delete .. //depot/projects/kse/sys/dev/drm/drm_os_freebsd.h#5 integrate .. //depot/projects/kse/sys/dev/ispfw/asm_2100.h#3 integrate .. //depot/projects/kse/sys/dev/ispfw/asm_2200.h#3 integrate .. //depot/projects/kse/sys/dev/ispfw/asm_2300.h#3 integrate .. //depot/projects/kse/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/kse/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.c#4 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.h#4 integrate .. //depot/projects/kse/sys/dev/pccard/pccard.c#13 integrate .. //depot/projects/kse/sys/dev/puc/puc.c#7 integrate .. //depot/projects/kse/sys/dev/puc/puc_pccard.c#1 branch .. //depot/projects/kse/sys/dev/puc/puc_pci.c#1 branch .. //depot/projects/kse/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/kse/sys/dev/puc/pucvar.h#3 integrate .. //depot/projects/kse/sys/fs/nwfs/nwfs_subr.c#5 integrate .. //depot/projects/kse/sys/i386/conf/GENERIC#23 integrate .. //depot/projects/kse/sys/i386/i386/db_interface.c#12 integrate .. //depot/projects/kse/sys/i386/i386/elf_machdep.c#4 integrate .. //depot/projects/kse/sys/i386/i386/machdep.c#56 integrate .. //depot/projects/kse/sys/i386/ibcs2/ibcs2_sysvec.c#4 integrate .. //depot/projects/kse/sys/i386/include/param.h#11 integrate .. //depot/projects/kse/sys/i386/linux/linux_machdep.c#16 integrate .. //depot/projects/kse/sys/i386/linux/linux_sysvec.c#19 integrate .. //depot/projects/kse/sys/ia64/conf/SKI#5 integrate .. //depot/projects/kse/sys/ia64/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/kse/sys/ia64/ia64/elf_machdep.c#5 integrate .. //depot/projects/kse/sys/ia64/ia64/machdep.c#37 integrate .. //depot/projects/kse/sys/ia64/ia64/pmap.c#30 integrate .. //depot/projects/kse/sys/kern/imgact_aout.c#15 integrate .. //depot/projects/kse/sys/kern/init_main.c#47 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#37 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#63 integrate .. //depot/projects/kse/sys/kern/sys_generic.c#33 integrate .. //depot/projects/kse/sys/kern/vfs_syscalls.c#34 integrate .. //depot/projects/kse/sys/modules/Makefile#31 integrate .. //depot/projects/kse/sys/modules/aic7xxx/ahc/Makefile#2 integrate .. //depot/projects/kse/sys/modules/aic7xxx/ahd/Makefile#2 integrate .. //depot/projects/kse/sys/modules/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/kse/sys/pc98/i386/machdep.c#32 integrate .. //depot/projects/kse/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/kse/sys/powerpc/powerpc/machdep.c#23 integrate .. //depot/projects/kse/sys/sparc64/sparc64/elf_machdep.c#8 integrate .. //depot/projects/kse/sys/sys/imgact.h#8 integrate .. //depot/projects/kse/sys/sys/param.h#24 integrate .. //depot/projects/kse/sys/sys/syscallsubr.h#1 branch .. //depot/projects/kse/sys/sys/sysent.h#8 integrate .. //depot/projects/kse/sys/sys/vnode.h#30 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_inode.c#10 integrate .. //depot/projects/kse/sys/vm/swap_pager.c#13 integrate Differences ... ==== //depot/projects/kse/include/stddef.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)stddef.h 8.1 (Berkeley) 6/2/93 * - * $FreeBSD: src/include/stddef.h,v 1.8 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/stddef.h,v 1.9 2002/09/01 17:57:20 mike Exp $ */ #ifndef _STDDEF_H_ @@ -43,7 +43,7 @@ typedef __ptrdiff_t ptrdiff_t; -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#if __BSD_VISIBLE #ifndef _RUNE_T_DECLARED typedef __rune_t rune_t; #define _RUNE_T_DECLARED ==== //depot/projects/kse/include/stdlib.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.39 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.40 2002/09/01 07:08:22 tjr Exp $ */ #ifndef _STDLIB_H_ @@ -120,10 +120,10 @@ int system(const char *); int mblen(const char *, size_t); -size_t mbstowcs(wchar_t *, const char *, size_t); +size_t mbstowcs(wchar_t *__restrict , const char *__restrict, size_t); int wctomb(char *, wchar_t); -int mbtowc(wchar_t *, const char *, size_t); -size_t wcstombs(char *, const wchar_t *, size_t); +int mbtowc(wchar_t *__restrict, const char *__restrict, size_t); +size_t wcstombs(char *__restrict, const wchar_t *__restrict, size_t); #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) extern const char *_malloc_options; ==== //depot/projects/kse/lib/libc/gen/fmtmsg.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.2 2002/08/05 19:36:09 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.3 2002/09/01 01:49:27 mike Exp $"); #include #include @@ -72,8 +72,10 @@ } output = printfmt(msgverb, class, label, sev, text, action, tag); - if (output == NULL) + if (output == NULL) { + free(msgverb); return (MM_NOTOK); + } if (*output != '\0') fprintf(stderr, "%s", output); free(msgverb); ==== //depot/projects/kse/lib/libc/locale/Makefile.inc#4 (text+ko) ==== @@ -1,17 +1,18 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.34 2002/08/20 03:42:21 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.35 2002/08/31 11:26:55 tjr Exp $ # locale sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale -SRCS+= ansi.c big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \ +SRCS+= big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \ isctype.c iswctype.c \ - ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mbrlen.c \ - mbrtowc.c mbrune.c mbsinit.c mbsrtowcs.c \ + ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mblen.c \ + mbrlen.c \ + mbrtowc.c mbrune.c mbsinit.c mbsrtowcs.c mbtowc.c mbstowcs.c \ mskanji.c nl_langinfo.c nomacros.c none.c rune.c \ runetype.c setinvalidrune.c setlocale.c setrunelocale.c table.c \ - tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c \ - wctob.c wctrans.c wctype.c wcwidth.c + tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wcstombs.c \ + wctob.c wctomb.c wctrans.c wctype.c wcwidth.c .if ${LIB} == "c" MAN+= btowc.3 \ ==== //depot/projects/kse/lib/libc/locale/collate.c#4 (text+ko) ==== @@ -26,9 +26,10 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.29 2002/08/30 20:26:02 ache Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.31 2002/08/31 01:05:39 ache Exp $"); #include "namespace.h" +#include #include #include #include @@ -58,6 +59,7 @@ { FILE *fp; int i, saverr, chains; + uint32_t u32; char strbuf[STR_LEN], buf[PATH_MAX]; void *TMP_substitute_table, *TMP_char_pri_table, *TMP_chain_pri_table; static char collate_encoding[ENCODING_LEN + 1]; @@ -106,13 +108,13 @@ return (_LDP_ERROR); } if (chains) { - if (fread(strbuf, sizeof(strbuf), 1, fp) != 1) { + if (fread(&u32, sizeof(u32), 1, fp) != 1) { saverr = errno; (void)fclose(fp); errno = saverr; return (_LDP_ERROR); } - if ((chains = atoi(strbuf)) < 1) { + if ((chains = (int)ntohl(u32)) < 1) { (void)fclose(fp); errno = EFTYPE; return (_LDP_ERROR); @@ -161,7 +163,7 @@ FREAD(TMP_substitute_table, sizeof(__collate_substitute_table), 1, fp); FREAD(TMP_char_pri_table, sizeof(__collate_char_pri_table), 1, fp); FREAD(TMP_chain_pri_table, - sizeof(*__collate_chain_pri_table) * chains, 1, fp); + sizeof(*__collate_chain_pri_table), chains, fp); (void)fclose(fp); (void)strcpy(collate_encoding, encoding); @@ -280,8 +282,8 @@ printf("\t'%c' --> \"%s\"\n", i, __collate_substitute_table[i]); printf("Chain priority table:\n"); - for (p2 = __collate_chain_pri_table; p2->str[0]; p2++) - printf("\t\"%s\" : %d %d\n\n", p2->str, p2->prim, p2->sec); + for (p2 = __collate_chain_pri_table; p2->str[0] != '\0'; p2++) + printf("\t\"%s\" : %d %d\n", p2->str, p2->prim, p2->sec); printf("Char priority table:\n"); for (i = 0; i < UCHAR_MAX + 1; i++) printf("\t'%c' : %d %d\n", i, __collate_char_pri_table[i].prim, ==== //depot/projects/kse/lib/libc/locale/multibyte.3#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)multibyte.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.13 2002/08/04 11:02:21 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.15 2002/09/01 07:21:58 tjr Exp $ .\" .Dd June 4, 1993 .Dt MULTIBYTE 3 @@ -52,11 +52,11 @@ .Ft int .Fn mblen "const char *mbchar" "size_t nbytes" .Ft size_t -.Fn mbstowcs "wchar_t *wcstring" "const char *mbstring" "size_t nwchars" +.Fn mbstowcs "wchar_t *restrict wcstring" "const char *restrict mbstring" "size_t nwchars" .Ft int -.Fn mbtowc "wchar_t *wcharp" "const char *mbchar" "size_t nbytes" +.Fn mbtowc "wchar_t *restrict wcharp" "const char *restrict mbchar" "size_t nbytes" .Ft size_t -.Fn wcstombs "char *mbstring" "const wchar_t *wcstring" "size_t nbytes" +.Fn wcstombs "char *restrict mbstring" "const wchar_t *restrict wcstring" "size_t nbytes" .Ft int .Fn wctomb "char *mbchar" "wchar_t wchar" .Sh DESCRIPTION @@ -78,7 +78,7 @@ .Va char Ns s . Individual basic elements may map into one or more (up to -.Dv MB_CHAR_MAX ) +.Dv MB_LEN_MAX ) bytes in a multibyte character. .Pp The current locale ==== //depot/projects/kse/lib/libc/string/bcmp.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)bcmp.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/bcmp.3,v 1.8 2001/10/01 16:09:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/bcmp.3,v 1.9 2002/08/30 21:07:40 robert Exp $ .\" .Dd June 4, 1993 .Dt BCMP 3 @@ -43,7 +43,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In strings.h .Ft int .Fn bcmp "const void *b1" "const void *b2" "size_t len" .Sh DESCRIPTION @@ -72,3 +72,10 @@ .Fn bcmp function first appeared in .Bx 4.2 . +Its prototype existed previously in +.Aq Pa string.h +before it was moved to +.Aq Pa strings.h +for +.St -p1003.1-2001 +compliance. ==== //depot/projects/kse/lib/libc/string/bcmp.c#2 (text+ko) ==== @@ -35,27 +35,25 @@ static char sccsid[] = "@(#)bcmp.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/bcmp.c,v 1.4 2002/03/21 18:44:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/bcmp.c,v 1.5 2002/08/30 21:07:40 robert Exp $"); -#include +#include /* * bcmp -- vax cmpc3 instruction */ int -bcmp(b1, b2, length) - const void *b1, *b2; - size_t length; +bcmp(const void *b1, const void *b2, size_t length) { char *p1, *p2; if (length == 0) - return(0); + return (0); p1 = (char *)b1; p2 = (char *)b2; do if (*p1++ != *p2++) break; while (--length); - return(length); + return (length); } ==== //depot/projects/kse/lib/libc/string/bcopy.3#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)bcopy.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/bcopy.3,v 1.7 2001/10/01 16:09:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/bcopy.3,v 1.8 2002/09/01 21:53:46 robert Exp $ .\" .Dd June 4, 1993 .Dt BCOPY 3 @@ -44,7 +44,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In strings.h .Ft void .Fn bcopy "const void *src" "void *dst" "size_t len" .Sh DESCRIPTION @@ -72,3 +72,10 @@ .Fn bcopy function appeared in .Bx 4.2 . +Its prototype existed previously in +.Aq Pa string.h +before it was moved to +.Aq Pa strings.h +for +.St -p1003.1-2001 +compliance. ==== //depot/projects/kse/lib/libc/string/bcopy.c#2 (text+ko) ==== @@ -38,9 +38,7 @@ static char sccsid[] = "@(#)bcopy.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/bcopy.c,v 1.4 2002/03/21 18:44:54 obrien Exp $"); - -#include +__FBSDID("$FreeBSD: src/lib/libc/string/bcopy.c,v 1.5 2002/09/01 21:53:46 robert Exp $"); /* * sizeof(word) MUST BE A POWER OF TWO @@ -56,21 +54,22 @@ * This is the routine that actually implements * (the portable versions of) bcopy, memcpy, and memmove. */ +#if defined(MEMCOPY) || defined(MEMMOVE) +#include + +void * #ifdef MEMCOPY -void * -memcpy(dst0, src0, length) +memcpy #else -#ifdef MEMMOVE -void * -memmove(dst0, src0, length) +memmove +#endif +(void *dst0, const void *src0, size_t length) #else +#include + void -bcopy(src0, dst0, length) -#endif +bcopy(const void *src0, void *dst0, size_t length) #endif - void *dst0; - const void *src0; - size_t length; { char *dst = dst0; const char *src = src0; ==== //depot/projects/kse/lib/libc/string/bzero.3#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)bzero.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/bzero.3,v 1.7 2001/10/01 16:09:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/bzero.3,v 1.8 2002/09/01 21:53:46 robert Exp $ .\" .Dd June 4, 1993 .Dt BZERO 3 @@ -44,7 +44,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In string.h +.In strings.h .Ft void .Fn bzero "void *b" "size_t len" .Sh DESCRIPTION @@ -69,3 +69,10 @@ function appeared in .Bx 4.3 . +Its prototype existed previously in +.Aq Pa string.h +before it was moved to +.Aq Pa strings.h +for +.St -p1003.1-2001 +compliance. ==== //depot/projects/kse/lib/libc/string/memset.c#2 (text+ko) ==== @@ -38,35 +38,33 @@ static char sccsid[] = "@(#)memset.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/string/memset.c,v 1.7 2002/03/21 18:44:54 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/memset.c,v 1.8 2002/09/01 21:53:46 robert Exp $"); #include #include -#include #define wsize sizeof(u_int) #define wmask (wsize - 1) #ifdef BZERO +#include + #define RETURN return #define VAL 0 #define WIDEVAL 0 void -bzero(dst0, length) - void *dst0; - size_t length; +bzero(void *dst0, size_t length) #else +#include + #define RETURN return (dst0) #define VAL c0 #define WIDEVAL c void * -memset(dst0, c0, length) - void *dst0; - int c0; - size_t length; +memset(void *dst0, int c0, size_t length) #endif { size_t t; ==== //depot/projects/kse/lib/libc/string/swab.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)swab.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.6 2001/10/01 16:09:00 ru Exp $ +.\" $FreeBSD: src/lib/libc/string/swab.3,v 1.7 2002/08/30 21:18:39 robert Exp $ .\" .Dd June 4, 1993 .Dt SWAB 3 @@ -43,7 +43,7 @@ .Sh SYNOPSIS .In string.h .Ft void -.Fn swab "const void *src" "void *dst" "size_t len" +.Fn swab "const void * restrict src" "void * restrict dst" "size_t len" .Sh DESCRIPTION The function .Fn swab ==== //depot/projects/kse/sys/alpha/alpha/dump_machdep.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.1 2002/05/11 21:53:46 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.2 2002/08/31 03:21:59 jhb Exp $ */ #include @@ -57,7 +57,7 @@ void *va; int i, mb; - printf("Dumping %u MB\n", Maxmem / (1024*1024 / PAGE_SIZE)); + printf("Dumping %ld MB\n", Maxmem / (1024*1024 / PAGE_SIZE)); /* Fill in the kernel dump header */ strcpy(kdh.magic, KERNELDUMPMAGIC); ==== //depot/projects/kse/sys/alpha/alpha/elf_machdep.c#5 (text+ko) ==== @@ -22,12 +22,14 @@ * (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/alpha/alpha/elf_machdep.c,v 1.10 2002/07/20 02:56:09 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.11 2002/09/01 21:41:22 jake Exp $ */ #include #include #include +#include +#include #include #include #include @@ -38,6 +40,10 @@ #include #include #include + +#include +#include + #include #include @@ -46,11 +52,11 @@ sysent, 0, 0, + NULL, 0, - 0, - 0, - 0, - elf64_freebsd_fixup, + NULL, + NULL, + __elfN(freebsd_fixup), sendsig, sigcode, &szsigcode, @@ -58,7 +64,15 @@ "FreeBSD ELF64", __elfN(coredump), NULL, - MINSIGSTKSZ + MINSIGSTKSZ, + PAGE_SIZE, + VM_MIN_ADDRESS, + VM_MAXUSER_ADDRESS, + USRSTACK, + PS_STRINGS, + VM_PROT_ALL, + exec_copyout_strings, + exec_setregs }; static Elf64_Brandinfo freebsd_brand_info = { ==== //depot/projects/kse/sys/alpha/alpha/machdep.c#41 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.182 2002/08/30 04:04:33 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.183 2002/08/31 03:33:30 peter Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -203,32 +203,28 @@ static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = alpha_ptob(physmem); - error = sysctl_handle_long(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_physmem, "LU", ""); static int sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) { - int error; - unsigned long val; + u_long val; val = alpha_ptob(physmem - cnt.v_wire_count); - error = sysctl_handle_long(oidp, &val, 0, req); - return (error); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG|CTLFLAG_RD, +SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD, 0, 0, sysctl_hw_usermem, "LU", ""); -SYSCTL_INT(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); +SYSCTL_ULONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); /* must be 2 less so 0 0 can signal end of chunks */ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2) ==== //depot/projects/kse/sys/alpha/linux/linux_sysvec.c#8 (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. * - * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.83 2002/07/20 02:56:09 peter Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.84 2002/09/01 21:41:22 jake Exp $ */ /* XXX we use functions that might not exist. */ @@ -179,19 +179,27 @@ linux_sysent, 0, 0, + NULL, 0, - 0, - 0, - 0, + NULL, + NULL, elf_linux_fixup, osendsig, linux_sigcode, &linux_szsigcode, - 0, + NULL, "Linux ELF", elf64_coredump, exec_linux_imgact_try, - LINUX_MINSIGSTKSZ + LINUX_MINSIGSTKSZ, + PAGE_SIZE, + VM_MIN_ADDRESS, + VM_MAXUSER_ADDRESS, + USRSTACK, + PS_STRINGS, + VM_PROT_ALL, + exec_copyout_strings, + exec_setregs }; static Elf64_Brandinfo linux_brand = { ==== //depot/projects/kse/sys/alpha/osf1/osf1_sysvec.c#4 (text+ko) ==== @@ -28,7 +28,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/alpha/osf1/osf1_sysvec.c,v 1.7 2002/06/02 20:05:41 schweikh Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.8 2002/09/01 21:41:22 jake Exp $ */ /* XXX we use functions that might not exist. */ @@ -64,21 +64,29 @@ struct sysentvec osf1_sysvec = { OSF1_SYS_MAXSYSCALL, osf1_sysent, - 0x0, 0, 0, + NULL, 0, - 0, - 0, /* trap-to-signal translation function */ + NULL, + NULL, /* trap-to-signal translation function */ osf1_freebsd_fixup, /* fixup */ osf1_sendsig, sigcode, /* use generic trampoline */ &osf1_szsigcode, /* use generic trampoline size */ - 0, /* prepsyscall */ + NULL, /* prepsyscall */ "OSF/1 ECOFF", NULL, /* we don't have an ECOFF coredump function */ NULL, - OSF1_MINSIGSTKSZ + OSF1_MINSIGSTKSZ, + PAGE_SIZE, + VM_MIN_ADDRESS, + VM_MAXUSER_ADDRESS, + USRSTACK, + PS_STRINGS, + VM_PROT_ALL, + exec_copyout_strings, + exec_setregs }; /* ==== //depot/projects/kse/sys/boot/ficl/prefix.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ ** SUCH DAMAGE. */ -/* $FreeBSD: src/sys/boot/ficl/prefix.c,v 1.2 2002/04/09 17:45:11 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/prefix.c,v 1.3 2002/08/31 01:04:53 scottl Exp $ */ #include #include @@ -104,7 +104,7 @@ vmSetTibIndex(pVM, si.cp + n - pVM->tib.cp ); vmExecute(pVM, pFW); - return FICL_TRUE; + return (int)FICL_TRUE; } pFW = pFW->link; } ==== //depot/projects/kse/sys/boot/ficl/words.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ ** SUCH DAMAGE. */ -/* $FreeBSD: src/sys/boot/ficl/words.c,v 1.37 2002/04/09 17:45:11 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/words.c,v 1.38 2002/08/31 01:04:53 scottl Exp $ */ #ifdef TESTMAIN #include @@ -732,7 +732,7 @@ int base = 10; int unsignedInteger = FALSE; - int append = FICL_TRUE; + FICL_INT append = FICL_TRUE; while (format < formatStop) { @@ -816,7 +816,7 @@ } } - if (append == FICL_TRUE) + if (append != FICL_FALSE) { if (!desiredLength) desiredLength = actualLength; @@ -1262,7 +1262,7 @@ } else { /* take branch (to else/endif/begin) */ - vmBranchRelative(pVM, *(int *)(pVM->ip)); + vmBranchRelative(pVM, (uintptr_t)*(pVM->ip)); } return; @@ -1311,7 +1311,7 @@ static void branchParen(FICL_VM *pVM) { - vmBranchRelative(pVM, *(int *)(pVM->ip)); + vmBranchRelative(pVM, (uintptr_t)*(pVM->ip)); return; } @@ -1473,7 +1473,7 @@ } vmExecute(pVM, tempFW); - return FICL_TRUE; + return (int)FICL_TRUE; } } @@ -1489,7 +1489,7 @@ { dictAppendCell(dp, LVALUEtoCELL(tempFW)); } - return FICL_TRUE; + return (int)FICL_TRUE; } } @@ -1922,7 +1922,7 @@ else { /* update index, branch to loop head */ stackSetTop(pVM->rStack, LVALUEtoCELL(index)); - vmBranchRelative(pVM, *(int *)(pVM->ip)); + vmBranchRelative(pVM, (uintptr_t)*(pVM->ip)); } return; @@ -1957,7 +1957,7 @@ else { /* update index, branch to loop head */ stackSetTop(pVM->rStack, LVALUEtoCELL(index)); - vmBranchRelative(pVM, *(int *)(pVM->ip)); + vmBranchRelative(pVM, (uintptr_t)*(pVM->ip)); } return; ==== //depot/projects/kse/sys/boot/i386/boot2/boot2.c#12 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.43 2002/06/21 06:18:01 mckusick Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.44 2002/09/01 21:29:10 kan Exp $ */ #include @@ -409,7 +409,7 @@ } if (opts & 1 << RBX_PROBEKBD) { i = *(uint8_t *)PTOV(0x496) & 0x10; - printf("Keyboard: %s\n", i ? "yes" : "no"); + /* printf("Keyboard: %s\n", i ? "yes" : "no"); */ if (!i) opts |= 1 << RBX_DUAL | 1 << RBX_SERIAL; opts &= ~(1 << RBX_PROBEKBD); ==== //depot/projects/kse/sys/compat/linux/linux_file.c#16 (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. * - * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.69 2002/08/17 02:36:14 rwatson Exp $ + * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.70 2002/09/01 22:30:24 iedowse Exp $ */ #include "opt_compat.h" @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -60,82 +61,68 @@ int linux_creat(struct thread *td, struct linux_creat_args *args) { - struct open_args /* { - char *path; - int flags; - int mode; - } */ bsd_open_args; - caddr_t sg; + char *path; + int error; - sg = stackgap_init(); - CHECKALTCREAT(td, &sg, args->path); + LCONVPATHEXIST(td, args->path, &path); #ifdef DEBUG if (ldebug(creat)) - printf(ARGS(creat, "%s, %d"), args->path, args->mode); + printf(ARGS(creat, "%s, %d"), path, args->mode); #endif - bsd_open_args.path = args->path; - bsd_open_args.mode = args->mode; - bsd_open_args.flags = O_WRONLY | O_CREAT | O_TRUNC; - return open(td, &bsd_open_args); + error = kern_open(td, path, UIO_SYSSPACE, O_WRONLY | O_CREAT | O_TRUNC, + args->mode); + LFREEPATH(path); + return (error); } #endif /*!__alpha__*/ int linux_open(struct thread *td, struct linux_open_args *args) { - struct open_args /* { - char *path; - int flags; - int mode; - } */ bsd_open_args; struct proc *p = td->td_proc; - int error; - caddr_t sg; + char *path; + int bsd_flags, error; - sg = stackgap_init(); - if (args->flags & LINUX_O_CREAT) - CHECKALTCREAT(td, &sg, args->path); + LCONVPATHCREAT(td, args->path, &path); else - CHECKALTEXIST(td, &sg, args->path); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 1 18: 5:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3458A37B400; Sun, 1 Sep 2002 18:04:24 -0700 (PDT) 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 D5C1437B401 for ; Sun, 1 Sep 2002 18:04:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96D6B43E3B for ; Sun, 1 Sep 2002 18:04:22 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8214MJU079565 for ; Sun, 1 Sep 2002 18:04:22 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8214M8Q079562 for perforce@freebsd.org; Sun, 1 Sep 2002 18:04:22 -0700 (PDT) Date: Sun, 1 Sep 2002 18:04:22 -0700 (PDT) Message-Id: <200209020104.g8214M8Q079562@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16932 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16932 Change 16932 by mini@freefall on 2002/09/01 18:03:37 Followup to change 16929 ("IFC @16924"): remove changes that should never have crept into this branch. Affected files ... .. //depot/projects/kse/lib/libc/alpha/gen/makecontext.c#3 edit .. //depot/projects/kse/lib/libc/gen/swapcontext.c#5 edit .. //depot/projects/kse/sys/contrib/dev/acpica/utdebug.c#11 edit .. //depot/projects/kse/sys/contrib/ipfilter/netinet/fil.c#8 edit .. //depot/projects/kse/sys/dev/sound/pci/solo.c#5 edit Differences ... ==== //depot/projects/kse/lib/libc/alpha/gen/makecontext.c#3 (text+ko) ==== @@ -29,11 +29,11 @@ #include #include -#include #include #include #include +#include /* Prototypes */ ==== //depot/projects/kse/lib/libc/gen/swapcontext.c#5 (text+ko) ==== @@ -27,11 +27,12 @@ #include __FBSDID("$FreeBSD: src/lib/libc/gen/swapcontext.c,v 1.2 2002/01/11 19:46:08 deischen Exp $"); +#include +#include +#include #include -#include #include -#include __weak_reference(__swapcontext, swapcontext); ==== //depot/projects/kse/sys/contrib/dev/acpica/utdebug.c#11 (text+ko) ==== @@ -600,57 +600,115 @@ /* Only dump the buffer if tracing is enabled */ -rom or relating to the Covered Code - * without prior written authorization from Intel. - * - * 4. Disclaimer and Export Compliance - * - * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED - * HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE - * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE, - * INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY - * UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY - * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A - * PARTICULAR PURPOSE. - * - * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES - * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR - * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT, - * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY - * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL - * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS - * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY - * LIMITED REMEDY. - * - * 4.3. Licensee shall not export, either directly or indirectly, any of this - * software or system incorporating such software without first obtaining any - * required license or other approval from the U. S. Department of Commerce or - * any other agency or department of the United States Government. In the - * event Licensee exports any such software from the United States or - * re-exports any such software from a foreign destination, Licensee shall - * ensure that the distribution and export/re-export of the software is in - * compliance with all laws, regulations, orders, or other restrictions of the - * U.S. Export Administration Regulations. Licensee agrees that neither it nor - * any of its subsidiaries will export/re-export any technical data, process, - * software, or service, directly or indirectly, to any country for which the - * United States government or any agency thereof requires an export license, - * other governmental approval, or letter of assurance, without first obtaining - * such license, approval or letter. - * - *****************************************************************************/ + if (!((ACPI_LV_TABLES & AcpiDbgLevel) && + (ComponentId & AcpiDbgLayer))) + { + return; + } + + if ((Count < 4) || (Count & 0x01)) + { + Display = DB_BYTE_DISPLAY; + } + + AcpiOsPrintf ("\nOffset Value\n"); + + /* + * Nasty little dump buffer routine! + */ + while (i < Count) + { + /* Print current offset */ + + AcpiOsPrintf ("%05X ", i); + + /* Print 16 hex chars */ + + for (j = 0; j < 16;) + { + if (i + j >= Count) + { + AcpiOsPrintf ("\n"); + return; + } + + /* Make sure that the INT8 doesn't get sign-extended! */ + + switch (Display) + { + /* Default is BYTE display */ + + default: + + AcpiOsPrintf ("%02X ", + *((UINT8 *) &Buffer[i + j])); + j += 1; + break; + + + case DB_WORD_DISPLAY: + + ACPI_MOVE_UNALIGNED16_TO_32 (&Temp32, + &Buffer[i + j]); + AcpiOsPrintf ("%04X ", Temp32); + j += 2; + break; + + + case DB_DWORD_DISPLAY: + + ACPI_MOVE_UNALIGNED32_TO_32 (&Temp32, + &Buffer[i + j]); + AcpiOsPrintf ("%08X ", Temp32); + j += 4; + break; + + + case DB_QWORD_DISPLAY: + + ACPI_MOVE_UNALIGNED32_TO_32 (&Temp32, + &Buffer[i + j]); + AcpiOsPrintf ("%08X", Temp32); + + ACPI_MOVE_UNALIGNED32_TO_32 (&Temp32, + &Buffer[i + j + 4]); + AcpiOsPrintf ("%08X ", Temp32); + j += 8; + break; + } + } -#define __TBUTILS_C__ + /* + * Print the ASCII equivalent characters + * But watch out for the bad unprintable ones... + */ + for (j = 0; j < 16; j++) + { + if (i + j >= Count) + { + AcpiOsPrintf ("\n"); + return; + } -#include "acpi.h" -#include "actables.h" + BufChar = Buffer[i + j]; + if ((BufChar > 0x1F && BufChar < 0x2E) || + (BufChar > 0x2F && BufChar < 0x61) || + (BufChar > 0x60 && BufChar < 0x7F)) + { + AcpiOsPrintf ("%c", BufChar); + } + else + { + AcpiOsPrintf ("."); + } + } + /* Done with that line. */ -#define _COMPONENT ACPI_TABLES - ACPI_MODULE_NAME ("tbutils") + AcpiOsPrintf ("\n"); + i += 16; + } + return; +} -/******************************************************************************* - * - * FUNCTION: AcpiTbHandleToObject - * - * PARAMETERS: TableId - Id for whi ==== //depot/projects/kse/sys/contrib/ipfilter/netinet/fil.c#8 (text+ko) ==== @@ -544,218 +544,170 @@ if (fin->fin_fl & FI_SHORT) return !(ft->ftu_tcpf | ft->ftu_tcpfm); /* - * Match the flags ? If not, abort thisle (ACPI_IS_SPACE (*String) || *String == '\t') - { - ++String; - } - - /* - * If the input parameter Base is zero, then we need to - * determine if it is octal, decimal, or hexadecimal: - */ - if (Base == 0) - { - if (*String == '0') - { - if (ACPI_TOLOWER (*(++String)) == 'x') - { - Base = 16; - ++String; - } - else - { - Base = 8; - } - } - else - { - Base = 10; - } - } - - /* - * For octal and hexadecimal bases, skip over the leading - * 0 or 0x, if they are present. - */ - if (Base == 8 && *String == '0') - { - String++; - } - - if (Base == 16 && - *String == '0' && - ACPI_TOLOWER (*(++String)) == 'x') - { - String++; - } - - /* Main loop: convert the string to an unsigned long */ - - while (*String) - { - if (ACPI_IS_DIGIT (*String)) - { - Index = ((UINT8) *String) - '0'; - } - else - { - Index = (UINT8) ACPI_TOUPPER (*String); - if (ACPI_IS_UPPER ((char) Index)) - { - Index = Index - 'A' + 10; - } - else - { - goto ErrorExit; - } - } - - if (Index >= Base) - { - goto ErrorExit; - } - - /* Check to see if value is out of range: */ - - Dividend = ACPI_INTEGER_MAX - (ACPI_INTEGER) Index; - (void) AcpiUtShortDivide (&Dividend, Base, &Quotient, NULL); - if (ReturnValue > Quotient) - { - goto ErrorExit; - } - - ReturnValue *= Base; - ReturnValue += Index; - ++String; - } - - *RetInteger = ReturnValue; - return (Status); - - -ErrorExit: - switch (Base) - { - case 8: - Status = AE_BAD_OCTAL_CONSTANT; - break; - - case 10: - Status = AE_BAD_DECIMAL_CONSTANT; - break; - - case 16: - Status = AE_BAD_HEX_CONSTANT; - break; - - default: - /* Base validated above */ - break; - } - - return (Status); + * Match the flags ? If not, abort this match. + */ + if (ft->ftu_tcpfm && + ft->ftu_tcpf != (fin->fin_tcpf & ft->ftu_tcpfm)) { + FR_DEBUG(("f. %#x & %#x != %#x\n", fin->fin_tcpf, + ft->ftu_tcpfm, ft->ftu_tcpf)); + err = 0; + } + } + return err; } - -/******************************************************************************* - * - * FUNCTION: AcpiUtStrupr - * - * PARAMETERS: SrcString - The source string to convert to - * - * RETURN: SrcString - * - * DESCRIPTION: Convert string to uppercase - * - ******************************************************************************/ - -NATIVE_CHAR * -AcpiUtStrupr ( - NATIVE_CHAR *SrcString) +/* + * Check the input/output list of rules for a match and result. + * Could be per interface, but this gets real nasty when you don't have + * kernel sauce. + */ +int fr_scanlist(passin, ip, fin, m) +u_32_t passin; +ip_t *ip; +register fr_info_t *fin; +void *m; { - NATIVE_CHAR *String; + register struct frentry *fr; + register fr_ip_t *fi = &fin->fin_fi; + int rulen, portcmp = 0, off, skip = 0, logged = 0; + u_32_t pass, passt, passl; + frentry_t *frl; + frl = NULL; + pass = passin; + fr = fin->fin_fr; + fin->fin_fr = NULL; + off = fin->fin_off; - ACPI_FUNCTION_ENTRY (); + if ((fi->fi_fl & FI_TCPUDP) && (fin->fin_dlen > 3) && !off) + portcmp = 1; + for (rulen = 0; fr; fr = fr->fr_next, rulen++) { + if (skip) { + FR_VERBOSE(("%d (%#x)\n", skip, fr->fr_flags)); + skip--; + continue; + } + /* + * In all checks below, a null (zero) value in the + * filter struture is taken to mean a wildcard. + * + * check that we are working for the right interface + */ +#ifdef _KERNEL +# if (BSD >= 199306) + if (fin->fin_out != 0) { + if ((fr->fr_oifa && + (fr->fr_oifa != ((mb_t *)m)->m_pkthdr.rcvif))) + continue; + } +# endif +#else + if (opts & (OPT_VERBOSE|OPT_DEBUG)) + printf("\n"); +#endif - /* Walk entire string, uppercasing the letters */ + FR_VERBOSE(("%c", fr->fr_skip ? 's' : + (pass & FR_PASS) ? 'p' : + (pass & FR_AUTH) ? 'a' : + (pass & FR_ACCOUNT) ? 'A' : + (pass & FR_NOMATCH) ? 'n' : 'b')); - for (String = SrcString; *String; ) - { - *String = (char) ACPI_TOUPPER (*String); - String++; - } + if (fr->fr_ifa && fr->fr_ifa != fin->fin_ifp) + continue; + FR_VERBOSE((":i")); + { + register u_32_t *ld, *lm, *lip; + register int i; - return (SrcString); -} + lip = (u_32_t *)fi; + lm = (u_32_t *)&fr->fr_mip; + ld = (u_32_t *)&fr->fr_ip; + i = ((*lip & *lm) != *ld); + FR_DEBUG(("0. %#08x & %#08x != %#08x\n", + *lip, *lm, *ld)); + if (i) + continue; + /* + * We now know whether the packet version and the + * rule version match, along with protocol, ttl and + * tos. + */ + lip++, lm++, ld++; + /* + * Unrolled loops (4 each, for 32 bits). + */ + FR_DEBUG(("1a. %#08x & %#08x != %#08x\n", + *lip, *lm, *ld)); + i |= ((*lip++ & *lm++) != *ld++) << 5; + if (fi->fi_v == 6) { + FR_DEBUG(("1b. %#08x & %#08x != %#08x\n", + *lip, *lm, *ld)); + i |= ((*lip++ & *lm++) != *ld++) << 5; + FR_DEBUG(("1c. %#08x & %#08x != %#08x\n", + *lip, *lm, *ld)); + i |= ((*lip++ & *lm++) != *ld++) << 5; + FR_DEBUG(("1d. %#08x & %#08x != %#08x\n", + *lip, *lm, *ld)); + i |= ((*lip++ & *lm++) != *ld++) << 5; + } else { + lip += 3; + lm += 3; + ld += 3; + } + i ^= (fr->fr_flags & FR_NOTSRCIP); + if (i) + continue; + FR_DEBUG(("2a. %#08x & %#08x != %#08x\n", + *lip, *lm, *ld)); + i |= ((*lip++ & *lm++) != *ld++) << 6; + if (fi->fi_v == 6) { + FR_DEBUG(("2b. %#08x & %#08x != %#08x\n", + *lip, *lm, *ld)); + i |= ((*lip++ & *lm++) != *ld++) << 6; + FR_DEBUG(("2c. %#08x & %#08x != %#08x\n", + *lip, *lm, *ld)); + i |= ((*lip++ & *lm++) != *ld++) << 6; + FR_DEBUG(("2d. %#08x & %#08x != %#08x\n", + *lip, *lm, *ld)); + i |= ((*lip++ & *lm++) != *ld++) << 6; + } else { + lip += 3; + lm += 3; + ld += 3; + } + i ^= (fr->fr_flags & FR_NOTDSTIP); + if (i) + continue; + FR_DEBUG(("3. %#08x & %#08x != %#08x\n", + *lip, *lm, *ld)); + i |= ((*lip++ & *lm++) != *ld++); + FR_DEBUG(("4. %#08x & %#08x != %#08x\n", + *lip, *lm, *ld)); + i |= ((*lip & *lm) != *ld); + if (i) + continue; + } -/******************************************************************************* - * - * FUNCTION: AcpiUtMutexInitialize - * - * PARAMETERS: None. - * - * RETURN: Status - * - * DESCRIPTION: Create the system mutex objects. - * - ******************************************************************************/ - -ACPI_STATUS -AcpiUtMutexInitialize ( - void) -{ - UINT32 i; - ACPI_STATUS Status; - - - ACPI_FUNCTION_TRACE ("UtMutexInitialize"); - - - /* - * Create each of the predefined mutex objects - */ - for (i = 0; i < NUM_MTX; i++) - { - Status = AcpiUtCreateMutex (i); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } - } - - return_ACPI_STATUS (AE_OK); -} - - -/******************************************************************************* - * - * FUNCTION: AcpiUtMutexTerminate - * - * PARAMETERS: None. - * - * RETURN: None. - * - * DESCRIPTION: Delete all of the system mutex objects. - * - ******************************************************************************/ - -void -AcpiUtMutexTerminate ( - void) -{ - UINT32 i; - - - ACPI_FUNCTION_TRACE ("UtMutexTerminate"); - - - /* - * Delete each predefined mutex object - */ - for (i = 0 + /* + * If a fragment, then only the first has what we're looking + * for here... + */ + if (!portcmp && (fr->fr_dcmp || fr->fr_scmp || fr->fr_tcpf || + fr->fr_tcpfm)) + continue; + if (fi->fi_fl & FI_TCPUDP) { + if (!fr_tcpudpchk(&fr->fr_tuc, fin)) + continue; + } else if (fr->fr_icmpm || fr->fr_icmp) { + if ((fi->fi_p != IPPROTO_ICMP) || off || + (fin->fin_dlen < 2)) + continue; + if ((fin->fin_data[0] & fr->fr_icmpm) != fr->fr_icmp) { + FR_DEBUG(("i. %#x & %#x != %#x\n", + fin->fin_data[0], fr->fr_icmpm, + fr->fr_icmp)); continue; } } ==== //depot/projects/kse/sys/dev/sound/pci/solo.c#5 (text+ko) ==== @@ -121,172 +121,210 @@ * Common code for the midi and pcm functions * * ess_cmd write a single byte to the CMD port. - * ess_cmd1 write a CMD + 1 b PCMTRIG_STOP); - } - } - DELAY(10 * 1000); /* give things a chance to stop */ + * ess_cmd1 write a CMD + 1 byte arg + * ess_cmd2 write a CMD + 2 byte arg + * ess_get_byte returns a single byte from the DSP data port + * + * ess_write is actually ess_cmd1 + * ess_read access ext. regs via ess_cmd(0xc0, reg) followed by ess_get_byte + */ - /* Disable interrupts */ - m3_wr_2(sc, HOST_INT_CTRL, 0); - m3_wr_1(sc, ASSP_CONTROL_C, 0); +static int +port_rd(struct resource *port, int regno, int size) +{ + bus_space_tag_t st = rman_get_bustag(port); + bus_space_handle_t sh = rman_get_bushandle(port); - m3_assp_halt(sc); + switch (size) { + case 1: + return bus_space_read_1(st, sh, regno); + case 2: + return bus_space_read_2(st, sh, regno); + case 4: + return bus_space_read_4(st, sh, regno); + default: + return 0xffffffff; + } +} - /* Save the state of the ASSP */ - for (i = REV_B_CODE_MEMORY_BEGIN; i <= REV_B_CODE_MEMORY_END; i++) - sc->savemem[index++] = m3_rd_assp_code(sc, i); - for (i = REV_B_DATA_MEMORY_BEGIN; i <= REV_B_DATA_MEMORY_END; i++) - sc->savemem[index++] = m3_rd_assp_data(sc, i); +static void +port_wr(struct resource *port, int regno, u_int32_t data, int size) +{ + bus_space_tag_t st = rman_get_bustag(port); + bus_space_handle_t sh = rman_get_bushandle(port); - /* Power down the card to D3 state */ - m3_power(sc, 3); - - return 0; + switch (size) { + case 1: + bus_space_write_1(st, sh, regno, data); + break; + case 2: + bus_space_write_2(st, sh, regno, data); + break; + case 4: + bus_space_write_4(st, sh, regno, data); + break; + } } static int -m3_pci_resume(device_t dev) +ess_rd(struct ess_info *sc, int reg) { - struct sc_info *sc = pcm_getdevinfo(dev); - int i, index = 0; - u_int8_t reset_state; + return port_rd(sc->sb, reg, 1); +} - M3_DEBUG(CHANGE, ("m3_pci_resume\n")); +static void +ess_wr(struct ess_info *sc, int reg, u_int8_t val) +{ + port_wr(sc->sb, reg, val, 1); +} - /* Power the card back to D0 */ - m3_power(sc, 0); +static int +ess_dspready(struct ess_info *sc) +{ + return ((ess_rd(sc, SBDSP_STATUS) & 0x80) == 0); +} - m3_config(sc); +static int +ess_dspwr(struct ess_info *sc, u_char val) +{ + int i; - reset_state = m3_assp_halt(sc); + for (i = 0; i < 1000; i++) { + if (ess_dspready(sc)) { + ess_wr(sc, SBDSP_CMD, val); + return 1; + } + if (i > 10) DELAY((i > 100)? 1000 : 10); + } + printf("ess_dspwr(0x%02x) timed out.\n", val); + return 0; +} - m3_codec_reset(sc); +static int +ess_cmd(struct ess_info *sc, u_char val) +{ + DEB(printf("ess_cmd: %x\n", val)); + return ess_dspwr(sc, val); +} - /* Restore the ASSP state */ - for (i = REV_B_CODE_MEMORY_BEGIN; i <= REV_B_CODE_MEMORY_END; i++) - m3_wr_assp_code(sc, i, sc->savemem[++index]); - for (i = REV_B_DATA_MEMORY_BEGIN; i <= REV_B_DATA_MEMORY_END; i++) - m3_wr_assp_data(sc, i, sc->savemem[++index]); +static int +ess_cmd1(struct ess_info *sc, u_char cmd, int val) +{ + DEB(printf("ess_cmd1: %x, %x\n", cmd, val)); + if (ess_dspwr(sc, cmd)) { + return ess_dspwr(sc, val & 0xff); + } else return 0; +} - /* Restart the DMA engine */ - m3_wr_assp_data(sc, KDATA_DMA_ACTIVE, 0); +static void +ess_setmixer(struct ess_info *sc, u_int port, u_int value) +{ + u_long flags; - /* [m3_assp_continue] */ - m3_wr_1(sc, DSP_PORT_CONTROL_REG_B, reset_state | REGB_ENABLE_RESET); + DEB(printf("ess_setmixer: reg=%x, val=%x\n", port, value);) + flags = spltty(); + ess_wr(sc, SB_MIX_ADDR, (u_char) (port & 0xff)); /* Select register */ + DELAY(10); + ess_wr(sc, SB_MIX_DATA, (u_char) (value & 0xff)); + DELAY(10); + splx(flags); +} - m3_amp_enable(sc); +static int +ess_getmixer(struct ess_info *sc, u_int port) +{ + int val; + u_long flags; - m3_enable_ints(sc); + flags = spltty(); + ess_wr(sc, SB_MIX_ADDR, (u_char) (port & 0xff)); /* Select register */ + DELAY(10); + val = ess_rd(sc, SB_MIX_DATA); + DELAY(10); + splx(flags); - if (mixer_reinit(dev) == -1) { - device_printf(dev, "unable to reinitialize the mixer\n"); - return ENXIO; - } + return val; +} - /* Turn the channels back on */ - for (i=0 ; ipch_cnt ; i++) { - if (sc->pch[i].active) { - m3_pchan_trigger(NULL, &sc->pch[i], PCMTRIG_START); - } - } - for (i=0 ; irch_cnt ; i++) { - if (sc->rch[i].active) { - m3_rchan_trigger(NULL, &sc->rch[i], PCMTRIG_START); - } - } +static int +ess_get_byte(struct ess_info *sc) +{ + int i; - return 0; + for (i = 1000; i > 0; i--) { + if (ess_rd(sc, 0xc) & 0x40) + return ess_rd(sc, DSP_READ); + else + DELAY(20); + } + return -1; } static int -m3_pci_shutdown(device_t dev) +ess_write(struct ess_info *sc, u_char reg, int val) { - struct sc_info *sc = pcm_getdevinfo(dev); + return ess_cmd1(sc, reg, val); +} - M3_DEBUG(CALL, ("m3_pci_shutdown\n")); - - m3_power(sc, 3); /* power off */ - return 0; +static int +ess_read(struct ess_info *sc, u_char reg) +{ + return (ess_cmd(sc, 0xc0) && ess_cmd(sc, reg))? ess_get_byte(sc) : -1; } -static u_int8_t -m3_assp_halt(struct sc_info *sc) +static int +ess_reset_dsp(struct ess_info *sc) { - u_int8_t data, reset_state; - - data = m3_rd_1(sc, DSP_PORT_CONTROL_REG_B); - reset_state = data & ~REGB_STOP_CLOCK; /* remember for continue */ - DELAY(10 * 1000); - m3_wr_1(sc, DSP_PORT_CONTROL_REG_B, reset_state & ~REGB_ENABLE_RESET); - DELAY(10 * 1000); /* necessary? */ - - return reset_state; + DEB(printf("ess_reset_dsp\n")); + ess_wr(sc, SBDSP_RST, 3); + DELAY(100); + ess_wr(sc, SBDSP_RST, 0); + if (ess_get_byte(sc) != 0xAA) { + DEB(printf("ess_reset_dsp failed\n")); +/* + rman_get_start(d->io_base))); +*/ + return ENXIO; /* Sorry */ + } + ess_cmd(sc, 0xc6); + return 0; } static void -m3_config(struct sc_info *sc) +ess_intr(void *arg) { - u_int32_t data, hv_cfg; - int hint; + struct ess_info *sc = (struct ess_info *)arg; + int src, pirq = 0, rirq = 0; - /* - * The volume buttons can be wired up via two different sets of pins. - * This presents a problem since we can't tell which way it's - * configured. Allow the user to set a hint in order to twiddle - * the proper bits. - */ - if (resource_int_value(device_get_name(sc->dev), - device_get_unit(sc->dev), - "hwvol_config", &hint) == 0) - hv_cfg = (hint > 0) ? HV_BUTTON_FROM_GD : 0; - else - hv_cfg = HV_BUTTON_FROM_GD; + src = 0; + if (ess_getmixer(sc, 0x7a) & 0x80) + src |= 2; + if (ess_rd(sc, 0x0c) & 0x01) + src |= 1; - data = pci_read_config(sc->dev, PCI_ALLEGRO_CONFIG, 4); - data &= ~HV_BUTTON_FROM_GD; - data |= REDUCED_DEBOUNCE | HV_CTRL_ENABLE | hv_cfg; - data |= PM_CTRL_ENABLE | CLK_DIV_BY_49 | USE_PCI_TIMING; - pci_write_config(sc->dev, PCI_ALLEGRO_CONFIG, data, 4); + if (src == 0) + return; - m3_wr_1(sc, ASSP_CONTROL_B, RESET_ASSP); - data = pci_read_config(sc->dev, PCI_ALLEGRO_CONFIG, 4); - data &= ~INT_CLK_SELECT; - if (sc->which == ESS_MAESTRO3) { - data &= ~INT_CLK_MULT_ENABLE; - data |= INT_CLK_SRC_NOT_PCI; + if (sc->duplex) { + pirq = (src & sc->pch.hwch)? 1 : 0; + rirq = (src & sc->rch.hwch)? 1 : 0; + } else { + if (sc->simplex_dir == PCMDIR_PLAY) + pirq = 1; + if (sc->simplex_dir == PCMDIR_REC) + rirq = 1; + if (!pirq && !rirq) + printf("solo: IRQ neither playback nor rec!\n"); } - data &= ~(CLK_MULT_MODE_SELECT | CLK_MULT_MODE_SELECT_2); - pci_write_config(sc->dev, PCI_ALLEGRO_CONFIG, data, 4); - if (sc->which == ESS_ALLEGRO_1) { - data = pci_read_config(sc->dev, PCI_USER_CONFIG, 4); - data |= IN_CLK_12MHZ_SELECT; - pci_write_config(sc->dev, PCI_USER_CONFIG, data, 4); - } + DEB(printf("ess_intr: pirq:%d rirq:%d\n",pirq,rirq)); - data = m3_rd_1(sc, ASSP_CONTROL_A); - data &= ~(DSP_CLK_36MHZ_SELECT | ASSP_CLK_49MHZ_SELECT); - data |= ASSP_CLK_49MHZ_SELECT; /*XXX assumes 49MHZ dsp XXX*/ - data |= ASSP_0_WS_ENABLE; - m3_wr_1(sc, ASSP_CONTROL_A, data); - - m3_wr_1(sc, ASSP_CONTROL_B, RUN_ASSP); -} - -static void -m3_enable_ints(struct sc_info *sc) -{ - u_int8_t data; - - m3_wr_2(sc, HOST_INT_CTRL, ASSP_INT_ENABLE | HV_INT_ENABLE); - data = m3_rd_1(sc, ASSP_CONTROL_C); - m3_wr_1(sc, ASSP_CONTROL_C, data | ASSP_HOST_INT_ENABLE); -} - -static void -m3_amp_enable(struct sc_info *sc) -{ -0xb8, ess_read(sc, 0xb8) & ~0x01); + if (pirq) { + if (sc->pch.stopping) { + ess_dmatrigger(sc, sc->pch.hwch, 0); + sc->pch.stopping = 0; + if (sc->pch.hwch == 1) + ess_write(sc, 0xb8, ess_read(sc, 0xb8) & ~0x01); else ess_setmixer(sc, 0x78, ess_getmixer(sc, 0x78) & ~0x03); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 2 12:53:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA53E37B401; Mon, 2 Sep 2002 12:53:05 -0700 (PDT) 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 731BE37B400; Mon, 2 Sep 2002 12:53:05 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F49C43E65; Mon, 2 Sep 2002 12:53:02 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g82JqgOo007425; Mon, 2 Sep 2002 15:52:42 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Mon, 2 Sep 2002 15:52:42 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16816 for review In-Reply-To: <200208302100.g7UL0hW3027550@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Hmm. I suspect the reason for ucontext.h was that that's the API exposed by Solaris and other platforms with those context management primitives. On Solaris, /usr/include/ucontext.h defines the userland API, and does a nested include of /usr/include/sys/ucontext.h for some of the structures, and the APIs for the system calls. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Fri, 30 Aug 2002, Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16816 > > Change 16816 by mini@mini_stylus on 2002/08/30 13:59:58 > > -> > > Affected files ... > > .. //depot/projects/kse/lib/libc/alpha/gen/makecontext.c#2 edit > > Differences ... > > ==== //depot/projects/kse/lib/libc/alpha/gen/makecontext.c#2 (text+ko) ==== > > @@ -29,10 +29,10 @@ > > #include > #include > +#include > > #include > #include > -#include > #include > > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 2 12:57:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 464D837B401; Mon, 2 Sep 2002 12:57:49 -0700 (PDT) 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 D4C9437B400; Mon, 2 Sep 2002 12:57:48 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF34443E3B; Mon, 2 Sep 2002 12:57:47 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g82JvQOo007882; Mon, 2 Sep 2002 15:57:26 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Mon, 2 Sep 2002 15:57:26 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Jonathan Mini Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 16871 for review In-Reply-To: <20020831225944.GR3751@elvis.mu.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG You know, when you're done, it would be really cool to have a Design and Implementation of KSE on FreeBSD document :-). That way I can find myself a clue regarding it :-). Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Sat, 31 Aug 2002, Jonathan Mini wrote: > Julian Elischer [julian@elischer.org] wrote : > > > sounds good, but I'd apreciate a 3 or 4 paragraph description of what you > > are doing as it varies a little from what we discussed.. > > > > pitty you aren't in the bay area any more.. > > A whiteboard would be good... > > Yeah. Whiteboards are nice. > > Again, from the top: > > The kse_mailbox and thread_mailboxe maintain a ucontext_t. This ucontext_t > has a bit of optional behaviour, which does this: > - SKIPSIGMASK skips the signal mask get/sets, so that we can > swapcontext() w/o making any syscalls. Also, caught signals > will be handled via an upcall to the UTS later. > - OBEYBUSY which makes setcontext() fail if uc_busy is set. > By now, I'm thinking we might not need this. > - CLEARSTATE, which requests that setcontext() clear any state > flags. > The state flags are: > - CRITICAL: in a critical section. This causes > thread_userret() to return to the thread instead of doing an > upcall, basically enforsing synchronous syscalls for that > thread for that time period. CRITICAL on the UTS's context > isn't honored. It's assumed that a uc_busy uts context is also > CRITICAL. > - SWAPPED: used by swapcontext() isntead of the int swapped on the > stack. I think this is kind of broken at the moment. The reason > for this is related to objections by jake (among others) about > using the stack during swapcontext(). > uc_busy is a seperate int because it needs to be set/checked atmoically. > > These are optional so that default *context functions work just > like they do on solaris or wherever. > > So, the way a thread is scheduled is like this: > > 1) An upcall is made, doing a thread_setcontext() on the ucontext_t > in the kse_maibox in userland. > 2) The UTS comes out of the state in the ucontext_t, either from the inital > state set by makecontext() or the state saved the last time it > swapcontext()'d out. > 3) The UTS checks for any threads in the completed list, and adds them to > the run queue. > 4) The UTS grabs a thread from the run queue. > 5) We know the thread wasn't in a CRITICAL state already, or it wouldn't > have been passed in via the upcall, so we don't have to worry about > stomping on the changes to CRITICAL made by the thread itself. > We set CRITICAL and CLEARSTATE on it. > 6) We set kse_mailbox.km_curthread to the thread_mailbox we selected. > 7) We swapcontext() into the thread's ucontext_t: > a) we getcontext() for the UTS context. > b) then, we mark uc_busy 0, freeing the UTS for further calls. > However, at this point, we are seen by the kernel as in a > critical section for the thread we're about to switch to, > so any traps in the kernel (such as syscalls) will return to > us instead of doing another upcall. > c) we setcontext() to the thread's ucontext_t, which restores machine > state, and clears the CRITICAL flag because it sees CLEARSTATE > set. > 8) execution continues as the scheduled thread. > > Upon reviewing this, I see that CLEARSTATE needs to be a flag, > not an option, so that it is also cleared when setcontext clears > the CRITICAL flag. > > So, I guess the right terminoligy would be persistent/temporary, and not > option/flag. > > My current plan is that signals will work like this: > 1) The process will request signal delivery via the uts. > 2) A catchable signal is delivered to the process and added to a sigset > kept in the kse_mailbox. > 1) An upcall is made to notify the UTS of the signal. > 2) The uts sees the signals caught thus far, and selects a thread to > receive the signal. > 3) It adds a signal frame to the context of the thread by calling > signalcontext(), which will do the same thing the kernel does to a > ucontext_t when delivering a signal to a process on that arch. > 4) It adds the signal to the runqueue, and it gets scheduled normally. > > Signals are a bit more complex than that, because of sigaltstack, and a few > other complications, but you get the basic idea. > > I hope all of that is clear. > > -- > Jonathan Mini > http://www.freebsd.org/ > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 2 13: 1:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 451B537B401; Mon, 2 Sep 2002 13:01:14 -0700 (PDT) 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 40AF437B405; Mon, 2 Sep 2002 13:01:13 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CA1243E42; Mon, 2 Sep 2002 13:01:12 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 67890AE1D7; Mon, 2 Sep 2002 13:01:12 -0700 (PDT) Date: Mon, 2 Sep 2002 13:01:12 -0700 From: Jonathan Mini To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16816 for review Message-ID: <20020902200112.GY3751@elvis.mu.org> References: <200208302100.g7UL0hW3027550@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson [rwatson@FreeBSD.org] wrote : > Hmm. I suspect the reason for ucontext.h was that that's the API exposed > by Solaris and other platforms with those context management primitives. > On Solaris, /usr/include/ucontext.h defines the userland API, and does a > nested include of /usr/include/sys/ucontext.h for some of the structures, > and the APIs for the system calls. Well, I suspect the same thing. I moved to sys/ucontext.h because on our system we have both, and I was getting nightmarishly-reoccuring problems with my not matching my while I was modifying the sys/ version. What we do in the cvs repo will most likely be . I'd like to see include , because the ucontext_t structure is defined by the kernel and then exported to userland (even though the *context() functions aren't syscalls). I dunno. I'll bow to more experienced hands on where to stuff these headers. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 2 13: 4: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6498937B405; Mon, 2 Sep 2002 13:03:59 -0700 (PDT) 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 0599C37B400; Mon, 2 Sep 2002 13:03:59 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0943F43E4A; Mon, 2 Sep 2002 13:03:58 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 25C44AE160; Mon, 2 Sep 2002 13:03:56 -0700 (PDT) Date: Mon, 2 Sep 2002 13:03:56 -0700 From: Jonathan Mini To: Robert Watson Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 16871 for review Message-ID: <20020902200356.GZ3751@elvis.mu.org> References: <20020831225944.GR3751@elvis.mu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson [rwatson@FreeBSD.org] wrote : > You know, when you're done, it would be really cool to have a Design and > Implementation of KSE on FreeBSD document :-). That way I can find myself > a clue regarding it :-). I'm actually planning something like that. I plan on doing a throurough review and cleanup of KSE soon (as soon as a prototype KSE-aware libpthread is done), and producing a design/implementation document is my eventual goal. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 2 13: 7: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36B1837B400; Mon, 2 Sep 2002 13:07:05 -0700 (PDT) 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 C5DC337B401; Mon, 2 Sep 2002 13:07:04 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D27743E4A; Mon, 2 Sep 2002 13:07:04 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g82K6iOo008901; Mon, 2 Sep 2002 16:06:44 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Mon, 2 Sep 2002 16:06:43 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Jonathan Mini Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 16871 for review In-Reply-To: <20020902200356.GZ3751@elvis.mu.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, 2 Sep 2002, Jonathan Mini wrote: > Robert Watson [rwatson@FreeBSD.org] wrote : > > > You know, when you're done, it would be really cool to have a Design and > > Implementation of KSE on FreeBSD document :-). That way I can find myself > > a clue regarding it :-). > > I'm actually planning something like that. I plan on doing a throurough > review and cleanup of KSE soon (as soon as a prototype KSE-aware > libpthread is done), and producing a design/implementation document is > my eventual goal. I realize that an implementation document would probably be a bit premature at this point :-) Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 2 13:11:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B583637B401; Mon, 2 Sep 2002 13:11:15 -0700 (PDT) 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 57F6837B400; Mon, 2 Sep 2002 13:11:15 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1740843E65; Mon, 2 Sep 2002 13:11:15 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id E3F75AE211; Mon, 2 Sep 2002 13:11:14 -0700 (PDT) Date: Mon, 2 Sep 2002 13:11:14 -0700 From: Jonathan Mini To: Robert Watson Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 16871 for review Message-ID: <20020902201114.GA3751@elvis.mu.org> References: <20020902200356.GZ3751@elvis.mu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson [rwatson@FreeBSD.org] wrote : > > On Mon, 2 Sep 2002, Jonathan Mini wrote: > > > Robert Watson [rwatson@FreeBSD.org] wrote : > > > > > You know, when you're done, it would be really cool to have a Design and > > > Implementation of KSE on FreeBSD document :-). That way I can find myself > > > a clue regarding it :-). > > > > I'm actually planning something like that. I plan on doing a throurough > > review and cleanup of KSE soon (as soon as a prototype KSE-aware > > libpthread is done), and producing a design/implementation document is > > my eventual goal. > > I realize that an implementation document would probably be a bit > premature at this point :-) > I think even a design document might be a bit premature as well, but a set of working notes that captures where we are now (that I'll make some effort to keep on top of) will be very valueble, and will eventually serve well to guide a more formal document. But for now, I'm going to push forward and work on the libpthread stuff. I'm not too far away, which is cause for some celebration, I think. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 2 13:18:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3E6437B401; Mon, 2 Sep 2002 13:18:46 -0700 (PDT) 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 7376837B400; Mon, 2 Sep 2002 13:18:46 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id C79AB43E3B; Mon, 2 Sep 2002 13:18:45 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g82KIPOo010280; Mon, 2 Sep 2002 16:18:25 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Mon, 2 Sep 2002 16:18:25 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Jonathan Mini Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 16871 for review In-Reply-To: <20020902201114.GA3751@elvis.mu.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, 2 Sep 2002, Jonathan Mini wrote: > I think even a design document might be a bit premature as well, but a > set of working notes that captures where we are now (that I'll make some > effort to keep on top of) will be very valueble, and will eventually > serve well to guide a more formal document. > > But for now, I'm going to push forward and work on the libpthread stuff. > I'm not too far away, which is cause for some celebration, I think. That would be very cool. It will probably take a while to get out all the scheduling and locking nits, etc, but I am really looking forward to having a prototype working. I have to admit I'm really looking forward to having an Apache2 that rocks on FreeBSD :-) Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 2 13:29:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA71337B405; Mon, 2 Sep 2002 13:29:28 -0700 (PDT) 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 7B92037B400; Mon, 2 Sep 2002 13:29:28 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DA6743E6A; Mon, 2 Sep 2002 13:29:28 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id CF7B7AE160; Mon, 2 Sep 2002 13:29:27 -0700 (PDT) Date: Mon, 2 Sep 2002 13:29:27 -0700 From: Jonathan Mini To: Robert Watson Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 16871 for review Message-ID: <20020902202927.GB3751@elvis.mu.org> References: <20020902201114.GA3751@elvis.mu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.3.27i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson [rwatson@FreeBSD.org] wrote : > On Mon, 2 Sep 2002, Jonathan Mini wrote: > > > But for now, I'm going to push forward and work on the libpthread stuff. > > I'm not too far away, which is cause for some celebration, I think. > > That would be very cool. It will probably take a while to get out all the > scheduling and locking nits, etc, but I am really looking forward to > having a prototype working. I have to admit I'm really looking forward to > having an Apache2 that rocks on FreeBSD :-) Yeah. I'm hoping soon soon soon. Maybe this week? This next week might be a bit turbulent. Hopefully I'll be moving to Seattle very soon, but I want to hammer this out before I do that, because things will be quite hectic for some time during and after the move, I think. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 2 21:27: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8A7237B401; Mon, 2 Sep 2002 21:25:51 -0700 (PDT) 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 7AF1E37B400 for ; Mon, 2 Sep 2002 21:25:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E36F43E65 for ; Mon, 2 Sep 2002 21:25:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g834PoJU014095 for ; Mon, 2 Sep 2002 21:25:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g834OUPM013605 for perforce@freebsd.org; Mon, 2 Sep 2002 21:24:30 -0700 (PDT) Date: Mon, 2 Sep 2002 21:24:30 -0700 (PDT) Message-Id: <200209030424.g834OUPM013605@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16978 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16978 Change 16978 by peter@peter_overcee on 2002/09/02 21:23:38 IFC @16975 (new gcc, binutils) Affected files ... .. //depot/projects/ia64/MAINTAINERS#14 integrate .. //depot/projects/ia64/Makefile#13 integrate .. //depot/projects/ia64/contrib/binutils/bfd/ChangeLog#6 integrate .. //depot/projects/ia64/contrib/binutils/bfd/elf64-alpha.c#5 integrate .. //depot/projects/ia64/contrib/binutils/bfd/version.h#4 integrate .. //depot/projects/ia64/contrib/binutils/binutils/binutils.texi#2 delete .. //depot/projects/ia64/contrib/binutils/binutils/config.texi#2 delete .. //depot/projects/ia64/contrib/binutils/binutils/configure.in#5 integrate .. //depot/projects/ia64/contrib/binutils/binutils/cxxfilt.man#2 delete .. //depot/projects/ia64/contrib/binutils/etc/ChangeLog#1 branch .. //depot/projects/ia64/contrib/binutils/etc/Makefile.in#1 branch .. //depot/projects/ia64/contrib/binutils/gprof/po/Make-in#1 branch .. //depot/projects/ia64/contrib/binutils/gprof/po/POTFILES.in#1 branch .. //depot/projects/ia64/contrib/binutils/gprof/po/gprof.pot#1 branch .. //depot/projects/ia64/contrib/binutils/include/elf/arm-oabi.h#2 delete .. //depot/projects/ia64/contrib/binutils/ld/ChangeLog#6 integrate .. //depot/projects/ia64/contrib/binutils/ld/configdoc.texi#2 delete .. //depot/projects/ia64/contrib/binutils/ld/emulparams/armelf_linux26.sh#2 delete .. //depot/projects/ia64/contrib/binutils/ld/ldlang.c#5 integrate .. //depot/projects/ia64/contrib/binutils/ld/scripttempl/elfppc.sc#2 delete .. //depot/projects/ia64/contrib/binutils/libiberty/acconfig.h#2 delete .. //depot/projects/ia64/contrib/binutils/libiberty/alloca-conf.h#2 delete .. //depot/projects/ia64/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/contrib/cvs/HACKING#2 integrate .. //depot/projects/ia64/contrib/cvs/INSTALL#2 integrate .. //depot/projects/ia64/contrib/cvs/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/cvs/NEWS#2 integrate .. //depot/projects/ia64/contrib/cvs/README#2 integrate .. //depot/projects/ia64/contrib/cvs/TESTS#2 integrate .. //depot/projects/ia64/contrib/cvs/TODO#2 integrate .. //depot/projects/ia64/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/ia64/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/ia64/contrib/cvs/compile#1 branch .. //depot/projects/ia64/contrib/cvs/config.h.in#2 integrate .. //depot/projects/ia64/contrib/cvs/configure#2 integrate .. //depot/projects/ia64/contrib/cvs/configure.in#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/pvcs2rcs.in#1 branch .. //depot/projects/ia64/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/ia64/contrib/cvs/depcomp#2 integrate .. //depot/projects/ia64/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/cvs/diff/diff3.c#2 integrate .. //depot/projects/ia64/contrib/cvs/diff/io.c#2 integrate .. //depot/projects/ia64/contrib/cvs/diff/system.h#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/mdate-sh#1 branch .. //depot/projects/ia64/contrib/cvs/doc/stamp-1#1 branch .. //depot/projects/ia64/contrib/cvs/doc/stamp-vti#1 branch .. //depot/projects/ia64/contrib/cvs/doc/version-client.texi#1 branch .. //depot/projects/ia64/contrib/cvs/doc/version.texi#1 branch .. //depot/projects/ia64/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/fnmatch.c#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/getdate.y#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/getline.c#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/valloc.c#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/xselect.h#2 integrate .. //depot/projects/ia64/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/cvs/man/cvs.1#3 integrate .. //depot/projects/ia64/contrib/cvs/man/cvs.5#2 integrate .. //depot/projects/ia64/contrib/cvs/mdate-sh#1 branch .. //depot/projects/ia64/contrib/cvs/noautomake.sh#1 branch .. //depot/projects/ia64/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/client.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/client.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/error.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/history.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/import.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/log.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/login.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/main.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/prepend_args.c#2 delete .. //depot/projects/ia64/contrib/cvs/src/prepend_args.h#2 delete .. //depot/projects/ia64/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/root.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/root.h#1 branch .. //depot/projects/ia64/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/ia64/contrib/cvs/src/server.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/server.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/update.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/version.c#1 branch .. //depot/projects/ia64/contrib/cvs/src/version.c.in#2 delete .. //depot/projects/ia64/contrib/cvs/src/version.h.in#1 branch .. //depot/projects/ia64/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/ia64/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/cvs/tools/README#2 integrate .. //depot/projects/ia64/contrib/gcc/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/gcc/Makefile.in#5 integrate .. //depot/projects/ia64/contrib/gcc/alias.c#5 integrate .. //depot/projects/ia64/contrib/gcc/attribs.c#3 integrate .. //depot/projects/ia64/contrib/gcc/bb-reorder.c#3 integrate .. //depot/projects/ia64/contrib/gcc/bitmap.c#3 integrate .. //depot/projects/ia64/contrib/gcc/builtins.c#4 integrate .. //depot/projects/ia64/contrib/gcc/c-common.c#5 integrate .. //depot/projects/ia64/contrib/gcc/c-decl.c#6 integrate .. //depot/projects/ia64/contrib/gcc/c-lang.c#4 integrate .. //depot/projects/ia64/contrib/gcc/c-lex.c#5 integrate .. //depot/projects/ia64/contrib/gcc/c-pragma.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cfgcleanup.c#3 integrate .. //depot/projects/ia64/contrib/gcc/cfgrtl.c#3 integrate .. //depot/projects/ia64/contrib/gcc/collect2.c#5 integrate .. //depot/projects/ia64/contrib/gcc/combine.c#5 integrate .. //depot/projects/ia64/contrib/gcc/config.gcc#3 integrate .. //depot/projects/ia64/contrib/gcc/config.in#4 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/alpha.c#5 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/alpha.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/elf.h#5 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/netbsd.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/alpha/unicosmk.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm.c#3 integrate .. //depot/projects/ia64/contrib/gcc/config/arm/arm.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386-protos.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386.c#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386.h#6 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/i386.md#5 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/linux64.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/mmintrin.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/netbsd64.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/openbsd.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/i386/unix.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/linux.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/ia64/sysv4.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix43.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/aix51.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/altivec.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/linux64.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/netbsd.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.c#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/rs6000.md#3 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/sysv4.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/rs6000/xcoff.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/netbsd-elf.h#2 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/openbsd1-64.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/sparc/openbsd64.h#1 branch .. //depot/projects/ia64/contrib/gcc/config/sparc/sol2.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sparc-protos.h#3 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sparc.c#5 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/sparc.h#4 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/t-crtfm#2 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/t-linux64#4 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/t-sol2-64#3 integrate .. //depot/projects/ia64/contrib/gcc/configure#5 integrate .. //depot/projects/ia64/contrib/gcc/configure.in#5 integrate .. //depot/projects/ia64/contrib/gcc/convert.c#3 integrate .. //depot/projects/ia64/contrib/gcc/cp-demangle.c#2 integrate .. //depot/projects/ia64/contrib/gcc/cp/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/gcc/cp/Make-lang.in#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/call.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/class.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/cp-lang.c#2 integrate .. //depot/projects/ia64/contrib/gcc/cp/cp-tree.h#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/cvt.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/decl.c#5 integrate .. //depot/projects/ia64/contrib/gcc/cp/decl2.c#5 integrate .. //depot/projects/ia64/contrib/gcc/cp/error.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/init.c#5 integrate .. //depot/projects/ia64/contrib/gcc/cp/lang-specs.h#5 integrate .. //depot/projects/ia64/contrib/gcc/cp/lex.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/mangle.c#3 integrate .. //depot/projects/ia64/contrib/gcc/cp/operators.def#2 integrate .. //depot/projects/ia64/contrib/gcc/cp/pt.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/rtti.c#3 integrate .. //depot/projects/ia64/contrib/gcc/cp/search.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/tree.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/typeck.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cp/typeck2.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cppfiles.c#3 integrate .. //depot/projects/ia64/contrib/gcc/cppinit.c#6 integrate .. //depot/projects/ia64/contrib/gcc/cpplib.c#4 integrate .. //depot/projects/ia64/contrib/gcc/cpplib.h#4 integrate .. //depot/projects/ia64/contrib/gcc/cppmacro.c#3 integrate .. //depot/projects/ia64/contrib/gcc/cse.c#5 integrate .. //depot/projects/ia64/contrib/gcc/cselib.c#3 integrate .. //depot/projects/ia64/contrib/gcc/defaults.h#4 integrate .. //depot/projects/ia64/contrib/gcc/doc/contrib.texi#3 integrate .. //depot/projects/ia64/contrib/gcc/doc/cpp.texi#3 integrate .. //depot/projects/ia64/contrib/gcc/doc/cppenv.texi#2 integrate .. //depot/projects/ia64/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/ia64/contrib/gcc/doc/invoke.texi#3 integrate .. //depot/projects/ia64/contrib/gcc/doc/md.texi#3 integrate .. //depot/projects/ia64/contrib/gcc/doc/tm.texi#3 integrate .. //depot/projects/ia64/contrib/gcc/dwarf2out.c#5 integrate .. //depot/projects/ia64/contrib/gcc/dwarfout.c#3 integrate .. //depot/projects/ia64/contrib/gcc/emit-rtl.c#6 integrate .. //depot/projects/ia64/contrib/gcc/explow.c#4 integrate .. //depot/projects/ia64/contrib/gcc/expmed.c#5 integrate .. //depot/projects/ia64/contrib/gcc/expr.c#5 integrate .. //depot/projects/ia64/contrib/gcc/expr.h#5 integrate .. //depot/projects/ia64/contrib/gcc/f/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/gcc/f/bugs.texi#4 integrate .. //depot/projects/ia64/contrib/gcc/f/news.texi#4 integrate .. //depot/projects/ia64/contrib/gcc/f/root.texi#4 integrate .. //depot/projects/ia64/contrib/gcc/f/target.h#4 integrate .. //depot/projects/ia64/contrib/gcc/f/version.c#5 integrate .. //depot/projects/ia64/contrib/gcc/final.c#5 integrate .. //depot/projects/ia64/contrib/gcc/flow.c#5 integrate .. //depot/projects/ia64/contrib/gcc/fold-const.c#5 integrate .. //depot/projects/ia64/contrib/gcc/function.c#5 integrate .. //depot/projects/ia64/contrib/gcc/gcc.c#7 integrate .. //depot/projects/ia64/contrib/gcc/haifa-sched.c#4 integrate .. //depot/projects/ia64/contrib/gcc/hooks.c#2 integrate .. //depot/projects/ia64/contrib/gcc/hooks.h#2 integrate .. //depot/projects/ia64/contrib/gcc/ifcvt.c#3 integrate .. //depot/projects/ia64/contrib/gcc/langhooks-def.h#3 integrate .. //depot/projects/ia64/contrib/gcc/langhooks.c#3 integrate .. //depot/projects/ia64/contrib/gcc/langhooks.h#3 integrate .. //depot/projects/ia64/contrib/gcc/libgcc2.c#3 integrate .. //depot/projects/ia64/contrib/gcc/local-alloc.c#4 integrate .. //depot/projects/ia64/contrib/gcc/loop.c#5 integrate .. //depot/projects/ia64/contrib/gcc/objc/Make-lang.in#3 integrate .. //depot/projects/ia64/contrib/gcc/objc/objc-lang.c#3 integrate .. //depot/projects/ia64/contrib/gcc/optabs.c#5 integrate .. //depot/projects/ia64/contrib/gcc/print-rtl.c#3 integrate .. //depot/projects/ia64/contrib/gcc/reg-stack.c#4 integrate .. //depot/projects/ia64/contrib/gcc/regclass.c#4 integrate .. //depot/projects/ia64/contrib/gcc/regmove.c#4 integrate .. //depot/projects/ia64/contrib/gcc/reload.c#5 integrate .. //depot/projects/ia64/contrib/gcc/reload1.c#5 integrate .. //depot/projects/ia64/contrib/gcc/rtl.h#5 integrate .. //depot/projects/ia64/contrib/gcc/sched-deps.c#3 integrate .. //depot/projects/ia64/contrib/gcc/sched-int.h#3 integrate .. //depot/projects/ia64/contrib/gcc/stor-layout.c#4 integrate .. //depot/projects/ia64/contrib/gcc/system.h#5 integrate .. //depot/projects/ia64/contrib/gcc/toplev.c#6 integrate .. //depot/projects/ia64/contrib/gcc/tradcpp.c#3 integrate .. //depot/projects/ia64/contrib/gcc/tree-inline.c#3 integrate .. //depot/projects/ia64/contrib/gcc/unroll.c#5 integrate .. //depot/projects/ia64/contrib/gcc/varasm.c#5 integrate .. //depot/projects/ia64/contrib/gcc/version.c#6 integrate .. //depot/projects/ia64/contrib/libf2c/ChangeLog#4 integrate .. //depot/projects/ia64/contrib/libf2c/aclocal.m4#2 integrate .. //depot/projects/ia64/contrib/libf2c/configure#4 integrate .. //depot/projects/ia64/contrib/libf2c/configure.in#4 integrate .. //depot/projects/ia64/contrib/libf2c/libF77/Version.c#4 integrate .. //depot/projects/ia64/contrib/libf2c/libI77/Version.c#4 integrate .. //depot/projects/ia64/contrib/libf2c/libU77/Version.c#4 integrate .. //depot/projects/ia64/contrib/libobjc/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/libobjc/aclocal.m4#2 integrate .. //depot/projects/ia64/contrib/libobjc/configure#4 integrate .. //depot/projects/ia64/contrib/libobjc/configure.in#4 integrate .. //depot/projects/ia64/contrib/libstdc++/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/libstdc++/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/libstdc++/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/libstdc++/acinclude.m4#2 integrate .. //depot/projects/ia64/contrib/libstdc++/aclocal.m4#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config.h.in#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/abi/i686-pc-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/ia64/contrib/libstdc++/config/cpu/m68k/bits/atomicity.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/linker-map.gnu#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/generic/c_locale.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/generic/ctype_members.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/generic/monetary_members.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/generic/time_members.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/ctype_members.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/messages_members.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/messages_members.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/monetary_members.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/gnu/time_members.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/locale/ieee_1003.1-2001/codecvt_specializations.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/aix/bits/ctype_noninline.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/generic/bits/ctype_noninline.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/gnu-linux/bits/os_defines.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_inline.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_noninline.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix5.2/bits/os_defines.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_inline.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/newlib/bits/ctype_inline.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/newlib/bits/ctype_noninline.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_base.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_inline.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_noninline.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/config/os/qnx/qnx6.1/bits/os_defines.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_base.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_noninline.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.5/bits/os_defines.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_noninline.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.6/bits/os_defines.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/config/os/solaris/solaris2.7/bits/os_defines.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/configure#2 integrate .. //depot/projects/ia64/contrib/libstdc++/configure.in#4 integrate .. //depot/projects/ia64/contrib/libstdc++/configure.target#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/backward/strstream#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/basic_ios.tcc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/basic_string.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/basic_string.tcc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/c++config#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/char_traits.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/fpos.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/fstream.tcc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/istream.tcc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/locale_facets.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/locale_facets.tcc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/ostream.tcc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/sstream.tcc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/stl_bvector.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/stl_deque.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/stl_iterator.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/stl_pair.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/streambuf.tcc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/bits/streambuf_iterator.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/c/std_cerrno.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/c/std_cmath.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/c/std_csetjmp.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/c/std_cstdarg.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/c/std_cstddef.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/c/std_cstdio.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/c/std_cwchar.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/c/std_cwctype.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/assert.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/ctype.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/errno.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/float.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/iso646.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/limits.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/locale.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/math.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/setjmp.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/signal.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/stdarg.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/stddef.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/stdio.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/stdlib.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/string.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/time.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/wchar.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_compatibility/wctype.h#1 branch .. //depot/projects/ia64/contrib/libstdc++/include/c_std/std_cmath.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/algorithm#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/hash_map#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/hash_set#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/iterator#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/numeric#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/rb_tree#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/slist#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/stdio_filebuf.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/stl_hashtable.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/ext/stl_rope.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/std/std_bitset.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/std/std_fstream.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/std/std_istream.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/std/std_memory.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/include/std/std_streambuf.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/libmath/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/libstdc++/libsupc++/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/libstdc++/libsupc++/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/libstdc++/libsupc++/cxxabi.h#2 integrate .. //depot/projects/ia64/contrib/libstdc++/libsupc++/eh_alloc.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/libsupc++/new#2 integrate .. //depot/projects/ia64/contrib/libstdc++/libsupc++/new_handler.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/libsupc++/new_op.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/libsupc++/pure.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/libsupc++/tinfo.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/libsupc++/tinfo2.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/src/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/libstdc++/src/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/libstdc++/src/ext-inst.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/src/fstream-inst.cc#1 branch .. //depot/projects/ia64/contrib/libstdc++/src/fstream.cc#1 branch .. //depot/projects/ia64/contrib/libstdc++/src/io-inst.cc#1 branch .. //depot/projects/ia64/contrib/libstdc++/src/istream-inst.cc#1 branch .. //depot/projects/ia64/contrib/libstdc++/src/locale-inst.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/src/locale.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/src/localename.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/src/misc-inst.cc#2 integrate .. //depot/projects/ia64/contrib/libstdc++/src/ostream-inst.cc#1 branch .. //depot/projects/ia64/contrib/libstdc++/src/sstream-inst.cc#1 branch .. //depot/projects/ia64/contrib/libstdc++/src/streambuf-inst.cc#1 branch .. //depot/projects/ia64/contrib/libstdc++/src/strstream.cc#2 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#18 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#5 integrate .. //depot/projects/ia64/etc/rc.d/mountd#6 integrate .. //depot/projects/ia64/etc/rc.d/sendmail#3 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#17 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes2#11 integrate .. //depot/projects/ia64/gnu/lib/libstdc++/Makefile#10 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/Makefile.inc0#6 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/doc/Makefile#4 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvs/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvs/prepend_args.c#1 branch .. //depot/projects/ia64/gnu/usr.bin/cvs/cvs/prepend_args.h#1 branch .. //depot/projects/ia64/gnu/usr.bin/cvs/doc/Makefile#2 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/lib/config.h#2 integrate .. //depot/projects/ia64/include/stddef.h#4 integrate .. //depot/projects/ia64/include/stdlib.h#11 integrate .. //depot/projects/ia64/include/time.h#8 integrate .. //depot/projects/ia64/kerberos5/usr.bin/krb5-config/Makefile#5 integrate .. //depot/projects/ia64/lib/libc/gen/fmtmsg.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/Makefile.inc#6 integrate .. //depot/projects/ia64/lib/libc/locale/ansi.c#3 delete .. //depot/projects/ia64/lib/libc/locale/mblen.c#1 branch .. //depot/projects/ia64/lib/libc/locale/mbstowcs.c#1 branch .. //depot/projects/ia64/lib/libc/locale/mbtowc.c#1 branch .. //depot/projects/ia64/lib/libc/locale/multibyte.3#3 integrate .. //depot/projects/ia64/lib/libc/locale/wcstombs.c#1 branch .. //depot/projects/ia64/lib/libc/locale/wctomb.c#1 branch .. //depot/projects/ia64/lib/libc/sparc64/fpu/fpu_qp.c#3 integrate .. //depot/projects/ia64/lib/libc/string/bcopy.3#2 integrate .. //depot/projects/ia64/lib/libc/string/bcopy.c#4 integrate .. //depot/projects/ia64/lib/libc/string/bzero.3#2 integrate .. //depot/projects/ia64/lib/libc/string/memset.c#4 integrate .. //depot/projects/ia64/release/alpha/dokern.sh#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#19 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#41 integrate .. //depot/projects/ia64/release/i386/dokern.sh#7 integrate .. //depot/projects/ia64/sbin/clri/clri.c#8 integrate .. //depot/projects/ia64/share/man/man4/Makefile#15 integrate .. //depot/projects/ia64/share/man/man4/ahd.4#1 branch .. //depot/projects/ia64/share/termcap/termcap.src#9 integrate .. //depot/projects/ia64/sys/alpha/alpha/elf_machdep.c#5 integrate .. //depot/projects/ia64/sys/alpha/include/ansi.h#12 delete .. //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#7 integrate .. //depot/projects/ia64/sys/alpha/osf1/osf1_sysvec.c#4 integrate .. //depot/projects/ia64/sys/arm/include/ansi.h#10 delete .. //depot/projects/ia64/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/ia64/sys/boot/i386/boot2/boot2.c#9 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/Makefile#8 integrate .. //depot/projects/ia64/sys/cam/cam_periph.c#4 integrate .. //depot/projects/ia64/sys/cam/cam_xpt.c#9 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.c#9 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#7 integrate .. //depot/projects/ia64/sys/compat/linux/linux_getcwd.c#6 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#13 integrate .. //depot/projects/ia64/sys/compat/linux/linux_signal.c#4 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#6 integrate .. //depot/projects/ia64/sys/compat/linux/linux_sysctl.c#2 integrate .. //depot/projects/ia64/sys/compat/linux/linux_uid16.c#5 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/ia64/sys/compat/linux/linux_util.h#4 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#10 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#11 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#8 integrate .. //depot/projects/ia64/sys/conf/NOTES#21 integrate .. //depot/projects/ia64/sys/conf/files#39 integrate .. //depot/projects/ia64/sys/conf/files.i386#17 integrate .. //depot/projects/ia64/sys/conf/files.pc98#14 integrate .. //depot/projects/ia64/sys/conf/options#28 integrate .. //depot/projects/ia64/sys/ddb/db_ps.c#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_eisa.c#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#5 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7770.c#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.reg#2 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.c#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.h#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.reg#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.seq#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_93cx6.c#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_93cx6.h#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_inline.h#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.h#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/Makefile#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm.c#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm.h#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_gram.y#5 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_scan.l#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#4 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/drm_drv.h#4 integrate .. //depot/projects/ia64/sys/dev/drm/drm_linux.h#2 delete .. //depot/projects/ia64/sys/dev/drm/drm_os_freebsd.h#5 integrate .. //depot/projects/ia64/sys/dev/ispfw/asm_2100.h#3 integrate .. //depot/projects/ia64/sys/dev/ispfw/asm_2200.h#3 integrate .. //depot/projects/ia64/sys/dev/ispfw/asm_2300.h#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.c#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.h#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.c#3 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_freebsd.h#3 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#7 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#5 integrate .. //depot/projects/ia64/sys/dev/puc/puc_pccard.c#1 branch .. //depot/projects/ia64/sys/dev/puc/puc_pci.c#1 branch .. //depot/projects/ia64/sys/dev/puc/pucdata.c#6 integrate .. //depot/projects/ia64/sys/dev/puc/pucvar.h#3 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_subr.c#3 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#19 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#20 integrate .. //depot/projects/ia64/sys/i386/i386/db_interface.c#6 integrate .. //depot/projects/ia64/sys/i386/i386/elf_machdep.c#6 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/ia64/sys/i386/include/ansi.h#11 delete .. //depot/projects/ia64/sys/i386/include/param.h#3 integrate .. //depot/projects/ia64/sys/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#12 integrate .. //depot/projects/ia64/sys/i4b/capi/capi_l4if.c#5 integrate .. //depot/projects/ia64/sys/i4b/capi/capi_llif.c#2 integrate .. //depot/projects/ia64/sys/i4b/capi/capi_msgs.c#2 integrate .. //depot/projects/ia64/sys/i4b/capi/iavc/iavc_card.c#3 integrate .. //depot/projects/ia64/sys/i4b/capi/iavc/iavc_isa.c#6 integrate .. //depot/projects/ia64/sys/i4b/capi/iavc/iavc_lli.c#4 integrate .. //depot/projects/ia64/sys/i4b/capi/iavc/iavc_pci.c#6 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_ctl.c#4 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_ing.c#6 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_ipr.c#6 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_isppp.c#4 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_rbch.c#6 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_tel.c#4 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_trace.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer1/i4b_l1dmux.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#7 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_bchan.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_ctx_s0P.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_diva.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_dynalink.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_hscx.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_isac.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_isic_pnp.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_l1.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_l1fsm.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_siemens_isurf.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_sws.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate .. //depot/projects/ia64/sys/i4b/layer1/itjc/i4b_itjc_isac.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/itjc/i4b_itjc_l1.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/itjc/i4b_itjc_pci.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer1/iwic/i4b_iwic_pci.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_iframe.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_l2.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_l2fsm.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_l2timer.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_lme.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_sframe.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_tei.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_uframe.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer2/i4b_util.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_l2if.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_l3fsm.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_l3timer.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_l4if.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_q931.c#6 integrate .. //depot/projects/ia64/sys/i4b/layer3/i4b_q932fac.c#3 integrate .. //depot/projects/ia64/sys/i4b/layer4/i4b_i4bdrv.c#7 integrate .. //depot/projects/ia64/sys/i4b/layer4/i4b_l4.c#5 integrate .. //depot/projects/ia64/sys/i4b/layer4/i4b_l4mgmt.c#4 integrate .. //depot/projects/ia64/sys/i4b/layer4/i4b_l4timer.c#3 integrate .. //depot/projects/ia64/sys/ia64/conf/SKI#5 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/elf_machdep.c#7 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#34 integrate .. //depot/projects/ia64/sys/ia64/include/ansi.h#11 delete .. //depot/projects/ia64/sys/kern/imgact_aout.c#11 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#18 integrate .. //depot/projects/ia64/sys/kern/init_main.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_condvar.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#30 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#25 integrate .. //depot/projects/ia64/sys/kern/sys_generic.c#17 integrate .. //depot/projects/ia64/sys/kern/uipc_cow.c#4 integrate .. //depot/projects/ia64/sys/kern/vfs_cache.c#10 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#25 integrate .. //depot/projects/ia64/sys/libkern/strlcat.c#1 branch .. //depot/projects/ia64/sys/libkern/strlcpy.c#1 branch .. //depot/projects/ia64/sys/modules/Makefile#18 integrate .. //depot/projects/ia64/sys/modules/aic7xxx/ahc/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/aic7xxx/ahd/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/ia64/sys/powerpc/include/ansi.h#12 delete .. //depot/projects/ia64/sys/powerpc/powerpc/elf_machdep.c#5 integrate .. //depot/projects/ia64/sys/sparc64/include/ansi.h#11 delete .. //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#21 integrate .. //depot/projects/ia64/sys/sys/imgact.h#8 integrate .. //depot/projects/ia64/sys/sys/libkern.h#5 integrate .. //depot/projects/ia64/sys/sys/param.h#17 integrate .. //depot/projects/ia64/sys/sys/syscallsubr.h#1 branch .. //depot/projects/ia64/sys/sys/sysent.h#9 integrate .. //depot/projects/ia64/sys/sys/vnode.h#19 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_inode.c#7 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#11 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#19 integrate .. //depot/projects/ia64/sys/x86_64/include/ansi.h#4 delete .. //depot/projects/ia64/usr.bin/make/Makefile#6 integrate .. //depot/projects/ia64/usr.bin/xlint/xlint/xlint.c#10 integrate .. //depot/projects/ia64/usr.sbin/Makefile#20 integrate .. //depot/projects/ia64/usr.sbin/getextattr/Makefile#4 delete .. //depot/projects/ia64/usr.sbin/getextattr/getextattr.8#5 delete .. //depot/projects/ia64/usr.sbin/getextattr/getextattr.c#7 delete .. //depot/projects/ia64/usr.sbin/inetd/inetd.c#8 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/plist.c#8 integrate .. //depot/projects/ia64/usr.sbin/ppp/command.c#13 integrate .. //depot/projects/ia64/usr.sbin/setextattr/Makefile#4 delete .. //depot/projects/ia64/usr.sbin/setextattr/setextattr.8#4 delete .. //depot/projects/ia64/usr.sbin/setextattr/setextattr.c#4 delete Differences ... ==== //depot/projects/ia64/MAINTAINERS#14 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.46 2002/07/18 12:12:15 ru Exp $ +$FreeBSD: src/MAINTAINERS,v 1.47 2002/09/01 15:55:38 rwatson Exp $ subsystem login notes ----------------------------- @@ -8,6 +8,8 @@ libc/posix1e rwatson Pre-commit review requested. POSIX.1e ACLs rwatson Pre-commit review requested. UFS EAs rwatson Pre-commit review requested. +MAC Framework rwatson Pre-commit review requested. +MAC Modules rwatson Pre-commit review requested. ATA/IDE sos Pre-commit review requested. ahc(4) gibbs Pre-commit review requested. NEWCARD imp Pre-commit review requested. ==== //depot/projects/ia64/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.263 2002/07/20 10:01:00 ru Exp $ +# $FreeBSD: src/Makefile,v 1.264 2002/08/31 07:18:40 peter Exp $ # # The user-driven targets are: # @@ -206,7 +206,8 @@ @echo " Upgrading the installed make" @echo "--------------------------------------------------------------" @cd ${.CURDIR}/usr.bin/make; \ - make obj && make depend && make all && make install + make obj && make -D_UPGRADING depend && \ + make -D_UPGRADING all && make install # # Define the upgrade targets. These are listed here in alphabetical ==== //depot/projects/ia64/contrib/binutils/bfd/ChangeLog#6 (text+ko) ==== @@ -1,3 +1,8 @@ +2002-07-20 Jason Thorpe + + * elf64-alpha.c (elf64_alpha_size_dynamic_sections): Only insert + DT_PLTGOT into the dynamic section if there is a PLT. + 2002-05-14 Daniel Jacobowitz * configure.in: Set is_release=y for 2.12.1 release. ==== //depot/projects/ia64/contrib/binutils/bfd/elf64-alpha.c#5 (text+ko) ==== @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/binutils/bfd/elf64-alpha.c,v 1.12 2002/07/05 20:32:42 obrien Exp $ */ +/* $FreeBSD: src/contrib/binutils/bfd/elf64-alpha.c,v 1.13 2002/08/31 20:38:58 obrien Exp $ */ /* We need a published ABI spec for this. Until one comes out, don't assume this'll remain unchanged forever. */ @@ -3241,12 +3241,10 @@ return false; } - if (!add_dynamic_entry (DT_PLTGOT, 0)) - return false; - if (relplt) { - if (!add_dynamic_entry (DT_PLTRELSZ, 0) + if (!add_dynamic_entry (DT_PLTGOT, 0) + || !add_dynamic_entry (DT_PLTRELSZ, 0) || !add_dynamic_entry (DT_PLTREL, DT_RELA) || !add_dynamic_entry (DT_JMPREL, 0)) return false; ==== //depot/projects/ia64/contrib/binutils/bfd/version.h#4 (text+ko) ==== @@ -1,1 +1,1 @@ -#define BFD_VERSION_DATE 20020622 +#define BFD_VERSION_DATE 20020720 ==== //depot/projects/ia64/contrib/binutils/binutils/configure.in#5 (text+ko) ==== @@ -7,7 +7,7 @@ AC_ISC_POSIX changequote(,)dnl -BFD_VERSION_STRING=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in` +BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${srcdir}/../bfd/configure.in` changequote([,])dnl AM_INIT_AUTOMAKE(binutils, ${BFD_VERSION}) ==== //depot/projects/ia64/contrib/binutils/ld/ChangeLog#6 (text+ko) ==== @@ -1,3 +1,9 @@ +2002-07-07 Alan Modra + + Merge from mainline. + 2002-07-05 Alan Modra + * ldlang.c (print_wild_statement): Fix output formatting. + 2002-05-09 Alan Modra Merge from mainline. ==== //depot/projects/ia64/contrib/binutils/ld/ldlang.c#5 (text+ko) ==== @@ -2492,10 +2492,10 @@ if (sec->spec.exclude_name_list != NULL) { name_list *tmp; - minfo ("EXCLUDE_FILE ( %s", sec->spec.exclude_name_list->name); + minfo ("EXCLUDE_FILE(%s", sec->spec.exclude_name_list->name); for (tmp = sec->spec.exclude_name_list->next; tmp; tmp = tmp->next) - minfo (", %s", tmp->name); - minfo (")"); + minfo (" %s", tmp->name); + minfo (") "); } if (sec->spec.name != NULL) minfo ("%s", sec->spec.name); @@ -2503,6 +2503,8 @@ minfo ("*"); if (sec->spec.sorted) minfo (")"); + if (sec->next) + minfo (" "); } minfo (")"); ==== //depot/projects/ia64/contrib/cvs/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,296 @@ +2002-04-17 Derek Price + + * configure.in: Update version number. + * configure: Regenerated. + +2002-04-03 Derek Price + + * cvs.spec.in: Use a lowercase "cvshome.org". Add some RedHat safety + features to avoid "rm -rf /". No need to rebuild the docs in the + distribution. Don't strip the binary. + +2002-03-26 Derek Price + + * configure.in: Add a FIXME comment. + +2002-03-21 Derek Price + + * aclocal.m4: Regenerate with recent version of Autoconf. It looks + like things changed because of some RedHat patches or the like which + didn't change the Autoconf version number, but the differences look + like useful changes so I'm going to use them for consistency. + * config.h.in: Ditto. + * configure: Ditto. + +2002-03-19 Larry Jones + + * NEWS (Changes since 1.11.1p1): Note -S flag for [r]log. + +2002-02-08 Larry Jones + + * NEWS (Changes since 1.11.1p1): Note read-only tag fix. + +2002-02-01 Larry Jones + + * NEWS (Changes from 1.9 to 1.10): Note -t/-f wrappers disabled. + +2001-12-12 Larry Jones + + * NEWS (Changes from 1.10 to 1.11): Note update -C. + +2001-12-03 Larry Jones + + * TODO (206, 207): New items. + + * NEWS (Changes since 1.11.1p1): Note -F flag for [r]annotate. + (Changes from 1.11 to 1.11.1): Note :: for log. + +2001-10-18 Derek Price + + * TESTS: Remove outdated note about tests that don't use the dotest + function and add some notes on writing tests. + * HACKING: Reference TESTS file in note about submitting test cases + with patches. + +2001-09-28 Larry Jones + + * noautomake.sh: Protect wildcards from shell expansion. + (Patch submitted by Stephen Cameron .) + +2001-09-22 Derek Price + + * INSTALL (Building from source code under Unix): Continue + noautoconf.sh note, stressing source checked out from CVS. + +2001-09-22 Derek Price + + * noautomake.sh: Correct usage. + +2001-09-13 Derek Price + + * Makefile.am (AUTOMAKE_OPTIONS): Updated to require Automake 1.5. + * NEWS (Changes since 1.11.1p1): Added note about standardizing on + Automake 1.5. + * INSTALL (Building from source code under UNIX): It's Automake version + `1.5', not `2.5'. + (Detailed information about your interaction with "configure"): Added + note about using `configure --help'. + * README (Installation): Add noautoconf.sh to the list of build and + installation commands. + + * Makefile.in: Regenerated. + +2001-09-04 Derek Price + + * Makefile.in: Regenerated with automake 1.5. + * aclocal.m4: Ditto. + * configure: Ditto. + +2001-09-04 Derek Price + + * INSTALL (Building from source code under UNIX): Add a comment about + the noautomake.sh script and autotool versions. + +2001-08-20 Derek Price + + * configure.in (AC_OUTPUT): Add src/version.h. + (Patch from Alexey Mahotkin .) + + * configure: Regenerated. + +2001-08-20 Derek Price + + * .cvsignore: Add cvs.spec. + +2001-08-14 Derek Price + + * configure.in (AC_OUTPUT): Add cvs.spec. + * Makefile.am (EXTRA_DIST): Remove cvs.spec.in and cvs.spec. + (Original patch from Alexey Mahotkin .) + + * cvs.spec.in: Use @PACKAGE@ from configure. + * cvs.spec: Remove this file. + + * configure: Regenerated. + * Makefile.in: Ditto. + +2001-08-14 Derek Price + + * DEVEL-CVS: Update mailing list addresses. + * HACKING: Ditto. + +2001-08-09 Derek Price + + * cvsnt.mak: Add entry for annotate.c. + +2001-08-07 Derek Price + + * build.com: correct name of build .com for zlib. + (Patch from Mike Marciniszyn .) + +2001-08-06 Derek Price + + * configure.in: Remove some redundant macros (they appear to be run + automatically by AC_INIT). + + * configure: Regenerated. + +2001-08-06 Derek Price + + * configure.in: Add AC_EXEEXT to get things right when under Windows. + (Report and patch from manklu@web.de.) + + * configure.in: Reorder some macros to prevent Autoconf warnings. + + * configure: Regenerated. + * Makefile.in: Ditto. + +2001-07-26 Larry Jones + + * NEWS: Fix format, add note about tag -B. + +2001-07-16 Derek Price + + * compile: New Automake file. + * configure.in: Add AM_PROG_CC_C_O to work around problems with some + compilers. + + * aclocal.m4: Regenerated. + * Makefile.in: Ditto. + * config.h.in: Ditto. + * configure: Ditto. + (Thanks to Stephen Cameron and + Tom Tromey .) + +2001-07-04 Derek Price + + * Makefile.in: Regenerated with new Automake release candidate 1.4h. + * aclocal.m4: Ditto. + +2001-07-04 Derek Price + + * configure.in: Tidy and add some comments. + + * configure: Regenerated. + +2001-07-03 Derek Price + + * HACKING (Source): Add a note about where to obtain the development + sources. + (Thanks to Bear Giles .) + +2001-07-03 Derek Price + + * configure.in: Test for mmap. + + * configure: Regenerated. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 2 22:12:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3475D37B400; Mon, 2 Sep 2002 22:11:52 -0700 (PDT) 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 D715D37B401 for ; Mon, 2 Sep 2002 22:11:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 271B843E72 for ; Mon, 2 Sep 2002 22:11:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g835BoJU026366 for ; Mon, 2 Sep 2002 22:11:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g835BoaE026363 for perforce@freebsd.org; Mon, 2 Sep 2002 22:11:50 -0700 (PDT) Date: Mon, 2 Sep 2002 22:11:50 -0700 (PDT) Message-Id: <200209030511.g835BoaE026363@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16982 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16982 Change 16982 by peter@peter_overcee on 2002/09/02 22:11:03 IFC @16981 Affected files ... .. //depot/projects/ia64/lib/libc/stdtime/localtime.c#6 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#9 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#12 integrate .. //depot/projects/ia64/sys/ia64/include/signal.h#4 integrate Differences ... ==== //depot/projects/ia64/lib/libc/stdtime/localtime.c#6 (text+ko) ==== @@ -9,7 +9,7 @@ #endif /* !defined NOID */ #endif /* !defined lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.32 2002/05/28 20:12:42 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.33 2002/09/03 04:34:10 peter Exp $"); /* ** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu). ==== //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.84 2002/08/22 16:13:31 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.85 2002/09/03 04:31:55 mjacob Exp $ */ /* * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. * @@ -234,7 +234,7 @@ } -static __inline void +static INLINE void isp_freeze_loopdown(struct ispsoftc *isp, char *msg) { if (isp->isp_osinfo.simqfrozen == 0) { @@ -521,15 +521,15 @@ #ifdef ISP_TARGET_MODE -static __inline int is_lun_enabled(struct ispsoftc *, int, lun_id_t); -static __inline int are_any_luns_enabled(struct ispsoftc *, int); -static __inline tstate_t *get_lun_statep(struct ispsoftc *, int, lun_id_t); -static __inline void rls_lun_statep(struct ispsoftc *, tstate_t *); -static __inline int isp_psema_sig_rqe(struct ispsoftc *, int); -static __inline int isp_cv_wait_timed_rqe(struct ispsoftc *, int, int); -static __inline void isp_cv_signal_rqe(struct ispsoftc *, int, int); -static __inline void isp_vsema_rqe(struct ispsoftc *, int); -static __inline atio_private_data_t *isp_get_atpd(struct ispsoftc *, int); +static INLINE int is_lun_enabled(struct ispsoftc *, int, lun_id_t); +static INLINE int are_any_luns_enabled(struct ispsoftc *, int); +static INLINE tstate_t *get_lun_statep(struct ispsoftc *, int, lun_id_t); +static INLINE void rls_lun_statep(struct ispsoftc *, tstate_t *); +static INLINE int isp_psema_sig_rqe(struct ispsoftc *, int); +static INLINE int isp_cv_wait_timed_rqe(struct ispsoftc *, int, int); +static INLINE void isp_cv_signal_rqe(struct ispsoftc *, int, int); +static INLINE void isp_vsema_rqe(struct ispsoftc *, int); +static INLINE atio_private_data_t *isp_get_atpd(struct ispsoftc *, int); static cam_status create_lun_state(struct ispsoftc *, int, struct cam_path *, tstate_t **); static void destroy_lun_state(struct ispsoftc *, tstate_t *); @@ -545,7 +545,7 @@ static int isp_handle_platform_notify_scsi(struct ispsoftc *, in_entry_t *); static int isp_handle_platform_notify_fc(struct ispsoftc *, in_fcentry_t *); -static __inline int +static INLINE int is_lun_enabled(struct ispsoftc *isp, int bus, lun_id_t lun) { tstate_t *tptr; @@ -561,7 +561,7 @@ return (0); } -static __inline int +static INLINE int are_any_luns_enabled(struct ispsoftc *isp, int port) { int lo, hi; @@ -580,7 +580,7 @@ return (0); } -static __inline tstate_t * +static INLINE tstate_t * get_lun_statep(struct ispsoftc *isp, int bus, lun_id_t lun) { tstate_t *tptr = NULL; @@ -607,53 +607,73 @@ return (tptr); } -static __inline void +static INLINE void rls_lun_statep(struct ispsoftc *isp, tstate_t *tptr) { if (tptr->hold) tptr->hold--; } -static __inline int +static INLINE int isp_psema_sig_rqe(struct ispsoftc *isp, int bus) { while (isp->isp_osinfo.tmflags[bus] & TM_BUSY) { isp->isp_osinfo.tmflags[bus] |= TM_WANTED; +#ifdef ISP_SMPLOCK if (cv_wait_sig(&isp->isp_osinfo.tgtcv0[bus], &isp->isp_lock)) { return (-1); } +#else + if (tsleep(&isp->isp_osinfo.tgtcv0[bus], PZERO, "cv_isp", 0)) { + return (-1); + } +#endif isp->isp_osinfo.tmflags[bus] |= TM_BUSY; } return (0); } -static __inline int +static INLINE int isp_cv_wait_timed_rqe(struct ispsoftc *isp, int bus, int timo) { +#ifdef ISP_SMPLOCK if (cv_timedwait(&isp->isp_osinfo.tgtcv1[bus], &isp->isp_lock, timo)) { return (-1); } +#else + if (tsleep(&isp->isp_osinfo.tgtcv1[bus], PZERO, "cv_isp1", 0)) { + return (-1); + } +#endif return (0); } -static __inline void +static INLINE void isp_cv_signal_rqe(struct ispsoftc *isp, int bus, int status) { isp->isp_osinfo.rstatus[bus] = status; +#ifdef ISP_SMPLOCK cv_signal(&isp->isp_osinfo.tgtcv1[bus]); +#else + wakeup(&isp->isp_osinfo.tgtcv1[bus]); +#endif } -static __inline void +static INLINE void isp_vsema_rqe(struct ispsoftc *isp, int bus) { if (isp->isp_osinfo.tmflags[bus] & TM_WANTED) { isp->isp_osinfo.tmflags[bus] &= ~TM_WANTED; +#ifdef ISP_SMPLOCK cv_signal(&isp->isp_osinfo.tgtcv0[bus]); +#else + cv_signal(&isp->isp_osinfo.tgtcv0[bus]); +#endif } isp->isp_osinfo.tmflags[bus] &= ~TM_BUSY; } -static __inline atio_private_data_t * +static INLINE atio_private_data_t * isp_get_atpd(struct ispsoftc *isp, int tag) { atio_private_data_t *atp; @@ -711,7 +731,7 @@ return (CAM_REQ_CMP); } -static __inline void +static INLINE void destroy_lun_state(struct ispsoftc *isp, tstate_t *tptr) { int hfx; @@ -1941,7 +1961,9 @@ { struct ispsoftc *isp = arg; +#ifdef ISP_SMPLOCK mtx_lock(&isp->isp_lock); +#endif /* * The first loop is for our usage where we have yet to have * gotten good fibre channel state. @@ -1959,8 +1981,12 @@ break; } } +#ifdef ISP_SMPLOCK msleep(isp_kthread, &isp->isp_lock, PRIBIO, "isp_fcthrd", hz); +#else + (void) tsleep(isp_kthread, PRIBIO, "isp_fcthrd", hz); +#endif } /* @@ -1978,7 +2004,11 @@ CAMLOCK_2_ISPLOCK(isp); } isp_prt(isp, ISP_LOGDEBUG0, "kthread: waiting until called"); +#ifdef ISP_SMPLOCK cv_wait(&isp->isp_osinfo.kthread_cv, &isp->isp_lock); +#else + (void) tsleep(&isp->isp_osinfo.kthread_cv, PRIBIO, "fc_cv", 0); +#endif } } @@ -2077,7 +2107,11 @@ xpt_done(ccb); break; } +#ifdef ISP_SMPLOCK cv_signal(&isp->isp_osinfo.kthread_cv); +#else + wakeup(&isp->isp_osinfo.kthread_cv); +#endif isp_freeze_loopdown(isp, "isp_action(RQLATER)"); XS_SETERR(ccb, CAM_REQUEUE_REQ); ISPLOCK_2_CAMLOCK(isp); @@ -2855,7 +2889,11 @@ isp_prt(isp, ISP_LOGINFO, "Name Server Database Changed"); } +#ifdef ISP_SMPLOCK cv_signal(&isp->isp_osinfo.kthread_cv); +#else + wakeup(&isp->isp_osinfo.kthread_cv); +#endif break; case ISPASYNC_FABRIC_DEV: { ==== //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.68 2002/08/22 16:14:19 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.69 2002/09/03 04:31:55 mjacob Exp $ */ /* * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob @@ -73,7 +73,8 @@ #endif #define HANDLE_LOOPSTATE_IN_OUTER_LAYERS 1 -#define ISP_SMPLOCK 1 +/* turn this off for now */ +/* #define ISP_SMPLOCK 1 */ #ifdef ISP_SMPLOCK #define ISP_IFLAGS INTR_TYPE_CAM | INTR_ENTROPY | INTR_MPSAFE @@ -165,12 +166,19 @@ * Locking macros... */ +#ifdef ISP_SMPLOCK #define ISP_LOCK(x) mtx_lock(&(x)->isp_lock) #define ISP_UNLOCK(x) mtx_unlock(&(x)->isp_lock) #define ISPLOCK_2_CAMLOCK(isp) \ mtx_unlock(&(isp)->isp_lock); mtx_lock(&Giant) #define CAMLOCK_2_ISPLOCK(isp) \ mtx_unlock(&Giant); mtx_lock(&(isp)->isp_lock) +#else +#define ISP_LOCK(x) do { } while (0) +#define ISP_UNLOCK(x) do { } while (0) +#define ISPLOCK_2_CAMLOCK(isp) do { } while (0) +#define CAMLOCK_2_ISPLOCK(isp) do { } while (0) +#endif /* * Required Macros/Defines @@ -411,8 +419,13 @@ if (isp->isp_osinfo.intsok) { int lim = ((isp->isp_mbxwrk0)? 120 : 20) * hz; isp->isp_osinfo.mboxwaiting = 1; +#ifdef ISP_SMPLOCK (void) msleep(&isp->isp_mbxworkp, &isp->isp_lock, PRIBIO, "isp_mboxwaiting", lim); +#else + (void) tsleep(&isp->isp_mbxworkp, + PRIBIO, "isp_mboxwaiting", lim); +#endif if (isp->isp_mboxbsy != 0) { isp_prt(isp, ISP_LOGWARN, "Interrupting Mailbox Command (0x%x) Timeout", ==== //depot/projects/ia64/sys/ia64/include/signal.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/include/signal.h,v 1.6 2002/04/10 19:24:08 dfr Exp $ */ +/* $FreeBSD: src/sys/ia64/include/signal.h,v 1.7 2002/09/03 04:30:00 peter Exp $ */ /* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */ /* @@ -75,7 +75,7 @@ */ typedef unsigned int osigset_t; struct osigcontext { - int _not_used; + int _not_used; }; /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 3 1:57:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27DD537B401; Tue, 3 Sep 2002 01:57:27 -0700 (PDT) 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 B71AE37B400 for ; Tue, 3 Sep 2002 01:57:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49C8543E72 for ; Tue, 3 Sep 2002 01:57:25 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g838vOJU060697 for ; Tue, 3 Sep 2002 01:57:24 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g838vOik060694 for perforce@freebsd.org; Tue, 3 Sep 2002 01:57:24 -0700 (PDT) Date: Tue, 3 Sep 2002 01:57:24 -0700 (PDT) Message-Id: <200209030857.g838vOik060694@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 16985 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16985 Change 16985 by mini@mini_stylus on 2002/09/03 01:57:04 Add an early version of signalcontext(), which adds a signal frame to a ucontext_t. Affected files ... .. //depot/projects/kse/lib/libc/i386/gen/Makefile.inc#2 edit .. //depot/projects/kse/lib/libc/i386/gen/signalcontext.c#1 add .. //depot/projects/kse/sys/sys/ucontext.h#7 edit Differences ... ==== //depot/projects/kse/lib/libc/i386/gen/Makefile.inc#2 (text+ko) ==== @@ -3,4 +3,4 @@ SRCS+= _ctx_start.S _setjmp.S alloca.S getcontext.S fabs.S frexp.c \ infinity.c isinf.c ldexp.c makecontext.c modf.S \ - rfork_thread.S setjmp.S sigsetjmp.S swapcontext.c + rfork_thread.S setjmp.S sigsetjmp.S swapcontext.c signalcontext.c ==== //depot/projects/kse/sys/sys/ucontext.h#7 (text+ko) ==== @@ -31,6 +31,7 @@ #ifndef _SYS_UCONTEXT_H_ #define _SYS_UCONTEXT_H_ +#include #include typedef struct __ucontext { @@ -63,6 +64,7 @@ int getcontext(ucontext_t *); int setcontext(const ucontext_t *); void makecontext(ucontext_t *, void (*)(void), int, ...); +int signalcontext(ucontext_t *, int, __sighandler_t *); int swapcontext(ucontext_t *, const ucontext_t *); #endif /* !_KERNEL */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 3 8:49:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8D4A37B401; Tue, 3 Sep 2002 08:49:06 -0700 (PDT) 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 48F5737B400 for ; Tue, 3 Sep 2002 08:49:06 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E8B3443E6A for ; Tue, 3 Sep 2002 08:49:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g83Fn5JU040416 for ; Tue, 3 Sep 2002 08:49:05 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g83Fn5hj040413 for perforce@freebsd.org; Tue, 3 Sep 2002 08:49:05 -0700 (PDT) Date: Tue, 3 Sep 2002 08:49:05 -0700 (PDT) Message-Id: <200209031549.g83Fn5hj040413@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 16996 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16996 Change 16996 by peter@peter_mckinley on 2002/09/03 08:48:30 mpt works. remove witness. Affected files ... .. //depot/projects/ia64/sys/ia64/conf/I3#4 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/I3#4 (text+ko) ==== @@ -37,6 +37,8 @@ options INVARIANTS options INVARIANT_SUPPORT options ALT_BREAK_TO_DEBUGGER +#options WITNESS +#options WITNESS_SKIPSPIN # Standard busses device isa @@ -50,7 +52,7 @@ device pass device isp #device sym -#device mpt +device mpt # ATA and ATAPI devices #device ata To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 3 8:54: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D51AD37B400; Tue, 3 Sep 2002 08:53:20 -0700 (PDT) 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 5F09837B401 for ; Tue, 3 Sep 2002 08:53:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 971CF43E3B for ; Tue, 3 Sep 2002 08:53:19 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g83FrJJU040953 for ; Tue, 3 Sep 2002 08:53:19 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g83FrBFr040946 for perforce@freebsd.org; Tue, 3 Sep 2002 08:53:11 -0700 (PDT) Date: Tue, 3 Sep 2002 08:53:11 -0700 (PDT) Message-Id: <200209031553.g83FrBFr040946@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 16997 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16997 Change 16997 by cvance@cvance_laptop on 2002/09/03 08:52:36 Mildly ugly reorganization of function ordering. Alphabetical order will make it easier to sync up in the future. Assign initial security class to vnodes during creation Add helper functions to check vnode perms Add stubs for missing check_vnode_xxx operations Add permission checks for rename operations Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#23 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#23 (text+ko) ==== @@ -114,6 +114,20 @@ return (cred_has_system(td->td_proc->p_ucred, perm)); } +static int +vnode_has_perm(struct ucred *cred, struct vnode *vp, access_vector_t perm, + avc_entry_ref_t *aeref) +{ + struct task_security_struct *task; + struct vnode_security_struct *file; + + task = SLOT(&cred->cr_label); + file = SLOT(&vp->v_label); + + /* TBD: audit? */ + return avc_has_perm_ref(task->sid, file->sid, file->sclass, + perm, aeref ? aeref : &file->avcr); +} static void sebsd_init_cred(struct ucred *ucred, struct label *label) @@ -292,6 +306,32 @@ SLOT(label) = NULL; } +static inline security_class_t +vnode_mode_to_security_class(struct vnode *vp) +{ + switch (vp->v_type) { + case VREG: + return SECCLASS_FILE; + case VDIR: + return SECCLASS_DIR; + case VBLK: + return SECCLASS_BLK_FILE; + case VCHR: + return SECCLASS_CHR_FILE; + case VLNK: + return SECCLASS_LNK_FILE; + case VSOCK: + return SECCLASS_SOCK_FILE; + case VFIFO: + return SECCLASS_FIFO_FILE; + } + + /* + * VNON and VBAD + */ + return SECCLASS_FILE; +} + static void sebsd_create_vnode(struct ucred *cred, struct vnode *parent, struct label *parentlabel, struct vnode *child, @@ -312,6 +352,7 @@ &newsid); vsec->sid = newsid; vsec->task_sid = task->sid; + vsec->sclass = vnode_mode_to_security_class(child); if ((child->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { return; @@ -336,31 +377,52 @@ } } - static int -sebsd_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, - struct label *label) +sebsd_update_vnode_from_extattr(struct vnode *vp, struct label *vnodelabel, + struct mount *mp, struct label *fslabel) { - /* TBD: Not Implemented */ - return 0; -} + struct vnode_security_struct *vsec; + /* TBD: Need to limit size of contexts used in extattr labels */ + char context[128]; + u_int32_t context_len; + int error; + + vsec = SLOT(vnodelabel); + + context_len = 128; /* TBD: bad fixed length */ + error = vn_extattr_get(vp, IO_NODELOCKED, + SEBSD_MAC_EXTATTR_NAMESPACE, + SEBSD_MAC_EXTATTR_NAME, + &context_len, context, curthread); + if (error == ENOATTR) { + vsec->sid = SECINITSID_UNLABELED; /* Use the default label */ + struct vattr va; + + VOP_GETATTR(vp, &va, curthread->td_ucred, curthread); + printf("sebsd_update_vnode_from_extattr: no label for inode=%d, fsid=%d\n", va.va_fileid, va.va_fsid); + + return (0); + } + if (error) { + return (error); /* Fail closed */ + } + + if (sebsd_verbose > 1) { + struct vattr va; + + VOP_GETATTR(vp, &va, curthread->td_ucred, curthread); + printf("sebsd_vnode_from_extattr: len=%d: context=%s inode=%d, fsid=%d\n", context_len, context, va.va_fileid, va.va_fsid); + } + + error = security_context_to_sid(context, context_len, &vsec->sid); + if (error) { + printf("sebsd_update_vnode_from_extattr: ERROR mapping context to sid: %s\n", context); + return (0); /* TBD bad, bad, bad */ + } -static int -sebsd_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, - struct label *label, int samedir) -{ - /* TBD: Not Implemented */ - return 0; -} + vsec->sclass = vnode_mode_to_security_class(vp); -static int -sebsd_check_vnode_relabel(struct ucred *cred, struct vnode *vp, - struct label *oldlabel, struct label *newlabel) -{ - /* TBD: Not Implemented */ - return 0; + return (0); } static void @@ -411,6 +473,31 @@ } static int +sebsd_check_vnode_access(struct ucred *cred, struct vnode *vp, + struct label *label, mode_t flags) +{ + + /* TBD: Not Implemented */ + return (0); +} + +static int +sebsd_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_chroot(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int sebsd_check_vnode_create(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vattr *vap) { @@ -424,49 +511,20 @@ } static int -sebsd_update_vnode_from_extattr(struct vnode *vp, struct label *vnodelabel, - struct mount *mp, struct label *fslabel) +sebsd_check_vnode_delete(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, + struct label *label) { - struct vnode_security_struct *vsec; - /* TBD: Need to limit size of contexts used in extattr labels */ - char context[128]; - u_int32_t context_len; - int error; + /* TBD: Not Implemented */ + return 0; +} - vsec = SLOT(vnodelabel); - - context_len = 128; /* TBD: bad fixed length */ - error = vn_extattr_get(vp, IO_NODELOCKED, - SEBSD_MAC_EXTATTR_NAMESPACE, - SEBSD_MAC_EXTATTR_NAME, - &context_len, context, curthread); - if (error == ENOATTR) { - vsec->sid = SECINITSID_UNLABELED; /* Use the default label */ - struct vattr va; - - VOP_GETATTR(vp, &va, curthread->td_ucred, curthread); - printf("sebsd_update_vnode_from_extattr: no label for inode=%d, fsid=%d\n", va.va_fileid, va.va_fsid); - - return (0); - } - if (error) { - return (error); /* Fail closed */ - } - - if (sebsd_verbose > 1) { - struct vattr va; - - VOP_GETATTR(vp, &va, curthread->td_ucred, curthread); - printf("sebsd_vnode_from_extattr: len=%d: context=%s inode=%d, fsid=%d\n", context_len, context, va.va_fileid, va.va_fsid); - } - - error = security_context_to_sid(context, context_len, &vsec->sid); - if (error) { - printf("sebsd_update_vnode_from_extattr: ERROR mapping context to sid: %s\n", context); - return (0); /* TBD bad, bad, bad */ - } - - return (0); +static int +sebsd_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, + struct label *label, acl_type_t type) +{ + /* TBD: Not Implemented */ + return 0; } static int @@ -536,6 +594,144 @@ } static int +sebsd_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct componentname *cnp) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_open(struct ucred *cred, struct vnode *vp, + struct label *filelabel, mode_t acc_mode) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_poll(struct ucred *active_cred, struct ucred *file_cred, + struct vnode *vp, struct label *label) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_read(struct ucred *active_cred, struct ucred *file_cred, + struct vnode *vp, struct label *label) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_readdir(struct ucred *cred, struct vnode *dvp, + struct label *dlabel) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_readlink(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_relabel(struct ucred *cred, struct vnode *vp, + struct label *oldlabel, struct label *newlabel) +{ + /* TBD: Not Implemented */ + return 0; +} + +static int +sebsd_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, + struct label *label) +{ + struct task_security_struct *task; + struct vnode_security_struct *old_dir, old_file; + int rc; + + task = SLOT(&cred->cr_label); + old_dir = SLOT(dlabel); + old_file = SLOT(label); + + /* TBD: audit data? */ + rc = avc_has_perm_ref(task->sid, old_dir->sid, SECCLASS_DIR, + DIR__REMOVE_NAME | DIR__SEARCH, + old_dirsec->avcr); + if (rc) + return (rc); + rc = avc_has_perm_ref(task->sid, old_file->sid, old_file->sclass, + FILE__RENAME, &old_file->avcr); + if (rc) + return (rc); + + return (0); +} + +static int +sebsd_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, + struct label *label, int samedir) +{ + struct task_security_struct *task; + struct vnode_security_struct *new_dir, new_file; + access_vector_t av; + int rc; + + task = SLOT(&cred->cr_label); + new_dir = SLOT(dlabel); + +#ifdef notdef + /* + * We don't have the right information available to make this + * test. TBD - find a way! + */ + if (vp->v_type == VDIR && !samedir) { + rc = avc_has_perm_ref(task->sid, old_file->sid, + old_file->sclass, DIR__REPARENT, + &old_file->avcr); + if (rc) + return (rc); + } +#endif + + av = DIR__ADD_NAME | DIR__SEARCH; + if (vp) + av |= DIR__REMOVE_NAME; + + /* TBD: audit */ + rc = avc_has_perm_ref(task->sid, new_dir->sid, SECCLASS_DIR, + av, &new_dir->avcr); + if (rc) + return (rc); + + if (vp) { + new_file = SLOT(label); + if (vp->v_type == VDIR) { + rc = avc_has_perm_ref(task->sid, new_file->sid, + new_file->sclass, + DIR__RMDIR, &new_file->avcr); + } else { + rc = avc_has_perm_ref(task->sid, new_file->sid, + new_file->sclass, + FILE__UNLINK, &new_file->avcr); + } + if (rc) + return (rc); + } + + return (0); +} + +static int sebsd_check_vnode_revoke(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -602,39 +798,22 @@ } static int -sebsd_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) +sebsd_check_vnode_write(struct ucred *active_cred, struct ucred *file_cred, + struct vnode *vp, struct label *label) { /* TBD: Not Implemented */ return 0; } -static int -sebsd_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, - struct label *label) +static vm_prot_t +sebsd_check_vnode_mmap_perms(struct ucred *cred, struct vnode *vp, + struct label *label, int newmapping) { /* TBD: Not Implemented */ return 0; } static int -sebsd_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, - struct label *label, acl_type_t type) -{ - /* TBD: Not Implemented */ - return 0; -} - -static int -sebsd_check_vnode_open(struct ucred *cred, struct vnode *vp, - struct label *filelabel, mode_t acc_mode) -{ - /* TBD: Not Implemented */ - return 0; -} - -static int sebsd_externalize(struct label *label, struct mac *extmac) { /* TBD: this assumes vnodes only and only stores '5' */ @@ -692,64 +871,76 @@ } static struct mac_policy_op_entry sebsd_ops[] = { - { MAC_INIT, - (macop_t)sebsd_init }, { MAC_DESTROY, (macop_t)sebsd_destroy }, - { MAC_SYSCALL, - (macop_t)sebsd_syscall }, - - /* Process operations */ + /* Init Labels */ + { MAC_INIT, + (macop_t)sebsd_init }, { MAC_INIT_CRED, (macop_t)sebsd_init_cred }, - { MAC_CREATE_CRED, - (macop_t)sebsd_create_cred }, - { MAC_CHECK_CRED_RELABEL, - (macop_t)sebsd_check_cred_relabel }, - { MAC_RELABEL_CRED, - (macop_t)sebsd_relabel_cred }, + { MAC_INIT_VNODE, + (macop_t)sebsd_init_vnode }, + + /* Destroy Labels */ { MAC_DESTROY_CRED, (macop_t)sebsd_destroy_cred }, + { MAC_DESTROY_VNODE, + (macop_t)sebsd_destroy_vnode }, + + /* In/Out */ + { MAC_EXTERNALIZE, + (macop_t)sebsd_externalize }, + { MAC_EXTERNALIZE_PID, + (macop_t)sebsd_externalize_pid }, + /* Create Labels */ + { MAC_CREATE_CRED, + (macop_t)sebsd_create_cred }, { MAC_CREATE_PROC0, (macop_t)sebsd_create_proc0 }, { MAC_CREATE_PROC1, (macop_t)sebsd_create_proc1 }, - { MAC_CHECK_PROC_SIGNAL, - (macop_t)sebsd_check_proc_signal }, - - - /* file operations */ - { MAC_INIT_VNODE, - (macop_t)sebsd_init_vnode }, - { MAC_DESTROY_VNODE, - (macop_t)sebsd_destroy_vnode }, { MAC_CREATE_VNODE, (macop_t)sebsd_create_vnode }, - { MAC_UPDATE_VNODE_FROM_EXTATTR, - (macop_t)sebsd_update_vnode_from_extattr }, - { MAC_RELABEL_VNODE, - (macop_t)sebsd_relabel_vnode }, - { MAC_CHECK_VNODE_EXEC, - (macop_t)sebsd_check_vnode_exec }, - { MAC_CHECK_VNODE_CREATE, - (macop_t)sebsd_check_vnode_create }, - { MAC_CHECK_VNODE_STAT, - (macop_t)sebsd_check_vnode_stat }, + /* Check Labels */ + { MAC_CHECK_CRED_RELABEL, + (macop_t)sebsd_check_cred_relabel }, + { MAC_CHECK_PROC_SIGNAL, + (macop_t)sebsd_check_proc_signal }, + { MAC_CHECK_VNODE_ACCESS, + (macop_t)sebsd_check_vnode_access }, { MAC_CHECK_VNODE_CHDIR, (macop_t)sebsd_check_vnode_chdir }, + { MAC_CHECK_VNODE_CHROOT, + (macop_t)sebsd_check_vnode_chroot }, + { MAC_CHECK_VNODE_CREATE, + (macop_t)sebsd_check_vnode_create }, { MAC_CHECK_VNODE_DELETE, (macop_t)sebsd_check_vnode_delete }, { MAC_CHECK_VNODE_DELETEACL, (macop_t)sebsd_check_vnode_deleteacl }, + { MAC_CHECK_VNODE_EXEC, + (macop_t)sebsd_check_vnode_exec }, { MAC_CHECK_VNODE_GETACL, (macop_t)sebsd_check_vnode_getacl }, { MAC_CHECK_VNODE_GETEXTATTR, (macop_t)sebsd_check_vnode_getextattr }, + { MAC_CHECK_VNODE_LOOKUP, + (macop_t)sebsd_check_vnode_lookup }, { MAC_CHECK_VNODE_OPEN, (macop_t)sebsd_check_vnode_open }, + { MAC_CHECK_VNODE_POLL, + (macop_t)sebsd_check_vnode_poll }, + { MAC_CHECK_VNODE_READ, + (macop_t)sebsd_check_vnode_read }, + { MAC_CHECK_VNODE_READDIR, + (macop_t)sebsd_check_vnode_readdir }, + { MAC_CHECK_VNODE_READLINK, + (macop_t)sebsd_check_vnode_readlink }, + { MAC_CHECK_VNODE_RELABEL, + (macop_t)sebsd_check_vnode_relabel }, { MAC_CHECK_VNODE_RENAME_FROM, (macop_t)sebsd_check_vnode_rename_from }, { MAC_CHECK_VNODE_RENAME_TO, @@ -768,18 +959,27 @@ (macop_t)sebsd_check_vnode_setowner }, { MAC_CHECK_VNODE_SETUTIMES, (macop_t)sebsd_check_vnode_setutimes }, - { MAC_CHECK_VNODE_RELABEL, - (macop_t)sebsd_check_vnode_relabel }, + { MAC_CHECK_VNODE_STAT, + (macop_t)sebsd_check_vnode_stat }, + { MAC_CHECK_VNODE_WRITE, + (macop_t)sebsd_check_vnode_write }, + { MAC_CHECK_VNODE_MMAP_PERMS, + (macop_t)sebsd_check_vnode_mmap_perms }, + /* Misc */ { MAC_EXECVE_TRANSITION, (macop_t)sebsd_execve_transition }, { MAC_EXECVE_WILL_TRANSITION, (macop_t)sebsd_execve_will_transition }, + { MAC_RELABEL_CRED, + (macop_t)sebsd_relabel_cred }, + { MAC_RELABEL_VNODE, + (macop_t)sebsd_relabel_vnode }, + { MAC_UPDATE_VNODE_FROM_EXTATTR, + (macop_t)sebsd_update_vnode_from_extattr }, - { MAC_EXTERNALIZE, - (macop_t)sebsd_externalize }, - { MAC_EXTERNALIZE_PID, - (macop_t)sebsd_externalize_pid }, + { MAC_SYSCALL, + (macop_t)sebsd_syscall }, { MAC_CREATE_ROOT_MOUNT, (macop_t)sebsd_create_root_mount }, { MAC_OP_LAST, NULL } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 3 10:35:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B696037B401; Tue, 3 Sep 2002 10:35:24 -0700 (PDT) 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 2413737B400 for ; Tue, 3 Sep 2002 10:35:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC5C343E42 for ; Tue, 3 Sep 2002 10:35:23 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g83HZNJU060129 for ; Tue, 3 Sep 2002 10:35:23 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g83HZN13060122 for perforce@freebsd.org; Tue, 3 Sep 2002 10:35:23 -0700 (PDT) Date: Tue, 3 Sep 2002 10:35:23 -0700 (PDT) Message-Id: <200209031735.g83HZN13060122@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 16999 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16999 Change 16999 by cvance@cvance_laptop on 2002/09/03 10:35:10 Fix bugs that prevented compilation Add a few more permission checks Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#24 (text+ko) ==== @@ -306,7 +306,7 @@ SLOT(label) = NULL; } -static inline security_class_t +static __inline security_class_t vnode_mode_to_security_class(struct vnode *vp) { switch (vp->v_type) { @@ -324,11 +324,11 @@ return SECCLASS_SOCK_FILE; case VFIFO: return SECCLASS_FIFO_FILE; + case VNON: + case VBAD: + return SECCLASS_FILE; } - /* - * VNON and VBAD - */ return SECCLASS_FILE; } @@ -501,11 +501,12 @@ sebsd_check_vnode_create(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vattr *vap) { - /* TBD: Not Implemented */ - struct vnode_security_struct *file, *dir; + struct task_security_struct *task; + struct vnode_security_struct *dir; - file = SLOT(&cred->cr_label); + task = SLOT(&cred->cr_label); dir = SLOT(dlabel); + /* TBD: Not Implemented */ return 0; } @@ -589,8 +590,7 @@ struct label *label, int attrnamespace, const char *name, struct uio *uio) { - /* TBD: Not Implemented */ - return 0; + return vnode_has_perm(cred, vp, FILE__GETATTR, NULL); } static int @@ -637,15 +637,37 @@ sebsd_check_vnode_readlink(struct ucred *cred, struct vnode *vp, struct label *label) { - /* TBD: Not Implemented */ - return 0; + return vnode_has_perm(cred, vp, FILE__READ, NULL); } static int sebsd_check_vnode_relabel(struct ucred *cred, struct vnode *vp, struct label *oldlabel, struct label *newlabel) { - /* TBD: Not Implemented */ + struct task_security_struct *task; + struct vnode_security_struct *old, *new; + int rc; + + task = SLOT(&cred->cr_label); + old = SLOT(oldlabel); + new = SLOT(oldlabel); + + /* TBD: audit? */ + rc = avc_has_perm_ref(task->sid, old->sid, old->sclass, + FILE__RELABELFROM, &old->avcr); + if (rc) + return (rc); + + rc = avc_has_perm(task->sid, new->sid, old->sclass, FILE__RELABELTO); + + if (rc) + return (rc); + /* + * TBD: + * SELinux also checks the superblock for class SECCLASS_FILESYSTEM + * and permission FILESYSTEM__ASSOCIATE + */ + return 0; } @@ -655,7 +677,7 @@ struct label *label) { struct task_security_struct *task; - struct vnode_security_struct *old_dir, old_file; + struct vnode_security_struct *old_dir, *old_file; int rc; task = SLOT(&cred->cr_label); @@ -665,7 +687,7 @@ /* TBD: audit data? */ rc = avc_has_perm_ref(task->sid, old_dir->sid, SECCLASS_DIR, DIR__REMOVE_NAME | DIR__SEARCH, - old_dirsec->avcr); + &old_dir->avcr); if (rc) return (rc); rc = avc_has_perm_ref(task->sid, old_file->sid, old_file->sclass, @@ -682,7 +704,7 @@ struct label *label, int samedir) { struct task_security_struct *task; - struct vnode_security_struct *new_dir, new_file; + struct vnode_security_struct *new_dir, *new_file; access_vector_t av; int rc; @@ -752,8 +774,7 @@ struct label *label, int attrnamespace, const char *name, struct uio *uio) { - /* TBD: Not Implemented */ - return 0; + return vnode_has_perm(cred, vp, FILE__SETATTR, NULL); } static int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 3 11:51:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F24437B401; Tue, 3 Sep 2002 11:50:18 -0700 (PDT) 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 54C4D37B400 for ; Tue, 3 Sep 2002 11:50:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A8C643E75 for ; Tue, 3 Sep 2002 11:50:16 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g83IoGJU070711 for ; Tue, 3 Sep 2002 11:50:16 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g83InNZA070592 for perforce@freebsd.org; Tue, 3 Sep 2002 11:49:23 -0700 (PDT) Date: Tue, 3 Sep 2002 11:49:23 -0700 (PDT) Message-Id: <200209031849.g83InNZA070592@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 17002 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17002 Change 17002 by jhb@jhb_laptop on 2002/09/03 11:48:48 IFC @17001. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/dump_machdep.c#2 integrate .. //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#5 integrate .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#46 integrate .. //depot/projects/smpng/sys/alpha/include/ansi.h#15 delete .. //depot/projects/smpng/sys/alpha/include/md_var.h#6 integrate .. //depot/projects/smpng/sys/alpha/include/reg.h#5 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#8 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#18 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_sysvec.c#4 integrate .. //depot/projects/smpng/sys/arm/include/ansi.h#12 delete .. //depot/projects/smpng/sys/boot/common/Makefile.inc#3 integrate .. //depot/projects/smpng/sys/boot/common/load_aout.c#3 delete .. //depot/projects/smpng/sys/boot/common/loader.8#15 integrate .. //depot/projects/smpng/sys/boot/ficl/prefix.c#3 integrate .. //depot/projects/smpng/sys/boot/ficl/words.c#4 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#12 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/aout_freebsd.c#2 delete .. //depot/projects/smpng/sys/boot/i386/libi386/i386_module.c#5 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#9 integrate .. //depot/projects/smpng/sys/boot/i386/loader/conf.c#5 integrate .. //depot/projects/smpng/sys/boot/i386/loader/help.i386#4 integrate .. //depot/projects/smpng/sys/boot/i386/pxeldr/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#10 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#5 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#10 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#12 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/smpng/sys/compat/linux/linux_file.c#13 integrate .. //depot/projects/smpng/sys/compat/linux/linux_getcwd.c#8 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#26 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#6 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#8 integrate .. //depot/projects/smpng/sys/compat/linux/linux_sysctl.c#3 integrate .. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#12 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.c#6 integrate .. //depot/projects/smpng/sys/compat/linux/linux_util.h#7 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#13 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#19 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_resource.c#6 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysvec.c#9 integrate .. //depot/projects/smpng/sys/conf/NOTES#21 integrate .. //depot/projects/smpng/sys/conf/files#48 integrate .. //depot/projects/smpng/sys/conf/files.i386#29 integrate .. //depot/projects/smpng/sys/conf/files.pc98#29 integrate .. //depot/projects/smpng/sys/conf/majors#12 integrate .. //depot/projects/smpng/sys/conf/options#34 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/acapps.h#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acefi.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acgcc.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acoutput.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acresrc.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlresrc.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbhistry.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmnames.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcl.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcs.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmutils.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pstree.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#10 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/fil.c#8 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#6 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil.c#9 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.c#7 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_frag.h#4 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#6 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.c#9 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_nat.h#5 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.c#8 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_proxy.h#4 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.c#7 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_state.h#5 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ipl.h#6 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#10 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#31 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#18 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7770.c#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#2 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#3 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.h#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.reg#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.seq#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_93cx6.c#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_93cx6.h#3 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_inline.h#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.h#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.c#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.h#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_gram.y#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_scan.l#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#5 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_linux.h#2 delete .. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#5 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#17 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#16 integrate .. //depot/projects/smpng/sys/dev/ispfw/asm_2100.h#3 integrate .. //depot/projects/smpng/sys/dev/ispfw/asm_2200.h#3 integrate .. //depot/projects/smpng/sys/dev/ispfw/asm_2300.h#3 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/fc_log.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_cnfg.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_fc.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_init.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_ioc.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_lan.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_raid.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_targ.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpilib/mpi_type.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_freebsd.c#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_freebsd.h#2 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#11 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#15 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#6 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pccard.c#1 branch .. //depot/projects/smpng/sys/dev/puc/puc_pci.c#1 branch .. //depot/projects/smpng/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/smpng/sys/dev/puc/pucvar.h#3 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#20 integrate .. //depot/projects/smpng/sys/dev/sio/sio_puc.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#8 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_subr.c#4 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#26 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#40 integrate .. //depot/projects/smpng/sys/i386/i386/db_interface.c#12 integrate .. //depot/projects/smpng/sys/i386/i386/dump_machdep.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/elf_machdep.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#43 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#25 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/smpng/sys/i386/include/ansi.h#15 delete .. //depot/projects/smpng/sys/i386/include/md_var.h#13 integrate .. //depot/projects/smpng/sys/i386/include/param.h#6 integrate .. //depot/projects/smpng/sys/i386/include/reg.h#5 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#15 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#20 integrate .. //depot/projects/smpng/sys/i4b/capi/capi_l4if.c#6 integrate .. //depot/projects/smpng/sys/i4b/capi/capi_llif.c#2 integrate .. //depot/projects/smpng/sys/i4b/capi/capi_msgs.c#3 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_card.c#3 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_isa.c#7 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_lli.c#5 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#7 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ctl.c#5 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ing.c#7 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#10 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_isppp.c#4 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_rbch.c#8 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_tel.c#6 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_trace.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/i4b_l1dmux.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_bchan.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_ctx_s0P.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_diva.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_dynalink.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_hscx.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isac.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_l1.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_l1fsm.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_siemens_isurf.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_sws.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_isac.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_l1.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_pci.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_iframe.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_l2.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_l2fsm.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_l2timer.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_lme.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_sframe.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_tei.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_uframe.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer2/i4b_util.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l2if.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l3fsm.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l3timer.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_l4if.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_q931.c#7 integrate .. //depot/projects/smpng/sys/i4b/layer3/i4b_q932fac.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_i4bdrv.c#11 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4mgmt.c#4 integrate .. //depot/projects/smpng/sys/i4b/layer4/i4b_l4timer.c#3 integrate .. //depot/projects/smpng/sys/ia64/conf/SKI#5 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/elf_machdep.c#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#41 integrate .. //depot/projects/smpng/sys/ia64/ia64/mca.c#4 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#35 integrate .. //depot/projects/smpng/sys/ia64/ia64/sal.c#8 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#36 integrate .. //depot/projects/smpng/sys/ia64/include/ansi.h#15 delete .. //depot/projects/smpng/sys/ia64/include/md_var.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/reg.h#7 integrate .. //depot/projects/smpng/sys/ia64/include/signal.h#4 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#15 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#17 integrate .. //depot/projects/smpng/sys/kern/init_main.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#34 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#42 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#45 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#5 integrate .. //depot/projects/smpng/sys/kern/link_aout.c#8 delete .. //depot/projects/smpng/sys/kern/link_elf.c#14 integrate .. //depot/projects/smpng/sys/kern/subr_param.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#8 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#19 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#4 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#25 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#15 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#43 integrate .. //depot/projects/smpng/sys/libkern/strlcat.c#1 branch .. //depot/projects/smpng/sys/libkern/strlcpy.c#1 branch .. //depot/projects/smpng/sys/modules/Makefile#31 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/ahd/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/cbb/Makefile#3 integrate .. //depot/projects/smpng/sys/net/if.h#11 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#20 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#38 integrate .. //depot/projects/smpng/sys/pci/uhci_pci.c#6 integrate .. //depot/projects/smpng/sys/powerpc/include/ansi.h#15 delete .. //depot/projects/smpng/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/smpng/sys/powerpc/include/reg.h#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#26 integrate .. //depot/projects/smpng/sys/sparc64/include/ansi.h#16 delete .. //depot/projects/smpng/sys/sparc64/include/md_var.h#10 integrate .. //depot/projects/smpng/sys/sparc64/include/reg.h#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#7 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/locore.S#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#32 integrate .. //depot/projects/smpng/sys/sys/buf.h#13 integrate .. //depot/projects/smpng/sys/sys/imgact.h#6 integrate .. //depot/projects/smpng/sys/sys/libkern.h#6 integrate .. //depot/projects/smpng/sys/sys/lock.h#17 integrate .. //depot/projects/smpng/sys/sys/param.h#28 integrate .. //depot/projects/smpng/sys/sys/proc.h#56 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#1 branch .. //depot/projects/smpng/sys/sys/sysent.h#8 integrate .. //depot/projects/smpng/sys/sys/systm.h#34 integrate .. //depot/projects/smpng/sys/sys/ucred.h#19 integrate .. //depot/projects/smpng/sys/sys/vnode.h#23 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#8 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#9 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#17 integrate .. //depot/projects/smpng/sys/vm/vm_init.c#5 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#21 integrate .. //depot/projects/smpng/sys/x86_64/include/ansi.h#3 delete Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/dump_machdep.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.1 2002/05/11 21:53:46 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.2 2002/08/31 03:21:59 jhb Exp $ */ #include @@ -57,7 +57,7 @@ void *va; int i, mb; - printf("Dumping %u MB\n", Maxmem / (1024*1024 / PAGE_SIZE)); + printf("Dumping %ld MB\n", Maxmem / (1024*1024 / PAGE_SIZE)); /* Fill in the kernel dump header */ strcpy(kdh.magic, KERNELDUMPMAGIC); ==== //depot/projects/smpng/sys/alpha/alpha/elf_machdep.c#5 (text+ko) ==== @@ -22,12 +22,14 @@ * (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/alpha/alpha/elf_machdep.c,v 1.10 2002/07/20 02:56:09 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.11 2002/09/01 21:41:22 jake Exp $ */ #include #include #include +#include +#include #include #include #include @@ -38,6 +40,10 @@ #include #include #include + +#include +#include + #include #include @@ -46,11 +52,11 @@ sysent, 0, 0, + NULL, 0, - 0, - 0, - 0, - elf64_freebsd_fixup, + NULL, + NULL, + __elfN(freebsd_fixup), sendsig, sigcode, &szsigcode, @@ -58,7 +64,15 @@ "FreeBSD ELF64", __elfN(coredump), NULL, - MINSIGSTKSZ + MINSIGSTKSZ, + PAGE_SIZE, + VM_MIN_ADDRESS, + VM_MAXUSER_ADDRESS, + USRSTACK, + PS_STRINGS, + VM_PROT_ALL, + exec_copyout_strings, + exec_setregs }; static Elf64_Brandinfo freebsd_brand_info = { ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#46 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.180 2002/07/31 19:37:02 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.183 2002/08/31 03:33:30 peter Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -97,6 +97,7 @@ #include #include #include +#include #include #include #include @@ -131,7 +132,6 @@ #include #include #include -#include #include #include #include @@ -189,13 +189,13 @@ struct msgbuf *msgbufp=0; -int Maxmem = 0; +long Maxmem = 0; -int totalphysmem; /* total amount of physical memory in system */ -int physmem; /* physical memory used by NetBSD + some rsvd */ -int resvmem; /* amount of memory reserved for PROM */ -int unusedmem; /* amount of memory for OS that we don't use */ -int unknownmem; /* amount of memory with an unknown use */ +long totalphysmem; /* total amount of physical memory in system */ +long physmem; /* physical memory used by NetBSD + some rsvd */ +long resvmem; /* amount of memory reserved for PROM */ +long unusedmem; /* amount of memory for OS that we don't use */ +long unknownmem; /* amount of memory with an unknown use */ int ncpus; /* number of cpus */ vm_offset_t phys_avail[10]; @@ -203,25 +203,28 @@ static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) { - int error = sysctl_handle_int(oidp, 0, alpha_ptob(physmem), req); - return (error); + u_long val; + + val = alpha_ptob(physmem); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_INT|CTLFLAG_RD, - 0, 0, sysctl_hw_physmem, "I", ""); +SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD, + 0, 0, sysctl_hw_physmem, "LU", ""); static int sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) { - int error = sysctl_handle_int(oidp, 0, - alpha_ptob(physmem - cnt.v_wire_count), req); - return (error); + u_long val; + + val = alpha_ptob(physmem - cnt.v_wire_count); + return (sysctl_handle_long(oidp, &val, 0, req)); } -SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_INT|CTLFLAG_RD, - 0, 0, sysctl_hw_usermem, "I", ""); +SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD, + 0, 0, sysctl_hw_usermem, "LU", ""); -SYSCTL_INT(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); +SYSCTL_ULONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); /* must be 2 less so 0 0 can signal end of chunks */ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2) @@ -1583,7 +1586,7 @@ * Clear registers on exec */ void -setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) +exec_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) { struct trapframe *tfp = td->td_frame; ==== //depot/projects/smpng/sys/alpha/include/md_var.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.19 2002/03/20 18:58:45 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.20 2002/08/30 04:04:34 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -36,7 +36,7 @@ extern char sigcode[]; extern char esigcode[]; extern int szsigcode; -extern int Maxmem; +extern long Maxmem; extern int busdma_swi_pending; struct fpreg; ==== //depot/projects/smpng/sys/alpha/include/reg.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/reg.h,v 1.11 2002/03/20 18:58:45 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/include/reg.h,v 1.12 2002/08/29 06:17:46 jake Exp $ */ /* From: NetBSD: reg.h,v 1.3 1997/04/06 08:47:40 cgd Exp */ /* @@ -114,7 +114,6 @@ /* * XXX these interfaces are MI, so they should be declared in a MI place. */ -void setregs(struct thread *, u_long, u_long, u_long); int fill_regs(struct thread *, struct reg *); int set_regs(struct thread *, struct reg *); int fill_fpregs(struct thread *, struct fpreg *); ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#8 (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. * - * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.83 2002/07/20 02:56:09 peter Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.84 2002/09/01 21:41:22 jake Exp $ */ /* XXX we use functions that might not exist. */ @@ -179,19 +179,27 @@ linux_sysent, 0, 0, + NULL, 0, - 0, - 0, - 0, + NULL, + NULL, elf_linux_fixup, osendsig, linux_sigcode, &linux_szsigcode, - 0, + NULL, "Linux ELF", elf64_coredump, exec_linux_imgact_try, - LINUX_MINSIGSTKSZ + LINUX_MINSIGSTKSZ, + PAGE_SIZE, + VM_MIN_ADDRESS, + VM_MAXUSER_ADDRESS, + USRSTACK, + PS_STRINGS, + VM_PROT_ALL, + exec_copyout_strings, + exec_setregs }; static Elf64_Brandinfo linux_brand = { ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#18 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.32 2002/08/16 12:51:51 rwatson Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.33 2002/08/30 04:04:34 peter Exp $ */ @@ -256,7 +256,7 @@ return open(td, &a); } -extern int totalphysmem; +extern long totalphysmem; int osf1_getsysinfo(td, uap) ==== //depot/projects/smpng/sys/alpha/osf1/osf1_sysvec.c#4 (text+ko) ==== @@ -28,7 +28,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/alpha/osf1/osf1_sysvec.c,v 1.7 2002/06/02 20:05:41 schweikh Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.8 2002/09/01 21:41:22 jake Exp $ */ /* XXX we use functions that might not exist. */ @@ -64,21 +64,29 @@ struct sysentvec osf1_sysvec = { OSF1_SYS_MAXSYSCALL, osf1_sysent, - 0x0, 0, 0, + NULL, 0, - 0, - 0, /* trap-to-signal translation function */ + NULL, + NULL, /* trap-to-signal translation function */ osf1_freebsd_fixup, /* fixup */ osf1_sendsig, sigcode, /* use generic trampoline */ &osf1_szsigcode, /* use generic trampoline size */ - 0, /* prepsyscall */ + NULL, /* prepsyscall */ "OSF/1 ECOFF", NULL, /* we don't have an ECOFF coredump function */ NULL, - OSF1_MINSIGSTKSZ + OSF1_MINSIGSTKSZ, + PAGE_SIZE, + VM_MIN_ADDRESS, + VM_MAXUSER_ADDRESS, + USRSTACK, + PS_STRINGS, + VM_PROT_ALL, + exec_copyout_strings, + exec_setregs }; /* ==== //depot/projects/smpng/sys/boot/common/Makefile.inc#3 (text+ko) ==== @@ -1,13 +1,9 @@ -# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.13 2002/03/28 01:28:21 obrien Exp $ +# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.14 2002/08/29 02:02:27 peter Exp $ SRCS+= bcache.c boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c load_elf.c ls.c misc.c SRCS+= module.c panic.c -.if defined(LOADER_AOUT_SUPPORT) -SRCS+= load_aout.c -.endif - .if defined(LOADER_NET_SUPPORT) SRCS+= dev_net.c .endif ==== //depot/projects/smpng/sys/boot/common/loader.8#15 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.46 2002/08/13 15:06:48 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.47 2002/08/30 11:10:59 iwasaki Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -313,7 +313,7 @@ .It Va acpi_load Unset this to disable automatic loading of the ACPI module. See also -.Va hint.acpi.0.disable +.Va hint.acpi.0.disabled in .Xr device.hints 5 . .It Va autoboot_delay ==== //depot/projects/smpng/sys/boot/ficl/prefix.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ ** SUCH DAMAGE. */ -/* $FreeBSD: src/sys/boot/ficl/prefix.c,v 1.2 2002/04/09 17:45:11 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/prefix.c,v 1.3 2002/08/31 01:04:53 scottl Exp $ */ #include #include @@ -104,7 +104,7 @@ vmSetTibIndex(pVM, si.cp + n - pVM->tib.cp ); vmExecute(pVM, pFW); - return FICL_TRUE; + return (int)FICL_TRUE; } pFW = pFW->link; } ==== //depot/projects/smpng/sys/boot/ficl/words.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ ** SUCH DAMAGE. */ -/* $FreeBSD: src/sys/boot/ficl/words.c,v 1.37 2002/04/09 17:45:11 dcs Exp $ */ +/* $FreeBSD: src/sys/boot/ficl/words.c,v 1.38 2002/08/31 01:04:53 scottl Exp $ */ #ifdef TESTMAIN #include @@ -732,7 +732,7 @@ int base = 10; int unsignedInteger = FALSE; - int append = FICL_TRUE; + FICL_INT append = FICL_TRUE; while (format < formatStop) { @@ -816,7 +816,7 @@ } } - if (append == FICL_TRUE) + if (append != FICL_FALSE) { if (!desiredLength) desiredLength = actualLength; @@ -1262,7 +1262,7 @@ } else { /* take branch (to else/endif/begin) */ - vmBranchRelative(pVM, *(int *)(pVM->ip)); + vmBranchRelative(pVM, (uintptr_t)*(pVM->ip)); } return; @@ -1311,7 +1311,7 @@ static void branchParen(FICL_VM *pVM) { - vmBranchRelative(pVM, *(int *)(pVM->ip)); + vmBranchRelative(pVM, (uintptr_t)*(pVM->ip)); return; } @@ -1473,7 +1473,7 @@ } vmExecute(pVM, tempFW); - return FICL_TRUE; + return (int)FICL_TRUE; } } @@ -1489,7 +1489,7 @@ { dictAppendCell(dp, LVALUEtoCELL(tempFW)); } - return FICL_TRUE; + return (int)FICL_TRUE; } } @@ -1922,7 +1922,7 @@ else { /* update index, branch to loop head */ stackSetTop(pVM->rStack, LVALUEtoCELL(index)); - vmBranchRelative(pVM, *(int *)(pVM->ip)); + vmBranchRelative(pVM, (uintptr_t)*(pVM->ip)); } return; @@ -1957,7 +1957,7 @@ else { /* update index, branch to loop head */ stackSetTop(pVM->rStack, LVALUEtoCELL(index)); - vmBranchRelative(pVM, *(int *)(pVM->ip)); + vmBranchRelative(pVM, (uintptr_t)*(pVM->ip)); } return; ==== //depot/projects/smpng/sys/boot/forth/loader.conf#12 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.63 2002/08/17 16:23:44 orion Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.64 2002/09/02 20:10:18 brooks Exp $ ############################################################## ### Basic configuration options ############################ @@ -90,6 +90,7 @@ #kern.nbuf="" # Set the number of buffer headers #kern.ncallout="" # Set the maximum # of timer events #kern.sgrowsiz="" # Set the amount to grow stack +#kern.cam.scsi_delay="2000" # Delay (in ms) before probing SCSI #kern.ipc.maxsockets="" # Set the maximum number of sockets avaliable #kern.ipc.nmbclusters="" # Set the number of mbuf clusters #kern.ipc.nmbufs="" # Set the maximum number of mbufs ==== //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#12 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.43 2002/06/21 06:18:01 mckusick Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.44 2002/09/01 21:29:10 kan Exp $ */ #include @@ -409,7 +409,7 @@ } if (opts & 1 << RBX_PROBEKBD) { i = *(uint8_t *)PTOV(0x496) & 0x10; - printf("Keyboard: %s\n", i ? "yes" : "no"); + /* printf("Keyboard: %s\n", i ? "yes" : "no"); */ if (!i) opts |= 1 << RBX_DUAL | 1 << RBX_SERIAL; opts &= ~(1 << RBX_PROBEKBD); ==== //depot/projects/smpng/sys/boot/i386/libi386/Makefile#6 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.27 2002/06/21 11:00:00 phk Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.28 2002/08/29 02:02:28 peter Exp $ # LIB= i386 INTERNALLIB= true -SRCS= aout_freebsd.c biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \ +SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \ biospci.c bootinfo.c comconsole.c devicename.c elf_freebsd.c gatea20.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c ==== //depot/projects/smpng/sys/boot/i386/libi386/i386_module.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.7 2002/08/09 06:07:33 obrien Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.8 2002/08/30 11:11:02 iwasaki Exp $ */ /* @@ -49,7 +49,7 @@ /* autoload ACPI support */ /* XXX should be in 4th keyed off acpi_load */ - if ((getenv("acpi_load") && !getenv("hint.acpi.0.disable"))) { + if ((getenv("acpi_load") && !getenv("hint.acpi.0.disabled"))) { error = mod_load("acpi", NULL, 0, NULL); if (error != 0) printf("ACPI autoload failed - %s\n", strerror(error)); ==== //depot/projects/smpng/sys/boot/i386/loader/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.59 2002/06/21 11:00:00 phk Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.62 2002/08/30 14:59:47 jhb Exp $ BASE= loader PROG= ${BASE} @@ -6,9 +6,6 @@ NEWVERSWHAT= "bootstrap loader" i386 BINDIR?= /boot INSTALLFLAGS= -b -.if !defined(LOADER_NO_AOUT_SUPPORT) -LOADER_AOUT_SUPPORT= yes -.endif # architecture-specific loader code SRCS= main.c conf.c ==== //depot/projects/smpng/sys/boot/i386/loader/conf.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.20 2002/03/17 12:25:48 sobomax Exp $ + * $FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.21 2002/08/29 02:02:28 peter Exp $ */ #include @@ -81,12 +81,10 @@ * Sort formats so that those that can detect based on arguments * rather than reading the file go first. */ -extern struct file_format i386_aout; extern struct file_format i386_elf; struct file_format *file_formats[] = { &i386_elf, - &i386_aout, NULL >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 3 14:46:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00D3D37B401; Tue, 3 Sep 2002 14:46:16 -0700 (PDT) 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 6FD4037B400 for ; Tue, 3 Sep 2002 14:46:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FC9B43E6A for ; Tue, 3 Sep 2002 14:46:16 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g83LkGJU099662 for ; Tue, 3 Sep 2002 14:46:16 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g83LkFgt099659 for perforce@freebsd.org; Tue, 3 Sep 2002 14:46:15 -0700 (PDT) Date: Tue, 3 Sep 2002 14:46:15 -0700 (PDT) Message-Id: <200209032146.g83LkFgt099659@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 17009 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17009 Change 17009 by jhb@jhb_laptop on 2002/09/03 14:46:04 IFC @17008. Affected files ... .. //depot/projects/smpng/sys/conf/NOTES#22 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#35 integrate Differences ... ==== //depot/projects/smpng/sys/conf/NOTES#22 (text+ko) ==== @@ -1,8 +1,9 @@ +# $FreeBSD: src/sys/conf/NOTES,v 1.1071 2002/09/03 19:21:39 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # # Lines that begin with 'device', 'options', 'machine', 'ident', 'maxusers', -# 'makeoptions', 'hints' etc go into the kernel configuration that you +# 'makeoptions', 'hints', etc. go into the kernel configuration that you # run config(8) with. # # Lines that begin with 'hint.' are NOT for config(8), they go into your @@ -14,7 +15,25 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1070 2002/09/02 20:10:18 brooks Exp $ + +# +# NOTES conventions and style guide: +# +# Large block comments should begin and end with a line containing only a +# comment character. +# +# To describe a particular object, a block comment (if it exists) should +# come first. Next should come device, options, and hints lines in that +# order. All device and option lines must be described by a comment that +# doesn't just expand the device or option name. Use only a concise +# comment on the same line if possible. Very detailed descriptions of +# devices and subsystems belong in manpages. +# +# A space followed by a tab separates 'option' from an option name. Two +# spaces followed by a tab separate 'device' from a device name. Comments +# after an option or device should use one space after the comment character. +# To comment out a negative option that disables code and thus should not be +# enabled for LINT builds, precede 'option' with "#!". # # ==== //depot/projects/smpng/sys/kern/imgact_elf.c#18 (text+ko) ==== @@ -27,7 +27,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/kern/imgact_elf.c,v 1.124 2002/09/02 17:27:30 dillon Exp $ + * $FreeBSD: src/sys/kern/imgact_elf.c,v 1.125 2002/09/03 21:18:17 peter Exp $ */ #include @@ -734,18 +734,20 @@ phdr[i].p_vaddr - seg_addr); /* - * Is this .text or .data? Use VM_PROT_WRITE - * to distinguish between the two for the purpose - * of limit checking and vmspace fields. + * Check whether the entry point is in this segment + * to determine whether to count is as text or data. + * XXX: this needs to be done better! */ - if (prot & VM_PROT_WRITE) { + if (hdr->e_entry >= phdr[i].p_vaddr && + hdr->e_entry < (phdr[i].p_vaddr + + phdr[i].p_memsz)) { + text_size = seg_size; + text_addr = seg_addr; + entry = (u_long)hdr->e_entry; + } else { data_size += seg_size; if (data_addr == 0) data_addr = seg_addr; - } else { - text_size += seg_size; - if (text_addr == 0) - text_addr = seg_addr; } /* @@ -761,13 +763,6 @@ error = ENOMEM; goto fail; } - - /* Does the entry point belong to this segment? */ - if (hdr->e_entry >= phdr[i].p_vaddr && - hdr->e_entry < (phdr[i].p_vaddr + - phdr[i].p_memsz)) { - entry = (u_long)hdr->e_entry; - } break; case PT_PHDR: /* Program header table info */ proghdr = phdr[i].p_vaddr; ==== //depot/projects/smpng/sys/kern/kern_descrip.c#35 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.157 2002/09/02 22:24:14 iedowse Exp $ + * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.158 2002/09/03 20:16:31 jhb Exp $ */ #include "opt_compat.h" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 3 15: 4:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A9D137B401; Tue, 3 Sep 2002 15:03:01 -0700 (PDT) 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 1425237B400 for ; Tue, 3 Sep 2002 15:03:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44C1143E72 for ; Tue, 3 Sep 2002 15:03:00 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g83M30JU001426 for ; Tue, 3 Sep 2002 15:03:00 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g83M2xmv001422 for perforce@freebsd.org; Tue, 3 Sep 2002 15:02:59 -0700 (PDT) Date: Tue, 3 Sep 2002 15:02:59 -0700 (PDT) Message-Id: <200209032202.g83M2xmv001422@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17011 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17011 Change 17011 by peter@peter_daintree on 2002/09/03 15:02:47 IFC @17008 Affected files ... .. //depot/projects/ia64/UPDATING#19 integrate .. //depot/projects/ia64/bin/ps/ps.c#8 integrate .. //depot/projects/ia64/etc/rc.d/nfsd#6 integrate .. //depot/projects/ia64/gnu/usr.bin/man/man/man.c#7 integrate .. //depot/projects/ia64/lib/csu/sparc64/crt1.c#6 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/Makefile.inc#7 integrate .. //depot/projects/ia64/lib/libc/sparc64/sys/sigaction.S#1 branch .. //depot/projects/ia64/sys/conf/NOTES#22 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#8 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#6 integrate .. //depot/projects/ia64/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/ia64/sys/dev/sio/sio_puc.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#31 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#9 integrate .. //depot/projects/ia64/sys/modules/Makefile#19 integrate .. //depot/projects/ia64/sys/sys/proc.h#29 integrate .. //depot/projects/ia64/usr.bin/uudecode/uudecode.c#10 integrate .. //depot/projects/ia64/usr.bin/uuencode/uuencode.1#6 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/perform.c#5 integrate Differences ... ==== //depot/projects/ia64/UPDATING#19 (text+ko) ==== @@ -22,6 +22,14 @@ integrity. Re-enabling write caching can substantially improve performance. +20020831: + gcc has been upgraded to 3.2. It is not all binary compatible + with earlier versions of gcc for c++ programs. All c++ + programs and libraries need to be recompiled. + + Also, if you encounter g++ issues, rm /usr/include/g++/* before + doing an installworld to make sure that stale files are removed. + 20020827: Our /etc/termcap now has all the entries from the XFree86 xterm almost unchanged. This means xterm now supports color by default. @@ -987,6 +995,7 @@ make installkernel KERNCONF=YOUR_KERNEL_HERE reboot in single user [3] mergemaster -p [5] + rm -rf /usr/include/g++ make installworld mergemaster [4] [1] @@ -1068,4 +1077,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.216 2002/08/28 19:34:49 schweikh Exp $ +$FreeBSD: src/UPDATING,v 1.217 2002/09/03 06:13:43 imp Exp $ ==== //depot/projects/ia64/bin/ps/ps.c#8 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.57 2002/07/08 09:08:51 robert Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.58 2002/09/03 05:44:00 jmallett Exp $"); #include #include @@ -591,9 +591,16 @@ static char * kludge_oldps_options(char *s) { + int have_fmt; size_t len; char *newopts, *ns, *cp; + /* + * If we have an 'o' option, then note it, since we don't want to do + * some types of munging. + */ + have_fmt = index(s, 'o') != NULL; + len = strlen(s); if ((newopts = ns = malloc(len + 2)) == NULL) errx(1, "malloc failed"); @@ -634,7 +641,7 @@ */ if (isdigit(*cp) && (cp == s || (cp[-1] != 't' && cp[-1] != 'p')) && - (cp - 1 == s || cp[-2] != 't')) + (cp - 1 == s || cp[-2] != 't') && !have_fmt) *ns++ = 'p'; (void)strcpy(ns, cp); /* and append the number */ ==== //depot/projects/ia64/etc/rc.d/nfsd#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: nfsd,v 1.4 2001/06/16 06:13:10 lukem Exp $ -# $FreeBSD: src/etc/rc.d/nfsd,v 1.5 2002/08/20 00:14:11 gordon Exp $ +# $FreeBSD: src/etc/rc.d/nfsd,v 1.6 2002/09/03 16:02:57 gordon Exp $ # # PROVIDE: nfsd @@ -18,6 +18,7 @@ FreeBSD) command_args="${nfs_server_flags}" start_precmd="nfsd_precmd" + sig_stop="USR1" ;; NetBSD) required_vars="mountd rpcbind" ==== //depot/projects/ia64/gnu/usr.bin/man/man/man.c#7 (text+ko) ==== @@ -16,7 +16,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.57 2002/08/27 09:31:27 eric Exp $"; + "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.58 2002/09/03 17:39:26 eric Exp $"; #endif /* not lint */ #define MAN_MAIN @@ -459,7 +459,7 @@ #endif /* __FreeBSD__ */ if (pager == NULL || *pager == '\0') - if ((pager = getenv ("PAGER")) == NULL || *pager == NULL) + if ((pager = getenv ("PAGER")) == NULL || *pager == '\0') pager = strdup (PAGER); if (debug) ==== //depot/projects/ia64/lib/csu/sparc64/crt1.c#6 (text+ko) ==== @@ -122,7 +122,6 @@ __progname = s + 1; } - __sparc_sigtramp_setup(); __sparc_utrap_setup(); /* @@ -152,4 +151,4 @@ __asm__(".previous"); #endif -__asm__(".ident\t\"$FreeBSD: src/lib/csu/sparc64/crt1.c,v 1.9 2002/07/16 12:28:50 markm Exp $\""); +__asm__(".ident\t\"$FreeBSD: src/lib/csu/sparc64/crt1.c,v 1.10 2002/09/03 14:59:41 jake Exp $\""); ==== //depot/projects/ia64/lib/libc/sparc64/sys/Makefile.inc#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.7 2002/05/23 23:51:57 jake Exp $ +# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.8 2002/09/03 14:55:29 jake Exp $ SRCS+= __sparc_sigtramp_setup.c \ __sparc_utrap.c \ @@ -12,7 +12,7 @@ CFLAGS+= -I${.CURDIR}/sparc64/fpu -MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S +MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S sigaction.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ ==== //depot/projects/ia64/sys/conf/NOTES#22 (text+ko) ==== @@ -1,8 +1,9 @@ +# $FreeBSD: src/sys/conf/NOTES,v 1.1071 2002/09/03 19:21:39 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # # Lines that begin with 'device', 'options', 'machine', 'ident', 'maxusers', -# 'makeoptions', 'hints' etc go into the kernel configuration that you +# 'makeoptions', 'hints', etc. go into the kernel configuration that you # run config(8) with. # # Lines that begin with 'hint.' are NOT for config(8), they go into your @@ -14,7 +15,25 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys//conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1070 2002/09/02 20:10:18 brooks Exp $ + +# +# NOTES conventions and style guide: +# +# Large block comments should begin and end with a line containing only a +# comment character. +# +# To describe a particular object, a block comment (if it exists) should +# come first. Next should come device, options, and hints lines in that +# order. All device and option lines must be described by a comment that +# doesn't just expand the device or option name. Use only a concise +# comment on the same line if possible. Very detailed descriptions of +# devices and subsystems belong in manpages. +# +# A space followed by a tab separates 'option' from an option name. Two +# spaces followed by a tab separate 'device' from a device name. Comments +# after an option or device should use one space after the comment character. +# To comment out a negative option that disables code and thus should not be +# enabled for LINT builds, precede 'option' with "#!". # # ==== //depot/projects/ia64/sys/dev/pccard/pccard.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: pcmcia.c,v 1.23 2000/07/28 19:17:02 drochner Exp $ */ -/* $FreeBSD: src/sys/dev/pccard/pccard.c,v 1.62 2002/08/31 18:34:30 imp Exp $ */ +/* $FreeBSD: src/sys/dev/pccard/pccard.c,v 1.63 2002/09/03 11:24:25 phk Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -1174,6 +1174,7 @@ pccard_intr(void *arg) { struct pccard_function *pf = (struct pccard_function*) arg; +#ifdef COOKIE_FOR_WARNER int reg; if (pf->intr_handler == NULL) @@ -1189,6 +1190,11 @@ reg & ~PCCARD_CCR_STATUS_INTR); pf->intr_handler(pf->intr_handler_arg); } +#else + if (pf->intr_handler == NULL) + return; + pf->intr_handler(pf->intr_handler_arg); +#endif } static int ==== //depot/projects/ia64/sys/dev/puc/puc.c#6 (text+ko) ==== @@ -58,7 +58,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.11 2002/09/01 01:59:38 jmallett Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc.c,v 1.14 2002/09/03 11:22:13 phk Exp $"); /* * PCI "universal" communication card device driver, glues com, lpt, @@ -112,6 +112,8 @@ static void puc_print_resource_list(struct resource_list *); #endif +devclass_t puc_devclass; + static int puc_port_bar_index(struct puc_softc *sc, int bar) { @@ -157,15 +159,8 @@ sc->irqres = res; sc->irqrid = rid; -#ifdef PUC_FASTINTR irq_setup = BUS_SETUP_INTR(device_get_parent(dev), dev, res, - INTR_TYPE_TTY | INTR_FAST, puc_intr, sc, &sc->intr_cookie); -#else - irq_setup = ENXIO; -#endif - if (irq_setup != 0) - irq_setup = BUS_SETUP_INTR(device_get_parent(dev), dev, res, - INTR_TYPE_TTY, puc_intr, sc, &sc->intr_cookie); + INTR_TYPE_TTY, puc_intr, sc, &sc->intr_cookie); if (irq_setup != 0) return (ENXIO); @@ -307,7 +302,6 @@ int i; struct puc_softc *sc; -printf("puc_intr\n"); sc = (struct puc_softc *)arg; for (i = 0; i < PUC_MAX_PORTS; i++) if (sc->sc_ports[i].ihand != NULL) @@ -335,7 +329,9 @@ return (NULL); } -static int puc_find_free_unit(char *name) + +static int +puc_find_free_unit(char *name) { devclass_t dc; int start; @@ -454,7 +450,8 @@ int i; struct puc_softc *sc; -printf("puc_setup_intr()\n"); + if (flags & INTR_FAST) + return (ENXIO); sc = (struct puc_softc *)device_get_softc(dev); for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { if (sc->sc_ports[i].dev == child) { @@ -476,7 +473,6 @@ int i; struct puc_softc *sc; -printf("puc_teardown_intr()\n"); sc = (struct puc_softc *)device_get_softc(dev); for (i = 0; PUC_PORT_VALID(sc->sc_desc, i); i++) { if (sc->sc_ports[i].dev == child) { @@ -506,6 +502,3 @@ } return (0); } - -devclass_t puc_devclass; - ==== //depot/projects/ia64/sys/dev/puc/puc_pccard.c#2 (text+ko) ==== @@ -22,7 +22,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/dev/puc/puc_pccard.c,v 1.3 2002/09/01 01:59:38 jmallett Exp $ + * $FreeBSD: src/sys/dev/puc/puc_pccard.c,v 1.4 2002/09/03 11:31:34 phk Exp $ */ #include "opt_puc.h" @@ -46,7 +46,8 @@ const struct puc_device_description rscom_devices = { - "RS-com 2 port", + "ARGOSY SP320 Dual port serial PCMCIA", + /* http://www.argosy.com.tw/product/sp320.htm */ NULL, { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, @@ -69,7 +70,6 @@ error = pccard_get_product_str(dev, &product); if (error) return(error); - printf("puc_pccard_probe <%s><%s>\n", vendor, product); if (!strcmp(vendor, "PCMCIA") && !strcmp(product, "RS-COM 2P")) { device_set_desc(dev, rscom_devices.name); return (0); ==== //depot/projects/ia64/sys/dev/sio/sio_puc.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.3 2002/03/20 02:07:41 alfred Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sio/sio_puc.c,v 1.4 2002/09/03 11:17:38 phk Exp $"); #include #include @@ -86,7 +86,7 @@ #ifdef PC98 SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550)); #endif - return (sioprobe(dev, 0, (u_long)rclk, 0)); + return (sioprobe(dev, 0, (u_long)rclk, 1)); } DRIVER_MODULE(sio, puc, sio_puc_driver, sio_devclass, 0, 0); ==== //depot/projects/ia64/sys/dev/sound/pci/fm801.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.14 2002/08/30 14:21:01 sobomax Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.15 2002/09/03 08:58:15 sobomax Exp $"); #define PCI_VENDOR_FORTEMEDIA 0x1319 #define PCI_DEVICE_FORTEMEDIA1 0x08011319 @@ -161,6 +161,8 @@ unsigned int bufsz; struct fm801_chinfo pch, rch; + + device_t radio; }; /* Bus Read / Write routines */ @@ -223,7 +225,7 @@ } if (i >= TIMO) { printf("fm801 rdcd: write codec invalid\n"); - return -1; + return 0; } return fm801_rd(fm801,FM_CODEC_DATA,2); @@ -613,13 +615,6 @@ codec = AC97_CREATE(dev, fm801, fm801_ac97); if (codec == NULL) goto oops; - /* - * XXX: quick check that device actually has sound capabilities. - * The problem is that some cards built around fm801 chip only - * have radio tuner onboard, but no sound capabilities. - */ - if (fm801_rdcd(NULL, fm801, AC97_REG_POWER) == -1) goto oops; - if (mixer_init(dev, ac97_getmixerclass(), codec) == -1) goto oops; fm801->irqid = 0; @@ -650,6 +645,9 @@ pcm_addchan(dev, PCMDIR_REC, &fm801ch_class, fm801); pcm_setstatus(dev, status); + fm801->radio = device_add_child(dev, "radio", -1); + bus_generic_attach(dev); + return 0; oops: @@ -670,11 +668,22 @@ DPRINT("Forte Media FM801 detach\n"); + fm801 = pcm_getdevinfo(dev); + + r = bus_generic_detach(dev); + if (r) + return r; + if (fm801->radio != NULL) { + r = device_delete_child(dev, fm801->radio); + if (r) + return r; + fm801->radio = NULL; + } + r = pcm_unregister(dev); if (r) return r; - fm801 = pcm_getdevinfo(dev); bus_release_resource(dev, fm801->regtype, fm801->regid, fm801->reg); bus_teardown_intr(dev, fm801->irq, fm801->ih); bus_release_resource(dev, SYS_RES_IRQ, fm801->irqid, fm801->irq); @@ -686,10 +695,50 @@ static int fm801_pci_probe( device_t dev ) { - int id; + u_int32_t data; + int id, regtype, regid, result; + struct resource *reg; + bus_space_tag_t st; + bus_space_handle_t sh; + + result = ENXIO; + if ((id = pci_get_devid(dev)) == PCI_DEVICE_FORTEMEDIA1 ) { - device_set_desc(dev, "Forte Media FM801 Audio Controller"); - return 0; + data = pci_read_config(dev, PCIR_COMMAND, 2); + data |= (PCIM_CMD_PORTEN|PCIM_CMD_BUSMASTEREN); + pci_write_config(dev, PCIR_COMMAND, data, 2); + data = pci_read_config(dev, PCIR_COMMAND, 2); + + regid = PCIR_MAPS; + regtype = SYS_RES_IOPORT; + reg = bus_alloc_resource(dev, regtype, ®id, 0, ~0, 1, + RF_ACTIVE); + + if (reg == NULL) + return ENXIO; + + st = rman_get_bustag(reg); + sh = rman_get_bushandle(reg); + /* + * XXX: quick check that device actually has sound capabilities. + * The problem is that some cards built around FM801 chip only + * have radio tuner onboard, but no sound capabilities. There + * is no "official" way to quickly check this, because all + * IDs are exactly the same. The only difference is 0x28 + * device control register, described in FM801 specification + * as "SRC/Mixer Test Control/DFC Status", but without + * any more detailed explanation. According to specs, and + * available sample cards (SF256-PCP-R and SF256-PCS-R) its + * power-on value should be `0', while on AC97-less tuner + * card (SF64-PCR) it was 0x80. + */ + if (bus_space_read_1(st, sh, 0x28) == 0) { + device_set_desc(dev, + "Forte Media FM801 Audio Controller"); + result = 0; + } + + bus_release_resource(dev, regtype, regid, reg); } /* if ((id = pci_get_devid(dev)) == PCI_DEVICE_FORTEMEDIA2 ) { @@ -697,7 +746,28 @@ return ENXIO; } */ - return ENXIO; + return (result); +} + +static struct resource * +fm801_alloc_resource(device_t bus, device_t child, int type, int *rid, + u_long start, u_long end, u_long count, u_int flags) +{ + struct fm801_info *fm801; + + fm801 = pcm_getdevinfo(bus); + + if (type == SYS_RES_IOPORT && *rid == PCIR_MAPS) + return (fm801->reg); + + return (NULL); +} + +static int +fm801_release_resource(device_t bus, device_t child, int type, int rid, + struct resource *r) +{ + return (0); } static device_method_t fm801_methods[] = { @@ -705,6 +775,16 @@ DEVMETHOD(device_probe, fm801_pci_probe), DEVMETHOD(device_attach, fm801_pci_attach), DEVMETHOD(device_detach, fm801_pci_detach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), + + /* Bus interface */ + DEVMETHOD(bus_print_child, bus_generic_print_child), + DEVMETHOD(bus_alloc_resource, fm801_alloc_resource), + DEVMETHOD(bus_release_resource, fm801_release_resource), + DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), { 0, 0} }; @@ -717,4 +797,3 @@ DRIVER_MODULE(snd_fm801, pci, fm801_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_fm801, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER); MODULE_VERSION(snd_fm801, 1); - ==== //depot/projects/ia64/sys/kern/imgact_elf.c#19 (text+ko) ==== @@ -27,7 +27,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/kern/imgact_elf.c,v 1.124 2002/09/02 17:27:30 dillon Exp $ + * $FreeBSD: src/sys/kern/imgact_elf.c,v 1.125 2002/09/03 21:18:17 peter Exp $ */ #include @@ -734,18 +734,20 @@ phdr[i].p_vaddr - seg_addr); /* - * Is this .text or .data? Use VM_PROT_WRITE - * to distinguish between the two for the purpose - * of limit checking and vmspace fields. + * Check whether the entry point is in this segment + * to determine whether to count is as text or data. + * XXX: this needs to be done better! */ - if (prot & VM_PROT_WRITE) { + if (hdr->e_entry >= phdr[i].p_vaddr && + hdr->e_entry < (phdr[i].p_vaddr + + phdr[i].p_memsz)) { + text_size = seg_size; + text_addr = seg_addr; + entry = (u_long)hdr->e_entry; + } else { data_size += seg_size; if (data_addr == 0) data_addr = seg_addr; - } else { - text_size += seg_size; - if (text_addr == 0) - text_addr = seg_addr; } /* @@ -761,13 +763,6 @@ error = ENOMEM; goto fail; } - - /* Does the entry point belong to this segment? */ - if (hdr->e_entry >= phdr[i].p_vaddr && - hdr->e_entry < (phdr[i].p_vaddr + - phdr[i].p_memsz)) { - entry = (u_long)hdr->e_entry; - } break; case PT_PHDR: /* Program header table info */ proghdr = phdr[i].p_vaddr; ==== //depot/projects/ia64/sys/kern/kern_descrip.c#31 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.157 2002/09/02 22:24:14 iedowse Exp $ + * $FreeBSD: src/sys/kern/kern_descrip.c,v 1.158 2002/09/03 20:16:31 jhb Exp $ */ #include "opt_compat.h" @@ -97,8 +97,11 @@ /* flags */ 0, }; -static int do_dup(struct filedesc *fdp, int old, int new, register_t *retval, - struct thread *td); +/* How to treat 'new' parameter when allocating a fd for do_dup(). */ +enum dup_type { DUP_VARIABLE, DUP_FIXED }; + +static int do_dup(struct thread *td, enum dup_type type, int old, int new, + register_t *retval); static int badfo_readwrite(struct file *fp, struct uio *uio, struct ucred *active_cred, int flags, struct thread *td); static int badfo_ioctl(struct file *fp, u_long com, void *data, @@ -166,37 +169,9 @@ struct thread *td; struct dup2_args *uap; { - struct proc *p = td->td_proc; - register struct filedesc *fdp = td->td_proc->p_fd; - register u_int old = uap->from, new = uap->to; - int i, error; - FILEDESC_LOCK(fdp); -retry: - if (old >= fdp->fd_nfiles || - fdp->fd_ofiles[old] == NULL || - new >= p->p_rlimit[RLIMIT_NOFILE].rlim_cur || - new >= maxfilesperproc) { - FILEDESC_UNLOCK(fdp); - return (EBADF); - } - if (old == new) { - td->td_retval[0] = new; - FILEDESC_UNLOCK(fdp); - return (0); - } - if (new >= fdp->fd_nfiles) { - if ((error = fdalloc(td, new, &i))) { - FILEDESC_UNLOCK(fdp); - return (error); - } - /* - * fdalloc() may block, retest everything. - */ - goto retry; - } - error = do_dup(fdp, (int)old, (int)new, td->td_retval, td); - return(error); + return (do_dup(td, DUP_FIXED, (int)uap->from, (int)uap->to, + td->td_retval)); } /* @@ -216,23 +191,8 @@ struct thread *td; struct dup_args *uap; { - register struct filedesc *fdp; - u_int old; - int new, error; - old = uap->fd; - fdp = td->td_proc->p_fd; - FILEDESC_LOCK(fdp); - if (old >= fdp->fd_nfiles || fdp->fd_ofiles[old] == NULL) { - FILEDESC_UNLOCK(fdp); - return (EBADF); - } - if ((error = fdalloc(td, 0, &new))) { - FILEDESC_UNLOCK(fdp); - return (error); - } - error = do_dup(fdp, (int)old, new, td->td_retval, td); - return (error); + return (do_dup(td, DUP_VARIABLE, (int)uap->fd, 0, td->td_retval)); } /* @@ -294,7 +254,7 @@ register char *pop; struct vnode *vp; struct flock *flp; - int i, tmp, error = 0, flg = F_POSIX; + int tmp, error = 0, flg = F_POSIX; u_int newmin; struct proc *leaderp; @@ -312,18 +272,14 @@ switch (cmd) { case F_DUPFD: + FILEDESC_UNLOCK(fdp); newmin = arg; if (newmin >= p->p_rlimit[RLIMIT_NOFILE].rlim_cur || newmin >= maxfilesperproc) { - FILEDESC_UNLOCK(fdp); error = EINVAL; break; } - if ((error = fdalloc(td, newmin, &i))) { - FILEDESC_UNLOCK(fdp); - break; - } - error = do_dup(fdp, fd, i, td->td_retval, td); + error = do_dup(td, DUP_VARIABLE, fd, newmin, td->td_retval); break; case F_GETFD: @@ -499,16 +455,72 @@ * filedesc must be locked, but will be unlocked as a side effect. */ static int -do_dup(fdp, old, new, retval, td) - register struct filedesc *fdp; - register int old, new; +do_dup(td, type, old, new, retval) + enum dup_type type; + int old, new; register_t *retval; struct thread *td; { + register struct filedesc *fdp; + struct proc *p; struct file *fp; struct file *delfp; + int error, newfd; + + p = td->td_proc; + fdp = p->p_fd; + + /* + * Verify we have a valid descriptor to dup from and possibly to + * dup to. + */ + FILEDESC_LOCK(fdp); + if (old >= fdp->fd_nfiles || fdp->fd_ofiles[old] == NULL || + new >= p->p_rlimit[RLIMIT_NOFILE].rlim_cur || + new >= maxfilesperproc) { + FILEDESC_UNLOCK(fdp); + return (EBADF); + } + if (type == DUP_FIXED && old == new) { + *retval = new; + FILEDESC_UNLOCK(fdp); + return (0); + } + fp = fdp->fd_ofiles[old]; + fhold(fp); + + /* + * Expand the table for the new descriptor if needed. This may + * block and drop and reacquire the filedesc lock. + */ + if (type == DUP_VARIABLE || new >= fdp->fd_nfiles) { + error = fdalloc(td, new, &newfd); + if (error) { + FILEDESC_UNLOCK(fdp); + return (error); + } + } + if (type == DUP_VARIABLE) + new = newfd; - FILEDESC_LOCK_ASSERT(fdp, MA_OWNED); + /* + * If the old file changed out from under us then treat it as a + * bad file descriptor. Userland should do its own locking to + * avoid this case. + */ + if (fdp->fd_ofiles[old] != fp) { + if (fdp->fd_ofiles[new] == NULL) { + if (new < fdp->fd_freefile) + fdp->fd_freefile = new; + while (fdp->fd_lastfile > 0 && + fdp->fd_ofiles[fdp->fd_lastfile] == NULL) + fdp->fd_lastfile--; + } + FILEDESC_UNLOCK(fdp); + fdrop(fp, td); + return (EBADF); + } + KASSERT(old != new, ("new fd is same as old")); /* * Save info on the descriptor being overwritten. We have @@ -516,6 +528,8 @@ * introducing an ownership race for the slot. */ delfp = fdp->fd_ofiles[new]; + KASSERT(delfp == NULL || type == DUP_FIXED, + ("dup() picked an open file")); #if 0 if (delfp && (fdp->fd_ofileflags[new] & UF_MAPPED)) (void) munmapfd(td, new); @@ -524,16 +538,13 @@ /* * Duplicate the source descriptor, update lastfile */ - fp = fdp->fd_ofiles[old]; fdp->fd_ofiles[new] = fp; - fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE; - fhold(fp); + fdp->fd_ofileflags[new] = fdp->fd_ofileflags[old] &~ UF_EXCLOSE; if (new > fdp->fd_lastfile) fdp->fd_lastfile = new; + FILEDESC_UNLOCK(fdp); *retval = new; - FILEDESC_UNLOCK(fdp); - /* * If we dup'd over a valid file, we now own the reference to it * and must dispose of it using closef() semantics (as if a @@ -1013,8 +1024,7 @@ lim = min((int)p->p_rlimit[RLIMIT_NOFILE].rlim_cur, maxfilesperproc); for (;;) { last = min(fdp->fd_nfiles, lim); - if ((i = want) < fdp->fd_freefile) - i = fdp->fd_freefile; + i = max(want, fdp->fd_freefile); for (; i < last; i++) { if (fdp->fd_ofiles[i] == NULL) { fdp->fd_ofileflags[i] = 0; @@ -1030,29 +1040,24 @@ /* * No space in current array. Expand? */ - if (fdp->fd_nfiles >= lim) + if (i >= lim) return (EMFILE); if (fdp->fd_nfiles < NDEXTENT) nfiles = NDEXTENT; else nfiles = 2 * fdp->fd_nfiles; + while (nfiles < want) + nfiles <<= 1; FILEDESC_UNLOCK(fdp); - mtx_lock(&Giant); - MALLOC(newofile, struct file **, nfiles * OFILESIZE, - M_FILEDESC, M_WAITOK); - mtx_unlock(&Giant); - FILEDESC_LOCK(fdp); + newofile = malloc(nfiles * OFILESIZE, M_FILEDESC, M_WAITOK); /* - * deal with file-table extend race that might have occured - * when malloc was blocked. + * Deal with file-table extend race that might have + * occurred while filedesc was unlocked. */ + FILEDESC_LOCK(fdp); if (fdp->fd_nfiles >= nfiles) { - FILEDESC_UNLOCK(fdp); - mtx_lock(&Giant); - FREE(newofile, M_FILEDESC); - mtx_unlock(&Giant); - FILEDESC_LOCK(fdp); + free(newofile, M_FILEDESC); continue; } newofileflags = (char *) &newofile[nfiles]; @@ -1060,11 +1065,12 @@ * Copy the existing ofile and ofileflags arrays * and zero the new portion of each array. */ - bcopy(fdp->fd_ofiles, newofile, - (i = sizeof(struct file *) * fdp->fd_nfiles)); - bzero((char *)newofile + i, nfiles * sizeof(struct file *) - i); - bcopy(fdp->fd_ofileflags, newofileflags, - (i = sizeof(char) * fdp->fd_nfiles)); + i = fdp->fd_nfiles * sizeof(struct file *); + bcopy(fdp->fd_ofiles, newofile, i); + bzero((char *)newofile + i, + nfiles * sizeof(struct file *) - i); + i = fdp->fd_nfiles * sizeof(char); + bcopy(fdp->fd_ofileflags, newofileflags, i); bzero(newofileflags + i, nfiles * sizeof(char) - i); if (fdp->fd_nfiles > NDFILE) oldofile = fdp->fd_ofiles; @@ -1074,13 +1080,8 @@ fdp->fd_ofileflags = newofileflags; fdp->fd_nfiles = nfiles; fdexpand++; - if (oldofile != NULL) { - FILEDESC_UNLOCK(fdp); - mtx_lock(&Giant); - FREE(oldofile, M_FILEDESC); - mtx_unlock(&Giant); - FILEDESC_LOCK(fdp); - } + if (oldofile != NULL) + free(oldofile, M_FILEDESC); } return (0); } @@ -1143,28 +1144,26 @@ * descriptor to the list of open files at that point, otherwise * put it at the front of the list of open files. */ - FILEDESC_LOCK(p->p_fd); - if ((error = fdalloc(td, 0, &i))) { - FILEDESC_UNLOCK(p->p_fd); - nfiles--; - sx_xunlock(&filelist_lock); - uma_zfree(file_zone, fp); - return (error); - } fp->f_mtxp = mtx_pool_alloc(); fp->f_gcflag = 0; fp->f_count = 1; fp->f_cred = crhold(td->td_ucred); fp->f_ops = &badfileops; fp->f_seqcount = 1; + FILEDESC_LOCK(p->p_fd); if ((fq = p->p_fd->fd_ofiles[0])) { LIST_INSERT_AFTER(fq, fp, f_list); } else { LIST_INSERT_HEAD(&filehead, fp, f_list); } + sx_xunlock(&filelist_lock); + if ((error = fdalloc(td, 0, &i))) { + FILEDESC_UNLOCK(p->p_fd); + fdrop(fp, td); + return (error); + } p->p_fd->fd_ofiles[i] = fp; FILEDESC_UNLOCK(p->p_fd); - sx_xunlock(&filelist_lock); if (resultfp) *resultfp = fp; if (resultfd) @@ -1559,13 +1558,14 @@ error = falloc(td, &fp, &fd); if (error != 0) break; + KASSERT(fd == i, ("oof, we didn't get our fd")); NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, "/dev/null", td); flags = FREAD | FWRITE; error = vn_open(&nd, &flags, 0); if (error != 0) { FILEDESC_LOCK(fdp); - fdp->fd_ofiles[i] = NULL; + fdp->fd_ofiles[fd] = NULL; FILEDESC_UNLOCK(fdp); fdrop(fp, td); break; @@ -1578,13 +1578,7 @@ VOP_UNLOCK(nd.ni_vp, 0, td); devnull = fd; } else { - FILEDESC_LOCK(fdp); - error = fdalloc(td, 0, &fd); - if (error != 0) { - FILEDESC_UNLOCK(fdp); - break; - } - error = do_dup(fdp, devnull, fd, &retval, td); + error = do_dup(td, DUP_FIXED, devnull, i, &retval); if (error != 0) break; } ==== //depot/projects/ia64/sys/kern/kern_mutex.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ * >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 3 19:52:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6415737B401; Tue, 3 Sep 2002 19:52:34 -0700 (PDT) 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 D056137B400 for ; Tue, 3 Sep 2002 19:52:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AF3443E81 for ; Tue, 3 Sep 2002 19:52:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g842qXJU046637 for ; Tue, 3 Sep 2002 19:52:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g842qX1J046634 for perforce@freebsd.org; Tue, 3 Sep 2002 19:52:33 -0700 (PDT) Date: Tue, 3 Sep 2002 19:52:33 -0700 (PDT) Message-Id: <200209040252.g842qX1J046634@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17020 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17020 Change 17020 by peter@peter_mckinley on 2002/09/03 19:51:57 Work around GEOM/devfs/specfs/whatever bug. Do not use O_EXCL as it leaks a permanent exclusive reference. Affected files ... .. //depot/projects/ia64/sbin/gpt/gpt.c#10 edit Differences ... ==== //depot/projects/ia64/sbin/gpt/gpt.c#10 (text+ko) ==== @@ -285,7 +285,7 @@ return (-1); found: - fd = open(device_name, (readonly) ? O_RDONLY : O_RDWR|O_EXCL); + fd = open(device_name, (readonly) ? O_RDONLY : O_RDWR); if (fd == -1) return (-1); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 3 20: 8:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED73A37B401; Tue, 3 Sep 2002 20:08:09 -0700 (PDT) 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 7753637B400 for ; Tue, 3 Sep 2002 20:08:09 -0700 (PDT) Received: from mail.speakeasy.net (mail16.speakeasy.net [216.254.0.216]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB8DB43E42 for ; Tue, 3 Sep 2002 20:08:08 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 5821 invoked from network); 4 Sep 2002 03:08:38 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail16.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 4 Sep 2002 03:08:38 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g84386Bv006155; Tue, 3 Sep 2002 23:08:07 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200209040252.g842qX1J046634@freefall.freebsd.org> Date: Tue, 03 Sep 2002 23:08:06 -0400 (EDT) From: John Baldwin To: Peter Wemm Subject: RE: PERFORCE change 17020 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 04-Sep-2002 Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17020 > > Change 17020 by peter@peter_mckinley on 2002/09/03 19:51:57 > > Work around GEOM/devfs/specfs/whatever bug. Do not use > O_EXCL as it leaks a permanent exclusive reference. My guess is it might be a LOOKUP_SHARED bug in vn_open_cred(), but I could be wrong. > Affected files ... > > .. //depot/projects/ia64/sbin/gpt/gpt.c#10 edit > > Differences ... > > ==== //depot/projects/ia64/sbin/gpt/gpt.c#10 (text+ko) ==== > > @@ -285,7 +285,7 @@ > return (-1); > > found: > - fd = open(device_name, (readonly) ? O_RDONLY : O_RDWR|O_EXCL); > + fd = open(device_name, (readonly) ? O_RDONLY : O_RDWR); > if (fd == -1) > return (-1); > -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 4 3:42:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBA0C37B401; Wed, 4 Sep 2002 03:41:34 -0700 (PDT) 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 2723F37B400 for ; Wed, 4 Sep 2002 03:41:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A91E943E3B for ; Wed, 4 Sep 2002 03:41:33 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g84AfUJU017964 for ; Wed, 4 Sep 2002 03:41:31 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g84AfU1q017939 for perforce@freebsd.org; Wed, 4 Sep 2002 03:41:30 -0700 (PDT) Date: Wed, 4 Sep 2002 03:41:30 -0700 (PDT) Message-Id: <200209041041.g84AfU1q017939@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17036 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17036 Change 17036 by mini@mini_stylus on 2002/09/04 03:41:30 - Convert back from a ucontext_t for UTS context in the kse_mailbox to a function pointer and a stack_t. - Synthesize machine state from scratch on each upcall, but only set up the minimum amount of state. - Discard the UTS state in kse_yield(). - Use a custom MI wrapper function to handle the user context switch into a thread from the UTS. - Once again, only kse_mailbox.ke_curthread acts as a critical section marker. - Move tm_context and km_curthread to the top of their structs, because it makes the assembly less messy when switching user contexts. - The UTS is now a run-once-per-upcall flow, instead of a loop around swapcontext(). - Clarify a few comments. Affected files ... .. //depot/projects/kse/sys/i386/i386/vm_machdep.c#64 edit .. //depot/projects/kse/sys/kern/kern_proc.c#81 edit .. //depot/projects/kse/sys/kern/kern_thread.c#100 edit .. //depot/projects/kse/sys/sys/kse.h#18 edit .. //depot/projects/kse/sys/sys/proc.h#126 edit .. //depot/projects/kse/tools/KSE/uts/Makefile#2 edit .. //depot/projects/kse/tools/KSE/uts/context.S#1 add .. //depot/projects/kse/tools/KSE/uts/uts.c#6 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#64 (text+ko) ==== @@ -368,6 +368,30 @@ pcb2->pcb_ext = NULL; } +/* + * Set the machine state for performing an upcall that had to + * wait until we selected a KSE to perform the upcall on. + */ +void +cpu_set_upcall_kse(struct thread *td, struct kse *ke) +{ + + /* + * Set the trap frame to point at the beginning of the uts + * function. + */ + td->td_frame->tf_esp = + (int)ke->ke_stack.ss_sp + ke->ke_stack.ss_size - 16; + td->td_frame->tf_eip = (int)ke->ke_upcall; + + /* + * Pass the address of the mailbox for this kse to the uts + * function as a parameter on the stack. + */ + suword((void *)(td->td_frame->tf_esp + sizeof(void *)), + (int)ke->ke_mailbox); +} + void cpu_wait(p) struct proc *p; ==== //depot/projects/kse/sys/kern/kern_proc.c#81 (text+ko) ==== @@ -279,22 +279,6 @@ int kse_yield(struct thread *td, struct kse_yield_args *uap) { - int error; - ucontext_t uc; - struct kse *ke; - - /* Save UTS context. */ - ke = td->td_kse; - if (ke == NULL) - return (EFAULT); - error = copyin(&ke->ke_mailbox->km_context, &uc, sizeof(ucontext_t)); - if (error) - return (error); - thread_getcontext(td, &uc); - uc.uc_busy = 0; - error = copyout(&uc, &ke->ke_mailbox->km_context, sizeof(ucontext_t)); - if (error) - return (error); /* Abandon thread. */ PROC_LOCK(td->td_proc); @@ -363,6 +347,8 @@ mi_switch(); /* Save current registers to PCB. */ mtx_unlock_spin(&sched_lock); newkse->ke_mailbox = uap->mbx; + newkse->ke_upcall = mbx.km_func; + bcopy(&mbx.km_stack, &newkse->ke_stack, sizeof(stack_t)); /* Note that we are the returning syscall */ td->td_retval[0] = 0; td->td_retval[1] = 0; ==== //depot/projects/kse/sys/kern/kern_thread.c#100 (text+ko) ==== @@ -549,16 +549,6 @@ */ discard = 1; - /* Make sure the KSE's UTS context is free for use. */ - if (fuword(&ke->ke_mailbox->km_context.uc_busy) != 0) - /* - * The KSE's UTS context is currently marked busy. This - * means the UTS is currently running, so switch to it - * instead of performing another upcall (abandon this - * thread). - */ - discard = 1; - /* Discard thread or mark for upcall. */ if (discard) { /* @@ -605,7 +595,6 @@ struct thread *td, struct trapframe *frame) { int error; - ucontext_t uc; /* * Ensure that we have a spare thread available. @@ -642,10 +631,9 @@ td, p->p_pid, p->p_comm); /* - * Fetch the current UTS context from userland. + * Set user context to the UTS. */ - error = copyin(&ke->ke_mailbox->km_context, &uc, - sizeof(ucontext_t)); + cpu_set_upcall_kse(td, ke); if (error) /* * Failing to do the KSE operation just defaults @@ -655,21 +643,6 @@ goto cont; /* - * Set user context to the UTS's. - * - * XXX - Add the busy marker to thread_setcontext(). - */ - error = thread_setcontext(td, &uc); - if (error) - /* - * Failing to do the KSE operation just defaults - * back to synchonous operation, so just return from - * the syscall. - */ - goto cont; - suword(&ke->ke_mailbox->km_context.uc_busy, (intptr_t)td); - - /* * Set state and mailbox. */ td->td_flags &= ~TDF_UPCALLING; ==== //depot/projects/kse/sys/sys/kse.h#18 (text+ko) ==== @@ -47,12 +47,12 @@ /* * Thread mailbox. * - * This describes a user thread ot the kernel scheduler. + * This describes a user thread to the kernel scheduler. */ struct thread_mailbox { + ucontext_t tm_context; /* User and machine context */ unsigned int tm_flags; /* Thread flags */ struct thread_mailbox *tm_next; /* Next thread in list */ - ucontext_t tm_context; /* User and machine context */ void *tm_udata; /* For use by the UTS */ int tm_spare[8]; }; @@ -64,12 +64,12 @@ * a single KSE. */ struct kse_mailbox { - unsigned int km_flags; /* KSE flags */ -#define KSEKMF_CRITICAL 0x00000001 - ucontext_t km_context; /* UTS context */ struct thread_mailbox *km_curthread; /* Currently running thread */ struct thread_mailbox *km_completed; /* Threads back from kernel */ sigset_t km_sigscaught; /* Caught signals */ + unsigned int km_flags; /* KSE flags */ + void *km_func; /* UTS function */ + stack_t km_stack; /* UTS context */ void *km_udata; /* For use by the UTS */ int tm_spare[8]; }; ==== //depot/projects/kse/sys/sys/proc.h#126 (text+ko) ==== @@ -373,6 +373,8 @@ KES_THREAD /* slaved to thread state */ } ke_state; /* (j) S* process status. */ struct kse_mailbox *ke_mailbox; /* the userland mailbox address */ + stack_t ke_stack; + void *ke_upcall; struct thread *ke_tdspare; /* spare thread for upcalls */ #define ke_endzero ke_dummy char ke_dummy; @@ -835,6 +837,7 @@ struct thread *thread_alloc(void); void thread_free(struct thread *td); void cpu_set_upcall(struct thread *td, void *pcb); +void cpu_set_upcall_kse(struct thread *td, struct kse *ke); void cpu_thread_exit(struct thread *); void cpu_thread_setup(struct thread *td); void kse_reassign(struct kse *ke); ==== //depot/projects/kse/tools/KSE/uts/Makefile#2 (text+ko) ==== @@ -1,5 +1,6 @@ PROG= uts NOMAN= CFLAGS+= -g +SRCS= context.S uts.c .include ==== //depot/projects/kse/tools/KSE/uts/uts.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#5 $ + * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#6 $ */ #include @@ -39,10 +39,12 @@ #include #include +#undef TRACE_UTS + #ifdef TRACE_UTS #define UPFMT(fmt...) pfmt(#fmt) #define UPSTR(s) pstr(s) -#define UPCHAR(c) pchar(s) +#define UPCHAR(c) pchar(c) #else #define UPFMT(fmt...) /* Nothing. */ #define UPSTR(s) /* Nothing. */ @@ -54,6 +56,7 @@ static struct kse_mailbox uts_mb; static struct thread_mailbox *run_queue; +static struct thread_mailbox *aa; static int progress = 0; @@ -64,12 +67,19 @@ static void runq_insert(struct thread_mailbox *tm); static struct thread_mailbox *runq_remove(void); static void thread_start(const void *func); -static void uts(void); +static void uts(struct kse_mailbox *km); + +extern int uts_to_thread(struct thread_mailbox *tdp, struct thread_mailbox **curthreadp); + +static void +foof(int sig) +{ + pfmt("%d", sig); +} void aaaa(void) { - progress++; for (;;) { pchar('.'); sleep(1); @@ -94,7 +104,7 @@ // thread_start(spin); init_uts(); for (i = 0;1;i++) { - progress++; + if (i) progress++; pchar('a' + (i % 26)); sleep(5); } @@ -120,7 +130,7 @@ /* Throw us into its context. */ getcontext(&tm->tm_context); - tm->tm_context.uc_flags = UCF_SKIPSIGMASK | UCF_OBEYBUSY; + tm->tm_context.uc_flags = UCF_SKIPSIGMASK; /* Find our stack. */ mib[0] = CTL_KERN; @@ -134,19 +144,15 @@ tm->tm_context.uc_stack.ss_size = MAIN_STACK_SIZE; /* - * Create UTS context. + * Create KSE mailbox. */ + p = (char *)malloc(THREAD_STACK_SIZE); bzero(&uts_mb, sizeof(struct kse_mailbox)); - getcontext(&uts_mb.km_context); - p = (char *)malloc(THREAD_STACK_SIZE); - uts_mb.km_context.uc_stack.ss_sp = p; - uts_mb.km_context.uc_stack.ss_size = THREAD_STACK_SIZE; - makecontext(&uts_mb.km_context, uts, 1); - uts_mb.km_context.uc_flags = UCF_SKIPSIGMASK | UCF_OBEYBUSY; - pfmt("ucontext at : 0x%x\n", &uts_mb.km_context); - pfmt("mcontext mc_len : %d (%d)\n", - uts_mb.km_context.uc_mcontext.mc_len, sizeof(mcontext_t)); + uts_mb.km_stack.ss_sp = p; + uts_mb.km_stack.ss_size = THREAD_STACK_SIZE; + uts_mb.km_func = (void *)uts; pfmt("uts() at : 0x%x\n", uts); + pfmt("uts stack at : 0x%x - 0x%x\n", p, p + THREAD_STACK_SIZE); /* * Start KSE scheduling. @@ -270,53 +276,60 @@ * Userland thread scheduler. */ static void -uts(void) +uts(struct kse_mailbox *km) { struct thread_mailbox *tm, *p; int ret; UPSTR("\n--uts() start--\n"); - for (;;) { - UPFMT("km_curthread -> 0x%x\n", uts_mb.km_curthread); + UPFMT("mailbox -> %x\n", km); + + /* + * Insert any processes back from being blocked + * in the kernel into the run queue. + */ + p = km->km_completed; + uts_mb.km_completed = NULL; + UPFMT("km_completed -> 0x%x", p); + while ((tm = p) != NULL) { + p = tm->tm_next; + UPFMT(" 0x%x", p); + runq_insert(tm); + } + UPCHAR('\n'); + + /* + * Process any signals we've recieved. + */ + /* XXX: Not yet. */ - /* - * Insert any processes back from being blocked - * in the kernel into the run queue. - */ - p = uts_mb.km_completed; - uts_mb.km_completed = NULL; - UPFMT("km_completed -> 0x%x", p); - while ((tm = p) != NULL) { - p = tm->tm_next; - UPFMT(" 0x%x", p); - runq_insert(tm); - } - UPCHAR('\n'); + /* + * Pull a thread off the run queue. + */ + p = runq_remove(); +#if 0 + if ((p == aa) && (progress > 0)) { + --progress; + signalcontext(&p->tm_context, 1, foof); + } +#endif - /* - * Pull a process off the run queue. - */ - p = runq_remove(); - if (p != NULL) { - UPFMT("\n-- uts() scheduling 0x%x--\n", p); - UPFMT("eip -> 0x%x progress -> %d\n", - p->tm_context.uc_mcontext.mc_eip, progress); - if ((p->tm_context.uc_flags & UCF_CRITICAL) == 0) - p->tm_context.uc_flags |= - UCF_CRITICAL | UCF_CLEARSTATE; - uts_mb.km_curthread = p; - UPSTR("curthread set\n"); - ret = swapcontext(&uts_mb.km_context, &p->tm_context); - UPFMT("\n-- uts() back from swapcontext() [%d] --\n", - ret); - if (ret) - /* - * Invalid thread context. Exit. - */ - exit(ret); - } else - kse_yield(); + /* + * Either schedule a thread, or idle if none ready to run. + */ + if (p != NULL) { + UPFMT("\n-- uts() scheduling 0x%x--\n", p); + UPFMT("eip -> 0x%x progress -> %d\n", + p->tm_context.uc_mcontext.mc_eip, progress); + if ((p->tm_context.uc_flags & UCF_CRITICAL) == 0) + p->tm_context.uc_flags |= + UCF_CRITICAL | UCF_CLEARSTATE; + uts_mb.km_curthread = p; + UPSTR("curthread set\n"); + uts_to_thread(p, &km->km_curthread); + UPSTR("\n-- uts_to_thread() failed --\n"); } + kse_yield(); pstr("** uts() exiting **\n"); exit(EX_SOFTWARE); } @@ -330,13 +343,14 @@ struct thread_mailbox *tm; char *p; - tm = (struct thread_mailbox *)calloc(1, sizeof(struct thread_mailbox)); - pfmt("thread_start() : 0x%x\n", tm); + aa = tm = (struct thread_mailbox *)calloc(1, sizeof(struct thread_mailbox)); + pfmt("thread_start() : 0x%x %x\n", tm, &aa->tm_context); getcontext(&tm->tm_context); p = (char *)malloc(THREAD_STACK_SIZE); tm->tm_context.uc_stack.ss_sp = p; tm->tm_context.uc_stack.ss_size = THREAD_STACK_SIZE; makecontext(&tm->tm_context, func, 1); - tm->tm_context.uc_flags = UCF_SKIPSIGMASK | UCF_OBEYBUSY; + tm->tm_context.uc_flags = UCF_SKIPSIGMASK; + // setcontext(&tm->tm_context); runq_insert(tm); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 4 8:59: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7B1B37B401; Wed, 4 Sep 2002 08:59:03 -0700 (PDT) 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 301AC37B400 for ; Wed, 4 Sep 2002 08:59:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E70D043E42 for ; Wed, 4 Sep 2002 08:59:02 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from freefall.freebsd.org (smmsp@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g84Fx2JU081473 for ; Wed, 4 Sep 2002 08:59:02 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g84Flbrm080378 for perforce@freebsd.org; Wed, 4 Sep 2002 08:47:37 -0700 (PDT) Date: Wed, 4 Sep 2002 08:47:37 -0700 (PDT) Message-Id: <200209041547.g84Flbrm080378@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 17045 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17045 Change 17045 by cvance@cvance_laptop on 2002/09/04 08:47:29 Add new goto target for MAC code in mmap. On error, make sure to grab Giant before possibly calling vput() Affected files ... .. //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/vm/vm_mmap.c#14 (text+ko) ==== @@ -450,7 +450,7 @@ (struct vnode *)handle, 1); if ((prot & macmaxprot) != prot) { error = EACCES; - goto done; + goto macdone; } maxprot &= macmaxprot; } @@ -462,6 +462,9 @@ #endif /* MAC */ error = vm_mmap(&vms->vm_map, &addr, size, prot, maxprot, flags, handle, pos); +#ifdef MAC +macdone: +#endif mtx_lock(&Giant); if (error == 0) td->td_retval[0] = (register_t) (addr + pageoff); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 4 18:47:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3BB537B401; Wed, 4 Sep 2002 18:47:31 -0700 (PDT) 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 33D7437B400 for ; Wed, 4 Sep 2002 18:47:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E78FC43E3B for ; Wed, 4 Sep 2002 18:47:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g851lUJU079585 for ; Wed, 4 Sep 2002 18:47:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g851lUqX079582 for perforce@freebsd.org; Wed, 4 Sep 2002 18:47:30 -0700 (PDT) Date: Wed, 4 Sep 2002 18:47:30 -0700 (PDT) Message-Id: <200209050147.g851lUqX079582@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17077 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17077 Change 17077 by peter@peter_mckinley on 2002/09/04 18:46:53 fix some format problems Affected files ... .. //depot/projects/ia64/sbin/gpt/map.c#6 edit Differences ... ==== //depot/projects/ia64/sbin/gpt/map.c#6 (text+ko) ==== @@ -79,9 +79,10 @@ if (n->map_type != MAP_TYPE_UNUSED) { warnx( - "error: partition(%llu,%llu) overlaps partition(%llu,%llu)", - (long long)start, (long long)size, - (long long)n->map_start, (long long)n->map_size); + "error: partition(%llu,%llu,%d) overlaps partition(%llu,%llu,%d)", + (long long)start, (long long)size, type, + (long long)n->map_start, (long long)n->map_size, + n->map_type); return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 4 18:49:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96D5537B401; Wed, 4 Sep 2002 18:49:34 -0700 (PDT) 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 38ED037B400 for ; Wed, 4 Sep 2002 18:49:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7F3C43E3B for ; Wed, 4 Sep 2002 18:49:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g851nXJU079740 for ; Wed, 4 Sep 2002 18:49:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g851nXVk079737 for perforce@freebsd.org; Wed, 4 Sep 2002 18:49:33 -0700 (PDT) Date: Wed, 4 Sep 2002 18:49:33 -0700 (PDT) Message-Id: <200209050149.g851nXVk079737@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17078 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17078 Change 17078 by peter@peter_mckinley on 2002/09/04 18:49:25 fix printf formats Affected files ... .. //depot/projects/ia64/sys/geom/geom_bsd.c#10 edit .. //depot/projects/ia64/sys/geom/geom_disk.c#11 edit .. //depot/projects/ia64/sys/geom/geom_pc98.c#6 edit Differences ... ==== //depot/projects/ia64/sys/geom/geom_bsd.c#10 (text+ko) ==== @@ -289,7 +289,7 @@ ms = gsp->softc; if (pp == NULL && cp == NULL) { sbuf_printf(sb, "%s%lld\n", - indent, ms->labeloffset); + indent, (long long)ms->labeloffset); } g_slice_dumpconf(sb, indent, gp, cp, pp); } ==== //depot/projects/ia64/sys/geom/geom_disk.c#11 (text+ko) ==== @@ -106,7 +106,8 @@ struct dumperinfo di; gkd = (struct g_kerneldump*)bp->bio_data; - printf("Kerneldump off=%lld len=%lld\n", gkd->offset, gkd->length); + printf("Kerneldump off=%lld len=%lld\n", (long long)gkd->offset, + (long long)gkd->length); di.dumper = (dumper_t *)dp->d_devsw->d_dump; di.priv = dp->d_dev; di.blocksize = dp->d_label.d_secsize; ==== //depot/projects/ia64/sys/geom/geom_pc98.c#6 (text+ko) ==== @@ -159,7 +159,8 @@ start = v * fwsect * fwhead * sectorsize; length = (u - v) * fwsect * fwhead * sectorsize; printf("c%d - c%d (%llx - %llx) = %s\n", - v, u, start, length, buf + 512 + 16 + i * 32); + v, u, (long long)start, (long long)length, + buf + 512 + 16 + i * 32); npart++; pp2 = g_slice_addslice(gp, i, start, length, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 4 18:51:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFFB837B401; Wed, 4 Sep 2002 18:51:37 -0700 (PDT) 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 542AE37B400 for ; Wed, 4 Sep 2002 18:51:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F092343E6A for ; Wed, 4 Sep 2002 18:51:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g851paJU080144 for ; Wed, 4 Sep 2002 18:51:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g851paa4080141 for perforce@freebsd.org; Wed, 4 Sep 2002 18:51:36 -0700 (PDT) Date: Wed, 4 Sep 2002 18:51:36 -0700 (PDT) Message-Id: <200209050151.g851paa4080141@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17079 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17079 Change 17079 by peter@peter_mckinley on 2002/09/04 18:51:07 deal with da0p1 etc. Affected files ... .. //depot/projects/ia64/sbin/newfs_msdos/newfs_msdos.c#4 edit Differences ... ==== //depot/projects/ia64/sbin/newfs_msdos/newfs_msdos.c#4 (text+ko) ==== @@ -725,7 +725,7 @@ else while (isdigit(*++s2)); s1 = s2; - if (s2 && *s2 == 's') { + if (s2 && (*s2 == 's' || *s2 == 'p')) { slice = strtol(s2 + 1, &s, 10); if (slice < 1 || slice > MAX_SLICES - BASE_SLICE) s2 = NULL; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 4 18:58:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1805537B401; Wed, 4 Sep 2002 18:58:47 -0700 (PDT) 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 AEE2037B400 for ; Wed, 4 Sep 2002 18:58:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5968143E42 for ; Wed, 4 Sep 2002 18:58:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g851wkJU080562 for ; Wed, 4 Sep 2002 18:58:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g851wknH080559 for perforce@freebsd.org; Wed, 4 Sep 2002 18:58:46 -0700 (PDT) Date: Wed, 4 Sep 2002 18:58:46 -0700 (PDT) Message-Id: <200209050158.g851wknH080559@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17080 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17080 Change 17080 by peter@peter_mckinley on 2002/09/04 18:58:01 use GEOM again for now. Affected files ... .. //depot/projects/ia64/sys/ia64/conf/I3#5 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/I3#5 (text+ko) ==== @@ -30,7 +30,7 @@ options P1003_1B #Posix P1003_1B real-time extentions options _KPOSIX_PRIORITY_SCHEDULING options CONSPEED=115200 -#options GEOM +options GEOM #options SMP options DDB To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 5 18:26:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AADF37B401; Thu, 5 Sep 2002 18:26:33 -0700 (PDT) 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 CDEE037B400; Thu, 5 Sep 2002 18:26:32 -0700 (PDT) Received: from holly.calldei.com (adsl-208-191-149-232.dsl.hstntx.swbell.net [208.191.149.232]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C46343E6E; Thu, 5 Sep 2002 18:26:32 -0700 (PDT) (envelope-from chris@holly.dyndns.org) Received: by holly.calldei.com (Postfix, from userid 1001) id 9C41CC0D; Thu, 5 Sep 2002 20:26:09 -0500 (CDT) Date: Thu, 5 Sep 2002 20:26:09 -0500 From: Chris Costello To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16684 for review Message-ID: <20020906012608.GH41454@holly.calldei.com> Reply-To: chris@FreeBSD.org References: <200208280516.g7S5Gw4x076037@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200208280516.g7S5Gw4x076037@freefall.freebsd.org> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tuesday, August 27, 2002, Robert Watson wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16684 > > Change 16684 by rwatson@rwatson_paprika on 2002/08/27 22:16:33 > > Adopt consistent sorting of new pre-syscall entry point > as found in mac (store with other process-related entry > points rather than in the access control section). What does this help, and can/will it be broken up into a set of entry points more in-line with what we have now? This seems to stick out like a sore thumb... -- Chris Costello FreeBSD Project http://www.FreeBSD.org/ TrustedBSD Project http://www.TrustedBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 5 19:14:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECC5D37B401; Thu, 5 Sep 2002 19:13:17 -0700 (PDT) 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 731F037B400 for ; Thu, 5 Sep 2002 19:13:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 35EB043E4A for ; Thu, 5 Sep 2002 19:13:16 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g862DGJU041521 for ; Thu, 5 Sep 2002 19:13:16 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g862DDBW041518 for perforce@freebsd.org; Thu, 5 Sep 2002 19:13:13 -0700 (PDT) Date: Thu, 5 Sep 2002 19:13:13 -0700 (PDT) Message-Id: <200209060213.g862DDBW041518@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 17129 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17129 Change 17129 by chris@chris_holly on 2002/09/05 19:13:08 Integrate (bring in new reference citation vendor bits) Affected files ... .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/java-tomcat/Makefile#1 branch .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/java-tomcat/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/laptop/Makefile#1 branch .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#1 branch .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hats/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/java-tomcat/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/laptop/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/branches.pic#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/boot/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/jail/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/Makefile#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/book.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/chapters.ent#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/blackend.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/obraun.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/thomas.key#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/authors.ent#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/Makefile#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/releng/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/releng/extra.css#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/Makefile#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#2 delete .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/man/man1/cat.1#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/man/man1/head.1#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#3 integrate .. //depot/projects/trustedbsd/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/x11/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/biff.1#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/find.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ftp.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ln.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/lockf.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/make.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/mv.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/perl.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/sed.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/smbutil.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/systat.1#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/tcpdump.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/troff.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/truncate.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/wc.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/close.2#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man2/fcntl.2#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_cond_destroy.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_exit.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_key_delete.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_mutex_destroy.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pthread_rwlock_unlock.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man4/pnp.4#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/disklabel.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/loader.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/named.conf.5#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man5/rc.conf.5#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man7/tuning.7#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/adjkerntz.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/atacontrol.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/badsect.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/camcontrol.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ccdconfig.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/clri.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/comcontrol.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/comsat.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dhclient.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/disklabel.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dmesg.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dump.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dumpfs.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dumpon.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fore_dnld.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ftpd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ifconfig.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ilmid.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/inetd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ldconfig.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/lpc.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_smbfs.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ppp.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rc.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/usbdevs.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/vmstat.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/vnconfig.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/wicontrol.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DECLARE_MODULE.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DELAY.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DEVICE_DETACH.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DEVICE_IDENTIFY.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DEVICE_PROBE.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DEV_MODULE.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/MODULE_DEPEND.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/MODULE_VERSION.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/Makefile#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/SYSCALL_MODULE.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_CREATE.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_INACTIVE.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_LINK.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_LOOKUP.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_READDIR.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_RENAME.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/bus_release_resource.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/devclass_get_devices.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/device_get_children.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/devstat.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/extattr.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/malloc.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/mi_switch.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/module.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/posix4.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/psignal.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/sbuf.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/suser.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/sysctl_add_oid.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/sysctl_ctx_init.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/time.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/vfs_unmountall.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/vget.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/vnode.9#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/zone.9#1 branch .. //depot/projects/trustedbsd/doc/nl_NL.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/trustedbsd/doc/pt_BR.ISO8859-1/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/trustedbsd/doc/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/trustedbsd/doc/share/sgml/man-refs.ent#6 integrate Differences ... ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#2 (text+ko) ==== @@ -1,5 +1,5 @@ + $FreeBSD: doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl,v 1.8 2002/08/27 14:10:14 blackend Exp $ --> @@ -41,9 +41,17 @@ (define %refentry-xref-link% #t) - (define ($create-refentry-xref-link$ refentrytitle manvolnum) - (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" - refentrytitle "&" "sektion=" manvolnum)) + (define ($create-refentry-xref-link$ #!optional (n (current-node))) + (let* ((r (select-elements (children n) (normalize "refentrytitle"))) + (m (select-elements (children n) (normalize "manvolnum"))) + (v (attribute-string (normalize "vendor") n)) + (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" + (data r) "&" "sektion=" (data m)))) + (case v + (("xfree86") (string-append u "&" "manpath=XFree86+4.0.2")) + (("netbsd") (string-append u "&" "manpath=NetBSD+1.5")) + (("ports") (string-append u "&" "manpath=FreeBSD+Ports")) + (else u)))) ]]> ==== //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/articles/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/el_GR.ISO8859-7/articles/Makefile,v 1.2 2002/04/06 18:23:17 keramida Exp $ +# $FreeBSD: doc/el_GR.ISO8859-7/articles/Makefile,v 1.4 2002/09/03 01:29:06 keramida Exp $ SUBDIR = SUBDIR+= cvs-freebsd @@ -6,6 +6,8 @@ SUBDIR+= explaining-bsd SUBDIR+= formatting-media SUBDIR+= freebsd-questions +SUBDIR+= java-tomcat +SUBDIR+= laptop SUBDIR+= new-users DOC_PREFIX?= ${.CURDIR}/../.. ==== //depot/projects/trustedbsd/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -53,9 +53,17 @@ (define %refentry-xref-link% #t) - (define ($create-refentry-xref-link$ refentrytitle manvolnum) - (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" - refentrytitle "&" "sektion=" manvolnum)) + (define ($create-refentry-xref-link$ #!optional (n (current-node))) + (let* ((r (select-elements (children n) (normalize "refentrytitle"))) + (m (select-elements (children n) (normalize "manvolnum"))) + (v (attribute-string (normalize "vendor") n)) + (u (string-append "http://www.FreeBSD.org/cgi/man.cgi?query=" + (data r) "&" "sektion=" (data m)))) + (case v + (("xfree86") (string-append u "&" "manpath=XFree86+4.0.2")) + (("netbsd") (string-append u "&" "manpath=NetBSD+1.5")) + (("ports") (string-append u "&" "manpath=FreeBSD+Ports")) + (else u)))) ]]> ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#5 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.130 2002/07/11 19:07:44 trhodes Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.132 2002/08/21 16:15:12 blackend Exp $ 1999 @@ -884,7 +884,10 @@ Add yourself to the Developers section of the Contributors List and remove yourself from the Additional - Contributors section. + Contributors section. Once you have done that, do not + forget to add your author entity to + doc/en_US.ISO8859-1/share/sgml/authors.ent; + use the other entries as example. This is a relatively easy task, but remains a good first test of your CVS skills. ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#7 (text+ko) ==== @@ -18,7 +18,7 @@ Contributors to FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.237 2002/08/18 16:39:09 marcus Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.245 2002/09/04 13:56:23 obraun Exp $ This article lists individuals and organizations who have @@ -482,6 +482,10 @@ + &a.obraun; + + + &a.jmb; @@ -842,6 +846,10 @@ + &a.cshumway; + + + &a.chm; @@ -1302,6 +1310,10 @@ + &a.thomas; + + + &a.darrenr; @@ -2852,19 +2864,19 @@ - &a.cshumway; + Chris Stenton jacs@gnome.co.uk - Chris Stenton jacs@gnome.co.uk + Chris Timmons skynyrd@opus.cts.cwu.edu - Chris Timmons skynyrd@opus.cts.cwu.edu + Chris Torek torek@ee.lbl.gov - Chris Torek torek@ee.lbl.gov + Christian Brueffer chris@unixpages.org @@ -4621,6 +4633,10 @@ + Ken Tom sub@mui.net + + + Kenji Saito marukun@mx2.nisiq.net @@ -4693,6 +4709,10 @@ + KIMURA Shigekazu zau50357@lion.zero.ad.jp + + + Kiril Mitev kiril@ideaglobal.com @@ -5766,10 +5786,6 @@ - Oliver Braun obraun@informatik.unibw-muenchen.de - - - Oliver Breuninger ob@seicom.NET @@ -6687,6 +6703,10 @@ + Takayuki Nakao t@nakao.org + + + Takeru NAIKI naiki@bfd.es.hokudai.ac.jp @@ -6746,6 +6766,10 @@ + Tetsuro Yabu yabu@uopmu.ees.osakafu-u.ac.jp + + + Tetsuya Furukawa tetsuya@secom-sis.co.jp @@ -6788,10 +6812,6 @@ - Thomas Quinot thomas@cuivre.fr.eu.org - - - Thomas A. Stephens tas@stephens.org @@ -7027,6 +7047,10 @@ + Volker Stolz vs@lambda.foldr.org + + + Vladimir A. Jakovenko vovik@ntu-kpi.kiev.ua @@ -7281,6 +7305,10 @@ + Andrew Gerweck andy@gerweck.dynup.net + + + Andrew Herbert andrew@werple.apana.org.au ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#4 (text+ko) ==== @@ -22,7 +22,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml,v 1.6 2002/06/30 20:39:47 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml,v 1.9 2002/09/05 23:44:21 keramida Exp $ The present article assumes a basic understanding of CVSup @@ -66,20 +66,20 @@ your base is /usr. A checkouts file contains information on the current status - of your sources -- in a way, a sort of photograph. This + of your sources—in a way, a sort of photograph. This significant information enables cvsup to retrieve updates most effectively. Further, and maybe more important, it enables cvsup to correctly manage your sources by locally deleting any files no longer present in the repository, thus leaving no stale files on your system. In fact, without a checkouts file, cvsup would - NOT know which files your collection was composed of (cf + not know which files your collection was composed of (cf &man.cvsup.1; and the fallback method for details); as a result, - it could NOT delete on your system those files no longer present + it could not delete on your system those files no longer present in the repository. They would remain on your system (stale files), and might cause you subtle build failures or other trouble. For example, this problem is likely to occur if you first update your ports collection several weeks after you - have got(ten) your installation CDs. + got your installation CD-ROMs. It is therefore recommended that you adopt the two-step procedure outlined in the CVSup FAQ (cf Q12, Q13); in subsequent sections, you @@ -171,8 +171,8 @@ - The cvsup utility will look for checkouts.cvs:B - -- in that the target is B; that is, cvsup will make use of + The cvsup utility will look for checkouts.cvs:B—in + that the target is B; that is, cvsup will make use of the information contained therein to correctly manage your sources. @@ -229,7 +229,7 @@ The format of a date is rigid. You have to specify all the components of the date: century (20, ie the 20th century, must be supplied whereas 19, the past century, can - be omitted), year, month, day, hour, minutes, seconds -- as + be omitted), year, month, day, hour, minutes, seconds—as shown in the above example. For more information, please see &man.cvsup.1;. ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/hats/article.sgml#3 (text+ko) ==== @@ -27,7 +27,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/hats/article.sgml,v 1.3 2002/08/17 20:01:18 ceri Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/hats/article.sgml,v 1.4 2002/08/31 16:42:19 keramida Exp $ 2002 @@ -40,7 +40,7 @@ core member's personal interpretation of core's position, both as a sitting member of core and as a former security officer. This is only a guideline, not as a cudgel for - grievances. Much like &man.style.9 is a guideline for the + grievances. Much like &man.style.9; is a guideline for the source code, this document is not intended as an absolute straight jacket. @@ -48,7 +48,7 @@ When core appoints someone to a hat, they expect that person to be responsible for an area of the source code tree. Core expects that person to be the final authority in that area of the - tree, or have enough self knowledge to know that they aren't and + tree, or have enough self knowledge to know that they are not and to seek qualified help. Core expects that person to guide development in that area of the tree. Sometimes this means taking an pro-active role in day to day affairs, while other times this @@ -62,7 +62,7 @@ work with the submitter to reach a compromise. Core expects the hat to be courteous. It is reasonable for hats to request that normal project rules be followed when reviewing patches (eg, that - they generally conform to style(9) or the prevailing style of the + they generally conform to &man.style.9; or the prevailing style of the file, that style and content changes be separated, etc). When a dispute arises, core expects the hat to make his or her @@ -83,7 +83,7 @@ deputy is expected to be able to act in the absence of the hat. For example, the security officer deputies send out security advisories when the SO is not around. In extreme cases, the - deputy can defer an issue until the hat returns, but that's + deputy can defer an issue until the hat returns, but that is expected to be the exception rather than the rule, especially if the hat's return is far in the future. @@ -94,7 +94,7 @@ at the pleasure of core. Core sometimes will impose additional, specific requirements - for a given hat that doesn't apply to all hats. These conditions + for a given hat that does not apply to all hats. These conditions may change over time. Committers and others working with hats are expected to use ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/java-tomcat/article.sgml#3 (text+ko) ==== @@ -80,7 +80,7 @@ Hiten Pandya - $FreeBSD: doc/en_US.ISO8859-1/articles/java-tomcat/article.sgml,v 1.6 2002/07/03 23:19:11 jim Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/java-tomcat/article.sgml,v 1.13 2002/08/31 21:44:18 keramida Exp $ This document is presented in hopes of making it easier for @@ -139,7 +139,7 @@ make it will fail if it attempts to build older source. You can upgrade your entire ports collection by using CVSup. See + url="../../books/handbook/cvsup.html"> for more information. You can also download the ports you need manually from to @@ -150,7 +150,8 @@ (Linux-ABI) enabled in your kernel configuration. Simply add the following option to your kernel configuration file and recompile it. Instructions for building a kernel can be found - in the FreeBSD Handbook. + in the + FreeBSD Handbook. options COMPAT_LINUX @@ -212,8 +213,8 @@ Open button rather than the Save button. You will be presented with another File Download box - this time choose Save - and you will be able to save j2sdk-1_3_1_02-linux-i386.bin. - Place it in /usr/ports/distfiles. + and you will be able to save j2sdk-1_3_1_02-linux-i386.bin. + Place it in /usr/ports/distfiles. @@ -253,25 +254,21 @@ you need to start by building java/linux-jdk13: - &prompt.root; cd /usr/ports/archivers/gtar; make all install clean - - &prompt.root; cd /usr/ports/archivers/unzip; make all install clean + &prompt.root; cd /usr/ports/archivers/gtar; make all install clean +&prompt.root; cd /usr/ports/archivers/unzip; make all install clean +&prompt.root; cd /usr/ports/archivers/zip; make all install clean - &prompt.root; cd /usr/ports/archivers/zip; make all install clean - And finally: - &prompt.root; cd /usr/ports/java/linux-jdk13 - - &prompt.root; make all install clean + &prompt.root; cd /usr/ports/java/linux-jdk13 +&prompt.root; make all install clean Once you have built java/linux-jdk13, you need to test it, to make sure it works as intended. To do that: - &prompt.root; cd /usr/local/linux-jdk1.3.1/bin - - &prompt.root; ./java -version + &prompt.root; cd /usr/local/linux-jdk1.3.1/bin +&prompt.root; ./java -version The output of the above command should be as follows: @@ -281,14 +278,13 @@ If you did not get the correct response, you need to: - &prompt.root; cd /usr/ports/java/linux-jdk13 + &prompt.root; cd /usr/ports/java/linux-jdk13 +&prompt.root; make deinstall - &prompt.root; make deinstall - And make sure that /usr/local does not contain a linux-jdk1.3.1 directory. If you find a fragment of the directory, delete it. Repeat the - build and install process for java/linux-jdk13. To make the native Java Development Kit @@ -307,8 +303,7 @@ for building the port. The patch-set file is called bsd-jdk131-patches-6.tar.gz. You should also make sure the integrity of the files by matching it with - the following MD5 checksum. The patch-set - is called Patch-set 6. + the following MD5 checksum. MD5 (bsd-jdk131-patches-6.tar.gz) = 9cade10b81d6034fdd2176bef32bdbf9 @@ -330,8 +325,8 @@ Java is becoming an even more popular for making diverse and scalable platform independent solutions. One of the most - growing needs of Java is in the ASP (Application - Service Provider) market. Java serves as the perfect + growing needs of Java is in the ASP (Application + Service Provider) market. Java serves as the perfect solution for these types of markets, with the following advantages: @@ -433,12 +428,16 @@ Set an environment variable JAVA_HOME which, points to the directory where you have installed the - JDK (the below example points to a native build of the - JDK): + JDK (the examples below point to a native build of the + JDK). If you are using &man.sh.1; as your shell, you can set + JAVA_HOME with: + + &prompt.root; export JAVA_HOME="/usr/local/jdk1.3.1" - &prompt.root; setenv JAVA_HOME /usr/local/jdk1.3.1 (for C Shells) + Those who use &man.csh.1; or a compatible shell, must use a + slightly different command: - &prompt.root; export JAVA_HOME=/usr/local/jdk1.3.1 (for Bourne Shells) + &prompt.root; setenv JAVA_HOME /usr/local/jdk1.3.1 This environment variable should be made permanent by adding it into either .profile or @@ -463,7 +462,7 @@ role="package">archivers/gtar), by doing the following: - &prompt.root; cd /usr/ports/archivers & & make all install clean + &prompt.root; cd /usr/ports/archivers/gtar && make all install clean @@ -473,16 +472,12 @@ directory to tomcat-4.0 for ease of reference: - &prompt.root; cd /usr/local + &prompt.root; cd /usr/local +&prompt.root; gtar zxvf jakarta-tomcat-4.0.3.tar.gz +&prompt.root; ls jakarta* +jakarta-tomcat-4.0.3 +&prompt.root; mv jakarta-tomcat-4.0.3 tomcat-4.0 - &prompt.root; gtar zxvf jakarta-tomcat-4.0.3.tar.gz - - &prompt.root; ls jakarta* - - jakarta-tomcat-4.0.3 - - &prompt.root; mv jakarta-tomcat-4.0.3 tomcat-4.0 - You can remove the jakarta-tomcat-4.0.3.tar.gz at your preference. @@ -514,19 +509,17 @@ Now that we have finished installing Tomcat. The following example shows how to start the Tomcat server: - &prompt.root; cd /usr/local/tomcat-4.0/bin - - &prompt.root; ./startup.sh (for starting Tomcat) + &prompt.root; cd /usr/local/tomcat-4.0/bin +&prompt.root; ./startup.sh (for starting Tomcat) You can test if your Tomcat server has started by visiting the following URL: http://127.0.0.1:8080 or http://localhost:8080. To stop Tomcat: - &prompt.root; cd /usr/local/tomcat-4.0/bin + &prompt.root; cd /usr/local/tomcat-4.0/bin +&prompt.root; ./shutdown.sh - &prompt.root; ./shutdown.sh - (for stopping Tomcat) The startup.sh and @@ -535,9 +528,8 @@ directory; if you would like to start Tomcat automatically at boot-time run: - &prompt.root; cd /usr/local/etc/rc.d - - &prompt.root; ln -s /usr/local/tomcat-4.0/bin/catalina.sh + &prompt.root; cd /usr/local/etc/rc.d +&prompt.root; ln -s /usr/local/tomcat-4.0/bin/catalina.sh Edit the catalina.sh, and add the following at the beginning of the file (after the comment @@ -552,15 +544,12 @@ port will be changed to 80, assuming there is no service running on that port. - &prompt.root; cd /usr/local/tomcat-4.0/conf - - &prompt.root; fgrep -n 8080 server.xml - - ~65: By default, a non-SSL HTTP/1.1 Connector is established on port 8080. - - ~89: port="8080" minProcessors="5" maxProcessors="75" - - &prompt.root; cat server.xml | sed s/8080/80/ > server.xml + &prompt.root; cd /usr/local/tomcat-4.0/conf +&prompt.root; fgrep -n 8080 server.xml +~65: By default, a non-SSL HTTP/1.1 Connector is established on port 8080. +~89: port="8080" minProcessors="5" maxProcessors="75" +&prompt.root; cat server.xml | sed s/8080/80/ > server.xml.new +&prompt.root; mv server.xml.new server.xml.new ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/laptop/article.sgml#4 (text+ko) ==== @@ -16,7 +16,7 @@ FreeBSD on Laptops - $FreeBSD: doc/en_US.ISO8859-1/articles/laptop/article.sgml,v 1.9 2002/07/11 19:07:55 trhodes Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/laptop/article.sgml,v 1.10 2002/09/05 23:49:41 keramida Exp $ FreeBSD works fine on most laptops, with a few caveats. @@ -89,7 +89,7 @@ winmodems whose functionality is implemented in software, for which only windows drivers are normally available (though a few drivers are beginning - to show up for other operating systems). Otherwise, you + to show up for other operating systems). If that is the case, you need to buy an external modem: the most compact option is probably a PC Card (PCMCIA) modem, discussed below, but serial or USB modems may be cheaper. Generally, regular @@ -103,7 +103,7 @@ Most laptops come with PCMCIA (also called PC Card) slots; these are supported fine under FreeBSD. Look through - your boot-up messages (using dmesg) and see whether these were + your boot-up messages (using dmesg) and see whether these were detected correctly (they should appear as pccard0, pccard1 etc on devices like @@ -117,7 +117,7 @@ particular most modems (16-bit) should work fine, provided they are not winmodems (these do exist even as PC Cards, so watch out). If your card is recognised as a generic modem, note that the - default pccard.conf file specifies a delay time of 10 seconds + default pccard.conf file specifies a delay time of 10 seconds (to avoid freezes on certain modems); this may well be over-cautious for your modem, so you may want to play with it, reducing it or removing it totally. @@ -131,10 +131,10 @@ allowed values (listed in the manual page &man.pccardc.8;). - If it is not running already, start the pccardd daemon. + If it is not running already, start the pccardd daemon. (To enable it at boot time, add pccard_enable="YES" to - /etc/rc.conf). Now your cards should be + /etc/rc.conf.) Now your cards should be detected when you insert and remove them, and you should get log messages about new devices being enabled. @@ -175,7 +175,7 @@ The X window system (XFree86) also includes display power management (look at the &man.xset.1; manual page, and search for - dpms there). You may want to investigate this. However, this, + dpms there). You may want to investigate this. However, this, too, works inconsistently on laptops: it often turns off the display but does not turn off the backlight. ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#5 (text+ko) ==== @@ -9,7 +9,7 @@ Writing FreeBSD Problem Reports - $FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v 1.17 2002/07/29 11:24:14 chern Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v 1.20 2002/09/01 19:57:05 keramida Exp $ This article describes how to best formulate and submit a @@ -105,13 +105,13 @@ upgrading and trying to reproduce the problem on an up-to-date system before submitting a problem report. There are few things that will annoy a developer more than receiving a problem report - about a bug she's already fixed. + about a bug she has already fixed. Finally, a bug that can not be reproduced can rarely be fixed. If the bug only occurred once and you can not reproduce it, and it does not seem to happen to anybody else, chances are none of the developers will be able to reproduce it or figure - out what's wrong. That does not mean it did not happen, but it + out what is wrong. That does not mean it did not happen, but it does mean that the chances of your problem report ever leading to a bug fix are very slim, and you should consider letting the matter drop. @@ -134,8 +134,13 @@ - The mailing lists—if you're not subscribed, use - the searchable archives on the FreeBSD web site. If your + The + mailing + lists—if you are not subscribed, use + the + searchable archives on the FreeBSD web site. If your problem has not been discussed on the lists, you might try posting a message about it and waiting a few days to see if someone can spot something you have overlooked. @@ -199,7 +204,7 @@ &prompt.user; send-pr -a /var/run/dmesg -a /tmp/errors - Don't worry about binary files, they will be automatically + Do not worry about binary files, they will be automatically encoded so as not to upset your mail agent. If you attach a patch, make sure you use the @@ -457,7 +462,7 @@ least a workaround (which not only helps other people with the same problem work around it, but may also help a developer understand the cause for the problem), but if - you do not have any firm ideas for either, it's better to + you do not have any firm ideas for either, it is better to leave this field blank than to speculate. ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/article.sgml#6 (text+ko) ==== @@ -47,7 +47,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.35 2002/08/14 06:39:36 murray Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/releng/article.sgml,v 1.36 2002/09/05 23:52:17 keramida Exp $ This paper describes the approach used by the FreeBSD release engineering team to make production quality releases @@ -120,7 +120,7 @@ GNATS[9] database through email, the &man.send-pr.1; application, or via the web interface provided at + url="http://www.FreeBSD.org/send-pr.html">. In addition to the multitude of different technical mailing lists about FreeBSD, the &a.qa; provides a forum for discussing the finer points of release-polishing. ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/releng/branches.pic#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -*- nroff -*- -.\" $FreeBSD: doc/en_US.ISO8859-1/articles/releng/branches.pic,v 1.4 2002/07/25 09:49:30 murray Exp $ +.\" $FreeBSD: doc/en_US.ISO8859-1/articles/releng/branches.pic,v 1.5 2002/09/02 07:53:14 murray Exp $ .PS 6 @@ -99,6 +99,9 @@ ellipse width .5 "\s-24.6R\s+2" line -> down from RELENG_4_6_0_RELEASE.s +RELENG_4_6_2_RELEASE: + ellipse width .5 "\s-24.6.2R\s+2" + line -> down from RELENG_4_6_2_RELEASE.s RELENG_4_6: box width .9 "\s-3RELENG_4_6\s+3" dashed ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/en_US.ISO8859-1/books/Makefile,v 1.10 2001/04/18 09:25:11 nik Exp $ +# $FreeBSD: doc/en_US.ISO8859-1/books/Makefile,v 1.11 2002/08/22 19:25:03 ceri Exp $ SUBDIR = corp-net-guide SUBDIR+= design-44bsd @@ -7,7 +7,6 @@ SUBDIR+= fdp-primer SUBDIR+= handbook SUBDIR+= porters-handbook -SUBDIR+= ppp-primer ROOT_SYMLINKS= faq handbook ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/boot/chapter.sgml#2 (text+ko) ==== @@ -3,7 +3,7 @@ Copyright (c) 2002 Sergey Lyubka All rights reserved -$FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/boot/chapter.sgml,v 1.1 2002/07/29 06:18:01 murray Exp $ +$FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/boot/chapter.sgml,v 1.10 2002/08/31 20:22:20 keramida Exp $ --> @@ -38,35 +38,39 @@ BIOS POST - boot0 stage - boot2 stage + boot0 stage + boot2 stage loader stage kernel initialization - The boot0 and boot2 stages are also referred to as - bootstrap stages 1 and 2 in &man.boot.8; as - the first steps in Freud's 3-stage bootstrapping procedure. - Various information is printed on the screen at each stage, so >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 5 23:45:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C9DD37B407; Thu, 5 Sep 2002 23:45:05 -0700 (PDT) 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 1C2CA37B400 for ; Thu, 5 Sep 2002 23:45:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33BC243E3B for ; Thu, 5 Sep 2002 23:45:04 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g866j4JU083832 for ; Thu, 5 Sep 2002 23:45:04 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g866j394083826 for perforce@freebsd.org; Thu, 5 Sep 2002 23:45:03 -0700 (PDT) Date: Thu, 5 Sep 2002 23:45:03 -0700 (PDT) Message-Id: <200209060645.g866j394083826@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17135 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17135 Change 17135 by mini@mini_stylus on 2002/09/05 23:44:57 Diff reduction. Affected files ... .. //depot/projects/kse/lib/libc/alpha/gen/makecontext.c#4 edit .. //depot/projects/kse/sys/kern/kern_thread.c#101 edit Differences ... ==== //depot/projects/kse/lib/libc/alpha/gen/makecontext.c#4 (text+ko) ==== @@ -32,8 +32,8 @@ #include #include +#include #include -#include /* Prototypes */ ==== //depot/projects/kse/sys/kern/kern_thread.c#101 (text+ko) ==== @@ -73,7 +73,7 @@ SYSCTL_INT(_kern_threads, OID_AUTO, allocated, CTLFLAG_RD, &allocated_threads, 0, "Number of threads in zone."); -static int oiks_debug = 1; /* 0 disable, 1 printf, 2 enter debugger */ +static int oiks_debug = 0; /* 0 disable, 1 printf, 2 enter debugger */ SYSCTL_INT(_kern_threads, OID_AUTO, oiks, CTLFLAG_RW, &oiks_debug, 0, "OIKS thread debug"); @@ -456,7 +456,9 @@ ke->ke_tdspare = NULL; } else { mtx_unlock_spin(&sched_lock); + mtx_lock(&Giant); td2 = thread_alloc(); + mtx_unlock(&Giant); mtx_lock_spin(&sched_lock); } CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 6 0: 1: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD5C037B401; Fri, 6 Sep 2002 00:00:25 -0700 (PDT) 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 520C237B400 for ; Fri, 6 Sep 2002 00:00:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECE0743E6A for ; Fri, 6 Sep 2002 00:00:24 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8670OJU085077 for ; Fri, 6 Sep 2002 00:00:24 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8670Opb085074 for perforce@freebsd.org; Fri, 6 Sep 2002 00:00:24 -0700 (PDT) Date: Fri, 6 Sep 2002 00:00:24 -0700 (PDT) Message-Id: <200209060700.g8670Opb085074@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17136 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17136 Change 17136 by mini@mini_stylus on 2002/09/05 23:59:53 Remove unused complexity in {get,set}context(). Affected files ... .. //depot/projects/kse/lib/libc/i386/gen/getcontext.S#7 edit Differences ... ==== //depot/projects/kse/lib/libc/i386/gen/getcontext.S#7 (text+ko) ==== @@ -33,22 +33,10 @@ #define MC_SIZE 640 /* sizeof mcontext_t */ #define UC_MC_OFFSET 16 /* offset to mcontext from ucontext */ #define UC_MC_LEN_OFFSET 96 /* offset to mc_len from mcontext */ -#define UC_FLAGS_OFFSET 676 /* offset to uc_flags from ucontext */ -#define MC_FLAGS_OFFSET 660 /* offset to uc_flags from ucontext */ -#define MC_BUSY_OFFSET 656 /* offset to uc_busy from ucontext */ #define MC_LEN_OFFSET 80 /* offset to mc_len from mcontext */ #define MC_FP_REGS_OFFSET 96 /* offset to FP regs from mcontext */ #define MC_FP_CW_OFFSET 96 /* offset to FP control word */ #define MC_OWNEDFP_OFFSET 88 /* offset to mc_ownedfp from mcontext */ -#define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ -#define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ -#define UCF_SWAPPED 0x00000080 /* Used by swapcontext(3). */ -#define UCF_CRITICAL 0x00000200 /* In a critical section. */ -#define UCF_CLEARSTATE 0x00000400 /* Clear UCF_STATE in setcontext. */ -#define UCF_STATE 0x0000ff00 /* State-related flags. */ -#define UCF_OPTIONS 0x000000ff /* Behaviour-related flags. */ - - /* * int setcontext(ucontext_t *ucp); @@ -64,14 +52,12 @@ cmpl $0, %eax /* check for null pointer */ jne 1f movl $-1, %eax - jmp 8f + jmp 5f 1: cmpl $MC_SIZE, UC_MC_LEN_OFFSET(%eax) /* is context valid? */ je 2f movl $-1, %eax /* bzzzt, invalid context */ - jmp 8f -2: testl $UCF_SKIPSIGMASK, UC_FLAGS_OFFSET(%eax) /* Restore sigmask? */ - jnz 3f - PIC_PROLOGUE + jmp 5f +2: PIC_PROLOGUE pushl $0 /* oset = NULL */ pushl %eax /* set = &ucp->uc_sigmask */ pushl $3 /* how = SIG_SETMASK */ @@ -79,8 +65,8 @@ addl $12, %esp PIC_EPILOGUE testl %eax, %eax /* check for error */ - jnz 8f -3: movl 4(%esp), %edx /* get address of context */ + jnz 5f + movl 4(%esp), %edx /* get address of context */ addl $UC_MC_OFFSET, %edx /* add offset to mcontext */ movl 4(%edx), %gs movl 8(%edx), %fs @@ -95,25 +81,19 @@ movl 60(%edx), %eax /* put return address at top of stack */ movl %eax, (%esp) cmpl $0, MC_OWNEDFP_OFFSET(%edx) /* are FP regs valid? */ - jz 4f + jz 3f frstor MC_FP_REGS_OFFSET(%edx) /* restore FP regs */ - jmp 5f -4: fninit + jmp 4f +3: fninit fldcw MC_FP_CW_OFFSET(%edx) -5: movl 48(%edx), %eax /* restore ax, bx, cx */ +4: movl 48(%edx), %eax /* restore ax, bx, cx */ movl 36(%edx), %ebx movl 44(%edx), %ecx pushl 68(%edx) /* flags on stack */ pushl 40(%edx) /* %edx on stack */ - testl $UCF_CLEARSTATE, MC_FLAGS_OFFSET(%edx) /* clear flag state? */ - jz 6f - andl $UCF_OPTIONS, MC_FLAGS_OFFSET(%edx) -6: testl $UCF_OBEYBUSY, MC_FLAGS_OFFSET(%edx) /* set uc_busy? */ - jz 7f - movl $1, MC_BUSY_OFFSET(%edx) /* set uc_busy */ -7: popl %edx /* %edx off stack */ + popl %edx /* %edx off stack */ popf /* flags off stack */ -8: ret +5: ret /* * int getcontext(ucontext_t *ucp); @@ -129,10 +109,8 @@ cmpl $0, %eax /* check for null pointer */ jne 1f movl $-1, %eax - jmp 3f - movl 4(%esp), %eax /* get address of context and sigset */ -1: testl $UCF_SKIPSIGMASK, UC_FLAGS_OFFSET(%eax) /* Save sigmask? */ - jnz 2f + jmp 2f +1: movl 4(%esp), %eax /* get address of context and sigset */ PIC_PROLOGUE pushl %eax /* oset = &ucp->uc_sigmask */ pushl $0 /* set = NULL */ @@ -141,8 +119,8 @@ addl $12, %esp PIC_EPILOGUE testl %eax, %eax /* check for error */ - jnz 3f -2: pushl %edx /* save value of edx */ + jnz 2f + pushl %edx /* save value of edx */ movl 8(%esp), %edx /* get address of context */ addl $UC_MC_OFFSET, %edx /* add offset to mcontext */ movl %gs, 4(%edx) @@ -178,4 +156,4 @@ movl $MC_SIZE, MC_LEN_OFFSET(%edx) /* context is now valid */ movl 40(%edx), %edx /* restore edx -- is this needed? */ xorl %eax, %eax /* return 0 */ -3: ret +2: ret To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 6 0:22:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 516A437B401; Fri, 6 Sep 2002 00:20:56 -0700 (PDT) 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 E374137B400 for ; Fri, 6 Sep 2002 00:20:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B830143E6A for ; Fri, 6 Sep 2002 00:20:54 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g867KsJU091880 for ; Fri, 6 Sep 2002 00:20:54 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g867Kr5L091865 for perforce@freebsd.org; Fri, 6 Sep 2002 00:20:53 -0700 (PDT) Date: Fri, 6 Sep 2002 00:20:53 -0700 (PDT) Message-Id: <200209060720.g867Kr5L091865@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 17138 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17138 Change 17138 by julian@julian_jules1 on 2002/09/06 00:19:54 IFC Affected files ... .. //depot/projects/kse/bin/ps/ps.c#12 integrate .. //depot/projects/kse/include/ctype.h#4 integrate .. //depot/projects/kse/include/rpc/auth_kerb.h#2 integrate .. //depot/projects/kse/include/rune.h#2 integrate .. //depot/projects/kse/include/runetype.h#3 integrate .. //depot/projects/kse/include/time.h#4 integrate .. //depot/projects/kse/lib/libc/locale/mblen.c#2 integrate .. //depot/projects/kse/lib/libc/locale/mbtowc.c#2 integrate .. //depot/projects/kse/lib/libc/locale/wctomb.c#2 integrate .. //depot/projects/kse/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate .. //depot/projects/kse/lib/libc/sparc64/sys/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/sparc64/sys/sigaction.S#1 branch .. //depot/projects/kse/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/kse/sys/alpha/include/ansi.h#14 delete .. //depot/projects/kse/sys/arm/include/ansi.h#11 delete .. //depot/projects/kse/sys/boot/forth/loader.conf#13 integrate .. //depot/projects/kse/sys/boot/i386/libi386/i386_module.c#6 integrate .. //depot/projects/kse/sys/boot/sparc64/loader/Makefile#10 integrate .. //depot/projects/kse/sys/cam/cam_periph.c#4 integrate .. //depot/projects/kse/sys/cam/cam_xpt.c#10 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_all.c#11 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/kse/sys/compat/linux/linux_file.c#17 integrate .. //depot/projects/kse/sys/compat/linux/linux_getcwd.c#8 integrate .. //depot/projects/kse/sys/compat/linux/linux_ioctl.c#18 integrate .. //depot/projects/kse/sys/compat/linux/linux_misc.c#20 integrate .. //depot/projects/kse/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/kse/sys/compat/linux/linux_sysctl.c#5 integrate .. //depot/projects/kse/sys/compat/linux/linux_uid16.c#9 integrate .. //depot/projects/kse/sys/conf/NOTES#15 integrate .. //depot/projects/kse/sys/conf/files#48 integrate .. //depot/projects/kse/sys/conf/files.i386#28 integrate .. //depot/projects/kse/sys/conf/files.pc98#29 integrate .. //depot/projects/kse/sys/conf/options.i386#20 integrate .. //depot/projects/kse/sys/dev/acpica/acpi.c#28 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pcib.c#10 integrate .. //depot/projects/kse/sys/dev/isp/isp_freebsd.c#16 integrate .. //depot/projects/kse/sys/dev/isp/isp_freebsd.h#14 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.h#5 integrate .. //depot/projects/kse/sys/dev/pccard/pccard.c#14 integrate .. //depot/projects/kse/sys/dev/pci/pci.c#16 integrate .. //depot/projects/kse/sys/dev/pci/pci_pci.c#12 integrate .. //depot/projects/kse/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/kse/sys/dev/puc/puc.c#8 integrate .. //depot/projects/kse/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/kse/sys/dev/puc/pucvar.h#4 integrate .. //depot/projects/kse/sys/dev/sio/sio_puc.c#4 integrate .. //depot/projects/kse/sys/dev/sound/pci/fm801.c#6 integrate .. //depot/projects/kse/sys/dev/sound/pci/maestro3.c#10 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_ctl.c#24 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#9 integrate .. //depot/projects/kse/sys/i386/conf/GENERIC#24 integrate .. //depot/projects/kse/sys/i386/conf/NOTES#36 integrate .. //depot/projects/kse/sys/i386/i386/bios.c#12 integrate .. //depot/projects/kse/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/kse/sys/i386/i386/identcpu.c#14 integrate .. //depot/projects/kse/sys/i386/i386/nexus.c#5 integrate .. //depot/projects/kse/sys/i386/include/ansi.h#13 delete .. //depot/projects/kse/sys/i386/include/pci_cfgreg.h#3 integrate .. //depot/projects/kse/sys/i386/linux/linux_genassym.c#4 integrate .. //depot/projects/kse/sys/i386/linux/linux_ptrace.c#5 integrate .. //depot/projects/kse/sys/i386/pci/pci_bus.c#8 integrate .. //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#12 integrate .. //depot/projects/kse/sys/i386/svr4/svr4_genassym.c#3 integrate .. //depot/projects/kse/sys/i4b/capi/capi_l4if.c#5 integrate .. //depot/projects/kse/sys/i4b/capi/capi_llif.c#2 integrate .. //depot/projects/kse/sys/i4b/capi/capi_msgs.c#3 integrate .. //depot/projects/kse/sys/i4b/capi/iavc/iavc_card.c#3 integrate .. //depot/projects/kse/sys/i4b/capi/iavc/iavc_isa.c#6 integrate .. //depot/projects/kse/sys/i4b/capi/iavc/iavc_lli.c#4 integrate .. //depot/projects/kse/sys/i4b/capi/iavc/iavc_pci.c#6 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_ctl.c#6 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_ing.c#6 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_ipr.c#6 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_isppp.c#4 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_rbch.c#8 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_tel.c#7 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_trace.c#7 integrate .. //depot/projects/kse/sys/i4b/layer1/i4b_l1dmux.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#5 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#4 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#7 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#4 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#5 integrate .. //depot/projects/kse/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_bchan.c#5 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_ctx_s0P.c#4 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_diva.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_dynalink.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_hscx.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_isac.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_l1.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_l1fsm.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_siemens_isurf.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_sws.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_isac.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_l1.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_pci.c#4 integrate .. //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#5 integrate .. //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_pci.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_iframe.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_l2.c#5 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_l2fsm.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_l2timer.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_lme.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_sframe.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_tei.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_uframe.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_util.c#3 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_l2if.c#5 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_l3fsm.c#3 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_l3timer.c#3 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_l4if.c#3 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_q931.c#6 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_q932fac.c#3 integrate .. //depot/projects/kse/sys/i4b/layer4/i4b_i4bdrv.c#10 integrate .. //depot/projects/kse/sys/i4b/layer4/i4b_l4.c#5 integrate .. //depot/projects/kse/sys/i4b/layer4/i4b_l4mgmt.c#4 integrate .. //depot/projects/kse/sys/i4b/layer4/i4b_l4timer.c#3 integrate .. //depot/projects/kse/sys/ia64/ia64/pmap.c#31 integrate .. //depot/projects/kse/sys/ia64/include/ansi.h#13 delete .. //depot/projects/kse/sys/ia64/include/signal.h#4 integrate .. //depot/projects/kse/sys/kern/imgact_elf.c#23 integrate .. //depot/projects/kse/sys/kern/kern_clock.c#20 integrate .. //depot/projects/kse/sys/kern/kern_condvar.c#42 integrate .. //depot/projects/kse/sys/kern/kern_descrip.c#36 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#38 integrate .. //depot/projects/kse/sys/kern/kern_exit.c#61 integrate .. //depot/projects/kse/sys/kern/kern_fork.c#79 integrate .. //depot/projects/kse/sys/kern/kern_intr.c#28 integrate .. //depot/projects/kse/sys/kern/kern_mac.c#3 integrate .. //depot/projects/kse/sys/kern/kern_mutex.c#33 integrate .. //depot/projects/kse/sys/kern/kern_proc.c#82 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#64 integrate .. //depot/projects/kse/sys/kern/kern_tc.c#12 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#102 integrate .. //depot/projects/kse/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/kse/sys/kern/subr_rman.c#8 integrate .. //depot/projects/kse/sys/kern/sys_process.c#30 integrate .. //depot/projects/kse/sys/kern/uipc_cow.c#5 integrate .. //depot/projects/kse/sys/kern/vfs_cache.c#16 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#41 integrate .. //depot/projects/kse/sys/kern/vnode_if.src#11 integrate .. //depot/projects/kse/sys/libkern/strlcat.c#1 branch .. //depot/projects/kse/sys/libkern/strlcpy.c#1 branch .. //depot/projects/kse/sys/modules/Makefile#32 integrate .. //depot/projects/kse/sys/net/if_gif.c#13 integrate .. //depot/projects/kse/sys/net/if_gif.h#6 integrate .. //depot/projects/kse/sys/netinet/in.h#11 integrate .. //depot/projects/kse/sys/netinet/in_pcb.h#15 integrate .. //depot/projects/kse/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/kse/sys/nfs/nfsnode.h#6 delete .. //depot/projects/kse/sys/nfsclient/nfs.h#12 integrate .. //depot/projects/kse/sys/pci/if_dc.c#20 integrate .. //depot/projects/kse/sys/powerpc/include/ansi.h#14 delete .. //depot/projects/kse/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/kse/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/kse/sys/sparc64/include/ansi.h#14 delete .. //depot/projects/kse/sys/sparc64/sparc64/machdep.c#37 integrate .. //depot/projects/kse/sys/sys/bio.h#7 integrate .. //depot/projects/kse/sys/sys/extattr.h#5 integrate .. //depot/projects/kse/sys/sys/imgact_aout.h#8 integrate .. //depot/projects/kse/sys/sys/libkern.h#5 integrate .. //depot/projects/kse/sys/sys/nlist_aout.h#2 integrate .. //depot/projects/kse/sys/sys/proc.h#127 integrate .. //depot/projects/kse/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/kse/sys/sys/timetc.h#7 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/kse/sys/ufs/ufs/inode.h#5 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_extattr.c#15 integrate .. //depot/projects/kse/sys/vm/swap_pager.h#4 integrate .. //depot/projects/kse/sys/vm/vm_glue.c#37 integrate .. //depot/projects/kse/sys/vm/vm_page.c#17 integrate .. //depot/projects/kse/sys/x86_64/include/ansi.h#3 delete .. //depot/projects/kse/usr.bin/gcore/elfcore.c#4 integrate .. //depot/projects/kse/usr.bin/gcore/gcore.c#8 integrate .. //depot/projects/kse/usr.bin/gcore/md-nop.c#3 integrate Differences ... ==== //depot/projects/kse/bin/ps/ps.c#12 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.57 2002/07/08 09:08:51 robert Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.58 2002/09/03 05:44:00 jmallett Exp $"); #include #include @@ -591,9 +591,16 @@ static char * kludge_oldps_options(char *s) { + int have_fmt; size_t len; char *newopts, *ns, *cp; + /* + * If we have an 'o' option, then note it, since we don't want to do + * some types of munging. + */ + have_fmt = index(s, 'o') != NULL; + len = strlen(s); if ((newopts = ns = malloc(len + 2)) == NULL) errx(1, "malloc failed"); @@ -634,7 +641,7 @@ */ if (isdigit(*cp) && (cp == s || (cp[-1] != 't' && cp[-1] != 'p')) && - (cp - 1 == s || cp[-2] != 't')) + (cp - 1 == s || cp[-2] != 't') && !have_fmt) *ns++ = 'p'; (void)strcpy(ns, cp); /* and append the number */ ==== //depot/projects/kse/include/ctype.h#4 (text+ko) ==== @@ -39,15 +39,14 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/include/ctype.h,v 1.22 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/ctype.h,v 1.23 2002/09/06 04:22:54 mike Exp $ */ #ifndef _CTYPE_H_ #define _CTYPE_H_ /* - * XXX brings massive namespace pollution (rune_t and struct - * member names). + * XXX brings namespace pollution (struct member names). */ #include @@ -85,9 +84,15 @@ int tolower(int); int toupper(int); -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#if __XSI_VISIBLE +int _tolower(int); +int _toupper(int); +int isascii(int); +int toascii(int); +#endif + +#if __BSD_VISIBLE int digittoint(int); -int isascii(int); int isblank(int); int ishexnumber(int); int isideogram(int); @@ -95,7 +100,6 @@ int isphonogram(int); int isrune(int); int isspecial(int); -int toascii(int); #endif __END_DECLS @@ -113,9 +117,26 @@ #define tolower(c) __tolower(c) #define toupper(c) __toupper(c) -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#if __XSI_VISIBLE +/* + * POSIX.1-2001 specifies _tolower() and _toupper() to be macros equivalent to + * tolower() and toupper() respectively, minus extra checking to ensure that + * the argument is a lower or uppercase letter respectively. We've chosen to + * implement these macros with the same error checking as tolower() and + * toupper() since this doesn't violate the specification itself, only its + * intent. We purposely leave _tolower() and _toupper() undocumented to + * discourage their use. + * + * XXX isascii() and toascii() should similarly be undocumented. + */ +#define _tolower(c) __tolower(c) +#define _toupper(c) __toupper(c) +#define isascii(c) (((c) & ~0x7F) == 0) +#define toascii(c) ((c) & 0x7F) +#endif + +#if __BSD_VISIBLE #define digittoint(c) __maskrune((c), 0xFF) -#define isascii(c) (((c) & ~0x7F) == 0) #define isblank(c) __istype((c), _CTYPE_B) #define ishexnumber(c) __istype((c), _CTYPE_X) #define isideogram(c) __istype((c), _CTYPE_I) @@ -123,10 +144,9 @@ #define isphonogram(c) __istype((c), _CTYPE_Q) #define isrune(c) __istype((c), 0xFFFFFF00L) #define isspecial(c) __istype((c), _CTYPE_T) -#define toascii(c) ((c) & 0x7F) #endif -/* See comments in about __ct_rune_t. */ +/* See comments in about __ct_rune_t. */ __BEGIN_DECLS unsigned long ___runetype(__ct_rune_t); __ct_rune_t ___tolower(__ct_rune_t); ==== //depot/projects/kse/include/rpc/auth_kerb.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/include/rpc/auth_kerb.h,v 1.1 2001/03/19 12:49:46 alfred Exp $ */ +/* $FreeBSD: src/include/rpc/auth_kerb.h,v 1.2 2002/09/04 23:58:23 alfred Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -38,8 +38,6 @@ #ifdef KERBEROS -#pragma ident "@(#)auth_kerb.h 1.10 94/04/25 SMI" - #include #include #include ==== //depot/projects/kse/include/rune.h#2 (text+ko) ==== @@ -34,14 +34,19 @@ * SUCH DAMAGE. * * @(#)rune.h 8.1 (Berkeley) 6/27/93 - * $FreeBSD: src/include/rune.h,v 1.2 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/rune.h,v 1.3 2002/09/06 04:22:54 mike Exp $ */ #ifndef _RUNE_H_ #define _RUNE_H_ +#include #include -#include + +#ifndef _RUNE_T_DECLARED +#define _RUNE_T_DECLARED +typedef __rune_t rune_t; +#endif #define _PATH_LOCALE "/usr/share/locale" ==== //depot/projects/kse/include/runetype.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)runetype.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/runetype.h,v 1.7 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/runetype.h,v 1.8 2002/09/06 04:22:54 mike Exp $ */ #ifndef _RUNETYPE_H_ @@ -43,23 +43,6 @@ #include #include -#ifndef _RUNE_T_DECLARED -typedef __rune_t rune_t; -#define _RUNE_T_DECLARED -#endif - -#ifndef _SIZE_T_DECLARED -typedef __size_t size_t; -#define _SIZE_T_DECLARED -#endif - -#ifndef __cplusplus -#ifndef _WCHAR_T_DECLARED -typedef __wchar_t wchar_t; -#define _WCHAR_T_DECLARED -#endif -#endif - #define _CACHED_RUNES (1 <<8 ) /* Must be a power of 2 */ #define _CRMASK (~(_CACHED_RUNES - 1)) @@ -67,9 +50,9 @@ * The lower 8 bits of runetype[] contain the digit value of the rune. */ typedef struct { - rune_t min; /* First rune of the range */ - rune_t max; /* Last rune (inclusive) of the range */ - rune_t map; /* What first maps to in maps */ + __rune_t min; /* First rune of the range */ + __rune_t max; /* Last rune (inclusive) of the range */ + __rune_t map; /* What first maps to in maps */ unsigned long *types; /* Array of types in range */ } _RuneEntry; @@ -82,13 +65,13 @@ char magic[8]; /* Magic saying what version we are */ char encoding[32]; /* ASCII name of this encoding */ - rune_t (*sgetrune)(const char *, size_t, char const **); - int (*sputrune)(rune_t, char *, size_t, char **); - rune_t invalid_rune; + __rune_t (*sgetrune)(const char *, __size_t, char const **); + int (*sputrune)(__rune_t, char *, __size_t, char **); + __rune_t invalid_rune; unsigned long runetype[_CACHED_RUNES]; - rune_t maplower[_CACHED_RUNES]; - rune_t mapupper[_CACHED_RUNES]; + __rune_t maplower[_CACHED_RUNES]; + __rune_t mapupper[_CACHED_RUNES]; /* * The following are to deal with Runes larger than _CACHED_RUNES - 1. ==== //depot/projects/kse/include/time.h#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.28 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/time.h,v 1.29 2002/09/03 00:06:57 mike Exp $ */ #ifndef _TIME_H_ @@ -48,18 +48,16 @@ #include #include -#include - #if __POSIX_VISIBLE > 0 && __POSIX_VISIBLE < 200112 || __BSD_VISIBLE /* * Frequency of the clock ticks reported by times(). Deprecated - use * sysconf(_SC_CLK_TCK) instead. (Removed in 1003.1-2001.) */ -#define CLK_TCK _BSD_CLK_TCK_ +#define CLK_TCK 128 #endif /* Frequency of the clock ticks reported by clock(). */ -#define CLOCKS_PER_SEC _BSD_CLOCKS_PER_SEC_ +#define CLOCKS_PER_SEC 128 #ifndef NULL #define NULL 0 ==== //depot/projects/kse/lib/libc/locale/mblen.c#2 (text+ko) ==== @@ -35,8 +35,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/mblen.c,v 1.1 2002/08/31 11:26:55 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mblen.c,v 1.2 2002/09/03 01:09:47 tjr Exp $"); +#include #include #include #include @@ -51,7 +52,9 @@ if (s == 0 || *s == 0) return (0); /* No support for state dependent encodings. */ - if (sgetrune(s, n, &e) == _INVALID_RUNE) + if (sgetrune(s, n, &e) == _INVALID_RUNE) { + errno = EILSEQ; return (s - e); + } return (e - s); } ==== //depot/projects/kse/lib/libc/locale/mbtowc.c#2 (text+ko) ==== @@ -35,8 +35,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/mbtowc.c,v 1.2 2002/09/01 07:08:22 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbtowc.c,v 1.3 2002/09/03 01:09:47 tjr Exp $"); +#include #include #include #include @@ -53,8 +54,10 @@ if (s == 0 || *s == 0) return (0); /* No support for state dependent encodings. */ - if ((r = sgetrune(s, n, &e)) == _INVALID_RUNE) + if ((r = sgetrune(s, n, &e)) == _INVALID_RUNE) { + errno = EILSEQ; return (s - e); + } if (pwc) *pwc = r; return (e - s); ==== //depot/projects/kse/lib/libc/locale/wctomb.c#2 (text+ko) ==== @@ -35,8 +35,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wctomb.c,v 1.1 2002/08/31 11:26:55 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wctomb.c,v 1.2 2002/09/03 01:09:47 tjr Exp $"); +#include #include #include #include @@ -58,5 +59,9 @@ } sputrune(wchar, s, MB_CUR_MAX, &e); - return (e ? e - s : -1); + if (e == NULL) { + errno = EILSEQ; + return (-1); + } + return (e - s); } ==== //depot/projects/kse/lib/libc/sparc64/fpu/fpu_qp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.2 2002/06/04 17:02:27 jake Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.3 2002/09/02 02:30:20 jake Exp $"); #include #include @@ -135,10 +135,10 @@ _QP_TTOQ(ux, x, u_long, u_long, a[0]) _QP_QTOT(d, d, double, a) -_QP_QTOT(i, i, int, ) -_QP_QTOT(s, s, float, ) +_QP_QTOT(i, i, int) +_QP_QTOT(s, s, float) _QP_QTOT(x, x, long, a) -_QP_QTOT(ui, i, u_int, ) +_QP_QTOT(ui, i, u_int) _QP_QTOT(ux, x, u_long, a) _QP_CMP(eq, 0, FCC_EQ) ==== //depot/projects/kse/lib/libc/sparc64/sys/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.7 2002/05/23 23:51:57 jake Exp $ +# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.8 2002/09/03 14:55:29 jake Exp $ SRCS+= __sparc_sigtramp_setup.c \ __sparc_utrap.c \ @@ -12,7 +12,7 @@ CFLAGS+= -I${.CURDIR}/sparc64/fpu -MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S +MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S sigaction.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ ==== //depot/projects/kse/lib/libc/stdtime/localtime.c#2 (text+ko) ==== @@ -9,7 +9,7 @@ #endif /* !defined NOID */ #endif /* !defined lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.32 2002/05/28 20:12:42 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.33 2002/09/03 04:34:10 peter Exp $"); /* ** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu). @@ -1476,6 +1476,12 @@ */ bits = TYPE_BIT(time_t) - 1; /* + * Limit to 32 bits or the things go crazy + * when it tries to figure out times near 2^62 etc. + */ + if (bits > 31) + bits = 31; + /* ** If time_t is signed, then 0 is just above the median, ** assuming two's complement arithmetic. ** If time_t is unsigned, then (1 << bits) is just above the median. ==== //depot/projects/kse/sys/boot/forth/loader.conf#13 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.63 2002/08/17 16:23:44 orion Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.64 2002/09/02 20:10:18 brooks Exp $ ############################################################## ### Basic configuration options ############################ @@ -90,6 +90,7 @@ #kern.nbuf="" # Set the number of buffer headers #kern.ncallout="" # Set the maximum # of timer events #kern.sgrowsiz="" # Set the amount to grow stack +#kern.cam.scsi_delay="2000" # Delay (in ms) before probing SCSI #kern.ipc.maxsockets="" # Set the maximum number of sockets avaliable #kern.ipc.nmbclusters="" # Set the number of mbuf clusters #kern.ipc.nmbufs="" # Set the maximum number of mbufs ==== //depot/projects/kse/sys/boot/i386/libi386/i386_module.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.8 2002/08/30 11:11:02 iwasaki Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.9 2002/09/05 11:16:23 iwasaki Exp $ */ /* @@ -44,16 +44,24 @@ i386_autoload(void) { int error; + int disabled; + char *rv; /* XXX use PnP to locate stuff here */ /* autoload ACPI support */ /* XXX should be in 4th keyed off acpi_load */ - if ((getenv("acpi_load") && !getenv("hint.acpi.0.disabled"))) { + disabled = 0; + rv = getenv("hint.acpi.0.disabled"); + if (rv != NULL && strncmp(rv, "0", 1) != 0) { + disabled = 1; + } + + if (getenv("acpi_load") && (!disabled)) { error = mod_load("acpi", NULL, 0, NULL); if (error != 0) printf("ACPI autoload failed - %s\n", strerror(error)); } - + return(0); } ==== //depot/projects/kse/sys/boot/sparc64/loader/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.11 2002/07/07 23:08:22 jake Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.12 2002/09/02 01:11:46 jake Exp $ BASE= loader PROG= ${BASE} @@ -6,7 +6,6 @@ NEWVERSWHAT= "bootstrap loader" sparc64 BINDIR?= /boot INSTALLFLAGS= -b -NOFORTH= yes # Architecture-specific loader code SRCS= locore.S main.c metadata.c vers.c ==== //depot/projects/kse/sys/cam/cam_periph.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.c,v 1.41 2002/08/24 02:51:28 peter Exp $ + * $FreeBSD: src/sys/cam/cam_periph.c,v 1.42 2002/09/02 20:10:18 brooks Exp $ */ #include @@ -1126,7 +1126,7 @@ case AC_SENT_BDR: case AC_BUS_RESET: { - cam_periph_bus_settle(periph, SCSI_DELAY); + cam_periph_bus_settle(periph, scsi_delay); break; } default: ==== //depot/projects/kse/sys/cam/cam_xpt.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.126 2002/08/27 18:43:14 njl Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.127 2002/09/02 20:10:18 brooks Exp $ */ #include #include @@ -5487,7 +5487,7 @@ * For HBAs that don't do bus resets, this won't make a difference. */ cam_periph_freeze_after_event(periph, &periph->path->bus->last_reset, - SCSI_DELAY); + scsi_delay); probeschedule(periph); return(CAM_REQ_CMP); } @@ -6760,9 +6760,9 @@ /* Call manually because we don't have any busses */ xpt_finishconfig(xpt_periph, NULL); } else { - if (busses_to_reset > 0 && SCSI_DELAY >= 2000) { + if (busses_to_reset > 0 && scsi_delay >= 2000) { printf("Waiting %d seconds for SCSI " - "devices to settle\n", SCSI_DELAY/1000); + "devices to settle\n", scsi_delay/1000); } xpt_for_all_busses(xptconfigfunc, NULL); } ==== //depot/projects/kse/sys/cam/scsi/scsi_all.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.36 2002/08/26 17:13:35 gibbs Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.37 2002/09/02 20:10:19 brooks Exp $ */ #include @@ -36,6 +36,8 @@ #include #include +#include +#include #else #include #include @@ -61,12 +63,40 @@ #define EJUSTRETURN -2 /* don't modify regs, just return */ #endif /* !_KERNEL */ +/* + * This is the default number of seconds we wait for devices to settle + * after a SCSI bus reset. + */ +#ifndef SCSI_DELAY +#define SCSI_DELAY 2000 +#endif +/* + * All devices need _some_ sort of bus settle delay, so we'll set it to + * a minimum value of 100ms. + */ +#ifndef SCSI_MIN_DELAY +#define SCSI_MIN_DELAY 100 +#endif +/* + * Make sure the user isn't using seconds instead of milliseconds. + */ +#if (SCSI_DELAY < SCSI_MIN_DELAY) +#error "SCSI_DELAY is in milliseconds, not seconds! Please use a larger value" +#endif + +int scsi_delay; + static int ascentrycomp(const void *key, const void *member); static int senseentrycomp(const void *key, const void *member); static void fetchtableentries(int sense_key, int asc, int ascq, struct scsi_inquiry_data *, const struct sense_key_table_entry **, const struct asc_table_entry **); +#ifdef _KERNEL +static void init_scsi_delay(void); +static int sysctl_scsi_delay(SYSCTL_HANDLER_ARGS); +static int set_scsi_delay(int delay); +#endif #if !defined(SCSI_NO_OP_STRINGS) @@ -2876,3 +2906,53 @@ } return (-1); } + +#ifdef _KERNEL +static void +init_scsi_delay(void) +{ + int delay; + + delay = SCSI_DELAY; + TUNABLE_INT_FETCH("kern.cam.scsi_delay", &delay); + + if (set_scsi_delay(delay) != 0) { + printf("cam: invalid value for tunable kern.cam.scsi_delay\n"); + set_scsi_delay(SCSI_DELAY); + } +} +SYSINIT(scsi_delay, SI_SUB_TUNABLES, SI_ORDER_ANY, init_scsi_delay, NULL); + +static int +sysctl_scsi_delay(SYSCTL_HANDLER_ARGS) +{ + int error, delay; + + delay = scsi_delay; + error = sysctl_handle_int(oidp, &delay, sizeof(delay), req); + if (error != 0 || req->newptr == NULL) + return (error); + return (set_scsi_delay(delay)); +} +SYSCTL_PROC(_kern_cam, OID_AUTO, scsi_delay, CTLTYPE_INT|CTLFLAG_RW, + 0, 0, sysctl_scsi_delay, "I", + "Delay to allow devices to settle after a SCSI bus reset (ms)"); + +static int +set_scsi_delay(int delay) +{ + /* + * If someone sets this to 0, we assume that they want the + * minimum allowable bus settle delay. + */ + if (delay == 0) { + printf("cam: using minimum scsi_delay (%dms)\n", + SCSI_MIN_DELAY); + delay = SCSI_MIN_DELAY; + } + if (delay < SCSI_MIN_DELAY) + return (EINVAL); + scsi_delay = delay; + return (0); +} +#endif /* _KERNEL */ ==== //depot/projects/kse/sys/cam/scsi/scsi_all.h#4 (text+ko) ==== @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.19 2002/06/04 17:41:47 mjacob Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.20 2002/09/02 20:10:19 brooks Exp $ */ /* @@ -27,30 +27,11 @@ #include #ifdef _KERNEL -#include "opt_scsi.h" /* * This is the number of seconds we wait for devices to settle after a SCSI * bus reset. */ -#ifndef SCSI_DELAY -#define SCSI_DELAY 2000 -#endif -/* - * If someone sets this to 0, we assume that they want the minimum - * allowable bus settle delay. All devices need _some_ sort of bus settle - * delay, so we'll set it to a minimum value of 100ms. - */ -#if (SCSI_DELAY == 0) -#undef SCSI_DELAY -#define SCSI_DELAY 100 -#endif - -/* - * Make sure the user isn't using seconds instead of milliseconds. - */ -#if (SCSI_DELAY < 100) -#error "SCSI_DELAY is in milliseconds, not seconds! Please use a larger value" -#endif +extern int scsi_delay; #endif /* _KERNEL */ /* ==== //depot/projects/kse/sys/compat/linux/linux_file.c#17 (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. * - * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.70 2002/09/01 22:30:24 iedowse Exp $ + * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.71 2002/09/02 22:46:05 iedowse Exp $ */ #include "opt_compat.h" @@ -931,30 +931,22 @@ static int fcntl_common(struct thread *td, struct linux_fcntl64_args *args) { - struct fcntl_args fcntl_args; struct file *fp; + long arg; int error, result; - fcntl_args.fd = args->fd; - switch (args->cmd) { case LINUX_F_DUPFD: - fcntl_args.cmd = F_DUPFD; - fcntl_args.arg = args->arg; - return (fcntl(td, &fcntl_args)); + return (kern_fcntl(td, args->fd, F_DUPFD, args->arg)); case LINUX_F_GETFD: - fcntl_args.cmd = F_GETFD; - return (fcntl(td, &fcntl_args)); + return (kern_fcntl(td, args->fd, F_GETFD, 0)); case LINUX_F_SETFD: - fcntl_args.cmd = F_SETFD; - fcntl_args.arg = args->arg; - return (fcntl(td, &fcntl_args)); + return (kern_fcntl(td, args->fd, F_SETFD, args->arg)); case LINUX_F_GETFL: - fcntl_args.cmd = F_GETFL; - error = fcntl(td, &fcntl_args); + error = kern_fcntl(td, args->fd, F_GETFL, 0); result = td->td_retval[0]; td->td_retval[0] = 0; if (result & O_RDONLY) @@ -974,21 +966,19 @@ return (error); case LINUX_F_SETFL: - fcntl_args.arg = 0; + arg = 0; if (args->arg & LINUX_O_NDELAY) - fcntl_args.arg |= O_NONBLOCK; + arg |= O_NONBLOCK; if (args->arg & LINUX_O_APPEND) - fcntl_args.arg |= O_APPEND; + arg |= O_APPEND; if (args->arg & LINUX_O_SYNC) - fcntl_args.arg |= O_FSYNC; + arg |= O_FSYNC; if (args->arg & LINUX_FASYNC) - fcntl_args.arg |= O_ASYNC; - fcntl_args.cmd = F_SETFL; - return (fcntl(td, &fcntl_args)); + arg |= O_ASYNC; + return (kern_fcntl(td, args->fd, F_SETFL, arg)); case LINUX_F_GETOWN: - fcntl_args.cmd = F_GETOWN; - return (fcntl(td, &fcntl_args)); + return (kern_fcntl(td, args->fd, F_GETOWN, 0)); case LINUX_F_SETOWN: /* @@ -1005,9 +995,7 @@ } fdrop(fp, td); - fcntl_args.cmd = F_SETOWN; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 6 15:10:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB90637B401; Fri, 6 Sep 2002 15:10:21 -0700 (PDT) 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 55F1137B400 for ; Fri, 6 Sep 2002 15:10:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA54043E77 for ; Fri, 6 Sep 2002 15:10:20 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g86MAKJU045900 for ; Fri, 6 Sep 2002 15:10:20 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g86MAKwl045895 for perforce@freebsd.org; Fri, 6 Sep 2002 15:10:20 -0700 (PDT) Date: Fri, 6 Sep 2002 15:10:20 -0700 (PDT) Message-Id: <200209062210.g86MAKwl045895@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17172 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17172 Change 17172 by mini@mini_stylus on 2002/09/06 15:09:44 Remove extra UCF_xxx flags we are no longer using. Affected files ... .. //depot/projects/kse/lib/libc/gen/swapcontext.c#6 edit .. //depot/projects/kse/sys/kern/kern_thread.c#103 edit .. //depot/projects/kse/sys/sys/ucontext.h#8 edit Differences ... ==== //depot/projects/kse/lib/libc/gen/swapcontext.c#6 (text+ko) ==== @@ -53,7 +53,6 @@ ret = getcontext(oucp); if ((ret == 0) && !(oucp->uc_flags & UCF_SWAPPED)) { oucp->uc_flags |= UCF_SWAPPED; - oucp->uc_busy = 0; ret = setcontext(ucp); } return (ret); ==== //depot/projects/kse/sys/kern/kern_thread.c#103 (text+ko) ==== @@ -508,15 +508,6 @@ struct thread *td, struct trapframe *frame) { int discard, error; - struct thread_mailbox *tmp; - - /* - * If we are in a critical section, return to this thread. - */ - tmp = (struct thread_mailbox *)fuword(&ke->ke_mailbox->km_curthread); - if ((tmp != NULL) && - (fuword(&tmp->tm_context.uc_flags) & UCF_CRITICAL)) - return (0); /* * Save the thread's context, and link it @@ -535,14 +526,13 @@ /* * Decide whether to perfom an upcall now. */ - discard = 0; - /* Make sure there are no other threads waiting to run. */ - if (TAILQ_FIRST(&kg->kg_runq)) + if (TAILQ_FIRST(&kg->kg_runq)) { /* * Another thread in this KSEG needs to run. * Switch to it instead of performing an upcall, - * abondoning this thread. + * abondoning this thread. Perform the upcall + * later; discard this thread for now. * * XXXKSE - As for the other threads to run; * we COULD rush through all the threads @@ -552,14 +542,6 @@ * What is OUR priority? The priority of the highest * sycall waiting to be returned? * For now, just let another KSE run (easiest). - */ - discard = 1; - - /* Discard thread or mark for upcall. */ - if (discard) { - /* - * Perform the upcall later; discard this thread for - * now. * * XXXKSE Future enhancement: Shove threads in this * state onto a list of completed threads hanging ==== //depot/projects/kse/sys/sys/ucontext.h#8 (text+ko) ==== @@ -48,15 +48,8 @@ struct __ucontext *uc_link; stack_t uc_stack; - intptr_t uc_busy; int uc_flags; -#define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ -#define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ -#define UCF_SWAPPED 0x00000080 /* Used by swapcontext(3). */ -#define UCF_CRITICAL 0x00000200 /* In a critical section. */ -#define UCF_CLEARSTATE 0x00000400 /* Clear UCF_STATE in setcontext. */ -#define UCF_STATE 0x0000ff00 /* State-related flags. */ -#define UCF_OPTIONS 0x000000ff /* Behaviour-related flags. */ +#define UCF_SWAPPED 0x00000001 /* Used by swapcontext(3). */ int __spare__[4]; } ucontext_t; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 6 19:34:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1982A37B401; Fri, 6 Sep 2002 19:34:30 -0700 (PDT) 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 7ED2E37B400; Fri, 6 Sep 2002 19:34:29 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EA5643E6A; Fri, 6 Sep 2002 19:34:28 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g872XsOo090173; Fri, 6 Sep 2002 22:33:55 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Fri, 6 Sep 2002 22:33:54 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Chris Costello Cc: Perforce Change Reviews Subject: Re: PERFORCE change 16684 for review In-Reply-To: <20020906012608.GH41454@holly.calldei.com> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, 5 Sep 2002, Chris Costello wrote: > On Tuesday, August 27, 2002, Robert Watson wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16684 > > > > Change 16684 by rwatson@rwatson_paprika on 2002/08/27 22:16:33 > > > > Adopt consistent sorting of new pre-syscall entry point > > as found in mac (store with other process-related entry > > points rather than in the access control section). > > What does this help, and can/will it be broken up into a set of entry > points more in-line with what we have now? This seems to stick out like > a sore thumb... We have a bunch of functional changes in the queue, but once those are in the tree, I'd actually like to do another pass at renaming and reordering the entry points. The access control entry points are now largely right (there are a few oddities involving the VM calls though). I'd like to make the event entry points sort in a similar manner. In particular, sorted by object type in the form: mac__ Similar to the checks, which are in the form: mac_check__ Before that we have at least the following in the queue: Port of lomac to the MAC framework Pipe lock fixing Merge new userland API to the trustedbsd_mac tree Fix VFS locking and handling of labels on vnodes Right now all that's really holding up the userland code is that it requires certain binaries that are currently statically linked to be able to dlopen() MAC modules, which we can't do right now. This will be required to do the nsswitch support also, as well as certain classes of internationalization. It's not quite clear what the answer is right now--at least temporarily, it may be to break out this functionality into a seperate usr.sbin/macctl, which is a shame, since interface labeling really does belong in ifconfig. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 7 3: 0:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5464137B406; Sat, 7 Sep 2002 03:00:08 -0700 (PDT) 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 BAE5037B400 for ; Sat, 7 Sep 2002 03:00:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AFC543E75 for ; Sat, 7 Sep 2002 03:00:07 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g87A07JU052864 for ; Sat, 7 Sep 2002 03:00:07 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g87A077P052856 for perforce@freebsd.org; Sat, 7 Sep 2002 03:00:07 -0700 (PDT) Date: Sat, 7 Sep 2002 03:00:07 -0700 (PDT) Message-Id: <200209071000.g87A077P052856@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17191 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17191 Change 17191 by mini@mini_stylus on 2002/09/07 02:59:59 Fix breakage from last IFC. Affected files ... .. //depot/projects/kse/sys/i386/i386/vm_machdep.c#65 edit .. //depot/projects/kse/sys/kern/kern_thread.c#104 edit .. //depot/projects/kse/sys/sys/proc.h#128 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/vm_machdep.c#65 (text+ko) ==== ==== //depot/projects/kse/sys/kern/kern_thread.c#104 (text+ko) ==== @@ -301,7 +301,6 @@ sizeof(ucontext_t)); if (error == 0) { thread_getcontext(td, &uc); - uc.uc_busy = 0; error = copyout(&uc, (caddr_t)td->td_mailbox + offsetof(struct thread_mailbox, tm_context), sizeof(ucontext_t)); @@ -361,7 +360,7 @@ KASSERT(!mtx_owned(&Giant), ("dying thread owns giant")); if (ke->ke_tdspare != NULL) { - thread_free(ke->ke_tdspare); + thread_stash(ke->ke_tdspare); ke->ke_tdspare = NULL; } cpu_thread_exit(td); /* XXXSMP */ @@ -464,12 +463,13 @@ } CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", td, td->td_proc->p_pid, td->td_proc->p_comm); - bzero(&td->td_startzero, + bzero(&td2->td_startzero, (unsigned)RANGEOF(struct thread, td_startzero, td_endzero)); bcopy(&td->td_startcopy, &td2->td_startcopy, (unsigned) RANGEOF(struct thread, td_startcopy, td_endcopy)); thread_link(td2, ke->ke_ksegrp); cpu_set_upcall(td2, td->td_pcb); + bcopy(td->td_frame, td2->td_frame, sizeof(struct trapframe)); /* * The user context for this thread is selected when we choose * a KSE and return to userland on it. All we need do here is @@ -507,7 +507,7 @@ thread_consider_upcalling(struct proc *p, struct ksegrp *kg, struct kse *ke, struct thread *td, struct trapframe *frame) { - int discard, error; + int error; /* * Save the thread's context, and link it ==== //depot/projects/kse/sys/sys/proc.h#128 (text+ko) ==== @@ -269,7 +269,6 @@ #define td_startzero td_flags int td_flags; /* (j) TDF_* flags. */ struct kse *td_last_kse; /* Where it wants to be if possible. */ - struct kse *td_kse; /* Current KSE if running. */ int td_dupfd; /* (k) Ret value from fdopen. XXX */ void *td_wchan; /* (j) Sleep address. */ const char *td_wmesg; /* (j) Reason for sleep. */ @@ -283,15 +282,16 @@ LIST_HEAD(, mtx) td_contested; /* (j) Contested locks. */ struct lock_list_entry *td_sleeplocks; /* (k) Held sleep locks. */ int td_intr_nesting_level; /* (k) Interrupt recursion. */ - void *td_mailbox; /* the userland mailbox address */ struct ucred *td_ucred; /* (k) Reference to credentials. */ void (*td_switchin)(void); /* (k) switchin special func */ u_int td_critnest; /* (k) Critical section nest level. */ -#define td_endzero td_md +#define td_endzero td_kse /* Copied during fork1() or thread_sched_upcall() */ -#define td_startcopy td_endzero +#define td_startcopy td_kse /* XXXKSE just copying td_md needs checking! */ + struct kse *td_kse; /* Current KSE if running. */ + void *td_mailbox; /* the userland mailbox address */ struct mdthread td_md; /* (k) Any machine-dependent fields. */ u_char td_base_pri; /* (j) Thread base kernel priority. */ u_char td_priority; /* (j) Thread active priority. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 7 5:23:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D03037B401; Sat, 7 Sep 2002 05:23:22 -0700 (PDT) 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 C1F0C37B400 for ; Sat, 7 Sep 2002 05:23:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A66143E6E for ; Sat, 7 Sep 2002 05:23:21 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g87CNLJU083950 for ; Sat, 7 Sep 2002 05:23:21 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g87CNLUT083947 for perforce@freebsd.org; Sat, 7 Sep 2002 05:23:21 -0700 (PDT) Date: Sat, 7 Sep 2002 05:23:21 -0700 (PDT) Message-Id: <200209071223.g87CNLUT083947@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17193 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17193 Change 17193 by mini@mini_stylus on 2002/09/07 05:22:54 Deliver caught signals via an upcall to the UTS in KSE processes. Affected files ... .. //depot/projects/kse/lib/libc/i386/gen/signalcontext.c#2 edit .. //depot/projects/kse/sys/kern/kern_sig.c#65 edit .. //depot/projects/kse/sys/kern/kern_thread.c#105 edit .. //depot/projects/kse/sys/sys/proc.h#129 edit .. //depot/projects/kse/tools/KSE/uts/uts.c#7 edit Differences ... ==== //depot/projects/kse/lib/libc/i386/gen/signalcontext.c#2 (text+ko) ==== @@ -31,6 +31,7 @@ #include #include +#include #include #include #include ==== //depot/projects/kse/sys/kern/kern_sig.c#65 (text+ko) ==== @@ -1853,6 +1853,9 @@ p->p_code = 0; p->p_sig = 0; } + if (p->p_flag & P_KSES) + if (signal_upcall(p, sig)) + return; (*p->p_sysent->sv_sendsig)(action, sig, &returnmask, code); } } ==== //depot/projects/kse/sys/kern/kern_thread.c#105 (text+ko) ==== @@ -487,6 +487,40 @@ } /* + * Schedule an upcall to notify a KSE process recieved signals. + * + * XXX - Modifying a sigset_t like this is totally bogus. + */ +struct thread * +signal_upcall(struct proc *p, int sig) +{ + struct thread *td, *td2; + struct kse *ke; + sigset_t ss; + int error; + + PROC_LOCK_ASSERT(p, MA_OWNED); + + td = FIRST_THREAD_IN_PROC(p); + ke = td->td_kse; + PROC_UNLOCK(p); + error = copyin(&ke->ke_mailbox->km_sigscaught, &ss, sizeof(sigset_t)); + PROC_LOCK(p); + if (error) + return (NULL); + SIGADDSET(ss, sig); + PROC_UNLOCK(p); + error = copyout(&ss, &ke->ke_mailbox->km_sigscaught, sizeof(sigset_t)); + PROC_LOCK(p); + if (error) + return (NULL); + mtx_lock_spin(&sched_lock); + td2 = thread_schedule_upcall(td, ke); + mtx_unlock_spin(&sched_lock); + return (td2); +} + +/* * Consider whether or not an upcall should be made, and update the * TDF_UPCALLING flag appropriately. * ==== //depot/projects/kse/sys/sys/proc.h#129 (text+ko) ==== @@ -291,7 +291,7 @@ #define td_startcopy td_kse /* XXXKSE just copying td_md needs checking! */ struct kse *td_kse; /* Current KSE if running. */ - void *td_mailbox; /* the userland mailbox address */ + struct thread_mailbox *td_mailbox; /* the userland mailbox address */ struct mdthread td_md; /* (k) Any machine-dependent fields. */ u_char td_base_pri; /* (j) Thread base kernel priority. */ u_char td_priority; /* (j) Thread active priority. */ @@ -851,6 +851,7 @@ void ksegrp_link(struct ksegrp *kg, struct proc *p); int kserunnable(void); void make_kse_runnable(struct kse *ke); +struct thread *signal_upcall(struct proc *p, int sig); void thread_exit(void) __dead2; int thread_export_context(struct thread *td); void thread_link(struct thread *td, struct ksegrp *kg); ==== //depot/projects/kse/tools/KSE/uts/uts.c#7 (text+ko) ==== @@ -23,11 +23,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#6 $ + * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#7 $ */ #include #include +#include #include #include #include @@ -37,6 +38,7 @@ #include #include #include +#include #include #undef TRACE_UTS @@ -66,28 +68,39 @@ static void pstr(const char *s); static void runq_insert(struct thread_mailbox *tm); static struct thread_mailbox *runq_remove(void); -static void thread_start(const void *func); +static void thread_start(const void *func, int arg); static void uts(struct kse_mailbox *km); extern int uts_to_thread(struct thread_mailbox *tdp, struct thread_mailbox **curthreadp); static void +nano(int len) +{ + struct timespec time_to_sleep; + struct timespec time_remaining; + + time_to_sleep.tv_sec = 0; + time_to_sleep.tv_nsec = len * 1000; + nanosleep(&time_to_sleep, &time_remaining); +} + +static void foof(int sig) { - pfmt("%d", sig); + pfmt("\n[%d]\n", sig); } void -aaaa(void) +aaaa(int c) { for (;;) { - pchar('.'); - sleep(1); + // pchar(c); + nano(1); } } void -spin(void) +spin(int arg) { for (;;) sched_yield(); } @@ -100,13 +113,14 @@ { int i; - thread_start(aaaa); + thread_start(aaaa, '.'); // thread_start(spin); init_uts(); for (i = 0;1;i++) { - if (i) progress++; - pchar('a' + (i % 26)); - sleep(5); +// if (i < 1000) +// thread_start(aaaa, 'a' + (i % 26)); + // pchar('A' + (i % 26)); + nano(1); } pstr("\n** main() exiting **\n"); return (EX_OK); @@ -130,7 +144,6 @@ /* Throw us into its context. */ getcontext(&tm->tm_context); - tm->tm_context.uc_flags = UCF_SKIPSIGMASK; /* Find our stack. */ mib[0] = CTL_KERN; @@ -163,7 +176,7 @@ /* * Arrange to deliver signals via KSE. */ - /* XXX: Not yet. */ + signal(SIGURG, foof); } /* @@ -279,7 +292,7 @@ uts(struct kse_mailbox *km) { struct thread_mailbox *tm, *p; - int ret; + int ret, i; UPSTR("\n--uts() start--\n"); UPFMT("mailbox -> %x\n", km); @@ -299,9 +312,17 @@ UPCHAR('\n'); /* - * Process any signals we've recieved. + * Process any signals we've recieved (but only if we have + * somewhere to deliver them to). */ - /* XXX: Not yet. */ + if ((run_queue != NULL) && SIGNOTEMPTY(km->km_sigscaught)) { + for (i = 0;i < _SIG_MAXSIG;i++) + if (SIGISMEMBER(km->km_sigscaught, i)) { + signalcontext(&run_queue->tm_context, i, foof); + break; + } + bzero(&km->km_sigscaught, sizeof(sigset_t)); + } /* * Pull a thread off the run queue. @@ -321,10 +342,6 @@ UPFMT("\n-- uts() scheduling 0x%x--\n", p); UPFMT("eip -> 0x%x progress -> %d\n", p->tm_context.uc_mcontext.mc_eip, progress); - if ((p->tm_context.uc_flags & UCF_CRITICAL) == 0) - p->tm_context.uc_flags |= - UCF_CRITICAL | UCF_CLEARSTATE; - uts_mb.km_curthread = p; UPSTR("curthread set\n"); uts_to_thread(p, &km->km_curthread); UPSTR("\n-- uts_to_thread() failed --\n"); @@ -338,7 +355,7 @@ * Start a thread. */ static void -thread_start(const void *func) +thread_start(const void *func, int arg) { struct thread_mailbox *tm; char *p; @@ -349,8 +366,7 @@ p = (char *)malloc(THREAD_STACK_SIZE); tm->tm_context.uc_stack.ss_sp = p; tm->tm_context.uc_stack.ss_size = THREAD_STACK_SIZE; - makecontext(&tm->tm_context, func, 1); - tm->tm_context.uc_flags = UCF_SKIPSIGMASK; + makecontext(&tm->tm_context, func, 2, arg); // setcontext(&tm->tm_context); runq_insert(tm); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 7 5:47: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC7FD37B401; Sat, 7 Sep 2002 05:46:55 -0700 (PDT) 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 2761F37B400 for ; Sat, 7 Sep 2002 05:46:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA38343E42 for ; Sat, 7 Sep 2002 05:46:54 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g87CkrJU086704 for ; Sat, 7 Sep 2002 05:46:54 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g87CkrUQ086701 for perforce@freebsd.org; Sat, 7 Sep 2002 05:46:53 -0700 (PDT) Date: Sat, 7 Sep 2002 05:46:53 -0700 (PDT) Message-Id: <200209071246.g87CkrUQ086701@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 17195 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17195 Change 17195 by julian@julian_desk on 2002/09/07 05:46:14 undo previous undo.. these fiedls are DEFINITLY not to be copied but should be zero'd Affected files ... .. //depot/projects/kse/sys/sys/proc.h#130 edit Differences ... ==== //depot/projects/kse/sys/sys/proc.h#130 (text+ko) ==== @@ -269,6 +269,7 @@ #define td_startzero td_flags int td_flags; /* (j) TDF_* flags. */ struct kse *td_last_kse; /* Where it wants to be if possible. */ + struct kse *td_kse; /* Current KSE if running. */ int td_dupfd; /* (k) Ret value from fdopen. XXX */ void *td_wchan; /* (j) Sleep address. */ const char *td_wmesg; /* (j) Reason for sleep. */ @@ -282,16 +283,15 @@ LIST_HEAD(, mtx) td_contested; /* (j) Contested locks. */ struct lock_list_entry *td_sleeplocks; /* (k) Held sleep locks. */ int td_intr_nesting_level; /* (k) Interrupt recursion. */ + struct thread_mailbox *td_mailbox; /* the userland mailbox address */ struct ucred *td_ucred; /* (k) Reference to credentials. */ void (*td_switchin)(void); /* (k) switchin special func */ u_int td_critnest; /* (k) Critical section nest level. */ -#define td_endzero td_kse +#define td_endzero td_md /* Copied during fork1() or thread_sched_upcall() */ -#define td_startcopy td_kse +#define td_startcopy td_endzero /* XXXKSE just copying td_md needs checking! */ - struct kse *td_kse; /* Current KSE if running. */ - struct thread_mailbox *td_mailbox; /* the userland mailbox address */ struct mdthread td_md; /* (k) Any machine-dependent fields. */ u_char td_base_pri; /* (j) Thread base kernel priority. */ u_char td_priority; /* (j) Thread active priority. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 7 15: 5:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 537CA37B401; Sat, 7 Sep 2002 15:05:30 -0700 (PDT) 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 2BADD37B400; Sat, 7 Sep 2002 15:05:29 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2F0843E72; Sat, 7 Sep 2002 15:05:28 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id B6589AE162; Sat, 7 Sep 2002 15:05:28 -0700 (PDT) Date: Sat, 7 Sep 2002 15:05:28 -0700 From: Jon Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17195 for review Message-ID: <20020907220528.GQ7265@elvis.mu.org> References: <200209071246.g87CkrUQ086701@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200209071246.g87CkrUQ086701@freefall.freebsd.org> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@FreeBSD.org] wrote : > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17195 > > Change 17195 by julian@julian_desk on 2002/09/07 05:46:14 > > undo previous undo.. these fiedls are DEFINITLY not to be copied > but should be zero'd Julian, please do not revert my work without asking me first. These fields needs to be copied in order for thread_schedule_upcall() to work. Either we need to copy them in the bcopy, or do it manually. The changes you've made cause upcalls to panic the system. I don't want to get into a commit war, please let me change them to something that works. > Affected files ... > > .. //depot/projects/kse/sys/sys/proc.h#130 edit > > Differences ... > > ==== //depot/projects/kse/sys/sys/proc.h#130 (text+ko) ==== > > @@ -269,6 +269,7 @@ > #define td_startzero td_flags > int td_flags; /* (j) TDF_* flags. */ > struct kse *td_last_kse; /* Where it wants to be if possible. */ > + struct kse *td_kse; /* Current KSE if running. */ > int td_dupfd; /* (k) Ret value from fdopen. XXX */ > void *td_wchan; /* (j) Sleep address. */ > const char *td_wmesg; /* (j) Reason for sleep. */ > @@ -282,16 +283,15 @@ > LIST_HEAD(, mtx) td_contested; /* (j) Contested locks. */ > struct lock_list_entry *td_sleeplocks; /* (k) Held sleep locks. */ > int td_intr_nesting_level; /* (k) Interrupt recursion. */ > + struct thread_mailbox *td_mailbox; /* the userland mailbox address */ > struct ucred *td_ucred; /* (k) Reference to credentials. */ > void (*td_switchin)(void); /* (k) switchin special func */ > u_int td_critnest; /* (k) Critical section nest level. */ > -#define td_endzero td_kse > +#define td_endzero td_md > > /* Copied during fork1() or thread_sched_upcall() */ > -#define td_startcopy td_kse > +#define td_startcopy td_endzero > /* XXXKSE just copying td_md needs checking! */ > - struct kse *td_kse; /* Current KSE if running. */ > - struct thread_mailbox *td_mailbox; /* the userland mailbox address */ > struct mdthread td_md; /* (k) Any machine-dependent fields. */ > u_char td_base_pri; /* (j) Thread base kernel priority. */ > u_char td_priority; /* (j) Thread active priority. */ -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 7 15:46: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C08537B401; Sat, 7 Sep 2002 15:45:58 -0700 (PDT) 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 25E8037B400; Sat, 7 Sep 2002 15:45:58 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id E36EC43E6A; Sat, 7 Sep 2002 15:45:57 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id ABB90AE160; Sat, 7 Sep 2002 15:45:57 -0700 (PDT) Date: Sat, 7 Sep 2002 15:45:57 -0700 From: Jon Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17195 for review Message-ID: <20020907224557.GS7265@elvis.mu.org> References: <200209071246.g87CkrUQ086701@freefall.freebsd.org> <20020907220528.GQ7265@elvis.mu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020907220528.GQ7265@elvis.mu.org> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jon Mini [mini@freebsd.org] wrote : > These fields needs to be copied in order for thread_schedule_upcall() > to work. Either we need to copy them in the bcopy, or do it manually. > > The changes you've made cause upcalls to panic the system. Hmm. Upon further investigation, you're right (not surprising); those fields are copied and assigned later on in the upcall process. However, I am still getting some panics sometimes. I think this is due to something else, though. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 7 16:20: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12DDC37B401; Sat, 7 Sep 2002 16:19:57 -0700 (PDT) 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 A6F3737B400 for ; Sat, 7 Sep 2002 16:19:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 681D343E65 for ; Sat, 7 Sep 2002 16:19:56 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g87NJuJU099368 for ; Sat, 7 Sep 2002 16:19:56 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g87NJum2099365 for perforce@freebsd.org; Sat, 7 Sep 2002 16:19:56 -0700 (PDT) Date: Sat, 7 Sep 2002 16:19:56 -0700 (PDT) Message-Id: <200209072319.g87NJum2099365@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17212 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17212 Change 17212 by mini@mini_stylus on 2002/09/07 16:19:49 Hold Giant while we allocate a thread. Jeffr says we needn't hold Gian over any UMA operation, but I'm still getting 'Giant not held' panics when we need to allocate a thread here. Affected files ... .. //depot/projects/kse/sys/kern/kern_thread.c#106 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#106 (text+ko) ==== @@ -621,8 +621,11 @@ /* * Ensure that we have a spare thread available. */ - if (ke->ke_tdspare == NULL) + if (ke->ke_tdspare == NULL) { + mtx_lock(&Giant); ke->ke_tdspare = thread_alloc(); + mtx_unlock(&Giant); + } /* * Bound threads need no additional work. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 7 16:20:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 262AD37B401; Sat, 7 Sep 2002 16:20:12 -0700 (PDT) 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 B179A37B400; Sat, 7 Sep 2002 16:20:11 -0700 (PDT) Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88]) by mx1.FreeBSD.org (Postfix) with ESMTP id 126ED43E77; Sat, 7 Sep 2002 16:20:11 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc52.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020907232010.KHDM14182.rwcrmhc52.attbi.com@InterJet.elischer.org>; Sat, 7 Sep 2002 23:20:10 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id QAA48733; Sat, 7 Sep 2002 16:14:08 -0700 (PDT) Date: Sat, 7 Sep 2002 16:14:08 -0700 (PDT) From: Julian Elischer To: Jon Mini Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 17195 for review In-Reply-To: <20020907224557.GS7265@elvis.mu.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG do you mind if I frame this :-) (so I can send it to my parents) ;-) On Sat, 7 Sep 2002, Jon Mini wrote: > Jon Mini [mini@freebsd.org] wrote : > > > These fields needs to be copied in order for thread_schedule_upcall() > > to work. Either we need to copy them in the bcopy, or do it manually. > > > > The changes you've made cause upcalls to panic the system. > > Hmm. Upon further investigation, you're right (not surprising); > those fields are copied and assigned later on in the upcall process. > However, I am still getting some panics sometimes. I think this is > due to something else, though. > > -- > Jonathan Mini > http://www.freebsd.org/ > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 7 16:20:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFAD737B400; Sat, 7 Sep 2002 16:20:29 -0700 (PDT) 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 342A737B401; Sat, 7 Sep 2002 16:20:29 -0700 (PDT) Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA14A43E75; Sat, 7 Sep 2002 16:20:28 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc52.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020907232023.KHIM14182.rwcrmhc52.attbi.com@InterJet.elischer.org>; Sat, 7 Sep 2002 23:20:23 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id QAA48727; Sat, 7 Sep 2002 16:10:26 -0700 (PDT) Date: Sat, 7 Sep 2002 16:10:25 -0700 (PDT) From: Julian Elischer To: Jon Mini Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 17195 for review In-Reply-To: <20020907220528.GQ7265@elvis.mu.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Copying them is definitly wrong. the 'current KSE' field CAN NOT be set at that time It must ONLY be set when a KSE as assigned to a thread. until then it MUST BE NULL. (I depend on that) The thread mailbox address must ONLY be pointed to by the thread to which it belongs. I also plan to put in KASSERTS on this for certain cases, one of which blew up wit this change. Only one thread can point to a particlar thread mailbox. therefore on creation of a new thread that filed must be zero'd. On Sat, 7 Sep 2002, Jon Mini wrote: > Julian Elischer [julian@FreeBSD.org] wrote : > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17195 > > > > Change 17195 by julian@julian_desk on 2002/09/07 05:46:14 > > > > undo previous undo.. these fiedls are DEFINITLY not to be copied > > but should be zero'd > > > Julian, please do not revert my work without asking me first. I did not originally place those fields in those sections by accident.. > > These fields needs to be copied in order for thread_schedule_upcall() > to work. Either we need to copy them in the bcopy, or do it manually. It does not make sense to COPY those fields If you think you need to copy them then by definition you have mis-understood something! let's try 'talk' :-) (on freefall) maybe we can figure out where the disconnect is.... > > The changes you've made cause upcalls to panic the system. > > I don't want to get into a commit war, please let me change them > to something that works. > > > Affected files ... > > > > .. //depot/projects/kse/sys/sys/proc.h#130 edit > > > > Differences ... > > > > ==== //depot/projects/kse/sys/sys/proc.h#130 (text+ko) ==== > > > > @@ -269,6 +269,7 @@ > > #define td_startzero td_flags > > int td_flags; /* (j) TDF_* flags. */ > > struct kse *td_last_kse; /* Where it wants to be if possible. */ > > + struct kse *td_kse; /* Current KSE if running. */ > > int td_dupfd; /* (k) Ret value from fdopen. XXX */ > > void *td_wchan; /* (j) Sleep address. */ > > const char *td_wmesg; /* (j) Reason for sleep. */ > > @@ -282,16 +283,15 @@ > > LIST_HEAD(, mtx) td_contested; /* (j) Contested locks. */ > > struct lock_list_entry *td_sleeplocks; /* (k) Held sleep locks. */ > > int td_intr_nesting_level; /* (k) Interrupt recursion. */ > > + struct thread_mailbox *td_mailbox; /* the userland mailbox address */ > > struct ucred *td_ucred; /* (k) Reference to credentials. */ > > void (*td_switchin)(void); /* (k) switchin special func */ > > u_int td_critnest; /* (k) Critical section nest level. */ > > -#define td_endzero td_kse > > +#define td_endzero td_md > > > > /* Copied during fork1() or thread_sched_upcall() */ > > -#define td_startcopy td_kse > > +#define td_startcopy td_endzero > > /* XXXKSE just copying td_md needs checking! */ > > - struct kse *td_kse; /* Current KSE if running. */ > > - struct thread_mailbox *td_mailbox; /* the userland mailbox address */ > > struct mdthread td_md; /* (k) Any machine-dependent fields. */ > > u_char td_base_pri; /* (j) Thread base kernel priority. */ > > u_char td_priority; /* (j) Thread active priority. */ > > -- > Jonathan Mini > http://www.freebsd.org/ > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 7 16:27:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC66737B405; Sat, 7 Sep 2002 16:27:48 -0700 (PDT) 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 6A61D37B400; Sat, 7 Sep 2002 16:27:48 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A66D43E42; Sat, 7 Sep 2002 16:27:48 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id D1168AE160; Sat, 7 Sep 2002 16:27:47 -0700 (PDT) Date: Sat, 7 Sep 2002 16:27:47 -0700 From: Jon Mini To: Julian Elischer Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 17195 for review Message-ID: <20020907232747.GT7265@elvis.mu.org> References: <20020907224557.GS7265@elvis.mu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > do you mind if I frame this :-) > (so I can send it to my parents) ;-) hahahaha. =) > On Sat, 7 Sep 2002, Jon Mini wrote: > > > Jon Mini [mini@freebsd.org] wrote : > > > > > These fields needs to be copied in order for thread_schedule_upcall() > > > to work. Either we need to copy them in the bcopy, or do it manually. > > > > > > The changes you've made cause upcalls to panic the system. > > > > Hmm. Upon further investigation, you're right (not surprising); > > those fields are copied and assigned later on in the upcall process. > > However, I am still getting some panics sometimes. I think this is > > due to something else, though. > > > > -- > > Jonathan Mini > > http://www.freebsd.org/ > > > -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 7 16:30:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB8BA37B406; Sat, 7 Sep 2002 16:30:17 -0700 (PDT) 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 3622237B400; Sat, 7 Sep 2002 16:30:17 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA1AB43E3B; Sat, 7 Sep 2002 16:30:16 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 7E71FAE165; Sat, 7 Sep 2002 16:30:16 -0700 (PDT) Date: Sat, 7 Sep 2002 16:30:16 -0700 From: Jon Mini Cc: Julian Elischer , Perforce Change Reviews Subject: Re: PERFORCE change 17195 for review Message-ID: <20020907233016.GU7265@elvis.mu.org> References: <20020907220528.GQ7265@elvis.mu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG No, you are totally right. On one field, I was confusing kses with threads, and on the other field, I was just smoking crack. The scary thing is that code actually worked on my machine. Oh, well. Please ignore my previous outburst. Julian Elischer [julian@elischer.org] wrote : > Copying them is definitly wrong. > the 'current KSE' field CAN NOT be set at that time > It must ONLY be set when a KSE as assigned to a thread. > until then it MUST BE NULL. (I depend on that) > > The thread mailbox address must ONLY be pointed to by the > thread to which it belongs. I also plan to put in KASSERTS > on this for certain cases, one of which blew up wit this change. > Only one thread can point to a particlar thread mailbox. > therefore on creation of a new thread that filed must be zero'd. > > > > On Sat, 7 Sep 2002, Jon Mini wrote: > > > Julian Elischer [julian@FreeBSD.org] wrote : > > > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17195 > > > > > > Change 17195 by julian@julian_desk on 2002/09/07 05:46:14 > > > > > > undo previous undo.. these fiedls are DEFINITLY not to be copied > > > but should be zero'd > > > > > > Julian, please do not revert my work without asking me first. > > I did not originally place those fields in those sections by accident.. > > > > > > These fields needs to be copied in order for thread_schedule_upcall() > > to work. Either we need to copy them in the bcopy, or do it manually. > > It does not make sense to COPY those fields If you think you need to > copy them then by definition you have mis-understood something! > > let's try 'talk' :-) (on freefall) > maybe we can figure out where the disconnect is.... > > > > > The changes you've made cause upcalls to panic the system. > > > > I don't want to get into a commit war, please let me change them > > to something that works. > > > > > Affected files ... > > > > > > .. //depot/projects/kse/sys/sys/proc.h#130 edit > > > > > > Differences ... > > > > > > ==== //depot/projects/kse/sys/sys/proc.h#130 (text+ko) ==== > > > > > > @@ -269,6 +269,7 @@ > > > #define td_startzero td_flags > > > int td_flags; /* (j) TDF_* flags. */ > > > struct kse *td_last_kse; /* Where it wants to be if possible. */ > > > + struct kse *td_kse; /* Current KSE if running. */ > > > int td_dupfd; /* (k) Ret value from fdopen. XXX */ > > > void *td_wchan; /* (j) Sleep address. */ > > > const char *td_wmesg; /* (j) Reason for sleep. */ > > > @@ -282,16 +283,15 @@ > > > LIST_HEAD(, mtx) td_contested; /* (j) Contested locks. */ > > > struct lock_list_entry *td_sleeplocks; /* (k) Held sleep locks. */ > > > int td_intr_nesting_level; /* (k) Interrupt recursion. */ > > > + struct thread_mailbox *td_mailbox; /* the userland mailbox address */ > > > struct ucred *td_ucred; /* (k) Reference to credentials. */ > > > void (*td_switchin)(void); /* (k) switchin special func */ > > > u_int td_critnest; /* (k) Critical section nest level. */ > > > -#define td_endzero td_kse > > > +#define td_endzero td_md > > > > > > /* Copied during fork1() or thread_sched_upcall() */ > > > -#define td_startcopy td_kse > > > +#define td_startcopy td_endzero > > > /* XXXKSE just copying td_md needs checking! */ > > > - struct kse *td_kse; /* Current KSE if running. */ > > > - struct thread_mailbox *td_mailbox; /* the userland mailbox address */ > > > struct mdthread td_md; /* (k) Any machine-dependent fields. */ > > > u_char td_base_pri; /* (j) Thread base kernel priority. */ > > > u_char td_priority; /* (j) Thread active priority. */ > > > > -- > > Jonathan Mini > > http://www.freebsd.org/ > > > -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 7 16:40:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 432CD37B409; Sat, 7 Sep 2002 16:40:13 -0700 (PDT) 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 2776C37B405; Sat, 7 Sep 2002 16:40:12 -0700 (PDT) Received: from sccrmhc01.attbi.com (sccrmhc01.attbi.com [204.127.202.61]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A75443E65; Sat, 7 Sep 2002 16:40:11 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org ([12.232.206.8]) by sccrmhc01.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020907234010.EPMN9751.sccrmhc01.attbi.com@InterJet.elischer.org>; Sat, 7 Sep 2002 23:40:10 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id QAA48832; Sat, 7 Sep 2002 16:26:57 -0700 (PDT) Date: Sat, 7 Sep 2002 16:26:56 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17212 for review In-Reply-To: <200209072319.g87NJum2099365@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG what's the backtrace? On Sat, 7 Sep 2002, Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17212 > > Change 17212 by mini@mini_stylus on 2002/09/07 16:19:49 > > Hold Giant while we allocate a thread. Jeffr says we needn't > hold Gian over any UMA operation, but I'm still getting > 'Giant not held' panics when we need to allocate a thread > here. > > Affected files ... > > .. //depot/projects/kse/sys/kern/kern_thread.c#106 edit > > Differences ... > > ==== //depot/projects/kse/sys/kern/kern_thread.c#106 (text+ko) ==== > > @@ -621,8 +621,11 @@ > /* > * Ensure that we have a spare thread available. > */ > - if (ke->ke_tdspare == NULL) > + if (ke->ke_tdspare == NULL) { > + mtx_lock(&Giant); > ke->ke_tdspare = thread_alloc(); > + mtx_unlock(&Giant); > + } > > /* > * Bound threads need no additional work. > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 7 17:10:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B549E37B401; Sat, 7 Sep 2002 17:10:33 -0700 (PDT) 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 40FCF37B400 for ; Sat, 7 Sep 2002 17:10:33 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id F136543E4A for ; Sat, 7 Sep 2002 17:10:24 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 326BCAE027; Sat, 7 Sep 2002 17:09:24 -0700 (PDT) Date: Sat, 7 Sep 2002 17:09:24 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17212 for review Message-ID: <20020908000924.GV7265@elvis.mu.org> References: <200209072319.g87NJum2099365@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > what's the backtrace? I haven't got a serial console (grrr), so I had to copy this down on paper. The panic is 'Giant not owned at ../../vm/vm_map.c:364' : Debugger() panic() _mtx_assert() _vm_map_lock() _vm_map_find() _kmem_alloc_nofault() pmap_new_thread() thread_init() slab_zalloc() uma_internal() uma_zalloc_arg() thread_alloc() thread_userret() userret() --- fork_return() fork_exit() fork_trampoline() The fork_trampoline stuff is totally bogus. We see this because the values were inited like fork does (in cpu_set_upcall()), but haven't been overriden yet for the upcall. Hmm. It looks like maybe we should be holding Giant inside pmap_new_thread(). Today does not seem to by my day; I am jumping way to quickly. I think it's time for a break. I'll see you tomorrow, or maybe later this evening. > On Sat, 7 Sep 2002, Jonathan Mini wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17212 > > > > Change 17212 by mini@mini_stylus on 2002/09/07 16:19:49 > > > > Hold Giant while we allocate a thread. Jeffr says we needn't > > hold Gian over any UMA operation, but I'm still getting > > 'Giant not held' panics when we need to allocate a thread > > here. > > > > Affected files ... > > > > .. //depot/projects/kse/sys/kern/kern_thread.c#106 edit > > > > Differences ... > > > > ==== //depot/projects/kse/sys/kern/kern_thread.c#106 (text+ko) ==== > > > > @@ -621,8 +621,11 @@ > > /* > > * Ensure that we have a spare thread available. > > */ > > - if (ke->ke_tdspare == NULL) > > + if (ke->ke_tdspare == NULL) { > > + mtx_lock(&Giant); > > ke->ke_tdspare = thread_alloc(); > > + mtx_unlock(&Giant); > > + } > > > > /* > > * Bound threads need no additional work. > > > -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 7 21:56: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8846737B401; Sat, 7 Sep 2002 21:55:55 -0700 (PDT) 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 25D7237B400 for ; Sat, 7 Sep 2002 21:55:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB59C43E65 for ; Sat, 7 Sep 2002 21:55:54 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g884tsJU046828 for ; Sat, 7 Sep 2002 21:55:54 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g884tstv046825 for perforce@freebsd.org; Sat, 7 Sep 2002 21:55:54 -0700 (PDT) Date: Sat, 7 Sep 2002 21:55:54 -0700 (PDT) Message-Id: <200209080455.g884tstv046825@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17224 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17224 Change 17224 by mini@mini_stylus on 2002/09/07 21:55:17 Tighten our grab for Giant from around UMA to just around the vm object allocation. Affected files ... .. //depot/projects/kse/sys/kern/kern_thread.c#107 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_thread.c#107 (text+ko) ==== @@ -155,7 +155,9 @@ ("size mismatch: %d != %d\n", size, (int)sizeof(struct thread))); td = (struct thread *)mem; + mtx_lock(&Giant); pmap_new_thread(td); + mtx_unlock(&Giant); cpu_thread_setup(td); cached_threads++; /* XXXSMP */ allocated_threads++; /* XXXSMP */ @@ -456,9 +458,7 @@ ke->ke_tdspare = NULL; } else { mtx_unlock_spin(&sched_lock); - mtx_lock(&Giant); td2 = thread_alloc(); - mtx_unlock(&Giant); mtx_lock_spin(&sched_lock); } CTR3(KTR_PROC, "thread_schedule_upcall: thread %p (pid %d, %s)", To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 8 1:45:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C0C037B401; Sun, 8 Sep 2002 01:45:16 -0700 (PDT) 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 1BB9737B400 for ; Sun, 8 Sep 2002 01:45:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B05CA43E4A for ; Sun, 8 Sep 2002 01:45:15 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g888jFJU080531 for ; Sun, 8 Sep 2002 01:45:15 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g888jFsL080528 for perforce@freebsd.org; Sun, 8 Sep 2002 01:45:15 -0700 (PDT) Date: Sun, 8 Sep 2002 01:45:15 -0700 (PDT) Message-Id: <200209080845.g888jFsL080528@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17228 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17228 Change 17228 by mini@mini_stylus on 2002/09/08 01:45:11 Use a thread_mailbox instead of a ucontext_t to store thread state. Affected files ... .. //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#8 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_create.c#5 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#6 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#7 edit Differences ... ==== //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#8 (text+ko) ==== @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -511,7 +512,7 @@ /* * Machine context, including signal state. */ - ucontext_t ctx; + struct thread_mailbox mailbox; /* * Cancelability flags - the lower 2 bits are used by cancel ==== //depot/projects/kse/lib/libc_r/uthread/uthread_create.c#5 (text+ko) ==== @@ -50,7 +50,7 @@ int _thread_uniqueid_offset = OFF(uniqueid); int _thread_state_offset = OFF(state); int _thread_name_offset = OFF(name); -int _thread_ctx_offset = OFF(ctx); +int _thread_ctx_offset = OFF(mailbox.tm_context); #undef OFF int _thread_PS_RUNNING_value = PS_RUNNING; @@ -122,11 +122,13 @@ new_thread->magic = PTHREAD_MAGIC; /* Initialise the machine context: */ - getcontext(&new_thread->ctx); - new_thread->ctx.uc_stack.ss_sp = new_thread->stack; - new_thread->ctx.uc_stack.ss_size = + getcontext(&new_thread->mailbox.tm_context); + new_thread->mailbox.tm_context.uc_stack.ss_sp = new_thread->stack; + new_thread->mailbox.tm_context.uc_stack.ss_size = pattr->stacksize_attr; - makecontext(&new_thread->ctx, _thread_start, 1); + makecontext(&new_thread->mailbox.tm_context, + _thread_start, 1); + new_thread->mailbox.tm_udata = (void *)new_thread; /* Copy the thread attributes: */ memcpy(&new_thread->attr, pattr, sizeof(struct pthread_attr)); ==== //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#6 (text+ko) ==== @@ -287,7 +287,7 @@ PTHREAD_CANCEL_DEFERRED; /* Setup the context for initial thread. */ - getcontext(&_thread_initial->ctx); + getcontext(&_thread_initial->mailbox.tm_context); _thread_kern_sched_ctx.uc_stack.ss_sp = _thread_initial->stack; _thread_kern_sched_ctx.uc_stack.ss_size = PTHREAD_STACK_INITIAL; ==== //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#7 (text+ko) ==== @@ -83,7 +83,7 @@ _thread_kern_in_sched = 1; /* Switch into the scheduler's context. */ - swapcontext(&curthread->ctx, &_thread_kern_sched_ctx); + swapcontext(&curthread->mailbox.tm_context, &_thread_kern_sched_ctx); DBG_MSG("Returned from swapcontext, thread %p\n", curthread); /* @@ -385,7 +385,8 @@ /* * Continue the thread at its current frame: */ - swapcontext(&_thread_kern_sched_ctx, &curthread->ctx); + swapcontext(&_thread_kern_sched_ctx, + &curthread->mailbox.tm_context); } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 8 3:28:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2102E37B401; Sun, 8 Sep 2002 03:28:21 -0700 (PDT) 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 8AE3937B400 for ; Sun, 8 Sep 2002 03:28:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 383D743E42 for ; Sun, 8 Sep 2002 03:28:20 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g88ASKJU097593 for ; Sun, 8 Sep 2002 03:28:20 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g88ASJGR097590 for perforce@freebsd.org; Sun, 8 Sep 2002 03:28:19 -0700 (PDT) Date: Sun, 8 Sep 2002 03:28:19 -0700 (PDT) Message-Id: <200209081028.g88ASJGR097590@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17230 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17230 Change 17230 by mini@mini_stylus on 2002/09/08 03:27:45 Add logic to switch back into the UTS from a thread. Affected files ... .. //depot/projects/kse/tools/KSE/uts/context.S#2 edit .. //depot/projects/kse/tools/KSE/uts/uts.c#8 edit Differences ... ==== //depot/projects/kse/tools/KSE/uts/context.S#2 (text+ko) ==== @@ -33,23 +33,14 @@ #define MC_SIZE 640 /* sizeof mcontext_t */ #define UC_MC_OFFSET 16 /* offset to mcontext from ucontext */ #define UC_MC_LEN_OFFSET 96 /* offset to mc_len from mcontext */ -#define UC_FLAGS_OFFSET 676 /* offset to uc_flags from ucontext */ -#define MC_FLAGS_OFFSET 660 /* offset to uc_flags from ucontext */ -#define MC_BUSY_OFFSET 656 /* offset to uc_busy from ucontext */ #define MC_LEN_OFFSET 80 /* offset to mc_len from mcontext */ #define MC_FP_REGS_OFFSET 96 /* offset to FP regs from mcontext */ #define MC_FP_CW_OFFSET 96 /* offset to FP control word */ #define MC_OWNEDFP_OFFSET 88 /* offset to mc_ownedfp from mcontext */ -#define UCF_SKIPSIGMASK 0x00000001 /* Don't set/restore signal mask. */ -#define UCF_OBEYBUSY 0x00000002 /* Respect uc_busy marker. */ -#define UCF_SWAPPED 0x00000080 /* Used by swapcontext(3). */ -#define UCF_CRITICAL 0x00000200 /* In a critical section. */ -#define UCF_CLEARSTATE 0x00000400 /* Clear UCF_STATE in setcontext. */ -#define UCF_STATE 0x0000ff00 /* State-related flags. */ -#define UCF_OPTIONS 0x000000ff /* Behaviour-related flags. */ - +#define KM_STACK_SP_OFFSET 32 /* offset to km_stack.ss_sp */ +#define KM_STACK_SIZE_OFFSET 36 /* offset to km_stack.ss_sp */ +#define KM_FUNC_OFFSET 28 /* offset to km_func */ - /* * int uts_to_thread(thread_mailbox *tdp, thread_mailbox **curthreadp); * @@ -99,39 +90,19 @@ popf /* flags off stack */ 5: ret /* %eip off stack */ -#if 0 - /* - * We'll convert this into a enter_uts() call later. - */ /* - * int getcontext(ucontext_t *ucp); + * int thread_to_uts(thread_mailbox *tm, kse_mailbox *km); * - * calls sigprocmask(int how, sigset_t *set, sigset_t *oset); - * - * Returns 0 if there are no errors; -1 otherwise + * Does not return on success, returns -1 otherwise. */ - .weak CNAME(getcontext) - .set CNAME(getcontext),CNAME(__getcontext) -ENTRY(__getcontext) +ENTRY(thread_to_uts) movl 4(%esp), %eax /* get address of context */ cmpl $0, %eax /* check for null pointer */ jne 1f movl $-1, %eax - jmp 3f - movl 4(%esp), %eax /* get address of context and sigset */ -1: testl $UCF_SKIPSIGMASK, UC_FLAGS_OFFSET(%eax) /* Save sigmask? */ - jnz 2f - PIC_PROLOGUE - pushl %eax /* oset = &ucp->uc_sigmask */ - pushl $0 /* set = NULL */ - pushl $3 /* how = SIG_SETMASK */ - call PIC_PLT(CNAME(_sigprocmask)) - addl $12, %esp - PIC_EPILOGUE - testl %eax, %eax /* check for error */ - jnz 3f -2: pushl %edx /* save value of edx */ - movl 8(%esp), %edx /* get address of context */ + jmp 2f +1: pushl %edx /* save value of edx */ + movl %eax, %edx /* get address of context */ addl $UC_MC_OFFSET, %edx /* add offset to mcontext */ movl %gs, 4(%edx) movl %fs, 8(%edx) @@ -164,7 +135,12 @@ addl $4, %eax /* address onto the top of the */ movl %eax, 72(%edx) /* stack; account for this */ movl $MC_SIZE, MC_LEN_OFFSET(%edx) /* context is now valid */ - movl 40(%edx), %edx /* restore edx -- is this needed? */ - xorl %eax, %eax /* return 0 */ -3: ret -#endif + movl 8(%esp), %edx /* get address of mailbox */ + movl KM_STACK_SP_OFFSET(%edx), %eax /* get bottom of stack */ + addl KM_STACK_SIZE_OFFSET(%edx), %eax /* add length */ + movl %eax, %esp /* switch to the uts's stack */ + pushl %edx /* push the address of the mailbox */ + pushl KM_FUNC_OFFSET(%edx) /* .. the uts can return to itself */ + pushl KM_FUNC_OFFSET(%edx) /* push the address of the uts func */ +2: ret + ==== //depot/projects/kse/tools/KSE/uts/uts.c#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#7 $ + * $P4: //depot/projects/kse/tools/KSE/uts/uts.c#8 $ */ #include @@ -63,6 +63,7 @@ static int progress = 0; static void init_uts(void); +static void enter_uts(void); static void pchar(char c); static void pfmt(const char *fmt, ...); static void pstr(const char *s); @@ -80,29 +81,30 @@ struct timespec time_remaining; time_to_sleep.tv_sec = 0; - time_to_sleep.tv_nsec = len * 1000; + time_to_sleep.tv_nsec = len * 10000; nanosleep(&time_to_sleep, &time_remaining); } -static void -foof(int sig) -{ - pfmt("\n[%d]\n", sig); -} - void aaaa(int c) { for (;;) { - // pchar(c); + pchar(c); nano(1); } } +static void +foof(int sig) +{ + pfmt("\n[%d]\n", sig); + thread_start(aaaa, '0' + progress++); +} + void spin(int arg) { - for (;;) sched_yield(); + for (;;) enter_uts(); sched_yield(); } /* @@ -113,19 +115,35 @@ { int i; - thread_start(aaaa, '.'); + thread_start(spin, '.'); // thread_start(spin); init_uts(); for (i = 0;1;i++) { // if (i < 1000) // thread_start(aaaa, 'a' + (i % 26)); - // pchar('A' + (i % 26)); - nano(1); + pchar('A' + (i % 26)); + nano(5); } pstr("\n** main() exiting **\n"); return (EX_OK); } + +/* + * Enter the UTS from a thread. + */ +static void +enter_uts(void) +{ + struct thread_mailbox *td; + + /* XXX: We should atomically exchange these two. */ + td = uts_mb.km_curthread; + uts_mb.km_curthread = NULL; + + thread_to_uts(td, &uts_mb); +} + /* * Initialise threading. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 8 4:20:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 721C137B401; Sun, 8 Sep 2002 04:20:08 -0700 (PDT) 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 832D137B400; Sun, 8 Sep 2002 04:20:07 -0700 (PDT) Received: from rwcrmhc51.attbi.com (rwcrmhc51.attbi.com [204.127.198.38]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5CD243E42; Sun, 8 Sep 2002 04:20:06 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc51.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020908112006.GJRT19682.rwcrmhc51.attbi.com@InterJet.elischer.org>; Sun, 8 Sep 2002 11:20:06 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id EAA51153; Sun, 8 Sep 2002 04:08:24 -0700 (PDT) Date: Sun, 8 Sep 2002 04:08:24 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17230 for review In-Reply-To: <200209081028.g88ASJGR097590@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, 8 Sep 2002, Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17230 > > Change 17230 by mini@mini_stylus on 2002/09/08 03:27:45 > > Add logic to switch back into the UTS from a thread. > > Affected files ... it's looking good.... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 8 18:43:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C929137B401; Sun, 8 Sep 2002 18:42:18 -0700 (PDT) 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 4FC7C37B400 for ; Sun, 8 Sep 2002 18:42:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABD5E43E72 for ; Sun, 8 Sep 2002 18:42:17 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g891gHJU059269 for ; Sun, 8 Sep 2002 18:42:17 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g891gH8o059266 for perforce@freebsd.org; Sun, 8 Sep 2002 18:42:17 -0700 (PDT) Date: Sun, 8 Sep 2002 18:42:17 -0700 (PDT) Message-Id: <200209090142.g891gH8o059266@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17248 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17248 Change 17248 by mini@mini_stylus on 2002/09/08 18:41:19 Switch over to KSE-style scheduling primitives, but don't actually use KSE yet. Affected files ... .. //depot/projects/kse/lib/libc_r/arch/i386/_thread_enter_uts.S#1 add .. //depot/projects/kse/lib/libc_r/arch/i386/_thread_switch.S#1 add .. //depot/projects/kse/lib/libc_r/sys/Makefile.inc#2 edit .. //depot/projects/kse/lib/libc_r/uthread/Makefile.inc#6 edit .. //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#9 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_create.c#6 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#7 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#8 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_priority_queue.c#3 edit Differences ... ==== //depot/projects/kse/lib/libc_r/sys/Makefile.inc#2 (text+ko) ==== @@ -2,5 +2,5 @@ .PATH: ${.CURDIR}/sys ${.CURDIR}/arch/${MACHINE_ARCH} -SRCS+= uthread_error.c _atomic_lock.S +SRCS+= uthread_error.c _atomic_lock.S _thread_enter_uts.S _thread_switch.S ==== //depot/projects/kse/lib/libc_r/uthread/Makefile.inc#6 (text+ko) ==== @@ -63,6 +63,7 @@ uthread_pause.c \ uthread_poll.c \ uthread_priority_queue.c \ + uthread_printf.c \ uthread_pselect.c \ uthread_read.c \ uthread_readv.c \ ==== //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#9 (text+ko) ==== @@ -68,18 +68,8 @@ /* Output debug messages like this: */ -#define stdout_debug(args...) do { \ - char buf[128]; \ - snprintf(buf, sizeof(buf), ##args); \ - __sys_write(1, buf, strlen(buf)); \ -} while (0) -#define stderr_debug(args...) do { \ - char buf[128]; \ - snprintf(buf, sizeof(buf), ##args); \ - __sys_write(2, buf, strlen(buf)); \ -} while (0) - - +#define stdout_debug(args...) _thread_printf( args ) +#define stderr_debug(args...) _thread_printf( args ) /* * Priority queue manipulation macros (using pqe link): @@ -704,13 +694,6 @@ ; #endif -SCLASS int _thread_kern_in_sched -#ifdef GLOBAL_PTHREAD_PRIVATE -= 0; -#else -; -#endif - /* Time of day at last scheduling timer signal: */ SCLASS struct timeval volatile _sched_tod #ifdef GLOBAL_PTHREAD_PRIVATE @@ -818,7 +801,7 @@ /* * Declare the kernel scheduler jump buffer and stack: */ -SCLASS ucontext_t _thread_kern_sched_ctx; +SCLASS struct kse_mailbox _thread_kern_kse_mailbox; SCLASS void * _thread_kern_sched_stack #ifdef GLOBAL_PTHREAD_PRIVATE @@ -891,15 +874,18 @@ void _thread_dump_info(void); void _thread_init(void); void _thread_kern_sched(void); -void _thread_kern_scheduler(void); +void _thread_kern_scheduler(struct kse_mailbox *); void _thread_kern_sched_state(enum pthread_state, char *fname, int lineno); void _thread_kern_sched_state_unlock(enum pthread_state state, spinlock_t *lock, char *fname, int lineno); void _thread_kern_set_timeout(const struct timespec *); void _thread_kern_sig_defer(void); void _thread_kern_sig_undefer(void); +void _thread_printf(const char *, ...); void _thread_start(void); void _thread_seterrno(pthread_t, int); +int _thread_enter_uts(struct thread_mailbox *tm, struct kse_mailbox *km); +int _thread_switch(struct thread_mailbox *, struct thread_mailbox **); pthread_addr_t _thread_gc(pthread_addr_t); void _thread_enter_cancellation_point(void); void _thread_leave_cancellation_point(void); ==== //depot/projects/kse/lib/libc_r/uthread/uthread_create.c#6 (text+ko) ==== @@ -232,9 +232,6 @@ { struct pthread *curthread = _get_curthread(); - /* We just left the scheduler via swapcontext: */ - _thread_kern_in_sched = 0; - /* Run the current thread's start routine with argument: */ pthread_exit(curthread->start_routine(curthread->arg)); ==== //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#7 (text+ko) ==== @@ -267,15 +267,12 @@ _thread_initial->attr.stacksize_attr = PTHREAD_STACK_INITIAL; /* Setup the context for the scheduler: */ - getcontext(&_thread_kern_sched_ctx); - _thread_kern_sched_ctx.uc_stack.ss_sp = + _thread_kern_kse_mailbox.km_stack.ss_sp = _thread_kern_sched_stack; - _thread_kern_sched_ctx.uc_stack.ss_size = sched_stack_size; - makecontext(&_thread_kern_sched_ctx, _thread_kern_scheduler, 1); + _thread_kern_kse_mailbox.km_stack.ss_size = sched_stack_size; + _thread_kern_kse_mailbox.km_func = + (void *)_thread_kern_scheduler; - /* Block all signals to the scheduler's context. */ - sigfillset(&_thread_kern_sched_ctx.uc_sigmask); - /* * Write a magic value to the thread structure * to help identify valid ones: @@ -288,8 +285,10 @@ /* Setup the context for initial thread. */ getcontext(&_thread_initial->mailbox.tm_context); - _thread_kern_sched_ctx.uc_stack.ss_sp = _thread_initial->stack; - _thread_kern_sched_ctx.uc_stack.ss_size = PTHREAD_STACK_INITIAL; + _thread_initial->mailbox.tm_context.uc_stack.ss_sp = + _thread_initial->stack; + _thread_initial->mailbox.tm_context.uc_stack.ss_size = + PTHREAD_STACK_INITIAL; /* Default the priority of the initial thread: */ _thread_initial->base_priority = PTHREAD_DEFAULT_PRIORITY; ==== //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#8 (text+ko) ==== @@ -1,4 +1,5 @@ /* + * Copyright (c) 2002 Jonathan Mini * Copyright (c) 1995-1998 John Birrell * All rights reserved. * @@ -57,6 +58,7 @@ #define DBG_MSG(x...) #endif + /* Static function prototype definitions: */ static void thread_kern_idle(void); @@ -73,27 +75,137 @@ void _thread_kern_sched(void) { + struct timespec ts; + struct timeval tv; struct pthread *curthread = _get_curthread(); + unsigned int current_tick; + + /* Get the current time of day. */ + GET_CURRENT_TOD(tv); + TIMEVAL_TO_TIMESPEC(&tv, &ts); + current_tick = _sched_ticks; /* - * Flag the pthread kernel as executing scheduler code - * to avoid a scheduler signal from interrupting this - * execution and calling the scheduler again. + * Enter a critical section. + */ + _thread_kern_kse_mailbox.km_curthread = NULL; + + /* + * If this thread is becoming inactive, make note of the + * time. + */ + if (curthread->state != PS_RUNNING) { + /* + * Save the current time as the time that the + * thread became inactive: + */ + curthread->last_inactive = (long)current_tick; + if (curthread->last_inactive < + curthread->last_active) { + /* Account for a rollover: */ + curthread->last_inactive =+ + UINT_MAX + 1; + } + } + + /* + * Place this thread into the appropriate queue(s). */ - _thread_kern_in_sched = 1; + switch (curthread->state) { + case PS_DEAD: + case PS_STATE_MAX: /* XXX: silences -Wall */ + case PS_SUSPENDED: + /* Dead or suspended threads are not placed in any queue. */ + break; + case PS_RUNNING: + /* + * Save the current time as the time that the + * thread became inactive: + */ + current_tick = _sched_ticks; + curthread->last_inactive = (long)current_tick; + if (curthread->last_inactive < + curthread->last_active) { + /* Account for a rollover: */ + curthread->last_inactive =+ UINT_MAX + 1; + } + + if ((curthread->slice_usec != -1) && + (curthread->attr.sched_policy != SCHED_FIFO)) { + /* + * Accumulate the number of microseconds for + * which the current thread has run: + */ + curthread->slice_usec += + (curthread->last_inactive - + curthread->last_active) * + (long)_clock_res_usec; + /* Check for time quantum exceeded: */ + if (curthread->slice_usec > TIMESLICE_USEC) + curthread->slice_usec = -1; + } + + if (curthread->slice_usec == -1) { + /* + * The thread exceeded its time + * quantum or it yielded the CPU; + * place it at the tail of the + * queue for its priority. + */ + PTHREAD_PRIOQ_INSERT_TAIL(curthread); + } else { + /* + * The thread hasn't exceeded its + * interval. Place it at the head + * of the queue for its priority. + */ + PTHREAD_PRIOQ_INSERT_HEAD(curthread); + } + break; + case PS_SPINBLOCK: + /* Increment spinblock count. */ + _spinblock_count++; + /*FALLTHROUGH*/ + case PS_DEADLOCK: + case PS_JOIN: + case PS_MUTEX_WAIT: + case PS_WAIT_WAIT: + /* No timeouts for these states. */ + curthread->wakeup_time.tv_sec = -1; + curthread->wakeup_time.tv_nsec = -1; + + /* Restart the time slice. */ + curthread->slice_usec = -1; + + /* Insert into the waiting queue. */ + PTHREAD_WAITQ_INSERT(curthread); + break; + + case PS_COND_WAIT: + case PS_SLEEP_WAIT: + /* These states can timeout. */ + /* Restart the time slice. */ + curthread->slice_usec = -1; + + /* Insert into the waiting queue. */ + PTHREAD_WAITQ_INSERT(curthread); + break; + } /* Switch into the scheduler's context. */ - swapcontext(&curthread->mailbox.tm_context, &_thread_kern_sched_ctx); - DBG_MSG("Returned from swapcontext, thread %p\n", curthread); + DBG_MSG("Calling _thread_enter_uts()\n"); + _thread_enter_uts(&curthread->mailbox, &_thread_kern_kse_mailbox); + DBG_MSG("Returned from _thread_enter_uts, thread %p\n", curthread); /* - * This point is reached when swapcontext() is called + * This point is reached when _thread_switch() is called * to restore the state of a thread. * - * This is the normal way out of the scheduler. + * This is the normal way out of the scheduler (for synchronous + * switches). */ - _thread_kern_in_sched = 0; + /* XXXKSE: Do this inside _thread_kern_scheduler() */ if (curthread->sig_defer_count == 0) { if (((curthread->cancelflags & PTHREAD_AT_CANCEL_POINT) == 0) && @@ -114,128 +226,50 @@ /* Run the installed switch hook: */ thread_run_switch_hook(_last_user_thread, curthread); } + DBG_MSG("Fuck me\n"); } void -_thread_kern_scheduler(void) +_thread_kern_scheduler(struct kse_mailbox *km) { struct timespec ts; struct timeval tv; - struct pthread *curthread = _get_curthread(); - pthread_t pthread, pthread_h; + pthread_t td, pthread, pthread_h; unsigned int current_tick; - int add_to_prioq; + struct thread_mailbox *tm, *p; - /* - * Enter a scheduling loop that finds the next thread that is - * ready to run. This loop completes when there are no more threads - * in the global list. It is interrupted each time a thread is - * scheduled, but will continue when we return. - */ - while (!(TAILQ_EMPTY(&_thread_list))) { + DBG_MSG("entering\n"); + while (!TAILQ_EMPTY(&_thread_list)) { - /* If the currently running thread is a user thread, save it: */ - if ((curthread->flags & PTHREAD_FLAGS_PRIVATE) == 0) - _last_user_thread = curthread; - - /* Get the current time of day: */ + /* Get the current time of day. */ GET_CURRENT_TOD(tv); TIMEVAL_TO_TIMESPEC(&tv, &ts); current_tick = _sched_ticks; - add_to_prioq = 0; - if (curthread != &_thread_kern_thread) { - /* - * This thread no longer needs to yield the CPU. - */ - if (curthread->state != PS_RUNNING) { - /* - * Save the current time as the time that the - * thread became inactive: - */ - curthread->last_inactive = (long)current_tick; - if (curthread->last_inactive < - curthread->last_active) { - /* Account for a rollover: */ - curthread->last_inactive =+ - UINT_MAX + 1; - } - } - - /* - * Place the currently running thread into the - * appropriate queue(s). - */ - switch (curthread->state) { - case PS_DEAD: - case PS_STATE_MAX: /* to silence -Wall */ - case PS_SUSPENDED: - /* - * Dead and suspended threads are not placed - * in any queue: - */ - break; - - case PS_RUNNING: - /* - * Runnable threads can't be placed in the - * priority queue until after waiting threads - * are polled (to preserve round-robin - * scheduling). - */ - add_to_prioq = 1; - break; - - /* - * States which do not depend on file descriptor I/O - * operations or timeouts: - */ - case PS_DEADLOCK: - case PS_JOIN: - case PS_MUTEX_WAIT: - case PS_WAIT_WAIT: - /* No timeouts for these states: */ - curthread->wakeup_time.tv_sec = -1; - curthread->wakeup_time.tv_nsec = -1; - - /* Restart the time slice: */ - curthread->slice_usec = -1; - - /* Insert into the waiting queue: */ - PTHREAD_WAITQ_INSERT(curthread); - break; - - /* States which can timeout: */ - case PS_COND_WAIT: - case PS_SLEEP_WAIT: - /* Restart the time slice: */ - curthread->slice_usec = -1; - - /* Insert into the waiting queue: */ - PTHREAD_WAITQ_INSERT(curthread); - break; - - /* States that require periodic work: */ - case PS_SPINBLOCK: - /* No timeouts for this state: */ - curthread->wakeup_time.tv_sec = -1; - curthread->wakeup_time.tv_nsec = -1; - - /* Increment spinblock count: */ - _spinblock_count++; - - /* FALLTHROUGH */ - } + /* + * Pick up threads that had blocked in the kernel and + * have now completed their trap (syscall, vm fault, etc). + * These threads were PS_RUNNING (and still are), but they + * need to be added to the run queue so that they can be + * scheduled again. + */ + DBG_MSG("Picking up km_completed\n"); + p = km->km_completed; + km->km_completed = NULL; /* XXX: Atomic xchg here. */ + while ((tm = p) != NULL) { + p = tm->tm_next; + tm->tm_next = NULL; + PTHREAD_PRIOQ_INSERT_TAIL((pthread_t)tm->tm_udata); } - last_tick = current_tick; + /* Deliver posted signals. */ + /* XXX: Not yet. */ + DBG_MSG("Picking up signals\n"); - /* - * Wake up threads that have timedout. This has to be - * done after polling in case a thread does a poll or - * select with zero time. - */ + /* Wake up threads that have timed out. */ + DBG_MSG("setactive\n"); PTHREAD_WAITQ_SETACTIVE(); + DBG_MSG("Picking up timeouts (%x)\n", TAILQ_FIRST(&_waitingq)); while (((pthread = TAILQ_FIRST(&_waitingq)) != NULL) && (pthread->wakeup_time.tv_sec != -1) && (((pthread->wakeup_time.tv_sec == 0) && @@ -243,6 +277,7 @@ (pthread->wakeup_time.tv_sec < ts.tv_sec) || ((pthread->wakeup_time.tv_sec == ts.tv_sec) && (pthread->wakeup_time.tv_nsec <= ts.tv_nsec)))) { + DBG_MSG("\t...\n"); /* * Remove this thread from the waiting queue * (and work queue if necessary) and place it @@ -251,6 +286,7 @@ PTHREAD_WAITQ_CLEARACTIVE(); if (pthread->flags & PTHREAD_FLAGS_IN_WORKQ) PTHREAD_WORKQ_REMOVE(pthread); + DBG_MSG("\twaking thread\n"); PTHREAD_NEW_STATE(pthread, PS_RUNNING); PTHREAD_WAITQ_SETACTIVE(); /* @@ -258,119 +294,39 @@ */ pthread->timeout = 1; } + DBG_MSG("clearactive\n"); PTHREAD_WAITQ_CLEARACTIVE(); /* - * Check to see if the current thread needs to be added - * to the priority queue: - */ - if (add_to_prioq != 0) { - /* - * Save the current time as the time that the - * thread became inactive: - */ - current_tick = _sched_ticks; - curthread->last_inactive = (long)current_tick; - if (curthread->last_inactive < - curthread->last_active) { - /* Account for a rollover: */ - curthread->last_inactive =+ UINT_MAX + 1; - } - - if ((curthread->slice_usec != -1) && - (curthread->attr.sched_policy != SCHED_FIFO)) { - /* - * Accumulate the number of microseconds for - * which the current thread has run: - */ - curthread->slice_usec += - (curthread->last_inactive - - curthread->last_active) * - (long)_clock_res_usec; - /* Check for time quantum exceeded: */ - if (curthread->slice_usec > TIMESLICE_USEC) - curthread->slice_usec = -1; - } - - if (curthread->slice_usec == -1) { - /* - * The thread exceeded its time - * quantum or it yielded the CPU; - * place it at the tail of the - * queue for its priority. - */ - PTHREAD_PRIOQ_INSERT_TAIL(curthread); - } else { - /* - * The thread hasn't exceeded its - * interval. Place it at the head - * of the queue for its priority. - */ - PTHREAD_PRIOQ_INSERT_HEAD(curthread); - } - } - - /* * Get the highest priority thread in the ready queue. */ + DBG_MSG("Selecting thread\n"); pthread_h = PTHREAD_PRIOQ_FIRST(); /* Check if there are no threads ready to run: */ - if (pthread_h == NULL) { - /* - * Lock the pthread kernel by changing the pointer to - * the running thread to point to the global kernel - * thread structure: - */ - _set_curthread(&_thread_kern_thread); - curthread = &_thread_kern_thread; - - DBG_MSG("No runnable threads, using kernel thread %p\n", - curthread); - - /* - * There are no threads ready to run, so wait until - * something happens that changes this condition: - */ - thread_kern_idle(); - - /* - * This process' usage will likely be very small - * while waiting in a poll. Since the scheduling - * clock is based on the profiling timer, it is - * unlikely that the profiling timer will fire - * and update the time of day. To account for this, - * get the time of day after polling with a timeout. - */ - gettimeofday((struct timeval *) &_sched_tod, NULL); - - /* Check once more for a runnable thread: */ - pthread_h = PTHREAD_PRIOQ_FIRST(); - } - - if (pthread_h != NULL) { + if (pthread_h) { + DBG_MSG("Scheduling thread\n"); /* Remove the thread from the ready queue: */ PTHREAD_PRIOQ_REMOVE(pthread_h); /* Make the selected thread the current thread: */ _set_curthread(pthread_h); - curthread = pthread_h; /* * Save the current time as the time that the thread * became active: */ current_tick = _sched_ticks; - curthread->last_active = (long) current_tick; + pthread_h->last_active = (long) current_tick; /* * Check if this thread is running for the first time * or running again after using its full time slice * allocation: */ - if (curthread->slice_usec == -1) { + if (pthread_h->slice_usec == -1) { /* Reset the accumulated time slice period: */ - curthread->slice_usec = 0; + pthread_h->slice_usec = 0; } /* @@ -378,19 +334,47 @@ * installed switch hooks. */ if ((_sched_switch_hook != NULL) && - (_last_user_thread != curthread)) { + (_last_user_thread != pthread_h)) { thread_run_switch_hook(_last_user_thread, - curthread); + pthread_h); } /* * Continue the thread at its current frame: */ - swapcontext(&_thread_kern_sched_ctx, - &curthread->mailbox.tm_context); + _last_user_thread = td; + DBG_MSG("switch in\n"); + _thread_switch(&pthread_h->mailbox, + &_thread_kern_kse_mailbox.km_curthread); + DBG_MSG("switch out\n"); + } else { + /* + * There is nothing for us to do. Either + * yield, or idle until something wakes up. + */ + DBG_MSG("No runnable threads, idling.\n"); + + /* + * kse_yield() only returns if we are the + * only thread in this process. If so, then + * we drop into an idle loop. + */ + kse_yield(); + thread_kern_idle(); + + /* + * This thread's usage will likely be very small + * while waiting in a poll. Since the scheduling + * clock is based on the profiling timer, it is + * unlikely that the profiling timer will fire + * and update the time of day. To account for this, + * get the time of day after polling with a timeout. + */ + gettimeofday((struct timeval *) &_sched_tod, NULL); } + DBG_MSG("looping\n"); } - - /* There are no more threads, so exit this process: */ + /* There are no threads; exit. */ + DBG_MSG("No threads, exiting.\n"); exit(0); } @@ -401,10 +385,10 @@ /* * Flag the pthread kernel as executing scheduler code - * to avoid a scheduler signal from interrupting this - * execution and calling the scheduler again. + * to avoid an upcall from interrupting this execution + * and calling the scheduler again. */ - _thread_kern_in_sched = 1; + _thread_kern_kse_mailbox.km_curthread = NULL; /* Change the state of the current thread: */ curthread->state = state; @@ -423,10 +407,10 @@ /* * Flag the pthread kernel as executing scheduler code - * to avoid a scheduler signal from interrupting this - * execution and calling the scheduler again. + * to avoid an upcall from interrupting this execution + * and calling the scheduler again. */ - _thread_kern_in_sched = 1; + _thread_kern_kse_mailbox.km_curthread = NULL; /* Change the state of the current thread: */ curthread->state = state; @@ -439,6 +423,13 @@ _thread_kern_sched(); } +/* + * XXX - What we need to do here is schedule ourselves an idle thread, + * which does the poll()/nanosleep()/whatever, and then will cause an + * upcall when it expires. This thread never gets inserted into the + * run_queue (in fact, there's no need for it to be a thread at all). + * timeout period has arrived. + */ static void thread_kern_idle() { @@ -460,6 +451,8 @@ /* * Either there are no threads in the waiting queue, * or there are no threads that can timeout. + * + * XXX: kse_yield() here, maybe? */ PANIC("Would idle forever"); } ==== //depot/projects/kse/lib/libc_r/uthread/uthread_priority_queue.c#3 (text+ko) ==== @@ -68,9 +68,9 @@ if (((thrd)->flags & _PQ_IN_SCHEDQ) != 0) \ PANIC(msg); \ } while (0) -#define _PQ_ASSERT_PROTECTED(msg) \ - PTHREAD_ASSERT((_thread_kern_in_sched != 0) || \ - ((_get_curthread())->sig_defer_count > 0), \ +#define _PQ_ASSERT_PROTECTED(msg) \ + PTHREAD_ASSERT((_thread_kern_kse_mailbox.km_curthread == NULL) || \ + ((_get_curthread())->sig_defer_count > 0), \ msg); #else To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 8 18:45:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81F1E37B401; Sun, 8 Sep 2002 18:45:22 -0700 (PDT) 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 275E737B400 for ; Sun, 8 Sep 2002 18:45:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DB69543E42 for ; Sun, 8 Sep 2002 18:45:21 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g891jLJU059562 for ; Sun, 8 Sep 2002 18:45:21 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g891jLMJ059559 for perforce@freebsd.org; Sun, 8 Sep 2002 18:45:21 -0700 (PDT) Date: Sun, 8 Sep 2002 18:45:21 -0700 (PDT) Message-Id: <200209090145.g891jLMJ059559@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17249 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17249 Change 17249 by mini@mini_stylus on 2002/09/08 18:44:25 Thread-safe formatted printing. Affected files ... .. //depot/projects/kse/lib/libc_r/uthread/uthread_printf.c#1 add .. //depot/projects/kse/sys/kern/kern_proc.c#83 edit Differences ... ==== //depot/projects/kse/sys/kern/kern_proc.c#83 (text+ko) ==== @@ -293,6 +293,17 @@ int kse_yield(struct thread *td, struct kse_yield_args *uap) { + struct thread *td2; + + /* KSE-enabled processes only, please. */ + if ((td->td_proc->p_flag & P_KSES) == 0) + return (EINVAL); + + /* Don't discard the last thread. */ + td2 = FIRST_THREAD_IN_PROC(td->td_proc); + KASSERT(td2 != NULL, ("kse_yield: no threads in our proc")); + if (TAILQ_NEXT(td, td_plist) == NULL) + return (EINVAL); /* Abandon thread. */ PROC_LOCK(td->td_proc); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 8 18:57: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C478B37B409; Sun, 8 Sep 2002 18:57:00 -0700 (PDT) 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 55F9337B4C8 for ; Sun, 8 Sep 2002 18:56:56 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA07243E3B for ; Sun, 8 Sep 2002 18:56:55 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 4FDADAE1C1; Sun, 8 Sep 2002 18:56:55 -0700 (PDT) Date: Sun, 8 Sep 2002 18:56:55 -0700 From: Jonathan Mini To: Perforce Change Reviews Subject: Re: PERFORCE change 17249 for review Message-ID: <20020909015655.GZ7265@elvis.mu.org> References: <200209090145.g891jLMJ059559@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200209090145.g891jLMJ059559@freefall.freebsd.org> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Great. I submitted more than I intended. Pointy-hat to me. > kse_yield(struct thread *td, struct kse_yield_args *uap) > { > + struct thread *td2; > + > + /* KSE-enabled processes only, please. */ > + if ((td->td_proc->p_flag & P_KSES) == 0) > + return (EINVAL); > + > + /* Don't discard the last thread. */ > + td2 = FIRST_THREAD_IN_PROC(td->td_proc); > + KASSERT(td2 != NULL, ("kse_yield: no threads in our proc")); > + if (TAILQ_NEXT(td, td_plist) == NULL) > + return (EINVAL); > > /* Abandon thread. */ > PROC_LOCK(td->td_proc); This code disallows kse_yield() to be called from a non-KSE-process, and in a KSE-process, does not the proc abandon the last thread (leaving a struct proc with zero threads, which -- among other things -- is unkillable). As an aside, being able to rely on kse_yield() failing when there are no other threads running lets it intelligently decide to drop into an idle loop. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 8 19:15: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F8A637B401; Sun, 8 Sep 2002 19:14:58 -0700 (PDT) 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 2995C37B400 for ; Sun, 8 Sep 2002 19:14:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D954143E72 for ; Sun, 8 Sep 2002 19:14:57 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g892EvJU066521 for ; Sun, 8 Sep 2002 19:14:57 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g892EvaU066518 for perforce@freebsd.org; Sun, 8 Sep 2002 19:14:57 -0700 (PDT) Date: Sun, 8 Sep 2002 19:14:57 -0700 (PDT) Message-Id: <200209090214.g892EvaU066518@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17250 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17250 Change 17250 by mini@mini_stylus on 2002/09/08 19:14:08 Enable KSE in libc_r. Affected files ... .. //depot/projects/kse/lib/libc_r/uthread/uthread_create.c#7 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#8 edit .. //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#9 edit Differences ... ==== //depot/projects/kse/lib/libc_r/uthread/uthread_create.c#7 (text+ko) ==== ==== //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#8 (text+ko) ==== @@ -266,7 +266,7 @@ _thread_initial->attr.stackaddr_attr = _thread_initial->stack; _thread_initial->attr.stacksize_attr = PTHREAD_STACK_INITIAL; - /* Setup the context for the scheduler: */ + /* Setup the context for the scheduler. */ _thread_kern_kse_mailbox.km_stack.ss_sp = _thread_kern_sched_stack; _thread_kern_kse_mailbox.km_stack.ss_size = sched_stack_size; @@ -289,6 +289,7 @@ _thread_initial->stack; _thread_initial->mailbox.tm_context.uc_stack.ss_size = PTHREAD_STACK_INITIAL; + _thread_initial->mailbox.tm_udata = (void *)_thread_initial; /* Default the priority of the initial thread: */ _thread_initial->base_priority = PTHREAD_DEFAULT_PRIORITY; @@ -333,6 +334,11 @@ _clock_res_usec = clockinfo.tick > CLOCK_RES_USEC_MIN ? clockinfo.tick : CLOCK_RES_USEC_MIN; + /* Start KSE. */ + _thread_kern_kse_mailbox.km_curthread = + &_thread_initial->mailbox; + if (kse_new(&_thread_kern_kse_mailbox, 0) != 0) + PANIC("kse_new failed"); } /* Initialise the garbage collector mutex and condition variable. */ ==== //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#9 (text+ko) ==== @@ -259,6 +259,7 @@ while ((tm = p) != NULL) { p = tm->tm_next; tm->tm_next = NULL; + DBG_MSG("\tmailbox=%p pthread=%p\n", tm, tm->tm_udata); PTHREAD_PRIOQ_INSERT_TAIL((pthread_t)tm->tm_udata); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 8 19:26:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FC2837B401; Sun, 8 Sep 2002 19:26:12 -0700 (PDT) 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 4153337B400 for ; Sun, 8 Sep 2002 19:26:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E01A343E77 for ; Sun, 8 Sep 2002 19:26:11 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g892QBJU067356 for ; Sun, 8 Sep 2002 19:26:11 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g892QB4Z067353 for perforce@freebsd.org; Sun, 8 Sep 2002 19:26:11 -0700 (PDT) Date: Sun, 8 Sep 2002 19:26:11 -0700 (PDT) Message-Id: <200209090226.g892QB4Z067353@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17251 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17251 Change 17251 by mini@mini_stylus on 2002/09/08 19:26:11 Add my email address to my copyright. Affected files ... .. //depot/projects/kse/lib/libc/i386/gen/signalcontext.c#3 edit Differences ... ==== //depot/projects/kse/lib/libc/i386/gen/signalcontext.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Jonathan Mini. + * Copyright (c) 2002 Jonathan Mini * All rights reserved. * * Redistribution and use in source and binary forms, with or without To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 8 21:53:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 904EA37B401; Sun, 8 Sep 2002 21:52:41 -0700 (PDT) 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 3564237B400 for ; Sun, 8 Sep 2002 21:52:41 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BFA243E42 for ; Sun, 8 Sep 2002 21:52:40 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g894qeJU088932 for ; Sun, 8 Sep 2002 21:52:40 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g894qaDr088909 for perforce@freebsd.org; Sun, 8 Sep 2002 21:52:36 -0700 (PDT) Date: Sun, 8 Sep 2002 21:52:36 -0700 (PDT) Message-Id: <200209090452.g894qaDr088909@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17255 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17255 Change 17255 by mini@freefall on 2002/09/08 21:52:26 IFC @17254. Affected files ... .. //depot/projects/kse/include/dirent.h#2 integrate .. //depot/projects/kse/include/inttypes.h#4 integrate .. //depot/projects/kse/include/search.h#4 integrate .. //depot/projects/kse/include/stdio.h#4 integrate .. //depot/projects/kse/include/stdlib.h#5 integrate .. //depot/projects/kse/include/time.h#5 integrate .. //depot/projects/kse/include/unistd.h#3 integrate .. //depot/projects/kse/include/wchar.h#4 integrate .. //depot/projects/kse/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/kse/lib/libc/gen/siglist.c#2 integrate .. //depot/projects/kse/lib/libc/gen/statvfs.3#2 integrate .. //depot/projects/kse/lib/libc/gen/statvfs.c#2 integrate .. //depot/projects/kse/lib/libc/locale/Makefile.inc#5 integrate .. //depot/projects/kse/lib/libc/locale/mbrlen.3#2 integrate .. //depot/projects/kse/lib/libc/locale/mbrlen.c#2 integrate .. //depot/projects/kse/lib/libc/locale/mbrtowc.3#2 integrate .. //depot/projects/kse/lib/libc/locale/mbrtowc.c#2 integrate .. //depot/projects/kse/lib/libc/locale/mbsrtowcs.3#2 integrate .. //depot/projects/kse/lib/libc/locale/mbsrtowcs.c#2 integrate .. //depot/projects/kse/lib/libc/locale/mbstowcs.c#2 integrate .. //depot/projects/kse/lib/libc/locale/mbtowc.c#3 integrate .. //depot/projects/kse/lib/libc/locale/multibyte.3#4 integrate .. //depot/projects/kse/lib/libc/locale/wcrtomb.3#2 integrate .. //depot/projects/kse/lib/libc/locale/wcrtomb.c#2 integrate .. //depot/projects/kse/lib/libc/locale/wcsrtombs.3#2 integrate .. //depot/projects/kse/lib/libc/locale/wcsrtombs.c#2 integrate .. //depot/projects/kse/lib/libc/locale/wcstol.3#1 branch .. //depot/projects/kse/lib/libc/locale/wcstol.c#1 branch .. //depot/projects/kse/lib/libc/locale/wcstombs.c#2 integrate .. //depot/projects/kse/lib/libc/locale/wcstoul.c#1 branch .. //depot/projects/kse/lib/libc/net/inet.3#3 integrate .. //depot/projects/kse/lib/libc/net/inet_ntop.c#3 integrate .. //depot/projects/kse/lib/libc/net/inet_pton.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/fgetws.3#2 integrate .. //depot/projects/kse/lib/libc/stdio/fgetws.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/fprintf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/fputws.3#2 integrate .. //depot/projects/kse/lib/libc/stdio/fputws.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/printf.3#3 integrate .. //depot/projects/kse/lib/libc/stdio/printf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/setbuf.3#3 integrate .. //depot/projects/kse/lib/libc/stdio/setbuf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/setvbuf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/snprintf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/sprintf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/vfprintf.c#4 integrate .. //depot/projects/kse/lib/libc/stdio/vprintf.c#4 integrate .. //depot/projects/kse/lib/libc/stdio/vsnprintf.c#4 integrate .. //depot/projects/kse/lib/libc/stdio/vsprintf.c#4 integrate .. //depot/projects/kse/lib/libc/stdlib/atexit.3#2 integrate .. //depot/projects/kse/lib/libc/stdlib/exit.3#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strtod.3#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtod.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoimax.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtol.3#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtol.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoll.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoul.3#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoul.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoull.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/strtoumax.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/tdelete.c#3 integrate .. //depot/projects/kse/lib/libc/stdlib/tsearch.3#3 integrate .. //depot/projects/kse/lib/libc/stdtime/strftime.3#3 integrate .. //depot/projects/kse/lib/libc/stdtime/strftime.c#3 integrate .. //depot/projects/kse/lib/libc/stdtime/strptime.3#3 integrate .. //depot/projects/kse/lib/libc/stdtime/strptime.c#3 integrate .. //depot/projects/kse/lib/libc/string/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/string/strcat.3#3 integrate .. //depot/projects/kse/lib/libc/string/strcat.c#3 integrate .. //depot/projects/kse/lib/libc/string/strcpy.3#3 integrate .. //depot/projects/kse/lib/libc/string/strcpy.c#3 integrate .. //depot/projects/kse/lib/libc/string/strncat.c#3 integrate .. //depot/projects/kse/lib/libc/string/strncpy.c#3 integrate .. //depot/projects/kse/lib/libc/string/strtok.c#2 integrate .. //depot/projects/kse/lib/libc/string/strxfrm.3#3 integrate .. //depot/projects/kse/lib/libc/string/strxfrm.c#3 integrate .. //depot/projects/kse/lib/libc/string/wcscat.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcscpy.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcsncat.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcsncpy.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcsstr.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcstok.3#1 branch .. //depot/projects/kse/lib/libc/string/wcstok.c#1 branch .. //depot/projects/kse/lib/libc/string/wmemchr.3#2 integrate .. //depot/projects/kse/lib/libc/string/wmemcpy.c#2 integrate .. //depot/projects/kse/sys/alpha/alpha/machdep.c#42 integrate .. //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#29 integrate .. //depot/projects/kse/sys/compat/pecoff/imgact_pecoff.c#15 integrate .. //depot/projects/kse/sys/conf/NOTES#16 integrate .. //depot/projects/kse/sys/conf/files#49 integrate .. //depot/projects/kse/sys/conf/files.i386#29 integrate .. //depot/projects/kse/sys/conf/options#26 integrate .. //depot/projects/kse/sys/conf/options.i386#21 integrate .. //depot/projects/kse/sys/conf/options.pc98#20 integrate .. //depot/projects/kse/sys/conf/options.x86_64#2 integrate .. //depot/projects/kse/sys/dev/acpica/acpi.c#29 integrate .. //depot/projects/kse/sys/dev/acpica/acpivar.h#16 integrate .. //depot/projects/kse/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/kse/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/kse/sys/dev/en/midway.c#3 integrate .. //depot/projects/kse/sys/dev/isp/isp.c#23 integrate .. //depot/projects/kse/sys/dev/isp/isp_freebsd.c#17 integrate .. //depot/projects/kse/sys/dev/isp/isp_freebsd.h#15 integrate .. //depot/projects/kse/sys/dev/isp/ispvar.h#14 integrate .. //depot/projects/kse/sys/dev/mii/brgphy.c#7 integrate .. //depot/projects/kse/sys/dev/mii/miidevs#7 integrate .. //depot/projects/kse/sys/dev/mii/miidevs.h#7 integrate .. //depot/projects/kse/sys/dev/pci/pci_pci.c#13 integrate .. //depot/projects/kse/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/kse/sys/dev/sab/sab.c#2 integrate .. //depot/projects/kse/sys/geom/geom.h#8 integrate .. //depot/projects/kse/sys/geom/geom_bsd.c#8 integrate .. //depot/projects/kse/sys/geom/geom_dev.c#7 integrate .. //depot/projects/kse/sys/geom/geom_dump.c#6 integrate .. //depot/projects/kse/sys/geom/geom_mbr.c#7 integrate .. //depot/projects/kse/sys/geom/geom_subr.c#8 integrate .. //depot/projects/kse/sys/geom/geom_sunlabel.c#6 integrate .. //depot/projects/kse/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/kse/sys/i386/conf/GENERIC#25 integrate .. //depot/projects/kse/sys/i386/conf/NOTES#37 integrate .. //depot/projects/kse/sys/i386/i386/initcpu.c#8 integrate .. //depot/projects/kse/sys/i386/i386/machdep.c#57 integrate .. //depot/projects/kse/sys/i386/i386/vm_machdep.c#66 integrate .. //depot/projects/kse/sys/i386/include/pci_cfgreg.h#4 integrate .. //depot/projects/kse/sys/i386/isa/npx.c#20 integrate .. //depot/projects/kse/sys/i386/linux/linux_ptrace.c#6 integrate .. //depot/projects/kse/sys/i386/linux/linux_sysvec.c#20 integrate .. //depot/projects/kse/sys/i386/pci/pci_bus.c#9 integrate .. //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#13 integrate .. //depot/projects/kse/sys/ia64/conf/GENERIC#17 integrate .. //depot/projects/kse/sys/ia64/conf/SKI#6 integrate .. //depot/projects/kse/sys/ia64/ia64/machdep.c#38 integrate .. //depot/projects/kse/sys/ia64/ia64/vm_machdep.c#23 integrate .. //depot/projects/kse/sys/kern/imgact_aout.c#16 integrate .. //depot/projects/kse/sys/kern/imgact_elf.c#24 integrate .. //depot/projects/kse/sys/kern/kern_conf.c#12 integrate .. //depot/projects/kse/sys/kern/kern_proc.c#84 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#108 integrate .. //depot/projects/kse/sys/kern/subr_witness.c#31 integrate .. //depot/projects/kse/sys/kern/sys_process.c#31 integrate .. //depot/projects/kse/sys/modules/Makefile#33 integrate .. //depot/projects/kse/sys/modules/aout/Makefile#1 branch .. //depot/projects/kse/sys/modules/if_gre/Makefile#1 branch .. //depot/projects/kse/sys/modules/linux/Makefile#9 integrate .. //depot/projects/kse/sys/modules/pecoff/Makefile#2 integrate .. //depot/projects/kse/sys/net/ethernet.h#7 integrate .. //depot/projects/kse/sys/net/if_gre.c#1 branch .. //depot/projects/kse/sys/net/if_gre.h#1 branch .. //depot/projects/kse/sys/netatalk/at.h#2 integrate .. //depot/projects/kse/sys/netinet/in_proto.c#6 integrate .. //depot/projects/kse/sys/netinet/ip_gre.c#1 branch .. //depot/projects/kse/sys/netinet/ip_gre.h#1 branch .. //depot/projects/kse/sys/netns/ns.h#4 integrate .. //depot/projects/kse/sys/netns/ns_if.h#3 integrate .. //depot/projects/kse/sys/nfsclient/nfs_socket.c#15 integrate .. //depot/projects/kse/sys/nfsclient/nfs_vfsops.c#14 integrate .. //depot/projects/kse/sys/nfsclient/nfsmount.h#4 integrate .. //depot/projects/kse/sys/pc98/i386/machdep.c#33 integrate .. //depot/projects/kse/sys/pccard/pccard.c#12 integrate .. //depot/projects/kse/sys/pci/if_rl.c#14 integrate .. //depot/projects/kse/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/kse/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/kse/sys/powerpc/powerpc/vm_machdep.c#15 integrate .. //depot/projects/kse/sys/sparc64/sparc64/machdep.c#38 integrate .. //depot/projects/kse/sys/sys/disklabel.h#13 integrate .. //depot/projects/kse/sys/sys/proc.h#131 integrate .. //depot/projects/kse/sys/sys/systm.h#31 integrate .. //depot/projects/kse/sys/sys/ucontext.h#9 integrate Differences ... ==== //depot/projects/kse/include/dirent.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dirent.h 8.2 (Berkeley) 7/28/94 - * $FreeBSD: src/include/dirent.h,v 1.11 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/dirent.h,v 1.12 2002/09/09 03:52:43 mike Exp $ */ #ifndef _DIRENT_H_ @@ -87,20 +87,21 @@ #include __BEGIN_DECLS -DIR *opendir(const char *); -struct dirent *readdir(DIR *); -void rewinddir(DIR *); -int closedir(DIR *); +DIR *opendir(const char *); +struct dirent * + readdir(DIR *); +void rewinddir(DIR *); +int closedir(DIR *); #ifndef _POSIX_SOURCE -DIR *__opendir2(const char *, int); -long telldir(DIR *); -void seekdir(DIR *, long); -int scandir(const char *, struct dirent ***, - int (*)(struct dirent *), int (*)(const void *, const void *)); -int alphasort(const void *, const void *); -int getdents(int, char *, int); -int getdirentries(int, char *, int, long *); -int readdir_r(DIR *, struct dirent *, struct dirent **); +DIR *__opendir2(const char *, int); +long telldir(DIR *); +void seekdir(DIR *, long); +int scandir(const char *, struct dirent ***, + int (*)(struct dirent *), int (*)(const void *, const void *)); +int alphasort(const void *, const void *); +int getdents(int, char *, int); +int getdirentries(int, char *, int, long *); +int readdir_r(DIR *, struct dirent *, struct dirent **); #endif /* not POSIX */ __END_DECLS ==== //depot/projects/kse/include/inttypes.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/inttypes.h,v 1.6 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/inttypes.h,v 1.7 2002/09/06 11:23:32 tjr Exp $ */ #ifndef _INTTYPES_H_ @@ -48,8 +48,8 @@ intmax_t imaxabs(intmax_t) __pure2; imaxdiv_t imaxdiv(intmax_t, intmax_t) __pure2; -intmax_t strtoimax(const char *__restrict, char **__restrict, int); -uintmax_t strtoumax(const char *__restrict, char **__restrict, int); +intmax_t strtoimax(const char * __restrict, char ** __restrict, int); +uintmax_t strtoumax(const char * __restrict, char ** __restrict, int); /* XXX: The following functions are missing the restrict type qualifier. */ intmax_t wcstoimax(const wchar_t *, wchar_t **, int); uintmax_t wcstoumax(const wchar_t *, wchar_t **, int); ==== //depot/projects/kse/include/search.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $ */ -/* $FreeBSD: src/include/search.h,v 1.6 2002/08/21 16:19:55 mike Exp $ */ +/* $FreeBSD: src/include/search.h,v 1.7 2002/09/06 11:23:32 tjr Exp $ */ /* * Written by J.T. Conklin @@ -44,7 +44,7 @@ int hcreate(size_t); void hdestroy(void); ENTRY *hsearch(ENTRY, ACTION); -void *tdelete(const void *__restrict, void **__restrict, +void *tdelete(const void * __restrict, void ** __restrict, int (*)(const void *, const void *)); void *tfind(const void *, void **, int (*)(const void *, const void *)); void *tsearch(const void *, void **, int (*)(const void *, const void *)); ==== //depot/projects/kse/include/stdio.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.45 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/stdio.h,v 1.46 2002/09/06 11:23:32 tjr Exp $ */ #ifndef _STDIO_H_ @@ -221,7 +221,7 @@ int fgetpos(FILE *, fpos_t *); char *fgets(char *, int, FILE *); FILE *fopen(const char *, const char *); -int fprintf(FILE *__restrict, const char *__restrict, ...); +int fprintf(FILE * __restrict, const char * __restrict, ...); int fputc(int, FILE *); int fputs(const char *, FILE *); size_t fread(void *, size_t, size_t, FILE *); @@ -235,7 +235,7 @@ int getchar(void); char *gets(char *); void perror(const char *); -int printf(const char *__restrict, ...); +int printf(const char * __restrict, ...); int putc(int, FILE *); int putchar(int); int puts(const char *); @@ -243,23 +243,23 @@ int rename(const char *, const char *); void rewind(FILE *); int scanf(const char *, ...); -void setbuf(FILE *__restrict, char *__restrict); -int setvbuf(FILE *__restrict, char *__restrict, int, size_t); -int sprintf(char *__restrict, const char *__restrict, ...); +void setbuf(FILE * __restrict, char * __restrict); +int setvbuf(FILE * __restrict, char * __restrict, int, size_t); +int sprintf(char * __restrict, const char * __restrict, ...); int sscanf(const char *, const char *, ...); FILE *tmpfile(void); char *tmpnam(char *); int ungetc(int, FILE *); -int vfprintf(FILE *__restrict, const char *__restrict, +int vfprintf(FILE * __restrict, const char * __restrict, __va_list); -int vprintf(const char *__restrict, __va_list); -int vsprintf(char *__restrict, const char *__restrict, +int vprintf(const char * __restrict, __va_list); +int vsprintf(char * __restrict, const char * __restrict, __va_list); #if __ISO_C_VISIBLE >= 1999 -int snprintf(char *__restrict, size_t, const char *__restrict, +int snprintf(char * __restrict, size_t, const char * __restrict, ...) __printflike(3, 4); -int vsnprintf(char *__restrict, size_t, const char *__restrict, +int vsnprintf(char * __restrict, size_t, const char * __restrict, __va_list) __printflike(3, 0); #endif ==== //depot/projects/kse/include/stdlib.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.40 2002/09/01 07:08:22 tjr Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.41 2002/09/06 11:23:32 tjr Exp $ */ #ifndef _STDLIB_H_ @@ -113,17 +113,17 @@ int rand(void); void *realloc(void *, size_t); void srand(unsigned); -double strtod(const char *__restrict, char **__restrict); -long strtol(const char *__restrict, char **__restrict, int); +double strtod(const char * __restrict, char ** __restrict); +long strtol(const char * __restrict, char ** __restrict, int); unsigned long - strtoul(const char *__restrict, char **__restrict, int); + strtoul(const char * __restrict, char ** __restrict, int); int system(const char *); int mblen(const char *, size_t); -size_t mbstowcs(wchar_t *__restrict , const char *__restrict, size_t); +size_t mbstowcs(wchar_t * __restrict , const char * __restrict, size_t); int wctomb(char *, wchar_t); -int mbtowc(wchar_t *__restrict, const char *__restrict, size_t); -size_t wcstombs(char *__restrict, const wchar_t *__restrict, size_t); +int mbtowc(wchar_t * __restrict, const char * __restrict, size_t); +size_t wcstombs(char * __restrict, const wchar_t * __restrict, size_t); #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) extern const char *_malloc_options; @@ -197,13 +197,13 @@ #ifdef __LONG_LONG_SUPPORTED /* LONGLONG */ long long - strtoll(const char *__restrict, char **__restrict, int); + strtoll(const char * __restrict, char ** __restrict, int); #endif __int64_t strtoq(const char *, char **, int); #ifdef __LONG_LONG_SUPPORTED /* LONGLONG */ unsigned long long - strtoull(const char *__restrict, char **__restrict, int); + strtoull(const char * __restrict, char ** __restrict, int); #endif __uint64_t strtouq(const char *, char **, int); ==== //depot/projects/kse/include/time.h#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.29 2002/09/03 00:06:57 mike Exp $ + * $FreeBSD: src/include/time.h,v 1.30 2002/09/06 11:23:32 tjr Exp $ */ #ifndef _TIME_H_ @@ -121,8 +121,8 @@ struct tm *gmtime(const time_t *); struct tm *localtime(const time_t *); time_t mktime(struct tm *); -size_t strftime(char *__restrict, size_t, const char *__restrict, - const struct tm *__restrict); +size_t strftime(char * __restrict, size_t, const char * __restrict, + const struct tm * __restrict); time_t time(time_t *); #if __POSIX_VISIBLE @@ -144,8 +144,8 @@ #endif #if __XSI_VISIBLE -char *strptime(const char *__restrict, const char *__restrict, - struct tm *__restrict); +char *strptime(const char * __restrict, const char * __restrict, + struct tm * __restrict); #endif #if __BSD_VISIBLE ==== //depot/projects/kse/include/unistd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.56 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/unistd.h,v 1.57 2002/09/06 11:23:32 tjr Exp $ */ #ifndef _UNISTD_H_ @@ -190,7 +190,7 @@ * course has been in BSD practically forever. */ #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 402 || __BSD_VISIBLE -int symlink(const char *__restrict, const char *__restrict); +int symlink(const char * __restrict, const char * __restrict); #endif /* X/Open System Interfaces */ @@ -210,7 +210,7 @@ int setpgrp(pid_t _pid, pid_t _pgrp); /* obsoleted by setpgid() */ int setregid(gid_t, gid_t); int setreuid(uid_t, uid_t); -/* void swab(const void *__restrict, void *__restrict, ssize_t); */ +/* void swab(const void * __restrict, void * __restrict, ssize_t); */ void sync(void); unsigned int ualarm(unsigned int, unsigned int); int usleep(unsigned int); ==== //depot/projects/kse/include/wchar.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.16 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/wchar.h,v 1.20 2002/09/08 13:27:26 tjr Exp $ */ /*- @@ -111,9 +111,9 @@ wint_t btowc(int); wint_t fgetwc(FILE *); wchar_t * - fgetws(wchar_t *__restrict, int, FILE *__restrict); + fgetws(wchar_t * __restrict, int, FILE * __restrict); wint_t fputwc(wchar_t, FILE *); -int fputws(const wchar_t *__restrict, FILE *__restrict); +int fputws(const wchar_t * __restrict, FILE * __restrict); int fwide(FILE *, int); wint_t getwc(FILE *); wint_t getwchar(void); @@ -144,8 +144,13 @@ size_t wcsrtombs(char * __restrict, const wchar_t ** __restrict, size_t, mbstate_t * __restrict); size_t wcsspn(const wchar_t *, const wchar_t *); -wchar_t *wcsstr(const wchar_t *, const wchar_t *); +wchar_t *wcsstr(const wchar_t * __restrict, const wchar_t * __restrict); int wctob(wint_t); +wchar_t *wcstok(wchar_t * __restrict, const wchar_t * __restrict, + wchar_t ** __restrict); +long wcstol(const wchar_t * __restrict, wchar_t ** __restrict, int); +unsigned long + wcstoul(const wchar_t * __restrict, wchar_t ** __restrict, int); wchar_t *wmemchr(const wchar_t *, wchar_t, size_t); int wmemcmp(const wchar_t *, const wchar_t *, size_t); wchar_t *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t); ==== //depot/projects/kse/lib/libc/gen/getgrouplist.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getgrouplist.c 8.2 (Berkeley) 12/8/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.11 2002/03/22 21:52:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.12 2002/09/08 04:43:28 wollman Exp $"); /* * get credential @@ -85,6 +85,7 @@ } } skip: + ; } endgrent(); *grpcnt = ngroups; ==== //depot/projects/kse/lib/libc/gen/siglist.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)siglist.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/siglist.c,v 1.3 2002/03/22 21:52:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/siglist.c,v 1.4 2002/09/07 08:14:19 jmallett Exp $"); #include #include @@ -72,7 +72,7 @@ "winch", /* SIGWINCH */ "info", /* SIGINFO */ "usr1", /* SIGUSR1 */ - "usr2", /* SIGUSR2 */ + "usr2" /* SIGUSR2 */ }; const char *const sys_siglist[NSIG] = { ==== //depot/projects/kse/lib/libc/gen/statvfs.3#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/statvfs.3,v 1.3 2002/07/16 20:40:12 wollman Exp $ +.\" $FreeBSD: src/lib/libc/gen/statvfs.3,v 1.4 2002/09/06 11:23:40 tjr Exp $ .\" .Dd July 13, 2002 .Dt STATVFS 3 @@ -40,7 +40,7 @@ .Sh SYNOPSIS .In sys/statvfs.h .Ft int -.Fn statvfs "const char *restrict path" "struct statvfs *restrict buf" +.Fn statvfs "const char * restrict path" "struct statvfs * restrict buf" .Ft int .Fn fstatvfs "int fd" "struct statvfs *buf" .Sh DESCRIPTION ==== //depot/projects/kse/lib/libc/gen/statvfs.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/statvfs.c,v 1.1 2002/07/11 22:54:11 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/statvfs.c,v 1.2 2002/09/06 11:23:40 tjr Exp $"); #include "namespace.h" #include @@ -70,7 +70,7 @@ } int -statvfs(const char *__restrict path, struct statvfs *__restrict result) +statvfs(const char * __restrict path, struct statvfs * __restrict result) { struct statfs sfs; int rv; ==== //depot/projects/kse/lib/libc/locale/Makefile.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.35 2002/08/31 11:26:55 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.36 2002/09/08 13:27:26 tjr Exp $ # locale sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale @@ -11,8 +11,8 @@ mbrtowc.c mbrune.c mbsinit.c mbsrtowcs.c mbtowc.c mbstowcs.c \ mskanji.c nl_langinfo.c nomacros.c none.c rune.c \ runetype.c setinvalidrune.c setlocale.c setrunelocale.c table.c \ - tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wcstombs.c \ - wctob.c wctomb.c wctrans.c wctype.c wcwidth.c + tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wcstol.c wcstombs.c \ + wcstoul.c wctob.c wctomb.c wctrans.c wctype.c wcwidth.c .if ${LIB} == "c" MAN+= btowc.3 \ @@ -22,8 +22,8 @@ mbsrtowcs.3 multibyte.3 \ nl_langinfo.3 \ rune.3 \ - setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wcsrtombs.3 \ - wcrtomb.3 \ + setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wcrtomb.3 \ + wcsrtombs.3 wcstol.3 \ wctrans.3 wctype.3 wcwidth.3 MAN+= euc.4 utf2.4 @@ -45,6 +45,7 @@ rune.3 sputrune.3 MLINKS+=setlocale.3 localeconv.3 MLINKS+=towlower.3 towupper.3 +MLINKS+=wcstol.3 wcstoul.3 MLINKS+=wctrans.3 towctrans.3 MLINKS+=wctype.3 iswctype.3 .endif ==== //depot/projects/kse/lib/libc/locale/mbrlen.3#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/libc/locale/mbrlen.3,v 1.1 2002/08/18 06:30:10 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbrlen.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ .Dd August 16, 2002 .Dt MBRLEN 3 .Os @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn mbrlen "const char *restrict s" "size_t n" "mbstate_t *restrict ps" +.Fn mbrlen "const char * restrict s" "size_t n" "mbstate_t * restrict ps" .Sh DESCRIPTION The .Fn mbrlen ==== //depot/projects/kse/lib/libc/locale/mbrlen.c#2 (text+ko) ==== @@ -25,12 +25,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/mbrlen.c,v 1.1 2002/08/18 06:30:10 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbrlen.c,v 1.2 2002/09/06 11:23:45 tjr Exp $"); #include size_t -mbrlen(const char *__restrict s, size_t n, mbstate_t *__restrict ps __unused) +mbrlen(const char * __restrict s, size_t n, mbstate_t * __restrict ps __unused) { return (mbrtowc(NULL, s, n, NULL)); ==== //depot/projects/kse/lib/libc/locale/mbrtowc.3#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/libc/locale/mbrtowc.3,v 1.1 2002/08/18 06:30:10 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbrtowc.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ .Dd August 15, 2002 .Dt MBRTOWC 3 .Os @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn mbrtowc "wchar_t *restrict pwc" "const char *restrict s" "size_t n" "mbstate_t *restrict ps" +.Fn mbrtowc "wchar_t * restrict pwc" "const char * restrict s" "size_t n" "mbstate_t * restrict ps" .Sh DESCRIPTION The .Fn mbrtowc ==== //depot/projects/kse/lib/libc/locale/mbrtowc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/mbrtowc.c,v 1.1 2002/08/18 06:30:10 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbrtowc.c,v 1.2 2002/09/06 11:23:45 tjr Exp $"); #include #include @@ -33,8 +33,8 @@ #include size_t -mbrtowc(wchar_t *__restrict pwc, const char *__restrict s, size_t n, - mbstate_t *__restrict ps __unused) +mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n, + mbstate_t * __restrict ps __unused) { const char *e; rune_t r; ==== //depot/projects/kse/lib/libc/locale/mbsrtowcs.3#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/libc/locale/mbsrtowcs.3,v 1.1 2002/08/18 06:30:10 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbsrtowcs.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ .Dd August 16, 2002 .Dt MBSRTOWCS 3 .Os @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn mbsrtowcs "wchar_t *restrict dst" "const char **restrict src" "size_t len" "mbstate_t *restrict ps" +.Fn mbsrtowcs "wchar_t * restrict dst" "const char ** restrict src" "size_t len" "mbstate_t * restrict ps" .Sh DESCRIPTION The .Fn mbsrtowcs ==== //depot/projects/kse/lib/libc/locale/mbsrtowcs.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/mbsrtowcs.c,v 1.1 2002/08/18 06:30:10 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbsrtowcs.c,v 1.2 2002/09/06 11:23:45 tjr Exp $"); #include #include @@ -33,8 +33,8 @@ #include size_t -mbsrtowcs(wchar_t *__restrict dst, const char **__restrict src, size_t len, - mbstate_t *__restrict ps __unused) +mbsrtowcs(wchar_t * __restrict dst, const char ** __restrict src, size_t len, + mbstate_t * __restrict ps __unused) { const char *s; size_t nchr; ==== //depot/projects/kse/lib/libc/locale/mbstowcs.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.3 2002/09/01 07:08:22 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.4 2002/09/06 11:23:45 tjr Exp $"); #include #include @@ -45,8 +45,8 @@ size_t mbstowcs(pwcs, s, n) - wchar_t *__restrict pwcs; - const char *__restrict s; + wchar_t * __restrict pwcs; + const char * __restrict s; size_t n; { char const *e; ==== //depot/projects/kse/lib/libc/locale/mbtowc.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/mbtowc.c,v 1.3 2002/09/03 01:09:47 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbtowc.c,v 1.4 2002/09/06 11:23:45 tjr Exp $"); #include #include @@ -44,8 +44,8 @@ int mbtowc(pwc, s, n) - wchar_t *__restrict pwc; - const char *__restrict s; + wchar_t * __restrict pwc; + const char * __restrict s; size_t n; { char const *e; ==== //depot/projects/kse/lib/libc/locale/multibyte.3#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)multibyte.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.15 2002/09/01 07:21:58 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.16 2002/09/06 11:23:45 tjr Exp $ .\" .Dd June 4, 1993 .Dt MULTIBYTE 3 @@ -52,11 +52,11 @@ .Ft int .Fn mblen "const char *mbchar" "size_t nbytes" .Ft size_t -.Fn mbstowcs "wchar_t *restrict wcstring" "const char *restrict mbstring" "size_t nwchars" +.Fn mbstowcs "wchar_t * restrict wcstring" "const char * restrict mbstring" "size_t nwchars" .Ft int -.Fn mbtowc "wchar_t *restrict wcharp" "const char *restrict mbchar" "size_t nbytes" +.Fn mbtowc "wchar_t * restrict wcharp" "const char * restrict mbchar" "size_t nbytes" .Ft size_t -.Fn wcstombs "char *restrict mbstring" "const wchar_t *restrict wcstring" "size_t nbytes" +.Fn wcstombs "char * restrict mbstring" "const wchar_t * restrict wcstring" "size_t nbytes" .Ft int .Fn wctomb "char *mbchar" "wchar_t wchar" .Sh DESCRIPTION ==== //depot/projects/kse/lib/libc/locale/wcrtomb.3#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/libc/locale/wcrtomb.3,v 1.1 2002/08/18 06:30:10 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcrtomb.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ .Dd August 15, 2002 .Dt WCRTOMB 3 .Os @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn wcrtomb "char *restrict s" "wchar_t wc" "mbstate_t *restrict ps" +.Fn wcrtomb "char * restrict s" "wchar_t wc" "mbstate_t * restrict ps" .Sh DESCRIPTION The .Fn wcrtomb ==== //depot/projects/kse/lib/libc/locale/wcrtomb.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.1 2002/08/18 06:30:10 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.2 2002/09/06 11:23:45 tjr Exp $"); #include #include @@ -33,7 +33,7 @@ #include size_t -wcrtomb(char *__restrict s, wchar_t wc, mbstate_t *__restrict ps __unused) +wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps __unused) { char *e; ==== //depot/projects/kse/lib/libc/locale/wcsrtombs.3#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/libc/locale/wcsrtombs.3,v 1.1 2002/08/18 06:30:10 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcsrtombs.3,v 1.2 2002/09/06 11:23:45 tjr Exp $ .Dd August 16, 2002 .Dt WCSRTOMBS 3 .Os @@ -34,7 +34,7 @@ .Sh SYNOPSIS .In wchar.h .Ft size_t -.Fn wcsrtombs "char *restrict dst" "const wchar_t **restrict src" "size_t len" "mbstate_t *restrict ps" +.Fn wcsrtombs "char * restrict dst" "const wchar_t ** restrict src" "size_t len" "mbstate_t * restrict ps" .Sh DESCRIPTION The .Fn wcsrtombs ==== //depot/projects/kse/lib/libc/locale/wcsrtombs.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcsrtombs.c,v 1.1 2002/08/18 06:30:10 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcsrtombs.c,v 1.2 2002/09/06 11:23:45 tjr Exp $"); #include #include @@ -34,8 +34,8 @@ #include size_t -wcsrtombs(char *__restrict dst, const wchar_t **__restrict src, size_t len, - mbstate_t *__restrict ps __unused) +wcsrtombs(char * __restrict dst, const wchar_t ** __restrict src, size_t len, + mbstate_t * __restrict ps __unused) { char buf[MB_LEN_MAX]; const wchar_t *s; ==== //depot/projects/kse/lib/libc/locale/wcstombs.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.3 2002/09/01 07:08:22 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.4 2002/09/06 11:23:45 tjr Exp $"); #include #include @@ -45,8 +45,8 @@ size_t wcstombs(s, pwcs, n) - char *__restrict s; - const wchar_t *__restrict pwcs; + char * __restrict s; + const wchar_t * __restrict pwcs; size_t n; { char buf[MB_LEN_MAX]; ==== //depot/projects/kse/lib/libc/net/inet.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)inet.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.24 2002/08/15 20:33:44 robert Exp $ +.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.25 2002/09/06 11:23:49 tjr Exp $ .\" .Dd June 17, 1996 .Dt INET 3 @@ -64,12 +64,12 @@ .Ft const char * .Fo inet_ntop .Fa "int af" -.Fa "const void *restrict src" -.Fa "char *restrict dst" +.Fa "const void * restrict src" +.Fa "char * restrict dst" .Fa "socklen_t size" .Fc .Ft int -.Fn inet_pton "int af" "const char *restrict src" "void *restrict dst" +.Fn inet_pton "int af" "const char * restrict src" "void * restrict dst" .Ft struct in_addr .Fn inet_makeaddr "in_addr_t net" "in_addr_t lna" .Ft in_addr_t ==== //depot/projects/kse/lib/libc/net/inet_ntop.c#3 (text+ko) ==== @@ -18,7 +18,7 @@ static char rcsid[] = "$Id: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.11 2002/08/15 21:19:31 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_ntop.c,v 1.12 2002/09/06 11:23:49 tjr Exp $"); #include #include @@ -47,7 +47,7 @@ * Paul Vixie, 1996. */ const char * -inet_ntop(int af, const void *__restrict src, char *__restrict dst, +inet_ntop(int af, const void * __restrict src, char * __restrict dst, socklen_t size) { switch (af) { ==== //depot/projects/kse/lib/libc/net/inet_pton.c#3 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.10 2002/08/14 20:40:35 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/inet_pton.c,v 1.11 2002/09/06 11:23:49 tjr Exp $"); #include #include @@ -48,7 +48,7 @@ * Paul Vixie, 1996. */ int -inet_pton(int af, const char *__restrict src, void *__restrict dst) +inet_pton(int af, const char * __restrict src, void * __restrict dst) { switch (af) { case AF_INET: ==== //depot/projects/kse/lib/libc/stdio/fgetws.3#2 (text+ko) ==== @@ -35,7 +35,7 @@ .\" .\" @(#)fgets.3 8.1 (Berkeley) 6/4/93 .\" FreeBSD: src/lib/libc/stdio/fgets.3,v 1.16 2002/05/31 05:01:17 archie Exp -.\" $FreeBSD: src/lib/libc/stdio/fgetws.3,v 1.1 2002/08/13 09:30:41 tjr Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fgetws.3,v 1.2 2002/09/06 11:23:55 tjr Exp $ .\" .Dd August 6, 2002 .Dt FGETWS 3 @@ -49,7 +49,7 @@ .In stdio.h .In wchar.h >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 9 9:20:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 100FE37B405; Mon, 9 Sep 2002 09:20:20 -0700 (PDT) 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 B0AE537B401; Mon, 9 Sep 2002 09:20:17 -0700 (PDT) Received: from magic.adaptec.com (magic.adaptec.com [208.236.45.80]) by mx1.FreeBSD.org (Postfix) with ESMTP id 031F443E81; Mon, 9 Sep 2002 09:20:11 -0700 (PDT) (envelope-from gibbs@scsiguy.com) Received: from redfish.adaptec.com (redfish.adaptec.com [162.62.50.11]) by magic.adaptec.com (8.10.2+Sun/8.10.2) with ESMTP id g89GK6G25277; Mon, 9 Sep 2002 09:20:06 -0700 (PDT) Received: from btc.btc.adaptec.com (btc.btc.adaptec.com [10.100.0.52]) by redfish.adaptec.com (8.8.8+Sun/8.8.8) with ESMTP id JAA04260; Mon, 9 Sep 2002 09:20:05 -0700 (PDT) Received: from [10.100.253.70] (aslan [10.100.253.70]) by btc.btc.adaptec.com (8.8.8+Sun/8.8.8) with ESMTP id KAA23769; Mon, 9 Sep 2002 10:20:03 -0600 (MDT) Date: Mon, 09 Sep 2002 10:20:04 -0600 From: "Justin T. Gibbs" Reply-To: "Justin T. Gibbs" To: Jonathan Mini , Perforce Change Reviews Subject: Re: PERFORCE change 17249 for review Message-ID: <16590000.1031588403@aslan.btc.adaptec.com> In-Reply-To: <20020909015655.GZ7265@elvis.mu.org> References: <200209090145.g891jLMJ059559@freefall.freebsd.org> <20020909015655.GZ7265@elvis.mu.org> X-Mailer: Mulberry/2.2.1 (Linux/x86) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG > Great. I submitted more than I intended. p4 change -f 17249 and update the comments for your checkin. -- Justin To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 9 10: 5:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 817F437B401; Mon, 9 Sep 2002 10:05:26 -0700 (PDT) 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 2F6B337B400 for ; Mon, 9 Sep 2002 10:05:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA6E443E3B for ; Mon, 9 Sep 2002 10:05:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g89H5PJU038767 for ; Mon, 9 Sep 2002 10:05:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g89H5PTc038644 for perforce@freebsd.org; Mon, 9 Sep 2002 10:05:25 -0700 (PDT) Date: Mon, 9 Sep 2002 10:05:25 -0700 (PDT) Message-Id: <200209091705.g89H5PTc038644@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17273 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17273 Change 17273 by rwatson@rwatson_tislabs on 2002/09/09 10:05:15 Minor diff reduction to the main tree: merge in $FreeBSD$ Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#9 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/fs/procfs/procfs_mac.c,v 1.1 2002/08/01 02:03:20 rwatson Exp $ */ #include "opt_mac.h" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 9 11:25:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2D5737B405; Mon, 9 Sep 2002 11:23:22 -0700 (PDT) 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 3CE8037B400 for ; Mon, 9 Sep 2002 11:23:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A3B543E3B for ; Mon, 9 Sep 2002 11:23:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g89INKJU056826 for ; Mon, 9 Sep 2002 11:23:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g89IIlDi055455 for perforce@freebsd.org; Mon, 9 Sep 2002 11:18:47 -0700 (PDT) Date: Mon, 9 Sep 2002 11:18:47 -0700 (PDT) Message-Id: <200209091818.g89IIlDi055455@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17278 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17278 Change 17278 by rwatson@rwatson_tislabs on 2002/09/09 11:17:54 Integ the trustedbsd base tree. New compiler, etc, etc. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#7 integrate .. //depot/projects/trustedbsd/base/Makefile#11 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#22 integrate .. //depot/projects/trustedbsd/base/UPDATING#18 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.g#2 integrate .. //depot/projects/trustedbsd/base/bin/df/df.1#3 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#10 integrate .. //depot/projects/trustedbsd/base/bin/ed/main.c#5 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.1#5 integrate .. //depot/projects/trustedbsd/base/bin/ln/symlink.7#3 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#11 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#9 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#8 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.1#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_subs.c#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/buf_subs.c#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/cache.h#3 integrate .. //depot/projects/trustedbsd/base/bin/pax/file_subs.c#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/ftree.c#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/options.c#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/pat_rep.c#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.1#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.c#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.h#3 integrate .. //depot/projects/trustedbsd/base/bin/pax/tables.h#3 integrate .. //depot/projects/trustedbsd/base/bin/pax/tar.1#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/tar.c#5 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#9 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.c#11 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.1#4 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/error.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/expand.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/elf64-alpha.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/bfd/version.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/binutils.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/config.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/configure.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/binutils/cxxfilt.man#2 delete .. //depot/projects/trustedbsd/base/contrib/binutils/etc/ChangeLog#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/etc/Makefile.in#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/gprof/po/Make-in#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/gprof/po/POTFILES.in#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/gprof/po/gprof.pot#1 branch .. //depot/projects/trustedbsd/base/contrib/binutils/include/elf/arm-oabi.h#2 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/configdoc.texi#2 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/emulparams/armelf_linux26.sh#2 delete .. //depot/projects/trustedbsd/base/contrib/binutils/ld/ldlang.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/binutils/ld/scripttempl/elfppc.sc#2 delete .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/acconfig.h#2 delete .. //depot/projects/trustedbsd/base/contrib/binutils/libiberty/alloca-conf.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/HACKING#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/INSTALL#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/NEWS#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/TESTS#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/TODO#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/compile#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/config.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/configure#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/configure.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/pvcs2rcs.in#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/depcomp#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/diff3.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/io.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/system.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/mdate-sh#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/doc/stamp-1#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/doc/stamp-vti#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/doc/version-client.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/doc/version.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/fnmatch.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/getdate.y#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/getline.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/valloc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/xselect.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/cvs.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/cvs.5#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/mdate-sh#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/noautomake.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/client.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/client.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/error.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/history.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/import.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/log.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/login.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/main.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/prepend_args.c#2 delete .. //depot/projects/trustedbsd/base/contrib/cvs/src/prepend_args.h#2 delete .. //depot/projects/trustedbsd/base/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/root.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/root.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/server.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/server.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/update.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/version.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/src/version.c.in#2 delete .. //depot/projects/trustedbsd/base/contrib/cvs/src/version.h.in#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/tools/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/alias.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/attribs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/bb-reorder.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/bitmap.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/builtins.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-decl.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-lang.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-lex.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-pragma.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgcleanup.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cfgrtl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/collect2.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/combine.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.gcc#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/elf.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/netbsd.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/unicosmk.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/arm/arm.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386-protos.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/i386.md#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/linux64.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/mmintrin.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/netbsd64.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/openbsd.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/unix.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/linux.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/ia64/sysv4.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix43.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/aix51.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/altivec.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux64.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/netbsd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.md#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sysv4.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/xcoff.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/netbsd-elf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/openbsd1-64.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/openbsd64.h#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sol2.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc-protos.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/sparc.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-crtfm#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-linux64#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-sol2-64#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/configure.in#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/convert.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp-demangle.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/Make-lang.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/call.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/class.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-lang.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-tree.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cvt.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl2.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/error.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/init.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/lang-specs.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/lex.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/mangle.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/operators.def#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/pt.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/rtti.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/search.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/tree.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/typeck2.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppfiles.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppinit.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpplib.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cpplib.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cppmacro.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cse.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cselib.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/defaults.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/contrib.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/cpp.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/cppenv.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/invoke.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/md.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/tm.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dwarf2out.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dwarfout.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/emit-rtl.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/explow.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/expmed.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/expr.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/expr.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/bugs.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/news.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/root.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/target.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/version.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/final.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/flow.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/fold-const.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/function.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/gcc.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/haifa-sched.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hooks.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/hooks.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ifcvt.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/langhooks-def.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/langhooks.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/langhooks.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/libgcc2.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/local-alloc.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/loop.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/objc/Make-lang.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/objc/objc-lang.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/optabs.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/print-rtl.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/reg-stack.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/regclass.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/regmove.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/reload.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/reload1.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/rtl.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sched-deps.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sched-int.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/stor-layout.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/system.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/toplev.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tradcpp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/tree-inline.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unroll.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/varasm.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/version.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/HISTORY#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/fils.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_sfil.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipf.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_ef.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_td.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipft_tx.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipmon.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/kmem.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipmon.8#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipnat.5#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/parse.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/printnat.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/rules/example.9#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f13#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f13#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/Version.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/Version.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/Version.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libobjc/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/libobjc/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/libobjc/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/libobjc/configure.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/Makefile.am#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/acinclude.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config.h.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/i686-pc-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/m68k/bits/atomicity.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/linker-map.gnu#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/c_locale.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/ctype_members.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/monetary_members.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/time_members.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/ctype_members.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/messages_members.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/messages_members.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/monetary_members.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/time_members.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/ieee_1003.1-2001/codecvt_specializations.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/aix/bits/ctype_noninline.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/generic/bits/ctype_noninline.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/gnu-linux/bits/os_defines.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_inline.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_noninline.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix5.2/bits/os_defines.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_inline.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/newlib/bits/ctype_inline.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/newlib/bits/ctype_noninline.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_base.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_inline.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_noninline.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/qnx/qnx6.1/bits/os_defines.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_base.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_noninline.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.5/bits/os_defines.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_noninline.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.6/bits/os_defines.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/solaris/solaris2.7/bits/os_defines.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/configure.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/configure.target#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/Makefile.am#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/backward/strstream#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/basic_ios.tcc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/basic_string.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/basic_string.tcc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/c++config#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/char_traits.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/fpos.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/fstream.tcc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/istream.tcc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/locale_facets.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/locale_facets.tcc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/ostream.tcc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/sstream.tcc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_bvector.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_deque.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_iterator.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/stl_pair.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/streambuf.tcc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/streambuf_iterator.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c/std_cerrno.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c/std_cmath.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c/std_csetjmp.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c/std_cstdarg.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c/std_cstddef.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c/std_cstdio.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c/std_cwchar.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c/std_cwctype.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/assert.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/ctype.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/errno.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/float.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/iso646.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/limits.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/locale.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/math.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/setjmp.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/signal.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/stdarg.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/stddef.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/stdio.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/stdlib.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/string.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/time.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/wchar.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_compatibility/wctype.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/c_std/std_cmath.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/algorithm#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/hash_map#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/hash_set#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/iterator#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/numeric#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/rb_tree#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/slist#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/stdio_filebuf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/stl_hashtable.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/ext/stl_rope.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_bitset.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_fstream.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_istream.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_memory.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/std/std_streambuf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libmath/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/Makefile.am#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/cxxabi.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/eh_alloc.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/new#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/new_handler.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/new_op.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/pure.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/tinfo.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libsupc++/tinfo2.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/Makefile.am#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/ext-inst.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/fstream-inst.cc#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/fstream.cc#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/io-inst.cc#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/istream-inst.cc#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/locale-inst.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/locale.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/localename.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/misc-inst.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/ostream-inst.cc#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/sstream-inst.cc#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/streambuf-inst.cc#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/strstream.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/RELEASE_NOTES#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/README#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/cf/submit.cf#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/proto.m4#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/cf/m4/version.m4#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/etrn.0#1 branch .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/etrn.pl#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/contrib/expn.pl#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/doc/op/op.me#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/conf.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/include/sm/varargs.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/comm.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/engine.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libmilter/listener.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/clock.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/libsm/ldap.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/mail.local.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mail.local/mail.local.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/mailstats/mailstats.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/makemap/makemap.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/praliases/praliases.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/rmail/rmail.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/smrsh.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/smrsh/smrsh.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/TRACEFLAGS#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/aliases.5#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/collect.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/conf.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/deliver.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/domain.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/err.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/headers.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mailq.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/main.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/map.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/mci.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/milter.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/parseaddr.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/queue.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/readcf.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sasl.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/savemail.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.8#5 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sendmail.h#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/sfsasl.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/srvrsmtp.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/usersmtp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/src/version.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/vacation/vacation.1#7 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/vacation/vacation.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tar/src/buffer.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/ChangeLog.2001#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/Makefile.am.common#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/NEWS#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/acconfig.h#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/admin/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/admin/copy.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/admin/ktutil.8#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/admin/ktutil.cat8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/admin/srvconvert.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/admin/srvcreate.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/afsutil/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/afsutil/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/afsutil/pagsh.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/dceutils/ChangeLog#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/dceutils/Makefile.am#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/dceutils/Makefile.in#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/dceutils/README.dcedfs#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/dceutils/README.original#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/dceutils/compile#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/dceutils/dfspag.exp#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/dceutils/dpagaix.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/dceutils/k5dce.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/dceutils/k5dcecon.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/dceutils/testpag.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/common/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/ftp.1#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/ftp.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/ftp.cat1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/gssapi.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/main.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/extern.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpd.8#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpusers.5#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ls.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/pathnames.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/popen.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kauth/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kauth/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kauth/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kauth/encdata.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kauth/kauth.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kauth/kauth.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kauth/kauthd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kauth/ksrvtgt.in#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kauth/marshall.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kauth/rkinit.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kauth/zrefresh#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kf/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kf/kf.cat1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kf/kfd.8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kf/kfd.cat8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/ChangeLog#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/Makefile.in#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/common.c#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/context.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/krb4.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/krb5.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/kx.1#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/kx.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/kx.cat1#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/kx.h#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/kxd.8#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/kxd.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/kxd.cat8#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/rxtelnet.1#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/rxtelnet.cat1#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/rxtelnet.in#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/rxterm.1#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/rxterm.cat1#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/rxterm.in#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/tenletxr.1#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/tenletxr.cat1#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/tenletxr.in#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kx/writeauth.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/login/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/login/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/login/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/login/login.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/login/login_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/login/login_protos.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/otp/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/otp/Makefile.am#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/otp/Makefile.in#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/otp/otp.1#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/otp/otp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/otp/otp.cat1#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/otp/otp_locl.h#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/otp/otpprint.1#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/otp/otpprint.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/otp/otpprint.cat1#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/ChangeLog#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/Makefile.am#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/Makefile.in#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/README#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/README-FIRST#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/README-KRB4#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/maildir.c#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop3.rfc1081#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop3e.rfc1082#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_auth.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_debug.c#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_dele.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_dropcopy.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_dropinfo.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_get_command.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_init.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_last.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_list.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_log.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_msg.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_parse.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_pass.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_quit.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_rset.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_send.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_stat.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_uidl.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_updt.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_user.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/pop_xover.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/popper.8#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/popper.README.release#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/popper.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/popper.h#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/popper/version.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/push/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/push/pfrom.1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/push/pfrom.cat1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/push/push.8#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/push/push.cat8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rcp/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/common.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/rsh.1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/rsh.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/rsh_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/rshd.8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/rshd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/su/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/su/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/su/su.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/libtelnet/auth-proto.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/libtelnet/rsaencpwd.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/commands.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/externs.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/main.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/sys_bsd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/telnet.1#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/telnet.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/telnet.cat1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnetd/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnetd/telnetd.8#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/test/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/ChangeLog#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/Makefile.in#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/README#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/nose.0.left#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/nose.0.right#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/nose.1.left#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/nose.1.right#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/nose.down#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/nose.front#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/nose.left.front#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/nose.right.front#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/xnlock.1#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/xnlock.c#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/xnlock/xnlock.cat1#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/Makefile.am.common#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/aix.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/auth-modules.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/broken-getaddrinfo.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/broken.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/broken2.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/crypto.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/db.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/destdirs.m4#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/dlopen.m4#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/find-if-not-broken.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/irix.m4#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-bigendian.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-func-getcwd-broken.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-ipv6.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-irix.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-readline.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-sys-nextstep.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-version.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/make-proto.pl#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/mips-abi.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/misc.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/need-proto.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/osfc2.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/otp.m4#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/roken-frag.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/roken.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/sunos.m4#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/telnet.m4#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/test-package.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/config.guess#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/config.sub#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/configure#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/configure.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/bits.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/config.h.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/kadm5/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/stamp-h.in#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/install-sh#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/ank.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/kadmin.8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/kadmin.cat8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/kadmind.8#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/kadmind.cat8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/server.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/util.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/version4.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/524.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/config.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/connect.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/hprop-common.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/hprop.8#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/hprop.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/hprop.cat8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/hpropd.8#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/hpropd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/hpropd.cat8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kaserver.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kdc.8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kdc.cat8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kdc_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kerberos4.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kerberos4.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kerberos5.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kstash.8#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kstash.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kstash.cat8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/log.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/main.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/string2key.8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/string2key.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/string2key.cat8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kpasswd/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kpasswd/kpasswd.1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kpasswd/kpasswd.cat1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kpasswd/kpasswdd.8#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kpasswd/kpasswdd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kpasswd/kpasswdd.cat8#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kdestroy.cat1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kgetcred.1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kgetcred.cat1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kinit.1#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kinit.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kinit.cat1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/klist.1#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/klist.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/klist.cat1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/45/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/45/mk_req.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/asn1_print.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/check-der.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/der_get.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/gen.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/gen_decode.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/k5.asn1#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/pam/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/pam/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/sia/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/com_err/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/com_err/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/com_err/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/com_err/com_err.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/com_err/compile_et.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/ChangeLog#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/Makefile.am#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/Makefile.in#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/README#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/complete.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/edit_compat.c#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/edit_compat.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/editline.3#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/editline.c#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/editline.cat3#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/editline.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/roken_rename.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/sysunix.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/testit.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/editline/unix.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/8003.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/acquire_cred.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/import_name.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/inquire_cred.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/release_cred.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/unwrap.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/verify_mic.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/hdb-private.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/hdb-protos.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/keytab.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/mkey.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/print.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/context_s.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/dump_log.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/init_c.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/iprop.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/ipropd_master.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/ipropd_slave.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/kadm5-private.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/kadm5-protos.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/log.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/private.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/replay_log.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/send_recv.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kafs/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kafs/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kafs/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kafs/common.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kafs/kafs.3#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kafs/kafs.cat3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kafs/roken_rename.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/acl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/addr_families.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/aname_to_localname.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/auth_context.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/cache.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/changepw.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/config_file.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/constants.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/context.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/crypto.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/fcache.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_addrs.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_cred.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_for_creds.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_host_realm.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_in_tkt.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/init_creds_pw.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/kerberos.8#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/keytab.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/keytab_any.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/keytab_file.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/keytab_keyfile.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/keytab_krb4.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5-private.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5-protos.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5.conf.5#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_425_conv_principal.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_appdefault.3#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_auth_context.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_build_principal.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_config.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_context.3#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_create_checksum.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_crypto_init.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_encrypt.3#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_free_addresses.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_free_principal.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_get_all_client_addrs.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_get_krbhst.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_init_context.3#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_keytab.3#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_krbhst_init.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_openlog.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_parse_name.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_principal_get_realm.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_sname_to_principal.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_timeofday.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_unparse_name.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_verify_user.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_warn.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krbhst-test.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krbhst.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/log.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/mcache.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/mk_error.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/net_read.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/net_write.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/parse-name-test.c#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/principal.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/rd_cred.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/recvauth.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/send_to_kdc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/store-int.h#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/store.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/store_emem.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/store_fd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/store_mem.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/test_get_addrs.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/verify_init.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/verify_krb5_conf.8#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/verify_krb5_conf.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/verify_user.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/ChangeLog#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/Makefile.am#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/Makefile.in#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/otp.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/otp.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/otp_challenge.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/otp_db.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/otp_locl.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/otp_md.c#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/otp_md.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/otp_parse.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/otp_print.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/otp_verify.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/otptest.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/otp/roken_rename.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/err.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/fnmatch.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/getarg.3#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/getarg.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/getarg.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/glob.h#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/localtime_r.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/make-print-version.c#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/mini_inetd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/ndbm_wrap.c#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/ndbm_wrap.h#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/resolve.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/resolve.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/roken-common.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/roken.def#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/roken.dsp#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/roken.h.in#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/roken.mak#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/roken.rc#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/snprintf.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/strftime.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/strlcat.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/strlcpy.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/strsep_copy.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 9 11:29: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9283D37B401; Mon, 9 Sep 2002 11:29:02 -0700 (PDT) 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 4420D37B400 for ; Mon, 9 Sep 2002 11:29:02 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B6DE43E6A for ; Mon, 9 Sep 2002 11:29:02 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 38453AE22C; Mon, 9 Sep 2002 11:28:58 -0700 (PDT) Date: Mon, 9 Sep 2002 11:28:58 -0700 From: Jonathan Mini To: "Justin T. Gibbs" Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17249 for review Message-ID: <20020909182858.GB7265@elvis.mu.org> References: <200209090145.g891jLMJ059559@freefall.freebsd.org> <20020909015655.GZ7265@elvis.mu.org> <16590000.1031588403@aslan.btc.adaptec.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <16590000.1031588403@aslan.btc.adaptec.com> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Justin T. Gibbs [gibbs@scsiguy.com] wrote : > > Great. I submitted more than I intended. > > p4 change -f 17249 > > and update the comments for your checkin. stylus:~$ p4 change -f 17249 You don't have permission for this operation. =( -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 9 11:37: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6428337B401; Mon, 9 Sep 2002 11:37:00 -0700 (PDT) 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 C5B6137B400; Mon, 9 Sep 2002 11:36:57 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F4EA43E3B; Mon, 9 Sep 2002 11:36:57 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 74A372A7D6; Mon, 9 Sep 2002 11:36:57 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Jonathan Mini Cc: "Justin T. Gibbs" , Perforce Change Reviews Subject: Re: PERFORCE change 17249 for review In-Reply-To: <20020909182858.GB7265@elvis.mu.org> Date: Mon, 09 Sep 2002 11:36:57 -0700 From: Peter Wemm Message-Id: <20020909183657.74A372A7D6@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jonathan Mini wrote: > Justin T. Gibbs [gibbs@scsiguy.com] wrote : > > > > Great. I submitted more than I intended. > > > > p4 change -f 17249 > > > > and update the comments for your checkin. > > stylus:~$ p4 change -f 17249 > You don't have permission for this operation. Yeah, p4d doesn't give us the ACL granularity for this. I'd love to be able to retroactively edit commit messages for non-superusers. I can change it for you though if you want. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 9 11:39:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75DAD37B401; Mon, 9 Sep 2002 11:39:21 -0700 (PDT) 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 1A09937B400 for ; Mon, 9 Sep 2002 11:39:21 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3E5A43E65 for ; Mon, 9 Sep 2002 11:39:20 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id A8942AE160; Mon, 9 Sep 2002 11:39:20 -0700 (PDT) Date: Mon, 9 Sep 2002 11:39:20 -0700 From: Jonathan Mini To: Peter Wemm Cc: "Justin T. Gibbs" , Perforce Change Reviews Subject: Re: PERFORCE change 17249 for review Message-ID: <20020909183920.GC7265@elvis.mu.org> References: <20020909182858.GB7265@elvis.mu.org> <20020909183657.74A372A7D6@canning.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020909183657.74A372A7D6@canning.wemm.org> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Peter Wemm [peter@wemm.org] wrote : > Jonathan Mini wrote: > > Justin T. Gibbs [gibbs@scsiguy.com] wrote : > > > > > > Great. I submitted more than I intended. > > > > > > p4 change -f 17249 > > > > > > and update the comments for your checkin. > > > > stylus:~$ p4 change -f 17249 > > You don't have permission for this operation. > > Yeah, p4d doesn't give us the ACL granularity for this. I'd love to be > able to retroactively edit commit messages for non-superusers. > > I can change it for you though if you want. > Please do. Add: Don't discard the last thread in a process, or the only thread in a non-KSE enabled process. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 9 11:44:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCB0D37B401; Mon, 9 Sep 2002 11:44:20 -0700 (PDT) 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 7B0BF37B400; Mon, 9 Sep 2002 11:44:20 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4397543E4A; Mon, 9 Sep 2002 11:44:20 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 264032A88D; Mon, 9 Sep 2002 11:44:20 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Jonathan Mini Cc: "Justin T. Gibbs" , Perforce Change Reviews Subject: Re: PERFORCE change 17249 for review In-Reply-To: <20020909183920.GC7265@elvis.mu.org> Date: Mon, 09 Sep 2002 11:44:20 -0700 From: Peter Wemm Message-Id: <20020909184420.264032A88D@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jonathan Mini wrote: > Peter Wemm [peter@wemm.org] wrote : > > > Jonathan Mini wrote: > > > Justin T. Gibbs [gibbs@scsiguy.com] wrote : > > > > > > > > Great. I submitted more than I intended. > > > > > > > > p4 change -f 17249 > > > > > > > > and update the comments for your checkin. > > > > > > stylus:~$ p4 change -f 17249 > > > You don't have permission for this operation. > > > > Yeah, p4d doesn't give us the ACL granularity for this. I'd love to be > > able to retroactively edit commit messages for non-superusers. > > > > I can change it for you though if you want. > > > > Please do. Add: > > Don't discard the last thread in a process, or the only > thread in a non-KSE enabled process. Done. Change: 17249 Date: 2002/09/08 18:44:25 Client: mini_stylus User: mini Status: submitted Description: Thread-safe formatted printing. Don't discard the last thread in a process, or the only thread in a non-KSE enabled process. Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 9 11:53:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0213737B401; Mon, 9 Sep 2002 11:53:32 -0700 (PDT) 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 68BA337B400 for ; Mon, 9 Sep 2002 11:53:32 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3152943E42 for ; Mon, 9 Sep 2002 11:53:32 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id E7D00AE1EE; Mon, 9 Sep 2002 11:53:31 -0700 (PDT) Date: Mon, 9 Sep 2002 11:53:31 -0700 From: Jonathan Mini To: Peter Wemm Cc: "Justin T. Gibbs" , Perforce Change Reviews Subject: Re: PERFORCE change 17249 for review Message-ID: <20020909185331.GD7265@elvis.mu.org> References: <20020909183920.GC7265@elvis.mu.org> <20020909184420.264032A88D@canning.wemm.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020909184420.264032A88D@canning.wemm.org> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Peter Wemm [peter@wemm.org] wrote : > Done. Thanks. =) -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 9 11:58:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA55937B401; Mon, 9 Sep 2002 11:58:16 -0700 (PDT) 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 5E6B037B400 for ; Mon, 9 Sep 2002 11:58:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1724D43E42 for ; Mon, 9 Sep 2002 11:58:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g89IwFJU076993 for ; Mon, 9 Sep 2002 11:58:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g89IwFPQ076990 for perforce@freebsd.org; Mon, 9 Sep 2002 11:58:15 -0700 (PDT) Date: Mon, 9 Sep 2002 11:58:15 -0700 (PDT) Message-Id: <200209091858.g89IwFPQ076990@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17281 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17281 Change 17281 by rwatson@rwatson_tislabs on 2002/09/09 11:57:59 Remove local memory trashing support in malloc -- we added it when it disappeared in the UMA change, but UMA now does this natively so merge it back out. Should marginally improve performance, and is a decent diff reduction. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_malloc.c#14 (text+ko) ==== @@ -117,13 +117,6 @@ {0, NULL}, }; -/* - * The WEIRD_ADDR is used as known text to copy into free objects so - * that modifications after frees can be detected. - */ -#define WEIRD_ADDR 0xdeadc0de -#define MAX_COPY 64 - u_int vm_kmem_size; /* @@ -202,24 +195,6 @@ } /* - * Copy in known text to make the memory look free. - */ -static __inline void -trash_mem(void *addr, size_t size) -{ -#ifdef INVARIANTS - uint32_t *ip; - - ip = (uint32_t *)addr; - size = size >= MAX_COPY ? MAX_COPY : size & ~sizeof(uint32_t); - while (size != 0) { - *ip++ = WEIRD_ADDR; - size -= sizeof(uint32_t); - } -#endif -} - -/* * free: * * Free a block of memory allocated by malloc. @@ -255,7 +230,6 @@ #ifdef INVARIANTS struct malloc_type **mtp = addr; #endif - trash_mem(addr, size); size = slab->us_zone->uz_size; #ifdef INVARIANTS /* @@ -275,7 +249,6 @@ uma_zfree_arg(slab->us_zone, addr, slab); } else { size = slab->us_size; - trash_mem(addr, size); uma_large_free(slab); } mtx_lock(&ksp->ks_mtx); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 9 17: 1:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E66A37B401; Mon, 9 Sep 2002 16:59:34 -0700 (PDT) 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 275A537B400 for ; Mon, 9 Sep 2002 16:59:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00B0D43E3B for ; Mon, 9 Sep 2002 16:59:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g89NxWJU032398 for ; Mon, 9 Sep 2002 16:59:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g89NxSrV032394 for perforce@freebsd.org; Mon, 9 Sep 2002 16:59:28 -0700 (PDT) Date: Mon, 9 Sep 2002 16:59:28 -0700 (PDT) Message-Id: <200209092359.g89NxSrV032394@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17290 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17290 Change 17290 by peter@peter_daintree on 2002/09/09 16:59:05 IFC @17289 Affected files ... .. //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/ia64/contrib/tar/src/buffer.c#2 integrate .. //depot/projects/ia64/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/ia64/crypto/openssh/monitor.c#3 integrate .. //depot/projects/ia64/crypto/openssh/session.c#13 integrate .. //depot/projects/ia64/crypto/openssh/sshlogin.c#5 integrate .. //depot/projects/ia64/crypto/openssh/sshlogin.h#4 integrate .. //depot/projects/ia64/etc/defaults/pccard.conf#12 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#19 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#6 integrate .. //depot/projects/ia64/etc/rc.d/accounting#3 integrate .. //depot/projects/ia64/etc/rc.d/amd#5 integrate .. //depot/projects/ia64/etc/rc.d/apmd#4 integrate .. //depot/projects/ia64/etc/rc.d/archdep#1 branch .. //depot/projects/ia64/etc/rc.d/bootparams#3 integrate .. //depot/projects/ia64/etc/rc.d/cleartmp#3 integrate .. //depot/projects/ia64/etc/rc.d/fsck#3 integrate .. //depot/projects/ia64/etc/rc.d/ipfilter#3 integrate .. //depot/projects/ia64/etc/rc.d/ipmon#3 integrate .. //depot/projects/ia64/etc/rc.d/ipnat#3 integrate .. //depot/projects/ia64/etc/rc.d/ipsec#4 integrate .. //depot/projects/ia64/etc/rc.d/isdnd#4 integrate .. //depot/projects/ia64/etc/rc.d/ldconfig#3 integrate .. //depot/projects/ia64/etc/rc.d/lpd#3 integrate .. //depot/projects/ia64/etc/rc.d/motd#4 integrate .. //depot/projects/ia64/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/ia64/etc/rc.d/mountcritremote#3 integrate .. //depot/projects/ia64/etc/rc.d/mountd#7 integrate .. //depot/projects/ia64/etc/rc.d/moused#2 integrate .. //depot/projects/ia64/etc/rc.d/named#4 integrate .. //depot/projects/ia64/etc/rc.d/nfsd#7 integrate .. //depot/projects/ia64/etc/rc.d/nfslocking#3 integrate .. //depot/projects/ia64/etc/rc.d/ntpd#4 integrate .. //depot/projects/ia64/etc/rc.d/ntpdate#3 integrate .. //depot/projects/ia64/etc/rc.d/pcvt#2 integrate .. //depot/projects/ia64/etc/rc.d/root#3 integrate .. //depot/projects/ia64/etc/rc.d/route6d#4 integrate .. //depot/projects/ia64/etc/rc.d/routed#3 integrate .. //depot/projects/ia64/etc/rc.d/rpcbind#5 integrate .. //depot/projects/ia64/etc/rc.d/rtadvd#3 integrate .. //depot/projects/ia64/etc/rc.d/savecore#3 integrate .. //depot/projects/ia64/etc/rc.d/securelevel#4 integrate .. //depot/projects/ia64/etc/rc.d/sendmail#4 integrate .. //depot/projects/ia64/etc/rc.d/swap1#3 integrate .. //depot/projects/ia64/etc/rc.d/syscons#4 integrate .. //depot/projects/ia64/etc/rc.d/sysctl#5 integrate .. //depot/projects/ia64/etc/rc.d/syslogd#3 integrate .. //depot/projects/ia64/etc/rc.d/ttys#3 integrate .. //depot/projects/ia64/etc/rc.d/virecover#3 integrate .. //depot/projects/ia64/etc/rc.d/ypbind#3 integrate .. //depot/projects/ia64/etc/rc.d/yppasswdd#4 integrate .. //depot/projects/ia64/etc/rc.d/ypserv#4 integrate .. //depot/projects/ia64/etc/rc.subr#5 integrate .. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#7 integrate .. //depot/projects/ia64/gnu/lib/libdialog/gauge.c#4 integrate .. //depot/projects/ia64/include/ctype.h#5 integrate .. //depot/projects/ia64/include/dirent.h#3 integrate .. //depot/projects/ia64/include/inttypes.h#6 integrate .. //depot/projects/ia64/include/rpc/auth_kerb.h#2 integrate .. //depot/projects/ia64/include/rune.h#3 integrate .. //depot/projects/ia64/include/runetype.h#5 integrate .. //depot/projects/ia64/include/search.h#5 integrate .. //depot/projects/ia64/include/stdio.h#7 integrate .. //depot/projects/ia64/include/stdlib.h#12 integrate .. //depot/projects/ia64/include/time.h#9 integrate .. //depot/projects/ia64/include/unistd.h#10 integrate .. //depot/projects/ia64/include/wchar.h#7 integrate .. //depot/projects/ia64/lib/libc/gen/getgrouplist.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/siglist.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/statvfs.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/statvfs.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/Makefile.inc#7 integrate .. //depot/projects/ia64/lib/libc/locale/mbrlen.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbrlen.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbrtowc.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbrtowc.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbsrtowcs.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbsrtowcs.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbstowcs.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbtowc.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/multibyte.3#4 integrate .. //depot/projects/ia64/lib/libc/locale/wcrtomb.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/wcrtomb.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/wcsrtombs.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/wcsrtombs.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/wcstol.3#1 branch .. //depot/projects/ia64/lib/libc/locale/wcstol.c#1 branch .. //depot/projects/ia64/lib/libc/locale/wcstombs.c#2 integrate .. //depot/projects/ia64/lib/libc/locale/wcstoul.c#1 branch .. //depot/projects/ia64/lib/libc/net/inet.3#5 integrate .. //depot/projects/ia64/lib/libc/net/inet_ntop.c#6 integrate .. //depot/projects/ia64/lib/libc/net/inet_pton.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/fgetws.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/fgetws.c#2 integrate .. //depot/projects/ia64/lib/libc/stdio/fprintf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/fputws.3#2 integrate .. //depot/projects/ia64/lib/libc/stdio/fputws.c#2 integrate .. //depot/projects/ia64/lib/libc/stdio/printf.3#11 integrate .. //depot/projects/ia64/lib/libc/stdio/printf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/setbuf.3#3 integrate .. //depot/projects/ia64/lib/libc/stdio/setbuf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/setvbuf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/snprintf.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/sprintf.c#6 integrate .. //depot/projects/ia64/lib/libc/stdio/vfprintf.c#11 integrate .. //depot/projects/ia64/lib/libc/stdio/vprintf.c#4 integrate .. //depot/projects/ia64/lib/libc/stdio/vsnprintf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdio/vsprintf.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/atexit.3#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/exit.3#2 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtod.3#3 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtod.c#12 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoimax.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtol.3#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtol.c#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoll.c#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoul.3#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoul.c#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoull.c#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtoumax.c#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/tdelete.c#4 integrate .. //depot/projects/ia64/lib/libc/stdlib/tsearch.3#3 integrate .. //depot/projects/ia64/lib/libc/stdtime/strftime.3#5 integrate .. //depot/projects/ia64/lib/libc/stdtime/strftime.c#5 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.3#4 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.c#4 integrate .. //depot/projects/ia64/lib/libc/string/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/string/strcat.3#4 integrate .. //depot/projects/ia64/lib/libc/string/strcat.c#5 integrate .. //depot/projects/ia64/lib/libc/string/strcpy.3#4 integrate .. //depot/projects/ia64/lib/libc/string/strcpy.c#5 integrate .. //depot/projects/ia64/lib/libc/string/strncat.c#5 integrate .. //depot/projects/ia64/lib/libc/string/strncpy.c#5 integrate .. //depot/projects/ia64/lib/libc/string/strtok.c#5 integrate .. //depot/projects/ia64/lib/libc/string/strxfrm.3#3 integrate .. //depot/projects/ia64/lib/libc/string/strxfrm.c#4 integrate .. //depot/projects/ia64/lib/libc/string/wcscat.c#4 integrate .. //depot/projects/ia64/lib/libc/string/wcscpy.c#4 integrate .. //depot/projects/ia64/lib/libc/string/wcsncat.c#4 integrate .. //depot/projects/ia64/lib/libc/string/wcsncpy.c#4 integrate .. //depot/projects/ia64/lib/libc/string/wcsstr.c#4 integrate .. //depot/projects/ia64/lib/libc/string/wcstok.3#1 branch .. //depot/projects/ia64/lib/libc/string/wcstok.c#1 branch .. //depot/projects/ia64/lib/libc/string/wmemchr.3#2 integrate .. //depot/projects/ia64/lib/libc/string/wmemcpy.c#4 integrate .. //depot/projects/ia64/lib/libmd/mdXhl.c#3 integrate .. //depot/projects/ia64/release/alpha/drivers.conf#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#20 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/i386/proc-i386.sgml#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#42 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/Makefile#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/ia64/release/i386/dokern.sh#8 integrate .. //depot/projects/ia64/release/i386/drivers.conf#6 integrate .. //depot/projects/ia64/release/pc98/dokern.sh#1 branch .. //depot/projects/ia64/sbin/camcontrol/camcontrol.8#4 integrate .. //depot/projects/ia64/sbin/camcontrol/camcontrol.c#7 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw.8#9 integrate .. //depot/projects/ia64/sbin/mount_nfs/mount_nfs.c#9 integrate .. //depot/projects/ia64/sbin/ping/ping.c#9 integrate .. //depot/projects/ia64/sbin/ping6/ping6.c#7 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.8#11 integrate .. //depot/projects/ia64/sbin/tunefs/tunefs.c#6 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#18 integrate .. //depot/projects/ia64/share/man/man4/Makefile#16 integrate .. //depot/projects/ia64/share/man/man4/bge.4#3 integrate .. //depot/projects/ia64/share/man/man4/gre.4#1 branch .. //depot/projects/ia64/share/man/man5/rc.conf.5#16 integrate .. //depot/projects/ia64/share/man/man8/rc.sendmail.8#3 integrate .. //depot/projects/ia64/share/man/man9/signal.9#2 integrate .. //depot/projects/ia64/share/man/man9/style.9#13 integrate .. //depot/projects/ia64/share/mk/bsd.cpu.mk#9 integrate .. //depot/projects/ia64/share/mk/bsd.kern.mk#5 integrate .. //depot/projects/ia64/share/termcap/reorder#3 integrate .. //depot/projects/ia64/share/termcap/termcap.src#10 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#17 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#9 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/i386_module.c#4 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#11 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#14 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#7 integrate .. //depot/projects/ia64/sys/compat/linux/linux_sysctl.c#3 integrate .. //depot/projects/ia64/sys/compat/linux/linux_uid16.c#6 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#11 integrate .. //depot/projects/ia64/sys/conf/NOTES#23 integrate .. //depot/projects/ia64/sys/conf/files#40 integrate .. //depot/projects/ia64/sys/conf/files.i386#18 integrate .. //depot/projects/ia64/sys/conf/options#29 integrate .. //depot/projects/ia64/sys/conf/options.i386#8 integrate .. //depot/projects/ia64/sys/conf/options.pc98#9 integrate .. //depot/projects/ia64/sys/conf/options.x86_64#2 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#20 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib.c#11 integrate .. //depot/projects/ia64/sys/dev/acpica/acpivar.h#10 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#3 integrate .. //depot/projects/ia64/sys/dev/isp/isp.c#11 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#13 integrate .. //depot/projects/ia64/sys/dev/isp/ispvar.h#9 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs#5 integrate .. //depot/projects/ia64/sys/dev/mii/miidevs.h#5 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#9 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#11 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/ia64/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#7 integrate .. //depot/projects/ia64/sys/dev/puc/pucvar.h#4 integrate .. //depot/projects/ia64/sys/dev/sab/sab.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pci/maestro3.c#7 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_ctl.c#9 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_ioctl.c#6 integrate .. //depot/projects/ia64/sys/geom/geom.h#9 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#11 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#12 integrate .. //depot/projects/ia64/sys/geom/geom_dump.c#7 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#11 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#10 integrate .. //depot/projects/ia64/sys/geom/geom_sunlabel.c#8 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#20 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#21 integrate .. //depot/projects/ia64/sys/i386/i386/bios.c#9 integrate .. //depot/projects/ia64/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#8 integrate .. //depot/projects/ia64/sys/i386/i386/initcpu.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#24 integrate .. //depot/projects/ia64/sys/i386/i386/nexus.c#3 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#10 integrate .. //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#10 integrate .. //depot/projects/ia64/sys/i386/include/pci_cfgreg.h#2 integrate .. //depot/projects/ia64/sys/i386/isa/npx.c#8 integrate .. //depot/projects/ia64/sys/i386/linux/linux_genassym.c#2 integrate .. //depot/projects/ia64/sys/i386/linux/linux_ptrace.c#4 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#13 integrate .. //depot/projects/ia64/sys/i386/pci/pci_bus.c#7 integrate .. //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#8 integrate .. //depot/projects/ia64/sys/i386/svr4/svr4_genassym.c#2 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#17 integrate .. //depot/projects/ia64/sys/ia64/conf/SKI#6 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#47 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#12 integrate .. //depot/projects/ia64/sys/kern/imgact_aout.c#12 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#9 integrate .. //depot/projects/ia64/sys/kern/kern_conf.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#28 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#3 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#10 integrate .. //depot/projects/ia64/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/ia64/sys/kern/subr_rman.c#6 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#17 integrate .. //depot/projects/ia64/sys/kern/sys_process.c#14 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#22 integrate .. //depot/projects/ia64/sys/kern/vnode_if.src#8 integrate .. //depot/projects/ia64/sys/libkern/strlcat.c#2 integrate .. //depot/projects/ia64/sys/libkern/strlcpy.c#2 integrate .. //depot/projects/ia64/sys/modules/Makefile#20 integrate .. //depot/projects/ia64/sys/modules/aout/Makefile#1 branch .. //depot/projects/ia64/sys/modules/if_gre/Makefile#1 branch .. //depot/projects/ia64/sys/modules/linux/Makefile#6 integrate .. //depot/projects/ia64/sys/modules/pccbb/Makefile#2 delete .. //depot/projects/ia64/sys/modules/pecoff/Makefile#2 integrate .. //depot/projects/ia64/sys/net/ethernet.h#5 integrate .. //depot/projects/ia64/sys/net/if_gif.c#8 integrate .. //depot/projects/ia64/sys/net/if_gif.h#5 integrate .. //depot/projects/ia64/sys/net/if_gre.c#1 branch .. //depot/projects/ia64/sys/net/if_gre.h#1 branch .. //depot/projects/ia64/sys/netatalk/at.h#2 integrate .. //depot/projects/ia64/sys/netinet/in.h#13 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.h#12 integrate .. //depot/projects/ia64/sys/netinet/in_proto.c#3 integrate .. //depot/projects/ia64/sys/netinet/ip_gre.c#1 branch .. //depot/projects/ia64/sys/netinet/ip_gre.h#1 branch .. //depot/projects/ia64/sys/netinet/ip_mroute.c#12 integrate .. //depot/projects/ia64/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/ia64/sys/netns/ns.h#4 integrate .. //depot/projects/ia64/sys/netns/ns_if.h#3 integrate .. //depot/projects/ia64/sys/nfs/nfsnode.h#3 delete .. //depot/projects/ia64/sys/nfsclient/nfs.h#7 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_socket.c#9 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vfsops.c#10 integrate .. //depot/projects/ia64/sys/nfsclient/nfsmount.h#3 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#22 integrate .. //depot/projects/ia64/sys/pccard/pccard.c#10 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#14 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#14 integrate .. //depot/projects/ia64/sys/pci/if_rlreg.h#6 integrate .. //depot/projects/ia64/sys/pci/if_sf.c#6 integrate .. //depot/projects/ia64/sys/pci/if_ste.c#7 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#8 integrate .. //depot/projects/ia64/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#9 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#22 integrate .. //depot/projects/ia64/sys/sys/bio.h#9 integrate .. //depot/projects/ia64/sys/sys/disklabel.h#16 integrate .. //depot/projects/ia64/sys/sys/extattr.h#4 integrate .. //depot/projects/ia64/sys/sys/imgact_aout.h#4 integrate .. //depot/projects/ia64/sys/sys/nlist_aout.h#2 integrate .. //depot/projects/ia64/sys/sys/proc.h#30 integrate .. //depot/projects/ia64/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/ia64/sys/sys/systm.h#19 integrate .. //depot/projects/ia64/sys/sys/timetc.h#7 integrate .. //depot/projects/ia64/sys/sys/ucontext.h#3 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/ia64/sys/ufs/ufs/inode.h#4 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#9 integrate .. //depot/projects/ia64/sys/vm/swap_pager.h#5 integrate .. //depot/projects/ia64/sys/vm/vm_glue.c#15 integrate .. //depot/projects/ia64/tools/regression/geom/ConfCmp/ConfCmp.c#3 integrate .. //depot/projects/ia64/tools/regression/geom/Data/disk.msdos.ext.xml#2 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T001/ref.conf#7 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T002/ref.conf#7 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T003/ref.conf#7 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T004/ref.conf#7 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T005/ref.conf#6 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T012/ref.conf#6 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T013/ref.conf#6 integrate .. //depot/projects/ia64/tools/regression/geom/Test/T014/ref.conf#5 integrate .. //depot/projects/ia64/tools/regression/geom/geom_simdisk.c#6 integrate .. //depot/projects/ia64/tools/regression/geom/geom_simdisk_xml.c#5 integrate .. //depot/projects/ia64/usr.bin/basename/basename.c#7 integrate .. //depot/projects/ia64/usr.bin/catman/catman.c#2 integrate .. //depot/projects/ia64/usr.bin/chflags/chflags.c#6 integrate .. //depot/projects/ia64/usr.bin/col/col.c#6 integrate .. //depot/projects/ia64/usr.bin/colcrt/colcrt.c#6 integrate .. //depot/projects/ia64/usr.bin/colldef/parse.y#9 integrate .. //depot/projects/ia64/usr.bin/cut/cut.c#7 integrate .. //depot/projects/ia64/usr.bin/enigma/enigma.c#3 integrate .. //depot/projects/ia64/usr.bin/env/env.c#6 integrate .. //depot/projects/ia64/usr.bin/expand/expand.c#7 integrate .. //depot/projects/ia64/usr.bin/finger/extern.h#5 integrate .. //depot/projects/ia64/usr.bin/finger/finger.c#7 integrate .. //depot/projects/ia64/usr.bin/finger/lprint.c#7 integrate .. //depot/projects/ia64/usr.bin/finger/net.c#5 integrate .. //depot/projects/ia64/usr.bin/finger/sprint.c#6 integrate .. //depot/projects/ia64/usr.bin/finger/util.c#6 integrate .. //depot/projects/ia64/usr.bin/fold/fold.c#7 integrate .. //depot/projects/ia64/usr.bin/from/from.c#4 integrate .. //depot/projects/ia64/usr.bin/gcore/elfcore.c#3 integrate .. //depot/projects/ia64/usr.bin/gcore/gcore.c#5 integrate .. //depot/projects/ia64/usr.bin/gcore/md-nop.c#3 integrate .. //depot/projects/ia64/usr.bin/getconf/confstr.gperf#3 integrate .. //depot/projects/ia64/usr.bin/getconf/sysconf.gperf#2 integrate .. //depot/projects/ia64/usr.bin/getopt/getopt.c#5 integrate .. //depot/projects/ia64/usr.bin/hesinfo/hesinfo.c#7 integrate .. //depot/projects/ia64/usr.bin/hexdump/conv.c#6 integrate .. //depot/projects/ia64/usr.bin/hexdump/display.c#9 integrate .. //depot/projects/ia64/usr.bin/hexdump/hexdump.c#3 integrate .. //depot/projects/ia64/usr.bin/hexdump/hexdump.h#5 integrate .. //depot/projects/ia64/usr.bin/hexdump/hexsyntax.c#4 integrate .. //depot/projects/ia64/usr.bin/hexdump/odsyntax.c#7 integrate .. //depot/projects/ia64/usr.bin/hexdump/parse.c#8 integrate .. //depot/projects/ia64/usr.bin/id/id.c#5 integrate .. //depot/projects/ia64/usr.bin/ipcrm/ipcrm.c#6 integrate .. //depot/projects/ia64/usr.bin/join/join.c#7 integrate .. //depot/projects/ia64/usr.bin/kdump/mkioctls#5 integrate .. //depot/projects/ia64/usr.bin/last/last.c#6 integrate .. //depot/projects/ia64/usr.bin/lastcomm/lastcomm.c#5 integrate .. //depot/projects/ia64/usr.bin/leave/leave.c#4 integrate .. //depot/projects/ia64/usr.bin/lex/flex.skl#2 integrate .. //depot/projects/ia64/usr.bin/lock/lock.c#6 integrate .. //depot/projects/ia64/usr.bin/logger/logger.c#6 integrate .. //depot/projects/ia64/usr.bin/logname/logname.c#5 integrate .. //depot/projects/ia64/usr.bin/look/look.c#6 integrate .. //depot/projects/ia64/usr.bin/m4/main.c#9 integrate .. //depot/projects/ia64/usr.bin/make/make.1#7 integrate .. //depot/projects/ia64/usr.bin/makewhatis/makewhatis.c#4 integrate .. //depot/projects/ia64/usr.bin/mesg/mesg.c#5 integrate .. //depot/projects/ia64/usr.bin/mkfifo/mkfifo.c#4 integrate .. //depot/projects/ia64/usr.bin/msgs/msgs.c#6 integrate .. //depot/projects/ia64/usr.bin/ncplogin/ncplogin.c#4 integrate .. //depot/projects/ia64/usr.bin/netstat/atalk.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/if.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/inet.c#5 integrate .. //depot/projects/ia64/usr.bin/netstat/inet6.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/ipsec.c#2 integrate .. //depot/projects/ia64/usr.bin/netstat/ipx.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/iso.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/main.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/mbuf.c#2 integrate .. //depot/projects/ia64/usr.bin/netstat/mroute.c#2 integrate .. //depot/projects/ia64/usr.bin/netstat/mroute6.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/netgraph.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/netstat.h#2 integrate .. //depot/projects/ia64/usr.bin/netstat/ns.c#3 integrate .. //depot/projects/ia64/usr.bin/netstat/route.c#6 integrate .. //depot/projects/ia64/usr.bin/nice/nice.c#7 integrate .. //depot/projects/ia64/usr.bin/pr/extern.h#3 integrate .. //depot/projects/ia64/usr.bin/pr/pr.c#6 integrate .. //depot/projects/ia64/usr.bin/printenv/printenv.c#5 integrate .. //depot/projects/ia64/usr.bin/printf/printf.c#6 integrate .. //depot/projects/ia64/usr.bin/rev/rev.c#5 integrate .. //depot/projects/ia64/usr.bin/rsh/rsh.c#7 integrate .. //depot/projects/ia64/usr.bin/rwall/rwall.c#3 integrate .. //depot/projects/ia64/usr.bin/script/script.c#6 integrate .. //depot/projects/ia64/usr.bin/soelim/soelim.c#4 integrate .. //depot/projects/ia64/usr.bin/tee/tee.c#7 integrate .. //depot/projects/ia64/usr.bin/time/time.c#6 integrate .. //depot/projects/ia64/usr.bin/touch/touch.c#7 integrate .. //depot/projects/ia64/usr.bin/tput/tput.c#7 integrate .. //depot/projects/ia64/usr.bin/tr/tr.c#8 integrate .. //depot/projects/ia64/usr.bin/tset/tset.c#4 integrate .. //depot/projects/ia64/usr.bin/tsort/tsort.c#5 integrate .. //depot/projects/ia64/usr.bin/ul/ul.c#5 integrate .. //depot/projects/ia64/usr.bin/uname/uname.c#5 integrate .. //depot/projects/ia64/usr.bin/unexpand/unexpand.c#6 integrate .. //depot/projects/ia64/usr.bin/uniq/uniq.c#9 integrate .. //depot/projects/ia64/usr.bin/unvis/unvis.c#4 integrate .. //depot/projects/ia64/usr.bin/users/users.c#3 integrate .. //depot/projects/ia64/usr.bin/vis/vis.c#5 integrate .. //depot/projects/ia64/usr.bin/what/what.c#5 integrate .. //depot/projects/ia64/usr.bin/write/write.c#6 integrate .. //depot/projects/ia64/usr.bin/xinstall/xinstall.c#10 integrate .. //depot/projects/ia64/usr.bin/xstr/xstr.c#4 integrate .. //depot/projects/ia64/usr.bin/yes/yes.c#2 integrate .. //depot/projects/ia64/usr.sbin/edquota/edquota.8#3 integrate .. //depot/projects/ia64/usr.sbin/edquota/edquota.c#6 integrate .. //depot/projects/ia64/usr.sbin/inetd/inetd.c#9 integrate .. //depot/projects/ia64/usr.sbin/mrouted/main.c#2 integrate .. //depot/projects/ia64/usr.sbin/mrouted/mapper.c#2 integrate .. //depot/projects/ia64/usr.sbin/mrouted/mrinfo.c#2 integrate .. //depot/projects/ia64/usr.sbin/mrouted/mtrace.c#2 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/add/main.c#4 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/info/info.h#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/info/main.c#6 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/info/perform.c#6 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/info/pkg_info.1#4 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/lib.h#6 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/pkgwrap.c#1 branch .. //depot/projects/ia64/usr.sbin/pkg_install/version/perform.c#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/version/version.h#2 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/index.c#5 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslog.conf.5#3 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#8 integrate .. //depot/projects/ia64/usr.sbin/traceroute6/traceroute6.c#2 integrate Differences ... ==== //depot/projects/ia64/contrib/gcc/config/freebsd-spec.h#3 (text+ko) ==== @@ -18,7 +18,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.2 2002/05/10 19:05:07 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.3 2002/09/09 06:56:29 obrien Exp $ */ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify @@ -85,7 +85,7 @@ the final CPP_PREDEFINES value. */ #define FBSD_CPP_PREDEFINES \ - "-D__FreeBSD__=5 -D__FreeBSD_cc_version=500003 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" + "-D__FreeBSD__=5 -D__FreeBSD_cc_version=500004 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD" #endif /* ! FREEBSD_NATIVE */ ==== //depot/projects/ia64/contrib/tar/src/buffer.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.2 2002/06/04 17:31:15 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.3 2002/09/09 06:00:16 sobomax Exp $ */ #include "system.h" @@ -1332,6 +1332,9 @@ might become clever enough to just stop working, once there is no more work to do, we might have to revise this area in such time. */ + if (fast_read_option && namelist_freed) + kill(child_pid, SIGTERM); + if (access_mode == ACCESS_READ && ! _isrmt (archive) && (S_ISFIFO (archive_stat.st_mode) || S_ISSOCK (archive_stat.st_mode))) @@ -1358,12 +1361,13 @@ break; } - if (WIFSIGNALED (wait_status)) - ERROR ((0, 0, _("Child died with signal %d"), - WTERMSIG (wait_status))); - else if (WEXITSTATUS (wait_status) != 0) - ERROR ((0, 0, _("Child returned status %d"), - WEXITSTATUS (wait_status))); + if (!fast_read_option || !namelist_freed) + if (WIFSIGNALED (wait_status)) + ERROR ((0, 0, _("Child died with signal %d"), + WTERMSIG (wait_status))); + else if (WEXITSTATUS (wait_status) != 0) + ERROR ((0, 0, _("Child returned status %d"), + WEXITSTATUS (wait_status))); } #endif /* !MSDOS */ ==== //depot/projects/ia64/crypto/openssh/FREEBSD-upgrade#2 (text+ko) ==== @@ -21,7 +21,7 @@ 4) Import the sources: - $ cvs import src/crypto/openssh-portable OPENSSH OpenSSH_X_YpZ + $ cvs import src/crypto/openssh OPENSSH OpenSSH_X_YpZ 5) Resolve conflicts. Remember to bump the version number and addendum in version.h. @@ -127,4 +127,4 @@ -- des@FreeBSD.org -$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.2 2002/07/05 15:25:55 des Exp $ +$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.3 2002/09/09 02:00:28 kuriyama Exp $ ==== //depot/projects/ia64/crypto/openssh/monitor.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ #include "includes.h" RCSID("$OpenBSD: monitor.c,v 1.18 2002/06/26 13:20:57 deraadt Exp $"); -RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.8 2002/07/10 23:04:07 des Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/monitor.c,v 1.9 2002/09/09 16:49:11 ume Exp $"); #include @@ -1113,8 +1113,8 @@ * the address be 0.0.0.0. */ memset(&from, 0, sizeof(from)); + fromlen = sizeof(from); if (packet_connection_is_on_socket()) { - fromlen = sizeof(from); if (getpeername(packet_get_connection_in(), (struct sockaddr *) & from, &fromlen) < 0) { debug("getpeername: %.100s", strerror(errno)); @@ -1124,7 +1124,7 @@ /* Record that there was a login on that tty from the remote host. */ record_login(s->pid, s->tty, pw->pw_name, pw->pw_uid, get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping), - (struct sockaddr *)&from); + (struct sockaddr *)&from, fromlen); } static void ==== //depot/projects/ia64/crypto/openssh/session.c#13 (text+ko) ==== @@ -34,7 +34,7 @@ #include "includes.h" RCSID("$OpenBSD: session.c,v 1.142 2002/06/26 13:49:26 deraadt Exp $"); -RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.36 2002/08/05 16:06:35 ache Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/session.c,v 1.37 2002/09/09 16:49:11 ume Exp $"); #include "ssh.h" #include "ssh1.h" @@ -669,8 +669,8 @@ * the address be 0.0.0.0. */ memset(&from, 0, sizeof(from)); + fromlen = sizeof(from); if (packet_connection_is_on_socket()) { - fromlen = sizeof(from); if (getpeername(packet_get_connection_in(), (struct sockaddr *) & from, &fromlen) < 0) { debug("getpeername: %.100s", strerror(errno)); @@ -680,7 +680,7 @@ record_utmp_only(pid, s->tty, s->pw->pw_name, get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping), - (struct sockaddr *)&from); + (struct sockaddr *)&from, fromlen); } #endif @@ -721,8 +721,8 @@ * the address be 0.0.0.0. */ memset(&from, 0, sizeof(from)); + fromlen = sizeof(from); if (packet_connection_is_on_socket()) { - fromlen = sizeof(from); if (getpeername(packet_get_connection_in(), (struct sockaddr *) & from, &fromlen) < 0) { debug("getpeername: %.100s", strerror(errno)); @@ -735,7 +735,7 @@ record_login(pid, s->tty, pw->pw_name, pw->pw_uid, get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping), - (struct sockaddr *)&from); + (struct sockaddr *)&from, fromlen); #ifdef USE_PAM /* ==== //depot/projects/ia64/crypto/openssh/sshlogin.c#5 (text+ko) ==== @@ -40,7 +40,7 @@ #include "includes.h" RCSID("$OpenBSD: sshlogin.c,v 1.4 2002/06/23 03:30:17 deraadt Exp $"); -RCSID("$FreeBSD: src/crypto/openssh/sshlogin.c,v 1.6 2002/06/29 11:48:59 des Exp $"); +RCSID("$FreeBSD: src/crypto/openssh/sshlogin.c,v 1.7 2002/09/09 16:49:11 ume Exp $"); #include "loginrec.h" @@ -66,12 +66,12 @@ */ void record_login(pid_t pid, const char *ttyname, const char *user, uid_t uid, - const char *host, struct sockaddr * addr) + const char *host, struct sockaddr * addr, socklen_t addrlen) { struct logininfo *li; li = login_alloc_entry(pid, user, host, ttyname); - login_set_addr(li, addr, sizeof(struct sockaddr)); + login_set_addr(li, addr, addrlen); login_login(li); login_free_entry(li); } @@ -79,12 +79,12 @@ #ifdef LOGIN_NEEDS_UTMPX void record_utmp_only(pid_t pid, const char *ttyname, const char *user, - const char *host, struct sockaddr * addr) + const char *host, struct sockaddr * addr, socklen_t addrlen) { struct logininfo *li; li = login_alloc_entry(pid, user, host, ttyname); - login_set_addr(li, addr, sizeof(struct sockaddr)); + login_set_addr(li, addr, addrlen); login_utmp_only(li); login_free_entry(li); } ==== //depot/projects/ia64/crypto/openssh/sshlogin.h#4 (text+ko) ==== @@ -1,4 +1,5 @@ /* $OpenBSD: sshlogin.h,v 1.3 2001/06/26 17:27:25 markus Exp $ */ +/* $FreeBSD: src/crypto/openssh/sshlogin.h,v 1.2 2002/09/09 16:49:11 ume Exp $ */ /* * Author: Tatu Ylonen @@ -16,13 +17,13 @@ void record_login(pid_t, const char *, const char *, uid_t, - const char *, struct sockaddr *); + const char *, struct sockaddr *, socklen_t); void record_logout(pid_t, const char *, const char *); u_long get_last_login_time(uid_t, const char *, char *, u_int); #ifdef LOGIN_NEEDS_UTMPX void record_utmp_only(pid_t, const char *, const char *, const char *, - struct sockaddr *); + struct sockaddr *, socklen_t); #endif #endif ==== //depot/projects/ia64/etc/defaults/pccard.conf#12 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.241 2002/07/26 06:12:14 imp Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.242 2002/09/06 17:45:36 iwasaki Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -1857,6 +1857,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Corega KK Wireless LAN PCCL-11 +card "corega" "WL PCCL-11" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # D Link DWL-650 11Mbps WLAN Card card "D" "Link DWL-650 11Mbps WLAN Card" config auto "wi" ? ==== //depot/projects/ia64/etc/defaults/rc.conf#19 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.157 2002/09/02 16:35:01 gordon Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.159 2002/09/05 20:14:40 gordon Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -157,6 +157,8 @@ rwhod_flags="" # Flags for rwhod rarpd_enable="NO" # Run rarpd (or NO). rarpd_flags="" # Flags to rarpd. +bootparamd_enable="NO" # Run bootparamd (or NO). +bootparamd_flags="" # Flags to bootparamd xtend_enable="NO" # Run the X-10 power controller daemon. xtend_flags="" # Flags to xtend (if enabled). pppoed_enable="NO" # Run the PPP over Ethernet daemon. @@ -361,8 +363,7 @@ mta_start_script="/etc/rc.sendmail" # Script to start your chosen MTA, called by /etc/rc. # Settings for /etc/rc.sendmail: -sendmail_enable="NO" # Run the sendmail inbound daemon (YES/NO/NONE). - # If NONE, don't start any sendmail processes. +sendmail_enable="NO" # Run the sendmail inbound daemon (YES/NO). sendmail_flags="-L sm-mta -bd -q30m" # Flags to sendmail (as a server) sendmail_submit_enable="YES" # Start a localhost-only MTA for mail submission sendmail_submit_flags="-L sm-mta -bd -q30m -ODaemonPortOptions=Addr=localhost" ==== //depot/projects/ia64/etc/rc.d/Makefile#6 (text+ko) ==== @@ -1,20 +1,21 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.5 2002/09/02 20:49:26 gordon Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.8 2002/09/06 01:23:31 peter Exp $ .include FILES= DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz amd \ - apm apmd atm1 atm2.sh atm3.sh bgfsck ccd cleanvar cleartmp cron devdb \ - devfs diskless dmesg dumpon fsck inetd initdiskless initrandom ip6fw \ - ipfilter ipfw ipmon ipnat ipsec ipxrouted isdnd kadmind kerberos \ - keyserv ldconfig local localdaemons lomac lpd motd mountcritlocal \ - mountcritremote mountd moused mroute6d mrouted msgs named network1 \ - network2 network3 network_ipv6 nfsclient nfsd nfslocking nfsserver \ - ntpd ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota \ - random rarpd root route6d routed rpcbind rtadvd rwho savecore \ - securelevel sendmail serial sppp sshd swap1 syscons sysctl syslogd \ - timed ttys usbd vinum virecover ypbind yppasswdd ypserv ypset \ - ypupdated ypxfrd + apm apmd atm1 atm2.sh atm3.sh archdep bgfsck bootparams ccd cleanvar \ + cleartmp cron devdb devfs diskless dmesg dumpon fsck inetd \ + initdiskless initrandom ip6fw ipfilter ipfw ipmon ipnat ipsec \ + ipxrouted isdnd kadmind kerberos keyserv ldconfig local \ + localdaemons lomac lpd motd mountcritlocal mountcritremote \ + mountd moused mroute6d mrouted msgs named network1 network2 \ + network3 network_ipv6 nfsclient nfsd nfslocking nfsserver ntpd \ + ntpdate othermta pccard pcvt ppp-user pppoed pwcheck quota random \ + rarpd root route6d routed rpcbind rtadvd rwho savecore \ + securelevel sendmail serial sppp sshd swap1 syscons sysctl \ + syslogd timed ttys usbd vinum virecover ypbind yppasswdd ypserv \ + ypset ypupdated ypxfrd FILESDIR= /etc/rc.d FILESMODE= ${BINMODE} ==== //depot/projects/ia64/etc/rc.d/accounting#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.3 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: accounting @@ -20,7 +20,7 @@ accounting_start() { - case `${CMD_OSTYPE}` in + case ${OSTYPE} in FreeBSD) _dir=`dirname "$accounting_file"` if [ ! -d `dirname "$_dir"` ]; then ==== //depot/projects/ia64/etc/rc.d/amd#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.6 2002/08/14 05:44:32 gordon Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.7 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: amd @@ -15,7 +15,7 @@ rcvar=`set_rcvar` command="/usr/sbin/${name}" -case `${CMD_OSTYPE}` in +case ${OSTYPE} in FreeBSD) start_precmd="amd_precmd" command_args="&" @@ -30,7 +30,7 @@ amd_precmd() { - case `${CMD_OSTYPE}` in + case ${OSTYPE} in FreeBSD) if ! checkyesno nfs_client_enable ; then force_depend nfsclient || return 1 ==== //depot/projects/ia64/etc/rc.d/apmd#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.3 2002/07/07 04:16:53 dougb Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.4 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: apmd @@ -15,7 +15,7 @@ rcvar=`set_rcvar` command="/usr/sbin/${name}" -case `${CMD_OSTYPE}` in +case ${OSTYPE} in FreeBSD) start_precmd="apmd_prestart" ;; ==== //depot/projects/ia64/etc/rc.d/bootparams#3 (text+ko) ==== @@ -1,19 +1,28 @@ #!/bin/sh # # $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/bootparams,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/bootparams,v 1.4 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: bootparams # REQUIRE: rpcbind DAEMON # BEFORE: LOGIN +# KEYWORD: FreeBSD . /etc/rc.subr name="bootparamd" -rcvar=$name -command="/usr/sbin/rpc.${name}" +rcvar=`set_rcvar` required_files="/etc/bootparams" +case ${OSTYPE} in +FreeBSD) + command="/usr/sbin/${name}" + ;; +NetBSD) + command="/usr/sbin/rpc.${name}" + ;; +esac + load_rc_config $name run_rc_command "$1" ==== //depot/projects/ia64/etc/rc.d/cleartmp#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: cleartmp,v 1.4 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.3 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: cleartmp @@ -28,7 +28,7 @@ find -x . ! -name . ! -name lost+found ! -name quota.user \ ! -name quota.group -exec rm -rf -- {} \; -type d -prune) - case `${CMD_OSTYPE}` in + case ${OSTYPE} in FreeBSD) # Remove X lock files, since they will prevent you from # restarting X ==== //depot/projects/ia64/etc/rc.d/fsck#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $ -# $FreeBSD: src/etc/rc.d/fsck,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.3 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: fsck @@ -34,7 +34,7 @@ trap : 3 echo "Starting file system checks:" - case `${CMD_OSTYPE}` in + case ${OSTYPE} in FreeBSD) if checkyesno background_fsck; then fsck -F -p @@ -60,7 +60,7 @@ stop_boot ;; 8) - case `${CMD_OSTYPE}` in + case ${OSTYPE} in FreeBSD) if checkyesno fsck_y_enable; then echo "File system preen failed, trying fsck -y." ==== //depot/projects/ia64/etc/rc.d/ipfilter#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.3 2002/09/06 16:18:05 gordon Exp $ # # PROVIDE: ipfilter @@ -14,7 +14,7 @@ rcvar=`set_rcvar` load_rc_config $name -case `${CMD_OSTYPE}` in +case ${OSTYPE} in FreeBSD) stop_precmd="test -f ${ipfilter_rules}" ;; @@ -36,7 +36,7 @@ ipfilter_prestart() { -case `${CMD_OSTYPE}` in +case ${OSTYPE} in FreeBSD) # load ipfilter kernel module if needed if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then @@ -76,7 +76,7 @@ ipfilter_start() { echo "Enabling ipfilter." - case `${CMD_OSTYPE}` in + case ${OSTYPE} in FreeBSD) ${ipfilter_program:-/sbin/ipf} -Fa -f \ "${ipfilter_rules}" ${ipfilter_flags} @@ -95,7 +95,7 @@ ipfilter_stop() >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 9 17:46:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B880137B401; Mon, 9 Sep 2002 17:44:12 -0700 (PDT) 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 64EB137B400 for ; Mon, 9 Sep 2002 17:44:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C05CC43E3B for ; Mon, 9 Sep 2002 17:44:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8A0i9JU045045 for ; Mon, 9 Sep 2002 17:44:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8A0funH044533 for perforce@freebsd.org; Mon, 9 Sep 2002 17:41:56 -0700 (PDT) Date: Mon, 9 Sep 2002 17:41:56 -0700 (PDT) Message-Id: <200209100041.g8A0funH044533@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17292 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17292 Change 17292 by peter@peter_daintree on 2002/09/09 17:40:28 IFC @17289 Affected files ... .. //depot/projects/hammer/MAINTAINERS#2 integrate .. //depot/projects/hammer/Makefile#2 integrate .. //depot/projects/hammer/Makefile.inc1#2 integrate .. //depot/projects/hammer/UPDATING#2 integrate .. //depot/projects/hammer/bin/cp/cp.1#2 integrate .. //depot/projects/hammer/bin/csh/USD.doc/csh.g#2 integrate .. //depot/projects/hammer/bin/df/df.1#2 integrate .. //depot/projects/hammer/bin/df/df.c#2 integrate .. //depot/projects/hammer/bin/ed/main.c#2 integrate .. //depot/projects/hammer/bin/ln/ln.1#2 integrate .. //depot/projects/hammer/bin/ln/symlink.7#2 integrate .. //depot/projects/hammer/bin/ls/ls.1#2 integrate .. //depot/projects/hammer/bin/ls/ls.c#2 integrate .. //depot/projects/hammer/bin/ls/print.c#2 integrate .. //depot/projects/hammer/bin/mv/mv.1#2 integrate .. //depot/projects/hammer/bin/pax/ar_subs.c#2 integrate .. //depot/projects/hammer/bin/pax/buf_subs.c#2 integrate .. //depot/projects/hammer/bin/pax/cache.h#2 integrate .. //depot/projects/hammer/bin/pax/file_subs.c#2 integrate .. //depot/projects/hammer/bin/pax/ftree.c#2 integrate .. //depot/projects/hammer/bin/pax/options.c#2 integrate .. //depot/projects/hammer/bin/pax/pat_rep.c#2 integrate .. //depot/projects/hammer/bin/pax/pax.1#2 integrate .. //depot/projects/hammer/bin/pax/pax.c#2 integrate .. //depot/projects/hammer/bin/pax/pax.h#2 integrate .. //depot/projects/hammer/bin/pax/tables.h#2 integrate .. //depot/projects/hammer/bin/pax/tar.1#2 integrate .. //depot/projects/hammer/bin/pax/tar.c#2 integrate .. //depot/projects/hammer/bin/ps/ps.1#2 integrate .. //depot/projects/hammer/bin/ps/ps.c#2 integrate .. //depot/projects/hammer/bin/rm/rm.1#2 integrate .. //depot/projects/hammer/bin/rm/rm.c#2 integrate .. //depot/projects/hammer/bin/sh/error.c#2 integrate .. //depot/projects/hammer/bin/sh/eval.c#2 integrate .. //depot/projects/hammer/bin/sh/expand.c#2 integrate .. //depot/projects/hammer/bin/sh/jobs.c#2 integrate .. //depot/projects/hammer/bin/sh/parser.c#2 integrate .. //depot/projects/hammer/bin/sh/sh.1#2 integrate .. //depot/projects/hammer/bin/test/test.c#2 integrate .. //depot/projects/hammer/contrib/binutils/bfd/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/binutils/bfd/elf64-alpha.c#2 integrate .. //depot/projects/hammer/contrib/binutils/bfd/version.h#2 integrate .. //depot/projects/hammer/contrib/binutils/binutils/binutils.texi#2 delete .. //depot/projects/hammer/contrib/binutils/binutils/config.texi#2 delete .. //depot/projects/hammer/contrib/binutils/binutils/configure.in#2 integrate .. //depot/projects/hammer/contrib/binutils/binutils/cxxfilt.man#2 delete .. //depot/projects/hammer/contrib/binutils/etc/ChangeLog#1 branch .. //depot/projects/hammer/contrib/binutils/etc/Makefile.in#1 branch .. //depot/projects/hammer/contrib/binutils/gprof/po/Make-in#1 branch .. //depot/projects/hammer/contrib/binutils/gprof/po/POTFILES.in#1 branch .. //depot/projects/hammer/contrib/binutils/gprof/po/gprof.pot#1 branch .. //depot/projects/hammer/contrib/binutils/include/elf/arm-oabi.h#2 delete .. //depot/projects/hammer/contrib/binutils/ld/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/binutils/ld/configdoc.texi#2 delete .. //depot/projects/hammer/contrib/binutils/ld/emulparams/armelf_linux26.sh#2 delete .. //depot/projects/hammer/contrib/binutils/ld/ldlang.c#2 integrate .. //depot/projects/hammer/contrib/binutils/ld/scripttempl/elfppc.sc#2 delete .. //depot/projects/hammer/contrib/binutils/libiberty/acconfig.h#2 delete .. //depot/projects/hammer/contrib/binutils/libiberty/alloca-conf.h#2 delete .. //depot/projects/hammer/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/cvs/HACKING#2 integrate .. //depot/projects/hammer/contrib/cvs/INSTALL#2 integrate .. //depot/projects/hammer/contrib/cvs/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/cvs/NEWS#2 integrate .. //depot/projects/hammer/contrib/cvs/README#2 integrate .. //depot/projects/hammer/contrib/cvs/TESTS#2 integrate .. //depot/projects/hammer/contrib/cvs/TODO#2 integrate .. //depot/projects/hammer/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/hammer/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/hammer/contrib/cvs/compile#1 branch .. //depot/projects/hammer/contrib/cvs/config.h.in#2 integrate .. //depot/projects/hammer/contrib/cvs/configure#2 integrate .. //depot/projects/hammer/contrib/cvs/configure.in#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/pvcs2rcs.in#1 branch .. //depot/projects/hammer/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/hammer/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/hammer/contrib/cvs/depcomp#2 integrate .. //depot/projects/hammer/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/cvs/diff/diff3.c#2 integrate .. //depot/projects/hammer/contrib/cvs/diff/io.c#2 integrate .. //depot/projects/hammer/contrib/cvs/diff/system.h#2 integrate .. //depot/projects/hammer/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/hammer/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/hammer/contrib/cvs/doc/mdate-sh#1 branch .. //depot/projects/hammer/contrib/cvs/doc/stamp-1#1 branch .. //depot/projects/hammer/contrib/cvs/doc/stamp-vti#1 branch .. //depot/projects/hammer/contrib/cvs/doc/version-client.texi#1 branch .. //depot/projects/hammer/contrib/cvs/doc/version.texi#1 branch .. //depot/projects/hammer/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/cvs/lib/fnmatch.c#2 integrate .. //depot/projects/hammer/contrib/cvs/lib/getdate.y#2 integrate .. //depot/projects/hammer/contrib/cvs/lib/getline.c#2 integrate .. //depot/projects/hammer/contrib/cvs/lib/valloc.c#2 integrate .. //depot/projects/hammer/contrib/cvs/lib/xselect.h#2 integrate .. //depot/projects/hammer/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/cvs/man/cvs.1#2 integrate .. //depot/projects/hammer/contrib/cvs/man/cvs.5#2 integrate .. //depot/projects/hammer/contrib/cvs/mdate-sh#1 branch .. //depot/projects/hammer/contrib/cvs/noautomake.sh#1 branch .. //depot/projects/hammer/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/hammer/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/client.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/client.h#2 integrate .. //depot/projects/hammer/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/hammer/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/error.h#2 integrate .. //depot/projects/hammer/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/history.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/import.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/log.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/login.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/main.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/prepend_args.c#2 delete .. //depot/projects/hammer/contrib/cvs/src/prepend_args.h#2 delete .. //depot/projects/hammer/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/root.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/root.h#1 branch .. //depot/projects/hammer/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/hammer/contrib/cvs/src/server.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/server.h#2 integrate .. //depot/projects/hammer/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/update.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/version.c#1 branch .. //depot/projects/hammer/contrib/cvs/src/version.c.in#2 delete .. //depot/projects/hammer/contrib/cvs/src/version.h.in#1 branch .. //depot/projects/hammer/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/hammer/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/hammer/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/cvs/tools/README#2 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/gcc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/gcc/alias.c#2 integrate .. //depot/projects/hammer/contrib/gcc/attribs.c#2 integrate .. //depot/projects/hammer/contrib/gcc/bb-reorder.c#2 integrate .. //depot/projects/hammer/contrib/gcc/bitmap.c#2 integrate .. //depot/projects/hammer/contrib/gcc/builtins.c#2 integrate .. //depot/projects/hammer/contrib/gcc/c-common.c#2 integrate .. //depot/projects/hammer/contrib/gcc/c-decl.c#2 integrate .. //depot/projects/hammer/contrib/gcc/c-lang.c#2 integrate .. //depot/projects/hammer/contrib/gcc/c-lex.c#2 integrate .. //depot/projects/hammer/contrib/gcc/c-pragma.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cfgcleanup.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cfgrtl.c#2 integrate .. //depot/projects/hammer/contrib/gcc/collect2.c#2 integrate .. //depot/projects/hammer/contrib/gcc/combine.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config.gcc#2 integrate .. //depot/projects/hammer/contrib/gcc/config.in#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/elf.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/netbsd.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/unicosmk.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/arm/arm.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386-protos.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/i386.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/linux64.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/mmintrin.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/netbsd64.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/openbsd.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/unix.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/linux.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/ia64/sysv4.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix43.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/aix51.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/altivec.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/linux64.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/netbsd.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/sysv4.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/xcoff.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/netbsd-elf.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/openbsd1-64.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/sparc/openbsd64.h#1 branch .. //depot/projects/hammer/contrib/gcc/config/sparc/sol2.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparc-protos.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparc.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/sparc.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/t-crtfm#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/t-linux64#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/t-sol2-64#2 integrate .. //depot/projects/hammer/contrib/gcc/configure#2 integrate .. //depot/projects/hammer/contrib/gcc/configure.in#2 integrate .. //depot/projects/hammer/contrib/gcc/convert.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp-demangle.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/Make-lang.in#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/call.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/class.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/cp-lang.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/cp-tree.h#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/cvt.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/decl.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/decl2.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/error.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/init.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/lang-specs.h#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/lex.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/mangle.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/operators.def#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/pt.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/rtti.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/search.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/tree.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/typeck.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cp/typeck2.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cppfiles.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cppinit.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cpplib.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cpplib.h#2 integrate .. //depot/projects/hammer/contrib/gcc/cppmacro.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cse.c#2 integrate .. //depot/projects/hammer/contrib/gcc/cselib.c#2 integrate .. //depot/projects/hammer/contrib/gcc/defaults.h#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/contrib.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/cpp.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/cppenv.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/md.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/tm.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/dwarf2out.c#2 integrate .. //depot/projects/hammer/contrib/gcc/dwarfout.c#2 integrate .. //depot/projects/hammer/contrib/gcc/emit-rtl.c#2 integrate .. //depot/projects/hammer/contrib/gcc/explow.c#2 integrate .. //depot/projects/hammer/contrib/gcc/expmed.c#2 integrate .. //depot/projects/hammer/contrib/gcc/expr.c#2 integrate .. //depot/projects/hammer/contrib/gcc/expr.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/gcc/f/bugs.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/f/news.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/f/root.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/f/target.h#2 integrate .. //depot/projects/hammer/contrib/gcc/f/version.c#2 integrate .. //depot/projects/hammer/contrib/gcc/final.c#2 integrate .. //depot/projects/hammer/contrib/gcc/flow.c#2 integrate .. //depot/projects/hammer/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/hammer/contrib/gcc/function.c#2 integrate .. //depot/projects/hammer/contrib/gcc/gcc.c#2 integrate .. //depot/projects/hammer/contrib/gcc/haifa-sched.c#2 integrate .. //depot/projects/hammer/contrib/gcc/hooks.c#2 integrate .. //depot/projects/hammer/contrib/gcc/hooks.h#2 integrate .. //depot/projects/hammer/contrib/gcc/ifcvt.c#2 integrate .. //depot/projects/hammer/contrib/gcc/langhooks-def.h#2 integrate .. //depot/projects/hammer/contrib/gcc/langhooks.c#2 integrate .. //depot/projects/hammer/contrib/gcc/langhooks.h#2 integrate .. //depot/projects/hammer/contrib/gcc/libgcc2.c#2 integrate .. //depot/projects/hammer/contrib/gcc/local-alloc.c#2 integrate .. //depot/projects/hammer/contrib/gcc/loop.c#2 integrate .. //depot/projects/hammer/contrib/gcc/objc/Make-lang.in#2 integrate .. //depot/projects/hammer/contrib/gcc/objc/objc-lang.c#2 integrate .. //depot/projects/hammer/contrib/gcc/optabs.c#2 integrate .. //depot/projects/hammer/contrib/gcc/print-rtl.c#2 integrate .. //depot/projects/hammer/contrib/gcc/reg-stack.c#2 integrate .. //depot/projects/hammer/contrib/gcc/regclass.c#2 integrate .. //depot/projects/hammer/contrib/gcc/regmove.c#2 integrate .. //depot/projects/hammer/contrib/gcc/reload.c#2 integrate .. //depot/projects/hammer/contrib/gcc/reload1.c#2 integrate .. //depot/projects/hammer/contrib/gcc/rtl.h#2 integrate .. //depot/projects/hammer/contrib/gcc/sched-deps.c#2 integrate .. //depot/projects/hammer/contrib/gcc/sched-int.h#2 integrate .. //depot/projects/hammer/contrib/gcc/stor-layout.c#2 integrate .. //depot/projects/hammer/contrib/gcc/system.h#2 integrate .. //depot/projects/hammer/contrib/gcc/toplev.c#2 integrate .. //depot/projects/hammer/contrib/gcc/tradcpp.c#2 integrate .. //depot/projects/hammer/contrib/gcc/tree-inline.c#2 integrate .. //depot/projects/hammer/contrib/gcc/unroll.c#2 integrate .. //depot/projects/hammer/contrib/gcc/varasm.c#2 integrate .. //depot/projects/hammer/contrib/gcc/version.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/hammer/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/hammer/contrib/ipfilter/fils.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ip_sfil.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipf.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipft_ef.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipft_td.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipft_tx.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/ipmon.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/kmem.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/hammer/contrib/ipfilter/man/ipnat.5#2 integrate .. //depot/projects/hammer/contrib/ipfilter/parse.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/printnat.c#2 integrate .. //depot/projects/hammer/contrib/ipfilter/rules/example.9#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/expected/f13#2 integrate .. //depot/projects/hammer/contrib/ipfilter/test/input/f13#2 integrate .. //depot/projects/hammer/contrib/libf2c/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/libf2c/aclocal.m4#2 integrate .. //depot/projects/hammer/contrib/libf2c/configure#2 integrate .. //depot/projects/hammer/contrib/libf2c/configure.in#2 integrate .. //depot/projects/hammer/contrib/libf2c/libF77/Version.c#2 integrate .. //depot/projects/hammer/contrib/libf2c/libI77/Version.c#2 integrate .. //depot/projects/hammer/contrib/libf2c/libU77/Version.c#2 integrate .. //depot/projects/hammer/contrib/libobjc/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/libobjc/aclocal.m4#2 integrate .. //depot/projects/hammer/contrib/libobjc/configure#2 integrate .. //depot/projects/hammer/contrib/libobjc/configure.in#2 integrate .. //depot/projects/hammer/contrib/libstdc++/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/libstdc++/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/libstdc++/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/libstdc++/acinclude.m4#2 integrate .. //depot/projects/hammer/contrib/libstdc++/aclocal.m4#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config.h.in#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/abi/i686-pc-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/cpu/m68k/bits/atomicity.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/linker-map.gnu#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/generic/c_locale.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/generic/ctype_members.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/generic/monetary_members.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/generic/time_members.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/ctype_members.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/messages_members.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/messages_members.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/monetary_members.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/time_members.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/ieee_1003.1-2001/codecvt_specializations.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/aix/bits/ctype_noninline.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/generic/bits/ctype_noninline.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/gnu-linux/bits/os_defines.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_inline.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_noninline.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix5.2/bits/os_defines.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_inline.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/newlib/bits/ctype_inline.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/newlib/bits/ctype_noninline.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_base.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_inline.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_noninline.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/os/qnx/qnx6.1/bits/os_defines.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_base.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_noninline.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.5/bits/os_defines.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_noninline.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.6/bits/os_defines.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/solaris/solaris2.7/bits/os_defines.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/configure#2 integrate .. //depot/projects/hammer/contrib/libstdc++/configure.in#2 integrate .. //depot/projects/hammer/contrib/libstdc++/configure.target#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/backward/strstream#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/basic_ios.tcc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/basic_string.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/basic_string.tcc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/c++config#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/char_traits.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/fpos.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/fstream.tcc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/istream.tcc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/locale_facets.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/locale_facets.tcc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/ostream.tcc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/sstream.tcc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/stl_bvector.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/stl_deque.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/stl_iterator.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/stl_pair.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/streambuf.tcc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/streambuf_iterator.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/c/std_cerrno.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/c/std_cmath.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/c/std_csetjmp.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/c/std_cstdarg.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/c/std_cstddef.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/c/std_cstdio.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/c/std_cwchar.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/c/std_cwctype.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/assert.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/ctype.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/errno.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/float.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/iso646.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/limits.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/locale.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/math.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/setjmp.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/signal.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/stdarg.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/stddef.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/stdio.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/stdlib.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/string.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/time.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/wchar.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_compatibility/wctype.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/include/c_std/std_cmath.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/algorithm#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/hash_map#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/hash_set#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/iterator#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/numeric#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/rb_tree#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/slist#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/stdio_filebuf.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/stl_hashtable.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/ext/stl_rope.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/std/std_bitset.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/std/std_fstream.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/std/std_istream.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/std/std_memory.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/std/std_streambuf.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/libmath/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/libstdc++/libsupc++/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/libstdc++/libsupc++/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/libstdc++/libsupc++/cxxabi.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/libsupc++/eh_alloc.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/libsupc++/new#2 integrate .. //depot/projects/hammer/contrib/libstdc++/libsupc++/new_handler.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/libsupc++/new_op.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/libsupc++/pure.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/libsupc++/tinfo.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/libsupc++/tinfo2.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/ext-inst.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/fstream-inst.cc#1 branch .. //depot/projects/hammer/contrib/libstdc++/src/fstream.cc#1 branch .. //depot/projects/hammer/contrib/libstdc++/src/io-inst.cc#1 branch .. //depot/projects/hammer/contrib/libstdc++/src/istream-inst.cc#1 branch .. //depot/projects/hammer/contrib/libstdc++/src/locale-inst.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/locale.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/localename.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/misc-inst.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/ostream-inst.cc#1 branch .. //depot/projects/hammer/contrib/libstdc++/src/sstream-inst.cc#1 branch .. //depot/projects/hammer/contrib/libstdc++/src/streambuf-inst.cc#1 branch .. //depot/projects/hammer/contrib/libstdc++/src/strstream.cc#2 integrate .. //depot/projects/hammer/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/hammer/contrib/sendmail/cf/README#2 integrate .. //depot/projects/hammer/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/hammer/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/hammer/contrib/sendmail/contrib/etrn.0#1 branch .. //depot/projects/hammer/contrib/sendmail/contrib/etrn.pl#2 integrate .. //depot/projects/hammer/contrib/sendmail/contrib/expn.pl#2 integrate .. //depot/projects/hammer/contrib/sendmail/doc/op/op.me#2 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/conf.h#2 integrate .. //depot/projects/hammer/contrib/sendmail/include/sm/varargs.h#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/comm.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libmilter/listener.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/clock.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/libsm/ldap.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/mail.local/mail.local.8#2 integrate .. //depot/projects/hammer/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/mailstats/mailstats.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/praliases/praliases.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/rmail/rmail.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/smrsh/smrsh.8#2 integrate .. //depot/projects/hammer/contrib/sendmail/smrsh/smrsh.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/TRACEFLAGS#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/aliases.5#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/deliver.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/domain.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/map.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/milter.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/sasl.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/sendmail.8#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/sfsasl.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/hammer/contrib/sendmail/vacation/vacation.1#2 integrate .. //depot/projects/hammer/contrib/sendmail/vacation/vacation.c#2 integrate .. //depot/projects/hammer/contrib/tar/src/buffer.c#2 integrate .. //depot/projects/hammer/contrib/top/display.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/ChangeLog.2001#1 branch .. //depot/projects/hammer/crypto/heimdal/Makefile.am.common#2 integrate .. //depot/projects/hammer/crypto/heimdal/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/NEWS#2 integrate .. //depot/projects/hammer/crypto/heimdal/acconfig.h#2 delete .. //depot/projects/hammer/crypto/heimdal/aclocal.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/admin/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/admin/copy.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/admin/ktutil.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/admin/ktutil.cat8#2 integrate .. //depot/projects/hammer/crypto/heimdal/admin/srvconvert.c#2 delete .. //depot/projects/hammer/crypto/heimdal/admin/srvcreate.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/afsutil/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/afsutil/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/afsutil/pagsh.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/dceutils/ChangeLog#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/dceutils/Makefile.am#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/dceutils/Makefile.in#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/dceutils/README.dcedfs#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/dceutils/README.original#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/dceutils/compile#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/dceutils/dfspag.exp#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/dceutils/dpagaix.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/dceutils/k5dce.h#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/dceutils/k5dcecon.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/dceutils/testpag.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/common/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/ftp.1#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/ftp.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/ftp.cat1#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/gssapi.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/main.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/extern.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ftpd.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ftpd.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ftpusers.5#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ls.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/pathnames.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/popen.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/kauth/ChangeLog#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kauth/Makefile.am#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kauth/Makefile.in#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kauth/encdata.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kauth/kauth.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kauth/kauth.h#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kauth/kauthd.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kauth/ksrvtgt.in#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kauth/marshall.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kauth/rkinit.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kauth/zrefresh#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kf/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/kf/kf.cat1#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/kf/kfd.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/kf/kfd.cat8#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/kx/ChangeLog#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/Makefile.am#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/Makefile.in#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/common.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/context.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/krb4.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/krb5.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/kx.1#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/kx.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/kx.cat1#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/kx.h#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/kxd.8#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/kxd.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/kxd.cat8#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/rxtelnet.1#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/rxtelnet.cat1#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/rxtelnet.in#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/rxterm.1#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/rxterm.cat1#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/rxterm.in#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/tenletxr.1#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/tenletxr.cat1#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/tenletxr.in#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/kx/writeauth.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/login/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/login/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/login/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/login/login.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/login/login_locl.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/login/login_protos.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/otp/ChangeLog#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/otp/Makefile.am#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/otp/Makefile.in#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/otp/otp.1#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/otp/otp.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/otp/otp.cat1#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/otp/otp_locl.h#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/otp/otpprint.1#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/otp/otpprint.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/otp/otpprint.cat1#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/ChangeLog#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/Makefile.am#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/Makefile.in#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/README#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/README-FIRST#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/README-KRB4#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/maildir.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop3.rfc1081#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop3e.rfc1082#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_auth.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_debug.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_dele.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_dropcopy.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_dropinfo.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_get_command.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_init.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_last.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_list.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_log.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_msg.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_parse.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_pass.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_quit.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_rset.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_send.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_stat.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_uidl.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_updt.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_user.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/pop_xover.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/popper.8#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/popper.README.release#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/popper.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/popper.h#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/popper/version.h#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/push/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/push/pfrom.1#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/push/pfrom.cat1#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/push/push.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/push/push.cat8#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rcp/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/common.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/rsh.1#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/rsh.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/rsh_locl.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/rshd.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/rshd.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/su/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/su/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/su/su.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/libtelnet/auth-proto.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/libtelnet/rsaencpwd.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnet/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnet/commands.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnet/externs.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnet/main.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnet/sys_bsd.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnet/telnet.1#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnet/telnet.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnet/telnet.cat1#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnetd/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/test/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/ChangeLog#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/Makefile.am#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/Makefile.in#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/README#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/nose.0.left#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/nose.0.right#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/nose.1.left#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/nose.1.right#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/nose.down#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/nose.front#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/nose.left.front#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/nose.right.front#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/xnlock.1#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/xnlock.c#2 delete .. //depot/projects/hammer/crypto/heimdal/appl/xnlock/xnlock.cat1#2 delete .. //depot/projects/hammer/crypto/heimdal/cf/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/Makefile.am.common#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/aix.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/auth-modules.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/broken-getaddrinfo.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/broken.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/broken2.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/crypto.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/db.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/destdirs.m4#1 branch .. //depot/projects/hammer/crypto/heimdal/cf/dlopen.m4#1 branch .. //depot/projects/hammer/crypto/heimdal/cf/find-if-not-broken.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/irix.m4#1 branch .. //depot/projects/hammer/crypto/heimdal/cf/krb-bigendian.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-func-getcwd-broken.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-ipv6.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-irix.m4#2 delete .. //depot/projects/hammer/crypto/heimdal/cf/krb-readline.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-sys-nextstep.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-version.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/make-proto.pl#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/mips-abi.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/misc.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/need-proto.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/osfc2.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/otp.m4#1 branch .. //depot/projects/hammer/crypto/heimdal/cf/roken-frag.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/roken.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/sunos.m4#1 branch .. //depot/projects/hammer/crypto/heimdal/cf/telnet.m4#1 branch .. //depot/projects/hammer/crypto/heimdal/cf/test-package.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/config.guess#2 integrate .. //depot/projects/hammer/crypto/heimdal/config.sub#2 integrate .. //depot/projects/hammer/crypto/heimdal/configure#2 integrate .. //depot/projects/hammer/crypto/heimdal/configure.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/doc/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/include/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/include/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/include/bits.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/include/config.h.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/include/kadm5/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/include/stamp-h.in#2 delete .. //depot/projects/hammer/crypto/heimdal/install-sh#2 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/ank.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/kadmin.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/kadmin.cat8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/kadmind.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/kadmind.cat8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/server.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/util.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/version4.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/524.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/config.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/connect.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/hprop-common.c#2 delete .. //depot/projects/hammer/crypto/heimdal/kdc/hprop.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/hprop.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/hprop.cat8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/hpropd.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/hpropd.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/hpropd.cat8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kaserver.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kdc.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kdc.cat8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kdc_locl.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kerberos4.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kerberos4.h#2 delete .. //depot/projects/hammer/crypto/heimdal/kdc/kerberos5.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kstash.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kstash.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kstash.cat8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/log.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/main.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/string2key.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/string2key.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/string2key.cat8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kpasswd/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/kpasswd/kpasswd.1#2 integrate .. //depot/projects/hammer/crypto/heimdal/kpasswd/kpasswd.cat1#2 integrate .. //depot/projects/hammer/crypto/heimdal/kpasswd/kpasswdd.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kpasswd/kpasswdd.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kpasswd/kpasswdd.cat8#2 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/kdestroy.cat1#2 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/kgetcred.1#2 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/kgetcred.cat1#2 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/kinit.1#2 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/kinit.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/kinit.cat1#2 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/klist.1#2 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/klist.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/klist.cat1#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/45/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/45/mk_req.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/asn1_print.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/check-der.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/der_get.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/gen.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/gen_decode.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/k5.asn1#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/pam/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/pam/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/sia/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/com_err/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/com_err/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/com_err/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/com_err/com_err.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/com_err/compile_et.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/editline/ChangeLog#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/Makefile.am#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/Makefile.in#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/README#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/complete.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/edit_compat.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/edit_compat.h#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/editline.3#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/editline.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/editline.cat3#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/editline.h#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/roken_rename.h#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/sysunix.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/testit.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/editline/unix.h#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/8003.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/acquire_cred.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/import_name.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/inquire_cred.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/release_cred.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/unwrap.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/verify_mic.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/hdb-private.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/hdb-protos.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/keytab.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/mkey.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/print.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/context_s.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/dump_log.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/init_c.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/iprop.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/ipropd_master.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/ipropd_slave.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/kadm5-private.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/kadm5-protos.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/log.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/private.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/replay_log.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/send_recv.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kafs/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kafs/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kafs/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kafs/common.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kafs/kafs.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kafs/kafs.cat3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kafs/roken_rename.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/acl.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/addr_families.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/aname_to_localname.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/auth_context.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/cache.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/changepw.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/config_file.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/constants.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/context.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/crypto.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/fcache.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/get_addrs.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/get_cred.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/get_for_creds.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/get_host_realm.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/get_in_tkt.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/init_creds_pw.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/kerberos.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/keytab.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/keytab_any.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/keytab_file.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/keytab_keyfile.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/keytab_krb4.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5-private.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5-protos.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5.conf.5#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_425_conv_principal.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_appdefault.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_auth_context.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_build_principal.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_config.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_context.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_create_checksum.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_crypto_init.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_encrypt.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_free_addresses.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_free_principal.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_get_all_client_addrs.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_get_krbhst.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_init_context.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_keytab.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_krbhst_init.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_locl.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_openlog.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_parse_name.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_principal_get_realm.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_sname_to_principal.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_timeofday.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_unparse_name.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_verify_user.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_warn.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krbhst-test.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krbhst.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/log.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/mcache.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/mk_error.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/net_read.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/net_write.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/parse-name-test.c#1 branch .. //depot/projects/hammer/crypto/heimdal/lib/krb5/principal.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/rd_cred.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/recvauth.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/send_to_kdc.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/store-int.h#1 branch .. //depot/projects/hammer/crypto/heimdal/lib/krb5/store.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/store_emem.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/store_fd.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/store_mem.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/test_get_addrs.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/verify_init.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/verify_krb5_conf.8#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/verify_krb5_conf.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/verify_user.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/otp/ChangeLog#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/Makefile.am#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/Makefile.in#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/otp.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/otp.h#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/otp_challenge.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/otp_db.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/otp_locl.h#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/otp_md.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/otp_md.h#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/otp_parse.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/otp_print.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/otp_verify.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/otptest.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/otp/roken_rename.h#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/roken/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/err.h#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/roken/fnmatch.h#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/roken/getarg.3#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/getarg.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/getarg.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/glob.h#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/roken/localtime_r.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/make-print-version.c#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/roken/mini_inetd.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/ndbm_wrap.c#1 branch .. //depot/projects/hammer/crypto/heimdal/lib/roken/ndbm_wrap.h#1 branch .. //depot/projects/hammer/crypto/heimdal/lib/roken/resolve.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/resolve.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/roken-common.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/roken.def#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/roken/roken.dsp#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/roken/roken.h.in#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/roken.mak#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/roken/roken.rc#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/roken/snprintf.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/strftime.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 10 6:22:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 510B037B406; Tue, 10 Sep 2002 06:22:46 -0700 (PDT) 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 9B66B37B400 for ; Tue, 10 Sep 2002 06:22:45 -0700 (PDT) Received: from mail.speakeasy.net (mail17.speakeasy.net [216.254.0.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3910043E3B for ; Tue, 10 Sep 2002 06:22:45 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 26441 invoked from network); 10 Sep 2002 13:22:42 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail17.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 10 Sep 2002 13:22:42 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g8ADMhBv031455; Tue, 10 Sep 2002 09:22:43 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200209100041.g8A0funH044533@freefall.freebsd.org> Date: Tue, 10 Sep 2002 09:22:44 -0400 (EDT) From: John Baldwin To: Peter Wemm Subject: RE: PERFORCE change 17292 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 10-Sep-2002 Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17292 > > Change 17292 by peter@peter_daintree on 2002/09/09 17:40:28 > > IFC @17289 > Affected files ... > > .. //depot/projects/hammer/MAINTAINERS#2 integrate Fear! -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 10 13:16:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3971C37B400; Tue, 10 Sep 2002 13:16:17 -0700 (PDT) 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 D9FD537B401 for ; Tue, 10 Sep 2002 13:16:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EFFF43E72 for ; Tue, 10 Sep 2002 13:16:15 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8AKGFJU045222 for ; Tue, 10 Sep 2002 13:16:15 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8AKGF2j045209 for perforce@freebsd.org; Tue, 10 Sep 2002 13:16:15 -0700 (PDT) Date: Tue, 10 Sep 2002 13:16:15 -0700 (PDT) Message-Id: <200209102016.g8AKGF2j045209@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17348 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17348 Change 17348 by mini@freefall on 2002/09/10 13:15:43 libc_r -> libpthread. Affected files ... .. //depot/projects/kse/lib/libc_r/Makefile#2 delete .. //depot/projects/kse/lib/libc_r/arch/alpha/_atomic_lock.S#2 delete .. //depot/projects/kse/lib/libc_r/arch/i386/_atomic_lock.S#2 delete .. //depot/projects/kse/lib/libc_r/arch/i386/_thread_enter_uts.S#2 delete .. //depot/projects/kse/lib/libc_r/arch/i386/_thread_switch.S#2 delete .. //depot/projects/kse/lib/libc_r/arch/ia64/_atomic_lock.S#2 delete .. //depot/projects/kse/lib/libc_r/man/Makefile.inc#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_attr.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_cancel.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_cleanup_pop.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_cleanup_push.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_cond_broadcast.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_cond_destroy.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_cond_init.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_cond_signal.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_cond_timedwait.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_cond_wait.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_condattr.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_create.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_detach.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_equal.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_exit.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_getspecific.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_join.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_key_create.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_key_delete.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_kill.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_mutex_destroy.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_mutex_init.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_mutex_lock.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_mutex_trylock.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_mutex_unlock.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_mutexattr.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_once.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_rwlock_destroy.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_rwlock_init.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_rwlock_rdlock.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_rwlock_unlock.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_rwlock_wrlock.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_rwlockattr_destroy.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_rwlockattr_getpshared.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_rwlockattr_init.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_rwlockattr_setpshared.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_schedparam.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_self.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_setspecific.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_sigmask.3#2 delete .. //depot/projects/kse/lib/libc_r/man/pthread_testcancel.3#2 delete .. //depot/projects/kse/lib/libc_r/man/sem_destroy.3#2 delete .. //depot/projects/kse/lib/libc_r/man/sem_getvalue.3#2 delete .. //depot/projects/kse/lib/libc_r/man/sem_init.3#2 delete .. //depot/projects/kse/lib/libc_r/man/sem_open.3#2 delete .. //depot/projects/kse/lib/libc_r/man/sem_post.3#2 delete .. //depot/projects/kse/lib/libc_r/man/sem_wait.3#2 delete .. //depot/projects/kse/lib/libc_r/man/sigwait.3#2 delete .. //depot/projects/kse/lib/libc_r/sys/Makefile.inc#3 delete .. //depot/projects/kse/lib/libc_r/sys/uthread_error.c#2 delete .. //depot/projects/kse/lib/libc_r/test/Makefile#2 delete .. //depot/projects/kse/lib/libc_r/test/README#2 delete .. //depot/projects/kse/lib/libc_r/test/guard_b.c#2 delete .. //depot/projects/kse/lib/libc_r/test/guard_b.exp#2 delete .. //depot/projects/kse/lib/libc_r/test/guard_s.pl#2 delete .. //depot/projects/kse/lib/libc_r/test/hello_b.c#2 delete .. //depot/projects/kse/lib/libc_r/test/hello_d.c#2 delete .. //depot/projects/kse/lib/libc_r/test/hello_d.exp#2 delete .. //depot/projects/kse/lib/libc_r/test/hello_s.c#2 delete .. //depot/projects/kse/lib/libc_r/test/join_leak_d.c#2 delete .. //depot/projects/kse/lib/libc_r/test/join_leak_d.exp#2 delete .. //depot/projects/kse/lib/libc_r/test/mutex_d.c#2 delete .. //depot/projects/kse/lib/libc_r/test/mutex_d.exp#2 delete .. //depot/projects/kse/lib/libc_r/test/propagate_s.pl#2 delete .. //depot/projects/kse/lib/libc_r/test/sem_d.c#2 delete .. //depot/projects/kse/lib/libc_r/test/sem_d.exp#2 delete .. //depot/projects/kse/lib/libc_r/test/sigsuspend_d.c#2 delete .. //depot/projects/kse/lib/libc_r/test/sigsuspend_d.exp#2 delete .. //depot/projects/kse/lib/libc_r/test/sigwait_d.c#2 delete .. //depot/projects/kse/lib/libc_r/test/sigwait_d.exp#2 delete .. //depot/projects/kse/lib/libc_r/test/verify#2 delete .. //depot/projects/kse/lib/libc_r/uthread/Makefile.inc#7 delete .. //depot/projects/kse/lib/libc_r/uthread/pthread_private.h#10 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_aio_suspend.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_destroy.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getdetachstate.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getguardsize.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getinheritsched.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getschedparam.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getschedpolicy.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getscope.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getstackaddr.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_getstacksize.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_init.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setdetachstate.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setguardsize.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setinheritsched.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setschedparam.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setschedpolicy.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setscope.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setstackaddr.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_attr_setstacksize.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_autoinit.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_cancel.c#5 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_clean.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_close.c#5 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_cond.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_condattr_destroy.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_condattr_init.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_creat.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_create.c#8 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_detach.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_equal.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_exit.c#5 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_fcntl.c#5 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_find_thread.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_fork.c#4 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_fsync.c#4 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_gc.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_getprio.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_getschedparam.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_info.c#5 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_init.c#9 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_join.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_kern.c#10 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_kill.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_main_np.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_mattr_init.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_mattr_kind_np.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_msync.c#4 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_multi_np.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_mutex.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_mutex_prioceiling.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_mutex_protocol.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_mutexattr_destroy.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_nanosleep.c#2 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_once.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_open.c#4 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_pause.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_poll.c#4 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_printf.c#2 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_priority_queue.c#4 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_pselect.c#4 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_read.c#5 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_readv.c#5 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_resume_np.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_rwlock.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_rwlockattr.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_select.c#5 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_self.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_sem.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_seterrno.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_setprio.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_setschedparam.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_sigmask.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_sigsuspend.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_sigwait.c#4 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_single_np.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_sleep.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_spec.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_spinlock.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_stack.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_suspend_np.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_switch_np.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_system.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_tcdrain.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_vfork.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_wait.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_wait4.c#4 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_waitpid.c#3 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_write.c#5 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_writev.c#5 delete .. //depot/projects/kse/lib/libc_r/uthread/uthread_yield.c#3 delete .. //depot/projects/kse/lib/libpthread/Makefile#1 add .. //depot/projects/kse/lib/libpthread/arch/alpha/_atomic_lock.S#1 add .. //depot/projects/kse/lib/libpthread/arch/i386/_atomic_lock.S#1 add .. //depot/projects/kse/lib/libpthread/arch/i386/_thread_enter_uts.S#1 add .. //depot/projects/kse/lib/libpthread/arch/i386/_thread_switch.S#1 add .. //depot/projects/kse/lib/libpthread/arch/ia64/_atomic_lock.S#1 add .. //depot/projects/kse/lib/libpthread/man/Makefile.inc#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_attr.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_cancel.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_cleanup_pop.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_cleanup_push.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_cond_broadcast.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_cond_destroy.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_cond_init.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_cond_signal.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_cond_timedwait.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_cond_wait.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_condattr.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_create.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_detach.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_equal.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_exit.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_getspecific.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_join.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_key_create.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_key_delete.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_kill.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_destroy.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_init.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_lock.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_trylock.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_unlock.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_mutexattr.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_once.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_destroy.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_init.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_rdlock.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_unlock.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_wrlock.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_destroy.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_getpshared.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_init.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_setpshared.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_schedparam.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_self.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_setspecific.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_sigmask.3#1 add .. //depot/projects/kse/lib/libpthread/man/pthread_testcancel.3#1 add .. //depot/projects/kse/lib/libpthread/man/sem_destroy.3#1 add .. //depot/projects/kse/lib/libpthread/man/sem_getvalue.3#1 add .. //depot/projects/kse/lib/libpthread/man/sem_init.3#1 add .. //depot/projects/kse/lib/libpthread/man/sem_open.3#1 add .. //depot/projects/kse/lib/libpthread/man/sem_post.3#1 add .. //depot/projects/kse/lib/libpthread/man/sem_wait.3#1 add .. //depot/projects/kse/lib/libpthread/man/sigwait.3#1 add .. //depot/projects/kse/lib/libpthread/sys/Makefile.inc#1 add .. //depot/projects/kse/lib/libpthread/sys/uthread_error.c#1 add .. //depot/projects/kse/lib/libpthread/test/Makefile#1 add .. //depot/projects/kse/lib/libpthread/test/README#1 add .. //depot/projects/kse/lib/libpthread/test/guard_b.c#1 add .. //depot/projects/kse/lib/libpthread/test/guard_b.exp#1 add .. //depot/projects/kse/lib/libpthread/test/guard_s.pl#1 add .. //depot/projects/kse/lib/libpthread/test/hello_b.c#1 add .. //depot/projects/kse/lib/libpthread/test/hello_d.c#1 add .. //depot/projects/kse/lib/libpthread/test/hello_d.exp#1 add .. //depot/projects/kse/lib/libpthread/test/hello_s.c#1 add .. //depot/projects/kse/lib/libpthread/test/join_leak_d.c#1 add .. //depot/projects/kse/lib/libpthread/test/join_leak_d.exp#1 add .. //depot/projects/kse/lib/libpthread/test/mutex_d.c#1 add .. //depot/projects/kse/lib/libpthread/test/mutex_d.exp#1 add .. //depot/projects/kse/lib/libpthread/test/propagate_s.pl#1 add .. //depot/projects/kse/lib/libpthread/test/sem_d.c#1 add .. //depot/projects/kse/lib/libpthread/test/sem_d.exp#1 add .. //depot/projects/kse/lib/libpthread/test/sigsuspend_d.c#1 add .. //depot/projects/kse/lib/libpthread/test/sigsuspend_d.exp#1 add .. //depot/projects/kse/lib/libpthread/test/sigwait_d.c#1 add .. //depot/projects/kse/lib/libpthread/test/sigwait_d.exp#1 add .. //depot/projects/kse/lib/libpthread/test/verify#1 add .. //depot/projects/kse/lib/libpthread/uthread/Makefile.inc#1 add .. //depot/projects/kse/lib/libpthread/uthread/pthread_private.h#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_aio_suspend.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_destroy.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getdetachstate.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getguardsize.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getinheritsched.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getschedparam.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getschedpolicy.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getscope.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getstackaddr.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_getstacksize.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_init.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setcreatesuspend_np.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setdetachstate.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setguardsize.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setinheritsched.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setschedparam.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setschedpolicy.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setscope.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setstackaddr.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_attr_setstacksize.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_autoinit.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_cancel.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_clean.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_close.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_cond.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_condattr_destroy.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_condattr_init.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_creat.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_create.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_detach.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_equal.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_exit.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_fcntl.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_find_thread.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_fork.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_fsync.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_gc.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_getprio.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_getschedparam.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_info.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_init.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_join.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_kern.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_kill.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_main_np.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_mattr_init.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_mattr_kind_np.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_msync.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_multi_np.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_mutex.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_mutex_prioceiling.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_mutex_protocol.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_mutexattr_destroy.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_nanosleep.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_once.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_open.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_pause.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_poll.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_printf.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_priority_queue.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_pselect.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_read.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_readv.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_resume_np.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_rwlock.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_rwlockattr.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_select.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_self.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_sem.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_seterrno.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_setprio.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_setschedparam.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_sigmask.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_sigsuspend.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_sigwait.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_single_np.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_sleep.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_spec.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_spinlock.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_stack.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_suspend_np.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_switch_np.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_system.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_tcdrain.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_vfork.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_wait.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_wait4.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_waitpid.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_write.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_writev.c#1 add .. //depot/projects/kse/lib/libpthread/uthread/uthread_yield.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 10 13:32:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B03D37B401; Tue, 10 Sep 2002 13:32:31 -0700 (PDT) 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 D3BDD37B400 for ; Tue, 10 Sep 2002 13:32:29 -0700 (PDT) Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E4F043E4A for ; Tue, 10 Sep 2002 13:32:29 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 12879 invoked from network); 10 Sep 2002 20:32:28 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 10 Sep 2002 20:32:28 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g8AKWQBv032695; Tue, 10 Sep 2002 16:32:27 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200209102016.g8AKGF2j045209@freefall.freebsd.org> Date: Tue, 10 Sep 2002 16:32:27 -0400 (EDT) From: John Baldwin To: Jonathan Mini Subject: RE: PERFORCE change 17348 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 10-Sep-2002 Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17348 > > Change 17348 by mini@freefall on 2002/09/10 13:15:43 > > libc_r -> libpthread. Next time you move files, you might want to read 'p4 help rename' first to make it a bit smoother. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 10 13:37:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9170837B401; Tue, 10 Sep 2002 13:37:36 -0700 (PDT) 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 F1FE937B400; Tue, 10 Sep 2002 13:37:35 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F35D43E75; Tue, 10 Sep 2002 13:37:35 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id 75BEAAE165; Tue, 10 Sep 2002 13:37:35 -0700 (PDT) Date: Tue, 10 Sep 2002 13:37:35 -0700 From: Jonathan Mini To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17348 for review Message-ID: <20020910203735.GD39524@elvis.mu.org> References: <200209102016.g8AKGF2j045209@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin [jhb@FreeBSD.org] wrote : > > On 10-Sep-2002 Jonathan Mini wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17348 > > > > Change 17348 by mini@freefall on 2002/09/10 13:15:43 > > > > libc_r -> libpthread. > > Next time you move files, you might want to read 'p4 help rename' > first to make it a bit smoother. Oh. =/ -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 10 15:58:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE3DD37B401; Tue, 10 Sep 2002 15:58:29 -0700 (PDT) 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 7FC3937B400 for ; Tue, 10 Sep 2002 15:58:29 -0700 (PDT) Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1916243E4A for ; Tue, 10 Sep 2002 15:58:29 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 29471 invoked from network); 10 Sep 2002 22:58:28 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 10 Sep 2002 22:58:28 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g8AMwRBv033155; Tue, 10 Sep 2002 18:58:27 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20020910203735.GD39524@elvis.mu.org> Date: Tue, 10 Sep 2002 18:58:27 -0400 (EDT) From: John Baldwin To: Jonathan Mini Subject: Re: PERFORCE change 17348 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 10-Sep-2002 Jonathan Mini wrote: > John Baldwin [jhb@FreeBSD.org] wrote : > >> >> On 10-Sep-2002 Jonathan Mini wrote: >> > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17348 >> > >> > Change 17348 by mini@freefall on 2002/09/10 13:15:43 >> > >> > libc_r -> libpthread. >> >> Next time you move files, you might want to read 'p4 help rename' >> first to make it a bit smoother. > > Oh. =/ No worries, we all get to learn something new everyday. :) -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 10 16:30:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88E1437B401; Tue, 10 Sep 2002 16:29:16 -0700 (PDT) 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 23CD137B400 for ; Tue, 10 Sep 2002 16:29:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83E4843E6A for ; Tue, 10 Sep 2002 16:29:15 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8ANTFJU099723 for ; Tue, 10 Sep 2002 16:29:15 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8ANTF8x099720 for perforce@freebsd.org; Tue, 10 Sep 2002 16:29:15 -0700 (PDT) Date: Tue, 10 Sep 2002 16:29:15 -0700 (PDT) Message-Id: <200209102329.g8ANTF8x099720@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17353 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17353 Change 17353 by mini@freefall on 2002/09/10 16:28:44 - s/libc_r/libpthread/g - Make libkse, not libpthread. This should help reduce confusion. Affected files ... .. //depot/projects/kse/lib/libpthread/Makefile#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_attr.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_cancel.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_cleanup_pop.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_cleanup_push.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_cond_broadcast.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_cond_destroy.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_cond_init.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_cond_signal.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_cond_timedwait.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_cond_wait.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_condattr.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_create.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_detach.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_equal.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_exit.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_getspecific.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_join.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_key_create.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_key_delete.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_kill.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_destroy.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_init.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_lock.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_trylock.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_mutex_unlock.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_mutexattr.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_once.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_destroy.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_init.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_rdlock.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_unlock.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_rwlock_wrlock.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_destroy.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_getpshared.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_init.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_setpshared.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_schedparam.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_self.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_setspecific.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_sigmask.3#2 edit .. //depot/projects/kse/lib/libpthread/man/pthread_testcancel.3#2 edit .. //depot/projects/kse/lib/libpthread/man/sem_destroy.3#2 edit .. //depot/projects/kse/lib/libpthread/man/sem_getvalue.3#2 edit .. //depot/projects/kse/lib/libpthread/man/sem_init.3#2 edit .. //depot/projects/kse/lib/libpthread/man/sem_open.3#2 edit .. //depot/projects/kse/lib/libpthread/man/sem_post.3#2 edit .. //depot/projects/kse/lib/libpthread/man/sem_wait.3#2 edit .. //depot/projects/kse/lib/libpthread/man/sigwait.3#2 edit .. //depot/projects/kse/lib/libpthread/test/Makefile#2 edit .. //depot/projects/kse/lib/libpthread/test/README#2 edit .. //depot/projects/kse/lib/libpthread/test/propagate_s.pl#2 edit .. //depot/projects/kse/lib/libpthread/uthread/uthread_sigwait.c#2 edit Differences ... ==== //depot/projects/kse/lib/libpthread/Makefile#2 (text+ko) ==== @@ -7,14 +7,14 @@ # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -LIB=c_r +LIB=kse SHLIB_MAJOR= 5 SHLIB_MINOR= 0 CFLAGS+=-DPTHREAD_KERNEL -D_THREAD_SAFE CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/uthread \ -I${.CURDIR}/../../include -# Uncomment this if you want libc_r to contain debug information for +# Uncomment this if you want libpthread to contain debug information for # thread locking. CFLAGS+=-D_LOCK_DEBUG ==== //depot/projects/kse/lib/libpthread/man/pthread_attr.3#2 (text+ko) ==== @@ -50,7 +50,7 @@ .Nm pthread_attr_getscope .Nd thread attribute operations .Sh LIBRARY -.Lb libc_r +.Lb libpthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_cancel.3#2 (text+ko) ==== @@ -6,7 +6,7 @@ .Nm pthread_cancel .Nd cancel execution of a thread .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_cleanup_pop.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_cleanup_pop .Nd call the first cleanup routine .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft void ==== //depot/projects/kse/lib/libpthread/man/pthread_cleanup_push.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_cleanup_push .Nd add a cleanup function for thread exit .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft void ==== //depot/projects/kse/lib/libpthread/man/pthread_cond_broadcast.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_cond_broadcast .Nd unblock all threads waiting for a condition variable .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_cond_destroy.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_cond_destroy .Nd destroy a condition variable .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_cond_init.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_cond_init .Nd create a condition variable .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_cond_signal.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_cond_signal .Nd unblock a thread waiting for a condition variable .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_cond_timedwait.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_cond_timedwait .Nd "wait on a condition variable for a specific amount of time" .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_cond_wait.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_cond_wait .Nd wait on a condition variable .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_condattr.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_condattr_destroy .Nd condition attribute operations .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_create.3#2 (text+ko) ==== @@ -37,7 +37,7 @@ .Nm pthread_create .Nd create a new thread .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_detach.3#2 (text+ko) ==== @@ -37,7 +37,7 @@ .Nm pthread_detach .Nd detach a thread .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_equal.3#2 (text+ko) ==== @@ -37,7 +37,7 @@ .Nm pthread_equal .Nd compare thread IDs .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_exit.3#2 (text+ko) ==== @@ -37,7 +37,7 @@ .Nm pthread_exit .Nd terminate the calling thread .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft void ==== //depot/projects/kse/lib/libpthread/man/pthread_getspecific.3#2 (text+ko) ==== @@ -37,7 +37,7 @@ .Nm pthread_getspecific .Nd get a thread-specific data value .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft void * ==== //depot/projects/kse/lib/libpthread/man/pthread_join.3#2 (text+ko) ==== @@ -37,7 +37,7 @@ .Nm pthread_join .Nd wait for thread termination .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_key_create.3#2 (text+ko) ==== @@ -37,7 +37,7 @@ .Nm pthread_key_create .Nd thread-specific data key creation .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_key_delete.3#2 (text+ko) ==== @@ -37,7 +37,7 @@ .Nm pthread_key_delete .Nd delete a thread-specific data key .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_kill.3#2 (text+ko) ==== @@ -33,7 +33,7 @@ .Nm pthread_kill .Nd send a signal to a specified thread .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .In signal.h ==== //depot/projects/kse/lib/libpthread/man/pthread_mutex_destroy.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_mutex_destroy .Nd free resources allocated for a mutex .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_mutex_init.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_mutex_init .Nd create a mutex .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_mutex_lock.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_mutex_lock .Nd lock a mutex .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_mutex_trylock.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_mutex_trylock .Nd attempt to lock a mutex without blocking .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_mutex_unlock.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_mutex_unlock .Nd unlock a mutex .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_mutexattr.3#2 (text+ko) ==== @@ -40,7 +40,7 @@ .Nm pthread_mutexattr_gettype .Nd mutex attribute operations .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_once.3#2 (text+ko) ==== @@ -37,7 +37,7 @@ .Nm pthread_once .Nd dynamic package initialization .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Pp ==== //depot/projects/kse/lib/libpthread/man/pthread_rwlock_destroy.3#2 (text+ko) ==== @@ -31,7 +31,7 @@ .Nm pthread_rwlock_destroy .Nd destroy a read/write lock .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_rwlock_init.3#2 (text+ko) ==== @@ -31,7 +31,7 @@ .Nm pthread_rwlock_init .Nd initialize a read/write lock .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_rwlock_rdlock.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .Nm pthread_rwlock_tryrdlock .Nd acquire a read/write lock for reading .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_rwlock_unlock.3#2 (text+ko) ==== @@ -31,7 +31,7 @@ .Nm pthread_rwlock_unlock .Nd release a read/write lock .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_rwlock_wrlock.3#2 (text+ko) ==== @@ -32,7 +32,7 @@ .Nm pthread_rwlock_trywrlock .Nd acquire a read/write lock for writing .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_destroy.3#2 (text+ko) ==== @@ -31,7 +31,7 @@ .Nm pthread_rwlockattr_destroy .Nd destroy a read/write lock .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_getpshared.3#2 (text+ko) ==== @@ -31,7 +31,7 @@ .Nm pthread_rwlockattr_getpshared .Nd get the process shared attribute .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_init.3#2 (text+ko) ==== @@ -31,7 +31,7 @@ .Nm pthread_rwlockattr_init .Nd initialize a read/write lock .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_rwlockattr_setpshared.3#2 (text+ko) ==== @@ -31,7 +31,7 @@ .Nm pthread_rwlockattr_setpshared .Nd set the process shared attribute .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_schedparam.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm pthread_getschedparam .Nd thread scheduling parameter manipulation .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_self.3#2 (text+ko) ==== @@ -37,7 +37,7 @@ .Nm pthread_self .Nd get the calling thread's ID .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft pthread_t ==== //depot/projects/kse/lib/libpthread/man/pthread_setspecific.3#2 (text+ko) ==== @@ -37,7 +37,7 @@ .Nm pthread_setspecific .Nd set a thread-specific data value .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/pthread_sigmask.3#2 (text+ko) ==== @@ -33,7 +33,7 @@ .Nm pthread_sigmask .Nd examine and/or change a thread's signal mask .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .In signal.h ==== //depot/projects/kse/lib/libpthread/man/pthread_testcancel.3#2 (text+ko) ==== @@ -8,7 +8,7 @@ .Nm pthread_testcancel .Nd set cancelability state .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In pthread.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/sem_destroy.3#2 (text+ko) ==== @@ -33,7 +33,7 @@ .Nm sem_destroy .Nd destroy an unnamed semaphore .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In semaphore.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/sem_getvalue.3#2 (text+ko) ==== @@ -33,7 +33,7 @@ .Nm sem_getvalue .Nd get the value of a semaphore .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In semaphore.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/sem_init.3#2 (text+ko) ==== @@ -33,7 +33,7 @@ .Nm sem_init .Nd initialize an unnamed semaphore .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In semaphore.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/sem_open.3#2 (text+ko) ==== @@ -35,7 +35,7 @@ .Nm sem_unlink .Nd named semaphore operations .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In semaphore.h .Ft sem_t * ==== //depot/projects/kse/lib/libpthread/man/sem_post.3#2 (text+ko) ==== @@ -33,7 +33,7 @@ .Nm sem_post .Nd increment (unlock) a semaphore .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In semaphore.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/sem_wait.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .Nm sem_trywait .Nd decrement (lock) a semaphore .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In semaphore.h .Ft int ==== //depot/projects/kse/lib/libpthread/man/sigwait.3#2 (text+ko) ==== @@ -33,7 +33,7 @@ .Nm sigwait .Nd select a set of signals .Sh LIBRARY -.Lb libc_r +.Lb pthread .Sh SYNOPSIS .In signal.h .Ft int ==== //depot/projects/kse/lib/libpthread/test/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ # # $FreeBSD: src/lib/libc_r/test/Makefile,v 1.9 2001/07/20 04:23:10 jasone Exp $ # -# Automated test suite for libc_r (pthreads). +# Automated test suite for pthread (pthreads). # # File lists. @@ -26,7 +26,7 @@ LDFLAGS_A := -static LDFLAGS_P := -pg LDFLAGS_S := -LIBS := -lc_r +LIBS := -lpthread # Flags passed to verify. "-v" or "-u" may be useful. VFLAGS := ==== //depot/projects/kse/lib/libpthread/test/README#2 (text+ko) ==== @@ -3,10 +3,10 @@ This test suite is meant to test general functionality of pthreads, as well as provide a simple framework for regression tests. In general, this test suite can be used with any pthreads library, but in reality there are a number of -libc_r-specific aspects to this test suite which would require some effort to -get around if testing another pthreads library. +libpthread-specific aspects to this test suite which would require some effort +to get around if testing another pthreads library. -This test suite assumes that libc_r is installed. +This test suite assumes that pthread is installed. There are two forms of test that the 'verify' script understands. The simpler form is the diff format, where the output of the test program is diff'ed with ==== //depot/projects/kse/lib/libpthread/test/propagate_s.pl#2 (text+ko) ==== @@ -29,7 +29,7 @@ # ########################################################################### # -# Verify that no cancellation points are propagated inside of libc_r. +# Verify that no cancellation points are propagated inside of pthread. # # $FreeBSD: src/lib/libc_r/test/propagate_s.pl,v 1.1 2000/04/26 23:25:58 jasone Exp $ # ==== //depot/projects/kse/lib/libpthread/uthread/uthread_sigwait.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -//depot/projects/kse/lib/libc_r/uthread/uthread_sigwait.c#1 - branch change 15154 (text+ko) /* * Copyright (c) 1997 John Birrell . * All rights reserved. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 10 17:33:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CD1C37B401; Tue, 10 Sep 2002 17:33:25 -0700 (PDT) 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 6172937B400; Tue, 10 Sep 2002 17:33:24 -0700 (PDT) Received: from magic.adaptec.com (magic.adaptec.com [208.236.45.80]) by mx1.FreeBSD.org (Postfix) with ESMTP id D439643E6E; Tue, 10 Sep 2002 17:33:23 -0700 (PDT) (envelope-from scottl@btc.adaptec.com) Received: from redfish.adaptec.com (redfish.adaptec.com [162.62.50.11]) by magic.adaptec.com (8.10.2+Sun/8.10.2) with ESMTP id g8B0XNG18144; Tue, 10 Sep 2002 17:33:23 -0700 (PDT) Received: from btc.btc.adaptec.com (btc.btc.adaptec.com [10.100.0.52]) by redfish.adaptec.com (8.8.8+Sun/8.8.8) with ESMTP id RAA08571; Tue, 10 Sep 2002 17:33:22 -0700 (PDT) Received: from hollin.btc.adaptec.com (hollin [10.100.253.56]) by btc.btc.adaptec.com (8.8.8+Sun/8.8.8) with ESMTP id SAA06741; Tue, 10 Sep 2002 18:33:19 -0600 (MDT) Received: from hollin.btc.adaptec.com (localhost [127.0.0.1]) by hollin.btc.adaptec.com (8.12.5/8.12.5) with ESMTP id g8B0UedK052489; Tue, 10 Sep 2002 18:30:40 -0600 (MDT) (envelope-from scottl@hollin.btc.adaptec.com) Received: (from scottl@localhost) by hollin.btc.adaptec.com (8.12.5/8.12.5/Submit) id g8B0UeIU052488; Tue, 10 Sep 2002 18:30:40 -0600 (MDT) Date: Tue, 10 Sep 2002 18:30:40 -0600 From: Scott Long To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17353 for review Message-ID: <20020911003040.GA52472@hollin.btc.adaptec.com> References: <200209102329.g8ANTF8x099720@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200209102329.g8ANTF8x099720@freefall.freebsd.org> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, Sep 10, 2002 at 04:29:15PM -0700, Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17353 > > Change 17353 by mini@freefall on 2002/09/10 16:28:44 > > - s/libc_r/libpthread/g > - Make libkse, not libpthread. This should help reduce confusion. > > Affected files ... I'm really consfused. Nowhere in the diff does it mention libkse. I'm also confused as to why 'libkse' is less confusing that 'libpthread'. Scott To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 10 17:39:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B6FB37B401; Tue, 10 Sep 2002 17:39:36 -0700 (PDT) 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 1855237B400 for ; Tue, 10 Sep 2002 17:39:36 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id D32E243E4A for ; Tue, 10 Sep 2002 17:39:35 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id B01DCAE25C; Tue, 10 Sep 2002 17:39:35 -0700 (PDT) Date: Tue, 10 Sep 2002 17:39:35 -0700 From: Jonathan Mini To: Scott Long Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17353 for review Message-ID: <20020911003935.GC3866@elvis.mu.org> References: <200209102329.g8ANTF8x099720@freefall.freebsd.org> <20020911003040.GA52472@hollin.btc.adaptec.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20020911003040.GA52472@hollin.btc.adaptec.com> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Scott Long [scott_long@btc.adaptec.com] wrote : > I'm really consfused. Nowhere in the diff does it mention libkse. I'm > also confused as to why 'libkse' is less confusing that 'libpthread'. The Makefile makes and installs "libkse" not "libpthread." -- i.e., LIB=kse in Makefile. The problem is this: We're going to have both this library and the old libc_r active at the same time. Eventually, the KSE version of pthreads will be default (perhaps even the only option), and will be linked via -lpthread. Right now, -pthread is basically just an alias for -lc_r. Linking against pthreads via -lpthead is a common method on other OS's, and it wuold be quite easy for users to accidentally get the KSE version, especially with autoconf involved. We want people to have to explicitly request linking with the KSE version, thus calling it 'libkse' in the short term. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 11 10: 9:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05C7837B41C; Wed, 11 Sep 2002 10:09:22 -0700 (PDT) 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 D3DD737B434 for ; Wed, 11 Sep 2002 10:09:14 -0700 (PDT) Received: from mail.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by mx1.FreeBSD.org (Postfix) with ESMTP id 77DD143E42 for ; Wed, 11 Sep 2002 10:09:13 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 18008 invoked from network); 11 Sep 2002 17:09:12 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 11 Sep 2002 17:09:12 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g8BH9BBv035512; Wed, 11 Sep 2002 13:09:11 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20020911003935.GC3866@elvis.mu.org> Date: Wed, 11 Sep 2002 13:09:12 -0400 (EDT) From: John Baldwin To: Jonathan Mini Subject: Re: PERFORCE change 17353 for review Cc: Perforce Change Reviews Cc: Perforce Change Reviews , Scott Long Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 11-Sep-2002 Jonathan Mini wrote: > Scott Long [scott_long@btc.adaptec.com] wrote : > >> I'm really consfused. Nowhere in the diff does it mention libkse. I'm >> also confused as to why 'libkse' is less confusing that 'libpthread'. > > The Makefile makes and installs "libkse" not "libpthread." -- i.e., > LIB=kse in Makefile. > > The problem is this: We're going to have both this library and the > old libc_r active at the same time. Eventually, the KSE version of > pthreads will be default (perhaps even the only option), and will > be linked via -lpthread. Right now, -pthread is basically just an > alias for -lc_r. Linking against pthreads via -lpthead is a common > method on other OS's, and it wuold be quite easy for users to > accidentally get the KSE version, especially with autoconf involved. > > We want people to have to explicitly request linking with the KSE version, > thus calling it 'libkse' in the short term. Well, once it is working, we want people to use -lpthread. I guess that it is your intention however. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 11 13:12:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 177F637B401; Wed, 11 Sep 2002 13:12:45 -0700 (PDT) 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 0B49737B400 for ; Wed, 11 Sep 2002 13:12:44 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EEE143E42 for ; Wed, 11 Sep 2002 13:12:43 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8BKChJU095345 for ; Wed, 11 Sep 2002 13:12:43 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8BKCguG095331 for perforce@freebsd.org; Wed, 11 Sep 2002 13:12:42 -0700 (PDT) Date: Wed, 11 Sep 2002 13:12:42 -0700 (PDT) Message-Id: <200209112012.g8BKCguG095331@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17387 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17387 Change 17387 by mini@mini_stylus on 2002/09/11 13:12:26 Add userland prototypes for KSE syscalls. Affected files ... .. //depot/projects/kse/sys/sys/kse.h#19 edit Differences ... ==== //depot/projects/kse/sys/sys/kse.h#19 (text+ko) ==== @@ -74,4 +74,11 @@ int tm_spare[8]; }; +#ifndef _KERNEL_ +int kse_exit(void); +int kse_wakeup(void); +int kse_new(struct kse_mailbox *, int); +int kse_yield(void); +#endif + #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 11 13:24:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD1DF37B401; Wed, 11 Sep 2002 13:23:02 -0700 (PDT) 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 7A79837B400 for ; Wed, 11 Sep 2002 13:23:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 862D343E42 for ; Wed, 11 Sep 2002 13:23:01 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8BKN1JU035536 for ; Wed, 11 Sep 2002 13:23:01 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8BKMt41035497 for perforce@freebsd.org; Wed, 11 Sep 2002 13:22:55 -0700 (PDT) Date: Wed, 11 Sep 2002 13:22:55 -0700 (PDT) Message-Id: <200209112022.g8BKMt41035497@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 17388 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17388 Change 17388 by jhb@jhb_laptop on 2002/09/11 13:22:48 IFC @17385. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#47 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#15 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#9 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/i386_module.c#6 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#17 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#27 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#9 integrate .. //depot/projects/smpng/sys/compat/linux/linux_sysctl.c#4 integrate .. //depot/projects/smpng/sys/compat/linux/linux_uid16.c#13 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#14 integrate .. //depot/projects/smpng/sys/conf/NOTES#23 integrate .. //depot/projects/smpng/sys/conf/files#49 integrate .. //depot/projects/smpng/sys/conf/files.i386#30 integrate .. //depot/projects/smpng/sys/conf/options#35 integrate .. //depot/projects/smpng/sys/conf/options.i386#17 integrate .. //depot/projects/smpng/sys/conf/options.pc98#19 integrate .. //depot/projects/smpng/sys/conf/options.x86_64#2 integrate .. //depot/projects/smpng/sys/ddb/db_ps.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#32 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#19 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#15 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#7 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#9 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#23 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#18 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#17 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#16 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#9 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#7 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs.h#7 integrate .. //depot/projects/smpng/sys/dev/pccard/card_if.m#7 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#12 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#16 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#16 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#18 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#16 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#10 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#7 integrate .. //depot/projects/smpng/sys/dev/puc/pucvar.h#4 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#11 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#14 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#9 integrate .. //depot/projects/smpng/sys/geom/geom.h#10 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#6 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#9 integrate .. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#11 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#27 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#41 integrate .. //depot/projects/smpng/sys/i386/i386/bios.c#12 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/initcpu.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#44 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#26 integrate .. //depot/projects/smpng/sys/i386/ibcs2/imgact_coff.c#11 integrate .. //depot/projects/smpng/sys/i386/include/pci_cfgreg.h#3 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#25 integrate .. //depot/projects/smpng/sys/i386/linux/linux_genassym.c#3 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#16 integrate .. //depot/projects/smpng/sys/i386/linux/linux_ptrace.c#3 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#21 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#8 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#12 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_genassym.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/i4b_hdlc.c#1 branch .. //depot/projects/smpng/sys/i4b/layer1/i4b_hdlc.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_hdlc.h#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#5 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#20 integrate .. //depot/projects/smpng/sys/ia64/conf/SKI#6 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#42 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#17 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#5 integrate .. //depot/projects/smpng/sys/kern/imgact_aout.c#16 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#19 integrate .. //depot/projects/smpng/sys/kern/init_main.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#10 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_kthread.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_rman.c#9 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#14 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#59 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#20 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#23 integrate .. //depot/projects/smpng/sys/kern/tty.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#31 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#44 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#9 integrate .. //depot/projects/smpng/sys/libkern/strlcat.c#2 integrate .. //depot/projects/smpng/sys/libkern/strlcpy.c#2 integrate .. //depot/projects/smpng/sys/modules/Makefile#32 integrate .. //depot/projects/smpng/sys/modules/aout/Makefile#1 branch .. //depot/projects/smpng/sys/modules/if_gre/Makefile#1 branch .. //depot/projects/smpng/sys/modules/linux/Makefile#9 integrate .. //depot/projects/smpng/sys/modules/pccbb/Makefile#2 delete .. //depot/projects/smpng/sys/modules/pecoff/Makefile#2 integrate .. //depot/projects/smpng/sys/net/ethernet.h#6 integrate .. //depot/projects/smpng/sys/net/if_gif.c#11 integrate .. //depot/projects/smpng/sys/net/if_gif.h#6 integrate .. //depot/projects/smpng/sys/net/if_gre.c#1 branch .. //depot/projects/smpng/sys/net/if_gre.h#1 branch .. //depot/projects/smpng/sys/netatalk/at.h#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#15 integrate .. //depot/projects/smpng/sys/netinet/in.h#15 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#14 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#4 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.c#1 branch .. //depot/projects/smpng/sys/netinet/ip_gre.h#1 branch .. //depot/projects/smpng/sys/netinet/ip_mroute.c#16 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/smpng/sys/netns/ns.h#4 integrate .. //depot/projects/smpng/sys/netns/ns_if.h#3 integrate .. //depot/projects/smpng/sys/nfs/nfsnode.h#4 delete .. //depot/projects/smpng/sys/nfsclient/nfs.h#10 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#13 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#16 integrate .. //depot/projects/smpng/sys/nfsclient/nfsmount.h#4 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#39 integrate .. //depot/projects/smpng/sys/pccard/pccard.c#15 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#19 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#15 integrate .. //depot/projects/smpng/sys/pci/if_rlreg.h#7 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#9 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#9 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#12 integrate .. //depot/projects/smpng/sys/posix4/ksched.c#8 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#9 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#17 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#33 integrate .. //depot/projects/smpng/sys/sys/bio.h#9 integrate .. //depot/projects/smpng/sys/sys/dirent.h#3 integrate .. //depot/projects/smpng/sys/sys/disklabel.h#19 integrate .. //depot/projects/smpng/sys/sys/extattr.h#5 integrate .. //depot/projects/smpng/sys/sys/imgact_aout.h#6 integrate .. //depot/projects/smpng/sys/sys/linker_set.h#3 integrate .. //depot/projects/smpng/sys/sys/nlist_aout.h#2 integrate .. //depot/projects/smpng/sys/sys/proc.h#57 integrate .. //depot/projects/smpng/sys/sys/snoop.h#5 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/smpng/sys/sys/systm.h#35 integrate .. //depot/projects/smpng/sys/sys/timetc.h#9 integrate .. //depot/projects/smpng/sys/sys/ucontext.h#3 integrate .. //depot/projects/smpng/sys/sys/vnode.h#24 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#5 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#18 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#20 integrate .. //depot/projects/smpng/sys/vm/swap_pager.h#4 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#17 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#9 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#15 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#47 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.183 2002/08/31 03:33:30 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.184 2002/09/07 19:12:27 jmallett Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1387,6 +1387,8 @@ sf.sf_si.si_signo = sig; sf.sf_si.si_code = code; sf.sf_si.si_addr = (void*)frame->tf_regs[FRAME_TRAPARG_A0]; + sf.sf_si.si_pid = p->p_pid; + sf.sf_si.si_uid = p->p_ucred->cr_uid; } else frame->tf_regs[FRAME_A1] = code; ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.70 2002/08/15 20:55:00 rwatson Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.71 2002/09/07 01:26:33 peter Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -395,29 +395,6 @@ } /* - * Dump the machine specific header information at the start of a core dump. - */ -int -cpu_coredump(td, vp, cred) - struct thread *td; - struct vnode *vp; - struct ucred *cred; -{ - int error; - - /* XXXKSE this is totally bogus! (and insecure) */ - error = vn_rdwr(UIO_WRITE, vp, (caddr_t) td->td_proc->p_uarea, - ctob(UAREA_PAGES), (off_t)0, - UIO_SYSSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); - if (error) - return error; - error = vn_rdwr(UIO_WRITE, vp, (caddr_t) td->td_kstack, - ctob(KSTACK_PAGES), (off_t)ctob(UAREA_PAGES), - UIO_SYSSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); - return error; -} - -/* * Map an IO request into kernel virtual address space. * * All requests are (re)mapped into kernel VA space. ==== //depot/projects/smpng/sys/alpha/linux/linux_machdep.c#9 (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. * - * $FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.22 2002/06/29 17:26:12 julian Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.23 2002/09/11 08:13:52 julian Exp $ */ #include @@ -180,6 +180,7 @@ * Make this runnable after we are finished with it. */ mtx_lock_spin(&sched_lock); + TD_SET_CAN_RUN(td2); setrunqueue(FIRST_THREAD_IN_PROC(p2)); mtx_unlock_spin(&sched_lock); ==== //depot/projects/smpng/sys/boot/i386/libi386/i386_module.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.8 2002/08/30 11:11:02 iwasaki Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.9 2002/09/05 11:16:23 iwasaki Exp $ */ /* @@ -44,16 +44,24 @@ i386_autoload(void) { int error; + int disabled; + char *rv; /* XXX use PnP to locate stuff here */ /* autoload ACPI support */ /* XXX should be in 4th keyed off acpi_load */ - if ((getenv("acpi_load") && !getenv("hint.acpi.0.disabled"))) { + disabled = 0; + rv = getenv("hint.acpi.0.disabled"); + if (rv != NULL && strncmp(rv, "0", 1) != 0) { + disabled = 1; + } + + if (getenv("acpi_load") && (!disabled)) { error = mod_load("acpi", NULL, 0, NULL); if (error != 0) printf("ACPI autoload failed - %s\n", strerror(error)); } - + return(0); } ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#19 (text+ko) ==== @@ -38,7 +38,7 @@ * * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 * - * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.53 2002/06/29 17:26:13 julian Exp $ + * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.54 2002/09/11 08:13:52 julian Exp $ */ #include @@ -566,18 +566,13 @@ break; } switch(td2->td_state) { - case TDS_SLP: - case TDS_MTX: + case TDS_INHIBITED: state = "S (sleeping)"; break; case TDS_RUNQ: case TDS_RUNNING: state = "R (running)"; break; - case TDS_NEW: - case TDS_UNQUEUED: - case TDS_IWAIT: - case TDS_SURPLUS: default: state = "? (unknown)"; break; ==== //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#17 (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. * - * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.88 2002/08/18 07:04:58 sobomax Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.89 2002/09/05 02:51:25 marcel Exp $ */ #include @@ -700,7 +700,10 @@ error = (ioctl(td, (struct ioctl_args *)args)); break; - /* LINUX_TIOCSCTTY */ + case LINUX_TIOCSCTTY: + args->cmd = TIOCSCTTY; + error = (ioctl(td, (struct ioctl_args *)args)); + break; case LINUX_TIOCGPGRP: args->cmd = TIOCGPGRP; ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#27 (text+ko) ==== @@ -25,27 +25,25 @@ * (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/compat/linux/linux_misc.c,v 1.126 2002/09/01 22:30:24 iedowse Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.128 2002/09/05 12:30:54 bde Exp $ */ -#include "opt_compat.h" #include "opt_mac.h" #include -#include +#include #include #include #include #include #include #include +#include #include #include #include #include -#include #include -#include #include #include #include @@ -53,8 +51,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -73,6 +71,7 @@ #include #include + #include #include @@ -601,7 +600,7 @@ error = munmap(td, &bsd_args); } - td->td_retval[0] = error ? 0 : (u_long)args->addr; + td->td_retval[0] = error ? 0 : (uintptr_t)args->addr; return error; } ==== //depot/projects/smpng/sys/compat/linux/linux_stats.c#9 (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. * - * $FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.45 2002/09/01 22:30:24 iedowse Exp $ + * $FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.46 2002/09/05 08:13:20 bde Exp $ */ #include "opt_mac.h" @@ -37,15 +37,16 @@ #include #include #include +#include #include #include #include -#include #include #include #include #include + #include static int ==== //depot/projects/smpng/sys/compat/linux/linux_sysctl.c#4 (text+ko) ==== @@ -25,19 +25,15 @@ * (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/compat/linux/linux_sysctl.c,v 1.3 2002/09/01 22:30:24 iedowse Exp $ + * $FreeBSD: src/sys/compat/linux/linux_sysctl.c,v 1.4 2002/09/05 08:13:20 bde Exp $ */ -#include "opt_compat.h" - #include +#include #include -#include -#include #include #include -#include #define LINUX_CTL_KERN 1 #define LINUX_CTL_VM 2 ==== //depot/projects/smpng/sys/compat/linux/linux_uid16.c#13 (text+ko) ==== @@ -23,21 +23,21 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.8 2002/09/01 22:30:24 iedowse Exp $ + * $FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.9 2002/09/05 08:13:20 bde Exp $ */ -#include "opt_compat.h" - #include -#include #include +#include #include #include #include #include +#include #include #include + #include DUMMY(setfsuid16); ==== //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#14 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD$ */ -/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.21 2002/09/01 21:41:22 jake Exp $ */ +/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.25 2002/09/07 22:31:44 peter Exp $ */ /* * Copyright (c) 2000 Masaru OKI @@ -43,7 +43,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - #include #include #include @@ -173,6 +172,7 @@ register struct ucred *cred = td->td_ucred; struct proc *p = td->td_proc; register struct vmspace *vm = p->p_vmspace; + char *tempuser; int error; #ifdef PECOFF_DEBUG struct vm_map *map; @@ -180,12 +180,21 @@ struct reg regs; #endif - if (ctob((UAREA_PAGES+KSTACK_PAGES) + vm->vm_dsize + vm->vm_ssize) >= limit) + if (ctob((uarea_pages + kstack_pages) + vm->vm_dsize + vm->vm_ssize) >= + limit) return (EFAULT); + tempuser = malloc(ctob(uarea_pages + kstack_pages), M_TEMP, + M_WAITOK | M_ZERO); + if (tempuser == NULL) + return (ENOMEM); PROC_LOCK(p); fill_kinfo_proc(p, &p->p_uarea->u_kproc); PROC_UNLOCK(p); - + bcopy(p->p_uarea, tempuser, sizeof(struct user)); + bcopy(td->td_frame, + tempuser + ctob(uarea_pages) + + ((caddr_t)td->td_frame - (caddr_t)td->td_kstack), + sizeof(struct trapframe)); #if PECOFF_DEBUG fill_regs(td, ®s); printf("EIP%x\n", regs.r_eip); @@ -195,17 +204,21 @@ ent = &map->header; printf("%p %p %p\n", ent, ent->prev, ent->next); #endif - error = cpu_coredump(td, vp, cred); + error = vn_rdwr(UIO_WRITE, vp, (caddr_t)tempuser, + ctob(uarea_pages + kstack_pages), + (off_t)0, UIO_SYSSPACE, IO_UNIT, cred, NOCRED, + (int *)NULL, td); + free(tempuser, M_TEMP); if (error == 0) error = vn_rdwr_inchunks(UIO_WRITE, vp, vm->vm_daddr, (int)ctob(vm->vm_dsize), - (off_t)ctob((UAREA_PAGES+KSTACK_PAGES)), + (off_t)ctob((uarea_pages + kstack_pages)), UIO_USERSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); if (error == 0) error = vn_rdwr_inchunks(UIO_WRITE, vp, (caddr_t)trunc_page(USRSTACK - ctob(vm->vm_ssize)), round_page(ctob(vm->vm_ssize)), - (off_t)ctob((UAREA_PAGES+KSTACK_PAGES)) + + (off_t)ctob((uarea_pages + kstack_pages)) + ctob(vm->vm_dsize), UIO_USERSPACE, IO_UNIT, cred, NOCRED, (int *)NULL, td); return (error); ==== //depot/projects/smpng/sys/conf/NOTES#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1071 2002/09/03 19:21:39 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1075 2002/09/11 05:33:09 njl Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -177,7 +177,7 @@ # debug.mutex.prof.collisions - number of hash collisions # debug.mutex.prof.stats - profiling statistics # -options MUTEX_PROFILING +options MUTEX_PROFILING ##################################################################### @@ -427,6 +427,8 @@ # The `gif' device implements IPv6 over IP4 tunneling, # IPv4 over IPv6 tunneling, IPv4 over IPv4 tunneling and # IPv6 over IPv6 tunneling. +# The `gre' device implements two types of IP4 over IP4 tunneling: +# GRE and MOBILE, as specified in the RFC1701 and RFC2004. # The XBONEHACK option allows the same pair of addresses to be configured on # multiple gif interfaces. # The `faith' device captures packets sent to it and diverts them @@ -453,6 +455,7 @@ device tap #Virtual Ethernet driver device tun #Tunnel driver (ppp(8), nos-tun(8)) device sl #Serial Line IP +device gre #IP over IP tunneling device ppp #Point-to-point protocol options PPP_BSDCOMP #PPP BSD-compress support options PPP_DEFLATE #PPP zlib/deflate/gzip support @@ -628,7 +631,7 @@ options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework options SMBFS #SMB/CIFS filesystem -options UDF #Universal Disk Format +options UDF #Universal Disk Format options UMAPFS #UID map filesystem options UNIONFS #Union filesystem # options NODEVFS #disable devices filesystem @@ -748,10 +751,10 @@ ##################################################################### # SECURITY POLICY PARAMETERS -# Support for Mandatory Access Control (MAC) -#options MAC -#options MAC_DEBUG -#options MAC_NONE # Statically link mac_none policy +# Support for Mandatory Access Control (MAC): +options MAC +options MAC_DEBUG +options MAC_NONE # Statically link mac_none policy ##################################################################### @@ -1049,7 +1052,6 @@ device splash # Splash screen and screen saver support # Various screen savers. -device apm_saver # Requires APM device blank_saver device daemon_saver device fade_saver @@ -1228,14 +1230,14 @@ options AHC_TMODE_ENABLE # Compile in aic79xx debugging code. -options AHD_DEBUG +options AHD_DEBUG # Aic79xx driver debugging options. # See the ahd(4) manpage -options AHD_DEBUG_OPTS=0xFFFFFFFF +options AHD_DEBUG_OPTS=0xFFFFFFFF # Print human-readable register definitions when debugging -options AHD_REG_PRETTY_PRINT +options AHD_REG_PRETTY_PRINT # The adw driver will attempt to use memory mapped I/O for all PCI # controllers that have it configured only if this option is set. @@ -1845,12 +1847,6 @@ device joy # PnP aware, hints for nonpnp only hint.joy.0.at="isa" hint.joy.0.port="0x201" -device cy 1 -options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared -hint.cy.0.at="isa" -hint.cy.0.irq="10" -hint.cy.0.maddr="0xd4000" -hint.cy.0.msize="0x2000" device dgb 1 options NDGBPORTS=17 hint.dgb.0.at="isa" ==== //depot/projects/smpng/sys/conf/files#49 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.696 2002/09/02 20:16:22 brooks Exp $ +# $FreeBSD: src/sys/conf/files,v 1.697 2002/09/06 17:12:50 sobomax Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1054,6 +1054,7 @@ net/if_faith.c optional faith net/if_fddisubr.c optional fddi net/if_gif.c optional gif +net/if_gre.c optional gre net/if_iso88025subr.c optional token net/if_loop.c optional loop net/if_media.c standard @@ -1216,6 +1217,7 @@ netinet/igmp.c optional inet netinet/in.c optional inet netinet/in_gif.c optional gif inet +netinet/ip_gre.c optional gre inet netinet/ip_id.c optional inet netinet/in_pcb.c optional inet netinet/in_proto.c optional inet ==== //depot/projects/smpng/sys/conf/files.i386#30 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.415 2002/09/02 00:52:04 brooks Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.418 2002/09/11 12:44:53 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -192,7 +192,7 @@ i386/i386/db_interface.c optional ddb i386/i386/db_trace.c optional ddb i386/i386/dump_machdep.c standard -i386/i386/elan-mmcr.c optional elan-mmcr +i386/i386/elan-mmcr.c optional cpu_elan i386/i386/elf_machdep.c standard i386/i386/exception.s standard i386/i386/i386-gdbstub.c optional ddb @@ -304,6 +304,8 @@ # # isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | ifpnp | itjc # +i4b/layer1/i4b_hdlc.c optional itjc +i4b/layer1/i4b_hdlc.c optional ihfc i4b/layer1/i4b_l1dmux.c optional isic i4b/layer1/i4b_l1lib.c optional isic i4b/layer1/i4b_l1dmux.c optional iwic @@ -395,7 +397,7 @@ isa/psm.c optional psm isa/syscons_isa.c optional sc isa/vga_isa.c optional vga -kern/imgact_aout.c standard +kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip kern/md4c.c optional netsmb kern/subr_diskmbr.c standard ==== //depot/projects/smpng/sys/conf/options#35 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.346 2002/09/01 07:13:10 scottl Exp $ +# $FreeBSD: src/sys/conf/options,v 1.348 2002/09/07 22:07:10 peter Exp $ # # On the handling of kernel options # @@ -88,6 +88,7 @@ GDBSPEED opt_ddb.h GEOM HW_WDOG +KSTACK_PAGES KTRACE KTRACE_REQUEST_POOL opt_ktrace.h LIBICONV @@ -327,6 +328,7 @@ LIBMCHAIN NCP opt_ncp.h NETATALK opt_atalk.h +NS opt_ns.h PPP_BSDCOMP opt_ppp.h PPP_DEFLATE opt_ppp.h PPP_FILTER opt_ppp.h ==== //depot/projects/smpng/sys/conf/options.i386#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.176 2002/07/15 19:11:21 jhb Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.180 2002/09/07 22:07:11 peter Exp $ # Options specific to the i386 platform kernels MATH_EMULATE opt_math_emulate.h @@ -18,11 +18,11 @@ I586_PMC_GUPROF opt_i586_guprof.h COMPAT_OLDISA BROKEN_KEYBOARD_RESET opt_reset.h -KSTACK_PAGES # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems # (see src/sys/conf/options), except for broken debugging options. +COMPAT_AOUT opt_dontuse.h IBCS2 opt_dontuse.h COMPAT_LINUX opt_dontuse.h COMPAT_SVR4 opt_dontuse.h @@ -47,6 +47,7 @@ CPU_CYRIX_NO_LOCK opt_cpu.h CPU_DIRECT_MAPPED_CACHE opt_cpu.h CPU_DISABLE_5X86_LSSER opt_cpu.h +CPU_ELAN opt_cpu.h CPU_FASTER_5X86_FPU opt_cpu.h CPU_I486_ON_386 opt_cpu.h CPU_IORT opt_cpu.h @@ -62,6 +63,7 @@ NO_MEMORY_HOLE opt_cpu.h CPU_ENABLE_SSE opt_cpu.h CPU_ATHLON_SSE_HACK opt_cpu.h +CPU_DISABLE_SSE opt_cpu.h # The CPU type affects the endian conversion functions all over the kernel. I386_CPU opt_global.h ==== //depot/projects/smpng/sys/conf/options.pc98#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.151 2002/07/15 19:11:21 jhb Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.153 2002/09/07 22:07:11 peter Exp $ # Options specific to the pc98 platform kernels MATH_EMULATE opt_math_emulate.h @@ -18,7 +18,6 @@ I586_PMC_GUPROF opt_i586_guprof.h COMPAT_OLDISA BROKEN_KEYBOARD_RESET opt_reset.h -KSTACK_PAGES # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems @@ -62,6 +61,7 @@ NO_MEMORY_HOLE opt_cpu.h CPU_ENABLE_SSE opt_cpu.h CPU_ATHLON_SSE_HACK opt_cpu.h +CPU_DISABLE_SSE opt_cpu.h # The CPU type affects the endian conversion functions all over the kernel. I386_CPU opt_global.h ==== //depot/projects/smpng/sys/conf/options.x86_64#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/conf/options.x86_64,v 1.1 2002/06/30 08:05:21 obrien Exp $ +# $FreeBSD: src/sys/conf/options.x86_64,v 1.2 2002/09/07 22:07:11 peter Exp $ # Options specific to the AMD x86-64 platform kernels PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM PERFMON opt_perfmon.h -KSTACK_PAGES # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h ==== //depot/projects/smpng/sys/ddb/db_ps.c#11 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/db_ps.c,v 1.31 2002/08/31 04:25:44 bde Exp $ + * $FreeBSD: src/sys/ddb/db_ps.c,v 1.32 2002/09/11 08:13:52 julian Exp $ */ #include #include @@ -112,7 +112,7 @@ state = "wait"; break; case PRS_ZOMBIE: - state = "zomp"; + state = "zomb"; break; default: state = "Unkn"; @@ -123,33 +123,56 @@ p->p_ucred != NULL ? p->p_ucred->cr_ruid : 0, pp->p_pid, p->p_pgrp != NULL ? p->p_pgrp->pg_id : 0, p->p_flag, state); - if (p->p_flag & P_KSES) { + if (p->p_flag & P_KSES) db_printf("(threaded) %s\n", p->p_comm); - FOREACH_THREAD_IN_PROC(p, td) { - db_printf( ". . . . . . . " - ". thread %p . . . ", td); - if (td->td_wchan != NULL) { - db_printf("SLP %6s %8p\n", td->td_wmesg, - (void *)td->td_wchan); - } else if (td->td_state == TDS_MTX) { - db_printf("MTX %6s %8p\n", td->td_mtxname, - (void *)td->td_blocked); - } else { - db_printf("--not blocked--\n"); + FOREACH_THREAD_IN_PROC(p, td) { + if (p->p_flag & P_KSES) + db_printf( " thread %p ", td); + if (TD_ON_SLEEPQ(td)) { + if (td->td_flags & TDF_CVWAITQ) + db_printf("[CVQ "); + else + db_printf("[SLPQ "); + db_printf(" %6s %8p]", td->td_wmesg, + (void *)td->td_wchan); + } + switch (td->td_state) { + case TDS_INHIBITED: + if (TD_ON_MUTEX(td)) { + db_printf("[MTX %6s %8p]", + td->td_mtxname, + (void *)td->td_blocked); + } + if (TD_IS_SLEEPING(td)) { + db_printf("[SLP]"); + } + if (TD_IS_SWAPPED(td)) { + db_printf("[SWAP]"); + } + if (TD_IS_SUSPENDED(td)) { + db_printf("[SUSP]"); + } + if (TD_AWAITING_INTR(td)) { + db_printf("[IWAIT]"); } + break; + case TDS_CAN_RUN: + db_printf("[Can run]"); + break; + case TDS_RUNQ: + db_printf("[RUNQ]"); + break; + case TDS_RUNNING: + db_printf("[CPU %d]", td->td_kse->ke_oncpu); + break; + default: + panic("unknown thread state"); } - } else { - td = FIRST_THREAD_IN_PROC(p); - if (td != NULL && td->td_wchan != NULL) { - db_printf(" %-6s %8p", td->td_wmesg, - (void *)td->td_wchan); - } else if (td != NULL && td->td_state == TDS_MTX) { - db_printf(" %6s %8p", td->td_mtxname, - (void *)td->td_blocked); - } else { - db_printf(" "); - } - db_printf(" %s\n", p->p_comm); + if (p->p_flag & P_KSES) + db_printf("\n"); + else + db_printf(" %s\n", p->p_comm); + } /* PROC_UNLOCK(p); */ ==== //depot/projects/smpng/sys/dev/acpica/acpi.c#32 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.72 2002/08/30 11:11:07 iwasaki Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.75 2002/09/06 17:01:06 jhb Exp $ */ #include "opt_acpi.h" @@ -103,8 +103,6 @@ static int acpi_probe(device_t dev); static int acpi_attach(device_t dev); static device_t acpi_add_child(device_t bus, int order, const char *name, int unit); -static int acpi_print_resources(struct resource_list *rl, const char *name, int type, - const char *format); static int acpi_print_child(device_t bus, device_t child); static int acpi_read_ivar(device_t dev, device_t child, int index, uintptr_t *result); static int acpi_write_ivar(device_t dev, device_t child, int index, uintptr_t value); @@ -453,8 +451,6 @@ freeenv(debugpoint); } #endif - if (!acpi_disabled("bus")) - acpi_probe_children(dev); /* * Register our shutdown handlers @@ -504,6 +500,9 @@ /* Register ACPI again to pass the correct argument of pm_func. */ power_pm_register(POWER_PM_TYPE_ACPI, acpi_pm_func, sc); + if (!acpi_disabled("bus")) + acpi_probe_children(dev); + error = 0; out: @@ -532,41 +531,7 @@ return(child); } >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 11 13:28:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CB2E37B401; Wed, 11 Sep 2002 13:28:43 -0700 (PDT) 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 3056437B400; Wed, 11 Sep 2002 13:28:43 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC2F843E65; Wed, 11 Sep 2002 13:28:42 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id CBB6DAE314; Wed, 11 Sep 2002 13:28:42 -0700 (PDT) Date: Wed, 11 Sep 2002 13:28:42 -0700 From: Jonathan Mini To: John Baldwin Cc: Perforce Change Reviews , Scott Long Subject: Re: PERFORCE change 17353 for review Message-ID: <20020911202842.GV3866@elvis.mu.org> References: <20020911003935.GC3866@elvis.mu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin [jhb@FreeBSD.org] wrote : > On 11-Sep-2002 Jonathan Mini wrote: > > > We want people to have to explicitly request linking with the KSE version, > > thus calling it 'libkse' in the short term. > > Well, once it is working, we want people to use -lpthread. I guess that > it is your intention however. It is. -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 12 7:46:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B391637B41F; Thu, 12 Sep 2002 07:46:03 -0700 (PDT) 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 EF13D37B417 for ; Thu, 12 Sep 2002 07:45:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A30B643E65 for ; Thu, 12 Sep 2002 07:45:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8CEjtJU065269 for ; Thu, 12 Sep 2002 07:45:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8CEjt8Z065266 for perforce@freebsd.org; Thu, 12 Sep 2002 07:45:55 -0700 (PDT) Date: Thu, 12 Sep 2002 07:45:55 -0700 (PDT) Message-Id: <200209121445.g8CEjt8Z065266@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17411 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17411 Change 17411 by rwatson@rwatson_sproing on 2002/09/12 07:45:04 When an mbuf is generated on an NFS socket, we need to explicitly perform labeling on the mbuf in advance of the retransmission copy being made, or we panic in the label copy operation since MLS finds an uninitialized label. Affected files ... .. //depot/projects/trustedbsd/mac/sys/modules/nfsclient/Makefile#4 edit .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#12 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/modules/nfsclient/Makefile#4 (text+ko) ==== @@ -5,7 +5,7 @@ SRCS= vnode_if.h \ nfs_bio.c nfs_lock.c nfs_node.c nfs_socket.c nfs_subs.c nfs_nfsiod.c \ nfs_vfsops.c nfs_vnops.c nfs_common.c \ - opt_inet.h opt_nfs.h opt_bootp.h + opt_inet.h opt_mac.h opt_nfs.h opt_bootp.h SRCS+= opt_inet6.h NFS_INET?= 1 # 0/1 - requires INET to be configured in kernel ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#12 (text+ko) ==== @@ -889,6 +889,10 @@ m = nfsm_rpchead(cred, nmp->nm_flag, procnum, auth_type, auth_len, mrest, mrest_len, &mheadend, &xid); +#ifdef MAC + mac_create_mbuf_from_socket(nmp->nm_so, m); +#endif + /* * For stream protocols, insert a Sun RPC Record Mark. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 12 13:44:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D847A37B401; Thu, 12 Sep 2002 13:44:37 -0700 (PDT) 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 79CEB37B400 for ; Thu, 12 Sep 2002 13:44:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3320C43E4A for ; Thu, 12 Sep 2002 13:44:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8CKibJU068005 for ; Thu, 12 Sep 2002 13:44:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8CKiaLD068002 for perforce@freebsd.org; Thu, 12 Sep 2002 13:44:36 -0700 (PDT) Date: Thu, 12 Sep 2002 13:44:36 -0700 (PDT) Message-Id: <200209122044.g8CKiaLD068002@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17419 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17419 Change 17419 by rwatson@rwatson_sproing on 2002/09/12 13:44:01 Fix kasserts with incorrect variable names; because we built these policies only as modules, we didn't get INVARIANTS set. This fixes the INVARIANTS build of mac_mls and mac_biba. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#102 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#84 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#102 (text+ko) ==== @@ -205,9 +205,9 @@ mac_biba_single_in_range(struct mac_biba *single, struct mac_biba *range) { - KASSERT((single->mb_flag & MAC_BIBA_FLAG_SINGLE) != 0, + KASSERT((single->mb_flags & MAC_BIBA_FLAG_SINGLE) != 0, ("mac_biba_single_in_range: a not single")); - KASSERT((range->mb_flag & MAC_BIBA_FLAG_RANGE) != 0, + KASSERT((range->mb_flags & MAC_BIBA_FLAG_RANGE) != 0, ("mac_biba_single_in_range: b not range")); return (mac_biba_dominate_element(&range->mb_rangehigh, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#84 (text+ko) ==== @@ -195,9 +195,9 @@ mac_mls_single_in_range(struct mac_mls *single, struct mac_mls *range) { - KASSERT((single->mm_flag & MAC_MLS_FLAG_SINGLE) != 0, + KASSERT((single->mm_flags & MAC_MLS_FLAG_SINGLE) != 0, ("mac_mls_single_in_range: a not single")); - KASSERT((range->mm_flag & MAC_MLS_FLAG_RANGE) != 0, + KASSERT((range->mm_flags & MAC_MLS_FLAG_RANGE) != 0, ("mac_mls_single_in_range: b not range")); return (mac_mls_dominate_element(&range->mm_rangehigh, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 12 13:47:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A7D337B401; Thu, 12 Sep 2002 13:47:42 -0700 (PDT) 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 B30B737B400 for ; Thu, 12 Sep 2002 13:47:41 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D27243E6E for ; Thu, 12 Sep 2002 13:47:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8CKlfJU068236 for ; Thu, 12 Sep 2002 13:47:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8CKlfZw068233 for perforce@freebsd.org; Thu, 12 Sep 2002 13:47:41 -0700 (PDT) Date: Thu, 12 Sep 2002 13:47:41 -0700 (PDT) Message-Id: <200209122047.g8CKlfZw068233@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17420 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17420 Change 17420 by rwatson@rwatson_sproing on 2002/09/12 13:46:57 Remove unused functions and restore building with -Werror. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#103 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#103 (text+ko) ==== @@ -241,19 +241,6 @@ } static int -mac_biba_equal_range(struct mac_biba *a, struct mac_biba *b) -{ - - KASSERT((a->mb_flags & MAC_BIBA_FLAG_RANGE) != 0, - ("mac_biba_equal_range: a not range")); - KASSERT((b->mb_flags & MAC_BIBA_FLAG_RANGE) != 0, - ("mac_biba_equal_range: b not range")); - - return (mac_biba_equal_element(&a->mb_rangelow, &b->mb_rangelow) && - mac_biba_equal_element(&a->mb_rangehigh, &b->mb_rangehigh)); -} - -static int mac_biba_equal_single(struct mac_biba *a, struct mac_biba *b) { @@ -266,13 +253,6 @@ } static int -mac_biba_high_single(struct mac_biba *mac_biba) -{ - - return (mac_biba->mb_single.mbe_type == MAC_BIBA_TYPE_HIGH); -} - -static int mac_biba_contains_equal(struct mac_biba *mac_biba) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 12 13:48:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC62737B405; Thu, 12 Sep 2002 13:48:43 -0700 (PDT) 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 7F3A037B401 for ; Thu, 12 Sep 2002 13:48:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B90743E42 for ; Thu, 12 Sep 2002 13:48:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8CKmhJU068321 for ; Thu, 12 Sep 2002 13:48:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8CKmg5W068318 for perforce@freebsd.org; Thu, 12 Sep 2002 13:48:42 -0700 (PDT) Date: Thu, 12 Sep 2002 13:48:42 -0700 (PDT) Message-Id: <200209122048.g8CKmg5W068318@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17421 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17421 Change 17421 by rwatson@rwatson_sproing on 2002/09/12 13:47:53 Remove unused function. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#85 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#85 (text+ko) ==== @@ -231,19 +231,6 @@ } static int -mac_mls_equal_range(struct mac_mls *a, struct mac_mls *b) -{ - - KASSERT((a->mm_flags & MAC_MLS_FLAG_RANGE) != 0, - ("mac_mls_equal_range: a not range")); - KASSERT((b->mm_flags & MAC_MLS_FLAG_RANGE) != 0, - ("mac_mls_equal_range: b not range")); - - return (mac_mls_equal_element(&a->mm_rangelow, &b->mm_rangelow) && - mac_mls_equal_element(&a->mm_rangehigh, &b->mm_rangehigh)); -} - -static int mac_mls_equal_single(struct mac_mls *a, struct mac_mls *b) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 12 18:58:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53F9D37B401; Thu, 12 Sep 2002 18:58:09 -0700 (PDT) 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 9B96F37B400 for ; Thu, 12 Sep 2002 18:58:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B8E243E3B for ; Thu, 12 Sep 2002 18:58:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8D1w7JU055071 for ; Thu, 12 Sep 2002 18:58:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8D1w7hg055068 for perforce@freebsd.org; Thu, 12 Sep 2002 18:58:07 -0700 (PDT) Date: Thu, 12 Sep 2002 18:58:07 -0700 (PDT) Message-Id: <200209130158.g8D1w7hg055068@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17426 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17426 Change 17426 by rwatson@rwatson_paprika on 2002/09/12 18:57:59 Provide static linking options for most policies. This means that when we build NOTES/LINT, we'll get INVARIANTS support; also, that users can statically link security modules if the risks of loadable modules concern them, or their environment does not support klds. Affected files ... .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#16 edit .. //depot/projects/trustedbsd/mac/sys/conf/files#48 edit .. //depot/projects/trustedbsd/mac/sys/conf/options#27 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/NOTES#16 (text+ko) ==== @@ -729,8 +729,16 @@ # Support for Mandatory Access Control (MAC) options MAC +options MAC_BIBA +options MAC_BSDEXTENDED options MAC_DEBUG -#options MAC_NONE # Statically link mac_none policy +options MAC_IFOFF +options MAC_MLS +options MAC_NONE +options MAC_PARTITION +options MAC_SEEOTHERUIDS +options MAC_TE +options MAC_TEST ##################################################################### ==== //depot/projects/trustedbsd/mac/sys/conf/files#48 (text+ko) ==== @@ -1356,9 +1356,17 @@ posix4/ksched.c optional _kposix_priority_scheduling posix4/p1003_1b.c standard posix4/posix4_mib.c standard -security/mac_none/mac_none.c optional mac_none +security/mac_biba/mac_biba.c optional mac_biba +security/mac_bsdextended/mac_bsdextended.c optional mac_bsdextended +security/mac_ifoff/mac_ifoff.c optional mac_ifoff security/mac_lomac/mac_lomac.c optional mac_lomac security/mac_lomac/kernel_plm.c optional mac_lomac +security/mac_mls/mac_mls.c optional mac_mls +security/mac_none/mac_none.c optional mac_none +security/mac_partition/mac_partition.c optional mac_partition +security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids +security/mac_te/mac_te.c optional mac_te +security/mac_test/mac_test.c optional mac_test ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_balloc.c optional ffs ufs/ffs/ffs_inode.c optional ffs ==== //depot/projects/trustedbsd/mac/sys/conf/options#27 (text+ko) ==== @@ -125,9 +125,17 @@ # Support for Mandatory Access Control (MAC) MAC opt_mac.h +MAC_BIBA opt_dontuse.h +MAC_BSDEXTENDED opt_dontuse.h MAC_DEBUG opt_mac.h +MAC_IFOFF opt_dontuse.h MAC_LOMAC opt_dontuse.h +MAC_MLS opt_dontuse.h MAC_NONE opt_dontuse.h +MAC_PARTITION opt_dontuse.h +MAC_SEEOTHERUIDS opt_dontuse.h +MAC_TE opt_dontuse.h +MAC_TEST opt_dontuse.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 12 19: 2:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A56A337B401; Thu, 12 Sep 2002 19:02:25 -0700 (PDT) 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 48B8D37B400 for ; Thu, 12 Sep 2002 19:02:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 030A143E65 for ; Thu, 12 Sep 2002 19:02:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8D22OJU055627 for ; Thu, 12 Sep 2002 19:02:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8D22OiC055614 for perforce@freebsd.org; Thu, 12 Sep 2002 19:02:24 -0700 (PDT) Date: Thu, 12 Sep 2002 19:02:24 -0700 (PDT) Message-Id: <200209130202.g8D22OiC055614@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17427 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17427 Change 17427 by rwatson@rwatson_paprika on 2002/09/12 19:01:24 Warning fixes due to parens positioning in assignments. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#104 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#86 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#104 (text+ko) ==== @@ -274,8 +274,8 @@ mac_biba_subject_equal_ok(struct mac_biba *mac_biba) { - KASSERT((mac_biba->mb_flags & MAC_BIBA_FLAGS_BOTH == - MAC_BIBA_FLAGS_BOTH), + KASSERT((mac_biba->mb_flags & MAC_BIBA_FLAGS_BOTH) == + MAC_BIBA_FLAGS_BOTH, ("mac_biba_subject_equal_ok: subject doesn't have both labels")); /* If the single is EQUAL, it's ok */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#86 (text+ko) ==== @@ -264,7 +264,7 @@ mac_mls_subject_equal_ok(struct mac_mls *mac_mls) { - KASSERT((mac_mls->mm_flags & MAC_MLS_FLAGS_BOTH == MAC_MLS_FLAGS_BOTH), + KASSERT((mac_mls->mm_flags & MAC_MLS_FLAGS_BOTH) == MAC_MLS_FLAGS_BOTH, ("mac_mls_subject_equal_ok: subject doesn't have both labels")); /* If the single is EQUAL, it's ok. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 12 19: 3:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A107937B401; Thu, 12 Sep 2002 19:03:27 -0700 (PDT) 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 304DA37B400 for ; Thu, 12 Sep 2002 19:03:27 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA5A643E65 for ; Thu, 12 Sep 2002 19:03:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8D23QJU056999 for ; Thu, 12 Sep 2002 19:03:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8D23QGY056996 for perforce@freebsd.org; Thu, 12 Sep 2002 19:03:26 -0700 (PDT) Date: Thu, 12 Sep 2002 19:03:26 -0700 (PDT) Message-Id: <200209130203.g8D23QGY056996@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17428 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17428 Change 17428 by rwatson@rwatson_paprika on 2002/09/12 19:02:31 Whitespace tweak from last submit. Affected files ... .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/NOTES#17 (text+ko) ==== @@ -730,7 +730,7 @@ # Support for Mandatory Access Control (MAC) options MAC options MAC_BIBA -options MAC_BSDEXTENDED +options MAC_BSDEXTENDED options MAC_DEBUG options MAC_IFOFF options MAC_MLS To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 13 9: 2:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F13C037B401; Fri, 13 Sep 2002 09:02:37 -0700 (PDT) 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 8175E37B400 for ; Fri, 13 Sep 2002 09:02:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15D9F43E3B for ; Fri, 13 Sep 2002 09:02:37 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8DG2aJU038651 for ; Fri, 13 Sep 2002 09:02:36 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8DG2a9K038641 for perforce@freebsd.org; Fri, 13 Sep 2002 09:02:36 -0700 (PDT) Date: Fri, 13 Sep 2002 09:02:36 -0700 (PDT) Message-Id: <200209131602.g8DG2a9K038641@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 17446 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17446 Change 17446 by amigus@amigus_caster on 2002/09/13 09:01:38 Fixes to make kde3 compile. Affected files ... .. //depot/projects/trustedbsd/base/contrib/gcc/calls.c#7 edit .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-lang.c#3 edit .. //depot/projects/trustedbsd/base/contrib/gcc/loop.c#8 edit Differences ... ==== //depot/projects/trustedbsd/base/contrib/gcc/calls.c#7 (text+ko) ==== @@ -4491,7 +4491,7 @@ emit_push_insn for BLKmode is careful to avoid it. */ excess = (arg->size.constant - int_size_in_bytes (TREE_TYPE (pval)) + partial * UNITS_PER_WORD); - size_rtx = expr_size (pval); + size_rtx = GEN_INT (int_size_in_bytes (TREE_TYPE (pval))); } if ((flags & ECF_SIBCALL) && GET_CODE (arg->value) == MEM) ==== //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-lang.c#3 (text+ko) ==== @@ -122,14 +122,8 @@ { if (CLASS_TYPE_P (TREE_TYPE (exp))) { - /* The backend should not be interested in the size of an expression - of a type with both of these set; all copies of such types must go - through a constructor or assignment op. */ - if (TYPE_HAS_COMPLEX_INIT_REF (TREE_TYPE (exp)) - && TYPE_HAS_COMPLEX_ASSIGN_REF (TREE_TYPE (exp))) - abort (); - /* This would be wrong for a type with virtual bases, but they are - caught by the abort above. */ + /* This would be wrong for a type with virtual bases, but they should + not get here. */ return CLASSTYPE_SIZE_UNIT (TREE_TYPE (exp)); } else ==== //depot/projects/trustedbsd/base/contrib/gcc/loop.c#8 (text+ko) ==== @@ -9264,7 +9264,7 @@ { case LE: if ((unsigned HOST_WIDE_INT) const_val != max_val >> 1) - code = LT, op1 = GEN_INT (const_val + 1); + code = LT, op1 = gen_int_mode (const_val + 1, GET_MODE (op0)); break; /* When cross-compiling, const_val might be sign-extended from @@ -9273,17 +9273,17 @@ if ((HOST_WIDE_INT) (const_val & max_val) != (((HOST_WIDE_INT) 1 << (GET_MODE_BITSIZE (GET_MODE (op0)) - 1)))) - code = GT, op1 = GEN_INT (const_val - 1); + code = GT, op1 = gen_int_mode (const_val - 1, GET_MODE (op0)); break; case LEU: if (uconst_val < max_val) - code = LTU, op1 = GEN_INT (uconst_val + 1); + code = LTU, op1 = gen_int_mode (uconst_val + 1, GET_MODE (op0)); break; case GEU: if (uconst_val != 0) - code = GTU, op1 = GEN_INT (uconst_val - 1); + code = GTU, op1 = gen_int_mode (uconst_val - 1, GET_MODE (op0)); break; default: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 13 10: 6:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6329737B401; Fri, 13 Sep 2002 10:04:51 -0700 (PDT) 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 DD6B637B400 for ; Fri, 13 Sep 2002 10:04:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C44B43E42 for ; Fri, 13 Sep 2002 10:04:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8DH4nJU065164 for ; Fri, 13 Sep 2002 10:04:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8DH1pcd062266 for perforce@freebsd.org; Fri, 13 Sep 2002 10:01:51 -0700 (PDT) Date: Fri, 13 Sep 2002 10:01:51 -0700 (PDT) Message-Id: <200209131701.g8DH1pcd062266@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17449 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17449 Change 17449 by rwatson@rwatson_tislabs on 2002/09/13 10:01:04 IFC from trustedbsd_base to trustedbsd_mac. This brings in various things, including an update to the gcc compiler (as well as a patch merged into trustedbsd_base to fix bugs compiling c++ code). This gets the MAC tree almost in sync with the main FreeBSD tree. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#7 integrate .. //depot/projects/trustedbsd/mac/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#22 integrate .. //depot/projects/trustedbsd/mac/UPDATING#15 integrate .. //depot/projects/trustedbsd/mac/bin/csh/USD.doc/csh.g#2 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/ed/main.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/ln/symlink.7#3 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/ls/print.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/pax/ar_subs.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/pax/buf_subs.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/pax/cache.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/file_subs.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/pax/ftree.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/pax/options.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pat_rep.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pax.1#4 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pax.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pax.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tables.h#3 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tar.1#4 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tar.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#9 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.1#4 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/error.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/eval.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/expand.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/jobs.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/parser.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#7 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/ChangeLog#7 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/elf64-alpha.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/bfd/version.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/binutils.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/config.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/binutils/cxxfilt.man#2 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/etc/ChangeLog#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/etc/Makefile.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/gprof/po/Make-in#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/gprof/po/POTFILES.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/gprof/po/gprof.pot#1 branch .. //depot/projects/trustedbsd/mac/contrib/binutils/include/elf/arm-oabi.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/ChangeLog#7 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/configdoc.texi#2 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/emulparams/armelf_linux26.sh#2 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/ldlang.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/binutils/ld/scripttempl/elfppc.sc#2 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/libiberty/acconfig.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/binutils/libiberty/alloca-conf.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/cvs/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/HACKING#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/INSTALL#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/NEWS#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/TESTS#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/TODO#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/acinclude.m4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/compile#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/config.h.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/configure#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/configure.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/cvs_acls.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/pvcs2rcs.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/rcs2log.sh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/rcs2sccs.sh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/contrib/sccs2rcs.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/depcomp#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/diff/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/diff/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/diff/diff3.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/diff/io.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/diff/system.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/cvs.texinfo#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/cvsclient.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/mdate-sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/stamp-1#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/stamp-vti#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/version-client.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/doc/version.texi#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/fnmatch.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/getdate.y#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/getline.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/valloc.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/lib/xselect.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/man/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/man/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/man/cvs.1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/man/cvs.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/mdate-sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/noautomake.sh#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/src/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/admin.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/annotate.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/buffer.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/buffer.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/checkout.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/client.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/client.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/commit.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/cvs.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/diff.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/error.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/filesubr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/find_names.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/history.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/import.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/lock.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/log.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/login.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/logmsg.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/main.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/mkmodules.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/modules.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/myndbm.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/parseinfo.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/patch.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/prepend_args.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/cvs/src/prepend_args.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/cvs/src/rcs.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/recurse.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/remove.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/root.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/root.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/src/sanity.sh#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/server.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/server.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/subr.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/tag.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/update.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/vers_ts.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/version.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/src/version.c.in#2 delete .. //depot/projects/trustedbsd/mac/contrib/cvs/src/version.h.in#1 branch .. //depot/projects/trustedbsd/mac/contrib/cvs/src/wrapper.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/src/zlib.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/tools/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/tools/Makefile.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/cvs/tools/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ChangeLog#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/alias.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/attribs.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/bb-reorder.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/bitmap.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/builtins.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-common.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-decl.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-lang.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-lex.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/c-pragma.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/calls.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfgcleanup.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cfgrtl.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/collect2.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/combine.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config.gcc#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/alpha.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/elf.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/netbsd.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/alpha/unicosmk.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/arm/arm.md#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386-protos.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.md#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/linux64.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/mmintrin.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/netbsd64.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/openbsd.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/unix.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/linux.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/ia64/sysv4.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix43.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/aix51.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/altivec.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/linux64.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/netbsd.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/rs6000.md#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/sysv4.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/rs6000/xcoff.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/netbsd-elf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/openbsd1-64.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/openbsd64.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sol2.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc-protos.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/sparc.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/t-crtfm#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/t-linux64#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/sparc/t-sol2-64#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/configure#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/configure.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/convert.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp-demangle.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/ChangeLog#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/Make-lang.in#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/call.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/class.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cp-lang.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cp-tree.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/cvt.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/decl.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/decl2.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/error.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/init.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/lang-specs.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/lex.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/mangle.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/operators.def#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/pt.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/rtti.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/search.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/tree.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/typeck.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cp/typeck2.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppfiles.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppinit.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpplib.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cpplib.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cppmacro.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cse.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/cselib.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/defaults.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/contrib.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/cpp.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/cppenv.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/include/gcc-common.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/invoke.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/md.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/doc/tm.texi#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dwarf2out.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/dwarfout.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/emit-rtl.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/explow.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expmed.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expr.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/expr.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/ChangeLog#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/bugs.texi#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/news.texi#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/root.texi#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/target.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/f/version.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/final.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/flow.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/fold-const.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/function.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/gcc.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/haifa-sched.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hooks.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/hooks.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/ifcvt.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/langhooks-def.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/langhooks.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/langhooks.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/libgcc2.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/local-alloc.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/loop.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/Make-lang.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/objc/objc-lang.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/optabs.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/print-rtl.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reg-stack.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/regclass.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/regmove.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reload.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/reload1.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/rtl.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-deps.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/sched-int.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/stor-layout.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/system.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/toplev.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tradcpp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/tree-inline.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/unroll.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/varasm.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/version.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/BSD/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/HISTORY#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/fils.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ip_sfil.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipf.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_ef.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_td.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipft_tx.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/ipmon.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/kmem.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipmon.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipnat.5#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/parse.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/printnat.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/rules/example.9#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/expected/f13#2 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/test/input/f13#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/ChangeLog#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/configure#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/configure.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libF77/Version.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libI77/Version.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libf2c/libU77/Version.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libobjc/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libobjc/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libobjc/configure#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libobjc/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/ChangeLog#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/Makefile.am#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/Makefile.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/acinclude.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config.h.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/abi/i686-pc-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/cpu/m68k/bits/atomicity.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/linker-map.gnu#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/generic/c_locale.cc#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/generic/ctype_members.cc#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/generic/monetary_members.cc#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/generic/time_members.cc#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/gnu/ctype_members.cc#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/gnu/messages_members.cc#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/gnu/messages_members.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/gnu/monetary_members.cc#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/gnu/time_members.cc#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/locale/ieee_1003.1-2001/codecvt_specializations.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/aix/bits/ctype_noninline.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/generic/bits/ctype_noninline.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/gnu-linux/bits/os_defines.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_inline.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix5.2/bits/ctype_noninline.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix5.2/bits/os_defines.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/irix/irix6.5/bits/ctype_inline.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/newlib/bits/ctype_inline.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/newlib/bits/ctype_noninline.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_base.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_inline.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/qnx/qnx6.1/bits/ctype_noninline.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/qnx/qnx6.1/bits/os_defines.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_base.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.5/bits/ctype_noninline.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.5/bits/os_defines.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.6/bits/ctype_noninline.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.6/bits/os_defines.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/config/os/solaris/solaris2.7/bits/os_defines.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/configure#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/configure.in#5 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/configure.target#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/Makefile.am#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/backward/strstream#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/basic_ios.tcc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/basic_string.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/basic_string.tcc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/c++config#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/char_traits.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/fpos.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/fstream.tcc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/istream.tcc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/locale_facets.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/locale_facets.tcc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/ostream.tcc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/sstream.tcc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/stl_bvector.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/stl_deque.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/stl_iterator.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/stl_pair.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/streambuf.tcc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/bits/streambuf_iterator.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c/std_cerrno.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c/std_cmath.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c/std_csetjmp.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c/std_cstdarg.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c/std_cstddef.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c/std_cstdio.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c/std_cwchar.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c/std_cwctype.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/assert.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/ctype.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/errno.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/float.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/iso646.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/limits.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/locale.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/math.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/setjmp.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/signal.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/stdarg.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/stddef.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/stdio.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/stdlib.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/string.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/time.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/wchar.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_compatibility/wctype.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/c_std/std_cmath.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/ext/algorithm#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/ext/hash_map#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/ext/hash_set#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/ext/iterator#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/ext/numeric#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/ext/rb_tree#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/ext/slist#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/ext/stdio_filebuf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/ext/stl_hashtable.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/ext/stl_rope.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/std/std_bitset.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/std/std_fstream.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/std/std_istream.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/std/std_memory.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/include/std/std_streambuf.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libmath/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/Makefile.am#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/cxxabi.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/eh_alloc.cc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/new#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/new_handler.cc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/new_op.cc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/pure.cc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/tinfo.cc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/libsupc++/tinfo2.cc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/Makefile.am#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/ext-inst.cc#2 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/fstream-inst.cc#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/fstream.cc#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/io-inst.cc#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/istream-inst.cc#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/locale-inst.cc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/locale.cc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/localename.cc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/misc-inst.cc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/ostream-inst.cc#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/sstream-inst.cc#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/streambuf-inst.cc#1 branch .. //depot/projects/trustedbsd/mac/contrib/libstdc++/src/strstream.cc#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/README#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/proto.m4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/etrn.0#1 branch .. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/etrn.pl#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/expn.pl#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/op.me#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/conf.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/varargs.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/comm.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/engine.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/listener.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/clock.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/ldap.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/mail.local.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/mail.local.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mailstats/mailstats.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/makemap/makemap.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/praliases/praliases.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/rmail/rmail.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/smrsh.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/smrsh/smrsh.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/Makefile.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/TRACEFLAGS#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/aliases.5#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/collect.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/domain.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/err.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/headers.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mailq.1#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/main.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/map.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/mci.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/milter.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/parseaddr.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/readcf.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sasl.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/savemail.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.8#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sfsasl.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/usersmtp.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/vacation/vacation.1#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/vacation/vacation.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tar/src/buffer.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/ChangeLog.2001#1 branch .. //depot/projects/trustedbsd/mac/crypto/heimdal/Makefile.am.common#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/NEWS#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/acconfig.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/admin/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/admin/copy.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/admin/ktutil.8#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/admin/ktutil.cat8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/admin/srvconvert.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/admin/srvcreate.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/afsutil/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/afsutil/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/afsutil/pagsh.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/dceutils/ChangeLog#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/dceutils/Makefile.am#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/dceutils/Makefile.in#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/dceutils/README.dcedfs#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/dceutils/README.original#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/dceutils/compile#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/dceutils/dfspag.exp#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/dceutils/dpagaix.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/dceutils/k5dce.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/dceutils/k5dcecon.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/dceutils/testpag.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/common/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/ftp.1#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/ftp.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/ftp.cat1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/gssapi.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftp/main.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/extern.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ftpd.8#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ftpd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ftpusers.5#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/ls.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/pathnames.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/ftp/ftpd/popen.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kauth/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kauth/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kauth/Makefile.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kauth/encdata.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kauth/kauth.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kauth/kauth.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kauth/kauthd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kauth/ksrvtgt.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kauth/marshall.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kauth/rkinit.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kauth/zrefresh#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kf/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kf/kf.cat1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kf/kfd.8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kf/kfd.cat8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/ChangeLog#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/Makefile.in#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/common.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/context.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/krb4.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/krb5.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/kx.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/kx.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/kx.cat1#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/kx.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/kxd.8#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/kxd.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/kxd.cat8#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/rxtelnet.1#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/rxtelnet.cat1#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/rxtelnet.in#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/rxterm.1#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/rxterm.cat1#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/rxterm.in#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/tenletxr.1#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/tenletxr.cat1#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/tenletxr.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/kx/writeauth.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/login/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/login/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/login/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/login/login.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/login/login_locl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/login/login_protos.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/otp/ChangeLog#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/otp/Makefile.am#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/otp/Makefile.in#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/otp/otp.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/otp/otp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/otp/otp.cat1#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/otp/otp_locl.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/otp/otpprint.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/otp/otpprint.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/otp/otpprint.cat1#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/ChangeLog#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/Makefile.am#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/Makefile.in#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/README-FIRST#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/README-KRB4#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/maildir.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop3.rfc1081#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop3e.rfc1082#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_auth.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_debug.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_dele.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_dropcopy.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_dropinfo.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_get_command.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_init.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_last.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_list.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_log.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_msg.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_parse.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_pass.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_quit.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_rset.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_send.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_stat.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_uidl.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_updt.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_user.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/pop_xover.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/popper.8#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/popper.README.release#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/popper.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/popper.h#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/popper/version.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/push/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/push/pfrom.1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/push/pfrom.cat1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/push/push.8#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/push/push.cat8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rcp/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rsh/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rsh/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rsh/common.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rsh/rsh.1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rsh/rsh.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rsh/rsh_locl.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rsh/rshd.8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/rsh/rshd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/su/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/su/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/su/su.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/libtelnet/auth-proto.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/libtelnet/rsaencpwd.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnet/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnet/commands.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnet/externs.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnet/main.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnet/sys_bsd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnet/telnet.1#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnet/telnet.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnet/telnet.cat1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnetd/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnetd/telnetd.8#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/test/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/ChangeLog#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/Makefile.in#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/nose.0.left#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/nose.0.right#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/nose.1.left#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/nose.1.right#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/nose.down#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/nose.front#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/nose.left.front#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/nose.right.front#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/xnlock.1#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/xnlock.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/appl/xnlock/xnlock.cat1#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/Makefile.am.common#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/aix.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/auth-modules.m4#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/broken-getaddrinfo.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/broken.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/broken2.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/crypto.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/db.m4#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/destdirs.m4#1 branch .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/dlopen.m4#1 branch .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/find-if-not-broken.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/irix.m4#1 branch .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-bigendian.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-func-getcwd-broken.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-ipv6.m4#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-irix.m4#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-readline.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-sys-nextstep.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/krb-version.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/make-proto.pl#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/mips-abi.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/misc.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/need-proto.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/osfc2.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/otp.m4#1 branch .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/roken-frag.m4#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/roken.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/sunos.m4#1 branch .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/telnet.m4#1 branch .. //depot/projects/trustedbsd/mac/crypto/heimdal/cf/test-package.m4#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/config.guess#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/config.sub#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/configure#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/configure.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/doc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/include/Makefile.am#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/include/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/include/bits.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/include/config.h.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/include/kadm5/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/include/stamp-h.in#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/install-sh#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/ank.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/kadmin.8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/kadmin.cat8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/kadmind.8#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/kadmind.cat8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/server.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/util.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kadmin/version4.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/524.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/config.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/connect.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/hprop-common.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/hprop.8#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/hprop.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/hprop.cat8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/hpropd.8#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/hpropd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/hpropd.cat8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kaserver.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kdc.8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kdc.cat8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kdc_locl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kerberos4.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kerberos4.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kerberos5.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kstash.8#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kstash.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/kstash.cat8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/log.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/main.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/string2key.8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/string2key.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kdc/string2key.cat8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kpasswd/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kpasswd/kpasswd.1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kpasswd/kpasswd.cat1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kpasswd/kpasswdd.8#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kpasswd/kpasswdd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kpasswd/kpasswdd.cat8#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/kdestroy.cat1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/kgetcred.1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/kgetcred.cat1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/kinit.1#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/kinit.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/kinit.cat1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/klist.1#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/klist.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/kuser/klist.cat1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/45/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/45/mk_req.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/Makefile.am#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/asn1_print.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/check-der.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/der_get.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/gen.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/gen_decode.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/asn1/k5.asn1#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/pam/Makefile.am#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/pam/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/auth/sia/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/com_err/ChangeLog#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/com_err/Makefile.am#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/com_err/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/com_err/com_err.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/com_err/compile_et.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/ChangeLog#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/Makefile.am#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/Makefile.in#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/README#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/complete.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/edit_compat.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/edit_compat.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/editline.3#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/editline.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/editline.cat3#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/editline.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/roken_rename.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/sysunix.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/testit.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/editline/unix.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/8003.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/Makefile.am#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/acquire_cred.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/import_name.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/inquire_cred.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/release_cred.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/unwrap.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/gssapi/verify_mic.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/hdb/Makefile.am#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/hdb/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/hdb/hdb-private.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/hdb/hdb-protos.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/hdb/keytab.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/hdb/mkey.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/hdb/print.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/Makefile.am#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/context_s.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/dump_log.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/init_c.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/iprop.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/ipropd_master.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/ipropd_slave.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/kadm5-private.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/kadm5-protos.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/log.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/private.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/replay_log.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kadm5/send_recv.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kafs/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kafs/Makefile.am#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kafs/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kafs/common.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kafs/kafs.3#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kafs/kafs.cat3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/kafs/roken_rename.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/Makefile.am#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/acl.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/addr_families.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/aname_to_localname.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/auth_context.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/cache.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/changepw.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/config_file.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/constants.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/context.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/crypto.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/fcache.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/get_addrs.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/get_cred.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/get_for_creds.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/get_host_realm.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/get_in_tkt.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/init_creds_pw.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/kerberos.8#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/keytab.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/keytab_any.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/keytab_file.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/keytab_keyfile.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/keytab_krb4.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5-private.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5-protos.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5.conf.5#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_425_conv_principal.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_appdefault.3#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_auth_context.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_build_principal.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_config.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_context.3#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_create_checksum.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_crypto_init.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_encrypt.3#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_free_addresses.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_free_principal.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_get_all_client_addrs.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_get_krbhst.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_init_context.3#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_keytab.3#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_krbhst_init.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_locl.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_openlog.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_parse_name.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_principal_get_realm.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_sname_to_principal.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_timeofday.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_unparse_name.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_verify_user.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krb5_warn.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krbhst-test.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/krbhst.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/log.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/mcache.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/mk_error.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/net_read.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/net_write.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/parse-name-test.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/principal.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/rd_cred.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/recvauth.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/send_to_kdc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/store-int.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/store.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/store_emem.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/store_fd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/store_mem.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/test_get_addrs.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/verify_init.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/verify_krb5_conf.8#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/verify_krb5_conf.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/krb5/verify_user.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/ChangeLog#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/Makefile.am#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/Makefile.in#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/otp.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/otp.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/otp_challenge.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/otp_db.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/otp_locl.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/otp_md.c#3 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/otp_md.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/otp_parse.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/otp_print.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/otp_verify.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/otptest.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/otp/roken_rename.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/Makefile.am#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/err.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/fnmatch.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/getarg.3#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/getarg.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/getarg.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/glob.h#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/localtime_r.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/make-print-version.c#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/mini_inetd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/ndbm_wrap.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/ndbm_wrap.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/resolve.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/resolve.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/roken-common.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/roken.def#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/roken.dsp#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/roken.h.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/roken.mak#2 delete .. //depot/projects/trustedbsd/mac/crypto/heimdal/lib/roken/roken.rc#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 13 11:27:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E992737B401; Fri, 13 Sep 2002 11:26:49 -0700 (PDT) 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 8A3C737B400 for ; Fri, 13 Sep 2002 11:26:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CEC543E3B for ; Fri, 13 Sep 2002 11:26:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8DIQnJU006525 for ; Fri, 13 Sep 2002 11:26:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8DIQm1B006522 for perforce@freebsd.org; Fri, 13 Sep 2002 11:26:48 -0700 (PDT) Date: Fri, 13 Sep 2002 11:26:48 -0700 (PDT) Message-Id: <200209131826.g8DIQm1B006522@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17453 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17453 Change 17453 by peter@peter_daintree on 2002/09/13 11:26:32 IFC gcore bits for testing Affected files ... .. //depot/projects/ia64/usr.bin/gcore/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/gcore/aoutcore.c#1 branch .. //depot/projects/ia64/usr.bin/gcore/elfcore.c#4 integrate .. //depot/projects/ia64/usr.bin/gcore/extern.h#3 integrate .. //depot/projects/ia64/usr.bin/gcore/gcore.c#6 integrate .. //depot/projects/ia64/usr.bin/gcore/md-nop.c#4 delete .. //depot/projects/ia64/usr.bin/gcore/md-sparc.c#3 delete Differences ... ==== //depot/projects/ia64/usr.bin/gcore/Makefile#3 (text+ko) ==== @@ -1,15 +1,13 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $FreeBSD: src/usr.bin/gcore/Makefile,v 1.7 2002/03/30 17:19:40 dwmalone Exp $ +# $FreeBSD: src/usr.bin/gcore/Makefile,v 1.8 2002/09/13 16:33:35 peter Exp $ PROG= gcore SRCS= elfcore.c gcore.c + +.if ${MACHINE_ARCH} == i386 +SRCS+= aoutcore.c DPADD= ${LIBKVM} LDADD= -lkvm - -.if ${MACHINE_ARCH} != "sparc" -SRCS+= md-nop.c -.else -SRCS+= md-${MACHINE_ARCH}.c .endif .include ==== //depot/projects/ia64/usr.bin/gcore/elfcore.c#4 (text+ko) ==== @@ -25,10 +25,11 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/gcore/elfcore.c,v 1.13 2002/09/05 09:11:19 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/gcore/elfcore.c,v 1.14 2002/09/13 16:33:35 peter Exp $"); #include #include +#include #include #include #include @@ -77,11 +78,26 @@ static void readhdrinfo(pid_t, prstatus_t *, prfpregset_t *, prpsinfo_t *); static vm_map_entry_t readmap(pid_t); +static int +elf_ident(int efd, pid_t pid, char *binfile) +{ + Elf_Ehdr hdr; + int cnt; + uid_t uid; + + cnt = read(efd, &hdr, sizeof(hdr)); + if (cnt != sizeof(hdr)) + return (0); + if (IS_ELF(hdr)) + return (1); + return (0); +} + /* * Write an ELF coredump for the given pid to the given fd. */ void -elf_coredump(int fd, pid_t pid) +elf_coredump(int efd, int fd, pid_t pid) { vm_map_entry_t map; struct sseg_closure seginfo; @@ -357,6 +373,7 @@ static void freemap(vm_map_entry_t map) { + while (map != NULL) { vm_map_entry_t next = map->next; free(map); @@ -514,3 +531,6 @@ free(mapbuf); return map; } + +struct dumpers elfdump = { elf_ident, elf_coredump }; +TEXT_SET(dumpset, elfdump); ==== //depot/projects/ia64/usr.bin/gcore/extern.h#3 (text+ko) ==== @@ -31,12 +31,10 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 6/6/93 - * $FreeBSD: src/usr.bin/gcore/extern.h,v 1.3 2002/03/22 01:22:40 imp Exp $ + * $FreeBSD: src/usr.bin/gcore/extern.h,v 1.4 2002/09/13 16:33:35 peter Exp $ */ -#include -#include - -void err(int, const char *, ...); -void elf_coredump(int, pid_t); -void md_core(kvm_t *, int, struct kinfo_proc *); +struct dumpers { + int (*ident)(int efd, pid_t pid, char *binfile); + void (*dump)(int efd, int fd, pid_t pid); +}; ==== //depot/projects/ia64/usr.bin/gcore/gcore.c#6 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/gcore/gcore.c,v 1.29 2002/09/05 09:11:20 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/gcore/gcore.c,v 1.30 2002/09/13 16:33:35 peter Exp $"); /* * Originally written by Eric Cooper in Fall 1981. @@ -60,19 +60,10 @@ #include #include #include -#include -#include -#include - -#include -#include -#include +#include -#include #include #include -#include -#include #include #include #include @@ -81,30 +72,21 @@ #include "extern.h" -static void core(int, int, struct kinfo_proc *); -static void datadump(int, int, struct kinfo_proc *, u_long, int); static void killed(int); static void restart_target(void); static void usage(void) __dead2; -static void userdump(int, struct kinfo_proc *, u_long, int); -kvm_t *kd; +static pid_t pid; -static int data_offset; -static pid_t pid; +SET_DECLARE(dumpset, struct dumpers); int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { - struct kinfo_proc *ki = NULL; - struct exec exec; int ch, cnt, efd, fd, sflag; - uid_t uid; char *binfile, *corefile; - char errbuf[_POSIX2_LINE_MAX], fname[MAXPATHLEN]; - int is_aout; + char fname[MAXPATHLEN]; + struct dumpers **d, *dumper; sflag = 0; corefile = NULL; @@ -123,7 +105,6 @@ } argv += optind; argc -= optind; - /* XXX we should check that the pid argument is really a number */ switch (argc) { case 1: @@ -139,54 +120,20 @@ default: usage(); } - efd = open(binfile, O_RDONLY, 0); if (efd < 0) err(1, "%s", binfile); - - cnt = read(efd, &exec, sizeof(exec)); - if (cnt != sizeof(exec)) - errx(1, "%s exec header: %s", - binfile, cnt > 0 ? strerror(EIO) : strerror(errno)); - if (!N_BADMAG(exec)) { - is_aout = 1; - /* - * This legacy a.out support uses the kvm interface instead - * of procfs. - */ - kd = kvm_openfiles(0, 0, 0, O_RDONLY, errbuf); - if (kd == NULL) - errx(1, "%s", errbuf); - - uid = getuid(); - - ki = kvm_getprocs(kd, KERN_PROC_PID, pid, &cnt); - if (ki == NULL || cnt != 1) - errx(1, "%d: not found", pid); - - if (ki->ki_ruid != uid && uid != 0) - errx(1, "%d: not owner", pid); - - if (ki->ki_stat == SZOMB) - errx(1, "%d: zombie", pid); - - if (ki->ki_flag & P_WEXIT) - errx(1, "%d: process exiting", pid); - if (ki->ki_flag & P_SYSTEM) /* Swapper or pagedaemon. */ - errx(1, "%d: system process", pid); - if (exec.a_text != ptoa(ki->ki_tsize)) - errx(1, "The executable %s does not belong to" - " process %d!\n" - "Text segment size (in bytes): executable %ld," - " process %d", binfile, pid, exec.a_text, - ptoa(ki->ki_tsize)); - data_offset = N_DATOFF(exec); - } else if (IS_ELF(*(Elf_Ehdr *)&exec)) { - is_aout = 0; - close(efd); - } else + dumper = NULL; + SET_FOREACH(d, dumpset) { + lseek(efd, 0, SEEK_SET); + if (((*d)->ident)(efd, pid, binfile)) { + dumper = (*d); + lseek(efd, 0, SEEK_SET); + break; + } + } + if (dumper == NULL) errx(1, "Invalid executable file"); - if (corefile == NULL) { (void)snprintf(fname, sizeof(fname), "core.%d", pid); corefile = fname; @@ -194,7 +141,6 @@ fd = open(corefile, O_RDWR|O_CREAT|O_TRUNC, DEFFILEMODE); if (fd < 0) err(1, "%s", corefile); - if (sflag) { signal(SIGHUP, killed); signal(SIGINT, killed); @@ -203,148 +149,32 @@ err(1, "%d: stop signal", pid); atexit(restart_target); } - - if (is_aout) - core(efd, fd, ki); - else - elf_coredump(fd, pid); - + dumper->dump(efd, fd, pid); (void)close(fd); + (void)close(efd); exit(0); } -/* - * core -- - * Build the core file. - */ -void -core(efd, fd, ki) - int efd; - int fd; - struct kinfo_proc *ki; -{ - union { - struct user user; - struct { - char uabytes[ctob(UAREA_PAGES)]; - char ksbytes[ctob(KSTACK_PAGES)]; - } bytes; - } uarea; - int tsize = ki->ki_tsize; - int dsize = ki->ki_dsize; - int ssize = ki->ki_ssize; - int cnt; - - /* Read in user struct */ - cnt = kvm_read(kd, (u_long)ki->ki_addr, uarea.bytes.uabytes, - ctob(UAREA_PAGES)); - if (cnt != ctob(UAREA_PAGES)) - errx(1, "read upages structure: %s", - cnt > 0 ? strerror(EIO) : strerror(errno)); - - cnt = kvm_read(kd, (u_long)ki->ki_kstack, uarea.bytes.ksbytes, - ctob(KSTACK_PAGES)); - if (cnt != ctob(KSTACK_PAGES)) - errx(1, "read kstack structure: %s", - cnt > 0 ? strerror(EIO) : strerror(errno)); - - /* - * Fill in the eproc vm parameters, since these are garbage unless - * the kernel is dumping core or something. - */ - uarea.user.u_kproc = *ki; - - /* Dump user area */ - cnt = write(fd, &uarea, sizeof(uarea)); - if (cnt != sizeof(uarea)) - errx(1, "write user structure: %s", - cnt > 0 ? strerror(EIO) : strerror(errno)); - - /* Dump data segment */ - datadump(efd, fd, ki, USRTEXT + ctob(tsize), dsize); - - /* Dump stack segment */ - userdump(fd, ki, USRSTACK - ctob(ssize), ssize); - - /* Dump machine dependent portions of the core. */ - md_core(kd, fd, ki); -} - -void -datadump(efd, fd, kp, addr, npage) - register int efd; - register int fd; - struct kinfo_proc *kp; - register u_long addr; - register int npage; +static void +killed(int sig) { - register int cc, delta; - char buffer[PAGE_SIZE]; - delta = data_offset - addr; - while (--npage >= 0) { - cc = kvm_uread(kd, kp, addr, buffer, PAGE_SIZE); - if (cc != PAGE_SIZE) { - /* Try to read the page from the executable. */ - if (lseek(efd, (off_t)addr + delta, SEEK_SET) == -1) - err(1, "seek executable"); - cc = read(efd, buffer, sizeof(buffer)); - if (cc != sizeof(buffer)) { - if (cc < 0) - err(1, "read executable"); - else /* Assume untouched bss page. */ - bzero(buffer, sizeof(buffer)); - } - } - cc = write(fd, buffer, PAGE_SIZE); - if (cc != PAGE_SIZE) - errx(1, "write data segment: %s", - cc > 0 ? strerror(EIO) : strerror(errno)); - addr += PAGE_SIZE; - } -} - -static void -killed(sig) - int sig; -{ restart_target(); signal(sig, SIG_DFL); kill(getpid(), sig); } static void -restart_target() +restart_target(void) { + kill(pid, SIGCONT); } void -userdump(fd, kp, addr, npage) - register int fd; - struct kinfo_proc *kp; - register u_long addr; - register int npage; +usage(void) { - register int cc; - char buffer[PAGE_SIZE]; - while (--npage >= 0) { - cc = kvm_uread(kd, kp, addr, buffer, PAGE_SIZE); - if (cc != PAGE_SIZE) - /* Could be an untouched fill-with-zero page. */ - bzero(buffer, PAGE_SIZE); - cc = write(fd, buffer, PAGE_SIZE); - if (cc != PAGE_SIZE) - errx(1, "write stack segment: %s", - cc > 0 ? strerror(EIO) : strerror(errno)); - addr += PAGE_SIZE; - } -} - -void -usage() -{ (void)fprintf(stderr, "usage: gcore [-s] [-c core] [executable] pid\n"); exit(1); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 13 15: 3:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7B5737B401; Fri, 13 Sep 2002 15:03:18 -0700 (PDT) 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 7026237B400 for ; Fri, 13 Sep 2002 15:03:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 197AA43E4A for ; Fri, 13 Sep 2002 15:03:18 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8DM3HJU069567 for ; Fri, 13 Sep 2002 15:03:17 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8DM3HDh069563 for perforce@freebsd.org; Fri, 13 Sep 2002 15:03:17 -0700 (PDT) Date: Fri, 13 Sep 2002 15:03:17 -0700 (PDT) Message-Id: <200209132203.g8DM3HDh069563@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 17462 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17462 Change 17462 by amigus@amigus_caster on 2002/09/13 15:02:59 Use system installed ugidfw header file. Affected files ... .. //depot/projects/trustedbsd/misc/kugidfw/kugidfw.cc#3 edit Differences ... ==== //depot/projects/trustedbsd/misc/kugidfw/kugidfw.cc#3 (text+ko) ==== @@ -50,7 +50,7 @@ #include -#include "/home/rwatson/libugidfw/ugidfw.h" +#include #include "../kmacmanager/konqueror.h" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 13 21:17:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCC6C37B401; Fri, 13 Sep 2002 21:16:20 -0700 (PDT) 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 52D2B37B400 for ; Fri, 13 Sep 2002 21:16:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 523B443E4A for ; Fri, 13 Sep 2002 21:16:14 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8E4GEJU078423 for ; Fri, 13 Sep 2002 21:16:14 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8E4GDkp078420 for perforce@freebsd.org; Fri, 13 Sep 2002 21:16:13 -0700 (PDT) Date: Fri, 13 Sep 2002 21:16:13 -0700 (PDT) Message-Id: <200209140416.g8E4GDkp078420@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 17468 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17468 Change 17468 by julian@julian_ref on 2002/09/13 21:15:32 Attempt at merging in thread state changes (among others) Affected files ... .. //depot/projects/kse/include/ctype.h#5 integrate .. //depot/projects/kse/include/dirent.h#3 integrate .. //depot/projects/kse/include/dlfcn.h#2 integrate .. //depot/projects/kse/include/stdlib.h#6 integrate .. //depot/projects/kse/include/wchar.h#5 integrate .. //depot/projects/kse/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/kse/lib/libc/gen/dlfunc.c#2 integrate .. //depot/projects/kse/lib/libc/gen/dlopen.3#3 integrate .. //depot/projects/kse/lib/libc/gen/getcontext.3#1 branch .. //depot/projects/kse/lib/libc/gen/makecontext.3#1 branch .. //depot/projects/kse/lib/libc/gen/ucontext.3#1 branch .. //depot/projects/kse/lib/libc/locale/Makefile.inc#6 integrate .. //depot/projects/kse/lib/libc/locale/wcsftime.3#1 branch .. //depot/projects/kse/lib/libc/locale/wcsftime.c#1 branch .. //depot/projects/kse/lib/libc/locale/wcstol.3#2 integrate .. //depot/projects/kse/lib/libc/net/getaddrinfo.c#4 integrate .. //depot/projects/kse/lib/libc/net/gethostbydns.c#2 integrate .. //depot/projects/kse/lib/libc/net/getnetbydns.c#2 integrate .. //depot/projects/kse/lib/libc/net/name6.c#2 integrate .. //depot/projects/kse/lib/libc/net/res_query.c#2 integrate .. //depot/projects/kse/lib/libc/net/res_update.c#2 integrate .. //depot/projects/kse/lib/libc/sparc64/gen/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/sparc64/gen/fabs.S#1 branch .. //depot/projects/kse/lib/libc/stdlib/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/stdlib/_Exit.c#1 branch .. //depot/projects/kse/lib/libc/stdlib/exit.3#3 integrate .. //depot/projects/kse/lib/libc/stdlib/qsort.3#2 integrate .. //depot/projects/kse/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/qsort_r.c#1 branch .. //depot/projects/kse/lib/libc/sys/sigaction.2#2 integrate .. //depot/projects/kse/lib/libc/sys/sigaltstack.2#2 integrate .. //depot/projects/kse/lib/libc/sys/sigreturn.2#2 integrate .. //depot/projects/kse/lib/libkvm/kvm.c#7 integrate .. //depot/projects/kse/lib/libkvm/kvm_proc.c#22 integrate .. //depot/projects/kse/sys/alpha/alpha/autoconf.c#7 integrate .. //depot/projects/kse/sys/alpha/alpha/setdef0.c#2 delete .. //depot/projects/kse/sys/alpha/alpha/setdef1.c#2 delete .. //depot/projects/kse/sys/alpha/linux/linux_machdep.c#12 integrate .. //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/kse/sys/conf/NOTES#17 integrate .. //depot/projects/kse/sys/conf/files.i386#30 integrate .. //depot/projects/kse/sys/ddb/db_ps.c#24 integrate .. //depot/projects/kse/sys/dev/ata/ata-all.c#22 integrate .. //depot/projects/kse/sys/dev/ata/ata-dma.c#23 integrate .. //depot/projects/kse/sys/dev/ata/ata-pci.c#24 integrate .. //depot/projects/kse/sys/dev/ata/atapi-all.c#15 integrate .. //depot/projects/kse/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/kse/sys/dev/ata/atapi-cd.c#19 integrate .. //depot/projects/kse/sys/dev/cardbus/cardbus.c#10 integrate .. //depot/projects/kse/sys/dev/ccd/ccd.c#14 integrate .. //depot/projects/kse/sys/dev/firewire/00README#1 branch .. //depot/projects/kse/sys/dev/firewire/bus_mgm.c#1 branch .. //depot/projects/kse/sys/dev/firewire/firewire.c#1 branch .. //depot/projects/kse/sys/dev/firewire/firewire.h#1 branch .. //depot/projects/kse/sys/dev/firewire/firewire_phy.h#1 branch .. //depot/projects/kse/sys/dev/firewire/firewirebusreg.h#1 branch .. //depot/projects/kse/sys/dev/firewire/firewirereg.h#1 branch .. //depot/projects/kse/sys/dev/firewire/fw_tap.c#1 branch .. //depot/projects/kse/sys/dev/firewire/fwmem.c#1 branch .. //depot/projects/kse/sys/dev/firewire/fwmem.h#1 branch .. //depot/projects/kse/sys/dev/firewire/fwohci.c#1 branch .. //depot/projects/kse/sys/dev/firewire/fwohci_pci.c#1 branch .. //depot/projects/kse/sys/dev/firewire/fwohcireg.h#1 branch .. //depot/projects/kse/sys/dev/firewire/fwohcivar.h#1 branch .. //depot/projects/kse/sys/dev/firewire/iec13213.h#1 branch .. //depot/projects/kse/sys/dev/firewire/iec68113.h#1 branch .. //depot/projects/kse/sys/dev/firewire/if_fwe.c#1 branch .. //depot/projects/kse/sys/dev/firewire/if_fwevar.h#1 branch .. //depot/projects/kse/sys/dev/firewire/sbp.c#1 branch .. //depot/projects/kse/sys/dev/pccard/card_if.m#6 integrate .. //depot/projects/kse/sys/dev/pccard/pccard.c#15 integrate .. //depot/projects/kse/sys/dev/pccard/pccarddevs#13 integrate .. //depot/projects/kse/sys/dev/pccard/pccarddevs.h#13 integrate .. //depot/projects/kse/sys/dev/pccbb/pccbb.c#21 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_ctl.c#25 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#10 integrate .. //depot/projects/kse/sys/geom/geom.h#9 integrate .. //depot/projects/kse/sys/geom/geom_bsd.c#9 integrate .. //depot/projects/kse/sys/geom/geom_disk.c#7 integrate .. //depot/projects/kse/sys/geom/geom_enc.c#3 integrate .. //depot/projects/kse/sys/geom/geom_io.c#5 integrate .. //depot/projects/kse/sys/geom/geom_pc98.c#5 integrate .. //depot/projects/kse/sys/gnu/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/kse/sys/i386/conf/GENERIC#26 integrate .. //depot/projects/kse/sys/i386/conf/NOTES#38 integrate .. //depot/projects/kse/sys/i386/i386/elan-mmcr.c#3 integrate .. //depot/projects/kse/sys/i386/ibcs2/imgact_coff.c#14 integrate .. //depot/projects/kse/sys/i386/linux/linux_machdep.c#17 integrate .. //depot/projects/kse/sys/i386/pci/pci_bus.c#10 integrate .. //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#14 integrate .. //depot/projects/kse/sys/i4b/layer1/i4b_hdlc.c#1 branch .. //depot/projects/kse/sys/i4b/layer1/i4b_hdlc.h#2 integrate .. //depot/projects/kse/sys/i4b/layer1/itjc/i4b_hdlc.h#2 integrate .. //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_pci.c#5 integrate .. //depot/projects/kse/sys/isa/fd.c#10 integrate .. //depot/projects/kse/sys/kern/bus_if.m#5 integrate .. //depot/projects/kse/sys/kern/imgact_aout.c#17 integrate .. //depot/projects/kse/sys/kern/init_main.c#48 integrate .. //depot/projects/kse/sys/kern/kern_acct.c#16 integrate .. //depot/projects/kse/sys/kern/kern_condvar.c#43 integrate .. //depot/projects/kse/sys/kern/kern_descrip.c#37 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#39 integrate .. //depot/projects/kse/sys/kern/kern_fork.c#80 integrate .. //depot/projects/kse/sys/kern/kern_idle.c#18 integrate .. //depot/projects/kse/sys/kern/kern_intr.c#29 integrate .. //depot/projects/kse/sys/kern/kern_kthread.c#14 integrate .. //depot/projects/kse/sys/kern/kern_ktrace.c#16 integrate .. //depot/projects/kse/sys/kern/kern_mac.c#4 integrate .. //depot/projects/kse/sys/kern/kern_mutex.c#34 integrate .. //depot/projects/kse/sys/kern/kern_proc.c#85 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#66 integrate .. //depot/projects/kse/sys/kern/kern_switch.c#66 integrate .. //depot/projects/kse/sys/kern/kern_synch.c#79 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#109 integrate .. //depot/projects/kse/sys/kern/subr_bus.c#12 integrate .. //depot/projects/kse/sys/kern/subr_smp.c#13 integrate .. //depot/projects/kse/sys/kern/sys_generic.c#34 integrate .. //depot/projects/kse/sys/kern/sys_process.c#32 integrate .. //depot/projects/kse/sys/kern/tty.c#31 integrate .. //depot/projects/kse/sys/kern/vfs_bio.c#24 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#42 integrate .. //depot/projects/kse/sys/kern/vfs_syscalls.c#35 integrate .. //depot/projects/kse/sys/modules/Makefile#34 integrate .. //depot/projects/kse/sys/modules/aout/Makefile#2 integrate .. //depot/projects/kse/sys/modules/firewire/Makefile#1 branch .. //depot/projects/kse/sys/modules/firewire/firewire/Makefile#1 branch .. //depot/projects/kse/sys/modules/firewire/fwe/Makefile#1 branch .. //depot/projects/kse/sys/modules/firewire/sbp/Makefile#1 branch .. //depot/projects/kse/sys/modules/if_gre/Makefile#2 integrate .. //depot/projects/kse/sys/modules/pccbb/Makefile#2 delete .. //depot/projects/kse/sys/net/bridge.c#12 integrate .. //depot/projects/kse/sys/net/if_ethersubr.c#19 integrate .. //depot/projects/kse/sys/net/if_gif.c#14 integrate .. //depot/projects/kse/sys/net/if_gif.h#7 integrate .. //depot/projects/kse/sys/net/if_gre.h#2 integrate .. //depot/projects/kse/sys/netgraph/ng_ksocket.c#17 integrate .. //depot/projects/kse/sys/netgraph/ng_pptpgre.c#6 integrate .. //depot/projects/kse/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/kse/sys/netinet/ip_mroute.c#13 integrate .. //depot/projects/kse/sys/netns/ns_if.h#4 integrate .. //depot/projects/kse/sys/pccard/pccard.c#13 integrate .. //depot/projects/kse/sys/pci/agp_i810.c#5 integrate .. //depot/projects/kse/sys/pci/agpreg.h#4 integrate .. //depot/projects/kse/sys/pci/if_sf.c#10 integrate .. //depot/projects/kse/sys/pci/if_ste.c#10 integrate .. //depot/projects/kse/sys/pci/if_xl.c#11 integrate .. //depot/projects/kse/sys/posix4/ksched.c#12 integrate .. //depot/projects/kse/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/kse/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/kse/sys/sys/bio.h#8 integrate .. //depot/projects/kse/sys/sys/bus.h#6 integrate .. //depot/projects/kse/sys/sys/dirent.h#3 integrate .. //depot/projects/kse/sys/sys/linker_set.h#3 integrate .. //depot/projects/kse/sys/sys/mman.h#6 integrate .. //depot/projects/kse/sys/sys/proc.h#132 integrate .. //depot/projects/kse/sys/sys/snoop.h#3 integrate .. //depot/projects/kse/sys/sys/vnode.h#31 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_vnops.c#17 integrate .. //depot/projects/kse/sys/vm/vm_glue.c#38 integrate .. //depot/projects/kse/sys/vm/vm_meter.c#16 integrate .. //depot/projects/kse/sys/vm/vm_pageout.c#19 integrate .. //depot/projects/kse/usr.bin/gcore/Makefile#3 integrate .. //depot/projects/kse/usr.bin/gcore/aoutcore.c#1 branch .. //depot/projects/kse/usr.bin/gcore/elfcore.c#5 integrate .. //depot/projects/kse/usr.bin/gcore/extern.h#3 integrate .. //depot/projects/kse/usr.bin/gcore/gcore.c#9 integrate .. //depot/projects/kse/usr.bin/gcore/md-nop.c#4 delete .. //depot/projects/kse/usr.bin/gcore/md-sparc.c#3 delete Differences ... ==== //depot/projects/kse/include/ctype.h#5 (text+ko) ==== @@ -39,16 +39,14 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/include/ctype.h,v 1.23 2002/09/06 04:22:54 mike Exp $ + * $FreeBSD: src/include/ctype.h,v 1.24 2002/09/09 05:38:05 mike Exp $ */ #ifndef _CTYPE_H_ #define _CTYPE_H_ -/* - * XXX brings namespace pollution (struct member names). - */ -#include +#include +#include #define _CTYPE_A 0x00000100L /* Alpha */ #define _CTYPE_C 0x00000200L /* Control */ @@ -164,10 +162,24 @@ #endif /* + * brings namespace pollution (struct member names). This prevents + * us from using the inline optimizations in the more strict __POSIX_VISIBLE and + * __XSI_VISIBLE namespaces. To fix this properly would require that we rename + * member names of long-standing structs, or something equally evil. + */ +#if !__BSD_VISIBLE && !defined(_USE_CTYPE_INLINE_) && \ + !defined(_DONT_USE_CTYPE_INLINE_) +#define _DONT_USE_CTYPE_INLINE_ +#endif + +/* * Use inline functions if we are allowed to and the compiler supports them. */ #if !defined(_DONT_USE_CTYPE_INLINE_) && \ (defined(_USE_CTYPE_INLINE_) || defined(__GNUC__) || defined(__cplusplus)) + +#include + static __inline int __maskrune(__ct_rune_t _c, unsigned long _f) { ==== //depot/projects/kse/include/dirent.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dirent.h 8.2 (Berkeley) 7/28/94 - * $FreeBSD: src/include/dirent.h,v 1.12 2002/09/09 03:52:43 mike Exp $ + * $FreeBSD: src/include/dirent.h,v 1.13 2002/09/10 18:12:16 mike Exp $ */ #ifndef _DIRENT_H_ @@ -41,13 +41,18 @@ * The kernel defines the format of directory entries returned by * the getdirentries(2) system call. */ +#include #include -#ifdef _POSIX_SOURCE -typedef void * DIR; -#else +#if __BSD_VISIBLE || __XSI_VISIBLE +/* + * XXX this is probably illegal in the __XSI_VISIBLE case, but brings us closer + * to the specification. + */ +#define d_ino d_fileno /* backward and XSI compatibility */ +#endif -#define d_ino d_fileno /* backward compatibility */ +#if __BSD_VISIBLE /* definitions for library routines operating on directories. */ #define DIRBLKSIZ 1024 @@ -80,29 +85,37 @@ #define NULL 0 #endif -#endif /* _POSIX_SOURCE */ +#else /* !__BSD_VISIBLE */ + +typedef void * DIR; + +#endif /* __BSD_VISIBLE */ #ifndef _KERNEL -#include - __BEGIN_DECLS +#if __BSD_VISIBLE +DIR *__opendir2(const char *, int); +int alphasort(const void *, const void *); +int getdents(int, char *, int); +int getdirentries(int, char *, int, long *); +#endif DIR *opendir(const char *); struct dirent * readdir(DIR *); +#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500 +int readdir_r(DIR *, struct dirent *, struct dirent **); +#endif void rewinddir(DIR *); -int closedir(DIR *); -#ifndef _POSIX_SOURCE -DIR *__opendir2(const char *, int); -long telldir(DIR *); -void seekdir(DIR *, long); +#if __BSD_VISIBLE int scandir(const char *, struct dirent ***, int (*)(struct dirent *), int (*)(const void *, const void *)); -int alphasort(const void *, const void *); -int getdents(int, char *, int); -int getdirentries(int, char *, int, long *); -int readdir_r(DIR *, struct dirent *, struct dirent **); -#endif /* not POSIX */ +#endif +#if __XSI_VISIBLE +void seekdir(DIR *, long); +long telldir(DIR *); +#endif +int closedir(DIR *); __END_DECLS #endif /* !_KERNEL */ ==== //depot/projects/kse/include/dlfcn.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1994 * The Regents of the University of California. All rights reserved. * @@ -30,40 +30,42 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/dlfcn.h,v 1.16 2002/05/29 19:35:11 wollman Exp $ + * $FreeBSD: src/include/dlfcn.h,v 1.18 2002/09/11 05:04:06 mike Exp $ */ #ifndef _DLFCN_H_ #define _DLFCN_H_ + #include /* * Modes and flags for dlopen(). */ -#define RTLD_LAZY 1 /* Bind function calls lazily */ -#define RTLD_NOW 2 /* Bind function calls immediately */ -#define RTLD_MODEMASK 0x3 -#define RTLD_GLOBAL 0x100 /* Make symbols globally available */ -#define RTLD_LOCAL 0 /* Opposite of RTLD_GLOBAL, and the default */ -#define RTLD_TRACE 0x200 /* Trace loaded objects and exit */ +#define RTLD_LAZY 1 /* Bind function calls lazily. */ +#define RTLD_NOW 2 /* Bind function calls immediately. */ +#define RTLD_MODEMASK 0x3 +#define RTLD_GLOBAL 0x100 /* Make symbols globally available. */ +#define RTLD_LOCAL 0 /* Opposite of RTLD_GLOBAL, and the default. */ +#define RTLD_TRACE 0x200 /* Trace loaded objects and exit. */ /* * Special handle arguments for dlsym(). */ -#define RTLD_NEXT ((void *) -1) /* Search subsequent objects */ -#define RTLD_DEFAULT ((void *) -2) /* Use default search algorithm */ +#define RTLD_NEXT ((void *) -1) /* Search subsequent objects. */ +#define RTLD_DEFAULT ((void *) -2) /* Use default search algorithm. */ +#if __BSD_VISIBLE /* * Structure filled in by dladdr(). */ -typedef struct dl_info { - const char *dli_fname; /* Pathname of shared object */ - void *dli_fbase; /* Base address of shared object */ - const char *dli_sname; /* Name of nearest symbol */ - void *dli_saddr; /* Address of nearest symbol */ +typedef struct dl_info { + const char *dli_fname; /* Pathname of shared object. */ + void *dli_fbase; /* Base address of shared object. */ + const char *dli_sname; /* Name of nearest symbol. */ + void *dli_saddr; /* Address of nearest symbol. */ } Dl_info; -/* +/*- * The actual type declared by this typedef is immaterial, provided that * it is a function pointer. Its purpose is to provide a return type for * dlfunc() which can be cast to a function pointer type without depending @@ -73,28 +75,31 @@ * appropriately. */ struct __dlfunc_arg { - int __dlfunc_dummy; + int __dlfunc_dummy; }; -typedef void (*dlfunc_t)(struct __dlfunc_arg); +typedef void (*dlfunc_t)(struct __dlfunc_arg); + +#endif /* __BSD_VISIBLE */ __BEGIN_DECLS -/* XSI functions first */ -int dlclose(void *); -const char *dlerror(void); -void *dlopen(const char *, int); -void *dlsym(void * /* __restrict */, const char * /* __restrict */); +/* XSI functions first. */ +int dlclose(void *); +const char * + dlerror(void); +void *dlopen(const char *, int); +void *dlsym(void * __restrict, const char * __restrict); #if __BSD_VISIBLE -int dladdr(const void *, Dl_info *); -dlfunc_t dlfunc(void * /* __restrict */, const char * /* __restrict */); -void dllockinit(void *_context, - void *(*_lock_create)(void *_context), - void (*_rlock_acquire)(void *_lock), - void (*_wlock_acquire)(void *_lock), - void (*_lock_release)(void *_lock), - void (*_lock_destroy)(void *_lock), - void (*_context_destroy)(void *_context)); +int dladdr(const void *, Dl_info *); +dlfunc_t dlfunc(void * __restrict, const char * __restrict); +void dllockinit(void *_context, + void *(*_lock_create)(void *_context), + void (*_rlock_acquire)(void *_lock), + void (*_wlock_acquire)(void *_lock), + void (*_lock_release)(void *_lock), + void (*_lock_destroy)(void *_lock), + void (*_context_destroy)(void *_context)); #endif /* __BSD_VISIBLE */ __END_DECLS ==== //depot/projects/kse/include/stdlib.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.41 2002/09/06 11:23:32 tjr Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.42 2002/09/10 02:02:49 wollman Exp $ */ #ifndef _STDLIB_H_ @@ -92,6 +92,7 @@ #define MB_CUR_MAX __mb_cur_max __BEGIN_DECLS +void _Exit(int) __dead2; void abort(void) __dead2; int abs(int) __pure2; int atexit(void (*)(void)); @@ -181,16 +182,18 @@ lldiv_t lldiv(long long, long long) __pure2; #endif int mergesort(void *, size_t, size_t, int (*)(const void *, const void *)); +void qsort_r(void *, size_t, size_t, void *, + int (*)(void *, const void *, const void *)); int radixsort(const unsigned char **, int, const unsigned char *, unsigned); -int sradixsort(const unsigned char **, int, const unsigned char *, - unsigned); int rand_r(unsigned *); long random(void); void *reallocf(void *, size_t); char *realpath(const char *, char resolved_path[]); void setprogname(const char *); char *setstate(char *); +int sradixsort(const unsigned char **, int, const unsigned char *, + unsigned); void sranddev(void); void srandom(unsigned long); void srandomdev(void); ==== //depot/projects/kse/include/wchar.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.20 2002/09/08 13:27:26 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.25 2002/09/12 23:33:17 tjr Exp $ */ /*- @@ -70,10 +70,8 @@ #include #include -#include - #ifndef NULL -#define NULL 0 +#define NULL 0 #endif #ifndef _MBSTATE_T_DECLARED @@ -93,11 +91,6 @@ #endif #endif -#ifndef _WCTYPE_T -typedef unsigned long wctype_t; -#define _WCTYPE_T -#endif - #ifndef _WINT_T_DECLARED typedef __wint_t wint_t; #define _WINT_T_DECLARED @@ -107,15 +100,18 @@ #define WEOF ((wint_t)-1) #endif +struct __sFILE; +struct tm; + __BEGIN_DECLS wint_t btowc(int); -wint_t fgetwc(FILE *); +wint_t fgetwc(struct __sFILE *); wchar_t * - fgetws(wchar_t * __restrict, int, FILE * __restrict); -wint_t fputwc(wchar_t, FILE *); -int fputws(const wchar_t * __restrict, FILE * __restrict); -int fwide(FILE *, int); -wint_t getwc(FILE *); + fgetws(wchar_t * __restrict, int, struct __sFILE * __restrict); +wint_t fputwc(wchar_t, struct __sFILE *); +int fputws(const wchar_t * __restrict, struct __sFILE * __restrict); +int fwide(struct __sFILE *, int); +wint_t getwc(struct __sFILE *); wint_t getwchar(void); size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict); size_t mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, @@ -123,15 +119,17 @@ int mbsinit(const mbstate_t *); size_t mbsrtowcs(wchar_t * __restrict, const char ** __restrict, size_t, mbstate_t * __restrict); -wint_t putwc(wchar_t, FILE *); +wint_t putwc(wchar_t, struct __sFILE *); wint_t putwchar(wchar_t); -wint_t ungetwc(wint_t, FILE *); +wint_t ungetwc(wint_t, struct __sFILE *); size_t wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); wchar_t *wcscat(wchar_t * __restrict, const wchar_t * __restrict); wchar_t *wcschr(const wchar_t *, wchar_t); int wcscmp(const wchar_t *, const wchar_t *); wchar_t *wcscpy(wchar_t * __restrict, const wchar_t * __restrict); size_t wcscspn(const wchar_t *, const wchar_t *); +size_t wcsftime(wchar_t * __restrict, size_t, const wchar_t * __restrict, + const struct tm * __restrict); size_t wcslcat(wchar_t *, const wchar_t *, size_t); size_t wcslcpy(wchar_t *, const wchar_t *, size_t); size_t wcslen(const wchar_t *); @@ -164,8 +162,8 @@ __END_DECLS #define getwc(fp) fgetwc(fp) -#define getwchar() fgetwc(stdin) -#define putwc(wc, fp) fputwc(wc, fp) -#define putwchar(wc) fputwc(wc, stdout) +#define getwchar() fgetwc(stdin) +#define putwc(wc, fp) fputwc((wc), (fp)) +#define putwchar(wc) fputwc((wc), stdout) #endif /* !_WCHAR_H_ */ ==== //depot/projects/kse/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.94 2002/08/08 04:50:36 mike Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.95 2002/09/11 21:39:19 archie Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen @@ -42,22 +42,22 @@ confstr.3 ctermid.3 daemon.3 \ devname.3 directory.3 dirname.3 dladdr.3 dllockinit.3 dlopen.3 \ err.3 exec.3 fmtcheck.3 fmtmsg.3 fnmatch.3 frexp.3 ftok.3 fts.3 \ - getbootfile.3 getbsize.3 getcap.3 getcwd.3 \ + getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \ getdiskbyname.3 getdomainname.3 getfsent.3 \ getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \ getmntinfo.3 getnetgrent.3 getobjformat.3 \ getpagesize.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \ getttyent.3 getusershell.3 getvfsbyname.3 getvfsent.3 \ - glob.3 initgroups.3 isinf.3 \ - ldexp.3 lockf.3 modf.3 msgctl.3 msgget.3 msgrcv.3 msgsnd.3 \ + glob.3 initgroups.3 isinf.3 ldexp.3 lockf.3 makecontext.3 \ + modf.3 msgctl.3 msgget.3 msgrcv.3 msgsnd.3 \ nice.3 nlist.3 pause.3 popen.3 pselect.3 psignal.3 pwcache.3 \ raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \ scandir.3 setjmp.3 setmode.3 setproctitle.3 shm_open.3 \ siginterrupt.3 signal.3 sigsetops.3 sleep.3 statvfs.3 stringlist.3 \ strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \ tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 time.3 times.3 timezone.3 \ - ttyname.3 tzset.3 ualarm.3 ulimit.3 uname.3 unvis.3 usleep.3 utime.3 \ - valloc.3 vis.3 + ttyname.3 tzset.3 ualarm.3 ucontext.3 ulimit.3 uname.3 \ + unvis.3 usleep.3 utime.3 valloc.3 vis.3 MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3 MLINKS+=ctermid.3 ctermid_r.3 @@ -78,6 +78,7 @@ getcap.3 cgetnum.3 getcap.3 cgetset.3 getcap.3 cgetstr.3 \ getcap.3 cgetustr.3 MLINKS+=getcwd.3 getwd.3 +MLINKS+=getcontext.3 setcontext.3 MLINKS+=getdomainname.3 setdomainname.3 MLINKS+=getfsent.3 endfsent.3 getfsent.3 getfsfile.3 getfsent.3 getfsspec.3 \ getfsent.3 getfstype.3 getfsent.3 setfsent.3 @@ -98,6 +99,7 @@ getvfsent.3 vfsload.3 MLINKS+=glob.3 globfree.3 MLINKS+=isinf.3 isnan.3 isinf.3 isnanf.3 +MLINKS+=makecontext.3 swapcontext.3 MLINKS+=popen.3 pclose.3 MLINKS+=psignal.3 strsignal.3 psignal.3 sys_siglist.3 psignal.3 sys_signame.3 MLINKS+=pwcache.3 group_from_gid.3 pwcache.3 user_from_uid.3 ==== //depot/projects/kse/lib/libc/gen/dlfcn.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.7 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.8 2002/09/11 05:05:48 mike Exp $"); /* * Linkage to services provided by the dynamic linker. These are @@ -102,7 +102,7 @@ #pragma weak dlsym void * -dlsym(void *handle, const char *name) +dlsym(void * __restrict handle, const char * __restrict name) { _rtld_error(sorry); return NULL; @@ -168,7 +168,7 @@ } void * -dlsym(void *handle, const char *name) +dlsym(void * __restrict handle, const char * __restrict name) { if (__ldso_entry == NULL) return NULL; ==== //depot/projects/kse/lib/libc/gen/dlfunc.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * This source file is in the public domain. * Garrett A. Wollman, 2002-05-28. * - * $FreeBSD: src/lib/libc/gen/dlfunc.c,v 1.2 2002/05/29 19:35:13 wollman Exp $ + * $FreeBSD: src/lib/libc/gen/dlfunc.c,v 1.3 2002/09/11 05:05:48 mike Exp $ */ #include @@ -17,7 +17,7 @@ * runs on, but is not guaranteed by the C standard. */ dlfunc_t -dlfunc(void *handle, const char *symbol) +dlfunc(void * __restrict handle, const char * __restrict symbol) { union { void *d; ==== //depot/projects/kse/lib/libc/gen/dlopen.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" Copyright (c) 1991 Sun Microsystems, Inc. .\" .\" @(#) dlopen.3 1.6 90/01/31 SMI -.\" $FreeBSD: src/lib/libc/gen/dlopen.3,v 1.22 2002/08/09 11:06:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/dlopen.3,v 1.23 2002/09/11 05:05:48 mike Exp $ .\" -.Dd May 28, 2002 +.Dd September 10, 2002 .Os .Dt DLOPEN 3 .Sh NAME @@ -45,9 +45,9 @@ .Ft void * .Fn dlopen "const char *path" "int mode" .Ft void * -.Fn dlsym "void *handle" "const char *symbol" +.Fn dlsym "void * restrict handle" "const char * restrict symbol" .Ft dlfunc_t -.Fn dlfunc "void *handle" "const char *symbol" +.Fn dlfunc "void * restrict handle" "const char * restrict symbol" .Ft const char * .Fn dlerror "void" .Ft int ==== //depot/projects/kse/lib/libc/locale/Makefile.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.36 2002/09/08 13:27:26 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.37 2002/09/11 08:57:11 tjr Exp $ # locale sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale @@ -11,7 +11,8 @@ mbrtowc.c mbrune.c mbsinit.c mbsrtowcs.c mbtowc.c mbstowcs.c \ mskanji.c nl_langinfo.c nomacros.c none.c rune.c \ runetype.c setinvalidrune.c setlocale.c setrunelocale.c table.c \ - tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wcstol.c wcstombs.c \ + tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wcsftime.c wcstol.c \ + wcstombs.c \ wcstoul.c wctob.c wctomb.c wctrans.c wctype.c wcwidth.c .if ${LIB} == "c" @@ -22,7 +23,8 @@ mbsrtowcs.3 multibyte.3 \ nl_langinfo.3 \ rune.3 \ - setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wcrtomb.3 \ + setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wcsftime.3 \ + wcrtomb.3 \ wcsrtombs.3 wcstol.3 \ wctrans.3 wctype.3 wcwidth.3 MAN+= euc.4 utf2.4 ==== //depot/projects/kse/lib/libc/locale/wcstol.3#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/libc/locale/wcstol.3,v 1.1 2002/09/08 13:27:26 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcstol.3,v 1.2 2002/09/12 09:25:27 tjr Exp $ .\" .Dd September 7, 2002 .Dt WCSTOL 3 @@ -39,9 +39,9 @@ .Sh SYNOPSIS .In wchar.h .Ft long -.Fn wcstol "const wchar_t * restrict nptr" "wchar_t * restrict endptr" "int base" +.Fn wcstol "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" .Ft "unsigned long" -.Fn wcstoul "const wchar_t * restrict nptr" "wchar_t * restrict endptr" "int base" +.Fn wcstoul "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" .Sh DESCRIPTION The .Fn wcstol ==== //depot/projects/kse/lib/libc/net/getaddrinfo.c#4 (text+ko) ==== @@ -83,7 +83,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.29 2002/08/21 19:57:53 pirzyk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.30 2002/09/13 20:31:29 nectar Exp $"); #include "namespace.h" #include @@ -201,11 +201,7 @@ { 0 } }; -#if PACKETSZ > 1024 -#define MAXPACKET PACKETSZ -#else -#define MAXPACKET 1024 -#endif +#define MAXPACKET 65536 typedef union { HEADER hdr; ==== //depot/projects/kse/lib/libc/net/gethostbydns.c#2 (text+ko) ==== @@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.36 2002/06/26 14:18:36 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.37 2002/09/13 20:31:29 nectar Exp $"); #include #include @@ -103,11 +103,7 @@ static void dprintf(char *, int) __printflike(1, 0); #endif -#if PACKETSZ > 1024 -#define MAXPACKET PACKETSZ -#else -#define MAXPACKET 1024 -#endif +#define MAXPACKET 65536 typedef union { HEADER hdr; ==== //depot/projects/kse/lib/libc/net/getnetbydns.c#2 (text+ko) ==== @@ -62,7 +62,7 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getnetbydns.c,v 1.21 2002/06/26 14:18:36 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getnetbydns.c,v 1.22 2002/09/13 20:31:29 nectar Exp $"); #include #include @@ -88,11 +88,7 @@ #define BYNAME 1 #define MAXALIASES 35 -#if PACKETSZ > 1024 -#define MAXPACKET PACKETSZ -#else -#define MAXPACKET 1024 -#endif +#define MAXPACKET 65536 typedef union { HEADER hdr; ==== //depot/projects/kse/lib/libc/net/name6.c#2 (text+ko) ==== @@ -94,7 +94,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.24 2002/06/26 18:03:31 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.25 2002/09/13 20:31:29 nectar Exp $"); #include "namespace.h" #include @@ -967,11 +967,7 @@ int rtl_type; }; -#if PACKETSZ > 1024 -#define MAXPACKET PACKETSZ -#else -#define MAXPACKET 1024 -#endif +#define MAXPACKET 65536 typedef union { HEADER hdr; ==== //depot/projects/kse/lib/libc/net/res_query.c#2 (text+ko) ==== @@ -73,7 +73,7 @@ static char orig_rcsid[] = "From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/res_query.c,v 1.23 2002/07/07 11:28:28 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/res_query.c,v 1.24 2002/09/13 20:31:29 nectar Exp $"); #include #include @@ -90,11 +90,7 @@ #include "res_config.h" -#if PACKETSZ > 1024 -#define MAXPACKET PACKETSZ -#else -#define MAXPACKET 1024 -#endif +#define MAXPACKET 65536 /* * Formulate a normal query, send, and await answer. ==== //depot/projects/kse/lib/libc/net/res_update.c#2 (text+ko) ==== @@ -21,7 +21,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/res_update.c,v 1.4 2002/03/22 21:52:30 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/res_update.c,v 1.5 2002/09/13 20:31:29 nectar Exp $"); #include #include @@ -51,6 +51,7 @@ */ #define NSMAX 16 +#define MAXPACKET 65536 struct ns1 { char nsname[MAXDNAME]; @@ -71,7 +72,7 @@ int res_update(ns_updrec *rrecp_in) { ns_updrec *rrecp, *tmprrecp; - u_char buf[PACKETSZ], answer[PACKETSZ], packet[2*PACKETSZ]; + u_char buf[PACKETSZ], answer[MAXPACKET], packet[2*PACKETSZ]; char name[MAXDNAME], zname[MAXDNAME], primary[MAXDNAME], mailaddr[MAXDNAME]; u_char soardata[2*MAXCDNAME+5*INT32SZ]; ==== //depot/projects/kse/lib/libc/sparc64/gen/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.4 2002/06/29 03:23:18 obrien Exp $ +# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.5 2002/09/13 16:01:26 tmm Exp $ -SRCS+= _setjmp.S fixunsdfsi.S flt_rounds.c fpsetmask.c frexp.c \ +SRCS+= _setjmp.S fabs.S fixunsdfsi.S flt_rounds.c fpsetmask.c frexp.c \ infinity.c isinf.c ldexp.c modf.S setjmp.S sigsetjmp.S ==== //depot/projects/kse/lib/libc/stdlib/Makefile.inc#2 (text+ko) ==== @@ -1,14 +1,14 @@ # from @(#)Makefile.inc 8.3 (Berkeley) 2/4/95 -# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.36 2001/12/02 18:27:40 peter Exp $ +# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.37 2002/09/10 02:04:49 wollman Exp $ # machine-independent stdlib sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib ${.CURDIR}/../libc/stdlib -MISRCS+=abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ +MISRCS+=_Exit.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ bsearch.c calloc.c div.c exit.c getenv.c getopt.c \ getsubopt.c hcreate.c heapsort.c imaxabs.c imaxdiv.c \ labs.c ldiv.c llabs.c lldiv.c malloc.c merge.c putenv.c \ - qsort.c radixsort.c rand.c random.c reallocf.c realpath.c \ + qsort.c qsort_r.c radixsort.c rand.c random.c reallocf.c realpath.c \ setenv.c strfmon.c strhash.c strtod.c strtoimax.c strtol.c strtoll.c \ strtoq.c strtoul.c strtoull.c strtoumax.c strtouq.c system.c \ tdelete.c tfind.c tsearch.c twalk.c @@ -26,9 +26,10 @@ realpath.3 strfmon.3 strtod.3 strtol.3 strtoul.3 system.3 tsearch.3 MLINKS+=atol.3 atoll.3 +MLINKS+=exit.3 _Exit.3 MLINKS+=getenv.3 putenv.3 getenv.3 setenv.3 getenv.3 unsetenv.3 MLINKS+=hcreate.3 hdestroy.3 hcreate.3 hsearch.3 -MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3 +MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3 qsort.3 qsort_r.3 MLINKS+=rand.3 rand_r.3 rand.3 srand.3 rand.3 sranddev.3 MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3 \ random.3 srandomdev.3 ==== //depot/projects/kse/lib/libc/stdlib/exit.3#3 (text+ko) ==== @@ -34,13 +34,13 @@ .\" SUCH DAMAGE. .\" .\" @(#)exit.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/exit.3,v 1.11 2002/09/06 19:23:28 wollman Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/exit.3,v 1.12 2002/09/10 02:04:49 wollman Exp $ .\" -.Dd September 6, 2002 +.Dd September 9, 2002 .Dt EXIT 3 .Os .Sh NAME -.Nm exit +.Nm exit , _Exit .Nd perform normal program termination .Sh LIBRARY .Lb libc @@ -48,12 +48,18 @@ .In stdlib.h .Ft void .Fn exit "int status" +.Ft void +.Fn _Exit "int status" .Sh DESCRIPTION -.Fn Exit -terminates a process. +The +.Fn exit +and +.Fn _Exit +functions terminate a process. .Pp -Before termination it performs the following functions in the -order listed: +Before termination, +.Fn exit +performs the following functions in the order listed: .Bl -enum -offset indent .It Call the functions registered with the @@ -69,16 +75,31 @@ function. .El .Pp -Passing arbitrary values back to the environment as -.Ar status -is considered bad style; -you should use the values -.Dv EXIT_SUCCESS +The +.Fn _Exit +function terminates without calling the functions registered with the +.Xr atexit 3 +function, and may or may not perform the other actions listed. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 14 19: 3:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E71F737B401; Sat, 14 Sep 2002 19:03:56 -0700 (PDT) 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 7566237B400 for ; Sat, 14 Sep 2002 19:03:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1788243E42 for ; Sat, 14 Sep 2002 19:03:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8F23tJU060335 for ; Sat, 14 Sep 2002 19:03:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8F23t1A060332 for perforce@freebsd.org; Sat, 14 Sep 2002 19:03:55 -0700 (PDT) Date: Sat, 14 Sep 2002 19:03:55 -0700 (PDT) Message-Id: <200209150203.g8F23t1A060332@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17500 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17500 Change 17500 by rwatson@rwatson_paprika on 2002/09/14 19:03:36 Sample MLS installation program. Affected files ... .. //depot/projects/trustedbsd/misc/kmlsinstall/Makefile#1 add .. //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#1 add .. //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.h#1 add .. //depot/projects/trustedbsd/misc/kmlsinstall/main.cc#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 14 21:13:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 24AB137B401; Sat, 14 Sep 2002 21:13:44 -0700 (PDT) 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 C8FC937B400 for ; Sat, 14 Sep 2002 21:13:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7671F43E3B for ; Sat, 14 Sep 2002 21:13:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8F4DhJU098306 for ; Sat, 14 Sep 2002 21:13:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8F4DhIp098303 for perforce@freebsd.org; Sat, 14 Sep 2002 21:13:43 -0700 (PDT) Date: Sat, 14 Sep 2002 21:13:43 -0700 (PDT) Message-Id: <200209150413.g8F4DhIp098303@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17505 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17505 Change 17505 by rwatson@rwatson_paprika on 2002/09/14 21:13:42 Update comments to be more suggestive about how the back-end installer should be hooked in. Affected files ... .. //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#2 (text+ko) ==== @@ -97,7 +97,9 @@ wizard->setHelpEnabled(page1, FALSE); /* - * Page 2: Configuration options. + * Page 2: Configuration options. Any necessary choices regarding + * the installation process should go on this page, or pages + * inserted immediately following it. */ QVBox *page2 = new QVBox(wizard); @@ -131,7 +133,7 @@ wizard->setHelpEnabled(page2, FALSE); /* - * Page 3: Conclusion. + * Page 3: Conclusion. Last warnings issued here. */ QLabel *page3 = new QLabel(wizard); page3->setText( @@ -168,10 +170,20 @@ if (wizard->exec() == FALSE) close(); + /* + * Don't permit the window to be closed from here until the + * installation is done. + */ exit_ok = false; - /* Install happens here, I suppose. */ - + /* + * Install happens here, I suppose. Any configuration options + * selected by the user should be applied. Adjust the number + * of steps below to reflect real-world steps. Update the + * status bar if needed, or status information on the Progress + * Dialog. Presumably invoking system() is the way to go + * when calling out to scripts. + */ QProgressDialog *progressdialog = new QProgressDialog(this, "TrustedBSD MLS Installation in Progress", TRUE); progressdialog->setTotalSteps(5); @@ -191,6 +203,10 @@ QMessageBox::information(this, "MLS Installation Complete!", "MLS support is now installed; reboot the system to start MLS."); + /* + * Re-enable window closing so that we can generate an exit + * event. + */ exit_ok = true; KMainWindow::close(); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 15 8:39:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92B5437B401; Sun, 15 Sep 2002 08:39:26 -0700 (PDT) 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 5094137B400 for ; Sun, 15 Sep 2002 08:39:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B6EF43E42 for ; Sun, 15 Sep 2002 08:39:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8FFdPJU000795 for ; Sun, 15 Sep 2002 08:39:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8FFdPBP000787 for perforce@freebsd.org; Sun, 15 Sep 2002 08:39:25 -0700 (PDT) Date: Sun, 15 Sep 2002 08:39:25 -0700 (PDT) Message-Id: <200209151539.g8FFdPBP000787@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17522 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17522 Change 17522 by rwatson@rwatson_paprika on 2002/09/15 08:39:20 After generating a close() event, return from the constructor rather than allowing it to continue. Remove an extraneous printf. Affected files ... .. //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#3 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#3 (text+ko) ==== @@ -158,17 +158,16 @@ int new_center_x, new_center_y; - printf("x: %d, y: %d\n", mainwindow_size.width(), - mainwindow_size.height()); - new_center_x = mainwindow_size.width() / 2 + this->x(); new_center_y = mainwindow_size.height() / 2 + this->y(); wizard->move(new_center_x - (dialog_size.width() / 2), new_center_y - (dialog_size.height() / 2)); - if (wizard->exec() == FALSE) + if (wizard->exec() == FALSE) { close(); + return; + } /* * Don't permit the window to be closed from here until the To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 15 9:24:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7354237B401; Sun, 15 Sep 2002 09:24:22 -0700 (PDT) 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 190F337B400 for ; Sun, 15 Sep 2002 09:24:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACDFD43E65 for ; Sun, 15 Sep 2002 09:24:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8FGOLJU015491 for ; Sun, 15 Sep 2002 09:24:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8FGOLZq015488 for perforce@freebsd.org; Sun, 15 Sep 2002 09:24:21 -0700 (PDT) Date: Sun, 15 Sep 2002 09:24:21 -0700 (PDT) Message-Id: <200209151624.g8FGOLZq015488@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17524 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17524 Change 17524 by rwatson@rwatson_paprika on 2002/09/15 09:23:56 Add more text, make samples more realistic. Affected files ... .. //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#4 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#4 (text+ko) ==== @@ -185,19 +185,62 @@ */ QProgressDialog *progressdialog = new QProgressDialog(this, "TrustedBSD MLS Installation in Progress", TRUE); - progressdialog->setTotalSteps(5); + QLabel *progresslabel = new QLabel(progressdialog); + progresslabel->setIndent(8); + progresslabel->setFont(font); + progressdialog->setTotalSteps(9); + progressdialog->setLabel(progresslabel); + progressdialog->setCancelButton(NULL); + progressdialog->setMinimumDuration(0); + progressdialog->setLabelText("TrustedBSD MLS Installation\n" + "Searching system"); progressdialog->setProgress(0); sleep(1); + + progressdialog->setLabelText("TrustedBSD MLS Installation\n" + "Installing kernel module"); progressdialog->setProgress(1); sleep(1); + + progressdialog->setLabelText("TrustedBSD MLS Installation\n" + "Installing user module"); progressdialog->setProgress(2); sleep(1); + + progressdialog->setLabelText("TrustedBSD MLS Installation\n" + "Updating loader.conf"); progressdialog->setProgress(3); sleep(1); + + progressdialog->setLabelText("TrustedBSD MLS Installation\n" + "Updating mac.conf"); progressdialog->setProgress(4); sleep(1); + + progressdialog->setLabelText("TrustedBSD MLS Installation\n" + "Enable first-boot labeling event"); progressdialog->setProgress(5); + sleep(1); + + progressdialog->setLabelText("TrustedBSD MLS Installation\n" + "Updating login.conf"); + progressdialog->setProgress(6); + sleep(1); + + progressdialog->setLabelText("TrustedBSD MLS Installation\n" + "Adding Security Officer account"); + progressdialog->setProgress(7); + sleep(1); + + progressdialog->setLabelText("TrustedBSD MLS Installation\n" + "Configuring Apache run-time label"); + progressdialog->setProgress(8); + sleep(1); + + progressdialog->setLabelText("TrustedBSD MLS Installation\n" + "Install complete"); + progressdialog->setProgress(9); QMessageBox::information(this, "MLS Installation Complete!", "MLS support is now installed; reboot the system to start MLS."); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 15 17:55:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62C1437B401; Sun, 15 Sep 2002 17:55:56 -0700 (PDT) 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 0E49D37B400 for ; Sun, 15 Sep 2002 17:55:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5FAB43E6A for ; Sun, 15 Sep 2002 17:55:55 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8G0ttJU074821 for ; Sun, 15 Sep 2002 17:55:55 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8G0ttBt074818 for perforce@freebsd.org; Sun, 15 Sep 2002 17:55:55 -0700 (PDT) Date: Sun, 15 Sep 2002 17:55:55 -0700 (PDT) Message-Id: <200209160055.g8G0ttBt074818@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17545 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17545 Change 17545 by mini@mini_stylus on 2002/09/15 17:55:22 It's _KERNEL, not _KERNEL_. Affected files ... .. //depot/projects/kse/sys/i386/isa/npx.c#21 edit .. //depot/projects/kse/sys/sys/kse.h#20 edit Differences ... ==== //depot/projects/kse/sys/i386/isa/npx.c#21 (text+ko) ==== @@ -563,7 +563,7 @@ register_t savecrit; savecrit = intr_disable(); - if (td == PCPU_GET(fpcurthread)) + if (curthread == PCPU_GET(fpcurthread)) npxsave(&PCPU_GET(curpcb)->pcb_save); intr_restore(savecrit); #ifdef NPX_DEBUG @@ -824,6 +824,9 @@ * and not necessarily for every context switch, but it is too hard to * access foreign pcb's. */ + +static int err_count = 0; + int npxdna() { @@ -833,9 +836,17 @@ if (!npx_exists) return (0); + if (PCPU_GET(fpcurthread) == curthread) { + printf("npxdna: fpcurthread == curthread %d times\n", + ++err_count); + stop_emulating(); + return (1); + } if (PCPU_GET(fpcurthread) != NULL) { - printf("npxdna: fpcurthread = %p, curthread = %p\n", - PCPU_GET(fpcurthread), curthread); + printf("npxdna: fpcurthread = %p (%d), curthread = %p (%d)\n", + PCPU_GET(fpcurthread), + PCPU_GET(fpcurthread)->td_proc->p_pid, + curthread, curthread->td_proc->p_pid); panic("npxdna"); } s = intr_disable(); @@ -951,7 +962,7 @@ } s = intr_disable(); - if (td == PCPU_GET(fpcurthread)) { + if (curthread == PCPU_GET(fpcurthread)) { fpusave(addr); #ifdef CPU_ENABLE_SSE if (!cpu_fxsr) @@ -972,7 +983,7 @@ } /* - * Set the state of the FPU; this must be called with interrupts disabled. + * Set the state of the FPU. */ void npxsetregs(td, addr) @@ -985,7 +996,7 @@ return; s = intr_disable(); - if (td == PCPU_GET(fpcurthread)) { + if (curthread == PCPU_GET(fpcurthread)) { fpurstor(addr); intr_restore(s); } else { ==== //depot/projects/kse/sys/sys/kse.h#20 (text+ko) ==== @@ -74,7 +74,7 @@ int tm_spare[8]; }; -#ifndef _KERNEL_ +#ifndef _KERNEL int kse_exit(void); int kse_wakeup(void); int kse_new(struct kse_mailbox *, int); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 15 18:19:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E62C737B401; Sun, 15 Sep 2002 18:19:25 -0700 (PDT) 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 9387B37B400 for ; Sun, 15 Sep 2002 18:19:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D8EE43E42 for ; Sun, 15 Sep 2002 18:19:25 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8G1JOJU083145 for ; Sun, 15 Sep 2002 18:19:24 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8G1JO3d083139 for perforce@freebsd.org; Sun, 15 Sep 2002 18:19:24 -0700 (PDT) Date: Sun, 15 Sep 2002 18:19:24 -0700 (PDT) Message-Id: <200209160119.g8G1JO3d083139@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17547 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17547 Change 17547 by mini@mini_stylus on 2002/09/15 18:18:54 Remove botch from last IFC. Affected files ... .. //depot/projects/kse/sys/sys/proc.h#133 edit Differences ... ==== //depot/projects/kse/sys/sys/proc.h#133 (text+ko) ==== @@ -422,7 +422,6 @@ KES_UNQUEUED, /* in transit */ KES_THREAD /* slaved to thread state */ } ke_state; /* (j) S* process status. */ - void *ke_mailbox; /* the userland mailbox address */ struct kse_mailbox *ke_mailbox; /* the userland mailbox address */ stack_t ke_stack; void *ke_upcall; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 15 19:32:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0562537B401; Sun, 15 Sep 2002 19:32:55 -0700 (PDT) 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 7CCAA37B400 for ; Sun, 15 Sep 2002 19:32:54 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C62843E3B for ; Sun, 15 Sep 2002 19:32:54 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8G2WsJU002430 for ; Sun, 15 Sep 2002 19:32:54 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8G2Wsa1002427 for perforce@freebsd.org; Sun, 15 Sep 2002 19:32:54 -0700 (PDT) Date: Sun, 15 Sep 2002 19:32:54 -0700 (PDT) Message-Id: <200209160232.g8G2Wsa1002427@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 17549 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17549 Change 17549 by julian@julian_jules1 on 2002/09/15 19:32:19 This got left out in the last merge from -current I have no idea why.. Affected files ... .. //depot/projects/kse/bin/ps/print.c#13 edit Differences ... ==== //depot/projects/kse/bin/ps/print.c#13 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.69 2002/07/11 17:28:29 bde Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.70 2002/09/13 07:13:33 peter Exp $"); #include #include @@ -65,7 +65,7 @@ #include "lomac.h" #include "ps.h" -static void printval(void *, VAR *); +#define ps_pgtok(a) (((a) * getpagesize()) / 1024) void printheader(void) @@ -477,10 +477,6 @@ } } -#ifndef pgtok -#define pgtok(a) (((a)*getpagesize())/1024) -#endif - void vsize(KINFO *k, VARENT *ve) { @@ -629,7 +625,7 @@ VAR *v; v = ve->var; - (void)printf("%*ld", v->width, (long)pgtok(k->ki_p->ki_tsize)); + (void)printf("%*ld", v->width, (long)ps_pgtok(k->ki_p->ki_tsize)); } void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 15 19:42: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B64937B401; Sun, 15 Sep 2002 19:41:37 -0700 (PDT) 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 DD69C37B400 for ; Sun, 15 Sep 2002 19:41:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D96A943E65 for ; Sun, 15 Sep 2002 19:41:35 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8G2fZJU002943 for ; Sun, 15 Sep 2002 19:41:35 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8G2fVkK002878 for perforce@freebsd.org; Sun, 15 Sep 2002 19:41:31 -0700 (PDT) Date: Sun, 15 Sep 2002 19:41:31 -0700 (PDT) Message-Id: <200209160241.g8G2fVkK002878@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 17550 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17550 Change 17550 by julian@julian_jules1 on 2002/09/15 19:41:24 IFC, including the independent KSE and KSEGRP changes. This should allow kse_new() to be finished to allow the creation of new KSEs and KSEGRPs. Affected files ... .. //depot/projects/kse/bin/ps/print.c#14 integrate .. //depot/projects/kse/include/wchar.h#6 integrate .. //depot/projects/kse/lib/libc/locale/Makefile.inc#7 integrate .. //depot/projects/kse/lib/libc/locale/wcsftime.c#2 integrate .. //depot/projects/kse/lib/libc/locale/wcstod.3#1 branch .. //depot/projects/kse/lib/libc/locale/wcstod.c#1 branch .. //depot/projects/kse/lib/libc/net/getaddrinfo.c#5 integrate .. //depot/projects/kse/lib/libc/net/gethostbydns.c#3 integrate .. //depot/projects/kse/lib/libc/net/getnetbydns.c#3 integrate .. //depot/projects/kse/lib/libc/net/hesiod.c#2 integrate .. //depot/projects/kse/lib/libc/net/name6.c#3 integrate .. //depot/projects/kse/lib/libc/net/res_mkquery.c#2 integrate .. //depot/projects/kse/lib/libc/net/res_query.c#3 integrate .. //depot/projects/kse/lib/libc/net/res_update.c#3 integrate .. //depot/projects/kse/lib/libc/sparc64/gen/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/sparc64/gen/fpgetmask.c#1 branch .. //depot/projects/kse/lib/libc/sparc64/gen/fpgetround.c#1 branch .. //depot/projects/kse/lib/libc/sparc64/gen/fpgetsticky.c#1 branch .. //depot/projects/kse/lib/libc/sparc64/gen/fpsetmask.c#2 integrate .. //depot/projects/kse/lib/libc/sparc64/gen/fpsetround.c#1 branch .. //depot/projects/kse/lib/libc/sparc64/gen/fpsetsticky.c#1 branch .. //depot/projects/kse/lib/libkvm/kvm_proc.c#23 integrate .. //depot/projects/kse/sys/alpha/alpha/interrupt.c#15 integrate .. //depot/projects/kse/sys/alpha/alpha/machdep.c#43 integrate .. //depot/projects/kse/sys/coda/coda_vnops.c#10 integrate .. //depot/projects/kse/sys/ddb/db_elf.c#3 integrate .. //depot/projects/kse/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/kse/sys/dev/ata/ata-dma.c#24 integrate .. //depot/projects/kse/sys/dev/ata/ata-isa.c#7 integrate .. //depot/projects/kse/sys/dev/ata/ata-pci.c#25 integrate .. //depot/projects/kse/sys/dev/sound/pcm/sound.h#8 integrate .. //depot/projects/kse/sys/dev/usb/usb.c#17 integrate .. //depot/projects/kse/sys/fs/deadfs/dead_vnops.c#5 integrate .. //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#16 integrate .. //depot/projects/kse/sys/fs/fdescfs/fdesc_vnops.c#10 integrate .. //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#16 integrate .. //depot/projects/kse/sys/fs/hpfs/hpfs_vfsops.c#12 integrate .. //depot/projects/kse/sys/fs/hpfs/hpfs_vnops.c#12 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_denode.c#9 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_vnops.c#10 integrate .. //depot/projects/kse/sys/fs/ntfs/ntfs_vfsops.c#13 integrate .. //depot/projects/kse/sys/fs/nullfs/null_subr.c#5 integrate .. //depot/projects/kse/sys/fs/nullfs/null_vnops.c#10 integrate .. //depot/projects/kse/sys/fs/nwfs/nwfs_node.c#7 integrate .. //depot/projects/kse/sys/fs/portalfs/portal_vfsops.c#8 integrate .. //depot/projects/kse/sys/fs/portalfs/portal_vnops.c#12 integrate .. //depot/projects/kse/sys/fs/pseudofs/pseudofs.c#12 integrate .. //depot/projects/kse/sys/fs/pseudofs/pseudofs_vncache.c#14 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs_node.c#6 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs_vnops.c#12 integrate .. //depot/projects/kse/sys/fs/specfs/spec_vnops.c#16 integrate .. //depot/projects/kse/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/kse/sys/fs/umapfs/umap_subr.c#6 integrate .. //depot/projects/kse/sys/fs/umapfs/umap_vnops.c#5 integrate .. //depot/projects/kse/sys/fs/unionfs/union_subr.c#10 integrate .. //depot/projects/kse/sys/fs/unionfs/union_vnops.c#7 integrate .. //depot/projects/kse/sys/gnu/ext2fs/ext2_vfsops.c#11 integrate .. //depot/projects/kse/sys/gnu/ext2fs/ext2_vnops.c#8 integrate .. //depot/projects/kse/sys/i386/conf/makeLINT.sh#2 delete .. //depot/projects/kse/sys/i386/i386/i686_mem.c#3 integrate .. //depot/projects/kse/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/kse/sys/i386/i386/machdep.c#58 integrate .. //depot/projects/kse/sys/i386/linux/linux_ptrace.c#7 integrate .. //depot/projects/kse/sys/ia64/ia64/machdep.c#39 integrate .. //depot/projects/kse/sys/isa/fd.c#11 integrate .. //depot/projects/kse/sys/isofs/cd9660/cd9660_vfsops.c#10 integrate .. //depot/projects/kse/sys/isofs/cd9660/cd9660_vnops.c#7 integrate .. //depot/projects/kse/sys/kern/init_main.c#49 integrate .. //depot/projects/kse/sys/kern/kern_descrip.c#38 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#40 integrate .. //depot/projects/kse/sys/kern/kern_exit.c#62 integrate .. //depot/projects/kse/sys/kern/kern_fork.c#81 integrate .. //depot/projects/kse/sys/kern/kern_lockf.c#12 integrate .. //depot/projects/kse/sys/kern/kern_mac.c#5 integrate .. //depot/projects/kse/sys/kern/kern_proc.c#86 integrate .. //depot/projects/kse/sys/kern/kern_resource.c#23 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#67 integrate .. //depot/projects/kse/sys/kern/kern_switch.c#67 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#110 integrate .. //depot/projects/kse/sys/kern/subr_bus.c#13 integrate .. //depot/projects/kse/sys/kern/vfs_bio.c#25 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#43 integrate .. //depot/projects/kse/sys/net/if_gre.c#2 integrate .. //depot/projects/kse/sys/netgraph/ng_ksocket.c#18 integrate .. //depot/projects/kse/sys/nfsclient/nfs_node.c#8 integrate .. //depot/projects/kse/sys/nfsclient/nfs_vnops.c#12 integrate .. //depot/projects/kse/sys/pc98/i386/machdep.c#34 integrate .. //depot/projects/kse/sys/pci/agp_i810.c#6 integrate .. //depot/projects/kse/sys/powerpc/powerpc/machdep.c#24 integrate .. //depot/projects/kse/sys/security/lomac/lomacfs_subr.c#4 integrate .. //depot/projects/kse/sys/security/lomac/lomacfs_vnops.c#7 integrate .. //depot/projects/kse/sys/sparc64/include/fsr.h#3 integrate .. //depot/projects/kse/sys/sparc64/include/ieeefp.h#2 integrate .. //depot/projects/kse/sys/sparc64/sparc64/machdep.c#39 integrate .. //depot/projects/kse/sys/sys/bio.h#9 integrate .. //depot/projects/kse/sys/sys/bus.h#7 integrate .. //depot/projects/kse/sys/sys/cdefs.h#16 integrate .. //depot/projects/kse/sys/sys/devicestat.h#3 integrate .. //depot/projects/kse/sys/sys/malloc.h#9 integrate .. //depot/projects/kse/sys/sys/memrange.h#3 integrate .. //depot/projects/kse/sys/sys/proc.h#134 integrate .. //depot/projects/kse/sys/sys/vnode.h#32 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_vfsops.c#25 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_vnops.c#18 integrate .. //depot/projects/kse/sys/vm/vm_swap.c#11 integrate Differences ... ==== //depot/projects/kse/bin/ps/print.c#14 (text+ko) ==== ==== //depot/projects/kse/include/wchar.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.25 2002/09/12 23:33:17 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.26 2002/09/15 08:38:50 tjr Exp $ */ /*- @@ -144,6 +144,7 @@ size_t wcsspn(const wchar_t *, const wchar_t *); wchar_t *wcsstr(const wchar_t * __restrict, const wchar_t * __restrict); int wctob(wint_t); +double wcstod(const wchar_t * __restrict, wchar_t ** __restrict); wchar_t *wcstok(wchar_t * __restrict, const wchar_t * __restrict, wchar_t ** __restrict); long wcstol(const wchar_t * __restrict, wchar_t ** __restrict, int); ==== //depot/projects/kse/lib/libc/locale/Makefile.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.37 2002/09/11 08:57:11 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.38 2002/09/15 08:38:51 tjr Exp $ # locale sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale @@ -11,7 +11,8 @@ mbrtowc.c mbrune.c mbsinit.c mbsrtowcs.c mbtowc.c mbstowcs.c \ mskanji.c nl_langinfo.c nomacros.c none.c rune.c \ runetype.c setinvalidrune.c setlocale.c setrunelocale.c table.c \ - tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wcsftime.c wcstol.c \ + tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wcsftime.c wcstod.c \ + wcstol.c \ wcstombs.c \ wcstoul.c wctob.c wctomb.c wctrans.c wctype.c wcwidth.c @@ -25,7 +26,7 @@ rune.3 \ setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wcsftime.3 \ wcrtomb.3 \ - wcsrtombs.3 wcstol.3 \ + wcsrtombs.3 wcstod.3 wcstol.3 \ wctrans.3 wctype.3 wcwidth.3 MAN+= euc.4 utf2.4 ==== //depot/projects/kse/lib/libc/locale/wcsftime.c#2 (text+ko) ==== @@ -25,8 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcsftime.c,v 1.1 2002/09/11 08:57:11 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcsftime.c,v 1.2 2002/09/15 08:06:17 tjr Exp $"); +#include #include #include #include @@ -51,8 +52,11 @@ { static const mbstate_t initial; mbstate_t state; - char *dst, *sformat; + char *dst, *dstp, *sformat; size_t n, sflen; + int sverrno; + + sformat = dst = NULL; /* * Convert the supplied format string to a multibyte representation @@ -61,8 +65,9 @@ state = initial; sflen = wcsrtombs(NULL, &format, 0, &state); if (sflen == (size_t)-1) - return (0); - sformat = alloca(sflen + 1); + goto error; + if ((sformat = malloc(sflen + 1)) == NULL) + goto error; state = initial; wcsrtombs(sformat, &format, sflen + 1, &state); @@ -72,16 +77,29 @@ * Then, copy and convert the result back into wide characters in * the caller's buffer. */ - if (SIZE_T_MAX / MB_CUR_MAX <= maxsize) + if (SIZE_T_MAX / MB_CUR_MAX <= maxsize) { /* maxsize is prepostorously large - avoid int. overflow. */ - return (0); - dst = alloca(maxsize * MB_CUR_MAX); + errno = EINVAL; + goto error; + } + if ((dst = malloc(maxsize * MB_CUR_MAX)) == NULL) + goto error; if (strftime(dst, maxsize, sformat, timeptr) == 0) - return (0); + goto error; state = initial; - n = mbsrtowcs(wcs, (const char **)&dst, maxsize, &state); - if (n == (size_t)-2 || n == (size_t)-1 || dst != NULL) - return (0); + dstp = dst; + n = mbsrtowcs(wcs, (const char **)&dstp, maxsize, &state); + if (n == (size_t)-2 || n == (size_t)-1 || dstp != NULL) + goto error; + free(sformat); + free(dst); return (n); + +error: + sverrno = errno; + free(sformat); + free(dst); + errno = sverrno; + return (0); } ==== //depot/projects/kse/lib/libc/net/getaddrinfo.c#5 (text+ko) ==== @@ -83,7 +83,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.30 2002/09/13 20:31:29 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.33 2002/09/15 20:36:38 ume Exp $"); #include "namespace.h" #include @@ -201,7 +201,7 @@ { 0 } }; -#define MAXPACKET 65536 +#define MAXPACKET (64*1024) typedef union { HEADER hdr; @@ -1411,7 +1411,7 @@ va_list ap; { struct addrinfo *ai; - querybuf buf, buf2; + querybuf *buf, *buf2; const char *name; const struct addrinfo *pai; struct addrinfo sentinel, *cur; @@ -1425,47 +1425,66 @@ memset(&sentinel, 0, sizeof(sentinel)); cur = &sentinel; + buf = malloc(sizeof(*buf)); + if (!buf) { + h_errno = NETDB_INTERNAL; + return NS_NOTFOUND; + } + buf2 = malloc(sizeof(*buf2)); + if (!buf2) { + free(buf); + h_errno = NETDB_INTERNAL; + return NS_NOTFOUND; + } + switch (pai->ai_family) { case AF_UNSPEC: /* prefer IPv6 */ q.qclass = C_IN; q.qtype = T_AAAA; - q.answer = buf.buf; - q.anslen = sizeof(buf); + q.answer = buf->buf; + q.anslen = sizeof(buf->buf); q.next = &q2; q2.qclass = C_IN; q2.qtype = T_A; - q2.answer = buf2.buf; - q2.anslen = sizeof(buf2); + q2.answer = buf2->buf; + q2.anslen = sizeof(buf2->buf); break; case AF_INET: q.qclass = C_IN; q.qtype = T_A; - q.answer = buf.buf; - q.anslen = sizeof(buf); + q.answer = buf->buf; + q.anslen = sizeof(buf->buf); break; case AF_INET6: q.qclass = C_IN; q.qtype = T_AAAA; - q.answer = buf.buf; - q.anslen = sizeof(buf); + q.answer = buf->buf; + q.anslen = sizeof(buf->buf); break; default: + free(buf); + free(buf2); return NS_UNAVAIL; } - if (res_searchN(name, &q) < 0) + if (res_searchN(name, &q) < 0) { + free(buf); + free(buf2); return NS_NOTFOUND; - ai = getanswer(&buf, q.n, q.name, q.qtype, pai); + } + ai = getanswer(buf, q.n, q.name, q.qtype, pai); if (ai) { cur->ai_next = ai; while (cur && cur->ai_next) cur = cur->ai_next; } if (q.next) { - ai = getanswer(&buf2, q2.n, q2.name, q2.qtype, pai); + ai = getanswer(buf2, q2.n, q2.name, q2.qtype, pai); if (ai) cur->ai_next = ai; } + free(buf); + free(buf2); if (sentinel.ai_next == NULL) switch (h_errno) { case HOST_NOT_FOUND: @@ -1768,7 +1787,7 @@ const char *name; /* domain name */ struct res_target *target; { - u_char buf[MAXPACKET]; + u_char *buf; HEADER *hp; int n; struct res_target *t; @@ -1783,6 +1802,12 @@ return (-1); } + buf = malloc(MAXPACKET); + if (!buf) { + h_errno = NETDB_INTERNAL; + return -1; + } + for (t = target; t; t = t->next) { int class, type; u_char *answer; @@ -1802,14 +1827,15 @@ #endif n = res_mkquery(QUERY, name, class, type, NULL, 0, NULL, - buf, sizeof(buf)); + buf, MAXPACKET); if (n > 0 && (_res.options & RES_USE_EDNS0) != 0) - n = res_opt(n, buf, sizeof(buf), anslen); + n = res_opt(n, buf, MAXPACKET, anslen); if (n <= 0) { #ifdef DEBUG if (_res.options & RES_DEBUG) printf(";; res_query: mkquery failed\n"); #endif + free(buf); h_errno = NO_RECOVERY; return (n); } @@ -1820,12 +1846,15 @@ if (_res.options & RES_DEBUG) printf(";; res_query: send error\n"); #endif + free(buf); h_errno = TRY_AGAIN; return (n); } #endif - if (n < 0 || hp->rcode != NOERROR || ntohs(hp->ancount) == 0) { + if (n < 0 || n > anslen) + hp->rcode = FORMERR; /* XXX not very informative */ + if (hp->rcode != NOERROR || ntohs(hp->ancount) == 0) { rcode = hp->rcode; /* record most recent error */ #ifdef DEBUG if (_res.options & RES_DEBUG) @@ -1840,6 +1869,8 @@ t->n = n; } + free(buf); + if (ancount == 0) { switch (rcode) { case NXDOMAIN: ==== //depot/projects/kse/lib/libc/net/gethostbydns.c#3 (text+ko) ==== @@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.37 2002/09/13 20:31:29 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.39 2002/09/15 16:51:09 nectar Exp $"); #include #include @@ -103,7 +103,11 @@ static void dprintf(char *, int) __printflike(1, 0); #endif -#define MAXPACKET 65536 +#if PACKETSZ > 1024 +#define MAXPACKET PACKETSZ +#else +#define MAXPACKET 1024 +#endif typedef union { HEADER hdr; @@ -583,9 +587,13 @@ break; } - if ((n = res_search(name, C_IN, type, buf.buf, sizeof(buf))) < 0) { + n = res_search(name, C_IN, type, buf.buf, sizeof(buf.buf)); + if (n < 0) { dprintf("res_search failed (%d)\n", n); - return NS_UNAVAIL; + return (NULL); + } else if (n > sizeof(buf.buf)) { + dprintf("static buffer is too small (%d)\n", n); + return (NULL); } *(struct hostent **)rval = gethostanswer(&buf, n, name, type); return (*(struct hostent **)rval != NULL) ? NS_SUCCESS : NS_NOTFOUND; ==== //depot/projects/kse/lib/libc/net/getnetbydns.c#3 (text+ko) ==== @@ -62,7 +62,7 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getnetbydns.c,v 1.22 2002/09/13 20:31:29 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getnetbydns.c,v 1.24 2002/09/15 16:51:09 nectar Exp $"); #include #include @@ -88,7 +88,11 @@ #define BYNAME 1 #define MAXALIASES 35 -#define MAXPACKET 65536 +#if PACKETSZ > 1024 +#define MAXPACKET PACKETSZ +#else +#define MAXPACKET 1024 +#endif typedef union { HEADER hdr; @@ -259,7 +263,13 @@ if (anslen < 0) { #ifdef DEBUG if (_res.options & RES_DEBUG) - printf("res_query failed\n"); + printf("res_search failed\n"); +#endif + return NS_UNAVAIL; + } else if (anslen > sizeof(buf)) { +#ifdef DEBUG + if (_res.options & RES_DEBUG) + printf("res_search static buffer too small"); #endif return NS_UNAVAIL; } @@ -299,7 +309,13 @@ if (anslen < 0) { #ifdef DEBUG if (_res.options & RES_DEBUG) - printf("res_query failed\n"); + printf("res_search failed\n"); +#endif + return NS_UNAVAIL; + } else if (anslen > sizeof(buf)) { +#ifdef DEBUG + if (_res.options & RES_DEBUG) + printf("res_search static buffer too small"); #endif return NS_UNAVAIL; } ==== //depot/projects/kse/lib/libc/net/hesiod.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ static char *orig_rcsid = "$NetBSD: hesiod.c,v 1.9 1999/02/11 06:16:38 simonb Exp $"; #endif #include -__FBSDID("$FreeBSD: src/lib/libc/net/hesiod.c,v 1.6 2002/03/22 21:52:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/hesiod.c,v 1.7 2002/09/15 16:51:09 nectar Exp $"); #include #include @@ -386,8 +386,8 @@ /* Send the query. */ n = res_send(qbuf, n, abuf, MAX_HESRESP); - if (n < 0) { - errno = ECONNREFUSED; + if (n < 0 || n > MAX_HESRESP) { + errno = ECONNREFUSED; /* XXX */ return NULL; } /* Parse the header of the result. */ ==== //depot/projects/kse/lib/libc/net/name6.c#3 (text+ko) ==== @@ -94,7 +94,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.25 2002/09/13 20:31:29 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.27 2002/09/15 16:51:09 nectar Exp $"); #include "namespace.h" #include @@ -967,7 +967,11 @@ int rtl_type; }; -#define MAXPACKET 65536 +#if PACKETSZ > 1024 +#define MAXPACKET PACKETSZ +#else +#define MAXPACKET 1024 +#endif typedef union { HEADER hdr; @@ -1283,7 +1287,7 @@ rtl = SLIST_NEXT(rtl, rtl_entry)) { ret = res_query(cp, C_IN, rtl->rtl_type, buf.buf, sizeof(buf.buf)); - if (ret > 0) { + if (ret > 0 && ret < sizeof(buf.buf)) { hpbuf.h_addrtype = (rtl->rtl_type == T_AAAA) ? AF_INET6 : AF_INET; hpbuf.h_length = ADDRLEN(hpbuf.h_addrtype); @@ -1308,7 +1312,7 @@ rtl = SLIST_NEXT(rtl, rtl_entry)) { ret = res_querydomain(name, NULL, C_IN, rtl->rtl_type, buf.buf, sizeof(buf.buf)); - if (ret > 0) { + if (ret > 0 && ret < sizeof(buf.buf)) { hpbuf.h_addrtype = (rtl->rtl_type == T_AAAA) ? AF_INET6 : AF_INET; hpbuf.h_length = ADDRLEN(hpbuf.h_addrtype); @@ -1345,7 +1349,7 @@ ret = res_querydomain(name, *domain, C_IN, rtl->rtl_type, buf.buf, sizeof(buf.buf)); - if (ret > 0) { + if (ret > 0 && ret < sizeof(buf.buf)) { hpbuf.h_addrtype = (rtl->rtl_type == T_AAAA) ? AF_INET6 : AF_INET; hpbuf.h_length = ADDRLEN(hpbuf.h_addrtype); @@ -1415,7 +1419,7 @@ rtl = SLIST_NEXT(rtl, rtl_entry)) { ret = res_querydomain(name, NULL, C_IN, rtl->rtl_type, buf.buf, sizeof(buf.buf)); - if (ret > 0) { + if (ret > 0 && ret < sizeof(buf.buf)) { hpbuf.h_addrtype = (rtl->rtl_type == T_AAAA) ? AF_INET6 : AF_INET; hpbuf.h_length = ADDRLEN(hpbuf.h_addrtype); @@ -1566,6 +1570,12 @@ if (n < 0) { *errp = h_errno; return NS_UNAVAIL; + } else if (n > sizeof(buf.buf)) { +#if 0 + errno = ERANGE; /* XXX is it OK to set errno here? */ +#endif + *errp = NETDB_INTERNAL; + return NS_UNAVAIL; } hp = getanswer(&buf, n, qbuf, T_PTR, &hbuf, errp); if (!hp) ==== //depot/projects/kse/lib/libc/net/res_mkquery.c#2 (text+ko) ==== @@ -73,7 +73,7 @@ static char orig_rcsid[] = "From: Id: res_mkquery.c,v 8.9 1997/04/24 22:22:36 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/res_mkquery.c,v 1.18 2002/03/22 21:52:30 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/res_mkquery.c,v 1.19 2002/09/14 17:28:40 ume Exp $"); #include #include @@ -229,6 +229,8 @@ __putshort(T_OPT, cp); /* TYPE */ cp += INT16SZ; + if (anslen > 0xffff) + anslen = 0xffff; /* limit to 16bit value */ __putshort(anslen & 0xffff, cp); /* CLASS = UDP payload size */ cp += INT16SZ; *cp++ = NOERROR; /* extended RCODE */ ==== //depot/projects/kse/lib/libc/net/res_query.c#3 (text+ko) ==== @@ -73,7 +73,7 @@ static char orig_rcsid[] = "From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/res_query.c,v 1.24 2002/09/13 20:31:29 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/res_query.c,v 1.25 2002/09/15 04:23:20 nectar Exp $"); #include #include @@ -90,7 +90,11 @@ #include "res_config.h" -#define MAXPACKET 65536 +#if PACKETSZ > 1024 +#define MAXPACKET PACKETSZ +#else +#define MAXPACKET 1024 +#endif /* * Formulate a normal query, send, and await answer. ==== //depot/projects/kse/lib/libc/net/res_update.c#3 (text+ko) ==== @@ -21,7 +21,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/res_update.c,v 1.5 2002/09/13 20:31:29 nectar Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/res_update.c,v 1.7 2002/09/15 16:51:09 nectar Exp $"); #include #include @@ -51,7 +51,6 @@ */ #define NSMAX 16 -#define MAXPACKET 65536 struct ns1 { char nsname[MAXDNAME]; @@ -72,7 +71,7 @@ int res_update(ns_updrec *rrecp_in) { ns_updrec *rrecp, *tmprrecp; - u_char buf[PACKETSZ], answer[MAXPACKET], packet[2*PACKETSZ]; + u_char buf[PACKETSZ], answer[PACKETSZ], packet[2*PACKETSZ]; char name[MAXDNAME], zname[MAXDNAME], primary[MAXDNAME], mailaddr[MAXDNAME]; u_char soardata[2*MAXCDNAME+5*INT32SZ]; @@ -160,6 +159,9 @@ fprintf(stderr, "res_update: send error for %s\n", rrecp->r_dname); return (n); + } else if (n > sizeof(answer)) { + fprintf(stderr, "res_update: buffer too small\n"); + return (-1); } if (n < HFIXEDSZ) return (-1); @@ -499,7 +501,10 @@ if (n < 0) { fprintf(stderr, "res_send: send error, n=%d\n", n); break; - } else + } else if (n > sizeof(answer)) { + fprintf(stderr, "res_send: buffer too small\n"); + break; + } numzones++; } ==== //depot/projects/kse/lib/libc/sparc64/gen/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,5 @@ -# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.5 2002/09/13 16:01:26 tmm Exp $ +# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.6 2002/09/14 18:06:21 tmm Exp $ -SRCS+= _setjmp.S fabs.S fixunsdfsi.S flt_rounds.c fpsetmask.c frexp.c \ +SRCS+= _setjmp.S fabs.S fixunsdfsi.S flt_rounds.c fpgetmask.c fpgetround.c \ + fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c frexp.c \ infinity.c isinf.c ldexp.c modf.S setjmp.S sigsetjmp.S ==== //depot/projects/kse/lib/libc/sparc64/gen/fpsetmask.c#2 (text+ko) ==== @@ -4,8 +4,9 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fpsetmask.c,v 1.1 2002/03/05 04:03:57 jake Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/gen/fpsetmask.c,v 1.2 2002/09/14 18:07:03 tmm Exp $"); +#include #include fp_except_t @@ -15,13 +16,13 @@ fp_except_t old; fp_except_t new; - __asm__("st %%fsr,%0" : "=m" (*&old)); + __asm__("st %%fsr,%0" : "=m" (old)); new = old; - new &= ~(0x1f << 23); - new |= ((mask & 0x1f) << 23); + new &= ~FSR_TEM_MASK; + new |= FSR_TEM(mask & FSR_EXC_MASK); - __asm__("ld %0,%%fsr" : : "m" (*&new)); + __asm__("ld %0,%%fsr" : : "m" (new)); - return (old >> 23) & 0x1f; + return (FSR_GET_TEM(old)); } ==== //depot/projects/kse/lib/libkvm/kvm_proc.c#23 (text+ko) ==== @@ -34,11 +34,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.55 2002/09/11 08:13:56 julian Exp $ + * $FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.56 2002/09/15 23:52:25 julian Exp $ */ #include -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.55 2002/09/11 08:13:56 julian Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.56 2002/09/15 23:52:25 julian Exp $"); #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)kvm_proc.c 8.3 (Berkeley) 9/23/93"; @@ -120,6 +120,8 @@ struct pstats pstats; struct ucred ucred; struct thread mtd; + struct kse mke; + struct ksegrp mkg; struct proc proc; struct proc pproc; struct timeval tv; @@ -140,6 +142,23 @@ TAILQ_FIRST(&proc.p_threads)); return (-1); } + if (proc.p_flag & P_KSES == 0) { + if (KREAD(kd, + (u_long)TAILQ_FIRST(&proc.p_ksegrps), + &mkg)) { + _kvm_err(kd, kd->program, + "can't read ksegrp at %x", + TAILQ_FIRST(&proc.p_ksegrps)); + return (-1); + } + if (KREAD(kd, + (u_long)TAILQ_FIRST(&mkg.kg_kseq), &mke)) { + _kvm_err(kd, kd->program, + "can't read kse at %x", + TAILQ_FIRST(&mkg.kg_kseq)); + return (-1); + } + } } if (KREAD(kd, (u_long)proc.p_ucred, &ucred) == 0) { kp->ki_ruid = ucred.cr_ruid; @@ -328,24 +347,23 @@ kp->ki_sigmask = proc.p_sigmask; kp->ki_xstat = proc.p_xstat; kp->ki_acflag = proc.p_acflag; + kp->ki_lock = proc.p_lock; if (proc.p_state != PRS_ZOMBIE) { - kp->ki_pctcpu = proc.p_kse.ke_pctcpu; - kp->ki_estcpu = proc.p_ksegrp.kg_estcpu; - kp->ki_slptime = proc.p_ksegrp.kg_slptime; kp->ki_swtime = proc.p_swtime; kp->ki_flag = proc.p_flag; kp->ki_sflag = proc.p_sflag; - kp->ki_wchan = mtd.td_wchan; kp->ki_traceflag = proc.p_traceflag; if (proc.p_state == PRS_NORMAL) { if (TD_ON_RUNQ(&mtd) || TD_CAN_RUN(&mtd) || TD_IS_RUNNING(&mtd)) { kp->ki_stat = SRUN; - } else if (mtd.td_state == TDS_INHIBITED) { + } else if (mtd.td_state == + TDS_INHIBITED) { if (P_SHOULDSTOP(&proc)) { kp->ki_stat = SSTOP; - } else if (TD_IS_SLEEPING(&mtd)) { + } else if ( + TD_IS_SLEEPING(&mtd)) { kp->ki_stat = SSLEEP; } else if (TD_ON_MUTEX(&mtd)) { kp->ki_stat = SMTX; @@ -356,15 +374,30 @@ } else { kp->ki_stat = SIDL; } - kp->ki_pri.pri_class = proc.p_ksegrp.kg_pri_class; - kp->ki_pri.pri_user = proc.p_ksegrp.kg_user_pri; + /* Stuff from the thread */ kp->ki_pri.pri_level = mtd.td_priority; kp->ki_pri.pri_native = mtd.td_base_pri; - kp->ki_nice = proc.p_ksegrp.kg_nice; - kp->ki_lock = proc.p_lock; - kp->ki_rqindex = proc.p_kse.ke_rqindex; - kp->ki_oncpu = proc.p_kse.ke_oncpu; kp->ki_lastcpu = mtd.td_lastcpu; + kp->ki_wchan = mtd.td_wchan; + + if (!(proc.p_flag & P_KSES)) { + /* stuff from the ksegrp */ + kp->ki_slptime = mkg.kg_slptime; + kp->ki_pri.pri_class = mkg.kg_pri_class; + kp->ki_pri.pri_user = mkg.kg_user_pri; + kp->ki_nice = mkg.kg_nice; + kp->ki_estcpu = mkg.kg_estcpu; + + /* Stuff from the kse */ + kp->ki_pctcpu = mke.ke_pctcpu; + kp->ki_rqindex = mke.ke_rqindex; + kp->ki_oncpu = mke.ke_oncpu; + } else { + kp->ki_oncpu = -1; + kp->ki_lastcpu = -1; + kp->ki_tdflags = -1; + /* All the rest are 0 for now */ + } } else { kp->ki_stat = SZOMB; } ==== //depot/projects/kse/sys/alpha/alpha/interrupt.c#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.68 2002/04/04 21:03:13 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.69 2002/09/14 16:54:46 scottl Exp $ */ /* $NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $ */ /* @@ -44,7 +44,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/kse/sys/alpha/alpha/machdep.c#43 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.184 2002/09/07 19:12:27 jmallett Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.185 2002/09/15 23:52:23 julian Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -884,7 +884,7 @@ } - proc_linkup(&proc0, &proc0.p_ksegrp, &proc0.p_kse, &thread0); + proc_linkup(&proc0, &ksegrp0, &kse0, &thread0); /* * Init mapping for u page(s) for proc 0 */ ==== //depot/projects/kse/sys/coda/coda_vnops.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vnops.c,v 1.42 2002/05/16 21:25:34 trhodes Exp $ + * $FreeBSD: src/sys/coda/coda_vnops.c,v 1.43 2002/09/14 09:02:20 njl Exp $ * */ @@ -1959,7 +1959,7 @@ lockinit(&cp->c_lock, PINOD, "cnode", 0, 0); cp->c_fid = *fid; - err = getnewvnode(VT_CODA, vfsp, coda_vnodeop_p, &vp); + err = getnewvnode("coda", vfsp, coda_vnodeop_p, &vp); if (err) { panic("coda: getnewvnode returned error %d\n", err); } ==== //depot/projects/kse/sys/ddb/db_elf.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.11 2002/06/29 02:32:33 peter Exp $ */ +/* $FreeBSD: src/sys/ddb/db_elf.c,v 1.15 2002/09/15 22:28:39 bde Exp $ */ /* $NetBSD: db_elf.c,v 1.4 1998/05/03 18:49:54 thorpej Exp $ */ /*- @@ -38,24 +38,26 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifdef __ELF__ - #include "opt_ddb.h" #ifdef DDB_NOKLDSYM -#include #include -#include -#include +#include -#include +#ifdef __i386__ +#include +#endif +#include #include -#include #include +#ifndef _ALIGNED_POINTER +#define _ALIGNED_POINTER(ptr, type) 1 +#endif + static char *db_elf_find_strtab(db_symtab_t *); #define STAB_TO_SYMSTART(stab) ((Elf_Sym *)((stab)->start)) @@ -82,7 +84,7 @@ char *strtab_start, *strtab_end; int i; - if (ALIGNED_POINTER(symtab, long) == 0) { + if (_ALIGNED_POINTER(symtab, long) == 0) { printf("DDB: bad symbol table start address %p\n", symtab); return; } @@ -145,7 +147,7 @@ strtab_end = (char *)symtab + shp[i].sh_offset + shp[i].sh_size; break; - + case SHT_SYMTAB: if (symtab_start != NULL) goto multiple_symtab; @@ -164,8 +166,8 @@ * Now, sanity check the symbols against the string table. */ if (symtab_start == NULL || strtab_start == NULL || - ALIGNED_POINTER(symtab_start, long) == 0 || - ALIGNED_POINTER(strtab_start, long) == 0) + _ALIGNED_POINTER(symtab_start, long) == 0 || + _ALIGNED_POINTER(strtab_start, long) == 0) goto badheader; for (symp = symtab_start; symp < symtab_end; symp++) if (symp->st_name + strtab_start > strtab_end) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 15 19:43:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC51537B401; Sun, 15 Sep 2002 19:43:39 -0700 (PDT) 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 5B81337B400 for ; Sun, 15 Sep 2002 19:43:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0B4FC43E4A for ; Sun, 15 Sep 2002 19:43:39 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8G2hcJU005603 for ; Sun, 15 Sep 2002 19:43:38 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8G2hc0w005586 for perforce@freebsd.org; Sun, 15 Sep 2002 19:43:38 -0700 (PDT) Date: Sun, 15 Sep 2002 19:43:38 -0700 (PDT) Message-Id: <200209160243.g8G2hc0w005586@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17551 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17551 Change 17551 by mini@mini_stylus on 2002/09/15 19:43:22 Add Bruce's fix for two NPX problems: 1) a panic in npxdna() where emulation was enabled, but we owned the coprocessor. 2) a trap 9 in fxrstor, caused by unaligned access. Affected files ... .. //depot/projects/kse/sys/i386/i386/machdep.c#59 edit Differences ... ==== //depot/projects/kse/sys/i386/i386/machdep.c#59 (text+ko) ==== @@ -917,6 +917,20 @@ */ load_cr0(rcr0() | CR0_MP | CR0_TS); + /* Initialize the npx (if any) for the current process. */ + /* + * XXX the above load_cr0() also initializes it and is a layering + * violation if NPX is configured. It drops the npx partially + * and this would be fatal if we were interrupted now, and decided + * to force the state to the pcb, and checked the invariant + * (CR0_TS clear) if and only if PCPU_GET(fpcurthread) != NULL). + * ALL of this can happen except the check. The check used to + * happen and be fatal later when we didn't complete the drop + * before returning to user mode. This should be fixed properly + * soon. + */ + fpstate_drop(td); + /* * XXX - Linux emulator * Make sure sure edx is 0x0 on entry. Linux binaries depend @@ -2139,7 +2153,32 @@ mcp->mc_fpformat = _MC_FPFMT_NODEV; mcp->mc_ownedfp = _MC_FPOWNED_NONE; #else - mcp->mc_ownedfp = npxgetregs(td, (union savefpu *)&mcp->mc_fpstate); + union savefpu *addr; + + /* + * XXX mc_fpstate might be misaligned, since its declaration is not + * unportabilized using __attribute__((aligned(16))) like the + * declaration of struct savemm, and anyway, alignment doesn't work + * for auto variables since we don't use gcc's pessimal stack + * alignment. Work around this by abusing the spare fields after + * mcp->mc_fpstate. + * + * XXX unpessimize most cases by only aligning when fxsave might be + * called, although this requires knowing too much about + * npxgetregs()'s internals. + */ + addr = (union savefpu *)&mcp->mc_fpstate; + if (td == PCPU_GET(fpcurthread) && cpu_fxsr && + ((uintptr_t)(void *)addr & 0xF)) { + do + addr = (void *)((char *)addr + 4); + while ((uintptr_t)(void *)addr & 0xF); + } + mcp->mc_ownedfp = npxgetregs(td, addr); + if (addr != (union savefpu *)&mcp->mc_fpstate) { + bcopy(addr, &mcp->mc_fpstate, sizeof(mcp->mc_fpstate)); + bzero(&mcp->mc_spare2, sizeof(mcp->mc_spare2)); + } mcp->mc_fpformat = npxformat(); #endif } @@ -2147,19 +2186,40 @@ static int set_fpcontext(struct thread *td, const mcontext_t *mcp) { + union savefpu *addr; if (mcp->mc_fpformat == _MC_FPFMT_NODEV) return (0); - else if ((mcp->mc_fpformat != _MC_FPFMT_387) && - ((mcp->mc_fpformat != _MC_FPFMT_XMM))) + else if (mcp->mc_fpformat != _MC_FPFMT_387 && + mcp->mc_fpformat != _MC_FPFMT_XMM) return (EINVAL); else if (mcp->mc_ownedfp == _MC_FPOWNED_NONE) /* We don't care what state is left in the FPU or PCB. */ fpstate_drop(td); else if (mcp->mc_ownedfp == _MC_FPOWNED_FPU || - mcp->mc_ownedfp == _MC_FPOWNED_PCB) - npxsetregs(td, (union savefpu *)&mcp->mc_fpstate); - else + mcp->mc_ownedfp == _MC_FPOWNED_PCB) { + /* XXX align as above. */ + addr = (union savefpu *)&mcp->mc_fpstate; + if (td == PCPU_GET(fpcurthread) && cpu_fxsr && + ((uintptr_t)(void *)addr & 0xF)) { + do + addr = (void *)((char *)addr + 4); + while ((uintptr_t)(void *)addr & 0xF); + bcopy(&mcp->mc_fpstate, addr, sizeof(mcp->mc_fpstate)); + } +#ifdef DEV_NPX + /* + * XXX we violate the dubious requirement that npxsetregs() + * be called with interrupts disabled. + */ + npxsetregs(td, addr); +#endif + /* + * Don't bother putting things back where they were in the + * misaligned case, since we know that the caller won't use + * them again. + */ + } else return (EINVAL); return (0); } @@ -2170,8 +2230,21 @@ register_t s; s = intr_disable(); +#ifdef DEV_NPX if (PCPU_GET(fpcurthread) == td) npxdrop(); +#endif + /* + * XXX force a full drop of the npx. The above only drops it if we + * owned it. npxgetregs() has the same bug in the !cpu_fxsr case. + * + * XXX I don't much like npxgetregs()'s semantics of doing a full + * drop. Dropping only to the pcb matches fnsave's behaviour. + * We only need to drop to !PCB_INITDONE in sendsig(). But + * sendsig() is the only caller of npxgetregs()... perhaps we just + * have too many layers. + */ + curthread->td_pcb->pcb_flags &= ~PCB_NPXINITDONE; intr_restore(s); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 16 1:15:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 328EB37B401; Mon, 16 Sep 2002 01:15:35 -0700 (PDT) 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 CFB8737B400 for ; Mon, 16 Sep 2002 01:15:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F5AB43E72 for ; Mon, 16 Sep 2002 01:15:34 -0700 (PDT) (envelope-from mini@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8G8FYJU015552 for ; Mon, 16 Sep 2002 01:15:34 -0700 (PDT) (envelope-from mini@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8G8FXvr015549 for perforce@freebsd.org; Mon, 16 Sep 2002 01:15:33 -0700 (PDT) Date: Mon, 16 Sep 2002 01:15:33 -0700 (PDT) Message-Id: <200209160815.g8G8FXvr015549@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to mini@freebsd.org using -f From: Jonathan Mini Subject: PERFORCE change 17560 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17560 Change 17560 by mini@freefall on 2002/09/16 01:14:41 IFC @17559. Affected files ... .. //depot/projects/kse/sys/conf/files#50 integrate .. //depot/projects/kse/sys/conf/files.pc98#30 integrate .. //depot/projects/kse/sys/conf/options.pc98#21 integrate .. //depot/projects/kse/sys/pc98/pc98/fd.c#12 integrate .. //depot/projects/kse/sys/pc98/pc98/sio.c#18 integrate .. //depot/projects/kse/sys/pc98/pc98/syscons_pc98.c#2 integrate .. //depot/projects/kse/sys/sys/cdefs.h#17 integrate Differences ... ==== //depot/projects/kse/sys/conf/files#50 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.697 2002/09/06 17:12:50 sobomax Exp $ +# $FreeBSD: src/sys/conf/files,v 1.698 2002/09/16 04:13:48 grehan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -796,6 +796,8 @@ geom/geom_slice.c optional geom geom/geom_subr.c optional geom geom/geom_sunlabel.c optional geom +crypto/rijndael/rijndael-alg-fst.c optional geom +crypto/rijndael/rijndael-api-fst.c optional geom gnu/ext2fs/ext2_alloc.c optional ext2fs \ warning "kernel contains GPL contaminated ext2fs filesystem" gnu/ext2fs/ext2_balloc.c optional ext2fs ==== //depot/projects/kse/sys/conf/files.pc98#30 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.244 2002/09/02 00:52:04 brooks Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.245 2002/09/16 07:17:43 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -270,6 +270,8 @@ # # isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | ifpnp | itjc # +i4b/layer1/i4b_hdlc.c optional itjc +i4b/layer1/i4b_hdlc.c optional ihfc i4b/layer1/i4b_l1dmux.c optional isic i4b/layer1/i4b_l1lib.c optional isic i4b/layer1/i4b_l1dmux.c optional iwic @@ -354,7 +356,7 @@ i4b/layer1/itjc/i4b_itjc_l1.c optional itjc i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # -kern/imgact_aout.c standard +kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip kern/md4c.c optional netsmb kern/subr_diskmbr.c count compat_atdisk ==== //depot/projects/kse/sys/conf/options.pc98#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.153 2002/09/07 22:07:11 peter Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.154 2002/09/16 07:19:43 nyan Exp $ # Options specific to the pc98 platform kernels MATH_EMULATE opt_math_emulate.h @@ -22,6 +22,7 @@ # Options for emulators. These should only be used at config time, so # they are handled like options for static filesystems # (see src/sys/conf/options), except for broken debugging options. +COMPAT_AOUT opt_dontuse.h IBCS2 opt_dontuse.h COMPAT_LINUX opt_dontuse.h COMPAT_SVR4 opt_dontuse.h ==== //depot/projects/kse/sys/pc98/pc98/fd.c#12 (text+ko) ==== @@ -50,7 +50,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.120 2002/07/16 14:34:38 nyan Exp $ + * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.121 2002/09/16 07:39:47 nyan Exp $ */ #include "opt_fdc.h" @@ -2148,7 +2148,7 @@ } bp->bio_bcount = (nblocks - blknum) * fdblk; } - bp->bio_pblkno = bp->bio_blkno; + bp->bio_pblkno = blknum; s = splbio(); bioqdisksort(&fdc->head, bp); untimeout(fd_turnoff, fd, fd->toffhandle); /* a good idea */ @@ -3103,6 +3103,7 @@ struct fd_formb *finfo; struct fdc_readid *idfield; size_t fdblk; + int error; fdu = FDUNIT(minor(dev)); fd = devclass_get_softc(fd_devclass, fdu); @@ -3138,17 +3139,12 @@ bp->bio_done = fdbiodone; bp->bio_flags = 0; - /* - * Now run the command. The wait loop is a version of bufwait() - * adapted for struct bio instead of struct buf and specialized - * for the current context. - */ + /* Now run the command. */ fdstrategy(bp); - while ((bp->bio_flags & BIO_DONE) == 0) - tsleep(bp, PRIBIO, "fdcmd", 0); + error = biowait(bp, "fdcmd"); free(bp, M_TEMP); - return (bp->bio_flags & BIO_ERROR ? bp->bio_error : 0); + return (error); } static int ==== //depot/projects/kse/sys/pc98/pc98/sio.c#18 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.175 2002/06/24 15:24:42 nyan Exp $ + * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.176 2002/09/16 07:14:02 nyan Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -1948,6 +1948,7 @@ * XXX we should goto open_top if comparam() slept. */ if (com->hasfifo) { + int i; /* * (Re)enable and drain fifos. * @@ -1959,7 +1960,7 @@ * and to handle races between enabling and fresh * input. */ - while (TRUE) { + for (i = 0; i < 500; i++) { sio_setreg(com, com_fifo, FIFO_RCV_RST | FIFO_XMT_RST | com->fifo_image); @@ -1992,6 +1993,10 @@ DELAY(50); (void) inb(com->data_port); } + if (i == 500) { + error = EIO; + goto out; + } } mtx_lock_spin(&sio_lock); ==== //depot/projects/kse/sys/pc98/pc98/syscons_pc98.c#2 (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/sys/pc98/pc98/syscons_pc98.c,v 1.14 2001/07/14 03:26:02 nyan Exp $ + * $FreeBSD: src/sys/pc98/pc98/syscons_pc98.c,v 1.15 2002/09/16 07:11:43 nyan Exp $ */ #include "opt_syscons.h" @@ -74,6 +74,39 @@ return sc_attach_unit(device_get_unit(dev), device_get_flags(dev)); } +static int sc_cur_scr; + +static int +scsuspend(device_t dev) +{ + int retry = 10; + static int dummy; + sc_softc_t *sc; + + sc = &main_softc; + sc_cur_scr = sc->cur_scp->index; + do { + sc_switch_scr(sc, 0); + if (!sc->switch_in_progress) { + break; + } + tsleep(&dummy, 0, "scsuspend", 100); + } while (retry--); + + return (0); +} + +static int +scresume(device_t dev) +{ + sc_softc_t *sc; + + sc = &main_softc; + sc_switch_scr(sc, sc_cur_scr); + + return (0); +} + int sc_max_unit(void) { @@ -199,6 +232,8 @@ DEVMETHOD(device_identify, scidentify), DEVMETHOD(device_probe, scprobe), DEVMETHOD(device_attach, scattach), + DEVMETHOD(device_suspend, scsuspend), + DEVMETHOD(device_resume, scresume), { 0, 0 } }; ==== //depot/projects/kse/sys/sys/cdefs.h#17 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)cdefs.h 8.8 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/cdefs.h,v 1.60 2002/09/15 14:17:29 bde Exp $ + * $FreeBSD: src/sys/sys/cdefs.h,v 1.61 2002/09/16 03:22:06 wollman Exp $ */ #ifndef _SYS_CDEFS_H_ @@ -139,9 +139,9 @@ /* * GCC 2.95 provides `__restrict' as an extention to C90 to support the - * C99-specific `restrict' type qualifier. We happen to use `__restrict' as a - * way to define the `restrict' type qualifier without disturbing older software - * that is unaware of C99 keywords. + * C99-specific `restrict' type qualifier. We happen to use `__restrict' as + * a way to define the `restrict' type qualifier without disturbing older + * software that is unaware of C99 keywords. */ #if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95) #if __STDC_VERSION__ < 199901 @@ -239,7 +239,7 @@ * Embed the rcs id of a source file in the resulting library. Note that in * more recent ELF binutils, we use .ident allowing the ID to be stripped. * Usage: - * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.60 2002/09/15 14:17:29 bde Exp $"); + * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.61 2002/09/16 03:22:06 wollman Exp $"); */ #ifndef __FBSDID #if !defined(lint) && !defined(STRIP_FBSDID) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 16 2: 0:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14AF737B407; Mon, 16 Sep 2002 02:00:15 -0700 (PDT) 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 BA40937B405; Mon, 16 Sep 2002 02:00:14 -0700 (PDT) Received: from rwcrmhc52.attbi.com (rwcrmhc52.attbi.com [216.148.227.88]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CCD643E81; Mon, 16 Sep 2002 02:00:13 -0700 (PDT) (envelope-from julian@elischer.org) Received: from InterJet.elischer.org ([12.232.206.8]) by rwcrmhc52.attbi.com (InterMail vM.4.01.03.27 201-229-121-127-20010626) with ESMTP id <20020916090012.IMRB26805.rwcrmhc52.attbi.com@InterJet.elischer.org>; Mon, 16 Sep 2002 09:00:12 +0000 Received: from localhost (localhost.elischer.org [127.0.0.1]) by InterJet.elischer.org (8.9.1a/8.9.1) with ESMTP id BAA93655; Mon, 16 Sep 2002 01:40:34 -0700 (PDT) Date: Mon, 16 Sep 2002 01:40:32 -0700 (PDT) From: Julian Elischer To: Jonathan Mini Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17560 for review In-Reply-To: <200209160815.g8G8FXvr015549@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Jon, beware that now the repo copy has been done, you make sure you have a copy of your changed versions before doing a p4 sync in case the new files from the freeBSD tree overwrite what you've been working on. On Mon, 16 Sep 2002, Jonathan Mini wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17560 > > Change 17560 by mini@freefall on 2002/09/16 01:14:41 > > IFC @17559. > > Affected files ... > > .. //depot/projects/kse/sys/conf/files#50 integrate > .. //depot/projects/kse/sys/conf/files.pc98#30 integrate > .. //depot/projects/kse/sys/conf/options.pc98#21 integrate > .. //depot/projects/kse/sys/pc98/pc98/fd.c#12 integrate > .. //depot/projects/kse/sys/pc98/pc98/sio.c#18 integrate > .. //depot/projects/kse/sys/pc98/pc98/syscons_pc98.c#2 integrate > .. //depot/projects/kse/sys/sys/cdefs.h#17 integrate > > Differences ... > > ==== //depot/projects/kse/sys/conf/files#50 (text+ko) ==== > > @@ -1,4 +1,4 @@ > -# $FreeBSD: src/sys/conf/files,v 1.697 2002/09/06 17:12:50 sobomax Exp $ > +# $FreeBSD: src/sys/conf/files,v 1.698 2002/09/16 04:13:48 grehan Exp $ > # > # The long compile-with and dependency lines are required because of > # limitations in config: backslash-newline doesn't work in strings, and > @@ -796,6 +796,8 @@ > geom/geom_slice.c optional geom > geom/geom_subr.c optional geom > geom/geom_sunlabel.c optional geom > +crypto/rijndael/rijndael-alg-fst.c optional geom > +crypto/rijndael/rijndael-api-fst.c optional geom > gnu/ext2fs/ext2_alloc.c optional ext2fs \ > warning "kernel contains GPL contaminated ext2fs filesystem" > gnu/ext2fs/ext2_balloc.c optional ext2fs > > ==== //depot/projects/kse/sys/conf/files.pc98#30 (text+ko) ==== > > @@ -3,7 +3,7 @@ > # > # modified for PC-9801 > # > -# $FreeBSD: src/sys/conf/files.pc98,v 1.244 2002/09/02 00:52:04 brooks Exp $ > +# $FreeBSD: src/sys/conf/files.pc98,v 1.245 2002/09/16 07:17:43 nyan Exp $ > # > # The long compile-with and dependency lines are required because of > # limitations in config: backslash-newline doesn't work in strings, and > @@ -270,6 +270,8 @@ > # > # isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | ifpnp | itjc > # > +i4b/layer1/i4b_hdlc.c optional itjc > +i4b/layer1/i4b_hdlc.c optional ihfc > i4b/layer1/i4b_l1dmux.c optional isic > i4b/layer1/i4b_l1lib.c optional isic > i4b/layer1/i4b_l1dmux.c optional iwic > @@ -354,7 +356,7 @@ > i4b/layer1/itjc/i4b_itjc_l1.c optional itjc > i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc > # > -kern/imgact_aout.c standard > +kern/imgact_aout.c optional compat_aout > kern/imgact_gzip.c optional gzip > kern/md4c.c optional netsmb > kern/subr_diskmbr.c count compat_atdisk > > ==== //depot/projects/kse/sys/conf/options.pc98#21 (text+ko) ==== > > @@ -1,4 +1,4 @@ > -# $FreeBSD: src/sys/conf/options.pc98,v 1.153 2002/09/07 22:07:11 peter Exp $ > +# $FreeBSD: src/sys/conf/options.pc98,v 1.154 2002/09/16 07:19:43 nyan Exp $ > # Options specific to the pc98 platform kernels > > MATH_EMULATE opt_math_emulate.h > @@ -22,6 +22,7 @@ > # Options for emulators. These should only be used at config time, so > # they are handled like options for static filesystems > # (see src/sys/conf/options), except for broken debugging options. > +COMPAT_AOUT opt_dontuse.h > IBCS2 opt_dontuse.h > COMPAT_LINUX opt_dontuse.h > COMPAT_SVR4 opt_dontuse.h > > ==== //depot/projects/kse/sys/pc98/pc98/fd.c#12 (text+ko) ==== > > @@ -50,7 +50,7 @@ > * SUCH DAMAGE. > * > * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 > - * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.120 2002/07/16 14:34:38 nyan Exp $ > + * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.121 2002/09/16 07:39:47 nyan Exp $ > */ > > #include "opt_fdc.h" > @@ -2148,7 +2148,7 @@ > } > bp->bio_bcount = (nblocks - blknum) * fdblk; > } > - bp->bio_pblkno = bp->bio_blkno; > + bp->bio_pblkno = blknum; > s = splbio(); > bioqdisksort(&fdc->head, bp); > untimeout(fd_turnoff, fd, fd->toffhandle); /* a good idea */ > @@ -3103,6 +3103,7 @@ > struct fd_formb *finfo; > struct fdc_readid *idfield; > size_t fdblk; > + int error; > > fdu = FDUNIT(minor(dev)); > fd = devclass_get_softc(fd_devclass, fdu); > @@ -3138,17 +3139,12 @@ > bp->bio_done = fdbiodone; > bp->bio_flags = 0; > > - /* > - * Now run the command. The wait loop is a version of bufwait() > - * adapted for struct bio instead of struct buf and specialized > - * for the current context. > - */ > + /* Now run the command. */ > fdstrategy(bp); > - while ((bp->bio_flags & BIO_DONE) == 0) > - tsleep(bp, PRIBIO, "fdcmd", 0); > + error = biowait(bp, "fdcmd"); > > free(bp, M_TEMP); > - return (bp->bio_flags & BIO_ERROR ? bp->bio_error : 0); > + return (error); > } > > static int > > ==== //depot/projects/kse/sys/pc98/pc98/sio.c#18 (text+ko) ==== > > @@ -30,7 +30,7 @@ > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > * SUCH DAMAGE. > * > - * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.175 2002/06/24 15:24:42 nyan Exp $ > + * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.176 2002/09/16 07:14:02 nyan Exp $ > * from: @(#)com.c 7.5 (Berkeley) 5/16/91 > * from: i386/isa sio.c,v 1.234 > */ > @@ -1948,6 +1948,7 @@ > * XXX we should goto open_top if comparam() slept. > */ > if (com->hasfifo) { > + int i; > /* > * (Re)enable and drain fifos. > * > @@ -1959,7 +1960,7 @@ > * and to handle races between enabling and fresh > * input. > */ > - while (TRUE) { > + for (i = 0; i < 500; i++) { > sio_setreg(com, com_fifo, > FIFO_RCV_RST | FIFO_XMT_RST > | com->fifo_image); > @@ -1992,6 +1993,10 @@ > DELAY(50); > (void) inb(com->data_port); > } > + if (i == 500) { > + error = EIO; > + goto out; > + } > } > > mtx_lock_spin(&sio_lock); > > ==== //depot/projects/kse/sys/pc98/pc98/syscons_pc98.c#2 (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/sys/pc98/pc98/syscons_pc98.c,v 1.14 2001/07/14 03:26:02 nyan Exp $ > + * $FreeBSD: src/sys/pc98/pc98/syscons_pc98.c,v 1.15 2002/09/16 07:11:43 nyan Exp $ > */ > > #include "opt_syscons.h" > @@ -74,6 +74,39 @@ > return sc_attach_unit(device_get_unit(dev), device_get_flags(dev)); > } > > +static int sc_cur_scr; > + > +static int > +scsuspend(device_t dev) > +{ > + int retry = 10; > + static int dummy; > + sc_softc_t *sc; > + > + sc = &main_softc; > + sc_cur_scr = sc->cur_scp->index; > + do { > + sc_switch_scr(sc, 0); > + if (!sc->switch_in_progress) { > + break; > + } > + tsleep(&dummy, 0, "scsuspend", 100); > + } while (retry--); > + > + return (0); > +} > + > +static int > +scresume(device_t dev) > +{ > + sc_softc_t *sc; > + > + sc = &main_softc; > + sc_switch_scr(sc, sc_cur_scr); > + > + return (0); > +} > + > int > sc_max_unit(void) > { > @@ -199,6 +232,8 @@ > DEVMETHOD(device_identify, scidentify), > DEVMETHOD(device_probe, scprobe), > DEVMETHOD(device_attach, scattach), > + DEVMETHOD(device_suspend, scsuspend), > + DEVMETHOD(device_resume, scresume), > { 0, 0 } > }; > > > ==== //depot/projects/kse/sys/sys/cdefs.h#17 (text+ko) ==== > > @@ -34,7 +34,7 @@ > * SUCH DAMAGE. > * > * @(#)cdefs.h 8.8 (Berkeley) 1/9/95 > - * $FreeBSD: src/sys/sys/cdefs.h,v 1.60 2002/09/15 14:17:29 bde Exp $ > + * $FreeBSD: src/sys/sys/cdefs.h,v 1.61 2002/09/16 03:22:06 wollman Exp $ > */ > > #ifndef _SYS_CDEFS_H_ > @@ -139,9 +139,9 @@ > > /* > * GCC 2.95 provides `__restrict' as an extention to C90 to support the > - * C99-specific `restrict' type qualifier. We happen to use `__restrict' as a > - * way to define the `restrict' type qualifier without disturbing older software > - * that is unaware of C99 keywords. > + * C99-specific `restrict' type qualifier. We happen to use `__restrict' as > + * a way to define the `restrict' type qualifier without disturbing older > + * software that is unaware of C99 keywords. > */ > #if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95) > #if __STDC_VERSION__ < 199901 > @@ -239,7 +239,7 @@ > * Embed the rcs id of a source file in the resulting library. Note that in > * more recent ELF binutils, we use .ident allowing the ID to be stripped. > * Usage: > - * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.60 2002/09/15 14:17:29 bde Exp $"); > + * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.61 2002/09/16 03:22:06 wollman Exp $"); > */ > #ifndef __FBSDID > #if !defined(lint) && !defined(STRIP_FBSDID) > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 16 2: 2:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1F4037B401; Mon, 16 Sep 2002 02:02:20 -0700 (PDT) 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 5267437B400 for ; Mon, 16 Sep 2002 02:02:20 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF07743E75 for ; Mon, 16 Sep 2002 02:02:19 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id A6F43AE147; Mon, 16 Sep 2002 02:02:19 -0700 (PDT) Date: Mon, 16 Sep 2002 02:02:19 -0700 From: Jonathan Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17560 for review Message-ID: <20020916090219.GI24394@elvis.mu.org> References: <200209160815.g8G8FXvr015549@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@elischer.org] wrote : > Jon, beware that now the repo copy has been done, you make sure > you have a copy of your changed versions before doing a p4 sync > in case the new files from the freeBSD tree overwrite what you've been > working on. I did the IFC now so that I could commit those changes into -CURRENT. Then I'll bring them back. This IFC doesn't have the repo copy. The next will. Thanks for the warning, though. > On Mon, 16 Sep 2002, Jonathan Mini wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17560 > > > > Change 17560 by mini@freefall on 2002/09/16 01:14:41 > > > > IFC @17559. > > > > Affected files ... > > > > .. //depot/projects/kse/sys/conf/files#50 integrate > > .. //depot/projects/kse/sys/conf/files.pc98#30 integrate > > .. //depot/projects/kse/sys/conf/options.pc98#21 integrate > > .. //depot/projects/kse/sys/pc98/pc98/fd.c#12 integrate > > .. //depot/projects/kse/sys/pc98/pc98/sio.c#18 integrate > > .. //depot/projects/kse/sys/pc98/pc98/syscons_pc98.c#2 integrate > > .. //depot/projects/kse/sys/sys/cdefs.h#17 integrate > > > > Differences ... > > > > ==== //depot/projects/kse/sys/conf/files#50 (text+ko) ==== > > > > @@ -1,4 +1,4 @@ > > -# $FreeBSD: src/sys/conf/files,v 1.697 2002/09/06 17:12:50 sobomax Exp $ > > +# $FreeBSD: src/sys/conf/files,v 1.698 2002/09/16 04:13:48 grehan Exp $ > > # > > # The long compile-with and dependency lines are required because of > > # limitations in config: backslash-newline doesn't work in strings, and > > @@ -796,6 +796,8 @@ > > geom/geom_slice.c optional geom > > geom/geom_subr.c optional geom > > geom/geom_sunlabel.c optional geom > > +crypto/rijndael/rijndael-alg-fst.c optional geom > > +crypto/rijndael/rijndael-api-fst.c optional geom > > gnu/ext2fs/ext2_alloc.c optional ext2fs \ > > warning "kernel contains GPL contaminated ext2fs filesystem" > > gnu/ext2fs/ext2_balloc.c optional ext2fs > > > > ==== //depot/projects/kse/sys/conf/files.pc98#30 (text+ko) ==== > > > > @@ -3,7 +3,7 @@ > > # > > # modified for PC-9801 > > # > > -# $FreeBSD: src/sys/conf/files.pc98,v 1.244 2002/09/02 00:52:04 brooks Exp $ > > +# $FreeBSD: src/sys/conf/files.pc98,v 1.245 2002/09/16 07:17:43 nyan Exp $ > > # > > # The long compile-with and dependency lines are required because of > > # limitations in config: backslash-newline doesn't work in strings, and > > @@ -270,6 +270,8 @@ > > # > > # isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | ifpnp | itjc > > # > > +i4b/layer1/i4b_hdlc.c optional itjc > > +i4b/layer1/i4b_hdlc.c optional ihfc > > i4b/layer1/i4b_l1dmux.c optional isic > > i4b/layer1/i4b_l1lib.c optional isic > > i4b/layer1/i4b_l1dmux.c optional iwic > > @@ -354,7 +356,7 @@ > > i4b/layer1/itjc/i4b_itjc_l1.c optional itjc > > i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc > > # > > -kern/imgact_aout.c standard > > +kern/imgact_aout.c optional compat_aout > > kern/imgact_gzip.c optional gzip > > kern/md4c.c optional netsmb > > kern/subr_diskmbr.c count compat_atdisk > > > > ==== //depot/projects/kse/sys/conf/options.pc98#21 (text+ko) ==== > > > > @@ -1,4 +1,4 @@ > > -# $FreeBSD: src/sys/conf/options.pc98,v 1.153 2002/09/07 22:07:11 peter Exp $ > > +# $FreeBSD: src/sys/conf/options.pc98,v 1.154 2002/09/16 07:19:43 nyan Exp $ > > # Options specific to the pc98 platform kernels > > > > MATH_EMULATE opt_math_emulate.h > > @@ -22,6 +22,7 @@ > > # Options for emulators. These should only be used at config time, so > > # they are handled like options for static filesystems > > # (see src/sys/conf/options), except for broken debugging options. > > +COMPAT_AOUT opt_dontuse.h > > IBCS2 opt_dontuse.h > > COMPAT_LINUX opt_dontuse.h > > COMPAT_SVR4 opt_dontuse.h > > > > ==== //depot/projects/kse/sys/pc98/pc98/fd.c#12 (text+ko) ==== > > > > @@ -50,7 +50,7 @@ > > * SUCH DAMAGE. > > * > > * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 > > - * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.120 2002/07/16 14:34:38 nyan Exp $ > > + * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.121 2002/09/16 07:39:47 nyan Exp $ > > */ > > > > #include "opt_fdc.h" > > @@ -2148,7 +2148,7 @@ > > } > > bp->bio_bcount = (nblocks - blknum) * fdblk; > > } > > - bp->bio_pblkno = bp->bio_blkno; > > + bp->bio_pblkno = blknum; > > s = splbio(); > > bioqdisksort(&fdc->head, bp); > > untimeout(fd_turnoff, fd, fd->toffhandle); /* a good idea */ > > @@ -3103,6 +3103,7 @@ > > struct fd_formb *finfo; > > struct fdc_readid *idfield; > > size_t fdblk; > > + int error; > > > > fdu = FDUNIT(minor(dev)); > > fd = devclass_get_softc(fd_devclass, fdu); > > @@ -3138,17 +3139,12 @@ > > bp->bio_done = fdbiodone; > > bp->bio_flags = 0; > > > > - /* > > - * Now run the command. The wait loop is a version of bufwait() > > - * adapted for struct bio instead of struct buf and specialized > > - * for the current context. > > - */ > > + /* Now run the command. */ > > fdstrategy(bp); > > - while ((bp->bio_flags & BIO_DONE) == 0) > > - tsleep(bp, PRIBIO, "fdcmd", 0); > > + error = biowait(bp, "fdcmd"); > > > > free(bp, M_TEMP); > > - return (bp->bio_flags & BIO_ERROR ? bp->bio_error : 0); > > + return (error); > > } > > > > static int > > > > ==== //depot/projects/kse/sys/pc98/pc98/sio.c#18 (text+ko) ==== > > > > @@ -30,7 +30,7 @@ > > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > > * SUCH DAMAGE. > > * > > - * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.175 2002/06/24 15:24:42 nyan Exp $ > > + * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.176 2002/09/16 07:14:02 nyan Exp $ > > * from: @(#)com.c 7.5 (Berkeley) 5/16/91 > > * from: i386/isa sio.c,v 1.234 > > */ > > @@ -1948,6 +1948,7 @@ > > * XXX we should goto open_top if comparam() slept. > > */ > > if (com->hasfifo) { > > + int i; > > /* > > * (Re)enable and drain fifos. > > * > > @@ -1959,7 +1960,7 @@ > > * and to handle races between enabling and fresh > > * input. > > */ > > - while (TRUE) { > > + for (i = 0; i < 500; i++) { > > sio_setreg(com, com_fifo, > > FIFO_RCV_RST | FIFO_XMT_RST > > | com->fifo_image); > > @@ -1992,6 +1993,10 @@ > > DELAY(50); > > (void) inb(com->data_port); > > } > > + if (i == 500) { > > + error = EIO; > > + goto out; > > + } > > } > > > > mtx_lock_spin(&sio_lock); > > > > ==== //depot/projects/kse/sys/pc98/pc98/syscons_pc98.c#2 (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/sys/pc98/pc98/syscons_pc98.c,v 1.14 2001/07/14 03:26:02 nyan Exp $ > > + * $FreeBSD: src/sys/pc98/pc98/syscons_pc98.c,v 1.15 2002/09/16 07:11:43 nyan Exp $ > > */ > > > > #include "opt_syscons.h" > > @@ -74,6 +74,39 @@ > > return sc_attach_unit(device_get_unit(dev), device_get_flags(dev)); > > } > > > > +static int sc_cur_scr; > > + > > +static int > > +scsuspend(device_t dev) > > +{ > > + int retry = 10; > > + static int dummy; > > + sc_softc_t *sc; > > + > > + sc = &main_softc; > > + sc_cur_scr = sc->cur_scp->index; > > + do { > > + sc_switch_scr(sc, 0); > > + if (!sc->switch_in_progress) { > > + break; > > + } > > + tsleep(&dummy, 0, "scsuspend", 100); > > + } while (retry--); > > + > > + return (0); > > +} > > + > > +static int > > +scresume(device_t dev) > > +{ > > + sc_softc_t *sc; > > + > > + sc = &main_softc; > > + sc_switch_scr(sc, sc_cur_scr); > > + > > + return (0); > > +} > > + > > int > > sc_max_unit(void) > > { > > @@ -199,6 +232,8 @@ > > DEVMETHOD(device_identify, scidentify), > > DEVMETHOD(device_probe, scprobe), > > DEVMETHOD(device_attach, scattach), > > + DEVMETHOD(device_suspend, scsuspend), > > + DEVMETHOD(device_resume, scresume), > > { 0, 0 } > > }; > > > > > > ==== //depot/projects/kse/sys/sys/cdefs.h#17 (text+ko) ==== > > > > @@ -34,7 +34,7 @@ > > * SUCH DAMAGE. > > * > > * @(#)cdefs.h 8.8 (Berkeley) 1/9/95 > > - * $FreeBSD: src/sys/sys/cdefs.h,v 1.60 2002/09/15 14:17:29 bde Exp $ > > + * $FreeBSD: src/sys/sys/cdefs.h,v 1.61 2002/09/16 03:22:06 wollman Exp $ > > */ > > > > #ifndef _SYS_CDEFS_H_ > > @@ -139,9 +139,9 @@ > > > > /* > > * GCC 2.95 provides `__restrict' as an extention to C90 to support the > > - * C99-specific `restrict' type qualifier. We happen to use `__restrict' as a > > - * way to define the `restrict' type qualifier without disturbing older software > > - * that is unaware of C99 keywords. > > + * C99-specific `restrict' type qualifier. We happen to use `__restrict' as > > + * a way to define the `restrict' type qualifier without disturbing older > > + * software that is unaware of C99 keywords. > > */ > > #if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95) > > #if __STDC_VERSION__ < 199901 > > @@ -239,7 +239,7 @@ > > * Embed the rcs id of a source file in the resulting library. Note that in > > * more recent ELF binutils, we use .ident allowing the ID to be stripped. > > * Usage: > > - * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.60 2002/09/15 14:17:29 bde Exp $"); > > + * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.61 2002/09/16 03:22:06 wollman Exp $"); > > */ > > #ifndef __FBSDID > > #if !defined(lint) && !defined(STRIP_FBSDID) > > > -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 16 10: 0:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A4F637B406; Mon, 16 Sep 2002 10:00:24 -0700 (PDT) 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 9CD2937B407; Mon, 16 Sep 2002 10:00:23 -0700 (PDT) Received: from magic.adaptec.com (magic.adaptec.com [208.236.45.80]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D95743E72; Mon, 16 Sep 2002 10:00:22 -0700 (PDT) (envelope-from Scott_Long@adaptec.com) Received: from redfish.adaptec.com (redfish.adaptec.com [162.62.50.11] (may be forged)) by magic.adaptec.com (8.10.2+Sun/8.10.2) with ESMTP id g8GGxnN12537; Mon, 16 Sep 2002 09:59:49 -0700 (PDT) Received: from btc.btc.adaptec.com (btc.btc.adaptec.com [10.100.0.52]) by redfish.adaptec.com (8.8.8+Sun/8.8.8) with ESMTP id JAA09975; Mon, 16 Sep 2002 09:59:47 -0700 (PDT) Received: from btcexc01.btc.adaptec.com (btcexc01 [10.100.0.23]) by btc.btc.adaptec.com (8.8.8+Sun/8.8.8) with ESMTP id KAA04578; Mon, 16 Sep 2002 10:59:45 -0600 (MDT) Received: by btcexc01.btc.adaptec.com with Internet Mail Service (5.5.2653.19) id ; Mon, 16 Sep 2002 10:59:45 -0600 Message-ID: <2C7CBDC6EA58D6119E4A00065B3A24CB04652E@btcexc01.btc.adaptec.com> From: "Long, Scott" To: "'Julian Elischer'" , Jonathan Mini Cc: Perforce Change Reviews Subject: RE: PERFORCE change 17560 for review Date: Mon, 16 Sep 2002 10:59:45 -0600 MIME-Version: 1.0 X-Mailer: Internet Mail Service (5.5.2653.19) Content-Type: text/plain Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG > > Jon, beware that now the repo copy has been done, you make sure > you have a copy of your changed versions before doing a p4 sync > in case the new files from the freeBSD tree overwrite what you've been > working on. Having 'noclobber' in your p4 client definition will prevent this from happening. You'll get pinged to fix the conflict when you do 'p4 resolve'. Scott > > On Mon, 16 Sep 2002, Jonathan Mini wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17560 > > > > Change 17560 by mini@freefall on 2002/09/16 01:14:41 > > > > IFC @17559. > > > > Affected files ... > > > > .. //depot/projects/kse/sys/conf/files#50 integrate > > .. //depot/projects/kse/sys/conf/files.pc98#30 integrate > > .. //depot/projects/kse/sys/conf/options.pc98#21 integrate > > .. //depot/projects/kse/sys/pc98/pc98/fd.c#12 integrate > > .. //depot/projects/kse/sys/pc98/pc98/sio.c#18 integrate > > .. //depot/projects/kse/sys/pc98/pc98/syscons_pc98.c#2 integrate > > .. //depot/projects/kse/sys/sys/cdefs.h#17 integrate > > > > Differences ... > > > > ==== //depot/projects/kse/sys/conf/files#50 (text+ko) ==== > > > > @@ -1,4 +1,4 @@ > > -# $FreeBSD: src/sys/conf/files,v 1.697 2002/09/06 17:12:50 > sobomax Exp $ > > +# $FreeBSD: src/sys/conf/files,v 1.698 2002/09/16 04:13:48 > grehan Exp $ > > # > > # The long compile-with and dependency lines are required > because of > > # limitations in config: backslash-newline doesn't work in > strings, and > > @@ -796,6 +796,8 @@ > > geom/geom_slice.c optional geom > > geom/geom_subr.c optional geom > > geom/geom_sunlabel.c optional geom > > +crypto/rijndael/rijndael-alg-fst.c optional geom > > +crypto/rijndael/rijndael-api-fst.c optional geom > > gnu/ext2fs/ext2_alloc.c optional ext2fs \ > > warning "kernel contains GPL contaminated ext2fs filesystem" > > gnu/ext2fs/ext2_balloc.c optional ext2fs > > > > ==== //depot/projects/kse/sys/conf/files.pc98#30 (text+ko) ==== > > > > @@ -3,7 +3,7 @@ > > # > > # modified for PC-9801 > > # > > -# $FreeBSD: src/sys/conf/files.pc98,v 1.244 2002/09/02 > 00:52:04 brooks Exp $ > > +# $FreeBSD: src/sys/conf/files.pc98,v 1.245 2002/09/16 > 07:17:43 nyan Exp $ > > # > > # The long compile-with and dependency lines are required > because of > > # limitations in config: backslash-newline doesn't work in > strings, and > > @@ -270,6 +270,8 @@ > > # > > # isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | > ifpnp | itjc > > # > > +i4b/layer1/i4b_hdlc.c optional itjc > > +i4b/layer1/i4b_hdlc.c optional ihfc > > i4b/layer1/i4b_l1dmux.c optional isic > > i4b/layer1/i4b_l1lib.c optional isic > > i4b/layer1/i4b_l1dmux.c optional iwic > > @@ -354,7 +356,7 @@ > > i4b/layer1/itjc/i4b_itjc_l1.c optional itjc > > i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc > > # > > -kern/imgact_aout.c standard > > +kern/imgact_aout.c optional compat_aout > > kern/imgact_gzip.c optional gzip > > kern/md4c.c optional netsmb > > kern/subr_diskmbr.c count compat_atdisk > > > > ==== //depot/projects/kse/sys/conf/options.pc98#21 (text+ko) ==== > > > > @@ -1,4 +1,4 @@ > > -# $FreeBSD: src/sys/conf/options.pc98,v 1.153 2002/09/07 > 22:07:11 peter Exp $ > > +# $FreeBSD: src/sys/conf/options.pc98,v 1.154 2002/09/16 > 07:19:43 nyan Exp $ > > # Options specific to the pc98 platform kernels > > > > MATH_EMULATE opt_math_emulate.h > > @@ -22,6 +22,7 @@ > > # Options for emulators. These should only be used at > config time, so > > # they are handled like options for static filesystems > > # (see src/sys/conf/options), except for broken debugging options. > > +COMPAT_AOUT opt_dontuse.h > > IBCS2 opt_dontuse.h > > COMPAT_LINUX opt_dontuse.h > > COMPAT_SVR4 opt_dontuse.h > > > > ==== //depot/projects/kse/sys/pc98/pc98/fd.c#12 (text+ko) ==== > > > > @@ -50,7 +50,7 @@ > > * SUCH DAMAGE. > > * > > * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 > > - * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.120 2002/07/16 > 14:34:38 nyan Exp $ > > + * $FreeBSD: src/sys/pc98/pc98/fd.c,v 1.121 2002/09/16 > 07:39:47 nyan Exp $ > > */ > > > > #include "opt_fdc.h" > > @@ -2148,7 +2148,7 @@ > > } > > bp->bio_bcount = (nblocks - blknum) * fdblk; > > } > > - bp->bio_pblkno = bp->bio_blkno; > > + bp->bio_pblkno = blknum; > > s = splbio(); > > bioqdisksort(&fdc->head, bp); > > untimeout(fd_turnoff, fd, fd->toffhandle); /* a good idea */ > > @@ -3103,6 +3103,7 @@ > > struct fd_formb *finfo; > > struct fdc_readid *idfield; > > size_t fdblk; > > + int error; > > > > fdu = FDUNIT(minor(dev)); > > fd = devclass_get_softc(fd_devclass, fdu); > > @@ -3138,17 +3139,12 @@ > > bp->bio_done = fdbiodone; > > bp->bio_flags = 0; > > > > - /* > > - * Now run the command. The wait loop is a version of bufwait() > > - * adapted for struct bio instead of struct buf and specialized > > - * for the current context. > > - */ > > + /* Now run the command. */ > > fdstrategy(bp); > > - while ((bp->bio_flags & BIO_DONE) == 0) > > - tsleep(bp, PRIBIO, "fdcmd", 0); > > + error = biowait(bp, "fdcmd"); > > > > free(bp, M_TEMP); > > - return (bp->bio_flags & BIO_ERROR ? bp->bio_error : 0); > > + return (error); > > } > > > > static int > > > > ==== //depot/projects/kse/sys/pc98/pc98/sio.c#18 (text+ko) ==== > > > > @@ -30,7 +30,7 @@ > > * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > POSSIBILITY OF > > * SUCH DAMAGE. > > * > > - * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.175 2002/06/24 > 15:24:42 nyan Exp $ > > + * $FreeBSD: src/sys/pc98/pc98/sio.c,v 1.176 2002/09/16 > 07:14:02 nyan Exp $ > > * from: @(#)com.c 7.5 (Berkeley) 5/16/91 > > * from: i386/isa sio.c,v 1.234 > > */ > > @@ -1948,6 +1948,7 @@ > > * XXX we should goto open_top if comparam() slept. > > */ > > if (com->hasfifo) { > > + int i; > > /* > > * (Re)enable and drain fifos. > > * > > @@ -1959,7 +1960,7 @@ > > * and to handle races between enabling > and fresh > > * input. > > */ > > - while (TRUE) { > > + for (i = 0; i < 500; i++) { > > sio_setreg(com, com_fifo, > > FIFO_RCV_RST | FIFO_XMT_RST > > | com->fifo_image); > > @@ -1992,6 +1993,10 @@ > > DELAY(50); > > (void) inb(com->data_port); > > } > > + if (i == 500) { > > + error = EIO; > > + goto out; > > + } > > } > > > > mtx_lock_spin(&sio_lock); > > > > ==== //depot/projects/kse/sys/pc98/pc98/syscons_pc98.c#2 > (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/sys/pc98/pc98/syscons_pc98.c,v 1.14 > 2001/07/14 03:26:02 nyan Exp $ > > + * $FreeBSD: src/sys/pc98/pc98/syscons_pc98.c,v 1.15 > 2002/09/16 07:11:43 nyan Exp $ > > */ > > > > #include "opt_syscons.h" > > @@ -74,6 +74,39 @@ > > return sc_attach_unit(device_get_unit(dev), > device_get_flags(dev)); > > } > > > > +static int sc_cur_scr; > > + > > +static int > > +scsuspend(device_t dev) > > +{ > > + int retry = 10; > > + static int dummy; > > + sc_softc_t *sc; > > + > > + sc = &main_softc; > > + sc_cur_scr = sc->cur_scp->index; > > + do { > > + sc_switch_scr(sc, 0); > > + if (!sc->switch_in_progress) { > > + break; > > + } > > + tsleep(&dummy, 0, "scsuspend", 100); > > + } while (retry--); > > + > > + return (0); > > +} > > + > > +static int > > +scresume(device_t dev) > > +{ > > + sc_softc_t *sc; > > + > > + sc = &main_softc; > > + sc_switch_scr(sc, sc_cur_scr); > > + > > + return (0); > > +} > > + > > int > > sc_max_unit(void) > > { > > @@ -199,6 +232,8 @@ > > DEVMETHOD(device_identify, scidentify), > > DEVMETHOD(device_probe, scprobe), > > DEVMETHOD(device_attach, scattach), > > + DEVMETHOD(device_suspend, scsuspend), > > + DEVMETHOD(device_resume, scresume), > > { 0, 0 } > > }; > > > > > > ==== //depot/projects/kse/sys/sys/cdefs.h#17 (text+ko) ==== > > > > @@ -34,7 +34,7 @@ > > * SUCH DAMAGE. > > * > > * @(#)cdefs.h 8.8 (Berkeley) 1/9/95 > > - * $FreeBSD: src/sys/sys/cdefs.h,v 1.60 2002/09/15 > 14:17:29 bde Exp $ > > + * $FreeBSD: src/sys/sys/cdefs.h,v 1.61 2002/09/16 > 03:22:06 wollman Exp $ > > */ > > > > #ifndef _SYS_CDEFS_H_ > > @@ -139,9 +139,9 @@ > > > > /* > > * GCC 2.95 provides `__restrict' as an extention to C90 > to support the > > - * C99-specific `restrict' type qualifier. We happen to > use `__restrict' as a > > - * way to define the `restrict' type qualifier without > disturbing older software > > - * that is unaware of C99 keywords. > > + * C99-specific `restrict' type qualifier. We happen to > use `__restrict' as > > + * a way to define the `restrict' type qualifier without > disturbing older > > + * software that is unaware of C99 keywords. > > */ > > #if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95) > > #if __STDC_VERSION__ < 199901 > > @@ -239,7 +239,7 @@ > > * Embed the rcs id of a source file in the resulting > library. Note that in > > * more recent ELF binutils, we use .ident allowing the ID > to be stripped. > > * Usage: > > - * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.60 > 2002/09/15 14:17:29 bde Exp $"); > > + * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.61 > 2002/09/16 03:22:06 wollman Exp $"); > > */ > > #ifndef __FBSDID > > #if !defined(lint) && !defined(STRIP_FBSDID) > > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 16 10: 2:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AACD737B401; Mon, 16 Sep 2002 10:02:09 -0700 (PDT) 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 6E66E37B400 for ; Mon, 16 Sep 2002 10:02:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F002D43E3B for ; Mon, 16 Sep 2002 10:02:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8GH28JU083339 for ; Mon, 16 Sep 2002 10:02:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8GH28rW083336 for perforce@freebsd.org; Mon, 16 Sep 2002 10:02:08 -0700 (PDT) Date: Mon, 16 Sep 2002 10:02:08 -0700 (PDT) Message-Id: <200209161702.g8GH28rW083336@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17578 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17578 Change 17578 by rwatson@rwatson_tislabs on 2002/09/16 10:02:02 Add an 'enforce_vm' flag that disables mmap protection stuff. Enabled by default (same as existing code). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#262 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#262 (text+ko) ==== @@ -146,6 +146,10 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_pipe, CTLFLAG_RW, &mac_enforce_pipe, 0, "Enforce MAC policy on pipe operations"); +static int mac_enforce_vm = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, + &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); + static int mac_label_size = sizeof(struct mac); SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size"); @@ -1825,6 +1829,9 @@ { vm_prot_t result = VM_PROT_ALL; + if (!mac_enforce_vm) + return (result); + /* * This should be some sort of MAC_BITWISE, maybe :) */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 16 10:20:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B80437B407; Mon, 16 Sep 2002 10:20:32 -0700 (PDT) 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 EAB9537B406 for ; Mon, 16 Sep 2002 10:20:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EDA343E4A for ; Mon, 16 Sep 2002 10:20:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8GHKVJU090859 for ; Mon, 16 Sep 2002 10:20:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8GHKVl1090852 for perforce@freebsd.org; Mon, 16 Sep 2002 10:20:31 -0700 (PDT) Date: Mon, 16 Sep 2002 10:20:31 -0700 (PDT) Message-Id: <200209161720.g8GHKVl1090852@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17579 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17579 Change 17579 by rwatson@rwatson_tislabs on 2002/09/16 10:20:02 Don't provide default labels at login in login.conf in preparation for merge of macnewapi to the main MAC tree. Otherwise, if you don't have all policies loaded, you might get locked out. Default labels for users must be configured by the administrator when they choose to load a policy. Affected files ... .. //depot/projects/trustedbsd/mac/etc/login.conf#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/login.conf#14 (text+ko) ==== @@ -37,9 +37,9 @@ :vmemoryuse=unlimited:\ :priority=0:\ :ignoretime@:\ - :umask=022:\ - :label=biba/high(low-high),mls/low(low-high),te/default_d:\ - :ttylabel=biba/high,mls/low,te/device_t: + :umask=022: + #:label=biba/high(low-high),mls/low(low-high),te/default_d:\ + #:ttylabel=biba/high,mls/low,te/device_t: # @@ -66,10 +66,10 @@ # N.B. login_getpwclass(3) will use this entry for the root account, # in preference to 'default'. root:\ - :label=biba/high(low-high),mls/low(low-high),te/default_d:\ - :ttylabel=biba/high,mls/low,te/device_t:\ :ignorenologin:\ :tc=default: + #:label=biba/high(low-high),mls/low(low-high),te/default_d:\ + #:ttylabel=biba/high,mls/low,te/device_t:\ # # Russian Users Accounts. Setup proper environment variables. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 16 13:10:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B594837B401; Mon, 16 Sep 2002 13:10:01 -0700 (PDT) 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 2CD9737B400 for ; Mon, 16 Sep 2002 13:10:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC2E643E6E for ; Mon, 16 Sep 2002 13:10:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8GKA0JU060338 for ; Mon, 16 Sep 2002 13:10:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8GKA0SU060334 for perforce@freebsd.org; Mon, 16 Sep 2002 13:10:00 -0700 (PDT) Date: Mon, 16 Sep 2002 13:10:00 -0700 (PDT) Message-Id: <200209162010.g8GKA0SU060334@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17585 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17585 Change 17585 by rwatson@rwatson_tislabs on 2002/09/16 13:09:17 Re-work pipes and locking a bit for the MAC framework: (1) In any MAC check call for the pipe code, assert that the pipe mutex is held. We use the pipe mutex to protect the label when the pipe is active, so it must be held if we want consistent access to the labe. (2) Check the mac_enforce_pipe flag for all pipe access control checks. This permits a high-level disabling of pipe access control in the MAC framework. (3) In the pipe code, there were some situations where the pipe mutex was not held (pipe_stat()) but we required it to be held. If we need it but the code didn't have it, grab and release the mutex in the MAC-specific code. (4) Rather than selectively grabbing the pipe mutex depending on the ioctl used on a pipe, always grab it, then release it if not needed. This is required for the MAC ioctl check. Note: it's not clear to me that all the existing code here is correct with regards to the locking of the pipe_sigio pointer, but if it's wrong, it was broken before I got here. I'm particularly concerned about the call to fgetown() in TIOCGPGRP, where we pass the sigio pointer by value rather than by reference. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#263 edit .. //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#31 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#263 (text+ko) ==== @@ -2613,6 +2613,11 @@ { int error; + PIPE_LOCK_ASSERT(pipe, MA_OWNED); + + if (!mac_enforce_pipe) + return (0); + MAC_CHECK(check_pipe_ioctl, cred, pipe, pipe->pipe_label, cmd, data); return (error); @@ -2623,6 +2628,11 @@ { int error; + PIPE_LOCK_ASSERT(pipe, MA_OWNED); + + if (!mac_enforce_pipe) + return (0); + MAC_CHECK(check_pipe_poll, cred, pipe, pipe->pipe_label); return (error); @@ -2633,6 +2643,11 @@ { int error; + PIPE_LOCK_ASSERT(pipe, MA_OWNED); + + if (!mac_enforce_pipe) + return (0); + MAC_CHECK(check_pipe_read, cred, pipe, pipe->pipe_label); return (error); @@ -2644,6 +2659,11 @@ { int error; + PIPE_LOCK_ASSERT(pipe, MA_OWNED); + + if (!mac_enforce_pipe) + return (0); + MAC_CHECK(check_pipe_relabel, cred, pipe, pipe->pipe_label, newlabel); return (error); @@ -2654,6 +2674,11 @@ { int error; + PIPE_LOCK_ASSERT(pipe, MA_OWNED); + + if (!mac_enforce_pipe) + return (0); + MAC_CHECK(check_pipe_stat, cred, pipe, pipe->pipe_label); return (error); @@ -2664,6 +2689,11 @@ { int error; + PIPE_LOCK_ASSERT(pipe, MA_OWNED); + + if (!mac_enforce_pipe) + return (0); + MAC_CHECK(check_pipe_write, cred, pipe, pipe->pipe_label); return (error); ==== //depot/projects/trustedbsd/mac/sys/kern/sys_pipe.c#31 (text+ko) ==== @@ -1165,8 +1165,11 @@ struct pipe *mpipe = (struct pipe *)fp->f_data; #ifdef MAC int error; +#endif + + PIPE_LOCK(mpipe); - /* XXXMAC: Pipe should be locked for this check. */ +#ifdef MAC error = mac_check_pipe_ioctl(active_cred, mpipe, cmd, data); if (error) return (error); @@ -1175,10 +1178,10 @@ switch (cmd) { case FIONBIO: + PIPE_UNLOCK(mpipe); return (0); case FIOASYNC: - PIPE_LOCK(mpipe); if (*(int *)data) { mpipe->pipe_state |= PIPE_ASYNC; } else { @@ -1188,7 +1191,6 @@ return (0); case FIONREAD: - PIPE_LOCK(mpipe); if (mpipe->pipe_state & PIPE_DIRECTW) *(int *)data = mpipe->pipe_map.cnt; else @@ -1197,22 +1199,27 @@ return (0); case FIOSETOWN: + PIPE_UNLOCK(mpipe); return (fsetown(*(int *)data, &mpipe->pipe_sigio)); case FIOGETOWN: + PIPE_UNLOCK(mpipe); *(int *)data = fgetown(mpipe->pipe_sigio); return (0); /* This is deprecated, FIOSETOWN should be used instead. */ case TIOCSPGRP: + PIPE_UNLOCK(mpipe); return (fsetown(-(*(int *)data), &mpipe->pipe_sigio)); /* This is deprecated, FIOGETOWN should be used instead. */ case TIOCGPGRP: + PIPE_UNLOCK(mpipe); *(int *)data = -fgetown(mpipe->pipe_sigio); return (0); } + PIPE_UNLOCK(mpipe); return (ENOTTY); } @@ -1288,8 +1295,9 @@ #ifdef MAC int error; - /* XXXMAC: Pipe should be locked for this check. */ + PIPE_LOCK(pipe); error = mac_check_pipe_stat(active_cred, pipe); + PIPE_UNLOCK(pipe); if (error) return (error); #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 16 13:12: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C613737B401; Mon, 16 Sep 2002 13:12:05 -0700 (PDT) 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 1B8C537B400 for ; Mon, 16 Sep 2002 13:12:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C90C443E4A for ; Mon, 16 Sep 2002 13:12:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8GKC4JU061948 for ; Mon, 16 Sep 2002 13:12:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8GKC3o5061933 for perforce@freebsd.org; Mon, 16 Sep 2002 13:12:03 -0700 (PDT) Date: Mon, 16 Sep 2002 13:12:03 -0700 (PDT) Message-Id: <200209162012.g8GKC3o5061933@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17586 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17586 Change 17586 by rwatson@rwatson_tislabs on 2002/09/16 13:11:11 Use a more traditional alphabetization of pipe with respects to socket. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#264 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#264 (text+ko) ==== @@ -132,6 +132,10 @@ &mac_enforce_network, 0, "Enforce MAC policy on network packets"); TUNABLE_INT("security.mac.enforce_network", &mac_enforce_network); +static int mac_enforce_pipe = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_pipe, CTLFLAG_RW, + &mac_enforce_pipe, 0, "Enforce MAC policy on pipe operations"); + static int mac_enforce_process = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_process, CTLFLAG_RW, &mac_enforce_process, 0, "Enforce MAC policy on inter-process operations"); @@ -142,10 +146,6 @@ &mac_enforce_socket, 0, "Enforce MAC policy on socket operations"); TUNABLE_INT("security.mac.enforce_socket", &mac_enforce_socket); -static int mac_enforce_pipe = 1; -SYSCTL_INT(_security_mac, OID_AUTO, enforce_pipe, CTLFLAG_RW, - &mac_enforce_pipe, 0, "Enforce MAC policy on pipe operations"); - static int mac_enforce_vm = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 16 19:37:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C11C837B401; Mon, 16 Sep 2002 19:37:05 -0700 (PDT) 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 5BF6937B400 for ; Mon, 16 Sep 2002 19:37:05 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DB4443E75 for ; Mon, 16 Sep 2002 19:37:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g8H2b4JU079960 for ; Mon, 16 Sep 2002 19:37:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g8H2b0dL079956 for perforce@freebsd.org; Mon, 16 Sep 2002 19:37:00 -0700 (PDT) Date: Mon, 16 Sep 2002 19:37:00 -0700 (PDT) Message-Id: <200209170237.g8H2b0dL079956@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17594 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17594 Change 17594 by rwatson@rwatson_tislabs on 2002/09/16 19:36:56 Integ new MAC userland API from rwatson_macnewapi branch; work done by rwatson and amigus. These changes revise the system call API and userland library API to support a flexible label format, rather than hard-coding a particular label structure. This permits kernel policies to introduce new label elements visible to userland without changes in the kernel ABI or advance knowledge of the label format. For example, the mac_partition policy now seperately exports partition information without any modifications to the base kernel. This is possible by re-working 'struct mac' so that it points at a variable length 'struct mac_element' array, which in turn points to a set of "bibary blob" label elements generated by user and kernel policy modules. Policies may now be shipped with a userland shared object that implements text/binary blob conversion routines, or can rely on generic string conversion provided by mac_generic. mac.conf configures the shared objects for use by applications, as well as the default elements to render in various label retrieving programs (getpmac, getfmac, etc). Existing support in applications such as ls, ps, ifconfig is updated, but due to static linking of these binaries, will not work at this time. getpmac, getfmac, et al have all been updated to work. macctl is now added to manage the labels on interfaces. getpmac can now also be used to retrieve the labels on non-current processes using -p. -l may be used to retrieve a non-default label set. Note: it is no longer possible to successfully set elements for a policy not loaded in the kernel. This results in better fail-closed characteristics, but means that you need to be careful not to set elements in login.conf unless the policy will be loaded, or users may not be able to log in. Note: you will need to recompile the kernel and userland, and insert a useful mac.conf, and update login.conf as needed to update through these changes. We've tested them a fair amount, but there are probably nits. Affected files ... .. //depot/projects/trustedbsd/mac/MACREADME#22 integrate .. //depot/projects/trustedbsd/mac/bin/ls/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/bin/ls/lomac.c#7 delete .. //depot/projects/trustedbsd/mac/bin/ls/lomac.h#3 delete .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#11 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.h#6 integrate .. //depot/projects/trustedbsd/mac/bin/ls/print.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/ls/util.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/ps/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/bin/ps/extern.h#7 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/ps/lomac.c#8 delete .. //depot/projects/trustedbsd/mac/bin/ps/lomac.h#4 delete .. //depot/projects/trustedbsd/mac/bin/ps/print.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#10 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#12 integrate .. //depot/projects/trustedbsd/mac/etc/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/etc/login.conf#15 integrate .. //depot/projects/trustedbsd/mac/etc/mac.conf#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.diskless1#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.diskless2#27 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#18 integrate .. //depot/projects/trustedbsd/mac/lib/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#17 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_biba.c#7 delete .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.3#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.c#5 delete .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_is_present_np.c#7 delete .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_mls.c#6 delete .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_module.h#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_te.c#8 delete .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#27 delete .. //depot/projects/trustedbsd/mac/lib/libmac/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/libmac/modules/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/libmac/modules/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/lib/libmac/modules/mac_biba/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/libmac/modules/mac_biba/mac_biba.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libmac/modules/mac_generic/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/libmac/modules/mac_generic/mac_generic.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libmac/modules/mac_mls/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/libmac/modules/mac_mls/mac_mls.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libmac/modules/mac_partition/Makefile#1 branch .. //depot/projects/trustedbsd/mac/lib/libmac/modules/mac_partition/mac_partition.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libutil/login_class.c#8 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/libexec/getty/main.c#8 integrate .. //depot/projects/trustedbsd/mac/libexec/lukemftpd/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifmac.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#265 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#25 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#32 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#106 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#88 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#72 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.h#1 branch .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#75 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/sys/_label.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#159 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#123 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#29 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#29 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#30 integrate .. //depot/projects/trustedbsd/mac/usr.bin/login/login.c#21 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#13 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/getfmac/getfmac.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/getpmac/getpmac.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/macctl/Makefile#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/macctl/macctl.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/macctl/macctl.h#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/macctl/macctl_interface.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/setfmac/setfmac.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/setpmac/setpmac.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslogd.c#12 integrate Differences ... ==== //depot/projects/trustedbsd/mac/MACREADME#22 (text+ko) ==== @@ -124,6 +124,14 @@ be able to map video memory, and by default video memory is labeled as mls/high so as to be conservative. +For now, use the MAC modules and not the kernel options to enable +particular MAC policies. This is necessary because the modules +are built without INVARIANTS; when compiled with INVARIANTS, +panics may sometimes be experienced when an uninitialized label +is passed through the system. Without INVARIANTS, the system will +ignore these labels unless they are involved in an access control +check, in the current configuration. + Things that look like they should work but don't ------------------------------------------------ ==== //depot/projects/trustedbsd/mac/bin/ls/Makefile#5 (text+ko) ==== @@ -2,7 +2,7 @@ # $FreeBSD: src/bin/ls/Makefile,v 1.23 2002/02/04 03:06:50 kris Exp $ PROG= ls -SRCS= cmp.c lomac.c ls.c print.c util.c +SRCS= cmp.c ls.c print.c util.c NO_WERROR=1 WFORMAT=0 DPADD= ${LIBM} ==== //depot/projects/trustedbsd/mac/bin/ls/ls.1#11 (text+ko) ==== @@ -146,7 +146,7 @@ .It Fl W Display whiteouts when scanning directories. .It Fl Z -Display each file's LOMAC level. +Display each file's MAC label. .It Fl a Include directory entries whose names begin with a dot @@ -303,7 +303,7 @@ is displayed for each file: file mode, number of links, owner name, group name, -LOMAC level, +MAC label, number of bytes in the file, abbreviated month, day-of-month file was last modified, hour file last modified, minute file last @@ -618,11 +618,6 @@ files in order to be compatible with the .St -p1003.2 specification. -.Sh FILES -.Bl -tag -width ".Pa /dev/lomac" -compact -.It Pa /dev/lomac -interface used to query the -.Xr lomac 4 KLD .El .Sh SEE ALSO @@ -630,7 +625,6 @@ .Xr chmod 1 , .Xr sort 1 , .Xr xterm 1 , -.Xr lomac 4 , .Xr termcap 5 , .Xr symlink 7 , .Xr sticky 8 ==== //depot/projects/trustedbsd/mac/bin/ls/ls.c#10 (text+ko) ==== @@ -51,6 +51,7 @@ #include #include #include +#include #include #include @@ -71,7 +72,6 @@ #include "ls.h" #include "extern.h" -#include "lomac.h" /* * Upward approximation of the maximum number of characters needed to @@ -118,7 +118,7 @@ static int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ - int f_lomac; /* show LOMAC attributes */ + int f_label; /* show MAC label */ #ifdef COLORLS int f_color; /* add type in color for non-regular files */ @@ -300,7 +300,7 @@ f_octal_escape = 0; break; case 'Z': - f_lomac = 1; + f_label = 1; break; default: case '?': @@ -502,7 +502,8 @@ FTSENT *cur; NAMES *np; off_t maxsize; - u_long btotal, lattrlen, maxblock, maxinode, maxlen, maxnlink, maxlattr; + u_long btotal, labelstrlen, maxblock, maxinode, maxlen, maxnlink; + u_long maxlabelstr; int bcfile, maxflags; gid_t maxgroup; uid_t maxuser; @@ -510,7 +511,7 @@ char *initmax; int entries, needstats; const char *user, *group; - char *flags, *lattr = NULL; + char *flags, *labelstr = NULL; char buf[STRBUF_SIZEOF(u_quad_t) + 1]; char ngroup[STRBUF_SIZEOF(uid_t) + 1]; char nuser[STRBUF_SIZEOF(gid_t) + 1]; @@ -530,7 +531,7 @@ btotal = 0; initmax = getenv("LS_COLWIDTHS"); /* Fields match -lios order. New ones should be added at the end. */ - maxlattr = maxblock = maxinode = maxlen = maxnlink = + maxlabelstr = maxblock = maxinode = maxlen = maxnlink = maxuser = maxgroup = maxflags = maxsize = 0; if (initmax != NULL && *initmax != '\0') { char *initmax2, *jinitmax; @@ -560,7 +561,7 @@ ninitmax = sscanf(jinitmax, " %lu : %lu : %lu : %i : %i : %i : %llu : %lu : %lu ", &maxinode, &maxblock, &maxnlink, &maxuser, - &maxgroup, &maxflags, &maxsize, &maxlen, &maxlattr); + &maxgroup, &maxflags, &maxsize, &maxlen, &maxlabelstr); f_notabs = 1; switch (ninitmax) { case 0: @@ -588,7 +589,7 @@ maxlen = 0; /* FALLTHROUGH */ case 8: - maxlattr = 0; + maxlabelstr = 0; /* FALLTHROUGH */ #ifdef COLORLS if (!f_color) @@ -603,8 +604,6 @@ maxnlink = makenines(maxnlink); maxsize = makenines(maxsize); } - if (f_lomac) - lomac_start(); bcfile = 0; flags = NULL; for (cur = list, entries = 0; cur; cur = cur->fts_link) { @@ -681,16 +680,48 @@ maxflags = flen; } else flen = 0; - lattr = NULL; - if (f_lomac) { - lattr = get_lattr(cur); - lattrlen = strlen(lattr); - if (lattrlen > maxlattr) - maxlattr = lattrlen; + labelstr = NULL; + if (f_label) { + mac_t label; + int error; + + error = mac_prepare_file_label(&label); + if (error != MAC_SUCCESS) { + fprintf(stderr, "%s: %s\n", + cur->fts_name, + mac_error(error)); + goto label_out; + } + + error = mac_get_file(cur->fts_name, + label); + if (error != MAC_SUCCESS) { + fprintf(stderr, "%s: %s\n", + cur->fts_name, + mac_error(error)); + goto label_out; + } + + error = mac_to_text(label, + &labelstr); + if (error != MAC_SUCCESS) { + fprintf(stderr, "%s: %s\n", + cur->fts_name, + mac_error(error)); + goto label_out; + } + + if (labelstr == NULL) + labelstr = strdup(""); + +label_out: + labelstrlen = strlen(labelstr); + if (labelstrlen > maxlabelstr) + maxlabelstr = labelstrlen; } else - lattrlen = 0; + labelstrlen = 0; - if ((np = malloc(sizeof(NAMES) + lattrlen + + if ((np = malloc(sizeof(NAMES) + labelstrlen + ulen + glen + flen + 4)) == NULL) err(1, "malloc"); @@ -708,11 +739,11 @@ (void)strcpy(np->flags, flags); free(flags); } - if (f_lomac) { - np->lattr = &np->data[ulen + glen + 2 + if (f_label) { + np->label = &np->data[ulen + glen + 2 + (f_flags ? flen + 1 : 0)]; - (void)strcpy(np->lattr, lattr); - free(lattr); + (void)strcpy(np->label, labelstr); + free(labelstr); } cur->fts_pointer = np; } @@ -732,7 +763,7 @@ (void)snprintf(buf, sizeof(buf), "%lu", maxblock); d.s_block = strlen(buf); d.s_flags = maxflags; - d.s_lattr = maxlattr; + d.s_label = maxlabelstr; d.s_group = maxgroup; (void)snprintf(buf, sizeof(buf), "%lu", maxinode); d.s_inode = strlen(buf); @@ -748,8 +779,6 @@ if (f_longform) for (cur = list; cur; cur = cur->fts_link) free(cur->fts_pointer); - if (f_lomac) - lomac_stop(); } /* ==== //depot/projects/trustedbsd/mac/bin/ls/ls.h#6 (text+ko) ==== @@ -45,7 +45,7 @@ extern int f_accesstime; /* use time of last access */ extern int f_flags; /* show flags associated with a file */ extern int f_humanval; /* show human-readable file sizes */ -extern int f_lomac; /* show LOMAC attributes */ +extern int f_label; /* show MAC label */ extern int f_inode; /* print inode */ extern int f_longform; /* long listing format */ extern int f_octal; /* print unprintables in octal */ @@ -70,7 +70,7 @@ int maxlen; u_int s_block; u_int s_flags; - u_int s_lattr; + u_int s_label; u_int s_group; u_int s_inode; u_int s_nlink; @@ -82,6 +82,6 @@ char *user; char *group; char *flags; - char *lattr; + char *label; char data[1]; } NAMES; ==== //depot/projects/trustedbsd/mac/bin/ls/print.c#9 (text+ko) ==== @@ -182,8 +182,8 @@ np->group); if (f_flags) (void)printf("%-*s ", dp->s_flags, np->flags); - if (f_lomac) - (void)printf("%-*s ", dp->s_lattr, np->lattr); + if (f_label) + (void)printf("%-*s ", dp->s_label, np->label); if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode)) if (minor(sp->st_rdev) > 255 || minor(sp->st_rdev) < 0) (void)printf("%3d, 0x%08x ", ==== //depot/projects/trustedbsd/mac/bin/ls/util.c#7 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/bin/ps/Makefile#6 (text+ko) ==== @@ -2,7 +2,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= ps -SRCS= fmt.c keyword.c nlist.c print.c ps.c lomac.c +SRCS= fmt.c keyword.c nlist.c print.c ps.c # # To support "lazy" ps for non root/wheel users # add -DLAZY_PS to the cflags. This helps ==== //depot/projects/trustedbsd/mac/bin/ps/extern.h#7 (text+ko) ==== @@ -54,7 +54,7 @@ const char *fmt_argv(char **, char *, size_t); double getpcpu(const KINFO *); void kvar(KINFO *, VARENT *); -void lattr(KINFO *, VARENT *); +void label(KINFO *, VARENT *); void logname(KINFO *, VARENT *); void longtname(KINFO *, VARENT *); void lstarted(KINFO *, VARENT *); @@ -74,7 +74,6 @@ int s_rgroupname(KINFO *); int s_runame(KINFO *); int s_uname(KINFO *); -void sebsd(KINFO *, VARENT *); void showkey(void); void started(KINFO *, VARENT *); void state(KINFO *, VARENT *); ==== //depot/projects/trustedbsd/mac/bin/ps/keyword.c#9 (text+ko) ==== @@ -104,13 +104,13 @@ 0}, {"ktrace", "KTRACE", NULL, 0, kvar, NULL, 8, KOFF(ki_traceflag), INT, "x", 0}, + {"label", "LABEL", NULL, LJUST, label, NULL, 0, 0, CHAR, NULL, 0}, {"lim", "LIM", NULL, 0, maxrss, NULL, 5, 0, CHAR, NULL, 0}, {"login", "LOGIN", NULL, LJUST, logname, NULL, MAXLOGNAME-1, 0, CHAR, NULL, 0}, {"logname", "", "login", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"lstart", "STARTED", NULL, LJUST|USER, lstarted, NULL, 28, 0, CHAR, NULL, 0}, - {"lvl", "LVL", NULL, LJUST, lattr, NULL, 3, 0, CHAR, NULL, 0}, {"majflt", "MAJFLT", NULL, USER, rvar, NULL, 4, ROFF(ru_majflt), LONG, "ld", 0}, {"minflt", "MINFLT", NULL, USER, rvar, NULL, 4, ROFF(ru_minflt), @@ -164,7 +164,6 @@ UINT, UIDFMT, 0}, {"ruser", "RUSER", NULL, LJUST|DSIZ, runame, s_runame, USERLEN, 0, CHAR, NULL, 0}, - {"sebsd", "SEBSD", NULL, LJUST, sebsd, NULL, 0, 0, CHAR, NULL, 0}, {"sid", "SID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_sid), UINT, PIDFMT, 0}, {"sig", "PENDING", NULL, 0, kvar, NULL, 8, KOFF(ki_siglist), INT, ==== //depot/projects/trustedbsd/mac/bin/ps/print.c#9 (text+ko) ==== @@ -63,7 +63,6 @@ #include #include -#include "lomac.h" #include "ps.h" static void printval(void *, VAR *); @@ -736,28 +735,30 @@ } void -lattr(KINFO *k, VARENT *ve) +label(KINFO *k, VARENT *ve) { + char *string; + mac_t label; + int error; VAR *v; - v = ve->var; - (void)printf("%-*d", v->width, get_lattr(k->ki_p->ki_pid)); -} + string = ""; + + error = mac_prepare_process_label(&label); + if (error != MAC_SUCCESS) { + fprintf(stderr, "%s\n", mac_error(error)); + goto out; + } -void -sebsd(KINFO *k, VARENT *ve) -{ - char buf[128]; - struct mac_pid_data mpd; - size_t datalen; - VAR *v; + error = mac_get_pid(k->ki_p->ki_pid, label); + if (error == 0) { + error = mac_to_text(label, &string); + if (error != MAC_SUCCESS) + string = ""; + } + mac_free(label); - strcpy(buf, "<>"); - strcpy(mpd.mpd_name, "trustedbsd_sebsd"); - mpd.mpd_data = buf; - datalen = sizeof(buf); - mpd.mpd_datalen = &datalen; - (void)mac_get_pid(k->ki_p->ki_pid, &mpd, 1); - v = ve->var; - (void)printf("%*s", v->width, mpd.mpd_data); +out: + (void)printf("%*s", v->width, string); + return; } ==== //depot/projects/trustedbsd/mac/bin/ps/ps.1#10 (text+ko) ==== @@ -144,10 +144,6 @@ .It Fl r Sort by current cpu usage, instead of by process .Tn ID . -.It Fl s -Add sebsd to the list of keywords for which -.Nm -will display information. .It Fl S Change the way the process time is calculated by summing all exited children to their parent process. @@ -188,7 +184,7 @@ .It Fl x Display information about processes without controlling terminals. .It Fl Z -Add lvl to the list of keywords for which +Add label to the list of keywords for which .Nm will display information. .El @@ -228,14 +224,14 @@ .It Dv "P_OWEUPC" Ta No "0x20000 Owe process an addupc() call at next ast" .It Dv "P_SWAPPING" Ta No "0x40000 Process is being swapped" .El +.It label +The MAC label of the process. .It lim The soft limit on memory used, specified via a call to .Xr setrlimit 2 . .It lstart The exact time the command started, using the ``%c'' format described in .Xr strftime 3 . -.It lvl -The LOMAC level of the process. .It mtxname The name of the .Xr mutex 9 @@ -339,8 +335,6 @@ .It X The process is being traced or debugged. .El -.It sebsd -The SEBSD security context of the process. .It tt An abbreviation for the pathname of the controlling terminal, if any. The abbreviation consists of the three letters following @@ -398,14 +392,14 @@ job control count .It ktrace tracing flags +.It label +MAC label .It lim memoryuse limit .It logname login name of user who started the process .It lstart time started -.It lvl -LOMAC level .It majflt total page faults .It minflt ==== //depot/projects/trustedbsd/mac/bin/ps/ps.c#12 (text+ko) ==== @@ -64,7 +64,6 @@ #include #include -#include "lomac.h" #include "ps.h" #define SEP ", \t" /* username separators */ @@ -108,15 +107,14 @@ static char o2[] = "tt,state,time,command"; static char ufmt[] = "user,pid,%cpu,%mem,vsz,rss,tt,state,start,time,command"; static char vfmt[] = "pid,state,time,sl,re,pagein,vsz,rss,lim,tsiz,%cpu,%mem,command"; -static char Zfmt[] = "lvl"; -static char sfmt[] = "sebsd"; +static char Zfmt[] = "label"; static kvm_t *kd; #if defined(LAZY_PS) -#define PS_ARGS "aCcefghjLlM:mN:O:o:p:rsSTt:U:uvwxZ" +#define PS_ARGS "aCcefghjLlM:mN:O:o:p:rSTt:U:uvwxZ" #else -#define PS_ARGS "aCceghjLlM:mN:O:o:p:rsSTt:U:uvwxZ" +#define PS_ARGS "aCceghjLlM:mN:O:o:p:rSTt:U:uvwxZ" #endif int @@ -242,10 +240,6 @@ case 'r': sortby = SORTCPU; break; - case 's': - parsefmt(sfmt); - sfmt[0] = '\0'; - break; case 'S': sumrusage = 1; break; @@ -415,7 +409,6 @@ } } free(uids); - lomac_stop(); exit(eval); } ==== //depot/projects/trustedbsd/mac/etc/Makefile#18 (text+ko) ==== @@ -10,7 +10,7 @@ dhclient.conf dm.conf fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ - motd modems netconfig networks newsyslog.conf \ + mac.conf motd modems netconfig networks newsyslog.conf \ phones printcap profile protocols \ rc rc.atm rc.devfs rc.diskless1 rc.diskless2 rc.firewall rc.firewall6 \ rc.network rc.network6 rc.pccard rc.sendmail rc.serial rc.shutdown \ ==== //depot/projects/trustedbsd/mac/etc/login.conf#15 (text+ko) ==== @@ -41,6 +41,15 @@ #:label=biba/high(low-high),mls/low(low-high),te/default_d:\ #:ttylabel=biba/high,mls/low,te/device_t: + # In many configurations, it will be desirable to set a default + # user MAC label. If so, the following might be a useful place + # to start: + # + #:label=biba/high(low-high),mls/low(low-high),te/default_d: + #:ttylabel=biba/high,mls/low,te/device_t: + # + # In addition, other labels might be desirable for other user + # classes. # # A collection of common class names - forward them all to 'default' ==== //depot/projects/trustedbsd/mac/etc/rc.diskless1#7 (text+ko) ==== @@ -61,8 +61,8 @@ mount_md() { /sbin/mdconfig -a -t malloc -s $1 -u $3 /sbin/disklabel -r -w md$3 auto - /sbin/newfs -i 4096 /dev/md$3c - /sbin/mount /dev/md$3c $2 + /sbin/newfs -O1 -i 4096 /dev/md$3c + /sbin/mount -o multilabel /dev/md$3c $2 } # DEBUGGING ==== //depot/projects/trustedbsd/mac/etc/rc.diskless2#27 (text+ko) ==== @@ -42,24 +42,8 @@ fi /sbin/mdconfig -a -t malloc -s $1 -u $3 /sbin/disklabel -r -w md$3 auto - /sbin/newfs $bpi /dev/md$3c - /sbin/mount /dev/md$3c $2 -} - -# Enable label support on a UFS1 md file system -# $1 = mountpoint -# $2 = md device -# XXX: Assumes auto-start -multilabel_md() { - labelsize=`/sbin/sysctl -n security.mac.label_size` - /bin/mkdir -p $1/.attribute/system - /usr/sbin/extattrctl initattr -f -p $1 ${labelsize} \ - $1/.attribute/system/freebsd.mac - #/usr/sbin/extattrctl start $1 - #/usr/sbin/extattrctl enable $1 system freebsd.mac \ - # $1/.attribute/system/freebsd.mac - /sbin/umount $1 - /sbin/mount -o multilabel /dev/md$2c $1 + /sbin/newfs -O2 $bpi /dev/md$3c + /sbin/mount -o multilabel /dev/md$3c $2 } # If there is a global system configuration file, suck it in. ==== //depot/projects/trustedbsd/mac/include/Makefile#18 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/lib/Makefile#10 (text+ko) ==== @@ -26,7 +26,7 @@ ${_compat} libalias libatm ${_libbind} libbz2 libc ${_libc_r} \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libfetch libform libftpio ${_libio} libipsec \ - libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ + libipx libisc libmac libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap libsebsd \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#17 (text+ko) ==== @@ -19,16 +19,9 @@ acl_to_text.c \ acl_valid.c \ extattr.c \ - mac_biba.c \ - mac_constant.c \ - mac_free.c \ - mac_is_present_np.c \ + mac.c \ mac_get.c \ - mac_mls.c \ - mac_sebsd.c \ - mac_set.c \ - mac_te.c \ - mac_text.c + mac_set.c .if ${LIB} == "c" ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.3#7 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" Copyright (c) 2001 Networks Associates Technology, Inc. +.\" Copyright (c) 2001, 2002 Networks Associates Technology, Inc. .\" All rights reserved. .\" .\" This software was developed for the FreeBSD Project by Chris @@ -43,21 +43,18 @@ .Sh SYNOPSIS .In sys/mac.h .Ft int -.Fn mac_free "void *buf_p" +.Fn mac_free "mac_t label" .Sh DESCRIPTION The .Fn mac_free -function frees the storage allocated to contain either a -.Vt mac_t -or a -.Vt char * , -as allocated by the -.Fn mac_to_text -function. +function frees the storage allocated to contain a +.Vt mac_t . .Sh RETURN VALUES The .Fn mac_free function always returns 0. +WARNING: see the notes in the BUGS section regarding the use of this +function. .Sh SEE ALSO .Xr mac 3 , .Xr mac_get 3 , @@ -71,3 +68,16 @@ .Fx POSIX.1e implementation page for more information. +.Sh BUGS +POSIX.1e specifies that +.Fn mac_free +will be used to free text strings created using +.Xr mac_to_text 3 . +Because +.Vt mac_t +is a complex structure in the TrustedBSD implementation, +.Fn mac_free +is specific to that type, and must not be used to free the character +strings returned from +.Fn mac_to_text . +Doing so may result in an application failure. ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#7 (text+ko) ==== @@ -37,65 +37,34 @@ #include #include -mac_t -mac_get_file(const char *path_p) +int +mac_get_file(const char *path, struct mac *label) { - struct mac *label; - int error; - label = (mac_t) malloc(sizeof(*label)); - if (label == NULL) { - errno = ENOMEM; - return (NULL); - } + return (__mac_get_file(path, label)); +} - error = __mac_get_file(path_p, label); - if (error) { - mac_free(label); - return (NULL); - } +int +mac_get_fd(int fd, struct mac *label) +{ - return (label); + return (__mac_get_fd(fd, label)); } -mac_t -mac_get_fd(int fd) +int +mac_get_proc(struct mac *label) { - struct mac *label; - int error; - label = (mac_t) malloc(sizeof(*label)); - if (label == NULL) { - errno = ENOMEM; - return (NULL); - } + return (__mac_get_proc(label)); +} - error = __mac_get_fd(fd, label); - if (error) { - mac_free(label); - return (NULL); - } +/* + * XXXMAC: Not yet. - return (label); -} - -mac_t -mac_get_proc() +int +mac_get_pid(pid_t pid, struct mac *label) { - struct mac *label; - int error; - label = (mac_t) malloc(sizeof(*label)); - if (label == NULL) { - errno = ENOMEM; - return (NULL); - } - - error = __mac_get_proc(label); - if (error) { - mac_free(label); - return (NULL); - } - - return (label); + return (__mac_get_pid(pid, label)); } +*/ ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.c#5 (text+ko) ==== @@ -35,21 +35,21 @@ #include int -mac_set_file(const char *path_p, mac_t label) +mac_set_file(const char *path, struct mac *label) { - return (__mac_set_file(path_p, label)); + return (__mac_set_file(path, label)); } int -mac_set_fd(int fd, mac_t label) +mac_set_fd(int fd, struct mac *label) { return (__mac_set_fd(fd, label)); } int -mac_set_proc(mac_t label) +mac_set_proc(struct mac *label) { return (__mac_set_proc(label)); ==== //depot/projects/trustedbsd/mac/lib/libutil/login_class.c#8 (text+ko) ==== @@ -377,8 +377,8 @@ } /* Setup the user's MAC label. */ - if (flags & LOGIN_SETMAC && mac_is_present_np(NULL) == 1) { - char *label_string; + if (flags & LOGIN_SETMAC && mac_is_present(NULL) == 1) { + const char *label_string; mac_t label; /* @@ -396,11 +396,11 @@ if (label_string == NULL) { /* Leave label as is, warning, dangerous */ } else { - label = mac_from_text(label_string); - if (label == NULL) { - syslog(LOG_ERR, "mac_from_text(%s): %m", - label_string); - return -1; + error = mac_from_text(&label, label_string); + if (error != MAC_SUCCESS) { + syslog(LOG_ERR, "mac_from_text('%s'): %s", label_string, + mac_error(error)); + return -1; } error = mac_set_proc(label); mac_free(label); ==== //depot/projects/trustedbsd/mac/libexec/ftpd/Makefile#7 (text+ko) ==== @@ -20,7 +20,7 @@ LSDIR= ../../bin/ls .PATH: ${.CURDIR}/${LSDIR} -SRCS+= ls.c cmp.c lomac.c print.c util.c +SRCS+= ls.c cmp.c print.c util.c CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR} DPADD+= ${LIBM} LDADD+= -lm ==== //depot/projects/trustedbsd/mac/libexec/getty/main.c#8 (text+ko) ==== @@ -232,6 +232,7 @@ rootpw = getpwuid(0); /* * After a user logs out, reset the tty MAC label to root's. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 17 13:59:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B55A37B401; Tue, 17 Sep 2002 13:59:21 -0700 (PDT) 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 1AD6E37B404 for ; Tue, 17 Sep 2002 13:59:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CAF7B43E3B for ; Tue, 17 Sep 2002 13:59:20 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8HKxKCo078305 for ; Tue, 17 Sep 2002 13:59:20 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8HKxKhx078302 for perforce@freebsd.org; Tue, 17 Sep 2002 13:59:20 -0700 (PDT) Date: Tue, 17 Sep 2002 13:59:20 -0700 (PDT) Message-Id: <200209172059.g8HKxKhx078302@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 17628 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17628 Change 17628 by amigus@amigus_caster on 2002/09/17 13:58:41 Forgot a pipe lock and userland bug fixes. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#266 edit .. //depot/projects/trustedbsd/mac/usr.sbin/getfmac/getfmac.c#3 edit .. //depot/projects/trustedbsd/mac/usr.sbin/getpmac/getpmac.c#3 edit .. //depot/projects/trustedbsd/mac/usr.sbin/setfmac/setfmac.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#266 (text+ko) ==== @@ -3842,8 +3842,10 @@ mac_free_element_array(element_array); if (error == 0) { pipe = (struct pipe *)fp->f_data; + PIPE_LOCK(pipe); error = mac_pipe_label_set(td->td_ucred, pipe, &intlabel); + PIPE_UNLOCK(pipe); } mac_destroy_pipe_label(&intlabel); ==== //depot/projects/trustedbsd/mac/usr.sbin/getfmac/getfmac.c#3 (text+ko) ==== @@ -53,7 +53,7 @@ error = mac_get_file(argv[i], label); if (error) { - perror(argv[1]); + perror(argv[i]); mac_free(label); continue; } ==== //depot/projects/trustedbsd/mac/usr.sbin/getpmac/getpmac.c#3 (text+ko) ==== @@ -64,12 +64,17 @@ return (-1); } - if (pid_set) + if (pid_set) { error = mac_get_pid(pid, label); - else + if (error) + perror("mac_get_pid"); + } + else { error = mac_get_proc(label); + if (error) + perror("mac_get_proc"); + } if (error) { - perror("mac_get_proc"); mac_free(label); exit (-1); } ==== //depot/projects/trustedbsd/mac/usr.sbin/setfmac/setfmac.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ for (i = 2; i < argc; i++) { error = mac_set_file(argv[i], label); if (error) { - perror(argv[1]); + perror(argv[i]); return (-1); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 17 18:43:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6011D37B404; Tue, 17 Sep 2002 18:43:25 -0700 (PDT) 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 0BC3837B401 for ; Tue, 17 Sep 2002 18:43:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACF6343E72 for ; Tue, 17 Sep 2002 18:43:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8I1hOCo060363 for ; Tue, 17 Sep 2002 18:43:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8I1hOaS060360 for perforce@freebsd.org; Tue, 17 Sep 2002 18:43:24 -0700 (PDT) Date: Tue, 17 Sep 2002 18:43:24 -0700 (PDT) Message-Id: <200209180143.g8I1hOaS060360@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17639 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17639 Change 17639 by rwatson@rwatson_tislabs on 2002/09/17 18:42:40 Sigh. Try again on the right branch: assert the pipe mutex during pipe relabel operations; this works fine because amigus added required locking to the system call code earlier today. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#267 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#267 (text+ko) ==== @@ -3349,6 +3349,8 @@ { int error; + PIPE_LOCK_ASSERT(pipe, MA_OWNED); + error = mac_check_pipe_relabel(cred, pipe, label); if (error) return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 18 15: 6: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F32937B406; Wed, 18 Sep 2002 15:06:00 -0700 (PDT) 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 D64B237B401 for ; Wed, 18 Sep 2002 15:05:59 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 80F8C43E42 for ; Wed, 18 Sep 2002 15:05:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8IM5xCo087329 for ; Wed, 18 Sep 2002 15:05:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8IM5xlQ087326 for perforce@freebsd.org; Wed, 18 Sep 2002 15:05:59 -0700 (PDT) Date: Wed, 18 Sep 2002 15:05:59 -0700 (PDT) Message-Id: <200209182205.g8IM5xlQ087326@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17671 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17671 Change 17671 by rwatson@rwatson_paprika on 2002/09/18 15:05:04 mac_check_vnode_link() check. Note that since vp isn't yet locked in kern_link() as dl's patch hasn't been committed yet, we don't currently provide access to the target vnode label. We will do once that is committed and the locking protocol is updated. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#268 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#82 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#160 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#124 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#268 (text+ko) ==== @@ -888,6 +888,10 @@ mpc->mpc_ops->mpo_check_vnode_getextattr = mpe->mpe_function; break; + case MAC_CHECK_VNODE_LINK: + mpc->mpc_ops->mpo_check_vnode_link = + mpe->mpe_function; + break; case MAC_CHECK_VNODE_LOOKUP: mpc->mpc_ops->mpo_check_vnode_lookup = mpe->mpe_function; @@ -2164,6 +2168,44 @@ } int +mac_check_vnode_link(struct ucred *cred, struct vnode *dvp, struct vnode *vp, + struct componentname *cnp) +{ + int error; + + /* + * XXXMAC: Currently, vp is not locked. When it is locked, we'll + * provide it as the link argument. + */ + ASSERT_VOP_LOCKED(dvp, "mac_check_vnode_lookup"); +#if 0 + ASSERT_VOP_LOCKED(vp, "mac_check_vnode_lookup"); +#endif + + if (!mac_enforce_fs) + return (0); + + error = vn_refreshlabel(dvp, cred); + if (error) + return (error); + +#if 0 + error = vn_refreshlabel(vp, cred); + if (error) + return (error); +#endif + +#if 0 + MAC_CHECK(check_vnode_link, cred, dvp, &dvp->v_label, vp, + &vp->v_label, cnp); +#else + MAC_CHECK(check_vnode_link, cred, dvp, &dvp->v_label, NULL, NULL, + cnp); +#endif + return (error); +} + +int mac_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct componentname *cnp) { ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#82 (text+ko) ==== @@ -1041,7 +1041,13 @@ } else { VOP_LEASE(nd.ni_dvp, td, td->td_ucred, LEASE_WRITE); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); - error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd); +#ifdef MAC + /* XXXMAC: link check */ + error = mac_check_vnode_link(td->td_ucred, nd.ni_dvp, + vp, &nd.ni_cnd); + if (error == 0) +#endif + error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd); } NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#160 (text+ko) ==== @@ -357,6 +357,8 @@ acl_type_t type); int mac_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, int attrnamespace, const char *name, struct uio *uio); +int mac_check_vnode_link(struct ucred *cred, struct vnode *dvp, + struct vnode *vp, struct componentname *cnp); int mac_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct componentname *cnp); /* XXX This u_char should be vm_prot_t! */ ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#124 (text+ko) ==== @@ -330,6 +330,9 @@ int (*mpo_check_vnode_getextattr)(struct ucred *cred, struct vnode *vp, struct label *label, int attrnamespace, const char *name, struct uio *uio); + int (*mpo_check_vnode_link)(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, + struct label *label, struct componentname *cnp); int (*mpo_check_vnode_lookup)(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp); @@ -502,6 +505,7 @@ MAC_CHECK_VNODE_EXEC, MAC_CHECK_VNODE_GETACL, MAC_CHECK_VNODE_GETEXTATTR, + MAC_CHECK_VNODE_LINK, MAC_CHECK_VNODE_LOOKUP, MAC_CHECK_VNODE_MMAP_PERMS, MAC_CHECK_VNODE_OPEN, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 18 15: 6:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D577737B408; Wed, 18 Sep 2002 15:06:00 -0700 (PDT) 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 48F2937B404 for ; Wed, 18 Sep 2002 15:06:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC66843E4A for ; Wed, 18 Sep 2002 15:05:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8IM5xCo087336 for ; Wed, 18 Sep 2002 15:05:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8IM5xCK087333 for perforce@freebsd.org; Wed, 18 Sep 2002 15:05:59 -0700 (PDT) Date: Wed, 18 Sep 2002 15:05:59 -0700 (PDT) Message-Id: <200209182205.g8IM5xCK087333@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17672 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17672 Change 17672 by rwatson@rwatson_paprika on 2002/09/18 15:05:53 Update policies for hard link MAC check: don't implement checks based on target vnode yet, as we don't have that locked in the MAC framework yet. Note that the semantics on bsdextended are interesting, since you can prevent users from hard linking files that are owned by specific other users... Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#107 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#53 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#73 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#76 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#12 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#44 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#107 (text+ko) ==== @@ -1710,6 +1710,32 @@ } static int +mac_biba_check_vnode_link(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) +{ + struct mac_biba *subj, *obj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(dlabel); + + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); + +#if 0 + obj = SLOT(label); + + if (!mac_biba_dominate_single(subj, obj)) + return (EACCES); +#endif + + return (0); +} + +static int mac_biba_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -2325,6 +2351,8 @@ (macop_t)mac_biba_check_vnode_getacl }, { MAC_CHECK_VNODE_GETEXTATTR, (macop_t)mac_biba_check_vnode_getextattr }, + { MAC_CHECK_VNODE_LINK, + (macop_t)mac_biba_check_vnode_link }, { MAC_CHECK_VNODE_LOOKUP, (macop_t)mac_biba_check_vnode_lookup }, { MAC_CHECK_VNODE_OPEN, ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#53 (text+ko) ==== @@ -445,6 +445,35 @@ } static int +mac_bsdextended_check_vnode_link(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) +{ + struct vattr vap; + int error; + + if (!mac_bsdextended_enabled) + return (0); + + error = VOP_GETATTR(dvp, &vap, cred, curthread); + if (error) + return (error); + error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VWRITE); + if (error) + return (error); + +#if 0 + error = VOP_GETATTR(vp, &vap, cred, curthread); + if (error) + return (error); + error = mac_bsdextended_check(cred, vap.va_uid, vap.va_gid, VWRITE); + if (error) + return (error); +#endif + return (0); +} + +static int mac_bsdextended_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -715,6 +744,8 @@ (macop_t)mac_bsdextended_check_vnode_getacl }, { MAC_CHECK_VNODE_GETEXTATTR, (macop_t)mac_bsdextended_check_vnode_getextattr }, + { MAC_CHECK_VNODE_LINK, + (macop_t)mac_bsdextended_check_vnode_link }, { MAC_CHECK_VNODE_LOOKUP, (macop_t)mac_bsdextended_check_vnode_lookup }, { MAC_CHECK_VNODE_OPEN, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#73 (text+ko) ==== @@ -679,6 +679,15 @@ } static int +mac_none_check_vnode_link(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) +{ + + return (0); +} + +static int mac_none_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -1044,6 +1053,8 @@ (macop_t)mac_none_check_vnode_getacl }, { MAC_CHECK_VNODE_GETEXTATTR, (macop_t)mac_none_check_vnode_getextattr }, + { MAC_CHECK_VNODE_LINK, + (macop_t)mac_none_check_vnode_link }, { MAC_CHECK_VNODE_LOOKUP, (macop_t)mac_none_check_vnode_lookup }, { MAC_CHECK_VNODE_OPEN, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#76 (text+ko) ==== @@ -1143,6 +1143,31 @@ } static int +mac_te_check_vnode_link(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) +{ + int error; + + error = mac_te_check(&cred->cr_label, dlabel, MAC_TE_CLASS_DIR, + MAC_TE_OPERATION_DIR_WRITE); + if (error) + return (error); +#if 0 + switch (vp->v_type) { + case VLNK: + return (mac_te_check(&cred->cr_label, label, + MAC_TE_CLASS_SYMLINK, MAC_TE_OPERATION_SYMLINK_LINK)); + default: + return (mac_te_check(&cred->cr_labl, label, + MAC_TE_CLASS_FILE, MAC_TE_OPERATION_FILE_LINK)); + } +#endif + + return (error); +} + +static int mac_te_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -1772,6 +1797,8 @@ (macop_t)mac_te_check_vnode_getacl }, { MAC_CHECK_VNODE_GETEXTATTR, (macop_t)mac_te_check_vnode_getextattr }, + { MAC_CHECK_VNODE_LINK, + (macop_t)mac_te_check_vnode_link }, { MAC_CHECK_VNODE_LOOKUP, (macop_t)mac_te_check_vnode_lookup }, { MAC_CHECK_VNODE_OPEN, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.h#12 (text+ko) ==== @@ -75,6 +75,7 @@ #define MAC_TE_OPERATION_FILE_EXEC 4 #define MAC_TE_OPERATION_FILE_GETACL 5 #define MAC_TE_OPERATION_FILE_GETEXTATTR 6 +#define MAC_TE_OPERATION_FILE_LINK 6 #define MAC_TE_OPERATION_FILE_POLL 7 #define MAC_TE_OPERATION_FILE_READ 8 #define MAC_TE_OPERATION_FILE_SETACL 9 @@ -120,10 +121,11 @@ #define MAC_TE_OPERATION_SYMLINK_DELETEACL 3 #define MAC_TE_OPERATION_SYMLINK_GETACL 4 #define MAC_TE_OPERATION_SYMLINK_GETEXTATTR 5 -#define MAC_TE_OPERATION_SYMLINK_READLINK 6 -#define MAC_TE_OPERATION_SYMLINK_SETACL 7 -#define MAC_TE_OPERATION_SYMLINK_SETEXTATTR 8 -#define MAC_TE_OPERATION_SYMLINK_STAT 9 +#define MAC_TE_OPERATION_SYMLINK_LINK 6 +#define MAC_TE_OPERATION_SYMLINK_READLINK 7 +#define MAC_TE_OPERATION_SYMLINK_SETACL 8 +#define MAC_TE_OPERATION_SYMLINK_SETEXTATTR 9 +#define MAC_TE_OPERATION_SYMLINK_STAT 10 #if 0 /* XXXMAC: temporarily disabled because we still need struct oldmac */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#44 (text+ko) ==== @@ -1053,6 +1053,15 @@ } static int +mac_test_check_vnode_link(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) +{ + + return (0); +} + +static int mac_test_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -1420,6 +1429,8 @@ (macop_t)mac_test_check_vnode_getacl }, { MAC_CHECK_VNODE_GETEXTATTR, (macop_t)mac_test_check_vnode_getextattr }, + { MAC_CHECK_VNODE_LINK, + (macop_t)mac_test_check_vnode_link }, { MAC_CHECK_VNODE_LOOKUP, (macop_t)mac_test_check_vnode_lookup }, { MAC_CHECK_VNODE_OPEN, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 18 15:16:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56C4437B404; Wed, 18 Sep 2002 15:16:13 -0700 (PDT) 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 0327237B401 for ; Wed, 18 Sep 2002 15:16:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B047C43E3B for ; Wed, 18 Sep 2002 15:16:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8IMGCCo089492 for ; Wed, 18 Sep 2002 15:16:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8IMGC2n089489 for perforce@freebsd.org; Wed, 18 Sep 2002 15:16:12 -0700 (PDT) Date: Wed, 18 Sep 2002 15:16:12 -0700 (PDT) Message-Id: <200209182216.g8IMGC2n089489@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17673 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17673 Change 17673 by rwatson@rwatson_paprika on 2002/09/18 15:15:59 Add a missing MAC check for the BPF code; not clear if this was lost during an integ, or a victim of moving source code in -current. Pointed out by: phk Affected files ... .. //depot/projects/trustedbsd/mac/sys/net/bpf.c#16 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/net/bpf.c#16 (text+ko) ==== @@ -1137,7 +1137,11 @@ ++d->bd_rcount; slen = bpf_filter(d->bd_filter, (u_char *)m, pktlen, 0); if (slen != 0) - catchpacket(d, (u_char *)m, pktlen, slen, bpf_mcopy); +#ifdef MAC + if (mac_check_bpfdesc_receive(d, ifp) == 0) +#endif + catchpacket(d, (u_char *)m, pktlen, slen, + bpf_mcopy); BPFD_UNLOCK(d); } BPFIF_UNLOCK(bp); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 18 15:48:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93F8737B404; Wed, 18 Sep 2002 15:48:54 -0700 (PDT) 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 4348B37B401 for ; Wed, 18 Sep 2002 15:48:54 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE00043E3B for ; Wed, 18 Sep 2002 15:48:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8IMmrCo096265 for ; Wed, 18 Sep 2002 15:48:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8IMmri1096262 for perforce@freebsd.org; Wed, 18 Sep 2002 15:48:53 -0700 (PDT) Date: Wed, 18 Sep 2002 15:48:53 -0700 (PDT) Message-Id: <200209182248.g8IMmri1096262@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17678 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17678 Change 17678 by rwatson@rwatson_paprika on 2002/09/18 15:47:53 File missed in previous submit: another instances of pre_syscall. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#13 (text+ko) ==== @@ -91,7 +91,7 @@ #endif #ifdef MAC - mac_pre_syscall_return(); + mac_thread_userret(td); #endif /* * XXX we cheat slightly on the locking here to avoid locking in To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 18 15:55: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BCD037B404; Wed, 18 Sep 2002 15:55:03 -0700 (PDT) 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 EDDCA37B401 for ; Wed, 18 Sep 2002 15:55:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 693FA43E6A for ; Wed, 18 Sep 2002 15:55:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8IMt2Co098154 for ; Wed, 18 Sep 2002 15:55:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8IMt1D3098150 for perforce@freebsd.org; Wed, 18 Sep 2002 15:55:01 -0700 (PDT) Date: Wed, 18 Sep 2002 15:55:01 -0700 (PDT) Message-Id: <200209182255.g8IMt1D3098150@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17680 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17680 Change 17680 by rwatson@rwatson_paprika on 2002/09/18 15:54:13 In an attempt to improve naming consistency, rename mac_pre_syscall_return(void) to mac_thread_userret(td). While I'm here, add prototypes to mac_none and mac_test, which are intended to implement all available entry points with stubs. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#269 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#6 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#74 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#45 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#161 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#125 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#269 (text+ko) ==== @@ -760,12 +760,12 @@ case MAC_CREATE_PROC1: mpc->mpc_ops->mpo_create_proc1 = mpe->mpe_function; break; - case MAC_PRE_SYSCALL_RETURN: - mpc->mpc_ops->mpo_pre_syscall_return = + case MAC_RELABEL_CRED: + mpc->mpc_ops->mpo_relabel_cred = mpe->mpe_function; break; - case MAC_RELABEL_CRED: - mpc->mpc_ops->mpo_relabel_cred = + case MAC_THREAD_USERRET: + mpc->mpc_ops->mpo_thread_userret = mpe->mpe_function; break; case MAC_CHECK_BPFDESC_RECEIVE: @@ -1696,10 +1696,10 @@ } void -mac_pre_syscall_return(void) +mac_thread_userret(struct thread *td) { - MAC_PERFORM(pre_syscall_return); + MAC_PERFORM(thread_userret, td); } /* ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#6 (text+ko) ==== @@ -2287,9 +2287,9 @@ } static void -mac_lomac_pre_syscall_return(void) +mac_lomac_thread_userret(struct thread *td) { - struct proc *p = curthread->td_proc; + struct proc *p = td->td_proc; struct mac_biba_proc *subj = PSLOT(&p->p_label); struct ucred *newcred, *oldcred; @@ -2457,6 +2457,8 @@ (macop_t)mac_biba_create_proc1 }, { MAC_RELABEL_CRED, (macop_t)mac_biba_relabel_cred }, + { MAC_THREAD_USERRET, + (macop_t)mac_lomac_thread_userret }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_biba_check_bpfdesc_receive }, { MAC_CHECK_CRED_RELABEL, @@ -2523,8 +2525,6 @@ (macop_t)mac_biba_check_vnode_write }, { MAC_CHECK_VNODE_MMAP_PERMS, (macop_t)mac_biba_check_vnode_mmap_perms }, - { MAC_PRE_SYSCALL_RETURN, - (macop_t)mac_lomac_pre_syscall_return }, { MAC_INIT_PROC, (macop_t)mac_lomac_init_proc }, { MAC_DESTROY_PROC, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#74 (text+ko) ==== @@ -439,6 +439,12 @@ } +static void +mac_none_thread_userret(struct thread *td) +{ + +} + /* * Access control checks. */ @@ -993,6 +999,8 @@ (macop_t)mac_none_create_proc1 }, { MAC_RELABEL_CRED, (macop_t)mac_none_relabel_cred }, + { MAC_THREAD_USERRET, + (macop_t)mac_none_thread_userret }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_none_check_bpfdesc_receive }, { MAC_CHECK_CRED_RELABEL, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#45 (text+ko) ==== @@ -813,6 +813,12 @@ } +static void +mac_test_thread_userret(struct thread *td) +{ + +} + /* * Access control checks. */ @@ -1369,6 +1375,8 @@ (macop_t)mac_test_create_proc1 }, { MAC_RELABEL_CRED, (macop_t)mac_test_relabel_cred }, + { MAC_THREAD_USERRET, + (macop_t)mac_test_thread_userret }, { MAC_CHECK_BPFDESC_RECEIVE, (macop_t)mac_test_check_bpfdesc_receive }, { MAC_CHECK_CRED_RELABEL, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#161 (text+ko) ==== @@ -318,7 +318,7 @@ int mac_execve_will_transition(struct ucred *old, struct vnode *vp); void mac_create_proc0(struct ucred *cred); void mac_create_proc1(struct ucred *cred); -void mac_pre_syscall_return(void); +void mac_thread_userret(struct thread *td); /* Access control checks. */ int mac_check_bpfdesc_receive(struct bpf_d *bpf_d, struct ifnet *ifnet); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#125 (text+ko) ==== @@ -253,9 +253,9 @@ struct vnode *vp, struct label *vnodelabel); void (*mpo_create_proc0)(struct ucred *cred); void (*mpo_create_proc1)(struct ucred *cred); - void (*mpo_pre_syscall_return)(void); void (*mpo_relabel_cred)(struct ucred *cred, struct label *newlabel); + void (*mpo_thread_userret)(struct thread *thread); /* * Access control checks. @@ -473,8 +473,8 @@ MAC_EXECVE_WILL_TRANSITION, MAC_CREATE_PROC0, MAC_CREATE_PROC1, - MAC_PRE_SYSCALL_RETURN, MAC_RELABEL_CRED, + MAC_THREAD_USERRET, MAC_CHECK_BPFDESC_RECEIVE, MAC_CHECK_CRED_RELABEL, MAC_CHECK_CRED_VISIBLE, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 18 16:53:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B42C37B404; Wed, 18 Sep 2002 16:53:13 -0700 (PDT) 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 DBBBC37B401 for ; Wed, 18 Sep 2002 16:53:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C3A043E65 for ; Wed, 18 Sep 2002 16:53:12 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8INrCCo014739 for ; Wed, 18 Sep 2002 16:53:12 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8INrCwv014736 for perforce@freebsd.org; Wed, 18 Sep 2002 16:53:12 -0700 (PDT) Date: Wed, 18 Sep 2002 16:53:12 -0700 (PDT) Message-Id: <200209182353.g8INrCwv014736@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 17681 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17681 Change 17681 by chris@chris_holly on 2002/09/18 16:52:58 Begin to move things around and make minor corrections as prescribed by Garrett Wollman. This is actually a weeks-old change and will be followed up by correctly organizing this document. Here are a few points that should be made about this document: o all relabel entry points are scattered, not under the right heading o there were a few other grammar errors that have yet to be corrected o every single entry point requires at least 26 lines of metadata o Data is formatted in a suboptimal layout due to DocBook limitations o on the current version, we're looking at hastily-written summaries o catching-up needs to be done; this document is out of date o Best thing to do after that is to mostly re-write each description o over the next few weeks, I'll be carrying out those changes o over the next few months, I'll decide whether or not I would like to keep this document in the DocBook format, or possibly move it out Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#16 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#16 (text+ko) ==== @@ -688,60 +688,6 @@ the root file system is mounted, after &mac.mpo;_create_mount;. - - - <function>&mac.mpo;_vnode_relabel</function> - - - - void - &mac.mpo;_vnode_relabel - - struct ucred - *cred - struct vnode - *vp - struct label - *vnodelabel - struct label - *newlabel - - - - - - &mac.thead; - - - - cred - Subject credential - - - - vp - vnode to relabel - - - - vnodelabel - Existing policy label for - vp - - - - newlabel - New, possibly partial label to replace - vnodelabel - - - - - - Update the label on the passed vnode given the passed - update vnode label and the passed subject credential. - - <function>&mac.mpo;_stdcreatevnode_ea</function> @@ -1233,7 +1179,7 @@ or prior to &man.accept.2;, depending on the protocol. - + <function>&mac.mpo;_socket_relabel</function> @@ -2397,7 +2343,7 @@ Create the subject credential of process 1, the parent - of all kernel processes. + of all user processes. @@ -2449,7 +2395,7 @@ entry point will include one or more authorizing credentials, information (possibly including a label) for any other objects involved in the operation. An access control entry point may - return 0 to permit the operation, and an &man.errno.2; error + return 0 to permit the operation, or an &man.errno.2; error value. The results of invoking the entry point across various registered policy modules will be composed as follows: if all modules permit the operation to succeed, success will be @@ -4733,6 +4679,59 @@ calls are not permitted to fail (failure should be reported earlier in the relabel check). + + <function>&mac.mpo;_vnode_relabel</function> + + + + void + &mac.mpo;_vnode_relabel + + struct ucred + *cred + struct vnode + *vp + struct label + *vnodelabel + struct label + *newlabel + + + + + + &mac.thead; + + + + cred + Subject credential + + + + vp + vnode to relabel + + + + vnodelabel + Existing policy label for + vp + + + + newlabel + New, possibly partial label to replace + vnodelabel + + + + + + Update the label on the passed vnode given the passed + update vnode label and the passed subject credential. + + <function>&mac.mpo;_init_bpfdesc</function> To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 18 17:51:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23A7237B406; Wed, 18 Sep 2002 17:51:41 -0700 (PDT) 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 C890A37B401 for ; Wed, 18 Sep 2002 17:51:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82ED843E4A for ; Wed, 18 Sep 2002 17:51:40 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8J0peCo030728 for ; Wed, 18 Sep 2002 17:51:40 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8J0peKG030717 for perforce@freebsd.org; Wed, 18 Sep 2002 17:51:40 -0700 (PDT) Date: Wed, 18 Sep 2002 17:51:40 -0700 (PDT) Message-Id: <200209190051.g8J0peKG030717@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 17686 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17686 Change 17686 by amigus@amigus_caster on 2002/09/18 17:50:40 Fix crash when MAC_DEBUG is undefined. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#270 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#270 (text+ko) ==== @@ -98,17 +98,6 @@ SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, "TrustedBSD MAC policy controls"); -SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, - "TrustedBSD MAC debug info"); -SYSCTL_NODE(_security_mac_debug, OID_AUTO, counters, CTLFLAG_RW, 0, - "TrustedBSD MAC object counters"); - -static int mac_debug_label_fallback = 0; -SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, - &mac_debug_label_fallback, 0, "Filesystems should fall back to fs label" - "when label is corrupted."); -TUNABLE_INT("security.mac.debug_label_fallback", - &mac_debug_label_fallback); #ifndef MAC_MAX_POLICIES #define MAC_MAX_POLICIES 8 @@ -178,6 +167,19 @@ "copy-on-write semantics, or by removing all write access"); #ifdef MAC_DEBUG +SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, + "TrustedBSD MAC debug info"); + +static int mac_debug_label_fallback = 0; +SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, + &mac_debug_label_fallback, 0, "Filesystems should fall back to fs label" + "when label is corrupted."); +TUNABLE_INT("security.mac.debug_label_fallback", + &mac_debug_label_fallback); + +SYSCTL_NODE(_security_mac_debug, OID_AUTO, counters, CTLFLAG_RW, 0, + "TrustedBSD MAC object counters"); + static unsigned int nmacmbufs, nmaccreds, nmacifnets, nmacbpfdescs, nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, nmacipqs, nmacpipes, nmacprocs; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 18 20:28:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C74C237B404; Wed, 18 Sep 2002 20:28:36 -0700 (PDT) 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 79B9337B401 for ; Wed, 18 Sep 2002 20:28:36 -0700 (PDT) Received: from holly.calldei.com (adsl-208-191-149-232.dsl.hstntx.swbell.net [208.191.149.232]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1AB143E65 for ; Wed, 18 Sep 2002 20:28:35 -0700 (PDT) (envelope-from chris@holly.dyndns.org) Received: by holly.calldei.com (Postfix, from userid 1001) id AC33AC35; Wed, 18 Sep 2002 22:27:03 -0500 (CDT) Date: Wed, 18 Sep 2002 22:27:03 -0500 From: Chris Costello To: Perforce Change Reviews Subject: Re: PERFORCE change 17681 for review Message-ID: <20020919032702.GA27220@holly.calldei.com> Reply-To: chris@FreeBSD.org References: <200209182353.g8INrCwv014736@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200209182353.g8INrCwv014736@freefall.freebsd.org> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wednesday, September 18, 2002, Chris Costello wrote: > Here are a few points that should be made about this document: > o all relabel entry points are scattered, not under the right heading > o there were a few other grammar errors that have yet to be corrected > o every single entry point requires at least 26 lines of metadata > o Data is formatted in a suboptimal layout due to DocBook limitations > o on the current version, we're looking at hastily-written summaries > o catching-up needs to be done; this document is out of date > o Best thing to do after that is to mostly re-write each description > o over the next few weeks, I'll be carrying out those changes > o over the next few months, I'll decide whether or not I would like to > keep this document in the DocBook format, or possibly move it out As an alternative, I'm thinking about using the traditional ms(7) doc. format and sticking it in /usr/share/doc/papers, or possibly waiting for the DocBook XML bits to get adapted and create a custom stylesheet (.mac -> .docbook) to help clean up the markup, which is really quite messy IMHO. -- Chris Costello FreeBSD Project http://www.FreeBSD.org/ TrustedBSD Project http://www.TrustedBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Sep 18 21:39:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7619737B407; Wed, 18 Sep 2002 21:39:35 -0700 (PDT) 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 212A237B40A for ; Wed, 18 Sep 2002 21:39:35 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D571F43E4A for ; Wed, 18 Sep 2002 21:39:34 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8J4dYCo098913 for ; Wed, 18 Sep 2002 21:39:34 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8J4dY2a098910 for perforce@freebsd.org; Wed, 18 Sep 2002 21:39:34 -0700 (PDT) Date: Wed, 18 Sep 2002 21:39:34 -0700 (PDT) Message-Id: <200209190439.g8J4dY2a098910@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 17700 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17700 Change 17700 by amigus@amigus_ganymede on 2002/09/18 21:39:06 I love introducing compile-time bugs fixing run-time bugs. This takes away the fallback label hack introduced by rwatson unless you have MAC_DEBUG defined. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#271 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#271 (text+ko) ==== @@ -1832,11 +1832,14 @@ vp->v_mount->mnt_stat.f_mntonname); if (VOP_GETATTR(vp, &va, curthread->td_ucred, curthread) == 0) printf(" inum %ld", va.va_fileid); +#ifdef MAC_DEBUG if (mac_debug_label_fallback) { printf(", falling back.\n"); mac_update_vnode_from_mount(vp, vp->v_mount); error = 0; - } else { + } +#endif + else { printf(".\n"); error = EPERM; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 19 5:48:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BF6E37B404; Thu, 19 Sep 2002 05:48:55 -0700 (PDT) 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 1E15937B401; Thu, 19 Sep 2002 05:48:55 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB12643E3B; Thu, 19 Sep 2002 05:48:52 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g8JCmTOo066466; Thu, 19 Sep 2002 08:48:29 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Thu, 19 Sep 2002 08:48:29 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Adam Migus Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17686 for review In-Reply-To: <200209190051.g8J0peKG030717@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG It would, at some point, be useful to figure out why the sysctl code panics if you do this, but now is probably not the moment. :-) Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Wed, 18 Sep 2002, Adam Migus wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17686 > > Change 17686 by amigus@amigus_caster on 2002/09/18 17:50:40 > > Fix crash when MAC_DEBUG is undefined. > > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#270 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#270 (text+ko) ==== > > @@ -98,17 +98,6 @@ > > SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, > "TrustedBSD MAC policy controls"); > -SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, > - "TrustedBSD MAC debug info"); > -SYSCTL_NODE(_security_mac_debug, OID_AUTO, counters, CTLFLAG_RW, 0, > - "TrustedBSD MAC object counters"); > - > -static int mac_debug_label_fallback = 0; > -SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, > - &mac_debug_label_fallback, 0, "Filesystems should fall back to fs label" > - "when label is corrupted."); > -TUNABLE_INT("security.mac.debug_label_fallback", > - &mac_debug_label_fallback); > > #ifndef MAC_MAX_POLICIES > #define MAC_MAX_POLICIES 8 > @@ -178,6 +167,19 @@ > "copy-on-write semantics, or by removing all write access"); > > #ifdef MAC_DEBUG > +SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, > + "TrustedBSD MAC debug info"); > + > +static int mac_debug_label_fallback = 0; > +SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, > + &mac_debug_label_fallback, 0, "Filesystems should fall back to fs label" > + "when label is corrupted."); > +TUNABLE_INT("security.mac.debug_label_fallback", > + &mac_debug_label_fallback); > + > +SYSCTL_NODE(_security_mac_debug, OID_AUTO, counters, CTLFLAG_RW, 0, > + "TrustedBSD MAC object counters"); > + > static unsigned int nmacmbufs, nmaccreds, nmacifnets, nmacbpfdescs, > nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, > nmacipqs, nmacpipes, nmacprocs; > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 19 9: 4:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F13537B404; Thu, 19 Sep 2002 09:04:36 -0700 (PDT) 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 0CCC537B401; Thu, 19 Sep 2002 09:04:36 -0700 (PDT) Received: from garple.migus.org (pcp243391pcs.howard01.md.comcast.net [68.55.83.143]) by mx1.FreeBSD.org (Postfix) with ESMTP id 381AD43E6A; Thu, 19 Sep 2002 09:04:35 -0700 (PDT) (envelope-from adam@migus.org) Received: from ganyopa (ganyopa.migus.org [192.168.4.2]) by garple.migus.org (8.12.2/8.12.2) with SMTP id g8JGCZlv008470; Thu, 19 Sep 2002 12:12:35 -0400 (EDT) From: "Adam Migus" To: "Robert Watson" , "Adam Migus" Cc: "Perforce Change Reviews" Subject: RE: PERFORCE change 17686 for review Date: Thu, 19 Sep 2002 12:04:04 -0400 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2911.0) X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 In-Reply-To: Importance: Normal Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Heh, agreed, on both counts. :-) > -----Original Message----- > From: Robert Watson [mailto:rwatson@FreeBSD.org] > Sent: Thursday, September 19, 2002 8:48 AM > To: Adam Migus > Cc: Perforce Change Reviews > Subject: Re: PERFORCE change 17686 for review > > > It would, at some point, be useful to figure out why the sysctl code > panics if you do this, but now is probably not the moment. :-) > > Robert N M Watson FreeBSD Core Team, TrustedBSD Projects > robert@fledge.watson.org Network Associates Laboratories > > On Wed, 18 Sep 2002, Adam Migus wrote: > > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17686 > > > > Change 17686 by amigus@amigus_caster on 2002/09/18 17:50:40 > > > > Fix crash when MAC_DEBUG is undefined. > > > > Affected files ... > > > > .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#270 edit > > > > Differences ... > > > > ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#270 > (text+ko) ==== > > > > @@ -98,17 +98,6 @@ > > > > SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, > > "TrustedBSD MAC policy controls"); > > -SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, > > - "TrustedBSD MAC debug info"); > > -SYSCTL_NODE(_security_mac_debug, OID_AUTO, counters, CTLFLAG_RW, 0, > > - "TrustedBSD MAC object counters"); > > - > > -static int mac_debug_label_fallback = 0; > > -SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, > > - &mac_debug_label_fallback, 0, "Filesystems should fall > back to fs label" > > - "when label is corrupted."); > > -TUNABLE_INT("security.mac.debug_label_fallback", > > - &mac_debug_label_fallback); > > > > #ifndef MAC_MAX_POLICIES > > #define MAC_MAX_POLICIES 8 > > @@ -178,6 +167,19 @@ > > "copy-on-write semantics, or by removing all write access"); > > > > #ifdef MAC_DEBUG > > +SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, > > + "TrustedBSD MAC debug info"); > > + > > +static int mac_debug_label_fallback = 0; > > +SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, > > + &mac_debug_label_fallback, 0, "Filesystems should fall > back to fs label" > > + "when label is corrupted."); > > +TUNABLE_INT("security.mac.debug_label_fallback", > > + &mac_debug_label_fallback); > > + > > +SYSCTL_NODE(_security_mac_debug, OID_AUTO, counters, CTLFLAG_RW, 0, > > + "TrustedBSD MAC object counters"); > > + > > static unsigned int nmacmbufs, nmaccreds, nmacifnets, nmacbpfdescs, > > nmacsockets, nmacmounts, nmactemp, nmacvnodes, nmacdevfsdirents, > > nmacipqs, nmacpipes, nmacprocs; > > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 19 15:25:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6878837B404; Thu, 19 Sep 2002 15:25:33 -0700 (PDT) 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 158DA37B401 for ; Thu, 19 Sep 2002 15:25:33 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C77F743E42 for ; Thu, 19 Sep 2002 15:25:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8JMPWCo087308 for ; Thu, 19 Sep 2002 15:25:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8JMPWLS087303 for perforce@freebsd.org; Thu, 19 Sep 2002 15:25:32 -0700 (PDT) Date: Thu, 19 Sep 2002 15:25:32 -0700 (PDT) Message-Id: <200209192225.g8JMPWLS087303@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17735 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17735 Change 17735 by rwatson@rwatson_tislabs on 2002/09/19 15:25:24 Export sizeof(struct oldmac) as the label size, not sizeof(struct mac). Pointed out by: amigus Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#272 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#272 (text+ko) ==== @@ -140,7 +140,7 @@ SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); -static int mac_label_size = sizeof(struct mac); +static int mac_label_size = sizeof(struct oldmac); SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, &mac_label_size, 0, "Pre-compiled MAC label size"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 19 15:27:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 692FB37B404; Thu, 19 Sep 2002 15:27:36 -0700 (PDT) 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 19EDE37B401 for ; Thu, 19 Sep 2002 15:27:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CAD9E43E4A for ; Thu, 19 Sep 2002 15:27:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8JMRZCo087609 for ; Thu, 19 Sep 2002 15:27:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8JMRZtJ087606 for perforce@freebsd.org; Thu, 19 Sep 2002 15:27:35 -0700 (PDT) Date: Thu, 19 Sep 2002 15:27:35 -0700 (PDT) Message-Id: <200209192227.g8JMRZtJ087606@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17736 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17736 Change 17736 by rwatson@rwatson_tislabs on 2002/09/19 15:27:08 Add enforcement tunables for enforce_vm, enforce_pipe. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#273 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#273 (text+ko) ==== @@ -125,6 +125,7 @@ static int mac_enforce_pipe = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_pipe, CTLFLAG_RW, &mac_enforce_pipe, 0, "Enforce MAC policy on pipe operations"); +TUNABLE_INT("security.mac.enforce_pipe", &mac_enforce_pipe); static int mac_enforce_process = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_process, CTLFLAG_RW, @@ -139,6 +140,7 @@ static int mac_enforce_vm = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); +TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); static int mac_label_size = sizeof(struct oldmac); SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Sep 19 17:47:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E64E37B404; Thu, 19 Sep 2002 17:47:26 -0700 (PDT) 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 186DA37B401 for ; Thu, 19 Sep 2002 17:47:26 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7B9E43E6A for ; Thu, 19 Sep 2002 17:47:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8K0lPCo028350 for ; Thu, 19 Sep 2002 17:47:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8K0lPBt028347 for perforce@freebsd.org; Thu, 19 Sep 2002 17:47:25 -0700 (PDT) Date: Thu, 19 Sep 2002 17:47:25 -0700 (PDT) Message-Id: <200209200047.g8K0lPBt028347@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17739 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17739 Change 17739 by rwatson@rwatson_tislabs on 2002/09/19 17:46:42 Temporarily disable VM enforcement and mmap revocation due to a bug in the MLS code somewhere. We'll turn this on again later when we've had a chance to track it down. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#274 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#274 (text+ko) ==== @@ -137,7 +137,7 @@ &mac_enforce_socket, 0, "Enforce MAC policy on socket operations"); TUNABLE_INT("security.mac.enforce_socket", &mac_enforce_socket); -static int mac_enforce_vm = 1; +static int mac_enforce_vm = 0; SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); @@ -159,7 +159,7 @@ SYSCTL_INT(_security_mac, OID_AUTO, vnode_label_cache_misses, CTLFLAG_RD, &mac_vnode_label_cache_misses, 0, "Cache misses on vnode labels"); -static int mac_mmap_revocation = 1; +static int mac_mmap_revocation = 0; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " "relabel"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 17:57: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 373BA37B404; Fri, 20 Sep 2002 17:56:40 -0700 (PDT) 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 A497C37B401 for ; Fri, 20 Sep 2002 17:56:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06F0A43E6E for ; Fri, 20 Sep 2002 17:56:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L0ubCo059731 for ; Fri, 20 Sep 2002 17:56:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L0uOFB059722 for perforce@freebsd.org; Fri, 20 Sep 2002 17:56:24 -0700 (PDT) Date: Fri, 20 Sep 2002 17:56:24 -0700 (PDT) Message-Id: <200209210056.g8L0uOFB059722@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17788 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17788 Change 17788 by peter@peter_daintree on 2002/09/20 17:55:58 IFC @17786 Affected files ... .. //depot/projects/hammer/Makefile#3 integrate .. //depot/projects/hammer/Makefile.inc1#3 integrate .. //depot/projects/hammer/bin/ps/extern.h#2 integrate .. //depot/projects/hammer/bin/ps/keyword.c#2 integrate .. //depot/projects/hammer/bin/ps/print.c#2 integrate .. //depot/projects/hammer/bin/ps/ps.h#2 integrate .. //depot/projects/hammer/bin/sh/jobs.c#3 integrate .. //depot/projects/hammer/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/acorn#1 branch .. //depot/projects/hammer/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/amigaos#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/animation#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/archive#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/audio#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/cddb#1 branch .. //depot/projects/hammer/contrib/file/Magdir/commands#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/compress#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/cvs#1 branch .. //depot/projects/hammer/contrib/file/Magdir/database#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/dolby#1 branch .. //depot/projects/hammer/contrib/file/Magdir/editors#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/elf#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/gringotts#1 branch .. //depot/projects/hammer/contrib/file/Magdir/hitachi-sh#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/human68k#1 branch .. //depot/projects/hammer/contrib/file/Magdir/images#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/impulse#1 branch .. //depot/projects/hammer/contrib/file/Magdir/linux#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/mcrypt#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/mlssa#1 branch .. //depot/projects/hammer/contrib/file/Magdir/nitpicker#1 branch .. //depot/projects/hammer/contrib/file/Magdir/perl#1 branch .. //depot/projects/hammer/contrib/file/Magdir/printer#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/pulsar#1 branch .. //depot/projects/hammer/contrib/file/Magdir/sendmail#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/tex#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/tgif#1 branch .. //depot/projects/hammer/contrib/file/Magdir/varied.out#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/hammer/contrib/file/Magdir/vxl#1 branch .. //depot/projects/hammer/contrib/file/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/file/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/file/Makefile.std#2 integrate .. //depot/projects/hammer/contrib/file/README#2 integrate .. //depot/projects/hammer/contrib/file/acconfig.h#2 integrate .. //depot/projects/hammer/contrib/file/acinclude.m4#2 integrate .. //depot/projects/hammer/contrib/file/aclocal.m4#2 integrate .. //depot/projects/hammer/contrib/file/apprentice.c#2 integrate .. //depot/projects/hammer/contrib/file/ascmagic.c#2 integrate .. //depot/projects/hammer/contrib/file/compress.c#2 integrate .. //depot/projects/hammer/contrib/file/config.h.in#2 integrate .. //depot/projects/hammer/contrib/file/configure#2 integrate .. //depot/projects/hammer/contrib/file/configure.in#2 integrate .. //depot/projects/hammer/contrib/file/file.c#2 integrate .. //depot/projects/hammer/contrib/file/file.h#2 integrate .. //depot/projects/hammer/contrib/file/file.man#2 integrate .. //depot/projects/hammer/contrib/file/fsmagic.c#2 integrate .. //depot/projects/hammer/contrib/file/is_tar.c#2 integrate .. //depot/projects/hammer/contrib/file/magic.man#2 integrate .. //depot/projects/hammer/contrib/file/magic.mime#2 integrate .. //depot/projects/hammer/contrib/file/names.h#2 integrate .. //depot/projects/hammer/contrib/file/patchlevel.h#2 integrate .. //depot/projects/hammer/contrib/file/print.c#2 integrate .. //depot/projects/hammer/contrib/file/readelf.c#2 integrate .. //depot/projects/hammer/contrib/file/readelf.h#2 integrate .. //depot/projects/hammer/contrib/file/softmagic.c#2 integrate .. //depot/projects/hammer/contrib/gcc/ChangeLog#3 integrate .. //depot/projects/hammer/contrib/gcc/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/gcc/c-common.h#2 integrate .. //depot/projects/hammer/contrib/gcc/c-parse.in#2 integrate .. //depot/projects/hammer/contrib/gcc/c-tree.h#2 integrate .. //depot/projects/hammer/contrib/gcc/c-typeck.c#2 integrate .. //depot/projects/hammer/contrib/gcc/calls.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/alpha/alpha.md#2 integrate .. //depot/projects/hammer/contrib/gcc/config/freebsd-spec.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/linux64.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.c#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/rs6000.md#3 integrate .. //depot/projects/hammer/contrib/gcc/config/rs6000/sysv4.h#3 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/linux64.h#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/t-netbsd64#2 integrate .. //depot/projects/hammer/contrib/gcc/configure#3 integrate .. //depot/projects/hammer/contrib/gcc/configure.in#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/ChangeLog#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/cp-lang.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/decl.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/decl2.c#3 integrate .. //depot/projects/hammer/contrib/gcc/cp/parse.y#2 integrate .. //depot/projects/hammer/contrib/gcc/dbxout.c#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/c-tree.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/compat.texi#1 branch .. //depot/projects/hammer/contrib/gcc/doc/cppopts.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/extend.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/gcc.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/invoke.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/makefile.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/rtl.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/standards.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/doc/tm.texi#3 integrate .. //depot/projects/hammer/contrib/gcc/doc/trouble.texi#2 integrate .. //depot/projects/hammer/contrib/gcc/emit-rtl.c#3 integrate .. //depot/projects/hammer/contrib/gcc/expr.h#3 integrate .. //depot/projects/hammer/contrib/gcc/f/ChangeLog#3 integrate .. //depot/projects/hammer/contrib/gcc/f/com.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/target.c#2 integrate .. //depot/projects/hammer/contrib/gcc/f/version.c#3 integrate .. //depot/projects/hammer/contrib/gcc/loop.c#3 integrate .. //depot/projects/hammer/contrib/gcc/optabs.c#3 integrate .. //depot/projects/hammer/contrib/gcc/reload.c#3 integrate .. //depot/projects/hammer/contrib/gcc/sched-deps.c#3 integrate .. //depot/projects/hammer/contrib/gcc/unroll.c#3 integrate .. //depot/projects/hammer/contrib/gcc/version.c#3 integrate .. //depot/projects/hammer/contrib/libf2c/libF77/Version.c#3 integrate .. //depot/projects/hammer/contrib/libf2c/libI77/Version.c#3 integrate .. //depot/projects/hammer/contrib/libf2c/libU77/Version.c#3 integrate .. //depot/projects/hammer/contrib/libstdc++/ChangeLog#3 integrate .. //depot/projects/hammer/contrib/libstdc++/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/libstdc++/acinclude.m4#3 integrate .. //depot/projects/hammer/contrib/libstdc++/aclocal.m4#3 integrate .. //depot/projects/hammer/contrib/libstdc++/config/abi/alphaev67-unknown-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/abi/ia64-unknown-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/cpu/sparc/bits/atomicity.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/locale/generic/c++locale_internal.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/locale/generic/c_locale.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/generic/codecvt_members.cc#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/locale/generic/messages_members.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/c++locale_internal.h#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/c_locale.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/c_locale.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/codecvt_members.cc#1 branch .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/collate_members.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/ctype_members.cc#3 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/messages_members.cc#3 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/messages_members.h#3 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/monetary_members.cc#3 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/numeric_members.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/gnu/time_members.cc#3 integrate .. //depot/projects/hammer/contrib/libstdc++/config/locale/ieee_1003.1-2001/messages_members.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/gnu-linux/bits/ctype_base.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/config/os/gnu-linux/bits/ctype_noninline.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/configure#3 integrate .. //depot/projects/hammer/contrib/libstdc++/configure.target#3 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/c++config#3 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/codecvt.h#2 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/locale_facets.h#3 integrate .. //depot/projects/hammer/contrib/libstdc++/include/bits/locale_facets.tcc#3 integrate .. //depot/projects/hammer/contrib/libstdc++/libmath/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/libstdc++/libmath/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/libstdc++/src/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/libstdc++/src/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/libstdc++/src/bitset.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/codecvt.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/concept-inst.cc#2 integrate .. //depot/projects/hammer/contrib/libstdc++/src/ctype.cc#1 branch .. //depot/projects/hammer/contrib/libstdc++/src/locale.cc#3 integrate .. //depot/projects/hammer/contrib/libstdc++/src/misc-inst.cc#3 integrate .. //depot/projects/hammer/contrib/libstdc++/src/strstream.cc#3 integrate .. //depot/projects/hammer/contrib/libstdc++/src/vterminate.cc#2 integrate .. //depot/projects/hammer/crypto/heimdal/ChangeLog#3 integrate .. //depot/projects/hammer/crypto/heimdal/aclocal.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/admin/add.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/admin/ktutil_locl.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ChangeLog#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/ftp.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/ftp_locl.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/gssapi.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/security.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/kf/kf.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/kf/kf_locl.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/kf/kfd.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/ChangeLog#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/common.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/rsh.1#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/rsh.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/rsh_locl.h#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/rshd.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/su/su.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/ChangeLog#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/libtelnet/enc_des.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/libtelnet/encrypt.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/ChangeLog#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/auth-modules.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/crypto.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/db.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/roken-frag.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/test-package.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/configure#3 integrate .. //depot/projects/hammer/crypto/heimdal/configure.in#3 integrate .. //depot/projects/hammer/crypto/heimdal/doc/ack.texi#2 integrate .. //depot/projects/hammer/crypto/heimdal/doc/install.texi#2 integrate .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-brezak-win2k-krb-rc4-hmac-01.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-brezak-win2k-krb-rc4-hmac-02.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-brezak-win2k-krb-rc4-hmac-03.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-foo#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-foo.ms#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-foo2#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-foo2.ms#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-foo3#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-foo3.ms#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-hornstein-dhc-kerbauth-02.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-horowitz-key-derivation-01.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-gssv2-08.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-gssv2-cbind-04.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-iakerb-04.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerb-chg-password-02.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerb-des3-hmac-sha1-00.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerb-key-derivation-00.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-err-msg-00.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-extra-tgt-02.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-extra-tgt-03.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-cross-01.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-cross-06.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-init-03.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-init-11.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-init-12.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-tapp-03.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-revisions-00.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-revisions-01.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-revisions-03.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-revisions-04.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-revisions-05.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-revisions-06.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-set-passwd-02.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-set-passwd-03.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-krb-dns-locate-00.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-krb-dns-locate-02.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-cat-krb5gss-mech2-03.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-ftpext-mlst-08.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-krb-wg-kerberos-referrals-00.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-ietf-krb-wg-krb-dns-locate-02.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-raeburn-cat-gssapi-krb5-3des-00.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-raeburn-krb-gssapi-krb5-3des-01.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-smedvinsky-dhc-kerbauth-01.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-swift-win2k-krb-referrals-01.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-swift-win2k-krb-user2user-01.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-thomas-snmpv3-kerbusm-00.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-trostle-win2k-cat-kerberos-set-passwd-00.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/draft-tso-telnet-krb5-04.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/rc4-hmac.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/rfc1508.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/rfc1509.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/rfc1510.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/rfc1750.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/rfc1831.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/rfc1964.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/rfc2078.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/rfc2203.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/rfc2228.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/rfc2743.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/doc/standardisation/rfc2744.txt#2 delete .. //depot/projects/hammer/crypto/heimdal/include/Makefile.am#3 integrate .. //depot/projects/hammer/crypto/heimdal/include/Makefile.in#3 integrate .. //depot/projects/hammer/crypto/heimdal/include/config.h.in#3 integrate .. //depot/projects/hammer/crypto/heimdal/include/make_crypto.c#1 branch .. //depot/projects/hammer/crypto/heimdal/kadmin/ChangeLog#3 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/kadmin_locl.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/load.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/server.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/version4.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/headers.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/hprop.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kaserver.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kerberos5.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/kpasswd/kpasswd_locl.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/kinit.1#3 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/kinit.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/der_get.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/gen.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/k5.asn1#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/pam/pam.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/ChangeLog#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/init_sec_context.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/unwrap.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/wrap.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/common.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/hdb-ldap.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/hdb_locl.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/Makefile.am#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/Makefile.in#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/auth_context.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/build_ap_req.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/build_auth.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/changepw.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/config_file.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/context.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/crypto.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/get_cred.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/get_for_creds.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/get_in_tkt.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/keytab_keyfile.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5-protos.h#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5.h#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_appdefault.3#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_auth_context.3#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_context.3#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_init_context.3#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_locl.h#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_parse_name.3#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5_unparse_name.3#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/kuserok.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/log.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/mk_error.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/mk_priv.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/mk_rep.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/mk_req_ext.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/mk_safe.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/name-45-test.c#1 branch .. //depot/projects/hammer/crypto/heimdal/lib/krb5/prompter_posix.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/rd_cred.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/rd_safe.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/sendauth.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/transited.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/ChangeLog#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/Makefile.am#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/Makefile.in#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/getifaddrs.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/getnameinfo_verified.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/parse_reply-test.c#1 branch .. //depot/projects/hammer/crypto/heimdal/lib/roken/resolve.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/roken-common.h#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/roken.awk#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/rtbl.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/tools/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/tools/Makefile.in#3 integrate .. //depot/projects/hammer/crypto/heimdal/tools/krb5-config.in#2 integrate .. //depot/projects/hammer/etc/MAKEDEV#3 integrate .. //depot/projects/hammer/etc/Makefile#2 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#2 integrate .. //depot/projects/hammer/etc/mtree/BSD.x11-4.dist#2 integrate .. //depot/projects/hammer/etc/newsyslog.conf#2 integrate .. //depot/projects/hammer/etc/rc#3 integrate .. //depot/projects/hammer/etc/rc.d/amd#3 integrate .. //depot/projects/hammer/etc/rc.d/ldconfig#3 integrate .. //depot/projects/hammer/etc/rc.d/network1#2 integrate .. //depot/projects/hammer/etc/rc.d/nfsclient#2 integrate .. //depot/projects/hammer/etc/rc.d/sendmail#3 integrate .. //depot/projects/hammer/etc/rc.network#3 integrate .. //depot/projects/hammer/etc/rc.shutdown#2 integrate .. //depot/projects/hammer/etc/rc.subr#3 integrate .. //depot/projects/hammer/etc/syslog.conf#2 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2#3 integrate .. //depot/projects/hammer/gnu/lib/Makefile#2 integrate .. //depot/projects/hammer/gnu/lib/libgcc/Makefile#2 integrate .. //depot/projects/hammer/gnu/lib/libstdc++/Makefile#3 integrate .. //depot/projects/hammer/gnu/usr.bin/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/as/CONTRIBUTORS#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/COPYING#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/ChangeLog#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/Makefile#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/Makefile.in#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/NOTES#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/NOTES.config#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/README#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/README-vms#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/README.coff#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/README.pic#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/README.rich#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/VERSION#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/app.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/as.1#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/as.1aout#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/as.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/as.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/atof-generic.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/bignum-copy.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/bignum.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/bit_fix.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/cond.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config-gas.com#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/Makefile.hp300#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/Makefile.i386#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/Makefile.pc532#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/Makefile.sparc#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/Makefile.vax#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/aout.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/atof-ieee.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/atof-ns32k.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/atof-tahoe.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/atof-vax.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/coff.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/cplus-dem.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-ansi.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-decstation.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-generic.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-hpux.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-i386.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-i386aix.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-rs6000.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-sun3.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-sun386.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-sun4.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-sunos.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-sysv.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-vax.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/ho-vms.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/mh-i386#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/mh-i386aix#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/mh-i386v4#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/mt-ebmon29k#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/mt-h8300#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/mt-h8300hds#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/mt-i386aix#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/mt-mips#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/mt-rs6000#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-aout.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-aout.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-bfd-sunos.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-bfd-sunos.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-bout.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-bout.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-coff.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-coff.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-coffbfd.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-coffbfd.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-generic.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-generic.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-ieee.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-ieee.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-vms.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/obj-vms.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-a29k.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-a29k.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-generic.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-generic.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-h8300.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-h8300.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-i386.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-i386.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-i860.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-i860.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-i960.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-i960.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-m68851.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-m68k.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-m68k.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-m68kmote.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-m88k.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-m88k.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-mips.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-mips.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-ns32k.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-ns32k.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-rs6000.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-rs6000.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-sparc.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-sparc.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-tahoe.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-tahoe.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-vax.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/tc-vax.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/te-dpx2.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/te-generic.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/te-hpux.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/te-i386aix.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/te-ic960.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/te-sco386.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/te-sequent.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/te-sun3.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/te-sysv32.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/config/vax-inst.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/configdos.bat#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/configure.in#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/debug.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/expr.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/expr.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/flo-const.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/flo-copy.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/flonum-mult.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/flonum.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/frags.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/frags.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/gas-format.el#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/hash.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/hash.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/hex-value.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/input-file.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/input-file.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/input-scrub.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/link.cmd#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/listing.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/listing.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/make-gas.com#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/makefile.dos#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/messages.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/obj.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/obstack.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/obstack.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/ChangeLog#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/a29k.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/h8300.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/i386.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/i860.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/i960.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/m68k.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/m88k.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/mips.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/np1.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/ns32k.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/pn.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/pyr.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/sparc.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/tahoe.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/opcode/vax.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/output-file.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/output-file.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/read.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/read.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/struc-symbol.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/subsegs.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/subsegs.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/symbols.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/symbols.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/tc.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/testscripts/doboth#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/testscripts/doobjcmp#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/testscripts/dostriptest#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/testscripts/dotest#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/testscripts/dounsortreloc#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/testscripts/dounsortsymbols#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/version.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/write.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/write.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/xmalloc.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/as/xrealloc.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/Makefile.tgt#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/c++filt/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_int/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/auto-host.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/include/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/grep.1#3 integrate .. //depot/projects/hammer/gnu/usr.bin/grep/grep.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gzip/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gzip/match.S#2 integrate .. //depot/projects/hammer/gnu/usr.bin/ld/Makefile#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/PORTING#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/cplus-dem.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/demangle.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/ld.1#3 delete .. //depot/projects/hammer/gnu/usr.bin/ld/ld.1aout#3 delete .. //depot/projects/hammer/gnu/usr.bin/ld/ld.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/ld.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/lib.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/rrs.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/sparc/md-static-funcs.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/sparc/md.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/sparc/md.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/sparc/mdprologue.S#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/symbol.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/symseg.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/warnings.c#2 delete .. //depot/projects/hammer/gnu/usr.bin/ld/xbits.c#2 delete .. //depot/projects/hammer/include/Makefile#2 integrate .. //depot/projects/hammer/include/dirent.h#3 integrate .. //depot/projects/hammer/include/dlfcn.h#2 integrate .. //depot/projects/hammer/include/fnmatch.h#2 integrate .. //depot/projects/hammer/include/grp.h#3 integrate .. //depot/projects/hammer/include/iso646.h#2 integrate .. //depot/projects/hammer/include/langinfo.h#2 integrate .. //depot/projects/hammer/include/link.h#3 integrate .. //depot/projects/hammer/include/monetary.h#3 integrate .. //depot/projects/hammer/include/nl_types.h#2 integrate .. //depot/projects/hammer/include/stdlib.h#3 integrate .. //depot/projects/hammer/include/wchar.h#3 integrate .. //depot/projects/hammer/kerberos5/include/config.h#3 integrate .. //depot/projects/hammer/kerberos5/include/crypto-headers.h#1 branch .. //depot/projects/hammer/kerberos5/include/version.h#3 integrate .. //depot/projects/hammer/kerberos5/libexec/ipropd-master/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/libexec/ipropd-slave/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/libexec/k5admind/Makefile#2 integrate .. //depot/projects/hammer/kerberos5/usr.bin/krb5-config/Makefile#3 integrate .. //depot/projects/hammer/lib/Makefile#2 integrate .. //depot/projects/hammer/lib/csu/sparc64/crt1.c#3 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/infinity.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/gen/_pthread_stubs.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/confstr.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/dlfunc.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/dlopen.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/getcontext.3#1 branch .. //depot/projects/hammer/lib/libc/gen/getobjformat.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/makecontext.3#1 branch .. //depot/projects/hammer/lib/libc/gen/swapcontext.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/ucontext.3#1 branch .. //depot/projects/hammer/lib/libc/gmon/gmon.c#2 integrate .. //depot/projects/hammer/lib/libc/i386/SYS.h#2 integrate .. //depot/projects/hammer/lib/libc/i386/gen/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/i386/gen/getcontext.S#2 integrate .. //depot/projects/hammer/lib/libc/i386/gen/infinity.c#2 integrate .. //depot/projects/hammer/lib/libc/i386/gen/makecontext.c#3 integrate .. //depot/projects/hammer/lib/libc/i386/gen/signalcontext.c#1 branch .. //depot/projects/hammer/lib/libc/ia64/gen/infinity.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/locale/frune.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/mbrune.3#2 integrate .. //depot/projects/hammer/lib/libc/locale/mbrune.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/rune.3#2 integrate .. //depot/projects/hammer/lib/libc/locale/wcsftime.3#1 branch .. //depot/projects/hammer/lib/libc/locale/wcsftime.c#1 branch .. //depot/projects/hammer/lib/libc/locale/wcstod.3#1 branch .. //depot/projects/hammer/lib/libc/locale/wcstod.c#1 branch .. //depot/projects/hammer/lib/libc/locale/wcstol.3#2 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#3 integrate .. //depot/projects/hammer/lib/libc/net/gethostbydns.c#2 integrate .. //depot/projects/hammer/lib/libc/net/getnetbydns.c#2 integrate .. //depot/projects/hammer/lib/libc/net/hesiod.c#2 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#2 integrate .. //depot/projects/hammer/lib/libc/net/res_mkquery.c#2 integrate .. //depot/projects/hammer/lib/libc/net/res_query.c#2 integrate .. //depot/projects/hammer/lib/libc/net/res_update.c#2 integrate .. //depot/projects/hammer/lib/libc/rpc/rpc_clnt_create.3#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/fabs.S#1 branch .. //depot/projects/hammer/lib/libc/sparc64/gen/fpgetmask.c#1 branch .. //depot/projects/hammer/lib/libc/sparc64/gen/fpgetround.c#1 branch .. //depot/projects/hammer/lib/libc/sparc64/gen/fpgetsticky.c#1 branch .. //depot/projects/hammer/lib/libc/sparc64/gen/fpsetmask.c#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/fpsetround.c#1 branch .. //depot/projects/hammer/lib/libc/sparc64/gen/fpsetsticky.c#1 branch .. //depot/projects/hammer/lib/libc/sparc64/gen/infinity.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetwc.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fgetws.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fputwc.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/fputws.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/local.h#3 integrate .. //depot/projects/hammer/lib/libc/stdio/printf.3#3 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetwc.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/vfprintf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/vsnprintf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/_Exit.c#1 branch .. //depot/projects/hammer/lib/libc/stdlib/exit.3#3 integrate .. //depot/projects/hammer/lib/libc/stdlib/qsort.3#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/qsort_r.c#1 branch .. //depot/projects/hammer/lib/libc/stdlib/strfmon.3#2 integrate .. //depot/projects/hammer/lib/libc/stdlib/strfmon.c#2 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/sys/sem.c#1 branch .. //depot/projects/hammer/lib/libc/sys/sigaction.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/sigaltstack.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/sigreturn.2#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_kern.c#3 integrate .. //depot/projects/hammer/lib/libcam/scsi_cmdparse.c#2 integrate .. //depot/projects/hammer/lib/libdevinfo/devinfo.3#2 integrate .. //depot/projects/hammer/lib/libdevinfo/devinfo.c#2 integrate .. //depot/projects/hammer/lib/libdevinfo/devinfo.h#3 integrate .. //depot/projects/hammer/lib/libdevinfo/devinfo_var.h#2 integrate .. //depot/projects/hammer/lib/libfetch/common.c#2 integrate .. //depot/projects/hammer/lib/libfetch/ftp.c#2 integrate .. //depot/projects/hammer/lib/libkvm/kvm.c#2 integrate .. //depot/projects/hammer/lib/libkvm/kvm_proc.c#3 integrate .. //depot/projects/hammer/lib/libmd/Makefile#2 integrate .. //depot/projects/hammer/lib/libncurses/Makefile#3 integrate .. //depot/projects/hammer/lib/libpam/libpam/Makefile#2 integrate .. //depot/projects/hammer/lib/libpthread/Makefile#1 branch .. //depot/projects/hammer/lib/libpthread/arch/alpha/alpha/_atomic_lock.S#1 branch .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/_atomic_lock.S#1 branch .. //depot/projects/hammer/lib/libpthread/arch/ia64/ia64/_atomic_lock.S#1 branch .. //depot/projects/hammer/lib/libpthread/man/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_attr.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_cancel.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_cleanup_pop.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_cleanup_push.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_broadcast.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_destroy.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_init.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_signal.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_timedwait.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_cond_wait.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_condattr.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_create.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_detach.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_equal.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_exit.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_getspecific.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_join.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_key_create.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_key_delete.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_kill.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_destroy.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_init.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_lock.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_trylock.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_mutex_unlock.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_mutexattr.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_once.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_destroy.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_init.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_rdlock.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_unlock.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlock_wrlock.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_destroy.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_getpshared.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_init.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_rwlockattr_setpshared.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_schedparam.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_self.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_setspecific.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_sigmask.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/pthread_testcancel.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/sem_destroy.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/sem_getvalue.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/sem_init.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/sem_open.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/sem_post.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/sem_wait.3#1 branch .. //depot/projects/hammer/lib/libpthread/man/sigwait.3#1 branch .. //depot/projects/hammer/lib/libpthread/sys/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libpthread/sys/thr_error.c#1 branch .. //depot/projects/hammer/lib/libpthread/test/Makefile#1 branch .. //depot/projects/hammer/lib/libpthread/test/README#1 branch .. //depot/projects/hammer/lib/libpthread/test/guard_b.c#1 branch .. //depot/projects/hammer/lib/libpthread/test/guard_b.exp#1 branch .. //depot/projects/hammer/lib/libpthread/test/guard_s.pl#1 branch .. //depot/projects/hammer/lib/libpthread/test/hello_b.c#1 branch .. //depot/projects/hammer/lib/libpthread/test/hello_d.c#1 branch .. //depot/projects/hammer/lib/libpthread/test/hello_d.exp#1 branch .. //depot/projects/hammer/lib/libpthread/test/hello_s.c#1 branch .. //depot/projects/hammer/lib/libpthread/test/join_leak_d.c#1 branch .. //depot/projects/hammer/lib/libpthread/test/join_leak_d.exp#1 branch .. //depot/projects/hammer/lib/libpthread/test/mutex_d.c#1 branch .. //depot/projects/hammer/lib/libpthread/test/mutex_d.exp#1 branch .. //depot/projects/hammer/lib/libpthread/test/propagate_s.pl#1 branch .. //depot/projects/hammer/lib/libpthread/test/sem_d.c#1 branch .. //depot/projects/hammer/lib/libpthread/test/sem_d.exp#1 branch .. //depot/projects/hammer/lib/libpthread/test/sigsuspend_d.c#1 branch .. //depot/projects/hammer/lib/libpthread/test/sigsuspend_d.exp#1 branch .. //depot/projects/hammer/lib/libpthread/test/sigwait_d.c#1 branch .. //depot/projects/hammer/lib/libpthread/test/sigwait_d.exp#1 branch .. //depot/projects/hammer/lib/libpthread/test/verify#1 branch .. //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_acl_aclcheck_fd.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_aio_suspend.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_destroy.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getdetachstate.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getguardsize.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getinheritsched.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getschedparam.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getschedpolicy.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getscope.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getstackaddr.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_getstacksize.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_init.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setdetachstate.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setguardsize.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setinheritsched.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setschedparam.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setschedpolicy.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setscope.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setstackaddr.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_attr_setstacksize.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_autoinit.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_clean.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_close.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_condattr_init.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_creat.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_detach.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_equal.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_exit.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_fcntl.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_find_thread.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_fork.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_fsync.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_gc.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_getprio.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_getschedparam.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_info.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_join.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_kill.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_main_np.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_mattr_init.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_msync.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_multi_np.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_nanosleep.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_once.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_open.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_pause.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_poll.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_priority_queue.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_pselect.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_read.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_readv.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_resume_np.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_rwlock.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_rwlockattr.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_select.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_self.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_sem.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_seterrno.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_setprio.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_setschedparam.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_sigaction.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_sigmask.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_sigpending.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_sigprocmask.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_single_np.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_sleep.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_spec.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_spinlock.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_stack.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_suspend_np.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_switch_np.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_system.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_tcdrain.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_vfork.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_wait.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_wait4.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_waitpid.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_write.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_writev.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_yield.c#1 branch .. //depot/projects/hammer/lib/liby/Makefile#2 integrate .. //depot/projects/hammer/lib/msun/src/math.h#2 integrate .. //depot/projects/hammer/libexec/Makefile#3 integrate .. //depot/projects/hammer/libexec/rtld-aout/shlib.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/hammer/release/Makefile#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/hammer/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/hammer/release/i386/dokern.sh#3 integrate .. //depot/projects/hammer/release/pc98/dokern.sh#2 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#2 integrate .. //depot/projects/hammer/sbin/disklabel/disklabel.c#3 integrate .. //depot/projects/hammer/sbin/fdisk/fdisk.c#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/Makefile#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/ea.c#1 branch .. //depot/projects/hammer/sbin/fsck_ffs/fsck.h#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass1.c#3 integrate .. //depot/projects/hammer/sbin/fsdb/Makefile#2 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.c#2 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#3 integrate .. //depot/projects/hammer/sbin/nos-tun/nos-tun.c#2 integrate .. //depot/projects/hammer/sbin/ping/ping.c#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.inc#2 integrate .. //depot/projects/hammer/secure/lib/libssl/Makefile#2 integrate .. //depot/projects/hammer/share/man/man3/Makefile#2 integrate .. //depot/projects/hammer/share/man/man3/stdarg.3#2 integrate .. //depot/projects/hammer/share/man/man4/ata.4#2 integrate .. //depot/projects/hammer/share/man/man4/firewire.4#1 branch .. //depot/projects/hammer/share/man/man4/fwohci.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.i386/viapm.4#2 integrate .. //depot/projects/hammer/share/man/man4/sbp.4#1 branch .. //depot/projects/hammer/share/man/man4/stf.4#2 integrate .. //depot/projects/hammer/share/man/man7/stdint.7#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_ACCESS.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_ACLCHECK.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_ATTRIB.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_CREATE.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_GETACL.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_GETEXTATTR.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_LINK.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_LOOKUP.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_READDIR.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_READLINK.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_REMOVE.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_RENAME.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_SETACL.9#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_SETEXTATTR.9#2 integrate .. //depot/projects/hammer/share/man/man9/getnewvnode.9#2 integrate .. //depot/projects/hammer/share/man/man9/mbuf.9#2 integrate .. //depot/projects/hammer/share/man/man9/style.9#3 integrate .. //depot/projects/hammer/share/misc/pci_vendors#3 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/hammer/share/mk/bsd.dep.mk#2 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#2 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#2 integrate .. //depot/projects/hammer/share/mk/bsd.prog.mk#2 integrate .. //depot/projects/hammer/share/mk/sys.mk#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/autoconf.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/db_trace.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/setdef0.c#2 delete .. //depot/projects/hammer/sys/alpha/alpha/setdef1.c#2 delete .. //depot/projects/hammer/sys/alpha/alpha/trap.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#3 integrate .. //depot/projects/hammer/sys/alpha/include/asm.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/param.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/stdarg.h#3 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_genassym.c#2 integrate .. //depot/projects/hammer/sys/alpha/linux/linux_machdep.c#2 integrate .. //depot/projects/hammer/sys/arm/include/param.h#2 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/i386/btx/btxldr/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/i386/btx/lib/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/i386/cdboot/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/i386/kgzldr/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/i386/kgzldr/crt.s#2 integrate .. //depot/projects/hammer/sys/boot/i386/kgzldr/kgzldr.m4#2 delete .. //depot/projects/hammer/sys/boot/i386/kgzldr/sio.s#2 integrate .. //depot/projects/hammer/sys/boot/i386/kgzldr/start.s#2 integrate .. //depot/projects/hammer/sys/boot/i386/liloldr/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/i386/mbr/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/i386/pxeldr/Makefile#3 integrate .. //depot/projects/hammer/sys/boot/pc98/btx/btx/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/pc98/btx/btxldr/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/pc98/btx/lib/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/pc98/kgzldr/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/hammer/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#2 integrate .. //depot/projects/hammer/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/hammer/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/hammer/sys/conf/NOTES#3 integrate .. //depot/projects/hammer/sys/conf/files#3 integrate .. //depot/projects/hammer/sys/conf/files.alpha#3 integrate .. //depot/projects/hammer/sys/conf/files.i386#3 integrate .. //depot/projects/hammer/sys/conf/files.pc98#3 integrate .. //depot/projects/hammer/sys/conf/files.powerpc#2 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#3 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#2 integrate .. //depot/projects/hammer/sys/conf/options#3 integrate .. //depot/projects/hammer/sys/conf/options.pc98#3 integrate .. //depot/projects/hammer/sys/conf/options.powerpc#2 integrate .. //depot/projects/hammer/sys/contrib/dev/fla/fla.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_elf.c#2 integrate .. //depot/projects/hammer/sys/ddb/db_ps.c#3 integrate .. //depot/projects/hammer/sys/ddb/ddb.h#2 integrate .. //depot/projects/hammer/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/hammer/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/hammer/sys/dev/amr/amr_disk.c#2 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-all.c#3 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/hammer/sys/dev/ccd/ccd.c#2 integrate .. //depot/projects/hammer/sys/dev/ct/ct_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/firewire/00README#1 branch .. //depot/projects/hammer/sys/dev/firewire/bus_mgm.c#1 branch .. //depot/projects/hammer/sys/dev/firewire/firewire.c#1 branch .. //depot/projects/hammer/sys/dev/firewire/firewire.h#1 branch .. //depot/projects/hammer/sys/dev/firewire/firewire_phy.h#1 branch .. //depot/projects/hammer/sys/dev/firewire/firewirebusreg.h#1 branch .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#1 branch .. //depot/projects/hammer/sys/dev/firewire/fw_tap.c#1 branch .. //depot/projects/hammer/sys/dev/firewire/fwmem.c#1 branch .. //depot/projects/hammer/sys/dev/firewire/fwmem.h#1 branch .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#1 branch .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#1 branch .. //depot/projects/hammer/sys/dev/firewire/fwohcireg.h#1 branch .. //depot/projects/hammer/sys/dev/firewire/fwohcivar.h#1 branch .. //depot/projects/hammer/sys/dev/firewire/iec13213.h#1 branch .. //depot/projects/hammer/sys/dev/firewire/iec68113.h#1 branch .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#1 branch .. //depot/projects/hammer/sys/dev/firewire/if_fwevar.h#1 branch .. //depot/projects/hammer/sys/dev/firewire/sbp.c#1 branch .. //depot/projects/hammer/sys/dev/ida/ida_disk.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 18: 0:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D8CA237B407; Fri, 20 Sep 2002 18:00:48 -0700 (PDT) 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 1A0BD37B401 for ; Fri, 20 Sep 2002 18:00:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B574643E65 for ; Fri, 20 Sep 2002 18:00:43 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L10hCo060524 for ; Fri, 20 Sep 2002 18:00:43 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L10hSf060515 for perforce@freebsd.org; Fri, 20 Sep 2002 18:00:43 -0700 (PDT) Date: Fri, 20 Sep 2002 18:00:43 -0700 (PDT) Message-Id: <200209210100.g8L10hSf060515@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17789 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17789 Change 17789 by peter@peter_daintree on 2002/09/20 18:00:18 test out prototype i386_hammer branch as a means of (very) selectively pulling in i386 baseline code and tracking it. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 18: 8:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A94337B404; Fri, 20 Sep 2002 18:08:55 -0700 (PDT) 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 ED76C37B401 for ; Fri, 20 Sep 2002 18:08:54 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8690A43E4A for ; Fri, 20 Sep 2002 18:08:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L18sCo066368 for ; Fri, 20 Sep 2002 18:08:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L18suB066365 for perforce@freebsd.org; Fri, 20 Sep 2002 18:08:54 -0700 (PDT) Date: Fri, 20 Sep 2002 18:08:54 -0700 (PDT) Message-Id: <200209210108.g8L18suB066365@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17791 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17791 Change 17791 by peter@peter_daintree on 2002/09/20 18:08:43 collect some more low hanging fruit Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/atomic.c#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/busdma_machdep.c#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/critical.c#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/elf_machdep.c#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/in_cksum.c#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/mem.c#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#1 branch .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 18:45:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7B6037B404; Fri, 20 Sep 2002 18:45:40 -0700 (PDT) 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 8025537B401 for ; Fri, 20 Sep 2002 18:45:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1ECF943E42 for ; Fri, 20 Sep 2002 18:45:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L1jeCo075406 for ; Fri, 20 Sep 2002 18:45:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L1jdAX075403 for perforce@freebsd.org; Fri, 20 Sep 2002 18:45:39 -0700 (PDT) Date: Fri, 20 Sep 2002 18:45:39 -0700 (PDT) Message-Id: <200209210145.g8L1jdAX075403@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17793 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17793 Change 17793 by peter@peter_daintree on 2002/09/20 18:44:56 pick up some more stuff here Affected files ... .. //depot/projects/hammer/sys/x86_64/include/_inttypes.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/asm.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/asmacros.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/atomic.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/bus.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/bus_at386.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/bus_dma.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/bus_memio.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/bus_pio.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/clock.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/cpu.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/cpufunc.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/critical.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/elf.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/float.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/floatingpoint.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/frame.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/in_cksum.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/kse.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/md_var.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/mutex.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/nexusvar.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/npx.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/pcb.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/pcb_ext.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/pci_cfgreg.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/pcpu.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/pmap.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/proc.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/psl.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/reg.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/reloc.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/resource.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/runq.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/segments.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/setjmp.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/sigframe.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/signal.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/specialreg.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/sysarch.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/trap.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/tss.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/ucontext.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/varargs.h#1 branch .. //depot/projects/hammer/sys/x86_64/include/vmparam.h#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 18:52:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB8A337B404; Fri, 20 Sep 2002 18:52:49 -0700 (PDT) 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 6A59A37B401 for ; Fri, 20 Sep 2002 18:52:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2721143E6A for ; Fri, 20 Sep 2002 18:52:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L1qnCo077368 for ; Fri, 20 Sep 2002 18:52:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L1qmpH077361 for perforce@freebsd.org; Fri, 20 Sep 2002 18:52:48 -0700 (PDT) Date: Fri, 20 Sep 2002 18:52:48 -0700 (PDT) Message-Id: <200209210152.g8L1qmpH077361@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17794 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17794 Change 17794 by peter@peter_daintree on 2002/09/20 18:52:39 pick up some more stuff. Affected files ... .. //depot/projects/hammer/sys/x86_64/Makefile#1 branch .. //depot/projects/hammer/sys/x86_64/acpica/Makefile#1 branch .. //depot/projects/hammer/sys/x86_64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/hammer/sys/x86_64/acpica/acpi_machdep.c#1 branch .. //depot/projects/hammer/sys/x86_64/acpica/acpi_wakecode.S#1 branch .. //depot/projects/hammer/sys/x86_64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/hammer/sys/x86_64/acpica/genwakecode.sh#1 branch .. //depot/projects/hammer/sys/x86_64/conf/GENERIC.hints#1 branch .. //depot/projects/hammer/sys/x86_64/conf/Makefile#1 branch .. //depot/projects/hammer/sys/x86_64/conf/gethints.awk#1 branch .. //depot/projects/hammer/sys/x86_64/isa/clock.c#1 branch .. //depot/projects/hammer/sys/x86_64/isa/icu.h#1 branch .. //depot/projects/hammer/sys/x86_64/isa/icu_ipl.s#1 branch .. //depot/projects/hammer/sys/x86_64/isa/icu_vector.s#1 branch .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#1 branch .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.h#1 branch .. //depot/projects/hammer/sys/x86_64/isa/isa.c#1 branch .. //depot/projects/hammer/sys/x86_64/isa/isa.h#1 branch .. //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#1 branch .. //depot/projects/hammer/sys/x86_64/isa/isa_dma.h#1 branch .. //depot/projects/hammer/sys/x86_64/isa/ithread.c#1 branch .. //depot/projects/hammer/sys/x86_64/isa/npx.c#1 branch .. //depot/projects/hammer/sys/x86_64/isa/timerreg.h#1 branch .. //depot/projects/hammer/sys/x86_64/isa/vector.s#1 branch .. //depot/projects/hammer/sys/x86_64/pci/pci_bus.c#1 branch .. //depot/projects/hammer/sys/x86_64/pci/pci_cfgreg.c#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19: 0: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9D2537B404; Fri, 20 Sep 2002 18:59:58 -0700 (PDT) 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 AD0B737B401 for ; Fri, 20 Sep 2002 18:59:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4FF8B43E3B for ; Fri, 20 Sep 2002 18:59:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L1xwCo078553 for ; Fri, 20 Sep 2002 18:59:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L1xvE2078550 for perforce@freebsd.org; Fri, 20 Sep 2002 18:59:57 -0700 (PDT) Date: Fri, 20 Sep 2002 18:59:57 -0700 (PDT) Message-Id: <200209210159.g8L1xvE2078550@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17795 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17795 Change 17795 by peter@peter_daintree on 2002/09/20 18:59:41 initial guesses as what is needed here. int64_t's are %ld, not %lld, and intptr_t's are %ld, not %d Affected files ... .. //depot/projects/hammer/sys/x86_64/include/_inttypes.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/_inttypes.h#2 (text+ko) ==== @@ -49,172 +49,172 @@ #define PRId8 "d" /* int8_t */ #define PRId16 "d" /* int16_t */ #define PRId32 "d" /* int32_t */ -#define PRId64 "lld" /* int64_t */ +#define PRId64 "ld" /* int64_t */ #define PRIdLEAST8 "d" /* int_least8_t */ #define PRIdLEAST16 "d" /* int_least16_t */ #define PRIdLEAST32 "d" /* int_least32_t */ -#define PRIdLEAST64 "lld" /* int_least64_t */ +#define PRIdLEAST64 "ld" /* int_least64_t */ #define PRIdFAST8 "d" /* int_fast8_t */ #define PRIdFAST16 "d" /* int_fast16_t */ #define PRIdFAST32 "d" /* int_fast32_t */ -#define PRIdFAST64 "lld" /* int_fast64_t */ +#define PRIdFAST64 "ld" /* int_fast64_t */ #define PRIdMAX "jd" /* intmax_t */ -#define PRIdPTR "d" /* intptr_t */ +#define PRIdPTR "ld" /* intptr_t */ #define PRIi8 "i" /* int8_t */ #define PRIi16 "i" /* int16_t */ #define PRIi32 "i" /* int32_t */ -#define PRIi64 "lli" /* int64_t */ +#define PRIi64 "li" /* int64_t */ #define PRIiLEAST8 "i" /* int_least8_t */ #define PRIiLEAST16 "i" /* int_least16_t */ #define PRIiLEAST32 "i" /* int_least32_t */ -#define PRIiLEAST64 "lli" /* int_least64_t */ +#define PRIiLEAST64 "li" /* int_least64_t */ #define PRIiFAST8 "i" /* int_fast8_t */ #define PRIiFAST16 "i" /* int_fast16_t */ #define PRIiFAST32 "i" /* int_fast32_t */ -#define PRIiFAST64 "lli" /* int_fast64_t */ +#define PRIiFAST64 "li" /* int_fast64_t */ #define PRIiMAX "ji" /* intmax_t */ -#define PRIiPTR "i" /* intptr_t */ +#define PRIiPTR "li" /* intptr_t */ /* fprintf(3) macros for unsigned integers. */ #define PRIo8 "o" /* uint8_t */ #define PRIo16 "o" /* uint16_t */ #define PRIo32 "o" /* uint32_t */ -#define PRIo64 "llo" /* uint64_t */ +#define PRIo64 "lo" /* uint64_t */ #define PRIoLEAST8 "o" /* uint_least8_t */ #define PRIoLEAST16 "o" /* uint_least16_t */ #define PRIoLEAST32 "o" /* uint_least32_t */ -#define PRIoLEAST64 "llo" /* uint_least64_t */ +#define PRIoLEAST64 "lo" /* uint_least64_t */ #define PRIoFAST8 "o" /* uint_fast8_t */ #define PRIoFAST16 "o" /* uint_fast16_t */ #define PRIoFAST32 "o" /* uint_fast32_t */ -#define PRIoFAST64 "llo" /* uint_fast64_t */ +#define PRIoFAST64 "lo" /* uint_fast64_t */ #define PRIoMAX "jo" /* uintmax_t */ -#define PRIoPTR "o" /* uintptr_t */ +#define PRIoPTR "lo" /* uintptr_t */ #define PRIu8 "u" /* uint8_t */ #define PRIu16 "u" /* uint16_t */ #define PRIu32 "u" /* uint32_t */ -#define PRIu64 "llu" /* uint64_t */ +#define PRIu64 "lu" /* uint64_t */ #define PRIuLEAST8 "u" /* uint_least8_t */ #define PRIuLEAST16 "u" /* uint_least16_t */ #define PRIuLEAST32 "u" /* uint_least32_t */ -#define PRIuLEAST64 "llu" /* uint_least64_t */ +#define PRIuLEAST64 "lu" /* uint_least64_t */ #define PRIuFAST8 "u" /* uint_fast8_t */ #define PRIuFAST16 "u" /* uint_fast16_t */ #define PRIuFAST32 "u" /* uint_fast32_t */ -#define PRIuFAST64 "llu" /* uint_fast64_t */ +#define PRIuFAST64 "lu" /* uint_fast64_t */ #define PRIuMAX "ju" /* uintmax_t */ -#define PRIuPTR "u" /* uintptr_t */ +#define PRIuPTR "lu" /* uintptr_t */ #define PRIx8 "x" /* uint8_t */ #define PRIx16 "x" /* uint16_t */ #define PRIx32 "x" /* uint32_t */ -#define PRIx64 "llx" /* uint64_t */ +#define PRIx64 "lx" /* uint64_t */ #define PRIxLEAST8 "x" /* uint_least8_t */ #define PRIxLEAST16 "x" /* uint_least16_t */ #define PRIxLEAST32 "x" /* uint_least32_t */ -#define PRIxLEAST64 "llx" /* uint_least64_t */ +#define PRIxLEAST64 "lx" /* uint_least64_t */ #define PRIxFAST8 "x" /* uint_fast8_t */ #define PRIxFAST16 "x" /* uint_fast16_t */ #define PRIxFAST32 "x" /* uint_fast32_t */ -#define PRIxFAST64 "llx" /* uint_fast64_t */ +#define PRIxFAST64 "lx" /* uint_fast64_t */ #define PRIxMAX "jx" /* uintmax_t */ -#define PRIxPTR "x" /* uintptr_t */ +#define PRIxPTR "lx" /* uintptr_t */ #define PRIX8 "X" /* uint8_t */ #define PRIX16 "X" /* uint16_t */ #define PRIX32 "X" /* uint32_t */ -#define PRIX64 "llX" /* uint64_t */ +#define PRIX64 "lX" /* uint64_t */ #define PRIXLEAST8 "X" /* uint_least8_t */ #define PRIXLEAST16 "X" /* uint_least16_t */ #define PRIXLEAST32 "X" /* uint_least32_t */ -#define PRIXLEAST64 "llX" /* uint_least64_t */ +#define PRIXLEAST64 "lX" /* uint_least64_t */ #define PRIXFAST8 "X" /* uint_fast8_t */ #define PRIXFAST16 "X" /* uint_fast16_t */ #define PRIXFAST32 "X" /* uint_fast32_t */ -#define PRIXFAST64 "llX" /* uint_fast64_t */ +#define PRIXFAST64 "lX" /* uint_fast64_t */ #define PRIXMAX "jX" /* uintmax_t */ -#define PRIXPTR "X" /* uintptr_t */ +#define PRIXPTR "lX" /* uintptr_t */ /* fscanf(3) macros for signed integers. */ #define SCNd8 "hhd" /* int8_t */ #define SCNd16 "hd" /* int16_t */ #define SCNd32 "d" /* int32_t */ -#define SCNd64 "lld" /* int64_t */ +#define SCNd64 "ld" /* int64_t */ #define SCNdLEAST8 "hhd" /* int_least8_t */ #define SCNdLEAST16 "hd" /* int_least16_t */ #define SCNdLEAST32 "d" /* int_least32_t */ -#define SCNdLEAST64 "lld" /* int_least64_t */ +#define SCNdLEAST64 "ld" /* int_least64_t */ #define SCNdFAST8 "d" /* int_fast8_t */ #define SCNdFAST16 "d" /* int_fast16_t */ #define SCNdFAST32 "d" /* int_fast32_t */ -#define SCNdFAST64 "lld" /* int_fast64_t */ +#define SCNdFAST64 "ld" /* int_fast64_t */ #define SCNdMAX "jd" /* intmax_t */ -#define SCNdPTR "d" /* intptr_t */ +#define SCNdPTR "ld" /* intptr_t */ #define SCNi8 "hhi" /* int8_t */ #define SCNi16 "hi" /* int16_t */ #define SCNi32 "i" /* int32_t */ -#define SCNi64 "lli" /* int64_t */ +#define SCNi64 "li" /* int64_t */ #define SCNiLEAST8 "hhi" /* int_least8_t */ #define SCNiLEAST16 "hi" /* int_least16_t */ #define SCNiLEAST32 "i" /* int_least32_t */ -#define SCNiLEAST64 "lli" /* int_least64_t */ +#define SCNiLEAST64 "li" /* int_least64_t */ #define SCNiFAST8 "i" /* int_fast8_t */ #define SCNiFAST16 "i" /* int_fast16_t */ #define SCNiFAST32 "i" /* int_fast32_t */ -#define SCNiFAST64 "lli" /* int_fast64_t */ +#define SCNiFAST64 "li" /* int_fast64_t */ #define SCNiMAX "ji" /* intmax_t */ -#define SCNiPTR "i" /* intptr_t */ +#define SCNiPTR "li" /* intptr_t */ /* fscanf(3) macros for unsigned integers. */ #define SCNo8 "hho" /* uint8_t */ #define SCNo16 "ho" /* uint16_t */ #define SCNo32 "o" /* uint32_t */ -#define SCNo64 "llo" /* uint64_t */ +#define SCNo64 "lo" /* uint64_t */ #define SCNoLEAST8 "hho" /* uint_least8_t */ #define SCNoLEAST16 "ho" /* uint_least16_t */ #define SCNoLEAST32 "o" /* uint_least32_t */ -#define SCNoLEAST64 "llo" /* uint_least64_t */ +#define SCNoLEAST64 "lo" /* uint_least64_t */ #define SCNoFAST8 "o" /* uint_fast8_t */ #define SCNoFAST16 "o" /* uint_fast16_t */ #define SCNoFAST32 "o" /* uint_fast32_t */ -#define SCNoFAST64 "llo" /* uint_fast64_t */ +#define SCNoFAST64 "lo" /* uint_fast64_t */ #define SCNoMAX "jo" /* uintmax_t */ -#define SCNoPTR "o" /* uintptr_t */ +#define SCNoPTR "lo" /* uintptr_t */ #define SCNu8 "hhu" /* uint8_t */ #define SCNu16 "hu" /* uint16_t */ #define SCNu32 "u" /* uint32_t */ -#define SCNu64 "llu" /* uint64_t */ +#define SCNu64 "lu" /* uint64_t */ #define SCNuLEAST8 "hhu" /* uint_least8_t */ #define SCNuLEAST16 "hu" /* uint_least16_t */ #define SCNuLEAST32 "u" /* uint_least32_t */ -#define SCNuLEAST64 "llu" /* uint_least64_t */ +#define SCNuLEAST64 "lu" /* uint_least64_t */ #define SCNuFAST8 "u" /* uint_fast8_t */ #define SCNuFAST16 "u" /* uint_fast16_t */ #define SCNuFAST32 "u" /* uint_fast32_t */ -#define SCNuFAST64 "llu" /* uint_fast64_t */ +#define SCNuFAST64 "lu" /* uint_fast64_t */ #define SCNuMAX "ju" /* uintmax_t */ -#define SCNuPTR "u" /* uintptr_t */ +#define SCNuPTR "lu" /* uintptr_t */ #define SCNx8 "hhx" /* uint8_t */ #define SCNx16 "hx" /* uint16_t */ #define SCNx32 "x" /* uint32_t */ -#define SCNx64 "llx" /* uint64_t */ +#define SCNx64 "lx" /* uint64_t */ #define SCNxLEAST8 "hhx" /* uint_least8_t */ #define SCNxLEAST16 "hx" /* uint_least16_t */ #define SCNxLEAST32 "x" /* uint_least32_t */ -#define SCNxLEAST64 "llx" /* uint_least64_t */ +#define SCNxLEAST64 "lx" /* uint_least64_t */ #define SCNxFAST8 "x" /* uint_fast8_t */ #define SCNxFAST16 "x" /* uint_fast16_t */ #define SCNxFAST32 "x" /* uint_fast32_t */ -#define SCNxFAST64 "llx" /* uint_fast64_t */ +#define SCNxFAST64 "lx" /* uint_fast64_t */ #define SCNxMAX "jx" /* uintmax_t */ -#define SCNxPTR "x" /* uintptr_t */ +#define SCNxPTR "lx" /* uintptr_t */ #endif /* !_MACHINE_INTTYPES_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19: 3: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2AD637B404; Fri, 20 Sep 2002 19:03:02 -0700 (PDT) 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 B8C6637B401 for ; Fri, 20 Sep 2002 19:03:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7692A43E7B for ; Fri, 20 Sep 2002 19:03:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L232Co080269 for ; Fri, 20 Sep 2002 19:03:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2326O080266 for perforce@freebsd.org; Fri, 20 Sep 2002 19:03:02 -0700 (PDT) Date: Fri, 20 Sep 2002 19:03:02 -0700 (PDT) Message-Id: <200209210203.g8L2326O080266@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17796 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17796 Change 17796 by peter@peter_daintree on 2002/09/20 19:02:47 zap math_emulate Affected files ... .. //depot/projects/hammer/sys/x86_64/include/frame.h#2 edit .. //depot/projects/hammer/sys/x86_64/isa/npx.c#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/frame.h#2 (text+ko) ==== @@ -154,7 +154,6 @@ }; int kdb_trap(int, int, struct trapframe *); -extern int (*pmath_emulate)(struct trapframe *); #define INTR_TO_TRAPFRAME(frame) ((struct trapframe *)&(frame)->if_fs) ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#2 (text+ko) ==== @@ -38,7 +38,6 @@ #include "opt_cpu.h" #include "opt_debug_npx.h" #include "opt_isa.h" -#include "opt_math_emulate.h" #include "opt_npx.h" #include ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#2 (text+ko) ==== @@ -101,8 +101,6 @@ #include -int (*pmath_emulate)(struct trapframe *); - extern void trap(struct trapframe frame); #ifdef I386_CPU extern int trapwrite(unsigned addr); @@ -409,21 +407,8 @@ if (npxdna()) goto userout; #endif - if (!pmath_emulate) { - i = SIGFPE; - ucode = FPE_FPU_NP_TRAP; - break; - } - mtx_lock(&Giant); - i = (*pmath_emulate)(&frame); - mtx_unlock(&Giant); - if (i == 0) { - if (!(frame.tf_eflags & PSL_T)) - goto userout; - frame.tf_eflags &= ~PSL_T; - i = SIGTRAP; - } - /* else ucode = emulator_only_knows() XXX */ + i = SIGFPE; + ucode = FPE_FPU_NP_TRAP; break; case T_FPOPFLT: /* FPU operand fetch fault */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19: 9:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73AA637B404; Fri, 20 Sep 2002 19:09:11 -0700 (PDT) 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 0572737B401 for ; Fri, 20 Sep 2002 19:09:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8024D43E6A for ; Fri, 20 Sep 2002 19:09:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L29ACo084911 for ; Fri, 20 Sep 2002 19:09:10 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L29AqN084908 for perforce@freebsd.org; Fri, 20 Sep 2002 19:09:10 -0700 (PDT) Date: Fri, 20 Sep 2002 19:09:10 -0700 (PDT) Message-Id: <200209210209.g8L29AqN084908@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17797 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17797 Change 17797 by peter@peter_daintree on 2002/09/20 19:08:21 chop out the evil -16 offset stuff for vm86 support (no vm86!!) Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#2 (text+ko) ==== @@ -1823,9 +1823,8 @@ initializecpu(); /* Initialize CPU registers */ /* make an initial tss so cpu can get interrupt stack on syscall! */ - /* Note: -16 is so we can grow the trapframe if we came from vm86 */ PCPU_SET(common_tss.tss_esp0, thread0.td_kstack + - KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb) - 16); + KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb)); PCPU_SET(common_tss.tss_ss0, GSEL(GDATA_SEL, SEL_KPL)); gsel_tss = GSEL(GPROC0_SEL, SEL_KPL); private_tss = 0; ==== //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#2 (text+ko) ==== @@ -199,9 +199,8 @@ 1: /* * Use the common default TSS instead of our own. * Set our stack pointer into the TSS, it's set to just - * below the PCB. In C, common_tss.tss_esp0 = &pcb - 16; + * below the PCB. In C, common_tss.tss_esp0 = &pcb; */ - leal -16(%edx), %ebx /* leave space for vm86 */ movl %ebx, PCPU(COMMON_TSS) + TSS_ESP0 /* ==== //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#2 (text+ko) ==== @@ -136,9 +136,8 @@ if (ext == 0) return (ENOMEM); bzero(ext, sizeof(struct pcb_ext)); - /* -16 is so we can convert a trapframe into vm86trapframe inplace */ ext->ext_tss.tss_esp0 = td->td_kstack + ctob(KSTACK_PAGES) - - sizeof(struct pcb) - 16; + sizeof(struct pcb); ext->ext_tss.tss_ss0 = GSEL(GDATA_SEL, SEL_KPL); /* * The last byte of the i/o map must be followed by an 0xff byte. ==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#2 (text+ko) ==== @@ -69,7 +69,6 @@ #include #include #include -#include #include #include @@ -174,9 +173,8 @@ * Create a new fresh stack for the new process. * Copy the trap frame for the return to user mode as if from a * syscall. This copies most of the user mode register values. - * The -16 is so we can expand the trapframe if we go to vm86. */ - td2->td_frame = (struct trapframe *)((caddr_t)td2->td_pcb - 16) - 1; + td2->td_frame = (struct trapframe *)td2->td_pcb - 1; bcopy(td1->td_frame, td2->td_frame, sizeof(struct trapframe)); td2->td_frame->tf_eax = 0; /* Child returns zero */ @@ -304,7 +302,7 @@ td->td_pcb = (struct pcb *)(td->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - td->td_frame = (struct trapframe *)((caddr_t)td->td_pcb - 16) - 1; + td->td_frame = (struct trapframe *)td->td_pcb - 1; } /* @@ -336,13 +334,12 @@ /* * Create a new fresh stack for the new thread. - * The -16 is so we can expand the trapframe if we go to vm86. * Don't forget to set this stack value into whatever supplies * the address for the fault handlers. * The contexts are filled in at the time we actually DO the * upcall as only then do we know which KSE we got. */ - td->td_frame = (struct trapframe *)((caddr_t)pcb2 - 16) - 1; + td->td_frame = (struct trapframe *)pcb2 - 1; /* * Set registers for trampoline to user mode. Leave space for the @@ -381,7 +378,7 @@ * function. */ td->td_frame->tf_esp = - (int)ke->ke_stack.ss_sp + ke->ke_stack.ss_size - 16; + (int)ke->ke_stack.ss_sp + ke->ke_stack.ss_size; td->td_frame->tf_eip = (int)ke->ke_upcall; /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19:11:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15F5337B404; Fri, 20 Sep 2002 19:11:14 -0700 (PDT) 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 CEEE237B401 for ; Fri, 20 Sep 2002 19:11:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 917C943E3B for ; Fri, 20 Sep 2002 19:11:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L2BDCo085158 for ; Fri, 20 Sep 2002 19:11:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2BDNl085148 for perforce@freebsd.org; Fri, 20 Sep 2002 19:11:13 -0700 (PDT) Date: Fri, 20 Sep 2002 19:11:13 -0700 (PDT) Message-Id: <200209210211.g8L2BDNl085148@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17798 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17798 Change 17798 by peter@peter_daintree on 2002/09/20 19:10:45 no more trapframe_vm86! (yay!) Affected files ... .. //depot/projects/hammer/sys/x86_64/include/frame.h#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/frame.h#3 (text+ko) ==== @@ -71,36 +71,6 @@ int tf_ss; }; -/* Superset of trap frame, for traps from virtual-8086 mode */ - -struct trapframe_vm86 { - int tf_fs; - int tf_es; - int tf_ds; - int tf_edi; - int tf_esi; - int tf_ebp; - int tf_isp; - int tf_ebx; - int tf_edx; - int tf_ecx; - int tf_eax; - int tf_trapno; - /* below portion defined in 386 hardware */ - int tf_err; - int tf_eip; - int tf_cs; - int tf_eflags; - /* below only when crossing rings (e.g. user to kernel) */ - int tf_esp; - int tf_ss; - /* below only when switching out of VM86 mode */ - int tf_vm86_es; - int tf_vm86_ds; - int tf_vm86_fs; - int tf_vm86_gs; -}; - /* Interrupt stack frame */ struct intrframe { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19:12:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0695237B404; Fri, 20 Sep 2002 19:12:18 -0700 (PDT) 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 EED9E37B401 for ; Fri, 20 Sep 2002 19:12:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50EF243E4A for ; Fri, 20 Sep 2002 19:12:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L2CGCo086701 for ; Fri, 20 Sep 2002 19:12:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2CFSF086698 for perforce@freebsd.org; Fri, 20 Sep 2002 19:12:15 -0700 (PDT) Date: Fri, 20 Sep 2002 19:12:15 -0700 (PDT) Message-Id: <200209210212.g8L2CFSF086698@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17799 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17799 Change 17799 by peter@peter_daintree on 2002/09/20 19:12:09 shoot osendsig and osigreturn in the head (I know, it wont link) Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#3 (text+ko) ==== @@ -161,10 +161,6 @@ long physmem = 0; int cold = 1; -#ifdef COMPAT_43 -static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); -#endif - static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) { @@ -277,136 +273,6 @@ * frame pointer, it returns to the user * specified pc, psl. */ -#ifdef COMPAT_43 -static void -osendsig(catcher, sig, mask, code) - sig_t catcher; - int sig; - sigset_t *mask; - u_long code; -{ - struct osigframe sf; - struct osigframe *fp; - struct proc *p; - struct thread *td; - struct sigacts *psp; - struct trapframe *regs; - int oonstack; - - td = curthread; - p = td->td_proc; - PROC_LOCK_ASSERT(p, MA_OWNED); - psp = p->p_sigacts; - regs = td->td_frame; - oonstack = sigonstack(regs->tf_esp); - - /* Allocate space for the signal handler context. */ - if ((p->p_flag & P_ALTSTACK) && !oonstack && - SIGISMEMBER(psp->ps_sigonstack, sig)) { - fp = (struct osigframe *)(p->p_sigstk.ss_sp + - p->p_sigstk.ss_size - sizeof(struct osigframe)); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) - p->p_sigstk.ss_flags |= SS_ONSTACK; -#endif - } else - fp = (struct osigframe *)regs->tf_esp - 1; - PROC_UNLOCK(p); - - /* Translate the signal if appropriate. */ - if (p->p_sysent->sv_sigtbl && sig <= p->p_sysent->sv_sigsize) - sig = p->p_sysent->sv_sigtbl[_SIG_IDX(sig)]; - - /* Build the argument list for the signal handler. */ - sf.sf_signum = sig; - sf.sf_scp = (register_t)&fp->sf_siginfo.si_sc; - PROC_LOCK(p); - if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) { - /* Signal handler installed with SA_SIGINFO. */ - sf.sf_arg2 = (register_t)&fp->sf_siginfo; - sf.sf_siginfo.si_signo = sig; - sf.sf_siginfo.si_code = code; - sf.sf_ahu.sf_action = (__osiginfohandler_t *)catcher; - } else { - /* Old FreeBSD-style arguments. */ - sf.sf_arg2 = code; - sf.sf_addr = regs->tf_err; - sf.sf_ahu.sf_handler = catcher; - } - PROC_UNLOCK(p); - - /* Save most if not all of trap frame. */ - sf.sf_siginfo.si_sc.sc_eax = regs->tf_eax; - sf.sf_siginfo.si_sc.sc_ebx = regs->tf_ebx; - sf.sf_siginfo.si_sc.sc_ecx = regs->tf_ecx; - sf.sf_siginfo.si_sc.sc_edx = regs->tf_edx; - sf.sf_siginfo.si_sc.sc_esi = regs->tf_esi; - sf.sf_siginfo.si_sc.sc_edi = regs->tf_edi; - sf.sf_siginfo.si_sc.sc_cs = regs->tf_cs; - sf.sf_siginfo.si_sc.sc_ds = regs->tf_ds; - sf.sf_siginfo.si_sc.sc_ss = regs->tf_ss; - sf.sf_siginfo.si_sc.sc_es = regs->tf_es; - sf.sf_siginfo.si_sc.sc_fs = regs->tf_fs; - sf.sf_siginfo.si_sc.sc_gs = rgs(); - sf.sf_siginfo.si_sc.sc_isp = regs->tf_isp; - - /* Build the signal context to be used by osigreturn(). */ - sf.sf_siginfo.si_sc.sc_onstack = (oonstack) ? 1 : 0; - SIG2OSIG(*mask, sf.sf_siginfo.si_sc.sc_mask); - sf.sf_siginfo.si_sc.sc_sp = regs->tf_esp; - sf.sf_siginfo.si_sc.sc_fp = regs->tf_ebp; - sf.sf_siginfo.si_sc.sc_pc = regs->tf_eip; - sf.sf_siginfo.si_sc.sc_ps = regs->tf_eflags; - sf.sf_siginfo.si_sc.sc_trapno = regs->tf_trapno; - sf.sf_siginfo.si_sc.sc_err = regs->tf_err; - - /* - * If we're a vm86 process, we want to save the segment registers. - * We also change eflags to be our emulated eflags, not the actual - * eflags. - */ - if (regs->tf_eflags & PSL_VM) { - /* XXX confusing names: `tf' isn't a trapframe; `regs' is. */ - struct trapframe_vm86 *tf = (struct trapframe_vm86 *)regs; - struct vm86_kernel *vm86 = &td->td_pcb->pcb_ext->ext_vm86; - - sf.sf_siginfo.si_sc.sc_gs = tf->tf_vm86_gs; - sf.sf_siginfo.si_sc.sc_fs = tf->tf_vm86_fs; - sf.sf_siginfo.si_sc.sc_es = tf->tf_vm86_es; - sf.sf_siginfo.si_sc.sc_ds = tf->tf_vm86_ds; - - if (vm86->vm86_has_vme == 0) - sf.sf_siginfo.si_sc.sc_ps = - (tf->tf_eflags & ~(PSL_VIF | PSL_VIP)) | - (vm86->vm86_eflags & (PSL_VIF | PSL_VIP)); - - /* See sendsig() for comments. */ - tf->tf_eflags &= ~(PSL_VM | PSL_NT | PSL_VIF | PSL_VIP); - } - - /* - * Copy the sigframe out to the user's stack. - */ - if (copyout(&sf, fp, sizeof(*fp)) != 0) { -#ifdef DEBUG - printf("process %ld has trashed its stack\n", (long)p->p_pid); -#endif - PROC_LOCK(p); - sigexit(td, SIGILL); - } - - regs->tf_esp = (int)fp; - regs->tf_eip = PS_STRINGS - szosigcode; - regs->tf_eflags &= ~PSL_T; - regs->tf_cs = _ucodesel; - regs->tf_ds = _udatasel; - regs->tf_es = _udatasel; - regs->tf_fs = _udatasel; - load_gs(_udatasel); - regs->tf_ss = _udatasel; - PROC_LOCK(p); -} -#endif /* COMPAT_43 */ - void sendsig(catcher, sig, mask, code) sig_t catcher; @@ -426,12 +292,6 @@ p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); psp = p->p_sigacts; -#ifdef COMPAT_43 - if (SIGISMEMBER(psp->ps_osigset, sig)) { - osendsig(catcher, sig, mask, code); - return; - } -#endif regs = td->td_frame; oonstack = sigonstack(regs->tf_esp); @@ -550,126 +410,6 @@ * MPSAFE */ int -osigreturn(td, uap) - struct thread *td; - struct osigreturn_args /* { - struct osigcontext *sigcntxp; - } */ *uap; -{ -#ifdef COMPAT_43 - struct osigcontext sc; - struct trapframe *regs; - struct osigcontext *scp; - struct proc *p = td->td_proc; - int eflags, error; - - regs = td->td_frame; - error = copyin(uap->sigcntxp, &sc, sizeof(sc)); - if (error != 0) - return (error); - scp = ≻ - eflags = scp->sc_ps; - if (eflags & PSL_VM) { - struct trapframe_vm86 *tf = (struct trapframe_vm86 *)regs; - struct vm86_kernel *vm86; - - /* - * if pcb_ext == 0 or vm86_inited == 0, the user hasn't - * set up the vm86 area, and we can't enter vm86 mode. - */ - if (td->td_pcb->pcb_ext == 0) - return (EINVAL); - vm86 = &td->td_pcb->pcb_ext->ext_vm86; - if (vm86->vm86_inited == 0) - return (EINVAL); - - /* Go back to user mode if both flags are set. */ - if ((eflags & PSL_VIP) && (eflags & PSL_VIF)) - trapsignal(p, SIGBUS, 0); - - if (vm86->vm86_has_vme) { - eflags = (tf->tf_eflags & ~VME_USERCHANGE) | - (eflags & VME_USERCHANGE) | PSL_VM; - } else { - vm86->vm86_eflags = eflags; /* save VIF, VIP */ - eflags = (tf->tf_eflags & ~VM_USERCHANGE) | - (eflags & VM_USERCHANGE) | PSL_VM; - } - tf->tf_vm86_ds = scp->sc_ds; - tf->tf_vm86_es = scp->sc_es; - tf->tf_vm86_fs = scp->sc_fs; - tf->tf_vm86_gs = scp->sc_gs; - tf->tf_ds = _udatasel; - tf->tf_es = _udatasel; - tf->tf_fs = _udatasel; - } else { - /* - * Don't allow users to change privileged or reserved flags. - */ - /* - * XXX do allow users to change the privileged flag PSL_RF. - * The cpu sets PSL_RF in tf_eflags for faults. Debuggers - * should sometimes set it there too. tf_eflags is kept in - * the signal context during signal handling and there is no - * other place to remember it, so the PSL_RF bit may be - * corrupted by the signal handler without us knowing. - * Corruption of the PSL_RF bit at worst causes one more or - * one less debugger trap, so allowing it is fairly harmless. - */ - if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF)) { - return (EINVAL); - } - - /* - * Don't allow users to load a valid privileged %cs. Let the - * hardware check for invalid selectors, excess privilege in - * other selectors, invalid %eip's and invalid %esp's. - */ - if (!CS_SECURE(scp->sc_cs)) { - trapsignal(p, SIGBUS, T_PROTFLT); - return (EINVAL); - } - regs->tf_ds = scp->sc_ds; - regs->tf_es = scp->sc_es; - regs->tf_fs = scp->sc_fs; - } - - /* Restore remaining registers. */ - regs->tf_eax = scp->sc_eax; - regs->tf_ebx = scp->sc_ebx; - regs->tf_ecx = scp->sc_ecx; - regs->tf_edx = scp->sc_edx; - regs->tf_esi = scp->sc_esi; - regs->tf_edi = scp->sc_edi; - regs->tf_cs = scp->sc_cs; - regs->tf_ss = scp->sc_ss; - regs->tf_isp = scp->sc_isp; - regs->tf_ebp = scp->sc_fp; - regs->tf_esp = scp->sc_sp; - regs->tf_eip = scp->sc_pc; - regs->tf_eflags = eflags; - - PROC_LOCK(p); -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) - if (scp->sc_onstack & 1) - p->p_sigstk.ss_flags |= SS_ONSTACK; - else - p->p_sigstk.ss_flags &= ~SS_ONSTACK; -#endif - SIGSETOLD(p->p_sigmask, scp->sc_mask); - SIG_CANTMASK(p->p_sigmask); - signotify(p); - PROC_UNLOCK(p); - return (EJUSTRETURN); -#else /* !COMPAT_43 */ - return (ENOSYS); -#endif /* COMPAT_43 */ -} - -/* - * MPSAFE - */ -int sigreturn(td, uap) struct thread *td; struct sigreturn_args /* { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19:15:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E81C37B404; Fri, 20 Sep 2002 19:15:22 -0700 (PDT) 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 4171137B401 for ; Fri, 20 Sep 2002 19:15:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00B6F43E65 for ; Fri, 20 Sep 2002 19:15:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L2FLCo087042 for ; Fri, 20 Sep 2002 19:15:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2FLqa087039 for perforce@freebsd.org; Fri, 20 Sep 2002 19:15:21 -0700 (PDT) Date: Fri, 20 Sep 2002 19:15:21 -0700 (PDT) Message-Id: <200209210215.g8L2FLqa087039@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17800 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17800 Change 17800 by peter@peter_daintree on 2002/09/20 19:14:31 nuke osigcode Affected files ... .. //depot/projects/hammer/sys/x86_64/include/md_var.h#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/md_var.h#2 (text+ko) ==== @@ -56,7 +56,7 @@ #endif extern void (*ovbcopy_vector)(const void *from, void *to, size_t len); extern char sigcode[]; -extern int szsigcode, szosigcode; +extern int szsigcode; typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); struct thread; ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#2 (text+ko) ==== @@ -406,33 +406,13 @@ int $0x80 /* enter kernel with args */ 0: jmp 0b -#ifdef COMPAT_43 - ALIGN_TEXT -osigcode: - call *SIGF_HANDLER(%esp) /* call signal handler */ - lea SIGF_SC(%esp),%eax /* get sigcontext */ - pushl %eax - testl $PSL_VM,SC_PS(%eax) - jne 9f - movl SC_GS(%eax),%gs /* restore %gs */ -9: - movl $SYS_osigreturn,%eax - pushl %eax /* junk to fake return addr. */ - int $0x80 /* enter kernel with args */ -0: jmp 0b -#endif /* COMPAT_43 */ - ALIGN_TEXT esigcode: .data - .globl szsigcode, szosigcode + .globl szsigcode szsigcode: .long esigcode-sigcode -#ifdef COMPAT_43 -szosigcode: - .long esigcode-osigcode -#endif .text /********************************************************************** To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19:17:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A343637B404; Fri, 20 Sep 2002 19:17:25 -0700 (PDT) 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 65C4F37B401 for ; Fri, 20 Sep 2002 19:17:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0688F43E6A for ; Fri, 20 Sep 2002 19:17:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L2HOCo087504 for ; Fri, 20 Sep 2002 19:17:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2HOut087501 for perforce@freebsd.org; Fri, 20 Sep 2002 19:17:24 -0700 (PDT) Date: Fri, 20 Sep 2002 19:17:24 -0700 (PDT) Message-Id: <200209210217.g8L2HOut087501@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17801 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17801 Change 17801 by peter@peter_daintree on 2002/09/20 19:17:19 zap some vm86 crud Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#3 (text+ko) ==== @@ -95,8 +95,6 @@ #include #endif -#include - #include #include @@ -257,8 +255,7 @@ ether_poll(poll_in_trap); #endif /* DEVICE_POLLING */ - if ((ISPL(frame.tf_cs) == SEL_UPL) || - ((frame.tf_eflags & PSL_VM) && !in_vm86call)) { + if (ISPL(frame.tf_cs) == SEL_UPL) { /* user trap */ sticks = td->td_kse->ke_sticks; @@ -301,23 +298,8 @@ i = SIGFPE; break; - /* - * The following two traps can happen in - * vm86 mode, and, if so, we want to handle - * them specially. - */ case T_PROTFLT: /* general protection fault */ case T_STKFLT: /* stack fault */ - if (frame.tf_eflags & PSL_VM) { - mtx_lock(&Giant); - i = vm86_emulate((struct vm86frame *)&frame); - mtx_unlock(&Giant); - if (i == 0) - goto user; - break; - } - /* FALLTHROUGH */ - case T_SEGNPFLT: /* segment not present fault */ case T_TSSFLT: /* invalid TSS fault */ case T_DOUBLEFLT: /* double fault */ @@ -443,33 +425,11 @@ #endif break; - /* - * The following two traps can happen in - * vm86 mode, and, if so, we want to handle - * them specially. - */ - case T_PROTFLT: /* general protection fault */ case T_STKFLT: /* stack fault */ - if (frame.tf_eflags & PSL_VM) { - mtx_lock(&Giant); - i = vm86_emulate((struct vm86frame *)&frame); - mtx_unlock(&Giant); - if (i != 0) - /* - * returns to original process - */ - vm86_trap((struct vm86frame *)&frame); - goto out; - } - if (type == T_STKFLT) - break; + break; - /* FALL THROUGH */ - + case T_PROTFLT: /* general protection fault */ case T_SEGNPFLT: /* segment not present fault */ - if (in_vm86call) - break; - if (td->td_intr_nesting_level != 0) break; @@ -569,7 +529,7 @@ * debugging the kernel. */ /* XXX Giant */ - if (user_dbreg_trap() && !in_vm86call) { + if (user_dbreg_trap()) { /* * Reset breakpoint bits because the * processor doesn't @@ -767,7 +727,6 @@ if (type <= MAX_TRAP_MSG) printf("\n\nFatal trap %d: %s while in %s mode\n", type, trap_msg[type], - frame->tf_eflags & PSL_VM ? "vm86" : ISPL(frame->tf_cs) == SEL_UPL ? "user" : "kernel"); #ifdef SMP /* two separate prints in case of a trap on an unmapped page */ @@ -806,8 +765,6 @@ printf("nested task, "); if (frame->tf_eflags & PSL_RF) printf("resume, "); - if (frame->tf_eflags & PSL_VM) - printf("vm86, "); printf("IOPL = %d\n", (frame->tf_eflags & PSL_IOPL) >> 12); printf("current process = "); if (curproc) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19:19:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF7DE37B404; Fri, 20 Sep 2002 19:19:28 -0700 (PDT) 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 6260337B401 for ; Fri, 20 Sep 2002 19:19:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2356343E3B for ; Fri, 20 Sep 2002 19:19:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L2JSCo087643 for ; Fri, 20 Sep 2002 19:19:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2JR0M087640 for perforce@freebsd.org; Fri, 20 Sep 2002 19:19:27 -0700 (PDT) Date: Fri, 20 Sep 2002 19:19:27 -0700 (PDT) Message-Id: <200209210219.g8L2JR0M087640@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17802 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17802 Change 17802 by peter@peter_daintree on 2002/09/20 19:19:25 remove vm86 from pcb extensions. hammer has still got IO permission bitmaps, but that is it. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pcb_ext.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pcb_ext.h#2 (text+ko) ==== @@ -33,14 +33,12 @@ * Extension to the 386 process control block */ #include -#include #include struct pcb_ext { struct segment_descriptor ext_tssd; /* tss descriptor */ struct i386tss ext_tss; /* per-process i386tss */ caddr_t ext_iomap; /* i/o permission bitmap */ - struct vm86_kernel ext_vm86; /* vm86 area */ }; #ifdef _KERNEL To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19:28:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B07A37B404; Fri, 20 Sep 2002 19:28:41 -0700 (PDT) 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 B5CBB37B401 for ; Fri, 20 Sep 2002 19:28:40 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7631A43E42 for ; Fri, 20 Sep 2002 19:28:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L2SeCo090156 for ; Fri, 20 Sep 2002 19:28:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2Seis090153 for perforce@freebsd.org; Fri, 20 Sep 2002 19:28:40 -0700 (PDT) Date: Fri, 20 Sep 2002 19:28:40 -0700 (PDT) Message-Id: <200209210228.g8L2Seis090153@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17804 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17804 Change 17804 by peter@peter_daintree on 2002/09/20 19:28:26 remove traces of vm86 bitmaps here Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#3 (text+ko) ==== @@ -102,9 +102,6 @@ case I386_SET_IOPERM: error = i386_set_ioperm(td, uap->parms); break; - case I386_VM86: - error = vm86_sysarch(td, uap->parms); - break; default: error = EOPNOTSUPP; break; @@ -148,11 +145,6 @@ ext->ext_tss.tss_ioopt = (offset - ((unsigned)&ext->ext_tss - (unsigned)ext)) << 16; ext->ext_iomap = (caddr_t)ext + offset; - ext->ext_vm86.vm86_intmap = (caddr_t)ext + offset - 32; - - addr = (u_long *)ext->ext_vm86.vm86_intmap; - for (i = 0; i < (ctob(IOPAGES) + 32 + 16) / sizeof(u_long); i++) - *addr++ = ~0; ssd.ssd_base = (unsigned)&ext->ext_tss; ssd.ssd_limit -= ((unsigned)&ext->ext_tss - (unsigned)ext); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19:30:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17BC137B404; Fri, 20 Sep 2002 19:30:44 -0700 (PDT) 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 B9AD737B401 for ; Fri, 20 Sep 2002 19:30:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7900743E42 for ; Fri, 20 Sep 2002 19:30:43 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L2UhCo090289 for ; Fri, 20 Sep 2002 19:30:43 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2UhSL090286 for perforce@freebsd.org; Fri, 20 Sep 2002 19:30:43 -0700 (PDT) Date: Fri, 20 Sep 2002 19:30:43 -0700 (PDT) Message-Id: <200209210230.g8L2UhSL090286@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17805 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17805 Change 17805 by peter@peter_daintree on 2002/09/20 19:29:59 get this to a state where it'll likely compile :-) Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#4 (text+ko) ==== @@ -59,6 +59,7 @@ #include /* for kernel_map */ +#if 0 #define MAX_LD 8192 #define LD_PER_PAGE 512 #define NEW_MAX_LD(num) ((num + LD_PER_PAGE) & ~(LD_PER_PAGE-1)) @@ -73,6 +74,7 @@ #ifdef SMP static void set_user_ldt_rv(struct thread *); #endif +#endif #ifndef _SYS_SYSPROTO_H_ struct sysarch_args { @@ -89,10 +91,10 @@ int error = 0; switch(uap->op) { +#if 0 case I386_GET_LDT: error = i386_get_ldt(td, uap->parms); break; - case I386_SET_LDT: error = i386_set_ldt(td, uap->parms); break; @@ -102,6 +104,7 @@ case I386_SET_IOPERM: error = i386_set_ioperm(td, uap->parms); break; +#endif default: error = EOPNOTSUPP; break; @@ -109,6 +112,7 @@ return (error); } +#if 0 int i386_extend_pcb(struct thread *td) { @@ -533,3 +537,4 @@ return(error); } +#endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19:33:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F67537B404; Fri, 20 Sep 2002 19:33:50 -0700 (PDT) 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 C2F7137B401 for ; Fri, 20 Sep 2002 19:33:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C62843E42 for ; Fri, 20 Sep 2002 19:33:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L2XnCo091884 for ; Fri, 20 Sep 2002 19:33:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2Xnkf091881 for perforce@freebsd.org; Fri, 20 Sep 2002 19:33:49 -0700 (PDT) Date: Fri, 20 Sep 2002 19:33:49 -0700 (PDT) Message-Id: <200209210233.g8L2Xnkf091881@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17806 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17806 Change 17806 by peter@peter_daintree on 2002/09/20 19:33:42 remove vm86 process signal sending and receiving Affected files ... .. //depot/projects/hammer/sys/x86_64/include/psl.h#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/psl.h#2 (text+ko) ==== @@ -55,10 +55,10 @@ #define PSL_IOPL 0x00003000 /* i/o privilege level */ #define PSL_NT 0x00004000 /* nested task bit */ #define PSL_RF 0x00010000 /* resume flag bit */ -#define PSL_VM 0x00020000 /* virtual 8086 mode bit */ +/* #define PSL_VM 0x00020000 */ /* virtual 8086 mode bit */ #define PSL_AC 0x00040000 /* alignment checking */ -#define PSL_VIF 0x00080000 /* virtual interrupt enable */ -#define PSL_VIP 0x00100000 /* virtual interrupt pending */ +/* #define PSL_VIF 0x00080000 */ /* virtual interrupt enable */ +/* #define PSL_VIP 0x00100000 */ /* virtual interrupt pending */ #define PSL_ID 0x00200000 /* identification bit */ /* ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#4 (text+ko) ==== @@ -348,35 +348,6 @@ PROC_UNLOCK(p); /* - * If we're a vm86 process, we want to save the segment registers. - * We also change eflags to be our emulated eflags, not the actual - * eflags. - */ - if (regs->tf_eflags & PSL_VM) { - struct trapframe_vm86 *tf = (struct trapframe_vm86 *)regs; - struct vm86_kernel *vm86 = &td->td_pcb->pcb_ext->ext_vm86; - - sf.sf_uc.uc_mcontext.mc_gs = tf->tf_vm86_gs; - sf.sf_uc.uc_mcontext.mc_fs = tf->tf_vm86_fs; - sf.sf_uc.uc_mcontext.mc_es = tf->tf_vm86_es; - sf.sf_uc.uc_mcontext.mc_ds = tf->tf_vm86_ds; - - if (vm86->vm86_has_vme == 0) - sf.sf_uc.uc_mcontext.mc_eflags = - (tf->tf_eflags & ~(PSL_VIF | PSL_VIP)) | - (vm86->vm86_eflags & (PSL_VIF | PSL_VIP)); - - /* - * Clear PSL_NT to inhibit T_TSSFLT faults on return from - * syscalls made by the signal handler. This just avoids - * wasting time for our lazy fixup of such faults. PSL_NT - * does nothing in vm86 mode, but vm86 programs can set it - * almost legitimately in probes for old cpu types. - */ - tf->tf_eflags &= ~(PSL_VM | PSL_NT | PSL_VIF | PSL_VIP); - } - - /* * Copy the sigframe out to the user's stack. */ if (copyout(&sf, sfp, sizeof(*sfp)) != 0) { @@ -428,77 +399,40 @@ ucp = &uc; regs = td->td_frame; eflags = ucp->uc_mcontext.mc_eflags; - if (eflags & PSL_VM) { - struct trapframe_vm86 *tf = (struct trapframe_vm86 *)regs; - struct vm86_kernel *vm86; + /* + * Don't allow users to change privileged or reserved flags. + */ + /* + * XXX do allow users to change the privileged flag PSL_RF. + * The cpu sets PSL_RF in tf_eflags for faults. Debuggers + * should sometimes set it there too. tf_eflags is kept in + * the signal context during signal handling and there is no + * other place to remember it, so the PSL_RF bit may be + * corrupted by the signal handler without us knowing. + * Corruption of the PSL_RF bit at worst causes one more or + * one less debugger trap, so allowing it is fairly harmless. + */ + if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF)) { + printf("sigreturn: eflags = 0x%x\n", eflags); + return (EINVAL); + } - /* - * if pcb_ext == 0 or vm86_inited == 0, the user hasn't - * set up the vm86 area, and we can't enter vm86 mode. - */ - if (td->td_pcb->pcb_ext == 0) - return (EINVAL); - vm86 = &td->td_pcb->pcb_ext->ext_vm86; - if (vm86->vm86_inited == 0) - return (EINVAL); + /* + * Don't allow users to load a valid privileged %cs. Let the + * hardware check for invalid selectors, excess privilege in + * other selectors, invalid %eip's and invalid %esp's. + */ + cs = ucp->uc_mcontext.mc_cs; + if (!CS_SECURE(cs)) { + printf("sigreturn: cs = 0x%x\n", cs); + trapsignal(p, SIGBUS, T_PROTFLT); + return (EINVAL); + } - /* Go back to user mode if both flags are set. */ - if ((eflags & PSL_VIP) && (eflags & PSL_VIF)) - trapsignal(p, SIGBUS, 0); - - if (vm86->vm86_has_vme) { - eflags = (tf->tf_eflags & ~VME_USERCHANGE) | - (eflags & VME_USERCHANGE) | PSL_VM; - } else { - vm86->vm86_eflags = eflags; /* save VIF, VIP */ - eflags = (tf->tf_eflags & ~VM_USERCHANGE) | - (eflags & VM_USERCHANGE) | PSL_VM; - } - bcopy(&ucp->uc_mcontext.mc_fs, tf, sizeof(struct trapframe)); - tf->tf_eflags = eflags; - tf->tf_vm86_ds = tf->tf_ds; - tf->tf_vm86_es = tf->tf_es; - tf->tf_vm86_fs = tf->tf_fs; - tf->tf_vm86_gs = ucp->uc_mcontext.mc_gs; - tf->tf_ds = _udatasel; - tf->tf_es = _udatasel; - tf->tf_fs = _udatasel; - } else { - /* - * Don't allow users to change privileged or reserved flags. - */ - /* - * XXX do allow users to change the privileged flag PSL_RF. - * The cpu sets PSL_RF in tf_eflags for faults. Debuggers - * should sometimes set it there too. tf_eflags is kept in - * the signal context during signal handling and there is no - * other place to remember it, so the PSL_RF bit may be - * corrupted by the signal handler without us knowing. - * Corruption of the PSL_RF bit at worst causes one more or - * one less debugger trap, so allowing it is fairly harmless. - */ - if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF)) { - printf("sigreturn: eflags = 0x%x\n", eflags); - return (EINVAL); - } - - /* - * Don't allow users to load a valid privileged %cs. Let the - * hardware check for invalid selectors, excess privilege in - * other selectors, invalid %eip's and invalid %esp's. - */ - cs = ucp->uc_mcontext.mc_cs; - if (!CS_SECURE(cs)) { - printf("sigreturn: cs = 0x%x\n", cs); - trapsignal(p, SIGBUS, T_PROTFLT); - return (EINVAL); - } - - ret = set_fpcontext(td, &ucp->uc_mcontext); - if (ret != 0) - return (ret); - bcopy(&ucp->uc_mcontext.mc_fs, regs, sizeof(*regs)); - } + ret = set_fpcontext(td, &ucp->uc_mcontext); + if (ret != 0) + return (ret); + bcopy(&ucp->uc_mcontext.mc_fs, regs, sizeof(*regs)); PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19:34:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BF7537B404; Fri, 20 Sep 2002 19:34:51 -0700 (PDT) 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 4E52337B401 for ; Fri, 20 Sep 2002 19:34:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 107B043E4A for ; Fri, 20 Sep 2002 19:34:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L2YoCo092035 for ; Fri, 20 Sep 2002 19:34:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2Yocj092032 for perforce@freebsd.org; Fri, 20 Sep 2002 19:34:50 -0700 (PDT) Date: Fri, 20 Sep 2002 19:34:50 -0700 (PDT) Message-Id: <200209210234.g8L2Yocj092032@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17807 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17807 Change 17807 by peter@peter_daintree on 2002/09/20 19:34:47 no more 'vm86 is usermode' glue Affected files ... .. //depot/projects/hammer/sys/x86_64/include/cpu.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/cpu.h#2 (text+ko) ==== @@ -59,11 +59,11 @@ #define cpu_setstack(td, ap) ((td)->td_frame->tf_esp = (ap)) #define TRAPF_USERMODE(framep) \ - ((ISPL((framep)->tf_cs) == SEL_UPL) || ((framep)->tf_eflags & PSL_VM)) + (ISPL((framep)->tf_cs) == SEL_UPL) #define TRAPF_PC(framep) ((framep)->tf_eip) #define CLKF_USERMODE(framep) \ - ((ISPL((framep)->cf_cs) == SEL_UPL) || ((framep)->cf_eflags & PSL_VM)) + (ISPL((framep)->cf_cs) == SEL_UPL) #define CLKF_PC(framep) ((framep)->cf_eip) /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19:37:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E31F837B404; Fri, 20 Sep 2002 19:37:56 -0700 (PDT) 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 A754737B401 for ; Fri, 20 Sep 2002 19:37:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6934943E7B for ; Fri, 20 Sep 2002 19:37:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L2btCo092529 for ; Fri, 20 Sep 2002 19:37:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2btdn092526 for perforce@freebsd.org; Fri, 20 Sep 2002 19:37:55 -0700 (PDT) Date: Fri, 20 Sep 2002 19:37:55 -0700 (PDT) Message-Id: <200209210237.g8L2btdn092526@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17808 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17808 Change 17808 by peter@peter_daintree on 2002/09/20 19:37:40 no more PSL_VM references Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#3 edit .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#2 (text+ko) ==== @@ -276,16 +276,8 @@ FAKE_MCOUNT(bintr) /* init "from" bintr -> doreti */ doreti_next: /* - * Check if ASTs can be handled now. PSL_VM must be checked first - * since segment registers only have an RPL in non-VM86 mode. + * Check if ASTs can be handled now. */ - testl $PSL_VM,TF_EFLAGS(%esp) /* are we in vm86 mode? */ - jz doreti_notvm86 - cmpl $1,in_vm86call /* are we in a vm86 call? XXXSMP */ - jne doreti_ast /* can handle ASTs now if not */ - jmp doreti_exit - -doreti_notvm86: testb $SEL_RPL_MASK,TF_CS(%esp) /* are we returning to user mode? */ jz doreti_exit /* can't handle ASTs now if not */ ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#3 (text+ko) ==== @@ -397,10 +397,7 @@ call *SIGF_HANDLER(%esp) /* call signal handler */ lea SIGF_UC(%esp),%eax /* get ucontext_t */ pushl %eax - testl $PSL_VM,UC_EFLAGS(%eax) - jne 9f movl UC_GS(%eax),%gs /* restore %gs */ -9: movl $SYS_sigreturn,%eax pushl %eax /* junk to fake return addr. */ int $0x80 /* enter kernel with args */ ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#4 (text+ko) ==== @@ -205,7 +205,7 @@ * interrupts disabled until they are accidentally * enabled later. */ - if (ISPL(frame.tf_cs) == SEL_UPL || (frame.tf_eflags & PSL_VM)) + if (ISPL(frame.tf_cs) == SEL_UPL) printf( "pid %ld (%s): trap %d with interrupts disabled\n", (long)curproc->p_pid, curproc->p_comm, type); @@ -742,7 +742,7 @@ } printf("instruction pointer = 0x%x:0x%x\n", frame->tf_cs & 0xffff, frame->tf_eip); - if ((ISPL(frame->tf_cs) == SEL_UPL) || (frame->tf_eflags & PSL_VM)) { + if (ISPL(frame->tf_cs) == SEL_UPL) { ss = frame->tf_ss & 0xffff; esp = frame->tf_esp; } else { @@ -1031,7 +1031,7 @@ /* * Traced syscall. */ - if ((orig_tf_eflags & PSL_T) && !(orig_tf_eflags & PSL_VM)) { + if (orig_tf_eflags & PSL_T) { frame.tf_eflags &= ~PSL_T; trapsignal(p, SIGTRAP, 0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19:40: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F1A337B404; Fri, 20 Sep 2002 19:40:02 -0700 (PDT) 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 DCDC137B401 for ; Fri, 20 Sep 2002 19:40:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D8C043E65 for ; Fri, 20 Sep 2002 19:40:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L2e1Co092706 for ; Fri, 20 Sep 2002 19:40:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2e1GK092685 for perforce@freebsd.org; Fri, 20 Sep 2002 19:40:01 -0700 (PDT) Date: Fri, 20 Sep 2002 19:40:01 -0700 (PDT) Message-Id: <200209210240.g8L2e1GK092685@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17809 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17809 Change 17809 by peter@peter_daintree on 2002/09/20 19:39:33 zap vm86, #if 0 the descriptor stuff and debug regs Affected files ... .. //depot/projects/hammer/sys/x86_64/include/sysarch.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/sysarch.h#2 (text+ko) ==== @@ -39,14 +39,13 @@ #ifndef _MACHINE_SYSARCH_H_ #define _MACHINE_SYSARCH_H_ +#if 0 #define I386_GET_LDT 0 #define I386_SET_LDT 1 /* I386_IOPL */ #define I386_GET_IOPERM 3 #define I386_SET_IOPERM 4 /* xxxxx */ -#define I386_VM86 6 - struct i386_ldt_args { int start; union descriptor *descs; @@ -59,11 +58,6 @@ int enable; }; -struct i386_vm86_args { - int sub_op; /* sub-operation to perform */ - char *sub_args; /* args */ -}; - #ifndef _KERNEL #include @@ -81,4 +75,6 @@ __END_DECLS #endif +#endif + #endif /* !_MACHINE_SYSARCH_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19:50:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A35A037B404; Fri, 20 Sep 2002 19:50:25 -0700 (PDT) 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 528FA37B401 for ; Fri, 20 Sep 2002 19:50:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA10143E65 for ; Fri, 20 Sep 2002 19:50:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L2oOCo094714 for ; Fri, 20 Sep 2002 19:50:24 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2oO8L094711 for perforce@freebsd.org; Fri, 20 Sep 2002 19:50:24 -0700 (PDT) Date: Fri, 20 Sep 2002 19:50:24 -0700 (PDT) Message-Id: <200209210250.g8L2oO8L094711@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17811 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17811 Change 17811 by peter@peter_daintree on 2002/09/20 19:49:25 vm86 all gone Affected files ... .. //depot/projects/hammer/sys/x86_64/include/sysarch.h#3 edit .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#3 edit .. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#4 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/sysarch.h#3 (text+ko) ==== @@ -69,7 +69,6 @@ int i386_set_ldt(int, union descriptor *, int); int i386_get_ioperm(unsigned int, unsigned int *, int *); int i386_set_ioperm(unsigned int, unsigned int, int); -int i386_vm86(int, void *); int i386_set_watch(int, unsigned int, int, int, struct dbreg *); int i386_clr_watch(int, struct dbreg *); __END_DECLS ==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#3 (text+ko) ==== @@ -250,11 +250,6 @@ /* - * Include vm86 call routines, which want to call doreti. - */ -#include "i386/i386/vm86bios.s" - -/* * Include what was once config+isa-dependent code. * XXX it should be in a stand-alone file. It's still icu-dependent and * belongs in i386/isa. ==== //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#2 (text+ko) ==== @@ -72,7 +72,6 @@ #endif #include #include -#include #include ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); @@ -204,7 +203,6 @@ ASSYM(BC32SEL, GSEL(GBIOSCODE32_SEL, SEL_KPL)); ASSYM(GPROC0_SEL, GPROC0_SEL); -ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame)); ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); ASSYM(MTX_RECURSECNT, offsetof(struct mtx, mtx_recurse)); ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#4 (text+ko) ==== @@ -149,12 +149,6 @@ p0upa: .long 0 /* phys addr of proc0's UAREA */ p0kpa: .long 0 /* phys addr of proc0's STACK */ -vm86phystk: .long 0 /* PA of vm86/bios stack */ - - .globl vm86paddr, vm86pa -vm86paddr: .long 0 /* address of vm86 region */ -vm86pa: .long 0 /* phys addr of vm86 region */ - #ifdef BDE_DEBUGGER .globl _bdb_exists /* flag to indicate BDE debugger is present */ _bdb_exists: .long 0 @@ -745,14 +739,6 @@ addl $KERNBASE, %esi movl %esi, R(proc0kstack) - ALLOCPAGES(1) /* vm86/bios stack */ - movl %esi,R(vm86phystk) - - ALLOCPAGES(3) /* pgtable + ext + IOPAGES */ - movl %esi,R(vm86pa) - addl $KERNBASE, %esi - movl %esi, R(vm86paddr) - #ifdef SMP /* Allocate cpu0's private data page */ ALLOCPAGES(1) @@ -811,23 +797,6 @@ movl $ISA_HOLE_LENGTH>>PAGE_SHIFT, %ecx fillkptphys($PG_RW) -/* Map space for the vm86 region */ - movl R(vm86phystk), %eax - movl $4, %ecx - fillkptphys($PG_RW) - -/* Map page 0 into the vm86 page table */ - movl $0, %eax - movl $0, %ebx - movl $1, %ecx - fillkpt(R(vm86pa), $PG_RW|PG_U) - -/* ...likewise for the ISA hole */ - movl $ISA_HOLE_START, %eax - movl $ISA_HOLE_START>>PAGE_SHIFT, %ebx - movl $ISA_HOLE_LENGTH>>PAGE_SHIFT, %ecx - fillkpt(R(vm86pa), $PG_RW|PG_U) - #ifdef SMP /* Map cpu0's private page into global kmem (4K @ cpu0prvpage) */ movl R(cpu0pp), %eax ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#5 (text+ko) ==== @@ -114,7 +114,6 @@ #include #include #include -#include #include #include @@ -954,21 +953,17 @@ { int i, physmap_idx, pa_indx; u_int basemem, extmem; - struct vm86frame vmf; - struct vm86context vmc; vm_offset_t pa, physmap[PHYSMAP_SIZE]; pt_entry_t *pte; char *cp; struct bios_smap *smap; - bzero(&vmf, sizeof(struct vm86frame)); bzero(physmap, sizeof(physmap)); /* * Perform "base memory" related probes & setup */ - vm86_intcall(0x12, &vmf); - basemem = vmf.vmf_ax; +#error "basemem = fetch from loader metadata" if (basemem > 640) { printf("Preposterous BIOS basemem of %uK, truncating to 640K\n", basemem); @@ -976,59 +971,12 @@ } /* - * XXX if biosbasemem is now < 640, there is a `hole' - * between the end of base memory and the start of - * ISA memory. The hole may be empty or it may - * contain BIOS code or data. Map it read/write so - * that the BIOS can write to it. (Memory from 0 to - * the physical end of the kernel is mapped read-only - * to begin with and then parts of it are remapped. - * The parts that aren't remapped form holes that - * remain read-only and are unused by the kernel. - * The base memory area is below the physical end of - * the kernel and right now forms a read-only hole. - * The part of it from PAGE_SIZE to - * (trunc_page(biosbasemem * 1024) - 1) will be - * remapped and used by the kernel later.) - * - * This code is similar to the code used in - * pmap_mapdev, but since no memory needs to be - * allocated we simply change the mapping. - */ - for (pa = trunc_page(basemem * 1024); - pa < ISA_HOLE_START; pa += PAGE_SIZE) - pmap_kenter(KERNBASE + pa, pa); - - /* - * if basemem != 640, map pages r/w into vm86 page table so - * that the bios can scribble on it. - */ - pte = (pt_entry_t *)vm86paddr; - for (i = basemem / 4; i < 160; i++) - pte[i] = (i << PAGE_SHIFT) | PG_V | PG_RW | PG_U; - - /* - * map page 1 R/W into the kernel page table so we can use it - * as a buffer. The kernel will unmap this page later. - */ - pmap_kenter(KERNBASE + (1 << PAGE_SHIFT), 1); - - /* * get memory map with INT 15:E820 */ - vmc.npages = 0; - smap = (void *)vm86_addpage(&vmc, 1, KERNBASE + (1 << PAGE_SHIFT)); - vm86_getptr(&vmc, (vm_offset_t)smap, &vmf.vmf_es, &vmf.vmf_di); +#error "smap = fetch from loader metadata" physmap_idx = 0; - vmf.vmf_ebx = 0; do { - vmf.vmf_eax = 0xE820; - vmf.vmf_edx = SMAP_SIG; - vmf.vmf_ecx = sizeof(struct bios_smap); - i = vm86_datacall(0x15, &vmf, &vmc); - if (i || vmf.vmf_eax != SMAP_SIG) - break; if (boothowto & RB_VERBOSE) printf("SMAP type=%02x base=%08x %08x len=%08x %08x\n", smap->type, @@ -1072,51 +1020,9 @@ physmap[physmap_idx] = smap->base; physmap[physmap_idx + 1] = smap->base + smap->length; next_run: ; - } while (vmf.vmf_ebx != 0); - - if (physmap[1] != 0) - goto physmap_done; - - /* - * If we failed above, try memory map with INT 15:E801 - */ - vmf.vmf_ax = 0xE801; - if (vm86_intcall(0x15, &vmf) == 0) { - extmem = vmf.vmf_cx + vmf.vmf_dx * 64; - } else { -#if 0 - vmf.vmf_ah = 0x88; - vm86_intcall(0x15, &vmf); - extmem = vmf.vmf_ax; -#else - /* - * Prefer the RTC value for extended memory. - */ - extmem = rtcin(RTC_EXTLO) + (rtcin(RTC_EXTHI) << 8); -#endif - } + } #error "while not end of smap table from loader" /* - * Special hack for chipsets that still remap the 384k hole when - * there's 16MB of memory - this really confuses people that - * are trying to use bus mastering ISA controllers with the - * "16MB limit"; they only have 16MB, but the remapping puts - * them beyond the limit. - * - * If extended memory is between 15-16MB (16-17MB phys address range), - * chop it to 15MB. - */ - if ((extmem > 15 * 1024) && (extmem < 16 * 1024)) - extmem = 15 * 1024; - - physmap[0] = 0; - physmap[1] = basemem * 1024; - physmap_idx = 2; - physmap[physmap_idx] = 0x100000; - physmap[physmap_idx + 1] = physmap[physmap_idx] + extmem * 1024; - -physmap_done: - /* * Now, physmap contains a map of physical memory. */ @@ -1520,7 +1426,6 @@ dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL); dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL); - vm86_initialize(); getmemsize(first); init_param2(physmem); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 19:53:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9483F37B404; Fri, 20 Sep 2002 19:53:30 -0700 (PDT) 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 88AA437B401 for ; Fri, 20 Sep 2002 19:53:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 346BE43E6A for ; Fri, 20 Sep 2002 19:53:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L2rTCo096285 for ; Fri, 20 Sep 2002 19:53:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L2rSYZ096282 for perforce@freebsd.org; Fri, 20 Sep 2002 19:53:28 -0700 (PDT) Date: Fri, 20 Sep 2002 19:53:28 -0700 (PDT) Message-Id: <200209210253.g8L2rSYZ096282@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17812 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17812 Change 17812 by peter@peter_daintree on 2002/09/20 19:53:18 Remove BDE_DEBUGGER with extreme prejudice. I've wanted to do this for ages. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/segments.h#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#4 edit .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#5 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#6 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/segments.h#2 (text+ko) ==== @@ -220,11 +220,7 @@ #define GBIOSUTIL_SEL 13 /* BIOS interface (Utility) */ #define GBIOSARGS_SEL 14 /* BIOS interface (Arguments) */ -#ifdef BDE_DEBUGGER -#define NGDT 18 /* some of 11-17 are reserved for debugger */ -#else #define NGDT 15 -#endif /* * Entries in the Local Descriptor Table (LDT) ==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#4 (text+ko) ==== @@ -81,34 +81,16 @@ .type __CONCAT(X,name),@function; __CONCAT(X,name): #define TRAP(a) pushl $(a) ; jmp alltraps -#ifdef BDE_DEBUGGER -#define BDBTRAP(name) \ - ss ; \ - cmpb $0,_bdb_exists ; \ - je 1f ; \ - testb $SEL_RPL_MASK,4(%esp) ; \ - jne 1f ; \ - ss ; \ - .globl __CONCAT(__CONCAT(bdb_,name),_ljmp); \ -__CONCAT(__CONCAT(bdb_,name),_ljmp): \ - ljmp $0,$0 ; \ -1: -#else -#define BDBTRAP(name) -#endif - MCOUNT_LABEL(user) MCOUNT_LABEL(btrap) IDTVEC(div) pushl $0; TRAP(T_DIVIDE) IDTVEC(dbg) - BDBTRAP(dbg) pushl $0; TRAP(T_TRCTRAP) IDTVEC(nmi) pushl $0; TRAP(T_NMI) IDTVEC(bpt) - BDBTRAP(bpt) pushl $0; TRAP(T_BPTFLT) IDTVEC(ofl) pushl $0; TRAP(T_OFLOW) ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#5 (text+ko) ==== @@ -149,11 +149,6 @@ p0upa: .long 0 /* phys addr of proc0's UAREA */ p0kpa: .long 0 /* phys addr of proc0's STACK */ -#ifdef BDE_DEBUGGER - .globl _bdb_exists /* flag to indicate BDE debugger is present */ -_bdb_exists: .long 0 -#endif - #ifdef PC98 .globl pc98_system_parameter pc98_system_parameter: @@ -226,16 +221,6 @@ rep movsb #else /* IBM-PC */ -#ifdef BDE_DEBUGGER -#ifdef BIOS_STEALS_3K - cmpl $0x0375c339,0x95504 -#else - cmpl $0x0375c339,0x96104 /* XXX - debugger signature */ -#endif - jne 1f - movb $1,R(_bdb_exists) -1: -#endif /* Tell the bios to warmboot next time */ movw $0x1234,0x472 #endif /* PC98 */ @@ -309,7 +294,7 @@ * XXX the gdt and idt are still somewhere in the boot program. We * depend on the convention that the boot program is below 1MB and we * are above 1MB to keep the gdt and idt away from the bss and page - * tables. The idt is only used if BDE_DEBUGGER is enabled. + * tables. The idt is not used. */ movl $R(end),%ecx movl $R(edata),%edi @@ -329,16 +314,7 @@ movl %cr4, %eax orl $CR4_VME, %eax movl %eax, %cr4 -1: -#ifdef BDE_DEBUGGER -/* - * Adjust as much as possible for paging before enabling paging so that the - * adjustments can be traced. - */ - call bdb_prepare_paging -#endif - /* Now enable paging */ movl R(IdlePTD), %eax movl %eax,%cr3 /* load ptd addr into mmu */ @@ -346,15 +322,6 @@ orl $CR0_PE|CR0_PG,%eax /* enable paging */ movl %eax,%cr0 /* and let's page NOW! */ -#ifdef BDE_DEBUGGER -/* - * Complete the adjustments for paging so that we can keep tracing through - * initi386() after the low (physical) addresses for the gdt and idt become - * invalid. - */ - call bdb_commit_paging -#endif - pushl $begin /* jump to high virtualized address */ ret @@ -754,12 +721,7 @@ #endif /* SMP */ /* Map read-only from zero to the end of the kernel text section */ - xorl %eax, %eax -#ifdef BDE_DEBUGGER -/* If the debugger is present, actually map everything read-write. */ - cmpl $0,R(_bdb_exists) - jne map_read_write -#endif + xorl %eax,%eax xorl %edx,%edx movl $R(etext),%ecx addl $PAGE_MASK,%ecx @@ -847,83 +809,3 @@ fillkpt(R(IdlePTD), $PG_RW) ret - -#ifdef BDE_DEBUGGER -bdb_prepare_paging: - cmpl $0,R(_bdb_exists) - je bdb_prepare_paging_exit - - subl $6,%esp - - /* - * Copy and convert debugger entries from the bootstrap gdt and idt - * to the kernel gdt and idt. Everything is still in low memory. - * Tracing continues to work after paging is enabled because the - * low memory addresses remain valid until everything is relocated. - * However, tracing through the setidt() that initializes the trace - * trap will crash. - */ - sgdt (%esp) - movl 2(%esp),%esi /* base address of bootstrap gdt */ - movl $R(_gdt),%edi - movl %edi,2(%esp) /* prepare to load kernel gdt */ - movl $8*18/4,%ecx - cld - rep /* copy gdt */ - movsl - movl $R(_gdt),-8+2(%edi) /* adjust gdt self-ptr */ - movb $0x92,-8+5(%edi) - lgdt (%esp) - - sidt (%esp) - movl 2(%esp),%esi /* base address of current idt */ - movl 8+4(%esi),%eax /* convert dbg descriptor to ... */ - movw 8(%esi),%ax - movl %eax,R(bdb_dbg_ljmp+1) /* ... immediate offset ... */ - movl 8+2(%esi),%eax - movw %ax,R(bdb_dbg_ljmp+5) /* ... and selector for ljmp */ - movl 24+4(%esi),%eax /* same for bpt descriptor */ - movw 24(%esi),%ax - movl %eax,R(bdb_bpt_ljmp+1) - movl 24+2(%esi),%eax - movw %ax,R(bdb_bpt_ljmp+5) - movl R(_idt),%edi - movl %edi,2(%esp) /* prepare to load kernel idt */ - movl $8*4/4,%ecx - cld - rep /* copy idt */ - movsl - lidt (%esp) - - addl $6,%esp - -bdb_prepare_paging_exit: - ret - -/* Relocate debugger gdt entries and gdt and idt pointers. */ -bdb_commit_paging: - cmpl $0,_bdb_exists - je bdb_commit_paging_exit - - movl $gdt+8*9,%eax /* adjust slots 9-17 */ - movl $9,%ecx -reloc_gdt: - movb $KERNBASE>>24,7(%eax) /* top byte of base addresses, was 0, */ - addl $8,%eax /* now KERNBASE>>24 */ - loop reloc_gdt - - subl $6,%esp - sgdt (%esp) - addl $KERNBASE,2(%esp) - lgdt (%esp) - sidt (%esp) - addl $KERNBASE,2(%esp) - lidt (%esp) - addl $6,%esp - - int $3 - -bdb_commit_paging_exit: - ret - -#endif /* BDE_DEBUGGER */ ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#6 (text+ko) ==== @@ -1284,14 +1284,8 @@ gdt_segs[GPRIV_SEL].ssd_base = (int) pc; gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss; - for (x = 0; x < NGDT; x++) { -#ifdef BDE_DEBUGGER - /* avoid overwriting db entries with APM ones */ - if (x >= GAPMCODE32_SEL && x <= GAPMDATA_SEL) - continue; -#endif + for (x = 0; x < NGDT; x++) ssdtosd(&gdt_segs[x], &gdt[x].sd); - } r_gdt.rd_limit = NGDT * sizeof(gdt[0]) - 1; r_gdt.rd_base = (int) gdt; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 20: 4: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 051F937B404; Fri, 20 Sep 2002 20:03:43 -0700 (PDT) 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 A148D37B401 for ; Fri, 20 Sep 2002 20:03:42 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12DCC43E65 for ; Fri, 20 Sep 2002 20:03:42 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L33gCo098265 for ; Fri, 20 Sep 2002 20:03:42 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L33fiS098262 for perforce@freebsd.org; Fri, 20 Sep 2002 20:03:41 -0700 (PDT) Date: Fri, 20 Sep 2002 20:03:41 -0700 (PDT) Message-Id: <200209210303.g8L33fiS098262@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17813 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17813 Change 17813 by peter@peter_daintree on 2002/09/20 20:03:13 Unifdef PC98 Affected files ... .. //depot/projects/hammer/sys/x86_64/include/bus.h#2 edit .. //depot/projects/hammer/sys/x86_64/include/clock.h#2 edit .. //depot/projects/hammer/sys/x86_64/include/md_var.h#3 edit .. //depot/projects/hammer/sys/x86_64/include/pci_cfgreg.h#2 edit .. //depot/projects/hammer/sys/x86_64/isa/icu.h#2 edit .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#2 edit .. //depot/projects/hammer/sys/x86_64/isa/isa.c#2 edit .. //depot/projects/hammer/sys/x86_64/isa/isa.h#2 edit .. //depot/projects/hammer/sys/x86_64/isa/npx.c#3 edit .. //depot/projects/hammer/sys/x86_64/isa/timerreg.h#2 edit .. //depot/projects/hammer/sys/x86_64/isa/vector.s#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#3 edit .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#6 edit .. //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/bus.h#2 (text+ko) ==== @@ -34,17 +34,11 @@ #ifndef _I386_BUS_H_ #define _I386_BUS_H_ -#ifdef PC98 -/* NEC PC-98 */ -#include -#else -/* IBM-PC */ #include -#endif #include /* - * Stream accesses are the same as normal accesses on i386/pc98; there are no + * Stream accesses are the same as normal accesses on i386; there are no * supported bus systems with an endianess different from the host one. */ #define bus_space_read_stream_1(t, h, o) bus_space_read_1((t), (h), (o)) ==== //depot/projects/hammer/sys/x86_64/include/clock.h#2 (text+ko) ==== @@ -35,12 +35,7 @@ int acquire_timer2(int mode); int release_timer0(void); int release_timer2(void); -#ifndef PC98 int rtcin(int val); -#else -int acquire_timer1(int mode); -int release_timer1(void); -#endif int sysbeep(int pitch, int period); void timer_restore(void); ==== //depot/projects/hammer/sys/x86_64/include/md_var.h#3 (text+ko) ==== @@ -50,10 +50,6 @@ extern u_int cyrix_did; extern uint16_t *elan_mmcr; extern char kstack[]; -#ifdef PC98 -extern int need_pre_dma_flush; -extern int need_post_dma_flush; -#endif extern void (*ovbcopy_vector)(const void *from, void *to, size_t len); extern char sigcode[]; extern int szsigcode; ==== //depot/projects/hammer/sys/x86_64/include/pci_cfgreg.h#2 (text+ko) ==== @@ -38,12 +38,7 @@ #define CONF1_ENABLE_RES1 0x80000000ul #define CONF2_ENABLE_PORT 0x0cf8 -#ifdef PC98 -#define CONF2_FORWARD_PORT 0x0cf9 -#else #define CONF2_FORWARD_PORT 0x0cfa -#endif - #define CONF2_ENABLE_CHK 0x0e #define CONF2_ENABLE_RES 0x0e ==== //depot/projects/hammer/sys/x86_64/isa/icu.h#2 (text+ko) ==== @@ -80,25 +80,6 @@ /* * Interrupt enable bits - in normal order of priority (which we change) */ -#ifdef PC98 -#define IRQ0 0x0001 -#define IRQ1 0x0002 -#define IRQ2 0x0004 -#define IRQ3 0x0008 -#define IRQ4 0x0010 -#define IRQ5 0x0020 -#define IRQ6 0x0040 -#define IRQ7 0x0080 -#define IRQ_SLAVE 0x0080 -#define IRQ8 0x0100 -#define IRQ9 0x0200 -#define IRQ10 0x0400 -#define IRQ11 0x0800 -#define IRQ12 0x1000 -#define IRQ13 0x2000 -#define IRQ14 0x4000 -#define IRQ15 0x8000 -#else #define IRQ0 0x0001 /* highest priority - timer */ #define IRQ1 0x0002 #define IRQ_SLAVE 0x0004 @@ -116,20 +97,14 @@ #define IRQ5 0x0020 #define IRQ6 0x0040 #define IRQ7 0x0080 /* lowest - parallel printer */ -#endif /* * Interrupt Control offset into Interrupt descriptor table (IDT) */ #define ICU_OFFSET 32 /* 0-31 are processor exceptions */ -#ifdef PC98 -#define ICU_IMR_OFFSET 2 -#define ICU_SLAVEID 7 -#else #define ICU_IMR_OFFSET 1 #define ICU_SLAVEID 2 -#endif #define ICU_EOI 0x20 #ifdef APIC_IO ==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#2 (text+ko) ==== @@ -64,13 +64,7 @@ #include #include #endif /* APIC_IO */ -#ifdef PC98 -#include -#include -#include -#else #include -#endif #include #ifdef DEV_ISA @@ -158,16 +152,11 @@ static void ithread_disable(int vector); static void init_i8259(void); -#ifdef PC98 -#define NMI_PARITY 0x04 -#define NMI_EPARITY 0x02 -#else #define NMI_PARITY (1 << 7) #define NMI_IOCHAN (1 << 6) #define ENMI_WATCHDOG (1 << 7) #define ENMI_BUSTIMER (1 << 6) #define ENMI_IOSTATUS (1 << 5) -#endif #ifdef DEV_ISA /* @@ -245,22 +234,6 @@ int cd; { int retval = 0; -#ifdef PC98 - int port = inb(0x33); - - log(LOG_CRIT, "NMI PC98 port = %x\n", port); - if (epson_machine_id == 0x20) - epson_outb(0xc16, epson_inb(0xc16) | 0x1); - if (port & NMI_PARITY) { - log(LOG_CRIT, "BASE RAM parity error, likely hardware failure."); - retval = 1; - } else if (port & NMI_EPARITY) { - log(LOG_CRIT, "EXTENDED RAM parity error, likely hardware failure."); - retval = 1; - } else { - log(LOG_CRIT, "\nNMI Resume ??\n"); - } -#else /* IBM-PC */ int isa_port = inb(0x61); int eisa_port = inb(0x461); @@ -302,7 +275,6 @@ log(LOG_CRIT, "EISA I/O port status error."); retval = 1; } -#endif return(retval); } @@ -361,24 +333,14 @@ outb(IO_ICU1+ICU_IMR_OFFSET, NRSVIDT); /* starting at this vector index */ outb(IO_ICU1+ICU_IMR_OFFSET, IRQ_SLAVE); /* slave on line 7 */ -#ifdef PC98 #ifdef AUTO_EOI_1 - outb(IO_ICU1+ICU_IMR_OFFSET, 0x1f); /* (master) auto EOI, 8086 mode */ -#else - outb(IO_ICU1+ICU_IMR_OFFSET, 0x1d); /* (master) 8086 mode */ -#endif -#else /* IBM-PC */ -#ifdef AUTO_EOI_1 outb(IO_ICU1+ICU_IMR_OFFSET, 2 | 1); /* auto EOI, 8086 mode */ #else outb(IO_ICU1+ICU_IMR_OFFSET, 1); /* 8086 mode */ #endif -#endif /* PC98 */ outb(IO_ICU1+ICU_IMR_OFFSET, 0xff); /* leave interrupts masked */ outb(IO_ICU1, 0x0a); /* default to IRR on read */ -#ifndef PC98 outb(IO_ICU1, 0xc0 | (3 - 1)); /* pri order 3-7, 0-2 (com2 first) */ -#endif /* !PC98 */ #ifdef DEV_MCA if (MCA_system) @@ -389,15 +351,11 @@ outb(IO_ICU2+ICU_IMR_OFFSET, NRSVIDT+8); /* staring at this vector index */ outb(IO_ICU2+ICU_IMR_OFFSET, ICU_SLAVEID); /* my slave id is 7 */ -#ifdef PC98 - outb(IO_ICU2+ICU_IMR_OFFSET,9); /* 8086 mode */ -#else /* IBM-PC */ #ifdef AUTO_EOI_2 outb(IO_ICU2+ICU_IMR_OFFSET, 2 | 1); /* auto EOI, 8086 mode */ #else outb(IO_ICU2+ICU_IMR_OFFSET,1); /* 8086 mode */ #endif -#endif /* PC98 */ outb(IO_ICU2+ICU_IMR_OFFSET, 0xff); /* leave interrupts masked */ outb(IO_ICU2, 0x0a); /* default to IRR on read */ } ==== //depot/projects/hammer/sys/x86_64/isa/isa.c#2 (text+ko) ==== @@ -61,9 +61,6 @@ #include #include #include -#ifdef PC98 -#include -#endif #include @@ -131,119 +128,13 @@ start, end, count, flags); } -#ifdef PC98 -/* - * Indirection support. The type of bus_space_handle_t is - * defined in sys/i386/include/bus_pc98.h. - */ -struct resource * -isa_alloc_resourcev(device_t child, int type, int *rid, - bus_addr_t *res, bus_size_t count, u_int flags) -{ - struct isa_device* idev = DEVTOISA(child); - struct resource_list *rl = &idev->id_resources; - - device_t bus = device_get_parent(child); - bus_addr_t start; - struct resource *re; - struct resource **bsre; - int i, j, k, linear_cnt, ressz, bsrid; - - start = bus_get_resource_start(child, type, *rid); - - linear_cnt = count; - ressz = 1; - for (i = 1; i < count; ++i) { - if (res[i] != res[i - 1] + 1) { - if (i < linear_cnt) - linear_cnt = i; - ++ressz; - } - } - - re = isa_alloc_resource(bus, child, type, rid, - start + res[0], start + res[linear_cnt - 1], - linear_cnt, flags); - if (re == NULL) - return NULL; - - bsre = malloc(sizeof (struct resource *) * ressz, M_DEVBUF, M_NOWAIT); - if (bsre == NULL) { - resource_list_release(rl, bus, child, type, *rid, re); - return NULL; - } - bsre[0] = re; - - for (i = linear_cnt, k = 1; i < count; i = j, k++) { - for (j = i + 1; j < count; j++) { - if (res[j] != res[j - 1] + 1) - break; - } - bsrid = *rid + k; - bsre[k] = isa_alloc_resource(bus, child, type, &bsrid, - start + res[i], start + res[j - 1], j - i, flags); - if (bsre[k] == NULL) { - for (k--; k >= 0; k--) - resource_list_release(rl, bus, child, type, - *rid + k, bsre[k]); - free(bsre, M_DEVBUF); - return NULL; - } - } - - re->r_bushandle->bsh_res = bsre; - re->r_bushandle->bsh_ressz = ressz; - - return re; -} - -int -isa_load_resourcev(struct resource *re, bus_addr_t *res, bus_size_t count) -{ - bus_addr_t start; - int i; - - if (count > re->r_bushandle->bsh_maxiatsz) { - printf("isa_load_resourcev: map size too large\n"); - return EINVAL; - } - - start = rman_get_start(re); - for (i = 0; i < re->r_bushandle->bsh_maxiatsz; i++) { - if (i < count) - re->r_bushandle->bsh_iat[i] = start + res[i]; - else - re->r_bushandle->bsh_iat[i] = start; - } - - re->r_bushandle->bsh_iatsz = count; - re->r_bushandle->bsh_bam = re->r_bustag->bs_ra; /* relocate access */ - - return 0; -} -#endif /* PC98 */ - int isa_release_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { struct isa_device* idev = DEVTOISA(child); struct resource_list *rl = &idev->id_resources; -#ifdef PC98 - /* - * Indirection support. The type of bus_space_handle_t is - * defined in sys/i386/include/bus_pc98.h. - */ - int i; - if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { - for (i = 1; i < r->r_bushandle->bsh_ressz; i++) - resource_list_release(rl, bus, child, type, rid + i, - r->r_bushandle->bsh_res[i]); - if (r->r_bushandle->bsh_res != NULL) - free(r->r_bushandle->bsh_res, M_DEVBUF); - } -#endif return resource_list_release(rl, bus, child, type, rid, r); } ==== //depot/projects/hammer/sys/x86_64/isa/isa.h#2 (text+ko) ==== @@ -37,10 +37,6 @@ * $FreeBSD: src/sys/i386/isa/isa.h,v 1.23 1999/08/28 00:44:54 peter Exp $ */ -#ifdef PC98 -#error isa.h is included from PC-9801 source -#endif - #ifndef _I386_ISA_ISA_H_ #define _I386_ISA_ISA_H_ ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#3 (text+ko) ==== @@ -77,12 +77,8 @@ #ifndef SMP #include -#ifdef PC98 -#include -#else #include #endif -#endif #include #ifdef DEV_ISA #include @@ -237,11 +233,7 @@ * The BUSY# latch must be cleared in all cases so that the next * unmasked npx exception causes an interrupt. */ -#ifdef PC98 - outb(0xf8, 0); -#else outb(0xf0, 0); -#endif /* * fpcurthread is normally non-null here. In that case, schedule an @@ -290,13 +282,8 @@ IO_NPX, IO_NPX, IO_NPXSIZE, RF_ACTIVE); if (ioport_res == NULL) panic("npx: can't get ports"); -#ifdef PC98 if (resource_int_value("npx", 0, "irq", &irq_num) != 0) - irq_num = 8; -#else - if (resource_int_value("npx", 0, "irq", &irq_num) != 0) irq_num = 13; -#endif irq_rid = 0; irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &ioport_rid, irq_num, irq_num, 1, RF_ACTIVE); @@ -311,12 +298,8 @@ * Partially reset the coprocessor, if any. Some BIOS's don't reset * it after a warm boot. */ -#ifdef PC98 - outb(0xf8,0); -#else outb(0xf1, 0); /* full reset on some systems, NOP on others */ outb(0xf0, 0); /* clear BUSY# latch */ -#endif /* * Prepare to trap all ESC (i.e., NPX) instructions and all WAIT * instructions. We must set the CR0_MP bit and use the CR0_TS @@ -1133,7 +1116,5 @@ static devclass_t npxisa_devclass; DRIVER_MODULE(npxisa, isa, npxisa_driver, npxisa_devclass, 0, 0); -#ifndef PC98 DRIVER_MODULE(npxisa, acpi, npxisa_driver, npxisa_devclass, 0, 0); -#endif #endif /* DEV_ISA */ ==== //depot/projects/hammer/sys/x86_64/isa/timerreg.h#2 (text+ko) ==== @@ -84,15 +84,9 @@ * Macros for specifying values to be written into a mode register. */ #define TIMER_CNTR0 (IO_TIMER1 + 0) /* timer 0 counter port */ -#ifdef PC98 -#define TIMER_CNTR1 0x3fdb /* timer 1 counter port */ -#define TIMER_CNTR2 (IO_TIMER1 + 4) /* timer 2 counter port */ -#define TIMER_MODE (IO_TIMER1 + 6) /* timer mode port */ -#else #define TIMER_CNTR1 (IO_TIMER1 + 1) /* timer 1 counter port */ #define TIMER_CNTR2 (IO_TIMER1 + 2) /* timer 2 counter port */ #define TIMER_MODE (IO_TIMER1 + 3) /* timer mode port */ -#endif #define TIMER_SEL0 0x00 /* select counter 0 */ #define TIMER_SEL1 0x40 /* select counter 1 */ #define TIMER_SEL2 0x80 /* select counter 2 */ ==== //depot/projects/hammer/sys/x86_64/isa/vector.s#2 (text+ko) ==== @@ -3,18 +3,10 @@ * $FreeBSD: src/sys/i386/isa/vector.s,v 1.37 2001/12/20 23:48:30 jhb Exp $ */ -/* - * modified for PC98 by Kakefuda - */ - #include "opt_auto_eoi.h" #include -#ifdef PC98 -#include -#else #include -#endif #include #define FAST_INTR_HANDLER_USES_ES 1 ==== //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#3 (text+ko) ==== @@ -206,10 +206,3 @@ ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); ASSYM(MTX_RECURSECNT, offsetof(struct mtx, mtx_recurse)); - -#ifdef PC98 -#include - -ASSYM(BUS_SPACE_HANDLE_BASE, offsetof(struct bus_space_handle, bsh_base)); -ASSYM(BUS_SPACE_HANDLE_IAT, offsetof(struct bus_space_handle, bsh_iat)); -#endif ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#6 (text+ko) ==== @@ -149,12 +149,6 @@ p0upa: .long 0 /* phys addr of proc0's UAREA */ p0kpa: .long 0 /* phys addr of proc0's STACK */ -#ifdef PC98 - .globl pc98_system_parameter -pc98_system_parameter: - .space 0x240 -#endif - /********************************************************************** * * Some handy macros @@ -212,18 +206,8 @@ */ NON_GPROF_ENTRY(btext) -#ifdef PC98 - /* save SYSTEM PARAMETER for resume (NS/T or other) */ - movl $0xa1400,%esi - movl $R(pc98_system_parameter),%edi - movl $0x0240,%ecx - cld - rep - movsb -#else /* IBM-PC */ /* Tell the bios to warmboot next time */ movw $0x1234,0x472 -#endif /* PC98 */ /* Set up a real frame in case the double return in newboot is executed. */ pushl %ebp @@ -251,33 +235,6 @@ */ movl $R(HIDENAME(tmpstk)),%esp -#ifdef PC98 - /* pc98_machine_type & M_EPSON_PC98 */ - testb $0x02,R(pc98_system_parameter)+220 - jz 3f - /* epson_machine_id <= 0x0b */ - cmpb $0x0b,R(pc98_system_parameter)+224 - ja 3f - - /* count up memory */ - movl $0x100000,%eax /* next, talley remaining memory */ - movl $0xFFF-0x100,%ecx -1: movl 0(%eax),%ebx /* save location to check */ - movl $0xa55a5aa5,0(%eax) /* write test pattern */ - cmpl $0xa55a5aa5,0(%eax) /* does not check yet for rollover */ - jne 2f - movl %ebx,0(%eax) /* restore memory */ - addl $PAGE_SIZE,%eax - loop 1b -2: subl $0x100000,%eax - shrl $17,%eax - movb %al,R(pc98_system_parameter)+1 -3: - - movw R(pc98_system_parameter+0x86),%ax - movw %ax,R(cpu_id) -#endif - call identify_cpu /* clear bss */ ==== //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#2 (text+ko) ==== @@ -66,12 +66,8 @@ #ifdef DEV_ISA #include -#ifdef PC98 -#include -#else #include #endif -#endif #include #include #include @@ -192,11 +188,7 @@ * multiple bridges. (eg: laptops with docking stations) */ drq_rman.rm_start = 0; -#ifdef PC98 - drq_rman.rm_end = 3; -#else drq_rman.rm_end = 7; -#endif drq_rman.rm_type = RMAN_ARRAY; drq_rman.rm_descr = "DMA request lines"; /* XXX drq 0 not available on some machines */ @@ -410,28 +402,11 @@ rman_set_bustag(rv, I386_BUS_SPACE_MEM); } else if (type == SYS_RES_IOPORT) { rman_set_bustag(rv, I386_BUS_SPACE_IO); -#ifndef PC98 rman_set_bushandle(rv, rv->r_start); -#endif } -#ifdef PC98 - if ((type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) && - i386_bus_space_handle_alloc(rv->r_bustag, rv->r_start, count, - &rv->r_bushandle) != 0) { - rman_release_resource(rv); - return 0; - } -#endif - if (needactivate) { if (bus_activate_resource(child, type, *rid, rv)) { -#ifdef PC98 - if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { - i386_bus_space_handle_free(rv->r_bustag, - rv->r_bushandle, rv->r_bushandle->bsh_sz); - } -#endif rman_release_resource(rv); return 0; } @@ -467,13 +442,7 @@ vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs; } rman_set_virtual(r, vaddr); -#ifdef PC98 - /* PC-98: the type of bus_space_handle_t is the structure. */ - r->r_bushandle->bsh_base = (bus_addr_t) vaddr; -#else - /* IBM-PC: the type of bus_space_handle_t is u_int */ rman_set_bushandle(r, (bus_space_handle_t) vaddr); -#endif } return (rman_activate_resource(r)); } @@ -505,12 +474,6 @@ if (error) return error; } -#ifdef PC98 - if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) { - i386_bus_space_handle_free(r->r_bustag, r->r_bushandle, - r->r_bushandle->bsh_sz); - } -#endif return (rman_release_resource(r)); } ==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#3 (text+ko) ==== @@ -42,9 +42,6 @@ */ #include "opt_npx.h" -#ifdef PC98 -#include "opt_pc98.h" -#endif #include "opt_reset.h" #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -80,11 +77,7 @@ #include -#ifdef PC98 -#include -#else #include -#endif static void cpu_reset_real(void); #ifdef SMP @@ -556,18 +549,7 @@ cpu_reset_real() { -#ifdef PC98 /* - * Attempt to do a CPU reset via CPU reset port. - */ - disable_intr(); - if ((inb(0x35) & 0xa0) != 0xa0) { - outb(0x37, 0x0f); /* SHUT0 = 0. */ - outb(0x37, 0x0b); /* SHUT1 = 0. */ - } - outb(0xf0, 0x00); /* Reset. */ -#else - /* * Attempt to do a CPU reset via the keyboard controller, * do not turn of the GateA20, as any machine that fails * to do the reset here would then end up in no man's land. @@ -579,7 +561,6 @@ printf("Keyboard reset did not work, attempting CPU shutdown\n"); DELAY(1000000); /* wait 1 sec for printf to complete */ #endif -#endif /* PC98 */ /* force a shutdown by unmapping entire address space ! */ bzero((caddr_t) PTD, PAGE_SIZE); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 20:11: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2205837B404; Fri, 20 Sep 2002 20:10:52 -0700 (PDT) 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 BF57C37B401 for ; Fri, 20 Sep 2002 20:10:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D47E43E65 for ; Fri, 20 Sep 2002 20:10:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L3ApCo003894 for ; Fri, 20 Sep 2002 20:10:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L3AorZ003880 for perforce@freebsd.org; Fri, 20 Sep 2002 20:10:50 -0700 (PDT) Date: Fri, 20 Sep 2002 20:10:50 -0700 (PDT) Message-Id: <200209210310.g8L3AorZ003880@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17814 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17814 Change 17814 by peter@peter_daintree on 2002/09/20 20:09:58 bring npx.c into the 1990's. Admit that FPU's exist as part of the cpu core and are not optional. This should get folded into the machdep area, rather than isa. Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/npx.c#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#4 (text+ko) ==== @@ -59,26 +59,16 @@ #include #include -#ifndef SMP -#include -#endif #include #include #include #include #include -#ifndef SMP -#include -#endif #include #include #include #include -#ifndef SMP -#include -#include -#endif #include #ifdef DEV_ISA #include @@ -158,9 +148,6 @@ static int npx_attach(device_t dev); static void npx_identify(driver_t *driver, device_t parent); -#ifndef SMP -static void npx_intr(void *); -#endif static int npx_probe(device_t dev); static void fpusave(union savefpu *); static void fpurstor(union savefpu *); @@ -169,36 +156,13 @@ void (*func)(void *buf, size_t len)); #endif /* I586_CPU */ -int hw_float; /* XXX currently just alias for npx_exists */ - +int hw_float = 1; SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, &hw_float, 0, "Floatingpoint instructions executed in hardware"); -#ifndef SMP -static volatile u_int npx_intrs_while_probing; -static volatile u_int npx_traps_while_probing; -#endif - static union savefpu npx_cleanstate; static bool_t npx_cleanstate_ready; -static bool_t npx_ex16; -static bool_t npx_exists; -static bool_t npx_irq13; - -#ifndef SMP -alias_for_inthand_t probetrap; -__asm(" \n\ - .text \n\ - .p2align 2,0x90 \n\ - .type " __XSTRING(CNAME(probetrap)) ",@function \n\ -" __XSTRING(CNAME(probetrap)) ": \n\ - ss \n\ - incl " __XSTRING(CNAME(npx_traps_while_probing)) " \n\ - fnclex \n\ - iret \n\ -"); -#endif /* SMP */ /* * Identify routine. Create a connection point on our parent for probing. @@ -215,49 +179,7 @@ panic("npx_identify"); } -#ifndef SMP /* - * Do minimal handling of npx interrupts to convert them to traps. - */ -static void -npx_intr(dummy) - void *dummy; -{ - struct thread *td; - -#ifndef SMP - npx_intrs_while_probing++; -#endif - - /* - * The BUSY# latch must be cleared in all cases so that the next - * unmasked npx exception causes an interrupt. - */ - outb(0xf0, 0); - - /* - * fpcurthread is normally non-null here. In that case, schedule an - * AST to finish the exception handling in the correct context - * (this interrupt may occur after the thread has entered the - * kernel via a syscall or an interrupt). Otherwise, the npx - * state of the thread that caused this interrupt must have been - * pushed to the thread's pcb, and clearing of the busy latch - * above has finished the (essentially null) handling of this - * interrupt. Control will eventually return to the instruction - * that caused it and it will repeat. We will eventually (usually - * soon) win the race to handle the interrupt properly. - */ - td = PCPU_GET(fpcurthread); - if (td != NULL) { - td->td_pcb->pcb_flags |= PCB_NPXTRAP; - mtx_lock_spin(&sched_lock); - td->td_kse->ke_flags |= KEF_ASTPENDING; - mtx_unlock_spin(&sched_lock); - } -} -#endif /* !SMP */ - -/* * Probe routine. Initialize cr0 to give correct behaviour for [f]wait * whether the device exists or not (XXX should be elsewhere). Set flags * to tell npxattach() what to do. Modify device struct if npx doesn't @@ -267,32 +189,6 @@ npx_probe(dev) device_t dev; { -#ifndef SMP - struct gate_descriptor save_idt_npxtrap; - struct resource *ioport_res, *irq_res; - void *irq_cookie; - int ioport_rid, irq_num, irq_rid; - u_short control; - u_short status; - - save_idt_npxtrap = idt[16]; - setidt(16, probetrap, SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - ioport_rid = 0; - ioport_res = bus_alloc_resource(dev, SYS_RES_IOPORT, &ioport_rid, - IO_NPX, IO_NPX, IO_NPXSIZE, RF_ACTIVE); - if (ioport_res == NULL) - panic("npx: can't get ports"); - if (resource_int_value("npx", 0, "irq", &irq_num) != 0) - irq_num = 13; - irq_rid = 0; - irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &ioport_rid, irq_num, - irq_num, 1, RF_ACTIVE); - if (irq_res == NULL) - panic("npx: can't get IRQ"); - if (bus_setup_intr(dev, irq_res, INTR_TYPE_MISC | INTR_FAST, npx_intr, - NULL, &irq_cookie) != 0) - panic("npx: can't create intr"); -#endif /* !SMP */ /* * Partially reset the coprocessor, if any. Some BIOS's don't reset @@ -320,116 +216,13 @@ */ stop_emulating(); /* - * Finish resetting the coprocessor, if any. If there is an error - * pending, then we may get a bogus IRQ13, but npx_intr() will handle - * it OK. Bogus halts have never been observed, but we enabled - * IRQ13 and cleared the BUSY# latch early to handle them anyway. + * Finish resetting the coprocessor. */ fninit(); device_set_desc(dev, "math processor"); -#ifdef SMP - - /* - * Exception 16 MUST work for SMP. - */ - npx_ex16 = hw_float = npx_exists = 1; return (0); - -#else /* !SMP */ - - /* - * Don't use fwait here because it might hang. - * Don't use fnop here because it usually hangs if there is no FPU. - */ - DELAY(1000); /* wait for any IRQ13 */ -#ifdef DIAGNOSTIC - if (npx_intrs_while_probing != 0) - printf("fninit caused %u bogus npx interrupt(s)\n", - npx_intrs_while_probing); - if (npx_traps_while_probing != 0) - printf("fninit caused %u bogus npx trap(s)\n", - npx_traps_while_probing); -#endif - /* - * Check for a status of mostly zero. - */ - status = 0x5a5a; - fnstsw(&status); - if ((status & 0xb8ff) == 0) { - /* - * Good, now check for a proper control word. - */ - control = 0x5a5a; - fnstcw(&control); - if ((control & 0x1f3f) == 0x033f) { - hw_float = npx_exists = 1; - /* - * We have an npx, now divide by 0 to see if exception - * 16 works. - */ - control &= ~(1 << 2); /* enable divide by 0 trap */ - fldcw(&control); -#ifdef FPU_ERROR_BROKEN - /* - * FPU error signal doesn't work on some CPU - * accelerator board. - */ - npx_ex16 = 1; - return (0); -#endif - npx_traps_while_probing = npx_intrs_while_probing = 0; - fp_divide_by_0(); - if (npx_traps_while_probing != 0) { - /* - * Good, exception 16 works. - */ - npx_ex16 = 1; - goto no_irq13; - } - if (npx_intrs_while_probing != 0) { - /* - * Bad, we are stuck with IRQ13. - */ - npx_irq13 = 1; - idt[16] = save_idt_npxtrap; - return (0); - } - /* - * Worse, even IRQ13 is broken. Use emulator. - */ - } - } - /* - * Probe failed, but we want to get to npxattach to initialize the - * emulator and say that it has been installed. XXX handle devices - * that aren't really devices better. - */ - /* FALLTHROUGH */ -no_irq13: - idt[16] = save_idt_npxtrap; - bus_teardown_intr(dev, irq_res, irq_cookie); - - /* - * XXX hack around brokenness of bus_teardown_intr(). If we left the - * irq active then we would get it instead of exception 16. - */ - { - register_t crit; - - crit = intr_disable(); - mtx_lock_spin(&icu_lock); - INTRDIS(1 << irq_num); - mtx_unlock_spin(&icu_lock); - intr_restore(crit); - } - - bus_release_resource(dev, SYS_RES_IRQ, irq_rid, irq_res); - bus_release_resource(dev, SYS_RES_IOPORT, ioport_rid, ioport_res); - return (0); - -#endif /* SMP */ } /* @@ -447,34 +240,7 @@ if (flags) device_printf(dev, "flags 0x%x ", flags); - if (npx_irq13) { - device_printf(dev, "using IRQ 13 interface\n"); - } else { -#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE) - if (npx_ex16) { - if (!(flags & NPX_PREFER_EMULATOR)) - device_printf(dev, "INT 16 interface\n"); - else { - device_printf(dev, "FPU exists, but flags request " - "emulator\n"); - hw_float = npx_exists = 0; - } - } else if (npx_exists) { - device_printf(dev, "error reporting broken; using 387 emulator\n"); - hw_float = npx_exists = 0; - } else - device_printf(dev, "387 emulator\n"); -#else - if (npx_ex16) { - device_printf(dev, "INT 16 interface\n"); - if (flags & NPX_PREFER_EMULATOR) { - device_printf(dev, "emulator requested, but none compiled " - "into kernel, using FPU\n"); - } - } else - device_printf(dev, "no 387 emulator in kernel and no FPU!\n"); -#endif - } + device_printf(dev, "INT 16 interface\n"); npxinit(__INITIAL_NPXCW__); if (npx_cleanstate_ready == 0) { @@ -485,23 +251,6 @@ npx_cleanstate_ready = 1; intr_restore(s); } -#ifdef I586_CPU_XXX - if (cpu_class == CPUCLASS_586 && npx_ex16 && npx_exists && - timezero("i586_bzero()", i586_bzero) < - timezero("bzero()", bzero) * 4 / 5) { - if (!(flags & NPX_DISABLE_I586_OPTIMIZED_BCOPY)) { - bcopy_vector = i586_bcopy; - ovbcopy_vector = i586_bcopy; - } - if (!(flags & NPX_DISABLE_I586_OPTIMIZED_BZERO)) - bzero = i586_bzero; - if (!(flags & NPX_DISABLE_I586_OPTIMIZED_COPYIO)) { - copyin_vector = i586_copyin; - copyout_vector = i586_copyout; - } - } -#endif - return (0); /* XXX unused */ } @@ -515,8 +264,6 @@ static union savefpu dummy; register_t savecrit; - if (!npx_exists) - return; /* * fninit has the same h/w bugs as fnsave. Use the detoxified * fnsave to throw away any junk in the fpu. npxsave() initializes @@ -542,6 +289,9 @@ npxexit(td) struct thread *td; { +#ifdef NPX_DEBUG + u_int masked_exceptions; +#endif register_t savecrit; savecrit = intr_disable(); @@ -549,20 +299,16 @@ npxsave(&PCPU_GET(curpcb)->pcb_save); intr_restore(savecrit); #ifdef NPX_DEBUG - if (npx_exists) { - u_int masked_exceptions; - - masked_exceptions = GET_FPU_CW(td) & GET_FPU_SW(td) & 0x7f; - /* - * Log exceptions that would have trapped with the old - * control word (overflow, divide by 0, and invalid operand). - */ - if (masked_exceptions & 0x0d) - log(LOG_ERR, - "pid %d (%s) exited with masked floating point exceptions 0x%02x\n", - td->td_proc->p_pid, td->td_proc->p_comm, - masked_exceptions); - } + masked_exceptions = GET_FPU_CW(td) & GET_FPU_SW(td) & 0x7f; + /* + * Log exceptions that would have trapped with the old + * control word (overflow, divide by 0, and invalid operand). + */ + if (masked_exceptions & 0x0d) + log(LOG_ERR, +"pid %d (%s) exited with masked floating point exceptions 0x%02x\n", + td->td_proc->p_pid, td->td_proc->p_comm, + masked_exceptions); #endif } @@ -570,8 +316,6 @@ npxformat() { - if (!npx_exists) - return (_MC_FPFMT_NODEV); #ifdef CPU_ENABLE_SSE if (cpu_fxsr) return (_MC_FPFMT_XMM); @@ -773,11 +517,6 @@ register_t savecrit; u_short control, status; - if (!npx_exists) { - printf("npxtrap: fpcurthread = %p, curthread = %p, npx_exists = %d\n", - PCPU_GET(fpcurthread), curthread, npx_exists); - panic("npxtrap from nowhere"); - } savecrit = intr_disable(); /* @@ -816,8 +555,6 @@ register_t s; u_short control; - if (!npx_exists) - return (0); if (PCPU_GET(fpcurthread) == curthread) { printf("npxdna: fpcurthread == curthread %d times\n", ++err_count); @@ -932,9 +669,6 @@ { register_t s; - if (!npx_exists) - return (_MC_FPOWNED_NONE); - if ((td->td_pcb->pcb_flags & PCB_NPXINITDONE) == 0) { if (npx_cleanstate_ready) bcopy(&npx_cleanstate, addr, sizeof(npx_cleanstate)); @@ -974,9 +708,6 @@ { register_t s; - if (!npx_exists) - return; - s = intr_disable(); if (curthread == PCPU_GET(fpcurthread)) { fpurstor(addr); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 20:11:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4B5637B404; Fri, 20 Sep 2002 20:11:53 -0700 (PDT) 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 54E1C37B401 for ; Fri, 20 Sep 2002 20:11:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1536643E42 for ; Fri, 20 Sep 2002 20:11:53 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L3BqCo004926 for ; Fri, 20 Sep 2002 20:11:52 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L3Bq1M004923 for perforce@freebsd.org; Fri, 20 Sep 2002 20:11:52 -0700 (PDT) Date: Fri, 20 Sep 2002 20:11:52 -0700 (PDT) Message-Id: <200209210311.g8L3Bq1M004923@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17815 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17815 Change 17815 by peter@peter_daintree on 2002/09/20 20:11:28 zap FPU emulator glue Affected files ... .. //depot/projects/hammer/sys/x86_64/include/npx.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/npx.h#2 (text+ko) ==== @@ -74,15 +74,6 @@ struct env87 sv_env; /* floating point control/status */ struct fpacc87 sv_ac[8]; /* accumulator contents, 0-7 */ u_char sv_pad0[4]; /* padding for (now unused) saved status word */ - /* - * Bogus padding for emulators. Emulators should use their own - * struct and arrange to store into this struct (ending here) - * before it is inspected for ptracing or for core dumps. Some - * emulators overwrite the whole struct. We have no good way of - * knowing how much padding to leave. Leave just enough for the - * GPL emulator's i387_union (176 bytes total). - */ - u_char sv_pad[64]; /* padding; used by emulators */ }; struct envxmm { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 20:16: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C6DA37B404; Fri, 20 Sep 2002 20:15:59 -0700 (PDT) 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 F190B37B401 for ; Fri, 20 Sep 2002 20:15:58 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9926F43E3B for ; Fri, 20 Sep 2002 20:15:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L3FwCo005147 for ; Fri, 20 Sep 2002 20:15:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L3FwHq005144 for perforce@freebsd.org; Fri, 20 Sep 2002 20:15:58 -0700 (PDT) Date: Fri, 20 Sep 2002 20:15:58 -0700 (PDT) Message-Id: <200209210315.g8L3FwHq005144@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17816 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17816 Change 17816 by peter@peter_daintree on 2002/09/20 20:15:22 continue decruftification. CPU_ENABLE_SSE is on. It is an architectural feature. We should panic if it isn't present. Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/npx.c#5 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#7 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#5 (text+ko) ==== @@ -74,13 +74,6 @@ #include #endif -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) -#define CPU_ENABLE_SSE -#endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif - /* * 387 and 287 Numeric Coprocessor Extension (NPX) Driver. */ @@ -101,10 +94,8 @@ #define fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) #define fp_divide_by_0() __asm("fldz; fld1; fdiv %st,%st(1); fnop") #define frstor(addr) __asm("frstor %0" : : "m" (*(addr))) -#ifdef CPU_ENABLE_SSE #define fxrstor(addr) __asm("fxrstor %0" : : "m" (*(addr))) #define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr))) -#endif #define start_emulating() __asm("smsw %%ax; orb %0,%%al; lmsw %%ax" \ : : "n" (CR0_TS) : "ax") #define stop_emulating() __asm("clts") @@ -119,16 +110,13 @@ void fnstsw(caddr_t addr); void fp_divide_by_0(void); void frstor(caddr_t addr); -#ifdef CPU_ENABLE_SSE void fxsave(caddr_t addr); void fxrstor(caddr_t addr); -#endif void start_emulating(void); void stop_emulating(void); #endif /* __GNUC__ */ -#ifdef CPU_ENABLE_SSE #define GET_FPU_CW(thread) \ (cpu_fxsr ? \ (thread)->td_pcb->pcb_save.sv_xmm.sv_env.en_cw : \ @@ -137,12 +125,6 @@ (cpu_fxsr ? \ (thread)->td_pcb->pcb_save.sv_xmm.sv_env.en_sw : \ (thread)->td_pcb->pcb_save.sv_87.sv_env.en_sw) -#else /* CPU_ENABLE_SSE */ -#define GET_FPU_CW(thread) \ - (thread->td_pcb->pcb_save.sv_87.sv_env.en_cw) -#define GET_FPU_SW(thread) \ - (thread->td_pcb->pcb_save.sv_87.sv_env.en_sw) -#endif /* CPU_ENABLE_SSE */ typedef u_char bool_t; @@ -272,11 +254,9 @@ savecrit = intr_disable(); npxsave(&dummy); stop_emulating(); -#ifdef CPU_ENABLE_SSE /* XXX npxsave() doesn't actually initialize the fpu in the SSE case. */ if (cpu_fxsr) fninit(); -#endif fldcw(&control); start_emulating(); intr_restore(savecrit); @@ -316,11 +296,10 @@ npxformat() { -#ifdef CPU_ENABLE_SSE if (cpu_fxsr) return (_MC_FPFMT_XMM); -#endif - return (_MC_FPFMT_387); + else + return (_MC_FPFMT_387); } /* @@ -680,14 +659,12 @@ s = intr_disable(); if (curthread == PCPU_GET(fpcurthread)) { fpusave(addr); -#ifdef CPU_ENABLE_SSE + /* + * fnsave initializes the FPU and destroys whatever + * context it contains. Make sure the FPU owner + * starts with a clean state next time. + */ if (!cpu_fxsr) -#endif - /* - * fnsave initializes the FPU and destroys whatever - * context it contains. Make sure the FPU owner - * starts with a clean state next time. - */ npxdrop(); intr_restore(s); return (_MC_FPOWNED_FPU); @@ -723,11 +700,9 @@ union savefpu *addr; { -#ifdef CPU_ENABLE_SSE if (cpu_fxsr) fxsave(addr); else -#endif fnsave(addr); } @@ -736,11 +711,9 @@ union savefpu *addr; { -#ifdef CPU_ENABLE_SSE if (cpu_fxsr) fxrstor(addr); else -#endif frstor(addr); } ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#7 (text+ko) ==== @@ -129,21 +129,12 @@ #define CS_SECURE(cs) (ISPL(cs) == SEL_UPL) #define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0) -#if !defined(CPU_ENABLE_SSE) && defined(I686_CPU) -#define CPU_ENABLE_SSE -#endif -#if defined(CPU_DISABLE_SSE) -#undef CPU_ENABLE_SSE -#endif - static void cpu_startup(void *); static void fpstate_drop(struct thread *td); static void get_fpcontext(struct thread *td, mcontext_t *mcp); static int set_fpcontext(struct thread *td, const mcontext_t *mcp); -#ifdef CPU_ENABLE_SSE static void set_fpregs_xmm(struct save87 *, struct savexmm *); static void fill_fpregs_xmm(struct savexmm *, struct save87 *); -#endif /* CPU_ENABLE_SSE */ SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL) int _udatasel, _ucodesel; @@ -1574,7 +1565,6 @@ return (0); } -#ifdef CPU_ENABLE_SSE static void fill_fpregs_xmm(sv_xmm, sv_87) struct savexmm *sv_xmm; @@ -1624,33 +1614,28 @@ for (i = 0; i < 8; ++i) sv_xmm->sv_fp[i].fp_acc = sv_87->sv_ac[i]; } -#endif /* CPU_ENABLE_SSE */ int fill_fpregs(struct thread *td, struct fpreg *fpregs) { -#ifdef CPU_ENABLE_SSE - if (cpu_fxsr) { + + if (cpu_fxsr) fill_fpregs_xmm(&td->td_pcb->pcb_save.sv_xmm, (struct save87 *)fpregs); - return (0); - } -#endif /* CPU_ENABLE_SSE */ - bcopy(&td->td_pcb->pcb_save.sv_87, fpregs, sizeof *fpregs); + else + bcopy(&td->td_pcb->pcb_save.sv_87, fpregs, sizeof *fpregs); return (0); } int set_fpregs(struct thread *td, struct fpreg *fpregs) { -#ifdef CPU_ENABLE_SSE - if (cpu_fxsr) { + + if (cpu_fxsr) set_fpregs_xmm((struct save87 *)fpregs, &td->td_pcb->pcb_save.sv_xmm); - return (0); - } -#endif /* CPU_ENABLE_SSE */ - bcopy(fpregs, &td->td_pcb->pcb_save.sv_87, sizeof *fpregs); + else + bcopy(fpregs, &td->td_pcb->pcb_save.sv_87, sizeof *fpregs); return (0); } @@ -1747,10 +1732,7 @@ * npxgetregs()'s internals. */ addr = (union savefpu *)&mcp->mc_fpstate; - if (td == PCPU_GET(fpcurthread) && -#ifdef CPU_ENABLE_SSE - cpu_fxsr && -#endif + if (td == PCPU_GET(fpcurthread) && cpu_fxsr && ((uintptr_t)(void *)addr & 0xF)) { do addr = (void *)((char *)addr + 4); @@ -1782,10 +1764,7 @@ mcp->mc_ownedfp == _MC_FPOWNED_PCB) { /* XXX align as above. */ addr = (union savefpu *)&mcp->mc_fpstate; - if (td == PCPU_GET(fpcurthread) && -#ifdef CPU_ENABLE_SSE - cpu_fxsr && -#endif + if (td == PCPU_GET(fpcurthread) && cpu_fxsr && ((uintptr_t)(void *)addr & 0xF)) { do addr = (void *)((char *)addr + 4); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 20:18: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33D7E37B404; Fri, 20 Sep 2002 20:18:02 -0700 (PDT) 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 D60E637B401 for ; Fri, 20 Sep 2002 20:18:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9477743E42 for ; Fri, 20 Sep 2002 20:18:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L3I1Co005250 for ; Fri, 20 Sep 2002 20:18:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L3I1Zb005247 for perforce@freebsd.org; Fri, 20 Sep 2002 20:18:01 -0700 (PDT) Date: Fri, 20 Sep 2002 20:18:01 -0700 (PDT) Message-Id: <200209210318.g8L3I1Zb005247@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17817 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17817 Change 17817 by peter@peter_daintree on 2002/09/20 20:17:09 nuke npx flags Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/npx.c#6 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#6 (text+ko) ==== @@ -78,12 +78,6 @@ * 387 and 287 Numeric Coprocessor Extension (NPX) Driver. */ -/* Configuration flags. */ -#define NPX_DISABLE_I586_OPTIMIZED_BCOPY (1 << 0) -#define NPX_DISABLE_I586_OPTIMIZED_BZERO (1 << 1) -#define NPX_DISABLE_I586_OPTIMIZED_COPYIO (1 << 2) -#define NPX_PREFER_EMULATOR (1 << 3) - #ifdef __GNUC__ #define fldcw(addr) __asm("fldcw %0" : : "m" (*(addr))) @@ -163,9 +157,9 @@ /* * Probe routine. Initialize cr0 to give correct behaviour for [f]wait - * whether the device exists or not (XXX should be elsewhere). Set flags - * to tell npxattach() what to do. Modify device struct if npx doesn't - * need to use interrupts. Return 0 if device exists. + * whether the device exists or not (XXX should be elsewhere). + * Modify device struct if npx doesn't need to use interrupts. + * Return 0 if device exists. */ static int npx_probe(dev) @@ -214,14 +208,8 @@ npx_attach(dev) device_t dev; { - int flags; register_t s; - if (resource_int_value("npx", 0, "flags", &flags) != 0) - flags = 0; - - if (flags) - device_printf(dev, "flags 0x%x ", flags); device_printf(dev, "INT 16 interface\n"); npxinit(__INITIAL_NPXCW__); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 20:27:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7332A37B401; Fri, 20 Sep 2002 20:27:14 -0700 (PDT) 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 1DC7B37B404 for ; Fri, 20 Sep 2002 20:27:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AEE743E4A for ; Fri, 20 Sep 2002 20:27:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L3RDCo007204 for ; Fri, 20 Sep 2002 20:27:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L3RCZV007201 for perforce@freebsd.org; Fri, 20 Sep 2002 20:27:12 -0700 (PDT) Date: Fri, 20 Sep 2002 20:27:12 -0700 (PDT) Message-Id: <200209210327.g8L3RCZV007201@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17818 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17818 Change 17818 by peter@peter_daintree on 2002/09/20 20:26:15 gut this file. Damn, it felt good to get rid of the I386_CPU braindamage handling stuff Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#2 (text+ko) ==== @@ -33,8 +33,6 @@ * $FreeBSD: src/sys/i386/i386/support.s,v 1.92 2002/09/16 19:25:08 mini Exp $ */ -#include "opt_npx.h" - #include #include #include @@ -42,30 +40,6 @@ #include "assym.s" -#define IDXSHIFT 10 - - .data - .globl bcopy_vector -bcopy_vector: - .long generic_bcopy - .globl bzero -bzero: - .long generic_bzero - .globl copyin_vector -copyin_vector: - .long generic_copyin - .globl copyout_vector -copyout_vector: - .long generic_copyout - .globl ovbcopy_vector -ovbcopy_vector: - .long generic_bcopy -#if defined(I586_CPU) && defined(DEV_NPX) -kernel_fpu_lock: - .byte 0xfe - .space 3 -#endif - .text /* @@ -73,7 +47,7 @@ * void bzero(void *buf, u_int len) */ -ENTRY(generic_bzero) +ENTRY(bzero) pushl %edi movl 8(%esp),%edi movl 12(%esp),%ecx @@ -89,267 +63,7 @@ popl %edi ret -#ifdef I486_CPU -ENTRY(i486_bzero) - movl 4(%esp),%edx - movl 8(%esp),%ecx - xorl %eax,%eax -/* - * do 64 byte chunks first - * - * XXX this is probably over-unrolled at least for DX2's - */ -2: - cmpl $64,%ecx - jb 3f - movl %eax,(%edx) - movl %eax,4(%edx) - movl %eax,8(%edx) - movl %eax,12(%edx) - movl %eax,16(%edx) - movl %eax,20(%edx) - movl %eax,24(%edx) - movl %eax,28(%edx) - movl %eax,32(%edx) - movl %eax,36(%edx) - movl %eax,40(%edx) - movl %eax,44(%edx) - movl %eax,48(%edx) - movl %eax,52(%edx) - movl %eax,56(%edx) - movl %eax,60(%edx) - addl $64,%edx - subl $64,%ecx - jnz 2b - ret - -/* - * do 16 byte chunks - */ - SUPERALIGN_TEXT -3: - cmpl $16,%ecx - jb 4f - movl %eax,(%edx) - movl %eax,4(%edx) - movl %eax,8(%edx) - movl %eax,12(%edx) - addl $16,%edx - subl $16,%ecx - jnz 3b - ret - -/* - * do 4 byte chunks - */ - SUPERALIGN_TEXT -4: - cmpl $4,%ecx - jb 5f - movl %eax,(%edx) - addl $4,%edx - subl $4,%ecx - jnz 4b - ret - -/* - * do 1 byte chunks - * a jump table seems to be faster than a loop or more range reductions - * - * XXX need a const section for non-text - */ - .data -jtab: - .long do0 - .long do1 - .long do2 - .long do3 - - .text - SUPERALIGN_TEXT -5: - jmp *jtab(,%ecx,4) - - SUPERALIGN_TEXT -do3: - movw %ax,(%edx) - movb %al,2(%edx) - ret - - SUPERALIGN_TEXT -do2: - movw %ax,(%edx) - ret - - SUPERALIGN_TEXT -do1: - movb %al,(%edx) - ret - - SUPERALIGN_TEXT -do0: - ret -#endif - -#if defined(I586_CPU) && defined(DEV_NPX) -ENTRY(i586_bzero) - movl 4(%esp),%edx - movl 8(%esp),%ecx - - /* - * The FPU register method is twice as fast as the integer register - * method unless the target is in the L1 cache and we pre-allocate a - * cache line for it (then the integer register method is 4-5 times - * faster). However, we never pre-allocate cache lines, since that - * would make the integer method 25% or more slower for the common - * case when the target isn't in either the L1 cache or the L2 cache. - * Thus we normally use the FPU register method unless the overhead - * would be too large. - */ - cmpl $256,%ecx /* empirical; clts, fninit, smsw cost a lot */ - jb intreg_i586_bzero - - /* - * The FPU registers may belong to an application or to fastmove() - * or to another invocation of bcopy() or ourself in a higher level - * interrupt or trap handler. Preserving the registers is - * complicated since we avoid it if possible at all levels. We - * want to localize the complications even when that increases them. - * Here the extra work involves preserving CR0_TS in TS. - * `fpcurthread != NULL' is supposed to be the condition that all the - * FPU resources belong to an application, but fpcurthread and CR0_TS - * aren't set atomically enough for this condition to work in - * interrupt handlers. - * - * Case 1: FPU registers belong to the application: we must preserve - * the registers if we use them, so we only use the FPU register - * method if the target size is large enough to amortize the extra - * overhead for preserving them. CR0_TS must be preserved although - * it is very likely to end up as set. - * - * Case 2: FPU registers belong to fastmove(): fastmove() currently - * makes the registers look like they belong to an application so - * that cpu_switch() and savectx() don't have to know about it, so - * this case reduces to case 1. - * - * Case 3: FPU registers belong to the kernel: don't use the FPU - * register method. This case is unlikely, and supporting it would - * be more complicated and might take too much stack. - * - * Case 4: FPU registers don't belong to anyone: the FPU registers - * don't need to be preserved, so we always use the FPU register - * method. CR0_TS must be preserved although it is very likely to - * always end up as clear. - */ - cmpl $0,PCPU(FPCURTHREAD) - je i586_bz1 - - /* - * XXX don't use the FPU for cases 1 and 2, since preemptive - * scheduling of ithreads broke these cases. Note that we can - * no longer get here from an interrupt handler, since the - * context sitch to the interrupt handler will have saved the - * FPU state. - */ - jmp intreg_i586_bzero - - cmpl $256+184,%ecx /* empirical; not quite 2*108 more */ - jb intreg_i586_bzero - sarb $1,kernel_fpu_lock - jc intreg_i586_bzero - smsw %ax - clts - subl $108,%esp - fnsave 0(%esp) - jmp i586_bz2 - -i586_bz1: - sarb $1,kernel_fpu_lock - jc intreg_i586_bzero - smsw %ax - clts - fninit /* XXX should avoid needing this */ -i586_bz2: - fldz - - /* - * Align to an 8 byte boundary (misalignment in the main loop would - * cost a factor of >= 2). Avoid jumps (at little cost if it is - * already aligned) by always zeroing 8 bytes and using the part up - * to the _next_ alignment position. - */ - fstl 0(%edx) - addl %edx,%ecx /* part of %ecx -= new_%edx - %edx */ - addl $8,%edx - andl $~7,%edx - subl %edx,%ecx - - /* - * Similarly align `len' to a multiple of 8. - */ - fstl -8(%edx,%ecx) - decl %ecx - andl $~7,%ecx - - /* - * This wouldn't be any faster if it were unrolled, since the loop - * control instructions are much faster than the fstl and/or done - * in parallel with it so their overhead is insignificant. - */ -fpureg_i586_bzero_loop: - fstl 0(%edx) - addl $8,%edx - subl $8,%ecx - cmpl $8,%ecx - jae fpureg_i586_bzero_loop - - cmpl $0,PCPU(FPCURTHREAD) - je i586_bz3 - - /* XXX check that the condition for cases 1-2 stayed false. */ -i586_bzero_oops: - int $3 - jmp i586_bzero_oops - - frstor 0(%esp) - addl $108,%esp - lmsw %ax - movb $0xfe,kernel_fpu_lock - ret - -i586_bz3: - fstp %st(0) - lmsw %ax - movb $0xfe,kernel_fpu_lock - ret - -intreg_i586_bzero: - /* - * `rep stos' seems to be the best method in practice for small - * counts. Fancy methods usually take too long to start up due - * to cache and BTB misses. - */ - pushl %edi - movl %edx,%edi - xorl %eax,%eax - shrl $2,%ecx - cld - rep - stosl - movl 12(%esp),%ecx - andl $3,%ecx - jne 1f - popl %edi - ret - -1: - rep - stosb - popl %edi - ret -#endif /* I586_CPU && defined(DEV_NPX) */ - -ENTRY(i686_pagezero) +ENTRY(pagezero) pushl %edi pushl %ebx @@ -442,19 +156,12 @@ cld ret -ENTRY(bcopy) - MEXITCOUNT - jmp *bcopy_vector - -ENTRY(ovbcopy) - MEXITCOUNT - jmp *ovbcopy_vector - /* - * generic_bcopy(src, dst, cnt) + * bcopy(src, dst, cnt) * ws@tools.de (Wolfgang Solfrank, TooLs GmbH) +49-228-985800 */ -ENTRY(generic_bcopy) +ALTENTRY(ovbcopy) +ENTRY(bcopy) pushl %esi pushl %edi movl 12(%esp),%esi @@ -499,155 +206,6 @@ cld ret -#if defined(I586_CPU) && defined(DEV_NPX) -ENTRY(i586_bcopy) - pushl %esi - pushl %edi - movl 12(%esp),%esi - movl 16(%esp),%edi - movl 20(%esp),%ecx - - movl %edi,%eax - subl %esi,%eax - cmpl %ecx,%eax /* overlapping && src < dst? */ - jb 1f - - cmpl $1024,%ecx - jb small_i586_bcopy - - sarb $1,kernel_fpu_lock - jc small_i586_bcopy - cmpl $0,PCPU(FPCURTHREAD) - je i586_bc1 - - /* XXX turn off handling of cases 1-2, as above. */ - movb $0xfe,kernel_fpu_lock - jmp small_i586_bcopy - - smsw %dx - clts - subl $108,%esp - fnsave 0(%esp) - jmp 4f - -i586_bc1: - smsw %dx - clts - fninit /* XXX should avoid needing this */ - - ALIGN_TEXT -4: - pushl %ecx -#define DCACHE_SIZE 8192 - cmpl $(DCACHE_SIZE-512)/2,%ecx - jbe 2f - movl $(DCACHE_SIZE-512)/2,%ecx -2: - subl %ecx,0(%esp) - cmpl $256,%ecx - jb 5f /* XXX should prefetch if %ecx >= 32 */ - pushl %esi - pushl %ecx - ALIGN_TEXT -3: - movl 0(%esi),%eax - movl 32(%esi),%eax - movl 64(%esi),%eax - movl 96(%esi),%eax - movl 128(%esi),%eax - movl 160(%esi),%eax - movl 192(%esi),%eax - movl 224(%esi),%eax - addl $256,%esi - subl $256,%ecx - cmpl $256,%ecx - jae 3b - popl %ecx - popl %esi -5: - ALIGN_TEXT -large_i586_bcopy_loop: - fildq 0(%esi) - fildq 8(%esi) - fildq 16(%esi) - fildq 24(%esi) - fildq 32(%esi) - fildq 40(%esi) - fildq 48(%esi) - fildq 56(%esi) - fistpq 56(%edi) - fistpq 48(%edi) - fistpq 40(%edi) - fistpq 32(%edi) - fistpq 24(%edi) - fistpq 16(%edi) - fistpq 8(%edi) - fistpq 0(%edi) - addl $64,%esi - addl $64,%edi - subl $64,%ecx - cmpl $64,%ecx - jae large_i586_bcopy_loop - popl %eax - addl %eax,%ecx - cmpl $64,%ecx - jae 4b - - cmpl $0,PCPU(FPCURTHREAD) - je i586_bc2 - - /* XXX check that the condition for cases 1-2 stayed false. */ -i586_bcopy_oops: - int $3 - jmp i586_bcopy_oops - - frstor 0(%esp) - addl $108,%esp -i586_bc2: - lmsw %dx - movb $0xfe,kernel_fpu_lock - -/* - * This is a duplicate of the main part of generic_bcopy. See the comments - * there. Jumping into generic_bcopy would cost a whole 0-1 cycles and - * would mess up high resolution profiling. - */ - ALIGN_TEXT -small_i586_bcopy: - shrl $2,%ecx - cld - rep - movsl - movl 20(%esp),%ecx - andl $3,%ecx - rep - movsb - popl %edi - popl %esi - ret - - ALIGN_TEXT -1: - addl %ecx,%edi - addl %ecx,%esi - decl %edi - decl %esi - andl $3,%ecx - std - rep - movsb - movl 20(%esp),%ecx - shrl $2,%ecx - subl $3,%esi - subl $3,%edi - rep - movsl - popl %edi - popl %esi - cld - ret -#endif /* I586_CPU && defined(DEV_NPX) */ - /* * Note: memcpy does not support overlapping copies */ @@ -690,13 +248,9 @@ */ /* - * copyout(from_kernel, to_user, len) - MP SAFE (if not I386_CPU) + * copyout(from_kernel, to_user, len) - MP SAFE */ ENTRY(copyout) - MEXITCOUNT - jmp *copyout_vector - -ENTRY(generic_copyout) movl PCPU(CURPCB),%eax movl $copyout_fault,PCB_ONFAULT(%eax) pushl %esi @@ -730,65 +284,9 @@ cmpl $VM_MAXUSER_ADDRESS,%eax ja copyout_fault -#ifdef I386_CPU - -/* - * We have to check each PTE for user write permission. - * The checking may cause a page fault, so it is important to set - * up everything for return via copyout_fault before here. - */ - /* compute number of pages */ - movl %edi,%ecx - andl $PAGE_MASK,%ecx - addl %ebx,%ecx - decl %ecx - shrl $IDXSHIFT+2,%ecx - incl %ecx - - /* compute PTE offset for start address */ - movl %edi,%edx - shrl $IDXSHIFT,%edx - andb $0xfc,%dl - -1: - /* check PTE for each page */ - leal PTmap(%edx),%eax - shrl $IDXSHIFT,%eax - andb $0xfc,%al - testb $PG_V,PTmap(%eax) /* PTE page must be valid */ - je 4f - movb PTmap(%edx),%al - andb $PG_V|PG_RW|PG_U,%al /* page must be valid and user writable */ - cmpb $PG_V|PG_RW|PG_U,%al - je 2f - -4: - /* simulate a trap */ - pushl %edx - pushl %ecx - shll $IDXSHIFT,%edx - pushl %edx - call trapwrite /* trapwrite(addr) */ - popl %edx - popl %ecx - popl %edx - - testl %eax,%eax /* if not ok, return EFAULT */ - jnz copyout_fault - -2: - addl $4,%edx - decl %ecx - jnz 1b /* check next page */ -#endif /* I386_CPU */ - /* bcopy(%esi, %edi, %ebx) */ movl %ebx,%ecx -#if defined(I586_CPU) && defined(DEV_NPX) - ALIGN_TEXT -slow_copyout: -#endif shrl $2,%ecx cld rep @@ -817,68 +315,10 @@ movl $EFAULT,%eax ret -#if defined(I586_CPU) && defined(DEV_NPX) -ENTRY(i586_copyout) - /* - * Duplicated from generic_copyout. Could be done a bit better. - */ - movl PCPU(CURPCB),%eax - movl $copyout_fault,PCB_ONFAULT(%eax) - pushl %esi - pushl %edi - pushl %ebx - movl 16(%esp),%esi - movl 20(%esp),%edi - movl 24(%esp),%ebx - testl %ebx,%ebx /* anything to do? */ - jz done_copyout - - /* - * Check explicitly for non-user addresses. If 486 write protection - * is being used, this check is essential because we are in kernel - * mode so the h/w does not provide any protection against writing - * kernel addresses. - */ - - /* - * First, prevent address wrapping. - */ - movl %edi,%eax - addl %ebx,%eax - jc copyout_fault -/* - * XXX STOP USING VM_MAXUSER_ADDRESS. - * It is an end address, not a max, so every time it is used correctly it - * looks like there is an off by one error, and of course it caused an off - * by one error in several places. - */ - cmpl $VM_MAXUSER_ADDRESS,%eax - ja copyout_fault - - /* bcopy(%esi, %edi, %ebx) */ -3: - movl %ebx,%ecx - /* - * End of duplicated code. - */ - - cmpl $1024,%ecx - jb slow_copyout - - pushl %ecx - call fastmove - addl $4,%esp - jmp done_copyout -#endif /* I586_CPU && defined(DEV_NPX) */ - /* * copyin(from_user, to_kernel, len) - MP SAFE */ ENTRY(copyin) - MEXITCOUNT - jmp *copyin_vector - -ENTRY(generic_copyin) movl PCPU(CURPCB),%eax movl $copyin_fault,PCB_ONFAULT(%eax) pushl %esi @@ -896,10 +336,6 @@ cmpl $VM_MAXUSER_ADDRESS,%edx ja copyin_fault -#if defined(I586_CPU) && defined(DEV_NPX) - ALIGN_TEXT -slow_copyin: -#endif movb %cl,%al shrl $2,%ecx /* copy longword-wise */ cld @@ -910,10 +346,6 @@ rep movsb -#if defined(I586_CPU) && defined(DEV_NPX) - ALIGN_TEXT -done_copyin: -#endif popl %edi popl %esi xorl %eax,%eax @@ -930,248 +362,6 @@ movl $EFAULT,%eax ret -#if defined(I586_CPU) && defined(DEV_NPX) -ENTRY(i586_copyin) - /* - * Duplicated from generic_copyin. Could be done a bit better. - */ - movl PCPU(CURPCB),%eax - movl $copyin_fault,PCB_ONFAULT(%eax) - pushl %esi - pushl %edi - movl 12(%esp),%esi /* caddr_t from */ - movl 16(%esp),%edi /* caddr_t to */ - movl 20(%esp),%ecx /* size_t len */ - - /* - * make sure address is valid - */ - movl %esi,%edx - addl %ecx,%edx - jc copyin_fault - cmpl $VM_MAXUSER_ADDRESS,%edx - ja copyin_fault - /* - * End of duplicated code. - */ - - cmpl $1024,%ecx - jb slow_copyin - - pushl %ebx /* XXX prepare for fastmove_fault */ - pushl %ecx - call fastmove - addl $8,%esp - jmp done_copyin -#endif /* I586_CPU && defined(DEV_NPX) */ - -#if defined(I586_CPU) && defined(DEV_NPX) -/* fastmove(src, dst, len) - src in %esi - dst in %edi - len in %ecx XXX changed to on stack for profiling - uses %eax and %edx for tmp. storage - */ -/* XXX use ENTRY() to get profiling. fastmove() is actually a non-entry. */ -ENTRY(fastmove) - pushl %ebp - movl %esp,%ebp - subl $PCB_SAVEFPU_SIZE+3*4,%esp - - movl 8(%ebp),%ecx - cmpl $63,%ecx - jbe fastmove_tail - - testl $7,%esi /* check if src addr is multiple of 8 */ - jnz fastmove_tail - - testl $7,%edi /* check if dst addr is multiple of 8 */ - jnz fastmove_tail - - /* XXX grab FPU context atomically. */ - cli - -/* if (fpcurthread != NULL) { */ - cmpl $0,PCPU(FPCURTHREAD) - je 6f -/* fnsave(&curpcb->pcb_savefpu); */ - movl PCPU(CURPCB),%eax - fnsave PCB_SAVEFPU(%eax) -/* FPCURTHREAD = NULL; */ - movl $0,PCPU(FPCURTHREAD) -/* } */ -6: -/* now we own the FPU. */ - -/* - * The process' FP state is saved in the pcb, but if we get - * switched, the cpu_switch() will store our FP state in the - * pcb. It should be possible to avoid all the copying for - * this, e.g., by setting a flag to tell cpu_switch() to - * save the state somewhere else. - */ -/* tmp = curpcb->pcb_savefpu; */ - movl %ecx,-12(%ebp) - movl %esi,-8(%ebp) - movl %edi,-4(%ebp) - movl %esp,%edi - movl PCPU(CURPCB),%esi - addl $PCB_SAVEFPU,%esi - cld - movl $PCB_SAVEFPU_SIZE>>2,%ecx - rep - movsl - movl -12(%ebp),%ecx - movl -8(%ebp),%esi - movl -4(%ebp),%edi -/* stop_emulating(); */ - clts -/* fpcurthread = curthread; */ - movl PCPU(CURTHREAD),%eax - movl %eax,PCPU(FPCURTHREAD) - movl PCPU(CURPCB),%eax - - /* XXX end of atomic FPU context grab. */ - sti - - movl $fastmove_fault,PCB_ONFAULT(%eax) -4: - movl %ecx,-12(%ebp) - cmpl $1792,%ecx - jbe 2f - movl $1792,%ecx -2: - subl %ecx,-12(%ebp) - cmpl $256,%ecx - jb 5f - movl %ecx,-8(%ebp) - movl %esi,-4(%ebp) - ALIGN_TEXT -3: - movl 0(%esi),%eax - movl 32(%esi),%eax - movl 64(%esi),%eax - movl 96(%esi),%eax - movl 128(%esi),%eax - movl 160(%esi),%eax - movl 192(%esi),%eax - movl 224(%esi),%eax - addl $256,%esi - subl $256,%ecx - cmpl $256,%ecx - jae 3b - movl -8(%ebp),%ecx - movl -4(%ebp),%esi -5: - ALIGN_TEXT -fastmove_loop: - fildq 0(%esi) - fildq 8(%esi) - fildq 16(%esi) - fildq 24(%esi) - fildq 32(%esi) - fildq 40(%esi) - fildq 48(%esi) - fildq 56(%esi) - fistpq 56(%edi) - fistpq 48(%edi) - fistpq 40(%edi) - fistpq 32(%edi) - fistpq 24(%edi) - fistpq 16(%edi) - fistpq 8(%edi) - fistpq 0(%edi) - addl $-64,%ecx - addl $64,%esi - addl $64,%edi - cmpl $63,%ecx - ja fastmove_loop - movl -12(%ebp),%eax - addl %eax,%ecx - cmpl $64,%ecx - jae 4b - - /* XXX ungrab FPU context atomically. */ - cli - -/* curpcb->pcb_savefpu = tmp; */ - movl %ecx,-12(%ebp) - movl %esi,-8(%ebp) - movl %edi,-4(%ebp) - movl PCPU(CURPCB),%edi - addl $PCB_SAVEFPU,%edi - movl %esp,%esi - cld - movl $PCB_SAVEFPU_SIZE>>2,%ecx - rep - movsl - movl -12(%ebp),%ecx - movl -8(%ebp),%esi - movl -4(%ebp),%edi - -/* start_emulating(); */ - smsw %ax - orb $CR0_TS,%al - lmsw %ax -/* fpcurthread = NULL; */ - movl $0,PCPU(FPCURTHREAD) - - /* XXX end of atomic FPU context ungrab. */ - sti - - ALIGN_TEXT -fastmove_tail: - movl PCPU(CURPCB),%eax - movl $fastmove_tail_fault,PCB_ONFAULT(%eax) - - movb %cl,%al - shrl $2,%ecx /* copy longword-wise */ - cld - rep - movsl - movb %al,%cl - andb $3,%cl /* copy remaining bytes */ - rep - movsb - - movl %ebp,%esp - popl %ebp - ret - - ALIGN_TEXT -fastmove_fault: - /* XXX ungrab FPU context atomically. */ - cli - - movl PCPU(CURPCB),%edi - addl $PCB_SAVEFPU,%edi - movl %esp,%esi - cld - movl $PCB_SAVEFPU_SIZE>>2,%ecx - rep - movsl - - smsw %ax - orb $CR0_TS,%al - lmsw %ax - movl $0,PCPU(FPCURTHREAD) - - /* XXX end of atomic FPU context ungrab. */ - sti - -fastmove_tail_fault: - movl %ebp,%esp - popl %ebp - addl $8,%esp - popl %ebx - popl %edi - popl %esi - movl PCPU(CURPCB),%edx - movl $0,PCB_ONFAULT(%edx) - movl $EFAULT,%eax - ret -#endif /* I586_CPU && defined(DEV_NPX) */ - /* * fu{byte,sword,word} - MP SAFE * @@ -1242,7 +432,7 @@ ret /* - * su{byte,sword,word} - MP SAFE (if not I386_CPU) + * su{byte,sword,word} - MP SAFE * * Write a byte (word, longword) to user memory */ @@ -1251,34 +441,6 @@ movl $fusufault,PCB_ONFAULT(%ecx) movl 4(%esp),%edx -#ifdef I386_CPU - - /* XXX - page boundary crossing is still not handled */ - movl %edx,%eax - shrl $IDXSHIFT,%edx - andb $0xfc,%dl - - leal PTmap(%edx),%ecx - shrl $IDXSHIFT,%ecx - andb $0xfc,%cl - testb $PG_V,PTmap(%ecx) /* PTE page must be valid */ - je 4f - movb PTmap(%edx),%dl - andb $PG_V|PG_RW|PG_U,%dl /* page must be valid and user writable */ - cmpb $PG_V|PG_RW|PG_U,%dl - je 1f - -4: - /* simulate a trap */ - pushl %eax - call trapwrite - popl %edx /* remove junk parameter from stack */ - testl %eax,%eax - jnz fusufault -1: - movl 4(%esp),%edx -#endif - cmpl $VM_MAXUSER_ADDRESS-4,%edx /* verify address validity */ ja fusufault @@ -1293,41 +455,13 @@ jmp suword /* - * suword16 - MP SAFE (if not I386_CPU) + * suword16 - MP SAFE */ ENTRY(suword16) movl PCPU(CURPCB),%ecx movl $fusufault,PCB_ONFAULT(%ecx) movl 4(%esp),%edx -#ifdef I386_CPU - - /* XXX - page boundary crossing is still not handled */ - movl %edx,%eax - shrl $IDXSHIFT,%edx - andb $0xfc,%dl - - leal PTmap(%edx),%ecx - shrl $IDXSHIFT,%ecx - andb $0xfc,%cl - testb $PG_V,PTmap(%ecx) /* PTE page must be valid */ - je 4f - movb PTmap(%edx),%dl >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 20:30:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FB3237B404; Fri, 20 Sep 2002 20:30:19 -0700 (PDT) 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 7E88F37B401 for ; Fri, 20 Sep 2002 20:30:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19F3243E77 for ; Fri, 20 Sep 2002 20:30:18 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L3UHCo007517 for ; Fri, 20 Sep 2002 20:30:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L3UH9C007514 for perforce@freebsd.org; Fri, 20 Sep 2002 20:30:17 -0700 (PDT) Date: Fri, 20 Sep 2002 20:30:17 -0700 (PDT) Message-Id: <200209210330.g8L3UH9C007514@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17819 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17819 Change 17819 by peter@peter_daintree on 2002/09/20 20:30:00 unifdef -U I386_CPU Affected files ... .. //depot/projects/hammer/sys/x86_64/include/atomic.h#2 edit .. //depot/projects/hammer/sys/x86_64/include/cpu.h#3 edit .. //depot/projects/hammer/sys/x86_64/isa/npx.c#7 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#8 edit .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/atomic.h#2 (text+ko) ==== @@ -117,34 +117,6 @@ #if defined(__GNUC__) -#if defined(I386_CPU) - -static __inline int -atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) -{ - int res = exp; - - __asm __volatile( - " pushfl ; " - " cli ; " - " cmpl %0,%2 ; " - " jne 1f ; " - " movl %1,%2 ; " - "1: " - " sete %%al; " - " movzbl %%al,%0 ; " - " popfl ; " - "# atomic_cmpset_int" - : "+a" (res) /* 0 (result) */ - : "r" (src), /* 1 */ - "m" (*(dst)) /* 2 */ - : "memory"); - - return (res); -} - -#else /* defined(I386_CPU) */ - static __inline int atomic_cmpset_int(volatile u_int *dst, u_int exp, u_int src) { @@ -165,36 +137,10 @@ return (res); } -#endif /* defined(I386_CPU) */ - #endif /* defined(__GNUC__) */ #if defined(__GNUC__) -#if defined(I386_CPU) - -/* - * We assume that a = b will do atomic loads and stores. - * - * XXX: This is _NOT_ safe on a P6 or higher because it does not guarantee - * memory ordering. These should only be used on a 386. - */ -#define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ -static __inline u_##TYPE \ -atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ -{ \ - return (*p); \ -} \ - \ -static __inline void \ -atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ -{ \ - *p = v; \ - __asm __volatile("" : : : "memory"); \ -} - -#else /* !defined(I386_CPU) */ - #define ATOMIC_STORE_LOAD(TYPE, LOP, SOP) \ static __inline u_##TYPE \ atomic_load_acq_##TYPE(volatile u_##TYPE *p) \ @@ -221,8 +167,6 @@ : : "memory"); \ } -#endif /* defined(I386_CPU) */ - #else /* !defined(__GNUC__) */ extern int atomic_cmpset_int(volatile u_int *, u_int, u_int); ==== //depot/projects/hammer/sys/x86_64/include/cpu.h#3 (text+ko) ==== @@ -99,14 +99,7 @@ static __inline u_int64_t get_cyclecount(void) { -#if defined(I386_CPU) || defined(I486_CPU) - struct timespec tv; - if (!tsc_present) { - nanotime(&tv); - return (tv.tv_sec * (u_int64_t)1000000000 + tv.tv_nsec); - } -#endif return (rdtsc()); } ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#7 (text+ko) ==== @@ -35,7 +35,6 @@ * $FreeBSD: src/sys/i386/isa/npx.c,v 1.131 2002/09/16 19:25:59 mini Exp $ */ -#include "opt_cpu.h" #include "opt_debug_npx.h" #include "opt_isa.h" #include "opt_npx.h" @@ -127,10 +126,6 @@ static int npx_probe(device_t dev); static void fpusave(union savefpu *); static void fpurstor(union savefpu *); -#ifdef I586_CPU_XXX -static long timezero(const char *funcname, - void (*func)(void *buf, size_t len)); -#endif /* I586_CPU */ int hw_float = 1; SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, @@ -560,7 +555,6 @@ * appear to have been triggered by the current (npx) user * instruction even when that instruction is a no-wait * instruction that should not trigger an error (e.g., - * fnclex). On at least one 486 system all of the no-wait * instructions are broken the same as frstor, so our * treatment does not amplify the breakage. On at least * one 386/Cyrix 387 system, fnclex works correctly while @@ -705,36 +699,6 @@ frstor(addr); } -#ifdef I586_CPU_XXX -static long -timezero(funcname, func) - const char *funcname; - void (*func)(void *buf, size_t len); - -{ - void *buf; -#define BUFSIZE 1048576 - long usec; - struct timeval finish, start; - - buf = malloc(BUFSIZE, M_TEMP, M_NOWAIT); - if (buf == NULL) - return (BUFSIZE); - microtime(&start); - (*func)(buf, BUFSIZE); - microtime(&finish); - usec = 1000000 * (finish.tv_sec - start.tv_sec) + - finish.tv_usec - start.tv_usec; - if (usec <= 0) - usec = 1; - if (bootverbose) - printf("%s bandwidth = %u kBps\n", funcname, - (u_int32_t)(((BUFSIZE >> 10) * 1000000) / usec)); - free(buf, M_TEMP); - return (usec); -} -#endif /* I586_CPU */ - static device_method_t npx_methods[] = { /* Device interface */ DEVMETHOD(device_identify, npx_identify), ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#8 (text+ko) ==== @@ -620,9 +620,7 @@ cr0 |= CR0_NE; /* Done by npxinit() */ #endif cr0 |= CR0_MP | CR0_TS; /* Done at every execve() too. */ -#ifndef I386_CPU cr0 |= CR0_WP | CR0_AM; -#endif load_cr0(cr0); load_gs(_udatasel); } ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#2 (text+ko) ==== @@ -578,34 +578,6 @@ return 0; } -#ifdef I386_CPU -/* - * i386 only has "invalidate everything" and no SMP to worry about. - */ -PMAP_INLINE void -pmap_invalidate_page(pmap_t pmap, vm_offset_t va) -{ - - if (pmap == kernel_pmap || pmap->pm_active) - invltlb(); -} - -PMAP_INLINE void -pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) -{ - - if (pmap == kernel_pmap || pmap->pm_active) - invltlb(); -} - -PMAP_INLINE void -pmap_invalidate_all(pmap_t pmap) -{ - - if (pmap == kernel_pmap || pmap->pm_active) - invltlb(); -} -#else /* !I386_CPU */ #ifdef SMP /* * For SMP, these functions have to use the IPI mechanism for coherence. @@ -725,7 +697,6 @@ invltlb(); } #endif /* !SMP */ -#endif /* !I386_CPU */ /* * Return an address which is the base of the Virtual mapping of @@ -1177,11 +1148,7 @@ pmap->pm_pdir = (pd_entry_t *)kmem_alloc_pageable(kernel_map, PAGE_SIZE); pmap_kenter((vm_offset_t)pmap->pm_pdir, (vm_offset_t)IdlePTD); -#ifndef I386_CPU invlpg((vm_offset_t)pmap->pm_pdir); -#else - invltlb(); -#endif pmap->pm_ptphint = NULL; pmap->pm_active = 0; TAILQ_INIT(&pmap->pm_pvlist); @@ -2279,11 +2246,7 @@ va = (vm_offset_t)crashdumpmap + (i * PAGE_SIZE); pmap_kenter(va, pa); -#ifndef I386_CPU invlpg(va); -#else - invltlb(); -#endif return ((void *)crashdumpmap); } @@ -2742,14 +2705,10 @@ if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); *CMAP2 = PG_V | PG_RW | phys | PG_A | PG_M; -#ifdef I386_CPU - invltlb(); -#else #ifdef SMP curthread->td_switchin = pmap_zpi_switchin2; #endif invlpg((u_int)CADDR2); -#endif #if defined(I686_CPU) if (cpu_class == CPUCLASS_686) i686_pagezero(CADDR2); @@ -2777,14 +2736,10 @@ if (*CMAP2) panic("pmap_zero_page: CMAP2 busy"); *CMAP2 = PG_V | PG_RW | phys | PG_A | PG_M; -#ifdef I386_CPU - invltlb(); -#else #ifdef SMP curthread->td_switchin = pmap_zpi_switchin2; #endif invlpg((u_int)CADDR2); -#endif #if defined(I686_CPU) if (cpu_class == CPUCLASS_686 && off == 0 && size == PAGE_SIZE) i686_pagezero(CADDR2); @@ -2812,14 +2767,10 @@ if (*CMAP3) panic("pmap_zero_page: CMAP3 busy"); *CMAP3 = PG_V | PG_RW | phys | PG_A | PG_M; -#ifdef I386_CPU - invltlb(); -#else #ifdef SMP curthread->td_switchin = pmap_zpi_switchin3; #endif invlpg((u_int)CADDR3); -#endif #if defined(I686_CPU) if (cpu_class == CPUCLASS_686) i686_pagezero(CADDR3); @@ -2848,15 +2799,11 @@ panic("pmap_copy_page: CMAP2 busy"); *CMAP1 = PG_V | VM_PAGE_TO_PHYS(src) | PG_A; *CMAP2 = PG_V | PG_RW | VM_PAGE_TO_PHYS(dst) | PG_A | PG_M; -#ifdef I386_CPU - invltlb(); -#else #ifdef SMP curthread->td_switchin = pmap_zpi_switchin12; #endif invlpg((u_int)CADDR1); invlpg((u_int)CADDR2); -#endif bcopy(CADDR1, CADDR2, PAGE_SIZE); #ifdef SMP curthread->td_switchin = NULL; ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#5 (text+ko) ==== @@ -100,9 +100,6 @@ #include extern void trap(struct trapframe frame); -#ifdef I386_CPU -extern int trapwrite(unsigned addr); -#endif extern void syscall(struct trapframe frame); static int trap_pfault(struct trapframe *, int, vm_offset_t); @@ -817,53 +814,6 @@ panic("double fault"); } -#ifdef I386_CPU -/* - * Compensate for 386 brain damage (missing URKR). - * This is a little simpler than the pagefault handler in trap() because - * it the page tables have already been faulted in and high addresses - * are thrown out early for other reasons. - */ -int trapwrite(addr) - unsigned addr; -{ - struct thread *td; - struct proc *p; - vm_offset_t va; - struct vmspace *vm; - int rv; - - va = trunc_page((vm_offset_t)addr); - /* - * XXX - MAX is END. Changed > to >= for temp. fix. - */ - if (va >= VM_MAXUSER_ADDRESS) - return (1); - - td = curthread; - p = td->td_proc; - vm = p->p_vmspace; - - PROC_LOCK(p); - ++p->p_lock; - PROC_UNLOCK(p); - - /* - * fault the data page - */ - rv = vm_fault(&vm->vm_map, va, VM_PROT_WRITE, VM_FAULT_DIRTY); - - PROC_LOCK(p); - --p->p_lock; - PROC_UNLOCK(p); - - if (rv != KERN_SUCCESS) - return 1; - - return (0); -} -#endif - /* * syscall - system call request C handler * To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 20:32:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D504337B406; Fri, 20 Sep 2002 20:32:22 -0700 (PDT) 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 82D5A37B401 for ; Fri, 20 Sep 2002 20:32:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE72743E42 for ; Fri, 20 Sep 2002 20:32:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L3WLCo009128 for ; Fri, 20 Sep 2002 20:32:21 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L3WLQe009125 for perforce@freebsd.org; Fri, 20 Sep 2002 20:32:21 -0700 (PDT) Date: Fri, 20 Sep 2002 20:32:21 -0700 (PDT) Message-Id: <200209210332.g8L3WLQe009125@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17820 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17820 Change 17820 by peter@peter_daintree on 2002/09/20 20:31:29 unifdef -U I586_CPU (and f00f_hack stuff) Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#9 edit .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#6 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#9 (text+ko) ==== @@ -672,10 +672,6 @@ int private_tss; /* flag indicating private tss */ -#if defined(I586_CPU) && !defined(NO_F00F_HACK) -extern int has_f00f_bug; -#endif - static struct i386tss dblfault_tss; static char dblfault_stack[PAGE_SIZE]; @@ -1453,45 +1449,6 @@ { } -#if defined(I586_CPU) && !defined(NO_F00F_HACK) -static void f00f_hack(void *unused); -SYSINIT(f00f_hack, SI_SUB_INTRINSIC, SI_ORDER_FIRST, f00f_hack, NULL); - -static void -f00f_hack(void *unused) { - struct gate_descriptor *new_idt; -#ifndef SMP - struct region_descriptor r_idt; -#endif - vm_offset_t tmp; - - if (!has_f00f_bug) - return; - - GIANT_REQUIRED; - - printf("Intel Pentium detected, installing workaround for F00F bug\n"); - - r_idt.rd_limit = sizeof(idt0) - 1; - - tmp = kmem_alloc(kernel_map, PAGE_SIZE * 2); - if (tmp == 0) - panic("kmem_alloc returned 0"); - if (((unsigned int)tmp & (PAGE_SIZE-1)) != 0) - panic("kmem_alloc returned non-page-aligned memory"); - /* Put the first seven entries in the lower page */ - new_idt = (struct gate_descriptor*)(tmp + PAGE_SIZE - (7*8)); - bcopy(idt, new_idt, sizeof(idt0)); - r_idt.rd_base = (int)new_idt; - lidt(&r_idt); - idt = new_idt; - if (vm_map_protect(kernel_map, tmp, tmp + PAGE_SIZE, - VM_PROT_READ, FALSE) != KERN_SUCCESS) - panic("vm_map_protect failed"); - return; -} -#endif /* defined(I586_CPU) && !NO_F00F_HACK */ - int ptrace_set_pc(struct thread *td, unsigned long addr) { ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#6 (text+ko) ==== @@ -141,10 +141,6 @@ "machine check trap", /* 28 T_MCHK */ }; -#if defined(I586_CPU) && !defined(NO_F00F_HACK) -extern int has_f00f_bug; -#endif - #ifdef DDB static int ddb_on_nmi = 1; SYSCTL_INT(_machdep, OID_AUTO, ddb_on_nmi, CTLFLAG_RW, @@ -307,21 +303,6 @@ case T_PAGEFLT: /* page fault */ i = trap_pfault(&frame, TRUE, eva); -#if defined(I586_CPU) && !defined(NO_F00F_HACK) - if (i == -2) { - /* - * The f00f hack workaround has triggered, so - * treat the fault as an illegal instruction - * (T_PRIVINFLT) instead of a page fault. - */ - type = frame.tf_trapno = T_PRIVINFLT; - - /* Proceed as in that case. */ - ucode = type; - i = SIGILL; - break; - } -#endif if (i == -1) goto userout; if (i == 0) @@ -637,10 +618,6 @@ * treat it is as an illegal instruction, and not a page * fault. */ -#if defined(I586_CPU) && !defined(NO_F00F_HACK) - if ((eva == (unsigned int)&idt[6]) && has_f00f_bug) - return -2; -#endif if (usermode) goto nogo; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 20:32:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C89337B40A; Fri, 20 Sep 2002 20:32:23 -0700 (PDT) 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 98A7C37B404 for ; Fri, 20 Sep 2002 20:32:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5042B43E65 for ; Fri, 20 Sep 2002 20:32:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L3WMCo009135 for ; Fri, 20 Sep 2002 20:32:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L3WLvi009132 for perforce@freebsd.org; Fri, 20 Sep 2002 20:32:21 -0700 (PDT) Date: Fri, 20 Sep 2002 20:32:21 -0700 (PDT) Message-Id: <200209210332.g8L3WLvi009132@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17821 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17821 Change 17821 by peter@peter_daintree on 2002/09/20 20:32:06 oops, more f00f crud Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#7 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#7 (text+ko) ==== @@ -612,11 +612,6 @@ if (va >= KERNBASE) { /* * Don't allow user-mode faults in kernel address space. - * An exception: if the faulting address is the invalid - * instruction entry in the IDT, then the Intel Pentium - * F00F bug workaround was triggered, and we need to - * treat it is as an illegal instruction, and not a page - * fault. */ if (usermode) goto nogo; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 20:39:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33AB737B404; Fri, 20 Sep 2002 20:39:32 -0700 (PDT) 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 D27E937B401 for ; Fri, 20 Sep 2002 20:39:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73B1443E75 for ; Fri, 20 Sep 2002 20:39:31 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L3dVCo009480 for ; Fri, 20 Sep 2002 20:39:31 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L3dVaw009477 for perforce@freebsd.org; Fri, 20 Sep 2002 20:39:31 -0700 (PDT) Date: Fri, 20 Sep 2002 20:39:31 -0700 (PDT) Message-Id: <200209210339.g8L3dVaw009477@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17822 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17822 Change 17822 by peter@peter_daintree on 2002/09/20 20:38:52 shoot silly bcopy etc indirection that we dont use. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/md_var.h#4 edit .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/md_var.h#4 (text+ko) ==== @@ -38,10 +38,7 @@ extern long Maxmem; extern u_int atdevbase; /* offset in virtual memory of ISA io mem */ -extern void (*bcopy_vector)(const void *from, void *to, size_t len); extern int busdma_swi_pending; -extern int (*copyin_vector)(const void *udaddr, void *kaddr, size_t len); -extern int (*copyout_vector)(const void *kaddr, void *udaddr, size_t len); extern u_int cpu_feature; extern u_int cpu_high; extern u_int cpu_id; @@ -50,7 +47,6 @@ extern u_int cyrix_did; extern uint16_t *elan_mmcr; extern char kstack[]; -extern void (*ovbcopy_vector)(const void *from, void *to, size_t len); extern char sigcode[]; extern int szsigcode; @@ -75,12 +71,7 @@ void doreti_popl_fs(void) __asm(__STRING(doreti_popl_fs)); void doreti_popl_fs_fault(void) __asm(__STRING(doreti_popl_fs_fault)); void fillw(int /*u_short*/ pat, void *base, size_t cnt); -void i486_bzero(void *buf, size_t len); -void i586_bcopy(const void *from, void *to, size_t len); -void i586_bzero(void *buf, size_t len); -int i586_copyin(const void *udaddr, void *kaddr, size_t len); -int i586_copyout(const void *kaddr, void *udaddr, size_t len); -void i686_pagezero(void *addr); +void pagezero(void *addr); void init_AMD_Elan_sc520(void); int is_physical_memory(vm_offset_t addr); u_long kvtop(void *addr); ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#3 (text+ko) ==== @@ -2709,12 +2709,7 @@ curthread->td_switchin = pmap_zpi_switchin2; #endif invlpg((u_int)CADDR2); -#if defined(I686_CPU) - if (cpu_class == CPUCLASS_686) - i686_pagezero(CADDR2); - else -#endif - bzero(CADDR2, PAGE_SIZE); + pagezero(CADDR2); #ifdef SMP curthread->td_switchin = NULL; #endif @@ -2740,11 +2735,9 @@ curthread->td_switchin = pmap_zpi_switchin2; #endif invlpg((u_int)CADDR2); -#if defined(I686_CPU) - if (cpu_class == CPUCLASS_686 && off == 0 && size == PAGE_SIZE) - i686_pagezero(CADDR2); + if (off == 0 && size == PAGE_SIZE) + pagezero(CADDR2); else -#endif bzero((char *)CADDR2 + off, size); #ifdef SMP curthread->td_switchin = NULL; @@ -2771,12 +2764,7 @@ curthread->td_switchin = pmap_zpi_switchin3; #endif invlpg((u_int)CADDR3); -#if defined(I686_CPU) - if (cpu_class == CPUCLASS_686) - i686_pagezero(CADDR3); - else -#endif - bzero(CADDR3, PAGE_SIZE); + pagezero(CADDR3); #ifdef SMP curthread->td_switchin = NULL; #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 20:43:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EF5F37B404; Fri, 20 Sep 2002 20:43:37 -0700 (PDT) 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 5D6D637B401 for ; Fri, 20 Sep 2002 20:43:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06EDC43E6A for ; Fri, 20 Sep 2002 20:43:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L3haCo011236 for ; Fri, 20 Sep 2002 20:43:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L3haZt011232 for perforce@freebsd.org; Fri, 20 Sep 2002 20:43:36 -0700 (PDT) Date: Fri, 20 Sep 2002 20:43:36 -0700 (PDT) Message-Id: <200209210343.g8L3haZt011232@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17823 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17823 Change 17823 by peter@peter_daintree on 2002/09/20 20:42:55 deconditionalize npx before folding it in elsewhere. Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/npx.c#8 edit .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#5 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#10 edit .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#3 edit .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#8 edit .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#8 (text+ko) ==== @@ -37,7 +37,6 @@ #include "opt_debug_npx.h" #include "opt_isa.h" -#include "opt_npx.h" #include #include ==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#5 (text+ko) ==== @@ -34,8 +34,6 @@ * $FreeBSD: src/sys/i386/i386/exception.s,v 1.98 2002/07/28 00:27:51 peter Exp $ */ -#include "opt_npx.h" - #include #include #include ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#10 (text+ko) ==== @@ -47,7 +47,6 @@ #include "opt_isa.h" #include "opt_maxmem.h" #include "opt_msgbuf.h" -#include "opt_npx.h" #include "opt_perfmon.h" #include "opt_kstack_pages.h" @@ -1668,10 +1667,6 @@ static void get_fpcontext(struct thread *td, mcontext_t *mcp) { -#ifndef DEV_NPX - mcp->mc_fpformat = _MC_FPFMT_NODEV; - mcp->mc_ownedfp = _MC_FPOWNED_NONE; -#else union savefpu *addr; /* @@ -1699,7 +1694,6 @@ bzero(&mcp->mc_spare2, sizeof(mcp->mc_spare2)); } mcp->mc_fpformat = npxformat(); -#endif } static int @@ -1726,13 +1720,11 @@ while ((uintptr_t)(void *)addr & 0xF); bcopy(&mcp->mc_fpstate, addr, sizeof(mcp->mc_fpstate)); } -#ifdef DEV_NPX /* * XXX we violate the dubious requirement that npxsetregs() * be called with interrupts disabled. */ npxsetregs(td, addr); -#endif /* * Don't bother putting things back where they were in the * misaligned case, since we know that the caller won't use @@ -1749,10 +1741,8 @@ register_t s; s = intr_disable(); -#ifdef DEV_NPX if (PCPU_GET(fpcurthread) == td) npxdrop(); -#endif /* * XXX force a full drop of the npx. The above only drops it if we * owned it. npxgetregs() has the same bug in the !cpu_fxsr case. ==== //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#3 (text+ko) ==== @@ -36,8 +36,6 @@ * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.134 2002/07/21 05:22:16 peter Exp $ */ -#include "opt_npx.h" - #include #ifdef SMP @@ -129,7 +127,6 @@ /* XXX FIXME: we should be saving the local APIC TPR */ #endif -#ifdef DEV_NPX /* have we used fp, and need a save? */ cmpl %ecx,PCPU(FPCURTHREAD) jne 1f @@ -138,7 +135,6 @@ call npxsave /* do it in a big C function */ popl %eax 1: -#endif /* Save is done. Now choose a new thread. */ /* XXX still trashing space above the old "Top Of Stack". */ @@ -340,7 +336,6 @@ pushfl popl PCB_PSL(%ecx) -#ifdef DEV_NPX /* * If fpcurthread == NULL, then the npx h/w state is irrelevant and the * state had better already be in the pcb. This is true for forks @@ -377,6 +372,5 @@ addl $12,%esp 1: popfl -#endif /* DEV_NPX */ ret ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#8 (text+ko) ==== @@ -47,7 +47,6 @@ #include "opt_ddb.h" #include "opt_isa.h" #include "opt_ktrace.h" -#include "opt_npx.h" #include "opt_trap.h" #include @@ -281,13 +280,9 @@ break; case T_ARITHTRAP: /* arithmetic trap */ -#ifdef DEV_NPX ucode = npxtrap(); if (ucode == -1) goto userout; -#else - ucode = code; -#endif i = SIGFPE; break; @@ -362,11 +357,9 @@ break; case T_DNA: -#ifdef DEV_NPX /* transparent fault (due to context switch "late") */ if (npxdna()) goto userout; -#endif i = SIGFPE; ucode = FPE_FPU_NP_TRAP; break; @@ -392,15 +385,15 @@ goto out; case T_DNA: -#ifdef DEV_NPX /* * The kernel is apparently using npx for copying. * XXX this should be fatal unless the kernel has * registered such use. */ - if (npxdna()) + if (npxdna()) { + printf("npxdna in kernel mode!\n"); goto out; -#endif + } break; case T_STKFLT: /* stack fault */ ==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#4 (text+ko) ==== @@ -41,7 +41,6 @@ * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.192 2002/09/16 19:25:08 mini Exp $ */ -#include "opt_npx.h" #include "opt_reset.h" #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -119,9 +118,7 @@ register struct proc *p1; struct pcb *pcb2; struct mdproc *mdp2; -#ifdef DEV_NPX register_t savecrit; -#endif p1 = td1->td_proc; if ((flags & RFPROC) == 0) { @@ -142,14 +139,12 @@ } /* Ensure that p1's pcb is up to date. */ -#ifdef DEV_NPX if (td1 == curthread) td1->td_pcb->pcb_gs = rgs(); savecrit = intr_disable(); if (PCPU_GET(fpcurthread) == td1) npxsave(&td1->td_pcb->pcb_save); intr_restore(savecrit); -#endif /* Point the pcb to the top of the stack */ pcb2 = (struct pcb *)(td2->td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; @@ -260,9 +255,8 @@ cpu_thread_exit(struct thread *td) { struct pcb *pcb = td->td_pcb; -#ifdef DEV_NPX + npxexit(td); -#endif if (pcb->pcb_ext != 0) { /* XXXKSE XXXSMP not SMP SAFE.. what locks do we have? */ /* if (pcb->pcb_ext->ext_refcount-- == 1) ?? */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 20:51:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D0D237B404; Fri, 20 Sep 2002 20:51:48 -0700 (PDT) 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 B2B1537B401 for ; Fri, 20 Sep 2002 20:51:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 563F643E65 for ; Fri, 20 Sep 2002 20:51:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L3plCo013288 for ; Fri, 20 Sep 2002 20:51:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L3pltb013285 for perforce@freebsd.org; Fri, 20 Sep 2002 20:51:47 -0700 (PDT) Date: Fri, 20 Sep 2002 20:51:47 -0700 (PDT) Message-Id: <200209210351.g8L3pltb013285@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17824 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17824 Change 17824 by peter@peter_daintree on 2002/09/20 20:51:31 kill old signal frame support. It's not happening folks. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/sigframe.h#2 edit .. //depot/projects/hammer/sys/x86_64/include/signal.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/sigframe.h#2 (text+ko) ==== @@ -34,43 +34,6 @@ /* * Signal frames, arguments passed to application signal handlers. */ -#ifdef _KERNEL -struct osigframe { - /* - * The first four members may be used by applications. - */ - - register_t sf_signum; - - /* - * Either 'int' for old-style FreeBSD handler or 'siginfo_t *' - * pointing to sf_siginfo for SA_SIGINFO handlers. - */ - register_t sf_arg2; - - /* Points to sf_siginfo.si_sc. */ - register_t sf_scp; - - register_t sf_addr; - - /* - * The following arguments are not constrained by the - * function call protocol. - * Applications are not supposed to access these members, - * except using the pointers we provide in the first three - * arguments. - */ - - union { - __osiginfohandler_t *sf_action; - __sighandler_t *sf_handler; - } sf_ahu; - - /* In the SA_SIGINFO case, sf_arg2 points here. */ - osiginfo_t sf_siginfo; -}; -#endif - struct sigframe { /* * The first four members may be used by applications. ==== //depot/projects/hammer/sys/x86_64/include/signal.h#2 (text+ko) ==== @@ -56,7 +56,6 @@ /* * Only the kernel should need these old type definitions. */ -#ifdef _KERNEL /* * Information pushed on stack when a signal is delivered. * This is used by the kernel to restore state following @@ -64,33 +63,6 @@ * to the handler to allow it to restore state properly if * a non-standard exit is performed. */ -typedef unsigned int osigset_t; - -struct osigcontext { - int sc_onstack; /* sigstack state to restore */ - osigset_t sc_mask; /* signal mask to restore */ - int sc_esp; /* machine state follows: */ - int sc_ebp; - int sc_isp; - int sc_eip; - int sc_efl; - int sc_es; - int sc_ds; - int sc_cs; - int sc_ss; - int sc_edi; - int sc_esi; - int sc_ebx; - int sc_edx; - int sc_ecx; - int sc_eax; - int sc_gs; - int sc_fs; - int sc_trapno; - int sc_err; -}; -#endif - /* * The sequence of the fields/registers in struct sigcontext should match * those in mcontext_t. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 21: 2:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4EC237B404; Fri, 20 Sep 2002 21:02:01 -0700 (PDT) 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 624E037B401 for ; Fri, 20 Sep 2002 21:02:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B6AF43E65 for ; Fri, 20 Sep 2002 21:02:00 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L420Co015229 for ; Fri, 20 Sep 2002 21:02:00 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L41xur015224 for perforce@freebsd.org; Fri, 20 Sep 2002 21:01:59 -0700 (PDT) Date: Fri, 20 Sep 2002 21:01:59 -0700 (PDT) Message-Id: <200209210401.g8L41xur015224@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17825 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17825 Change 17825 by peter@peter_daintree on 2002/09/20 21:01:47 more decruftification. We dont have no nexgen or cyrix x86_64 cpus to deal with. Everything has cpuid. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/md_var.h#5 edit .. //depot/projects/hammer/sys/x86_64/include/specialreg.h#2 edit .. //depot/projects/hammer/sys/x86_64/isa/isa.h#3 edit .. //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#2 edit .. //depot/projects/hammer/sys/x86_64/isa/npx.c#9 edit .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#7 edit .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#9 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/md_var.h#5 (text+ko) ==== @@ -44,7 +44,6 @@ extern u_int cpu_id; extern u_int cpu_fxsr; extern char cpu_vendor[]; -extern u_int cyrix_did; extern uint16_t *elan_mmcr; extern char kstack[]; extern char sigcode[]; ==== //depot/projects/hammer/sys/x86_64/include/specialreg.h#2 (text+ko) ==== @@ -168,69 +168,6 @@ #define MTRR_N16K 16 #define MTRR_N4K 64 -/* - * Cyrix configuration registers, accessible as IO ports. - */ -#define CCR0 0xc0 /* Configuration control register 0 */ -#define CCR0_NC0 0x01 /* First 64K of each 1M memory region is - non-cacheable */ -#define CCR0_NC1 0x02 /* 640K-1M region is non-cacheable */ -#define CCR0_A20M 0x04 /* Enables A20M# input pin */ -#define CCR0_KEN 0x08 /* Enables KEN# input pin */ -#define CCR0_FLUSH 0x10 /* Enables FLUSH# input pin */ -#define CCR0_BARB 0x20 /* Flushes internal cache when entering hold - state */ -#define CCR0_CO 0x40 /* Cache org: 1=direct mapped, 0=2x set - assoc */ -#define CCR0_SUSPEND 0x80 /* Enables SUSP# and SUSPA# pins */ - -#define CCR1 0xc1 /* Configuration control register 1 */ -#define CCR1_RPL 0x01 /* Enables RPLSET and RPLVAL# pins */ -#define CCR1_SMI 0x02 /* Enables SMM pins */ -#define CCR1_SMAC 0x04 /* System management memory access */ -#define CCR1_MMAC 0x08 /* Main memory access */ -#define CCR1_NO_LOCK 0x10 /* Negate LOCK# */ -#define CCR1_SM3 0x80 /* SMM address space address region 3 */ - -#define CCR2 0xc2 -#define CCR2_WB 0x02 /* Enables WB cache interface pins */ -#define CCR2_SADS 0x02 /* Slow ADS */ -#define CCR2_LOCK_NW 0x04 /* LOCK NW Bit */ -#define CCR2_SUSP_HLT 0x08 /* Suspend on HALT */ -#define CCR2_WT1 0x10 /* WT region 1 */ -#define CCR2_WPR1 0x10 /* Write-protect region 1 */ -#define CCR2_BARB 0x20 /* Flushes write-back cache when entering - hold state. */ -#define CCR2_BWRT 0x40 /* Enables burst write cycles */ -#define CCR2_USE_SUSP 0x80 /* Enables suspend pins */ - -#define CCR3 0xc3 -#define CCR3_SMILOCK 0x01 /* SMM register lock */ -#define CCR3_NMI 0x02 /* Enables NMI during SMM */ -#define CCR3_LINBRST 0x04 /* Linear address burst cycles */ -#define CCR3_SMMMODE 0x08 /* SMM Mode */ -#define CCR3_MAPEN0 0x10 /* Enables Map0 */ -#define CCR3_MAPEN1 0x20 /* Enables Map1 */ -#define CCR3_MAPEN2 0x40 /* Enables Map2 */ -#define CCR3_MAPEN3 0x80 /* Enables Map3 */ - -#define CCR4 0xe8 -#define CCR4_IOMASK 0x07 -#define CCR4_MEM 0x08 /* Enables momory bypassing */ -#define CCR4_DTE 0x10 /* Enables directory table entry cache */ -#define CCR4_FASTFPE 0x20 /* Fast FPU exception */ -#define CCR4_CPUID 0x80 /* Enables CPUID instruction */ - -#define CCR5 0xe9 -#define CCR5_WT_ALLOC 0x01 /* Write-through allocate */ -#define CCR5_SLOP 0x02 /* LOOP instruction slowed down */ -#define CCR5_LBR1 0x10 /* Local bus region 1 */ -#define CCR5_ARREN 0x20 /* Enables ARR region */ - -#define CCR6 0xea - -#define CCR7 0xeb - /* Performance Control Register (5x86 only). */ #define PCR0 0x20 #define PCR0_RSTK 0x01 /* Enables return stack */ @@ -339,21 +276,4 @@ #define AMD_WT_ALLOC_PRE 0x20000 /* programmable range enable */ #define AMD_WT_ALLOC_FRE 0x10000 /* fixed (A0000-FFFFF) range enable */ - -#ifndef LOCORE -static __inline u_char -read_cyrix_reg(u_char reg) -{ - outb(0x22, reg); - return inb(0x23); -} - -static __inline void -write_cyrix_reg(u_char reg, u_char data) -{ - outb(0x22, reg); - outb(0x23, data); -} -#endif - #endif /* !_MACHINE_SPECIALREG_H_ */ ==== //depot/projects/hammer/sys/x86_64/isa/isa.h#3 (text+ko) ==== @@ -165,32 +165,4 @@ #endif /* !IO_ISASIZES */ -/* - * Input / Output Memory Physical Addresses - */ -#ifndef IOM_BEGIN -#define IOM_BEGIN 0x0A0000 /* Start of I/O Memory "hole" */ -#define IOM_END 0x100000 /* End of I/O Memory "hole" */ -#define IOM_SIZE (IOM_END - IOM_BEGIN) -#endif /* !IOM_BEGIN */ - -/* - * RAM Physical Address Space (ignoring the above mentioned "hole") - */ -#ifndef RAM_BEGIN -#define RAM_BEGIN 0x0000000 /* Start of RAM Memory */ -#define RAM_END 0x1000000 /* End of RAM Memory */ -#define RAM_SIZE (RAM_END - RAM_BEGIN) -#endif /* !RAM_BEGIN */ - -/* - * Oddball Physical Memory Addresses - */ -#ifndef COMPAQ_RAMRELOC -#define COMPAQ_RAMRELOC 0x80C00000 /* Compaq RAM relocation/diag */ -#define COMPAQ_RAMSETUP 0x80C00002 /* Compaq RAM setup */ -#define WEITEK_FPU 0xC0000000 /* WTL 2167 */ -#define CYRIX_EMC 0xC0000000 /* Cyrix EMC */ -#endif /* !COMPAQ_RAMRELOC */ - #endif /* !_I386_ISA_ISA_H_ */ ==== //depot/projects/hammer/sys/x86_64/isa/isa_dma.c#2 (text+ko) ==== @@ -79,6 +79,8 @@ #define DMA2_MODE (IO_DMA2 + 2*11) /* mode register */ #define DMA2_FFC (IO_DMA2 + 2*12) /* clear first/last FF */ +#define ISARAM_END 0x1000000 + static int isa_dmarangecheck(caddr_t va, u_int length, int chan); static caddr_t dma_bouncebuf[8]; @@ -381,7 +383,6 @@ endva = (vm_offset_t)round_page((vm_offset_t)va + length); for (; va < (caddr_t) endva ; va += PAGE_SIZE) { phys = trunc_page(pmap_extract(kernel_pmap, (vm_offset_t)va)); -#define ISARAM_END RAM_END if (phys == 0) panic("isa_dmacheck: no physical page present"); if (phys >= ISARAM_END) ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#9 (text+ko) ==== @@ -549,17 +549,13 @@ pcb->pcb_flags |= PCB_NPXINITDONE; } else { /* - * The following frstor may cause an IRQ13 when the state + * The following frstor may cause a trap when the state * being restored has a pending error. The error will * appear to have been triggered by the current (npx) user * instruction even when that instruction is a no-wait * instruction that should not trigger an error (e.g., * instructions are broken the same as frstor, so our - * treatment does not amplify the breakage. On at least - * one 386/Cyrix 387 system, fnclex works correctly while - * frstor and fnsave are broken, so our treatment breaks - * fnclex if it is the first FPU instruction after a context - * switch. + * treatment does not amplify the breakage. */ fpurstor(&pcb->pcb_save); } ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#7 (text+ko) ==== @@ -491,93 +491,6 @@ */ identify_cpu: - /* Try to toggle alignment check flag; does not exist on 386. */ - pushfl - popl %eax - movl %eax,%ecx - orl $PSL_AC,%eax - pushl %eax - popfl - pushfl - popl %eax - xorl %ecx,%eax - andl $PSL_AC,%eax - pushl %ecx - popfl - - testl %eax,%eax - jnz try486 - - /* NexGen CPU does not have aligment check flag. */ - pushfl - movl $0x5555, %eax - xorl %edx, %edx - movl $2, %ecx - clc - divl %ecx - jz trynexgen - popfl - movl $CPU_386,R(cpu) - jmp 3f - -trynexgen: - popfl - movl $CPU_NX586,R(cpu) - movl $0x4778654e,R(cpu_vendor) # store vendor string - movl $0x72446e65,R(cpu_vendor+4) - movl $0x6e657669,R(cpu_vendor+8) - movl $0,R(cpu_vendor+12) - jmp 3f - -try486: /* Try to toggle identification flag; does not exist on early 486s. */ - pushfl - popl %eax - movl %eax,%ecx - xorl $PSL_ID,%eax - pushl %eax - popfl - pushfl - popl %eax - xorl %ecx,%eax - andl $PSL_ID,%eax - pushl %ecx - popfl - - testl %eax,%eax - jnz trycpuid - movl $CPU_486,R(cpu) - - /* - * Check Cyrix CPU - * Cyrix CPUs do not change the undefined flags following - * execution of the divide instruction which divides 5 by 2. - * - * Note: CPUID is enabled on M2, so it passes another way. - */ - pushfl - movl $0x5555, %eax - xorl %edx, %edx - movl $2, %ecx - clc - divl %ecx - jnc trycyrix - popfl - jmp 3f /* You may use Intel CPU. */ - -trycyrix: - popfl - /* - * IBM Bluelighting CPU also doesn't change the undefined flags. - * Because IBM doesn't disclose the information for Bluelighting - * CPU, we couldn't distinguish it from Cyrix's (including IBM - * brand of Cyrix CPUs). - */ - movl $0x69727943,R(cpu_vendor) # store vendor string - movl $0x736e4978,R(cpu_vendor+4) - movl $0x64616574,R(cpu_vendor+8) - jmp 3f - -trycpuid: /* Use the `cpuid' instruction. */ xorl %eax,%eax cpuid # cpuid 0 movl %eax,R(cpu_high) # highest capability @@ -590,24 +503,8 @@ cpuid # cpuid 1 movl %eax,R(cpu_id) # store cpu_id movl %edx,R(cpu_feature) # store cpu_feature - rorl $8,%eax # extract family type - andl $15,%eax - cmpl $5,%eax - jae 1f - /* less than Pentium; must be 486 */ - movl $CPU_486,R(cpu) - jmp 3f -1: - /* a Pentium? */ - cmpl $5,%eax - jne 2f - movl $CPU_586,R(cpu) - jmp 3f -2: - /* Greater than Pentium...call it a Pentium Pro */ - movl $CPU_686,R(cpu) -3: + movl $CPU_686,R(cpu) # call it a pentium pro ret ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#9 (text+ko) ==== @@ -222,12 +222,6 @@ code = frame.tf_err; if (type == T_PAGEFLT) { /* - * For some Cyrix CPUs, %cr2 is clobbered by - * interrupts. This problem is worked around by using - * an interrupt gate for the pagefault handler. We - * are finally ready to read %cr2 and then must - * reenable interrupts. - * * If we get a page fault while holding a spin lock, then * it is most likely a fatal kernel page fault. The kernel * is already going to panic trying to get a sleep lock to @@ -236,9 +230,7 @@ * to the debugger. */ eva = rcr2(); - if (PCPU_GET(spinlocks) == NULL) - enable_intr(); - else + if (PCPU_GET(spinlocks) != NULL) trap_fatal(&frame, eva); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 21: 3: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE80437B681; Fri, 20 Sep 2002 21:03:04 -0700 (PDT) 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 45DE637B43A for ; Fri, 20 Sep 2002 21:03:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06A5E43E6A for ; Fri, 20 Sep 2002 21:03:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L431Co015359 for ; Fri, 20 Sep 2002 21:03:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L431NF015356 for perforce@freebsd.org; Fri, 20 Sep 2002 21:03:01 -0700 (PDT) Date: Fri, 20 Sep 2002 21:03:01 -0700 (PDT) Message-Id: <200209210403.g8L431NF015356@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17826 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17826 Change 17826 by peter@peter_daintree on 2002/09/20 21:02:58 previous commit removed cyrix pagefault/%cr2 bug workaround. Make matching change here before it burns us when this is converted later. change page fault vector back to trap gate instead of interrupt gate. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#11 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#11 (text+ko) ==== @@ -1336,7 +1336,7 @@ GSEL(GCODE_SEL, SEL_KPL)); setidt(13, &IDTVEC(prot), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - setidt(14, &IDTVEC(page), SDT_SYS386IGT, SEL_KPL, + setidt(14, &IDTVEC(page), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); setidt(15, &IDTVEC(rsvd), SDT_SYS386TGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 21: 6:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88FB037B404; Fri, 20 Sep 2002 21:06:11 -0700 (PDT) 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 3487337B401; Fri, 20 Sep 2002 21:06:11 -0700 (PDT) Received: from k6.locore.ca (k6.locore.ca [198.96.117.170]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FA6543E3B; Fri, 20 Sep 2002 21:06:10 -0700 (PDT) (envelope-from jake@k6.locore.ca) Received: from k6.locore.ca (jake@localhost.locore.ca [127.0.0.1]) by k6.locore.ca (8.12.5/8.12.5) with ESMTP id g8L4Iq8a081391; Sat, 21 Sep 2002 00:18:52 -0400 (EDT) (envelope-from jake@k6.locore.ca) Received: (from jake@localhost) by k6.locore.ca (8.12.5/8.12.5/Submit) id g8L4Iqbl081390; Sat, 21 Sep 2002 00:18:52 -0400 (EDT) Date: Sat, 21 Sep 2002 00:18:52 -0400 From: Jake Burkholder To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17822 for review Message-ID: <20020921001852.A80340@locore.ca> References: <200209210339.g8L3dVaw009477@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200209210339.g8L3dVaw009477@freefall.freebsd.org>; from peter@freebsd.org on Fri, Sep 20, 2002 at 08:39:31PM -0700 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Apparently, On Fri, Sep 20, 2002 at 08:39:31PM -0700, Peter Wemm said words to the effect of; > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17822 > > Change 17822 by peter@peter_daintree on 2002/09/20 20:38:52 > > shoot silly bcopy etc indirection that we dont use. > > Affected files ... > > .. //depot/projects/hammer/sys/x86_64/include/md_var.h#4 edit > .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#3 edit > > Differences ... > > ==== //depot/projects/hammer/sys/x86_64/include/md_var.h#4 (text+ko) ==== > > @@ -38,10 +38,7 @@ > > extern long Maxmem; > extern u_int atdevbase; /* offset in virtual memory of ISA io mem */ > -extern void (*bcopy_vector)(const void *from, void *to, size_t len); > extern int busdma_swi_pending; > -extern int (*copyin_vector)(const void *udaddr, void *kaddr, size_t len); > -extern int (*copyout_vector)(const void *kaddr, void *udaddr, size_t len); > extern u_int cpu_feature; > extern u_int cpu_high; > extern u_int cpu_id; > @@ -50,7 +47,6 @@ > extern u_int cyrix_did; > extern uint16_t *elan_mmcr; > extern char kstack[]; ^^^^^^^^^ I always get a kick out of seeing this. :) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 21:14:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7DA237B404; Fri, 20 Sep 2002 21:14:16 -0700 (PDT) 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 5741237B401 for ; Fri, 20 Sep 2002 21:14:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DF2843E3B for ; Fri, 20 Sep 2002 21:14:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L4EFCo021693 for ; Fri, 20 Sep 2002 21:14:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L4EFqC021690 for perforce@freebsd.org; Fri, 20 Sep 2002 21:14:15 -0700 (PDT) Date: Fri, 20 Sep 2002 21:14:15 -0700 (PDT) Message-Id: <200209210414.g8L4EFqC021690@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17827 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17827 Change 17827 by peter@peter_daintree on 2002/09/20 21:14:04 nuke more old cruft (386bsd-0.1 bootblock support (I'm sure bde has them :-) and some VM86 glue I missed before (VME) Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#8 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#8 (text+ko) ==== @@ -237,41 +237,8 @@ call identify_cpu -/* clear bss */ -/* - * XXX this should be done a little earlier. - * - * XXX we don't check that there is memory for our bss and page tables - * before using it. - * - * XXX the boot program somewhat bogusly clears the bss. We still have - * to do it in case we were unzipped by kzipboot. Then the boot program - * only clears kzipboot's bss. - * - * XXX the gdt and idt are still somewhere in the boot program. We - * depend on the convention that the boot program is below 1MB and we - * are above 1MB to keep the gdt and idt away from the bss and page - * tables. The idt is not used. - */ - movl $R(end),%ecx - movl $R(edata),%edi - subl %edi,%ecx - xorl %eax,%eax - cld - rep - stosb - call create_pagetables -/* - * If the CPU has support for VME, turn it on. - */ - testl $CPUID_VME, R(cpu_feature) - jz 1f - movl %cr4, %eax - orl $CR4_VME, %eax - movl %eax, %cr4 - /* Now enable paging */ movl R(IdlePTD), %eax movl %eax,%cr3 /* load ptd addr into mmu */ @@ -365,14 +332,6 @@ */ /* - * The old style disk boot blocks fake a frame on the stack and - * did an lret to get here. The frame on the stack has a return - * address of 0. - */ - cmpl $0,4(%ebp) - je olddiskboot - - /* * We have some form of return address, so this is either the * old diskless netboot code, or the new uniform code. That can * be detected by looking at the 5th argument, if it is 0 @@ -408,35 +367,10 @@ 1: /* - * If we have a kernelname copy it in - */ - movl BI_KERNELNAME(%ebx),%esi - cmpl $0,%esi - je 2f /* No kernelname */ - movl $MAXPATHLEN,%ecx /* Brute force!!! */ - movl $R(kernelname),%edi - cmpb $'/',(%esi) /* Make sure it starts with a slash */ - je 1f - movb $'/',(%edi) - incl %edi - decl %ecx -1: - cld - rep - movsb - -2: - /* * Determine the size of the boot loader's copy of the bootinfo - * struct. This is impossible to do properly because old versions - * of the struct don't contain a size field and there are 2 old - * versions with the same version number. + * struct. */ - movl $BI_ENDCOMMON,%ecx /* prepare for sizeless version */ - testl $RB_BOOTINFO,8(%ebp) /* bi_size (and bootinfo) valid? */ - je got_bi_size /* no, sizeless version */ movl BI_SIZE(%ebx),%ecx -got_bi_size: /* * Copy the common part of the bootinfo struct @@ -451,31 +385,6 @@ rep movsb -#ifdef NFS_ROOT -#ifndef BOOTP_NFSV3 - /* - * If we have a nfs_diskless structure copy it in - */ - movl BI_NFS_DISKLESS(%ebx),%esi - cmpl $0,%esi - je olddiskboot - movl $R(nfs_diskless),%edi - movl $NFSDISKLESS_SIZE,%ecx - cld - rep - movsb - movl $R(nfs_diskless_valid),%edi - movl $1,(%edi) -#endif -#endif - - /* - * The old style disk boot. - * (*btext)(howto, bootdev, cyloffset, esym); - * Note that the newer boot code just falls into here to pick - * up howto and bootdev, cyloffset and esym are no longer used - */ -olddiskboot: movl 8(%ebp),%eax movl %eax,R(boothowto) movl 12(%ebp),%eax To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 21:25:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F89F37B401; Fri, 20 Sep 2002 21:25:31 -0700 (PDT) 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 BC28537B404 for ; Fri, 20 Sep 2002 21:25:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 206E443E42 for ; Fri, 20 Sep 2002 21:25:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L4PUCo023976 for ; Fri, 20 Sep 2002 21:25:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L4PTuW023973 for perforce@freebsd.org; Fri, 20 Sep 2002 21:25:29 -0700 (PDT) Date: Fri, 20 Sep 2002 21:25:29 -0700 (PDT) Message-Id: <200209210425.g8L4PTuW023973@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17828 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17828 Change 17828 by peter@peter_daintree on 2002/09/20 21:24:34 remove microchannel (I defy somebody to show me a hammer + microchannel system!), various other cruft. Get rid of TPR stuff since we actually have %cr8 as a TPR replacement which will be a lot nicer. That all needs to be redone. Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/clock.c#2 edit .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#3 edit .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.h#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#6 edit .. //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#3 edit .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/clock.c#2 (text+ko) ==== @@ -50,7 +50,6 @@ #include "opt_clock.h" #include "opt_isa.h" -#include "opt_mca.h" #include #include @@ -91,10 +90,6 @@ #include -#ifdef DEV_MCA -#include -#endif - #ifdef APIC_IO #include /* The interrupt triggered by the 8254 (timer) chip */ @@ -262,11 +257,6 @@ } break; } -#ifdef DEV_MCA - /* Reset clock interrupt by asserting bit 7 of port 0x61 */ - if (MCA_system) - outb(0x61, inb(0x61) | 0x80); -#endif } /* ==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#3 (text+ko) ==== @@ -39,7 +39,6 @@ #include "opt_auto_eoi.h" #include "opt_isa.h" -#include "opt_mca.h" #include #include @@ -60,7 +59,6 @@ #include #if defined(APIC_IO) -#include /** FAST_HI */ #include #include #endif /* APIC_IO */ @@ -76,10 +74,6 @@ #include #endif -#ifdef DEV_MCA -#include -#endif - /* * Per-interrupt data. */ @@ -238,10 +232,6 @@ int eisa_port = inb(0x461); log(LOG_CRIT, "NMI ISA %x, EISA %x\n", isa_port, eisa_port); -#ifdef DEV_MCA - if (MCA_system && mca_bus_nmi()) - return(0); -#endif if (isa_port & NMI_PARITY) { log(LOG_CRIT, "RAM parity error, likely hardware failure."); @@ -324,12 +314,7 @@ static void init_i8259() { -#ifdef DEV_MCA - if (MCA_system) - outb(IO_ICU1, 0x19); /* reset; program device, four bytes */ - else -#endif - outb(IO_ICU1, 0x11); /* reset; program device, four bytes */ + outb(IO_ICU1, 0x11); /* reset; program device, four bytes */ outb(IO_ICU1+ICU_IMR_OFFSET, NRSVIDT); /* starting at this vector index */ outb(IO_ICU1+ICU_IMR_OFFSET, IRQ_SLAVE); /* slave on line 7 */ @@ -342,12 +327,7 @@ outb(IO_ICU1, 0x0a); /* default to IRR on read */ outb(IO_ICU1, 0xc0 | (3 - 1)); /* pri order 3-7, 0-2 (com2 first) */ -#ifdef DEV_MCA - if (MCA_system) - outb(IO_ICU2, 0x19); /* reset; program device, four bytes */ - else -#endif - outb(IO_ICU2, 0x11); /* reset; program device, four bytes */ + outb(IO_ICU2, 0x11); /* reset; program device, four bytes */ outb(IO_ICU2+ICU_IMR_OFFSET, NRSVIDT+8); /* staring at this vector index */ outb(IO_ICU2+ICU_IMR_OFFSET, ICU_SLAVEID); /* my slave id is 7 */ @@ -456,11 +436,6 @@ int icu_setup(int intr, driver_intr_t *handler, void *arg, int flags) { -#ifdef FAST_HI - int select; /* the select register is 8 bits */ - int vector; - u_int32_t value; /* the window register is 32 bits */ -#endif /* FAST_HI */ register_t crit; #if defined(APIC_IO) @@ -478,35 +453,9 @@ mtx_lock_spin(&icu_lock); intr_handler[intr] = handler; intr_unit[intr] = arg; -#ifdef FAST_HI - if (flags & INTR_FAST) { - vector = TPR_FAST_INTS + intr; - setidt(vector, fastintr[intr], - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - } - else { - vector = TPR_SLOW_INTS + intr; - setidt(vector, slowintr[intr], - SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); - } -#ifdef APIC_INTR_REORDER - set_lapic_isrloc(intr, vector); -#endif - /* - * Reprogram the vector in the IO APIC. - */ - if (int_to_apicintpin[intr].ioapic >= 0) { - select = int_to_apicintpin[intr].redirindex; - value = io_apic_read(int_to_apicintpin[intr].ioapic, - select) & ~IOART_INTVEC; - io_apic_write(int_to_apicintpin[intr].ioapic, - select, value | vector); - } -#else setidt(ICU_OFFSET + intr, flags & INTR_FAST ? fastintr[intr] : slowintr[intr], SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); -#endif /* FAST_HI */ INTREN(1 << intr); mtx_unlock_spin(&icu_lock); intr_restore(crit); @@ -534,17 +483,8 @@ intr_countp[intr] = &intrcnt[1 + intr]; intr_handler[intr] = isa_strayintr; intr_unit[intr] = &intr_unit[intr]; -#ifdef FAST_HI_XXX - /* XXX how do I re-create dvp here? */ - setidt(flags & INTR_FAST ? TPR_FAST_INTS + intr : TPR_SLOW_INTS + intr, - slowintr[intr], SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); -#else /* FAST_HI */ -#ifdef APIC_INTR_REORDER - set_lapic_isrloc(intr, ICU_OFFSET + intr); -#endif setidt(ICU_OFFSET + intr, slowintr[intr], SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL)); -#endif /* FAST_HI */ mtx_unlock_spin(&icu_lock); intr_restore(crit); return (0); ==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.h#2 (text+ko) ==== @@ -99,11 +99,6 @@ #define TPR_BLOCK_XCPUSTOP 0xaf /* */ #define TPR_BLOCK_ALL 0xff /* all INTs */ -#ifdef TEST_TEST1 -/* put a 'fake' HWI in top of APIC prio 0x3x, 32 + 31 = 63 = 0x3f */ -#define XTEST1_OFFSET (ICU_OFFSET + 31) -#endif /** TEST_TEST1 */ - /* TLB shootdowns */ #define XINVLTLB_OFFSET (ICU_OFFSET + 112) /* 0x90 */ #define XINVLPG_OFFSET (ICU_OFFSET + 113) /* 0x91 */ @@ -208,12 +203,6 @@ Xspuriousint, /* handle APIC "spurious INTs" */ Xrendezvous; /* handle CPU rendezvous */ -#ifdef TEST_TEST1 -inthand_t - Xtest1; /* 'fake' HWI at top of APIC prio 0x3x, 32+31 = 0x3f */ -#endif /** TEST_TEST1 */ -#endif /* SMP || APIC_IO */ - #ifdef APIC_IO /* * This is to accommodate "mixed-mode" programming for ==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#6 (text+ko) ==== @@ -38,9 +38,6 @@ #include #include #include -#ifdef SMP -#include /** various SMP options */ -#endif #include "assym.s" ==== //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#3 (text+ko) ==== @@ -240,12 +240,6 @@ panic("nexus_attach eisa"); device_probe_and_attach(child); } - if (!devclass_get_device(devclass_find("mca"), 0)) { - child = BUS_ADD_CHILD(dev, 0, "mca", 0); - if (child == 0) - panic("nexus_probe mca"); - device_probe_and_attach(child); - } if (!devclass_get_device(devclass_find("isa"), 0)) { child = BUS_ADD_CHILD(dev, 0, "isa", 0); if (child == NULL) ==== //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#4 (text+ko) ==== @@ -38,11 +38,6 @@ #include -#ifdef SMP -#include -#include /* CHEAP_TPR, GRAB_LOPRIO */ -#endif - #include "assym.s" /*****************************************************************************/ @@ -51,8 +46,6 @@ .data - .globl panic - #ifdef SWTCH_OPTIM_STATS .globl swtch_optim_stats, tlb_flush_count swtch_optim_stats: .long 0 /* number of _swtch_optims */ @@ -123,10 +116,6 @@ movl %eax,PCB_DR0(%edx) 1: -#ifdef SMP - /* XXX FIXME: we should be saving the local APIC TPR */ -#endif - /* have we used fp, and need a save? */ cmpl %ecx,PCPU(FPCURTHREAD) jne 1f @@ -233,21 +222,9 @@ pushl PCB_PSL(%edx) popfl -#if defined(SMP) && defined(GRAB_LOPRIO) - /* Hold LOPRIO for interrupts. */ -#ifdef CHEAP_TPR - movl $0, lapic+LA_TPR -#else - andl $~APIC_TPR_PRIO, lapic+LA_TPR -#endif -#endif movl %edx, PCPU(CURPCB) movl %ecx, PCPU(CURTHREAD) /* into next thread */ -#ifdef SMP - /* XXX FIXME: we should be restoring the local APIC TPR */ -#endif - /* * Determine the LDT to use and load it if is the default one and * that is not the current one. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 21:58:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07A2837B404; Fri, 20 Sep 2002 21:58:11 -0700 (PDT) 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 A666B37B401 for ; Fri, 20 Sep 2002 21:58:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE60843E65 for ; Fri, 20 Sep 2002 21:58:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L4w9Co030052 for ; Fri, 20 Sep 2002 21:58:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L4w9m5030049 for perforce@freebsd.org; Fri, 20 Sep 2002 21:58:09 -0700 (PDT) Date: Fri, 20 Sep 2002 21:58:09 -0700 (PDT) Message-Id: <200209210458.g8L4w9m5030049@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17829 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17829 Change 17829 by peter@peter_daintree on 2002/09/20 21:57:13 argh, I've had it. This lousy SMP/APIC code is giving me a headache. Out with it! We always said we needed to report it, here's our chance. If necessary, re-copy it from i386 later but for now start with the easy case. Affected files ... .. //depot/projects/hammer/sys/x86_64/acpica/acpi_machdep.c#2 edit .. //depot/projects/hammer/sys/x86_64/include/atomic.h#3 edit .. //depot/projects/hammer/sys/x86_64/include/clock.h#3 edit .. //depot/projects/hammer/sys/x86_64/include/param.h#3 edit .. //depot/projects/hammer/sys/x86_64/include/pmap.h#2 edit .. //depot/projects/hammer/sys/x86_64/include/segments.h#3 edit .. //depot/projects/hammer/sys/x86_64/isa/clock.c#3 edit .. //depot/projects/hammer/sys/x86_64/isa/icu.h#3 edit .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#4 edit .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.h#3 edit .. //depot/projects/hammer/sys/x86_64/isa/vector.s#3 edit .. //depot/projects/hammer/sys/x86_64/pci/pci_cfgreg.c#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/critical.c#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#7 edit .. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#4 edit .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#9 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#12 edit .. //depot/projects/hammer/sys/x86_64/x86_64/mem.c#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#4 edit .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#4 edit .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#5 edit .. //depot/projects/hammer/sys/x86_64/x86_64/sys_machdep.c#5 edit .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#10 edit .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/acpica/acpi_machdep.c#2 (text+ko) ==== @@ -330,9 +330,6 @@ acpi_install_wakeup_handler(sc); -#ifdef APIC_IO - acpi_SetIntrModel(ACPI_INTR_APIC); -#endif return (0); } ==== //depot/projects/hammer/sys/x86_64/include/atomic.h#3 (text+ko) ==== @@ -81,7 +81,7 @@ * For userland, assume the SMP case and use lock prefixes so that * the binaries will run on both types of systems. */ -#if defined(SMP) || !defined(_KERNEL) +#if !defined(_KERNEL) #define MPLOCKED lock ; #else #define MPLOCKED ==== //depot/projects/hammer/sys/x86_64/include/clock.h#3 (text+ko) ==== @@ -22,9 +22,6 @@ extern u_int tsc_freq; extern int tsc_is_broken; extern int wall_cmos_clock; -#ifdef APIC_IO -extern int apic_8254_intr; -#endif /* * Driver to clock driver interface. ==== //depot/projects/hammer/sys/x86_64/include/param.h#3 (text+ko) ==== @@ -84,11 +84,7 @@ #endif #define MID_MACHINE MID_X86_64 -#ifdef SMP -#define MAXCPU 16 -#else #define MAXCPU 1 -#endif /* SMP */ #define ALIGNBYTES _ALIGNBYTES #define ALIGN(p) _ALIGN(p) ==== //depot/projects/hammer/sys/x86_64/include/pmap.h#2 (text+ko) ==== @@ -100,28 +100,17 @@ #define NKPT 30 /* actual number of kernel page tables */ #endif #ifndef NKPDE -#ifdef SMP -#define NKPDE (KVA_PAGES - 2) /* addressable number of page tables/pde's */ -#else #define NKPDE (KVA_PAGES - 1) /* addressable number of page tables/pde's */ #endif -#endif /* * The *PTDI values control the layout of virtual memory * * XXX This works for now, but I am not real happy with it, I'll fix it * right after I fix locore.s and the magic 28K hole - * - * SMP_PRIVPAGES: The per-cpu address space is 0xff80000 -> 0xffbfffff */ #define APTDPTDI (NPDEPG-1) /* alt ptd entry that points to APTD */ -#ifdef SMP -#define MPPTDI (APTDPTDI-1) /* per cpu ptd entry */ -#define KPTDI (MPPTDI-NKPDE) /* start of kernel virtual pde's */ -#else #define KPTDI (APTDPTDI-NKPDE)/* start of kernel virtual pde's */ -#endif /* SMP */ #define PTDPTDI (KPTDI-1) /* ptd entry that points to ptd! */ #define UMAXPTDI (PTDPTDI-1) /* ptd entry for user space end */ #define UMAXPTEOFF (NPTEPG) /* pte entry for user space end */ ==== //depot/projects/hammer/sys/x86_64/include/segments.h#3 (text+ko) ==== @@ -193,12 +193,7 @@ /* * Size of IDT table */ - -#if defined(SMP) || defined(APIC_IO) -#define NIDT 256 /* we use them all */ -#else #define NIDT 129 /* 32 reserved, 16 h/w, 0 s/w, linux's 0x80 */ -#endif /* SMP || APIC_IO */ #define NRSVIDT 32 /* reserved entries for cpu exceptions */ /* @@ -207,20 +202,11 @@ #define GNULL_SEL 0 /* Null Descriptor */ #define GCODE_SEL 1 /* Kernel Code Descriptor */ #define GDATA_SEL 2 /* Kernel Data Descriptor */ -#define GPRIV_SEL 3 /* SMP Per-Processor Private Data */ -#define GPROC0_SEL 4 /* Task state process slot zero and up */ -#define GLDT_SEL 5 /* LDT - eventually one per process */ -#define GUSERLDT_SEL 6 /* User LDT */ -#define GTGATE_SEL 7 /* Process task switch gate */ -#define GBIOSLOWMEM_SEL 8 /* BIOS low memory access (must be entry 8) */ -#define GPANIC_SEL 9 /* Task state to consider panic from */ -#define GBIOSCODE32_SEL 10 /* BIOS interface (32bit Code) */ -#define GBIOSCODE16_SEL 11 /* BIOS interface (16bit Code) */ -#define GBIOSDATA_SEL 12 /* BIOS interface (Data) */ -#define GBIOSUTIL_SEL 13 /* BIOS interface (Utility) */ -#define GBIOSARGS_SEL 14 /* BIOS interface (Arguments) */ - -#define NGDT 15 +#define GPROC0_SEL 3 /* Task state process slot zero and up */ +#define GLDT_SEL 4 /* LDT - eventually one per process */ +#define GUSERLDT_SEL 5 /* User LDT */ +#define GPANIC_SEL 6 /* Task state to consider panic from */ +#define NGDT 7 /* * Entries in the Local Descriptor Table (LDT) ==== //depot/projects/hammer/sys/x86_64/isa/clock.c#3 (text+ko) ==== @@ -72,12 +72,6 @@ #include #include #include -#ifdef APIC_IO -#include -#endif -#if defined(SMP) || defined(APIC_IO) -#include -#endif /* SMP || APIC_IO */ #include #include @@ -90,14 +84,6 @@ #include -#ifdef APIC_IO -#include -/* The interrupt triggered by the 8254 (timer) chip */ -int apic_8254_intr; -static u_long read_intr_count(int vec); -static void setup_8254_mixed_mode(void); -#endif - /* * 32-bit time_t's can't reach leap years before 1904 or after 2036, so we * can use a simple formula for leap years. @@ -202,10 +188,6 @@ mtx_unlock_spin(&clock_lock); } timer_func(&frame); -#ifdef SMP - if (timer_func == hardclock) - forward_hardclock(); -#endif switch (timer0_state) { case RELEASED: @@ -216,9 +198,6 @@ >= hardclock_max_count) { timer0_prescaler_count -= hardclock_max_count; hardclock(&frame); -#ifdef SMP - forward_hardclock(); -#endif } break; @@ -251,9 +230,6 @@ timer_func = hardclock; timer0_state = RELEASED; hardclock(&frame); -#ifdef SMP - forward_hardclock(); -#endif } break; } @@ -372,9 +348,6 @@ { while (rtcin(RTC_INTR) & RTCIR_PERIOD) { statclock(&frame); -#ifdef SMP - forward_statclock(); -#endif } } @@ -803,7 +776,6 @@ #endif } -#if !defined(SMP) /* * We can not use the TSC in SMP mode, until we figure out a * cheap (impossible), reliable and precise (yeah right!) way @@ -831,8 +803,6 @@ tsc_timecounter.tc_frequency = tsc_freq; tc_init(&tsc_timecounter); } - -#endif /* !defined(SMP) */ } /* @@ -976,10 +946,6 @@ cpu_initclocks() { int diag; -#ifdef APIC_IO - int apic_8254_trial; - void *clkdesc; -#endif /* APIC_IO */ register_t crit; if (statclock_disable) { @@ -997,32 +963,6 @@ } /* Finish initializing 8253 timer 0. */ -#ifdef APIC_IO - - apic_8254_intr = isa_apic_irq(0); - apic_8254_trial = 0; - if (apic_8254_intr >= 0 ) { - if (apic_int_type(0, 0) == 3) - apic_8254_trial = 1; - } else { - /* look for ExtInt on pin 0 */ - if (apic_int_type(0, 0) == 3) { - apic_8254_intr = apic_irq(0, 0); - setup_8254_mixed_mode(); - } else - panic("APIC_IO: Cannot route 8254 interrupt to CPU"); - } - - inthand_add("clk", apic_8254_intr, (driver_intr_t *)clkintr, NULL, - INTR_TYPE_CLK | INTR_FAST, &clkdesc); - crit = intr_disable(); - mtx_lock_spin(&icu_lock); - INTREN(1 << apic_8254_intr); - mtx_unlock_spin(&icu_lock); - intr_restore(crit); - -#else /* APIC_IO */ - /* * XXX Check the priority of this interrupt handler. I * couldn't find anything suitable in the BSD/OS code (grog, @@ -1036,8 +976,6 @@ mtx_unlock_spin(&icu_lock); intr_restore(crit); -#endif /* APIC_IO */ - /* Initialize RTC. */ writertc(RTC_STATUSA, rtc_statusa); writertc(RTC_STATUSB, RTCSB_24HR); @@ -1049,118 +987,17 @@ if (diag != 0) printf("RTC BIOS diagnostic error %b\n", diag, RTCDG_BITS); -#ifdef APIC_IO - if (isa_apic_irq(8) != 8) - panic("APIC RTC != 8"); -#endif /* APIC_IO */ - inthand_add("rtc", 8, (driver_intr_t *)rtcintr, NULL, INTR_TYPE_CLK | INTR_FAST, NULL); crit = intr_disable(); mtx_lock_spin(&icu_lock); -#ifdef APIC_IO - INTREN(APIC_IRQ8); -#else INTREN(IRQ8); -#endif /* APIC_IO */ mtx_unlock_spin(&icu_lock); intr_restore(crit); writertc(RTC_STATUSB, rtc_statusb); - -#ifdef APIC_IO - if (apic_8254_trial) { - - printf("APIC_IO: Testing 8254 interrupt delivery\n"); - while (read_intr_count(8) < 6) - ; /* nothing */ - if (read_intr_count(apic_8254_intr) < 3) { - /* - * The MP table is broken. - * The 8254 was not connected to the specified pin - * on the IO APIC. - * Workaround: Limited variant of mixed mode. - */ - - crit = intr_disable(); - mtx_lock_spin(&icu_lock); - INTRDIS(1 << apic_8254_intr); - mtx_unlock_spin(&icu_lock); - intr_restore(crit); - inthand_remove(clkdesc); - printf("APIC_IO: Broken MP table detected: " - "8254 is not connected to " - "IOAPIC #%d intpin %d\n", - int_to_apicintpin[apic_8254_intr].ioapic, - int_to_apicintpin[apic_8254_intr].int_pin); - /* - * Revoke current ISA IRQ 0 assignment and - * configure a fallback interrupt routing from - * the 8254 Timer via the 8259 PIC to the - * an ExtInt interrupt line on IOAPIC #0 intpin 0. - * We reuse the low level interrupt handler number. - */ - if (apic_irq(0, 0) < 0) { - revoke_apic_irq(apic_8254_intr); - assign_apic_irq(0, 0, apic_8254_intr); - } - apic_8254_intr = apic_irq(0, 0); - setup_8254_mixed_mode(); - inthand_add("clk", apic_8254_intr, - (driver_intr_t *)clkintr, NULL, - INTR_TYPE_CLK | INTR_FAST, NULL); - crit = intr_disable(); - mtx_lock_spin(&icu_lock); - INTREN(1 << apic_8254_intr); - mtx_unlock_spin(&icu_lock); - intr_restore(crit); - } - - } - if (apic_int_type(0, 0) != 3 || - int_to_apicintpin[apic_8254_intr].ioapic != 0 || - int_to_apicintpin[apic_8254_intr].int_pin != 0) - printf("APIC_IO: routing 8254 via IOAPIC #%d intpin %d\n", - int_to_apicintpin[apic_8254_intr].ioapic, - int_to_apicintpin[apic_8254_intr].int_pin); - else - printf("APIC_IO: " - "routing 8254 via 8259 and IOAPIC #0 intpin 0\n"); -#endif - -} - -#ifdef APIC_IO -static u_long -read_intr_count(int vec) -{ - u_long *up; - up = intr_countp[vec]; - if (up) - return *up; - return 0UL; -} - -static void -setup_8254_mixed_mode() -{ - /* - * Allow 8254 timer to INTerrupt 8259: - * re-initialize master 8259: - * reset; prog 4 bytes, single ICU, edge triggered - */ - outb(IO_ICU1, 0x13); - outb(IO_ICU1 + 1, NRSVIDT); /* start vector (unused) */ - outb(IO_ICU1 + 1, 0x00); /* ignore slave */ - outb(IO_ICU1 + 1, 0x03); /* auto EOI, 8086 */ - outb(IO_ICU1 + 1, 0xfe); /* unmask INT0 */ - - /* program IO APIC for type 3 INT on INT0 */ - if (ext_int_setup(0, 0) < 0) - panic("8254 redirect via APIC pin0 impossible!"); } -#endif void setstatclockrate(int newhz) @@ -1235,13 +1072,7 @@ if (count < i8254_lastcount || (!i8254_ticked && (clkintr_pending || ((count < 20 || (!(eflags & PSL_I) && count < timer0_max_count / 2u)) && -#ifdef APIC_IO -#define lapic_irr1 ((volatile u_int *)&lapic)[0x210 / 4] /* XXX XXX */ - /* XXX this assumes that apic_8254_intr is < 24. */ - (lapic_irr1 & (1 << apic_8254_intr)))) -#else (inb(IO_ICU1) & 1))) -#endif )) { i8254_ticked = 1; i8254_offset += timer0_max_count; ==== //depot/projects/hammer/sys/x86_64/isa/icu.h#3 (text+ko) ==== @@ -58,26 +58,12 @@ void INTREN(u_int); void INTRDIS(u_int); -#ifdef APIC_IO -extern unsigned apic_imen; /* APIC interrupt mask enable */ -#else extern unsigned imen; /* interrupt mask enable */ -#endif #endif /* LOCORE */ -#ifdef APIC_IO /* - * Note: The APIC uses different values for IRQxxx. - * Unfortunately many drivers use the 8259 values as indexes - * into tables, etc. The APIC equivilants are kept as APIC_IRQxxx. - * The 8259 versions have to be used in SMP for legacy operation - * of the drivers. - */ -#endif /* APIC_IO */ - -/* * Interrupt enable bits - in normal order of priority (which we change) */ #define IRQ0 0x0001 /* highest priority - timer */ @@ -107,21 +93,10 @@ #define ICU_SLAVEID 2 #define ICU_EOI 0x20 -#ifdef APIC_IO - -/* 32-47: ISA IRQ0-IRQ15, 48-63: IO APIC IRQ16-IRQ31 */ -#define ICU_LEN 32 -#define HWI_MASK 0xffffffff /* bits for h/w interrupts */ -#define NHWI 32 - -#else - #define ICU_LEN 16 /* 32-47 are ISA interrupts */ #define HWI_MASK 0xffff /* bits for h/w interrupts */ #define NHWI 16 -#endif /* APIC_IO */ - #define INTRCNT_COUNT (1 + ICU_LEN + 2 * ICU_LEN) #endif /* !_I386_ISA_ICU_H_ */ ==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#4 (text+ko) ==== @@ -58,10 +58,6 @@ #include #include -#if defined(APIC_IO) -#include -#include -#endif /* APIC_IO */ #include #include @@ -70,9 +66,6 @@ #endif #include #include -#ifdef APIC_IO -#include -#endif /* * Per-interrupt data. @@ -93,16 +86,6 @@ &IDTVEC(fastintr10), &IDTVEC(fastintr11), &IDTVEC(fastintr12), &IDTVEC(fastintr13), &IDTVEC(fastintr14), &IDTVEC(fastintr15), -#if defined(APIC_IO) - &IDTVEC(fastintr16), &IDTVEC(fastintr17), - &IDTVEC(fastintr18), &IDTVEC(fastintr19), - &IDTVEC(fastintr20), &IDTVEC(fastintr21), - &IDTVEC(fastintr22), &IDTVEC(fastintr23), - &IDTVEC(fastintr24), &IDTVEC(fastintr25), - &IDTVEC(fastintr26), &IDTVEC(fastintr27), - &IDTVEC(fastintr28), &IDTVEC(fastintr29), - &IDTVEC(fastintr30), &IDTVEC(fastintr31), -#endif /* APIC_IO */ }; static unpendhand_t *fastunpend[ICU_LEN] = { @@ -114,16 +97,6 @@ &IDTVEC(fastunpend10), &IDTVEC(fastunpend11), &IDTVEC(fastunpend12), &IDTVEC(fastunpend13), &IDTVEC(fastunpend14), &IDTVEC(fastunpend15), -#if defined(APIC_IO) - &IDTVEC(fastunpend16), &IDTVEC(fastunpend17), - &IDTVEC(fastunpend18), &IDTVEC(fastunpend19), - &IDTVEC(fastunpend20), &IDTVEC(fastunpend21), - &IDTVEC(fastunpend22), &IDTVEC(fastunpend23), - &IDTVEC(fastunpend24), &IDTVEC(fastunpend25), - &IDTVEC(fastunpend26), &IDTVEC(fastunpend27), - &IDTVEC(fastunpend28), &IDTVEC(fastunpend29), - &IDTVEC(fastunpend30), &IDTVEC(fastunpend31), -#endif /* APIC_IO */ }; static inthand_t *slowintr[ICU_LEN] = { @@ -131,12 +104,6 @@ &IDTVEC(intr4), &IDTVEC(intr5), &IDTVEC(intr6), &IDTVEC(intr7), &IDTVEC(intr8), &IDTVEC(intr9), &IDTVEC(intr10), &IDTVEC(intr11), &IDTVEC(intr12), &IDTVEC(intr13), &IDTVEC(intr14), &IDTVEC(intr15), -#if defined(APIC_IO) - &IDTVEC(intr16), &IDTVEC(intr17), &IDTVEC(intr18), &IDTVEC(intr19), - &IDTVEC(intr20), &IDTVEC(intr21), &IDTVEC(intr22), &IDTVEC(intr23), - &IDTVEC(intr24), &IDTVEC(intr25), &IDTVEC(intr26), &IDTVEC(intr27), - &IDTVEC(intr28), &IDTVEC(intr29), &IDTVEC(intr30), &IDTVEC(intr31), -#endif /* APIC_IO */ }; static driver_intr_t isa_strayintr; @@ -172,27 +139,12 @@ } /* - * In the APIC_IO case we might be granted IRQ 2, as this is typically - * consumed by chaining between the two PIC components. If we're using - * the APIC, however, this may not be the case, and as such we should - * free the resource. (XXX untested) - * * The generic ISA attachment code will handle allocating any other resources * that we don't explicitly claim here. */ static int atpic_attach(device_t dev) { -#ifdef APIC_IO - int rid; - struct resource *res; - - /* try to allocate our IRQ and then free it */ - rid = 0; - res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, 0); - if (res != NULL) - bus_release_resource(dev, SYS_RES_IRQ, rid, res); -#endif return(0); } @@ -438,11 +390,7 @@ { register_t crit; -#if defined(APIC_IO) - if ((u_int)intr >= ICU_LEN) /* no 8259 SLAVE to ignore */ -#else if ((u_int)intr >= ICU_LEN || intr == ICU_SLAVEID) -#endif /* APIC_IO */ return (EINVAL); #if 0 if (intr_handler[intr] != isa_strayintr) ==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.h#3 (text+ko) ==== @@ -42,89 +42,6 @@ #ifdef _KERNEL -#if defined(SMP) || defined(APIC_IO) -/* - * XXX FIXME: rethink location for all IPI vectors. - */ - -/* - APIC TPR priority vector levels: - - 0xff (255) +-------------+ - | | 15 (IPIs: Xspuriousint) - 0xf0 (240) +-------------+ - | | 14 - 0xe0 (224) +-------------+ - | | 13 - 0xd0 (208) +-------------+ - | | 12 - 0xc0 (192) +-------------+ - | | 11 - 0xb0 (176) +-------------+ - | | 10 (IPIs: Xcpustop) - 0xa0 (160) +-------------+ - | | 9 (IPIs: Xinvltlb) - 0x90 (144) +-------------+ - | | 8 (linux/BSD syscall, IGNORE FAST HW INTS) - 0x80 (128) +-------------+ - | | 7 (FAST_INTR 16-23) - 0x70 (112) +-------------+ - | | 6 (FAST_INTR 0-15) - 0x60 (96) +-------------+ - | | 5 (IGNORE HW INTS) - 0x50 (80) +-------------+ - | | 4 (2nd IO APIC) - 0x40 (64) +------+------+ - | | | 3 (upper APIC hardware INTs: PCI) - 0x30 (48) +------+------+ - | | 2 (start of hardware INTs: ISA) - 0x20 (32) +-------------+ - | | 1 (exceptions, traps, etc.) - 0x10 (16) +-------------+ - | | 0 (exceptions, traps, etc.) - 0x00 (0) +-------------+ - */ - -/* IDT vector base for regular (aka. slow) and fast interrupts */ -#define TPR_SLOW_INTS 0x20 -#define TPR_FAST_INTS 0x60 -/* XXX note that the AST interrupt is at 0x50 */ - -/* blocking values for local APIC Task Priority Register */ -#define TPR_BLOCK_HWI 0x4f /* hardware INTs */ -#define TPR_IGNORE_HWI 0x5f /* ignore INTs */ -#define TPR_BLOCK_FHWI 0x7f /* hardware FAST INTs */ -#define TPR_IGNORE_FHWI 0x8f /* ignore FAST INTs */ -#define TPR_BLOCK_XINVLTLB 0x9f /* */ -#define TPR_BLOCK_XCPUSTOP 0xaf /* */ -#define TPR_BLOCK_ALL 0xff /* all INTs */ - -/* TLB shootdowns */ -#define XINVLTLB_OFFSET (ICU_OFFSET + 112) /* 0x90 */ -#define XINVLPG_OFFSET (ICU_OFFSET + 113) /* 0x91 */ -#define XINVLRNG_OFFSET (ICU_OFFSET + 114) /* 0x92 */ - -/* inter-cpu clock handling */ -#define XHARDCLOCK_OFFSET (ICU_OFFSET + 120) /* 0x98 */ -#define XSTATCLOCK_OFFSET (ICU_OFFSET + 121) /* 0x99 */ - -/* inter-CPU rendezvous */ -#define XRENDEZVOUS_OFFSET (ICU_OFFSET + 122) /* 0x9A */ - -/* IPI to generate an additional software trap at the target CPU */ -/* XXX in the middle of the interrupt range, overlapping IRQ48 */ -#define XCPUAST_OFFSET (ICU_OFFSET + 48) /* 0x50 */ - -/* IPI to signal CPUs to stop and wait for another CPU to restart them */ -#define XCPUSTOP_OFFSET (ICU_OFFSET + 128) /* 0xA0 */ - -/* - * Note: this vector MUST be xxxx1111, 32 + 223 = 255 = 0xff: - */ -#define XSPURIOUSINT_OFFSET (ICU_OFFSET + 223) - -#endif /* SMP || APIC_IO */ - #ifdef LOCORE /* @@ -176,41 +93,6 @@ IDTVEC(fastunpend27), IDTVEC(fastunpend28), IDTVEC(fastunpend29), IDTVEC(fastunpend30), IDTVEC(fastunpend31); -#if defined(SMP) || defined(APIC_IO) -inthand_t - IDTVEC(fastintr16), IDTVEC(fastintr17), - IDTVEC(fastintr18), IDTVEC(fastintr19), - IDTVEC(fastintr20), IDTVEC(fastintr21), - IDTVEC(fastintr22), IDTVEC(fastintr23), - IDTVEC(fastintr24), IDTVEC(fastintr25), - IDTVEC(fastintr26), IDTVEC(fastintr27), - IDTVEC(fastintr28), IDTVEC(fastintr29), - IDTVEC(fastintr30), IDTVEC(fastintr31); -inthand_t - IDTVEC(intr16), IDTVEC(intr17), IDTVEC(intr18), IDTVEC(intr19), - IDTVEC(intr20), IDTVEC(intr21), IDTVEC(intr22), IDTVEC(intr23), - IDTVEC(intr24), IDTVEC(intr25), IDTVEC(intr26), IDTVEC(intr27), - IDTVEC(intr28), IDTVEC(intr29), IDTVEC(intr30), IDTVEC(intr31); - -inthand_t - Xinvltlb, /* TLB shootdowns - global */ - Xinvlpg, /* TLB shootdowns - 1 page */ - Xinvlrng, /* TLB shootdowns - page range */ - Xhardclock, /* Forward hardclock() */ - Xstatclock, /* Forward statclock() */ - Xcpuast, /* Additional software trap on other cpu */ - Xcpustop, /* CPU stops & waits for another CPU to restart it */ - Xspuriousint, /* handle APIC "spurious INTs" */ - Xrendezvous; /* handle CPU rendezvous */ - -#ifdef APIC_IO -/* - * This is to accommodate "mixed-mode" programming for - * motherboards that don't connect the 8254 to the IO APIC. - */ -#define AUTO_EOI_1 1 -#endif - #define NR_INTRNAMES (1 + ICU_LEN + 2 * ICU_LEN) void isa_defaultirq(void); ==== //depot/projects/hammer/sys/x86_64/isa/vector.s#3 (text+ko) ==== @@ -93,8 +93,4 @@ * loading segregs. */ -#ifdef APIC_IO -#include "i386/isa/apic_vector.s" -#else #include "i386/isa/icu_vector.s" -#endif /* APIC_IO */ ==== //depot/projects/hammer/sys/x86_64/pci/pci_cfgreg.c#2 (text+ko) ==== @@ -45,10 +45,6 @@ #include #include -#ifdef APIC_IO -#include -#endif /* APIC_IO */ - #include "pcib_if.h" #define PRVERB(a) printf a @@ -201,50 +197,8 @@ pci_cfgregread(int bus, int slot, int func, int reg, int bytes) { uint32_t line; -#ifdef APIC_IO - uint32_t pin; /* - * If we are using the APIC, the contents of the intline - * register will probably be wrong (since they are set up for - * use with the PIC. Rather than rewrite these registers - * (maybe that would be smarter) we trap attempts to read them - * and translate to our private vector numbers. - */ - if ((reg == PCIR_INTLINE) && (bytes == 1)) { - - pin = pci_do_cfgregread(bus, slot, func, PCIR_INTPIN, 1); - line = pci_do_cfgregread(bus, slot, func, PCIR_INTLINE, 1); - - if (pin != 0) { - int airq; - - airq = pci_apic_irq(bus, slot, pin); - if (airq >= 0) { - /* PCI specific entry found in MP table */ - if (airq != line) - undirect_pci_irq(line); - return(airq); - } else { - /* - * PCI interrupts might be redirected - * to the ISA bus according to some MP - * tables. Use the same methods as - * used by the ISA devices devices to - * find the proper IOAPIC int pin. - */ - airq = isa_apic_irq(line); - if ((airq >= 0) && (airq != line)) { - /* XXX: undirect_pci_irq() ? */ - undirect_isa_irq(line); - return(airq); - } - } - } - return(line); - } -#else - /* * Some BIOS writers seem to want to ignore the spec and put * 0 in the intline rather than 255 to indicate none. The rest of * the code uses 255 as an invalid IRQ. @@ -253,7 +207,6 @@ line = pci_do_cfgregread(bus, slot, func, PCIR_INTLINE, 1); return pci_i386_map_intline(line); } -#endif /* APIC_IO */ return(pci_do_cfgregread(bus, slot, func, reg, bytes)); } ==== //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#2 (text+ko) ==== @@ -77,11 +77,7 @@ #include #include -#ifdef APIC_IO -#include -#else #include -#endif /* APIC_IO */ #ifdef DEV_ISA #include @@ -135,13 +131,8 @@ * * This is all rather inconvenient. */ -#ifdef APIC_IO - bsp_apic_configure(); - enable_intr(); -#else enable_intr(); INTREN(IRQ_SLAVE); -#endif /* APIC_IO */ /* nexus0 is the top of the i386 device tree */ device_add_child(root_bus, "nexus", 0); @@ -174,11 +165,6 @@ cninit_finish(); if (bootverbose) { - -#ifdef APIC_IO - imen_dump(); -#endif /* APIC_IO */ - /* * Print out the BIOS's idea of the disk geometries. */ ==== //depot/projects/hammer/sys/x86_64/x86_64/critical.c#2 (text+ko) ==== @@ -17,19 +17,13 @@ #include #include -#ifdef SMP -#include -#include -#else /* * XXX this mess to get sched_ithd() and call_fast_unpend() */ #include -#include #include #include #include -#endif void i386_unpend(void); /* NOTE: not static, called from assembly */ ==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#7 (text+ko) ==== @@ -320,8 +320,4 @@ movl $T_PROTFLT,TF_TRAPNO(%esp) jmp alltraps_with_regs_pushed -#ifdef APIC_IO -#include "i386/isa/apic_ipl.s" -#else #include "i386/isa/icu_ipl.s" -#endif /* APIC_IO */ ==== //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#4 (text+ko) ==== @@ -67,9 +67,6 @@ #include #include #include -#ifdef SMP -#include -#endif #include #include #include @@ -188,20 +185,10 @@ ASSYM(PC_CURRENTLDT, offsetof(struct pcpu, pc_currentldt)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); -#ifdef SMP -ASSYM(LA_VER, offsetof(struct LAPIC, version)); -ASSYM(LA_TPR, offsetof(struct LAPIC, tpr)); -ASSYM(LA_EOI, offsetof(struct LAPIC, eoi)); -ASSYM(LA_SVR, offsetof(struct LAPIC, svr)); -ASSYM(LA_ICR_LO, offsetof(struct LAPIC, icr_lo)); -ASSYM(LA_ICR_HI, offsetof(struct LAPIC, icr_hi)); -#endif - ASSYM(KCSEL, GSEL(GCODE_SEL, SEL_KPL)); ASSYM(KDSEL, GSEL(GDATA_SEL, SEL_KPL)); ASSYM(KPSEL, GSEL(GPRIV_SEL, SEL_KPL)); -ASSYM(BC32SEL, GSEL(GBIOSCODE32_SEL, SEL_KPL)); ASSYM(GPROC0_SEL, GPROC0_SEL); ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#9 (text+ko) ==== @@ -91,17 +91,6 @@ .set APTD,APTmap + (APTDPTDI * PAGE_SIZE) .set APTDpde,PTD + (APTDPTDI * PDESIZE) -#ifdef SMP -/* - * Define layout of per-cpu address space. - * This is "constructed" in locore.s on the BSP and in mp_machdep.c - * for each AP. DO NOT REORDER THESE WITHOUT UPDATING THE REST! - */ - .globl SMP_prvspace, lapic - .set SMP_prvspace,(MPPTDI << PDRSHIFT) - .set lapic,SMP_prvspace + (NPTEPG-1) * PAGE_SIZE -#endif /* SMP */ - /* * Compiled KERNBASE location */ @@ -125,22 +114,9 @@ KERNend: .long 0 /* phys addr end of kernel (just after bss) */ physfree: .long 0 /* phys addr of next free page */ -#ifdef SMP - .globl cpu0prvpage -cpu0pp: .long 0 /* phys addr cpu0 private pg */ -cpu0prvpage: .long 0 /* relocated version */ - - .globl SMPpt -SMPptpa: .long 0 /* phys addr SMP page table */ -SMPpt: .long 0 /* relocated version */ -#endif /* SMP */ - .globl IdlePTD IdlePTD: .long 0 /* phys addr of kernel PTD */ -#ifdef SMP - .globl KPTphys -#endif KPTphys: .long 0 /* phys addr of kernel page tables */ .globl proc0uarea, proc0kstack @@ -469,20 +445,6 @@ addl $KERNBASE, %esi movl %esi, R(proc0kstack) -#ifdef SMP -/* Allocate cpu0's private data page */ - ALLOCPAGES(1) - movl %esi,R(cpu0pp) - addl $KERNBASE, %esi - movl %esi, R(cpu0prvpage) /* relocated to KVM space */ - -/* Allocate SMP page table page */ - ALLOCPAGES(1) - movl %esi,R(SMPptpa) - addl $KERNBASE, %esi - movl %esi, R(SMPpt) /* relocated to KVM space */ -#endif /* SMP */ - /* Map read-only from zero to the end of the kernel text section */ xorl %eax,%eax xorl %edx,%edx @@ -522,37 +484,6 @@ movl $ISA_HOLE_LENGTH>>PAGE_SHIFT, %ecx fillkptphys($PG_RW) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 22: 5:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6F8E37B404; Fri, 20 Sep 2002 22:05:19 -0700 (PDT) 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 5983237B401 for ; Fri, 20 Sep 2002 22:05:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1585943E4A for ; Fri, 20 Sep 2002 22:05:19 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L55ICo034753 for ; Fri, 20 Sep 2002 22:05:18 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L55IBJ034663 for perforce@freebsd.org; Fri, 20 Sep 2002 22:05:18 -0700 (PDT) Date: Fri, 20 Sep 2002 22:05:18 -0700 (PDT) Message-Id: <200209210505.g8L55IBJ034663@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17830 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17830 Change 17830 by peter@peter_daintree on 2002/09/20 22:04:40 remove traces of GPRIV_SEL - we dont need this crud. We can either use a pointer register, or use the hammer's swapgs stuff which has a flat 64 bit base arrangement that doesn't use segments. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#5 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#13 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#5 (text+ko) ==== @@ -187,7 +187,6 @@ ASSYM(KCSEL, GSEL(GCODE_SEL, SEL_KPL)); ASSYM(KDSEL, GSEL(GDATA_SEL, SEL_KPL)); -ASSYM(KPSEL, GSEL(GPRIV_SEL, SEL_KPL)); ASSYM(GPROC0_SEL, GPROC0_SEL); ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#13 (text+ko) ==== @@ -1156,10 +1156,6 @@ */ gdt_segs[GCODE_SEL].ssd_limit = atop(0 - 1); gdt_segs[GDATA_SEL].ssd_limit = atop(0 - 1); - pc = &__pcpu; - gdt_segs[GPRIV_SEL].ssd_limit = - atop(sizeof(struct pcpu) - 1); - gdt_segs[GPRIV_SEL].ssd_base = (int) pc; gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss; for (x = 0; x < NGDT; x++) @@ -1169,6 +1165,7 @@ r_gdt.rd_base = (int) gdt; lgdt(&r_gdt); + pc = &__pcpu; pcpu_init(pc, 0, sizeof(struct pcpu)); PCPU_SET(prvspace, pc); PCPU_SET(curthread, &thread0); @@ -1292,9 +1289,8 @@ dblfault_tss.tss_cr3 = (int)IdlePTD; dblfault_tss.tss_eip = (int)dblfault_handler; dblfault_tss.tss_eflags = PSL_KERNEL; - dblfault_tss.tss_ds = dblfault_tss.tss_es = + dblfault_tss.tss_ds = dblfault_tss.tss_es = dblfault_tss.tss_fs = dblfault_tss.tss_gs = GSEL(GDATA_SEL, SEL_KPL); - dblfault_tss.tss_fs = GSEL(GPRIV_SEL, SEL_KPL); dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL); dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 22:13:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D67B37B404; Fri, 20 Sep 2002 22:13:30 -0700 (PDT) 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 AF76037B401 for ; Fri, 20 Sep 2002 22:13:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C23443E6E for ; Fri, 20 Sep 2002 22:13:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L5DTCo038203 for ; Fri, 20 Sep 2002 22:13:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L5DTIM038200 for perforce@freebsd.org; Fri, 20 Sep 2002 22:13:29 -0700 (PDT) Date: Fri, 20 Sep 2002 22:13:29 -0700 (PDT) Message-Id: <200209210513.g8L5DTIM038200@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17831 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17831 Change 17831 by peter@peter_daintree on 2002/09/20 22:12:49 Gah, move some hairy code from asm to C. It has NO NEED to be in asm. We call it about 40 times during initialization and once if we have a fatal trap and are about to panic. (same is true on x86, but test it first!) The formats here change for 64 bit mode, which is why I noticed and I wasn't going to touch gross asm code if I could help it :-). Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#14 edit .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#14 (text+ko) ==== @@ -820,6 +820,7 @@ struct segment_descriptor *sd; struct soft_segment_descriptor *ssd; { + ssd->ssd_base = (sd->sd_hibase << 24) | sd->sd_lobase; ssd->ssd_limit = (sd->sd_hilimit << 16) | sd->sd_lolimit; ssd->ssd_type = sd->sd_type; @@ -829,6 +830,24 @@ ssd->ssd_gran = sd->sd_gran; } +void +ssdtosd(ssd, sd) + struct soft_segment_descriptor *ssd; + struct segment_descriptor *sd; +{ + + sd->sd_lobase = (ssd->ssd_base) & 0xffffff; + sd->sd_hibase = (ssd->ssd_base >> 24) & 0xff + sd->sd_lolimit = (ssd->ssd_limit) & 0xffff; + sd->sd_hilimit = (ssd->ssd_limit >> 16) & 0xf; + sd->sd_type = ssd->ssd_type; + sd->sd_dpl = ssd->ssd_dpl; + sd->sd_p = ssd->ssd_p; + sd->sd_def32 = ssd->ssd_def32; + sd->sd_gran = ssd->ssd_gran; +} + + #define PHYSMAP_SIZE (2 * 8) /* ==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#3 (text+ko) ==== @@ -682,27 +682,6 @@ ltr 4(%esp) ret -/* ssdtosd(*ssdp,*sdp) */ -ENTRY(ssdtosd) - pushl %ebx - movl 8(%esp),%ecx - movl 8(%ecx),%ebx - shll $16,%ebx - movl (%ecx),%edx - roll $16,%edx - movb %dh,%bl - movb %dl,%bh - rorl $8,%ebx - movl 4(%ecx),%eax - movw %ax,%dx - andl $0xf0000,%eax - orl %eax,%ebx - movl 12(%esp),%ecx - movl %edx,(%ecx) - movl %ebx,4(%ecx) - popl %ebx - ret - /* void reset_dbregs() */ ENTRY(reset_dbregs) movl $0,%eax To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Sep 20 22:40:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A6D237B404; Fri, 20 Sep 2002 22:40:03 -0700 (PDT) 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 3CE3237B401 for ; Fri, 20 Sep 2002 22:40:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B71F643E3B for ; Fri, 20 Sep 2002 22:40:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L5e2Co042571 for ; Fri, 20 Sep 2002 22:40:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L5e21s042553 for perforce@freebsd.org; Fri, 20 Sep 2002 22:40:02 -0700 (PDT) Date: Fri, 20 Sep 2002 22:40:02 -0700 (PDT) Message-Id: <200209210540.g8L5e21s042553@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17832 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17832 Change 17832 by peter@peter_daintree on 2002/09/20 22:39:53 Do not use the lazy critical mask stuff. It's just more things to go wrong at this stage. I plan to use plain C for the interrupt handlers anyway while getting started, just like alpha and ia64. Less assembler to get wrong is better. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/critical.h#2 edit .. //depot/projects/hammer/sys/x86_64/include/proc.h#2 edit .. //depot/projects/hammer/sys/x86_64/isa/icu_vector.s#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/critical.c#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/critical.h#2 (text+ko) ==== @@ -23,7 +23,6 @@ /* * Prototypes - see //critical.c */ -void cpu_unpend(void); void cpu_critical_fork_exit(void); void cpu_thread_link(struct thread *td); @@ -34,12 +33,15 @@ * * This routine is called from critical_enter() on the 0->1 transition * of td_critnest, prior to it being incremented to 1. - * - * If new-style critical section handling we do not have to do anything. - * However, as a side effect any interrupts occuring while td_critnest - * is non-zero will be deferred. */ -#define cpu_critical_enter() +static __inline void +cpu_critical_enter(void) +{ + struct thread *td; + + td = curthread; + td->td_md.md_savecrit = intr_disable(); +} /* * cpu_critical_exit: @@ -47,27 +49,14 @@ * This routine is called from critical_exit() on a 1->0 transition * of td_critnest, after it has been decremented to 0. We are * exiting the last critical section. - * - * Note that the td->critnest (1->0) transition interrupt race against - * our int_pending/unpend() check below is handled by the interrupt - * code for us, so we do not have to do anything fancy. */ static __inline void cpu_critical_exit(void) { - /* - * We may have to schedule pending interrupts. Create - * conditions similar to an interrupt context and call - * unpend(). - * - * note: we do this even if we are in an interrupt - * nesting level. Deep nesting is protected by - * critical_*() and if we conditionalized it then we - * would have to check int_pending again whenever - * we decrement td_intr_nesting_level to 0. - */ - if (PCPU_GET(int_pending)) - cpu_unpend(); + struct thread *td; + + td = curthread; + intr_restore(td->td_md.md_savecrit); } #else /* !__GNUC__ */ ==== //depot/projects/hammer/sys/x86_64/include/proc.h#2 (text+ko) ==== @@ -51,6 +51,7 @@ * Machine-dependent part of the proc structure for i386. */ struct mdthread { + register_t md_savecrit; }; struct mdproc { ==== //depot/projects/hammer/sys/x86_64/isa/icu_vector.s#2 (text+ko) ==== @@ -4,7 +4,6 @@ */ #define IRQ_BIT(irq_num) (1 << ((irq_num) % 8)) -#define IRQ_LBIT(irq_num) (1 << (irq_num)) #define IRQ_BYTE(irq_num) ((irq_num) >> 3) #ifdef AUTO_EOI_1 @@ -38,43 +37,6 @@ #endif -#define PUSH_FRAME \ - pushl $0 ; /* dummy error code */ \ - pushl $0 ; /* dummy trap type */ \ - pushal ; /* 8 ints */ \ - pushl %ds ; /* save data and extra segments ... */ \ - pushl %es ; \ - pushl %fs - -#define PUSH_DUMMY \ - pushfl ; /* eflags */ \ - pushl %cs ; /* cs */ \ - pushl 12(%esp) ; /* original caller eip */ \ - pushl $0 ; /* dummy error code */ \ - pushl $0 ; /* dummy trap type */ \ - subl $11*4,%esp - -#define POP_FRAME \ - popl %fs ; \ - popl %es ; \ - popl %ds ; \ - popal ; \ - addl $4+4,%esp - -#define POP_DUMMY \ - addl $16*4,%esp - -#define MASK_IRQ(icu, irq_num) \ - movb imen + IRQ_BYTE(irq_num),%al ; \ - orb $IRQ_BIT(irq_num),%al ; \ - movb %al,imen + IRQ_BYTE(irq_num) ; \ - outb %al,$icu+ICU_IMR_OFFSET - -#define UNMASK_IRQ(icu, irq_num) \ - movb imen + IRQ_BYTE(irq_num),%al ; \ - andb $~IRQ_BIT(irq_num),%al ; \ - movb %al,imen + IRQ_BYTE(irq_num) ; \ - outb %al,$icu+ICU_IMR_OFFSET /* * Macros for interrupt interrupt entry, call to handler, and exit. */ @@ -83,72 +45,33 @@ .text ; \ SUPERALIGN_TEXT ; \ IDTVEC(vec_name) ; \ - PUSH_FRAME ; \ + pushl $0 ; /* dummy error code */ \ + pushl $0 ; /* dummy trap type */ \ + pushal ; \ + pushl %ds ; /* save our data and extra segments */ \ + pushl %es ; \ + pushl %fs ; \ mov $KDSEL,%ax ; \ mov %ax,%ds ; \ mov %ax,%es ; \ mov $KPSEL,%ax ; \ mov %ax,%fs ; \ FAKE_MCOUNT((12+ACTUALLY_PUSHED)*4(%esp)) ; \ + call critical_enter ; \ movl PCPU(CURTHREAD),%ebx ; \ - cmpl $0,TD_CRITNEST(%ebx) ; \ - je 1f ; \ -; \ - movl $1,PCPU(INT_PENDING) ; \ - orl $IRQ_LBIT(irq_num),PCPU(FPENDING) ; \ - MASK_IRQ(icu, irq_num) ; \ - enable_icus ; \ - jmp 10f ; \ -1: ; \ - incl TD_CRITNEST(%ebx) ; \ incl TD_INTR_NESTING_LEVEL(%ebx) ; \ pushl intr_unit + (irq_num) * 4 ; \ - call *intr_handler + (irq_num) * 4 ; \ + call *intr_handler + (irq_num) * 4 ; /* do the work ASAP */ \ + enable_icus ; /* (re)enable ASAP (helps edge trigger?) */ \ addl $4,%esp ; \ - enable_icus ; \ incl cnt+V_INTR ; /* book-keeping can wait */ \ movl intr_countp + (irq_num) * 4,%eax ; \ incl (%eax) ; \ - decl TD_CRITNEST(%ebx) ; \ - cmpl $0,PCPU(INT_PENDING) ; \ - je 2f ; \ -; \ - call i386_unpend ; \ -2: ; \ decl TD_INTR_NESTING_LEVEL(%ebx) ; \ -10: ; \ + call critical_exit ; \ MEXITCOUNT ; \ jmp doreti -/* - * Restart a fast interrupt that was held up by a critical section. - * This routine is called from unpend(). unpend() ensures we are - * in a critical section and deals with the interrupt nesting level - * for us. If we previously masked the irq, we have to unmask it. - * - * We have a choice. We can regenerate the irq using the 'int' - * instruction or we can create a dummy frame and call the interrupt - * handler directly. I've chosen to use the dummy-frame method. - */ -#define FAST_UNPEND(irq_num, vec_name, icu) \ - .text ; \ - SUPERALIGN_TEXT ; \ -IDTVEC(vec_name) ; \ -; \ - pushl %ebp ; \ - movl %esp, %ebp ; \ - PUSH_DUMMY ; \ - pushl intr_unit + (irq_num) * 4 ; \ - call *intr_handler + (irq_num) * 4 ; /* do the work ASAP */ \ - addl $4, %esp ; \ - incl cnt+V_INTR ; /* book-keeping can wait */ \ - movl intr_countp + (irq_num) * 4,%eax ; \ - incl (%eax) ; \ - UNMASK_IRQ(icu, irq_num) ; \ - POP_DUMMY ; \ - popl %ebp ; \ - ret - /* * Slow, threaded interrupts. * @@ -162,92 +85,71 @@ .text ; \ SUPERALIGN_TEXT ; \ IDTVEC(vec_name) ; \ - PUSH_FRAME ; \ + pushl $0 ; /* dummy error code */ \ + pushl $0 ; /* dummy trap type */ \ + pushal ; \ + pushl %ds ; /* save our data and extra segments */ \ + pushl %es ; \ + pushl %fs ; \ mov $KDSEL,%ax ; /* load kernel ds, es and fs */ \ mov %ax,%ds ; \ mov %ax,%es ; \ mov $KPSEL,%ax ; \ mov %ax,%fs ; \ -; \ maybe_extra_ipending ; \ - MASK_IRQ(icu, irq_num) ; \ + movb imen + IRQ_BYTE(irq_num),%al ; \ + orb $IRQ_BIT(irq_num),%al ; \ + movb %al,imen + IRQ_BYTE(irq_num) ; \ + outb %al,$icu+ICU_IMR_OFFSET ; \ enable_icus ; \ -; \ movl PCPU(CURTHREAD),%ebx ; \ - cmpl $0,TD_CRITNEST(%ebx) ; \ - je 1f ; \ - movl $1,PCPU(INT_PENDING); \ - orl $IRQ_LBIT(irq_num),PCPU(IPENDING) ; \ - jmp 10f ; \ -1: ; \ incl TD_INTR_NESTING_LEVEL(%ebx) ; \ -; \ FAKE_MCOUNT(13*4(%esp)) ; /* XXX late to avoid double count */ \ - cmpl $0,PCPU(INT_PENDING) ; \ - je 9f ; \ - call i386_unpend ; \ -9: ; \ pushl $irq_num; /* pass the IRQ */ \ call sched_ithd ; \ addl $4, %esp ; /* discard the parameter */ \ -; \ decl TD_INTR_NESTING_LEVEL(%ebx) ; \ -10: ; \ MEXITCOUNT ; \ + /* We could usually avoid the following jmp by inlining some of */ \ + /* doreti, but it's probably better to use less cache. */ \ jmp doreti MCOUNT_LABEL(bintr) - FAST_INTR(0,fastintr0, IO_ICU1, ENABLE_ICU1) - FAST_INTR(1,fastintr1, IO_ICU1, ENABLE_ICU1) - FAST_INTR(2,fastintr2, IO_ICU1, ENABLE_ICU1) - FAST_INTR(3,fastintr3, IO_ICU1, ENABLE_ICU1) - FAST_INTR(4,fastintr4, IO_ICU1, ENABLE_ICU1) - FAST_INTR(5,fastintr5, IO_ICU1, ENABLE_ICU1) - FAST_INTR(6,fastintr6, IO_ICU1, ENABLE_ICU1) - FAST_INTR(7,fastintr7, IO_ICU1, ENABLE_ICU1) - FAST_INTR(8,fastintr8, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(9,fastintr9, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(10,fastintr10, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(11,fastintr11, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(12,fastintr12, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(13,fastintr13, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(14,fastintr14, IO_ICU2, ENABLE_ICU1_AND_2) - FAST_INTR(15,fastintr15, IO_ICU2, ENABLE_ICU1_AND_2) + FAST_INTR(0,fastintr0, ENABLE_ICU1) + FAST_INTR(1,fastintr1, ENABLE_ICU1) + FAST_INTR(2,fastintr2, ENABLE_ICU1) + FAST_INTR(3,fastintr3, ENABLE_ICU1) + FAST_INTR(4,fastintr4, ENABLE_ICU1) + FAST_INTR(5,fastintr5, ENABLE_ICU1) + FAST_INTR(6,fastintr6, ENABLE_ICU1) + FAST_INTR(7,fastintr7, ENABLE_ICU1) + FAST_INTR(8,fastintr8, ENABLE_ICU1_AND_2) + FAST_INTR(9,fastintr9, ENABLE_ICU1_AND_2) + FAST_INTR(10,fastintr10, ENABLE_ICU1_AND_2) + FAST_INTR(11,fastintr11, ENABLE_ICU1_AND_2) + FAST_INTR(12,fastintr12, ENABLE_ICU1_AND_2) + FAST_INTR(13,fastintr13, ENABLE_ICU1_AND_2) + FAST_INTR(14,fastintr14, ENABLE_ICU1_AND_2) + FAST_INTR(15,fastintr15, ENABLE_ICU1_AND_2) #define CLKINTR_PENDING movl $1,CNAME(clkintr_pending) /* Threaded interrupts */ - INTR(0,intr0, IO_ICU1, ENABLE_ICU1, CLKINTR_PENDING) - INTR(1,intr1, IO_ICU1, ENABLE_ICU1,) - INTR(2,intr2, IO_ICU1, ENABLE_ICU1,) - INTR(3,intr3, IO_ICU1, ENABLE_ICU1,) - INTR(4,intr4, IO_ICU1, ENABLE_ICU1,) - INTR(5,intr5, IO_ICU1, ENABLE_ICU1,) - INTR(6,intr6, IO_ICU1, ENABLE_ICU1,) - INTR(7,intr7, IO_ICU1, ENABLE_ICU1,) - INTR(8,intr8, IO_ICU2, ENABLE_ICU1_AND_2,) - INTR(9,intr9, IO_ICU2, ENABLE_ICU1_AND_2,) - INTR(10,intr10, IO_ICU2, ENABLE_ICU1_AND_2,) - INTR(11,intr11, IO_ICU2, ENABLE_ICU1_AND_2,) - INTR(12,intr12, IO_ICU2, ENABLE_ICU1_AND_2,) - INTR(13,intr13, IO_ICU2, ENABLE_ICU1_AND_2,) - INTR(14,intr14, IO_ICU2, ENABLE_ICU1_AND_2,) - INTR(15,intr15, IO_ICU2, ENABLE_ICU1_AND_2,) + INTR(0,intr0, ENABLE_ICU1, CLKINTR_PENDING) + INTR(1,intr1, ENABLE_ICU1,) + INTR(2,intr2, ENABLE_ICU1,) + INTR(3,intr3, ENABLE_ICU1,) + INTR(4,intr4, ENABLE_ICU1,) + INTR(5,intr5, ENABLE_ICU1,) + INTR(6,intr6, ENABLE_ICU1,) + INTR(7,intr7, ENABLE_ICU1,) + INTR(8,intr8, ENABLE_ICU1_AND_2,) + INTR(9,intr9, ENABLE_ICU1_AND_2,) + INTR(10,intr10, ENABLE_ICU1_AND_2,) + INTR(11,intr11, ENABLE_ICU1_AND_2,) + INTR(12,intr12, ENABLE_ICU1_AND_2,) + INTR(13,intr13, ENABLE_ICU1_AND_2,) + INTR(14,intr14, ENABLE_ICU1_AND_2,) + INTR(15,intr15, ENABLE_ICU1_AND_2,) - FAST_UNPEND(0,fastunpend0, IO_ICU1) - FAST_UNPEND(1,fastunpend1, IO_ICU1) - FAST_UNPEND(2,fastunpend2, IO_ICU1) - FAST_UNPEND(3,fastunpend3, IO_ICU1) - FAST_UNPEND(4,fastunpend4, IO_ICU1) - FAST_UNPEND(5,fastunpend5, IO_ICU1) - FAST_UNPEND(6,fastunpend6, IO_ICU1) - FAST_UNPEND(7,fastunpend7, IO_ICU1) - FAST_UNPEND(8,fastunpend8, IO_ICU2) - FAST_UNPEND(9,fastunpend9, IO_ICU2) - FAST_UNPEND(10,fastunpend10, IO_ICU2) - FAST_UNPEND(11,fastunpend11, IO_ICU2) - FAST_UNPEND(12,fastunpend12, IO_ICU2) - FAST_UNPEND(13,fastunpend13, IO_ICU2) - FAST_UNPEND(14,fastunpend14, IO_ICU2) - FAST_UNPEND(15,fastunpend15, IO_ICU2) MCOUNT_LABEL(eintr) ==== //depot/projects/hammer/sys/x86_64/x86_64/critical.c#3 (text+ko) ==== @@ -18,135 +18,24 @@ #include /* - * XXX this mess to get sched_ithd() and call_fast_unpend() - */ -#include -#include -#include -#include - -void i386_unpend(void); /* NOTE: not static, called from assembly */ - -/* - * cpu_unpend() - called from critical_exit() inline after quick - * interrupt-pending check. + * cpu_critical_fork_exit() - cleanup after fork */ void -cpu_unpend(void) +cpu_critical_fork_exit(void) { - register_t eflags; struct thread *td; - td = curthread; - eflags = intr_disable(); - if (PCPU_GET(int_pending)) { - ++td->td_intr_nesting_level; - i386_unpend(); - --td->td_intr_nesting_level; - } - intr_restore(eflags); -} - -/* - * cpu_critical_fork_exit() - cleanup after fork - * - * For i386 we do not have to do anything, td_critnest is - * handled by the fork trampoline code. - */ -void -cpu_critical_fork_exit(void) -{ + td = cuthread; + td->td_critnest = 1; + td->td_md.md_critnest = read_eflags() & PSL_I; } /* * cpu_thread_link() - thread linkup, initialize machine-dependant fields - * - * There are currently no machine-dependant fields that require - * initialization. */ void cpu_thread_link(struct thread *td) { -} -/* - * Called from cpu_unpend or called from the assembly vector code - * to process any interrupts which may have occured while we were in - * a critical section. - * - * - interrupts must be disabled - * - td_critnest must be 0 - * - td_intr_nesting_level must be incremented by the caller - * - * NOT STATIC (called from assembly) - */ -void -i386_unpend(void) -{ - KASSERT(curthread->td_critnest == 0, ("unpend critnest != 0")); - KASSERT((read_eflags() & PSL_I) == 0, ("unpend interrupts enabled1")); - curthread->td_critnest = 1; - for (;;) { - u_int32_t mask; - int irq; - - /* - * Fast interrupts have priority - */ - if ((mask = PCPU_GET(fpending)) != 0) { - irq = bsfl(mask); - PCPU_SET(fpending, mask & ~(1 << irq)); - call_fast_unpend(irq); - KASSERT((read_eflags() & PSL_I) == 0, - ("unpend interrupts enabled2 %d", irq)); - continue; - } - - /* - * Threaded interrupts come next - */ - if ((mask = PCPU_GET(ipending)) != 0) { - irq = bsfl(mask); - PCPU_SET(ipending, mask & ~(1 << irq)); - sched_ithd((void *)irq); - KASSERT((read_eflags() & PSL_I) == 0, - ("unpend interrupts enabled3 %d", irq)); - continue; - } - - /* - * Software interrupts and delayed IPIs are last - * - * XXX give the bits #defined names. see also - * isa/xxx_vector.s - */ - if ((mask = PCPU_GET(spending)) != 0) { - irq = bsfl(mask); - PCPU_SET(spending, mask & ~(1 << irq)); - switch(irq) { - case 0: /* bit 0 - hardclock */ - mtx_lock_spin(&sched_lock); - hardclock_process(curthread, 0); - mtx_unlock_spin(&sched_lock); - break; - case 1: /* bit 1 - statclock */ - mtx_lock_spin(&sched_lock); - statclock_process(curthread->td_kse, - (register_t)i386_unpend, 0); - mtx_unlock_spin(&sched_lock); - break; - } - KASSERT((read_eflags() & PSL_I) == 0, - ("unpend interrupts enabled4 %d", irq)); - continue; - } - break; - } - /* - * Interrupts are still disabled, we can safely clear int_pending - * and td_critnest. - */ - KASSERT((read_eflags() & PSL_I) == 0, ("unpend interrupts enabled5")); - PCPU_SET(int_pending, 0); - curthread->td_critnest = 0; + td->td_md.md_savecrit = 0; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 0:22: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F381F37B401; Sat, 21 Sep 2002 00:21:37 -0700 (PDT) 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 222F337B404 for ; Sat, 21 Sep 2002 00:21:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 08BFB43E65 for ; Sat, 21 Sep 2002 00:21:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L7LaCo077180 for ; Sat, 21 Sep 2002 00:21:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L7LZT7077163 for perforce@freebsd.org; Sat, 21 Sep 2002 00:21:35 -0700 (PDT) Date: Sat, 21 Sep 2002 00:21:35 -0700 (PDT) Message-Id: <200209210721.g8L7LZT7077163@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17835 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17835 Change 17835 by peter@peter_overcee on 2002/09/21 00:21:20 gut the pcibios code. We cannot use it in any form on hammer. ("MUST NOT call the bios after starting long mode") Affected files ... .. //depot/projects/hammer/sys/x86_64/pci/pci_cfgreg.c#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/pci/pci_cfgreg.c#3 (text+ko) ==== @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.94 2002/09/20 19:16:41 jhb Exp $ - * */ #include /* XXX trim includes */ @@ -42,87 +41,16 @@ #include #include #include -#include -#include #include "pcib_if.h" -#define PRVERB(a) printf a - static int cfgmech; static int devmax; -static int usebios; -static int enable_pcibios = 0; - -TUNABLE_INT("hw.pci.enable_pcibios", &enable_pcibios); -static int pci_cfgintr_valid(struct PIR_entry *pe, int pin, int irq); -static int pci_cfgintr_unique(struct PIR_entry *pe, int pin); -static int pci_cfgintr_linked(struct PIR_entry *pe, int pin); -static int pci_cfgintr_search(struct PIR_entry *pe, int bus, int device, int matchpin, int pin); -static int pci_cfgintr_virgin(struct PIR_entry *pe, int pin); - -static void pci_print_irqmask(u_int16_t irqs); -static void pci_print_route_table(struct PIR_table *prt, int size); -static int pcibios_cfgread(int bus, int slot, int func, int reg, int bytes); -static void pcibios_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes); -static int pcibios_cfgopen(void); static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes); static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes); static int pcireg_cfgopen(void); -static struct PIR_table *pci_route_table; -static int pci_route_count; - -/* - * Some BIOS writers seem to want to ignore the spec and put - * 0 in the intline rather than 255 to indicate none. Some use - * numbers in the range 128-254 to indicate something strange and - * apparently undocumented anywhere. Assume these are completely bogus - * and map them to 255, which means "none". - */ -static __inline__ int -pci_i386_map_intline(int line) -{ - if (line == 0 || line >= 128) - return (PCI_INVALID_IRQ); - return (line); -} - -int -pci_pcibios_active(void) -{ - return (usebios); -} - -int -pci_kill_pcibios(void) -{ - usebios = 0; - return (pcireg_cfgopen() != 0); -} - -static u_int16_t -pcibios_get_version(void) -{ - struct bios_regs args; - - if (PCIbios.ventry == 0) { - PRVERB(("pcibios: No call entry point\n")); - return (0); - } - args.eax = PCIBIOS_BIOS_PRESENT; - if (bios32(&args, PCIbios.ventry, GSEL(GCODE_SEL, SEL_KPL))) { - PRVERB(("pcibios: BIOS_PRESENT call failed\n")); - return (0); - } - if (args.edx != 0x20494350) { - PRVERB(("pcibios: BIOS_PRESENT didn't return 'PCI ' in edx\n")); - return (0); - } - return (args.ebx & 0xffff); -} - /* * Initialise access to PCI configuration space */ @@ -130,56 +58,13 @@ pci_cfgregopen(void) { static int opened = 0; - u_long sigaddr; - static struct PIR_table *pt; - u_int8_t ck, *cv; - int i; if (opened) - return(1); - - if (pcibios_cfgopen() != 0) - usebios = 1; - else if (pcireg_cfgopen() != 0) - usebios = 0; - else - return(0); - - /* - * Look for the interrupt routing table. - * - * We use PCI BIOS's PIR table if it's available $PIR is the - * standard way to do this. Sadly, some machines are not - * standards conforming and have _PIR instead. We shrug and cope - * by looking for both. - */ - if (pcibios_get_version() >= 0x0210 && pt == NULL) { - sigaddr = bios_sigsearch(0, "$PIR", 4, 16, 0); - if (sigaddr == 0) - sigaddr = bios_sigsearch(0, "_PIR", 4, 16, 0); - if (sigaddr != 0) { - pt = (struct PIR_table *)(uintptr_t) - BIOS_PADDRTOVADDR(sigaddr); - for (cv = (u_int8_t *)pt, ck = 0, i = 0; - i < (pt->pt_header.ph_length); i++) { - ck += cv[i]; - } - if (ck == 0 && pt->pt_header.ph_length > - sizeof(struct PIR_header)) { - pci_route_table = pt; - pci_route_count = (pt->pt_header.ph_length - - sizeof(struct PIR_header)) / - sizeof(struct PIR_entry); - printf("Using $PIR table, %d entries at %p\n", - pci_route_count, pci_route_table); - if (bootverbose) - pci_print_route_table(pci_route_table, - pci_route_count); - } - } - } + return (1); + if (pcireg_cfgopen() == 0) + return (0); opened = 1; - return(1); + return (1); } /* @@ -188,9 +73,8 @@ static u_int32_t pci_do_cfgregread(int bus, int slot, int func, int reg, int bytes) { - return(usebios ? - pcibios_cfgread(bus, slot, func, reg, bytes) : - pcireg_cfgread(bus, slot, func, reg, bytes)); + + return (pcireg_cfgread(bus, slot, func, reg, bytes); } u_int32_t @@ -200,14 +84,19 @@ /* * Some BIOS writers seem to want to ignore the spec and put - * 0 in the intline rather than 255 to indicate none. The rest of - * the code uses 255 as an invalid IRQ. + * 0 in the intline rather than 255 to indicate none. Some use + * numbers in the range 128-254 to indicate something strange and + * apparently undocumented anywhere. Assume these are completely bogus + * and map them to 255, which the rest of the PCI code recognizes as + * as an invalid IRQ. */ if (reg == PCIR_INTLINE && bytes == 1) { line = pci_do_cfgregread(bus, slot, func, PCIR_INTLINE, 1); - return pci_i386_map_intline(line); + if (line == 0 || line >= 128) + line = PCI_INVALID_IRQ; + return (line); } - return(pci_do_cfgregread(bus, slot, func, reg, bytes)); + return (pci_do_cfgregread(bus, slot, func, reg, bytes)); } /* @@ -216,410 +105,22 @@ void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes) { - return (usebios ? - pcibios_cfgwrite(bus, slot, func, reg, data, bytes) : - pcireg_cfgwrite(bus, slot, func, reg, data, bytes)); + + return (pcireg_cfgwrite(bus, slot, func, reg, data, bytes)); } /* * Route a PCI interrupt - * - * XXX we don't do anything "right" with the function number in the PIR table - * (because the consumer isn't currently passing it in). We don't care - * anyway, due to the way PCI interrupts are assigned. */ int pci_cfgintr(int bus, int device, int pin, int oldirq) { - struct PIR_entry *pe; - int i, irq; - struct bios_regs args; - u_int16_t v; - int already = 0; - - v = pcibios_get_version(); - if (v < 0x0210) { - PRVERB(( - "pci_cfgintr: BIOS %x.%02x doesn't support interrupt routing\n", - (v & 0xff00) >> 8, v & 0xff)); - return (PCI_INVALID_IRQ); - } - if ((bus < 0) || (bus > 255) || (device < 0) || (device > 255) || - (pin < 1) || (pin > 4)) - return(PCI_INVALID_IRQ); - /* - * Scan the entry table for a contender - */ - for (i = 0, pe = &pci_route_table->pt_entry[0]; i < pci_route_count; - i++, pe++) { - if ((bus != pe->pe_bus) || (device != pe->pe_device)) - continue; - /* - * A link of 0 means that this intpin is not connected to - * any other device's interrupt pins and is not connected to - * any of the Interrupt Router's interrupt pins, so we can't - * route it. - */ - if (pe->pe_intpin[pin - 1].link == 0) - continue; - - if (pci_cfgintr_valid(pe, pin, oldirq)) { - printf("pci_cfgintr: %d:%d INT%c BIOS irq %d\n", bus, - device, 'A' + pin - 1, oldirq); - return (oldirq); - } - irq = pci_cfgintr_linked(pe, pin); - if (irq == PCI_INVALID_IRQ) - irq = pci_cfgintr_unique(pe, pin); - if (irq != PCI_INVALID_IRQ) - already = 1; - if (irq == PCI_INVALID_IRQ) - irq = pci_cfgintr_virgin(pe, pin); - if (irq == PCI_INVALID_IRQ) - break; - - /* - * Ask the BIOS to route the interrupt - */ - args.eax = PCIBIOS_ROUTE_INTERRUPT; - args.ebx = (bus << 8) | (device << 3); - /* pin value is 0xa - 0xd */ - args.ecx = (irq << 8) | (0xa + pin - 1); - if (!already && - bios32(&args, PCIbios.ventry, GSEL(GCODE_SEL, SEL_KPL))) { - /* - * XXX if it fails, we should try to smack the router - * hardware directly. - * XXX Also, there may be other choices that we can - * try that will work. - */ - PRVERB(("pci_cfgintr: ROUTE_INTERRUPT failed.\n")); - return(PCI_INVALID_IRQ); - } - printf("pci_cfgintr: %d:%d INT%c routed to irq %d\n", bus, - device, 'A' + pin - 1, irq); - return(irq); - } - - PRVERB(("pci_cfgintr: can't route an interrupt to %d:%d INT%c\n", bus, - device, 'A' + pin - 1)); - return(PCI_INVALID_IRQ); -} - -/* - * Check to see if an existing IRQ setting is valid. - */ -static int -pci_cfgintr_valid(struct PIR_entry *pe, int pin, int irq) -{ - uint32_t irqmask; - - if (!PCI_INTERRUPT_VALID(irq)) - return (0); - irqmask = pe->pe_intpin[pin - 1].irqs; - if (irqmask & (1 << irq)) { - PRVERB(("pci_cfgintr_valid: BIOS irq %d is valid\n", irq)); - return (1); - } - return (0); -} - -/* - * Look to see if the routing table claims this pin is uniquely routed. - */ -static int -pci_cfgintr_unique(struct PIR_entry *pe, int pin) -{ - int irq; - uint32_t irqmask; - - irqmask = pe->pe_intpin[pin - 1].irqs; - if (irqmask != 0 && powerof2(irqmask)) { - irq = ffs(irqmask) - 1; - PRVERB(("pci_cfgintr_unique: hard-routed to irq %d\n", irq)); - return(irq); - } - return(PCI_INVALID_IRQ); -} - -/* - * Look for another device which shares the same link byte and - * already has a unique IRQ, or which has had one routed already. - */ -static int -pci_cfgintr_linked(struct PIR_entry *pe, int pin) -{ - struct PIR_entry *oe; - struct PIR_intpin *pi; - int i, j, irq; - - /* - * Scan table slots. - */ - for (i = 0, oe = &pci_route_table->pt_entry[0]; i < pci_route_count; - i++, oe++) { - /* scan interrupt pins */ - for (j = 0, pi = &oe->pe_intpin[0]; j < 4; j++, pi++) { - - /* don't look at the entry we're trying to match */ - if ((pe == oe) && (i == (pin - 1))) - continue; - /* compare link bytes */ - if (pi->link != pe->pe_intpin[pin - 1].link) - continue; - /* link destination mapped to a unique interrupt? */ - if (pi->irqs != 0 && powerof2(pi->irqs)) { - irq = ffs(pi->irqs) - 1; - PRVERB(("pci_cfgintr_linked: linked (%x) to hard-routed irq %d\n", - pi->link, irq)); - return(irq); - } - - /* - * look for the real PCI device that matches this - * table entry - */ - irq = pci_cfgintr_search(pe, oe->pe_bus, oe->pe_device, - j, pin); - if (irq != PCI_INVALID_IRQ) - return(irq); - } - } - return(PCI_INVALID_IRQ); -} - -/* - * Scan for the real PCI device at (bus)/(device) using intpin (matchpin) and - * see if it has already been assigned an interrupt. - */ -static int -pci_cfgintr_search(struct PIR_entry *pe, int bus, int device, int matchpin, int pin) -{ - devclass_t pci_devclass; - device_t *pci_devices; - int pci_count; - device_t *pci_children; - int pci_childcount; - device_t *busp, *childp; - int i, j, irq; - - /* - * Find all the PCI busses. - */ - pci_count = 0; - if ((pci_devclass = devclass_find("pci")) != NULL) - devclass_get_devices(pci_devclass, &pci_devices, &pci_count); - - /* - * Scan all the PCI busses/devices looking for this one. - */ - irq = PCI_INVALID_IRQ; - for (i = 0, busp = pci_devices; (i < pci_count) && (irq == PCI_INVALID_IRQ); - i++, busp++) { - pci_childcount = 0; - device_get_children(*busp, &pci_children, &pci_childcount); - - for (j = 0, childp = pci_children; j < pci_childcount; j++, - childp++) { - if ((pci_get_bus(*childp) == bus) && - (pci_get_slot(*childp) == device) && - (pci_get_intpin(*childp) == matchpin)) { - irq = pci_i386_map_intline(pci_get_irq(*childp)); - if (irq != PCI_INVALID_IRQ) - PRVERB(("pci_cfgintr_search: linked (%x) to configured irq %d at %d:%d:%d\n", - pe->pe_intpin[pin - 1].link, irq, - pci_get_bus(*childp), - pci_get_slot(*childp), - pci_get_function(*childp))); - break; - } - } - if (pci_children != NULL) - free(pci_children, M_TEMP); - } - if (pci_devices != NULL) - free(pci_devices, M_TEMP); - return(irq); -} - -/* - * Pick a suitable IRQ from those listed as routable to this device. - */ -static int -pci_cfgintr_virgin(struct PIR_entry *pe, int pin) -{ - int irq, ibit; - - /* - * first scan the set of PCI-only interrupts and see if any of these - * are routable - */ - for (irq = 0; irq < 16; irq++) { - ibit = (1 << irq); - - /* can we use this interrupt? */ - if ((pci_route_table->pt_header.ph_pci_irqs & ibit) && - (pe->pe_intpin[pin - 1].irqs & ibit)) { - PRVERB(("pci_cfgintr_virgin: using routable PCI-only interrupt %d\n", irq)); - return(irq); - } - } - - /* life is tough, so just pick an interrupt */ - for (irq = 0; irq < 16; irq++) { - ibit = (1 << irq); - if (pe->pe_intpin[pin - 1].irqs & ibit) { - PRVERB(("pci_cfgintr_virgin: using routable interrupt %d\n", irq)); - return(irq); - } - } - return(PCI_INVALID_IRQ); -} - -static void -pci_print_irqmask(u_int16_t irqs) -{ - int i, first; - - if (irqs == 0) { - printf("none"); - return; - } - first = 1; - for (i = 0; i < 16; i++, irqs >>= 1) - if (irqs & 1) { - if (!first) - printf(" "); - else - first = 0; - printf("%d", i); - } -} - -/* - * Dump the contents of a PCI BIOS Interrupt Routing Table to the console. - */ -static void -pci_print_route_table(struct PIR_table *prt, int size) -{ - struct PIR_entry *entry; - struct PIR_intpin *intpin; - int i, pin; - - printf("PCI-Only Interrupts: "); - pci_print_irqmask(prt->pt_header.ph_pci_irqs); - printf("\nLocation Bus Device Pin Link IRQs\n"); - entry = &prt->pt_entry[0]; - for (i = 0; i < size; i++, entry++) { - intpin = &entry->pe_intpin[0]; - for (pin = 0; pin < 4; pin++, intpin++) - if (intpin->link != 0) { - if (entry->pe_slot == 0) - printf("embedded "); - else - printf("slot %-3d ", entry->pe_slot); - printf(" %3d %3d %c 0x%02x ", - entry->pe_bus, entry->pe_device, - 'A' + pin, intpin->link); - pci_print_irqmask(intpin->irqs); - printf("\n"); - } - } -} - -/* - * See if any interrupts for a given PCI bus are routed in the PIR. Don't - * even bother looking if the BIOS doesn't support routing anyways. - */ -int -pci_probe_route_table(int bus) -{ - int i; - u_int16_t v; - - v = pcibios_get_version(); - if (v < 0x0210) - return (0); - for (i = 0; i < pci_route_count; i++) - if (pci_route_table->pt_entry[i].pe_bus == bus) - return (1); - return (0); + printf("pci_cfgintr: can't route an interrupt to %d:%d INT%c without ACPI\n", bus, + device, 'A' + pin - 1); + return (PCI_INVALID_IRQ); } -/* - * Config space access using BIOS functions - */ -static int -pcibios_cfgread(int bus, int slot, int func, int reg, int bytes) -{ - struct bios_regs args; - u_int mask; - - switch(bytes) { - case 1: - args.eax = PCIBIOS_READ_CONFIG_BYTE; - mask = 0xff; - break; - case 2: - args.eax = PCIBIOS_READ_CONFIG_WORD; - mask = 0xffff; - break; - case 4: - args.eax = PCIBIOS_READ_CONFIG_DWORD; - mask = 0xffffffff; - break; - default: - return(-1); - } - args.ebx = (bus << 8) | (slot << 3) | func; - args.edi = reg; - bios32(&args, PCIbios.ventry, GSEL(GCODE_SEL, SEL_KPL)); - /* check call results? */ - return(args.ecx & mask); -} - -static void -pcibios_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes) -{ - struct bios_regs args; - - switch(bytes) { - case 1: - args.eax = PCIBIOS_WRITE_CONFIG_BYTE; - break; - case 2: - args.eax = PCIBIOS_WRITE_CONFIG_WORD; - break; - case 4: - args.eax = PCIBIOS_WRITE_CONFIG_DWORD; - break; - default: - return; - } - args.ebx = (bus << 8) | (slot << 3) | func; - args.ecx = data; - args.edi = reg; - bios32(&args, PCIbios.ventry, GSEL(GCODE_SEL, SEL_KPL)); -} - -/* - * Determine whether there is a PCI BIOS present - */ -static int -pcibios_cfgopen(void) -{ - u_int16_t v = 0; - - if (PCIbios.ventry != 0 && enable_pcibios) { - v = pcibios_get_version(); - if (v > 0) - printf("pcibios: BIOS version %x.%02x\n", - (v & 0xff00) >> 8, v & 0xff); - } - return (v > 0); -} - /* * Configuration space access using direct register operations */ @@ -838,4 +339,3 @@ devmax = 0; return (cfgmech); } - To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 0:32: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B61337B404; Sat, 21 Sep 2002 00:31:50 -0700 (PDT) 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 AB0C137B401 for ; Sat, 21 Sep 2002 00:31:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33D7143E4A for ; Sat, 21 Sep 2002 00:31:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L7VnCo080018 for ; Sat, 21 Sep 2002 00:31:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L7VmtX080015 for perforce@freebsd.org; Sat, 21 Sep 2002 00:31:48 -0700 (PDT) Date: Sat, 21 Sep 2002 00:31:48 -0700 (PDT) Message-Id: <200209210731.g8L7VmtX080015@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17836 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17836 Change 17836 by peter@peter_overcee on 2002/09/21 00:31:02 gut the acpi MD code. acpi_wakecode.S is not going to be much use in that form. Remove pnpbios sabotage hooks, since there is no pnpbios to sabotage anymore. Affected files ... .. //depot/projects/hammer/sys/x86_64/acpica/Makefile#2 delete .. //depot/projects/hammer/sys/x86_64/acpica/OsdEnvironment.c#2 edit .. //depot/projects/hammer/sys/x86_64/acpica/acpi_machdep.c#3 edit .. //depot/projects/hammer/sys/x86_64/acpica/acpi_wakecode.S#2 delete .. //depot/projects/hammer/sys/x86_64/acpica/acpi_wakeup.c#2 edit .. //depot/projects/hammer/sys/x86_64/acpica/genwakecode.sh#2 delete Differences ... ==== //depot/projects/hammer/sys/x86_64/acpica/OsdEnvironment.c#2 (text+ko) ==== @@ -33,17 +33,9 @@ #include "acpi.h" -#include - ACPI_STATUS AcpiOsInitialize(void) { - /* - * Prevent the PnP BIOS code from interfering with our own scan of - * ISA devices. - */ - PnPBIOStable = NULL; - return(0); } ==== //depot/projects/hammer/sys/x86_64/acpica/acpi_machdep.c#3 (text+ko) ==== @@ -28,308 +28,20 @@ #include #include -#include -#include -#include #include "acpi.h" - #include -#include - -static device_t acpi_dev; - -/* - * APM driver emulation - */ - -#include - -#include -#include - -#include - -static struct apm_softc apm_softc; - -static d_open_t apmopen; -static d_close_t apmclose; -static d_write_t apmwrite; -static d_ioctl_t apmioctl; -static d_poll_t apmpoll; - -#define CDEV_MAJOR 39 -static struct cdevsw apm_cdevsw = { - /* open */ apmopen, - /* close */ apmclose, - /* read */ noread, - /* write */ apmwrite, - /* ioctl */ apmioctl, - /* poll */ apmpoll, - /* mmap */ nommap, - /* strategy */ nostrategy, - /* name */ "apm", - /* maj */ CDEV_MAJOR, - /* dump */ nodump, - /* psize */ nopsize, - /* flags */ 0, -}; - -static int -acpi_capm_convert_battstate(struct acpi_battinfo *battp) -{ - int state; - - state = 0xff; /* XXX unknown */ - - if (battp->state & ACPI_BATT_STAT_DISCHARG) { - if (battp->cap >= 50) { - state = 0; /* high */ - } else { - state = 1; /* low */ - } - } - if (battp->state & ACPI_BATT_STAT_CRITICAL) { - state = 2; /* critical */ - } - if (battp->state & ACPI_BATT_STAT_CHARGING) { - state = 3; /* charging */ - } - return (state); -} - -static int -acpi_capm_convert_battflags(struct acpi_battinfo *battp) -{ - int flags; - - flags = 0; - - if (battp->cap >= 50) { - flags |= APM_BATT_HIGH; - } else { - if (battp->state & ACPI_BATT_STAT_CRITICAL) { - flags |= APM_BATT_CRITICAL; - } else { - flags |= APM_BATT_LOW; - } - } - if (battp->state & ACPI_BATT_STAT_CHARGING) { - flags |= APM_BATT_CHARGING; - } - if (battp->state == ACPI_BATT_STAT_NOT_PRESENT) { - flags = APM_BATT_NOT_PRESENT; - } - - return (flags); -} - -static int -acpi_capm_get_info(apm_info_t aip) -{ - int acline; - struct acpi_battinfo batt; - - aip->ai_infoversion = 1; - aip->ai_major = 1; - aip->ai_minor = 2; - aip->ai_status = apm_softc.active; - aip->ai_capabilities= 0xff00; /* XXX unknown */ - - if (acpi_acad_get_acline(&acline)) { - aip->ai_acline = 0xff; /* unknown */ - } else { - aip->ai_acline = acline; /* on/off */ - } - - if (acpi_battery_get_battinfo(-1, &batt)) { - aip->ai_batt_stat = 0xff; /* unknown */ - aip->ai_batt_life = 0xff; /* unknown */ - aip->ai_batt_time = -1; /* unknown */ - aip->ai_batteries = 0; - } else { - aip->ai_batt_stat = acpi_capm_convert_battstate(&batt); - aip->ai_batt_life = batt.cap; - aip->ai_batt_time = (batt.min == -1) ? -1 : batt.min * 60; - aip->ai_batteries = acpi_battery_get_units(); - } - - return (0); -} - -static int -acpi_capm_get_pwstatus(apm_pwstatus_t app) -{ - int batt_unit; - int acline; - struct acpi_battinfo batt; - - if (app->ap_device != PMDV_ALLDEV && - (app->ap_device < PMDV_BATT0 || app->ap_device > PMDV_BATT_ALL)) { - return (1); - } - - if (app->ap_device == PMDV_ALLDEV) { - batt_unit = -1; /* all units */ - } else { - batt_unit = app->ap_device - PMDV_BATT0; - } - - if (acpi_battery_get_battinfo(batt_unit, &batt)) { - return (1); - } - - app->ap_batt_stat = acpi_capm_convert_battstate(&batt); - app->ap_batt_flag = acpi_capm_convert_battflags(&batt); - app->ap_batt_life = batt.cap; - app->ap_batt_time = (batt.min == -1) ? -1 : batt.min * 60; - if (acpi_acad_get_acline(&acline)) { - app->ap_acline = 0xff; /* unknown */ - } else { - app->ap_acline = acline; /* on/off */ - } - - return (0); -} - -static int -apmopen(dev_t dev, int flag, int fmt, struct thread *td) -{ - return (0); -} - -static int -apmclose(dev_t dev, int flag, int fmt, struct thread *td) -{ - return (0); -} - -static int -apmioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct thread *td) -{ - int error = 0; - struct acpi_softc *acpi_sc; - struct apm_info info; - apm_info_old_t aiop; - - if ((acpi_sc = device_get_softc(acpi_dev)) == NULL) { - return (ENXIO); - } - - switch (cmd) { - case APMIO_SUSPEND: - if (!(flag & FWRITE)) - return (EPERM); - if (apm_softc.active) - acpi_SetSleepState(acpi_sc, acpi_sc->acpi_suspend_sx); - else - error = EINVAL; - break; - - case APMIO_STANDBY: - if (!(flag & FWRITE)) - return (EPERM); - if (apm_softc.active) - acpi_SetSleepState(acpi_sc, acpi_sc->acpi_standby_sx); - else - error = EINVAL; - break; - - case APMIO_GETINFO_OLD: - if (acpi_capm_get_info(&info)) - error = ENXIO; - aiop = (apm_info_old_t)addr; - aiop->ai_major = info.ai_major; - aiop->ai_minor = info.ai_minor; - aiop->ai_acline = info.ai_acline; - aiop->ai_batt_stat = info.ai_batt_stat; - aiop->ai_batt_life = info.ai_batt_life; - aiop->ai_status = info.ai_status; - break; - - case APMIO_GETINFO: - if (acpi_capm_get_info((apm_info_t)addr)) - error = ENXIO; - - break; - - case APMIO_GETPWSTATUS: - if (acpi_capm_get_pwstatus((apm_pwstatus_t)addr)) - error = ENXIO; - break; - - case APMIO_ENABLE: - if (!(flag & FWRITE)) - return (EPERM); - apm_softc.active = 1; - break; - - case APMIO_DISABLE: - if (!(flag & FWRITE)) - return (EPERM); - apm_softc.active = 0; - break; - - case APMIO_HALTCPU: - break; - - case APMIO_NOTHALTCPU: - break; - - case APMIO_DISPLAY: - if (!(flag & FWRITE)) - return (EPERM); - break; - - case APMIO_BIOS: - if (!(flag & FWRITE)) - return (EPERM); - bzero(addr, sizeof(struct apm_bios_arg)); - break; - - default: - error = EINVAL; - break; - } - - return (error); -} - -static int -apmwrite(dev_t dev, struct uio *uio, int ioflag) -{ - - return (uio->uio_resid); -} - -static int -apmpoll(dev_t dev, int events, struct thread *td) -{ - return (0); -} - -static void -acpi_capm_init(struct acpi_softc *sc) -{ - - make_dev(&apm_cdevsw, 0, 0, 5, 0664, "apm"); -} - int acpi_machdep_init(device_t dev) { struct acpi_softc *sc; - acpi_dev = dev; - if ((sc = device_get_softc(acpi_dev)) == NULL) { + if ((sc = device_get_softc(dev)) == NULL) { return (ENXIO); } - acpi_capm_init(sc); - acpi_install_wakeup_handler(sc); return (0); } - ==== //depot/projects/hammer/sys/x86_64/acpica/acpi_wakeup.c#2 (text+ko) ==== @@ -26,320 +26,20 @@ * * $FreeBSD: src/sys/i386/acpica/acpi_wakeup.c,v 1.13 2002/08/22 21:24:00 archie Exp $ */ - #include -#include -#include #include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include #include "acpi.h" - -#include - #include -#include "acpi_wakecode.h" - -extern void initializecpu(void); - -static struct region_descriptor r_idt, r_gdt, *p_gdt; -static u_int16_t r_ldt; - -static u_int32_t r_eax, r_ebx, r_ecx, r_edx, r_ebp, r_esi, r_edi, - r_efl, r_cr0, r_cr2, r_cr3, r_cr4, ret_addr; - -static u_int16_t r_cs, r_ds, r_es, r_fs, r_gs, r_ss, r_tr; -static u_int32_t r_esp = 0; - -static void acpi_printcpu(void); -static void acpi_realmodeinst(void *arg, bus_dma_segment_t *segs, - int nsegs, int error); -static void acpi_alloc_wakeup_handler(void); - -/* XXX shut gcc up */ -extern int acpi_savecpu(void); -extern int acpi_restorecpu(void); - -__asm__(" \n\ - .text \n\ - .p2align 2, 0x90 \n\ - .type acpi_restorecpu, @function\n\ -acpi_restorecpu: \n\ - .align 4 \n\ - movl r_eax,%eax \n\ - movl r_ebx,%ebx \n\ - movl r_ecx,%ecx \n\ - movl r_edx,%edx \n\ - movl r_ebp,%ebp \n\ - movl r_esi,%esi \n\ - movl r_edi,%edi \n\ - movl r_esp,%esp \n\ - \n\ - pushl r_efl \n\ - popfl \n\ - \n\ - movl ret_addr,%eax \n\ - movl %eax,(%esp) \n\ - xorl %eax,%eax \n\ - ret \n\ - \n\ - .text \n\ - .p2align 2, 0x90 \n\ - .type acpi_savecpu, @function \n\ -acpi_savecpu: \n\ - movw %cs,r_cs \n\ - movw %ds,r_ds \n\ - movw %es,r_es \n\ - movw %fs,r_fs \n\ - movw %gs,r_gs \n\ - movw %ss,r_ss \n\ - \n\ - movl %eax,r_eax \n\ - movl %ebx,r_ebx \n\ - movl %ecx,r_ecx \n\ - movl %edx,r_edx \n\ - movl %ebp,r_ebp \n\ - movl %esi,r_esi \n\ - movl %edi,r_edi \n\ - \n\ - movl %cr0,%eax \n\ - movl %eax,r_cr0 \n\ - movl %cr2,%eax \n\ - movl %eax,r_cr2 \n\ - movl %cr3,%eax \n\ - movl %eax,r_cr3 \n\ - movl %cr4,%eax \n\ - movl %eax,r_cr4 \n\ - \n\ - pushfl \n\ - popl r_efl \n\ - \n\ - movl %esp,r_esp \n\ - \n\ - sgdt r_gdt \n\ - sidt r_idt \n\ - sldt r_ldt \n\ - str r_tr \n\ - \n\ - movl (%esp),%eax \n\ - movl %eax,ret_addr \n\ - movl $1,%eax \n\ - ret \n\ -"); - -static void -acpi_printcpu(void) -{ - - printf("======== acpi_printcpu() debug dump ========\n"); - printf("gdt[%04x:%08x] idt[%04x:%08x] ldt[%04x] tr[%04x] efl[%08x]\n", - r_gdt.rd_limit, r_gdt.rd_base, r_idt.rd_limit, r_idt.rd_base, - r_ldt, r_tr, r_efl); - printf("eax[%08x] ebx[%08x] ecx[%08x] edx[%08x]\n", - r_eax, r_ebx, r_ecx, r_edx); - printf("esi[%08x] edi[%08x] ebp[%08x] esp[%08x]\n", - r_esi, r_edi, r_ebp, r_esp); - printf("cr0[%08x] cr2[%08x] cr3[%08x] cr4[%08x]\n", - r_cr0, r_cr2, r_cr3, r_cr4); - printf("cs[%04x] ds[%04x] es[%04x] fs[%04x] gs[%04x] ss[%04x]\n", - r_cs, r_ds, r_es, r_fs, r_gs, r_ss); -} - -#define WAKECODE_FIXUP(offset, type, val) do { \ - void **addr; \ - addr = (void **)(sc->acpi_wakeaddr + offset); \ - (type *)*addr = val; \ -} while (0) - -#define WAKECODE_BCOPY(offset, type, val) do { \ - void **addr; \ - addr = (void **)(sc->acpi_wakeaddr + offset); \ - bcopy(&(val), addr, sizeof(type)); \ -} while (0) - int acpi_sleep_machdep(struct acpi_softc *sc, int state) { - ACPI_STATUS status; - vm_offset_t oldphys; - struct pmap *pm; - vm_page_t page; - static vm_page_t opage = NULL; - int ret = 0; - int pteobj_allocated = 0; - u_long ef; - - if (sc->acpi_wakeaddr == 0) { - return (0); - } - - AcpiSetFirmwareWakingVector(sc->acpi_wakephys); - - ef = read_eflags(); - disable_intr(); - - /* Create Identity Mapping */ - pm = vmspace_pmap(CURPROC->p_vmspace); - if (pm->pm_pteobj == NULL) { - pm->pm_pteobj = vm_object_allocate(OBJT_DEFAULT, PTDPTDI + 1); - pteobj_allocated = 1; - } - - oldphys = pmap_extract(pm, sc->acpi_wakephys); - if (oldphys) { - opage = PHYS_TO_VM_PAGE(oldphys); - } - page = PHYS_TO_VM_PAGE(sc->acpi_wakephys); - pmap_enter(pm, sc->acpi_wakephys, page, - VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE, 1); - - ret_addr = 0; - if (acpi_savecpu()) { - /* Execute Sleep */ - p_gdt = (struct region_descriptor *)(sc->acpi_wakeaddr + physical_gdt); - p_gdt->rd_limit = r_gdt.rd_limit; - p_gdt->rd_base = vtophys(r_gdt.rd_base); - - WAKECODE_FIXUP(physical_esp, u_int32_t, vtophys(r_esp)); - WAKECODE_FIXUP(previous_cr0, u_int32_t, r_cr0); - WAKECODE_FIXUP(previous_cr2, u_int32_t, r_cr2); - WAKECODE_FIXUP(previous_cr3, u_int32_t, r_cr3); - WAKECODE_FIXUP(previous_cr4, u_int32_t, r_cr4); - - WAKECODE_FIXUP(previous_tr, u_int16_t, r_tr); - WAKECODE_BCOPY(previous_gdt, struct region_descriptor, r_gdt); - WAKECODE_FIXUP(previous_ldt, u_int16_t, r_ldt); - WAKECODE_BCOPY(previous_idt, struct region_descriptor, r_idt); - - WAKECODE_FIXUP(where_to_recover, void, acpi_restorecpu); - - WAKECODE_FIXUP(previous_ds, u_int16_t, r_ds); - WAKECODE_FIXUP(previous_es, u_int16_t, r_es); - WAKECODE_FIXUP(previous_fs, u_int16_t, r_fs); - WAKECODE_FIXUP(previous_gs, u_int16_t, r_gs); - WAKECODE_FIXUP(previous_ss, u_int16_t, r_ss); - - if (acpi_get_verbose(sc)) { - acpi_printcpu(); - } - - wbinvd(); - - if (state == ACPI_STATE_S4 && sc->acpi_s4bios) { - status = AcpiEnterSleepStateS4Bios(); - } else { - status = AcpiEnterSleepState(state); - } - - if (status != AE_OK) { - device_printf(sc->acpi_dev, - "AcpiEnterSleepState failed - %s\n", - AcpiFormatException(status)); - ret = -1; - goto out; - } - - for (;;) ; - } else { - /* Execute Wakeup */ -#if 0 - initializecpu(); -#endif - icu_reinit(); - - if (acpi_get_verbose(sc)) { - acpi_savecpu(); - acpi_printcpu(); - } - } - -out: - pmap_remove(pm, sc->acpi_wakephys, sc->acpi_wakephys + PAGE_SIZE); - if (opage) { - pmap_enter(pm, sc->acpi_wakephys, page, - VM_PROT_READ | VM_PROT_WRITE, 0); - } - - if (pteobj_allocated) { - vm_object_deallocate(pm->pm_pteobj); - pm->pm_pteobj = NULL; - } - - write_eflags(ef); - - return (ret); -} - -static bus_dma_tag_t acpi_waketag; -static bus_dmamap_t acpi_wakemap; -static vm_offset_t acpi_wakeaddr = 0; - -static void -acpi_alloc_wakeup_handler(void) -{ - if (bus_dma_tag_create(/* parent */ NULL, /* alignment */ 2, 0, - /* lowaddr below 1MB */ 0x9ffff, - /* highaddr */ BUS_SPACE_MAXADDR, NULL, NULL, - PAGE_SIZE, 1, PAGE_SIZE, 0, &acpi_waketag) != 0) { - printf("acpi_alloc_wakeup_handler: unable to create wake tag\n"); - return; - } - - if (bus_dmamem_alloc(acpi_waketag, (void **)&acpi_wakeaddr, - BUS_DMA_NOWAIT, &acpi_wakemap)) { - printf("acpi_alloc_wakeup_handler: unable to allocate wake memory\n"); - return; - } + return (0); } -SYSINIT(acpiwakeup, SI_SUB_KMEM, SI_ORDER_ANY, acpi_alloc_wakeup_handler, 0) - -static void -acpi_realmodeinst(void *arg, bus_dma_segment_t *segs, int nsegs, int error) -{ - struct acpi_softc *sc = arg; - u_int32_t *addr; - - addr = (u_int32_t *)&wakecode[wakeup_sw32 + 2]; - *addr = segs[0].ds_addr + wakeup_32; - bcopy(wakecode, (void *)sc->acpi_wakeaddr, sizeof(wakecode)); - sc->acpi_wakephys = segs[0].ds_addr; -} - void acpi_install_wakeup_handler(struct acpi_softc *sc) { - - if (acpi_wakeaddr == 0) { - return; - } - - sc->acpi_waketag = acpi_waketag; - sc->acpi_wakeaddr = acpi_wakeaddr; - sc->acpi_wakemap = acpi_wakemap; - - bus_dmamap_load(sc->acpi_waketag, sc->acpi_wakemap, - (void *)sc->acpi_wakeaddr, PAGE_SIZE, - acpi_realmodeinst, sc, 0); } - To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 0:42: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E863B37B404; Sat, 21 Sep 2002 00:42:02 -0700 (PDT) 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 9135837B401 for ; Sat, 21 Sep 2002 00:42:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4204E43E42 for ; Sat, 21 Sep 2002 00:42:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L7g2Co081889 for ; Sat, 21 Sep 2002 00:42:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L7g1kH081886 for perforce@freebsd.org; Sat, 21 Sep 2002 00:42:01 -0700 (PDT) Date: Sat, 21 Sep 2002 00:42:01 -0700 (PDT) Message-Id: <200209210742.g8L7g1kH081886@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17837 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17837 Change 17837 by peter@peter_overcee on 2002/09/21 00:41:06 more de-bios-ification Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pci_cfgreg.h#3 edit .. //depot/projects/hammer/sys/x86_64/pci/pci_bus.c#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#15 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pci_cfgreg.h#3 (text+ko) ==== @@ -46,6 +46,3 @@ u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes); void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes); int pci_cfgintr(int bus, int device, int pin, int oldirq); -int pci_kill_pcibios(void); -int pci_pcibios_active(void); -int pci_probe_route_table(int bus); ==== //depot/projects/hammer/sys/x86_64/pci/pci_bus.c#2 (text+ko) ==== @@ -44,14 +44,10 @@ #include #include #include -#include #include #include "pcib_if.h" -static int pcibios_pcib_route_interrupt(device_t pcib, device_t dev, - int pin); - static int nexus_pcib_maxslots(device_t dev) { @@ -81,7 +77,9 @@ static int nexus_pcib_route_interrupt(device_t pcib, device_t dev, int pin) { - return (pcibios_pcib_route_interrupt(pcib, dev, pin)); + + /* No routing possible */ + return (PCI_INVALID_IRQ); } static devclass_t pcib_devclass; @@ -299,7 +297,6 @@ int pcifunchigh; int found824xx = 0; int found_orion = 0; - int found_pcibios_flaming_death = 0; device_t child; devclass_t pci_devclass; @@ -391,23 +388,6 @@ } /* - * This is just freaking brilliant! Some BIOS writers have - * decided that we must be forcibly prevented from using - * PCIBIOS to query the host->pci bridges. If you try and - * access configuration registers, it pretends there is - * no pci device at that bus:device:function address. - */ - if (!found && pci_pcibios_active() && !found_pcibios_flaming_death) { - /* retry with the old mechanism, or fail */ - if (pci_kill_pcibios() == 0) - return; - printf("nexus_pcib_identify: found broken PCIBIOS - disabling it and retrying.\n"); - printf("nexus_pcib_identify: it is bogusly censoring host->pci bridges.\n"); - found_pcibios_flaming_death = 1; - goto retry; - } - - /* * Make sure we add at least one bridge since some old * hardware doesn't actually have a host-pci bridge device. * Note that pci_cfgregopen() thinks we have PCI devices.. @@ -622,67 +602,3 @@ static devclass_t pcibus_pnp_devclass; DRIVER_MODULE(pcibus_pnp, isa, pcibus_pnp_driver, pcibus_pnp_devclass, 0, 0); - - -/* - * Provide a PCI-PCI bridge driver for PCI busses behind PCI-PCI bridges - * that appear in the PCIBIOS Interrupt Routing Table to use the routing - * table for interrupt routing when possible. - */ -static int pcibios_pcib_probe(device_t bus); - -static device_method_t pcibios_pcib_pci_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, pcibios_pcib_probe), - DEVMETHOD(device_attach, pcib_attach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), - - /* Bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_read_ivar, pcib_read_ivar), - DEVMETHOD(bus_write_ivar, pcib_write_ivar), - DEVMETHOD(bus_alloc_resource, pcib_alloc_resource), - DEVMETHOD(bus_release_resource, bus_generic_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), - DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - - /* pcib interface */ - DEVMETHOD(pcib_maxslots, pcib_maxslots), - DEVMETHOD(pcib_read_config, pcib_read_config), - DEVMETHOD(pcib_write_config, pcib_write_config), - DEVMETHOD(pcib_route_interrupt, pcibios_pcib_route_interrupt), - - {0, 0} -}; - -static driver_t pcibios_pcib_driver = { - "pcib", - pcibios_pcib_pci_methods, - sizeof(struct pcib_softc), -}; - -DRIVER_MODULE(pcibios_pcib, pci, pcibios_pcib_driver, pcib_devclass, 0, 0); - -static int -pcibios_pcib_probe(device_t dev) -{ - - if ((pci_get_class(dev) != PCIC_BRIDGE) || - (pci_get_subclass(dev) != PCIS_BRIDGE_PCI)) - return (ENXIO); - if (pci_probe_route_table(pcib_get_bus(dev)) == 0) - return (ENXIO); - device_set_desc(dev, "PCIBIOS PCI-PCI bridge"); - return (-2000); -} - -static int -pcibios_pcib_route_interrupt(device_t pcib, device_t dev, int pin) -{ - return(pci_cfgintr(pci_get_bus(dev), pci_get_slot(dev), pin, - pci_get_irq(dev))); -} ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#15 (text+ko) ==== @@ -99,7 +99,6 @@ #include #include #include -#include #include /* pcb.h included via sys/user.h */ #include #ifdef PERFMON To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 1: 4:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B757337B401; Sat, 21 Sep 2002 01:04:31 -0700 (PDT) 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 3627937B404 for ; Sat, 21 Sep 2002 01:04:31 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E915943E6E for ; Sat, 21 Sep 2002 01:04:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L84UCo086117 for ; Sat, 21 Sep 2002 01:04:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L84UYB086114 for perforce@freebsd.org; Sat, 21 Sep 2002 01:04:30 -0700 (PDT) Date: Sat, 21 Sep 2002 01:04:30 -0700 (PDT) Message-Id: <200209210804.g8L84UYB086114@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17840 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17840 Change 17840 by peter@peter_overcee on 2002/09/21 01:04:13 I know jake and benno are going to kill me, but promote these to MI, and at different numbers to what they used.. I've not changed powerpc or sparc64 or this conflict would go unnoticed. I'm prepared to change them to the same as the 0x100x numbers if it is worth it, but I'd rather reserve that range as MD. Affected files ... .. //depot/projects/hammer/sys/sys/linker.h#2 edit Differences ... ==== //depot/projects/hammer/sys/sys/linker.h#2 (text+ko) ==== @@ -191,10 +191,21 @@ #define MODINFOMD_SSYM 0x0003 /* start of symbols */ #define MODINFOMD_ESYM 0x0004 /* end of symbols */ #define MODINFOMD_DYNAMIC 0x0005 /* _DYNAMIC pointer */ +#define MODINFOMD_ENVP 0x0006 /* envp[] */ +#define MODINFOMD_HOWTO 0x0007 /* boothowto */ +#define MODINFOMD_KERNEND 0x0008 /* kernend */ #define MODINFOMD_NOCOPY 0x8000 /* don't copy this metadata to the kernel */ #define MODINFOMD_DEPLIST (0x4001 | MODINFOMD_NOCOPY) /* depends on */ +#ifdef _KERNEL +#define MD_FETCH(mdp, info, type) ({ \ + type *__p; \ + __p = (type *)preload_search_info((mdp), MODINFO_METADATA | (info)); \ + __p ? *__p : 0; \ +}) +#endif + #define LINKER_HINTS_VERSION 1 /* linker.hints file version */ #ifdef _KERNEL To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 1:34:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2E6037B404; Sat, 21 Sep 2002 01:34:07 -0700 (PDT) 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 5796B37B401 for ; Sat, 21 Sep 2002 01:34:07 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E248E43E42 for ; Sat, 21 Sep 2002 01:34:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L8Y6Co096351 for ; Sat, 21 Sep 2002 01:34:06 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L8Y66g096348 for perforce@freebsd.org; Sat, 21 Sep 2002 01:34:06 -0700 (PDT) Date: Sat, 21 Sep 2002 01:34:06 -0700 (PDT) Message-Id: <200209210834.g8L8Y66g096348@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17841 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17841 Change 17841 by peter@peter_overcee on 2002/09/21 01:33:35 copy sparc64's startup strategy so that we pass additional metadata through so we can stop being dependent on bootinfo. Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#2 edit .. //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#2 edit .. //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#2 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/bootinfo.c#2 (text+ko) ==== @@ -176,43 +176,47 @@ * MOD_SIZE sizeof(size_t) module size * MOD_METADATA (variable) type-specific metadata */ -#define COPY32(v, a) { \ +#define COPY32(v, a, c) { \ u_int32_t x = (v); \ - i386_copyin(&x, a, sizeof(x)); \ + if (c) \ + i386_copyin(&x, a, sizeof(x)); \ a += sizeof(x); \ } -#define MOD_STR(t, a, s) { \ - COPY32(t, a); \ - COPY32(strlen(s) + 1, a); \ - i386_copyin(s, a, strlen(s) + 1); \ +#define MOD_STR(t, a, s, c) { \ + COPY32(t, a, c); \ + COPY32(strlen(s) + 1, a, c); \ + if (c) \ + i386_copyin(s, a, strlen(s) + 1); \ a += roundup(strlen(s) + 1, sizeof(u_long));\ } -#define MOD_NAME(a, s) MOD_STR(MODINFO_NAME, a, s) -#define MOD_TYPE(a, s) MOD_STR(MODINFO_TYPE, a, s) -#define MOD_ARGS(a, s) MOD_STR(MODINFO_ARGS, a, s) +#define MOD_NAME(a, s, c) MOD_STR(MODINFO_NAME, a, s, c) +#define MOD_TYPE(a, s, c) MOD_STR(MODINFO_TYPE, a, s, c) +#define MOD_ARGS(a, s, c) MOD_STR(MODINFO_ARGS, a, s, c) -#define MOD_VAR(t, a, s) { \ - COPY32(t, a); \ - COPY32(sizeof(s), a); \ - i386_copyin(&s, a, sizeof(s)); \ +#define MOD_VAR(t, a, s, c) { \ + COPY32(t, a, c); \ + COPY32(sizeof(s), a, c); \ + if (c) \ + i386_copyin(&s, a, sizeof(s)); \ a += roundup(sizeof(s), sizeof(u_long)); \ } -#define MOD_ADDR(a, s) MOD_VAR(MODINFO_ADDR, a, s) -#define MOD_SIZE(a, s) MOD_VAR(MODINFO_SIZE, a, s) +#define MOD_ADDR(a, s, c) MOD_VAR(MODINFO_ADDR, a, s, c) +#define MOD_SIZE(a, s, c) MOD_VAR(MODINFO_SIZE, a, s, c) -#define MOD_METADATA(a, mm) { \ - COPY32(MODINFO_METADATA | mm->md_type, a); \ - COPY32(mm->md_size, a); \ - i386_copyin(mm->md_data, a, mm->md_size); \ +#define MOD_METADATA(a, mm, c) { \ + COPY32(MODINFO_METADATA | mm->md_type, a, c); \ + COPY32(mm->md_size, a, c); \ + if (c) \ + i386_copyin(mm->md_data, a, mm->md_size); \ a += roundup(mm->md_size, sizeof(u_long));\ } -#define MOD_END(a) { \ - COPY32(MODINFO_END, a); \ - COPY32(0, a); \ +#define MOD_END(a, c) { \ + COPY32(MODINFO_END, a, c); \ + COPY32(0, a, c); \ } vm_offset_t @@ -220,21 +224,23 @@ { struct preloaded_file *fp; struct file_metadata *md; + int c; + c = addr != 0; /* start with the first module on the list, should be the kernel */ for (fp = file_findfile(NULL, NULL); fp != NULL; fp = fp->f_next) { - MOD_NAME(addr, fp->f_name); /* this field must come first */ - MOD_TYPE(addr, fp->f_type); + MOD_NAME(addr, fp->f_name, c); /* this field must come first */ + MOD_TYPE(addr, fp->f_type, c); if (fp->f_args) - MOD_ARGS(addr, fp->f_args); - MOD_ADDR(addr, fp->f_addr); - MOD_SIZE(addr, fp->f_size); + MOD_ARGS(addr, fp->f_args, c); + MOD_ADDR(addr, fp->f_addr, c); + MOD_SIZE(addr, fp->f_size, c); for (md = fp->f_metadata; md != NULL; md = md->md_next) if (!(md->md_type & MODINFOMD_NOCOPY)) - MOD_METADATA(addr, md); + MOD_METADATA(addr, md, c); } - MOD_END(addr); + MOD_END(addr, c); return(addr); } @@ -248,18 +254,20 @@ * - Module metadata are formatted and placed in kernel space. */ int -bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip) +bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, vm_offset_t *modulep) { struct preloaded_file *xp; struct i386_devdesc *rootdev; vm_offset_t addr; + vm_offset_t kernend; + vm_offset_t envp; + vm_offset_t size; char *rootdevname; - int bootdevnr, i; - u_int pad; + int bootdevnr, i, howto; char *kernelname; const char *kernelpath; - *howtop = bi_getboothowto(args); + howtop = bi_getboothowto(args); /* * Allow the environment variable 'rootdev' to override the supplied device @@ -305,20 +313,7 @@ return (EINVAL); } free(rootdev); - *bootdevp = bootdevnr; - /* legacy bootinfo structure */ - bi.bi_version = BOOTINFO_VERSION; - bi.bi_kernelname = 0; /* XXX char * -> kernel name */ - bi.bi_nfs_diskless = 0; /* struct nfs_diskless * */ - bi.bi_n_bios_used = 0; /* XXX would have to hook biosdisk driver for these */ - for (i = 0; i < N_BIOS_GEOM; i++) - bi.bi_bios_geom[i] = bd_getbigeom(i); - bi.bi_size = sizeof(bi); - bi.bi_memsizes_valid = 1; - bi.bi_basemem = bios_basemem / 1024; - bi.bi_extmem = bios_extmem / 1024; - /* find the last module in the chain */ addr = 0; for (xp = file_findfile(NULL, NULL); xp != NULL; xp = xp->f_next) { @@ -326,37 +321,59 @@ addr = xp->f_addr + xp->f_size; } /* pad to a page boundary */ - pad = (u_int)addr & PAGE_MASK; - if (pad != 0) { - pad = PAGE_SIZE - pad; - addr += pad; - } + addr = roundup(addr, PAGE_SIZE); /* copy our environment */ - bi.bi_envp = addr; + envp = addr; addr = bi_copyenv(addr); /* pad to a page boundary */ - pad = (u_int)addr & PAGE_MASK; - if (pad != 0) { - pad = PAGE_SIZE - pad; - addr += pad; - } - /* copy module list and metadata */ - bi.bi_modulep = addr; - addr = bi_copymodules(addr); + addr = roundup(addr, PAGE_SIZE); + + kfp = file_findfile(NULL, "elf kernel"); + if (kfp == NULL) + panic("can't find kernel file"); + kernend = 0; /* fill it in later */ + file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); + file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); + file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); +#ifdef MODINFOMD_SMAP + file_addmetadata(kfp, MODINFOMD_SMAP, smapsize, smap); +#endif + + /* Figure out the size and location of the metadata */ + *modulep = addr; + size = bi_copymodules(0); + kernend = roundup(addr + size, PAGE_SIZE); - /* all done copying stuff in, save end of loaded object space */ - bi.bi_kernend = addr; + /* patch MODINFOMD_KERNEND */ + md = file_findmetadata(kfp, MODINFOMD_KERNEND); + bcopy(&kernend, md->md_data, sizeof kernend); - *howtop |= RB_BOOTINFO; /* it's there now */ + /* copy module list and metadata */ + (void)bi_copymodules(addr); - /* - * Get the kernel name, strip off any device prefix. - */ + /* legacy bootinfo structure */ kernelname = getenv("kernelname"); i386_getdev(NULL, kernelname, &kernelpath); + bi.bi_version = BOOTINFO_VERSION; + bi.bi_kernelname = 0; /* XXX char * -> kernel name */ + bi.bi_nfs_diskless = 0; /* struct nfs_diskless * */ + bi.bi_n_bios_used = 0; /* XXX would have to hook biosdisk driver for these */ + for (i = 0; i < N_BIOS_GEOM; i++) + bi.bi_bios_geom[i] = bd_getbigeom(i); + bi.bi_size = sizeof(bi); + bi.bi_memsizes_valid = 1; + bi.bi_basemem = bios_basemem / 1024; + bi.bi_extmem = bios_extmem / 1024; + bi.bi_envp = envp; + bi.bi_modulep = envp; + bi.bi_kernend = kernend; bi.bi_kernelname = VTOP(kernelpath); + + /* legacy boot arguments */ + *howtop = howto | RB_BOOTINFO; + *bootdevp = bootdevnr; *bip = VTOP(&bi); return(0); ==== //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#2 (text+ko) ==== @@ -53,7 +53,7 @@ { struct file_metadata *md; Elf_Ehdr *ehdr; - vm_offset_t entry, bootinfop; + vm_offset_t entry, bootinfop, modulep; int boothowto, err, bootdev; struct bootinfo *bi; vm_offset_t ssym, esym; @@ -62,7 +62,7 @@ return(EFTYPE); /* XXX actually EFUCKUP */ ehdr = (Elf_Ehdr *)&(md->md_data); - if ((err = bi_load(fp->f_args, &boothowto, &bootdev, &bootinfop)) != 0) + if ((err = bi_load(fp->f_args, &boothowto, &bootdev, &bootinfop, &modulep)) != 0) return(err); entry = ehdr->e_entry & 0xffffff; @@ -83,7 +83,7 @@ #endif dev_cleanup(); - __exec((void *)entry, boothowto, bootdev, 0, 0, 0, bootinfop); + __exec((void *)entry, boothowto, bootdev, modulep, 0, 0, bootinfop); panic("exec returned"); } ==== //depot/projects/hammer/sys/boot/i386/libi386/libi386.h#2 (text+ko) ==== @@ -97,6 +97,7 @@ int bi_getboothowto(char *kargs); vm_offset_t bi_copyenv(vm_offset_t addr); -int bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip); +int bi_load(char *args, int *howtop, int *bootdevp, vm_offset_t *bip, + vm_offset_t *modulep); void pxe_enable(void *pxeinfo); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 1:58:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0A4337B404; Sat, 21 Sep 2002 01:58:38 -0700 (PDT) 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 8032737B401 for ; Sat, 21 Sep 2002 01:58:38 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2ACCC43E75 for ; Sat, 21 Sep 2002 01:58:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L8wcCo000771 for ; Sat, 21 Sep 2002 01:58:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L8wbqM000768 for perforce@freebsd.org; Sat, 21 Sep 2002 01:58:37 -0700 (PDT) Date: Sat, 21 Sep 2002 01:58:37 -0700 (PDT) Message-Id: <200209210858.g8L8wbqM000768@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17844 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17844 Change 17844 by peter@peter_overcee on 2002/09/21 01:57:58 adjust for new modulep args. exterminate bootinfo. Affected files ... .. //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#3 edit .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#10 edit Differences ... ==== //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#3 (text+ko) ==== @@ -83,7 +83,7 @@ #endif dev_cleanup(); - __exec((void *)entry, boothowto, bootdev, modulep, 0, 0, bootinfop); + __exec((void *)entry, boothowto, bootdev, 0, 0, 0, bootinfop, modulep, bi->bi_kernend); panic("exec returned"); } ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#10 (text+ko) ==== @@ -107,8 +107,8 @@ .space 0x2000 /* space for tmpstk - temporary stack */ HIDENAME(tmpstk): - .globl bootinfo -bootinfo: .space BOOTINFO_SIZE /* bootinfo that we can handle */ + .globl modulep +bootinfo: .long 0 /* phys addr of module table */ .globl KERNend KERNend: .long 0 /* phys addr end of kernel (just after bss) */ @@ -185,7 +185,10 @@ /* Tell the bios to warmboot next time */ movw $0x1234,0x472 -/* Set up a real frame in case the double return in newboot is executed. */ +/* Get onto a stack that we can trust. */ + movl $R(HIDENAME(tmpstk)),%esp + +/* Set up a real frame */ pushl %ebp movl %esp, %ebp @@ -203,14 +206,6 @@ call recover_bootinfo -/* Get onto a stack that we can trust. */ -/* - * XXX this step is delayed in case recover_bootinfo needs to return via - * the old stack, but it need not be, since recover_bootinfo actually - * returns via the old frame. - */ - movl $R(HIDENAME(tmpstk)),%esp - call identify_cpu call create_pagetables @@ -250,9 +245,13 @@ call mi_startup /* autoconfiguration, mountroot etc */ /* NOTREACHED */ addl $0,%esp /* for db_numargs() again */ +0: hlt + jmp 0b -/* +/********************************************************************** + * * Signal trampoline, copied to top of user stack + * */ NON_GPROF_ENTRY(sigcode) call *SIGF_HANDLER(%esp) /* call signal handler */ @@ -262,7 +261,8 @@ movl $SYS_sigreturn,%eax pushl %eax /* junk to fake return addr. */ int $0x80 /* enter kernel with args */ -0: jmp 0b +0: hlt /* priviliged instruction */ + jmp 0b ALIGN_TEXT esigcode: @@ -280,26 +280,8 @@ */ recover_bootinfo: /* - * This code is called in different ways depending on what loaded - * and started the kernel. This is used to detect how we get the - * arguments from the other code and what we do with them. - * - * Old disk boot blocks: - * (*btext)(howto, bootdev, cyloffset, esym); - * [return address == 0, and can NOT be returned to] - * [cyloffset was not supported by the FreeBSD boot code - * and always passed in as 0] - * [esym is also known as total in the boot code, and - * was never properly supported by the FreeBSD boot code] - * - * Old diskless netboot code: - * (*btext)(0,0,0,0,&nfsdiskless,0,0,0); - * [return address != 0, and can NOT be returned to] - * If we are being booted by this code it will NOT work, - * so we are just going to halt if we find this case. - * * New uniform boot code: - * (*btext)(howto, bootdev, 0, 0, 0, &bootinfo) + * (*btext)(howto, bootdev, 0, 0, 0, &bootinfo, modulep, kernend) * [return address != 0, and can be returned to] * * There may seem to be a lot of wasted arguments in here, but @@ -307,65 +289,11 @@ * and old boot code can load new kernels. */ - /* - * We have some form of return address, so this is either the - * old diskless netboot code, or the new uniform code. That can - * be detected by looking at the 5th argument, if it is 0 - * we are being booted by the new uniform boot code. - */ - cmpl $0,24(%ebp) - je newboot - - /* - * Seems we have been loaded by the old diskless boot code, we - * don't stand a chance of running as the diskless structure - * changed considerably between the two, so just halt. - */ - hlt + movl 32(%ebp),%eax /* modulep */ + movl %eax,R(modulep) + movl 36(%ebp),%eax /* kernend */ + movl %eax,R(kernend) - /* - * We have been loaded by the new uniform boot code. - * Let's check the bootinfo version, and if we do not understand - * it we return to the loader with a status of 1 to indicate this error - */ -newboot: - movl 28(%ebp),%ebx /* &bootinfo.version */ - movl BI_VERSION(%ebx),%eax - cmpl $1,%eax /* We only understand version 1 */ - je 1f - movl $1,%eax /* Return status */ - leave - /* - * XXX this returns to our caller's caller (as is required) since - * we didn't set up a frame and our caller did. - */ - ret - -1: - /* - * Determine the size of the boot loader's copy of the bootinfo - * struct. - */ - movl BI_SIZE(%ebx),%ecx - - /* - * Copy the common part of the bootinfo struct - */ - movl %ebx,%esi - movl $R(bootinfo),%edi - cmpl $BOOTINFO_SIZE,%ecx - jbe got_common_bi_size - movl $BOOTINFO_SIZE,%ecx -got_common_bi_size: - cld - rep - movsb - - movl 8(%ebp),%eax - movl %eax,R(boothowto) - movl 12(%ebp),%eax - movl %eax,R(bootdev) - ret @@ -401,25 +329,8 @@ create_pagetables: -/* Find end of kernel image (rounded up to a page boundary). */ - movl $R(_end),%esi - -/* Include symbols, if any. */ - movl R(bootinfo+BI_ESYMTAB),%edi - testl %edi,%edi - je over_symalloc - movl %edi,%esi - movl $KERNBASE,%edi - addl %edi,R(bootinfo+BI_SYMTAB) - addl %edi,R(bootinfo+BI_ESYMTAB) -over_symalloc: - -/* If we are told where the end of the kernel space is, believe it. */ - movl R(bootinfo+BI_KERNEND),%edi - testl %edi,%edi - je no_kernend - movl %edi,%esi -no_kernend: +/* We are told where the end of the kernel space is, believe it. */ + movl R(kernend),%esi addl $PAGE_MASK,%esi andl $~PAGE_MASK,%esi To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 2: 8:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC0ED37B404; Sat, 21 Sep 2002 02:08:51 -0700 (PDT) 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 51C0237B401 for ; Sat, 21 Sep 2002 02:08:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E995043E6A for ; Sat, 21 Sep 2002 02:08:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L98oCo007117 for ; Sat, 21 Sep 2002 02:08:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L98oKT007114 for perforce@freebsd.org; Sat, 21 Sep 2002 02:08:50 -0700 (PDT) Date: Sat, 21 Sep 2002 02:08:50 -0700 (PDT) Message-Id: <200209210908.g8L98oKT007114@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17845 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17845 Change 17845 by peter@peter_overcee on 2002/09/21 02:08:39 more bootinfo/metadata tidyup Affected files ... .. //depot/projects/hammer/sys/x86_64/include/cpu.h#4 edit .. //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#3 edit .. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#6 edit .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#11 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#16 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/cpu.h#4 (text+ko) ==== @@ -72,19 +72,9 @@ #define CPU_CONSDEV 1 /* dev_t: console terminal device */ #define CPU_ADJKERNTZ 2 /* int: timezone offset (seconds) */ #define CPU_DISRTCSET 3 /* int: disable resettodr() call */ -#define CPU_BOOTINFO 4 /* struct: bootinfo */ #define CPU_WALLCLOCK 5 /* int: indicates wall CMOS clock */ #define CPU_MAXID 6 /* number of valid machdep ids */ -#define CTL_MACHDEP_NAMES { \ - { 0, 0 }, \ - { "console_device", CTLTYPE_STRUCT }, \ - { "adjkerntz", CTLTYPE_INT }, \ - { "disable_rtc_set", CTLTYPE_INT }, \ - { "bootinfo", CTLTYPE_STRUCT }, \ - { "wall_cmos_clock", CTLTYPE_INT }, \ -} - #ifdef _KERNEL extern char btext[]; extern char etext[]; ==== //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#3 (text+ko) ==== @@ -75,7 +75,6 @@ #include #endif -#include #include #include @@ -160,43 +159,8 @@ configure_final(dummy) void *dummy; { - int i; cninit_finish(); - - if (bootverbose) { - /* - * Print out the BIOS's idea of the disk geometries. - */ - printf("BIOS Geometries:\n"); - for (i = 0; i < N_BIOS_GEOM; i++) { - unsigned long bios_geom; - int max_cylinder, max_head, max_sector; - - bios_geom = bootinfo.bi_bios_geom[i]; - - /* - * XXX the bootstrap punts a 1200K floppy geometry - * when the get-disk-geometry interrupt fails. Skip - * drives that have this geometry. - */ - if (bios_geom == 0x4f010f) - continue; - - printf(" %x:%08lx ", i, bios_geom); - max_cylinder = bios_geom >> 16; - max_head = (bios_geom >> 8) & 0xff; - max_sector = bios_geom & 0xff; - printf( - "0..%d=%d cylinders, 0..%d=%d heads, 1..%d=%d sectors\n", - max_cylinder, max_cylinder + 1, - max_head, max_head + 1, - max_sector, max_sector); - } - printf(" %d accounted for\n", bootinfo.bi_n_bios_used); - - printf("Device configuration finished.\n"); - } cold = 0; } ==== //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#6 (text+ko) ==== @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -159,17 +158,7 @@ ASSYM(EFAULT, EFAULT); ASSYM(ENAMETOOLONG, ENAMETOOLONG); ASSYM(MAXPATHLEN, MAXPATHLEN); -ASSYM(BOOTINFO_SIZE, sizeof(struct bootinfo)); -ASSYM(BI_VERSION, offsetof(struct bootinfo, bi_version)); -ASSYM(BI_KERNELNAME, offsetof(struct bootinfo, bi_kernelname)); -ASSYM(BI_NFS_DISKLESS, offsetof(struct bootinfo, bi_nfs_diskless)); -ASSYM(BI_ENDCOMMON, offsetof(struct bootinfo, bi_endcommon)); -ASSYM(NFSDISKLESS_SIZE, sizeof(struct nfs_diskless)); -ASSYM(BI_SIZE, offsetof(struct bootinfo, bi_size)); -ASSYM(BI_SYMTAB, offsetof(struct bootinfo, bi_symtab)); -ASSYM(BI_ESYMTAB, offsetof(struct bootinfo, bi_esymtab)); -ASSYM(BI_KERNEND, offsetof(struct bootinfo, bi_kernend)); -ASSYM(PC_SIZEOF, sizeof(struct pcpu)); +eSSYM(PC_SIZEOF, sizeof(struct pcpu)); ASSYM(PC_PRVSPACE, offsetof(struct pcpu, pc_prvspace)); ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); ASSYM(PC_INT_PENDING, offsetof(struct pcpu, pc_int_pending)); ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#11 (text+ko) ==== @@ -108,7 +108,7 @@ HIDENAME(tmpstk): .globl modulep -bootinfo: .long 0 /* phys addr of module table */ +modulep: .long 0 /* phys addr of metadata table */ .globl KERNend KERNend: .long 0 /* phys addr end of kernel (just after bss) */ @@ -204,7 +204,7 @@ mov %ax, %fs mov %ax, %gs - call recover_bootinfo + call recover_metadata call identify_cpu @@ -275,10 +275,10 @@ /********************************************************************** * - * Recover the bootinfo passed to us from the boot program + * Recover the metadata passed to us from the boot program * */ -recover_bootinfo: +recover_metadata: /* * New uniform boot code: * (*btext)(howto, bootdev, 0, 0, 0, &bootinfo, modulep, kernend) @@ -292,7 +292,7 @@ movl 32(%ebp),%eax /* modulep */ movl %eax,R(modulep) movl 36(%ebp),%eax /* kernend */ - movl %eax,R(kernend) + movl %eax,R(KERNend) ret @@ -329,12 +329,8 @@ create_pagetables: -/* We are told where the end of the kernel space is, believe it. */ - movl R(kernend),%esi - - addl $PAGE_MASK,%esi - andl $~PAGE_MASK,%esi - movl %esi,R(KERNend) /* save end of kernel */ +/* We are told where the end of the kernel space is. */ + movl R(KERNend),%esi /* get end of kernel */ movl %esi,R(physfree) /* next free page is at end of kernel */ /* Allocate Kernel Page Tables */ ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#16 (text+ko) ==== @@ -97,7 +97,6 @@ #include #include #include -#include #include #include /* pcb.h included via sys/user.h */ #include @@ -626,16 +625,9 @@ SYSCTL_INT(_machdep, CPU_DISRTCSET, disable_rtc_set, CTLFLAG_RW, &disable_rtc_set, 0, ""); -SYSCTL_STRUCT(_machdep, CPU_BOOTINFO, bootinfo, - CTLFLAG_RD, &bootinfo, bootinfo, ""); - SYSCTL_INT(_machdep, CPU_WALLCLOCK, wall_cmos_clock, CTLFLAG_RW, &wall_cmos_clock, 0, ""); -u_long bootdev; /* not a dev_t - encoding is different */ -SYSCTL_ULONG(_machdep, OID_AUTO, guessed_bootdev, - CTLFLAG_RD, &bootdev, 0, "Maybe the Boot device (not in dev_t format)"); - /* * Initialize 386 and configure to run kernel */ @@ -1131,8 +1123,8 @@ int first; { struct gate_descriptor *gdp; - int gsel_tss, metadata_missing, off, x; - /* table descriptors - used to load tables by microp */ + caddr_t kmdp; + int gsel_tss, off, x; struct region_descriptor r_gdt, r_idt; struct pcpu *pc; @@ -1148,17 +1140,11 @@ */ proc_linkup(&proc0, &ksegrp0, &kse0, &thread0); - metadata_missing = 0; - if (bootinfo.bi_modulep) { - preload_metadata = (caddr_t)bootinfo.bi_modulep + KERNBASE; - preload_bootstrap_relocate(KERNBASE); - } else { - metadata_missing = 1; - } - if (envmode == 1) - kern_envp = static_env; - else if (bootinfo.bi_envp) - kern_envp = (caddr_t)bootinfo.bi_envp + KERNBASE; + preload_metadata = (caddr_t)modulep + KERNBASE; + preload_bootstrap_relocate(KERNBASE); + kmdp = preload_search_by_type("elf kernel"); + boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); + kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *); /* Init basic tunables, hz etc */ init_param1(); @@ -1269,9 +1255,6 @@ */ cninit(); - if (metadata_missing) - printf("WARNING: loader(8) metadata is missing!\n"); - #ifdef DEV_ISA isa_defaultirq(); #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 2:30:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC35D37B404; Sat, 21 Sep 2002 02:30:17 -0700 (PDT) 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 8A21C37B401 for ; Sat, 21 Sep 2002 02:30:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 472E643E42 for ; Sat, 21 Sep 2002 02:30:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L9UHCo011612 for ; Sat, 21 Sep 2002 02:30:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L9UGla011602 for perforce@freebsd.org; Sat, 21 Sep 2002 02:30:16 -0700 (PDT) Date: Sat, 21 Sep 2002 02:30:16 -0700 (PDT) Message-Id: <200209210930.g8L9UGla011602@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17846 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17846 Change 17846 by peter@peter_overcee on 2002/09/21 02:30:07 having user code in the middle of locore always bothered me. move sigtrap stuff to a seperate file where we can assemble it with different options if needed. Especially keep it away from the 32/64 bit transition areas. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#12 edit .. //depot/projects/hammer/sys/x86_64/x86_64/sigtramp.s#1 add Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#12 (text+ko) ==== @@ -43,13 +43,6 @@ * and many others. */ -#include "opt_bootp.h" -#include "opt_compat.h" -#include "opt_nfsroot.h" - -#include -#include - #include #include #include @@ -185,10 +178,8 @@ /* Tell the bios to warmboot next time */ movw $0x1234,0x472 -/* Get onto a stack that we can trust. */ +/* Get onto a stack that we can trust and set up a real frame. */ movl $R(HIDENAME(tmpstk)),%esp - -/* Set up a real frame */ pushl %ebp movl %esp, %ebp @@ -205,9 +196,7 @@ mov %ax, %gs call recover_metadata - call identify_cpu - call create_pagetables /* Now enable paging */ @@ -250,31 +239,6 @@ /********************************************************************** * - * Signal trampoline, copied to top of user stack - * - */ -NON_GPROF_ENTRY(sigcode) - call *SIGF_HANDLER(%esp) /* call signal handler */ - lea SIGF_UC(%esp),%eax /* get ucontext_t */ - pushl %eax - movl UC_GS(%eax),%gs /* restore %gs */ - movl $SYS_sigreturn,%eax - pushl %eax /* junk to fake return addr. */ - int $0x80 /* enter kernel with args */ -0: hlt /* priviliged instruction */ - jmp 0b - - ALIGN_TEXT -esigcode: - - .data - .globl szsigcode -szsigcode: - .long esigcode-sigcode - .text - -/********************************************************************** - * * Recover the metadata passed to us from the boot program * */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 2:36:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4B0737B404; Sat, 21 Sep 2002 02:36:25 -0700 (PDT) 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 72DC837B401 for ; Sat, 21 Sep 2002 02:36:25 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30F4B43E65 for ; Sat, 21 Sep 2002 02:36:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L9aPCo013283 for ; Sat, 21 Sep 2002 02:36:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L9aPLS013280 for perforce@freebsd.org; Sat, 21 Sep 2002 02:36:25 -0700 (PDT) Date: Sat, 21 Sep 2002 02:36:25 -0700 (PDT) Message-Id: <200209210936.g8L9aPLS013280@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17847 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17847 Change 17847 by peter@peter_overcee on 2002/09/21 02:35:26 s/elf32/elf64/ for native binaries initially and #If 0 out the reloc code Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/elf_machdep.c#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/elf_machdep.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #include #include -struct sysentvec elf32_freebsd_sysvec = { +struct sysentvec elf64_freebsd_sysvec = { SYS_MAXSYSCALL, sysent, 0, @@ -58,7 +58,7 @@ sigcode, &szsigcode, NULL, - "FreeBSD ELF32", + "FreeBSD ELF64", __elfN(coredump), NULL, MINSIGSTKSZ, @@ -74,21 +74,22 @@ static Elf32_Brandinfo freebsd_brand_info = { ELFOSABI_FREEBSD, - EM_386, + EM_X86_64, "FreeBSD", "", "/usr/libexec/ld-elf.so.1", &elf32_freebsd_sysvec }; -SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, - (sysinit_cfunc_t) elf32_insert_brand_entry, +SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, &freebsd_brand_info); /* Process one elf relocation with addend. */ int elf_reloc(linker_file_t lf, const void *data, int type) { +#if 0 Elf_Addr relocbase = (Elf_Addr) lf->address; Elf_Addr *where; Elf_Addr addr; @@ -167,5 +168,6 @@ rtype); return -1; } +#endif return(0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 2:53:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B319037B404; Sat, 21 Sep 2002 02:53:47 -0700 (PDT) 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 4B5AA37B401 for ; Sat, 21 Sep 2002 02:53:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 036CA43E6A for ; Sat, 21 Sep 2002 02:53:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8L9rkCo016980 for ; Sat, 21 Sep 2002 02:53:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8L9rkG7016977 for perforce@freebsd.org; Sat, 21 Sep 2002 02:53:46 -0700 (PDT) Date: Sat, 21 Sep 2002 02:53:46 -0700 (PDT) Message-Id: <200209210953.g8L9rkG7016977@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17849 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17849 Change 17849 by peter@peter_overcee on 2002/09/21 02:53:43 initial guesses at what this might look like Affected files ... .. //depot/projects/hammer/sys/x86_64/include/elf.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/elf.h#2 (text+ko) ==== @@ -30,17 +30,17 @@ #define _MACHINE_ELF_H_ 1 /* - * ELF definitions for the i386 architecture. + * ELF definitions for the x86-64 architecture. */ -#include /* Definitions common to all 32 bit architectures. */ +#include /* Definitions common to all 64 bit architectures. */ -#define __ELF_WORD_SIZE 32 /* Used by */ +#define __ELF_WORD_SIZE 64 /* Used by */ #include -#define ELF_ARCH EM_386 +#define ELF_ARCH EM_X86_64 -#define ELF_MACHINE_OK(x) ((x) == EM_386 || (x) == EM_486) +#define ELF_MACHINE_OK(x) ((x) == EM_X86_64) /* * Auxiliary vector entries for passing information to the interpreter. @@ -50,13 +50,13 @@ */ typedef struct { /* Auxiliary vector entry on initial stack */ - int a_type; /* Entry type. */ + long a_type; /* Entry type. */ union { long a_val; /* Integer value. */ void *a_ptr; /* Address. */ void (*a_fcn)(void); /* Function pointer (not used). */ } a_un; -} Elf32_Auxinfo; +} Elf64_Auxinfo; __ElfType(Auxinfo); @@ -98,24 +98,29 @@ * Relocation types. */ -#define R_386_NONE 0 /* No relocation. */ -#define R_386_32 1 /* Add symbol value. */ -#define R_386_PC32 2 /* Add PC-relative symbol value. */ -#define R_386_GOT32 3 /* Add PC-relative GOT offset. */ -#define R_386_PLT32 4 /* Add PC-relative PLT offset. */ -#define R_386_COPY 5 /* Copy data from shared object. */ -#define R_386_GLOB_DAT 6 /* Set GOT entry to data address. */ -#define R_386_JMP_SLOT 7 /* Set GOT entry to code address. */ -#define R_386_RELATIVE 8 /* Add load address of shared object. */ -#define R_386_GOTOFF 9 /* Add GOT-relative symbol address. */ -#define R_386_GOTPC 10 /* Add PC-relative GOT table address. */ +#define R_X86_64_NONE 0 /* No relocation. */ +#define R_X86_64_64 1 /* Add 64 bit symbol value. */ +#define R_X86_64_PC32 2 /* PC-relative 32 bit signed sym value. */ +#define R_X86_64_GOT32 3 /* PC-relative 32 bit GOT offset. */ +#define R_X86_64_PLT32 4 /* PC-relative 32 bit PLT offset. */ +#define R_X86_64_COPY 5 /* Copy data from shared object. */ +#define R_X86_64_GLOB_DAT 6 /* Set GOT entry to data address. */ +#define R_X86_64_JMP_SLOT 7 /* Set GOT entry to code address. */ +#define R_X86_64_RELATIVE 8 /* Add load address of shared object. */ +#define R_X86_64_GOTPCREL 9 /* Add 32 bit signed pcrel offset to GOT. */ +#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */ +#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */ +#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */ +#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative symbol value */ +#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */ +#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative symbol value */ -#define R_386_COUNT 11 /* Count of defined relocation types. */ +#define R_X86_64_COUNT 16 /* Count of defined relocation types. */ /* Define "machine" characteristics */ -#define ELF_TARG_CLASS ELFCLASS32 +#define ELF_TARG_CLASS ELFCLASS64 #define ELF_TARG_DATA ELFDATA2LSB -#define ELF_TARG_MACH EM_386 +#define ELF_TARG_MACH EM_X86_64 #define ELF_TARG_VER 1 #ifdef _KERNEL To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 3:21:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C5EC37B404; Sat, 21 Sep 2002 03:21:21 -0700 (PDT) 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 ACC5E37B401 for ; Sat, 21 Sep 2002 03:21:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A34E43E75 for ; Sat, 21 Sep 2002 03:21:20 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8LALKCo025761 for ; Sat, 21 Sep 2002 03:21:20 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8LALKOD025758 for perforce@freebsd.org; Sat, 21 Sep 2002 03:21:20 -0700 (PDT) Date: Sat, 21 Sep 2002 03:21:20 -0700 (PDT) Message-Id: <200209211021.g8LALKOD025758@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17850 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17850 Change 17850 by peter@peter_overcee on 2002/09/21 03:21:19 Update for x86-64. Still *very* subject to change. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/frame.h#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/frame.h#4 (text+ko) ==== @@ -49,78 +49,102 @@ */ struct trapframe { - int tf_fs; - int tf_es; - int tf_ds; - int tf_edi; - int tf_esi; - int tf_ebp; - int tf_isp; - int tf_ebx; - int tf_edx; - int tf_ecx; - int tf_eax; - int tf_trapno; + int64_t tf_gs; + int64_t tf_fs; + int64_t tf_es; + int64_t tf_ds; + int64_t tf_r15; + int64_t tf_r14; + int64_t tf_r13; + int64_t tf_r12; + int64_t tf_r11; + int64_t tf_r10; + int64_t tf_r9; + int64_t tf_r8; + int64_t tf_rdi; + int64_t tf_rsi; + int64_t tf_rbp; + int64_t tf_rbx; + int64_t tf_rdx; + int64_t tf_rcx; + int64_t tf_rax; + int64_t tf_trapno; /* below portion defined in 386 hardware */ - int tf_err; - int tf_eip; - int tf_cs; - int tf_eflags; + int64_t tf_err; + int64_t tf_rip; + int64_t tf_cs; + int64_t tf_rflags; /* below only when crossing rings (e.g. user to kernel) */ - int tf_esp; - int tf_ss; + int64_t tf_rsp; + int64_t tf_ss; }; /* Interrupt stack frame */ struct intrframe { - int if_vec; - int if_fs; - int if_es; - int if_ds; - int if_edi; - int if_esi; - int if_ebp; - int :32; - int if_ebx; - int if_edx; - int if_ecx; - int if_eax; - int :32; /* for compat with trap frame - trapno */ - int :32; /* for compat with trap frame - err */ + int64_t if_vec; + int64_t if_gs; + int64_t if_fs; + int64_t if_es; + int64_t if_ds; + int64_t if_r15; + int64_t if_r14; + int64_t if_r13; + int64_t if_r12; + int64_t if_r11; + int64_t if_r10; + int64_t if_r9; + int64_t if_r8; + int64_t if_rdi; + int64_t if_rsi; + int64_t if_rbp; + int64_t if_rbx; + int64_t if_rdx; + int64_t if_rcx; + int64_t if_rax; + int64_t :64; /* for compat with trap frame - trapno */ + int64_t :64; /* for compat with trap frame - err */ /* below portion defined in 386 hardware */ - int if_eip; - int if_cs; - int if_eflags; + int64_t if_rip; + int64_t if_cs; + int64_t if_rflags; /* below only when crossing rings (e.g. user to kernel) */ - int if_esp; - int if_ss; + int64_t if_rsp; + int64_t if_ss; }; /* frame of clock (same as interrupt frame) */ struct clockframe { - int cf_vec; - int cf_fs; - int cf_es; - int cf_ds; - int cf_edi; - int cf_esi; - int cf_ebp; - int :32; - int cf_ebx; - int cf_edx; - int cf_ecx; - int cf_eax; - int :32; /* for compat with trap frame - trapno */ - int :32; /* for compat with trap frame - err */ + int64_t cf_vec; + int64_t cf_gs; + int64_t cf_fs; + int64_t cf_es; + int64_t cf_ds; + int64_t cf_r15; + int64_t cf_r14; + int64_t cf_r13; + int64_t cf_r12; + int64_t cf_r11; + int64_t cf_r10; + int64_t cf_r9; + int64_t cf_r8; + int64_t cf_rdi; + int64_t cf_rsi; + int64_t cf_rbp; + int64_t cf_rbx; + int64_t cf_rdx; + int64_t cf_rcx; + int64_t cf_rax; + int64_t :64; /* for compat with trap frame - trapno */ + int64_t :64; /* for compat with trap frame - err */ /* below portion defined in 386 hardware */ - int cf_eip; - int cf_cs; - int cf_eflags; + int64_t cf_rip; + int64_t cf_cs; + int64_t cf_rflags; /* below only when crossing rings (e.g. user to kernel) */ - int cf_esp; - int cf_ss; + int64_t cf_rsp; + int64_t cf_ss; }; int kdb_trap(int, int, struct trapframe *); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 3:27:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 960D937B404; Sat, 21 Sep 2002 03:27:32 -0700 (PDT) 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 48D9237B401 for ; Sat, 21 Sep 2002 03:27:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0739B43E3B for ; Sat, 21 Sep 2002 03:27:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8LARVCo027574 for ; Sat, 21 Sep 2002 03:27:31 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8LARV58027571 for perforce@freebsd.org; Sat, 21 Sep 2002 03:27:31 -0700 (PDT) Date: Sat, 21 Sep 2002 03:27:31 -0700 (PDT) Message-Id: <200209211027.g8LARV58027571@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17851 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17851 Change 17851 by peter@peter_overcee on 2002/09/21 03:27:15 nuke tf_isp, it wasn't worth a lot. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/reg.h#2 edit .. //depot/projects/hammer/sys/x86_64/include/signal.h#3 edit .. //depot/projects/hammer/sys/x86_64/include/ucontext.h#2 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#17 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/reg.h#2 (text+ko) ==== @@ -88,7 +88,6 @@ unsigned int r_edi; unsigned int r_esi; unsigned int r_ebp; - unsigned int r_isp; unsigned int r_ebx; unsigned int r_edx; unsigned int r_ecx; ==== //depot/projects/hammer/sys/x86_64/include/signal.h#3 (text+ko) ==== @@ -77,7 +77,6 @@ int sc_edi; int sc_esi; int sc_ebp; - int sc_isp; int sc_ebx; int sc_edx; int sc_ecx; ==== //depot/projects/hammer/sys/x86_64/include/ucontext.h#2 (text+ko) ==== @@ -45,7 +45,6 @@ int mc_edi; int mc_esi; int mc_ebp; - int mc_isp; int mc_ebx; int mc_edx; int mc_ecx; ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#17 (text+ko) ==== @@ -1502,7 +1502,6 @@ mcp->mc_edi = tp->tf_edi; mcp->mc_esi = tp->tf_esi; mcp->mc_ebp = tp->tf_ebp; - mcp->mc_isp = tp->tf_isp; mcp->mc_ebx = tp->tf_ebx; mcp->mc_edx = tp->tf_edx; mcp->mc_ecx = tp->tf_ecx; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 3:46: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BE9C37B404; Sat, 21 Sep 2002 03:46:03 -0700 (PDT) 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 E92E537B401 for ; Sat, 21 Sep 2002 03:46:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F46143E42 for ; Sat, 21 Sep 2002 03:46:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8LAk2Co031299 for ; Sat, 21 Sep 2002 03:46:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8LAk2Xx031294 for perforce@freebsd.org; Sat, 21 Sep 2002 03:46:02 -0700 (PDT) Date: Sat, 21 Sep 2002 03:46:02 -0700 (PDT) Message-Id: <200209211046.g8LAk2Xx031294@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17852 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17852 Change 17852 by peter@peter_overcee on 2002/09/21 03:45:48 Define x86-64 arch defined MSR's. We need to be able to get to the EFER MSR to turn on long mode. This would be useful. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/specialreg.h#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/specialreg.h#3 (text+ko) ==== @@ -124,6 +124,9 @@ #define MSR_PERFCTR0 0x0c1 #define MSR_PERFCTR1 0x0c2 #define MSR_MTRRcap 0x0fe +#define MSR_SYSENTER_CS 0x174 +#define MSR_SYSENTER_ESP 0x175 +#define MSR_SYSENTER_EIP 0x176 #define MSR_MCG_CAP 0x179 #define MSR_MCG_STATUS 0x17a #define MSR_MCG_CTL 0x17b @@ -139,6 +142,7 @@ #define MSR_MTRR64kBase 0x250 #define MSR_MTRR16kBase 0x258 #define MSR_MTRR4kBase 0x268 +#define MSR_PAT 0x277 #define MSR_MTRRdefType 0x2ff #define MSR_MC0_CTL 0x400 #define MSR_MC0_STATUS 0x401 @@ -276,4 +280,29 @@ #define AMD_WT_ALLOC_PRE 0x20000 /* programmable range enable */ #define AMD_WT_ALLOC_FRE 0x10000 /* fixed (A0000-FFFFF) range enable */ +/* X86-64 MSR's */ +#define MSR_EFER 0xc0000080 /* extended features */ +#define MSR_STAR 0xc0000081 /* legacy mode SYSCALL target/cs/ss */ +#define MSR_LSTAR 0xc0000082 /* long mode SYSCALL target rip */ +#define MSR_CSTAR 0xc0000083 /* compat mode SYSCALL target rip */ +#define MSR_SF_MASK 0xc0000084 /* syscall flags mask */ +#define MSR_FSBASE 0xc0000100 /* base address of the %fs "segment" */ +#define MSR_GSBASE 0xc0000101 /* base address of the %gs "segment" */ +#define MSR_KGSBASE 0xc0000102 /* base address of the kernel %gs */ +#define MSR_PERFEVSEL0 0xc0010000 +#define MSR_PERFEVSEL1 0xc0010001 +#define MSR_PERFEVSEL2 0xc0010002 +#define MSR_PERFEVSEL3 0xc0010003 +#define MSR_PERFCTR0 0xc0010004 +#define MSR_PERFCTR1 0xc0010005 +#define MSR_PERFCTR2 0xc0010006 +#define MSR_PERFCTR3 0xc0010007 +#define MSR_SYSCFG 0xc0010010 +#define MSR_IORRBASE0 0xc0010016 +#define MSR_IORRMASK0 0xc0010017 +#define MSR_IORRBASE1 0xc0010018 +#define MSR_IORRMASK1 0xc0010019 +#define MSR_TOP_MEM 0xc001001a /* boundary for ram below 4G */ +#define MSR_TOP_MEM2 0xc001001d /* boundary for ram above 4G */ + #endif /* !_MACHINE_SPECIALREG_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 4: 3:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C028337B404; Sat, 21 Sep 2002 04:03:34 -0700 (PDT) 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 6865D37B401 for ; Sat, 21 Sep 2002 04:03:34 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2999843E3B for ; Sat, 21 Sep 2002 04:03:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8LB3YCo039077 for ; Sat, 21 Sep 2002 04:03:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8LB3Xnj039074 for perforce@freebsd.org; Sat, 21 Sep 2002 04:03:33 -0700 (PDT) Date: Sat, 21 Sep 2002 04:03:33 -0700 (PDT) Message-Id: <200209211103.g8LB3Xnj039074@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17853 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17853 Change 17853 by peter@peter_overcee on 2002/09/21 04:03:03 add EFER bits so we can actually turn long mode on. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/specialreg.h#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/specialreg.h#4 (text+ko) ==== @@ -75,6 +75,14 @@ #define CR4_XMM 0x00000400 /* enable SIMD/MMX2 to use except 16 */ /* + * Bits in x86-64 special registers. EFER is 64 bits wide. + */ +#define EFER_SCE 0x000000001 /* System Call Extensions (R/W) */ +#define EFER_LME 0x000000100 /* Long mode enable (R/W) */ +#define EFER_LMA 0x000000400 /* Long mode active (R) */ +#define EFER_NXE 0x000000800 /* PTE No-Execute bit enable (R/W) */ + +/* * CPUID instruction features register */ #define CPUID_FPU 0x00000001 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 4:22:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0648F37B404; Sat, 21 Sep 2002 04:22:23 -0700 (PDT) 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 8666F37B401 for ; Sat, 21 Sep 2002 04:22:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3AC0C43E65 for ; Sat, 21 Sep 2002 04:22:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8LBMLCo046395 for ; Sat, 21 Sep 2002 04:22:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8LBMLsh046371 for perforce@freebsd.org; Sat, 21 Sep 2002 04:22:21 -0700 (PDT) Date: Sat, 21 Sep 2002 04:22:21 -0700 (PDT) Message-Id: <200209211122.g8LBMLsh046371@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17854 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17854 Change 17854 by peter@peter_overcee on 2002/09/21 04:21:18 partial updates for new segmentation formats. I'm too tired to make sense of this stuff yet. :-] Affected files ... .. //depot/projects/hammer/sys/x86_64/include/segments.h#4 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#18 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/segments.h#4 (text+ko) ==== @@ -70,7 +70,8 @@ unsigned sd_dpl:2 ; /* segment descriptor priority level */ unsigned sd_p:1 ; /* segment descriptor present */ unsigned sd_hilimit:4 ; /* segment extent (msb) */ - unsigned sd_xx:2 ; /* unused */ + unsigned sd_xx:1 ; /* unused */ + unsigned sd_l:2 ; /* long mode (cs only) */ unsigned sd_def32:1 ; /* default 32 vs 16 bit size */ unsigned sd_gran:1 ; /* limit granularity (byte/page units)*/ unsigned sd_hibase:8 ; /* segment base address (msb) */ @@ -82,12 +83,14 @@ struct gate_descriptor { unsigned gd_looffset:16 ; /* gate offset (lsb) */ unsigned gd_selector:16 ; /* gate segment selector */ - unsigned gd_stkcpy:5 ; /* number of stack wds to cpy */ - unsigned gd_xx:3 ; /* unused */ + unsigned gd_ist:3 ; /* IST table index */ + unsigned gd_xx:5 ; /* unused */ unsigned gd_type:5 ; /* segment type */ unsigned gd_dpl:2 ; /* segment descriptor priority level */ unsigned gd_p:1 ; /* segment descriptor present */ unsigned gd_hioffset:16 ; /* gate offset (msb) */ + unsigned gd_hihioffset:32 ; /* gate offset (bits 32-63) */ + unsigned gd_rsvd:32 ; /* reserved */ } ; /* @@ -100,21 +103,12 @@ /* system segments and gate types */ #define SDT_SYSNULL 0 /* system null */ -#define SDT_SYS286TSS 1 /* system 286 TSS available */ -#define SDT_SYSLDT 2 /* system local descriptor table */ -#define SDT_SYS286BSY 3 /* system 286 TSS busy */ -#define SDT_SYS286CGT 4 /* system 286 call gate */ -#define SDT_SYSTASKGT 5 /* system task gate */ -#define SDT_SYS286IGT 6 /* system 286 interrupt gate */ -#define SDT_SYS286TGT 7 /* system 286 trap gate */ -#define SDT_SYSNULL2 8 /* system null again */ -#define SDT_SYS386TSS 9 /* system 386 TSS available */ -#define SDT_SYSNULL3 10 /* system null again */ -#define SDT_SYS386BSY 11 /* system 386 TSS busy */ -#define SDT_SYS386CGT 12 /* system 386 call gate */ -#define SDT_SYSNULL4 13 /* system null again */ -#define SDT_SYS386IGT 14 /* system 386 interrupt gate */ -#define SDT_SYS386TGT 15 /* system 386 trap gate */ +#define SDT_SYSLDT 2 /* system 64 bit local descriptor table */ +#define SDT_SYSTSS 9 /* system available 64 bit TSS */ +#define SDT_SYSBSY 11 /* system busy 64 bit TSS */ +#define SDT_SYSCGT 12 /* system 64 bit call gate */ +#define SDT_SYSIGT 14 /* system 64 bit interrupt gate */ +#define SDT_SYSTGT 15 /* system 64 bit trap gate */ /* memory segment types */ #define SDT_MEMRO 16 /* memory read only */ ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#18 (text+ko) ==== @@ -684,7 +684,7 @@ { 0x0, /* segment base address */ sizeof(struct i386tss)-1,/* length - all address space */ - SDT_SYS386TSS, /* segment type */ + SDT_SYSTSS, /* segment type */ 0, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, @@ -711,7 +711,7 @@ /* GPANIC_SEL 6 Panic Tss Descriptor */ { (int) &dblfault_tss, /* segment base address */ sizeof(struct i386tss)-1,/* length - all address space */ - SDT_SYS386TSS, /* segment type */ + SDT_SYSTSS, /* segment type */ 0, /* segment descriptor priority level */ 1, /* segment descriptor present */ 0, 0, @@ -813,7 +813,7 @@ { ssd->ssd_base = (sd->sd_hibase << 24) | sd->sd_lobase; - ssd->ssd_limit = (sd->sd_hilimit << 16) | sd->sd_lolimit; + ssd->ssd_limit = (sd->sd_hilimit << 16) | sd->sd_Lolimit; ssd->ssd_type = sd->sd_type; ssd->ssd_dpl = sd->sd_dpl; ssd->ssd_p = sd->sd_p; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 11:18: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A90A837B404; Sat, 21 Sep 2002 11:17:59 -0700 (PDT) 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 36B4837B401; Sat, 21 Sep 2002 11:17:59 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41A7543E3B; Sat, 21 Sep 2002 11:17:55 -0700 (PDT) (envelope-from arr@watson.org) Received: from fledge.watson.org (localhost [127.0.0.1]) by fledge.watson.org (8.12.4/8.12.4) with ESMTP id g8LIHROn095964; Sat, 21 Sep 2002 14:17:27 -0400 (EDT) (envelope-from arr@watson.org) Received: from localhost (arr@localhost) by fledge.watson.org (8.12.5/8.12.5/Submit) with SMTP id g8LIHQLV095961; Sat, 21 Sep 2002 14:17:27 -0400 (EDT) X-Authentication-Warning: fledge.watson.org: arr owned process doing -bs Date: Sat, 21 Sep 2002 14:17:25 -0400 (EDT) From: "Andrew R. Reiter" To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17811 for review In-Reply-To: <200209210250.g8L2oO8L094711@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 20 Sep 2002, Peter Wemm wrote: :http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17811 : :Change 17811 by peter@peter_daintree on 2002/09/20 19:49:25 : : vm86 all gone sweeet :)) : :Affected files ... : :.. //depot/projects/hammer/sys/x86_64/include/sysarch.h#3 edit :.. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#3 edit :.. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#2 edit :.. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#4 edit :.. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#5 edit : :Differences ... : :==== //depot/projects/hammer/sys/x86_64/include/sysarch.h#3 (text+ko) ==== : :@@ -69,7 +69,6 @@ : int i386_set_ldt(int, union descriptor *, int); : int i386_get_ioperm(unsigned int, unsigned int *, int *); : int i386_set_ioperm(unsigned int, unsigned int, int); :-int i386_vm86(int, void *); : int i386_set_watch(int, unsigned int, int, int, struct dbreg *); : int i386_clr_watch(int, struct dbreg *); : __END_DECLS : :==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#3 (text+ko) ==== : :@@ -250,11 +250,6 @@ : : : /* :- * Include vm86 call routines, which want to call doreti. :- */ :-#include "i386/i386/vm86bios.s" :- :-/* : * Include what was once config+isa-dependent code. : * XXX it should be in a stand-alone file. It's still icu-dependent and : * belongs in i386/isa. : :==== //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#2 (text+ko) ==== : :@@ -72,7 +72,6 @@ : #endif : #include : #include :-#include : #include : : ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); :@@ -204,7 +203,6 @@ : : ASSYM(BC32SEL, GSEL(GBIOSCODE32_SEL, SEL_KPL)); : ASSYM(GPROC0_SEL, GPROC0_SEL); :-ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame)); : : ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock)); : ASSYM(MTX_RECURSECNT, offsetof(struct mtx, mtx_recurse)); : :==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#4 (text+ko) ==== : :@@ -149,12 +149,6 @@ : p0upa: .long 0 /* phys addr of proc0's UAREA */ : p0kpa: .long 0 /* phys addr of proc0's STACK */ : :-vm86phystk: .long 0 /* PA of vm86/bios stack */ :- :- .globl vm86paddr, vm86pa :-vm86paddr: .long 0 /* address of vm86 region */ :-vm86pa: .long 0 /* phys addr of vm86 region */ :- : #ifdef BDE_DEBUGGER : .globl _bdb_exists /* flag to indicate BDE debugger is present */ : _bdb_exists: .long 0 :@@ -745,14 +739,6 @@ : addl $KERNBASE, %esi : movl %esi, R(proc0kstack) : :- ALLOCPAGES(1) /* vm86/bios stack */ :- movl %esi,R(vm86phystk) :- :- ALLOCPAGES(3) /* pgtable + ext + IOPAGES */ :- movl %esi,R(vm86pa) :- addl $KERNBASE, %esi :- movl %esi, R(vm86paddr) :- : #ifdef SMP : /* Allocate cpu0's private data page */ : ALLOCPAGES(1) :@@ -811,23 +797,6 @@ : movl $ISA_HOLE_LENGTH>>PAGE_SHIFT, %ecx : fillkptphys($PG_RW) : :-/* Map space for the vm86 region */ :- movl R(vm86phystk), %eax :- movl $4, %ecx :- fillkptphys($PG_RW) :- :-/* Map page 0 into the vm86 page table */ :- movl $0, %eax :- movl $0, %ebx :- movl $1, %ecx :- fillkpt(R(vm86pa), $PG_RW|PG_U) :- :-/* ...likewise for the ISA hole */ :- movl $ISA_HOLE_START, %eax :- movl $ISA_HOLE_START>>PAGE_SHIFT, %ebx :- movl $ISA_HOLE_LENGTH>>PAGE_SHIFT, %ecx :- fillkpt(R(vm86pa), $PG_RW|PG_U) :- : #ifdef SMP : /* Map cpu0's private page into global kmem (4K @ cpu0prvpage) */ : movl R(cpu0pp), %eax : :==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#5 (text+ko) ==== : :@@ -114,7 +114,6 @@ : #include : #include : #include :-#include : #include : #include : :@@ -954,21 +953,17 @@ : { : int i, physmap_idx, pa_indx; : u_int basemem, extmem; :- struct vm86frame vmf; :- struct vm86context vmc; : vm_offset_t pa, physmap[PHYSMAP_SIZE]; : pt_entry_t *pte; : char *cp; : struct bios_smap *smap; : :- bzero(&vmf, sizeof(struct vm86frame)); : bzero(physmap, sizeof(physmap)); : : /* : * Perform "base memory" related probes & setup : */ :- vm86_intcall(0x12, &vmf); :- basemem = vmf.vmf_ax; :+#error "basemem = fetch from loader metadata" : if (basemem > 640) { : printf("Preposterous BIOS basemem of %uK, truncating to 640K\n", : basemem); :@@ -976,59 +971,12 @@ : } : : /* :- * XXX if biosbasemem is now < 640, there is a `hole' :- * between the end of base memory and the start of :- * ISA memory. The hole may be empty or it may :- * contain BIOS code or data. Map it read/write so :- * that the BIOS can write to it. (Memory from 0 to :- * the physical end of the kernel is mapped read-only :- * to begin with and then parts of it are remapped. :- * The parts that aren't remapped form holes that :- * remain read-only and are unused by the kernel. :- * The base memory area is below the physical end of :- * the kernel and right now forms a read-only hole. :- * The part of it from PAGE_SIZE to :- * (trunc_page(biosbasemem * 1024) - 1) will be :- * remapped and used by the kernel later.) :- * :- * This code is similar to the code used in :- * pmap_mapdev, but since no memory needs to be :- * allocated we simply change the mapping. :- */ :- for (pa = trunc_page(basemem * 1024); :- pa < ISA_HOLE_START; pa += PAGE_SIZE) :- pmap_kenter(KERNBASE + pa, pa); :- :- /* :- * if basemem != 640, map pages r/w into vm86 page table so :- * that the bios can scribble on it. :- */ :- pte = (pt_entry_t *)vm86paddr; :- for (i = basemem / 4; i < 160; i++) :- pte[i] = (i << PAGE_SHIFT) | PG_V | PG_RW | PG_U; :- :- /* :- * map page 1 R/W into the kernel page table so we can use it :- * as a buffer. The kernel will unmap this page later. :- */ :- pmap_kenter(KERNBASE + (1 << PAGE_SHIFT), 1); :- :- /* : * get memory map with INT 15:E820 : */ :- vmc.npages = 0; :- smap = (void *)vm86_addpage(&vmc, 1, KERNBASE + (1 << PAGE_SHIFT)); :- vm86_getptr(&vmc, (vm_offset_t)smap, &vmf.vmf_es, &vmf.vmf_di); :+#error "smap = fetch from loader metadata" : : physmap_idx = 0; :- vmf.vmf_ebx = 0; : do { :- vmf.vmf_eax = 0xE820; :- vmf.vmf_edx = SMAP_SIG; :- vmf.vmf_ecx = sizeof(struct bios_smap); :- i = vm86_datacall(0x15, &vmf, &vmc); :- if (i || vmf.vmf_eax != SMAP_SIG) :- break; : if (boothowto & RB_VERBOSE) : printf("SMAP type=%02x base=%08x %08x len=%08x %08x\n", : smap->type, :@@ -1072,51 +1020,9 @@ : physmap[physmap_idx] = smap->base; : physmap[physmap_idx + 1] = smap->base + smap->length; : next_run: ; :- } while (vmf.vmf_ebx != 0); :- :- if (physmap[1] != 0) :- goto physmap_done; :- :- /* :- * If we failed above, try memory map with INT 15:E801 :- */ :- vmf.vmf_ax = 0xE801; :- if (vm86_intcall(0x15, &vmf) == 0) { :- extmem = vmf.vmf_cx + vmf.vmf_dx * 64; :- } else { :-#if 0 :- vmf.vmf_ah = 0x88; :- vm86_intcall(0x15, &vmf); :- extmem = vmf.vmf_ax; :-#else :- /* :- * Prefer the RTC value for extended memory. :- */ :- extmem = rtcin(RTC_EXTLO) + (rtcin(RTC_EXTHI) << 8); :-#endif :- } :+ } #error "while not end of smap table from loader" : : /* :- * Special hack for chipsets that still remap the 384k hole when :- * there's 16MB of memory - this really confuses people that :- * are trying to use bus mastering ISA controllers with the :- * "16MB limit"; they only have 16MB, but the remapping puts :- * them beyond the limit. :- * :- * If extended memory is between 15-16MB (16-17MB phys address range), :- * chop it to 15MB. :- */ :- if ((extmem > 15 * 1024) && (extmem < 16 * 1024)) :- extmem = 15 * 1024; :- :- physmap[0] = 0; :- physmap[1] = basemem * 1024; :- physmap_idx = 2; :- physmap[physmap_idx] = 0x100000; :- physmap[physmap_idx + 1] = physmap[physmap_idx] + extmem * 1024; :- :-physmap_done: :- /* : * Now, physmap contains a map of physical memory. : */ : :@@ -1520,7 +1426,6 @@ : dblfault_tss.tss_cs = GSEL(GCODE_SEL, SEL_KPL); : dblfault_tss.tss_ldt = GSEL(GLDT_SEL, SEL_KPL); : :- vm86_initialize(); : getmemsize(first); : init_param2(physmem); : : -- Andrew R. Reiter arr@watson.org arr@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 11:59:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 336BA37B404; Sat, 21 Sep 2002 11:58:51 -0700 (PDT) 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 CED7337B401 for ; Sat, 21 Sep 2002 11:58:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07B8543E65 for ; Sat, 21 Sep 2002 11:58:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8LIwnCo032856 for ; Sat, 21 Sep 2002 11:58:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8LIwnd4032853 for perforce@freebsd.org; Sat, 21 Sep 2002 11:58:49 -0700 (PDT) Date: Sat, 21 Sep 2002 11:58:49 -0700 (PDT) Message-Id: <200209211858.g8LIwnd4032853@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17869 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17869 Change 17869 by peter@peter_overcee on 2002/09/21 11:58:46 IFC @17867 Affected files ... .. //depot/projects/hammer/bin/cp/cp.c#2 integrate .. //depot/projects/hammer/bin/ls/ls.c#3 integrate .. //depot/projects/hammer/etc/Makefile#3 integrate .. //depot/projects/hammer/etc/newsyslog.conf#3 integrate .. //depot/projects/hammer/etc/syslog.conf#3 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes2#4 integrate .. //depot/projects/hammer/include/fts.h#2 integrate .. //depot/projects/hammer/include/limits.h#2 integrate .. //depot/projects/hammer/include/stdlib.h#4 integrate .. //depot/projects/hammer/include/unistd.h#3 integrate .. //depot/projects/hammer/include/wchar.h#4 integrate .. //depot/projects/hammer/lib/libc/gen/fts.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/fts.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/stdio/fwprintf.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/local.h#4 integrate .. //depot/projects/hammer/lib/libc/stdio/stdio.3#3 integrate .. //depot/projects/hammer/lib/libc/stdio/swprintf.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/vswprintf.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/vwprintf.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/wprintf.3#1 branch .. //depot/projects/hammer/lib/libc/stdio/wprintf.c#1 branch .. //depot/projects/hammer/lib/libc/string/wcscat.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wcschr.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcscmp.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcscpy.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wcscspn.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcslcat.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcslcpy.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcslen.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcsncat.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wcsncmp.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcsncpy.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wcspbrk.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcsrchr.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcsspn.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcsstr.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wmemchr.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wmemcmp.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wmemcpy.c#3 integrate .. //depot/projects/hammer/lib/libc/string/wmemmove.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wmemset.c#2 integrate .. //depot/projects/hammer/share/man/man8/yp.8#3 integrate .. //depot/projects/hammer/sys/ddb/db_command.c#2 integrate .. //depot/projects/hammer/sys/ddb/ddb.h#3 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#2 integrate .. //depot/projects/hammer/sys/dev/awi/awi_wep.c#2 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/hammer/sys/dev/null/null.c#2 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpoio.c#2 integrate .. //depot/projects/hammer/sys/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/hammer/sys/i386/apm/apm.c#2 integrate .. //depot/projects/hammer/sys/i386/include/cpufunc.h#2 integrate .. //depot/projects/hammer/sys/i386/isa/clock.c#3 integrate .. //depot/projects/hammer/sys/modules/Makefile#4 integrate .. //depot/projects/hammer/sys/net/bpf.c#3 integrate .. //depot/projects/hammer/sys/pc98/pc98/clock.c#2 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/hammer/sys/sparc64/include/bus.h#3 integrate .. //depot/projects/hammer/sys/sys/_posix.h#2 integrate .. //depot/projects/hammer/sys/sys/syslimits.h#2 integrate .. //depot/projects/hammer/sys/sys/unistd.h#2 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#3 integrate .. //depot/projects/hammer/usr.bin/find/find.c#2 integrate .. //depot/projects/hammer/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c#2 integrate .. //depot/projects/hammer/usr.sbin/mtree/create.c#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/match.c#2 integrate Differences ... ==== //depot/projects/hammer/bin/cp/cp.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.40 2002/07/23 00:42:56 johan Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.41 2002/09/21 01:28:33 wollman Exp $"); /* * Cp copies source files to target files. @@ -92,7 +92,7 @@ enum op { FILE_TO_FILE, FILE_TO_DIR, DIR_TO_DNE }; static int copy(char *[], enum op, int); -static int mastercmp(const FTSENT **, const FTSENT **); +static int mastercmp(const FTSENT * const *, const FTSENT * const *); int main(int argc, char *argv[]) @@ -484,7 +484,7 @@ * files first reduces seeking. */ int -mastercmp(const FTSENT **a, const FTSENT **b) +mastercmp(const FTSENT * const *a, const FTSENT * const *b) { int a_info, b_info; ==== //depot/projects/hammer/bin/ls/ls.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.65 2002/08/25 13:01:45 charnier Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.66 2002/09/21 01:28:36 wollman Exp $"); #include #include @@ -82,7 +82,7 @@ static void display(FTSENT *, FTSENT *); static u_quad_t makenines(u_long); -static int mastercmp(const FTSENT **, const FTSENT **); +static int mastercmp(const FTSENT * const *, const FTSENT * const *); static void traverse(int, char **, int); static void (*printfcn)(DISPLAY *); @@ -759,7 +759,7 @@ * All other levels use the sort function. Error entries remain unsorted. */ static int -mastercmp(const FTSENT **a, const FTSENT **b) +mastercmp(const FTSENT * const *a, const FTSENT * const *b) { int a_info, b_info; ==== //depot/projects/hammer/etc/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.293 2002/09/20 22:12:27 markm Exp $ +# $FreeBSD: src/etc/Makefile,v 1.294 2002/09/21 12:07:35 markm Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -136,7 +136,7 @@ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ ${DESTDIR}/var/log/cron ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ - ${DESTDIR}/var/log/ftp.log + ${DESTDIR}/var/log/xferlog ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \ ${DESTDIR}/var/log/lpd-errs ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \ ==== //depot/projects/hammer/etc/newsyslog.conf#3 (text+ko) ==== @@ -1,5 +1,5 @@ # configuration file for newsyslog -# $FreeBSD: src/etc/newsyslog.conf,v 1.41 2002/09/20 22:10:01 markm Exp $ +# $FreeBSD: src/etc/newsyslog.conf,v 1.42 2002/09/21 12:07:35 markm Exp $ # # Note: some sites will want to select more restrictive protections than the # defaults. In particular, it may be desirable to switch many of the 644 @@ -13,7 +13,7 @@ /var/log/auth.log 600 7 100 * J /var/log/kerberos.log 600 7 100 * J /var/log/lpd-errs 644 7 100 * J -/var/log/ftp.log 600 7 100 * J +/var/log/xferlog 600 7 100 * J /var/log/maillog 640 7 * @T00 J /var/log/sendmail.st 640 10 * 168 B /var/log/messages 644 5 100 * J ==== //depot/projects/hammer/etc/syslog.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/syslog.conf,v 1.22 2002/09/20 22:10:01 markm Exp $ +# $FreeBSD: src/etc/syslog.conf,v 1.23 2002/09/21 12:07:35 markm Exp $ # # Spaces ARE valid field separators in this file. However, # other *nix-like systems still insist on using tabs as field @@ -11,7 +11,7 @@ auth.info;authpriv.info /var/log/auth.log mail.info /var/log/maillog lpr.info /var/log/lpd-errs -ftp.info /var/log/ftp.log +ftp.info /var/log/xferlog cron.* /var/log/cron *.emerg * # uncomment this to log all writes to /dev/console to /var/log/console.log ==== //depot/projects/hammer/games/fortune/datfiles/fortunes2#4 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.48 2002/09/11 11:21:36 tg Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes2,v 1.49 2002/09/21 16:13:20 schweikh Exp $ % ======================================================================= @@ -30593,7 +30593,7 @@ Many a town that didn't have enough work to support a single lawyer can easily support two or more. % -Many a writer seems to thing he is never profound +Many a writer seems to think he is never profound except when he can't understand his own meaning. -- George D. Prentice % ==== //depot/projects/hammer/include/fts.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)fts.h 8.3 (Berkeley) 8/14/94 - * $FreeBSD: src/include/fts.h,v 1.6 2002/03/26 01:35:05 bde Exp $ + * $FreeBSD: src/include/fts.h,v 1.7 2002/09/21 01:28:36 wollman Exp $ */ #ifndef _FTS_H_ @@ -47,7 +47,7 @@ int fts_pathlen; /* sizeof(path) */ int fts_nitems; /* elements in the sort array */ int (*fts_compar) /* compare function */ - (const struct _ftsent **, const struct _ftsent **); + (const struct _ftsent * const *, const struct _ftsent * const *); #define FTS_COMFOLLOW 0x001 /* follow command line symlinks */ #define FTS_LOGICAL 0x002 /* logical walk */ @@ -62,6 +62,7 @@ #define FTS_NAMEONLY 0x100 /* (private) child names only */ #define FTS_STOP 0x200 /* (private) unrecoverable error */ int fts_options; /* fts_open options, global flags */ + void *fts_clientptr; /* thunk for sort function */ } FTS; typedef struct _ftsent { @@ -113,7 +114,8 @@ u_short fts_instr; /* fts_set() instructions */ struct stat *fts_statp; /* stat(2) information */ - char fts_name[1]; /* file name */ + char *fts_name; /* file name */ + FTS *fts_fts; /* back pointer to main FTS */ } FTSENT; #include @@ -121,10 +123,15 @@ __BEGIN_DECLS FTSENT *fts_children(FTS *, int); int fts_close(FTS *); +void *fts_get_clientptr(FTS *); +#define fts_get_clientptr(fts) ((fts)->fts_clientptr) +FTS *fts_get_stream(FTSENT *); +#define fts_get_stream(ftsent) ((ftsent)->fts_fts) FTS *fts_open(char * const *, int, - int (*)(const FTSENT **, const FTSENT **)); + int (*)(const FTSENT * const *, const FTSENT * const *)); FTSENT *fts_read(FTS *); int fts_set(FTS *, FTSENT *, int); +void fts_set_clientptr(FTS *, void *); __END_DECLS #endif /* !_FTS_H_ */ ==== //depot/projects/hammer/include/limits.h#2 (text+ko) ==== @@ -31,14 +31,14 @@ * SUCH DAMAGE. * * @(#)limits.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/include/limits.h,v 1.11 2001/06/18 20:24:18 wollman Exp $ + * $FreeBSD: src/include/limits.h,v 1.12 2002/09/21 02:00:44 wollman Exp $ */ #ifndef _LIMITS_H_ #define _LIMITS_H_ -#include +#include -#ifndef _ANSI_SOURCE +#if __POSIX_VISIBLE #define _POSIX_ARG_MAX 4096 #define _POSIX_CHILD_MAX 6 #define _POSIX_LINK_MAX 8 @@ -61,11 +61,9 @@ #define _POSIX2_EXPR_NEST_MAX 32 #define _POSIX2_LINE_MAX 2048 #define _POSIX2_RE_DUP_MAX 255 +#endif -#define _XOPEN_IOV_MAX 16 - -#ifdef _P1003_1B_VISIBLE - +#if __POSIX_VISIBLE >= 199309 #define _POSIX_AIO_LISTIO_MAX 16 #define _POSIX_AIO_MAX 1 #define _POSIX_DELAYTIMER_MAX 32 @@ -76,12 +74,14 @@ #define _POSIX_SEM_VALUE_MAX 32767 #define _POSIX_SIGQUEUE_MAX 32 #define _POSIX_TIMER_MAX 32 +#endif +#if __POSIX_VISIBLE >= 200112 +#define _POSIX_HOST_NAME_MAX 255 #endif -#endif /* !_ANSI_SOURCE */ - -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) || defined(_XOPEN_SOURCE) +#if __XSI_VISIBLE +#define _XOPEN_IOV_MAX 16 #define PASS_MAX 128 /* _PASSWORD_LEN from */ #define NL_ARGMAX 99 /* max # of position args for printf */ @@ -93,7 +93,7 @@ #endif #include -#if !defined(_ANSI_SOURCE) +#if __POSIX_VISIBLE #include #endif ==== //depot/projects/hammer/include/stdlib.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.42 2002/09/10 02:02:49 wollman Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.43 2002/09/21 02:03:58 wollman Exp $ */ #ifndef _STDLIB_H_ @@ -40,7 +40,7 @@ #include #include -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#if __BSD_VISIBLE #ifndef _RUNE_T_DECLARED typedef __rune_t rune_t; #define _RUNE_T_DECLARED @@ -69,16 +69,6 @@ long rem; /* remainder */ } ldiv_t; -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -#ifdef __LONG_LONG_SUPPORTED -/* LONGLONG */ -typedef struct { - long long quot; - long long rem; -} lldiv_t; -#endif -#endif - #ifndef NULL #define NULL 0 #endif @@ -92,7 +82,6 @@ #define MB_CUR_MAX __mb_cur_max __BEGIN_DECLS -void _Exit(int) __dead2; void abort(void) __dead2; int abs(int) __pure2; int atexit(void (*)(void)); @@ -109,53 +98,137 @@ long labs(long) __pure2; ldiv_t ldiv(long, long) __pure2; void *malloc(size_t); +int mblen(const char *, size_t); +size_t mbstowcs(wchar_t *__restrict , const char *__restrict, size_t); +int mbtowc(wchar_t * __restrict, const char * __restrict, size_t); void qsort(void *, size_t, size_t, int (*)(const void *, const void *)); int rand(void); void *realloc(void *, size_t); void srand(unsigned); -double strtod(const char * __restrict, char ** __restrict); -long strtol(const char * __restrict, char ** __restrict, int); +double strtod(const char *__restrict, char **__restrict); +/* float strtof(const char *__restrict, char **__restrict); */ +long strtol(const char *__restrict, char **__restrict, int); +/* long double + strtold(const char *__restrict, char **__restrict); */ unsigned long strtoul(const char * __restrict, char ** __restrict, int); int system(const char *); - -int mblen(const char *, size_t); -size_t mbstowcs(wchar_t * __restrict , const char * __restrict, size_t); int wctomb(char *, wchar_t); -int mbtowc(wchar_t * __restrict, const char * __restrict, size_t); size_t wcstombs(char * __restrict, const wchar_t * __restrict, size_t); -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -extern const char *_malloc_options; -extern void (*_malloc_message)(const char *p1, const char *p2, const char *p3, const char *p4); +/* + * Functions added in C99 which we make conditionally available in the + * BSD^C89 namespace if the compiler supports `long long'. + * The #if test is more complicated than it ought to be because + * __BSD_VISIBLE implies __ISO_C_VISIBLE == 1999 *even if* `long long' + * is not supported in the compilation environment (which therefore means + * that it can't really be ISO C99). + * + * (The only other extension made by C99 in thie header is _Exit().) + */ +#if __ISO_C_VISIBLE >= 1999 +#ifdef __LONG_LONG_SUPPORTED +/* LONGLONG */ +typedef struct { + long long quot; + long long rem; +} lldiv_t; + +/* LONGLONG */ +long long + atoll(const char *); +/* LONGLONG */ +long long + llabs(long long) __pure2; +/* LONGLONG */ +lldiv_t lldiv(long long, long long) __pure2; +/* LONGLONG */ +long long + strtoll(const char *__restrict, char **__restrict, int); +/* LONGLONG */ +unsigned long long + strtoull(const char *__restrict, char **__restrict, int); +#endif /* __LONG_LONG_SUPPORTED */ + +void _Exit(int) __dead2; +#endif /* __ISO_C_VISIBLE >= 1999 */ -int putenv(const char *); +/* + * Extensions made by POSIX relative to C. We don't know yet which edition + * of POSIX made these extensions, so assume they've always been there until + * research can be done. + */ +#if __POSIX_VISIBLE /* >= ??? */ +/* int posix_memalign(void **, size_t, size_t); (ADV) */ +int rand_r(unsigned *); /* (TSF) */ int setenv(const char *, const char *, int); +void unsetenv(const char *); +#endif +/* + * The only changes to the XSI namespace in revision 6 were the deletion + * of the ttyslot() and valloc() functions, which FreeBSD never declared + * in this header. For revision 7, ecvt(), fcvt(), and gcvt(), which + * FreeBSD also does not have, and mktemp(), are to be deleted. + */ +#if __XSI_VISIBLE +/* XXX XSI requires pollution from here. We'd rather not. */ +/* long a64l(const char *); */ double drand48(void); +/* char *ecvt(double, int, int *__restrict, int *__restrict); */ double erand48(unsigned short[3]); +/* char *fcvt(double, int, int *__restrict, int *__restrict); */ +/* char *gcvt(double, int, int *__restrict, int *__restrict); */ +#ifndef _GETSUBOPT_DECLARED +int getsubopt(char **, char *const *, char **); +#define _GETSUBOPT_DECLARED +#endif +/* int grantpt(int); */ +char *initstate(unsigned long /* XSI requires u_int */, char *, long); long jrand48(unsigned short[3]); +/* char *l64a(long); */ void lcong48(unsigned short[7]); long lrand48(void); +#ifndef _MKSTEMP_DECLARED +int mkstemp(char *); +#define _MKSTEMP_DECLARED +#endif +#ifndef _MKTEMP_DECLARED +char *mktemp(char *); +#define _MKTEMP_DECLARED +#endif long mrand48(void); long nrand48(unsigned short[3]); +/* int posix_openpt(int); */ +/* char *ptsname(int); */ +int putenv(const char *); +long random(void); +char *realpath(const char *, char resolved_path[]); unsigned short *seed48(unsigned short[3]); +#ifndef _SETKEY_DECLARED +int setkey(const char *); +#define _SETKEY_DECLARED +#endif +char *setstate(/* const */ char *); void srand48(long); +void srandom(unsigned long); +/* int unlockpt(int); */ +#endif /* __XSI_VISIBLE */ + +#if __BSD_VISIBLE +extern const char *_malloc_options; +extern void (*_malloc_message)(const char *, const char *, const char *, const char *); + void *alloca(size_t); /* built-in for gcc */ - /* getcap(3) functions */ __uint32_t arc4random(void); void arc4random_addrandom(unsigned char *dat, int datlen); void arc4random_stir(void); -#ifdef __LONG_LONG_SUPPORTED -/* LONGLONG */ -long long - atoll(const char *); -#endif char *getbsize(int *, long *); + /* getcap(3) functions */ char *cgetcap(char *, const char *, int); int cgetclose(void); int cgetent(char **, char **, const char *); @@ -174,44 +247,23 @@ getprogname(void); int heapsort(void *, size_t, size_t, int (*)(const void *, const void *)); -char *initstate(unsigned long, char *, long); -#ifdef __LONG_LONG_SUPPORTED -/* LONGLONG */ -long long - llabs(long long) __pure2; -lldiv_t lldiv(long long, long long) __pure2; -#endif int mergesort(void *, size_t, size_t, int (*)(const void *, const void *)); void qsort_r(void *, size_t, size_t, void *, int (*)(void *, const void *, const void *)); int radixsort(const unsigned char **, int, const unsigned char *, unsigned); -int rand_r(unsigned *); -long random(void); void *reallocf(void *, size_t); -char *realpath(const char *, char resolved_path[]); void setprogname(const char *); -char *setstate(char *); int sradixsort(const unsigned char **, int, const unsigned char *, unsigned); void sranddev(void); -void srandom(unsigned long); void srandomdev(void); -#ifdef __LONG_LONG_SUPPORTED -/* LONGLONG */ -long long - strtoll(const char * __restrict, char ** __restrict, int); -#endif + +/* Deprecated interfaces, to be removed in FreeBSD 6.0. */ __int64_t strtoq(const char *, char **, int); -#ifdef __LONG_LONG_SUPPORTED -/* LONGLONG */ -unsigned long long - strtoull(const char * __restrict, char ** __restrict, int); -#endif __uint64_t strtouq(const char *, char **, int); -void unsetenv(const char *); -#endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */ +#endif /* __BSD_VISIBLE */ __END_DECLS #endif /* !_STDLIB_H_ */ ==== //depot/projects/hammer/include/unistd.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.57 2002/09/06 11:23:32 tjr Exp $ + * $FreeBSD: src/include/unistd.h,v 1.58 2002/09/21 02:08:32 wollman Exp $ */ #ifndef _UNISTD_H_ @@ -81,6 +81,230 @@ #define F_TEST 3 /* test a section for locks by other procs */ #endif +/* + * POSIX options and option groups we unconditionally do or don't + * implement. This list includes those options which are exclusively + * implemented (or not) in user mode. Please keep this list in + * alphabetical order. + * + * Anything which is defined as zero below **must** have an + * implementation for the corresponding sysconf() which is able to + * determine conclusively whether or not the feature is supported. + * Anything which is defined as other than -1 below **must** have + * complete headers, types, and function declarations as specified by + * the POSIX standard; however, if the relevant sysconf() function + * returns -1, the functions may be stubbed out. + */ +#define _POSIX_BARRIERS -1 +#define _POSIX_READER_WRITER_LOCKS 200112L +#define _POSIX_REGEXP 1 +#define _POSIX_SHELL 1 +#define _POSIX_SPAWN -1 +#define _POSIX_SPIN_LOCKS -1 +#define _POSIX_THREAD_ATTR_STACKADDR 200112L +#define _POSIX_THREAD_ATTR_STACKSIZE 200112L +#define _POSIX_THREAD_CPUTIME -1 +#define _POSIX_THREAD_PRIO_INHERIT 200112L +#define _POSIX_THREAD_PRIO_PROTECT 200112L +#define _POSIX_THREAD_PRIORITY_SCHEDULING 200112L +#define _POSIX_THREAD_PROCESS_SHARED -1 +#define _POSIX_THREAD_SAFE_FUNCTIONS -1 +#define _POSIX_THREAD_SPORADIC_SERVER -1 +#define _POSIX_THREADS 200112L +#define _POSIX_TRACE -1 +#define _POSIX_TRACE_EVENT_FILTER -1 +#define _POSIX_TRACE_INHERIT -1 +#define _POSIX_TRACE_LOG -1 +#define _POSIX2_C_BIND 200112L /* mandatory */ +#define _POSIX2_C_DEV -1 /* need c99 utility */ +#define _POSIX2_CHAR_TERM 1 +#define _POSIX2_FORT_DEV -1 /* need fort77 utility */ +#define _POSIX2_FORT_RUN 200112L +#define _POSIX2_LOCALEDEF -1 +#define _POSIX2_PBS -1 +#define _POSIX2_PBS_ACCOUNTING -1 +#define _POSIX2_PBS_CHECKPOINT -1 +#define _POSIX2_PBS_LOCATE -1 +#define _POSIX2_PBS_MESSAGE -1 +#define _POSIX2_PBS_TRACK -1 +#define _POSIX2_SW_DEV -1 /* XXX ??? */ +#define _POSIX2_UPE 200112L +#define _V6_ILP32_OFF32 -1 +#define _V6_ILP32_OFFBIG 0 +#define _V6_LP64_OFF64 0 +#define _V6_LPBIG_OFFBIG -1 + +#if __XSI_VISIBLE +#define _XOPEN_CRYPT -1 /* XXX ??? */ +#define _XOPEN_ENH_I18N -1 /* mandatory in XSI */ +#define _XOPEN_LEGACY -1 +#define _XOPEN_REALTIME -1 +#define _XOPEN_REALTIME_THREADS -1 +#define _XOPEN_UNIX -1 +#endif + +/* Define the versions we target for compliance. */ +#define _POSIX_VERSION 200112L +#define _POSIX2_VERSION 200112L + +/* + * POSIX-style system configuration variable accessors (for the + * sysconf function). The kernel does not directly implement the + * sysconf() interface; rather, a C library stub translates references + * to sysconf() into calls to sysctl() using a giant switch statement. + * Those that are marked `user' are implemented entirely in the C + * library and never query the kernel. pathconf() is implemented + * directly by the kernel so those are not defined here. + */ +#define _SC_ARG_MAX 1 +#define _SC_CHILD_MAX 2 +#define _SC_CLK_TCK 3 +#define _SC_NGROUPS_MAX 4 +#define _SC_OPEN_MAX 5 +#define _SC_JOB_CONTROL 6 +#define _SC_SAVED_IDS 7 +#define _SC_VERSION 8 +#define _SC_BC_BASE_MAX 9 /* user */ +#define _SC_BC_DIM_MAX 10 /* user */ +#define _SC_BC_SCALE_MAX 11 /* user */ +#define _SC_BC_STRING_MAX 12 /* user */ +#define _SC_COLL_WEIGHTS_MAX 13 /* user */ +#define _SC_EXPR_NEST_MAX 14 /* user */ +#define _SC_LINE_MAX 15 /* user */ +#define _SC_RE_DUP_MAX 16 /* user */ +#define _SC_2_VERSION 17 /* user */ +#define _SC_2_C_BIND 18 /* user */ +#define _SC_2_C_DEV 19 /* user */ +#define _SC_2_CHAR_TERM 20 /* user */ +#define _SC_2_FORT_DEV 21 /* user */ +#define _SC_2_FORT_RUN 22 /* user */ +#define _SC_2_LOCALEDEF 23 /* user */ +#define _SC_2_SW_DEV 24 /* user */ +#define _SC_2_UPE 25 /* user */ +#define _SC_STREAM_MAX 26 /* user */ +#define _SC_TZNAME_MAX 27 /* user */ + +#if __POSIX_VISIBLE >= 199309 +#define _SC_ASYNCHRONOUS_IO 28 +#define _SC_MAPPED_FILES 29 +#define _SC_MEMLOCK 30 +#define _SC_MEMLOCK_RANGE 31 +#define _SC_MEMORY_PROTECTION 32 +#define _SC_MESSAGE_PASSING 33 +#define _SC_PRIORITIZED_IO 34 +#define _SC_PRIORITY_SCHEDULING 35 +#define _SC_REALTIME_SIGNALS 36 +#define _SC_SEMAPHORES 37 +#define _SC_FSYNC 38 +#define _SC_SHARED_MEMORY_OBJECTS 39 +#define _SC_SYNCHRONIZED_IO 40 +#define _SC_TIMERS 41 +#define _SC_AIO_LISTIO_MAX 42 +#define _SC_AIO_MAX 43 +#define _SC_AIO_PRIO_DELTA_MAX 44 +#define _SC_DELAYTIMER_MAX 45 +#define _SC_MQ_OPEN_MAX 46 +#define _SC_PAGESIZE 47 +#define _SC_RTSIG_MAX 48 +#define _SC_SEM_NSEMS_MAX 49 +#define _SC_SEM_VALUE_MAX 50 +#define _SC_SIGQUEUE_MAX 51 +#define _SC_TIMER_MAX 52 +#endif + +#if __POSIX_VISIBLE >= 200112 +#define _SC_2_PBS 59 /* user */ +#define _SC_2_PBS_ACCOUNTING 60 /* user */ +#define _SC_2_PBS_CHECKPOINT 61 /* user */ +#define _SC_2_PBS_LOCATE 62 /* user */ +#define _SC_2_PBS_MESSAGE 63 /* user */ +#define _SC_2_PBS_TRACK 64 /* user */ +#define _SC_ADVISORY_INFO 65 +#define _SC_BARRIERS 66 /* user */ +#define _SC_CLOCK_SELECTION 67 +#define _SC_CPUTIME 68 +#define _SC_FILE_LOCKING 69 +#define _SC_GETGR_R_SIZE_MAX 70 /* user */ +#define _SC_GETPW_R_SIZE_MAX 71 /* user */ +#define _SC_HOST_NAME_MAX 72 +#define _SC_LOGIN_NAME_MAX 73 +#define _SC_MONOTONIC_CLOCK 74 +#define _SC_MQ_PRIO_MAX 75 +#define _SC_READER_WRITER_LOCKS 76 /* user */ +#define _SC_REGEXP 77 /* user */ +#define _SC_SHELL 78 /* user */ +#define _SC_SPAWN 79 /* user */ +#define _SC_SPIN_LOCKS 80 /* user */ +#define _SC_SPORADIC_SERVER 81 +#define _SC_THREAD_ATTR_STACKADDR 82 /* user */ +#define _SC_THREAD_ATTR_STACKSIZE 83 /* user */ +#define _SC_THREAD_CPUTIME 84 /* user */ +#define _SC_THREAD_DESTRUCTOR_ITERATIONS 85 /* user */ +#define _SC_THREAD_KEYS_MAX 86 /* user */ +#define _SC_THREAD_PRIO_INHERIT 87 /* user */ +#define _SC_THREAD_PRIO_PROTECT 88 /* user */ +#define _SC_THREAD_PRIORITY_SCHEDULING 89 /* user */ +#define _SC_THREAD_PROCESS_SHARED 90 /* user */ +#define _SC_THREAD_SAFE_FUNCTIONS 91 /* user */ +#define _SC_THREAD_SPORADIC_SERVER 92 /* user */ +#define _SC_THREAD_STACK_MIN 93 /* user */ +#define _SC_THREAD_THREADS_MAX 94 /* user */ +#define _SC_TIMEOUTS 95 /* user */ +#define _SC_THREADS 96 /* user */ +#define _SC_TRACE 97 /* user */ +#define _SC_TRACE_EVENT_FILTER 98 /* user */ +#define _SC_TRACE_INHERIT 99 /* user */ +#define _SC_TRACE_LOG 100 /* user */ +#define _SC_TTY_NAME_MAX 101 /* user */ +#define _SC_TYPED_MEMORY_OBJECTS 102 +#define _SC_V6_ILP32_OFF32 103 /* user */ +#define _SC_V6_ILP32_OFFBIG 104 /* user */ +#define _SC_V6_LP64_OFF64 105 /* user */ +#define _SC_V6_LPBIG_OFFBIG 106 /* user */ +#endif + +#if __XSI_VISIBLE +#define _SC_ATEXIT_MAX 107 /* user */ +#define _SC_IOV_MAX 56 +#define _SC_PAGE_SIZE _SC_PAGESIZE +#define _SC_XOPEN_CRYPT 108 /* user */ +#define _SC_XOPEN_ENH_I18N 109 /* user */ +#define _SC_XOPEN_LEGACY 110 /* user */ +#define _SC_XOPEN_REALTIME 111 +#define _SC_XOPEN_REALTIME_THREADS 112 +#define _SC_XOPEN_SHM 113 +#define _SC_XOPEN_STREAMS 114 +#define _SC_XOPEN_UNIX 115 +#define _SC_XOPEN_VERSION 116 +#define _SC_XOPEN_XCU_VERSION 117 /* user */ +#endif + +#if __BSD_VISIBLE +#define _SC_NPROCESSORS_CONF 57 +#define _SC_NPROCESSORS_ONLN 58 +#endif + +/* Keys for the confstr(3) function. */ +#if __POSIX_VISIBLE >= 199209 +#define _CS_PATH 1 /* default value of PATH */ +#endif + +#if __POSIX_VISIBLE >= 200112 +#define _CS_POSIX_V6_ILP32_OFF32_CFLAGS 2 +#define _CS_POSIX_V6_ILP32_OFF32_LDFLAGS 3 +#define _CS_POSIX_V6_ILP32_OFF32_LIBS 4 +#define _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS 5 +#define _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS 6 +#define _CS_POSIX_V6_ILP32_OFFBIG_LIBS 7 +#define _CS_POSIX_V6_LP64_OFF64_CFLAGS 8 +#define _CS_POSIX_V6_LP64_OFF64_LDFLAGS 9 +#define _CS_POSIX_V6_LP64_OFF64_LIBS 10 +#define _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS 11 +#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS 12 +#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS 13 +#define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS 14 +#endif + __BEGIN_DECLS /* 1003.1-1990 */ void _exit(int) __dead2; @@ -141,8 +365,6 @@ extern char *optarg; /* getopt(3) external variables */ extern int optind, opterr, optopt; - -#define _CS_PATH 1 /* default value of PATH */ #endif /* ISO/IEC 9945-1: 1996 */ @@ -167,27 +389,12 @@ int gethostname(char *, int /* socklen_t */); int setegid(gid_t); int seteuid(uid_t); - -/* X/Open mistake copied by POSIX */ -#define _CS_POSIX_V6_ILP32_OFF32_CFLAGS 2 -#define _CS_POSIX_V6_ILP32_OFF32_LDFLAGS 3 -#define _CS_POSIX_V6_ILP32_OFF32_LIBS 4 -#define _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS 5 -#define _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS 6 -#define _CS_POSIX_V6_ILP32_OFFBIG_LIBS 7 -#define _CS_POSIX_V6_LP64_OFF64_CFLAGS 8 -#define _CS_POSIX_V6_LP64_OFF64_LDFLAGS 9 -#define _CS_POSIX_V6_LP64_OFF64_LIBS 10 -#define _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS 11 -#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS 12 -#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS 13 -#define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS 14 #endif /* * symlink() was originally in POSIX.1a, which was withdrawn after * being overtaken by events (1003.1-2001). It was in XPG4.2, and of - * course has been in BSD practically forever. + * course has been in BSD since 4.2. */ #if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 402 || __BSD_VISIBLE int symlink(const char * __restrict, const char * __restrict); @@ -254,9 +461,15 @@ int issetugid(void); char *mkdtemp(char *); int mknod(const char *, mode_t, dev_t); +#ifndef _MKSTEMP_DECLARED int mkstemp(char *); +#define _MKSTEMP_DECLARED +#endif int mkstemps(char *, int); +#ifndef _MKTEMP_DECLARED char *mktemp(char *); +#define _MKTEMP_DECLARED +#endif int nfsclnt(int, void *); int nfssvc(int, void *); int profil(char *, size_t, vm_offset_t, int); @@ -281,7 +494,10 @@ int setgroups(int, const gid_t *); void sethostid(long); int sethostname(const char *, int); +#ifndef _SETKEY_DECLARED int setkey(const char *); +#define _SETKEY_DECLARED +#endif int setlogin(const char *); void *setmode(const char *); int setresgid(gid_t, gid_t, gid_t); @@ -299,7 +515,10 @@ void *valloc(size_t); /* obsoleted by malloc() */ extern char *suboptarg; /* getsubopt(3) external variable */ +#ifndef _GETSUBOPT_DECLARED int getsubopt(char **, char * const *, char **); +#define _GETSUBOPT_DECLARED +#endif extern int optreset; /* getopt(3) external variable */ #endif /* __BSD_VISIBLE */ __END_DECLS ==== //depot/projects/hammer/include/wchar.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.26 2002/09/15 08:38:50 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.28 2002/09/21 13:00:29 tjr Exp $ */ /*- @@ -111,6 +111,7 @@ wint_t fputwc(wchar_t, struct __sFILE *); int fputws(const wchar_t * __restrict, struct __sFILE * __restrict); int fwide(struct __sFILE *, int); +int fwprintf(struct __sFILE * __restrict, const wchar_t * __restrict, ...); wint_t getwc(struct __sFILE *); wint_t getwchar(void); size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict); @@ -121,7 +122,14 @@ mbstate_t * __restrict); wint_t putwc(wchar_t, struct __sFILE *); wint_t putwchar(wchar_t); +int swprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict, + ...); wint_t ungetwc(wint_t, struct __sFILE *); +int vfwprintf(struct __sFILE * __restrict, const wchar_t * __restrict, + __va_list); +int vswprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict, + __va_list); +int vwprintf(const wchar_t * __restrict, __va_list); size_t wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); wchar_t *wcscat(wchar_t * __restrict, const wchar_t * __restrict); wchar_t *wcschr(const wchar_t *, wchar_t); @@ -130,8 +138,6 @@ size_t wcscspn(const wchar_t *, const wchar_t *); size_t wcsftime(wchar_t * __restrict, size_t, const wchar_t * __restrict, const struct tm * __restrict); -size_t wcslcat(wchar_t *, const wchar_t *, size_t); -size_t wcslcpy(wchar_t *, const wchar_t *, size_t); size_t wcslen(const wchar_t *); wchar_t *wcsncat(wchar_t * __restrict, const wchar_t * __restrict, size_t); @@ -155,11 +161,17 @@ wchar_t *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t); wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t); wchar_t *wmemset(wchar_t *, wchar_t, size_t); +int wprintf(const wchar_t * __restrict, ...); #if __XSI_VISIBLE int wcswidth(const wchar_t *, size_t); int wcwidth(wchar_t); #endif + +#if __BSD_VISIBLE +size_t wcslcat(wchar_t *, const wchar_t *, size_t); +size_t wcslcpy(wchar_t *, const wchar_t *, size_t); +#endif __END_DECLS #define getwc(fp) fgetwc(fp) ==== //depot/projects/hammer/lib/libc/gen/fts.3#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)fts.3 8.5 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.13 2001/09/20 12:32:45 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/fts.3,v 1.14 2002/09/21 01:28:38 wollman Exp $ .\" -.Dd April 16, 1994 +.Dd September 15, 2002 .Dt FTS 3 .Os .Sh NAME @@ -52,6 +52,12 @@ .Fn fts_children "FTS *ftsp" "int options" .Ft int .Fn fts_set "FTS *ftsp" "FTSENT *f" "int options" +.Ft void +.Fn fts_set_clientptr "FTS *ftsp" "void *clientdata" +.Ft void * +.Fn fts_get_clientptr "FTS *ftsp" +.Ft FTS * +.Fn fts_get_stream "FTSENT *f" .Ft int .Fn fts_close "FTS *ftsp" .Sh DESCRIPTION @@ -105,7 +111,27 @@ .Dq Fa FTSENT No structure are generally interchangeable. +.Pp +The +.Fa FTS +structure contains space for a single pointer, which may be used to +store application data or per-hierarchy state. The +.Fn fts_set_clientptr +and >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 12: 3:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE1BE37B404; Sat, 21 Sep 2002 12:03:16 -0700 (PDT) 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 98EA537B401 for ; Sat, 21 Sep 2002 12:03:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 533CB43E81 for ; Sat, 21 Sep 2002 12:03:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8LJ3GCo034787 for ; Sat, 21 Sep 2002 12:03:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8LJ3FJh034761 for perforce@freebsd.org; Sat, 21 Sep 2002 12:03:15 -0700 (PDT) Date: Sat, 21 Sep 2002 12:03:15 -0700 (PDT) Message-Id: <200209211903.g8LJ3FJh034761@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17870 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17870 Change 17870 by peter@peter_overcee on 2002/09/21 12:00:06 integrate via i386_hammer branch Affected files ... .. //depot/projects/hammer/sys/x86_64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/hammer/sys/x86_64/include/cpufunc.h#2 integrate .. //depot/projects/hammer/sys/x86_64/isa/clock.c#4 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/acpica/acpi_wakeup.c#3 (text+ko) ==== ==== //depot/projects/hammer/sys/x86_64/include/cpufunc.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.128 2002/07/21 05:22:16 peter Exp $ + * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.129 2002/09/21 18:26:53 markm Exp $ */ /* @@ -124,6 +124,12 @@ return (mask == 0 ? mask : (int)bsrl((u_int)mask) + 1); } +static __inline void +halt(void) +{ + __asm __volatile("hlt"); +} + #if __GNUC__ < 2 #define inb(port) inbv(port) @@ -600,6 +606,7 @@ void disable_intr(void); void do_cpuid(u_int ax, u_int *p); void enable_intr(void); +void halt(void); u_char inb(u_int port); u_int inl(u_int port); void insb(u_int port, void *addr, size_t cnt); ==== //depot/projects/hammer/sys/x86_64/isa/clock.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/isa/clock.c,v 1.188 2002/09/18 07:34:04 iwasaki Exp $ + * $FreeBSD: src/sys/i386/isa/clock.c,v 1.189 2002/09/21 07:59:06 phk Exp $ */ /* @@ -65,8 +65,6 @@ #include #include -#ifdef CLK_CALIBRATION_LOOP -#endif #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 12:11:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FA0C37B401; Sat, 21 Sep 2002 12:11:28 -0700 (PDT) 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 5FB9E37B404 for ; Sat, 21 Sep 2002 12:11:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA9E643E65 for ; Sat, 21 Sep 2002 12:11:27 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8LJBRCo040873 for ; Sat, 21 Sep 2002 12:11:27 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8LJBR9p040863 for perforce@freebsd.org; Sat, 21 Sep 2002 12:11:27 -0700 (PDT) Date: Sat, 21 Sep 2002 12:11:27 -0700 (PDT) Message-Id: <200209211911.g8LJBR9p040863@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17873 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17873 Change 17873 by peter@peter_overcee on 2002/09/21 12:10:44 chop out more apm goop Affected files ... .. //depot/projects/hammer/sys/x86_64/conf/GENERIC.hints#2 edit .. //depot/projects/hammer/sys/x86_64/include/clock.h#4 edit .. //depot/projects/hammer/sys/x86_64/isa/clock.c#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/conf/GENERIC.hints#2 (text+ko) ==== @@ -31,9 +31,6 @@ hint.npx.0.at="nexus" hint.npx.0.port="0x0F0" hint.npx.0.irq="13" -hint.apm.0.at="nexus" -hint.apm.0.disabled="1" -hint.apm.0.flags="0x20" hint.pmtimer.0.at="isa" hint.pcic.0.at="isa" # hint.pcic.0.irq="10" # Default to polling ==== //depot/projects/hammer/sys/x86_64/include/clock.h#4 (text+ko) ==== @@ -34,7 +34,6 @@ int release_timer2(void); int rtcin(int val); int sysbeep(int pitch, int period); -void timer_restore(void); #endif /* _KERNEL */ ==== //depot/projects/hammer/sys/x86_64/isa/clock.c#5 (text+ko) ==== @@ -656,47 +656,6 @@ } /* - * i8254_restore is called from apm_default_resume() to reload - * the countdown register. - * this should not be necessary but there are broken laptops that - * do not restore the countdown register on resume. - * when it happnes, it messes up the hardclock interval and system clock, - * which leads to the infamous "calcru: negative time" problem. - */ -static void -i8254_restore(void) -{ - - mtx_lock_spin(&clock_lock); - outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT); - outb(TIMER_CNTR0, timer0_max_count & 0xff); - outb(TIMER_CNTR0, timer0_max_count >> 8); - mtx_unlock_spin(&clock_lock); -} - -static void -rtc_restore(void) -{ - - /* Reenable RTC updates and interrupts. */ - /* XXX locking is needed for RTC access? */ - writertc(RTC_STATUSA, rtc_statusa); - writertc(RTC_STATUSB, RTCSB_HALT | RTCSB_24HR); - writertc(RTC_STATUSB, rtc_statusb); -} - -/* - * Restore all the timers atomically. - */ -void -timer_restore(void) -{ - - i8254_restore(); /* restore timer_freq and hz */ - rtc_restore(); /* reenable RTC interrupts */ -} - -/* * Initialize 8254 timer 0 early so that it can be used in DELAY(). * XXX initialization of other timers is unintentionally left blank. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 12:40:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85E0737B404; Sat, 21 Sep 2002 12:40:36 -0700 (PDT) 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 2F41437B401 for ; Sat, 21 Sep 2002 12:40:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3F2C43E77 for ; Sat, 21 Sep 2002 12:40:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8LJeZCo046636 for ; Sat, 21 Sep 2002 12:40:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8LJeZq5046633 for perforce@freebsd.org; Sat, 21 Sep 2002 12:40:35 -0700 (PDT) Date: Sat, 21 Sep 2002 12:40:35 -0700 (PDT) Message-Id: <200209211940.g8LJeZq5046633@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17877 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17877 Change 17877 by peter@peter_overcee on 2002/09/21 12:40:00 In response to prodding by jake, move some variables to C, and use bss. Since we depend on loader, which clears bss before starting us, this is now safe. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#13 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#19 edit .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#13 (text+ko) ==== @@ -93,30 +93,16 @@ /* * Globals */ - .data + .bss ALIGN_DATA /* just to be sure */ - .globl HIDENAME(tmpstk) .space 0x2000 /* space for tmpstk - temporary stack */ HIDENAME(tmpstk): - .globl modulep -modulep: .long 0 /* phys addr of metadata table */ - - .globl KERNend -KERNend: .long 0 /* phys addr end of kernel (just after bss) */ -physfree: .long 0 /* phys addr of next free page */ - - .globl IdlePTD -IdlePTD: .long 0 /* phys addr of kernel PTD */ - -KPTphys: .long 0 /* phys addr of kernel page tables */ - - .globl proc0uarea, proc0kstack -proc0uarea: .long 0 /* address of proc 0 uarea space */ -proc0kstack: .long 0 /* address of proc 0 kstack space */ -p0upa: .long 0 /* phys addr of proc0's UAREA */ -p0kpa: .long 0 /* phys addr of proc0's STACK */ +physfree: .space 4 /* phys addr of next free page */ +KPTphys: .space 4 /* phys addr of kernel page tables */ +p0upa: .space 4 /* phys addr of proc0's UAREA */ +p0kpa: .space 4 /* phys addr of proc0's STACK */ /********************************************************************** * ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#19 (text+ko) ==== @@ -133,6 +133,12 @@ int _udatasel, _ucodesel; u_int atdevbase; +/* These are written in 32 bit mode */ +u_int32_t modulep; /* phys addr of metadata table */ +u_int32_t IdlePTD; /* phys addr of kernel PTD */ +struct user *proc0uarea; /* address of proc 0 uarea space */ +vm_offset_t proc0kstack; /* address of proc 0 kstack space */ + #if defined(SWTCH_OPTIM_STATS) extern int swtch_optim_stats; SYSCTL_INT(_debug, OID_AUTO, swtch_optim_stats, @@ -647,8 +653,6 @@ static struct i386tss dblfault_tss; static char dblfault_stack[PAGE_SIZE]; -extern struct user *proc0uarea; -extern vm_offset_t proc0kstack; /* software prototypes -- in more palatable form */ @@ -1140,7 +1144,7 @@ */ proc_linkup(&proc0, &ksegrp0, &kse0, &thread0); - preload_metadata = (caddr_t)modulep + KERNBASE; + preload_metadata = modulep + KERNBASE; preload_bootstrap_relocate(KERNBASE); kmdp = preload_search_by_type("elf kernel"); boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#5 (text+ko) ==== @@ -156,7 +156,7 @@ static int nkpt; vm_offset_t kernel_vm_end; -extern u_int32_t KERNend; +u_int32_t KERNend; /* Written in 32 bit mode */ /* * Data for the pv entry allocation mechanism To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 13:14:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D07437B404; Sat, 21 Sep 2002 13:14:23 -0700 (PDT) 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 E8F9C37B401 for ; Sat, 21 Sep 2002 13:14:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A530E43E65 for ; Sat, 21 Sep 2002 13:14:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8LKEMCo059049 for ; Sat, 21 Sep 2002 13:14:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8LKEM6o059038 for perforce@freebsd.org; Sat, 21 Sep 2002 13:14:22 -0700 (PDT) Date: Sat, 21 Sep 2002 13:14:22 -0700 (PDT) Message-Id: <200209212014.g8LKEM6o059038@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17882 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17882 Change 17882 by peter@peter_overcee on 2002/09/21 13:10:50 start turning on long mode. We're now as far as running in "compatability mode" (long mode but with a 32 bit app) because the 'long' bit in %cs isn't set yet. This means this has a fair way to go yet.. we'll need to mess with evil gdt stuff before we can reach kernbase. :-( Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#14 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#14 (text+ko) ==== @@ -133,13 +133,13 @@ * prot = protection bits */ #define fillkpt(base, prot) \ - shll $2,%ebx ; \ + shll $3,%ebx ; \ addl base,%ebx ; \ orl $PG_V,%eax ; \ orl prot,%eax ; \ 1: movl %eax,(%ebx) ; \ addl $PAGE_SIZE,%eax ; /* increment physical address */ \ - addl $4,%ebx ; /* next pte */ \ + addl $8,%ebx ; /* next pte */ \ loop 1b /* @@ -185,17 +185,35 @@ call identify_cpu call create_pagetables -/* Now enable paging */ +/* Enable PAE mode (prerequisite for long mode) */ + movl %cr4, %eax + orl $CR4_PAE, %eax + movl %eax, %cr4 + +/* Point to the PML4 */ movl R(IdlePTD), %eax movl %eax,%cr3 /* load ptd addr into mmu */ + +/* Enable long mode */ + movl $MSR_EFER, %ecx + rdmsr + orl $EFER_LME, %eax + wrmsr +/* + * At this point, we are in 32 bit "compatability" mode, where + * EFER.LMA = 1, CS.L = 0, CS.D = 0, CR0.PE = 1. + */ + +/* Now enable paging */ movl %cr0,%eax /* get control word */ - orl $CR0_PE|CR0_PG,%eax /* enable paging */ + orl $CR0_PG, %eax /* enable paging */ movl %eax,%cr0 /* and let's page NOW! */ - pushl $begin /* jump to high virtualized address */ + pushl $begin /* prepare for jump to virtual address */ ret /* now running relocated at KERNBASE where the system is linked to run */ +/* XXX not yet, we have to set the segment 'long' bit first! */ begin: /* set up bootstrap stack */ movl proc0kstack,%eax /* location of in-kernel stack */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 16: 0: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B4FD37B404; Sat, 21 Sep 2002 16:00:03 -0700 (PDT) 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 F133137B401 for ; Sat, 21 Sep 2002 16:00:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8E5F43E6A for ; Sat, 21 Sep 2002 16:00:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8LN02Co006702 for ; Sat, 21 Sep 2002 16:00:02 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8LN0253006699 for perforce@freebsd.org; Sat, 21 Sep 2002 16:00:02 -0700 (PDT) Date: Sat, 21 Sep 2002 16:00:02 -0700 (PDT) Message-Id: <200209212300.g8LN0253006699@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17890 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17890 Change 17890 by rwatson@rwatson_tislabs on 2002/09/21 15:59:55 If load fails, we may get an unload event during the boot process. Check for this case by looking to see if the policy generating the unload has MPC_RUNTIME_FLAG_REGISTERED set: if not, it was never loaded, so we can quietly suceed and all is well. Restructure the lock handling and add some comments around this and related behavior while I'm here. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#275 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#275 (text+ko) ==== @@ -1025,16 +1025,38 @@ mac_policy_unregister(struct mac_policy_conf *mpc) { + /* + * If we fail the load, we may get a request to unload. Check + * to see if we did the run-time registration, and if not, + * silently succeed. + */ + MAC_POLICY_LIST_LOCK(); + if ((mpc->mpc_runtime_flags & MPC_RUNTIME_FLAG_REGISTERED) == 0) { + MAC_POLICY_LIST_UNLOCK(); + return (0); + } #if 0 /* * Don't allow unloading modules with private data. */ - if (mpc->mpc_field_off != NULL) + if (mpc->mpc_field_off != NULL) { + MAC_POLICY_LIST_UNLOCK(); return (EBUSY); + } #endif - if ((mpc->mpc_loadtime_flags & MPC_LOADTIME_FLAG_UNLOADOK) == 0) + /* + * Only allow the unload to proceed if the module is unloadable + * by its own definition. + */ + if ((mpc->mpc_loadtime_flags & MPC_LOADTIME_FLAG_UNLOADOK) == 0) { + MAC_POLICY_LIST_UNLOCK(); return (EBUSY); - MAC_POLICY_LIST_LOCK(); + } + /* + * Right now, we EBUSY if the list is in use. In the future, + * for reliability reasons, we might want to sleep and wakeup + * later to try again. + */ if (mac_policy_list_busy > 0) { MAC_POLICY_LIST_UNLOCK(); return (EBUSY); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 17:32:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5944F37B404; Sat, 21 Sep 2002 17:32:55 -0700 (PDT) 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 1B9D137B401 for ; Sat, 21 Sep 2002 17:32:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1A1743E77 for ; Sat, 21 Sep 2002 17:32:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8M0WsCo034604 for ; Sat, 21 Sep 2002 17:32:54 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8M0WsHA034601 for perforce@freebsd.org; Sat, 21 Sep 2002 17:32:54 -0700 (PDT) Date: Sat, 21 Sep 2002 17:32:54 -0700 (PDT) Message-Id: <200209220032.g8M0WsHA034601@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17892 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17892 Change 17892 by peter@peter_overcee on 2002/09/21 17:32:35 sigtramp should be workable. convert for register calling convention. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/sigtramp.s#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/sigtramp.s#2 (text+ko) ==== @@ -56,14 +56,12 @@ * */ NON_GPROF_ENTRY(sigcode) - call *SIGF_HANDLER(%esp) /* call signal handler */ - lea SIGF_UC(%esp),%eax /* get ucontext_t */ - pushl %eax - movl UC_GS(%eax),%gs /* restore %gs */ - movl $SYS_sigreturn,%eax - pushl %eax /* junk to fake return addr. */ - int $0x80 /* enter kernel with args */ -0: hlt /* priviliged instruction */ + call *SIGF_HANDLER(%rsp) /* call signal handler */ + lea SIGF_UC(%rsp),%rdi /* get ucontext_t */ + pushq $0 /* junk to fake return addr. */ + movq $SYS_sigreturn,%rax + syscall /* enter kernel with args */ +0: hlt /* trap priviliged instruction */ jmp 0b ALIGN_TEXT To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 17:49:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41C9937B404; Sat, 21 Sep 2002 17:49:16 -0700 (PDT) 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 E4BFD37B401 for ; Sat, 21 Sep 2002 17:49:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4D2143E7B for ; Sat, 21 Sep 2002 17:49:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8M0nFCo036994 for ; Sat, 21 Sep 2002 17:49:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8M0nFia036991 for perforce@freebsd.org; Sat, 21 Sep 2002 17:49:15 -0700 (PDT) Date: Sat, 21 Sep 2002 17:49:15 -0700 (PDT) Message-Id: <200209220049.g8M0nFia036991@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17894 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17894 Change 17894 by peter@peter_overcee on 2002/09/21 17:49:03 update lgdt,lidt,lldt,ltr. Remind me again why lldt, lidt and ltr are not inlines? Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#4 (text+ko) ==== @@ -638,8 +638,7 @@ /* void lgdt(struct region_descriptor *rdp); */ ENTRY(lgdt) /* reload the descriptor table */ - movl 4(%esp),%eax - lgdt (%eax) + lgdt (%rdi) /* flush the prefetch q */ jmp 1f @@ -649,37 +648,33 @@ movl $KDSEL,%eax mov %ax,%ds mov %ax,%es - mov %ax,%gs mov %ax,%ss - movl $KPSEL,%eax - mov %ax,%fs /* reload code selector by turning return into intersegmental return */ - movl (%esp),%eax - pushl %eax - movl $KCSEL,4(%esp) - lret + popq %rax + pushq $KCSEL + pushq %rax + lretq /* * void lidt(struct region_descriptor *rdp); */ ENTRY(lidt) - movl 4(%esp),%eax - lidt (%eax) + lidt (%rdi) ret /* * void lldt(u_short sel) */ ENTRY(lldt) - lldt 4(%esp) + lldt %di ret /* * void ltr(u_short sel) */ ENTRY(ltr) - ltr 4(%esp) + ltr %di ret /* void reset_dbregs() */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 18:55:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3CBD37B404; Sat, 21 Sep 2002 18:55:38 -0700 (PDT) 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 4E80C37B401 for ; Sat, 21 Sep 2002 18:55:38 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 107D943E6E for ; Sat, 21 Sep 2002 18:55:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8M1tbCo054959 for ; Sat, 21 Sep 2002 18:55:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8M1tbB6054956 for perforce@freebsd.org; Sat, 21 Sep 2002 18:55:37 -0700 (PDT) Date: Sat, 21 Sep 2002 18:55:37 -0700 (PDT) Message-Id: <200209220155.g8M1tbB6054956@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17899 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17899 Change 17899 by peter@peter_overcee on 2002/09/21 18:55:07 remove derogatory comment that isn't relevant anymore. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#15 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#15 (text+ko) ==== @@ -52,14 +52,6 @@ #include "assym.s" /* - * XXX - * - * Note: This version greatly munged to avoid various assembler errors - * that may be fixed in newer versions of gas. Perhaps newer versions - * will have more pleasant appearance. - */ - -/* * PTmap is recursive pagemap at top of virtual address space. * Within PTmap, the page directory can be found (third indirection). * To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 19: 0:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12BD837B404; Sat, 21 Sep 2002 19:00:46 -0700 (PDT) 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 86CF537B401 for ; Sat, 21 Sep 2002 19:00:45 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id ADCD743E4A for ; Sat, 21 Sep 2002 19:00:44 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8M20iCo055524 for ; Sat, 21 Sep 2002 19:00:44 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8M20inS055514 for perforce@freebsd.org; Sat, 21 Sep 2002 19:00:44 -0700 (PDT) Date: Sat, 21 Sep 2002 19:00:44 -0700 (PDT) Message-Id: <200209220200.g8M20inS055514@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17900 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17900 Change 17900 by peter@peter_overcee on 2002/09/21 18:59:57 finish up (almost). The kld relocator for PC32 still needs to be finished. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/elf_machdep.c#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/elf_machdep.c#3 (text+ko) ==== @@ -72,13 +72,13 @@ exec_setregs }; -static Elf32_Brandinfo freebsd_brand_info = { +static Elf64_Brandinfo freebsd_brand_info = { ELFOSABI_FREEBSD, EM_X86_64, "FreeBSD", "", "/usr/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec + &elf64_freebsd_sysvec }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -89,7 +89,6 @@ int elf_reloc(linker_file_t lf, const void *data, int type) { -#if 0 Elf_Addr relocbase = (Elf_Addr) lf->address; Elf_Addr *where; Elf_Addr addr; @@ -119,10 +118,10 @@ switch (rtype) { - case R_386_NONE: /* none */ + case R_X86_64_NONE: /* none */ break; - case R_386_32: /* S + A */ + case R_X86_64_64: /* S + A */ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return -1; @@ -131,16 +130,17 @@ *where = addr; break; - case R_386_PC32: /* S + A - P */ + case R_X86_64_PC32: /* S + A - P */ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return -1; addr += addend - (Elf_Addr)where; + XXX needs to be 32 bit *where, not 64 bit if (*where != addr) *where = addr; break; - case R_386_COPY: /* none */ + case R_X86_64_COPY: /* none */ /* * There shouldn't be copy relocations in kernel * objects. @@ -149,7 +149,7 @@ return -1; break; - case R_386_GLOB_DAT: /* S */ + case R_X86_64_GLOB_DAT: /* S */ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return -1; @@ -157,7 +157,7 @@ *where = addr; break; - case R_386_RELATIVE: /* B + A */ + case R_X86_64_RELATIVE: /* B + A */ addr = relocbase + addend; if (*where != addr) *where = addr; @@ -168,6 +168,5 @@ rtype); return -1; } -#endif return(0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 20:26:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C5BB37B404; Sat, 21 Sep 2002 20:26:45 -0700 (PDT) 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 2B3A437B401 for ; Sat, 21 Sep 2002 20:26:45 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFAA143E3B for ; Sat, 21 Sep 2002 20:26:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8M3QiCo082052 for ; Sat, 21 Sep 2002 20:26:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8M3Qi8i082049 for perforce@freebsd.org; Sat, 21 Sep 2002 20:26:44 -0700 (PDT) Date: Sat, 21 Sep 2002 20:26:44 -0700 (PDT) Message-Id: <200209220326.g8M3Qi8i082049@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17904 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17904 Change 17904 by rwatson@rwatson_tislabs on 2002/09/21 20:25:44 Modify Biba and MLS to recognize the reality that mpo_create_mbuf_from_mbuf() may have a source mbuf that is initialized but not created. Modify nfs_socket.c to not explicitly perform the label copy since it will be performed later. Affected files ... .. //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#14 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#108 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#89 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/nfsclient/nfs_socket.c#14 (text+ko) ==== @@ -889,10 +889,6 @@ m = nfsm_rpchead(cred, nmp->nm_flag, procnum, auth_type, auth_len, mrest, mrest_len, &mheadend, &xid); -#ifdef MAC - mac_create_mbuf_from_socket(nmp->nm_so, m); -#endif - /* * For stream protocols, insert a Sun RPC Record Mark. */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#108 (text+ko) ==== @@ -925,7 +925,15 @@ source = SLOT(oldmbuflabel); dest = SLOT(newmbuflabel); - mac_biba_copy_single(source, dest); + /* + * Because the source mbuf may not yet have been "created", + * just initialized, we do a conditional copy. Since we don't + * allow mbufs to have ranges, do a KASSERT to make sure that + * doesn't happen. + */ + KASSERT((source->mb_flags & MAC_BIBA_FLAG_RANGE) != 0, + ("mac_biba_create_mbuf_from_mbuf: source mbuf has range")); + mac_biba_copy(source, dest); } static void ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#89 (text+ko) ==== @@ -879,7 +879,15 @@ source = SLOT(oldmbuflabel); dest = SLOT(newmbuflabel); - mac_mls_copy_single(source, dest); + /* + * Because the source mbuf may not yet have been "created", + * just initialized, we do a conditional copy. Since we don't + * allow mbufs to have ranges, do a KASSERT to make sure that + * doesn't happen. + */ + KASSERT((source->mm_flags & MAC_MLS_FLAG_RANGE) != 0, + ("mac_mls_create_mbuf_from_mbuf: source mbuf has range")); + mac_mls_copy(source, dest); } static void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 21: 0:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8956C37B406; Sat, 21 Sep 2002 21:00:30 -0700 (PDT) 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 1109B37B404 for ; Sat, 21 Sep 2002 21:00:29 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA79143E77 for ; Sat, 21 Sep 2002 21:00:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8M40SCo088197 for ; Sat, 21 Sep 2002 21:00:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8M40SBV088194 for perforce@freebsd.org; Sat, 21 Sep 2002 21:00:28 -0700 (PDT) Date: Sat, 21 Sep 2002 21:00:28 -0700 (PDT) Message-Id: <200209220400.g8M40SBV088194@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17905 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17905 Change 17905 by rwatson@rwatson_tislabs on 2002/09/21 21:00:09 Reverse polarity of two KASSERT's. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#109 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#90 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#109 (text+ko) ==== @@ -931,7 +931,7 @@ * allow mbufs to have ranges, do a KASSERT to make sure that * doesn't happen. */ - KASSERT((source->mb_flags & MAC_BIBA_FLAG_RANGE) != 0, + KASSERT((source->mb_flags & MAC_BIBA_FLAG_RANGE) == 0, ("mac_biba_create_mbuf_from_mbuf: source mbuf has range")); mac_biba_copy(source, dest); } ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#90 (text+ko) ==== @@ -885,7 +885,7 @@ * allow mbufs to have ranges, do a KASSERT to make sure that * doesn't happen. */ - KASSERT((source->mm_flags & MAC_MLS_FLAG_RANGE) != 0, + KASSERT((source->mm_flags & MAC_MLS_FLAG_RANGE) == 0, ("mac_mls_create_mbuf_from_mbuf: source mbuf has range")); mac_mls_copy(source, dest); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 21:34:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FD8337B404; Sat, 21 Sep 2002 21:34:10 -0700 (PDT) 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 ED00C37B401 for ; Sat, 21 Sep 2002 21:34:09 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AA4E43E4A for ; Sat, 21 Sep 2002 21:34:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8M4Y9Co099975 for ; Sat, 21 Sep 2002 21:34:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8M4Y9a0099972 for perforce@freebsd.org; Sat, 21 Sep 2002 21:34:09 -0700 (PDT) Date: Sat, 21 Sep 2002 21:34:09 -0700 (PDT) Message-Id: <200209220434.g8M4Y9a0099972@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17906 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17906 Change 17906 by rwatson@rwatson_tislabs on 2002/09/21 21:33:48 Introduce a new MAC Framework and MAC Policy entry point, mac_create_devfs_symlink(), which is invoked to initialize the label on a newly created symlink in devfs in the scenario where symlink() is called by a user process (the case where it's associated with a device during make_dev_alias is handled by the mac_create_devfs_device() case, since it has a dev_t). The current method of copying the label from the vnode didn't work as it broke assertions in the handling of the vnode due to a duplicate vnode creation event. This should fix problems in Biba, MLS, TE, and SEBSD relating to correct labeling of user generated symlinks (such as /dev/log). In Biba, MLS, and TE, we derive the symlink label from the subject credential creating the symlink. It could also come from the parent directory of the symlink, which is available in the entry point arguments. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#24 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#110 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#91 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#75 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#77 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#46 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#162 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#126 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#24 (text+ko) ==== @@ -878,12 +878,11 @@ MALLOC(de->de_symlink, char *, i, M_DEVFS, M_WAITOK); bcopy(ap->a_target, de->de_symlink, i); lockmgr(&dmp->dm_lock, LK_EXCLUSIVE, 0, curthread); +#ifdef MAC + mac_create_devfs_symlink(ap->a_cnp->cn_cred, dd, de); +#endif TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); devfs_allocv(de, ap->a_dvp->v_mount, ap->a_vpp, 0); -#ifdef MAC - mac_create_vnode(ap->a_cnp->cn_cred, ap->a_dvp, *ap->a_vpp); - mac_update_devfsdirent(de, *ap->a_vpp); -#endif /* MAC */ lockmgr(&dmp->dm_lock, LK_RELEASE, 0, curthread); return (0); } ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#110 (text+ko) ==== @@ -584,6 +584,18 @@ } static void +mac_biba_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, + struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) +{ + struct mac_biba *source, *dest; + + source = SLOT(&cred->cr_label); + dest = SLOT(delabel); + + mac_biba_copy_single(source, dest); +} + +static void mac_biba_create_devfs_vnode(struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { @@ -2231,6 +2243,8 @@ (macop_t)mac_biba_create_devfs_device }, { MAC_CREATE_DEVFS_DIRECTORY, (macop_t)mac_biba_create_devfs_directory }, + { MAC_CREATE_DEVFS_SYMLINK, + (macop_t)mac_biba_create_devfs_symlink }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_biba_create_devfs_vnode }, { MAC_CREATE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#91 (text+ko) ==== @@ -575,6 +575,18 @@ } static void +mac_mls_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, + struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) +{ + struct mac_mls *source, *dest; + + source = SLOT(&cred->cr_label); + dest = SLOT(delabel); + + mac_mls_copy_single(source, dest); +} + +static void mac_mls_create_devfs_vnode(struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { @@ -2166,6 +2178,8 @@ (macop_t)mac_mls_create_devfs_device }, { MAC_CREATE_DEVFS_DIRECTORY, (macop_t)mac_mls_create_devfs_directory }, + { MAC_CREATE_DEVFS_SYMLINK, + (macop_t)mac_mls_create_devfs_symlink }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_mls_create_devfs_vnode }, { MAC_CREATE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#75 (text+ko) ==== @@ -169,6 +169,13 @@ } static void +mac_none_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, + struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) +{ + +} + +static void mac_none_create_devfs_vnode(struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { @@ -923,6 +930,8 @@ (macop_t)mac_none_create_devfs_device }, { MAC_CREATE_DEVFS_DIRECTORY, (macop_t)mac_none_create_devfs_directory }, + { MAC_CREATE_DEVFS_SYMLINK, + (macop_t)mac_none_create_devfs_symlink }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_none_create_devfs_vnode }, { MAC_CREATE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#77 (text+ko) ==== @@ -1005,6 +1005,14 @@ } static void +mac_te_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, + struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) +{ + + mac_te_copy_label(&cred->cr_label, delabel); +} + +static void mac_te_create_devfs_vnode(struct devfs_dirent *de, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { @@ -1679,6 +1687,8 @@ (macop_t)mac_te_create_devfs_device }, { MAC_CREATE_DEVFS_DIRECTORY, (macop_t)mac_te_create_devfs_directory }, + { MAC_CREATE_DEVFS_SYMLINK, + (macop_t)mac_te_create_devfs_symlink }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_te_create_devfs_vnode }, { MAC_CREATE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#46 (text+ko) ==== @@ -543,6 +543,13 @@ } static void +mac_test_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, + struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) +{ + +} + +static void mac_test_create_devfs_vnode(struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { @@ -1301,6 +1308,8 @@ (macop_t)mac_test_create_devfs_device }, { MAC_CREATE_DEVFS_DIRECTORY, (macop_t)mac_test_create_devfs_directory }, + { MAC_CREATE_DEVFS_SYMLINK, + (macop_t)mac_test_create_devfs_symlink }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_test_create_devfs_vnode }, { MAC_CREATE_VNODE, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#162 (text+ko) ==== @@ -267,6 +267,8 @@ void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de); void mac_create_devfs_directory(char *dirname, int dirnamelen, struct devfs_dirent *de); +void mac_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, + struct devfs_dirent *de); void mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp); void mac_create_vnode(struct ucred *cred, struct vnode *parent, struct vnode *child); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#126 (text+ko) ==== @@ -146,6 +146,9 @@ struct label *label); void (*mpo_create_devfs_directory)(char *dirname, int dirnamelen, struct devfs_dirent *de, struct label *label); + void (*mpo_create_devfs_symlink)(struct ucred *cred, + struct devfs_dirent *dd, struct label *ddlabel, + struct devfs_dirent *de, struct label *delabel); void (*mpo_create_devfs_vnode)(struct devfs_dirent *de, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel); @@ -435,6 +438,7 @@ MAC_INTERNALIZE_VNODE_LABEL, MAC_CREATE_DEVFS_DEVICE, MAC_CREATE_DEVFS_DIRECTORY, + MAC_CREATE_DEVFS_SYMLINK, MAC_CREATE_DEVFS_VNODE, MAC_CREATE_VNODE, MAC_CREATE_MOUNT, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 21:51:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABDD637B401; Sat, 21 Sep 2002 21:51:32 -0700 (PDT) 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 230E437B404 for ; Sat, 21 Sep 2002 21:51:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C567643E75 for ; Sat, 21 Sep 2002 21:51:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8M4pVCo004265 for ; Sat, 21 Sep 2002 21:51:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8M4pVkl004262 for perforce@freebsd.org; Sat, 21 Sep 2002 21:51:31 -0700 (PDT) Date: Sat, 21 Sep 2002 21:51:31 -0700 (PDT) Message-Id: <200209220451.g8M4pVkl004262@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17909 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17909 Change 17909 by rwatson@rwatson_tislabs on 2002/09/21 21:51:14 Missed the new vnode_symlink operation registration in the module registration loop. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#276 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#276 (text+ko) ==== @@ -614,6 +614,10 @@ mpc->mpc_ops->mpo_create_devfs_directory = mpe->mpe_function; break; + case MAC_CREATE_DEVFS_SYMLINK: + mpc->mpc_ops->mpo_create_devfs_symlink = + mpe->mpe_function; + break; case MAC_CREATE_DEVFS_VNODE: mpc->mpc_ops->mpo_create_devfs_vnode = mpe->mpe_function; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 21:56:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60BDF37B404; Sat, 21 Sep 2002 21:56:39 -0700 (PDT) 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 0E89137B401 for ; Sat, 21 Sep 2002 21:56:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BCBE43E6E for ; Sat, 21 Sep 2002 21:56:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8M4ucCo004720 for ; Sat, 21 Sep 2002 21:56:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8M4uciP004717 for perforce@freebsd.org; Sat, 21 Sep 2002 21:56:38 -0700 (PDT) Date: Sat, 21 Sep 2002 21:56:38 -0700 (PDT) Message-Id: <200209220456.g8M4uciP004717@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17910 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17910 Change 17910 by peter@peter_overcee on 2002/09/21 21:55:54 integrate i386_hammer branch to pick up some i386 changes I want. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/cpufunc.h#3 integrate .. //depot/projects/hammer/sys/x86_64/include/segments.h#5 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#4 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#20 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/mem.c#3 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/support.s#5 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/include/cpufunc.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.129 2002/09/21 18:26:53 markm Exp $ + * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.130 2002/09/22 04:45:21 peter Exp $ */ /* @@ -46,6 +46,7 @@ #include struct thread; +struct region_descriptor; __BEGIN_DECLS #define readb(va) (*(volatile u_int8_t *) (va)) @@ -468,6 +469,27 @@ __asm __volatile("movl %0,%%gs" : : "rm" (sel)); } +/* void lidt(struct region_descriptor *addr); */ +static __inline void +lidt(struct region_descriptor *addr) +{ + __asm __volatile("lidt (%0)" : : "r" (addr)); +} + +/* void lldt(u_short sel); */ +static __inline void +lldt(u_short sel) +{ + __asm __volatile("lldt %0" : : "r" (sel)); +} + +/* void ltr(u_short sel); */ +static __inline void +ltr(u_short sel) +{ + __asm __volatile("ltr %0" : : "r" (sel)); +} + static __inline u_int rdr0(void) { @@ -622,6 +644,10 @@ void load_cr4(u_int cr4); void load_fs(u_int sel); void load_gs(u_int sel); +struct region_descriptor; +void lidt(struct region_descriptor *addr); +void lldt(u_short sel); +void ltr(u_short sel); void outb(u_int port, u_char data); void outl(u_int port, u_int data); void outsb(u_int port, void *addr, size_t cnt); @@ -663,7 +689,6 @@ #endif /* __GNUC__ */ -void ltr(u_short sel); void reset_dbregs(void); __END_DECLS ==== //depot/projects/hammer/sys/x86_64/include/segments.h#5 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/include/segments.h,v 1.29 2002/03/23 15:09:35 bde Exp $ + * $FreeBSD: src/sys/i386/include/segments.h,v 1.30 2002/09/22 04:45:21 peter Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ @@ -224,8 +224,6 @@ extern union descriptor ldt[NLDT]; void lgdt(struct region_descriptor *rdp); -void lidt(struct region_descriptor *rdp); -void lldt(u_short sel); void sdtossd(struct segment_descriptor *sdp, struct soft_segment_descriptor *ssdp); void ssdtosd(struct soft_segment_descriptor *ssdp, ==== //depot/projects/hammer/sys/x86_64/x86_64/autoconf.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.169 2002/09/20 17:59:09 phk Exp $ + * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.170 2002/09/22 00:59:01 jake Exp $ */ /* @@ -61,7 +61,6 @@ #include #include -#if defined(NFSCLIENT) && defined(NFS_ROOT) #include #include #include @@ -73,7 +72,6 @@ #include #include #include -#endif #include #include @@ -88,10 +86,6 @@ static void configure(void *); static void configure_final(void *); -#if defined(NFSCLIENT) && defined(NFS_ROOT) && !defined(BOOTP_NFSROOT) -static void pxe_setup_nfsdiskless(void); -#endif - SYSINIT(configure1, SI_SUB_CONFIGURE, SI_ORDER_FIRST, configure_first, NULL); /* SI_ORDER_SECOND is hookable */ SYSINIT(configure2, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL); @@ -175,184 +169,10 @@ #endif #if defined(NFSCLIENT) && defined(NFS_ROOT) #if !defined(BOOTP_NFSROOT) - pxe_setup_nfsdiskless(); + nfs_setup_diskless(); if (nfs_diskless_valid) #endif rootdevnames[0] = "nfs:"; #endif } SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL) - -#if defined(NFSCLIENT) && defined(NFS_ROOT) && !defined(BOOTP_NFSROOT) - -static int -inaddr_to_sockaddr(char *ev, struct sockaddr_in *sa) -{ - u_int32_t a[4]; - char *cp; - int count; - - bzero(sa, sizeof(*sa)); - sa->sin_len = sizeof(*sa); - sa->sin_family = AF_INET; - - if ((cp = getenv(ev)) == NULL) - return(1); - count = sscanf(cp, "%d.%d.%d.%d", &a[0], &a[1], &a[2], &a[3]); - freeenv(cp); - if (count != 4) - return(1); - /* XXX is this ordering correct? */ - sa->sin_addr.s_addr = (a[3] << 24) + (a[2] << 16) + (a[1] << 8) + a[0]; - return(0); -} - -static int -hwaddr_to_sockaddr(char *ev, struct sockaddr_dl *sa) -{ - char *cp; - u_int32_t a[6]; - int count; - - bzero(sa, sizeof(*sa)); - sa->sdl_len = sizeof(*sa); - sa->sdl_family = AF_LINK; - sa->sdl_type = IFT_ETHER; - sa->sdl_alen = ETHER_ADDR_LEN; - if ((cp = getenv(ev)) == NULL) - return(1); - count = sscanf(cp, "%x:%x:%x:%x:%x:%x", - &a[0], &a[1], &a[2], &a[3], &a[4], &a[5]); - freeenv(cp); - if (count != 6) - return(1); - sa->sdl_data[0] = a[0]; - sa->sdl_data[1] = a[1]; - sa->sdl_data[2] = a[2]; - sa->sdl_data[3] = a[3]; - sa->sdl_data[4] = a[4]; - sa->sdl_data[5] = a[5]; - return(0); -} - -static int -decode_nfshandle(char *ev, u_char *fh) -{ - u_char *cp, *ep; - int len, val; - - ep = cp = getenv(ev); - if (cp == NULL) - return(0); - if ((strlen(cp) < 2) || (*cp != 'X')) { - freeenv(ep); - return (0); - } - len = 0; - cp++; - for (;;) { - if (*cp == 'X') { - freeenv(ep); - return(len); - } - if ((sscanf(cp, "%2x", &val) != 1) || (val > 0xff)) { - freeenv(ep); - return(0); - } - *(fh++) = val; - len++; - cp += 2; - if (len > NFSX_V2FH) { - freeenv(ep); - return(0); - } - } -} - -/* - * Populate the essential fields in the nfsv3_diskless structure. - * - * The loader is expected to export the following environment variables: - * - * boot.netif.ip IP address on boot interface - * boot.netif.netmask netmask on boot interface - * boot.netif.gateway default gateway (optional) - * boot.netif.hwaddr hardware address of boot interface - * boot.nfsroot.server IP address of root filesystem server - * boot.nfsroot.path path of the root filesystem on server - * boot.nfsroot.nfshandle NFS handle for root filesystem on server - */ -static void -pxe_setup_nfsdiskless(void) -{ - struct nfs_diskless *nd = &nfs_diskless; - struct ifnet *ifp; - struct ifaddr *ifa; - struct sockaddr_dl *sdl, ourdl; - struct sockaddr_in myaddr, netmask; - char *cp; - - /* set up interface */ - if (inaddr_to_sockaddr("boot.netif.ip", &myaddr)) - return; - if (inaddr_to_sockaddr("boot.netif.netmask", &netmask)) { - printf("PXE: no netmask\n"); - return; - } - bcopy(&myaddr, &nd->myif.ifra_addr, sizeof(myaddr)); - bcopy(&myaddr, &nd->myif.ifra_broadaddr, sizeof(myaddr)); - ((struct sockaddr_in *) &nd->myif.ifra_broadaddr)->sin_addr.s_addr = - myaddr.sin_addr.s_addr | ~ netmask.sin_addr.s_addr; - bcopy(&netmask, &nd->myif.ifra_mask, sizeof(netmask)); - - if (hwaddr_to_sockaddr("boot.netif.hwaddr", &ourdl)) { - printf("PXE: no hardware address\n"); - return; - } - ifa = NULL; - TAILQ_FOREACH(ifp, &ifnet, if_link) { - TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) { - if ((ifa->ifa_addr->sa_family == AF_LINK) && - (sdl = ((struct sockaddr_dl *)ifa->ifa_addr))) { - if ((sdl->sdl_type == ourdl.sdl_type) && - (sdl->sdl_alen == ourdl.sdl_alen) && - !bcmp(sdl->sdl_data + sdl->sdl_nlen, - ourdl.sdl_data + ourdl.sdl_nlen, - sdl->sdl_alen)) - goto match_done; - } - } - } - printf("PXE: no interface\n"); - return; /* no matching interface */ -match_done: - sprintf(nd->myif.ifra_name, "%s%d", ifp->if_name, ifp->if_unit); - - - /* set up gateway */ - inaddr_to_sockaddr("boot.netif.gateway", &nd->mygateway); - - /* XXX set up swap? */ - - /* set up root mount */ - nd->root_args.rsize = 8192; /* XXX tunable? */ - nd->root_args.wsize = 8192; - nd->root_args.sotype = SOCK_DGRAM; - nd->root_args.flags = (NFSMNT_WSIZE | NFSMNT_RSIZE | NFSMNT_RESVPORT); - if (inaddr_to_sockaddr("boot.nfsroot.server", &nd->root_saddr)) { - printf("PXE: no server\n"); - return; - } - nd->root_saddr.sin_port = htons(NFS_PORT); - if (decode_nfshandle("boot.nfsroot.nfshandle", &nd->root_fh[0]) == 0) { - printf("PXE: no NFS handle\n"); - return; - } - if ((cp = getenv("boot.nfsroot.path")) != NULL) { - strncpy(nd->root_hostnam, cp, MNAMELEN - 1); - freeenv(cp); - } - - nfs_diskless_valid = 1; -} -#endif ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#20 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.537 2002/09/20 17:50:53 phk Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.538 2002/09/22 01:32:48 mdodd Exp $ */ #include "opt_atalk.h" @@ -508,6 +508,10 @@ struct trapframe *regs = td->td_frame; struct pcb *pcb = td->td_pcb; + /* Reset pc->pcb_gs and %gs before possibly invalidating it. */ + pcb->pcb_gs = _udatasel; + load_gs(_udatasel); + if (td->td_proc->p_md.md_ldt) user_ldt_free(td); @@ -524,19 +528,6 @@ /* PS_STRINGS value for BSD/OS binaries. It is 0 for non-BSD/OS. */ regs->tf_ebx = ps_strings; - /* reset %gs as well */ - if (pcb == PCPU_GET(curpcb)) - load_gs(_udatasel); - - /* - * Always reset pcb->pcb_gs to udatasel, it will be loaded into gs - * by cpu_switch_load_gs when this process returns from the system - * call. Failing to reset pcb_gs here can cause cpu_switch_load_gs - * to trigger a general protection fault if the parent process had - * modified gs to point at a LDT entry. - */ - pcb->pcb_gs = _udatasel; - /* * Reset the hardware debug registers if they were in use. * They won't have any meaning for the newly exec'd process. ==== //depot/projects/hammer/sys/x86_64/x86_64/mem.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/i386/mem.c,v 1.97 2002/08/03 00:59:15 peter Exp $ + * $FreeBSD: src/sys/i386/i386/mem.c,v 1.98 2002/09/21 19:02:17 markm Exp $ */ /* @@ -182,19 +182,17 @@ eaddr = round_page(uio->uio_offset + c); if (addr < (vm_offset_t)VADDR(PTDPTDI, 0)) - return EFAULT; + return (EFAULT); if (eaddr >= (vm_offset_t)VADDR(APTDPTDI, 0)) - return EFAULT; + return (EFAULT); for (; addr < eaddr; addr += PAGE_SIZE) - if (pmap_extract(kernel_pmap, addr) == 0) { - return EFAULT; - } + if (pmap_extract(kernel_pmap, addr) == 0) + return (EFAULT); if (!kernacc((caddr_t)(int)uio->uio_offset, c, uio->uio_rw == UIO_READ ? - VM_PROT_READ : VM_PROT_WRITE)) { + VM_PROT_READ : VM_PROT_WRITE)) return (EFAULT); - } error = uiomove((caddr_t)(int)uio->uio_offset, (int)c, uio); continue; } @@ -221,14 +219,14 @@ /* minor device 0 is physical memory */ case 0: - return i386_btop(offset); + return (i386_btop(offset)); /* minor device 1 is kernel memory */ case 1: - return i386_btop(vtophys(offset)); + return (i386_btop(vtophys(offset))); default: - return -1; + return (-1); } } @@ -270,9 +268,9 @@ error = copyout(md, mo->mo_desc, nd * sizeof(struct mem_range_desc)); free(md, M_MEMDESC); - } else { + } + else nd = mem_range_softc.mr_ndesc; - } mo->mo_arg[0] = nd; break; @@ -301,13 +299,11 @@ if (mem_range_softc.mr_op == NULL) return (EOPNOTSUPP); - if (*arg == 0) { + if (*arg == 0) *arg = mem_range_softc.mr_ndesc; - } - else { + else bcopy(mem_range_softc.mr_desc, mrd, (*arg) * sizeof(struct mem_range_desc)); - } return (0); } @@ -338,19 +334,19 @@ 0640, "kmem"); iodev = make_dev(&mem_cdevsw, 14, UID_ROOT, GID_WHEEL, 0600, "io"); - return 0; + return (0); case MOD_UNLOAD: destroy_dev(memdev); destroy_dev(kmemdev); destroy_dev(iodev); - return 0; + return (0); case MOD_SHUTDOWN: - return 0; + return (0); default: - return EOPNOTSUPP; + return (EOPNOTSUPP); } } ==== //depot/projects/hammer/sys/x86_64/x86_64/support.s#5 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/support.s,v 1.92 2002/09/16 19:25:08 mini Exp $ + * $FreeBSD: src/sys/i386/i386/support.s,v 1.93 2002/09/22 04:45:20 peter Exp $ */ #include @@ -656,27 +656,6 @@ pushq %rax lretq -/* - * void lidt(struct region_descriptor *rdp); - */ -ENTRY(lidt) - lidt (%rdi) - ret - -/* - * void lldt(u_short sel) - */ -ENTRY(lldt) - lldt %di - ret - -/* - * void ltr(u_short sel) - */ -ENTRY(ltr) - ltr %di - ret - /* void reset_dbregs() */ ENTRY(reset_dbregs) movl $0,%eax To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Sep 21 21:58:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BD8E37B404; Sat, 21 Sep 2002 21:58:42 -0700 (PDT) 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 D02BE37B401 for ; Sat, 21 Sep 2002 21:58:41 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E60B43E42 for ; Sat, 21 Sep 2002 21:58:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8M4wfCo004878 for ; Sat, 21 Sep 2002 21:58:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8M4wfXq004875 for perforce@freebsd.org; Sat, 21 Sep 2002 21:58:41 -0700 (PDT) Date: Sat, 21 Sep 2002 21:58:41 -0700 (PDT) Message-Id: <200209220458.g8M4wfXq004875@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17911 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17911 Change 17911 by rwatson@rwatson_tislabs on 2002/09/21 21:58:02 Adding missing wrapper function. Too late at night to be committing. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#277 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#277 (text+ko) ==== @@ -3347,6 +3347,15 @@ MAC_PERFORM(create_devfs_device, dev, de, &de->de_label); } +void +mac_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, + struct devfs_dirent *de) +{ + + MAC_PERFORM(create_devfs_symlink, cred, dd, &dd->de_label, de, + &de->de_label); +} + static int mac_stdcreatevnode_ea(struct vnode *vp) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 9:32:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20B8037B401; Sun, 22 Sep 2002 09:32:13 -0700 (PDT) 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 B9CBD37B404 for ; Sun, 22 Sep 2002 09:32:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3392C43E3B for ; Sun, 22 Sep 2002 09:32:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8MGWCCo051490 for ; Sun, 22 Sep 2002 09:32:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8MGWBkY051428 for perforce@freebsd.org; Sun, 22 Sep 2002 09:32:11 -0700 (PDT) Date: Sun, 22 Sep 2002 09:32:11 -0700 (PDT) Message-Id: <200209221632.g8MGWBkY051428@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17933 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17933 Change 17933 by rwatson@rwatson_paprika on 2002/09/22 09:31:12 Apparently I neglected to commit the mac_mls implementation of mpo_check_vnode_link() when I added that. Presumably a missed p4 edit after a local chmod +w while on travel. Here it is. As with other implementations, we have to wait for the IFC of the VOP_LINK() changes from Don Lewis before we can do the label checks on the target vnode. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#92 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#92 (text+ko) ==== @@ -1691,6 +1691,31 @@ } static int +mac_mls_check_vnode_link(struct ucred *cred, struct vnode *dvp, + struct label *dlabel, struct vnode *vp, struct label *label, + struct componentname *cnp) +{ + struct mac_mls *subj, *obj; + + if (!mac_mls_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(dlabel); + + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); + +#if 0 + obj = SLOT(dlabel); + if (!mac_mls_dominate_single(obj, subj)) + return (EACCES); +#endif + + return (0); +} + +static int mac_mls_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp) { @@ -2308,6 +2333,8 @@ (macop_t)mac_mls_check_vnode_getacl }, { MAC_CHECK_VNODE_GETEXTATTR, (macop_t)mac_mls_check_vnode_getextattr }, + { MAC_CHECK_VNODE_LINK, + (macop_t)mac_mls_check_vnode_link }, { MAC_CHECK_VNODE_LOOKUP, (macop_t)mac_mls_check_vnode_lookup }, { MAC_CHECK_VNODE_OPEN, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 10:23:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 836B937B404; Sun, 22 Sep 2002 10:23:15 -0700 (PDT) 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 2C02E37B401 for ; Sun, 22 Sep 2002 10:23:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA7C743E75 for ; Sun, 22 Sep 2002 10:23:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8MHNECo003305 for ; Sun, 22 Sep 2002 10:23:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8MHNEd5003302 for perforce@freebsd.org; Sun, 22 Sep 2002 10:23:14 -0700 (PDT) Date: Sun, 22 Sep 2002 10:23:14 -0700 (PDT) Message-Id: <200209221723.g8MHNEd5003302@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17935 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17935 Change 17935 by rwatson@rwatson_paprika on 2002/09/22 10:22:33 Teach mac_partition model that a request to set the partition to 0 is a no-op during the relabel check (we already handled it that way in the actual relabel implementation). This reduces interference with other loaded policies. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#13 (text+ko) ==== @@ -196,15 +196,26 @@ } static int -mac_partition_check_cred_relabel(struct ucred *cred, struct mac *newlabel) +mac_partition_check_cred_relabel(struct ucred *cred, struct label *newlabel) { + int error; + + error = 0; + + /* Treat "0" as a no-op request. */ + if (SLOT(newlabel) != 0) { + /* If we're already in a partition, can't repartition. */ + if (SLOT(&cred->cr_label) != 0) + return (EPERM); - /* If in a partition, can't re-partition. */ - if (SLOT(&cred->cr_label) != 0) - return (EPERM); + /* + * If not in a partition, must have privilege to create + * one. + */ + error = suser_cred(cred, 0); + } - /* If not in a partition, must have privilege */ - return (suser_cred(cred, 0)); + return (error); } static int To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 14:37:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 444A037B404; Sun, 22 Sep 2002 14:37:31 -0700 (PDT) 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 E0F3337B401 for ; Sun, 22 Sep 2002 14:37:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9CFA443E42 for ; Sun, 22 Sep 2002 14:37:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8MLbUCo089964 for ; Sun, 22 Sep 2002 14:37:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8MLbULP089960 for perforce@freebsd.org; Sun, 22 Sep 2002 14:37:30 -0700 (PDT) Date: Sun, 22 Sep 2002 14:37:30 -0700 (PDT) Message-Id: <200209222137.g8MLbULP089960@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 17942 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17942 Change 17942 by rwatson@rwatson_paprika on 2002/09/22 14:37:16 During ffs_close_ea(), if the authorizing credential is NULL, use the closed equivilent to KERNELCRED, thread0.td_ucred. This prevents a NULL pointer dereference in ffs_extwrite, re-fixing a bug phk previously fixed and possibly re-introduced. We'll have to figure out a bit more about what we mean by "kernel credential" sometime, but this approximation is workable. Affected files ... .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vnops.c#9 (text+ko) ==== @@ -1430,6 +1430,8 @@ dp = ip->i_din2; error = ip->i_ea_error; if (commit && error == 0) { + if (cred == NULL) + cred = thread0.td_ucred; liovec.iov_base = ip->i_ea_area; liovec.iov_len = ip->i_ea_len; luio.uio_iov = &liovec; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 18:11:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99D8237B404; Sun, 22 Sep 2002 18:11:55 -0700 (PDT) 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 40E5837B401; Sun, 22 Sep 2002 18:11:55 -0700 (PDT) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C2EE43E81; Sun, 22 Sep 2002 18:11:54 -0700 (PDT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.3/8.12.3) with ESMTP id g8N1Br9R095569; Sun, 22 Sep 2002 19:11:53 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Sun, 22 Sep 2002 19:11:36 -0600 (MDT) Message-Id: <20020922.191136.67563804.imp@bsdimp.com> To: peter@freebsd.org Cc: perforce@freebsd.org Subject: Re: PERFORCE change 17812 for review From: "M. Warner Losh" In-Reply-To: <200209210253.g8L2rSYZ096282@freefall.freebsd.org> References: <200209210253.g8L2rSYZ096282@freefall.freebsd.org> X-Mailer: Mew version 2.1 on Emacs 21.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: <200209210253.g8L2rSYZ096282@freefall.freebsd.org> Peter Wemm writes: : #ifdef PC98 There are no pc98 hammers dude! Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 18:13:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 976E137B404; Sun, 22 Sep 2002 18:13:18 -0700 (PDT) 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 45B2737B401; Sun, 22 Sep 2002 18:13:18 -0700 (PDT) Received: from harmony.village.org (rover.bsdimp.com [204.144.255.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8417343E3B; Sun, 22 Sep 2002 18:13:17 -0700 (PDT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.3/8.12.3) with ESMTP id g8N1DG9R095578; Sun, 22 Sep 2002 19:13:16 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Sun, 22 Sep 2002 19:13:00 -0600 (MDT) Message-Id: <20020922.191300.15873264.imp@bsdimp.com> To: peter@freebsd.org Cc: perforce@freebsd.org Subject: Re: PERFORCE change 17828 for review From: "M. Warner Losh" In-Reply-To: <200209210425.g8L4PTuW023973@freefall.freebsd.org> References: <200209210425.g8L4PTuW023973@freefall.freebsd.org> X-Mailer: Mew version 2.1 on Emacs 21.2 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG In message: <200209210425.g8L4PTuW023973@freefall.freebsd.org> Peter Wemm writes: : remove microchannel (I defy somebody to show me a : hammer + microchannel system!), various other cruft. Get rid I'd go further and say that there won't be any EISA hammer boxes. Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 21: 8:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F26DC37B404; Sun, 22 Sep 2002 21:08:33 -0700 (PDT) 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 86B9237B42A for ; Sun, 22 Sep 2002 21:08:30 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2429F43E3B for ; Sun, 22 Sep 2002 21:08:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N48UCo003166 for ; Sun, 22 Sep 2002 21:08:30 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N48Tbt003163 for perforce@freebsd.org; Sun, 22 Sep 2002 21:08:29 -0700 (PDT) Date: Sun, 22 Sep 2002 21:08:29 -0700 (PDT) Message-Id: <200209230408.g8N48Tbt003163@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17950 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17950 Change 17950 by peter@peter_overcee on 2002/09/22 21:08:27 EISA? what's that? Affected files ... .. //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#5 edit .. //depot/projects/hammer/sys/x86_64/isa/isa.h#4 edit .. //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/isa/intr_machdep.c#5 (text+ko) ==== @@ -181,9 +181,8 @@ { int retval = 0; int isa_port = inb(0x61); - int eisa_port = inb(0x461); - log(LOG_CRIT, "NMI ISA %x, EISA %x\n", isa_port, eisa_port); + log(LOG_CRIT, "NMI ISA STATUS 0x%02x", isa_port); if (isa_port & NMI_PARITY) { log(LOG_CRIT, "RAM parity error, likely hardware failure."); @@ -195,29 +194,7 @@ retval = 1; } - /* - * On a real EISA machine, this will never happen. However it can - * happen on ISA machines which implement XT style floating point - * error handling (very rare). Save them from a meaningless panic. - */ - if (eisa_port == 0xff) - return(retval); - - if (eisa_port & ENMI_WATCHDOG) { - log(LOG_CRIT, "EISA watchdog timer expired, likely hardware failure."); - retval = 1; - } - - if (eisa_port & ENMI_BUSTIMER) { - log(LOG_CRIT, "EISA bus timeout, likely hardware failure."); - retval = 1; - } - - if (eisa_port & ENMI_IOSTATUS) { - log(LOG_CRIT, "EISA I/O port status error."); - retval = 1; - } - return(retval); + return (retval); } /* ==== //depot/projects/hammer/sys/x86_64/isa/isa.h#4 (text+ko) ==== @@ -147,7 +147,6 @@ #define IO_COMSIZE 8 /* 8250, 16x50 com controllers */ #define IO_DMASIZE 16 /* 8237 DMA controllers */ #define IO_DPGSIZE 32 /* 74LS612 DMA page registers */ -#define IO_EISASIZE 256 /* EISA controllers */ #define IO_FDCSIZE 8 /* Nec765 floppy controllers */ #define IO_GAMSIZE 16 /* AT compatible game controllers */ #define IO_GSCSIZE 8 /* GeniScan GS-4500G hand scanner */ ==== //depot/projects/hammer/sys/x86_64/x86_64/nexus.c#5 (text+ko) ==== @@ -223,15 +223,9 @@ */ bus_generic_attach(dev); /* - * And if we didn't see EISA or ISA on a pci bridge, create some + * And if we didn't see an ISA on a pci bridge, create some * connection points now so they show up "on motherboard". */ - if (!devclass_get_device(devclass_find("eisa"), 0)) { - child = BUS_ADD_CHILD(dev, 0, "eisa", 0); - if (child == NULL) - panic("nexus_attach eisa"); - device_probe_and_attach(child); - } if (!devclass_get_device(devclass_find("isa"), 0)) { child = BUS_ADD_CHILD(dev, 0, "isa", 0); if (child == NULL) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 21:12: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A87F37B404; Sun, 22 Sep 2002 21:11:36 -0700 (PDT) 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 CB71637B401 for ; Sun, 22 Sep 2002 21:11:35 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E754D43E77 for ; Sun, 22 Sep 2002 21:11:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N4BYCo004849 for ; Sun, 22 Sep 2002 21:11:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N4BYcH004846 for perforce@freebsd.org; Sun, 22 Sep 2002 21:11:34 -0700 (PDT) Date: Sun, 22 Sep 2002 21:11:34 -0700 (PDT) Message-Id: <200209230411.g8N4BYcH004846@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17951 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17951 Change 17951 by peter@peter_overcee on 2002/09/22 21:11:04 IFC @17948 Affected files ... .. //depot/projects/hammer/bin/cp/cp.c#3 integrate .. //depot/projects/hammer/contrib/gcc/toplev.c#3 integrate .. //depot/projects/hammer/etc/rc.d/diskless#2 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc0#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#2 integrate .. //depot/projects/hammer/include/inttypes.h#3 integrate .. //depot/projects/hammer/include/limits.h#3 integrate .. //depot/projects/hammer/include/stdlib.h#5 integrate .. //depot/projects/hammer/include/wchar.h#5 integrate .. //depot/projects/hammer/lib/libc/i386/gen/signalcontext.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libc/locale/wcstoimax.c#1 branch .. //depot/projects/hammer/lib/libc/locale/wcstol.3#3 integrate .. //depot/projects/hammer/lib/libc/locale/wcstoll.c#1 branch .. //depot/projects/hammer/lib/libc/locale/wcstoull.c#1 branch .. //depot/projects/hammer/lib/libc/locale/wcstoumax.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/local.h#5 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetwc.c#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.8#3 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.c#3 integrate .. //depot/projects/hammer/sbin/mdmfs/pathnames.h#2 integrate .. //depot/projects/hammer/sbin/newfs/newfs.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#3 integrate .. //depot/projects/hammer/sys/alpha/include/atomic.h#2 integrate .. //depot/projects/hammer/sys/alpha/osf1/imgact_osf1.c#3 integrate .. //depot/projects/hammer/sys/coda/coda_namecache.h#2 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/hammer/sys/conf/NOTES#4 integrate .. //depot/projects/hammer/sys/conf/files#4 integrate .. //depot/projects/hammer/sys/conf/options#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/hammer/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/hammer/sys/dev/md/md.c#4 integrate .. //depot/projects/hammer/sys/dev/random/hash.c#2 integrate .. //depot/projects/hammer/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/hammer/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#3 integrate .. //depot/projects/hammer/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/hammer/sys/i386/apm/apm.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/autoconf.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/db_interface.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/legacy.c#1 branch .. //depot/projects/hammer/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/mem.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/mpapic.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/support.s#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#3 integrate .. //depot/projects/hammer/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/hammer/sys/i386/include/legacyvar.h#1 branch .. //depot/projects/hammer/sys/i386/include/segments.h#2 integrate .. //depot/projects/hammer/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/hammer/sys/kern/imgact_aout.c#4 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/hammer/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/hammer/sys/kern/init_main.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_alq.c#1 branch .. //depot/projects/hammer/sys/kern/kern_exec.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#3 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#3 integrate .. //depot/projects/hammer/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/hammer/sys/net/netisr.c#1 branch .. //depot/projects/hammer/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#1 branch .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/hammer/sys/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/hammer/sys/pci/amdpm.c#2 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#3 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/autoconf.c#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/hammer/sys/sys/alq.h#1 branch .. //depot/projects/hammer/sys/sys/imgact.h#3 integrate .. //depot/projects/hammer/sys/sys/ktr.h#3 integrate .. //depot/projects/hammer/sys/sys/unistd.h#3 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#4 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#3 integrate .. //depot/projects/hammer/sys/vm/vm_map.h#2 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/hammer/sys/vm/vm_unix.c#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag#2 integrate .. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.c#2 integrate Differences ... ==== //depot/projects/hammer/bin/cp/cp.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.41 2002/09/21 01:28:33 wollman Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.42 2002/09/22 11:15:56 mckay Exp $"); /* * Cp copies source files to target files. @@ -361,9 +361,10 @@ * honour setuid, setgid and sticky bits, but we * normally want to preserve them on directories. */ - if (pflag) - rval = setfile(curr->fts_statp, 0); - else { + if (pflag) { + if (setfile(curr->fts_statp, 0)) + rval = 1; + } else { mode = curr->fts_statp->st_mode; if ((mode & (S_ISUID | S_ISGID | S_ISTXT)) || ((mode | S_IRWXU) & mask) != (mode & mask)) ==== //depot/projects/hammer/contrib/gcc/toplev.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/toplev.c,v 1.16 2002/09/01 21:06:42 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/toplev.c,v 1.17 2002/09/22 07:26:38 obrien Exp $ */ /* This is the top level of cc1/c++. It parses command args, opens files, invokes the various passes @@ -4691,7 +4691,7 @@ } #endif /*FORCE_OPTIMIZATION_DOWNGRADE*/ -#if defined(__alpha__) +#if defined(TRY_WITHOUT_THIS__alpha__) if (optimize > 1) { warning ("\n***\n***\tThe -O%d flag TRIGGERS KNOWN OPTIMIZER BUGS ON THIS PLATFORM\n***", ==== //depot/projects/hammer/etc/rc.d/diskless#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/diskless,v 1.20 2002/06/25 01:52:33 bsd Exp $ +# $FreeBSD: src/etc/rc.d/diskless,v 1.21 2002/09/22 09:48:02 phk Exp $ # # PROVIDE: diskless @@ -49,10 +49,7 @@ if [ -n "$4" ]; then bpi="-i $4" fi - /sbin/mdconfig -a -t malloc -s $1 -u $3 - /sbin/disklabel -r -w md$3 auto - /sbin/newfs $bpi /dev/md$3c - /sbin/mount /dev/md$3c $2 + /sbin/mdmfs $bpi -s $1 -M md$3 $2 } # If there is a global system configuration file, suck it in. ==== //depot/projects/hammer/etc/rc.d/initdiskless#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/initdiskless,v 1.18 2002/07/28 03:41:53 dd Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.19 2002/09/22 09:48:02 phk Exp $ # # PROVIDE: initdiskless @@ -67,10 +67,7 @@ mount_md() { - /sbin/mdconfig -a -t malloc -s $1 -u $3 - /sbin/disklabel -r -w md$3 auto - /sbin/newfs -i 4096 /dev/md$3c - /sbin/mount /dev/md$3c $2 + /sbin/mdmfs -i 4096 -s $1 -M md$3 $2 } # DEBUGGING ==== //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc0#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.28 2002/08/31 20:57:53 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.29 2002/09/22 05:29:37 obrien Exp $ # # This is included explicitly at the top of each sub-Makefile. We can't # use the normal "Makefile.inc" mechanism, because we need some of these @@ -8,7 +8,6 @@ VERSION_DATE= 20020720 TARGET_ARCH?= ${MACHINE_ARCH} -BINUTIL_ARCH= ${TARGET_ARCH} # RELTOP is the relative path to this point in the source or object # tree, from any subdirectory of same. It gets extra "../" prefixes @@ -23,18 +22,18 @@ .endif CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I. -.if exists(${.CURDIR}/${BINUTIL_ARCH}) -CFLAGS+= -I${.CURDIR}/${BINUTIL_ARCH} +.if exists(${.CURDIR}/${TARGET_ARCH}) +CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} .endif CFLAGS+= -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd/${BINUTIL_ARCH} +CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd/${TARGET_ARCH} CFLAGS+= -I${SRCDIR}/include -.if exists(${.CURDIR}/${BINUTIL_ARCH}) -.PATH: ${.CURDIR}/${BINUTIL_ARCH} +.if exists(${.CURDIR}/${TARGET_ARCH}) +.PATH: ${.CURDIR}/${TARGET_ARCH} .endif -ARCHS= ${BINUTIL_ARCH} +ARCHS= ${TARGET_ARCH} .for _arch in ${CROSS_ARCH} .if (${ARCHS:R:M${_arch:R}} == "") ==== //depot/projects/hammer/gnu/usr.bin/binutils/as/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.11 2001/10/14 01:47:30 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.12 2002/09/22 05:29:37 obrien Exp $ .include "${.CURDIR}/../Makefile.inc0" -GASES= ${BINUTIL_ARCH} +GASES= ${TARGET_ARCH} FORMATS=freebsd # Only build the cross tools when not cross-compiling. ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.20 2002/07/16 16:10:39 mike Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.21 2002/09/22 05:29:37 obrien Exp $ .include "../Makefile.inc0" @@ -19,16 +19,8 @@ INTERNALLIB= true CLEANFILES+= config.h targmatch.h -# If set, BINUTILSDISTDIR is the path to a directory containing the full GNU -# binutils release. FreeBSD only distributes the bits that are required to -# build native architectures. BINUTILSDISTDIR is needed to build cross tools. -.if defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR}) -.PATH: ${BINUTILSDISTDIR}/bfd ${BINUTILSDISTDIR}/opcodes -CFLAGS+= -I${BINUTILSDISTDIR}/bfd -I${BINUTILSDISTDIR}/include -I. -.endif - SELARCH= -.if ${BINUTIL_ARCH} == "sparc64" +.if ${TARGET_ARCH} == "sparc64" SELARCH= &bfd_sparc_arch .else .for _a in ${ARCHS} @@ -55,7 +47,7 @@ sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET} config.h: config.h.fbsd -.if ${BINUTIL_ARCH} == "i386" +.if ${TARGET_ARCH} == "i386" sed -e 's,!!TRAD_HEADER!!,"hosts/i386bsd.h",g' ${.ALLSRC} > ${.TARGET} .else sed -e 's,!!TRAD_HEADER!!,,g' ${.ALLSRC} > ${.TARGET} ==== //depot/projects/hammer/include/inttypes.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/inttypes.h,v 1.7 2002/09/06 11:23:32 tjr Exp $ + * $FreeBSD: src/include/inttypes.h,v 1.8 2002/09/22 08:06:45 tjr Exp $ */ #ifndef _INTTYPES_H_ @@ -32,13 +32,6 @@ #include #include -#ifndef __cplusplus -#ifndef _WCHAR_T_DECLARED -typedef __wchar_t wchar_t; -#define _WCHAR_T_DECLARED -#endif -#endif - typedef struct { intmax_t quot; /* Quotient. */ intmax_t rem; /* Remainder. */ @@ -50,9 +43,10 @@ intmax_t strtoimax(const char * __restrict, char ** __restrict, int); uintmax_t strtoumax(const char * __restrict, char ** __restrict, int); -/* XXX: The following functions are missing the restrict type qualifier. */ -intmax_t wcstoimax(const wchar_t *, wchar_t **, int); -uintmax_t wcstoumax(const wchar_t *, wchar_t **, int); +intmax_t wcstoimax(const __wchar_t * __restrict, + __wchar_t ** __restrict, int); +uintmax_t wcstoumax(const __wchar_t * __restrict, + __wchar_t ** __restrict, int); __END_DECLS #endif /* !_INTTYPES_H_ */ ==== //depot/projects/hammer/include/limits.h#3 (text+ko) ==== @@ -31,11 +31,12 @@ * SUCH DAMAGE. * * @(#)limits.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/include/limits.h,v 1.12 2002/09/21 02:00:44 wollman Exp $ + * $FreeBSD: src/include/limits.h,v 1.13 2002/09/21 21:28:25 bde Exp $ */ #ifndef _LIMITS_H_ #define _LIMITS_H_ + #include #if __POSIX_VISIBLE @@ -64,16 +65,16 @@ #endif #if __POSIX_VISIBLE >= 199309 -#define _POSIX_AIO_LISTIO_MAX 16 -#define _POSIX_AIO_MAX 1 -#define _POSIX_DELAYTIMER_MAX 32 -#define _POSIX_MQ_OPEN_MAX 8 -#define _POSIX_MQ_PRIO_MAX 32 -#define _POSIX_RTSIG_MAX 0 -#define _POSIX_SEM_NSEMS_MAX 256 -#define _POSIX_SEM_VALUE_MAX 32767 -#define _POSIX_SIGQUEUE_MAX 32 -#define _POSIX_TIMER_MAX 32 +#define _POSIX_AIO_LISTIO_MAX 16 +#define _POSIX_AIO_MAX 1 +#define _POSIX_DELAYTIMER_MAX 32 +#define _POSIX_MQ_OPEN_MAX 8 +#define _POSIX_MQ_PRIO_MAX 32 +#define _POSIX_RTSIG_MAX 0 +#define _POSIX_SEM_NSEMS_MAX 256 +#define _POSIX_SEM_VALUE_MAX 32767 +#define _POSIX_SIGQUEUE_MAX 32 +#define _POSIX_TIMER_MAX 32 #endif #if __POSIX_VISIBLE >= 200112 @@ -82,17 +83,18 @@ #if __XSI_VISIBLE #define _XOPEN_IOV_MAX 16 -#define PASS_MAX 128 /* _PASSWORD_LEN from */ +#define PASS_MAX 128 /* _PASSWORD_LEN from */ -#define NL_ARGMAX 99 /* max # of position args for printf */ -#define NL_LANGMAX 31 /* max LANG name length */ -#define NL_MSGMAX 32767 -#define NL_NMAX 1 -#define NL_SETMAX 255 -#define NL_TEXTMAX 2048 -#endif +#define NL_ARGMAX 99 /* max # of position args for printf */ +#define NL_LANGMAX 31 /* max LANG name length */ +#define NL_MSGMAX 32767 +#define NL_NMAX 1 +#define NL_SETMAX 255 +#define NL_TEXTMAX 2048 +#endif #include + #if __POSIX_VISIBLE #include #endif ==== //depot/projects/hammer/include/stdlib.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.43 2002/09/21 02:03:58 wollman Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.44 2002/09/21 22:05:37 bde Exp $ */ #ifndef _STDLIB_H_ @@ -60,13 +60,13 @@ #endif typedef struct { - int quot; /* quotient */ - int rem; /* remainder */ + int quot; /* quotient */ + int rem; /* remainder */ } div_t; typedef struct { - long quot; /* quotient */ - long rem; /* remainder */ + long quot; + long rem; } ldiv_t; #ifndef NULL @@ -99,18 +99,18 @@ ldiv_t ldiv(long, long) __pure2; void *malloc(size_t); int mblen(const char *, size_t); -size_t mbstowcs(wchar_t *__restrict , const char *__restrict, size_t); +size_t mbstowcs(wchar_t * __restrict , const char * __restrict, size_t); int mbtowc(wchar_t * __restrict, const char * __restrict, size_t); void qsort(void *, size_t, size_t, int (*)(const void *, const void *)); int rand(void); void *realloc(void *, size_t); void srand(unsigned); -double strtod(const char *__restrict, char **__restrict); -/* float strtof(const char *__restrict, char **__restrict); */ -long strtol(const char *__restrict, char **__restrict, int); +double strtod(const char * __restrict, char ** __restrict); +/* float strtof(const char * __restrict, char ** __restrict); */ +long strtol(const char * __restrict, char ** __restrict, int); /* long double - strtold(const char *__restrict, char **__restrict); */ + strtold(const char * __restrict, char ** __restrict); */ unsigned long strtoul(const char * __restrict, char ** __restrict, int); int system(const char *); @@ -144,14 +144,14 @@ /* LONGLONG */ lldiv_t lldiv(long long, long long) __pure2; /* LONGLONG */ -long long - strtoll(const char *__restrict, char **__restrict, int); +long long + strtoll(const char * __restrict, char ** __restrict, int); /* LONGLONG */ unsigned long long - strtoull(const char *__restrict, char **__restrict, int); + strtoull(const char * __restrict, char ** __restrict, int); #endif /* __LONG_LONG_SUPPORTED */ -void _Exit(int) __dead2; +void _Exit(int) __dead2; #endif /* __ISO_C_VISIBLE >= 1999 */ /* @@ -176,10 +176,10 @@ /* XXX XSI requires pollution from here. We'd rather not. */ /* long a64l(const char *); */ double drand48(void); -/* char *ecvt(double, int, int *__restrict, int *__restrict); */ +/* char *ecvt(double, int, int * __restrict, int * __restrict); */ double erand48(unsigned short[3]); -/* char *fcvt(double, int, int *__restrict, int *__restrict); */ -/* char *gcvt(double, int, int *__restrict, int *__restrict); */ +/* char *fcvt(double, int, int * __restrict, int * __restrict); */ +/* char *gcvt(double, int, int * __restrict, int * __restrict); */ #ifndef _GETSUBOPT_DECLARED int getsubopt(char **, char *const *, char **); #define _GETSUBOPT_DECLARED @@ -196,7 +196,7 @@ #endif #ifndef _MKTEMP_DECLARED char *mktemp(char *); -#define _MKTEMP_DECLARED +#define _MKTEMP_DECLARED #endif long mrand48(void); long nrand48(unsigned short[3]); @@ -217,10 +217,10 @@ /* int unlockpt(int); */ #endif /* __XSI_VISIBLE */ - #if __BSD_VISIBLE extern const char *_malloc_options; -extern void (*_malloc_message)(const char *, const char *, const char *, const char *); +extern void (*_malloc_message)(const char *, const char *, const char *, + const char *); void *alloca(size_t); /* built-in for gcc */ __uint32_t @@ -260,7 +260,8 @@ void srandomdev(void); /* Deprecated interfaces, to be removed in FreeBSD 6.0. */ -__int64_t strtoq(const char *, char **, int); +__int64_t + strtoq(const char *, char **, int); __uint64_t strtouq(const char *, char **, int); #endif /* __BSD_VISIBLE */ ==== //depot/projects/hammer/include/wchar.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.28 2002/09/21 13:00:29 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.29 2002/09/22 08:06:45 tjr Exp $ */ /*- @@ -154,8 +154,12 @@ wchar_t *wcstok(wchar_t * __restrict, const wchar_t * __restrict, wchar_t ** __restrict); long wcstol(const wchar_t * __restrict, wchar_t ** __restrict, int); +long long + wcstoll(const wchar_t * __restrict, wchar_t ** __restrict, int); unsigned long wcstoul(const wchar_t * __restrict, wchar_t ** __restrict, int); +unsigned long long + wcstoull(const wchar_t * __restrict, wchar_t ** __restrict, int); wchar_t *wmemchr(const wchar_t *, wchar_t, size_t); int wmemcmp(const wchar_t *, const wchar_t *, size_t); wchar_t *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t); ==== //depot/projects/hammer/lib/libc/i386/gen/signalcontext.c#2 (text+ko) ==== @@ -23,18 +23,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/i386/gen/signalcontext.c,v 1.2 2002/09/17 03:15:47 mini Exp $ + * $FreeBSD: src/lib/libc/i386/gen/signalcontext.c,v 1.3 2002/09/21 23:54:32 mini Exp $ */ #include __FBSDID("$FreeBSD"); #include -#include -#include #include #include #include +#include __weak_reference(__signalcontext, signalcontext); @@ -43,10 +42,10 @@ int __signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func) { + register_t *p; struct sigframe *sfp; - int *p; - /* + /*- * Set up stack. * (n = sizeof(int)) * 2n+sizeof(struct sigframe) ucp @@ -54,29 +53,27 @@ * 1n &func * 0n &_ctx_start */ - p = (int *)ucp->uc_mcontext.mc_esp; - *--p = (int)ucp; + p = (register_t *)(void *)(intptr_t)ucp->uc_mcontext.mc_esp; + *--p = (register_t)(intptr_t)ucp; p -= sizeof(struct sigframe); sfp = (struct sigframe *)p; bzero(sfp, sizeof(struct sigframe)); sfp->sf_signum = sig; - sfp->sf_siginfo = (int)&sfp->sf_si; - sfp->sf_ucontext = (int)&sfp->sf_uc; + sfp->sf_siginfo = (register_t)(intptr_t)&sfp->sf_si; + sfp->sf_ucontext = (register_t)(intptr_t)&sfp->sf_uc; sfp->sf_ahu.sf_action = (__siginfohandler_t *)func; bcopy(ucp, &sfp->sf_uc, sizeof(ucontext_t)); sfp->sf_si.si_signo = sig; + *--p = (register_t)(intptr_t)func; - *--p = (int)func; - /* * Set up ucontext_t. */ ucp->uc_mcontext.mc_ebp = ucp->uc_mcontext.mc_esp - sizeof(int); - ucp->uc_mcontext.mc_esp = (int)p; - ucp->uc_mcontext.mc_eip = (int)_ctx_start; + ucp->uc_mcontext.mc_esp = (register_t)(intptr_t)p; + ucp->uc_mcontext.mc_eip = (register_t)(intptr_t)_ctx_start; ucp->uc_mcontext.mc_eflags &= ~PSL_T; ucp->uc_link = &sfp->sf_uc; - SIGDELSET(ucp->uc_sigmask, sig); + sigdelset(&ucp->uc_sigmask, sig); return (0); } - ==== //depot/projects/hammer/lib/libc/locale/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.38 2002/09/15 08:38:51 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.39 2002/09/22 08:06:45 tjr Exp $ # locale sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale @@ -12,9 +12,10 @@ mskanji.c nl_langinfo.c nomacros.c none.c rune.c \ runetype.c setinvalidrune.c setlocale.c setrunelocale.c table.c \ tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wcsftime.c wcstod.c \ - wcstol.c \ + wcstoimax.c wcstol.c wcstoll.c \ wcstombs.c \ - wcstoul.c wctob.c wctomb.c wctrans.c wctype.c wcwidth.c + wcstoul.c wcstoull.c wcstoumax.c wctob.c wctomb.c wctrans.c wctype.c \ + wcwidth.c .if ${LIB} == "c" MAN+= btowc.3 \ @@ -48,7 +49,8 @@ rune.3 sputrune.3 MLINKS+=setlocale.3 localeconv.3 MLINKS+=towlower.3 towupper.3 -MLINKS+=wcstol.3 wcstoul.3 +MLINKS+=wcstol.3 wcstoul.3 wcstol.3 wcstoll.3 wcstol.3 wcstoull.3 \ + wcstol.3 wcstoimax.3 wcstol.3 wcstoumax.3 MLINKS+=wctrans.3 towctrans.3 MLINKS+=wctype.3 iswctype.3 .endif ==== //depot/projects/hammer/lib/libc/locale/wcstol.3#3 (text+ko) ==== @@ -22,17 +22,23 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcstol.3,v 1.2 2002/09/12 09:25:27 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcstol.3,v 1.3 2002/09/22 08:06:45 tjr Exp $ .\" .Dd September 7, 2002 .Dt WCSTOL 3 .Os .Sh NAME -.Nm wcstol , wcstoul +.Nm wcstol , wcstoul , +.Nm wcstoll , wcstoull , +.Nm wcstoimax , wcstoumax .Nd "convert a wide character string value to a" -.Vt long +.Vt long , +.Vt "unsigned long" , +.Vt "long long" , +.Vt "unsigned long long" , +.Vt intmax_t or -.Vt "unsigned long" +.Vt uintmax_t integer .Sh LIBRARY .Lb libc @@ -42,28 +48,47 @@ .Fn wcstol "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" .Ft "unsigned long" .Fn wcstoul "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" +.Ft "long long" +.Fn wcstoll "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" +.Ft "unsigned long long" +.Fn wcstoull "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" +.In inttypes.h +.Ft intmax_t +.Fn wcstoimax "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" +.Ft uintmax_t +.Fn wcstoumax "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" .Sh DESCRIPTION The -.Fn wcstol +.Fn wcstol , +.Fn wcstoul , +.Fn wcstoll , +.Fn wcstoull , +.Fn wcstoimax and -.Fn wcstoul +.Fn wcstoumax functions are wide-character versions of the -.Fn strtol +.Fn strtol , +.Fn strtoul , +.Fn strtoll , +.Fn strtoull , +.Fn strtoimax and -.Fn strtoul +.Fn strtoumax functions. -Refer to -.Xr strtol 3 -and -.Xr strtoul 3 +Refer to their manual pages (for example +.Xr strtol 3 ) for details. .Sh SEE ALSO .Xr strtol 3 , .Xr strtoul 3 .Sh STANDARDS The -.Fn wcstol +.Fn wcstol , +.Fn wcstoul , +.Fn wcstoll , +.Fn wcstoull , +.Fn wcstoimax and -.Fn wcstoul +.Fn wcstoumax functions conform to .St -isoC-99 . ==== //depot/projects/hammer/lib/libc/stdio/local.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)local.h 8.3 (Berkeley) 7/3/94 - * $FreeBSD: src/lib/libc/stdio/local.h,v 1.16 2002/09/21 13:00:30 tjr Exp $ + * $FreeBSD: src/lib/libc/stdio/local.h,v 1.17 2002/09/22 05:59:00 tjr Exp $ */ #include /* for off_t */ @@ -71,6 +71,7 @@ extern int __swsetup(FILE *); extern int __sflags(const char *, int *); extern int __ungetc(int, FILE *); +extern wint_t __ungetwc(wchar_t, FILE *); extern int __vfprintf(FILE *, const char *, __va_list); extern int __vfwprintf(FILE *, const wchar_t *, __va_list); ==== //depot/projects/hammer/lib/libc/stdio/ungetwc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetwc.c,v 1.3 2002/09/20 13:23:26 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetwc.c,v 1.4 2002/09/22 05:59:00 tjr Exp $"); #include "namespace.h" #include @@ -36,28 +36,40 @@ #include "libc_private.h" #include "local.h" +/* + * Non-MT-safe version. + */ wint_t -ungetwc(wint_t wc, FILE *fp) +__ungetwc(wint_t wc, FILE *fp) { char buf[MB_LEN_MAX]; mbstate_t mbs; size_t len; - FLOCKFILE(fp); - ORIENT(fp, 1); if (wc == WEOF) - goto error; + return (WEOF); memset(&mbs, 0, sizeof(mbs)); if ((len = wcrtomb(buf, wc, &mbs)) == (size_t)-1) - goto error; + return (WEOF); while (len-- != 0) if (__ungetc((unsigned char)buf[len], fp) == EOF) - goto error; - FUNLOCKFILE(fp); + return (WEOF); return (wc); +} + +/* + * MT-safe version. + */ +wint_t +ungetwc(wint_t wc, FILE *fp) +{ + wint_t r; -error: + FLOCKFILE(fp); + ORIENT(fp, 1); + r = __ungetwc(wc, fp); FUNLOCKFILE(fp); - return (WEOF); + + return (r); } ==== //depot/projects/hammer/sbin/ipfw/ipfw.8#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.112 2002/09/08 09:01:08 blackend Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.113 2002/09/22 11:30:51 maxim Exp $ .\" .de NOIPFW .br @@ -589,7 +589,7 @@ For packets forwarded locally, the local address of the socket will be set to the original destination address of the packet. -This makes the +This makes the .Xr netstat 1 entry look rather weird but is intended for use with transparent proxy servers. @@ -982,7 +982,7 @@ Match packets with a given .Ar dst-mac and -Ar src-mac +.Ar src-mac addresses, specified as the .Cm any keyword (matching any MAC address), or six groups of hex digits @@ -1162,7 +1162,7 @@ .El The set number of rules can be changed with the command .Pp -.Nm +.Nm .Cm set move .Brq Cm rule Ar rule-number | old-set .Cm to Ar new-set ==== //depot/projects/hammer/sbin/mdmfs/mdmfs.8#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.11 2002/08/21 18:10:49 trhodes Exp $ +.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.12 2002/09/22 09:46:28 phk Exp $ .\" .Dd August 5, 2001 .Dt MDMFS 8 @@ -84,8 +84,6 @@ .Xr md 4 disk using .Xr mdconfig 8 , -labels it using -.Xr disklabel 8 , puts a UFS file system on it using .Xr newfs 8 , and mounts it using @@ -331,7 +329,6 @@ .Sh SEE ALSO .Xr md 4 , .Xr fstab 5 , -.Xr disklabel 8 , .Xr mdconfig 8 , .Xr mount 8 , .Xr newfs 8 ==== //depot/projects/hammer/sbin/mdmfs/mdmfs.c#3 (text+ko) ==== @@ -25,14 +25,14 @@ */ /* - * mdmfs (md/MFS) is a wrapper around mdconfig(8), disklabel(8), + * mdmfs (md/MFS) is a wrapper around mdconfig(8), * newfs(8), and mount(8) that mimics the command line option set of * the deprecated mount_mfs(8). */ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.10 2002/08/21 18:10:49 trhodes Exp $"; + "$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.11 2002/09/22 09:46:28 phk Exp $"; #endif /* not lint */ #include @@ -75,7 +75,6 @@ static void argappend(char **, const char *, ...) __printflike(2, 3); static void debugprintf(const char *, ...) __printflike(1, 2); -static void do_disklabel(void); static void do_mdconfig_attach(const char *, const enum md_types); static void do_mdconfig_attach_au(const char *, const enum md_types); static void do_mdconfig_detach(void); @@ -265,7 +264,6 @@ do_mdconfig_attach_au(mdconfig_arg, mdtype); else do_mdconfig_attach(mdconfig_arg, mdtype); - do_disklabel(); do_newfs(newfs_arg); do_mount(mount_arg, mtpoint); do_mtptsetup(mtpoint, &mi); @@ -320,19 +318,6 @@ } /* - * Label the memory disk. - */ -static void -do_disklabel(void) -{ - int rv; - - rv = run(NULL, "%s -r -w %s%d auto", PATH_DISKLABEL, mdname, unit); - if (rv) - errx(1, "disklabel exited with error code %d", rv); -} - -/* * Attach a memory disk with a known unit. */ static void @@ -439,7 +424,7 @@ { int rv; - rv = run(NULL, "%s%s /dev/%s%dc %s", PATH_MOUNT, args, + rv = run(NULL, "%s%s /dev/%s%d %s", PATH_MOUNT, args, mdname, unit, mtpoint); if (rv) errx(1, "mount exited with error code %d", rv); @@ -489,7 +474,7 @@ { int rv; - rv = run(NULL, "%s%s /dev/%s%dc", PATH_NEWFS, args, mdname, unit); + rv = run(NULL, "%s%s /dev/%s%d", PATH_NEWFS, args, mdname, unit); if (rv) errx(1, "newfs exited with error code %d", rv); } ==== //depot/projects/hammer/sbin/mdmfs/pathnames.h#2 (text+ko) ==== @@ -1,9 +1,8 @@ -/* $FreeBSD: src/sbin/mdmfs/pathnames.h,v 1.1 2001/06/18 23:46:58 dd Exp $ */ +/* $FreeBSD: src/sbin/mdmfs/pathnames.h,v 1.2 2002/09/22 09:46:28 phk Exp $ */ #ifndef MDMFS_PATHNAMES_H #define MDMFS_PATHNAMES_H #define PATH_MDCONFIG "/sbin/mdconfig" -#define PATH_DISKLABEL "/sbin/disklabel" #define PATH_NEWFS "/sbin/newfs" #define PATH_MOUNT "/sbin/mount" ==== //depot/projects/hammer/sbin/newfs/newfs.c#3 (text+ko) ==== @@ -54,7 +54,7 @@ static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/newfs/newfs.c,v 1.63 2002/08/21 18:11:21 trhodes Exp $"; + "$FreeBSD: src/sbin/newfs/newfs.c,v 1.64 2002/09/22 09:41:41 phk Exp $"; #endif /* not lint */ /* @@ -374,10 +374,8 @@ return; lp->d_checksum = 0; lp->d_checksum = dkcksum(lp); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 21:23:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE55837B404; Sun, 22 Sep 2002 21:23:50 -0700 (PDT) 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 8B28137B401 for ; Sun, 22 Sep 2002 21:23:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4914B43E6E for ; Sun, 22 Sep 2002 21:23:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N4NoCo006988 for ; Sun, 22 Sep 2002 21:23:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N4Nomt006985 for perforce@freebsd.org; Sun, 22 Sep 2002 21:23:50 -0700 (PDT) Date: Sun, 22 Sep 2002 21:23:50 -0700 (PDT) Message-Id: <200209230423.g8N4Nomt006985@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17952 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17952 Change 17952 by peter@peter_overcee on 2002/09/22 21:23:27 update fxsave store area for 64 bit mode. instead of 8 xmm registers, there are 16. some segment:offset:pad groups became 64 bit pointers. Fix some errors in the x86 version. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/npx.h#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/npx.h#3 (text+ko) ==== @@ -79,16 +79,13 @@ struct envxmm { u_int16_t en_cw; /* control word (16bits) */ u_int16_t en_sw; /* status word (16bits) */ - u_int16_t en_tw; /* tag word (16bits) */ + u_int8_t en_tw; /* tag word (8bits) */ + u_int8_t en_zero; u_int16_t en_opcode; /* opcode last executed (11 bits ) */ - u_int32_t en_fip; /* floating point instruction pointer */ - u_int16_t en_fcs; /* floating code segment selector */ - u_int16_t en_pad0; /* padding */ - u_int32_t en_foo; /* floating operand offset */ - u_int16_t en_fos; /* floating operand segment selector */ - u_int16_t en_pad1; /* padding */ + u_int64_t en_rip; /* floating point instruction pointer */ + u_int64_t en_rdp; /* floating operand pointer */ u_int32_t en_mxcsr; /* SSE sontorol/status register */ - u_int32_t en_pad2; /* padding */ + u_int32_t en_mxcsr_mask; /* valid bits in mxcsr */ }; /* Contents of each SSE extended accumulator */ @@ -102,8 +99,8 @@ struct fpacc87 fp_acc; u_char fp_pad[6]; /* padding */ } sv_fp[8]; - struct xmmacc sv_xmm[8]; - u_char sv_pad[224]; + struct xmmacc sv_xmm[16]; + u_char sv_pad[96]; } __attribute__((aligned(16))); union savefpu { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 21:33: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2D5037B404; Sun, 22 Sep 2002 21:33:02 -0700 (PDT) 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 7DF6B37B401 for ; Sun, 22 Sep 2002 21:33:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 053F243E65 for ; Sun, 22 Sep 2002 21:33:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N4X1Co009057 for ; Sun, 22 Sep 2002 21:33:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N4X1c3009054 for perforce@freebsd.org; Sun, 22 Sep 2002 21:33:01 -0700 (PDT) Date: Sun, 22 Sep 2002 21:33:01 -0700 (PDT) Message-Id: <200209230433.g8N4X1c3009054@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17953 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17953 Change 17953 by peter@peter_overcee on 2002/09/22 21:32:55 We have cpu_fxsr unconditionally as an arch feature. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/md_var.h#6 edit .. //depot/projects/hammer/sys/x86_64/include/tss.h#2 edit .. //depot/projects/hammer/sys/x86_64/isa/npx.c#10 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#21 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/md_var.h#6 (text+ko) ==== @@ -42,7 +42,6 @@ extern u_int cpu_feature; extern u_int cpu_high; extern u_int cpu_id; -extern u_int cpu_fxsr; extern char cpu_vendor[]; extern uint16_t *elan_mmcr; extern char kstack[]; ==== //depot/projects/hammer/sys/x86_64/include/tss.h#2 (text+ko) ==== ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#10 (text+ko) ==== @@ -81,11 +81,8 @@ #define fldcw(addr) __asm("fldcw %0" : : "m" (*(addr))) #define fnclex() __asm("fnclex") #define fninit() __asm("fninit") -#define fnsave(addr) __asm __volatile("fnsave %0" : "=m" (*(addr))) #define fnstcw(addr) __asm __volatile("fnstcw %0" : "=m" (*(addr))) #define fnstsw(addr) __asm __volatile("fnstsw %0" : "=m" (*(addr))) -#define fp_divide_by_0() __asm("fldz; fld1; fdiv %st,%st(1); fnop") -#define frstor(addr) __asm("frstor %0" : : "m" (*(addr))) #define fxrstor(addr) __asm("fxrstor %0" : : "m" (*(addr))) #define fxsave(addr) __asm __volatile("fxsave %0" : "=m" (*(addr))) #define start_emulating() __asm("smsw %%ax; orb %0,%%al; lmsw %%ax" \ @@ -97,11 +94,8 @@ void fldcw(caddr_t addr); void fnclex(void); void fninit(void); -void fnsave(caddr_t addr); void fnstcw(caddr_t addr); void fnstsw(caddr_t addr); -void fp_divide_by_0(void); -void frstor(caddr_t addr); void fxsave(caddr_t addr); void fxrstor(caddr_t addr); void start_emulating(void); @@ -109,14 +103,8 @@ #endif /* __GNUC__ */ -#define GET_FPU_CW(thread) \ - (cpu_fxsr ? \ - (thread)->td_pcb->pcb_save.sv_xmm.sv_env.en_cw : \ - (thread)->td_pcb->pcb_save.sv_87.sv_env.en_cw) -#define GET_FPU_SW(thread) \ - (cpu_fxsr ? \ - (thread)->td_pcb->pcb_save.sv_xmm.sv_env.en_sw : \ - (thread)->td_pcb->pcb_save.sv_87.sv_env.en_sw) +#define GET_FPU_CW(thread) ((thread)->td_pcb->pcb_save.sv_xmm.sv_env.en_cw) +#define GET_FPU_SW(thread) ((thread)->td_pcb->pcb_save.sv_xmm.sv_env.en_sw) typedef u_char bool_t; @@ -237,8 +225,7 @@ npxsave(&dummy); stop_emulating(); /* XXX npxsave() doesn't actually initialize the fpu in the SSE case. */ - if (cpu_fxsr) - fninit(); + fninit(); fldcw(&control); start_emulating(); intr_restore(savecrit); @@ -278,10 +265,7 @@ npxformat() { - if (cpu_fxsr) - return (_MC_FPFMT_XMM); - else - return (_MC_FPFMT_387); + return (_MC_FPFMT_XMM); } /* @@ -636,13 +620,6 @@ s = intr_disable(); if (curthread == PCPU_GET(fpcurthread)) { fpusave(addr); - /* - * fnsave initializes the FPU and destroys whatever - * context it contains. Make sure the FPU owner - * starts with a clean state next time. - */ - if (!cpu_fxsr) - npxdrop(); intr_restore(s); return (_MC_FPOWNED_FPU); } else { @@ -677,10 +654,7 @@ union savefpu *addr; { - if (cpu_fxsr) - fxsave(addr); - else - fnsave(addr); + fxsave(addr); } static void @@ -688,10 +662,7 @@ union savefpu *addr; { - if (cpu_fxsr) - fxrstor(addr); - else - frstor(addr); + fxrstor(addr); } static device_method_t npx_methods[] = { ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#21 (text+ko) ==== @@ -1459,11 +1459,7 @@ fill_fpregs(struct thread *td, struct fpreg *fpregs) { - if (cpu_fxsr) - fill_fpregs_xmm(&td->td_pcb->pcb_save.sv_xmm, - (struct save87 *)fpregs); - else - bcopy(&td->td_pcb->pcb_save.sv_87, fpregs, sizeof *fpregs); + fill_fpregs_xmm(&td->td_pcb->pcb_save.sv_xmm, (struct save87 *)fpregs); return (0); } @@ -1471,11 +1467,7 @@ set_fpregs(struct thread *td, struct fpreg *fpregs) { - if (cpu_fxsr) - set_fpregs_xmm((struct save87 *)fpregs, - &td->td_pcb->pcb_save.sv_xmm); - else - bcopy(fpregs, &td->td_pcb->pcb_save.sv_87, sizeof *fpregs); + set_fpregs_xmm((struct save87 *)fpregs, &td->td_pcb->pcb_save.sv_xmm); return (0); } @@ -1567,8 +1559,7 @@ * npxgetregs()'s internals. */ addr = (union savefpu *)&mcp->mc_fpstate; - if (td == PCPU_GET(fpcurthread) && cpu_fxsr && - ((uintptr_t)(void *)addr & 0xF)) { + if (td == PCPU_GET(fpcurthread) && ((uintptr_t)(void *)addr & 0xF)) { do addr = (void *)((char *)addr + 4); while ((uintptr_t)(void *)addr & 0xF); @@ -1598,7 +1589,7 @@ mcp->mc_ownedfp == _MC_FPOWNED_PCB) { /* XXX align as above. */ addr = (union savefpu *)&mcp->mc_fpstate; - if (td == PCPU_GET(fpcurthread) && cpu_fxsr && + if (td == PCPU_GET(fpcurthread) && ((uintptr_t)(void *)addr & 0xF)) { do addr = (void *)((char *)addr + 4); @@ -1630,7 +1621,7 @@ npxdrop(); /* * XXX force a full drop of the npx. The above only drops it if we - * owned it. npxgetregs() has the same bug in the !cpu_fxsr case. + * owned it. * * XXX I don't much like npxgetregs()'s semantics of doing a full * drop. Dropping only to the pcb matches fnsave's behaviour. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 21:58:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A19FF37B404; Sun, 22 Sep 2002 21:58:35 -0700 (PDT) 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 36AC437B401 for ; Sun, 22 Sep 2002 21:58:35 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 447EE43E4A for ; Sun, 22 Sep 2002 21:58:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N4wYCo013476 for ; Sun, 22 Sep 2002 21:58:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N4wX5U013473 for perforce@freebsd.org; Sun, 22 Sep 2002 21:58:33 -0700 (PDT) Date: Sun, 22 Sep 2002 21:58:33 -0700 (PDT) Message-Id: <200209230458.g8N4wX5U013473@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17956 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17956 Change 17956 by peter@peter_overcee on 2002/09/22 21:57:56 unwind more x87/sse entanglement. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/npx.h#4 edit .. //depot/projects/hammer/sys/x86_64/include/pcb.h#2 edit .. //depot/projects/hammer/sys/x86_64/isa/npx.c#11 edit .. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#7 edit .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#22 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/npx.h#4 (text+ko) ==== @@ -45,35 +45,14 @@ #ifndef _MACHINE_NPX_H_ #define _MACHINE_NPX_H_ -/* Environment information of floating point unit */ -struct env87 { - long en_cw; /* control word (16bits) */ - long en_sw; /* status word (16bits) */ - long en_tw; /* tag word (16bits) */ - long en_fip; /* floating point instruction pointer */ - u_short en_fcs; /* floating code segment selector */ - u_short en_opcode; /* opcode last executed (11 bits ) */ - long en_foo; /* floating operand offset */ - long en_fos; /* floating operand segment selector */ -}; - -/* Contents of each floating point accumulator */ +/* Contents of each x87 floating point accumulator */ struct fpacc87 { -#ifdef dontdef /* too unportable */ - u_long fp_mantlo; /* mantissa low (31:0) */ - u_long fp_manthi; /* mantissa high (63:32) */ - int fp_exp:15; /* exponent */ - int fp_sgn:1; /* mantissa sign */ -#else u_char fp_bytes[10]; -#endif }; -/* Floating point context */ -struct save87 { - struct env87 sv_env; /* floating point control/status */ - struct fpacc87 sv_ac[8]; /* accumulator contents, 0-7 */ - u_char sv_pad0[4]; /* padding for (now unused) saved status word */ +/* Contents of each SSE extended accumulator */ +struct xmmacc { + u_char xmm_bytes[16]; }; struct envxmm { @@ -88,12 +67,7 @@ u_int32_t en_mxcsr_mask; /* valid bits in mxcsr */ }; -/* Contents of each SSE extended accumulator */ -struct xmmacc { - u_char xmm_bytes[16]; -}; - -struct savexmm { +struct savefpu { struct envxmm sv_env; struct { struct fpacc87 fp_acc; @@ -103,11 +77,6 @@ u_char sv_pad[96]; } __attribute__((aligned(16))); -union savefpu { - struct save87 sv_87; - struct savexmm sv_xmm; -}; - /* * The hardware default control word for i387's and later coprocessors is * 0x37F, giving: @@ -132,10 +101,10 @@ void npxdrop(void); void npxexit(struct thread *td); int npxformat(void); -int npxgetregs(struct thread *td, union savefpu *addr); +int npxgetregs(struct thread *td, struct savefpu *addr); void npxinit(u_short control); -void npxsave(union savefpu *addr); -void npxsetregs(struct thread *td, union savefpu *addr); +void npxsave(struct savefpu *addr); +void npxsetregs(struct thread *td, struct savefpu *addr); int npxtrap(void); #endif ==== //depot/projects/hammer/sys/x86_64/include/pcb.h#2 (text+ko) ==== @@ -61,7 +61,7 @@ int pcb_dr6; int pcb_dr7; - union savefpu pcb_save; + struct savefpu pcb_save; u_int pcb_flags; #define FP_SOFTFP 0x01 /* process using software fltng pnt emulator */ #define PCB_DBREGS 0x02 /* process using debug registers */ ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#11 (text+ko) ==== @@ -111,15 +111,13 @@ static int npx_attach(device_t dev); static void npx_identify(driver_t *driver, device_t parent); static int npx_probe(device_t dev); -static void fpusave(union savefpu *); -static void fpurstor(union savefpu *); int hw_float = 1; SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, &hw_float, 0, "Floatingpoint instructions executed in hardware"); -static union savefpu npx_cleanstate; +static struct savefpu npx_cleanstate; static bool_t npx_cleanstate_ready; /* @@ -198,7 +196,7 @@ if (npx_cleanstate_ready == 0) { s = intr_disable(); stop_emulating(); - fpusave(&npx_cleanstate); + fxsave(&npx_cleanstate); start_emulating(); npx_cleanstate_ready = 1; intr_restore(s); @@ -213,7 +211,7 @@ npxinit(control) u_short control; { - static union savefpu dummy; + static struct savefpu dummy; register_t savecrit; /* @@ -541,7 +539,7 @@ * instructions are broken the same as frstor, so our * treatment does not amplify the breakage. */ - fpurstor(&pcb->pcb_save); + fxrstor(&pcb->pcb_save); } intr_restore(s); @@ -573,11 +571,11 @@ */ void npxsave(addr) - union savefpu *addr; + struct savefpu *addr; { stop_emulating(); - fpusave(addr); + fxsave(addr); start_emulating(); PCPU_SET(fpcurthread, NULL); @@ -605,7 +603,7 @@ int npxgetregs(td, addr) struct thread *td; - union savefpu *addr; + struct savefpu *addr; { register_t s; @@ -619,7 +617,7 @@ s = intr_disable(); if (curthread == PCPU_GET(fpcurthread)) { - fpusave(addr); + fxsave(addr); intr_restore(s); return (_MC_FPOWNED_FPU); } else { @@ -635,13 +633,13 @@ void npxsetregs(td, addr) struct thread *td; - union savefpu *addr; + struct savefpu *addr; { register_t s; s = intr_disable(); if (curthread == PCPU_GET(fpcurthread)) { - fpurstor(addr); + fxrstor(addr); intr_restore(s); } else { intr_restore(s); @@ -649,22 +647,6 @@ } } -static void -fpusave(addr) - union savefpu *addr; -{ - - fxsave(addr); -} - -static void -fpurstor(addr) - union savefpu *addr; -{ - - fxrstor(addr); -} - static device_method_t npx_methods[] = { /* Device interface */ DEVMETHOD(device_identify, npx_identify), ==== //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#7 (text+ko) ==== @@ -136,7 +136,7 @@ ASSYM(PCB_SPARE, offsetof(struct pcb, __pcb_spare)); ASSYM(PCB_FLAGS, offsetof(struct pcb, pcb_flags)); ASSYM(PCB_SAVEFPU, offsetof(struct pcb, pcb_save)); -ASSYM(PCB_SAVEFPU_SIZE, sizeof(union savefpu)); +ASSYM(PCB_SAVEFPU_SIZE, sizeof(struct savefpu)); ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); ASSYM(PCB_SIZE, sizeof(struct pcb)); ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#22 (text+ko) ==== @@ -1544,7 +1544,7 @@ static void get_fpcontext(struct thread *td, mcontext_t *mcp) { - union savefpu *addr; + struct savefpu *addr; /* * XXX mc_fpstate might be misaligned, since its declaration is not @@ -1558,14 +1558,14 @@ * called, although this requires knowing too much about * npxgetregs()'s internals. */ - addr = (union savefpu *)&mcp->mc_fpstate; + addr = (struct savefpu *)&mcp->mc_fpstate; if (td == PCPU_GET(fpcurthread) && ((uintptr_t)(void *)addr & 0xF)) { do addr = (void *)((char *)addr + 4); while ((uintptr_t)(void *)addr & 0xF); } mcp->mc_ownedfp = npxgetregs(td, addr); - if (addr != (union savefpu *)&mcp->mc_fpstate) { + if (addr != (struct savefpu *)&mcp->mc_fpstate) { bcopy(addr, &mcp->mc_fpstate, sizeof(mcp->mc_fpstate)); bzero(&mcp->mc_spare2, sizeof(mcp->mc_spare2)); } @@ -1575,12 +1575,11 @@ static int set_fpcontext(struct thread *td, const mcontext_t *mcp) { - union savefpu *addr; + struct savefpu *addr; if (mcp->mc_fpformat == _MC_FPFMT_NODEV) return (0); - else if (mcp->mc_fpformat != _MC_FPFMT_387 && - mcp->mc_fpformat != _MC_FPFMT_XMM) + else if (mcp->mc_fpformat != _MC_FPFMT_XMM) return (EINVAL); else if (mcp->mc_ownedfp == _MC_FPOWNED_NONE) /* We don't care what state is left in the FPU or PCB. */ @@ -1588,7 +1587,7 @@ else if (mcp->mc_ownedfp == _MC_FPOWNED_FPU || mcp->mc_ownedfp == _MC_FPOWNED_PCB) { /* XXX align as above. */ - addr = (union savefpu *)&mcp->mc_fpstate; + addr = (struct savefpu *)&mcp->mc_fpstate; if (td == PCPU_GET(fpcurthread) && ((uintptr_t)(void *)addr & 0xF)) { do To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 22: 6:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A777037B401; Sun, 22 Sep 2002 22:06:47 -0700 (PDT) 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 1859237B406 for ; Sun, 22 Sep 2002 22:06:47 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82BD543E7B for ; Sun, 22 Sep 2002 22:06:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N56kCo019958 for ; Sun, 22 Sep 2002 22:06:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N56kCT019953 for perforce@freebsd.org; Sun, 22 Sep 2002 22:06:46 -0700 (PDT) Date: Sun, 22 Sep 2002 22:06:46 -0700 (PDT) Message-Id: <200209230506.g8N56kCT019953@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17959 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17959 Change 17959 by peter@peter_overcee on 2002/09/22 22:06:17 integ i386_hammer Affected files ... .. //depot/projects/hammer/sys/x86_64/include/tss.h#3 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/include/tss.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)tss.h 5.4 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/i386/include/tss.h,v 1.12 2000/10/27 08:30:56 bde Exp $ + * $FreeBSD: src/sys/i386/include/tss.h,v 1.13 2002/09/23 05:04:05 peter Exp $ */ #ifndef _MACHINE_TSS_H_ @@ -47,26 +47,20 @@ struct i386tss { int tss_link; /* actually 16 bits: top 16 bits must be zero */ int tss_esp0; /* kernel stack pointer privilege level 0 */ -#define tss_ksp tss_esp0 int tss_ss0; /* actually 16 bits: top 16 bits must be zero */ int tss_esp1; /* kernel stack pointer privilege level 1 */ int tss_ss1; /* actually 16 bits: top 16 bits must be zero */ int tss_esp2; /* kernel stack pointer privilege level 2 */ int tss_ss2; /* actually 16 bits: top 16 bits must be zero */ int tss_cr3; /* page table directory */ -#define tss_ptd tss_cr3 int tss_eip; /* program counter */ -#define tss_pc tss_eip int tss_eflags; /* program status longword */ -#define tss_psl tss_eflags int tss_eax; int tss_ecx; int tss_edx; int tss_ebx; int tss_esp; /* user stack pointer */ -#define tss_usp tss_esp int tss_ebp; /* user frame pointer */ -#define tss_fp tss_ebp int tss_esi; int tss_edi; int tss_es; /* actually 16 bits: top 16 bits must be zero */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 22:23:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6872737B404; Sun, 22 Sep 2002 22:23:09 -0700 (PDT) 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 EEA4137B401 for ; Sun, 22 Sep 2002 22:23:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F35D43E3B for ; Sun, 22 Sep 2002 22:23:08 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N5N8Co024295 for ; Sun, 22 Sep 2002 22:23:08 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N5N8D5024292 for perforce@freebsd.org; Sun, 22 Sep 2002 22:23:08 -0700 (PDT) Date: Sun, 22 Sep 2002 22:23:08 -0700 (PDT) Message-Id: <200209230523.g8N5N8D5024292@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17963 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17963 Change 17963 by peter@peter_overcee on 2002/09/22 22:22:41 x86-64 tss.h Affected files ... .. //depot/projects/hammer/sys/x86_64/include/tss.h#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/tss.h#4 (text+ko) ==== @@ -41,37 +41,33 @@ #define _MACHINE_TSS_H_ 1 /* - * Intel 386 Context Data Type + * x86-64 Context Data Type + * + * The alignment is pretty messed up here due to reuse of the original 32 bit + * fields. It might be worth trying to set the tss on a +4 byte offset to + * make the 64 bit fields aligned in practice. */ - -struct i386tss { - int tss_link; /* actually 16 bits: top 16 bits must be zero */ - int tss_esp0; /* kernel stack pointer privilege level 0 */ - int tss_ss0; /* actually 16 bits: top 16 bits must be zero */ - int tss_esp1; /* kernel stack pointer privilege level 1 */ - int tss_ss1; /* actually 16 bits: top 16 bits must be zero */ - int tss_esp2; /* kernel stack pointer privilege level 2 */ - int tss_ss2; /* actually 16 bits: top 16 bits must be zero */ - int tss_cr3; /* page table directory */ - int tss_eip; /* program counter */ - int tss_eflags; /* program status longword */ - int tss_eax; - int tss_ecx; - int tss_edx; - int tss_ebx; - int tss_esp; /* user stack pointer */ - int tss_ebp; /* user frame pointer */ - int tss_esi; - int tss_edi; - int tss_es; /* actually 16 bits: top 16 bits must be zero */ - int tss_cs; /* actually 16 bits: top 16 bits must be zero */ - int tss_ss; /* actually 16 bits: top 16 bits must be zero */ - int tss_ds; /* actually 16 bits: top 16 bits must be zero */ - int tss_fs; /* actually 16 bits: top 16 bits must be zero */ - int tss_gs; /* actually 16 bits: top 16 bits must be zero */ - int tss_ldt; /* actually 16 bits: top 16 bits must be zero */ - int tss_ioopt; /* options & io offset bitmap: currently zero */ - /* XXX unimplemented .. i/o permission bitmap */ +#pragma pack(1) +struct x86_64tss { + u_int32_t tss_rsvd0; + u_int64_t tss_rsp0; /* kernel stack pointer ring 0 */ + u_int64_t tss_rsp1; /* kernel stack pointer ring 1 */ + u_int64_t tss_rsp2; /* kernel stack pointer ring 2 */ + u_int32_t tss_rsvd1; + u_int32_t tss_rsvd2; + u_int32_t tss_rsvd3; + u_int64_t tss_ist1; /* Interrupt stack table 1 */ + u_int64_t tss_ist2; /* Interrupt stack table 2 */ + u_int64_t tss_ist3; /* Interrupt stack table 3 */ + u_int64_t tss_ist4; /* Interrupt stack table 4 */ + u_int64_t tss_ist5; /* Interrupt stack table 5 */ + u_int64_t tss_ist6; /* Interrupt stack table 6 */ + u_int64_t tss_ist7; /* Interrupt stack table 7 */ + u_int32_t tss_rsvd4; + u_int32_t tss_rsvd5; + u_int16_t tss_rsvd6; + u_int16_t tss_iobase; /* io bitmap offset */ }; +#pragma pack() #endif /* _MACHINE_TSS_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 23:48: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D70FD37B404; Sun, 22 Sep 2002 23:48:01 -0700 (PDT) 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 8673D37B401 for ; Sun, 22 Sep 2002 23:48:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 29E4443E6A for ; Sun, 22 Sep 2002 23:48:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N6m1Co056739 for ; Sun, 22 Sep 2002 23:48:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N6m0KY056730 for perforce@freebsd.org; Sun, 22 Sep 2002 23:48:00 -0700 (PDT) Date: Sun, 22 Sep 2002 23:48:00 -0700 (PDT) Message-Id: <200209230648.g8N6m0KY056730@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17972 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17972 Change 17972 by peter@peter_overcee on 2002/09/22 23:47:03 split up the memory and system descriptors. They have different sizes in 64 bit mode. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/segments.h#6 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/segments.h#6 (text+ko) ==== @@ -42,7 +42,7 @@ #define _MACHINE_SEGMENTS_H_ /* - * 386 Segmentation Data Structures and definitions + * x86-64 Segmentation Data Structures and definitions * William F. Jolitz (william@ernie.berkeley.edu) 6/20/1989 */ @@ -60,7 +60,25 @@ #define GSEL(s,r) (((s)<<3) | r) /* a global selector */ /* - * Memory and System segment descriptors + * Memory segment descriptors (%cs, %ds etc for compatability apps. 32 bit wide) + */ +struct segment_descriptor { + unsigned sd_lolimit:16 ; /* segment extent (lsb) */ + unsigned sd_lobase:24 __attribute__ ((packed)); + /* segment base address (lsb) */ + unsigned sd_type:5 ; /* segment type */ + unsigned sd_dpl:2 ; /* segment descriptor priority level */ + unsigned sd_p:1 ; /* segment descriptor present */ + unsigned sd_hilimit:4 ; /* segment extent (msb) */ + unsigned sd_xx:1 ; /* unused */ + unsigned sd_l:2 ; /* long mode (cs only) */ + unsigned sd_def32:1 ; /* default 32 vs 16 bit size */ + unsigned sd_gran:1 ; /* limit granularity (byte/page units)*/ + unsigned sd_hibase:8 ; /* segment base address (msb) */ +}; + +/* + * System segment descriptors (64 bit wide) */ struct segment_descriptor { unsigned sd_lolimit:16 ; /* segment extent (lsb) */ @@ -75,10 +93,10 @@ unsigned sd_def32:1 ; /* default 32 vs 16 bit size */ unsigned sd_gran:1 ; /* limit granularity (byte/page units)*/ unsigned sd_hibase:8 ; /* segment base address (msb) */ -} ; +}; /* - * Gate descriptors (e.g. indirect descriptors) + * Gate descriptors (e.g. indirect descriptors, trap, interrupt etc. 64 bit) */ struct gate_descriptor { unsigned gd_looffset:16 ; /* gate offset (lsb) */ @@ -91,14 +109,6 @@ unsigned gd_hioffset:16 ; /* gate offset (msb) */ unsigned gd_hihioffset:32 ; /* gate offset (bits 32-63) */ unsigned gd_rsvd:32 ; /* reserved */ -} ; - -/* - * Generic descriptor - */ -union descriptor { - struct segment_descriptor sd; - struct gate_descriptor gd; }; /* system segments and gate types */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 23:54:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A20A37B404; Sun, 22 Sep 2002 23:54:14 -0700 (PDT) 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 AE0C537B401 for ; Sun, 22 Sep 2002 23:54:12 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CFEFA43E42 for ; Sun, 22 Sep 2002 23:54:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N6sBCo061543 for ; Sun, 22 Sep 2002 23:54:11 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N6s9x2061537 for perforce@freebsd.org; Sun, 22 Sep 2002 23:54:09 -0700 (PDT) Date: Sun, 22 Sep 2002 23:54:09 -0700 (PDT) Message-Id: <200209230654.g8N6s9x2061537@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17974 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17974 Change 17974 by peter@peter_overcee on 2002/09/22 23:53:51 IFC @17973 Affected files ... .. //depot/projects/hammer/contrib/bind/port/freebsd/include/port_after.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/endian.h#3 integrate .. //depot/projects/hammer/sys/alpha/pci/tsunamireg.h#2 integrate .. //depot/projects/hammer/sys/boot/ia64/skiload/main.c#2 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_all.c#3 integrate .. //depot/projects/hammer/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/hammer/sys/compat/linux/linux_sysctl.c#3 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/hammer/sys/dev/ciss/cissio.h#2 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#3 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/hammer/sys/dev/isp/isp_inline.h#2 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/hammer/sys/dev/isp/ispmbox.h#3 integrate .. //depot/projects/hammer/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_freebsd.c#2 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_freebsd.h#2 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/ray/if_raymib.h#2 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb.h#2 integrate .. //depot/projects/hammer/sys/i386/include/endian.h#3 integrate .. //depot/projects/hammer/sys/i386/include/npx.h#3 integrate .. //depot/projects/hammer/sys/i386/include/segments.h#3 integrate .. //depot/projects/hammer/sys/i386/include/tss.h#2 integrate .. //depot/projects/hammer/sys/i386/linux/linux_proto.h#2 integrate .. //depot/projects/hammer/sys/i386/linux/linux_syscall.h#2 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/hammer/sys/i386/linux/syscalls.master#2 integrate .. //depot/projects/hammer/sys/ia64/include/endian.h#3 integrate .. //depot/projects/hammer/sys/ia64/include/reg.h#3 integrate .. //depot/projects/hammer/sys/ia64/include/signal.h#3 integrate .. //depot/projects/hammer/sys/kern/kern_alq.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#4 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#3 integrate .. //depot/projects/hammer/sys/net/if_arc.h#2 integrate .. //depot/projects/hammer/sys/net/if_gre.h#2 integrate .. //depot/projects/hammer/sys/net/if_llc.h#2 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#3 integrate .. //depot/projects/hammer/sys/net/iso88025.h#2 integrate .. //depot/projects/hammer/sys/netinet/icmp6.h#2 integrate .. //depot/projects/hammer/sys/netinet/ip6.h#2 integrate .. //depot/projects/hammer/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/hammer/sys/powerpc/include/endian.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/endian.h#3 integrate .. //depot/projects/hammer/sys/sys/cdefs.h#3 integrate .. //depot/projects/hammer/sys/sys/linker_set.h#3 integrate .. //depot/projects/hammer/sys/sys/proc.h#4 integrate .. //depot/projects/hammer/sys/tools/vnode_if.awk#3 integrate .. //depot/projects/hammer/sys/x86_64/include/endian.h#3 integrate .. //depot/projects/hammer/tools/KSE/ksetest/kse_threads_test.c#3 integrate .. //depot/projects/hammer/tools/KSE/ksetest/simplelock.h#1 branch .. //depot/projects/hammer/usr.bin/uname/uname.c#4 integrate Differences ... ==== //depot/projects/hammer/contrib/bind/port/freebsd/include/port_after.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/bind/port/freebsd/include/port_after.h,v 1.13 2002/05/13 19:33:23 nectar Exp $ */ +/* $FreeBSD: src/contrib/bind/port/freebsd/include/port_after.h,v 1.14 2002/09/23 03:40:09 mike Exp $ */ #ifndef PORT_AFTER_H #define PORT_AFTER_H #define USE_POSIX @@ -7,7 +7,6 @@ #define USE_WAITPID #define HAVE_GETRUSAGE #define HAVE_FCHMOD -#define NEED_PSELECT #define HAVE_SA_LEN #define SETPWENT_VOID #define RLIMIT_TYPE rlim_t @@ -27,6 +26,7 @@ #define UDPSUM "udpcksum" #include +#include #include #include #if (!defined(BSD)) || (BSD < 199306) ==== //depot/projects/hammer/sys/alpha/include/endian.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)endian.h 8.1 (Berkeley) 6/10/93 * $NetBSD: endian.h,v 1.5 1997/10/09 15:42:19 bouyer Exp $ - * $FreeBSD: src/sys/alpha/include/endian.h,v 1.12 2002/08/21 16:19:58 mike Exp $ + * $FreeBSD: src/sys/alpha/include/endian.h,v 1.13 2002/09/23 04:32:16 mike Exp $ */ #ifndef _MACHINE_ENDIAN_H_ @@ -112,11 +112,20 @@ return (__r); } -#endif /* __GNUC__ */ - #define __htonl(x) __bswap32(x) #define __htons(x) __bswap16(x) #define __ntohl(x) __bswap32(x) #define __ntohs(x) __bswap16(x) +#else /* !__GNUC__ */ + +/* + * No optimizations are available for this compiler. Fall back to + * non-optimized functions by defining the constant usually used to prevent + * redefinition. + */ +#define _BYTEORDER_FUNC_DEFINED + +#endif /* __GNUC__ */ + #endif /* !_MACHINE_ENDIAN_H_ */ ==== //depot/projects/hammer/sys/alpha/pci/tsunamireg.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/pci/tsunamireg.h,v 1.3 1999/08/28 00:39:03 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/pci/tsunamireg.h,v 1.4 2002/09/23 05:55:10 peter Exp $ */ /* * 21271 Chipset registers and constants. @@ -10,7 +10,7 @@ typedef struct { - volatile u_int64_t reg __attribute__((aligned(64))); + volatile u_int64_t reg __aligned(64); } tsunami_reg; /* notes */ typedef struct { ==== //depot/projects/hammer/sys/boot/ia64/skiload/main.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.1 2001/09/12 08:34:27 dfr Exp $"; + "$FreeBSD: src/sys/boot/ia64/skiload/main.c,v 1.2 2002/09/23 05:55:10 peter Exp $"; #endif /* not lint */ #include @@ -49,7 +49,7 @@ void __start(void) { - static char stack[16384] __attribute__((aligned (16))); + static char stack[16384] __aligned(16); static char malloc[512*1024]; int i; ==== //depot/projects/hammer/sys/cam/cam_xpt.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.127 2002/09/02 20:10:18 brooks Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.128 2002/09/23 04:55:32 mjacob Exp $ */ #include #include @@ -471,6 +471,14 @@ }, { /* + * These are the large storage arrays. + * Submitted by: William Carrel + */ + { T_DIRECT, SIP_MEDIA_FIXED, "HITACHI", "OPEN*", "*" }, + CAM_QUIRK_HILUNS, 2, 1024 + }, + { + /* * This old revision of the TDC3600 is also SCSI-1, and * hangs upon serial number probing. */ ==== //depot/projects/hammer/sys/cam/scsi/scsi_all.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.37 2002/09/02 20:10:19 brooks Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.38 2002/09/23 04:56:35 mjacob Exp $ */ #include @@ -72,7 +72,9 @@ #endif /* * All devices need _some_ sort of bus settle delay, so we'll set it to - * a minimum value of 100ms. + * a minimum value of 100ms. Note that this is pertinent only for SPI- + * not transport like Fibre Channel or iSCSI where 'delay' is completely + * meaningless. */ #ifndef SCSI_MIN_DELAY #define SCSI_MIN_DELAY 100 @@ -80,7 +82,7 @@ /* * Make sure the user isn't using seconds instead of milliseconds. */ -#if (SCSI_DELAY < SCSI_MIN_DELAY) +#if (SCSI_DELAY < SCSI_MIN_DELAY && SCSI_DELAY != 0) #error "SCSI_DELAY is in milliseconds, not seconds! Please use a larger value" #endif ==== //depot/projects/hammer/sys/compat/linux/linux_socket.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. * - * $FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.32 2002/06/02 20:05:42 schweikh Exp $ + * $FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.33 2002/09/23 06:17:51 mini Exp $ */ /* XXX we use functions that might not exist. */ @@ -503,7 +503,7 @@ bsd_args.s = linux_args.s; bsd_args.name = (caddr_t)linux_args.addr; bsd_args.anamelen = linux_args.namelen; - error = oaccept(td, &bsd_args); + error = accept(td, &bsd_args); if (error) return (error); @@ -543,7 +543,7 @@ bsd_args.fdes = linux_args.s; bsd_args.asa = (caddr_t) linux_args.addr; bsd_args.alen = linux_args.namelen; - return (ogetsockname(td, &bsd_args)); + return (getsockname(td, &bsd_args)); } struct linux_getpeername_args { @@ -556,7 +556,7 @@ linux_getpeername(struct thread *td, struct linux_getpeername_args *args) { struct linux_getpeername_args linux_args; - struct ogetpeername_args /* { + struct getpeername_args /* { int fdes; caddr_t asa; int *alen; @@ -569,7 +569,7 @@ bsd_args.fdes = linux_args.s; bsd_args.asa = (caddr_t) linux_args.addr; bsd_args.alen = linux_args.namelen; - return (ogetpeername(td, &bsd_args)); + return (getpeername(td, &bsd_args)); } struct linux_socketpair_args { @@ -615,11 +615,13 @@ linux_send(struct thread *td, struct linux_send_args *args) { struct linux_send_args linux_args; - struct osend_args /* { - int s; + struct sendto_args /* { + int s; caddr_t buf; - int len; + size_t len; int flags; + caddr_t to; + int tolen; } */ bsd_args; int error; @@ -630,7 +632,9 @@ bsd_args.buf = linux_args.msg; bsd_args.len = linux_args.len; bsd_args.flags = linux_args.flags; - return (osend(td, &bsd_args)); + bsd_args.to = NULL; + bsd_args.tolen = 0; + return (sendto(td, &bsd_args)); } struct linux_recv_args { @@ -644,11 +648,13 @@ linux_recv(struct thread *td, struct linux_recv_args *args) { struct linux_recv_args linux_args; - struct orecv_args /* { + struct recvfrom_args /* { int s; caddr_t buf; int len; int flags; + caddr_t from; + int fromlen; } */ bsd_args; int error; @@ -659,7 +665,9 @@ bsd_args.buf = linux_args.msg; bsd_args.len = linux_args.len; bsd_args.flags = linux_args.flags; - return (orecv(td, &bsd_args)); + bsd_args.from = NULL; + bsd_args.fromlenaddr = NULL; + return (recvfrom(td, &bsd_args)); } struct linux_sendto_args { @@ -734,7 +742,7 @@ bsd_args.flags = linux_to_bsd_msg_flags(linux_args.flags); bsd_args.from = linux_args.from; bsd_args.fromlenaddr = linux_args.fromlen; - return (orecvfrom(td, &bsd_args)); + return (recvfrom(td, &bsd_args)); } struct linux_recvmsg_args { ==== //depot/projects/hammer/sys/compat/linux/linux_sysctl.c#3 (text+ko) ==== @@ -25,11 +25,15 @@ * (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/compat/linux/linux_sysctl.c,v 1.4 2002/09/05 08:13:20 bde Exp $ + * $FreeBSD: src/sys/compat/linux/linux_sysctl.c,v 1.5 2002/09/23 06:17:51 mini Exp $ */ #include +#include #include +#include +#include +#include #include #include @@ -117,3 +121,20 @@ free(mib, M_TEMP); return (ENOTDIR); } + +int +linux_sethostname(struct thread *td, struct linux_sethostname_args *uap) +{ + int name[2]; + int error; + + name[0] = CTL_KERN; + name[1] = KERN_HOSTNAME; + mtx_lock(&Giant); + if ((error = suser_cred(td->td_ucred, PRISON_ROOT)) == 0) { + error = userland_sysctl(td, name, 2, 0, 0, 0, + uap->hostname, uap->len, 0); + } + mtx_unlock(&Giant); + return (error); +} ==== //depot/projects/hammer/sys/compat/svr4/svr4_stream.c#3 (text+ko) ==== @@ -27,7 +27,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/compat/svr4/svr4_stream.c,v 1.31 2002/08/17 02:36:15 rwatson Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.32 2002/09/23 06:17:53 mini Exp $ */ /* @@ -2252,24 +2252,30 @@ struct thread *td; struct svr4_sys_send_args *uap; { - struct osend_args osa; + struct sendto_args osa; + SCARG(&osa, s) = SCARG(uap, s); SCARG(&osa, buf) = SCARG(uap, buf); SCARG(&osa, len) = SCARG(uap, len); SCARG(&osa, flags) = SCARG(uap, flags); - return osend(td, &osa); + SCARG(&osa, to) = NULL; + SCARG(&osa, tolen) = 0; + return sendto(td, &osa); } int svr4_sys_recv(td, uap) struct thread *td; struct svr4_sys_recv_args *uap; { - struct orecv_args ora; + struct recvfrom_args ora; + SCARG(&ora, s) = SCARG(uap, s); SCARG(&ora, buf) = SCARG(uap, buf); SCARG(&ora, len) = SCARG(uap, len); SCARG(&ora, flags) = SCARG(uap, flags); - return orecv(td, &ora); + SCARG(&osa, from) = NULL; + SCARG(&osa, fromlen) = 0; + return recvfrom(td, &ora); } /* ==== //depot/projects/hammer/sys/dev/ciss/cissio.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/cissio.h,v 1.1 2001/11/27 23:08:36 msmith Exp $ + * $FreeBSD: src/sys/dev/ciss/cissio.h,v 1.2 2002/09/23 06:35:32 alfred Exp $ */ /* @@ -108,18 +108,18 @@ u_int8_t Dev; u_int8_t Bus:6; u_int8_t Mode:2; - } PeripDev __attribute__ ((__packed__)); + } PeripDev __packed; struct { u_int8_t DevLSB; u_int8_t DevMSB:6; u_int8_t Mode:2; - } LogDev __attribute__ ((__packed__)); + } LogDev __packed; struct { u_int8_t Dev:5; u_int8_t Bus:3; u_int8_t Targ:6; u_int8_t Mode:2; - } LogUnit __attribute__ ((__packed__)); + } LogUnit __packed; } SCSI3Addr_struct; typedef struct { @@ -127,20 +127,20 @@ u_int32_t Bus:6; u_int32_t Mode:2; SCSI3Addr_struct Target[2]; -} PhysDevAddr_struct __attribute__ ((__packed__)); +} PhysDevAddr_struct __packed; typedef struct { u_int32_t VolId:30; u_int32_t Mode:2; u_int8_t reserved[4]; -} LogDevAddr_struct __attribute__ ((__packed__)); +} LogDevAddr_struct __packed; typedef union { u_int8_t LunAddrBytes[8]; SCSI3Addr_struct SCSI3Lun[4]; PhysDevAddr_struct PhysDev; LogDevAddr_struct LogDev; -} LUNAddr_struct __attribute__ ((__packed__)); +} LUNAddr_struct __packed; typedef struct { u_int8_t CDBLen; @@ -148,24 +148,24 @@ u_int8_t Type:3; u_int8_t Attribute:3; u_int8_t Direction:2; - } Type __attribute__ ((__packed__)); + } Type __packed; u_int16_t Timeout; u_int8_t CDB[16]; -} RequestBlock_struct __attribute__ ((__packed__)); +} RequestBlock_struct __packed; typedef union { struct { u_int8_t Reserved[3]; u_int8_t Type; u_int32_t ErrorInfo; - } Common_Info __attribute__ ((__packed__)); + } Common_Info __packed; struct { u_int8_t Reserved[2]; u_int8_t offense_size; u_int8_t offense_num; u_int32_t offense_value; - } Invalid_Cmd __attribute__ ((__packed__)); -} MoreErrInfo_struct __attribute__ ((__packed__)); + } Invalid_Cmd __packed; +} MoreErrInfo_struct __packed; typedef struct { u_int8_t ScsiStatus; @@ -174,7 +174,7 @@ u_int32_t ResidualCnt; MoreErrInfo_struct MoreErrInfo; u_int8_t SenseInfo[SENSEINFOBYTES]; -} ErrorInfo_struct __attribute__ ((__packed__)); +} ErrorInfo_struct __packed; typedef struct { LUNAddr_struct LUN_info; /* 8 */ @@ -182,7 +182,7 @@ ErrorInfo_struct error_info; /* 48 */ u_int16_t buf_size; /* 2 */ u_int8_t *buf; /* 4 */ -} IOCTL_Command_struct __attribute__ ((__packed__)); +} IOCTL_Command_struct __packed; /* * Note that we'd normally pass the struct in directly, but ==== //depot/projects/hammer/sys/dev/isp/isp.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.98 2002/09/07 16:12:52 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.99 2002/09/23 04:59:42 mjacob Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -950,28 +950,55 @@ * Now enable request/response queues */ - mbs.param[0] = MBOX_INIT_RES_QUEUE; - mbs.param[1] = RESULT_QUEUE_LEN(isp); - mbs.param[2] = DMA_WD1(isp->isp_result_dma); - mbs.param[3] = DMA_WD0(isp->isp_result_dma); - mbs.param[4] = 0; - mbs.param[5] = 0; - isp_mboxcmd(isp, &mbs, MBLOGALL); - if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - return; - } - isp->isp_residx = mbs.param[5]; + if (IS_ULTRA2(isp) || IS_1240(isp)) { + mbs.param[0] = MBOX_INIT_RES_QUEUE_A64; + mbs.param[1] = RESULT_QUEUE_LEN(isp); + mbs.param[2] = DMA_WD1(isp->isp_result_dma); + mbs.param[3] = DMA_WD0(isp->isp_result_dma); + mbs.param[4] = 0; + mbs.param[6] = DMA_WD3(isp->isp_result_dma); + mbs.param[7] = DMA_WD2(isp->isp_result_dma); + isp_mboxcmd(isp, &mbs, MBLOGALL); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + return; + } + isp->isp_residx = mbs.param[5]; + + mbs.param[0] = MBOX_INIT_REQ_QUEUE_A64; + mbs.param[1] = RQUEST_QUEUE_LEN(isp); + mbs.param[2] = DMA_WD1(isp->isp_rquest_dma); + mbs.param[3] = DMA_WD0(isp->isp_rquest_dma); + mbs.param[5] = 0; + mbs.param[6] = DMA_WD3(isp->isp_result_dma); + mbs.param[7] = DMA_WD2(isp->isp_result_dma); + isp_mboxcmd(isp, &mbs, MBLOGALL); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + return; + } + isp->isp_reqidx = isp->isp_reqodx = mbs.param[4]; + } else { + mbs.param[0] = MBOX_INIT_RES_QUEUE; + mbs.param[1] = RESULT_QUEUE_LEN(isp); + mbs.param[2] = DMA_WD1(isp->isp_result_dma); + mbs.param[3] = DMA_WD0(isp->isp_result_dma); + mbs.param[4] = 0; + isp_mboxcmd(isp, &mbs, MBLOGALL); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + return; + } + isp->isp_residx = mbs.param[5]; - mbs.param[0] = MBOX_INIT_REQ_QUEUE; - mbs.param[1] = RQUEST_QUEUE_LEN(isp); - mbs.param[2] = DMA_WD1(isp->isp_rquest_dma); - mbs.param[3] = DMA_WD0(isp->isp_rquest_dma); - mbs.param[4] = 0; - isp_mboxcmd(isp, &mbs, MBLOGALL); - if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - return; + mbs.param[0] = MBOX_INIT_REQ_QUEUE; + mbs.param[1] = RQUEST_QUEUE_LEN(isp); + mbs.param[2] = DMA_WD1(isp->isp_rquest_dma); + mbs.param[3] = DMA_WD0(isp->isp_rquest_dma); + mbs.param[5] = 0; + isp_mboxcmd(isp, &mbs, MBLOGALL); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + return; + } + isp->isp_reqidx = isp->isp_reqodx = mbs.param[4]; } - isp->isp_reqidx = isp->isp_reqodx = mbs.param[4]; /* * Turn on Fast Posting, LVD transitions @@ -4825,8 +4852,8 @@ ISPOPMAP(0x00, 0x00), /* 0x4f: */ ISPOPMAP(0xdf, 0xdf), /* 0x50: LOAD RAM A64 */ ISPOPMAP(0xdf, 0xdf), /* 0x51: DUMP RAM A64 */ - ISPOPMAP(0xdf, 0xdf), /* 0x52: INITIALIZE REQUEST QUEUE A64 */ - ISPOPMAP(0xff, 0xff), /* 0x53: INITIALIZE RESPONSE QUEUE A64 */ + ISPOPMAP(0xdf, 0xff), /* 0x52: INITIALIZE REQUEST QUEUE A64 */ + ISPOPMAP(0xef, 0xff), /* 0x53: INITIALIZE RESPONSE QUEUE A64 */ ISPOPMAP(0xcf, 0x01), /* 0x54: EXECUTE IOCB A64 */ ISPOPMAP(0x07, 0x01), /* 0x55: ENABLE TARGET MODE */ ISPOPMAP(0x03, 0x0f), /* 0x56: GET TARGET STATUS */ ==== //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.70 2002/09/06 18:32:16 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.71 2002/09/23 05:00:14 mjacob Exp $ */ /* * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob @@ -61,7 +61,10 @@ #include "opt_ddb.h" #include "opt_isp.h" -#define ISP_DMA_ADDR_T bus_addr_t +/* + * Not quite yet + */ +/* #define ISP_DAC_SUPPORTED 1 */ /* * Efficiency- get rid of SBus code && tests unless we need them. ==== //depot/projects/hammer/sys/dev/isp/isp_inline.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_inline.h,v 1.27 2002/07/11 03:25:04 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_inline.h,v 1.28 2002/09/23 05:00:37 mjacob Exp $ */ /* * Qlogic Host Adapter Inline Functions * @@ -476,7 +476,7 @@ ISP_IOXPUT_8(isp, tqsrc->req_cdb[i], &tqdst->req_cdb[i]); } ISP_IOXPUT_32(isp, tqsrc->req_totalcnt, &tqdst->req_totalcnt); - for (i = 0; i < ISP_RQDSEG_T2; i++) { + for (i = 0; i < ISP_RQDSEG_T3; i++) { ISP_IOXPUT_32(isp, tqsrc->req_dataseg[i].ds_base, &tqdst->req_dataseg[i].ds_base); ISP_IOXPUT_32(isp, tqsrc->req_dataseg[i].ds_basehi, ==== //depot/projects/hammer/sys/dev/isp/isp_pci.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.87 2002/08/17 17:21:54 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.88 2002/09/23 05:02:53 mjacob Exp $ */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. * FreeBSD Version. @@ -1057,7 +1057,7 @@ caddr_t base; u_int32_t len; int i, error, ns; - bus_size_t bl; + bus_size_t alim, slim; struct imush im; /* @@ -1067,16 +1067,20 @@ return (0); } +#ifdef ISP_DAC_SUPPORTED + alim = BUS_SPACE_UNRESTRICTED; +#else + alim = BUS_SPACE_MAXADDR_32BIT; +#endif if (IS_ULTRA2(isp) || IS_FC(isp) || IS_1240(isp)) { - bl = BUS_SPACE_UNRESTRICTED; + slim = BUS_SPACE_MAXADDR_32BIT; } else { - bl = BUS_SPACE_MAXADDR_24BIT; + slim = BUS_SPACE_MAXADDR_24BIT; } ISP_UNLOCK(isp); - if (bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR, - BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, - ISP_NSEGS, bl, 0, &pcs->dmat)) { + if (bus_dma_tag_create(NULL, 1, slim+1, alim, alim, + NULL, NULL, BUS_SPACE_MAXSIZE, ISP_NSEGS, slim, 0, &pcs->dmat)) { isp_prt(isp, ISP_LOGERR, "could not create master dma tag"); ISP_LOCK(isp); return(1); @@ -1109,8 +1113,8 @@ } ns = (len / PAGE_SIZE) + 1; - if (bus_dma_tag_create(pcs->dmat, QENTRY_LEN, 0, BUS_SPACE_MAXADDR, - BUS_SPACE_MAXADDR, NULL, NULL, len, ns, bl, 0, &isp->isp_cdmat)) { + if (bus_dma_tag_create(pcs->dmat, QENTRY_LEN, slim+1, alim, alim, + NULL, NULL, len, ns, slim, 0, &isp->isp_cdmat)) { isp_prt(isp, ISP_LOGERR, "cannot create a dma tag for control spaces"); free(pcs->dmaps, M_DEVBUF); ==== //depot/projects/hammer/sys/dev/isp/isp_sbus.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.4 2002/07/25 20:49:30 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_sbus.c,v 1.5 2002/09/23 05:03:34 mjacob Exp $ */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. * FreeBSD Version. @@ -477,7 +477,6 @@ caddr_t base; u_int32_t len; int i, error, ns; - bus_size_t bl; struct imush im; /* @@ -488,17 +487,16 @@ } ISP_UNLOCK(isp); - bl = BUS_SPACE_MAXADDR_24BIT; - if (bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR, - BUS_SPACE_MAXADDR, NULL, NULL, BUS_SPACE_MAXSIZE, - ISP_NSEGS, bl, 0, &sbs->dmat)) { + if (bus_dma_tag_create(NULL, 1, BUS_SPACE_MAXADDR_24BIT-1, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR_32BIT, + NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, ISP_NSEGS, + BUS_SPACE_MAXADDR_24BIT, 0, &sbs->dmat)) { isp_prt(isp, ISP_LOGERR, "could not create master dma tag"); ISP_LOCK(isp); return(1); } - len = sizeof (XS_T **) * isp->isp_maxcmds; isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_WAITOK | M_ZERO); if (isp->isp_xflist == NULL) { @@ -522,8 +520,9 @@ len += ISP_QUEUE_SIZE(RESULT_QUEUE_LEN(isp)); ns = (len / PAGE_SIZE) + 1; - if (bus_dma_tag_create(sbs->dmat, QENTRY_LEN, 0, BUS_SPACE_MAXADDR, - BUS_SPACE_MAXADDR, NULL, NULL, len, ns, bl, 0, &isp->isp_cdmat)) { + if (bus_dma_tag_create(sbs->dmat, QENTRY_LEN, BUS_SPACE_MAXADDR_24BIT-1, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR_32BIT, NULL, NULL, + len, ns, BUS_SPACE_MAXADDR_24BIT, 0, &isp->isp_cdmat)) { isp_prt(isp, ISP_LOGERR, "cannot create a dma tag for control spaces"); free(sbs->dmaps, M_DEVBUF); ==== //depot/projects/hammer/sys/dev/isp/ispmbox.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.43 2002/08/17 17:19:29 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/ispmbox.h,v 1.44 2002/09/23 05:04:16 mjacob Exp $ */ /* * Mailbox and Queue Entry Definitions for for Qlogic ISP SCSI adapters. * @@ -109,6 +109,9 @@ #define FW_FEATURE_RIO_32BIT 0x4 #define FW_FEATURE_RIO_16BIT 0x8 +#define MBOX_INIT_REQ_QUEUE_A64 0x0052 +#define MBOX_INIT_RES_QUEUE_A64 0x0053 + #define MBOX_ENABLE_TARGET_MODE 0x0055 #define ENABLE_TARGET_FLAG 0x8000 #define ENABLE_TQING_FLAG 0x0004 @@ -338,6 +341,9 @@ ispds_t req_dataseg[ISP_RQDSEG]; } ispreq_t; +#define ispreq64_t ispreqt3_t /* same as.... */ +#define ISP_RQDSEG_A64 2 + /* * A request packet can also be a marker packet. */ ==== //depot/projects/hammer/sys/dev/isp/ispvar.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.60 2002/09/06 18:32:16 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.61 2002/09/23 05:09:23 mjacob Exp $ */ /* * Soft Definitions for for Qlogic ISP SCSI adapters. * @@ -89,8 +89,10 @@ /* * 'Types' */ -#ifndef ISP_DMA_ADDR_T -#define ISP_DMA_ADDR_T u_int32_t +#ifdef ISP_DAC_SUPPORTED +typedef u_int64_t isp_dma_addr_t; +#else +typedef u_int32_t isp_dma_addr_t; #endif /* @@ -307,7 +309,7 @@ * Scratch DMA mapped in area to fetch Port Database stuff, etc. */ caddr_t isp_scratch; - ISP_DMA_ADDR_T isp_scdma; + isp_dma_addr_t isp_scdma; #ifdef ISP_FW_CRASH_DUMP u_int16_t *isp_dump_data; #endif @@ -429,8 +431,8 @@ */ caddr_t isp_rquest; caddr_t isp_result; - ISP_DMA_ADDR_T isp_rquest_dma; - ISP_DMA_ADDR_T isp_result_dma; + isp_dma_addr_t isp_rquest_dma; + isp_dma_addr_t isp_result_dma; } ispsoftc_t; #define SDPARAM(isp) ((sdparam *) (isp)->isp_param) @@ -566,8 +568,13 @@ /* * DMA cookie macros */ +#ifdef ISP_DAC_SUPPORTRED +#define DMA_WD3(x) (((x) >> 48) & 0xffff) +#define DMA_WD2(x) (((x) >> 32) & 0xffff) +#else #define DMA_WD3(x) 0 #define DMA_WD2(x) 0 +#endif #define DMA_WD1(x) (((x) >> 16) & 0xffff) #define DMA_WD0(x) (((x) & 0xffff)) @@ -703,7 +710,7 @@ * we had better let the OS determine login policy. * * ISPASYNC_PROMENADE has an argument that is a pointer to an integer which - * is an index into the portdb in the softc ('target'). Whether that entrie's + * is an index into the portdb in the softc ('target'). Whether that entry's * valid tag is set or not says whether something has arrived or departed. * The name refers to a favorite pastime of many city dwellers- watching * people come and go, talking of Michaelangelo, and so on.. @@ -772,10 +779,10 @@ * * INLINE - platform specific define for 'inline' functions * - * ISP_DMA_ADDR_T - platform specific dma address coookie- basically - * the largest integer that can hold the 32 or - * 64 bit value appropriate for the QLogic's DMA - * addressing. Defaults to u_int32_t. + * ISP_DAC_SUPPORTED - Is DAC (Dual Address Cycle) is supported? + * Basically means whether or not DMA for PCI + * PCI cards (Ultra2 or better or FC) works + * above 4GB. * * ISP2100_SCRLEN - length for the Fibre Channel scratch DMA area * ==== //depot/projects/hammer/sys/dev/mpt/mpt.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpt.c,v 1.4 2002/09/01 23:07:09 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpt.c,v 1.5 2002/09/23 05:14:02 mjacob Exp $ */ /* * Generic routines for LSI '909 FC adapters. * FreeBSD Version. @@ -231,6 +231,7 @@ panic("mpt_free_request bad req ptr\n"); return; } + req->sequence = 0; req->ccb = NULL; req->debug = REQ_FREE; SLIST_INSERT_HEAD(&mpt->request_free_list, req, link); @@ -559,7 +560,7 @@ return (0); } -#define CFG_DATA_OFF 40 +#define CFG_DATA_OFF 128 int mpt_read_cfg_page(mpt_softc_t *mpt, int PageAddress, fCONFIG_PAGE_HEADER *hdr) @@ -575,7 +576,7 @@ cfgp = req->req_vbuf; amt = (cfgp->Header.PageLength * sizeof (uint32_t)); - bzero(cfgp, sizeof *cfgp); + bzero(cfgp, MPT_REQUEST_AREA); cfgp->Action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT; cfgp->Function = MPI_FUNCTION_CONFIG; cfgp->Header = *hdr; ==== //depot/projects/hammer/sys/dev/mpt/mpt_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/mpt/mpt_freebsd.c,v 1.4 2002/09/01 23:07:09 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/mpt/mpt_freebsd.c,v 1.5 2002/09/23 05:25:59 mjacob Exp $ */ /* * FreeBSD/CAM specific routines for LSI '909 FC adapters. * FreeBSD Version. @@ -34,6 +34,7 @@ static void mpt_poll(struct cam_sim *); static timeout_t mpttimeout; +static timeout_t mpttimeout2; static void mpt_action(struct cam_sim *, union ccb *); static int mpt_setwidth(mpt_softc_t *, int, int); static int mpt_setsync(mpt_softc_t *, int, int, int); @@ -119,13 +120,22 @@ { request_t *req; union ccb *ccb = arg; + u_int32_t oseq; mpt_softc_t *mpt; mpt = ccb->ccb_h.ccb_mpt_ptr; MPT_LOCK(mpt); - req = ccb->ccb_h.ccb_req_ptr; + oseq = req->sequence; mpt->timeouts++; + if (mpt_intr(mpt)) { + if (req->sequence != oseq) { + device_printf(mpt->dev, "bullet missed in timeout\n"); + MPT_UNLOCK(mpt); + return; + } + device_printf(mpt->dev, "bullet U-turned in timeout: got us\n"); + } device_printf(mpt->dev, "time out on request index = 0x%02x sequence = 0x%08x\n", req->index, req->sequence); @@ -142,6 +152,8 @@ mpt_print_scsi_io_request((MSG_SCSI_IO_REQUEST *)req->req_vbuf); req->debug = REQ_TIMEOUT; req->ccb = NULL; + req->link.sle_next = (void *) mpt; + (void) timeout(mpttimeout2, (caddr_t)req, hz / 10); ccb->ccb_h.status = CAM_CMD_TIMEOUT; ccb->ccb_h.status |= CAM_RELEASE_SIMQ; MPTLOCK_2_CAMLOCK(mpt); @@ -150,6 +162,18 @@ MPT_UNLOCK(mpt); } +static void +mpttimeout2(void *arg) +{ + request_t *req = arg; + if (req->debug == REQ_TIMEOUT) { + mpt_softc_t *mpt = (mpt_softc_t *) req->link.sle_next; + MPT_LOCK(mpt); + mpt_free_request(mpt, req); + MPT_UNLOCK(mpt); + } +} + /* * Callback routine from "bus_dmamap_load" or in simple case called directly. * @@ -341,6 +365,7 @@ } ccb->ccb_h.status |= CAM_SIM_QUEUED; + MPTLOCK_2_CAMLOCK(mpt); if (ccb->ccb_h.timeout != CAM_TIME_INFINITY) { ccb->ccb_h.timeout_ch = timeout(mpttimeout, (caddr_t)ccb, @@ -350,7 +375,6 @@ } if (mpt->verbose > 1) mpt_print_scsi_io_request(mpt_req); - CAMLOCK_2_MPTLOCK(mpt); mpt_send_cmd(mpt, req); MPTLOCK_2_CAMLOCK(mpt); } @@ -361,7 +385,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Sep 22 23:57:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE84F37B404; Sun, 22 Sep 2002 23:57:16 -0700 (PDT) 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 5718B37B401 for ; Sun, 22 Sep 2002 23:57:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC42D43E42 for ; Sun, 22 Sep 2002 23:57:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N6vFCo063139 for ; Sun, 22 Sep 2002 23:57:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N6vFtq063135 for perforce@freebsd.org; Sun, 22 Sep 2002 23:57:15 -0700 (PDT) Date: Sun, 22 Sep 2002 23:57:15 -0700 (PDT) Message-Id: <200209230657.g8N6vFtq063135@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17975 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17975 Change 17975 by peter@peter_overcee on 2002/09/22 23:56:20 integrate i386_hammer for segments.h tweaks and __packed crud Affected files ... .. //depot/projects/hammer/sys/x86_64/include/npx.h#5 integrate .. //depot/projects/hammer/sys/x86_64/include/segments.h#7 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/include/npx.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/i386/include/npx.h,v 1.25 2002/09/16 19:25:41 mini Exp $ + * $FreeBSD: src/sys/i386/include/npx.h,v 1.26 2002/09/23 05:55:10 peter Exp $ */ /* @@ -75,7 +75,7 @@ } sv_fp[8]; struct xmmacc sv_xmm[16]; u_char sv_pad[96]; -} __attribute__((aligned(16))); +} __aligned(16); /* * The hardware default control word for i387's and later coprocessors is ==== //depot/projects/hammer/sys/x86_64/include/segments.h#7 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/include/segments.h,v 1.30 2002/09/22 04:45:21 peter Exp $ + * $FreeBSD: src/sys/i386/include/segments.h,v 1.31 2002/09/23 06:50:07 peter Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ @@ -64,8 +64,7 @@ */ struct segment_descriptor { unsigned sd_lolimit:16 ; /* segment extent (lsb) */ - unsigned sd_lobase:24 __attribute__ ((packed)); - /* segment base address (lsb) */ + unsigned sd_lobase:24 __packed; /* segment base address (lsb) */ unsigned sd_type:5 ; /* segment type */ unsigned sd_dpl:2 ; /* segment descriptor priority level */ unsigned sd_p:1 ; /* segment descriptor present */ @@ -82,8 +81,7 @@ */ struct segment_descriptor { unsigned sd_lolimit:16 ; /* segment extent (lsb) */ - unsigned sd_lobase:24 __attribute__ ((packed)); - /* segment base address (lsb) */ + unsigned sd_lobase:24 __packed; /* segment base address (lsb) */ unsigned sd_type:5 ; /* segment type */ unsigned sd_dpl:2 ; /* segment descriptor priority level */ unsigned sd_p:1 ; /* segment descriptor present */ @@ -180,8 +178,8 @@ * region descriptors, used to load gdt/idt tables before segments yet exist. */ struct region_descriptor { - unsigned rd_limit:16; /* segment extent */ - unsigned rd_base:32 __attribute__ ((packed)); /* base address */ + unsigned rd_limit:16; /* segment extent */ + unsigned rd_base:32 __packed; /* base address */ }; /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 0: 2:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B81A37B404; Mon, 23 Sep 2002 00:02:23 -0700 (PDT) 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 EF4C137B401 for ; Mon, 23 Sep 2002 00:02:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AED743E6E for ; Mon, 23 Sep 2002 00:02:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N72MCo066677 for ; Mon, 23 Sep 2002 00:02:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N72MDC066668 for perforce@freebsd.org; Mon, 23 Sep 2002 00:02:22 -0700 (PDT) Date: Mon, 23 Sep 2002 00:02:22 -0700 (PDT) Message-Id: <200209230702.g8N72MDC066668@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17976 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17976 Change 17976 by peter@peter_overcee on 2002/09/23 00:01:54 integ i386_hammer - take a copy if libc/i386/SYS.h Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/SYS.h#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 0:30: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BAB837B407; Mon, 23 Sep 2002 00:29:58 -0700 (PDT) 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 DB56237B404 for ; Mon, 23 Sep 2002 00:29:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FA5443E42 for ; Mon, 23 Sep 2002 00:29:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N7TvCo081206 for ; Mon, 23 Sep 2002 00:29:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N7TvaS081203 for perforce@freebsd.org; Mon, 23 Sep 2002 00:29:57 -0700 (PDT) Date: Mon, 23 Sep 2002 00:29:57 -0700 (PDT) Message-Id: <200209230729.g8N7TvaS081203@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17978 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17978 Change 17978 by peter@peter_overcee on 2002/09/23 00:29:09 update for hammer. Ahh, the joy of having real PC relative modes. DOWN WITH PIC_PROLOGUE etc! Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/SYS.h#2 edit .. //depot/projects/hammer/sys/x86_64/include/asm.h#2 edit Differences ... ==== //depot/projects/hammer/lib/libc/x86_64/SYS.h#2 (text+ko) ==== @@ -40,22 +40,19 @@ #include #include -#define SYSCALL(x) 2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror)); \ +#define SYSCALL(x) 2: jmp PIC_PLT(HIDENAME(cerror)); \ ENTRY(__CONCAT(__sys_,x)); \ .weak CNAME(x); \ .set CNAME(x),CNAME(__CONCAT(__sys_,x)); \ .weak CNAME(__CONCAT(_,x)); \ .set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \ - mov __CONCAT($SYS_,x),%eax; KERNCALL; jb 2b + mov __CONCAT($SYS_,x),%rax; KERNCALL; jb 2b #define RSYSCALL(x) SYSCALL(x); ret #define PSEUDO(x) ENTRY(__CONCAT(__sys_,x)); \ .weak CNAME(__CONCAT(_,x)); \ .set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \ - mov __CONCAT($SYS_,x),%eax; KERNCALL; ret + mov __CONCAT($SYS_,x),%rax; KERNCALL; ret -/* gas messes up offset -- although we don't currently need it, do for BCS */ -#define LCALL(x,y) .byte 0x9a ; .long y; .word x - -#define KERNCALL int $0x80 +#define KERNCALL syscall ==== //depot/projects/hammer/sys/x86_64/include/asm.h#2 (text+ko) ==== @@ -43,23 +43,11 @@ #include #ifdef PIC -#define PIC_PROLOGUE \ - pushl %ebx; \ - call 1f; \ -1: \ - popl %ebx; \ - addl $_GLOBAL_OFFSET_TABLE_+[.-1b],%ebx -#define PIC_EPILOGUE \ - popl %ebx #define PIC_PLT(x) x@PLT -#define PIC_GOT(x) x@GOT(%ebx) -#define PIC_GOTOFF(x) x@GOTOFF(%ebx) +#define PIC_GOT(x) x@GOTPCREL(%rip) #else -#define PIC_PROLOGUE -#define PIC_EPILOGUE #define PIC_PLT(x) x #define PIC_GOT(x) x -#define PIC_GOTOFF(x) x #endif /* @@ -80,14 +68,14 @@ #ifdef PROF #define ALTENTRY(x) _ENTRY(x); \ - pushl %ebp; movl %esp,%ebp; \ + pushl %rbp; movl %rsp,%rbp; \ call PIC_PLT(HIDENAME(mcount)); \ - popl %ebp; \ + popl %rbp; \ jmp 9f #define ENTRY(x) _ENTRY(x); \ - pushl %ebp; movl %esp,%ebp; \ + pushl %rbp; movl %rsp,%rbp; \ call PIC_PLT(HIDENAME(mcount)); \ - popl %ebp; \ + popl %rbp; \ 9: #else #define ALTENTRY(x) _ENTRY(x) @@ -119,25 +107,21 @@ #define ARCH_DISPATCH(x) \ _START_ENTRY; \ .globl CNAME(x); .type CNAME(x),@function; CNAME(x): ; \ - PIC_PROLOGUE; \ - movl PIC_GOT(AVECNAME(x)),%eax; \ - PIC_EPILOGUE; \ - jmpl *(%eax) + movl PIC_GOT(AVECNAME(x)),%rax; \ + jmpl *(%rax) #define ARCH_SELECT(x) _START_ENTRY; \ .type ASELNAME(x),@function; \ ASELNAME(x): \ - PIC_PROLOGUE; \ call PIC_PLT(CNAME(__get_hw_float)); \ - testl %eax,%eax; \ - movl PIC_GOT(ANAME(x)),%eax; \ + testl %rax,%rax; \ + movl PIC_GOT(ANAME(x)),%rax; \ jne 8f; \ - movl PIC_GOT(GNAME(x)),%eax; \ + movl PIC_GOT(GNAME(x)),%rax; \ 8: \ - movl PIC_GOT(AVECNAME(x)),%edx; \ - movl %eax,(%edx); \ - PIC_EPILOGUE; \ - jmpl *%eax + movl PIC_GOT(AVECNAME(x)),%rdx; \ + movl %rax,(%rdx); \ + jmpl *%rax #else /* !PIC */ #define ARCH_DISPATCH(x) \ _START_ENTRY; \ @@ -148,13 +132,13 @@ .type ASELNAME(x),@function; \ ASELNAME(x): \ call CNAME(__get_hw_float); \ - testl %eax,%eax; \ - movl $ANAME(x),%eax; \ + testl %rax,%rax; \ + movl $ANAME(x),%rax; \ jne 8f; \ - movl $GNAME(x),%eax; \ + movl $GNAME(x),%rax; \ 8: \ - movl %eax,AVECNAME(x); \ - jmpl *%eax + movl %rax,AVECNAME(x); \ + jmpl *%rax #endif /* PIC */ #define ARCH_VECTOR(x) .data; .p2align 2; \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 0:33: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF2F637B404; Mon, 23 Sep 2002 00:33:02 -0700 (PDT) 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 6094137B401 for ; Mon, 23 Sep 2002 00:33:02 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 220A543E42 for ; Mon, 23 Sep 2002 00:33:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N7X2Co082922 for ; Mon, 23 Sep 2002 00:33:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N7X1t5082919 for perforce@freebsd.org; Mon, 23 Sep 2002 00:33:01 -0700 (PDT) Date: Mon, 23 Sep 2002 00:33:01 -0700 (PDT) Message-Id: <200209230733.g8N7X1t5082919@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17980 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17980 Change 17980 by peter@peter_overcee on 2002/09/23 00:32:01 Actually, dont use syscall yet. The fast entry path complications are additional hurdles to get over. Keep using the tss entry gates for now so that we have the luxury of having a pre-existing stack when we enter the kernel instead of having to find it ourselves. Affected files ... .. //depot/projects/hammer/lib/libc/x86_64/SYS.h#3 edit Differences ... ==== //depot/projects/hammer/lib/libc/x86_64/SYS.h#3 (text+ko) ==== @@ -55,4 +55,4 @@ .set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \ mov __CONCAT($SYS_,x),%rax; KERNCALL; ret -#define KERNCALL syscall +#define KERNCALL int $0x80 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 0:34:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14DF537B404; Mon, 23 Sep 2002 00:34:16 -0700 (PDT) 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 B5BBE37B401 for ; Mon, 23 Sep 2002 00:34:15 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 921F643E4A for ; Mon, 23 Sep 2002 00:34:14 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N7YECo083007 for ; Mon, 23 Sep 2002 00:34:14 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N7Y5jr082997 for perforce@freebsd.org; Mon, 23 Sep 2002 00:34:05 -0700 (PDT) Date: Mon, 23 Sep 2002 00:34:05 -0700 (PDT) Message-Id: <200209230734.g8N7Y5jr082997@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 17981 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17981 Change 17981 by julian@julian_jules1 on 2002/09/23 00:33:56 MFC.. Mini! check the merge of the floating point and context stuff Affected files ... .. //depot/projects/kse/bin/ps/extern.h#7 integrate .. //depot/projects/kse/bin/ps/keyword.c#9 integrate .. //depot/projects/kse/bin/ps/print.c#15 integrate .. //depot/projects/kse/bin/ps/ps.h#3 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#2 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#2 integrate .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#3 integrate .. //depot/projects/kse/include/Makefile#3 integrate .. //depot/projects/kse/include/fnmatch.h#2 integrate .. //depot/projects/kse/include/fts.h#2 integrate .. //depot/projects/kse/include/grp.h#3 integrate .. //depot/projects/kse/include/inttypes.h#5 integrate .. //depot/projects/kse/include/iso646.h#2 integrate .. //depot/projects/kse/include/langinfo.h#2 integrate .. //depot/projects/kse/include/limits.h#2 integrate .. //depot/projects/kse/include/link.h#3 integrate .. //depot/projects/kse/include/monetary.h#3 integrate .. //depot/projects/kse/include/nl_types.h#2 integrate .. //depot/projects/kse/include/stdlib.h#7 integrate .. //depot/projects/kse/include/unistd.h#4 integrate .. //depot/projects/kse/include/wchar.h#7 integrate .. //depot/projects/kse/lib/libc/alpha/gen/infinity.c#2 integrate .. //depot/projects/kse/lib/libc/gen/_pthread_stubs.c#2 integrate .. //depot/projects/kse/lib/libc/gen/confstr.c#2 integrate .. //depot/projects/kse/lib/libc/gen/dlfcn.c#3 integrate .. //depot/projects/kse/lib/libc/gen/fts.3#2 integrate .. //depot/projects/kse/lib/libc/gen/fts.c#2 integrate .. //depot/projects/kse/lib/libc/gen/getobjformat.c#2 integrate .. //depot/projects/kse/lib/libc/gen/swapcontext.c#7 integrate .. //depot/projects/kse/lib/libc/gen/sysconf.c#2 integrate .. //depot/projects/kse/lib/libc/gmon/gmon.c#2 integrate .. //depot/projects/kse/lib/libc/i386/SYS.h#2 integrate .. //depot/projects/kse/lib/libc/i386/gen/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/i386/gen/getcontext.S#8 integrate .. //depot/projects/kse/lib/libc/i386/gen/infinity.c#2 integrate .. //depot/projects/kse/lib/libc/i386/gen/makecontext.c#6 integrate .. //depot/projects/kse/lib/libc/ia64/gen/infinity.c#2 integrate .. //depot/projects/kse/lib/libc/locale/Makefile.inc#8 integrate .. //depot/projects/kse/lib/libc/locale/frune.c#2 integrate .. //depot/projects/kse/lib/libc/locale/mbrune.3#2 integrate .. //depot/projects/kse/lib/libc/locale/mbrune.c#2 integrate .. //depot/projects/kse/lib/libc/locale/rune.3#3 integrate .. //depot/projects/kse/lib/libc/locale/wcstoimax.c#1 branch .. //depot/projects/kse/lib/libc/locale/wcstol.3#3 integrate .. //depot/projects/kse/lib/libc/locale/wcstoll.c#1 branch .. //depot/projects/kse/lib/libc/locale/wcstoull.c#1 branch .. //depot/projects/kse/lib/libc/locale/wcstoumax.c#1 branch .. //depot/projects/kse/lib/libc/net/getnetbydns.c#4 integrate .. //depot/projects/kse/lib/libc/net/name6.c#4 integrate .. //depot/projects/kse/lib/libc/rpc/rpc_clnt_create.3#3 integrate .. //depot/projects/kse/lib/libc/sparc64/gen/infinity.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/stdio/fgetwc.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/fgetws.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/fputwc.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/fputws.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/fwprintf.c#1 branch .. //depot/projects/kse/lib/libc/stdio/local.h#4 integrate .. //depot/projects/kse/lib/libc/stdio/printf.3#4 integrate .. //depot/projects/kse/lib/libc/stdio/stdio.3#3 integrate .. //depot/projects/kse/lib/libc/stdio/swprintf.c#1 branch .. //depot/projects/kse/lib/libc/stdio/ungetwc.c#2 integrate .. //depot/projects/kse/lib/libc/stdio/vfprintf.c#5 integrate .. //depot/projects/kse/lib/libc/stdio/vfwprintf.c#1 branch .. //depot/projects/kse/lib/libc/stdio/vsnprintf.c#5 integrate .. //depot/projects/kse/lib/libc/stdio/vswprintf.c#1 branch .. //depot/projects/kse/lib/libc/stdio/vwprintf.c#1 branch .. //depot/projects/kse/lib/libc/stdio/wprintf.3#1 branch .. //depot/projects/kse/lib/libc/stdio/wprintf.c#1 branch .. //depot/projects/kse/lib/libc/stdlib/strfmon.3#2 integrate .. //depot/projects/kse/lib/libc/stdlib/strfmon.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcscat.c#3 integrate .. //depot/projects/kse/lib/libc/string/wcschr.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcscmp.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcscpy.c#3 integrate .. //depot/projects/kse/lib/libc/string/wcscspn.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcslcat.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcslcpy.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcslen.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcsncat.c#3 integrate .. //depot/projects/kse/lib/libc/string/wcsncmp.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcsncpy.c#3 integrate .. //depot/projects/kse/lib/libc/string/wcspbrk.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcsrchr.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcsspn.c#2 integrate .. //depot/projects/kse/lib/libc/string/wcsstr.c#3 integrate .. //depot/projects/kse/lib/libc/string/wmemchr.c#2 integrate .. //depot/projects/kse/lib/libc/string/wmemcmp.c#2 integrate .. //depot/projects/kse/lib/libc/string/wmemcpy.c#3 integrate .. //depot/projects/kse/lib/libc/string/wmemmove.c#2 integrate .. //depot/projects/kse/lib/libc/string/wmemset.c#2 integrate .. //depot/projects/kse/lib/libc/sys/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/sys/sem.c#1 branch .. //depot/projects/kse/lib/libkvm/kvm_proc.c#24 integrate .. //depot/projects/kse/sys/alpha/alpha/autoconf.c#8 integrate .. //depot/projects/kse/sys/alpha/alpha/db_trace.c#6 integrate .. //depot/projects/kse/sys/alpha/alpha/machdep.c#44 integrate .. //depot/projects/kse/sys/alpha/alpha/pmap.c#34 integrate .. //depot/projects/kse/sys/alpha/alpha/trap.c#35 integrate .. //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#30 integrate .. //depot/projects/kse/sys/alpha/include/asm.h#4 integrate .. //depot/projects/kse/sys/alpha/include/atomic.h#3 integrate .. //depot/projects/kse/sys/alpha/include/endian.h#8 integrate .. //depot/projects/kse/sys/alpha/include/param.h#7 integrate .. //depot/projects/kse/sys/alpha/include/stdarg.h#4 integrate .. //depot/projects/kse/sys/alpha/linux/linux_genassym.c#3 integrate .. //depot/projects/kse/sys/alpha/osf1/imgact_osf1.c#8 integrate .. //depot/projects/kse/sys/alpha/pci/tsunamireg.h#2 integrate .. //depot/projects/kse/sys/arm/include/param.h#3 integrate .. //depot/projects/kse/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/kse/sys/boot/i386/btx/btx/Makefile#3 integrate .. //depot/projects/kse/sys/boot/i386/btx/btxldr/Makefile#2 integrate .. //depot/projects/kse/sys/boot/i386/btx/lib/Makefile#3 integrate .. //depot/projects/kse/sys/boot/i386/cdboot/Makefile#2 integrate .. //depot/projects/kse/sys/boot/i386/kgzldr/Makefile#4 integrate .. //depot/projects/kse/sys/boot/i386/kgzldr/crt.s#2 integrate .. //depot/projects/kse/sys/boot/i386/kgzldr/kgzldr.m4#2 delete .. //depot/projects/kse/sys/boot/i386/kgzldr/sio.s#2 integrate .. //depot/projects/kse/sys/boot/i386/kgzldr/start.s#2 integrate .. //depot/projects/kse/sys/boot/i386/liloldr/Makefile#2 integrate .. //depot/projects/kse/sys/boot/i386/mbr/Makefile#2 integrate .. //depot/projects/kse/sys/boot/i386/pxeldr/Makefile#3 integrate .. //depot/projects/kse/sys/boot/ia64/skiload/main.c#2 integrate .. //depot/projects/kse/sys/boot/pc98/btx/btx/Makefile#3 integrate .. //depot/projects/kse/sys/boot/pc98/btx/btxldr/Makefile#2 integrate .. //depot/projects/kse/sys/boot/pc98/btx/lib/Makefile#3 integrate .. //depot/projects/kse/sys/boot/pc98/kgzldr/Makefile#4 integrate .. //depot/projects/kse/sys/boot/pc98/kgzldr/crt.s#3 integrate .. //depot/projects/kse/sys/cam/cam_xpt.c#11 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_all.c#12 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_cd.c#9 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_da.c#23 integrate .. //depot/projects/kse/sys/coda/coda_namecache.h#3 integrate .. //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#20 integrate .. //depot/projects/kse/sys/compat/linux/linux_ioctl.c#19 integrate .. //depot/projects/kse/sys/compat/linux/linux_ioctl.h#4 integrate .. //depot/projects/kse/sys/compat/linux/linux_misc.c#21 integrate .. //depot/projects/kse/sys/compat/linux/linux_socket.c#8 integrate .. //depot/projects/kse/sys/compat/linux/linux_sysctl.c#6 integrate .. //depot/projects/kse/sys/compat/pecoff/imgact_pecoff.c#16 integrate .. //depot/projects/kse/sys/compat/svr4/imgact_svr4.c#8 integrate .. //depot/projects/kse/sys/compat/svr4/svr4_stream.c#12 integrate .. //depot/projects/kse/sys/conf/Makefile.powerpc#14 integrate .. //depot/projects/kse/sys/conf/NOTES#18 integrate .. //depot/projects/kse/sys/conf/files#51 integrate .. //depot/projects/kse/sys/conf/files.alpha#17 integrate .. //depot/projects/kse/sys/conf/files.powerpc#9 integrate .. //depot/projects/kse/sys/conf/kern.post.mk#14 integrate .. //depot/projects/kse/sys/conf/kern.pre.mk#15 integrate .. //depot/projects/kse/sys/conf/kmod.mk#13 integrate .. //depot/projects/kse/sys/conf/options#27 integrate .. //depot/projects/kse/sys/conf/options.powerpc#4 integrate .. //depot/projects/kse/sys/contrib/dev/fla/fla.c#5 integrate .. //depot/projects/kse/sys/ddb/db_command.c#6 integrate .. //depot/projects/kse/sys/ddb/ddb.h#4 integrate .. //depot/projects/kse/sys/dev/aac/aac_disk.c#14 integrate .. //depot/projects/kse/sys/dev/aac/aacvar.h#12 integrate .. //depot/projects/kse/sys/dev/aic7xxx/ahc_eisa.c#5 integrate .. //depot/projects/kse/sys/dev/aic7xxx/ahc_pci.c#5 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_osm.h#5 integrate .. //depot/projects/kse/sys/dev/amr/amr_disk.c#4 integrate .. //depot/projects/kse/sys/dev/amr/amrvar.h#4 integrate .. //depot/projects/kse/sys/dev/ata/ata-card.c#6 integrate .. //depot/projects/kse/sys/dev/ata/ata-disk.c#22 integrate .. //depot/projects/kse/sys/dev/ata/ata-dma.c#25 integrate .. //depot/projects/kse/sys/dev/ata/ata-isa.c#8 integrate .. //depot/projects/kse/sys/dev/ata/ata-pci.c#26 integrate .. //depot/projects/kse/sys/dev/ata/ata-raid.c#14 integrate .. //depot/projects/kse/sys/dev/ata/atapi-fd.c#12 integrate .. //depot/projects/kse/sys/dev/awi/awi.c#7 integrate .. //depot/projects/kse/sys/dev/awi/awi_wep.c#6 integrate .. //depot/projects/kse/sys/dev/bge/if_bge.c#14 integrate .. //depot/projects/kse/sys/dev/ccd/ccd.c#15 integrate .. //depot/projects/kse/sys/dev/ct/ct_isa.c#4 integrate .. //depot/projects/kse/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/kse/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/kse/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/kse/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/kse/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/kse/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/kse/sys/dev/ida/ida_disk.c#6 integrate .. //depot/projects/kse/sys/dev/iicbus/iic.c#6 integrate .. //depot/projects/kse/sys/dev/iicbus/iic.h#1 branch .. //depot/projects/kse/sys/dev/iir/iir_ctrl.c#3 integrate .. //depot/projects/kse/sys/dev/isp/isp.c#24 integrate .. //depot/projects/kse/sys/dev/isp/isp_freebsd.h#16 integrate .. //depot/projects/kse/sys/dev/isp/isp_inline.h#10 integrate .. //depot/projects/kse/sys/dev/isp/isp_pci.c#14 integrate .. //depot/projects/kse/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/kse/sys/dev/isp/ispmbox.h#15 integrate .. //depot/projects/kse/sys/dev/isp/ispvar.h#15 integrate .. //depot/projects/kse/sys/dev/md/md.c#24 integrate .. //depot/projects/kse/sys/dev/mlx/mlx_disk.c#4 integrate .. //depot/projects/kse/sys/dev/mlx/mlxvar.h#5 integrate .. //depot/projects/kse/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.c#5 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.h#6 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/kse/sys/dev/ncv/ncr53c500_pccard.c#6 integrate .. //depot/projects/kse/sys/dev/nsp/nsp_pccard.c#7 integrate .. //depot/projects/kse/sys/dev/null/null.c#5 integrate .. //depot/projects/kse/sys/dev/ofw/ofw_disk.c#2 integrate .. //depot/projects/kse/sys/dev/ppbus/vpoio.c#3 integrate .. //depot/projects/kse/sys/dev/pst/pst-raid.c#3 integrate .. //depot/projects/kse/sys/dev/random/hash.c#4 integrate .. //depot/projects/kse/sys/dev/random/randomdev.c#8 integrate .. //depot/projects/kse/sys/dev/random/yarrow.c#6 integrate .. //depot/projects/kse/sys/dev/ray/if_raymib.h#2 integrate .. //depot/projects/kse/sys/dev/sio/sio.c#18 integrate .. //depot/projects/kse/sys/dev/smbus/smb.c#5 integrate .. //depot/projects/kse/sys/dev/smbus/smb.h#1 branch .. //depot/projects/kse/sys/dev/smbus/smbus.c#4 integrate .. //depot/projects/kse/sys/dev/stg/tmc18c30_isa.c#4 integrate .. //depot/projects/kse/sys/dev/stg/tmc18c30_pccard.c#7 integrate .. //depot/projects/kse/sys/dev/twe/twe_freebsd.c#8 integrate .. //depot/projects/kse/sys/dev/usb/usb.h#7 integrate .. //depot/projects/kse/sys/dev/vinum/vinumext.h#5 integrate .. //depot/projects/kse/sys/dev/vinum/vinumioctl.c#10 integrate .. //depot/projects/kse/sys/dev/vinum/vinumparser.c#2 integrate .. //depot/projects/kse/sys/fs/deadfs/dead_vnops.c#6 integrate .. //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#17 integrate .. //depot/projects/kse/sys/fs/fdescfs/fdesc_vnops.c#11 integrate .. //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#17 integrate .. //depot/projects/kse/sys/fs/hpfs/hpfs_vnops.c#13 integrate .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate .. //depot/projects/kse/sys/fs/ntfs/ntfs_vnops.c#10 integrate .. //depot/projects/kse/sys/fs/portalfs/portal_vnops.c#13 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_status.c#15 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs.h#4 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs_node.h#2 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs_smb.c#5 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs_subr.h#3 integrate .. //depot/projects/kse/sys/fs/smbfs/smbfs_vnops.c#13 integrate .. //depot/projects/kse/sys/fs/unionfs/union_subr.c#11 integrate .. //depot/projects/kse/sys/fs/unionfs/union_vfsops.c#11 integrate .. //depot/projects/kse/sys/fs/unionfs/union_vnops.c#8 integrate .. //depot/projects/kse/sys/geom/geom_dev.c#8 integrate .. //depot/projects/kse/sys/geom/geom_disk.c#8 integrate .. //depot/projects/kse/sys/geom/geom_gpt.c#6 integrate .. //depot/projects/kse/sys/gnu/ext2fs/ext2_vnops.c#9 integrate .. //depot/projects/kse/sys/i386/acpica/acpi_wakeup.c#8 integrate .. //depot/projects/kse/sys/i386/apm/apm.c#7 integrate .. //depot/projects/kse/sys/i386/conf/NOTES#39 integrate .. //depot/projects/kse/sys/i386/i386/autoconf.c#11 integrate .. //depot/projects/kse/sys/i386/i386/bioscall.s#2 integrate .. //depot/projects/kse/sys/i386/i386/db_interface.c#13 integrate .. //depot/projects/kse/sys/i386/i386/db_trace.c#9 integrate .. //depot/projects/kse/sys/i386/i386/elan-mmcr.c#4 integrate .. //depot/projects/kse/sys/i386/i386/genassym.c#32 integrate .. //depot/projects/kse/sys/i386/i386/i686_mem.c#4 integrate .. //depot/projects/kse/sys/i386/i386/legacy.c#1 branch .. //depot/projects/kse/sys/i386/i386/locore.s#16 integrate .. //depot/projects/kse/sys/i386/i386/machdep.c#60 integrate .. //depot/projects/kse/sys/i386/i386/mem.c#8 integrate .. //depot/projects/kse/sys/i386/i386/mpapic.c#10 integrate .. //depot/projects/kse/sys/i386/i386/support.s#11 integrate .. //depot/projects/kse/sys/i386/i386/trap.c#62 integrate .. //depot/projects/kse/sys/i386/i386/vm_machdep.c#67 integrate .. //depot/projects/kse/sys/i386/ibcs2/imgact_coff.c#15 integrate .. //depot/projects/kse/sys/i386/include/asm.h#3 integrate .. //depot/projects/kse/sys/i386/include/cpufunc.h#12 integrate .. //depot/projects/kse/sys/i386/include/endian.h#10 integrate .. //depot/projects/kse/sys/i386/include/iic.h#2 delete .. //depot/projects/kse/sys/i386/include/legacyvar.h#1 branch .. //depot/projects/kse/sys/i386/include/npx.h#7 integrate .. //depot/projects/kse/sys/i386/include/param.h#12 integrate .. //depot/projects/kse/sys/i386/include/pcb.h#8 integrate .. //depot/projects/kse/sys/i386/include/profile.h#6 integrate .. //depot/projects/kse/sys/i386/include/segments.h#4 integrate .. //depot/projects/kse/sys/i386/include/signal.h#5 integrate .. //depot/projects/kse/sys/i386/include/smb.h#2 delete .. //depot/projects/kse/sys/i386/include/stdarg.h#6 integrate .. //depot/projects/kse/sys/i386/include/tss.h#2 integrate .. //depot/projects/kse/sys/i386/include/ucontext.h#4 integrate .. //depot/projects/kse/sys/i386/isa/clock.c#13 integrate .. //depot/projects/kse/sys/i386/isa/npx.c#22 integrate .. //depot/projects/kse/sys/i386/linux/imgact_linux.c#8 integrate .. //depot/projects/kse/sys/i386/linux/linux_proto.h#10 integrate .. //depot/projects/kse/sys/i386/linux/linux_syscall.h#8 integrate .. //depot/projects/kse/sys/i386/linux/linux_sysent.c#8 integrate .. //depot/projects/kse/sys/i386/linux/syscalls.master#8 integrate .. //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#15 integrate .. //depot/projects/kse/sys/ia64/ia64/db_trace.c#7 integrate .. //depot/projects/kse/sys/ia64/ia64/interrupt.c#13 integrate .. //depot/projects/kse/sys/ia64/ia64/machdep.c#40 integrate .. //depot/projects/kse/sys/ia64/ia64/sscdisk.c#9 integrate .. //depot/projects/kse/sys/ia64/include/asm.h#5 integrate .. //depot/projects/kse/sys/ia64/include/endian.h#9 integrate .. //depot/projects/kse/sys/ia64/include/param.h#8 integrate .. //depot/projects/kse/sys/ia64/include/reg.h#9 integrate .. //depot/projects/kse/sys/ia64/include/signal.h#5 integrate .. //depot/projects/kse/sys/ia64/include/stdarg.h#5 integrate .. //depot/projects/kse/sys/isa/fd.c#12 integrate .. //depot/projects/kse/sys/isofs/cd9660/cd9660_vnops.c#8 integrate .. //depot/projects/kse/sys/kern/imgact_aout.c#18 integrate .. //depot/projects/kse/sys/kern/imgact_elf.c#25 integrate .. //depot/projects/kse/sys/kern/imgact_gzip.c#5 integrate .. //depot/projects/kse/sys/kern/init_main.c#50 integrate .. //depot/projects/kse/sys/kern/init_sysent.c#25 integrate .. //depot/projects/kse/sys/kern/kern_acct.c#17 integrate .. //depot/projects/kse/sys/kern/kern_alq.c#1 branch .. //depot/projects/kse/sys/kern/kern_conf.c#13 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#41 integrate .. //depot/projects/kse/sys/kern/kern_exit.c#63 integrate .. //depot/projects/kse/sys/kern/kern_fork.c#82 integrate .. //depot/projects/kse/sys/kern/kern_intr.c#30 integrate .. //depot/projects/kse/sys/kern/kern_ktr.c#9 integrate .. //depot/projects/kse/sys/kern/kern_mac.c#6 integrate .. //depot/projects/kse/sys/kern/kern_malloc.c#13 integrate .. //depot/projects/kse/sys/kern/kern_proc.c#87 integrate .. //depot/projects/kse/sys/kern/kern_resource.c#24 integrate .. //depot/projects/kse/sys/kern/kern_shutdown.c#33 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#68 integrate .. //depot/projects/kse/sys/kern/kern_switch.c#68 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#111 integrate .. //depot/projects/kse/sys/kern/link_elf.c#16 integrate .. //depot/projects/kse/sys/kern/makesyscalls.sh#13 integrate .. //depot/projects/kse/sys/kern/subr_disk.c#12 integrate .. //depot/projects/kse/sys/kern/subr_disklabel.c#11 integrate .. //depot/projects/kse/sys/kern/subr_diskmbr.c#5 integrate .. //depot/projects/kse/sys/kern/subr_diskslice.c#12 integrate .. //depot/projects/kse/sys/kern/subr_mchain.c#6 integrate .. //depot/projects/kse/sys/kern/subr_sbuf.c#8 integrate .. //depot/projects/kse/sys/kern/subr_trap.c#77 integrate .. //depot/projects/kse/sys/kern/subr_witness.c#32 integrate .. //depot/projects/kse/sys/kern/sys_generic.c#35 integrate .. //depot/projects/kse/sys/kern/syscalls.c#24 integrate .. //depot/projects/kse/sys/kern/syscalls.master#24 integrate .. //depot/projects/kse/sys/kern/uipc_mbuf.c#10 integrate .. //depot/projects/kse/sys/kern/uipc_sem.c#1 branch .. //depot/projects/kse/sys/kern/uipc_socket2.c#21 integrate .. //depot/projects/kse/sys/kern/vfs_mount.c#4 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#44 integrate .. //depot/projects/kse/sys/kern/vfs_syscalls.c#36 integrate .. //depot/projects/kse/sys/kern/vnode_if.src#12 integrate .. //depot/projects/kse/sys/modules/Makefile#35 integrate .. //depot/projects/kse/sys/modules/nfsclient/Makefile#5 integrate .. //depot/projects/kse/sys/modules/oltr/Makefile#3 integrate .. //depot/projects/kse/sys/modules/sem/Makefile#1 branch .. //depot/projects/kse/sys/net/bpf.c#14 integrate .. //depot/projects/kse/sys/net/if_arc.h#4 integrate .. //depot/projects/kse/sys/net/if_ethersubr.c#20 integrate .. //depot/projects/kse/sys/net/if_gif.c#15 integrate .. //depot/projects/kse/sys/net/if_gre.c#3 integrate .. //depot/projects/kse/sys/net/if_gre.h#3 integrate .. //depot/projects/kse/sys/net/if_llc.h#4 integrate .. //depot/projects/kse/sys/net/if_ppp.c#12 integrate .. //depot/projects/kse/sys/net/if_spppsubr.c#10 integrate .. //depot/projects/kse/sys/net/if_stf.c#13 integrate .. //depot/projects/kse/sys/net/netisr.c#1 branch .. //depot/projects/kse/sys/netatm/spans/spans_kxdr.c#4 integrate .. //depot/projects/kse/sys/netatm/spans/spans_kxdr.h#1 branch .. //depot/projects/kse/sys/netatm/spans/spans_msg.c#5 integrate .. //depot/projects/kse/sys/netatm/spans/spans_xdr.x#2 integrate .. //depot/projects/kse/sys/netinet/icmp6.h#5 integrate .. //depot/projects/kse/sys/netinet/ip6.h#2 integrate .. //depot/projects/kse/sys/netinet/ip_gre.c#3 integrate .. //depot/projects/kse/sys/netinet/ip_input.c#25 integrate .. //depot/projects/kse/sys/netinet/ip_output.c#27 integrate .. //depot/projects/kse/sys/netinet/tcp_input.c#28 integrate .. //depot/projects/kse/sys/netinet/tcp_output.c#13 integrate .. //depot/projects/kse/sys/netinet6/in6_cksum.c#2 integrate .. //depot/projects/kse/sys/netns/idp_usrreq.c#5 integrate .. //depot/projects/kse/sys/netns/spp_usrreq.c#6 integrate .. //depot/projects/kse/sys/netsmb/smb.h#6 integrate .. //depot/projects/kse/sys/netsmb/smb_conn.h#7 integrate .. //depot/projects/kse/sys/netsmb/smb_rq.c#6 integrate .. //depot/projects/kse/sys/netsmb/smb_smb.c#4 integrate .. //depot/projects/kse/sys/netsmb/smb_tran.h#4 integrate .. //depot/projects/kse/sys/netsmb/smb_trantcp.c#9 integrate .. //depot/projects/kse/sys/netsmb/smb_trantcp.h#3 integrate .. //depot/projects/kse/sys/netsmb/smb_usr.c#2 integrate .. //depot/projects/kse/sys/nfsclient/nfs_diskless.c#1 branch .. //depot/projects/kse/sys/nfsclient/nfs_socket.c#16 integrate .. //depot/projects/kse/sys/nfsclient/nfs_vfsops.c#15 integrate .. //depot/projects/kse/sys/nfsclient/nfsdiskless.h#4 integrate .. //depot/projects/kse/sys/nfsserver/nfs_syscalls.c#8 integrate .. //depot/projects/kse/sys/pc98/apm/apm_bioscall.s#2 integrate .. //depot/projects/kse/sys/pc98/i386/machdep.c#35 integrate .. //depot/projects/kse/sys/pc98/pc98/clock.c#9 integrate .. //depot/projects/kse/sys/pc98/pc98/diskslice_machdep.c#4 integrate .. //depot/projects/kse/sys/pc98/pc98/fd.c#13 integrate .. //depot/projects/kse/sys/pc98/pc98/wd.c#5 integrate .. //depot/projects/kse/sys/pci/amdpm.c#5 integrate .. //depot/projects/kse/sys/pci/if_dc.c#21 integrate .. //depot/projects/kse/sys/pci/if_dcreg.h#8 integrate .. //depot/projects/kse/sys/pci/if_ste.c#11 integrate .. //depot/projects/kse/sys/pci/if_xl.c#12 integrate .. //depot/projects/kse/sys/pci/simos.c#3 integrate .. //depot/projects/kse/sys/posix4/_semaphore.h#1 branch .. //depot/projects/kse/sys/posix4/mqueue.h#3 integrate .. //depot/projects/kse/sys/posix4/posix4.h#6 integrate .. //depot/projects/kse/sys/posix4/posix4_mib.c#2 integrate .. //depot/projects/kse/sys/powerpc/conf/GENERIC#9 integrate .. //depot/projects/kse/sys/powerpc/include/asm.h#4 integrate .. //depot/projects/kse/sys/powerpc/include/atomic.h#3 integrate .. //depot/projects/kse/sys/powerpc/include/bus.h#4 integrate .. //depot/projects/kse/sys/powerpc/include/cpu.h#10 integrate .. //depot/projects/kse/sys/powerpc/include/cpufunc.h#10 integrate .. //depot/projects/kse/sys/powerpc/include/endian.h#8 integrate .. //depot/projects/kse/sys/powerpc/include/frame.h#6 integrate .. //depot/projects/kse/sys/powerpc/include/openpicvar.h#2 integrate .. //depot/projects/kse/sys/powerpc/include/param.h#5 integrate .. //depot/projects/kse/sys/powerpc/include/sigframe.h#3 integrate .. //depot/projects/kse/sys/powerpc/include/stdarg.h#5 integrate .. //depot/projects/kse/sys/powerpc/powermac/ata_macio.c#1 branch .. //depot/projects/kse/sys/powerpc/powermac/macio.c#1 branch .. //depot/projects/kse/sys/powerpc/powermac/maciovar.h#1 branch .. //depot/projects/kse/sys/powerpc/powermac/uninorth.c#2 integrate .. //depot/projects/kse/sys/powerpc/powermac/uninorthvar.h#2 integrate .. //depot/projects/kse/sys/powerpc/powerpc/autoconf.c#6 integrate .. //depot/projects/kse/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/kse/sys/powerpc/powerpc/genassym.c#16 integrate .. //depot/projects/kse/sys/powerpc/powerpc/interrupt.c#2 integrate .. //depot/projects/kse/sys/powerpc/powerpc/locore.s#10 integrate .. //depot/projects/kse/sys/powerpc/powerpc/machdep.c#25 integrate .. //depot/projects/kse/sys/powerpc/powerpc/nexus.c#3 integrate .. //depot/projects/kse/sys/powerpc/powerpc/ofw_machdep.c#6 integrate .. //depot/projects/kse/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/kse/sys/powerpc/powerpc/pmap.c#21 integrate .. //depot/projects/kse/sys/powerpc/powerpc/sigcode.S#3 integrate .. //depot/projects/kse/sys/powerpc/powerpc/syncicache.c#3 integrate .. //depot/projects/kse/sys/powerpc/powerpc/trap.c#18 integrate .. //depot/projects/kse/sys/powerpc/powerpc/trap_subr.S#5 integrate .. //depot/projects/kse/sys/powerpc/powerpc/vm_machdep.c#16 integrate .. //depot/projects/kse/sys/powerpc/psim/ata_iobus.c#1 branch .. //depot/projects/kse/sys/powerpc/psim/iobus.c#1 branch .. //depot/projects/kse/sys/powerpc/psim/iobusvar.h#1 branch .. //depot/projects/kse/sys/powerpc/psim/psim-tree#1 branch .. //depot/projects/kse/sys/powerpc/psim/sio_iobus.c#1 branch .. //depot/projects/kse/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/kse/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/kse/sys/sparc64/conf/GENERIC#20 integrate .. //depot/projects/kse/sys/sparc64/include/bus.h#7 integrate .. //depot/projects/kse/sys/sparc64/include/endian.h#10 integrate .. //depot/projects/kse/sys/sparc64/include/param.h#12 integrate .. //depot/projects/kse/sys/sparc64/include/stdarg.h#4 integrate .. //depot/projects/kse/sys/sparc64/sparc64/autoconf.c#7 integrate .. //depot/projects/kse/sys/sparc64/sparc64/db_trace.c#11 integrate .. //depot/projects/kse/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/kse/sys/sparc64/sparc64/trap.c#37 integrate .. //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#27 integrate .. //depot/projects/kse/sys/sys/_posix.h#2 integrate .. //depot/projects/kse/sys/sys/_types.h#6 integrate .. //depot/projects/kse/sys/sys/alq.h#1 branch .. //depot/projects/kse/sys/sys/bio.h#10 integrate .. //depot/projects/kse/sys/sys/cdefs.h#18 integrate .. //depot/projects/kse/sys/sys/disk.h#5 integrate .. //depot/projects/kse/sys/sys/disklabel.h#14 integrate .. //depot/projects/kse/sys/sys/fcntl.h#4 integrate .. //depot/projects/kse/sys/sys/file.h#14 integrate .. //depot/projects/kse/sys/sys/imgact.h#9 integrate .. //depot/projects/kse/sys/sys/kse.h#21 integrate .. //depot/projects/kse/sys/sys/ktr.h#8 integrate .. //depot/projects/kse/sys/sys/linker_set.h#4 integrate .. //depot/projects/kse/sys/sys/mbuf.h#14 integrate .. //depot/projects/kse/sys/sys/mchain.h#4 integrate .. //depot/projects/kse/sys/sys/param.h#25 integrate .. //depot/projects/kse/sys/sys/proc.h#135 integrate .. //depot/projects/kse/sys/sys/syscall.h#24 integrate .. //depot/projects/kse/sys/sys/syscall.mk#24 integrate .. //depot/projects/kse/sys/sys/syslimits.h#2 integrate .. //depot/projects/kse/sys/sys/sysproto.h#28 integrate .. //depot/projects/kse/sys/sys/types.h#19 integrate .. //depot/projects/kse/sys/sys/ucontext.h#10 integrate .. //depot/projects/kse/sys/sys/unistd.h#6 integrate .. //depot/projects/kse/sys/tools/vnode_if.awk#6 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_alloc.c#14 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_snapshot.c#15 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_vnops.c#19 integrate .. //depot/projects/kse/sys/vm/uma.h#8 integrate .. //depot/projects/kse/sys/vm/uma_core.c#14 integrate .. //depot/projects/kse/sys/vm/uma_dbg.c#5 integrate .. //depot/projects/kse/sys/vm/uma_dbg.h#3 integrate .. //depot/projects/kse/sys/vm/uma_int.h#7 integrate .. //depot/projects/kse/sys/vm/vm_glue.c#39 integrate .. //depot/projects/kse/sys/vm/vm_map.c#26 integrate .. //depot/projects/kse/sys/vm/vm_map.h#17 integrate .. //depot/projects/kse/sys/vm/vm_mmap.c#20 integrate .. //depot/projects/kse/sys/vm/vm_object.h#9 integrate .. //depot/projects/kse/sys/vm/vm_page.h#13 integrate .. //depot/projects/kse/sys/vm/vm_pageout.c#20 integrate .. //depot/projects/kse/sys/vm/vm_unix.c#8 integrate .. //depot/projects/kse/sys/x86_64/include/endian.h#3 integrate .. //depot/projects/kse/sys/x86_64/include/param.h#2 integrate .. //depot/projects/kse/sys/x86_64/include/stdarg.h#3 integrate Differences ... ==== //depot/projects/kse/bin/ps/extern.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.24 2002/06/08 06:49:15 bde Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.26 2002/09/17 02:52:44 jmallett Exp $ */ struct kinfo; @@ -79,7 +79,6 @@ void state(KINFO *, VARENT *); void tdev(KINFO *, VARENT *); void tname(KINFO *, VARENT *); -void tsize(KINFO *, VARENT *); void ucomm(KINFO *, VARENT *); void uname(KINFO *, VARENT *); void vsize(KINFO *, VARENT *); ==== //depot/projects/kse/bin/ps/keyword.c#9 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.50 2002/07/08 09:08:51 robert Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.54 2002/09/17 17:13:52 jmallett Exp $"); #include #include @@ -57,15 +57,6 @@ static VAR *findvar(char *); static int vcmp(const void *, const void *); -#ifdef NOTINUSE -int utime(), stime(), ixrss(), idrss(), isrss(); - {{"utime"}, "UTIME", USER, utime, NULL, 4}, - {{"stime"}, "STIME", USER, stime, NULL, 4}, - {{"ixrss"}, "IXRSS", USER, ixrss, NULL, 4}, - {{"idrss"}, "IDRSS", USER, idrss, NULL, 4}, - {{"isrss"}, "ISRSS", USER, isrss, NULL, 4}, -#endif - /* Compute offset in common structures. */ #define KOFF(x) offsetof(struct kinfo_proc, x) #define ROFF(x) offsetof(struct rusage, x) @@ -156,8 +147,7 @@ UINT, UIDFMT, 0}, {"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname, USERLEN, 0, CHAR, NULL, 0}, - {"rss", "RSS", NULL, 0, kvar, NULL, 4, KOFF(ki_rssize), UINT, "d", - 0}, + {"rss", "RSS", NULL, 0, kvar, NULL, 4, KOFF(ki_rssize), PGTOK, "ld", 0}, {"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR, NULL, 0}, {"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid), @@ -190,7 +180,7 @@ PIDFMT, 0}, {"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT, PIDFMT, 0}, - {"tsiz", "TSIZ", NULL, 0, tsize, NULL, 4, 0, CHAR, NULL, 0}, + {"tsiz", "TSIZ", NULL, 0, kvar, NULL, 4, KOFF(ki_tsize), PGTOK, "ld", 0}, {"tt", "TT ", NULL, 0, tname, NULL, 4, 0, CHAR, NULL, 0}, {"tty", "TTY", NULL, LJUST, longtname, NULL, 8, 0, CHAR, NULL, 0}, {"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR, NULL, ==== //depot/projects/kse/bin/ps/print.c#15 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.70 2002/09/13 07:13:33 peter Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.73 2002/09/17 17:13:52 jmallett Exp $"); #include #include @@ -317,6 +317,7 @@ return (strlen(user_from_uid(k->ki_p->ki_ruid, 0))); } + void tdev(KINFO *k, VARENT *ve) { @@ -620,15 +621,6 @@ } void -tsize(KINFO *k, VARENT *ve) -{ - VAR *v; - - v = ve->var; - (void)printf("%*ld", v->width, (long)ps_pgtok(k->ki_p->ki_tsize)); -} - -void priorityr(KINFO *k, VARENT *ve) { VAR *v; @@ -704,6 +696,9 @@ case KPTR: (void)printf(ofmt, v->width, *(u_long *)bp); break; + case PGTOK: + (void)printf(ofmt, v->width, ps_pgtok(*(u_long *)bp)); + break; default: errx(1, "unknown type %d", v->type); } ==== //depot/projects/kse/bin/ps/ps.h#3 (text+ko) ==== @@ -31,11 +31,11 @@ * SUCH DAMAGE. * * @(#)ps.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ps/ps.h,v 1.10 2002/02/03 14:43:04 markm Exp $ + * $FreeBSD: src/bin/ps/ps.h,v 1.12 2002/09/17 17:13:52 jmallett Exp $ */ #define UNLIMITED 0 /* unlimited terminal width */ -enum type { CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR }; +enum type { CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR, PGTOK }; typedef struct kinfo { struct kinfo_proc *ki_p; /* kinfo_proc structure */ ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h,v 1.2 2002/07/10 07:48:45 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h,v 1.3 2002/09/18 16:20:49 obrien Exp $ */ #ifndef FBSD_KGDB_I386_H #define FBSD_KGDB_I386_H @@ -20,7 +20,7 @@ #undef FRAME_SAVED_PC #define FRAME_SAVED_PC(FRAME) \ (kernel_debugging \ - ? fbsd_kern_frame_saved_pc(FRAME) : \ + ? fbsd_kern_frame_saved_pc (FRAME) : \ (FRAME)->signal_handler_caller \ ? sigtramp_saved_pc (FRAME) \ : read_memory_integer ((FRAME)->frame + 4, 4)) ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* Native-kernel debugging definitions for FreeBSD. - * $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h,v 1.2 2002/06/29 17:55:17 obrien Exp $ + * $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h,v 1.3 2002/09/18 16:20:49 obrien Exp $ */ #ifndef FBSD_KGDB_H @@ -27,7 +27,7 @@ /* START_PROGRESS is called at the top of main */ #undef START_PROGRESS #define START_PROGRESS(STR,N) \ - if (!strcmp(STR, "kgdb")) \ + if (!strcmp (STR, "kgdb")) \ kernel_debugging = 1; #endif /* FBSD_KGDB_H */ ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.40 2002/07/28 18:46:49 peter Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.42 2002/09/18 16:19:05 obrien Exp $ */ /* * This works like "remote" but, you use it like this: @@ -29,6 +29,7 @@ * * This way makes it easy to short-circut the whole bfd monster, * and direct the inferior stuff to our libkvm implementation. + * */ #include @@ -57,19 +58,19 @@ #include "gdbcore.h" static void -kcore_files_info PARAMS ((struct target_ops *)); +kcore_files_info (struct target_ops *); static void -kcore_close PARAMS ((int)); +kcore_close (int); static void -get_kcore_registers PARAMS ((int)); +get_kcore_registers (int); static int -xfer_mem PARAMS ((CORE_ADDR, char *, int, int, struct target_ops *)); +xfer_mem (CORE_ADDR, char *, int, int, struct target_ops *); static int -xfer_umem PARAMS ((CORE_ADDR, char *, int, int)); +xfer_umem (CORE_ADDR, char *, int, int); static char *core_file; static kvm_t *core_kd; @@ -81,16 +82,15 @@ int kernel_debugging; int kernel_writablecore; -/* - * Read the "thing" at kernel address 'addr' into the space pointed to - * by point. The length of the "thing" is determined by the type of p. - * Result is non-zero if transfer fails. - */ +/* Read the "thing" at kernel address 'addr' into the space pointed to + by point. The length of the "thing" is determined by the type of p. + Result is non-zero if transfer fails. */ + #define kvread(addr, p) \ -(target_read_memory((CORE_ADDR)(addr), (char *)(p), sizeof(*(p)))) + (target_read_memory ((CORE_ADDR) (addr), (char *) (p), sizeof (*(p)))) static CORE_ADDR -ksym_kernbase() +ksym_kernbase (void) { static CORE_ADDR kernbase; struct minimal_symbol *sym; @@ -107,94 +107,93 @@ return kernbase; } -#define KERNOFF (ksym_kernbase()) +#define KERNOFF (ksym_kernbase ()) #define INKERNEL(x) ((x) >= KERNOFF) - CORE_ADDR -ksym_lookup(name) - const char *name; +ksym_lookup(const char *name) { struct minimal_symbol *sym; - sym = lookup_minimal_symbol(name, NULL, NULL); + sym = lookup_minimal_symbol (name, NULL, NULL); if (sym == NULL) - error("kernel symbol `%s' not found.", name); + error ("kernel symbol `%s' not found.", name); - return SYMBOL_VALUE_ADDRESS(sym); + return SYMBOL_VALUE_ADDRESS (sym); } -/* - * Provide the address of an initial PCB to use. - * If this is a crash dump, try for "dumppcb". - * If no "dumppcb" or it's /dev/mem, use proc0. - * Return the core address of the PCB we found. - */ +/* Provide the address of an initial PCB to use. + If this is a crash dump, try for "dumppcb". + If no "dumppcb" or it's /dev/mem, use proc0. + Return the core address of the PCB we found. */ + static CORE_ADDR -initial_pcb() +initial_pcb (void) { struct minimal_symbol *sym; CORE_ADDR addr; void *val; - /* Make sure things are open... */ + /* Make sure things are open... */ if (!core_kd || !core_file) return (0); - /* If this is NOT /dev/mem try for dumppcb. */ - if (strncmp(core_file, _PATH_DEV, sizeof _PATH_DEV - 1)) { - sym = lookup_minimal_symbol("dumppcb", NULL, NULL); - if (sym != NULL) { - addr = SYMBOL_VALUE_ADDRESS(sym); - return (addr); - } + /* If this is NOT /dev/mem try for dumppcb. */ + if (strncmp (core_file, _PATH_DEV, sizeof _PATH_DEV - 1)) + { + sym = lookup_minimal_symbol ("dumppcb", NULL, NULL); + if (sym != NULL) + { + addr = SYMBOL_VALUE_ADDRESS (sym); + return (addr); + } } - /* - * OK, just use thread0's pcb. Note that curproc might - * not exist, and if it does, it will point to gdb. - * Therefore, just use proc0 and let the user set - * some other context if they care about it. - */ - addr = ksym_lookup("thread0"); - if (kvread(addr, &val)) { - error("cannot read thread0 pointer at %x\n", addr); - val = 0; - } else { - /* Read the PCB address in thread structure. */ - addr += offsetof(struct thread, td_pcb); - if (kvread(addr, &val)) { - error("cannot read thread0->td_pcb pointer at %x\n", addr); + /* OK, just use thread0's pcb. Note that curproc might + not exist, and if it does, it will point to gdb. + Therefore, just use proc0 and let the user set + some other context if they care about it. */ + + addr = ksym_lookup ("thread0"); + if (kvread (addr, &val)) + { + error ("cannot read thread0 pointer at %x\n", addr); val = 0; } - } + else + { + /* Read the PCB address in thread structure. */ + addr += offsetof (struct thread, td_pcb); + if (kvread (addr, &val)) + { + error ("cannot read thread0->td_pcb pointer at %x\n", addr); + val = 0; + } + } - cur_proc = 0; /* thread0 is wholly in the kernel and cur_proc is - * only used for reading user mem, so no point - * in setting this up */ - + /* thread0 is wholly in the kernel and cur_proc is only used for + reading user mem, so no point in setting this up. */ + cur_proc = 0; return ((CORE_ADDR)val); } -/* - * Set the current context to that of the PCB struct - * at the system address passed. - */ +/* Set the current context to that of the PCB struct at the system address + passed. */ + static int -set_context(addr) - CORE_ADDR addr; +set_context (CORE_ADDR addr) { CORE_ADDR procaddr = 0; - if (kvread(addr, &cur_pcb)) - error("cannot read pcb at %#x", addr); + if (kvread (addr, &cur_pcb)) + error ("cannot read pcb at %#x", addr); - /* Fetch all registers from core file */ + /* Fetch all registers from core file. */ target_fetch_registers (-1); - /* Now, set up the frame cache, and print the top of stack */ - flush_cached_frames(); + /* Now, set up the frame cache, and print the top of stack. */ + flush_cached_frames (); set_current_frame (create_new_frame (read_fp (), read_pc ())); select_frame (get_current_frame (), 0); return (0); @@ -205,28 +204,26 @@ /* ARGSUSED */ static void -kcore_close (quitting) - int quitting; +kcore_close (int quitting) { - inferior_ptid = null_ptid; /* Avoid confusion from thread stuff */ + inferior_ptid = null_ptid; /* Avoid confusion from thread stuff. */ - if (core_kd) { - kvm_close(core_kd); - free(core_file); - core_file = NULL; - core_kd = NULL; - } + if (core_kd) + { + kvm_close (core_kd); + free (core_file); + core_file = NULL; + core_kd = NULL; + } } /* This routine opens and sets up the core file bfd. */ static void -kcore_open (filename, from_tty) - char *filename; /* the core file */ - int from_tty; +kcore_open (char *filename /* the core file */, int from_tty) { - kvm_t *kd; + kvm_t *kd; const char *p; struct cleanup *old_chain; char buf[256], *cp; @@ -235,61 +232,66 @@ target_preopen (from_tty); - /* The exec file is required for symbols. */ + /* The exec file is required for symbols. */ if (exec_bfd == NULL) - error("No kernel exec file specified"); + error ("No kernel exec file specified"); - if (core_kd) { - error ("No core file specified." - " (Use `detach' to stop debugging a core file.)"); - return; - } + if (core_kd) + { + error ("No core file specified." + " (Use `detach' to stop debugging a core file.)"); + return; + } - if (!filename) { - error ("No core file specified."); - return; - } + if (!filename) + { + error ("No core file specified."); + return; + } filename = tilde_expand (filename); - if (filename[0] != '/') { - cp = concat (current_directory, "/", filename, NULL); - free (filename); - filename = cp; - } + if (filename[0] != '/') + { + cp = concat (current_directory, "/", filename, NULL); + free (filename); + filename = cp; + } old_chain = make_cleanup (free, filename); kd = kvm_open (bfd_get_filename(exec_bfd), filename, NULL, kernel_writablecore ? O_RDWR: O_RDONLY, 0); - if (kd == NULL) { - perror_with_name (filename); - return; - } + if (kd == NULL) + { + perror_with_name (filename); + return; + } /* Looks semi-reasonable. Toss the old core file and work on the new. */ - discard_cleanups (old_chain); /* Don't free filename any more */ + discard_cleanups (old_chain); /* Don't free filename any more. */ core_file = filename; unpush_target (&kcore_ops); ontop = !push_target (&kcore_ops); - /* Note unpush_target (above) calls kcore_close. */ + /* Note unpush_target (above) calls kcore_close. */ core_kd = kd; - /* print out the panic string if there is one */ - if (kvread(ksym_lookup("panicstr"), &addr) == 0 && + /* Print out the panic string if there is one. */ + if (kvread (ksym_lookup ("panicstr"), &addr) == 0 && addr != 0 && - target_read_memory(addr, buf, sizeof(buf)) == 0) { + target_read_memory (addr, buf, sizeof(buf)) == 0) + { - for (cp = buf; cp < &buf[sizeof(buf)] && *cp; cp++) - if (!isascii(*cp) || (!isprint(*cp) && !isspace(*cp))) - *cp = '?'; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 0:36:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0FAE37B404; Mon, 23 Sep 2002 00:35:44 -0700 (PDT) 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 4906737B401; Mon, 23 Sep 2002 00:35:44 -0700 (PDT) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2269543E4A; Mon, 23 Sep 2002 00:35:43 -0700 (PDT) (envelope-from baka@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1921) id E9019AE1D0; Mon, 23 Sep 2002 00:35:42 -0700 (PDT) Date: Mon, 23 Sep 2002 00:35:42 -0700 From: Jon Mini To: Julian Elischer Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17981 for review Message-ID: <20020923073542.GJ7539@elvis.mu.org> References: <200209230734.g8N7Y5jr082997@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200209230734.g8N7Y5jr082997@freefall.freebsd.org> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Julian Elischer [julian@FreeBSD.org] wrote : > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17981 > > Change 17981 by julian@julian_jules1 on 2002/09/23 00:33:56 > > MFC.. Mini! check the merge of the floating point and context stuff Wilco. > Affected files ... > > .. //depot/projects/kse/bin/ps/extern.h#7 integrate > .. //depot/projects/kse/bin/ps/keyword.c#9 integrate > .. //depot/projects/kse/bin/ps/print.c#15 integrate > .. //depot/projects/kse/bin/ps/ps.h#3 integrate > .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#2 integrate > .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#2 integrate > .. //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#3 integrate > .. //depot/projects/kse/include/Makefile#3 integrate > .. //depot/projects/kse/include/fnmatch.h#2 integrate > .. //depot/projects/kse/include/fts.h#2 integrate > .. //depot/projects/kse/include/grp.h#3 integrate > .. //depot/projects/kse/include/inttypes.h#5 integrate > .. //depot/projects/kse/include/iso646.h#2 integrate > .. //depot/projects/kse/include/langinfo.h#2 integrate > .. //depot/projects/kse/include/limits.h#2 integrate > .. //depot/projects/kse/include/link.h#3 integrate > .. //depot/projects/kse/include/monetary.h#3 integrate > .. //depot/projects/kse/include/nl_types.h#2 integrate > .. //depot/projects/kse/include/stdlib.h#7 integrate > .. //depot/projects/kse/include/unistd.h#4 integrate > .. //depot/projects/kse/include/wchar.h#7 integrate > .. //depot/projects/kse/lib/libc/alpha/gen/infinity.c#2 integrate > .. //depot/projects/kse/lib/libc/gen/_pthread_stubs.c#2 integrate > .. //depot/projects/kse/lib/libc/gen/confstr.c#2 integrate > .. //depot/projects/kse/lib/libc/gen/dlfcn.c#3 integrate > .. //depot/projects/kse/lib/libc/gen/fts.3#2 integrate > .. //depot/projects/kse/lib/libc/gen/fts.c#2 integrate > .. //depot/projects/kse/lib/libc/gen/getobjformat.c#2 integrate > .. //depot/projects/kse/lib/libc/gen/swapcontext.c#7 integrate > .. //depot/projects/kse/lib/libc/gen/sysconf.c#2 integrate > .. //depot/projects/kse/lib/libc/gmon/gmon.c#2 integrate > .. //depot/projects/kse/lib/libc/i386/SYS.h#2 integrate > .. //depot/projects/kse/lib/libc/i386/gen/Makefile.inc#3 integrate > .. //depot/projects/kse/lib/libc/i386/gen/getcontext.S#8 integrate > .. //depot/projects/kse/lib/libc/i386/gen/infinity.c#2 integrate > .. //depot/projects/kse/lib/libc/i386/gen/makecontext.c#6 integrate > .. //depot/projects/kse/lib/libc/ia64/gen/infinity.c#2 integrate > .. //depot/projects/kse/lib/libc/locale/Makefile.inc#8 integrate > .. //depot/projects/kse/lib/libc/locale/frune.c#2 integrate > .. //depot/projects/kse/lib/libc/locale/mbrune.3#2 integrate > .. //depot/projects/kse/lib/libc/locale/mbrune.c#2 integrate > .. //depot/projects/kse/lib/libc/locale/rune.3#3 integrate > .. //depot/projects/kse/lib/libc/locale/wcstoimax.c#1 branch > .. //depot/projects/kse/lib/libc/locale/wcstol.3#3 integrate > .. //depot/projects/kse/lib/libc/locale/wcstoll.c#1 branch > .. //depot/projects/kse/lib/libc/locale/wcstoull.c#1 branch > .. //depot/projects/kse/lib/libc/locale/wcstoumax.c#1 branch > .. //depot/projects/kse/lib/libc/net/getnetbydns.c#4 integrate > .. //depot/projects/kse/lib/libc/net/name6.c#4 integrate > .. //depot/projects/kse/lib/libc/rpc/rpc_clnt_create.3#3 integrate > .. //depot/projects/kse/lib/libc/sparc64/gen/infinity.c#2 integrate > .. //depot/projects/kse/lib/libc/stdio/Makefile.inc#3 integrate > .. //depot/projects/kse/lib/libc/stdio/fgetwc.c#2 integrate > .. //depot/projects/kse/lib/libc/stdio/fgetws.c#3 integrate > .. //depot/projects/kse/lib/libc/stdio/fputwc.c#2 integrate > .. //depot/projects/kse/lib/libc/stdio/fputws.c#3 integrate > .. //depot/projects/kse/lib/libc/stdio/fwprintf.c#1 branch > .. //depot/projects/kse/lib/libc/stdio/local.h#4 integrate > .. //depot/projects/kse/lib/libc/stdio/printf.3#4 integrate > .. //depot/projects/kse/lib/libc/stdio/stdio.3#3 integrate > .. //depot/projects/kse/lib/libc/stdio/swprintf.c#1 branch > .. //depot/projects/kse/lib/libc/stdio/ungetwc.c#2 integrate > .. //depot/projects/kse/lib/libc/stdio/vfprintf.c#5 integrate > .. //depot/projects/kse/lib/libc/stdio/vfwprintf.c#1 branch > .. //depot/projects/kse/lib/libc/stdio/vsnprintf.c#5 integrate > .. //depot/projects/kse/lib/libc/stdio/vswprintf.c#1 branch > .. //depot/projects/kse/lib/libc/stdio/vwprintf.c#1 branch > .. //depot/projects/kse/lib/libc/stdio/wprintf.3#1 branch > .. //depot/projects/kse/lib/libc/stdio/wprintf.c#1 branch > .. //depot/projects/kse/lib/libc/stdlib/strfmon.3#2 integrate > .. //depot/projects/kse/lib/libc/stdlib/strfmon.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wcscat.c#3 integrate > .. //depot/projects/kse/lib/libc/string/wcschr.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wcscmp.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wcscpy.c#3 integrate > .. //depot/projects/kse/lib/libc/string/wcscspn.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wcslcat.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wcslcpy.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wcslen.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wcsncat.c#3 integrate > .. //depot/projects/kse/lib/libc/string/wcsncmp.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wcsncpy.c#3 integrate > .. //depot/projects/kse/lib/libc/string/wcspbrk.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wcsrchr.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wcsspn.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wcsstr.c#3 integrate > .. //depot/projects/kse/lib/libc/string/wmemchr.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wmemcmp.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wmemcpy.c#3 integrate > .. //depot/projects/kse/lib/libc/string/wmemmove.c#2 integrate > .. //depot/projects/kse/lib/libc/string/wmemset.c#2 integrate > .. //depot/projects/kse/lib/libc/sys/Makefile.inc#2 integrate > .. //depot/projects/kse/lib/libc/sys/sem.c#1 branch > .. //depot/projects/kse/lib/libkvm/kvm_proc.c#24 integrate > .. //depot/projects/kse/sys/alpha/alpha/autoconf.c#8 integrate > .. //depot/projects/kse/sys/alpha/alpha/db_trace.c#6 integrate > .. //depot/projects/kse/sys/alpha/alpha/machdep.c#44 integrate > .. //depot/projects/kse/sys/alpha/alpha/pmap.c#34 integrate > .. //depot/projects/kse/sys/alpha/alpha/trap.c#35 integrate > .. //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#30 integrate > .. //depot/projects/kse/sys/alpha/include/asm.h#4 integrate > .. //depot/projects/kse/sys/alpha/include/atomic.h#3 integrate > .. //depot/projects/kse/sys/alpha/include/endian.h#8 integrate > .. //depot/projects/kse/sys/alpha/include/param.h#7 integrate > .. //depot/projects/kse/sys/alpha/include/stdarg.h#4 integrate > .. //depot/projects/kse/sys/alpha/linux/linux_genassym.c#3 integrate > .. //depot/projects/kse/sys/alpha/osf1/imgact_osf1.c#8 integrate > .. //depot/projects/kse/sys/alpha/pci/tsunamireg.h#2 integrate > .. //depot/projects/kse/sys/arm/include/param.h#3 integrate > .. //depot/projects/kse/sys/boot/i386/boot0/Makefile#3 integrate > .. //depot/projects/kse/sys/boot/i386/btx/btx/Makefile#3 integrate > .. //depot/projects/kse/sys/boot/i386/btx/btxldr/Makefile#2 integrate > .. //depot/projects/kse/sys/boot/i386/btx/lib/Makefile#3 integrate > .. //depot/projects/kse/sys/boot/i386/cdboot/Makefile#2 integrate > .. //depot/projects/kse/sys/boot/i386/kgzldr/Makefile#4 integrate > .. //depot/projects/kse/sys/boot/i386/kgzldr/crt.s#2 integrate > .. //depot/projects/kse/sys/boot/i386/kgzldr/kgzldr.m4#2 delete > .. //depot/projects/kse/sys/boot/i386/kgzldr/sio.s#2 integrate > .. //depot/projects/kse/sys/boot/i386/kgzldr/start.s#2 integrate > .. //depot/projects/kse/sys/boot/i386/liloldr/Makefile#2 integrate > .. //depot/projects/kse/sys/boot/i386/mbr/Makefile#2 integrate > .. //depot/projects/kse/sys/boot/i386/pxeldr/Makefile#3 integrate > .. //depot/projects/kse/sys/boot/ia64/skiload/main.c#2 integrate > .. //depot/projects/kse/sys/boot/pc98/btx/btx/Makefile#3 integrate > .. //depot/projects/kse/sys/boot/pc98/btx/btxldr/Makefile#2 integrate > .. //depot/projects/kse/sys/boot/pc98/btx/lib/Makefile#3 integrate > .. //depot/projects/kse/sys/boot/pc98/kgzldr/Makefile#4 integrate > .. //depot/projects/kse/sys/boot/pc98/kgzldr/crt.s#3 integrate > .. //depot/projects/kse/sys/cam/cam_xpt.c#11 integrate > .. //depot/projects/kse/sys/cam/scsi/scsi_all.c#12 integrate > .. //depot/projects/kse/sys/cam/scsi/scsi_cd.c#9 integrate > .. //depot/projects/kse/sys/cam/scsi/scsi_da.c#23 integrate > .. //depot/projects/kse/sys/coda/coda_namecache.h#3 integrate > .. //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#20 integrate > .. //depot/projects/kse/sys/compat/linux/linux_ioctl.c#19 integrate > .. //depot/projects/kse/sys/compat/linux/linux_ioctl.h#4 integrate > .. //depot/projects/kse/sys/compat/linux/linux_misc.c#21 integrate > .. //depot/projects/kse/sys/compat/linux/linux_socket.c#8 integrate > .. //depot/projects/kse/sys/compat/linux/linux_sysctl.c#6 integrate > .. //depot/projects/kse/sys/compat/pecoff/imgact_pecoff.c#16 integrate > .. //depot/projects/kse/sys/compat/svr4/imgact_svr4.c#8 integrate > .. //depot/projects/kse/sys/compat/svr4/svr4_stream.c#12 integrate > .. //depot/projects/kse/sys/conf/Makefile.powerpc#14 integrate > .. //depot/projects/kse/sys/conf/NOTES#18 integrate > .. //depot/projects/kse/sys/conf/files#51 integrate > .. //depot/projects/kse/sys/conf/files.alpha#17 integrate > .. //depot/projects/kse/sys/conf/files.powerpc#9 integrate > .. //depot/projects/kse/sys/conf/kern.post.mk#14 integrate > .. //depot/projects/kse/sys/conf/kern.pre.mk#15 integrate > .. //depot/projects/kse/sys/conf/kmod.mk#13 integrate > .. //depot/projects/kse/sys/conf/options#27 integrate > .. //depot/projects/kse/sys/conf/options.powerpc#4 integrate > .. //depot/projects/kse/sys/contrib/dev/fla/fla.c#5 integrate > .. //depot/projects/kse/sys/ddb/db_command.c#6 integrate > .. //depot/projects/kse/sys/ddb/ddb.h#4 integrate > .. //depot/projects/kse/sys/dev/aac/aac_disk.c#14 integrate > .. //depot/projects/kse/sys/dev/aac/aacvar.h#12 integrate > .. //depot/projects/kse/sys/dev/aic7xxx/ahc_eisa.c#5 integrate > .. //depot/projects/kse/sys/dev/aic7xxx/ahc_pci.c#5 integrate > .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate > .. //depot/projects/kse/sys/dev/aic7xxx/aic7xxx_osm.h#5 integrate > .. //depot/projects/kse/sys/dev/amr/amr_disk.c#4 integrate > .. //depot/projects/kse/sys/dev/amr/amrvar.h#4 integrate > .. //depot/projects/kse/sys/dev/ata/ata-card.c#6 integrate > .. //depot/projects/kse/sys/dev/ata/ata-disk.c#22 integrate > .. //depot/projects/kse/sys/dev/ata/ata-dma.c#25 integrate > .. //depot/projects/kse/sys/dev/ata/ata-isa.c#8 integrate > .. //depot/projects/kse/sys/dev/ata/ata-pci.c#26 integrate > .. //depot/projects/kse/sys/dev/ata/ata-raid.c#14 integrate > .. //depot/projects/kse/sys/dev/ata/atapi-fd.c#12 integrate > .. //depot/projects/kse/sys/dev/awi/awi.c#7 integrate > .. //depot/projects/kse/sys/dev/awi/awi_wep.c#6 integrate > .. //depot/projects/kse/sys/dev/bge/if_bge.c#14 integrate > .. //depot/projects/kse/sys/dev/ccd/ccd.c#15 integrate > .. //depot/projects/kse/sys/dev/ct/ct_isa.c#4 integrate > .. //depot/projects/kse/sys/dev/firewire/firewire.c#2 integrate > .. //depot/projects/kse/sys/dev/firewire/firewire.h#2 integrate > .. //depot/projects/kse/sys/dev/firewire/fwohci_pci.c#2 integrate > .. //depot/projects/kse/sys/dev/firewire/fwohcireg.h#2 integrate > .. //depot/projects/kse/sys/dev/firewire/sbp.c#2 integrate > .. //depot/projects/kse/sys/dev/ic/ns16550.h#2 integrate > .. //depot/projects/kse/sys/dev/ida/ida_disk.c#6 integrate > .. //depot/projects/kse/sys/dev/iicbus/iic.c#6 integrate > .. //depot/projects/kse/sys/dev/iicbus/iic.h#1 branch > .. //depot/projects/kse/sys/dev/iir/iir_ctrl.c#3 integrate > .. //depot/projects/kse/sys/dev/isp/isp.c#24 integrate > .. //depot/projects/kse/sys/dev/isp/isp_freebsd.h#16 integrate > .. //depot/projects/kse/sys/dev/isp/isp_inline.h#10 integrate > .. //depot/projects/kse/sys/dev/isp/isp_pci.c#14 integrate > .. //depot/projects/kse/sys/dev/isp/isp_sbus.c#2 integrate > .. //depot/projects/kse/sys/dev/isp/ispmbox.h#15 integrate > .. //depot/projects/kse/sys/dev/isp/ispvar.h#15 integrate > .. //depot/projects/kse/sys/dev/md/md.c#24 integrate > .. //depot/projects/kse/sys/dev/mlx/mlx_disk.c#4 integrate > .. //depot/projects/kse/sys/dev/mlx/mlxvar.h#5 integrate > .. //depot/projects/kse/sys/dev/mpt/mpt.c#5 integrate > .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.c#5 integrate > .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.h#6 integrate > .. //depot/projects/kse/sys/dev/mpt/mpt_pci.c#5 integrate > .. //depot/projects/kse/sys/dev/ncv/ncr53c500_pccard.c#6 integrate > .. //depot/projects/kse/sys/dev/nsp/nsp_pccard.c#7 integrate > .. //depot/projects/kse/sys/dev/null/null.c#5 integrate > .. //depot/projects/kse/sys/dev/ofw/ofw_disk.c#2 integrate > .. //depot/projects/kse/sys/dev/ppbus/vpoio.c#3 integrate > .. //depot/projects/kse/sys/dev/pst/pst-raid.c#3 integrate > .. //depot/projects/kse/sys/dev/random/hash.c#4 integrate > .. //depot/projects/kse/sys/dev/random/randomdev.c#8 integrate > .. //depot/projects/kse/sys/dev/random/yarrow.c#6 integrate > .. //depot/projects/kse/sys/dev/ray/if_raymib.h#2 integrate > .. //depot/projects/kse/sys/dev/sio/sio.c#18 integrate > .. //depot/projects/kse/sys/dev/smbus/smb.c#5 integrate > .. //depot/projects/kse/sys/dev/smbus/smb.h#1 branch > .. //depot/projects/kse/sys/dev/smbus/smbus.c#4 integrate > .. //depot/projects/kse/sys/dev/stg/tmc18c30_isa.c#4 integrate > .. //depot/projects/kse/sys/dev/stg/tmc18c30_pccard.c#7 integrate > .. //depot/projects/kse/sys/dev/twe/twe_freebsd.c#8 integrate > .. //depot/projects/kse/sys/dev/usb/usb.h#7 integrate > .. //depot/projects/kse/sys/dev/vinum/vinumext.h#5 integrate > .. //depot/projects/kse/sys/dev/vinum/vinumioctl.c#10 integrate > .. //depot/projects/kse/sys/dev/vinum/vinumparser.c#2 integrate > .. //depot/projects/kse/sys/fs/deadfs/dead_vnops.c#6 integrate > .. //depot/projects/kse/sys/fs/devfs/devfs_vnops.c#17 integrate > .. //depot/projects/kse/sys/fs/fdescfs/fdesc_vnops.c#11 integrate > .. //depot/projects/kse/sys/fs/fifofs/fifo_vnops.c#17 integrate > .. //depot/projects/kse/sys/fs/hpfs/hpfs_vnops.c#13 integrate > .. //depot/projects/kse/sys/fs/msdosfs/msdosfs_vnops.c#11 integrate > .. //depot/projects/kse/sys/fs/ntfs/ntfs_vnops.c#10 integrate > .. //depot/projects/kse/sys/fs/portalfs/portal_vnops.c#13 integrate > .. //depot/projects/kse/sys/fs/procfs/procfs_status.c#15 integrate > .. //depot/projects/kse/sys/fs/smbfs/smbfs.h#4 integrate > .. //depot/projects/kse/sys/fs/smbfs/smbfs_node.h#2 integrate > .. //depot/projects/kse/sys/fs/smbfs/smbfs_smb.c#5 integrate > .. //depot/projects/kse/sys/fs/smbfs/smbfs_subr.h#3 integrate > .. //depot/projects/kse/sys/fs/smbfs/smbfs_vnops.c#13 integrate > .. //depot/projects/kse/sys/fs/unionfs/union_subr.c#11 integrate > .. //depot/projects/kse/sys/fs/unionfs/union_vfsops.c#11 integrate > .. //depot/projects/kse/sys/fs/unionfs/union_vnops.c#8 integrate > .. //depot/projects/kse/sys/geom/geom_dev.c#8 integrate > .. //depot/projects/kse/sys/geom/geom_disk.c#8 integrate > .. //depot/projects/kse/sys/geom/geom_gpt.c#6 integrate > .. //depot/projects/kse/sys/gnu/ext2fs/ext2_vnops.c#9 integrate > .. //depot/projects/kse/sys/i386/acpica/acpi_wakeup.c#8 integrate > .. //depot/projects/kse/sys/i386/apm/apm.c#7 integrate > .. //depot/projects/kse/sys/i386/conf/NOTES#39 integrate > .. //depot/projects/kse/sys/i386/i386/autoconf.c#11 integrate > .. //depot/projects/kse/sys/i386/i386/bioscall.s#2 integrate > .. //depot/projects/kse/sys/i386/i386/db_interface.c#13 integrate > .. //depot/projects/kse/sys/i386/i386/db_trace.c#9 integrate > .. //depot/projects/kse/sys/i386/i386/elan-mmcr.c#4 integrate > .. //depot/projects/kse/sys/i386/i386/genassym.c#32 integrate > .. //depot/projects/kse/sys/i386/i386/i686_mem.c#4 integrate > .. //depot/projects/kse/sys/i386/i386/legacy.c#1 branch > .. //depot/projects/kse/sys/i386/i386/locore.s#16 integrate > .. //depot/projects/kse/sys/i386/i386/machdep.c#60 integrate > .. //depot/projects/kse/sys/i386/i386/mem.c#8 integrate > .. //depot/projects/kse/sys/i386/i386/mpapic.c#10 integrate > .. //depot/projects/kse/sys/i386/i386/support.s#11 integrate > .. //depot/projects/kse/sys/i386/i386/trap.c#62 integrate > .. //depot/projects/kse/sys/i386/i386/vm_machdep.c#67 integrate > .. //depot/projects/kse/sys/i386/ibcs2/imgact_coff.c#15 integrate > .. //depot/projects/kse/sys/i386/include/asm.h#3 integrate > .. //depot/projects/kse/sys/i386/include/cpufunc.h#12 integrate > .. //depot/projects/kse/sys/i386/include/endian.h#10 integrate > .. //depot/projects/kse/sys/i386/include/iic.h#2 delete > .. //depot/projects/kse/sys/i386/include/legacyvar.h#1 branch > .. //depot/projects/kse/sys/i386/include/npx.h#7 integrate > .. //depot/projects/kse/sys/i386/include/param.h#12 integrate > .. //depot/projects/kse/sys/i386/include/pcb.h#8 integrate > .. //depot/projects/kse/sys/i386/include/profile.h#6 integrate > .. //depot/projects/kse/sys/i386/include/segments.h#4 integrate > .. //depot/projects/kse/sys/i386/include/signal.h#5 integrate > .. //depot/projects/kse/sys/i386/include/smb.h#2 delete > .. //depot/projects/kse/sys/i386/include/stdarg.h#6 integrate > .. //depot/projects/kse/sys/i386/include/tss.h#2 integrate > .. //depot/projects/kse/sys/i386/include/ucontext.h#4 integrate > .. //depot/projects/kse/sys/i386/isa/clock.c#13 integrate > .. //depot/projects/kse/sys/i386/isa/npx.c#22 integrate > .. //depot/projects/kse/sys/i386/linux/imgact_linux.c#8 integrate > .. //depot/projects/kse/sys/i386/linux/linux_proto.h#10 integrate > .. //depot/projects/kse/sys/i386/linux/linux_syscall.h#8 integrate > .. //depot/projects/kse/sys/i386/linux/linux_sysent.c#8 integrate > .. //depot/projects/kse/sys/i386/linux/syscalls.master#8 integrate > .. //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#15 integrate > .. //depot/projects/kse/sys/ia64/ia64/db_trace.c#7 integrate > .. //depot/projects/kse/sys/ia64/ia64/interrupt.c#13 integrate > .. //depot/projects/kse/sys/ia64/ia64/machdep.c#40 integrate > .. //depot/projects/kse/sys/ia64/ia64/sscdisk.c#9 integrate > .. //depot/projects/kse/sys/ia64/include/asm.h#5 integrate > .. //depot/projects/kse/sys/ia64/include/endian.h#9 integrate > .. //depot/projects/kse/sys/ia64/include/param.h#8 integrate > .. //depot/projects/kse/sys/ia64/include/reg.h#9 integrate > .. //depot/projects/kse/sys/ia64/include/signal.h#5 integrate > .. //depot/projects/kse/sys/ia64/include/stdarg.h#5 integrate > .. //depot/projects/kse/sys/isa/fd.c#12 integrate > .. //depot/projects/kse/sys/isofs/cd9660/cd9660_vnops.c#8 integrate > .. //depot/projects/kse/sys/kern/imgact_aout.c#18 integrate > .. //depot/projects/kse/sys/kern/imgact_elf.c#25 integrate > .. //depot/projects/kse/sys/kern/imgact_gzip.c#5 integrate > .. //depot/projects/kse/sys/kern/init_main.c#50 integrate > .. //depot/projects/kse/sys/kern/init_sysent.c#25 integrate > .. //depot/projects/kse/sys/kern/kern_acct.c#17 integrate > .. //depot/projects/kse/sys/kern/kern_alq.c#1 branch > .. //depot/projects/kse/sys/kern/kern_conf.c#13 integrate > .. //depot/projects/kse/sys/kern/kern_exec.c#41 integrate > .. //depot/projects/kse/sys/kern/kern_exit.c#63 integrate > .. //depot/projects/kse/sys/kern/kern_fork.c#82 integrate > .. //depot/projects/kse/sys/kern/kern_intr.c#30 integrate > .. //depot/projects/kse/sys/kern/kern_ktr.c#9 integrate > .. //depot/projects/kse/sys/kern/kern_mac.c#6 integrate > .. //depot/projects/kse/sys/kern/kern_malloc.c#13 integrate > .. //depot/projects/kse/sys/kern/kern_proc.c#87 integrate > .. //depot/projects/kse/sys/kern/kern_resource.c#24 integrate > .. //depot/projects/kse/sys/kern/kern_shutdown.c#33 integrate > .. //depot/projects/kse/sys/kern/kern_sig.c#68 integrate > .. //depot/projects/kse/sys/kern/kern_switch.c#68 integrate > .. //depot/projects/kse/sys/kern/kern_thread.c#111 integrate > .. //depot/projects/kse/sys/kern/link_elf.c#16 integrate > .. //depot/projects/kse/sys/kern/makesyscalls.sh#13 integrate > .. //depot/projects/kse/sys/kern/subr_disk.c#12 integrate > .. //depot/projects/kse/sys/kern/subr_disklabel.c#11 integrate > .. //depot/projects/kse/sys/kern/subr_diskmbr.c#5 integrate > .. //depot/projects/kse/sys/kern/subr_diskslice.c#12 integrate > .. //depot/projects/kse/sys/kern/subr_mchain.c#6 integrate > .. //depot/projects/kse/sys/kern/subr_sbuf.c#8 integrate > .. //depot/projects/kse/sys/kern/subr_trap.c#77 integrate > .. //depot/projects/kse/sys/kern/subr_witness.c#32 integrate > .. //depot/projects/kse/sys/kern/sys_generic.c#35 integrate > .. //depot/projects/kse/sys/kern/syscalls.c#24 integrate > .. //depot/projects/kse/sys/kern/syscalls.master#24 integrate > .. //depot/projects/kse/sys/kern/uipc_mbuf.c#10 integrate > .. //depot/projects/kse/sys/kern/uipc_sem.c#1 branch > .. //depot/projects/kse/sys/kern/uipc_socket2.c#21 integrate > .. //depot/projects/kse/sys/kern/vfs_mount.c#4 integrate > .. //depot/projects/kse/sys/kern/vfs_subr.c#44 integrate > .. //depot/projects/kse/sys/kern/vfs_syscalls.c#36 integrate > .. //depot/projects/kse/sys/kern/vnode_if.src#12 integrate > .. //depot/projects/kse/sys/modules/Makefile#35 integrate > .. //depot/projects/kse/sys/modules/nfsclient/Makefile#5 integrate > .. //depot/projects/kse/sys/modules/oltr/Makefile#3 integrate > .. //depot/projects/kse/sys/modules/sem/Makefile#1 branch > .. //depot/projects/kse/sys/net/bpf.c#14 integrate > .. //depot/projects/kse/sys/net/if_arc.h#4 integrate > .. //depot/projects/kse/sys/net/if_ethersubr.c#20 integrate > .. //depot/projects/kse/sys/net/if_gif.c#15 integrate > .. //depot/projects/kse/sys/net/if_gre.c#3 integrate > .. //depot/projects/kse/sys/net/if_gre.h#3 integrate > .. //depot/projects/kse/sys/net/if_llc.h#4 integrate > .. //depot/projects/kse/sys/net/if_ppp.c#12 integrate > .. //depot/projects/kse/sys/net/if_spppsubr.c#10 integrate > .. //depot/projects/kse/sys/net/if_stf.c#13 integrate > .. //depot/projects/kse/sys/net/netisr.c#1 branch > .. //depot/projects/kse/sys/netatm/spans/spans_kxdr.c#4 integrate > .. //depot/projects/kse/sys/netatm/spans/spans_kxdr.h#1 branch > .. //depot/projects/kse/sys/netatm/spans/spans_msg.c#5 integrate > .. //depot/projects/kse/sys/netatm/spans/spans_xdr.x#2 integrate > .. //depot/projects/kse/sys/netinet/icmp6.h#5 integrate > .. //depot/projects/kse/sys/netinet/ip6.h#2 integrate > .. //depot/projects/kse/sys/netinet/ip_gre.c#3 integrate > .. //depot/projects/kse/sys/netinet/ip_input.c#25 integrate > .. //depot/projects/kse/sys/netinet/ip_output.c#27 integrate > .. //depot/projects/kse/sys/netinet/tcp_input.c#28 integrate > .. //depot/projects/kse/sys/netinet/tcp_output.c#13 integrate > .. //depot/projects/kse/sys/netinet6/in6_cksum.c#2 integrate > .. //depot/projects/kse/sys/netns/idp_usrreq.c#5 integrate > .. //depot/projects/kse/sys/netns/spp_usrreq.c#6 integrate > .. //depot/projects/kse/sys/netsmb/smb.h#6 integrate > .. //depot/projects/kse/sys/netsmb/smb_conn.h#7 integrate > .. //depot/projects/kse/sys/netsmb/smb_rq.c#6 integrate > .. //depot/projects/kse/sys/netsmb/smb_smb.c#4 integrate > .. //depot/projects/kse/sys/netsmb/smb_tran.h#4 integrate > .. //depot/projects/kse/sys/netsmb/smb_trantcp.c#9 integrate > .. //depot/projects/kse/sys/netsmb/smb_trantcp.h#3 integrate > .. //depot/projects/kse/sys/netsmb/smb_usr.c#2 integrate > .. //depot/projects/kse/sys/nfsclient/nfs_diskless.c#1 branch > .. //depot/projects/kse/sys/nfsclient/nfs_socket.c#16 integrate > .. //depot/projects/kse/sys/nfsclient/nfs_vfsops.c#15 integrate > .. //depot/projects/kse/sys/nfsclient/nfsdiskless.h#4 integrate > .. //depot/projects/kse/sys/nfsserver/nfs_syscalls.c#8 integrate > .. //depot/projects/kse/sys/pc98/apm/apm_bioscall.s#2 integrate > .. //depot/projects/kse/sys/pc98/i386/machdep.c#35 integrate > .. //depot/projects/kse/sys/pc98/pc98/clock.c#9 integrate > .. //depot/projects/kse/sys/pc98/pc98/diskslice_machdep.c#4 integrate > .. //depot/projects/kse/sys/pc98/pc98/fd.c#13 integrate > .. //depot/projects/kse/sys/pc98/pc98/wd.c#5 integrate > .. //depot/projects/kse/sys/pci/amdpm.c#5 integrate > .. //depot/projects/kse/sys/pci/if_dc.c#21 integrate > .. //depot/projects/kse/sys/pci/if_dcreg.h#8 integrate > .. //depot/projects/kse/sys/pci/if_ste.c#11 integrate > .. //depot/projects/kse/sys/pci/if_xl.c#12 integrate > .. //depot/projects/kse/sys/pci/simos.c#3 integrate > .. //depot/projects/kse/sys/posix4/_semaphore.h#1 branch > .. //depot/projects/kse/sys/posix4/mqueue.h#3 integrate > .. //depot/projects/kse/sys/posix4/posix4.h#6 integrate > .. //depot/projects/kse/sys/posix4/posix4_mib.c#2 integrate > .. //depot/projects/kse/sys/powerpc/conf/GENERIC#9 integrate > .. //depot/projects/kse/sys/powerpc/include/asm.h#4 integrate > .. //depot/projects/kse/sys/powerpc/include/atomic.h#3 integrate > .. //depot/projects/kse/sys/powerpc/include/bus.h#4 integrate > .. //depot/projects/kse/sys/powerpc/include/cpu.h#10 integrate > .. //depot/projects/kse/sys/powerpc/include/cpufunc.h#10 integrate > .. //depot/projects/kse/sys/powerpc/include/endian.h#8 integrate > .. //depot/projects/kse/sys/powerpc/include/frame.h#6 integrate > .. //depot/projects/kse/sys/powerpc/include/openpicvar.h#2 integrate > .. //depot/projects/kse/sys/powerpc/include/param.h#5 integrate > .. //depot/projects/kse/sys/powerpc/include/sigframe.h#3 integrate > .. //depot/projects/kse/sys/powerpc/include/stdarg.h#5 integrate > .. //depot/projects/kse/sys/powerpc/powermac/ata_macio.c#1 branch > .. //depot/projects/kse/sys/powerpc/powermac/macio.c#1 branch > .. //depot/projects/kse/sys/powerpc/powermac/maciovar.h#1 branch > .. //depot/projects/kse/sys/powerpc/powermac/uninorth.c#2 integrate > .. //depot/projects/kse/sys/powerpc/powermac/uninorthvar.h#2 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/autoconf.c#6 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/db_trace.c#2 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/genassym.c#16 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/interrupt.c#2 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/locore.s#10 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/machdep.c#25 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/nexus.c#3 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/ofw_machdep.c#6 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/openpic.c#2 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/pmap.c#21 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/sigcode.S#3 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/syncicache.c#3 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/trap.c#18 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/trap_subr.S#5 integrate > .. //depot/projects/kse/sys/powerpc/powerpc/vm_machdep.c#16 integrate > .. //depot/projects/kse/sys/powerpc/psim/ata_iobus.c#1 branch > .. //depot/projects/kse/sys/powerpc/psim/iobus.c#1 branch > .. //depot/projects/kse/sys/powerpc/psim/iobusvar.h#1 branch > .. //depot/projects/kse/sys/powerpc/psim/psim-tree#1 branch > .. //depot/projects/kse/sys/powerpc/psim/sio_iobus.c#1 branch > .. //depot/projects/kse/sys/security/mac_biba/mac_biba.c#5 integrate > .. //depot/projects/kse/sys/security/mac_mls/mac_mls.c#5 integrate > .. //depot/projects/kse/sys/sparc64/conf/GENERIC#20 integrate > .. //depot/projects/kse/sys/sparc64/include/bus.h#7 integrate > .. //depot/projects/kse/sys/sparc64/include/endian.h#10 integrate > .. //depot/projects/kse/sys/sparc64/include/param.h#12 integrate > .. //depot/projects/kse/sys/sparc64/include/stdarg.h#4 integrate > .. //depot/projects/kse/sys/sparc64/sparc64/autoconf.c#7 integrate > .. //depot/projects/kse/sys/sparc64/sparc64/db_trace.c#11 integrate > .. //depot/projects/kse/sys/sparc64/sparc64/exception.S#3 integrate > .. //depot/projects/kse/sys/sparc64/sparc64/trap.c#37 integrate > .. //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#27 integrate > .. //depot/projects/kse/sys/sys/_posix.h#2 integrate > .. //depot/projects/kse/sys/sys/_types.h#6 integrate > .. //depot/projects/kse/sys/sys/alq.h#1 branch > .. //depot/projects/kse/sys/sys/bio.h#10 integrate > .. //depot/projects/kse/sys/sys/cdefs.h#18 integrate > .. //depot/projects/kse/sys/sys/disk.h#5 integrate > .. //depot/projects/kse/sys/sys/disklabel.h#14 integrate > .. //depot/projects/kse/sys/sys/fcntl.h#4 integrate > .. //depot/projects/kse/sys/sys/file.h#14 integrate > .. //depot/projects/kse/sys/sys/imgact.h#9 integrate > .. //depot/projects/kse/sys/sys/kse.h#21 integrate > .. //depot/projects/kse/sys/sys/ktr.h#8 integrate > .. //depot/projects/kse/sys/sys/linker_set.h#4 integrate > .. //depot/projects/kse/sys/sys/mbuf.h#14 integrate > .. //depot/projects/kse/sys/sys/mchain.h#4 integrate > .. //depot/projects/kse/sys/sys/param.h#25 integrate > .. //depot/projects/kse/sys/sys/proc.h#135 integrate > .. //depot/projects/kse/sys/sys/syscall.h#24 integrate > .. //depot/projects/kse/sys/sys/syscall.mk#24 integrate > .. //depot/projects/kse/sys/sys/syslimits.h#2 integrate > .. //depot/projects/kse/sys/sys/sysproto.h#28 integrate > .. //depot/projects/kse/sys/sys/types.h#19 integrate > .. //depot/projects/kse/sys/sys/ucontext.h#10 integrate > .. //depot/projects/kse/sys/sys/unistd.h#6 integrate > .. //depot/projects/kse/sys/tools/vnode_if.awk#6 integrate > .. //depot/projects/kse/sys/ufs/ffs/ffs_alloc.c#14 integrate > .. //depot/projects/kse/sys/ufs/ffs/ffs_snapshot.c#15 integrate > .. //depot/projects/kse/sys/ufs/ufs/ufs_vnops.c#19 integrate > .. //depot/projects/kse/sys/vm/uma.h#8 integrate > .. //depot/projects/kse/sys/vm/uma_core.c#14 integrate > .. //depot/projects/kse/sys/vm/uma_dbg.c#5 integrate > .. //depot/projects/kse/sys/vm/uma_dbg.h#3 integrate > .. //depot/projects/kse/sys/vm/uma_int.h#7 integrate > .. //depot/projects/kse/sys/vm/vm_glue.c#39 integrate > .. //depot/projects/kse/sys/vm/vm_map.c#26 integrate > .. //depot/projects/kse/sys/vm/vm_map.h#17 integrate > .. //depot/projects/kse/sys/vm/vm_mmap.c#20 integrate > .. //depot/projects/kse/sys/vm/vm_object.h#9 integrate > .. //depot/projects/kse/sys/vm/vm_page.h#13 integrate > .. //depot/projects/kse/sys/vm/vm_pageout.c#20 integrate > .. //depot/projects/kse/sys/vm/vm_unix.c#8 integrate > .. //depot/projects/kse/sys/x86_64/include/endian.h#3 integrate > .. //depot/projects/kse/sys/x86_64/include/param.h#2 integrate > .. //depot/projects/kse/sys/x86_64/include/stdarg.h#3 integrate > > Differences ... > > ==== //depot/projects/kse/bin/ps/extern.h#7 (text+ko) ==== > > @@ -31,7 +31,7 @@ > * SUCH DAMAGE. > * > * @(#)extern.h 8.3 (Berkeley) 4/2/94 > - * $FreeBSD: src/bin/ps/extern.h,v 1.24 2002/06/08 06:49:15 bde Exp $ > + * $FreeBSD: src/bin/ps/extern.h,v 1.26 2002/09/17 02:52:44 jmallett Exp $ > */ > > struct kinfo; > @@ -79,7 +79,6 @@ > void state(KINFO *, VARENT *); > void tdev(KINFO *, VARENT *); > void tname(KINFO *, VARENT *); > -void tsize(KINFO *, VARENT *); > void ucomm(KINFO *, VARENT *); > void uname(KINFO *, VARENT *); > void vsize(KINFO *, VARENT *); > > ==== //depot/projects/kse/bin/ps/keyword.c#9 (text+ko) ==== > > @@ -37,7 +37,7 @@ > #endif /* not lint */ > #endif > #include > -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.50 2002/07/08 09:08:51 robert Exp $"); > +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.54 2002/09/17 17:13:52 jmallett Exp $"); > > #include > #include > @@ -57,15 +57,6 @@ > static VAR *findvar(char *); > static int vcmp(const void *, const void *); > > -#ifdef NOTINUSE > -int utime(), stime(), ixrss(), idrss(), isrss(); > - {{"utime"}, "UTIME", USER, utime, NULL, 4}, > - {{"stime"}, "STIME", USER, stime, NULL, 4}, > - {{"ixrss"}, "IXRSS", USER, ixrss, NULL, 4}, > - {{"idrss"}, "IDRSS", USER, idrss, NULL, 4}, > - {{"isrss"}, "ISRSS", USER, isrss, NULL, 4}, > -#endif > - > /* Compute offset in common structures. */ > #define KOFF(x) offsetof(struct kinfo_proc, x) > #define ROFF(x) offsetof(struct rusage, x) > @@ -156,8 +147,7 @@ > UINT, UIDFMT, 0}, > {"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname, > USERLEN, 0, CHAR, NULL, 0}, > - {"rss", "RSS", NULL, 0, kvar, NULL, 4, KOFF(ki_rssize), UINT, "d", > - 0}, > + {"rss", "RSS", NULL, 0, kvar, NULL, 4, KOFF(ki_rssize), PGTOK, "ld", 0}, > {"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR, > NULL, 0}, > {"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid), > @@ -190,7 +180,7 @@ > PIDFMT, 0}, > {"tsid", "TSID", NULL, 0, kvar, NULL, PIDLEN, KOFF(ki_tsid), UINT, > PIDFMT, 0}, > - {"tsiz", "TSIZ", NULL, 0, tsize, NULL, 4, 0, CHAR, NULL, 0}, > + {"tsiz", "TSIZ", NULL, 0, kvar, NULL, 4, KOFF(ki_tsize), PGTOK, "ld", 0}, > {"tt", "TT ", NULL, 0, tname, NULL, 4, 0, CHAR, NULL, 0}, > {"tty", "TTY", NULL, LJUST, longtname, NULL, 8, 0, CHAR, NULL, 0}, > {"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR, NULL, > > ==== //depot/projects/kse/bin/ps/print.c#15 (text+ko) ==== > > @@ -37,7 +37,7 @@ > #endif /* not lint */ > #endif > #include > -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.70 2002/09/13 07:13:33 peter Exp $"); > +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.73 2002/09/17 17:13:52 jmallett Exp $"); > > #include > #include > @@ -317,6 +317,7 @@ > return (strlen(user_from_uid(k->ki_p->ki_ruid, 0))); > } > > + > void > tdev(KINFO *k, VARENT *ve) > { > @@ -620,15 +621,6 @@ > } > > void > -tsize(KINFO *k, VARENT *ve) > -{ > - VAR *v; > - > - v = ve->var; > - (void)printf("%*ld", v->width, (long)ps_pgtok(k->ki_p->ki_tsize)); > -} > - > -void > priorityr(KINFO *k, VARENT *ve) > { > VAR *v; > @@ -704,6 +696,9 @@ > case KPTR: > (void)printf(ofmt, v->width, *(u_long *)bp); > break; > + case PGTOK: > + (void)printf(ofmt, v->width, ps_pgtok(*(u_long *)bp)); > + break; > default: > errx(1, "unknown type %d", v->type); > } > > ==== //depot/projects/kse/bin/ps/ps.h#3 (text+ko) ==== > > @@ -31,11 +31,11 @@ > * SUCH DAMAGE. > * > * @(#)ps.h 8.1 (Berkeley) 5/31/93 > - * $FreeBSD: src/bin/ps/ps.h,v 1.10 2002/02/03 14:43:04 markm Exp $ > + * $FreeBSD: src/bin/ps/ps.h,v 1.12 2002/09/17 17:13:52 jmallett Exp $ > */ > > #define UNLIMITED 0 /* unlimited terminal width */ > -enum type { CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR }; > +enum type { CHAR, UCHAR, SHORT, USHORT, INT, UINT, LONG, ULONG, KPTR, PGTOK }; > > typedef struct kinfo { > struct kinfo_proc *ki_p; /* kinfo_proc structure */ > > ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#2 (text+ko) ==== > > @@ -1,4 +1,4 @@ > -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h,v 1.2 2002/07/10 07:48:45 obrien Exp $ */ > +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h,v 1.3 2002/09/18 16:20:49 obrien Exp $ */ > > #ifndef FBSD_KGDB_I386_H > #define FBSD_KGDB_I386_H > @@ -20,7 +20,7 @@ > #undef FRAME_SAVED_PC > #define FRAME_SAVED_PC(FRAME) \ > (kernel_debugging \ > - ? fbsd_kern_frame_saved_pc(FRAME) : \ > + ? fbsd_kern_frame_saved_pc (FRAME) : \ > (FRAME)->signal_handler_caller \ > ? sigtramp_saved_pc (FRAME) \ > : read_memory_integer ((FRAME)->frame + 4, 4)) > > ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#2 (text+ko) ==== > > @@ -1,5 +1,5 @@ > /* Native-kernel debugging definitions for FreeBSD. > - * $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h,v 1.2 2002/06/29 17:55:17 obrien Exp $ > + * $FreeBSD: src/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h,v 1.3 2002/09/18 16:20:49 obrien Exp $ > */ > > #ifndef FBSD_KGDB_H > @@ -27,7 +27,7 @@ > /* START_PROGRESS is called at the top of main */ > #undef START_PROGRESS > #define START_PROGRESS(STR,N) \ > - if (!strcmp(STR, "kgdb")) \ > + if (!strcmp (STR, "kgdb")) \ > kernel_debugging = 1; > > #endif /* FBSD_KGDB_H */ > > ==== //depot/projects/kse/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#3 (text+ko) ==== > > @@ -19,7 +19,7 @@ > Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > */ > > -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.40 2002/07/28 18:46:49 peter Exp $ */ > +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/kvm-fbsd.c,v 1.42 2002/09/18 16:19:05 obrien Exp $ */ > > /* > * This works like "remote" but, you use it like this: > @@ -29,6 +29,7 @@ > * > * This way makes it easy to short-circut the whole bfd monster, > * and direct the inferior stuff to our libkvm implementation. > + * > */ > > #include > @@ -57,19 +58,19 @@ > #include "gdbcore.h" > > static void > -kcore_files_info PARAMS ((struct target_ops *)); > +kcore_files_info (struct target_ops *); > > static void > -kcore_close PARAMS ((int)); > +kcore_close (int); > > static void > -get_kcore_registers PARAMS ((int)); > +get_kcore_registers (int); > > static int > -xfer_mem PARAMS ((CORE_ADDR, char *, int, int, struct target_ops *)); > +xfer_mem (CORE_ADDR, char *, int, int, struct target_ops *); > > static int > -xfer_umem PARAMS ((CORE_ADDR, char *, int, int)); > +xfer_umem (CORE_ADDR, char *, int, int); > > static char *core_file; > static kvm_t *core_kd; > @@ -81,16 +82,15 @@ > int kernel_debugging; > int kernel_writablecore; > > -/* > - * Read the "thing" at kernel address 'addr' into the space pointed to > - * by point. The length of the "thing" is determined by the type of p. > - * Result is non-zero if transfer fails. > - */ > +/* Read the "thing" at kernel address 'addr' into the space pointed to > + by point. The length of the "thing" is determined by the type of p. > + Result is non-zero if transfer fails. */ > + > #define kvread(addr, p) \ > -(target_read_memory((CORE_ADDR)(addr), (char *)(p), sizeof(*(p)))) > + (target_read_memory ((CORE_ADDR) (addr), (char *) (p), sizeof (*(p)))) > > static CORE_ADDR > -ksym_kernbase() > +ksym_kernbase (void) > { > static CORE_ADDR kernbase; > struct minimal_symbol *sym; > @@ -107,94 +107,93 @@ > return kernbase; > } > > -#define KERNOFF (ksym_kernbase()) > +#define KERNOFF (ksym_kernbase ()) > #define INKERNEL(x) ((x) >= KERNOFF) > > - > CORE_ADDR > -ksym_lookup(name) > - const char *name; > +ksym_lookup(const char *name) > { > struct minimal_symbol *sym; > > - sym = lookup_minimal_symbol(name, NULL, NULL); > + sym = lookup_minimal_symbol (name, NULL, NULL); > if (sym == NULL) > - error("kernel symbol `%s' not found.", name); > + error ("kernel symbol `%s' not found.", name); > > - return SYMBOL_VALUE_ADDRESS(sym); > + return SYMBOL_VALUE_ADDRESS (sym); > } > > -/* > - * Provide the address of an initial PCB to use. > - * If this is a crash dump, try for "dumppcb". > - * If no "dumppcb" or it's /dev/mem, use proc0. > - * Return the core address of the PCB we found. > - */ > +/* Provide the address of an initial PCB to use. > + If this is a crash dump, try for "dumppcb". > + If no "dumppcb" or it's /dev/mem, use proc0. > + Return the core address of the PCB we found. */ > + > static CORE_ADDR > -initial_pcb() > +initial_pcb (void) > { > struct minimal_symbol *sym; > CORE_ADDR addr; > void *val; > > - /* Make sure things are open... */ > + /* Make sure things are open... */ > if (!core_kd || !core_file) > return (0); > > - /* If this is NOT /dev/mem try for dumppcb. */ > - if (strncmp(core_file, _PATH_DEV, sizeof _PATH_DEV - 1)) { > - sym = lookup_minimal_symbol("dumppcb", NULL, NULL); > - if (sym != NULL) { > - addr = SYMBOL_VALUE_ADDRESS(sym); > - return (addr); > - } > + /* If this is NOT /dev/mem try for dumppcb. */ > + if (strncmp (core_file, _PATH_DEV, sizeof _PATH_DEV - 1)) > + { > + sym = lookup_minimal_symbol ("dumppcb", NULL, NULL); > + if (sym != NULL) > + { > + addr = SYMBOL_VALUE_ADDRESS (sym); > + return (addr); > + } > } > > - /* > - * OK, just use thread0's pcb. Note that curproc might > - * not exist, and if it does, it will point to gdb. > - * Therefore, just use proc0 and let the user set > - * some other context if they care about it. > - */ > - addr = ksym_lookup("thread0"); > - if (kvread(addr, &val)) { > - error("cannot read thread0 pointer at %x\n", addr); > - val = 0; > - } else { > - /* Read the PCB address in thread structure. */ > - addr += offsetof(struct thread, td_pcb); > - if (kvread(addr, &val)) { > - error("cannot read thread0->td_pcb pointer at %x\n", addr); > + /* OK, just use thread0's pcb. Note that curproc might > + not exist, and if it does, it will point to gdb. > + Therefore, just use proc0 and let the user set > + some other context if they care about it. */ > + > + addr = ksym_lookup ("thread0"); > + if (kvread (addr, &val)) > + { > + error ("cannot read thread0 pointer at %x\n", addr); > val = 0; > } > - } > + else > + { > + /* Read the PCB address in thread structure. */ > + addr += offsetof (struct thread, td_pcb); > + if (kvread (addr, &val)) > + { > + error ("cannot read thread0->td_pcb pointer at %x\n", addr); > + val = 0; > + } > + } > > - cur_proc = 0; /* thread0 is wholly in the kernel and cur_proc is > - * only used for reading user mem, so no point > - * in setting this up */ > - > + /* thread0 is wholly in the kernel and cur_proc is only used for > + reading user mem, so no point in setting this up. */ > + cur_proc = 0; > > return ((CORE_ADDR)val); > } > > -/* > - * Set the current context to that of the PCB struct > - * at the system address passed. > - */ > +/* Set the current context to that of the PCB struct at the system address > + passed. */ > + > static int > -set_context(addr) > - CORE_ADDR addr; > +set_context (CORE_ADDR addr) > { > CORE_ADDR procaddr = 0; > > - if (kvread(addr, &cur_pcb)) > - error("cannot read pcb at %#x", addr); > + if (kvread (addr, &cur_pcb)) > + error ("cannot read pcb at %#x", addr); > > - /* Fetch all registers from core file */ > + /* Fetch all registers from core file. */ > target_fetch_registers (-1); > > - /* Now, set up the frame cache, and print the top of stack */ > - flush_cached_frames(); > + /* Now, set up the frame cache, and print the top of stack. */ > + flush_cached_frames (); > set_current_frame (create_new_frame (read_fp (), read_pc ())); > select_frame (get_current_frame (), 0); > return (0); > @@ -205,28 +204,26 @@ > > /* ARGSUSED */ > static void > -kcore_close (quitting) > - int quitting; > +kcore_close (int quitting) > { > > - inferior_ptid = null_ptid; /* Avoid confusion from thread stuff */ > + inferior_ptid = null_ptid; /* Avoid confusion from thread stuff. */ > > - if (core_kd) { > - kvm_close(core_kd); > - free(core_file); > - core_file = NULL; > - core_kd = NULL; > - } > + if (core_kd) > + { > + kvm_close (core_kd); > + free (core_file); > + core_file = NULL; > + core_kd = NULL; > + } > } > > /* This routine opens and sets up the core file bfd. */ > > static void > -kcore_open (filename, from_tty) > - char *filename; /* the core file */ > - int from_tty; > +kcore_open (char *filename /* the core file */, int from_tty) > { > - kvm_t *kd; > + kvm_t *kd; > const char *p; > struct cleanup *old_chain; > char buf[256], *cp; > @@ -235,61 +232,66 @@ > > target_preopen (from_tty); > > - /* The exec file is required for symbols. */ > + /* The exec file is required for symbols. */ > if (exec_bfd == NULL) > - error("No kernel exec file specified"); > + error ("No kernel exec file specified"); > > - if (core_kd) { > - error ("No core file specified." > - " (Use `detach' to stop debugging a core file.)"); > - return; > - } > + if (core_kd) > + { > + error ("No core file specified." > + " (Use `detach' to stop debugging a core file.)"); > + return; > + } > > - if (!filename) { > - error ("No core file specified."); > - return; > - } > + if (!filename) > + { > + error ("No core file specified."); > + return; > + } > > filename = tilde_expand (filename); > - if (filename[0] != '/') { > - cp = concat (current_directory, "/", filename, NULL); > - free (filename); > - filename = cp; > - } > + if (filename[0] != '/') > + { > + cp = concat (current_directory, "/", filename, NULL); > + free (filename); > + filename = cp; > + } > > old_chain = make_cleanup (free, filename); > > kd = kvm_open (bfd_get_filename(exec_bfd), filename, NULL, > kernel_writablecore ? O_RDWR: O_RDONLY, 0); > - if (kd == NULL) { > - perror_with_name (filename); > - return; > - } > + if (kd == NULL) > + { > + perror_with_name (filename); > + return; > + } > > /* Looks semi-reasonable. Toss the old core file and work on the new. */ > > - discard_cleanups (old_chain); /* Don't free filename any more */ > + discard_cleanups (old_chain); /* Don't free filename any more. */ > core_file = filename; > unpush_target (&kcore_ops); > ontop = !push_target (&kcore_ops); > > - /* Note unpush_target (above) calls kcore_close. */ > + /* Note unpush_target (above) calls kcore_close. */ > core_kd = kd; > > - /* print out the panic string if there is one */ > - if (kvread(ksym_lookup("panicstr"), &addr) == 0 && > + /* Print out the panic string if there is one. */ > + if (kvread (ksym_lookup ("panicstr"), &addr) == 0 && > addr != 0 && > - target_read_memory(addr, buf, sizeof(buf)) == 0) { > + target_read_memory (addr, buf, sizeof(buf)) == 0) > + { > > - for (cp = buf; cp < &buf[sizeof(buf)] && *cp; cp++) > - if (!isascii(*cp) || (!isprint(*cp) && !isspace(*cp))) > - *cp = '?'; > > >>> TRUNCATED FOR MAIL (1000 lines) <<< -- Jonathan Mini http://www.freebsd.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 0:56:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4E1D37B404; Mon, 23 Sep 2002 00:56:43 -0700 (PDT) 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 5192937B401 for ; Mon, 23 Sep 2002 00:56:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE89643E3B for ; Mon, 23 Sep 2002 00:56:42 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N7ugCo090707 for ; Mon, 23 Sep 2002 00:56:42 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N7ugBN090704 for perforce@freebsd.org; Mon, 23 Sep 2002 00:56:42 -0700 (PDT) Date: Mon, 23 Sep 2002 00:56:42 -0700 (PDT) Message-Id: <200209230756.g8N7ugBN090704@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17983 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17983 Change 17983 by peter@peter_overcee on 2002/09/23 00:56:05 IFC @17982 (and i386_hammer, sorry about the repeated spam about this) Affected files ... .. //depot/projects/hammer/lib/csu/x86_64/Makefile#1 branch .. //depot/projects/hammer/lib/csu/x86_64/crt1.c#1 branch .. //depot/projects/hammer/lib/csu/x86_64/crti.S#1 branch .. //depot/projects/hammer/lib/csu/x86_64/crtn.S#1 branch .. //depot/projects/hammer/sys/i386/include/asm.h#3 integrate .. //depot/projects/hammer/sys/powerpc/include/asm.h#3 integrate .. //depot/projects/hammer/sys/sys/vnode.h#4 integrate .. //depot/projects/hammer/sys/x86_64/include/asm.h#3 integrate .. //depot/projects/hammer/usr.bin/uname/uname.c#5 integrate Differences ... ==== //depot/projects/hammer/sys/i386/include/asm.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD: src/sys/i386/include/asm.h,v 1.9 2002/09/17 01:48:57 peter Exp $ + * $FreeBSD: src/sys/i386/include/asm.h,v 1.10 2002/09/23 07:27:45 peter Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -53,13 +53,11 @@ popl %ebx #define PIC_PLT(x) x@PLT #define PIC_GOT(x) x@GOT(%ebx) -#define PIC_GOTOFF(x) x@GOTOFF(%ebx) #else #define PIC_PROLOGUE #define PIC_EPILOGUE #define PIC_PLT(x) x #define PIC_GOT(x) x -#define PIC_GOTOFF(x) x #endif /* ==== //depot/projects/hammer/sys/powerpc/include/asm.h#3 (text+ko) ==== @@ -29,7 +29,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: asm.h,v 1.6.18.1 2000/07/25 08:37:14 kleink Exp $ - * $FreeBSD: src/sys/powerpc/include/asm.h,v 1.5 2002/09/17 01:48:58 peter Exp $ + * $FreeBSD: src/sys/powerpc/include/asm.h,v 1.6 2002/09/23 07:27:45 peter Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -41,17 +41,14 @@ #define PIC_PLT(x) x@plt #ifdef __STDC__ #define PIC_GOT(x) XXX -#define PIC_GOTOFF(x) XXX #else /* not __STDC__ */ #define PIC_GOT(x) XXX -#define PIC_GOTOFF(x) XXX #endif /* __STDC__ */ #else #define PIC_PROLOGUE #define PIC_EPILOGUE #define PIC_PLT(x) x #define PIC_GOT(x) x -#define PIC_GOTOFF(x) x #endif #define CNAME(csym) csym ==== //depot/projects/hammer/sys/sys/vnode.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $FreeBSD: src/sys/sys/vnode.h,v 1.208 2002/09/14 09:02:15 njl Exp $ + * $FreeBSD: src/sys/sys/vnode.h,v 1.209 2002/09/23 07:21:25 jeff Exp $ */ #ifndef _SYS_VNODE_H_ @@ -52,6 +52,7 @@ #include #include #include +#include /* * The vnode is the focus of all file activity in UNIX. There is a ==== //depot/projects/hammer/sys/x86_64/include/asm.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD: src/sys/i386/include/asm.h,v 1.9 2002/09/17 01:48:57 peter Exp $ + * $FreeBSD: src/sys/i386/include/asm.h,v 1.10 2002/09/23 07:27:45 peter Exp $ */ #ifndef _MACHINE_ASM_H_ ==== //depot/projects/hammer/usr.bin/uname/uname.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ #include -__FBSDID("$FreeBSD: src/usr.bin/uname/uname.c,v 1.10 2002/09/23 06:14:13 jmallett Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/uname/uname.c,v 1.11 2002/09/23 06:47:39 jmallett Exp $"); #ifndef lint static const char copyright[] = @@ -84,6 +84,7 @@ int ch; setup_get(); + flags = 0; while ((ch = getopt(argc, argv, "amnprsv")) != -1) switch(ch) { @@ -169,99 +170,53 @@ printf("\n"); } -void -native_sysname(void) -{ - int mib[2]; - size_t len; - static char buf[1024]; +#define NATIVE_SYSCTL2_GET(var,mib0,mib1) \ +void \ +native_##var(void) \ +{ \ + int mib[] = { (mib0), (mib1) }; \ + size_t len; \ + static char buf[1024]; \ + char **varp = &(var); \ + \ + len = sizeof buf; \ + if (sysctl(mib, sizeof mib / sizeof mib[0], \ + &buf, &len, NULL, 0) == -1) \ + err(1, "sysctl"); - mib[0] = CTL_KERN; - mib[1] = KERN_OSTYPE; - len = sizeof(buf); - if (sysctl(mib, 2, &buf, &len, NULL, 0) == -1) - err(1, "sysctl"); - sysname = buf; -} +#define NATIVE_SET \ + *varp = buf; \ + return; \ +} struct __hack -void -native_hostname(void) -{ - int mib[2]; - size_t len; - static char buf[1024]; +#define NATIVE_BUFFER (buf) +#define NATIVE_LENGTH (len) - mib[0] = CTL_KERN; - mib[1] = KERN_HOSTNAME; - len = sizeof(buf); - if (sysctl(mib, 2, &buf, &len, NULL, 0) == -1) - err(1, "sysctl"); - hostname = buf; -} +NATIVE_SYSCTL2_GET(sysname, CTL_KERN, KERN_OSTYPE) { +} NATIVE_SET; -void -native_release(void) -{ - int mib[2]; - size_t len; - static char buf[1024]; +NATIVE_SYSCTL2_GET(hostname, CTL_KERN, KERN_HOSTNAME) { +} NATIVE_SET; - mib[0] = CTL_KERN; - mib[1] = KERN_OSRELEASE; - len = sizeof(buf); - if (sysctl(mib, 2, &buf, &len, NULL, 0) == -1) - err(1, "sysctl"); - release = buf; -} +NATIVE_SYSCTL2_GET(release, CTL_KERN, KERN_OSRELEASE) { +} NATIVE_SET; -void -native_version(void) -{ - int mib[2]; - size_t len, tlen; +NATIVE_SYSCTL2_GET(version, CTL_KERN, KERN_VERSION) { + size_t n; char *p; - static char buf[1024]; - mib[0] = CTL_KERN; - mib[1] = KERN_VERSION; - len = sizeof(buf); - if (sysctl(mib, 2, &buf, &len, NULL, 0) == -1) - err(1, "sysctl"); - for (p = buf, tlen = len; tlen--; ++p) + p = NATIVE_BUFFER; + n = NATIVE_LENGTH; + for (; n--; ++p) if (*p == '\n' || *p == '\t') *p = ' '; - version = buf; -} +} NATIVE_SET; -void -native_platform(void) -{ - int mib[2]; - size_t len; - static char buf[1024]; +NATIVE_SYSCTL2_GET(platform, CTL_HW, HW_MACHINE) { +} NATIVE_SET; - mib[0] = CTL_HW; - mib[1] = HW_MACHINE; - len = sizeof(buf); - if (sysctl(mib, 2, &buf, &len, NULL, 0) == -1) - err(1, "sysctl"); - platform = buf; -} - -void -native_arch(void) -{ - int mib[2]; - size_t len; - static char buf[1024]; - - mib[0] = CTL_HW; - mib[1] = HW_MACHINE_ARCH; - len = sizeof(buf); - if (sysctl(mib, 2, &buf, &len, NULL, 0) == -1) - err(1, "sysctl"); - arch = buf; -} +NATIVE_SYSCTL2_GET(arch, CTL_HW, HW_MACHINE_ARCH) { +} NATIVE_SET; void usage(void) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 0:58:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D1FF37B404; Mon, 23 Sep 2002 00:58:46 -0700 (PDT) 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 4E2C137B401 for ; Mon, 23 Sep 2002 00:58:46 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEE8843E6A for ; Mon, 23 Sep 2002 00:58:45 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N7wjCo090950 for ; Mon, 23 Sep 2002 00:58:45 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N7wjJE090947 for perforce@freebsd.org; Mon, 23 Sep 2002 00:58:45 -0700 (PDT) Date: Mon, 23 Sep 2002 00:58:45 -0700 (PDT) Message-Id: <200209230758.g8N7wjJE090947@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17984 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17984 Change 17984 by peter@peter_overcee on 2002/09/23 00:58:02 update for x86-64 Affected files ... .. //depot/projects/hammer/lib/csu/x86_64/crt1.c#2 edit Differences ... ==== //depot/projects/hammer/lib/csu/x86_64/crt1.c#2 (text+ko) ==== @@ -60,7 +60,7 @@ fptr retval; #ifdef __GNUC__ - __asm__("movl %%edx,%0" : "=rm"(retval)); + __asm__("movl %%rdx,%0" : "=rm"(retval)); #else retval = (fptr)0; /* XXXX Fix this for other compilers */ #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 1: 1:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91BBC37B404; Mon, 23 Sep 2002 01:01:50 -0700 (PDT) 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 5A0B537B401 for ; Mon, 23 Sep 2002 01:01:50 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05FE643E42 for ; Mon, 23 Sep 2002 01:01:50 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N81nCo091909 for ; Mon, 23 Sep 2002 01:01:49 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N81nQg091902 for perforce@freebsd.org; Mon, 23 Sep 2002 01:01:49 -0700 (PDT) Date: Mon, 23 Sep 2002 01:01:49 -0700 (PDT) Message-Id: <200209230801.g8N81nQg091902@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17985 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17985 Change 17985 by peter@peter_overcee on 2002/09/23 01:01:16 suck in rtld bits Affected files ... .. //depot/projects/hammer/libexec/rtld-elf/x86_64/Makefile.inc#1 branch .. //depot/projects/hammer/libexec/rtld-elf/x86_64/elf_rtld.x#1 branch .. //depot/projects/hammer/libexec/rtld-elf/x86_64/lockdflt.c#1 branch .. //depot/projects/hammer/libexec/rtld-elf/x86_64/reloc.c#1 branch .. //depot/projects/hammer/libexec/rtld-elf/x86_64/rtld_machdep.h#1 branch .. //depot/projects/hammer/libexec/rtld-elf/x86_64/rtld_start.S#1 branch Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 1:10:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB5A637B404; Mon, 23 Sep 2002 01:10:01 -0700 (PDT) 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 84AF037B401 for ; Mon, 23 Sep 2002 01:10:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2CA0243E65 for ; Mon, 23 Sep 2002 01:10:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N8A1Co097575 for ; Mon, 23 Sep 2002 01:10:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N8A0Wi097572 for perforce@freebsd.org; Mon, 23 Sep 2002 01:10:00 -0700 (PDT) Date: Mon, 23 Sep 2002 01:10:00 -0700 (PDT) Message-Id: <200209230810.g8N8A0Wi097572@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17987 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17987 Change 17987 by peter@peter_overcee on 2002/09/23 01:09:14 chop out i386 backwards compatability cruft initial translation of rtld_start.S. Much more to be done, especially considering that the kernel side of the exec interface hasn't been done yet. Affected files ... .. //depot/projects/hammer/libexec/rtld-elf/x86_64/lockdflt.c#2 edit .. //depot/projects/hammer/libexec/rtld-elf/x86_64/rtld_start.S#2 edit Differences ... ==== //depot/projects/hammer/libexec/rtld-elf/x86_64/lockdflt.c#2 (text+ko) ==== @@ -48,7 +48,6 @@ * instruction and catching the SIGILL which results on the 80386. */ -#include #include #include #include @@ -132,36 +131,6 @@ } /* - * Crude exclusive locks for the 80386, which does not support the - * cmpxchg instruction. - */ -static void -lock80386_acquire(void *lock) -{ - Lock *l = (Lock *)lock; - sigset_t tmp_oldsigmask; - - for ( ; ; ) { - sigprocmask(SIG_BLOCK, &fullsigmask, &tmp_oldsigmask); - if (xchgl(1, &l->lock) == 0) - break; - sigprocmask(SIG_SETMASK, &tmp_oldsigmask, NULL); - while (l->lock != 0) - ; /* Spin */ - } - oldsigmask = tmp_oldsigmask; -} - -static void -lock80386_release(void *lock) -{ - Lock *l = (Lock *)lock; - - l->lock = 0; - sigprocmask(SIG_SETMASK, &oldsigmask, NULL); -} - -/* * Better reader/writer locks for the 80486 and later CPUs. */ static void @@ -206,42 +175,6 @@ sigprocmask(SIG_SETMASK, &oldsigmask, NULL); } -/* - * Code to determine at runtime whether the CPU supports the cmpxchg - * instruction. This instruction allows us to use locks that are more - * efficient, but it didn't exist on the 80386. - */ -static jmp_buf sigill_env; - -static void -sigill(int sig) -{ - longjmp(sigill_env, 1); -} - -static int -cpu_supports_cmpxchg(void) -{ - struct sigaction act, oact; - int result; - volatile int lock; - - memset(&act, 0, sizeof act); - act.sa_handler = sigill; - sigemptyset(&act.sa_mask); - act.sa_flags = 0; - - sigaction(SIGILL, &act, &oact); - if (setjmp(sigill_env) == 0) { - lock = 0; - cmpxchgl(0, 1, &lock); - result = 1; - } else - result = 0; - sigaction(SIGILL, &oact, NULL); - return result; -} - void lockdflt_init(LockInfo *li) { @@ -249,17 +182,10 @@ li->context_destroy = NULL; li->lock_create = lock_create; li->lock_destroy = lock_destroy; - if (cpu_supports_cmpxchg()) { - /* Use fast locks that require an 80486 or later. */ - li->rlock_acquire = rlock_acquire; - li->wlock_acquire = wlock_acquire; - li->rlock_release = rlock_release; - li->wlock_release = wlock_release; - } else { - /* It's a cruddy old 80386. */ - li->rlock_acquire = li->wlock_acquire = lock80386_acquire; - li->rlock_release = li->wlock_release = lock80386_release; - } + li->rlock_acquire = rlock_acquire; + li->wlock_acquire = wlock_acquire; + li->rlock_release = rlock_release; + li->wlock_release = wlock_release; /* * Construct a mask to block all signals except traps which might * conceivably be generated within the dynamic linker itself. ==== //depot/projects/hammer/libexec/rtld-elf/x86_64/rtld_start.S#2 (text+ko) ==== @@ -25,32 +25,33 @@ * $FreeBSD: src/libexec/rtld-elf/i386/rtld_start.S,v 1.3 1999/08/28 00:10:15 peter Exp $ */ +.error finish update please. needs to be updated for calling conventions at the very least .text .align 4 .globl .rtld_start .type .rtld_start,@function .rtld_start: - xorl %ebp,%ebp # Clear frame pointer for good form - movl %esp,%eax # Save initial stack pointer - subl $8,%esp # A place to store exit procedure addr - movl %esp,%ebx # save address of exit proc - movl %esp,%ecx # construct address of obj_main - addl $4,%ecx - pushl %ecx # Pass address of obj_main - pushl %ebx # Pass address of exit proc - pushl %eax # Pass initial stack pointer to rtld + xorl %rbp,%rbp # Clear frame pointer for good form + movl %rsp,%rax # Save initial stack pointer + subl $8,%rsp # A place to store exit procedure addr + movl %rsp,%rbx # save address of exit proc + movl %rsp,%rcx # construct address of obj_main + addl $4,%rcx + pushl %rcx # Pass address of obj_main + pushl %rbx # Pass address of exit proc + pushl %rax # Pass initial stack pointer to rtld call _rtld@PLT # Call rtld(sp); returns entry point - addl $12,%esp # Remove arguments from stack - popl %edx # Get exit procedure address - addl $4,%esp # Ignore obj_main + addl $12,%rsp # Remove arguments from stack + popl %rdx # Get exit procedure address + addl $4,%rsp # Ignore obj_main /* - * At this point, %eax contains the entry point of the main program, and - * %edx contains a pointer to a termination function that should be + * At this point, %rax contains the entry point of the main program, and + * %rdx contains a pointer to a termination function that should be * registered with atexit(). (crt1.o registers it.) */ .globl .rtld_goto_main .rtld_goto_main: # This symbol exists just to make debugging easier. - jmp *%eax # Enter main program + jmp *%rax # Enter main program /* @@ -69,20 +70,20 @@ .type _rtld_bind_start,@function _rtld_bind_start: pushf # Save eflags - pushl %eax # Save %eax - pushl %edx # Save %edx - pushl %ecx # Save %ecx - pushl 20(%esp) # Copy reloff argument - pushl 20(%esp) # Copy obj argument + pushl %rax # Save %rax + pushl %rdx # Save %rdx + pushl %rcx # Save %rcx + pushl 20(%rsp) # Copy reloff argument + pushl 20(%rsp) # Copy obj argument call _rtld_bind@PLT # Transfer control to the binder - /* Now %eax contains the entry point of the function being called. */ + /* Now %rax contains the entry point of the function being called. */ - addl $8,%esp # Discard binder arguments - movl %eax,20(%esp) # Store target over obj argument - popl %ecx # Restore %ecx - popl %edx # Restore %edx - popl %eax # Restore %eax + addl $8,%rsp # Discard binder arguments + movl %rax,20(%rsp) # Store target over obj argument + popl %rcx # Restore %rcx + popl %rdx # Restore %rdx + popl %rax # Restore %rax popf # Restore eflags - leal 4(%esp),%esp # Discard reloff, do not change eflags + leal 4(%rsp),%rsp # Discard reloff, do not change eflags ret # "Return" to target address To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 7:30:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4261337B404; Mon, 23 Sep 2002 07:30:11 -0700 (PDT) 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 C3B4F37B401 for ; Mon, 23 Sep 2002 07:30:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2BF043E42 for ; Mon, 23 Sep 2002 07:30:09 -0700 (PDT) (envelope-from julian@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8NEU9Co044992 for ; Mon, 23 Sep 2002 07:30:09 -0700 (PDT) (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8NEU98O044984 for perforce@freebsd.org; Mon, 23 Sep 2002 07:30:09 -0700 (PDT) Date: Mon, 23 Sep 2002 07:30:09 -0700 (PDT) Message-Id: <200209231430.g8NEU98O044984@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer Subject: PERFORCE change 17992 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17992 Change 17992 by julian@julian_jules1 on 2002/09/23 07:29:11 Catch cleanup round Affected files ... .. //depot/projects/kse/include/wchar.h#8 integrate .. //depot/projects/kse/lib/libc/stdio/Makefile.inc#4 integrate .. //depot/projects/kse/lib/libc/stdio/fwscanf.c#1 branch .. //depot/projects/kse/lib/libc/stdio/local.h#5 integrate .. //depot/projects/kse/lib/libc/stdio/scanf.3#2 integrate .. //depot/projects/kse/lib/libc/stdio/swscanf.c#1 branch .. //depot/projects/kse/lib/libc/stdio/vfscanf.c#3 integrate .. //depot/projects/kse/lib/libc/stdio/vfwscanf.c#1 branch .. //depot/projects/kse/lib/libc/stdio/vswscanf.c#1 branch .. //depot/projects/kse/lib/libc/stdio/vwscanf.c#1 branch .. //depot/projects/kse/lib/libc/stdio/wscanf.3#1 branch .. //depot/projects/kse/lib/libc/stdio/wscanf.c#1 branch .. //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#31 integrate .. //depot/projects/kse/sys/dev/ciss/cissio.h#2 integrate .. //depot/projects/kse/sys/dev/sbni/if_sbni.c#5 integrate .. //depot/projects/kse/sys/i386/include/asm.h#4 integrate .. //depot/projects/kse/sys/i386/include/segments.h#5 integrate .. //depot/projects/kse/sys/kern/kern_proc.c#88 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#112 integrate .. //depot/projects/kse/sys/net/iso88025.h#4 integrate .. //depot/projects/kse/sys/netinet/ip_output.c#28 integrate .. //depot/projects/kse/sys/powerpc/include/asm.h#5 integrate .. //depot/projects/kse/sys/sys/cdefs.h#19 integrate .. //depot/projects/kse/sys/sys/proc.h#136 integrate .. //depot/projects/kse/sys/sys/vnode.h#33 integrate Differences ... ==== //depot/projects/kse/include/wchar.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.29 2002/09/22 08:06:45 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.30 2002/09/23 12:40:06 tjr Exp $ */ /*- @@ -112,6 +112,7 @@ int fputws(const wchar_t * __restrict, struct __sFILE * __restrict); int fwide(struct __sFILE *, int); int fwprintf(struct __sFILE * __restrict, const wchar_t * __restrict, ...); +int fwscanf(struct __sFILE * __restrict, const wchar_t * __restrict, ...); wint_t getwc(struct __sFILE *); wint_t getwchar(void); size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict); @@ -124,12 +125,18 @@ wint_t putwchar(wchar_t); int swprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict, ...); +int swscanf(const wchar_t * __restrict, const wchar_t * __restrict, ...); wint_t ungetwc(wint_t, struct __sFILE *); int vfwprintf(struct __sFILE * __restrict, const wchar_t * __restrict, __va_list); +int vfwscanf(struct __sFILE * __restrict, const wchar_t * __restrict, + __va_list); int vswprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict, __va_list); +int vswscanf(const wchar_t * __restrict, const wchar_t * __restrict, + __va_list); int vwprintf(const wchar_t * __restrict, __va_list); +int vwscanf(const wchar_t * __restrict, __va_list); size_t wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); wchar_t *wcscat(wchar_t * __restrict, const wchar_t * __restrict); wchar_t *wcschr(const wchar_t *, wchar_t); @@ -166,6 +173,7 @@ wchar_t *wmemmove(wchar_t *, const wchar_t *, size_t); wchar_t *wmemset(wchar_t *, wchar_t, size_t); int wprintf(const wchar_t * __restrict, ...); +int wscanf(const wchar_t * __restrict, ...); #if __XSI_VISIBLE int wcswidth(const wchar_t *, size_t); ==== //depot/projects/kse/lib/libc/stdio/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 4/17/94 -# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.24 2002/09/21 13:00:30 tjr Exp $ +# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.25 2002/09/23 12:40:06 tjr Exp $ # stdio sources .PATH: ${.CURDIR}/../libc/stdio @@ -8,21 +8,24 @@ fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \ fileno.c findfp.c flags.c fopen.c fprintf.c fpurge.c fputc.c fputs.c \ fputwc.c fputws.c fread.c freopen.c fscanf.c fseek.c fsetpos.c \ - ftell.c funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwrite.c getc.c \ + ftell.c funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwscanf.c \ + fwrite.c getc.c \ getchar.c gets.c getw.c getwc.c getwchar.c makebuf.c mktemp.c \ perror.c printf.c putc.c putchar.c puts.c putw.c putwc.c putwchar.c \ refill.c remove.c rewind.c rget.c scanf.c setbuf.c setbuffer.c \ - setvbuf.c snprintf.c sprintf.c sscanf.c stdio.c swprintf.c tempnam.c \ - tmpfile.c \ + setvbuf.c snprintf.c sprintf.c sscanf.c stdio.c swprintf.c swscanf.c \ + tempnam.c tmpfile.c \ tmpnam.c ungetc.c ungetwc.c vasprintf.c vfprintf.c vfscanf.c \ - vfwprintf.c vprintf.c vscanf.c vsnprintf.c vsprintf.c vsscanf.c \ - vswprintf.c vwprintf.c wbuf.c wprintf.c wsetup.c + vfwprintf.c vfwscanf.c vprintf.c vscanf.c vsnprintf.c vsprintf.c \ + vsscanf.c \ + vswprintf.c vswscanf.c vwprintf.c vwscanf.c wbuf.c wprintf.c wscanf.c \ + wsetup.c .if ${LIB} == "c" MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetws.3 fopen.3 fputs.3 \ fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 getwc.3 mktemp.3 \ printf.3 putc.3 putwc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 \ - ungetc.3 ungetwc.3 wprintf.3 + ungetc.3 ungetwc.3 wprintf.3 wscanf.3 MLINKS+=ferror.3 clearerr.3 ferror.3 feof.3 ferror.3 fileno.3 MLINKS+=fflush.3 fpurge.3 @@ -49,4 +52,6 @@ MLINKS+=tmpnam.3 tempnam.3 tmpnam.3 tmpfile.3 MLINKS+=wprintf.3 fwprintf.3 wprintf.3 swprintf.3 \ wprintf.3 vwprintf.3 wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3 +MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vwscanf.3 \ + wscanf.3 vswscanf.3 wscanf.3 vfwscanf.3 .endif ==== //depot/projects/kse/lib/libc/stdio/local.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)local.h 8.3 (Berkeley) 7/3/94 - * $FreeBSD: src/lib/libc/stdio/local.h,v 1.17 2002/09/22 05:59:00 tjr Exp $ + * $FreeBSD: src/lib/libc/stdio/local.h,v 1.19 2002/09/23 12:40:06 tjr Exp $ */ #include /* for off_t */ @@ -71,9 +71,11 @@ extern int __swsetup(FILE *); extern int __sflags(const char *, int *); extern int __ungetc(int, FILE *); -extern wint_t __ungetwc(wchar_t, FILE *); +extern wint_t __ungetwc(wint_t, FILE *); extern int __vfprintf(FILE *, const char *, __va_list); extern int __vfwprintf(FILE *, const wchar_t *, __va_list); +extern int __vfwscanf(FILE * __restrict, const wchar_t * __restrict, + __va_list); extern int __sdidinit; ==== //depot/projects/kse/lib/libc/stdio/scanf.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)scanf.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/stdio/scanf.3,v 1.17 2002/05/30 09:53:47 ru Exp $ +.\" $FreeBSD: src/lib/libc/stdio/scanf.3,v 1.18 2002/09/23 11:35:50 tjr Exp $ .\" .Dd December 11, 1993 .Dt SCANF 3 @@ -178,9 +178,10 @@ (rather than .Vt float ) , or that the conversion will be one of -.Cm c +.Cm c , +.Cm s or -.Cm s +.Cm \&[ and the next pointer is a pointer to an array of .Vt wchar_t (rather than @@ -254,8 +255,15 @@ a default of .Dq infinity is used (with one exception, below); -otherwise at most this many characters are scanned +otherwise at most this many bytes are scanned in processing the conversion. +In the case of the +.Cm lc , +.Cm ls +and +.Cm l[ +conversions, the field width specifies the maximum number +of multibyte characters that will be scanned. Before conversion begins, most conversions skip white space; this white space is not counted against the field width. @@ -334,6 +342,13 @@ character. The input string stops at white space or at the maximum field width, whichever occurs first. +.Pp +If an +.Cm l +qualifier is present, the next pointer must be a pointer to +.Vt wchar_t , +into which the input will be placed after conversion by +.Xr mbrtowc 3 . .It Cm S The same as .Cm ls . @@ -350,6 +365,13 @@ is added). The usual skip of leading white space is suppressed. To skip white space first, use an explicit space in the format. +.Pp +If an +.Cm l +qualifier is present, the next pointer must be a pointer to +.Vt wchar_t , +into which the input will be placed after conversion by +.Xr mbrtowc 3 . .It Cm C The same as .Cm lc . @@ -395,6 +417,13 @@ The string ends with the appearance of a character not in the (or, with a circumflex, in) set or when the field width runs out. +.Pp +If an +.Cm l +qualifier is present, the next pointer must be a pointer to +.Vt wchar_t , +into which the input will be placed after conversion by +.Xr mbrtowc 3 . .It Cm p Matches a pointer value (as printed by .Ql %p @@ -492,18 +521,6 @@ modifiers for positional arguments are not implemented. .Pp The -.Cm l -modifier for -.Cm %c -and -.Cm %s -(and -.Cm %C -and -.Cm %S ) -to specify wide characters and strings is not implemented. -.Pp -The .Cm \&%a and .Cm \&%A ==== //depot/projects/kse/lib/libc/stdio/vfscanf.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.24 2002/08/13 09:30:41 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.25 2002/09/23 11:35:50 tjr Exp $"); #include "namespace.h" #include @@ -48,6 +48,8 @@ #include #include #include +#include +#include #include "un-namespace.h" #include "collate.h" @@ -136,7 +138,11 @@ int nread; /* number of characters consumed from fp */ int base; /* base argument to conversion function */ char ccltab[256]; /* character class table for %[...] */ - char buf[BUF]; /* buffer for numeric conversions */ + char buf[BUF]; /* buffer for numeric and mb conversions */ + wchar_t *wcp; /* handy wide character pointer */ + wchar_t *wcp0; /* saves original value of wcp */ + mbstate_t mbs; /* multibyte conversion state */ + size_t nconv; /* length of multibyte sequence converted */ /* `basefix' is used to avoid `if' tests in the integer scanner */ static short basefix[17] = @@ -371,6 +377,32 @@ } } nread += sum; + } else if (flags & LONG) { + wcp = va_arg(ap, wchar_t *); + n = 0; + while (width != 0) { + if (n == MB_CUR_MAX) + goto input_failure; + buf[n++] = *fp->_p; + fp->_p++; + fp->_r--; + memset(&mbs, 0, sizeof(mbs)); + nconv = mbrtowc(wcp, buf, n, &mbs); + if (nconv == 0 || nconv == (size_t)-1) + goto input_failure; + if (nconv != (size_t)-2) { + nread += n; + width--; + wcp++; + n = 0; + } + if (fp->_r <= 0 && __srefill(fp)) { + if (n != 0) + goto input_failure; + break; + } + } + nassigned++; } else { size_t r = fread((void *)va_arg(ap, char *), 1, width, fp); @@ -402,6 +434,45 @@ } if (n == 0) goto match_failure; + } else if (flags & LONG) { + wcp = wcp0 = va_arg(ap, wchar_t *); + n = 0; + while (width != 0) { + if (n == MB_CUR_MAX) + goto input_failure; + buf[n++] = *fp->_p; + fp->_p++; + fp->_r--; + memset(&mbs, 0, sizeof(mbs)); + nconv = mbrtowc(wcp, buf, n, &mbs); + if (nconv == 0 || nconv == (size_t)-1) + goto input_failure; + if (nconv != (size_t)-2) { + if (wctob(*wcp) != EOF && + !ccltab[wctob(*wcp)]) { + while (--n > 0) + __ungetc(buf[n], + fp); + break; + } + nread += n; + width--; + wcp++; + n = 0; + } + if (fp->_r <= 0 && __srefill(fp)) { + if (n != 0) + goto input_failure; + break; + } + } + if (n != 0) + goto input_failure; + n = wcp - wcp0; + if (n == 0) + goto match_failure; + *wcp = L'\0'; + nassigned++; } else { p0 = p = va_arg(ap, char *); while (ccltab[*fp->_p]) { @@ -439,6 +510,39 @@ break; } nread += n; + } else if (flags & LONG) { + wcp = va_arg(ap, wchar_t *); + n = 0; + while (!isspace(*fp->_p) && width != 0) { + if (n == MB_CUR_MAX) + goto input_failure; + buf[n++] = *fp->_p; + fp->_p++; + fp->_r--; + memset(&mbs, 0, sizeof(mbs)); + nconv = mbrtowc(wcp, buf, n, &mbs); + if (nconv == 0 || nconv == (size_t)-1) + goto input_failure; + if (nconv != (size_t)-2) { + if (iswspace(*wcp)) { + while (--n > 0) + __ungetc(buf[n], + fp); + break; + } + nread += n; + width--; + wcp++; + n = 0; + } + if (fp->_r <= 0 && __srefill(fp)) { + if (n != 0) + goto input_failure; + break; + } + } + *wcp = L'\0'; + nassigned++; } else { p0 = p = va_arg(ap, char *); while (!isspace(*fp->_p)) { ==== //depot/projects/kse/sys/alpha/alpha/vm_machdep.c#31 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.73 2002/09/17 07:49:40 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.74 2002/09/23 08:04:30 julian Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -269,35 +269,7 @@ td->td_frame = (struct trapframe *)((caddr_t)td->td_pcb) - 1; } -struct md_store { - struct pcb mds_pcb; - struct trapframe mds_frame; -}; - -#if 0 void -cpu_save_upcall(struct thread *td, struct kse *newkse) -{ - - newkse->ke_mdstorage = malloc(sizeof(struct md_store), M_TEMP, - M_WAITOK); - /* Note: use of M_WAITOK means it won't fail. */ - /* set up shortcuts in MI section */ - newkse->ke_pcb = - &(((struct md_store *)(newkse->ke_mdstorage))->mds_pcb); - newkse->ke_frame = - &(((struct md_store *)(newkse->ke_mdstorage))->mds_frame); - - /* Copy the upcall pcb. Kernel mode & fp regs are here. */ - /* XXXKSE this may be un-needed */ - bcopy(td->td_pcb, newkse->ke_pcb, sizeof(struct pcb)); - - /* This copies most of the user mode register values. */ - bcopy(td->td_frame, newkse->ke_frame, sizeof(struct trapframe)); -} -#endif - -void cpu_set_upcall(struct thread *td, void *pcb) { struct pcb *pcb2; @@ -354,54 +326,6 @@ /* XXX */ } -#if 0 -void -cpu_set_args(struct thread *td, struct kse *ke) -{ -/* XXX - suword((void *)(ke->ke_frame->tf_esp + sizeof(void *)), - (int)ke->ke_mailbox); -*/ -} -#endif - -#if 0 -void -cpu_free_kse_mdstorage(struct kse *kse) -{ - - free(kse->ke_mdstorage, M_TEMP); - kse->ke_mdstorage = NULL; - kse->ke_pcb = NULL; - kse->ke_frame = NULL; -} -#endif - -#if 0 -int -cpu_export_context(struct thread *td) -{ - - /* XXXKSE */ - struct trapframe *frame; - struct thread_mailbox *tm; - struct trapframe *uframe; - int error; - - frame = td->td_frame; - tm = td->td_mailbox; - uframe = &tm->ctx.tfrm.tf_tf; - error = copyout(frame, uframe, sizeof(*frame)); - /* - * "What about the fp regs?" I hear you ask.... XXXKSE - * Don't know where gs and "onstack" come from. - * May need to fiddle a few other values too. - */ - return (error); - return (0); -} -#endif - void cpu_wait(p) struct proc *p; ==== //depot/projects/kse/sys/dev/ciss/cissio.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/cissio.h,v 1.1 2001/11/27 23:08:36 msmith Exp $ + * $FreeBSD: src/sys/dev/ciss/cissio.h,v 1.2 2002/09/23 06:35:32 alfred Exp $ */ /* @@ -108,18 +108,18 @@ u_int8_t Dev; u_int8_t Bus:6; u_int8_t Mode:2; - } PeripDev __attribute__ ((__packed__)); + } PeripDev __packed; struct { u_int8_t DevLSB; u_int8_t DevMSB:6; u_int8_t Mode:2; - } LogDev __attribute__ ((__packed__)); + } LogDev __packed; struct { u_int8_t Dev:5; u_int8_t Bus:3; u_int8_t Targ:6; u_int8_t Mode:2; - } LogUnit __attribute__ ((__packed__)); + } LogUnit __packed; } SCSI3Addr_struct; typedef struct { @@ -127,20 +127,20 @@ u_int32_t Bus:6; u_int32_t Mode:2; SCSI3Addr_struct Target[2]; -} PhysDevAddr_struct __attribute__ ((__packed__)); +} PhysDevAddr_struct __packed; typedef struct { u_int32_t VolId:30; u_int32_t Mode:2; u_int8_t reserved[4]; -} LogDevAddr_struct __attribute__ ((__packed__)); +} LogDevAddr_struct __packed; typedef union { u_int8_t LunAddrBytes[8]; SCSI3Addr_struct SCSI3Lun[4]; PhysDevAddr_struct PhysDev; LogDevAddr_struct LogDev; -} LUNAddr_struct __attribute__ ((__packed__)); +} LUNAddr_struct __packed; typedef struct { u_int8_t CDBLen; @@ -148,24 +148,24 @@ u_int8_t Type:3; u_int8_t Attribute:3; u_int8_t Direction:2; - } Type __attribute__ ((__packed__)); + } Type __packed; u_int16_t Timeout; u_int8_t CDB[16]; -} RequestBlock_struct __attribute__ ((__packed__)); +} RequestBlock_struct __packed; typedef union { struct { u_int8_t Reserved[3]; u_int8_t Type; u_int32_t ErrorInfo; - } Common_Info __attribute__ ((__packed__)); + } Common_Info __packed; struct { u_int8_t Reserved[2]; u_int8_t offense_size; u_int8_t offense_num; u_int32_t offense_value; - } Invalid_Cmd __attribute__ ((__packed__)); -} MoreErrInfo_struct __attribute__ ((__packed__)); + } Invalid_Cmd __packed; +} MoreErrInfo_struct __packed; typedef struct { u_int8_t ScsiStatus; @@ -174,7 +174,7 @@ u_int32_t ResidualCnt; MoreErrInfo_struct MoreErrInfo; u_int8_t SenseInfo[SENSEINFOBYTES]; -} ErrorInfo_struct __attribute__ ((__packed__)); +} ErrorInfo_struct __packed; typedef struct { LUNAddr_struct LUN_info; /* 8 */ @@ -182,7 +182,7 @@ ErrorInfo_struct error_info; /* 48 */ u_int16_t buf_size; /* 2 */ u_int8_t *buf; /* 4 */ -} IOCTL_Command_struct __attribute__ ((__packed__)); +} IOCTL_Command_struct __packed; /* * Note that we'd normally pass the struct in directly, but ==== //depot/projects/kse/sys/dev/sbni/if_sbni.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.5 2002/08/05 18:14:16 fjoe Exp $ + * $FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.6 2002/09/23 06:35:33 alfred Exp $ */ /* @@ -1253,7 +1253,7 @@ #endif /* ASM_CRC */ -static u_int32_t crc32tab[] __attribute__ ((aligned(8))) = { +static u_int32_t crc32tab[] __aligned(8) = { 0xD202EF8D, 0xA505DF1B, 0x3C0C8EA1, 0x4B0BBE37, 0xD56F2B94, 0xA2681B02, 0x3B614AB8, 0x4C667A2E, 0xDCD967BF, 0xABDE5729, 0x32D70693, 0x45D03605, ==== //depot/projects/kse/sys/i386/include/asm.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD: src/sys/i386/include/asm.h,v 1.9 2002/09/17 01:48:57 peter Exp $ + * $FreeBSD: src/sys/i386/include/asm.h,v 1.10 2002/09/23 07:27:45 peter Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -53,13 +53,11 @@ popl %ebx #define PIC_PLT(x) x@PLT #define PIC_GOT(x) x@GOT(%ebx) -#define PIC_GOTOFF(x) x@GOTOFF(%ebx) #else #define PIC_PROLOGUE #define PIC_EPILOGUE #define PIC_PLT(x) x #define PIC_GOT(x) x -#define PIC_GOTOFF(x) x #endif /* ==== //depot/projects/kse/sys/i386/include/segments.h#5 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/include/segments.h,v 1.30 2002/09/22 04:45:21 peter Exp $ + * $FreeBSD: src/sys/i386/include/segments.h,v 1.31 2002/09/23 06:50:07 peter Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ @@ -64,8 +64,7 @@ */ struct segment_descriptor { unsigned sd_lolimit:16 ; /* segment extent (lsb) */ - unsigned sd_lobase:24 __attribute__ ((packed)); - /* segment base address (lsb) */ + unsigned sd_lobase:24 __packed; /* segment base address (lsb) */ unsigned sd_type:5 ; /* segment type */ unsigned sd_dpl:2 ; /* segment descriptor priority level */ unsigned sd_p:1 ; /* segment descriptor present */ @@ -176,8 +175,8 @@ * region descriptors, used to load gdt/idt tables before segments yet exist. */ struct region_descriptor { - unsigned rd_limit:16; /* segment extent */ - unsigned rd_base:32 __attribute__ ((packed)); /* base address */ + unsigned rd_limit:16; /* segment extent */ + unsigned rd_base:32 __packed; /* base address */ }; /* ==== //depot/projects/kse/sys/kern/kern_proc.c#88 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_proc.c 8.7 (Berkeley) 2/14/95 - * $FreeBSD: src/sys/kern/kern_proc.c,v 1.150 2002/09/23 06:10:24 julian Exp $ + * $FreeBSD: src/sys/kern/kern_proc.c,v 1.151 2002/09/23 14:01:01 julian Exp $ */ #include "opt_ktrace.h" @@ -371,8 +371,10 @@ bzero(&newke->ke_startzero, RANGEOF(struct kse, ke_startzero, ke_endzero)); mtx_lock_spin(&sched_lock); +#if 0 bcopy(&td->td_kse->ke_startcopy, &newke->ke_startcopy, RANGEOF(struct kse, ke_startcopy, ke_endcopy)); +#endif } else { /* * We are switching to KSEs so just ==== //depot/projects/kse/sys/kern/kern_thread.c#112 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/kern/kern_thread.c,v 1.29 2002/09/23 06:14:30 julian Exp $ + * $FreeBSD: src/sys/kern/kern_thread.c,v 1.30 2002/09/23 14:06:12 julian Exp $ */ #include @@ -700,7 +700,7 @@ * this thead/KSE up to userland. */ CTR3(KTR_PROC, "userret: upcall thread %p (pid %d, %s)", - td, p->p_pid, p->p_comm); + td, td->td_proc->p_pid, td->td_proc->p_comm); /* * Set user context to the UTS. ==== //depot/projects/kse/sys/net/iso88025.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/iso88025.h,v 1.8 2002/05/11 06:27:24 kbyanc Exp $ + * $FreeBSD: src/sys/net/iso88025.h,v 1.9 2002/09/23 06:35:33 alfred Exp $ * * Information gathered from tokenring@freebsd, /sys/net/ethernet.h and * the Mach token ring driver. @@ -95,12 +95,12 @@ u_int8_t iso88025_shost[ISO88025_ADDR_LEN]; /* source address */ u_int16_t rcf; /* route control field */ u_int16_t rd[RIF_MAX_RD]; /* routing designators */ -} __attribute__ ((__packed__)); +} __packed; struct iso88025_rif { u_int16_t rcf; /* route control field */ u_int16_t rd[RIF_MAX_RD]; /* routing designators */ -} __attribute__ ((__packed__)); +} __packed; struct iso88025_sockaddr_data { u_char ether_dhost[ISO88025_ADDR_LEN]; ==== //depot/projects/kse/sys/netinet/ip_output.c#28 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/netinet/ip_output.c,v 1.164 2002/09/17 11:13:04 maxim Exp $ + * $FreeBSD: src/sys/netinet/ip_output.c,v 1.165 2002/09/23 08:56:24 maxim Exp $ */ #define _IP_VHL @@ -141,7 +141,6 @@ int rv; #endif /* PFIL_HOOKS */ - len = 0; args.eh = NULL; args.rule = NULL; args.next_hop = NULL; @@ -199,8 +198,9 @@ } if (opt) { + len = 0; m = ip_insertoptions(m, opt, &len); - if (len >= sizeof(struct ip)) + if (len != 0) hlen = len; } ip = mtod(m, struct ip *); @@ -1136,14 +1136,18 @@ unsigned optlen; optlen = opt->m_len - sizeof(p->ipopt_dst); - if (optlen + (u_short)ip->ip_len > IP_MAXPACKET) + if (optlen + (u_short)ip->ip_len > IP_MAXPACKET) { + *phlen = 0; return (m); /* XXX should fail */ + } if (p->ipopt_dst.s_addr) ip->ip_dst = p->ipopt_dst; if (m->m_flags & M_EXT || m->m_data - optlen < m->m_pktdat) { MGETHDR(n, M_DONTWAIT, MT_HEADER); - if (n == 0) + if (n == 0) { + *phlen = 0; return (m); + } n->m_pkthdr.rcvif = (struct ifnet *)0; #ifdef MAC mac_create_mbuf_from_mbuf(m, n); ==== //depot/projects/kse/sys/powerpc/include/asm.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $NetBSD: asm.h,v 1.6.18.1 2000/07/25 08:37:14 kleink Exp $ - * $FreeBSD: src/sys/powerpc/include/asm.h,v 1.5 2002/09/17 01:48:58 peter Exp $ + * $FreeBSD: src/sys/powerpc/include/asm.h,v 1.6 2002/09/23 07:27:45 peter Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -41,17 +41,14 @@ #define PIC_PLT(x) x@plt #ifdef __STDC__ #define PIC_GOT(x) XXX -#define PIC_GOTOFF(x) XXX #else /* not __STDC__ */ #define PIC_GOT(x) XXX -#define PIC_GOTOFF(x) XXX #endif /* __STDC__ */ #else #define PIC_PROLOGUE #define PIC_EPILOGUE #define PIC_PLT(x) x #define PIC_GOT(x) x -#define PIC_GOTOFF(x) x #endif #define CNAME(csym) csym ==== //depot/projects/kse/sys/sys/cdefs.h#19 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)cdefs.h 8.8 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/cdefs.h,v 1.65 2002/09/23 06:19:31 peter Exp $ + * $FreeBSD: src/sys/sys/cdefs.h,v 1.66 2002/09/23 06:37:48 peter Exp $ */ #ifndef _SYS_CDEFS_H_ @@ -110,23 +110,28 @@ * pure (no side effects) functions, and unused variables. They are * null except for versions of gcc that are known to support the features * properly (old versions of gcc-2 supported the dead and pure features - * in a different (wrong) way). + * in a different (wrong) way). If we do not provide an implementation + * for a given compiler, let the compile fail if it is told to use + * a feature that we cannot live without. */ -#if __GNUC__ < 2 || __GNUC__ == 2 && __GNUC_MINOR__ < 5 +#ifdef lint #define __dead2 #define __pure2 #define __unused #define __packed #define __aligned(x) #define __section(x) +#else +#if __GNUC__ < 2 || __GNUC__ == 2 && __GNUC_MINOR__ < 5 +#define __dead2 +#define __pure2 +#define __unused #endif #if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7 #define __dead2 __attribute__((__noreturn__)) #define __pure2 __attribute__((__const__)) #define __unused -#define __packed /* XXX find this out, if we care */ -#define __aligned(x) /* XXX find this out, if we care */ -#define __section(x) /* XXX find this out, if we care */ +/* XXX Find out what to do for __packed, __aligned and __section */ #endif #if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ == 3 #define __dead2 __attribute__((__noreturn__)) @@ -136,6 +141,7 @@ #define __aligned(x) __attribute__((__aligned__(x))) #define __section(x) __attribute__((__section__(x))) #endif +#endif /* XXX: should use `#if __STDC_VERSION__ < 199901'. */ #if !(__GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3) @@ -226,7 +232,7 @@ * Embed the rcs id of a source file in the resulting library. Note that in * more recent ELF binutils, we use .ident allowing the ID to be stripped. * Usage: - * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.65 2002/09/23 06:19:31 peter Exp $"); + * __FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.66 2002/09/23 06:37:48 peter Exp $"); */ #ifndef __FBSDID #if !defined(lint) && !defined(STRIP_FBSDID) ==== //depot/projects/kse/sys/sys/proc.h#136 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.252 2002/09/23 06:14:29 julian Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.254 2002/09/23 08:04:30 julian Exp $ */ #ifndef _SYS_PROC_H_ @@ -316,63 +316,63 @@ vm_offset_t td_kstack; /* Kernel VA of kstack. */ }; /* flags kept in td_flags */ -#define TDF_UNBOUND 0x000001 /* May give away the kse, uses the kg runq. */ -#define TDF_INPANIC 0x000002 /* Caused a panic, let it drive crashdump. */ -#define TDF_SINTR 0x000008 /* Sleep is interruptible. */ -#define TDF_TIMEOUT 0x000010 /* Timing out during sleep. */ -#define TDF_SELECT 0x000040 /* Selecting; wakeup/waiting danger. */ -#define TDF_CVWAITQ 0x000080 /* Thread is on a cv_waitq (not slpq). */ -#define TDF_UPCALLING 0x000100 /* This thread is doing an upcall. */ -#define TDF_ONSLEEPQ 0x000200 /* On the sleep queue. */ -#define TDF_INMSLEEP 0x000400 /* Don't recurse in msleep(). */ -#define TDF_TIMOFAIL 0x001000 /* Timeout from sleep after we were awake. */ -#define TDF_DEADLKTREAT 0x800000 /* Lock aquisition - deadlock treatment. */ +#define TDF_UNBOUND 0x000001 /* May give away the kse, uses the kg runq. */ +#define TDF_INPANIC 0x000002 /* Caused a panic, let it drive crashdump. */ +#define TDF_SINTR 0x000008 /* Sleep is interruptible. */ +#define TDF_TIMEOUT 0x000010 /* Timing out during sleep. */ +#define TDF_SELECT 0x000040 /* Selecting; wakeup/waiting danger. */ +#define TDF_CVWAITQ 0x000080 /* Thread is on a cv_waitq (not slpq). */ +#define TDF_UPCALLING 0x000100 /* This thread is doing an upcall. */ +#define TDF_ONSLEEPQ 0x000200 /* On the sleep queue. */ +#define TDF_INMSLEEP 0x000400 /* Don't recurse in msleep(). */ +#define TDF_TIMOFAIL 0x001000 /* Timeout from sleep after we were awake. */ +#define TDF_DEADLKTREAT 0x800000 /* Lock aquisition - deadlock treatment. */ -#define TDI_SUSPENDED 0x01 /* On suspension queue. */ -#define TDI_SLEEPING 0x02 /* Actually asleep! (tricky). */ -#define TDI_SWAPPED 0x04 /* Stack not in mem.. bad juju if run. */ -#define TDI_MUTEX 0x08 /* Stopped on a mutex. */ -#define TDI_IWAIT 0x10 /* Awaiting interrupt. */ +#define TDI_SUSPENDED 0x01 /* On suspension queue. */ +#define TDI_SLEEPING 0x02 /* Actually asleep! (tricky). */ +#define TDI_SWAPPED 0x04 /* Stack not in mem.. bad juju if run. */ +#define TDI_MUTEX 0x08 /* Stopped on a mutex. */ +#define TDI_IWAIT 0x10 /* Awaiting interrupt. */ -#define TD_IS_SLEEPING(td) ((td)->td_inhibitors & TDI_SLEEPING) -#define TD_ON_SLEEPQ(td) ((td)->td_wchan != NULL) -#define TD_IS_SUSPENDED(td) ((td)->td_inhibitors & TDI_SUSPENDED) -#define TD_IS_SWAPPED(td) ((td)->td_inhibitors & TDI_SWAPPED) -#define TD_ON_MUTEX(td) ((td)->td_inhibitors & TDI_MUTEX) -#define TD_AWAITING_INTR(td) ((td)->td_inhibitors & TDI_IWAIT) -#define TD_IS_RUNNING(td) ((td)->td_state == TDS_RUNNING) -#define TD_ON_RUNQ(td) ((td)->td_state == TDS_RUNQ) -#define TD_CAN_RUN(td) ((td)->td_state == TDS_CAN_RUN) -#define TD_IS_INHIBITED(td) ((td)->td_state == TDS_INHIBITED) +#define TD_IS_SLEEPING(td) ((td)->td_inhibitors & TDI_SLEEPING) +#define TD_ON_SLEEPQ(td) ((td)->td_wchan != NULL) +#define TD_IS_SUSPENDED(td) ((td)->td_inhibitors & TDI_SUSPENDED) +#define TD_IS_SWAPPED(td) ((td)->td_inhibitors & TDI_SWAPPED) +#define TD_ON_MUTEX(td) ((td)->td_inhibitors & TDI_MUTEX) +#define TD_AWAITING_INTR(td) ((td)->td_inhibitors & TDI_IWAIT) +#define TD_IS_RUNNING(td) ((td)->td_state == TDS_RUNNING) +#define TD_ON_RUNQ(td) ((td)->td_state == TDS_RUNQ) +#define TD_CAN_RUN(td) ((td)->td_state == TDS_CAN_RUN) +#define TD_IS_INHIBITED(td) ((td)->td_state == TDS_INHIBITED) -#define TD_SET_INHIB(td, inhib) do { \ +#define TD_SET_INHIB(td, inhib) do { \ (td)->td_state = TDS_INHIBITED; \ (td)->td_inhibitors |= inhib; \ } while (0) -#define TD_CLR_INHIB(td, inhib) do { \ +#define TD_CLR_INHIB(td, inhib) do { \ if (((td)->td_inhibitors & inhib) && \ (((td)->td_inhibitors &= ~inhib) == 0)) \ (td)->td_state = TDS_CAN_RUN; \ } while (0) -#define TD_SET_SLEEPING(td) TD_SET_INHIB((td), TDI_SLEEPING) -#define TD_SET_SWAPPED(td) TD_SET_INHIB((td), TDI_SWAPPED) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 9: 5:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9EE437B790; Mon, 23 Sep 2002 09:05:14 -0700 (PDT) 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 18BB737B627 for ; Mon, 23 Sep 2002 09:05:08 -0700 (PDT) Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95F0943E42 for ; Mon, 23 Sep 2002 09:04:57 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 4093 invoked from network); 23 Sep 2002 16:04:58 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 23 Sep 2002 16:04:58 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g8NG4hBv081741; Mon, 23 Sep 2002 12:04:43 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200209211911.g8LJBR9p040863@freefall.freebsd.org> Date: Mon, 23 Sep 2002 12:04:46 -0400 (EDT) From: John Baldwin To: Peter Wemm Subject: RE: PERFORCE change 17873 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 21-Sep-2002 Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17873 > > Change 17873 by peter@peter_overcee on 2002/09/21 12:10:44 > > chop out more apm goop When you do add ACPI resume support back in at some point, you will likely still need timer_restore(), so I wouldn't axe it just yet. > Affected files ... > > .. //depot/projects/hammer/sys/x86_64/conf/GENERIC.hints#2 edit > .. //depot/projects/hammer/sys/x86_64/include/clock.h#4 edit > .. //depot/projects/hammer/sys/x86_64/isa/clock.c#5 edit > > Differences ... > > ==== //depot/projects/hammer/sys/x86_64/conf/GENERIC.hints#2 (text+ko) ==== > > @@ -31,9 +31,6 @@ > hint.npx.0.at="nexus" > hint.npx.0.port="0x0F0" > hint.npx.0.irq="13" > -hint.apm.0.at="nexus" > -hint.apm.0.disabled="1" > -hint.apm.0.flags="0x20" > hint.pmtimer.0.at="isa" > hint.pcic.0.at="isa" > # hint.pcic.0.irq="10" # Default to polling > > ==== //depot/projects/hammer/sys/x86_64/include/clock.h#4 (text+ko) ==== > > @@ -34,7 +34,6 @@ > int release_timer2(void); > int rtcin(int val); > int sysbeep(int pitch, int period); > -void timer_restore(void); > > #endif /* _KERNEL */ > > > ==== //depot/projects/hammer/sys/x86_64/isa/clock.c#5 (text+ko) ==== > > @@ -656,47 +656,6 @@ > } > > /* > - * i8254_restore is called from apm_default_resume() to reload > - * the countdown register. > - * this should not be necessary but there are broken laptops that > - * do not restore the countdown register on resume. > - * when it happnes, it messes up the hardclock interval and system clock, > - * which leads to the infamous "calcru: negative time" problem. > - */ > -static void > -i8254_restore(void) > -{ > - > - mtx_lock_spin(&clock_lock); > - outb(TIMER_MODE, TIMER_SEL0 | TIMER_RATEGEN | TIMER_16BIT); > - outb(TIMER_CNTR0, timer0_max_count & 0xff); > - outb(TIMER_CNTR0, timer0_max_count >> 8); > - mtx_unlock_spin(&clock_lock); > -} > - > -static void > -rtc_restore(void) > -{ > - > - /* Reenable RTC updates and interrupts. */ > - /* XXX locking is needed for RTC access? */ > - writertc(RTC_STATUSA, rtc_statusa); > - writertc(RTC_STATUSB, RTCSB_HALT | RTCSB_24HR); > - writertc(RTC_STATUSB, rtc_statusb); > -} > - > -/* > - * Restore all the timers atomically. > - */ > -void > -timer_restore(void) > -{ > - > - i8254_restore(); /* restore timer_freq and hz */ > - rtc_restore(); /* reenable RTC interrupts */ > -} > - > -/* > * Initialize 8254 timer 0 early so that it can be used in DELAY(). > * XXX initialization of other timers is unintentionally left blank. > */ -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 9: 5:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5523737B406; Mon, 23 Sep 2002 09:05:46 -0700 (PDT) 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 F0A5A37B401 for ; Mon, 23 Sep 2002 09:05:45 -0700 (PDT) Received: from mail.speakeasy.net (mail17.speakeasy.net [216.254.0.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82EF743E6E for ; Mon, 23 Sep 2002 09:05:45 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 3108 invoked from network); 23 Sep 2002 16:04:56 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail17.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 23 Sep 2002 16:04:56 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.5/8.12.5) with ESMTP id g8NG4fBv081738; Mon, 23 Sep 2002 12:04:41 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200209211027.g8LARV58027571@freefall.freebsd.org> Date: Mon, 23 Sep 2002 12:04:44 -0400 (EDT) From: John Baldwin To: Peter Wemm Subject: RE: PERFORCE change 17851 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 21-Sep-2002 Peter Wemm wrote: > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17851 > > Change 17851 by peter@peter_overcee on 2002/09/21 03:27:15 > > nuke tf_isp, it wasn't worth a lot. Errm, does 'pusha' not push ESP on x86-64? It does on i386, and the trapframe contents are partially determined by that. You can't just remove it from the trapframe unless pusha has changed or you will hose all the other variables in the frame. > Affected files ... > > .. //depot/projects/hammer/sys/x86_64/include/reg.h#2 edit > .. //depot/projects/hammer/sys/x86_64/include/signal.h#3 edit > .. //depot/projects/hammer/sys/x86_64/include/ucontext.h#2 edit > .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#17 edit > > Differences ... > > ==== //depot/projects/hammer/sys/x86_64/include/reg.h#2 (text+ko) ==== > > @@ -88,7 +88,6 @@ > unsigned int r_edi; > unsigned int r_esi; > unsigned int r_ebp; > - unsigned int r_isp; > unsigned int r_ebx; > unsigned int r_edx; > unsigned int r_ecx; > > ==== //depot/projects/hammer/sys/x86_64/include/signal.h#3 (text+ko) ==== > > @@ -77,7 +77,6 @@ > int sc_edi; > int sc_esi; > int sc_ebp; > - int sc_isp; > int sc_ebx; > int sc_edx; > int sc_ecx; > > ==== //depot/projects/hammer/sys/x86_64/include/ucontext.h#2 (text+ko) ==== > > @@ -45,7 +45,6 @@ > int mc_edi; > int mc_esi; > int mc_ebp; > - int mc_isp; > int mc_ebx; > int mc_edx; > int mc_ecx; > > ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#17 (text+ko) ==== > > @@ -1502,7 +1502,6 @@ > mcp->mc_edi = tp->tf_edi; > mcp->mc_esi = tp->tf_esi; > mcp->mc_ebp = tp->tf_ebp; > - mcp->mc_isp = tp->tf_isp; > mcp->mc_ebx = tp->tf_ebx; > mcp->mc_edx = tp->tf_edx; > mcp->mc_ecx = tp->tf_ecx; -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 9:15:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F09FE37B404; Mon, 23 Sep 2002 09:15:28 -0700 (PDT) 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 403B137B401; Mon, 23 Sep 2002 09:15:28 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3DB943E75; Mon, 23 Sep 2002 09:15:27 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id DEF4B2A7D6; Mon, 23 Sep 2002 09:15:22 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 17851 for review In-Reply-To: Date: Mon, 23 Sep 2002 09:15:22 -0700 From: Peter Wemm Message-Id: <20020923161522.DEF4B2A7D6@canning.wemm.org> Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG John Baldwin wrote: > > On 21-Sep-2002 Peter Wemm wrote: > > http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17851 > > > > Change 17851 by peter@peter_overcee on 2002/09/21 03:27:15 > > > > nuke tf_isp, it wasn't worth a lot. > > Errm, does 'pusha' not push ESP on x86-64? It does on i386, > and the trapframe contents are partially determined by > that. You can't just remove it from the trapframe unless > pusha has changed or you will hose all the other variables > in the frame. pushal is only a 32 bit instruction. There is no 64 bit version, so that means we get to define our own frame formats. It may as well be in register number order (which I dont think I have right yet). > > Affected files ... > > > > .. //depot/projects/hammer/sys/x86_64/include/reg.h#2 edit > > .. //depot/projects/hammer/sys/x86_64/include/signal.h#3 edit > > .. //depot/projects/hammer/sys/x86_64/include/ucontext.h#2 edit > > .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#17 edit > > > > Differences ... > > > > ==== //depot/projects/hammer/sys/x86_64/include/reg.h#2 (text+ko) ==== > > > > @@ -88,7 +88,6 @@ > > unsigned int r_edi; > > unsigned int r_esi; > > unsigned int r_ebp; > > - unsigned int r_isp; > > unsigned int r_ebx; > > unsigned int r_edx; > > unsigned int r_ecx; > > > > ==== //depot/projects/hammer/sys/x86_64/include/signal.h#3 (text+ko) ==== > > > > @@ -77,7 +77,6 @@ > > int sc_edi; > > int sc_esi; > > int sc_ebp; > > - int sc_isp; > > int sc_ebx; > > int sc_edx; > > int sc_ecx; > > > > ==== //depot/projects/hammer/sys/x86_64/include/ucontext.h#2 (text+ko) ==== > > > > @@ -45,7 +45,6 @@ > > int mc_edi; > > int mc_esi; > > int mc_ebp; > > - int mc_isp; > > int mc_ebx; > > int mc_edx; > > int mc_ecx; > > > > ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#17 (text+ko) ==== > > > > @@ -1502,7 +1502,6 @@ > > mcp->mc_edi = tp->tf_edi; > > mcp->mc_esi = tp->tf_esi; > > mcp->mc_ebp = tp->tf_ebp; > > - mcp->mc_isp = tp->tf_isp; > > mcp->mc_ebx = tp->tf_ebx; > > mcp->mc_edx = tp->tf_edx; > > mcp->mc_ecx = tp->tf_ecx; > > -- > > John Baldwin <>< http://www.FreeBSD.org/~jhb/ > "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ > Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 10:57:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BFAC37B404; Mon, 23 Sep 2002 10:57:52 -0700 (PDT) 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 E105F37B401 for ; Mon, 23 Sep 2002 10:57:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FFFC43E75 for ; Mon, 23 Sep 2002 10:57:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8NHvpCo061118 for ; Mon, 23 Sep 2002 10:57:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8NHvpMc061115 for perforce@freebsd.org; Mon, 23 Sep 2002 10:57:51 -0700 (PDT) Date: Mon, 23 Sep 2002 10:57:51 -0700 (PDT) Message-Id: <200209231757.g8NHvpMc061115@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 18002 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18002 Change 18002 by peter@peter_overcee on 2002/09/23 10:57:37 some more updates. Rip out the unused evil ISxxx() macros. I think they're unused on i386 as well. union descriptor is gone because the gdt is a mixture of different sized descriptors now(!) instead of an array with a fixed size record. There is some evil overlap protection to trap offsets by having a couple of must-be-zero fields that will expand to SDT_SYSNULL if the second half is accessed as a short descriptor in error. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/segments.h#8 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/segments.h#8 (text+ko) ==== @@ -60,53 +60,58 @@ #define GSEL(s,r) (((s)<<3) | r) /* a global selector */ /* - * Memory segment descriptors (%cs, %ds etc for compatability apps. 32 bit wide) + * User segment descriptors (%cs, %ds etc for compatability apps. 64 bit wide) + * For long-mode apps, %cs only has the conforming bit in sd_type, the sd_dpl, + * sd_p, sd_l and sd_def32 which must be zero). %ds only has sd_p. */ -struct segment_descriptor { - unsigned sd_lolimit:16 ; /* segment extent (lsb) */ - unsigned sd_lobase:24 __packed; /* segment base address (lsb) */ - unsigned sd_type:5 ; /* segment type */ - unsigned sd_dpl:2 ; /* segment descriptor priority level */ - unsigned sd_p:1 ; /* segment descriptor present */ - unsigned sd_hilimit:4 ; /* segment extent (msb) */ - unsigned sd_xx:1 ; /* unused */ - unsigned sd_l:2 ; /* long mode (cs only) */ - unsigned sd_def32:1 ; /* default 32 vs 16 bit size */ - unsigned sd_gran:1 ; /* limit granularity (byte/page units)*/ - unsigned sd_hibase:8 ; /* segment base address (msb) */ +struct user_segment_descriptor { + u_int64_t sd_lolimit:16; /* segment extent (lsb) */ + u_int64_t sd_lobase:24; /* segment base address (lsb) */ + u_int64_t sd_type:5; /* segment type */ + u_int64_t sd_dpl:2; /* segment descriptor priority level */ + u_int64_t sd_p:1; /* segment descriptor present */ + u_int64_t sd_hilimit:4; /* segment extent (msb) */ + u_int64_t sd_xx:1; /* unused */ + u_int64_t sd_l:2; /* long mode (cs only) */ + u_int64_t sd_def32:1; /* default 32 vs 16 bit size */ + u_int64_t sd_gran:1; /* limit granularity (byte/page units)*/ + u_int64_t sd_hibase:8; /* segment base address (msb) */ }; /* - * System segment descriptors (64 bit wide) + * System segment descriptors (128 bit wide) */ -struct segment_descriptor { - unsigned sd_lolimit:16 ; /* segment extent (lsb) */ - unsigned sd_lobase:24 __packed; /* segment base address (lsb) */ - unsigned sd_type:5 ; /* segment type */ - unsigned sd_dpl:2 ; /* segment descriptor priority level */ - unsigned sd_p:1 ; /* segment descriptor present */ - unsigned sd_hilimit:4 ; /* segment extent (msb) */ - unsigned sd_xx:1 ; /* unused */ - unsigned sd_l:2 ; /* long mode (cs only) */ - unsigned sd_def32:1 ; /* default 32 vs 16 bit size */ - unsigned sd_gran:1 ; /* limit granularity (byte/page units)*/ - unsigned sd_hibase:8 ; /* segment base address (msb) */ +struct system_segment_descriptor { + u_int64_t sd_lolimit:16; /* segment extent (lsb) */ + u_int64_t sd_lobase:24; /* segment base address (lsb) */ + u_int64_t sd_type:5; /* segment type */ + u_int64_t sd_dpl:2; /* segment descriptor priority level */ + u_int64_t sd_p:1; /* segment descriptor present */ + u_int64_t sd_hilimit:4; /* segment extent (msb) */ + u_int64_t sd_xx0:3; /* unused */ + u_int64_t sd_gran:1; /* limit granularity (byte/page units)*/ + u_int64_t sd_hibase:40; /* segment base address (msb) */ + u_int64_t sd_xx1:8; + u_int64_t sd_mbz:5; /* MUST be zero */ + u_int64_t sd_xx1:19; }; /* - * Gate descriptors (e.g. indirect descriptors, trap, interrupt etc. 64 bit) + * Gate descriptors (e.g. indirect descriptors, trap, interrupt etc. 128 bit) + * Only interrupt and trap gates have gd_ist. */ -struct gate_descriptor { - unsigned gd_looffset:16 ; /* gate offset (lsb) */ - unsigned gd_selector:16 ; /* gate segment selector */ - unsigned gd_ist:3 ; /* IST table index */ - unsigned gd_xx:5 ; /* unused */ - unsigned gd_type:5 ; /* segment type */ - unsigned gd_dpl:2 ; /* segment descriptor priority level */ - unsigned gd_p:1 ; /* segment descriptor present */ - unsigned gd_hioffset:16 ; /* gate offset (msb) */ - unsigned gd_hihioffset:32 ; /* gate offset (bits 32-63) */ - unsigned gd_rsvd:32 ; /* reserved */ +struct gate_descriptor { + u_int64_t gd_looffset:16; /* gate offset (lsb) */ + u_int64_t gd_selector:16; /* gate segment selector */ + u_int64_t gd_ist:3; /* IST table index */ + u_int64_t gd_xx:5; /* unused */ + u_int64_t gd_type:5; /* segment type */ + u_int64_t gd_dpl:2; /* segment descriptor priority level */ + u_int64_t gd_p:1; /* segment descriptor present */ + u_int64_t gd_hioffset:38; /* gate offset (msb) */ + u_int64_t sd_xx1:8; + u_int64_t sd_mbz:5; /* MUST be zero */ + u_int64_t sd_xx1:19; }; /* system segments and gate types */ @@ -136,42 +141,22 @@ #define SDT_MEMERC 30 /* memory execute read conforming */ #define SDT_MEMERAC 31 /* memory execute read accessed conforming */ -/* is memory segment descriptor pointer ? */ -#define ISMEMSDP(s) ((s->d_type) >= SDT_MEMRO && (s->d_type) <= SDT_MEMERAC) - -/* is 286 gate descriptor pointer ? */ -#define IS286GDP(s) (((s->d_type) >= SDT_SYS286CGT \ - && (s->d_type) < SDT_SYS286TGT)) - -/* is 386 gate descriptor pointer ? */ -#define IS386GDP(s) (((s->d_type) >= SDT_SYS386CGT \ - && (s->d_type) < SDT_SYS386TGT)) - -/* is gate descriptor pointer ? */ -#define ISGDP(s) (IS286GDP(s) || IS386GDP(s)) - -/* is segment descriptor pointer ? */ -#define ISSDP(s) (ISMEMSDP(s) || !ISGDP(s)) - -/* is system segment descriptor pointer ? */ -#define ISSYSSDP(s) (!ISMEMSDP(s) && !ISGDP(s)) - /* * Software definitions are in this convenient format, * which are translated into inconvenient segment descriptors * when needed to be used by the 386 hardware */ -struct soft_segment_descriptor { - unsigned ssd_base ; /* segment base address */ - unsigned ssd_limit ; /* segment extent */ - unsigned ssd_type:5 ; /* segment type */ - unsigned ssd_dpl:2 ; /* segment descriptor priority level */ - unsigned ssd_p:1 ; /* segment descriptor present */ - unsigned ssd_xx:4 ; /* unused */ - unsigned ssd_xx1:2 ; /* unused */ - unsigned ssd_def32:1 ; /* default 32 vs 16 bit size */ - unsigned ssd_gran:1 ; /* limit granularity (byte/page units)*/ +struct soft_segment_descriptor32 { + unsigned ssd_base; /* segment base address */ + unsigned ssd_limit; /* segment extent */ + unsigned ssd_type:5; /* segment type */ + unsigned ssd_dpl:2; /* segment descriptor priority level */ + unsigned ssd_p:1; /* segment descriptor present */ + unsigned ssd_xx:4; /* unused */ + unsigned ssd_xx1:2; /* unused */ + unsigned ssd_def32:1; /* default 32 vs 16 bit size */ + unsigned ssd_gran:1; /* limit granularity (byte/page units)*/ }; /* @@ -183,16 +168,6 @@ }; /* - * Segment Protection Exception code bits - */ - -#define SEGEX_EXT 0x01 /* recursive or externally induced */ -#define SEGEX_IDT 0x02 /* interrupt descriptor table */ -#define SEGEX_TI 0x04 /* local descriptor table */ - /* other bits are affected descriptor index */ -#define SEGEX_IDX(s) (((s)>>3)&0x1fff) - -/* * Size of IDT table */ #define NIDT 129 /* 32 reserved, 16 h/w, 0 s/w, linux's 0x80 */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 11:29:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7735F37B404; Mon, 23 Sep 2002 11:29:11 -0700 (PDT) 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 226A337B401 for ; Mon, 23 Sep 2002 11:29:11 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90A4A43E77 for ; Mon, 23 Sep 2002 11:29:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8NITACo072658 for ; Mon, 23 Sep 2002 11:29:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8NITAgw072655 for perforce@freebsd.org; Mon, 23 Sep 2002 11:29:10 -0700 (PDT) Date: Mon, 23 Sep 2002 11:29:10 -0700 (PDT) Message-Id: <200209231829.g8NITAgw072655@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18008 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18008 Change 18008 by rwatson@rwatson_paprika on 2002/09/23 11:28:42 Sundry files necessary to perform aspects of out MLS-on-demand demonstration. Affected files ... .. //depot/projects/trustedbsd/misc/demo-20020725/cgi/filelist.html#1 add .. //depot/projects/trustedbsd/misc/demo-20020725/cgi/index.cgi#1 add .. //depot/projects/trustedbsd/misc/demo-20020725/httpd.conf#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 11:35:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E08837B404; Mon, 23 Sep 2002 11:35:19 -0700 (PDT) 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 D2BC437B401 for ; Mon, 23 Sep 2002 11:35:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A99C43E3B for ; Mon, 23 Sep 2002 11:35:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8NIZICo074528 for ; Mon, 23 Sep 2002 11:35:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8NIZIwV074525 for perforce@freebsd.org; Mon, 23 Sep 2002 11:35:18 -0700 (PDT) Date: Mon, 23 Sep 2002 11:35:18 -0700 (PDT) Message-Id: <200209231835.g8NIZIwV074525@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18009 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18009 Change 18009 by rwatson@rwatson_paprika on 2002/09/23 11:34:59 Work-around instructions for running XFree86 with MLS. Affected files ... .. //depot/projects/trustedbsd/misc/demo-20020725/x11_with_mls.txt#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 13:58:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C273A37B404; Mon, 23 Sep 2002 13:58:00 -0700 (PDT) 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 72E9137B401 for ; Mon, 23 Sep 2002 13:58:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6412043E3B for ; Mon, 23 Sep 2002 13:57:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8NKvwCo015024 for ; Mon, 23 Sep 2002 13:57:58 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8NKvECs014688 for perforce@freebsd.org; Mon, 23 Sep 2002 13:57:14 -0700 (PDT) Date: Mon, 23 Sep 2002 13:57:14 -0700 (PDT) Message-Id: <200209232057.g8NKvECs014688@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18016 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18016 Change 18016 by rwatson@rwatson_tislabs on 2002/09/23 13:56:34 IFC main tree to TrustedBSD MAC tree. Pick up a lot of stuff, including the actual fixes to gcc we just had patches for before, as well as the v_tag change. Affected files ... .. //depot/projects/trustedbsd/base/Makefile#12 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#23 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.c#9 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#10 integrate .. //depot/projects/trustedbsd/base/bin/ps/extern.h#6 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#8 integrate .. //depot/projects/trustedbsd/base/bin/ps/print.c#8 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/bind/port/freebsd/include/port_after.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/file/FREEBSD-upgrade#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/acorn#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/adventure#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/amigaos#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/animation#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/archive#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/audio#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/cddb#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/commands#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/compress#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/cvs#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/database#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/dolby#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/editors#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/elf#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/gringotts#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/hitachi-sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/human68k#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/images#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/impulse#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/linux#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/lisp#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/mcrypt#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/mlssa#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/nitpicker#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/perl#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/printer#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/pulsar#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/sendmail#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/tex#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/tgif#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Magdir/varied.out#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/vorbis#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Magdir/vxl#1 branch .. //depot/projects/trustedbsd/base/contrib/file/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/Makefile.std#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/README#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/acconfig.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/acinclude.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/aclocal.m4#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/apprentice.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/ascmagic.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/compress.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/config.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/configure.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/file.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/fsmagic.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/is_tar.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.man#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/magic.mime#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/names.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/patchlevel.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/print.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/readelf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/readelf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/file/softmagic.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/ChangeLog#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-common.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-parse.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-tree.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-typeck.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/calls.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/alpha/alpha.md#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/freebsd-spec.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/linux64.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/rs6000.md#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/rs6000/sysv4.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/freebsd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/linux64.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/t-netbsd64#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/configure#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/configure.in#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/ChangeLog#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/cp-lang.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/decl2.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/cp/parse.y#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/dbxout.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/c-tree.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/compat.texi#1 branch .. //depot/projects/trustedbsd/base/contrib/gcc/doc/cppopts.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/extend.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/gcc.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/invoke.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/makefile.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/rtl.texi#5 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/standards.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/tm.texi#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/doc/trouble.texi#2 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/emit-rtl.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/expr.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/ChangeLog#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/com.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/target.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/f/version.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/loop.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/optabs.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/reload.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/sched-deps.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/toplev.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/unroll.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/version.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libF77/Version.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libI77/Version.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libf2c/libU77/Version.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/acinclude.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/aclocal.m4#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/alphaev67-unknown-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/abi/ia64-unknown-linux-gnu/baseline_symbols.txt#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/cpu/sparc/bits/atomicity.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/c++locale_internal.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/c_locale.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/codecvt_members.cc#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/generic/messages_members.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/c++locale_internal.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/c_locale.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/c_locale.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/codecvt_members.cc#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/collate_members.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/ctype_members.cc#3 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/messages_members.cc#3 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/messages_members.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/monetary_members.cc#3 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/numeric_members.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/gnu/time_members.cc#3 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/locale/ieee_1003.1-2001/messages_members.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/gnu-linux/bits/ctype_base.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/config/os/gnu-linux/bits/ctype_noninline.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/configure.target#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/c++config#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/codecvt.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/locale_facets.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/include/bits/locale_facets.tcc#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libmath/Makefile.am#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/libmath/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/Makefile.am#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/bitset.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/codecvt.cc#4 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/concept-inst.cc#2 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/ctype.cc#1 branch .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/locale.cc#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/misc-inst.cc#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/strstream.cc#5 integrate .. //depot/projects/trustedbsd/base/contrib/libstdc++/src/vterminate.cc#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/admin/add.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/admin/ktutil_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/ftp.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/ftp_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/gssapi.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/security.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kf/kf.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kf/kf_locl.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kf/kfd.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/common.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/rsh.1#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/rsh.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/rsh_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/rshd.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/su/su.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/libtelnet/enc_des.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/libtelnet/encrypt.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/auth-modules.m4#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/crypto.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/db.m4#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/roken-frag.m4#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/test-package.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/configure#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/configure.in#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/ack.texi#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/install.texi#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-brezak-win2k-krb-rc4-hmac-01.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-brezak-win2k-krb-rc4-hmac-02.txt#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-brezak-win2k-krb-rc4-hmac-03.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-foo#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-foo.ms#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-foo2#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-foo2.ms#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-foo3#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-foo3.ms#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-hornstein-dhc-kerbauth-02.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-horowitz-key-derivation-01.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-gssv2-08.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-gssv2-cbind-04.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-iakerb-04.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerb-chg-password-02.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerb-des3-hmac-sha1-00.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerb-key-derivation-00.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-err-msg-00.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-extra-tgt-02.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-extra-tgt-03.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-cross-01.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-cross-06.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-init-03.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-init-11.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-init-12.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-pk-tapp-03.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-revisions-00.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-revisions-01.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-revisions-03.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-revisions-04.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-revisions-05.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-revisions-06.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-set-passwd-02.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-kerberos-set-passwd-03.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-krb-dns-locate-00.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-krb-dns-locate-02.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-cat-krb5gss-mech2-03.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-ftpext-mlst-08.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-krb-wg-kerberos-referrals-00.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-ietf-krb-wg-krb-dns-locate-02.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-raeburn-cat-gssapi-krb5-3des-00.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-raeburn-krb-gssapi-krb5-3des-01.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-smedvinsky-dhc-kerbauth-01.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-swift-win2k-krb-referrals-01.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-swift-win2k-krb-user2user-01.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-thomas-snmpv3-kerbusm-00.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-trostle-win2k-cat-kerberos-set-passwd-00.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/draft-tso-telnet-krb5-04.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/rc4-hmac.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/rfc1508.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/rfc1509.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/rfc1510.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/rfc1750.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/rfc1831.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/rfc1964.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/rfc2078.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/rfc2203.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/rfc2228.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/rfc2743.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/standardisation/rfc2744.txt#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/include/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/config.h.in#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/make_crypto.c#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/kadmin_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/load.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/server.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/version4.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/headers.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/hprop.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kaserver.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kerberos5.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kpasswd/kpasswd_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kinit.1#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kinit.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/der_get.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/gen.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/k5.asn1#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/pam/pam.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/init_sec_context.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/unwrap.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/wrap.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/common.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/hdb-ldap.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/hdb_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/Makefile.am#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/auth_context.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/build_ap_req.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/build_auth.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/changepw.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/config_file.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/context.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/crypto.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_cred.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_for_creds.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_in_tkt.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/keytab_keyfile.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5-protos.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_appdefault.3#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_auth_context.3#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_context.3#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_init_context.3#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_locl.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_parse_name.3#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5_unparse_name.3#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/kuserok.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/log.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/mk_error.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/mk_priv.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/mk_rep.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/mk_req_ext.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/mk_safe.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/name-45-test.c#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/prompter_posix.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/rd_cred.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/rd_safe.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/sendauth.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/transited.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/Makefile.am#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/getifaddrs.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/getnameinfo_verified.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/parse_reply-test.c#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/resolve.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/roken-common.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/roken.awk#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/rtbl.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/tools/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/tools/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/tools/krb5-config.in#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/monitor.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/session.c#12 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshlogin.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshlogin.h#4 integrate .. //depot/projects/trustedbsd/base/etc/MAKEDEV#15 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#20 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#8 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#16 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.x11-4.dist#3 integrate .. //depot/projects/trustedbsd/base/etc/newsyslog.conf#6 integrate .. //depot/projects/trustedbsd/base/etc/rc#16 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/amd#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/diskless#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/initdiskless#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ldconfig#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/network1#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/nfsclient#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/sendmail#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/syscons#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.network#14 integrate .. //depot/projects/trustedbsd/base/etc/rc.shutdown#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.subr#6 integrate .. //depot/projects/trustedbsd/base/etc/syslog.conf#5 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes#18 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/fortunes2#11 integrate .. //depot/projects/trustedbsd/base/gnu/lib/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/gauge.c#4 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libgcc/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libstdc++/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/CONTRIBUTORS#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/COPYING#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/Makefile#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/NOTES#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/NOTES.config#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/README#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/README-vms#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/README.coff#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/README.pic#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/README.rich#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/VERSION#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/app.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/as.1#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/as.1aout#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/as.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/as.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/atof-generic.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/bignum-copy.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/bignum.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/bit_fix.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/cond.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config-gas.com#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/Makefile.hp300#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/Makefile.i386#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/Makefile.pc532#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/Makefile.sparc#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/Makefile.vax#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/aout.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/atof-ieee.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/atof-ns32k.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/atof-tahoe.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/atof-vax.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/coff.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/cplus-dem.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-ansi.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-decstation.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-generic.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-hpux.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-i386.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-i386aix.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-rs6000.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-sun3.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-sun386.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-sun4.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-sunos.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-sysv.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-vax.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/ho-vms.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/mh-i386#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/mh-i386aix#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/mh-i386v4#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/mt-ebmon29k#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/mt-h8300#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/mt-h8300hds#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/mt-i386aix#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/mt-mips#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/mt-rs6000#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-aout.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-aout.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-bfd-sunos.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-bfd-sunos.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-bout.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-bout.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-coff.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-coff.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-coffbfd.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-coffbfd.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-generic.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-generic.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-ieee.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-ieee.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-vms.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/obj-vms.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-a29k.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-a29k.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-generic.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-generic.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-h8300.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-h8300.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-i386.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-i386.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-i860.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-i860.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-i960.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-i960.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-m68851.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-m68k.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-m68k.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-m68kmote.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-m88k.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-m88k.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-mips.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-mips.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-ns32k.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-ns32k.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-rs6000.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-rs6000.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-sparc.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-sparc.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-tahoe.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-tahoe.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-vax.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/tc-vax.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/te-dpx2.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/te-generic.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/te-hpux.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/te-i386aix.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/te-ic960.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/te-sco386.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/te-sequent.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/te-sun3.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/te-sysv32.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/config/vax-inst.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/configdos.bat#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/configure.in#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/debug.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/expr.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/expr.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/flo-const.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/flo-copy.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/flonum-mult.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/flonum.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/frags.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/frags.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/gas-format.el#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/hash.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/hash.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/hex-value.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/input-file.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/input-file.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/input-scrub.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/link.cmd#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/listing.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/listing.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/make-gas.com#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/makefile.dos#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/messages.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/obj.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/obstack.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/obstack.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/a29k.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/h8300.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/i386.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/i860.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/i960.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/m68k.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/m88k.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/mips.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/np1.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/ns32k.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/pn.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/pyr.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/sparc.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/tahoe.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/opcode/vax.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/output-file.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/output-file.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/read.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/read.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/struc-symbol.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/subsegs.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/subsegs.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/symbols.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/symbols.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/tc.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/testscripts/doboth#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/testscripts/doobjcmp#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/testscripts/dostriptest#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/testscripts/dotest#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/testscripts/dounsortreloc#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/testscripts/dounsortsymbols#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/version.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/write.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/write.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/xmalloc.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/as/xrealloc.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/Makefile.inc0#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/as/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/fbsd-kgdb.h#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbfd/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/Makefile.tgt#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/c++filt/Makefile#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_int/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/auto-host.h#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/include/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/grep.1#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/grep/grep.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/gzip/match.S#3 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/Makefile#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/PORTING#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/cplus-dem.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/demangle.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/ld.1#3 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/ld.1aout#3 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/ld.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/ld.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/lib.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/rrs.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/sparc/md-static-funcs.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/sparc/md.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/sparc/md.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/sparc/mdprologue.S#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/symbol.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/symseg.h#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/warnings.c#2 delete .. //depot/projects/trustedbsd/base/gnu/usr.bin/ld/xbits.c#2 delete .. //depot/projects/trustedbsd/base/include/Makefile#14 integrate .. //depot/projects/trustedbsd/base/include/dirent.h#4 integrate .. //depot/projects/trustedbsd/base/include/dlfcn.h#5 integrate .. //depot/projects/trustedbsd/base/include/fnmatch.h#3 integrate .. //depot/projects/trustedbsd/base/include/fts.h#3 integrate .. //depot/projects/trustedbsd/base/include/grp.h#7 integrate .. //depot/projects/trustedbsd/base/include/inttypes.h#7 integrate .. //depot/projects/trustedbsd/base/include/iso646.h#2 integrate .. //depot/projects/trustedbsd/base/include/langinfo.h#5 integrate .. //depot/projects/trustedbsd/base/include/limits.h#2 integrate .. //depot/projects/trustedbsd/base/include/link.h#4 integrate .. //depot/projects/trustedbsd/base/include/monetary.h#5 integrate .. //depot/projects/trustedbsd/base/include/nl_types.h#3 integrate .. //depot/projects/trustedbsd/base/include/stdlib.h#12 integrate .. //depot/projects/trustedbsd/base/include/unistd.h#10 integrate .. //depot/projects/trustedbsd/base/include/wchar.h#8 integrate .. //depot/projects/trustedbsd/base/kerberos5/include/config.h#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/include/crypto-headers.h#1 branch .. //depot/projects/trustedbsd/base/kerberos5/include/version.h#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-master/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/ipropd-slave/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/libexec/k5admind/Makefile#4 integrate .. //depot/projects/trustedbsd/base/kerberos5/usr.bin/krb5-config/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/csu/sparc64/crt1.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc/alpha/gen/infinity.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/Makefile.inc#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/_pthread_stubs.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/confstr.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dlfcn.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dlfunc.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dlopen.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fts.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/fts.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getcontext.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/getobjformat.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/makecontext.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gen/swapcontext.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/sysconf.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ucontext.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/gmon/gmon.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/SYS.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/getcontext.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/infinity.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/makecontext.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/signalcontext.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/infinity.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/Makefile.inc#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/frune.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrune.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrune.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/rune.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/wcsftime.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wcsftime.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wcstod.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wcstod.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wcstoimax.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wcstol.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/wcstoll.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wcstoull.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/locale/wcstoumax.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbydns.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getnetbydns.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/hesiod.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/name6.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_mkquery.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_query.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/res_update.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/rpc/rpc_clnt_create.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/Makefile.inc#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/fabs.S#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/fpgetmask.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/fpgetround.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/fpgetsticky.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/fpsetmask.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/fpsetround.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/fpsetsticky.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sparc64/gen/infinity.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/Makefile.inc#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fgetwc.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fgetws.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fputwc.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fputws.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/fwprintf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/fwscanf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/local.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/printf.3#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/scanf.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/stdio.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/swprintf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/swscanf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/ungetwc.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfprintf.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfscanf.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfwprintf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/vfwscanf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/vsnprintf.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/vswprintf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/vswscanf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/vwprintf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/vwscanf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/wprintf.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/wprintf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/wscanf.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdio/wscanf.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/_Exit.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/exit.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/qsort.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/qsort.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/qsort_r.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strfmon.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strfmon.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcscat.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcschr.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcscmp.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcscpy.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcscspn.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcslcat.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcslcpy.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcslen.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcsncat.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcsncmp.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcsncpy.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcspbrk.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcsrchr.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcsspn.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcsstr.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wmemchr.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wmemcmp.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wmemcpy.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wmemmove.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wmemset.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sem.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc/sys/sigaction.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigaltstack.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigreturn.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_kern.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libcam/scsi_cmdparse.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libdevinfo/devinfo.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libdevinfo/devinfo.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libdevinfo/devinfo.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libdevinfo/devinfo_var.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/common.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/ftp.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libkvm/kvm_proc.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libmd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libpam/libpam/Makefile#14 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/alpha/alpha/_atomic_lock.S#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/i386/i386/_atomic_lock.S#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/arch/ia64/ia64/_atomic_lock.S#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_attr.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cancel.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cleanup_pop.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cleanup_push.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cond_broadcast.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cond_destroy.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cond_init.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cond_signal.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cond_timedwait.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_cond_wait.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_condattr.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_create.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_detach.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_equal.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_exit.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_getspecific.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_join.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_key_create.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_key_delete.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_kill.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_mutex_destroy.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_mutex_init.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_mutex_lock.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_mutex_trylock.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_mutex_unlock.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_mutexattr.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_once.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlock_destroy.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlock_init.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlock_rdlock.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlock_unlock.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlock_wrlock.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlockattr_destroy.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlockattr_getpshared.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlockattr_init.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_rwlockattr_setpshared.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_schedparam.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_self.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_setspecific.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_sigmask.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/pthread_testcancel.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/sem_destroy.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/sem_getvalue.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/sem_init.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/sem_open.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/sem_post.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/sem_wait.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/man/sigwait.3#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/sys/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/sys/thr_error.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/Makefile#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/README#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/guard_b.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/guard_b.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/guard_s.pl#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/hello_b.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/hello_d.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/hello_d.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/hello_s.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/join_leak_d.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/join_leak_d.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/mutex_d.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/mutex_d.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/propagate_s.pl#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/sem_d.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/sem_d.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/sigsuspend_d.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/sigsuspend_d.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/sigwait_d.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/sigwait_d.exp#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/test/verify#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_acl_aclcheck_fd.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_aio_suspend.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_destroy.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getdetachstate.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getguardsize.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getinheritsched.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getschedparam.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getschedpolicy.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getscope.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getstackaddr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_getstacksize.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_init.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setcreatesuspend_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setdetachstate.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setguardsize.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setinheritsched.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setschedparam.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setschedpolicy.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setscope.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setstackaddr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_attr_setstacksize.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_autoinit.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cancel.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_clean.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_close.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_condattr_destroy.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_condattr_init.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_creat.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_detach.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_equal.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_exit.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fcntl.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_find_thread.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fork.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_fsync.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_gc.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_getprio.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_getschedparam.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_info.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_init.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_join.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kill.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_main_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mattr_init.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mattr_kind_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_msync.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_multi_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex_prioceiling.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutex_protocol.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_mutexattr_destroy.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_nanosleep.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_once.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_open.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pause.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_poll.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_priority_queue.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_pselect.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_read.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_readv.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_resume_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_rwlock.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_rwlockattr.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_select.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_self.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sem.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_seterrno.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_setprio.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_setschedparam.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigaction.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigmask.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigpending.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigprocmask.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigsuspend.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sigwait.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_single_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sleep.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spec.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_spinlock.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_stack.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_suspend_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_switch_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_system.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_tcdrain.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_vfork.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_wait.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_wait4.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_waitpid.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_write.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_writev.c#1 branch .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_yield.c#1 branch .. //depot/projects/trustedbsd/base/lib/liby/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/math.h#4 integrate .. //depot/projects/trustedbsd/base/libexec/Makefile#4 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-aout/shlib.c#2 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/sparc64/reloc.c#3 integrate .. //depot/projects/trustedbsd/base/release/Makefile#19 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#24 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#39 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/Makefile.inc#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/alpha/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/common/hw.ent#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/common/intro.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/i386/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/i386/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/pc98/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/sparc64/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/relnotes/common/new.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/i386/dokern.sh#9 integrate .. //depot/projects/trustedbsd/base/release/pc98/dokern.sh#1 branch .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/disklabel/disklabel.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/ea.c#1 branch .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsck.h#8 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass1.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/fsdb/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw.8#14 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/ldconfig/ldconfig.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/pathnames.h#2 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/newfs.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/nos-tun/nos-tun.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.c#9 integrate .. //depot/projects/trustedbsd/base/secure/lib/libcrypto/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssl/Makefile#4 integrate .. //depot/projects/trustedbsd/base/share/man/man3/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/man/man3/stdarg.3#2 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ata.4#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/firewire.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/fwohci.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/man4.i386/viapm.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/sbp.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/stf.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man7/stdint.7#4 integrate .. //depot/projects/trustedbsd/base/share/man/man8/yp.8#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_ACCESS.9#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_ACLCHECK.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_ATTRIB.9#8 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_CREATE.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_GETACL.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_GETEXTATTR.9#5 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_LINK.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_LOOKUP.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_READDIR.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_READLINK.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_REMOVE.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_RENAME.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_SETACL.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/VOP_SETEXTATTR.9#4 integrate .. //depot/projects/trustedbsd/base/share/man/man9/getnewvnode.9#2 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mbuf.9#3 integrate .. //depot/projects/trustedbsd/base/share/man/man9/style.9#13 integrate .. //depot/projects/trustedbsd/base/share/misc/pci_vendors#12 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#8 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.dep.mk#8 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.lib.mk#14 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.own.mk#6 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#12 integrate .. //depot/projects/trustedbsd/base/share/mk/sys.mk#5 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 15:28:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD5B237B404; Mon, 23 Sep 2002 15:28:51 -0700 (PDT) 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 7F73337B401 for ; Mon, 23 Sep 2002 15:28:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1CE8F43E77 for ; Mon, 23 Sep 2002 15:28:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8NMSoCo053841 for ; Mon, 23 Sep 2002 15:28:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8NMSoYm053838 for perforce@freebsd.org; Mon, 23 Sep 2002 15:28:50 -0700 (PDT) Date: Mon, 23 Sep 2002 15:28:50 -0700 (PDT) Message-Id: <200209232228.g8NMSoYm053838@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18021 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18021 Change 18021 by rwatson@rwatson_tislabs on 2002/09/23 15:28:05 Further tweaks on instructions and labels to use with XFree86 and MLS. Affected files ... .. //depot/projects/trustedbsd/misc/demo-20020725/x11_with_mls.txt#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/demo-20020725/x11_with_mls.txt#2 (text+ko) ==== @@ -1,12 +1,13 @@ Labeling requirements: -(1) /dev/mem and /dev/kmem must be read-write for the X server. Errors - mmap'ing these devices will be reported as errors mmap'ing /dev/vga, - for reasons unknown to me and possibly known only to the authors - of XFree86. To work around this on a system where the security - issues associated with the work-around are not a problem, use: +(1) /dev/mem, /dev/kmem, /dev/io, /dev/ttyv8, and /dev/sysmouse must be + read-write for the X server. Errors mmap'ing these devices will be + reported as errors mmap'ing /dev/vga, for reasons unknown to me and + possibly known only to the authors of XFree86. To work around this + on a system where the security issues associated with the work-around + are not a problem, use: - setfmac mls/equal /dev/mem /dev/kmem + setfmac mls/equal /dev/mem /dev/kmem /dev/io /dev/ttyv8 /dev/sysmouse Note: this will bypass MLS protection of the devices, and is not a good idea. @@ -22,14 +23,9 @@ Some applications may also require /tmp/.ICE-unix which should be similarly labeled. -(3) XFree86 maintains logfiles in /var/log. Generation of these - logfiles must be pointed at a directory writable by the X - server. At lack of this, /var/log may also be changed to - an MLS bypass label: +(3) XFree86 maintains logfiles in /var/log. Either point X11 at + a per-label/user directory for logging, or disable logging by + creating a symlink from /var/log/XFree86.0.log to /dev/null. + - setfmac mls/equal /var/log - Note that the X server may fail to rotate previous logs because - it attempts to rename these files. A better tactic is to - force the X server to store the logs somewhere else, perhaps - a per-user directory. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 15:55:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BFA637B404; Mon, 23 Sep 2002 15:55:25 -0700 (PDT) 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 ECA1237B401 for ; Mon, 23 Sep 2002 15:55:23 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A745243E75 for ; Mon, 23 Sep 2002 15:55:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8NMtNCo059768 for ; Mon, 23 Sep 2002 15:55:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8NMtNxS059765 for perforce@freebsd.org; Mon, 23 Sep 2002 15:55:23 -0700 (PDT) Date: Mon, 23 Sep 2002 15:55:23 -0700 (PDT) Message-Id: <200209232255.g8NMtNxS059765@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18022 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18022 Change 18022 by rwatson@rwatson_tislabs on 2002/09/23 15:54:35 A few more bits and bobs necessary to get KDE running with MLS. Affected files ... .. //depot/projects/trustedbsd/misc/demo-20020725/x11_with_mls.txt#3 edit Differences ... ==== //depot/projects/trustedbsd/misc/demo-20020725/x11_with_mls.txt#3 (text+ko) ==== @@ -12,13 +12,14 @@ Note: this will bypass MLS protection of the devices, and is not a good idea. -(2) Labeling of /tmp and /tmp/.X11-unix. It is necessary for this - directory to be writable by any user making use of X. As with +(2) Labeling of /tmp, /tmp/.X11-unix, and /tmp/.ICE-unix. It is necessary + for this directory to be writable by any user making use of X. As with (1), the work-around easiest for perform for a demonstration is: - mkdir -p /tmp/.X11-unix - setfmac mls/equal /tmp /tmp/.X11-unix + mkdir -p /tmp/.X11-unix /tmp/.ICE-unix + setfmac mls/equal /tmp /tmp/.X11-unix /tmp/.ICE-unix + chmod a+rwxt /tmp/.X11-unix /tmp/.ICE-unix Some applications may also require /tmp/.ICE-unix which should be similarly labeled. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 16:18:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BFC537B404; Mon, 23 Sep 2002 16:18:53 -0700 (PDT) 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 3AC3337B401 for ; Mon, 23 Sep 2002 16:18:53 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D736D43E77 for ; Mon, 23 Sep 2002 16:18:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8NNIqCo070809 for ; Mon, 23 Sep 2002 16:18:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8NNIqkG070806 for perforce@freebsd.org; Mon, 23 Sep 2002 16:18:52 -0700 (PDT) Date: Mon, 23 Sep 2002 16:18:52 -0700 (PDT) Message-Id: <200209232318.g8NNIqkG070806@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18024 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18024 Change 18024 by rwatson@rwatson_tislabs on 2002/09/23 16:17:59 Instructions for user mounting in an MLS demo. Affected files ... .. //depot/projects/trustedbsd/misc/demo-20020725/mount.txt#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 16:20:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 845AB37B404; Mon, 23 Sep 2002 16:20:56 -0700 (PDT) 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 30FC237B401 for ; Mon, 23 Sep 2002 16:20:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E20F943E6A for ; Mon, 23 Sep 2002 16:20:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8NNKtCo071894 for ; Mon, 23 Sep 2002 16:20:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8NNKttq071884 for perforce@freebsd.org; Mon, 23 Sep 2002 16:20:55 -0700 (PDT) Date: Mon, 23 Sep 2002 16:20:55 -0700 (PDT) Message-Id: <200209232320.g8NNKttq071884@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18025 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18025 Change 18025 by rwatson@rwatson_tislabs on 2002/09/23 16:20:07 Further annotations. Affected files ... .. //depot/projects/trustedbsd/misc/demo-20020725/mount.txt#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/demo-20020725/mount.txt#2 (text+ko) ==== @@ -1,11 +1,26 @@ -As security officer +As security officer: + +Enable user mountpoints: + + sysctl vfs.usermount=1 + +Label the device so that the general has appropriate rights: + + setfmac mls/high /dev/acd0c + chown general /dev/acd0c + +Label the mountpoint so that the general has appropriate rights: + + setfmac mls/high /mnt + chown general /mnt + +As general: + +Mount the device: -sysctl vfs.usermount=1 -setfmac mls/high /dev/acd0c -setfmac mls/high /mnt -chown general /mnt + mount -o rdonly /dev/acd0c /mnt -As general +Unmount the device: -mount -o rdonly /dev/acd0c /mnt + umount /mnt To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 16:22: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D12E37B404; Mon, 23 Sep 2002 16:21:58 -0700 (PDT) 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 F1C9037B401 for ; Mon, 23 Sep 2002 16:21:57 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC10C43E42 for ; Mon, 23 Sep 2002 16:21:57 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8NNLvCo073046 for ; Mon, 23 Sep 2002 16:21:57 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8NNLvdv073041 for perforce@freebsd.org; Mon, 23 Sep 2002 16:21:57 -0700 (PDT) Date: Mon, 23 Sep 2002 16:21:57 -0700 (PDT) Message-Id: <200209232321.g8NNLvdv073041@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18026 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18026 Change 18026 by rwatson@rwatson_tislabs on 2002/09/23 16:21:00 Note on .X11-unix getting deleted at boot. Affected files ... .. //depot/projects/trustedbsd/misc/demo-20020725/x11_with_mls.txt#4 edit Differences ... ==== //depot/projects/trustedbsd/misc/demo-20020725/x11_with_mls.txt#4 (text+ko) ==== @@ -21,8 +21,12 @@ setfmac mls/equal /tmp /tmp/.X11-unix /tmp/.ICE-unix chmod a+rwxt /tmp/.X11-unix /tmp/.ICE-unix - Some applications may also require /tmp/.ICE-unix which should - be similarly labeled. + Some applications may also require /tmp/.ICE-unix which should be + similarly labeled. + + NOTE: Since the boot scripts may reset the contents and protections + on these directories, it may be necessary to insert a new rc.d + script to reset the labels. (3) XFree86 maintains logfiles in /var/log. Either point X11 at a per-label/user directory for logging, or disable logging by To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 16:48:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B97D637B404; Mon, 23 Sep 2002 16:48:32 -0700 (PDT) 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 6417537B401 for ; Mon, 23 Sep 2002 16:48:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0347943E86 for ; Mon, 23 Sep 2002 16:48:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8NNmVCo082677 for ; Mon, 23 Sep 2002 16:48:31 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8NNmVhw082674 for perforce@freebsd.org; Mon, 23 Sep 2002 16:48:31 -0700 (PDT) Date: Mon, 23 Sep 2002 16:48:31 -0700 (PDT) Message-Id: <200209232348.g8NNmVhw082674@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 18028 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18028 Change 18028 by peter@peter_daintree on 2002/09/23 16:47:38 nuke kvtop(), yet another alias for vtophys() Affected files ... .. //depot/projects/hammer/sys/x86_64/include/md_var.h#7 edit .. //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#6 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/md_var.h#7 (text+ko) ==== @@ -72,7 +72,6 @@ void pagezero(void *addr); void init_AMD_Elan_sc520(void); int is_physical_memory(vm_offset_t addr); -u_long kvtop(void *addr); void setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int selec); void swi_vm(void *); int user_dbreg_trap(void); ==== //depot/projects/hammer/sys/x86_64/x86_64/vm_machdep.c#6 (text+ko) ==== @@ -378,20 +378,6 @@ } /* - * Convert kernel VA to physical address - */ -u_long -kvtop(void *addr) -{ - vm_offset_t va; - - va = pmap_kextract((vm_offset_t)addr); - if (va == 0) - panic("kvtop: zero page frame"); - return((int)va); -} - -/* * Map an IO request into kernel virtual address space. * * All requests are (re)mapped into kernel VA space. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 18:39:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57FAE37B404; Mon, 23 Sep 2002 18:39:52 -0700 (PDT) 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 F2DAC37B401 for ; Mon, 23 Sep 2002 18:39:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C84243E4A for ; Mon, 23 Sep 2002 18:39:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8O1dpCo048028 for ; Mon, 23 Sep 2002 18:39:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8O1dp81048025 for perforce@freebsd.org; Mon, 23 Sep 2002 18:39:51 -0700 (PDT) Date: Mon, 23 Sep 2002 18:39:51 -0700 (PDT) Message-Id: <200209240139.g8O1dp81048025@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18032 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18032 Change 18032 by rwatson@rwatson_tislabs on 2002/09/23 18:39:45 Minor hacks to better support ttys until openpty() does things better: add tunable/sysctl twiddles to set the labels on ptys to biba/equal and/or mls/equal when they are instantiated. This is not the right long term solution since it doesn't properly handle pty reuse. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#111 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#93 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#111 (text+ko) ==== @@ -101,6 +101,11 @@ TUNABLE_STR("security.mac.biba.trusted_interfaces", trusted_interfaces, sizeof(trusted_interfaces)); +static int mac_biba_ptys_equal = 0; +SYSCTL_INT(_security_mac_biba, OID_AUTO, ptys_equal, CTLFLAG_RW, + &mac_biba_ptys_equal, 0, "Label pty devices as biba/equal on create"); +TUNABLE_INT("security.mac.biba.ptys_equal", &mac_biba_ptys_equal); + static int mac_biba_revocation_enabled = 0; SYSCTL_INT(_security_mac_biba, OID_AUTO, revocation_enabled, CTLFLAG_RW, &mac_biba_revocation_enabled, 0, "Revoke access to objects on relabel"); @@ -568,6 +573,10 @@ strcmp(dev->si_name, "random") == 0 || strncmp(dev->si_name, "fd/", strlen("fd/")) == 0) biba_type = MAC_BIBA_TYPE_EQUAL; + else if (mac_biba_ptys_equal && + (strncmp(dev->si_name, "ttyp", strlen("ttyp")) == 0 || + strncmp(dev->si_name, "ptyp", strlen("ptyp")) == 0)) + biba_type = MAC_BIBA_TYPE_EQUAL; else biba_type = MAC_BIBA_TYPE_HIGH; mac_biba_set_single(mac_biba, biba_type, 0); ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#93 (text+ko) ==== @@ -90,6 +90,11 @@ SYSCTL_INT(_security_mac_mls, OID_AUTO, destroyed_not_inited, CTLFLAG_RD, &destroyed_not_inited, 0, "Count of labels destroyed but not inited"); +static int mac_mls_ptys_equal = 0; +SYSCTL_INT(_security_mac_mls, OID_AUTO, ptys_equal, CTLFLAG_RW, + &mac_mls_ptys_equal, 0, "Label pty devices as mls/equal on create"); +TUNABLE_INT("security.mac.mls.ptys_equal", &mac_mls_ptys_equal); + static int mac_mls_revocation_enabled = 0; SYSCTL_INT(_security_mac_mls, OID_AUTO, revocation_enabled, CTLFLAG_RW, &mac_mls_revocation_enabled, 0, "Revoke access to objects on relabel"); @@ -559,6 +564,10 @@ else if (strcmp(dev->si_name, "kmem") == 0 || strcmp(dev->si_name, "mem") == 0) mls_type = MAC_MLS_TYPE_HIGH; + else if (mac_mls_ptys_equal && + (strncmp(dev->si_name, "ttyp", strlen("ttyp")) == 0 || + strncmp(dev->si_name, "ptyp", strlen("ptyp")) == 0)) + mls_type = MAC_MLS_TYPE_EQUAL; else mls_type = MAC_MLS_TYPE_LOW; mac_mls_set_single(mac_mls, mls_type, 0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 19:32: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09FB737B404; Mon, 23 Sep 2002 19:32:04 -0700 (PDT) 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 B00F037B401 for ; Mon, 23 Sep 2002 19:32:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AD0E43E6E for ; Mon, 23 Sep 2002 19:32:03 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8O2W3Co071833 for ; Mon, 23 Sep 2002 19:32:03 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8O2W3db071830 for perforce@freebsd.org; Mon, 23 Sep 2002 19:32:03 -0700 (PDT) Date: Mon, 23 Sep 2002 19:32:03 -0700 (PDT) Message-Id: <200209240232.g8O2W3db071830@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 18038 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18038 Change 18038 by peter@peter_daintree on 2002/09/23 19:31:25 grab a copy for tracing locore startup. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/serial.S#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 20: 2: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13D9237B404; Mon, 23 Sep 2002 20:02:02 -0700 (PDT) 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 B144A37B401 for ; Mon, 23 Sep 2002 20:02:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F30B43E86 for ; Mon, 23 Sep 2002 20:02:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8O321Co078929 for ; Mon, 23 Sep 2002 20:02:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8O3206k078910 for perforce@freebsd.org; Mon, 23 Sep 2002 20:02:00 -0700 (PDT) Date: Mon, 23 Sep 2002 20:02:00 -0700 (PDT) Message-Id: <200209240302.g8O3206k078910@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 18044 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18044 Change 18044 by peter@peter_daintree on 2002/09/23 20:01:41 more fragments. prototype gdt stuff. serial trace hooks. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#16 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#16 (text+ko) ==== @@ -82,20 +82,6 @@ .globl kernbase .set kernbase,KERNBASE -/* - * Globals - */ - .bss - ALIGN_DATA /* just to be sure */ - .globl HIDENAME(tmpstk) - .space 0x2000 /* space for tmpstk - temporary stack */ -HIDENAME(tmpstk): - -physfree: .space 4 /* phys addr of next free page */ -KPTphys: .space 4 /* phys addr of kernel page tables */ -p0upa: .space 4 /* phys addr of proc0's UAREA */ -p0kpa: .space 4 /* phys addr of proc0's STACK */ - /********************************************************************** * * Some handy macros @@ -145,12 +131,17 @@ shrl $PAGE_SHIFT, %ebx ; \ fillkpt(R(KPTphys), prot) +#define PING(a) \ + movb $(a),%al; \ + call serial_putc + .text /********************************************************************** * * This is where the bootblocks start us, set the ball rolling... * */ + .code32 NON_GPROF_ENTRY(btext) /* Tell the bios to warmboot next time */ @@ -173,19 +164,28 @@ mov %ax, %fs mov %ax, %gs + call init_serial + + PING('H'); call recover_metadata + PING('i'); call identify_cpu + + PING('T'); call create_pagetables + PING('h'); /* Enable PAE mode (prerequisite for long mode) */ movl %cr4, %eax orl $CR4_PAE, %eax movl %eax, %cr4 + PING('e'); /* Point to the PML4 */ movl R(IdlePTD), %eax movl %eax,%cr3 /* load ptd addr into mmu */ + PING('r'); /* Enable long mode */ movl $MSR_EFER, %ecx rdmsr @@ -196,17 +196,27 @@ * EFER.LMA = 1, CS.L = 0, CS.D = 0, CR0.PE = 1. */ + PING('e'); /* Now enable paging */ movl %cr0,%eax /* get control word */ orl $CR0_PG, %eax /* enable paging */ movl %eax,%cr0 /* and let's page NOW! */ - pushl $begin /* prepare for jump to virtual address */ + +/* + * Now, we're running with paging turned on, but still running with V==P + * in low memory. We are still using the bootblock gdt/idt. Switch to + * a gdt that we control so that we can flip on the 'L' bit in %cs. + */ + PING('0') + pushl $paging /* prepare for jump to virtual address */ ret /* now running relocated at KERNBASE where the system is linked to run */ /* XXX not yet, we have to set the segment 'long' bit first! */ -begin: +paging: + PING('1') + /* set up bootstrap stack */ movl proc0kstack,%eax /* location of in-kernel stack */ /* bootstrap stack end location */ @@ -370,3 +380,53 @@ fillkpt(R(IdlePTD), $PG_RW) ret + +/********************************************************************** +/* + * We need to switch to a new gdt in order to get from compatability + * mode to full 64 bit mode. These are 'long mode descriptors', not + * the old legacy mode descriptors. The contents are mostly ignored, + * except for the key flags fields. + */ + .data + .p2align 4 +gdt: /* offset = 0x0 */ + .word 0x0 /* null descriptor (required) */ + .word 0x0 + .byte 0x0 + .byte 0x0 + .byte 0x0 + .byte 0x0 + +kernelcode: /* offset = 0x8 */ + .word 0xffff /* segment limit 0..15 */ + .word 0x0000 /* segment base 0..15 */ + .byte 0x0 /* segment base 16..23 */ + .byte 0x9f /* flags; Type; P=1,DPL=0,C=1 */ + .byte 0xaf /* flags; Limit; D=0,L=1 */ + .byte 0x0 /* segment base 24..32 */ + +kerneldata: /* offset = 0x10 */ + .word 0xffff /* segment limit 0..15 */ + .word 0x0000 /* segment base 0..15 */ + .byte 0x0 /* segment base 16..23 */ + .byte 0x93 /* flags; Type; P=1 */ + .byte 0xcf /* flags; Limit; */ + .byte 0x0 /* segment base 24..32 */ +gdt_end: + +/* Region descriptor for the gdt above */ +gdt_rd: .word (gdt_end - gdt) + .word R(gdt) + + .bss + ALIGN_DATA /* just to be sure */ + .globl HIDENAME(tmpstk) + .space 0x1000 /* space for tmpstk - temporary stack */ +HIDENAME(tmpstk): + +physfree: .space 4 /* phys addr of next free page */ +KPTphys: .space 4 /* phys addr of kernel page tables */ +p0upa: .space 4 /* phys addr of proc0's UAREA */ +p0kpa: .space 4 /* phys addr of proc0's STACK */ + To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 22:43:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC65C37B404; Mon, 23 Sep 2002 22:43:16 -0700 (PDT) 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 9D62037B401 for ; Mon, 23 Sep 2002 22:43:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FD4643E4A for ; Mon, 23 Sep 2002 22:43:16 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8O5hGCo023818 for ; Mon, 23 Sep 2002 22:43:16 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8O5hFLB023815 for perforce@freebsd.org; Mon, 23 Sep 2002 22:43:15 -0700 (PDT) Date: Mon, 23 Sep 2002 22:43:15 -0700 (PDT) Message-Id: <200209240543.g8O5hFLB023815@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18047 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18047 Change 18047 by amigus@amigus_ganymede on 2002/09/23 22:42:36 Scripts and data for the demo. They work (in a manner of speaking) but are UGLY. They started out as ugly, but as the day progessed they turned into UGLY. If I get time I'll fix 'em up. Since this is a demo I doubt they're ever going to be that great. The plus side is all this stuff has given us some good ideas for how to do userland properly... Affected files ... .. //depot/projects/trustedbsd/misc/scripts/mac_add_so_account.pl#1 add .. //depot/projects/trustedbsd/misc/scripts/mac_boot.pl#1 add .. //depot/projects/trustedbsd/misc/scripts/mac_clear_ea.sh#1 add .. //depot/projects/trustedbsd/misc/scripts/mac_default_label.pl#1 add .. //depot/projects/trustedbsd/misc/scripts/mac_enable_boot.pl#1 add .. //depot/projects/trustedbsd/misc/scripts/mac_install_kernel_module.pl#1 add .. //depot/projects/trustedbsd/misc/scripts/mac_install_user_module.pl#1 add .. //depot/projects/trustedbsd/misc/scripts/mac_undo.sh#1 add .. //depot/projects/trustedbsd/misc/scripts/mac_update_loader_conf.pl#1 add .. //depot/projects/trustedbsd/misc/scripts/mac_update_login_conf.pl#1 add .. //depot/projects/trustedbsd/misc/scripts/mac_update_mac_conf.pl#1 add .. //depot/projects/trustedbsd/misc/scripts/master_script.sh#1 add .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/libmac_mls.a#1 add .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/libmac_mls.so#1 add .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/libmac_mls.so.1#1 add .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/libmac_mls_p.a#1 add .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/mac_boot.conf#1 add .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/mac_default_labels#1 add .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/mac_mls.ko#1 add .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/mac_mls_fix_x#1 add .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/mac_mls_init#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Sep 23 23:54:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4698937B404; Mon, 23 Sep 2002 23:54:50 -0700 (PDT) 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 E6D5837B401 for ; Mon, 23 Sep 2002 23:54:49 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2BEFD43E75 for ; Mon, 23 Sep 2002 23:54:49 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8O6snCo042505 for ; Mon, 23 Sep 2002 23:54:49 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8O6sn0d042501 for perforce@freebsd.org; Mon, 23 Sep 2002 23:54:49 -0700 (PDT) Date: Mon, 23 Sep 2002 23:54:49 -0700 (PDT) Message-Id: <200209240654.g8O6sn0d042501@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18049 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18049 Change 18049 by amigus@amigus_ganymede on 2002/09/23 23:54:05 Forgot to set the login class... Affected files ... .. //depot/projects/trustedbsd/misc/scripts/mac_add_so_account.pl#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/scripts/mac_add_so_account.pl#2 (text+ko) ==== @@ -34,7 +34,8 @@ my $ret; -$ret = system("pw useradd $username -c \"$real_name\" -m -g wheel -s $shell"); +$ret = system( + "pw useradd $username -c \"$real_name\" -m -L so -g wheel -s $shell"); exit ($ret); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 0: 9:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10D8337B404; Tue, 24 Sep 2002 00:09:09 -0700 (PDT) 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 B48EA37B401 for ; Tue, 24 Sep 2002 00:09:08 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5171843E6E for ; Tue, 24 Sep 2002 00:09:08 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8O798Co049133 for ; Tue, 24 Sep 2002 00:09:08 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8O797HQ049130 for perforce@freebsd.org; Tue, 24 Sep 2002 00:09:07 -0700 (PDT) Date: Tue, 24 Sep 2002 00:09:07 -0700 (PDT) Message-Id: <200209240709.g8O797HQ049130@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18051 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18051 Change 18051 by amigus@amigus_ganymede on 2002/09/24 00:08:58 Hook scripts into kde installer. This (again) is quite ugly but (again) it works. The scripts and the "mls_install_files" directory must be in the working directory of kmlsinstaller. Affected files ... .. //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#5 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#5 (text+ko) ==== @@ -47,10 +47,14 @@ #include #include +#include /* for system() */ + #include "kmlsinstaller.moc" KMLSInstaller::KMLSInstaller() : KMainWindow() { + char sysbuf[4096], *p; + int error; exit_ok = true; @@ -194,53 +198,156 @@ progressdialog->setMinimumDuration(0); progressdialog->setLabelText("TrustedBSD MLS Installation\n" - "Searching system"); + "Installing kernel module"); progressdialog->setProgress(0); - sleep(1); + + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "mac_install_kernel_module.pl "); + p = strcat(p, "--module-file mls_install_files/mac_mls.ko "); + p = strcat(p, "--module-directory /boot/kernel"); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); progressdialog->setLabelText("TrustedBSD MLS Installation\n" - "Installing kernel module"); + "Installing user module"); progressdialog->setProgress(1); - sleep(1); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "mac_install_user_module.pl "); + p = strcat(p, "--library-directory /usr/lib "); + p = strcat(p, "mls_install_files/libmac_mls.a "); + p = strcat(p, "mls_install_files/libmac_mls_p.a "); + p = strcat(p, "mls_install_files/libmac_mls.so "); + p = strcat(p, "mls_install_files/libmac_mls.so.1"); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); progressdialog->setLabelText("TrustedBSD MLS Installation\n" - "Installing user module"); + "Updating loader.conf"); progressdialog->setProgress(2); - sleep(1); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "mac_update_loader_conf.pl "); + p = strcat(p, "--loader-config-file /boot/loader.conf "); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); progressdialog->setLabelText("TrustedBSD MLS Installation\n" - "Updating loader.conf"); + "Updating mac.conf"); progressdialog->setProgress(3); - sleep(1); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "mac_update_mac_conf.pl "); + p = strcat(p, "--mac-config-file /etc/mac.conf "); + p = strcat(p, "--label-name mls "); + p = strcat(p, "--module-name mac_mls "); + p = strcat(p, "--module-library libmac_mls.so.1 "); + p = strcat(p, "file ifnet process"); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); progressdialog->setLabelText("TrustedBSD MLS Installation\n" - "Updating mac.conf"); + "Install boot program"); progressdialog->setProgress(4); - sleep(1); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "install -m 555 -o root -g wheel "); + p = strcat(p, "mac_boot.pl /usr/local/sbin"); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "install -m 555 -o root -g wheel "); + p = strcat(p, "mac_default_label.pl /usr/local/sbin"); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "touch /etc/.mac_installed"); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); progressdialog->setLabelText("TrustedBSD MLS Installation\n" - "Enable first-boot labeling event"); + "Enable boot program"); progressdialog->setProgress(5); - sleep(1); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "mac_enable_boot.pl "); + p = strcat(p, "--etc-directory /etc "); + p = strcat(p, "--rc-directory /etc/rc.d "); + p = strcat(p, "etc:mls_install_files/mac_default_labels "); + p = strcat(p, "etc:mls_install_files/mac_boot.conf "); + p = strcat(p, "rc:mls_install_files/mac_mls_init "); + p = strcat(p, "rc:mls_install_files/mac_mls_fix_x"); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); progressdialog->setLabelText("TrustedBSD MLS Installation\n" "Updating login.conf"); progressdialog->setProgress(6); - sleep(1); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "mac_update_login_conf.pl "); + p = strcat(p, "--login-config-file /etc/login.conf "); + p = strcat(p, "--user default "); + p = strcat(p, "--label \"mls/low(low-low)\" "); + p = strcat(p, "--tty-label \"mls/low(low-low)\" "); + p = strcat(p, "--do-backup"); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "mac_update_login_conf.pl "); + p = strcat(p, "--login-config-file /etc/login.conf "); + p = strcat(p, "--user root "); + p = strcat(p, "--label \"mls/low(low-high)\" "); + p = strcat(p, "--tty-label \"mls/low(low-high)\""); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "mac_update_login_conf.pl "); + p = strcat(p, "--login-config-file /etc/login.conf "); + p = strcat(p, "--user so "); + p = strcat(p, "--label \"mls/high(low-high)\" "); + p = strcat(p, "--tty-label \"mls/high(low-high)\""); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "cap_mkdb /etc/login.conf"); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); progressdialog->setLabelText("TrustedBSD MLS Installation\n" "Adding Security Officer account"); progressdialog->setProgress(7); - sleep(1); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "mac_add_so_account.pl "); + p = strcat(p, "--username so "); + p = strcat(p, "--real-name \"Security Officer\" "); + p = strcat(p, "--shell /usr/local/bin/bash"); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); progressdialog->setLabelText("TrustedBSD MLS Installation\n" - "Configuring Apache run-time label"); + "Install complete"); progressdialog->setProgress(8); - sleep(1); - - progressdialog->setLabelText("TrustedBSD MLS Installation\n" - "Install complete"); - progressdialog->setProgress(9); QMessageBox::information(this, "MLS Installation Complete!", "MLS support is now installed; reboot the system to start MLS."); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 0:20:24 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 084BB37B401; Tue, 24 Sep 2002 00:20:23 -0700 (PDT) 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 A403637B401 for ; Tue, 24 Sep 2002 00:20:22 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D07243E3B for ; Tue, 24 Sep 2002 00:20:22 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8O7KMCo051376 for ; Tue, 24 Sep 2002 00:20:22 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8O7KMMb051368 for perforce@freebsd.org; Tue, 24 Sep 2002 00:20:22 -0700 (PDT) Date: Tue, 24 Sep 2002 00:20:22 -0700 (PDT) Message-Id: <200209240720.g8O7KMMb051368@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18052 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18052 Change 18052 by amigus@amigus_ganymede on 2002/09/24 00:19:37 This works a little better. Affected files ... .. //depot/projects/trustedbsd/misc/scripts/mac_add_so_account.pl#3 edit Differences ... ==== //depot/projects/trustedbsd/misc/scripts/mac_add_so_account.pl#3 (text+ko) ==== @@ -35,7 +35,7 @@ my $ret; $ret = system( - "pw useradd $username -c \"$real_name\" -m -L so -g wheel -s $shell"); + "pw useradd $username -c \"$real_name\" -m -L \"so\" -g wheel -s $shell"); exit ($ret); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 7: 8:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AE0637B404; Tue, 24 Sep 2002 07:08:24 -0700 (PDT) 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 40F8F37B401 for ; Tue, 24 Sep 2002 07:08:24 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F353F43E65 for ; Tue, 24 Sep 2002 07:08:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8OE8NCo082550 for ; Tue, 24 Sep 2002 07:08:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8OE8NHA082544 for perforce@freebsd.org; Tue, 24 Sep 2002 07:08:23 -0700 (PDT) Date: Tue, 24 Sep 2002 07:08:23 -0700 (PDT) Message-Id: <200209241408.g8OE8NHA082544@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18057 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18057 Change 18057 by rwatson@rwatson_paprika on 2002/09/24 07:08:03 Cheesy KDE user mount tool. Scans fstab for noauto filesystems, then uses getmntinfo() to figure out if they are mounted. Displays them in a QT listview, and provides "Mount" and "Unmount" buttons. Due to mount(8) not returning useful error codes, the failure modes aren't so pretty, but it works fine otherwise. If run unprivileged, vfs.usermount must be true. Note: don't make this setuid. Affected files ... .. //depot/projects/trustedbsd/misc/kmounter/Makefile#1 add .. //depot/projects/trustedbsd/misc/kmounter/kmounter.cc#1 add .. //depot/projects/trustedbsd/misc/kmounter/kmounter.h#1 add .. //depot/projects/trustedbsd/misc/kmounter/main.cc#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 9: 9:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE8D537B404; Tue, 24 Sep 2002 09:09:54 -0700 (PDT) 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 592F337B401 for ; Tue, 24 Sep 2002 09:09:54 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1238343E86 for ; Tue, 24 Sep 2002 09:09:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8OG9rCo059413 for ; Tue, 24 Sep 2002 09:09:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8OG9rlq059410 for perforce@freebsd.org; Tue, 24 Sep 2002 09:09:53 -0700 (PDT) Date: Tue, 24 Sep 2002 09:09:53 -0700 (PDT) Message-Id: <200209241609.g8OG9rlq059410@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 18059 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18059 Change 18059 by rwatson@rwatson_tislabs on 2002/09/24 09:09:08 Note that some systems require labeling of agpgart to run X11. Remove trailing whitespace. Affected files ... .. //depot/projects/trustedbsd/misc/demo-20020725/x11_with_mls.txt#5 edit Differences ... ==== //depot/projects/trustedbsd/misc/demo-20020725/x11_with_mls.txt#5 (text+ko) ==== @@ -12,6 +12,10 @@ Note: this will bypass MLS protection of the devices, and is not a good idea. + Further note: Some systems will also use /dev/agpgart, which will + also need to be relabeled. When devfs is in use, these labels may + need to be set each boot. + (2) Labeling of /tmp, /tmp/.X11-unix, and /tmp/.ICE-unix. It is necessary for this directory to be writable by any user making use of X. As with (1), the work-around easiest for perform for a demonstration @@ -32,5 +36,3 @@ a per-label/user directory for logging, or disable logging by creating a symlink from /var/log/XFree86.0.log to /dev/null. - - To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 13:23:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCAAB37B404; Tue, 24 Sep 2002 13:23:18 -0700 (PDT) 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 8C8CC37B401 for ; Tue, 24 Sep 2002 13:23:18 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3603043E81 for ; Tue, 24 Sep 2002 13:23:18 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8OKNICo034257 for ; Tue, 24 Sep 2002 13:23:18 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8OKNHtE034254 for perforce@freebsd.org; Tue, 24 Sep 2002 13:23:17 -0700 (PDT) Date: Tue, 24 Sep 2002 13:23:17 -0700 (PDT) Message-Id: <200209242023.g8OKNHtE034254@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18074 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18074 Change 18074 by amigus@amigus_ganymede on 2002/09/24 13:22:41 Required for X11 on the demo machine (which uses AGP). Affected files ... .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/mac_default_labels#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/scripts/mls_install_files/mac_default_labels#2 (text+ko) ==== @@ -4,6 +4,7 @@ /dev/ttyv8 mls/equal /dev/sysmouse mls/equal /dev/psm0 mls/equal +/dev/agpgart mls/equal /tmp mls/equal /tmp/.X11-unix mls/equal /tmp/.ICE-unix mls/equal To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 13:24:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A3AE37B404; Tue, 24 Sep 2002 13:24:20 -0700 (PDT) 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 4BF5437B401 for ; Tue, 24 Sep 2002 13:24:20 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 027B043E4A for ; Tue, 24 Sep 2002 13:24:20 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8OKOJCo034405 for ; Tue, 24 Sep 2002 13:24:19 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8OKOJkC034402 for perforce@freebsd.org; Tue, 24 Sep 2002 13:24:19 -0700 (PDT) Date: Tue, 24 Sep 2002 13:24:19 -0700 (PDT) Message-Id: <200209242024.g8OKOJkC034402@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18075 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18075 Change 18075 by amigus@amigus_ganymede on 2002/09/24 13:23:41 tty's don't have ranges. Affected files ... .. //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#6 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#6 (text+ko) ==== @@ -300,7 +300,7 @@ p = strcat(p, "--login-config-file /etc/login.conf "); p = strcat(p, "--user default "); p = strcat(p, "--label \"mls/low(low-low)\" "); - p = strcat(p, "--tty-label \"mls/low(low-low)\" "); + p = strcat(p, "--tty-label \"mls/low\" "); p = strcat(p, "--do-backup"); error = system(sysbuf); if (error) @@ -311,7 +311,7 @@ p = strcat(p, "--login-config-file /etc/login.conf "); p = strcat(p, "--user root "); p = strcat(p, "--label \"mls/low(low-high)\" "); - p = strcat(p, "--tty-label \"mls/low(low-high)\""); + p = strcat(p, "--tty-label \"mls/low\""); error = system(sysbuf); if (error) fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); @@ -321,7 +321,7 @@ p = strcat(p, "--login-config-file /etc/login.conf "); p = strcat(p, "--user so "); p = strcat(p, "--label \"mls/high(low-high)\" "); - p = strcat(p, "--tty-label \"mls/high(low-high)\""); + p = strcat(p, "--tty-label \"mls/high\""); error = system(sysbuf); if (error) fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 14:35:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BEE237B404; Tue, 24 Sep 2002 14:35:55 -0700 (PDT) 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 F3AA137B401 for ; Tue, 24 Sep 2002 14:35:54 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BC0843EA3 for ; Tue, 24 Sep 2002 14:35:54 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8OLZsCo053451 for ; Tue, 24 Sep 2002 14:35:54 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8OLZsXa053448 for perforce@freebsd.org; Tue, 24 Sep 2002 14:35:54 -0700 (PDT) Date: Tue, 24 Sep 2002 14:35:54 -0700 (PDT) Message-Id: <200209242135.g8OLZsXa053448@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18079 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18079 Change 18079 by amigus@amigus_ganymede on 2002/09/24 14:35:39 It doesn't do that. Affected files ... .. //depot/projects/trustedbsd/misc/scripts/mac_boot.pl#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/scripts/mac_boot.pl#2 (text+ko) ==== @@ -66,10 +66,6 @@ system ("passwd $CF_OPS{'so_username'}") unless (-f $STATE_FILE); -print "Configuring Apache run-time label...\n"; - -# XXX: Add label to apache startup script. - unless (-f $STATE_FILE) { print "Initializing filesystems for MAC/MLS...\n"; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 17:58:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EFC137B404; Tue, 24 Sep 2002 17:58:32 -0700 (PDT) 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 1A90337B401 for ; Tue, 24 Sep 2002 17:58:32 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CCA9F43E6E for ; Tue, 24 Sep 2002 17:58:31 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8P0wVCo006489 for ; Tue, 24 Sep 2002 17:58:31 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8P0wV3R006486 for perforce@freebsd.org; Tue, 24 Sep 2002 17:58:31 -0700 (PDT) Date: Tue, 24 Sep 2002 17:58:31 -0700 (PDT) Message-Id: <200209250058.g8P0wV3R006486@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18095 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18095 Change 18095 by amigus@amigus_ganymede on 2002/09/24 17:58:14 Fixes, changes and new script for demo. Affected files ... .. //depot/projects/trustedbsd/misc/scripts/mac_undo.sh#2 edit .. //depot/projects/trustedbsd/misc/scripts/mac_user_label.pl#1 add .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/mac_default_labels#3 edit Differences ... ==== //depot/projects/trustedbsd/misc/scripts/mac_undo.sh#2 (text+ko) ==== @@ -11,5 +11,6 @@ mv /etc/login.conf.bak /etc/login.conf cap_mkdb /etc/login.conf pw userdel so +rm -rf /home/so rm /etc/.mac_configured rm /etc/.mac_installed ==== //depot/projects/trustedbsd/misc/scripts/mls_install_files/mac_default_labels#3 (text+ko) ==== @@ -5,6 +5,7 @@ /dev/sysmouse mls/equal /dev/psm0 mls/equal /dev/agpgart mls/equal +/dev/acd0 mls/equal /tmp mls/equal /tmp/.X11-unix mls/equal /tmp/.ICE-unix mls/equal To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 18: 1:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F8ED37B404; Tue, 24 Sep 2002 18:01:37 -0700 (PDT) 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 C0E0D37B401 for ; Tue, 24 Sep 2002 18:01:36 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F13543E81 for ; Tue, 24 Sep 2002 18:01:36 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8P11ZCo006951 for ; Tue, 24 Sep 2002 18:01:35 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8P11ZN1006941 for perforce@freebsd.org; Tue, 24 Sep 2002 18:01:35 -0700 (PDT) Date: Tue, 24 Sep 2002 18:01:35 -0700 (PDT) Message-Id: <200209250101.g8P11ZN1006941@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18096 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18096 Change 18096 by amigus@amigus_ganymede on 2002/09/24 18:01:04 install new script. Affected files ... .. //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#7 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#7 (text+ko) ==== @@ -270,6 +270,13 @@ fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); memset(sysbuf, NULL, sizeof (sysbuf)); p = sysbuf; + p = strcat(p, "install -m 555 -o root -g wheel "); + p = strcat(p, "mac_user_label.pl /usr/local/sbin"); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; p = strcat(p, "touch /etc/.mac_installed"); error = system(sysbuf); if (error) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 18: 2:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BAC937B404; Tue, 24 Sep 2002 18:02:38 -0700 (PDT) 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 2C18A37B401 for ; Tue, 24 Sep 2002 18:02:38 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6B3E43E3B for ; Tue, 24 Sep 2002 18:02:37 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8P12bCo008318 for ; Tue, 24 Sep 2002 18:02:37 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8P12bnV008315 for perforce@freebsd.org; Tue, 24 Sep 2002 18:02:37 -0700 (PDT) Date: Tue, 24 Sep 2002 18:02:37 -0700 (PDT) Message-Id: <200209250102.g8P12bnV008315@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18097 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18097 Change 18097 by amigus@amigus_ganymede on 2002/09/24 18:01:38 These ended up here by accident. Affected files ... .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/libmac_mls.a#2 delete .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/libmac_mls.so#2 delete .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/libmac_mls.so.1#2 delete .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/libmac_mls_p.a#2 delete .. //depot/projects/trustedbsd/misc/scripts/mls_install_files/mac_mls.ko#2 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 18:28:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E66EA37B404; Tue, 24 Sep 2002 18:28:10 -0700 (PDT) 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 959ED37B401 for ; Tue, 24 Sep 2002 18:28:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5696343E65 for ; Tue, 24 Sep 2002 18:28:10 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8P1SACo017114 for ; Tue, 24 Sep 2002 18:28:10 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8P1SAAf017111 for perforce@freebsd.org; Tue, 24 Sep 2002 18:28:10 -0700 (PDT) Date: Tue, 24 Sep 2002 18:28:10 -0700 (PDT) Message-Id: <200209250128.g8P1SAAf017111@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18101 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18101 Change 18101 by amigus@amigus_ganymede on 2002/09/24 18:27:26 Need to label so's files on boot. Affected files ... .. //depot/projects/trustedbsd/misc/scripts/mac_boot.pl#3 edit Differences ... ==== //depot/projects/trustedbsd/misc/scripts/mac_boot.pl#3 (text+ko) ==== @@ -66,6 +66,11 @@ system ("passwd $CF_OPS{'so_username'}") unless (-f $STATE_FILE); +print "Labeling Security Officers files...\n" and +system ("/usr/local/sbin/mac_user_label.pl --directory /home/so". + "--file-label mls/high --run-label mls/equal") +unless (-f $STATE_FILE); + unless (-f $STATE_FILE) { print "Initializing filesystems for MAC/MLS...\n"; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 20:24:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19D4F37B404; Tue, 24 Sep 2002 20:24:38 -0700 (PDT) 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 BB2E837B401 for ; Tue, 24 Sep 2002 20:24:37 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C1D943E77 for ; Tue, 24 Sep 2002 20:24:37 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8P3ObCo050399 for ; Tue, 24 Sep 2002 20:24:37 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8P3Obda050396 for perforce@freebsd.org; Tue, 24 Sep 2002 20:24:37 -0700 (PDT) Date: Tue, 24 Sep 2002 20:24:37 -0700 (PDT) Message-Id: <200209250324.g8P3Obda050396@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18110 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18110 Change 18110 by amigus@amigus_ganymede on 2002/09/24 20:23:35 Tweaking. Affected files ... .. //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#8 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#8 (text+ko) ==== @@ -275,12 +275,6 @@ error = system(sysbuf); if (error) fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); - memset(sysbuf, NULL, sizeof (sysbuf)); - p = sysbuf; - p = strcat(p, "touch /etc/.mac_installed"); - error = system(sysbuf); - if (error) - fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); progressdialog->setLabelText("TrustedBSD MLS Installation\n" "Enable boot program"); @@ -316,28 +310,12 @@ p = sysbuf; p = strcat(p, "mac_update_login_conf.pl "); p = strcat(p, "--login-config-file /etc/login.conf "); - p = strcat(p, "--user root "); + p = strcat(p, "--user so "); p = strcat(p, "--label \"mls/low(low-high)\" "); p = strcat(p, "--tty-label \"mls/low\""); error = system(sysbuf); if (error) fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); - memset(sysbuf, NULL, sizeof (sysbuf)); - p = sysbuf; - p = strcat(p, "mac_update_login_conf.pl "); - p = strcat(p, "--login-config-file /etc/login.conf "); - p = strcat(p, "--user so "); - p = strcat(p, "--label \"mls/high(low-high)\" "); - p = strcat(p, "--tty-label \"mls/high\""); - error = system(sysbuf); - if (error) - fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); - memset(sysbuf, NULL, sizeof (sysbuf)); - p = sysbuf; - p = strcat(p, "cap_mkdb /etc/login.conf"); - error = system(sysbuf); - if (error) - fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); progressdialog->setLabelText("TrustedBSD MLS Installation\n" "Adding Security Officer account"); @@ -352,6 +330,13 @@ if (error) fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "touch /etc/.mac_installed"); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); + progressdialog->setLabelText("TrustedBSD MLS Installation\n" "Install complete"); progressdialog->setProgress(8); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 20:25:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E036137B404; Tue, 24 Sep 2002 20:25:39 -0700 (PDT) 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 9108337B401 for ; Tue, 24 Sep 2002 20:25:39 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3021F43E6E for ; Tue, 24 Sep 2002 20:25:39 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8P3PdCo050483 for ; Tue, 24 Sep 2002 20:25:39 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8P3PcYt050480 for perforce@freebsd.org; Tue, 24 Sep 2002 20:25:38 -0700 (PDT) Date: Tue, 24 Sep 2002 20:25:38 -0700 (PDT) Message-Id: <200209250325.g8P3PcYt050480@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18111 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18111 Change 18111 by amigus@amigus_ganymede on 2002/09/24 20:25:33 Tweak. Affected files ... .. //depot/projects/trustedbsd/misc/scripts/mac_boot.pl#4 edit .. //depot/projects/trustedbsd/misc/scripts/master_script.sh#2 edit .. //depot/projects/trustedbsd/misc/scripts/relabeluser#1 add .. //depot/projects/trustedbsd/misc/scripts/setup#1 add Differences ... ==== //depot/projects/trustedbsd/misc/scripts/mac_boot.pl#4 (text+ko) ==== @@ -63,14 +63,6 @@ print "Entering MAC/MLS boot script.\n"; -system ("passwd $CF_OPS{'so_username'}") -unless (-f $STATE_FILE); - -print "Labeling Security Officers files...\n" and -system ("/usr/local/sbin/mac_user_label.pl --directory /home/so". - "--file-label mls/high --run-label mls/equal") -unless (-f $STATE_FILE); - unless (-f $STATE_FILE) { print "Initializing filesystems for MAC/MLS...\n"; @@ -141,6 +133,14 @@ rename("/etc/fstab.update", "/etc/fstab"); } +system ("passwd $CF_OPS{'so_username'}") +unless (-f $STATE_FILE); + +print "Labeling Security Officers files...\n" and +system ("/usr/local/sbin/mac_user_label.pl --directory /home/so ". + "--file-label mls/high --run-label mls/equal") +unless (-f $STATE_FILE); + open(FH,">$STATE_FILE") || die "$program: cannot create $STATE_FILE: $!"; close (FH); ==== //depot/projects/trustedbsd/misc/scripts/master_script.sh#2 (text+ko) ==== @@ -31,7 +31,11 @@ install -m 555 -o root -g wheel mac_boot.pl /usr/local/sbin [ $? -ne 0 ] && echo "Error!" && exit 1 install -m 555 -o root -g wheel mac_default_label.pl /usr/local/sbin -touch /etc/.mac_installed +[ $? -ne 0 ] && echo "Error!" && exit 1 +install -m 555 -o root -g wheel mac_user_label.pl /usr/local/sbin +[ $? -ne 0 ] && echo "Error!" && exit 1 +install -m 555 -o root -g wheel relabeluser /usr/local/sbin +[ $? -ne 0 ] && echo "Error!" && exit 1 echo "Enabling boot program." mac_enable_boot.pl --etc-directory /etc \ @@ -49,17 +53,11 @@ [ $? -ne 0 ] && echo "Error!" && exit 1 mac_update_login_conf.pl --login-config-file /etc/login.conf \ - --user root \ + --user so \ --label "mls/low(low-high)" \ --tty-label "mls/low(low-high)" [ $? -ne 0 ] && echo "Error!" && exit 1 -mac_update_login_conf.pl --login-config-file /etc/login.conf \ - --user so \ - --label "mls/high(low-high)" \ - --tty-label "mls/high(low-high)" -[ $? -ne 0 ] && echo "Error!" && exit 1 - cap_mkdb /etc/login.conf [ $? -ne 0 ] && echo "Error!" && exit 1 @@ -67,3 +65,5 @@ mac_add_so_account.pl --username so --real-name "Security Officer" \ --shell /usr/local/bin/bash [ $? -ne 0 ] && echo "Error!" && exit 1 + +touch /etc/.mac_installed To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 20:28:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CC3437B404; Tue, 24 Sep 2002 20:28:44 -0700 (PDT) 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 AE4A937B401 for ; Tue, 24 Sep 2002 20:28:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7032043E6E for ; Tue, 24 Sep 2002 20:28:43 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8P3ShCo050649 for ; Tue, 24 Sep 2002 20:28:43 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8P3ShxX050646 for perforce@freebsd.org; Tue, 24 Sep 2002 20:28:43 -0700 (PDT) Date: Tue, 24 Sep 2002 20:28:43 -0700 (PDT) Message-Id: <200209250328.g8P3ShxX050646@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18112 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18112 Change 18112 by amigus@amigus_ganymede on 2002/09/24 20:28:39 Oops. Tweak. Affected files ... .. //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#9 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#9 (text+ko) ==== @@ -275,6 +275,13 @@ error = system(sysbuf); if (error) fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); + memset(sysbuf, NULL, sizeof (sysbuf)); + p = sysbuf; + p = strcat(p, "install -m 555 -o root -g wheel "); + p = strcat(p, "relabeluser /usr/local/sbin"); + error = system(sysbuf); + if (error) + fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); progressdialog->setLabelText("TrustedBSD MLS Installation\n" "Enable boot program"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Sep 24 20:53:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 481AC37B404; Tue, 24 Sep 2002 20:53:14 -0700 (PDT) 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 ECEE737B401 for ; Tue, 24 Sep 2002 20:53:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD55943E6E for ; Tue, 24 Sep 2002 20:53:13 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8P3rDCo056181 for ; Tue, 24 Sep 2002 20:53:13 -0700 (PDT) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8P3rD3F056178 for perforce@freebsd.org; Tue, 24 Sep 2002 20:53:13 -0700 (PDT) Date: Tue, 24 Sep 2002 20:53:13 -0700 (PDT) Message-Id: <200209250353.g8P3rD3F056178@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 18114 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18114 Change 18114 by amigus@amigus_ganymede on 2002/09/24 20:52:43 Tweak. Affected files ... .. //depot/projects/trustedbsd/misc/scripts/relabeluser#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/scripts/relabeluser#2 (text+ko) ==== @@ -7,20 +7,27 @@ print "usage: $program USER - Name des zur Zeit angemeldeten Benutzers. + Name des angemeldeten Benutzers. @@ -1244,7 +1247,7 @@ gesetzt ist, weil die Shell $TERM expandiert und das Ergebnis an echo gibt. - Shells behandeln viele Spezialzeichen, sogenannte + Shells behandeln viele Spezialzeichen, so genannte Metazeichen, als besondere Darstellungen für Daten. Das allgemeinste ist das Zeichen *, das eine beliebige Anzahl Zeichen in einem Dateinamen repräsentiert. @@ -1255,7 +1258,7 @@ Dateinamen die mit * übereinstimmen, an echo weitergibt. - Um zu verhindern, daß die Shell diese Sonderzeichen + Um zu verhindern, dass die Shell diese Sonderzeichen interpretiert, kann man sie schützen, indem man ihnen einen Backslash (\) voranstellt. echo $TERM gibt aus, auf was auch immer Ihr Terminal @@ -1275,7 +1278,7 @@ Sie können auch chsh mit der Option aufrufen, dann wird Ihre Shell gesetzt, - ohne dasß Sie in einen Editor gelangen. Um Ihre Shell + ohne dass Sie in einen Editor gelangen. Um Ihre Shell zum Beispiel auf die bash zu ändern, geben Sie das folgende Kommando ein: @@ -1287,7 +1290,7 @@ Die von Ihnen gewünschte Shell - muß in /etc/shells + muss in /etc/shells aufgeführt sein. Haben Sie eine Shell aus der Ports Sammlung installiert, sollte das schon automatisch erledigt werden. Installierten @@ -1377,7 +1380,7 @@ Gerätenamen, die Sie wahrscheinlich in den Bootmeldungen sehen werden, sind zum Beispiel acd0, das erste - IDE CDROM oder kbd0, die Tastatur. + IDE CD-ROM oder kbd0, die Tastatur. Auf die meisten Geräte wird unter Unix über spezielle Gerätedateien im /dev Verzeichnis @@ -1422,6 +1425,209 @@ + + Virtuelle Konsolen und Terminals + Virtuelle Konsole + Terminal + + Sie können FreeBSD mit einem Terminal benutzen, der nur Text + darstellen kann. Wenn Sie FreeBSD auf diese Weise benutzen, stehen + Ihnen alle Möglichkeiten eines &unix; Betriebssystems zur + Verfügung. Dieser Abschnitt beschreibt was Terminals und + Konsolen sind und wie sie unter FreeBSD eingesetzt werden. + + + Die Konsole + Konsole + + Wenn Ihr FreeBSD System ohne eine graphische + Benutzeroberfläche startet, wird am Ende des Systemstarts, + nachdem die Startskripten gelaufen sind, ein Anmeldeprompt + ausgegeben. Die letzten Startmeldungen sollten ähnlich wie + die Folgenden aussehen: + + Additional ABI support:. +Local package initialization:. +Additional TCP options:. + +Fri Sep 20 13:01:06 EEST 2002 + +FreeBSD/i386 (pc3.example.org) (ttyv0) + +login: + + Beachten Sie die letzten beiden Zeilen der Ausgabe, die + vorletzte lautet: + + FreeBSD/i386 (pc3.example.org) (ttyv0) + + Diese Zeile enthält einige Informationen über das + gerade gestartete System. Die Ausgabe stammt von der + FreeBSD-Konsole einer Maschine mit einem Intel oder + Intel-kompatiblen Prozessor der x86-Architektur + Genau das ist mit i386 gemeint. Auch + wenn Ihr System keine Intel 386 CPU besitzt, wird + i386 ausgegeben. Es wird immer die + Architektur und nicht der Typ des Prozessors ausgegeben. + . Der Name des Systems (jedes &unix; System besitzt + einen Namen) ist pc3.example.org und die Ausgabe + stammt von der Systemkonsole, dem Terminal + ttyv0. + + Das Ende der Ausgabe ist immer die Aufforderung zur Eingabe + eines Benutzernamens: + + login: + + Der Anmeldevorgang wird im nächsten Abschnitt + erläutert. + + + + Der Anmeldevorgang + + FreeBSD ist ein Mehrbenutzersystem, das Multitasking + unterstützt. Das heißt mehrere Benutzer können + gleichzeitig viele Programme auf einem System laufen lassen. + + Jedes Mehrbenutzersystem muss die Benutzer voneinander + unterscheiden können. In FreeBSD und allen anderen &unix; + Betriebssystemen wird dies dadurch erreicht, dass sich die + Benutzer anmelden müssen, bevor sie Programme laufen lassen + können. Jeder Benutzer besitzt einen eindeutigen Namen (den + Account) und ein dazugehörendes Passwort, die beide bei + der Anmeldung abgefragt werden. + + Startskripten + Nachdem FreeBSD gestartet ist und die Startskripten + Startskripten sind Programme, die FreeBSD automatisch bei + jedem Startvorgang ausführt. Der Zweck der Skripten + besteht darin, das System zu konfigurieren und nützliche + Dienste im Hintergrund zu starten. + , gelaufen sind, erscheint eine Aufforderung zur Eingabe + des Benutzernamens: + + login: + + Wenn Ihr Benutzername beispielsweise john + ist, geben Sie jetzt john gefolgt von + Enter ein. Sie sollten dann eine Aufforderung zur + Eingabe des Passworts erhalten: + + login: john +Password: + + Geben Sie jetzt das Passwort von john + gefolgt von Enter ein. Das Passwort wird aus + Sicherheitsgründen nicht auf dem Bildschirm angezeigt. + + Wenn Sie das richtige Passwort eingegeben haben, sind Sie + am System angemeldet und können nun alle verfügbaren + Kommandos absetzen. + + + + Virtuelle Konsolen + + Da FreeBSD mehrere Programme gleichzeitig laufen lassen kann, + ist eine einzige Konsole, an der Kommandos abgesetzt werden + können, zu wenig. Abhilfe schaffen virtuelle Konsolen, die + mehrere Konsolen zur Verfügung stellen. + + Die Anzahl der virtuellen Konsolen unter FreeBSD können Sie + einstellen. Zwischen den einzelnen Konsolen können Sie mit + speziellen Tastenkombinationen wechseln. Jede Konsole verfügt + über einen eigenen Ausgabekanal und FreeBSD ordnet die + Tastatureingaben und Monitorausgaben der richtigen Konsole zu, wenn + Sie zwischen den Konsolen wechseln. + + Zum Umschalten der Konsolen stellt FreeBSD spezielle + Tastenkombinationen bereit + Eine recht technische und genaue Beschreibung der FreeBSD + Konsole und der Tastatur-Treiber finden Sie in den Hilfeseiten + &man.syscons.4;, &man.atkbd.4;, &man.vidcontrol.1; und + &man.kbdcontrol.1;. Lesen Sie diese Seiten, wenn Sie an den + Einzelheiten interessiert sind. + . Benutzen Sie + AltF1, + AltF2 bis + AltF8, + um zwischen den verschiedenen Konsolen umzuschalten. + + Wenn Sie zu einer anderen Konsole wechseln, sichert FreeBSD den + Bildschirminhalt und gibt den Bildschirminhalt der neuen Konsole + aus. Dies erzeugt die Illusion mehrerer Bildschirme und + Tastaturen, an denen Sie Kommandos absetzen können. Wenn eine + Konsole nicht sichtbar ist, weil Sie auf eine andere Konsole + gewechselt haben, laufen die dort abgesetzten Kommandos + weiter. + + + + <filename>/etc/ttys</filename> + + In der Voreinstellung stehen unter FreeBSD acht virtuelle + Konsolen zur Verfügung, deren Anzahl Sie leicht erhöhen + oder erniedrigen können. Die Anzahl und Art der Konsolen wird + in /etc/ttys eingestellt. + + Jede Zeile in /etc/ttys, die nicht mit + # anfängt, konfiguriert einen Terminal oder + eine virtuelle Konsole. In der Voreinstellung werden in dieser + Datei neun virtuelle Konsolen definiert, von denen acht aktiviert + sind. Die Konsolen sind in den Zeilen, die mit + ttyv beginnen, definiert: + + # name getty type status comments +# +ttyv0 "/usr/libexec/getty Pc" cons25 on secure +# Virtual terminals +ttyv1 "/usr/libexec/getty Pc" cons25 on secure +ttyv2 "/usr/libexec/getty Pc" cons25 on secure +ttyv3 "/usr/libexec/getty Pc" cons25 on secure +ttyv4 "/usr/libexec/getty Pc" cons25 on secure +ttyv5 "/usr/libexec/getty Pc" cons25 on secure +ttyv6 "/usr/libexec/getty Pc" cons25 on secure +ttyv7 "/usr/libexec/getty Pc" cons25 on secure +ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure + + Die Hilfeseite &man.ttys.5; enthält eine ausführliche + Beschreibung der Spalten dieser Datei und der Optionen, die Sie zum + Konfigurieren der virtuellen Konsolen benutzen können. + + + + Die Konsole im Single-User-Modus + + Eine eingehende Beschreibung des Single-User-Modus finden Sie + in . Im Single-User-Modus steht + Ihnen nur eine Konsole zur Verfügung. + Die Definition dieser Konsole befindet sich ebenfalls in + /etc/ttys. Suchen Sie nach einer Zeile, die + mit console beginnt: + + # name getty type status comments +# +# If console is marked "insecure", then init will ask for the root password +# when going to single-user mode. +console none unknown off secure + + + In der Zeile, die mit console beginnt, + können Sie secure durch + insecure ersetzen. Wenn Sie danach in den + Single-User-Modus booten, verlangt das System ebenfalls die + Eingabe des root-Passworts. + + Setzen Sie insecure nicht + leichtfertig ein. Wenn Sie das Passwort von + root vergessen, wird es schwierig, in den + Single-User-Modus zu gelangen, wenn Sie den FreeBSD + Boot-Prozess nicht genau verstehen. + + + + Weitere Informationen @@ -1507,8 +1713,8 @@ Das ist nett, wenn Sie den Namen eines Kommandos wissen, und lediglich wissen wollen, wie es zu benutzen ist. Aber was tun Sie, wenn Sie Sich nicht an den Namen des Kommandos - erinnern können? Sie können man - benutzen, um nach Schlüsselbegriffen in den + erinnern können? Sie können mit man + nach Schlüsselbegriffen in den Kommandobeschreibungen zu suchen, indem Sie den Parameter benutzen: ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#4 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml,v 1.10 2002/09/11 15:51:28 alex Exp $ - $FreeBSDde: de-docproj/books/handbook/bibliography/chapter.sgml,v 1.16 2002/09/07 12:45:26 mheinen Exp $ + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml,v 1.12 2002/10/21 07:05:10 mheinen Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Oct 22 19:30:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE52837B404; Tue, 22 Oct 2002 19:30:20 -0700 (PDT) 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 9AD5837B401 for ; Tue, 22 Oct 2002 19:30:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7969443E42 for ; Tue, 22 Oct 2002 19:30:19 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9N2ThmV055582 for ; Tue, 22 Oct 2002 19:29:43 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9N2Tg9G055575 for perforce@freebsd.org; Tue, 22 Oct 2002 19:29:42 -0700 (PDT) Date: Tue, 22 Oct 2002 19:29:42 -0700 (PDT) Message-Id: <200210230229.g9N2Tg9G055575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 19939 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19939 Change 19939 by chris@chris_nailabs on 2002/10/22 19:29:30 Remove the (largely LOMAC-centric) "TrustedBSD" section. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#8 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#8 (text+ko) ==== @@ -944,750 +944,6 @@ - - - - - Chris - Costello - Written by - - - - - Trusted Operating System Features - - This section will give an overview of the features offered - by TrustedBSD. - - - Mandatory Access Control Framework - - This section will document the MAC framework from a user's - perspective. - - - Biba - - This section will document the Biba fixed-label MAC - policy. - - - - - - - - Tim - Fraser - - NAI Labs - - - - - Chris - Costello - - Safeport Network Services, NAI Labs - - - - - - Biba Low-Watermark Integrity Protection - - LOMAC is a loadable kernel module-based security - extension available on a number of UNIX kernels. LOMAC - provides Low Water-Mark Mandatory Access Control - functionality to protect the integrity of processes and data - from viruses, Trojan horses, malicious remote users, and - compromised root daemons. LOMAC is - designed to be virtually invisible to users, and largely - painless to administrators. - - This is the operations manual for LOMAC. It describes - LOMAC and the protection LOMAC provides. Please note that - the FreeBSD version of LOMAC is still under development. - Although enough functionality exists to provide some useful - protection, some features and fixes remain to be - implemented. The FreeBSD version of LOMAC should be used for - experimental purposes only at this time. - - - Introduction - - - MAC - - - Several projects have demonstrated that - kernel-resident Mandatory Access Control - (MAC) mechanisms can protect the - integrity of Free UNIX systems from malicious code and - users. However, implementations of these mechanisms have - traditionally required invasive kernel modifications, - sometimes coupled with supporting modifications of - user-space utilities, as well. This requirement has - hindered the adoption of MAC mechanisms in the mainstream - Free UNIX community. Adoption has been further discouraged - by the difficulty of starting small and evolving towards a - complete MAC solution - in general, the complete set of - extensive modifications must be made before MAC can - provide any useful protection. - - LOMAC is an attempt to make an easily-adoptable form - of MAC integrity protection available to the Free UNIX - community without the discouraging necessity of kernel - modifications. LOMAC implements a simple form of MAC - integrity protection based on Biba's Low Water-Mark model - in a Loadable Kernel Module (LKM) Although it trades off - some of the advanced MAC features found in traditional MAC - implementations, LOMAC provides useful integrity - protection without any modifications to the kernel, - applications, or their existing configurations. LOMAC is - designed to be compatible with existing software, and - ships with a one-size-fits-all default configuration. - LOMAC may be used to harden cur rently-deployed FreeBSD - systems simply by loading the LKM into the kernel shortly - after boot time. - - Once loaded, LOMAC divides the system into two - conceptual levels of integrity: high and low. The high - side contains all process and files that should be - protected from malicious code and remote users, including - the system binaries (/bin, - /lib) and configuration files - (/etc). The low side contains the - processes that interact with remote users (remote login - sessions, httpd) and the files - they download from the net (mail attachments). Low files - may contain viruses or Trojan Horses. Low processes take - input from remote users that may cause buffer overflows. - During run-time, LOMAC protects high files and processes - by preventing low processes from modifying or signalling - them. Thanks to is generic default configuration, LOMAC - handles the division of the system into high and low parts - automatically, without administrative direction. - - LOMAC does not override the existing FreeBSD - protection mechanisms. Instead, its permission checks are - done in addition to the existing ones—the kernel - permits an operation only if both the existing mechanisms - and LOMAC decide it should permit it. Unlike the existing - FreeBSD protection mechanisms, LOMAC makes decisions based - solely on integrity level, not on user identity. With - LOMAC, a low-level root process is - just as powerless as a low-level - non-root process. Since LOMAC - automatically places all network servers in the low part - of the system, this fact prevents compromised - root-privileged network servers from - harming the high-integrity part of the system. - - - - A Short Tour - - This section introduces LOMAC's major features. You - may follow these steps the first time you boot with LOMAC - running to ensure that your installation is - correct. - - - - Log in as root, from the - system console. - - - - Check to make sure that the LOMAC LKM is - loaded: - - # /sbin/kldstat | grep lomac.ko 5 1 - 0xc13e0000 c000 lomac.ko - - - - Look at the levels of your processes: - - # ps PID LVL TT STAT TIME COMMAND 251 2 - v6 Is 0:00.37 login -p root 650 2 v6 S - 0:00.56 -csh (csh) 665 2 v6 R+ 0:00.05 - ./ps - - Note that all your processes are running at level - 2—LOMAC's highest level of privilege. - - - - Look at the levels of your files. - (-Z shows levels.) - - # ls -lZ total 62 -rw-r--r-- 2 root wheel 2 - 802 Apr 21 2001 .cshrc -rw------- 1 root wheel 2 - 2973 Oct 12 09:41 .history -rw-r--r-- 1 root wheel - 2 142 Apr 21 2001 .klogin -rw-r--r-- 1 root wheel - 2 297 Apr 21 2001 .login ... - - Note that all your files are also at level 2. - Level-2 files are high-integrity—LOMAC assumes - that they contain no viruses or Trojan horses at boot - time, and limits the behavior of processes during - run-time to keep them that way. - - - - Look at the levels of a normal user's files. I'll - use the user tfraser in the example; you'll have to - use one of your own users. - - # ls -laZ /home/tfraser total 47 drwxr-xr-x 8 - tfraser staff 1 1024 Oct 25 14:30 . drwxr-xr-x 4 - root wheel 2 512 Aug 27 10:47 .. -rw------- 1 - tfraser staff 1 114 Aug 27 11:11 .Xauthority - -rw------- 1 tfraser staff 1 42 Oct 4 10:17 - .bash_history - - Note that while /home is - level 2 (high integrity), all of the user's files are - level 1 (low integrity). LOMAC assumes that any of the - user's files may be Trojan horses or contain - viruses. - - - - Examine one of the user's files with less, and put - less in the background with ctrl-Z. Then run ps to - look at your processes. - - # less /home/tfraser/.bash_history <output - not included in document to save space> ^Z - Suspended # ps PID LVL TT STAT TIME COMMAND 251 - 2 v6 Is 0:00.37 login -p root 650 2 v6 S - 0:01.28 -csh (csh) 733 1 v6 T 0:00.08 less - /home/tfraser/.bash_history 735 2 v6 R+ - 0:00.05 ./ps - - Note that, although your shell - (csh in my case) is still - at level 2, the process running less is at level 1. - Here's why: Processes generally inherit the level of - their parent. So, any process you start with your - level-2 shell will initially execute at level 2. The - less process was no exception - it began running at - level 2. However, the less process went on to read the - user's .cshrc file. This file is - a level-1 file—it contains low-integrity data. - Whenever LOMAC sees a level-2 process read a level-1 - file, LOMAC "demotes" the process. That is, it reduces - the process to level 1. - - Level-2 processes have maximum privileges (like - root in standard UNIX). Level-1 - processes have greatly reduced privileges. For - example, they cannot write to level-2 files, or signal - level-2 processes. When a level-2 process reads a - level-1 file, it puts itself at risk. The file may be - a Trojan horse or may contain data designed to cause - buffer overflows. Because of this risk, LOMAC demotes - level-2 processes that read level-1 files to level 1. - Once at level 1, these processes have insufficient - privilege to harm level-2 processes and files. - - Many cautious UNIX administrators avoid putting - "." in their PATH environment variable, in order to - avoid executing some Trojan horses. In standard UNIX, - a malicious user might give an attack program the same - name as a commonly-used command like ls. If the - administrator, running as root, - were to cd to the malicious user's directory and type - ls, if the "." preceded /bin in - their path, they would accidentally execute the - malicious ls rather than - /bin/ls. This act would - effectively execute the malicious user's Trojan horse - program with root privileges, - perhaps to modify the login program or the - passwd file. - - This precaution is not required in a system - running LOMAC. LOMAC considers the execution of a - program to be equivalent to a read (since the process - reads the program file in order to execute it). Since - all non-root user's files are at - level 1, LOMAC would demote the process executing the - Trojan ls, just as it demoted less in our example, - above. Once at level 1, LOMAC would prevent the Trojan - ls from modifying level-2 files such as the login - program or the passwd file. - - Demotion is a key part of the LOMAC's integrity - protection scheme. Now that we've demonstrated how it - works, we're now done with less. Quit the less - program. - - # fg <output not included in document to save - space> q - - - - Create a test file. We'll use this test file to - demonstrate LOMAC's integrity protection later - on. - - # cat > /root/foo This file contains test data. - ^D - - - - tail -f - /var/log/messages - - Leave this running while you continue the tour. - It's output will contain LOMAC log messages as we - proceed. - - - - Switch to another virtual console and log in as a - normal user. Once logged in, examine the levels of - your processes: - - $ ps PID LVL TT STAT TIME COMMAND 742 1 - v7 S 0:00.48 -tcsh (tcsh) 750 1 v7 R+ - 0:00.05 ps - - Note that as a normal user, all of your processes - are at level 1. Why? Switch back to the virtual - console where you are logged in as - root. You should see a log - message similar to: - - Oct 25 14:44:54 myhost - /boot/kernel/kernel: LOMAC: level-2 subject - p252g252u1002:login demoted to level 1 after reading - under "/usr/home" - - All the getty programs that handle logins run at - level 2. When a user attempts to log in, they run the - login program, which also runs at level 2. Upon - supplying the proper password, the login program - starts a shell for the user - (tcsh in this case). The - shell starts at level 2, but LOMAC demotes it to level - 1 when it reads the user's .cshrc - file, just as it demoted the less program, above. Once - the user's shell is running at level 1, all of the - programs subsequently executed by the user will run at - level 1, also. - - Our root shell from the start - of the tour remains at level-2 because LOMAC has set - all of root's files at level 2. A - level-2 process may read level-2 files without being - demoted. The user's shell is demoted because it reads - the user's level-1 files. LOMAC does not assign levels - to processes based on the user's - root/non-root - identity. LOMAC assigns levels to files by starting - the first process (init) at level 2, allowing child - processes to inherit their parent's level, and by - demoting processes that read level-1 files. LOMAC does - not pay any attention to user identity. Consequently, - LOMAC is not vulnerable to any of the traditional - attacks on UNIX security that involve obtaining - root identity. - - - - Test the above assertion that LOMAC does not give - any extra privileges to processes with - root identity. Switch back to the - normal user's shell and become - root. - - &prompt.user; su Password: # ps PID LVL TT STAT - TIME COMMAND 252 1 v7 Is 0:00.39 login -p - tfraser 751 1 v7 I 0:00.18 su 752 1 v7 S - 0:00.43 _su (csh) 755 1 v7 R+ 0:00.05 ps - - Note that, despite the su, your - shell is still at level 1. LOMAC never increases the - level of a process. Now attempt to delete the - /root/foo file you created - earlier. - - # ls -lZ /root/foo -rw-r--r-- 1 root wheel 2 - 30 Oct 25 14:44 /root/foo # rm /root/foo rm: - /root/foo: Operation not permitted - - Even though you are root, - LOMAC will not allow a level-1 process - (rm in this case) to delete a - level-2 file. You should see a log message similar to - this one in on the root virtual - console that is tailing /var/log/messages: - - Oct 25 14:50:52 myhost - /boot/kernel/kernel: LOMAC: level-1 proc p763g763u0:rm - denied delete to level-2 object under - "/" - - This concludes the short tour. - - - - - - LOMAC and Network Applications - - This section explains how LOMAC uses its demotion - behavior to ensure that all remote users and servers that - serve remote users (httpd, - ftpd, etc.) run at level 1. At - this level, malicious remote users and compromised network - servers can do little harm to the level-2 part of the - system, even if they have root - privilege. It also discusses a few of the finer points - concerning LOMAC's protection scheme not already covered - in the Short Tour - section, above. The basic elements of LOMAC's integrity - protection scheme are summarized here: - - - - LOMAC assigns every process, or named filesystem - object (file, named pipe, or bound UNIX-domain socket) - a level: either 1 (low integrity) or 2 (high - integrity). - - - - LOMAC assigns levels to filesystem objects based - on their location in the filesystem namespace. The - mapping between names and levels constitutes most of - LOMAC's "default policy", and is presently hardcoded - into the LKM. Once assigned, the levels of filesystem - objects never change. - - - - The first process (init) starts at level 2. All - child processes inherit the level of their parent. - Only when a level-2 process reads from a level-1 - object does LOMAC demote the process to level - 1. - - - - Level-1 processes have insufficient privilege to - write to level-2 objects or signal level-2 processes. - This protects the level-2 part of the system from - malicious interference. - - - - The combination of LOMAC's demotion behavior and - its restrictions on the privileges of level-1 - processes prevent malicious level-1 users from harming - the level-2 part of the system, even in cases where - level-2 administrators accidentally execute malicious - user's Trojan horses. - - - - In UNIX, network servers are generally started - automatically by the init process, or by one of its - children. With LOMAC, this arrangement guarantees that - network servers inherit the init process's level of 2. In - addition to demoting level-2 processes upon reading - level-1 files, LOMAC also demotes level-2 processes when - they read from a network interface. Consequently, LOMAC - demotes network server as soon as they read their first - client request from the network. Just as LOMAC assigns - appropriate levels to user shells based on their - file-reading behavior, not their user's identity, this - scheme allows LOMAC to demote network servers without - initially knowing which programs are network servers: - LOMAC simply allows the init program to start all of its - servers at level 2, and subsequently demotes those servers - which read from a network interface. - - LOMAC uses the same strategy to ensure that remote - users run at level 1: it demotes the remote login - (telnetd, rlogind) servers when they receive their first - login request, as described above. LOMAC's ability to - automatically determine the proper levels for users and - servers during runtime is the feature which allows it to - avoid site-specific configuration and ship with a - one-size-fits-all default policy. - - Here is an example of an httpd server before it reads - its first request. Note that the httpd server is comprised - of 5 processes, all at level 2. - - # ps -U nobody PID LVL TT STAT TIME COMMAND - 369 2 ?? I 0:00.03 /usr/local/sbin/httpd 370 2 - ?? I 0:00.03 /usr/local/sbin/httpd 371 2 ?? I - 0:00.03 /usr/local/sbin/httpd 372 2 ?? I 0:00.03 - /usr/local/sbin/httpd 373 2 ?? I 0:00.03 - /usr/local/sbin/httpd - - After httpd reads its first request from the network, - you should see a message similar to this one in - /var/log/messages: - - Oct 25 16:16:24 myhost /boot/kernel/kernel: - LOMAC: level-2 subject p369g368u65534:httpd demoted to - level 1 after reading from the network - - And running ps again will produce: - - PID LVL TT STAT TIME COMMAND - 369 1 ?? S 0:00.30 /usr/local/sbin/httpd 370 2 - ?? I 0:00.03 /usr/local/sbin/httpd 371 2 ?? I - 0:00.03 /usr/local/sbin/httpd 372 2 ?? I 0:00.03 - /usr/local/sbin/httpd 373 2 ?? I 0:00.03 - /usr/local/sbin/httpd 1572 2 ?? S 0:00.06 - /usr/local/sbin/httpd - - LOMAC demoted httpd process 369 as soon as it read its - first client request. - - - - LOMAC and Traditional UNIX Access Control - - LOMAC does not override the existing FreeBSD - protection mechanisms. Instead, its permission checks are - done in addition to the existing ones—the kernel - permits an operation only if both the existing mechanisms - and LOMAC decide the kernel should permit it. - - There are three main differences between the integrity - protection scheme implemented by LOMAC and traditional - UNIX security mechanisms: - - - - Traditional UNIX provides mechanisms by which - processes can increase their privileges by changing - their effective identities. Although UNIX systems can - be configured to prevent malicious users from - exploiting these mechanisms in most cases, they can - also be misconfigured, and good configurations can be - foiled by bugs in user-space application programs. - LOMAC provides no mechanism to allow a process to - increase its level. - - - - Traditional UNIX access control mechanisms are not - designed to prevent the flow of potentially dangerous - data from low-integrity objects to high-integrity - objects. That is, from files owned by one user to - those owned by another - even to those owned by - root. The Trojan ls scenario in - the Short Tour - section describes one well-known example of this - vulnerability, and how LOMAC counters it. - - - - Although many enhancements now exist, in its most - basic form traditional UNIX depends on easily defeated - authentication mechanisms to establish appropriate - initial privilege levels. LOMAC assigns privilege - levels to processes based on their reading behavior. - As described above, the effect of LOMAC's policy is to - give the highest level of privilege only local - administrative users, and the lowest level of - privilege to all others, regardless of identity. LOMAC - does not consider user identity; consequently, it does - not depend on authentication. - - - - - - Limits of LOMAC's Protection - - LOMAC embodies a trade-off between quality of MAC - protection and compatibility. LOMAC's primary goal is to - remain compatible with existing software while providing - some useful MAC integrity protection. The Low Water-Mark - MAC model supports this compatibility-first requirement. - However, it the quality of protection it provides is not - as great as that provided by more modern, less compatible, - models. This issue is discussed at length in. This section - presents the two well-known primary quality-of-protection - drawbacks of the Low Water-Mark model: its enforcement of - the principle of least privilege, and its reliance on - trusted applications. - - The first drawback of the Low Water-Mark MAC scheme - concerns the Principle of Least Privilege, which holds - that a good MAC scheme should grant a subject the minimum - set of privileges needed to do its job [SAL75]. - Constraining a subject in this way minimizes the amount of - damage the subject can cause should it become compromised. - Low Water-Mark provides weaker constraints than some more - modern models. The LOMAC AND NETWORK APPLICATIONS section - describes how LOMAC protects the level-2 part of the - system by demoting network servers to level 1. Although - LOMAC will prevent a compromised level-1 network server - from harming the level-2 part of the system, LOMAC will - not prevent such a server from doing harm in the level-1 - remainder of the system. A compromised - root-privileged network server could, - for example, send kill signals to another level-1 - server. - - - The second drawback of the Low Water-Mark MAC scheme - is its reliance on trusted applications. This reliance is - a feature of hierarchical models like Low Water-Mark - [BOE85]. The dhclient(8) client-side DHCP agent is a good - example of LOMAC's reliance on trusted applications: As - described in the LOMAC AND NETWORK APPLICATIONS section, - LOMAC protects the integrity of the level-2 part of the - system by demoting all applications which read from the - network to level 1. Once demoted, these applications can - no longer modify level-2 files. Although this demotion and - confinement prevents potentially-compromised network - applications provides useful protection, it also prevents - applications like dhclient from operating properly. - - The dhclient application reads DHCP information from - the network and attempts to update the host's - /etc configuration files, - accordingly. This is exactly the kind of - potentially-dangerous behavior that is prohibited by - LOMAC; a dhclient that LOMAC has demoted to level 1 cannot - modify /etc configuration files. - Although dangerous, dhclient's behavior is required for - the proper operation of some systems. - - LOMAC must provide an exception to its policy in order - to allow dhclient to run, and "trust" dhclient not to - abuse this exceptional privilege. LOMAC sets the special - "NONETDEMOTE" flag on all processes running the dhclient - program. LOMAC will not demote a process with this flag - set when that process reads from the network. This - exception allows a level-2 dhclient to stay at level 2 - after reading DHCP information from the network, - permitting it to modify /etc - configuration files as it chooses. - - The FreeBSD version of LOMAC presently two flags for - processes, each implementing a specific flavor of - trust: - - - - - NONETDEMOTE - - - - LOMAC will not demote a processes after reading - from the network provided that it has this flag - set. - - - - - - NODEMOTE - - - - LOMAC will never demote a process that has this - flag set. - - - - - Note that, although these flags allow level-2 - processes to escape demotion, they do not allow a level-1 - process to raise its level to 2. LOMAC does not provide - any such promotion mechanism. - - LOMAC will set a process's - NONETDEMOTE or - NODEMOTE flag when that process - executes a particular program, such as dhclient. In - addition, once a process has one of these flags set, any - children it subsequently creates will have the same flag - set. LOMAC maintains a short list mapping programs to - process trust flags. Eventually, that list will be shown - here. However, since the FreeBSD version of LOMAC is still - under development, the membership of the list is still - fluid. The best reference is the LOMAC source code, - specifically policy_plm.h. - - If you create symlinks to env - named env-nonetdemote and - env-nodemote , executing env through - these symlinks will cause env and its child processes to - run with the NONETDEMOTE and - NODEMOTE flags, respectively. This - feature may be an aid to administration, particularly when - downloading and installing new software. - - - - - Multi-Level Security - - This section will document the MLS policy. - - - - Type Enforcement - - This section will document the Type Enforcement - policy. - - - - BSD Extended - - This section will document the BSD Extended - policy. - - - - - Access Control Lists - - This section will document ACLs. - - - Configuring ACLs - - This section will include the commands and kernel - options necessary to enable ACLs on a given file - system. - - - - Examples Using ACLs - - This section will include a few hypothetical system - situations and appropriate ACL configuration for each - case. - - - - - POSIX.1e Capabilities - - This section will explain POSIX.1e Capabilities. - - - To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 8: 5:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56D1937B404; Wed, 23 Oct 2002 08:05:46 -0700 (PDT) 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 06B4937B401 for ; Wed, 23 Oct 2002 08:05:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A224B43E42 for ; Wed, 23 Oct 2002 08:05:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NF56mV005638 for ; Wed, 23 Oct 2002 08:05:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NF56tl005635 for perforce@freebsd.org; Wed, 23 Oct 2002 08:05:06 -0700 (PDT) Date: Wed, 23 Oct 2002 08:05:06 -0700 (PDT) Message-Id: <200210231505.g9NF56tl005635@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 Subject: PERFORCE change 19962 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19962 Change 19962 by rwatson@rwatson_tislabs on 2002/10/23 08:04:20 Add mac_check_sysctl(), a MAC Framework and MAC Policy entry point to check whether a sysctl operation is permitted. Right now, this is not a highly useful entry point, since sysctl doesn't provide useful information such as the name, rather, just the OID. This is sufficient, however, to permit policies to rote deny sysctl change requests from processes, which can support most integrity policies, even if the granularity is poor. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#325 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#12 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#188 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#146 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#325 (text+ko) ==== @@ -137,6 +137,11 @@ &mac_enforce_socket, 0, "Enforce MAC policy on socket operations"); TUNABLE_INT("security.mac.enforce_socket", &mac_enforce_socket); +static int mac_enforce_sysctl = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_sysctl, CTLFLAG_RW, + &mac_enforce_sysctl, 0, "Enforce MAC policy on sysctl operations"); +TUNABLE_INT("security.mac.enforce_sysctl", &mac_enforce_sysctl); + static int mac_enforce_vm = 0; SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); @@ -918,6 +923,10 @@ mpc->mpc_ops->mpo_check_socket_visible = mpe->mpe_function; break; + case MAC_CHECK_SYSCTL: + mpc->mpc_ops->mpo_check_sysctl = + mpe->mpe_function; + break; case MAC_CHECK_VNODE_ACCESS: mpc->mpc_ops->mpo_check_vnode_access = mpe->mpe_function; @@ -3367,6 +3376,25 @@ } int +mac_check_sysctl(struct ucred *cred, int *name, u_int namelen, void *old, + size_t *oldlenp, int inkernel, void *new, size_t newlen) +{ + int error; + + /* + * XXXMAC: We're very much like to assert the SYSCTL_LOCK here, + * but since it's not exported from kern_sysctl.c, we can't. + */ + if (!mac_enforce_sysctl) + return (0); + + MAC_CHECK(check_sysctl, cred, name, namelen, old, oldlenp, inkernel, + new, newlen); + + return (error); +} + +int mac_ioctl_ifnet_get(struct ucred *cred, struct ifreq *ifr, struct ifnet *ifnet) { ==== //depot/projects/trustedbsd/mac/sys/kern/kern_sysctl.c#12 (text+ko) ==== @@ -41,11 +41,13 @@ */ #include "opt_compat.h" +#include "opt_mac.h" #include #include #include #include +#include #include #include #include @@ -1238,6 +1240,15 @@ SYSCTL_LOCK(); +#ifdef MAC + error = mac_check_sysctl(td->td_ucred, name, namelen, old, oldlenp, + inkernel, new, newlen); + if (error) { + SYSCTL_UNLOCK(); + return (error); + } +#endif + do { req2 = req; error = sysctl_root(0, name, namelen, &req2); ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#188 (text+ko) ==== @@ -304,6 +304,9 @@ int mac_check_socket_receive(struct ucred *cred, struct socket *so); int mac_check_socket_send(struct ucred *cred, struct socket *so); int mac_check_socket_visible(struct ucred *cred, struct socket *so); +int mac_check_sysctl(struct ucred *cred, int *name, u_int namelen, + void *old, size_t *oldlenp, int inkernel, void *new, + size_t newlen); int mac_check_vnode_access(struct ucred *cred, struct vnode *vp, int flags); int mac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#146 (text+ko) ==== @@ -315,6 +315,9 @@ struct socket *so, struct label *socketlabel); int (*mpo_check_socket_visible)(struct ucred *cred, struct socket *so, struct label *socketlabel); + int (*mpo_check_sysctl)(struct ucred *cred, int *name, + u_int namelen, void *old, size_t *oldlenp, int inkernel, + void *new, size_t newlen); int (*mpo_check_vnode_access)(struct ucred *cred, struct vnode *vp, struct label *label, int flags); int (*mpo_check_vnode_chdir)(struct ucred *cred, @@ -511,6 +514,7 @@ MAC_CHECK_SOCKET_RELABEL, MAC_CHECK_SOCKET_SEND, MAC_CHECK_SOCKET_VISIBLE, + MAC_CHECK_SYSCTL, MAC_CHECK_VNODE_ACCESS, MAC_CHECK_VNODE_CHDIR, MAC_CHECK_VNODE_CHROOT, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 8:13: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2770937B404; Wed, 23 Oct 2002 08:13:00 -0700 (PDT) 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 B680037B401 for ; Wed, 23 Oct 2002 08:12:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CFE143E42 for ; Wed, 23 Oct 2002 08:12:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NFCKmV006788 for ; Wed, 23 Oct 2002 08:12:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NFCGol006785 for perforce@freebsd.org; Wed, 23 Oct 2002 08:12:16 -0700 (PDT) Date: Wed, 23 Oct 2002 08:12:16 -0700 (PDT) Message-Id: <200210231512.g9NFCGol006785@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 Subject: PERFORCE change 19964 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19964 Change 19964 by rwatson@rwatson_tislabs on 2002/10/23 08:11:26 Teach mac_biba about sysctl: permit sysctl reads by any subject, but permit sysctl writes only if the subject meets our definition of Biba privileged (single==equal, either end of range==equal, range==low-high). This permits information flow via sysctl only for privileged subjects, and prohibits system reconfiguration by unprivileged subjects. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#151 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#151 (text+ko) ==== @@ -320,6 +320,14 @@ } static int +mac_biba_privileged(struct mac_biba *mac_biba) +{ + + /* Equate the notion of "equal" with privilege. */ + return (mac_biba_subject_equal_ok(mac_biba)); +} + +static int mac_biba_valid(struct mac_biba *mac_biba) { @@ -1807,6 +1815,30 @@ } static int +mac_biba_check_sysctl(struct ucred *cred, int *name, u_int namelen, + void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen) +{ + struct mac_biba *subj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + + /* + * Permit sysctl modification only if Biba-privileged; permit + * read by any process. + */ + if (new != NULL) { + if (!mac_biba_privileged(subj)) + return (EPERM); + } + + return (0); +} + + +static int mac_biba_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -2606,6 +2638,8 @@ (macop_t)mac_biba_check_socket_relabel }, { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_biba_check_socket_visible }, + { MAC_CHECK_SYSCTL, + (macop_t)mac_biba_check_sysctl }, { MAC_CHECK_VNODE_ACCESS, (macop_t)mac_biba_check_vnode_open }, { MAC_CHECK_VNODE_CHDIR, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 8:24:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6761C37B404; Wed, 23 Oct 2002 08:24:15 -0700 (PDT) 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 0013E37B401 for ; Wed, 23 Oct 2002 08:24:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A3E043E3B for ; Wed, 23 Oct 2002 08:24:14 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NFNZmV007620 for ; Wed, 23 Oct 2002 08:23:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NFNZIp007617 for perforce@freebsd.org; Wed, 23 Oct 2002 08:23:35 -0700 (PDT) Date: Wed, 23 Oct 2002 08:23:35 -0700 (PDT) Message-Id: <200210231523.g9NFNZIp007617@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 Subject: PERFORCE change 19966 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19966 Change 19966 by rwatson@rwatson_tislabs on 2002/10/23 08:22:42 Whitespace nit. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#152 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#152 (text+ko) ==== @@ -1837,7 +1837,6 @@ return (0); } - static int mac_biba_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 8:40:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05FFF37B404; Wed, 23 Oct 2002 08:40:13 -0700 (PDT) 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 9731F37B401 for ; Wed, 23 Oct 2002 08:40:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EA0E43E42 for ; Wed, 23 Oct 2002 08:40:12 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NFdWmV008596 for ; Wed, 23 Oct 2002 08:39:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NFdWgq008590 for perforce@freebsd.org; Wed, 23 Oct 2002 08:39:32 -0700 (PDT) Date: Wed, 23 Oct 2002 08:39:32 -0700 (PDT) Message-Id: <200210231539.g9NFdWgq008590@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 Subject: PERFORCE change 19968 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19968 Change 19968 by rwatson@rwatson_tislabs on 2002/10/23 08:39:25 Integ mac_biba sysctl change into mac_lomac. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#14 integrate Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#14 (text+ko) ==== @@ -305,6 +305,14 @@ } static int +mac_lomac_privileged(struct mac_lomac *mac_lomac) +{ + + /* Equate the notion of "equal" with privilege. */ + return (mac_lomac_subject_equal_ok(mac_lomac)); +} + +static int mac_lomac_valid(struct mac_lomac *mac_lomac) { @@ -1763,6 +1771,29 @@ } static int +mac_lomac_check_sysctl(struct ucred *cred, int *name, u_int namelen, + void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen) +{ + struct mac_lomac *subj; + + if (!mac_lomac_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + + /* + * Permit sysctl modification only if Biba-privileged; permit + * read by any process. + */ + if (new != NULL) { + if (!mac_lomac_privileged(subj)) + return (EPERM); + } + + return (0); +} + +static int mac_lomac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, struct label *dlabel) { @@ -2559,6 +2590,8 @@ (macop_t)mac_lomac_check_socket_relabel }, { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_lomac_check_socket_visible }, + { MAC_CHECK_SYSCTL, + (macop_t)mac_lomac_check_sysctl }, { MAC_CHECK_VNODE_ACCESS, (macop_t)mac_lomac_check_vnode_open }, { MAC_CHECK_VNODE_CHDIR, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 9:31:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3280237B404; Wed, 23 Oct 2002 09:31:48 -0700 (PDT) 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 BEB4337B401 for ; Wed, 23 Oct 2002 09:31:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 26C6743E77 for ; Wed, 23 Oct 2002 09:31:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NGV7mV012428 for ; Wed, 23 Oct 2002 09:31:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NGV7Uv012425 for perforce@freebsd.org; Wed, 23 Oct 2002 09:31:07 -0700 (PDT) Date: Wed, 23 Oct 2002 09:31:07 -0700 (PDT) Message-Id: <200210231631.g9NGV7Uv012425@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 Subject: PERFORCE change 19972 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19972 Change 19972 by rwatson@rwatson_tislabs on 2002/10/23 09:30:36 I was sure I removed mac_te from the modules Makefile yesterday, but apparently not. Affected files ... .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#44 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#44 (text+ko) ==== @@ -71,7 +71,6 @@ mac_none \ mac_partition \ mac_seeotheruids \ - mac_te \ mac_test \ mcd \ md \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 9:48:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E142737B404; Wed, 23 Oct 2002 09:48:08 -0700 (PDT) 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 9012F37B401 for ; Wed, 23 Oct 2002 09:48:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4634043E3B for ; Wed, 23 Oct 2002 09:48:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NGlSmV013298 for ; Wed, 23 Oct 2002 09:47:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NGlSs9013295 for perforce@freebsd.org; Wed, 23 Oct 2002 09:47:28 -0700 (PDT) Date: Wed, 23 Oct 2002 09:47:28 -0700 (PDT) Message-Id: <200210231647.g9NGlSs9013295@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 Subject: PERFORCE change 19974 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19974 Change 19974 by rwatson@rwatson_tislabs on 2002/10/23 09:46:36 mac_check_sysctl implementations for mac_none and mac_test. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#89 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#63 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#89 (text+ko) ==== @@ -621,6 +621,14 @@ } static int +mac_none_check_sysctl(struct ucred *cred, int *name, u_int namelen, + void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen) +{ + + return (0); +} + +static int mac_none_check_vnode_access(struct ucred *cred, struct vnode *vp, struct label *label, mode_t flags) { @@ -1078,6 +1086,8 @@ (macop_t)mac_none_check_socket_relabel }, { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_none_check_socket_visible }, + { MAC_CHECK_SYSCTL, + (macop_t)mac_none_check_sysctl }, { MAC_CHECK_VNODE_ACCESS, (macop_t)mac_none_check_vnode_access }, { MAC_CHECK_VNODE_CHDIR, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#63 (text+ko) ==== @@ -1010,6 +1010,14 @@ } static int +mac_test_check_sysctl(struct ucred *cred, int *name, u_int namelen, + void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen) +{ + + return (0); +} + +static int mac_test_check_socket_relabel(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { @@ -1477,6 +1485,8 @@ (macop_t)mac_test_check_socket_relabel }, { MAC_CHECK_SOCKET_VISIBLE, (macop_t)mac_test_check_socket_visible }, + { MAC_CHECK_SYSCTL, + (macop_t)mac_test_check_sysctl }, { MAC_CHECK_VNODE_ACCESS, (macop_t)mac_test_check_vnode_access }, { MAC_CHECK_VNODE_CHDIR, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 11: 3:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA95437B404; Wed, 23 Oct 2002 11:02:45 -0700 (PDT) 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 509EA37B401 for ; Wed, 23 Oct 2002 11:02:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6DFD743E65 for ; Wed, 23 Oct 2002 11:02:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NI24mV018053 for ; Wed, 23 Oct 2002 11:02:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NI2094018050 for perforce@freebsd.org; Wed, 23 Oct 2002 11:02:00 -0700 (PDT) Date: Wed, 23 Oct 2002 11:02:00 -0700 (PDT) Message-Id: <200210231802.g9NI2094018050@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 Subject: PERFORCE change 19978 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19978 Change 19978 by rwatson@rwatson_tislabs on 2002/10/23 11:01:04 The new VFS world order for MAC: (1) Remove vn_refreshlabel(), and move to a model where the label is assumed to be present from inception of the vnode. For single-label file systems, this is handled in getnewvnode(); for multi-label, the file system will perform appropriate initialization for both the association and creation cases. (2) Move to a model where vnodes are explicitly "created" (new object with framework-generated label), or "associated" with an existing persistent object and label. (3) Deprecate procfs support: it worked fine for the poll model, but poorly for the "from inception" model as you get a cache coherrency problem. Since we now export label data using mac_get_pid(), that's not a problem. (4) As part of this change, break out each policy into using its own extended attribute, and use UFS2 extended attribute transactions to protect the coherency of labels during multi-policy relables. If you're using UFS2, you'll lose current labels, but no special configuration will be required. If you're using UFS1, you'll need to allocate new per-policy EA-backing files. Also, you won't get the strong multi-policy consistency guarantees, so you really want to move to UFS2. This brings vnodes into line with all other labeled kernel objects by making them use the init->create->relabel->destroy life cycle rather than polling. It also fixes MAC label behavior in the presence of shared vnode locks, which are being used in VFS more now than they were when we did the initial design. I did a first pass merge of SEBSD, but have not been able to test it with file labeling, it might require fixing. Ditto the work-in-progress mac_lomac. Affected files ... .. //depot/projects/trustedbsd/mac/sys/conf/files#64 edit .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#33 edit .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.c#12 edit .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.h#10 edit .. //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs_mac.c#13 delete .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.h#14 edit .. //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#20 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#326 edit .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#44 edit .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#45 edit .. //depot/projects/trustedbsd/mac/sys/modules/procfs/Makefile#10 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#153 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#131 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#90 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#64 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#50 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#189 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#147 edit .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#25 edit .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_vnops.c#58 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/conf/files#64 (text+ko) ==== @@ -828,7 +828,6 @@ fs/procfs/procfs_dbregs.c optional procfs fs/procfs/procfs_fpregs.c optional procfs fs/procfs/procfs_ioctl.c optional procfs -fs/procfs/procfs_mac.c optional procfs fs/procfs/procfs_map.c optional procfs fs/procfs/procfs_mem.c optional procfs fs/procfs/procfs_note.c optional procfs ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#33 (text+ko) ==== @@ -167,7 +167,7 @@ de->de_vnode = vp; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); #ifdef MAC - mac_create_devfs_vnode(de, vp); + mac_associate_vnode_devfs(mp, de, vp); #endif *vpp = vp; return (0); ==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.c#12 (text+ko) ==== @@ -153,7 +153,6 @@ dir = pfs_create_dir(root, "pid", procfs_attr, NULL, PFS_PROCDEP); - dir->pn_refreshlabel = procfs_piddir_refreshlabel; pfs_create_file(dir, "cmdline", procfs_doproccmdline, NULL, NULL, PFS_RD); pfs_create_file(dir, "ctl", procfs_doprocctl, ==== //depot/projects/trustedbsd/mac/sys/fs/procfs/procfs.h#10 (text+ko) ==== @@ -61,9 +61,6 @@ /* Attributes */ int procfs_attr(PFS_ATTR_ARGS); -/* MAC */ -int procfs_piddir_refreshlabel(PFS_REFRESHLABEL_ARGS); - /* Visibility */ int procfs_notsystem(PFS_VIS_ARGS); int procfs_candebug(PFS_VIS_ARGS); ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs.h#14 (text+ko) ==== @@ -145,15 +145,6 @@ typedef int (*pfs_getextattr_t)(PFS_GETEXTATTR_ARGS); /* - * Getlabel callback - */ -#define PFS_REFRESHLABEL_ARGS \ - struct thread *td, struct proc *p, struct vnode *vp, \ - struct pfs_node *pn, struct ucred *cred -struct mac; -typedef int (*pfs_refreshlabel_t)(PFS_REFRESHLABEL_ARGS); - -/* * Last-close callback */ #define PFS_CLOSE_ARGS \ @@ -194,7 +185,6 @@ pfs_attr_t pn_attr; pfs_vis_t pn_vis; pfs_getextattr_t pn_getextattr; - pfs_refreshlabel_t pn_refreshlabel; void *pn_data; int pn_flags; ==== //depot/projects/trustedbsd/mac/sys/fs/pseudofs/pseudofs_vnops.c#20 (text+ko) ==== @@ -28,8 +28,6 @@ * $FreeBSD: src/sys/fs/pseudofs/pseudofs_vnops.c,v 1.31 2002/09/25 02:32:40 jeff Exp $ */ -#include "opt_mac.h" - #include #include #include @@ -37,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -732,50 +729,6 @@ return (pfs_vncache_free(va->a_vp)); } -#ifdef MAC -/* - * Refresh the vnode label as appropriate for the pseudo-file system. - */ -static int -pfs_refreshlabel(struct vop_refreshlabel_args *va) -{ - struct vnode *vn = va->a_vp; - struct pfs_vdata *pvd = (struct pfs_vdata *)vn->v_data; - struct pfs_node *pn = pvd->pvd_pn; - struct proc *proc = NULL; - int error; - - PFS_TRACE((pd->pn_name)); - - if (pn->pn_refreshlabel == NULL) { - mac_update_vnode_from_mount(vn, vn->v_mount); - return (0); - } - - /* - * This is necessary because either process' privileges may - * have changed since the last open() call. - */ - if (!pfs_visible(curthread, pn, pvd->pvd_pid)) - PFS_RETURN (EIO); - - /* XXX duplicate bits of pfs_visible() */ - if (pvd->pvd_pid != NO_PID) { - if ((proc = pfind(pvd->pvd_pid)) == NULL) - PFS_RETURN (EIO); - _PHOLD(proc); - PROC_UNLOCK(proc); - } - - error = (pn->pn_refreshlabel)(curthread, proc, vn, pn, va->a_cred); - - if (proc != NULL) - PRELE(proc); - - PFS_RETURN (error); -} -#endif - /* * Set attributes */ ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#326 (text+ko) ==== @@ -147,23 +147,12 @@ &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); -static int mac_label_size = sizeof(struct oldmac); -SYSCTL_INT(_security_mac, OID_AUTO, label_size, CTLFLAG_RD, - &mac_label_size, 0, "Pre-compiled MAC label size"); - static int mac_cache_fslabel_in_vnode = 1; SYSCTL_INT(_security_mac, OID_AUTO, cache_fslabel_in_vnode, CTLFLAG_RW, &mac_cache_fslabel_in_vnode, 0, "Cache mount fslabel in vnode"); TUNABLE_INT("security.mac.cache_fslabel_in_vnode", &mac_cache_fslabel_in_vnode); -static int mac_vnode_label_cache_hits = 0; -SYSCTL_INT(_security_mac, OID_AUTO, vnode_label_cache_hits, CTLFLAG_RD, - &mac_vnode_label_cache_hits, 0, "Cache hits on vnode labels"); -static int mac_vnode_label_cache_misses = 0; -SYSCTL_INT(_security_mac, OID_AUTO, vnode_label_cache_misses, CTLFLAG_RD, - &mac_vnode_label_cache_misses, 0, "Cache misses on vnode labels"); - static int mac_mmap_revocation = 0; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " @@ -218,12 +207,9 @@ #endif static int error_select(int error1, int error2); -static int mac_externalize_vnode_oldmac(struct label *label, - struct oldmac *extmac); static int mac_policy_register(struct mac_policy_conf *mpc); static int mac_policy_unregister(struct mac_policy_conf *mpc); -static int mac_stdcreatevnode_ea(struct vnode *vp); static void mac_check_vnode_mmap_downgrade(struct ucred *cred, struct vnode *vp, int *prot); static void mac_cred_mmapped_drop_perms_recurse(struct thread *td, @@ -231,6 +217,9 @@ static void mac_destroy_socket_label(struct label *label); +static int mac_setlabel_vnode_extattr(struct ucred *cred, + struct vnode *vp, struct label *intlabel); + MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); @@ -635,10 +624,6 @@ mpc->mpc_ops->mpo_externalize_vnode_label = mpe->mpe_function; break; - case MAC_EXTERNALIZE_VNODE_OLDMAC: - mpc->mpc_ops->mpo_externalize_vnode_oldmac = - mpe->mpe_function; - break; case MAC_INTERNALIZE_CRED_LABEL: mpc->mpc_ops->mpo_internalize_cred_label = mpe->mpe_function; @@ -675,14 +660,6 @@ mpc->mpc_ops->mpo_create_devfs_vnode = mpe->mpe_function; break; - case MAC_STDCREATEVNODE_EA: - mpc->mpc_ops->mpo_stdcreatevnode_ea = - mpe->mpe_function; - break; - case MAC_CREATE_VNODE: - mpc->mpc_ops->mpo_create_vnode = - mpe->mpe_function; - break; case MAC_CREATE_MOUNT: mpc->mpc_ops->mpo_create_mount = mpe->mpe_function; @@ -699,20 +676,24 @@ mpc->mpc_ops->mpo_update_devfsdirent = mpe->mpe_function; break; - case MAC_UPDATE_PROCFSVNODE: - mpc->mpc_ops->mpo_update_procfsvnode = + case MAC_ASSOCIATE_VNODE_DEVFS: + mpc->mpc_ops->mpo_associate_vnode_devfs = + mpe->mpe_function; + break; + case MAC_ASSOCIATE_VNODE_EXTATTR: + mpc->mpc_ops->mpo_associate_vnode_extattr = mpe->mpe_function; break; - case MAC_UPDATE_VNODE_FROM_EXTATTR: - mpc->mpc_ops->mpo_update_vnode_from_extattr = + case MAC_ASSOCIATE_VNODE_SINGLELABEL: + mpc->mpc_ops->mpo_associate_vnode_singlelabel = mpe->mpe_function; break; - case MAC_UPDATE_VNODE_FROM_EXTERNALIZED: - mpc->mpc_ops->mpo_update_vnode_from_externalized = + case MAC_CREATE_VNODE_EXTATTR: + mpc->mpc_ops->mpo_create_vnode_extattr = mpe->mpe_function; break; - case MAC_UPDATE_VNODE_FROM_MOUNT: - mpc->mpc_ops->mpo_update_vnode_from_mount = + case MAC_SETLABEL_VNODE_EXTATTR: + mpc->mpc_ops->mpo_setlabel_vnode_extattr = mpe->mpe_function; break; case MAC_CREATE_MBUF_FROM_SOCKET: @@ -1683,16 +1664,6 @@ } static int -mac_externalize_vnode_oldmac(struct label *label, struct oldmac *extmac) -{ - int error; - - MAC_CHECK(externalize_vnode_oldmac, label, extmac); - - return (error); -} - -static int mac_internalize_cred_label(struct label *label, char *string) { int error; @@ -1791,285 +1762,120 @@ } void -mac_update_procfsvnode(struct vnode *vp, struct ucred *cred) +mac_associate_vnode_devfs(struct mount *mp, struct devfs_dirent *de, + struct vnode *vp) { - MAC_PERFORM(update_procfsvnode, vp, &vp->v_label, cred); + MAC_PERFORM(associate_vnode_devfs, mp, &mp->mnt_fslabel, de, + &de->de_label, vp, &vp->v_label); } -/* - * Support callout for policies that manage their own externalization - * using extended attributes. - */ -static int -mac_update_vnode_from_extattr(struct vnode *vp, struct mount *mp) +int +mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp) { int error; - MAC_CHECK(update_vnode_from_extattr, vp, &vp->v_label, mp, - &mp->mnt_fslabel); + ASSERT_VOP_LOCKED(vp, "mac_associate_vnode_extattr"); - return (error); -} - -/* - * Given an externalized mac label, internalize it and stamp it on a - * vnode. - */ -static int -mac_update_vnode_from_externalized(struct vnode *vp, struct oldmac *extmac) -{ - int error; + MAC_CHECK(associate_vnode_extattr, mp, &mp->mnt_fslabel, vp, + &vp->v_label); - MAC_CHECK(update_vnode_from_externalized, vp, &vp->v_label, extmac); - return (error); } -/* - * Call out to individual policies to update the label in a vnode from - * the mountpoint. - */ void -mac_update_vnode_from_mount(struct vnode *vp, struct mount *mp) +mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp) { - MAC_PERFORM(update_vnode_from_mount, vp, &vp->v_label, mp, - &mp->mnt_fslabel); - - ASSERT_VOP_LOCKED(vp, "mac_update_vnode_from_mount"); - if (mac_cache_fslabel_in_vnode) - vp->v_vflag |= VV_CACHEDLABEL; + MAC_PERFORM(associate_vnode_singlelabel, mp, &mp->mnt_fslabel, vp, + &vp->v_label); } -/* - * Implementation of VOP_REFRESHLABEL() that relies on extended attributes - * to store label data. Can be referenced by filesystems supporting - * extended attributes. - */ int -vop_stdrefreshlabel_ea(struct vop_refreshlabel_args *ap) +mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, + struct vnode *dvp, struct vnode *vp, struct componentname *cnp) { - struct vnode *vp = ap->a_vp; - struct oldmac extmac; - int buflen, error; + int error; - ASSERT_VOP_LOCKED(vp, "vop_stdrefreshlabel_ea"); + ASSERT_VOP_LOCKED(dvp, "mac_create_vnode_extattr"); + ASSERT_VOP_LOCKED(vp, "mac_create_vnode_extattr"); - /* - * Call out to external policies first. Order doesn't really - * matter, as long as failure of one assures failure of all. - */ - error = mac_update_vnode_from_extattr(vp, vp->v_mount); - if (error) + error = VOP_OPENEXTATTR(vp, cred, curthread); + if (error == EOPNOTSUPP) { + /* XXX: Optionally abort if transactions not supported. */ + printf("Warning: transactions not supported in EA write.\n"); + } else if (error) return (error); - buflen = sizeof(extmac); - error = vn_extattr_get(vp, IO_NODELOCKED, - FREEBSD_MAC_EXTATTR_NAMESPACE, FREEBSD_MAC_EXTATTR_NAME, &buflen, - (char *)&extmac, curthread); - switch (error) { - case 0: - /* Got it */ - break; + MAC_CHECK(create_vnode_extattr, cred, mp, &mp->mnt_fslabel, + dvp, &dvp->v_label, vp, &vp->v_label, cnp); - case ENOATTR: - /* - * Use the label from the mount point. - */ - mac_update_vnode_from_mount(vp, vp->v_mount); - return (0); - - case EOPNOTSUPP: - default: - /* Fail horribly. */ + if (error) { + VOP_CLOSEEXTATTR(vp, 0, NOCRED, curthread); return (error); } - if (buflen != sizeof(extmac)) - error = EPERM; /* Fail very closed. */ - if (error == 0) - error = mac_update_vnode_from_externalized(vp, &extmac); - if (error == 0) - vp->v_vflag |= VV_CACHEDLABEL; - else { - struct vattr va; + error = VOP_CLOSEEXTATTR(vp, 1, NOCRED, curthread); - printf("Corrupted label on %s", - vp->v_mount->mnt_stat.f_mntonname); - if (VOP_GETATTR(vp, &va, curthread->td_ucred, curthread) == 0) - printf(" inum %ld", va.va_fileid); -#ifdef MAC_DEBUG - if (mac_debug_label_fallback) { - printf(", falling back.\n"); - mac_update_vnode_from_mount(vp, vp->v_mount); - error = 0; - } else { -#endif - printf(".\n"); - error = EPERM; -#ifdef MAC_DEBUG - } -#endif - } + if (error == EOPNOTSUPP) + error = 0; /* XXX */ return (error); } -/* - * Make sure the vnode label is up-to-date. If EOPNOTSUPP, then we handle - * the labeling activity outselves. Filesystems should be careful not - * to change their minds regarding whether they support vop_refreshlabel() - * for a vnode or not. Don't cache the vnode here, allow the file - * system code to determine if it's safe to cache. If we update from - * the mount, don't cache since a change to the mount label should affect - * all vnodes. - */ static int -vn_refreshlabel(struct vnode *vp, struct ucred *cred) +mac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, + struct label *intlabel) { int error; - ASSERT_VOP_LOCKED(vp, "vn_refreshlabel"); + ASSERT_VOP_LOCKED(vp, "mac_setlabel_vnode_extattr"); - if (vp->v_mount == NULL) { -/* - Eventually, we probably want to special-case refreshing - of deadfs vnodes, and if there's a lock-free race somewhere, - that case might be handled here. + error = VOP_OPENEXTATTR(vp, cred, curthread); + if (error == EOPNOTSUPP) { + /* XXX: Optionally abort if transactions not supported. */ + printf("Warning: transactions not supported in EA write.\n"); + } else if (error) + return (error); - mac_update_vnode_deadfs(vp); - return (0); - */ - /* printf("vn_refreshlabel: null v_mount\n"); */ - if (vp->v_type != VNON) - printf( - "vn_refreshlabel: null v_mount with non-VNON\n"); - return (EBADF); - } + MAC_CHECK(setlabel_vnode_extattr, cred, vp, &vp->v_label, intlabel); - if (vp->v_vflag & VV_CACHEDLABEL) { - mac_vnode_label_cache_hits++; - return (0); - } else - mac_vnode_label_cache_misses++; - - if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { - mac_update_vnode_from_mount(vp, vp->v_mount); - return (0); - } - - error = VOP_REFRESHLABEL(vp, cred, curthread); - switch (error) { - case EOPNOTSUPP: - /* - * If labels are not supported on this vnode, fall back to - * the label in the mount and propagate it to the vnode. - * There should probably be some sort of policy/flag/decision - * about doing this. - */ - mac_update_vnode_from_mount(vp, vp->v_mount); - error = 0; - default: + if (error) { + VOP_CLOSEEXTATTR(vp, 0, NOCRED, curthread); return (error); } -} -/* - * Helper function for file systems using the vop_std*_ea() calls. This - * function must be called after EA service is available for the vnode, - * but before it's hooked up to the namespace so that the node persists - * if there's a crash, or before it can be accessed. On successful - * commit of the label to disk (etc), do cache the label. - */ -int -vop_stdcreatevnode_ea(struct vnode *dvp, struct vnode *tvp, struct ucred *cred) -{ - struct oldmac extmac; - int error; + error = VOP_CLOSEEXTATTR(vp, 1, NOCRED, curthread); - ASSERT_VOP_LOCKED(tvp, "vop_stdcreatevnode_ea"); - if ((dvp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { - mac_update_vnode_from_mount(tvp, tvp->v_mount); - } else { - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); + if (error == EOPNOTSUPP) + error = 0; /* XXX */ - /* - * Stick the label in the vnode. Then try to write to - * disk. If we fail, return a failure to abort the - * create operation. Really, this failure shouldn't - * happen except in fairly unusual circumstances (out - * of disk, etc). - */ - mac_create_vnode(cred, dvp, tvp); - - error = mac_stdcreatevnode_ea(tvp); - if (error) - return (error); - - /* - * XXX: Eventually this will go away and all policies will - * directly manage their extended attributes. - */ - error = mac_externalize_vnode_oldmac(&tvp->v_label, &extmac); - if (error) - return (error); - - error = vn_extattr_set(tvp, IO_NODELOCKED, - FREEBSD_MAC_EXTATTR_NAMESPACE, FREEBSD_MAC_EXTATTR_NAME, - sizeof(extmac), (char *)&extmac, curthread); - if (error == 0) - tvp->v_vflag |= VV_CACHEDLABEL; - else { -#if 0 - /* - * In theory, we could have fall-back behavior here. - * It would probably be incorrect. - */ -#endif - return (error); - } - } - - return (0); + return (error); } void mac_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *shelllabel, struct image_params *imgp) { - int error; ASSERT_VOP_LOCKED(vp, "mac_execve_transition"); if (!mac_enforce_process && !mac_enforce_fs) return; - error = vn_refreshlabel(vp, old); - if (error) { - printf("mac_execve_transition: vn_refreshlabel returned %d\n", - error); - printf("mac_execve_transition: using old vnode label\n"); - } - MAC_PERFORM(execve_transition, old, new, vp, &vp->v_label, shelllabel, - imgp); + MAC_PERFORM(execve_transition, old, new, vp, &vp->v_label, + shelllabel, imgp); } int mac_execve_will_transition(struct ucred *old, struct vnode *vp, struct label *shelllabel, struct image_params *imgp) { - int error, result; + int result; if (!mac_enforce_process && !mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, old); - if (error) - return (error); - result = 0; MAC_BOOLEAN(execve_will_transition, ||, old, vp, &vp->v_label, shelllabel, imgp); @@ -2087,10 +1893,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_access, cred, vp, &vp->v_label, flags); return (error); } @@ -2105,10 +1907,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_chdir, cred, dvp, &dvp->v_label); return (error); } @@ -2123,10 +1921,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_chroot, cred, dvp, &dvp->v_label); return (error); } @@ -2142,10 +1936,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_create, cred, dvp, &dvp->v_label, cnp, vap); return (error); } @@ -2162,13 +1952,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_delete, cred, dvp, &dvp->v_label, vp, &vp->v_label, cnp); return (error); @@ -2185,10 +1968,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_deleteacl, cred, vp, &vp->v_label, type); return (error); } @@ -2204,9 +1983,6 @@ if (!mac_enforce_process && !mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); MAC_CHECK(check_vnode_exec, cred, vp, &vp->v_label, imgp); return (error); @@ -2222,10 +1998,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_getacl, cred, vp, &vp->v_label, type); return (error); } @@ -2241,10 +2013,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_getextattr, cred, vp, &vp->v_label, attrnamespace, name, uio); return (error); @@ -2262,14 +2030,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); - - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_link, cred, dvp, &dvp->v_label, vp, &vp->v_label, cnp); return (error); @@ -2286,10 +2046,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_lookup, cred, dvp, &dvp->v_label, cnp); return (error); } @@ -2304,10 +2060,6 @@ if (!mac_enforce_fs || !mac_enforce_vm) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_mmap, cred, vp, &vp->v_label, prot); return (error); } @@ -2338,10 +2090,6 @@ if (!mac_enforce_fs || !mac_enforce_vm) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_mprotect, cred, vp, &vp->v_label, prot); return (error); } @@ -2356,10 +2104,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_open, cred, vp, &vp->v_label, acc_mode); return (error); } @@ -2375,10 +2119,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, active_cred); - if (error) - return (error); - MAC_CHECK(check_vnode_poll, active_cred, file_cred, vp, &vp->v_label); @@ -2396,10 +2136,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, active_cred); - if (error) - return (error); - MAC_CHECK(check_vnode_read, active_cred, file_cred, vp, &vp->v_label); @@ -2416,10 +2152,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_readdir, cred, dvp, &dvp->v_label); return (error); } @@ -2434,10 +2166,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_readlink, cred, vp, &vp->v_label); return (error); } @@ -2450,10 +2178,6 @@ ASSERT_VOP_LOCKED(vp, "mac_check_vnode_relabel"); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_relabel, cred, vp, &vp->v_label, newlabel); return (error); @@ -2471,13 +2195,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_rename_from, cred, dvp, &dvp->v_label, vp, &vp->v_label, cnp); return (error); @@ -2495,14 +2212,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(dvp, cred); - if (error) - return (error); - if (vp != NULL) { - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - } MAC_CHECK(check_vnode_rename_to, cred, dvp, &dvp->v_label, vp, vp != NULL ? &vp->v_label : NULL, samedir, cnp); return (error); @@ -2518,10 +2227,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_revoke, cred, vp, &vp->v_label); return (error); } @@ -2537,10 +2242,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_setacl, cred, vp, &vp->v_label, type, acl); return (error); } @@ -2556,10 +2257,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_setextattr, cred, vp, &vp->v_label, attrnamespace, name, uio); return (error); @@ -2575,10 +2272,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_setflags, cred, vp, &vp->v_label, flags); return (error); } @@ -2593,10 +2286,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_setmode, cred, vp, &vp->v_label, mode); return (error); } @@ -2612,10 +2301,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_setowner, cred, vp, &vp->v_label, uid, gid); return (error); } @@ -2631,10 +2316,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, cred); - if (error) - return (error); - MAC_CHECK(check_vnode_setutimes, cred, vp, &vp->v_label, atime, mtime); return (error); @@ -2651,10 +2332,6 @@ if (!mac_enforce_fs) return (0); - error = vn_refreshlabel(vp, active_cred); - if (error) - return (error); - MAC_CHECK(check_vnode_stat, active_cred, file_cred, vp, &vp->v_label); return (error); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 11:18: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D39D37B404; Wed, 23 Oct 2002 11:18:04 -0700 (PDT) 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 12D3637B401 for ; Wed, 23 Oct 2002 11:18:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9221043E6A for ; Wed, 23 Oct 2002 11:18:03 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NIHNmV019127 for ; Wed, 23 Oct 2002 11:17:23 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NIHNcs019124 for perforce@freebsd.org; Wed, 23 Oct 2002 11:17:23 -0700 (PDT) Date: Wed, 23 Oct 2002 11:17:23 -0700 (PDT) Message-Id: <200210231817.g9NIHNcs019124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 19979 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19979 Change 19979 by jhb@jhb_laptop on 2002/10/23 11:17:16 Axe P1003B option. Affected files ... .. //depot/projects/smpng/sys/alpha/conf/ALPHA#5 edit .. //depot/projects/smpng/sys/alpha/conf/ALPHA-up#4 edit .. //depot/projects/smpng/sys/i386/conf/X86#4 edit .. //depot/projects/smpng/sys/i386/conf/X86-up#4 edit Differences ... ==== //depot/projects/smpng/sys/alpha/conf/ALPHA#5 (text+ko) ==== @@ -27,7 +27,6 @@ options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores -options P1003_1B #Posix P1003_1B real-time extentions options _KPOSIX_PRIORITY_SCHEDULING options INCLUDE_CONFIG_FILE options VFS_AIO ==== //depot/projects/smpng/sys/alpha/conf/ALPHA-up#4 (text+ko) ==== @@ -27,7 +27,6 @@ options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores -options P1003_1B #Posix P1003_1B real-time extentions options _KPOSIX_PRIORITY_SCHEDULING options INCLUDE_CONFIG_FILE options VFS_AIO ==== //depot/projects/smpng/sys/i386/conf/X86#4 (text+ko) ==== @@ -22,7 +22,6 @@ options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores -options P1003_1B #Posix P1003_1B real-time extensions options _KPOSIX_PRIORITY_SCHEDULING options KBD_INSTALL_CDEV # install a CDEV entry in /dev options INCLUDE_CONFIG_FILE ==== //depot/projects/smpng/sys/i386/conf/X86-up#4 (text+ko) ==== @@ -22,7 +22,6 @@ options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores -options P1003_1B #Posix P1003_1B real-time extensions options _KPOSIX_PRIORITY_SCHEDULING options KBD_INSTALL_CDEV # install a CDEV entry in /dev options INCLUDE_CONFIG_FILE To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 11:25:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAE3A37B404; Wed, 23 Oct 2002 11:25:13 -0700 (PDT) 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 537CB37B401 for ; Wed, 23 Oct 2002 11:25:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0252C43E4A for ; Wed, 23 Oct 2002 11:25:13 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NIOXmV019677 for ; Wed, 23 Oct 2002 11:24:33 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NIOWv8019674 for perforce@freebsd.org; Wed, 23 Oct 2002 11:24:32 -0700 (PDT) Date: Wed, 23 Oct 2002 11:24:32 -0700 (PDT) Message-Id: <200210231824.g9NIOWv8019674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 19980 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19980 Change 19980 by jhb@jhb_laptop on 2002/10/23 11:24:10 Catch up to SPARC64 GENERIC. Affected files ... .. //depot/projects/smpng/sys/sparc64/conf/SPARC64#8 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/conf/SPARC64#8 (text+ko) ==== @@ -1,69 +1,110 @@ +# baldwin.cx sparc64 SMP test machines + machine sparc64 cpu SUN4U ident SPARC64 maxusers 0 -makeoptions DEBUG=-g -makeoptions KERNEL=smpng +#To statically compile in device wiring instead of /boot/device.hints +#hints "GENERIC.hints" #Default places to look for devices. + +makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions NO_MODULES=yes +makeoptions KERNEL=smpng + +# Platforms supported +# At this time all platforms are supported, as-is. -options INET -options FFS -options SOFTUPDATES -options NFSCLIENT -options NFSSERVER -options CD9660 -options PROCFS -options PSEUDOFS -options SYSVSHM -options SYSVMSG -options SYSVSEM +options INET #InterNETworking +options INET6 #IPv6 communications protocols +options FFS #Berkeley Fast Filesystem +options SOFTUPDATES #Enable FFS soft updates support +options UFS_ACL #Support for access control lists +options UFS_DIRHASH #Improve performance on big directories +options NFSCLIENT #Network Filesystem Client +options NFSSERVER #Network Filesystem Server +options NFS_ROOT #NFS usable as root device +#options MSDOSFS #MSDOS Filesystem +options CD9660 #ISO 9660 Filesystem +options PROCFS #Process filesystem (requires PSEUDOFS) +options PSEUDOFS #Pseudo-filesystem framework +options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] +options KTRACE #ktrace(1) syscall trace support +options SYSVSHM #SYSV-style shared memory +options SYSVMSG #SYSV-style message queues +options SYSVSEM #SYSV-style semaphores +#options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -options DDB -options BREAK_TO_DEBUGGER -options INVARIANTS -options INVARIANT_SUPPORT -options WITNESS +# Debugging for use in -current +options DDB #Enable the kernel debugger +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +options WITNESS #Enable checks to detect deadlocks and cycles -options SMP +# To make an SMP kernel, the next line is needed +options SMP # Symmetric MultiProcessor Kernel -device apb +# Standard busses +device apb # Sun APB PCI-PCI bridge device ebus device pci +# Floppy drives +#device fdc + +# ATA and ATAPI devices device ata -device atadisk -device atapicd +device atadisk # ATA disk drives +device atapicd # ATAPI CDROM drives +#device atapifd # ATAPI floppy drives +#device atapist # ATAPI tape drives +# Do NOT enable ATA_STATIC_ID -- cmd646 controller will be !ata2!, +# and you will not mount an ATA /. +#options ATA_STATIC_ID #Static device numbering + +# SCSI Controllers +device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') -device sym +# SCSI peripherals +device scbus # SCSI bus (required) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct SCSI access) +#device ses # SCSI Environmental Services (and SAF-TE) -device scbus -device da -device cd +device ofw_console # OpenBoot firmware console device -device ofw_console +# Builtin hardware +device genclock # Generic clock interface +device eeprom # eeprom (really an ebus driver for the MK48Txx) +device "mk48txx" # Mostek MK48T02, MK48T08, MK48T59 clock -device genclock -device eeprom -device "mk48txx" +# Serial (COM) ports +#device sio # 8250, 16[45]50 based serial ports +#device sab # Siemens SAB82532 based serial ports -device miibus -device hme +# PCI Ethernet NICs that use the common MII bus controller code. +device miibus # MII bus support +device hme # Sun HME (Happy Meal Ethernet) -device random -device loop -device ether -device pty -device md +# Pseudo devices - the number indicates how many units to allocated. +device random # Entropy device +device loop # Network loopback +device ether # Ethernet support +device pty # Pseudo-ttys (telnet etc) +device md # Memory "disks" +device gif # IPv6 and IPv4 tunneling +device faith # IPv6-to-IPv4 relaying/(translation) -device bpf +# The `bpf' device enables the Berkeley Packet Filter. +# Be aware of the administrative consequences of enabling this! +device bpf #Berkeley packet filter -makeoptions NO_WERROR=true -makeoptions NO_MODULES=true +options KTR +options KTR_COMPILE=0xffffffff +options KTR_ENTRIES=8192 +options KTR_MASK=KTR_TRAP -#options ATA_ENABLE_BUSMASTER -options DEBUGGER_ON_POWERFAIL +options OFW_PCI_DEBUG -options KTR -options KTR_COMPILE=0xffffffff -options KTR_ENTRIES=8192 -options KTR_MASK=(KTR_PROC|KTR_TRAP) +options DEBUGGER_ON_POWERFAIL To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 11:26:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D424337B404; Wed, 23 Oct 2002 11:26:15 -0700 (PDT) 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 8347637B401 for ; Wed, 23 Oct 2002 11:26:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 241A043E4A for ; Wed, 23 Oct 2002 11:26:15 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NIPZmV019742 for ; Wed, 23 Oct 2002 11:25:35 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NIPYK5019739 for perforce@freebsd.org; Wed, 23 Oct 2002 11:25:34 -0700 (PDT) Date: Wed, 23 Oct 2002 11:25:34 -0700 (PDT) Message-Id: <200210231825.g9NIPYK5019739@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 19981 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19981 Change 19981 by jhb@jhb_laptop on 2002/10/23 11:25:25 Catch up to GENERIC, turn on UFS_ACL and UFS_DIRHASH. Affected files ... .. //depot/projects/smpng/sys/alpha/conf/ALPHA#6 edit .. //depot/projects/smpng/sys/alpha/conf/ALPHA-up#5 edit .. //depot/projects/smpng/sys/i386/conf/X86#5 edit .. //depot/projects/smpng/sys/i386/conf/X86-up#5 edit Differences ... ==== //depot/projects/smpng/sys/alpha/conf/ALPHA#6 (text+ko) ==== @@ -17,6 +17,8 @@ options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support +options UFS_ACL #Support for access control lists +options UFS_DIRHASH #Improve performance on big directories options NFSCLIENT #Network Filesystem Client options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem ==== //depot/projects/smpng/sys/alpha/conf/ALPHA-up#5 (text+ko) ==== @@ -17,6 +17,8 @@ options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support +options UFS_ACL #Support for access control lists +options UFS_DIRHASH #Improve performance on big directories options NFSCLIENT #Network Filesystem Client options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem ==== //depot/projects/smpng/sys/i386/conf/X86#5 (text+ko) ==== @@ -13,6 +13,8 @@ options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support +options UFS_ACL #Support for access control lists +options UFS_DIRHASH #Improve performance on big directories options NFSCLIENT #Network Filesystem Client options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem ==== //depot/projects/smpng/sys/i386/conf/X86-up#5 (text+ko) ==== @@ -13,6 +13,8 @@ options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support +options UFS_ACL #Support for access control lists +options UFS_DIRHASH #Improve performance on big directories options NFSCLIENT #Network Filesystem Client options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 11:47:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA09D37B404; Wed, 23 Oct 2002 11:47:46 -0700 (PDT) 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 4100B37B401 for ; Wed, 23 Oct 2002 11:47:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1143E43E9C for ; Wed, 23 Oct 2002 11:47:43 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NIl3mV021217 for ; Wed, 23 Oct 2002 11:47:03 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NIl2SG021214 for perforce@freebsd.org; Wed, 23 Oct 2002 11:47:02 -0700 (PDT) Date: Wed, 23 Oct 2002 11:47:02 -0700 (PDT) Message-Id: <200210231847.g9NIl2SG021214@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 19984 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19984 Change 19984 by jhb@jhb_laptop on 2002/10/23 11:46:20 Bah, merge-o. Affected files ... .. //depot/projects/smpng/sys/sys/proc.h#62 edit Differences ... ==== //depot/projects/smpng/sys/sys/proc.h#62 (text+ko) ==== @@ -289,7 +289,7 @@ void (*td_switchin)(void); /* (k) Switchin special func. */ struct thread *td_standin; /* (?) use this for an upcall */ u_int td_critnest; /* (k) Critical section nest level. */ -#define td_endzero td_td_base_pri +#define td_endzero td_base_pri /* Copied during fork1() or thread_sched_upcall() */ #define td_startcopy td_endzero To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 12:49: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDE4137B404; Wed, 23 Oct 2002 12:49:01 -0700 (PDT) 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 82E9F37B401 for ; Wed, 23 Oct 2002 12:49:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 368F843E77 for ; Wed, 23 Oct 2002 12:49:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NJmLmV025487 for ; Wed, 23 Oct 2002 12:48:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NJmKKn025484 for perforce@freebsd.org; Wed, 23 Oct 2002 12:48:20 -0700 (PDT) Date: Wed, 23 Oct 2002 12:48:20 -0700 (PDT) Message-Id: <200210231948.g9NJmKKn025484@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 Subject: PERFORCE change 19988 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19988 Change 19988 by rwatson@rwatson_tislabs on 2002/10/23 12:47:58 Possible workaround for a getsysctlbyname() problem: sysctl makes use of a special 0. namespace to handle MIB name lookup and related evil. For now, exempt that namespace from integrity checks. This probably bears revisiting. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#154 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#154 (text+ko) ==== @@ -1864,9 +1864,13 @@ /* * Permit sysctl modification only if Biba-privileged; permit - * read by any process. + * read by any process. Exempt certain management interfaces + * that are used to query MIB state. XXXMAC: This probably + * requires some more review. */ if (new != NULL) { + if (namelen > 0 && name[0] == 0) + return (0); if (!mac_biba_privileged(subj)) return (EPERM); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 13:27:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EF8037B401; Wed, 23 Oct 2002 13:27:53 -0700 (PDT) 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 D58A237B404 for ; Wed, 23 Oct 2002 13:27:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EF6E43E97 for ; Wed, 23 Oct 2002 13:27:49 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NKR9mV028072 for ; Wed, 23 Oct 2002 13:27:09 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NKR8hG028069 for perforce@freebsd.org; Wed, 23 Oct 2002 13:27:08 -0700 (PDT) Date: Wed, 23 Oct 2002 13:27:08 -0700 (PDT) Message-Id: <200210232027.g9NKR8hG028069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 19990 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19990 Change 19990 by jhb@jhb_zion on 2002/10/23 13:27:03 Bah, add a trailing newline to make config(8) happy. Affected files ... .. //depot/projects/smpng/sys/sparc64/conf/SPARC64#9 edit Differences ... ==== //depot/projects/smpng/sys/sparc64/conf/SPARC64#9 (text+ko) ==== @@ -107,4 +107,4 @@ options OFW_PCI_DEBUG -options DEBUGGER_ON_POWERFAIL+options DEBUGGER_ON_POWERFAIL To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 16:42:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6869937B404; Wed, 23 Oct 2002 16:41:55 -0700 (PDT) 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 EF32F37B401 for ; Wed, 23 Oct 2002 16:41:54 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E5C8E43E6E for ; Wed, 23 Oct 2002 16:41:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NNfDmV040778 for ; Wed, 23 Oct 2002 16:41:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NNfCuM040774 for perforce@freebsd.org; Wed, 23 Oct 2002 16:41:12 -0700 (PDT) Date: Wed, 23 Oct 2002 16:41:12 -0700 (PDT) Message-Id: <200210232341.g9NNfCuM040774@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 Subject: PERFORCE change 19999 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19999 Change 19999 by rwatson@rwatson_tislabs on 2002/10/23 16:41:03 Integ FreeBSD tree into TrustedBSD base: loop back a variety of MAC-related changes, including the userland utilities, some library changes (libutil), etc. Affected files ... .. //depot/projects/trustedbsd/base/bin/cat/cat.c#8 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#11 integrate .. //depot/projects/trustedbsd/base/bin/ls/lomac.c#7 integrate .. //depot/projects/trustedbsd/base/bin/ls/lomac.h#3 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#10 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/troffrc#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/kadm_ser_wrap.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/roff/groff/Makefile#4 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/Makefile#6 integrate .. //depot/projects/trustedbsd/base/include/pthread_np.h#4 integrate .. //depot/projects/trustedbsd/base/include/stdlib.h#13 integrate .. //depot/projects/trustedbsd/base/kerberos5/include/version.h#5 integrate .. //depot/projects/trustedbsd/base/kerberosIV/include/version.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/name6.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strcpy.3#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strerror.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcschr.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcscmp.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcsncmp.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcsncpy.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcsrchr.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_cancel.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_error.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_read.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_return.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_suspend.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_waitcomplete.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_write.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/pthread_private.h#10 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/Makefile#4 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/blocks.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/chunk.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/create_chunk.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#11 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/libdisk.h#7 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/tst01.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/write_alpha_disk.c#1 branch .. //depot/projects/trustedbsd/base/lib/libdisk/write_disk.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/write_i386_disk.c#1 branch .. //depot/projects/trustedbsd/base/lib/libdisk/write_pc98_disk.c#1 branch .. //depot/projects/trustedbsd/base/lib/libufs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/lib/libufs/block.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libufs/error.c#1 branch .. //depot/projects/trustedbsd/base/lib/libufs/libufs.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libufs/sblock.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libufs/type.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_class.c#4 integrate .. //depot/projects/trustedbsd/base/lib/msun/src/math.h#6 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/map_object.c#2 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#9 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#29 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#46 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sbin/dumpfs/dumpfs.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/map.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.h#2 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifmac.c#1 branch .. //depot/projects/trustedbsd/base/share/man/man7/firewall.7#5 integrate .. //depot/projects/trustedbsd/base/share/man/man7/ports.7#5 integrate .. //depot/projects/trustedbsd/base/share/man/man7/release.7#7 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#43 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#20 integrate .. //depot/projects/trustedbsd/base/sys/conf/majors#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-all.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-cam.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ic/cd180.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rc/rc.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/rc/rcreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/i386/conf/GENERIC.hints#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#25 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/speaker.h#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/ic/cd180.h#2 delete .. //depot/projects/trustedbsd/base/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/rc.c#7 delete .. //depot/projects/trustedbsd/base/sys/i386/isa/rcreg.h#2 delete .. //depot/projects/trustedbsd/base/sys/kern/imgact_elf.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#19 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mchain.c#8 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#30 integrate .. //depot/projects/trustedbsd/base/sys/modules/mac_biba/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/mac_ifoff/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/mac_mls/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/mac_none/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/mac_test/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/rc/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/trustedbsd/base/sys/pc98/conf/GENERIC.hints#3 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#14 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#13 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#22 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/frame.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/reg.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/ucontext.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.S#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#18 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/intr_machdep.c#12 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#22 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/swtch.S#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tick.c#6 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/signalvar.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/unistd.h#9 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_softdep.c#15 integrate .. //depot/projects/trustedbsd/base/usr.bin/du/du.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/arch.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/compat.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/cond.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/job.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/main.c#13 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/make.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/nonints.h#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/parse.c#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/str.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/suff.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/targ.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/su/su.1#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/su/su.c#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/systat/swap.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/xlint/lint1/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/getfmac/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/getfmac/getfmac.8#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/getfmac/getfmac.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/getpmac/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/getpmac/getpmac.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/setfmac/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/setfmac/setfmac.8#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/setfmac/setfmac.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/setpmac/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/setpmac/setpmac.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/install.c#12 integrate Differences ... ==== //depot/projects/trustedbsd/base/bin/cat/cat.c#8 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.27 2002/07/31 16:50:21 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.28 2002/10/23 10:23:38 markm Exp $"); #include #include @@ -71,7 +71,7 @@ const char *filename; static void usage(void); -static void scanfiles(char **argv, int cooked); +static void scanfiles(char *argv[], int cooked); static void cook_cat(FILE *); static void raw_cat(int); @@ -132,8 +132,8 @@ /* NOTREACHED */ } -void -scanfiles(char **argv, int cooked) +static void +scanfiles(char *argv[], int cooked) { int i = 0; char *path; ==== //depot/projects/trustedbsd/base/bin/df/df.c#11 (text+ko) ==== @@ -48,7 +48,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.43 2002/08/26 04:56:23 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.44 2002/10/23 22:09:05 markm Exp $"); #include #include @@ -381,7 +381,8 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; - static int headerlen, timesthrough; + static int timesthrough; + static size_t headerlen; static const char *header; long used, availblks, inodes; @@ -392,7 +393,7 @@ mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - mwp->total = imax(mwp->total, headerlen); + mwp->total = imax(mwp->total, (int)headerlen); } mwp->used = imax(mwp->used, strlen("Used")); mwp->avail = imax(mwp->avail, strlen("Avail")); @@ -441,7 +442,7 @@ update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp) { static long blocksize; - int dummy; + size_t dummy; if (blocksize == 0) getbsize(&dummy, &blocksize); ==== //depot/projects/trustedbsd/base/bin/ls/lomac.c#7 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include - __FBSDID("$FreeBSD: src/bin/ls/lomac.c,v 1.8 2002/07/10 20:44:54 dillon Exp $"); + __FBSDID("$FreeBSD: src/bin/ls/lomac.c,v 1.9 2002/10/23 10:15:44 markm Exp $"); #include #include @@ -106,7 +106,7 @@ */ char * -get_lattr(FTSENT *ent) +get_lattr(const FTSENT *ent) { char *lattr; ==== //depot/projects/trustedbsd/base/bin/ls/lomac.h#3 (text+ko) ==== @@ -32,9 +32,9 @@ * SUCH DAMAGE. * * $Id: lomac.h,v 1.3 2001/11/26 19:23:02 bfeldman Exp $ - * $FreeBSD: src/bin/ls/lomac.h,v 1.2 2002/03/14 21:51:00 rwatson Exp $ + * $FreeBSD: src/bin/ls/lomac.h,v 1.3 2002/10/23 10:15:44 markm Exp $ */ void lomac_start(void); void lomac_stop(void); -char *get_lattr(FTSENT *); +char *get_lattr(const FTSENT *); ==== //depot/projects/trustedbsd/base/bin/ls/print.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.59 2002/10/18 10:59:45 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.60 2002/10/23 10:20:01 markm Exp $"); #include #include @@ -65,7 +65,7 @@ #include "extern.h" static int printaname(FTSENT *, u_long, u_long); -static void printlink(FTSENT *); +static void printlink(const FTSENT *); static void printtime(time_t); static int printtype(u_int); static void printsize(size_t, off_t); @@ -95,7 +95,7 @@ } unit_t; static unit_t unit_adjust(double *); -static int unitp[] = {NONE, KILO, MEGA, GIGA, TERA, PETA}; +static unit_t unitp[] = {NONE, KILO, MEGA, GIGA, TERA, PETA}; #ifdef COLORLS /* Most of these are taken from */ @@ -522,7 +522,7 @@ { int i; int j; - int len; + size_t len; char c[2]; short legacy_warn = 0; @@ -579,7 +579,7 @@ #endif /* COLORLS */ static void -printlink(FTSENT *p) +printlink(const FTSENT *p) { int lnklen; char name[MAXPATHLEN + 1]; @@ -624,18 +624,18 @@ * especially on huge disks. * */ -unit_t +static unit_t unit_adjust(double *val) { double abval; unit_t unit; - unsigned int unit_sz; + u_int unit_sz; abval = fabs(*val); - unit_sz = abval ? ilogb(abval) / 10 : 0; + unit_sz = abval ? (u_int)ilogb(abval) / 10 : 0; - if (unit_sz >= UNIT_MAX) { + if (unit_sz >= (u_int)UNIT_MAX) { unit = NONE; } else { unit = unitp[unit_sz]; ==== //depot/projects/trustedbsd/base/contrib/groff/tmac/troffrc#5 (text+ko) ==== @@ -1,5 +1,5 @@ .\" Startup file for troff. -.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.12 2002/10/21 12:29:57 ru Exp $ +.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.13 2002/10/23 19:04:00 ru Exp $ . .\" This is tested by pic. .nr 0p 0 @@ -45,7 +45,4 @@ . .\} . -.\" Disable SGR support in grotty(1). -.if n .do output "x X tty: sgr 0 -. .\" Don't let blank lines creep in here. ==== //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#8 (text+ko) ==== @@ -31,8 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#7 $ - * $FreeBSD$ + * $P4: //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_ttyconv.c#8 $ */ #include ==== //depot/projects/trustedbsd/base/crypto/kerberosIV/kadmin/kadm_ser_wrap.c#2 (text+ko) ==== @@ -117,16 +117,25 @@ u_char *retdat, *tmpdat; int retval, retlen; - if (strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) { + if (*dat_len < (KADM_VERSIZE + sizeof(u_int32_t)) + || strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE) != 0) { errpkt(errdat, dat, dat_len, KADM_BAD_VER); return KADM_BAD_VER; } in_len = KADM_VERSIZE; /* get the length */ - if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0) + if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0 || + (r_len > *dat_len - KADM_VERSIZE - sizeof(u_int32_t))) { + errpkt(errdat, dat, dat_len, KADM_LENGTH_ERROR); return KADM_LENGTH_ERROR; + } + in_len += retc; authent.length = *dat_len - r_len - KADM_VERSIZE - sizeof(u_int32_t); + if (authent.length > MAX_KTXT_LEN) { + errpkt(errdat, dat, dat_len, KADM_LENGTH_ERROR); + return KADM_LENGTH_ERROR; + } memcpy(authent.dat, (char *)(*dat) + in_len, authent.length); authent.mbz = 0; /* service key should be set before here */ ==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/roff/groff/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.5 2002/10/21 03:21:50 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.6 2002/10/23 21:28:52 gallatin Exp $ PROG_CXX= groff SRCS= groff.cc pipeline.c @@ -6,10 +6,4 @@ LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} -.if ${MACHINE_ARCH} == "alpha" -#XXXX ld produces only one PT_LOAD segment when this binary -#XXXX is linked dynamically, which confuses the rtld -NOSHARED?= yes -.endif - .include ==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.38 2002/10/13 12:22:57 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.39 2002/10/23 19:04:00 ru Exp $ TMACOWN?= ${BINOWN} TMACGRP?= ${BINGRP} @@ -14,6 +14,7 @@ MLINKS+= groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7 CLEANFILES= ${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} +CLEANFILES+= troffrc-end.patched NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \ me.tmac \ @@ -32,7 +33,7 @@ lbp.tmac \ html.tmac www.tmac \ eqnrc \ - troffrc troffrc-end \ + troffrc \ hyphen.us SPECIALFILES= an.tmac man.tmac s.tmac ms.tmac STRIPFILES= e.tmac doc.tmac mdoc.local @@ -40,6 +41,7 @@ fr.ISO8859-1 ru.KOI8-R all: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} +all: troffrc-end.patched .for f in ${MDOCFILES} ${STRIPFILES} $f-s: $f @@ -53,6 +55,9 @@ ${.ALLSRC} > ${.TARGET} .endfor +troffrc-end.patched: troffrc-end + (cat ${.ALLSRC}; echo ".if n .do nop \X'tty: sgr 0'\c") > ${.TARGET} + beforeinstall: cd ${DIST_DIR}; \ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ @@ -61,6 +66,8 @@ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ hyphen.ru ${DESTDIR}${TMACDIR} cd ${.OBJDIR} + ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + troffrc-end.patched ${DESTDIR}${TMACDIR}/troffrc-end .for f in ${STRIPFILES} ${SPECIALFILES} ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ $f-s ${DESTDIR}${TMACDIR}/$f ==== //depot/projects/trustedbsd/base/include/pthread_np.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread_np.h,v 1.12 2002/05/24 04:35:55 deischen Exp $ + * $FreeBSD: src/include/pthread_np.h,v 1.13 2002/10/22 17:11:49 fjoe Exp $ */ #ifndef _PTHREAD_NP_H_ #define _PTHREAD_NP_H_ @@ -48,11 +48,11 @@ int pthread_multi_np(void); int pthread_mutexattr_getkind_np(pthread_mutexattr_t); int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int); -int pthread_resume_all_np(void); +void pthread_resume_all_np(void); int pthread_resume_np(pthread_t); void pthread_set_name_np(pthread_t, const char *); int pthread_single_np(void); -int pthread_suspend_all_np(void); +void pthread_suspend_all_np(void); int pthread_suspend_np(pthread_t); int pthread_switch_add_np(pthread_switch_routine_t); int pthread_switch_delete_np(pthread_switch_routine_t); ==== //depot/projects/trustedbsd/base/include/stdlib.h#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.44 2002/09/21 22:05:37 bde Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.45 2002/10/23 14:18:07 markm Exp $ */ #ifndef _STDLIB_H_ @@ -227,7 +227,7 @@ arc4random(void); void arc4random_addrandom(unsigned char *dat, int datlen); void arc4random_stir(void); -char *getbsize(int *, long *); +char *getbsize(size_t *, long *); /* getcap(3) functions */ char *cgetcap(char *, const char *, int); int cgetclose(void); ==== //depot/projects/trustedbsd/base/kerberos5/include/version.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $FreeBSD: src/kerberos5/include/version.h,v 1.8 2002/09/19 12:12:26 nectar Exp $ */ -const char *krb4_long_version = "@(#)$Version: krb4-1.0.5 (FreeBSD) $"; -const char *krb4_version = "krb4-1.0.5"; -const char *heimdal_long_version = "@(#)$Version: Heimdal 0.5 (FreeBSD) $"; -const char *heimdal_version = "Heimdal 0.5"; +/* $FreeBSD: src/kerberos5/include/version.h,v 1.9 2002/10/23 06:12:21 assar Exp $ */ +const char *krb4_long_version = "@(#)$Version: krb4-1.0.5fb1 (FreeBSD) $"; +const char *krb4_version = "krb4-1.0.5fb1"; +const char *heimdal_long_version = "@(#)$Version: Heimdal 0.5fb1 (FreeBSD) $"; +const char *heimdal_version = "Heimdal 0.5fb1"; ==== //depot/projects/trustedbsd/base/kerberosIV/include/version.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $FreeBSD: src/kerberosIV/include/version.h,v 1.3 2000/01/09 08:59:34 markm Exp $ */ -char *krb4_long_version = "@(#)$Version: krb4-1.0 by root on greenpeace.grondar.za (i386-unknown-freebsd4.0) Sat Jan 8 19:34:57 SAST 2000 $"; -char *krb4_version = "krb4-1.0"; -char *heimdal_long_version = "@(#)$Version: heimdal-0.1l by root on greenpeace.grondar.za (i386-unknown-freebsd4.0) Sat Jan 8 20:56:02 SAST 2000 $"; -char *heimdal_version = "heimdal-0.1l"; +/* $FreeBSD: src/kerberosIV/include/version.h,v 1.4 2002/10/23 06:12:21 assar Exp $ */ +char *krb4_long_version = "@(#)$Version: krb4-1.0.5 (FreeBSD) $"; +char *krb4_version = "krb4-1.0.5"; +char *heimdal_long_version = "@(#)$Version: Heimdal 0.5fb1 (FreeBSD) $"; +char *heimdal_version = "Heimdal 0.5fb1"; ==== //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getbsize.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.8 2001/10/01 16:08:50 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.9 2002/10/23 14:18:07 markm Exp $ .\" .Dd June 4, 1993 .Dt GETBSIZE 3 @@ -43,7 +43,7 @@ .Sh SYNOPSIS .In stdlib.h .Ft char * -.Fn getbsize "int *headerlenp" "long *blocksizep" +.Fn getbsize "size_t *headerlenp" "long *blocksizep" .Sh DESCRIPTION The .Fn getbsize ==== //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getbsize.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.4 2002/03/22 21:52:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.5 2002/10/23 14:18:07 markm Exp $"); #include #include @@ -44,12 +44,13 @@ char * getbsize(headerlenp, blocksizep) - int *headerlenp; + size_t *headerlenp; long *blocksizep; { static char header[20]; long n, max, mul, blocksize; - char *ep, *p, *form; + char *ep, *p; + const char *form; #define KB (1024L) #define MB (1024L * 1024L) ==== //depot/projects/trustedbsd/base/lib/libc/net/name6.c#7 (text+ko) ==== @@ -94,7 +94,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.29 2002/10/06 08:43:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.30 2002/10/23 10:45:09 ume Exp $"); #include "namespace.h" #include @@ -1529,6 +1529,7 @@ int af; int *errp; int n; + int err; struct hostent *hp; u_char c, *cp; char *bp; @@ -1540,6 +1541,9 @@ querybuf *buf; char qbuf[MAXDNAME+1]; char *hlist[2]; + char *tld6[] = { "ip6.arpa", "ip6.int", NULL }; + char *tld4[] = { "in-addr.arpa", NULL }; + char **tld; addr = va_arg(ap, const void *); addrlen = va_arg(ap, int); @@ -1554,6 +1558,19 @@ return NS_NOTFOUND; #endif + switch (af) { +#ifdef INET6 + case AF_INET6: + tld = tld6; + break; +#endif + case AF_INET: + tld = tld4; + break; + default: + return NS_NOTFOUND; + } + if ((_res.options & RES_INIT) == 0) { if (res_init() < 0) { *errp = h_errno; @@ -1566,67 +1583,76 @@ hbuf.h_length = addrlen; na = 0; - /* XXX assumes that MAXDNAME is big enough */ - n = 0; - bp = qbuf; - cp = (u_char *)addr+addrlen-1; - switch (af) { -#ifdef INET6 - case AF_INET6: - for (; n < addrlen; n++, cp--) { - c = *cp; - *bp++ = hex[c & 0xf]; - *bp++ = '.'; - *bp++ = hex[c >> 4]; - *bp++ = '.'; - } - strcpy(bp, "ip6.int"); - break; -#endif - default: - for (; n < addrlen; n++, cp--) { - c = *cp; - if (c >= 100) - *bp++ = '0' + c / 100; - if (c >= 10) - *bp++ = '0' + (c % 100) / 10; - *bp++ = '0' + c % 10; - *bp++ = '.'; - } - strcpy(bp, "in-addr.arpa"); - break; - } - buf = malloc(sizeof(*buf)); if (buf == NULL) { *errp = NETDB_INTERNAL; return NS_UNAVAIL; } + err = NS_SUCCESS; + for (/* nothing */; *tld; tld++) { + /* + * XXX assumes that MAXDNAME is big enough - error checks + * has been made by callers + */ + n = 0; + bp = qbuf; + cp = (u_char *)addr+addrlen-1; + switch (af) { +#ifdef INET6 + case AF_INET6: + for (; n < addrlen; n++, cp--) { + c = *cp; + *bp++ = hex[c & 0xf]; + *bp++ = '.'; + *bp++ = hex[c >> 4]; + *bp++ = '.'; + } + strcpy(bp, *tld); + break; +#endif + case AF_INET: + for (; n < addrlen; n++, cp--) { + c = *cp; + if (c >= 100) + *bp++ = '0' + c / 100; + if (c >= 10) + *bp++ = '0' + (c % 100) / 10; + *bp++ = '0' + c % 10; + *bp++ = '.'; + } + strcpy(bp, *tld); + break; + } - n = res_query(qbuf, C_IN, T_PTR, buf->buf, sizeof buf->buf); - if (n < 0) { - free(buf); - *errp = h_errno; - return NS_UNAVAIL; - } else if (n > sizeof(buf->buf)) { - free(buf); + n = res_query(qbuf, C_IN, T_PTR, buf->buf, sizeof buf->buf); + if (n < 0) { + *errp = h_errno; + err = NS_UNAVAIL; + continue; + } else if (n > sizeof(buf->buf)) { #if 0 - errno = ERANGE; /* XXX is it OK to set errno here? */ + errno = ERANGE; /* XXX is it OK to set errno here? */ #endif - *errp = NETDB_INTERNAL; - return NS_UNAVAIL; + *errp = NETDB_INTERNAL; + err = NS_UNAVAIL; + continue; + } + hp = getanswer(buf, n, qbuf, T_PTR, &hbuf, errp); + if (!hp) { + err = NS_NOTFOUND; + continue; + } + free(buf); + hbuf.h_addrtype = af; + hbuf.h_length = addrlen; + hbuf.h_addr_list = hlist; + hlist[0] = (char *)addr; + hlist[1] = NULL; + *(struct hostent **)rval = _hpcopy(&hbuf, errp); + return NS_SUCCESS; } - hp = getanswer(buf, n, qbuf, T_PTR, &hbuf, errp); free(buf); - if (!hp) - return NS_NOTFOUND; - hbuf.h_addrtype = af; - hbuf.h_length = addrlen; - hbuf.h_addr_list = hlist; - hlist[0] = (char *)addr; - hlist[1] = NULL; - *(struct hostent **)rval = _hpcopy(&hbuf, errp); - return NS_SUCCESS; + return err; } static void ==== //depot/projects/trustedbsd/base/lib/libc/string/strcpy.3#8 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strcpy.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/strcpy.3,v 1.20 2002/10/10 14:16:08 robert Exp $ +.\" $FreeBSD: src/lib/libc/string/strcpy.3,v 1.21 2002/10/23 08:55:14 des Exp $ .\" .Dd August 9, 2001 .Dt STRCPY 3 @@ -54,36 +54,41 @@ .Fn strncpy "char * restrict dst" "const char * restrict src" "size_t len" .Sh DESCRIPTION The -.Fn stpcpy , +.Fn stpcpy +and .Fn strcpy -function -copies the string +functions +copy the string .Fa src to .Fa dst (including the terminating .Ql \e0 -character). +character.) .Pp The .Fn strncpy -function copies not more than +function copies at most .Fa len characters from .Fa src into -.Fa dst , -appending -.Ql \e0 -characters if +.Fa dst . +If .Fa src is less than .Fa len -characters long, and +characters long, +the remainder of +.Fa dst +is filled with +.Ql \e0 +characters. +Otherwise, +.Fa dst +is .Em not -terminating -.Fa dst -otherwise. +terminated. .Sh RETURN VALUES The .Fn strcpy ==== //depot/projects/trustedbsd/base/lib/libc/string/strerror.3#5 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)strerror.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/string/strerror.3,v 1.18 2002/01/31 13:32:14 jedgar Exp $ +.\" $FreeBSD: src/lib/libc/string/strerror.3,v 1.19 2002/10/23 10:16:21 tjr Exp $ .\" -.Dd November 26, 2001 +.Dd October 22, 2002 .Dt STRERROR 3 .Os .Sh NAME @@ -150,6 +150,14 @@ .Sh SEE ALSO .Xr intro 2 , .Xr psignal 3 +.Sh STANDARDS +The +.Fn perror , +.Fn strerror +and +.Fn strerror_r +functions conform to +.St -p1003.1-2001 . .Sh HISTORY The .Fn strerror @@ -169,6 +177,14 @@ function will return its result in a static buffer which may be overwritten by subsequent calls. .Pp +The +.Fn perror +function is implemented in terms of +.Fn strerror , +hence it uses the same static buffer. +This behaviour is forbidden by +.St -isoC-99 . +.Pp Programs that use the deprecated .Va sys_errlist variable often fail to compile because they declare it ==== //depot/projects/trustedbsd/base/lib/libc/string/wcschr.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c)1999 Citrus Project, + * Copyright (c) 2002 Tim J. Robbins * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,34 +22,20 @@ * 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. - * - * citrus Id: wcschr.c,v 1.2 2000/12/21 05:07:25 itojun Exp */ #include -#if 0 -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: wcschr.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); -#endif /* LIBC_SCCS and not lint */ -#endif -__FBSDID("$FreeBSD: src/lib/libc/string/wcschr.c,v 1.6 2002/09/21 00:29:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/wcschr.c,v 1.7 2002/10/23 10:47:47 tjr Exp $"); #include wchar_t * -wcschr(s, c) - const wchar_t *s; - wchar_t c; +wcschr(const wchar_t *s, wchar_t c) { - const wchar_t *p; - p = s; - while (*p) { - if (*p == c) { - /* LINTED interface specification */ - return (wchar_t *)p; - } - p++; - } - return NULL; + while (*s != c && *s != L'\0') + s++; + if (*s == c) + return ((wchar_t *)s); + return (NULL); } ==== //depot/projects/trustedbsd/base/lib/libc/string/wcscmp.c#5 (text+ko) ==== @@ -38,10 +38,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcmp.c 8.1 (Berkeley) 6/4/93"; #if 0 -__RCSID("$NetBSD$"); +__RCSID("$NetBSD: wcscmp.c,v 1.3 2001/01/05 12:13:12 itojun Exp $"); #endif #endif /* LIBC_SCCS and not lint */ -__FBSDID("$FreeBSD: src/lib/libc/string/wcscmp.c,v 1.6 2002/09/21 00:29:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/wcscmp.c,v 1.7 2002/10/23 11:08:40 tjr Exp $"); #include ==== //depot/projects/trustedbsd/base/lib/libc/string/wcsncmp.c#5 (text+ko) ==== @@ -35,10 +35,10 @@ #if 0 #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strncmp.c 8.1 (Berkeley) 6/4/93"; -__RCSID("$NetBSD$"); +__RCSID("$NetBSD: wcsncmp.c,v 1.3 2001/01/05 12:13:13 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ #endif -__FBSDID("$FreeBSD: src/lib/libc/string/wcsncmp.c,v 1.6 2002/09/21 00:29:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/wcsncmp.c,v 1.7 2002/10/23 11:08:40 tjr Exp $"); #include ==== //depot/projects/trustedbsd/base/lib/libc/string/wcsncpy.c#6 (text+ko) ==== @@ -1,6 +1,9 @@ /*- - * Copyright (c)1999 Citrus Project, - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,11 +13,18 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 16:50:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00BF137B404; Wed, 23 Oct 2002 16:50:06 -0700 (PDT) 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 9ACFB37B401 for ; Wed, 23 Oct 2002 16:50:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89BCF43E6E for ; Wed, 23 Oct 2002 16:50:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NNnOmV043130 for ; Wed, 23 Oct 2002 16:49:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NNnNrg043112 for perforce@freebsd.org; Wed, 23 Oct 2002 16:49:23 -0700 (PDT) Date: Wed, 23 Oct 2002 16:49:23 -0700 (PDT) Message-Id: <200210232349.g9NNnNrg043112@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 Subject: PERFORCE change 20000 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20000 Change 20000 by rwatson@rwatson_tislabs on 2002/10/23 16:48:45 Loop back more MAC stuff (et al) from TrustedBSD base to TrustedBSD MAC tree, including user MAC utilities, login.conf processing in libutil, su, ifconfig, and more. Affected files ... .. //depot/projects/trustedbsd/mac/bin/cat/cat.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/ls/lomac.c#8 branch .. //depot/projects/trustedbsd/mac/bin/ls/lomac.h#4 branch .. //depot/projects/trustedbsd/mac/bin/ls/print.c#11 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/troffrc#5 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/kadm_ser_wrap.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/roff/groff/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/include/pthread_np.h#4 integrate .. //depot/projects/trustedbsd/mac/include/stdlib.h#13 integrate .. //depot/projects/trustedbsd/mac/kerberos5/include/version.h#5 integrate .. //depot/projects/trustedbsd/mac/kerberosIV/include/version.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getbsize.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/getbsize.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/name6.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strcpy.3#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strerror.3#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/wcschr.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/wcscmp.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/wcsncmp.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/wcsncpy.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/wcsrchr.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_cancel.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_error.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_read.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_return.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_suspend.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_waitcomplete.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_write.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/pthread_private.h#10 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/blocks.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/create_chunk.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/libdisk.h#7 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/tst01.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/write_alpha_disk.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libdisk/write_disk.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/write_i386_disk.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libdisk/write_pc98_disk.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libufs/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/block.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/error.c#1 branch .. //depot/projects/trustedbsd/mac/lib/libufs/libufs.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/sblock.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libufs/type.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_class.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/msun/src/math.h#6 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/map_object.c#2 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#9 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#26 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#39 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile#11 integrate .. //depot/projects/trustedbsd/mac/sbin/dumpfs/dumpfs.c#7 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/map.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#12 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.h#4 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifmac.c#10 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/firewall.7#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/ports.7#5 integrate .. //depot/projects/trustedbsd/mac/share/man/man7/release.7#7 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#65 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#18 integrate .. //depot/projects/trustedbsd/mac/sys/conf/majors#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-all.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-cam.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ic/cd180.h#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/rc/rc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/rc/rcreg.h#1 branch .. //depot/projects/trustedbsd/mac/sys/i386/conf/GENERIC.hints#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#26 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/speaker.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/ic/cd180.h#2 delete .. //depot/projects/trustedbsd/mac/sys/i386/isa/pmtimer.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/rc.c#7 delete .. //depot/projects/trustedbsd/mac/sys/i386/isa/rcreg.h#2 delete .. //depot/projects/trustedbsd/mac/sys/kern/imgact_elf.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mutex.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_mchain.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#46 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_biba/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_ifoff/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_mls/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_none/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_test/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/rc/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/net/if_tun.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/conf/GENERIC.hints#3 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#155 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#132 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/conf/GENERIC#21 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/frame.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/reg.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/ucontext.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/exception.S#7 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/genassym.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/intr_machdep.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/machdep.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/swtch.S#3 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/tick.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#190 integrate .. //depot/projects/trustedbsd/mac/sys/sys/signalvar.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/sys/unistd.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_softdep.c#13 integrate .. //depot/projects/trustedbsd/mac/usr.bin/du/du.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/arch.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/compat.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/cond.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/job.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/main.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/make.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/nonints.h#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/parse.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/str.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/suff.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/targ.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/su/su.1#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/su/su.c#14 integrate .. //depot/projects/trustedbsd/mac/usr.bin/systat/swap.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/xlint/lint1/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#17 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/getfmac/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/getfmac/getfmac.8#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/getfmac/getfmac.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/getpmac/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/getpmac/getpmac.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pstat/pstat.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/setfmac/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/setfmac/setfmac.8#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/setfmac/setfmac.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/setpmac/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/setpmac/setpmac.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/install.c#11 integrate Differences ... ==== //depot/projects/trustedbsd/mac/bin/cat/cat.c#8 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.27 2002/07/31 16:50:21 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.28 2002/10/23 10:23:38 markm Exp $"); #include #include @@ -71,7 +71,7 @@ const char *filename; static void usage(void); -static void scanfiles(char **argv, int cooked); +static void scanfiles(char *argv[], int cooked); static void cook_cat(FILE *); static void raw_cat(int); @@ -132,8 +132,8 @@ /* NOTREACHED */ } -void -scanfiles(char **argv, int cooked) +static void +scanfiles(char *argv[], int cooked) { int i = 0; char *path; ==== //depot/projects/trustedbsd/mac/bin/df/df.c#11 (text+ko) ==== @@ -48,7 +48,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.43 2002/08/26 04:56:23 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.44 2002/10/23 22:09:05 markm Exp $"); #include #include @@ -381,7 +381,8 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; - static int headerlen, timesthrough; + static int timesthrough; + static size_t headerlen; static const char *header; long used, availblks, inodes; @@ -392,7 +393,7 @@ mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - mwp->total = imax(mwp->total, headerlen); + mwp->total = imax(mwp->total, (int)headerlen); } mwp->used = imax(mwp->used, strlen("Used")); mwp->avail = imax(mwp->avail, strlen("Avail")); @@ -441,7 +442,7 @@ update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp) { static long blocksize; - int dummy; + size_t dummy; if (blocksize == 0) getbsize(&dummy, &blocksize); ==== //depot/projects/trustedbsd/mac/bin/ls/print.c#11 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.59 2002/10/18 10:59:45 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.60 2002/10/23 10:20:01 markm Exp $"); #include #include @@ -65,7 +65,7 @@ #include "extern.h" static int printaname(FTSENT *, u_long, u_long); -static void printlink(FTSENT *); +static void printlink(const FTSENT *); static void printtime(time_t); static int printtype(u_int); static void printsize(size_t, off_t); @@ -95,7 +95,7 @@ } unit_t; static unit_t unit_adjust(double *); -static int unitp[] = {NONE, KILO, MEGA, GIGA, TERA, PETA}; +static unit_t unitp[] = {NONE, KILO, MEGA, GIGA, TERA, PETA}; #ifdef COLORLS /* Most of these are taken from */ @@ -522,7 +522,7 @@ { int i; int j; - int len; + size_t len; char c[2]; short legacy_warn = 0; @@ -579,7 +579,7 @@ #endif /* COLORLS */ static void -printlink(FTSENT *p) +printlink(const FTSENT *p) { int lnklen; char name[MAXPATHLEN + 1]; @@ -624,18 +624,18 @@ * especially on huge disks. * */ -unit_t +static unit_t unit_adjust(double *val) { double abval; unit_t unit; - unsigned int unit_sz; + u_int unit_sz; abval = fabs(*val); - unit_sz = abval ? ilogb(abval) / 10 : 0; + unit_sz = abval ? (u_int)ilogb(abval) / 10 : 0; - if (unit_sz >= UNIT_MAX) { + if (unit_sz >= (u_int)UNIT_MAX) { unit = NONE; } else { unit = unitp[unit_sz]; ==== //depot/projects/trustedbsd/mac/contrib/groff/tmac/troffrc#5 (text+ko) ==== @@ -1,5 +1,5 @@ .\" Startup file for troff. -.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.12 2002/10/21 12:29:57 ru Exp $ +.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.13 2002/10/23 19:04:00 ru Exp $ . .\" This is tested by pic. .nr 0p 0 @@ -45,7 +45,4 @@ . .\} . -.\" Disable SGR support in grotty(1). -.if n .do output "x X tty: sgr 0 -. .\" Don't let blank lines creep in here. ==== //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#8 (text+ko) ==== @@ -31,8 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#7 $ - * $FreeBSD$ + * $P4: //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_ttyconv.c#8 $ */ #include ==== //depot/projects/trustedbsd/mac/crypto/kerberosIV/kadmin/kadm_ser_wrap.c#2 (text+ko) ==== @@ -117,16 +117,25 @@ u_char *retdat, *tmpdat; int retval, retlen; - if (strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE)) { + if (*dat_len < (KADM_VERSIZE + sizeof(u_int32_t)) + || strncmp(KADM_VERSTR, (char *)*dat, KADM_VERSIZE) != 0) { errpkt(errdat, dat, dat_len, KADM_BAD_VER); return KADM_BAD_VER; } in_len = KADM_VERSIZE; /* get the length */ - if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0) + if ((retc = stv_long(*dat, &r_len, in_len, *dat_len)) < 0 || + (r_len > *dat_len - KADM_VERSIZE - sizeof(u_int32_t))) { + errpkt(errdat, dat, dat_len, KADM_LENGTH_ERROR); return KADM_LENGTH_ERROR; + } + in_len += retc; authent.length = *dat_len - r_len - KADM_VERSIZE - sizeof(u_int32_t); + if (authent.length > MAX_KTXT_LEN) { + errpkt(errdat, dat, dat_len, KADM_LENGTH_ERROR); + return KADM_LENGTH_ERROR; + } memcpy(authent.dat, (char *)(*dat) + in_len, authent.length); authent.mbz = 0; /* service key should be set before here */ ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/roff/groff/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.5 2002/10/21 03:21:50 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.6 2002/10/23 21:28:52 gallatin Exp $ PROG_CXX= groff SRCS= groff.cc pipeline.c @@ -6,10 +6,4 @@ LDADD= ${LIBGROFF} -lm CLEANFILES= ${MAN} -.if ${MACHINE_ARCH} == "alpha" -#XXXX ld produces only one PT_LOAD segment when this binary -#XXXX is linked dynamically, which confuses the rtld -NOSHARED?= yes -.endif - .include ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.38 2002/10/13 12:22:57 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.39 2002/10/23 19:04:00 ru Exp $ TMACOWN?= ${BINOWN} TMACGRP?= ${BINGRP} @@ -14,6 +14,7 @@ MLINKS+= groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7 CLEANFILES= ${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} +CLEANFILES+= troffrc-end.patched NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \ me.tmac \ @@ -32,7 +33,7 @@ lbp.tmac \ html.tmac www.tmac \ eqnrc \ - troffrc troffrc-end \ + troffrc \ hyphen.us SPECIALFILES= an.tmac man.tmac s.tmac ms.tmac STRIPFILES= e.tmac doc.tmac mdoc.local @@ -40,6 +41,7 @@ fr.ISO8859-1 ru.KOI8-R all: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} +all: troffrc-end.patched .for f in ${MDOCFILES} ${STRIPFILES} $f-s: $f @@ -53,6 +55,9 @@ ${.ALLSRC} > ${.TARGET} .endfor +troffrc-end.patched: troffrc-end + (cat ${.ALLSRC}; echo ".if n .do nop \X'tty: sgr 0'\c") > ${.TARGET} + beforeinstall: cd ${DIST_DIR}; \ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ @@ -61,6 +66,8 @@ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ hyphen.ru ${DESTDIR}${TMACDIR} cd ${.OBJDIR} + ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ + troffrc-end.patched ${DESTDIR}${TMACDIR}/troffrc-end .for f in ${STRIPFILES} ${SPECIALFILES} ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ $f-s ${DESTDIR}${TMACDIR}/$f ==== //depot/projects/trustedbsd/mac/include/pthread_np.h#4 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread_np.h,v 1.12 2002/05/24 04:35:55 deischen Exp $ + * $FreeBSD: src/include/pthread_np.h,v 1.13 2002/10/22 17:11:49 fjoe Exp $ */ #ifndef _PTHREAD_NP_H_ #define _PTHREAD_NP_H_ @@ -48,11 +48,11 @@ int pthread_multi_np(void); int pthread_mutexattr_getkind_np(pthread_mutexattr_t); int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int); -int pthread_resume_all_np(void); +void pthread_resume_all_np(void); int pthread_resume_np(pthread_t); void pthread_set_name_np(pthread_t, const char *); int pthread_single_np(void); -int pthread_suspend_all_np(void); +void pthread_suspend_all_np(void); int pthread_suspend_np(pthread_t); int pthread_switch_add_np(pthread_switch_routine_t); int pthread_switch_delete_np(pthread_switch_routine_t); ==== //depot/projects/trustedbsd/mac/include/stdlib.h#13 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.44 2002/09/21 22:05:37 bde Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.45 2002/10/23 14:18:07 markm Exp $ */ #ifndef _STDLIB_H_ @@ -227,7 +227,7 @@ arc4random(void); void arc4random_addrandom(unsigned char *dat, int datlen); void arc4random_stir(void); -char *getbsize(int *, long *); +char *getbsize(size_t *, long *); /* getcap(3) functions */ char *cgetcap(char *, const char *, int); int cgetclose(void); ==== //depot/projects/trustedbsd/mac/kerberos5/include/version.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $FreeBSD: src/kerberos5/include/version.h,v 1.8 2002/09/19 12:12:26 nectar Exp $ */ -const char *krb4_long_version = "@(#)$Version: krb4-1.0.5 (FreeBSD) $"; -const char *krb4_version = "krb4-1.0.5"; -const char *heimdal_long_version = "@(#)$Version: Heimdal 0.5 (FreeBSD) $"; -const char *heimdal_version = "Heimdal 0.5"; +/* $FreeBSD: src/kerberos5/include/version.h,v 1.9 2002/10/23 06:12:21 assar Exp $ */ +const char *krb4_long_version = "@(#)$Version: krb4-1.0.5fb1 (FreeBSD) $"; +const char *krb4_version = "krb4-1.0.5fb1"; +const char *heimdal_long_version = "@(#)$Version: Heimdal 0.5fb1 (FreeBSD) $"; +const char *heimdal_version = "Heimdal 0.5fb1"; ==== //depot/projects/trustedbsd/mac/kerberosIV/include/version.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $FreeBSD: src/kerberosIV/include/version.h,v 1.3 2000/01/09 08:59:34 markm Exp $ */ -char *krb4_long_version = "@(#)$Version: krb4-1.0 by root on greenpeace.grondar.za (i386-unknown-freebsd4.0) Sat Jan 8 19:34:57 SAST 2000 $"; -char *krb4_version = "krb4-1.0"; -char *heimdal_long_version = "@(#)$Version: heimdal-0.1l by root on greenpeace.grondar.za (i386-unknown-freebsd4.0) Sat Jan 8 20:56:02 SAST 2000 $"; -char *heimdal_version = "heimdal-0.1l"; +/* $FreeBSD: src/kerberosIV/include/version.h,v 1.4 2002/10/23 06:12:21 assar Exp $ */ +char *krb4_long_version = "@(#)$Version: krb4-1.0.5 (FreeBSD) $"; +char *krb4_version = "krb4-1.0.5"; +char *heimdal_long_version = "@(#)$Version: Heimdal 0.5fb1 (FreeBSD) $"; +char *heimdal_version = "Heimdal 0.5fb1"; ==== //depot/projects/trustedbsd/mac/lib/libc/gen/getbsize.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getbsize.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.8 2001/10/01 16:08:50 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.9 2002/10/23 14:18:07 markm Exp $ .\" .Dd June 4, 1993 .Dt GETBSIZE 3 @@ -43,7 +43,7 @@ .Sh SYNOPSIS .In stdlib.h .Ft char * -.Fn getbsize "int *headerlenp" "long *blocksizep" +.Fn getbsize "size_t *headerlenp" "long *blocksizep" .Sh DESCRIPTION The .Fn getbsize ==== //depot/projects/trustedbsd/mac/lib/libc/gen/getbsize.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getbsize.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.4 2002/03/22 21:52:05 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.5 2002/10/23 14:18:07 markm Exp $"); #include #include @@ -44,12 +44,13 @@ char * getbsize(headerlenp, blocksizep) - int *headerlenp; + size_t *headerlenp; long *blocksizep; { static char header[20]; long n, max, mul, blocksize; - char *ep, *p, *form; + char *ep, *p; + const char *form; #define KB (1024L) #define MB (1024L * 1024L) ==== //depot/projects/trustedbsd/mac/lib/libc/net/name6.c#7 (text+ko) ==== @@ -94,7 +94,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.29 2002/10/06 08:43:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.30 2002/10/23 10:45:09 ume Exp $"); #include "namespace.h" #include @@ -1529,6 +1529,7 @@ int af; int *errp; int n; + int err; struct hostent *hp; u_char c, *cp; char *bp; @@ -1540,6 +1541,9 @@ querybuf *buf; char qbuf[MAXDNAME+1]; char *hlist[2]; + char *tld6[] = { "ip6.arpa", "ip6.int", NULL }; + char *tld4[] = { "in-addr.arpa", NULL }; + char **tld; addr = va_arg(ap, const void *); addrlen = va_arg(ap, int); @@ -1554,6 +1558,19 @@ return NS_NOTFOUND; #endif + switch (af) { +#ifdef INET6 + case AF_INET6: + tld = tld6; + break; +#endif + case AF_INET: + tld = tld4; + break; + default: + return NS_NOTFOUND; + } + if ((_res.options & RES_INIT) == 0) { if (res_init() < 0) { *errp = h_errno; @@ -1566,67 +1583,76 @@ hbuf.h_length = addrlen; na = 0; - /* XXX assumes that MAXDNAME is big enough */ - n = 0; - bp = qbuf; - cp = (u_char *)addr+addrlen-1; - switch (af) { -#ifdef INET6 - case AF_INET6: - for (; n < addrlen; n++, cp--) { - c = *cp; - *bp++ = hex[c & 0xf]; - *bp++ = '.'; - *bp++ = hex[c >> 4]; - *bp++ = '.'; - } - strcpy(bp, "ip6.int"); - break; -#endif - default: - for (; n < addrlen; n++, cp--) { - c = *cp; - if (c >= 100) - *bp++ = '0' + c / 100; - if (c >= 10) - *bp++ = '0' + (c % 100) / 10; - *bp++ = '0' + c % 10; - *bp++ = '.'; - } - strcpy(bp, "in-addr.arpa"); - break; - } - buf = malloc(sizeof(*buf)); if (buf == NULL) { *errp = NETDB_INTERNAL; return NS_UNAVAIL; } + err = NS_SUCCESS; + for (/* nothing */; *tld; tld++) { + /* + * XXX assumes that MAXDNAME is big enough - error checks + * has been made by callers + */ + n = 0; + bp = qbuf; + cp = (u_char *)addr+addrlen-1; + switch (af) { +#ifdef INET6 + case AF_INET6: + for (; n < addrlen; n++, cp--) { + c = *cp; + *bp++ = hex[c & 0xf]; + *bp++ = '.'; + *bp++ = hex[c >> 4]; + *bp++ = '.'; + } + strcpy(bp, *tld); + break; +#endif + case AF_INET: + for (; n < addrlen; n++, cp--) { + c = *cp; + if (c >= 100) + *bp++ = '0' + c / 100; + if (c >= 10) + *bp++ = '0' + (c % 100) / 10; + *bp++ = '0' + c % 10; + *bp++ = '.'; + } + strcpy(bp, *tld); + break; + } - n = res_query(qbuf, C_IN, T_PTR, buf->buf, sizeof buf->buf); - if (n < 0) { - free(buf); - *errp = h_errno; - return NS_UNAVAIL; - } else if (n > sizeof(buf->buf)) { - free(buf); + n = res_query(qbuf, C_IN, T_PTR, buf->buf, sizeof buf->buf); + if (n < 0) { + *errp = h_errno; + err = NS_UNAVAIL; + continue; + } else if (n > sizeof(buf->buf)) { #if 0 - errno = ERANGE; /* XXX is it OK to set errno here? */ + errno = ERANGE; /* XXX is it OK to set errno here? */ #endif - *errp = NETDB_INTERNAL; - return NS_UNAVAIL; + *errp = NETDB_INTERNAL; + err = NS_UNAVAIL; + continue; + } + hp = getanswer(buf, n, qbuf, T_PTR, &hbuf, errp); + if (!hp) { + err = NS_NOTFOUND; + continue; + } + free(buf); + hbuf.h_addrtype = af; + hbuf.h_length = addrlen; + hbuf.h_addr_list = hlist; + hlist[0] = (char *)addr; + hlist[1] = NULL; + *(struct hostent **)rval = _hpcopy(&hbuf, errp); + return NS_SUCCESS; } - hp = getanswer(buf, n, qbuf, T_PTR, &hbuf, errp); free(buf); - if (!hp) - return NS_NOTFOUND; - hbuf.h_addrtype = af; - hbuf.h_length = addrlen; - hbuf.h_addr_list = hlist; - hlist[0] = (char *)addr; - hlist[1] = NULL; - *(struct hostent **)rval = _hpcopy(&hbuf, errp); - return NS_SUCCESS; + return err; } static void ==== //depot/projects/trustedbsd/mac/lib/libc/string/strcpy.3#8 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strcpy.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/strcpy.3,v 1.20 2002/10/10 14:16:08 robert Exp $ +.\" $FreeBSD: src/lib/libc/string/strcpy.3,v 1.21 2002/10/23 08:55:14 des Exp $ .\" .Dd August 9, 2001 .Dt STRCPY 3 @@ -54,36 +54,41 @@ .Fn strncpy "char * restrict dst" "const char * restrict src" "size_t len" .Sh DESCRIPTION The -.Fn stpcpy , +.Fn stpcpy +and .Fn strcpy -function -copies the string +functions +copy the string .Fa src to .Fa dst (including the terminating .Ql \e0 -character). +character.) .Pp The .Fn strncpy -function copies not more than +function copies at most .Fa len characters from .Fa src into -.Fa dst , -appending -.Ql \e0 -characters if +.Fa dst . +If .Fa src is less than .Fa len -characters long, and +characters long, +the remainder of +.Fa dst +is filled with +.Ql \e0 +characters. +Otherwise, +.Fa dst +is .Em not -terminating -.Fa dst -otherwise. +terminated. .Sh RETURN VALUES The .Fn strcpy ==== //depot/projects/trustedbsd/mac/lib/libc/string/strerror.3#5 (text+ko) ==== @@ -34,9 +34,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)strerror.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/string/strerror.3,v 1.18 2002/01/31 13:32:14 jedgar Exp $ +.\" $FreeBSD: src/lib/libc/string/strerror.3,v 1.19 2002/10/23 10:16:21 tjr Exp $ .\" -.Dd November 26, 2001 +.Dd October 22, 2002 .Dt STRERROR 3 .Os .Sh NAME @@ -150,6 +150,14 @@ .Sh SEE ALSO .Xr intro 2 , .Xr psignal 3 +.Sh STANDARDS +The +.Fn perror , +.Fn strerror +and +.Fn strerror_r +functions conform to +.St -p1003.1-2001 . .Sh HISTORY The .Fn strerror @@ -169,6 +177,14 @@ function will return its result in a static buffer which may be overwritten by subsequent calls. .Pp +The +.Fn perror +function is implemented in terms of +.Fn strerror , +hence it uses the same static buffer. +This behaviour is forbidden by +.St -isoC-99 . +.Pp Programs that use the deprecated .Va sys_errlist variable often fail to compile because they declare it ==== //depot/projects/trustedbsd/mac/lib/libc/string/wcschr.c#4 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c)1999 Citrus Project, + * Copyright (c) 2002 Tim J. Robbins * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,34 +22,20 @@ * 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. - * - * citrus Id: wcschr.c,v 1.2 2000/12/21 05:07:25 itojun Exp */ #include -#if 0 -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: wcschr.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); -#endif /* LIBC_SCCS and not lint */ -#endif -__FBSDID("$FreeBSD: src/lib/libc/string/wcschr.c,v 1.6 2002/09/21 00:29:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/wcschr.c,v 1.7 2002/10/23 10:47:47 tjr Exp $"); #include wchar_t * -wcschr(s, c) - const wchar_t *s; - wchar_t c; +wcschr(const wchar_t *s, wchar_t c) { - const wchar_t *p; - p = s; - while (*p) { - if (*p == c) { - /* LINTED interface specification */ - return (wchar_t *)p; - } - p++; - } - return NULL; + while (*s != c && *s != L'\0') + s++; + if (*s == c) + return ((wchar_t *)s); + return (NULL); } ==== //depot/projects/trustedbsd/mac/lib/libc/string/wcscmp.c#4 (text+ko) ==== @@ -38,10 +38,10 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcmp.c 8.1 (Berkeley) 6/4/93"; #if 0 -__RCSID("$NetBSD$"); +__RCSID("$NetBSD: wcscmp.c,v 1.3 2001/01/05 12:13:12 itojun Exp $"); #endif #endif /* LIBC_SCCS and not lint */ -__FBSDID("$FreeBSD: src/lib/libc/string/wcscmp.c,v 1.6 2002/09/21 00:29:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/wcscmp.c,v 1.7 2002/10/23 11:08:40 tjr Exp $"); #include ==== //depot/projects/trustedbsd/mac/lib/libc/string/wcsncmp.c#4 (text+ko) ==== @@ -35,10 +35,10 @@ #if 0 #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strncmp.c 8.1 (Berkeley) 6/4/93"; -__RCSID("$NetBSD$"); +__RCSID("$NetBSD: wcsncmp.c,v 1.3 2001/01/05 12:13:13 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ #endif -__FBSDID("$FreeBSD: src/lib/libc/string/wcsncmp.c,v 1.6 2002/09/21 00:29:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/wcsncmp.c,v 1.7 2002/10/23 11:08:40 tjr Exp $"); #include ==== //depot/projects/trustedbsd/mac/lib/libc/string/wcsncpy.c#5 (text+ko) ==== @@ -1,6 +1,9 @@ /*- - * Copyright (c)1999 Citrus Project, - * All rights reserved. + * Copyright (c) 1990, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Chris Torek. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,11 +13,18 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) @@ -22,37 +32,33 @@ * 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. - * - * citrus Id: wcsncpy.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp */ #include -#if 0 -#if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: wcsncpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); -#endif /* LIBC_SCCS and not lint */ -#endif -__FBSDID("$FreeBSD: src/lib/libc/string/wcsncpy.c,v 1.7 2002/09/21 00:29:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/wcsncpy.c,v 1.8 2002/10/23 04:35:25 tjr Exp $"); #include +/* + * Copy src to dst, truncating or null-padding to always copy n bytes. + * Return dst. + */ wchar_t * -wcsncpy(s1, s2, n) - wchar_t * __restrict s1; - const wchar_t * __restrict s2; - size_t n; +wcsncpy(wchar_t * __restrict dst, const wchar_t * __restrict src, size_t n) { - wchar_t *p; - const wchar_t *q; + if (n != 0) { + wchar_t *d = dst; + const wchar_t *s = src; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 16:51: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18CB637B404; Wed, 23 Oct 2002 16:51:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 931) id A242737B401; Wed, 23 Oct 2002 16:51:00 -0700 (PDT) Date: Wed, 23 Oct 2002 16:51:00 -0700 From: Juli Mallett To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 20000 for review Message-ID: <20021023165100.A1190@FreeBSD.org> References: <200210232349.g9NNnNrg043112@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <200210232349.g9NNnNrg043112@repoman.freebsd.org>; from rwatson@FreeBSD.org on Wed, Oct 23, 2002 at 04:49:23PM -0700 Organisation: The FreeBSD Project X-Alternate-Addresses: , , , , X-Towel: Yes X-LiveJournal: flata, jmallett X-Negacore: Yes Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG * De: Robert Watson [ Data: 2002-10-23 ] [ Subjecte: PERFORCE change 20000 for review ] > http://perforce.freebsd.org/chv.cgi?CH=20000 > > Change 20000 by rwatson@rwatson_tislabs on 2002/10/23 16:48:45 Didn't you also have change 10000? Congrats! :) -- Juli Mallett | FreeBSD: The Power To Serve Will break world for fulltime employment. | finger jmallett@FreeBSD.org http://people.FreeBSD.org/~jmallett/ | Support my FreeBSD hacking! To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 16:58:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB65C37B404; Wed, 23 Oct 2002 16:58:16 -0700 (PDT) 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 7488F37B401 for ; Wed, 23 Oct 2002 16:58:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1BBD743E3B for ; Wed, 23 Oct 2002 16:58:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9NNvZmV045566 for ; Wed, 23 Oct 2002 16:57:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9NNvY0i045562 for perforce@freebsd.org; Wed, 23 Oct 2002 16:57:34 -0700 (PDT) Date: Wed, 23 Oct 2002 16:57:34 -0700 (PDT) Message-Id: <200210232357.g9NNvY0i045562@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 Subject: PERFORCE change 20002 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20002 Change 20002 by rwatson@rwatson_tislabs on 2002/10/23 16:57:01 Sync up ps usage with reality. Affected files ... .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#13 edit Differences ... ==== //depot/projects/trustedbsd/mac/bin/ps/ps.c#13 (text+ko) ==== @@ -651,7 +651,7 @@ { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ps [-aChjlmrsSTuvwx] [-O|o fmt] [-p pid] [-t tty] [-U user]", + "usage: ps [-aChjlmrSTuvwxZ] [-O|o fmt] [-p pid] [-t tty] [-U user]", " [-M core] [-N system]", " ps [-L]"); exit(1); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 17:49:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECD0237B404; Wed, 23 Oct 2002 17:49:19 -0700 (PDT) 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 6D71037B401 for ; Wed, 23 Oct 2002 17:49:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1604743E3B for ; Wed, 23 Oct 2002 17:49:19 -0700 (PDT) (envelope-from chris@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9O0mbmV048883 for ; Wed, 23 Oct 2002 17:48:37 -0700 (PDT) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9O0mbXd048880 for perforce@freebsd.org; Wed, 23 Oct 2002 17:48:37 -0700 (PDT) Date: Wed, 23 Oct 2002 17:48:37 -0700 (PDT) Message-Id: <200210240048.g9O0mbXd048880@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 20004 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20004 Change 20004 by chris@chris_nailabs on 2002/10/23 17:47:45 Refer to "application failure" as "undefined behavior, including application failure". Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.3#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.3#8 (text+ko) ==== @@ -80,4 +80,5 @@ is specific to that type, and must not be used to free the character strings returned from .Fn mac_to_text . -Doing so may result in an application failure. +Doing so may result in undefined behavior, +including application failure. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 18:34:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5DF837B404; Wed, 23 Oct 2002 18:34:16 -0700 (PDT) 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 49A3337B401 for ; Wed, 23 Oct 2002 18:34:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8232643E42 for ; Wed, 23 Oct 2002 18:34:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9O1XYmV051836 for ; Wed, 23 Oct 2002 18:33:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9O1XXvX051833 for perforce@freebsd.org; Wed, 23 Oct 2002 18:33:33 -0700 (PDT) Date: Wed, 23 Oct 2002 18:33:33 -0700 (PDT) Message-Id: <200210240133.g9O1XXvX051833@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 Subject: PERFORCE change 20007 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20007 Change 20007 by rwatson@rwatson_tislabs on 2002/10/23 18:33:07 Loop back recent MAC commits from the main FreeBSD tree to the TrustedBSD base tree: ls, ps flags. Affected files ... .. //depot/projects/trustedbsd/base/bin/ls/Makefile#6 integrate .. //depot/projects/trustedbsd/base/bin/ls/lomac.c#8 delete .. //depot/projects/trustedbsd/base/bin/ls/lomac.h#4 delete .. //depot/projects/trustedbsd/base/bin/ls/ls.1#12 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#12 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.h#6 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#11 integrate .. //depot/projects/trustedbsd/base/bin/ps/Makefile#7 integrate .. //depot/projects/trustedbsd/base/bin/ps/extern.h#8 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#11 integrate .. //depot/projects/trustedbsd/base/bin/ps/lomac.c#7 delete .. //depot/projects/trustedbsd/base/bin/ps/lomac.h#4 delete .. //depot/projects/trustedbsd/base/bin/ps/print.c#10 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#11 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/posix1e.3#4 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/Makefile#7 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#31 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_partition/mac_partition.c#1 branch .. //depot/projects/trustedbsd/base/sys/security/mac_partition/mac_partition.h#1 branch Differences ... ==== //depot/projects/trustedbsd/base/bin/ls/Makefile#6 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 -# $FreeBSD: src/bin/ls/Makefile,v 1.23 2002/02/04 03:06:50 kris Exp $ +# $FreeBSD: src/bin/ls/Makefile,v 1.24 2002/10/24 00:07:30 rwatson Exp $ PROG= ls -SRCS= cmp.c lomac.c ls.c print.c util.c +SRCS= cmp.c ls.c print.c util.c NO_WERROR=1 WFORMAT=0 DPADD= ${LIBM} ==== //depot/projects/trustedbsd/base/bin/ls/ls.1#12 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.69 2002/08/21 17:32:34 trhodes Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.70 2002/10/24 00:07:30 rwatson Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -146,7 +146,7 @@ .It Fl W Display whiteouts when scanning directories. .It Fl Z -Display each file's LOMAC level. +Display each file's MAC label. .It Fl a Include directory entries whose names begin with a dot @@ -303,7 +303,7 @@ is displayed for each file: file mode, number of links, owner name, group name, -LOMAC level, +MAC label, number of bytes in the file, abbreviated month, day-of-month file was last modified, hour file last modified, minute file last @@ -618,11 +618,6 @@ files in order to be compatible with the .St -p1003.2 specification. -.Sh FILES -.Bl -tag -width ".Pa /dev/lomac" -compact -.It Pa /dev/lomac -interface used to query the -.Xr lomac 4 KLD .El .Sh SEE ALSO @@ -630,7 +625,6 @@ .Xr chmod 1 , .Xr sort 1 , .Xr xterm 1 , -.Xr lomac 4 , .Xr termcap 5 , .Xr symlink 7 , .Xr sticky 8 ==== //depot/projects/trustedbsd/base/bin/ls/ls.c#12 (text+ko) ==== @@ -46,11 +46,12 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.67 2002/10/18 10:59:45 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.68 2002/10/24 00:07:30 rwatson Exp $"); #include #include #include +#include #include #include @@ -71,7 +72,6 @@ #include "ls.h" #include "extern.h" -#include "lomac.h" /* * Upward approximation of the maximum number of characters needed to @@ -80,7 +80,7 @@ */ #define STRBUF_SIZEOF(t) (1 + CHAR_BIT * sizeof(t) / 3 + 1) -static void display(FTSENT *, FTSENT *); +static void display(FTSENT *, FTSENT *, int); static u_quad_t makenines(u_long); static int mastercmp(const FTSENT * const *, const FTSENT * const *); static void traverse(int, char **, int); @@ -118,7 +118,7 @@ static int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ - int f_lomac; /* show LOMAC attributes */ + int f_label; /* show MAC label */ #ifdef COLORLS int f_color; /* add type in color for non-regular files */ @@ -300,7 +300,7 @@ f_octal_escape = 0; break; case 'Z': - f_lomac = 1; + f_label = 1; break; default: case '?': @@ -440,7 +440,7 @@ fts_open(argv, options, f_nosort ? NULL : mastercmp)) == NULL) err(1, "fts_open"); - display(NULL, fts_children(ftsp, 0)); + display(NULL, fts_children(ftsp, 0), options); if (f_listdir) return; @@ -480,7 +480,7 @@ output = 1; } chp = fts_children(ftsp, ch_options); - display(p, chp); + display(p, chp, options); if (!f_recursive && chp != NULL) (void)fts_set(ftsp, p, FTS_SKIP); @@ -498,14 +498,15 @@ * points to the parent directory of the display list. */ static void -display(FTSENT *p, FTSENT *list) +display(FTSENT *p, FTSENT *list, int options) { struct stat *sp; DISPLAY d; FTSENT *cur; NAMES *np; off_t maxsize; - u_long btotal, lattrlen, maxblock, maxinode, maxlen, maxnlink, maxlattr; + u_long btotal, labelstrlen, maxblock, maxinode, maxlen, maxnlink; + u_long maxlabelstr; int bcfile, maxflags; gid_t maxgroup; uid_t maxuser; @@ -513,7 +514,7 @@ char *initmax; int entries, needstats; const char *user, *group; - char *flags, *lattr = NULL; + char *flags, *labelstr = NULL; char buf[STRBUF_SIZEOF(u_quad_t) + 1]; char ngroup[STRBUF_SIZEOF(uid_t) + 1]; char nuser[STRBUF_SIZEOF(gid_t) + 1]; @@ -533,7 +534,7 @@ btotal = 0; initmax = getenv("LS_COLWIDTHS"); /* Fields match -lios order. New ones should be added at the end. */ - maxlattr = maxblock = maxinode = maxlen = maxnlink = + maxlabelstr = maxblock = maxinode = maxlen = maxnlink = maxuser = maxgroup = maxflags = maxsize = 0; if (initmax != NULL && *initmax != '\0') { char *initmax2, *jinitmax; @@ -563,7 +564,7 @@ ninitmax = sscanf(jinitmax, " %lu : %lu : %lu : %i : %i : %i : %llu : %lu : %lu ", &maxinode, &maxblock, &maxnlink, &maxuser, - &maxgroup, &maxflags, &maxsize, &maxlen, &maxlattr); + &maxgroup, &maxflags, &maxsize, &maxlen, &maxlabelstr); f_notabs = 1; switch (ninitmax) { case 0: @@ -591,7 +592,7 @@ maxlen = 0; /* FALLTHROUGH */ case 8: - maxlattr = 0; + maxlabelstr = 0; /* FALLTHROUGH */ #ifdef COLORLS if (!f_color) @@ -606,8 +607,6 @@ maxnlink = makenines(maxnlink); maxsize = makenines(maxsize); } - if (f_lomac) - lomac_start(); bcfile = 0; flags = NULL; for (cur = list, entries = 0; cur; cur = cur->fts_link) { @@ -684,16 +683,51 @@ maxflags = flen; } else flen = 0; - lattr = NULL; - if (f_lomac) { - lattr = get_lattr(cur); - lattrlen = strlen(lattr); - if (lattrlen > maxlattr) - maxlattr = lattrlen; + labelstr = NULL; + if (f_label) { + mac_t label; + int error; + + error = mac_prepare_file_label(&label); + if (error == -1) { + fprintf(stderr, "%s: %s\n", + cur->fts_name, + strerror(errno)); + goto label_out; + } + + if (options & FTS_LOGICAL) + error = mac_get_file( + cur->fts_path, label); + else + error = mac_get_link( + cur->fts_name, label); + if (error == -1) { + perror(cur->fts_name); + mac_free(label); + goto label_out; + } + + error = mac_to_text(label, + &labelstr); + if (error == -1) { + fprintf(stderr, "%s: %s\n", + cur->fts_name, + strerror(errno)); + mac_free(label); + goto label_out; + } + mac_free(label); +label_out: + if (labelstr == NULL) + labelstr = strdup(""); + labelstrlen = strlen(labelstr); + if (labelstrlen > maxlabelstr) + maxlabelstr = labelstrlen; } else - lattrlen = 0; + labelstrlen = 0; - if ((np = malloc(sizeof(NAMES) + lattrlen + + if ((np = malloc(sizeof(NAMES) + labelstrlen + ulen + glen + flen + 4)) == NULL) err(1, "malloc"); @@ -711,11 +745,11 @@ (void)strcpy(np->flags, flags); free(flags); } - if (f_lomac) { - np->lattr = &np->data[ulen + glen + 2 + if (f_label) { + np->label = &np->data[ulen + glen + 2 + (f_flags ? flen + 1 : 0)]; - (void)strcpy(np->lattr, lattr); - free(lattr); + (void)strcpy(np->label, labelstr); + free(labelstr); } cur->fts_pointer = np; } @@ -735,7 +769,7 @@ (void)snprintf(buf, sizeof(buf), "%lu", maxblock); d.s_block = strlen(buf); d.s_flags = maxflags; - d.s_lattr = maxlattr; + d.s_label = maxlabelstr; d.s_group = maxgroup; (void)snprintf(buf, sizeof(buf), "%lu", maxinode); d.s_inode = strlen(buf); @@ -751,8 +785,6 @@ if (f_longform) for (cur = list; cur; cur = cur->fts_link) free(cur->fts_pointer); - if (f_lomac) - lomac_stop(); } /* ==== //depot/projects/trustedbsd/base/bin/ls/ls.h#6 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.18 2002/05/19 02:51:36 tjr Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.19 2002/10/24 00:07:30 rwatson Exp $ */ #define NO_PRINT 1 @@ -45,7 +45,7 @@ extern int f_accesstime; /* use time of last access */ extern int f_flags; /* show flags associated with a file */ extern int f_humanval; /* show human-readable file sizes */ -extern int f_lomac; /* show LOMAC attributes */ +extern int f_label; /* show MAC label */ extern int f_inode; /* print inode */ extern int f_longform; /* long listing format */ extern int f_octal; /* print unprintables in octal */ @@ -70,7 +70,7 @@ int maxlen; u_int s_block; u_int s_flags; - u_int s_lattr; + u_int s_label; u_int s_group; u_int s_inode; u_int s_nlink; @@ -82,6 +82,6 @@ char *user; char *group; char *flags; - char *lattr; + char *label; char data[1]; } NAMES; ==== //depot/projects/trustedbsd/base/bin/ls/print.c#11 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.60 2002/10/23 10:20:01 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.61 2002/10/24 00:07:30 rwatson Exp $"); #include #include @@ -182,8 +182,8 @@ np->group); if (f_flags) (void)printf("%-*s ", dp->s_flags, np->flags); - if (f_lomac) - (void)printf("%-*s ", dp->s_lattr, np->lattr); + if (f_label) + (void)printf("%-*s ", dp->s_label, np->label); if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode)) if (minor(sp->st_rdev) > 255 || minor(sp->st_rdev) < 0) (void)printf("%3d, 0x%08x ", ==== //depot/projects/trustedbsd/base/bin/ps/Makefile#7 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/bin/ps/Makefile,v 1.21 2002/07/08 15:48:39 jmallett Exp $ +# $FreeBSD: src/bin/ps/Makefile,v 1.22 2002/10/24 00:00:57 rwatson Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= ps -SRCS= fmt.c keyword.c nlist.c print.c ps.c lomac.c +SRCS= fmt.c keyword.c nlist.c print.c ps.c # # To support "lazy" ps for non root/wheel users # add -DLAZY_PS to the cflags. This helps ==== //depot/projects/trustedbsd/base/bin/ps/extern.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.27 2002/10/02 20:32:50 jhb Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.28 2002/10/24 00:00:57 rwatson Exp $ */ struct kinfo; @@ -54,7 +54,7 @@ const char *fmt_argv(char **, char *, size_t); double getpcpu(const KINFO *); void kvar(KINFO *, VARENT *); -void lattr(KINFO *, VARENT *); +void label(KINFO *, VARENT *); void logname(KINFO *, VARENT *); void longtname(KINFO *, VARENT *); void lstarted(KINFO *, VARENT *); @@ -71,6 +71,7 @@ void rgroupname(KINFO *, VARENT *); void runame(KINFO *, VARENT *); void rvar(KINFO *, VARENT *); +int s_label(KINFO *); int s_rgroupname(KINFO *); int s_runame(KINFO *); int s_uname(KINFO *); ==== //depot/projects/trustedbsd/base/bin/ps/keyword.c#11 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.57 2002/10/02 20:32:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.58 2002/10/24 00:00:57 rwatson Exp $"); #include #include @@ -95,13 +95,14 @@ 0}, {"ktrace", "KTRACE", NULL, 0, kvar, NULL, 8, KOFF(ki_traceflag), INT, "x", 0}, + {"label", "LABEL", NULL, LJUST|DSIZ, label, s_label, SHRT_MAX, 0, CHAR, + NULL, 0}, {"lim", "LIM", NULL, 0, maxrss, NULL, 5, 0, CHAR, NULL, 0}, {"login", "LOGIN", NULL, LJUST, logname, NULL, MAXLOGNAME-1, 0, CHAR, NULL, 0}, {"logname", "", "login", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"lstart", "STARTED", NULL, LJUST|USER, lstarted, NULL, 28, 0, CHAR, NULL, 0}, - {"lvl", "LVL", NULL, LJUST, lattr, NULL, 3, 0, CHAR, NULL, 0}, {"majflt", "MAJFLT", NULL, USER, rvar, NULL, 4, ROFF(ru_majflt), LONG, "ld", 0}, {"minflt", "MINFLT", NULL, USER, rvar, NULL, 4, ROFF(ru_minflt), ==== //depot/projects/trustedbsd/base/bin/ps/print.c#10 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.74 2002/10/02 20:32:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.75 2002/10/24 00:00:57 rwatson Exp $"); #include #include @@ -45,6 +45,7 @@ #include #include +#include #include #include @@ -62,7 +63,6 @@ #include #include -#include "lomac.h" #include "ps.h" #define ps_pgtok(a) (((a) * getpagesize()) / 1024) @@ -726,10 +726,53 @@ } void -lattr(KINFO *k, VARENT *ve) +label(KINFO *k, VARENT *ve) { + char *string; + mac_t label; + int error; VAR *v; v = ve->var; - (void)printf("%-*d", v->width, get_lattr(k->ki_p->ki_pid)); + string = NULL; + + if (mac_prepare_process_label(&label) == -1) { + perror("mac_prepare_process_label"); + goto out; + } + + error = mac_get_pid(k->ki_p->ki_pid, label); + if (error == 0) { + if (mac_to_text(label, &string) == -1) + string = NULL; + } + mac_free(label); + +out: + if (string != NULL) { + (void)printf("%-*s", v->width, string); + free(string); + } else + (void)printf("%-*s", v->width, ""); + return; +} + +int +s_label(KINFO *k) +{ + char *string = NULL; + mac_t label; + int error, size = 0; + + if (mac_prepare_process_label(&label) == -1) { + perror("mac_prepare_process_label"); + return (0); + } + error = mac_get_pid(k->ki_p->ki_pid, label); + if (error == 0 && mac_to_text(label, &string) == 0) { + size = strlen(string); + free(string); + } + mac_free(label); + return (size); } ==== //depot/projects/trustedbsd/base/bin/ps/ps.1#11 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.58 2002/10/02 20:32:50 jhb Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.59 2002/10/24 00:00:57 rwatson Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -184,7 +184,7 @@ .It Fl x Display information about processes without controlling terminals. .It Fl Z -Add lvl to the list of keywords for which +Add label to the list of keywords for which .Nm will display information. .El @@ -224,14 +224,14 @@ .It Dv "P_OWEUPC" Ta No "0x20000 Owe process an addupc() call at next ast" .It Dv "P_SWAPPING" Ta No "0x40000 Process is being swapped" .El +.It label +The MAC label of the process. .It lim The soft limit on memory used, specified via a call to .Xr setrlimit 2 . .It lstart The exact time the command started, using the ``%c'' format described in .Xr strftime 3 . -.It lvl -The LOMAC level of the process. .It lockname The name of the lock that the process is currently blocked on. If the name is invalid or unknown, then @@ -390,14 +390,14 @@ job control count .It ktrace tracing flags +.It label +MAC label .It lim memoryuse limit .It logname login name of user who started the process .It lstart time started -.It lvl -LOMAC level .It majflt total page faults .It minflt ==== //depot/projects/trustedbsd/base/bin/ps/ps.c#12 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.58 2002/09/03 05:44:00 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.59 2002/10/24 00:00:57 rwatson Exp $"); #include #include @@ -64,7 +64,6 @@ #include #include -#include "lomac.h" #include "ps.h" #define SEP ", \t" /* username separators */ @@ -108,7 +107,7 @@ static char o2[] = "tt,state,time,command"; static char ufmt[] = "user,pid,%cpu,%mem,vsz,rss,tt,state,start,time,command"; static char vfmt[] = "pid,state,time,sl,re,pagein,vsz,rss,lim,tsiz,%cpu,%mem,command"; -static char Zfmt[] = "lvl"; +static char Zfmt[] = "label"; static kvm_t *kd; @@ -410,7 +409,6 @@ } } free(uids); - lomac_stop(); exit(eval); } @@ -653,7 +651,7 @@ { (void)fprintf(stderr, "%s\n%s\n%s\n", - "usage: ps [-aChjlmrSTuvwx] [-O|o fmt] [-p pid] [-t tty] [-U user]", + "usage: ps [-aChjlmrSTuvwxZ] [-O|o fmt] [-p pid] [-t tty] [-U user]", " [-M core] [-N system]", " ps [-L]"); exit(1); ==== //depot/projects/trustedbsd/base/lib/libc/posix1e/posix1e.3#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/posix1e.3,v 1.22 2002/10/22 01:52:53 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/posix1e.3,v 1.24 2002/10/23 23:56:15 chris Exp $ .\" .Dd January 17, 2000 .Dt POSIX1E 3 @@ -41,14 +41,15 @@ .In sys/mac.h .Sh DESCRIPTION The IEEE POSIX.1e specification never left draft form, but the interfaces -it describes are now widely used despite inherent limitations. Currently, -only a few of the interfaces and features are implemented in +it describes are now widely used despite inherent limitations. +Currently, only a few of the interfaces and features are implemented in .Fx , although efforts are underway to complete the integration at this time. .Pp POSIX.1e describes five security extensions to the base POSIX.1 API: Access Control Lists (ACLs), Auditing, Capabilities, Mandatory Access -Control, and Information Flow Labels. Of these, the ACL interfaces are +Control, and Information Flow Labels. +Of these, the ACL interfaces are currently included with .Fx , Auditing, Capabilities, and Mandatory @@ -57,7 +58,8 @@ .Pp POSIX.1e defines both syntax and semantics for these features, but fairly substantial changes are required to implement these features in the -operating system. As shipped, +operating system. +As shipped, .Fx 4.0 permits file systems to export Access Control Lists via the VFS, and provides a library for userland @@ -69,7 +71,8 @@ .Fx currently provides documentation and APIs for fine-grained capability support, but implementation is currently not included in the base -system. Documentation of these API calls is provided in +system. +Documentation of these API calls is provided in .Xr cap 3 . .Pp Additional patches supporting POSIX.1e features are provided by the @@ -82,15 +85,17 @@ development at this time. .Sh ENVIRONMENT POSIX.1e assigns security labels to all objects, extending the security -functionality described in POSIX.1. These additional labels provide +functionality described in POSIX.1. +These additional labels provide fine-grained discretionary access control, fine-grained capabilities, -and labels necessary for mandatory access control. POSIX.2c describes -a set of userland utilities for manipulating these labels. These userland +and labels necessary for mandatory access control. +POSIX.2c describes +a set of userland utilities for manipulating these labels. +These userland utilities are not bundled with .Fx 4.0 so as to discourage their use in the short term. -.Sh FILES .Sh SEE ALSO .Xr acl 3 , .Xr cap 3 , @@ -100,9 +105,11 @@ .Xr extattr 9 , .Xr mac 9 .Sh STANDARDS -POSIX.1e is described in IEEE POSIX.1e draft 17. Discussion -of the draft continues on the cross-platform POSIX.1e implementation -mailing list. To join this list, see the +POSIX.1e is described in IEEE POSIX.1e draft 17. +Discussion of the draft continues +on the cross-platform POSIX.1e implementation +mailing list. +To join this list, see the .Fx POSIX.1e implementation page for more information. ==== //depot/projects/trustedbsd/base/libexec/ftpd/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/4/94 -# $FreeBSD: src/libexec/ftpd/Makefile,v 1.50 2002/06/28 10:36:14 markm Exp $ +# $FreeBSD: src/libexec/ftpd/Makefile,v 1.51 2002/10/24 00:07:30 rwatson Exp $ PROG= ftpd MAN= ftpd.8 @@ -20,7 +20,7 @@ LSDIR= ../../bin/ls .PATH: ${.CURDIR}/${LSDIR} -SRCS+= ls.c cmp.c lomac.c print.c util.c +SRCS+= ls.c cmp.c print.c util.c CFLAGS+=-Dmain=ls_main -I${.CURDIR}/${LSDIR} DPADD+= ${LIBM} LDADD+= -lm ==== //depot/projects/trustedbsd/base/sys/modules/Makefile#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.273 2002/10/23 15:53:09 jhb Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.274 2002/10/23 23:36:26 rwatson Exp $ .if exists(${.CURDIR}/../opencrypto) && !defined(NOCRYPT) _crypto= crypto @@ -68,6 +68,7 @@ mac_ifoff \ mac_mls \ mac_none \ + mac_partition \ mac_seeotheruids \ mac_test \ mcd \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 18:39:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC97037B404; Wed, 23 Oct 2002 18:39:23 -0700 (PDT) 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 7D43B37B401 for ; Wed, 23 Oct 2002 18:39:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 380C243E42 for ; Wed, 23 Oct 2002 18:39:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9O1cfmV052220 for ; Wed, 23 Oct 2002 18:38:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9O1cfwi052216 for perforce@freebsd.org; Wed, 23 Oct 2002 18:38:41 -0700 (PDT) Date: Wed, 23 Oct 2002 18:38:41 -0700 (PDT) Message-Id: <200210240138.g9O1cfwi052216@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 Subject: PERFORCE change 20009 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20009 Change 20009 by rwatson@rwatson_tislabs on 2002/10/23 18:38:02 Require that target swap devices by high integrity, since they will contain potentially high integrity data. Require Biba privilege to set the swap device. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#156 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#156 (text+ko) ==== @@ -333,6 +333,16 @@ } static int +mac_biba_high_single(struct mac_biba *mac_biba) +{ + + KASSERT((mac_biba->mb_flags & MAC_BIBA_FLAG_SINGLE) != 0, + ("mac_biba_equal_single: mac_biba not single")); + + return (mac_biba->mb_single.mbe_type == MAC_BIBA_TYPE_HIGH); +} + +static int mac_biba_valid(struct mac_biba *mac_biba) { @@ -2455,8 +2465,10 @@ subj = SLOT(&cred->cr_label); obj = SLOT(label); - if (!mac_biba_dominate_single(subj, obj) || - !mac_biba_dominate_single(obj, subj)) + if (!mac_biba_privileged(subj)) + return (EPERM); + + if (!mac_biba_high_single(obj)) return (EACCES); return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 18:40:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5895B37B406; Wed, 23 Oct 2002 18:40:30 -0700 (PDT) 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 E2F5037B401 for ; Wed, 23 Oct 2002 18:40:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91A9B43E8A for ; Wed, 23 Oct 2002 18:40:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9O1dhmV052419 for ; Wed, 23 Oct 2002 18:39:43 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9O1dhKE052414 for perforce@freebsd.org; Wed, 23 Oct 2002 18:39:43 -0700 (PDT) Date: Wed, 23 Oct 2002 18:39:43 -0700 (PDT) Message-Id: <200210240139.g9O1dhKE052414@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 Subject: PERFORCE change 20010 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20010 Change 20010 by rwatson@rwatson_tislabs on 2002/10/23 18:39:22 Integ various MAC changes from the TrustedBSD base tree to the TrustedBSD MAC tree. Includes ls, ps label support. Affected files ... .. //depot/projects/trustedbsd/mac/bin/ls/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/bin/ls/lomac.c#9 delete .. //depot/projects/trustedbsd/mac/bin/ls/lomac.h#5 delete .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#12 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#16 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.h#7 integrate .. //depot/projects/trustedbsd/mac/bin/ls/print.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/ps/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/bin/ps/extern.h#11 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#13 integrate .. //depot/projects/trustedbsd/mac/bin/ps/print.c#16 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#12 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.c#14 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/posix1e.3#5 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/Makefile#8 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#47 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.h#2 integrate Differences ... ==== //depot/projects/trustedbsd/mac/bin/ls/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 -# $FreeBSD: src/bin/ls/Makefile,v 1.23 2002/02/04 03:06:50 kris Exp $ +# $FreeBSD: src/bin/ls/Makefile,v 1.24 2002/10/24 00:07:30 rwatson Exp $ PROG= ls SRCS= cmp.c ls.c print.c util.c ==== //depot/projects/trustedbsd/mac/bin/ls/ls.1#12 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.69 2002/08/21 17:32:34 trhodes Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.70 2002/10/24 00:07:30 rwatson Exp $ .\" .Dd May 19, 2002 .Dt LS 1 ==== //depot/projects/trustedbsd/mac/bin/ls/ls.c#16 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.67 2002/10/18 10:59:45 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.68 2002/10/24 00:07:30 rwatson Exp $"); #include #include ==== //depot/projects/trustedbsd/mac/bin/ls/ls.h#7 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/ls.h,v 1.18 2002/05/19 02:51:36 tjr Exp $ + * $FreeBSD: src/bin/ls/ls.h,v 1.19 2002/10/24 00:07:30 rwatson Exp $ */ #define NO_PRINT 1 ==== //depot/projects/trustedbsd/mac/bin/ls/print.c#12 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.60 2002/10/23 10:20:01 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.61 2002/10/24 00:07:30 rwatson Exp $"); #include #include ==== //depot/projects/trustedbsd/mac/bin/ps/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/ps/Makefile,v 1.21 2002/07/08 15:48:39 jmallett Exp $ +# $FreeBSD: src/bin/ps/Makefile,v 1.22 2002/10/24 00:00:57 rwatson Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 PROG= ps ==== //depot/projects/trustedbsd/mac/bin/ps/extern.h#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.27 2002/10/02 20:32:50 jhb Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.28 2002/10/24 00:00:57 rwatson Exp $ */ struct kinfo; ==== //depot/projects/trustedbsd/mac/bin/ps/keyword.c#13 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.57 2002/10/02 20:32:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.58 2002/10/24 00:00:57 rwatson Exp $"); #include #include ==== //depot/projects/trustedbsd/mac/bin/ps/print.c#16 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.74 2002/10/02 20:32:50 jhb Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.75 2002/10/24 00:00:57 rwatson Exp $"); #include #include ==== //depot/projects/trustedbsd/mac/bin/ps/ps.1#12 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.58 2002/10/02 20:32:50 jhb Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.59 2002/10/24 00:00:57 rwatson Exp $ .\" .Dd April 18, 1994 .Dt PS 1 ==== //depot/projects/trustedbsd/mac/bin/ps/ps.c#14 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.58 2002/09/03 05:44:00 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.59 2002/10/24 00:00:57 rwatson Exp $"); #include #include ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/posix1e.3#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/posix1e.3,v 1.22 2002/10/22 01:52:53 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/posix1e.3,v 1.24 2002/10/23 23:56:15 chris Exp $ .\" .Dd January 17, 2000 .Dt POSIX1E 3 @@ -41,14 +41,15 @@ .In sys/mac.h .Sh DESCRIPTION The IEEE POSIX.1e specification never left draft form, but the interfaces -it describes are now widely used despite inherent limitations. Currently, -only a few of the interfaces and features are implemented in +it describes are now widely used despite inherent limitations. +Currently, only a few of the interfaces and features are implemented in .Fx , although efforts are underway to complete the integration at this time. .Pp POSIX.1e describes five security extensions to the base POSIX.1 API: Access Control Lists (ACLs), Auditing, Capabilities, Mandatory Access -Control, and Information Flow Labels. Of these, the ACL interfaces are +Control, and Information Flow Labels. +Of these, the ACL interfaces are currently included with .Fx , Auditing, Capabilities, and Mandatory @@ -57,7 +58,8 @@ .Pp POSIX.1e defines both syntax and semantics for these features, but fairly substantial changes are required to implement these features in the -operating system. As shipped, +operating system. +As shipped, .Fx 4.0 permits file systems to export Access Control Lists via the VFS, and provides a library for userland @@ -69,7 +71,8 @@ .Fx currently provides documentation and APIs for fine-grained capability support, but implementation is currently not included in the base -system. Documentation of these API calls is provided in +system. +Documentation of these API calls is provided in .Xr cap 3 . .Pp Additional patches supporting POSIX.1e features are provided by the @@ -82,15 +85,17 @@ development at this time. .Sh ENVIRONMENT POSIX.1e assigns security labels to all objects, extending the security -functionality described in POSIX.1. These additional labels provide +functionality described in POSIX.1. +These additional labels provide fine-grained discretionary access control, fine-grained capabilities, -and labels necessary for mandatory access control. POSIX.2c describes -a set of userland utilities for manipulating these labels. These userland +and labels necessary for mandatory access control. +POSIX.2c describes +a set of userland utilities for manipulating these labels. +These userland utilities are not bundled with .Fx 4.0 so as to discourage their use in the short term. -.Sh FILES .Sh SEE ALSO .Xr acl 3 , .Xr cap 3 , @@ -100,9 +105,11 @@ .Xr extattr 9 , .Xr mac 9 .Sh STANDARDS -POSIX.1e is described in IEEE POSIX.1e draft 17. Discussion -of the draft continues on the cross-platform POSIX.1e implementation -mailing list. To join this list, see the +POSIX.1e is described in IEEE POSIX.1e draft 17. +Discussion of the draft continues +on the cross-platform POSIX.1e implementation +mailing list. +To join this list, see the .Fx POSIX.1e implementation page for more information. ==== //depot/projects/trustedbsd/mac/libexec/ftpd/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/4/94 -# $FreeBSD: src/libexec/ftpd/Makefile,v 1.50 2002/06/28 10:36:14 markm Exp $ +# $FreeBSD: src/libexec/ftpd/Makefile,v 1.51 2002/10/24 00:07:30 rwatson Exp $ PROG= ftpd MAN= ftpd.8 ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#47 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.273 2002/10/23 15:53:09 jhb Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.274 2002/10/23 23:36:26 rwatson Exp $ .if exists(${.CURDIR}/../opencrypto) && !defined(NOCRYPT) _crypto= crypto ==== //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#17 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.h#2 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 18:49:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E346137B404; Wed, 23 Oct 2002 18:49:37 -0700 (PDT) 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 7C68E37B401 for ; Wed, 23 Oct 2002 18:49:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 35D0D43E4A for ; Wed, 23 Oct 2002 18:49:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9O1mtmV053059 for ; Wed, 23 Oct 2002 18:48:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9O1mthc053056 for perforce@freebsd.org; Wed, 23 Oct 2002 18:48:55 -0700 (PDT) Date: Wed, 23 Oct 2002 18:48:55 -0700 (PDT) Message-Id: <200210240148.g9O1mthc053056@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 Subject: PERFORCE change 20011 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20011 Change 20011 by rwatson@rwatson_tislabs on 2002/10/23 18:47:55 Fix a mis-merge from the integ due to a baseless integ on this file. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifmac.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/ifconfig/ifmac.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sbin/ifconfig/ifmac.c,v 1.2 2002/10/23 22:50:04 rwatson Exp $ */ #include @@ -50,7 +50,7 @@ #include "ifconfig.h" void -mac_status(int s, struct rt_addrinfo *info) +maclabel_status(int s, struct rt_addrinfo *info) { struct ifreq ifr; mac_t label; @@ -70,7 +70,8 @@ if (mac_to_text(label, &label_text) == -1) goto mac_free; - printf("\tmac %s\n", label_text); + if (strlen(label_text) != 0) + printf("\tmaclabel %s\n", label_text); free(label_text); mac_free: @@ -78,7 +79,7 @@ } void -setifmac(const char *val, int d, int s, const struct afswtch *rafp) +setifmaclabel(const char *val, int d, int s, const struct afswtch *rafp) { struct ifreq ifr; mac_t label; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 18:49:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 042C837B406; Wed, 23 Oct 2002 18:49:39 -0700 (PDT) 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 2675537B407 for ; Wed, 23 Oct 2002 18:49:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEFDF43E4A for ; Wed, 23 Oct 2002 18:49:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9O1mumV053065 for ; Wed, 23 Oct 2002 18:48:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9O1muRT053062 for perforce@freebsd.org; Wed, 23 Oct 2002 18:48:56 -0700 (PDT) Date: Wed, 23 Oct 2002 18:48:56 -0700 (PDT) Message-Id: <200210240148.g9O1muRT053062@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 Subject: PERFORCE change 20012 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20012 Change 20012 by rwatson@rwatson_tislabs on 2002/10/23 18:48:21 Another merge tweak: unused variable. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifmac.c#12 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/ifconfig/ifmac.c#12 (text+ko) ==== @@ -55,7 +55,6 @@ struct ifreq ifr; mac_t label; char *label_text; - int error; memset(&ifr, 0, sizeof(ifr)); strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 19:32:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8092037B404; Wed, 23 Oct 2002 19:32:31 -0700 (PDT) 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 18BA337B401 for ; Wed, 23 Oct 2002 19:32:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A63B243E42 for ; Wed, 23 Oct 2002 19:32:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9O2VnmV056002 for ; Wed, 23 Oct 2002 19:31:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9O2Vm6J055999 for perforce@freebsd.org; Wed, 23 Oct 2002 19:31:48 -0700 (PDT) Date: Wed, 23 Oct 2002 19:31:48 -0700 (PDT) Message-Id: <200210240231.g9O2Vm6J055999@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 Subject: PERFORCE change 20014 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20014 Change 20014 by rwatson@rwatson_tislabs on 2002/10/23 19:31:23 Diff reduction: mac.h is no longer required as a dependency in most cases if you're not actually calling a MAC API. Affected files ... .. //depot/projects/trustedbsd/mac/usr.bin/find/function.c#9 edit .. //depot/projects/trustedbsd/mac/usr.bin/netstat/inet6.c#5 edit .. //depot/projects/trustedbsd/mac/usr.bin/netstat/iso.c#5 edit .. //depot/projects/trustedbsd/mac/usr.bin/netstat/mbuf.c#4 edit .. //depot/projects/trustedbsd/mac/usr.bin/netstat/mroute.c#4 edit .. //depot/projects/trustedbsd/mac/usr.bin/netstat/ns.c#5 edit .. //depot/projects/trustedbsd/mac/usr.bin/netstat/unix.c#4 edit .. //depot/projects/trustedbsd/mac/usr.bin/systat/mbufs.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.bin/find/function.c#9 (text+ko) ==== @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD: src/usr.bin/find/function.c,v 1.47 2002/08/10 20:19:03 mux Exp $"); #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/usr.bin/netstat/inet6.c#5 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/usr.bin/netstat/iso.c#5 (text+ko) ==== @@ -66,7 +66,6 @@ */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/usr.bin/netstat/mbuf.c#4 (text+ko) ==== @@ -40,7 +40,6 @@ #endif /* not lint */ #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/usr.bin/netstat/mroute.c#4 (text+ko) ==== @@ -54,7 +54,6 @@ #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/usr.bin/netstat/ns.c#5 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include #include ==== //depot/projects/trustedbsd/mac/usr.bin/netstat/unix.c#4 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/mac/usr.bin/systat/mbufs.c#4 (text+ko) ==== @@ -41,7 +41,6 @@ #include #include -#include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Oct 23 19:33:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7057237B404; Wed, 23 Oct 2002 19:33:33 -0700 (PDT) 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 0840A37B401 for ; Wed, 23 Oct 2002 19:33:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A143443E3B for ; Wed, 23 Oct 2002 19:33:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9O2WpmV056077 for ; Wed, 23 Oct 2002 19:32:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9O2Wo1J056073 for perforce@freebsd.org; Wed, 23 Oct 2002 19:32:50 -0700 (PDT) Date: Wed, 23 Oct 2002 19:32:50 -0700 (PDT) Message-Id: <200210240232.g9O2Wo1J056073@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 Subject: PERFORCE change 20015 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20015 Change 20015 by rwatson@rwatson_tislabs on 2002/10/23 19:32:08 Can't remember why this was here, possibly from when passwd understood what the label on the password file should be. Affected files ... .. //depot/projects/trustedbsd/mac/usr.bin/passwd/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.bin/passwd/Makefile#5 (text+ko) ==== @@ -10,10 +10,6 @@ MLINKS = passwd.1 yppasswd.1 WARNS ?= 4 -.if defined(MAC) -CFLAGS+=-DMAC -.endif - beforeinstall: .for i in passwd yppasswd [ ! -e ${DESTDIR}${BINDIR}/$i ] || \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 8:24:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 665AA37B406; Thu, 24 Oct 2002 08:24:21 -0700 (PDT) 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 DBF4A37B401 for ; Thu, 24 Oct 2002 08:24:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CA9D43E6A for ; Thu, 24 Oct 2002 08:24:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OFNamV005368 for ; Thu, 24 Oct 2002 08:23:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OFNZXN005365 for perforce@freebsd.org; Thu, 24 Oct 2002 08:23:35 -0700 (PDT) Date: Thu, 24 Oct 2002 08:23:35 -0700 (PDT) Message-Id: <200210241523.g9OFNZXN005365@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 Subject: PERFORCE change 20040 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20040 Change 20040 by rwatson@rwatson_tislabs on 2002/10/24 08:23:08 Submerge local diffs left over from baseless integ. Affected files ... .. //depot/projects/trustedbsd/mac/etc/mac.conf#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/mac.conf#8 (text+ko) ==== @@ -1,8 +1,10 @@ # +# $FreeBSD: src/etc/mac.conf,v 1.1 2002/10/22 14:38:49 rwatson Exp $ +# # TrustedBSD MAC userland policy configuration file. Kernel modules # export label information, and mac.conf indicates to userland -# applications how they should interpret kernel and user-provided -# labels. +# applications what defaults they should use in the absense of any +# other user-provided information. # # To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 8:26:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06B6C37B40A; Thu, 24 Oct 2002 08:26:28 -0700 (PDT) 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 3574637B41F for ; Thu, 24 Oct 2002 08:26:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E09843E6E for ; Thu, 24 Oct 2002 08:26:23 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OFPdmV005593 for ; Thu, 24 Oct 2002 08:25:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OFPc31005590 for perforce@freebsd.org; Thu, 24 Oct 2002 08:25:38 -0700 (PDT) Date: Thu, 24 Oct 2002 08:25:38 -0700 (PDT) Message-Id: <200210241525.g9OFPc31005590@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 Subject: PERFORCE change 20041 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20041 Change 20041 by rwatson@rwatson_tislabs on 2002/10/24 08:24:46 Further trim remains of mac_te. Affected files ... .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#17 edit .. //depot/projects/trustedbsd/mac/include/Makefile#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#17 (text+ko) ==== @@ -146,8 +146,6 @@ .. mac_partition .. - mac_te - .. sebsd .. .. ==== //depot/projects/trustedbsd/mac/include/Makefile#24 (text+ko) ==== @@ -43,7 +43,7 @@ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ security/lomac security/mac_biba security/mac_bsdextended \ security/mac_lomac security/mac_mls security/mac_partition \ - security/mac_te security/sebsd ufs/ffs ufs/ufs + security/sebsd ufs/ffs ufs/ufs # For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/* # are taken care of To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 8:41:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 666B437B404; Thu, 24 Oct 2002 08:41:54 -0700 (PDT) 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 108B237B401 for ; Thu, 24 Oct 2002 08:41:54 -0700 (PDT) Received: from mail.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by mx1.FreeBSD.org (Postfix) with ESMTP id 002FA43E75 for ; Thu, 24 Oct 2002 08:41:53 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 28361 invoked from network); 24 Oct 2002 15:41:56 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 24 Oct 2002 15:41:56 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.6/8.12.6) with ESMTP id g9OFfpn5071098; Thu, 24 Oct 2002 11:41:51 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20021023165100.A1190@FreeBSD.org> Date: Thu, 24 Oct 2002 11:41:55 -0400 (EDT) From: John Baldwin To: Juli Mallett Subject: Re: PERFORCE change 20000 for review Cc: Perforce Change Reviews Cc: Perforce Change Reviews , Robert Watson Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 23-Oct-2002 Juli Mallett wrote: > * De: Robert Watson [ Data: 2002-10-23 ] > [ Subjecte: PERFORCE change 20000 for review ] >> http://perforce.freebsd.org/chv.cgi?CH=20000 >> >> Change 20000 by rwatson@rwatson_tislabs on 2002/10/23 16:48:45 > > Didn't you also have change 10000? Congrats! :) And 5000. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 9:22:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 499DA37B404; Thu, 24 Oct 2002 09:22:33 -0700 (PDT) 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 D28D537B401 for ; Thu, 24 Oct 2002 09:22:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D4DF43E42 for ; Thu, 24 Oct 2002 09:22:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OGLmmV009108 for ; Thu, 24 Oct 2002 09:21:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OGLlX2009105 for perforce@freebsd.org; Thu, 24 Oct 2002 09:21:47 -0700 (PDT) Date: Thu, 24 Oct 2002 09:21:47 -0700 (PDT) Message-Id: <200210241621.g9OGLlX2009105@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 Subject: PERFORCE change 20043 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20043 Change 20043 by rwatson@rwatson_tislabs on 2002/10/24 09:21:13 Diff reduction: mac.h no longer required for mbuf.h and ucred.h Affected files ... .. //depot/projects/trustedbsd/mac/contrib/amd/include/am_defs.h#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/amd/include/am_defs.h#3 (text+ko) ==== @@ -360,7 +360,6 @@ * Actions to take if exists. */ #ifdef HAVE_SYS_MBUF_H -# include # include /* * OSF4 (DU-4.0) defines m_next and m_data also in so I must @@ -447,8 +446,6 @@ * Actions to take if exists. */ #ifdef HAVE_SYS_UCRED_H -/* XXX: need something more here */ -#include # include #endif /* HAVE_SYS_UCRED_H */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 9:27:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C47E37B404; Thu, 24 Oct 2002 09:27:40 -0700 (PDT) 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 F313637B401 for ; Thu, 24 Oct 2002 09:27:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83ABC43E4A for ; Thu, 24 Oct 2002 09:27:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OGQtmV009277 for ; Thu, 24 Oct 2002 09:26:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OGQsqV009274 for perforce@freebsd.org; Thu, 24 Oct 2002 09:26:54 -0700 (PDT) Date: Thu, 24 Oct 2002 09:26:54 -0700 (PDT) Message-Id: <200210241626.g9OGQsqV009274@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 Subject: PERFORCE change 20044 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20044 Change 20044 by rwatson@rwatson_tislabs on 2002/10/24 09:26:36 Manually merge mac.9 man page changes from the merge of this manual to the main tree. Update cross-references, remove per-entry-point documentation (this is now in the Developer's Handbook chapter on the MAC Framework), and bring in the credits section. Affected files ... .. //depot/projects/trustedbsd/mac/share/man/man9/mac.9#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/share/man/man9/mac.9#10 (text+ko) ==== @@ -34,7 +34,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man9/mac.9,v 1.1 2002/10/21 23:51:18 rwatson Exp $ .\" .Dd February 16, 2002 .Os @@ -48,6 +48,7 @@ .Pp In the kernel configuration file: .Cd "options MAC" +.Cd "options MAC_DEBUG" .Sh DESCRIPTION .Ss Introduction The TrustedBSD mandatory access control framework permits dynamically @@ -141,205 +142,8 @@ the new entry points so that they may consistently enforce their policies. .Sh ENTRY POINTS -.Ss Authorizational -.Bl -tag -.It Ft int Fn mac_bpfdesc_check_receive_from_ifnet "struct bpf_d *bpf_d" "struct ifnet *ifnet" -Called in -.Xr bpf_tap 9 -before allowing -.Xr catchpacket 9 . -(Not called in -.Xr bpf_mtap 9 -before allowing -.Xr catchpacket 9 ?) -.It Ft int Fn mac_cred_check_access_vnode "struct ucred *cred" "struct vnode *vp" "int flags" -Called in -.Xr vn_access 9 -before checking -.Xr VOP_ACCESS 9 . -.It Ft int Fn mac_cred_check_bind_socket "struct ucred *cred" "struct socket *so" "struct sockaddr *sa" -Called in -.Xr bind 9 -before allowing -.Xr sobind 9 . -.It Ft int Fn mac_cred_check_chdir_vnode "struct ucred *cred" "struct vnode *dvp" -Called in -.Xr chdir 9 -via -.Xr change_dir 9 -and in -.Xr fchdir 9 . -.It Ft int Fn mac_cred_check_connect_socket "struct ucred *cred" "struct socket *so" "struct sockaddr *sa" -Called in -.Xr connect 9 -before allowing -.Xr soconnect 9 . -.It Ft int Fn mac_cred_check_create_vnode "struct ucred *cred" "struct vnode *dvp" "struct vattr *vap" -Called in -.Xr unp_bind 9 -before -.Xr VOP_CREATE 9 , -.Xr symlink 9 -before -.Xr VOP_SYMLINK 9 , -.Xr vn_mkdir 9 -before -.Xr VOP_MKDIR 9 , -.Xr vn_open_cred 9 -before -.Xr VOP_CREATE 9 , -and in -.Xr mknod 9 -and -.Xr mkfifo 9 -before -.Xr VOP_MKNOD 9 . -.It Ft int Fn mac_cred_check_deleteacl_vnode "struct ucred *cred" "struct vnode *vp" "acl_type_t type" -Called by -.Xr vacl_delete 9 -before -.Xr VOP_SETACL 9 . -.It Ft int Fn mac_cred_check_getacl_vnode "struct ucred *cred" "struct vnode *vp" "acl_type_t type" -Called by -.Xr vacl_get_acl 9 -before -.Xr VOP_GETACL 9 . -.It Ft int Fn mac_cred_check_getextattr_vnode "struct ucred *cred" "struct vnode *vp" "int attrnamespace" "const char *name" "struct uio *uio" -Called in -.Xr extattr_get_vp 9 -before calling -.Xr VOP_GETEXTATTR 9 . -.It Ft int Fn mac_cred_check_listen_socket "struct ucred *cred" "struct socket *socket" -Called in -.Xr listen 9 -before calling -.Xr solisten 9 . -.It Ft int Fn mac_cred_check_search_vnode "struct ucred *cred" "struct vnode *dvp" -Called in -.Xr getdents_common 9 , -.Xr linux_getcwd_scandir 9 , -.Xr svr4_sys_getdents64 9 , -.Xr svr4_sys_getdents 9 , -.Xr ibcs2_getdents 9 , -.Xr ibcs2_read 9 , -.Xr ogetdirentries 9 -and -.Xr getdirentries 9 -before calling -.Xr VOP_READDIR 9 . -Called in -.Xr lookup 9 -before calling -.Xr VOP_LOOKUP 9 . -.It Ft int Fn mac_cred_check_setacl_vnode "struct ucred *cred" "struct vnode *vp" "acl_type_t type" "struct acl *acl" -Called in -.Xr vacl_set_acl 9 -before calling -.Xr VOP_SETACL 9 . -.It Ft int Fn mac_cred_check_setextattr_vnode "struct ucred *cred" "struct vnode *vp" "int attrnamespace" "const char *name" "struct uio *uio" -Called in -.Xr extattr_set_vp 9 -and -.Xr extattr_delete_vp 9 -before calling -.Xr VOP_SETEXTATTR 9 . -.It Ft int Fn mac_cred_check_setflags_vnode "struct ucred *cred" "struct vnode *vp" "u_long flags" -Called in -.Xr setfflags 9 -before calling -.Xr VOP_SETATTR 9 . -.It Ft int Fn mac_cred_check_setmode_vnode "struct ucred *cred" "struct vnode *vp" "mode_t mode" -Called in -.Xr setfmode 9 -before calling -.Xr VOP_SETATTR 9 . -.It Ft int Fn mac_cred_check_setowner_vnode "struct ucred *cred" "struct vnode *vp" "uid_t uid" "gid_t gid" -Called in -.Xr setfown 9 -before calling -.Xr VOP_SETATTR 9 . -.It Ft int Fn mac_cred_check_setutimes_vnode "struct ucred *cred" "struct vnode *vp" "struct timespec atime" "struct timespec ctime" -Called in -.Xr setfown 9 -before calling -.Xr VOP_SETATTR 9 . -.It Ft int Fn mac_cred_check_stat_vnode "struct ucred *cred" "struct vnode *vp" -Called in -.Xr vn_stat 9 -before calling -.Xr VOP_GETATTR 9 . -.It Ft int Fn mac_cred_check_delete_vnode "struct ucred *cred" "struct vnode *dvp" "struct vnode *vp" -Called in the last component of -.Xr namei 9 -for all DELETE operations. -.It Ft int Fn mac_cred_check_rename_from_vnode "struct ucred *cred" "struct vnode *dvp" "struct vnode *vp" -Called in -.Xr rename 9 -after the -.Xr namei 9 -DELETE operation. -.It Ft int Fn mac_cred_check_rename_to_vnode "struct ucred *cred" "struct vnode *dvp" "struct vnode *vp" "int samedir" -Called in -.Xr rename 9 -after the -.Xr namei 9 -RENAME operation and before the -.Xr VOP_RENAME 9 . -.It Ft int Fn mac_cred_check_open_vnode "struct ucred *cred" "struct vnode *vp" "mode_t acc_mode" -Called by -.Xr fcntl 9 -in the F_SETFL case before allowing flags to be changed, by -.Xr truncate 9 -to mediate access to -.Xr VOP_SETATTR 9 -and -.Xr vn_open_cred 9 -when handling a non-O_CREAT vnode. -.It Ft int Fn mac_cred_check_revoke_vnode "struct ucred *cred" "struct vnode *vp" -Called by -.Xr revoke 9 -to mediate access to -.Xr VOP_REVOKE 9 . -.It Ft int Fn mac_cred_check_statfs "struct ucred *cred" "struct mount *mp" -Called by -.Xr osf1_statfs 9 , -.Xr osf1_fstatfs 9 , -.Xr osf1_getfsstat 9 , -.Xr linux_statfs 9 , -.Xr linux_fstatfs 9 , -.Xr linux_ustat 9 , -.Xr statfs 9 , -.Xr fstatfs 9 , -.Xr getfsstat 9 -and -.Xr fhstatfs 9 -before calling -.Xr VFS_STATFS 9 . -.El -.Ss Label-based -.Bl -tag -.It Ft int Fn mac_getsockopt_label_get "struct ucred *cred" "struct socket *so" "struct mac *extmac" -Called by -.Xr sogetopt 9 -in the SO_LABEL case. -.It Ft int Fn mac_getsockopt_peerlabel_get "struct ucred *cred" "struct socket *so" "struct mac *extmac" -Called by -.Xr sogetopt 9 -in the SO_PEERLABEL case. -.It Ft int Fn mac_getsockopt_label_set "struct ucred *cred" "struct socket *so" "struct mac *extmac" -Called by -.Xr sosetopt 9 -in the SO_LABEL case. -.It Ft int Fn mac_ioctl_ifnet_get "struct ucred *cred" "struct ifreq *ifr" "struct ifnet *ifnet" -Called by -.Xr ifhwioctl 9 -in the SIOCGIFMAC case. -.It Ft int Fn mac_ioctl_ifnet_set "struct ucred *cred" "struct ifreq *ifr" "struct ifnet *ifnet" -Called by -.Xr ifhwioctl 9 -in the SIOCSIFMAC case. -.El -.Pp +System service and module authors should reference the FreeBSD +Developer's Handbook for information on the MAC Framework APIs. .Sh SEE ALSO .Xr acl 3 , .Xr cap 3 , @@ -348,6 +152,7 @@ .Xr posix1e 3 , .Xr ucred 9 , .Xr vaccess 9 , +.Xr vaccess_acl_posix1e 9 , .Xr VFS 9 , .Rs .%T "FreeBSD Developers' Handbook" @@ -357,3 +162,42 @@ .Sh AUTHORS This man page was written by .An Robert Watson . +This software was contributed to the +.Fx +Project by Network Associates Laboratories, the Security Research +Division of Network Associates Inc. under DARPA/SPAWAR contract +N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research program. +.Pp +.An -nosplit +The TrustedBSD MAC Framework was designed by +.An Robert Watson , +and implemented by the Network Associates Laboratories Network Security +(NETSEC), Secure Execution Environement (SEE), and Adaptive +Network Defense research groups. +Network Associates Laboratory staff contributing to the CBOSS Project +include (in alphabetical order): +.An Lee Badger , +.An Brian Feldman , +.An Tim Fraser , +.An Doug Kilpatrick , +.An Suresh Krishnaswamy , +.An Adam Migus , +.An Wayne Morrison , +.An Chris Vance , +and +.An Robert Watson . +.Pp +Sub-contracted staff include: +.An Chris Costello , +.An Poul-Henning Kamp , +.An Jonathan Lemon , +.An Kirk McKusick , +.An Dag-Erling Smorgrav . +.Pp +Additional contributors include: +.An Chris Faulhaber , +.An Ilmar Habibulin , +.An Thomas Moestl , +and +.An Andrew Reiter . +.An -split To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 9:34:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6ECB37B404; Thu, 24 Oct 2002 09:34:49 -0700 (PDT) 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 5333937B401 for ; Thu, 24 Oct 2002 09:34:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC72A43E4A for ; Thu, 24 Oct 2002 09:34:48 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OGY4mV009864 for ; Thu, 24 Oct 2002 09:34:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OGY3Lb009861 for perforce@freebsd.org; Thu, 24 Oct 2002 09:34:03 -0700 (PDT) Date: Thu, 24 Oct 2002 09:34:03 -0700 (PDT) Message-Id: <200210241634.g9OGY3Lb009861@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 Subject: PERFORCE change 20045 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20045 Change 20045 by rwatson@rwatson_tislabs on 2002/10/24 09:33:19 README updates. Among other things, note that lukemftpd is not considered supported because it doesn't use standard context management interfaces, meaning that MAC labels will not be set properly. Also remove a bunch of warnings that applied only before the VFS changes, note MAC_DEBUG, etc. Affected files ... .. //depot/projects/trustedbsd/mac/MACREADME#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/MACREADME#24 (text+ko) ==== @@ -6,17 +6,13 @@ Add the following to your kernel configuration: -options MAC +options MAC # Mandatory Access Control +#options MAC_DEBUG # Might also be useful Rebuild and reinstall world and kernel. Make sure that login.conf is in sync with that provided in the MAC repository, and that login.conf.db is up to date also; this can be done most easily via mergemaster(8). -NOTE: It may be necessary to set 'NO_WERROR=yes' in /etc/make.conf to -successfully build the kernel, due to some warnings introduced when -integrating MAC into the VFS name lookup code. These warnings will -be resolved prior to 5.0-RELEASE. - There are a variety of MAC modules installed in /boot/kernel following an installkernel. Some must be loaded prior to boot in the loader; others may be loaded when needed before or after the boot. The @@ -82,11 +78,6 @@ may be inconsistently enforced. CODA support is probably in the same condition. -Currently, non-FreeBSD ABIs are not fully supported. This includes -the Linux compatibility layer, and other related components (SCO, et al). -They will likely not correctly check MAC operations in all cases that the -normal FreeBSD ABI code does; the status of the ABIs is improving. - Client-side NFS locking is known to Do The Wrong Thing, for a variety of reasons. Unlike the other components of the kernel NFS client, it doesn't use the mount-time credential to authorize out-going RPC @@ -94,26 +85,17 @@ FIFO, etc. (This is now largely fixed due to moving VFS protections higher in the stack) +Warning: if you have applications that are involved in setting process +privileges as a result of user login, or act on behalf of a user, +and they are not base system applications, they may not properly set +MAC labels for users when they log in. As such, before assuming that +these applications will behave properly, you probably want to send +a query to trustedbsd-discuss@TrustedBSD.org. At least one base +system application is known to work improperly: lukemftpd. + Things not to do with MAC ------------------------- -Don't enable one of the MAC policies after running with persistent -per-object labels in extended attributes when the MAC policy wasn't -compiled into your kernel. The policy will not have had a chance to -gate label set requests, and the resulting labels on disk may be -invalid, resulting in a panic. Instead, make sure to reinitialize all -of the "freebsd.mac" attributes to their default (with extattrctl(8)) -before starting them again on the new kernel. Using the -security.mac.debug_label_fallback tunable/sysctl will permit the -MAC framework to ignore certain classes of poorly initialized labels, -but not all. - -Don't downgrade a UFS-based filesystem from multilevel to singlelevel, -and then back to multilevel without a reboot. The label cache can -become inconsistent following a downgrade to singlelevel; this is -not a problem until you re-upgrade. Instead, remount the filesystem, -or reboot. - Don't use netboot without setting the loader.conf setting to indicate to Biba which interface is trusted. Otherwise, the NFS client will fail as it cannot send packets via the interface. @@ -121,7 +103,12 @@ Don't expect X11 to work with MLS enabled if you try to run X11 at mls/low (the default). This won't work because XFree86 expects to be able to map video memory, and by default video memory is labeled -as mls/high so as to be conservative. +as mls/high so as to be conservative. If you want to get X to +work, you can run X at mls/high (possibly not recommended based on +your security policy requirements) you can run X with an mls/equal +label to have it override all MLS protections (not advised), or you +can label the necessary devices so that they can be accessed by the +user running X (not advised). For now, use the MAC modules and not the kernel options to enable particular MAC policies. This is necessary because the modules To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 9:34:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E20B837B401; Thu, 24 Oct 2002 09:34:50 -0700 (PDT) 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 278EA37B415 for ; Thu, 24 Oct 2002 09:34:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 817D843E4A for ; Thu, 24 Oct 2002 09:34:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OGY4mV009870 for ; Thu, 24 Oct 2002 09:34:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OGY4Y6009867 for perforce@freebsd.org; Thu, 24 Oct 2002 09:34:04 -0700 (PDT) Date: Thu, 24 Oct 2002 09:34:04 -0700 (PDT) Message-Id: <200210241634.g9OGY4Y6009867@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 Subject: PERFORCE change 20046 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20046 Change 20046 by rwatson@rwatson_tislabs on 2002/10/24 09:33:33 Gratuitous diff reduction. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libugidfw/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libugidfw/Makefile#5 (text+ko) ==== @@ -2,7 +2,6 @@ LIB= ugidfw SHLIB_MAJOR= 1 -CFLAGS+= -Wall SRCS= ugidfw.c INCS= ugidfw.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 9:38:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4E2437B404; Thu, 24 Oct 2002 09:38:56 -0700 (PDT) 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 3C4C837B401 for ; Thu, 24 Oct 2002 09:38:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6FBC43E4A for ; Thu, 24 Oct 2002 09:38:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OGcBmV010116 for ; Thu, 24 Oct 2002 09:38:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OGcAwU010113 for perforce@freebsd.org; Thu, 24 Oct 2002 09:38:10 -0700 (PDT) Date: Thu, 24 Oct 2002 09:38:10 -0700 (PDT) Message-Id: <200210241638.g9OGcAwU010113@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 Subject: PERFORCE change 20048 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20048 Change 20048 by rwatson@rwatson_tislabs on 2002/10/24 09:37:43 Can't really think of a good reason for this man page to cross-reference itself. Affected files ... .. //depot/projects/trustedbsd/mac/share/man/man9/vaccess_acl_posix1e.9#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/share/man/man9/vaccess_acl_posix1e.9#6 (text+ko) ==== @@ -116,7 +116,6 @@ .El .Sh SEE ALSO .Xr vaccess 9 , -.Xr vaccess_acl_posix1e 9 , .Xr vnode 9 , .Xr VOP_ACCESS 9 .Sh AUTHORS To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 9:40: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8BD237B404; Thu, 24 Oct 2002 09:39:58 -0700 (PDT) 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 4FD3F37B401 for ; Thu, 24 Oct 2002 09:39:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D32FC43E65 for ; Thu, 24 Oct 2002 09:39:57 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OGdDmV010156 for ; Thu, 24 Oct 2002 09:39:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OGdCEG010153 for perforce@freebsd.org; Thu, 24 Oct 2002 09:39:12 -0700 (PDT) Date: Thu, 24 Oct 2002 09:39:12 -0700 (PDT) Message-Id: <200210241639.g9OGdCEG010153@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 Subject: PERFORCE change 20049 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20049 Change 20049 by rwatson@rwatson_tislabs on 2002/10/24 09:38:14 Another scrap of mac_te removed. Affected files ... .. //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#15 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/boot/forth/loader.conf#15 (text+ko) ==== @@ -290,7 +290,6 @@ mac_none_load="NO" # Null MAC policy mac_partition_load="NO" # Partition MAC policy mac_seeotheruids_load="NO" # UID visbility MAC policy -mac_te_load="NO" # Type Enforcement policy sebsd_load="NO" # Security-Enhanced BSD module ############################################################## To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 9:50:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8012D37B404; Thu, 24 Oct 2002 09:50:11 -0700 (PDT) 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 26C6137B401 for ; Thu, 24 Oct 2002 09:50:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEB5C43E4A for ; Thu, 24 Oct 2002 09:50:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OGnQmV010940 for ; Thu, 24 Oct 2002 09:49:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OGnPlU010936 for perforce@freebsd.org; Thu, 24 Oct 2002 09:49:25 -0700 (PDT) Date: Thu, 24 Oct 2002 09:49:25 -0700 (PDT) Message-Id: <200210241649.g9OGnPlU010936@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 Subject: PERFORCE change 20050 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20050 Change 20050 by rwatson@rwatson_tislabs on 2002/10/24 09:48:25 Gratuitous diff reduction. Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#10 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/usr.sbin/ugidfw/ugidfw.c,v 1.1 2002/08/02 07:14:22 rwatson Exp $ */ #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 10:53:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE6EC37B401; Thu, 24 Oct 2002 10:53:31 -0700 (PDT) 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 6A5AC37B404 for ; Thu, 24 Oct 2002 10:53:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E72C43E3B for ; Thu, 24 Oct 2002 10:53:30 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OHqjmV015811 for ; Thu, 24 Oct 2002 10:52:45 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OHqjd1015808 for perforce@freebsd.org; Thu, 24 Oct 2002 10:52:45 -0700 (PDT) Date: Thu, 24 Oct 2002 10:52:45 -0700 (PDT) Message-Id: <200210241752.g9OHqjd1015808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 20055 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20055 Change 20055 by jhb@jhb_laptop on 2002/10/24 10:52:04 Back out bogus changes to constraints (some of the changes were non-bogus and will be redone in a later submit.) Affected files ... .. //depot/projects/smpng/sys/alpha/include/alpha_cpu.h#3 edit Differences ... ==== //depot/projects/smpng/sys/alpha/include/alpha_cpu.h#3 (text+ko) ==== @@ -353,10 +353,11 @@ static __inline void alpha_pal_cflush(u_int64_t pfn) { + register u_int64_t a0 __asm__("$16") = pfn; __asm__ __volatile__ ( "call_pal 0x1 #PAL_cflush" : - : "$16" (pfn)); + : "r" (a0)); } static __inline void @@ -368,21 +369,21 @@ static __inline void alpha_pal_wripir(u_int64_t ipir) { + register u_int64_t a0 __asm__("$16") = ipir; __asm__ __volatile__ ( "call_pal 0xd #PAL_ipir" - : "+$16" (ipir) - : + : "=r" (a0) + : "0" (a0) : "$1", "$22", "$23", "$24", "$25"); } static __inline u_int64_t alpha_pal_rdmces(void) { - u_int64_t v0; - + register u_int64_t v0 __asm__("$0"); __asm__ __volatile__ ( "call_pal 0x10 #PAL_OSF1_rdmces" - : "=$0" (v0) + : "=r" (v0) : : "$1", "$22", "$23", "$24", "$25"); return v0; @@ -391,42 +392,45 @@ static __inline void alpha_pal_wrmces(u_int64_t mces) { + register u_int64_t a0 __asm__("$16") = mces; __asm__ __volatile__ ( "call_pal 0x11 #PAL_wrmces" - : "+$16" (mces) - : + : "=r" (a0) + : "0" (a0) : "$1", "$22", "$23", "$24", "$25"); } static __inline void alpha_pal_wrfen(u_int64_t fen) { + register u_int64_t a0 __asm__("$16") = fen; __asm__ __volatile__ ( "call_pal 0x2b #PAL_wrfen" - : "+$16" (fen) - : + : "=r" (a0) + : "0" (a0) : "$1", "$22", "$23", "$24", "$25"); } static __inline void alpha_pal_wrvptptr(u_int64_t vptptr) { + register u_int64_t a0 __asm__("$16") = vptptr; __asm__ __volatile__ ( "call_pal 0x2d #PAL_wrvptptr" - : "+$16" (vptptr) - : + : "=r" (a0) + : "0" (a0) : "$1", "$22", "$23", "$24", "$25"); } static __inline u_int64_t alpha_pal_swpctx(u_int64_t pcb) { - u_int64_t v0; - + register u_int64_t a0 __asm__("$16") = pcb; + register u_int64_t v0 __asm__("$0"); __asm__ __volatile__ ( "call_pal 0x30 #PAL_OSF1_swpctx" - : "=$0" (v0), "+$16" (pcb) - : + : "=r" (v0), "=r" (a0) + : "1" (a0) : "$1", "$22", "$23", "$24", "$25", "memory"); return v0; } @@ -434,21 +438,21 @@ static __inline void alpha_pal_wrval(u_int64_t sysvalue) { + register u_int64_t a0 __asm__("$16") = sysvalue; __asm__ __volatile__ ( "call_pal 0x31 #PAL_wrval" - : "+$16" (sysvalue) - : + : "=r" (a0) + : "0" (a0) : "$1", "$22", "$23", "$24", "$25"); } static __inline u_int64_t alpha_pal_rdval(void) { - u_int64_t v0; - + register u_int64_t v0 __asm__("$0"); __asm__ __volatile__ ( "call_pal 0x32 #PAL_OSF1_rdval" - : "=$0" (v0) + : "=r" (v0) : : "$1", "$22", "$23", "$24", "$25"); return v0; @@ -457,32 +461,36 @@ static __inline void alpha_pal_tbi(u_int64_t op, u_int64_t va) { + register u_int64_t a0 __asm__("$16") = op; + register u_int64_t a1 __asm__("$17") = va; __asm__ __volatile__ ( "call_pal 0x33 #PAL_OSF1_tbi" - : "+$16" (op), "+$17" (va) - : + : "=r" (a0), "=r" (a1) + : "0" (a0), "1" (a1) : "$1", "$22", "$23", "$24", "$25"); } static __inline void alpha_pal_wrent(void *ent, u_int64_t which) { + register u_int64_t a0 __asm__("$16") = (u_int64_t) ent; + register u_int64_t a1 __asm__("$17") = which; __asm__ __volatile__ ( "call_pal 0x34 #PAL_OSF1_wrent" - : "+$16" ((u_int64_t) ent), "+$17" (which) - : + : "=r" (a0), "=r" (a1) + : "0" (a0), "1" (a1) : "$1", "$22", "$23", "$24", "$25"); } static __inline u_int64_t alpha_pal_swpipl(u_int64_t newipl) { - u_int64_t v0; - + register u_int64_t a0 __asm__("$16") = newipl; + register u_int64_t v0 __asm__("$0"); __asm__ __volatile__ ( "call_pal 0x35 #PAL_OSF1_swpipl" - : "=$0" (v0), "+$16" (newipl) - : + : "=r" (v0), "=r" (a0) + : "1" (a0) : "$1", "$22", "$23", "$24", "$25"); return v0; } @@ -490,11 +498,10 @@ static __inline u_int64_t alpha_pal_rdps(void) { - u_int64_t v0; - + register u_int64_t v0 __asm__("$0"); __asm__ __volatile__ ( "call_pal 0x36 #PAL_OSF1_rdps" - : "=$0" (v0) + : "=r" (v0) : : "$1", "$22", "$23", "$24", "$25"); return v0; @@ -503,22 +510,24 @@ static __inline void alpha_pal_wrusp(u_int64_t usp) { + register u_int64_t a0 __asm__("$16") = usp; __asm__ __volatile__ ( "call_pal 0x38 #PAL_wrusp" - : "+$16" (usp) - : + : "=r" (a0) + : "0" (a0) : "$1", "$22", "$23", "$24", "$25"); } static __inline u_int64_t alpha_pal_wrperfmon(u_int64_t arg0, u_int64_t arg1) { - u_int64_t v0; - + register u_int64_t v0 __asm__("$0"); + register u_int64_t a0 __asm__("$16") = arg0; + register u_int64_t a1 __asm__("$17") = arg1; __asm__ __volatile__ ( "call_pal 0x39 #PAL_OSF1_wrperfmon" - : "+$16" (arg0), "+$17" (arg1), "=$0" (v0) - : + : "=r" (a0), "=r" (a1), "=r" (v0) + : "0" (a0), "1" (a1) : "$1", "$22", "$23", "$24", "$25"); return v0; } @@ -526,11 +535,10 @@ static __inline u_int64_t alpha_pal_rdusp(void) { - u_int64_t v0; - + register u_int64_t v0 __asm__("$0"); __asm__ __volatile__ ( "call_pal 0x3a #PAL_OSF1_rdusp" - : "=$0" (v0) + : "=r" (v0) : : "$1", "$22", "$23", "$24", "$25"); return v0; @@ -539,11 +547,10 @@ static __inline u_int64_t alpha_pal_whami(void) { - u_int64_t v0; - + register u_int64_t v0 __asm__("$0"); __asm__ __volatile__ ( "call_pal 0x3c #PAL_OSF1_whami" - : "=$0" (v0) + : "=r" (v0) : : "$1", "$22", "$23", "$24", "$25"); return v0; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 10:54:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64C8737B404; Thu, 24 Oct 2002 10:54:33 -0700 (PDT) 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 EDD7D37B401 for ; Thu, 24 Oct 2002 10:54:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F0E043E77 for ; Thu, 24 Oct 2002 10:54:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OHrlmV015869 for ; Thu, 24 Oct 2002 10:53:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OHrlMq015866 for perforce@freebsd.org; Thu, 24 Oct 2002 10:53:47 -0700 (PDT) Date: Thu, 24 Oct 2002 10:53:47 -0700 (PDT) Message-Id: <200210241753.g9OHrlMq015866@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 Subject: PERFORCE change 20056 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20056 Change 20056 by rwatson@rwatson_tislabs on 2002/10/24 10:53:26 During the root mount, it's possible for a NULL mountpoint to be passed to getnewvnode() to support the device vnode we're mounting on. For now, just skip setting the label on these vnodes, and generate a printf to make sure our understanding of this scenario is correct. In the future, we might want to add a KASSERT that the type of the vnode is "none", or special case the handling here a bit further. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#45 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#45 (text+ko) ==== @@ -1004,9 +1004,14 @@ VI_UNLOCK(vp); #ifdef MAC mac_init_vnode(vp); - if ((mp->mnt_flag & MNT_MULTILABEL) == 0) { + /* + * NULL mp indicates that this vnode is being used for the + * mount device for the root file system. + */ + if (mp != NULL && (mp->mnt_flag & MNT_MULTILABEL) == 0) { mac_associate_vnode_singlelabel(mp, vp); - } + } else if (mp == NULL) + printf("NULL mp in getnewvnode()\n"); #endif insmntque(vp, mp); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 11: 0:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFD0037B404; Thu, 24 Oct 2002 11:00:36 -0700 (PDT) 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 7F21837B401 for ; Thu, 24 Oct 2002 11:00:36 -0700 (PDT) Received: from rootlabs.com (root.org [67.118.192.226]) by mx1.FreeBSD.org (Postfix) with SMTP id E28E243E91 for ; Thu, 24 Oct 2002 11:00:30 -0700 (PDT) (envelope-from nate@rootlabs.com) Received: (qmail 68988 invoked by uid 1000); 24 Oct 2002 18:00:31 -0000 Date: Thu, 24 Oct 2002 11:00:31 -0700 (PDT) From: Nate Lawson To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 20056 for review In-Reply-To: <200210241753.g9OHrlMq015866@repoman.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, 24 Oct 2002, Robert Watson wrote: > http://perforce.freebsd.org/chv.cgi?CH=20056 > > Change 20056 by rwatson@rwatson_tislabs on 2002/10/24 10:53:26 > > During the root mount, it's possible for a NULL mountpoint > to be passed to getnewvnode() to support the device vnode > we're mounting on. For now, just skip setting the > label on these vnodes, and generate a printf to make sure > our understanding of this scenario is correct. In the > future, we might want to add a KASSERT that the type of > the vnode is "none", or special case the handling here > a bit further. I hope you don't mean strcmp(vp->v_tag, "none") and instead mean vp->v_type & VNON. -Nate > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#45 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#45 (text+ko) ==== > > @@ -1004,9 +1004,14 @@ > VI_UNLOCK(vp); > #ifdef MAC > mac_init_vnode(vp); > - if ((mp->mnt_flag & MNT_MULTILABEL) == 0) { > + /* > + * NULL mp indicates that this vnode is being used for the > + * mount device for the root file system. > + */ > + if (mp != NULL && (mp->mnt_flag & MNT_MULTILABEL) == 0) { > mac_associate_vnode_singlelabel(mp, vp); > - } > + } else if (mp == NULL) > + printf("NULL mp in getnewvnode()\n"); > #endif > insmntque(vp, mp); > > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 11: 1:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A0C237B404; Thu, 24 Oct 2002 11:01:43 -0700 (PDT) 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 237D437B401 for ; Thu, 24 Oct 2002 11:01:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8152943E6A for ; Thu, 24 Oct 2002 11:01:42 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OI0vmV016709 for ; Thu, 24 Oct 2002 11:00:57 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OI0vwr016705 for perforce@freebsd.org; Thu, 24 Oct 2002 11:00:57 -0700 (PDT) Date: Thu, 24 Oct 2002 11:00:57 -0700 (PDT) Message-Id: <200210241800.g9OI0vwr016705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 20058 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20058 Change 20058 by jhb@jhb_laptop on 2002/10/24 11:00:56 Here are the non-bogus changes. Affected files ... .. //depot/projects/smpng/sys/alpha/include/alpha_cpu.h#4 edit Differences ... ==== //depot/projects/smpng/sys/alpha/include/alpha_cpu.h#4 (text+ko) ==== @@ -372,8 +372,8 @@ register u_int64_t a0 __asm__("$16") = ipir; __asm__ __volatile__ ( "call_pal 0xd #PAL_ipir" - : "=r" (a0) - : "0" (a0) + : "+r" (a0) + : : "$1", "$22", "$23", "$24", "$25"); } @@ -395,8 +395,8 @@ register u_int64_t a0 __asm__("$16") = mces; __asm__ __volatile__ ( "call_pal 0x11 #PAL_wrmces" - : "=r" (a0) - : "0" (a0) + : "+r" (a0) + : : "$1", "$22", "$23", "$24", "$25"); } @@ -406,8 +406,8 @@ register u_int64_t a0 __asm__("$16") = fen; __asm__ __volatile__ ( "call_pal 0x2b #PAL_wrfen" - : "=r" (a0) - : "0" (a0) + : "+r" (a0) + : : "$1", "$22", "$23", "$24", "$25"); } @@ -417,8 +417,8 @@ register u_int64_t a0 __asm__("$16") = vptptr; __asm__ __volatile__ ( "call_pal 0x2d #PAL_wrvptptr" - : "=r" (a0) - : "0" (a0) + : "+r" (a0) + : : "$1", "$22", "$23", "$24", "$25"); } @@ -429,8 +429,8 @@ register u_int64_t v0 __asm__("$0"); __asm__ __volatile__ ( "call_pal 0x30 #PAL_OSF1_swpctx" - : "=r" (v0), "=r" (a0) - : "1" (a0) + : "=r" (v0), "+r" (a0) + : : "$1", "$22", "$23", "$24", "$25", "memory"); return v0; } @@ -441,8 +441,8 @@ register u_int64_t a0 __asm__("$16") = sysvalue; __asm__ __volatile__ ( "call_pal 0x31 #PAL_wrval" - : "=r" (a0) - : "0" (a0) + : "+r" (a0) + : : "$1", "$22", "$23", "$24", "$25"); } @@ -465,8 +465,8 @@ register u_int64_t a1 __asm__("$17") = va; __asm__ __volatile__ ( "call_pal 0x33 #PAL_OSF1_tbi" - : "=r" (a0), "=r" (a1) - : "0" (a0), "1" (a1) + : "+r" (a0), "+r" (a1) + : : "$1", "$22", "$23", "$24", "$25"); } @@ -477,8 +477,8 @@ register u_int64_t a1 __asm__("$17") = which; __asm__ __volatile__ ( "call_pal 0x34 #PAL_OSF1_wrent" - : "=r" (a0), "=r" (a1) - : "0" (a0), "1" (a1) + : "+r" (a0), "+r" (a1) + : : "$1", "$22", "$23", "$24", "$25"); } @@ -489,8 +489,8 @@ register u_int64_t v0 __asm__("$0"); __asm__ __volatile__ ( "call_pal 0x35 #PAL_OSF1_swpipl" - : "=r" (v0), "=r" (a0) - : "1" (a0) + : "=r" (v0), "+r" (a0) + : : "$1", "$22", "$23", "$24", "$25"); return v0; } @@ -513,8 +513,8 @@ register u_int64_t a0 __asm__("$16") = usp; __asm__ __volatile__ ( "call_pal 0x38 #PAL_wrusp" - : "=r" (a0) - : "0" (a0) + : "+r" (a0) + : : "$1", "$22", "$23", "$24", "$25"); } @@ -526,8 +526,8 @@ register u_int64_t a1 __asm__("$17") = arg1; __asm__ __volatile__ ( "call_pal 0x39 #PAL_OSF1_wrperfmon" - : "=r" (a0), "=r" (a1), "=r" (v0) - : "0" (a0), "1" (a1) + : "+r" (a0), "+r" (a1), "=r" (v0) + : : "$1", "$22", "$23", "$24", "$25"); return v0; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 11: 8:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E2E337B409; Thu, 24 Oct 2002 11:07:53 -0700 (PDT) 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 151BD37B406 for ; Thu, 24 Oct 2002 11:07:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21FAE43E6E for ; Thu, 24 Oct 2002 11:07:52 -0700 (PDT) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OI77mV017227 for ; Thu, 24 Oct 2002 11:07:07 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OI76CI017224 for perforce@freebsd.org; Thu, 24 Oct 2002 11:07:06 -0700 (PDT) Date: Thu, 24 Oct 2002 11:07:06 -0700 (PDT) Message-Id: <200210241807.g9OI76CI017224@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 20061 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20061 Change 20061 by green@green_laptop_2 on 2002/10/24 11:06:31 * Continue synchronize mac_lomac with mac_biba changes (e.g. complete extattr methodology switchover). * Disable mac_lomac protection against sysctl changes for the time being. * Update mac_lomac logic to utilize demotion rather than denial, so now it's LESS like Biba! * Include debugging code for mmap revocation as that is currently not doing anything. Affected files ... .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#48 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#15 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.h#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/modules/Makefile#48 (text+ko) ==== @@ -66,6 +66,7 @@ mac_biba \ mac_bsdextended \ mac_ifoff \ + mac_lomac \ mac_mls \ mac_none \ mac_partition \ ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#15 (text+ko) ==== @@ -79,6 +79,11 @@ #include +struct mac_lomac_proc { + struct mac_lomac mac_lomac; + struct mtx mtx; +}; + SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, lomac, CTLFLAG_RW, 0, @@ -120,6 +125,8 @@ static int mac_lomac_slot; #define SLOT(l) ((struct mac_lomac *)LABEL_TO_SLOT((l), mac_lomac_slot).l_ptr) +#define PSLOT(l) ((struct mac_lomac_proc *) \ + LABEL_TO_SLOT((l), mac_lomac_slot).l_ptr) MALLOC_DEFINE(M_MACLOMAC, "lomac label", "MAC/LOMAC labels"); @@ -420,6 +427,36 @@ mac_lomac_copy_range(source, dest); } +static int +maybe_demote(struct mac_lomac *subjlabel, struct mac_lomac *objlabel) +{ + struct mac_lomac_proc *subj = PSLOT(&curthread->td_proc->p_label); + + mtx_lock(&subj->mtx); + if (subj->mac_lomac.ml_flags & MAC_LOMAC_FLAG_UPDATE) { + /* + * Check to see if the pending demotion would be more or + * less severe than this one, and keep the more severe. + * This can only happen for a multi-threaded application. + */ + if (mac_lomac_dominate_single(objlabel, &subj->mac_lomac)) + goto out; + } + bzero(&subj->mac_lomac, sizeof(subj->mac_lomac)); + mac_lomac_copy_single(objlabel, &subj->mac_lomac); + mac_lomac_set_range(&subj->mac_lomac, + objlabel->ml_single.mle_type, objlabel->ml_single.mle_grade, + objlabel->ml_single.mle_type, objlabel->ml_single.mle_grade); + subj->mac_lomac.ml_flags |= MAC_LOMAC_FLAG_UPDATE; + mtx_lock_spin(&sched_lock); + curthread->td_kse->ke_flags |= KEF_ASTPENDING; + curthread->td_proc->p_sflag |= PS_MACPEND; + mtx_unlock_spin(&sched_lock); +out: + mtx_unlock(&subj->mtx); + return (0); +} + /* * Policy module operations. */ @@ -457,6 +494,15 @@ } static void +mac_lomac_init_proc_label(struct ucred *ucred, struct label *label) +{ + + PSLOT(label) = malloc(sizeof(struct mac_lomac_proc), M_MACLOMAC, + M_ZERO | M_WAITOK); + mtx_init(&PSLOT(label)->mtx, "MAC/Lomac proc lock", NULL, MTX_DEF); +} + +static void mac_lomac_destroy_label(struct label *label) { @@ -464,6 +510,15 @@ SLOT(label) = NULL; } +static void +mac_lomac_destroy_proc_label(struct ucred *ucred, struct label *label) +{ + + mtx_destroy(&PSLOT(label)->mtx); + FREE(PSLOT(label), M_MACLOMAC); + PSLOT(label) = NULL; +} + /* * mac_lomac_element_to_string() is basically an snprintf wrapper with * the same properties as snprintf(). It returns the length it would @@ -763,30 +818,6 @@ } static void -mac_lomac_create_vnode(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct vnode *vp, struct label *vlabel) -{ - struct mac_lomac *source, *dest, temp; - size_t buflen; - int error; - - buflen = sizeof(temp); - bzero(&temp, buflen); - - source = SLOT(&cred->cr_label); - dest = SLOT(vlabel); - mac_lomac_copy_single(source, &temp); - - error = vn_extattr_set(vp, IO_NODELOCKED, MAC_LOMAC_EXTATTR_NAMESPACE, - MAC_LOMAC_EXTATTR_NAME, buflen, (char *)&temp, curthread); - if (error == 0) - mac_lomac_copy_single(source, dest); -#ifdef notyet - return (error); -#endif -} - -static void mac_lomac_create_mount(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel) { @@ -825,7 +856,7 @@ source = SLOT(label); #ifdef notyet - if ((source->ml_flags & MAC_BIBA_FLAG_SINGLE) == 0) + if ((source->ml_flags & MAC_LOMAC_FLAG_SINGLE) == 0) return (0); #endif #ifndef notyet @@ -854,24 +885,21 @@ } static void -mac_lomac_update_procfsvnode(struct vnode *vp, struct label *vnodelabel, - struct ucred *cred) +mac_lomac_associate_vnode_devfs(struct mount *mp, struct label *fslabel, + struct devfs_dirent *de, struct label *delabel, struct vnode *vp, + struct label *vlabel) { struct mac_lomac *source, *dest; - source = SLOT(&cred->cr_label); - dest = SLOT(vnodelabel); + source = SLOT(delabel); + dest = SLOT(vlabel); - /* - * Only copy the single, not the range, since vnodes only have - * a single. - */ mac_lomac_copy_single(source, dest); } static int -mac_lomac_update_vnode_from_extattr(struct vnode *vp, struct label *vlabel, - struct mount *mp, struct label *fslabel) +mac_lomac_associate_vnode_extattr(struct mount *mp, struct label *fslabel, + struct vnode *vp, struct label *vlabel) { struct mac_lomac temp, *source, *dest; size_t buflen; @@ -911,17 +939,61 @@ } static void -mac_lomac_update_vnode_from_mount(struct vnode *vp, struct label *vnodelabel, - struct mount *mp, struct label *fslabel) +mac_lomac_associate_vnode_singlelabel(struct mount *mp, + struct label *fslabel, struct vnode *vp, struct label *vlabel) { struct mac_lomac *source, *dest; source = SLOT(fslabel); - dest = SLOT(vnodelabel); + dest = SLOT(vlabel); mac_lomac_copy_single(source, dest); } +static int +mac_lomac_create_vnode_extattr(struct ucred *cred, struct mount *mp, + struct label *fslabel, struct vnode *dvp, struct label *dlabel, + struct vnode *vp, struct label *vlabel, struct componentname *cnp) +{ + struct mac_lomac *source, *dest, temp; + size_t buflen; + int error; + + buflen = sizeof(temp); + bzero(&temp, buflen); + + source = SLOT(&cred->cr_label); + dest = SLOT(vlabel); + mac_lomac_copy_single(source, &temp); + + error = vn_extattr_set(vp, IO_NODELOCKED, MAC_LOMAC_EXTATTR_NAMESPACE, + MAC_LOMAC_EXTATTR_NAME, buflen, (char *)&temp, curthread); + if (error == 0) + mac_lomac_copy_single(source, dest); + return (error); +} + +static int +mac_lomac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, + struct label *vlabel, struct label *intlabel) +{ + struct mac_lomac *source, temp; + size_t buflen; + int error; + + buflen = sizeof(temp); + bzero(&temp, buflen); + + source = SLOT(intlabel); + if ((source->ml_flags & MAC_LOMAC_FLAG_SINGLE) == 0) + return (0); + + mac_lomac_copy_single(source, &temp); + error = vn_extattr_set(vp, IO_NODELOCKED, MAC_LOMAC_EXTATTR_NAMESPACE, + MAC_LOMAC_EXTATTR_NAME, buflen, (char *)&temp, curthread); + return (error); +} + /* * Labeling event operations: IPC object. */ @@ -1473,24 +1545,6 @@ } static int -mac_lomac_check_mount_stat(struct ucred *cred, struct mount *mp, - struct label *mntlabel) -{ - struct mac_lomac *subj, *obj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(mntlabel); - - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); - - return (0); -} - -static int mac_lomac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) { @@ -1504,24 +1558,6 @@ } static int -mac_lomac_check_pipe_poll(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel) -{ - struct mac_lomac *subj, *obj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT((pipelabel)); - - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); - - return (0); -} - -static int mac_lomac_check_pipe_read(struct ucred *cred, struct pipe *pipe, struct label *pipelabel) { @@ -1534,7 +1570,7 @@ obj = SLOT((pipelabel)); if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); + return (maybe_demote(subj, obj)); return (0); } @@ -1591,24 +1627,6 @@ } static int -mac_lomac_check_pipe_stat(struct ucred *cred, struct pipe *pipe, - struct label *pipelabel) -{ - struct mac_lomac *subj, *obj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT((pipelabel)); - - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); - - return (0); -} - -static int mac_lomac_check_pipe_write(struct ucred *cred, struct pipe *pipe, struct label *pipelabel) { @@ -1774,6 +1792,7 @@ mac_lomac_check_sysctl(struct ucred *cred, int *name, u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen) { +#ifdef notyet struct mac_lomac *subj; if (!mac_lomac_enabled) @@ -1790,46 +1809,11 @@ return (EPERM); } - return (0); -} - -static int -mac_lomac_check_vnode_chdir(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) -{ - struct mac_lomac *subj, *obj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(dlabel); - - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); - +#endif return (0); } static int -mac_lomac_check_vnode_chroot(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) -{ - struct mac_lomac *subj, *obj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(dlabel); - - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); - - return (0); -} - -static int mac_lomac_check_vnode_create(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct componentname *cnp, struct vattr *vap) { @@ -1890,60 +1874,6 @@ } static int -mac_lomac_check_vnode_exec(struct ucred *cred, struct vnode *vp, - struct label *label, struct image_params *imgp) -{ - struct mac_lomac *subj, *obj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(label); - - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); - - return (0); -} - -static int -mac_lomac_check_vnode_getacl(struct ucred *cred, struct vnode *vp, - struct label *label, acl_type_t type) -{ - struct mac_lomac *subj, *obj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(label); - - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); - - return (0); -} - -static int -mac_lomac_check_vnode_getextattr(struct ucred *cred, struct vnode *vp, - struct label *label, int attrnamespace, const char *name, struct uio *uio) -{ - struct mac_lomac *subj, *obj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(label); - - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); - - return (0); -} - -static int mac_lomac_check_vnode_link(struct ucred *cred, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *label, struct componentname *cnp) @@ -1968,25 +1898,35 @@ } static int -mac_lomac_check_vnode_lookup(struct ucred *cred, struct vnode *dvp, - struct label *dlabel, struct componentname *cnp) +mac_lomac_check_vnode_mmap(struct ucred *cred, struct vnode *vp, + struct label *label, int prot) { struct mac_lomac *subj, *obj; + /* + * Rely on the use of open()-time protections to handle + * non-revocation cases. + */ if (!mac_lomac_enabled) return (0); subj = SLOT(&cred->cr_label); - obj = SLOT(dlabel); + obj = SLOT(label); - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); + if (prot & VM_PROT_WRITE) { + if (!mac_lomac_dominate_single(subj, obj)) + return (EACCES); + } + if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { + if (!mac_lomac_dominate_single(obj, subj)) + return (maybe_demote(subj, obj)); + } return (0); } static int -mac_lomac_check_vnode_mmap(struct ucred *cred, struct vnode *vp, +mac_lomac_check_vnode_mprotect(struct ucred *cred, struct vnode *vp, struct label *label, int prot) { struct mac_lomac *subj, *obj; @@ -2001,82 +1941,69 @@ subj = SLOT(&cred->cr_label); obj = SLOT(label); - if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); - } if (prot & VM_PROT_WRITE) { if (!mac_lomac_dominate_single(subj, obj)) return (EACCES); } - - return (0); -} - -static int -mac_lomac_check_vnode_open(struct ucred *cred, struct vnode *vp, - struct label *vnodelabel, mode_t acc_mode) -{ - struct mac_lomac *subj, *obj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(vnodelabel); - - /* XXX privilege override for admin? */ - if (acc_mode & (VREAD | VEXEC | VSTAT)) { + if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { if (!mac_lomac_dominate_single(obj, subj)) return (EACCES); } - if (acc_mode & (VWRITE | VAPPEND | VADMIN)) { - if (!mac_lomac_dominate_single(subj, obj)) - return (EACCES); - } return (0); } -static int -mac_lomac_check_vnode_poll(struct ucred *active_cred, struct ucred *file_cred, - struct vnode *vp, struct label *label) +static __inline const char * +prot2str(vm_prot_t prot) { - struct mac_lomac *subj, *obj; - if (!mac_lomac_enabled || !revocation_enabled) - return (0); - - subj = SLOT(&active_cred->cr_label); - obj = SLOT(label); - - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); - - return (0); + switch (prot & VM_PROT_ALL) { + case VM_PROT_READ: + return ("r--"); + case VM_PROT_READ | VM_PROT_WRITE: + return ("rw-"); + case VM_PROT_READ | VM_PROT_EXECUTE: + return ("r-x"); + case VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE: + return ("rwx"); + case VM_PROT_WRITE: + return ("-w-"); + case VM_PROT_EXECUTE: + return ("--x"); + case VM_PROT_WRITE | VM_PROT_EXECUTE: + return ("-wx"); + default: + return ("---"); + } } -static int -mac_lomac_check_vnode_read(struct ucred *active_cred, struct ucred *file_cred, - struct vnode *vp, struct label *label) +static void +mac_lomac_check_vnode_mmap_downgrade(struct ucred *cred, struct vnode *vp, + struct label *label, vm_prot_t *prot) { struct mac_lomac *subj, *obj; + /* + * Rely on the use of open()-time protections to handle + * non-revocation cases. + */ if (!mac_lomac_enabled || !revocation_enabled) - return (0); + return; - subj = SLOT(&active_cred->cr_label); + subj = SLOT(&cred->cr_label); obj = SLOT(label); - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); - - return (0); + printf("lomac mmap dg (%u): *prot was %s\n", + curthread->td_proc->p_pid, prot2str(*prot)); + if (!mac_lomac_dominate_single(subj, obj)) + *prot &= ~VM_PROT_WRITE; + printf("lomac mmap dg (%u): *prot is %s\n", + curthread->td_proc->p_pid, prot2str(*prot)); } static int -mac_lomac_check_vnode_readdir(struct ucred *cred, struct vnode *dvp, - struct label *dlabel) +mac_lomac_check_vnode_open(struct ucred *cred, struct vnode *vp, + struct label *vnodelabel, mode_t acc_mode) { struct mac_lomac *subj, *obj; @@ -2084,28 +2011,31 @@ return (0); subj = SLOT(&cred->cr_label); - obj = SLOT(dlabel); + obj = SLOT(vnodelabel); - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); + /* XXX privilege override for admin? */ + if (acc_mode & (VWRITE | VAPPEND | VADMIN)) { + if (!mac_lomac_dominate_single(subj, obj)) + return (EACCES); + } return (0); } static int -mac_lomac_check_vnode_readlink(struct ucred *cred, struct vnode *vp, - struct label *label) +mac_lomac_check_vnode_read(struct ucred *active_cred, struct ucred *file_cred, + struct vnode *vp, struct label *label) { struct mac_lomac *subj, *obj; - if (!mac_lomac_enabled) + if (!mac_lomac_enabled || !revocation_enabled) return (0); - subj = SLOT(&cred->cr_label); + subj = SLOT(&active_cred->cr_label); obj = SLOT(label); if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); + return (maybe_demote(subj, obj)); return (0); } @@ -2341,24 +2271,6 @@ } static int -mac_lomac_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred, - struct vnode *vp, struct label *vnodelabel) -{ - struct mac_lomac *subj, *obj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(&active_cred->cr_label); - obj = SLOT(vnodelabel); - - if (!mac_lomac_dominate_single(obj, subj)) - return (EACCES); - - return (0); -} - -static int mac_lomac_check_vnode_swapon(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -2394,6 +2306,46 @@ return (0); } +static void +mac_lomac_thread_userret(struct thread *td) +{ + struct proc *p = td->td_proc; + struct mac_lomac_proc *subj = PSLOT(&p->p_label); + struct ucred *newcred, *oldcred; + + mtx_lock(&subj->mtx); + if (subj->mac_lomac.ml_flags & MAC_LOMAC_FLAG_UPDATE) { + mtx_unlock(&subj->mtx); + newcred = crget(); + /* + * Prevent a lock order reversal in + * mac_cred_mmapped_drop_perms; ideally, the other + * user of subj->mtx wouldn't be holding Giant. + */ + mtx_lock(&Giant); + mtx_lock(&subj->mtx); + /* + * Check if we lost the race while allocating the cred. + */ + if ((subj->mac_lomac.ml_flags & MAC_LOMAC_FLAG_UPDATE) == 0) + goto out; + PROC_LOCK(p); + oldcred = p->p_ucred; + crcopy(newcred, oldcred); + crhold(newcred); + mac_lomac_copy(&subj->mac_lomac, SLOT(&newcred->cr_label)); + p->p_ucred = newcred; + crfree(oldcred); + PROC_UNLOCK(p); + mac_cred_mmapped_drop_perms(curthread, newcred); + out: + mtx_unlock(&subj->mtx); + mtx_unlock(&Giant); + } else { + mtx_unlock(&subj->mtx); + } +} + static struct mac_policy_op_entry mac_lomac_ops[] = { { MAC_DESTROY, @@ -2418,6 +2370,8 @@ (macop_t)mac_lomac_init_label }, { MAC_INIT_PIPE_LABEL, (macop_t)mac_lomac_init_label }, + { MAC_INIT_PROC, + (macop_t)mac_lomac_init_proc_label }, { MAC_INIT_SOCKET_LABEL, (macop_t)mac_lomac_init_label_waitcheck }, { MAC_INIT_SOCKET_PEER_LABEL, @@ -2442,6 +2396,8 @@ (macop_t)mac_lomac_destroy_label }, { MAC_DESTROY_PIPE_LABEL, (macop_t)mac_lomac_destroy_label }, + { MAC_DESTROY_PROC, + (macop_t)mac_lomac_destroy_proc_label }, { MAC_DESTROY_SOCKET_LABEL, (macop_t)mac_lomac_destroy_label }, { MAC_DESTROY_SOCKET_PEER_LABEL, @@ -2482,8 +2438,6 @@ (macop_t)mac_lomac_create_devfs_symlink }, { MAC_CREATE_DEVFS_VNODE, (macop_t)mac_lomac_create_devfs_vnode }, - { MAC_CREATE_VNODE, - (macop_t)mac_lomac_create_vnode }, { MAC_CREATE_MOUNT, (macop_t)mac_lomac_create_mount }, { MAC_CREATE_ROOT_MOUNT, @@ -2492,12 +2446,16 @@ (macop_t)mac_lomac_relabel_vnode }, { MAC_UPDATE_DEVFSDIRENT, (macop_t)mac_lomac_update_devfsdirent }, - { MAC_UPDATE_PROCFSVNODE, - (macop_t)mac_lomac_update_procfsvnode }, - { MAC_UPDATE_VNODE_FROM_EXTATTR, - (macop_t)mac_lomac_update_vnode_from_extattr }, - { MAC_UPDATE_VNODE_FROM_MOUNT, - (macop_t)mac_lomac_update_vnode_from_mount }, + { MAC_ASSOCIATE_VNODE_DEVFS, + (macop_t)mac_lomac_associate_vnode_devfs }, + { MAC_ASSOCIATE_VNODE_EXTATTR, + (macop_t)mac_lomac_associate_vnode_extattr }, + { MAC_ASSOCIATE_VNODE_SINGLELABEL, + (macop_t)mac_lomac_associate_vnode_singlelabel }, + { MAC_CREATE_VNODE_EXTATTR, + (macop_t)mac_lomac_create_vnode_extattr }, + { MAC_SETLABEL_VNODE_EXTATTR, + (macop_t)mac_lomac_setlabel_vnode_extattr }, { MAC_CREATE_MBUF_FROM_SOCKET, (macop_t)mac_lomac_create_mbuf_from_socket }, { MAC_CREATE_PIPE, @@ -2564,18 +2522,12 @@ (macop_t)mac_lomac_check_ifnet_relabel }, { MAC_CHECK_IFNET_TRANSMIT, (macop_t)mac_lomac_check_ifnet_transmit }, - { MAC_CHECK_MOUNT_STAT, - (macop_t)mac_lomac_check_mount_stat }, { MAC_CHECK_PIPE_IOCTL, (macop_t)mac_lomac_check_pipe_ioctl }, - { MAC_CHECK_PIPE_POLL, - (macop_t)mac_lomac_check_pipe_poll }, { MAC_CHECK_PIPE_READ, (macop_t)mac_lomac_check_pipe_read }, { MAC_CHECK_PIPE_RELABEL, (macop_t)mac_lomac_check_pipe_relabel }, - { MAC_CHECK_PIPE_STAT, - (macop_t)mac_lomac_check_pipe_stat }, { MAC_CHECK_PIPE_WRITE, (macop_t)mac_lomac_check_pipe_write }, { MAC_CHECK_PROC_DEBUG, @@ -2594,40 +2546,24 @@ (macop_t)mac_lomac_check_sysctl }, { MAC_CHECK_VNODE_ACCESS, (macop_t)mac_lomac_check_vnode_open }, - { MAC_CHECK_VNODE_CHDIR, - (macop_t)mac_lomac_check_vnode_chdir }, - { MAC_CHECK_VNODE_CHROOT, - (macop_t)mac_lomac_check_vnode_chroot }, { MAC_CHECK_VNODE_CREATE, (macop_t)mac_lomac_check_vnode_create }, { MAC_CHECK_VNODE_DELETE, (macop_t)mac_lomac_check_vnode_delete }, { MAC_CHECK_VNODE_DELETEACL, (macop_t)mac_lomac_check_vnode_deleteacl }, - { MAC_CHECK_VNODE_EXEC, - (macop_t)mac_lomac_check_vnode_exec }, - { MAC_CHECK_VNODE_GETACL, - (macop_t)mac_lomac_check_vnode_getacl }, - { MAC_CHECK_VNODE_GETEXTATTR, - (macop_t)mac_lomac_check_vnode_getextattr }, { MAC_CHECK_VNODE_LINK, (macop_t)mac_lomac_check_vnode_link }, - { MAC_CHECK_VNODE_LOOKUP, - (macop_t)mac_lomac_check_vnode_lookup }, { MAC_CHECK_VNODE_MMAP, (macop_t)mac_lomac_check_vnode_mmap }, + { MAC_CHECK_VNODE_MMAP_DOWNGRADE, + (macop_t)mac_lomac_check_vnode_mmap_downgrade }, { MAC_CHECK_VNODE_MPROTECT, - (macop_t)mac_lomac_check_vnode_mmap }, + (macop_t)mac_lomac_check_vnode_mprotect }, { MAC_CHECK_VNODE_OPEN, (macop_t)mac_lomac_check_vnode_open }, - { MAC_CHECK_VNODE_POLL, - (macop_t)mac_lomac_check_vnode_poll }, { MAC_CHECK_VNODE_READ, (macop_t)mac_lomac_check_vnode_read }, - { MAC_CHECK_VNODE_READDIR, - (macop_t)mac_lomac_check_vnode_readdir }, - { MAC_CHECK_VNODE_READLINK, - (macop_t)mac_lomac_check_vnode_readlink }, { MAC_CHECK_VNODE_RELABEL, (macop_t)mac_lomac_check_vnode_relabel }, { MAC_CHECK_VNODE_RENAME_FROM, @@ -2648,12 +2584,12 @@ (macop_t)mac_lomac_check_vnode_setowner }, { MAC_CHECK_VNODE_SETUTIMES, (macop_t)mac_lomac_check_vnode_setutimes }, - { MAC_CHECK_VNODE_STAT, - (macop_t)mac_lomac_check_vnode_stat }, { MAC_CHECK_VNODE_SWAPON, (macop_t)mac_lomac_check_vnode_swapon }, { MAC_CHECK_VNODE_WRITE, (macop_t)mac_lomac_check_vnode_write }, + { MAC_THREAD_USERRET, + (macop_t)mac_lomac_thread_userret }, { MAC_OP_LAST, NULL } }; ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.h#8 (text+ko) ==== @@ -50,6 +50,10 @@ #define MAC_LOMAC_FLAG_SINGLE 0x00000001 /* mb_single initialized */ #define MAC_LOMAC_FLAG_RANGE 0x00000002 /* mb_range* initialized */ #define MAC_LOMAC_FLAGS_BOTH (MAC_LOMAC_FLAG_SINGLE | MAC_LOMAC_FLAG_RANGE) +#define MAC_LOMAC_CFLAG_SINGLE 0x00000004 /* mb_single initialized */ +#define MAC_LOMAC_CFLAG_RANGE 0x00000008 /* mb_range* initialized */ +#define MAC_LOMAC_CFLAGS_BOTH (MAC_LOMAC_CFLAG_SINGLE | MAC_LOMAC_CFLAG_RANGE) +#define MAC_LOMAC_FLAG_UPDATE 0x00000010 /* must demote this process */ #define MAC_LOMAC_TYPE_UNDEF 0 /* Undefined */ #define MAC_LOMAC_TYPE_GRADE 1 /* Hierarchal grade with mb_grade. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 11:13: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D0D137B407; Thu, 24 Oct 2002 11:13:00 -0700 (PDT) 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 29C2E37B4F6 for ; Thu, 24 Oct 2002 11:12:59 -0700 (PDT) Received: from mail.speakeasy.net (mail17.speakeasy.net [216.254.0.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1204643E8A for ; Thu, 24 Oct 2002 11:12:57 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 9138 invoked from network); 24 Oct 2002 18:13:01 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail17.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 24 Oct 2002 18:13:01 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.6/8.12.6) with ESMTP id g9OICrn5071696; Thu, 24 Oct 2002 14:12:54 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Thu, 24 Oct 2002 14:12:57 -0400 (EDT) From: John Baldwin To: Nate Lawson Subject: Re: PERFORCE change 20056 for review Cc: Perforce Change Reviews Cc: Perforce Change Reviews , Robert Watson Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 24-Oct-2002 Nate Lawson wrote: > On Thu, 24 Oct 2002, Robert Watson wrote: >> http://perforce.freebsd.org/chv.cgi?CH=20056 >> >> Change 20056 by rwatson@rwatson_tislabs on 2002/10/24 10:53:26 >> >> During the root mount, it's possible for a NULL mountpoint >> to be passed to getnewvnode() to support the device vnode >> we're mounting on. For now, just skip setting the >> label on these vnodes, and generate a printf to make sure >> our understanding of this scenario is correct. In the >> future, we might want to add a KASSERT that the type of >> the vnode is "none", or special case the handling here >> a bit further. > > I hope you don't mean strcmp(vp->v_tag, "none") and instead mean > vp->v_type & VNON. Speaking of v_tag, can you fix the devel/libgtop port on current? This is the patch I used to get it building the other day: > cat patch-sysdeps_freebsd_procmap.c --- sysdeps/freebsd/procmap.c.orig Tue Oct 15 20:00:35 2002 +++ sysdeps/freebsd/procmap.c Tue Oct 15 20:05:54 2002 @@ -251,6 +251,7 @@ &vnode, sizeof (vnode)) != sizeof (vnode)) glibtop_error_io_r (server, "kvm_read (vnode)"); +#if __FreeBSD_version < 500000 if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) || !vnode.v_data) continue; @@ -261,6 +262,7 @@ maps [i-1].inode = inode.i_number; maps [i-1].device = inode.i_dev; +#endif #endif } while (entry.next != first); -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 11:43:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DCFC37B406; Thu, 24 Oct 2002 11:43:38 -0700 (PDT) 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 9821037B401 for ; Thu, 24 Oct 2002 11:43:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5472243E65 for ; Thu, 24 Oct 2002 11:43:37 -0700 (PDT) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OIgqmV019739 for ; Thu, 24 Oct 2002 11:42:52 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OIgpMJ019736 for perforce@freebsd.org; Thu, 24 Oct 2002 11:42:51 -0700 (PDT) Date: Thu, 24 Oct 2002 11:42:51 -0700 (PDT) Message-Id: <200210241842.g9OIgpMJ019736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 20064 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20064 Change 20064 by green@green_laptop_2 on 2002/10/24 11:42:34 Change default MAC VM permissions to: security.mac.enforce_vm: 1 security.mac.mmap_revocation: 0 security.mac.mmap_revocation_via_cow: 1 Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#327 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#327 (text+ko) ==== @@ -142,7 +142,7 @@ &mac_enforce_sysctl, 0, "Enforce MAC policy on sysctl operations"); TUNABLE_INT("security.mac.enforce_sysctl", &mac_enforce_sysctl); -static int mac_enforce_vm = 0; +static int mac_enforce_vm = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); @@ -157,7 +157,7 @@ SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " "relabel"); -static int mac_mmap_revocation_via_cow = 0; +static int mac_mmap_revocation_via_cow = 1; SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation_via_cow, CTLFLAG_RW, &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " "copy-on-write semantics, or by removing all write access"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 11:52:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3262C37B406; Thu, 24 Oct 2002 11:52:36 -0700 (PDT) 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 C10E437B401 for ; Thu, 24 Oct 2002 11:52:35 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9055943E65 for ; Thu, 24 Oct 2002 11:52:31 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g9OIpwOo033786; Thu, 24 Oct 2002 14:51:58 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Thu, 24 Oct 2002 14:51:57 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Nate Lawson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 20056 for review In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Thu, 24 Oct 2002, Nate Lawson wrote: > On Thu, 24 Oct 2002, Robert Watson wrote: > > http://perforce.freebsd.org/chv.cgi?CH=20056 > > > > Change 20056 by rwatson@rwatson_tislabs on 2002/10/24 10:53:26 > > > > During the root mount, it's possible for a NULL mountpoint > > to be passed to getnewvnode() to support the device vnode > > we're mounting on. For now, just skip setting the > > label on these vnodes, and generate a printf to make sure > > our understanding of this scenario is correct. In the > > future, we might want to add a KASSERT that the type of > > the vnode is "none", or special case the handling here > > a bit further. > > I hope you don't mean strcmp(vp->v_tag, "none") and instead mean > vp->v_type & VNON. But of course :-). Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 12: 2: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC91A37B401; Thu, 24 Oct 2002 12:02:04 -0700 (PDT) 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 B399F37B42A for ; Thu, 24 Oct 2002 12:02:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A2EA43E42 for ; Thu, 24 Oct 2002 12:02:00 -0700 (PDT) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OJ1FmV021115 for ; Thu, 24 Oct 2002 12:01:15 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OJ1EcC021112 for perforce@freebsd.org; Thu, 24 Oct 2002 12:01:14 -0700 (PDT) Date: Thu, 24 Oct 2002 12:01:14 -0700 (PDT) Message-Id: <200210241901.g9OJ1EcC021112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 20065 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20065 Change 20065 by green@green_laptop_2 on 2002/10/24 12:00:22 Revocation being enabled is pretty important to LOMAC operation, so enable it here by default. Still leave the policy itself disabled. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#17 (text+ko) ==== @@ -118,7 +118,7 @@ &ptys_equal, 0, "Label pty devices as lomac/equal on create"); TUNABLE_INT("security.mac.lomac.ptys_equal", &ptys_equal); -static int revocation_enabled = 0; +static int revocation_enabled = 1; SYSCTL_INT(_security_mac_lomac, OID_AUTO, revocation_enabled, CTLFLAG_RW, &revocation_enabled, 0, "Revoke access to objects on relabel"); TUNABLE_INT("security.mac.lomac.revocation_enabled", &revocation_enabled); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 12:18:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28C2437B404; Thu, 24 Oct 2002 12:18:10 -0700 (PDT) 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 AF01837B401; Thu, 24 Oct 2002 12:18:09 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9730243E6E; Thu, 24 Oct 2002 12:18:06 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g9OJHTOo041303; Thu, 24 Oct 2002 15:17:30 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Thu, 24 Oct 2002 15:17:28 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 20064 for review In-Reply-To: <200210241842.g9OIgpMJ019736@repoman.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Note that this is arguably incorrect for all policies but LOMAC, since "fail stop" is the desired behavior for Biba, MLS, SELinux, and others. This is why I changed the default for cow to off. We should look into a way to provide both what LOMAC and the other policies need, perhaps by having two entry points: one for the purpose of downgrading with COW, one without. In particular, pay attention to cases like: LOMAC wants to downgrade write to read-only Biba wants to remove write entirely The desired composition in this case is probably the Biba result. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Thu, 24 Oct 2002, Brian Feldman wrote: > http://perforce.freebsd.org/chv.cgi?CH=20064 > > Change 20064 by green@green_laptop_2 on 2002/10/24 11:42:34 > > Change default MAC VM permissions to: > > security.mac.enforce_vm: 1 > security.mac.mmap_revocation: 0 > security.mac.mmap_revocation_via_cow: 1 > > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#327 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#327 (text+ko) ==== > > @@ -142,7 +142,7 @@ > &mac_enforce_sysctl, 0, "Enforce MAC policy on sysctl operations"); > TUNABLE_INT("security.mac.enforce_sysctl", &mac_enforce_sysctl); > > -static int mac_enforce_vm = 0; > +static int mac_enforce_vm = 1; > SYSCTL_INT(_security_mac, OID_AUTO, enforce_vm, CTLFLAG_RW, > &mac_enforce_vm, 0, "Enforce MAC policy on vm operations"); > TUNABLE_INT("security.mac.enforce_vm", &mac_enforce_vm); > @@ -157,7 +157,7 @@ > SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation, CTLFLAG_RW, > &mac_mmap_revocation, 0, "Revoke mmap access to files on subject " > "relabel"); > -static int mac_mmap_revocation_via_cow = 0; > +static int mac_mmap_revocation_via_cow = 1; > SYSCTL_INT(_security_mac, OID_AUTO, mmap_revocation_via_cow, CTLFLAG_RW, > &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " > "copy-on-write semantics, or by removing all write access"); > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 12:19:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE86C37B404; Thu, 24 Oct 2002 12:19:24 -0700 (PDT) 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 4F24237B401; Thu, 24 Oct 2002 12:19:24 -0700 (PDT) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 094F643E65; Thu, 24 Oct 2002 12:19:22 -0700 (PDT) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id g9OJInOo041635; Thu, 24 Oct 2002 15:18:49 -0400 (EDT) (envelope-from robert@fledge.watson.org) Date: Thu, 24 Oct 2002 15:18:49 -0400 (EDT) From: Robert Watson X-Sender: robert@fledge.watson.org To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 20065 for review In-Reply-To: <200210241901.g9OJ1EcC021112@repoman.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG An interesting question will be whether our process-based labels provide close enough behavior to traditional LOMAC "process group" behavior for pipeline downgrades. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Thu, 24 Oct 2002, Brian Feldman wrote: > http://perforce.freebsd.org/chv.cgi?CH=20065 > > Change 20065 by green@green_laptop_2 on 2002/10/24 12:00:22 > > Revocation being enabled is pretty important to LOMAC operation, > so enable it here by default. Still leave the policy itself > disabled. > > Affected files ... > > .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#17 edit > > Differences ... > > ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#17 (text+ko) ==== > > @@ -118,7 +118,7 @@ > &ptys_equal, 0, "Label pty devices as lomac/equal on create"); > TUNABLE_INT("security.mac.lomac.ptys_equal", &ptys_equal); > > -static int revocation_enabled = 0; > +static int revocation_enabled = 1; > SYSCTL_INT(_security_mac_lomac, OID_AUTO, revocation_enabled, CTLFLAG_RW, > &revocation_enabled, 0, "Revoke access to objects on relabel"); > TUNABLE_INT("security.mac.lomac.revocation_enabled", &revocation_enabled); > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 12:44:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 20E1737B406; Thu, 24 Oct 2002 12:44:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 7724737B401; Thu, 24 Oct 2002 12:44:24 -0700 (PDT) Received: from green.bikeshed.org (9pc9770ni7g3nsuo@green.bikeshed.org [10.0.0.1] (may be forged)) by green.bikeshed.org (8.12.6/8.12.6) with ESMTP id g9OJiOPw023927; Thu, 24 Oct 2002 15:44:24 -0400 (EDT) (envelope-from green@green.bikeshed.org) Received: from localhost (green@localhost) by green.bikeshed.org (8.12.6/8.12.6/Submit) with ESMTP id g9OJiOMU023924; Thu, 24 Oct 2002 15:44:24 -0400 (EDT) Message-Id: <200210241944.g9OJiOMU023924@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Robert Watson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 20064 for review In-Reply-To: Your message of "Thu, 24 Oct 2002 15:17:28 EDT." From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 24 Oct 2002 15:44:24 -0400 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson wrote: > Note that this is arguably incorrect for all policies but LOMAC, since > "fail stop" is the desired behavior for Biba, MLS, SELinux, and others. > This is why I changed the default for cow to off. We should look into a > way to provide both what LOMAC and the other policies need, perhaps by > having two entry points: one for the purpose of downgrading with COW, one > without. In particular, pay attention to cases like: > > LOMAC wants to downgrade write to read-only > Biba wants to remove write entirely > > The desired composition in this case is probably the Biba result. Well, note that nothing at all was enforced previously, and only LOMAC is capable of requesting downgrade at the moment, so this is effectively a LOMAC option, but in the wrong place :) I think the simple solution would be adding an int *dontCOW argument, and in policies which would like to revoke without COW something like: if (shouldrevoke(subj, obj)) { *perms &= ~VM_OBJECT_READ; if (I_should_not_COW) ++*dontCOW; } -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 13:34:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBD3D37B404; Thu, 24 Oct 2002 13:33:58 -0700 (PDT) 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 706B537B401 for ; Thu, 24 Oct 2002 13:33:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CF8043E6A for ; Thu, 24 Oct 2002 13:33:57 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OKXCmV027244 for ; Thu, 24 Oct 2002 13:33:12 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OKXBCH027241 for perforce@freebsd.org; Thu, 24 Oct 2002 13:33:11 -0700 (PDT) Date: Thu, 24 Oct 2002 13:33:11 -0700 (PDT) Message-Id: <200210242033.g9OKXBCH027241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 20073 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20073 Change 20073 by jhb@jhb_laptop on 2002/10/24 13:32:26 IFC @20072. Affected files ... .. //depot/projects/smpng/sys/boot/efi/libefi/bootinfo.c#5 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/efiboot.h#5 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/elf_freebsd.c#8 integrate .. //depot/projects/smpng/sys/conf/NOTES#27 integrate .. //depot/projects/smpng/sys/conf/files#53 integrate .. //depot/projects/smpng/sys/conf/files.i386#33 integrate .. //depot/projects/smpng/sys/conf/files.ia64#21 integrate .. //depot/projects/smpng/sys/conf/files.pc98#32 integrate .. //depot/projects/smpng/sys/conf/majors#16 integrate .. //depot/projects/smpng/sys/conf/options#39 integrate .. //depot/projects/smpng/sys/conf/options.ia64#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#15 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#24 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-all.h#10 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/smpng/sys/dev/ic/cd180.h#1 branch .. //depot/projects/smpng/sys/dev/rc/rc.c#1 branch .. //depot/projects/smpng/sys/dev/rc/rcreg.h#1 branch .. //depot/projects/smpng/sys/geom/geom_subr.c#13 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC.hints#3 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#45 integrate .. //depot/projects/smpng/sys/i386/include/speaker.h#2 integrate .. //depot/projects/smpng/sys/i386/isa/ic/cd180.h#2 delete .. //depot/projects/smpng/sys/i386/isa/pmtimer.c#3 integrate .. //depot/projects/smpng/sys/i386/isa/rc.c#12 delete .. //depot/projects/smpng/sys/i386/isa/rcreg.h#2 delete .. //depot/projects/smpng/sys/ia64/conf/GENERIC#23 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#46 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#51 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#39 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#9 integrate .. //depot/projects/smpng/sys/kern/subr_mchain.c#8 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#11 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#35 integrate .. //depot/projects/smpng/sys/modules/Makefile#36 integrate .. //depot/projects/smpng/sys/modules/mac_biba/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/mac_ifoff/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/mac_mls/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/mac_none/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/mac_partition/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mac_test/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/rc/Makefile#1 branch .. //depot/projects/smpng/sys/modules/vinum/Makefile#3 integrate .. //depot/projects/smpng/sys/net/if_tun.c#17 integrate .. //depot/projects/smpng/sys/netinet/in.c#14 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#20 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#17 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC.hints#4 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#43 integrate .. //depot/projects/smpng/sys/pc98/pc98/clock.c#12 integrate .. //depot/projects/smpng/sys/pc98/pc98/syscons_pc98.c#4 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#1 branch .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.h#1 branch .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#22 integrate .. //depot/projects/smpng/sys/sparc64/include/frame.h#11 integrate .. //depot/projects/smpng/sys/sparc64/include/reg.h#12 integrate .. //depot/projects/smpng/sys/sparc64/include/ucontext.h#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#24 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#36 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#7 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#40 integrate .. //depot/projects/smpng/sys/sys/conf.h#16 integrate .. //depot/projects/smpng/sys/sys/mac.h#5 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#5 integrate .. //depot/projects/smpng/sys/sys/proc.h#63 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#11 integrate .. //depot/projects/smpng/sys/sys/unistd.h#8 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#19 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#20 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_swap.c#16 integrate Differences ... ==== //depot/projects/smpng/sys/boot/efi/libefi/bootinfo.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.6 2002/06/20 06:29:42 peter Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/bootinfo.c,v 1.7 2002/10/24 07:53:12 marcel Exp $ */ #include @@ -244,7 +244,8 @@ * - Module metadata are formatted and placed in kernel space. */ int -bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey) +bi_load(struct bootinfo *bi, struct preloaded_file *fp, UINTN *mapkey, + UINTN pages) { char *rootdevname; struct efi_devdesc *rootdev; @@ -254,7 +255,7 @@ vm_offset_t ssym, esym; struct file_metadata *md; EFI_STATUS status; - UINTN key; + UINTN bisz, key; /* * Version 1 bootinfo. @@ -273,9 +274,9 @@ bi->bi_systab = (u_int64_t) ST; /* - * Allow the environment variable 'rootdev' to override the supplied device - * This should perhaps go to MI code and/or have $rootdev tested/set by - * MI code before launching the kernel. + * Allow the environment variable 'rootdev' to override the supplied + * device. This should perhaps go to MI code and/or have $rootdev + * tested/set by MI code before launching the kernel. */ rootdevname = getenv("rootdev"); efi_getdev((void **)(&rootdev), rootdevname, NULL); @@ -331,14 +332,16 @@ /* all done copying stuff in, save end of loaded object space */ bi->bi_kernend = addr; - /* read memory map and stash it after bootinfo */ - bi->bi_memmap = (u_int64_t)(bi + 1); - bi->bi_memmap_size = 8192 - sizeof(struct bootinfo); + /* + * Read the memory map and stash it after bootinfo. Align the memory map + * on a 16-byte boundary (the bootinfo block is page aligned). + */ + bisz = (sizeof(struct bootinfo) + 0x0f) & ~0x0f; + bi->bi_memmap = ((u_int64_t)bi) + bisz; + bi->bi_memmap_size = EFI_PAGE_SIZE * pages - bisz; status = BS->GetMemoryMap(&bi->bi_memmap_size, - (EFI_MEMORY_DESCRIPTOR *)bi->bi_memmap, - &key, - &bi->bi_memdesc_size, - &bi->bi_memdesc_version); + (EFI_MEMORY_DESCRIPTOR *)bi->bi_memmap, &key, + &bi->bi_memdesc_size, &bi->bi_memdesc_version); if (EFI_ERROR(status)) { printf("bi_load: Can't read memory map\n"); return EINVAL; ==== //depot/projects/smpng/sys/boot/efi/libefi/efiboot.h#5 (text+ko) ==== @@ -28,7 +28,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/boot/efi/libefi/efiboot.h,v 1.6 2001/11/19 07:09:47 peter Exp $ + * $FreeBSD: src/sys/boot/efi/libefi/efiboot.h,v 1.7 2002/10/24 07:53:12 marcel Exp $ */ /* @@ -88,4 +88,4 @@ struct bootinfo; struct preloaded_file; extern int bi_load(struct bootinfo *, struct preloaded_file *, - UINTN *mapkey); + UINTN *mapkey, UINTN pages); ==== //depot/projects/smpng/sys/boot/efi/libefi/elf_freebsd.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/efi/libefi/elf_freebsd.c,v 1.8 2002/05/19 04:42:18 marcel Exp $ */ +/* $FreeBSD: src/sys/boot/efi/libefi/elf_freebsd.c,v 1.9 2002/10/24 07:53:12 marcel Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -143,15 +143,31 @@ struct ia64_pte pte; struct bootinfo *bi; u_int64_t psr; - UINTN mapkey; + UINTN mapkey, pages, size; + UINTN descsz; + UINT32 descver; EFI_STATUS status; if ((md = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL) return(EFTYPE); /* XXX actually EFUCKUP */ hdr = (Elf_Ehdr *)&(md->md_data); - status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData, - EFI_SIZE_TO_PAGES(sizeof(struct bootinfo)), (void*)&bi); + /* + * Allocate enough pages to hold the bootinfo block and the memory + * map EFI will return to us. The memory map has an unknown size, + * so we have to determine that first. Note that the AllocatePages + * call can itself modify the memory map, so we have to take that + * into account as well. The changes to the memory map are caused + * by splitting a range of free memory into two (AFAICT), so that + * one is marked as being loader data. + */ + size = 0; + descsz = sizeof(EFI_MEMORY_DESCRIPTOR); + BS->GetMemoryMap(&size, NULL, &mapkey, &descsz, &descver); + size += descsz + ((sizeof(struct bootinfo) + 0x0f) & ~0x0f); + pages = EFI_SIZE_TO_PAGES(size); + status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData, pages, + (void*)&bi); if (EFI_ERROR(status)) { printf("unable to create bootinfo block (status=0x%lx)\n", (long)status); @@ -159,7 +175,7 @@ } bzero(bi, sizeof(struct bootinfo)); - bi_load(bi, fp, &mapkey); + bi_load(bi, fp, &mapkey, pages); printf("Entering %s at 0x%lx...\n", fp->f_name, hdr->e_entry); ==== //depot/projects/smpng/sys/conf/NOTES#27 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1102 2002/10/20 08:17:34 scottl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1103 2002/10/24 17:21:39 rwatson Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -760,8 +760,15 @@ # Support for Mandatory Access Control (MAC): options MAC +options MAC_BIBA +options MAC_BSDEXTENDED options MAC_DEBUG -options MAC_NONE # Statically link mac_none policy +options MAC_IFOFF +options MAC_MLS +options MAC_NONE +options MAC_PARTITION +options MAC_SEEOTHERUIDS +options MAC_TEST ##################################################################### ==== //depot/projects/smpng/sys/conf/files#53 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.725 2002/10/21 05:09:04 brooks Exp $ +# $FreeBSD: src/sys/conf/files,v 1.728 2002/10/24 19:05:03 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -65,123 +65,123 @@ coda/coda_vfsops.c optional vcoda coda/coda_vnops.c optional vcoda compat/linprocfs/linprocfs.c optional linprocfs -contrib/dev/acpica/dbcmds.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbdisply.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbexec.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbfileio.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbhistry.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbinput.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbstats.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbutils.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dbxface.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmbuffer.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmnames.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmopcode.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmresrc.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmresrcl.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmresrcs.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmutils.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dmwalk.c optional acpica acpi_debug nowerror -contrib/dev/acpica/dsfield.c optional acpica nowerror -contrib/dev/acpica/dsmethod.c optional acpica -contrib/dev/acpica/dsmthdat.c optional acpica -contrib/dev/acpica/dsobject.c optional acpica -contrib/dev/acpica/dsopcode.c optional acpica nowerror -contrib/dev/acpica/dsutils.c optional acpica -contrib/dev/acpica/dswexec.c optional acpica -contrib/dev/acpica/dswload.c optional acpica -contrib/dev/acpica/dswscope.c optional acpica -contrib/dev/acpica/dswstate.c optional acpica -contrib/dev/acpica/evevent.c optional acpica -contrib/dev/acpica/evmisc.c optional acpica -contrib/dev/acpica/evregion.c optional acpica -contrib/dev/acpica/evrgnini.c optional acpica -contrib/dev/acpica/evsci.c optional acpica -contrib/dev/acpica/evxface.c optional acpica -contrib/dev/acpica/evxfevnt.c optional acpica -contrib/dev/acpica/evxfregn.c optional acpica -contrib/dev/acpica/exconfig.c optional acpica -contrib/dev/acpica/exconvrt.c optional acpica nowerror -contrib/dev/acpica/excreate.c optional acpica -contrib/dev/acpica/exdump.c optional acpica nowerror -contrib/dev/acpica/exfield.c optional acpica -contrib/dev/acpica/exfldio.c optional acpica -contrib/dev/acpica/exmisc.c optional acpica -contrib/dev/acpica/exmutex.c optional acpica -contrib/dev/acpica/exnames.c optional acpica -contrib/dev/acpica/exoparg1.c optional acpica -contrib/dev/acpica/exoparg2.c optional acpica -contrib/dev/acpica/exoparg3.c optional acpica -contrib/dev/acpica/exoparg6.c optional acpica nowerror -contrib/dev/acpica/exprep.c optional acpica -contrib/dev/acpica/exregion.c optional acpica -contrib/dev/acpica/exresnte.c optional acpica -contrib/dev/acpica/exresolv.c optional acpica -contrib/dev/acpica/exresop.c optional acpica nowerror -contrib/dev/acpica/exstore.c optional acpica -contrib/dev/acpica/exstoren.c optional acpica -contrib/dev/acpica/exstorob.c optional acpica -contrib/dev/acpica/exsystem.c optional acpica -contrib/dev/acpica/exutils.c optional acpica -contrib/dev/acpica/hwacpi.c optional acpica -contrib/dev/acpica/hwgpe.c optional acpica nowerror -contrib/dev/acpica/hwregs.c optional acpica nowerror -contrib/dev/acpica/hwsleep.c optional acpica -contrib/dev/acpica/hwtimer.c optional acpica -contrib/dev/acpica/nsaccess.c optional acpica -contrib/dev/acpica/nsalloc.c optional acpica -contrib/dev/acpica/nsdump.c optional acpica nowerror -contrib/dev/acpica/nseval.c optional acpica -contrib/dev/acpica/nsinit.c optional acpica -contrib/dev/acpica/nsload.c optional acpica -contrib/dev/acpica/nsnames.c optional acpica nowerror -contrib/dev/acpica/nsobject.c optional acpica -contrib/dev/acpica/nssearch.c optional acpica -contrib/dev/acpica/nsutils.c optional acpica -contrib/dev/acpica/nswalk.c optional acpica -contrib/dev/acpica/nsxfeval.c optional acpica nowerror -contrib/dev/acpica/nsxfname.c optional acpica nowerror -contrib/dev/acpica/nsxfobj.c optional acpica nowerror -contrib/dev/acpica/psargs.c optional acpica -contrib/dev/acpica/psfind.c optional acpica -contrib/dev/acpica/psopcode.c optional acpica -contrib/dev/acpica/psparse.c optional acpica -contrib/dev/acpica/psscope.c optional acpica -contrib/dev/acpica/pstree.c optional acpica -contrib/dev/acpica/psutils.c optional acpica -contrib/dev/acpica/pswalk.c optional acpica -contrib/dev/acpica/psxface.c optional acpica -contrib/dev/acpica/rsaddr.c optional acpica -contrib/dev/acpica/rscalc.c optional acpica -contrib/dev/acpica/rscreate.c optional acpica -contrib/dev/acpica/rsdump.c optional acpica nowerror -contrib/dev/acpica/rsio.c optional acpica -contrib/dev/acpica/rsirq.c optional acpica -contrib/dev/acpica/rslist.c optional acpica -contrib/dev/acpica/rsmemory.c optional acpica -contrib/dev/acpica/rsmisc.c optional acpica -contrib/dev/acpica/rsutils.c optional acpica -contrib/dev/acpica/rsxface.c optional acpica -contrib/dev/acpica/tbconvrt.c optional acpica -contrib/dev/acpica/tbget.c optional acpica -contrib/dev/acpica/tbgetall.c optional acpica -contrib/dev/acpica/tbinstal.c optional acpica -contrib/dev/acpica/tbrsdt.c optional acpica -contrib/dev/acpica/tbutils.c optional acpica -contrib/dev/acpica/tbxface.c optional acpica -contrib/dev/acpica/tbxfroot.c optional acpica -contrib/dev/acpica/utalloc.c optional acpica -contrib/dev/acpica/utclib.c optional acpica nowerror -contrib/dev/acpica/utcopy.c optional acpica nowerror -contrib/dev/acpica/utdebug.c optional acpica nowerror -contrib/dev/acpica/utdelete.c optional acpica -contrib/dev/acpica/uteval.c optional acpica -contrib/dev/acpica/utglobal.c optional acpica nowerror -contrib/dev/acpica/utinit.c optional acpica -contrib/dev/acpica/utmath.c optional acpica -contrib/dev/acpica/utmisc.c optional acpica nowerror -contrib/dev/acpica/utobject.c optional acpica nowerror -contrib/dev/acpica/utxface.c optional acpica +contrib/dev/acpica/dbcmds.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dbdisply.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dbexec.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dbfileio.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dbhistry.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dbinput.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dbstats.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dbutils.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dbxface.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dmbuffer.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dmnames.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dmopcode.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dmresrc.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dmresrcl.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dmresrcs.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dmutils.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dmwalk.c optional acpi acpi_debug nowerror +contrib/dev/acpica/dsfield.c optional acpi nowerror +contrib/dev/acpica/dsmethod.c optional acpi +contrib/dev/acpica/dsmthdat.c optional acpi +contrib/dev/acpica/dsobject.c optional acpi +contrib/dev/acpica/dsopcode.c optional acpi nowerror +contrib/dev/acpica/dsutils.c optional acpi +contrib/dev/acpica/dswexec.c optional acpi +contrib/dev/acpica/dswload.c optional acpi +contrib/dev/acpica/dswscope.c optional acpi +contrib/dev/acpica/dswstate.c optional acpi +contrib/dev/acpica/evevent.c optional acpi +contrib/dev/acpica/evmisc.c optional acpi +contrib/dev/acpica/evregion.c optional acpi +contrib/dev/acpica/evrgnini.c optional acpi +contrib/dev/acpica/evsci.c optional acpi +contrib/dev/acpica/evxface.c optional acpi +contrib/dev/acpica/evxfevnt.c optional acpi +contrib/dev/acpica/evxfregn.c optional acpi +contrib/dev/acpica/exconfig.c optional acpi +contrib/dev/acpica/exconvrt.c optional acpi nowerror +contrib/dev/acpica/excreate.c optional acpi +contrib/dev/acpica/exdump.c optional acpi nowerror +contrib/dev/acpica/exfield.c optional acpi +contrib/dev/acpica/exfldio.c optional acpi +contrib/dev/acpica/exmisc.c optional acpi +contrib/dev/acpica/exmutex.c optional acpi +contrib/dev/acpica/exnames.c optional acpi +contrib/dev/acpica/exoparg1.c optional acpi +contrib/dev/acpica/exoparg2.c optional acpi +contrib/dev/acpica/exoparg3.c optional acpi +contrib/dev/acpica/exoparg6.c optional acpi nowerror +contrib/dev/acpica/exprep.c optional acpi +contrib/dev/acpica/exregion.c optional acpi +contrib/dev/acpica/exresnte.c optional acpi +contrib/dev/acpica/exresolv.c optional acpi +contrib/dev/acpica/exresop.c optional acpi nowerror +contrib/dev/acpica/exstore.c optional acpi +contrib/dev/acpica/exstoren.c optional acpi +contrib/dev/acpica/exstorob.c optional acpi +contrib/dev/acpica/exsystem.c optional acpi +contrib/dev/acpica/exutils.c optional acpi +contrib/dev/acpica/hwacpi.c optional acpi +contrib/dev/acpica/hwgpe.c optional acpi nowerror +contrib/dev/acpica/hwregs.c optional acpi nowerror +contrib/dev/acpica/hwsleep.c optional acpi +contrib/dev/acpica/hwtimer.c optional acpi +contrib/dev/acpica/nsaccess.c optional acpi +contrib/dev/acpica/nsalloc.c optional acpi +contrib/dev/acpica/nsdump.c optional acpi nowerror +contrib/dev/acpica/nseval.c optional acpi +contrib/dev/acpica/nsinit.c optional acpi +contrib/dev/acpica/nsload.c optional acpi +contrib/dev/acpica/nsnames.c optional acpi nowerror +contrib/dev/acpica/nsobject.c optional acpi +contrib/dev/acpica/nssearch.c optional acpi +contrib/dev/acpica/nsutils.c optional acpi +contrib/dev/acpica/nswalk.c optional acpi +contrib/dev/acpica/nsxfeval.c optional acpi nowerror +contrib/dev/acpica/nsxfname.c optional acpi nowerror +contrib/dev/acpica/nsxfobj.c optional acpi nowerror +contrib/dev/acpica/psargs.c optional acpi +contrib/dev/acpica/psfind.c optional acpi +contrib/dev/acpica/psopcode.c optional acpi +contrib/dev/acpica/psparse.c optional acpi +contrib/dev/acpica/psscope.c optional acpi +contrib/dev/acpica/pstree.c optional acpi +contrib/dev/acpica/psutils.c optional acpi +contrib/dev/acpica/pswalk.c optional acpi +contrib/dev/acpica/psxface.c optional acpi +contrib/dev/acpica/rsaddr.c optional acpi +contrib/dev/acpica/rscalc.c optional acpi +contrib/dev/acpica/rscreate.c optional acpi +contrib/dev/acpica/rsdump.c optional acpi nowerror +contrib/dev/acpica/rsio.c optional acpi +contrib/dev/acpica/rsirq.c optional acpi +contrib/dev/acpica/rslist.c optional acpi +contrib/dev/acpica/rsmemory.c optional acpi +contrib/dev/acpica/rsmisc.c optional acpi +contrib/dev/acpica/rsutils.c optional acpi +contrib/dev/acpica/rsxface.c optional acpi +contrib/dev/acpica/tbconvrt.c optional acpi +contrib/dev/acpica/tbget.c optional acpi +contrib/dev/acpica/tbgetall.c optional acpi +contrib/dev/acpica/tbinstal.c optional acpi +contrib/dev/acpica/tbrsdt.c optional acpi +contrib/dev/acpica/tbutils.c optional acpi +contrib/dev/acpica/tbxface.c optional acpi +contrib/dev/acpica/tbxfroot.c optional acpi +contrib/dev/acpica/utalloc.c optional acpi +contrib/dev/acpica/utclib.c optional acpi nowerror +contrib/dev/acpica/utcopy.c optional acpi nowerror +contrib/dev/acpica/utdebug.c optional acpi nowerror +contrib/dev/acpica/utdelete.c optional acpi +contrib/dev/acpica/uteval.c optional acpi +contrib/dev/acpica/utglobal.c optional acpi nowerror +contrib/dev/acpica/utinit.c optional acpi +contrib/dev/acpica/utmath.c optional acpi +contrib/dev/acpica/utmisc.c optional acpi nowerror +contrib/dev/acpica/utobject.c optional acpi nowerror +contrib/dev/acpica/utxface.c optional acpi contrib/ipfilter/netinet/fil.c optional ipfilter inet contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet contrib/ipfilter/netinet/ip_fil.c optional ipfilter inet @@ -224,32 +224,32 @@ dev/aac/aac_pci.c optional aac pci dev/aac/aac_cam.c optional aacp aac dev/aac/aac_linux.c optional aac compat_linux -dev/acpica/acpi.c optional acpica -dev/acpica/acpica_support.c optional acpica -dev/acpica/acpi_acad.c optional acpica nowerror -dev/acpica/acpi_battery.c optional acpica -dev/acpica/acpi_button.c optional acpica -dev/acpica/acpi_cmbat.c optional acpica nowerror -dev/acpica/acpi_cpu.c optional acpica -dev/acpica/acpi_ec.c optional acpica -dev/acpica/acpi_lid.c optional acpica -dev/acpica/acpi_pci.c optional acpica pci -dev/acpica/acpi_pci_link.c optional acpica pci -dev/acpica/acpi_pcib.c optional acpica pci -dev/acpica/acpi_pcib_acpi.c optional acpica pci -dev/acpica/acpi_pcib_pci.c optional acpica pci -dev/acpica/acpi_powerres.c optional acpica nowerror -dev/acpica/acpi_resource.c optional acpica -dev/acpica/acpi_thermal.c optional acpica -dev/acpica/acpi_timer.c optional acpica -dev/acpica/Osd/OsdDebug.c optional acpica -dev/acpica/Osd/OsdHardware.c optional acpica -dev/acpica/Osd/OsdInterrupt.c optional acpica -dev/acpica/Osd/OsdMemory.c optional acpica -dev/acpica/Osd/OsdSchedule.c optional acpica -dev/acpica/Osd/OsdStream.c optional acpica -dev/acpica/Osd/OsdSynch.c optional acpica -dev/acpica/Osd/OsdTable.c optional acpica +dev/acpica/acpi.c optional acpi +dev/acpica/acpica_support.c optional acpi +dev/acpica/acpi_acad.c optional acpi nowerror +dev/acpica/acpi_battery.c optional acpi +dev/acpica/acpi_button.c optional acpi +dev/acpica/acpi_cmbat.c optional acpi nowerror +dev/acpica/acpi_cpu.c optional acpi +dev/acpica/acpi_ec.c optional acpi +dev/acpica/acpi_lid.c optional acpi +dev/acpica/acpi_pci.c optional acpi pci +dev/acpica/acpi_pci_link.c optional acpi pci +dev/acpica/acpi_pcib.c optional acpi pci +dev/acpica/acpi_pcib_acpi.c optional acpi pci +dev/acpica/acpi_pcib_pci.c optional acpi pci +dev/acpica/acpi_powerres.c optional acpi nowerror +dev/acpica/acpi_resource.c optional acpi +dev/acpica/acpi_thermal.c optional acpi +dev/acpica/acpi_timer.c optional acpi +dev/acpica/Osd/OsdDebug.c optional acpi +dev/acpica/Osd/OsdHardware.c optional acpi +dev/acpica/Osd/OsdInterrupt.c optional acpi +dev/acpica/Osd/OsdMemory.c optional acpi +dev/acpica/Osd/OsdSchedule.c optional acpi +dev/acpica/Osd/OsdStream.c optional acpi +dev/acpica/Osd/OsdSynch.c optional acpi +dev/acpica/Osd/OsdTable.c optional acpi dev/advansys/adv_eisa.c optional adv eisa dev/advansys/adv_pci.c optional adv pci dev/advansys/advansys.c optional adv @@ -616,6 +616,7 @@ crypto/sha2/sha2.c optional random dev/ray/if_ray.c optional ray card dev/ray/if_ray.c optional ray pccard +dev/rc/rc.c optional rc dev/rp/rp.c optional rp dev/rp/rp_isa.c optional rp isa dev/rp/rp_pci.c optional rp pci @@ -1493,7 +1494,14 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard kern/uipc_sem.c optional p1003_1b_semaphores +security/mac_biba/mac_biba.c optional mac_biba +security/mac_bsdextended/mac_bsdextended.c optional mac_bsdextended +security/mac_ifoff/mac_ifoff.c optional mac_ifoff +security/mac_mls/mac_mls.c optional mac_mls security/mac_none/mac_none.c optional mac_none +security/mac_partition/mac_partition.c optional mac_partition +security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids +security/mac_test/mac_test.c optional mac_test ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_balloc.c optional ffs ufs/ffs/ffs_inode.c optional ffs ==== //depot/projects/smpng/sys/conf/files.i386#33 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.423 2002/10/05 16:35:26 phk Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.425 2002/10/24 19:05:03 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -180,10 +180,10 @@ gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate -i386/acpica/OsdEnvironment.c optional acpica -i386/acpica/acpi_machdep.c optional acpica -i386/acpica/acpi_wakeup.c optional acpica -acpi_wakecode.h optional acpica \ +i386/acpica/OsdEnvironment.c optional acpi +i386/acpica/acpi_machdep.c optional acpi +i386/acpica/acpi_wakeup.c optional acpi +acpi_wakecode.h optional acpi \ dependency "$S/i386/acpica/acpi_wakecode.S" \ compile-with "${MAKE} -f $S/i386/acpica/Makefile MAKESRCPATH=$S/i386/acpica" \ no-obj no-implicit-rule before-depend \ @@ -286,7 +286,6 @@ i386/isa/pcvt/pcvt_vtf.c optional vt i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine -i386/isa/rc.c count rc i386/isa/scd.c count scd nowerror i386/isa/spic.c optional spic i386/isa/spigot.c count spigot ==== //depot/projects/smpng/sys/conf/files.ia64#21 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.40 2002/10/19 04:02:16 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.41 2002/10/24 19:05:03 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -18,10 +18,10 @@ no-obj no-implicit-rule before-depend \ clean "atkbdmap.h" # -ia64/acpica/acpi_machdep.c optional acpica -ia64/acpica/acpi_wakeup.c optional acpica -ia64/acpica/OsdEnvironment.c optional acpica -ia64/acpica/madt.c optional acpica +ia64/acpica/acpi_machdep.c optional acpi +ia64/acpica/acpi_wakeup.c optional acpi +ia64/acpica/OsdEnvironment.c optional acpi +ia64/acpica/madt.c optional acpi ia64/ia32/ia32_misc.c optional ia32 ia64/ia32/ia32_sysent.c optional ia32 ia64/ia32/ia32_sysvec.c optional ia32 ==== //depot/projects/smpng/sys/conf/files.pc98#32 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.250 2002/10/05 16:35:26 phk Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.251 2002/10/24 07:18:24 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -256,7 +256,6 @@ i386/isa/pcf.c optional pcf i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine -i386/isa/rc.c count rc i386/isa/scd.c count scd i386/isa/spigot.c count spigot i386/isa/stallion.c optional stl nowerror ==== //depot/projects/smpng/sys/conf/majors#16 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/conf/majors,v 1.145 2002/10/20 08:17:35 scottl Exp $ +$FreeBSD: src/sys/conf/majors,v 1.146 2002/10/22 16:40:01 mdodd Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. @@ -195,6 +195,7 @@ 177 openfirm OpenFirmware control device 178 raidctl RAIDframe (control device) 179 raid RAIDframe (disk device) +180 nvidia NVIDIA (nvidiaN/nvidiactl) 200 ?? entries from 200-252 are reserved for local use 252 ?? entries from 200-252 are reserved for local use 254 internal Used internally by the kernel ==== //depot/projects/smpng/sys/conf/options#39 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.360 2002/10/20 08:17:35 scottl Exp $ +# $FreeBSD: src/sys/conf/options,v 1.361 2002/10/24 17:21:40 rwatson Exp $ # # On the handling of kernel options # @@ -145,8 +145,15 @@ # Support for Mandatory Access Control (MAC) MAC opt_mac.h +MAC_BIBA opt_dontuse.h +MAC_BSDEXTENDED opt_dontuse.h MAC_DEBUG opt_mac.h +MAC_IFOFF opt_dontuse.h +MAC_MLS opt_dontuse.h MAC_NONE opt_dontuse.h +MAC_PARTITION opt_dontuse.h +MAC_SEEOTHERUIDS opt_dontuse.h +MAC_TEST opt_dontuse.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h ==== //depot/projects/smpng/sys/conf/options.ia64#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.ia64,v 1.13 2002/10/17 07:04:30 iwasaki Exp $ +# $FreeBSD: src/sys/conf/options.ia64,v 1.14 2002/10/24 19:17:06 jhb Exp $ # Options specific to the ia64 platform kernels ITANIUM opt_global.h @@ -71,4 +71,4 @@ # Device options DEV_SPLASH opt_splash.h -DEV_ACPICA opt_acpica.h +DEV_ACPI opt_acpi.h ==== //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#15 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.27 2002/10/16 17:28:52 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.28 2002/10/24 10:56:33 iwasaki Exp $ */ /****************************************************************************** * @@ -244,6 +244,9 @@ int ec_csrvalue; }; +static int acpi_ec_event_driven = 0; +TUNABLE_INT("hw.acpi.ec.event_driven", &acpi_ec_event_driven); + #define EC_LOCK_TIMEOUT 1000 /* 1ms */ static __inline ACPI_STATUS @@ -618,7 +621,7 @@ ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, (UINT32)Event); /* XXX this should test whether interrupts are available some other way */ - if(cold) + if (cold || acpi_ec_event_driven) return_ACPI_STATUS(EcWaitEvent(sc, Event)); if (!EcIsLocked(sc)) ==== //depot/projects/smpng/sys/dev/ata/ata-all.c#24 (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. * - * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.155 2002/10/01 15:21:57 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.156 2002/10/22 20:18:51 thomas Exp $ */ #include "opt_ata.h" @@ -210,8 +210,7 @@ atapi_attach(&ch->device[SLAVE]); #endif #ifdef DEV_ATAPICAM - if (ch->devices & (ATA_ATAPI_MASTER | ATA_ATAPI_SLAVE)) - atapi_cam_attach_bus(ch); + atapi_cam_attach_bus(ch); #endif } return 0; @@ -244,8 +243,7 @@ atapi_detach(&ch->device[SLAVE]); #endif #ifdef DEV_ATAPICAM - if (ch->devices & (ATA_ATAPI_SLAVE|ATA_ATAPI_MASTER)) - atapi_cam_detach_bus(ch); + atapi_cam_detach_bus(ch); #endif splx(s); @@ -585,8 +583,7 @@ atapi_attach(&ch->device[SLAVE]); #endif #ifdef DEV_ATAPICAM - if (ch->devices & (ATA_ATAPI_MASTER | ATA_ATAPI_SLAVE)) - atapi_cam_attach_bus(ch); + atapi_cam_attach_bus(ch); #endif } } @@ -852,10 +849,6 @@ ata_printf(ch, -1, "resetting devices ..\n"); ata_reset(ch); -#ifdef DEV_ATAPICAM - if (devices & (ATA_ATAPI_SLAVE|ATA_ATAPI_MASTER)) - atapi_cam_detach_bus(ch); -#endif if ((misdev = devices & ~ch->devices)) { #ifdef DEV_ATADISK if (misdev & ATA_ATA_MASTER && ch->device[MASTER].driver) @@ -923,8 +916,7 @@ } #endif #ifdef DEV_ATAPICAM - if (ch->devices & (ATA_ATAPI_MASTER | ATA_ATAPI_SLAVE)) - atapi_cam_attach_bus(ch); + atapi_cam_reinit_bus(ch); #endif printf("done\n"); ATA_UNLOCK_CH(ch); ==== //depot/projects/smpng/sys/dev/ata/atapi-all.h#10 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-all.h,v 1.46 2002/09/23 18:54:29 alfred Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-all.h,v 1.47 2002/10/22 20:18:51 thomas Exp $ */ /* ATAPI misc defines */ @@ -175,6 +175,7 @@ void atapi_cam_attach_bus(struct ata_channel *); void atapi_detach(struct ata_device *); void atapi_cam_detach_bus(struct ata_channel *); +void atapi_cam_reinit_bus(struct ata_channel *); void atapi_reinit(struct ata_device *); void atapi_start(struct ata_device *); int atapi_transfer(struct atapi_request *); ==== //depot/projects/smpng/sys/dev/ata/atapi-cam.c#4 (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. * - * $FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.9 2002/09/28 17:14:24 phk Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.10 2002/10/22 20:18:51 thomas Exp $ */ #include @@ -77,6 +77,8 @@ LIST_ENTRY(atapi_xpt_softc) chain; }; +enum reinit_reason { BOOT_ATTACH, ATTACH, RESET }; + static LIST_HEAD(,atapi_xpt_softc) all_buses = LIST_HEAD_INITIALIZER(all_buses); /* CAM XPT methods */ @@ -87,6 +89,7 @@ static int atapi_cb(struct atapi_request *); /* internal functions */ +static void reinit_bus(struct atapi_xpt_softc *scp, enum reinit_reason reason); static void setup_dev(struct atapi_xpt_softc *, struct ata_device *); static void setup_async_cb(struct atapi_xpt_softc *, uint32_t); static void cam_rescan_callback(struct cam_periph *, union ccb *); @@ -95,6 +98,7 @@ static struct atapi_hcb *allocate_hcb(struct atapi_xpt_softc *, int, int, union ccb *); static void free_hcb(struct atapi_hcb *hcb); static void free_softc(struct atapi_xpt_softc *scp); +static struct atapi_xpt_softc *get_softc(struct ata_channel *ata_ch); static struct ata_device *get_ata_device(struct atapi_xpt_softc *scp, int id); static MALLOC_DEFINE(M_ATACAM, "ATA CAM transport", "ATA driver CAM-XPT layer"); @@ -147,13 +151,7 @@ CAM_DEBUG(path, CAM_DEBUG_TRACE, ("Registered SIM for ata%d\n", unit)); setup_async_cb(scp, AC_LOST_DEVICE); - - if (ata_ch->devices & ATA_ATAPI_MASTER) - setup_dev(scp, &ata_ch->device[MASTER]); - if (ata_ch->devices & ATA_ATAPI_SLAVE) - setup_dev(scp, &ata_ch->device[SLAVE]); - - cam_rescan(sim); + reinit_bus(scp, cold ? BOOT_ATTACH : ATTACH); return; error: @@ -163,11 +161,32 @@ void atapi_cam_detach_bus(struct ata_channel *ata_ch) { - struct atapi_xpt_softc *scp; + struct atapi_xpt_softc *scp = get_softc(ata_ch); + free_softc(scp); +} + +void +atapi_cam_reinit_bus(struct ata_channel *ata_ch) { + struct atapi_xpt_softc *scp = get_softc(ata_ch); + reinit_bus(scp, RESET); +} + +static void +reinit_bus(struct atapi_xpt_softc *scp, enum reinit_reason reason) { + if (scp->ata_ch->devices & ATA_ATAPI_MASTER) + setup_dev(scp, &scp->ata_ch->device[MASTER]); + if (scp->ata_ch->devices & ATA_ATAPI_SLAVE) + setup_dev(scp, &scp->ata_ch->device[SLAVE]); - LIST_FOREACH(scp, &all_buses, chain) { - if (scp->ata_ch == ata_ch) - free_softc(scp); + switch (reason) { + case BOOT_ATTACH: + break; + case RESET: + xpt_async(AC_BUS_RESET, scp->path, NULL); + /*FALLTHROUGH*/ + case ATTACH: + cam_rescan(scp->sim); + break; } } @@ -261,16 +280,20 @@ return; } - case XPT_RESET_DEV: - /* should reset the device */ + case XPT_RESET_DEV: { + int tid = ccb_h->target_id; + struct ata_device *dev = get_ata_device(softc, tid); + CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_SUBTRACE, ("dev reset\n")); + atapi_reinit(dev); ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); return; + } case XPT_RESET_BUS: - /* should reset the ATA bus */ CAM_DEBUG(ccb->ccb_h.path, CAM_DEBUG_SUBTRACE, ("bus reset\n")); + ata_reinit(softc->ata_ch); ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); return; @@ -669,6 +692,16 @@ } } +static struct atapi_xpt_softc * +get_softc(struct ata_channel *ata_ch) { + struct atapi_xpt_softc *scp; + LIST_FOREACH(scp, &all_buses, chain) { + if (scp->ata_ch == ata_ch) + return scp; + } + return NULL; +} + static struct ata_device * get_ata_device(struct atapi_xpt_softc *scp, int id) { ==== //depot/projects/smpng/sys/dev/firewire/sbp.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.4 2002/10/21 15:36:59 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.5 2002/10/23 13:04:02 simokawa Exp $ * */ @@ -1101,17 +1101,10 @@ } static void -sbp_scsi_status(struct sbp_status *sbp_status, struct sbp_ocb *ocb) +sbp_print_scsi_cmd(struct sbp_ocb *ocb) { - struct sbp_cmd_status *sbp_cmd_status; - struct scsi_sense_data *sense; struct ccb_scsiio *csio; - - sbp_cmd_status = (struct sbp_cmd_status *)sbp_status->data; - sense = &ocb->ccb->csio.sense_data; - -SBP_DEBUG(0) csio = &ocb->ccb->csio; printf("%s:%d:%d XPT_SCSI_IO: " "cmd: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x" >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 13:44:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94BEE37B404; Thu, 24 Oct 2002 13:44:15 -0700 (PDT) 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 2DEC637B401 for ; Thu, 24 Oct 2002 13:44:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9FB143E8A for ; Thu, 24 Oct 2002 13:44:13 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OKhSmV028066 for ; Thu, 24 Oct 2002 13:43:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OKhRqt028063 for perforce@freebsd.org; Thu, 24 Oct 2002 13:43:27 -0700 (PDT) Date: Thu, 24 Oct 2002 13:43:27 -0700 (PDT) Message-Id: <200210242043.g9OKhRqt028063@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 Subject: PERFORCE change 20077 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20077 Change 20077 by rwatson@rwatson_tislabs on 2002/10/24 13:43:05 A bit better pass at mprotect check -- not quite right yet, so leave it disabled, since we don't have a good cred. Affected files ... .. //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#17 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#17 (text+ko) ==== @@ -1235,6 +1235,13 @@ { vm_map_entry_t current; vm_map_entry_t entry; +#ifdef MAC +#if 0 + vm_object_t object; + struct vnode *vp; + int error; +#endif +#endif vm_map_lock(map); @@ -1260,19 +1267,17 @@ return (KERN_PROTECTION_FAILURE); } #ifdef MAC - /* XXXMAC: Checks against MAC labels should go here. */ #if 0 /* Find the deepest backing object. */ - vm_object_t object; - object = vme->object.vm_object; + object = current->object.vm_object; while (object->backing_object != NULL) object = object->backing_object; switch (object->type) { case OBJT_VNODE: - struct vnode *vp = (struct vnode *)object->handle; - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + vp = (struct vnode *)object->handle; + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); error = mac_check_vnode_mprotect(cred, vp, new_prot); - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0, curthread); if (error) return (KERN_PROTECTION_FAILURE); break; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 13:45:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1A2337B404; Thu, 24 Oct 2002 13:45:16 -0700 (PDT) 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 393C137B401 for ; Thu, 24 Oct 2002 13:45:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1C1643E4A for ; Thu, 24 Oct 2002 13:45:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OKiUmV028235 for ; Thu, 24 Oct 2002 13:44:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OKiU1A028232 for perforce@freebsd.org; Thu, 24 Oct 2002 13:44:30 -0700 (PDT) Date: Thu, 24 Oct 2002 13:44:30 -0700 (PDT) Message-Id: <200210242044.g9OKiU1A028232@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 Subject: PERFORCE change 20078 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20078 Change 20078 by rwatson@rwatson_tislabs on 2002/10/24 13:43:47 Submerge more (now) gratuitous inclusion of mac.h. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/user.h#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/user.h#9 (text+ko) ==== @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 13:45:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B40C337B406; Thu, 24 Oct 2002 13:45:17 -0700 (PDT) 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 C09F037B410 for ; Thu, 24 Oct 2002 13:45:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60C0643E7B for ; Thu, 24 Oct 2002 13:45:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OKiUmV028241 for ; Thu, 24 Oct 2002 13:44:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OKiU0e028238 for perforce@freebsd.org; Thu, 24 Oct 2002 13:44:30 -0700 (PDT) Date: Thu, 24 Oct 2002 13:44:30 -0700 (PDT) Message-Id: <200210242044.g9OKiU0e028238@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 Subject: PERFORCE change 20079 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20079 Change 20079 by rwatson@rwatson_tislabs on 2002/10/24 13:44:25 Remove dup from integ. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/_label.h#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/_label.h#5 (text+ko) ==== @@ -48,8 +48,6 @@ #define MAC_FLAG_INITIALIZED 0x0000001 /* Is initialized for use. */ -#define MAC_FLAG_INITIALIZED 0x0000001 /* Is initialized for use. */ - struct label { int l_flags; union { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 13:51:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DFF337B401; Thu, 24 Oct 2002 13:51:25 -0700 (PDT) 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 240B737B404 for ; Thu, 24 Oct 2002 13:51:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8195543E3B for ; Thu, 24 Oct 2002 13:51:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OKodmV028816 for ; Thu, 24 Oct 2002 13:50:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OKocfP028813 for perforce@freebsd.org; Thu, 24 Oct 2002 13:50:38 -0700 (PDT) Date: Thu, 24 Oct 2002 13:50:38 -0700 (PDT) Message-Id: <200210242050.g9OKocfP028813@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 Subject: PERFORCE change 20080 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20080 Change 20080 by rwatson@rwatson_tislabs on 2002/10/24 13:50:12 Avoid warning more than once per boot about the EA transaction issue if there's a file system that doesn't support EA transactions and yet has been frobbed by MAC as multilabel on extended attributes. While I'm here, document lack of locking on mac_late and ea_warn_once, and suggest why that's OK. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#328 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#328 (text+ko) ==== @@ -110,8 +110,19 @@ SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD, &mac_max_policies, 0, ""); +/* + * Has the kernel started generating labeled objects yet? All read/write + * access to this variable is serialized during the boot process. Following + * the end of serialization, we don't update this flag; no locking. + */ static int mac_late = 0; +/* + * Warn about EA transactions only the first time they happen. + * Weak coherency, no locking. + */ +static int ea_warn_once = 0; + static int mac_enforce_fs = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_fs, CTLFLAG_RW, &mac_enforce_fs, 0, "Enforce MAC policy on file system objects"); @@ -1803,7 +1814,11 @@ error = VOP_OPENEXTATTR(vp, cred, curthread); if (error == EOPNOTSUPP) { /* XXX: Optionally abort if transactions not supported. */ - printf("Warning: transactions not supported in EA write.\n"); + if (ea_warn_once == 0) { + printf("Warning: transactions not supported " + "in EA write.\n"); + ea_warn_once = 1; + } } else if (error) return (error); @@ -1834,7 +1849,11 @@ error = VOP_OPENEXTATTR(vp, cred, curthread); if (error == EOPNOTSUPP) { /* XXX: Optionally abort if transactions not supported. */ - printf("Warning: transactions not supported in EA write.\n"); + if (ea_warn_once == 0) { + printf("Warning: transactions not supported " + "in EA write.\n"); + ea_warn_once = 1; + } } else if (error) return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 13:57:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8673E37B404; Thu, 24 Oct 2002 13:57:33 -0700 (PDT) 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 36D7B37B401 for ; Thu, 24 Oct 2002 13:57:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A077243E4A for ; Thu, 24 Oct 2002 13:57:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OKulmV029024 for ; Thu, 24 Oct 2002 13:56:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OKuk4V029021 for perforce@freebsd.org; Thu, 24 Oct 2002 13:56:46 -0700 (PDT) Date: Thu, 24 Oct 2002 13:56:46 -0700 (PDT) Message-Id: <200210242056.g9OKuk4V029021@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 Subject: PERFORCE change 20081 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20081 Change 20081 by rwatson@rwatson_tislabs on 2002/10/24 13:56:03 More consistently use mac_biba_privileged(subj) instead of the old equal_ok notion. Use the error response from mac_biba_privileged() for the sysctl check, rather than treating it as a boolean incorrectly. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#157 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#157 (text+ko) ==== @@ -299,7 +299,7 @@ } static int -mac_biba_subject_equal_ok(struct mac_biba *mac_biba) +mac_biba_privileged(struct mac_biba *mac_biba) { KASSERT((mac_biba->mb_flags & MAC_BIBA_FLAGS_BOTH) == @@ -325,14 +325,6 @@ } static int -mac_biba_privileged(struct mac_biba *mac_biba) -{ - - /* Equate the notion of "equal" with privilege. */ - return (mac_biba_subject_equal_ok(mac_biba)); -} - -static int mac_biba_high_single(struct mac_biba *mac_biba) { @@ -1475,7 +1467,7 @@ * their label. */ if (mac_biba_contains_equal(new)) { - error = mac_biba_subject_equal_ok(subj); + error = mac_biba_privileged(subj); if (error) return (error); } @@ -1672,7 +1664,7 @@ * subject must have appropriate privilege. */ if (mac_biba_contains_equal(new)) { - error = mac_biba_subject_equal_ok(subj); + error = mac_biba_privileged(subj); if (error) return (error); } @@ -1834,7 +1826,7 @@ * the subject must have appropriate privilege. */ if (mac_biba_contains_equal(new)) { - error = mac_biba_subject_equal_ok(subj); + error = mac_biba_privileged(subj); if (error) return (error); } @@ -1866,6 +1858,7 @@ void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen) { struct mac_biba *subj; + int error; if (!mac_biba_enabled) return (0); @@ -1881,8 +1874,9 @@ if (new != NULL) { if (namelen > 0 && name[0] == 0) return (0); - if (!mac_biba_privileged(subj)) - return (EPERM); + error = mac_biba_privileged(subj); + if (error) + return (error); } return (0); @@ -2247,7 +2241,7 @@ * the subject must have appropriate privilege. */ if (mac_biba_contains_equal(new)) { - error = mac_biba_subject_equal_ok(subj); + error = mac_biba_privileged(subj); if (error) return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 14: 1:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0826B37B404; Thu, 24 Oct 2002 14:01:39 -0700 (PDT) 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 9685D37B401 for ; Thu, 24 Oct 2002 14:01:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4FD4D43E42 for ; Thu, 24 Oct 2002 14:01:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OL0qmV029504 for ; Thu, 24 Oct 2002 14:00:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OL0q4J029501 for perforce@freebsd.org; Thu, 24 Oct 2002 14:00:52 -0700 (PDT) Date: Thu, 24 Oct 2002 14:00:52 -0700 (PDT) Message-Id: <200210242100.g9OL0q4J029501@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 Subject: PERFORCE change 20082 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20082 Change 20082 by rwatson@rwatson_tislabs on 2002/10/24 14:00:15 Require Biba privilege to relabel interfaces. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#158 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#158 (text+ko) ==== @@ -1519,6 +1519,13 @@ return (error); /* + * Relabling network interfaces requires Biba privilege. + */ + error = mac_biba_privileged(subj); + if (error) + return (error); + + /* * If the Biba label is to be changed, authorize as appropriate. */ if (new->mb_flags & MAC_BIBA_FLAGS_BOTH) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Oct 24 15:43:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87D9F37B401; Thu, 24 Oct 2002 15:43:49 -0700 (PDT) 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 1F3C437B404 for ; Thu, 24 Oct 2002 15:43:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 915E843E75 for ; Thu, 24 Oct 2002 15:43:46 -0700 (PDT) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9OMh0mV036059 for ; Thu, 24 Oct 2002 15:43:00 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9OMh0Pg036050 for perforce@freebsd.org; Thu, 24 Oct 2002 15:43:00 -0700 (PDT) Date: Thu, 24 Oct 2002 15:43:00 -0700 (PDT) Message-Id: <200210242243.g9OMh0Pg036050@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 20089 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20089 Change 20089 by green@green_laptop_2 on 2002/10/24 15:42:47 * For mac_lomac, assume "equal" labels for ttyv*. * When demoting, don't blindly set all parts of the label to the single target. Demote "rangehigh" and "single" the object label's single, and "rangelow" to the single if it would in fact be demoting it to do so (i.e. don't raise it). I can successfully use the range behavior to temporarily lower my integrity level to be able to observe objects that would otherwise demote me, and then raise it again. Also, I can successfully modify my label in all the normal Biba-like ways and then be demoted each time I observe a non-dominant object, like a many-level ratchet instead of a... two-level ratchet :-) Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#18 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#18 (text+ko) ==== @@ -443,10 +443,20 @@ goto out; } bzero(&subj->mac_lomac, sizeof(subj->mac_lomac)); + /* + * Always demote the single label. + */ mac_lomac_copy_single(objlabel, &subj->mac_lomac); - mac_lomac_set_range(&subj->mac_lomac, - objlabel->ml_single.mle_type, objlabel->ml_single.mle_grade, - objlabel->ml_single.mle_type, objlabel->ml_single.mle_grade); + /* + * Start with the original range, then minimize each side of + * the range to the point of not dominating the object. The + * high side will always be demoted, of course. + */ + mac_lomac_copy_range(subjlabel, &subj->mac_lomac); + if (!mac_lomac_dominate_element(&objlabel->ml_single, + &subj->mac_lomac.ml_rangelow)) + subj->mac_lomac.ml_rangelow = objlabel->ml_single; + subj->mac_lomac.ml_rangehigh = objlabel->ml_single; subj->mac_lomac.ml_flags |= MAC_LOMAC_FLAG_UPDATE; mtx_lock_spin(&sched_lock); curthread->td_kse->ke_flags |= KEF_ASTPENDING; @@ -773,7 +783,8 @@ if (strcmp(dev->si_name, "null") == 0 || strcmp(dev->si_name, "zero") == 0 || strcmp(dev->si_name, "random") == 0 || - strncmp(dev->si_name, "fd/", strlen("fd/")) == 0) + strncmp(dev->si_name, "fd/", strlen("fd/")) == 0 || + strncmp(dev->si_name, "ttyv", strlen("ttyv")) == 0) lomac_type = MAC_LOMAC_TYPE_EQUAL; else if (ptys_equal && (strncmp(dev->si_name, "ttyp", strlen("ttyp")) == 0 || To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 7:47:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88BFD37B404; Fri, 25 Oct 2002 07:47:28 -0700 (PDT) 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 346FE37B401 for ; Fri, 25 Oct 2002 07:47:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FCE843E42 for ; Fri, 25 Oct 2002 07:47:27 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PEkcmV097436 for ; Fri, 25 Oct 2002 07:46:38 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PEkbV8097432 for perforce@freebsd.org; Fri, 25 Oct 2002 07:46:37 -0700 (PDT) Date: Fri, 25 Oct 2002 07:46:37 -0700 (PDT) Message-Id: <200210251446.g9PEkbV8097432@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 20117 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20117 Change 20117 by jhb@jhb_laptop on 2002/10/25 07:45:58 IFC @20116. Need phk@'s fix for v_incr_usecount(). Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/trap.c#39 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#18 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#45 integrate .. //depot/projects/smpng/sys/i386/include/float.h#2 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#52 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#35 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#10 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#36 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#32 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#37 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#41 integrate .. //depot/projects/smpng/sys/sys/proc.h#64 integrate .. //depot/projects/smpng/sys/sys/vnode.h#27 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#18 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#33 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#39 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.101 2002/09/17 07:44:28 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.102 2002/10/24 23:09:47 julian Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -669,24 +669,8 @@ sticks = td->td_kse->ke_sticks; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (p->p_flag & P_KSES) { - /* - * If we are doing a syscall in a KSE environment, - * note where our mailbox is. There is always the - * possibility that we could do this lazily (in sleep()), - * but for now do it every time. - */ - td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox - + offsetof(struct kse_mailbox, km_curthread)); - if ((td->td_mailbox == NULL) || - (td->td_mailbox == (void *)-1)) { - td->td_mailbox = NULL; /* single thread it.. */ - td->td_flags &= ~TDF_UNBOUND; - } else { - td->td_flags |= TDF_UNBOUND; - } - } - + if (p->p_flag & P_KSES) + thread_user_enter(p, td); #ifdef DIAGNOSTIC alpha_fpstate_check(td); #endif ==== //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95 - * $FreeBSD: src/sys/fs/specfs/spec_vnops.c,v 1.183 2002/10/22 00:59:48 mckusick Exp $ + * $FreeBSD: src/sys/fs/specfs/spec_vnops.c,v 1.184 2002/10/25 00:20:36 mckusick Exp $ */ #include @@ -421,8 +421,8 @@ struct vnode *vp = ap->a_vp; struct buf *bp; struct buf *nbp; - int s; - int maxretry = 10000; /* large, arbitrarily chosen */ + int s, error = 0; + int maxretry = 100; /* large, arbitrarily chosen */ if (!vn_isdisk(vp, NULL)) return (0); @@ -435,6 +435,7 @@ s = splbio(); TAILQ_FOREACH(bp, &vp->v_dirtyblkhd, b_vnbufs) { bp->b_flags &= ~B_SCANNED; + bp->b_error = 0; } splx(s); @@ -481,16 +482,25 @@ PRIBIO + 1, "spfsyn", 0); } if (!TAILQ_EMPTY(&vp->v_dirtyblkhd)) { - if (--maxretry != 0) { + /* + * If we are unable to write any of these buffers + * then we fail now rather than trying endlessly + * to write them out. + */ + TAILQ_FOREACH(bp, &vp->v_dirtyblkhd, b_vnbufs) + if ((error = bp->b_error) == 0) + continue; + if (error == 0 && --maxretry >= 0) { splx(s); goto loop1; } vprint("spec_fsync: giving up on dirty", vp); + error = EAGAIN; } } VI_UNLOCK(vp); splx(s); - return (0); + return (error); } /* ==== //depot/projects/smpng/sys/geom/geom_subr.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_subr.c,v 1.20 2002/10/24 19:20:28 phk Exp $ + * $FreeBSD: src/sys/geom/geom_subr.c,v 1.21 2002/10/24 21:32:49 phk Exp $ */ @@ -190,7 +190,7 @@ pp->geom = gp; LIST_INSERT_HEAD(&gp->provider, pp, provider); g_nproviders++; - if (g_nproviders > 1) + if (strcmp(pp->name, "geom.ctl")) g_post_event(EV_NEW_PROVIDER, NULL, NULL, pp, NULL); return (pp); } ==== //depot/projects/smpng/sys/i386/i386/trap.c#45 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.235 2002/10/09 02:33:35 julian Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.236 2002/10/24 23:09:48 julian Exp $ */ /* @@ -963,44 +963,8 @@ td->td_frame = &frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (p->p_flag & P_KSES) { - /* - * First check that we shouldn't just abort. - * But check if we are the single thread first! - * XXX p_singlethread not locked, but should be safe. - */ - if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { - PROC_LOCK(p); - mtx_lock_spin(&sched_lock); - thread_exit(); - /* NOTREACHED */ - } - - /* - * If we are doing a syscall in a KSE environment, - * note where our mailbox is. There is always the - * possibility that we could do this lazily (in sleep()), - * but for now do it every time. - */ -#if 0 - td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox - + offsetof(struct kse_mailbox, km_curthread)); -#else /* if user pointer arithmetic is ok in the kernel */ - td->td_mailbox = - (void *)fuword( - (void *)&td->td_kse->ke_mailbox->km_curthread); -#endif - if ((td->td_mailbox == NULL) || - (td->td_mailbox == (void *)-1)) { - td->td_mailbox = NULL; /* single thread it.. */ - td->td_flags &= ~TDF_UNBOUND; - } else { - if (td->td_standin == NULL) { - td->td_standin = thread_alloc(); - } - td->td_flags |= TDF_UNBOUND; - } - } + if (p->p_flag & P_KSES) + thread_user_enter(p, td); params = (caddr_t)frame.tf_esp + sizeof(int); code = frame.tf_eax; orig_tf_eflags = frame.tf_eflags; ==== //depot/projects/smpng/sys/i386/include/float.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/i386/include/float.h,v 1.8 1999/08/28 00:44:11 peter Exp $ + * $FreeBSD: src/sys/i386/include/float.h,v 1.9 2002/10/25 07:02:52 imp Exp $ */ #ifndef _MACHINE_FLOAT_H_ @@ -60,13 +60,14 @@ #define DBL_MAX 1.7976931348623157E+308 #define DBL_MAX_10_EXP 308 -#define LDBL_MANT_DIG DBL_MANT_DIG -#define LDBL_EPSILON DBL_EPSILON -#define LDBL_DIG DBL_DIG -#define LDBL_MIN_EXP DBL_MIN_EXP -#define LDBL_MIN DBL_MIN -#define LDBL_MIN_10_EXP DBL_MIN_10_EXP -#define LDBL_MAX_EXP DBL_MAX_EXP -#define LDBL_MAX DBL_MAX -#define LDBL_MAX_10_EXP DBL_MAX_10_EXP + +#define LDBL_MANT_DIG 64 +#define LDBL_EPSILON 1.0842021724855044340E-19L +#define LDBL_DIG 18 +#define LDBL_MIN_EXP (-16381) +#define LDBL_MIN 3.3621031431120935063E-4932L +#define LDBL_MIN_10_EXP (-4931) +#define LDBL_MAX_EXP 16384 +#define LDBL_MAX 1.1897314953572317650E+4932L +#define LDBL_MAX_10_EXP 4932 #endif /* _MACHINE_FLOAT_H_ */ ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#38 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.64 2002/10/04 00:18:21 peter Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.65 2002/10/24 23:09:48 julian Exp $ */ /* From: src/sys/alpha/alpha/trap.c,v 1.33 */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ @@ -808,24 +808,8 @@ framep->tf_cr_iip += 16; } - if (p->p_flag & P_KSES) { - /* - * If we are doing a syscall in a KSE environment, - * note where our mailbox is. There is always the - * possibility that we could do this lazily (in sleep()), - * but for now do it every time. - */ - td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox - + offsetof(struct kse_mailbox, km_curthread)); - if ((td->td_mailbox == NULL) || - (td->td_mailbox == (void *)-1)) { - td->td_mailbox = NULL; /* single thread it.. */ - td->td_flags &= ~TDF_UNBOUND; - } else { - td->td_flags |= TDF_UNBOUND; - } - } - + if (p->p_flag & P_KSES) + thread_user_enter(p, td); #ifdef DIAGNOSTIC ia64_fpstate_check(td); #endif ==== //depot/projects/smpng/sys/kern/kern_condvar.c#20 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_condvar.c,v 1.33 2002/10/09 02:33:36 julian Exp $ + * $FreeBSD: src/sys/kern/kern_condvar.c,v 1.34 2002/10/25 07:11:12 julian Exp $ */ #include "opt_ktrace.h" @@ -82,7 +82,6 @@ #endif static void cv_timedwait_end(void *arg); -static void cv_check_upcall(struct thread *td); /* * Initialize a condition variable. Must be called before use. @@ -112,11 +111,10 @@ */ /* - * Decide if we need to queue an upcall. - * This is copied from msleep(), perhaps this should be a common function. + * Switch context. */ -static void -cv_check_upcall(struct thread *td) +static __inline void +cv_switch(struct thread *td) { /* @@ -127,8 +125,7 @@ * the thread (recursion here might be bad). * Hence the TDF_INMSLEEP flag. */ - if ((td->td_proc->p_flag & P_KSES) && td->td_mailbox && - (td->td_flags & TDF_INMSLEEP) == 0) { + if ((td->td_flags & (TDF_UNBOUND|TDF_INMSLEEP)) == TDF_UNBOUND) { /* * We don't need to upcall now, just queue it. * The upcall will happen when other n-kernel work @@ -139,16 +136,6 @@ thread_schedule_upcall(td, td->td_kse); td->td_flags &= ~TDF_INMSLEEP; } -} - -/* - * Switch context. - */ -static __inline void -cv_switch(struct thread *td) -{ - - cv_check_upcall(td); TD_SET_SLEEPING(td); td->td_proc->p_stats->p_ru.ru_nvcsw++; mi_switch(); ==== //depot/projects/smpng/sys/kern/kern_mutex.c#52 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.115 2002/10/23 10:26:54 des Exp $ + * $FreeBSD: src/sys/kern/kern_mutex.c,v 1.116 2002/10/25 08:40:20 phk Exp $ */ /* @@ -859,6 +859,10 @@ { /* + * XXX: When kernacc() does not require Giant we can reenable this check + */ +#ifdef notyet +/* * XXX - When kernacc() is fixed on the alpha to handle K0_SEG memory properly * we can re-enable the kernacc() checks. */ @@ -873,6 +877,7 @@ VM_PROT_READ | VM_PROT_WRITE)) panic("Can't read and write to mutex %p", m); #endif +#endif } #endif ==== //depot/projects/smpng/sys/kern/kern_synch.c#35 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.204 2002/10/12 05:32:23 jeff Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.205 2002/10/25 07:11:12 julian Exp $ */ #include "opt_ddb.h" @@ -155,26 +155,29 @@ * Hence the TDF_INMSLEEP flag. */ if (p->p_flag & P_KSES) { - /* Just don't bother if we are exiting - and not the exiting thread. */ - if ((p->p_flag & P_WEXIT) && catch && p->p_singlethread != td) + /* + * Just don't bother if we are exiting + * and not the exiting thread. + */ + if ((p->p_flag & P_WEXIT) && catch && (p->p_singlethread != td)) return (EINTR); - if (td->td_mailbox && (!(td->td_flags & TDF_INMSLEEP))) { + mtx_lock_spin(&sched_lock); + if ((td->td_flags & (TDF_UNBOUND|TDF_INMSLEEP)) == + TDF_UNBOUND) { /* * Arrange for an upcall to be readied. * it will not actually happen until all * pending in-kernel work for this KSEGRP * has been done. */ - mtx_lock_spin(&sched_lock); /* Don't recurse here! */ td->td_flags |= TDF_INMSLEEP; thread_schedule_upcall(td, td->td_kse); td->td_flags &= ~TDF_INMSLEEP; - mtx_unlock_spin(&sched_lock); } + } else { + mtx_lock_spin(&sched_lock); } - mtx_lock_spin(&sched_lock); if (cold ) { /* * During autoconfiguration, just give interrupts ==== //depot/projects/smpng/sys/kern/kern_thread.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/kern/kern_thread.c,v 1.42 2002/10/24 14:43:48 davidxu Exp $ + * $FreeBSD: src/sys/kern/kern_thread.c,v 1.48 2002/10/25 13:12:36 davidxu Exp $ */ #include @@ -369,8 +369,6 @@ return ESRCH; } found: - TAILQ_REMOVE(&kg->kg_iq, ke, ke_kgrlist); - kg->kg_idle_kses--; thread_schedule_upcall(td, ke); mtx_unlock_spin(&sched_lock); td->td_retval[0] = 0; @@ -1039,6 +1037,7 @@ thread_schedule_upcall(struct thread *td, struct kse *ke) { struct thread *td2; + struct ksegrp *kg; int newkse; mtx_assert(&sched_lock, MA_OWNED); @@ -1059,6 +1058,12 @@ } KASSERT((ke->ke_bound == NULL), ("kse already bound")); + if (ke->ke_state == KES_IDLE) { + kg = ke->ke_ksegrp; + TAILQ_REMOVE(&kg->kg_iq, ke, ke_kgrlist); + kg->kg_idle_kses--; + ke->ke_state = KES_UNQUEUED; + } if ((td2 = td->td_standin) != NULL) { td->td_standin = NULL; } else { @@ -1115,6 +1120,7 @@ } else { ke->ke_bound = NULL; ke->ke_thread = td2; + ke->ke_state = KES_THREAD; setrunqueue(td2); } return (td2); /* bogus.. should be a void function */ @@ -1158,6 +1164,54 @@ } /* + * setup done on the thread when it enters the kernel. + * XXXKSE Presently only for syscalls but eventually all kernel entries. + */ +void +thread_user_enter(struct proc *p, struct thread *td) +{ + struct kse *ke; + + /* + * First check that we shouldn't just abort. + * But check if we are the single thread first! + * XXX p_singlethread not locked, but should be safe. + */ + if ((p->p_flag & P_WEXIT) && (p->p_singlethread != td)) { + PROC_LOCK(p); + mtx_lock_spin(&sched_lock); + thread_exit(); + /* NOTREACHED */ + } + + /* + * If we are doing a syscall in a KSE environment, + * note where our mailbox is. There is always the + * possibility that we could do this lazily (in sleep()), + * but for now do it every time. + */ + ke = td->td_kse; + if (ke->ke_mailbox != NULL) { +#if 0 + td->td_mailbox = (void *)fuword((caddr_t)ke->ke_mailbox + + offsetof(struct kse_mailbox, km_curthread)); +#else /* if user pointer arithmetic is ok in the kernel */ + td->td_mailbox = + (void *)fuword( (void *)&ke->ke_mailbox->km_curthread); +#endif + if ((td->td_mailbox == NULL) || + (td->td_mailbox == (void *)-1)) { + td->td_mailbox = NULL; /* single thread it.. */ + td->td_flags &= ~TDF_UNBOUND; + } else { + if (td->td_standin == NULL) + td->td_standin = thread_alloc(); + td->td_flags |= TDF_UNBOUND; + } + } +} + +/* * The extra work we go through if we are a threaded process when we * return to userland. * @@ -1397,28 +1451,42 @@ p->p_flag &= ~P_SINGLE_EXIT; p->p_flag |= P_STOPPED_SINGLE; p->p_singlethread = td; + /* XXXKSE Which lock protects the below values? */ while ((p->p_numthreads - p->p_suspcount) != 1) { mtx_lock_spin(&sched_lock); FOREACH_THREAD_IN_PROC(p, td2) { if (td2 == td) continue; if (TD_IS_INHIBITED(td2)) { - if (TD_IS_SUSPENDED(td2)) { - if (force_exit == SINGLE_EXIT) { + if (force_exit == SINGLE_EXIT) { + if (TD_IS_SUSPENDED(td2)) { thread_unsuspend_one(td2); - } else { + } + if (TD_ON_SLEEPQ(td2) && + (td2->td_flags & TDF_SINTR)) { + if (td2->td_flags & TDF_CVWAITQ) + cv_abort(td2); + else + abortsleep(td2); + } + } else { + if (TD_IS_SUSPENDED(td2)) continue; - } - } - if (TD_ON_SLEEPQ(td2) && - (td2->td_flags & TDF_SINTR)) { - if (td2->td_flags & TDF_CVWAITQ) - cv_abort(td2); - else - abortsleep(td2); + /* maybe other inhibitted states too? */ + if (TD_IS_SLEEPING(td2) && + (td2->td_flags & TDF_SINTR)) + thread_suspend_one(td2); } } } + /* + * Maybe we suspended some threads.. was it enough? + */ + if ((p->p_numthreads - p->p_suspcount) == 1) { + mtx_unlock_spin(&sched_lock); + break; + } + /* * Wake us up when everyone else has suspended. * In the mean time we suspend as well. @@ -1574,6 +1642,7 @@ * Hack: If we are suspending but are on the sleep queue * then we are in msleep or the cv equivalent. We * want to look like we have two Inhibitors. + * May already be set.. doesn't matter. */ if (TD_ON_SLEEPQ(td)) TD_SET_SLEEPING(td); ==== //depot/projects/smpng/sys/kern/vfs_subr.c#36 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_subr.c 8.31 (Berkeley) 5/26/95 - * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.416 2002/10/24 19:38:56 phk Exp $ + * $FreeBSD: src/sys/kern/vfs_subr.c,v 1.418 2002/10/25 07:58:25 phk Exp $ */ /* @@ -1958,7 +1958,7 @@ v_incr_usecount(struct vnode *vp, int delta) { vp->v_usecount += delta; - if (vp->v_type == VCHR) { + if (vp->v_type == VCHR && vp->v_rdev != NULL) { mtx_lock(&spechash_mtx); vp->v_rdev->si_usecount += delta; mtx_unlock(&spechash_mtx); @@ -3425,7 +3425,7 @@ struct vnode *syncvp = ap->a_vp; struct mount *mp = syncvp->v_mount; struct thread *td = ap->a_td; - int asyncflag; + int error, asyncflag; /* * We only need to do something if this is a lazy evaluation. @@ -3456,12 +3456,12 @@ asyncflag = mp->mnt_flag & MNT_ASYNC; mp->mnt_flag &= ~MNT_ASYNC; vfs_msync(mp, MNT_NOWAIT); - VFS_SYNC(mp, MNT_LAZY, ap->a_cred, td); + error = VFS_SYNC(mp, MNT_LAZY, ap->a_cred, td); if (asyncflag) mp->mnt_flag |= MNT_ASYNC; vn_finished_write(mp); vfs_unbusy(mp, td); - return (0); + return (error); } /* ==== //depot/projects/smpng/sys/kern/vfs_vnops.c#32 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.174 2002/10/19 20:56:44 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_vnops.c,v 1.175 2002/10/25 00:20:36 mckusick Exp $ */ #include "opt_mac.h" @@ -1005,19 +1005,24 @@ /* * Request a filesystem to suspend write operations. */ -void +int vfs_write_suspend(mp) struct mount *mp; { struct thread *td = curthread; + int error; if (mp->mnt_kern_flag & MNTK_SUSPEND) - return; + return (0); mp->mnt_kern_flag |= MNTK_SUSPEND; if (mp->mnt_writeopcount > 0) (void) tsleep(&mp->mnt_writeopcount, PUSER - 1, "suspwt", 0); - VFS_SYNC(mp, MNT_WAIT, td->td_ucred, td); + if ((error = VFS_SYNC(mp, MNT_WAIT, td->td_ucred, td)) != 0) { + vfs_write_resume(mp); + return (error); + } mp->mnt_kern_flag |= MNTK_SUSPENDED; + return (0); } /* ==== //depot/projects/smpng/sys/netinet/ip_fw.h#11 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.74 2002/08/10 04:37:32 luigi Exp $ + * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.75 2002/10/24 22:32:13 mux Exp $ */ #ifndef _IPFW2_H @@ -276,6 +276,7 @@ struct ip_fw { struct ip_fw *next; /* linked list of rules */ struct ip_fw *next_rule; /* ptr to next [skipto] rule */ + u_int32_t set_disable; /* disabled sets (for userland) */ u_int16_t act_ofs; /* offset of action in 32-bit units */ u_int16_t cmd_len; /* # of 32-bit words in cmd */ u_int16_t rulenum; /* rule number */ @@ -331,6 +332,7 @@ /* to generate keepalives) */ u_int16_t dyn_type; /* rule type */ u_int16_t count; /* refcount */ + u_int16_t rulenum; /* rule number (for userland) */ }; /* ==== //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#37 (text+ko) ==== @@ -37,7 +37,7 @@ * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 * from: FreeBSD: src/sys/i386/i386/machdep.c,v 1.477 2001/08/27 - * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.66 2002/10/22 18:03:15 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/machdep.c,v 1.67 2002/10/25 06:26:34 jake Exp $ */ #include "opt_ddb.h" @@ -313,7 +313,7 @@ thread0.td_kstack = kstack0; thread0.td_pcb = (struct pcb *) (thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE) - 1; - frame0.tf_tstate = TSTATE_IE | TSTATE_PEF; + frame0.tf_tstate = TSTATE_IE | TSTATE_PEF | TSTATE_PRIV; thread0.td_frame = &frame0; /* @@ -597,12 +597,12 @@ } pcb = td->td_pcb; + tf = td->td_frame; sp = rounddown(stack, 16); - tf = td->td_frame; bzero(pcb, sizeof(*pcb)); bzero(tf, sizeof(*tf)); tf->tf_out[0] = stack; - tf->tf_out[3] = PS_STRINGS; + tf->tf_out[3] = p->p_sysent->sv_psstrings; tf->tf_out[6] = sp - SPOFF - sizeof(struct frame); tf->tf_tnpc = entry + 4; tf->tf_tpc = entry; ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#41 (text+ko) ==== @@ -37,7 +37,7 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * from: FreeBSD: src/sys/i386/i386/trap.c,v 1.197 2001/07/19 - * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.48 2002/10/22 18:03:15 jake Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/trap.c,v 1.49 2002/10/24 23:09:48 julian Exp $ */ #include "opt_ddb.h" @@ -575,23 +575,8 @@ td->td_frame = tf; if (td->td_ucred != p->p_ucred) cred_update_thread(td); - if (p->p_flag & P_KSES) { - /* - * If we are doing a syscall in a KSE environment, - * note where our mailbox is. There is always the - * possibility that we could do this lazily (in sleep()), - * but for now do it every time. - */ - td->td_mailbox = (void *)fuword((caddr_t)td->td_kse->ke_mailbox - + offsetof(struct kse_mailbox, km_curthread)); - if ((td->td_mailbox == NULL) || - (td->td_mailbox == (void *)-1)) { - td->td_mailbox = NULL; /* single thread it.. */ - td->td_flags &= ~TDF_UNBOUND; - } else { - td->td_flags |= TDF_UNBOUND; - } - } + if (p->p_flag & P_KSES) + thread_user_enter(p, td); code = tf->tf_global[1]; /* ==== //depot/projects/smpng/sys/sys/proc.h#64 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)proc.h 8.15 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/proc.h,v 1.274 2002/10/24 08:46:34 julian Exp $ + * $FreeBSD: src/sys/sys/proc.h,v 1.275 2002/10/24 23:09:48 julian Exp $ */ #ifndef _SYS_PROC_H_ @@ -930,6 +930,7 @@ void thread_unsuspend(struct proc *p); void thread_unsuspend_one(struct thread *td); int thread_userret(struct thread *td, struct trapframe *frame); +void thread_user_enter(struct proc *p, struct thread *td); void thread_sanity_check(struct thread *td, char *); #endif /* _KERNEL */ ==== //depot/projects/smpng/sys/sys/vnode.h#27 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vnode.h 8.7 (Berkeley) 2/4/94 - * $FreeBSD: src/sys/sys/vnode.h,v 1.215 2002/10/13 04:19:44 jeff Exp $ + * $FreeBSD: src/sys/sys/vnode.h,v 1.216 2002/10/25 00:20:36 mckusick Exp $ */ #ifndef _SYS_VNODE_H_ @@ -681,7 +681,7 @@ struct ucred *cred); void vfs_timestamp(struct timespec *); void vfs_write_resume(struct mount *mp); -void vfs_write_suspend(struct mount *mp); +int vfs_write_suspend(struct mount *mp); int vop_stdbmap(struct vop_bmap_args *); int vop_stdgetwritemount(struct vop_getwritemount_args *); int vop_stdgetpages(struct vop_getpages_args *); ==== //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_snapshot.c 8.11 (McKusick) 7/23/00 - * $FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.47 2002/10/22 01:23:00 mckusick Exp $ + * $FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.48 2002/10/25 00:20:37 mckusick Exp $ */ #include @@ -307,7 +307,10 @@ */ for (;;) { vn_finished_write(wrtmp); - vfs_write_suspend(vp->v_mount); + if ((error = vfs_write_suspend(vp->v_mount)) != 0) { + vn_start_write(NULL, &wrtmp, V_WAIT); + goto out; + } if (mp->mnt_kern_flag & MNTK_SUSPENDED) break; vn_start_write(NULL, &wrtmp, V_WAIT); ==== //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#33 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.194 2002/10/15 20:00:06 rwatson Exp $ + * $FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.195 2002/10/25 00:20:37 mckusick Exp $ */ #include "opt_mac.h" @@ -184,7 +184,11 @@ /* * Flush any dirty data. */ - VFS_SYNC(mp, MNT_WAIT, td->td_proc->p_ucred, td); + if ((error = VFS_SYNC(mp, MNT_WAIT, + td->td_proc->p_ucred, td)) != 0) { + vn_finished_write(mp); + return (error); + } /* * Check for and optionally get rid of files open * for writing. @@ -1156,7 +1160,7 @@ if ((error = softdep_flushworklist(ump->um_mountp, &count, td))) allerror = error; /* Flushed work items may create new vnodes to clean */ - if (count) { + if (allerror == 0 && count) { mtx_lock(&mntvnode_mtx); goto loop; } @@ -1172,7 +1176,7 @@ if ((error = VOP_FSYNC(devvp, cred, waitfor, td)) != 0) allerror = error; VOP_UNLOCK(devvp, 0, td); - if (waitfor == MNT_WAIT) { + if (allerror == 0 && waitfor == MNT_WAIT) { mtx_lock(&mntvnode_mtx); goto loop; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 7:58:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2547937B404; Fri, 25 Oct 2002 07:58:45 -0700 (PDT) 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 ADFB637B401 for ; Fri, 25 Oct 2002 07:58:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6408943E4A for ; Fri, 25 Oct 2002 07:58:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PEvtmV098336 for ; Fri, 25 Oct 2002 07:57:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PEvs8m098332 for perforce@freebsd.org; Fri, 25 Oct 2002 07:57:54 -0700 (PDT) Date: Fri, 25 Oct 2002 07:57:54 -0700 (PDT) Message-Id: <200210251457.g9PEvs8m098332@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 Subject: PERFORCE change 20121 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20121 Change 20121 by rwatson@rwatson_tislabs on 2002/10/25 07:57:39 Provide mac_biba_subject_dominate_high(), a utility function to determine if the passed subject credential dominates a high object. Use only for sysctl mib entries. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#159 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#159 (text+ko) ==== @@ -220,6 +220,19 @@ } static int +mac_biba_subject_dominate_high(struct mac_biba *mac_biba) +{ + struct mac_biba_element *element; + + KASSERT((mac_biba->mb_single->mb_flags & MAC_BIBA_FLAG_SINGLE) != 0, + ("mac_biba_single_in_range: mac_biba not single")); + element = &mac_biba->mb_single; + + return (element->mbe_type == MAC_BIBA_TYPE_EQUAL || + element->mbe_type == MAC_BIBA_TYPE_HIGH); +} + +static int mac_biba_range_in_range(struct mac_biba *rangea, struct mac_biba *rangeb) { @@ -1873,14 +1886,19 @@ subj = SLOT(&cred->cr_label); /* - * Permit sysctl modification only if Biba-privileged; permit - * read by any process. Exempt certain management interfaces - * that are used to query MIB state. XXXMAC: This probably - * requires some more review. + * In general, treat sysctl variables as biba/high, but also + * require privilege to change them, since they are a + * communications channel between grades. Exempt MIB + * queries from this due to undocmented sysctl magic. + * XXXMAC: This probably requires some more review. */ if (new != NULL) { if (namelen > 0 && name[0] == 0) return (0); + + if (!mac_biba_subject_dominate_high(subj)) + return (EACCES); + error = mac_biba_privileged(subj); if (error) return (error); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 9:27:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A33537B413; Fri, 25 Oct 2002 09:27:36 -0700 (PDT) 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 13AA337B401 for ; Fri, 25 Oct 2002 09:27:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C32A843E4A for ; Fri, 25 Oct 2002 09:27:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PGQjmV004452 for ; Fri, 25 Oct 2002 09:26:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PGQiOt004449 for perforce@freebsd.org; Fri, 25 Oct 2002 09:26:44 -0700 (PDT) Date: Fri, 25 Oct 2002 09:26:44 -0700 (PDT) Message-Id: <200210251626.g9PGQiOt004449@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 Subject: PERFORCE change 20126 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20126 Change 20126 by rwatson@rwatson_tislabs on 2002/10/25 09:26:33 Excess include trimmage; left over from earlier functionality now removed or migrated. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#11 edit .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_get.c#11 (text+ko) ==== @@ -34,9 +34,6 @@ #include #include -#include -#include - int mac_get_fd(int fd, struct mac *label) { ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_set.c#8 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 9:28:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B418337B404; Fri, 25 Oct 2002 09:28:37 -0700 (PDT) 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 4B1E137B401 for ; Fri, 25 Oct 2002 09:28:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D9CE743E4A for ; Fri, 25 Oct 2002 09:28:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PGRlmV004539 for ; Fri, 25 Oct 2002 09:27:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PGRkM4004536 for perforce@freebsd.org; Fri, 25 Oct 2002 09:27:46 -0700 (PDT) Date: Fri, 25 Oct 2002 09:27:46 -0700 (PDT) Message-Id: <200210251627.g9PGRkM4004536@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 Subject: PERFORCE change 20127 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20127 Change 20127 by rwatson@rwatson_tislabs on 2002/10/25 09:27:26 Permit a libc wrapper for execve_mac(). We do this for all the other MAC-related system calls, and it permits us to perform user-space transforms on labels before they enter the kernel. Not currently used, but has been used in the past. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#20 edit .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#41 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#39 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#40 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#38 edit .. //depot/projects/trustedbsd/mac/sys/sys/imgact.h#13 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#191 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#41 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#40 edit .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#42 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#20 (text+ko) ==== @@ -20,6 +20,7 @@ acl_valid.c \ extattr.c \ mac.c \ + mac_exec.c \ mac_get.c \ mac_set.c ==== //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#41 (text+ko) ==== @@ -443,7 +443,7 @@ { AS(extattr_set_link_args), (sy_call_t *)extattr_set_link }, /* 412 = extattr_set_link */ { AS(extattr_get_link_args), (sy_call_t *)extattr_get_link }, /* 413 = extattr_get_link */ { AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link }, /* 414 = extattr_delete_link */ - { SYF_MPSAFE | AS(execve_mac_args), (sy_call_t *)execve_mac }, /* 415 = execve_mac */ + { SYF_MPSAFE | AS(__execve_mac_args), (sy_call_t *)__execve_mac }, /* 415 = __execve_mac */ { 0, (sy_call_t *)nosys }, /* 416 = newsigreturn */ { 0, (sy_call_t *)nosys }, /* 417 = newsigaction */ { 0, (sy_call_t *)nosys }, /* 418 = __xstat */ ==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#39 (text+ko) ==== @@ -136,7 +136,7 @@ static const struct execsw **execsw; #ifndef _SYS_SYSPROTO_H_ -struct execve_mac_args { +struct __execve_mac_args { char *fname; char **argv; char **envv; @@ -145,14 +145,14 @@ #endif /* - * execve_mac() system call. + * __execve_mac() system call. * * MPSAFE */ int -execve_mac(td, uap) +__execve_mac(td, uap) struct thread *td; - register struct execve_mac_args *uap; + register struct __execve_mac_args *uap; { struct proc *p = td->td_proc; struct nameidata nd, *ndp; @@ -684,7 +684,7 @@ } /* - * execve() system call. This is simply a wrapper for execve_mac + * execve() system call. This is simply a wrapper for __execve_mac * which passes in a NULL label argument. * * MPSAFE @@ -698,13 +698,13 @@ syscallarg(char **) envv; } */ *uap; { - struct execve_mac_args mac_args; + struct __execve_mac_args mac_args; mac_args.fname = uap->fname; mac_args.argv = uap->argv; mac_args.envv = uap->envv; mac_args.mac_p = NULL; - return (execve_mac(td, &mac_args)); + return (__execve_mac(td, &mac_args)); } int ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#40 (text+ko) ==== @@ -422,7 +422,7 @@ "extattr_set_link", /* 412 = extattr_set_link */ "extattr_get_link", /* 413 = extattr_get_link */ "extattr_delete_link", /* 414 = extattr_delete_link */ - "execve_mac", /* 415 = execve_mac */ + "__execve_mac", /* 415 = __execve_mac */ "#416", /* 416 = newsigreturn */ "#417", /* 417 = newsigaction */ "#418", /* 418 = __xstat */ ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#38 (text+ko) ==== @@ -601,7 +601,7 @@ void *data, size_t nbytes); } 414 STD BSD { int extattr_delete_link(const char *path, \ int attrnamespace, const char *attrname); } -415 MSTD BSD { int execve_mac(char *fname, char **argv, \ +415 MSTD BSD { int __execve_mac(char *fname, char **argv, \ char **envv, struct mac *mac_p); } 416 UNIMPL BSD newsigreturn 417 UNIMPL BSD newsigaction ==== //depot/projects/trustedbsd/mac/sys/sys/imgact.h#13 (text+ko) ==== @@ -45,7 +45,7 @@ struct image_params { struct proc *proc; /* our process struct */ - struct execve_mac_args *uap; /* syscall arguments */ + struct __execve_mac_args *uap; /* syscall arguments */ struct label *execlabel; /* MAC label to compose transition with */ struct vnode *vp; /* pointer to vnode of file to exec */ struct vm_object *object; /* The vm object for this vp */ ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#191 (text+ko) ==== @@ -87,6 +87,8 @@ * Extended non-POSIX.1e interfaces that offer additional services * available from the userland and kernel MAC frameworks. */ +int execve_mac(char *fname, char **argv, char **envv, + mac_t _label); int mac_free(mac_t _label); int mac_from_text(mac_t *_label, const char *_text); int mac_get_fd(int _fd, mac_t _label); ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.h#41 (text+ko) ==== @@ -323,5 +323,5 @@ #define SYS_extattr_set_link 412 #define SYS_extattr_get_link 413 #define SYS_extattr_delete_link 414 -#define SYS_execve_mac 415 +#define SYS___execve_mac 415 #define SYS_MAXSYSCALL 421 ==== //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#40 (text+ko) ==== @@ -272,4 +272,4 @@ extattr_set_link.o \ extattr_get_link.o \ extattr_delete_link.o \ - execve_mac.o + __execve_mac.o ==== //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#42 (text+ko) ==== @@ -1189,7 +1189,7 @@ char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)]; char attrname_l_[PADL_(const char *)]; const char * attrname; char attrname_r_[PADR_(const char *)]; }; -struct execve_mac_args { +struct __execve_mac_args { char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)]; char argv_l_[PADL_(char **)]; char ** argv; char argv_r_[PADR_(char **)]; char envv_l_[PADL_(char **)]; char ** envv; char envv_r_[PADR_(char **)]; @@ -1463,7 +1463,7 @@ int extattr_set_link(struct thread *, struct extattr_set_link_args *); int extattr_get_link(struct thread *, struct extattr_get_link_args *); int extattr_delete_link(struct thread *, struct extattr_delete_link_args *); -int execve_mac(struct thread *, struct execve_mac_args *); +int __execve_mac(struct thread *, struct __execve_mac_args *); #ifdef COMPAT_43 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 9:51:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6113237B404; Fri, 25 Oct 2002 09:51:07 -0700 (PDT) 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 BE00C37B401 for ; Fri, 25 Oct 2002 09:51:06 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 692B243E4A for ; Fri, 25 Oct 2002 09:51:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PGoGmV006478 for ; Fri, 25 Oct 2002 09:50:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PGoFtw006471 for perforce@freebsd.org; Fri, 25 Oct 2002 09:50:15 -0700 (PDT) Date: Fri, 25 Oct 2002 09:50:15 -0700 (PDT) Message-Id: <200210251650.g9PGoFtw006471@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 Subject: PERFORCE change 20129 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20129 Change 20129 by rwatson@rwatson_tislabs on 2002/10/25 09:49:22 Add mac_check_reboot(), which permits policies to get in on the access control decision to reboot a machine. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#329 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_shutdown.c#14 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#192 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#148 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#329 (text+ko) ==== @@ -143,6 +143,11 @@ &mac_enforce_process, 0, "Enforce MAC policy on inter-process operations"); TUNABLE_INT("security.mac.enforce_process", &mac_enforce_process); +static int mac_enforce_reboot = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_reboot, CTLFLAG_RW, + &mac_enforce_reboot, 0, "Enforce MAC policy for reboot operations"); +TUNABLE_INT("security.mac.enforce_reboot", &mac_enforce_reboot); + static int mac_enforce_socket = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_socket, CTLFLAG_RW, &mac_enforce_socket, 0, "Enforce MAC policy on socket operations"); @@ -883,6 +888,10 @@ mpc->mpc_ops->mpo_check_proc_signal = mpe->mpe_function; break; + case MAC_CHECK_REBOOT: + mpc->mpc_ops->mpo_check_reboot = + mpe->mpe_function; + break; case MAC_CHECK_SOCKET_BIND: mpc->mpc_ops->mpo_check_socket_bind = mpe->mpe_function; @@ -2957,6 +2966,19 @@ } int +mac_check_reboot(struct ucred *cred, int howto) +{ + int error; + + if (!mac_enforce_reboot) + return (0); + + MAC_CHECK(check_reboot, cred, howto); + + return (error); +} + +int mac_check_socket_bind(struct ucred *ucred, struct socket *socket, struct sockaddr *sockaddr) { ==== //depot/projects/trustedbsd/mac/sys/kern/kern_shutdown.c#14 (text+ko) ==== @@ -43,6 +43,7 @@ #include "opt_ddb_trace.h" #include "opt_ddb_unattended.h" #include "opt_hw_wdog.h" +#include "opt_mac.h" #include "opt_panic.h" #include "opt_show_busybufs.h" @@ -56,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -159,10 +161,17 @@ { int error; - mtx_lock(&Giant); - if ((error = suser(td)) == 0) + error = 0; +#ifdef MAC + error = mac_check_reboot(td->td_ucred, uap->opt); +#endif + if (error == 0) + error = suser(td); + if (error == 0) { + mtx_lock(&Giant); boot(uap->opt); - mtx_unlock(&Giant); + mtx_unlock(&Giant); + } return (error); } ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#192 (text+ko) ==== @@ -302,6 +302,7 @@ int mac_check_proc_sched(struct ucred *cred, struct proc *proc); int mac_check_proc_signal(struct ucred *cred, struct proc *proc, int signum); +int mac_check_reboot(struct ucred *cred, int howto); int mac_check_socket_bind(struct ucred *cred, struct socket *so, struct sockaddr *sockaddr); int mac_check_socket_connect(struct ucred *cred, struct socket *so, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#148 (text+ko) ==== @@ -297,6 +297,7 @@ struct proc *proc); int (*mpo_check_proc_signal)(struct ucred *cred, struct proc *proc, int signum); + int (*mpo_check_reboot)(struct ucred *cred, int howto); int (*mpo_check_socket_bind)(struct ucred *cred, struct socket *so, struct label *socketlabel, struct sockaddr *sockaddr); @@ -506,6 +507,7 @@ MAC_CHECK_PROC_DEBUG, MAC_CHECK_PROC_SCHED, MAC_CHECK_PROC_SIGNAL, + MAC_CHECK_REBOOT, MAC_CHECK_SOCKET_BIND, MAC_CHECK_SOCKET_CONNECT, MAC_CHECK_SOCKET_DELIVER, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 9:54:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF2A737B404; Fri, 25 Oct 2002 09:54:11 -0700 (PDT) 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 4996237B401 for ; Fri, 25 Oct 2002 09:54:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D880C43E42 for ; Fri, 25 Oct 2002 09:54:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PGrLmV006817 for ; Fri, 25 Oct 2002 09:53:21 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PGrKHW006812 for perforce@freebsd.org; Fri, 25 Oct 2002 09:53:20 -0700 (PDT) Date: Fri, 25 Oct 2002 09:53:20 -0700 (PDT) Message-Id: <200210251653.g9PGrKHW006812@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 Subject: PERFORCE change 20130 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20130 Change 20130 by rwatson@rwatson_tislabs on 2002/10/25 09:52:42 For consistency, name mac_biba_privileged as mac_biba_subject_privileged -- it should only be called on subjects. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#160 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#160 (text+ko) ==== @@ -312,12 +312,12 @@ } static int -mac_biba_privileged(struct mac_biba *mac_biba) +mac_biba_subject_privileged(struct mac_biba *mac_biba) { KASSERT((mac_biba->mb_flags & MAC_BIBA_FLAGS_BOTH) == MAC_BIBA_FLAGS_BOTH, - ("mac_biba_subject_equal_ok: subject doesn't have both labels")); + ("mac_biba_subject_privileged: subject doesn't have both labels")); /* If the single is EQUAL, it's ok. */ if (mac_biba->mb_single.mbe_type == MAC_BIBA_TYPE_EQUAL) @@ -1480,7 +1480,7 @@ * their label. */ if (mac_biba_contains_equal(new)) { - error = mac_biba_privileged(subj); + error = mac_biba_subject_privileged(subj); if (error) return (error); } @@ -1534,7 +1534,7 @@ /* * Relabling network interfaces requires Biba privilege. */ - error = mac_biba_privileged(subj); + error = mac_biba_subject_privileged(subj); if (error) return (error); @@ -1684,7 +1684,7 @@ * subject must have appropriate privilege. */ if (mac_biba_contains_equal(new)) { - error = mac_biba_privileged(subj); + error = mac_biba_subject_privileged(subj); if (error) return (error); } @@ -1846,7 +1846,7 @@ * the subject must have appropriate privilege. */ if (mac_biba_contains_equal(new)) { - error = mac_biba_privileged(subj); + error = mac_biba_subject_privileged(subj); if (error) return (error); } @@ -1899,7 +1899,7 @@ if (!mac_biba_subject_dominate_high(subj)) return (EACCES); - error = mac_biba_privileged(subj); + error = mac_biba_subject_privileged(subj); if (error) return (error); } @@ -2266,7 +2266,7 @@ * the subject must have appropriate privilege. */ if (mac_biba_contains_equal(new)) { - error = mac_biba_privileged(subj); + error = mac_biba_subject_privileged(subj); if (error) return (error); } @@ -2484,7 +2484,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(label); - if (!mac_biba_privileged(subj)) + if (!mac_biba_subject_privileged(subj)) return (EPERM); if (!mac_biba_high_single(obj)) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 10: 6:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA7F937B404; Fri, 25 Oct 2002 10:06:29 -0700 (PDT) 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 934D337B401 for ; Fri, 25 Oct 2002 10:06:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3953B43E3B for ; Fri, 25 Oct 2002 10:06:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PH5cmV007816 for ; Fri, 25 Oct 2002 10:05:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PH5aZq007800 for perforce@freebsd.org; Fri, 25 Oct 2002 10:05:36 -0700 (PDT) Date: Fri, 25 Oct 2002 10:05:36 -0700 (PDT) Message-Id: <200210251705.g9PH5aZq007800@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 Subject: PERFORCE change 20131 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20131 Change 20131 by rwatson@rwatson_tislabs on 2002/10/25 10:04:37 Bring in various changes since last TrustedBSD base integ: largely sysinstall fixes, some Kirk fixes, etc. Affected files ... .. //depot/projects/trustedbsd/base/UPDATING#19 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#13 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/troffrc#6 integrate .. //depot/projects/trustedbsd/base/etc/MAKEDEV#19 integrate .. //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#6 integrate .. //depot/projects/trustedbsd/base/etc/inetd.conf#7 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#11 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/100.chksetuid#6 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/200.chkmounts#5 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/500.ipfwdenied#4 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/510.ipfdenied#1 branch .. //depot/projects/trustedbsd/base/etc/periodic/security/600.ip6fwdenied#4 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/700.kernelmsg#5 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/Makefile#3 integrate .. //depot/projects/trustedbsd/base/etc/periodic/security/security.functions#1 branch .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/Makefile#7 integrate .. //depot/projects/trustedbsd/base/include/Makefile#20 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/wcrtomb.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac_free.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/local.h#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strerror.3#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcsncpy.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/wcsstr.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_cancel.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_error.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_read.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_return.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_suspend.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_waitcomplete.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/aio_write.2#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/sigaction.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libfetch/ftp.c#11 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#15 integrate .. //depot/projects/trustedbsd/base/libexec/lukemftpd/Makefile#5 integrate .. //depot/projects/trustedbsd/base/release/Makefile#26 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#47 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/create.c#1 branch .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.h#2 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/fsinterface/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/newvm/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/papers/sysperf/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/01.cacm/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/01.cacm/p1#2 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/01.cacm/ref.bib#1 branch .. //depot/projects/trustedbsd/base/share/doc/psd/02.implement/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/02.implement/implement#2 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/02.implement/ref.bib#1 branch .. //depot/projects/trustedbsd/base/share/doc/psd/06.Clang/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/13.rcs/rcs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/15.yacc/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/15.yacc/ref.bib#1 branch .. //depot/projects/trustedbsd/base/share/doc/psd/15.yacc/ss..#2 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/16.lex/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/16.lex/lex.ms#2 integrate .. //depot/projects/trustedbsd/base/share/doc/psd/17.m4/m4.ms#2 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/10.named/Makefile#2 delete .. //depot/projects/trustedbsd/base/share/doc/smm/18.net/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/smm/contents/contents.ms#2 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/10.exref/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/10.exref/summary/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/12.vi/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/12.vi/summary/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/12.vi/vi/Makefile#2 integrate .. //depot/projects/trustedbsd/base/share/doc/usd/22.trofftut/tt.mac#2 integrate .. //depot/projects/trustedbsd/base/share/man/man3/assert.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man3/stdarg.3#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#20 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#4 integrate .. //depot/projects/trustedbsd/base/share/man/man4/aio.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/periodic.conf.5#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/trap.c#16 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/bootinfo.c#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/efiboot.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/efi/libefi/elf_freebsd.c#5 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#22 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#44 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#21 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.ia64#13 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#18 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#25 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.ia64#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_ec.c#11 integrate .. //depot/projects/trustedbsd/base/sys/fs/specfs/spec_vnops.c#15 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#26 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#19 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/float.h#2 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#16 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#23 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/trap.c#13 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_condvar.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_vnops.c#30 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#32 integrate .. //depot/projects/trustedbsd/base/sys/modules/mac_partition/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/modules/vinum/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_divert.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw.h#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_usrreq.c#12 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/trap.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#23 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/rwindow.c#6 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#17 integrate .. //depot/projects/trustedbsd/base/sys/sys/conf.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#27 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#29 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_snapshot.c#15 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#12 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T000/ref.conf#5 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T001/ref.conf#6 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T002/ref.conf#6 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T003/ref.conf#6 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T004/ref.conf#6 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T005/ref.conf#6 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T006/ref.conf#5 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T007/ref.conf#5 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T008/ref.conf#5 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T009/ref.conf#5 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T011/ref.conf#5 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T012/ref.conf#6 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T013/ref.conf#6 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/Test/T014/ref.conf#7 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/geom_sim.h#5 integrate .. //depot/projects/trustedbsd/base/tools/regression/geom/geom_simdisk.c#6 integrate .. //depot/projects/trustedbsd/base/tools/regression/usr.bin/make/Makefile#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/make/var.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/stat/stat.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/show.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/quot/quot.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dev2c.sh#3 delete .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/dist.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/install.c#13 integrate Differences ... ==== //depot/projects/trustedbsd/base/UPDATING#19 (text+ko) ==== @@ -22,6 +22,20 @@ integrity. Re-enabling write caching can substantially improve performance. +20021023: + Alphas with kernels from between 20020830 and 20021023 and/or + rtld (ld-elf.so.1) older than 20021023 may experience problems + with groff while doing a buildworld (kernel: "out of memory", + fixed in rev 1.129 of kern/imgact_elf.c; rtld: "too few PT_LOAD + segments", fixed in rev 1.8 of libexec/rtld-elf/map_object.c). + + So, to successfully upgrade your Alpha, you must either + upgrade your kernel and rtld first (which might be a bit + tricky), or avoid running the bootstrapped groff during the + "transitional" buildworld. To avoid running groff during the + transitional upgrade run make buildworld with -DNOMAN, + -DNO_SHAREDOCS, and -DNO_LPR. + 20020831: gcc has been upgraded to 3.2. It is not all binary compatible with earlier versions of gcc for c++ programs. All c++ @@ -1077,4 +1091,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.217 2002/09/03 06:13:43 imp Exp $ +$FreeBSD: src/UPDATING,v 1.218 2002/10/24 18:41:02 gallatin Exp $ ==== //depot/projects/trustedbsd/base/bin/ls/ls.c#13 (text+ko) ==== @@ -46,10 +46,11 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.68 2002/10/24 00:07:30 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.69 2002/10/24 01:01:53 rwatson Exp $"); #include #include +#include #include #include @@ -685,6 +686,7 @@ flen = 0; labelstr = NULL; if (f_label) { + char name[PATH_MAX + 1]; mac_t label; int error; @@ -696,12 +698,20 @@ goto label_out; } + if (cur->fts_level == FTS_ROOTLEVEL) + snprintf(name, sizeof(name), + "%s", cur->fts_name); + else + snprintf(name, sizeof(name), + "%s/%s", cur->fts_parent->fts_accpath, + cur->fts_name); + if (options & FTS_LOGICAL) - error = mac_get_file( - cur->fts_path, label); + error = mac_get_file(name, + label); else - error = mac_get_link( - cur->fts_name, label); + error = mac_get_link(name, + label); if (error == -1) { perror(cur->fts_name); mac_free(label); ==== //depot/projects/trustedbsd/base/contrib/groff/tmac/troffrc#6 (text+ko) ==== @@ -1,5 +1,5 @@ .\" Startup file for troff. -.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.13 2002/10/23 19:04:00 ru Exp $ +.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.14 2002/10/24 11:05:58 ru Exp $ . .\" This is tested by pic. .nr 0p 0 @@ -45,4 +45,12 @@ . .\} . +.\" Disable SGR support in grotty(1). +.if n \{\ +. do nop \X'tty: sgr 0' +. sp -1 +. nr nl 0-1 +. nr % -1 +.\} +. .\" Don't let blank lines creep in here. ==== //depot/projects/trustedbsd/base/etc/MAKEDEV#19 (text+ko) ==== @@ -20,7 +20,7 @@ # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # # @(#)MAKEDEV 5.2 (Berkeley) 6/22/90 -# $FreeBSD: src/etc/MAKEDEV,v 1.331 2002/10/20 08:17:34 scottl Exp $ +# $FreeBSD: src/etc/MAKEDEV,v 1.332 2002/10/24 17:59:58 luigi Exp $ # # Device "make" file. Valid arguments: # all makes all known devices, standard number of units (or close) @@ -916,8 +916,8 @@ ;; usb) - mknod usb$unit c 108 255 root:operator - chmod 0660 usb$unit + mknod usb c 108 255 root:operator + chmod 0660 usb ;; usb*) ==== //depot/projects/trustedbsd/base/etc/defaults/periodic.conf#6 (text+ko) ==== @@ -10,7 +10,7 @@ # 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.21 2002/09/25 03:01:42 brian Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.22 2002/10/25 15:16:54 thomas Exp $ # # What files override these defaults ? @@ -150,6 +150,9 @@ # 500.ipfwdenied daily_status_security_ipfwdenied_enable="YES" +# 510.ipfdenied +daily_status_security_ipfdenied_enable="YES" + # 550.ipfwlimit daily_status_security_ipfwlimit_enable="YES" ==== //depot/projects/trustedbsd/base/etc/inetd.conf#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.58 2002/08/09 17:34:13 gordon Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.59 2002/10/24 15:46:10 rwatson Exp $ # # Internet server configuration database # @@ -6,7 +6,12 @@ # To disable a service, comment it out by prefixing the line with '#'. # To enable a service, remove the '#' at the beginning of the line. # +# WARNING: lukemftpd does not support PAM, MAC, per-class nologin files, +# or any login.conf resource limits or features; use it only if this is +# appropriate for your environment. If you require these features, use +# the regular FreeBSD ftpd below. #ftp stream tcp nowait root /usr/libexec/lukemftpd ftpd -l -r +# #ftp stream tcp nowait root /usr/libexec/ftpd ftpd -l #ftp stream tcp6 nowait root /usr/libexec/ftpd ftpd -l #telnet stream tcp nowait root /usr/libexec/telnetd telnetd ==== //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.60 2002/10/18 15:30:50 tmm Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.61 2002/10/24 15:25:37 rwatson Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -142,6 +142,8 @@ .. mac_mls .. + mac_partition + .. .. sys .. ==== //depot/projects/trustedbsd/base/etc/periodic/security/100.chksetuid#6 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.6 2002/09/24 18:53:46 ache Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.7 2002/10/25 15:14:16 thomas Exp $ # # If there is a global system configuration file, suck it in. @@ -35,12 +35,12 @@ source_periodic_confs fi -LOG="${daily_status_security_logdir}" +. /etc/periodic/security/security.functions + rc=0 case "$daily_status_security_chksetuid_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` echo "" echo 'Checking setuid files and devices:' # XXX Note that there is the possibility of overrunning the args to ls @@ -54,24 +54,10 @@ find $mount -xdev -type f \ \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \ \( -perm -u+s -or -perm -g+s \) -print0 - done | xargs -0 -n 20 ls -liTd | sed 's/^ *//' | sort -k 11 > ${TMP} - fi - - if [ ! -f ${LOG}/setuid.today ]; then - rc=1 - echo "No ${LOG}/setuid.today" - cp ${TMP} ${LOG}/setuid.today || rc=3 - fi - - if ! cmp ${LOG}/setuid.today ${TMP} >/dev/null - then - [ $rc -lt 1 ] && rc=1 - echo "${host} setuid diffs:" - diff -b ${LOG}/setuid.today ${TMP} - mv ${LOG}/setuid.today ${LOG}/setuid.yesterday || rc=3 - mv ${TMP} ${LOG}/setuid.today || rc=3 - fi - rm -f ${TMP};; + done | xargs -0 -n 20 ls -liTd | sed 's/^ *//' | sort -k 11 | + check_diff setuid - "${host} setuid diffs:" + rc=$? + fi;; *) rc=0;; esac ==== //depot/projects/trustedbsd/base/etc/periodic/security/200.chkmounts#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.4 2002/08/25 04:09:17 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.5 2002/10/25 15:14:16 thomas Exp $ # # Show changes in the way filesystems are mounted @@ -38,35 +38,21 @@ source_periodic_confs fi -LOG="${daily_status_security_logdir}" +. /etc/periodic/security/security.functions + ignore="${daily_status_security_chkmounts_ignore}" rc=0 case "$daily_status_security_chkmounts_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` case "$daily_status_security_noamd" in [Yy][Ee][Ss]) ignore="${ignore}|^amd:" esac [ -n "$ignore" ] && cmd="egrep -v ${ignore#|}" || cmd=cat - if mount -p | ${cmd} > ${TMP}; then - if [ ! -f ${LOG}/mount.today ]; then - rc=1 - echo "" - echo "No ${LOG}/mount.today" - cp ${TMP} ${LOG}/mount.today || rc=3 - fi - if ! cmp ${LOG}/mount.today ${TMP} >/dev/null 2>&1; then - [ $rc -lt 1 ] && rc=1 - echo "" - echo "${host} changes in mounted filesystems:" - diff -b ${LOG}/mount.today ${TMP} - mv ${LOG}/mount.today ${LOG}/mount.yesterday || rc=3 - mv ${TMP} ${LOG}/mount.today || rc=3 - fi - fi - rm -f ${TMP};; + mount -p | ${cmd} | + check_diff mount - "${host} changes in mounted filesystems:" + rc=$?;; *) rc=0;; esac ==== //depot/projects/trustedbsd/base/etc/periodic/security/500.ipfwdenied#4 (text+ko) ==== @@ -24,13 +24,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.3 2002/08/25 04:09:17 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.4 2002/10/25 15:14:16 thomas Exp $ # -# Show denied packets -# - - # If there is a global system configuration file, suck it in. # if [ -r /etc/defaults/periodic.conf ] @@ -39,29 +35,17 @@ source_periodic_confs fi -LOG="${daily_status_security_logdir}" +. /etc/periodic/security/security.functions + rc=0 case "$daily_status_security_ipfwdenied_enable" in [Yy][Ee][Ss]) TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` if ipfw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then - if [ ! -f ${LOG}/ipfw.today ]; then - rc=1 - echo "" - echo "No ${LOG}/ipfw.today" - cp ${TMP} ${LOG}/ipfw.today || rc=3 - fi - - if ! cmp ${LOG}/ipfw.today ${TMP} >/dev/null; then - [ $rc -lt 1 ] && rc=1 - echo "" - echo "${host} denied packets:" - diff -b ${LOG}/ipfw.today ${TMP} | egrep "^>" - mv ${LOG}/ipfw.today ${LOG}/ipfw.yesterday || rc=3 - mv ${TMP} ${LOG}/ipfw.today || rc=3 - fi + check_diff new_only ipfw ${TMP} "${host} ipfw denied packets:" fi + rc=$? rm -f ${TMP};; *) rc=0;; esac ==== //depot/projects/trustedbsd/base/etc/periodic/security/600.ip6fwdenied#4 (text+ko) ==== @@ -24,12 +24,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.3 2002/08/25 04:09:17 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.4 2002/10/25 15:14:16 thomas Exp $ # -# Show IPv6 denied packets -# - # If there is a global system configuration file, suck it in. # if [ -r /etc/defaults/periodic.conf ] @@ -38,30 +35,17 @@ source_periodic_confs fi -LOG="${daily_status_security_logdir}" +. /etc/periodic/security/security.functions + rc=0 case "$daily_status_security_ip6fwdenied_enable" in [Yy][Ee][Ss]) TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` if ip6fw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then - if [ ! -f ${LOG}/ip6fw.today ]; then - rc=1 - echo "" - echo "No ${LOG}/ip6fw.today" - cp ${TMP} ${LOG}/ip6fw.today || rc=3 - fi - - if ! cmp ${LOG}/ip6fw.today ${TMP} >/dev/null; then - [ $rc -lt 1 ] && rc=1 - echo "" - echo "${host} IPv6 denied packets:" - diff -b ${LOG}/ip6fw.today ${TMP} | - egrep "^>" - mv ${LOG}/ip6fw.today ${LOG}/ip6fw.yesterday || rc=3 - mv ${TMP} ${LOG}/ip6fw.today || rc=3 - fi + check_diff new_only ip6fw ${TMP} "${host} ip6fw denied packets:" fi + rc=$? rm -f ${TMP};; *) rc=0;; esac ==== //depot/projects/trustedbsd/base/etc/periodic/security/700.kernelmsg#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.5 2002/08/25 04:09:17 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.6 2002/10/25 15:14:16 thomas Exp $ # # Show kernel log messages @@ -38,30 +38,15 @@ source_periodic_confs fi -LOG="${daily_status_security_logdir}" +. /etc/periodic/security/security.functions + rc=0 case "$daily_status_security_kernelmsg_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` - if dmesg 2>/dev/null > ${TMP}; then - if [ ! -f ${LOG}/dmesg.today ]; then - rc=1 - echo "" - echo "No ${LOG}/dmesg.today" - cp ${TMP} ${LOG}/dmesg.today || rc=3 - fi - - echo "" - echo "${host} kernel log messages:" - if ! cmp ${LOG}/dmesg.today ${TMP} >/dev/null 2>&1; then - [ $rc -lt 1 ] && rc=1 - diff -b ${LOG}/dmesg.today ${TMP} | egrep "^>" - mv ${LOG}/dmesg.today ${LOG}/dmesg.yesterday || rc=3 - mv ${TMP} ${LOG}/dmesg.today || rc=3 - fi - fi - rm -f ${TMP};; + dmesg 2>/dev/null > ${TMP} | + check_diff new_only dmesg - "${host} kernel log messages:" + rc=$?;; *) rc=0;; esac ==== //depot/projects/trustedbsd/base/etc/periodic/security/Makefile#3 (text+ko) ==== @@ -1,15 +1,17 @@ -# $FreeBSD: src/etc/periodic/security/Makefile,v 1.2 2002/07/18 12:32:57 ru Exp $ +# $FreeBSD: src/etc/periodic/security/Makefile,v 1.3 2002/10/25 15:23:26 thomas Exp $ FILES= 100.chksetuid \ 200.chkmounts \ 300.chkuid0 \ 400.passwdless \ 500.ipfwdenied \ + 510.ipfdenied \ 550.ipfwlimit \ 600.ip6fwdenied \ 650.ip6fwlimit \ 700.kernelmsg \ 800.loginfail \ - 900.tcpwrap + 900.tcpwrap \ + security.functions .include ==== //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.39 2002/10/23 19:04:00 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.40 2002/10/24 11:05:58 ru Exp $ TMACOWN?= ${BINOWN} TMACGRP?= ${BINGRP} @@ -14,7 +14,6 @@ MLINKS+= groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7 CLEANFILES= ${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} -CLEANFILES+= troffrc-end.patched NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \ me.tmac \ @@ -33,7 +32,7 @@ lbp.tmac \ html.tmac www.tmac \ eqnrc \ - troffrc \ + troffrc troffrc-end \ hyphen.us SPECIALFILES= an.tmac man.tmac s.tmac ms.tmac STRIPFILES= e.tmac doc.tmac mdoc.local @@ -41,7 +40,6 @@ fr.ISO8859-1 ru.KOI8-R all: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} -all: troffrc-end.patched .for f in ${MDOCFILES} ${STRIPFILES} $f-s: $f @@ -55,9 +53,6 @@ ${.ALLSRC} > ${.TARGET} .endfor -troffrc-end.patched: troffrc-end - (cat ${.ALLSRC}; echo ".if n .do nop \X'tty: sgr 0'\c") > ${.TARGET} - beforeinstall: cd ${DIST_DIR}; \ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ @@ -66,8 +61,6 @@ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ hyphen.ru ${DESTDIR}${TMACDIR} cd ${.OBJDIR} - ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ - troffrc-end.patched ${DESTDIR}${TMACDIR}/troffrc-end .for f in ${STRIPFILES} ${SPECIALFILES} ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ $f-s ${DESTDIR}${TMACDIR}/$f ==== //depot/projects/trustedbsd/base/include/Makefile#20 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.184 2002/10/18 15:30:45 tmm Exp $ +# $FreeBSD: src/include/Makefile,v 1.185 2002/10/24 15:25:37 rwatson Exp $ # # Doing a make install builds /usr/include # @@ -42,7 +42,7 @@ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ security/lomac security/mac_biba security/mac_bsdextended \ - security/mac_mls ufs/ffs ufs/ufs + security/mac_mls security/mac_partition ufs/ffs ufs/ufs # For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/* # are taken care of ==== //depot/projects/trustedbsd/base/lib/libc/locale/wcrtomb.c#3 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.2 2002/09/06 11:23:45 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.3 2002/10/25 13:24:45 tjr Exp $"); #include +#include #include #include #include @@ -36,7 +37,10 @@ wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps __unused) { char *e; + char buf[MB_LEN_MAX]; + if (s == NULL) + s = buf; sputrune(wc, s, MB_CUR_MAX, &e); if (e == NULL) { errno = EILSEQ; ==== //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#8 (text+ko) ==== @@ -38,12 +38,9 @@ * in the source code. This is because RFC2553 is silent about which error * code must be returned for which situation. * - freeaddrinfo(NULL). RFC2553 is silent about it. XNET 5.2 says it is - * invalid. - * current code - SEGV on freeaddrinfo(NULL) + * invalid. current code - SEGV on freeaddrinfo(NULL) + * * Note: - * - We use getipnodebyname() just for thread-safeness. There's no intent - * to let it do PF_UNSPEC (actually we never pass PF_UNSPEC to - * getipnodebyname(). * - The code filters out AFs that are not supported by the kernel, * when globbing NULL hostname (to loopback, or wildcard). Is it the right * thing to do? What is the relationship with post-RFC2553 AI_ADDRCONFIG @@ -52,38 +49,21 @@ * (1) what should we do against numeric hostname (2) what should we do * against NULL hostname (3) what is AI_ADDRCONFIG itself. AF not ready? * non-loopback address configured? global address configured? + * + * OS specific notes for netbsd/openbsd/freebsd4/bsdi4: * - To avoid search order issue, we have a big amount of code duplicate * from gethnamaddr.c and some other places. The issues that there's no * lower layer function to lookup "IPv4 or IPv6" record. Calling * gethostbyname2 from getaddrinfo will end up in wrong search order, as - * follows: - * - The code makes use of following calls when asked to resolver with - * ai_family = PF_UNSPEC: - * getipnodebyname(host, AF_INET6); - * getipnodebyname(host, AF_INET); - * This will result in the following queries if the node is configure to - * prefer /etc/hosts than DNS: - * lookup /etc/hosts for IPv6 address - * lookup DNS for IPv6 address - * lookup /etc/hosts for IPv4 address - * lookup DNS for IPv4 address - * which may not meet people's requirement. - * The right thing to happen is to have underlying layer which does - * PF_UNSPEC lookup (lookup both) and return chain of addrinfos. - * This would result in a bit of code duplicate with _dns_ghbyname() and - * friends. + * presented above. + * + * OS specific notes for freebsd4: + * - FreeBSD supported $GAI. The code does not. + * - FreeBSD allowed classful IPv4 numeric (127.1), the code does not. */ -/* - * diffs with other KAME platforms: - * - other KAME platforms already nuked FAITH ($GAI), but as FreeBSD - * 4.0-RELEASE supplies it, we still have the code here. - * - AI_ADDRCONFIG support is supplied - * - some of FreeBSD style (#define tabify and others) - * - classful IPv4 numeric (127.1) is allowed. - */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.34 2002/10/06 08:43:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.35 2002/10/25 16:24:28 ume Exp $"); #include "namespace.h" #include @@ -120,19 +100,21 @@ # define FAITH #endif -#define SUCCESS 0 -#define ANY 0 -#define YES 1 -#define NO 0 +#define SUCCESS 0 +#define ANY 0 +#define YES 1 +#define NO 0 static const char in_addrany[] = { 0, 0, 0, 0 }; +static const char in_loopback[] = { 127, 0, 0, 1 }; +#ifdef INET6 static const char in6_addrany[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -static const char in_loopback[] = { 127, 0, 0, 1 }; static const char in6_loopback[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }; +#endif static const struct afd { int a_af; @@ -166,9 +148,9 @@ int e_protocol; const char *e_protostr; int e_wild; -#define WILD_AF(ex) ((ex)->e_wild & 0x01) -#define WILD_SOCKTYPE(ex) ((ex)->e_wild & 0x02) -#define WILD_PROTOCOL(ex) ((ex)->e_wild & 0x04) +#define WILD_AF(ex) ((ex)->e_wild & 0x01) +#define WILD_SOCKTYPE(ex) ((ex)->e_wild & 0x02) +#define WILD_PROTOCOL(ex) ((ex)->e_wild & 0x04) }; static const struct explore explore[] = { @@ -190,9 +172,9 @@ }; #ifdef INET6 -#define PTON_MAX 16 +#define PTON_MAX 16 #else -#define PTON_MAX 4 +#define PTON_MAX 4 #endif static const ns_src default_dns_files[] = { @@ -240,9 +222,9 @@ static struct addrinfo *getanswer(const querybuf *, int, const char *, int, const struct addrinfo *); -static int _dns_getaddrinfo(void *, void *, va_list); static void _sethtent(void); static void _endhtent(void); +static int _dns_getaddrinfo(void *, void *, va_list); static struct addrinfo *_gethtent(const char *, const struct addrinfo *); static int _files_getaddrinfo(void *, void *, va_list); #ifdef YP @@ -291,7 +273,7 @@ /* XXX macros that make external reference is BAD. */ -#define GET_AI(ai, afd, addr) \ +#define GET_AI(ai, afd, addr) \ do { \ /* external reference: pai, error, and label free */ \ (ai) = get_ai(pai, (afd), (addr)); \ @@ -301,7 +283,7 @@ } \ } while (/*CONSTCOND*/0) -#define GET_PORT(ai, serv) \ +#define GET_PORT(ai, serv) \ do { \ /* external reference: error and label free */ \ error = get_port((ai), (serv), 0); \ @@ -309,7 +291,7 @@ goto free; \ } while (/*CONSTCOND*/0) -#define GET_CANONNAME(ai, str) \ +#define GET_CANONNAME(ai, str) \ do { \ /* external reference: pai, error and label free */ \ error = get_canonname(pai, (ai), (str)); \ @@ -317,7 +299,7 @@ goto free; \ } while (/*CONSTCOND*/0) -#define ERR(err) \ +#define ERR(err) \ do { \ /* external reference: error, and label bad */ \ error = (err); \ @@ -325,9 +307,9 @@ /*NOTREACHED*/ \ } while (/*CONSTCOND*/0) -#define MATCH_FAMILY(x, y, w) \ +#define MATCH_FAMILY(x, y, w) \ ((x) == (y) || (/*CONSTCOND*/(w) && ((x) == PF_UNSPEC || (y) == PF_UNSPEC))) -#define MATCH(x, y, w) \ +#define MATCH(x, y, w) \ ((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY))) char * @@ -430,8 +412,8 @@ continue; if (ex->e_protocol == ANY) continue; - if (pai->ai_socktype == ex->e_socktype - && pai->ai_protocol != ex->e_protocol) { + if (pai->ai_socktype == ex->e_socktype && + pai->ai_protocol != ex->e_protocol) { ERR(EAI_BADHINTS); } } @@ -440,7 +422,7 @@ /* * post-2553: AI_ALL and AI_V4MAPPED are effective only against - * AF_INET6 query. They needs to be ignored if specified in other + * AF_INET6 query. They need to be ignored if specified in other * occassions. */ switch (pai->ai_flags & (AI_ALL | AI_V4MAPPED)) { @@ -776,7 +758,7 @@ while (cur && cur->ai_next) cur = cur->ai_next; } else - ERR(EAI_FAMILY); /*xxx*/ + ERR(EAI_FAMILY); /* XXX */ } break; } @@ -870,7 +852,7 @@ ai->ai_canonname = (char *)malloc(strlen(str) + 1); if (ai->ai_canonname == NULL) return EAI_MEMORY; - strcpy(ai->ai_canonname, str); + strlcpy(ai->ai_canonname, str, strlen(str) + 1); } return 0; } @@ -997,9 +979,10 @@ if (str_isnumber(servname)) { if (!allownumeric) return EAI_SERVICE; - port = htons(atoi(servname)); + port = atoi(servname); if (port < 0 || port > 65535) return EAI_SERVICE; + port = htons(port); } else { switch (ai->ai_socktype) { case SOCK_DGRAM: @@ -1227,8 +1210,8 @@ const u_char *cp; int n; const u_char *eom; - char *bp; - int type, class, buflen, ancount, qdcount; + char *bp, *ep; + int type, class, ancount, qdcount; int haveanswer, had_error; char tbuf[MAXDNAME]; int (*name_ok)(const char *); @@ -1255,13 +1238,13 @@ ancount = ntohs(hp->ancount); qdcount = ntohs(hp->qdcount); bp = hostbuf; - buflen = sizeof hostbuf; + ep = hostbuf + sizeof hostbuf; cp = answer->buf + HFIXEDSZ; if (qdcount != 1) { h_errno = NO_RECOVERY; return (NULL); } - n = dn_expand(answer->buf, eom, cp, bp, buflen); + n = dn_expand(answer->buf, eom, cp, bp, ep - bp); if ((n < 0) || !(*name_ok)(bp)) { h_errno = NO_RECOVERY; return (NULL); @@ -1279,14 +1262,13 @@ } canonname = bp; bp += n; - buflen -= n; /* The qname can be abbreviated, but h_name is now absolute. */ qname = canonname; } haveanswer = 0; had_error = 0; while (ancount-- > 0 && cp < eom && !had_error) { - n = dn_expand(answer->buf, eom, cp, bp, buflen); + n = dn_expand(answer->buf, eom, cp, bp, ep - bp); if ((n < 0) || !(*name_ok)(bp)) { had_error++; continue; @@ -1313,14 +1295,13 @@ cp += n; /* Get canonical name. */ n = strlen(tbuf) + 1; /* for the \0 */ - if (n > buflen || n >= MAXHOSTNAMELEN) { + if (n > ep - bp || n >= MAXHOSTNAMELEN) { >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 10:30:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66E5537B404; Fri, 25 Oct 2002 10:30:01 -0700 (PDT) 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 EB1AF37B401 for ; Fri, 25 Oct 2002 10:30:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7F2343E4A for ; Fri, 25 Oct 2002 10:29:59 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PHTAmV010997 for ; Fri, 25 Oct 2002 10:29:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PHT8sa010994 for perforce@freebsd.org; Fri, 25 Oct 2002 10:29:08 -0700 (PDT) Date: Fri, 25 Oct 2002 10:29:08 -0700 (PDT) Message-Id: <200210251729.g9PHT8sa010994@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 Subject: PERFORCE change 20134 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20134 Change 20134 by rwatson@rwatson_tislabs on 2002/10/25 10:28:12 Integ the MAC tree: loop back man page stuff from libc; pick up many sysinstall fixes, vfs fixes, etc. Affected files ... .. //depot/projects/trustedbsd/mac/UPDATING#16 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#17 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/troffrc#6 integrate .. //depot/projects/trustedbsd/mac/etc/MAKEDEV#17 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/periodic.conf#6 integrate .. //depot/projects/trustedbsd/mac/etc/inetd.conf#7 integrate .. //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#18 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/100.chksetuid#6 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/200.chkmounts#5 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/500.ipfwdenied#4 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/510.ipfdenied#1 branch .. //depot/projects/trustedbsd/mac/etc/periodic/security/600.ip6fwdenied#4 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/700.kernelmsg#5 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/etc/periodic/security/security.functions#1 branch .. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/include/Makefile#25 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/wcrtomb.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_free.3#9 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/local.h#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/strerror.3#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/wcsncpy.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc/string/wcsstr.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_cancel.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_error.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_read.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_return.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_suspend.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_waitcomplete.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/aio_write.2#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/sigaction.2#7 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#12 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/ftp.c#11 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#15 integrate .. //depot/projects/trustedbsd/mac/libexec/lukemftpd/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#30 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#40 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/create.c#1 branch .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.h#2 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#13 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#9 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/fsinterface/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/newvm/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/papers/sysperf/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/01.cacm/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/01.cacm/p1#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/01.cacm/ref.bib#1 branch .. //depot/projects/trustedbsd/mac/share/doc/psd/02.implement/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/02.implement/implement#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/02.implement/ref.bib#1 branch .. //depot/projects/trustedbsd/mac/share/doc/psd/06.Clang/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/13.rcs/rcs/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/15.yacc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/15.yacc/ref.bib#1 branch .. //depot/projects/trustedbsd/mac/share/doc/psd/15.yacc/ss..#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/16.lex/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/16.lex/lex.ms#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/psd/17.m4/m4.ms#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/smm/10.named/Makefile#2 delete .. //depot/projects/trustedbsd/mac/share/doc/smm/18.net/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/smm/contents/contents.ms#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/10.exref/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/10.exref/summary/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/12.vi/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/12.vi/summary/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/12.vi/vi/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/share/doc/usd/22.trofftut/tt.mac#2 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/assert.3#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man3/stdarg.3#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#19 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/acpi.4#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/aio.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man5/periodic.conf.5#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/trap.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/bootinfo.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/efiboot.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/efi/libefi/elf_freebsd.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#28 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#66 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#19 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.ia64#13 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#15 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#38 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options.ia64#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/acpica/acpi_ec.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/fs/specfs/spec_vnops.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#27 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/float.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/conf/GENERIC#16 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/trap.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_condvar.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mutex.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_proc.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_subr.c#46 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_vnops.c#57 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#49 integrate .. //depot/projects/trustedbsd/mac/sys/modules/mac_partition/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/vinum/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_usrreq.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/trap.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/machdep.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/rwindow.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/trap.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/sys/conf.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#28 integrate .. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#49 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_snapshot.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#11 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T000/ref.conf#5 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T001/ref.conf#6 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T002/ref.conf#6 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T003/ref.conf#6 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T004/ref.conf#6 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T005/ref.conf#6 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T006/ref.conf#5 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T007/ref.conf#5 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T008/ref.conf#5 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T009/ref.conf#5 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T011/ref.conf#5 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T012/ref.conf#6 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T013/ref.conf#6 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/Test/T014/ref.conf#7 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/geom_sim.h#4 integrate .. //depot/projects/trustedbsd/mac/tools/regression/geom/geom_simdisk.c#6 integrate .. //depot/projects/trustedbsd/mac/tools/regression/usr.bin/make/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/var.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/stat/stat.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/info/show.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/quot/quot.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dev2c.sh#3 delete .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dist.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/install.c#12 integrate Differences ... ==== //depot/projects/trustedbsd/mac/UPDATING#16 (text+ko) ==== @@ -22,6 +22,20 @@ integrity. Re-enabling write caching can substantially improve performance. +20021023: + Alphas with kernels from between 20020830 and 20021023 and/or + rtld (ld-elf.so.1) older than 20021023 may experience problems + with groff while doing a buildworld (kernel: "out of memory", + fixed in rev 1.129 of kern/imgact_elf.c; rtld: "too few PT_LOAD + segments", fixed in rev 1.8 of libexec/rtld-elf/map_object.c). + + So, to successfully upgrade your Alpha, you must either + upgrade your kernel and rtld first (which might be a bit + tricky), or avoid running the bootstrapped groff during the + "transitional" buildworld. To avoid running groff during the + transitional upgrade run make buildworld with -DNOMAN, + -DNO_SHAREDOCS, and -DNO_LPR. + 20020831: gcc has been upgraded to 3.2. It is not all binary compatible with earlier versions of gcc for c++ programs. All c++ @@ -1077,4 +1091,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.217 2002/09/03 06:13:43 imp Exp $ +$FreeBSD: src/UPDATING,v 1.218 2002/10/24 18:41:02 gallatin Exp $ ==== //depot/projects/trustedbsd/mac/bin/ls/ls.c#17 (text+ko) ==== @@ -46,10 +46,11 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.68 2002/10/24 00:07:30 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.69 2002/10/24 01:01:53 rwatson Exp $"); #include #include +#include #include #include @@ -685,6 +686,7 @@ flen = 0; labelstr = NULL; if (f_label) { + char name[PATH_MAX + 1]; mac_t label; int error; @@ -696,12 +698,20 @@ goto label_out; } + if (cur->fts_level == FTS_ROOTLEVEL) + snprintf(name, sizeof(name), + "%s", cur->fts_name); + else + snprintf(name, sizeof(name), + "%s/%s", cur->fts_parent->fts_accpath, + cur->fts_name); + if (options & FTS_LOGICAL) - error = mac_get_file( - cur->fts_path, label); + error = mac_get_file(name, + label); else - error = mac_get_link( - cur->fts_name, label); + error = mac_get_link(name, + label); if (error == -1) { perror(cur->fts_name); mac_free(label); ==== //depot/projects/trustedbsd/mac/contrib/groff/tmac/troffrc#6 (text+ko) ==== @@ -1,5 +1,5 @@ .\" Startup file for troff. -.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.13 2002/10/23 19:04:00 ru Exp $ +.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.14 2002/10/24 11:05:58 ru Exp $ . .\" This is tested by pic. .nr 0p 0 @@ -45,4 +45,12 @@ . .\} . +.\" Disable SGR support in grotty(1). +.if n \{\ +. do nop \X'tty: sgr 0' +. sp -1 +. nr nl 0-1 +. nr % -1 +.\} +. .\" Don't let blank lines creep in here. ==== //depot/projects/trustedbsd/mac/etc/MAKEDEV#17 (text+ko) ==== @@ -20,7 +20,7 @@ # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # # @(#)MAKEDEV 5.2 (Berkeley) 6/22/90 -# $FreeBSD: src/etc/MAKEDEV,v 1.331 2002/10/20 08:17:34 scottl Exp $ +# $FreeBSD: src/etc/MAKEDEV,v 1.332 2002/10/24 17:59:58 luigi Exp $ # # Device "make" file. Valid arguments: # all makes all known devices, standard number of units (or close) @@ -916,8 +916,8 @@ ;; usb) - mknod usb$unit c 108 255 root:operator - chmod 0660 usb$unit + mknod usb c 108 255 root:operator + chmod 0660 usb ;; usb*) ==== //depot/projects/trustedbsd/mac/etc/defaults/periodic.conf#6 (text+ko) ==== @@ -10,7 +10,7 @@ # 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.21 2002/09/25 03:01:42 brian Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.22 2002/10/25 15:16:54 thomas Exp $ # # What files override these defaults ? @@ -150,6 +150,9 @@ # 500.ipfwdenied daily_status_security_ipfwdenied_enable="YES" +# 510.ipfdenied +daily_status_security_ipfdenied_enable="YES" + # 550.ipfwlimit daily_status_security_ipfwlimit_enable="YES" ==== //depot/projects/trustedbsd/mac/etc/inetd.conf#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.58 2002/08/09 17:34:13 gordon Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.59 2002/10/24 15:46:10 rwatson Exp $ # # Internet server configuration database # @@ -6,7 +6,12 @@ # To disable a service, comment it out by prefixing the line with '#'. # To enable a service, remove the '#' at the beginning of the line. # +# WARNING: lukemftpd does not support PAM, MAC, per-class nologin files, +# or any login.conf resource limits or features; use it only if this is +# appropriate for your environment. If you require these features, use +# the regular FreeBSD ftpd below. #ftp stream tcp nowait root /usr/libexec/lukemftpd ftpd -l -r +# #ftp stream tcp nowait root /usr/libexec/ftpd ftpd -l #ftp stream tcp6 nowait root /usr/libexec/ftpd ftpd -l #telnet stream tcp nowait root /usr/libexec/telnetd telnetd ==== //depot/projects/trustedbsd/mac/etc/mtree/BSD.include.dist#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.60 2002/10/18 15:30:50 tmm Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.61 2002/10/24 15:25:37 rwatson Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # ==== //depot/projects/trustedbsd/mac/etc/periodic/security/100.chksetuid#6 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.6 2002/09/24 18:53:46 ache Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.7 2002/10/25 15:14:16 thomas Exp $ # # If there is a global system configuration file, suck it in. @@ -35,12 +35,12 @@ source_periodic_confs fi -LOG="${daily_status_security_logdir}" +. /etc/periodic/security/security.functions + rc=0 case "$daily_status_security_chksetuid_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` echo "" echo 'Checking setuid files and devices:' # XXX Note that there is the possibility of overrunning the args to ls @@ -54,24 +54,10 @@ find $mount -xdev -type f \ \( -perm -u+x -or -perm -g+x -or -perm -o+x \) \ \( -perm -u+s -or -perm -g+s \) -print0 - done | xargs -0 -n 20 ls -liTd | sed 's/^ *//' | sort -k 11 > ${TMP} - fi - - if [ ! -f ${LOG}/setuid.today ]; then - rc=1 - echo "No ${LOG}/setuid.today" - cp ${TMP} ${LOG}/setuid.today || rc=3 - fi - - if ! cmp ${LOG}/setuid.today ${TMP} >/dev/null - then - [ $rc -lt 1 ] && rc=1 - echo "${host} setuid diffs:" - diff -b ${LOG}/setuid.today ${TMP} - mv ${LOG}/setuid.today ${LOG}/setuid.yesterday || rc=3 - mv ${TMP} ${LOG}/setuid.today || rc=3 - fi - rm -f ${TMP};; + done | xargs -0 -n 20 ls -liTd | sed 's/^ *//' | sort -k 11 | + check_diff setuid - "${host} setuid diffs:" + rc=$? + fi;; *) rc=0;; esac ==== //depot/projects/trustedbsd/mac/etc/periodic/security/200.chkmounts#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.4 2002/08/25 04:09:17 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/200.chkmounts,v 1.5 2002/10/25 15:14:16 thomas Exp $ # # Show changes in the way filesystems are mounted @@ -38,35 +38,21 @@ source_periodic_confs fi -LOG="${daily_status_security_logdir}" +. /etc/periodic/security/security.functions + ignore="${daily_status_security_chkmounts_ignore}" rc=0 case "$daily_status_security_chkmounts_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` case "$daily_status_security_noamd" in [Yy][Ee][Ss]) ignore="${ignore}|^amd:" esac [ -n "$ignore" ] && cmd="egrep -v ${ignore#|}" || cmd=cat - if mount -p | ${cmd} > ${TMP}; then - if [ ! -f ${LOG}/mount.today ]; then - rc=1 - echo "" - echo "No ${LOG}/mount.today" - cp ${TMP} ${LOG}/mount.today || rc=3 - fi - if ! cmp ${LOG}/mount.today ${TMP} >/dev/null 2>&1; then - [ $rc -lt 1 ] && rc=1 - echo "" - echo "${host} changes in mounted filesystems:" - diff -b ${LOG}/mount.today ${TMP} - mv ${LOG}/mount.today ${LOG}/mount.yesterday || rc=3 - mv ${TMP} ${LOG}/mount.today || rc=3 - fi - fi - rm -f ${TMP};; + mount -p | ${cmd} | + check_diff mount - "${host} changes in mounted filesystems:" + rc=$?;; *) rc=0;; esac ==== //depot/projects/trustedbsd/mac/etc/periodic/security/500.ipfwdenied#4 (text+ko) ==== @@ -24,13 +24,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.3 2002/08/25 04:09:17 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/500.ipfwdenied,v 1.4 2002/10/25 15:14:16 thomas Exp $ # -# Show denied packets -# - - # If there is a global system configuration file, suck it in. # if [ -r /etc/defaults/periodic.conf ] @@ -39,29 +35,17 @@ source_periodic_confs fi -LOG="${daily_status_security_logdir}" +. /etc/periodic/security/security.functions + rc=0 case "$daily_status_security_ipfwdenied_enable" in [Yy][Ee][Ss]) TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` if ipfw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then - if [ ! -f ${LOG}/ipfw.today ]; then - rc=1 - echo "" - echo "No ${LOG}/ipfw.today" - cp ${TMP} ${LOG}/ipfw.today || rc=3 - fi - - if ! cmp ${LOG}/ipfw.today ${TMP} >/dev/null; then - [ $rc -lt 1 ] && rc=1 - echo "" - echo "${host} denied packets:" - diff -b ${LOG}/ipfw.today ${TMP} | egrep "^>" - mv ${LOG}/ipfw.today ${LOG}/ipfw.yesterday || rc=3 - mv ${TMP} ${LOG}/ipfw.today || rc=3 - fi + check_diff new_only ipfw ${TMP} "${host} ipfw denied packets:" fi + rc=$? rm -f ${TMP};; *) rc=0;; esac ==== //depot/projects/trustedbsd/mac/etc/periodic/security/600.ip6fwdenied#4 (text+ko) ==== @@ -24,12 +24,9 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.3 2002/08/25 04:09:17 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/600.ip6fwdenied,v 1.4 2002/10/25 15:14:16 thomas Exp $ # -# Show IPv6 denied packets -# - # If there is a global system configuration file, suck it in. # if [ -r /etc/defaults/periodic.conf ] @@ -38,30 +35,17 @@ source_periodic_confs fi -LOG="${daily_status_security_logdir}" +. /etc/periodic/security/security.functions + rc=0 case "$daily_status_security_ip6fwdenied_enable" in [Yy][Ee][Ss]) TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` if ip6fw -a l 2>/dev/null | egrep "deny|reset|unreach" > ${TMP}; then - if [ ! -f ${LOG}/ip6fw.today ]; then - rc=1 - echo "" - echo "No ${LOG}/ip6fw.today" - cp ${TMP} ${LOG}/ip6fw.today || rc=3 - fi - - if ! cmp ${LOG}/ip6fw.today ${TMP} >/dev/null; then - [ $rc -lt 1 ] && rc=1 - echo "" - echo "${host} IPv6 denied packets:" - diff -b ${LOG}/ip6fw.today ${TMP} | - egrep "^>" - mv ${LOG}/ip6fw.today ${LOG}/ip6fw.yesterday || rc=3 - mv ${TMP} ${LOG}/ip6fw.today || rc=3 - fi + check_diff new_only ip6fw ${TMP} "${host} ip6fw denied packets:" fi + rc=$? rm -f ${TMP};; *) rc=0;; esac ==== //depot/projects/trustedbsd/mac/etc/periodic/security/700.kernelmsg#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.5 2002/08/25 04:09:17 cjc Exp $ +# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.6 2002/10/25 15:14:16 thomas Exp $ # # Show kernel log messages @@ -38,30 +38,15 @@ source_periodic_confs fi -LOG="${daily_status_security_logdir}" +. /etc/periodic/security/security.functions + rc=0 case "$daily_status_security_kernelmsg_enable" in [Yy][Ee][Ss]) - TMP=`mktemp ${TMPDIR:-/tmp}/security.XXXXXXXXXX` - if dmesg 2>/dev/null > ${TMP}; then - if [ ! -f ${LOG}/dmesg.today ]; then - rc=1 - echo "" - echo "No ${LOG}/dmesg.today" - cp ${TMP} ${LOG}/dmesg.today || rc=3 - fi - - echo "" - echo "${host} kernel log messages:" - if ! cmp ${LOG}/dmesg.today ${TMP} >/dev/null 2>&1; then - [ $rc -lt 1 ] && rc=1 - diff -b ${LOG}/dmesg.today ${TMP} | egrep "^>" - mv ${LOG}/dmesg.today ${LOG}/dmesg.yesterday || rc=3 - mv ${TMP} ${LOG}/dmesg.today || rc=3 - fi - fi - rm -f ${TMP};; + dmesg 2>/dev/null > ${TMP} | + check_diff new_only dmesg - "${host} kernel log messages:" + rc=$?;; *) rc=0;; esac ==== //depot/projects/trustedbsd/mac/etc/periodic/security/Makefile#3 (text+ko) ==== @@ -1,15 +1,17 @@ -# $FreeBSD: src/etc/periodic/security/Makefile,v 1.2 2002/07/18 12:32:57 ru Exp $ +# $FreeBSD: src/etc/periodic/security/Makefile,v 1.3 2002/10/25 15:23:26 thomas Exp $ FILES= 100.chksetuid \ 200.chkmounts \ 300.chkuid0 \ 400.passwdless \ 500.ipfwdenied \ + 510.ipfdenied \ 550.ipfwlimit \ 600.ip6fwdenied \ 650.ip6fwlimit \ 700.kernelmsg \ 800.loginfail \ - 900.tcpwrap + 900.tcpwrap \ + security.functions .include ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/tmac/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.39 2002/10/23 19:04:00 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.40 2002/10/24 11:05:58 ru Exp $ TMACOWN?= ${BINOWN} TMACGRP?= ${BINGRP} @@ -14,7 +14,6 @@ MLINKS+= groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7 CLEANFILES= ${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} -CLEANFILES+= troffrc-end.patched NORMALFILES= mandoc.tmac andoc.tmac an-old.tmac \ me.tmac \ @@ -33,7 +32,7 @@ lbp.tmac \ html.tmac www.tmac \ eqnrc \ - troffrc \ + troffrc troffrc-end \ hyphen.us SPECIALFILES= an.tmac man.tmac s.tmac ms.tmac STRIPFILES= e.tmac doc.tmac mdoc.local @@ -41,7 +40,6 @@ fr.ISO8859-1 ru.KOI8-R all: ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} -all: troffrc-end.patched .for f in ${MDOCFILES} ${STRIPFILES} $f-s: $f @@ -55,9 +53,6 @@ ${.ALLSRC} > ${.TARGET} .endfor -troffrc-end.patched: troffrc-end - (cat ${.ALLSRC}; echo ".if n .do nop \X'tty: sgr 0'\c") > ${.TARGET} - beforeinstall: cd ${DIST_DIR}; \ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ @@ -66,8 +61,6 @@ ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ hyphen.ru ${DESTDIR}${TMACDIR} cd ${.OBJDIR} - ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ - troffrc-end.patched ${DESTDIR}${TMACDIR}/troffrc-end .for f in ${STRIPFILES} ${SPECIALFILES} ${INSTALL} -o ${TMACOWN} -g ${TMACGRP} -m ${TMACMODE} \ $f-s ${DESTDIR}${TMACDIR}/$f ==== //depot/projects/trustedbsd/mac/include/Makefile#25 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.184 2002/10/18 15:30:45 tmm Exp $ +# $FreeBSD: src/include/Makefile,v 1.185 2002/10/24 15:25:37 rwatson Exp $ # # Doing a make install builds /usr/include # ==== //depot/projects/trustedbsd/mac/lib/libc/locale/wcrtomb.c#3 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.2 2002/09/06 11:23:45 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.3 2002/10/25 13:24:45 tjr Exp $"); #include +#include #include #include #include @@ -36,7 +37,10 @@ wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps __unused) { char *e; + char buf[MB_LEN_MAX]; + if (s == NULL) + s = buf; sputrune(wc, s, MB_CUR_MAX, &e); if (e == NULL) { errno = EILSEQ; ==== //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#8 (text+ko) ==== @@ -38,12 +38,9 @@ * in the source code. This is because RFC2553 is silent about which error * code must be returned for which situation. * - freeaddrinfo(NULL). RFC2553 is silent about it. XNET 5.2 says it is - * invalid. - * current code - SEGV on freeaddrinfo(NULL) + * invalid. current code - SEGV on freeaddrinfo(NULL) + * * Note: - * - We use getipnodebyname() just for thread-safeness. There's no intent - * to let it do PF_UNSPEC (actually we never pass PF_UNSPEC to - * getipnodebyname(). * - The code filters out AFs that are not supported by the kernel, * when globbing NULL hostname (to loopback, or wildcard). Is it the right * thing to do? What is the relationship with post-RFC2553 AI_ADDRCONFIG @@ -52,38 +49,21 @@ * (1) what should we do against numeric hostname (2) what should we do * against NULL hostname (3) what is AI_ADDRCONFIG itself. AF not ready? * non-loopback address configured? global address configured? + * + * OS specific notes for netbsd/openbsd/freebsd4/bsdi4: * - To avoid search order issue, we have a big amount of code duplicate * from gethnamaddr.c and some other places. The issues that there's no * lower layer function to lookup "IPv4 or IPv6" record. Calling * gethostbyname2 from getaddrinfo will end up in wrong search order, as - * follows: - * - The code makes use of following calls when asked to resolver with - * ai_family = PF_UNSPEC: - * getipnodebyname(host, AF_INET6); - * getipnodebyname(host, AF_INET); - * This will result in the following queries if the node is configure to - * prefer /etc/hosts than DNS: - * lookup /etc/hosts for IPv6 address - * lookup DNS for IPv6 address - * lookup /etc/hosts for IPv4 address - * lookup DNS for IPv4 address - * which may not meet people's requirement. - * The right thing to happen is to have underlying layer which does - * PF_UNSPEC lookup (lookup both) and return chain of addrinfos. - * This would result in a bit of code duplicate with _dns_ghbyname() and - * friends. + * presented above. + * + * OS specific notes for freebsd4: + * - FreeBSD supported $GAI. The code does not. + * - FreeBSD allowed classful IPv4 numeric (127.1), the code does not. */ -/* - * diffs with other KAME platforms: - * - other KAME platforms already nuked FAITH ($GAI), but as FreeBSD - * 4.0-RELEASE supplies it, we still have the code here. - * - AI_ADDRCONFIG support is supplied - * - some of FreeBSD style (#define tabify and others) - * - classful IPv4 numeric (127.1) is allowed. - */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.34 2002/10/06 08:43:35 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.35 2002/10/25 16:24:28 ume Exp $"); #include "namespace.h" #include @@ -120,19 +100,21 @@ # define FAITH #endif -#define SUCCESS 0 -#define ANY 0 -#define YES 1 -#define NO 0 +#define SUCCESS 0 +#define ANY 0 +#define YES 1 +#define NO 0 static const char in_addrany[] = { 0, 0, 0, 0 }; +static const char in_loopback[] = { 127, 0, 0, 1 }; +#ifdef INET6 static const char in6_addrany[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -static const char in_loopback[] = { 127, 0, 0, 1 }; static const char in6_loopback[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }; +#endif static const struct afd { int a_af; @@ -166,9 +148,9 @@ int e_protocol; const char *e_protostr; int e_wild; -#define WILD_AF(ex) ((ex)->e_wild & 0x01) -#define WILD_SOCKTYPE(ex) ((ex)->e_wild & 0x02) -#define WILD_PROTOCOL(ex) ((ex)->e_wild & 0x04) +#define WILD_AF(ex) ((ex)->e_wild & 0x01) +#define WILD_SOCKTYPE(ex) ((ex)->e_wild & 0x02) +#define WILD_PROTOCOL(ex) ((ex)->e_wild & 0x04) }; static const struct explore explore[] = { @@ -190,9 +172,9 @@ }; #ifdef INET6 -#define PTON_MAX 16 +#define PTON_MAX 16 #else -#define PTON_MAX 4 +#define PTON_MAX 4 #endif static const ns_src default_dns_files[] = { @@ -240,9 +222,9 @@ static struct addrinfo *getanswer(const querybuf *, int, const char *, int, const struct addrinfo *); -static int _dns_getaddrinfo(void *, void *, va_list); static void _sethtent(void); static void _endhtent(void); +static int _dns_getaddrinfo(void *, void *, va_list); static struct addrinfo *_gethtent(const char *, const struct addrinfo *); static int _files_getaddrinfo(void *, void *, va_list); #ifdef YP @@ -291,7 +273,7 @@ /* XXX macros that make external reference is BAD. */ -#define GET_AI(ai, afd, addr) \ +#define GET_AI(ai, afd, addr) \ do { \ /* external reference: pai, error, and label free */ \ (ai) = get_ai(pai, (afd), (addr)); \ @@ -301,7 +283,7 @@ } \ } while (/*CONSTCOND*/0) -#define GET_PORT(ai, serv) \ +#define GET_PORT(ai, serv) \ do { \ /* external reference: error and label free */ \ error = get_port((ai), (serv), 0); \ @@ -309,7 +291,7 @@ goto free; \ } while (/*CONSTCOND*/0) -#define GET_CANONNAME(ai, str) \ +#define GET_CANONNAME(ai, str) \ do { \ /* external reference: pai, error and label free */ \ error = get_canonname(pai, (ai), (str)); \ @@ -317,7 +299,7 @@ goto free; \ } while (/*CONSTCOND*/0) -#define ERR(err) \ +#define ERR(err) \ do { \ /* external reference: error, and label bad */ \ error = (err); \ @@ -325,9 +307,9 @@ /*NOTREACHED*/ \ } while (/*CONSTCOND*/0) -#define MATCH_FAMILY(x, y, w) \ +#define MATCH_FAMILY(x, y, w) \ ((x) == (y) || (/*CONSTCOND*/(w) && ((x) == PF_UNSPEC || (y) == PF_UNSPEC))) -#define MATCH(x, y, w) \ +#define MATCH(x, y, w) \ ((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY))) char * @@ -430,8 +412,8 @@ continue; if (ex->e_protocol == ANY) continue; - if (pai->ai_socktype == ex->e_socktype - && pai->ai_protocol != ex->e_protocol) { + if (pai->ai_socktype == ex->e_socktype && + pai->ai_protocol != ex->e_protocol) { ERR(EAI_BADHINTS); } } @@ -440,7 +422,7 @@ /* * post-2553: AI_ALL and AI_V4MAPPED are effective only against - * AF_INET6 query. They needs to be ignored if specified in other + * AF_INET6 query. They need to be ignored if specified in other * occassions. */ switch (pai->ai_flags & (AI_ALL | AI_V4MAPPED)) { @@ -776,7 +758,7 @@ while (cur && cur->ai_next) cur = cur->ai_next; } else - ERR(EAI_FAMILY); /*xxx*/ + ERR(EAI_FAMILY); /* XXX */ } break; } @@ -870,7 +852,7 @@ ai->ai_canonname = (char *)malloc(strlen(str) + 1); if (ai->ai_canonname == NULL) return EAI_MEMORY; - strcpy(ai->ai_canonname, str); + strlcpy(ai->ai_canonname, str, strlen(str) + 1); } return 0; } @@ -997,9 +979,10 @@ if (str_isnumber(servname)) { if (!allownumeric) return EAI_SERVICE; - port = htons(atoi(servname)); + port = atoi(servname); if (port < 0 || port > 65535) return EAI_SERVICE; + port = htons(port); } else { switch (ai->ai_socktype) { case SOCK_DGRAM: @@ -1227,8 +1210,8 @@ const u_char *cp; int n; const u_char *eom; - char *bp; - int type, class, buflen, ancount, qdcount; + char *bp, *ep; + int type, class, ancount, qdcount; int haveanswer, had_error; char tbuf[MAXDNAME]; int (*name_ok)(const char *); @@ -1255,13 +1238,13 @@ ancount = ntohs(hp->ancount); qdcount = ntohs(hp->qdcount); bp = hostbuf; - buflen = sizeof hostbuf; + ep = hostbuf + sizeof hostbuf; cp = answer->buf + HFIXEDSZ; if (qdcount != 1) { h_errno = NO_RECOVERY; return (NULL); } - n = dn_expand(answer->buf, eom, cp, bp, buflen); + n = dn_expand(answer->buf, eom, cp, bp, ep - bp); if ((n < 0) || !(*name_ok)(bp)) { h_errno = NO_RECOVERY; return (NULL); @@ -1279,14 +1262,13 @@ } canonname = bp; bp += n; - buflen -= n; /* The qname can be abbreviated, but h_name is now absolute. */ qname = canonname; } haveanswer = 0; had_error = 0; while (ancount-- > 0 && cp < eom && !had_error) { - n = dn_expand(answer->buf, eom, cp, bp, buflen); + n = dn_expand(answer->buf, eom, cp, bp, ep - bp); if ((n < 0) || !(*name_ok)(bp)) { had_error++; continue; @@ -1313,14 +1295,13 @@ cp += n; /* Get canonical name. */ n = strlen(tbuf) + 1; /* for the \0 */ - if (n > buflen || n >= MAXHOSTNAMELEN) { + if (n > ep - bp || n >= MAXHOSTNAMELEN) { had_error++; continue; } - strcpy(bp, tbuf); + strlcpy(bp, tbuf, ep - bp); canonname = bp; bp += n; - buflen -= n; continue; } if (qtype == T_ANY) { @@ -1374,7 +1355,6 @@ canonname = bp; nn = strlen(bp) + 1; /* for the \0 */ bp += nn; - buflen -= nn; } >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 10:58:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D75AD37B404; Fri, 25 Oct 2002 10:58:43 -0700 (PDT) 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 185A237B40B for ; Fri, 25 Oct 2002 10:58:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B52F343E4A for ; Fri, 25 Oct 2002 10:58:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PHvlmV014867 for ; Fri, 25 Oct 2002 10:57:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PHvl0x014864 for perforce@freebsd.org; Fri, 25 Oct 2002 10:57:47 -0700 (PDT) Date: Fri, 25 Oct 2002 10:57:47 -0700 (PDT) Message-Id: <200210251757.g9PHvl0x014864@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 Subject: PERFORCE change 20138 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20138 Change 20138 by rwatson@rwatson_tislabs on 2002/10/25 10:57:25 Take a pass at integrating recent Biba changes into LOMAC. Probably not quite perfect. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#19 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#19 (text+ko) ==== @@ -286,12 +286,12 @@ } static int -mac_lomac_subject_equal_ok(struct mac_lomac *mac_lomac) +mac_lomac_subject_privileged(struct mac_lomac *mac_lomac) { KASSERT((mac_lomac->ml_flags & MAC_LOMAC_FLAGS_BOTH) == MAC_LOMAC_FLAGS_BOTH, - ("mac_lomac_subject_equal_ok: subject doesn't have both labels")); + ("mac_lomac_subject_privileged: subject doesn't have both labels")); /* If the single is EQUAL, it's ok. */ if (mac_lomac->ml_single.mle_type == MAC_LOMAC_TYPE_EQUAL) @@ -312,11 +312,12 @@ } static int -mac_lomac_privileged(struct mac_lomac *mac_lomac) +mac_lomac_high_single(struct mac_lomac *mac_lomac) { - - /* Equate the notion of "equal" with privilege. */ - return (mac_lomac_subject_equal_ok(mac_lomac)); + KASSERT((mac_lomac->ml_flags & MAC_LOMAC_FLAG_SINGLE) != 0, + ("mac_lomac_high_single: mac_lomac not single")); + + return (mac_lomac->ml_single.mle_type == MAC_LOMAC_TYPE_HIGH); } static int @@ -1467,7 +1468,7 @@ * their label. */ if (mac_lomac_contains_equal(new)) { - error = mac_lomac_subject_equal_ok(subj); + error = mac_lomac_subject_privileged(subj); if (error) return (error); } @@ -1519,6 +1520,13 @@ return (error); /* + * Relabling network interfaces requires LOMAC privilege. + */ + error = mac_lomac_subject_privileged(subj); + if (error) + return (error); + + /* * If the LOMAC label is to be changed, authorize as appropriate. */ if (new->ml_flags & MAC_LOMAC_FLAGS_BOTH) { @@ -1628,7 +1636,7 @@ * subject must have appropriate privilege. */ if (mac_lomac_contains_equal(new)) { - error = mac_lomac_subject_equal_ok(subj); + error = mac_lomac_subject_privileged(subj); if (error) return (error); } @@ -1772,7 +1780,7 @@ * the subject must have appropriate privilege. */ if (mac_lomac_contains_equal(new)) { - error = mac_lomac_subject_equal_ok(subj); + error = mac_lomac_subject_privileged(subj); if (error) return (error); } @@ -1812,11 +1820,20 @@ subj = SLOT(&cred->cr_label); /* - * Permit sysctl modification only if Biba-privileged; permit - * read by any process. + * In general, treat sysctl variables as lomac/high, but also + * require privilege to change them, since they are a + * communications channel between grades. Exempt MIB + * queries from this due to undocmented sysctl magic. + * XXXMAC: This probably requires some more review. */ if (new != NULL) { - if (!mac_lomac_privileged(subj)) + if (namelen > 0 && name[0] == 0) + return (0); + + if (!mac_lomac_subject_dominate_high(subj)) + return (EACCES); + + if (!mac_lomac_subject_privileged(subj)) return (EPERM); } @@ -2065,7 +2082,7 @@ * the subject must have appropriate privilege. */ if (mac_lomac_contains_equal(new)) { - error = mac_lomac_subject_equal_ok(subj); + error = mac_lomac_subject_privileged(subj); if (error) return (error); } @@ -2265,7 +2282,10 @@ subj = SLOT(&cred->cr_label); obj = SLOT(label); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_privileged(subj)) + return (EPERM); + + if (!mac_lomac_high_single(obj)) return (EACCES); return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 11:14: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB53237B404; Fri, 25 Oct 2002 11:13:58 -0700 (PDT) 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 5687937B401 for ; Fri, 25 Oct 2002 11:13:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAB3F43E3B for ; Fri, 25 Oct 2002 11:13:57 -0700 (PDT) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PID7mV016042 for ; Fri, 25 Oct 2002 11:13:07 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PID7Ow016039 for perforce@freebsd.org; Fri, 25 Oct 2002 11:13:07 -0700 (PDT) Date: Fri, 25 Oct 2002 11:13:07 -0700 (PDT) Message-Id: <200210251813.g9PID7Ow016039@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 20140 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20140 Change 20140 by green@green_laptop_2 on 2002/10/25 11:12:34 * Add an "auxiliary single" to struct mac_lomac {} for usage by directories for the inherited label and possibly for execution of executables initially into lower singles via transition hooks that utilize mac_lomac.ml_auxsingle. * Stop having the relabel_vnode hook set extattrs, and additionally have it clear the entire vnode label so that the case of removing auxlabels works. * Allow mac_lomac to accept older 16-byte labels and convert them on-the-fly to 20-byte labels. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#20 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.h#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#20 (text+ko) ==== @@ -234,6 +234,23 @@ } static int +mac_lomac_auxsingle_in_range(struct mac_lomac *single, struct mac_lomac *range) +{ + + KASSERT((single->ml_flags & MAC_LOMAC_FLAG_AUX) != 0, + ("mac_lomac_single_in_range: a not auxsingle")); + KASSERT((range->ml_flags & MAC_LOMAC_FLAG_RANGE) != 0, + ("mac_lomac_single_in_range: b not range")); + + return (mac_lomac_dominate_element(&range->ml_rangehigh, + &single->ml_auxsingle) && + mac_lomac_dominate_element(&single->ml_auxsingle, + &range->ml_rangelow)); + + return (1); +} + +static int mac_lomac_dominate_single(struct mac_lomac *a, struct mac_lomac *b) { KASSERT((a->ml_flags & MAC_LOMAC_FLAG_SINGLE) != 0, @@ -274,6 +291,9 @@ if (mac_lomac->ml_flags & MAC_LOMAC_FLAG_SINGLE) if (mac_lomac->ml_single.mle_type == MAC_LOMAC_TYPE_EQUAL) return (1); + if (mac_lomac->ml_flags & MAC_LOMAC_FLAG_AUX) + if (mac_lomac->ml_auxsingle.mle_type == MAC_LOMAC_TYPE_EQUAL) + return (1); if (mac_lomac->ml_flags & MAC_LOMAC_FLAG_RANGE) { if (mac_lomac->ml_rangelow.mle_type == MAC_LOMAC_TYPE_EQUAL) @@ -340,6 +360,22 @@ return (EINVAL); } + if (mac_lomac->ml_flags & MAC_LOMAC_FLAG_AUX) { + switch (mac_lomac->ml_auxsingle.mle_type) { + case MAC_LOMAC_TYPE_GRADE: + case MAC_LOMAC_TYPE_EQUAL: + case MAC_LOMAC_TYPE_HIGH: + case MAC_LOMAC_TYPE_LOW: + break; + + default: + return (EINVAL); + } + } else { + if (mac_lomac->ml_auxsingle.mle_type != MAC_LOMAC_TYPE_UNDEF) + return (EINVAL); + } + if (mac_lomac->ml_flags & MAC_LOMAC_FLAG_RANGE) { switch (mac_lomac->ml_rangelow.mle_type) { case MAC_LOMAC_TYPE_GRADE: @@ -419,11 +455,24 @@ } static void +mac_lomac_copy_auxsingle(struct mac_lomac *labelfrom, struct mac_lomac *labelto) +{ + + KASSERT((labelfrom->ml_flags & MAC_LOMAC_FLAG_AUX) != 0, + ("mac_lomac_copy_auxsingle: labelfrom not auxsingle")); + + labelto->ml_auxsingle = labelfrom->ml_auxsingle; + labelto->ml_flags |= MAC_LOMAC_FLAG_AUX; +} + +static void mac_lomac_copy(struct mac_lomac *source, struct mac_lomac *dest) { if (source->ml_flags & MAC_LOMAC_FLAG_SINGLE) mac_lomac_copy_single(source, dest); + if (source->ml_flags & MAC_LOMAC_FLAG_AUX) + mac_lomac_copy_auxsingle(source, dest); if (source->ml_flags & MAC_LOMAC_FLAG_RANGE) mac_lomac_copy_range(source, dest); } @@ -579,6 +628,27 @@ curptr += len; } + if (mac_lomac->ml_flags & MAC_LOMAC_FLAG_AUX) { + len = snprintf(curptr, left, "["); + if (len >= left) + return (EINVAL); + left -= len; + curptr += len; + + len = mac_lomac_element_to_string(curptr, left, + &mac_lomac->ml_auxsingle); + if (len >= left) + return (EINVAL); + left -= len; + curptr += len; + + len = snprintf(curptr, left, "]"); + if (len >= left) + return (EINVAL); + left -= len; + curptr += len; + } + if (mac_lomac->ml_flags & MAC_LOMAC_FLAG_RANGE) { len = snprintf(curptr, left, "("); if (len >= left) @@ -680,7 +750,8 @@ static int mac_lomac_parse(struct mac_lomac *mac_lomac, char *string) { - char *range, *rangeend, *rangehigh, *rangelow, *single; + char *range, *rangeend, *rangehigh, *rangelow, *single, *auxsingle, + *auxsingleend; int error; /* Do we have a range? */ @@ -688,6 +759,11 @@ range = index(string, '('); if (range == single) single = NULL; + auxsingle = index(string, '['); + if (auxsingle == single) + single = NULL; + if (range != NULL && auxsingle != NULL) + return (EINVAL); rangelow = rangehigh = NULL; if (range != NULL) { /* Nul terminate the end of the single string. */ @@ -712,6 +788,18 @@ KASSERT((rangelow != NULL && rangehigh != NULL) || (rangelow == NULL && rangehigh == NULL), ("mac_lomac_internalize_label: range mismatch")); + if (auxsingle != NULL) { + /* Nul terminate the end of the single string. */ + *auxsingle = '\0'; + auxsingle++; + auxsingleend = index(auxsingle, ']'); + if (auxsingleend == NULL) + return (EINVAL); + if (*(auxsingleend + 1) != '\0') + return (EINVAL); + /* Nul terminate the end of the auxsingle. */ + *auxsingleend = '\0'; + } bzero(mac_lomac, sizeof(*mac_lomac)); if (single != NULL) { @@ -721,6 +809,14 @@ mac_lomac->ml_flags |= MAC_LOMAC_FLAG_SINGLE; } + if (auxsingle != NULL) { + error = mac_lomac_parse_element(&mac_lomac->ml_auxsingle, + auxsingle); + if (error) + return (error); + mac_lomac->ml_flags |= MAC_LOMAC_FLAG_AUX; + } + if (rangelow != NULL) { error = mac_lomac_parse_element(&mac_lomac->ml_rangelow, rangelow); @@ -859,29 +955,13 @@ mac_lomac_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *vnodelabel, struct label *label) { - struct mac_lomac *source, temp; - size_t buflen; - int error; - - buflen = sizeof(temp); - bzero(&temp, buflen); + struct mac_lomac *source, *dest; source = SLOT(label); -#ifdef notyet - if ((source->ml_flags & MAC_LOMAC_FLAG_SINGLE) == 0) - return (0); -#endif -#ifndef notyet - mac_lomac_copy(source, SLOT(vnodelabel)); -#endif + dest = SLOT(vnodelabel); - mac_lomac_copy_single(source, &temp); - - error = vn_extattr_set(vp, IO_NODELOCKED, MAC_LOMAC_EXTATTR_NAMESPACE, - MAC_LOMAC_EXTATTR_NAME, buflen, (char *)&temp, curthread); -#ifdef notyet - return (error); -#endif + bzero(dest, sizeof(*dest)); + mac_lomac_copy(source, dest); } static void @@ -933,9 +1013,16 @@ return (error); if (buflen != sizeof(temp)) { - printf("mac_lomac_associate_vnode_extattr: bad size %d\n", - buflen); - return (EPERM); + if (buflen != sizeof(temp) - sizeof(temp.ml_auxsingle)) { + printf("mac_lomac_associate_vnode_extattr: bad size %d\n", + buflen); + return (EPERM); + } + bzero(&temp.ml_auxsingle, sizeof(temp.ml_auxsingle)); + buflen = sizeof(temp); + (void)vn_extattr_set(vp, IO_NODELOCKED, + MAC_LOMAC_EXTATTR_NAMESPACE, MAC_LOMAC_EXTATTR_NAME, + buflen, (char *)&temp, curthread); } if (mac_lomac_valid(&temp) != 0) { printf("mac_lomac_associate_vnode_extattr: invalid\n"); @@ -1811,7 +1898,6 @@ mac_lomac_check_sysctl(struct ucred *cred, int *name, u_int namelen, void *old, size_t *oldlenp, int inkernel, void *new, size_t newlen) { -#ifdef notyet struct mac_lomac *subj; if (!mac_lomac_enabled) @@ -1837,7 +1923,6 @@ return (EPERM); } -#endif return (0); } @@ -2053,9 +2138,10 @@ /* * If there is a LOMAC label update for the vnode, it must be a - * single label. + * single label, with an optional explicit auxiliary single. */ - error = lomac_atmostflags(new, MAC_LOMAC_FLAG_SINGLE); + error = lomac_atmostflags(new, + MAC_LOMAC_FLAG_SINGLE | MAC_LOMAC_FLAG_AUX); if (error) return (error); @@ -2087,6 +2173,24 @@ return (error); } } + if (new->ml_flags & MAC_LOMAC_FLAG_AUX) { + /* + * To change the auxiliary LOMAC label on a vnode, the new + * vnode label must be in the subject range. + */ + if (!mac_lomac_auxsingle_in_range(new, subj)) + return (EPERM); + + /* + * To change the auxiliary LOMAC label on the vnode to be + * EQUAL, the subject must have appropriate privilege. + */ + if (mac_lomac_contains_equal(new)) { + error = mac_lomac_subject_equal_ok(subj); + if (error) + return (error); + } + } return (0); } ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.h#9 (text+ko) ==== @@ -47,13 +47,11 @@ #define MAC_LOMAC_LABEL_NAME "lomac" -#define MAC_LOMAC_FLAG_SINGLE 0x00000001 /* mb_single initialized */ -#define MAC_LOMAC_FLAG_RANGE 0x00000002 /* mb_range* initialized */ +#define MAC_LOMAC_FLAG_SINGLE 0x00000001 /* ml_single initialized */ +#define MAC_LOMAC_FLAG_RANGE 0x00000002 /* ml_range* initialized */ +#define MAC_LOMAC_FLAG_AUX 0x00000004 /* ml_auxsingle initialized */ #define MAC_LOMAC_FLAGS_BOTH (MAC_LOMAC_FLAG_SINGLE | MAC_LOMAC_FLAG_RANGE) -#define MAC_LOMAC_CFLAG_SINGLE 0x00000004 /* mb_single initialized */ -#define MAC_LOMAC_CFLAG_RANGE 0x00000008 /* mb_range* initialized */ -#define MAC_LOMAC_CFLAGS_BOTH (MAC_LOMAC_CFLAG_SINGLE | MAC_LOMAC_CFLAG_RANGE) -#define MAC_LOMAC_FLAG_UPDATE 0x00000010 /* must demote this process */ +#define MAC_LOMAC_FLAG_UPDATE 0x00000008 /* must demote this process */ #define MAC_LOMAC_TYPE_UNDEF 0 /* Undefined */ #define MAC_LOMAC_TYPE_GRADE 1 /* Hierarchal grade with mb_grade. */ @@ -78,15 +76,18 @@ }; /* - * LOMAC labels consist of two components: a single label, and a label - * range. Depending on the context, one or both may be used; the mb_flags + * LOMAC labels start with two components: a single label, and a label + * range. Depending on the context, one or both may be used; the ml_flags * field permits the provider to indicate what fields are intended for - * use. + * use. The auxiliary label works the same way, but is only valid on + * filesystem objects to provide inheritance semantics on directories + * and "non-demoting" execution on executable files. */ struct mac_lomac { int ml_flags; struct mac_lomac_element ml_single; struct mac_lomac_element ml_rangelow, ml_rangehigh; + struct mac_lomac_element ml_auxsingle; }; #endif /* !_SYS_SECURITY_MAC_LOMAC_H */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 11:52:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7B5137B404; Fri, 25 Oct 2002 11:52:47 -0700 (PDT) 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 4F70C37B401 for ; Fri, 25 Oct 2002 11:52:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E029343E8A for ; Fri, 25 Oct 2002 11:52:46 -0700 (PDT) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PIpumV018652 for ; Fri, 25 Oct 2002 11:51:56 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PIpulS018649 for perforce@freebsd.org; Fri, 25 Oct 2002 11:51:56 -0700 (PDT) Date: Fri, 25 Oct 2002 11:51:56 -0700 (PDT) Message-Id: <200210251851.g9PIpulS018649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 20143 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20143 Change 20143 by green@green_laptop_2 on 2002/10/25 11:51:02 Here's the initial, probably-buggy implementation of mac_lomac's LOMAC-style explicit inheritance of labels from directories. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#21 (text+ko) ==== @@ -432,6 +432,16 @@ } static void +mac_lomac_set_auxsingle(struct mac_lomac *mac_lomac, u_short type, + u_short grade) +{ + + mac_lomac->ml_auxsingle.mle_type = type; + mac_lomac->ml_auxsingle.mle_grade = grade; + mac_lomac->ml_flags |= MAC_LOMAC_FLAG_AUX; +} + +static void mac_lomac_copy_range(struct mac_lomac *labelfrom, struct mac_lomac *labelto) { @@ -1054,7 +1064,7 @@ struct label *fslabel, struct vnode *dvp, struct label *dlabel, struct vnode *vp, struct label *vlabel, struct componentname *cnp) { - struct mac_lomac *source, *dest, temp; + struct mac_lomac *source, *dest, *dir, temp; size_t buflen; int error; @@ -1063,12 +1073,19 @@ source = SLOT(&cred->cr_label); dest = SLOT(vlabel); - mac_lomac_copy_single(source, &temp); + dir = SLOT(dlabel); + if (dir->ml_flags & MAC_LOMAC_FLAG_AUX) { + mac_lomac_copy_auxsingle(dir, &temp); + mac_lomac_set_single(&temp, dir->ml_auxsingle.mle_type, + dir->ml_auxsingle.mle_grade); + } else { + mac_lomac_copy_single(source, &temp); + } error = vn_extattr_set(vp, IO_NODELOCKED, MAC_LOMAC_EXTATTR_NAMESPACE, MAC_LOMAC_EXTATTR_NAME, buflen, (char *)&temp, curthread); if (error == 0) - mac_lomac_copy_single(source, dest); + mac_lomac_copy(&temp, dest); return (error); } @@ -1916,8 +1933,10 @@ if (namelen > 0 && name[0] == 0) return (0); +#ifdef notdef if (!mac_lomac_subject_dominate_high(subj)) return (EACCES); +#endif if (!mac_lomac_subject_privileged(subj)) return (EPERM); @@ -1940,6 +1959,9 @@ if (!mac_lomac_dominate_single(subj, obj)) return (EACCES); + if (obj->ml_flags & MAC_LOMAC_FLAG_AUX && + !mac_lomac_dominate_element(&subj->ml_single, &obj->ml_auxsingle)) + return (EACCES); return (0); } @@ -2186,7 +2208,7 @@ * EQUAL, the subject must have appropriate privilege. */ if (mac_lomac_contains_equal(new)) { - error = mac_lomac_subject_equal_ok(subj); + error = mac_lomac_subject_privileged(subj); if (error) return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 12:18:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BFE137BB13; Fri, 25 Oct 2002 12:18:22 -0700 (PDT) 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 89B8537BADB for ; Fri, 25 Oct 2002 12:18:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4867243E7B for ; Fri, 25 Oct 2002 12:18:20 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PJHUmV020758 for ; Fri, 25 Oct 2002 12:17:30 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PJHTed020755 for perforce@freebsd.org; Fri, 25 Oct 2002 12:17:29 -0700 (PDT) Date: Fri, 25 Oct 2002 12:17:29 -0700 (PDT) Message-Id: <200210251917.g9PJHTed020755@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 20146 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20146 Change 20146 by cvance@cvance_laptop on 2002/10/25 12:16:47 Before EAs are available, vn_extattr_get will return EOPNOTSUPP so handle EOPNOTSUPP case in sebsd_associate_vnode_extattr; vnodes will be reloaded after the policy is available, to the temporary (incorrect) label will be fine. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#51 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#51 (text+ko) ==== @@ -487,7 +487,7 @@ SEBSD_MAC_EXTATTR_NAMESPACE, SEBSD_MAC_EXTATTR_NAME, &context_len, context, curthread); - if (error == ENOATTR) { + if (error == ENOATTR || error == EOPNOTSUPP) { vsec->sid = SECINITSID_UNLABELED; /* Use the default label */ struct vattr va; @@ -497,6 +497,8 @@ goto dosclass; } if (error) { + printf("sebsd_update_vnode_from_extattr: ERROR %d returned " + " by vn_extattr_get()\n", error); return (error); /* Fail closed */ } if (sebsd_verbose > 1) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 12:25:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6092E37BB7B; Fri, 25 Oct 2002 12:25:30 -0700 (PDT) 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 ED58137BB78 for ; Fri, 25 Oct 2002 12:25:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 948D243E6A for ; Fri, 25 Oct 2002 12:25:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PJOdmV021370 for ; Fri, 25 Oct 2002 12:24:39 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PJOc5l021367 for perforce@freebsd.org; Fri, 25 Oct 2002 12:24:38 -0700 (PDT) Date: Fri, 25 Oct 2002 12:24:38 -0700 (PDT) Message-Id: <200210251924.g9PJOc5l021367@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 Subject: PERFORCE change 20147 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20147 Change 20147 by rwatson@rwatson_tislabs on 2002/10/25 12:24:33 Forgot to p4 add the execve_mac libc wrapper. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_exec.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 12:32: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A02937BD36; Fri, 25 Oct 2002 12:31:39 -0700 (PDT) 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 42C2037BD36 for ; Fri, 25 Oct 2002 12:31:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5477B43E3B for ; Fri, 25 Oct 2002 12:31:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PJUlmV021972 for ; Fri, 25 Oct 2002 12:30:47 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PJUlhi021969 for perforce@freebsd.org; Fri, 25 Oct 2002 12:30:47 -0700 (PDT) Date: Fri, 25 Oct 2002 12:30:47 -0700 (PDT) Message-Id: <200210251930.g9PJUlhi021969@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 Subject: PERFORCE change 20148 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20148 Change 20148 by rwatson@rwatson_tislabs on 2002/10/25 12:30:43 Integ main FreeBSD tree to TrustedBSD base tree: pick up the ABI fixes from Peter, which hopefully help stabilize X11 as well as make 4.x applications work better Affected files ... .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#9 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/locore.s#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#16 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/md_var.h#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/sigframe.h#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/signal.h#4 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/ucontext.h#3 integrate .. //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_signal.c#8 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#26 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#14 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#16 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/genassym.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/locore.s#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/md_var.h#10 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/sigframe.h#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/signal.h#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/ucontext.h#5 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/npx.c#13 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#24 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/sigframe.h#2 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/signal.h#6 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#11 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/signal.h#3 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/machdep.c#14 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/signal.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/tick.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/iommu.c#7 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/machdep.c#24 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/tick.c#7 integrate .. //depot/projects/trustedbsd/base/sys/sys/_sigset.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/signal.h#8 integrate .. //depot/projects/trustedbsd/base/sys/sys/signalvar.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#23 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#23 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#24 integrate .. //depot/projects/trustedbsd/base/sys/sys/ucontext.h#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#14 integrate Differences ... ==== //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#9 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.35 2002/10/25 16:24:28 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.36 2002/10/25 17:07:02 ume Exp $"); #include "namespace.h" #include @@ -217,14 +217,14 @@ static const struct afd *find_afd(int); static int addrconfig(struct addrinfo *); #ifdef INET6 -static int ip6_str2scopeid(char *, struct sockaddr_in6 *); +static int ip6_str2scopeid(char *, struct sockaddr_in6 *, u_int32_t *); #endif static struct addrinfo *getanswer(const querybuf *, int, const char *, int, const struct addrinfo *); +static int _dns_getaddrinfo(void *, void *, va_list); static void _sethtent(void); static void _endhtent(void); -static int _dns_getaddrinfo(void *, void *, va_list); static struct addrinfo *_gethtent(const char *, const struct addrinfo *); static int _files_getaddrinfo(void *, void *, va_list); #ifdef YP @@ -346,8 +346,9 @@ if (*p == '\0') return NO; ep = NULL; + errno = 0; (void)strtoul(p, &ep, 10); - if (ep && *ep == '\0') + if (errno == 0 && ep && *ep == '\0') return YES; else return NO; @@ -822,13 +823,13 @@ error = explore_numeric(pai, addr, servname, res); if (error == 0) { - int scopeid; + u_int32_t scopeid; for (cur = *res; cur; cur = cur->ai_next) { if (cur->ai_family != AF_INET6) continue; sin6 = (struct sockaddr_in6 *)(void *)cur->ai_addr; - if ((scopeid = ip6_str2scopeid(scope, sin6)) == -1) { + if (ip6_str2scopeid(scope, sin6, &scopeid) == -1) { free(hostname2); return(EAI_NODATA); /* XXX: is return OK? */ } @@ -1080,14 +1081,17 @@ #ifdef INET6 /* convert a string to a scope identifier. XXX: IPv6 specific */ static int -ip6_str2scopeid(scope, sin6) +ip6_str2scopeid(scope, sin6, scopeid) char *scope; struct sockaddr_in6 *sin6; + u_int32_t *scopeid; { - int scopeid; - struct in6_addr *a6 = &sin6->sin6_addr; + u_long lscopeid; + struct in6_addr *a6; char *ep; + a6 = &sin6->sin6_addr; + /* empty scopeid portion is invalid */ if (*scope == '\0') return -1; @@ -1098,10 +1102,10 @@ * and interfaces, so we simply use interface indices for * like-local scopes. */ - scopeid = if_nametoindex(scope); - if (scopeid == 0) + *scopeid = if_nametoindex(scope); + if (*scopeid == 0) goto trynumeric; - return(scopeid); + return 0; } /* still unclear about literal, allow numeric only - placeholder */ @@ -1114,9 +1118,11 @@ /* try to convert to a numeric id as a last resort */ trynumeric: - scopeid = (int)strtoul(scope, &ep, 10); - if (*ep == '\0') - return scopeid; + errno = 0; + lscopeid = strtoul(scope, &ep, 10); + *scopeid = (u_int32_t)(lscopeid & 0xffffffffUL); + if (errno == 0 && ep && *ep == '\0' && *scopeid == lscopeid) + return 0; else return -1; } @@ -1447,6 +1453,7 @@ q.answer = buf->buf; q.anslen = sizeof(buf->buf); q.next = &q2; + q2.name = name; q2.qclass = C_IN; q2.qtype = T_A; q2.answer = buf2->buf; ==== //depot/projects/trustedbsd/base/sys/alpha/alpha/locore.s#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/locore.s,v 1.21 2002/02/07 20:58:42 julian Exp $ + * $FreeBSD: src/sys/alpha/alpha/locore.s,v 1.22 2002/10/25 19:10:55 peter Exp $ */ /* @@ -53,6 +53,8 @@ * rights to redistribute these changes. */ +#include "opt_compat.h" + #include #include #include @@ -190,15 +192,55 @@ jsr ra, (t12) /* call the signal handler (t12==pv) */ ldq a0, 0(sp) /* get the sigcontext pointer */ lda sp, 16(sp) - CALLSYS_NOERROR(sigreturn) /* and call sigreturn() with it. */ + ldiq v0, SYS_sigreturn + call_pal PAL_OSF1_callsys /* and call sigreturn() with it. */ mov v0, a0 /* if that failed, get error code */ - CALLSYS_NOERROR(exit) /* and call exit() with it. */ -XNESTED(esigcode,0) + ldiq v0, SYS_exit + call_pal PAL_OSF1_callsys /* and call exit() with it. */ END(sigcode) +#ifdef COMPAT_43 +NESTED(osigcode,0,0,ra,0,0) + lda sp, -16(sp) /* save the sigcontext pointer */ + stq a2, 0(sp) + jsr ra, (t12) /* call the signal handler (t12==pv) */ + ldq a0, 0(sp) /* get the sigcontext pointer */ + lda sp, 16(sp) + ldiq v0, 103 /* Old 3.x SYS_sigreturn */ + call_pal PAL_OSF1_callsys /* and call sigreturn() with it. */ + mov v0, a0 /* if that failed, get error code */ + ldiq v0, SYS_exit + call_pal PAL_OSF1_callsys /* and call exit() with it. */ + END(osigcode) +#endif + +#ifdef COMPAT_FREEBSD4 +NESTED(freebsd4_sigcode,0,0,ra,0,0) + lda sp, -16(sp) /* save the sigcontext pointer */ + stq a2, 0(sp) + jsr ra, (t12) /* call the signal handler (t12==pv) */ + ldq a0, 0(sp) /* get the sigcontext pointer */ + lda sp, 16(sp) + ldiq v0, 344 /* Old 4.x SYS_sigreturn */ + call_pal PAL_OSF1_callsys /* and call sigreturn() with it. */ + mov v0, a0 /* if that failed, get error code */ + ldiq v0, SYS_exit + call_pal PAL_OSF1_callsys /* and call exit() with it. */ + END(freebsd4_sigcode) +#endif +EXPORT(esigcode) /* end of all sigcode */ + .data - EXPORT(szsigcode) - .quad esigcode-sigcode +EXPORT(szsigcode) + .long esigcode-sigcode +#ifdef COMPAT_43 +EXPORT(szosigcode) + .long esigcode-osigcode +#endif +#ifdef COMPAT_FREEBSD4 +EXPORT(szfreebsd4_sigcode) + .long esigcode-freebsd4_sigcode +#endif .text /**************************************************************************/ ==== //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#16 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.186 2002/09/20 17:50:50 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.187 2002/10/25 19:10:55 peter Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -232,6 +232,10 @@ #ifdef COMPAT_43 void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); #endif +#ifdef COMPAT_FREEBSD4 +static void freebsd4_sendsig(sig_t catcher, int sig, sigset_t *mask, + u_long code); +#endif static void identifycpu(void); @@ -1250,7 +1254,7 @@ /* * Set up the registers to return to sigcode. */ - frame->tf_regs[FRAME_PC] = PS_STRINGS - (esigcode - sigcode); + frame->tf_regs[FRAME_PC] = PS_STRINGS - szosigcode; frame->tf_regs[FRAME_A0] = sig; frame->tf_regs[FRAME_FLAGS] = 0; /* full restore */ PROC_LOCK(p); @@ -1264,6 +1268,121 @@ } #endif +#ifdef COMPAT_FREEBSD4 +static void +freebsd4_sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +{ + struct proc *p; + struct thread *td; + struct trapframe *frame; + struct sigacts *psp; + struct sigframe4 sf, *sfp; + int oonstack, rndfsize; + + td = curthread; + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); + psp = p->p_sigacts; + + frame = td->td_frame; + oonstack = sigonstack(alpha_pal_rdusp()); + rndfsize = ((sizeof(sf) + 15) / 16) * 16; + + /* save user context */ + bzero(&sf, sizeof(sf)); + sf.sf_uc.uc_sigmask = *mask; + sf.sf_uc.uc_stack = p->p_sigstk; + sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; + sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; + + fill_regs(td, (struct reg *)sf.sf_uc.uc_mcontext.mc_regs); + sf.sf_uc.uc_mcontext.mc_regs[R_SP] = alpha_pal_rdusp(); + sf.sf_uc.uc_mcontext.mc_regs[R_ZERO] = 0xACEDBADE; /* magic number */ + sf.sf_uc.uc_mcontext.mc_regs[R_PS] = frame->tf_regs[FRAME_PS]; + sf.sf_uc.uc_mcontext.mc_regs[R_PC] = frame->tf_regs[FRAME_PC]; + sf.sf_uc.uc_mcontext.mc_regs[R_TRAPARG_A0] = + frame->tf_regs[FRAME_TRAPARG_A0]; + sf.sf_uc.uc_mcontext.mc_regs[R_TRAPARG_A1] = + frame->tf_regs[FRAME_TRAPARG_A1]; + sf.sf_uc.uc_mcontext.mc_regs[R_TRAPARG_A2] = + frame->tf_regs[FRAME_TRAPARG_A2]; + + /* + * Allocate and validate space for the signal handler + * context. Note that if the stack is in P0 space, the + * call to grow() is a nop, and the useracc() check + * will fail if the process has not already allocated + * the space with a `brk'. + */ + if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + SIGISMEMBER(psp->ps_sigonstack, sig)) { + sfp = (struct sigframe4 *)((caddr_t)p->p_sigstk.ss_sp + + p->p_sigstk.ss_size - rndfsize); +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) + p->p_sigstk.ss_flags |= SS_ONSTACK; +#endif + } else + sfp = (struct sigframe4 *)(alpha_pal_rdusp() - rndfsize); + PROC_UNLOCK(p); + + /* save the floating-point state, if necessary, then copy it. */ + alpha_fpstate_save(td, 1); + sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; + bcopy(&td->td_pcb->pcb_fp, + (struct fpreg *)sf.sf_uc.uc_mcontext.mc_fpregs, + sizeof(struct fpreg)); + sf.sf_uc.uc_mcontext.mc_fp_control = td->td_pcb->pcb_fp_control; + +#ifdef COMPAT_OSF1 + /* + * XXX Create an OSF/1-style sigcontext and associated goo. + */ +#endif + + /* + * copy the frame out to userland. + */ + if (copyout((caddr_t)&sf, (caddr_t)sfp, sizeof(sf)) != 0) { + /* + * Process has trashed its stack; give it an illegal + * instruction to halt it in its tracks. + */ + PROC_LOCK(p); + SIGACTION(p, SIGILL) = SIG_DFL; + SIGDELSET(p->p_sigignore, SIGILL); + SIGDELSET(p->p_sigcatch, SIGILL); + SIGDELSET(p->p_sigmask, SIGILL); + psignal(p, SIGILL); + return; + } + + /* + * Set up the registers to return to sigcode. + */ + frame->tf_regs[FRAME_PC] = PS_STRINGS - szfreebsd4_sigcode; + frame->tf_regs[FRAME_A0] = sig; + PROC_LOCK(p); + if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) { + frame->tf_regs[FRAME_A1] = (u_int64_t)&(sfp->sf_si); + + /* Fill in POSIX parts */ + sf.sf_si.si_signo = sig; + sf.sf_si.si_code = code; + sf.sf_si.si_addr = (void*)frame->tf_regs[FRAME_TRAPARG_A0]; + sf.sf_si.si_pid = p->p_pid; + sf.sf_si.si_uid = p->p_ucred->cr_uid; + } + else + frame->tf_regs[FRAME_A1] = code; + + frame->tf_regs[FRAME_A2] = (u_int64_t)&(sfp->sf_uc); + frame->tf_regs[FRAME_T12] = (u_int64_t)catcher; /* t12 is pv */ + frame->tf_regs[FRAME_FLAGS] = 0; /* full restore */ + alpha_pal_wrusp((unsigned long)sfp); +} +#endif /* COMPAT_FREEBSD4 */ + void sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) { @@ -1278,6 +1397,12 @@ p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); psp = p->p_sigacts; +#ifdef COMPAT_FREEBSD4 + if (SIGISMEMBER(psp->ps_freebsd4, sig)) { + freebsd4_sendsig(catcher, sig, mask, code); + return; + } +#endif #ifdef COMPAT_43 if (SIGISMEMBER(psp->ps_osigset, sig)) { osendsig(catcher, sig, mask, code); @@ -1377,7 +1502,7 @@ /* * Set up the registers to return to sigcode. */ - frame->tf_regs[FRAME_PC] = PS_STRINGS - (esigcode - sigcode); + frame->tf_regs[FRAME_PC] = PS_STRINGS - szsigcode; frame->tf_regs[FRAME_A0] = sig; PROC_LOCK(p); if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) { @@ -1419,13 +1544,13 @@ * * MPSAFE */ +#ifdef COMPAT_43 int osigreturn(struct thread *td, struct osigreturn_args /* { struct osigcontext *sigcntxp; } */ *uap) { -#ifdef COMPAT_43 struct osigcontext *scp, ksc; struct proc *p = td->td_proc; @@ -1479,10 +1604,82 @@ sizeof(struct fpreg)); td->td_pcb->pcb_fp_control = ksc.sc_fp_control; return (EJUSTRETURN); -#else /* !COMPAT_43 */ - return (ENOSYS); +} #endif /* COMPAT_43 */ + +#ifdef COMPAT_FREEBSD4 +/* + * MPSAFE + */ +int +freebsd4_sigreturn(struct thread *td, + struct freebsd4_sigreturn_args /* { + const struct ucontext4 *sigcntxp; + } */ *uap) +{ + struct ucontext4 uc; + const struct ucontext4 *ucp; + struct pcb *pcb; + unsigned long val; + struct proc *p; + int error; + + ucp = uap->sigcntxp; + pcb = td->td_pcb; + p = td->td_proc; + + /* + * Fetch the entire context structure at once for speed. + * Note that struct osigcontext is smaller than a ucontext_t, + * so even if copyin() faults, we may have actually gotten a complete + * struct osigcontext. + */ + error = copyin(ucp, &uc, sizeof(ucontext_t)); + if (error != 0) { +#ifdef COMPAT_43 + if (((struct osigcontext*)&uc)->sc_regs[R_ZERO] == 0xACEDBADE) + return osigreturn(td, (struct osigreturn_args *)uap); +#endif + return (error); + } + +#ifdef COMPAT_43 + if (((struct osigcontext*)&uc)->sc_regs[R_ZERO] == 0xACEDBADE) + return osigreturn(td, (struct osigreturn_args *)uap); +#endif + + /* + * Restore the user-supplied information + */ + set_regs(td, (struct reg *)uc.uc_mcontext.mc_regs); + val = (uc.uc_mcontext.mc_regs[R_PS] | ALPHA_PSL_USERSET) & + ~ALPHA_PSL_USERCLR; + td->td_frame->tf_regs[FRAME_PS] = val; + td->td_frame->tf_regs[FRAME_PC] = uc.uc_mcontext.mc_regs[R_PC]; + td->td_frame->tf_regs[FRAME_FLAGS] = 0; /* full restore */ + alpha_pal_wrusp(uc.uc_mcontext.mc_regs[R_SP]); + + PROC_LOCK(p); +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) + if (uc.uc_mcontext.mc_onstack & 1) + p->p_sigstk.ss_flags |= SS_ONSTACK; + else + p->p_sigstk.ss_flags &= ~SS_ONSTACK; +#endif + + p->p_sigmask = uc.uc_sigmask; + SIG_CANTMASK(p->p_sigmask); + signotify(p); + PROC_UNLOCK(p); + + /* XXX ksc.sc_ownedfp ? */ + alpha_fpstate_drop(td); + bcopy((struct fpreg *)uc.uc_mcontext.mc_fpregs, + &td->td_pcb->pcb_fp, sizeof(struct fpreg)); + td->td_pcb->pcb_fp_control = uc.uc_mcontext.mc_fp_control; + return (EJUSTRETURN); } +#endif /* COMPAT_FREEBSD4 */ /* * MPSAFE @@ -1498,6 +1695,7 @@ struct pcb *pcb; unsigned long val; struct proc *p; + int error; ucp = uap->sigcntxp; pcb = td->td_pcb; @@ -1507,21 +1705,22 @@ if (sigdebug & SDB_FOLLOW) printf("sigreturn: pid %d, scp %p\n", p->p_pid, ucp); #endif - /* * Fetch the entire context structure at once for speed. * Note that struct osigcontext is smaller than a ucontext_t, * so even if copyin() faults, we may have actually gotten a complete * struct osigcontext. + * XXX we'll *still* be getting osigcontext's here due to longjmp(3) + * brain damage. */ - if (copyin(ucp, &uc, sizeof(ucontext_t))) { + error = copyin(ucp, &uc, sizeof(ucontext_t)); + if (error != 0) { #ifdef COMPAT_43 if (((struct osigcontext*)&uc)->sc_regs[R_ZERO] == 0xACEDBADE) return osigreturn(td, (struct osigreturn_args *)uap); #endif - return (EFAULT); + return (error); } - #ifdef COMPAT_43 if (((struct osigcontext*)&uc)->sc_regs[R_ZERO] == 0xACEDBADE) return osigreturn(td, (struct osigreturn_args *)uap); ==== //depot/projects/trustedbsd/base/sys/alpha/include/md_var.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.20 2002/08/30 04:04:34 peter Exp $ + * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.21 2002/10/25 19:10:55 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -36,6 +36,12 @@ extern char sigcode[]; extern char esigcode[]; extern int szsigcode; +#ifdef COMPAT_43 +extern int szosigcode; +#endif +#ifdef COMPAT_FREEBSD4 +extern int szfreebsd4_sigcode; +#endif extern long Maxmem; extern int busdma_swi_pending; ==== //depot/projects/trustedbsd/base/sys/alpha/include/sigframe.h#3 (text+ko) ==== @@ -25,16 +25,18 @@ * (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/alpha/include/sigframe.h,v 1.3 2002/02/17 17:40:25 deischen Exp $ + * $FreeBSD: src/sys/alpha/include/sigframe.h,v 1.4 2002/10/25 19:10:55 peter Exp $ */ #ifndef _MACHINE_SIGFRAME_H_ #define _MACHINE_SIGFRAME_H_ 1 -#ifdef _KERNEL -struct osigframe { - struct osigcontext sf_sc; - osiginfo_t sf_si; +#if defined(_KERNEL) && defined(COMPAT_FREEBSD4) +/* FreeBSD 4.x */ +struct sigframe4 { + unsigned long __spare__; + struct ucontext4 sf_uc; + siginfo_t sf_si; }; #endif ==== //depot/projects/trustedbsd/base/sys/alpha/include/signal.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/signal.h,v 1.9 2002/10/13 00:31:46 mike Exp $ */ +/* $FreeBSD: src/sys/alpha/include/signal.h,v 1.10 2002/10/25 19:10:55 peter Exp $ */ /* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */ /* @@ -47,7 +47,7 @@ /* * Only the kernel should need these old type definitions. */ -#ifdef _KERNEL +#if defined(_KERNEL) && defined(COMPAT_43) /* * Information pushed on stack when a signal is delivered. * This is used by the kernel to restore state following @@ -58,8 +58,6 @@ * Note that sc_regs[] and sc_fpregs[]+sc_fpcr are inline * representations of 'struct reg' and 'struct fpreg', respectively. */ -typedef unsigned int osigset_t; - struct osigcontext { long sc_onstack; /* sigstack state to restore */ long sc_mask; /* signal mask to restore */ ==== //depot/projects/trustedbsd/base/sys/alpha/include/ucontext.h#3 (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. * - * $FreeBSD: src/sys/alpha/include/ucontext.h,v 1.4 2002/01/10 02:36:30 deischen Exp $ + * $FreeBSD: src/sys/alpha/include/ucontext.h,v 1.5 2002/10/25 19:10:55 peter Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -50,4 +50,16 @@ long __spare__[6]; } mcontext_t; +#if defined(_KERNEL) && defined(COMPAT_FREEBSD4) +struct mcontext4 { + long mc_onstack; /* XXX - sigcontext compat. */ + unsigned long mc_regs[37]; + unsigned long mc_fpregs[32]; + unsigned long mc_fpcr; + unsigned long mc_fp_control; + long mc_ownedfp; + long __spare__[7]; +}; +#endif + #endif /* !_MACHINE_UCONTEXT_H_ */ ==== //depot/projects/trustedbsd/base/sys/alpha/osf1/osf1_signal.c#8 (text+ko) ==== @@ -30,9 +30,14 @@ * (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/alpha/osf1/osf1_signal.c,v 1.22 2002/10/01 17:15:46 jmallett Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.23 2002/10/25 19:10:55 peter Exp $ */ +#include "opt_compat.h" +#ifndef COMPAT_43 +#error "COMPAT_OSF1 requires COMPAT_43" +#endif + #include #include #include @@ -101,7 +106,6 @@ #define osf1_sigismember(s, n) (*(s) & sigmask(n)) #define osf1_sigaddset(s, n) (*(s) |= sigmask(n)) - void osf1_to_bsd_sigset(oss, bss) const osf1_sigset_t *oss; @@ -747,9 +751,6 @@ return (EJUSTRETURN); } -extern int -osigstack(struct thread *td, struct osf1_osigstack_args *uap); - int osf1_osigstack(td, uap) register struct thread *td; @@ -761,5 +762,5 @@ /* uprintf("osf1_osigstack: oss = %p, nss = %p",uap->oss, uap->nss); uprintf(" stack ptr = %p\n",p->p_sigacts->ps_sigstk.ss_sp);*/ - return(osigstack(td, uap)); + return(osigstack(td, (struct osigstack_args *)uap)); } ==== //depot/projects/trustedbsd/base/sys/conf/options#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.361 2002/10/24 17:21:40 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.362 2002/10/25 19:10:55 peter Exp $ # # On the handling of kernel options # @@ -77,6 +77,7 @@ COMPAT_43 opt_compat.h COMPAT_FREEBSD4 opt_compat.h COMPAT_SUNOS opt_compat.h +NO_COMPAT_FREEBSD4 opt_compat.h COMPILING_LINT opt_global.h CY_PCI_FASTINTR CONSPEED opt_comconsole.h ==== //depot/projects/trustedbsd/base/sys/geom/geom.h#14 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom.h,v 1.34 2002/10/20 19:18:06 phk Exp $ + * $FreeBSD: src/sys/geom/geom.h,v 1.35 2002/10/25 18:42:42 phk Exp $ */ #ifndef _GEOM_GEOM_H_ @@ -192,6 +192,9 @@ } u; }; +/* geom_dev.c */ +int g_dev_print(void); + /* geom_dump.c */ void g_hexdump(void *ptr, int length); void g_trace(int level, char *, ...); ==== //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#16 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_dev.c,v 1.29 2002/10/20 20:28:24 phk Exp $ + * $FreeBSD: src/sys/geom/geom_dev.c,v 1.31 2002/10/25 18:42:42 phk Exp $ */ #include @@ -87,6 +87,20 @@ G_CLASS_INITIALIZER }; +int +g_dev_print(void) +{ + struct g_geom *gp; + + if (LIST_EMPTY(&g_dev_class.geom)) + return (0); + printf("List of GEOM disk devices:\n "); + LIST_FOREACH(gp, &g_dev_class.geom, geom) + printf(" %s", gp->name); + printf("\n"); + return (1); +} + static void g_dev_clone(void *arg __unused, char *name, int namelen __unused, dev_t *dev) { @@ -95,7 +109,6 @@ if (*dev != NODEV) return; - g_trace(G_T_TOPOLOGY, "g_dev_clone(%s)", name); g_waitidle(); /* XXX: can I drop Giant here ??? */ ==== //depot/projects/trustedbsd/base/sys/i386/i386/genassym.c#9 (text+ko) ==== @@ -34,9 +34,10 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.129 2002/09/16 19:25:08 mini Exp $ + * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.130 2002/10/25 19:10:56 peter Exp $ */ +#include "opt_compat.h" #include "opt_kstack_pages.h" #include @@ -151,12 +152,20 @@ ASSYM(TF_CS, offsetof(struct trapframe, tf_cs)); ASSYM(TF_EFLAGS, offsetof(struct trapframe, tf_eflags)); ASSYM(SIGF_HANDLER, offsetof(struct sigframe, sf_ahu.sf_handler)); +#ifdef COMPAT_43 ASSYM(SIGF_SC, offsetof(struct osigframe, sf_siginfo.si_sc)); +#endif ASSYM(SIGF_UC, offsetof(struct sigframe, sf_uc)); +#ifdef COMPAT_43 ASSYM(SC_PS, offsetof(struct osigcontext, sc_ps)); ASSYM(SC_FS, offsetof(struct osigcontext, sc_fs)); ASSYM(SC_GS, offsetof(struct osigcontext, sc_gs)); ASSYM(SC_TRAPNO, offsetof(struct osigcontext, sc_trapno)); +#endif +#ifdef COMPAT_FREEBSD4 +ASSYM(UC4_EFLAGS, offsetof(struct ucontext4, uc_mcontext.mc_eflags)); +ASSYM(UC4_GS, offsetof(struct ucontext4, uc_mcontext.mc_gs)); +#endif ASSYM(UC_EFLAGS, offsetof(ucontext_t, uc_mcontext.mc_eflags)); ASSYM(UC_GS, offsetof(ucontext_t, uc_mcontext.mc_gs)); ASSYM(ENOENT, ENOENT); ==== //depot/projects/trustedbsd/base/sys/i386/i386/locore.s#6 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/locore.s,v 1.159 2002/09/17 01:48:57 peter Exp $ + * $FreeBSD: src/sys/i386/i386/locore.s,v 1.160 2002/10/25 19:10:56 peter Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -406,6 +406,22 @@ int $0x80 /* enter kernel with args */ 0: jmp 0b +#ifdef COMPAT_FREEBSD4 + ALIGN_TEXT +freebsd4_sigcode: + call *SIGF_HANDLER(%esp) /* call signal handler */ + lea SIGF_UC(%esp),%eax /* get ucontext_t */ + pushl %eax + testl $PSL_VM,UC4_EFLAGS(%eax) + jne 9f + movl UC4_GS(%eax),%gs /* restore %gs */ +9: + movl $344,%eax /* 4.x SYS_sigreturn */ + pushl %eax /* junk to fake return addr. */ + int $0x80 /* enter kernel with args */ +0: jmp 0b +#endif + #ifdef COMPAT_43 ALIGN_TEXT osigcode: @@ -416,7 +432,7 @@ jne 9f movl SC_GS(%eax),%gs /* restore %gs */ 9: - movl $SYS_osigreturn,%eax + movl $103,%eax /* 3.x SYS_sigreturn */ pushl %eax /* junk to fake return addr. */ int $0x80 /* enter kernel with args */ 0: jmp 0b @@ -426,10 +442,16 @@ esigcode: .data - .globl szsigcode, szosigcode + .globl szsigcode szsigcode: .long esigcode-sigcode +#ifdef COMPAT_FREEBSD4 + .globl szfreebsd4_sigcode +szfreebsd4_sigcode: + .long esigcode-freebsd4_sigcode +#endif #ifdef COMPAT_43 + .globl szosigcode szosigcode: .long esigcode-osigcode #endif ==== //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#22 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.543 2002/10/20 20:48:56 phk Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.545 2002/10/25 19:10:56 peter Exp $ */ #include "opt_atalk.h" @@ -165,6 +165,10 @@ #ifdef COMPAT_43 static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); #endif +#ifdef COMPAT_FREEBSD4 +static void freebsd4_sendsig(sig_t catcher, int sig, sigset_t *mask, + u_long code); +#endif static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) @@ -286,8 +290,7 @@ sigset_t *mask; u_long code; { - struct osigframe sf; - struct osigframe *fp; + struct osigframe sf, *fp; struct proc *p; struct thread *td; struct sigacts *psp; @@ -408,6 +411,129 @@ } #endif /* COMPAT_43 */ +#ifdef COMPAT_FREEBSD4 +static void +freebsd4_sendsig(catcher, sig, mask, code) + sig_t catcher; + int sig; + sigset_t *mask; + u_long code; +{ + struct sigframe4 sf, *sfp; + struct proc *p; + struct thread *td; + struct sigacts *psp; + struct trapframe *regs; + int oonstack; + + td = curthread; + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); + psp = p->p_sigacts; + regs = td->td_frame; + oonstack = sigonstack(regs->tf_esp); + + /* Save user context. */ + bzero(&sf, sizeof(sf)); + sf.sf_uc.uc_sigmask = *mask; + sf.sf_uc.uc_stack = p->p_sigstk; + sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; + sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; + sf.sf_uc.uc_mcontext.mc_gs = rgs(); + bcopy(regs, &sf.sf_uc.uc_mcontext.mc_fs, sizeof(*regs)); + + /* Allocate space for the signal handler context. */ + if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + SIGISMEMBER(psp->ps_sigonstack, sig)) { + sfp = (struct sigframe4 *)(p->p_sigstk.ss_sp + + p->p_sigstk.ss_size - sizeof(struct sigframe4)); +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) + p->p_sigstk.ss_flags |= SS_ONSTACK; +#endif + } else + sfp = (struct sigframe4 *)regs->tf_esp - 1; + PROC_UNLOCK(p); + + /* Translate the signal if appropriate. */ + if (p->p_sysent->sv_sigtbl && sig <= p->p_sysent->sv_sigsize) + sig = p->p_sysent->sv_sigtbl[_SIG_IDX(sig)]; + + /* Build the argument list for the signal handler. */ + sf.sf_signum = sig; + sf.sf_ucontext = (register_t)&sfp->sf_uc; + PROC_LOCK(p); + if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) { + /* Signal handler installed with SA_SIGINFO. */ + sf.sf_siginfo = (register_t)&sfp->sf_si; + sf.sf_ahu.sf_action = (__siginfohandler_t *)catcher; + + /* Fill in POSIX parts */ + sf.sf_si.si_signo = sig; + sf.sf_si.si_code = code; + sf.sf_si.si_addr = (void *)regs->tf_err; + sf.sf_si.si_pid = p->p_pid; + sf.sf_si.si_uid = p->p_ucred->cr_uid; + } else { + /* Old FreeBSD-style arguments. */ + sf.sf_siginfo = code; + sf.sf_addr = regs->tf_err; + sf.sf_ahu.sf_handler = catcher; + } + PROC_UNLOCK(p); + + /* >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 12:37:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A0D437BD37; Fri, 25 Oct 2002 12:36:47 -0700 (PDT) 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 C722E37BD36 for ; Fri, 25 Oct 2002 12:36:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9D93D43E6A for ; Fri, 25 Oct 2002 12:36:45 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PJZtmV022616 for ; Fri, 25 Oct 2002 12:35:55 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PJZsVf022608 for perforce@freebsd.org; Fri, 25 Oct 2002 12:35:54 -0700 (PDT) Date: Fri, 25 Oct 2002 12:35:54 -0700 (PDT) Message-Id: <200210251935.g9PJZsVf022608@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 Subject: PERFORCE change 20149 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20149 Change 20149 by rwatson@rwatson_tislabs on 2002/10/25 12:35:32 Integ Peter's ABI fixes. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/locore.s#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/md_var.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/sigframe.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/signal.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/ucontext.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_signal.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#39 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/genassym.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/locore.s#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/md_var.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/sigframe.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/signal.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/ucontext.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/npx.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/sigframe.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/signal.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/kern/init_sysent.c#42 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.c#41 edit .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#39 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_tun.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/include/signal.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/machdep.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/signal.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/tick.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/iommu.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/machdep.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/tick.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/sys/_sigset.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/sys/signal.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/sys/signalvar.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscall.h#42 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscall.mk#41 edit .. //depot/projects/trustedbsd/mac/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/sys/sysproto.h#43 edit .. //depot/projects/trustedbsd/mac/sys/sys/ucontext.h#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#18 integrate Differences ... ==== //depot/projects/trustedbsd/mac/lib/libc/net/getaddrinfo.c#9 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.35 2002/10/25 16:24:28 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.36 2002/10/25 17:07:02 ume Exp $"); #include "namespace.h" #include @@ -217,14 +217,14 @@ static const struct afd *find_afd(int); static int addrconfig(struct addrinfo *); #ifdef INET6 -static int ip6_str2scopeid(char *, struct sockaddr_in6 *); +static int ip6_str2scopeid(char *, struct sockaddr_in6 *, u_int32_t *); #endif static struct addrinfo *getanswer(const querybuf *, int, const char *, int, const struct addrinfo *); +static int _dns_getaddrinfo(void *, void *, va_list); static void _sethtent(void); static void _endhtent(void); -static int _dns_getaddrinfo(void *, void *, va_list); static struct addrinfo *_gethtent(const char *, const struct addrinfo *); static int _files_getaddrinfo(void *, void *, va_list); #ifdef YP @@ -346,8 +346,9 @@ if (*p == '\0') return NO; ep = NULL; + errno = 0; (void)strtoul(p, &ep, 10); - if (ep && *ep == '\0') + if (errno == 0 && ep && *ep == '\0') return YES; else return NO; @@ -822,13 +823,13 @@ error = explore_numeric(pai, addr, servname, res); if (error == 0) { - int scopeid; + u_int32_t scopeid; for (cur = *res; cur; cur = cur->ai_next) { if (cur->ai_family != AF_INET6) continue; sin6 = (struct sockaddr_in6 *)(void *)cur->ai_addr; - if ((scopeid = ip6_str2scopeid(scope, sin6)) == -1) { + if (ip6_str2scopeid(scope, sin6, &scopeid) == -1) { free(hostname2); return(EAI_NODATA); /* XXX: is return OK? */ } @@ -1080,14 +1081,17 @@ #ifdef INET6 /* convert a string to a scope identifier. XXX: IPv6 specific */ static int -ip6_str2scopeid(scope, sin6) +ip6_str2scopeid(scope, sin6, scopeid) char *scope; struct sockaddr_in6 *sin6; + u_int32_t *scopeid; { - int scopeid; - struct in6_addr *a6 = &sin6->sin6_addr; + u_long lscopeid; + struct in6_addr *a6; char *ep; + a6 = &sin6->sin6_addr; + /* empty scopeid portion is invalid */ if (*scope == '\0') return -1; @@ -1098,10 +1102,10 @@ * and interfaces, so we simply use interface indices for * like-local scopes. */ - scopeid = if_nametoindex(scope); - if (scopeid == 0) + *scopeid = if_nametoindex(scope); + if (*scopeid == 0) goto trynumeric; - return(scopeid); + return 0; } /* still unclear about literal, allow numeric only - placeholder */ @@ -1114,9 +1118,11 @@ /* try to convert to a numeric id as a last resort */ trynumeric: - scopeid = (int)strtoul(scope, &ep, 10); - if (*ep == '\0') - return scopeid; + errno = 0; + lscopeid = strtoul(scope, &ep, 10); + *scopeid = (u_int32_t)(lscopeid & 0xffffffffUL); + if (errno == 0 && ep && *ep == '\0' && *scopeid == lscopeid) + return 0; else return -1; } @@ -1447,6 +1453,7 @@ q.answer = buf->buf; q.anslen = sizeof(buf->buf); q.next = &q2; + q2.name = name; q2.qclass = C_IN; q2.qtype = T_A; q2.answer = buf2->buf; ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/locore.s#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/locore.s,v 1.21 2002/02/07 20:58:42 julian Exp $ + * $FreeBSD: src/sys/alpha/alpha/locore.s,v 1.22 2002/10/25 19:10:55 peter Exp $ */ /* @@ -53,6 +53,8 @@ * rights to redistribute these changes. */ +#include "opt_compat.h" + #include #include #include @@ -190,15 +192,55 @@ jsr ra, (t12) /* call the signal handler (t12==pv) */ ldq a0, 0(sp) /* get the sigcontext pointer */ lda sp, 16(sp) - CALLSYS_NOERROR(sigreturn) /* and call sigreturn() with it. */ + ldiq v0, SYS_sigreturn + call_pal PAL_OSF1_callsys /* and call sigreturn() with it. */ mov v0, a0 /* if that failed, get error code */ - CALLSYS_NOERROR(exit) /* and call exit() with it. */ -XNESTED(esigcode,0) + ldiq v0, SYS_exit + call_pal PAL_OSF1_callsys /* and call exit() with it. */ END(sigcode) +#ifdef COMPAT_43 +NESTED(osigcode,0,0,ra,0,0) + lda sp, -16(sp) /* save the sigcontext pointer */ + stq a2, 0(sp) + jsr ra, (t12) /* call the signal handler (t12==pv) */ + ldq a0, 0(sp) /* get the sigcontext pointer */ + lda sp, 16(sp) + ldiq v0, 103 /* Old 3.x SYS_sigreturn */ + call_pal PAL_OSF1_callsys /* and call sigreturn() with it. */ + mov v0, a0 /* if that failed, get error code */ + ldiq v0, SYS_exit + call_pal PAL_OSF1_callsys /* and call exit() with it. */ + END(osigcode) +#endif + +#ifdef COMPAT_FREEBSD4 +NESTED(freebsd4_sigcode,0,0,ra,0,0) + lda sp, -16(sp) /* save the sigcontext pointer */ + stq a2, 0(sp) + jsr ra, (t12) /* call the signal handler (t12==pv) */ + ldq a0, 0(sp) /* get the sigcontext pointer */ + lda sp, 16(sp) + ldiq v0, 344 /* Old 4.x SYS_sigreturn */ + call_pal PAL_OSF1_callsys /* and call sigreturn() with it. */ + mov v0, a0 /* if that failed, get error code */ + ldiq v0, SYS_exit + call_pal PAL_OSF1_callsys /* and call exit() with it. */ + END(freebsd4_sigcode) +#endif +EXPORT(esigcode) /* end of all sigcode */ + .data - EXPORT(szsigcode) - .quad esigcode-sigcode +EXPORT(szsigcode) + .long esigcode-sigcode +#ifdef COMPAT_43 +EXPORT(szosigcode) + .long esigcode-osigcode +#endif +#ifdef COMPAT_FREEBSD4 +EXPORT(szfreebsd4_sigcode) + .long esigcode-freebsd4_sigcode +#endif .text /**************************************************************************/ ==== //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#14 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.186 2002/09/20 17:50:50 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.187 2002/10/25 19:10:55 peter Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -232,6 +232,10 @@ #ifdef COMPAT_43 void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); #endif +#ifdef COMPAT_FREEBSD4 +static void freebsd4_sendsig(sig_t catcher, int sig, sigset_t *mask, + u_long code); +#endif static void identifycpu(void); @@ -1250,7 +1254,7 @@ /* * Set up the registers to return to sigcode. */ - frame->tf_regs[FRAME_PC] = PS_STRINGS - (esigcode - sigcode); + frame->tf_regs[FRAME_PC] = PS_STRINGS - szosigcode; frame->tf_regs[FRAME_A0] = sig; frame->tf_regs[FRAME_FLAGS] = 0; /* full restore */ PROC_LOCK(p); @@ -1264,6 +1268,121 @@ } #endif +#ifdef COMPAT_FREEBSD4 +static void +freebsd4_sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) +{ + struct proc *p; + struct thread *td; + struct trapframe *frame; + struct sigacts *psp; + struct sigframe4 sf, *sfp; + int oonstack, rndfsize; + + td = curthread; + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); + psp = p->p_sigacts; + + frame = td->td_frame; + oonstack = sigonstack(alpha_pal_rdusp()); + rndfsize = ((sizeof(sf) + 15) / 16) * 16; + + /* save user context */ + bzero(&sf, sizeof(sf)); + sf.sf_uc.uc_sigmask = *mask; + sf.sf_uc.uc_stack = p->p_sigstk; + sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; + sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; + + fill_regs(td, (struct reg *)sf.sf_uc.uc_mcontext.mc_regs); + sf.sf_uc.uc_mcontext.mc_regs[R_SP] = alpha_pal_rdusp(); + sf.sf_uc.uc_mcontext.mc_regs[R_ZERO] = 0xACEDBADE; /* magic number */ + sf.sf_uc.uc_mcontext.mc_regs[R_PS] = frame->tf_regs[FRAME_PS]; + sf.sf_uc.uc_mcontext.mc_regs[R_PC] = frame->tf_regs[FRAME_PC]; + sf.sf_uc.uc_mcontext.mc_regs[R_TRAPARG_A0] = + frame->tf_regs[FRAME_TRAPARG_A0]; + sf.sf_uc.uc_mcontext.mc_regs[R_TRAPARG_A1] = + frame->tf_regs[FRAME_TRAPARG_A1]; + sf.sf_uc.uc_mcontext.mc_regs[R_TRAPARG_A2] = + frame->tf_regs[FRAME_TRAPARG_A2]; + + /* + * Allocate and validate space for the signal handler + * context. Note that if the stack is in P0 space, the + * call to grow() is a nop, and the useracc() check + * will fail if the process has not already allocated + * the space with a `brk'. + */ + if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + SIGISMEMBER(psp->ps_sigonstack, sig)) { + sfp = (struct sigframe4 *)((caddr_t)p->p_sigstk.ss_sp + + p->p_sigstk.ss_size - rndfsize); +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) + p->p_sigstk.ss_flags |= SS_ONSTACK; +#endif + } else + sfp = (struct sigframe4 *)(alpha_pal_rdusp() - rndfsize); + PROC_UNLOCK(p); + + /* save the floating-point state, if necessary, then copy it. */ + alpha_fpstate_save(td, 1); + sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; + bcopy(&td->td_pcb->pcb_fp, + (struct fpreg *)sf.sf_uc.uc_mcontext.mc_fpregs, + sizeof(struct fpreg)); + sf.sf_uc.uc_mcontext.mc_fp_control = td->td_pcb->pcb_fp_control; + +#ifdef COMPAT_OSF1 + /* + * XXX Create an OSF/1-style sigcontext and associated goo. + */ +#endif + + /* + * copy the frame out to userland. + */ + if (copyout((caddr_t)&sf, (caddr_t)sfp, sizeof(sf)) != 0) { + /* + * Process has trashed its stack; give it an illegal + * instruction to halt it in its tracks. + */ + PROC_LOCK(p); + SIGACTION(p, SIGILL) = SIG_DFL; + SIGDELSET(p->p_sigignore, SIGILL); + SIGDELSET(p->p_sigcatch, SIGILL); + SIGDELSET(p->p_sigmask, SIGILL); + psignal(p, SIGILL); + return; + } + + /* + * Set up the registers to return to sigcode. + */ + frame->tf_regs[FRAME_PC] = PS_STRINGS - szfreebsd4_sigcode; + frame->tf_regs[FRAME_A0] = sig; + PROC_LOCK(p); + if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) { + frame->tf_regs[FRAME_A1] = (u_int64_t)&(sfp->sf_si); + + /* Fill in POSIX parts */ + sf.sf_si.si_signo = sig; + sf.sf_si.si_code = code; + sf.sf_si.si_addr = (void*)frame->tf_regs[FRAME_TRAPARG_A0]; + sf.sf_si.si_pid = p->p_pid; + sf.sf_si.si_uid = p->p_ucred->cr_uid; + } + else + frame->tf_regs[FRAME_A1] = code; + + frame->tf_regs[FRAME_A2] = (u_int64_t)&(sfp->sf_uc); + frame->tf_regs[FRAME_T12] = (u_int64_t)catcher; /* t12 is pv */ + frame->tf_regs[FRAME_FLAGS] = 0; /* full restore */ + alpha_pal_wrusp((unsigned long)sfp); +} +#endif /* COMPAT_FREEBSD4 */ + void sendsig(sig_t catcher, int sig, sigset_t *mask, u_long code) { @@ -1278,6 +1397,12 @@ p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); psp = p->p_sigacts; +#ifdef COMPAT_FREEBSD4 + if (SIGISMEMBER(psp->ps_freebsd4, sig)) { + freebsd4_sendsig(catcher, sig, mask, code); + return; + } +#endif #ifdef COMPAT_43 if (SIGISMEMBER(psp->ps_osigset, sig)) { osendsig(catcher, sig, mask, code); @@ -1377,7 +1502,7 @@ /* * Set up the registers to return to sigcode. */ - frame->tf_regs[FRAME_PC] = PS_STRINGS - (esigcode - sigcode); + frame->tf_regs[FRAME_PC] = PS_STRINGS - szsigcode; frame->tf_regs[FRAME_A0] = sig; PROC_LOCK(p); if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) { @@ -1419,13 +1544,13 @@ * * MPSAFE */ +#ifdef COMPAT_43 int osigreturn(struct thread *td, struct osigreturn_args /* { struct osigcontext *sigcntxp; } */ *uap) { -#ifdef COMPAT_43 struct osigcontext *scp, ksc; struct proc *p = td->td_proc; @@ -1479,10 +1604,82 @@ sizeof(struct fpreg)); td->td_pcb->pcb_fp_control = ksc.sc_fp_control; return (EJUSTRETURN); -#else /* !COMPAT_43 */ - return (ENOSYS); +} #endif /* COMPAT_43 */ + +#ifdef COMPAT_FREEBSD4 +/* + * MPSAFE + */ +int +freebsd4_sigreturn(struct thread *td, + struct freebsd4_sigreturn_args /* { + const struct ucontext4 *sigcntxp; + } */ *uap) +{ + struct ucontext4 uc; + const struct ucontext4 *ucp; + struct pcb *pcb; + unsigned long val; + struct proc *p; + int error; + + ucp = uap->sigcntxp; + pcb = td->td_pcb; + p = td->td_proc; + + /* + * Fetch the entire context structure at once for speed. + * Note that struct osigcontext is smaller than a ucontext_t, + * so even if copyin() faults, we may have actually gotten a complete + * struct osigcontext. + */ + error = copyin(ucp, &uc, sizeof(ucontext_t)); + if (error != 0) { +#ifdef COMPAT_43 + if (((struct osigcontext*)&uc)->sc_regs[R_ZERO] == 0xACEDBADE) + return osigreturn(td, (struct osigreturn_args *)uap); +#endif + return (error); + } + +#ifdef COMPAT_43 + if (((struct osigcontext*)&uc)->sc_regs[R_ZERO] == 0xACEDBADE) + return osigreturn(td, (struct osigreturn_args *)uap); +#endif + + /* + * Restore the user-supplied information + */ + set_regs(td, (struct reg *)uc.uc_mcontext.mc_regs); + val = (uc.uc_mcontext.mc_regs[R_PS] | ALPHA_PSL_USERSET) & + ~ALPHA_PSL_USERCLR; + td->td_frame->tf_regs[FRAME_PS] = val; + td->td_frame->tf_regs[FRAME_PC] = uc.uc_mcontext.mc_regs[R_PC]; + td->td_frame->tf_regs[FRAME_FLAGS] = 0; /* full restore */ + alpha_pal_wrusp(uc.uc_mcontext.mc_regs[R_SP]); + + PROC_LOCK(p); +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) + if (uc.uc_mcontext.mc_onstack & 1) + p->p_sigstk.ss_flags |= SS_ONSTACK; + else + p->p_sigstk.ss_flags &= ~SS_ONSTACK; +#endif + + p->p_sigmask = uc.uc_sigmask; + SIG_CANTMASK(p->p_sigmask); + signotify(p); + PROC_UNLOCK(p); + + /* XXX ksc.sc_ownedfp ? */ + alpha_fpstate_drop(td); + bcopy((struct fpreg *)uc.uc_mcontext.mc_fpregs, + &td->td_pcb->pcb_fp, sizeof(struct fpreg)); + td->td_pcb->pcb_fp_control = uc.uc_mcontext.mc_fp_control; + return (EJUSTRETURN); } +#endif /* COMPAT_FREEBSD4 */ /* * MPSAFE @@ -1498,6 +1695,7 @@ struct pcb *pcb; unsigned long val; struct proc *p; + int error; ucp = uap->sigcntxp; pcb = td->td_pcb; @@ -1507,21 +1705,22 @@ if (sigdebug & SDB_FOLLOW) printf("sigreturn: pid %d, scp %p\n", p->p_pid, ucp); #endif - /* * Fetch the entire context structure at once for speed. * Note that struct osigcontext is smaller than a ucontext_t, * so even if copyin() faults, we may have actually gotten a complete * struct osigcontext. + * XXX we'll *still* be getting osigcontext's here due to longjmp(3) + * brain damage. */ - if (copyin(ucp, &uc, sizeof(ucontext_t))) { + error = copyin(ucp, &uc, sizeof(ucontext_t)); + if (error != 0) { #ifdef COMPAT_43 if (((struct osigcontext*)&uc)->sc_regs[R_ZERO] == 0xACEDBADE) return osigreturn(td, (struct osigreturn_args *)uap); #endif - return (EFAULT); + return (error); } - #ifdef COMPAT_43 if (((struct osigcontext*)&uc)->sc_regs[R_ZERO] == 0xACEDBADE) return osigreturn(td, (struct osigreturn_args *)uap); ==== //depot/projects/trustedbsd/mac/sys/alpha/include/md_var.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.20 2002/08/30 04:04:34 peter Exp $ + * $FreeBSD: src/sys/alpha/include/md_var.h,v 1.21 2002/10/25 19:10:55 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -36,6 +36,12 @@ extern char sigcode[]; extern char esigcode[]; extern int szsigcode; +#ifdef COMPAT_43 +extern int szosigcode; +#endif +#ifdef COMPAT_FREEBSD4 +extern int szfreebsd4_sigcode; +#endif extern long Maxmem; extern int busdma_swi_pending; ==== //depot/projects/trustedbsd/mac/sys/alpha/include/sigframe.h#3 (text+ko) ==== @@ -25,16 +25,18 @@ * (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/alpha/include/sigframe.h,v 1.3 2002/02/17 17:40:25 deischen Exp $ + * $FreeBSD: src/sys/alpha/include/sigframe.h,v 1.4 2002/10/25 19:10:55 peter Exp $ */ #ifndef _MACHINE_SIGFRAME_H_ #define _MACHINE_SIGFRAME_H_ 1 -#ifdef _KERNEL -struct osigframe { - struct osigcontext sf_sc; - osiginfo_t sf_si; +#if defined(_KERNEL) && defined(COMPAT_FREEBSD4) +/* FreeBSD 4.x */ +struct sigframe4 { + unsigned long __spare__; + struct ucontext4 sf_uc; + siginfo_t sf_si; }; #endif ==== //depot/projects/trustedbsd/mac/sys/alpha/include/signal.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/signal.h,v 1.9 2002/10/13 00:31:46 mike Exp $ */ +/* $FreeBSD: src/sys/alpha/include/signal.h,v 1.10 2002/10/25 19:10:55 peter Exp $ */ /* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */ /* @@ -47,7 +47,7 @@ /* * Only the kernel should need these old type definitions. */ -#ifdef _KERNEL +#if defined(_KERNEL) && defined(COMPAT_43) /* * Information pushed on stack when a signal is delivered. * This is used by the kernel to restore state following @@ -58,8 +58,6 @@ * Note that sc_regs[] and sc_fpregs[]+sc_fpcr are inline * representations of 'struct reg' and 'struct fpreg', respectively. */ -typedef unsigned int osigset_t; - struct osigcontext { long sc_onstack; /* sigstack state to restore */ long sc_mask; /* signal mask to restore */ ==== //depot/projects/trustedbsd/mac/sys/alpha/include/ucontext.h#3 (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. * - * $FreeBSD: src/sys/alpha/include/ucontext.h,v 1.4 2002/01/10 02:36:30 deischen Exp $ + * $FreeBSD: src/sys/alpha/include/ucontext.h,v 1.5 2002/10/25 19:10:55 peter Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -50,4 +50,16 @@ long __spare__[6]; } mcontext_t; +#if defined(_KERNEL) && defined(COMPAT_FREEBSD4) +struct mcontext4 { + long mc_onstack; /* XXX - sigcontext compat. */ + unsigned long mc_regs[37]; + unsigned long mc_fpregs[32]; + unsigned long mc_fpcr; + unsigned long mc_fp_control; + long mc_ownedfp; + long __spare__[7]; +}; +#endif + #endif /* !_MACHINE_UCONTEXT_H_ */ ==== //depot/projects/trustedbsd/mac/sys/alpha/osf1/osf1_signal.c#8 (text+ko) ==== @@ -30,9 +30,14 @@ * (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/alpha/osf1/osf1_signal.c,v 1.22 2002/10/01 17:15:46 jmallett Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.23 2002/10/25 19:10:55 peter Exp $ */ +#include "opt_compat.h" +#ifndef COMPAT_43 +#error "COMPAT_OSF1 requires COMPAT_43" +#endif + #include #include #include @@ -101,7 +106,6 @@ #define osf1_sigismember(s, n) (*(s) & sigmask(n)) #define osf1_sigaddset(s, n) (*(s) |= sigmask(n)) - void osf1_to_bsd_sigset(oss, bss) const osf1_sigset_t *oss; @@ -747,9 +751,6 @@ return (EJUSTRETURN); } -extern int -osigstack(struct thread *td, struct osf1_osigstack_args *uap); - int osf1_osigstack(td, uap) register struct thread *td; @@ -761,5 +762,5 @@ /* uprintf("osf1_osigstack: oss = %p, nss = %p",uap->oss, uap->nss); uprintf(" stack ptr = %p\n",p->p_sigacts->ps_sigstk.ss_sp);*/ - return(osigstack(td, uap)); + return(osigstack(td, (struct osigstack_args *)uap)); } ==== //depot/projects/trustedbsd/mac/sys/conf/options#39 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.361 2002/10/24 17:21:40 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.362 2002/10/25 19:10:55 peter Exp $ # # On the handling of kernel options # @@ -77,6 +77,7 @@ COMPAT_43 opt_compat.h COMPAT_FREEBSD4 opt_compat.h COMPAT_SUNOS opt_compat.h +NO_COMPAT_FREEBSD4 opt_compat.h COMPILING_LINT opt_global.h CY_PCI_FASTINTR CONSPEED opt_comconsole.h ==== //depot/projects/trustedbsd/mac/sys/geom/geom.h#13 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom.h,v 1.34 2002/10/20 19:18:06 phk Exp $ + * $FreeBSD: src/sys/geom/geom.h,v 1.35 2002/10/25 18:42:42 phk Exp $ */ #ifndef _GEOM_GEOM_H_ @@ -192,6 +192,9 @@ } u; }; +/* geom_dev.c */ +int g_dev_print(void); + /* geom_dump.c */ void g_hexdump(void *ptr, int length); void g_trace(int level, char *, ...); ==== //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#15 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_dev.c,v 1.29 2002/10/20 20:28:24 phk Exp $ + * $FreeBSD: src/sys/geom/geom_dev.c,v 1.31 2002/10/25 18:42:42 phk Exp $ */ #include @@ -87,6 +87,20 @@ G_CLASS_INITIALIZER }; +int +g_dev_print(void) +{ + struct g_geom *gp; + + if (LIST_EMPTY(&g_dev_class.geom)) + return (0); + printf("List of GEOM disk devices:\n "); + LIST_FOREACH(gp, &g_dev_class.geom, geom) + printf(" %s", gp->name); + printf("\n"); + return (1); +} + static void g_dev_clone(void *arg __unused, char *name, int namelen __unused, dev_t *dev) { @@ -95,7 +109,6 @@ if (*dev != NODEV) return; - g_trace(G_T_TOPOLOGY, "g_dev_clone(%s)", name); g_waitidle(); /* XXX: can I drop Giant here ??? */ ==== //depot/projects/trustedbsd/mac/sys/i386/i386/genassym.c#9 (text+ko) ==== @@ -34,9 +34,10 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.129 2002/09/16 19:25:08 mini Exp $ + * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.130 2002/10/25 19:10:56 peter Exp $ */ +#include "opt_compat.h" #include "opt_kstack_pages.h" #include @@ -151,12 +152,20 @@ ASSYM(TF_CS, offsetof(struct trapframe, tf_cs)); ASSYM(TF_EFLAGS, offsetof(struct trapframe, tf_eflags)); ASSYM(SIGF_HANDLER, offsetof(struct sigframe, sf_ahu.sf_handler)); +#ifdef COMPAT_43 ASSYM(SIGF_SC, offsetof(struct osigframe, sf_siginfo.si_sc)); +#endif ASSYM(SIGF_UC, offsetof(struct sigframe, sf_uc)); +#ifdef COMPAT_43 ASSYM(SC_PS, offsetof(struct osigcontext, sc_ps)); ASSYM(SC_FS, offsetof(struct osigcontext, sc_fs)); ASSYM(SC_GS, offsetof(struct osigcontext, sc_gs)); ASSYM(SC_TRAPNO, offsetof(struct osigcontext, sc_trapno)); +#endif +#ifdef COMPAT_FREEBSD4 +ASSYM(UC4_EFLAGS, offsetof(struct ucontext4, uc_mcontext.mc_eflags)); +ASSYM(UC4_GS, offsetof(struct ucontext4, uc_mcontext.mc_gs)); +#endif ASSYM(UC_EFLAGS, offsetof(ucontext_t, uc_mcontext.mc_eflags)); ASSYM(UC_GS, offsetof(ucontext_t, uc_mcontext.mc_gs)); ASSYM(ENOENT, ENOENT); ==== //depot/projects/trustedbsd/mac/sys/i386/i386/locore.s#6 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/locore.s,v 1.159 2002/09/17 01:48:57 peter Exp $ + * $FreeBSD: src/sys/i386/i386/locore.s,v 1.160 2002/10/25 19:10:56 peter Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -406,6 +406,22 @@ int $0x80 /* enter kernel with args */ 0: jmp 0b +#ifdef COMPAT_FREEBSD4 + ALIGN_TEXT +freebsd4_sigcode: + call *SIGF_HANDLER(%esp) /* call signal handler */ + lea SIGF_UC(%esp),%eax /* get ucontext_t */ + pushl %eax + testl $PSL_VM,UC4_EFLAGS(%eax) + jne 9f + movl UC4_GS(%eax),%gs /* restore %gs */ +9: + movl $344,%eax /* 4.x SYS_sigreturn */ + pushl %eax /* junk to fake return addr. */ + int $0x80 /* enter kernel with args */ +0: jmp 0b +#endif + #ifdef COMPAT_43 ALIGN_TEXT osigcode: @@ -416,7 +432,7 @@ jne 9f movl SC_GS(%eax),%gs /* restore %gs */ 9: - movl $SYS_osigreturn,%eax + movl $103,%eax /* 3.x SYS_sigreturn */ pushl %eax /* junk to fake return addr. */ int $0x80 /* enter kernel with args */ 0: jmp 0b @@ -426,10 +442,16 @@ esigcode: .data - .globl szsigcode, szosigcode + .globl szsigcode szsigcode: .long esigcode-sigcode +#ifdef COMPAT_FREEBSD4 + .globl szfreebsd4_sigcode +szfreebsd4_sigcode: + .long esigcode-freebsd4_sigcode +#endif #ifdef COMPAT_43 + .globl szosigcode szosigcode: .long esigcode-osigcode #endif ==== //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#22 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.543 2002/10/20 20:48:56 phk Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.545 2002/10/25 19:10:56 peter Exp $ */ #include "opt_atalk.h" @@ -165,6 +165,10 @@ #ifdef COMPAT_43 static void osendsig(sig_t catcher, int sig, sigset_t *mask, u_long code); #endif +#ifdef COMPAT_FREEBSD4 +static void freebsd4_sendsig(sig_t catcher, int sig, sigset_t *mask, + u_long code); +#endif static int sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) @@ -286,8 +290,7 @@ sigset_t *mask; u_long code; { - struct osigframe sf; - struct osigframe *fp; + struct osigframe sf, *fp; struct proc *p; struct thread *td; struct sigacts *psp; @@ -408,6 +411,129 @@ } #endif /* COMPAT_43 */ +#ifdef COMPAT_FREEBSD4 +static void +freebsd4_sendsig(catcher, sig, mask, code) + sig_t catcher; + int sig; + sigset_t *mask; + u_long code; +{ + struct sigframe4 sf, *sfp; + struct proc *p; + struct thread *td; + struct sigacts *psp; + struct trapframe *regs; + int oonstack; + + td = curthread; + p = td->td_proc; + PROC_LOCK_ASSERT(p, MA_OWNED); + psp = p->p_sigacts; + regs = td->td_frame; + oonstack = sigonstack(regs->tf_esp); + + /* Save user context. */ + bzero(&sf, sizeof(sf)); + sf.sf_uc.uc_sigmask = *mask; + sf.sf_uc.uc_stack = p->p_sigstk; + sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) + ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; + sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; + sf.sf_uc.uc_mcontext.mc_gs = rgs(); + bcopy(regs, &sf.sf_uc.uc_mcontext.mc_fs, sizeof(*regs)); + + /* Allocate space for the signal handler context. */ + if ((p->p_flag & P_ALTSTACK) != 0 && !oonstack && + SIGISMEMBER(psp->ps_sigonstack, sig)) { + sfp = (struct sigframe4 *)(p->p_sigstk.ss_sp + + p->p_sigstk.ss_size - sizeof(struct sigframe4)); +#if defined(COMPAT_43) || defined(COMPAT_SUNOS) + p->p_sigstk.ss_flags |= SS_ONSTACK; +#endif + } else + sfp = (struct sigframe4 *)regs->tf_esp - 1; + PROC_UNLOCK(p); + + /* Translate the signal if appropriate. */ + if (p->p_sysent->sv_sigtbl && sig <= p->p_sysent->sv_sigsize) + sig = p->p_sysent->sv_sigtbl[_SIG_IDX(sig)]; + + /* Build the argument list for the signal handler. */ + sf.sf_signum = sig; + sf.sf_ucontext = (register_t)&sfp->sf_uc; + PROC_LOCK(p); + if (SIGISMEMBER(p->p_sigacts->ps_siginfo, sig)) { + /* Signal handler installed with SA_SIGINFO. */ + sf.sf_siginfo = (register_t)&sfp->sf_si; + sf.sf_ahu.sf_action = (__siginfohandler_t *)catcher; + + /* Fill in POSIX parts */ + sf.sf_si.si_signo = sig; + sf.sf_si.si_code = code; + sf.sf_si.si_addr = (void *)regs->tf_err; + sf.sf_si.si_pid = p->p_pid; + sf.sf_si.si_uid = p->p_ucred->cr_uid; + } else { + /* Old FreeBSD-style arguments. */ + sf.sf_siginfo = code; + sf.sf_addr = regs->tf_err; + sf.sf_ahu.sf_handler = catcher; + } + PROC_UNLOCK(p); + + /* + * If we're a vm86 process, we want to save the segment registers. + * We also change eflags to be our emulated eflags, not the actual >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 12:40:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C94BB37B407; Fri, 25 Oct 2002 12:40:52 -0700 (PDT) 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 6253B37B401 for ; Fri, 25 Oct 2002 12:40:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0942643E75 for ; Fri, 25 Oct 2002 12:40:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PJe1mV023515 for ; Fri, 25 Oct 2002 12:40:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PJe1Z7023510 for perforce@freebsd.org; Fri, 25 Oct 2002 12:40:01 -0700 (PDT) Date: Fri, 25 Oct 2002 12:40:01 -0700 (PDT) Message-Id: <200210251940.g9PJe1Z7023510@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 Subject: PERFORCE change 20151 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20151 Change 20151 by rwatson@rwatson_tislabs on 2002/10/25 12:39:28 Extraneous whitespace removal as part of merge of VFS changes to main FreeBSD tree. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#149 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#149 (text+ko) ==== @@ -173,7 +173,6 @@ struct label *direntlabel, struct vnode *vp, struct label *vnodelabel); - /* * Labeling event operations: IPC objects. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 12:52:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE7FC37B404; Fri, 25 Oct 2002 12:52:07 -0700 (PDT) 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 55D5237B401 for ; Fri, 25 Oct 2002 12:52:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0BC2A43E65 for ; Fri, 25 Oct 2002 12:52:07 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PJpGmV024349 for ; Fri, 25 Oct 2002 12:51:16 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PJpGlc024346 for perforce@freebsd.org; Fri, 25 Oct 2002 12:51:16 -0700 (PDT) Date: Fri, 25 Oct 2002 12:51:16 -0700 (PDT) Message-Id: <200210251951.g9PJpGlc024346@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 Subject: PERFORCE change 20153 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20153 Change 20153 by rwatson@rwatson_tislabs on 2002/10/25 12:51:06 Sort entry point definitions left unsorted during my VFS merge. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#193 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#193 (text+ko) ==== @@ -219,26 +219,24 @@ * Labeling event operations: file system objects, and things that * look a lot like file system objects. */ +void mac_associate_vnode_devfs(struct mount *mp, struct devfs_dirent *de, + struct vnode *vp); +int mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp); +void mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp); void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de); void mac_create_devfs_directory(char *dirname, int dirnamelen, struct devfs_dirent *de); void mac_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, struct devfs_dirent *de); void mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp); -void mac_create_vnode(struct ucred *cred, struct vnode *parent, - struct vnode *child); +int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, + struct vnode *dvp, struct vnode *vp, struct componentname *cnp); void mac_create_mount(struct ucred *cred, struct mount *mp); void mac_create_root_mount(struct ucred *cred, struct mount *mp); void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *newlabel); void mac_update_devfsdirent(struct devfs_dirent *de, struct vnode *vp); -void mac_associate_vnode_devfs(struct mount *mp, struct devfs_dirent *de, - struct vnode *vp); -int mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp); -void mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp); -int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, - struct vnode *dvp, struct vnode *vp, struct componentname *cnp); /* * Labeling event operations: IPC objects. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 12:53:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05FAA37B404; Fri, 25 Oct 2002 12:53:10 -0700 (PDT) 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 8E4D037B401 for ; Fri, 25 Oct 2002 12:53:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E7FF43E3B for ; Fri, 25 Oct 2002 12:53:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PJqImV024408 for ; Fri, 25 Oct 2002 12:52:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PJqITV024405 for perforce@freebsd.org; Fri, 25 Oct 2002 12:52:18 -0700 (PDT) Date: Fri, 25 Oct 2002 12:52:18 -0700 (PDT) Message-Id: <200210251952.g9PJqITV024405@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 Subject: PERFORCE change 20154 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20154 Change 20154 by rwatson@rwatson_tislabs on 2002/10/25 12:52:10 Extraneous whitespace. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#194 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#194 (text+ko) ==== @@ -237,7 +237,6 @@ struct label *newlabel); void mac_update_devfsdirent(struct devfs_dirent *de, struct vnode *vp); - /* * Labeling event operations: IPC objects. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 13:35: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C93537B404; Fri, 25 Oct 2002 13:35:02 -0700 (PDT) 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 23EB837B401 for ; Fri, 25 Oct 2002 13:35:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D375343E65 for ; Fri, 25 Oct 2002 13:35:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PKYBmV027238 for ; Fri, 25 Oct 2002 13:34:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PKYA9f027235 for perforce@freebsd.org; Fri, 25 Oct 2002 13:34:10 -0700 (PDT) Date: Fri, 25 Oct 2002 13:34:10 -0700 (PDT) Message-Id: <200210252034.g9PKYA9f027235@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 Subject: PERFORCE change 20157 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20157 Change 20157 by rwatson@rwatson_tislabs on 2002/10/25 13:33:24 More sorting. Affected files ... .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#195 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#195 (text+ko) ==== @@ -199,6 +199,8 @@ void mac_init_mount(struct mount *); void mac_init_proc(struct proc *); void mac_init_vnode(struct vnode *); +void mac_init_vnode_label(struct label *); +void mac_copy_vnode_label(struct label *, struct label *label); void mac_destroy_bpfdesc(struct bpf_d *); void mac_destroy_cred(struct ucred *); void mac_destroy_devfsdirent(struct devfs_dirent *); @@ -210,9 +212,6 @@ void mac_destroy_mbuf(struct mbuf *); void mac_destroy_mount(struct mount *); void mac_destroy_vnode(struct vnode *); -/* XXXMAC: shouldn't be exported? */ -void mac_init_vnode_label(struct label *); -void mac_copy_vnode_label(struct label *, struct label *label); void mac_destroy_vnode_label(struct label *); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 15: 8: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E382B37B404; Fri, 25 Oct 2002 15:08:01 -0700 (PDT) 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 6313637B401 for ; Fri, 25 Oct 2002 15:08:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3AE743E42 for ; Fri, 25 Oct 2002 15:08:00 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PM7AmV034050 for ; Fri, 25 Oct 2002 15:07:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PM79mv034047 for perforce@freebsd.org; Fri, 25 Oct 2002 15:07:09 -0700 (PDT) Date: Fri, 25 Oct 2002 15:07:09 -0700 (PDT) Message-Id: <200210252207.g9PM79mv034047@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 Subject: PERFORCE change 20165 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20165 Change 20165 by rwatson@rwatson_tislabs on 2002/10/25 15:06:33 Remove whitespace to prep for merge. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#330 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#330 (text+ko) ==== @@ -3243,7 +3243,6 @@ return (error); buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac->m_string, buffer, mac->m_buflen, NULL); if (error) { free(buffer, M_MACTEMP); @@ -3298,7 +3297,6 @@ return (error); elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL); if (error) { free(elements, M_MACTEMP); @@ -3306,7 +3304,6 @@ } buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - error = mac_externalize_socket_label(&so->so_label, elements, buffer, mac->m_buflen, M_WAITOK); if (error == 0) @@ -3330,7 +3327,6 @@ return (error); elements = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac->m_string, elements, mac->m_buflen, NULL); if (error) { free(elements, M_MACTEMP); @@ -3448,7 +3444,6 @@ return (error); elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL); if (error) { free(elements, M_MACTEMP); @@ -3457,7 +3452,6 @@ } buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - error = mac_externalize_cred_label(&tcred->cr_label, elements, buffer, mac.m_buflen, M_WAITOK); if (error == 0) @@ -3488,7 +3482,6 @@ return (error); elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL); if (error) { free(elements, M_MACTEMP); @@ -3496,7 +3489,6 @@ } buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - error = mac_externalize_cred_label(&td->td_ucred->cr_label, elements, buffer, mac.m_buflen, M_WAITOK); if (error == 0) @@ -3529,7 +3521,6 @@ return (error); buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL); if (error) { free(buffer, M_MACTEMP); @@ -3607,7 +3598,6 @@ return (error); elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL); if (error) { free(elements, M_MACTEMP); @@ -3615,7 +3605,6 @@ } buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - mtx_lock(&Giant); /* VFS */ error = fget(td, SCARG(uap, fd), &fp); if (error) @@ -3699,7 +3688,6 @@ return (error); elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL); if (error) { free(elements, M_MACTEMP); @@ -3757,7 +3745,6 @@ return (error); elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL); if (error) { free(elements, M_MACTEMP); @@ -3818,7 +3805,6 @@ return (error); buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL); if (error) { free(buffer, M_MACTEMP); @@ -3905,7 +3891,6 @@ return (error); buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL); if (error) { free(buffer, M_MACTEMP); @@ -3962,7 +3947,6 @@ return (error); buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL); if (error) { free(buffer, M_MACTEMP); @@ -4047,7 +4031,6 @@ return (error); buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL); if (error) { free(buffer, M_MACTEMP); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 15:15:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E09D637B401; Fri, 25 Oct 2002 15:15:11 -0700 (PDT) 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 602D137B406 for ; Fri, 25 Oct 2002 15:15:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14E2E43E3B for ; Fri, 25 Oct 2002 15:15:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9PMEKmV034734 for ; Fri, 25 Oct 2002 15:14:20 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9PMEJgx034731 for perforce@freebsd.org; Fri, 25 Oct 2002 15:14:19 -0700 (PDT) Date: Fri, 25 Oct 2002 15:14:19 -0700 (PDT) Message-Id: <200210252214.g9PMEJgx034731@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 Subject: PERFORCE change 20167 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20167 Change 20167 by rwatson@rwatson_tislabs on 2002/10/25 15:13:29 More vertical whitespace compression for merge. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#331 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#331 (text+ko) ==== @@ -3121,7 +3121,6 @@ return (error); elements = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac.m_string, elements, mac.m_buflen, NULL); if (error) { free(elements, M_MACTEMP); @@ -3129,7 +3128,6 @@ } buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - error = mac_externalize_ifnet_label(&ifnet->if_label, elements, buffer, mac.m_buflen, M_WAITOK); if (error == 0) @@ -3159,7 +3157,6 @@ return (error); buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK); - error = copyinstr(mac.m_string, buffer, mac.m_buflen, NULL); if (error) { free(buffer, M_MACTEMP); @@ -3695,7 +3692,6 @@ } buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - mtx_lock(&Giant); /* VFS */ NDINIT(&nd, LOOKUP, LOCKLEAF | FOLLOW, UIO_USERSPACE, uap->path_p, td); @@ -3705,7 +3701,6 @@ mac_init_vnode_label(&intlabel); mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel); - error = mac_externalize_vnode_label(&intlabel, elements, buffer, mac.m_buflen, M_WAITOK); @@ -3752,7 +3747,6 @@ } buffer = malloc(mac.m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - mtx_lock(&Giant); /* VFS */ NDINIT(&nd, LOOKUP, LOCKLEAF | NOFOLLOW, UIO_USERSPACE, uap->path_p, td); @@ -3762,10 +3756,8 @@ mac_init_vnode_label(&intlabel); mac_copy_vnode_label(&nd.ni_vp->v_label, &intlabel); - error = mac_externalize_vnode_label(&intlabel, elements, buffer, mac.m_buflen, M_WAITOK); - NDFREE(&nd, 0); mac_destroy_vnode_label(&intlabel); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 19:43:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36F3937B404; Fri, 25 Oct 2002 19:43:39 -0700 (PDT) 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 C29AB37B401 for ; Fri, 25 Oct 2002 19:43:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67A2E43E42 for ; Fri, 25 Oct 2002 19:43:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9Q2gkmV051917 for ; Fri, 25 Oct 2002 19:42:46 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9Q2gkk9051914 for perforce@freebsd.org; Fri, 25 Oct 2002 19:42:46 -0700 (PDT) Date: Fri, 25 Oct 2002 19:42:46 -0700 (PDT) Message-Id: <200210260242.g9Q2gkk9051914@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 Subject: PERFORCE change 20173 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20173 Change 20173 by rwatson@rwatson_tislabs on 2002/10/25 19:42:40 _POSIX_MAC_PRESENT was renamed. Affected files ... .. //depot/projects/trustedbsd/mac/usr.bin/login/login.c#24 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.bin/login/login.c#24 (text+ko) ==== @@ -423,7 +423,7 @@ int error; if (mac_from_text(&label, label_string) == 0) { - if (pathconf(ttyn, _POSIX_MAC_PRESENT) > 0 && + if (pathconf(ttyn, _PC_MAC_PRESENT) > 0 && mac_set_file(ttyn, label) == -1) syslog(LOG_WARNING, "mac_set_file(%s): warning: %m", To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 20: 8:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0836037B404; Fri, 25 Oct 2002 20:08:10 -0700 (PDT) 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 949D637B401 for ; Fri, 25 Oct 2002 20:08:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C5B143E3B for ; Fri, 25 Oct 2002 20:08:09 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9Q37HmV053902 for ; Fri, 25 Oct 2002 20:07:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9Q37GF8053899 for perforce@freebsd.org; Fri, 25 Oct 2002 20:07:16 -0700 (PDT) Date: Fri, 25 Oct 2002 20:07:16 -0700 (PDT) Message-Id: <200210260307.g9Q37GF8053899@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 Subject: PERFORCE change 20175 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20175 Change 20175 by rwatson@rwatson_tislabs on 2002/10/25 20:07:01 execve_mac was renamed. Affected files ... .. //depot/projects/trustedbsd/mac/sys/ia64/ia32/syscalls.master#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/ia64/ia32/syscalls.master#8 (text+ko) ==== @@ -585,7 +585,7 @@ 412 UNIMPL BSD extattr_set_link 413 UNIMPL BSD extattr_get_link 414 UNIMPL BSD extattr_delete_link -415 UNIMPL BSD execve_mac +415 UNIMPL BSD __execve_mac 416 UNIMPL BSD newsigreturn 417 UNIMPL BSD newsigaction 418 UNIMPL BSD __xstat To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 20:14:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2C6237B404; Fri, 25 Oct 2002 20:14:18 -0700 (PDT) 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 4AC0E37B401 for ; Fri, 25 Oct 2002 20:14:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5C1943E4A for ; Fri, 25 Oct 2002 20:14:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9Q3DPmV054515 for ; Fri, 25 Oct 2002 20:13:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9Q3DPF2054512 for perforce@freebsd.org; Fri, 25 Oct 2002 20:13:25 -0700 (PDT) Date: Fri, 25 Oct 2002 20:13:25 -0700 (PDT) Message-Id: <200210260313.g9Q3DPF2054512@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 Subject: PERFORCE change 20176 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20176 Change 20176 by rwatson@rwatson_curry on 2002/10/25 20:13:22 We now don't permit the multilabel flag to change on file systems once they are mounted, for cache coherency reasons. Remove the hack to change the flag under some circumstances. Affected files ... .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#22 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#22 (text+ko) ==== @@ -41,13 +41,11 @@ * Support for filesystem extended attribute: UFS-specific support functions. */ -#include "opt_mac.h" #include "opt_ufs.h" #include #include #include -#include #include #include #include @@ -687,15 +685,6 @@ if (!uele) return (ENOATTR); -#ifdef MAC - /* - * Hack to disable MAC operations as specified by the mnt_flag - * if system/freebsd.mac is disabled. - */ - if (attrnamespace == FREEBSD_MAC_EXTATTR_NAMESPACE && - strcmp(attrname, FREEBSD_MAC_EXTATTR_NAME) == 0) - ump->um_mountp->mnt_flag &= ~MNT_MULTILABEL; -#endif /* MAC */ LIST_REMOVE(uele, uele_entries); ASSERT_VOP_LOCKED(uele->uele_backing_vnode, "ufs_extattr_disable"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Oct 25 20:15:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 579A237B404; Fri, 25 Oct 2002 20:15:20 -0700 (PDT) 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 063E137B401 for ; Fri, 25 Oct 2002 20:15:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A055143E3B for ; Fri, 25 Oct 2002 20:15:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9Q3ERmV054584 for ; Fri, 25 Oct 2002 20:14:27 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9Q3ERxU054581 for perforce@freebsd.org; Fri, 25 Oct 2002 20:14:27 -0700 (PDT) Date: Fri, 25 Oct 2002 20:14:27 -0700 (PDT) Message-Id: <200210260314.g9Q3ERxU054581@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 Subject: PERFORCE change 20177 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20177 Change 20177 by rwatson@rwatson_curry on 2002/10/25 20:13:33 Remove dup include. Affected files ... .. //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#27 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/ufs/ffs/ffs_vfsops.c#27 (text+ko) ==== @@ -36,7 +36,6 @@ #include "opt_mac.h" #include "opt_quota.h" -#include "opt_mac.h" #include "opt_ufs.h" #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Oct 26 13:58:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 18F4C37B404; Sat, 26 Oct 2002 13:58:03 -0700 (PDT) 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 B641937B401 for ; Sat, 26 Oct 2002 13:58:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9755843E42 for ; Sat, 26 Oct 2002 13:58:01 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9QKv5mV022709 for ; Sat, 26 Oct 2002 13:57:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9QKv1gG022706 for perforce@freebsd.org; Sat, 26 Oct 2002 13:57:01 -0700 (PDT) Date: Sat, 26 Oct 2002 13:57:01 -0700 (PDT) Message-Id: <200210262057.g9QKv1gG022706@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 Subject: PERFORCE change 20202 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20202 Change 20202 by rwatson@rwatson_tislabs on 2002/10/26 13:56:48 Integ the TrustedBSD base tree: loop back the VFS changes from MAC. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#26 integrate .. //depot/projects/trustedbsd/base/UPDATING#20 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/c-format.c#6 integrate .. //depot/projects/trustedbsd/base/etc/dm.conf#3 delete .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#10 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#19 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ipnat#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/sysctl#6 integrate .. //depot/projects/trustedbsd/base/include/pthread_np.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/gethostbydns.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/man/pthread_attr_get_np.3#1 branch .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/Makefile.inc#4 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_attr_get_np.c#1 branch .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_create.c#5 integrate .. //depot/projects/trustedbsd/base/release/Makefile#27 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/Makefile#2 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/early-adopter/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/readme/article.sgml#8 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#48 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#5 integrate .. //depot/projects/trustedbsd/base/release/doc/share/examples/Makefile.relnotesng#4 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#13 integrate .. //depot/projects/trustedbsd/base/share/colldef/Makefile#9 integrate .. //depot/projects/trustedbsd/base/share/colldef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/base/share/colldef/map.ISO8859-13#1 branch .. //depot/projects/trustedbsd/base/share/mklocale/Makefile#8 integrate .. //depot/projects/trustedbsd/base/share/mklocale/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/base/share/monetdef/Makefile#9 integrate .. //depot/projects/trustedbsd/base/share/monetdef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/base/share/msgdef/Makefile#9 integrate .. //depot/projects/trustedbsd/base/share/msgdef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/base/share/numericdef/Makefile#9 integrate .. //depot/projects/trustedbsd/base/share/numericdef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/base/share/timedef/Makefile#8 integrate .. //depot/projects/trustedbsd/base/share/timedef/lt_LT.ISO8859-13.src#1 branch .. //depot/projects/trustedbsd/base/sys/alpha/include/alpha_cpu.h#2 integrate .. //depot/projects/trustedbsd/base/sys/alpha/include/atomic.h#4 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#45 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#19 integrate .. //depot/projects/trustedbsd/base/sys/ddb/db_examine.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/rc/rc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/tx/if_tx.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/tx/if_txvar.h#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/devfs/devfs_vnops.c#18 integrate .. //depot/projects/trustedbsd/base/sys/fs/fdescfs/fdesc_vnops.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs.c#7 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs.h#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_mac.c#2 delete .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs.h#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/pseudofs/pseudofs_vnops.c#13 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#15 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_kern.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mbr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_pc98.c#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/proc.h#7 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sysctl.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_trap.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#30 integrate .. //depot/projects/trustedbsd/base/sys/modules/procfs/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/pc98/i386/machdep.c#22 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#15 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#14 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#9 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/conf/GENERIC#23 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.S#10 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#18 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/proc.h#28 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vfsops.c#19 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ufs/ufs_vnops.c#22 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-btowc.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbrlen.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbrtowc.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbsrtowcs.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wcrtomb.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wcsrtombs.c#1 branch Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#26 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.306 2002/10/22 08:30:31 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.307 2002/10/25 19:15:29 peter Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -356,6 +356,13 @@ false; \ fi .endif +.if ${TARGET_ARCH} == ${MACHINE_ARCH} && \ + (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/") + @echo "Checking to see if your booted kernel is fresh enough.." + ${.OBJDIR}/bin/sh/sh -c \ + 'echo "Testing installed kernel for new sigaction(2) syscall"' + @echo "Seems ok.." +.endif # # distributeworld ==== //depot/projects/trustedbsd/base/UPDATING#20 (text+ko) ==== @@ -17,10 +17,13 @@ developers choose to disable these features on build machines to maximize performance. - In addition, IDE write caching is currently disabled by default - due to on-going concerns about disk write order and file system - integrity. Re-enabling write caching can substantially improve - performance. +20021024: + Old, compatibility slices have been removed in GEOM kernels. This + means that you will have to update your /etc/fstab to not use + disk devices of the form /dev/ad0a. Instead, you now must + specify /dev/ad0s1a, or whatever slice your FreeBSD partition + really is on. The old device names have gone away, so if you + use them anywhere else, you must also adjust those uses. 20021023: Alphas with kernels from between 20020830 and 20021023 and/or @@ -998,21 +1001,35 @@ To rebuild everything and install it on the current system. ----------------------------------------------------------- - make world - Build a new kernel, see above. + # Note: sometimes if you are running current you gotta do more than + # is listed here if you are upgrading from a really old current. + + [7] + make buildworld + make buildkernel KERNCONF=YOUR_KERNEL_HERE + make installkernel KERNCONF=YOUR_KERNEL_HERE + [1] + [3] + mergemaster -p [5] + make installworld + mergemaster [4] + + To upgrade from 4.x-stable to current ------------------------------------- + [7] make buildworld make buildkernel KERNCONF=YOUR_KERNEL_HERE cp src/sys/${MACHINE_ARCH}/conf/GENERIC.hints /boot/device.hints [2] make installkernel KERNCONF=YOUR_KERNEL_HERE - reboot in single user [3] - mergemaster -p [5] + cd src/sys/boot ; make install [6] + [1] + [3] + mergemaster -p [5] rm -rf /usr/include/g++ make installworld - mergemaster [4] - [1] + mergemaster [4] Make sure that you've read the UPDATING file to understand the @@ -1058,6 +1075,23 @@ install) after the buildworld before this step if you last updated from current before 20020224 or from -stable before 20020408. + [6] 4.x boot blocks can be used to boot a 5.x system, however + it is difficult to do that at best. If you are concerned + about being able to boot 4.x if the reboot to single user + fails, then you should do something like + mv /boot /boot-4x + mkdir /boot + before this step. You may be able to then boot the 4.x boot + blocks if you catch boot2, and enter /boot-4x/loader rather than + /boot/loader. However, this step hasn't been torture tested. + + [7] Before you upgrade, please make sure that you are not using + compatibility slices. These are device names of the form, on i386 + and other architectures that use MBR slicing, /dev/ad0a without the + actual slice name. Chances are excellent that these will break. + You generally must update these entries to use the post FreeBSD + 2.x form of /dev/ad0s1a. + FORMAT: This file contains a list, in reverse chronological order, of major @@ -1091,4 +1125,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.218 2002/10/24 18:41:02 gallatin Exp $ +$FreeBSD: src/UPDATING,v 1.220 2002/10/26 06:25:11 imp Exp $ ==== //depot/projects/trustedbsd/base/contrib/gcc/c-format.c#6 (text+ko) ==== @@ -19,7 +19,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/c-format.c,v 1.5 2002/07/12 00:49:52 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/c-format.c,v 1.6 2002/10/25 19:41:32 mux Exp $ */ #include "config.h" #include "system.h" @@ -798,7 +798,7 @@ */ { "D", 1, STD_EXT, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "cR" }, { "b", 1, STD_EXT, { T89_C, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp", "" }, - { "rz", 0, STD_EXT, { T89_I, BADLEN, BADLEN, T89_L, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "i" }, + { "ry", 0, STD_EXT, { T89_I, BADLEN, BADLEN, T89_L, BADLEN, BADLEN, BADLEN, BADLEN, BADLEN }, "-wp0 +#", "i" }, { NULL, 0, 0, NOLENGTHS, NULL, NULL } }; ==== //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.91 2002/10/19 12:56:56 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.92 2002/10/25 22:00:34 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -357,6 +357,8 @@ .. la_LN.US-ASCII .. + lt_LT.ISO8859-13 + .. lt_LT.ISO8859-4 .. nl_BE.ISO8859-1 ==== //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.267 2002/10/20 11:18:56 markm Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.268 2002/10/25 22:00:34 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -453,6 +453,8 @@ .. la_LN.US-ASCII .. + lt_LT.ISO8859-13 + .. lt_LT.ISO8859-4 .. nl_BE.ISO8859-1 @@ -777,6 +779,8 @@ .. la_LN.US-ASCII .. + lt_LT.ISO8859-13 + .. lt_LT.ISO8859-4 .. nl_BE.ISO8859-1 ==== //depot/projects/trustedbsd/base/etc/rc.d/ipnat#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipnat,v 1.4 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/ipnat,v 1.5 2002/10/26 00:18:06 fenner Exp $ # # PROVIDE: ipnat @@ -36,8 +36,7 @@ { # Make sure ipfilter is loaded before continuing if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1; then - err 'ipnat requires ipfilter be loaded' - return 1 + err 1 'ipnat requires ipfilter be loaded' fi return 0 } ==== //depot/projects/trustedbsd/base/etc/rc.d/sysctl#6 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: sysctl,v 1.12 2002/04/29 12:10:23 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sysctl,v 1.10 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/sysctl,v 1.11 2002/10/25 23:02:54 fenner Exp $ # # PROVIDE: sysctl @@ -49,8 +49,8 @@ sysctl ${var} ;; esac - elif [ "$1" -eq "last" ]; then - warn "sysctl ${mib} does not exits." + elif [ "$1" = "last" ]; then + warn "sysctl ${mib} does not exist." fi ;; esac ==== //depot/projects/trustedbsd/base/include/pthread_np.h#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/pthread_np.h,v 1.13 2002/10/22 17:11:49 fjoe Exp $ + * $FreeBSD: src/include/pthread_np.h,v 1.14 2002/10/26 13:58:12 phantom Exp $ */ #ifndef _PTHREAD_NP_H_ #define _PTHREAD_NP_H_ @@ -44,6 +44,7 @@ */ __BEGIN_DECLS int pthread_attr_setcreatesuspend_np(pthread_attr_t *); +int pthread_attr_get_np(pthread_t *, pthread_attr_t *); int pthread_main_np(void); int pthread_multi_np(void); int pthread_mutexattr_getkind_np(pthread_mutexattr_t); ==== //depot/projects/trustedbsd/base/lib/libc/net/gethostbydns.c#7 (text+ko) ==== @@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.40 2002/10/03 17:25:33 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.41 2002/10/26 19:00:14 ume Exp $"); #include #include @@ -674,7 +674,7 @@ uaddr[n] & 0xf, (uaddr[n] >> 4) & 0xf)); } - strcpy(qp, "ip6.int"); + strlcat(qbuf, "ip6.arpa", sizeof(qbuf)); break; default: abort(); @@ -684,6 +684,12 @@ return NS_NOTFOUND; } n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf->buf, sizeof buf->buf); + if (n < 0 && af == AF_INET6) { + *qp = '\0'; + strlcat(qbuf, "ip6.int", sizeof(qbuf)); + n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf->buf, + sizeof buf->buf); + } if (n < 0) { free(buf); dprintf("res_query failed (%d)\n", n); ==== //depot/projects/trustedbsd/base/lib/libc_r/man/Makefile.inc#2 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/lib/libc_r/man/Makefile.inc,v 1.15 2001/07/20 04:23:09 jasone Exp $ +# $FreeBSD: src/lib/libc_r/man/Makefile.inc,v 1.16 2002/10/26 15:04:29 phantom Exp $ # POSIX thread man files .PATH: ${.CURDIR}/man MAN+= pthread_attr.3 \ + pthread_attr_get_np.3 \ pthread_cancel.3 \ pthread_cleanup_pop.3 \ pthread_cleanup_push.3 \ ==== //depot/projects/trustedbsd/base/lib/libc_r/uthread/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.33 2002/06/28 13:26:02 deischen Exp $ +# $FreeBSD: src/lib/libc_r/uthread/Makefile.inc,v 1.34 2002/10/26 13:55:35 phantom Exp $ # uthread sources .PATH: ${.CURDIR}/uthread @@ -20,6 +20,7 @@ uthread_attr_getscope.c \ uthread_attr_getstackaddr.c \ uthread_attr_getstacksize.c \ + uthread_attr_get_np.c \ uthread_attr_setcreatesuspend_np.c \ uthread_attr_setdetachstate.c \ uthread_attr_setguardsize.c \ ==== //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_create.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.34 2002/07/09 13:24:52 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_create.c,v 1.35 2002/10/26 13:47:06 phantom Exp $ */ #include #include @@ -59,7 +59,7 @@ __weak_reference(_pthread_create, pthread_create); int -_pthread_create(pthread_t * thread, const pthread_attr_t * attr, +_pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine) (void *), void *arg) { struct pthread *curthread = _get_curthread(); @@ -71,6 +71,9 @@ pthread_attr_t pattr; void *stack; + if (thread == NULL) + return(EINVAL); + /* * Locking functions in libc are required when there are * threads other than the initial thread. ==== //depot/projects/trustedbsd/base/release/Makefile#27 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.715 2002/10/24 07:35:30 nyan Exp $ +# $FreeBSD: src/release/Makefile,v 1.716 2002/10/26 04:48:55 bmah Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \ # [ RELEASETAG=tag ] @@ -124,7 +124,7 @@ AUTO_KEYBOARD_DETECT?= 0 .if !defined(NODOC) -DIST_DOCS_ARCH_INDEP= readme errata +DIST_DOCS_ARCH_INDEP= readme errata early-adopter DIST_DOCS_ARCH_DEP= installation relnotes hardware .endif @@ -640,6 +640,7 @@ cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ done @mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT ${RD}/mfsfd/stand/help/INSTALL.TXT + @mv ${RD}/mfsfd/stand/help/EARLY-ADOPTER.TXT ${RD}/mfsfd/stand/help/EARLY.TXT .endif -test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd @mkdir -p ${RD}/mfsfd/boot @@ -758,6 +759,8 @@ @cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${FD} @mv ${FD}/INSTALLATION.TXT ${FD}/INSTALL.TXT @mv ${FD}/INSTALLATION.HTM ${FD}/INSTALL.HTM + @mv ${FD}/EARLY-ADOPTER.TXT ${FD}/EARLY.TXT + @mv ${FD}/EARLY-ADOPTER.HTM ${FD}/EARLY.HTM .endif @echo "CD_VERSION = ${BUILDNAME}" > ${FD}/cdrom.inf .if !defined(NOPORTS) @@ -797,6 +800,8 @@ @cp ${RND}/${RELNOTES_LANG}/readme/docbook.css ${CD_DISC1} @mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT @mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM + @mv ${CD_DISC1}/EARLY-ADOPTER.TXT ${CD_DISC1}/EARLY.TXT + @mv ${CD_DISC1}/EARLY-ADOPTER.HTM ${CD_DISC1}/EARLY.HTM .endif .if ${TARGET} != "pc98" @echo "Setting up /boot" ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/Makefile,v 1.2 2001/04/29 21:04:58 dd Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/Makefile,v 1.3 2002/10/25 21:58:06 bmah Exp $ RELN_ROOT?= ${.CURDIR}/.. @@ -7,6 +7,7 @@ SUBDIR+= readme SUBDIR+= errata SUBDIR+= installation +SUBDIR+= early-adopter COMPAT_SYMLINK = en ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/readme/article.sgml#8 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.17 2002/03/30 17:34:31 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.18 2002/10/26 17:00:39 bmah Exp $ 2000 @@ -277,6 +277,13 @@ + EARLY.TXT: A guide for early + adopters of &os; 5.0-RELEASE. Highly recommended + reading for users new to &os; &release.branch; and/or the + 5.X series of releases. + + + RELNOTES.TXT: The release notes, showing what's new and different in &os; &release.current; compared to the previous release (&os; ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#48 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.440 2002/10/25 03:50:41 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.442 2002/10/26 17:27:35 bmah Exp $ 2000 @@ -1312,7 +1312,22 @@ The &man.geom.4; disk I/O request transformation framework has been added; this extensible framework is designed to support a wide variety of operations on I/O requests on their - way from the upper kernel to the device drivers. + way from the upper kernel to the device drivers. + + + GEOM-enabled kernels no longer support + compatability slices. This feature + (supported on the i386 and pc98 only) allowed a user to + refer to a disk partition without specifying an MBR slice + (e.g. /dev/ad0a); the kernel would + automatically find the first applicable &os; slice and use + it. On GEOM kernels, only the full partition names + (e.g. /dev/ad0s1a) are allowed when + referring to partitions within MBR slices. This + change should affect very few users. + + + A GEOM Based Disk Encryption module has been added. It provides denial of access to cold disks, with @@ -4500,53 +4515,15 @@ Upgrading from previous releases of &os; - If you're upgrading from a previous release of &os;, you - generally will have three options: - - - - Using the binary upgrade option of &man.sysinstall.8;. - This option is perhaps the quickest, although it presumes - that your installation of &os; uses no special compilation - options. - - - Performing a complete reinstall of &os;. Technically, - this is not an upgrading method, and in any case is usually less - convenient than a binary upgrade, in that it requires you to - manually backup and restore the contents of - /etc. However, it may be useful in - cases where you want (or need) to change the partitioning of - your disks. - - - From source code in /usr/src. This - route is more flexible, but requires more disk space, time, - and technical expertise. More information can be found - in the Using - make world section of the FreeBSD - Handbook. Upgrading from very old - versions of &os; may be problematic; in cases like this, it - is usually more effective to perform a binary upgrade or a - complete reinstall. - - - - - Please read the INSTALL.TXT file for more - information, preferably before beginning an - upgrade. If you are upgrading from source, please be sure to read - /usr/src/UPDATING as well. - - Finally, if you want to use one of various means to track the - -STABLE or -CURRENT branches of &os;, please be sure to consult - the -CURRENT - vs. -STABLE section of the FreeBSD - Handbook. + Users with existing &os; systems are + highly encouraged to read the Early + Adopter's Guide to &os; 5.0. This document generally has + the filename EARLY.TXT on the distribution + media, or any other place that the release notes can be found. It + offers some notes on upgrading, but more importantly, also + discusses some of the relative merits of upgrading to &os; + 5.X versus running &os; + 4.X. Upgrading &os; should, of course, only be attempted after ==== //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#5 (text+ko) ==== @@ -3,8 +3,8 @@ The FreeBSD French Documentation Project $Id: dev.sgml,v 1.3 2002/09/29 21:03:53 eagle Exp $ - $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml,v 1.4 2002/10/19 16:26:21 gioria Exp $ - Original revision: 1.106 + $FreeBSD: src/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml,v 1.5 2002/10/26 12:36:38 gioria Exp $ + Original revision: 1.111 --> + @@ -20,6 +20,13 @@
    &artheader; + + + This document is in a very preliminary state. It is + incomplete, and is almost certainly not be an accurate + reflection of reality. + + §.intro; §.proc.ia64; §.dev; ==== //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/Makefile#2 (text+ko) ==== @@ -1,8 +1,9 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.4 2002/06/03 09:58:44 nyan Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.5 2002/11/08 18:36:04 bmah Exp $ RELN_ROOT?= ${.CURDIR}/../.. SUBDIR = alpha +SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 SUBDIR+= sparc64 ==== //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#3 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -29,9 +29,9 @@ - Common Installation Problems, Q&A + Common Installation Problems for &arch.print; Architecture Users - + I go to boot from the hard disk for the first time @@ -63,14 +63,14 @@ each configured as the master on their respective IDE busses, and wish to boot &os; from the second disk. The BIOS sees these as disk 0 and disk 1, while &os; sees - them as wd0 and - wd2. + them as ad0 and + ad2. &os; is on BIOS disk 1, of type - wd and the &os; disk number is 2, so + ad and the &os; disk number is 2, so you would say: - 1:wd(2,a)kernel + 1:ad(2,a)kernel Note that if you have a slave on the primary bus, the above is not necessary (and is effectively wrong). @@ -134,16 +134,6 @@ - - - - Known Hardware Problems, Q&A - - - Please send hardware tips for this section to &a.jkh;. - - - The &man.mcd.4; driver keeps thinking that it has @@ -161,54 +151,6 @@ - &os; claims to support the 3Com PCMCIA card, but my - card isn't recognized when it's plugged into my - laptop. - - - There are a couple of possible problems. First of - all, &os; does not support multi-function cards, so if - you have a combo Ethernet/modem card (such as the 3C562), it - won't work. The default driver for the 3C589 card was - written just like all of the other drivers in &os;, and - depend on the card's own configuration data stored in NVRAM - to work. You must correctly configure &os;'s driver to - match the IRQ, port, and IOMEM stored in NVRAM. - - Unfortunately, the only program capable of reading - them is the 3COM supplied DOS program. This program must be - run on a absolutely clean system (no other drivers must be - running), and the program will whine about CARD-Services not - being found, but it will continue. This is necessary to - read the NVRAM values. You want to know the IRQ, port, and - IOMEM values (the latter is called the CIS tuple by 3COM). - The first two can be set in the program, the third is - un-settable, and can only be read. Once you have these - values, set them in UserConfig and your card will be - recognized. - - - - - &os; finds my PCMCIA network card, but no packets - appear to be sent even though it claims to be working. - - - Many PCMCIA cards have the ability to use either the - 10-Base2 (BNC) or 10-BaseT connectors for connecting to the - network. The driver is unable to auto-select - the correct connector, so you must tell it which connector - to use. In order to switch between the two connectors, the - link flags must be set. Depending on the model of the card, - or will choose the correct network connector. - You can set these in &man.sysinstall.8; by using the - Extra options to ifconfig: field in the - network setup screen. - - - - The system finds my &man.ed.4; network card, but I keep getting device timeout errors. @@ -247,84 +189,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 9 15:50:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEC3637B404; Sat, 9 Nov 2002 15:50:23 -0800 (PST) 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 8028D37B401 for ; Sat, 9 Nov 2002 15:50:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C93C43E3B for ; Sat, 9 Nov 2002 15:50:22 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gA9NmDmV022742 for ; Sat, 9 Nov 2002 15:48:13 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gA9Nm2Zf022692 for perforce@freebsd.org; Sat, 9 Nov 2002 15:48:02 -0800 (PST) Date: Sat, 9 Nov 2002 15:48:02 -0800 (PST) Message-Id: <200211092348.gA9Nm2Zf022692@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 Subject: PERFORCE change 20911 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20911 Change 20911 by rwatson@rwatson_tislabs on 2002/11/09 15:47:15 Integ the TrustedBSD MAC tree: loop back various MAC changes (AST, execlabel, mac_exec generally, etc), as well as other main tree changes. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#10 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#19 integrate .. //depot/projects/trustedbsd/mac/bin/ls/print.c#14 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#5 integrate .. //depot/projects/trustedbsd/mac/etc/namedb/named.root#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.subr#7 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile.tgt#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#21 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/acl.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_exec.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.3#10 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#9 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#16 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/write_alpha_disk.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/write_i386_disk.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/write_pc98_disk.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libfetch/fetch.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#4 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#34 integrate .. //depot/projects/trustedbsd/mac/release/alpha/dokern.sh#6 integrate .. //depot/projects/trustedbsd/mac/release/alpha/drivers.conf#8 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#28 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#44 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/share/examples/Makefile.relnotesng#5 integrate .. //depot/projects/trustedbsd/mac/release/ia64/doFS.sh#2 integrate .. //depot/projects/trustedbsd/mac/sbin/ipfw/ipfw2.c#10 integrate .. //depot/projects/trustedbsd/mac/sbin/mount_std/mount_std.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/reboot/nextboot.8#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcipher/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile.asm#2 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libcrypto/Makefile.inc#7 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libssh/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/secure/lib/libtelnet/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/fwe.4#1 branch .. //depot/projects/trustedbsd/mac/share/man/man4/rl.4#3 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/passwd.5#3 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/prom.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC#18 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/include/bus.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/tlsb/dwlpx.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/bluetooth/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/common/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/common/ng_bluetooth.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/ng_bt3c.4#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/ng_bt3c_firmware.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/ng_bt3c_var.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/TODO#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/ng_h4.4#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/ng_h4.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/ng_h4_prse.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/ng_h4_var.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/TODO#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/ng_ubt.4#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/ng_ubt.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/ng_ubt_var.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/TODO#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci.4#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_cmds.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_cmds.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_evnt.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_evnt.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_main.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_misc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_misc.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_prse.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_ulpi.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_ulpi.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_var.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_bluetooth.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_bt3c.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_btsocket.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_btsocket_hci_raw.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_btsocket_l2cap.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_h4.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_hci.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_l2cap.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_ubt.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/TODO#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap.4#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_cmds.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_cmds.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_evnt.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_evnt.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_llpi.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_llpi.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_main.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_misc.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_misc.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_prse.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_ulpi.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_ulpi.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_var.h#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/Makefile#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/TODO#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket.4#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket_hci_raw.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket_l2cap.c#1 branch .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket_l2cap_raw.c#1 branch .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#30 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#69 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.i386#21 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files.pc98#18 integrate .. //depot/projects/trustedbsd/mac/sys/conf/kmod.mk#13 integrate .. //depot/projects/trustedbsd/mac/sys/conf/majors#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/an/if_an.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/asr/asr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-all.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/atapi-tape.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/awi/awi.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bktr/bktr_core.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cardbus/cardbus_cis.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/README#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_hw.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_hw.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em_osdep.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fb/vga.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxpvar.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gfb/gfb_pci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hea/eni_buffer.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hea/eni_init.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hea/eni_receive.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hea/eni_transmit.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hea/eni_vcm.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hfa/fore_output.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hfa/fore_receive.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ida/ida.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iir/iir_pci.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mcd/mcd.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mcd/mcdvar.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/musycc/musycc.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/my/if_my.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_ngereg.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/pcfclock.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/pps.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/rc/rc.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/scd/scd.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/si/si_isa.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sio/sio_puc.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sr/if_sr.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sr/if_srregs.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tdfx/tdfx_pci.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tga/tga_pci.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ubsec/ubsec.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ufm.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/ugen.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/umass.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumdaemon.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinuminterrupt.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumrequest.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumrevive.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wds/wd7000.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/fs/hpfs/hpfs_vfsops.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/fs/smbfs/smbfs_smb.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/geom/bde/g_bde.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_bsd.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_dump.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_pc98.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_subr.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/i386/conf/NOTES#31 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/exception.s#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/genassym.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/trap.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm86.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/vm86bios.s#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/pcb.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/reg.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/include/vm86.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/kern/imgact_elf.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_lockf.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#353 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mib.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_bus.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_trap.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#43 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket2.c#28 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_aio.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_cluster.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_mount.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile#51 integrate .. //depot/projects/trustedbsd/mac/sys/modules/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/aac/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/aic/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/aic7xxx/ahc/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/apm/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/bktr/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/cam/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/drm/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/ed/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ep/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/fdc/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/fe/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/hfa/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/i2c/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/i2c/controllers/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/modules/lnc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/lomac/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/msdosfs/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/oldcard/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/pcspeaker/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/pmc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/mss/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/sound/driver/sbc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/splash/bmp/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/syscons/apm/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/syscons/daemon/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/syscons/dragon/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/syscons/snake/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/syscons/star/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/sysvipc/Makefile.inc#1 branch .. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_cm.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_cm.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_device.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_if.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_if.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_signal.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_stack.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_subr.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/atm_var.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/ipatm/ipatm_if.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/ipatm/ipatm_load.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/ipatm/ipatm_var.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/port.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/spans/spans_kxdr.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/q2110_sigaa.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/q2110_sigcpcs.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/qsaal1_sigaa.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/qsaal1_sigcpcs.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscf_uni_lower.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscf_uni_upper.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscf_uni_var.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_lower.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_pdu.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_sigaa.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_sigcpcs.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_subr.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_upper.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/sscop_var.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/unisig_decode.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/unisig_encode.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netatm/uni/unisig_var.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_bridge.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_one2many.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_parse.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ppp.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_pppoe.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_proto.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_mroute.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_output.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/netipx/ipx_ip.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/netncp/ncp_rq.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/netsmb/smb_subr.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/opencrypto/crypto.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/i386/machdep.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/pci/amd.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_mn.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/pci/intpm.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/machdep.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#182 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#65 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#145 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#104 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#80 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/ebus/ebus.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/ofw_bus.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/ver.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/isa/isa.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/pci/ofw_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/pci/ofw_pci.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/pci/psycho.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/identcpu.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/machdep.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/ofw_bus.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#168 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mchain.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mount.h#22 integrate .. //depot/projects/trustedbsd/mac/sys/sys/proc.h#31 integrate .. //depot/projects/trustedbsd/mac/sys/ufs/ufs/ufs_extattr.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_init.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#13 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-btowc.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbrtowc.c#2 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcrtomb.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/bluetooth/Makefile#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/bluetooth/btsockstat/Makefile#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/bluetooth/btsockstat/btsockstat.1#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/bluetooth/btsockstat/btsockstat.c#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/fetch/fetch.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.bin/make/var.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/yes/yes.c#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/adduser/adduser.8#5 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/Makefile#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/Makefile#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/hccontrol.8#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/hccontrol.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/hccontrol.h#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/info.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/link_control.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/link_policy.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/node.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/send_recv.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/status.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/util.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/Makefile#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/hcseriald.8#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/hcseriald.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/Makefile#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/l2cap.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/l2control.8#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/l2control.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/l2control.h#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2ping/Makefile#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2ping/l2ping.8#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2ping/l2ping.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/create/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/delete/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/file.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/url.c#1 branch .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/dist.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/syslogd/syslogd.c#17 integrate Differences ... ==== //depot/projects/trustedbsd/mac/MAINTAINERS#10 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.49 2002/10/30 04:53:58 des Exp $ +$FreeBSD: src/MAINTAINERS,v 1.50 2002/11/06 14:01:08 jmallett Exp $ subsystem login notes ----------------------------- @@ -84,3 +84,4 @@ etc/rc.* gordon Requests heads-up to help keep etc/rc.d in sync. fdc(4) joerg Just keep me informed of changes, try not to break it. sppp(4) joerg Just keep me informed of changes, try not to break it. +make make Recommends pre-commit review. ==== //depot/projects/trustedbsd/mac/bin/ls/ls.c#19 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.70 2002/10/27 17:44:32 wollman Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.71 2002/11/06 01:18:12 tjr Exp $"); #include #include @@ -330,7 +330,7 @@ f_color = 1; } #else - (void)fprintf(stderr, "Color support not compiled in.\n"); + warnx("color support not compiled in"); #endif /*COLORLS*/ #ifdef COLORLS @@ -691,9 +691,7 @@ error = mac_prepare_file_label(&label); if (error == -1) { - fprintf(stderr, "%s: %s\n", - cur->fts_name, - strerror(errno)); + warn("%s", cur->fts_name); goto label_out; } @@ -712,7 +710,7 @@ error = mac_get_link(name, label); if (error == -1) { - perror(cur->fts_name); + warn("%s", cur->fts_name); mac_free(label); goto label_out; } @@ -720,9 +718,7 @@ error = mac_to_text(label, &labelstr); if (error == -1) { - fprintf(stderr, "%s: %s\n", - cur->fts_name, - strerror(errno)); + warn("%s", cur->fts_name); mac_free(label); goto label_out; } ==== //depot/projects/trustedbsd/mac/bin/ls/print.c#14 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.62 2002/11/03 07:29:08 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.63 2002/11/06 01:18:12 tjr Exp $"); #include #include @@ -558,10 +558,9 @@ if (c[j] >= '0' && c[j] <= '7') { colors[i].num[j] = c[j] - '0'; if (!legacy_warn) { - fprintf(stderr, - "warn: LSCOLORS should use " + warnx("LSCOLORS should use " "characters a-h instead of 0-9 (" - "see the manual page)\n"); + "see the manual page)"); } legacy_warn = 1; } else if (c[j] >= 'a' && c[j] <= 'h') @@ -572,9 +571,8 @@ } else if (tolower((unsigned char)c[j] == 'x')) colors[i].num[j] = -1; else { - fprintf(stderr, - "error: invalid character '%c' in LSCOLORS" - " env var\n", c[j]); + warnx("invalid character '%c' in LSCOLORS" + " env var", c[j]); colors[i].num[j] = -1; } } ==== //depot/projects/trustedbsd/mac/crypto/openssh/sshd_config.5#5 (text+ko) ==== @@ -35,7 +35,7 @@ .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" .\" $OpenBSD: sshd_config.5,v 1.13 2002/09/16 20:12:11 stevesk Exp $ -.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.8 2002/11/05 17:24:01 des Exp $ +.\" $FreeBSD: src/crypto/openssh/sshd_config.5,v 1.9 2002/11/06 08:04:56 des Exp $ .Dd September 25, 1999 .Dt SSHD_CONFIG 5 .Os @@ -132,6 +132,11 @@ this controls the use of PAM (see .Xr pam 3 ) for authentication. +Note that this affects the effectiveness of the +.Cm PasswordAuthentication +and +.Cm PermitRootLogin +variables. The default is .Dq yes . .It Cm Ciphers @@ -426,6 +431,17 @@ Specifies whether password authentication is allowed. The default is .Dq yes . +Note that +.Cm ChallengeResponseAuthentication +is +.Dq yes , +and the PAM authentication policy for +.Nm sshd +includes +.Xr pam_unix 8 , +password authentication will be allowed through the challenge-response +mechanism regardless of the value of +.Cm PasswordAuthentication . .It Cm PermitEmptyPasswords When password authentication is allowed, it specifies whether the server allows login to accounts with empty password strings. @@ -442,6 +458,13 @@ .Dq no . The default is .Dq no . +Note that if +.Cm ChallengeResponseAuthentication +is +.Dq yes , +the root user may be allowed in with its password even if +.Cm PermitRootLogin is set to +.Dq without-password . .Pp If this option is set to .Dq without-password ==== //depot/projects/trustedbsd/mac/etc/namedb/named.root#2 (text+ko) ==== @@ -1,20 +1,20 @@ +; +; $FreeBSD: src/etc/namedb/named.root,v 1.10 2002/11/06 09:21:39 dougb Exp $ +; + ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " ; configuration file of BIND domain name servers). ; -; This file is made available by InterNIC registration services +; This file is made available by InterNIC ; under anonymous FTP as ; file /domain/named.root -; on server FTP.RS.INTERNIC.NET -; -OR- under Gopher at RS.INTERNIC.NET -; under menu InterNIC Registration Services (NSI) -; submenu InterNIC Registration Archives -; file named.root +; on server FTP.INTERNIC.NET +; +; last update: Nov 5, 2002 +; related version of root zone: 2002110501 ; -; last update: Aug 22, 1997 -; related version of root zone: 1997082200 -; $FreeBSD: src/etc/namedb/named.root,v 1.9 1999/09/13 17:09:08 peter Exp $ ; ; formerly NS.INTERNIC.NET ; @@ -61,17 +61,17 @@ . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 ; -; temporarily housed at NSI (InterNIC) +; operated by VeriSign, Inc. ; . 3600000 NS J.ROOT-SERVERS.NET. -J.ROOT-SERVERS.NET. 3600000 A 198.41.0.10 +J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 ; ; housed in LINX, operated by RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 ; -; temporarily housed at ISI (IANA) +; operated by IANA ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 198.32.64.12 ==== //depot/projects/trustedbsd/mac/etc/rc.subr#7 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.6 2002/09/12 17:27:36 gordon Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.7 2002/11/08 17:06:15 gordon Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -132,7 +132,7 @@ return 1 ;; *) - warn "\$${1} is not set properly." + warn "\$${1} is not set properly - see rc.conf(5)." return 1 ;; esac @@ -839,7 +839,7 @@ # rc_usage() { - echo -n 1>&2 "usage: $0 [fast|force](" + echo -n 1>&2 "Usage: $0 [fast|force](" _sep= for _elem in $*; do @@ -851,18 +851,6 @@ } # -# _echo prefix message -# Display message preceded by "$prefix:". Log to syslog as well. -# XXX - syslogd may not be listening (especially if this subroutine -# is called at boot before syslogd has had a chance to startup). -# -_echo() -{ - [ -x /usr/bin/logger ] && /usr/bin/logger "$0: $1: $2" - echo "$0: $1: $2" -} - -# # err exitval message # Display message to stderr and log to the syslog, and exit with exitval. # @@ -871,7 +859,10 @@ exitval=$1 shift - _echo 1>&2 "ERROR" "$*" + if [ -x /usr/bin/logger ]; then + logger "$0: ERROR: $*" + fi + echo 1>&2 "$0: ERROR: $*" exit $exitval } @@ -881,7 +872,10 @@ # warn() { - _echo 1>&2 "WARNING" "$*" + if [ -x /usr/bin/logger ]; then + logger "$0: WARNING: $*" + fi + echo 1>&2 "$0: WARNING: $*" } # @@ -890,12 +884,15 @@ # info() { - _echo "INFO" "$*" + if [ -x /usr/bin/logger ]; then + logger "$0: INFO: $*" + fi + echo "$0: INFO: $*" } # # debug message -# If debugging is enabled in rc.conf output message to stderr and syslog. +# If debugging is enabled in rc.conf output message to stderr. # BEWARE that you don't call any subroutine that itself calls this # function. # @@ -903,7 +900,7 @@ { case ${rc_debug} in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) - _echo 1>&2 "DEBUG" "$*" + echo 1>&2 "$0: DEBUG: $*" return ;; esac ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/Makefile.tgt#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.5 2002/09/12 15:56:20 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/Makefile.tgt,v 1.6 2002/11/06 07:00:59 obrien Exp $ TARGET_ARCH?= ${MACHINE_ARCH} @@ -15,4 +15,5 @@ .elif ${TARGET_ARCH} == "sparc64" GCC_CPU= sparc TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc +CFLAGS+= -DTARGET_CPU_DEFAULT=${TARGET_CPU_DEFAULT} .endif ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.11 2002/10/22 14:36:11 rwatson Exp $ +# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.12 2002/11/06 03:38:47 rwatson Exp $ MAINTAINER= rwatson@FreeBSD.org ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/acl.3#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2000, 2001 Robert N. M. Watson +.\" Copyright (c) 2000, 2001, 2002 Robert N. M. Watson .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.18 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.19 2002/11/08 15:01:28 rwatson Exp $ .\" .Dd January 28, 2000 .Dt ACL 3 @@ -179,11 +179,9 @@ routines may change over time, and as such are not documented. They are not intended to be called directly without going through the library. -.Sh IMPLEMENTATION NOTES -.Fx Ns 's -support for POSIX.1e interfaces and features is still under -development at this time. .Sh SEE ALSO +.Xr getfacl 1 , +.Xr setfacl 1 , .Xr acl_add_perm 3 , .Xr acl_calc_mask 3 , .Xr acl_clear_perms 3 , @@ -227,6 +225,12 @@ .Fx 4.0 ; .Fx 5.0 was the first version to include a complete ACL implementation based -on extended attributes. +on extended attributes for the UFS and UFS2 file systems. +.Pp +.Xr getfacl 1 +and +.Xr setfacl 1 +describe the user tools that permit direct manipulation of complete file +ACLs. .Sh AUTHORS .An Robert N M Watson ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_exec.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.3#10 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac_text.3,v 1.2 2002/10/28 23:06:04 chris Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac_text.3,v 1.4 2002/11/06 17:38:18 chris Exp $ .Dd December 21, 2001 .Dt MAC_TEXT 3 .Sh NAME @@ -42,67 +42,39 @@ .Lb libc .Sh SYNOPSIS .In sys/mac.h -.Ft mac_t -.Fn mac_from_text "const char *text_p" -.Ft "char *" -.Fn mac_to_text "mac_t label" "size_t *len_p" +.Ft int +.Fn mac_from_text "mac_t *mac" "const char *text" +.Ft int +.Fn mac_to_text "mac_t label" "char **text" .Sh DESCRIPTION The .Fn mac_from_text function converts the text representation of a label -into a -.Vt mac_t , +into the internal policy label format +.Vt ( mac_t ) +and places it in +.Fa *mac , which must later be freed with -.Xr mac_free . +.Xr mac_free 3 . +.Pp The .Fn mac_to_text -function returns -the text representation of -.Fa label -and sets -.Fa *len_p -to the length of the returned string. +function allocates storage for +.Fa *text , +which will be set to the text representation of +.Fa label . .Pp Refer to .Xr maclabel 7 for the MAC label format. .Sh RETURN VALUES -The -.Fn mac_from_text -function returns a valid -.Vt mac_t -equivalent to -the MAC label described in -.Fa text_p -upon success, and -.Dv NULL -upon failure, setting -.Va errno -to indicate the error. -.Pp -The -.Fn mac_to_text -function returns a string -containing the text representation of -.Fa label -upon success, and -.Dv NULL -upon failure, setting -.Va errno -to indicate the error. +.Rv -std mac_from_text mac_to_text .Sh COMPATIBILITY POSIX.1e does not define -a text format for text representations +a format for text representations of MAC labels. .Sh ERRORS .Bl -tag -width Er -.It Bq Er EINVAL -An invalid policy or qualifier -was specified in -.Fa text_p , -or an invalid MAC label -was specified in -.Fa label . .It Bq Er ENOMEM Insufficient memory was available to allocate internal storage. ==== //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#9 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.42 2002/11/02 12:05:16 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.43 2002/11/07 14:54:53 nyan Exp $"); #include #include @@ -275,10 +275,9 @@ break; case p_pc98: switch (type) { + case fat: + case pc98: case freebsd: - subtype = 0xc494; - /* FALLTHROUGH */ - case fat: c1 = Find_Mother_Chunk(d->chunks, offset, end, whole); break; case part: ==== //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#16 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.102 2002/11/03 01:37:08 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.105 2002/11/08 15:25:15 nyan Exp $"); #include #include @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -35,7 +34,6 @@ #include #include -#define DOSPTYP_EXTENDED 5 #ifdef DEBUG #define DPRINT(x) warn x #define DPRINTX(x) warnx x @@ -253,7 +251,6 @@ } if (platform == p_alpha && !strcmp(t, "BSD") && d->chunks->part->part == NULL) { - o = d->chunks->size; if (Add_Chunk(d, 0, d->chunks->size, name, freebsd, 0, 0, "-")) DPRINT(("Failed to add 'freebsd' chunk")); } @@ -268,15 +265,42 @@ printf("%s [%s] %jd %jd\n", t, n, (intmax_t)(off / s), (intmax_t) (len / s)); if (!strcmp(t, "SUN")) i = Add_Chunk(d, off, len, n, part, 0, 0, 0); - else if (!strncmp(t, "MBR", 3) && ty == 165) - i = Add_Chunk(d, off, len, n, freebsd, ty, 0, 0); - else if (!strncmp(t, "MBR", 3)) - i = Add_Chunk(d, off, len, n, mbr, ty, 0, 0); - else if (!strcmp(t, "BSD")) + else if (!strncmp(t, "MBR", 3)) { + switch (ty) { + case 0xa5: + i = Add_Chunk(d, off, len, n, freebsd, ty, 0, 0); + break; + case 0x01: + case 0x04: + case 0x06: + case 0x0b: + case 0x0c: + case 0x0e: + i = Add_Chunk(d, off, len, n, fat, ty, 0, 0); + break; + default: + i = Add_Chunk(d, off, len, n, mbr, ty, 0, 0); + break; + } + } else if (!strcmp(t, "BSD")) i = Add_Chunk(d, off, len, n, part, 0, 0, 0); - else if (!strcmp(t, "PC98")) - i = Add_Chunk(d, off, len, n, pc98, 0, 0, 0); - else if (!strcmp(t, "GPT")) + else if (!strcmp(t, "PC98")) { + switch (ty & 0x7f) { + case 0x14: + i = Add_Chunk(d, off, len, n, freebsd, ty, 0, 0); + break; + case 0x20: + case 0x21: + case 0x22: + case 0x23: + case 0x24: + i = Add_Chunk(d, off, len, n, fat, ty, 0, 0); + break; + default: + i = Add_Chunk(d, off, len, n, pc98, ty, 0, 0); + break; + } + } else if (!strcmp(t, "GPT")) i = Add_Chunk(d, off, len, n, ty, 0, 0, 0); else { printf("BARF %d\n", __LINE__); exit(0); } @@ -503,15 +527,17 @@ { switch (type) { - case 0: + case whole: return "whole"; - case 2: + case fat: return "fat"; - case 3: + case freebsd: switch (subtype) { case 0xc494: return "freebsd"; default: return "unknown"; } + case unused: + return "unused"; default: return "unknown"; } @@ -522,9 +548,9 @@ { >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 10 12:14:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C02537B404; Sun, 10 Nov 2002 12:14:09 -0800 (PST) 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 C888A37B401 for ; Sun, 10 Nov 2002 12:14:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 863DF43E3B for ; Sun, 10 Nov 2002 12:14:08 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAAKBtmV062928 for ; Sun, 10 Nov 2002 12:11:55 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAAKBt6h062921 for perforce@freebsd.org; Sun, 10 Nov 2002 12:11:55 -0800 (PST) Date: Sun, 10 Nov 2002 12:11:55 -0800 (PST) Message-Id: <200211102011.gAAKBt6h062921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 20929 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20929 Change 20929 by jmallett@jmallett_dalek on 2002/11/10 12:11:45 Remove the symlinking from to in userland, as it breaks mkioctl, which picks up headers twice then, unless there is a real . Affected files ... .. //depot/projects/mips/include/Makefile#7 edit Differences ... ==== //depot/projects/mips/include/Makefile#7 (text+ko) ==== @@ -101,8 +101,6 @@ cd ${.CURDIR}/../sys/${MACHINE_ARCH}/${MACHINE}; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}/usr/include/platform -.else - ln -s machine ${DESTDIR}/usr/include/platform .endif .if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include) cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \ @@ -130,8 +128,6 @@ rm -rf ${DESTDIR}/usr/include/platform .if ${MACHINE_ARCH} != ${MACHINE} && exists(../../sys/${MACHINE_ARCH}/${MACHINE}) ln -s ../../sys/${MACHINE_ARCH}/${MACHINE} ${DESTDIR}/usr/include/platform -.else - ln -s machine ${DESTDIR}/usr/include/platform .endif rm -rf ${DESTDIR}/usr/include/machine ln -s ../../sys/${MACHINE_ARCH}/include ${DESTDIR}/usr/include/machine To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 10 12:23:50 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEC3C37B408; Sun, 10 Nov 2002 12:23:24 -0800 (PST) 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 E52FC37B401 for ; Sun, 10 Nov 2002 12:23:22 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BF1343E42 for ; Sun, 10 Nov 2002 12:23:21 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAAKL8mV063915 for ; Sun, 10 Nov 2002 12:21:08 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAAKL8p8063912 for perforce@freebsd.org; Sun, 10 Nov 2002 12:21:08 -0800 (PST) Date: Sun, 10 Nov 2002 12:21:08 -0800 (PST) Message-Id: <200211102021.gAAKL8p8063912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 20931 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20931 Change 20931 by jmallett@jmallett_dalek on 2002/11/10 12:20:28 IFC. Affected files ... .. //depot/projects/mips/MAINTAINERS#4 integrate .. //depot/projects/mips/contrib/nvi/clib/getopt.c#2 integrate .. //depot/projects/mips/contrib/nvi/clib/memchr.c#2 integrate .. //depot/projects/mips/contrib/nvi/clib/memmove.c#2 integrate .. //depot/projects/mips/contrib/nvi/clib/memset.c#2 integrate .. //depot/projects/mips/contrib/nvi/clib/mkstemp.c#2 integrate .. //depot/projects/mips/contrib/nvi/clib/mmap.c#2 integrate .. //depot/projects/mips/contrib/nvi/clib/snprintf.c#2 integrate .. //depot/projects/mips/contrib/nvi/clib/strdup.c#2 integrate .. //depot/projects/mips/contrib/nvi/clib/strerror.c#2 integrate .. //depot/projects/mips/contrib/nvi/clib/strpbrk.c#2 integrate .. //depot/projects/mips/contrib/nvi/clib/strsep.c#2 integrate .. //depot/projects/mips/contrib/nvi/clib/strtol.c#2 integrate .. //depot/projects/mips/contrib/nvi/clib/strtoul.c#2 integrate .. //depot/projects/mips/contrib/nvi/clib/vsnprintf.c#2 integrate .. //depot/projects/mips/etc/defaults/rc.conf#3 integrate .. //depot/projects/mips/etc/rc.subr#3 integrate .. //depot/projects/mips/games/fortune/datfiles/gerrold.limerick#2 integrate .. //depot/projects/mips/lib/libc/locale/btowc.3#2 integrate .. //depot/projects/mips/lib/libc/locale/mbrtowc.c#2 integrate .. //depot/projects/mips/lib/libc/stdio/findfp.c#5 integrate .. //depot/projects/mips/release/Makefile.inc.docports#3 integrate .. //depot/projects/mips/release/alpha/dokern.sh#4 integrate .. //depot/projects/mips/release/alpha/drivers.conf#5 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/hardware/Makefile#3 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#5 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml#3 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/installation/Makefile#3 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#3 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml#2 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile#1 branch .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml#1 branch .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/relnotes/Makefile#3 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#5 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile#1 branch .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#1 branch .. //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#4 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml#2 integrate .. //depot/projects/mips/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/mips/share/Makefile#2 integrate .. //depot/projects/mips/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/mips/sys/alpha/alpha/machdep.c#5 integrate .. //depot/projects/mips/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/devicename.c#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_devsearch.c#2 delete .. //depot/projects/mips/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/mips/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/mips/sys/boot/sparc64/loader/Makefile#3 integrate .. //depot/projects/mips/sys/boot/sparc64/loader/main.c#3 integrate .. //depot/projects/mips/sys/boot/sparc64/loader/metadata.c#3 integrate .. //depot/projects/mips/sys/dev/mcd/mcd.c#4 integrate .. //depot/projects/mips/sys/dev/scd/scd.c#3 integrate .. //depot/projects/mips/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/mips/sys/ia64/ia64/machdep.c#5 integrate .. //depot/projects/mips/sys/kern/kern_exec.c#4 integrate .. //depot/projects/mips/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/mips/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/mips/sys/pc98/i386/machdep.c#5 integrate .. //depot/projects/mips/sys/pci/viapm.c#2 integrate .. //depot/projects/mips/sys/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/mips/sys/sys/gpt.h#3 integrate .. //depot/projects/mips/sys/vm/uma_dbg.c#2 integrate .. //depot/projects/mips/sys/vm/vm_fault.c#3 integrate .. //depot/projects/mips/sys/vm/vm_map.c#4 integrate .. //depot/projects/mips/sys/vm/vm_object.c#4 integrate .. //depot/projects/mips/sys/vm/vm_page.c#7 integrate .. //depot/projects/mips/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/mips/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/mips/tools/regression/lib/libc/locale/test-btowc.c#3 integrate .. //depot/projects/mips/tools/regression/lib/libc/locale/test-mbrtowc.c#3 integrate .. //depot/projects/mips/usr.bin/Makefile#4 integrate .. //depot/projects/mips/usr.bin/truss/alpha-fbsd.c#2 integrate .. //depot/projects/mips/usr.bin/truss/extern.h#2 integrate .. //depot/projects/mips/usr.bin/truss/i386-fbsd.c#2 integrate .. //depot/projects/mips/usr.bin/truss/i386-linux.c#2 integrate .. //depot/projects/mips/usr.bin/truss/ia64-fbsd.c#1 branch .. //depot/projects/mips/usr.bin/truss/main.c#3 integrate .. //depot/projects/mips/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/mips/usr.bin/truss/syscalls.c#3 integrate .. //depot/projects/mips/usr.bin/whois/whois.1#2 integrate .. //depot/projects/mips/usr.bin/whois/whois.c#2 integrate .. //depot/projects/mips/usr.bin/yes/yes.c#3 integrate Differences ... ==== //depot/projects/mips/MAINTAINERS#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.50 2002/11/06 14:01:08 jmallett Exp $ +$FreeBSD: src/MAINTAINERS,v 1.51 2002/11/10 16:23:31 mjacob Exp $ subsystem login notes ----------------------------- @@ -44,6 +44,7 @@ pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. isp(4) mjacob Pre-commit review requested. +mpt(4) mjacob Pre-commit review requested. sa(4) mjacob Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. ==== //depot/projects/mips/contrib/nvi/clib/getopt.c#2 (text+ko) ==== ==== //depot/projects/mips/contrib/nvi/clib/memchr.c#2 (text+ko) ==== ==== //depot/projects/mips/contrib/nvi/clib/memmove.c#2 (text+ko) ==== ==== //depot/projects/mips/contrib/nvi/clib/memset.c#2 (text+ko) ==== ==== //depot/projects/mips/contrib/nvi/clib/mkstemp.c#2 (text+ko) ==== ==== //depot/projects/mips/contrib/nvi/clib/mmap.c#2 (text+ko) ==== ==== //depot/projects/mips/contrib/nvi/clib/snprintf.c#2 (text+ko) ==== ==== //depot/projects/mips/contrib/nvi/clib/strdup.c#2 (text+ko) ==== ==== //depot/projects/mips/contrib/nvi/clib/strerror.c#2 (text+ko) ==== ==== //depot/projects/mips/contrib/nvi/clib/strpbrk.c#2 (text+ko) ==== ==== //depot/projects/mips/contrib/nvi/clib/strsep.c#2 (text+ko) ==== ==== //depot/projects/mips/contrib/nvi/clib/strtol.c#2 (text+ko) ==== ==== //depot/projects/mips/contrib/nvi/clib/strtoul.c#2 (text+ko) ==== ==== //depot/projects/mips/contrib/nvi/clib/vsnprintf.c#2 (text+ko) ==== ==== //depot/projects/mips/etc/defaults/rc.conf#3 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.160 2002/11/02 08:21:25 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.161 2002/11/10 09:13:31 imp Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -26,6 +26,7 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). +devd_enable="YES" # Run devd, to trigger progams on device tree changes. pccard_enable="NO" # Set to YES if you want to configure PCCARD devices. pccard_mem="DEFAULT" # If pccard_enable=YES, this is card memory address. pccard_beep="2" # pccard beep type. ==== //depot/projects/mips/etc/rc.subr#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.7 2002/11/08 17:06:15 gordon Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.8 2002/11/09 17:34:21 gordon Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -900,8 +900,10 @@ { case ${rc_debug} in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + if [ -x /usr/bin/logger ]; then + logger "$0: INFO: $*" + fi echo 1>&2 "$0: DEBUG: $*" - return ;; esac } ==== //depot/projects/mips/games/fortune/datfiles/gerrold.limerick#2 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.3 2002/04/28 21:59:07 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.4 2002/11/09 22:22:52 dcs Exp $ %% From The War Against The Chtorr, %% Copyright David Gerrold, 1984-2000, all rights reserved, %% used with permission of the author. @@ -44,3 +44,75 @@ From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all rights reserved, used with permission of the author. +% +There was a young lady named Susie, +Who everyone thought was a floozy. + She liked boy scout troops + and Shriners, in groups; +"What the hell?" She replied. "I'm not choosy." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A fellow who lived in West Perkin +was always a-jerkin' his gherkin. + Said he, "It's not fickle + to play with my pickle. +At least my gherkin's a workin'." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A proctologist name of McGee +once bent over double to see + an eyeball of glass + he had shoved up his ass, +"--- so I can see one that looks back at me." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Bart has a singular penis +for his wife who is built like a Venus. + He awoke with a fright + last Saturday night: +"Hey! Something is coming between us!" + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A lady who lives in New Delhi +has habits disgusting and smelhi. + She likes to eat feces + of various species. +(The recipe is tattooed or her belhi.) + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A daisy chain isn't a riddle. +just some folks who are happy to fiddle, + by twos and by threes, + on their backs or their knees, +and it's fun getting caught in the middle! + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A lad with a marvelous bend +has no need of a lover or friend. + What he does to himself + would fill up a shelf, +but alas, he has come to his end. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was an old witch, name of Jessie +whose crotch was all smelly and messie. + She enjoyed a good squirm + with an alien worm +-- and got stains all over her dressie! + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. ==== //depot/projects/mips/lib/libc/locale/btowc.3#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/libc/locale/btowc.3,v 1.1 2002/08/03 13:49:55 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/btowc.3,v 1.2 2002/11/10 11:14:58 tjr Exp $ .\" .Dd August 3, 2002 .Dt BTOWC 3 @@ -60,7 +60,9 @@ returns .Dv WEOF . .Sh SEE ALSO -.Xr multibyte 3 +.Xr mbrtowc 3 , +.Xr multibyte 3 , +.Xr wcrtomb 3 .Sh STANDARDS The .Fn btowc ==== //depot/projects/mips/lib/libc/locale/mbrtowc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/locale/mbrtowc.c,v 1.2 2002/09/06 11:23:45 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbrtowc.c,v 1.3 2002/11/10 10:49:14 tjr Exp $"); #include #include @@ -45,12 +45,6 @@ n = 1; } - if (*s == '\0') { - if (pwc != NULL) - *pwc = L'\0'; - return (0); - } - if ((r = sgetrune(s, n, &e)) == _INVALID_RUNE) { /* * The design of sgetrune() doesn't give us any way to tell @@ -77,5 +71,5 @@ if (pwc != NULL) *pwc = (wchar_t)r; - return ((size_t)(e - s)); + return (r != 0 ? (size_t)(e - s) : 0); } ==== //depot/projects/mips/lib/libc/stdio/findfp.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)findfp.c 8.2 (Berkeley) 1/4/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.26 2002/11/04 03:23:56 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.27 2002/11/10 08:44:38 imp Exp $"); #include #include @@ -69,7 +69,10 @@ static struct __sFILEX __sFX[3]; -static FILE __sF[3] = { +#if LIBC_MAJOR >= 6 +static +#endif +FILE __sF[3] = { std(__SRD, STDIN_FILENO), std(__SWR, STDOUT_FILENO), std(__SWR|__SNBF, STDERR_FILENO) ==== //depot/projects/mips/release/Makefile.inc.docports#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile.inc.docports,v 1.15 2002/10/30 09:20:50 murray Exp $ +# $FreeBSD: src/release/Makefile.inc.docports,v 1.16 2002/11/10 14:38:27 tmm Exp $ # # List of (dependent) ports that are minimally required to be # checked out from CVS in order to get ${DOCPORTS} built and @@ -37,6 +37,7 @@ ports/graphics/scr2png \ ports/textproc/scr2txt \ ports/graphics/tiff \ + ports/lang/perl5 \ ports/print/freetype2 \ ports/print/ghostscript-gnu \ ports/textproc/docbook \ @@ -61,7 +62,7 @@ .if ${OSVERSION} < 460101 || ( ${OSVERSION} >= 500000 && ${OSVERSION} < 500036 ) MINIMALDOCPORTS+= ports/textproc/sed_inplace .endif -.if ${MACHINE_ARCH} == "alpha" +.if ${MACHINE_ARCH} != "i386" MINIMALDOCPORTS+= ports/textproc/openjade .else MINIMALDOCPORTS+= ports/textproc/jade ==== //depot/projects/mips/release/alpha/dokern.sh#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/alpha/dokern.sh,v 1.59 2002/11/08 13:58:48 mjacob Exp $ +# $FreeBSD: src/release/alpha/dokern.sh,v 1.60 2002/11/09 17:09:45 mjacob Exp $ # sed \ @@ -17,8 +17,6 @@ -e '/MSDOSFS/d' \ -e '/PSEUDOFS/d' \ -e '/PROCFS/d' \ - -e '/UFS_DIRHASH/d' \ - -e '/MSDOSFS/d' \ -e '/CD9660/d' \ -e '/KTRACE/d' \ -e '/SYSV/d' \ @@ -81,18 +79,7 @@ -e '/maxusers/d' \ -e '/ahc/d' \ -e '/mpt.*MPT/d' \ - -e '/txp/d' \ - -e '/dc.*21143/d' \ - -e '/de.*Tulip/d' \ - -e '/fxp/d' \ - -e '/rl.*Real/d' \ - -e '/tl.*Texas/d' \ - -e '/vr.*VIA/d' \ - -e '/xl.*Boom/d' \ - -e '/tun.*unnel/d' \ - -e '/vx.*Vort/d' \ -e '/ch.*media/d' \ - -e '/miibus/d' \ -e 's/ident.*GENERIC/ident BOOTMFS/g' # reset maxusers to something lower @@ -100,4 +87,3 @@ echo "options SCSI_NO_OP_STRINGS" echo "options SCSI_NO_SENSE_STRINGS" -echo "makeoptions NO_MODULES=1" ==== //depot/projects/mips/release/alpha/drivers.conf#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/alpha/drivers.conf,v 1.9 2002/11/08 13:58:48 mjacob Exp $ +# $FreeBSD: src/release/alpha/drivers.conf,v 1.10 2002/11/09 17:11:24 mjacob Exp $ # # drv: driver name in kernel config file # filename: filename of kernel module (without .ko) @@ -39,20 +39,22 @@ miibus miibus 2 network "MII bus support" de if_de 2 network "DEC DEC/Intel 21040, 21041, 21140" dc if_dc 2 network "DEC DEC/Intel 21143 and workalikes" -txp if_txp 2 network "3Com 3XP Typhoon/Sidewinder (3CR990) NIC" -vx if_vx 2 network "3Com 3c590 and 3c595 EtherLink III NIC" -miibus miibus 2 network "MII bus support" -dc if_dc 2 network "DEC/Intel 21143 and workalikes" +txp if_txp 2 network "3Com 3XP Typhoon/Sidewinder (3CR990)" +vx if_vx 2 network "3Com 3c590 and 3c595 EtherLink III" pcn if_pcn 2 network "AMD Am79C97x PCI 10/100" -fxp if_fxp 2 network "Intel EtherExpress PRO/100B (82557, 82558)" +fxp if_fxp 2 network "Intel PRO/100B (8255{7,8})" rl if_rl 2 network "RealTek 8129/8139" tl if_tl 2 network "Texas Instruments ThunderLAN" vr if_vr 2 network "VIA Rhine, Rhine II" vx if_vx 2 network "3Com 3c590, 3c595 (Vortex)" xl if_xl 2 network "3Com 3c90x (Boomerang, Cyclone)" -nfsclient nfsclient 3 options "NFS client support" +if_tun if_tun 3 network "Packet tunnel" +if_gif if_gif 3 network "IPv6 and IPv4 tunneling" amr amr 3 disk "AMI MegaRAID" mlx mlx 3 disk "Mylex DAC-family RAID" +mpt mpt 3 disk "LSI-Logic Fusion" +ahc ahc 3 disk "Adaptec 2940" ispfw ispfw 3 disk "Qlogic SCSI firmware modules" +nfsclient nfsclient 3 options "NFS client support" cd9660 cd9660 3 options "CD9660 filesystem" ==== //depot/projects/mips/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#2 (text+ko) ==== @@ -1,9 +1,9 @@ The &os; Release Engineering Team - $FreeBSD: src/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml,v 1.2 2002/11/03 12:32:43 ue Exp $ + $FreeBSD: src/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml,v 1.3 2002/11/09 21:27:37 ue Exp $ 2002 ==== //depot/projects/mips/release/doc/de_DE.ISO8859-1/hardware/Makefile#3 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/Makefile,v 1.2 2002/10/12 19:00:27 ue Exp $ -# $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/Makefile,v 1.3 2002/07/08 18:41:44 ue Exp $ -# basiert auf: 1.4 +# $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/Makefile,v 1.3 2002/11/09 21:27:37 ue Exp $ +# $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/Makefile,v 1.4 2002/11/09 18:00:42 ue Exp $ +# basiert auf: 1.5 RELN_ROOT?= ${.CURDIR}/../.. SUBDIR = alpha +SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 SUBDIR+= sparc64 ==== //depot/projects/mips/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#5 (text+ko) ==== @@ -22,19 +22,19 @@ We give manpage references using the &man entities where possible. If a driver has no manpage (and consequently no - &man entity, we simply give the name of the driver). + &man entity, we simply give the name of the driver). Please avoid doing &man entity conversions unless you know for sure that an entity and manpage exist; sweeps through this file to fix "missed" conversions are likely to break the build. - $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/dev.sgml,v 1.41 2002/10/31 21:33:20 ue Exp $ - basiert auf: 1.112 + $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/dev.sgml,v 1.43 2002/11/09 18:06:11 ue Exp $ + basiert auf: 1.114 --> - $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml,v 1.10 2002/11/02 11:20:25 ue Exp $ + $FreeBSD: src/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml,v 1.11 2002/11/09 21:27:37 ue Exp $ Unterstützte Geräte @@ -55,7 +55,7 @@ Festplatten-Controller IDE/ATA Controller - (&man.ata.4; Treiber) + (&man.ata.4; Treiber) Acerlabs Aladdin @@ -146,7 +146,7 @@ - IDE/ATA controllers (wdc Treiber) + IDE/ATA controllers (wdc Treiber) on-board IDE Controller @@ -154,7 +154,7 @@ - Adaptec SCSI Controller + Adaptec SCSI Controller Adaptec 1535 ISA SCSI Controller @@ -252,7 +252,7 @@ (&man.asr.4; Treiber) Adaptec FSA RAID Controller (&man.aac.4; - Treiber) + Treiber) Adaptec AAC-2622 @@ -293,7 +293,7 @@ NEC PC-9801-55, 92 und dazu kompatible C-Bus - SCSI Controller (bs Treiber) + SCSI Controller (bs Treiber) NEC PC-9801-55, 92 und kompatible @@ -368,7 +368,7 @@ AdvanSys SCSI Controllers (alle Modelle. - &man.adv.4; und &man.adw.4; Treiber) + &man.adv.4; und &man.adw.4; Treiber) MELCO IFC-USP, RATOC REX-PCI30 und @Nifty FNECHARD @@ -378,7 +378,7 @@ BusLogic MultiMaster Hostadapter, - W-Modelle (&man.bt.4; Treiber): + W-Modelle (&man.bt.4; Treiber): BT-948 @@ -395,7 +395,7 @@ BusLogic MultiMaster Hostdapter, - C-Modelle (&man.bt.4; Treiber): + C-Modelle (&man.bt.4; Treiber): BT-946C @@ -436,7 +436,7 @@ BusLogic MultiMaster Hostadapter, - S-Typen (&man.bt.4; Treiber): + S-Typen (&man.bt.4; Treiber): BT-445S @@ -477,7 +477,7 @@ BusLogic MultiMaster Hostadapter, - A-Typen (&man.bt.4; Treiber): + A-Typen (&man.bt.4; Treiber): BT-742A @@ -511,7 +511,7 @@ (&man.dpt.4; Treiber) DPT SmartRAID V und VI SCSI RAID Controller - (&man.asr.4; Treiber) + (&man.asr.4; Treiber) PM1554 @@ -544,7 +544,7 @@ AMI MegaRAID RAID Controller, Modellreihen - Express und Enterprise (&man.amr.4; Treiber) + Express und Enterprise (&man.amr.4; Treiber) MegaRAID Series 418 @@ -679,7 +679,7 @@ Mylex PCI to SCSI RAID Controllers, - Firmware-Version 6.x (&man.mly.4; Treiber) + Firmware-Version 6.x (&man.mly.4; Treiber) AcceleRAID 160 @@ -710,7 +710,7 @@ 3ware Escalade ATA RAID Controller (&man.twe.4; - Treiber) + Treiber) 5000 series @@ -730,7 +730,7 @@ 53C810a, 53C815, 53C825, 53C825a, 53C860, 53C875, 53C875a, 53C876, 53C885, 53C895, 53C895a, 53C896, 53C1010-33, 53C1010-66, 53C1000, 53C1000R PCI SCSI Controller, sowohl auf Hostadaptern - als auch on-board (&man.ncr.4; und &man.sym.4; Treiber) + als auch on-board (&man.ncr.4; und &man.sym.4; Treiber) ASUS SC-200, SC-896 @@ -778,7 +778,7 @@ PC-Card SCSI Hostadapter auf Basis des NCR - 53C500 (ncv Treiber) + 53C500 (ncv Treiber) IO DATA PCSC-DV @@ -815,7 +815,7 @@ ISA/PC-Card SCSI Hostadapter auf Basis der TMC - 18C30, 18C50 (stg Treiber) + 18C30, 18C50 (stg Treiber) Future Domain SCSI2GO @@ -841,7 +841,7 @@ Qlogic(-ähnlich) Controller - (&man.isp.4; Treiber) + (&man.isp.4; Treiber) Qlogic 1020, 1040 SCSI und Ultra SCSI @@ -898,7 +898,7 @@ Tekram DC390 und DC390T Controller, eventuell auch andere auf dem AMD 53c974 basierende Karte - (&man.amd.4; Treiber) + (&man.amd.4; Treiber) MELCO IFC-DP @@ -907,7 +907,7 @@ PC-Card SCSI Hostadapter auf Basis des Workbit - Ninja SCSI-3 (nsp Treiber) + Ninja SCSI-3 (nsp Treiber) Alpha-Data AD-PCS201 @@ -920,7 +920,7 @@ SCSI-Controller für den Druckerport - (&man.vpo.4; Treiber) + (&man.vpo.4; Treiber) AIC 7110 SCSI Controller (ist im Iomega ZIP @@ -939,7 +939,7 @@ SCSI Hostadapter, die das Command - Interface for SCSI-3 Support nutzen (ciss Treiber) + Interface for SCSI-3 Support nutzen (ciss Treiber) Compaq Smart Array 5* series (5300, 5i, 532) @@ -948,7 +948,7 @@ Intel Integrated RAID Controller (iir Treiber) - + Intel RAID Controller SRCMR @@ -1007,7 +1007,7 @@ schreibenden Zugriff steht das Programm &man.cdrecord.1; aus der Ports Collection zur Verfügung. - Zur Zeit unterstützte CDROM-Arten: + Zur Zeit unterstützte CDROM-Arten: SCSI Geräte (dazu gehören auch ProAudio @@ -1027,7 +1027,7 @@ Die folgenden Treiber wurden zwar vom alten SCSI-Treibermodell unterstützt, wurden aber noch nicht - für das neue CAM-System umgeschrieben: + für das neue CAM-System umgeschrieben: NCR5380/NCR53400 (ProAudio Spectrum) @@ -1035,7 +1035,7 @@ - UltraStor 14F, 24F und 34F SCSI Controller. + UltraStor 14F, 24F und 34F SCSI Controller. Dieser Treiber ist in Arbeit, allerdings gibt es noch keine verläßlichen Informationen, ob @@ -1058,7 +1058,7 @@ - Dieser Treiber wird nicht mehr gepflegt: + Dieser Treiber wird nicht mehr gepflegt: Mitsumi-eigener CDROM-Anschluß (alle Varianten) @@ -1073,7 +1073,7 @@ Adaptec Duralink PCI Fast Ethernet Netzwerkkarten, die auf dem Adaptec AIC-6915 Fast Ethernet - Controller basieren (&man.sf.4; Treiber) + Controller basieren (&man.sf.4; Treiber) ANA-62011 64-bit single port 10/100baseTX @@ -1098,7 +1098,7 @@ Allied-Telesis AT1700 und RE2000 Karten - (&man.fe.4; Treiber) + (&man.fe.4; Treiber) CONTEC C-NET(PC)C PCMCIA Ethernet @@ -1141,7 +1141,7 @@ Alteon Networks PCI Gigabit Ethernet Netzwerkkarten mit Tigon 1 und Tigon 2 Chipsatz (&man.ti.4; - Treiber) + Treiber) 3Com 3c985-SX (Tigon 1 und 2) @@ -1190,7 +1190,7 @@ AMD PCnet Netzwerkkarten (&man.lnc.4; und - &man.pcn.4; Treiber) + &man.pcn.4; Treiber) AMD PCnet/PCI (79c970 & 53c974 oder 79c974) @@ -1247,7 +1247,7 @@ Netzwerkkarten mit SMC 83c17x (EPIC) (&man.tx.4; - Treiber) + Treiber) SMC EtherPower II 9432 Familie @@ -1255,9 +1255,9 @@ - Netzwerkkarten mit National Semiconductor DS8390, + Netzwerkkarten mit National Semiconductor DS8390, dazu gehören auch die NE2000 und alle Nachbauten der NE2000 - (&man.ed.4; Treiber) + (&man.ed.4; Treiber) In der Konfigurationsdatei für den Kernel müssen Sie die Einstellungen für das Nicht-PCI @@ -1441,7 +1441,7 @@ NE2000-kompatible PC-Card (PCMCIA) Ethernet und - FastEthernet Karten (&man.ed.4; Treiber) + FastEthernet Karten (&man.ed.4; Treiber) AR-P500 Ethernet @@ -1562,7 +1562,7 @@ Treiber) RealTek 8129/8139 Fast Ethernet - Netzwerkkarten (&man.rl.4; Treiber) + Netzwerkkarten (&man.rl.4; Treiber) Accton Cheetah EN1207D (MPX 5030/5038; @@ -1620,7 +1620,7 @@ Lite-On 82c168/82c169 PNIC Fast Ethernet - Netzwerkkarten (&man.dc.4; Treiber) + Netzwerkkarten (&man.dc.4; Treiber) Kingston KNE110TX @@ -1641,7 +1641,7 @@ Macronix 98713, 98713A, 98715, 98715A und - 98725 Fast Ethernet Karten (&man.dc.4; Treiber) + 98725 Fast Ethernet Karten (&man.dc.4; Treiber) Accton EN1217 (98715A) @@ -1674,7 +1674,7 @@ Macronix/Lite-On PNIC II LC82C115 Fast - Ethernet Karten (&man.dc.4; Treiber) + Ethernet Karten (&man.dc.4; Treiber) LinkSys EtherFast LNE100TX Version 2 @@ -1683,7 +1683,7 @@ Winbond W89C840F Fast Ethernet Karten - (&man.wb.4; Treiber) + (&man.wb.4; Treiber) Trendware TE100-PCIE @@ -1693,7 +1693,7 @@ VIA Technologies VT3043 Rhine I und VT86C100A Rhine II Fast Ethernet - Karten (&man.vr.4; Treiber) + Karten (&man.vr.4; Treiber) AOpen/Acer ALN-320 @@ -1722,7 +1722,7 @@ Silicon Integrated Systems SiS 900 und SiS - 7016 PCI Fast Ethernet Karten (&man.sis.4; Treiber) + 7016 PCI Fast Ethernet Karten (&man.sis.4; Treiber) SiS 630, 635 und 735 Mainboard Chipsätze @@ -1739,7 +1739,7 @@ National Semiconductor DP83815 Fast - Ethernet Karten (&man.sis.4; Treiber) + Ethernet Karten (&man.sis.4; Treiber) NetGear FA311-TX @@ -1752,7 +1752,7 @@ National Semiconductor DP83820 und DP83821 - Gigabit Ethernet Karten (&man.nge.4; Treiber) + Gigabit Ethernet Karten (&man.nge.4; Treiber) Addtron AEG320T @@ -1796,7 +1796,7 @@ Sundance Technologies ST201 PCI Fast - Ethernet Karten (&man.ste.4; Treiber) + Ethernet Karten (&man.ste.4; Treiber) D-Link DFE-550TX @@ -1805,7 +1805,7 @@ SysKonnect SK-984x PCI Gigabit Ethernet - Karten (&man.sk.4; Treiber) + Karten (&man.sk.4; Treiber) SK-9821 1000baseT copper, single port @@ -1837,7 +1837,7 @@ Texas Instruments ThunderLAN PCI - Netzwerkkarten (&man.tl.4; Treiber) + Netzwerkkarten (&man.tl.4; Treiber) Compaq Netelligent 10, 10/100, 10/100 @@ -1877,7 +1877,7 @@ AL981 (&man.dc.4; Treiber) PCI Fast Ethernet Karten mit ADMtek Inc. - AN985 (&man.dc.4; Treiber) + AN985 (&man.dc.4; Treiber) LinkSys EtherFast LNE100TX v4.0/4.1 @@ -1886,7 +1886,7 @@ USB Ethernet Karten mit ADMtek Inc. AN986 - (&man.aue.4; Treiber) + (&man.aue.4; Treiber) Abocom UFE1000, DSB650TX_NA @@ -1952,7 +1952,7 @@ USB Netzwerkkarten mit CATC USB-EL1210A - (&man.cue.4; Treiber) + (&man.cue.4; Treiber) Belkin F5U011, F5U111 @@ -1969,7 +1969,7 @@ USB Netzwerkkarten mit Kawasaki LSI KU5KUSB101B - (&man.kue.4; Treiber) + (&man.kue.4; Treiber) 3Com 3c19250 @@ -2030,7 +2030,7 @@ ASIX Electronics AX88140A PCI - Netzwerkkarten (&man.dc.4; Treiber) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 10 14:15:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57C9537B404; Sun, 10 Nov 2002 14:15:40 -0800 (PST) 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 E44A637B401 for ; Sun, 10 Nov 2002 14:15:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8CDC143E6E for ; Sun, 10 Nov 2002 14:15:39 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAAMDQmV073972 for ; Sun, 10 Nov 2002 14:13:26 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAAMDQjn073969 for perforce@freebsd.org; Sun, 10 Nov 2002 14:13:26 -0800 (PST) Date: Sun, 10 Nov 2002 14:13:26 -0800 (PST) Message-Id: <200211102213.gAAMDQjn073969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 20935 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20935 Change 20935 by jmallett@jmallett_dalek on 2002/11/10 14:13:00 We don't necessarily need , remove this reference inherited from looking at FreeBSD/PowerPC and the NetBSD/sgimips code. If we need it in time it can be added, as can appropriate references in this file, once it is completed. Affected files ... .. //depot/projects/mips/sys/mips/include/cpufunc.h#2 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpufunc.h#2 (text+ko) ==== @@ -32,8 +32,6 @@ #include -#include - static __inline struct pcpu * mips_get_pcpup(void) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 10 14:58:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CE9637B404; Sun, 10 Nov 2002 14:58:32 -0800 (PST) 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 D8B3137B401 for ; Sun, 10 Nov 2002 14:58:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8258243E6E for ; Sun, 10 Nov 2002 14:58:31 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAAMuImV078378 for ; Sun, 10 Nov 2002 14:56:18 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAAMuHF4078375 for perforce@freebsd.org; Sun, 10 Nov 2002 14:56:17 -0800 (PST) Date: Sun, 10 Nov 2002 14:56:17 -0800 (PST) Message-Id: <200211102256.gAAMuHF4078375@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 20936 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20936 Change 20936 by jmallett@jmallett_dalek on 2002/11/10 14:56:15 Add XXX. Affected files ... .. //depot/projects/mips/sys/mips/include/cpufunc.h#3 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpufunc.h#3 (text+ko) ==== @@ -37,7 +37,7 @@ { struct pcpu *ret; - ret = NULL; + /* XXX Get a pointer to the pcpu. */ return(ret); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 10 15: 9:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EC4C37B404; Sun, 10 Nov 2002 15:09:46 -0800 (PST) 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 36D3E37B401 for ; Sun, 10 Nov 2002 15:09:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9CDE43E75 for ; Sun, 10 Nov 2002 15:09:45 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAAN7WmV079336 for ; Sun, 10 Nov 2002 15:07:32 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAAN7WvT079333 for perforce@freebsd.org; Sun, 10 Nov 2002 15:07:32 -0800 (PST) Date: Sun, 10 Nov 2002 15:07:32 -0800 (PST) Message-Id: <200211102307.gAAN7WvT079333@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 20937 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20937 Change 20937 by jmallett@jmallett_dalek on 2002/11/10 15:06:56 Wrap in ifndef/define/endif stuff. Add an empty . Affected files ... .. //depot/projects/mips/sys/mips/include/mutex.h#1 add .. //depot/projects/mips/sys/mips/sgimips/param.h#3 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/param.h#3 (text+ko) ==== @@ -36,8 +36,13 @@ * 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. + * + * $FreeBSD$ */ +#ifndef _SGIMIPS_PARAM_H_ +#define _SGIMIPS_PARAM_H_ + #define MACHINE "sgimips" #define MID_MACHINE MID_MIPS @@ -75,10 +80,11 @@ #ifdef _KERNEL #ifndef _LOCORE -__inline extern void delay(unsigned long); #define DELAY(n) delay(n) #include #endif /* _LOCORE */ #endif /* _KERNEL */ + +#endif /* !_SGIMIPS_PARAM_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 10 15:21: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD07137B404; Sun, 10 Nov 2002 15:21:00 -0800 (PST) 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 894E537B401 for ; Sun, 10 Nov 2002 15:21:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3439243E4A for ; Sun, 10 Nov 2002 15:21:00 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAANIkmV080414 for ; Sun, 10 Nov 2002 15:18:46 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAANIkZc080409 for perforce@freebsd.org; Sun, 10 Nov 2002 15:18:46 -0800 (PST) Date: Sun, 10 Nov 2002 15:18:46 -0800 (PST) Message-Id: <200211102318.gAANIkZc080409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 20938 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20938 Change 20938 by jmallett@jmallett_thefather on 2002/11/10 15:18:37 Copy _stdint.h from PowerPC. Affected files ... .. //depot/projects/mips/sys/mips/include/_stdint.h#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 10 15:37:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 229AB37B406; Sun, 10 Nov 2002 15:37:25 -0800 (PST) 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 9939237B401 for ; Sun, 10 Nov 2002 15:37:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5565E43E6E for ; Sun, 10 Nov 2002 15:37:24 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAANZAmV081850 for ; Sun, 10 Nov 2002 15:35:10 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAANZ6DG081847 for perforce@freebsd.org; Sun, 10 Nov 2002 15:35:06 -0800 (PST) Date: Sun, 10 Nov 2002 15:35:06 -0800 (PST) Message-Id: <200211102335.gAANZ6DG081847@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 Subject: PERFORCE change 20939 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20939 Change 20939 by rwatson@rwatson_tislabs on 2002/11/10 15:34:41 M_MACOPVEC no longer required, as we no longer run-time generate the operation structure. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#354 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#354 (text+ko) ==== @@ -221,7 +221,6 @@ static int mac_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, struct label *intlabel); -MALLOC_DEFINE(M_MACOPVEC, "macopvec", "MAC policy operation vector"); MALLOC_DEFINE(M_MACPIPELABEL, "macpipelabel", "MAC labels for pipes"); MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 8: 8:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1099037B404; Mon, 11 Nov 2002 08:07:50 -0800 (PST) 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 AD11737B401 for ; Mon, 11 Nov 2002 08:07:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2C3943E75 for ; Mon, 11 Nov 2002 08:07:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gABG5VmV067155 for ; Mon, 11 Nov 2002 08:05:31 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gABG5Ri9067143 for perforce@freebsd.org; Mon, 11 Nov 2002 08:05:27 -0800 (PST) Date: Mon, 11 Nov 2002 08:05:27 -0800 (PST) Message-Id: <200211111605.gABG5Ri9067143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 20965 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20965 Change 20965 by jmallett@jmallett_dalek on 2002/11/11 08:05:04 IFC. Affected files ... .. //depot/projects/mips/games/fortune/datfiles/Makefile#2 integrate .. //depot/projects/mips/games/fortune/datfiles/gerrold.limerick#3 integrate .. //depot/projects/mips/lib/libc/ia64/gen/_setjmp.S#2 integrate .. //depot/projects/mips/lib/libc/ia64/gen/setjmp.S#2 integrate .. //depot/projects/mips/lib/libc/ia64/gen/sigsetjmp.S#2 integrate .. //depot/projects/mips/lib/libc/sys/uuidgen.2#2 integrate .. //depot/projects/mips/lib/libdisk/create_chunk.c#5 integrate .. //depot/projects/mips/lib/libdisk/disk.c#8 integrate .. //depot/projects/mips/lib/libdisk/libdisk.h#4 integrate .. //depot/projects/mips/lib/libdisk/write_ia64_disk.c#2 integrate .. //depot/projects/mips/lib/libdisk/write_sparc64_disk.c#2 integrate .. //depot/projects/mips/libexec/ftpd/ftpd.c#3 integrate .. //depot/projects/mips/release/alpha/dokern.sh#5 integrate .. //depot/projects/mips/release/alpha/drivers.conf#6 integrate .. //depot/projects/mips/release/i386/dokern.sh#5 integrate .. //depot/projects/mips/release/i386/drivers.conf#4 integrate .. //depot/projects/mips/release/ia64/mkisoimages.sh#3 integrate .. //depot/projects/mips/release/scripts/print-cdrom-packages.sh#2 integrate .. //depot/projects/mips/sbin/gpt/add.c#2 integrate .. //depot/projects/mips/sbin/gpt/create.c#3 integrate .. //depot/projects/mips/sbin/gpt/destroy.c#2 integrate .. //depot/projects/mips/sbin/gpt/gpt.c#4 integrate .. //depot/projects/mips/sbin/gpt/migrate.c#3 integrate .. //depot/projects/mips/sbin/gpt/recover.c#2 integrate .. //depot/projects/mips/sbin/gpt/show.c#3 integrate .. //depot/projects/mips/share/man/man4/snp.4#2 integrate .. //depot/projects/mips/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/mips/sys/dev/snp/snp.c#2 integrate .. //depot/projects/mips/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/mips/sys/ia64/conf/GENERIC#7 integrate .. //depot/projects/mips/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/mips/sys/ia64/include/setjmp.h#3 integrate .. //depot/projects/mips/sys/isa/fd.c#2 integrate .. //depot/projects/mips/sys/kern/kern_mac.c#7 integrate .. //depot/projects/mips/sys/modules/splash/bmp/splash_bmp.c#2 integrate .. //depot/projects/mips/sys/modules/splash/pcx/splash_pcx.c#2 integrate .. //depot/projects/mips/sys/modules/syscons/dragon/Makefile#3 integrate .. //depot/projects/mips/sys/modules/syscons/fire/Makefile#2 integrate .. //depot/projects/mips/sys/modules/syscons/rain/Makefile#2 integrate .. //depot/projects/mips/sys/modules/syscons/warp/Makefile#2 integrate .. //depot/projects/mips/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/mips/sys/sys/snoop.h#2 integrate .. //depot/projects/mips/sys/vm/pmap.h#2 integrate .. //depot/projects/mips/sys/vm/swap_pager.c#2 integrate .. //depot/projects/mips/sys/vm/uma_core.c#4 integrate .. //depot/projects/mips/sys/vm/uma_dbg.c#3 integrate .. //depot/projects/mips/sys/vm/vm_object.c#5 integrate .. //depot/projects/mips/usr.bin/kenv/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/sysinstall/disks.c#6 integrate .. //depot/projects/mips/usr.sbin/watch/watch.c#2 integrate Differences ... ==== //depot/projects/mips/games/fortune/datfiles/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/19/94 -# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.28 2001/12/17 13:59:29 ru Exp $ +# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.29 2002/11/10 23:41:01 dcs Exp $ FILES= fortunes fortunes2 freebsd-tips murphy startrek zippy BLDS= fortunes.dat fortunes2.dat murphy.dat startrek.dat zippy.dat \ @@ -14,8 +14,8 @@ # THREE LINES AND UNCOMMENT THE FOURTH LINE. # THE THREE LINES: -FILES+= fortunes2-o limerick murphy-o -BLDS+= fortunes2-o.dat limerick.dat murphy-o.dat +FILES+= fortunes2-o limerick murphy-o gerrold.limerick +BLDS+= fortunes2-o.dat limerick.dat murphy-o.dat gerrold.limerick.dat TYPE= real # THE FOURTH LINE: @@ -26,7 +26,7 @@ FILESDIR= ${SHAREDIR}/games/fortune -.for f in fortunes fortunes2 fortunes2-o freebsd-tips limerick murphy murphy-o startrek zippy +.for f in fortunes fortunes2 fortunes2-o freebsd-tips gerrold.limerick limerick murphy murphy-o startrek zippy $f.dat: $f PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \ strfile -Crs ${.ALLSRC} ${.TARGET} ==== //depot/projects/mips/games/fortune/datfiles/gerrold.limerick#3 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.4 2002/11/09 22:22:52 dcs Exp $ +%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.5 2002/11/10 23:37:25 dcs Exp $ %% From The War Against The Chtorr, %% Copyright David Gerrold, 1984-2000, all rights reserved, %% used with permission of the author. @@ -67,7 +67,7 @@ once bent over double to see an eyeball of glass he had shoved up his ass, -"--- so I can see one that looks back at me." +"-- so I can see one that looks back at me." From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all rights reserved, used with permission of the author. @@ -116,3 +116,708 @@ From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all rights reserved, used with permission of the author. +% +A lady who favors coition, +has invented the spaceship position. + She lies down with ease + and pulls up her knees, +and hollers, "Lift off!" and "Ignitions!" + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Isaac the famous seducer, +will meet a young lass and conducer + to let him get fresh + with her quivering flesh, +but if there isn't the time, he'll just gucer. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +And old man of Texas named Tanners +was notorious for his bad manners. + When he noticed the start + of an imminent fart, +he'd announce it with bullhorns and banners. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A woman who wanted to see, +if she stood up, how far she could pee, + had pardon to beg, + when it ran down her leg, +and formed icicles off her left knee. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A promiscuous sort was dear Laurie +(Yes, this is that kind of story.) + She did it with Joe + and Larry and Moe +and Curly and Howard and Morrie. + +And Johnny and Richard and Pritchard and Kerry +And Lonnie and Horace and Boris and Barry + and Donald and Harold + and Ronald and Gerald +and Tommy and Dicky and Harry. + +And . . . Peter and Paul and Teddy and Todd +and Matthew and Mark and Simon and Rod + and Brucie and Mark + and Bobby and Clarck +and she still isn't finished! My God! + +And David and Dennis and Huey and Ken +and Dewey and Louie, then David again, + and Willy and Ben + and David again +and again and again and again. + +And Danny and Manny and Gary and Fred +and Mackie and Jackie and Dougie and Ned + and Harvey and Len + (then David again) +and -- hold on just a second, she's dead! + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was a young man from St. Loo, +who gave his dear sister a screw. + Said he, with aplomb, + "You're better than Mom." +Said she, "That's what Dad told me too!" + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A lady who didn't like flies +managed to hide her surprise, + when she opened up one + and found it was fun. +Now she willingly widens her thighs. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was a young lady named Nancy, +who liked having sex, plain of fancy. + With lightning and thunder, + and a profound sense of wonder, +But not with a partner -- much too chancy. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was a young lady quite tearful. +Of sucking a cock, she was fearful. + In a moment of dreard, + she just turned her head. +And, boy! Did she get an earful! + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A mathematician named Boris +had a wife with a wondrous clitoris. + He charged a small fee + for his colleagues to see +that it was made in the shape of a torus. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +The ladies all had to agree +that Mort's penis was too small to see. + A whore named Louise + sniffed, "Who will _that_ please?" +Mort proudly submitted, "Just me!" + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was a young fellow named Fisk +whose comings and goings were brisk, + He hid things that were stolen + inside his colon, +and said, "Hey! It's my own *." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A stunning young lady named Joan +thought a penis was made with a bone. + She just didn't know + 'twas her sexual glow +that turned parts of men into stone. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A midwife named Flo from Arabia +often enjoys giving baby a + forty-volt shock + to the base of the cock. +(On a girl, she goes for the labia.) + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +I know of a lass who's for sale. +She's really a nice piece of tail. + From June to September, + she'll devour your member, +but the rest of the year, she's in jail. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Miss Wilkerson thought it her duty +to maintain her conjugal beauty. + She mixed up a paste + of industrial waste, +and applied it to her sweet patootie.* + +* The facts about beauty are known, +and well-learned by those who are grown: + beauty is thin, + it lies on the skin; +but ugly goes down to the bone. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +The punctual Cynthia Rolen +missed a period, (or it was stolen) + She looked up her ass + with a tube made of glass, +but found only her own semi-colon; + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A short-organ fellow named Kevin +used a vacuum to stretch it to seven, + then to eight and to nine, + and though ten was divine, +there will be film at eleven.* + +* If you think that our boy's now a stud, +you've been fooled by the size of his pud. + Although twelve inches soft, + when it rises aloft, +he just faints from the sheer lack of blood. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There once was a lady named Lizard, +who got lost in a pink candy blizzard, + with a fellow named Jim + who wanted to swim +up her legs to visit her gizzard. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was a young fellow named Ted, +who had a radio put in his head. + Long wave or short + he did it for sport +-- and to improve his reception in bed. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was a young lady from Venus, +whose body was shaped like a penis. + A fellow named Hunt + was shaped like a cunt, +so it all worked out fine, just between us. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was an old bastard named Gene, +impotent, selfish, and mean. + His dick was so shamed + by what the man claimed, +it pretended that is was a spleen. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There once was a fellow named Jason, +whose horrible death I would hasten. + I'd feed him to worms, + just to see how he squirms +-- but they'd vomit his crap in a basin. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +With a French lass, it's unwise to trifle. +They have urges they simply can't stifle. + A woman of France + will pull down her pants +at the sight of a towering eye-full. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +"My God!" screamed devout Mrs. Pike, +as she fondled her stableman's spike. + "This is quite out of place, + and a great loss of face +-- but I think I have fallen in like!" + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A well-endower fellow from Ortening +prepared for an evening of sportening, + with a boy from a disco, + till he lubed up his Crisco, +and discovered, alas, it was _shortening_! + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A lady who read Sigmund Freud, +thought her genitals underemployed; + so she put in a stand + for a seven-piece band, +and held dances that we all enjoyed. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A lady named Shirley was mellow +and she said to her eager young fellow, + "I prefer bagels and lox + to sucking off cocks, +Or even a nice dish of Jell-O!" + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was a young man from St. Helens +afflicted with shrinkin's and swellin's. + His dick was so small + it was not there at all, +but his balls looked like honeydew melons. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A woman who once faked a lettera +reference by which she could gettera + job much improved, + regretted her move +when they asked her to show her et cetera. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A lady of South Madagascar +wears a bag on her head; it's to mask her. + A bottle of scotch + might loosen her crotch. +Wait here, I'll go and I'll ask her. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Chuck is weird, let the whole world know it. +He brought in his bucket to show it. + We all had a fit + when we saw it was shit. +We didn't know he was planning to throw it. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +"Which partners are best? Sixty-niners. +And better than that? Try the Shriners." + These are the results + of consenting adults, +(and occasional like-minded minors.) + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A lady's iambic pentameter +is thirty-two inches diameter. + The breadth of her scansion + is due to expansion +in the pants of a critical amateur. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was a young fellow from Norwich +Who liked having sex with his porridge. + With sugar and cream + and a buttery scream -- +(The leftovers went into storage.) + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was a young fellow named Jim +who liked to get naked and swim + with plastic sex toys + shaped like pubescent boys, +'cause he'd rather be gay than be grim. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A lady who jogged in the breeze +had bosoms that flapped to her knees. + Said she, "They're quite warm, + they keep me dry in a storm, +and when it snows, I use them for skis." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was an old voyeur named Zeke, +who liked to hide in the closet and peek, + then jump out with loud cries + of "Aha!" and "Surprise!" +and point out your flaws in technique. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Rick promised to gently deflower +a maiden who lived on South Gower, + (The truth is, he spread + her legs wide on the bed, +and finsihed her off in an hour.) + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +These poems have come out of my forehead. +The subject are all fairly torrid + -- except for the few + that will make you say, "Pugh!" +And those are the ones that are horrid. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Juanita, the subject of scandals, +used to use unscented candles, + but now thinks it nice + to use a device +with batteries, buzzers, and handles. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was an old prune name of Ginty +who only ate muffins and thin tea. + Thinking of sex + gave her the blecchs, +and left her all dried up and squinty. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +I have written some limericks quite fateful, +malicious and vicious and hateful; + but I've torn up the jokes + that would sicken most folks, +and humanity ought ot be grateful; + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Here's the tale of Benjamin Sneed: +Where others were two'd he was three'd + and when they unmasked it, + (three balls in his basket), +he was voted "Most Likely to Breed." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A maiden who had a third breast +always kept her hand close to her chest, + and I promised her well + that I never woudl tell. +(Write me privately. Name on request.) + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Skydiver Daniel McDopp +used to masturbate right from the top. + Whenever he fell, + he jerked off like hell. +He was good to the very last drop. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A necrophile name of Ned Schultz, +often brags of his deed and exults, + "Tis legal, it's said, + to make love to the dead, +if performed by consenting adults." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Have you ever met Jamie McBeezis? +He does any damn thing that he pleases. + Says Jamie, undaunted, + "If you've got it,then flaunt it!" +But he's referring to social diseases. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There once was a nearsighted gynie +whose glasses were sparkly and shiny; + but they stayed in the drawer + while he worked on a whore +and tied up the tubes of her hiney. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A shepherd named Jimmie Fitzhugh, +said to his sweetheart, "It's true. + Nothing is moister + than a fresh oister, +unless, of course, it is ewe." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There's a reason why Barton is queer. +When you meet him, the reason is clear. + A goddess named Venus + gave him a penis, +but Mother Nature filled up his brassiere. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Then there was Benjamin Bright, +a contestant on "What's My Delight?" + They guesses at his habits + with little white rabbits, +but were stumped by his mouse and his kite. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was a young man from St. Lutz, +who had a remarkable putz. + It would sniff, it would hunt, + for it only liked cunt. +Absolutely no lips, hands, or butts. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Sally's sex life was carefully planned. +Said she, "I prefer to be manned. + Things that are anal, + are always so banal, +but things that expand are just grand." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Sally-Jo was exceedingly vexed, +when they said she was quite oversexed. + She said, "That's not true, + I just like to screw, +Now, please take a number. Who's next?" + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Sally sued for support; she was claimin' +Phil had fathered her baby (named Damon). + She said, "I ought to know." + as she pointed below. +"'Cause this is the box that he came in." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +We will need a computer to tally +all the cowboys who scouted our Sally. + There were some on her mountains + and some on her fountains, +and quite a few down in the valley. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A lady who overly lusted +was frequently opened and thrusted. + When the baby came due + it was female too, +and its hymen was already busted. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +When writing these verses of mine, +I start with a clever last line, + then work backward from there, + toward the opening pair, +with the hope it'll all work out fine.* + +*only sometimes it doesn't. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There once was a whore from St. Paul, +who took anyone, wide, short, or tall. + She said to her clients, + "It's not really science -- +it's just that one size will fit all!" + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was a young fellow named Forrest +whose cornhole was one of the sorest. + Said he, "I don't mind + a regular grind +-- but I do wish my ass were clitorised." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +When Shakespeare awakes with a scream +and his member a-drippin' with cream, + 'tis just the commission + of nocturnal emission, +which he dubs, "A Mid-Slumber Night-Stream." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Sally-Jo taught erotic correction. +She told her student to get an erection. + "Put your dick in my mouth. + Move it north, move it south -- +Now, you're getting a sense of direction!" + +Her instructions were very explicit, +and more than a little illicit: + "Please fill up my cunny + with fresh clover honey, +and butter my buns like a biscuit." + +"Then wrap me up nice in a blanket, +and I'll sit on your staff while you crank it. + I'll put on some feathers, + and laces and leathers, +and wiggle my ass while you spank it." + +"Now that your fingers are stinky, +tie me up in some chains that are clinky. + Bring in goats and a sheik, + give my titties a tweak +--and _now_, we can start getting kinky!" + +"Forget what the chain and the whip meant. +Just get the straps and the slings and a shipment + of high-grade Vaseline, + and a strong trampoline, +and allof the other equipment!" + +"Now, when we get all the bedsprings a-drummin', +that's when I'll start in a-hummin', + then quickly, my dear, + put it into my ear, +so I'll hear the sound of it comin'!" + +"I don't know how much this is costing," +said her student, still covered with frosting. + "But I can say with affinity + that I've lost my virginity. +Quite frankly, my dear, you're _exhausting_!" + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was a mad pilot named Lizzy, +whose manners were said to be skizzy. + She could loop, she could twirl, + she could make your head whirl. +She left all her men fucking dizzy. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +The speed of Ed's seed is unclocked +whenever a lady's unfrocked. + Tho' his spirit is willin, + when a pussy needs fillin', +he's a man who goes off half-cocked. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A lady whose name is Tirelli +has tits made of dynamite jelli. + If you take on this dare, + you must fondle with care. +(The detonator's south of her belli.) + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +The fame of our Mame was her tushy, +and the front of her cunt. (It was bushy.) + But I heard that her Mike + preferred for his spike +the place in her face that was skwooshy. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A whore with a face like a hound +complained that her sales were down, + till a lover named Michael + bought her a cycle, +and she peddled it all over town. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +There was a young man named Levine +who said to his lady, inclined, + "Thanks for the spasm, + it felt like orgasm; +as a matter of fact, 'twas divine." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A king who was mad at the time, +decreed limerick writing a crime. + but late in the night + all the poets woudl write +verses without any rhyme or meter. + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% ==== //depot/projects/mips/lib/libc/ia64/gen/_setjmp.S#2 (text+ko) ==== @@ -1,4 +1,4 @@ -// $FreeBSD: src/lib/libc/ia64/gen/_setjmp.S,v 1.6 2001/10/20 15:19:08 dfr Exp $ +// $FreeBSD: src/lib/libc/ia64/gen/_setjmp.S,v 1.7 2002/11/11 08:11:44 marcel Exp $ // // Copyright (c) 1999, 2000 // Intel Corporation. @@ -69,13 +69,6 @@ // ENTRY(_setjmp, 1) - // - // Make sure buffer is aligned at 16byte boundary - // - add r10 = -0x10,r0 ;; // mask the lower 4 bits - and r32 = r32, r10;; - add r32 = 0x10, r32;; // move to next 16 byte boundary - add r10 = J_PREDS, r32 // skip Unats & pfs save area add r11 = J_BSP, r32 // @@ -200,13 +193,6 @@ WEAK_ALIAS(_longjmp,___longjmp) ENTRY(___longjmp, 2) // - // Make sure buffer is aligned at 16byte boundary - // - add r10 = -0x10,r0 ;; // mask the lower 4 bits - and r32 = r32, r10;; - add r32 = 0x10, r32;; // move to next 16 byte boundary - - // // caching the return value as we do invala in the end // mov r8 = r33 // return value ==== //depot/projects/mips/lib/libc/ia64/gen/setjmp.S#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: setjmp.S,v 1.3 1997/12/05 02:06:27 thorpej Exp $ */ -/* $FreeBSD: src/lib/libc/ia64/gen/setjmp.S,v 1.7 2001/10/26 08:26:45 dfr Exp $ */ +/* $FreeBSD: src/lib/libc/ia64/gen/setjmp.S,v 1.8 2002/11/11 08:11:44 marcel Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -46,14 +46,10 @@ ENTRY(setjmp, 1) alloc loc0=ar.pfs,1,2,3,0 mov loc1=rp - // - // Compensate for the pointer twiddling that setjmp does. - // - dep r14=r0,r32,0,4 - ;; + ;; mov out0=1 // how = SIG_BLOCK mov out1=0 // set = NULL - add out2=J_SIG0+0x10,r14 // oset = &jb[J_SIG0] + add out2=J_SIG0,in0 // oset = &jb[J_SIG0] br.call.sptk.few rp=__sys_sigprocmask ;; mov rp=loc1 @@ -69,13 +65,9 @@ ENTRY(__longjmp, 2) alloc loc0=ar.pfs,2,2,3,0 mov loc1=rp - // - // Compensate for the pointer twiddling that setjmp does. - // - dep r14=r0,r32,0,4 ;; mov out0=3 // how = SIG_SETMASK - add out1=J_SIG0+0x10,r14 // set = &jb[J_SIG0] + add out1=J_SIG0,in0 // set = &jb[J_SIG0] mov out2=0 // oset = NULL br.call.sptk.few rp=__sys_sigprocmask ;; ==== //depot/projects/mips/lib/libc/ia64/gen/sigsetjmp.S#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: sigsetjmp.S,v 1.2 1996/10/17 03:08:07 cgd Exp $ */ -/* $FreeBSD: src/lib/libc/ia64/gen/sigsetjmp.S,v 1.5 2001/10/26 08:26:45 dfr Exp $ */ +/* $FreeBSD: src/lib/libc/ia64/gen/sigsetjmp.S,v 1.6 2002/11/11 08:11:44 marcel Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -45,27 +45,17 @@ */ ENTRY(sigsetjmp, 2) - // - // Compensate for the pointer twiddling that setjmp does. - // - dep r14=r0,r32,0,4 - ;; - add r14=J_SIGMASK+0x10,r14 // place to save mask + add r14=J_SIGMASK,in0 // place to save mask + cmp.ne p6,p7=0,in1 // save signal state? ;; st8 [r14]=in1 // save mask value - cmp.ne p6,p7=0,in1 // save signal state? (p6) br.cond.dptk.many setjmp (p7) br.cond.dpnt.many _setjmp END(sigsetjmp) WEAK_ALIAS(siglongjmp,__siglongjmp) ENTRY(__siglongjmp, 2) - // - // Compensate for the pointer twiddling that setjmp does. - // - dep r14=r0,r32,0,4 - ;; - add r14=J_SIGMASK+0x10,r14 // address of mask value + add r14=J_SIGMASK,in0 // address of mask value ;; ld8 r14=[r14] ;; ==== //depot/projects/mips/lib/libc/sys/uuidgen.2#2 (text+ko) ==== @@ -22,7 +22,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/libc/sys/uuidgen.2,v 1.2 2002/05/30 12:04:36 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/uuidgen.2,v 1.3 2002/11/11 00:29:01 marcel Exp $ .\" .Dd May 26, 2002 .Dt UUIDGEN 2 @@ -35,7 +35,7 @@ .Sh SYNOPSIS .In sys/uuid.h .Ft int -.Fn uuidgen "uuid_t *store" "int count" +.Fn uuidgen "struct uuid *store" "int count" .Sh DESCRIPTION The .Nm @@ -46,18 +46,71 @@ .Fa store . The identifiers are generated according to the syntax and semantics of the DCE version 1 variant of universally unique identifiers. +See below for a more in-depth description of the identifiers. When no IEEE 802 -address is available for the node field a random multicast address is -generated for each call. +address is available for the node field, a random multicast address is +generated for each invocation of the system call. +According to the algorithm of generating time-based UUIDs, this will also +force a new random clock sequence, thereby increasing the likelyhood for +the identifier to be unique. .Pp -When multiple identifiers are requested, the +When multiple identifiers are to be generated, the .Nm -system call will generate identifiers that are adjacent in time. +system call will generate a set of identifiers that is dense in such a way +that there is no identifier that is larger than the smallest identifier in the +set and smaller than the largest identifier in the set and that is not already +in the set. +.Pp +Universally unique identifiers, also known as globally unique identifiers +(GUIDs), have a binary representation of 128-bits. +The grouping and meaning of these bits is described by the following +structure and its description of the fields that follow it: +.Bd -literal +struct uuid { + uint32_t time_low; + uint16_t time_mid; + uint16_t time_hi_and_version; + uint8_t clock_seq_hi_and_reserved; + uint8_t clock_seq_low; + uint8_t node[_UUID_NODE_LEN]; +}; +.Ed .Pp -Universally unique identifiers, also known as globally unique identifiers, -are normally represented as: +.Bl -tag -width _clock_seq_hi_and_reserved_ +.It time_low +The least significant 32 bits of a 60-bit timestamp. +This field is stored in the native byte-order. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 9:44:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0461C37B404; Mon, 11 Nov 2002 09:44:48 -0800 (PST) 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 A53C837B401 for ; Mon, 11 Nov 2002 09:44:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60FDB43E7B for ; Mon, 11 Nov 2002 09:44:47 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gABHgUmV075919 for ; Mon, 11 Nov 2002 09:42:30 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gABHgTrV075916 for perforce@freebsd.org; Mon, 11 Nov 2002 09:42:29 -0800 (PST) Date: Mon, 11 Nov 2002 09:42:29 -0800 (PST) Message-Id: <200211111742.gABHgTrV075916@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 Subject: PERFORCE change 20968 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20968 Change 20968 by rwatson@rwatson_tislabs on 2002/11/11 09:41:38 Gratuitous diff reduction. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#43 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/syscalls.master#43 (text+ko) ==== @@ -34,7 +34,6 @@ ; Please copy any additions and changes to the following compatability tables: ; sys/ia64/ia32/syscalls.master (take a best guess) ; [other 64 bit platforms with an alternate 32 bit syscall table go here too] - ; #ifdef's, etc. may be included, and are copied to the output files. #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 10:47: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B9CA37B404; Mon, 11 Nov 2002 10:47:04 -0800 (PST) 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 E8E3037B401 for ; Mon, 11 Nov 2002 10:47:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8DD7243E6E for ; Mon, 11 Nov 2002 10:47:03 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gABIikmV081202 for ; Mon, 11 Nov 2002 10:44:46 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gABIij55081199 for perforce@freebsd.org; Mon, 11 Nov 2002 10:44:45 -0800 (PST) Date: Mon, 11 Nov 2002 10:44:45 -0800 (PST) Message-Id: <200211111844.gABIij55081199@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 Subject: PERFORCE change 20969 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20969 Change 20969 by rwatson@rwatson_tislabs on 2002/11/11 10:44:19 Attempt to consistently name modules in MAC_POLICY_SET() in the same manner as the module files themselves by stripping the trustedbsd_ from the front of each module name declaration. Add "NSA/NAI Labs" to the front of the SEBSD name for consistency with other declarations. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#183 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#66 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#19 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#36 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#146 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#105 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#23 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#19 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#81 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#58 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#183 (text+ko) ==== @@ -2677,5 +2677,5 @@ .mpo_check_vnode_write = mac_biba_check_vnode_write, }; -MAC_POLICY_SET(&mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba", +MAC_POLICY_SET(&mac_biba_ops, mac_biba, "TrustedBSD MAC/Biba", MPC_LOADTIME_FLAG_NOTLATE, &mac_biba_slot); ==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#66 (text+ko) ==== @@ -763,5 +763,5 @@ .mpo_check_vnode_stat = mac_bsdextended_check_vnode_stat, }; -MAC_POLICY_SET(&mac_bsdextended_ops, trustedbsd_mac_bsdextended, +MAC_POLICY_SET(&mac_bsdextended_ops, mac_bsdextended, "TrustedBSD MAC/BSD Extended", MPC_LOADTIME_FLAG_UNLOADOK, NULL); ==== //depot/projects/trustedbsd/mac/sys/security/mac_ifoff/mac_ifoff.c#19 (text+ko) ==== @@ -162,5 +162,5 @@ .mpo_check_socket_deliver = mac_ifoff_check_socket_deliver, }; -MAC_POLICY_SET(&mac_ifoff_ops, trustedbsd_mac_ifoff, "TrustedBSD MAC/ifoff", +MAC_POLICY_SET(&mac_ifoff_ops, mac_ifoff, "TrustedBSD MAC/ifoff", MPC_LOADTIME_FLAG_UNLOADOK, NULL); ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#36 (text+ko) ==== @@ -2697,5 +2697,5 @@ .mpo_thread_userret = mac_lomac_thread_userret, }; -MAC_POLICY_SET(&mac_lomac_ops, trustedbsd_mac_lomac, "TrustedBSD MAC/LOMAC", +MAC_POLICY_SET(&mac_lomac_ops, mac_lomac, "TrustedBSD MAC/LOMAC", MPC_LOADTIME_FLAG_NOTLATE, &mac_lomac_slot); ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#146 (text+ko) ==== @@ -2511,5 +2511,5 @@ .mpo_check_vnode_write = mac_mls_check_vnode_write, }; -MAC_POLICY_SET(&mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS", +MAC_POLICY_SET(&mac_mls_ops, mac_mls, "TrustedBSD MAC/MLS", MPC_LOADTIME_FLAG_NOTLATE, &mac_mls_slot); ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#105 (text+ko) ==== @@ -1078,5 +1078,5 @@ .mpo_check_vnode_write = mac_none_check_vnode_write, }; -MAC_POLICY_SET(&mac_none_ops, trustedbsd_mac_none, "TrustedBSD MAC/None", +MAC_POLICY_SET(&mac_none_ops, mac_none, "TrustedBSD MAC/None", MPC_LOADTIME_FLAG_UNLOADOK, NULL); ==== //depot/projects/trustedbsd/mac/sys/security/mac_partition/mac_partition.c#23 (text+ko) ==== @@ -282,5 +282,5 @@ .mpo_check_vnode_exec = mac_partition_check_vnode_exec, }; -MAC_POLICY_SET(&mac_partition_ops, trustedbsd_mac_partition, - "TrustedBSD MAC/Partition", MPC_LOADTIME_FLAG_UNLOADOK, &partition_slot); +MAC_POLICY_SET(&mac_partition_ops, mac_partition, "TrustedBSD MAC/Partition", + MPC_LOADTIME_FLAG_UNLOADOK, &partition_slot); ==== //depot/projects/trustedbsd/mac/sys/security/mac_seeotheruids/mac_seeotheruids.c#19 (text+ko) ==== @@ -166,5 +166,5 @@ .mpo_check_socket_visible = mac_seeotheruids_check_socket_visible, }; -MAC_POLICY_SET(&mac_seeotheruids_ops, trustedbsd_mac_seeotheruids, +MAC_POLICY_SET(&mac_seeotheruids_ops, mac_seeotheruids, "TrustedBSD MAC/seeotheruids", MPC_LOADTIME_FLAG_UNLOADOK, NULL); ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#81 (text+ko) ==== @@ -1475,5 +1475,5 @@ .mpo_check_vnode_write = mac_test_check_vnode_write, }; -MAC_POLICY_SET(&mac_test_ops, trustedbsd_mac_test, "TrustedBSD MAC/Test", +MAC_POLICY_SET(&mac_test_ops, mac_test, "TrustedBSD MAC/Test", MPC_LOADTIME_FLAG_UNLOADOK, &test_slot); ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#58 (text+ko) ==== @@ -1274,5 +1274,5 @@ .mpo_create_root_mount = sebsd_create_root_mount, }; -MAC_POLICY_SET(&sebsd_ops, trustedbsd_sebsd, "Security Enhanced BSD", +MAC_POLICY_SET(&sebsd_ops, sebsd, "NSA/NAI Labs Security Enhanced BSD", MPC_LOADTIME_FLAG_NOTLATE, &slot); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 11:33: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DA2C37B404; Mon, 11 Nov 2002 11:33:00 -0800 (PST) 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 3C12737B401 for ; Mon, 11 Nov 2002 11:33:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEA0443E6E for ; Mon, 11 Nov 2002 11:32:59 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gABJUgmV085590 for ; Mon, 11 Nov 2002 11:30:42 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gABJUfUF085587 for perforce@freebsd.org; Mon, 11 Nov 2002 11:30:41 -0800 (PST) Date: Mon, 11 Nov 2002 11:30:41 -0800 (PST) Message-Id: <200211111930.gABJUfUF085587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 20970 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20970 Change 20970 by jhb@jhb_laptop on 2002/11/11 11:30:27 Rename witness_sleep() to witness_warn() and make it a bit more extensible so it can handle more arbitrary messages, etc. Also, add a function to display a single lock instance and share this code between witness_warn() and witness_list_locks(). Affected files ... .. //depot/projects/smpng/sys/kern/subr_witness.c#62 edit .. //depot/projects/smpng/sys/sys/lock.h#18 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#62 (text+ko) ==== @@ -145,6 +145,7 @@ static void witness_lock_list_free(struct lock_list_entry *lle); static struct lock_instance *find_instance(struct lock_list_entry *lock_list, struct lock_object *lock); +static int witness_list_lock(struct lock_instance *instance); #if defined(DDB) static void witness_display_list(void(*prnt)(const char *fmt, ...), struct witness_list *list); @@ -912,60 +913,71 @@ } /* - * Warn if any held locks are not sleepable. Note that Giant and the lock - * passed in are both special cases since they are both released during the - * sleep process and aren't actually held while the thread is asleep. + * Warn if any locks other than 'lock' are held. Flags can be passed in to + * exempt Giant and sleepable locks from the checks as well. If any + * non-exempt locks are held, then a supplied message is printed to the + * console along with a list of the offending locks. If indicated in the + * flags then a failure results in a panic as well. */ int -witness_sleep(int check_only, struct lock_object *lock, const char *file, - int line) +witness_warn(int flags, struct lock_object *lock, const char *file, int line, + const char *fmt, ...) { - struct lock_list_entry **lock_list, *lle; + struct lock_list_entry *lle; struct lock_instance *lock1; struct thread *td; + va_list ap; int i, n; if (witness_cold || witness_dead || panicstr != NULL) return (0); n = 0; td = curthread; - lock_list = &td->td_sleeplocks; -again: - for (lle = *lock_list; lle != NULL; lle = lle->ll_next) + for (lle = td->td_sleeplocks; lle != NULL; lle = lle->ll_next) for (i = lle->ll_count - 1; i >= 0; i--) { lock1 = &lle->ll_children[i]; - if (lock1->li_lock == lock || + if (lock1->li_lock == lock) + continue; + if (flags & WARN_GIANTOK && lock1->li_lock == &Giant.mtx_object) continue; - if ((lock1->li_lock->lo_flags & LO_SLEEPABLE) != 0) { - if (check_only == 0) { - CTR3(KTR_WITNESS, - "pid %d: sleeping with lock (%s) %s held", - td->td_proc->p_pid, - lock1->li_lock->lo_class->lc_name, - lock1->li_lock->lo_name); - lock1->li_flags |= LI_SLEPT; - } + if (flags & WARN_SLEEPOK && + (lock1->li_lock->lo_flags & LO_SLEEPABLE) != 0) continue; + if (n == 0) { + va_start(ap, fmt); + vprintf(fmt, ap); + va_end(ap); + printf(" with the following"); + if (flags & WARN_SLEEPOK) + printf(" non-sleepable"); + printf("locks held at %s:%d:\n", file, line); } n++; - printf("%s:%d: %s with \"%s\" locked from %s:%d\n", - file, line, check_only ? "could sleep" : "sleeping", - lock1->li_lock->lo_name, lock1->li_file, - lock1->li_line); + witness_list_lock(lock1); } - if (lock_list == &td->td_sleeplocks && PCPU_GET(spinlocks) != NULL) { + if (PCPU_GET(spinlocks) != NULL) { /* * Since we already hold a spinlock preemption is * already blocked. */ - lock_list = PCPU_PTR(spinlocks); - goto again; + if (n == 0) { + va_start(ap, fmt); + vprintf(fmt, ap); + va_end(ap); + printf(" with the following"); + if (flags & WARN_SLEEPOK) + printf(" non-sleepable"); + printf("locks held at %s:%d:\n", file, line); + } + n += witness_list_locks(PCPU_PTR(spinlocks)); } + if (flags & WARN_PANIC && n) + panic("witness_warn"); #ifdef DDB - if (witness_ddb && n) + else if (witness_ddb && n) Debugger(__func__); -#endif /* DDB */ +#endif return (n); } @@ -1354,28 +1366,31 @@ return (NULL); } +static int +witness_list_lock(struct lock_instance *instance) +{ + struct lock_object *lock; + + lock = instance->li_lock; + printf("%s %s %s", (instance->li_flags & LI_EXCLUSIVE) != 0 ? + "exclusive" : "shared", lock->lo_class->lc_name, lock->lo_name); + if (lock->lo_type != lock->lo_name) + printf(" (%s)", lock->lo_type); + printf(" r = %d (%p) locked @ %s:%d\n", + instance->li_flags & LI_RECURSEMASK, lock, instance->li_file, + instance->li_line); +} + int witness_list_locks(struct lock_list_entry **lock_list) { struct lock_list_entry *lle; - struct lock_instance *instance; - struct lock_object *lock; int i, nheld; nheld = 0; for (lle = *lock_list; lle != NULL; lle = lle->ll_next) for (i = lle->ll_count - 1; i >= 0; i--) { - instance = &lle->ll_children[i]; - lock = instance->li_lock; - printf("%s %s %s", - (instance->li_flags & LI_EXCLUSIVE) != 0 ? - "exclusive" : "shared", - lock->lo_class->lc_name, lock->lo_name); - if (lock->lo_type != lock->lo_name) - printf(" (%s)", lock->lo_type); - printf(" r = %d (%p) locked @ %s:%d\n", - instance->li_flags & LI_RECURSEMASK, lock, - instance->li_file, instance->li_line); + witness_list_lock(&lle->ll_children[i]); nheld++; } return (nheld); ==== //depot/projects/smpng/sys/sys/lock.h#18 (text+ko) ==== @@ -212,6 +212,12 @@ const char *witness_file(struct lock_object *); #ifdef WITNESS + +/* Flags for witness_warn(). */ +#define WARN_GIANTOK 0x01 /* Giant is exempt from this check. */ +#define WARN_PANIC 0x02 /* Panic if check fails. */ +#define WARN_SLEEPOK 0x04 /* Sleepable locks are exempt from check. */ + #define WITNESS_INIT(lock) \ witness_init((lock)) @@ -230,8 +236,8 @@ #define WITNESS_UNLOCK(lock, flags, file, line) \ witness_unlock((lock), (flags), (file), (line)) -#define WITNESS_SLEEP(check, lock) \ - witness_sleep((check), (lock), __FILE__, __LINE__) +#define WITNESS_WARN(flags, lock, fmt, ...) \ + witness_warn((flags), (lock), __FILE__, __LINE__, (fmt), __VA_ARGS__) #define WITNESS_SAVE_DECL(n) \ const char * __CONCAT(n, __wf); \ @@ -256,7 +262,7 @@ #define WITNESS_UPGRADE(lock, flags, file, line) #define WITNESS_DOWNGRADE(lock, flags, file, line) #define WITNESS_UNLOCK(lock, flags, file, line) -#define WITNESS_SLEEP(check, lock) +#define WITNESS_WARN(flags, lock, fmt, ...) #define WITNESS_SAVE_DECL(n) #define WITNESS_SAVE(lock, n) #define WITNESS_RESTORE(lock, n) @@ -264,5 +270,15 @@ #define WITNESS_LINE(lock) (0) #endif /* WITNESS */ +/* XXX */ +#define WITNESS_SLEEP(check, lock) do { \ + if ((check)) \ + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock, \ + "Could Sleep"); \ + else \ + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock, \ + "Sleeping"); \ +} while (0) + #endif /* _KERNEL */ #endif /* _SYS_LOCK_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 12: 6:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B389D37B404; Mon, 11 Nov 2002 12:06:42 -0800 (PST) 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 4B57737B401 for ; Mon, 11 Nov 2002 12:06:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF46643FC7 for ; Mon, 11 Nov 2002 12:06:41 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gABK4OmV088500 for ; Mon, 11 Nov 2002 12:04:24 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gABK4N1Z088497 for perforce@freebsd.org; Mon, 11 Nov 2002 12:04:23 -0800 (PST) Date: Mon, 11 Nov 2002 12:04:23 -0800 (PST) Message-Id: <200211112004.gABK4N1Z088497@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 20972 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20972 Change 20972 by green@green_laptop_2 on 2002/11/11 12:04:14 Fix extattr corruption on the disk instead of just noticing it. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/fsck_ffs/ea.c#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/fsck_ffs/ea.c#3 (text+ko) ==== @@ -63,10 +63,14 @@ eascan(struct inodesc *idesc, struct ufs2_dinode *dp) { struct bufarea *bp; - char tmpf[sizeof("/tmp/fsck_ffs-extent.XXXXXX")]; u_char *cp; long blksiz; +#if 0 + char tmpf[sizeof("/tmp/fsck_ffs-extent.XXXXXX")]; int fd; +#else + union dinode *fixdp; +#endif if (dp->di_extsize == 0) return 0; @@ -79,6 +83,7 @@ if (chkextattr(cp, dp->di_extsize)) { pfatal("CORRUPT EXTENDED ATTRIBUTES I=%lu", (u_long)idesc->id_number); +#if 0 if (reply("DUMP EXTENT") == 1) { strcpy(tmpf, "/tmp/fsck_ffs-extent.XXXXXX"); fd = mkstemp(tmpf); @@ -91,6 +96,14 @@ (void)close(fd); } } +#else + if (reply("CLEAR") == 1) { + fixdp = ginode(idesc->id_number); + fixdp->dp2.di_extsize = 0; + bzero(&fixdp->dp2.di_extb, sizeof(fixdp->dp2.di_extb)); + inodirty(); + } +#endif } bp->b_flags &= ~B_INUSE; return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 12:48:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5D8637B404; Mon, 11 Nov 2002 12:48:34 -0800 (PST) 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 7D24637B401 for ; Mon, 11 Nov 2002 12:48:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A62743E4A for ; Mon, 11 Nov 2002 12:48:34 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gABKkGmV092121 for ; Mon, 11 Nov 2002 12:46:16 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gABKkFfK092118 for perforce@freebsd.org; Mon, 11 Nov 2002 12:46:15 -0800 (PST) Date: Mon, 11 Nov 2002 12:46:15 -0800 (PST) Message-Id: <200211112046.gABKkFfK092118@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 20974 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20974 Change 20974 by jhb@jhb_laptop on 2002/11/11 12:45:33 Change consumers of WITNESS_SLEEP() to use WITNESS_WARN() instead. Affected files ... .. //depot/projects/smpng/sys/kern/kern_condvar.c#21 edit .. //depot/projects/smpng/sys/kern/kern_sig.c#49 edit .. //depot/projects/smpng/sys/kern/kern_synch.c#36 edit .. //depot/projects/smpng/sys/kern/kern_sysctl.c#25 edit .. //depot/projects/smpng/sys/vm/uma_core.c#21 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_condvar.c#21 (text+ko) ==== @@ -219,7 +219,8 @@ ktrcsw(1, 0); #endif CV_ASSERT(cvp, mp, td); - WITNESS_SLEEP(0, &mp->mtx_object); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->mtx_object, + "Waiting on \"%s\"", cvp->cv_description); WITNESS_SAVE(&mp->mtx_object, mp); if (cold ) { @@ -275,7 +276,8 @@ ktrcsw(1, 0); #endif CV_ASSERT(cvp, mp, td); - WITNESS_SLEEP(0, &mp->mtx_object); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->mtx_object, + "Waiting on \"%s\"", cvp->cv_description); WITNESS_SAVE(&mp->mtx_object, mp); if (cold || panicstr) { @@ -343,7 +345,8 @@ ktrcsw(1, 0); #endif CV_ASSERT(cvp, mp, td); - WITNESS_SLEEP(0, &mp->mtx_object); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->mtx_object, + "Waiting on \"%s\"", cvp->cv_description); WITNESS_SAVE(&mp->mtx_object, mp); if (cold || panicstr) { @@ -421,7 +424,8 @@ ktrcsw(1, 0); #endif CV_ASSERT(cvp, mp, td); - WITNESS_SLEEP(0, &mp->mtx_object); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->mtx_object, + "Waiting on \"%s\"", cvp->cv_description); WITNESS_SAVE(&mp->mtx_object, mp); if (cold || panicstr) { ==== //depot/projects/smpng/sys/kern/kern_sig.c#49 (text+ko) ==== @@ -1674,7 +1674,8 @@ p = td->td_proc; PROC_LOCK_ASSERT(p, MA_OWNED); - WITNESS_SLEEP(1, &p->p_mtx.mtx_object); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &p->p_mtx.mtx_object, + "Checking for signals"); for (;;) { int traced = (p->p_flag & P_TRACED) || (p->p_stops & S_SIG); ==== //depot/projects/smpng/sys/kern/kern_synch.c#36 (text+ko) ==== @@ -143,7 +143,8 @@ if (KTRPOINT(td, KTR_CSW)) ktrcsw(1, 0); #endif - WITNESS_SLEEP(0, &mtx->mtx_object); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mtx->mtx_object, + "Sleeping on \"%s\"", wmesg); KASSERT(timo != 0 || mtx_owned(&Giant) || mtx != NULL, ("sleeping without a mutex")); /* ==== //depot/projects/smpng/sys/kern/kern_sysctl.c#25 (text+ko) ==== @@ -999,7 +999,8 @@ size_t i = 0; if (req->lock == 1 && req->oldptr) - WITNESS_SLEEP(1, NULL); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, + "sysctl_old_user"); if (req->oldptr) { i = l; if (req->oldlen <= req->oldidx) ==== //depot/projects/smpng/sys/vm/uma_core.c#21 (text+ko) ==== @@ -1308,7 +1308,8 @@ if (!(flags & M_NOWAIT)) { KASSERT(curthread->td_intr_nesting_level == 0, ("malloc(M_WAITOK) in interrupt context")); - WITNESS_SLEEP(1, NULL); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, + "malloc() of \"%s\"", zone->uz_name); } zalloc_restart: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 13: 5: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80F1837B404; Mon, 11 Nov 2002 13:04:57 -0800 (PST) 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 F3F8537B401 for ; Mon, 11 Nov 2002 13:04:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 09E2943E8A for ; Mon, 11 Nov 2002 13:04:55 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gABL2amV093731 for ; Mon, 11 Nov 2002 13:02:36 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gABL2ajg093726 for perforce@freebsd.org; Mon, 11 Nov 2002 13:02:36 -0800 (PST) Date: Mon, 11 Nov 2002 13:02:36 -0800 (PST) Message-Id: <200211112102.gABL2ajg093726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 20975 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20975 Change 20975 by jhb@jhb_laptop on 2002/11/11 13:02:15 Change callers of witness_list() to use WITNESS_WARN() instead. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/trap.c#40 edit .. //depot/projects/smpng/sys/i386/i386/trap.c#46 edit .. //depot/projects/smpng/sys/ia64/ia64/trap.c#39 edit .. //depot/projects/smpng/sys/kern/subr_mbuf.c#21 edit .. //depot/projects/smpng/sys/kern/subr_trap.c#42 edit .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#27 edit .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#43 edit Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#40 (text+ko) ==== @@ -789,12 +789,8 @@ #ifdef INVARIANTS cred_free_thread(td); #endif -#ifdef WITNESS - if (witness_list(td)) { - panic("system call %s returning with mutex(s) held\n", - syscallnames[code]); - } -#endif + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + syscallnames[code]); mtx_assert(&sched_lock, MA_NOTOWNED); mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/smpng/sys/i386/i386/trap.c#46 (text+ko) ==== @@ -1099,13 +1099,8 @@ #ifdef INVARIANTS cred_free_thread(td); #endif - -#ifdef WITNESS - if (witness_list(td)) { - panic("system call %s returning with mutex(s) held\n", - syscallnames[code]); - } -#endif + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + syscallnames[code]); mtx_assert(&sched_lock, MA_NOTOWNED); mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#39 (text+ko) ==== @@ -905,12 +905,8 @@ #ifdef INVARIANTS cred_free_thread(td); #endif -#ifdef WITNESS - if (witness_list(td)) { - panic("system call %s returning with mutex(s) held\n", - syscallnames[code]); - } -#endif + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + syscallnames[code]); mtx_assert(&sched_lock, MA_NOTOWNED); mtx_assert(&Giant, MA_NOTOWNED); } @@ -1082,13 +1078,8 @@ #ifdef INVARIANTS cred_free_thread(td); #endif - -#ifdef WITNESS - if (witness_list(td)) { - panic("system call %s returning with mutex(s) held\n", - syscallnames[code]); - } -#endif + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + syscallnames[code]); mtx_assert(&sched_lock, MA_NOTOWNED); mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/smpng/sys/kern/subr_mbuf.c#21 (text+ko) ==== @@ -999,15 +999,8 @@ struct domain *dp; struct protosw *pr; -/* - * XXX: Argh, we almost always trip here with witness turned on now-a-days - * XXX: because we often come in with Giant held. For now, there's no way - * XXX: to avoid this. - */ -#ifdef WITNESS - KASSERT(witness_list(curthread) == 0, - ("mb_reclaim() called with locks held")); -#endif + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK | WARN_PANIC, NULL, + "mb_reclaim()"); mbstat.m_drain++; /* XXX: No consistency. */ ==== //depot/projects/smpng/sys/kern/subr_trap.c#42 (text+ko) ==== @@ -163,10 +163,7 @@ CTR3(KTR_SYSC, "ast: thread %p (pid %d, %s)", td, p->p_pid, p->p_comm); KASSERT(TRAPF_USERMODE(framep), ("ast in kernel mode")); -#ifdef WITNESS - if (witness_list(td)) - panic("Returning to user mode with mutex(s) held"); -#endif + WITNESS_WARN(WARN_PANIC, NULL, "Returning to user mode"); mtx_assert(&Giant, MA_NOTOWNED); mtx_assert(&sched_lock, MA_NOTOWNED); td->td_frame = framep; ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#27 (text+ko) ==== @@ -473,12 +473,8 @@ */ STOPEVENT(p, S_SCX, code); -#ifdef WITNESS - if (witness_list(td)) { - panic("system call %s returning with mutex(s) held\n", - syscallnames[code]); - } -#endif + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + syscallnames[code]); mtx_assert(&sched_lock, MA_NOTOWNED); mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#43 (text+ko) ==== @@ -632,12 +632,8 @@ #ifdef INVARIANTS cred_free_thread(td); #endif -#ifdef WITNESS - if (witness_list(td)) { - panic("system call %s returning with mutex(s) held\n", - syscallnames[code]); - } -#endif + WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", + syscallnames[code]); mtx_assert(&sched_lock, MA_NOTOWNED); mtx_assert(&Giant, MA_NOTOWNED); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 13: 5:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B756A37B404; Mon, 11 Nov 2002 13:05:57 -0800 (PST) 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 532B737B401 for ; Mon, 11 Nov 2002 13:05:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F219E43E77 for ; Mon, 11 Nov 2002 13:05:56 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gABL3cmV093821 for ; Mon, 11 Nov 2002 13:03:38 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gABL3cZF093818 for perforce@freebsd.org; Mon, 11 Nov 2002 13:03:38 -0800 (PST) Date: Mon, 11 Nov 2002 13:03:38 -0800 (PST) Message-Id: <200211112103.gABL3cZF093818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 20976 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20976 Change 20976 by jhb@jhb_laptop on 2002/11/11 13:03:21 Make this more consistent with subr_mbuf.c. Affected files ... .. //depot/projects/smpng/sys/kern/kern_sysctl.c#26 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_sysctl.c#26 (text+ko) ==== @@ -1000,7 +1000,7 @@ if (req->lock == 1 && req->oldptr) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, - "sysctl_old_user"); + "sysctl_old_user()"); if (req->oldptr) { i = l; if (req->oldlen <= req->oldidx) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 13: 7: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5D0237B404; Mon, 11 Nov 2002 13:06:59 -0800 (PST) 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 4F75437B401 for ; Mon, 11 Nov 2002 13:06:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE5A943E3B for ; Mon, 11 Nov 2002 13:06:58 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gABL4emV093880 for ; Mon, 11 Nov 2002 13:04:40 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gABL4erp093877 for perforce@freebsd.org; Mon, 11 Nov 2002 13:04:40 -0800 (PST) Date: Mon, 11 Nov 2002 13:04:40 -0800 (PST) Message-Id: <200211112104.gABL4erp093877@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 20977 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20977 Change 20977 by jhb@jhb_laptop on 2002/11/11 13:03:56 Axe WITNESS_SLEEP(). Affected files ... .. //depot/projects/smpng/sys/sys/lock.h#19 edit Differences ... ==== //depot/projects/smpng/sys/sys/lock.h#19 (text+ko) ==== @@ -270,15 +270,5 @@ #define WITNESS_LINE(lock) (0) #endif /* WITNESS */ -/* XXX */ -#define WITNESS_SLEEP(check, lock) do { \ - if ((check)) \ - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock, \ - "Could Sleep"); \ - else \ - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, lock, \ - "Sleeping"); \ -} while (0) - #endif /* _KERNEL */ #endif /* _SYS_LOCK_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 13:11: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7499037B404; Mon, 11 Nov 2002 13:11:05 -0800 (PST) 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 09EE037B401 for ; Mon, 11 Nov 2002 13:11:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAFF343E6E for ; Mon, 11 Nov 2002 13:11:04 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gABL8kmV094317 for ; Mon, 11 Nov 2002 13:08:46 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gABL8kbL094314 for perforce@freebsd.org; Mon, 11 Nov 2002 13:08:46 -0800 (PST) Date: Mon, 11 Nov 2002 13:08:46 -0800 (PST) Message-Id: <200211112108.gABL8kbL094314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 20978 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20978 Change 20978 by jhb@jhb_laptop on 2002/11/11 13:07:58 Make witness_list() static. Affected files ... .. //depot/projects/smpng/sys/kern/subr_witness.c#63 edit .. //depot/projects/smpng/sys/sys/lock.h#20 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#63 (text+ko) ==== @@ -145,6 +145,7 @@ static void witness_lock_list_free(struct lock_list_entry *lle); static struct lock_instance *find_instance(struct lock_list_entry *lock_list, struct lock_object *lock); +static int witness_list(struct thread *td); static int witness_list_lock(struct lock_instance *instance); #if defined(DDB) static void witness_display_list(void(*prnt)(const char *fmt, ...), @@ -1399,7 +1400,7 @@ /* * Calling this on td != curthread is bad unless we are in ddb. */ -int +static int witness_list(struct thread *td) { int nheld; ==== //depot/projects/smpng/sys/sys/lock.h#20 (text+ko) ==== @@ -205,7 +205,6 @@ void witness_save(struct lock_object *, const char **, int *); void witness_restore(struct lock_object *, const char *, int); int witness_list_locks(struct lock_list_entry **); -int witness_list(struct thread *); int witness_sleep(int, struct lock_object *, const char *, int); void witness_assert(struct lock_object *, int, const char *, int); int witness_line(struct lock_object *); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 13:13:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B58BF37B404; Mon, 11 Nov 2002 13:13:08 -0800 (PST) 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 4C85637B401 for ; Mon, 11 Nov 2002 13:13:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0609343E3B for ; Mon, 11 Nov 2002 13:13:08 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gABLAnmV094746 for ; Mon, 11 Nov 2002 13:10:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gABLAnU4094743 for perforce@freebsd.org; Mon, 11 Nov 2002 13:10:49 -0800 (PST) Date: Mon, 11 Nov 2002 13:10:49 -0800 (PST) Message-Id: <200211112110.gABLAnU4094743@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 Subject: PERFORCE change 20979 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20979 Change 20979 by rwatson@rwatson_tislabs on 2002/11/11 13:09:50 Whitespace and layout consistency improvements, making it easier to maintain local locking modifications. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#355 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#355 (text+ko) ==== @@ -235,10 +235,19 @@ static struct mtx mac_policy_list_lock; static LIST_HEAD(, mac_policy_conf) mac_policy_list; static int mac_policy_list_busy; -#define MAC_POLICY_LIST_LOCKINIT() mtx_init(&mac_policy_list_lock, \ - "mac_policy_list_lock", NULL, MTX_DEF); -#define MAC_POLICY_LIST_LOCK() mtx_lock(&mac_policy_list_lock); -#define MAC_POLICY_LIST_UNLOCK() mtx_unlock(&mac_policy_list_lock); + +#define MAC_POLICY_LIST_LOCKINIT() do { \ + mtx_init(&mac_policy_list_lock, "mac_policy_list_lock", NULL, \ + MTX_DEF); \ +} while (0) + +#define MAC_POLICY_LIST_LOCK() do { \ + mtx_lock(&mac_policy_list_lock); \ +} while (0) + +#define MAC_POLICY_LIST_UNLOCK() do { \ + mtx_unlock(&mac_policy_list_lock); \ +} while (0) #define MAC_POLICY_LIST_BUSY() do { \ MAC_POLICY_LIST_LOCK(); \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 13:24: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 956B137B404; Mon, 11 Nov 2002 13:23:38 -0800 (PST) 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 3DD3137B401 for ; Mon, 11 Nov 2002 13:23:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1C1243E3B for ; Mon, 11 Nov 2002 13:23:36 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gABLLImV095667 for ; Mon, 11 Nov 2002 13:21:18 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gABLL20j095646 for perforce@freebsd.org; Mon, 11 Nov 2002 13:21:02 -0800 (PST) Date: Mon, 11 Nov 2002 13:21:02 -0800 (PST) Message-Id: <200211112121.gABLL20j095646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 20980 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20980 Change 20980 by jhb@jhb_laptop on 2002/11/11 13:20:21 IFC @20971. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/atomic.s#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#50 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#39 integrate .. //depot/projects/smpng/sys/alpha/alpha/prom.c#9 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#25 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/smpng/sys/alpha/include/atomic.h#7 integrate .. //depot/projects/smpng/sys/alpha/include/bus.h#5 integrate .. //depot/projects/smpng/sys/alpha/include/vmparam.h#3 integrate .. //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#10 integrate .. //depot/projects/smpng/sys/bluetooth/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/common/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/common/ng_bluetooth.c#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/ng_bt3c.4#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/ng_bt3c_firmware.h#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/ng_bt3c_var.h#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/h4/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/h4/TODO#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/h4/ng_h4.4#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/h4/ng_h4.c#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/h4/ng_h4_prse.h#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/h4/ng_h4_var.h#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/TODO#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/ng_ubt.4#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/ng_ubt.c#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/ng_ubt_var.h#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/TODO#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci.4#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_cmds.c#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_cmds.h#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_evnt.c#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_evnt.h#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_main.c#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_misc.c#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_misc.h#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_prse.h#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_ulpi.c#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_ulpi.h#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_var.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_bluetooth.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_bt3c.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_btsocket.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_btsocket_hci_raw.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_btsocket_l2cap.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_h4.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_hci.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_l2cap.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_ubt.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/TODO#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap.4#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_cmds.c#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_cmds.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_evnt.c#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_evnt.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_llpi.c#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_llpi.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_main.c#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_misc.c#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_misc.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_prse.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_ulpi.c#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_ulpi.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_var.h#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/TODO#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket.4#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket.c#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket_hci_raw.c#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket_l2cap.c#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket_l2cap_raw.c#1 branch .. //depot/projects/smpng/sys/boot/forth/loader.conf#13 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/smpng/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#4 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#5 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_devsearch.c#3 delete .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#6 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#12 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#11 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#8 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#5 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#16 integrate .. //depot/projects/smpng/sys/conf/NOTES#28 integrate .. //depot/projects/smpng/sys/conf/files#55 integrate .. //depot/projects/smpng/sys/conf/files.i386#34 integrate .. //depot/projects/smpng/sys/conf/files.pc98#34 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#17 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#16 integrate .. //depot/projects/smpng/sys/conf/majors#17 integrate .. //depot/projects/smpng/sys/crypto/sha2/sha2.c#4 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#35 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#21 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#10 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/smpng/sys/dev/amr/amr_compat.h#3 integrate .. //depot/projects/smpng/sys/dev/amr/amr_disk.c#5 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/amr/amr_tables.h#3 integrate .. //depot/projects/smpng/sys/dev/amr/amrio.h#3 integrate .. //depot/projects/smpng/sys/dev/amr/amrreg.h#5 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#6 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#24 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#14 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#25 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#12 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#10 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#7 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#11 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#8 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/smpng/sys/dev/eisa/eisaconf.c#4 integrate .. //depot/projects/smpng/sys/dev/em/README#4 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#12 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#9 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.c#5 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.h#5 integrate .. //depot/projects/smpng/sys/dev/em/if_em_osdep.h#8 integrate .. //depot/projects/smpng/sys/dev/fb/vga.c#9 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#20 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#6 integrate .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/gx/if_gxvar.h#4 integrate .. //depot/projects/smpng/sys/dev/hea/eni_buffer.c#7 integrate .. //depot/projects/smpng/sys/dev/hea/eni_init.c#2 integrate .. //depot/projects/smpng/sys/dev/hea/eni_receive.c#4 integrate .. //depot/projects/smpng/sys/dev/hea/eni_transmit.c#4 integrate .. //depot/projects/smpng/sys/dev/hea/eni_vcm.c#5 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_output.c#5 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_receive.c#5 integrate .. //depot/projects/smpng/sys/dev/ida/ida.c#3 integrate .. //depot/projects/smpng/sys/dev/iir/iir_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/mcd/mcd.c#2 integrate .. //depot/projects/smpng/sys/dev/mcd/mcdvar.h#2 integrate .. //depot/projects/smpng/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#6 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#17 integrate .. //depot/projects/smpng/sys/dev/nge/if_ngereg.h#5 integrate .. //depot/projects/smpng/sys/dev/pccard/card_if.m#8 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#14 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#22 integrate .. //depot/projects/smpng/sys/dev/pci/isa_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpt.c#4 integrate .. //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppb_msq.h#2 integrate .. //depot/projects/smpng/sys/dev/ppbus/pps.c#8 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#3 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#2 integrate .. //depot/projects/smpng/sys/dev/scd/scd_isa.c#1 branch .. //depot/projects/smpng/sys/dev/scd/scdreg.h#2 integrate .. //depot/projects/smpng/sys/dev/scd/scdvar.h#1 branch .. //depot/projects/smpng/sys/dev/si/si_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/sio/sio_puc.c#5 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#6 integrate .. //depot/projects/smpng/sys/dev/sr/if_srregs.h#2 integrate .. //depot/projects/smpng/sys/dev/sym/sym_defs.h#3 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/tga/tga_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/ufm.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/ulpt.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/usb.h#7 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumdaemon.c#4 integrate .. //depot/projects/smpng/sys/dev/vinum/vinuminterrupt.c#3 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#7 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumrevive.c#5 integrate .. //depot/projects/smpng/sys/dev/wds/wd7000.c#2 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#15 integrate .. //depot/projects/smpng/sys/fs/msdosfs/denode.h#4 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_smb.c#6 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#19 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.h#2 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#3 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/smpng/sys/geom/geom.h#15 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#6 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#15 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#47 integrate .. //depot/projects/smpng/sys/i386/i386/exception.s#12 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#18 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#50 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#27 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#47 integrate .. //depot/projects/smpng/sys/i386/i386/vm86.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/vm86bios.s#4 integrate .. //depot/projects/smpng/sys/i386/include/pcb.h#9 integrate .. //depot/projects/smpng/sys/i386/include/reg.h#7 integrate .. //depot/projects/smpng/sys/i386/include/vm86.h#5 integrate .. //depot/projects/smpng/sys/i386/isa/gpib.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#29 integrate .. //depot/projects/smpng/sys/i386/isa/scd.c#9 delete .. //depot/projects/smpng/sys/i386/isa/scdreg.h#2 delete .. //depot/projects/smpng/sys/i386/isa/spkr.c#8 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#23 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#15 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#25 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC.hints#3 integrate .. //depot/projects/smpng/sys/ia64/ia32/syscalls.master#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/exception.s#21 integrate .. //depot/projects/smpng/sys/ia64/ia64/genassym.c#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/locore.s#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#48 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#38 integrate .. //depot/projects/smpng/sys/ia64/ia64/swtch.s#12 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#19 integrate .. //depot/projects/smpng/sys/ia64/include/pcb.h#7 integrate .. //depot/projects/smpng/sys/ia64/include/setjmp.h#5 integrate .. //depot/projects/smpng/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/smpng/sys/isa/fd.c#14 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#17 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#23 integrate .. //depot/projects/smpng/sys/kern/imgact_shell.c#3 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_environment.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_lockf.c#11 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#19 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#43 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#64 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#13 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#22 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#21 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#29 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#21 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#30 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#30 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#14 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/smpng/sys/libkern/qsort.c#3 integrate .. //depot/projects/smpng/sys/modules/Makefile#37 integrate .. //depot/projects/smpng/sys/modules/Makefile.inc#3 integrate .. //depot/projects/smpng/sys/modules/aac/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/aic/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/aic7xxx/ahd/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/aicasm/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/apm/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/atspeaker/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/bktr/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/cam/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/drm/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/ed/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ep/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/fdc/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/fe/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/firewire/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/firewire/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/hfa/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/i2c/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/i2c/controllers/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/isp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/lnc/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/lomac/Makefile.inc#2 integrate .. //depot/projects/smpng/sys/modules/mpt/Makefile#1 branch .. //depot/projects/smpng/sys/modules/msdosfs/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/netgraph/fec/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/fec/sample_startup#1 branch .. //depot/projects/smpng/sys/modules/netgraph/source/Makefile#1 branch .. //depot/projects/smpng/sys/modules/nfsserver/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/oldcard/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/pcspeaker/Makefile#1 branch .. //depot/projects/smpng/sys/modules/pmc/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/scd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sound/driver/mss/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/sound/driver/sbc/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/splash/bmp/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/splash/bmp/splash_bmp.c#3 integrate .. //depot/projects/smpng/sys/modules/splash/pcx/splash_pcx.c#2 integrate .. //depot/projects/smpng/sys/modules/syscons/apm/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/syscons/daemon/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/syscons/dragon/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/syscons/fire/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/syscons/rain/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/syscons/snake/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/syscons/star/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/syscons/warp/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/sysvipc/Makefile.inc#1 branch .. //depot/projects/smpng/sys/net/if_vlan.c#12 integrate .. //depot/projects/smpng/sys/net/radix.c#5 integrate .. //depot/projects/smpng/sys/net/zlib.c#6 integrate .. //depot/projects/smpng/sys/netatm/atm_cm.c#8 integrate .. //depot/projects/smpng/sys/netatm/atm_cm.h#5 integrate .. //depot/projects/smpng/sys/netatm/atm_device.c#5 integrate .. //depot/projects/smpng/sys/netatm/atm_if.c#7 integrate .. //depot/projects/smpng/sys/netatm/atm_if.h#7 integrate .. //depot/projects/smpng/sys/netatm/atm_signal.c#4 integrate .. //depot/projects/smpng/sys/netatm/atm_stack.h#3 integrate .. //depot/projects/smpng/sys/netatm/atm_subr.c#11 integrate .. //depot/projects/smpng/sys/netatm/atm_var.h#9 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_if.c#5 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_load.c#4 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_var.h#4 integrate .. //depot/projects/smpng/sys/netatm/port.h#5 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_kxdr.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/q2110_sigaa.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/q2110_sigcpcs.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/qsaal1_sigaa.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/qsaal1_sigcpcs.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni_lower.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni_upper.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni_var.h#3 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_lower.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_pdu.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_sigaa.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_sigcpcs.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_subr.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_upper.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_var.h#4 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_decode.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_encode.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_var.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_fec.h#1 branch .. //depot/projects/smpng/sys/netgraph/ng_one2many.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_parse.c#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_source.h#1 branch .. //depot/projects/smpng/sys/netinet/in_pcb.c#30 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#6 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#18 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#29 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#25 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#14 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.c#5 integrate .. //depot/projects/smpng/sys/netncp/ncp_rq.c#3 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.c#8 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#22 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#13 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#13 integrate .. //depot/projects/smpng/sys/nfsserver/nfsm_subs.h#6 integrate .. //depot/projects/smpng/sys/opencrypto/crypto.c#3 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#27 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC.hints#5 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#45 integrate .. //depot/projects/smpng/sys/pc98/pc98/spkr.c#6 integrate .. //depot/projects/smpng/sys/pci/amd.c#3 integrate .. //depot/projects/smpng/sys/pci/if_mn.c#4 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#18 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#11 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#17 integrate .. //depot/projects/smpng/sys/pci/if_tireg.h#3 integrate .. //depot/projects/smpng/sys/pci/intpm.c#5 integrate .. //depot/projects/smpng/sys/pci/viapm.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#29 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.h#4 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.h#4 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#5 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.h#2 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#5 integrate .. //depot/projects/smpng/sys/sparc64/include/ofw_bus.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#16 integrate .. //depot/projects/smpng/sys/sparc64/include/ver.h#4 integrate .. //depot/projects/smpng/sys/sparc64/isa/isa.c#5 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#5 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#4 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#39 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/ofw_bus.c#3 integrate .. //depot/projects/smpng/sys/sys/_label.h#3 integrate .. //depot/projects/smpng/sys/sys/gpt.h#3 integrate .. //depot/projects/smpng/sys/sys/imgact.h#8 integrate .. //depot/projects/smpng/sys/sys/mac.h#7 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#7 integrate .. //depot/projects/smpng/sys/sys/malloc.h#12 integrate .. //depot/projects/smpng/sys/sys/mchain.h#5 integrate .. //depot/projects/smpng/sys/sys/mount.h#17 integrate .. //depot/projects/smpng/sys/sys/param.h#31 integrate .. //depot/projects/smpng/sys/sys/proc.h#66 integrate .. //depot/projects/smpng/sys/sys/snoop.h#6 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#25 integrate .. //depot/projects/smpng/sys/sys/syscall.h#22 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#22 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#24 integrate .. //depot/projects/smpng/sys/sys/time.h#10 integrate .. //depot/projects/smpng/sys/sys/uuid.h#2 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#20 integrate .. //depot/projects/smpng/sys/vm/pmap.h#11 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#19 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#22 integrate .. //depot/projects/smpng/sys/vm/uma_dbg.c#5 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#12 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#17 integrate .. //depot/projects/smpng/sys/vm/vm_init.c#6 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#20 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#15 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#18 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#20 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/atomic.s#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/atomic.s,v 1.5 2001/04/25 20:40:56 obrien Exp $ + * $FreeBSD: src/sys/alpha/alpha/atomic.s,v 1.6 2002/10/30 01:41:44 gallatin Exp $ */ #include ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#50 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.187 2002/10/25 19:10:55 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.191 2002/11/09 16:19:13 des Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -192,7 +192,6 @@ long Maxmem = 0; long totalphysmem; /* total amount of physical memory in system */ -long physmem; /* physical memory used by NetBSD + some rsvd */ long resvmem; /* amount of memory reserved for PROM */ long unusedmem; /* amount of memory for OS that we don't use */ long unknownmem; /* amount of memory with an unknown use */ @@ -200,32 +199,6 @@ vm_offset_t phys_avail[10]; -static int -sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) -{ - u_long val; - - val = alpha_ptob(physmem); - return (sysctl_handle_long(oidp, &val, 0, req)); -} - -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD, - 0, 0, sysctl_hw_physmem, "LU", ""); - -static int -sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) -{ - u_long val; - - val = alpha_ptob(physmem - cnt.v_wire_count); - return (sysctl_handle_long(oidp, &val, 0, req)); -} - -SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD, - 0, 0, sysctl_hw_usermem, "LU", ""); - -SYSCTL_ULONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); - /* must be 2 less so 0 0 can signal end of chunks */ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2) @@ -266,7 +239,8 @@ #ifdef PERFMON perfmon_init(); #endif - printf("real memory = %ld (%ldK bytes)\n", alpha_ptob(Maxmem), alpha_ptob(Maxmem) / 1024); + printf("real memory = %ld (%ld MB)\n", alpha_ptob(Maxmem), + alpha_ptob(Maxmem) / 1048576); /* * Display any holes after the first chunk of extended memory. @@ -285,8 +259,8 @@ vm_ksubmap_init(&kmi); - printf("avail memory = %ld (%ldK bytes)\n", ptoa(cnt.v_free_count), - ptoa(cnt.v_free_count) / 1024); + printf("avail memory = %ld (%ld MB)\n", ptoa(cnt.v_free_count), + ptoa(cnt.v_free_count) / 1048576); /* * Set up buffers, so they can be used to read disk labels. @@ -1370,8 +1344,6 @@ sf.sf_si.si_signo = sig; sf.sf_si.si_code = code; sf.sf_si.si_addr = (void*)frame->tf_regs[FRAME_TRAPARG_A0]; - sf.sf_si.si_pid = p->p_pid; - sf.sf_si.si_uid = p->p_ucred->cr_uid; } else frame->tf_regs[FRAME_A1] = code; @@ -1453,11 +1425,6 @@ sfp = (struct sigframe *)(alpha_pal_rdusp() - rndfsize); PROC_UNLOCK(p); -#ifdef DEBUG - if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) - printf("sendsig(%d): sig %d ssp %p usp %p\n", p->p_pid, - sig, &sf, sfp); -#endif /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; @@ -1476,11 +1443,6 @@ * copy the frame out to userland. */ if (copyout((caddr_t)&sf, (caddr_t)sfp, sizeof(sf)) != 0) { -#ifdef DEBUG - if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) - printf("sendsig(%d): copyout failed on sig %d\n", - p->p_pid, sig); -#endif /* * Process has trashed its stack; give it an illegal * instruction to halt it in its tracks. @@ -1493,11 +1455,6 @@ psignal(p, SIGILL); return; } -#ifdef DEBUG - if (sigdebug & SDB_FOLLOW) - printf("sendsig(%d): sig %d sfp %p code %lx\n", p->p_pid, sig, - sfp, code); -#endif /* * Set up the registers to return to sigcode. @@ -1512,8 +1469,6 @@ sf.sf_si.si_signo = sig; sf.sf_si.si_code = code; sf.sf_si.si_addr = (void*)frame->tf_regs[FRAME_TRAPARG_A0]; - sf.sf_si.si_pid = p->p_pid; - sf.sf_si.si_uid = p->p_ucred->cr_uid; } else frame->tf_regs[FRAME_A1] = code; @@ -1522,15 +1477,6 @@ frame->tf_regs[FRAME_T12] = (u_int64_t)catcher; /* t12 is pv */ frame->tf_regs[FRAME_FLAGS] = 0; /* full restore */ alpha_pal_wrusp((unsigned long)sfp); - -#ifdef DEBUG - if (sigdebug & SDB_FOLLOW) - printf("sendsig(%d): pc %lx, catcher %lx\n", p->p_pid, - frame->tf_regs[FRAME_PC], frame->tf_regs[FRAME_A3]); - if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) - printf("sendsig(%d): sig %d returns\n", - p->p_pid, sig); -#endif } /* @@ -1701,10 +1647,6 @@ pcb = td->td_pcb; p = td->td_proc; -#ifdef DEBUG - if (sigdebug & SDB_FOLLOW) - printf("sigreturn: pid %d, scp %p\n", p->p_pid, ucp); -#endif /* * Fetch the entire context structure at once for speed. * Note that struct osigcontext is smaller than a ucontext_t, @@ -1756,10 +1698,6 @@ &td->td_pcb->pcb_fp, sizeof(struct fpreg)); td->td_pcb->pcb_fp_control = uc.uc_mcontext.mc_fp_control; -#ifdef DEBUG - if (sigdebug & SDB_FOLLOW) - printf("sigreturn(%d): returns\n", p->p_pid); -#endif return (EJUSTRETURN); } ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#39 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.110 2002/10/20 21:40:17 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.112 2002/11/11 05:17:33 alc Exp $ */ /* @@ -170,6 +170,7 @@ #include #include #include +#include #include @@ -321,7 +322,6 @@ * Data for the pv entry allocation mechanism */ static uma_zone_t pvzone; -static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; static int pmap_pagedaemon_waken = 0; @@ -330,7 +330,6 @@ static void alpha_protection_init(void); static void pmap_changebit(vm_page_t m, int bit, boolean_t setem); -static void pmap_remove_all(vm_page_t m); static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t* ptq, vm_offset_t sva); @@ -345,7 +344,6 @@ static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); static vm_page_t pmap_page_lookup(vm_object_t object, vm_pindex_t pindex); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); -static void *pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); #ifdef SMP static void pmap_invalidate_page_action(void *arg); static void pmap_invalidate_all_action(void *arg); @@ -566,11 +564,45 @@ return 0; } -static void * -pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) +void * +uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { + static vm_pindex_t color; + vm_page_t m; + int pflags; + void *va; + *flags = UMA_SLAB_PRIV; - return (void *)kmem_alloc(kernel_map, bytes); + + if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) + pflags = VM_ALLOC_INTERRUPT; + else + pflags = VM_ALLOC_SYSTEM; + + if (wait & M_ZERO) + pflags |= VM_ALLOC_ZERO; + + m = vm_page_alloc(NULL, color++, pflags | VM_ALLOC_NOOBJ); + + if (m) { + va = (void *)ALPHA_PHYS_TO_K0SEG(m->phys_addr); + if ((m->flags & PG_ZERO) == 0) + bzero(va, PAGE_SIZE); + return (va); + } + + return (NULL); +} + +void +uma_small_free(void *mem, int size, u_int8_t flags) +{ + vm_page_t m; + + m = PHYS_TO_VM_PAGE(ALPHA_K0SEG_TO_PHYS((vm_offset_t)mem)); + vm_page_lock_queues(); + vm_page_free(m); + vm_page_unlock_queues(); } /* @@ -608,7 +640,6 @@ initial_pvs = MINPV; pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); - uma_zone_set_allocf(pvzone, pmap_allocf); uma_prealloc(pvzone, initial_pvs); /* * object for kernel page table pages @@ -634,7 +665,6 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_page_array_size; pv_entry_high_water = 9 * (pv_entry_max / 10); - uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); } @@ -1901,7 +1931,7 @@ * pmap_remove (slow...) */ -static void +void pmap_remove_all(vm_page_t m) { register pv_entry_t pv; ==== //depot/projects/smpng/sys/alpha/alpha/prom.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $FreeBSD: src/sys/alpha/alpha/prom.c,v 1.23 2002/03/21 06:14:57 imp Exp $ + * $FreeBSD: src/sys/alpha/alpha/prom.c,v 1.24 2002/11/08 15:24:32 jhb Exp $ */ #include "opt_simos.h" @@ -99,7 +99,9 @@ void init_bootstrap_console() { +#ifndef SIMOS char buf[4]; +#endif init_prom_interface(hwrpb); @@ -200,12 +202,14 @@ /* * SimOS console uses floating point. */ - if (curproc != PCPU_GET(fpcurproc)) { + if (curthread != PCPU_GET(fpcurthread)) { alpha_pal_wrfen(1); - if (PCPU_GET(fpcurproc)) - savefpstate(&PCPU_GET(fpcurproc)->p_addr->u_pcb.pcb_fp); - PCPU_SET(fpcurproc, curproc); - restorefpstate(&PCPU_GET(fpcurproc)->p_addr->u_pcb.pcb_fp); + if (PCPU_GET(fpcurthread)) { + savefpstate(&PCPU_GET(fpcurthread)->td_pcb->pcb_fp); + PCPU_GET(fpcurthread)->td_pcb->pcb_hw.apcb_flags &= ~ALPHA_PCB_FLAGS_FEN; + } + PCPU_SET(fpcurthread, curthread); + restorefpstate(&PCPU_GET(fpcurthread)->td_pcb->pcb_fp); } #endif if (!pmap_uses_prom_console()) ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#25 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.153 2002/10/19 16:53:59 rwatson Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.154 2002/11/07 14:36:56 jhb Exp $ machine alpha cpu EV4 @@ -31,8 +31,6 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options NO_GEOM - # Platforms supported options API_UP1000 # UP1000, UP1100 (Nautilus) options DEC_AXPPCI_33 # UDB, Multia, AXPpci33, NoName ==== //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.4 2001/07/15 17:56:53 obrien Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.5 2002/10/30 01:34:41 gallatin Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -21,6 +21,5 @@ hint.sio.1.at="isa" hint.sio.1.port="0x2F8" hint.sio.1.irq="3" -hint.sio.1.flags="0x50" hint.ppc.0.at="isa" hint.ppc.0.irq="7" ==== //depot/projects/smpng/sys/alpha/include/atomic.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.16 2002/10/25 20:22:12 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.17 2002/10/30 01:41:44 gallatin Exp $ */ #ifndef _MACHINE_ATOMIC_H_ ==== //depot/projects/smpng/sys/alpha/include/bus.h#5 (text+ko) ==== @@ -67,7 +67,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/alpha/include/bus.h,v 1.13 2002/10/21 13:48:29 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.15 2002/11/08 20:49:43 jhb Exp $ */ #ifndef _ALPHA_BUS_H_ #define _ALPHA_BUS_H_ @@ -233,29 +233,29 @@ #define writel(o, v) bus_space_write_4(busspace_isa_mem, o, 0, v) #define insb(o, a, c) bus_space_read_multi_1(busspace_isa_io, o, 0, \ - (void*)a, c) + (void*)(a), c) #define insw(o, a, c) bus_space_read_multi_2(busspace_isa_io, o, 0, \ - (void*)a, c) + (void*)(a), c) #define insl(o, a, c) bus_space_read_multi_4(busspace_isa_io, o, 0, \ - (void*)a, c) + (void*)(a), c) #define outsb(o, a, c) bus_space_write_multi_1(busspace_isa_io, o, 0, \ - (void*)a, c) + (void*)(a), c) #define outsw(o, a, c) bus_space_write_multi_2(busspace_isa_io, o, 0, \ - (void*)a, c) + (void*)(a), c) #define outsl(o, a, c) bus_space_write_multi_4(busspace_isa_io, o, 0, \ - (void*)a, c) + (void*)(a), c) #define memcpy_fromio(d, s, c) \ - bus_space_read_region_1(busspace_isa_mem, s, 0, d, c) + bus_space_read_region_1(busspace_isa_mem, (uintptr_t)(s), 0, d, c) #define memcpy_toio(d, s, c) \ - bus_space_write_region_1(busspace_isa_mem, d, 0, s, c) + bus_space_write_region_1(busspace_isa_mem, (uintptr_t)(d), 0, s, c) #define memcpy_io(d, s, c) \ - bus_space_copy_region_1(busspace_isa_mem, s, 0, d, 0, c) + bus_space_copy_region_1(busspace_isa_mem, (uintptr_t)(s), 0, d, 0, c) #define memset_io(d, v, c) \ - bus_space_set_region_1(busspace_isa_mem, d, 0, v, c) + bus_space_set_region_1(busspace_isa_mem, (uintptr_t)(d), 0, v, c) #define memsetw_io(d, v, c) \ - bus_space_set_region_2(busspace_isa_mem, d, 0, v, c) + bus_space_set_region_2(busspace_isa_mem, (uintptr_t)(d), 0, v, c) static __inline void memsetw(void *d, int val, size_t size) ==== //depot/projects/smpng/sys/alpha/include/vmparam.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.7 2001/09/12 08:36:55 julian Exp $ */ +/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.8 2002/11/01 03:34:51 jeff Exp $ */ /* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */ #ifndef _ALPHA_VMPARAM_H #define _ALPHA_VMPARAM_H @@ -129,6 +129,12 @@ protected against replacement */ /* + * Alpha provides a machine specific single page allocator through the use + * of K0SEG. + */ +#define UMA_MD_SMALL_ALLOC + +/* * Mach derived constants */ ==== //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.22 2002/03/01 23:15:45 mjacob Exp $ + * $FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.23 2002/11/08 20:52:21 jhb Exp $ */ /* @@ -123,7 +123,11 @@ static driver_intr_t dwlpx_intr; static u_int32_t imaskcache[DWLPX_NIONODE][DWLPX_NHOSE][NHPC]; +#ifdef SIMOS +extern void simos_intr(int); +#else static void dwlpx_eintr(unsigned long); +#endif /* * Direct-mapped window: 2G at 2G @@ -741,13 +745,19 @@ /* */ +#ifdef SIMOS static void dwlpx_intr(void *arg) { -#ifdef SIMOS - extern void simos_intr(int); + simos_intr(0); -#else +} + +#else /* !SIMOS */ + +static void +dwlpx_intr(void *arg) +{ unsigned long vec = (unsigned long) arg; if ((vec & DWLPX_VEC_EMARK) != 0) { dwlpx_eintr(vec); @@ -758,7 +768,6 @@ /* NOTREACHED */ } alpha_dispatch_intr(NULL, vec); -#endif } static void @@ -833,6 +842,7 @@ REGVAL(PCIA_ERR(i) + sc->sysbase) = hpcs[i].err; } } +#endif /* SIMOS */ static device_method_t dwlpx_methods[] = { /* Device interface */ ==== //depot/projects/smpng/sys/boot/forth/loader.conf#13 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.64 2002/09/02 20:10:18 brooks Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.66 2002/11/02 08:49:51 mini Exp $ ############################################################## ### Basic configuration options ############################ @@ -91,7 +91,7 @@ #kern.ncallout="" # Set the maximum # of timer events #kern.sgrowsiz="" # Set the amount to grow stack #kern.cam.scsi_delay="2000" # Delay (in ms) before probing SCSI -#kern.ipc.maxsockets="" # Set the maximum number of sockets avaliable >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 15:22:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EBB337B404; Mon, 11 Nov 2002 15:22:16 -0800 (PST) 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 19CD737B401; Mon, 11 Nov 2002 15:22:16 -0800 (PST) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5683343E3B; Mon, 11 Nov 2002 15:22:15 -0800 (PST) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id gABNLbOo000430; Mon, 11 Nov 2002 18:21:38 -0500 (EST) (envelope-from robert@fledge.watson.org) Date: Mon, 11 Nov 2002 18:21:37 -0500 (EST) From: Robert Watson X-Sender: robert@fledge.watson.org To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 20974 for review In-Reply-To: <200211112046.gABKkFfK092118@repoman.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Ah, great, thanks! I'll pick this up for use with the MAC Framework with our new condition variable code when we IFC it in from the main tree. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Mon, 11 Nov 2002, John Baldwin wrote: > http://perforce.freebsd.org/chv.cgi?CH=20974 > > Change 20974 by jhb@jhb_laptop on 2002/11/11 12:45:33 > > Change consumers of WITNESS_SLEEP() to use WITNESS_WARN() instead. > > Affected files ... > > .. //depot/projects/smpng/sys/kern/kern_condvar.c#21 edit > .. //depot/projects/smpng/sys/kern/kern_sig.c#49 edit > .. //depot/projects/smpng/sys/kern/kern_synch.c#36 edit > .. //depot/projects/smpng/sys/kern/kern_sysctl.c#25 edit > .. //depot/projects/smpng/sys/vm/uma_core.c#21 edit > > Differences ... > > ==== //depot/projects/smpng/sys/kern/kern_condvar.c#21 (text+ko) ==== > > @@ -219,7 +219,8 @@ > ktrcsw(1, 0); > #endif > CV_ASSERT(cvp, mp, td); > - WITNESS_SLEEP(0, &mp->mtx_object); > + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->mtx_object, > + "Waiting on \"%s\"", cvp->cv_description); > WITNESS_SAVE(&mp->mtx_object, mp); > > if (cold ) { > @@ -275,7 +276,8 @@ > ktrcsw(1, 0); > #endif > CV_ASSERT(cvp, mp, td); > - WITNESS_SLEEP(0, &mp->mtx_object); > + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->mtx_object, > + "Waiting on \"%s\"", cvp->cv_description); > WITNESS_SAVE(&mp->mtx_object, mp); > > if (cold || panicstr) { > @@ -343,7 +345,8 @@ > ktrcsw(1, 0); > #endif > CV_ASSERT(cvp, mp, td); > - WITNESS_SLEEP(0, &mp->mtx_object); > + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->mtx_object, > + "Waiting on \"%s\"", cvp->cv_description); > WITNESS_SAVE(&mp->mtx_object, mp); > > if (cold || panicstr) { > @@ -421,7 +424,8 @@ > ktrcsw(1, 0); > #endif > CV_ASSERT(cvp, mp, td); > - WITNESS_SLEEP(0, &mp->mtx_object); > + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mp->mtx_object, > + "Waiting on \"%s\"", cvp->cv_description); > WITNESS_SAVE(&mp->mtx_object, mp); > > if (cold || panicstr) { > > ==== //depot/projects/smpng/sys/kern/kern_sig.c#49 (text+ko) ==== > > @@ -1674,7 +1674,8 @@ > > p = td->td_proc; > PROC_LOCK_ASSERT(p, MA_OWNED); > - WITNESS_SLEEP(1, &p->p_mtx.mtx_object); > + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &p->p_mtx.mtx_object, > + "Checking for signals"); > for (;;) { > int traced = (p->p_flag & P_TRACED) || (p->p_stops & S_SIG); > > > ==== //depot/projects/smpng/sys/kern/kern_synch.c#36 (text+ko) ==== > > @@ -143,7 +143,8 @@ > if (KTRPOINT(td, KTR_CSW)) > ktrcsw(1, 0); > #endif > - WITNESS_SLEEP(0, &mtx->mtx_object); > + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &mtx->mtx_object, > + "Sleeping on \"%s\"", wmesg); > KASSERT(timo != 0 || mtx_owned(&Giant) || mtx != NULL, > ("sleeping without a mutex")); > /* > > ==== //depot/projects/smpng/sys/kern/kern_sysctl.c#25 (text+ko) ==== > > @@ -999,7 +999,8 @@ > size_t i = 0; > > if (req->lock == 1 && req->oldptr) > - WITNESS_SLEEP(1, NULL); > + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, > + "sysctl_old_user"); > if (req->oldptr) { > i = l; > if (req->oldlen <= req->oldidx) > > ==== //depot/projects/smpng/sys/vm/uma_core.c#21 (text+ko) ==== > > @@ -1308,7 +1308,8 @@ > if (!(flags & M_NOWAIT)) { > KASSERT(curthread->td_intr_nesting_level == 0, > ("malloc(M_WAITOK) in interrupt context")); > - WITNESS_SLEEP(1, NULL); > + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, > + "malloc() of \"%s\"", zone->uz_name); > } > > zalloc_restart: > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 16:43:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3114F37B401; Mon, 11 Nov 2002 16:43:39 -0800 (PST) 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 09AB437B404 for ; Mon, 11 Nov 2002 16:43:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AACCC43E75 for ; Mon, 11 Nov 2002 16:43:38 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAC0fJmV012673 for ; Mon, 11 Nov 2002 16:41:19 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAC0fJAV012669 for perforce@freebsd.org; Mon, 11 Nov 2002 16:41:19 -0800 (PST) Date: Mon, 11 Nov 2002 16:41:19 -0800 (PST) Message-Id: <200211120041.gAC0fJAV012669@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 Subject: PERFORCE change 20981 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20981 Change 20981 by rwatson@rwatson_tislabs on 2002/11/11 16:41:03 Introduce a condition variable to avoid returning EBUSY when the MAC policy list is busy during a load or unload attempt. We assert no locks held during the cv wait, meaning we should be fairly deadlock-safe. Because of the cv model and busy count, it's possible for a cv waiter waiting for exclusive access to the policy list to be starved by active and long-lived access control/labeling events. For now, we accept that as a necessary tradeoff. Largely extracted from: amigus_mac_userland Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#356 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#356 (text+ko) ==== @@ -46,6 +46,7 @@ #include "opt_devfs.h" #include +#include #include #include #include @@ -233,12 +234,14 @@ * and that this is not yet done for relabel requests. */ static struct mtx mac_policy_list_lock; +static struct cv mac_policy_list_not_busy; static LIST_HEAD(, mac_policy_conf) mac_policy_list; static int mac_policy_list_busy; #define MAC_POLICY_LIST_LOCKINIT() do { \ mtx_init(&mac_policy_list_lock, "mac_policy_list_lock", NULL, \ MTX_DEF); \ + cv_init(&mac_policy_list_not_busy, "mac_policy_list_not_busy"); \ } while (0) #define MAC_POLICY_LIST_LOCK() do { \ @@ -249,6 +252,14 @@ mtx_unlock(&mac_policy_list_lock); \ } while (0) +#define MAC_POLICY_LIST_EXCLUSIVE() do { \ + WITNESS_SLEEP(1, NULL); \ + mtx_lock(&mac_policy_list_lock); \ + while (mac_policy_list_busy != 0) \ + cv_wait(&mac_policy_list_not_busy, \ + &mac_policy_list_lock); \ +} while (0) + #define MAC_POLICY_LIST_BUSY() do { \ MAC_POLICY_LIST_LOCK(); \ mac_policy_list_busy++; \ @@ -258,8 +269,9 @@ #define MAC_POLICY_LIST_UNBUSY() do { \ MAC_POLICY_LIST_LOCK(); \ mac_policy_list_busy--; \ - if (mac_policy_list_busy < 0) \ - panic("Extra mac_policy_list_busy--"); \ + KASSERT(mac_policy_list_busy >= 0, ("MAC_POLICY_LIST_LOCK")); \ + if (mac_policy_list_busy == 0) \ + cv_signal(&mac_policy_list_not_busy); \ MAC_POLICY_LIST_UNLOCK(); \ } while (0) @@ -474,11 +486,7 @@ struct mac_policy_conf *tmpc; int slot; - MAC_POLICY_LIST_LOCK(); - if (mac_policy_list_busy > 0) { - MAC_POLICY_LIST_UNLOCK(); - return (EBUSY); - } + MAC_POLICY_LIST_EXCLUSIVE(); LIST_FOREACH(tmpc, &mac_policy_list, mpc_list) { if (strcmp(tmpc->mpc_name, mpc->mpc_name) == 0) { MAC_POLICY_LIST_UNLOCK(); @@ -518,7 +526,7 @@ * to see if we did the run-time registration, and if not, * silently succeed. */ - MAC_POLICY_LIST_LOCK(); + MAC_POLICY_LIST_EXCLUSIVE(); if ((mpc->mpc_runtime_flags & MPC_RUNTIME_FLAG_REGISTERED) == 0) { MAC_POLICY_LIST_UNLOCK(); return (0); @@ -540,23 +548,14 @@ MAC_POLICY_LIST_UNLOCK(); return (EBUSY); } - /* - * Right now, we EBUSY if the list is in use. In the future, - * for reliability reasons, we might want to sleep and wakeup - * later to try again. - */ - if (mac_policy_list_busy > 0) { - MAC_POLICY_LIST_UNLOCK(); - return (EBUSY); - } if (mpc->mpc_ops->mpo_destroy != NULL) (*(mpc->mpc_ops->mpo_destroy))(mpc); LIST_REMOVE(mpc, mpc_list); + mpc->mpc_runtime_flags &= ~MPC_RUNTIME_FLAG_REGISTERED; + MAC_POLICY_LIST_UNLOCK(); - mpc->mpc_runtime_flags &= ~MPC_RUNTIME_FLAG_REGISTERED; - printf("Security policy unload: %s (%s)\n", mpc->mpc_fullname, mpc->mpc_name); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 19:46:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CF1437B404; Mon, 11 Nov 2002 19:46:20 -0800 (PST) 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 1260237B401 for ; Mon, 11 Nov 2002 19:46:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9773C43E42 for ; Mon, 11 Nov 2002 19:46:19 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAC3i0mV028622 for ; Mon, 11 Nov 2002 19:44:00 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAC3hx5p028617 for perforce@freebsd.org; Mon, 11 Nov 2002 19:43:59 -0800 (PST) Date: Mon, 11 Nov 2002 19:43:59 -0800 (PST) Message-Id: <200211120343.gAC3hx5p028617@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 Subject: PERFORCE change 20983 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20983 Change 20983 by rwatson@rwatson_tislabs on 2002/11/11 19:43:58 GC mac_create_devfs_vnode and mpo_create_devfs_vnode, they're no longer used. Migrate the comment in SEBSD to the new associate call, since that's where it applies. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#357 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#184 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#37 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#147 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#106 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#82 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#59 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#215 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#169 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#357 (text+ko) ==== @@ -2740,13 +2740,6 @@ } void -mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp) -{ - - MAC_PERFORM(create_devfs_vnode, de, &de->de_label, vp, &vp->v_label); -} - -void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de) { ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#184 (text+ko) ==== @@ -844,17 +844,6 @@ } static void -mac_biba_create_devfs_vnode(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) -{ - struct mac_biba *source, *dest; - - source = SLOT(direntlabel); - dest = SLOT(vnodelabel); - mac_biba_copy_single(source, dest); -} - -static void mac_biba_create_mount(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel) { @@ -2587,7 +2576,6 @@ .mpo_create_devfs_device = mac_biba_create_devfs_device, .mpo_create_devfs_directory = mac_biba_create_devfs_directory, .mpo_create_devfs_symlink = mac_biba_create_devfs_symlink, - .mpo_create_devfs_vnode = mac_biba_create_devfs_vnode, .mpo_create_mount = mac_biba_create_mount, .mpo_create_root_mount = mac_biba_create_root_mount, .mpo_relabel_vnode = mac_biba_relabel_vnode, ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#37 (text+ko) ==== @@ -980,17 +980,6 @@ } static void -mac_lomac_create_devfs_vnode(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) -{ - struct mac_lomac *source, *dest; - - source = SLOT(direntlabel); - dest = SLOT(vnodelabel); - mac_lomac_copy_single(source, dest); -} - -static void mac_lomac_create_mount(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel) { @@ -2615,7 +2604,6 @@ .mpo_create_devfs_device = mac_lomac_create_devfs_device, .mpo_create_devfs_directory = mac_lomac_create_devfs_directory, .mpo_create_devfs_symlink = mac_lomac_create_devfs_symlink, - .mpo_create_devfs_vnode = mac_lomac_create_devfs_vnode, .mpo_create_mount = mac_lomac_create_mount, .mpo_create_root_mount = mac_lomac_create_root_mount, .mpo_relabel_vnode = mac_lomac_relabel_vnode, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#147 (text+ko) ==== @@ -813,17 +813,6 @@ } static void -mac_mls_create_devfs_vnode(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) -{ - struct mac_mls *source, *dest; - - source = SLOT(direntlabel); - dest = SLOT(vnodelabel); - mac_mls_copy_single(source, dest); -} - -static void mac_mls_create_mount(struct ucred *cred, struct mount *mp, struct label *mntlabel, struct label *fslabel) { @@ -2424,7 +2413,6 @@ .mpo_create_devfs_device = mac_mls_create_devfs_device, .mpo_create_devfs_directory = mac_mls_create_devfs_directory, .mpo_create_devfs_symlink = mac_mls_create_devfs_symlink, - .mpo_create_devfs_vnode = mac_mls_create_devfs_vnode, .mpo_create_mount = mac_mls_create_mount, .mpo_create_root_mount = mac_mls_create_root_mount, .mpo_relabel_vnode = mac_mls_relabel_vnode, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#106 (text+ko) ==== @@ -189,13 +189,6 @@ } -static void -mac_none_create_devfs_vnode(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) -{ - -} - static int mac_none_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *dvp, struct label *dlabel, @@ -979,7 +972,6 @@ .mpo_create_devfs_device = mac_none_create_devfs_device, .mpo_create_devfs_directory = mac_none_create_devfs_directory, .mpo_create_devfs_symlink = mac_none_create_devfs_symlink, - .mpo_create_devfs_vnode = mac_none_create_devfs_vnode, .mpo_create_vnode_extattr = mac_none_create_vnode_extattr, .mpo_create_mount = mac_none_create_mount, .mpo_create_root_mount = mac_none_create_root_mount, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#82 (text+ko) ==== @@ -567,13 +567,6 @@ } -static void -mac_test_create_devfs_vnode(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) -{ - -} - static int mac_test_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *dvp, struct label *dlabel, @@ -1377,7 +1370,6 @@ .mpo_create_devfs_device = mac_test_create_devfs_device, .mpo_create_devfs_directory = mac_test_create_devfs_directory, .mpo_create_devfs_symlink = mac_test_create_devfs_symlink, - .mpo_create_devfs_vnode = mac_test_create_devfs_vnode, .mpo_create_vnode_extattr = mac_test_create_vnode_extattr, .mpo_create_mount = mac_test_create_mount, .mpo_create_root_mount = mac_test_create_root_mount, ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#59 (text+ko) ==== @@ -448,10 +448,12 @@ } static void -sebsd_create_devfs_vnode(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, - struct label *vnodelabel) +sebsd_associate_vnode_devfs(struct mount *mp, struct label *fslabel, + struct devfs_dirent *de, struct label *delabel, + struct vnode *vp, struct label *vlabel) { + + /* TBD, default to SECINITSID_UNLABELED. */ /* * This is a no-op for now, but when devfs_dirents do contain * labels, they should be copied to the vp here as per how @@ -461,16 +463,6 @@ */ } - -static void -sebsd_associate_vnode_devfs(struct mount *mp, struct label *fslabel, - struct devfs_dirent *de, struct label *delabel, - struct vnode *vp, struct label *vlabel) -{ - - /* TBD, default to SECINITSID_UNLABELED. */ -} - static int sebsd_associate_vnode_extattr(struct mount *mp, struct label *fslabel, struct vnode *vp, struct label *vlabel) @@ -1266,7 +1258,6 @@ .mpo_execve_will_transition = sebsd_execve_will_transition, .mpo_relabel_cred = sebsd_relabel_cred, .mpo_relabel_vnode = sebsd_relabel_vnode, - .mpo_create_devfs_vnode = sebsd_create_devfs_vnode, .mpo_setlabel_vnode_extattr = sebsd_setlabel_vnode_extattr, .mpo_syscall = sebsd_syscall, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#215 (text+ko) ==== @@ -176,7 +176,6 @@ struct devfs_dirent *de); void mac_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, struct devfs_dirent *de); -void mac_create_devfs_vnode(struct devfs_dirent *de, struct vnode *vp); int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); void mac_create_mount(struct ucred *cred, struct mount *mp); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#169 (text+ko) ==== @@ -149,9 +149,6 @@ void (*mpo_create_devfs_symlink)(struct ucred *cred, struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel); - void (*mpo_create_devfs_vnode)(struct devfs_dirent *de, - struct label *direntlabel, struct vnode *vp, - struct label *vnodelabel); int (*mpo_create_vnode_extattr)(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *dvp, struct label *dlabel, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 11 20:22: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12FE537B404; Mon, 11 Nov 2002 20:22:04 -0800 (PST) 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 A00EB37B401 for ; Mon, 11 Nov 2002 20:22:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B05843E42 for ; Mon, 11 Nov 2002 20:22:03 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAC4JhmV031963 for ; Mon, 11 Nov 2002 20:19:43 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAC4Jh6n031960 for perforce@freebsd.org; Mon, 11 Nov 2002 20:19:43 -0800 (PST) Date: Mon, 11 Nov 2002 20:19:43 -0800 (PST) Message-Id: <200211120419.gAC4Jh6n031960@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 Subject: PERFORCE change 20984 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20984 Change 20984 by rwatson@rwatson_tislabs on 2002/11/11 20:19:15 Comment updates regarding synchronization. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#358 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#358 (text+ko) ==== @@ -226,12 +226,18 @@ MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); /* - * mac_policy_list_lock protects the consistency of 'mac_policy_list', - * the linked list of attached policy modules. Read-only consumers of - * the list must acquire a shared lock for the duration of their use; - * writers must acquire an exclusive lock. Note that for compound - * operations, locks should be held for the entire compound operation, - * and that this is not yet done for relabel requests. + * mac_policy_list stores the list of active policies. A busy count is + * maintained for the list, stored in mac_policy_busy. The busy count + * is protected by mac_policy_list_lock; the list may be modified only + * while the busy count is 0, requiring that the lock be held to + * prevent new references to the list from being acquired. For almost + * all operations, incrementing the busy count is sufficient to + * guarantee consistency, as the list cannot be modified while the + * busy count is elevated. For a few special operations involving a + * change to the list of active policies, the lock itself must be held. + * A condition variable, mac_policy_list_not_busy, is used to signal + * potential exclusive consumers that they should try to acquire the + * lock if a first attempt at exclusive access fails. */ static struct mtx mac_policy_list_lock; static struct cv mac_policy_list_not_busy; @@ -252,6 +258,15 @@ mtx_unlock(&mac_policy_list_lock); \ } while (0) +/* + * We manually invoke WITNESS_SLEEP() to allow Witness to generate + * warnings even if we don't end up ever triggering the wait at + * run-time. The consumer of the exclusive interface must not hold + * any locks (other than potentially Giant) since we may sleep for + * long (potentially indefinite) periods of time waiting for the + * framework to become quiescent so that a policy list change may + * be made. + */ #define MAC_POLICY_LIST_EXCLUSIVE() do { \ WITNESS_SLEEP(1, NULL); \ mtx_lock(&mac_policy_list_lock); \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 12 5:42:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76E0837B404; Tue, 12 Nov 2002 05:42:30 -0800 (PST) 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 0D4CA37B401 for ; Tue, 12 Nov 2002 05:42:30 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB69D43E3B for ; Tue, 12 Nov 2002 05:42:29 -0800 (PST) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gACDe8mV079578 for ; Tue, 12 Nov 2002 05:40:08 -0800 (PST) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gACDe7IM079575 for perforce@freebsd.org; Tue, 12 Nov 2002 05:40:07 -0800 (PST) Date: Tue, 12 Nov 2002 05:40:07 -0800 (PST) Message-Id: <200211121340.gACDe7IM079575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 20998 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20998 Change 20998 by cvance@cvance_laptop on 2002/11/12 05:39:26 Add ufs to the list of filesystems having persistent SID storage Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/fs_use#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/fs_use#2 (text+ko) ==== @@ -9,6 +9,7 @@ fs_use_psid ext2; fs_use_psid ext3; fs_use_psid reiserfs; +fs_use_psid ufs; # Use the allocating task SID to label inodes in the following filesystem # types, and label the filesystem itself with the specified context. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 12 12:30:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40EE037B404; Tue, 12 Nov 2002 12:30:49 -0800 (PST) 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 CAD1B37B401 for ; Tue, 12 Nov 2002 12:30:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86C2843E4A for ; Tue, 12 Nov 2002 12:30:48 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gACKSPmV014635 for ; Tue, 12 Nov 2002 12:28:25 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gACKSPMx014630 for perforce@freebsd.org; Tue, 12 Nov 2002 12:28:25 -0800 (PST) Date: Tue, 12 Nov 2002 12:28:25 -0800 (PST) Message-Id: <200211122028.gACKSPMx014630@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21008 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21008 Change 21008 by green@green_laptop_2 on 2002/11/12 12:27:37 Make ls(1) use correct logic for finding the path names for files to look up MAC labels for. Affected files ... .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#20 edit Differences ... ==== //depot/projects/trustedbsd/mac/bin/ls/ls.c#20 (text+ko) ==== @@ -691,17 +691,15 @@ error = mac_prepare_file_label(&label); if (error == -1) { - warn("%s", cur->fts_name); + warn("MAC label for %s/%s", + cur->fts_parent->fts_path, + cur->fts_name); goto label_out; } - if (cur->fts_level == FTS_ROOTLEVEL) - snprintf(name, sizeof(name), - "%s", cur->fts_name); - else - snprintf(name, sizeof(name), - "%s/%s", cur->fts_parent->fts_accpath, - cur->fts_name); + snprintf(name, sizeof(name), "%s/%s", + cur->fts_parent->fts_accpath, + cur->fts_name); if (options & FTS_LOGICAL) error = mac_get_file(name, @@ -710,7 +708,9 @@ error = mac_get_link(name, label); if (error == -1) { - warn("%s", cur->fts_name); + warn("MAC label for %s/%s", + cur->fts_parent->fts_path, + cur->fts_name); mac_free(label); goto label_out; } @@ -718,7 +718,9 @@ error = mac_to_text(label, &labelstr); if (error == -1) { - warn("%s", cur->fts_name); + warn("MAC label for %s/%s", + cur->fts_parent->fts_path, + cur->fts_name); mac_free(label); goto label_out; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 12 12:35: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F167C37B404; Tue, 12 Nov 2002 12:34:54 -0800 (PST) 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 890C537B401 for ; Tue, 12 Nov 2002 12:34:54 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 32A3343E77 for ; Tue, 12 Nov 2002 12:34:54 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gACKWVmV015045 for ; Tue, 12 Nov 2002 12:32:31 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gACKWU4H015042 for perforce@freebsd.org; Tue, 12 Nov 2002 12:32:30 -0800 (PST) Date: Tue, 12 Nov 2002 12:32:30 -0800 (PST) Message-Id: <200211122032.gACKWU4H015042@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21009 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21009 Change 21009 by jmallett@jmallett_dalek on 2002/11/12 12:32:04 Match -m* -f* options with what my toy kernels are using. Affected files ... .. //depot/projects/mips/sys/conf/Makefile.mips#2 edit Differences ... ==== //depot/projects/mips/sys/conf/Makefile.mips#2 (text+ko) ==== @@ -40,7 +40,7 @@ COPTS+= -D__FreeBSD__ .endif -COPTS+= -msoft-float +COPTS+= -mno-abicalls -fno-pic -msoft-float %BEFORE_DEPEND To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 12 15:48:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD65C37B404; Tue, 12 Nov 2002 15:48:52 -0800 (PST) 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 640EA37B401 for ; Tue, 12 Nov 2002 15:48:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21EDF43E3B for ; Tue, 12 Nov 2002 15:48:52 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gACNkSmV032276 for ; Tue, 12 Nov 2002 15:46:28 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gACNkRbb032273 for perforce@freebsd.org; Tue, 12 Nov 2002 15:46:27 -0800 (PST) Date: Tue, 12 Nov 2002 15:46:27 -0800 (PST) Message-Id: <200211122346.gACNkRbb032273@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21015 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21015 Change 21015 by green@green_laptop_2 on 2002/11/12 15:45:46 Really correct the initial issue in ls(1): test for whether there is a parent directory without paying attention to any fields other than fts_parent and fts_name when attempting to find a MAC label for a given FTSENT. Affected files ... .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/bin/ls/ls.c#21 (text+ko) ==== @@ -697,9 +697,13 @@ goto label_out; } - snprintf(name, sizeof(name), "%s/%s", - cur->fts_parent->fts_accpath, - cur->fts_name); + if (cur->fts_parent == NULL) + snprintf(name, sizeof(name), + "%s", p->fts_name); + else + snprintf(name, sizeof(name), + "%s/%s", cur->fts_parent-> + fts_accpath, cur->fts_name); if (options & FTS_LOGICAL) error = mac_get_file(name, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 12 17:47:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36E9A37B404; Tue, 12 Nov 2002 17:47:27 -0800 (PST) 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 CFCDB37B401 for ; Tue, 12 Nov 2002 17:47:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D2B243E77 for ; Tue, 12 Nov 2002 17:47:25 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAD1j0mV042538 for ; Tue, 12 Nov 2002 17:45:00 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAD1ip2U042521 for perforce@freebsd.org; Tue, 12 Nov 2002 17:44:51 -0800 (PST) Date: Tue, 12 Nov 2002 17:44:51 -0800 (PST) Message-Id: <200211130144.gAD1ip2U042521@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21017 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21017 Change 21017 by peter@peter_daintree on 2002/11/12 17:44:24 IFC @21016 Affected files ... .. //depot/projects/ia64/MAINTAINERS#17 integrate .. //depot/projects/ia64/Makefile.inc1#40 integrate .. //depot/projects/ia64/bin/chmod/chmod.1#6 integrate .. //depot/projects/ia64/bin/getfacl/getfacl.1#3 integrate .. //depot/projects/ia64/bin/getfacl/getfacl.c#5 integrate .. //depot/projects/ia64/bin/ls/ls.1#12 integrate .. //depot/projects/ia64/bin/ls/ls.c#13 integrate .. //depot/projects/ia64/bin/ls/print.c#9 integrate .. //depot/projects/ia64/bin/ps/extern.h#8 integrate .. //depot/projects/ia64/bin/ps/nlist.c#5 integrate .. //depot/projects/ia64/contrib/gcc/config/sparc/freebsd.h#4 integrate .. //depot/projects/ia64/contrib/lukemftpd/ChangeLog#3 integrate .. //depot/projects/ia64/contrib/lukemftpd/acconfig.h#2 integrate .. //depot/projects/ia64/contrib/lukemftpd/config.h.in#2 integrate .. //depot/projects/ia64/contrib/lukemftpd/configure#3 integrate .. //depot/projects/ia64/contrib/lukemftpd/configure.in#3 integrate .. //depot/projects/ia64/contrib/lukemftpd/lukemftpd.h#3 integrate .. //depot/projects/ia64/contrib/lukemftpd/todo#3 integrate .. //depot/projects/ia64/contrib/ntp/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/ntp/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/ntp/NEWS#3 integrate .. //depot/projects/ia64/contrib/ntp/README.bk#2 integrate .. //depot/projects/ia64/contrib/ntp/README.refclocks#1 branch .. //depot/projects/ia64/contrib/ntp/acconfig.h#3 integrate .. //depot/projects/ia64/contrib/ntp/aclocal.m4#3 integrate .. //depot/projects/ia64/contrib/ntp/config.guess#2 integrate .. //depot/projects/ia64/contrib/ntp/config.h.in#3 integrate .. //depot/projects/ia64/contrib/ntp/config.sub#2 integrate .. //depot/projects/ia64/contrib/ntp/configure#3 integrate .. //depot/projects/ia64/contrib/ntp/configure.in#3 integrate .. //depot/projects/ia64/contrib/ntp/depcomp#2 integrate .. //depot/projects/ia64/contrib/ntp/flock-build#2 integrate .. //depot/projects/ia64/contrib/ntp/html/driver42.htm#1 branch .. //depot/projects/ia64/contrib/ntp/html/driver42.html#2 delete .. //depot/projects/ia64/contrib/ntp/html/driver43.htm#1 branch .. //depot/projects/ia64/contrib/ntp/html/driver44.htm#1 branch .. //depot/projects/ia64/contrib/ntp/html/refclock.htm#3 integrate .. //depot/projects/ia64/contrib/ntp/include/l_stdlib.h#2 integrate .. //depot/projects/ia64/contrib/ntp/include/ntp.h#3 integrate .. //depot/projects/ia64/contrib/ntp/include/ntp_syscall.h#2 integrate .. //depot/projects/ia64/contrib/ntp/install-sh#2 integrate .. //depot/projects/ia64/contrib/ntp/libntp/clocktypes.c#3 integrate .. //depot/projects/ia64/contrib/ntp/libntp/msyslog.c#2 integrate .. //depot/projects/ia64/contrib/ntp/missing#2 integrate .. //depot/projects/ia64/contrib/ntp/mkinstalldirs#3 integrate .. //depot/projects/ia64/contrib/ntp/ntpd/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/ntp/ntpd/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/ntp/ntpd/ntp_control.c#3 integrate .. //depot/projects/ia64/contrib/ntp/ntpd/ntp_loopfilter.c#3 integrate .. //depot/projects/ia64/contrib/ntp/ntpd/refclock_conf.c#3 integrate .. //depot/projects/ia64/contrib/ntp/ntpd/refclock_jjy.c#2 integrate .. //depot/projects/ia64/contrib/ntp/ntpd/refclock_local.c#3 integrate .. //depot/projects/ia64/contrib/ntp/ntpd/refclock_neoclock4x.c#1 branch .. //depot/projects/ia64/contrib/ntp/ntpd/refclock_ripencc.c#1 branch .. //depot/projects/ia64/contrib/ntp/ntpd/refclock_zyfer.c#2 integrate .. //depot/projects/ia64/contrib/ntp/ntpdate/ntpdate.c#3 integrate .. //depot/projects/ia64/contrib/ntp/parseutil/dcfd.c#2 integrate .. //depot/projects/ia64/contrib/ntp/util/ansi2knr.c#3 integrate .. //depot/projects/ia64/contrib/ntp/version#2 integrate .. //depot/projects/ia64/crypto/openssh/auth2-pam-freebsd.c#5 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config#9 integrate .. //depot/projects/ia64/crypto/openssh/ssh_config.5#5 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config#10 integrate .. //depot/projects/ia64/crypto/openssh/sshd_config.5#5 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#20 integrate .. //depot/projects/ia64/etc/inetd.conf#9 integrate .. //depot/projects/ia64/etc/mtree/BSD.var.dist#9 integrate .. //depot/projects/ia64/etc/namedb/named.root#2 integrate .. //depot/projects/ia64/etc/rc.d/Makefile#7 integrate .. //depot/projects/ia64/etc/rc.d/devd#1 branch .. //depot/projects/ia64/etc/rc.d/ipfilter#5 integrate .. //depot/projects/ia64/etc/rc.d/ypbind#4 integrate .. //depot/projects/ia64/etc/rc.network#18 integrate .. //depot/projects/ia64/etc/rc.subr#7 integrate .. //depot/projects/ia64/games/fortune/datfiles/Makefile#3 integrate .. //depot/projects/ia64/games/fortune/datfiles/gerrold.limerick#3 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/Makefile.tgt#7 integrate .. //depot/projects/ia64/include/unistd.h#14 integrate .. //depot/projects/ia64/lib/libc/gen/_pthread_stubs.c#4 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/_setjmp.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/setjmp.S#2 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/sigsetjmp.S#2 integrate .. //depot/projects/ia64/lib/libc/include/namespace.h#5 integrate .. //depot/projects/ia64/lib/libc/include/reentrant.h#2 integrate .. //depot/projects/ia64/lib/libc/locale/btowc.3#2 integrate .. //depot/projects/ia64/lib/libc/locale/mbrlen.3#4 integrate .. //depot/projects/ia64/lib/libc/locale/mbrtowc.c#3 integrate .. //depot/projects/ia64/lib/libc/locale/mbstowcs.c#4 integrate .. //depot/projects/ia64/lib/libc/locale/wctrans.c#2 integrate .. //depot/projects/ia64/lib/libc/posix1e/Makefile.inc#6 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl.3#2 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac.c#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/mac_exec.c#1 branch .. //depot/projects/ia64/lib/libc/posix1e/mac_text.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/posix1e.3#4 integrate .. //depot/projects/ia64/lib/libc/stdio/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/stdio/findfp.c#7 integrate .. //depot/projects/ia64/lib/libc/stdio/vfscanf.c#9 integrate .. //depot/projects/ia64/lib/libc/stdio/vfwscanf.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/gettimeofday.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/kqueue.2#4 integrate .. //depot/projects/ia64/lib/libc/sys/pathconf.2#2 integrate .. //depot/projects/ia64/lib/libc/sys/uuidgen.2#5 integrate .. //depot/projects/ia64/lib/libc/uuid/uuid.h#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_write.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_writev.c#4 integrate .. //depot/projects/ia64/lib/libdisk/chunk.c#7 integrate .. //depot/projects/ia64/lib/libdisk/create_chunk.c#9 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#11 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.3#3 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.h#9 integrate .. //depot/projects/ia64/lib/libdisk/tst01.c#5 integrate .. //depot/projects/ia64/lib/libdisk/write_alpha_disk.c#3 integrate .. //depot/projects/ia64/lib/libdisk/write_i386_disk.c#2 integrate .. //depot/projects/ia64/lib/libdisk/write_ia64_disk.c#6 integrate .. //depot/projects/ia64/lib/libdisk/write_pc98_disk.c#3 integrate .. //depot/projects/ia64/lib/libdisk/write_sparc64_disk.c#2 integrate .. //depot/projects/ia64/lib/libfetch/fetch.3#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#3 integrate .. //depot/projects/ia64/lib/libugidfw/ugidfw.c#4 integrate .. //depot/projects/ia64/lib/libugidfw/ugidfw.h#3 integrate .. //depot/projects/ia64/lib/libutil/login_class.c#5 integrate .. //depot/projects/ia64/libexec/Makefile#8 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.c#15 integrate .. //depot/projects/ia64/libexec/lukemftpd/Makefile#8 integrate .. //depot/projects/ia64/libexec/lukemftpd/config.h#2 integrate .. //depot/projects/ia64/libexec/mknetid/mknetid.c#3 integrate .. //depot/projects/ia64/release/Makefile#24 integrate .. //depot/projects/ia64/release/Makefile.inc.docports#8 integrate .. //depot/projects/ia64/release/alpha/dokern.sh#5 integrate .. //depot/projects/ia64/release/alpha/drivers.conf#7 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/Makefile#2 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/early-adopter/Makefile#1 branch .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#1 branch .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/Makefile#3 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#9 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml#4 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/Makefile#5 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#6 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#5 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml#2 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile#1 branch .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/readme/article.sgml#6 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/Makefile#3 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#12 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile#1 branch .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/Makefile#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#25 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/Makefile#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml#3 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/ia64/Makefile#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/Makefile#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#49 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#1 branch .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/Makefile#4 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml#1 branch .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/ia64/release/doc/share/examples/Makefile.relnotesng#5 integrate .. //depot/projects/ia64/release/i386/dokern.sh#12 integrate .. //depot/projects/ia64/release/i386/drivers.conf#8 integrate .. //depot/projects/ia64/release/ia64/boot_crunch.conf#1 branch .. //depot/projects/ia64/release/ia64/doFS.sh#1 branch .. //depot/projects/ia64/release/ia64/dokern.sh#1 branch .. //depot/projects/ia64/release/ia64/mkisoimages.sh#1 branch .. //depot/projects/ia64/release/pc98/drivers-small.conf#2 integrate .. //depot/projects/ia64/release/pc98/fixit-small_crunch.conf#1 branch .. //depot/projects/ia64/release/scripts/doFS.sh#7 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#14 integrate .. //depot/projects/ia64/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/ia64/sbin/dumpfs/dumpfs.c#8 integrate .. //depot/projects/ia64/sbin/gbde/Makefile#2 integrate .. //depot/projects/ia64/sbin/gbde/gbde.8#2 integrate .. //depot/projects/ia64/sbin/gbde/gbde.c#3 integrate .. //depot/projects/ia64/sbin/gpt/add.c#2 integrate .. //depot/projects/ia64/sbin/gpt/create.c#3 integrate .. //depot/projects/ia64/sbin/gpt/destroy.c#3 integrate .. //depot/projects/ia64/sbin/gpt/gpt.c#13 integrate .. //depot/projects/ia64/sbin/gpt/gpt.h#9 integrate .. //depot/projects/ia64/sbin/gpt/migrate.c#5 integrate .. //depot/projects/ia64/sbin/gpt/recover.c#5 integrate .. //depot/projects/ia64/sbin/gpt/show.c#4 integrate .. //depot/projects/ia64/sbin/ipfw/ipfw2.c#7 integrate .. //depot/projects/ia64/sbin/mca/mca.c#8 integrate .. //depot/projects/ia64/sbin/mount_std/mount_std.c#8 integrate .. //depot/projects/ia64/sbin/newfs_msdos/newfs_msdos.c#6 integrate .. //depot/projects/ia64/sbin/reboot/Makefile#4 integrate .. //depot/projects/ia64/sbin/reboot/nextboot.8#1 branch .. //depot/projects/ia64/sbin/sysctl/sysctl.c#9 integrate .. //depot/projects/ia64/secure/lib/libcipher/Makefile#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile#10 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile.asm#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile.inc#7 integrate .. //depot/projects/ia64/secure/lib/libssh/Makefile#8 integrate .. //depot/projects/ia64/secure/lib/libtelnet/Makefile#4 integrate .. //depot/projects/ia64/share/Makefile#4 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#22 integrate .. //depot/projects/ia64/share/man/man4/Makefile#21 integrate .. //depot/projects/ia64/share/man/man4/atapicam.4#2 integrate .. //depot/projects/ia64/share/man/man4/fwe.4#1 branch .. //depot/projects/ia64/share/man/man4/gbde.4#2 integrate .. //depot/projects/ia64/share/man/man4/rl.4#4 integrate .. //depot/projects/ia64/share/man/man4/snp.4#6 integrate .. //depot/projects/ia64/share/man/man4/wi.4#8 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#21 integrate .. //depot/projects/ia64/share/man/man5/passwd.5#3 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#17 integrate .. //depot/projects/ia64/share/man/man7/clocks.7#4 integrate .. //depot/projects/ia64/share/man/man9/mac.9#2 integrate .. //depot/projects/ia64/share/man/man9/style.9#16 integrate .. //depot/projects/ia64/share/misc/bsd-family-tree#8 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#20 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#20 integrate .. //depot/projects/ia64/sys/alpha/alpha/prom.c#5 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC#17 integrate .. //depot/projects/ia64/sys/alpha/include/bus.h#5 integrate .. //depot/projects/ia64/sys/alpha/tlsb/dwlpx.c#3 integrate .. //depot/projects/ia64/sys/bluetooth/Makefile#1 branch .. //depot/projects/ia64/sys/bluetooth/common/Makefile#1 branch .. //depot/projects/ia64/sys/bluetooth/common/ng_bluetooth.c#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/Makefile#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/Makefile#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/ng_bt3c.4#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/ng_bt3c_firmware.h#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/ng_bt3c_var.h#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/h4/Makefile#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/h4/TODO#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/h4/ng_h4.4#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/h4/ng_h4.c#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/h4/ng_h4_prse.h#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/h4/ng_h4_var.h#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/Makefile#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/TODO#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/ng_ubt.4#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/ng_ubt.c#1 branch .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/ng_ubt_var.h#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/Makefile#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/TODO#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci.4#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_cmds.c#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_cmds.h#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_evnt.c#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_evnt.h#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_main.c#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_misc.c#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_misc.h#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_prse.h#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_ulpi.c#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_ulpi.h#1 branch .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_var.h#1 branch .. //depot/projects/ia64/sys/bluetooth/include/ng_bluetooth.h#1 branch .. //depot/projects/ia64/sys/bluetooth/include/ng_bt3c.h#1 branch .. //depot/projects/ia64/sys/bluetooth/include/ng_btsocket.h#1 branch .. //depot/projects/ia64/sys/bluetooth/include/ng_btsocket_hci_raw.h#1 branch .. //depot/projects/ia64/sys/bluetooth/include/ng_btsocket_l2cap.h#1 branch .. //depot/projects/ia64/sys/bluetooth/include/ng_h4.h#1 branch .. //depot/projects/ia64/sys/bluetooth/include/ng_hci.h#1 branch .. //depot/projects/ia64/sys/bluetooth/include/ng_l2cap.h#1 branch .. //depot/projects/ia64/sys/bluetooth/include/ng_ubt.h#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/Makefile#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/TODO#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap.4#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_cmds.c#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_cmds.h#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_evnt.c#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_evnt.h#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_llpi.c#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_llpi.h#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_main.c#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_misc.c#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_misc.h#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_prse.h#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_ulpi.c#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_ulpi.h#1 branch .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_var.h#1 branch .. //depot/projects/ia64/sys/bluetooth/socket/Makefile#1 branch .. //depot/projects/ia64/sys/bluetooth/socket/TODO#1 branch .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket.4#1 branch .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket.c#1 branch .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket_hci_raw.c#1 branch .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket_l2cap.c#1 branch .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket_l2cap_raw.c#1 branch .. //depot/projects/ia64/sys/boot/forth/loader.conf#11 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/ia64/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/Makefile#4 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/devicename.c#3 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/libofw.h#3 integrate .. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_devsearch.c#2 delete .. //depot/projects/ia64/sys/boot/ofw/libofw/ofw_disk.c#5 integrate .. //depot/projects/ia64/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/Makefile#10 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/main.c#10 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/metadata.c#7 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#13 integrate .. //depot/projects/ia64/sys/conf/NOTES#29 integrate .. //depot/projects/ia64/sys/conf/files#47 integrate .. //depot/projects/ia64/sys/conf/files.i386#22 integrate .. //depot/projects/ia64/sys/conf/files.pc98#18 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#21 integrate .. //depot/projects/ia64/sys/conf/kmod.mk#16 integrate .. //depot/projects/ia64/sys/conf/majors#14 integrate .. //depot/projects/ia64/sys/crypto/sha2/sha2.c#4 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_acad.c#4 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_cmbat.c#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#11 integrate .. //depot/projects/ia64/sys/dev/asr/asr.c#8 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#19 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-tape.c#8 integrate .. //depot/projects/ia64/sys/dev/awi/awi.c#7 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/ia64/sys/dev/bktr/bktr_core.c#6 integrate .. //depot/projects/ia64/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus.c#9 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus_cis.c#7 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/ia64/sys/dev/em/README#4 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#12 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#9 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.c#5 integrate .. //depot/projects/ia64/sys/dev/em/if_em_hw.h#5 integrate .. //depot/projects/ia64/sys/dev/em/if_em_osdep.h#8 integrate .. //depot/projects/ia64/sys/dev/fb/vga.c#5 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/ia64/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/ia64/sys/dev/firewire/fwdev.c#1 branch .. //depot/projects/ia64/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/ia64/sys/dev/firewire/fwmem.h#2 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/ia64/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#15 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpvar.h#4 integrate .. //depot/projects/ia64/sys/dev/gfb/gfb_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/gx/if_gxvar.h#3 integrate .. //depot/projects/ia64/sys/dev/hea/eni_buffer.c#7 integrate .. //depot/projects/ia64/sys/dev/hea/eni_init.c#2 integrate .. //depot/projects/ia64/sys/dev/hea/eni_receive.c#4 integrate .. //depot/projects/ia64/sys/dev/hea/eni_transmit.c#4 integrate .. //depot/projects/ia64/sys/dev/hea/eni_vcm.c#5 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_output.c#5 integrate .. //depot/projects/ia64/sys/dev/hfa/fore_receive.c#5 integrate .. //depot/projects/ia64/sys/dev/ida/ida.c#3 integrate .. //depot/projects/ia64/sys/dev/iir/iir_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/mcd/mcd.c#2 integrate .. //depot/projects/ia64/sys/dev/mcd/mcdvar.h#2 integrate .. //depot/projects/ia64/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/ia64/sys/dev/my/if_my.c#7 integrate .. //depot/projects/ia64/sys/dev/nge/if_nge.c#12 integrate .. //depot/projects/ia64/sys/dev/nge/if_ngereg.h#4 integrate .. //depot/projects/ia64/sys/dev/pccard/card_if.m#6 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#12 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#18 integrate .. //depot/projects/ia64/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/ia64/sys/dev/ppbus/pcfclock.c#3 integrate .. //depot/projects/ia64/sys/dev/ppbus/ppb_msq.h#2 integrate .. //depot/projects/ia64/sys/dev/ppbus/pps.c#6 integrate .. //depot/projects/ia64/sys/dev/rc/rc.c#2 integrate .. //depot/projects/ia64/sys/dev/scd/scd.c#2 integrate .. //depot/projects/ia64/sys/dev/scd/scd_isa.c#1 branch .. //depot/projects/ia64/sys/dev/scd/scdreg.h#2 integrate .. //depot/projects/ia64/sys/dev/scd/scdvar.h#1 branch .. //depot/projects/ia64/sys/dev/si/si_isa.c#3 integrate .. //depot/projects/ia64/sys/dev/sio/sio_puc.c#4 integrate .. //depot/projects/ia64/sys/dev/snp/snp.c#8 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sound.c#8 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/ia64/sys/dev/sr/if_sr.c#5 integrate .. //depot/projects/ia64/sys/dev/sr/if_srregs.h#2 integrate .. //depot/projects/ia64/sys/dev/sym/sym_defs.h#3 integrate .. //depot/projects/ia64/sys/dev/tdfx/tdfx_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/tga/tga_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#4 integrate .. //depot/projects/ia64/sys/dev/usb/ufm.c#6 integrate .. //depot/projects/ia64/sys/dev/usb/ugen.c#7 integrate .. //depot/projects/ia64/sys/dev/usb/umass.c#13 integrate .. //depot/projects/ia64/sys/dev/usb/usb.h#5 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumdaemon.c#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinuminterrupt.c#3 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrequest.c#7 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrevive.c#5 integrate .. //depot/projects/ia64/sys/dev/wds/wd7000.c#2 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs_vfsops.c#11 integrate .. //depot/projects/ia64/sys/fs/msdosfs/denode.h#3 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_smb.c#5 integrate .. //depot/projects/ia64/sys/fs/specfs/spec_vnops.c#12 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde.h#3 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_crypt.c#4 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_lock.c#3 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/ia64/sys/geom/geom.h#15 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#18 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/ia64/sys/geom/geom_dev.c#18 integrate .. //depot/projects/ia64/sys/geom/geom_dump.c#12 integrate .. //depot/projects/ia64/sys/geom/geom_event.c#8 integrate .. //depot/projects/ia64/sys/geom/geom_gpt.c#12 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#11 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#17 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#12 integrate .. //depot/projects/ia64/sys/geom/geom_subr.c#14 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#27 integrate .. //depot/projects/ia64/sys/i386/i386/exception.s#6 integrate .. //depot/projects/ia64/sys/i386/i386/genassym.c#8 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#30 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#21 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#20 integrate .. //depot/projects/ia64/sys/i386/i386/vm86.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/vm86bios.s#3 integrate .. //depot/projects/ia64/sys/i386/include/pcb.h#8 integrate .. //depot/projects/ia64/sys/i386/include/reg.h#5 integrate .. //depot/projects/ia64/sys/i386/include/vm86.h#3 integrate .. //depot/projects/ia64/sys/i386/isa/gpib.c#4 integrate .. //depot/projects/ia64/sys/i386/isa/npx.c#12 integrate .. //depot/projects/ia64/sys/i386/isa/scd.c#8 delete .. //depot/projects/ia64/sys/i386/isa/scdreg.h#2 delete .. //depot/projects/ia64/sys/i386/isa/spkr.c#6 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#15 integrate .. //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#12 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC#20 integrate .. //depot/projects/ia64/sys/ia64/conf/GENERIC.hints#4 integrate .. //depot/projects/ia64/sys/ia64/ia32/syscalls.master#10 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#52 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#44 integrate .. //depot/projects/ia64/sys/ia64/include/setjmp.h#3 integrate .. //depot/projects/ia64/sys/ia64/include/vmparam.h#5 integrate .. //depot/projects/ia64/sys/isa/fd.c#9 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_vfsops.c#14 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#23 integrate .. //depot/projects/ia64/sys/kern/imgact_shell.c#3 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_acct.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_environment.c#5 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#31 integrate .. //depot/projects/ia64/sys/kern/kern_lockf.c#7 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#10 integrate .. //depot/projects/ia64/sys/kern/kern_malloc.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_mib.c#10 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#15 integrate .. //depot/projects/ia64/sys/kern/kern_time.c#11 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#12 integrate .. //depot/projects/ia64/sys/kern/subr_trap.c#17 integrate .. //depot/projects/ia64/sys/kern/subr_witness.c#23 integrate .. //depot/projects/ia64/sys/kern/sys_socket.c#11 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#20 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#20 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#20 integrate .. //depot/projects/ia64/sys/kern/uipc_socket2.c#18 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#21 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#25 integrate .. //depot/projects/ia64/sys/kern/vfs_cluster.c#12 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/ia64/sys/libkern/qsort.c#3 integrate .. //depot/projects/ia64/sys/modules/Makefile#26 integrate .. //depot/projects/ia64/sys/modules/Makefile.inc#2 integrate .. //depot/projects/ia64/sys/modules/aac/Makefile.inc#1 branch .. //depot/projects/ia64/sys/modules/aic/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/aic7xxx/Makefile.inc#1 branch .. //depot/projects/ia64/sys/modules/aic7xxx/ahc/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/aic7xxx/ahc/Makefile.inc#1 branch .. //depot/projects/ia64/sys/modules/aic7xxx/ahd/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/aic7xxx/aicasm/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/apm/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/bktr/Makefile.inc#1 branch .. //depot/projects/ia64/sys/modules/cam/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/drm/Makefile.inc#1 branch .. //depot/projects/ia64/sys/modules/ed/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/ep/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/fdc/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/fe/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/firewire/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/firewire/Makefile.inc#1 branch .. //depot/projects/ia64/sys/modules/firewire/firewire/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/hfa/Makefile.inc#1 branch .. //depot/projects/ia64/sys/modules/i2c/Makefile.inc#1 branch .. //depot/projects/ia64/sys/modules/i2c/controllers/Makefile.inc#1 branch .. //depot/projects/ia64/sys/modules/lnc/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/lomac/Makefile.inc#2 integrate .. //depot/projects/ia64/sys/modules/msdosfs/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/nfsserver/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/oldcard/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/pcspeaker/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/pmc/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/scd/Makefile#1 branch .. //depot/projects/ia64/sys/modules/sound/driver/mss/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/sound/driver/sbc/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/splash/bmp/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/splash/bmp/splash_bmp.c#3 integrate .. //depot/projects/ia64/sys/modules/splash/pcx/splash_pcx.c#2 integrate .. //depot/projects/ia64/sys/modules/syscons/apm/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/syscons/daemon/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/syscons/dragon/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/syscons/fire/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/syscons/rain/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/syscons/snake/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/syscons/star/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/syscons/warp/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/sysvipc/Makefile.inc#1 branch .. //depot/projects/ia64/sys/net/if_vlan.c#8 integrate .. //depot/projects/ia64/sys/net/radix.c#5 integrate .. //depot/projects/ia64/sys/net/zlib.c#6 integrate .. //depot/projects/ia64/sys/netatm/atm_cm.c#9 integrate .. //depot/projects/ia64/sys/netatm/atm_cm.h#5 integrate .. //depot/projects/ia64/sys/netatm/atm_device.c#5 integrate .. //depot/projects/ia64/sys/netatm/atm_if.c#6 integrate .. //depot/projects/ia64/sys/netatm/atm_if.h#7 integrate .. //depot/projects/ia64/sys/netatm/atm_signal.c#4 integrate .. //depot/projects/ia64/sys/netatm/atm_stack.h#3 integrate .. //depot/projects/ia64/sys/netatm/atm_subr.c#10 integrate .. //depot/projects/ia64/sys/netatm/atm_var.h#8 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_if.c#5 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_load.c#4 integrate .. //depot/projects/ia64/sys/netatm/ipatm/ipatm_var.h#4 integrate .. //depot/projects/ia64/sys/netatm/port.h#5 integrate .. //depot/projects/ia64/sys/netatm/spans/spans_kxdr.c#5 integrate .. //depot/projects/ia64/sys/netatm/uni/q2110_sigaa.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/q2110_sigcpcs.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/qsaal1_sigaa.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/qsaal1_sigcpcs.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/sscf_uni_lower.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/sscf_uni_upper.c#2 integrate .. //depot/projects/ia64/sys/netatm/uni/sscf_uni_var.h#3 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_lower.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_pdu.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_sigaa.c#2 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_sigcpcs.c#2 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_subr.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_upper.c#4 integrate .. //depot/projects/ia64/sys/netatm/uni/sscop_var.h#4 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_decode.c#5 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_encode.c#3 integrate .. //depot/projects/ia64/sys/netatm/uni/unisig_var.h#4 integrate .. //depot/projects/ia64/sys/netgraph/ng_bridge.c#5 integrate .. //depot/projects/ia64/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/ia64/sys/netgraph/ng_one2many.c#4 integrate .. //depot/projects/ia64/sys/netgraph/ng_parse.c#6 integrate .. //depot/projects/ia64/sys/netgraph/ng_ppp.c#7 integrate .. //depot/projects/ia64/sys/netgraph/ng_pppoe.c#10 integrate .. //depot/projects/ia64/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#19 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.h#14 integrate .. //depot/projects/ia64/sys/netinet/in_proto.c#5 integrate .. //depot/projects/ia64/sys/netinet/ip_mroute.c#14 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#16 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#26 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#13 integrate .. //depot/projects/ia64/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/ia64/sys/netipx/ipx_ip.c#4 integrate .. //depot/projects/ia64/sys/netncp/ncp_rq.c#3 integrate .. //depot/projects/ia64/sys/netsmb/smb_subr.c#6 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#8 integrate .. //depot/projects/ia64/sys/opencrypto/crypto.c#3 integrate .. //depot/projects/ia64/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/ia64/sys/pc98/conf/GENERIC.hints#3 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#27 integrate .. //depot/projects/ia64/sys/pci/amd.c#3 integrate .. //depot/projects/ia64/sys/pci/if_mn.c#4 integrate .. //depot/projects/ia64/sys/pci/if_ste.c#9 integrate .. //depot/projects/ia64/sys/pci/if_ti.c#13 integrate .. //depot/projects/ia64/sys/pci/if_tireg.h#3 integrate .. //depot/projects/ia64/sys/pci/intpm.c#5 integrate .. //depot/projects/ia64/sys/pci/viapm.c#2 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#18 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#9 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.h#4 integrate .. //depot/projects/ia64/sys/security/mac_bsdextended/mac_bsdextended.c#5 integrate .. //depot/projects/ia64/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/ia64/sys/security/mac_ifoff/mac_ifoff.c#4 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.h#4 integrate .. //depot/projects/ia64/sys/security/mac_none/mac_none.c#6 integrate .. //depot/projects/ia64/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/ia64/sys/security/mac_partition/mac_partition.h#2 integrate .. //depot/projects/ia64/sys/security/mac_seeotheruids/mac_seeotheruids.c#3 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#6 integrate .. //depot/projects/ia64/sys/sparc64/ebus/ebus.c#5 integrate .. //depot/projects/ia64/sys/sparc64/include/ofw_bus.h#3 integrate .. //depot/projects/ia64/sys/sparc64/include/pmap.h#10 integrate .. //depot/projects/ia64/sys/sparc64/include/ver.h#4 integrate .. //depot/projects/ia64/sys/sparc64/isa/isa.c#5 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pci.c#5 integrate .. //depot/projects/ia64/sys/sparc64/pci/ofw_pci.h#4 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#10 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/identcpu.c#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#26 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/ofw_bus.c#3 integrate .. //depot/projects/ia64/sys/sys/_label.h#3 integrate .. //depot/projects/ia64/sys/sys/gpt.h#6 integrate .. //depot/projects/ia64/sys/sys/imgact.h#10 integrate .. //depot/projects/ia64/sys/sys/mac.h#9 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#8 integrate .. //depot/projects/ia64/sys/sys/malloc.h#14 integrate .. //depot/projects/ia64/sys/sys/mchain.h#4 integrate .. //depot/projects/ia64/sys/sys/mount.h#17 integrate .. //depot/projects/ia64/sys/sys/param.h#21 integrate .. //depot/projects/ia64/sys/sys/proc.h#38 integrate .. //depot/projects/ia64/sys/sys/snoop.h#4 integrate .. //depot/projects/ia64/sys/sys/socketvar.h#22 integrate .. //depot/projects/ia64/sys/sys/syscall.h#19 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#19 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#21 integrate .. //depot/projects/ia64/sys/sys/time.h#10 integrate .. //depot/projects/ia64/sys/sys/uuid.h#6 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_extattr.c#11 integrate .. //depot/projects/ia64/sys/vm/pmap.h#10 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#14 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#28 integrate .. //depot/projects/ia64/sys/vm/uma_dbg.c#8 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#20 integrate .. //depot/projects/ia64/sys/vm/vm_init.c#7 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#33 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#22 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#22 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#16 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#17 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#18 integrate .. //depot/projects/ia64/tools/KSE/ksetest/simplelock.h#2 integrate .. //depot/projects/ia64/tools/regression/lib/libc/locale/Makefile#3 integrate .. //depot/projects/ia64/tools/regression/lib/libc/locale/test-btowc.c#2 integrate .. //depot/projects/ia64/tools/regression/lib/libc/locale/test-mblen.c#1 branch .. //depot/projects/ia64/tools/regression/lib/libc/locale/test-mbrtowc.c#2 integrate .. //depot/projects/ia64/tools/regression/lib/libc/locale/test-mbstowcs.c#1 branch .. //depot/projects/ia64/tools/regression/lib/libc/locale/test-mbtowc.c#1 branch .. //depot/projects/ia64/tools/regression/lib/libc/locale/test-wcrtomb.c#2 integrate .. //depot/projects/ia64/tools/regression/lib/libc/locale/test-wcstombs.c#1 branch .. //depot/projects/ia64/tools/regression/lib/libc/locale/test-wctomb.c#1 branch .. //depot/projects/ia64/usr.bin/Makefile#34 integrate .. //depot/projects/ia64/usr.bin/bluetooth/Makefile#1 branch .. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/Makefile#1 branch .. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/btsockstat.1#1 branch .. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/btsockstat.c#1 branch .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.holiday#6 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.c#11 integrate .. //depot/projects/ia64/usr.bin/kenv/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/make/make.1#10 integrate .. //depot/projects/ia64/usr.bin/make/var.c#11 integrate .. //depot/projects/ia64/usr.bin/mkstr/mkstr.1#4 integrate .. //depot/projects/ia64/usr.bin/mkstr/mkstr.c#6 integrate .. //depot/projects/ia64/usr.bin/truss/alpha-fbsd.c#5 integrate .. //depot/projects/ia64/usr.bin/truss/extern.h#3 integrate .. //depot/projects/ia64/usr.bin/truss/i386-fbsd.c#4 integrate .. //depot/projects/ia64/usr.bin/truss/i386-linux.c#6 integrate .. //depot/projects/ia64/usr.bin/truss/ia64-fbsd.c#1 branch .. //depot/projects/ia64/usr.bin/truss/main.c#8 integrate .. //depot/projects/ia64/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/ia64/usr.bin/truss/syscalls.c#8 integrate .. //depot/projects/ia64/usr.bin/uuidgen/uuidgen.1#5 integrate .. //depot/projects/ia64/usr.bin/uuidgen/uuidgen.c#6 integrate .. //depot/projects/ia64/usr.bin/whois/whois.1#4 integrate .. //depot/projects/ia64/usr.bin/whois/whois.c#5 integrate .. //depot/projects/ia64/usr.bin/xstr/xstr.c#5 integrate .. //depot/projects/ia64/usr.bin/yes/yes.c#3 integrate .. //depot/projects/ia64/usr.sbin/Makefile#25 integrate .. //depot/projects/ia64/usr.sbin/adduser/adduser.8#4 integrate .. //depot/projects/ia64/usr.sbin/ancontrol/ancontrol.8#4 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.8#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.c#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.h#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/info.c#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/link_control.c#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/link_policy.c#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/node.c#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/send_recv.c#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/status.c#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/util.c#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/hcseriald.8#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/hcseriald.c#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2cap.c#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.8#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.c#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.h#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/l2ping.8#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/l2ping.c#1 branch .. //depot/projects/ia64/usr.sbin/ntp/config.h#3 integrate .. //depot/projects/ia64/usr.sbin/ntp/ntpd/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/ntp/scripts/mkver#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/create/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/delete/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/file.c#7 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/url.c#1 branch .. //depot/projects/ia64/usr.sbin/pppd/sys-bsd.c#3 integrate .. //depot/projects/ia64/usr.sbin/sicontrol/sicontrol.8#3 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/disks.c#7 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/dist.c#10 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/label.c#8 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#17 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/modules.c#4 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/sysinstall.h#10 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#13 integrate .. //depot/projects/ia64/usr.sbin/watch/watch.c#7 integrate .. //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.8#7 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#17 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.49 2002/10/30 04:53:58 des Exp $ +$FreeBSD: src/MAINTAINERS,v 1.52 2002/11/11 16:56:40 mjacob Exp $ subsystem login notes ----------------------------- @@ -44,7 +44,7 @@ pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. isp(4) mjacob Pre-commit review requested. -sa(4) mjacob Pre-commit review requested. +mpt(4) mjacob Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. @@ -84,3 +84,4 @@ etc/rc.* gordon Requests heads-up to help keep etc/rc.d in sync. fdc(4) joerg Just keep me informed of changes, try not to break it. sppp(4) joerg Just keep me informed of changes, try not to break it. +make make Recommends pre-commit review. ==== //depot/projects/ia64/Makefile.inc1#40 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.309 2002/10/28 08:44:59 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.310 2002/11/03 23:48:14 scottl Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -492,12 +492,21 @@ cd ${KRNLOBJDIR}/${_kernel}; \ MAKESRCPATH=${KRNLSRCDIR}/dev/aic7xxx/aicasm \ ${MAKE} -DNO_CPU_CFLAGS -f ${KRNLSRCDIR}/dev/aic7xxx/aicasm/Makefile +.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KRNLSRCDIR}/modules) + cd ${KRNLOBJDIR}/${_kernel}; \ + ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} modules-obj + cd ${.CURDIR}/sys/modules/aic7xxx/aicasm; \ + MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ + ${MAKE} -DNO_CPU_CFLAGS depend; \ + MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ + ${MAKE} -DNO_CPU_CFLAGS all +.endif .if !defined(NO_KERNELDEPEND) cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend + ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} depend -DNO_MODULES_OBJ .endif cd ${KRNLOBJDIR}/${_kernel}; \ - ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} all + ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} all -DNO_MODULES_OBJ @echo "--------------------------------------------------------------" @echo ">>> Kernel build for ${_kernel} completed on `LC_ALL=C date`" @echo "--------------------------------------------------------------" @@ -608,6 +617,10 @@ # # build-tools: Build special purpose build tools # +.if defined(MODULES_WITH_WORLD) && exists(${KRNLSRCDIR}/modules) +_aicasm= sys/modules/aic7xxx/aicasm +.endif + .if exists(${.CURDIR}/share) && !defined(NOSHARE) _share= share/syscons/scrnmaps .endif @@ -630,7 +643,7 @@ build-tools: .for _tool in bin/csh bin/sh gnu/usr.bin/cc/cc_tools ${_fortran} \ ${_libroken4} ${_libkrb5} lib/libncurses ${_share} \ - usr.bin/awk usr.bin/file usr.sbin/sysinstall + ${_aicasm} usr.bin/awk usr.bin/file usr.sbin/sysinstall ${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; ${MAKE} DIRPRFX=${_tool}/ build-tools .endfor ==== //depot/projects/ia64/bin/chmod/chmod.1#6 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.33 2002/10/01 20:32:59 trhodes Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.34 2002/11/04 06:46:53 tjr Exp $ .\" .Dd March 31, 1994 .Dt CHMOD 1 @@ -315,6 +315,7 @@ .Sh SEE ALSO .Xr chflags 1 , .Xr install 1 , +.Xr setfacl 1 , .Xr chmod 2 , .Xr stat 2 , .Xr umask 2 , ==== //depot/projects/ia64/bin/getfacl/getfacl.1#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.4 2001/11/16 15:59:46 rwatson Exp $ +.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.5 2002/11/03 23:22:34 tjr Exp $ .\" .\" Developed by the TrustedBSD Project. .\" Support for POSIX.1e access control lists. @@ -89,6 +89,8 @@ Retrieve the default ACL for the directory .Pa / , if any. +.Sh DIAGNOSTICS +.Ex -std .Sh SEE ALSO .Xr setfacl 1 , .Xr acl 3 , ==== //depot/projects/ia64/bin/getfacl/getfacl.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ #include -__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.7 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.8 2002/11/03 23:22:34 tjr Exp $"); #include #include @@ -156,7 +156,7 @@ error = stat(path, &sb); if (error == -1) { - perror(path); + warn("%s", path); return(-1); } @@ -178,14 +178,14 @@ return(0); acl = acl_from_stat(sb); if (!acl) { - perror("acl_from_stat()"); + warn("acl_from_stat()"); return(-1); } } acl_text = acl_to_text(acl, 0); if (!acl_text) { - perror(path); + warn("%s", path); return(-1); } @@ -200,13 +200,12 @@ static int print_acl_from_stdin(acl_type_t type) { - char pathname[PATH_MAX]; + char *p, pathname[PATH_MAX]; int carried_error = 0; - pathname[sizeof(pathname) - 1] = '\0'; while (fgets(pathname, (int)sizeof(pathname), stdin)) { - /* remove the \n */ - pathname[strlen(pathname) - 1] = '\0'; + if ((p = strchr(pathname, '\n')) != NULL) + *p = '\0'; if (print_acl(pathname, type) == -1) { carried_error = -1; } @@ -236,7 +235,7 @@ if (argc == 0) { error = print_acl_from_stdin(type); - return(error); + return(error ? 1 : 0); } for (i = 0; i < argc; i++) { @@ -251,5 +250,5 @@ } } - return(carried_error); + return(carried_error ? 1 : 0); } ==== //depot/projects/ia64/bin/ls/ls.1#12 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.70 2002/10/24 00:07:30 rwatson Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.71 2002/11/03 07:29:08 tjr Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -417,6 +417,20 @@ .Xr sticky 8 . ) .El .El +.Pp +The next field contains a +plus +.Pq Sq Li + +character if the file has an ACL, or a +space +.Pq Sq Li " " +if it does not. +The +.Nm +utility does not show the actual ACL; +use +.Xr getfacl 1 +to do this. .Sh EXAMPLES The following is how to do an .Nm @@ -618,21 +632,25 @@ files in order to be compatible with the .St -p1003.2 specification. -KLD -.El .Sh SEE ALSO .Xr chflags 1 , .Xr chmod 1 , +.Xr getfacl 1 , .Xr sort 1 , .Xr xterm 1 , .Xr termcap 5 , .Xr symlink 7 , +.Xr getfmac 8 , .Xr sticky 8 .Sh STANDARDS The .Nm utility conforms to .St -p1003.1-2001 . +.Pp +.No The ACL support is compatible with IEEE\ Std\ 1003.2c\ ( Ns Dq "POSIX.2c" Ns ) +Draft\ 17 +(withdrawn). .Sh HISTORY An .Nm ==== //depot/projects/ia64/bin/ls/ls.c#13 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.70 2002/10/27 17:44:32 wollman Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.71 2002/11/06 01:18:12 tjr Exp $"); #include #include @@ -330,7 +330,7 @@ f_color = 1; } #else - (void)fprintf(stderr, "Color support not compiled in.\n"); + warnx("color support not compiled in"); #endif /*COLORLS*/ #ifdef COLORLS @@ -691,9 +691,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 12 18: 0:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B28337B406; Tue, 12 Nov 2002 18:00:45 -0800 (PST) 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 14F0F37B401 for ; Tue, 12 Nov 2002 18:00:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B1CD43E75 for ; Tue, 12 Nov 2002 18:00:44 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAD1wKmV050999 for ; Tue, 12 Nov 2002 17:58:20 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAD1wJI4050990 for perforce@freebsd.org; Tue, 12 Nov 2002 17:58:19 -0800 (PST) Date: Tue, 12 Nov 2002 17:58:19 -0800 (PST) Message-Id: <200211130158.gAD1wJI4050990@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21021 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21021 Change 21021 by peter@peter_daintree on 2002/11/12 17:57:46 IFC @21020 (mostly after kicking the importer re: bluetooth). Affected files ... .. //depot/projects/ia64/bin/echo/echo.c#4 integrate .. //depot/projects/ia64/contrib/one-true-awk/FREEBSD-upgrade#3 integrate .. //depot/projects/ia64/sys/bluetooth/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/common/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/common/ng_bluetooth.c#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/ng_bt3c.4#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/ng_bt3c_firmware.h#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/h4/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/h4/TODO#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/h4/ng_h4.4#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/h4/ng_h4.c#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/h4/ng_h4_prse.h#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/h4/ng_h4_var.h#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/ng_ubt.4#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/ng_ubt.c#2 delete .. //depot/projects/ia64/sys/bluetooth/drivers/ubt/ng_ubt_var.h#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/TODO#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci.4#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_cmds.c#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_cmds.h#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_evnt.c#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_evnt.h#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_main.c#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_misc.c#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_misc.h#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_prse.h#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_ulpi.c#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_ulpi.h#2 delete .. //depot/projects/ia64/sys/bluetooth/hci/ng_hci_var.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_bluetooth.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_bt3c.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_btsocket.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_btsocket_hci_raw.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_btsocket_l2cap.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_h4.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_hci.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_l2cap.h#2 delete .. //depot/projects/ia64/sys/bluetooth/include/ng_ubt.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/TODO#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap.4#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_cmds.c#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_cmds.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_evnt.c#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_evnt.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_llpi.c#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_llpi.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_main.c#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_misc.c#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_misc.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_prse.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_ulpi.c#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_ulpi.h#2 delete .. //depot/projects/ia64/sys/bluetooth/l2cap/ng_l2cap_var.h#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/Makefile#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/TODO#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket.4#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket.c#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket_hci_raw.c#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket_l2cap.c#2 delete .. //depot/projects/ia64/sys/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 delete .. //depot/projects/ia64/sys/conf/majors#15 integrate .. //depot/projects/ia64/usr.bin/bluetooth/Makefile#2 delete .. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/Makefile#2 delete .. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/btsockstat.1#2 delete .. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/btsockstat.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.8#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/info.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/link_control.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/link_policy.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/node.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/send_recv.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/status.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/util.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/hcseriald.8#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/hcseriald.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2cap.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.8#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.c#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.h#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/Makefile#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/l2ping.8#2 delete .. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/l2ping.c#2 delete Differences ... ==== //depot/projects/ia64/bin/echo/echo.c#4 (text+ko) ==== @@ -43,10 +43,9 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.13 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.14 2002/11/13 01:39:02 njl Exp $"); -#include -#include +#include #include /* ARGSUSED */ @@ -64,6 +63,9 @@ nflag = 0; while (argv[0] != NULL) { + size_t len; + + len = strlen(argv[0]); /* * If the next argument is NULL then this is this @@ -71,23 +73,20 @@ * for a trailing \c. */ if (argv[1] == NULL) { - size_t len; - - len = strlen(argv[0]); /* is there room for a '\c' and is there one? */ if (len >= 2 && argv[0][len - 2] == '\\' && argv[0][len - 1] == 'c') { /* chop it and set the no-newline flag. */ - argv[0][len - 2] = '\0'; + len -= 2; nflag = 1; } } - (void)printf("%s", argv[0]); + write(STDOUT_FILENO, argv[0], len); if (*++argv) - putchar(' '); + write(STDOUT_FILENO, " ", 1); } if (!nflag) - putchar('\n'); + write(STDOUT_FILENO, "\n", 1); return 0; } ==== //depot/projects/ia64/contrib/one-true-awk/FREEBSD-upgrade#3 (text+ko) ==== @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20020218 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20020101 ==== //depot/projects/ia64/sys/conf/majors#15 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/conf/majors,v 1.149 2002/11/13 00:25:01 peter Exp $ +$FreeBSD: src/sys/conf/majors,v 1.150 2002/11/13 01:42:59 peter Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. @@ -63,6 +63,7 @@ 43 vn vnode "disk" device (retired) 44 gp GPIB 45 scd Sony CDROM interface +46 - - 47 gsc Genius Scanner 48 cy Cyclades 49 ?? was ssc To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 12 18:13:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A7B837B404; Tue, 12 Nov 2002 18:13:17 -0800 (PST) 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 B385537B401 for ; Tue, 12 Nov 2002 18:13:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB5A443E75 for ; Tue, 12 Nov 2002 18:13:14 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAD2AomV052912 for ; Tue, 12 Nov 2002 18:10:50 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAD2AZTf052909 for perforce@freebsd.org; Tue, 12 Nov 2002 18:10:35 -0800 (PST) Date: Tue, 12 Nov 2002 18:10:35 -0800 (PST) Message-Id: <200211130210.gAD2AZTf052909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21022 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21022 Change 21022 by peter@peter_daintree on 2002/11/12 18:09:59 IFC @21020 Affected files ... .. //depot/projects/hammer/MAINTAINERS#4 integrate .. //depot/projects/hammer/Makefile.inc1#5 integrate .. //depot/projects/hammer/UPDATING#4 integrate .. //depot/projects/hammer/bin/chmod/chmod.1#3 integrate .. //depot/projects/hammer/bin/echo/echo.c#2 integrate .. //depot/projects/hammer/bin/getfacl/getfacl.1#2 integrate .. //depot/projects/hammer/bin/getfacl/getfacl.c#2 integrate .. //depot/projects/hammer/bin/ls/ls.1#4 integrate .. //depot/projects/hammer/bin/ls/ls.c#5 integrate .. //depot/projects/hammer/bin/ls/print.c#4 integrate .. //depot/projects/hammer/bin/ps/extern.h#5 integrate .. //depot/projects/hammer/bin/ps/nlist.c#2 integrate .. //depot/projects/hammer/bin/ps/print.c#5 integrate .. //depot/projects/hammer/bin/sh/histedit.c#2 integrate .. //depot/projects/hammer/contrib/gcc/config/sparc/freebsd.h#3 integrate .. //depot/projects/hammer/contrib/lukemftpd/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/lukemftpd/acconfig.h#2 integrate .. //depot/projects/hammer/contrib/lukemftpd/config.h.in#2 integrate .. //depot/projects/hammer/contrib/lukemftpd/configure#2 integrate .. //depot/projects/hammer/contrib/lukemftpd/configure.in#2 integrate .. //depot/projects/hammer/contrib/lukemftpd/lukemftpd.h#2 integrate .. //depot/projects/hammer/contrib/lukemftpd/todo#2 integrate .. //depot/projects/hammer/contrib/ntp/COPYRIGHT#2 integrate .. //depot/projects/hammer/contrib/ntp/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/ntp/ChangeLog-4.1.0#1 branch .. //depot/projects/hammer/contrib/ntp/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/ntp/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/NEWS#2 integrate .. //depot/projects/hammer/contrib/ntp/README.bk#1 branch .. //depot/projects/hammer/contrib/ntp/README.cvs#2 integrate .. //depot/projects/hammer/contrib/ntp/README.refclocks#1 branch .. //depot/projects/hammer/contrib/ntp/README.rsa#2 integrate .. //depot/projects/hammer/contrib/ntp/README.versions#1 branch .. //depot/projects/hammer/contrib/ntp/acconfig.h#2 integrate .. //depot/projects/hammer/contrib/ntp/acinclude.m4#2 integrate .. //depot/projects/hammer/contrib/ntp/aclocal.m4#2 integrate .. //depot/projects/hammer/contrib/ntp/adjtimed/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/clockstuff/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/clockstuff/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/config.guess#2 integrate .. //depot/projects/hammer/contrib/ntp/config.h.in#2 integrate .. //depot/projects/hammer/contrib/ntp/config.sub#2 integrate .. //depot/projects/hammer/contrib/ntp/configure#2 integrate .. //depot/projects/hammer/contrib/ntp/configure.in#2 integrate .. //depot/projects/hammer/contrib/ntp/depcomp#2 integrate .. //depot/projects/hammer/contrib/ntp/flock-build#2 integrate .. //depot/projects/hammer/contrib/ntp/html/driver40.htm#1 branch .. //depot/projects/hammer/contrib/ntp/html/driver42.htm#1 branch .. //depot/projects/hammer/contrib/ntp/html/driver43.htm#1 branch .. //depot/projects/hammer/contrib/ntp/html/driver44.htm#1 branch .. //depot/projects/hammer/contrib/ntp/html/hints/mpeix#1 branch .. //depot/projects/hammer/contrib/ntp/html/hints/vxworks.html#2 integrate .. //depot/projects/hammer/contrib/ntp/html/hints/winnt#2 delete .. //depot/projects/hammer/contrib/ntp/html/qth.htm#2 integrate .. //depot/projects/hammer/contrib/ntp/html/refclock.htm#2 integrate .. //depot/projects/hammer/contrib/ntp/html/vxworks.htm#2 delete .. //depot/projects/hammer/contrib/ntp/html/y2k.htm#2 delete .. //depot/projects/hammer/contrib/ntp/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/include/l_stdlib.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_machine.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_request.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntp_syscall.h#2 integrate .. //depot/projects/hammer/contrib/ntp/include/ntpd.h#2 integrate .. //depot/projects/hammer/contrib/ntp/install-sh#2 integrate .. //depot/projects/hammer/contrib/ntp/kernel/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/kernel/sys/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/adjtime.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/clocktypes.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/iosignal.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/machines.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/mexit.c#2 delete .. //depot/projects/hammer/contrib/ntp/libntp/mktime.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/msyslog.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/snprintf.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/strdup.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libntp/strerror.c#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/libparse/kclk_computime.c#2 delete .. //depot/projects/hammer/contrib/ntp/libparse/kclk_dcf7000.c#2 delete .. //depot/projects/hammer/contrib/ntp/libparse/kclk_hopf6021.c#2 delete .. //depot/projects/hammer/contrib/ntp/libparse/kclk_meinberg.c#2 delete .. //depot/projects/hammer/contrib/ntp/libparse/kclk_rawdcf.c#2 delete .. //depot/projects/hammer/contrib/ntp/libparse/kclk_rcc8000.c#2 delete .. //depot/projects/hammer/contrib/ntp/libparse/kclk_schmid.c#2 delete .. //depot/projects/hammer/contrib/ntp/libparse/kclk_trimtaip.c#2 delete .. //depot/projects/hammer/contrib/ntp/libparse/kclk_trimtsip.c#2 delete .. //depot/projects/hammer/contrib/ntp/libparse/kclk_varitext.c#2 delete .. //depot/projects/hammer/contrib/ntp/libparse/kclk_wharton.c#2 delete .. //depot/projects/hammer/contrib/ntp/libparse/kparse.c#2 delete .. //depot/projects/hammer/contrib/ntp/libparse/kparse_conf.c#2 delete .. //depot/projects/hammer/contrib/ntp/librsaref/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/librsaref/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/missing#2 integrate .. //depot/projects/hammer/contrib/ntp/mkinstalldirs#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/jupiter.h#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_config.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_control.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_crypto.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_intres.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_loopfilter.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_proto.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_request.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_resolver.c#2 delete .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_timer.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntpd.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_chu.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_conf.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_jjy.c#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_local.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_neoclock4x.c#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_oncore.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_palisade.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_ripencc.c#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_true.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_tt560.c#1 branch .. //depot/projects/hammer/contrib/ntp/ntpd/refclock_zyfer.c#1 branch .. //depot/projects/hammer/contrib/ntp/ntpdate/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpdate/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpdate/ntpdate.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpdate/ntptimeset.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpdc/ntpdc_ops.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpq/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpq/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/ntpq/ntpq.c#2 integrate .. //depot/projects/hammer/contrib/ntp/ntptrace/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/ntp/ntptrace/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/ntptrace/ntptrace.c#2 integrate .. //depot/projects/hammer/contrib/ntp/parseutil/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/parseutil/dcfd.c#2 integrate .. //depot/projects/hammer/contrib/ntp/scripts/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/scripts/calc_tickadj#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/checktime#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/freq_adj#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/mkver.in#2 integrate .. //depot/projects/hammer/contrib/ntp/scripts/ntpsweep#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/ntpsweep.in#2 integrate .. //depot/projects/hammer/contrib/ntp/scripts/plot_summary.in#2 integrate .. //depot/projects/hammer/contrib/ntp/scripts/plot_summary.pl#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/stats.ulrich.patches#2 delete .. //depot/projects/hammer/contrib/ntp/scripts/summary.in#2 integrate .. //depot/projects/hammer/contrib/ntp/scripts/summary.pl#2 delete .. //depot/projects/hammer/contrib/ntp/util/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/ntp/util/ansi2knr.c#2 integrate .. //depot/projects/hammer/contrib/ntp/util/ntp-genkeys.c#2 integrate .. //depot/projects/hammer/contrib/ntp/version#1 branch .. //depot/projects/hammer/contrib/nvi/clib/getopt.c#2 integrate .. //depot/projects/hammer/contrib/nvi/clib/memchr.c#2 integrate .. //depot/projects/hammer/contrib/nvi/clib/memmove.c#2 integrate .. //depot/projects/hammer/contrib/nvi/clib/memset.c#2 integrate .. //depot/projects/hammer/contrib/nvi/clib/mkstemp.c#2 integrate .. //depot/projects/hammer/contrib/nvi/clib/mmap.c#2 integrate .. //depot/projects/hammer/contrib/nvi/clib/snprintf.c#2 integrate .. //depot/projects/hammer/contrib/nvi/clib/strdup.c#2 integrate .. //depot/projects/hammer/contrib/nvi/clib/strerror.c#2 integrate .. //depot/projects/hammer/contrib/nvi/clib/strpbrk.c#2 integrate .. //depot/projects/hammer/contrib/nvi/clib/strsep.c#2 integrate .. //depot/projects/hammer/contrib/nvi/clib/strtol.c#2 integrate .. //depot/projects/hammer/contrib/nvi/clib/strtoul.c#2 integrate .. //depot/projects/hammer/contrib/nvi/clib/vsnprintf.c#2 integrate .. //depot/projects/hammer/contrib/one-true-awk/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/crypto/openssh/CREDITS#2 integrate .. //depot/projects/hammer/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-Xlist#2 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-tricks#1 branch .. //depot/projects/hammer/crypto/openssh/FREEBSD-upgrade#3 integrate .. //depot/projects/hammer/crypto/openssh/INSTALL#2 integrate .. //depot/projects/hammer/crypto/openssh/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/openssh/TODO#2 integrate .. //depot/projects/hammer/crypto/openssh/acconfig.h#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-bsdauth.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-krb4.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-krb5.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-options.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-options.h#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-pam.h#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-passwd.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth-skey.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth.h#2 integrate .. //depot/projects/hammer/crypto/openssh/auth1.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth2-chall.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth2-none.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth2-pam-freebsd.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth2-pam.c#2 integrate .. //depot/projects/hammer/crypto/openssh/auth2.c#2 integrate .. //depot/projects/hammer/crypto/openssh/authfd.c#2 integrate .. //depot/projects/hammer/crypto/openssh/authfd.h#2 integrate .. //depot/projects/hammer/crypto/openssh/canohost.c#2 integrate .. //depot/projects/hammer/crypto/openssh/channels.c#2 integrate .. //depot/projects/hammer/crypto/openssh/channels.h#2 integrate .. //depot/projects/hammer/crypto/openssh/cipher.c#2 integrate .. //depot/projects/hammer/crypto/openssh/clientloop.c#2 integrate .. //depot/projects/hammer/crypto/openssh/compat.c#2 integrate .. //depot/projects/hammer/crypto/openssh/compat.h#2 integrate .. //depot/projects/hammer/crypto/openssh/config.guess#2 integrate .. //depot/projects/hammer/crypto/openssh/config.sub#2 integrate .. //depot/projects/hammer/crypto/openssh/configure.ac#2 integrate .. //depot/projects/hammer/crypto/openssh/defines.h#2 integrate .. //depot/projects/hammer/crypto/openssh/dh.c#2 integrate .. //depot/projects/hammer/crypto/openssh/hostfile.c#2 integrate .. //depot/projects/hammer/crypto/openssh/hostfile.h#2 integrate .. //depot/projects/hammer/crypto/openssh/includes.h#2 integrate .. //depot/projects/hammer/crypto/openssh/kex.h#2 integrate .. //depot/projects/hammer/crypto/openssh/key.c#2 integrate .. //depot/projects/hammer/crypto/openssh/log.c#2 integrate .. //depot/projects/hammer/crypto/openssh/log.h#2 integrate .. //depot/projects/hammer/crypto/openssh/loginrec.c#2 integrate .. //depot/projects/hammer/crypto/openssh/monitor.c#3 integrate .. //depot/projects/hammer/crypto/openssh/monitor.h#2 integrate .. //depot/projects/hammer/crypto/openssh/monitor_fdpass.c#2 integrate .. //depot/projects/hammer/crypto/openssh/monitor_mm.c#2 integrate .. //depot/projects/hammer/crypto/openssh/monitor_mm.h#2 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.c#2 integrate .. //depot/projects/hammer/crypto/openssh/monitor_wrap.h#2 integrate .. //depot/projects/hammer/crypto/openssh/msg.c#2 integrate .. //depot/projects/hammer/crypto/openssh/msg.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/Makefile.in#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/base64.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bindresvport.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cray.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-cray.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-getpeereid.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-getpeereid.h#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/bsd-misc.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/dirname.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getcwd.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/getopt.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/glob.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/glob.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_ntoa.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/inet_ntop.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/mktemp.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/openbsd-compat.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/port-aix.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/readpassphrase.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/readpassphrase.h#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/realpath.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/rresvport.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/setenv.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/sigact.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strlcat.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strlcpy.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/strsep.c#2 integrate .. //depot/projects/hammer/crypto/openssh/openbsd-compat/sys-queue.h#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/sys-tree.h#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/xmmap.c#1 branch .. //depot/projects/hammer/crypto/openssh/openbsd-compat/xmmap.h#1 branch .. //depot/projects/hammer/crypto/openssh/packet.c#2 integrate .. //depot/projects/hammer/crypto/openssh/radix.c#2 integrate .. //depot/projects/hammer/crypto/openssh/readconf.c#2 integrate .. //depot/projects/hammer/crypto/openssh/rijndael.c#2 integrate .. //depot/projects/hammer/crypto/openssh/scard.h#2 integrate .. //depot/projects/hammer/crypto/openssh/servconf.c#2 integrate .. //depot/projects/hammer/crypto/openssh/servconf.h#2 integrate .. //depot/projects/hammer/crypto/openssh/serverloop.c#2 integrate .. //depot/projects/hammer/crypto/openssh/session.c#3 integrate .. //depot/projects/hammer/crypto/openssh/session.h#2 integrate .. //depot/projects/hammer/crypto/openssh/sftp-client.c#2 integrate .. //depot/projects/hammer/crypto/openssh/sftp-client.h#2 integrate .. //depot/projects/hammer/crypto/openssh/sftp-common.c#2 integrate .. //depot/projects/hammer/crypto/openssh/sftp-common.h#2 integrate .. //depot/projects/hammer/crypto/openssh/sftp-glob.c#2 integrate .. //depot/projects/hammer/crypto/openssh/sftp-glob.h#2 integrate .. //depot/projects/hammer/crypto/openssh/sftp-int.c#2 integrate .. //depot/projects/hammer/crypto/openssh/sftp-server.c#2 integrate .. //depot/projects/hammer/crypto/openssh/sftp.1#2 integrate .. //depot/projects/hammer/crypto/openssh/sftp.c#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh-add.c#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh-agent.c#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh-dss.c#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keygen.c#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keyscan.c#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keysign.8#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh-keysign.c#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh-rand-helper.c#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh-rsa.c#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh.1#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh.c#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh.h#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh_config.5#2 integrate .. //depot/projects/hammer/crypto/openssh/ssh_prng_cmds.in#2 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect.c#2 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect1.c#2 integrate .. //depot/projects/hammer/crypto/openssh/sshconnect2.c#2 integrate .. //depot/projects/hammer/crypto/openssh/sshd.8#2 integrate .. //depot/projects/hammer/crypto/openssh/sshd.c#2 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config#2 integrate .. //depot/projects/hammer/crypto/openssh/sshd_config.5#2 integrate .. //depot/projects/hammer/crypto/openssh/sshlogin.c#3 integrate .. //depot/projects/hammer/crypto/openssh/sshlogin.h#3 integrate .. //depot/projects/hammer/crypto/openssh/sshpty.c#2 integrate .. //depot/projects/hammer/crypto/openssh/uidswap.c#2 integrate .. //depot/projects/hammer/crypto/openssh/uuencode.c#2 integrate .. //depot/projects/hammer/crypto/openssh/version.c#2 integrate .. //depot/projects/hammer/crypto/openssh/version.h#2 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#3 integrate .. //depot/projects/hammer/etc/inetd.conf#3 integrate .. //depot/projects/hammer/etc/mtree/BSD.local.dist#3 integrate .. //depot/projects/hammer/etc/mtree/BSD.var.dist#3 integrate .. //depot/projects/hammer/etc/namedb/named.root#2 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#3 integrate .. //depot/projects/hammer/etc/rc.d/devd#1 branch .. //depot/projects/hammer/etc/rc.d/ipfilter#4 integrate .. //depot/projects/hammer/etc/rc.d/root#4 integrate .. //depot/projects/hammer/etc/rc.d/ypbind#3 integrate .. //depot/projects/hammer/etc/rc.network#4 integrate .. //depot/projects/hammer/etc/rc.subr#4 integrate .. //depot/projects/hammer/games/fortune/datfiles/Makefile#2 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/hammer/games/fortune/datfiles/gerrold.limerick#2 integrate .. //depot/projects/hammer/gnu/lib/libobjc/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/Makefile.tgt#3 integrate .. //depot/projects/hammer/gnu/usr.bin/groff/src/preproc/Makefile#2 integrate .. //depot/projects/hammer/include/unistd.h#7 integrate .. //depot/projects/hammer/kerberos5/Makefile#3 integrate .. //depot/projects/hammer/lib/libc/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/infinity.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/_pthread_stubs.c#3 integrate .. //depot/projects/hammer/lib/libc/i386/gen/infinity.c#3 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/_setjmp.S#2 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/infinity.c#3 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/setjmp.S#2 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/sigsetjmp.S#2 integrate .. //depot/projects/hammer/lib/libc/include/namespace.h#2 integrate .. //depot/projects/hammer/lib/libc/include/reentrant.h#2 integrate .. //depot/projects/hammer/lib/libc/locale/btowc.3#2 integrate .. //depot/projects/hammer/lib/libc/locale/collate.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/mbrlen.3#3 integrate .. //depot/projects/hammer/lib/libc/locale/mbrtowc.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/mbstowcs.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/utf8.5#2 integrate .. //depot/projects/hammer/lib/libc/locale/wctrans.c#2 integrate .. //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/posix1e/acl.3#2 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac.3#3 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac.c#2 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac_exec.c#1 branch .. //depot/projects/hammer/lib/libc/posix1e/mac_text.3#3 integrate .. //depot/projects/hammer/lib/libc/posix1e/posix1e.3#3 integrate .. //depot/projects/hammer/lib/libc/rpc/PSD.doc/nfs.rfc.ms#2 integrate .. //depot/projects/hammer/lib/libc/rpc/PSD.doc/rpc.prog.ms#2 integrate .. //depot/projects/hammer/lib/libc/rpc/PSD.doc/rpc.rfc.ms#2 integrate .. //depot/projects/hammer/lib/libc/rpc/PSD.doc/rpcgen.ms#2 integrate .. //depot/projects/hammer/lib/libc/rpc/PSD.doc/stubs#2 integrate .. //depot/projects/hammer/lib/libc/rpc/PSD.doc/xdr.nts.ms#2 integrate .. //depot/projects/hammer/lib/libc/rpc/PSD.doc/xdr.rfc.ms#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/gen/infinity.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/stdio/findfp.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/vfscanf.c#5 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwscanf.c#3 integrate .. //depot/projects/hammer/lib/libc/sys/gettimeofday.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/pathconf.2#2 integrate .. //depot/projects/hammer/lib/libc/sys/uuidgen.2#2 integrate .. //depot/projects/hammer/lib/libc/uuid/Makefile.inc#1 branch .. //depot/projects/hammer/lib/libc/uuid/uuid.3#1 branch .. //depot/projects/hammer/lib/libc/uuid/uuid.h#1 branch .. //depot/projects/hammer/lib/libc/uuid/uuid_compare.c#1 branch .. //depot/projects/hammer/lib/libc/uuid/uuid_create.c#1 branch .. //depot/projects/hammer/lib/libc/uuid/uuid_create_nil.c#1 branch .. //depot/projects/hammer/lib/libc/uuid/uuid_equal.c#1 branch .. //depot/projects/hammer/lib/libc/uuid/uuid_from_string.c#1 branch .. //depot/projects/hammer/lib/libc/uuid/uuid_hash.c#1 branch .. //depot/projects/hammer/lib/libc/uuid/uuid_is_nil.c#1 branch .. //depot/projects/hammer/lib/libc/uuid/uuid_to_string.c#1 branch .. //depot/projects/hammer/lib/libc_r/uthread/uthread_mutex.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_write.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_writev.c#3 integrate .. //depot/projects/hammer/lib/libdisk/Makefile#3 integrate .. //depot/projects/hammer/lib/libdisk/blocks.c#3 integrate .. //depot/projects/hammer/lib/libdisk/chunk.c#3 integrate .. //depot/projects/hammer/lib/libdisk/create_chunk.c#6 integrate .. //depot/projects/hammer/lib/libdisk/disk.c#5 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.3#3 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.h#3 integrate .. //depot/projects/hammer/lib/libdisk/rules.c#5 integrate .. //depot/projects/hammer/lib/libdisk/tst01.c#3 integrate .. //depot/projects/hammer/lib/libdisk/write_alpha_disk.c#2 integrate .. //depot/projects/hammer/lib/libdisk/write_i386_disk.c#2 integrate .. //depot/projects/hammer/lib/libdisk/write_ia64_disk.c#2 integrate .. //depot/projects/hammer/lib/libdisk/write_pc98_disk.c#2 integrate .. //depot/projects/hammer/lib/libdisk/write_sparc64_disk.c#1 branch .. //depot/projects/hammer/lib/libfetch/Makefile#4 integrate .. //depot/projects/hammer/lib/libfetch/common.c#4 integrate .. //depot/projects/hammer/lib/libfetch/fetch.3#2 integrate .. //depot/projects/hammer/lib/libfetch/ftp.errors#2 integrate .. //depot/projects/hammer/lib/libfetch/http.c#4 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/thr_enter_uts.S#1 branch .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/thr_switch.S#1 branch .. //depot/projects/hammer/lib/libpthread/sys/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_printf.c#1 branch .. //depot/projects/hammer/lib/libpthread/thread/thr_priority_queue.c#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigmask.c#2 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.c#4 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.h#3 integrate .. //depot/projects/hammer/lib/libutil/login.conf.5#2 integrate .. //depot/projects/hammer/lib/libutil/login_class.c#3 integrate .. //depot/projects/hammer/lib/libutil/pw_util.c#2 integrate .. //depot/projects/hammer/lib/msun/src/math.h#5 integrate .. //depot/projects/hammer/libexec/Makefile#5 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#5 integrate .. //depot/projects/hammer/libexec/lukemftpd/Makefile#4 integrate .. //depot/projects/hammer/libexec/lukemftpd/config.h#2 integrate .. //depot/projects/hammer/libexec/mknetid/mknetid.c#2 integrate .. //depot/projects/hammer/release/Makefile#8 integrate .. //depot/projects/hammer/release/Makefile.inc.docports#2 integrate .. //depot/projects/hammer/release/alpha/dokern.sh#3 integrate .. //depot/projects/hammer/release/alpha/drivers.conf#4 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/Makefile#2 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/early-adopter/Makefile#1 branch .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#1 branch .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/hardware/Makefile#3 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/installation/Makefile#3 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#3 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml#2 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile#1 branch .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/readme/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/relnotes/Makefile#3 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#4 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile#1 branch .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/Makefile#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#7 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/ia64/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/Makefile#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/ia64/Makefile#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/ia64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/ia64/Makefile#1 branch .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/ia64/article.sgml#1 branch .. //depot/projects/hammer/release/doc/fr_FR.ISO8859-1/Makefile#4 integrate .. //depot/projects/hammer/release/doc/fr_FR.ISO8859-1/early-adopter/Makefile#1 branch .. //depot/projects/hammer/release/doc/fr_FR.ISO8859-1/early-adopter/article.sgml#1 branch .. //depot/projects/hammer/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/hammer/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/fr_FR.ISO8859-1/installation/common/install.sgml#2 integrate .. //depot/projects/hammer/release/doc/share/examples/Makefile.relnotesng#3 integrate .. //depot/projects/hammer/release/i386/dokern.sh#6 integrate .. //depot/projects/hammer/release/i386/drivers.conf#5 integrate .. //depot/projects/hammer/release/ia64/boot_crunch.conf#1 branch .. //depot/projects/hammer/release/ia64/doFS.sh#1 branch .. //depot/projects/hammer/release/ia64/dokern.sh#1 branch .. //depot/projects/hammer/release/ia64/mkisoimages.sh#1 branch .. //depot/projects/hammer/release/pc98/dokern.sh#5 integrate .. //depot/projects/hammer/release/pc98/drivers-small.conf#2 integrate .. //depot/projects/hammer/release/pc98/fixit-small_crunch.conf#1 branch .. //depot/projects/hammer/release/scripts/doFS.sh#2 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#3 integrate .. //depot/projects/hammer/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/hammer/sbin/dumpfs/dumpfs.c#4 integrate .. //depot/projects/hammer/sbin/fsck/fsck.c#3 integrate .. //depot/projects/hammer/sbin/gbde/Makefile#2 integrate .. //depot/projects/hammer/sbin/gbde/gbde.8#2 integrate .. //depot/projects/hammer/sbin/gbde/gbde.c#2 integrate .. //depot/projects/hammer/sbin/gpt/add.c#2 integrate .. //depot/projects/hammer/sbin/gpt/create.c#2 integrate .. //depot/projects/hammer/sbin/gpt/destroy.c#2 integrate .. //depot/projects/hammer/sbin/gpt/gpt.c#3 integrate .. //depot/projects/hammer/sbin/gpt/gpt.h#3 integrate .. //depot/projects/hammer/sbin/gpt/migrate.c#3 integrate .. //depot/projects/hammer/sbin/gpt/recover.c#3 integrate .. //depot/projects/hammer/sbin/gpt/show.c#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/hammer/sbin/mca/mca.c#3 integrate .. //depot/projects/hammer/sbin/mount_std/mount_std.c#3 integrate .. //depot/projects/hammer/sbin/newfs_msdos/newfs_msdos.c#4 integrate .. //depot/projects/hammer/sbin/reboot/Makefile#2 integrate .. //depot/projects/hammer/sbin/reboot/nextboot.8#1 branch .. //depot/projects/hammer/sbin/sysctl/sysctl.c#3 integrate .. //depot/projects/hammer/secure/lib/libcipher/Makefile#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile#3 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.asm#2 integrate .. //depot/projects/hammer/secure/lib/libcrypto/Makefile.inc#3 integrate .. //depot/projects/hammer/secure/lib/libssh/Makefile#3 integrate .. //depot/projects/hammer/secure/lib/libtelnet/Makefile#2 integrate .. //depot/projects/hammer/secure/libexec/ssh-keysign/Makefile#2 integrate .. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/hammer/share/Makefile#2 integrate .. //depot/projects/hammer/share/doc/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/beyond4.3/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/bufbio/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/devfs/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/diskperf/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/jail/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/kernmalloc/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/kerntune/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/malloc/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/nqnfs/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/px/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/relengr/0.t#2 integrate .. //depot/projects/hammer/share/doc/papers/relengr/Makefile#2 integrate .. //depot/projects/hammer/share/doc/papers/sysperf/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/01.cacm/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/01.cacm/p1#3 integrate .. //depot/projects/hammer/share/doc/psd/02.implement/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/02.implement/implement#3 integrate .. //depot/projects/hammer/share/doc/psd/05.sysman/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/06.Clang/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/12.make/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/13.rcs/rcs/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/13.rcs/rcs_func/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/15.yacc/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/15.yacc/ss..#3 integrate .. //depot/projects/hammer/share/doc/psd/16.lex/Makefile#3 integrate .. //depot/projects/hammer/share/doc/psd/18.gprof/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/20.ipctut/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/21.ipc/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/22.rpcgen/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/23.rpc/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/24.xdr/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/25.xdrrfc/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/26.rpcrfc/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/27.nfsrpc/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/28.cvs/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/contents/Makefile#2 integrate .. //depot/projects/hammer/share/doc/psd/title/Makefile#2 integrate .. //depot/projects/hammer/share/doc/smm/01.setup/Makefile#2 integrate .. //depot/projects/hammer/share/doc/smm/02.config/Makefile#2 integrate .. //depot/projects/hammer/share/doc/smm/05.fastfs/Makefile#2 integrate .. //depot/projects/hammer/share/doc/smm/08.sendmailop/Makefile#2 integrate .. //depot/projects/hammer/share/doc/smm/12.timed/Makefile#2 integrate .. //depot/projects/hammer/share/doc/smm/contents/Makefile#2 integrate .. //depot/projects/hammer/share/doc/smm/title/Makefile#2 integrate .. //depot/projects/hammer/share/doc/usd/04.csh/Makefile#2 integrate .. //depot/projects/hammer/share/doc/usd/07.mail/Makefile#2 integrate .. //depot/projects/hammer/share/doc/usd/10.exref/summary/Makefile#3 integrate .. //depot/projects/hammer/share/doc/usd/11.vitut/Makefile#2 integrate .. //depot/projects/hammer/share/doc/usd/12.vi/Makefile#2 integrate .. //depot/projects/hammer/share/doc/usd/12.vi/Makefile.inc#3 integrate .. //depot/projects/hammer/share/doc/usd/12.vi/summary/Makefile#3 integrate .. //depot/projects/hammer/share/doc/usd/12.vi/vi/Makefile#3 integrate .. //depot/projects/hammer/share/doc/usd/12.vi/viapwh/Makefile#2 integrate .. //depot/projects/hammer/share/doc/usd/13.viref/Makefile#3 integrate .. //depot/projects/hammer/share/doc/usd/19.memacros/Makefile#2 integrate .. //depot/projects/hammer/share/doc/usd/20.meref/Makefile#2 integrate .. //depot/projects/hammer/share/doc/usd/21.troff/Makefile#2 integrate .. //depot/projects/hammer/share/doc/usd/22.trofftut/Makefile#2 integrate .. //depot/projects/hammer/share/doc/usd/contents/Makefile#2 integrate .. //depot/projects/hammer/share/doc/usd/title/Makefile#2 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#6 integrate .. //depot/projects/hammer/share/man/man4/Makefile#6 integrate .. //depot/projects/hammer/share/man/man4/atapicam.4#1 branch .. //depot/projects/hammer/share/man/man4/fwe.4#1 branch .. //depot/projects/hammer/share/man/man4/gbde.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_source.4#1 branch .. //depot/projects/hammer/share/man/man4/ohci.4#2 integrate .. //depot/projects/hammer/share/man/man4/rl.4#2 integrate .. //depot/projects/hammer/share/man/man4/snp.4#3 integrate .. //depot/projects/hammer/share/man/man4/udbp.4#2 integrate .. //depot/projects/hammer/share/man/man4/uhci.4#2 integrate .. //depot/projects/hammer/share/man/man4/ukbd.4#4 integrate .. //depot/projects/hammer/share/man/man4/umass.4#3 integrate .. //depot/projects/hammer/share/man/man4/ums.4#2 integrate .. //depot/projects/hammer/share/man/man4/usb.4#2 integrate .. //depot/projects/hammer/share/man/man4/wi.4#3 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#4 integrate .. //depot/projects/hammer/share/man/man5/passwd.5#2 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/hammer/share/man/man7/clocks.7#2 integrate .. //depot/projects/hammer/share/man/man9/mac.9#2 integrate .. //depot/projects/hammer/share/man/man9/style.9#5 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#3 integrate .. //depot/projects/hammer/share/misc/pci_vendors#5 integrate .. //depot/projects/hammer/share/mk/bsd.doc.mk#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/atomic.s#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/prom.c#2 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#5 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/hammer/sys/alpha/include/atomic.h#4 integrate .. //depot/projects/hammer/sys/alpha/include/bus.h#4 integrate .. //depot/projects/hammer/sys/alpha/include/vmparam.h#2 integrate .. //depot/projects/hammer/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/hammer/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/devicename.c#2 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/libofw.h#2 integrate .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_devsearch.c#2 delete .. //depot/projects/hammer/sys/boot/ofw/libofw/ofw_disk.c#2 integrate .. //depot/projects/hammer/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/Makefile#4 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#4 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#4 integrate .. //depot/projects/hammer/sys/conf/NOTES#11 integrate .. //depot/projects/hammer/sys/conf/files#10 integrate .. //depot/projects/hammer/sys/conf/files.i386#8 integrate .. //depot/projects/hammer/sys/conf/files.pc98#8 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#5 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#4 integrate .. //depot/projects/hammer/sys/conf/majors#8 integrate .. //depot/projects/hammer/sys/crypto/sha2/sha2.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cmbat.c#3 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/hammer/sys/dev/amr/amr.c#4 integrate .. //depot/projects/hammer/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/hammer/sys/dev/amr/amr_compat.h#3 integrate .. //depot/projects/hammer/sys/dev/amr/amr_disk.c#4 integrate .. //depot/projects/hammer/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/amr/amr_tables.h#3 integrate .. //depot/projects/hammer/sys/dev/amr/amrio.h#3 integrate .. //depot/projects/hammer/sys/dev/amr/amrreg.h#4 integrate .. //depot/projects/hammer/sys/dev/amr/amrvar.h#4 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#3 integrate .. //depot/projects/hammer/sys/dev/asr/asr.c#3 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#3 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_core.c#3 integrate .. //depot/projects/hammer/sys/dev/buslogic/bt.c#2 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#5 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/hammer/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/hammer/sys/dev/eisa/eisaconf.c#3 integrate .. //depot/projects/hammer/sys/dev/em/README#3 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#4 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#4 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.c#4 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.h#4 integrate .. //depot/projects/hammer/sys/dev/em/if_em_osdep.h#4 integrate .. //depot/projects/hammer/sys/dev/fb/vga.c#4 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/hammer/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/hammer/sys/dev/firewire/fwdev.c#1 branch .. //depot/projects/hammer/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/hammer/sys/dev/firewire/fwmem.h#2 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#5 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/hammer/sys/dev/gfb/gfb_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/gx/if_gxvar.h#2 integrate .. //depot/projects/hammer/sys/dev/hea/eni_buffer.c#3 integrate .. //depot/projects/hammer/sys/dev/hea/eni_init.c#2 integrate .. //depot/projects/hammer/sys/dev/hea/eni_receive.c#2 integrate .. //depot/projects/hammer/sys/dev/hea/eni_transmit.c#2 integrate .. //depot/projects/hammer/sys/dev/hea/eni_vcm.c#3 integrate .. //depot/projects/hammer/sys/dev/hfa/fore_output.c#2 integrate .. //depot/projects/hammer/sys/dev/hfa/fore_receive.c#3 integrate .. //depot/projects/hammer/sys/dev/ida/ida.c#2 integrate .. //depot/projects/hammer/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/mcd/mcd.c#3 integrate .. //depot/projects/hammer/sys/dev/mcd/mcdvar.h#3 integrate .. //depot/projects/hammer/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#2 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/hammer/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/hammer/sys/dev/pccard/card_if.m#3 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard.c#5 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/hammer/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpt.c#2 integrate .. //depot/projects/hammer/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppb_msq.h#2 integrate .. //depot/projects/hammer/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/hammer/sys/dev/rc/rc.c#2 integrate .. //depot/projects/hammer/sys/dev/scd/scd.c#2 integrate .. //depot/projects/hammer/sys/dev/scd/scd_isa.c#1 branch .. //depot/projects/hammer/sys/dev/scd/scdreg.h#2 integrate .. //depot/projects/hammer/sys/dev/scd/scdvar.h#1 branch .. //depot/projects/hammer/sys/dev/si/si_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/sio/sio_puc.c#3 integrate .. //depot/projects/hammer/sys/dev/snp/snp.c#2 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/hammer/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/hammer/sys/dev/sr/if_srregs.h#2 integrate .. //depot/projects/hammer/sys/dev/sym/sym_defs.h#2 integrate .. //depot/projects/hammer/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/tga/tga_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/hammer/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/ufm.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/ulpt.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb.h#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumdaemon.c#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinuminterrupt.c#2 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrequest.c#2 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrevive.c#2 integrate .. //depot/projects/hammer/sys/dev/wds/wd7000.c#2 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#4 integrate .. //depot/projects/hammer/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_smb.c#3 integrate .. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#8 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde.h#2 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#2 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/hammer/sys/geom/geom.h#8 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#9 integrate .. //depot/projects/hammer/sys/geom/geom_dump.c#7 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_gpt.c#7 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#7 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#6 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#6 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#6 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#8 integrate .. //depot/projects/hammer/sys/i386/i386/exception.s#2 integrate .. //depot/projects/hammer/sys/i386/i386/genassym.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#9 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/vm86bios.s#2 integrate .. //depot/projects/hammer/sys/i386/include/pcb.h#5 integrate .. //depot/projects/hammer/sys/i386/include/reg.h#4 integrate .. //depot/projects/hammer/sys/i386/include/vm86.h#2 integrate .. //depot/projects/hammer/sys/i386/isa/gpib.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#6 integrate .. //depot/projects/hammer/sys/i386/isa/scd.c#6 delete .. //depot/projects/hammer/sys/i386/isa/scdreg.h#2 delete .. //depot/projects/hammer/sys/i386/isa/spkr.c#4 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#7 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#5 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC.hints#2 integrate .. //depot/projects/hammer/sys/ia64/ia32/syscalls.master#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/exception.s#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/genassym.c#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/locore.s#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/swtch.s#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#4 integrate .. //depot/projects/hammer/sys/ia64/include/pcb.h#3 integrate .. //depot/projects/hammer/sys/ia64/include/setjmp.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/vmparam.h#2 integrate .. //depot/projects/hammer/sys/isa/fd.c#4 integrate .. //depot/projects/hammer/sys/isofs/cd9660/cd9660_vfsops.c#6 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/hammer/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_acct.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_environment.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_event.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_lockf.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_tc.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#4 integrate .. //depot/projects/hammer/sys/kern/makesyscalls.sh#3 integrate .. //depot/projects/hammer/sys/kern/subr_bus.c#5 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#7 integrate .. //depot/projects/hammer/sys/kern/sys_socket.c#5 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#8 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#8 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#4 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#6 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/hammer/sys/libkern/qsort.c#2 integrate .. //depot/projects/hammer/sys/modules/Makefile#10 integrate .. //depot/projects/hammer/sys/modules/Makefile.inc#2 integrate .. //depot/projects/hammer/sys/modules/aac/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/aic/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/aic7xxx/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/aic7xxx/ahc/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/aic7xxx/ahc/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/aic7xxx/ahd/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/aic7xxx/aicasm/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/apm/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/atspeaker/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/bktr/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/cam/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/drm/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/ed/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ep/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/fdc/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/fe/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/firewire/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/firewire/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/firewire/firewire/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/hfa/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/i2c/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/i2c/controllers/Makefile.inc#1 branch .. //depot/projects/hammer/sys/modules/isp/Makefile#1 branch .. //depot/projects/hammer/sys/modules/lnc/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/lomac/Makefile.inc#2 integrate .. //depot/projects/hammer/sys/modules/mpt/Makefile#1 branch .. //depot/projects/hammer/sys/modules/msdosfs/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/netgraph/fec/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/fec/sample_startup#1 branch .. //depot/projects/hammer/sys/modules/netgraph/source/Makefile#1 branch .. //depot/projects/hammer/sys/modules/nfsserver/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/oldcard/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/pcspeaker/Makefile#1 branch .. //depot/projects/hammer/sys/modules/pmc/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/scd/Makefile#1 branch .. //depot/projects/hammer/sys/modules/sound/driver/mss/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/sound/driver/sbc/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/splash/bmp/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/splash/bmp/splash_bmp.c#3 integrate .. //depot/projects/hammer/sys/modules/splash/pcx/splash_pcx.c#2 integrate .. //depot/projects/hammer/sys/modules/syscons/apm/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/syscons/daemon/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/syscons/dragon/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/syscons/fire/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/syscons/rain/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/syscons/snake/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/syscons/star/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/syscons/warp/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/sysvipc/Makefile.inc#1 branch .. //depot/projects/hammer/sys/net/if_vlan.c#3 integrate .. //depot/projects/hammer/sys/net/radix.c#2 integrate .. //depot/projects/hammer/sys/net/zlib.c#3 integrate .. //depot/projects/hammer/sys/netatm/atm_cm.c#3 integrate .. //depot/projects/hammer/sys/netatm/atm_cm.h#2 integrate .. //depot/projects/hammer/sys/netatm/atm_device.c#2 integrate .. //depot/projects/hammer/sys/netatm/atm_if.c#3 integrate .. //depot/projects/hammer/sys/netatm/atm_if.h#3 integrate .. //depot/projects/hammer/sys/netatm/atm_signal.c#2 integrate .. //depot/projects/hammer/sys/netatm/atm_stack.h#2 integrate .. //depot/projects/hammer/sys/netatm/atm_subr.c#2 integrate .. //depot/projects/hammer/sys/netatm/atm_var.h#2 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_if.c#2 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_load.c#2 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_var.h#2 integrate .. //depot/projects/hammer/sys/netatm/port.h#2 integrate .. //depot/projects/hammer/sys/netatm/spans/spans_kxdr.c#3 integrate .. //depot/projects/hammer/sys/netatm/uni/q2110_sigaa.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/q2110_sigcpcs.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/qsaal1_sigaa.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/qsaal1_sigcpcs.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/sscf_uni_lower.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/sscf_uni_upper.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/sscf_uni_var.h#2 integrate .. //depot/projects/hammer/sys/netatm/uni/sscop_lower.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/sscop_pdu.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/sscop_sigaa.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/sscop_sigcpcs.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/sscop_subr.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/sscop_upper.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/sscop_var.h#2 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_decode.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_encode.c#2 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_var.h#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_fec.c#1 branch .. //depot/projects/hammer/sys/netgraph/ng_fec.h#1 branch .. //depot/projects/hammer/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_source.c#1 branch .. //depot/projects/hammer/sys/netgraph/ng_source.h#1 branch .. //depot/projects/hammer/sys/netinet/in.h#4 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#5 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#4 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#6 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/hammer/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/hammer/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/hammer/sys/netipx/ipx_ip.c#4 integrate .. //depot/projects/hammer/sys/netncp/ncp_rq.c#2 integrate .. //depot/projects/hammer/sys/netsmb/smb_subr.c#3 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#4 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/hammer/sys/nfsserver/nfsm_subs.h#2 integrate .. //depot/projects/hammer/sys/opencrypto/crypto.c#3 integrate .. //depot/projects/hammer/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#5 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC.hints#4 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#7 integrate .. //depot/projects/hammer/sys/pc98/pc98/spkr.c#3 integrate .. //depot/projects/hammer/sys/pci/amd.c#3 integrate .. //depot/projects/hammer/sys/pci/if_mn.c#3 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#5 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#4 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#5 integrate .. //depot/projects/hammer/sys/pci/if_tireg.h#2 integrate .. //depot/projects/hammer/sys/pci/intpm.c#2 integrate .. //depot/projects/hammer/sys/pci/viapm.c#2 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.h#3 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#4 integrate .. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/hammer/sys/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.h#3 integrate .. //depot/projects/hammer/sys/security/mac_none/mac_none.c#5 integrate .. //depot/projects/hammer/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/hammer/sys/security/mac_partition/mac_partition.h#2 integrate .. //depot/projects/hammer/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/hammer/sys/sparc64/include/ofw_bus.h#2 integrate .. //depot/projects/hammer/sys/sparc64/include/pmap.h#4 integrate .. //depot/projects/hammer/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/hammer/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.c#2 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#6 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/ofw_bus.c#2 integrate .. //depot/projects/hammer/sys/sys/_label.h#3 integrate .. //depot/projects/hammer/sys/sys/gpt.h#2 integrate .. //depot/projects/hammer/sys/sys/imgact.h#4 integrate .. //depot/projects/hammer/sys/sys/mac.h#6 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#6 integrate .. //depot/projects/hammer/sys/sys/malloc.h#3 integrate .. //depot/projects/hammer/sys/sys/mchain.h#3 integrate .. //depot/projects/hammer/sys/sys/mount.h#5 integrate .. //depot/projects/hammer/sys/sys/param.h#7 integrate .. //depot/projects/hammer/sys/sys/proc.h#10 integrate .. //depot/projects/hammer/sys/sys/snoop.h#3 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#3 integrate .. //depot/projects/hammer/sys/sys/sun_disklabel.h#3 integrate .. //depot/projects/hammer/sys/sys/syscall.h#8 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#8 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#8 integrate .. //depot/projects/hammer/sys/sys/time.h#2 integrate .. //depot/projects/hammer/sys/sys/uuid.h#2 integrate .. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#4 integrate .. //depot/projects/hammer/sys/vm/pmap.h#4 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#5 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#6 integrate .. //depot/projects/hammer/sys/vm/uma_dbg.c#3 integrate .. //depot/projects/hammer/sys/vm/uma_int.h#3 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#4 integrate .. //depot/projects/hammer/sys/vm/vm_init.c#3 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#5 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#5 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#4 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#5 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#7 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#5 integrate .. //depot/projects/hammer/tools/KSE/ksetest/simplelock.h#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/locale/test-btowc.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 12 18:20:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E20F37B404; Tue, 12 Nov 2002 18:20:25 -0800 (PST) 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 CD74C37B401 for ; Tue, 12 Nov 2002 18:20:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A0EB43E42 for ; Tue, 12 Nov 2002 18:20:24 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAD2HxmV053105 for ; Tue, 12 Nov 2002 18:17:59 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAD2HxWO053098 for perforce@freebsd.org; Tue, 12 Nov 2002 18:17:59 -0800 (PST) Date: Tue, 12 Nov 2002 18:17:59 -0800 (PST) Message-Id: <200211130217.gAD2HxWO053098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21023 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21023 Change 21023 by peter@peter_daintree on 2002/11/12 18:17:57 integrate i386_hammer Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pcb.h#5 integrate .. //depot/projects/hammer/sys/x86_64/include/reg.h#4 integrate .. //depot/projects/hammer/sys/x86_64/isa/npx.c#14 integrate .. //depot/projects/hammer/sys/x86_64/pci/pci_cfgreg.c#7 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/exception.s#8 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#9 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#27 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#7 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#14 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pcb.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/include/pcb.h,v 1.48 2002/10/15 00:02:50 peter Exp $ + * $FreeBSD: src/sys/i386/include/pcb.h,v 1.49 2002/11/07 01:34:23 davidxu Exp $ */ #ifndef _I386_PCB_H_ @@ -63,10 +63,10 @@ struct savefpu pcb_save; u_int pcb_flags; -#define FP_SOFTFP 0x01 /* process using software fltng pnt emulator */ #define PCB_DBREGS 0x02 /* process using debug registers */ #define PCB_NPXTRAP 0x04 /* npx trap pending */ #define PCB_NPXINITDONE 0x08 /* fpu state is initialized */ + caddr_t pcb_onfault; /* copyin/out fault recovery */ int pcb_gs; struct pcb_ext *pcb_ext; /* optional pcb extension */ ==== //depot/projects/hammer/sys/x86_64/include/reg.h#4 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)reg.h 5.5 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/i386/include/reg.h,v 1.28 2002/10/20 20:48:56 phk Exp $ + * $FreeBSD: src/sys/i386/include/reg.h,v 1.29 2002/11/07 22:42:31 alfred Exp $ */ #ifndef _MACHINE_REG_H_ @@ -131,7 +131,7 @@ #define DBREG_DR7_EXEC 0x00 /* break on execute */ #define DBREG_DR7_WRONLY 0x01 /* break on write */ #define DBREG_DR7_RDWR 0x03 /* break on read or write */ -#define DBREG_DRX(d,x) (d->dr[(x)]) /* reference dr0 - dr7 by +#define DBREG_DRX(d,x) ((d)->dr[(x)]) /* reference dr0 - dr7 by register number */ ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/isa/npx.c,v 1.134 2002/10/25 19:12:16 peter Exp $ + * $FreeBSD: src/sys/i386/isa/npx.c,v 1.135 2002/11/05 04:03:42 davidxu Exp $ */ #include "opt_debug_npx.h" ==== //depot/projects/hammer/sys/x86_64/pci/pci_cfgreg.c#7 (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. * - * $FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.97 2002/10/07 05:15:05 imp Exp $ + * $FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.99 2002/11/02 22:35:24 imp Exp $ * */ @@ -222,18 +222,19 @@ static int pci_cfgcheck(int maxdev) { - u_char device; + uint32_t id, class; + uint8_t header; + uint8_t device; if (bootverbose) printf("pci_cfgcheck:\tdevice "); for (device = 0; device < maxdev; device++) { - unsigned id, class, header; if (bootverbose) printf("%d ", device); id = inl(pci_cfgenable(0, device, 0, 0, 4)); - if (id == 0 || id == -1) + if (id == 0 || id == 0xffffffff) continue; class = inl(pci_cfgenable(0, device, 0, 8, 4)) >> 8; @@ -243,7 +244,7 @@ continue; header = inb(pci_cfgenable(0, device, 0, 14, 1)); - if (bootverbose) + if (bootverbose) printf("[hdr=%02x] ", header); if ((header & 0x7e) != 0) continue; @@ -264,13 +265,13 @@ static int pcireg_cfgopen(void) { - unsigned long mode1res,oldval1; - unsigned char mode2res,oldval2; + uint32_t mode1res, oldval1; + uint8_t mode2res, oldval2; oldval1 = inl(CONF1_ADDR_PORT); if (bootverbose) { - printf("pci_open(1):\tmode 1 addr port (0x0cf8) is 0x%08lx\n", + printf("pci_open(1):\tmode 1 addr port (0x0cf8) is 0x%08x\n", oldval1); } @@ -280,12 +281,12 @@ devmax = 32; outl(CONF1_ADDR_PORT, CONF1_ENABLE_CHK); - outb(CONF1_ADDR_PORT +3, 0); + outb(CONF1_ADDR_PORT + 3, 0); mode1res = inl(CONF1_ADDR_PORT); outl(CONF1_ADDR_PORT, oldval1); if (bootverbose) - printf("pci_open(1a):\tmode1res=0x%08lx (0x%08lx)\n", + printf("pci_open(1a):\tmode1res=0x%08x (0x%08lx)\n", mode1res, CONF1_ENABLE_CHK); if (mode1res) { @@ -298,7 +299,7 @@ outl(CONF1_ADDR_PORT, oldval1); if (bootverbose) - printf("pci_open(1b):\tmode1res=0x%08lx (0x%08lx)\n", + printf("pci_open(1b):\tmode1res=0x%08x (0x%08lx)\n", mode1res, CONF1_ENABLE_CHK1); if ((mode1res & CONF1_ENABLE_MSK1) == CONF1_ENABLE_RES1) { ==== //depot/projects/hammer/sys/x86_64/x86_64/exception.s#8 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/exception.s,v 1.98 2002/07/28 00:27:51 peter Exp $ + * $FreeBSD: src/sys/i386/i386/exception.s,v 1.99 2002/11/07 01:34:23 davidxu Exp $ */ #include ==== //depot/projects/hammer/sys/x86_64/x86_64/genassym.c#9 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 - * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.130 2002/10/25 19:10:56 peter Exp $ + * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.131 2002/11/07 01:34:23 davidxu Exp $ */ #include "opt_compat.h" @@ -141,6 +141,7 @@ ASSYM(PCB_ONFAULT, offsetof(struct pcb, pcb_onfault)); ASSYM(PCB_SIZE, sizeof(struct pcb)); +ASSYM(PCB_VM86CALL, PCB_VM86CALL); ASSYM(TF_TRAPNO, offsetof(struct trapframe, tf_trapno)); ASSYM(TF_ERR, offsetof(struct trapframe, tf_err)); ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#27 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.545 2002/10/25 19:10:56 peter Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.549 2002/11/09 21:17:41 iwasaki Exp $ */ #include "opt_atalk.h" @@ -148,7 +148,6 @@ CTLFLAG_RD, &tlb_flush_count, 0, ""); #endif -long physmem = 0; int cold = 1; #ifdef COMPAT_FREEBSD4 @@ -156,42 +155,6 @@ u_long code); #endif -static int -sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) -{ - u_long val; - - val = ctob(physmem); - return (sysctl_handle_long(oidp, &val, 0, req)); -} - -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD, - 0, 0, sysctl_hw_physmem, "LU", ""); - -static int -sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) -{ - u_long val; - - val = ctob(physmem - cnt.v_wire_count); - return (sysctl_handle_long(oidp, &val, 0, req)); -} - -SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD, - 0, 0, sysctl_hw_usermem, "LU", ""); - -static int -sysctl_hw_availpages(SYSCTL_HANDLER_ARGS) -{ - u_long val; - - val = i386_btop(avail_end - avail_start); - return (sysctl_handle_long(oidp, &val, 0, req)); -} - -SYSCTL_PROC(_hw, OID_AUTO, availpages, CTLTYPE_ULONG | CTLFLAG_RD, - 0, 0, sysctl_hw_availpages, "LU", ""); - long Maxmem = 0; vm_offset_t phys_avail[10]; @@ -220,8 +183,8 @@ #ifdef PERFMON perfmon_init(); #endif - printf("real memory = %u (%uK bytes)\n", ptoa(Maxmem), - ptoa(Maxmem) / 1024); + printf("real memory = %u (%u MB)\n", ptoa(Maxmem), + ptoa(Maxmem) / 1048576); /* * Display any holes after the first chunk of extended memory. */ @@ -241,8 +204,8 @@ vm_ksubmap_init(&kmi); - printf("avail memory = %u (%uK bytes)\n", ptoa(cnt.v_free_count), - ptoa(cnt.v_free_count) / 1024); + printf("avail memory = %u (%u MB)\n", ptoa(cnt.v_free_count), + ptoa(cnt.v_free_count) / 1048576); /* * Set up buffers, so they can be used to read disk labels. @@ -325,8 +288,6 @@ sf.sf_si.si_signo = sig; sf.sf_si.si_code = code; sf.sf_si.si_addr = (void *)regs->tf_err; - sf.sf_si.si_pid = p->p_pid; - sf.sf_si.si_uid = p->p_ucred->cr_uid; } else { /* Old FreeBSD-style arguments. */ sf.sf_siginfo = code; @@ -456,8 +417,6 @@ sf.sf_si.si_signo = sig; sf.sf_si.si_code = code; sf.sf_si.si_addr = (void *)regs->tf_err; - sf.sf_si.si_pid = p->p_pid; - sf.sf_si.si_uid = p->p_ucred->cr_uid; } else { /* Old FreeBSD-style arguments. */ sf.sf_siginfo = code; @@ -1164,55 +1123,34 @@ } #error "while not end of smap table from loader" /* - * Perform "base memory" related probes & setup + * Perform "base memory" related probes & setup based on SMAP */ - for (i = 0; i <= physmap_idx; i += 2) { - if (physmap[i] == 0x00000000) { - basemem = physmap[i + 1] / 1024; - break; + if (basemem == 0) { + for (i = 0; i <= physmap_idx; i += 2) { + if (physmap[i] == 0x00000000) { + basemem = physmap[i + 1] / 1024; + break; + } } - } - /* Fall back to the old compatibility function for base memory */ -#error "basemem = fetch from loader metadata" + if (basemem == 0) { + basemem = 640; + } - if (basemem > 640) { - printf("Preposterous BIOS basemem of %uK, truncating to 640K\n", - basemem); - basemem = 640; - } + if (basemem > 640) { + printf("Preposterous BIOS basemem of %uK, truncating to 640K\n", + basemem); + basemem = 640; + } - /* - * XXX if biosbasemem is now < 640, there is a `hole' - * between the end of base memory and the start of - * ISA memory. The hole may be empty or it may - * contain BIOS code or data. Map it read/write so - * that the BIOS can write to it. (Memory from 0 to - * the physical end of the kernel is mapped read-only - * to begin with and then parts of it are remapped. - * The parts that aren't remapped form holes that - * remain read-only and are unused by the kernel. - * The base memory area is below the physical end of - * the kernel and right now forms a read-only hole. - * The part of it from PAGE_SIZE to - * (trunc_page(biosbasemem * 1024) - 1) will be - * remapped and used by the kernel later.) - * - * This code is similar to the code used in - * pmap_mapdev, but since no memory needs to be - * allocated we simply change the mapping. - */ - for (pa = trunc_page(basemem * 1024); - pa < ISA_HOLE_START; pa += PAGE_SIZE) - pmap_kenter(KERNBASE + pa, pa); + for (pa = trunc_page(basemem * 1024); + pa < ISA_HOLE_START; pa += PAGE_SIZE) + pmap_kenter(KERNBASE + pa, pa); - /* - * if basemem != 640, map pages r/w into vm86 page table so - * that the bios can scribble on it. - */ - pte = (pt_entry_t *)vm86paddr; - for (i = basemem / 4; i < 160; i++) - pte[i] = (i << PAGE_SHIFT) | PG_V | PG_RW | PG_U; + pte = (pt_entry_t *)vm86paddr; + for (i = basemem / 4; i < 160; i++) + pte[i] = (i << PAGE_SHIFT) | PG_V | PG_RW | PG_U; + } if (physmap[1] != 0) goto physmap_done; ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.367 2002/10/02 07:44:21 scottl Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.369 2002/11/11 05:17:33 alc Exp $ */ /* @@ -191,7 +191,6 @@ static void i386_protection_init(void); static __inline void pmap_changebit(vm_page_t m, int bit, boolean_t setem); -static void pmap_remove_all(vm_page_t m); static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva); @@ -1740,7 +1739,7 @@ * pmap_remove (slow...) */ -static void +void pmap_remove_all(vm_page_t m) { register pv_entry_t pv; @@ -2196,7 +2195,6 @@ vm_offset_t tmpidx; int psize; vm_page_t p, mpte; - int objpgs; if (pmap == NULL || object == NULL) return; @@ -2275,76 +2273,44 @@ } mpte = NULL; + + if ((p = TAILQ_FIRST(&object->memq)) != NULL) { + if (p->pindex < pindex) { + p = vm_page_splay(pindex, object->root); + if ((object->root = p)->pindex < pindex) + p = TAILQ_NEXT(p, listq); + } + } /* - * if we are processing a major portion of the object, then scan the - * entire thing. + * Assert: the variable p is either (1) the page with the + * least pindex greater than or equal to the parameter pindex + * or (2) NULL. */ - if (psize > (object->resident_page_count >> 2)) { - objpgs = psize; - - for (p = TAILQ_FIRST(&object->memq); - ((objpgs > 0) && (p != NULL)); - p = TAILQ_NEXT(p, listq)) { - - if (p->pindex < pindex || p->pindex - pindex >= psize) { - continue; - } - tmpidx = p->pindex - pindex; - /* - * don't allow an madvise to blow away our really - * free pages allocating pv entries. - */ - if ((limit & MAP_PREFAULT_MADVISE) && - cnt.v_free_count < cnt.v_free_reserved) { - break; - } - vm_page_lock_queues(); - if (((p->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL) && - (p->busy == 0) && - (p->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { - if ((p->queue - p->pc) == PQ_CACHE) - vm_page_deactivate(p); - vm_page_busy(p); - vm_page_unlock_queues(); - mpte = pmap_enter_quick(pmap, - addr + i386_ptob(tmpidx), p, mpte); - vm_page_lock_queues(); - vm_page_wakeup(p); - } - vm_page_unlock_queues(); - objpgs -= 1; - } - } else { + for (; + p != NULL && (tmpidx = p->pindex - pindex) < psize; + p = TAILQ_NEXT(p, listq)) { /* - * else lookup the pages one-by-one. + * don't allow an madvise to blow away our really + * free pages allocating pv entries. */ - for (tmpidx = 0; tmpidx < psize; tmpidx += 1) { - /* - * don't allow an madvise to blow away our really - * free pages allocating pv entries. - */ - if ((limit & MAP_PREFAULT_MADVISE) && - cnt.v_free_count < cnt.v_free_reserved) { - break; - } - p = vm_page_lookup(object, tmpidx + pindex); - if (p == NULL) - continue; + if ((limit & MAP_PREFAULT_MADVISE) && + cnt.v_free_count < cnt.v_free_reserved) { + break; + } + vm_page_lock_queues(); + if ((p->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL && + (p->busy == 0) && + (p->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { + if ((p->queue - p->pc) == PQ_CACHE) + vm_page_deactivate(p); + vm_page_busy(p); + vm_page_unlock_queues(); + mpte = pmap_enter_quick(pmap, + addr + i386_ptob(tmpidx), p, mpte); vm_page_lock_queues(); - if ((p->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL && - (p->busy == 0) && - (p->flags & (PG_BUSY | PG_FICTITIOUS)) == 0) { - if ((p->queue - p->pc) == PQ_CACHE) - vm_page_deactivate(p); - vm_page_busy(p); - vm_page_unlock_queues(); - mpte = pmap_enter_quick(pmap, - addr + i386_ptob(tmpidx), p, mpte); - vm_page_lock_queues(); - vm_page_wakeup(p); - } - vm_page_unlock_queues(); + vm_page_wakeup(p); } + vm_page_unlock_queues(); } return; } @@ -2859,7 +2825,8 @@ register pt_entry_t *pte; int s; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (!pmap_initialized || (m->flags & PG_FICTITIOUS) || + (!setem && bit == PG_RW && (m->flags & PG_WRITEABLE) == 0)) return; s = splvm(); @@ -2904,6 +2871,8 @@ } } } + if (!setem && bit == PG_RW) + vm_page_flag_clear(m, PG_WRITEABLE); splx(s); } ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#14 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/trap.c,v 1.236 2002/10/24 23:09:48 julian Exp $ + * $FreeBSD: src/sys/i386/i386/trap.c,v 1.237 2002/11/07 01:34:23 davidxu Exp $ */ /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 12 21:12:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BB0F37B404; Tue, 12 Nov 2002 21:12:53 -0800 (PST) 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 B516237B401 for ; Tue, 12 Nov 2002 21:12:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BAD643E42 for ; Tue, 12 Nov 2002 21:12:52 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAD5ARmV067488 for ; Tue, 12 Nov 2002 21:10:27 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAD5AQEC067485 for perforce@freebsd.org; Tue, 12 Nov 2002 21:10:26 -0800 (PST) Date: Tue, 12 Nov 2002 21:10:26 -0800 (PST) Message-Id: <200211130510.gAD5AQEC067485@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 Subject: PERFORCE change 21024 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21024 Change 21024 by rwatson@rwatson_tislabs on 2002/11/12 21:09:42 Begin to futz around with login classes and inetd: rather than using "daemon" as the default, use the class of the user specified in inetd.conf. This way, MAC labels get set correctly also. Allow the default to be overriden, permitting a restoration of the previous behavior using: inetd -L daemon Probably not quite there yet in terms of complete correctness and functionality, but appears to be a step up. Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.8#7 edit .. //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.8#7 (text+ko) ==== @@ -43,6 +43,7 @@ .Nm .Op Fl d .Op Fl l +.Op Fl L Ar class .Op Fl w .Op Fl W .Op Fl c Ar maximum @@ -80,6 +81,11 @@ Turn on debugging. .It Fl l Turn on logging of successful connections. +.It Fl L Ar class +Specify an alternative class to use as the default login class for a +daemon; by default, inetd will use the user class specified in the +.Xr 5 master.passwd +file. .It Fl w Turn on TCP Wrapping for external services. See the @@ -426,9 +432,7 @@ part separated by .Dq / allows to specify login class different -than default -.Dq daemon -login class. +than default login class for the specified user. .Pp The .Em server-program ==== //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.c#8 (text+ko) ==== @@ -180,10 +180,6 @@ #ifdef LOGIN_CAP #include - -/* see init.c */ -#define RESOURCE_RC "daemon" - #endif #ifndef MAXCHILD @@ -277,6 +273,9 @@ uid_t euid; gid_t egid; mode_t mask; +#ifdef LOGIN_CAP +char *default_class = NULL; +#endif struct servtab *servtab; @@ -338,7 +337,7 @@ openlog("inetd", LOG_PID | LOG_NOWAIT | LOG_PERROR, LOG_DAEMON); - while ((ch = getopt(argc, argv, "dlwWR:a:c:C:p:s:")) != -1) + while ((ch = getopt(argc, argv, "dlL:wWR:a:c:C:p:s:")) != -1) switch(ch) { case 'd': debug = 1; @@ -347,6 +346,11 @@ case 'l': log = 1; break; +#ifdef LOGIN_CAP + case 'L': + default_class = optarg; + break; +#endif case 'R': getvalue(optarg, &toomany, "-R %s: bad value for service invocation rate"); @@ -793,7 +797,10 @@ if (grp != NULL) pwd->pw_gid = grp->gr_gid; #ifdef LOGIN_CAP - if ((lc = login_getclass(sep->se_class)) == NULL) { + if (sep->se_class == NULL) + lc = NULL; + else if ((lc = login_getclass(sep->se_class)) + == NULL) { /* error syslogged by getclass */ syslog(LOG_ERR, "%s/%s: %s: login class error", @@ -1894,7 +1901,7 @@ *s = '\0'; sep->se_class = newstr(s + 1); } else - sep->se_class = newstr(RESOURCE_RC); + sep->se_class = default_class; #endif if ((s = strrchr(sep->se_user, ':')) != NULL) { *s = '\0'; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 6:56:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AF2137B406; Wed, 13 Nov 2002 06:56:01 -0800 (PST) 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 B49A337B401 for ; Wed, 13 Nov 2002 06:56:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6050E43E4A for ; Wed, 13 Nov 2002 06:55:56 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADErTmV028571 for ; Wed, 13 Nov 2002 06:53:29 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADErRIh028568 for perforce@freebsd.org; Wed, 13 Nov 2002 06:53:27 -0800 (PST) Date: Wed, 13 Nov 2002 06:53:27 -0800 (PST) Message-Id: <200211131453.gADErRIh028568@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 Subject: PERFORCE change 21030 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21030 Change 21030 by rwatson@rwatson_tislabs on 2002/11/13 06:53:14 Integ TrustedBSD base from FreeBSD vendor branch. Bring in various things, but largely loop back minor MAC changes such as MACOPVEC removal, devfs trimmage, etc. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#11 integrate .. //depot/projects/trustedbsd/base/bin/echo/echo.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/ChangeLog#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/acconfig.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/config.h.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/configure#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/configure.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/lukemftpd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftpd/todo#3 integrate .. //depot/projects/trustedbsd/base/contrib/one-true-awk/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#17 integrate .. //depot/projects/trustedbsd/base/etc/inetd.conf#9 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/Makefile#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devd#1 branch .. //depot/projects/trustedbsd/base/etc/rc.subr#8 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/Makefile#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/datfiles/gerrold.limerick#3 integrate .. //depot/projects/trustedbsd/base/include/unistd.h#14 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/_setjmp.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/setjmp.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/sigsetjmp.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/btowc.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrlen.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/mbrtowc.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/mbstowcs.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/locale/wctrans.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/findfp.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/uuidgen.2#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_writev.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/create_chunk.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#17 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/libdisk.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/libdisk.h#10 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/write_ia64_disk.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/write_sparc64_disk.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_init.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login_class.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/Makefile#6 integrate .. //depot/projects/trustedbsd/base/libexec/ftpd/ftpd.c#16 integrate .. //depot/projects/trustedbsd/base/libexec/lukemftpd/Makefile#6 integrate .. //depot/projects/trustedbsd/base/libexec/lukemftpd/config.h#2 integrate .. //depot/projects/trustedbsd/base/libexec/mknetid/mknetid.c#3 integrate .. //depot/projects/trustedbsd/base/release/Makefile#31 integrate .. //depot/projects/trustedbsd/base/release/Makefile.inc.docports#6 integrate .. //depot/projects/trustedbsd/base/release/alpha/dokern.sh#7 integrate .. //depot/projects/trustedbsd/base/release/alpha/drivers.conf#9 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/hardware/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#10 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml#4 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/Makefile#5 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#5 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/Makefile#3 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#11 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#1 branch .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#6 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/i386/dokern.sh#13 integrate .. //depot/projects/trustedbsd/base/release/i386/drivers.conf#8 integrate .. //depot/projects/trustedbsd/base/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#10 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/add.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/create.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/destroy.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/gpt.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/migrate.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/recover.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/gpt/show.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#9 integrate .. //depot/projects/trustedbsd/base/share/Makefile#3 integrate .. //depot/projects/trustedbsd/base/share/man/man4/snp.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#16 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/machdep.c#18 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#20 integrate .. //depot/projects/trustedbsd/base/sys/bluetooth/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/common/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/common/ng_bluetooth.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/bt3c/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/bt3c/ng_bt3c.4#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/bt3c/ng_bt3c_firmware.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/h4/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/h4/TODO#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/h4/ng_h4.4#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/h4/ng_h4.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/h4/ng_h4_prse.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/h4/ng_h4_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/ubt/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/ubt/ng_ubt.4#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/ubt/ng_ubt.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/drivers/ubt/ng_ubt_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/TODO#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci.4#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_cmds.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_cmds.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_evnt.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_evnt.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_main.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_misc.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_misc.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_prse.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_ulpi.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_ulpi.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/hci/ng_hci_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_bluetooth.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_bt3c.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_btsocket.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_btsocket_hci_raw.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_btsocket_l2cap.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_h4.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_hci.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_l2cap.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/include/ng_ubt.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/TODO#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap.4#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_cmds.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_cmds.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_evnt.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_evnt.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_llpi.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_llpi.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_main.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_misc.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_misc.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_prse.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_ulpi.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_ulpi.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/l2cap/ng_l2cap_var.h#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/Makefile#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/TODO#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/ng_btsocket.4#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/ng_btsocket.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/ng_btsocket_hci_raw.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/ng_btsocket_l2cap.c#2 delete .. //depot/projects/trustedbsd/base/sys/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/devicename.c#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/libofw.h#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/ofw_devsearch.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/ofw/libofw/ofw_disk.c#5 integrate .. //depot/projects/trustedbsd/base/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/Makefile#10 integrate .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/trustedbsd/base/sys/boot/sparc64/loader/metadata.c#7 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#48 integrate .. //depot/projects/trustedbsd/base/sys/conf/majors#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus_cis.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwdev.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwmem.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/gx/if_gxvar.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/mcd/mcd.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/ppb_msq.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/scd/scd.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/snp/snp.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/sym/sym_defs.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/trustedbsd/base/sys/fs/msdosfs/denode.h#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#24 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#23 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/gpib.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#19 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#27 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#23 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/setjmp.h#3 integrate .. //depot/projects/trustedbsd/base/sys/isa/fd.c#9 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#31 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_witness.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#21 integrate .. //depot/projects/trustedbsd/base/sys/libkern/qsort.c#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/firewire/firewire/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/splash/bmp/splash_bmp.c#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/splash/pcx/splash_pcx.c#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/syscons/dragon/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/syscons/fire/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/syscons/rain/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/syscons/warp/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/net/radix.c#5 integrate .. //depot/projects/trustedbsd/base/sys/net/zlib.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netinet/in_pcb.h#13 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#27 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_syncache.c#15 integrate .. //depot/projects/trustedbsd/base/sys/pc98/i386/machdep.c#24 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ste.c#10 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_tireg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/pci/viapm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/machdep.c#16 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#22 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#20 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_none/mac_none.c#14 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_test/mac_test.c#14 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/pmap.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/gpt.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#21 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#21 integrate .. //depot/projects/trustedbsd/base/sys/sys/snoop.h#4 integrate .. //depot/projects/trustedbsd/base/sys/vm/pmap.h#10 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#11 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_core.c#14 integrate .. //depot/projects/trustedbsd/base/sys/vm/uma_dbg.c#5 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#16 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#17 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#19 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#24 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#14 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#16 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-btowc.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mblen.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbrtowc.c#3 integrate .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbstowcs.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-mbtowc.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wcstombs.c#1 branch .. //depot/projects/trustedbsd/base/tools/regression/lib/libc/locale/test-wctomb.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/Makefile#18 integrate .. //depot/projects/trustedbsd/base/usr.bin/bluetooth/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.bin/bluetooth/btsockstat/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.bin/bluetooth/btsockstat/btsockstat.1#2 delete .. //depot/projects/trustedbsd/base/usr.bin/bluetooth/btsockstat/btsockstat.c#2 delete .. //depot/projects/trustedbsd/base/usr.bin/fetch/fetch.c#11 integrate .. //depot/projects/trustedbsd/base/usr.bin/kenv/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/alpha-fbsd.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/extern.h#3 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/i386-fbsd.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/i386-linux.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/ia64-fbsd.c#1 branch .. //depot/projects/trustedbsd/base/usr.bin/truss/main.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/trustedbsd/base/usr.bin/truss/syscalls.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/whois/whois.1#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/whois/whois.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/yes/yes.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/hccontrol.8#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/hccontrol.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/info.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/link_control.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/link_policy.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/node.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/send_recv.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/status.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hccontrol/util.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hcseriald/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hcseriald/hcseriald.8#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/hcseriald/hcseriald.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2control/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2control/l2cap.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2control/l2control.8#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2control/l2control.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2control/l2control.h#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2ping/Makefile#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2ping/l2ping.8#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/bluetooth/l2ping/l2ping.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/disks.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/label.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/watch/watch.c#7 integrate Differences ... ==== //depot/projects/trustedbsd/base/MAINTAINERS#11 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.50 2002/11/06 14:01:08 jmallett Exp $ +$FreeBSD: src/MAINTAINERS,v 1.52 2002/11/11 16:56:40 mjacob Exp $ subsystem login notes ----------------------------- @@ -44,7 +44,7 @@ pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. isp(4) mjacob Pre-commit review requested. -sa(4) mjacob Pre-commit review requested. +mpt(4) mjacob Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. ==== //depot/projects/trustedbsd/base/bin/echo/echo.c#5 (text+ko) ==== @@ -43,10 +43,9 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.13 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.14 2002/11/13 01:39:02 njl Exp $"); -#include -#include +#include #include /* ARGSUSED */ @@ -64,6 +63,9 @@ nflag = 0; while (argv[0] != NULL) { + size_t len; + + len = strlen(argv[0]); /* * If the next argument is NULL then this is this @@ -71,23 +73,20 @@ * for a trailing \c. */ if (argv[1] == NULL) { - size_t len; - - len = strlen(argv[0]); /* is there room for a '\c' and is there one? */ if (len >= 2 && argv[0][len - 2] == '\\' && argv[0][len - 1] == 'c') { /* chop it and set the no-newline flag. */ - argv[0][len - 2] = '\0'; + len -= 2; nflag = 1; } } - (void)printf("%s", argv[0]); + write(STDOUT_FILENO, argv[0], len); if (*++argv) - putchar(' '); + write(STDOUT_FILENO, " ", 1); } if (!nflag) - putchar('\n'); + write(STDOUT_FILENO, "\n", 1); return 0; } ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,14 @@ +Thu May 23 02:43:41 UTC 2002 lukem + + * released 1.2 beta 2 + + * replace fnmatch(3) if FNM_CASEFOLD isn't available + +Sat Mar 16 01:28:28 UTC 2002 lukem + + * libukem/glob.c: Fix two problems in the KNR->ANSI conversion + noticed by Yuji Yamano + Thu Mar 14 06:02:31 UTC 2002 lukem * released 1.2 beta 1 ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/acconfig.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $Id: acconfig.h,v 1.9 2001/04/28 07:11:06 lukem Exp $ */ +/* $Id: acconfig.h,v 1.10 2002/05/23 02:42:55 lukem Exp $ */ @TOP@ @BOTTOM@ @@ -48,6 +48,9 @@ /* Define if fclose() is declared in */ #undef HAVE_FCLOSE_D +/* Define if FNM_CASEFOLD is declared in */ +#undef HAVE_FNM_CASEFOLD + /* Define if optarg is declared in or */ #undef HAVE_OPTARG_D ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/config.h.in#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ -/* $Id: config.h.in,v 1.15 2001/04/28 07:11:46 lukem Exp $ */ +/* $Id: config.h.in,v 1.16 2002/05/23 02:42:55 lukem Exp $ */ /* Define if the closedir function returns void instead of int. */ @@ -221,6 +221,9 @@ /* Define if fclose() is declared in */ #undef HAVE_FCLOSE_D +/* Define if FNM_CASEFOLD is declared in */ +#undef HAVE_FNM_CASEFOLD + /* Define if optarg is declared in or */ #undef HAVE_OPTARG_D ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/configure#3 (text+ko) ==== @@ -3181,14 +3181,55 @@ + echo $ac_n "checking for FNM_CASEFOLD""... $ac_c" 1>&6 +echo "configure:3186: checking for FNM_CASEFOLD" >&5 +if eval "test \"`echo '$''{'ftp_cv_HAVE_FNM_CASEFOLD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < +int main() { + int X = FNM_CASEFOLD ; +; return 0; } +EOF +if { (eval echo configure:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ftp_cv_HAVE_FNM_CASEFOLD=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ftp_cv_HAVE_FNM_CASEFOLD=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ftp_cv_HAVE_FNM_CASEFOLD" 1>&6 + if test "x$ftp_cv_HAVE_FNM_CASEFOLD" = "xyes"; then + cat >> confdefs.h <<\EOF +#define HAVE_FNM_CASEFOLD 1 +EOF + + else + LIBOBJS="$LIBOBJS fnmatch.o" + : + fi + + + echo $ac_n "checking for optarg declaration""... $ac_c" 1>&6 -echo "configure:3186: checking for optarg declaration" >&5 +echo "configure:3227: checking for optarg declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTARG_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3197,7 +3238,7 @@ char *X = optarg ; ; return 0; } EOF -if { (eval echo configure:3201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_OPTARG_D=yes else @@ -3224,13 +3265,13 @@ echo $ac_n "checking for optind declaration""... $ac_c" 1>&6 -echo "configure:3228: checking for optind declaration" >&5 +echo "configure:3269: checking for optind declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTIND_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3239,7 +3280,7 @@ int X = optind ; ; return 0; } EOF -if { (eval echo configure:3243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_OPTIND_D=yes else @@ -3266,13 +3307,13 @@ echo $ac_n "checking for optreset""... $ac_c" 1>&6 -echo "configure:3270: checking for optreset" >&5 +echo "configure:3311: checking for optreset" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTRESET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3281,7 +3322,7 @@ int X = optreset ; ; return 0; } EOF -if { (eval echo configure:3285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ftp_cv_HAVE_OPTRESET=yes else @@ -3308,13 +3349,13 @@ echo $ac_n "checking for pclose() declaration""... $ac_c" 1>&6 -echo "configure:3312: checking for pclose() declaration" >&5 +echo "configure:3353: checking for pclose() declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_PCLOSE_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3322,7 +3363,7 @@ int (*X)() = pclose ; ; return 0; } EOF -if { (eval echo configure:3326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_PCLOSE_D=yes else @@ -3350,13 +3391,13 @@ if test $ac_cv_func_getusershell = yes; then echo $ac_n "checking for getusershell() declaration""... $ac_c" 1>&6 -echo "configure:3354: checking for getusershell() declaration" >&5 +echo "configure:3395: checking for getusershell() declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_GETUSERSHELL_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3364,7 +3405,7 @@ char *(*X)() = getusershell ; ; return 0; } EOF -if { (eval echo configure:3368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_GETUSERSHELL_D=yes else @@ -3395,13 +3436,13 @@ echo $ac_n "checking *printf() support for %lld""... $ac_c" 1>&6 -echo "configure:3399: checking *printf() support for %lld" >&5 +echo "configure:3440: checking *printf() support for %lld" >&5 can_printf_longlong=no if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < @@ -3412,7 +3453,7 @@ } EOF -if { (eval echo configure:3416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 @@ -3432,12 +3473,12 @@ if test $can_printf_longlong != yes; then echo $ac_n "checking *printf() support for %qd""... $ac_c" 1>&6 -echo "configure:3436: checking *printf() support for %qd" >&5 +echo "configure:3477: checking *printf() support for %qd" >&5 if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < @@ -3448,7 +3489,7 @@ } EOF -if { (eval echo configure:3452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 @@ -3479,12 +3520,12 @@ for ac_func in strtoll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3483: checking for $ac_func" >&5 +echo "configure:3524: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3542,13 +3583,13 @@ if test $ac_cv_func_getaddrinfo = yes -a ! -n "$socks"; then echo $ac_n "checking for AI_NUMERICHOST""... $ac_c" 1>&6 -echo "configure:3546: checking for AI_NUMERICHOST" >&5 +echo "configure:3587: checking for AI_NUMERICHOST" >&5 if eval "test \"`echo '$''{'ftp_cv_have_ai_numerichost'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3558,7 +3599,7 @@ int X = AI_NUMERICHOST ; ; return 0; } EOF -if { (eval echo configure:3562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_have_ai_numerichost=yes else @@ -3581,7 +3622,7 @@ fi echo $ac_n "checking for working getaddrinfo()""... $ac_c" 1>&6 -echo "configure:3585: checking for working getaddrinfo()" >&5 +echo "configure:3626: checking for working getaddrinfo()" >&5 if test $have_rfc2553_netdb = yes; then cat >> confdefs.h <<\EOF #define HAVE_RFC2553_NETDB 1 @@ -3600,13 +3641,13 @@ if test $ac_cv_func_sl_init = yes; then echo $ac_n "checking if sl_add() returns int""... $ac_c" 1>&6 -echo "configure:3604: checking if sl_add() returns int" >&5 +echo "configure:3645: checking if sl_add() returns int" >&5 if eval "test \"`echo '$''{'ftp_cv_INT_SL_ADD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3614,7 +3655,7 @@ int f = sl_add((StringList *)0, "foo") ; ; return 0; } EOF -if { (eval echo configure:3618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_INT_SL_ADD=yes else @@ -3643,12 +3684,12 @@ for ac_func in fts_open strmode user_from_uid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3647: checking for $ac_func" >&5 +echo "configure:3688: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/configure.in#3 (text+ko) ==== @@ -1,10 +1,10 @@ -dnl $Id: configure.in,v 1.17 2001/12/01 02:00:48 lukem Exp $ +dnl $Id: configure.in,v 1.18 2002/05/23 02:42:55 lukem Exp $ dnl dnl configure.in -- dnl process this file with autoconf to produce a configure script. dnl -AC_REVISION($Revision: 1.17 $)dnl +AC_REVISION($Revision: 1.18 $)dnl AC_INIT(lukemftpd.h) @@ -166,6 +166,11 @@ AC_MSG_TRY_COMPILE(for fclose() declaration, ftp_cv_HAVE_FCLOSE_D, [ #include ], [ int (*X)() = fclose ], [AC_DEFINE(HAVE_FCLOSE_D, 1)]) +AC_MSG_TRY_COMPILE(for FNM_CASEFOLD, ftp_cv_HAVE_FNM_CASEFOLD, [ +#include ], [ int X = FNM_CASEFOLD ], +[AC_DEFINE(HAVE_FNM_CASEFOLD, 1)], +[LIBOBJS="$LIBOBJS fnmatch.o"]) + AC_MSG_TRY_COMPILE(for optarg declaration, ftp_cv_HAVE_OPTARG_D, [ #include #include ], [ char *X = optarg ], [AC_DEFINE(HAVE_OPTARG_D, 1)]) ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/lukemftpd.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ -/* $Id: lukemftpd.h,v 1.18 2002/03/14 06:02:24 lukem Exp $ */ +/* $Id: lukemftpd.h,v 1.20 2002/05/23 02:43:58 lukem Exp $ */ -#define FTPD_VERSION "lukemftpd 1.2 beta 1" +#define FTPD_VERSION "lukemftpd 1.2 beta 2" #include "config.h" @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -82,6 +81,12 @@ # include "ftpglob.h" #endif +#if HAVE_FNM_CASEFOLD +# include +#else +# include "ftpfnmatch.h" +#endif + #if HAVE_PATHS_H # include #endif ==== //depot/projects/trustedbsd/base/contrib/lukemftpd/todo#3 (text+ko) ==== @@ -4,7 +4,6 @@ is not available? - IF_NAMESIZE not available on darwin - inet_net_pton() ipv6 support - - FNM_CASEFOLD for fnmatch(3) support lfcompile(5) (large files) on solaris ==== //depot/projects/trustedbsd/base/contrib/one-true-awk/FREEBSD-upgrade#3 (text+ko) ==== @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20020218 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20020101 ==== //depot/projects/trustedbsd/base/etc/defaults/rc.conf#17 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.160 2002/11/02 08:21:25 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.162 2002/11/12 07:10:45 imp Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -26,6 +26,7 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). +devd_enable="NO" # Run devd, to trigger progams on device tree changes. pccard_enable="NO" # Set to YES if you want to configure PCCARD devices. pccard_mem="DEFAULT" # If pccard_enable=YES, this is card memory address. pccard_beep="2" # pccard beep type. ==== //depot/projects/trustedbsd/base/etc/inetd.conf#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.60 2002/10/29 08:41:12 obrien Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.61 2002/11/12 17:31:11 obrien Exp $ # # Internet server configuration database # @@ -6,12 +6,6 @@ # To disable a service, comment it out by prefixing the line with '#'. # To enable a service, remove the '#' at the beginning of the line. # -# WARNING: lukemftpd does not utilize PAM, MAC, per-class nologin files, -# or any login.conf resource limits or features. Use this ftpd only if this -# is appropriate for your environment. If you require these features, use -# the alternate FreeBSD ftpd below. -#ftp stream tcp nowait root /usr/libexec/lukemftpd ftpd -l -r -# #ftp stream tcp nowait root /usr/libexec/ftpd ftpd -l #ftp stream tcp6 nowait root /usr/libexec/ftpd ftpd -l #telnet stream tcp nowait root /usr/libexec/telnetd telnetd ==== //depot/projects/trustedbsd/base/etc/rc.d/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.8 2002/09/06 01:23:31 peter Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.9 2002/11/09 07:45:53 imp Exp $ .include FILES= DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz amd \ apm apmd atm1 atm2.sh atm3.sh archdep bgfsck bootparams ccd cleanvar \ - cleartmp cron devdb devfs diskless dmesg dumpon fsck inetd \ + cleartmp cron devd devdb devfs diskless dmesg dumpon fsck inetd \ initdiskless initrandom ip6fw ipfilter ipfw ipmon ipnat ipsec \ ipxrouted isdnd kadmind kerberos keyserv ldconfig local \ localdaemons lomac lpd motd mountcritlocal mountcritremote \ ==== //depot/projects/trustedbsd/base/etc/rc.subr#8 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.7 2002/11/08 17:06:15 gordon Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.8 2002/11/09 17:34:21 gordon Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -900,8 +900,10 @@ { case ${rc_debug} in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + if [ -x /usr/bin/logger ]; then + logger "$0: INFO: $*" + fi echo 1>&2 "$0: DEBUG: $*" - return ;; esac } ==== //depot/projects/trustedbsd/base/games/fortune/datfiles/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/19/94 -# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.28 2001/12/17 13:59:29 ru Exp $ +# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.29 2002/11/10 23:41:01 dcs Exp $ FILES= fortunes fortunes2 freebsd-tips murphy startrek zippy BLDS= fortunes.dat fortunes2.dat murphy.dat startrek.dat zippy.dat \ @@ -14,8 +14,8 @@ # THREE LINES AND UNCOMMENT THE FOURTH LINE. # THE THREE LINES: -FILES+= fortunes2-o limerick murphy-o -BLDS+= fortunes2-o.dat limerick.dat murphy-o.dat +FILES+= fortunes2-o limerick murphy-o gerrold.limerick +BLDS+= fortunes2-o.dat limerick.dat murphy-o.dat gerrold.limerick.dat TYPE= real # THE FOURTH LINE: @@ -26,7 +26,7 @@ FILESDIR= ${SHAREDIR}/games/fortune -.for f in fortunes fortunes2 fortunes2-o freebsd-tips limerick murphy murphy-o startrek zippy +.for f in fortunes fortunes2 fortunes2-o freebsd-tips gerrold.limerick limerick murphy murphy-o startrek zippy $f.dat: $f PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \ strfile -Crs ${.ALLSRC} ${.TARGET} ==== //depot/projects/trustedbsd/base/games/fortune/datfiles/gerrold.limerick#3 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.3 2002/04/28 21:59:07 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.5 2002/11/10 23:37:25 dcs Exp $ %% From The War Against The Chtorr, %% Copyright David Gerrold, 1984-2000, all rights reserved, %% used with permission of the author. @@ -44,3 +44,780 @@ From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all rights reserved, used with permission of the author. +% +There was a young lady named Susie, +Who everyone thought was a floozy. + She liked boy scout troops + and Shriners, in groups; +"What the hell?" She replied. "I'm not choosy." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A fellow who lived in West Perkin +was always a-jerkin' his gherkin. + Said he, "It's not fickle + to play with my pickle. +At least my gherkin's a workin'." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A proctologist name of McGee +once bent over double to see + an eyeball of glass + he had shoved up his ass, +"-- so I can see one that looks back at me." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Bart has a singular penis +for his wife who is built like a Venus. + He awoke with a fright + last Saturday night: +"Hey! Something is coming between us!" + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A lady who lives in New Delhi +has habits disgusting and smelhi. + She likes to eat feces + of various species. +(The recipe is tattooed or her belhi.) + >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 7: 0:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3460F37B404; Wed, 13 Nov 2002 07:00:06 -0800 (PST) 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 D1BF137B401 for ; Wed, 13 Nov 2002 07:00:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 845EE43E77 for ; Wed, 13 Nov 2002 07:00:04 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADEvbmV031255 for ; Wed, 13 Nov 2002 06:57:37 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADEvYFS031252 for perforce@freebsd.org; Wed, 13 Nov 2002 06:57:34 -0800 (PST) Date: Wed, 13 Nov 2002 06:57:34 -0800 (PST) Message-Id: <200211131457.gADEvYFS031252@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 Subject: PERFORCE change 21031 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21031 Change 21031 by rwatson@rwatson_tislabs on 2002/11/13 06:57:17 Integ the TrustedBSD MAC branch from the recently integ'd TrustedBSD base branch, looping back a pile of main tree changes, as well as some minor MAC cleanup. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#11 integrate .. //depot/projects/trustedbsd/mac/bin/echo/echo.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftpd/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftpd/acconfig.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftpd/config.h.in#2 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftpd/configure#3 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftpd/configure.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftpd/lukemftpd.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/lukemftpd/todo#3 integrate .. //depot/projects/trustedbsd/mac/contrib/one-true-awk/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#19 integrate .. //depot/projects/trustedbsd/mac/etc/inetd.conf#9 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/devd#1 branch .. //depot/projects/trustedbsd/mac/etc/rc.subr#8 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/games/fortune/datfiles/gerrold.limerick#3 integrate .. //depot/projects/trustedbsd/mac/include/unistd.h#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/_setjmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/setjmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/sigsetjmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/btowc.3#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbrlen.3#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbrtowc.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/mbstowcs.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/locale/wctrans.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/findfp.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sys/uuidgen.2#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_writev.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/create_chunk.c#11 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#17 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/libdisk.3#3 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/libdisk.h#10 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/write_ia64_disk.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/write_sparc64_disk.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_init.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_private.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libutil/login_class.c#11 integrate .. //depot/projects/trustedbsd/mac/libexec/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/libexec/ftpd/ftpd.c#16 integrate .. //depot/projects/trustedbsd/mac/libexec/lukemftpd/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/libexec/lukemftpd/config.h#2 integrate .. //depot/projects/trustedbsd/mac/libexec/mknetid/mknetid.c#3 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#35 integrate .. //depot/projects/trustedbsd/mac/release/Makefile.inc.docports#6 integrate .. //depot/projects/trustedbsd/mac/release/alpha/dokern.sh#7 integrate .. //depot/projects/trustedbsd/mac/release/alpha/drivers.conf#9 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/hardware/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#10 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/hardware/ia64/article.sgml#4 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/installation/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/installation/common/trouble.sgml#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/installation/common/upgrade.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/installation/ia64/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#11 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/ia64/Makefile#1 branch .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#1 branch .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/layout.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/trouble.sgml#5 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/installation/common/upgrade.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/fr_FR.ISO8859-1/hardware/common/dev.sgml#6 integrate .. //depot/projects/trustedbsd/mac/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/i386/dokern.sh#13 integrate .. //depot/projects/trustedbsd/mac/release/i386/drivers.conf#8 integrate .. //depot/projects/trustedbsd/mac/release/ia64/mkisoimages.sh#2 integrate .. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#10 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/add.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/create.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/destroy.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/gpt.c#5 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/migrate.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/recover.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/gpt/show.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/sysctl/sysctl.c#9 integrate .. //depot/projects/trustedbsd/mac/share/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/snp.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/rc.conf.5#14 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/machdep.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/bluetooth/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/common/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/common/ng_bluetooth.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/ng_bt3c.4#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/ng_bt3c_firmware.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/TODO#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/ng_h4.4#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/ng_h4.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/ng_h4_prse.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/h4/ng_h4_var.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/ng_ubt.4#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/ng_ubt.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/drivers/ubt/ng_ubt_var.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/TODO#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci.4#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_cmds.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_cmds.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_evnt.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_evnt.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_main.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_misc.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_misc.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_prse.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_ulpi.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_ulpi.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/hci/ng_hci_var.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_bluetooth.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_bt3c.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_btsocket.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_btsocket_hci_raw.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_btsocket_l2cap.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_h4.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_hci.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_l2cap.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/include/ng_ubt.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/TODO#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap.4#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_cmds.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_cmds.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_evnt.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_evnt.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_llpi.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_llpi.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_main.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_misc.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_misc.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_prse.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_ulpi.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_ulpi.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/l2cap/ng_l2cap_var.h#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/Makefile#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/TODO#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket.4#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket_hci_raw.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket_l2cap.c#2 delete .. //depot/projects/trustedbsd/mac/sys/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/ofw/common/main.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ofw/libofw/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ofw/libofw/devicename.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ofw/libofw/libofw.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/ofw/libofw/ofw_devsearch.c#2 delete .. //depot/projects/trustedbsd/mac/sys/boot/ofw/libofw/ofw_disk.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/boot/sparc64/loader/Makefile#10 integrate .. //depot/projects/trustedbsd/mac/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/boot/sparc64/loader/metadata.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/conf/files#70 integrate .. //depot/projects/trustedbsd/mac/sys/conf/majors#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cardbus/cardbus_cis.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwdev.c#1 branch .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwmem.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gx/if_gxvar.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mcd/mcd.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/my/if_my.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/ppb_msq.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/scd/scd.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/snp/snp.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sym/sym_defs.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/fs/msdosfs/denode.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/machdep.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/gpib.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/conf/GENERIC#19 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/machdep.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/include/setjmp.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/isa/fd.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#49 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#359 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_witness.c#25 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#44 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_bio.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/libkern/qsort.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/firewire/firewire/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/splash/bmp/splash_bmp.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/splash/pcx/splash_pcx.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/syscons/dragon/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/syscons/fire/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/sys/modules/syscons/rain/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/syscons/warp/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/net/radix.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/zlib.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/pc98/i386/machdep.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ste.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_tireg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/pci/viapm.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/machdep.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#185 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#148 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#107 integrate .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#83 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/pmap.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/sys/gpt.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#216 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#170 integrate .. //depot/projects/trustedbsd/mac/sys/sys/snoop.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/vm/pmap.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/vm/uma_core.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/vm/uma_dbg.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_fault.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_map.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_page.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#14 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-btowc.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mblen.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbrtowc.c#3 integrate .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbstowcs.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-mbtowc.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wcstombs.c#1 branch .. //depot/projects/trustedbsd/mac/tools/regression/lib/libc/locale/test-wctomb.c#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/Makefile#16 integrate .. //depot/projects/trustedbsd/mac/usr.bin/bluetooth/Makefile#2 delete .. //depot/projects/trustedbsd/mac/usr.bin/bluetooth/btsockstat/Makefile#2 delete .. //depot/projects/trustedbsd/mac/usr.bin/bluetooth/btsockstat/btsockstat.1#2 delete .. //depot/projects/trustedbsd/mac/usr.bin/bluetooth/btsockstat/btsockstat.c#2 delete .. //depot/projects/trustedbsd/mac/usr.bin/fetch/fetch.c#10 integrate .. //depot/projects/trustedbsd/mac/usr.bin/kenv/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/alpha-fbsd.c#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/extern.h#3 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/i386-fbsd.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/i386-linux.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/ia64-fbsd.c#1 branch .. //depot/projects/trustedbsd/mac/usr.bin/truss/main.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/trustedbsd/mac/usr.bin/truss/syscalls.c#7 integrate .. //depot/projects/trustedbsd/mac/usr.bin/whois/whois.1#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/whois/whois.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/yes/yes.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/Makefile#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/Makefile#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/hccontrol.8#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/hccontrol.c#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/info.c#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/link_control.c#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/link_policy.c#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/node.c#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/send_recv.c#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/status.c#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hccontrol/util.c#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/Makefile#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/hcseriald.8#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/hcseriald/hcseriald.c#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/Makefile#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/l2cap.c#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/l2control.8#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/l2control.c#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2control/l2control.h#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2ping/Makefile#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2ping/l2ping.8#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/bluetooth/l2ping/l2ping.c#2 delete .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/disks.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/label.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/watch/watch.c#6 integrate Differences ... ==== //depot/projects/trustedbsd/mac/MAINTAINERS#11 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.50 2002/11/06 14:01:08 jmallett Exp $ +$FreeBSD: src/MAINTAINERS,v 1.52 2002/11/11 16:56:40 mjacob Exp $ subsystem login notes ----------------------------- @@ -44,7 +44,7 @@ pass(4) ken Pre-commit review requested. ch(4) ken Pre-commit review requested. isp(4) mjacob Pre-commit review requested. -sa(4) mjacob Pre-commit review requested. +mpt(4) mjacob Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. ==== //depot/projects/trustedbsd/mac/bin/echo/echo.c#5 (text+ko) ==== @@ -43,10 +43,9 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.13 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.14 2002/11/13 01:39:02 njl Exp $"); -#include -#include +#include #include /* ARGSUSED */ @@ -64,6 +63,9 @@ nflag = 0; while (argv[0] != NULL) { + size_t len; + + len = strlen(argv[0]); /* * If the next argument is NULL then this is this @@ -71,23 +73,20 @@ * for a trailing \c. */ if (argv[1] == NULL) { - size_t len; - - len = strlen(argv[0]); /* is there room for a '\c' and is there one? */ if (len >= 2 && argv[0][len - 2] == '\\' && argv[0][len - 1] == 'c') { /* chop it and set the no-newline flag. */ - argv[0][len - 2] = '\0'; + len -= 2; nflag = 1; } } - (void)printf("%s", argv[0]); + write(STDOUT_FILENO, argv[0], len); if (*++argv) - putchar(' '); + write(STDOUT_FILENO, " ", 1); } if (!nflag) - putchar('\n'); + write(STDOUT_FILENO, "\n", 1); return 0; } ==== //depot/projects/trustedbsd/mac/contrib/lukemftpd/ChangeLog#3 (text+ko) ==== @@ -1,3 +1,14 @@ +Thu May 23 02:43:41 UTC 2002 lukem + + * released 1.2 beta 2 + + * replace fnmatch(3) if FNM_CASEFOLD isn't available + +Sat Mar 16 01:28:28 UTC 2002 lukem + + * libukem/glob.c: Fix two problems in the KNR->ANSI conversion + noticed by Yuji Yamano + Thu Mar 14 06:02:31 UTC 2002 lukem * released 1.2 beta 1 ==== //depot/projects/trustedbsd/mac/contrib/lukemftpd/acconfig.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $Id: acconfig.h,v 1.9 2001/04/28 07:11:06 lukem Exp $ */ +/* $Id: acconfig.h,v 1.10 2002/05/23 02:42:55 lukem Exp $ */ @TOP@ @BOTTOM@ @@ -48,6 +48,9 @@ /* Define if fclose() is declared in */ #undef HAVE_FCLOSE_D +/* Define if FNM_CASEFOLD is declared in */ +#undef HAVE_FNM_CASEFOLD + /* Define if optarg is declared in or */ #undef HAVE_OPTARG_D ==== //depot/projects/trustedbsd/mac/contrib/lukemftpd/config.h.in#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ -/* $Id: config.h.in,v 1.15 2001/04/28 07:11:46 lukem Exp $ */ +/* $Id: config.h.in,v 1.16 2002/05/23 02:42:55 lukem Exp $ */ /* Define if the closedir function returns void instead of int. */ @@ -221,6 +221,9 @@ /* Define if fclose() is declared in */ #undef HAVE_FCLOSE_D +/* Define if FNM_CASEFOLD is declared in */ +#undef HAVE_FNM_CASEFOLD + /* Define if optarg is declared in or */ #undef HAVE_OPTARG_D ==== //depot/projects/trustedbsd/mac/contrib/lukemftpd/configure#3 (text+ko) ==== @@ -3181,14 +3181,55 @@ + echo $ac_n "checking for FNM_CASEFOLD""... $ac_c" 1>&6 +echo "configure:3186: checking for FNM_CASEFOLD" >&5 +if eval "test \"`echo '$''{'ftp_cv_HAVE_FNM_CASEFOLD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < +int main() { + int X = FNM_CASEFOLD ; +; return 0; } +EOF +if { (eval echo configure:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ftp_cv_HAVE_FNM_CASEFOLD=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ftp_cv_HAVE_FNM_CASEFOLD=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ftp_cv_HAVE_FNM_CASEFOLD" 1>&6 + if test "x$ftp_cv_HAVE_FNM_CASEFOLD" = "xyes"; then + cat >> confdefs.h <<\EOF +#define HAVE_FNM_CASEFOLD 1 +EOF + + else + LIBOBJS="$LIBOBJS fnmatch.o" + : + fi + + + echo $ac_n "checking for optarg declaration""... $ac_c" 1>&6 -echo "configure:3186: checking for optarg declaration" >&5 +echo "configure:3227: checking for optarg declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTARG_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3197,7 +3238,7 @@ char *X = optarg ; ; return 0; } EOF -if { (eval echo configure:3201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_OPTARG_D=yes else @@ -3224,13 +3265,13 @@ echo $ac_n "checking for optind declaration""... $ac_c" 1>&6 -echo "configure:3228: checking for optind declaration" >&5 +echo "configure:3269: checking for optind declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTIND_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3239,7 +3280,7 @@ int X = optind ; ; return 0; } EOF -if { (eval echo configure:3243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_OPTIND_D=yes else @@ -3266,13 +3307,13 @@ echo $ac_n "checking for optreset""... $ac_c" 1>&6 -echo "configure:3270: checking for optreset" >&5 +echo "configure:3311: checking for optreset" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTRESET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3281,7 +3322,7 @@ int X = optreset ; ; return 0; } EOF -if { (eval echo configure:3285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ftp_cv_HAVE_OPTRESET=yes else @@ -3308,13 +3349,13 @@ echo $ac_n "checking for pclose() declaration""... $ac_c" 1>&6 -echo "configure:3312: checking for pclose() declaration" >&5 +echo "configure:3353: checking for pclose() declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_PCLOSE_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3322,7 +3363,7 @@ int (*X)() = pclose ; ; return 0; } EOF -if { (eval echo configure:3326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_PCLOSE_D=yes else @@ -3350,13 +3391,13 @@ if test $ac_cv_func_getusershell = yes; then echo $ac_n "checking for getusershell() declaration""... $ac_c" 1>&6 -echo "configure:3354: checking for getusershell() declaration" >&5 +echo "configure:3395: checking for getusershell() declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_GETUSERSHELL_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3364,7 +3405,7 @@ char *(*X)() = getusershell ; ; return 0; } EOF -if { (eval echo configure:3368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_GETUSERSHELL_D=yes else @@ -3395,13 +3436,13 @@ echo $ac_n "checking *printf() support for %lld""... $ac_c" 1>&6 -echo "configure:3399: checking *printf() support for %lld" >&5 +echo "configure:3440: checking *printf() support for %lld" >&5 can_printf_longlong=no if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < @@ -3412,7 +3453,7 @@ } EOF -if { (eval echo configure:3416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 @@ -3432,12 +3473,12 @@ if test $can_printf_longlong != yes; then echo $ac_n "checking *printf() support for %qd""... $ac_c" 1>&6 -echo "configure:3436: checking *printf() support for %qd" >&5 +echo "configure:3477: checking *printf() support for %qd" >&5 if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < @@ -3448,7 +3489,7 @@ } EOF -if { (eval echo configure:3452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 @@ -3479,12 +3520,12 @@ for ac_func in strtoll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3483: checking for $ac_func" >&5 +echo "configure:3524: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3542,13 +3583,13 @@ if test $ac_cv_func_getaddrinfo = yes -a ! -n "$socks"; then echo $ac_n "checking for AI_NUMERICHOST""... $ac_c" 1>&6 -echo "configure:3546: checking for AI_NUMERICHOST" >&5 +echo "configure:3587: checking for AI_NUMERICHOST" >&5 if eval "test \"`echo '$''{'ftp_cv_have_ai_numerichost'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3558,7 +3599,7 @@ int X = AI_NUMERICHOST ; ; return 0; } EOF -if { (eval echo configure:3562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_have_ai_numerichost=yes else @@ -3581,7 +3622,7 @@ fi echo $ac_n "checking for working getaddrinfo()""... $ac_c" 1>&6 -echo "configure:3585: checking for working getaddrinfo()" >&5 +echo "configure:3626: checking for working getaddrinfo()" >&5 if test $have_rfc2553_netdb = yes; then cat >> confdefs.h <<\EOF #define HAVE_RFC2553_NETDB 1 @@ -3600,13 +3641,13 @@ if test $ac_cv_func_sl_init = yes; then echo $ac_n "checking if sl_add() returns int""... $ac_c" 1>&6 -echo "configure:3604: checking if sl_add() returns int" >&5 +echo "configure:3645: checking if sl_add() returns int" >&5 if eval "test \"`echo '$''{'ftp_cv_INT_SL_ADD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3614,7 +3655,7 @@ int f = sl_add((StringList *)0, "foo") ; ; return 0; } EOF -if { (eval echo configure:3618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_INT_SL_ADD=yes else @@ -3643,12 +3684,12 @@ for ac_func in fts_open strmode user_from_uid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3647: checking for $ac_func" >&5 +echo "configure:3688: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ==== //depot/projects/trustedbsd/mac/contrib/lukemftpd/configure.in#3 (text+ko) ==== @@ -1,10 +1,10 @@ -dnl $Id: configure.in,v 1.17 2001/12/01 02:00:48 lukem Exp $ +dnl $Id: configure.in,v 1.18 2002/05/23 02:42:55 lukem Exp $ dnl dnl configure.in -- dnl process this file with autoconf to produce a configure script. dnl -AC_REVISION($Revision: 1.17 $)dnl +AC_REVISION($Revision: 1.18 $)dnl AC_INIT(lukemftpd.h) @@ -166,6 +166,11 @@ AC_MSG_TRY_COMPILE(for fclose() declaration, ftp_cv_HAVE_FCLOSE_D, [ #include ], [ int (*X)() = fclose ], [AC_DEFINE(HAVE_FCLOSE_D, 1)]) +AC_MSG_TRY_COMPILE(for FNM_CASEFOLD, ftp_cv_HAVE_FNM_CASEFOLD, [ +#include ], [ int X = FNM_CASEFOLD ], +[AC_DEFINE(HAVE_FNM_CASEFOLD, 1)], +[LIBOBJS="$LIBOBJS fnmatch.o"]) + AC_MSG_TRY_COMPILE(for optarg declaration, ftp_cv_HAVE_OPTARG_D, [ #include #include ], [ char *X = optarg ], [AC_DEFINE(HAVE_OPTARG_D, 1)]) ==== //depot/projects/trustedbsd/mac/contrib/lukemftpd/lukemftpd.h#3 (text+ko) ==== @@ -1,6 +1,6 @@ -/* $Id: lukemftpd.h,v 1.18 2002/03/14 06:02:24 lukem Exp $ */ +/* $Id: lukemftpd.h,v 1.20 2002/05/23 02:43:58 lukem Exp $ */ -#define FTPD_VERSION "lukemftpd 1.2 beta 1" +#define FTPD_VERSION "lukemftpd 1.2 beta 2" #include "config.h" @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -82,6 +81,12 @@ # include "ftpglob.h" #endif +#if HAVE_FNM_CASEFOLD +# include +#else +# include "ftpfnmatch.h" +#endif + #if HAVE_PATHS_H # include #endif ==== //depot/projects/trustedbsd/mac/contrib/lukemftpd/todo#3 (text+ko) ==== @@ -4,7 +4,6 @@ is not available? - IF_NAMESIZE not available on darwin - inet_net_pton() ipv6 support - - FNM_CASEFOLD for fnmatch(3) support lfcompile(5) (large files) on solaris ==== //depot/projects/trustedbsd/mac/contrib/one-true-awk/FREEBSD-upgrade#3 (text+ko) ==== @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20020218 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20020101 ==== //depot/projects/trustedbsd/mac/etc/defaults/rc.conf#19 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.160 2002/11/02 08:21:25 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.162 2002/11/12 07:10:45 imp Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -26,6 +26,7 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). +devd_enable="NO" # Run devd, to trigger progams on device tree changes. pccard_enable="NO" # Set to YES if you want to configure PCCARD devices. pccard_mem="DEFAULT" # If pccard_enable=YES, this is card memory address. pccard_beep="2" # pccard beep type. ==== //depot/projects/trustedbsd/mac/etc/inetd.conf#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.60 2002/10/29 08:41:12 obrien Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.61 2002/11/12 17:31:11 obrien Exp $ # # Internet server configuration database # @@ -6,12 +6,6 @@ # To disable a service, comment it out by prefixing the line with '#'. # To enable a service, remove the '#' at the beginning of the line. # -# WARNING: lukemftpd does not utilize PAM, MAC, per-class nologin files, -# or any login.conf resource limits or features. Use this ftpd only if this -# is appropriate for your environment. If you require these features, use -# the alternate FreeBSD ftpd below. -#ftp stream tcp nowait root /usr/libexec/lukemftpd ftpd -l -r -# #ftp stream tcp nowait root /usr/libexec/ftpd ftpd -l #ftp stream tcp6 nowait root /usr/libexec/ftpd ftpd -l #telnet stream tcp nowait root /usr/libexec/telnetd telnetd ==== //depot/projects/trustedbsd/mac/etc/rc.d/Makefile#5 (text+ko) ==== @@ -1,11 +1,11 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.8 2002/09/06 01:23:31 peter Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.9 2002/11/09 07:45:53 imp Exp $ .include FILES= DAEMON LOGIN NETWORKING SERVERS abi accounting addswap adjkerntz amd \ apm apmd atm1 atm2.sh atm3.sh archdep bgfsck bootparams ccd cleanvar \ - cleartmp cron devdb devfs diskless dmesg dumpon fsck inetd \ + cleartmp cron devd devdb devfs diskless dmesg dumpon fsck inetd \ initdiskless initrandom ip6fw ipfilter ipfw ipmon ipnat ipsec \ ipxrouted isdnd kadmind kerberos keyserv ldconfig local \ localdaemons lomac lpd motd mountcritlocal mountcritremote \ ==== //depot/projects/trustedbsd/mac/etc/rc.subr#8 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.7 2002/11/08 17:06:15 gordon Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.8 2002/11/09 17:34:21 gordon Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -900,8 +900,10 @@ { case ${rc_debug} in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) + if [ -x /usr/bin/logger ]; then + logger "$0: INFO: $*" + fi echo 1>&2 "$0: DEBUG: $*" - return ;; esac } ==== //depot/projects/trustedbsd/mac/games/fortune/datfiles/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/19/94 -# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.28 2001/12/17 13:59:29 ru Exp $ +# $FreeBSD: src/games/fortune/datfiles/Makefile,v 1.29 2002/11/10 23:41:01 dcs Exp $ FILES= fortunes fortunes2 freebsd-tips murphy startrek zippy BLDS= fortunes.dat fortunes2.dat murphy.dat startrek.dat zippy.dat \ @@ -14,8 +14,8 @@ # THREE LINES AND UNCOMMENT THE FOURTH LINE. # THE THREE LINES: -FILES+= fortunes2-o limerick murphy-o -BLDS+= fortunes2-o.dat limerick.dat murphy-o.dat +FILES+= fortunes2-o limerick murphy-o gerrold.limerick +BLDS+= fortunes2-o.dat limerick.dat murphy-o.dat gerrold.limerick.dat TYPE= real # THE FOURTH LINE: @@ -26,7 +26,7 @@ FILESDIR= ${SHAREDIR}/games/fortune -.for f in fortunes fortunes2 fortunes2-o freebsd-tips limerick murphy murphy-o startrek zippy +.for f in fortunes fortunes2 fortunes2-o freebsd-tips gerrold.limerick limerick murphy murphy-o startrek zippy $f.dat: $f PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \ strfile -Crs ${.ALLSRC} ${.TARGET} ==== //depot/projects/trustedbsd/mac/games/fortune/datfiles/gerrold.limerick#3 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.3 2002/04/28 21:59:07 dougb Exp $ +%% $FreeBSD: src/games/fortune/datfiles/gerrold.limerick,v 1.5 2002/11/10 23:37:25 dcs Exp $ %% From The War Against The Chtorr, %% Copyright David Gerrold, 1984-2000, all rights reserved, %% used with permission of the author. @@ -44,3 +44,780 @@ From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all rights reserved, used with permission of the author. +% +There was a young lady named Susie, +Who everyone thought was a floozy. + She liked boy scout troops + and Shriners, in groups; +"What the hell?" She replied. "I'm not choosy." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A fellow who lived in West Perkin +was always a-jerkin' his gherkin. + Said he, "It's not fickle + to play with my pickle. +At least my gherkin's a workin'." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A proctologist name of McGee +once bent over double to see + an eyeball of glass + he had shoved up his ass, +"-- so I can see one that looks back at me." + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +Bart has a singular penis +for his wife who is built like a Venus. + He awoke with a fright + last Saturday night: +"Hey! Something is coming between us!" + +From The War Against The Chtorr, (c) David Gerrold, 1984-2000, all +rights reserved, used with permission of the author. +% +A lady who lives in New Delhi +has habits disgusting and smelhi. + She likes to eat feces + of various species. +(The recipe is tattooed or her belhi.) + >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 8:41:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3507337B404; Wed, 13 Nov 2002 08:41:13 -0800 (PST) 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 CB24537B401 for ; Wed, 13 Nov 2002 08:41:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8581643E7B for ; Wed, 13 Nov 2002 08:41:12 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADGcjmV042907 for ; Wed, 13 Nov 2002 08:38:45 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADGciVD042901 for perforce@freebsd.org; Wed, 13 Nov 2002 08:38:44 -0800 (PST) Date: Wed, 13 Nov 2002 08:38:44 -0800 (PST) Message-Id: <200211131638.gADGciVD042901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21034 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21034 Change 21034 by green@green_laptop_2 on 2002/11/13 08:38:20 Okay, I really hate this code, fts(3), etc. I'm SURE it works now. Net changes are a single extra comparison and correct printing of pathname in errors. Affected files ... .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#22 edit Differences ... ==== //depot/projects/trustedbsd/mac/bin/ls/ls.c#22 (text+ko) ==== @@ -448,7 +448,8 @@ * If not recursing down this tree and don't need stat info, just get * the names. */ - ch_options = !f_recursive && options & FTS_NOSTAT ? FTS_NAMEONLY : 0; + ch_options = !f_recursive && !f_label && + options & FTS_NOSTAT ? FTS_NAMEONLY : 0; while ((p = fts_read(ftsp)) != NULL) switch (p->fts_info) { @@ -697,9 +698,9 @@ goto label_out; } - if (cur->fts_parent == NULL) + if (cur->fts_level == FTS_ROOTLEVEL) snprintf(name, sizeof(name), - "%s", p->fts_name); + "%s", cur->fts_name); else snprintf(name, sizeof(name), "%s/%s", cur->fts_parent-> To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 10:25:54 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 702C537B404; Wed, 13 Nov 2002 10:25:30 -0800 (PST) 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 0427637B401 for ; Wed, 13 Nov 2002 10:25:30 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13E4B43E3B for ; Wed, 13 Nov 2002 10:25:29 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADIN1mV052842 for ; Wed, 13 Nov 2002 10:23:01 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADIN0PM052839 for perforce@freebsd.org; Wed, 13 Nov 2002 10:23:00 -0800 (PST) Date: Wed, 13 Nov 2002 10:23:00 -0800 (PST) Message-Id: <200211131823.gADIN0PM052839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21038 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21038 Change 21038 by jhb@jhb_laptop on 2002/11/13 10:22:11 IFC @21020. I had to use p4 integ w/o @xxxx because bluetooth wasn't getting deleted otherwise. Affected files ... .. //depot/projects/smpng/sys/bluetooth/Makefile#2 delete .. //depot/projects/smpng/sys/bluetooth/common/Makefile#2 delete .. //depot/projects/smpng/sys/bluetooth/common/ng_bluetooth.c#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/Makefile#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/Makefile#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/ng_bt3c.4#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/ng_bt3c_firmware.h#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/h4/Makefile#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/h4/TODO#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/h4/ng_h4.4#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/h4/ng_h4.c#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/h4/ng_h4_prse.h#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/h4/ng_h4_var.h#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/Makefile#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/ng_ubt.4#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/ng_ubt.c#2 delete .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/ng_ubt_var.h#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/Makefile#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/TODO#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci.4#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_cmds.c#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_cmds.h#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_evnt.c#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_evnt.h#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_main.c#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_misc.c#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_misc.h#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_prse.h#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_ulpi.c#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_ulpi.h#2 delete .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_var.h#2 delete .. //depot/projects/smpng/sys/bluetooth/include/ng_bluetooth.h#2 delete .. //depot/projects/smpng/sys/bluetooth/include/ng_bt3c.h#2 delete .. //depot/projects/smpng/sys/bluetooth/include/ng_btsocket.h#2 delete .. //depot/projects/smpng/sys/bluetooth/include/ng_btsocket_hci_raw.h#2 delete .. //depot/projects/smpng/sys/bluetooth/include/ng_btsocket_l2cap.h#2 delete .. //depot/projects/smpng/sys/bluetooth/include/ng_h4.h#2 delete .. //depot/projects/smpng/sys/bluetooth/include/ng_hci.h#2 delete .. //depot/projects/smpng/sys/bluetooth/include/ng_l2cap.h#2 delete .. //depot/projects/smpng/sys/bluetooth/include/ng_ubt.h#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/Makefile#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/TODO#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap.4#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_cmds.c#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_cmds.h#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_evnt.c#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_evnt.h#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_llpi.c#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_llpi.h#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_main.c#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_misc.c#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_misc.h#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_prse.h#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_ulpi.c#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_ulpi.h#2 delete .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_var.h#2 delete .. //depot/projects/smpng/sys/bluetooth/socket/Makefile#2 delete .. //depot/projects/smpng/sys/bluetooth/socket/TODO#2 delete .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket.4#2 delete .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket.c#2 delete .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket_hci_raw.c#2 delete .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket_l2cap.c#2 delete .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 delete .. //depot/projects/smpng/sys/conf/files#56 integrate .. //depot/projects/smpng/sys/conf/majors#18 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#9 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#1 branch .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.h#2 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#9 integrate .. //depot/projects/smpng/sys/modules/firewire/firewire/Makefile#3 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#16 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#9 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#9 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#6 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#6 integrate .. //depot/projects/smpng/sys/sys/mac.h#8 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#8 integrate Differences ... ==== //depot/projects/smpng/sys/conf/files#56 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.733 2002/11/08 22:33:14 jhb Exp $ +# $FreeBSD: src/sys/conf/files,v 1.734 2002/11/12 15:22:18 simokawa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -385,6 +385,7 @@ dev/firewire/fwohci.c optional firewire dev/firewire/fwohci_pci.c optional firewire pci dev/firewire/fwmem.c optional firewire +dev/firewire/fwdev.c optional firewire dev/firewire/if_fwe.c optional fwe dev/firewire/sbp.c optional sbp dev/fxp/if_fxp.c optional fxp ==== //depot/projects/smpng/sys/conf/majors#18 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/conf/majors,v 1.148 2002/11/06 02:19:28 rwatson Exp $ +$FreeBSD: src/sys/conf/majors,v 1.150 2002/11/13 01:42:59 peter Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. @@ -63,6 +63,7 @@ 43 vn vnode "disk" device (retired) 44 gp GPIB 45 scd Sony CDROM interface +46 - - 47 gsc Genius Scanner 48 cy Cyclades 49 ?? was ssc @@ -117,6 +118,7 @@ 98 loe Loopback pseudo-ethernet (sbabkin@dcn.att.com) 99 ct Cronyx/Tau serial adaptor 100 xrpu Xilinx Reprogrammable Processing Unit +101 was:dgm was: Digiboard PC/Xem in <= RELENG_4 102 fla M-Systems DiskOnChip(r) 103 streams SVR4 Streams emulation 104 xpt CAM Transport Layer Services @@ -184,8 +186,9 @@ 166 ciss Compaq SmartArray 5* adapter 167 ufm USB Fm Radio 168 sab Siemens SAB82532 serial chip +168 XXX used by pst in RELENG_4 169 ofwd OpenFirmware disk -170 pst Promise SuperTrak +170 pst Promise SuperTrak (uses 168 in RELENG_4) 171 mide LSI MegaRAID IDE (control device) 172 mided LSI MegaRAID IDE (disk device) 173 devctl Devd control device @@ -200,5 +203,6 @@ 182 mdsio RS-485 driver for 8250-family UARTs 200 ?? entries from 200-252 are reserved for local use 252 ?? entries from 200-252 are reserved for local use +253 was:MFS was: used by MFS in <= RELENG_4 254 internal Used internally by the kernel 255 bad choice -1 is 255 which has magic meanings internally ==== //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ * * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#113 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.4 2002/09/26 22:53:59 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.5 2002/11/12 10:22:49 scottl Exp $ */ #ifdef __linux__ @@ -181,8 +181,8 @@ struct scb *scb); #endif -static bus_size_t ahd_sglist_size(struct ahd_softc *ahd); -static bus_size_t ahd_sglist_allocsize(struct ahd_softc *ahd); +static u_int ahd_sglist_size(struct ahd_softc *ahd); +static u_int ahd_sglist_allocsize(struct ahd_softc *ahd); static bus_dmamap_callback_t ahd_dmamap_cb; static void ahd_initialize_hscbs(struct ahd_softc *ahd); @@ -4096,7 +4096,7 @@ } #endif /**************************** Initialization **********************************/ -static bus_size_t +static u_int ahd_sglist_size(struct ahd_softc *ahd) { bus_size_t list_size; @@ -4113,7 +4113,7 @@ * OS will allocate full pages to us, so it doesn't make sense to request * less than a page. */ -static bus_size_t +static u_int ahd_sglist_allocsize(struct ahd_softc *ahd) { bus_size_t sg_list_increment; @@ -4203,9 +4203,9 @@ } #ifdef AHD_DEBUG if ((ahd_debug & AHD_SHOW_MEMORY) != 0) { - printf("%s: scb size = 0x%x, hscb size - 0x%x\n", - ahd_name(ahd), sizeof(struct scb), - sizeof(struct hardware_scb)); + printf("%s: scb size = 0x%x, hscb size = 0x%x\n", + ahd_name(ahd), (u_int)sizeof(struct scb), + (u_int)sizeof(struct hardware_scb)); } #endif return (ahd); ==== //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.22 2002/11/06 20:40:29 jhb Exp $ + * $FreeBSD: src/sys/dev/cardbus/cardbus_cis.c,v 1.24 2002/11/12 09:45:59 scottl Exp $ */ /* @@ -265,51 +265,48 @@ DECODE_PROTOTYPE(bar) { + struct cardbus_devinfo *dinfo = device_get_ivars(child); + int type; + int reg; + u_int32_t bar; + if (len != 6) { printf("*** ERROR *** BAR length not 6 (%d)\n", len); return (EINVAL); + } + reg = *(u_int16_t*)tupledata; + len = *(u_int32_t*)(tupledata + 2); + if (reg & TPL_BAR_REG_AS) { + type = SYS_RES_IOPORT; } else { - struct cardbus_devinfo *dinfo = device_get_ivars(child); - int type; - int reg; - u_int32_t bar; + type = SYS_RES_MEMORY; + } + bar = (reg & TPL_BAR_REG_ASI_MASK) - 1; + if (bar < 0 || bar > 5 || + (type == SYS_RES_IOPORT && bar == 5)) { + device_printf(cbdev, "Invalid BAR number: %02x(%02x)\n", + reg, bar); + return (0); + } + bar = CARDBUS_BASE0_REG + bar * 4; + if (type == SYS_RES_MEMORY) { + if (bar & TPL_BAR_REG_PREFETCHABLE) + dinfo->mprefetchable |= BARBIT(bar); + if (bar & TPL_BAR_REG_BELOW1MB) + dinfo->mbelow1mb |= BARBIT(bar); + } else if (type == SYS_RES_IOPORT) { + if (bar & TPL_BAR_REG_BELOW1MB) + dinfo->ibelow1mb |= BARBIT(bar); + } + DEVPRINTF((cbdev, "Opening BAR: type=%s, bar=%02x, len=%04x%s%s\n", + (type == SYS_RES_MEMORY) ? "MEM" : "IO", bar, len, + (type == SYS_RES_MEMORY && dinfo->mprefetchable & BARBIT(bar)) ? + " (Prefetchable)" : "", type == SYS_RES_MEMORY ? + ((dinfo->mbelow1mb & BARBIT(bar)) ? " (Below 1Mb)" : "") : + (dinfo->ibelow1mb & BARBIT(bar)) ? " (Below 1Mb)" : "" )); - reg = *(u_int16_t*)tupledata; - len = *(u_int32_t*)(tupledata + 2); - if (reg & TPL_BAR_REG_AS) { - type = SYS_RES_IOPORT; - } else { - type = SYS_RES_MEMORY; - } - bar = (reg & TPL_BAR_REG_ASI_MASK) - 1; - if (bar < 0 || bar > 5 || - (type == SYS_RES_IOPORT && bar == 5)) { - device_printf(cbdev, "Invalid BAR number: %02x(%02x)\n", - reg, bar); - return (0); - } - bar = CARDBUS_BASE0_REG + bar * 4; - if (type == SYS_RES_MEMORY) { - if (bar & TPL_BAR_REG_PREFETCHABLE) - dinfo->mprefetchable |= BARBIT(bar); - if (bar & TPL_BAR_REG_BELOW1MB) - dinfo->mbelow1mb |= BARBIT(bar); - } else if (type == SYS_RES_IOPORT) { - if (bar & TPL_BAR_REG_BELOW1MB) - dinfo->ibelow1mb |= BARBIT(bar); - } - DEVPRINTF((cbdev, "Opening BAR: type=%s, bar=%02x, " - "len=%04x%s%s\n", - (type==SYS_RES_MEMORY)?"MEM":"IO", bar, len, - (type==SYS_RES_MEMORY&&dinfo->mprefetchable&BARBIT(bar))? - " (Prefetchable)":"", - type==SYS_RES_MEMORY? - ((dinfo->mbelow1mb&BARBIT(bar))?" (Below 1Mb)":"") - :(dinfo->ibelow1mb&BARBIT(bar))?" (Below 1Mb)":"" - )); + resource_list_add(&dinfo->pci.resources, type, bar, 0UL, ~0UL, len); - resource_list_add(&dinfo->pci.resources, type, bar, 0UL, ~0UL, len); - } return (0); } @@ -412,7 +409,7 @@ switch (CARDBUS_CIS_SPACE(*start)) { case CARDBUS_CIS_ASI_TUPLE: - /* CIS in tuple space need no initialization */ + /* CIS in PCI config space need no initialization */ return ((struct resource*)~0UL); case CARDBUS_CIS_ASI_BAR0: case CARDBUS_CIS_ASI_BAR1: @@ -421,11 +418,16 @@ case CARDBUS_CIS_ASI_BAR4: case CARDBUS_CIS_ASI_BAR5: *rid = CARDBUS_BASE0_REG + (CARDBUS_CIS_SPACE(*start) - 1) * 4; - pci_write_config(child, *rid, 0xffffffff, 4); break; case CARDBUS_CIS_ASI_ROM: *rid = CARDBUS_ROM_REG; +#if 0 + /* + * This mask doesn't contain the bit that actually enables + * the Option ROM. + */ pci_write_config(child, *rid, CARDBUS_ROM_ADDRMASK, 4); +#endif break; default: device_printf(cbdev, "Unable to read CIS: Unknown space: %d\n", @@ -434,12 +436,20 @@ } /* figure out how much space we need */ + pci_write_config(child, *rid, 0xffffffff, 4); testval = pci_read_config(child, *rid, 4); - if (testval & 1) { + + /* + * This bit has a different meaning depending if we are dealing + * with a normal BAR or an Option ROM BAR. + */ + if (((testval & 0x1) == 0x1) && (*rid != CARDBUS_ROM_REG)) { device_printf(cbdev, "CIS Space is IO, expecting memory.\n"); return (NULL); } + size = CARDBUS_MAPREG_MEM_SIZE(testval); + /* XXX Is this some kind of hack? */ if (size < 4096) size = 4096; /* allocate the memory space to read CIS */ @@ -460,57 +470,73 @@ if (CARDBUS_CIS_SPACE(*start) == CARDBUS_CIS_ASI_ROM) { bus_space_tag_t bt; bus_space_handle_t bh; - int imagenum; u_int32_t imagesize; - int mystart = 0; + u_int32_t imagebase = 0; + u_int32_t pcidata; + u_int16_t romsig; int romnum = 0; - int dataptr; + int imagenum; bt = rman_get_bustag(res); bh = rman_get_bushandle(res); imagenum = CARDBUS_CIS_ASI_ROM_IMAGE(*start); for (romnum = 0;; romnum++) { - if (bus_space_read_2(bt, bh, - mystart+CARDBUS_EXROM_SIGNATURE) != 0xaa55) { + romsig = bus_space_read_2(bt, bh, + imagebase + CARDBUS_EXROM_SIGNATURE); + if (romsig != 0xaa55) { device_printf(cbdev, "Bad header in rom %d: " - "[%x] %04x\n", romnum, mystart + - CARDBUS_EXROM_SIGNATURE, - bus_space_read_2(bt, bh, - mystart+CARDBUS_EXROM_SIGNATURE)); + "[%x] %04x\n", romnum, imagebase + + CARDBUS_EXROM_SIGNATURE, romsig); bus_release_resource(cbdev, SYS_RES_MEMORY, *rid, res); *rid = 0; return (NULL); } - dataptr = mystart + bus_space_read_2(bt, bh, - mystart + CARDBUS_EXROM_DATA_PTR); + + /* + * If this was the Option ROM image that we were + * looking for, then we are done. + */ + if (romnum == imagenum) + break; + + /* Find out where the next Option ROM image is */ + pcidata = imagebase + bus_space_read_2(bt, bh, + imagebase + CARDBUS_EXROM_DATA_PTR); imagesize = bus_space_read_2(bt, bh, - dataptr + CARDBUS_EXROM_DATA_IMAGE_LENGTH); + pcidata + CARDBUS_EXROM_DATA_IMAGE_LENGTH); if (imagesize == 0) { /* * XXX some ROMs seem to have this as zero, * can we assume this means 1 block? */ + device_printf(cbdev, "Warning, size of Option " + "ROM image %d is 0 bytes, assuming 512 " + "bytes.\n", romnum); imagesize = 1; } + + /* Image size is in 512 byte units */ imagesize <<= 9; - if (romnum == imagenum) - break; - if ((bus_space_read_1(bt, bh, mystart + - CARDBUS_EXROM_DATA_INDICATOR) & 0x80) == 0) { - device_printf(cbdev, "Cannot read CIS: " - "Not enough images of rom\n"); + if ((bus_space_read_1(bt, bh, pcidata + + CARDBUS_EXROM_DATA_INDICATOR) & 0x80) != 0) { + device_printf(cbdev, "Cannot find CIS in " + "Option ROM\n"); + bus_release_resource(cbdev, SYS_RES_MEMORY, + *rid, res); + *rid = 0; return (NULL); } - mystart += imagesize; + imagebase += imagesize; } - *start = mystart + CARDBUS_CIS_ADDR(*start); + *start = imagebase + CARDBUS_CIS_ADDR(*start); } else { - *start = CARDBUS_CIS_SPACE(*start); + *start = CARDBUS_CIS_ADDR(*start); } + return (res); } @@ -553,7 +579,8 @@ bzero(tupledata, MAXTUPLESIZE); expect_linktarget = TRUE; - start = pci_read_config(child, CARDBUS_CIS_REG, 4); + if ((start = pci_read_config(child, CARDBUS_CIS_REG, 4)) == 0) + return (ENXIO); off = 0; res = cardbus_read_tuple_init(cbdev, child, &start, &rid); if (res == NULL) ==== //depot/projects/smpng/sys/dev/firewire/firewire.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.4 2002/11/07 02:13:40 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.8 2002/11/12 17:16:20 simokawa Exp $ * */ @@ -46,30 +46,14 @@ #include #include #include -#include #include /* for rdtsc proto for clock.h below */ #include -#include -#include -#include -#include /* for vtophys proto */ -#include - #include /* used by smbus and newbus */ -#include /* used by newbus */ -#include /* used by newbus */ -#include /* used by newbus */ - -#include -#include -#include - #include #include -#include #include #include @@ -78,24 +62,13 @@ SYSCTL_INT(_debug, OID_AUTO, firewire_debug, CTLFLAG_RW, &firewire_debug, 0, "Firewire driver debug flag"); -#define CDEV_MAJOR 127 #define FW_MAXASYRTY 4 #define FW_MAXDEVRCNT 4 -#define FWNODE_INVAL 0xffff #define XFER_TIMEOUT 0 -static d_open_t fw_open; -static d_close_t fw_close; -static d_ioctl_t fw_ioctl; -static d_poll_t fw_poll; -static d_read_t fw_read; /* for Isochronous packet */ -static d_write_t fw_write; -static d_mmap_t fw_mmap; - devclass_t firewire_devclass; - static int firewire_match __P((device_t)); static int firewire_attach __P((device_t)); static int firewire_detach __P((device_t)); @@ -103,10 +76,8 @@ static int firewire_shutdown __P((device_t)); #endif static device_t firewire_add_child __P((device_t, int, const char *, int)); -static struct fw_bind *fw_bindlookup __P((struct firewire_comm *, u_int32_t, u_int32_t)); static void fw_try_bmr __P((void *)); static void fw_try_bmr_callback __P((struct fw_xfer *)); -static u_int16_t fw_noderesolve __P((struct firewire_comm *, struct fw_eui64)); static void fw_asystart __P((struct fw_xfer *)); static int fw_get_tlabel __P((struct firewire_comm *, struct fw_xfer *)); static void fw_bus_probe __P((struct firewire_comm *)); @@ -138,442 +109,16 @@ #define MAX_GAPHOP 16 u_int gap_cnt[] = {1, 1, 4, 6, 9, 12, 14, 17, 20, 23, 25, 28, 31, 33, 36, 39, 42}; -/* - * The probe routine. - */ -struct cdevsw firewire_cdevsw = -{ - fw_open, fw_close, fw_read, fw_write, fw_ioctl, - fw_poll, fw_mmap, nostrategy, "fw", CDEV_MAJOR, nodump, nopsize, D_MEM -}; + +extern struct cdevsw firewire_cdevsw; + static driver_t firewire_driver = { "firewire", firewire_methods, sizeof(struct firewire_softc), }; -static int -fw_open (dev_t dev, int flags, int fmt, fw_proc *td) -{ - struct firewire_softc *sc; - int unit = DEV2UNIT(dev); - int sub = DEV2DMACH(dev); - - int err = 0; - - if (DEV_FWMEM(dev)) - return fwmem_open(dev, flags, fmt, td); - - sc = devclass_get_softc(firewire_devclass, unit); - if(sc->fc->ir[sub]->flag & FWXFERQ_OPEN){ - err = EBUSY; - return err; - } - if(sc->fc->it[sub]->flag & FWXFERQ_OPEN){ - err = EBUSY; - return err; - } - if(sc->fc->ir[sub]->flag & FWXFERQ_MODEMASK){ - err = EBUSY; - return err; - } -/* Default is per packet mode */ - sc->fc->ir[sub]->flag |= FWXFERQ_OPEN; - sc->fc->it[sub]->flag |= FWXFERQ_OPEN; - sc->fc->ir[sub]->flag |= FWXFERQ_PACKET; - return err; -} -static int -fw_close (dev_t dev, int flags, int fmt, fw_proc *td) -{ - struct firewire_softc *sc; - int unit = DEV2UNIT(dev); - int sub = DEV2DMACH(dev); - struct fw_xfer *xfer; - struct fw_dvbuf *dvbuf; - struct fw_bind *fwb; - int err = 0; - - if (DEV_FWMEM(dev)) - return fwmem_close(dev, flags, fmt, td); - - sc = devclass_get_softc(firewire_devclass, unit); - if(!(sc->fc->ir[sub]->flag & FWXFERQ_OPEN)){ - err = EINVAL; - return err; - } - sc->fc->ir[sub]->flag &= ~FWXFERQ_OPEN; - if(!(sc->fc->it[sub]->flag & FWXFERQ_OPEN)){ - err = EINVAL; - return err; - } - sc->fc->it[sub]->flag &= ~FWXFERQ_OPEN; - - if(sc->fc->ir[sub]->flag & FWXFERQ_RUNNING){ - sc->fc->irx_disable(sc->fc, sub); - } - if(sc->fc->it[sub]->flag & FWXFERQ_RUNNING){ - sc->fc->it[sub]->flag &= ~FWXFERQ_RUNNING; - sc->fc->itx_disable(sc->fc, sub); - } - if(sc->fc->it[sub]->flag & FWXFERQ_DV){ - if((dvbuf = sc->fc->it[sub]->dvproc) != NULL){ - free(dvbuf->buf, M_DEVBUF); - sc->fc->it[sub]->dvproc = NULL; - } - if((dvbuf = sc->fc->it[sub]->dvdma) != NULL){ - free(dvbuf->buf, M_DEVBUF); - sc->fc->it[sub]->dvdma = NULL; - } - while((dvbuf = STAILQ_FIRST(&sc->fc->it[sub]->dvvalid)) != NULL){ - STAILQ_REMOVE_HEAD(&sc->fc->it[sub]->dvvalid, link); - free(dvbuf->buf, M_DEVBUF); - } - while((dvbuf = STAILQ_FIRST(&sc->fc->it[sub]->dvfree)) != NULL){ - STAILQ_REMOVE_HEAD(&sc->fc->it[sub]->dvfree, link); - free(dvbuf->buf, M_DEVBUF); - } - free(sc->fc->it[sub]->dvbuf, M_DEVBUF); - sc->fc->it[sub]->dvbuf = NULL; - } - if(sc->fc->ir[sub]->flag & FWXFERQ_EXTBUF){ - free(sc->fc->ir[sub]->buf, M_DEVBUF); - sc->fc->ir[sub]->buf = NULL; - free(sc->fc->ir[sub]->bulkxfer, M_DEVBUF); - sc->fc->ir[sub]->bulkxfer = NULL; - sc->fc->ir[sub]->flag &= ~FWXFERQ_EXTBUF; - sc->fc->ir[sub]->psize = FWPMAX_S400; - sc->fc->ir[sub]->maxq = FWMAXQUEUE; - } - if(sc->fc->it[sub]->flag & FWXFERQ_EXTBUF){ - free(sc->fc->it[sub]->buf, M_DEVBUF); - sc->fc->it[sub]->buf = NULL; - free(sc->fc->it[sub]->bulkxfer, M_DEVBUF); - sc->fc->it[sub]->bulkxfer = NULL; - sc->fc->it[sub]->dvbuf = NULL; - sc->fc->it[sub]->flag &= ~FWXFERQ_EXTBUF; - sc->fc->it[sub]->psize = FWPMAX_S400; - sc->fc->it[sub]->maxq = FWMAXQUEUE; - } - for(xfer = STAILQ_FIRST(&sc->fc->ir[sub]->q); - xfer != NULL; xfer = STAILQ_FIRST(&sc->fc->ir[sub]->q)){ - sc->fc->ir[sub]->queued--; - STAILQ_REMOVE_HEAD(&sc->fc->ir[sub]->q, link); - - xfer->resp = 0; - switch(xfer->act_type){ - case FWACT_XFER: - fw_xfer_done(xfer); - break; - default: - break; - } - fw_xfer_free(xfer); - } - for(fwb = STAILQ_FIRST(&sc->fc->ir[sub]->binds); fwb != NULL; - fwb = STAILQ_FIRST(&sc->fc->ir[sub]->binds)){ - STAILQ_REMOVE(&sc->fc->binds, fwb, fw_bind, fclist); - STAILQ_REMOVE_HEAD(&sc->fc->ir[sub]->binds, chlist); - free(fwb, M_DEVBUF); - } - sc->fc->ir[sub]->flag &= ~FWXFERQ_MODEMASK; - sc->fc->it[sub]->flag &= ~FWXFERQ_MODEMASK; - return err; -} /* - * read request. - */ -static int -fw_read (dev_t dev, struct uio *uio, int ioflag) -{ - struct firewire_softc *sc; - struct fw_xferq *ir; - struct fw_xfer *xfer; - int err = 0, s, slept = 0; - int unit = DEV2UNIT(dev); - int sub = DEV2DMACH(dev); - struct fw_pkt *fp; - - if (DEV_FWMEM(dev)) - return fwmem_read(dev, uio, ioflag); - - sc = devclass_get_softc(firewire_devclass, unit); - - ir = sc->fc->ir[sub]; - - if(ir->flag & FWXFERQ_PACKET){ - ir->stproc = NULL; - } -readloop: - xfer = STAILQ_FIRST(&ir->q); - if(!(ir->flag & FWXFERQ_PACKET) && ir->stproc == NULL){ - ir->stproc = STAILQ_FIRST(&ir->stvalid); - if(ir->stproc != NULL){ - s = splfw(); - STAILQ_REMOVE_HEAD(&ir->stvalid, link); - splx(s); - ir->queued = 0; - } - } - - if(xfer == NULL && ir->stproc == NULL){ - if(slept == 0){ - slept = 1; - if(!(ir->flag & FWXFERQ_RUNNING) - && (ir->flag & FWXFERQ_PACKET)){ - err = sc->fc->irx_enable(sc->fc, sub); - } - if(err){ - return err; - } - ir->flag |= FWXFERQ_WAKEUP; - err = tsleep((caddr_t)ir, FWPRI, "fw_read", hz); - if(err){ - ir->flag &= ~FWXFERQ_WAKEUP; - return err; - } - goto readloop; - }else{ - err = EIO; - return err; - } - }else if(xfer != NULL){ - s = splfw(); - ir->queued --; - STAILQ_REMOVE_HEAD(&ir->q, link); - splx(s); - fp = (struct fw_pkt *)(xfer->recv.buf + xfer->recv.off); - if(sc->fc->irx_post != NULL) - sc->fc->irx_post(sc->fc, fp->mode.ld); - err = uiomove(xfer->recv.buf + xfer->recv.off, xfer->recv.len, uio); - fw_xfer_free( xfer); - }else if(ir->stproc != NULL){ - fp = (struct fw_pkt *)(ir->stproc->buf + ir->queued * ir->psize); - if(sc->fc->irx_post != NULL) - sc->fc->irx_post(sc->fc, fp->mode.ld); - if(ntohs(fp->mode.stream.len) == 0){ - err = EIO; - return err; - } - err = uiomove((caddr_t)fp, ntohs(fp->mode.stream.len) + sizeof(u_int32_t), uio); - fp->mode.stream.len = 0; - ir->queued ++; - if(ir->queued >= ir->bnpacket){ - s = splfw(); - ir->stproc->flag = 0; - STAILQ_INSERT_TAIL(&ir->stfree, ir->stproc, link); - splx(s); - ir->stproc = NULL; - } - } -#if 0 - if(STAILQ_FIRST(&ir->q) == NULL && - (ir->flag & FWXFERQ_RUNNING) && (ir->flag & FWXFERQ_PACKET)){ - err = sc->fc->irx_enable(sc->fc, sub); - } -#endif -#if 0 - if(STAILQ_FIRST(&ir->stvalid) == NULL && - (ir->flag & FWXFERQ_RUNNING) && !(ir->flag & FWXFERQ_PACKET)){ - err = sc->fc->irx_enable(sc->fc, sub); - } -#endif - return err; -} -static int -fw_write (dev_t dev, struct uio *uio, int ioflag) -{ - int err = 0; - struct firewire_softc *sc; - int unit = DEV2UNIT(dev); - int sub = DEV2DMACH(dev); - int tl, s, slept = 0; - struct fw_pkt *fp; - struct fw_xfer *xfer; - struct fw_xferq *xferq; - struct firewire_comm *fc; - struct fw_xferq *it; - - if (DEV_FWMEM(dev)) - return fwmem_write(dev, uio, ioflag); - - sc = devclass_get_softc(firewire_devclass, unit); - fc = sc->fc; - it = sc->fc->it[sub]; - - fp = (struct fw_pkt *)uio->uio_iov->iov_base; - switch(fp->mode.common.tcode){ - case FWTCODE_RREQQ: - case FWTCODE_RREQB: - case FWTCODE_LREQ: - err = EINVAL; - return err; - case FWTCODE_WREQQ: - case FWTCODE_WREQB: - xferq = fc->atq; - break; - case FWTCODE_STREAM: - if(it->flag & FWXFERQ_PACKET){ - xferq = fc->atq; - }else{ - xferq = NULL; - } - break; - case FWTCODE_WRES: - case FWTCODE_RRESQ: - case FWTCODE_RRESB: - case FWTCODE_LRES: - xferq = fc->ats; - break; - default: - err = EINVAL; - return err; - } - /* Discard unsent buffered stream packet, when sending Asyrequrst */ - if(xferq != NULL && it->stproc != NULL){ - s = splfw(); - it->stproc->flag = 0; - STAILQ_INSERT_TAIL(&it->stfree, it->stproc, link); - splx(s); - it->stproc = NULL; - } - if(xferq == NULL && !(it->flag & FWXFERQ_DV)){ -isoloop: - if(it->stproc == NULL){ - it->stproc = STAILQ_FIRST(&it->stfree); - if(it->stproc != NULL){ - s = splfw(); - STAILQ_REMOVE_HEAD(&it->stfree, link); - splx(s); - it->queued = 0; - }else if(slept == 0){ - slept = 1; - err = sc->fc->itx_enable(sc->fc, sub); - if(err){ - return err; - } - err = tsleep((caddr_t)it, FWPRI, "fw_write", hz); - if(err){ - return err; - } - goto isoloop; - }else{ - err = EIO; - return err; - } - } - fp = (struct fw_pkt *)(it->stproc->buf + it->queued * it->psize); - fp->mode.stream.len = htons(uio->uio_resid - sizeof(u_int32_t)); - err = uiomove(it->stproc->buf + it->queued * it->psize, - uio->uio_resid, uio); - it->queued ++; - if(it->queued >= it->btpacket){ - s = splfw(); - STAILQ_INSERT_TAIL(&it->stvalid, it->stproc, link); - splx(s); - it->stproc = NULL; - fw_tbuf_update(sc->fc, sub, 0); - err = sc->fc->itx_enable(sc->fc, sub); - } - return err; - } if(xferq == NULL && it->flag & FWXFERQ_DV){ -dvloop: - if(it->dvproc == NULL){ - it->dvproc = STAILQ_FIRST(&it->dvfree); - if(it->dvproc != NULL){ - s = splfw(); - STAILQ_REMOVE_HEAD(&it->dvfree, link); - splx(s); - it->dvptr = 0; - }else if(slept == 0){ - slept = 1; - err = sc->fc->itx_enable(sc->fc, sub); - if(err){ - return err; - } - err = tsleep((caddr_t)it, FWPRI, "fw_write", hz); - if(err){ - return err; - } - goto dvloop; - }else{ - err = EIO; - return err; - } - } - fp = (struct fw_pkt *)(it->dvproc->buf + it->queued * it->psize); - fp->mode.stream.len = htons(uio->uio_resid - sizeof(u_int32_t)); - err = uiomove(it->dvproc->buf + it->dvptr, - uio->uio_resid, uio); - it->dvptr += it->psize; - if(err){ - return err; - } - if(it->dvptr >= it->psize * it->dvpacket){ - s = splfw(); - STAILQ_INSERT_TAIL(&it->dvvalid, it->dvproc, link); - splx(s); - it->dvproc = NULL; - err = fw_tbuf_update(sc->fc, sub, 0); - if(err){ - return err; - } - err = sc->fc->itx_enable(sc->fc, sub); - } - return err; - } - if(xferq != NULL){ - xfer = fw_xfer_alloc(); - if(xfer == NULL){ - err = ENOMEM; - return err; - } - xfer->send.buf = malloc(uio->uio_resid, M_DEVBUF, M_NOWAIT); - if(xfer->send.buf == NULL){ - fw_xfer_free( xfer); - err = ENOBUFS; - return err; - } - xfer->dst = ntohs(fp->mode.hdr.dst); - - switch(fp->mode.common.tcode){ - case FWTCODE_WREQQ: - case FWTCODE_WREQB: - if((tl = fw_get_tlabel(fc, xfer)) == -1 ){ - fw_xfer_free( xfer); - err = EAGAIN; - return err; - } - fp->mode.hdr.tlrt = tl << 2; - default: - break; - } - - xfer->tl = fp->mode.hdr.tlrt >> 2; - xfer->send.len = uio->uio_resid; - xfer->send.off = 0; - xfer->tcode = fp->mode.common.tcode; - xfer->spd = 0;/* XXX: how to setup it */ - xfer->fc = fc; - xfer->q = xferq; - xfer->act_type = FWACT_XFER; - xfer->act.hand = fw_asy_callback; - xfer->retry_req = fw_asybusy; - - err = uiomove(xfer->send.buf, uio->uio_resid, uio); - if(err){ - return err; - } - fw_asystart(xfer); - err = tsleep((caddr_t)xfer, FWPRI, "fw_write", hz); - if(xfer->resp == EBUSY) - return EBUSY; - fw_xfer_free( xfer); - return err; - } - return EINVAL; -} -/* * transmitter buffer update. */ int @@ -752,409 +297,12 @@ ir->stdma2 = bulkxfer2; return err; } -/* - * ioctl support. - */ -int -fw_ioctl (dev_t dev, u_long cmd, caddr_t data, int flag, fw_proc *td) -{ - struct firewire_softc *sc; - int unit = DEV2UNIT(dev); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 11:21:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D78B37B404; Wed, 13 Nov 2002 11:21:41 -0800 (PST) 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 E963237B401 for ; Wed, 13 Nov 2002 11:21:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78D0943E7B for ; Wed, 13 Nov 2002 11:21:40 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADJJCmV057910 for ; Wed, 13 Nov 2002 11:19:12 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADJJB2k057905 for perforce@freebsd.org; Wed, 13 Nov 2002 11:19:11 -0800 (PST) Date: Wed, 13 Nov 2002 11:19:11 -0800 (PST) Message-Id: <200211131919.gADJJB2k057905@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21042 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21042 Change 21042 by jhb@jhb_laptop on 2002/11/13 11:18:44 Replace prototype for witness_sleep() with one for witness_warn(). Affected files ... .. //depot/projects/smpng/sys/sys/lock.h#21 edit Differences ... ==== //depot/projects/smpng/sys/sys/lock.h#21 (text+ko) ==== @@ -205,7 +205,8 @@ void witness_save(struct lock_object *, const char **, int *); void witness_restore(struct lock_object *, const char *, int); int witness_list_locks(struct lock_list_entry **); -int witness_sleep(int, struct lock_object *, const char *, int); +int witness_warn(int, struct lock_object *, const char *, int, + const char *, ...); void witness_assert(struct lock_object *, int, const char *, int); int witness_line(struct lock_object *); const char *witness_file(struct lock_object *); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 11:33: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B471837B404; Wed, 13 Nov 2002 11:32:55 -0800 (PST) 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 4C59537B401 for ; Wed, 13 Nov 2002 11:32:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF5F943E4A for ; Wed, 13 Nov 2002 11:32:54 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADJUQmV059048 for ; Wed, 13 Nov 2002 11:30:26 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADJUQYd059045 for perforce@freebsd.org; Wed, 13 Nov 2002 11:30:26 -0800 (PST) Date: Wed, 13 Nov 2002 11:30:26 -0800 (PST) Message-Id: <200211131930.gADJUQYd059045@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21043 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21043 Change 21043 by green@green_laptop_2 on 2002/11/13 11:29:41 Revise the new LOMAC's interpretation of the subject label. The components are thus: single(low-high) single: The effective level defines what the level of created files shall be, and what the lowest-integrity object that may be read without demotion shall be. low: The low range level determines the lower bound that the effective level may become. high: The high range level determines what protections are enforced regarding modification of objects by the subject. Additionally, it is also the upper bound of the effective level. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#38 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#38 (text+ko) ==== @@ -203,8 +203,6 @@ default: panic("mac_lomac_dominate_element: a->mle_type invalid"); } - - return (0); } static int @@ -230,8 +228,6 @@ &single->ml_single) && mac_lomac_dominate_element(&single->ml_single, &range->ml_rangelow)); - - return (1); } static int @@ -263,6 +259,19 @@ } static int +mac_lomac_subject_dominate(struct mac_lomac *a, struct mac_lomac *b) +{ + KASSERT((~a->ml_flags & + (MAC_LOMAC_FLAG_SINGLE | MAC_LOMAC_FLAG_RANGE)) == 0, + ("mac_lomac_dominate_single: a not subject")); + KASSERT((b->ml_flags & MAC_LOMAC_FLAG_SINGLE) != 0, + ("mac_lomac_dominate_single: b not single")); + + return (mac_lomac_dominate_element(&a->ml_rangehigh, + &b->ml_single)); +} + +static int mac_lomac_equal_element(struct mac_lomac_element *a, struct mac_lomac_element *b) { @@ -1838,7 +1847,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT((pipelabel)); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -1858,7 +1867,7 @@ /* XXX: range checks */ if (!mac_lomac_dominate_single(obj, subj)) return (ESRCH); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -1878,7 +1887,7 @@ /* XXX: range checks */ if (!mac_lomac_dominate_single(obj, subj)) return (ESRCH); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -1898,7 +1907,7 @@ /* XXX: range checks */ if (!mac_lomac_dominate_single(obj, subj)) return (ESRCH); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -2055,7 +2064,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(dlabel); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); if (obj->ml_flags & MAC_LOMAC_FLAG_AUX && !mac_lomac_dominate_element(&subj->ml_single, &obj->ml_auxsingle)) @@ -2077,12 +2086,12 @@ subj = SLOT(&cred->cr_label); obj = SLOT(dlabel); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); obj = SLOT(label); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -2100,7 +2109,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(label); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -2119,12 +2128,12 @@ subj = SLOT(&cred->cr_label); obj = SLOT(dlabel); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); obj = SLOT(label); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -2147,7 +2156,7 @@ obj = SLOT(label); if (prot & VM_PROT_WRITE) { - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); } if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { @@ -2175,7 +2184,7 @@ obj = SLOT(label); if (prot & VM_PROT_WRITE) { - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); } if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { @@ -2202,7 +2211,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(label); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) *prot &= ~VM_PROT_WRITE; } @@ -2220,7 +2229,7 @@ /* XXX privilege override for admin? */ if (acc_mode & (VWRITE | VAPPEND | VADMIN)) { - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); } @@ -2328,12 +2337,12 @@ subj = SLOT(&cred->cr_label); obj = SLOT(dlabel); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); obj = SLOT(label); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -2352,13 +2361,13 @@ subj = SLOT(&cred->cr_label); obj = SLOT(dlabel); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); if (vp != NULL) { obj = SLOT(label); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); } @@ -2377,7 +2386,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(label); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -2395,7 +2404,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(label); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -2414,7 +2423,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(vnodelabel); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); /* XXX: protect the MAC EA in a special way? */ @@ -2434,7 +2443,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(vnodelabel); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -2452,7 +2461,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(vnodelabel); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -2470,7 +2479,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(vnodelabel); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -2488,7 +2497,7 @@ subj = SLOT(&cred->cr_label); obj = SLOT(vnodelabel); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); @@ -2506,7 +2515,7 @@ subj = SLOT(&active_cred->cr_label); obj = SLOT(label); - if (!mac_lomac_dominate_single(subj, obj)) + if (!mac_lomac_subject_dominate(subj, obj)) return (EACCES); return (0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 14: 7: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F9E437B401; Wed, 13 Nov 2002 14:07:01 -0800 (PST) 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 15C7E37B404 for ; Wed, 13 Nov 2002 14:07:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B998143E3B for ; Wed, 13 Nov 2002 14:07:00 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADM4WmV072365 for ; Wed, 13 Nov 2002 14:04:32 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADM4V3a072362 for perforce@freebsd.org; Wed, 13 Nov 2002 14:04:31 -0800 (PST) Date: Wed, 13 Nov 2002 14:04:31 -0800 (PST) Message-Id: <200211132204.gADM4V3a072362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21044 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21044 Change 21044 by jhb@jhb_laptop on 2002/11/13 14:04:22 Bah. Whoever in C99-land dreamed up use of variadic macro args didn't actually use their little noggin to do so, so I have to use a gcc-ism to fix. Morons. Affected files ... .. //depot/projects/smpng/sys/sys/lock.h#22 edit Differences ... ==== //depot/projects/smpng/sys/sys/lock.h#22 (text+ko) ==== @@ -237,7 +237,7 @@ witness_unlock((lock), (flags), (file), (line)) #define WITNESS_WARN(flags, lock, fmt, ...) \ - witness_warn((flags), (lock), __FILE__, __LINE__, (fmt), __VA_ARGS__) + witness_warn((flags), (lock), __FILE__, __LINE__, (fmt), ## __VA_ARGS__) #define WITNESS_SAVE_DECL(n) \ const char * __CONCAT(n, __wf); \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 14:11: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3827337B406; Wed, 13 Nov 2002 14:11:07 -0800 (PST) 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 CE3D837B401 for ; Wed, 13 Nov 2002 14:11:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E29E43E42 for ; Wed, 13 Nov 2002 14:11:06 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADM8bmV072826 for ; Wed, 13 Nov 2002 14:08:37 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADM8ben072819 for perforce@freebsd.org; Wed, 13 Nov 2002 14:08:37 -0800 (PST) Date: Wed, 13 Nov 2002 14:08:37 -0800 (PST) Message-Id: <200211132208.gADM8ben072819@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21045 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21045 Change 21045 by jhb@jhb_laptop on 2002/11/13 14:08:13 Compile fixes. Affected files ... .. //depot/projects/smpng/sys/kern/subr_witness.c#65 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_witness.c#65 (text+ko) ==== @@ -72,6 +72,8 @@ #include +#include + /* Define this to check for blessed mutexes */ #undef BLESSING @@ -146,7 +148,7 @@ static struct lock_instance *find_instance(struct lock_list_entry *lock_list, struct lock_object *lock); static int witness_list(struct thread *td); -static int witness_list_lock(struct lock_instance *instance); +static void witness_list_lock(struct lock_instance *instance); #if defined(DDB) static void witness_display_list(void(*prnt)(const char *fmt, ...), struct witness_list *list); @@ -1366,7 +1368,7 @@ return (NULL); } -static int +static void witness_list_lock(struct lock_instance *instance) { struct lock_object *lock; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 14:29:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 061D237B404; Wed, 13 Nov 2002 14:29:30 -0800 (PST) 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 A4D4B37B401 for ; Wed, 13 Nov 2002 14:29:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62BD943E42 for ; Wed, 13 Nov 2002 14:29:29 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADMR0mV074264 for ; Wed, 13 Nov 2002 14:27:00 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADMR0ce074261 for perforce@freebsd.org; Wed, 13 Nov 2002 14:27:00 -0800 (PST) Date: Wed, 13 Nov 2002 14:27:00 -0800 (PST) Message-Id: <200211132227.gADMR0ce074261@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21046 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21046 Change 21046 by peter@peter_daintree on 2002/11/13 14:26:32 slightly less non-portable Affected files ... .. //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#11 edit Differences ... ==== //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#11 (text+ko) ==== @@ -55,7 +55,6 @@ #include #include #include -#include #include #include @@ -111,7 +110,7 @@ goto file_err; if ((flags & PAM_SILENT) == 0) { if (read(fd, &ll, sizeof ll) == sizeof ll && ll.ll_time != 0) { - t = _time32_to_time(ll.ll_time); + t = ll.ll_time; if (*ll.ll_host != '\0') pam_info(pamh, "Last login: %.*s from %.*s", 24 - 5, ctime(&t), @@ -126,7 +125,7 @@ } bzero(&ll, sizeof(ll)); - ll.ll_time = _time_to_time32(time(NULL)); + ll.ll_time = time(NULL); /* note: does not need to be NUL-terminated */ strncpy(ll.ll_line, tty, sizeof(ll.ll_line)); @@ -143,7 +142,7 @@ * Record session in utmp(5) and wtmp(5). */ bzero(&utmp, sizeof(utmp)); - utmp.ut_time = _time_to_time32(time(NULL)); + utmp.ut_time = time(NULL); /* note: does not need to be NUL-terminated */ strncpy(utmp.ut_name, user, sizeof(utmp.ut_name)); if (rhost != NULL) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 14:30:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A60D37B404; Wed, 13 Nov 2002 14:30:32 -0800 (PST) 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 BD9C237B401 for ; Wed, 13 Nov 2002 14:30:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CC3743E77 for ; Wed, 13 Nov 2002 14:30:31 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADMS2mV074392 for ; Wed, 13 Nov 2002 14:28:02 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADMS2I7074387 for perforce@freebsd.org; Wed, 13 Nov 2002 14:28:02 -0800 (PST) Date: Wed, 13 Nov 2002 14:28:02 -0800 (PST) Message-Id: <200211132228.gADMS2I7074387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21047 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21047 Change 21047 by peter@peter_daintree on 2002/11/13 14:27:47 revert to vendor Affected files ... .. //depot/projects/ia64/sys/vm/uma_core.c#29 edit Differences ... ==== //depot/projects/ia64/sys/vm/uma_core.c#29 (text+ko) ==== @@ -149,9 +149,7 @@ /* Prototypes.. */ -#ifndef MD_HAVE_OBJ_ALLOC static void *obj_alloc(uma_zone_t, int, u_int8_t *, int); -#endif static void *page_alloc(uma_zone_t, int, u_int8_t *, int); static void page_free(void *, int, u_int8_t); static uma_slab_t slab_zalloc(uma_zone_t, int); @@ -801,7 +799,6 @@ return (p); } -#ifndef MD_HAVE_OBJ_ALLOC /* * Allocates a number of pages from within an object * @@ -849,7 +846,6 @@ return ((void *)retkva); } -#endif /* * Frees a number of pages to the system @@ -1912,7 +1908,6 @@ ZONE_UNLOCK(zone); } -#ifndef MD_HAVE_UMA_ZONE_SET_OBJ /* See uma.h */ int uma_zone_set_obj(uma_zone_t zone, struct vm_object *obj, int count) @@ -1934,6 +1929,7 @@ return (0); } + if (obj == NULL) obj = vm_object_allocate(OBJT_DEFAULT, pages); @@ -1954,7 +1950,6 @@ return (1); } -#endif /* See uma.h */ void To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 14:32:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1703E37B406; Wed, 13 Nov 2002 14:32:36 -0800 (PST) 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 9532537B401 for ; Wed, 13 Nov 2002 14:32:35 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51D6E43E42 for ; Wed, 13 Nov 2002 14:32:35 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADMU6mV075085 for ; Wed, 13 Nov 2002 14:30:06 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADMU6wa075082 for perforce@freebsd.org; Wed, 13 Nov 2002 14:30:06 -0800 (PST) Date: Wed, 13 Nov 2002 14:30:06 -0800 (PST) Message-Id: <200211132230.gADMU6wa075082@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21049 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21049 Change 21049 by peter@peter_daintree on 2002/11/13 14:29:17 less unportable. The whole utmp/wtmp thing needs a proper API anyway. Affected files ... .. //depot/projects/ia64/usr.sbin/ppp/physical.c#9 edit .. //depot/projects/ia64/usr.sbin/pppd/auth.c#4 edit Differences ... ==== //depot/projects/ia64/usr.sbin/ppp/physical.c#9 (text+ko) ==== @@ -45,11 +45,6 @@ #else #include #endif -#if defined(__FreeBSD__) -#include -#else -#define _time_to_time32(t) (t) -#endif #include "layer.h" #ifndef NONAT @@ -921,7 +916,7 @@ char *colon; memset(&ut, 0, sizeof ut); - ut.ut_time = _time_to_time32(time(NULL)); + ut.ut_time = time(NULL); strncpy(ut.ut_name, name, sizeof ut.ut_name); if (p->handler && (p->handler->type == TCP_DEVICE || p->handler->type == UDP_DEVICE)) { ==== //depot/projects/ia64/usr.sbin/pppd/auth.c#4 (text+ko) ==== @@ -49,7 +49,6 @@ #include #include #include -#include #if defined(_PATH_LASTLOG) && defined(_linux_) #include #endif @@ -996,7 +995,7 @@ #endif memset((void *)&utmp, 0, sizeof(utmp)); - utmp.ut_time = _time_to_time32(time(NULL)); + utmp.ut_time = time(NULL); (void)strncpy(utmp.ut_name, user, sizeof(utmp.ut_name)); (void)strncpy(utmp.ut_host, ":PPP", sizeof(utmp.ut_host)); (void)strncpy(utmp.ut_line, tty, sizeof(utmp.ut_line)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 14:33:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13F0737B404; Wed, 13 Nov 2002 14:33:38 -0800 (PST) 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 A06AB37B401 for ; Wed, 13 Nov 2002 14:33:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C66F43E42 for ; Wed, 13 Nov 2002 14:33:37 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADMV8mV075179 for ; Wed, 13 Nov 2002 14:31:08 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADMV8il075176 for perforce@freebsd.org; Wed, 13 Nov 2002 14:31:08 -0800 (PST) Date: Wed, 13 Nov 2002 14:31:08 -0800 (PST) Message-Id: <200211132231.gADMV8il075176@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21050 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21050 Change 21050 by peter@peter_daintree on 2002/11/13 14:31:02 revert. The O_EXCL stuff should be fixed in geom by now. Affected files ... .. //depot/projects/ia64/sbin/gpt/gpt.c#14 edit Differences ... ==== //depot/projects/ia64/sbin/gpt/gpt.c#14 (text+ko) ==== @@ -271,7 +271,7 @@ return (-1); found: - fd = open(device_name, (readonly) ? O_RDONLY : O_RDWR); + fd = open(device_name, (readonly) ? O_RDONLY : O_RDWR|O_EXCL); if (fd == -1) return (-1); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 15:13:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3DFB37B404; Wed, 13 Nov 2002 15:13:27 -0800 (PST) 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 2492137B401 for ; Wed, 13 Nov 2002 15:13:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C527243E7B for ; Wed, 13 Nov 2002 15:13:26 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADNAvmV078626 for ; Wed, 13 Nov 2002 15:10:57 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADNAvZv078623 for perforce@freebsd.org; Wed, 13 Nov 2002 15:10:57 -0800 (PST) Date: Wed, 13 Nov 2002 15:10:57 -0800 (PST) Message-Id: <200211132310.gADNAvZv078623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21052 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21052 Change 21052 by green@green_laptop_2 on 2002/11/13 15:10:13 Optimization: treat labeling operations as a transaction so that setfsmac(8) will no label an entire filesystem more quickly. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#4 (text+ko) ==== @@ -19,10 +19,11 @@ char *regexstr; /* uncompiled regular expression */ mode_t mode; /* mode to possibly match */ char *modestr; /* print-worthy ",-?" mode string */ - mac_t mac; /* MAC label to apply */ + char *mactext; /* MAC label to apply */ int flags; /* miscellaneous flags */ #define F_DONTLABEL 0x01 - } *entries; + } *entries, /* entries[0..nentries] */ + *match; /* cached decision for MAC label to apply */ size_t nentries; /* size of entries list */ STAILQ_ENTRY(label_spec) link; }; @@ -211,7 +212,7 @@ add_spec_line(const char *file, int is_sebsd, struct label_spec_entry *entry, char *line) { - char *regexstr, *modestr, *macstr, *regerrorstr, *sebsdstr; + char *regexstr, *modestr, *macstr, *regerrorstr; size_t size; int error; @@ -242,17 +243,14 @@ errx(1, "%s: %s: %s", file, entry->regexstr, regerrorstr); } if (!is_sebsd) { - if (mac_from_text(&entry->mac, macstr)) - err(1, "%s: mac_from_text(%s)", file, macstr); + entry->mactext = strdup(macstr); + if (entry->mactext == NULL) + err(1, "strdup"); } else { - if (asprintf(&sebsdstr, "sebsd/%s", macstr) == -1) + if (asprintf(&entry->mactext, "sebsd/%s", macstr) == -1) err(1, "asprintf"); - if (mac_from_text(&entry->mac, sebsdstr)) - err(1, "%s: mac_from_text(%s)", file, sebsdstr); - if (strcmp(macstr, "<>") == 0) + if (strcmp(entry->mactext, "<>") == 0) entry->flags |= F_DONTLABEL; - free(sebsdstr); - } if (modestr != NULL) { if (strlen(modestr) != 2 || modestr[0] != '-') @@ -300,8 +298,9 @@ regmatch_t pmatch; struct label_spec *ls; struct label_spec_entry *ent; - char *regerrorstr, *mactext; + char *regerrorstr, *macstr; size_t size; + mac_t mac; int error, matchedby; /* @@ -311,8 +310,8 @@ */ matchedby = 0; STAILQ_FOREACH(ls, &specs->head, link) { - for (ent = ls->entries; ent < &ls->entries[ls->nentries]; - ent++) { + for (ls->match = NULL, ent = ls->entries; + ent < &ls->entries[ls->nentries]; ent++) { if (ent->mode != 0 && (ftsent->fts_statp->st_mode & S_IFMT) != ent->mode) continue; @@ -324,6 +323,7 @@ case REG_NOMATCH: continue; case 0: + ls->match = ent; break; default: size = regerror(error, &ent->regex, NULL, 0); @@ -341,28 +341,48 @@ ftsent->fts_path); matchedby = 1; } - if (mac_to_text(ent->mac, &mactext) != 0) - err(1, "mac_to_text"); printf("%s(%s%s,%s)", matchedby == 2 ? "," : "", - ent->regexstr, ent->modestr, mactext); + ent->regexstr, ent->modestr, ent->mactext); if (matchedby == 1) matchedby = 2; - free(mactext); - } - if ((ent->flags & F_DONTLABEL) == 0 && - mac_set_link(ftsent->fts_accpath, ent->mac) != 0) { - if (errno == EOPNOTSUPP) - return (1); - if (vflag) - printf("\n"); - err(1, "mac_set_link(%.*s)", - ftsent->fts_pathlen, ftsent->fts_path); } break; } } if (vflag && matchedby) printf("\n"); + size = 0; + STAILQ_FOREACH(ls, &specs->head, link) { + /* cached match decision */ + if (ls->match && (ls->match->flags & F_DONTLABEL) == 0) + /* add length of "x\0"/"y," */ + size += strlen(ls->match->mactext) + 1; + } + macstr = malloc(size); + if (macstr == NULL) + err(1, "malloc"); + *macstr = '\0'; + STAILQ_FOREACH(ls, &specs->head, link) { + /* cached match decision */ + if (ls->match && (ls->match->flags & F_DONTLABEL) == 0) { + if (*macstr != '\0') + strcat(macstr, ","); + strcat(macstr, ls->match->mactext); + } + } + if (mac_from_text(&mac, macstr)) + err(1, "mac_from_text(%s)", macstr); + if (mac_set_link(ftsent->fts_accpath, mac) != 0) { + if (errno == EOPNOTSUPP) { + mac_free(mac); + free(macstr); + return (1); + } + err(1, "mac_set_link(%.*s, %s)", ftsent->fts_pathlen, + ftsent->fts_path, macstr); + } + mac_free(mac); + free(macstr); return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 15:29:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14F5837B404; Wed, 13 Nov 2002 15:28:48 -0800 (PST) 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 9EDFC37B401 for ; Wed, 13 Nov 2002 15:28:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66CBD43E7B for ; Wed, 13 Nov 2002 15:28:46 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gADNQHmV079559 for ; Wed, 13 Nov 2002 15:26:17 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADNQGb9079556 for perforce@freebsd.org; Wed, 13 Nov 2002 15:26:16 -0800 (PST) Date: Wed, 13 Nov 2002 15:26:16 -0800 (PST) Message-Id: <200211132326.gADNQGb9079556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21053 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21053 Change 21053 by jmallett@jmallett_dalek on 2002/11/13 15:26:14 IFC. Affected files ... .. //depot/projects/mips/MAINTAINERS#5 integrate .. //depot/projects/mips/bin/echo/echo.c#2 integrate .. //depot/projects/mips/contrib/lukemftpd/ChangeLog#2 integrate .. //depot/projects/mips/contrib/lukemftpd/acconfig.h#2 integrate .. //depot/projects/mips/contrib/lukemftpd/config.h.in#2 integrate .. //depot/projects/mips/contrib/lukemftpd/configure#2 integrate .. //depot/projects/mips/contrib/lukemftpd/configure.in#2 integrate .. //depot/projects/mips/contrib/lukemftpd/lukemftpd.h#2 integrate .. //depot/projects/mips/contrib/lukemftpd/todo#2 integrate .. //depot/projects/mips/contrib/one-true-awk/FREEBSD-upgrade#2 integrate .. //depot/projects/mips/etc/defaults/rc.conf#4 integrate .. //depot/projects/mips/etc/inetd.conf#4 integrate .. //depot/projects/mips/include/unistd.h#4 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_writev.c#2 integrate .. //depot/projects/mips/lib/libdisk/libdisk.3#3 integrate .. //depot/projects/mips/lib/libdisk/libdisk.h#5 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_init.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/mips/lib/libpthread/thread/thr_private.h#3 integrate .. //depot/projects/mips/lib/libutil/login_class.c#3 integrate .. //depot/projects/mips/libexec/Makefile#2 integrate .. //depot/projects/mips/libexec/lukemftpd/Makefile#3 integrate .. //depot/projects/mips/libexec/lukemftpd/config.h#2 integrate .. //depot/projects/mips/libexec/mknetid/mknetid.c#2 integrate .. //depot/projects/mips/release/Makefile#7 integrate .. //depot/projects/mips/release/i386/dokern.sh#6 integrate .. //depot/projects/mips/release/i386/drivers.conf#5 integrate .. //depot/projects/mips/sbin/sysctl/sysctl.c#2 integrate .. //depot/projects/mips/sys/bluetooth/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/common/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/common/ng_bluetooth.c#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/bt3c/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/bt3c/ng_bt3c.4#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/bt3c/ng_bt3c_firmware.h#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/h4/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/h4/TODO#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/h4/ng_h4.4#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/h4/ng_h4.c#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/h4/ng_h4_prse.h#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/h4/ng_h4_var.h#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/ubt/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/ubt/ng_ubt.4#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/ubt/ng_ubt.c#2 delete .. //depot/projects/mips/sys/bluetooth/drivers/ubt/ng_ubt_var.h#2 delete .. //depot/projects/mips/sys/bluetooth/hci/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/hci/TODO#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci.4#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_cmds.c#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_cmds.h#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_evnt.c#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_evnt.h#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_main.c#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_misc.c#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_misc.h#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_prse.h#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_ulpi.c#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_ulpi.h#2 delete .. //depot/projects/mips/sys/bluetooth/hci/ng_hci_var.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_bluetooth.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_bt3c.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_btsocket.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_btsocket_hci_raw.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_btsocket_l2cap.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_h4.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_hci.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_l2cap.h#2 delete .. //depot/projects/mips/sys/bluetooth/include/ng_ubt.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/TODO#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap.4#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_cmds.c#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_cmds.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_evnt.c#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_evnt.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_llpi.c#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_llpi.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_main.c#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_misc.c#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_misc.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_prse.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_ulpi.c#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_ulpi.h#2 delete .. //depot/projects/mips/sys/bluetooth/l2cap/ng_l2cap_var.h#2 delete .. //depot/projects/mips/sys/bluetooth/socket/Makefile#2 delete .. //depot/projects/mips/sys/bluetooth/socket/TODO#2 delete .. //depot/projects/mips/sys/bluetooth/socket/ng_btsocket.4#2 delete .. //depot/projects/mips/sys/bluetooth/socket/ng_btsocket.c#2 delete .. //depot/projects/mips/sys/bluetooth/socket/ng_btsocket_hci_raw.c#2 delete .. //depot/projects/mips/sys/bluetooth/socket/ng_btsocket_l2cap.c#2 delete .. //depot/projects/mips/sys/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 delete .. //depot/projects/mips/sys/conf/files#9 integrate .. //depot/projects/mips/sys/conf/majors#5 integrate .. //depot/projects/mips/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/mips/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/mips/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/mips/sys/dev/firewire/firewirereg.h#2 integrate .. //depot/projects/mips/sys/dev/firewire/fwdev.c#1 branch .. //depot/projects/mips/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/mips/sys/dev/firewire/fwmem.h#2 integrate .. //depot/projects/mips/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/mips/sys/dev/firewire/fwohci_pci.c#4 integrate .. //depot/projects/mips/sys/kern/kern_mac.c#8 integrate .. //depot/projects/mips/sys/kern/subr_witness.c#5 integrate .. //depot/projects/mips/sys/modules/firewire/firewire/Makefile#3 integrate .. //depot/projects/mips/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/mips/sys/security/mac_biba/mac_biba.c#6 integrate .. //depot/projects/mips/sys/security/mac_mls/mac_mls.c#6 integrate .. //depot/projects/mips/sys/security/mac_none/mac_none.c#6 integrate .. //depot/projects/mips/sys/security/mac_test/mac_test.c#6 integrate .. //depot/projects/mips/sys/sys/mac.h#5 integrate .. //depot/projects/mips/sys/sys/mac_policy.h#6 integrate .. //depot/projects/mips/usr.bin/bluetooth/Makefile#2 delete .. //depot/projects/mips/usr.bin/bluetooth/btsockstat/Makefile#2 delete .. //depot/projects/mips/usr.bin/bluetooth/btsockstat/btsockstat.1#2 delete .. //depot/projects/mips/usr.bin/bluetooth/btsockstat/btsockstat.c#2 delete .. //depot/projects/mips/usr.bin/fetch/fetch.c#3 integrate .. //depot/projects/mips/usr.sbin/bluetooth/Makefile#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/Makefile#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/hccontrol.8#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/hccontrol.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/hccontrol.h#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/info.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/link_control.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/link_policy.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/node.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/send_recv.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/status.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hccontrol/util.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hcseriald/Makefile#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hcseriald/hcseriald.8#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/hcseriald/hcseriald.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2control/Makefile#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2control/l2cap.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2control/l2control.8#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2control/l2control.c#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2control/l2control.h#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2ping/Makefile#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2ping/l2ping.8#2 delete .. //depot/projects/mips/usr.sbin/bluetooth/l2ping/l2ping.c#2 delete .. //depot/projects/mips/usr.sbin/sysinstall/label.c#4 integrate Differences ... ==== //depot/projects/mips/MAINTAINERS#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.51 2002/11/10 16:23:31 mjacob Exp $ +$FreeBSD: src/MAINTAINERS,v 1.52 2002/11/11 16:56:40 mjacob Exp $ subsystem login notes ----------------------------- @@ -45,7 +45,6 @@ ch(4) ken Pre-commit review requested. isp(4) mjacob Pre-commit review requested. mpt(4) mjacob Pre-commit review requested. -sa(4) mjacob Pre-commit review requested. tdfx(4) cokane Just keep me informed of changes, try not to break it. sendmail gshapiro Pre-commit review requested. etc/mail gshapiro Pre-commit review requested. ==== //depot/projects/mips/bin/echo/echo.c#2 (text+ko) ==== @@ -43,10 +43,9 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.13 2002/06/30 05:13:53 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/echo/echo.c,v 1.14 2002/11/13 01:39:02 njl Exp $"); -#include -#include +#include #include /* ARGSUSED */ @@ -64,6 +63,9 @@ nflag = 0; while (argv[0] != NULL) { + size_t len; + + len = strlen(argv[0]); /* * If the next argument is NULL then this is this @@ -71,23 +73,20 @@ * for a trailing \c. */ if (argv[1] == NULL) { - size_t len; - - len = strlen(argv[0]); /* is there room for a '\c' and is there one? */ if (len >= 2 && argv[0][len - 2] == '\\' && argv[0][len - 1] == 'c') { /* chop it and set the no-newline flag. */ - argv[0][len - 2] = '\0'; + len -= 2; nflag = 1; } } - (void)printf("%s", argv[0]); + write(STDOUT_FILENO, argv[0], len); if (*++argv) - putchar(' '); + write(STDOUT_FILENO, " ", 1); } if (!nflag) - putchar('\n'); + write(STDOUT_FILENO, "\n", 1); return 0; } ==== //depot/projects/mips/contrib/lukemftpd/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,14 @@ +Thu May 23 02:43:41 UTC 2002 lukem + + * released 1.2 beta 2 + + * replace fnmatch(3) if FNM_CASEFOLD isn't available + +Sat Mar 16 01:28:28 UTC 2002 lukem + + * libukem/glob.c: Fix two problems in the KNR->ANSI conversion + noticed by Yuji Yamano + Thu Mar 14 06:02:31 UTC 2002 lukem * released 1.2 beta 1 ==== //depot/projects/mips/contrib/lukemftpd/acconfig.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $Id: acconfig.h,v 1.9 2001/04/28 07:11:06 lukem Exp $ */ +/* $Id: acconfig.h,v 1.10 2002/05/23 02:42:55 lukem Exp $ */ @TOP@ @BOTTOM@ @@ -48,6 +48,9 @@ /* Define if fclose() is declared in */ #undef HAVE_FCLOSE_D +/* Define if FNM_CASEFOLD is declared in */ +#undef HAVE_FNM_CASEFOLD + /* Define if optarg is declared in or */ #undef HAVE_OPTARG_D ==== //depot/projects/mips/contrib/lukemftpd/config.h.in#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* config.h.in. Generated automatically from configure.in by autoheader. */ -/* $Id: config.h.in,v 1.15 2001/04/28 07:11:46 lukem Exp $ */ +/* $Id: config.h.in,v 1.16 2002/05/23 02:42:55 lukem Exp $ */ /* Define if the closedir function returns void instead of int. */ @@ -221,6 +221,9 @@ /* Define if fclose() is declared in */ #undef HAVE_FCLOSE_D +/* Define if FNM_CASEFOLD is declared in */ +#undef HAVE_FNM_CASEFOLD + /* Define if optarg is declared in or */ #undef HAVE_OPTARG_D ==== //depot/projects/mips/contrib/lukemftpd/configure#2 (text+ko) ==== @@ -3181,14 +3181,55 @@ + echo $ac_n "checking for FNM_CASEFOLD""... $ac_c" 1>&6 +echo "configure:3186: checking for FNM_CASEFOLD" >&5 +if eval "test \"`echo '$''{'ftp_cv_HAVE_FNM_CASEFOLD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < +int main() { + int X = FNM_CASEFOLD ; +; return 0; } +EOF +if { (eval echo configure:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ftp_cv_HAVE_FNM_CASEFOLD=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ftp_cv_HAVE_FNM_CASEFOLD=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ftp_cv_HAVE_FNM_CASEFOLD" 1>&6 + if test "x$ftp_cv_HAVE_FNM_CASEFOLD" = "xyes"; then + cat >> confdefs.h <<\EOF +#define HAVE_FNM_CASEFOLD 1 +EOF + + else + LIBOBJS="$LIBOBJS fnmatch.o" + : + fi + + + echo $ac_n "checking for optarg declaration""... $ac_c" 1>&6 -echo "configure:3186: checking for optarg declaration" >&5 +echo "configure:3227: checking for optarg declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTARG_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3197,7 +3238,7 @@ char *X = optarg ; ; return 0; } EOF -if { (eval echo configure:3201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_OPTARG_D=yes else @@ -3224,13 +3265,13 @@ echo $ac_n "checking for optind declaration""... $ac_c" 1>&6 -echo "configure:3228: checking for optind declaration" >&5 +echo "configure:3269: checking for optind declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTIND_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3239,7 +3280,7 @@ int X = optind ; ; return 0; } EOF -if { (eval echo configure:3243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_OPTIND_D=yes else @@ -3266,13 +3307,13 @@ echo $ac_n "checking for optreset""... $ac_c" 1>&6 -echo "configure:3270: checking for optreset" >&5 +echo "configure:3311: checking for optreset" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_OPTRESET'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3281,7 +3322,7 @@ int X = optreset ; ; return 0; } EOF -if { (eval echo configure:3285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ftp_cv_HAVE_OPTRESET=yes else @@ -3308,13 +3349,13 @@ echo $ac_n "checking for pclose() declaration""... $ac_c" 1>&6 -echo "configure:3312: checking for pclose() declaration" >&5 +echo "configure:3353: checking for pclose() declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_PCLOSE_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3322,7 +3363,7 @@ int (*X)() = pclose ; ; return 0; } EOF -if { (eval echo configure:3326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_PCLOSE_D=yes else @@ -3350,13 +3391,13 @@ if test $ac_cv_func_getusershell = yes; then echo $ac_n "checking for getusershell() declaration""... $ac_c" 1>&6 -echo "configure:3354: checking for getusershell() declaration" >&5 +echo "configure:3395: checking for getusershell() declaration" >&5 if eval "test \"`echo '$''{'ftp_cv_HAVE_GETUSERSHELL_D'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3364,7 +3405,7 @@ char *(*X)() = getusershell ; ; return 0; } EOF -if { (eval echo configure:3368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_HAVE_GETUSERSHELL_D=yes else @@ -3395,13 +3436,13 @@ echo $ac_n "checking *printf() support for %lld""... $ac_c" 1>&6 -echo "configure:3399: checking *printf() support for %lld" >&5 +echo "configure:3440: checking *printf() support for %lld" >&5 can_printf_longlong=no if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < @@ -3412,7 +3453,7 @@ } EOF -if { (eval echo configure:3416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 @@ -3432,12 +3473,12 @@ if test $can_printf_longlong != yes; then echo $ac_n "checking *printf() support for %qd""... $ac_c" 1>&6 -echo "configure:3436: checking *printf() support for %qd" >&5 +echo "configure:3477: checking *printf() support for %qd" >&5 if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < @@ -3448,7 +3489,7 @@ } EOF -if { (eval echo configure:3452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 @@ -3479,12 +3520,12 @@ for ac_func in strtoll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3483: checking for $ac_func" >&5 +echo "configure:3524: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3542,13 +3583,13 @@ if test $ac_cv_func_getaddrinfo = yes -a ! -n "$socks"; then echo $ac_n "checking for AI_NUMERICHOST""... $ac_c" 1>&6 -echo "configure:3546: checking for AI_NUMERICHOST" >&5 +echo "configure:3587: checking for AI_NUMERICHOST" >&5 if eval "test \"`echo '$''{'ftp_cv_have_ai_numerichost'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3558,7 +3599,7 @@ int X = AI_NUMERICHOST ; ; return 0; } EOF -if { (eval echo configure:3562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_have_ai_numerichost=yes else @@ -3581,7 +3622,7 @@ fi echo $ac_n "checking for working getaddrinfo()""... $ac_c" 1>&6 -echo "configure:3585: checking for working getaddrinfo()" >&5 +echo "configure:3626: checking for working getaddrinfo()" >&5 if test $have_rfc2553_netdb = yes; then cat >> confdefs.h <<\EOF #define HAVE_RFC2553_NETDB 1 @@ -3600,13 +3641,13 @@ if test $ac_cv_func_sl_init = yes; then echo $ac_n "checking if sl_add() returns int""... $ac_c" 1>&6 -echo "configure:3604: checking if sl_add() returns int" >&5 +echo "configure:3645: checking if sl_add() returns int" >&5 if eval "test \"`echo '$''{'ftp_cv_INT_SL_ADD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3614,7 +3655,7 @@ int f = sl_add((StringList *)0, "foo") ; ; return 0; } EOF -if { (eval echo configure:3618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ftp_cv_INT_SL_ADD=yes else @@ -3643,12 +3684,12 @@ for ac_func in fts_open strmode user_from_uid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3647: checking for $ac_func" >&5 +echo "configure:3688: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else ==== //depot/projects/mips/contrib/lukemftpd/configure.in#2 (text+ko) ==== @@ -1,10 +1,10 @@ -dnl $Id: configure.in,v 1.17 2001/12/01 02:00:48 lukem Exp $ +dnl $Id: configure.in,v 1.18 2002/05/23 02:42:55 lukem Exp $ dnl dnl configure.in -- dnl process this file with autoconf to produce a configure script. dnl -AC_REVISION($Revision: 1.17 $)dnl +AC_REVISION($Revision: 1.18 $)dnl AC_INIT(lukemftpd.h) @@ -166,6 +166,11 @@ AC_MSG_TRY_COMPILE(for fclose() declaration, ftp_cv_HAVE_FCLOSE_D, [ #include ], [ int (*X)() = fclose ], [AC_DEFINE(HAVE_FCLOSE_D, 1)]) +AC_MSG_TRY_COMPILE(for FNM_CASEFOLD, ftp_cv_HAVE_FNM_CASEFOLD, [ +#include ], [ int X = FNM_CASEFOLD ], +[AC_DEFINE(HAVE_FNM_CASEFOLD, 1)], +[LIBOBJS="$LIBOBJS fnmatch.o"]) + AC_MSG_TRY_COMPILE(for optarg declaration, ftp_cv_HAVE_OPTARG_D, [ #include #include ], [ char *X = optarg ], [AC_DEFINE(HAVE_OPTARG_D, 1)]) ==== //depot/projects/mips/contrib/lukemftpd/lukemftpd.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ -/* $Id: lukemftpd.h,v 1.18 2002/03/14 06:02:24 lukem Exp $ */ +/* $Id: lukemftpd.h,v 1.20 2002/05/23 02:43:58 lukem Exp $ */ -#define FTPD_VERSION "lukemftpd 1.2 beta 1" +#define FTPD_VERSION "lukemftpd 1.2 beta 2" #include "config.h" @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -82,6 +81,12 @@ # include "ftpglob.h" #endif +#if HAVE_FNM_CASEFOLD +# include +#else +# include "ftpfnmatch.h" +#endif + #if HAVE_PATHS_H # include #endif ==== //depot/projects/mips/contrib/lukemftpd/todo#2 (text+ko) ==== @@ -4,7 +4,6 @@ is not available? - IF_NAMESIZE not available on darwin - inet_net_pton() ipv6 support - - FNM_CASEFOLD for fnmatch(3) support lfcompile(5) (large files) on solaris ==== //depot/projects/mips/contrib/one-true-awk/FREEBSD-upgrade#2 (text+ko) ==== @@ -21,4 +21,4 @@ The vendor import was done by: - cvs import src/contrib/one-true-awk BELL_LABS bwk_20020218 + cvs import src/contrib/one-true-awk BELL_LABS bwk_20020101 ==== //depot/projects/mips/etc/defaults/rc.conf#4 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.161 2002/11/10 09:13:31 imp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.162 2002/11/12 07:10:45 imp Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -26,7 +26,7 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). -devd_enable="YES" # Run devd, to trigger progams on device tree changes. +devd_enable="NO" # Run devd, to trigger progams on device tree changes. pccard_enable="NO" # Set to YES if you want to configure PCCARD devices. pccard_mem="DEFAULT" # If pccard_enable=YES, this is card memory address. pccard_beep="2" # pccard beep type. ==== //depot/projects/mips/etc/inetd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/inetd.conf,v 1.60 2002/10/29 08:41:12 obrien Exp $ +# $FreeBSD: src/etc/inetd.conf,v 1.61 2002/11/12 17:31:11 obrien Exp $ # # Internet server configuration database # @@ -6,12 +6,6 @@ # To disable a service, comment it out by prefixing the line with '#'. # To enable a service, remove the '#' at the beginning of the line. # -# WARNING: lukemftpd does not utilize PAM, MAC, per-class nologin files, -# or any login.conf resource limits or features. Use this ftpd only if this -# is appropriate for your environment. If you require these features, use -# the alternate FreeBSD ftpd below. -#ftp stream tcp nowait root /usr/libexec/lukemftpd ftpd -l -r -# #ftp stream tcp nowait root /usr/libexec/ftpd ftpd -l #ftp stream tcp6 nowait root /usr/libexec/ftpd ftpd -l #telnet stream tcp nowait root /usr/libexec/telnetd telnetd ==== //depot/projects/mips/include/unistd.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.63 2002/10/28 00:15:43 wollman Exp $ + * $FreeBSD: src/include/unistd.h,v 1.64 2002/11/12 14:41:49 mike Exp $ */ #ifndef _UNISTD_H_ @@ -361,7 +361,7 @@ ssize_t write(int, const void *, size_t); /* 1003.2-1992 */ -#if __POSIX_VISIBLE >= 199209 +#if __POSIX_VISIBLE >= 199209 || __XSI_VISIBLE size_t confstr(int, char *, size_t); int getopt(int, char * const [], const char *); @@ -370,7 +370,7 @@ #endif /* ISO/IEC 9945-1: 1996 */ -#if __POSIX_VISIBLE >= 199506 +#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE int fsync(int); /* @@ -381,13 +381,18 @@ #define _FTRUNCATE_DECLARED int ftruncate(int, off_t); #endif +#endif +#if __POSIX_VISIBLE >= 199506 int getlogin_r(char *, int); #endif /* 1003.1-2001 */ +#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE +int fchown(int, uid_t, gid_t); +int readlink(const char *, char *, int); +#endif #if __POSIX_VISIBLE >= 200112 -int fchown(int, uid_t, gid_t); int gethostname(char *, int /* socklen_t */); int setegid(gid_t); int seteuid(uid_t); @@ -408,6 +413,7 @@ /* char *ctermid(char *); */ /* XXX ??? */ int encrypt(char *, int); int fchdir(int); +long gethostid(void); int getpgid(pid_t _pid); int getsid(pid_t _pid); char *getwd(char *); /* LEGACY: obsoleted by getcwd() */ @@ -432,13 +438,20 @@ #endif #endif /* __XSI_VISIBLE */ +#if __XSI_VISIBLE <= 500 || __BSD_VISIBLE +int brk(const void *); +int chroot(const char *); +int getdtablesize(void); +int getpagesize(void) __pure2; +char *getpass(const char *); +void *sbrk(intptr_t); +#endif + #if __BSD_VISIBLE struct timeval; /* select(2) */ int acct(const char *); int async_daemon(void); -int brk(const void *); int check_utility_compat(const char *); -int chroot(const char *); const char * crypt_get_format(void); int crypt_set_format(const char *); @@ -448,12 +461,8 @@ int exect(const char *, char * const *, char * const *); char *fflagstostr(u_long); int getdomainname(char *, int); -int getdtablesize(void); int getgrouplist(const char *, gid_t, gid_t *, int *); -long gethostid(void); mode_t getmode(const void *, mode_t); -int getpagesize(void) __pure2; -char *getpass(const char *); int getpeereid(int, uid_t *, gid_t *); int getresgid(gid_t *, gid_t *, gid_t *); int getresuid(uid_t *, uid_t *, uid_t *); @@ -483,7 +492,6 @@ const char *, const char *, const char *); char *re_comp(const char *); int re_exec(const char *); -int readlink(const char *, char *, int); int reboot(int); int revoke(const char *); pid_t rfork(int); @@ -491,7 +499,6 @@ int rresvport(int *); int rresvport_af(int *, int); int ruserok(const char *, int, const char *, const char *); -void *sbrk(intptr_t); #if __BSD_VISIBLE #ifndef _SELECT_DECLARED #define _SELECT_DECLARED ==== //depot/projects/mips/lib/libc_r/uthread/uthread_writev.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/uthread/uthread_writev.c,v 1.20 2002/08/29 23:06:07 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_writev.c,v 1.21 2002/11/12 19:01:49 archie Exp $ * */ #include @@ -174,20 +174,35 @@ * interrupted by a signal */ if (curthread->interrupted) { - /* Return an error: */ - ret = -1; + if (num > 0) { + /* Return partial success: */ + ret = num; + } else { + /* Return an error: */ + errno = EINTR; + ret = -1; + } } /* - * If performing a non-blocking write or if an - * error occurred, just return whatever the write - * syscall did: + * If performing a non-blocking write, + * just return whatever the write syscall did: */ - } else if (!blocking || n < 0) { + } else if (!blocking) { /* A non-blocking call might return zero: */ ret = n; break; + /* + * If there was an error, return partial success + * (if any bytes were written) or else the error: + */ + } else if (n < 0) { + if (num > 0) + ret = num; + else + ret = n; + /* Check if the write has completed: */ } else if (idx == iovcnt) /* Return the number of bytes written: */ ==== //depot/projects/mips/lib/libdisk/libdisk.3#3 (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. .\" -.\" $FreeBSD: src/lib/libdisk/libdisk.3,v 1.27 2002/10/22 09:13:02 phk Exp $ +.\" $FreeBSD: src/lib/libdisk/libdisk.3,v 1.28 2002/11/11 19:37:19 davidc Exp $ .\" " .Dd March 15, 1996 .Dt LIBDISK 3 @@ -55,7 +55,7 @@ .Nm MakeDev , .Nm MakeDevDisk , .Nm ShowChunkFlags , -.Nm chunk_n , +.Nm chunk_name , .Nm slice_type_name .Nd library interface to slice and partition labels .Sh LIBRARY @@ -64,9 +64,6 @@ .In sys/types.h .In libdisk.h .Pp -.Vt extern const char *chunk_n[] ; -.Ft const char * -.Fn slice_type_name "int type" "int subtype" .Ft struct disk * .Fn Open_Disk "const char *devname" .Ft void @@ -115,6 +112,10 @@ .Fn MakeDevDisk "struct disk *d" "const char *path" .Ft char * .Fn ShowChunkFlags "struct chunk *c" +.Ft const char * +.Fn chunk_name "chunk_e type" +.Ft const char * +.Fn slice_type_name "int type" "int subtype" .Sh DESCRIPTION .Nm Libdisk provides an interface to the low-level disk slice and partition labels. @@ -303,7 +304,11 @@ .Fn ShowChunkFlags returns a string to show flags. .Pp -Chunk name strings can be accessed directly using the external array +The +.Fn chunk_name +function takes the enumerated chunk type and returns its name. +.Fn chunk_name +replaces the old external array .Va chunk_n . .Pp .Fn slice_type_name ==== //depot/projects/mips/lib/libdisk/libdisk.h#5 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * -* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.50 2002/11/10 20:49:28 marcel Exp $ +* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.51 2002/11/11 18:55:57 davidc Exp $ * */ @@ -147,70 +147,69 @@ #define DELCHUNK_RECOVER 0x0001 -const char *chunk_name(chunk_e type); +const char *chunk_name(chunk_e); const char * -slice_type_name( int type, int subtype ); +slice_type_name(int, int); /* "chunk_n" for subtypes too */ struct disk * -Open_Disk(const char *devname); +Open_Disk(const char *); /* Will open the named disk, and return populated tree. */ void -Free_Disk(struct disk *disk); +Free_Disk(struct disk *); /* Free a tree made with Open_Disk() or Clone_Disk() */ void -Debug_Disk(struct disk *disk); +Debug_Disk(struct disk *); /* Print the content of the tree to stdout */ void -Set_Bios_Geom(struct disk *disk, u_long cyl, u_long heads, u_long sects); +Set_Bios_Geom(struct disk *, u_long, u_long, u_long); /* Set the geometry the bios uses. */ void >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 13 15:52:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E44837B404; Wed, 13 Nov 2002 15:52:36 -0800 (PST) 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 1345337B401; Wed, 13 Nov 2002 15:52:36 -0800 (PST) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59AB443E75; Wed, 13 Nov 2002 15:52:35 -0800 (PST) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.4/8.12.4) with SMTP id gADNpvOo043474; Wed, 13 Nov 2002 18:51:58 -0500 (EST) (envelope-from robert@fledge.watson.org) Date: Wed, 13 Nov 2002 18:51:57 -0500 (EST) From: Robert Watson X-Sender: robert@fledge.watson.org To: Peter Wemm Cc: Perforce Change Reviews Subject: Re: PERFORCE change 21049 for review In-Reply-To: <200211132230.gADMU6wa075082@repoman.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Drehmel has a personal branch in Perforce somewhere that implements the portable APIs to utmp and wtmp, and pushes utmp into the kernel for management. Dig around and you'll probably find it. I was hoping to get the utmp stuff into the main tree for 5.0, but didn't find time to do reviews and the like. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories On Wed, 13 Nov 2002, Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=21049 > > Change 21049 by peter@peter_daintree on 2002/11/13 14:29:17 > > less unportable. The whole utmp/wtmp thing needs a proper API > anyway. > > Affected files ... > > .. //depot/projects/ia64/usr.sbin/ppp/physical.c#9 edit > .. //depot/projects/ia64/usr.sbin/pppd/auth.c#4 edit > > Differences ... > > ==== //depot/projects/ia64/usr.sbin/ppp/physical.c#9 (text+ko) ==== > > @@ -45,11 +45,6 @@ > #else > #include > #endif > -#if defined(__FreeBSD__) > -#include > -#else > -#define _time_to_time32(t) (t) > -#endif > > #include "layer.h" > #ifndef NONAT > @@ -921,7 +916,7 @@ > char *colon; > > memset(&ut, 0, sizeof ut); > - ut.ut_time = _time_to_time32(time(NULL)); > + ut.ut_time = time(NULL); > strncpy(ut.ut_name, name, sizeof ut.ut_name); > if (p->handler && (p->handler->type == TCP_DEVICE || > p->handler->type == UDP_DEVICE)) { > > ==== //depot/projects/ia64/usr.sbin/pppd/auth.c#4 (text+ko) ==== > > @@ -49,7 +49,6 @@ > #include > #include > #include > -#include > #if defined(_PATH_LASTLOG) && defined(_linux_) > #include > #endif > @@ -996,7 +995,7 @@ > #endif > > memset((void *)&utmp, 0, sizeof(utmp)); > - utmp.ut_time = _time_to_time32(time(NULL)); > + utmp.ut_time = time(NULL); > (void)strncpy(utmp.ut_name, user, sizeof(utmp.ut_name)); > (void)strncpy(utmp.ut_host, ":PPP", sizeof(utmp.ut_host)); > (void)strncpy(utmp.ut_line, tty, sizeof(utmp.ut_line)); > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 14 7:11: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49CC437B404; Thu, 14 Nov 2002 07:10:57 -0800 (PST) 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 DD4C837B401 for ; Thu, 14 Nov 2002 07:10:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7FD5F43E4A for ; Thu, 14 Nov 2002 07:10:56 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAEF8OmV059266 for ; Thu, 14 Nov 2002 07:08:24 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAEF8NwR059262 for perforce@freebsd.org; Thu, 14 Nov 2002 07:08:23 -0800 (PST) Date: Thu, 14 Nov 2002 07:08:23 -0800 (PST) Message-Id: <200211141508.gAEF8NwR059262@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21054 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21054 Change 21054 by green@green_laptop_2 on 2002/11/14 07:07:48 * Fix a botch in setfsmac(8) that caused SEBSD's <> labels to correctly notice them again. * Add a setfmac(8) mode which implements setfmac(8) in terms of setfsmac(8). This involves adding a flag to specify that a given entry always matches and passing around information on the -h flag/basename(argv[0]) of "setfmac". Affected files ... .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#5 (text+ko) ==== @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -22,6 +23,7 @@ char *mactext; /* MAC label to apply */ int flags; /* miscellaneous flags */ #define F_DONTLABEL 0x01 +#define F_ALWAYSMATCH 0x02 } *entries, /* entries[0..nentries] */ *match; /* cached decision for MAC label to apply */ size_t nentries; /* size of entries list */ @@ -32,11 +34,13 @@ STAILQ_HEAD(label_specs_head, label_spec) head; }; -void usage(void) __dead2; +void usage(int) __dead2; struct label_specs *new_specs(void); void add_specs(struct label_specs *, const char *, int); +void add_setfmac_specs(struct label_specs *, char *); void add_spec_line(const char *, int, struct label_spec_entry *, char *); -int apply_specs(struct label_specs *, FTSENT *, int); +int apply_specs(struct label_specs *, FTSENT *, int, int); +int specs_empty(struct label_specs *); int main(int argc, char **argv) @@ -44,11 +48,17 @@ FTSENT *ftsent; FTS *fts; struct label_specs *specs; - int eflag = 0, xflag = 0, vflag = 0; - int ch; + int eflag = 0, xflag = 0, vflag = 0, hflag; + int ch, is_setfmac; + char *bn; + bn = basename(argv[0]); + if (bn == NULL) + err(1, "basename"); + is_setfmac = strcmp(bn, "setfmac") == 0; + hflag = is_setfmac ? FTS_LOGICAL : FTS_PHYSICAL; specs = new_specs(); - while ((ch = getopt(argc, argv, "ef:s:vx")) != -1) { + while ((ch = getopt(argc, argv, is_setfmac ? "h" : "ef:s:vx")) != -1) { switch (ch) { case 'e': eflag = 1; @@ -56,6 +66,9 @@ case 'f': add_specs(specs, optarg, 0); break; + case 'h': + hflag = FTS_PHYSICAL; + break; case 's': add_specs(specs, optarg, 1); break; @@ -66,15 +79,23 @@ xflag = FTS_XDEV; break; default: - usage(); + usage(is_setfmac); } } argc -= optind; argv += optind; - if (argc == 0) - usage(); - fts = fts_open(argv, FTS_PHYSICAL | xflag, NULL); + if (is_setfmac) { + if (argc <= 1) + usage(is_setfmac); + add_setfmac_specs(specs, *argv); + argc--; + argv++; + } else { + if (argc == 0 || specs_empty(specs)) + usage(is_setfmac); + } + fts = fts_open(argv, hflag | xflag, NULL); if (fts == NULL) err(1, "cannot traverse filesystem%s", argc ? "s" : ""); while ((ftsent = fts_read(fts)) != NULL) { @@ -83,11 +104,14 @@ break; case FTS_D: /* do pre-order */ case FTS_DC: /* do cyclic? */ + /* don't ever recurse directories as setfmac(8) */ + if (is_setfmac) + fts_set(fts, ftsent, FTS_SKIP); case FTS_DEFAULT: /* do default */ case FTS_F: /* do regular */ case FTS_SL: /* do symlink */ case FTS_W: /* do whiteout */ - if (apply_specs(specs, ftsent, vflag)) { + if (apply_specs(specs, ftsent, hflag, vflag)) { if (eflag) { errx(1, "labeling not supported in " "%.*s", ftsent->fts_pathlen, @@ -114,10 +138,13 @@ } void -usage(void) +usage(int is_setfmac) { - fprintf(stderr, "usage: setfsmac [-evx] [-f specfile [...]] [-s specfile [...]] path ...\n"); + if (is_setfmac) + fprintf(stderr, "usage: setfmac [-h] label path ...\n"); + else + fprintf(stderr, "usage: setfsmac [-evx] [-f specfile [...]] [-s specfile [...]] path ...\n"); exit(1); } @@ -209,6 +236,24 @@ } void +add_setfmac_specs(struct label_specs *specs, char *label) +{ + struct label_spec *spec; + + spec = malloc(sizeof(*spec)); + if (spec == NULL) + err(1, "malloc"); + spec->nentries = 1; + spec->entries = calloc(spec->nentries, sizeof(*spec->entries)); + if (spec->entries == NULL) + err(1, "malloc"); + /* The _only_ thing specified here is the mactext! */ + spec->entries->mactext = label; + spec->entries->flags |= F_ALWAYSMATCH; + STAILQ_INSERT_TAIL(&specs->head, spec, link); +} + +void add_spec_line(const char *file, int is_sebsd, struct label_spec_entry *entry, char *line) { @@ -249,7 +294,7 @@ } else { if (asprintf(&entry->mactext, "sebsd/%s", macstr) == -1) err(1, "asprintf"); - if (strcmp(entry->mactext, "<>") == 0) + if (strcmp(macstr, "<>") == 0) entry->flags |= F_DONTLABEL; } if (modestr != NULL) { @@ -293,7 +338,14 @@ } int -apply_specs(struct label_specs *specs, FTSENT *ftsent, int vflag) +specs_empty(struct label_specs *specs) +{ + + return (STAILQ_EMPTY(&specs->head)); +} + +int +apply_specs(struct label_specs *specs, FTSENT *ftsent, int hflag, int vflag) { regmatch_t pmatch; struct label_spec *ls; @@ -312,6 +364,8 @@ STAILQ_FOREACH(ls, &specs->head, link) { for (ls->match = NULL, ent = ls->entries; ent < &ls->entries[ls->nentries]; ent++) { + if (ent->flags & F_ALWAYSMATCH) + goto matched; if (ent->mode != 0 && (ftsent->fts_statp->st_mode & S_IFMT) != ent->mode) continue; @@ -323,7 +377,6 @@ case REG_NOMATCH: continue; case 0: - ls->match = ent; break; default: size = regerror(error, &ent->regex, NULL, 0); @@ -334,6 +387,8 @@ size); errx(1, "%s: %s", ent->regexstr, regerrorstr); } + matched: + ls->match = ent; if (vflag) { if (matchedby == 0) { printf("%.*s matched by ", @@ -372,7 +427,8 @@ } if (mac_from_text(&mac, macstr)) err(1, "mac_from_text(%s)", macstr); - if (mac_set_link(ftsent->fts_accpath, mac) != 0) { + if ((hflag == FTS_PHYSICAL ? mac_set_link(ftsent->fts_accpath, mac) : + mac_set_file(ftsent->fts_accpath, mac)) != 0) { if (errno == EOPNOTSUPP) { mac_free(mac); free(macstr); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 14 8: 0: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0775B37B404; Thu, 14 Nov 2002 07:59:57 -0800 (PST) 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 9538F37B401 for ; Thu, 14 Nov 2002 07:59:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 215AD43E75 for ; Thu, 14 Nov 2002 07:59:56 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAEFvNmV063439 for ; Thu, 14 Nov 2002 07:57:23 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAEFvNkg063436 for perforce@freebsd.org; Thu, 14 Nov 2002 07:57:23 -0800 (PST) Date: Thu, 14 Nov 2002 07:57:23 -0800 (PST) Message-Id: <200211141557.gAEFvNkg063436@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21055 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21055 Change 21055 by green@green_laptop_2 on 2002/11/14 07:56:59 Replace setfmac(8) with setfsmac(8)'s compatibility mode. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/setfsmac/Makefile#2 edit .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfmac.8#1 branch .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#6 edit .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#21 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ # $FreeBSD$ PROG= setfsmac -MAN= +LINKS= ${BINDIR}/${PROG} ${BINDIR}/setfmac +MAN= setfmac.8 .include ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#6 (text+ko) ==== @@ -1,3 +1,41 @@ +/*- + * Copyright (c) 2002 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by NAI Labs, the + * Security Research Division of Network Associates, Inc. under + * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA + * CHATS research program. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 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. + * + * $FreeBSD$ + */ + +#include +#include #include #include #include ==== //depot/projects/trustedbsd/mac/usr.sbin/Makefile#21 (text+ko) ==== @@ -95,7 +95,6 @@ rtsold \ rwhod \ sa \ - setfmac \ setkey \ setpmac \ sliplogin \ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 14 9:52:14 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E33337B404; Thu, 14 Nov 2002 09:52:12 -0800 (PST) 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 05E8F37B401 for ; Thu, 14 Nov 2002 09:52:12 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A55FC43E75 for ; Thu, 14 Nov 2002 09:52:11 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAEHncmV073416 for ; Thu, 14 Nov 2002 09:49:38 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAEHnclj073413 for perforce@freebsd.org; Thu, 14 Nov 2002 09:49:38 -0800 (PST) Date: Thu, 14 Nov 2002 09:49:38 -0800 (PST) Message-Id: <200211141749.gAEHnclj073413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21056 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21056 Change 21056 by green@green_laptop_2 on 2002/11/14 09:49:00 Install an example LOMAC policy. Affected files ... .. //depot/projects/trustedbsd/mac/share/security/Makefile#2 edit .. //depot/projects/trustedbsd/mac/share/security/lomac-policy.contexts#1 add Differences ... ==== //depot/projects/trustedbsd/mac/share/security/Makefile#2 (text+ko) ==== @@ -1,5 +1,9 @@ # $FreeBSD$ +FILES= lomac-policy.contexts +NOOBJ= noobj +FILESDIR= ${BINDIR}/security + SUBDIR= sebsd -.include +.include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 14 22:28:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 143D437B401; Thu, 14 Nov 2002 22:27:53 -0800 (PST) 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 97B5E37B404 for ; Thu, 14 Nov 2002 22:27:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33A5743E77 for ; Thu, 14 Nov 2002 22:27:51 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAF6PFmV038784 for ; Thu, 14 Nov 2002 22:25:15 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAF6PDmH038771 for perforce@freebsd.org; Thu, 14 Nov 2002 22:25:13 -0800 (PST) Date: Thu, 14 Nov 2002 22:25:13 -0800 (PST) Message-Id: <200211150625.gAF6PDmH038771@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 Subject: PERFORCE change 21063 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21063 Change 21063 by rwatson@rwatson_tislabs on 2002/11/14 22:24:46 Integ TrustedBSD base from FreeBSD vendor branch now the P4 importer is re-enabled. BIND fix, MAC condition variable loopback, Sam's recent interface changes. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#29 integrate .. //depot/projects/trustedbsd/base/bin/sleep/sleep.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/CHANGES#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_defs.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_sec.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_defs.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_ncache.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_req.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_resp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_name.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_samedomain.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libiberty/Makefile#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/auto-host.h#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libasn1/Makefile#5 integrate .. //depot/projects/trustedbsd/base/kerberos5/lib/libhdb/Makefile#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/_pthread_stubs.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/syslog.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/gen/_setjmp.S#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/libc_private.h#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/namespace.h#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdio/findfp.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/strtod.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/pthread_private.h#11 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_attr_init.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_autoinit.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_cond.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_condattr_init.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_create.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_execve.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_exit.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_gc.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_init.c#7 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_join.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_mattr_init.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_mutex.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_mutex_prioceiling.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_once.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_pselect.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_rwlock.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_sem.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_sig.c#6 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_stack.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/chunk.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/disk.c#18 integrate .. //depot/projects/trustedbsd/base/lib/libncurses/Makefile#9 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_krb5/pam_krb5.c#7 integrate .. //depot/projects/trustedbsd/base/release/alpha/drivers.conf#10 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#3 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#12 integrate .. //depot/projects/trustedbsd/base/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#2 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#52 integrate .. //depot/projects/trustedbsd/base/release/doc/share/examples/Makefile.relnotesng#6 integrate .. //depot/projects/trustedbsd/base/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#11 integrate .. //depot/projects/trustedbsd/base/sbin/devd/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.8#15 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifconfig.c#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vlan.4#6 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.sys.mk#7 integrate .. //depot/projects/trustedbsd/base/sys/alpha/alpha/pmap.c#21 integrate .. //depot/projects/trustedbsd/base/sys/alpha/conf/GENERIC.hints#3 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/help.common#4 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/loader.8#13 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_periph.c#4 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_low.c#6 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/trustedbsd/base/sys/conf/options#27 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic/aic_pccard.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an_isa.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/awi/awi.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/awi/if_awi_pccard.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/cardbus/cardbus_cis.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/cnw/if_cnw.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ed/if_ed_pccard.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ep/if_ep_pccard.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/fe/if_fe.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/fe/if_fe_pccard.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/fxp/if_fxp.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/gem/if_gem.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/gx/if_gx.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/gx/if_gxvar.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/hme/if_hme.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ie/if_ie.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/iicbus/if_ic.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lge.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc_cbus.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc_isa.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/mly/mly.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/my/if_my.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_ngereg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard_cis.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccarddevs.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccardvar.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci.c#16 integrate .. //depot/projects/trustedbsd/base/sys/dev/pci/pci_pci.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/pdq/pdq_ifsubr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sbni/if_sbni.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/sn/if_sn.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sr/if_sr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/trm/trm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/tx/if_tx.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/txp/if_txp.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_aue.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_auereg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_cuereg.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_kue.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_kuereg.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usb_ethersubr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/vx/if_vx.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/wi/if_wi.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/wl/if_wl.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/xe/if_xe.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/xe/if_xe_pccard.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/i686_mem.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/mp_clock.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#24 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/if_cx.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/if_el.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/if_le.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/if_rdp.c#6 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_bus.c#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/pci/pci_cfgreg.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_ipr.c#7 integrate .. //depot/projects/trustedbsd/base/sys/i4b/driver/i4b_isppp.c#6 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/pmap.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_thread.c#15 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_log.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_prf.c#18 integrate .. //depot/projects/trustedbsd/base/sys/modules/agp/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.c#13 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.h#4 integrate .. //depot/projects/trustedbsd/base/sys/net/bpfdesc.h#5 integrate .. //depot/projects/trustedbsd/base/sys/net/bridge.c#12 integrate .. //depot/projects/trustedbsd/base/sys/net/bridge.h#3 integrate .. //depot/projects/trustedbsd/base/sys/net/ethernet.h#6 integrate .. //depot/projects/trustedbsd/base/sys/net/fddi.h#4 integrate .. //depot/projects/trustedbsd/base/sys/net/if.h#12 integrate .. //depot/projects/trustedbsd/base/sys/net/if_arcsubr.c#6 integrate .. //depot/projects/trustedbsd/base/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/net/if_disc.c#4 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ef.c#5 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#22 integrate .. //depot/projects/trustedbsd/base/sys/net/if_faith.c#10 integrate .. //depot/projects/trustedbsd/base/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gif.c#15 integrate .. //depot/projects/trustedbsd/base/sys/net/if_gre.c#5 integrate .. //depot/projects/trustedbsd/base/sys/net/if_loop.c#9 integrate .. //depot/projects/trustedbsd/base/sys/net/if_ppp.c#13 integrate .. //depot/projects/trustedbsd/base/sys/net/if_sl.c#9 integrate .. //depot/projects/trustedbsd/base/sys/net/if_stf.c#13 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tap.c#11 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#12 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#11 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#10 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan_var.h#3 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_ether.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_dummynet.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_gre.c#5 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_ali.c#3 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_amd.c#6 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_i810.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_intel.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_sis.c#3 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp_via.c#3 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_dc.c#18 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_de.c#5 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_pcn.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_rl.c#16 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sf.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#16 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sk.c#8 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ste.c#11 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_ti.c#15 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_tl.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_vr.c#11 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_wb.c#8 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#11 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/pmap.c#15 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/pmap.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/pci/psycho.c#12 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#28 integrate .. //depot/projects/trustedbsd/base/sys/sys/msgbuf.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/socket.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sys/stddef.h#1 branch .. //depot/projects/trustedbsd/base/sys/vm/pmap.h#11 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#20 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.h#8 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#15 integrate .. //depot/projects/trustedbsd/base/usr.bin/fetch/fetch.c#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/xargs/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/xargs/xargs.c#12 integrate .. //depot/projects/trustedbsd/base/usr.bin/xinstall/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/exec_elf32.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/file.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/config.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/devices.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/disks.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/install.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/label.c#11 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#29 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.310 2002/11/03 23:48:14 scottl Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.312 2002/11/14 19:24:50 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -123,6 +123,7 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +OSRELDATE!= sysctl -n kern.osreldate TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -193,7 +194,8 @@ BMAKEENV= MAKEOBJDIRPREFIX=${WORLDTMP} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ +BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + BOOTSTRAPPING=${OSRELDATE} \ -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ -DNO_CPU_CFLAGS -DNO_WERROR @@ -201,8 +203,8 @@ TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ - -DNO_CPU_CFLAGS +TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 \ + BOOTSTRAPPING=${OSRELDATE} -DNO_CPU_CFLAGS # cross-tool stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB @@ -727,7 +729,8 @@ .endif _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ - lib/libncurses lib/libopie lib/libradius lib/librpcsvc \ + lib/libncurses lib/libopie lib/libpam lib/libradius \ + lib/librpcsvc \ lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ lib/libz lib/msun @@ -753,7 +756,7 @@ _generic_libs+= usr.sbin/pcvt/keycap .endif -.for _lib in ${_startup_libs} ${_prebuild_libs} ${_generic_libs} +.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) ${ECHODIR} "===> ${_lib}"; \ @@ -764,6 +767,16 @@ .endif .endfor +# libpam is special: we need to build static PAM modules before +# static PAM library, and dynamic PAM library before dynamic PAM +# modules. +lib/libpam__L: .PHONY + ${ECHODIR} "===> lib/libpam"; \ + cd ${.CURDIR}/lib/libpam; \ + ${MAKE} DIRPRFX=lib/libpam/ depend; \ + ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ + ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install + _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} ==== //depot/projects/trustedbsd/base/bin/sleep/sleep.c#4 (text+ko) ==== @@ -43,14 +43,14 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.12 2002/06/30 05:15:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.15 2002/11/14 01:14:35 njl Exp $"); #include #include -#include #include #include #include +#include void usage(void); @@ -59,25 +59,15 @@ { struct timespec time_to_sleep; long l; - int ch, neg; + int neg; char *p; - while ((ch = getopt(argc, argv, "")) != -1) - switch(ch) { - case '?': - default: - usage(); - /* NOTREACHED */ - } - argc -= optind; - argv += optind; - - if (argc != 1) { + if (argc != 2) { usage(); /* NOTREACHED */ } - p = argv[0]; + p = argv[1]; /* Skip over leading whitespaces. */ while (isspace((unsigned char)*p)) @@ -88,6 +78,9 @@ if (*p == '-') { neg = 1; ++p; + if (!isdigit((unsigned char)*p) && *p != '.') + usage(); + /* NOTREACHED */ } else if (*p == '+') ++p; @@ -128,7 +121,8 @@ void usage(void) { + const char *msg = "usage: sleep seconds\n"; - (void)fprintf(stderr, "usage: sleep seconds\n"); + write(STDERR_FILENO, msg, strlen(msg)); exit(1); } ==== //depot/projects/trustedbsd/base/contrib/bind/CHANGES#5 (text+ko) ==== @@ -1,3 +1,23 @@ +1469. [bug] buffer length calculation for PX was wrong. + +1468. [bug] ns_name_ntol() could overwite a zero length buffer. + +1467. [bug] off by one bug in ns_makecannon(). + +1466. [bug] large ENDS UDP buffer size could trigger a assertion. + +1465. [bug] possible NULL pointer dereference in db_sec.c + +1464. [bug] the buffer used to construct the -ve record was not + big enough for all possible SOA records. use pointer + arithmetic to calculate the remaining size in this + buffer. + +1463. [bug] use serial space arithmetic to determine if a SIG is + too old, in the future or has internally constistant + times. + +1462. [bug] write buffer overflow in make_rr(). --- 8.3.3-REL released --- (Wed Jun 26 21:15:43 PDT 2002) ==== //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_defs.h#4 (text+ko) ==== @@ -78,7 +78,7 @@ */ /* max length of data in RR data field */ -#define MAXDATA (2*MAXDNAME + 5*INT32SZ) +#define MAXDATA (3*MAXDNAME + 5*INT32SZ) /* max length of data in a TXT RR segment */ #define MAXCHARSTRING 255 ==== //depot/projects/trustedbsd/base/contrib/bind/bin/named/db_sec.c#3 (text+ko) ==== @@ -479,7 +479,9 @@ struct sig_record *sigdata; struct dnode *sigdn; struct databuf *sigdp; - time_t now; + u_int32_t now; + u_int32_t exptime; + u_int32_t signtime; char *signer; u_char name_n[MAXDNAME]; u_char *sig, *eom; @@ -492,6 +494,7 @@ int dnssec_failed = 0, dnssec_succeeded = 0; int return_value; int i; + int expired = 0; if (rrset == NULL || rrset->rr_name == NULL) { ns_warning (ns_log_default, "verify_set: missing rrset/name"); @@ -527,11 +530,14 @@ * Don't verify a set if the SIG inception time is in * the future. This should be fixed before 2038 (BEW) */ - if ((time_t)ntohl(sigdata->sig_time_n) > now) + signtime = ntohl(sigdata->sig_time_n); + if (SEQ_GT(signtime, now)) continue; /* An expired set is dropped, but the data is not. */ - if ((time_t)ntohl(sigdata->sig_exp_n) < now) { + exptime = ntohl(sigdata->sig_exp_n); + if (SEQ_GT(now, exptime)) { + expired++; db_detach(&sigdn->dp); sigdp = NULL; continue; @@ -723,7 +729,7 @@ } end: - if (dnssec_failed > 0) + if (dnssec_failed > 0 || expired > 0) rrset_trim_sigs(rrset); if (trustedkey == 0 && key != NULL) dst_free_key(key); ==== //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_defs.h#5 (text+ko) ==== @@ -469,7 +469,7 @@ q_cmsglen, /* len of cname message */ q_cmsgsize; /* allocated size of cname message */ int16_t q_dfd; /* UDP file descriptor */ - int16_t q_udpsize; /* UDP message size */ + u_int16_t q_udpsize; /* UDP message size */ int q_distance; /* distance this query is from the * original query that the server * received. */ ==== //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_ncache.c#3 (text+ko) ==== @@ -66,7 +66,7 @@ u_int16_t atype; u_char *sp, *cp1; u_char data[MAXDATA]; - size_t len = sizeof data; + u_char *eod = data + sizeof(data); #endif nameserIncr(from.sin_addr, nssRcvdNXD); @@ -186,7 +186,7 @@ rdatap = cp; /* origin */ - n = dn_expand(msg, msg + msglen, cp, (char*)data, len); + n = dn_expand(msg, msg + msglen, cp, (char*)data, eod - data); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: origin form error"); @@ -195,9 +195,8 @@ cp += n; n = strlen((char*)data) + 1; cp1 = data + n; - len -= n; /* mail */ - n = dn_expand(msg, msg + msglen, cp, (char*)cp1, len); + n = dn_expand(msg, msg + msglen, cp, (char*)cp1, eod - cp1); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: mail form error"); return; @@ -205,20 +204,20 @@ cp += n; n = strlen((char*)cp1) + 1; cp1 += n; - len -= n; n = 5 * INT32SZ; + if (n > (eod - cp1)) /* Can't happen. See MAXDATA. */ + return; BOUNDS_CHECK(cp, n); memcpy(cp1, cp, n); /* serial, refresh, retry, expire, min */ cp1 += n; - len -= n; cp += n; if (cp != rdatap + dlen) { ns_debug(ns_log_ncache, 3, "ncache: form error"); return; } /* store the zone of the soa record */ - n = dn_expand(msg, msg + msglen, sp, (char*)cp1, len); + n = dn_expand(msg, msg + msglen, sp, (char*)cp1, eod - cp1); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: form error 2"); return; ==== //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_req.c#5 (text+ko) ==== @@ -2195,7 +2195,7 @@ /* first just copy over the type_covered, algorithm, */ /* labels, orig ttl, two timestamps, and the footprint */ - if ((dp->d_size - 18) > buflen) + if (buflen < 18) goto cleanup; /* out of room! */ memcpy(cp, cp1, 18); cp += 18; ==== //depot/projects/trustedbsd/base/contrib/bind/bin/named/ns_resp.c#5 (text+ko) ==== @@ -2001,7 +2001,7 @@ * to BOUNDS_CHECK() here. */ cp1 += (n = strlen((char *)cp1) + 1); - n1 = sizeof(data) - n; + n1 = sizeof(data) - n - INT16SZ; n = dn_expand(msg, eom, cp, (char *)cp1, n1); if (n < 0) { hp->rcode = FORMERR; @@ -2043,8 +2043,18 @@ ttl = origTTL; } + /* + * Check that expire and signature times are internally + * consistant. + */ + if (!SEQ_GT(exptime, signtime) && exptime != signtime) { + ns_debug(ns_log_default, 3, + "ignoring SIG: signature expires before it was signed"); + return ((cp - rrp) + dlen); + } + /* Don't let bogus signers "sign" in the future. */ - if (signtime > now) { + if (SEQ_GT(signtime, now)) { ns_debug(ns_log_default, 3, "ignoring SIG: signature date %s is in the future", p_secstodate (signtime)); @@ -2052,7 +2062,7 @@ } /* Ignore received SIG RR's that are already expired. */ - if (exptime <= now) { + if (SEQ_GT(now, exptime)) { ns_debug(ns_log_default, 3, "ignoring SIG: expiration %s is in the past", p_secstodate (exptime)); ==== //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_name.c#4 (text+ko) ==== @@ -341,6 +341,10 @@ dn = dst; eom = dst + dstsiz; + if (dn >= eom) { + errno = EMSGSIZE; + return (-1); + } while ((n = *cp++) != 0) { if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) { /* Some kind of compression pointer. */ ==== //depot/projects/trustedbsd/base/contrib/bind/lib/nameser/ns_samedomain.c#2 (text+ko) ==== @@ -166,7 +166,7 @@ ns_makecanon(const char *src, char *dst, size_t dstsize) { size_t n = strlen(src); - if (n + sizeof "." > dstsize) { + if (n + sizeof "." + 1 > dstsize) { errno = EMSGSIZE; return (-1); } ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libiberty/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.16 2002/05/13 11:09:03 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $ .include "../Makefile.inc0" @@ -10,7 +10,9 @@ hex.c floatformat.c hashtab.c lbasename.c make-temp-file.c \ objalloc.c obstack.c safe-ctype.c xatexit.c xexit.c xmalloc.c \ xstrdup.c xstrerror.c -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440000 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500022 )) SRCS+= basename.c .endif WARNS= 1 ==== //depot/projects/trustedbsd/base/gnu/usr.bin/cc/cc_tools/auto-host.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.10 2002/10/20 07:50:20 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.11 2002/11/13 11:50:40 ru Exp $ */ #include @@ -357,7 +357,10 @@ /* #undef _GNU_SOURCE */ /* Define if you have a working header file. */ +#if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \ + __FreeBSD_version >= 500014 #define HAVE_STDBOOL_H 1 +#endif /* Define if you can safely include both and . */ #define STRING_WITH_STRINGS 1 ==== //depot/projects/trustedbsd/base/kerberos5/lib/libasn1/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.16 2002/08/13 16:52:50 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $ LIB= asn1 CFLAGS+=-I${KRB5DIR}/include \ @@ -106,7 +106,9 @@ strupr.c ${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET} -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440001 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 )) asn1_compile: getprogname.c setprogname.c .endif ==== //depot/projects/trustedbsd/base/kerberos5/lib/libhdb/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.9 2002/08/13 16:52:52 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.10 2002/11/13 13:49:29 ru Exp $ LIB= hdb CFLAGS+=-I${KRB5DIR}/include \ @@ -61,7 +61,9 @@ get_window_size.c strupr.c ${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET} -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440001 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 )) asn1_compile: getprogname.c setprogname.c .endif ==== //depot/projects/trustedbsd/base/lib/libc/gen/_pthread_stubs.c#5 (text+ko) ==== @@ -25,14 +25,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.8 2002/11/01 09:37:16 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.10 2002/11/13 21:55:22 deischen Exp $"); #include #include -#include -void *_pthread_getspecific(pthread_key_t key); -pthread_t _pthread_self(void); +#include "libc_private.h" /* * Weak symbols: All libc internal usage of these functions should @@ -42,69 +40,7 @@ * usage to avoid unwanted cancellation points and to differentiate * between application locks and libc locks (threads holding the * latter can't be allowed to exit/terminate). - * - * We also provide weak pthread_XXX stubs which call their - * _pthread_XXX counterparts. These stubs may be used be other - * libraries for ensuring thread-safety without requiring the presence - * of a thread library. */ -__weak_reference(_pthread_cond_init_stub, _pthread_cond_init); -__weak_reference(_pthread_cond_signal_stub, _pthread_cond_signal); -__weak_reference(_pthread_cond_broadcast_stub, _pthread_cond_broadcast); -__weak_reference(_pthread_cond_wait_stub, _pthread_cond_wait); -__weak_reference(_pthread_cond_destroy_stub, _pthread_cond_destroy); -__weak_reference(_pthread_getspecific_stub, _pthread_getspecific); -__weak_reference(_pthread_key_create_stub, _pthread_key_create); -__weak_reference(_pthread_key_delete_stub, _pthread_key_delete); -__weak_reference(_pthread_main_np_stub, _pthread_main_np); -__weak_reference(_pthread_mutex_destroy_stub, _pthread_mutex_destroy); -__weak_reference(_pthread_mutex_init_stub, _pthread_mutex_init); -__weak_reference(_pthread_mutex_lock_stub, _pthread_mutex_lock); -__weak_reference(_pthread_mutex_trylock_stub, _pthread_mutex_trylock); -__weak_reference(_pthread_mutex_unlock_stub, _pthread_mutex_unlock); -__weak_reference(_pthread_mutexattr_init_stub, _pthread_mutexattr_init); -__weak_reference(_pthread_mutexattr_destroy_stub, _pthread_mutexattr_destroy); -__weak_reference(_pthread_mutexattr_settype_stub, _pthread_mutexattr_settype); -__weak_reference(_pthread_once_stub, _pthread_once); -__weak_reference(_pthread_self_stub, _pthread_self); -__weak_reference(_pthread_rwlock_init_stub, _pthread_rwlock_init); -__weak_reference(_pthread_rwlock_destroy_stub, _pthread_rwlock_destroy); -__weak_reference(_pthread_rwlock_rdlock_stub, _pthread_rwlock_rdlock); -__weak_reference(_pthread_rwlock_tryrdlock_stub, _pthread_rwlock_tryrdlock); -__weak_reference(_pthread_rwlock_trywrlock_stub, _pthread_rwlock_trywrlock); -__weak_reference(_pthread_rwlock_unlock_stub, _pthread_rwlock_unlock); -__weak_reference(_pthread_rwlock_wrlock_stub, _pthread_rwlock_wrlock); -__weak_reference(_pthread_setspecific_stub, _pthread_setspecific); -__weak_reference(_pthread_sigmask_stub, _pthread_sigmask); - -__weak_reference(pthread_cond_init_stub, pthread_cond_init); -__weak_reference(pthread_cond_signal_stub, pthread_cond_signal); -__weak_reference(pthread_cond_broadcast_stub, pthread_cond_broadcast); -__weak_reference(pthread_cond_wait_stub, pthread_cond_wait); -__weak_reference(pthread_cond_destroy_stub, pthread_cond_destroy); -__weak_reference(pthread_getspecific_stub, pthread_getspecific); -__weak_reference(pthread_key_create_stub, pthread_key_create); -__weak_reference(pthread_key_delete_stub, pthread_key_delete); -__weak_reference(pthread_main_np_stub, pthread_main_np); -__weak_reference(pthread_mutex_destroy_stub, pthread_mutex_destroy); -__weak_reference(pthread_mutex_init_stub, pthread_mutex_init); -__weak_reference(pthread_mutex_lock_stub, pthread_mutex_lock); -__weak_reference(pthread_mutex_trylock_stub, pthread_mutex_trylock); -__weak_reference(pthread_mutex_unlock_stub, pthread_mutex_unlock); -__weak_reference(pthread_mutexattr_init_stub, pthread_mutexattr_init); -__weak_reference(pthread_mutexattr_destroy_stub, pthread_mutexattr_destroy); -__weak_reference(pthread_mutexattr_settype_stub, pthread_mutexattr_settype); -__weak_reference(pthread_once_stub, pthread_once); -__weak_reference(pthread_self_stub, pthread_self); -__weak_reference(pthread_rwlock_init_stub, pthread_rwlock_init); -__weak_reference(pthread_rwlock_destroy_stub, pthread_rwlock_destroy); -__weak_reference(pthread_rwlock_rdlock_stub, pthread_rwlock_rdlock); -__weak_reference(pthread_rwlock_tryrdlock_stub, pthread_rwlock_tryrdlock); -__weak_reference(pthread_rwlock_trywrlock_stub, pthread_rwlock_trywrlock); -__weak_reference(pthread_rwlock_unlock_stub, pthread_rwlock_unlock); -__weak_reference(pthread_rwlock_wrlock_stub, pthread_rwlock_wrlock); -__weak_reference(pthread_setspecific_stub, pthread_setspecific); -__weak_reference(pthread_sigmask_stub, pthread_sigmask); /* Define a null pthread structure just to satisfy _pthread_self. */ struct pthread { @@ -112,342 +48,179 @@ static struct pthread main_thread; -static int -_pthread_cond_init_stub(pthread_cond_t *cond, - const pthread_condattr_t *cond_attr) -{ - return (0); -} +static int stub_main(void); +static void *stub_null(void); +static struct pthread *stub_self(void); +static int stub_zero(void); -static int -_pthread_cond_signal_stub(pthread_cond_t *cond) -{ - return (0); -} +#define PJT_DUAL_ENTRY(entry) \ + (pthread_func_t)entry, (pthread_func_t)entry -static int -_pthread_cond_broadcast_stub(pthread_cond_t *cond) -{ - return (0); -} +pthread_func_entry_t __thr_jtable[PJT_MAX] = { + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_BROADCAST */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_SIGNAL */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_WAIT */ + {PJT_DUAL_ENTRY(stub_null)}, /* PJT_GETSPECIFIC */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_CREATE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_DELETE */ + {PJT_DUAL_ENTRY(stub_main)}, /* PJT_MAIN_NP */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_LOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_TRYLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_UNLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_SETTYPE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ONCE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_RDLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYRDLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYWRLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_UNLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_WRLOCK */ + {PJT_DUAL_ENTRY(stub_self)}, /* PJT_SELF */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SETSPECIFIC */ + {PJT_DUAL_ENTRY(stub_zero)} /* PJT_SIGMASK */ +}; -static int -_pthread_cond_wait_stub(pthread_cond_t *cond, pthread_mutex_t *mutex) -{ - return (0); -} +/* + * Weak aliases for exported (pthread_*) and internal (_pthread_*) routines. + */ +#define WEAK_REF(sym, alias) __weak_reference(sym, alias) -static int -_pthread_cond_destroy_stub(pthread_cond_t *cond) -{ - return (0); -} +#define FUNC_TYPE(name) __CONCAT(name, _func_t) +#define FUNC_INT(name) __CONCAT(name, _int) +#define FUNC_EXP(name) __CONCAT(name, _exp) -static void * -_pthread_getspecific_stub(pthread_key_t key) -{ - return (NULL); -} +#define STUB_FUNC(name, idx, ret) \ + static ret FUNC_EXP(name)(void) __unused; \ + static ret FUNC_INT(name)(void) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(void); \ + static ret FUNC_EXP(name)(void) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func()); \ + } \ + static ret FUNC_INT(name)(void) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func()); \ + } -static int -_pthread_key_create_stub(pthread_key_t *key, void (*destructor) (void *)) -{ - return (0); -} +#define STUB_FUNC1(name, idx, ret, p0_type) \ + static ret FUNC_EXP(name)(p0_type) __unused; \ + static ret FUNC_INT(name)(p0_type) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(p0_type); \ + static ret FUNC_EXP(name)(p0_type p0) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func(p0)); \ + } \ + static ret FUNC_INT(name)(p0_type p0) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func(p0)); \ + } -static int -_pthread_key_delete_stub(pthread_key_t key) -{ - return (0); -} +#define STUB_FUNC2(name, idx, ret, p0_type, p1_type) \ + static ret FUNC_EXP(name)(p0_type, p1_type) __unused; \ + static ret FUNC_INT(name)(p0_type, p1_type) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(p0_type, p1_type); \ + static ret FUNC_EXP(name)(p0_type p0, p1_type p1) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func(p0, p1)); \ + } \ + static ret FUNC_INT(name)(p0_type p0, p1_type p1) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func(p0, p1)); \ + } -static int -_pthread_main_np_stub() -{ - return (-1); -} +#define STUB_FUNC3(name, idx, ret, p0_type, p1_type, p2_type) \ + static ret FUNC_EXP(name)(p0_type, p1_type, p2_type) __unused; \ + static ret FUNC_INT(name)(p0_type, p1_type, p2_type) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(p0_type, p1_type, p2_type); \ + static ret FUNC_EXP(name)(p0_type p0, p1_type p1, p2_type p2) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func(p0, p1, p2)); \ + } \ + static ret FUNC_INT(name)(p0_type p0, p1_type p1, p2_type p2) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func(p0, p1, p2)); \ + } -static int -_pthread_mutex_destroy_stub(pthread_mutex_t *mattr) -{ - return (0); -} +STUB_FUNC1(pthread_cond_broadcast, PJT_COND_BROADCAST, int, void *) +STUB_FUNC1(pthread_cond_destroy, PJT_COND_DESTROY, int, void *) +STUB_FUNC2(pthread_cond_init, PJT_COND_INIT, int, void *, void *) +STUB_FUNC1(pthread_cond_signal, PJT_COND_SIGNAL, int, void *) +STUB_FUNC1(pthread_cond_wait, PJT_COND_WAIT, int, void *) +STUB_FUNC1(pthread_getspecific, PJT_GETSPECIFIC, void *, pthread_key_t) +STUB_FUNC2(pthread_key_create, PJT_KEY_CREATE, int, void *, void *) +STUB_FUNC1(pthread_key_delete, PJT_KEY_DELETE, int, pthread_key_t) +STUB_FUNC(pthread_main_np, PJT_MAIN_NP, int) +STUB_FUNC1(pthread_mutex_destroy, PJT_MUTEX_DESTROY, int, void *) +STUB_FUNC2(pthread_mutex_init, PJT_MUTEX_INIT, int, void *, void *) +STUB_FUNC1(pthread_mutex_lock, PJT_MUTEX_LOCK, int, void *) +STUB_FUNC1(pthread_mutex_trylock, PJT_MUTEX_TRYLOCK, int, void *) +STUB_FUNC1(pthread_mutex_unlock, PJT_MUTEX_UNLOCK, int, void *) +STUB_FUNC1(pthread_mutexattr_destroy, PJT_MUTEXATTR_DESTROY, int, void *) +STUB_FUNC1(pthread_mutexattr_init, PJT_MUTEXATTR_INIT, int, void *) +STUB_FUNC1(pthread_mutexattr_settype, PJT_MUTEXATTR_SETTYPE, int, void *) +STUB_FUNC2(pthread_once, PJT_ONCE, int, void *, void *) +STUB_FUNC1(pthread_rwlock_destroy, PJT_RWLOCK_DESTROY, int, void *) +STUB_FUNC2(pthread_rwlock_init, PJT_RWLOCK_INIT, int, void *, void *) +STUB_FUNC1(pthread_rwlock_rdlock, PJT_RWLOCK_RDLOCK, int, void *) +STUB_FUNC1(pthread_rwlock_tryrdlock, PJT_RWLOCK_TRYRDLOCK, int, void *) +STUB_FUNC1(pthread_rwlock_trywrlock, PJT_RWLOCK_TRYWRLOCK, int, void *) +STUB_FUNC1(pthread_rwlock_unlock, PJT_RWLOCK_UNLOCK, int, void *) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 14 22:58: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EA2937B404; Thu, 14 Nov 2002 22:57:37 -0800 (PST) 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 CC99E37B401 for ; Thu, 14 Nov 2002 22:57:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DAEDF43EAC for ; Thu, 14 Nov 2002 22:57:30 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAF6ssmV044264 for ; Thu, 14 Nov 2002 22:54:54 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAF6sqd1044230 for perforce@freebsd.org; Thu, 14 Nov 2002 22:54:52 -0800 (PST) Date: Thu, 14 Nov 2002 22:54:52 -0800 (PST) Message-Id: <200211150654.gAF6sqd1044230@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 Subject: PERFORCE change 21064 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21064 Change 21064 by rwatson@rwatson_tislabs on 2002/11/14 22:54:22 Integ TrustedBSD MAC branch from the TrustedBSD base branch: bind update, various cleanups, Sam's ifnet changes, also loopback of some MAC stuff including condition variable changes. Affected files ... .. //depot/projects/trustedbsd/mac/Makefile.inc1#29 integrate .. //depot/projects/trustedbsd/mac/bin/sleep/sleep.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/CHANGES#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_defs.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_sec.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_defs.h#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_ncache.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_req.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_resp.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_name.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_samedomain.c#2 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libiberty/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/auto-host.h#5 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libasn1/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/kerberos5/lib/libhdb/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/_pthread_stubs.c#5 integrate .. //depot/projects/trustedbsd/mac/lib/libc/gen/syslog.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/gen/_setjmp.S#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/libc_private.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/namespace.h#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc/include/un-namespace.h#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdio/findfp.c#8 integrate .. //depot/projects/trustedbsd/mac/lib/libc/stdlib/strtod.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/pthread_private.h#11 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_attr_init.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_autoinit.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_cond.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_condattr_init.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_create.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_execve.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_exit.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_gc.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_init.c#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_join.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_mattr_init.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_mutex.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_mutex_prioceiling.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_once.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_pselect.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_rwlock.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_sem.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_sig.c#6 integrate .. //depot/projects/trustedbsd/mac/lib/libc_r/uthread/uthread_stack.c#3 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#10 integrate .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#18 integrate .. //depot/projects/trustedbsd/mac/lib/libncurses/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/Makefile.inc#6 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/modules/pam_krb5/pam_krb5.c#7 integrate .. //depot/projects/trustedbsd/mac/release/alpha/drivers.conf#10 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#3 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#12 integrate .. //depot/projects/trustedbsd/mac/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#2 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#45 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/examples/Makefile.relnotesng#6 integrate .. //depot/projects/trustedbsd/mac/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#11 integrate .. //depot/projects/trustedbsd/mac/sbin/devd/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sbin/devd/devd.8#2 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.8#15 integrate .. //depot/projects/trustedbsd/mac/sbin/ifconfig/ifconfig.c#14 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/vlan.4#6 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.sys.mk#7 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/alpha/pmap.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/alpha/conf/GENERIC.hints#3 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/help.common#5 integrate .. //depot/projects/trustedbsd/mac/sys/boot/common/loader.8#13 integrate .. //depot/projects/trustedbsd/mac/sys/cam/cam_periph.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_low.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/conf/options#40 integrate .. //depot/projects/trustedbsd/mac/sys/contrib/dev/oltr/if_oltr.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/aic/aic_pccard.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/an/if_an.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/an/if_an_isa.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/an/if_an_pccard.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/an/if_an_pci.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ar/if_ar.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/awi/awi.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/awi/if_awi_pccard.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bgereg.h#10 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cardbus/cardbus.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cardbus/cardbus_cis.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cnw/if_cnw.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/cs/if_cs.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ed/if_ed_pccard.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/en/midway.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ep/if_ep_pccard.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fe/if_fe.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fe/if_fe_pccard.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/fxp/if_fxp.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gem/if_gem.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gx/if_gx.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/gx/if_gxvar.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/hme/if_hme.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ie/if_ie.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/iicbus/if_ic.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/lge/if_lge.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc_cbus.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc_isa.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/lnc/if_lnc_pci.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/mly/mly.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/my/if_my.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_nge.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/nge/if_ngereg.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccard.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccard_cis.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccarddevs#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccarddevs.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccard/pccardvar.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pccbb/pccbb.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pci.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pci/pci_pci.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/pdq/pdq_ifsubr.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ray/if_ray.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sbni/if_sbni.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sn/if_sn.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/sr/if_sr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/trm/trm.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/tx/if_tx.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/txp/if_txp.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_aue.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_auereg.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_cue.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_cuereg.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_kue.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/if_kuereg.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/usb_ethersubr.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vx/if_vx.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wi/if_wi.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/dev/wl/if_wl.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/dev/xe/if_xe.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/dev/xe/if_xe_pccard.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/i686_mem.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/mp_clock.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/i386/i386/pmap.c#23 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/if_cx.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/if_el.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/if_le.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/if_rdp.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_bus.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/i386/pci/pci_cfgreg.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_ipr.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_isppp.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/ia64/ia64/pmap.c#22 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#360 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_thread.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_log.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/kern/subr_prf.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/modules/agp/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sys/net/bpf.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/net/bpf.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/net/bpfdesc.h#7 integrate .. //depot/projects/trustedbsd/mac/sys/net/bridge.c#14 integrate .. //depot/projects/trustedbsd/mac/sys/net/bridge.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/net/ethernet.h#6 integrate .. //depot/projects/trustedbsd/mac/sys/net/fddi.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/net/if.h#18 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_arcsubr.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_atmsubr.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_disc.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ef.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_faith.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_fddisubr.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gif.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_gre.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_loop.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_ppp.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_sl.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_stf.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_tap.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_tun.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_var.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_vlan_var.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_eiface.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_ether.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/netgraph/ng_iface.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_dummynet.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_gre.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp_ali.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp_amd.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp_i810.c#7 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp_intel.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp_sis.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/pci/agp_via.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_dc.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_de.c#6 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_pcn.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_rl.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sf.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sis.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sk.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ste.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_ti.c#17 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_tl.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_vr.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_wb.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_xl.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/pmap.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/include/pmap.h#15 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/pci/psycho.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/sparc64/sparc64/pmap.c#26 integrate .. //depot/projects/trustedbsd/mac/sys/sys/msgbuf.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/sys/socket.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/stddef.h#1 branch .. //depot/projects/trustedbsd/mac/sys/vm/pmap.h#11 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#18 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pageout.c#13 integrate .. //depot/projects/trustedbsd/mac/usr.bin/fetch/fetch.c#11 integrate .. //depot/projects/trustedbsd/mac/usr.bin/xargs/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.bin/xargs/xargs.c#12 integrate .. //depot/projects/trustedbsd/mac/usr.bin/xinstall/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/crunch/crunchide/exec_elf32.c#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/mtree/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/newsyslog/newsyslog.8#3 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/newsyslog/newsyslog.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pkg_install/lib/file.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/config.c#8 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/devices.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/disks.c#9 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/install.c#13 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/label.c#10 integrate Differences ... ==== //depot/projects/trustedbsd/mac/Makefile.inc1#29 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.310 2002/11/03 23:48:14 scottl Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.312 2002/11/14 19:24:50 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -123,6 +123,7 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +OSRELDATE!= sysctl -n kern.osreldate TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -193,7 +194,8 @@ BMAKEENV= MAKEOBJDIRPREFIX=${WORLDTMP} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ +BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + BOOTSTRAPPING=${OSRELDATE} \ -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ -DNO_CPU_CFLAGS -DNO_WERROR @@ -201,8 +203,8 @@ TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ - -DNO_CPU_CFLAGS +TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 \ + BOOTSTRAPPING=${OSRELDATE} -DNO_CPU_CFLAGS # cross-tool stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB @@ -727,7 +729,8 @@ .endif _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ - lib/libncurses lib/libopie lib/libradius lib/librpcsvc \ + lib/libncurses lib/libopie lib/libpam lib/libradius \ + lib/librpcsvc \ lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ lib/libz lib/msun @@ -753,7 +756,7 @@ _generic_libs+= usr.sbin/pcvt/keycap .endif -.for _lib in ${_startup_libs} ${_prebuild_libs} ${_generic_libs} +.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) ${ECHODIR} "===> ${_lib}"; \ @@ -764,6 +767,16 @@ .endif .endfor +# libpam is special: we need to build static PAM modules before +# static PAM library, and dynamic PAM library before dynamic PAM +# modules. +lib/libpam__L: .PHONY + ${ECHODIR} "===> lib/libpam"; \ + cd ${.CURDIR}/lib/libpam; \ + ${MAKE} DIRPRFX=lib/libpam/ depend; \ + ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ + ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install + _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} ==== //depot/projects/trustedbsd/mac/bin/sleep/sleep.c#4 (text+ko) ==== @@ -43,14 +43,14 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.12 2002/06/30 05:15:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.15 2002/11/14 01:14:35 njl Exp $"); #include #include -#include #include #include #include +#include void usage(void); @@ -59,25 +59,15 @@ { struct timespec time_to_sleep; long l; - int ch, neg; + int neg; char *p; - while ((ch = getopt(argc, argv, "")) != -1) - switch(ch) { - case '?': - default: - usage(); - /* NOTREACHED */ - } - argc -= optind; - argv += optind; - - if (argc != 1) { + if (argc != 2) { usage(); /* NOTREACHED */ } - p = argv[0]; + p = argv[1]; /* Skip over leading whitespaces. */ while (isspace((unsigned char)*p)) @@ -88,6 +78,9 @@ if (*p == '-') { neg = 1; ++p; + if (!isdigit((unsigned char)*p) && *p != '.') + usage(); + /* NOTREACHED */ } else if (*p == '+') ++p; @@ -128,7 +121,8 @@ void usage(void) { + const char *msg = "usage: sleep seconds\n"; - (void)fprintf(stderr, "usage: sleep seconds\n"); + write(STDERR_FILENO, msg, strlen(msg)); exit(1); } ==== //depot/projects/trustedbsd/mac/contrib/bind/CHANGES#5 (text+ko) ==== @@ -1,3 +1,23 @@ +1469. [bug] buffer length calculation for PX was wrong. + +1468. [bug] ns_name_ntol() could overwite a zero length buffer. + +1467. [bug] off by one bug in ns_makecannon(). + +1466. [bug] large ENDS UDP buffer size could trigger a assertion. + +1465. [bug] possible NULL pointer dereference in db_sec.c + +1464. [bug] the buffer used to construct the -ve record was not + big enough for all possible SOA records. use pointer + arithmetic to calculate the remaining size in this + buffer. + +1463. [bug] use serial space arithmetic to determine if a SIG is + too old, in the future or has internally constistant + times. + +1462. [bug] write buffer overflow in make_rr(). --- 8.3.3-REL released --- (Wed Jun 26 21:15:43 PDT 2002) ==== //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_defs.h#4 (text+ko) ==== @@ -78,7 +78,7 @@ */ /* max length of data in RR data field */ -#define MAXDATA (2*MAXDNAME + 5*INT32SZ) +#define MAXDATA (3*MAXDNAME + 5*INT32SZ) /* max length of data in a TXT RR segment */ #define MAXCHARSTRING 255 ==== //depot/projects/trustedbsd/mac/contrib/bind/bin/named/db_sec.c#3 (text+ko) ==== @@ -479,7 +479,9 @@ struct sig_record *sigdata; struct dnode *sigdn; struct databuf *sigdp; - time_t now; + u_int32_t now; + u_int32_t exptime; + u_int32_t signtime; char *signer; u_char name_n[MAXDNAME]; u_char *sig, *eom; @@ -492,6 +494,7 @@ int dnssec_failed = 0, dnssec_succeeded = 0; int return_value; int i; + int expired = 0; if (rrset == NULL || rrset->rr_name == NULL) { ns_warning (ns_log_default, "verify_set: missing rrset/name"); @@ -527,11 +530,14 @@ * Don't verify a set if the SIG inception time is in * the future. This should be fixed before 2038 (BEW) */ - if ((time_t)ntohl(sigdata->sig_time_n) > now) + signtime = ntohl(sigdata->sig_time_n); + if (SEQ_GT(signtime, now)) continue; /* An expired set is dropped, but the data is not. */ - if ((time_t)ntohl(sigdata->sig_exp_n) < now) { + exptime = ntohl(sigdata->sig_exp_n); + if (SEQ_GT(now, exptime)) { + expired++; db_detach(&sigdn->dp); sigdp = NULL; continue; @@ -723,7 +729,7 @@ } end: - if (dnssec_failed > 0) + if (dnssec_failed > 0 || expired > 0) rrset_trim_sigs(rrset); if (trustedkey == 0 && key != NULL) dst_free_key(key); ==== //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_defs.h#5 (text+ko) ==== @@ -469,7 +469,7 @@ q_cmsglen, /* len of cname message */ q_cmsgsize; /* allocated size of cname message */ int16_t q_dfd; /* UDP file descriptor */ - int16_t q_udpsize; /* UDP message size */ + u_int16_t q_udpsize; /* UDP message size */ int q_distance; /* distance this query is from the * original query that the server * received. */ ==== //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_ncache.c#3 (text+ko) ==== @@ -66,7 +66,7 @@ u_int16_t atype; u_char *sp, *cp1; u_char data[MAXDATA]; - size_t len = sizeof data; + u_char *eod = data + sizeof(data); #endif nameserIncr(from.sin_addr, nssRcvdNXD); @@ -186,7 +186,7 @@ rdatap = cp; /* origin */ - n = dn_expand(msg, msg + msglen, cp, (char*)data, len); + n = dn_expand(msg, msg + msglen, cp, (char*)data, eod - data); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: origin form error"); @@ -195,9 +195,8 @@ cp += n; n = strlen((char*)data) + 1; cp1 = data + n; - len -= n; /* mail */ - n = dn_expand(msg, msg + msglen, cp, (char*)cp1, len); + n = dn_expand(msg, msg + msglen, cp, (char*)cp1, eod - cp1); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: mail form error"); return; @@ -205,20 +204,20 @@ cp += n; n = strlen((char*)cp1) + 1; cp1 += n; - len -= n; n = 5 * INT32SZ; + if (n > (eod - cp1)) /* Can't happen. See MAXDATA. */ + return; BOUNDS_CHECK(cp, n); memcpy(cp1, cp, n); /* serial, refresh, retry, expire, min */ cp1 += n; - len -= n; cp += n; if (cp != rdatap + dlen) { ns_debug(ns_log_ncache, 3, "ncache: form error"); return; } /* store the zone of the soa record */ - n = dn_expand(msg, msg + msglen, sp, (char*)cp1, len); + n = dn_expand(msg, msg + msglen, sp, (char*)cp1, eod - cp1); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: form error 2"); return; ==== //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_req.c#5 (text+ko) ==== @@ -2195,7 +2195,7 @@ /* first just copy over the type_covered, algorithm, */ /* labels, orig ttl, two timestamps, and the footprint */ - if ((dp->d_size - 18) > buflen) + if (buflen < 18) goto cleanup; /* out of room! */ memcpy(cp, cp1, 18); cp += 18; ==== //depot/projects/trustedbsd/mac/contrib/bind/bin/named/ns_resp.c#5 (text+ko) ==== @@ -2001,7 +2001,7 @@ * to BOUNDS_CHECK() here. */ cp1 += (n = strlen((char *)cp1) + 1); - n1 = sizeof(data) - n; + n1 = sizeof(data) - n - INT16SZ; n = dn_expand(msg, eom, cp, (char *)cp1, n1); if (n < 0) { hp->rcode = FORMERR; @@ -2043,8 +2043,18 @@ ttl = origTTL; } + /* + * Check that expire and signature times are internally + * consistant. + */ + if (!SEQ_GT(exptime, signtime) && exptime != signtime) { + ns_debug(ns_log_default, 3, + "ignoring SIG: signature expires before it was signed"); + return ((cp - rrp) + dlen); + } + /* Don't let bogus signers "sign" in the future. */ - if (signtime > now) { + if (SEQ_GT(signtime, now)) { ns_debug(ns_log_default, 3, "ignoring SIG: signature date %s is in the future", p_secstodate (signtime)); @@ -2052,7 +2062,7 @@ } /* Ignore received SIG RR's that are already expired. */ - if (exptime <= now) { + if (SEQ_GT(now, exptime)) { ns_debug(ns_log_default, 3, "ignoring SIG: expiration %s is in the past", p_secstodate (exptime)); ==== //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_name.c#4 (text+ko) ==== @@ -341,6 +341,10 @@ dn = dst; eom = dst + dstsiz; + if (dn >= eom) { + errno = EMSGSIZE; + return (-1); + } while ((n = *cp++) != 0) { if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) { /* Some kind of compression pointer. */ ==== //depot/projects/trustedbsd/mac/contrib/bind/lib/nameser/ns_samedomain.c#2 (text+ko) ==== @@ -166,7 +166,7 @@ ns_makecanon(const char *src, char *dst, size_t dstsize) { size_t n = strlen(src); - if (n + sizeof "." > dstsize) { + if (n + sizeof "." + 1 > dstsize) { errno = EMSGSIZE; return (-1); } ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libiberty/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.16 2002/05/13 11:09:03 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $ .include "../Makefile.inc0" @@ -10,7 +10,9 @@ hex.c floatformat.c hashtab.c lbasename.c make-temp-file.c \ objalloc.c obstack.c safe-ctype.c xatexit.c xexit.c xmalloc.c \ xstrdup.c xstrerror.c -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440000 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500022 )) SRCS+= basename.c .endif WARNS= 1 ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/cc/cc_tools/auto-host.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.10 2002/10/20 07:50:20 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.11 2002/11/13 11:50:40 ru Exp $ */ #include @@ -357,7 +357,10 @@ /* #undef _GNU_SOURCE */ /* Define if you have a working header file. */ +#if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \ + __FreeBSD_version >= 500014 #define HAVE_STDBOOL_H 1 +#endif /* Define if you can safely include both and . */ #define STRING_WITH_STRINGS 1 ==== //depot/projects/trustedbsd/mac/kerberos5/lib/libasn1/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.16 2002/08/13 16:52:50 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $ LIB= asn1 CFLAGS+=-I${KRB5DIR}/include \ @@ -106,7 +106,9 @@ strupr.c ${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET} -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440001 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 )) asn1_compile: getprogname.c setprogname.c .endif ==== //depot/projects/trustedbsd/mac/kerberos5/lib/libhdb/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.9 2002/08/13 16:52:52 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.10 2002/11/13 13:49:29 ru Exp $ LIB= hdb CFLAGS+=-I${KRB5DIR}/include \ @@ -61,7 +61,9 @@ get_window_size.c strupr.c ${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET} -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440001 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 )) asn1_compile: getprogname.c setprogname.c .endif ==== //depot/projects/trustedbsd/mac/lib/libc/gen/_pthread_stubs.c#5 (text+ko) ==== @@ -25,14 +25,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.8 2002/11/01 09:37:16 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.10 2002/11/13 21:55:22 deischen Exp $"); #include #include -#include -void *_pthread_getspecific(pthread_key_t key); -pthread_t _pthread_self(void); +#include "libc_private.h" /* * Weak symbols: All libc internal usage of these functions should @@ -42,69 +40,7 @@ * usage to avoid unwanted cancellation points and to differentiate * between application locks and libc locks (threads holding the * latter can't be allowed to exit/terminate). - * - * We also provide weak pthread_XXX stubs which call their - * _pthread_XXX counterparts. These stubs may be used be other - * libraries for ensuring thread-safety without requiring the presence - * of a thread library. */ -__weak_reference(_pthread_cond_init_stub, _pthread_cond_init); -__weak_reference(_pthread_cond_signal_stub, _pthread_cond_signal); -__weak_reference(_pthread_cond_broadcast_stub, _pthread_cond_broadcast); -__weak_reference(_pthread_cond_wait_stub, _pthread_cond_wait); -__weak_reference(_pthread_cond_destroy_stub, _pthread_cond_destroy); -__weak_reference(_pthread_getspecific_stub, _pthread_getspecific); -__weak_reference(_pthread_key_create_stub, _pthread_key_create); -__weak_reference(_pthread_key_delete_stub, _pthread_key_delete); -__weak_reference(_pthread_main_np_stub, _pthread_main_np); -__weak_reference(_pthread_mutex_destroy_stub, _pthread_mutex_destroy); -__weak_reference(_pthread_mutex_init_stub, _pthread_mutex_init); -__weak_reference(_pthread_mutex_lock_stub, _pthread_mutex_lock); -__weak_reference(_pthread_mutex_trylock_stub, _pthread_mutex_trylock); -__weak_reference(_pthread_mutex_unlock_stub, _pthread_mutex_unlock); -__weak_reference(_pthread_mutexattr_init_stub, _pthread_mutexattr_init); -__weak_reference(_pthread_mutexattr_destroy_stub, _pthread_mutexattr_destroy); -__weak_reference(_pthread_mutexattr_settype_stub, _pthread_mutexattr_settype); -__weak_reference(_pthread_once_stub, _pthread_once); -__weak_reference(_pthread_self_stub, _pthread_self); -__weak_reference(_pthread_rwlock_init_stub, _pthread_rwlock_init); -__weak_reference(_pthread_rwlock_destroy_stub, _pthread_rwlock_destroy); -__weak_reference(_pthread_rwlock_rdlock_stub, _pthread_rwlock_rdlock); -__weak_reference(_pthread_rwlock_tryrdlock_stub, _pthread_rwlock_tryrdlock); -__weak_reference(_pthread_rwlock_trywrlock_stub, _pthread_rwlock_trywrlock); -__weak_reference(_pthread_rwlock_unlock_stub, _pthread_rwlock_unlock); -__weak_reference(_pthread_rwlock_wrlock_stub, _pthread_rwlock_wrlock); -__weak_reference(_pthread_setspecific_stub, _pthread_setspecific); -__weak_reference(_pthread_sigmask_stub, _pthread_sigmask); - -__weak_reference(pthread_cond_init_stub, pthread_cond_init); -__weak_reference(pthread_cond_signal_stub, pthread_cond_signal); -__weak_reference(pthread_cond_broadcast_stub, pthread_cond_broadcast); -__weak_reference(pthread_cond_wait_stub, pthread_cond_wait); -__weak_reference(pthread_cond_destroy_stub, pthread_cond_destroy); -__weak_reference(pthread_getspecific_stub, pthread_getspecific); -__weak_reference(pthread_key_create_stub, pthread_key_create); -__weak_reference(pthread_key_delete_stub, pthread_key_delete); -__weak_reference(pthread_main_np_stub, pthread_main_np); -__weak_reference(pthread_mutex_destroy_stub, pthread_mutex_destroy); -__weak_reference(pthread_mutex_init_stub, pthread_mutex_init); -__weak_reference(pthread_mutex_lock_stub, pthread_mutex_lock); -__weak_reference(pthread_mutex_trylock_stub, pthread_mutex_trylock); -__weak_reference(pthread_mutex_unlock_stub, pthread_mutex_unlock); -__weak_reference(pthread_mutexattr_init_stub, pthread_mutexattr_init); -__weak_reference(pthread_mutexattr_destroy_stub, pthread_mutexattr_destroy); -__weak_reference(pthread_mutexattr_settype_stub, pthread_mutexattr_settype); -__weak_reference(pthread_once_stub, pthread_once); -__weak_reference(pthread_self_stub, pthread_self); -__weak_reference(pthread_rwlock_init_stub, pthread_rwlock_init); -__weak_reference(pthread_rwlock_destroy_stub, pthread_rwlock_destroy); -__weak_reference(pthread_rwlock_rdlock_stub, pthread_rwlock_rdlock); -__weak_reference(pthread_rwlock_tryrdlock_stub, pthread_rwlock_tryrdlock); -__weak_reference(pthread_rwlock_trywrlock_stub, pthread_rwlock_trywrlock); -__weak_reference(pthread_rwlock_unlock_stub, pthread_rwlock_unlock); -__weak_reference(pthread_rwlock_wrlock_stub, pthread_rwlock_wrlock); -__weak_reference(pthread_setspecific_stub, pthread_setspecific); -__weak_reference(pthread_sigmask_stub, pthread_sigmask); /* Define a null pthread structure just to satisfy _pthread_self. */ struct pthread { @@ -112,342 +48,179 @@ static struct pthread main_thread; -static int -_pthread_cond_init_stub(pthread_cond_t *cond, - const pthread_condattr_t *cond_attr) -{ - return (0); -} +static int stub_main(void); +static void *stub_null(void); +static struct pthread *stub_self(void); +static int stub_zero(void); -static int -_pthread_cond_signal_stub(pthread_cond_t *cond) -{ - return (0); -} +#define PJT_DUAL_ENTRY(entry) \ + (pthread_func_t)entry, (pthread_func_t)entry -static int -_pthread_cond_broadcast_stub(pthread_cond_t *cond) -{ - return (0); -} +pthread_func_entry_t __thr_jtable[PJT_MAX] = { + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_BROADCAST */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_SIGNAL */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_WAIT */ + {PJT_DUAL_ENTRY(stub_null)}, /* PJT_GETSPECIFIC */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_CREATE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_DELETE */ + {PJT_DUAL_ENTRY(stub_main)}, /* PJT_MAIN_NP */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_LOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_TRYLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_UNLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_SETTYPE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ONCE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_RDLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYRDLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYWRLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_UNLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_WRLOCK */ + {PJT_DUAL_ENTRY(stub_self)}, /* PJT_SELF */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SETSPECIFIC */ + {PJT_DUAL_ENTRY(stub_zero)} /* PJT_SIGMASK */ +}; -static int -_pthread_cond_wait_stub(pthread_cond_t *cond, pthread_mutex_t *mutex) -{ - return (0); -} +/* + * Weak aliases for exported (pthread_*) and internal (_pthread_*) routines. + */ +#define WEAK_REF(sym, alias) __weak_reference(sym, alias) -static int -_pthread_cond_destroy_stub(pthread_cond_t *cond) -{ - return (0); -} +#define FUNC_TYPE(name) __CONCAT(name, _func_t) +#define FUNC_INT(name) __CONCAT(name, _int) +#define FUNC_EXP(name) __CONCAT(name, _exp) -static void * -_pthread_getspecific_stub(pthread_key_t key) -{ - return (NULL); -} +#define STUB_FUNC(name, idx, ret) \ + static ret FUNC_EXP(name)(void) __unused; \ + static ret FUNC_INT(name)(void) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(void); \ + static ret FUNC_EXP(name)(void) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func()); \ + } \ + static ret FUNC_INT(name)(void) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func()); \ + } -static int -_pthread_key_create_stub(pthread_key_t *key, void (*destructor) (void *)) -{ - return (0); -} +#define STUB_FUNC1(name, idx, ret, p0_type) \ + static ret FUNC_EXP(name)(p0_type) __unused; \ + static ret FUNC_INT(name)(p0_type) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(p0_type); \ + static ret FUNC_EXP(name)(p0_type p0) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func(p0)); \ + } \ + static ret FUNC_INT(name)(p0_type p0) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func(p0)); \ + } -static int -_pthread_key_delete_stub(pthread_key_t key) -{ - return (0); -} +#define STUB_FUNC2(name, idx, ret, p0_type, p1_type) \ + static ret FUNC_EXP(name)(p0_type, p1_type) __unused; \ + static ret FUNC_INT(name)(p0_type, p1_type) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(p0_type, p1_type); \ + static ret FUNC_EXP(name)(p0_type p0, p1_type p1) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func(p0, p1)); \ + } \ + static ret FUNC_INT(name)(p0_type p0, p1_type p1) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func(p0, p1)); \ + } -static int -_pthread_main_np_stub() -{ - return (-1); -} +#define STUB_FUNC3(name, idx, ret, p0_type, p1_type, p2_type) \ + static ret FUNC_EXP(name)(p0_type, p1_type, p2_type) __unused; \ + static ret FUNC_INT(name)(p0_type, p1_type, p2_type) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(p0_type, p1_type, p2_type); \ + static ret FUNC_EXP(name)(p0_type p0, p1_type p1, p2_type p2) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func(p0, p1, p2)); \ + } \ + static ret FUNC_INT(name)(p0_type p0, p1_type p1, p2_type p2) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func(p0, p1, p2)); \ + } -static int -_pthread_mutex_destroy_stub(pthread_mutex_t *mattr) -{ - return (0); -} +STUB_FUNC1(pthread_cond_broadcast, PJT_COND_BROADCAST, int, void *) +STUB_FUNC1(pthread_cond_destroy, PJT_COND_DESTROY, int, void *) +STUB_FUNC2(pthread_cond_init, PJT_COND_INIT, int, void *, void *) +STUB_FUNC1(pthread_cond_signal, PJT_COND_SIGNAL, int, void *) +STUB_FUNC1(pthread_cond_wait, PJT_COND_WAIT, int, void *) +STUB_FUNC1(pthread_getspecific, PJT_GETSPECIFIC, void *, pthread_key_t) +STUB_FUNC2(pthread_key_create, PJT_KEY_CREATE, int, void *, void *) +STUB_FUNC1(pthread_key_delete, PJT_KEY_DELETE, int, pthread_key_t) +STUB_FUNC(pthread_main_np, PJT_MAIN_NP, int) +STUB_FUNC1(pthread_mutex_destroy, PJT_MUTEX_DESTROY, int, void *) +STUB_FUNC2(pthread_mutex_init, PJT_MUTEX_INIT, int, void *, void *) +STUB_FUNC1(pthread_mutex_lock, PJT_MUTEX_LOCK, int, void *) +STUB_FUNC1(pthread_mutex_trylock, PJT_MUTEX_TRYLOCK, int, void *) +STUB_FUNC1(pthread_mutex_unlock, PJT_MUTEX_UNLOCK, int, void *) +STUB_FUNC1(pthread_mutexattr_destroy, PJT_MUTEXATTR_DESTROY, int, void *) +STUB_FUNC1(pthread_mutexattr_init, PJT_MUTEXATTR_INIT, int, void *) +STUB_FUNC1(pthread_mutexattr_settype, PJT_MUTEXATTR_SETTYPE, int, void *) +STUB_FUNC2(pthread_once, PJT_ONCE, int, void *, void *) +STUB_FUNC1(pthread_rwlock_destroy, PJT_RWLOCK_DESTROY, int, void *) +STUB_FUNC2(pthread_rwlock_init, PJT_RWLOCK_INIT, int, void *, void *) +STUB_FUNC1(pthread_rwlock_rdlock, PJT_RWLOCK_RDLOCK, int, void *) +STUB_FUNC1(pthread_rwlock_tryrdlock, PJT_RWLOCK_TRYRDLOCK, int, void *) +STUB_FUNC1(pthread_rwlock_trywrlock, PJT_RWLOCK_TRYWRLOCK, int, void *) >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 15 7: 3:27 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6708037B404; Fri, 15 Nov 2002 07:03:26 -0800 (PST) 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 129D037B401 for ; Fri, 15 Nov 2002 07:03:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B125143E42 for ; Fri, 15 Nov 2002 07:03:25 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAFF0mmV091355 for ; Fri, 15 Nov 2002 07:00:48 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAFF0l5L091352 for perforce@freebsd.org; Fri, 15 Nov 2002 07:00:47 -0800 (PST) Date: Fri, 15 Nov 2002 07:00:47 -0800 (PST) Message-Id: <200211151500.gAFF0l5L091352@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21069 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21069 Change 21069 by green@green_laptop_2 on 2002/11/15 06:59:46 Fix a mtx_lock() which should have been a mtx_unlock(). (Noticed by mike halderman .) Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#39 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#39 (text+ko) ==== @@ -521,7 +521,7 @@ * This can only happen for a multi-threaded application. */ if (mac_lomac_dominate_single(objlabel, &subj->mac_lomac)) { - mtx_lock(&subj->mtx); + mtx_unlock(&subj->mtx); return (0); } } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 15 9: 0:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CC1037B404; Fri, 15 Nov 2002 09:00:48 -0800 (PST) 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 DC6CA37B401 for ; Fri, 15 Nov 2002 09:00:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CEC543E6E for ; Fri, 15 Nov 2002 09:00:47 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAFGw9mV002108 for ; Fri, 15 Nov 2002 08:58:09 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAFGw9Ec002100 for perforce@freebsd.org; Fri, 15 Nov 2002 08:58:09 -0800 (PST) Date: Fri, 15 Nov 2002 08:58:09 -0800 (PST) Message-Id: <200211151658.gAFGw9Ec002100@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21070 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21070 Change 21070 by green@green_laptop_2 on 2002/11/15 08:58:01 * Correct the usage for setfmac(8) in its manpage and that of setf{,s}mac(8) in the usage() statement. * Implement -R for recursive labelling for setfmac.8 since it's essentially free now. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfmac.8#2 edit .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfmac.8#2 (text+ko) ==== @@ -39,9 +39,9 @@ .Nd set MAC label for a file system object .Sh SYNOPSIS .Nm -.Ar label -.Ar file -.Op Ar file ... +.Op Fl Rh +.Ar label file +.Op Ar ... .Sh DESCRIPTION The .Nm ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#7 (text+ko) ==== @@ -86,7 +86,7 @@ FTSENT *ftsent; FTS *fts; struct label_specs *specs; - int eflag = 0, xflag = 0, vflag = 0, hflag; + int eflag = 0, xflag = 0, vflag = 0, Rflag = 0, hflag; int ch, is_setfmac; char *bn; @@ -96,8 +96,11 @@ is_setfmac = strcmp(bn, "setfmac") == 0; hflag = is_setfmac ? FTS_LOGICAL : FTS_PHYSICAL; specs = new_specs(); - while ((ch = getopt(argc, argv, is_setfmac ? "h" : "ef:s:vx")) != -1) { + while ((ch = getopt(argc, argv, is_setfmac ? "Rh" : "ef:s:vx")) != -1) { switch (ch) { + case 'R': + Rflag = 1; + break; case 'e': eflag = 1; break; @@ -143,7 +146,7 @@ case FTS_D: /* do pre-order */ case FTS_DC: /* do cyclic? */ /* don't ever recurse directories as setfmac(8) */ - if (is_setfmac) + if (is_setfmac && !Rflag) fts_set(fts, ftsent, FTS_SKIP); case FTS_DEFAULT: /* do default */ case FTS_F: /* do regular */ @@ -180,9 +183,9 @@ { if (is_setfmac) - fprintf(stderr, "usage: setfmac [-h] label path ...\n"); + fprintf(stderr, "usage: setfmac [-Rh] label path [...]\n"); else - fprintf(stderr, "usage: setfsmac [-evx] [-f specfile [...]] [-s specfile [...]] path ...\n"); + fprintf(stderr, "usage: setfsmac [-evx] [-f specfile [...]] [-s specfile [...]] path [...]\n"); exit(1); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 15 9:50:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C2DF37B404; Fri, 15 Nov 2002 09:50:49 -0800 (PST) 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 B7C6C37B401 for ; Fri, 15 Nov 2002 09:50:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70BAE43E42 for ; Fri, 15 Nov 2002 09:50:48 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAFHmAmV007416 for ; Fri, 15 Nov 2002 09:48:10 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAFHmAcH007411 for perforce@freebsd.org; Fri, 15 Nov 2002 09:48:10 -0800 (PST) Date: Fri, 15 Nov 2002 09:48:10 -0800 (PST) Message-Id: <200211151748.gAFHmAcH007411@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21071 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21071 Change 21071 by peter@peter_precision on 2002/11/15 09:47:48 Dont use utime(3) (obsolete anyway). It is sizeof(time_t) sensitive and is asking for trouble if you get includes out of sync with the emulation of utime() in libc/gen/utime.c. utimes(2) uses struct timeval, which has explicit 'long' values for times. Affected files ... .. //depot/projects/ia64/usr.bin/xinstall/xinstall.c#12 edit Differences ... ==== //depot/projects/ia64/usr.bin/xinstall/xinstall.c#12 (text+ko) ==== @@ -64,7 +64,6 @@ #include #include #include -#include #include "pathnames.h" @@ -262,7 +261,7 @@ install(const char *from_name, const char *to_name, u_long fset, u_int flags) { struct stat from_sb, temp_sb, to_sb; - struct utimbuf utb; + struct timeval tvb[2]; int devnull, files_match, from_fd, serrno, target; int tempcopy, temp_fd, to_fd; char backup[MAXPATHLEN], *p, pathbuf[MAXPATHLEN], tempfile[MAXPATHLEN]; @@ -377,9 +376,11 @@ * Need to preserve target file times, though. */ if (to_sb.st_nlink != 1) { - utb.actime = to_sb.st_atime; - utb.modtime = to_sb.st_mtime; - (void)utime(tempfile, &utb); + tvb[0].tv_sec = to_sb.st_atime; + tvb[0].tv_usec = 0; + tvb[1].tv_sec = to_sb.st_mtime; + tvb[1].tv_usec = 0; + (void)utimes(tempfile, tvb); } else { files_match = 1; (void)unlink(tempfile); @@ -433,9 +434,11 @@ * Preserve the timestamp of the source file if necessary. */ if (dopreserve && !files_match && !devnull) { - utb.actime = from_sb.st_atime; - utb.modtime = from_sb.st_mtime; - (void)utime(to_name, &utb); + tvb[0].tv_sec = from_sb.st_atime; + tvb[0].tv_usec = 0; + tvb[1].tv_sec = from_sb.st_mtime; + tvb[1].tv_usec = 0; + (void)utimes(to_name, tvb); } if (fstat(to_fd, &to_sb) == -1) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 15 9:59:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA05C37B404; Fri, 15 Nov 2002 09:59:04 -0800 (PST) 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 567BD37B401 for ; Fri, 15 Nov 2002 09:59:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4058843E77 for ; Fri, 15 Nov 2002 09:59:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAFHuPmV010301 for ; Fri, 15 Nov 2002 09:56:25 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAFHuNLF010265 for perforce@freebsd.org; Fri, 15 Nov 2002 09:56:23 -0800 (PST) Date: Fri, 15 Nov 2002 09:56:23 -0800 (PST) Message-Id: <200211151756.gAFHuNLF010265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21073 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21073 Change 21073 by peter@peter_daintree on 2002/11/15 09:55:46 IFC @21068 Affected files ... .. //depot/projects/ia64/Makefile.inc1#41 integrate .. //depot/projects/ia64/bin/sleep/sleep.c#4 integrate .. //depot/projects/ia64/contrib/bind/CHANGES#5 integrate .. //depot/projects/ia64/contrib/bind/bin/named/db_defs.h#4 integrate .. //depot/projects/ia64/contrib/bind/bin/named/db_sec.c#3 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_defs.h#5 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_ncache.c#3 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_req.c#5 integrate .. //depot/projects/ia64/contrib/bind/bin/named/ns_resp.c#5 integrate .. //depot/projects/ia64/contrib/bind/lib/nameser/ns_name.c#4 integrate .. //depot/projects/ia64/contrib/bind/lib/nameser/ns_samedomain.c#2 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#21 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/libiberty/Makefile#5 integrate .. //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/auto-host.h#8 integrate .. //depot/projects/ia64/kerberos5/lib/libasn1/Makefile#6 integrate .. //depot/projects/ia64/kerberos5/lib/libhdb/Makefile#6 integrate .. //depot/projects/ia64/lib/libc/gen/_pthread_stubs.c#5 integrate .. //depot/projects/ia64/lib/libc/gen/syslog.c#6 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/_setjmp.S#3 integrate .. //depot/projects/ia64/lib/libc/include/libc_private.h#3 integrate .. //depot/projects/ia64/lib/libc/include/namespace.h#6 integrate .. //depot/projects/ia64/lib/libc/include/un-namespace.h#4 integrate .. //depot/projects/ia64/lib/libc/stdio/findfp.c#8 integrate .. //depot/projects/ia64/lib/libc/stdlib/strtod.c#13 integrate .. //depot/projects/ia64/lib/libc_r/uthread/pthread_private.h#12 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_attr_init.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_autoinit.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_cond.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_condattr_init.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_create.c#6 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_execve.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_exit.c#6 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_gc.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_init.c#7 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_join.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_mattr_init.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_mutex.c#4 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_mutex_prioceiling.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_once.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_pselect.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_rwlock.c#3 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_sem.c#2 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_sig.c#6 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_stack.c#3 integrate .. //depot/projects/ia64/lib/libdisk/change.c#4 integrate .. //depot/projects/ia64/lib/libdisk/chunk.c#8 integrate .. //depot/projects/ia64/lib/libdisk/create_chunk.c#10 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#12 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.h#10 integrate .. //depot/projects/ia64/lib/libdisk/rules.c#7 integrate .. //depot/projects/ia64/lib/libdisk/tst01.c#6 integrate .. //depot/projects/ia64/lib/libdisk/write_alpha_disk.c#4 integrate .. //depot/projects/ia64/lib/libdisk/write_disk.c#6 integrate .. //depot/projects/ia64/lib/libdisk/write_i386_disk.c#3 integrate .. //depot/projects/ia64/lib/libdisk/write_ia64_disk.c#7 integrate .. //depot/projects/ia64/lib/libdisk/write_pc98_disk.c#4 integrate .. //depot/projects/ia64/lib/libdisk/write_sparc64_disk.c#3 integrate .. //depot/projects/ia64/lib/libncurses/Makefile#10 integrate .. //depot/projects/ia64/lib/libpam/modules/Makefile.inc#7 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_krb5/pam_krb5.c#6 integrate .. //depot/projects/ia64/release/alpha/drivers.conf#8 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#13 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#2 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#50 integrate .. //depot/projects/ia64/release/doc/share/examples/Makefile.relnotesng#6 integrate .. //depot/projects/ia64/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#15 integrate .. //depot/projects/ia64/sbin/devd/Makefile#2 integrate .. //depot/projects/ia64/sbin/devd/devd.8#2 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#15 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.c#11 integrate .. //depot/projects/ia64/share/man/man4/vlan.4#6 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#9 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#21 integrate .. //depot/projects/ia64/sys/alpha/conf/GENERIC.hints#3 integrate .. //depot/projects/ia64/sys/boot/common/help.common#4 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#11 integrate .. //depot/projects/ia64/sys/cam/cam_periph.c#5 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_low.c#7 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/ia64/sys/conf/options#34 integrate .. //depot/projects/ia64/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/ia64/sys/dev/aic/aic_pccard.c#4 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#12 integrate .. //depot/projects/ia64/sys/dev/an/if_an_isa.c#3 integrate .. //depot/projects/ia64/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/ia64/sys/dev/an/if_an_pci.c#3 integrate .. //depot/projects/ia64/sys/dev/ar/if_ar.c#5 integrate .. //depot/projects/ia64/sys/dev/awi/awi.c#8 integrate .. //depot/projects/ia64/sys/dev/awi/if_awi_pccard.c#4 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#17 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#10 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus.c#10 integrate .. //depot/projects/ia64/sys/dev/cardbus/cardbus_cis.c#8 integrate .. //depot/projects/ia64/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/ia64/sys/dev/cnw/if_cnw.c#5 integrate .. //depot/projects/ia64/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/ia64/sys/dev/ed/if_ed_pccard.c#9 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#13 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#10 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#5 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep_pccard.c#5 integrate .. //depot/projects/ia64/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/ia64/sys/dev/fe/if_fe.c#3 integrate .. //depot/projects/ia64/sys/dev/fe/if_fe_pccard.c#4 integrate .. //depot/projects/ia64/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#16 integrate .. //depot/projects/ia64/sys/dev/gem/if_gem.c#9 integrate .. //depot/projects/ia64/sys/dev/gx/if_gx.c#6 integrate .. //depot/projects/ia64/sys/dev/gx/if_gxvar.h#4 integrate .. //depot/projects/ia64/sys/dev/hme/if_hme.c#7 integrate .. //depot/projects/ia64/sys/dev/ie/if_ie.c#3 integrate .. //depot/projects/ia64/sys/dev/iicbus/if_ic.c#5 integrate .. //depot/projects/ia64/sys/dev/lge/if_lge.c#7 integrate .. //depot/projects/ia64/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/ia64/sys/dev/lnc/if_lnc.c#5 integrate .. //depot/projects/ia64/sys/dev/lnc/if_lnc_cbus.c#2 integrate .. //depot/projects/ia64/sys/dev/lnc/if_lnc_isa.c#2 integrate .. //depot/projects/ia64/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/ia64/sys/dev/mly/mly.c#5 integrate .. //depot/projects/ia64/sys/dev/my/if_my.c#8 integrate .. //depot/projects/ia64/sys/dev/nge/if_nge.c#13 integrate .. //depot/projects/ia64/sys/dev/nge/if_ngereg.h#5 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard.c#13 integrate .. //depot/projects/ia64/sys/dev/pccard/pccard_cis.c#7 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs#15 integrate .. //depot/projects/ia64/sys/dev/pccard/pccarddevs.h#15 integrate .. //depot/projects/ia64/sys/dev/pccard/pccardvar.h#7 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#19 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#14 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#10 integrate .. //depot/projects/ia64/sys/dev/pdq/pdq_ifsubr.c#5 integrate .. //depot/projects/ia64/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/ia64/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/ia64/sys/dev/sbni/if_sbni.c#7 integrate .. //depot/projects/ia64/sys/dev/sn/if_sn.c#4 integrate .. //depot/projects/ia64/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/ia64/sys/dev/sr/if_sr.c#6 integrate .. //depot/projects/ia64/sys/dev/trm/trm.c#2 integrate .. //depot/projects/ia64/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/ia64/sys/dev/txp/if_txp.c#6 integrate .. //depot/projects/ia64/sys/dev/usb/if_aue.c#14 integrate .. //depot/projects/ia64/sys/dev/usb/if_auereg.h#7 integrate .. //depot/projects/ia64/sys/dev/usb/if_cue.c#7 integrate .. //depot/projects/ia64/sys/dev/usb/if_cuereg.h#4 integrate .. //depot/projects/ia64/sys/dev/usb/if_kue.c#8 integrate .. //depot/projects/ia64/sys/dev/usb/if_kuereg.h#5 integrate .. //depot/projects/ia64/sys/dev/usb/usb_ethersubr.c#4 integrate .. //depot/projects/ia64/sys/dev/vx/if_vx.c#6 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#25 integrate .. //depot/projects/ia64/sys/dev/wl/if_wl.c#5 integrate .. //depot/projects/ia64/sys/dev/xe/if_xe.c#4 integrate .. //depot/projects/ia64/sys/dev/xe/if_xe_pccard.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/i686_mem.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/mp_clock.c#4 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#22 integrate .. //depot/projects/ia64/sys/i386/isa/if_cx.c#3 integrate .. //depot/projects/ia64/sys/i386/isa/if_el.c#3 integrate .. //depot/projects/ia64/sys/i386/isa/if_le.c#6 integrate .. //depot/projects/ia64/sys/i386/isa/if_rdp.c#5 integrate .. //depot/projects/ia64/sys/i386/pci/pci_bus.c#11 integrate .. //depot/projects/ia64/sys/i386/pci/pci_cfgreg.c#13 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_ipr.c#8 integrate .. //depot/projects/ia64/sys/i4b/driver/i4b_isppp.c#6 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#45 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#19 integrate .. //depot/projects/ia64/sys/kern/subr_log.c#7 integrate .. //depot/projects/ia64/sys/kern/subr_prf.c#16 integrate .. //depot/projects/ia64/sys/modules/agp/Makefile#3 integrate .. //depot/projects/ia64/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/ia64/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/ia64/sys/net/bpf.c#13 integrate .. //depot/projects/ia64/sys/net/bpf.h#4 integrate .. //depot/projects/ia64/sys/net/bpfdesc.h#5 integrate .. //depot/projects/ia64/sys/net/bridge.c#12 integrate .. //depot/projects/ia64/sys/net/bridge.h#4 integrate .. //depot/projects/ia64/sys/net/ethernet.h#6 integrate .. //depot/projects/ia64/sys/net/fddi.h#4 integrate .. //depot/projects/ia64/sys/net/if.h#11 integrate .. //depot/projects/ia64/sys/net/if_arcsubr.c#6 integrate .. //depot/projects/ia64/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/ia64/sys/net/if_disc.c#4 integrate .. //depot/projects/ia64/sys/net/if_ef.c#5 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#19 integrate .. //depot/projects/ia64/sys/net/if_faith.c#7 integrate .. //depot/projects/ia64/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/ia64/sys/net/if_gif.c#12 integrate .. //depot/projects/ia64/sys/net/if_gre.c#5 integrate .. //depot/projects/ia64/sys/net/if_loop.c#8 integrate .. //depot/projects/ia64/sys/net/if_ppp.c#9 integrate .. //depot/projects/ia64/sys/net/if_sl.c#7 integrate .. //depot/projects/ia64/sys/net/if_stf.c#10 integrate .. //depot/projects/ia64/sys/net/if_tap.c#13 integrate .. //depot/projects/ia64/sys/net/if_tun.c#10 integrate .. //depot/projects/ia64/sys/net/if_var.h#12 integrate .. //depot/projects/ia64/sys/net/if_vlan.c#9 integrate .. //depot/projects/ia64/sys/net/if_vlan_var.h#3 integrate .. //depot/projects/ia64/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/ia64/sys/netgraph/ng_ether.c#6 integrate .. //depot/projects/ia64/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/ia64/sys/netinet/ip_dummynet.c#11 integrate .. //depot/projects/ia64/sys/netinet/ip_gre.c#5 integrate .. //depot/projects/ia64/sys/pci/agp.c#9 integrate .. //depot/projects/ia64/sys/pci/agp_ali.c#3 integrate .. //depot/projects/ia64/sys/pci/agp_amd.c#7 integrate .. //depot/projects/ia64/sys/pci/agp_i810.c#9 integrate .. //depot/projects/ia64/sys/pci/agp_intel.c#7 integrate .. //depot/projects/ia64/sys/pci/agp_sis.c#3 integrate .. //depot/projects/ia64/sys/pci/agp_via.c#3 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#18 integrate .. //depot/projects/ia64/sys/pci/if_de.c#5 integrate .. //depot/projects/ia64/sys/pci/if_pcn.c#7 integrate .. //depot/projects/ia64/sys/pci/if_rl.c#18 integrate .. //depot/projects/ia64/sys/pci/if_sf.c#8 integrate .. //depot/projects/ia64/sys/pci/if_sis.c#12 integrate .. //depot/projects/ia64/sys/pci/if_sk.c#8 integrate .. //depot/projects/ia64/sys/pci/if_ste.c#10 integrate .. //depot/projects/ia64/sys/pci/if_ti.c#14 integrate .. //depot/projects/ia64/sys/pci/if_tl.c#7 integrate .. //depot/projects/ia64/sys/pci/if_vr.c#9 integrate .. //depot/projects/ia64/sys/pci/if_wb.c#8 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#12 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/pmap.c#19 integrate .. //depot/projects/ia64/sys/sparc64/include/pmap.h#11 integrate .. //depot/projects/ia64/sys/sparc64/pci/psycho.c#11 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#24 integrate .. //depot/projects/ia64/sys/sys/msgbuf.h#4 integrate .. //depot/projects/ia64/sys/sys/socket.h#10 integrate .. //depot/projects/ia64/sys/sys/stddef.h#1 branch .. //depot/projects/ia64/sys/vm/pmap.h#11 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#23 integrate .. //depot/projects/ia64/sys/vm/vm_object.h#10 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#18 integrate .. //depot/projects/ia64/usr.bin/fetch/fetch.c#12 integrate .. //depot/projects/ia64/usr.bin/xargs/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/xargs/xargs.c#19 integrate .. //depot/projects/ia64/usr.bin/xinstall/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/crunch/crunchide/exec_elf32.c#4 integrate .. //depot/projects/ia64/usr.sbin/mtree/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.8#3 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#9 integrate .. //depot/projects/ia64/usr.sbin/pkg_install/lib/file.c#8 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/config.c#7 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/devices.c#6 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/disks.c#8 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/install.c#9 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/label.c#9 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#41 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.310 2002/11/03 23:48:14 scottl Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.312 2002/11/14 19:24:50 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -123,6 +123,7 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +OSRELDATE!= sysctl -n kern.osreldate TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -193,7 +194,8 @@ BMAKEENV= MAKEOBJDIRPREFIX=${WORLDTMP} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ +BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + BOOTSTRAPPING=${OSRELDATE} \ -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ -DNO_CPU_CFLAGS -DNO_WERROR @@ -201,8 +203,8 @@ TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ - -DNO_CPU_CFLAGS +TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 \ + BOOTSTRAPPING=${OSRELDATE} -DNO_CPU_CFLAGS # cross-tool stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB @@ -727,7 +729,8 @@ .endif _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ - lib/libncurses lib/libopie lib/libradius lib/librpcsvc \ + lib/libncurses lib/libopie lib/libpam lib/libradius \ + lib/librpcsvc \ lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ lib/libz lib/msun @@ -753,7 +756,7 @@ _generic_libs+= usr.sbin/pcvt/keycap .endif -.for _lib in ${_startup_libs} ${_prebuild_libs} ${_generic_libs} +.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) ${ECHODIR} "===> ${_lib}"; \ @@ -764,6 +767,16 @@ .endif .endfor +# libpam is special: we need to build static PAM modules before +# static PAM library, and dynamic PAM library before dynamic PAM +# modules. +lib/libpam__L: .PHONY + ${ECHODIR} "===> lib/libpam"; \ + cd ${.CURDIR}/lib/libpam; \ + ${MAKE} DIRPRFX=lib/libpam/ depend; \ + ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ + ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install + _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} ==== //depot/projects/ia64/bin/sleep/sleep.c#4 (text+ko) ==== @@ -43,14 +43,14 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.12 2002/06/30 05:15:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.15 2002/11/14 01:14:35 njl Exp $"); #include #include -#include #include #include #include +#include void usage(void); @@ -59,25 +59,15 @@ { struct timespec time_to_sleep; long l; - int ch, neg; + int neg; char *p; - while ((ch = getopt(argc, argv, "")) != -1) - switch(ch) { - case '?': - default: - usage(); - /* NOTREACHED */ - } - argc -= optind; - argv += optind; - - if (argc != 1) { + if (argc != 2) { usage(); /* NOTREACHED */ } - p = argv[0]; + p = argv[1]; /* Skip over leading whitespaces. */ while (isspace((unsigned char)*p)) @@ -88,6 +78,9 @@ if (*p == '-') { neg = 1; ++p; + if (!isdigit((unsigned char)*p) && *p != '.') + usage(); + /* NOTREACHED */ } else if (*p == '+') ++p; @@ -128,7 +121,8 @@ void usage(void) { + const char *msg = "usage: sleep seconds\n"; - (void)fprintf(stderr, "usage: sleep seconds\n"); + write(STDERR_FILENO, msg, strlen(msg)); exit(1); } ==== //depot/projects/ia64/contrib/bind/CHANGES#5 (text+ko) ==== @@ -1,3 +1,23 @@ +1469. [bug] buffer length calculation for PX was wrong. + +1468. [bug] ns_name_ntol() could overwite a zero length buffer. + +1467. [bug] off by one bug in ns_makecannon(). + +1466. [bug] large ENDS UDP buffer size could trigger a assertion. + +1465. [bug] possible NULL pointer dereference in db_sec.c + +1464. [bug] the buffer used to construct the -ve record was not + big enough for all possible SOA records. use pointer + arithmetic to calculate the remaining size in this + buffer. + +1463. [bug] use serial space arithmetic to determine if a SIG is + too old, in the future or has internally constistant + times. + +1462. [bug] write buffer overflow in make_rr(). --- 8.3.3-REL released --- (Wed Jun 26 21:15:43 PDT 2002) ==== //depot/projects/ia64/contrib/bind/bin/named/db_defs.h#4 (text+ko) ==== @@ -78,7 +78,7 @@ */ /* max length of data in RR data field */ -#define MAXDATA (2*MAXDNAME + 5*INT32SZ) +#define MAXDATA (3*MAXDNAME + 5*INT32SZ) /* max length of data in a TXT RR segment */ #define MAXCHARSTRING 255 ==== //depot/projects/ia64/contrib/bind/bin/named/db_sec.c#3 (text+ko) ==== @@ -479,7 +479,9 @@ struct sig_record *sigdata; struct dnode *sigdn; struct databuf *sigdp; - time_t now; + u_int32_t now; + u_int32_t exptime; + u_int32_t signtime; char *signer; u_char name_n[MAXDNAME]; u_char *sig, *eom; @@ -492,6 +494,7 @@ int dnssec_failed = 0, dnssec_succeeded = 0; int return_value; int i; + int expired = 0; if (rrset == NULL || rrset->rr_name == NULL) { ns_warning (ns_log_default, "verify_set: missing rrset/name"); @@ -527,11 +530,14 @@ * Don't verify a set if the SIG inception time is in * the future. This should be fixed before 2038 (BEW) */ - if ((time_t)ntohl(sigdata->sig_time_n) > now) + signtime = ntohl(sigdata->sig_time_n); + if (SEQ_GT(signtime, now)) continue; /* An expired set is dropped, but the data is not. */ - if ((time_t)ntohl(sigdata->sig_exp_n) < now) { + exptime = ntohl(sigdata->sig_exp_n); + if (SEQ_GT(now, exptime)) { + expired++; db_detach(&sigdn->dp); sigdp = NULL; continue; @@ -723,7 +729,7 @@ } end: - if (dnssec_failed > 0) + if (dnssec_failed > 0 || expired > 0) rrset_trim_sigs(rrset); if (trustedkey == 0 && key != NULL) dst_free_key(key); ==== //depot/projects/ia64/contrib/bind/bin/named/ns_defs.h#5 (text+ko) ==== @@ -469,7 +469,7 @@ q_cmsglen, /* len of cname message */ q_cmsgsize; /* allocated size of cname message */ int16_t q_dfd; /* UDP file descriptor */ - int16_t q_udpsize; /* UDP message size */ + u_int16_t q_udpsize; /* UDP message size */ int q_distance; /* distance this query is from the * original query that the server * received. */ ==== //depot/projects/ia64/contrib/bind/bin/named/ns_ncache.c#3 (text+ko) ==== @@ -66,7 +66,7 @@ u_int16_t atype; u_char *sp, *cp1; u_char data[MAXDATA]; - size_t len = sizeof data; + u_char *eod = data + sizeof(data); #endif nameserIncr(from.sin_addr, nssRcvdNXD); @@ -186,7 +186,7 @@ rdatap = cp; /* origin */ - n = dn_expand(msg, msg + msglen, cp, (char*)data, len); + n = dn_expand(msg, msg + msglen, cp, (char*)data, eod - data); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: origin form error"); @@ -195,9 +195,8 @@ cp += n; n = strlen((char*)data) + 1; cp1 = data + n; - len -= n; /* mail */ - n = dn_expand(msg, msg + msglen, cp, (char*)cp1, len); + n = dn_expand(msg, msg + msglen, cp, (char*)cp1, eod - cp1); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: mail form error"); return; @@ -205,20 +204,20 @@ cp += n; n = strlen((char*)cp1) + 1; cp1 += n; - len -= n; n = 5 * INT32SZ; + if (n > (eod - cp1)) /* Can't happen. See MAXDATA. */ + return; BOUNDS_CHECK(cp, n); memcpy(cp1, cp, n); /* serial, refresh, retry, expire, min */ cp1 += n; - len -= n; cp += n; if (cp != rdatap + dlen) { ns_debug(ns_log_ncache, 3, "ncache: form error"); return; } /* store the zone of the soa record */ - n = dn_expand(msg, msg + msglen, sp, (char*)cp1, len); + n = dn_expand(msg, msg + msglen, sp, (char*)cp1, eod - cp1); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: form error 2"); return; ==== //depot/projects/ia64/contrib/bind/bin/named/ns_req.c#5 (text+ko) ==== @@ -2195,7 +2195,7 @@ /* first just copy over the type_covered, algorithm, */ /* labels, orig ttl, two timestamps, and the footprint */ - if ((dp->d_size - 18) > buflen) + if (buflen < 18) goto cleanup; /* out of room! */ memcpy(cp, cp1, 18); cp += 18; ==== //depot/projects/ia64/contrib/bind/bin/named/ns_resp.c#5 (text+ko) ==== @@ -2001,7 +2001,7 @@ * to BOUNDS_CHECK() here. */ cp1 += (n = strlen((char *)cp1) + 1); - n1 = sizeof(data) - n; + n1 = sizeof(data) - n - INT16SZ; n = dn_expand(msg, eom, cp, (char *)cp1, n1); if (n < 0) { hp->rcode = FORMERR; @@ -2043,8 +2043,18 @@ ttl = origTTL; } + /* + * Check that expire and signature times are internally + * consistant. + */ + if (!SEQ_GT(exptime, signtime) && exptime != signtime) { + ns_debug(ns_log_default, 3, + "ignoring SIG: signature expires before it was signed"); + return ((cp - rrp) + dlen); + } + /* Don't let bogus signers "sign" in the future. */ - if (signtime > now) { + if (SEQ_GT(signtime, now)) { ns_debug(ns_log_default, 3, "ignoring SIG: signature date %s is in the future", p_secstodate (signtime)); @@ -2052,7 +2062,7 @@ } /* Ignore received SIG RR's that are already expired. */ - if (exptime <= now) { + if (SEQ_GT(now, exptime)) { ns_debug(ns_log_default, 3, "ignoring SIG: expiration %s is in the past", p_secstodate (exptime)); ==== //depot/projects/ia64/contrib/bind/lib/nameser/ns_name.c#4 (text+ko) ==== @@ -341,6 +341,10 @@ dn = dst; eom = dst + dstsiz; + if (dn >= eom) { + errno = EMSGSIZE; + return (-1); + } while ((n = *cp++) != 0) { if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) { /* Some kind of compression pointer. */ ==== //depot/projects/ia64/contrib/bind/lib/nameser/ns_samedomain.c#2 (text+ko) ==== @@ -166,7 +166,7 @@ ns_makecanon(const char *src, char *dst, size_t dstsize) { size_t n = strlen(src); - if (n + sizeof "." > dstsize) { + if (n + sizeof "." + 1 > dstsize) { errno = EMSGSIZE; return (-1); } ==== //depot/projects/ia64/etc/defaults/rc.conf#21 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.162 2002/11/12 07:10:45 imp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.163 2002/11/15 08:26:36 ru Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -26,7 +26,7 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). -devd_enable="NO" # Run devd, to trigger progams on device tree changes. +devd_enable="NO" # Run devd, to trigger programs on device tree changes. pccard_enable="NO" # Set to YES if you want to configure PCCARD devices. pccard_mem="DEFAULT" # If pccard_enable=YES, this is card memory address. pccard_beep="2" # pccard beep type. @@ -335,7 +335,7 @@ moused_type="auto" # See man page for rc.conf(5) for available settings. moused_port="/dev/psm0" # Set to your mouse port. moused_flags="" # Any additional flags to moused. -mousechar_start="NO" # if 0xd0-0xd3 default range is occuped in your +mousechar_start="NO" # if 0xd0-0xd3 default range is occupied in your # language code table, specify alternative range # start like mousechar_start=3, see vidcontrol(1) allscreens_flags="" # Set this vidcontrol mode for all virtual screens ==== //depot/projects/ia64/gnu/usr.bin/binutils/libiberty/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.16 2002/05/13 11:09:03 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $ .include "../Makefile.inc0" @@ -10,7 +10,9 @@ hex.c floatformat.c hashtab.c lbasename.c make-temp-file.c \ objalloc.c obstack.c safe-ctype.c xatexit.c xexit.c xmalloc.c \ xstrdup.c xstrerror.c -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440000 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500022 )) SRCS+= basename.c .endif WARNS= 1 ==== //depot/projects/ia64/gnu/usr.bin/cc/cc_tools/auto-host.h#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.10 2002/10/20 07:50:20 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.11 2002/11/13 11:50:40 ru Exp $ */ #include @@ -357,7 +357,10 @@ /* #undef _GNU_SOURCE */ /* Define if you have a working header file. */ +#if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \ + __FreeBSD_version >= 500014 #define HAVE_STDBOOL_H 1 +#endif /* Define if you can safely include both and . */ #define STRING_WITH_STRINGS 1 ==== //depot/projects/ia64/kerberos5/lib/libasn1/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.16 2002/08/13 16:52:50 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $ LIB= asn1 CFLAGS+=-I${KRB5DIR}/include \ @@ -106,7 +106,9 @@ strupr.c ${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET} -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440001 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 )) asn1_compile: getprogname.c setprogname.c .endif ==== //depot/projects/ia64/kerberos5/lib/libhdb/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.9 2002/08/13 16:52:52 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.10 2002/11/13 13:49:29 ru Exp $ LIB= hdb CFLAGS+=-I${KRB5DIR}/include \ @@ -61,7 +61,9 @@ get_window_size.c strupr.c ${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET} -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440001 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 )) asn1_compile: getprogname.c setprogname.c .endif ==== //depot/projects/ia64/lib/libc/gen/_pthread_stubs.c#5 (text+ko) ==== @@ -25,14 +25,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.8 2002/11/01 09:37:16 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.10 2002/11/13 21:55:22 deischen Exp $"); #include #include -#include -void *_pthread_getspecific(pthread_key_t key); -pthread_t _pthread_self(void); +#include "libc_private.h" /* * Weak symbols: All libc internal usage of these functions should @@ -42,69 +40,7 @@ * usage to avoid unwanted cancellation points and to differentiate * between application locks and libc locks (threads holding the * latter can't be allowed to exit/terminate). - * - * We also provide weak pthread_XXX stubs which call their - * _pthread_XXX counterparts. These stubs may be used be other - * libraries for ensuring thread-safety without requiring the presence - * of a thread library. */ -__weak_reference(_pthread_cond_init_stub, _pthread_cond_init); -__weak_reference(_pthread_cond_signal_stub, _pthread_cond_signal); -__weak_reference(_pthread_cond_broadcast_stub, _pthread_cond_broadcast); -__weak_reference(_pthread_cond_wait_stub, _pthread_cond_wait); -__weak_reference(_pthread_cond_destroy_stub, _pthread_cond_destroy); -__weak_reference(_pthread_getspecific_stub, _pthread_getspecific); -__weak_reference(_pthread_key_create_stub, _pthread_key_create); -__weak_reference(_pthread_key_delete_stub, _pthread_key_delete); -__weak_reference(_pthread_main_np_stub, _pthread_main_np); -__weak_reference(_pthread_mutex_destroy_stub, _pthread_mutex_destroy); -__weak_reference(_pthread_mutex_init_stub, _pthread_mutex_init); -__weak_reference(_pthread_mutex_lock_stub, _pthread_mutex_lock); -__weak_reference(_pthread_mutex_trylock_stub, _pthread_mutex_trylock); -__weak_reference(_pthread_mutex_unlock_stub, _pthread_mutex_unlock); -__weak_reference(_pthread_mutexattr_init_stub, _pthread_mutexattr_init); -__weak_reference(_pthread_mutexattr_destroy_stub, _pthread_mutexattr_destroy); -__weak_reference(_pthread_mutexattr_settype_stub, _pthread_mutexattr_settype); -__weak_reference(_pthread_once_stub, _pthread_once); -__weak_reference(_pthread_self_stub, _pthread_self); -__weak_reference(_pthread_rwlock_init_stub, _pthread_rwlock_init); -__weak_reference(_pthread_rwlock_destroy_stub, _pthread_rwlock_destroy); -__weak_reference(_pthread_rwlock_rdlock_stub, _pthread_rwlock_rdlock); -__weak_reference(_pthread_rwlock_tryrdlock_stub, _pthread_rwlock_tryrdlock); -__weak_reference(_pthread_rwlock_trywrlock_stub, _pthread_rwlock_trywrlock); -__weak_reference(_pthread_rwlock_unlock_stub, _pthread_rwlock_unlock); -__weak_reference(_pthread_rwlock_wrlock_stub, _pthread_rwlock_wrlock); -__weak_reference(_pthread_setspecific_stub, _pthread_setspecific); -__weak_reference(_pthread_sigmask_stub, _pthread_sigmask); - -__weak_reference(pthread_cond_init_stub, pthread_cond_init); -__weak_reference(pthread_cond_signal_stub, pthread_cond_signal); -__weak_reference(pthread_cond_broadcast_stub, pthread_cond_broadcast); -__weak_reference(pthread_cond_wait_stub, pthread_cond_wait); -__weak_reference(pthread_cond_destroy_stub, pthread_cond_destroy); -__weak_reference(pthread_getspecific_stub, pthread_getspecific); -__weak_reference(pthread_key_create_stub, pthread_key_create); -__weak_reference(pthread_key_delete_stub, pthread_key_delete); -__weak_reference(pthread_main_np_stub, pthread_main_np); -__weak_reference(pthread_mutex_destroy_stub, pthread_mutex_destroy); -__weak_reference(pthread_mutex_init_stub, pthread_mutex_init); -__weak_reference(pthread_mutex_lock_stub, pthread_mutex_lock); -__weak_reference(pthread_mutex_trylock_stub, pthread_mutex_trylock); -__weak_reference(pthread_mutex_unlock_stub, pthread_mutex_unlock); -__weak_reference(pthread_mutexattr_init_stub, pthread_mutexattr_init); -__weak_reference(pthread_mutexattr_destroy_stub, pthread_mutexattr_destroy); -__weak_reference(pthread_mutexattr_settype_stub, pthread_mutexattr_settype); -__weak_reference(pthread_once_stub, pthread_once); -__weak_reference(pthread_self_stub, pthread_self); -__weak_reference(pthread_rwlock_init_stub, pthread_rwlock_init); -__weak_reference(pthread_rwlock_destroy_stub, pthread_rwlock_destroy); -__weak_reference(pthread_rwlock_rdlock_stub, pthread_rwlock_rdlock); -__weak_reference(pthread_rwlock_tryrdlock_stub, pthread_rwlock_tryrdlock); -__weak_reference(pthread_rwlock_trywrlock_stub, pthread_rwlock_trywrlock); -__weak_reference(pthread_rwlock_unlock_stub, pthread_rwlock_unlock); -__weak_reference(pthread_rwlock_wrlock_stub, pthread_rwlock_wrlock); -__weak_reference(pthread_setspecific_stub, pthread_setspecific); -__weak_reference(pthread_sigmask_stub, pthread_sigmask); /* Define a null pthread structure just to satisfy _pthread_self. */ struct pthread { @@ -112,342 +48,179 @@ static struct pthread main_thread; -static int -_pthread_cond_init_stub(pthread_cond_t *cond, - const pthread_condattr_t *cond_attr) -{ - return (0); -} +static int stub_main(void); +static void *stub_null(void); +static struct pthread *stub_self(void); +static int stub_zero(void); -static int -_pthread_cond_signal_stub(pthread_cond_t *cond) -{ - return (0); -} +#define PJT_DUAL_ENTRY(entry) \ + (pthread_func_t)entry, (pthread_func_t)entry -static int -_pthread_cond_broadcast_stub(pthread_cond_t *cond) -{ - return (0); -} +pthread_func_entry_t __thr_jtable[PJT_MAX] = { + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_BROADCAST */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_SIGNAL */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_WAIT */ + {PJT_DUAL_ENTRY(stub_null)}, /* PJT_GETSPECIFIC */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_CREATE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_DELETE */ + {PJT_DUAL_ENTRY(stub_main)}, /* PJT_MAIN_NP */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_LOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_TRYLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_UNLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_SETTYPE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ONCE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_RDLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYRDLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYWRLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_UNLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_WRLOCK */ + {PJT_DUAL_ENTRY(stub_self)}, /* PJT_SELF */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SETSPECIFIC */ + {PJT_DUAL_ENTRY(stub_zero)} /* PJT_SIGMASK */ +}; -static int -_pthread_cond_wait_stub(pthread_cond_t *cond, pthread_mutex_t *mutex) -{ - return (0); -} +/* + * Weak aliases for exported (pthread_*) and internal (_pthread_*) routines. + */ +#define WEAK_REF(sym, alias) __weak_reference(sym, alias) -static int -_pthread_cond_destroy_stub(pthread_cond_t *cond) -{ - return (0); -} +#define FUNC_TYPE(name) __CONCAT(name, _func_t) +#define FUNC_INT(name) __CONCAT(name, _int) +#define FUNC_EXP(name) __CONCAT(name, _exp) -static void * -_pthread_getspecific_stub(pthread_key_t key) -{ - return (NULL); -} +#define STUB_FUNC(name, idx, ret) \ + static ret FUNC_EXP(name)(void) __unused; \ + static ret FUNC_INT(name)(void) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(void); \ + static ret FUNC_EXP(name)(void) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func()); \ + } \ + static ret FUNC_INT(name)(void) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func()); \ + } -static int -_pthread_key_create_stub(pthread_key_t *key, void (*destructor) (void *)) -{ - return (0); -} +#define STUB_FUNC1(name, idx, ret, p0_type) \ + static ret FUNC_EXP(name)(p0_type) __unused; \ + static ret FUNC_INT(name)(p0_type) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(p0_type); \ + static ret FUNC_EXP(name)(p0_type p0) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func(p0)); \ + } \ + static ret FUNC_INT(name)(p0_type p0) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func(p0)); \ + } -static int -_pthread_key_delete_stub(pthread_key_t key) -{ - return (0); -} +#define STUB_FUNC2(name, idx, ret, p0_type, p1_type) \ + static ret FUNC_EXP(name)(p0_type, p1_type) __unused; \ + static ret FUNC_INT(name)(p0_type, p1_type) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(p0_type, p1_type); \ + static ret FUNC_EXP(name)(p0_type p0, p1_type p1) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func(p0, p1)); \ + } \ + static ret FUNC_INT(name)(p0_type p0, p1_type p1) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func(p0, p1)); \ + } -static int -_pthread_main_np_stub() -{ - return (-1); -} +#define STUB_FUNC3(name, idx, ret, p0_type, p1_type, p2_type) \ + static ret FUNC_EXP(name)(p0_type, p1_type, p2_type) __unused; \ + static ret FUNC_INT(name)(p0_type, p1_type, p2_type) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(p0_type, p1_type, p2_type); \ + static ret FUNC_EXP(name)(p0_type p0, p1_type p1, p2_type p2) \ + { \ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 15 10:19:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03EA337B406; Fri, 15 Nov 2002 10:19:34 -0800 (PST) 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 7AA4C37B401 for ; Fri, 15 Nov 2002 10:19:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1341643E77 for ; Fri, 15 Nov 2002 10:19:33 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAFIGtmV015853 for ; Fri, 15 Nov 2002 10:16:55 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAFIGsNk015850 for perforce@freebsd.org; Fri, 15 Nov 2002 10:16:54 -0800 (PST) Date: Fri, 15 Nov 2002 10:16:54 -0800 (PST) Message-Id: <200211151816.gAFIGsNk015850@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21076 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21076 Change 21076 by peter@peter_daintree on 2002/11/15 10:16:47 integ i386_hammer pseudo-branch Affected files ... .. //depot/projects/hammer/sys/x86_64/pci/pci_bus.c#7 integrate .. //depot/projects/hammer/sys/x86_64/pci/pci_cfgreg.c#8 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#8 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/pci/pci_bus.c#7 (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/sys/i386/pci/pci_bus.c,v 1.95 2002/10/20 17:54:17 phk Exp $ + * $FreeBSD: src/sys/i386/pci/pci_bus.c,v 1.96 2002/11/13 21:30:44 peter Exp $ * */ @@ -261,6 +261,11 @@ *busnum = nexus_pcib_read_config(0, bus, slot, func, 0x44, 1); break; + case 0x00101166: + s = "ServerWorks CIOB30 host to PCI bridge"; + *busnum = nexus_pcib_read_config(0, bus, slot, func, 0x44, 1); + break; + case 0x00111166: /* FALLTHROUGH */ case 0x03021014: /* IBM re-badged ServerWorks chipset */ ==== //depot/projects/hammer/sys/x86_64/pci/pci_cfgreg.c#8 (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. * - * $FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.99 2002/11/02 22:35:24 imp Exp $ + * $FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.100 2002/11/14 05:22:37 imp Exp $ * */ @@ -138,7 +138,7 @@ && reg <= PCI_REGMAX && bytes != 3 && (unsigned) bytes <= 4 - && (reg & (bytes -1)) == 0) { + && (reg & (bytes - 1)) == 0) { switch (cfgmech) { case 1: outl(CONF1_ADDR_PORT, (1 << 31) ==== //depot/projects/hammer/sys/x86_64/x86_64/pmap.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.369 2002/11/11 05:17:33 alc Exp $ + * $FreeBSD: src/sys/i386/i386/pmap.c,v 1.370 2002/11/13 05:39:57 alc Exp $ */ /* @@ -164,7 +164,7 @@ static uma_zone_t pvzone; static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; -static int pmap_pagedaemon_waken = 0; +int pmap_pagedaemon_waken; /* * All those kernel PT submaps that BSD is so fond of @@ -1466,36 +1466,6 @@ } /* - * This routine is very drastic, but can save the system - * in a pinch. - */ -void -pmap_collect() -{ - int i; - vm_page_t m; - static int warningdone = 0; - - if (pmap_pagedaemon_waken == 0) - return; - - if (warningdone < 5) { - printf("pmap_collect: collecting pv entries -- suggest increasing PMAP_SHPGPERPROC\n"); - warningdone++; - } - - for(i = 0; i < vm_page_array_size; i++) { - m = &vm_page_array[i]; - if (m->wire_count || m->hold_count || m->busy || - (m->flags & (PG_BUSY | PG_UNMANAGED))) - continue; - pmap_remove_all(m); - } - pmap_pagedaemon_waken = 0; -} - - -/* * If it is the first entry on the list, it is actually * in the header and we must copy the following entry up * to the header. Otherwise we must search the list for To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 15 10:20: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 14C0237B409; Fri, 15 Nov 2002 10:19:35 -0800 (PST) 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 DAC8037B404 for ; Fri, 15 Nov 2002 10:19:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 774C743E75 for ; Fri, 15 Nov 2002 10:19:32 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAFIGsmV015847 for ; Fri, 15 Nov 2002 10:16:54 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAFIGqmh015844 for perforce@freebsd.org; Fri, 15 Nov 2002 10:16:52 -0800 (PST) Date: Fri, 15 Nov 2002 10:16:52 -0800 (PST) Message-Id: <200211151816.gAFIGqmh015844@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21075 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21075 Change 21075 by peter@peter_daintree on 2002/11/15 10:15:52 IFC @21068 Affected files ... .. //depot/projects/hammer/Makefile.inc1#6 integrate .. //depot/projects/hammer/bin/sleep/sleep.c#2 integrate .. //depot/projects/hammer/contrib/bind/CHANGES#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/db_defs.h#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/db_sec.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_defs.h#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_ncache.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_req.c#2 integrate .. //depot/projects/hammer/contrib/bind/bin/named/ns_resp.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/nameser/ns_name.c#2 integrate .. //depot/projects/hammer/contrib/bind/lib/nameser/ns_samedomain.c#2 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#4 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libiberty/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/auto-host.h#4 integrate .. //depot/projects/hammer/kerberos5/lib/libasn1/Makefile#3 integrate .. //depot/projects/hammer/kerberos5/lib/libhdb/Makefile#3 integrate .. //depot/projects/hammer/lib/libc/gen/_pthread_stubs.c#4 integrate .. //depot/projects/hammer/lib/libc/gen/syslog.c#2 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/_setjmp.S#3 integrate .. //depot/projects/hammer/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/hammer/lib/libc/include/namespace.h#3 integrate .. //depot/projects/hammer/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/hammer/lib/libc/stdio/findfp.c#6 integrate .. //depot/projects/hammer/lib/libc/stdlib/strtod.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#5 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_attr_init.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_autoinit.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_cond.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_condattr_init.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_create.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_execve.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_exit.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_gc.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_init.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_join.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_mattr_init.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_mutex.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_mutex_prioceiling.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_once.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_pselect.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_rwlock.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sem.c#2 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_sig.c#3 integrate .. //depot/projects/hammer/lib/libc_r/uthread/uthread_stack.c#2 integrate .. //depot/projects/hammer/lib/libdisk/change.c#4 integrate .. //depot/projects/hammer/lib/libdisk/chunk.c#4 integrate .. //depot/projects/hammer/lib/libdisk/create_chunk.c#7 integrate .. //depot/projects/hammer/lib/libdisk/disk.c#6 integrate .. //depot/projects/hammer/lib/libdisk/libdisk.h#4 integrate .. //depot/projects/hammer/lib/libdisk/rules.c#6 integrate .. //depot/projects/hammer/lib/libdisk/tst01.c#4 integrate .. //depot/projects/hammer/lib/libdisk/write_alpha_disk.c#3 integrate .. //depot/projects/hammer/lib/libdisk/write_disk.c#4 integrate .. //depot/projects/hammer/lib/libdisk/write_i386_disk.c#3 integrate .. //depot/projects/hammer/lib/libdisk/write_ia64_disk.c#3 integrate .. //depot/projects/hammer/lib/libdisk/write_pc98_disk.c#3 integrate .. //depot/projects/hammer/lib/libdisk/write_sparc64_disk.c#2 integrate .. //depot/projects/hammer/lib/libncurses/Makefile#6 integrate .. //depot/projects/hammer/lib/libpam/modules/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/hammer/release/alpha/drivers.conf#5 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#5 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/hammer/release/doc/share/examples/Makefile.relnotesng#4 integrate .. //depot/projects/hammer/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#4 integrate .. //depot/projects/hammer/sbin/devd/Makefile#2 integrate .. //depot/projects/hammer/sbin/devd/devd.8#2 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#6 integrate .. //depot/projects/hammer/share/man/man4/vlan.4#3 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#7 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC.hints#3 integrate .. //depot/projects/hammer/sys/boot/common/help.common#2 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#3 integrate .. //depot/projects/hammer/sys/cam/cam_periph.c#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_low.c#3 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/hammer/sys/conf/options#9 integrate .. //depot/projects/hammer/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/hammer/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#4 integrate .. //depot/projects/hammer/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/hammer/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#3 integrate .. //depot/projects/hammer/sys/dev/awi/awi.c#4 integrate .. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#6 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/hammer/sys/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/hammer/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/hammer/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#3 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#5 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#5 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#4 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/hammer/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/hammer/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe.c#3 integrate .. //depot/projects/hammer/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/hammer/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/hammer/sys/dev/gx/if_gx.c#3 integrate .. //depot/projects/hammer/sys/dev/gx/if_gxvar.h#3 integrate .. //depot/projects/hammer/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/hammer/sys/dev/ie/if_ie.c#3 integrate .. //depot/projects/hammer/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/hammer/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#3 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_cbus.c#2 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_isa.c#2 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/mly/mly.c#4 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#3 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/hammer/sys/dev/nge/if_ngereg.h#3 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard.c#6 integrate .. //depot/projects/hammer/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs#4 integrate .. //depot/projects/hammer/sys/dev/pccard/pccarddevs.h#4 integrate .. //depot/projects/hammer/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#5 integrate .. //depot/projects/hammer/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/pdq/pdq_ifsubr.c#2 integrate .. //depot/projects/hammer/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/hammer/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/hammer/sys/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#3 integrate .. //depot/projects/hammer/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr.c#4 integrate .. //depot/projects/hammer/sys/dev/trm/trm.c#2 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#4 integrate .. //depot/projects/hammer/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/hammer/sys/dev/usb/usb_ethersubr.c#2 integrate .. //depot/projects/hammer/sys/dev/vx/if_vx.c#4 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#5 integrate .. //depot/projects/hammer/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#3 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe_pccard.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/i686_mem.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/hammer/sys/i386/isa/if_cx.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/if_el.c#2 integrate .. //depot/projects/hammer/sys/i386/isa/if_le.c#3 integrate .. //depot/projects/hammer/sys/i386/isa/if_rdp.c#4 integrate .. //depot/projects/hammer/sys/i386/pci/pci_bus.c#7 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#8 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_ipr.c#4 integrate .. //depot/projects/hammer/sys/i4b/driver/i4b_isppp.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#8 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#12 integrate .. //depot/projects/hammer/sys/kern/subr_log.c#4 integrate .. //depot/projects/hammer/sys/kern/subr_prf.c#6 integrate .. //depot/projects/hammer/sys/modules/agp/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/hammer/sys/net/bpf.c#6 integrate .. //depot/projects/hammer/sys/net/bpf.h#2 integrate .. //depot/projects/hammer/sys/net/bpfdesc.h#3 integrate .. //depot/projects/hammer/sys/net/bridge.c#4 integrate .. //depot/projects/hammer/sys/net/bridge.h#2 integrate .. //depot/projects/hammer/sys/net/ethernet.h#3 integrate .. //depot/projects/hammer/sys/net/fddi.h#2 integrate .. //depot/projects/hammer/sys/net/if.h#5 integrate .. //depot/projects/hammer/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/hammer/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/hammer/sys/net/if_disc.c#2 integrate .. //depot/projects/hammer/sys/net/if_ef.c#2 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/hammer/sys/net/if_faith.c#2 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#4 integrate .. //depot/projects/hammer/sys/net/if_gif.c#6 integrate .. //depot/projects/hammer/sys/net/if_gre.c#5 integrate .. //depot/projects/hammer/sys/net/if_loop.c#3 integrate .. //depot/projects/hammer/sys/net/if_ppp.c#5 integrate .. //depot/projects/hammer/sys/net/if_sl.c#4 integrate .. //depot/projects/hammer/sys/net/if_stf.c#5 integrate .. //depot/projects/hammer/sys/net/if_tap.c#5 integrate .. //depot/projects/hammer/sys/net/if_tun.c#4 integrate .. //depot/projects/hammer/sys/net/if_var.h#5 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#4 integrate .. //depot/projects/hammer/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/hammer/sys/netinet/ip_gre.c#5 integrate .. //depot/projects/hammer/sys/pci/agp.c#3 integrate .. //depot/projects/hammer/sys/pci/agp_ali.c#3 integrate .. //depot/projects/hammer/sys/pci/agp_amd.c#4 integrate .. //depot/projects/hammer/sys/pci/agp_i810.c#5 integrate .. //depot/projects/hammer/sys/pci/agp_intel.c#3 integrate .. //depot/projects/hammer/sys/pci/agp_sis.c#3 integrate .. //depot/projects/hammer/sys/pci/agp_via.c#3 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#5 integrate .. //depot/projects/hammer/sys/pci/if_de.c#3 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#3 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#6 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#4 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#4 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#3 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#5 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#6 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#4 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#4 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#4 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#7 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#6 integrate .. //depot/projects/hammer/sys/sparc64/include/pmap.h#5 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/hammer/sys/sys/msgbuf.h#2 integrate .. //depot/projects/hammer/sys/sys/socket.h#4 integrate .. //depot/projects/hammer/sys/sys/stddef.h#1 branch .. //depot/projects/hammer/sys/vm/pmap.h#5 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#6 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#5 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#8 integrate .. //depot/projects/hammer/usr.bin/fetch/fetch.c#5 integrate .. //depot/projects/hammer/usr.bin/xargs/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.c#3 integrate .. //depot/projects/hammer/usr.bin/xinstall/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate .. //depot/projects/hammer/usr.sbin/mtree/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#2 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/file.c#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/config.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#5 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/label.c#4 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.310 2002/11/03 23:48:14 scottl Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.312 2002/11/14 19:24:50 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -123,6 +123,7 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +OSRELDATE!= sysctl -n kern.osreldate TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -193,7 +194,8 @@ BMAKEENV= MAKEOBJDIRPREFIX=${WORLDTMP} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ +BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + BOOTSTRAPPING=${OSRELDATE} \ -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ -DNO_CPU_CFLAGS -DNO_WERROR @@ -201,8 +203,8 @@ TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ - -DNO_CPU_CFLAGS +TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 \ + BOOTSTRAPPING=${OSRELDATE} -DNO_CPU_CFLAGS # cross-tool stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB @@ -727,7 +729,8 @@ .endif _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ - lib/libncurses lib/libopie lib/libradius lib/librpcsvc \ + lib/libncurses lib/libopie lib/libpam lib/libradius \ + lib/librpcsvc \ lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ lib/libz lib/msun @@ -753,7 +756,7 @@ _generic_libs+= usr.sbin/pcvt/keycap .endif -.for _lib in ${_startup_libs} ${_prebuild_libs} ${_generic_libs} +.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) ${ECHODIR} "===> ${_lib}"; \ @@ -764,6 +767,16 @@ .endif .endfor +# libpam is special: we need to build static PAM modules before +# static PAM library, and dynamic PAM library before dynamic PAM +# modules. +lib/libpam__L: .PHONY + ${ECHODIR} "===> lib/libpam"; \ + cd ${.CURDIR}/lib/libpam; \ + ${MAKE} DIRPRFX=lib/libpam/ depend; \ + ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ + ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install + _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} ==== //depot/projects/hammer/bin/sleep/sleep.c#2 (text+ko) ==== @@ -43,14 +43,14 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.12 2002/06/30 05:15:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.15 2002/11/14 01:14:35 njl Exp $"); #include #include -#include #include #include #include +#include void usage(void); @@ -59,25 +59,15 @@ { struct timespec time_to_sleep; long l; - int ch, neg; + int neg; char *p; - while ((ch = getopt(argc, argv, "")) != -1) - switch(ch) { - case '?': - default: - usage(); - /* NOTREACHED */ - } - argc -= optind; - argv += optind; - - if (argc != 1) { + if (argc != 2) { usage(); /* NOTREACHED */ } - p = argv[0]; + p = argv[1]; /* Skip over leading whitespaces. */ while (isspace((unsigned char)*p)) @@ -88,6 +78,9 @@ if (*p == '-') { neg = 1; ++p; + if (!isdigit((unsigned char)*p) && *p != '.') + usage(); + /* NOTREACHED */ } else if (*p == '+') ++p; @@ -128,7 +121,8 @@ void usage(void) { + const char *msg = "usage: sleep seconds\n"; - (void)fprintf(stderr, "usage: sleep seconds\n"); + write(STDERR_FILENO, msg, strlen(msg)); exit(1); } ==== //depot/projects/hammer/contrib/bind/CHANGES#2 (text+ko) ==== @@ -1,3 +1,23 @@ +1469. [bug] buffer length calculation for PX was wrong. + +1468. [bug] ns_name_ntol() could overwite a zero length buffer. + +1467. [bug] off by one bug in ns_makecannon(). + +1466. [bug] large ENDS UDP buffer size could trigger a assertion. + +1465. [bug] possible NULL pointer dereference in db_sec.c + +1464. [bug] the buffer used to construct the -ve record was not + big enough for all possible SOA records. use pointer + arithmetic to calculate the remaining size in this + buffer. + +1463. [bug] use serial space arithmetic to determine if a SIG is + too old, in the future or has internally constistant + times. + +1462. [bug] write buffer overflow in make_rr(). --- 8.3.3-REL released --- (Wed Jun 26 21:15:43 PDT 2002) ==== //depot/projects/hammer/contrib/bind/bin/named/db_defs.h#2 (text+ko) ==== @@ -78,7 +78,7 @@ */ /* max length of data in RR data field */ -#define MAXDATA (2*MAXDNAME + 5*INT32SZ) +#define MAXDATA (3*MAXDNAME + 5*INT32SZ) /* max length of data in a TXT RR segment */ #define MAXCHARSTRING 255 ==== //depot/projects/hammer/contrib/bind/bin/named/db_sec.c#2 (text+ko) ==== @@ -479,7 +479,9 @@ struct sig_record *sigdata; struct dnode *sigdn; struct databuf *sigdp; - time_t now; + u_int32_t now; + u_int32_t exptime; + u_int32_t signtime; char *signer; u_char name_n[MAXDNAME]; u_char *sig, *eom; @@ -492,6 +494,7 @@ int dnssec_failed = 0, dnssec_succeeded = 0; int return_value; int i; + int expired = 0; if (rrset == NULL || rrset->rr_name == NULL) { ns_warning (ns_log_default, "verify_set: missing rrset/name"); @@ -527,11 +530,14 @@ * Don't verify a set if the SIG inception time is in * the future. This should be fixed before 2038 (BEW) */ - if ((time_t)ntohl(sigdata->sig_time_n) > now) + signtime = ntohl(sigdata->sig_time_n); + if (SEQ_GT(signtime, now)) continue; /* An expired set is dropped, but the data is not. */ - if ((time_t)ntohl(sigdata->sig_exp_n) < now) { + exptime = ntohl(sigdata->sig_exp_n); + if (SEQ_GT(now, exptime)) { + expired++; db_detach(&sigdn->dp); sigdp = NULL; continue; @@ -723,7 +729,7 @@ } end: - if (dnssec_failed > 0) + if (dnssec_failed > 0 || expired > 0) rrset_trim_sigs(rrset); if (trustedkey == 0 && key != NULL) dst_free_key(key); ==== //depot/projects/hammer/contrib/bind/bin/named/ns_defs.h#2 (text+ko) ==== @@ -469,7 +469,7 @@ q_cmsglen, /* len of cname message */ q_cmsgsize; /* allocated size of cname message */ int16_t q_dfd; /* UDP file descriptor */ - int16_t q_udpsize; /* UDP message size */ + u_int16_t q_udpsize; /* UDP message size */ int q_distance; /* distance this query is from the * original query that the server * received. */ ==== //depot/projects/hammer/contrib/bind/bin/named/ns_ncache.c#2 (text+ko) ==== @@ -66,7 +66,7 @@ u_int16_t atype; u_char *sp, *cp1; u_char data[MAXDATA]; - size_t len = sizeof data; + u_char *eod = data + sizeof(data); #endif nameserIncr(from.sin_addr, nssRcvdNXD); @@ -186,7 +186,7 @@ rdatap = cp; /* origin */ - n = dn_expand(msg, msg + msglen, cp, (char*)data, len); + n = dn_expand(msg, msg + msglen, cp, (char*)data, eod - data); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: origin form error"); @@ -195,9 +195,8 @@ cp += n; n = strlen((char*)data) + 1; cp1 = data + n; - len -= n; /* mail */ - n = dn_expand(msg, msg + msglen, cp, (char*)cp1, len); + n = dn_expand(msg, msg + msglen, cp, (char*)cp1, eod - cp1); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: mail form error"); return; @@ -205,20 +204,20 @@ cp += n; n = strlen((char*)cp1) + 1; cp1 += n; - len -= n; n = 5 * INT32SZ; + if (n > (eod - cp1)) /* Can't happen. See MAXDATA. */ + return; BOUNDS_CHECK(cp, n); memcpy(cp1, cp, n); /* serial, refresh, retry, expire, min */ cp1 += n; - len -= n; cp += n; if (cp != rdatap + dlen) { ns_debug(ns_log_ncache, 3, "ncache: form error"); return; } /* store the zone of the soa record */ - n = dn_expand(msg, msg + msglen, sp, (char*)cp1, len); + n = dn_expand(msg, msg + msglen, sp, (char*)cp1, eod - cp1); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: form error 2"); return; ==== //depot/projects/hammer/contrib/bind/bin/named/ns_req.c#2 (text+ko) ==== @@ -2195,7 +2195,7 @@ /* first just copy over the type_covered, algorithm, */ /* labels, orig ttl, two timestamps, and the footprint */ - if ((dp->d_size - 18) > buflen) + if (buflen < 18) goto cleanup; /* out of room! */ memcpy(cp, cp1, 18); cp += 18; ==== //depot/projects/hammer/contrib/bind/bin/named/ns_resp.c#2 (text+ko) ==== @@ -2001,7 +2001,7 @@ * to BOUNDS_CHECK() here. */ cp1 += (n = strlen((char *)cp1) + 1); - n1 = sizeof(data) - n; + n1 = sizeof(data) - n - INT16SZ; n = dn_expand(msg, eom, cp, (char *)cp1, n1); if (n < 0) { hp->rcode = FORMERR; @@ -2043,8 +2043,18 @@ ttl = origTTL; } + /* + * Check that expire and signature times are internally + * consistant. + */ + if (!SEQ_GT(exptime, signtime) && exptime != signtime) { + ns_debug(ns_log_default, 3, + "ignoring SIG: signature expires before it was signed"); + return ((cp - rrp) + dlen); + } + /* Don't let bogus signers "sign" in the future. */ - if (signtime > now) { + if (SEQ_GT(signtime, now)) { ns_debug(ns_log_default, 3, "ignoring SIG: signature date %s is in the future", p_secstodate (signtime)); @@ -2052,7 +2062,7 @@ } /* Ignore received SIG RR's that are already expired. */ - if (exptime <= now) { + if (SEQ_GT(now, exptime)) { ns_debug(ns_log_default, 3, "ignoring SIG: expiration %s is in the past", p_secstodate (exptime)); ==== //depot/projects/hammer/contrib/bind/lib/nameser/ns_name.c#2 (text+ko) ==== @@ -341,6 +341,10 @@ dn = dst; eom = dst + dstsiz; + if (dn >= eom) { + errno = EMSGSIZE; + return (-1); + } while ((n = *cp++) != 0) { if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) { /* Some kind of compression pointer. */ ==== //depot/projects/hammer/contrib/bind/lib/nameser/ns_samedomain.c#2 (text+ko) ==== @@ -166,7 +166,7 @@ ns_makecanon(const char *src, char *dst, size_t dstsize) { size_t n = strlen(src); - if (n + sizeof "." > dstsize) { + if (n + sizeof "." + 1 > dstsize) { errno = EMSGSIZE; return (-1); } ==== //depot/projects/hammer/etc/defaults/rc.conf#4 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.162 2002/11/12 07:10:45 imp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.163 2002/11/15 08:26:36 ru Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -26,7 +26,7 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). -devd_enable="NO" # Run devd, to trigger progams on device tree changes. +devd_enable="NO" # Run devd, to trigger programs on device tree changes. pccard_enable="NO" # Set to YES if you want to configure PCCARD devices. pccard_mem="DEFAULT" # If pccard_enable=YES, this is card memory address. pccard_beep="2" # pccard beep type. @@ -335,7 +335,7 @@ moused_type="auto" # See man page for rc.conf(5) for available settings. moused_port="/dev/psm0" # Set to your mouse port. moused_flags="" # Any additional flags to moused. -mousechar_start="NO" # if 0xd0-0xd3 default range is occuped in your +mousechar_start="NO" # if 0xd0-0xd3 default range is occupied in your # language code table, specify alternative range # start like mousechar_start=3, see vidcontrol(1) allscreens_flags="" # Set this vidcontrol mode for all virtual screens ==== //depot/projects/hammer/gnu/usr.bin/binutils/libiberty/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.16 2002/05/13 11:09:03 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $ .include "../Makefile.inc0" @@ -10,7 +10,9 @@ hex.c floatformat.c hashtab.c lbasename.c make-temp-file.c \ objalloc.c obstack.c safe-ctype.c xatexit.c xexit.c xmalloc.c \ xstrdup.c xstrerror.c -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440000 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500022 )) SRCS+= basename.c .endif WARNS= 1 ==== //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/auto-host.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.10 2002/10/20 07:50:20 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.11 2002/11/13 11:50:40 ru Exp $ */ #include @@ -357,7 +357,10 @@ /* #undef _GNU_SOURCE */ /* Define if you have a working header file. */ +#if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \ + __FreeBSD_version >= 500014 #define HAVE_STDBOOL_H 1 +#endif /* Define if you can safely include both and . */ #define STRING_WITH_STRINGS 1 ==== //depot/projects/hammer/kerberos5/lib/libasn1/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.16 2002/08/13 16:52:50 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $ LIB= asn1 CFLAGS+=-I${KRB5DIR}/include \ @@ -106,7 +106,9 @@ strupr.c ${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET} -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440001 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 )) asn1_compile: getprogname.c setprogname.c .endif ==== //depot/projects/hammer/kerberos5/lib/libhdb/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.9 2002/08/13 16:52:52 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.10 2002/11/13 13:49:29 ru Exp $ LIB= hdb CFLAGS+=-I${KRB5DIR}/include \ @@ -61,7 +61,9 @@ get_window_size.c strupr.c ${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET} -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440001 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 )) asn1_compile: getprogname.c setprogname.c .endif ==== //depot/projects/hammer/lib/libc/gen/_pthread_stubs.c#4 (text+ko) ==== @@ -25,14 +25,12 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.8 2002/11/01 09:37:16 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.10 2002/11/13 21:55:22 deischen Exp $"); #include #include -#include -void *_pthread_getspecific(pthread_key_t key); -pthread_t _pthread_self(void); +#include "libc_private.h" /* * Weak symbols: All libc internal usage of these functions should @@ -42,69 +40,7 @@ * usage to avoid unwanted cancellation points and to differentiate * between application locks and libc locks (threads holding the * latter can't be allowed to exit/terminate). - * - * We also provide weak pthread_XXX stubs which call their - * _pthread_XXX counterparts. These stubs may be used be other - * libraries for ensuring thread-safety without requiring the presence - * of a thread library. */ -__weak_reference(_pthread_cond_init_stub, _pthread_cond_init); -__weak_reference(_pthread_cond_signal_stub, _pthread_cond_signal); -__weak_reference(_pthread_cond_broadcast_stub, _pthread_cond_broadcast); -__weak_reference(_pthread_cond_wait_stub, _pthread_cond_wait); -__weak_reference(_pthread_cond_destroy_stub, _pthread_cond_destroy); -__weak_reference(_pthread_getspecific_stub, _pthread_getspecific); -__weak_reference(_pthread_key_create_stub, _pthread_key_create); -__weak_reference(_pthread_key_delete_stub, _pthread_key_delete); -__weak_reference(_pthread_main_np_stub, _pthread_main_np); -__weak_reference(_pthread_mutex_destroy_stub, _pthread_mutex_destroy); -__weak_reference(_pthread_mutex_init_stub, _pthread_mutex_init); -__weak_reference(_pthread_mutex_lock_stub, _pthread_mutex_lock); -__weak_reference(_pthread_mutex_trylock_stub, _pthread_mutex_trylock); -__weak_reference(_pthread_mutex_unlock_stub, _pthread_mutex_unlock); -__weak_reference(_pthread_mutexattr_init_stub, _pthread_mutexattr_init); -__weak_reference(_pthread_mutexattr_destroy_stub, _pthread_mutexattr_destroy); -__weak_reference(_pthread_mutexattr_settype_stub, _pthread_mutexattr_settype); -__weak_reference(_pthread_once_stub, _pthread_once); -__weak_reference(_pthread_self_stub, _pthread_self); -__weak_reference(_pthread_rwlock_init_stub, _pthread_rwlock_init); -__weak_reference(_pthread_rwlock_destroy_stub, _pthread_rwlock_destroy); -__weak_reference(_pthread_rwlock_rdlock_stub, _pthread_rwlock_rdlock); -__weak_reference(_pthread_rwlock_tryrdlock_stub, _pthread_rwlock_tryrdlock); -__weak_reference(_pthread_rwlock_trywrlock_stub, _pthread_rwlock_trywrlock); -__weak_reference(_pthread_rwlock_unlock_stub, _pthread_rwlock_unlock); -__weak_reference(_pthread_rwlock_wrlock_stub, _pthread_rwlock_wrlock); -__weak_reference(_pthread_setspecific_stub, _pthread_setspecific); -__weak_reference(_pthread_sigmask_stub, _pthread_sigmask); - -__weak_reference(pthread_cond_init_stub, pthread_cond_init); -__weak_reference(pthread_cond_signal_stub, pthread_cond_signal); -__weak_reference(pthread_cond_broadcast_stub, pthread_cond_broadcast); -__weak_reference(pthread_cond_wait_stub, pthread_cond_wait); -__weak_reference(pthread_cond_destroy_stub, pthread_cond_destroy); -__weak_reference(pthread_getspecific_stub, pthread_getspecific); -__weak_reference(pthread_key_create_stub, pthread_key_create); -__weak_reference(pthread_key_delete_stub, pthread_key_delete); -__weak_reference(pthread_main_np_stub, pthread_main_np); -__weak_reference(pthread_mutex_destroy_stub, pthread_mutex_destroy); -__weak_reference(pthread_mutex_init_stub, pthread_mutex_init); -__weak_reference(pthread_mutex_lock_stub, pthread_mutex_lock); -__weak_reference(pthread_mutex_trylock_stub, pthread_mutex_trylock); -__weak_reference(pthread_mutex_unlock_stub, pthread_mutex_unlock); -__weak_reference(pthread_mutexattr_init_stub, pthread_mutexattr_init); -__weak_reference(pthread_mutexattr_destroy_stub, pthread_mutexattr_destroy); -__weak_reference(pthread_mutexattr_settype_stub, pthread_mutexattr_settype); -__weak_reference(pthread_once_stub, pthread_once); -__weak_reference(pthread_self_stub, pthread_self); -__weak_reference(pthread_rwlock_init_stub, pthread_rwlock_init); -__weak_reference(pthread_rwlock_destroy_stub, pthread_rwlock_destroy); -__weak_reference(pthread_rwlock_rdlock_stub, pthread_rwlock_rdlock); -__weak_reference(pthread_rwlock_tryrdlock_stub, pthread_rwlock_tryrdlock); -__weak_reference(pthread_rwlock_trywrlock_stub, pthread_rwlock_trywrlock); -__weak_reference(pthread_rwlock_unlock_stub, pthread_rwlock_unlock); -__weak_reference(pthread_rwlock_wrlock_stub, pthread_rwlock_wrlock); -__weak_reference(pthread_setspecific_stub, pthread_setspecific); -__weak_reference(pthread_sigmask_stub, pthread_sigmask); /* Define a null pthread structure just to satisfy _pthread_self. */ struct pthread { @@ -112,342 +48,179 @@ static struct pthread main_thread; -static int -_pthread_cond_init_stub(pthread_cond_t *cond, - const pthread_condattr_t *cond_attr) -{ - return (0); -} +static int stub_main(void); +static void *stub_null(void); +static struct pthread *stub_self(void); +static int stub_zero(void); -static int -_pthread_cond_signal_stub(pthread_cond_t *cond) -{ - return (0); -} +#define PJT_DUAL_ENTRY(entry) \ + (pthread_func_t)entry, (pthread_func_t)entry -static int -_pthread_cond_broadcast_stub(pthread_cond_t *cond) -{ - return (0); -} +pthread_func_entry_t __thr_jtable[PJT_MAX] = { + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_BROADCAST */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_SIGNAL */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_COND_WAIT */ + {PJT_DUAL_ENTRY(stub_null)}, /* PJT_GETSPECIFIC */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_CREATE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_KEY_DELETE */ + {PJT_DUAL_ENTRY(stub_main)}, /* PJT_MAIN_NP */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_LOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_TRYLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEX_UNLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_MUTEXATTR_SETTYPE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_ONCE */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_DESTROY */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_INIT */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_RDLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYRDLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_TRYWRLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_UNLOCK */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_RWLOCK_WRLOCK */ + {PJT_DUAL_ENTRY(stub_self)}, /* PJT_SELF */ + {PJT_DUAL_ENTRY(stub_zero)}, /* PJT_SETSPECIFIC */ + {PJT_DUAL_ENTRY(stub_zero)} /* PJT_SIGMASK */ +}; -static int -_pthread_cond_wait_stub(pthread_cond_t *cond, pthread_mutex_t *mutex) -{ - return (0); -} +/* + * Weak aliases for exported (pthread_*) and internal (_pthread_*) routines. + */ +#define WEAK_REF(sym, alias) __weak_reference(sym, alias) -static int -_pthread_cond_destroy_stub(pthread_cond_t *cond) -{ - return (0); -} +#define FUNC_TYPE(name) __CONCAT(name, _func_t) +#define FUNC_INT(name) __CONCAT(name, _int) +#define FUNC_EXP(name) __CONCAT(name, _exp) -static void * -_pthread_getspecific_stub(pthread_key_t key) -{ - return (NULL); -} +#define STUB_FUNC(name, idx, ret) \ + static ret FUNC_EXP(name)(void) __unused; \ + static ret FUNC_INT(name)(void) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(void); \ + static ret FUNC_EXP(name)(void) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func()); \ + } \ + static ret FUNC_INT(name)(void) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func()); \ + } -static int -_pthread_key_create_stub(pthread_key_t *key, void (*destructor) (void *)) -{ - return (0); -} +#define STUB_FUNC1(name, idx, ret, p0_type) \ + static ret FUNC_EXP(name)(p0_type) __unused; \ + static ret FUNC_INT(name)(p0_type) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(p0_type); \ + static ret FUNC_EXP(name)(p0_type p0) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func(p0)); \ + } \ + static ret FUNC_INT(name)(p0_type p0) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func(p0)); \ + } -static int -_pthread_key_delete_stub(pthread_key_t key) -{ - return (0); -} +#define STUB_FUNC2(name, idx, ret, p0_type, p1_type) \ + static ret FUNC_EXP(name)(p0_type, p1_type) __unused; \ + static ret FUNC_INT(name)(p0_type, p1_type) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(p0_type, p1_type); \ + static ret FUNC_EXP(name)(p0_type p0, p1_type p1) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][0]; \ + return (func(p0, p1)); \ + } \ + static ret FUNC_INT(name)(p0_type p0, p1_type p1) \ + { \ + FUNC_TYPE(name) func; \ + func = (FUNC_TYPE(name))__thr_jtable[idx][1]; \ + return (func(p0, p1)); \ + } -static int -_pthread_main_np_stub() -{ - return (-1); -} +#define STUB_FUNC3(name, idx, ret, p0_type, p1_type, p2_type) \ + static ret FUNC_EXP(name)(p0_type, p1_type, p2_type) __unused; \ + static ret FUNC_INT(name)(p0_type, p1_type, p2_type) __unused; \ + WEAK_REF(FUNC_EXP(name), name); \ + WEAK_REF(FUNC_INT(name), __CONCAT(_, name)); \ + typedef ret (*FUNC_TYPE(name))(p0_type, p1_type, p2_type); \ + static ret FUNC_EXP(name)(p0_type p0, p1_type p1, p2_type p2) \ + { \ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 15 10:21:38 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C65137B404; Fri, 15 Nov 2002 10:21:37 -0800 (PST) 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 D054F37B401 for ; Fri, 15 Nov 2002 10:21:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C6A543E75 for ; Fri, 15 Nov 2002 10:21:36 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAFIIwmV016563 for ; Fri, 15 Nov 2002 10:18:58 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAFIIvBV016558 for perforce@freebsd.org; Fri, 15 Nov 2002 10:18:57 -0800 (PST) Date: Fri, 15 Nov 2002 10:18:57 -0800 (PST) Message-Id: <200211151818.gAFIIvBV016558@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21077 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21077 Change 21077 by peter@peter_daintree on 2002/11/15 10:18:00 match ia64 Affected files ... .. //depot/projects/hammer/sys/x86_64/include/_types.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/_types.h#2 (text+ko) ==== @@ -72,7 +72,7 @@ typedef __int64_t __segsz_t; /* segment size (in pages) */ typedef __uint64_t __size_t; /* sizeof() */ typedef __int64_t __ssize_t; /* byte count or error */ -typedef __int32_t __time_t; /* time()... */ +typedef __int64_t __time_t; /* time()... */ typedef __uint64_t __uintfptr_t; typedef __uint64_t __uintmax_t; typedef __uint64_t __uintptr_t; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 15 10:46:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DB0737B406; Fri, 15 Nov 2002 10:46:08 -0800 (PST) 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 1363A37B404 for ; Fri, 15 Nov 2002 10:46:08 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9196C43E75 for ; Fri, 15 Nov 2002 10:46:07 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAFIhTmV019178 for ; Fri, 15 Nov 2002 10:43:29 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAFIhTNU019175 for perforce@freebsd.org; Fri, 15 Nov 2002 10:43:29 -0800 (PST) Date: Fri, 15 Nov 2002 10:43:29 -0800 (PST) Message-Id: <200211151843.gAFIhTNU019175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21079 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21079 Change 21079 by green@green_laptop_2 on 2002/11/15 10:43:26 Add three new checks for kernel modules: mac_check_kldload(cred, vnode) mac_check_kldunload(cred) mac_check_kldobserve(cred) There's a lot of extra information that could be given to policies but it's decidedly all unimportant. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#15 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#361 edit .. //depot/projects/trustedbsd/mac/sys/kern/link_elf.c#13 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#186 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#40 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#108 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#84 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#217 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#171 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#15 (text+ko) ==== @@ -27,6 +27,7 @@ */ #include "opt_ddb.h" +#include "opt_mac.h" #include #include @@ -38,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -474,6 +476,11 @@ /* Refuse to unload modules if securelevel raised. */ if (securelevel > 0) return (EPERM); +#ifdef MAC + error = mac_check_system_kldunload(curthread->td_ucred); + if (error) + return (error); +#endif KLD_DPF(FILE, ("linker_file_unload: lf->refs=%d\n", file->refs)); if (file->refs == 1) { @@ -824,6 +831,12 @@ linker_file_t lf; int error = 0; +#ifdef MAC + error = mac_check_system_kldobserve(curthread->td_ucred); + if (error) + return (error); +#endif + mtx_lock(&Giant); td->td_retval[0] = -1; @@ -854,6 +867,12 @@ linker_file_t lf; int error = 0; +#ifdef MAC + error = mac_check_system_kldobserve(curthread->td_ucred); + if (error) + return (error); +#endif + mtx_lock(&Giant); if (SCARG(uap, fileid) == 0) { @@ -889,6 +908,12 @@ int namelen, version; struct kld_file_stat *stat; +#ifdef MAC + error = mac_check_system_kldobserve(curthread->td_ucred); + if (error) + return (error); +#endif + mtx_lock(&Giant); lf = linker_find_file_by_id(SCARG(uap, fileid)); @@ -938,6 +963,12 @@ module_t mp; int error = 0; +#ifdef MAC + error = mac_check_system_kldobserve(curthread->td_ucred); + if (error) + return (error); +#endif + mtx_lock(&Giant); lf = linker_find_file_by_id(SCARG(uap, fileid)); if (lf) { @@ -967,6 +998,12 @@ struct kld_sym_lookup lookup; int error = 0; +#ifdef MAC + error = mac_check_system_kldobserve(curthread->td_ucred); + if (error) + return (error); +#endif + mtx_lock(&Giant); if ((error = copyin(SCARG(uap, data), &lookup, sizeof(lookup))) != 0) @@ -1800,6 +1837,11 @@ linker_file_t lf; int error; +#ifdef MAC + error = mac_check_system_kldobserve(curthread->td_ucred); + if (error) + return (error); +#endif sysctl_wire_old_buffer(req, 0); mtx_lock(&kld_mtx); TAILQ_FOREACH(lf, &linker_files, link) { ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#361 (text+ko) ==== @@ -2592,6 +2592,50 @@ } int +mac_check_system_kldload(struct ucred *cred, struct vnode *vp) +{ + int error; + + if (vp != NULL) { + ASSERT_VOP_LOCKED(vp, "mac_check_system_acct"); + } + + if (!mac_enforce_system) + return (0); + + MAC_CHECK(check_system_kldload, cred, vp, + vp != NULL ? &vp->v_label : NULL); + + return (error); +} + +int +mac_check_system_kldobserve(struct ucred *cred) +{ + int error; + + if (!mac_enforce_system) + return (0); + + MAC_CHECK(check_system_kldobserve, cred); + + return (error); +} + +int +mac_check_system_kldunload(struct ucred *cred) +{ + int error; + + if (!mac_enforce_system) + return (0); + + MAC_CHECK(check_system_kldunload, cred); + + return (error); +} + +int mac_check_system_nfsd(struct ucred *cred) { int error; ==== //depot/projects/trustedbsd/mac/sys/kern/link_elf.c#13 (text+ko) ==== @@ -27,11 +27,13 @@ */ #include "opt_ddb.h" +#include "opt_mac.h" #include #include #include #include +#include #include #include #include @@ -556,6 +558,13 @@ if (error) return error; NDFREE(&nd, NDF_ONLY_PNBUF); +#ifdef MAC + error = mac_check_system_kldload(curthread->td_ucred, nd.ni_vp); + if (error) { + firstpage = NULL; + goto out; + } +#endif /* * Read the elf header from the file. ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#186 (text+ko) ==== @@ -1861,6 +1861,45 @@ } static int +mac_biba_check_system_kldload(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_biba *subj, *obj; + int error; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + + error = mac_biba_subject_privileged(subj); + if (error) + return (error); + + obj = SLOT(label); + if (!mac_biba_high_single(obj)) + return (EACCES); + + return (0); +} + + +static int +mac_biba_check_system_kldunload(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_biba *subj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + + return (mac_biba_subject_privileged(subj)); +} + + +static int mac_biba_check_system_settime(struct ucred *cred) { struct mac_biba *subj; @@ -2630,6 +2669,8 @@ .mpo_check_socket_relabel = mac_biba_check_socket_relabel, .mpo_check_socket_visible = mac_biba_check_socket_visible, .mpo_check_system_acct = mac_biba_check_system_acct, + .mpo_check_system_kldload = mac_biba_check_system_kldload, + .mpo_check_system_kldunload = mac_biba_check_system_kldunload, .mpo_check_system_settime = mac_biba_check_system_settime, .mpo_check_system_swapon = mac_biba_check_system_swapon, .mpo_check_system_sysctl = mac_biba_check_system_sysctl, ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#40 (text+ko) ==== @@ -1998,6 +1998,44 @@ } static int +mac_lomac_check_system_kldload(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_lomac *subj, *obj; + + if (!mac_lomac_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (mac_lomac_subject_privileged(subj)) + return (EPERM); + + if (!mac_lomac_high_single(obj)) + return (EACCES); + + return (0); +} + +static int +mac_lomac_check_system_kldunload(struct ucred *cred) +{ + struct mac_lomac *subj; + + if (!mac_lomac_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + + if (mac_lomac_subject_privileged(subj)) + return (EPERM); + + return (0); +} + + +static int mac_lomac_check_system_swapon(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -2668,6 +2706,8 @@ .mpo_check_socket_deliver = mac_lomac_check_socket_deliver, .mpo_check_socket_relabel = mac_lomac_check_socket_relabel, .mpo_check_socket_visible = mac_lomac_check_socket_visible, + .mpo_check_system_kldload = mac_lomac_check_system_kldload, + .mpo_check_system_kldunload = mac_lomac_check_system_kldunload, .mpo_check_system_swapon = mac_lomac_check_system_swapon, .mpo_check_system_sysctl = mac_lomac_check_system_sysctl, .mpo_check_vnode_access = mac_lomac_check_vnode_open, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#108 (text+ko) ==== @@ -652,6 +652,28 @@ } static int +mac_none_check_system_kldload(struct ucred *cred, struct vnode *vp, + struct label *vlabel) +{ + + return (0); +} + +static int +mac_none_check_system_kldobserve(struct ucred *cred) +{ + + return (0); +} + +static int +mac_none_check_system_kldunload(struct ucred *cred) +{ + + return (0); +} + +static int mac_none_check_system_reboot(struct ucred *cred, int how) { @@ -1034,6 +1056,9 @@ .mpo_check_socket_relabel = mac_none_check_socket_relabel, .mpo_check_socket_visible = mac_none_check_socket_visible, .mpo_check_system_acct = mac_none_check_system_acct, + .mpo_check_system_kldload = mac_none_check_system_kldload, + .mpo_check_system_kldobserve = mac_none_check_system_kldobserve, + .mpo_check_system_kldunload = mac_none_check_system_kldunload, .mpo_check_system_reboot = mac_none_check_system_reboot, .mpo_check_system_settime = mac_none_check_system_settime, .mpo_check_system_swapon = mac_none_check_system_swapon, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#84 (text+ko) ==== @@ -1048,6 +1048,28 @@ } static int +mac_test_check_system_kldload(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + + return (0); +} + +static int +mac_test_check_system_kldobserve(struct ucred *cred) +{ + + return (0); +} + +static int +mac_test_check_system_kldunload(struct ucred *cred) +{ + + return (0); +} + +static int mac_test_check_system_reboot(struct ucred *cred, int how) { @@ -1431,6 +1453,9 @@ .mpo_check_socket_relabel = mac_test_check_socket_relabel, .mpo_check_socket_visible = mac_test_check_socket_visible, .mpo_check_system_acct = mac_test_check_system_acct, + .mpo_check_system_kldload = mac_test_check_system_kldload, + .mpo_check_system_kldobserve = mac_test_check_system_kldobserve, + .mpo_check_system_kldunload = mac_test_check_system_kldunload, .mpo_check_system_reboot = mac_test_check_system_reboot, .mpo_check_system_settime = mac_test_check_system_settime, .mpo_check_system_swapon = mac_test_check_system_swapon, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#217 (text+ko) ==== @@ -260,6 +260,9 @@ int mac_check_socket_send(struct ucred *cred, struct socket *so); int mac_check_socket_visible(struct ucred *cred, struct socket *so); int mac_check_system_acct(struct ucred *cred, struct vnode *vp); +int mac_check_system_kldload(struct ucred *cred, struct vnode *vp); +int mac_check_system_kldobserve(struct ucred *cred); +int mac_check_system_kldunload(struct ucred *cred); int mac_check_system_nfsd(struct ucred *cred); int mac_check_system_reboot(struct ucred *cred, int howto); int mac_check_system_settime(struct ucred *cred); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#171 (text+ko) ==== @@ -317,6 +317,10 @@ struct socket *so, struct label *socketlabel); int (*mpo_check_system_acct)(struct ucred *cred, struct vnode *vp, struct label *vlabel); + int (*mpo_check_system_kldload)(struct ucred *cred, + struct vnode *vp, struct label *vlabel); + int (*mpo_check_system_kldobserve)(struct ucred *cred); + int (*mpo_check_system_kldunload)(struct ucred *cred); int (*mpo_check_system_nfsd)(struct ucred *cred); int (*mpo_check_system_reboot)(struct ucred *cred, int howto); int (*mpo_check_system_settime)(struct ucred *cred); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 15 14:52: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC93A37B404; Fri, 15 Nov 2002 14:51:52 -0800 (PST) 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 4407537B401 for ; Fri, 15 Nov 2002 14:51:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E1F543E75 for ; Fri, 15 Nov 2002 14:51:51 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAFMnCmV050735 for ; Fri, 15 Nov 2002 14:49:12 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAFMnClh050722 for perforce@freebsd.org; Fri, 15 Nov 2002 14:49:12 -0800 (PST) Date: Fri, 15 Nov 2002 14:49:12 -0800 (PST) Message-Id: <200211152249.gAFMnClh050722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21095 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21095 Change 21095 by peter@peter_daintree on 2002/11/15 14:48:39 IFC @21094 Affected files ... .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#15 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#12 integrate .. //depot/projects/ia64/release/Makefile#25 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#7 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml#4 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#16 integrate .. //depot/projects/ia64/share/man/man7/release.7#13 integrate .. //depot/projects/ia64/sys/ia64/ia64/clock.c#11 integrate .. //depot/projects/ia64/sys/ia64/include/_types.h#3 integrate .. //depot/projects/ia64/sys/net/if.c#14 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#15 integrate .. //depot/projects/ia64/usr.bin/who/who.c#9 integrate .. //depot/projects/ia64/usr.bin/xinstall/xinstall.c#13 integrate .. //depot/projects/ia64/usr.sbin/ppp/physical.c#10 integrate .. //depot/projects/ia64/usr.sbin/pppd/auth.c#5 integrate Differences ... ==== //depot/projects/ia64/etc/mtree/BSD.usr.dist#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.268 2002/10/25 22:00:34 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.269 2002/11/15 18:44:09 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -96,8 +96,6 @@ .. 13.rcs .. - 14.sccs - .. 15.yacc .. 16.lex ==== //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#12 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.c,v 1.16 2002/05/30 20:48:59 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libpam/modules/pam_lastlog/pam_lastlog.c,v 1.17 2002/11/15 22:41:59 peter Exp $"); #define _BSD_SOURCE ==== //depot/projects/ia64/release/Makefile#25 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.727 2002/11/12 17:51:02 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.729 2002/11/15 22:03:25 jhb Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \ # [ RELEASETAG=tag ] @@ -104,6 +104,7 @@ .if defined(NOPORTS) && !defined(NODOC) DOMINIMALDOCPORTS= YES .include "Makefile.inc.docports" +RELEASEPORTSMODULE= ${MINIMALDOCPORTS} .endif # Helper variable @@ -273,13 +274,16 @@ FIXIT_TARGET= release.10 .endif -EXTRAS= cdrom.1 ftp.1 +EXTRAS= ftp.1 +.if !defined(NOCDROM) +EXTRAS+= cdrom.1 .if defined(MAKE_ISOS) EXTRAS+= iso.1 .if ${TARGET} != "pc98" BOOTABLE="-b" .endif .endif +.endif .if !defined(NODOC) DOCREL= doc.1 doc.2 @@ -297,6 +301,21 @@ cd ${.CURDIR}/..; ${CROSSMAKE} -f Makefile.inc1 -V WMAKEENV WMAKE= ${WMAKEENV} ${MAKE} +CVS_SRCARGS= -P +.if defined(RELEASETAG) +CVS_SRCARGS+= -r ${RELEASETAG} +.endif + +CVS_DOCARGS= -P +.if defined(DOCRELEASETAG) +CVS_DOCARGS+= -r ${DOCRELEASETAG} +.endif + +CVS_PORTSARGS= -P +.if defined(PORTSRELEASETAG) +CVS_PORTSARGS+= -r ${PORTSRELEASETAG} +.endif + rerelease release: .if !defined(CHROOTDIR) || !defined(BUILDNAME) || !defined(CVSROOT) @echo "To make a release you must set CHROOTDIR, BUILDNAME and CVSROOT" && false @@ -324,12 +343,13 @@ if [ -f /etc/resolv.conf ]; then \ cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \ fi -.if !defined(RELEASETAG) - cd ${CHROOTDIR}/usr && rm -rf src && \ - ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASESRCMODULE} + rm -rf ${CHROOTDIR}/usr/src +.if defined(EXTSRCDIR) + cd ${CHROOTDIR}/usr && \ + cp -R ${EXTSRCDIR} src .else - cd ${CHROOTDIR}/usr && rm -rf src && \ - ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${RELEASETAG} ${RELEASESRCMODULE} + cd ${CHROOTDIR}/usr && \ + ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_SRCARGS} ${RELEASESRCMODULE} .endif .if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES}) cd ${CHROOTDIR}/usr/src && patch ${PATCH_FLAGS} < ${LOCAL_PATCHES} @@ -337,24 +357,19 @@ .if defined(LOCAL_SCRIPT) && exists(${LOCAL_SCRIPT}) cd ${CHROOTDIR} && env CHROOTDIR=${CHROOTDIR} BUILDNAME=${BUILDNAME} RELEASETAG=${RELEASETAG} ${LOCAL_SCRIPT} .endif + rm -rf ${CHROOTDIR}/usr/ports +.if !defined(NOPORTSATALL) + cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_PORTSARGS} ${RELEASEPORTSMODULE} +.endif .if !defined(NOPORTS) -.if defined(PORTSRELEASETAG) - cd ${CHROOTDIR}/usr && rm -rf ports && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${PORTSRELEASETAG} ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES} -.else - cd ${CHROOTDIR}/usr && rm -rf ports && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASEPORTSMODULE} && cd ports && ${MAKEREADMES} + cd ${CHROOTDIR}/usr/ports && ${MAKEREADMES} .endif -.elif defined(DOMINIMALDOCPORTS) && ${DOMINIMALDOCPORTS} == "YES" -.if defined(PORTSRELEASETAG) - cd ${CHROOTDIR}/usr && rm -rf ports && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${PORTSRELEASETAG} ${MINIMALDOCPORTS} -.else - cd ${CHROOTDIR}/usr && rm -rf ports && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${MINIMALDOCPORTS} -.endif -.endif .if !defined(NODOC) -.if defined(DOCRELEASETAG) - cd ${CHROOTDIR}/usr && rm -rf doc && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P -r ${DOCRELEASETAG} ${RELEASEDOCMODULE} + rm -rf ${CHROOTDIR}/usr/doc +.if defined(EXTDOCDIR) + cd ${CHROOTDIR}/usr && cp -R ${EXTDOCDIR} doc .else - cd ${CHROOTDIR}/usr && rm -rf doc && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} -P ${RELEASEDOCMODULE} + cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_DOCARGS} ${RELEASEDOCMODULE} .endif if [ -d ${RELEASEDISTFILES}/ ]; then \ cp -rp ${RELEASEDISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \ @@ -404,7 +419,7 @@ AUTO_KEYBOARD_DETECT BOOT_CONFIG BUILDNAME \ CD_EXTRA_BITS DISTRIBUTIONS DOC_LANG DOMINIMALDOCPORTS \ EXTRA_SRC FIXCRYPTO KERNELS KERNEL_FLAGS \ - MAKE_ISOS NODOC NO_FLOPPIES NOKERBEROS NOPORTS NOSHARED \ + MAKE_ISOS NOCDROM NODOC NO_FLOPPIES NOKERBEROS NOPORTS NOSHARED \ NOSRC NO_SENDMAIL RELEASETAG \ RELNOTES_LANG TARGET TARGET_ARCH WORLD_FLAGS .if defined(${var}) ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/common/install.sgml#7 (text+ko) ==== @@ -1,6 +1,6 @@ + &os; for the &arch.print; requires a 386 or better processor to run (sorry, there is no support for 286 processors) and at least 5 megs of RAM to install and 4 megs of RAM to @@ -81,6 +83,8 @@ most minimal installation. See below for ways of shrinking existing DOS partitions in order to install &os;. + + &os; for the &arch.print; supports the platforms described in HARDWARE.TXT. @@ -101,6 +105,17 @@ necessary to download new firmware from the vendor's Web site. + + + &os; for the &arch.print; supports the platforms + described in HARDWARE.TXT. + + You will need a dedicated disk for + &os;/sparc64. It is not possible to share a disk with another + operating system at this time. + + + If you are not familiar with configuring hardware for &os;, you should be sure to read the HARDWARE.TXT file; @@ -111,7 +126,7 @@ Floppy Disk Image Instructions - Depending on how you choose to install &os;, you may need to + Depending on how you choose to install &os;, you may need to create a set of floppy disks (usually two) to begin the installation process. This section briefly describes how to create these disks, either from a CDROM installation or from the Internet. Note that in @@ -130,7 +145,7 @@ images (for 1.44MB floppies) or kern-small.flp and mfsroot-small.flp images (for 1.2MB floppies). - Getting these images over the network is easy. Simply fetch + Getting these images over the network is easy. Simply fetch the release/floppies/kern.flp and @@ -159,7 +174,7 @@ tools directory on your CDROM or &os; FTP mirror) or the &man.dd.1; command in UNIX. - For example, to create the kernel floppy image from DOS, you'd + For example, to create the kernel floppy image from DOS, you'd do something like this: C> fdimage kern.flp a: @@ -171,18 +186,18 @@ Assuming that you'd copied rawrite.exe and kern.flp into a directory somewhere. You would do the same for mfsroot.flp, of course. - If you're creating the boot floppy from a UNIX machine, you + If you're creating the boot floppy from a UNIX machine, you may find that: &prompt.root; dd if=floppies/kern.flp of=/dev/rfd0 &prompt.root; dd if=floppies/kern.flp of=/dev/rfd0.1440 - or + or &prompt.root; dd if=floppies/kern.flp of=/dev/floppy &prompt.root; dd if=floppies/kern-small.flp of=/dev/rfd0.1200 - work well, depending on your hardware and operating system + work well, depending on your hardware and operating system environment (different versions of UNIX have different names for the floppy drive). @@ -199,6 +214,8 @@ Installing &os; from CDROM or the Internet + + The easiest type of installation is from CDROM. If you have a supported CDROM drive and a &os; installation CDROM, there are 2 ways of starting the @@ -268,6 +285,8 @@ for additional tips on installing via FTP or NFS. + + The easiest type of installation is from CDROM. If you have a supported CDROM drive and a &os; installation CDROM, you can boot &os; directly from the @@ -292,6 +311,59 @@ Insert the mfsroot.flp floppy when prompted and you will end up at the first screen of the install program. + + + + Most &arch; systems are set up to boot automatically from + disk. To install &os;, you need to boot over the network or + from a CDROM, which requires you to break into the PROM + (OpenFirmware). + + To do this, reboot the system, and wait until the boot + message appears. It depends on the model, but should look about + like: + + Sun Blade 100 (UltraSPARC-IIe), Keyboard Present +Copyright 1998-2001 Sun Microsystems, Inc. All rights reserved. +OpenBoot 4.2, 128 MB memory installed, Serial #51090132. +Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4. + + If your system proceeds to boot from disk at this point, you + need to press L1A + or StopA + on the keyboard, or send a BREAK over the + serial console (using for example ~# in + &man.tip.1; or &man.cu.1;) to get to the PROM prompt. It looks + like this: + + + + + + + + ok +ok {0} + + + + This is the prompt used on systems with just one + CPU. + + + + This is the prompt used on SMP systems, the digit + indicates the number of the active CPU. + + + + + At this point, place the CDROM into your + drive, and from the PROM prompt, type boot + cdrom. + Detail on various installation types ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml#4 (text+ko) ==== @@ -1,4 +1,4 @@ - + - ]>
    &artheader; - - This article gives some brief instructions on installing - &os;/&arch; &release.current;. Please keep in mind that this port - is a work in progress, and as such, the installation procedure is - much more involved than for &os;/i386 or &os;/alpha. - -§.sparc64.install; +&abstract; +§.install; +§.layout; +§.upgrade; +§.trouble;
    ==== //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#16 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.33 2002/11/14 23:17:00 bmah Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.34 2002/11/15 19:34:31 bmah Exp $ # # MAINTAINER: jkh # @@ -108,6 +108,7 @@ CDROM_SET_1="${CDROM_SET_1} graphics/xv" CDROM_SET_1="${CDROM_SET_1} irc/xchat" CDROM_SET_1="${CDROM_SET_1} lang/gnat" +CDROM_SET_1="${CDROM_SET_1} lang/perl5" CDROM_SET_1="${CDROM_SET_1} mail/exim" CDROM_SET_1="${CDROM_SET_1} mail/fetchmail" CDROM_SET_1="${CDROM_SET_1} mail/mutt" ==== //depot/projects/ia64/share/man/man7/release.7#13 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/release.7,v 1.16 2002/10/22 23:36:10 keramida Exp $ +.\" $FreeBSD: src/share/man/man7/release.7,v 1.17 2002/11/15 20:55:37 jhb Exp $ .\" .Dd March 12, 2002 .Dt RELEASE 7 @@ -260,6 +260,8 @@ .It Va MAKE_ISOS If defined, bootable ISO CD-ROM images will be created from the contents of the CD-ROM stage directory. +.It Va NOCDROM +If defined, the CD-ROM stage directories will not be created. .It Va NODOC If set to .Dq Li YES , @@ -271,6 +273,8 @@ distribution will still be created with the minimal documentation set provided in .Pa src/share/doc . +.It Va NO_FLOPPIES +If defined, no floppy disk image files will be created. .It Va NOPORTS If set to .Dq Li YES ==== //depot/projects/ia64/sys/ia64/ia64/clock.c#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/ia64/clock.c,v 1.16 2002/10/04 01:00:35 peter Exp $ */ +/* $FreeBSD: src/sys/ia64/ia64/clock.c,v 1.17 2002/11/15 22:36:57 peter Exp $ */ /* $NetBSD: clock.c,v 1.20 1998/01/31 10:32:47 ross Exp $ */ /* ==== //depot/projects/ia64/sys/ia64/include/_types.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/ia64/include/_types.h,v 1.3 2002/08/23 22:19:57 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/_types.h,v 1.4 2002/11/15 22:35:34 peter Exp $ */ #ifndef _MACHINE__TYPES_H_ ==== //depot/projects/ia64/sys/net/if.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.149 2002/09/24 17:35:08 brooks Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.151 2002/11/15 18:42:10 sam Exp $ */ #include "opt_compat.h" ==== //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_snapshot.c 8.11 (McKusick) 7/23/00 - * $FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.48 2002/10/25 00:20:37 mckusick Exp $ + * $FreeBSD: src/sys/ufs/ffs/ffs_snapshot.c,v 1.49 2002/11/15 22:36:57 peter Exp $ */ #include ==== //depot/projects/ia64/usr.bin/who/who.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/who/who.c,v 1.17 2002/06/20 07:36:22 tjr Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/who/who.c,v 1.18 2002/11/15 22:41:59 peter Exp $"); #include #include ==== //depot/projects/ia64/usr.bin/xinstall/xinstall.c#13 (text+ko) ==== @@ -44,7 +44,7 @@ #endif #include -__FBSDID("$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.58 2002/10/31 10:41:51 ru Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.59 2002/11/15 22:43:56 peter Exp $"); #include #include ==== //depot/projects/ia64/usr.sbin/ppp/physical.c#10 (text+ko) ==== @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $FreeBSD: src/usr.sbin/ppp/physical.c,v 1.53 2002/08/27 20:11:58 brian Exp $ + * $FreeBSD: src/usr.sbin/ppp/physical.c,v 1.54 2002/11/15 22:42:00 peter Exp $ * */ ==== //depot/projects/ia64/usr.sbin/pppd/auth.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/auth.c,v 1.26 2002/03/05 10:50:55 maxim Exp $"; +static char rcsid[] = "$FreeBSD: src/usr.sbin/pppd/auth.c,v 1.27 2002/11/15 22:42:00 peter Exp $"; #endif #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 15 16:17:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECEB437B404; Fri, 15 Nov 2002 16:17:49 -0800 (PST) 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 94E8D37B401; Fri, 15 Nov 2002 16:17:49 -0800 (PST) Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by mx1.FreeBSD.org (Postfix) with ESMTP id 908C343E77; Fri, 15 Nov 2002 16:17:48 -0800 (PST) (envelope-from robert@fledge.watson.org) Received: from fledge.watson.org (fledge.pr.watson.org [192.0.2.3]) by fledge.watson.org (8.12.6/8.12.5) with SMTP id gAG0HgBF061332; Fri, 15 Nov 2002 19:17:43 -0500 (EST) (envelope-from robert@fledge.watson.org) Date: Fri, 15 Nov 2002 19:17:42 -0500 (EST) From: Robert Watson X-Sender: robert@fledge.watson.org To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 21079 for review In-Reply-To: <200211151843.gAFIhTNU019175@repoman.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Generally looks good, but a couple of questions below. On Fri, 15 Nov 2002, Brian Feldman wrote: > Add three new checks for kernel modules: > mac_check_kldload(cred, vnode) > mac_check_kldunload(cred) > mac_check_kldobserve(cred) The naming seems a bit inconsistent here -- in some places it's in the system namespace. I'd be tempted to rename them as: mac_check_kld_load() mac_check_kld_stat() mac_check_kld_unload() > int > +mac_check_system_kldload(struct ucred *cred, struct vnode *vp) > +{ > + int error; > + > + if (vp != NULL) { > + ASSERT_VOP_LOCKED(vp, "mac_check_system_acct"); > + } Two questions: (1) Can vp ever be NULL here? If so, when and why? (2) Looks like a copy-and-paste-o: should be kldload not acct. > + if (!mac_enforce_system) > + return (0); Adam's recent comments about "system" vs "kld" sound good. > @@ -556,6 +558,13 @@ > if (error) > return error; > NDFREE(&nd, NDF_ONLY_PNBUF); > +#ifdef MAC > + error = mac_check_system_kldload(curthread->td_ucred, nd.ni_vp); > + if (error) { > + firstpage = NULL; > + goto out; It looks like you can only get here if the vn_open() succeeds, suggesting vp will always be non-NULL. If the goal is to leave the door open for other potential sources of linker data later, I suggest we just handle that case with a different entry point in the event that happens. Robert N M Watson FreeBSD Core Team, TrustedBSD Projects robert@fledge.watson.org Network Associates Laboratories To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 16 1:47:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9132F37B404; Sat, 16 Nov 2002 01:47:43 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from green.bikeshed.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E4C8937B401; Sat, 16 Nov 2002 01:47:42 -0800 (PST) Received: from green.bikeshed.org (wzyzd7ekkrsqv5e2@green.bikeshed.org [10.0.0.1] (may be forged)) by green.bikeshed.org (8.12.6/8.12.6) with ESMTP id gAG9lg56000918; Sat, 16 Nov 2002 04:47:42 -0500 (EST) (envelope-from green@green.bikeshed.org) Received: from localhost (green@localhost) by green.bikeshed.org (8.12.6/8.12.6/Submit) with ESMTP id gAG9lgfB000914; Sat, 16 Nov 2002 04:47:42 -0500 (EST) Message-Id: <200211160947.gAG9lgfB000914@green.bikeshed.org> X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: Robert Watson Cc: Brian Feldman , Perforce Change Reviews Subject: Re: PERFORCE change 21079 for review In-Reply-To: Your message of "Fri, 15 Nov 2002 19:17:42 EST." From: "Brian F. Feldman" Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 16 Nov 2002 04:47:42 -0500 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Robert Watson wrote: > > Generally looks good, but a couple of questions below. > > > On Fri, 15 Nov 2002, Brian Feldman wrote: > > > Add three new checks for kernel modules: > > mac_check_kldload(cred, vnode) > > mac_check_kldunload(cred) > > mac_check_kldobserve(cred) > > The naming seems a bit inconsistent here -- in some places it's in the > system namespace. I'd be tempted to rename them as: > > mac_check_kld_load() > mac_check_kld_stat() > mac_check_kld_unload() > > > int > > +mac_check_system_kldload(struct ucred *cred, struct vnode *vp) > > +{ > > + int error; > > + > > + if (vp != NULL) { > > + ASSERT_VOP_LOCKED(vp, "mac_check_system_acct"); > > + } > > Two questions: > > (1) Can vp ever be NULL here? If so, when and why? > (2) Looks like a copy-and-paste-o: should be kldload not acct. > > > + if (!mac_enforce_system) > > + return (0); > > Adam's recent comments about "system" vs "kld" sound good. > > > @@ -556,6 +558,13 @@ > > if (error) > > return error; > > NDFREE(&nd, NDF_ONLY_PNBUF); > > +#ifdef MAC > > + error = mac_check_system_kldload(curthread->td_ucred, nd.ni_vp); > > + if (error) { > > + firstpage = NULL; > > + goto out; > > It looks like you can only get here if the vn_open() succeeds, suggesting > vp will always be non-NULL. If the goal is to leave the door open for > other potential sources of linker data later, I suggest we just handle > that case with a different entry point in the event that happens. No, you're right; it's of course always be non-NULL... The only potential sources of linker data are from that same function called recursively. The check shouldn't be done. -- Brian Fundakowski Feldman \'[ FreeBSD ]''''''''''\ <> green@FreeBSD.org <> bfeldman@tislabs.com \ The Power to Serve! \ Opinions expressed are my own. \,,,,,,,,,,,,,,,,,,,,,,\ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 16 17:34:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF42837B404; Sat, 16 Nov 2002 17:34:26 -0800 (PST) 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 52BCC37B401 for ; Sat, 16 Nov 2002 17:34:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F088943E42 for ; Sat, 16 Nov 2002 17:34:24 -0800 (PST) (envelope-from chris@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAH1VemV006493 for ; Sat, 16 Nov 2002 17:31:40 -0800 (PST) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAH1VbXP006445 for perforce@freebsd.org; Sat, 16 Nov 2002 17:31:37 -0800 (PST) Date: Sat, 16 Nov 2002 17:31:37 -0800 (PST) Message-Id: <200211170131.gAH1VbXP006445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 21122 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21122 Change 21122 by chris@chris_holly on 2002/11/16 17:31:01 Integ. Affected files ... .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/faq/book.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#5 integrate .. //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/share/sgml/teams.ent#3 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributing/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/mh/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/pam/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/faq/book.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/book.sgml#4 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#8 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#7 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#9 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/fanf.key#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/pgpkeys/keramida.key#2 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#1 branch .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/share/sgml/authors.ent#8 integrate .. //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/books/handbook/book.sgml#3 integrate .. //depot/projects/trustedbsd/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#5 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/Makefile#6 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#6 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#1 branch .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#4 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#2 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#3 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/books/handbook/printing/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man1/ld.1#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/_secure_path.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/arc4random.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/atan2.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/bindresvport.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/clock.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/confstr.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ctermid.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/daemon.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/devname.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/devstat.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/directory.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/erf.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/exp.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/fmod.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/frexp.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/ftpio.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getbootfile.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getbsize.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getcwd.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getdiskbyname.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getdomainname.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/gethostid.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/gethostname.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getobjformat.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getttyent.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getvfsbyname.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/getvfsent.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/glob.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/hypot.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/keycap.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/kvm.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/kvm_geterr.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/kvm_getfiles.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/kvm_getloadavg.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/kvm_getprocs.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/kvm_nlist.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/kvm_open.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/kvm_read.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/lgamma.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/login_class.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/math.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/modf.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/moncontrol.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/msgctl.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/msgget.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/msgrcv.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/msgsnd.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/nice.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_authenticate.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_chauthtok.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_fail_delay.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_open_session.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_setcred.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_start.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/pam_strerror.3#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/psignal.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/siginterrupt.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man3/sigsetops.3#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ipfw.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pam_radius.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pam_tacplus.8#2 integrate .. //depot/projects/trustedbsd/doc/share/mk/doc.docbook.mk#4 integrate .. //depot/projects/trustedbsd/doc/share/mk/doc.html.mk#3 integrate .. //depot/projects/trustedbsd/doc/share/mk/doc.images.mk#3 integrate .. //depot/projects/trustedbsd/doc/share/sgml/catalog#4 integrate .. //depot/projects/trustedbsd/doc/share/sgml/freebsd.dsl#3 integrate .. //depot/projects/trustedbsd/doc/share/sgml/man-refs.ent#9 integrate Differences ... ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/faq/book.sgml#5 (text+ko) ==== @@ -2,10 +2,10 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project -$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.23 2002/10/17 16:26:12 mheinen Exp $ -$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.370 2002/10/13 13:47:14 mheinen Exp $ +$FreeBSD: doc/de_DE.ISO8859-1/books/faq/book.sgml,v 1.26 2002/11/14 19:02:13 mheinen Exp $ +$FreeBSDde: de-docproj/books/faq/book.sgml,v 1.375 2002/11/13 21:44:15 mheinen Exp $ - basiert auf: 1.487 + basiert auf: 1.490 --> @@ -44,7 +44,7 @@ - $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.370 2002/10/13 13:47:14 mheinen Exp $ + $FreeBSDde: de-docproj/books/faq/book.sgml,v 1.375 2002/11/13 21:44:15 mheinen Exp $ 1995 @@ -561,11 +561,11 @@ des Projekts und darüber, wem es erlaubt sein soll, Code zum Quellbaum hinzuzufügen, werden innerhalb eines Core + url="http://www.de.freebsd.org/doc/en_US.ISO8859-1/articles/contributors/article.html#STAFF-CORE">Core Team von etwa 9 Personen geführt. Es gibt ein weitaus größeres Team von über 200 Committers, + url="http://www.de.freebsd.org/doc/en_US.ISO8859-1/articles/contributors/article.html#STAFF-COMMITTERS">Committers, die dazu autorisiert sind, Änderungen am FreeBSD Quellbaum durchzuführen.     @@ -627,6 +627,18 @@     + + Wie wird ein FreeBSD-Spiegel eingerichtet? + + + + Der Artikel Mirroring + FreeBSD erklärt, wie ein FreeBSD-Spiegel + eingerichtet wird. + + + + Wie greife ich auf die Datenbank mit Problemberichten zu? @@ -1201,7 +1213,7 @@ Die FreeBSD Mall bietet ebenfalls professionellen FreeBSD support an. Weitergehende Informationen finden - Sie auf Ihrer Webseite. Wenn Ihre Firma oder Organisation ebenfalls Training @@ -1434,9 +1446,9 @@ Installationsdiskette enthält. Wenn Sie eine modifizierte Ausgabe erstellen wollen, - finden Sie eine Anleitung im Kapitel Erzeugung einer - eigenen Release des Handbuchs. + finden Sie eine Anleitung im Artikel + FreeBSD Release Engineering. @@ -1912,7 +1924,7 @@ Ja, Sie brauchen dazu nur ein ganz normales Laplink-Kabel. Weitere Informationen zum Thema Netzwerke am Druckerport finden sie im Kapitel PLIP des + url="http://www.de.freebsd.org/doc/en_US.ISO8859-1/handbook/plip.html">PLIP des Handbuchs. Lesen Sie FreeBSD 3.X oder eine ältere Version @@ -2530,10 +2542,10 @@ zu erreichen, werden bestimmte Dienste und Features entweder aktiviert oder deaktiviert. Die Details sind im Abschnitt Sicherheits-Profile + url="http://www.de.freebsd.org/doc/en_US.ISO8859-1/books/handbook/install-post.html#SECURITYPROFILE">Security Profile des Handbuch-Kapitels Nach der - Installation enthalten. + url="http://www.de.freebsd.org/doc/en_US.ISO8859-1/books/handbook/install-post.html"> + Post-Installation enthalten.     @@ -2550,12 +2562,10 @@ - Ja. FreeBSD ist zur Zeit auf der Architekturen Intel - x86 und DEC (bzw. Compaq) Alpha verfügbar. - Außerdem wurde Interesse an einem Port von FreeBSD - zur SPARC-Architektur ausgedrückt. Schließen - Sie sich der Mailingliste &a.sparc; an, wenn Sie an dem Projekt - teilnehmen möchten. Die Neuzugänge auf der + Ja. FreeBSD ist zur Zeit für die Intel x86 und + DEC (jetzt Compaq) Alpha Architekturen verfügbar. + Seit FreeBSD 5.0 wird auch die SPARC-64 Architektur + unterstützt. Die Neuzugänge auf der Liste der in Zukunft unterstützten Plattformen sind IA-64 und PowerPC. Abonnieren Sie die Mailinglisten &a.ia64; oder &a.ppc;, wenn Sie mehr über den Stand der Entwicklung @@ -3417,9 +3427,8 @@ - Sie finden im Abschnitt Ethernet-Karten - des Handbuchs eine vollständige Liste. + In den Hardware Informationen zu jedem FreeBSD Release + werden die unterstützten Karten aufgezählt. @@ -3998,10 +4007,10 @@ Falls das einzige Problem ist, daß er schrecklich langsam ist, dann sollte Sie versuchen, den Modus - des Druckerportes zu ändern, wie es im + url="http://www.de.freebsd.org/doc/en_US.ISO8859-1/books/handbook/printing-intro-setup.html#PRINTING-PARALLEL-PORT-MODE">Setting + the Communication Mode for the Parallel Port zu ändern, wie es im Kapitel Drucker + url="http://www.de.freebsd.org/doc/en_US.ISO8859-1/books/handbook/printing-intro-setup.html">Printing des Handbuchs beschrieben ist. @@ -6114,7 +6123,7 @@ Lesen Sie das Tutorial zur Festplattenformatierung unter www.de.FreeBSD.org. + url="http://www.de.freebsd.org/doc/en_US.ISO8859-1/articles/formatting-media/">www.de.FreeBSD.org. @@ -8380,7 +8389,7 @@ Weitere Informationen über Versionsnummern und die verschiedenen Entwicklungszweige enthält der Artikel - Release + Release Engineering. @@ -9761,8 +9770,8 @@ und die notwendigen Dateien von einem Server anstatt von der Festplatte liest. Vollständige Details finden Sie im Handbucheintrag über - Diskless Booting + url="http://www.de.freebsd.org/doc/en_US.ISO8859-1/books/handbook/diskless.html">Handbucheintrag über + Diskless Operation. @@ -9774,10 +9783,10 @@ Ja. Genaue Informationen zu diesem Thema finden Sie - im Kapitel Netzwerke - für Fortgeschrittene, im Abschnitt Router und - Gateways. + im Kapitel + Advanced Networking, im Abschnitt + Building a Router. @@ -9876,7 +9885,7 @@ Dieses Thema wird im Handbuch-Kapitel PLIP + url="http://www.de.freebsd.org/doc/en_US.ISO8859-1/books/handbook/plip.html">PLIP behandelt. @@ -9958,7 +9967,7 @@ NFS verursachen. Weitere Informationen zu diesem Thema finden Sie - im Handbucheintrag zu + im Handbucheintrag zu NFS. @@ -10006,9 +10015,9 @@ ist, daß Sie den Aufbau der &man.exports.5; nicht oder nicht richtig verstanden haben. Überprüfen Sie Ihre &man.exports.5; und lesen das Kapitel NFS im Handbuch, + url="http://www.de.freebsd.org/doc/en_US.ISO8859-1/books/handbook/nfs.html">NFS im Handbuch, speziell den Abschnitt Konfiguration. + url="http://www.de.freebsd.org/doc/en_US.ISO8859-1/books/handbook/nfs.html#CONFIGURING-NFS">Konfiguration. @@ -10324,7 +10333,7 @@ linkend="service-redirect">FAQ-Eintrag über die Umleitung von Diensten oder die Online-Hilfe zu &man.natd.8; durchlesen. Auch in der Ports Sammlung sind diverse + url="../../../../ports/index.html">Ports Sammlung sind diverse Hilfsprogramme für diesen Zweck enthalten. @@ -13995,8 +14004,8 @@ Genauere Informationen finden Sie im Artikel - to FreeBSD. Wie können Hilfe immer gut + url="http://www.de.freebsd.org/doc/en_US.ISO8859-1/articles/contributing/article.html"> + Contributing to FreeBSD. Wie können Hilfe immer gut gebrauchen! @@ -14063,9 +14072,9 @@ - Eine Anleitung dazu finden Sie im Kapitel Erzeugung einer - eigenen Release des Handbuchs. + Eine Anleitung dazu finden Sie im Artikel + FreeBSD Release Engineering. @@ -14165,12 +14174,12 @@ - Lesen Sie bitte den Artikel - über das Einreichen vom Code. + Lesen Sie bitte den Artikel + Contributing to FreeBSD. Und Danke, daß Sie darüber - Nachdenken! + nachdenken! ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#5 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.13 2002/10/21 07:05:09 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/basics/chapter.sgml,v 1.52 2002/10/20 15:52:29 mheinen Exp $ - basiert auf: 1.81 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.15 2002/11/16 14:22:44 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/basics/chapter.sgml,v 1.54 2002/11/16 14:14:58 mheinen Exp $ + basiert auf: 1.87 --> @@ -1395,8 +1395,8 @@ MAKEDEV Skript - Auf Systemen ohne DEVFS müssen - Gerätedateien mit + Auf Systemen ohne DEVFS (das sind alle + Systeme vor FreeBSD 5.0) müssen Gerätedateien mit &man.MAKEDEV.8; wie unten gezeigt angelegt werden: &prompt.root; cd /dev ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#5 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.9 2002/10/21 07:05:09 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/boot/chapter.sgml,v 1.28 2002/10/20 15:52:29 mheinen Exp $ - basiert auf: 1.39 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.11 2002/11/12 22:14:56 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/boot/chapter.sgml,v 1.30 2002/11/08 08:58:07 mheinen Exp $ + basiert auf: 1.46 --> @@ -626,6 +626,90 @@     --> + + + + + Tom + Rhodes + Beigetragen von + + + + + + device.hints + + <filename>device.hints</filename> + + Der Boot-Loader liest während des Systemstarts die Datei + &man.device.hints.5;, die Hinweise zur Konfiguration von Geräten + enthält. + + Diese Funktion wurde in FreeBSD 5.0 + eingeführt. + + Pro Zeile enthält diese Datei eine Variable. Kommentare + werden, wie üblich, durch # eingeleitet. Die + Variablen können mit den Kommandos des Boot-Loaders bearbeitet + werden. Neue Variablen werden mit set gesetzt, + unset löscht schon definierte Variablen und + show zeigt Variablen an. Nach dem Systemstart + können die Variablen mit &man.kenv.1; angezeigt werden. + + Die Variablen legen fest, wie ein Gerät vom Gerätetreiber + konfiguriert wird. Die verwendete Syntax lautet: + + hint.driver.unit.keyword="value" + + Der Gerätetreiber wird mit driver, + die Nummer des Geräts mit unit + angegeben. keyword ist eine Option aus + der folgenden Liste: + + + + : Gibt den Bus, auf dem sich das + Gerät befindet, an. + + + + : Die Startadresse des + I/O-Bereichs. + + + + : Gibt die zu verwendende + Unterbrechungsanforderung (IRQ) an. + + + + : Die Nummer des DMA Kanals. + + + + : Die physikalische Speicheradresse des + Geräts. + + + + : Setzt verschiedene + gerätespezifische Optionen. + + + + : Deaktiviert das Gerät, wenn + der Wert auf 1 gesetzt wird. + + + + Ein Gerätetreiber kann mehr Optionen, als die hier + beschriebenen, besitzen oder benötigen. Schlagen Sie die + Optionen bitte in der Online-Hilfe des Treibers nach. Weitere + Informationen erhalten Sie in &man.device.hints.5;, &man.kenv.1;, + &man.loader.conf.5; und &man.loader.8;. + + init ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#5 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.12 2002/10/21 07:05:12 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.50 2002/10/20 15:52:30 mheinen Exp $ - basiert auf: 1.69 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml,v 1.13 2002/11/16 14:22:44 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/config/chapter.sgml,v 1.51 2002/11/16 14:14:59 mheinen Exp $ + basiert auf: 1.71 --> ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#4 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.5 2002/10/21 07:05:11 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/cutting-edge/chapter.sgml,v 1.25 2002/10/20 14:11:17 mheinen Exp $ - basiert auf: 1.140 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.7 2002/11/16 14:05:05 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/cutting-edge/chapter.sgml,v 1.29 2002/11/16 14:04:37 mheinen Exp $ + basiert auf: 1.152 --> @@ -198,6 +198,10 @@ Benutzen von &os.current; + + -CURRENT + benutzen + Es ist essentiell, die Mailinglisten @@ -220,7 +224,7 @@ subscribe freebsd-current subscribe cvs-all - majordomo + Majordomo Sie können Majordomo auch @@ -244,7 +248,7 @@ -CURRENT - Synchronisation mit CVSup + Synchronisation mit CVSup @@ -318,6 +322,10 @@ Schwierigkeiten geraten, wenn Sie versuchen, nur einen Teil der Quellen zu übersetzen. + + -CURRENT + übersetzen + Bevor Sie &os.current; übersetzen, sollten Sie sich das Makefile in /usr/src genau anschauen. Wenn Sie Ihr @@ -433,8 +441,8 @@ subscribe cvs-all - majordomo - + Majordomo + Sie können Majordomo auch den Text help schicken und erhalten dann eine ausführliche Hilfe, die beschreibt, wie Sie die @@ -456,8 +464,14 @@ + cvsup + + + cron + + -STABLE - Synchronisation mit CVSup + Synchronisation mit CVSup Benutzen Sie cvsup mit @@ -468,7 +482,10 @@ herunterladen und danach nur noch Änderungen beziehen. Viele lassen cvsup aus cron heraus laufen, um ihre - Quellen automatisch auf Stand zu bringen. Wenn Sie dazu + Quellen automatisch auf Stand zu bringen. Sie + müssen das oben erwähnte + supfile anpassen und cvsup konfigurieren. Wenn Sie dazu eine einfache Schnittstelle benötigen, geben sie Folgendes ein: @@ -587,7 +604,7 @@ effizienter. - CTM + CTM Im Gegensatz dazu vergleicht CTM Ihre Quellen nicht mit denen auf einem Server. Stattdessen läuft auf ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#5 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.14 2002/10/21 07:05:10 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/disks/chapter.sgml,v 1.55 2002/10/20 14:05:51 mheinen Exp $ - basiert auf: 1.112 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.15 2002/11/12 22:14:57 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/disks/chapter.sgml,v 1.56 2002/11/12 22:08:13 mheinen Exp $ + basiert auf: 1.114 --> @@ -1117,7 +1117,7 @@ formatieren, um das Medium zu überprüfen, oder die Kapazität zu erhöhen. - Mit fdformat formatieren Sie eine + Mit &man.fdformat.1; formatieren Sie eine Diskette. Dieses Werkzeug erwartet die Angabe eines Gerätenamens der Form /dev/fdX. @@ -1190,7 +1190,7 @@ &prompt.root; /sbin/newfs_msdos /dev/fd0 - Durch das Disklabel erkennt newfs + Durch das Disklabel erkennt &man.newfs.8; den Diskettentyp und ist in der Lage, ein neues Dateisystem anzulegen. Die Diskette kann nun benutzt werden. @@ -1199,7 +1199,7 @@ Verwenden der Diskette Sie können die Diskette mit - mount_msdos in Ihren Dateibaum + &man.mount.msdos.8; in Ihren Dateibaum einhängen oder mit den Mtools aus der Ports-Sammlung darauf zugreifen. ==== //depot/projects/trustedbsd/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#3 (text+ko) ==== @@ -2,9 +2,9 @@ The FreeBSD Documentation Project The FreeBSD German Documentation Project - $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.4 2002/10/21 07:05:12 mheinen Exp $ - $FreeBSDde: de-docproj/books/handbook/eresources/chapter.sgml,v 1.9 2002/10/20 12:53:40 mheinen Exp $ - basiert auf: 1.101 + $FreeBSD: doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.6 2002/11/16 14:05:05 mheinen Exp $ + $FreeBSDde: de-docproj/books/handbook/eresources/chapter.sgml,v 1.11 2002/11/14 19:38:06 mheinen Exp $ + basiert auf: 1.104 --> @@ -281,6 +281,11 @@ + freebsd-ia32 + FreeBSD für die IA-32 (Intel x86) Platform + + + freebsd-ia64 Portierung von FreeBSD auf Intels neue IA64 Systeme @@ -315,6 +320,11 @@ + freebsd-mips + Portierung von FreeBSD zu MIPS + + + freebsd-mobile Diskussionen über mobiles Rechnen @@ -403,6 +413,11 @@ + freebsd-testing + Leistungs- und Stabilitätstests von FreeBSD + + + freebsd-standards Konformität von FreeBSD mit den C99- und POSIX-Standards @@ -496,6 +511,10 @@ + freebsd-arm-digest + + + freebsd-chat-digest @@ -512,6 +531,10 @@ + freebsd-ia32-digest + + + freebsd-ia64-digest @@ -1513,8 +1536,13 @@ http://www.ar.FreeBSD.org/ — Armenien. + + + + http://www.au.FreeBSD.org/ — Australien/1. - + http://freebsd.itworks.com.au/ — Australien/4. + url="http://www4.au.FreeBSD.org/">http://www4.au.FreeBSD.org/ — Australien/4. + + + + http://www5.au.FreeBSD.org/ — Australien/5. + + + + http://www6.au.FreeBSD.org/ — Australien/6. + + + + http://http://freebsd.itworks.com.au/ — Australien/7. + + + + freebsd.unixtech.be/ — Belgien. http://www.br.FreeBSD.org/www.freebsd.org/ — Brasilien/1. + url="http://www.br.FreeBSD.org/">http://www.br.FreeBSD.org/ — Brasilien/1. http://www2.br.FreeBSD.org/www.freebsd.org/ — Brasilien/2. + url="http://www2.br.FreeBSD.org/">http://www2.br.FreeBSD.org/ — Brasilien/2. @@ -1560,6 +1608,11 @@ http://www.dk.FreeBSD.org/ — Dänemark. + + + http://www3.dk.FreeBSD.org/ — Dänemark/3. + http://www.fi.FreeBSD.org/ — Finnland. + + + http://www2.fi.FreeBSD.org/ — Finnland/2. + http://www3.uk.FreeBSD.org/ — Großbritannien/3. + + + http://www4.uk.FreeBSD.org/ — Großbritannien/4. + + + + http://www.hk.FreeBSD.org/ — Hong Kong. + http://www2.ie.FreeBSD.org/ — Irland/2. + + + + http://www.is.FreeBSD.org/ — Island. http://www.il.FreeBSD.org/ — Israel. + + + + http://www.it.FreeBSD.org/ — Italien. + + + + http://www.gufi.org/mirrors/www.freebsd.org/data/ — Italien/2. + + + + http://www.jp.FreeBSD.org/www.FreeBSD.org/ — Japan. http://www.ca.FreeBSD.org/ — Kanada/1. + url="http://www.ca.FreeBSD.org/">http://www.ca.FreeBSD.org/ — Kanada. + http://www2.kr.FreeBSD.org/ — Korea/2. + + + http://www3.kr.FreeBSD.org/ — Korea/3. + http://www.lv.FreeBSD.org/ — Lettland. + + + http://www.lt.FreeBSD.org/ — Litauen. + http://www.no.FreeBSD.org/ — Norwegen. + + + http://www.no2.FreeBSD.org/ — Norwegen/2. + http://www.at.FreeBSD.org/ — Österreich. + + + + http://www2.at.FreeBSD.org/ — Österreich/2. + + + + http://www.pl.FreeBSD.org/ — Polen/1. @@ -1696,10 +1811,12 @@ url="http://www2.pl.FreeBSD.org/">http://www2.pl.FreeBSD.org/ — Polen/2. + http://www4.pt.FreeBSD.org/ — Portugal/4. + + + + http://www.ro.FreeBSD.org/ — Rumänien. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 16 20:20: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D486537B404; Sat, 16 Nov 2002 20:19:49 -0800 (PST) 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 5AAA437B401 for ; Sat, 16 Nov 2002 20:19:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BDC3543E6E for ; Sat, 16 Nov 2002 20:19:48 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAH4H3mV022747 for ; Sat, 16 Nov 2002 20:17:03 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAH4H3qA022730 for perforce@freebsd.org; Sat, 16 Nov 2002 20:17:03 -0800 (PST) Date: Sat, 16 Nov 2002 20:17:03 -0800 (PST) Message-Id: <200211170417.gAH4H3qA022730@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 Subject: PERFORCE change 21127 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21127 Change 21127 by rwatson@rwatson_paprika on 2002/11/16 20:16:05 Some minor entry point renaming: use the _kld_* naming scheme rather than the _system_kld* naming scheme. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#16 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#362 edit .. //depot/projects/trustedbsd/mac/sys/kern/link_elf.c#14 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#187 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#41 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#109 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#85 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#218 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#172 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#16 (text+ko) ==== @@ -477,7 +477,7 @@ if (securelevel > 0) return (EPERM); #ifdef MAC - error = mac_check_system_kldunload(curthread->td_ucred); + error = mac_check_kld_unload(curthread->td_ucred); if (error) return (error); #endif @@ -832,7 +832,7 @@ int error = 0; #ifdef MAC - error = mac_check_system_kldobserve(curthread->td_ucred); + error = mac_check_kld_observe(curthread->td_ucred); if (error) return (error); #endif @@ -868,7 +868,7 @@ int error = 0; #ifdef MAC - error = mac_check_system_kldobserve(curthread->td_ucred); + error = mac_check_kld_observe(curthread->td_ucred); if (error) return (error); #endif @@ -909,7 +909,7 @@ struct kld_file_stat *stat; #ifdef MAC - error = mac_check_system_kldobserve(curthread->td_ucred); + error = mac_check_kld_observe(curthread->td_ucred); if (error) return (error); #endif @@ -964,7 +964,7 @@ int error = 0; #ifdef MAC - error = mac_check_system_kldobserve(curthread->td_ucred); + error = mac_check_kld_observe(curthread->td_ucred); if (error) return (error); #endif @@ -999,7 +999,7 @@ int error = 0; #ifdef MAC - error = mac_check_system_kldobserve(curthread->td_ucred); + error = mac_check_kld_observe(curthread->td_ucred); if (error) return (error); #endif @@ -1838,7 +1838,7 @@ int error; #ifdef MAC - error = mac_check_system_kldobserve(curthread->td_ucred); + error = mac_check_kld_observe(curthread->td_ucred); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#362 (text+ko) ==== @@ -2317,6 +2317,50 @@ } int +mac_check_kld_load(struct ucred *cred, struct vnode *vp) +{ + int error; + + if (vp != NULL) { + ASSERT_VOP_LOCKED(vp, "mac_check_system_acct"); + } + + if (!mac_enforce_system) + return (0); + + MAC_CHECK(check_kld_load, cred, vp, + vp != NULL ? &vp->v_label : NULL); + + return (error); +} + +int +mac_check_kld_observe(struct ucred *cred) +{ + int error; + + if (!mac_enforce_system) + return (0); + + MAC_CHECK(check_kld_observe, cred); + + return (error); +} + +int +mac_check_kld_unload(struct ucred *cred) +{ + int error; + + if (!mac_enforce_system) + return (0); + + MAC_CHECK(check_kld_unload, cred); + + return (error); +} + +int mac_check_mount_stat(struct ucred *cred, struct mount *mount) { int error; @@ -2592,50 +2636,6 @@ } int -mac_check_system_kldload(struct ucred *cred, struct vnode *vp) -{ - int error; - - if (vp != NULL) { - ASSERT_VOP_LOCKED(vp, "mac_check_system_acct"); - } - - if (!mac_enforce_system) - return (0); - - MAC_CHECK(check_system_kldload, cred, vp, - vp != NULL ? &vp->v_label : NULL); - - return (error); -} - -int -mac_check_system_kldobserve(struct ucred *cred) -{ - int error; - - if (!mac_enforce_system) - return (0); - - MAC_CHECK(check_system_kldobserve, cred); - - return (error); -} - -int -mac_check_system_kldunload(struct ucred *cred) -{ - int error; - - if (!mac_enforce_system) - return (0); - - MAC_CHECK(check_system_kldunload, cred); - - return (error); -} - -int mac_check_system_nfsd(struct ucred *cred) { int error; ==== //depot/projects/trustedbsd/mac/sys/kern/link_elf.c#14 (text+ko) ==== @@ -559,7 +559,7 @@ return error; NDFREE(&nd, NDF_ONLY_PNBUF); #ifdef MAC - error = mac_check_system_kldload(curthread->td_ucred, nd.ni_vp); + error = mac_check_kld_load(curthread->td_ucred, nd.ni_vp); if (error) { firstpage = NULL; goto out; ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#187 (text+ko) ==== @@ -1537,6 +1537,44 @@ } static int +mac_biba_check_kld_load(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_biba *subj, *obj; + int error; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + + error = mac_biba_subject_privileged(subj); + if (error) + return (error); + + obj = SLOT(label); + if (!mac_biba_high_single(obj)) + return (EACCES); + + return (0); +} + + +static int +mac_biba_check_kld_unload(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_biba *subj; + + if (!mac_biba_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + + return (mac_biba_subject_privileged(subj)); +} + +static int mac_biba_check_mount_stat(struct ucred *cred, struct mount *mp, struct label *mntlabel) { @@ -1861,45 +1899,6 @@ } static int -mac_biba_check_system_kldload(struct ucred *cred, struct vnode *vp, - struct label *label) -{ - struct mac_biba *subj, *obj; - int error; - - if (!mac_biba_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - - error = mac_biba_subject_privileged(subj); - if (error) - return (error); - - obj = SLOT(label); - if (!mac_biba_high_single(obj)) - return (EACCES); - - return (0); -} - - -static int -mac_biba_check_system_kldunload(struct ucred *cred, struct vnode *vp, - struct label *label) -{ - struct mac_biba *subj; - - if (!mac_biba_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - - return (mac_biba_subject_privileged(subj)); -} - - -static int mac_biba_check_system_settime(struct ucred *cred) { struct mac_biba *subj; @@ -2655,6 +2654,8 @@ .mpo_check_cred_visible = mac_biba_check_cred_visible, .mpo_check_ifnet_relabel = mac_biba_check_ifnet_relabel, .mpo_check_ifnet_transmit = mac_biba_check_ifnet_transmit, + .mpo_check_kld_load = mac_biba_check_kld_load, + .mpo_check_kld_unload = mac_biba_check_kld_unload, .mpo_check_mount_stat = mac_biba_check_mount_stat, .mpo_check_pipe_ioctl = mac_biba_check_pipe_ioctl, .mpo_check_pipe_poll = mac_biba_check_pipe_poll, @@ -2669,8 +2670,6 @@ .mpo_check_socket_relabel = mac_biba_check_socket_relabel, .mpo_check_socket_visible = mac_biba_check_socket_visible, .mpo_check_system_acct = mac_biba_check_system_acct, - .mpo_check_system_kldload = mac_biba_check_system_kldload, - .mpo_check_system_kldunload = mac_biba_check_system_kldunload, .mpo_check_system_settime = mac_biba_check_system_settime, .mpo_check_system_swapon = mac_biba_check_system_swapon, .mpo_check_system_sysctl = mac_biba_check_system_sysctl, ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#41 (text+ko) ==== @@ -1754,6 +1754,43 @@ } static int +mac_lomac_check_kld_load(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + struct mac_lomac *subj, *obj; + + if (!mac_lomac_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + obj = SLOT(label); + + if (mac_lomac_subject_privileged(subj)) + return (EPERM); + + if (!mac_lomac_high_single(obj)) + return (EACCES); + + return (0); +} + +static int +mac_lomac_check_kld_unload(struct ucred *cred) +{ + struct mac_lomac *subj; + + if (!mac_lomac_enabled) + return (0); + + subj = SLOT(&cred->cr_label); + + if (mac_lomac_subject_privileged(subj)) + return (EPERM); + + return (0); +} + +static int mac_lomac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, struct label *pipelabel, unsigned long cmd, void /* caddr_t */ *data) { @@ -1998,44 +2035,6 @@ } static int -mac_lomac_check_system_kldload(struct ucred *cred, struct vnode *vp, - struct label *label) -{ - struct mac_lomac *subj, *obj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - obj = SLOT(label); - - if (mac_lomac_subject_privileged(subj)) - return (EPERM); - - if (!mac_lomac_high_single(obj)) - return (EACCES); - - return (0); -} - -static int -mac_lomac_check_system_kldunload(struct ucred *cred) -{ - struct mac_lomac *subj; - - if (!mac_lomac_enabled) - return (0); - - subj = SLOT(&cred->cr_label); - - if (mac_lomac_subject_privileged(subj)) - return (EPERM); - - return (0); -} - - -static int mac_lomac_check_system_swapon(struct ucred *cred, struct vnode *vp, struct label *label) { @@ -2696,6 +2695,8 @@ .mpo_check_cred_visible = mac_lomac_check_cred_visible, .mpo_check_ifnet_relabel = mac_lomac_check_ifnet_relabel, .mpo_check_ifnet_transmit = mac_lomac_check_ifnet_transmit, + .mpo_check_kld_load = mac_lomac_check_kld_load, + .mpo_check_kld_unload = mac_lomac_check_kld_unload, .mpo_check_pipe_ioctl = mac_lomac_check_pipe_ioctl, .mpo_check_pipe_read = mac_lomac_check_pipe_read, .mpo_check_pipe_relabel = mac_lomac_check_pipe_relabel, @@ -2706,8 +2707,6 @@ .mpo_check_socket_deliver = mac_lomac_check_socket_deliver, .mpo_check_socket_relabel = mac_lomac_check_socket_relabel, .mpo_check_socket_visible = mac_lomac_check_socket_visible, - .mpo_check_system_kldload = mac_lomac_check_system_kldload, - .mpo_check_system_kldunload = mac_lomac_check_system_kldunload, .mpo_check_system_swapon = mac_lomac_check_system_swapon, .mpo_check_system_sysctl = mac_lomac_check_system_sysctl, .mpo_check_vnode_access = mac_lomac_check_vnode_open, ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#109 (text+ko) ==== @@ -519,6 +519,28 @@ } static int +mac_none_check_kld_load(struct ucred *cred, struct vnode *vp, + struct label *vlabel) +{ + + return (0); +} + +static int +mac_none_check_kld_observe(struct ucred *cred) +{ + + return (0); +} + +static int +mac_none_check_kld_unload(struct ucred *cred) +{ + + return (0); +} + +static int mac_none_check_mount_stat(struct ucred *cred, struct mount *mp, struct label *mntlabel) { @@ -652,28 +674,6 @@ } static int -mac_none_check_system_kldload(struct ucred *cred, struct vnode *vp, - struct label *vlabel) -{ - - return (0); -} - -static int -mac_none_check_system_kldobserve(struct ucred *cred) -{ - - return (0); -} - -static int -mac_none_check_system_kldunload(struct ucred *cred) -{ - - return (0); -} - -static int mac_none_check_system_reboot(struct ucred *cred, int how) { @@ -1039,6 +1039,9 @@ .mpo_check_kenv_get = mac_none_check_kenv_get, .mpo_check_kenv_set = mac_none_check_kenv_set, .mpo_check_kenv_unset = mac_none_check_kenv_unset, + .mpo_check_kld_load = mac_none_check_kld_load, + .mpo_check_kld_observe = mac_none_check_kld_observe, + .mpo_check_kld_unload = mac_none_check_kld_unload, .mpo_check_mount_stat = mac_none_check_mount_stat, .mpo_check_pipe_ioctl = mac_none_check_pipe_ioctl, .mpo_check_pipe_poll = mac_none_check_pipe_poll, @@ -1056,9 +1059,6 @@ .mpo_check_socket_relabel = mac_none_check_socket_relabel, .mpo_check_socket_visible = mac_none_check_socket_visible, .mpo_check_system_acct = mac_none_check_system_acct, - .mpo_check_system_kldload = mac_none_check_system_kldload, - .mpo_check_system_kldobserve = mac_none_check_system_kldobserve, - .mpo_check_system_kldunload = mac_none_check_system_kldunload, .mpo_check_system_reboot = mac_none_check_system_reboot, .mpo_check_system_settime = mac_none_check_system_settime, .mpo_check_system_swapon = mac_none_check_system_swapon, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#85 (text+ko) ==== @@ -915,6 +915,28 @@ } static int +mac_test_check_kld_load(struct ucred *cred, struct vnode *vp, + struct label *label) +{ + + return (0); +} + +static int +mac_test_check_kld_observe(struct ucred *cred) +{ + + return (0); +} + +static int +mac_test_check_kld_unload(struct ucred *cred) +{ + + return (0); +} + +static int mac_test_check_mount_stat(struct ucred *cred, struct mount *mp, struct label *mntlabel) { @@ -1048,28 +1070,6 @@ } static int -mac_test_check_system_kldload(struct ucred *cred, struct vnode *vp, - struct label *label) -{ - - return (0); -} - -static int -mac_test_check_system_kldobserve(struct ucred *cred) -{ - - return (0); -} - -static int -mac_test_check_system_kldunload(struct ucred *cred) -{ - - return (0); -} - -static int mac_test_check_system_reboot(struct ucred *cred, int how) { @@ -1436,6 +1436,9 @@ .mpo_check_kenv_get = mac_test_check_kenv_get, .mpo_check_kenv_set = mac_test_check_kenv_set, .mpo_check_kenv_unset = mac_test_check_kenv_unset, + .mpo_check_kld_load = mac_test_check_kld_load, + .mpo_check_kld_observe = mac_test_check_kld_observe, + .mpo_check_kld_unload = mac_test_check_kld_unload, .mpo_check_mount_stat = mac_test_check_mount_stat, .mpo_check_pipe_ioctl = mac_test_check_pipe_ioctl, .mpo_check_pipe_poll = mac_test_check_pipe_poll, @@ -1453,9 +1456,6 @@ .mpo_check_socket_relabel = mac_test_check_socket_relabel, .mpo_check_socket_visible = mac_test_check_socket_visible, .mpo_check_system_acct = mac_test_check_system_acct, - .mpo_check_system_kldload = mac_test_check_system_kldload, - .mpo_check_system_kldobserve = mac_test_check_system_kldobserve, - .mpo_check_system_kldunload = mac_test_check_system_kldunload, .mpo_check_system_reboot = mac_test_check_system_reboot, .mpo_check_system_settime = mac_test_check_system_settime, .mpo_check_system_swapon = mac_test_check_system_swapon, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#218 (text+ko) ==== @@ -239,6 +239,9 @@ int mac_check_kenv_get(struct ucred *cred, char *name); int mac_check_kenv_set(struct ucred *cred, char *name, char *value); int mac_check_kenv_unset(struct ucred *cred, char *name); +int mac_check_kld_load(struct ucred *cred, struct vnode *vp); +int mac_check_kld_observe(struct ucred *cred); +int mac_check_kld_unload(struct ucred *cred); int mac_check_mount_stat(struct ucred *cred, struct mount *mp); int mac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, unsigned long cmd, void *data); @@ -260,9 +263,6 @@ int mac_check_socket_send(struct ucred *cred, struct socket *so); int mac_check_socket_visible(struct ucred *cred, struct socket *so); int mac_check_system_acct(struct ucred *cred, struct vnode *vp); -int mac_check_system_kldload(struct ucred *cred, struct vnode *vp); -int mac_check_system_kldobserve(struct ucred *cred); -int mac_check_system_kldunload(struct ucred *cred); int mac_check_system_nfsd(struct ucred *cred); int mac_check_system_reboot(struct ucred *cred, int howto); int mac_check_system_settime(struct ucred *cred); ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#172 (text+ko) ==== @@ -274,6 +274,10 @@ int (*mpo_check_kenv_set)(struct ucred *cred, char *name, char *value); int (*mpo_check_kenv_unset)(struct ucred *cred, char *name); + int (*mpo_check_kld_load)(struct ucred *cred, struct vnode *vp, + struct label *vlabel); + int (*mpo_check_kld_observe)(struct ucred *cred); + int (*mpo_check_kld_unload)(struct ucred *cred); int (*mpo_check_mount_stat)(struct ucred *cred, struct mount *mp, struct label *mntlabel); int (*mpo_check_pipe_ioctl)(struct ucred *cred, struct pipe *pipe, @@ -317,10 +321,6 @@ struct socket *so, struct label *socketlabel); int (*mpo_check_system_acct)(struct ucred *cred, struct vnode *vp, struct label *vlabel); - int (*mpo_check_system_kldload)(struct ucred *cred, - struct vnode *vp, struct label *vlabel); - int (*mpo_check_system_kldobserve)(struct ucred *cred); - int (*mpo_check_system_kldunload)(struct ucred *cred); int (*mpo_check_system_nfsd)(struct ucred *cred); int (*mpo_check_system_reboot)(struct ucred *cred, int howto); int (*mpo_check_system_settime)(struct ucred *cred); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 16 20:25: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A76D337B404; Sat, 16 Nov 2002 20:24:57 -0800 (PST) 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 268F237B401 for ; Sat, 16 Nov 2002 20:24:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C097A43E88 for ; Sat, 16 Nov 2002 20:24:56 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAH4MBmV023648 for ; Sat, 16 Nov 2002 20:22:11 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAH4MAqf023645 for perforce@freebsd.org; Sat, 16 Nov 2002 20:22:10 -0800 (PST) Date: Sat, 16 Nov 2002 20:22:10 -0800 (PST) Message-Id: <200211170422.gAH4MAqf023645@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 Subject: PERFORCE change 21129 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21129 Change 21129 by rwatson@rwatson_paprika on 2002/11/16 20:22:03 Rename mac_check_kld_observe() to mac_check_kld_stat() to improve congruence with mount_stat(), vnode_stat(), and actually interface names (kldstat, modstat, etc). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#17 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#363 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#110 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#86 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#219 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#173 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#17 (text+ko) ==== @@ -832,7 +832,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_observe(curthread->td_ucred); + error = mac_check_kld_stat(curthread->td_ucred); if (error) return (error); #endif @@ -868,7 +868,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_observe(curthread->td_ucred); + error = mac_check_kld_stat(curthread->td_ucred); if (error) return (error); #endif @@ -909,7 +909,7 @@ struct kld_file_stat *stat; #ifdef MAC - error = mac_check_kld_observe(curthread->td_ucred); + error = mac_check_kld_stat(curthread->td_ucred); if (error) return (error); #endif @@ -964,7 +964,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_observe(curthread->td_ucred); + error = mac_check_kld_stat(curthread->td_ucred); if (error) return (error); #endif @@ -999,7 +999,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_observe(curthread->td_ucred); + error = mac_check_kld_stat(curthread->td_ucred); if (error) return (error); #endif @@ -1838,7 +1838,7 @@ int error; #ifdef MAC - error = mac_check_kld_observe(curthread->td_ucred); + error = mac_check_kld_stat(curthread->td_ucred); if (error) return (error); #endif ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#363 (text+ko) ==== @@ -2335,14 +2335,14 @@ } int -mac_check_kld_observe(struct ucred *cred) +mac_check_kld_stat(struct ucred *cred) { int error; if (!mac_enforce_system) return (0); - MAC_CHECK(check_kld_observe, cred); + MAC_CHECK(check_kld_stat, cred); return (error); } ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#110 (text+ko) ==== @@ -527,7 +527,7 @@ } static int -mac_none_check_kld_observe(struct ucred *cred) +mac_none_check_kld_stat(struct ucred *cred) { return (0); @@ -1040,7 +1040,7 @@ .mpo_check_kenv_set = mac_none_check_kenv_set, .mpo_check_kenv_unset = mac_none_check_kenv_unset, .mpo_check_kld_load = mac_none_check_kld_load, - .mpo_check_kld_observe = mac_none_check_kld_observe, + .mpo_check_kld_stat = mac_none_check_kld_stat, .mpo_check_kld_unload = mac_none_check_kld_unload, .mpo_check_mount_stat = mac_none_check_mount_stat, .mpo_check_pipe_ioctl = mac_none_check_pipe_ioctl, ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#86 (text+ko) ==== @@ -923,7 +923,7 @@ } static int -mac_test_check_kld_observe(struct ucred *cred) +mac_test_check_kld_stat(struct ucred *cred) { return (0); @@ -1437,7 +1437,7 @@ .mpo_check_kenv_set = mac_test_check_kenv_set, .mpo_check_kenv_unset = mac_test_check_kenv_unset, .mpo_check_kld_load = mac_test_check_kld_load, - .mpo_check_kld_observe = mac_test_check_kld_observe, + .mpo_check_kld_stat = mac_test_check_kld_stat, .mpo_check_kld_unload = mac_test_check_kld_unload, .mpo_check_mount_stat = mac_test_check_mount_stat, .mpo_check_pipe_ioctl = mac_test_check_pipe_ioctl, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#219 (text+ko) ==== @@ -240,7 +240,7 @@ int mac_check_kenv_set(struct ucred *cred, char *name, char *value); int mac_check_kenv_unset(struct ucred *cred, char *name); int mac_check_kld_load(struct ucred *cred, struct vnode *vp); -int mac_check_kld_observe(struct ucred *cred); +int mac_check_kld_stat(struct ucred *cred); int mac_check_kld_unload(struct ucred *cred); int mac_check_mount_stat(struct ucred *cred, struct mount *mp); int mac_check_pipe_ioctl(struct ucred *cred, struct pipe *pipe, ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#173 (text+ko) ==== @@ -276,7 +276,7 @@ int (*mpo_check_kenv_unset)(struct ucred *cred, char *name); int (*mpo_check_kld_load)(struct ucred *cred, struct vnode *vp, struct label *vlabel); - int (*mpo_check_kld_observe)(struct ucred *cred); + int (*mpo_check_kld_stat)(struct ucred *cred); int (*mpo_check_kld_unload)(struct ucred *cred); int (*mpo_check_mount_stat)(struct ucred *cred, struct mount *mp, struct label *mntlabel); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 16 20:28: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8EDC37B404; Sat, 16 Nov 2002 20:28:01 -0800 (PST) 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 83D0437B401 for ; Sat, 16 Nov 2002 20:28:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3F70A43E9C for ; Sat, 16 Nov 2002 20:28:01 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAH4PFmV023871 for ; Sat, 16 Nov 2002 20:25:15 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAH4PFmS023868 for perforce@freebsd.org; Sat, 16 Nov 2002 20:25:15 -0800 (PST) Date: Sat, 16 Nov 2002 20:25:15 -0800 (PST) Message-Id: <200211170425.gAH4PFmS023868@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 Subject: PERFORCE change 21130 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21130 Change 21130 by rwatson@rwatson_paprika on 2002/11/16 20:24:45 vp!=NULL is an invariant for mac_check_kld_load(), so don't attempt to handle vp!=NULL. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#364 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#364 (text+ko) ==== @@ -2321,15 +2321,12 @@ { int error; - if (vp != NULL) { - ASSERT_VOP_LOCKED(vp, "mac_check_system_acct"); - } + ASSERT_VOP_LOCKED(vp, "mac_check_kld_load"); if (!mac_enforce_system) return (0); - MAC_CHECK(check_kld_load, cred, vp, - vp != NULL ? &vp->v_label : NULL); + MAC_CHECK(check_kld_load, cred, vp, &vp->v_label); return (error); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 16 20:31: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E83E37B404; Sat, 16 Nov 2002 20:31:06 -0800 (PST) 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 2694D37B401 for ; Sat, 16 Nov 2002 20:31:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D253A43E3B for ; Sat, 16 Nov 2002 20:31:05 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAH4SKmV024274 for ; Sat, 16 Nov 2002 20:28:20 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAH4SJ6v024269 for perforce@freebsd.org; Sat, 16 Nov 2002 20:28:19 -0800 (PST) Date: Sat, 16 Nov 2002 20:28:19 -0800 (PST) Message-Id: <200211170428.gAH4SJ6v024269@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 Subject: PERFORCE change 21131 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21131 Change 21131 by rwatson@rwatson_paprika on 2002/11/16 20:27:56 Key kld enforcemnt off of mac_enforce_kld rather than mac_enforce_system. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#365 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#365 (text+ko) ==== @@ -125,6 +125,11 @@ &mac_enforce_fs, 0, "Enforce MAC policy on file system objects"); TUNABLE_INT("security.mac.enforce_fs", &mac_enforce_fs); +static int mac_enforce_kld = 1; +SYSCTL_INT(_security_mac, OID_AUTO, enforce_kld, CTLFLAG_RW, + &mac_enforce_kld, 0, "Enforce MAC policy on kld operations"); +TUNABLE_INT("security.mac.enforce_kld", &mac_enforce_kld); + static int mac_enforce_network = 1; SYSCTL_INT(_security_mac, OID_AUTO, enforce_network, CTLFLAG_RW, &mac_enforce_network, 0, "Enforce MAC policy on network packets"); @@ -2323,7 +2328,7 @@ ASSERT_VOP_LOCKED(vp, "mac_check_kld_load"); - if (!mac_enforce_system) + if (!mac_enforce_kld) return (0); MAC_CHECK(check_kld_load, cred, vp, &vp->v_label); @@ -2336,7 +2341,7 @@ { int error; - if (!mac_enforce_system) + if (!mac_enforce_kld) return (0); MAC_CHECK(check_kld_stat, cred); @@ -2349,7 +2354,7 @@ { int error; - if (!mac_enforce_system) + if (!mac_enforce_kld) return (0); MAC_CHECK(check_kld_unload, cred); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 16 21:51:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54D8137B404; Sat, 16 Nov 2002 21:51:49 -0800 (PST) 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 E489E37B401 for ; Sat, 16 Nov 2002 21:51:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9ABC243E75 for ; Sat, 16 Nov 2002 21:51:48 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAH5n2mV032781 for ; Sat, 16 Nov 2002 21:49:02 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAH5n2S3032775 for perforce@freebsd.org; Sat, 16 Nov 2002 21:49:02 -0800 (PST) Date: Sat, 16 Nov 2002 21:49:02 -0800 (PST) Message-Id: <200211170549.gAH5n2S3032775@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 Subject: PERFORCE change 21136 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21136 Change 21136 by rwatson@rwatson_paprika on 2002/11/16 21:48:47 Avoid using curthread in situations where we actually do have thread pointer passed in; this avoids the PCPU cost, as well as preventing confusion by the reader regarding why curthread and the passed thread might be different (as well as being more consistent with other use of the thread in the same function). Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#18 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_linker.c#18 (text+ko) ==== @@ -832,7 +832,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_stat(curthread->td_ucred); + error = mac_check_kld_stat(td->td_ucred); if (error) return (error); #endif @@ -868,7 +868,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_stat(curthread->td_ucred); + error = mac_check_kld_stat(td->td_ucred); if (error) return (error); #endif @@ -909,7 +909,7 @@ struct kld_file_stat *stat; #ifdef MAC - error = mac_check_kld_stat(curthread->td_ucred); + error = mac_check_kld_stat(td->td_ucred); if (error) return (error); #endif @@ -964,7 +964,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_stat(curthread->td_ucred); + error = mac_check_kld_stat(td->td_ucred); if (error) return (error); #endif @@ -999,7 +999,7 @@ int error = 0; #ifdef MAC - error = mac_check_kld_stat(curthread->td_ucred); + error = mac_check_kld_stat(td->td_ucred); if (error) return (error); #endif @@ -1838,7 +1838,7 @@ int error; #ifdef MAC - error = mac_check_kld_stat(curthread->td_ucred); + error = mac_check_kld_stat(req->td->td_ucred); if (error) return (error); #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 12:15:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA8CF37B404; Sun, 17 Nov 2002 12:14:41 -0800 (PST) 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 4AB3F37B401 for ; Sun, 17 Nov 2002 12:14:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 564D643E42 for ; Sun, 17 Nov 2002 12:14:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAHKBpmV017383 for ; Sun, 17 Nov 2002 12:11:51 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAHKBoYd017380 for perforce@freebsd.org; Sun, 17 Nov 2002 12:11:50 -0800 (PST) Date: Sun, 17 Nov 2002 12:11:50 -0800 (PST) Message-Id: <200211172011.gAHKBoYd017380@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21180 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21180 Change 21180 by peter@peter_overcee on 2002/11/17 12:11:00 IFC @21104 (same as DP2 last integ) Affected files ... .. //depot/projects/ia64/kerberos5/usr.bin/krb5-config/Makefile#7 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/Makefile.inc#5 integrate .. //depot/projects/ia64/lib/libc/alpha/gen/makecontext.c#2 integrate .. //depot/projects/ia64/lib/libc/gen/sysconf.c#8 integrate .. //depot/projects/ia64/lib/libc/i386/gen/Makefile.inc#6 integrate .. //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#9 integrate .. //depot/projects/ia64/sbin/newfs/mkfs.c#17 integrate .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#21 integrate .. //depot/projects/ia64/sys/alpha/include/cpu.h#4 integrate .. //depot/projects/ia64/sys/alpha/include/fpu.h#2 integrate .. //depot/projects/ia64/sys/alpha/include/signal.h#4 integrate .. //depot/projects/ia64/sys/alpha/include/ucontext.h#4 integrate .. //depot/projects/ia64/sys/conf/files#48 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#31 integrate .. //depot/projects/ia64/sys/i386/include/signal.h#5 integrate .. //depot/projects/ia64/sys/i386/include/ucontext.h#6 integrate .. //depot/projects/ia64/sys/i386/isa/npx.c#13 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#53 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_context.c#1 branch .. //depot/projects/ia64/sys/kern/kern_exec.c#32 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#21 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#21 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#22 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#26 integrate .. //depot/projects/ia64/sys/net/route.c#5 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#18 integrate .. //depot/projects/ia64/sys/netinet/ip_mroute.c#15 integrate .. //depot/projects/ia64/sys/netinet/ip_mroute.h#3 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#17 integrate .. //depot/projects/ia64/sys/netinet/ip_var.h#9 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#17 integrate .. //depot/projects/ia64/sys/posix4/ksched.c#7 integrate .. //depot/projects/ia64/sys/posix4/p1003_1b.c#4 integrate .. //depot/projects/ia64/sys/posix4/posix4.h#4 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#19 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#27 integrate .. //depot/projects/ia64/sys/sys/syscall.h#20 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#20 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#22 integrate .. //depot/projects/ia64/sys/sys/ucontext.h#6 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#21 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#24 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#23 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#19 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#19 integrate Differences ... ==== //depot/projects/ia64/kerberos5/usr.bin/krb5-config/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.7 2002/09/19 12:59:18 nectar Exp $ +# $FreeBSD: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.8 2002/11/16 02:23:17 nectar Exp $ SCRIPTS= krb5-config MAN= krb5-config.1 @@ -15,6 +15,7 @@ -e "s,@LIB_dbopen\@,,g" \ -e "s,@LIB_des_appl\@,-lcrypto,g" \ -e "s,@LIBS\@,-lcom_err,g" \ + -e "s,@INCLUDE_des@,,g" \ ${.ALLSRC} > ${.TARGET} chmod +x ${.TARGET} ==== //depot/projects/ia64/lib/libc/alpha/gen/Makefile.inc#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.9 2002/03/21 06:45:32 peter Exp $ +# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.10 2002/11/16 06:39:10 deischen Exp $ SRCS+= _setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \ @@ -8,7 +8,7 @@ SRCS+= __divqu.S __divq.S __divlu.S __divl.S SRCS+= __remqu.S __remq.S __remlu.S __reml.S SRCS+= rfork_thread.S -SRCS+= _ctx_start.S getcontext.S makecontext.c swapcontext.c +SRCS+= _ctx_start.S makecontext.c CLEANFILES+= __divqu.S __divq.S __divlu.S __divl.S CLEANFILES+= __remqu.S __remq.S __remlu.S __reml.S ==== //depot/projects/ia64/lib/libc/alpha/gen/makecontext.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/makecontext.c,v 1.1 2002/01/10 02:40:53 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/makecontext.c,v 1.2 2002/11/16 06:39:10 deischen Exp $"); #include #include @@ -90,7 +90,7 @@ * Make sure the context is valid. For now, we only allow * trapframe format contexts to be used for makecontext. */ - else if (ucp->uc_mcontext.mc_format == __UC_REV0_SIGFRAME) { + else if (ucp->uc_mcontext.mc_format == _MC_REV0_SIGFRAME) { /* * Alpha passes the first 6 parameters in registers and * remaining parameters on the stack. Set up the context ==== //depot/projects/ia64/lib/libc/gen/sysconf.c#8 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)sysconf.c 8.2 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.17 2002/10/27 18:03:02 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.18 2002/11/16 06:35:20 alfred Exp $"); #include #include @@ -254,14 +254,17 @@ return (_POSIX_TIMERS); #endif case _SC_AIO_LISTIO_MAX: + defaultresult = _POSIX_AIO_LISTIO_MAX; mib[0] = CTL_P1003_1B; mib[1] = CTL_P1003_1B_AIO_LISTIO_MAX; goto yesno; case _SC_AIO_MAX: + defaultresult = _POSIX_AIO_MAX; mib[0] = CTL_P1003_1B; mib[1] = CTL_P1003_1B_AIO_MAX; goto yesno; case _SC_AIO_PRIO_DELTA_MAX: + defaultresult = 0; mib[0] = CTL_P1003_1B; mib[1] = CTL_P1003_1B_AIO_PRIO_DELTA_MAX; goto yesno; ==== //depot/projects/ia64/lib/libc/i386/gen/Makefile.inc#6 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.17 2002/09/17 19:43:53 bde Exp $ +# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.18 2002/11/16 06:39:11 deischen Exp $ -SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.S frexp.c getcontext.S \ +SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.S frexp.c \ infinity.c isinf.c ldexp.c makecontext.c modf.S \ - rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S swapcontext.c + rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S ==== //depot/projects/ia64/lib/libc/ia64/gen/Makefile.inc#9 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.4 2002/04/13 04:06:34 marcel Exp $ +# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.5 2002/11/16 01:41:33 marcel Exp $ -SRCS+= _setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S -SRCS+= sigsetjmp.S fpsetmask.c fpgetmask.c -SRCS+= __divdi3.S __divsi3.S __moddi3.S __modsi3.S -SRCS+= __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S -SRCS+= __divdf3.S __divsf3.S +SRCS+= __divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \ + __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _setjmp.S fabs.S \ + fpgetmask.c fpsetmask.c frexp.c infinity.c isinf.c ldexp.c modf.c \ + setjmp.S sigsetjmp.S # The following may go away if function _Unwind_FindTableEntry() # will be part of GCC. ==== //depot/projects/ia64/sbin/newfs/mkfs.c#17 (text+ko) ==== @@ -48,7 +48,7 @@ static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.63 2002/10/18 23:17:30 mckusick Exp $"; + "$FreeBSD: src/sbin/newfs/mkfs.c,v 1.64 2002/11/15 23:50:14 mckusick Exp $"; #endif /* not lint */ #include @@ -405,7 +405,8 @@ howmany(csfrags, sblock.fs_frag); sblock.fs_cstotal.cs_nffree = fragnum(&sblock, sblock.fs_size) + - (csfrags > 0 ? sblock.fs_frag - csfrags : 0); + (numfrags(&sblock, csfrags) > 0 ? + sblock.fs_frag - numfrags(&sblock, csfrags) : 0); sblock.fs_cstotal.cs_nifree = sblock.fs_ncg * sblock.fs_ipg - ROOTINO; sblock.fs_cstotal.cs_ndir = 0; sblock.fs_dsize -= csfrags; ==== //depot/projects/ia64/sys/alpha/alpha/machdep.c#21 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.191 2002/11/09 16:19:13 des Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.192 2002/11/16 06:35:51 deischen Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -210,7 +210,9 @@ u_long code); #endif +static void get_fpcontext(struct thread *td, mcontext_t *mcp); static void identifycpu(void); +static int set_fpcontext(struct thread *td, const mcontext_t *mcp); struct kva_md_info kmi; @@ -1405,7 +1407,7 @@ frame->tf_regs[FRAME_TRAPARG_A1]; sf.sf_uc.uc_mcontext.mc_regs[R_TRAPARG_A2] = frame->tf_regs[FRAME_TRAPARG_A2]; - sf.sf_uc.uc_mcontext.mc_format = __UC_REV0_SIGFRAME; + sf.sf_uc.uc_mcontext.mc_format = _MC_REV0_SIGFRAME; /* * Allocate and validate space for the signal handler @@ -1664,13 +1666,15 @@ return (error); } #ifdef COMPAT_43 - if (((struct osigcontext*)&uc)->sc_regs[R_ZERO] == 0xACEDBADE) - return osigreturn(td, (struct osigreturn_args *)uap); + if (((struct osigcontext*)&uc)->sc_regs[R_ZERO] == 0xACEDBADE) + return osigreturn(td, (struct osigreturn_args *)uap); #endif /* * Restore the user-supplied information */ + if ((error = set_fpcontext(td, &uc.uc_mcontext)) != 0) + return (error); set_regs(td, (struct reg *)uc.uc_mcontext.mc_regs); val = (uc.uc_mcontext.mc_regs[R_PS] | ALPHA_PSL_USERSET) & ~ALPHA_PSL_USERCLR; @@ -1692,12 +1696,6 @@ signotify(p); PROC_UNLOCK(p); - /* XXX ksc.sc_ownedfp ? */ - alpha_fpstate_drop(td); - bcopy((struct fpreg *)uc.uc_mcontext.mc_fpregs, - &td->td_pcb->pcb_fp, sizeof(struct fpreg)); - td->td_pcb->pcb_fp_control = uc.uc_mcontext.mc_fp_control; - return (EJUSTRETURN); } @@ -2011,6 +2009,133 @@ } int +get_mcontext(struct thread *td, mcontext_t *mcp) +{ + /* + * Use a trapframe for getsetcontext, so just copy the + * threads trapframe. + */ + bcopy(&td->td_frame, &mcp->mc_regs, sizeof(td->td_frame)); + + /* + * When the thread is the current thread, the user stack pointer + * is not in the PCB; it must be read from the PAL. + */ + if (td == curthread) + mcp->mc_regs[FRAME_SP] = alpha_pal_rdusp(); + + mcp->mc_format = _MC_REV0_TRAPFRAME; + mcp->mc_onstack = sigonstack(alpha_pal_rdusp()) ? 1 : 0; + get_fpcontext(td, mcp); + return (0); +} + +int +set_mcontext(struct thread *td, const mcontext_t *mcp) +{ + int ret; + unsigned long val; + + if ((mcp->mc_format != _MC_REV0_TRAPFRAME) && + (mcp->mc_format != _MC_REV0_SIGFRAME)) + return (EINVAL); + else if ((ret = set_fpcontext(td, mcp)) != 0) + return (ret); + + if (mcp->mc_format == _MC_REV0_SIGFRAME) { + set_regs(td, (struct reg *)&mcp->mc_regs); + val = (mcp->mc_regs[R_PS] | ALPHA_PSL_USERSET) & + ~ALPHA_PSL_USERCLR; + td->td_frame->tf_regs[FRAME_PS] = val; + td->td_frame->tf_regs[FRAME_PC] = mcp->mc_regs[R_PC]; + td->td_frame->tf_regs[FRAME_FLAGS] = 0; + if (td == curthread) + alpha_pal_wrusp(mcp->mc_regs[R_SP]); + + } else { + if (td == curthread) + alpha_pal_wrusp(mcp->mc_regs[FRAME_SP]); + /* + * The context is a trapframe, so just copy it over the + * threads frame. + */ + bcopy(&mcp->mc_regs, &td->td_frame, sizeof(td->td_frame)); + } + return (0); +} + +static void +get_fpcontext(struct thread *td, mcontext_t *mcp) +{ + register_t s; + + s = intr_disable(); + if ((td->td_md.md_flags & MDTD_FPUSED) == 0) { + intr_restore(s); + mcp->mc_ownedfp = _MC_FPOWNED_NONE; + } else if (PCPU_GET(fpcurthread) == td) { + /* See comments in alpha_fpstate_save() regarding FEN. */ + if (td != curthread) + alpha_pal_wrfen(1); + /* + * The last field (fpr_cr) of struct fpreg isn't + * included in mc_fpregs, but it immediately follows + * it in mcontext_t. + */ + savefpstate((struct fpreg *)&mcp->mc_fpregs); + if (td != curthread) + alpha_pal_wrfen(0); + intr_restore(s); + mcp->mc_ownedfp = _MC_FPOWNED_FPU; + } else { + /* + * The thread doesn't own the FPU so get the state from + * the PCB. + */ + intr_restore(s); + bcopy(&td->td_pcb->pcb_fp, &mcp->mc_fpregs, + sizeof(td->td_pcb->pcb_fp)); + mcp->mc_ownedfp = _MC_FPOWNED_PCB; + } + /* There's no harm in always doing the following. */ + mcp->mc_fp_control = td->td_pcb->pcb_fp_control; +} + +static int +set_fpcontext(struct thread *td, const mcontext_t *mcp) +{ + register_t s; + + if (mcp->mc_ownedfp == _MC_FPOWNED_NONE) { + /* XXX - Drop fpu state so we get a clean state? */ + alpha_fpstate_drop(td); + } + else if ((mcp->mc_ownedfp != _MC_FPOWNED_FPU) && + (mcp->mc_ownedfp != _MC_FPOWNED_PCB)) + return (EINVAL); + else { + s = intr_disable(); + if (PCPU_GET(fpcurthread) == td) { + /* + * The last field (fpr_cr) of struct fpreg isn't + * included in mc_fpregs, but it immediately follows + * it in mcontext_t. + */ + restorefpstate((struct fpreg *)&mcp->mc_fpregs); + intr_restore(s); + } + else { + /* Just save the state in the PCB. */ + intr_restore(s); + bcopy(&mcp->mc_fpregs, &td->td_pcb->pcb_fp, + sizeof (td->td_pcb->pcb_fp)); + } + td->td_pcb->pcb_fp_control = mcp->mc_fp_control; + } + return (0); +} + +int fill_dbregs(struct thread *td, struct dbreg *dbregs) { ==== //depot/projects/ia64/sys/alpha/include/cpu.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.33 2002/10/06 05:24:13 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.34 2002/11/16 06:35:51 deischen Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* @@ -115,11 +115,11 @@ void XentSys(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ void XentUna(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ void alpha_init(u_long, u_long, u_long, u_long, u_long); +void alpha_fpstate_check(struct thread *td); +void alpha_fpstate_drop(struct thread *td); +void alpha_fpstate_save(struct thread *td, int write); +void alpha_fpstate_switch(struct thread *td); int alpha_pa_access(u_long); -void alpha_fpstate_check(struct thread *p); -void alpha_fpstate_save(struct thread *p, int write); -void alpha_fpstate_drop(struct thread *p); -void alpha_fpstate_switch(struct thread *p); int badaddr (void *, size_t); int badaddr_read(void *, size_t, void *); u_int64_t console_restart(u_int64_t, u_int64_t, u_int64_t); ==== //depot/projects/ia64/sys/alpha/include/fpu.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/fpu.h,v 1.5 2001/09/12 08:36:54 julian Exp $ + * $FreeBSD: src/sys/alpha/include/fpu.h,v 1.6 2002/11/16 06:35:51 deischen Exp $ */ #ifndef _MACHINE_FPU_H_ @@ -116,9 +116,7 @@ __asm__("trapb") #ifdef _KERNEL - -extern int fp_software_completion(u_int64_t regmask, struct thread *p); - +extern int fp_software_completion(u_int64_t regmask, struct thread *td); #endif #endif /* ! _MACHINE_FPU_H_ */ ==== //depot/projects/ia64/sys/alpha/include/signal.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/signal.h,v 1.10 2002/10/25 19:10:55 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/include/signal.h,v 1.11 2002/11/16 06:35:51 deischen Exp $ */ /* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */ /* @@ -94,10 +94,9 @@ unsigned long sc_fpregs[32]; /* FP register set (see above) */ unsigned long sc_fpcr; /* FP control register (see above) */ unsigned long sc_fp_control; /* FP software control word */ - long sc_ownedfp; /* fp has been used */ - long sc_xxx1[2]; /* sc_ssize, sc_sbase on DUX */ - long sc_xxx2[3]; /* sc_fp_trap_pc, sc_fp_trigger_sum, sc_fp_trigger_inst */ - long sc_reserved[2]; /* XXX */ + long sc_ownedfp; /* fp has been used; see mcontext_t */ + long sc_format; /* see mcontext_t */ + long sc_spare[6]; /* XXX */ }; #define sc_sp sc_regs[R_SP] ==== //depot/projects/ia64/sys/alpha/include/ucontext.h#4 (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. * - * $FreeBSD: src/sys/alpha/include/ucontext.h,v 1.5 2002/10/25 19:10:55 peter Exp $ + * $FreeBSD: src/sys/alpha/include/ucontext.h,v 1.6 2002/11/16 06:35:51 deischen Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -43,11 +43,14 @@ unsigned long mc_fpregs[32]; unsigned long mc_fpcr; unsigned long mc_fp_control; +#define _MC_FPOWNED_NONE 0 /* FP state not used */ +#define _MC_FPOWNED_FPU 1 /* FP state came from FPU */ +#define _MC_FPOWNED_PCB 2 /* FP state came from PCB */ long mc_ownedfp; -#define __UC_REV0_SIGFRAME 1 /* context is a signal frame */ -#define __UC_REV0_TRAPFRAME 2 /* context is a trap frame */ +#define _MC_REV0_SIGFRAME 1 /* context is a signal frame */ +#define _MC_REV0_TRAPFRAME 2 /* context is a trap frame */ long mc_format; - long __spare__[6]; + long mc_spare[6]; } mcontext_t; #if defined(_KERNEL) && defined(COMPAT_FREEBSD4) ==== //depot/projects/ia64/sys/conf/files#48 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.734 2002/11/12 15:22:18 simokawa Exp $ +# $FreeBSD: src/sys/conf/files,v 1.736 2002/11/16 06:35:51 deischen Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -975,6 +975,7 @@ kern/kern_clock.c standard kern/kern_condvar.c standard kern/kern_conf.c standard +kern/kern_context.c standard kern/kern_descrip.c standard kern/kern_poll.c optional device_polling kern/kern_environment.c standard @@ -1318,7 +1319,7 @@ netinet/ip_fw2.c optional ipfirewall netinet/ip_icmp.c optional inet netinet/ip_input.c optional inet -netinet/ip_mroute.c optional inet +netinet/ip_mroute.c optional mrouting netinet/ip_output.c optional inet netinet/raw_ip.c optional inet netinet/tcp_debug.c optional tcpdebug ==== //depot/projects/ia64/sys/i386/i386/machdep.c#31 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.549 2002/11/09 21:17:41 iwasaki Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.550 2002/11/16 06:35:52 deischen Exp $ */ #include "opt_atalk.h" @@ -2317,7 +2317,7 @@ /* * Get machine context. */ -void +int get_mcontext(struct thread *td, mcontext_t *mcp) { struct trapframe *tp; @@ -2344,6 +2344,7 @@ mcp->mc_ss = tp->tf_ss; mcp->mc_len = sizeof(*mcp); get_fpcontext(td, mcp); + return (0); } /* ==== //depot/projects/ia64/sys/i386/include/signal.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/i386/include/signal.h,v 1.18 2002/10/25 19:10:56 peter Exp $ + * $FreeBSD: src/sys/i386/include/signal.h,v 1.19 2002/11/16 06:35:52 deischen Exp $ */ #ifndef _MACHINE_SIGNAL_H_ @@ -119,7 +119,7 @@ int sc_efl; int sc_esp; int sc_ss; - int sc_len; /* sizeof(struct mcontext_t) */ + int sc_len; /* sizeof(mcontext_t) */ /* * XXX - See and for * the following fields. @@ -127,7 +127,7 @@ int sc_fpformat; int sc_ownedfp; int sc_spare1[1]; - int sc_fpregs[128]; + int sc_fpstate[128]; int sc_spare2[8]; }; ==== //depot/projects/ia64/sys/i386/include/ucontext.h#6 (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. * - * $FreeBSD: src/sys/i386/include/ucontext.h,v 1.8 2002/10/25 19:10:56 peter Exp $ + * $FreeBSD: src/sys/i386/include/ucontext.h,v 1.9 2002/11/16 06:35:52 deischen Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -38,7 +38,7 @@ * and ucontext_t at the same time. */ int mc_onstack; /* XXX - sigcontext compat. */ - int mc_gs; + int mc_gs; /* machine state (trapframe) */ int mc_fs; int mc_es; int mc_ds; @@ -55,7 +55,7 @@ int mc_eip; int mc_cs; int mc_eflags; - int mc_esp; /* machine state */ + int mc_esp; int mc_ss; int mc_len; /* sizeof(mcontext_t) */ @@ -72,8 +72,7 @@ int mc_spare2[8]; } mcontext_t; -#ifdef _KERNEL -#ifdef COMPAT_FREEBSD4 +#if defined(_KERNEL) && defined(COMPAT_FREEBSD4) /* For 4.x binaries */ struct mcontext4 { int mc_onstack; /* XXX - sigcontext compat. */ @@ -101,10 +100,4 @@ }; #endif -struct thread; - -void get_mcontext(struct thread *td, mcontext_t *mcp); -int set_mcontext(struct thread *td, const mcontext_t *mcp); -#endif - #endif /* !_MACHINE_UCONTEXT_H_ */ ==== //depot/projects/ia64/sys/i386/isa/npx.c#13 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/isa/npx.c,v 1.135 2002/11/05 04:03:42 davidxu Exp $ + * $FreeBSD: src/sys/i386/isa/npx.c,v 1.136 2002/11/16 06:35:52 deischen Exp $ */ #include "opt_cpu.h" @@ -161,14 +161,14 @@ typedef u_char bool_t; +static void fpusave(union savefpu *); +static void fpurstor(union savefpu *); static int npx_attach(device_t dev); static void npx_identify(driver_t *driver, device_t parent); #ifndef SMP static void npx_intr(void *); #endif static int npx_probe(device_t dev); -static void fpusave(union savefpu *); -static void fpurstor(union savefpu *); #ifdef I586_CPU_XXX static long timezero(const char *funcname, void (*func)(void *buf, size_t len)); ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#53 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.121 2002/11/09 16:19:14 des Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.122 2002/11/16 06:35:52 deischen Exp $ */ #include "opt_compat.h" @@ -1038,6 +1038,20 @@ } #endif +int +get_mcontext(struct thread *td, mcontext_t *mcp) +{ + + return (ENOSYS); +} + +int +set_mcontext(struct thread *td, const mcontext_t *mcp) +{ + + return (ENOSYS); +} + /* * Machine dependent boot() routine */ ==== //depot/projects/ia64/sys/kern/init_sysent.c#20 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.142 2002/11/05 17:48:04 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.136 2002/11/05 17:47:08 rwatson Exp + * $FreeBSD: src/sys/kern/init_sysent.c,v 1.143 2002/11/16 06:36:56 deischen Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.137 2002/11/16 06:35:53 deischen Exp */ #include "opt_compat.h" @@ -449,4 +449,7 @@ { 0, (sy_call_t *)nosys }, /* 418 = __xstat */ { 0, (sy_call_t *)nosys }, /* 419 = __xfstat */ { 0, (sy_call_t *)nosys }, /* 420 = __xlstat */ + { SYF_MPSAFE | AS(getcontext_args), (sy_call_t *)getcontext }, /* 421 = getcontext */ + { SYF_MPSAFE | AS(setcontext_args), (sy_call_t *)setcontext }, /* 422 = setcontext */ + { SYF_MPSAFE | AS(swapcontext_args), (sy_call_t *)swapcontext }, /* 423 = swapcontext */ }; ==== //depot/projects/ia64/sys/kern/kern_exec.c#32 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_exec.c,v 1.198 2002/11/10 07:12:04 alc Exp $ + * $FreeBSD: src/sys/kern/kern_exec.c,v 1.199 2002/11/16 07:44:25 alc Exp $ */ #include "opt_ktrace.h" @@ -771,7 +771,7 @@ (ma[0]->valid == 0)) { if (ma[0]) { vm_page_lock_queues(); - pmap_page_protect(ma[0], VM_PROT_NONE); + pmap_remove_all(ma[0]); vm_page_free(ma[0]); vm_page_unlock_queues(); } ==== //depot/projects/ia64/sys/kern/syscalls.c#21 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.128 2002/11/05 17:48:04 rwatson Exp $ - * created from FreeBSD: src/sys/kern/syscalls.master,v 1.136 2002/11/05 17:47:08 rwatson Exp + * $FreeBSD: src/sys/kern/syscalls.c,v 1.129 2002/11/16 06:36:56 deischen Exp $ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.137 2002/11/16 06:35:53 deischen Exp */ const char *syscallnames[] = { @@ -428,4 +428,7 @@ "#418", /* 418 = __xstat */ "#419", /* 419 = __xfstat */ "#420", /* 420 = __xlstat */ + "getcontext", /* 421 = getcontext */ + "setcontext", /* 422 = setcontext */ + "swapcontext", /* 423 = swapcontext */ }; ==== //depot/projects/ia64/sys/kern/syscalls.master#21 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.136 2002/11/05 17:47:08 rwatson Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.137 2002/11/16 06:35:53 deischen Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -608,6 +608,10 @@ 418 UNIMPL BSD __xstat 419 UNIMPL BSD __xfstat 420 UNIMPL BSD __xlstat +421 MSTD BSD { int getcontext(struct __ucontext *ucp); } +422 MSTD BSD { int setcontext(const struct __ucontext *ucp); } +423 MSTD BSD { int swapcontext(struct __ucontext *oucp, \ + const struct __ucontext *ucp); } ; Please copy any additions and changes to the following compatability tables: ; sys/ia64/ia32/syscalls.master (take a best guess) ==== //depot/projects/ia64/sys/kern/vfs_aio.c#22 (text+ko) ==== @@ -13,7 +13,7 @@ * bad that happens because of using this software isn't the responsibility * of the author. This software is distributed AS-IS. * - * $FreeBSD: src/sys/kern/vfs_aio.c,v 1.143 2002/11/07 20:46:37 rwatson Exp $ + * $FreeBSD: src/sys/kern/vfs_aio.c,v 1.145 2002/11/16 06:38:07 alfred Exp $ */ /* @@ -47,6 +47,7 @@ #include #include +#include #include #include #include @@ -350,6 +351,9 @@ aiod_lifetime = AIOD_LIFETIME_DEFAULT; jobrefid = 1; async_io_version = _POSIX_VERSION; + p31b_setcfg(CTL_P1003_1B_AIO_LISTIO_MAX, AIO_LISTIO_MAX); + p31b_setcfg(CTL_P1003_1B_AIO_MAX, MAX_AIO_QUEUE); + p31b_setcfg(CTL_P1003_1B_AIO_PRIO_DELTA_MAX, 0); } /* @@ -372,6 +376,9 @@ rm_at_exit(aio_proc_rundown); rm_at_exec(aio_proc_rundown); kqueue_del_filteropts(EVFILT_AIO); + p31b_setcfg(CTL_P1003_1B_AIO_LISTIO_MAX, 0); + p31b_setcfg(CTL_P1003_1B_AIO_MAX, 0); + p31b_setcfg(CTL_P1003_1B_AIO_PRIO_DELTA_MAX, 0); return (0); } ==== //depot/projects/ia64/sys/kern/vfs_bio.c#26 (text+ko) ==== @@ -11,7 +11,7 @@ * 2. Absolutely no warranty of function or purpose is made by the author * John S. Dyson. * - * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.340 2002/11/10 07:12:04 alc Exp $ + * $FreeBSD: src/sys/kern/vfs_bio.c,v 1.341 2002/11/16 07:44:25 alc Exp $ */ /* @@ -1504,7 +1504,7 @@ if ((bp->b_flags & B_ASYNC) == 0 && !m->valid && m->hold_count == 0) { vm_page_busy(m); - pmap_page_protect(m, VM_PROT_NONE); + pmap_remove_all(m); vm_page_free(m); } else if (bp->b_flags & B_DIRECT) { vm_page_try_to_free(m); @@ -3268,7 +3268,7 @@ * It may not work properly with small-block devices. * We need to find a better way. */ - pmap_page_protect(m, VM_PROT_NONE); + pmap_remove_all(m); if (clear_modify) vfs_page_set_valid(bp, foff, i, m); else if (m->valid == VM_PAGE_BITS_ALL && ==== //depot/projects/ia64/sys/net/route.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)route.c 8.3 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/route.c,v 1.70 2002/05/31 04:27:51 silby Exp $ + * $FreeBSD: src/sys/net/route.c,v 1.71 2002/11/15 22:53:53 luigi Exp $ */ #include "opt_inet.h" @@ -403,7 +403,7 @@ { #ifdef INET /* Multicast goop, grrr... */ - return mrt_ioctl(req, data); + return mrt_ioctl ? mrt_ioctl(req, data) : EOPNOTSUPP; #else /* INET */ return ENXIO; #endif /* INET */ ==== //depot/projects/ia64/sys/netinet/ip_input.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_input.c,v 1.215 2002/10/20 22:52:06 phk Exp $ + * $FreeBSD: src/sys/netinet/ip_input.c,v 1.216 2002/11/15 22:53:52 luigi Exp $ */ #include "opt_bootp.h" @@ -600,7 +600,8 @@ * ip_mforward() returns a non-zero value, the packet * must be discarded, else it may be accepted below. */ - if (ip_mforward(ip, m->m_pkthdr.rcvif, m, 0) != 0) { + if (ip_mforward && + ip_mforward(ip, m->m_pkthdr.rcvif, m, 0) != 0) { ipstat.ips_cantforward++; m_freem(m); return; @@ -2073,10 +2074,10 @@ { if (so->so_type != SOCK_RAW || so->so_proto->pr_protocol != IPPROTO_RSVP) - return EOPNOTSUPP; + return EOPNOTSUPP; if (ip_rsvpd != NULL) - return EADDRINUSE; + return EADDRINUSE; ip_rsvpd = so; /* @@ -2105,3 +2106,29 @@ } return 0; } + +void +rsvp_input(struct mbuf *m, int off) /* XXX must fixup manually */ +{ + if (rsvp_input_p) { /* call the real one if loaded */ + rsvp_input_p(m, off); + return; + } + + /* Can still get packets with rsvp_on = 0 if there is a local member + * of the group to which the RSVP packet is addressed. But in this + * case we want to throw the packet away. + */ + + if (!rsvp_on) { + m_freem(m); + return; + } + + if (ip_rsvpd != NULL) { + rip_input(m, off); + return; + } + /* Drop the packet */ + m_freem(m); +} ==== //depot/projects/ia64/sys/netinet/ip_mroute.c#15 (text+ko) ==== @@ -9,7 +9,7 @@ * Modified by Bill Fenner, PARC, April 1995 * * MROUTING Revision: 3.5 - * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.82 2002/11/08 14:52:26 jhb Exp $ + * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.83 2002/11/15 22:53:52 luigi Exp $ */ #include "opt_mac.h" @@ -45,157 +45,30 @@ #include #include -#ifndef MROUTING -extern u_long _ip_mcast_src(int vifi); -extern int _ip_mforward(struct ip *ip, struct ifnet *ifp, struct mbuf *m, - struct ip_moptions *imo); -extern int _ip_mrouter_done(void); -extern int _ip_mrouter_get(struct socket *so, struct sockopt *sopt); -extern int _ip_mrouter_set(struct socket *so, struct sockopt *sopt); -extern int _mrt_ioctl(int req, caddr_t data); - /* - * Dummy routines and globals used when multicast routing is not compiled in. + * Control debugging code for rsvp and multicast routing code. + * Can only set them with the debugger. */ +static u_int rsvpdebug; /* non-zero enables debugging */ -struct socket *ip_mrouter = NULL; -u_int rsvpdebug = 0; +static u_int mrtdebug; /* any set of the flags below */ +#define DEBUG_MFC 0x02 +#define DEBUG_FORWARD 0x04 +#define DEBUG_EXPIRE 0x08 +#define DEBUG_XMIT 0x10 -int -_ip_mrouter_set(so, sopt) - struct socket *so; - struct sockopt *sopt; -{ - return(EOPNOTSUPP); -} - -int (*ip_mrouter_set)(struct socket *, struct sockopt *) = _ip_mrouter_set; - - -int -_ip_mrouter_get(so, sopt) - struct socket *so; - struct sockopt *sopt; -{ - return(EOPNOTSUPP); -} - -int (*ip_mrouter_get)(struct socket *, struct sockopt *) = _ip_mrouter_get; - -int -_ip_mrouter_done() -{ - return(0); -} - -int (*ip_mrouter_done)(void) = _ip_mrouter_done; - -int >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 13:19:23 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B8D237B404; Sun, 17 Nov 2002 13:19:21 -0800 (PST) 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 D9E7237B401 for ; Sun, 17 Nov 2002 13:19:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 971B743E42 for ; Sun, 17 Nov 2002 13:19:20 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAHLGVmV022766 for ; Sun, 17 Nov 2002 13:16:31 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAHLGVeN022762 for perforce@freebsd.org; Sun, 17 Nov 2002 13:16:31 -0800 (PST) Date: Sun, 17 Nov 2002 13:16:31 -0800 (PST) Message-Id: <200211172116.gAHLGVeN022762@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21184 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21184 Change 21184 by peter@peter_precision on 2002/11/17 13:16:07 Argh, I forgot these. :-( Affected files ... .. //depot/projects/ia64/lib/libutil/logout.c#2 edit .. //depot/projects/ia64/lib/libutil/logwtmp.c#3 edit Differences ... ==== //depot/projects/ia64/lib/libutil/logout.c#2 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include #include +#include typedef struct utmp UTMP; @@ -68,7 +69,7 @@ continue; bzero(ut.ut_name, UT_NAMESIZE); bzero(ut.ut_host, UT_HOSTSIZE); - (void)time(&ut.ut_time); + ut.ut_time = _time_to_time32(time(NULL)); (void)lseek(fd, -(off_t)sizeof(UTMP), L_INCR); (void)write(fd, &ut, sizeof(UTMP)); rval = 1; ==== //depot/projects/ia64/lib/libutil/logwtmp.c#3 (text+ko) ==== @@ -52,6 +52,7 @@ #include #include #include +#include /* wrapper for KAME-special getnameinfo() */ #ifndef NI_WITHSCOPEID @@ -102,7 +103,7 @@ (void) strncpy(ut.ut_line, line, sizeof(ut.ut_line)); (void) strncpy(ut.ut_name, name, sizeof(ut.ut_name)); (void) strncpy(ut.ut_host, host, sizeof(ut.ut_host)); - (void) time(&ut.ut_time); + ut.ut_time = _time_to_time32(time(NULL)); if (write(fd, (char *)&ut, sizeof(struct utmp)) != sizeof(struct utmp)) (void) ftruncate(fd, buf.st_size); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 15: 7:35 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C55ED37B404; Sun, 17 Nov 2002 15:07:33 -0800 (PST) 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 5B6C937B401 for ; Sun, 17 Nov 2002 15:07:33 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BF49843E3B for ; Sun, 17 Nov 2002 15:07:32 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAHN4hmV029929 for ; Sun, 17 Nov 2002 15:04:43 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAHN4ha4029926 for perforce@freebsd.org; Sun, 17 Nov 2002 15:04:43 -0800 (PST) Date: Sun, 17 Nov 2002 15:04:43 -0800 (PST) Message-Id: <200211172304.gAHN4ha4029926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21187 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21187 Change 21187 by jmallett@jmallett_dalek on 2002/11/17 15:03:50 Empty stubs aplenty to move forward to things being required to be correct. Affected files ... .. //depot/projects/mips/sys/mips/include/pmap.h#1 add .. //depot/projects/mips/sys/mips/mips/genassym.c#2 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/genassym.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ #include #include +#include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 15:54:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E08337B404; Sun, 17 Nov 2002 15:54:31 -0800 (PST) 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 1B50537B401 for ; Sun, 17 Nov 2002 15:54:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CDFE943E3B for ; Sun, 17 Nov 2002 15:54:30 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAHNpfmV033356 for ; Sun, 17 Nov 2002 15:51:41 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAHNpev7033353 for perforce@freebsd.org; Sun, 17 Nov 2002 15:51:40 -0800 (PST) Date: Sun, 17 Nov 2002 15:51:40 -0800 (PST) Message-Id: <200211172351.gAHNpev7033353@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21189 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21189 Change 21189 by marcel@marcel_nfs on 2002/11/17 15:51:04 Create a new file for the EPC based syscalls. We put the code in a special section (.text.syscall) for greatest flexibility. The syscall code itself is still a stub. pmap/trap code coming next. Affected files ... .. //depot/projects/ia64/sys/conf/files.ia64#20 edit .. //depot/projects/ia64/sys/conf/ldscript.ia64#4 edit .. //depot/projects/ia64/sys/ia64/ia64/syscall.s#1 add Differences ... ==== //depot/projects/ia64/sys/conf/files.ia64#20 (text+ko) ==== @@ -64,6 +64,7 @@ ia64/ia64/sscdisk.c optional ski ia64/ia64/swtch.s standard ia64/ia64/sys_machdep.c standard +ia64/ia64/syscall.s standard ia64/ia64/trap.c standard ia64/ia64/unaligned.c standard ia64/ia64/unwind.c standard ==== //depot/projects/ia64/sys/conf/ldscript.ia64#4 (text+ko) ==== @@ -13,6 +13,7 @@ { *(.text.ivt) . += 8192; + *(.text.syscall) *(.text) *(.stub) /* .gnu.warning sections are handled specially by elf32.em. */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 16: 6:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4842A37B404; Sun, 17 Nov 2002 16:06:47 -0800 (PST) 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 BC4F637B401 for ; Sun, 17 Nov 2002 16:06:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 699AC43E6E for ; Sun, 17 Nov 2002 16:06:46 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAI03umV034012 for ; Sun, 17 Nov 2002 16:03:56 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAI03uph034009 for perforce@freebsd.org; Sun, 17 Nov 2002 16:03:56 -0800 (PST) Date: Sun, 17 Nov 2002 16:03:56 -0800 (PST) Message-Id: <200211180003.gAI03uph034009@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21190 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21190 Change 21190 by marcel@marcel_nfs on 2002/11/17 16:03:41 When we get a pagefault in the syscall page, wire it in. Exclude the syscall/gateway page from the vmspace. Note that I assume for now that we have just a single page even though I created a range of 1MB. I think having a larger range for this helps, but only in the case we hardcode this stuff. Peter already mentioned that we could pass the information to the process. That's a detail I leave for later. Note that the actual syscall sequence (CALLSYS_NOERROR) has not been changed. It would immediately break things. To test the syscall page, do something like: \begin{verbatim} #include #include #include #include #include int main() { u_long lid; printf("syscall page at %lx\n", (long)USRSTACK); __asm __volatile("mov b6 = %1; br.call.sptk rp = b6;; mov %0 = r8" : "=r" (lid) : "r" USRSTACK); printf("LID=%lx\n", lid); return 0; } \end{verbatim} This test uses the stub and returns the CPU id of the current CPU by using a privileged instruction (to prove that the epc works). Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#46 edit .. //depot/projects/ia64/sys/ia64/ia64/trap.c#37 edit .. //depot/projects/ia64/sys/ia64/include/pmap.h#7 edit .. //depot/projects/ia64/sys/ia64/include/vmparam.h#6 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#46 (text+ko) ==== @@ -191,6 +191,9 @@ vm_offset_t vhpt_base, vhpt_size; +/* Syscall gateway page. */ +extern u_int64_t ia64_syscall_page[]; + /* * We use an object to own the kernel's 'page tables'. For simplicity, * we use one page directory to index a set of pages containing @@ -451,13 +454,6 @@ */ ia64_set_rr(IA64_RR_BASE(6), (6 << 8) | (28 << 2)); ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (28 << 2)); - - /* - * Set up proc0's PCB. - */ -#if 0 - thread0.td_pcb->pcb_hw.apcb_asn = 0; -#endif /* * Reserve some memory for allocating pvs while bootstrapping @@ -874,7 +870,7 @@ } /*************************************************** -* Pmap allocation/deallocation routines. + * Pmap allocation/deallocation routines. ***************************************************/ /* @@ -1782,6 +1778,19 @@ pmap_install(oldpmap); } +int +pmap_wire_syscall_page(pmap) + pmap_t pmap; +{ + struct ia64_lpte *pte; + + pte = pmap_find_pte(VM_MAX_ADDRESS); + pmap_set_pte(pte, VM_MAX_ADDRESS, + IA64_RR_MASK((u_int64_t)ia64_syscall_page), PTE_IG_MANAGED, + PTE_PL_KERN, PTE_AR_X_RX); + return (0); +} + /* * Make temporary mapping for a physical address. This is called * during dump. ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#37 (text+ko) ==== @@ -562,6 +562,10 @@ vm = (p != NULL) ? p->p_vmspace : NULL; if (vm == NULL) goto no_fault_in; + if (va == VM_MAX_ADDRESS) { + if (!pmap_wire_syscall_page(&vm->vm_pmap)) + goto out; + } map = &vm->vm_map; } ==== //depot/projects/ia64/sys/ia64/include/pmap.h#7 (text+ko) ==== @@ -137,6 +137,7 @@ void pmap_set_opt (unsigned *); void pmap_set_opt_bsp (void); struct pmap *pmap_install(struct pmap *pmap); +int pmap_wire_syscall_page(struct pmap *pmap); #endif /* _KERNEL */ ==== //depot/projects/ia64/sys/ia64/include/vmparam.h#6 (text+ko) ==== @@ -50,11 +50,10 @@ /* * USRTEXT is the start of the user text/data space, while USRSTACK * is the top (end) of the user stack. Immediately above the user stack - * resides the user structure, which is UPAGES long and contains the - * kernel stack. + * resides the syscall gateway page. */ #define USRTEXT CLBYTES -#define USRSTACK VM_MAXUSER_ADDRESS +#define USRSTACK VM_MAX_ADDRESS /* * Virtual memory related constants, all in bytes @@ -141,7 +140,7 @@ /* user/kernel map constants */ #define VM_MIN_ADDRESS 0 #define VM_MAXUSER_ADDRESS IA64_RR_BASE(5) -#define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS +#define VM_MAX_ADDRESS VM_MAXUSER_ADDRESS - (1024*1024) #define VM_MIN_KERNEL_ADDRESS IA64_RR_BASE(5) #define VM_MAX_KERNEL_ADDRESS (IA64_RR_BASE(6) - 1) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 16:47:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AB5537B404; Sun, 17 Nov 2002 16:47:38 -0800 (PST) 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 27FCB37B401 for ; Sun, 17 Nov 2002 16:47:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C6D1A43EB1 for ; Sun, 17 Nov 2002 16:47:37 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAI0immV036604 for ; Sun, 17 Nov 2002 16:44:48 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAI0il6h036601 for perforce@freebsd.org; Sun, 17 Nov 2002 16:44:47 -0800 (PST) Date: Sun, 17 Nov 2002 16:44:47 -0800 (PST) Message-Id: <200211180044.gAI0il6h036601@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21192 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21192 Change 21192 by jmallett@jmallett_dalek on 2002/11/17 16:44:07 Add beginnings of locore.s (simple startup code, based on SMR and NetBSD), and headers needed to use coprocessor register macros, and the "friendly" register names. Affected files ... .. //depot/projects/mips/sys/mips/include/asm.h#1 add .. //depot/projects/mips/sys/mips/include/cpuregs.h#1 add .. //depot/projects/mips/sys/mips/mips/locore.s#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 16:57:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FA2137B404; Sun, 17 Nov 2002 16:57:51 -0800 (PST) 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 0080837B401 for ; Sun, 17 Nov 2002 16:57:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B243F43EB1 for ; Sun, 17 Nov 2002 16:57:50 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAI0t0mV037248 for ; Sun, 17 Nov 2002 16:55:00 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAI0t0eP037241 for perforce@freebsd.org; Sun, 17 Nov 2002 16:55:00 -0800 (PST) Date: Sun, 17 Nov 2002 16:55:00 -0800 (PST) Message-Id: <200211180055.gAI0t0eP037241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21193 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21193 Change 21193 by jmallett@jmallett_dalek on 2002/11/17 16:54:04 Add a machdep.c to the MIPS MD code, for cpu_prid and fpu_id storage, and add a paltform_start which (right now) just calls arcbios_init, for SGIMIPS. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#2 edit .. //depot/projects/mips/sys/mips/mips/machdep.c#1 add .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#1 add Differences ... ==== //depot/projects/mips/sys/conf/files.mips#2 (text+ko) ==== @@ -10,6 +10,13 @@ # kern/subr_diskmbr.c standard +# This stanza is MIPS MD files. +mips/mips/machdep.c standard + +# This stanza is platform files, per platform. +mips/sgimips/machdep_sgimips.c standard + +# This stanza is device files. dev/arcbios/arcbios.c optional arcbios dev/arcbios/arcbios_tty.c optional arcbios To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 17: 0:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E73A237B404; Sun, 17 Nov 2002 17:00:55 -0800 (PST) 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 7D9C537B401 for ; Sun, 17 Nov 2002 17:00:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A0AC43E77 for ; Sun, 17 Nov 2002 17:00:55 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAI0w5mV037661 for ; Sun, 17 Nov 2002 16:58:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAI0w5K3037658 for perforce@freebsd.org; Sun, 17 Nov 2002 16:58:05 -0800 (PST) Date: Sun, 17 Nov 2002 16:58:05 -0800 (PST) Message-Id: <200211180058.gAI0w5K3037658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21194 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21194 Change 21194 by jmallett@jmallett_dalek on 2002/11/17 16:57:34 Consistently use SGIMIPS instead of 'SGI' for the option name, and correct bogon wrt machdep_platform.c being standard, in the previous submit. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#3 edit .. //depot/projects/mips/sys/conf/options.mips#3 edit .. //depot/projects/mips/sys/mips/conf/GENERIC#4 edit Differences ... ==== //depot/projects/mips/sys/conf/files.mips#3 (text+ko) ==== @@ -14,7 +14,7 @@ mips/mips/machdep.c standard # This stanza is platform files, per platform. -mips/sgimips/machdep_sgimips.c standard +mips/sgimips/machdep_sgimips.c optional SGIMIPS # This stanza is device files. dev/arcbios/arcbios.c optional arcbios ==== //depot/projects/mips/sys/conf/options.mips#3 (text+ko) ==== @@ -3,6 +3,6 @@ R4400 opt_global.h -SGI opt_platform.h +SGIMIPS opt_platform.h _BYTE_ORDER opt_endian.h ==== //depot/projects/mips/sys/mips/conf/GENERIC#4 (text+ko) ==== @@ -12,7 +12,7 @@ # Platform support platform sgimips #SGI MIPS guts -options SGI #SGI MIPS hardware +options SGIMIPS #SGI MIPS hardware # Hardware support device arcbios #ARCBIOS To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 17:24:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE4FC37B404; Sun, 17 Nov 2002 17:24:24 -0800 (PST) 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 5501937B401 for ; Sun, 17 Nov 2002 17:24:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13B1943E3B for ; Sun, 17 Nov 2002 17:24:24 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAI1LYmV038994 for ; Sun, 17 Nov 2002 17:21:34 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAI1LXtj038991 for perforce@freebsd.org; Sun, 17 Nov 2002 17:21:33 -0800 (PST) Date: Sun, 17 Nov 2002 17:21:33 -0800 (PST) Message-Id: <200211180121.gAI1LXtj038991@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21195 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21195 Change 21195 by marcel@marcel_nfs on 2002/11/17 17:21:22 Go off on a tangent: group registers in structures based on the runtime specification. This allows us to more conveniently work with sets of registers, where work is defined as saving, restoring and copying and can be used as the building blocks for trapframes, sigframes, mcontexts, regs, fpregs, pcbs and any of the zillion I forget. Hopefully this helps reduce the PITA of continuously writing and rewriting those tedious save/restore sequences... Note that switching to this will definitely be an ABI breaker. This file is unused for now. Once the dark side clouds less and the force is with us, we will use it. Right, Yoda? Affected files ... .. //depot/projects/ia64/sys/ia64/include/_regset.h#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 17:30:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0ED2E37B404; Sun, 17 Nov 2002 17:30:33 -0800 (PST) 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 9D04B37B401 for ; Sun, 17 Nov 2002 17:30:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46D5243E4A for ; Sun, 17 Nov 2002 17:30:32 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAI1RgmV039345 for ; Sun, 17 Nov 2002 17:27:42 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAI1RflQ039339 for perforce@freebsd.org; Sun, 17 Nov 2002 17:27:41 -0800 (PST) Date: Sun, 17 Nov 2002 17:27:41 -0800 (PST) Message-Id: <200211180127.gAI1RflQ039339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21196 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21196 Change 21196 by jmallett@jmallett_dalek on 2002/11/17 17:27:19 Ugh. Use lowercase of option name. What a brain-o. Affected files ... .. //depot/projects/mips/sys/conf/files.mips#4 edit Differences ... ==== //depot/projects/mips/sys/conf/files.mips#4 (text+ko) ==== @@ -14,7 +14,7 @@ mips/mips/machdep.c standard # This stanza is platform files, per platform. -mips/sgimips/machdep_sgimips.c optional SGIMIPS +mips/sgimips/machdep_sgimips.c optional sgimips # This stanza is device files. dev/arcbios/arcbios.c optional arcbios To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 17:46:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D54B37B404; Sun, 17 Nov 2002 17:45:56 -0800 (PST) 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 4874737B401 for ; Sun, 17 Nov 2002 17:45:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 13C1043E77 for ; Sun, 17 Nov 2002 17:45:55 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAI1h5mV040416 for ; Sun, 17 Nov 2002 17:43:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAI1h20V040406 for perforce@freebsd.org; Sun, 17 Nov 2002 17:43:02 -0800 (PST) Date: Sun, 17 Nov 2002 17:43:02 -0800 (PST) Message-Id: <200211180143.gAI1h20V040406@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21198 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21198 Change 21198 by jmallett@jmallett_dalek on 2002/11/17 17:42:43 IFC. Affected files ... .. //depot/projects/mips/Makefile.inc1#4 integrate .. //depot/projects/mips/bin/sleep/sleep.c#2 integrate .. //depot/projects/mips/contrib/bind/CHANGES#2 integrate .. //depot/projects/mips/contrib/bind/bin/named/db_defs.h#2 integrate .. //depot/projects/mips/contrib/bind/bin/named/db_sec.c#2 integrate .. //depot/projects/mips/contrib/bind/bin/named/ns_defs.h#2 integrate .. //depot/projects/mips/contrib/bind/bin/named/ns_ncache.c#2 integrate .. //depot/projects/mips/contrib/bind/bin/named/ns_req.c#2 integrate .. //depot/projects/mips/contrib/bind/bin/named/ns_resp.c#2 integrate .. //depot/projects/mips/contrib/bind/lib/nameser/ns_name.c#2 integrate .. //depot/projects/mips/contrib/bind/lib/nameser/ns_samedomain.c#2 integrate .. //depot/projects/mips/etc/defaults/rc.conf#5 integrate .. //depot/projects/mips/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/mips/etc/periodic/security/700.kernelmsg#3 integrate .. //depot/projects/mips/etc/periodic/security/security.functions#2 integrate .. //depot/projects/mips/games/fortune/datfiles/freebsd-tips#4 integrate .. //depot/projects/mips/games/fortune/datfiles/startrek#2 integrate .. //depot/projects/mips/gnu/usr.bin/binutils/libiberty/Makefile#3 integrate .. //depot/projects/mips/gnu/usr.bin/cc/cc_tools/auto-host.h#3 integrate .. //depot/projects/mips/include/uuid.h#1 branch .. //depot/projects/mips/kerberos5/lib/libasn1/Makefile#2 integrate .. //depot/projects/mips/kerberos5/lib/libhdb/Makefile#2 integrate .. //depot/projects/mips/kerberos5/usr.bin/krb5-config/Makefile#2 integrate .. //depot/projects/mips/lib/libc/alpha/gen/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/alpha/gen/makecontext.c#2 integrate .. //depot/projects/mips/lib/libc/gen/_pthread_stubs.c#3 integrate .. //depot/projects/mips/lib/libc/gen/sysconf.c#3 integrate .. //depot/projects/mips/lib/libc/gen/syslog.c#2 integrate .. //depot/projects/mips/lib/libc/i386/gen/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/ia64/gen/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/ia64/gen/_setjmp.S#3 integrate .. //depot/projects/mips/lib/libc/include/libc_private.h#2 integrate .. //depot/projects/mips/lib/libc/include/namespace.h#3 integrate .. //depot/projects/mips/lib/libc/include/un-namespace.h#2 integrate .. //depot/projects/mips/lib/libc/stdio/findfp.c#6 integrate .. //depot/projects/mips/lib/libc/stdlib/strtod.c#2 integrate .. //depot/projects/mips/lib/libc/sys/select.2#2 integrate .. //depot/projects/mips/lib/libc_r/arch/ia64/_atomic_lock.S#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/pthread_private.h#3 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_attr_init.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_autoinit.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_cond.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_condattr_init.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_create.c#3 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_execve.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_exit.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_gc.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_init.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_join.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_mattr_init.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_mutex.c#3 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_mutex_prioceiling.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_once.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_pselect.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_rwlock.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_sem.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_sig.c#2 integrate .. //depot/projects/mips/lib/libc_r/uthread/uthread_stack.c#2 integrate .. //depot/projects/mips/lib/libdisk/change.c#4 integrate .. //depot/projects/mips/lib/libdisk/chunk.c#4 integrate .. //depot/projects/mips/lib/libdisk/create_chunk.c#6 integrate .. //depot/projects/mips/lib/libdisk/disk.c#9 integrate .. //depot/projects/mips/lib/libdisk/libdisk.h#6 integrate .. //depot/projects/mips/lib/libdisk/rules.c#5 integrate .. //depot/projects/mips/lib/libdisk/tst01.c#5 integrate .. //depot/projects/mips/lib/libdisk/write_alpha_disk.c#4 integrate .. //depot/projects/mips/lib/libdisk/write_disk.c#3 integrate .. //depot/projects/mips/lib/libdisk/write_i386_disk.c#3 integrate .. //depot/projects/mips/lib/libdisk/write_ia64_disk.c#3 integrate .. //depot/projects/mips/lib/libdisk/write_pc98_disk.c#4 integrate .. //depot/projects/mips/lib/libdisk/write_sparc64_disk.c#3 integrate .. //depot/projects/mips/lib/libncurses/Makefile#2 integrate .. //depot/projects/mips/lib/libpam/modules/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/mips/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate .. //depot/projects/mips/lib/libutil/logout.c#2 integrate .. //depot/projects/mips/lib/libutil/logwtmp.c#2 integrate .. //depot/projects/mips/libexec/ftpd/logwtmp.c#2 integrate .. //depot/projects/mips/release/Makefile#8 integrate .. //depot/projects/mips/release/alpha/drivers.conf#7 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/early-adopter/article.sgml#3 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#4 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml#3 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/mips/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.sgml#2 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml#2 integrate .. //depot/projects/mips/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/Makefile#2 integrate .. //depot/projects/mips/release/doc/ja_JP.eucJP/early-adopter/Makefile#1 branch .. //depot/projects/mips/release/doc/ja_JP.eucJP/early-adopter/article.sgml#1 branch .. //depot/projects/mips/release/doc/share/examples/Makefile.relnotesng#4 integrate .. //depot/projects/mips/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/mips/release/picobsd/mfs_tree/etc/rc#2 integrate .. //depot/projects/mips/release/scripts/print-cdrom-packages.sh#3 integrate .. //depot/projects/mips/sbin/devd/Makefile#2 integrate .. //depot/projects/mips/sbin/devd/devd.8#2 integrate .. //depot/projects/mips/sbin/dumpfs/dumpfs.c#4 integrate .. //depot/projects/mips/sbin/ifconfig/ifconfig.8#4 integrate .. //depot/projects/mips/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/mips/sbin/newfs/mkfs.c#3 integrate .. //depot/projects/mips/share/man/man4/vlan.4#2 integrate .. //depot/projects/mips/share/man/man7/release.7#3 integrate .. //depot/projects/mips/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/mips/sys/alpha/alpha/machdep.c#6 integrate .. //depot/projects/mips/sys/alpha/alpha/pmap.c#5 integrate .. //depot/projects/mips/sys/alpha/conf/GENERIC.hints#3 integrate .. //depot/projects/mips/sys/alpha/include/cpu.h#3 integrate .. //depot/projects/mips/sys/alpha/include/fpu.h#2 integrate .. //depot/projects/mips/sys/alpha/include/signal.h#4 integrate .. //depot/projects/mips/sys/alpha/include/ucontext.h#3 integrate .. //depot/projects/mips/sys/boot/common/help.common#2 integrate .. //depot/projects/mips/sys/boot/common/loader.8#2 integrate .. //depot/projects/mips/sys/cam/cam_periph.c#2 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/mips/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/mips/sys/conf/files#10 integrate .. //depot/projects/mips/sys/conf/options#6 integrate .. //depot/projects/mips/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/mips/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/mips/sys/dev/an/if_an.c#3 integrate .. //depot/projects/mips/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/mips/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/mips/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/mips/sys/dev/ar/if_ar.c#2 integrate .. //depot/projects/mips/sys/dev/awi/awi.c#3 integrate .. //depot/projects/mips/sys/dev/awi/if_awi_pccard.c#2 integrate .. //depot/projects/mips/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/mips/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/mips/sys/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/mips/sys/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/mips/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/mips/sys/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/mips/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/mips/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/mips/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/mips/sys/dev/em/if_em.c#3 integrate .. //depot/projects/mips/sys/dev/em/if_em.h#3 integrate .. //depot/projects/mips/sys/dev/en/midway.c#2 integrate .. //depot/projects/mips/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/mips/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/mips/sys/dev/ex/if_ex.c#2 integrate .. //depot/projects/mips/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/mips/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/mips/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/mips/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/mips/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/mips/sys/dev/gx/if_gx.c#2 integrate .. //depot/projects/mips/sys/dev/gx/if_gxvar.h#3 integrate .. //depot/projects/mips/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/mips/sys/dev/ie/if_ie.c#2 integrate .. //depot/projects/mips/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/mips/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/mips/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/mips/sys/dev/lnc/if_lnc.c#2 integrate .. //depot/projects/mips/sys/dev/lnc/if_lnc_cbus.c#2 integrate .. //depot/projects/mips/sys/dev/lnc/if_lnc_isa.c#2 integrate .. //depot/projects/mips/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/mips/sys/dev/mly/mly.c#3 integrate .. //depot/projects/mips/sys/dev/my/if_my.c#4 integrate .. //depot/projects/mips/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/mips/sys/dev/nge/if_ngereg.h#3 integrate .. //depot/projects/mips/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/mips/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/mips/sys/dev/pccard/pccarddevs#3 integrate .. //depot/projects/mips/sys/dev/pccard/pccarddevs.h#3 integrate .. //depot/projects/mips/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/mips/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/mips/sys/dev/pci/pci.c#3 integrate .. //depot/projects/mips/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/mips/sys/dev/pcic/i82365.c#2 integrate .. //depot/projects/mips/sys/dev/pdq/pdq_ifsubr.c#2 integrate .. //depot/projects/mips/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/mips/sys/dev/ray/if_ray.c#2 integrate .. //depot/projects/mips/sys/dev/sab/sab.c#2 integrate .. //depot/projects/mips/sys/dev/sbni/if_sbni.c#2 integrate .. //depot/projects/mips/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/mips/sys/dev/snc/dp83932.c#2 integrate .. //depot/projects/mips/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/mips/sys/dev/trm/trm.c#2 integrate .. //depot/projects/mips/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/mips/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/mips/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/mips/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/mips/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/mips/sys/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/mips/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/mips/sys/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/mips/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/mips/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/mips/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/mips/sys/dev/usb/usb_ethersubr.c#2 integrate .. //depot/projects/mips/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/mips/sys/dev/vx/if_vx.c#2 integrate .. //depot/projects/mips/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/mips/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/mips/sys/dev/xe/if_xe.c#2 integrate .. //depot/projects/mips/sys/dev/xe/if_xe_pccard.c#2 integrate .. //depot/projects/mips/sys/geom/geom_pc98.c#4 integrate .. //depot/projects/mips/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/mips/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/mips/sys/i386/i386/mp_clock.c#2 integrate .. //depot/projects/mips/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/mips/sys/i386/include/signal.h#4 integrate .. //depot/projects/mips/sys/i386/include/ucontext.h#3 integrate .. //depot/projects/mips/sys/i386/isa/if_cx.c#2 integrate .. //depot/projects/mips/sys/i386/isa/if_el.c#2 integrate .. //depot/projects/mips/sys/i386/isa/if_le.c#3 integrate .. //depot/projects/mips/sys/i386/isa/if_rdp.c#4 integrate .. //depot/projects/mips/sys/i386/isa/npx.c#4 integrate .. //depot/projects/mips/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/mips/sys/i386/pci/pci_cfgreg.c#4 integrate .. //depot/projects/mips/sys/i4b/driver/i4b_ipr.c#3 integrate .. //depot/projects/mips/sys/i4b/driver/i4b_isppp.c#3 integrate .. //depot/projects/mips/sys/ia64/ia32/ia32_proto.h#3 integrate .. //depot/projects/mips/sys/ia64/ia32/ia32_syscall.h#3 integrate .. //depot/projects/mips/sys/ia64/ia32/ia32_sysent.c#3 integrate .. //depot/projects/mips/sys/ia64/ia32/syscalls.master#5 integrate .. //depot/projects/mips/sys/ia64/ia64/clock.c#2 integrate .. //depot/projects/mips/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/mips/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/mips/sys/ia64/include/_types.h#2 integrate .. //depot/projects/mips/sys/kern/init_sysent.c#6 integrate .. //depot/projects/mips/sys/kern/kern_context.c#1 branch .. //depot/projects/mips/sys/kern/kern_exec.c#5 integrate .. //depot/projects/mips/sys/kern/kern_mac.c#9 integrate .. //depot/projects/mips/sys/kern/kern_thread.c#5 integrate .. //depot/projects/mips/sys/kern/subr_log.c#3 integrate .. //depot/projects/mips/sys/kern/subr_prf.c#4 integrate .. //depot/projects/mips/sys/kern/syscalls.c#6 integrate .. //depot/projects/mips/sys/kern/syscalls.master#7 integrate .. //depot/projects/mips/sys/kern/vfs_aio.c#5 integrate .. //depot/projects/mips/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/mips/sys/modules/agp/Makefile#2 integrate .. //depot/projects/mips/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/mips/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/mips/sys/net/bpf.c#3 integrate .. //depot/projects/mips/sys/net/bpf.h#2 integrate .. //depot/projects/mips/sys/net/bpfdesc.h#2 integrate .. //depot/projects/mips/sys/net/bridge.c#4 integrate .. //depot/projects/mips/sys/net/bridge.h#2 integrate .. //depot/projects/mips/sys/net/ethernet.h#2 integrate .. //depot/projects/mips/sys/net/fddi.h#2 integrate .. //depot/projects/mips/sys/net/if.c#2 integrate .. //depot/projects/mips/sys/net/if.h#2 integrate .. //depot/projects/mips/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/mips/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/mips/sys/net/if_disc.c#2 integrate .. //depot/projects/mips/sys/net/if_ef.c#2 integrate .. //depot/projects/mips/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/mips/sys/net/if_faith.c#2 integrate .. //depot/projects/mips/sys/net/if_fddisubr.c#3 integrate .. //depot/projects/mips/sys/net/if_gif.c#3 integrate .. //depot/projects/mips/sys/net/if_gre.c#3 integrate .. //depot/projects/mips/sys/net/if_loop.c#3 integrate .. //depot/projects/mips/sys/net/if_ppp.c#2 integrate .. //depot/projects/mips/sys/net/if_sl.c#4 integrate .. //depot/projects/mips/sys/net/if_stf.c#4 integrate .. //depot/projects/mips/sys/net/if_tap.c#3 integrate .. //depot/projects/mips/sys/net/if_tun.c#3 integrate .. //depot/projects/mips/sys/net/if_var.h#2 integrate .. //depot/projects/mips/sys/net/if_vlan.c#4 integrate .. //depot/projects/mips/sys/net/if_vlan_var.h#2 integrate .. //depot/projects/mips/sys/net/raw_cb.c#2 integrate .. //depot/projects/mips/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/mips/sys/net/route.c#2 integrate .. //depot/projects/mips/sys/netgraph/ng_eiface.c#2 integrate .. //depot/projects/mips/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/mips/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/mips/sys/netinet/igmp.c#3 integrate .. //depot/projects/mips/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/mips/sys/netinet/ip_gre.c#3 integrate .. //depot/projects/mips/sys/netinet/ip_input.c#5 integrate .. //depot/projects/mips/sys/netinet/ip_mroute.c#5 integrate .. //depot/projects/mips/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/mips/sys/netinet/ip_output.c#5 integrate .. //depot/projects/mips/sys/netinet/ip_var.h#4 integrate .. //depot/projects/mips/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/mips/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/mips/sys/pc98/i386/machdep.c#6 integrate .. //depot/projects/mips/sys/pc98/pc98/fd.c#3 integrate .. //depot/projects/mips/sys/pci/agp.c#2 integrate .. //depot/projects/mips/sys/pci/agp_ali.c#2 integrate .. //depot/projects/mips/sys/pci/agp_amd.c#3 integrate .. //depot/projects/mips/sys/pci/agp_i810.c#2 integrate .. //depot/projects/mips/sys/pci/agp_intel.c#2 integrate .. //depot/projects/mips/sys/pci/agp_sis.c#2 integrate .. //depot/projects/mips/sys/pci/agp_via.c#2 integrate .. //depot/projects/mips/sys/pci/if_dc.c#4 integrate .. //depot/projects/mips/sys/pci/if_de.c#2 integrate .. //depot/projects/mips/sys/pci/if_pcn.c#2 integrate .. //depot/projects/mips/sys/pci/if_rl.c#4 integrate .. //depot/projects/mips/sys/pci/if_sf.c#3 integrate .. //depot/projects/mips/sys/pci/if_sis.c#3 integrate .. //depot/projects/mips/sys/pci/if_sk.c#2 integrate .. //depot/projects/mips/sys/pci/if_ste.c#3 integrate .. //depot/projects/mips/sys/pci/if_ti.c#4 integrate .. //depot/projects/mips/sys/pci/if_tl.c#3 integrate .. //depot/projects/mips/sys/pci/if_vr.c#3 integrate .. //depot/projects/mips/sys/pci/if_wb.c#3 integrate .. //depot/projects/mips/sys/pci/if_xl.c#4 integrate .. //depot/projects/mips/sys/posix4/ksched.c#4 integrate .. //depot/projects/mips/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/mips/sys/posix4/posix4.h#2 integrate .. //depot/projects/mips/sys/posix4/posix4_mib.c#3 integrate .. //depot/projects/mips/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/mips/sys/powerpc/powerpc/pmap.c#2 integrate .. //depot/projects/mips/sys/sparc64/include/pmap.h#3 integrate .. //depot/projects/mips/sys/sparc64/pci/psycho.c#4 integrate .. //depot/projects/mips/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/mips/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/mips/sys/sys/msgbuf.h#2 integrate .. //depot/projects/mips/sys/sys/select.h#3 integrate .. //depot/projects/mips/sys/sys/socket.h#3 integrate .. //depot/projects/mips/sys/sys/stddef.h#1 branch .. //depot/projects/mips/sys/sys/syscall.h#6 integrate .. //depot/projects/mips/sys/sys/syscall.mk#6 integrate .. //depot/projects/mips/sys/sys/sysproto.h#6 integrate .. //depot/projects/mips/sys/sys/ucontext.h#3 integrate .. //depot/projects/mips/sys/ufs/ffs/ffs_snapshot.c#5 integrate .. //depot/projects/mips/sys/vm/pmap.h#3 integrate .. //depot/projects/mips/sys/vm/uma_core.c#5 integrate .. //depot/projects/mips/sys/vm/vm_fault.c#4 integrate .. //depot/projects/mips/sys/vm/vm_object.c#6 integrate .. //depot/projects/mips/sys/vm/vm_object.h#3 integrate .. //depot/projects/mips/sys/vm/vm_page.c#8 integrate .. //depot/projects/mips/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/mips/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/mips/usr.bin/fetch/fetch.c#4 integrate .. //depot/projects/mips/usr.bin/makewhatis/makewhatis.local.8#1 branch .. //depot/projects/mips/usr.bin/makewhatis/makewhatis.local.sh#1 branch .. //depot/projects/mips/usr.bin/who/who.c#2 integrate .. //depot/projects/mips/usr.bin/xargs/Makefile#2 integrate .. //depot/projects/mips/usr.bin/xargs/xargs.c#2 integrate .. //depot/projects/mips/usr.bin/xinstall/Makefile#2 integrate .. //depot/projects/mips/usr.bin/xinstall/xinstall.c#3 integrate .. //depot/projects/mips/usr.sbin/crunch/crunchide/exec_elf32.c#2 integrate .. //depot/projects/mips/usr.sbin/mtree/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/newsyslog/newsyslog.8#2 integrate .. //depot/projects/mips/usr.sbin/newsyslog/newsyslog.c#3 integrate .. //depot/projects/mips/usr.sbin/ntp/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/ntp/Makefile.inc#2 integrate .. //depot/projects/mips/usr.sbin/pkg_install/lib/file.c#3 integrate .. //depot/projects/mips/usr.sbin/ppp/physical.c#2 integrate .. //depot/projects/mips/usr.sbin/pppd/auth.c#2 integrate .. //depot/projects/mips/usr.sbin/sysinstall/config.c#2 integrate .. //depot/projects/mips/usr.sbin/sysinstall/devices.c#3 integrate .. //depot/projects/mips/usr.sbin/sysinstall/disks.c#7 integrate .. //depot/projects/mips/usr.sbin/sysinstall/install.c#4 integrate .. //depot/projects/mips/usr.sbin/sysinstall/label.c#5 integrate Differences ... ==== //depot/projects/mips/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.310 2002/11/03 23:48:14 scottl Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.312 2002/11/14 19:24:50 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -123,6 +123,7 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +OSRELDATE!= sysctl -n kern.osreldate TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -193,7 +194,8 @@ BMAKEENV= MAKEOBJDIRPREFIX=${WORLDTMP} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ +BMAKE= ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + BOOTSTRAPPING=${OSRELDATE} \ -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ -DNO_CPU_CFLAGS -DNO_WERROR @@ -201,8 +203,8 @@ TMAKEENV= MAKEOBJDIRPREFIX=${OBJTREE} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 -DBOOTSTRAPPING \ - -DNO_CPU_CFLAGS +TMAKE= ${TMAKEENV} ${MAKE} -f Makefile.inc1 \ + BOOTSTRAPPING=${OSRELDATE} -DNO_CPU_CFLAGS # cross-tool stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB @@ -727,7 +729,8 @@ .endif _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ - lib/libncurses lib/libopie lib/libradius lib/librpcsvc \ + lib/libncurses lib/libopie lib/libpam lib/libradius \ + lib/librpcsvc \ lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ lib/libz lib/msun @@ -753,7 +756,7 @@ _generic_libs+= usr.sbin/pcvt/keycap .endif -.for _lib in ${_startup_libs} ${_prebuild_libs} ${_generic_libs} +.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) ${ECHODIR} "===> ${_lib}"; \ @@ -764,6 +767,16 @@ .endif .endfor +# libpam is special: we need to build static PAM modules before +# static PAM library, and dynamic PAM library before dynamic PAM +# modules. +lib/libpam__L: .PHONY + ${ECHODIR} "===> lib/libpam"; \ + cd ${.CURDIR}/lib/libpam; \ + ${MAKE} DIRPRFX=lib/libpam/ depend; \ + ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \ + ${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install + _startup_libs: ${_startup_libs:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} ==== //depot/projects/mips/bin/sleep/sleep.c#2 (text+ko) ==== @@ -43,14 +43,14 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.12 2002/06/30 05:15:04 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/sleep/sleep.c,v 1.15 2002/11/14 01:14:35 njl Exp $"); #include #include -#include #include #include #include +#include void usage(void); @@ -59,25 +59,15 @@ { struct timespec time_to_sleep; long l; - int ch, neg; + int neg; char *p; - while ((ch = getopt(argc, argv, "")) != -1) - switch(ch) { - case '?': - default: - usage(); - /* NOTREACHED */ - } - argc -= optind; - argv += optind; - - if (argc != 1) { + if (argc != 2) { usage(); /* NOTREACHED */ } - p = argv[0]; + p = argv[1]; /* Skip over leading whitespaces. */ while (isspace((unsigned char)*p)) @@ -88,6 +78,9 @@ if (*p == '-') { neg = 1; ++p; + if (!isdigit((unsigned char)*p) && *p != '.') + usage(); + /* NOTREACHED */ } else if (*p == '+') ++p; @@ -128,7 +121,8 @@ void usage(void) { + const char *msg = "usage: sleep seconds\n"; - (void)fprintf(stderr, "usage: sleep seconds\n"); + write(STDERR_FILENO, msg, strlen(msg)); exit(1); } ==== //depot/projects/mips/contrib/bind/CHANGES#2 (text+ko) ==== @@ -1,3 +1,23 @@ +1469. [bug] buffer length calculation for PX was wrong. + +1468. [bug] ns_name_ntol() could overwite a zero length buffer. + +1467. [bug] off by one bug in ns_makecannon(). + +1466. [bug] large ENDS UDP buffer size could trigger a assertion. + +1465. [bug] possible NULL pointer dereference in db_sec.c + +1464. [bug] the buffer used to construct the -ve record was not + big enough for all possible SOA records. use pointer + arithmetic to calculate the remaining size in this + buffer. + +1463. [bug] use serial space arithmetic to determine if a SIG is + too old, in the future or has internally constistant + times. + +1462. [bug] write buffer overflow in make_rr(). --- 8.3.3-REL released --- (Wed Jun 26 21:15:43 PDT 2002) ==== //depot/projects/mips/contrib/bind/bin/named/db_defs.h#2 (text+ko) ==== @@ -78,7 +78,7 @@ */ /* max length of data in RR data field */ -#define MAXDATA (2*MAXDNAME + 5*INT32SZ) +#define MAXDATA (3*MAXDNAME + 5*INT32SZ) /* max length of data in a TXT RR segment */ #define MAXCHARSTRING 255 ==== //depot/projects/mips/contrib/bind/bin/named/db_sec.c#2 (text+ko) ==== @@ -479,7 +479,9 @@ struct sig_record *sigdata; struct dnode *sigdn; struct databuf *sigdp; - time_t now; + u_int32_t now; + u_int32_t exptime; + u_int32_t signtime; char *signer; u_char name_n[MAXDNAME]; u_char *sig, *eom; @@ -492,6 +494,7 @@ int dnssec_failed = 0, dnssec_succeeded = 0; int return_value; int i; + int expired = 0; if (rrset == NULL || rrset->rr_name == NULL) { ns_warning (ns_log_default, "verify_set: missing rrset/name"); @@ -527,11 +530,14 @@ * Don't verify a set if the SIG inception time is in * the future. This should be fixed before 2038 (BEW) */ - if ((time_t)ntohl(sigdata->sig_time_n) > now) + signtime = ntohl(sigdata->sig_time_n); + if (SEQ_GT(signtime, now)) continue; /* An expired set is dropped, but the data is not. */ - if ((time_t)ntohl(sigdata->sig_exp_n) < now) { + exptime = ntohl(sigdata->sig_exp_n); + if (SEQ_GT(now, exptime)) { + expired++; db_detach(&sigdn->dp); sigdp = NULL; continue; @@ -723,7 +729,7 @@ } end: - if (dnssec_failed > 0) + if (dnssec_failed > 0 || expired > 0) rrset_trim_sigs(rrset); if (trustedkey == 0 && key != NULL) dst_free_key(key); ==== //depot/projects/mips/contrib/bind/bin/named/ns_defs.h#2 (text+ko) ==== @@ -469,7 +469,7 @@ q_cmsglen, /* len of cname message */ q_cmsgsize; /* allocated size of cname message */ int16_t q_dfd; /* UDP file descriptor */ - int16_t q_udpsize; /* UDP message size */ + u_int16_t q_udpsize; /* UDP message size */ int q_distance; /* distance this query is from the * original query that the server * received. */ ==== //depot/projects/mips/contrib/bind/bin/named/ns_ncache.c#2 (text+ko) ==== @@ -66,7 +66,7 @@ u_int16_t atype; u_char *sp, *cp1; u_char data[MAXDATA]; - size_t len = sizeof data; + u_char *eod = data + sizeof(data); #endif nameserIncr(from.sin_addr, nssRcvdNXD); @@ -186,7 +186,7 @@ rdatap = cp; /* origin */ - n = dn_expand(msg, msg + msglen, cp, (char*)data, len); + n = dn_expand(msg, msg + msglen, cp, (char*)data, eod - data); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: origin form error"); @@ -195,9 +195,8 @@ cp += n; n = strlen((char*)data) + 1; cp1 = data + n; - len -= n; /* mail */ - n = dn_expand(msg, msg + msglen, cp, (char*)cp1, len); + n = dn_expand(msg, msg + msglen, cp, (char*)cp1, eod - cp1); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: mail form error"); return; @@ -205,20 +204,20 @@ cp += n; n = strlen((char*)cp1) + 1; cp1 += n; - len -= n; n = 5 * INT32SZ; + if (n > (eod - cp1)) /* Can't happen. See MAXDATA. */ + return; BOUNDS_CHECK(cp, n); memcpy(cp1, cp, n); /* serial, refresh, retry, expire, min */ cp1 += n; - len -= n; cp += n; if (cp != rdatap + dlen) { ns_debug(ns_log_ncache, 3, "ncache: form error"); return; } /* store the zone of the soa record */ - n = dn_expand(msg, msg + msglen, sp, (char*)cp1, len); + n = dn_expand(msg, msg + msglen, sp, (char*)cp1, eod - cp1); if (n < 0) { ns_debug(ns_log_ncache, 3, "ncache: form error 2"); return; ==== //depot/projects/mips/contrib/bind/bin/named/ns_req.c#2 (text+ko) ==== @@ -2195,7 +2195,7 @@ /* first just copy over the type_covered, algorithm, */ /* labels, orig ttl, two timestamps, and the footprint */ - if ((dp->d_size - 18) > buflen) + if (buflen < 18) goto cleanup; /* out of room! */ memcpy(cp, cp1, 18); cp += 18; ==== //depot/projects/mips/contrib/bind/bin/named/ns_resp.c#2 (text+ko) ==== @@ -2001,7 +2001,7 @@ * to BOUNDS_CHECK() here. */ cp1 += (n = strlen((char *)cp1) + 1); - n1 = sizeof(data) - n; + n1 = sizeof(data) - n - INT16SZ; n = dn_expand(msg, eom, cp, (char *)cp1, n1); if (n < 0) { hp->rcode = FORMERR; @@ -2043,8 +2043,18 @@ ttl = origTTL; } + /* + * Check that expire and signature times are internally + * consistant. + */ + if (!SEQ_GT(exptime, signtime) && exptime != signtime) { + ns_debug(ns_log_default, 3, + "ignoring SIG: signature expires before it was signed"); + return ((cp - rrp) + dlen); + } + /* Don't let bogus signers "sign" in the future. */ - if (signtime > now) { + if (SEQ_GT(signtime, now)) { ns_debug(ns_log_default, 3, "ignoring SIG: signature date %s is in the future", p_secstodate (signtime)); @@ -2052,7 +2062,7 @@ } /* Ignore received SIG RR's that are already expired. */ - if (exptime <= now) { + if (SEQ_GT(now, exptime)) { ns_debug(ns_log_default, 3, "ignoring SIG: expiration %s is in the past", p_secstodate (exptime)); ==== //depot/projects/mips/contrib/bind/lib/nameser/ns_name.c#2 (text+ko) ==== @@ -341,6 +341,10 @@ dn = dst; eom = dst + dstsiz; + if (dn >= eom) { + errno = EMSGSIZE; + return (-1); + } while ((n = *cp++) != 0) { if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) { /* Some kind of compression pointer. */ ==== //depot/projects/mips/contrib/bind/lib/nameser/ns_samedomain.c#2 (text+ko) ==== @@ -166,7 +166,7 @@ ns_makecanon(const char *src, char *dst, size_t dstsize) { size_t n = strlen(src); - if (n + sizeof "." > dstsize) { + if (n + sizeof "." + 1 > dstsize) { errno = EMSGSIZE; return (-1); } ==== //depot/projects/mips/etc/defaults/rc.conf#5 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.162 2002/11/12 07:10:45 imp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.163 2002/11/15 08:26:36 ru Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -26,7 +26,7 @@ apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). -devd_enable="NO" # Run devd, to trigger progams on device tree changes. +devd_enable="NO" # Run devd, to trigger programs on device tree changes. pccard_enable="NO" # Set to YES if you want to configure PCCARD devices. pccard_mem="DEFAULT" # If pccard_enable=YES, this is card memory address. pccard_beep="2" # pccard beep type. @@ -335,7 +335,7 @@ moused_type="auto" # See man page for rc.conf(5) for available settings. moused_port="/dev/psm0" # Set to your mouse port. moused_flags="" # Any additional flags to moused. -mousechar_start="NO" # if 0xd0-0xd3 default range is occuped in your +mousechar_start="NO" # if 0xd0-0xd3 default range is occupied in your # language code table, specify alternative range # start like mousechar_start=3, see vidcontrol(1) allscreens_flags="" # Set this vidcontrol mode for all virtual screens ==== //depot/projects/mips/etc/mtree/BSD.usr.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.268 2002/10/25 22:00:34 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.269 2002/11/15 18:44:09 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -96,8 +96,6 @@ .. 13.rcs .. - 14.sccs - .. 15.yacc .. 16.lex ==== //depot/projects/mips/etc/periodic/security/700.kernelmsg#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.6 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.7 2002/11/16 14:57:12 thomas Exp $ # # Show kernel log messages @@ -44,7 +44,7 @@ case "$daily_status_security_kernelmsg_enable" in [Yy][Ee][Ss]) - dmesg 2>/dev/null > ${TMP} | + dmesg 2>/dev/null | check_diff new_only dmesg - "${host} kernel log messages:" rc=$?;; *) rc=0;; ==== //depot/projects/mips/etc/periodic/security/security.functions#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/security.functions,v 1.1 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/security.functions,v 1.2 2002/11/16 14:58:39 thomas Exp $ # # @@ -63,7 +63,7 @@ cp ${tmpf} ${LOG}/${label}.today || rc=3 fi - if ! cmp ${LOG}/${label}.today ${tmpf} >/dev/null; then + if ! cmp -s ${LOG}/${label}.today ${tmpf} >/dev/null; then [ $rc -lt 1 ] && rc=1 echo "" echo "${msg}" ==== //depot/projects/mips/games/fortune/datfiles/freebsd-tips#4 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.28 2002/10/20 13:41:44 tom Exp $ +$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.29 2002/11/16 13:24:44 joerg Exp $ % Having trouble using fetch through a firewall? Try setting the environment variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details. @@ -44,7 +44,7 @@ % You can disable tcsh's terminal beep if you `set nobeep'. % -If you `set watch (0 any any)' in tcsh, you will be notified when +If you `set watch = (0 any any)' in tcsh, you will be notified when someone logs in or out of your system. % Nice tcsh prompt: set prompt = '%m %# ' ==== //depot/projects/mips/games/fortune/datfiles/startrek#2 (text+ko) ==== @@ -1,3 +1,4 @@ +%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.2 2002/11/17 09:53:11 schweikh Exp $ A father doesn't destroy his children. -- Lt. Carolyn Palamas, "Who Mourns for Adonais?", stardate 3468.1. @@ -628,7 +629,7 @@ -- Bailey, "The Corbomite Maneuver", stardate 1514.2 % "We have the right to survive!" -"Not be killing others." +"Not by killing others." -- Deela and Kirk, "Wink of An Eye", stardate 5710.5 % We Klingons believe as you do -- the sick should die. Only the strong ==== //depot/projects/mips/gnu/usr.bin/binutils/libiberty/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.16 2002/05/13 11:09:03 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libiberty/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $ .include "../Makefile.inc0" @@ -10,7 +10,9 @@ hex.c floatformat.c hashtab.c lbasename.c make-temp-file.c \ objalloc.c obstack.c safe-ctype.c xatexit.c xexit.c xmalloc.c \ xstrdup.c xstrerror.c -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440000 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500022 )) SRCS+= basename.c .endif WARNS?= 1 ==== //depot/projects/mips/gnu/usr.bin/cc/cc_tools/auto-host.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.10 2002/10/20 07:50:20 obrien Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/cc/cc_tools/auto-host.h,v 1.11 2002/11/13 11:50:40 ru Exp $ */ #include @@ -357,7 +357,10 @@ /* #undef _GNU_SOURCE */ /* Define if you have a working header file. */ +#if (__FreeBSD_version >= 440003 && __FreeBSD_version < 500000) || \ + __FreeBSD_version >= 500014 #define HAVE_STDBOOL_H 1 +#endif /* Define if you can safely include both and . */ #define STRING_WITH_STRINGS 1 ==== //depot/projects/mips/kerberos5/lib/libasn1/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.16 2002/08/13 16:52:50 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libasn1/Makefile,v 1.17 2002/11/13 13:49:29 ru Exp $ LIB= asn1 CFLAGS+=-I${KRB5DIR}/include \ @@ -106,7 +106,9 @@ strupr.c ${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET} -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440001 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 )) asn1_compile: getprogname.c setprogname.c .endif ==== //depot/projects/mips/kerberos5/lib/libhdb/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.9 2002/08/13 16:52:52 ru Exp $ +# $FreeBSD: src/kerberos5/lib/libhdb/Makefile,v 1.10 2002/11/13 13:49:29 ru Exp $ LIB= hdb CFLAGS+=-I${KRB5DIR}/include \ @@ -61,7 +61,9 @@ get_window_size.c strupr.c ${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET} -.if defined(BOOTSTRAPPING) +.if defined(BOOTSTRAPPING) && \ + ( ${BOOTSTRAPPING} < 440001 || \ + ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500023 )) asn1_compile: getprogname.c setprogname.c .endif ==== //depot/projects/mips/kerberos5/usr.bin/krb5-config/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.7 2002/09/19 12:59:18 nectar Exp $ +# $FreeBSD: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.8 2002/11/16 02:23:17 nectar Exp $ SCRIPTS= krb5-config MAN= krb5-config.1 @@ -15,6 +15,7 @@ -e "s,@LIB_dbopen\@,,g" \ -e "s,@LIB_des_appl\@,-lcrypto,g" \ -e "s,@LIBS\@,-lcom_err,g" \ + -e "s,@INCLUDE_des@,,g" \ ${.ALLSRC} > ${.TARGET} chmod +x ${.TARGET} ==== //depot/projects/mips/lib/libc/alpha/gen/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.9 2002/03/21 06:45:32 peter Exp $ +# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.10 2002/11/16 06:39:10 deischen Exp $ SRCS+= _setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \ @@ -8,7 +8,7 @@ SRCS+= __divqu.S __divq.S __divlu.S __divl.S SRCS+= __remqu.S __remq.S __remlu.S __reml.S SRCS+= rfork_thread.S -SRCS+= _ctx_start.S getcontext.S makecontext.c swapcontext.c +SRCS+= _ctx_start.S makecontext.c CLEANFILES+= __divqu.S __divq.S __divlu.S __divl.S CLEANFILES+= __remqu.S __remq.S __remlu.S __reml.S ==== //depot/projects/mips/lib/libc/alpha/gen/makecontext.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/makecontext.c,v 1.1 2002/01/10 02:40:53 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/makecontext.c,v 1.2 2002/11/16 06:39:10 deischen Exp $"); #include #include @@ -90,7 +90,7 @@ * Make sure the context is valid. For now, we only allow * trapframe format contexts to be used for makecontext. */ - else if (ucp->uc_mcontext.mc_format == __UC_REV0_SIGFRAME) { + else if (ucp->uc_mcontext.mc_format == _MC_REV0_SIGFRAME) { /* * Alpha passes the first 6 parameters in registers and * remaining parameters on the stack. Set up the context ==== //depot/projects/mips/lib/libc/gen/_pthread_stubs.c#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 18:12:31 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78C7C37B404; Sun, 17 Nov 2002 18:12:29 -0800 (PST) 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 119F437B401 for ; Sun, 17 Nov 2002 18:12:29 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE63043E4A for ; Sun, 17 Nov 2002 18:12:28 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAI29cmV042326 for ; Sun, 17 Nov 2002 18:09:38 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAI29cFA042323 for perforce@freebsd.org; Sun, 17 Nov 2002 18:09:38 -0800 (PST) Date: Sun, 17 Nov 2002 18:09:38 -0800 (PST) Message-Id: <200211180209.gAI29cFA042323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21200 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21200 Change 21200 by jmallett@jmallett_dalek on 2002/11/17 18:09:17 Remove PPC gprof stuff from copy. Affected files ... .. //depot/projects/mips/sys/mips/include/asm.h#2 edit Differences ... ==== //depot/projects/mips/sys/mips/include/asm.h#2 (text+ko) ==== @@ -63,12 +63,6 @@ #define _ENTRY(x) \ .text; .align 2; .globl x; .type x,@function; x: -#ifdef GPROF -# define _PROF_PROLOGUE mflr 0; stw 0,4(1); bl _mcount -#else -# define _PROF_PROLOGUE -#endif - #define ENTRY(y) _ENTRY(CNAME(y)); _PROF_PROLOGUE #define ASENTRY(y) _ENTRY(ASMNAME(y)); _PROF_PROLOGUE #define GLOBAL(y) _GLOBAL(CNAME(y)) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 18:33:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DD0737B404; Sun, 17 Nov 2002 18:33:56 -0800 (PST) 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 ABC6937B401 for ; Sun, 17 Nov 2002 18:33:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 498EC43E42 for ; Sun, 17 Nov 2002 18:33:55 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAI2V5mV043772 for ; Sun, 17 Nov 2002 18:31:05 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAI2V4Xu043769 for perforce@freebsd.org; Sun, 17 Nov 2002 18:31:04 -0800 (PST) Date: Sun, 17 Nov 2002 18:31:04 -0800 (PST) Message-Id: <200211180231.gAI2V4Xu043769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21201 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21201 Change 21201 by jmallett@jmallett_dalek on 2002/11/17 18:31:03 Move PANIC_REBOOT_WAIT_TIME to MI options, since MI stuff references it, and everything has it. Affected files ... .. //depot/projects/mips/sys/conf/options#7 edit .. //depot/projects/mips/sys/conf/options.alpha#3 edit .. //depot/projects/mips/sys/conf/options.i386#3 edit .. //depot/projects/mips/sys/conf/options.ia64#4 edit .. //depot/projects/mips/sys/conf/options.mips#4 edit .. //depot/projects/mips/sys/conf/options.pc98#3 edit .. //depot/projects/mips/sys/conf/options.powerpc#2 edit .. //depot/projects/mips/sys/conf/options.sparc64#2 edit .. //depot/projects/mips/sys/conf/options.x86_64#3 edit .. //depot/projects/mips/sys/mips/include/bus.h#1 add Differences ... ==== //depot/projects/mips/sys/conf/options#7 (text+ko) ==== @@ -107,6 +107,7 @@ NODEVFS opt_devfs.h NTIMECOUNTER opt_ntp.h NSWAPDEV opt_swap.h +PANIC_REBOOT_WAIT_TIME opt_panic.h PPS_SYNC opt_ntp.h PUC_FASTINTR opt_puc.h QUOTA ==== //depot/projects/mips/sys/conf/options.alpha#3 (text+ko) ==== @@ -22,7 +22,6 @@ PPC_DEBUG opt_ppc.h SHOW_BUSYBUFS -PANIC_REBOOT_WAIT_TIME opt_panic.h MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h ==== //depot/projects/mips/sys/conf/options.i386#3 (text+ko) ==== @@ -9,7 +9,6 @@ PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h SHOW_BUSYBUFS -PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM PERFMON opt_perfmon.h POWERFAIL_NMI opt_trap.h ==== //depot/projects/mips/sys/conf/options.ia64#4 (text+ko) ==== @@ -13,7 +13,6 @@ PPC_DEBUG opt_ppc.h SHOW_BUSYBUFS -PANIC_REBOOT_WAIT_TIME opt_panic.h MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h ==== //depot/projects/mips/sys/conf/options.mips#4 (text+ko) ==== ==== //depot/projects/mips/sys/conf/options.pc98#3 (text+ko) ==== @@ -9,7 +9,6 @@ PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h SHOW_BUSYBUFS -PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM PERFMON opt_perfmon.h POWERFAIL_NMI opt_trap.h ==== //depot/projects/mips/sys/conf/options.powerpc#2 (text+ko) ==== @@ -5,7 +5,6 @@ IPKDB opt_ipkdb.h SHOW_BUSYBUFS -PANIC_REBOOT_WAIT_TIME opt_panic.h POWERMAC opt_platform.h PSIM opt_psim.h ==== //depot/projects/mips/sys/conf/options.sparc64#2 (text+ko) ==== @@ -3,7 +3,6 @@ SUN4U opt_global.h SHOW_BUSYBUFS -PANIC_REBOOT_WAIT_TIME opt_panic.h EBUS_DEBUG opt_ebus.h PSYCHO_DEBUG opt_psycho.h ==== //depot/projects/mips/sys/conf/options.x86_64#3 (text+ko) ==== @@ -1,7 +1,6 @@ # $FreeBSD: src/sys/conf/options.x86_64,v 1.3 2002/10/17 07:04:31 iwasaki Exp $ # Options specific to the AMD x86-64 platform kernels -PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM PERFMON opt_perfmon.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 18:38: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDF0937B404; Sun, 17 Nov 2002 18:38:01 -0800 (PST) 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 8540737B401 for ; Sun, 17 Nov 2002 18:38:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 243A243E75 for ; Sun, 17 Nov 2002 18:38:01 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAI2ZBmV043991 for ; Sun, 17 Nov 2002 18:35:11 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAI2ZARG043979 for perforce@freebsd.org; Sun, 17 Nov 2002 18:35:10 -0800 (PST) Date: Sun, 17 Nov 2002 18:35:10 -0800 (PST) Message-Id: <200211180235.gAI2ZARG043979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21202 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21202 Change 21202 by jmallett@jmallett_dalek on 2002/11/17 18:34:13 Move SHOW_BUSYBUFS to MI options file. Affected files ... .. //depot/projects/mips/sys/conf/options#8 edit .. //depot/projects/mips/sys/conf/options.alpha#4 edit .. //depot/projects/mips/sys/conf/options.i386#4 edit .. //depot/projects/mips/sys/conf/options.ia64#5 edit .. //depot/projects/mips/sys/conf/options.mips#5 edit .. //depot/projects/mips/sys/conf/options.pc98#4 edit .. //depot/projects/mips/sys/conf/options.powerpc#3 edit .. //depot/projects/mips/sys/conf/options.sparc64#3 edit .. //depot/projects/mips/sys/conf/options.x86_64#4 edit Differences ... ==== //depot/projects/mips/sys/conf/options#8 (text+ko) ==== @@ -111,6 +111,7 @@ PPS_SYNC opt_ntp.h PUC_FASTINTR opt_puc.h QUOTA +SHOW_BUSYBUFS SPX_HACK SUIDDIR opt_suiddir.h MSGMNB opt_sysvipc.h ==== //depot/projects/mips/sys/conf/options.alpha#4 (text+ko) ==== @@ -21,8 +21,6 @@ PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -SHOW_BUSYBUFS - MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h SC_CUT_SPACES2TABS opt_syscons.h ==== //depot/projects/mips/sys/conf/options.i386#4 (text+ko) ==== @@ -8,7 +8,6 @@ DISABLE_PG_G opt_pmap.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -SHOW_BUSYBUFS MAXMEM PERFMON opt_perfmon.h POWERFAIL_NMI opt_trap.h ==== //depot/projects/mips/sys/conf/options.ia64#5 (text+ko) ==== @@ -12,8 +12,6 @@ PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -SHOW_BUSYBUFS - MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h SC_CUT_SPACES2TABS opt_syscons.h ==== //depot/projects/mips/sys/conf/options.mips#5 (text+ko) ==== ==== //depot/projects/mips/sys/conf/options.pc98#4 (text+ko) ==== @@ -8,7 +8,6 @@ DISABLE_PG_G opt_pmap.h PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -SHOW_BUSYBUFS MAXMEM PERFMON opt_perfmon.h POWERFAIL_NMI opt_trap.h ==== //depot/projects/mips/sys/conf/options.powerpc#3 (text+ko) ==== @@ -4,7 +4,5 @@ MPC750 opt_global.h IPKDB opt_ipkdb.h -SHOW_BUSYBUFS - POWERMAC opt_platform.h PSIM opt_psim.h ==== //depot/projects/mips/sys/conf/options.sparc64#3 (text+ko) ==== @@ -2,8 +2,6 @@ SUN4U opt_global.h -SHOW_BUSYBUFS - EBUS_DEBUG opt_ebus.h PSYCHO_DEBUG opt_psycho.h PSYCHO_STRAY opt_psycho.h ==== //depot/projects/mips/sys/conf/options.x86_64#4 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 19:46:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 310B937B404; Sun, 17 Nov 2002 19:46:27 -0800 (PST) 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 BE6FE37B401 for ; Sun, 17 Nov 2002 19:46:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 794B143E3B for ; Sun, 17 Nov 2002 19:46:26 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAI3hamV049248 for ; Sun, 17 Nov 2002 19:43:36 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAI3hZb2049245 for perforce@freebsd.org; Sun, 17 Nov 2002 19:43:35 -0800 (PST) Date: Sun, 17 Nov 2002 19:43:35 -0800 (PST) Message-Id: <200211180343.gAI3hZb2049245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21206 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21206 Change 21206 by marcel@marcel_nfs on 2002/11/17 19:43:18 Handle multiple gateway pages. Not really important, but less limited. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#47 edit .. //depot/projects/ia64/sys/ia64/ia64/trap.c#38 edit .. //depot/projects/ia64/sys/ia64/include/pmap.h#8 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#47 (text+ko) ==== @@ -1779,15 +1779,17 @@ } int -pmap_wire_syscall_page(pmap) +pmap_wire_syscall_page(pmap, va) pmap_t pmap; + vm_offset_t va; { + vm_offset_t d, pa; struct ia64_lpte *pte; - pte = pmap_find_pte(VM_MAX_ADDRESS); - pmap_set_pte(pte, VM_MAX_ADDRESS, - IA64_RR_MASK((u_int64_t)ia64_syscall_page), PTE_IG_MANAGED, - PTE_PL_KERN, PTE_AR_X_RX); + d = va - VM_MAX_ADDRESS; + pa = IA64_RR_MASK((u_int64_t)ia64_syscall_page) + d; + pte = pmap_find_pte(va); + pmap_set_pte(pte, va, pa, PTE_IG_MANAGED, PTE_PL_KERN, PTE_AR_X_RX); return (0); } ==== //depot/projects/ia64/sys/ia64/ia64/trap.c#38 (text+ko) ==== @@ -562,8 +562,8 @@ vm = (p != NULL) ? p->p_vmspace : NULL; if (vm == NULL) goto no_fault_in; - if (va == VM_MAX_ADDRESS) { - if (!pmap_wire_syscall_page(&vm->vm_pmap)) + if (va >= VM_MAX_ADDRESS) { + if (!pmap_wire_syscall_page(&vm->vm_pmap, va)) goto out; } map = &vm->vm_map; ==== //depot/projects/ia64/sys/ia64/include/pmap.h#8 (text+ko) ==== @@ -137,7 +137,7 @@ void pmap_set_opt (unsigned *); void pmap_set_opt_bsp (void); struct pmap *pmap_install(struct pmap *pmap); -int pmap_wire_syscall_page(struct pmap *pmap); +int pmap_wire_syscall_page(struct pmap *pmap, vm_offset_t); #endif /* _KERNEL */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 22: 8:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BFFA37B404; Sun, 17 Nov 2002 22:08:27 -0800 (PST) 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 B9E0F37B401 for ; Sun, 17 Nov 2002 22:08:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C10D43E6E for ; Sun, 17 Nov 2002 22:08:26 -0800 (PST) (envelope-from chris@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAI65ZmV059547 for ; Sun, 17 Nov 2002 22:05:35 -0800 (PST) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAI65Yj5059540 for perforce@freebsd.org; Sun, 17 Nov 2002 22:05:34 -0800 (PST) Date: Sun, 17 Nov 2002 22:05:34 -0800 (PST) Message-Id: <200211180605.gAI65Yj5059540@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 21212 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21212 Change 21212 by chris@chris_holly on 2002/11/17 22:05:05 Minor markup nit and bring things closer to date on the various renamings. This really can't be all of them, so more on this to come... Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#17 edit Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/developers-handbook/mac/chapter.sgml#17 (text+ko) ==== @@ -168,7 +168,7 @@ should handle the policy, and optionally requests the allocation of label state by the framework: - static struct mac_policy_op_entry mac_none_ops[] = + static struct mac_policy_op_entry &mac.mpo;_ops[] = { { MAC_DESTROY, (macop_t)mac_none_destroy }, @@ -3610,7 +3610,7 @@ *vp struct label *label - mode_t + int acc_mode @@ -4546,13 +4546,13 @@ privilege. - - <function>&mac.mpo;_check_socket_receive</function> + + <function>&mac.mpo;_check_socket_deliver</function> int - &mac.mpo;_check_socket_receive + &mac.mpo;_check_socket_deliver struct ucred *cred @@ -4590,7 +4590,7 @@ mbuf - Object; mbuf to be received + Object; mbuf to be delivered To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 17 23:10:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5DA937B404; Sun, 17 Nov 2002 23:10:48 -0800 (PST) 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 4C79737B401 for ; Sun, 17 Nov 2002 23:10:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA68143E3B for ; Sun, 17 Nov 2002 23:10:47 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAI77umV065429 for ; Sun, 17 Nov 2002 23:07:56 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAI77uCD065423 for perforce@freebsd.org; Sun, 17 Nov 2002 23:07:56 -0800 (PST) Date: Sun, 17 Nov 2002 23:07:56 -0800 (PST) Message-Id: <200211180707.gAI77uCD065423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21219 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21219 Change 21219 by marcel@marcel_nfs on 2002/11/17 23:07:22 Add EPC_CALLSYS_NOERROR, which has the same purpose as CALLSYS_NOERROR, but uses the epc framework. In order to keep each syscall-site small, we divert from the normal runtime call sequence. Instead, we pass the return address in p6. The syscall number is passed in r8 and the previous CFM is passed on in r9. While here, flesh out some regset save/restore functions. A nice thing about them is that they help structure the problem, and thus keep your mind from folding but other than that they're probably no good. I'll continue working on them, but I don't think they'll have a long life ahead of them... The _{get|set}_special probably needs an async and a sync variant... Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/syscall.s#2 edit .. //depot/projects/ia64/sys/ia64/include/_regset.h#2 edit .. //depot/projects/ia64/sys/ia64/include/asm.h#6 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/syscall.s#2 (text+ko) ==== @@ -51,6 +51,18 @@ * * Lightweight syscalls can be implemented by accessing kernel structures * or calling kernel functions without this setup. + * + * Syscalls don't follow the calling convention completely. The reason + * for this is that it would create unnecessary overhead. Arguments to + * syscalls are: + * r8 - syscall number + * r9 - ar.pfs + * in0-in7 - syscall arguments + * b6 - return address + * + * Syscalls return: + * r8+r9 - syscall return value(s) + * r10 - syscall error flag */ .section .text.syscall, "ax" @@ -69,5 +81,198 @@ ;; .endp epc_syscall -/* Make sure we don't cross the page boundary */ - .org PAGE_SIZE + +/* + * _{get|set}_special + * Do not follow runtime convention! + */ +/* + * inputs: r16 struct _special + * r17 return address + */ +ENTRY(_get_special, 0) +{ .mii + flushrs + add r2=8,r16 + add r3=16,r16 + ;; +} +{ .mmi + .mem.offset 0,0 + st8.spill [r2]=r1,16 // gp + .mem.offset 8,0 + st8.spill [r3]=r12,16 // sp + mov b6=r17 + ;; +} +{ .mmi + .mem.offset 16,0 + st8.spill [r2]=r13,16 // tp + mov r17=ar.rsc + mov r18=b0 + ;; +} +{ .mmi + st8 [r3]=r18,16 // rp + mov ar.rsc=0 + mov r19=pr + ;; +} +{ .mmi + st8 [r2]=r19,16 // pr + mov r20=ar.unat + mov r21=ar.pfs + ;; +} +{ .mmi + st8 [r16]=r20 // nat + st8 [r3]=r17,16 // ar.rsc + nop 0 +} +{ .mmi + st8 [r2]=r21,16 // ar.pfs + mov r22=ar.bsp + nop 1 + ;; +} +{ .mmi + st8 [r3]=r22,16 // ar.bspstore + mov r23=ar.rnat + nop 2 + ;; +} +{ .mmi + st8 [r2]=r23 // ar.rnat + mov r24=ar.fpsr + nop 3 + ;; +} +{ .mmb + st8 [r3]=r24 // ar.fpsr + mov ar.rsc=r17 + br.sptk b6 + ;; +} +END(_get_special) + +/* + * inputs: r16 struct _special + */ +ENTRY(_set_special, 0) +END(_set_special) + +/* + * _{get|set}_callee_saved + */ +ENTRY(_get_callee_saved, 1) +{ .mii + mov r31=ar.unat + add r2=8,in0 + add r3=16,in0 + ;; +} +{ .mmi + .mem.offset 0,0 + st8.spill [r2]=r4,16 // r4 + .mem.offset 8,0 + st8.spill [r3]=r5,16 // r5 + mov r29=b1 + ;; +} +{ .mmi + .mem.offset 16,0 + st8.spill [r2]=r6,16 // r6 + .mem.offset 24,0 + st8.spill [r3]=r7,16 // r7 + mov r28=b2 + ;; +} +{ .mmi + st8 [r2]=r29,16 // b1 + mov r30=ar.unat + mov r27=b3 + ;; +} +{ .mmi + st8 [in0]=r30 // nat + st8 [r3]=r28,16 // b2 + mov r26=b4 + ;; +} +{ .mmi + st8 [r2]=r27,16 // b3 + st8 [r3]=r26,16 // b4 + mov r25=b5 + ;; +} +{ .mmi + st8 [r2]=r25,16 // b5 + st8 [r3]=r31 // ar.unat + mov r24=ar.lc + ;; +} +{ .mfb + st8 [r2]=r24 // ar.lc + nop 0 + br.ret.sptk rp + ;; +} +END(_get_callee_saved) + +ENTRY(_set_callee_saved, 1) +{ .mii + ld8 r31=[in0] // nat + add r2=8,in0 + add r3=16,in0 + ;; +} +{ .mmb + mov ar.unat=r31 + lfetch [r3] + nop 0 + ;; +} +{ .mmi + ld8.fill r4=[r2],16 // r4 + ld8.fill r5=[r3],16 // r5 + nop 1 + ;; +} +{ .mmb + ld8.fill r6=[r2],16 // r6 + ld8.fill r7=[r3],16 // r7 + nop 2 + ;; +} +{ .mmi + ld8 r29=[r2],16 // b1 + ;; + ld8 r28=[r3],16 // b2 + mov b1=r29 + ;; +} +{ .mmi + ld8 r27=[r2],16 // b3 + ld8 r26=[r3],16 // b4 + mov b2=r28 + ;; +} +{ .mmi + ld8 r25=[r2],16 // b5 + ld8 r24=[r3] // ar.unat + mov b3=r27 + ;; +} +{ .mii + ld8 r23=[r2] // ar.lc + mov b4=r26 + mov b5=r25 + ;; +} +{ .mib + mov ar.unat=r24 + mov ar.lc=r23 + br.ret.sptk rp + ;; +} +END(_set_callee_saved) ==== //depot/projects/ia64/sys/ia64/include/_regset.h#2 (text+ko) ==== @@ -53,22 +53,20 @@ * Special registers. */ struct _special { - uint64_t flags; /* PSR bits and others... */ + uint64_t nat; /* NaT after spilling. */ uint64_t gr[3]; #define _GR1 0 /* GP */ #define _GR12 1 /* SP */ #define _GR13 2 /* TP */ - uint64_t nat; /* NaT *after* spilling. */ uint64_t br[1]; #define _BR0 0 /* RP */ - uint64_t ip; uint64_t pr; uint64_t ar_rsc; uint64_t ar_pfs; uint64_t ar_bspstore; - uint64_t ar_bsp; /* or ndirty? */ uint64_t ar_rnat; uint64_t ar_fpsr; + uint64_t __spare__; }; struct _special_fp { @@ -80,19 +78,19 @@ * Preserved registers. */ struct _callee_saved { + uint64_t nat; /* NaT after spilling. */ uint64_t gr[4]; #define _GR4 0 #define _GR5 1 #define _GR6 2 #define _GR7 3 - uint64_t nat; /* NaT *after* spilling. */ uint64_t br[5]; #define _BR1 0 #define _BR2 1 #define _BR3 2 #define _BR4 3 #define _BR5 4 - uint64_t ar_unat; /* All NaT bits. */ + uint64_t ar_unat; /* NaT before spilling. */ uint64_t ar_lc; }; ==== //depot/projects/ia64/sys/ia64/include/asm.h#6 (text+ko) ==== @@ -151,16 +151,27 @@ label: ASCIZ msg; \ .text; + /* * System call glue. */ -#define SYSCALLNUM(name) \ - SYS_ ## name +#define SYSCALLNUM(name) SYS_ ## name +#define GATEWAY_PAGE ((5 << 61) - 1048576) #define CALLSYS_NOERROR(name) \ mov r15=SYSCALLNUM(name); \ break 0x100000 ;; +#define EPC_CALLSYS_NOERROR(name) \ +{ .mlx ; \ + alloc r9 = ar.pfs, 0, 0, 8, 0 ; \ + movl r14 = GATEWAY_PAGE ;; } \ +{ .mib ; \ + mov r8 = SYSCALLNUM(name) ; \ + mov b7 = r14 ; \ + br.call.sptk b6 = b7 } + + /* * WEAK_ALIAS: create a weak alias (ELF only). */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 18 2:25:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9AEC37B404; Mon, 18 Nov 2002 02:25:24 -0800 (PST) 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 3F4E637B401; Mon, 18 Nov 2002 02:25:24 -0800 (PST) Received: from herring.nlsystems.com (mailgate.nlsystems.com [62.49.251.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3FAD43E91; Mon, 18 Nov 2002 02:25:22 -0800 (PST) (envelope-from dfr@nlsystems.com) Received: from herring.nlsystems.com (herring.nlsystems.com [10.0.0.2]) by herring.nlsystems.com (8.12.6/8.12.6) with ESMTP id gAIAPHDP010131; Mon, 18 Nov 2002 10:25:17 GMT (envelope-from dfr@nlsystems.com) Content-Type: text/plain; charset="iso-8859-1" From: Doug Rabson To: Marcel Moolenaar , Perforce Change Reviews Subject: Re: PERFORCE change 21190 for review Date: Mon, 18 Nov 2002 10:25:17 +0000 User-Agent: KMail/1.4.3 References: <200211180003.gAI03uph034009@repoman.freebsd.org> In-Reply-To: <200211180003.gAI03uph034009@repoman.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-Id: <200211181025.17278.dfr@nlsystems.com> X-Spam-Status: No, hits=-7.7 required=5.0 tests=IN_REP_TO,QUOTED_EMAIL_TEXT,REFERENCES,SPAM_PHRASE_00_01, USER_AGENT,USER_AGENT_KMAIL version=2.41 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Monday 18 November 2002 12:03 am, Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D21190 > > Change 21190 by marcel@marcel_nfs on 2002/11/17 16:03:41 > > =09When we get a pagefault in the syscall page, wire it in. Exclude > =09the syscall/gateway page from the vmspace. Note that I assume > =09for now that we have just a single page even though I created a > =09range of 1MB. I think having a larger range for this helps, but > =09only in the case we hardcode this stuff. Peter already mentioned > =09that we could pass the information to the process. That's a > =09detail I leave for later. Maybe a single 1Mb TR would be simpler? --=20 Doug Rabson=09=09=09=09Mail: dfr@nlsystems.com =09=09=09=09=09Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 18 7:37:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 792DD37B404; Mon, 18 Nov 2002 07:37:07 -0800 (PST) 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 0DF9B37B401 for ; Mon, 18 Nov 2002 07:37:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F07F43E77 for ; Mon, 18 Nov 2002 07:37:06 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAIFYDmV098243 for ; Mon, 18 Nov 2002 07:34:13 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAIFYDjj098240 for perforce@freebsd.org; Mon, 18 Nov 2002 07:34:13 -0800 (PST) Date: Mon, 18 Nov 2002 07:34:13 -0800 (PST) Message-Id: <200211181534.gAIFYDjj098240@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21231 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21231 Change 21231 by green@green_laptop_2 on 2002/11/18 07:33:28 Possibly print more vnode info on what causes demotion in mac_lomac. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#42 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#42 (text+ko) ==== @@ -503,8 +503,9 @@ static int maybe_demote(struct mac_lomac *subjlabel, struct mac_lomac *objlabel, - const char *actionname, const char *objname) + const char *actionname, const char *objname, struct vnode *vpq) { + struct vattr va; static const char xxx[] = "<>"; struct mac_lomac_proc *subj = PSLOT(&curthread->td_proc->p_label); char *subjlabeltext, *objlabeltext, *subjtext, *text; @@ -572,10 +573,21 @@ free(text, M_MACLOMAC); } pgid = p->p_pgrp->pg_id; /* XXX could be stale? */ - log(LOG_INFO, "LOMAC: level-%s subject p%dg%du%d:%s demoted to" - " level %s after %s a level-%s %s\n", - subjlabeltext, p->p_pid, pgid, curthread->td_ucred->cr_uid, - p->p_comm, subjtext, actionname, objlabeltext, objname); + if (vpq != NULL && VOP_GETATTR(vpq, &va, curthread->td_ucred, + curthread) == 0) { + log(LOG_INFO, "LOMAC: level-%s subject p%dg%du%d:%s demoted to" + " level %s after %s a level-%s %s (inode=%ld, " + "mountpount=%s)\n", + subjlabeltext, p->p_pid, pgid, curthread->td_ucred->cr_uid, + p->p_comm, subjtext, actionname, objlabeltext, objname, + va.va_fileid, vpq->v_mount->mnt_stat.f_mntonname); + } else { + log(LOG_INFO, "LOMAC: level-%s subject p%dg%du%d:%s demoted to" + " level %s after %s a level-%s %s\n", + subjlabeltext, p->p_pid, pgid, curthread->td_ucred->cr_uid, + p->p_comm, subjtext, actionname, objlabeltext, objname); + } + if (subjlabeltext != xxx) free(subjlabeltext, M_MACLOMAC); if (objlabeltext != xxx) @@ -1537,7 +1549,7 @@ */ if (mac_lomac_enabled && revocation_enabled && !mac_lomac_dominate_single(obj, source)) - (void)maybe_demote(source, obj, "executing", "file"); + (void)maybe_demote(source, obj, "executing", "file", vp); } static int @@ -1816,7 +1828,7 @@ obj = SLOT((pipelabel)); if (!mac_lomac_dominate_single(obj, subj)) - return (maybe_demote(subj, obj, "reading", "pipe")); + return (maybe_demote(subj, obj, "reading", "pipe", NULL)); return (0); } @@ -2198,7 +2210,7 @@ } if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { if (!mac_lomac_dominate_single(obj, subj)) - return (maybe_demote(subj, obj, "mapping", "file")); + return (maybe_demote(subj, obj, "mapping", "file", vp)); } return (0); @@ -2286,7 +2298,7 @@ obj = SLOT(label); if (!mac_lomac_dominate_single(obj, subj)) - return (maybe_demote(subj, obj, "reading", "file")); + return (maybe_demote(subj, obj, "reading", "file", vp)); return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 18 10: 2: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E48737B404; Mon, 18 Nov 2002 10:02:05 -0800 (PST) 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 A78C337B401 for ; Mon, 18 Nov 2002 10:02:04 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id C193C43E88 for ; Mon, 18 Nov 2002 10:02:03 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gAII1w0N045556; Mon, 18 Nov 2002 10:01:58 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gAII24qM000664; Mon, 18 Nov 2002 10:02:04 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gAII23QG000663; Mon, 18 Nov 2002 10:02:03 -0800 (PST) (envelope-from marcel) Date: Mon, 18 Nov 2002 10:02:03 -0800 From: Marcel Moolenaar To: Doug Rabson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 21190 for review Message-ID: <20021118180203.GA612@dhcp01.pn.xcllnt.net> References: <200211180003.gAI03uph034009@repoman.freebsd.org> <200211181025.17278.dfr@nlsystems.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200211181025.17278.dfr@nlsystems.com> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, Nov 18, 2002 at 10:25:17AM +0000, Doug Rabson wrote: > On Monday 18 November 2002 12:03 am, Marcel Moolenaar wrote: > > http://perforce.freebsd.org/chv.cgi?CH=21190 > > > > Change 21190 by marcel@marcel_nfs on 2002/11/17 16:03:41 > > > > When we get a pagefault in the syscall page, wire it in. Exclude > > the syscall/gateway page from the vmspace. Note that I assume > > for now that we have just a single page even though I created a > > range of 1MB. I think having a larger range for this helps, but > > only in the case we hardcode this stuff. Peter already mentioned > > that we could pass the information to the process. That's a > > detail I leave for later. > > Maybe a single 1Mb TR would be simpler? Definitely. I just didn't want to go through the effort of finding the right register and dealing with SMP right now. I just wanted to get something off the ground; get feedback on the taken approach and have it trigger new ideas and suggestions. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 18 10: 7:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D8E237B401; Mon, 18 Nov 2002 10:07:14 -0800 (PST) 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 C4B1F37B404 for ; Mon, 18 Nov 2002 10:07:13 -0800 (PST) Received: from mail.speakeasy.net (mail14.speakeasy.net [216.254.0.214]) by mx1.FreeBSD.org (Postfix) with ESMTP id A46DE43E88 for ; Mon, 18 Nov 2002 10:07:12 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 5783 invoked from network); 18 Nov 2002 18:07:17 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail14.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 18 Nov 2002 18:07:17 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.6/8.12.6) with ESMTP id gAII7A2D027516; Mon, 18 Nov 2002 13:07:11 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: Date: Mon, 18 Nov 2002 13:07:15 -0500 (EST) From: John Baldwin To: Robert Watson Subject: Re: PERFORCE change 21079 for review Cc: Perforce Change Reviews Cc: Perforce Change Reviews , Brian Feldman Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 16-Nov-2002 Robert Watson wrote: > On Fri, 15 Nov 2002, Brian Feldman wrote: >> int >> +mac_check_system_kldload(struct ucred *cred, struct vnode *vp) >> +{ >> + int error; >> + >> + if (vp != NULL) { >> + ASSERT_VOP_LOCKED(vp, "mac_check_system_acct"); >> + } > > Two questions: > > (2) Looks like a copy-and-paste-o: should be kldload not acct. __func__ > manually making copies of all function names. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 18 10:48:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7FA4437B404; Mon, 18 Nov 2002 10:48:58 -0800 (PST) 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 2F58637B401 for ; Mon, 18 Nov 2002 10:48:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC10A43E4A for ; Mon, 18 Nov 2002 10:48:57 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAIIk4mV009946 for ; Mon, 18 Nov 2002 10:46:04 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAIIk3S6009943 for perforce@freebsd.org; Mon, 18 Nov 2002 10:46:03 -0800 (PST) Date: Mon, 18 Nov 2002 10:46:03 -0800 (PST) Message-Id: <200211181846.gAIIk3S6009943@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21232 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21232 Change 21232 by green@green_laptop_2 on 2002/11/18 10:45:32 Don't keep the old setfmac around. Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/setfmac/Makefile#5 delete .. //depot/projects/trustedbsd/mac/usr.sbin/setfmac/setfmac.8#4 delete .. //depot/projects/trustedbsd/mac/usr.sbin/setfmac/setfmac.c#9 delete Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 18 11:12:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F2B537B404; Mon, 18 Nov 2002 11:12:27 -0800 (PST) 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 0D53837B401 for ; Mon, 18 Nov 2002 11:12:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCB0D43E6E for ; Mon, 18 Nov 2002 11:12:26 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAIJ9XmV011547 for ; Mon, 18 Nov 2002 11:09:33 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAIJ9WZh011544 for perforce@freebsd.org; Mon, 18 Nov 2002 11:09:32 -0800 (PST) Date: Mon, 18 Nov 2002 11:09:32 -0800 (PST) Message-Id: <200211181909.gAIJ9WZh011544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21233 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21233 Change 21233 by green@green_laptop_2 on 2002/11/18 11:09:18 Document -R and -h for setfmac(8). Affected files ... .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfmac.8#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfmac.8#3 (text+ko) ==== @@ -46,8 +46,19 @@ The .Nm utility associates the specified MAC label to the specified file or files. +.Pp +The following options are available: +.Bl -tag -width indent +.It Fl R +Recursively list subdirectories encountered. +.It Fl h +Apply +.Ar label +to symbolic links encountered, rather than their targets. +.El .Sh SEE ALSO .Xr mac 3 , .Xr mac_set_file 3 , +.Xr mac_set_link 3 , .Xr getfmac 8 , .Xr mac 9 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 18 12:34: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 590FD37B404; Mon, 18 Nov 2002 12:34:07 -0800 (PST) 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 E8B8437B401 for ; Mon, 18 Nov 2002 12:34:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 915A343E6E for ; Mon, 18 Nov 2002 12:34:06 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAIKVCmV016677 for ; Mon, 18 Nov 2002 12:31:12 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAIKVCxb016674 for perforce@freebsd.org; Mon, 18 Nov 2002 12:31:12 -0800 (PST) Date: Mon, 18 Nov 2002 12:31:12 -0800 (PST) Message-Id: <200211182031.gAIKVCxb016674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21235 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21235 Change 21235 by jmallett@jmallett_dalek on 2002/11/18 12:30:39 Copy from, not to, coprocessor 1. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore.s#2 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore.s#2 (text+ko) ==== @@ -70,7 +70,7 @@ # Get the processor ID from coprocessor 0, and the FPU ID from # coprocessor 1. mfc0 t0, MIPS_COP_0_PRID - ctc1 t1, MIPS_FPU_ID + cfc1 t1, MIPS_FPU_ID sw t0, cpu_prid sw t1, fpu_id To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 18 13:14:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAF7737B404; Mon, 18 Nov 2002 13:14:18 -0800 (PST) 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 644C737B401 for ; Mon, 18 Nov 2002 13:14:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EC6043E3B for ; Mon, 18 Nov 2002 13:14:18 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAILBNmV019537 for ; Mon, 18 Nov 2002 13:11:23 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAILBNs6019534 for perforce@freebsd.org; Mon, 18 Nov 2002 13:11:23 -0800 (PST) Date: Mon, 18 Nov 2002 13:11:23 -0800 (PST) Message-Id: <200211182111.gAILBNs6019534@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21240 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21240 Change 21240 by jmallett@jmallett_dalek on 2002/11/18 13:11:19 Forgot to submit this, register definitions. Affected files ... .. //depot/projects/mips/sys/mips/include/regdef.h#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 18 14:32:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19EDA37B404; Mon, 18 Nov 2002 14:32:11 -0800 (PST) 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 A7E6E37B401 for ; Mon, 18 Nov 2002 14:32:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 53B9443E6E for ; Mon, 18 Nov 2002 14:32:10 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAIMTFmV024947 for ; Mon, 18 Nov 2002 14:29:15 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAIMTFWW024944 for perforce@freebsd.org; Mon, 18 Nov 2002 14:29:15 -0800 (PST) Date: Mon, 18 Nov 2002 14:29:15 -0800 (PST) Message-Id: <200211182229.gAIMTFWW024944@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21246 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21246 Change 21246 by green@green_laptop_2 on 2002/11/18 14:28:31 Enter the basic setfsmac.8 manpage. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.8#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 18 16:17:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5BDF37B404; Mon, 18 Nov 2002 16:17:56 -0800 (PST) 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 3F8CC37B401; Mon, 18 Nov 2002 16:17:56 -0800 (PST) Received: from holly.dyndns.org (adsl-208-191-149-232.dsl.hstntx.swbell.net [208.191.149.232]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3019143E9C; Mon, 18 Nov 2002 16:17:55 -0800 (PST) (envelope-from chris@holly.dyndns.org) Received: (from chris@localhost) by holly.dyndns.org (8.12.6/8.11.6) id gAJ0J01e050595; Mon, 18 Nov 2002 18:19:00 -0600 (CST) (envelope-from chris) Date: Mon, 18 Nov 2002 18:19:00 -0600 From: Chris Costello To: Brian Feldman Cc: Perforce Change Reviews Subject: Re: PERFORCE change 21246 for review Message-ID: <20021119001900.GH42055@holly.machined.net> Reply-To: chris@freebsd.org References: <200211182229.gAIMTFWW024944@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200211182229.gAIMTFWW024944@repoman.freebsd.org> User-Agent: Mutt/1.4i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Monday, November 18, 2002, Brian Feldman wrote: > http://perforce.freebsd.org/chv.cgi?CH=21246 > > Change 21246 by green@green_laptop_2 on 2002/11/18 14:28:31 > > Enter the basic setfsmac.8 manpage. Makes me wonder if we shouldn't combine setfsmac.8 and setfmac.8. Typically things this simple don't have two different man pages. -- Chris Costello FreeBSD Project http://www.FreeBSD.org/ TrustedBSD Project http://www.TrustedBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 18 16:50:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3693137B401; Mon, 18 Nov 2002 16:50:16 -0800 (PST) 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 B441237B408 for ; Mon, 18 Nov 2002 16:50:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 759314424B for ; Mon, 18 Nov 2002 16:47:42 -0800 (PST) (envelope-from chris@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAJ0i1mV033647 for ; Mon, 18 Nov 2002 16:44:01 -0800 (PST) (envelope-from chris@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAJ0i0SS033640 for perforce@freebsd.org; Mon, 18 Nov 2002 16:44:00 -0800 (PST) Date: Mon, 18 Nov 2002 16:44:00 -0800 (PST) Message-Id: <200211190044.gAJ0i0SS033640@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chris@freebsd.org using -f From: Chris Costello Subject: PERFORCE change 21250 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21250 Change 21250 by chris@chris_holly on 2002/11/18 16:43:00 Integ. Affected files ... .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#11 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#10 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#11 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#5 integrate .. //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/IPXrouted.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/MAKEDEV.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/Makefile#6 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ac.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/accton.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/adding_user.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/adduser.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/adjkerntz.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/amd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/amq.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ancontrol.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/apm.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/apmd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/arp.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/atacontrol.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/atm.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/atmarpd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/atrun.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/badsect.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/boot0cfg.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/boot_i386.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/bootparamd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/bootpd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/bootpef.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/bootptest.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/btxld.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/burncd.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/camcontrol.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ccdconfig.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/chat.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/chkgrp.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/chkprintcap.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/chown.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/chroot.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/clri.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/comcontrol.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/comsat.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/config.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/crash.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/cron.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/cvsbug.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/daemon.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dev_mkdb.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dhclient-script.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dhclient.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/disklabel.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/diskless.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/diskpart.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dm.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dmesg.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dump.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dumpfs.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/dumpon.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/edquota.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/faithd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fdisk.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ffsinfo.8#3 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fingerd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fixmount.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fore_dnld.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fsck_msdosfs.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fsdb.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fsinfo.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/fsirand.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ftpd.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/genassym.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/gensetdefs.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/getty.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/gifconfig.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/growfs.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/hlfsd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ibcs2.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ifconfig.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ifmcstat.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ilmid.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/inetd.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/init.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/intro.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/iostat.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ip6fw.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ipf.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ipfstat.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ipmon.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ipnat.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/isdnd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/isdndebug.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/isdndecode.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/isdnmonitor.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/isdnphone.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/isdntel.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/isdntelctl.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/isdntrace.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ispcvt.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/jail.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/joy.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/kernbb.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/keyserv.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/kget.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/kgmon.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/kgzip.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/kldconfig.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/kldload.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/kldstat.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/kldunload.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/lastlogin.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ldconfig.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/linux.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/loader.4th.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/loader.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/locate.updatedb.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/lpc.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/lpd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/lptcontrol.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mail.local.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mailwrapper.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/makekey.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/makewhatis.local.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/manctl.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/map-mbone.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/memcontrol.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mergemaster.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mixer.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mk-amd-map.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mknetid.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mknod.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mld6query.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mlxcontrol.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_cd9660.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_ext2fs.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_msdos.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_msdosfs.8#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_nfs.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_ntfs.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_null.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_nullfs.8#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_nwfs.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_portal.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_portalfs.8#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_std.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_umap.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_umapfs.8#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_union.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mount_unionfs.8#1 branch .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mountd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/moused.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mrinfo.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mrouted.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mtest.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mtrace.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/mtree.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/named.reload.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/named.restart.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/natd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ndp.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/newfs.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/newfs_msdos.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/newkey.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/newsyslog.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/nextboot.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/nfsd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/nfsiod.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ngctl.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/nghook.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/nologin.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/nos-tun.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/nslookup.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ntp-genkeys.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ntpd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ntpdate.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ntpdc.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ntpq.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ntptime.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ntptrace.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pac.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pam.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pam_opie.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pam_opieaccess.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pam_radius.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pam_ssh.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pam_tacplus.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pccardc.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pccardd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pciconf.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/periodic.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/picobsd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ping.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ping6.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pnpinfo.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/portmap.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ppp.8#5 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pppctl.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pppd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pppoed.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/prefix.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/procctl.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pstat.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pw.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pwd_mkdb.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/pxeboot.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/quot.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/quotacheck.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/quotaon.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rarpd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/raycontrol.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rbootd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rc.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/reboot.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/renice.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/repquota.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/restore.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/revnetgroup.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rexecd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rip6query.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rlogind.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rmt.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rmuser.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rndcontrol.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/route.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/route6d.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/routed.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpc.lockd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpc.rquotad.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpc.rstatd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpc.rusersd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpc.rwalld.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpc.sprayd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpc.statd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpc.umntall.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpc.yppasswdd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rpc.ypxfrd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rrenumd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rshd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rtadvd.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rtquery.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rtsold.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/rwhod.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sa.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/savecore.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/scspd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sendmail.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/setkey.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/showmount.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/shutdown.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sicontrol.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/slattach.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sliplogin.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/slstat.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/smrsh.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/spkrtest.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/spppcontrol.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/spray.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ssh-keysign.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sshd.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sticky.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/stlload.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/stlstats.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/stlstty.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/strfile.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/svr4.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/swapon.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sync.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sysctl.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/sysinstall.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/syslogd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/talkd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/telnetd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/tftpd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/timed.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/timedc.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/traceroute.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/traceroute6.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/trpt.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/tunefs.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/tzsetup.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/umount.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/usbd.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/usbdevs.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/uuchk.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/uucico.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/uucpd.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/uusched.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/uuxqt.8#2 delete .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/vinum.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/vipw.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/vmstat.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/watch.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/wicontrol.8#4 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/wlconfig.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/xtend.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/yp.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/yp_mkdb.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ypbind.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ypinit.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/yppoll.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/yppush.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ypserv.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ypset.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/ypxfr.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/zdump.8#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man8/zic.8#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/BUS_PRINT_CHILD.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/BUS_READ_IVAR.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/BUS_SETUP_INTR.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DECLARE_MODULE.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DELAY.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DEVICE_ATTACH.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DEVICE_DETACH.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DEVICE_IDENTIFY.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DEVICE_PROBE.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DEVICE_SHUTDOWN.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DEV_MODULE.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/DRIVER_MODULE.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/KASSERT.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/MD5.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/MODULE_DEPEND.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/MODULE_VERSION.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/SYSCALL_MODULE.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_CHECKEXP.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_FHTOVP.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_INIT.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_MOUNT.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_QUOTACTL.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_ROOT.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_START.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_STATFS.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_UNMOUNT.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_VGET.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VFS_VPTOFH.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_ACCESS.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_ACLCHECK.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_ADVLOCK.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_ATTRIB.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_BWRITE.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_CREATE.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_FSYNC.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_GETACL.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_GETEXTATTR.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_GETPAGES.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_INACTIVE.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_IOCTL.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_LEASE.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_LINK.9#3 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_LOOKUP.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_OPENCLOSE.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_PATHCONF.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_PRINT.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_RDWR.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_READDIR.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_READLINK.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_REALLOCBLKS.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_REMOVE.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_RENAME.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_SETACL.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_SETEXTATTR.9#2 integrate .. //depot/projects/trustedbsd/doc/ja_JP.eucJP/man/man9/VOP_STRATEGY.9#2 integrate Differences ... ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/articles/contributors/article.sgml#11 (text+ko) ==== @@ -18,7 +18,7 @@ Contributors to FreeBSD - $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.298 2002/11/15 20:36:36 arved Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/article.sgml,v 1.299 2002/11/18 06:59:57 maho Exp $ This article lists individuals and organizations who have @@ -1217,11 +1217,11 @@ - &a.maho; + &a.max; - &a.max; + &a.maho; ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -266,7 +266,7 @@ ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-current/. Some of our FTP mirrors may also allow - compressed/tarred grabbing of whole trees. e.g. you + compressed/tarred grabbing of whole trees. For example you see: usr.bin/lex @@ -476,10 +476,10 @@ Use ftp. The source tree for &os.stable; is always exported on: ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-stable/ + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-stable/">ftp://ftp.FreeBSD.org/pub/FreeBSD/FreeBSD-stable/. Some of our FTP mirrors may also allow - compressed/tarred grabbing of whole trees. e.g. you + compressed/tarred grabbing of whole trees. For example you see: usr.bin/lex ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#10 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -2391,7 +2391,9 @@ ports/german ports/hebrew ports/japanese +ports/hungarian ports/korean +ports/portuguese ports/russian ports/ukrainian ports/vietnamese @@ -2686,6 +2688,15 @@ + ports-finance + release=cvs + + + Monetary, financial and related applications. + + + + ports-ftp release=cvs @@ -2722,6 +2733,15 @@ + ports-hungarian + release=cvs + + + Hungarian language support. + + + + ports-irc release=cvs @@ -2803,6 +2823,15 @@ + ports-multimedia + release=cvs + + + Multimedia software. + + + + ports-net release=cvs @@ -2825,12 +2854,21 @@ release=cvs - Software support for 3Com Palm + Software support for Palm series. + ports-portuguese + release=cvs + + + Portuguese language support. + + + + ports-print release=cvs @@ -3344,7 +3382,7 @@ cvsup2.at.FreeBSD.org (maintainer - postmaster@wu-wien.ac.at) + ftp-admin.zid@univie.ac.at) ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#5 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1831,7 +1831,7 @@ # Installed in /usr/local/libexec/psif # -read first_line +IFS="" read -r first_line first_two_chars=`expr "$first_line" : '\(..\)'` if [ "$first_two_chars" = "%!" ]; then @@ -1905,7 +1905,7 @@ # # Read first two characters of the file # -read first_line +IFS="" read -r first_line first_two_chars=`expr "$first_line" : '\(..\)'` if [ "$first_two_chars" = "%!" ]; then @@ -1932,7 +1932,7 @@ # Plain text or HP/PCL, so just print it directly; print a form feed # at the end to eject the last page. # - echo $first_line && cat && printf "\033&l0H" && + echo "$first_line" && cat && printf "\033&l0H" && exit 0 fi ==== //depot/projects/trustedbsd/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#11 (text+ko) ==== @@ -1,7 +1,7 @@ + accessibility* + Ports to help disabled users. + + + afterstep* Ports to support the AfterStep window manager. @@ -1344,6 +1349,11 @@ + finance + Monetary, financial and related applications. + + + french French language support. @@ -1378,11 +1388,21 @@ + haskell* + Software related to the Haskell language. + + + hebrew Hebrew language support. + hungarian + Hungarian language support. + + + ipv6* IPv6 related software. @@ -1399,7 +1419,7 @@ java - Java language support. + Software related to the Java language. @@ -1451,6 +1471,11 @@ + multimedia + Multimedia software. + + + net Miscellaneous networking software. @@ -1467,7 +1492,12 @@ palm - Software support for the 3Com Palm(tm) series. + Software support for the Palm(tm) series. + + + + parallel* + Applications dealing with parallelism in computing. @@ -1486,6 +1516,11 @@ + portuguese + Portuguese language support. + + + print Printing software. Desktop publishing tools (previewers, etc.) belong here too. @@ -1493,12 +1528,12 @@ python* - Software written in python. + Software related to the Python language. ruby* - Software written in ruby. + Software related to the Ruby language. ==== //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#5 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.4 2002/10/29 15:41:15 blackend Exp $ - $Id: chapter.sgml,v 1.19 2002/10/29 14:39:50 marc Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.5 2002/11/17 20:35:52 blackend Exp $ + $Id: chapter.sgml,v 1.20 2002/11/17 20:16:51 marc Exp $ Original revision: 1.86 --> @@ -1606,7 +1606,7 @@ terminal FreeBSD peut être utilisé de diverses façons. - L'une d'elles est en tapant des commandes sur une terminal + L'une d'elles est en tapant des commandes sur un terminal texte. Une bonne partie de la flexibilité et de la puissance d'un système d'exploitation &unix; est directemtent disponible sous vos mains en utilisant FreeBSD de cette manière. @@ -1680,7 +1680,7 @@ Chaque système multi-utilisateur a besoin d'un moyen pour distinguer un “utilisateur” du reste. Sous - FreeBSD (et sous tous les les systèmes de type &unix;), + FreeBSD (et sous tous les systèmes de type &unix;), cela est effectué en demandant à chaque utilisateur de “s'attacher” au système avant d'être en mesure d'exécuter des programmes. Chaque utilisateur @@ -1697,7 +1697,7 @@ qui sont exécutés automatiquement pas FreeBSD au démarrage. Leur fonction principale est de configurer le système pour permettre l'exécution de tout programme, - et de démarrer tout services que vous avez configurez pour + et de démarrer tout service que vous avez configuré pour tourner en tâche de fond et exécuter des choses utiles. , il présentera une invite et demandera un nom @@ -1716,13 +1716,13 @@ Tapez maintenant le mot de passe de john, et appuyez sur Entrée. Le mot de passe - n'est pas affiché! Vous n'avez pas a + n'est pas affiché! Vous n'avez pas à vous préoccuper de cela maintenant. Il suffit de penser que cela est fait pour des raisons de sécurité. - Si vous avez taper correctement votre mot de passe, + Si vous avez tapé correctement votre mot de passe, vous devriez être maintenant attaché - au système et prêt a essayer toutes les commandes + au système et prêt à essayer toutes les commandes disponibles. @@ -1742,9 +1742,9 @@ de nombreuses consoles virtuelles. Vous pouvez basculer d'une console virtuelle à une autre en utilisant une combinaison de touches sur votre clavier. Chaque console - a son pronpre canal de sortie, et FreeBSD prend soin de + a son propre canal de sortie, et FreeBSD prend soin de rediriger correctement les entrées au clavier et la sortie - vers écran quand vous basculez d'un console virtuelle à + vers écran quand vous basculez d'une console virtuelle à la suivante. Des combinaisons de touches spécifiques ont @@ -1783,7 +1783,7 @@ La configuration par défaut de FreeBSD démarre avec 8 consoles virtuelles. Cependant ce n'est pas un paramétrage - fixe, et vous pouvez aisément personaliser votre installation + fixe, et vous pouvez aisément personnaliser votre installation pour démarrer avec plus ou moins de consoles virtuelles. Le nombre et les paramétrages des consoles virtuelles sont configurés dans le fichier @@ -1791,12 +1791,12 @@ Vous pouvez utiliser le fichier /etc/ttys pour configurer les consoles - virtuelles de FreeBSD. Chaque non-commentée dans ce fichier + virtuelles de FreeBSD. Chaque ligne non-commentée dans ce fichier (les lignes qui ne débutent pas par le caractère #) contient le paramétrage d'un terminal ou d'une console virtuelle. La version par défaut de ce fichier livrée avec FreeBSD configure 9 consoles virtuelles, - et en active 8. Ce sont les ligne commençant avec le terme + et en active 8. Ce sont les lignes commençant avec le terme ttyv: # name getty type status comments @@ -1840,7 +1840,7 @@ Comme l'indiquent les commentaires au-dessus de la ligne - console, vous pouvez editer cette ligne + console, vous pouvez éditer cette ligne et changer secure pour insecure. Si vous faites cela, quand FreeBSD démarrera en mode mono-utilisateur, il demandera le ==== //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#5 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml,v 1.7 2002/10/29 18:07:51 blackend Exp $ - $Id: chapter.sgml,v 1.12 2002/10/29 18:06:25 marc Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml,v 1.8 2002/11/17 11:12:56 blackend Exp $ + $Id: chapter.sgml,v 1.13 2002/11/17 11:11:19 marc Exp $ Original revision: 1.63 --> @@ -104,7 +104,7 @@ Cela inclut des programmes en ligne de commande comme mutt, pine, elm, et - mail, et des programmes graphique + mail, et des programmes graphiques comme balsa, xfmail pour juste en nommer quelques-uns, ou quelque chose de plus @@ -349,15 +349,15 @@ courrier local et quel type d'accès ils ont. Les machines peuvent être listées avec , , ou simplement - transférés à la routine de gestion des erreurs + transférées à la routine de gestion des erreurs sendmail avec une erreur donnée. Les machines qui sont listées avec , qui est le - comportement par défaut, sont autorisés à envoyer du + comportement par défaut, sont autorisées à envoyer du courrier à cette machinee dès que la destination finale du courrier est la machine locale. Les machines listées avec se verront rejeter pour toute connexion au serveur. Les machines présentes avec l'option - sont autorisés à envoyer du + sont autorisées à envoyer du courrier à n'importe quelle destination par l'intermédiaire de ce serveur de courrier. @@ -380,7 +380,7 @@ d'erreur de sendmail. Le message est affiché sur la machine distante quand un courrier électronique correspond à la partie gauche de la table. - L'entrée suivante rejette le courrier en provenance d'un + L'entrée suivante rejette le courrier en provenance d'une machine précise de l'Internet, another.source.of.spam. L'entrée suivante accepte les connexions à partir de la machine @@ -422,12 +422,12 @@ aux lettres à gauche et la cible sur la droite. Le premier exemple transfère la boîte aux lettres root vers la boîte aux lettres - localuser, qui est ensuite recherché + localuser, qui est ensuite recherchée dans la base de données d'alias. Si aucune correspondance n'est trouvée alors le message est délivré à l'utilisateur locale localuser. L'exemple suivant montre une - liste de correspondance. Un courrier envoyé un à la + liste de correspondance. Un courrier envoyé à la boîte aux lettres ftp-bugs sera délivré aux trois boites locales joe, eric, et paul. Notez @@ -518,7 +518,7 @@ @exemple.com joe - Dans l'exemple ci-dessus, nous avons un correspondance pour + Dans l'exemple ci-dessus, nous avons une correspondance pour un domaine exemple.com. Ce fichier est traité jusqu'à trouver la première correspondance. Le premier élément fait correspondre root@exemple.com @@ -591,7 +591,7 @@ de configurer votre nouveau logiciel avant de remplacer sendmail. Quand vous faites cela, vous devez être sûr que l'installation du nouveau - logiciel de tentera pas de remplacer des binaires du système + logiciel ne tentera pas de remplacer des binaires du système comme /usr/bin/sendmail. Sinon, votre nouveau logiciel sera mis en service avant d'avoir pu le configurer. @@ -744,7 +744,7 @@ comme /usr/bin/sendmail exécute réellement l'agent que vous avez choisi à la place. Heureusement, FreeBSD fournit un système appelé - &man.mailwrapper.8; qui remplit se travail pour vous. + &man.mailwrapper.8; qui remplit ce travail pour vous. Quand sendmail fonctionne tel qu'il a été installé, vous @@ -931,7 +931,7 @@ exemple.com). Quand le sendmail expéditeur tente - de vous délivrer du courrier, il essaira de se connecter + de vous délivrer du courrier, il essaiera de se connecter à votre serveur (exemple.com) via votre liaison par modem. Ce qui échouera très probablement par dépassement de délai puisque @@ -1040,7 +1040,7 @@ utiliser un système ou un client “clic-bouton” sur une autre machine ou un autre FAI. C'est également très utile si vous avez uniquement qu'un ou deux - compte de courrier électronique configuré. + comptes de courrier électronique configurés. S'il y a un grand nombre d'adresses à ajouter, vous pouvez tout simplement ouvrir ce fichier dans votre éditeur de texte favori et ensuite ajouter les domaines, @@ -1081,7 +1081,7 @@ Sans aucune configuration, vous devrez être en mesure d'envoyer du courrier électronique à des machines - extérieures à partir du moment ou vous avez + extérieures à partir du moment où vous avez configuré /etc/resolv.conf ou que vous avez votre propre serveur de noms. Si vous désirez que le courrier pour votre machine soit délivré au @@ -1113,7 +1113,7 @@ derrière un coupe-feu, il doit autoriser le trafic SMTP en votre direction. Si vous voulez recevoir directement le courrier sur votre machine, vous devez être sûrs - de de l'une de ces deux choses: + de l'une de ces deux choses: enregistrement MX @@ -1129,8 +1129,8 @@ - Une des deux conditions précédente vous - permettra de recevoir directement de courrier pour votre + Une des deux conditions précédentes vous + permettra de recevoir directement le courrier pour votre machine. Essayez: ==== //depot/projects/trustedbsd/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#3 (text+ko) ==== @@ -8,8 +8,8 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml,v 1.2 2002/10/24 16:56:45 blackend Exp $ - $Id: chapter.sgml,v 1.8 2002/10/24 15:08:40 marc Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml,v 1.3 2002/11/17 11:00:51 blackend Exp $ + $Id: chapter.sgml,v 1.9 2002/11/17 10:58:28 marc Exp $ Original revision: 1.13 --> @@ -56,7 +56,7 @@ Vinum est un gestionnaire de volume, un pilote de disque - virtuel qui permet de résoudre de ces trois problèmes. + virtuel qui permet de résoudre ces trois problèmes. Regardons-les plus en détails. De nombreuses solutions à ces problèmes ont été proposées et implémentées: @@ -107,7 +107,7 @@ positionner leurs têtes en environ 3.5 ms. Les disques les plus véloces tournent à 15000 tr/minute, donc le temps de latence moyen de rotation (un demi-tour) est de 2 ms. - A 70 MO/s, le transfer en lui-même prend environ + A 70 MO/s, le transfert en lui-même prend environ 150 μs, presque rien comparé au temps de positionnement. Dans un tel cas, le taux de transfert effectif tombe à un peu plus de 1 MO/s et est clairement hautement dépendant de la @@ -149,7 +149,7 @@ individuels et de les stocker de cette manière, plutôt que de les prendre comme un gros livre et de le déchirer en petites sections. Cette méthode est appelée - concaténation est a pour avantage que + concaténation et a pour avantage que les disques n'ont pas besoin d'avoir de rapport spécifique au niveau de leur taille respective. Cela fonctionne bien quand l'accès au disque virtuel est réparti de façon @@ -272,7 +272,7 @@ être effectuées sur les deux disques, elles prennent donc deux fois plus de bande passante que sur un volume sans miroir. Les lectures de souffrent pas de baisse de - performance: elles semble même plus rapides. + performance: elles semblent même plus rapides. @@ -353,7 +353,7 @@ Les sous-disques résident sur le - disques Vinum, en fait les partitions + disque Vinum, en fait les partitions UNIX™. Les disques Vinum peuvent contenir un nombre quelconque de sous-disque. A l'exception d'une petite zone au début du disque, qui est utilisée pour stocker @@ -364,7 +364,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 18 23:38:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C81F337B404; Mon, 18 Nov 2002 23:38:20 -0800 (PST) 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 51E1937B401 for ; Mon, 18 Nov 2002 23:38:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BA4FF43E3B for ; Mon, 18 Nov 2002 23:38:19 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAJ7ZNmV059616 for ; Mon, 18 Nov 2002 23:35:23 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAJ7ZMDS059613 for perforce@freebsd.org; Mon, 18 Nov 2002 23:35:22 -0800 (PST) Date: Mon, 18 Nov 2002 23:35:22 -0800 (PST) Message-Id: <200211190735.gAJ7ZMDS059613@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21259 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21259 Change 21259 by jmallett@jmallett_luna on 2002/11/18 23:35:03 Too much unatomic clutter. Fill in atomic_set_{int,long}, as they're the basis for most everything else, and other stuff can be added as it's actually needed. Affected files ... .. //depot/projects/mips/sys/mips/include/atomic.h#2 edit Differences ... ==== //depot/projects/mips/sys/mips/include/atomic.h#2 (text+ko) ==== @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2001 Jake Burkholder. - * All rights reserved. + * Copyright (c) 2002 Juli Mallett. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -23,330 +22,43 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/include/atomic.h,v 1.1 2001/07/31 05:45:16 jake Exp $ */ -/* - * This is not atomic. It is just a stub to make things compile. - */ - #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ -#define __atomic_op(p, op, v) ({ \ - __typeof(*p) __v = (__typeof(*p))v; \ - *p op __v; \ -}) +static __inline int +atomic_set_int(int *p, int val) +{ + int temp; -#define __atomic_load(p) ({ \ - __typeof(*p) __v; \ - __v = *p; \ - __v; \ -}) + __asm __volatile ( + "ll %[temp], %[p]\n\t" + "move %[temp], %[val]\n\t" + "sc %[temp], %[p]\n\t" + : [val] "=r"(val) + : [temp] "r"(temp), [p] "r"(p) + : "memory" + ); -#define __atomic_load_clear(p) ({ \ - __typeof(*p) __v; \ - __v = *p; \ - *p = 0; \ - __v; \ -}) + return (temp); +} -#define __atomic_cas(p, e, s) ({ \ - u_int __v; \ - if (*p == (__typeof(*p))e) { \ - *p = (__typeof(*p))s; \ - __v = 1; \ - } else { \ - __v = 0; \ - } \ - __v; \ -}) +static __inline long +atomic_set_long(long *p, long val) +{ + long temp; -#define __atomic_op_8(p, op, v) __atomic_op(p, op, v) -#define __atomic_op_16(p, op, v) __atomic_op(p, op, v) -#define __atomic_op_32(p, op, v) __atomic_op(p, op, v) -#define __atomic_load_32(p) __atomic_load(p) -#define __atomic_load_clear_32(p) __atomic_load_clear(p) -#define __atomic_cas_32(p, e, s) __atomic_cas(p, e, s) -#define __atomic_op_64(p, op, v) __atomic_op(p, op, v) -#define __atomic_load_64(p) __atomic_load(p) -#define __atomic_load_clear_64(p) __atomic_load_clear(p) -#define __atomic_cas_64(p, e, s) __atomic_cas(p, e, s) + __asm __volatile ( + "lld %[temp], %[p]\n\t" + "move %[temp], %[val]\n\t" + "scd %[temp], %[p]\n\t" + : [val] "=r"(val) + : [temp] "r"(temp), [p] "r"(p) + : "memory" + ); -#define atomic_add_8(p, v) __atomic_op_8(p, +=, v) -#define atomic_subtract_8(p, v) __atomic_op_8(p, -=, v) -#define atomic_set_8(p, v) __atomic_op_8(p, |=, v) -#define atomic_clear_8(p, v) __atomic_op_8(p, &=, ~v) -#define atomic_store_8(p, v) __atomic_op_8(p, =, v) - -#define atomic_add_16(p, v) __atomic_op_16(p, +=, v) -#define atomic_subtract_16(p, v) __atomic_op_16(p, -=, v) -#define atomic_set_16(p, v) __atomic_op_16(p, |=, v) -#define atomic_clear_16(p, v) __atomic_op_16(p, &=, ~v) -#define atomic_store_16(p, v) __atomic_op_16(p, =, v) - -#define atomic_add_32(p, v) __atomic_op_32(p, +=, v) -#define atomic_subtract_32(p, v) __atomic_op_32(p, -=, v) -#define atomic_set_32(p, v) __atomic_op_32(p, |=, v) -#define atomic_clear_32(p, v) __atomic_op_32(p, &=, ~v) -#define atomic_store_32(p, v) __atomic_op_32(p, =, v) -#define atomic_load_32(p) __atomic_load_32(p) -#define atomic_readandclear_32(p) __atomic_load_clear_32(p) -#define atomic_cmpset_32(p, e, s) __atomic_cas_32(p, e, s) - -#define atomic_add_64(p, v) __atomic_op_64(p, +=, v) -#define atomic_subtract_64(p, v) __atomic_op_64(p, -=, v) -#define atomic_set_64(p, v) __atomic_op_64(p, |=, v) -#define atomic_clear_64(p, v) __atomic_op_64(p, &=, ~v) -#define atomic_store_64(p, v) __atomic_op_64(p, =, v) -#define atomic_load_64(p) __atomic_load_64(p) -#define atomic_readandclear_64(p) __atomic_load_clear_64(p) -#define atomic_cmpset_64(p, e, s) __atomic_cas_64(p, e, s) - -#define atomic_add_acq_8(p, v) __atomic_op_8(p, +=, v) -#define atomic_subtract_acq_8(p, v) __atomic_op_8(p, -=, v) -#define atomic_set_acq_8(p, v) __atomic_op_8(p, |=, v) -#define atomic_clear_acq_8(p, v) __atomic_op_8(p, &=, ~v) -#define atomic_store_acq_8(p, v) __atomic_op_8(p, =, v) - -#define atomic_add_acq_16(p, v) __atomic_op_16(p, +=, v) -#define atomic_subtract_acq_16(p, v) __atomic_op_16(p, -=, v) -#define atomic_set_acq_16(p, v) __atomic_op_16(p, |=, v) -#define atomic_clear_acq_16(p, v) __atomic_op_16(p, &=, ~v) -#define atomic_store_acq_16(p, v) __atomic_op_16(p, =, v) - -#define atomic_add_acq_32(p, v) __atomic_op_32(p, +=, v) -#define atomic_subtract_acq_32(p, v) __atomic_op_32(p, -=, v) -#define atomic_set_acq_32(p, v) __atomic_op_32(p, |=, v) -#define atomic_clear_acq_32(p, v) __atomic_op_32(p, &=, ~v) -#define atomic_store_acq_32(p, v) __atomic_op_32(p, =, v) -#define atomic_load_acq_32(p) __atomic_load_32(p) -#define atomic_cmpset_acq_32(p, e, s) __atomic_cas_32(p, e, s) - -#define atomic_add_acq_64(p, v) __atomic_op_64(p, +=, v) -#define atomic_subtract_acq_64(p, v) __atomic_op_64(p, -=, v) -#define atomic_set_acq_64(p, v) __atomic_op_64(p, |=, v) -#define atomic_clear_acq_64(p, v) __atomic_op_64(p, &=, ~v) -#define atomic_store_acq_64(p, v) __atomic_op_64(p, =, v) -#define atomic_load_acq_64(p) __atomic_load_64(p) -#define atomic_cmpset_acq_64(p, e, s) __atomic_cas_64(p, e, s) - -#define atomic_add_rel_8(p, v) __atomic_op_8(p, +=, v) -#define atomic_subtract_rel_8(p, v) __atomic_op_8(p, -=, v) -#define atomic_set_rel_8(p, v) __atomic_op_8(p, |=, v) -#define atomic_clear_rel_8(p, v) __atomic_op_8(p, &=, ~v) -#define atomic_store_rel_8(p, v) __atomic_op_8(p, =, v) - -#define atomic_add_rel_16(p, v) __atomic_op_16(p, +=, v) -#define atomic_subtract_rel_16(p, v) __atomic_op_16(p, -=, v) -#define atomic_set_rel_16(p, v) __atomic_op_16(p, |=, v) -#define atomic_clear_rel_16(p, v) __atomic_op_16(p, &=, ~v) -#define atomic_store_rel_16(p, v) __atomic_op_16(p, =, v) - -#define atomic_add_rel_32(p, v) __atomic_op_32(p, +=, v) -#define atomic_subtract_rel_32(p, v) __atomic_op_32(p, -=, v) -#define atomic_set_rel_32(p, v) __atomic_op_32(p, |=, v) -#define atomic_clear_rel_32(p, v) __atomic_op_32(p, &=, ~v) -#define atomic_store_rel_32(p, v) __atomic_op_32(p, =, v) -#define atomic_cmpset_rel_32(p, e, s) __atomic_cas_32(p, e, s) - -#define atomic_add_rel_64(p, v) __atomic_op_64(p, +=, v) -#define atomic_subtract_rel_64(p, v) __atomic_op_64(p, -=, v) -#define atomic_set_rel_64(p, v) __atomic_op_64(p, |=, v) -#define atomic_clear_rel_64(p, v) __atomic_op_64(p, &=, ~v) -#define atomic_store_rel_64(p, v) __atomic_op_64(p, =, v) -#define atomic_cmpset_rel_64(p, e, s) __atomic_cas_64(p, e, s) - -#define atomic_add_char(p, v) __atomic_op_8(p, +=, v) -#define atomic_subtract_char(p, v) __atomic_op_8(p, -=, v) -#define atomic_set_char(p, v) __atomic_op_8(p, |=, v) -#define atomic_clear_char(p, v) __atomic_op_8(p, &=, ~v) -#define atomic_store_char(p, v) __atomic_op_8(p, =, v) - -#define atomic_add_short(p, v) __atomic_op_16(p, +=, v) -#define atomic_subtract_short(p, v) __atomic_op_16(p, -=, v) -#define atomic_set_short(p, v) __atomic_op_16(p, |=, v) -#define atomic_clear_short(p, v) __atomic_op_16(p, &=, ~v) -#define atomic_store_short(p, v) __atomic_op_16(p, =, v) - -#define atomic_add_int(p, v) __atomic_op_32(p, +=, v) -#define atomic_subtract_int(p, v) __atomic_op_32(p, -=, v) -#define atomic_set_int(p, v) __atomic_op_32(p, |=, v) -#define atomic_clear_int(p, v) __atomic_op_32(p, &=, ~v) -#define atomic_store_int(p, v) __atomic_op_32(p, =, v) -#define atomic_load_int(p) __atomic_load_32(p) -#define atomic_readandclear_int(p) __atomic_load_clear_32(p) -#define atomic_cmpset_int(p, e, s) __atomic_cas_32(p, e, s) - -#define atomic_add_long(p, v) __atomic_op_64(p, +=, v) -#define atomic_subtract_long(p, v) __atomic_op_64(p, -=, v) -#define atomic_set_long(p, v) __atomic_op_64(p, |=, v) -#define atomic_clear_long(p, v) __atomic_op_64(p, &=, ~v) -#define atomic_store_long(p, v) __atomic_op_64(p, =, v) -#define atomic_load_long(p) __atomic_load_64(p) -#define atomic_readandclear_long(p) __atomic_load_clear_64(p) -#define atomic_cmpset_long(p, e, s) __atomic_cas_64(p, e, s) - -#define atomic_add_acq_char(p, v) __atomic_op_8(p, +=, v) -#define atomic_subtract_acq_char(p, v) __atomic_op_8(p, -=, v) -#define atomic_set_acq_char(p, v) __atomic_op_8(p, |=, v) -#define atomic_clear_acq_char(p, v) __atomic_op_8(p, &=, ~v) -#define atomic_store_acq_char(p, v) __atomic_op_8(p, =, v) - -#define atomic_add_acq_short(p, v) __atomic_op_16(p, +=, v) -#define atomic_subtract_acq_short(p, v) __atomic_op_16(p, -=, v) -#define atomic_set_acq_short(p, v) __atomic_op_16(p, |=, v) -#define atomic_clear_acq_short(p, v) __atomic_op_16(p, &=, ~v) -#define atomic_store_acq_short(p, v) __atomic_op_16(p, =, v) - -#define atomic_add_acq_int(p, v) __atomic_op_32(p, +=, v) -#define atomic_subtract_acq_int(p, v) __atomic_op_32(p, -=, v) -#define atomic_set_acq_int(p, v) __atomic_op_32(p, |=, v) -#define atomic_clear_acq_int(p, v) __atomic_op_32(p, &=, ~v) -#define atomic_store_acq_int(p, v) __atomic_op_32(p, =, v) -#define atomic_load_acq_int(p) __atomic_load_32(p) -#define atomic_cmpset_acq_int(p, e, s) __atomic_cas_32(p, e, s) - -#define atomic_add_acq_long(p, v) __atomic_op_64(p, +=, v) -#define atomic_subtract_acq_long(p, v) __atomic_op_64(p, -=, v) -#define atomic_set_acq_long(p, v) __atomic_op_64(p, |=, v) -#define atomic_clear_acq_long(p, v) __atomic_op_64(p, &=, ~v) -#define atomic_store_acq_long(p, v) __atomic_op_64(p, =, v) -#define atomic_load_acq_long(p) __atomic_load_64(p) -#define atomic_cmpset_acq_long(p, e, s) __atomic_cas_64(p, e, s) - -#define atomic_add_rel_char(p, v) __atomic_op_8(p, +=, v) -#define atomic_subtract_rel_char(p, v) __atomic_op_8(p, -=, v) -#define atomic_set_rel_char(p, v) __atomic_op_8(p, |=, v) -#define atomic_clear_rel_char(p, v) __atomic_op_8(p, &=, ~v) -#define atomic_store_rel_char(p, v) __atomic_op_8(p, =, v) - -#define atomic_add_rel_short(p, v) __atomic_op_16(p, +=, v) -#define atomic_subtract_rel_short(p, v) __atomic_op_16(p, -=, v) -#define atomic_set_rel_short(p, v) __atomic_op_16(p, |=, v) -#define atomic_clear_rel_short(p, v) __atomic_op_16(p, &=, ~v) -#define atomic_store_rel_short(p, v) __atomic_op_16(p, =, v) - -#define atomic_add_rel_int(p, v) __atomic_op_32(p, +=, v) -#define atomic_subtract_rel_int(p, v) __atomic_op_32(p, -=, v) -#define atomic_set_rel_int(p, v) __atomic_op_32(p, |=, v) -#define atomic_clear_rel_int(p, v) __atomic_op_32(p, &=, ~v) -#define atomic_store_rel_int(p, v) __atomic_op_32(p, =, v) -#define atomic_cmpset_rel_int(p, e, s) __atomic_cas_32(p, e, s) - -#define atomic_add_rel_long(p, v) __atomic_op_64(p, +=, v) -#define atomic_subtract_rel_long(p, v) __atomic_op_64(p, -=, v) -#define atomic_set_rel_long(p, v) __atomic_op_64(p, |=, v) -#define atomic_clear_rel_long(p, v) __atomic_op_64(p, &=, ~v) -#define atomic_store_rel_long(p, v) __atomic_op_64(p, =, v) -#define atomic_cmpset_rel_long(p, e, s) __atomic_cas_64(p, e, s) - -#define atomic_add_char(p, v) __atomic_op_8(p, +=, v) -#define atomic_subtract_char(p, v) __atomic_op_8(p, -=, v) -#define atomic_set_char(p, v) __atomic_op_8(p, |=, v) -#define atomic_clear_char(p, v) __atomic_op_8(p, &=, ~v) -#define atomic_store_char(p, v) __atomic_op_8(p, =, v) - -#define atomic_add_short(p, v) __atomic_op_16(p, +=, v) -#define atomic_subtract_short(p, v) __atomic_op_16(p, -=, v) -#define atomic_set_short(p, v) __atomic_op_16(p, |=, v) -#define atomic_clear_short(p, v) __atomic_op_16(p, &=, ~v) -#define atomic_store_short(p, v) __atomic_op_16(p, =, v) - -#define atomic_add_int(p, v) __atomic_op_32(p, +=, v) -#define atomic_subtract_int(p, v) __atomic_op_32(p, -=, v) -#define atomic_set_int(p, v) __atomic_op_32(p, |=, v) -#define atomic_clear_int(p, v) __atomic_op_32(p, &=, ~v) -#define atomic_store_int(p, v) __atomic_op_32(p, =, v) -#define atomic_load_int(p) __atomic_load_32(p) -#define atomic_readandclear_int(p) __atomic_load_clear_32(p) -#define atomic_cmpset_int(p, e, s) __atomic_cas_32(p, e, s) - -#define atomic_add_long(p, v) __atomic_op_64(p, +=, v) -#define atomic_subtract_long(p, v) __atomic_op_64(p, -=, v) -#define atomic_set_long(p, v) __atomic_op_64(p, |=, v) -#define atomic_clear_long(p, v) __atomic_op_64(p, &=, ~v) -#define atomic_store_long(p, v) __atomic_op_64(p, =, v) -#define atomic_load_long(p) __atomic_load_64(p) -#define atomic_readandclear_long(p) __atomic_load_clear_64(p) -#define atomic_cmpset_long(p, e, s) __atomic_cas_64(p, e, s) - -#define atomic_add_ptr(p, v) __atomic_op_64(p, +=, v) -#define atomic_subtract_ptr(p, v) __atomic_op_64(p, -=, v) -#define atomic_set_ptr(p, v) __atomic_op_64(p, |=, v) -#define atomic_clear_ptr(p, v) __atomic_op_64(p, &=, ~v) -#define atomic_store_ptr(p, v) __atomic_op_64(p, =, v) -#define atomic_load_ptr(p) __atomic_load_64(p) -#define atomic_readandclear_ptr(p) __atomic_load_clear_64(p) -#define atomic_cmpset_ptr(p, e, s) __atomic_cas_64(p, e, s) - -#define atomic_add_acq_char(p, v) __atomic_op_8(p, +=, v) -#define atomic_subtract_acq_char(p, v) __atomic_op_8(p, -=, v) -#define atomic_set_acq_char(p, v) __atomic_op_8(p, |=, v) -#define atomic_clear_acq_char(p, v) __atomic_op_8(p, &=, ~v) -#define atomic_store_acq_char(p, v) __atomic_op_8(p, =, v) - -#define atomic_add_acq_short(p, v) __atomic_op_16(p, +=, v) -#define atomic_subtract_acq_short(p, v) __atomic_op_16(p, -=, v) -#define atomic_set_acq_short(p, v) __atomic_op_16(p, |=, v) -#define atomic_clear_acq_short(p, v) __atomic_op_16(p, &=, ~v) -#define atomic_store_acq_short(p, v) __atomic_op_16(p, =, v) - -#define atomic_add_acq_int(p, v) __atomic_op_32(p, +=, v) -#define atomic_subtract_acq_int(p, v) __atomic_op_32(p, -=, v) -#define atomic_set_acq_int(p, v) __atomic_op_32(p, |=, v) -#define atomic_clear_acq_int(p, v) __atomic_op_32(p, &=, ~v) -#define atomic_store_acq_int(p, v) __atomic_op_32(p, =, v) -#define atomic_load_acq_int(p) __atomic_load_32(p) -#define atomic_cmpset_acq_int(p, e, s) __atomic_cas_32(p, e, s) - -#define atomic_add_acq_long(p, v) __atomic_op_64(p, +=, v) -#define atomic_subtract_acq_long(p, v) __atomic_op_64(p, -=, v) -#define atomic_set_acq_long(p, v) __atomic_op_64(p, |=, v) -#define atomic_clear_acq_long(p, v) __atomic_op_64(p, &=, ~v) -#define atomic_store_acq_long(p, v) __atomic_op_64(p, =, v) -#define atomic_load_acq_long(p) __atomic_load_64(p) -#define atomic_cmpset_acq_long(p, e, s) __atomic_cas_64(p, e, s) - -#define atomic_add_acq_ptr(p, v) __atomic_op_64(p, +=, v) -#define atomic_subtract_acq_ptr(p, v) __atomic_op_64(p, -=, v) -#define atomic_set_acq_ptr(p, v) __atomic_op_64(p, |=, v) -#define atomic_clear_acq_ptr(p, v) __atomic_op_64(p, &=, ~v) -#define atomic_store_acq_ptr(p, v) __atomic_op_64(p, =, v) -#define atomic_load_acq_ptr(p) __atomic_load_64(p) -#define atomic_cmpset_acq_ptr(p, e, s) __atomic_cas_64(p, e, s) - -#define atomic_add_rel_char(p, v) __atomic_op_8(p, +=, v) -#define atomic_subtract_rel_char(p, v) __atomic_op_8(p, -=, v) -#define atomic_set_rel_char(p, v) __atomic_op_8(p, |=, v) -#define atomic_clear_rel_char(p, v) __atomic_op_8(p, &=, ~v) -#define atomic_store_rel_char(p, v) __atomic_op_8(p, =, v) - -#define atomic_add_rel_short(p, v) __atomic_op_16(p, +=, v) -#define atomic_subtract_rel_short(p, v) __atomic_op_16(p, -=, v) -#define atomic_set_rel_short(p, v) __atomic_op_16(p, |=, v) -#define atomic_clear_rel_short(p, v) __atomic_op_16(p, &=, ~v) -#define atomic_store_rel_short(p, v) __atomic_op_16(p, =, v) - -#define atomic_add_rel_int(p, v) __atomic_op_32(p, +=, v) -#define atomic_subtract_rel_int(p, v) __atomic_op_32(p, -=, v) -#define atomic_set_rel_int(p, v) __atomic_op_32(p, |=, v) -#define atomic_clear_rel_int(p, v) __atomic_op_32(p, &=, ~v) -#define atomic_store_rel_int(p, v) __atomic_op_32(p, =, v) -#define atomic_cmpset_rel_int(p, e, s) __atomic_cas_32(p, e, s) - -#define atomic_add_rel_long(p, v) __atomic_op_64(p, +=, v) -#define atomic_subtract_rel_long(p, v) __atomic_op_64(p, -=, v) -#define atomic_set_rel_long(p, v) __atomic_op_64(p, |=, v) -#define atomic_clear_rel_long(p, v) __atomic_op_64(p, &=, ~v) -#define atomic_store_rel_long(p, v) __atomic_op_64(p, =, v) -#define atomic_cmpset_rel_long(p, e, s) __atomic_cas_64(p, e, s) - -#define atomic_add_rel_ptr(p, v) __atomic_op_64(p, +=, v) -#define atomic_subtract_rel_ptr(p, v) __atomic_op_64(p, -=, v) -#define atomic_set_rel_ptr(p, v) __atomic_op_64(p, |=, v) -#define atomic_clear_rel_ptr(p, v) __atomic_op_64(p, &=, ~v) -#define atomic_store_rel_ptr(p, v) __atomic_op_64(p, =, v) -#define atomic_cmpset_rel_ptr(p, e, s) __atomic_cas_64(p, e, s) + return (temp); +} #endif /* !_MACHINE_ATOMIC_H_ */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 19 7:46:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 363B237B481; Tue, 19 Nov 2002 07:46:13 -0800 (PST) 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 C640237B406 for ; Tue, 19 Nov 2002 07:46:12 -0800 (PST) Received: from mail.speakeasy.net (mail16.speakeasy.net [216.254.0.216]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1053D43E3B for ; Tue, 19 Nov 2002 07:46:12 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 4929 invoked from network); 19 Nov 2002 15:46:13 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail16.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 19 Nov 2002 15:46:13 -0000 Received: from laptop.baldwin.cx (laptop.baldwin.cx [192.168.0.4]) by server.baldwin.cx (8.12.6/8.12.6) with ESMTP id gAJFk22D030798; Tue, 19 Nov 2002 10:46:02 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200211190735.gAJ7ZMDS059613@repoman.freebsd.org> Date: Tue, 19 Nov 2002 10:46:07 -0500 (EST) From: John Baldwin To: Juli Mallett Subject: RE: PERFORCE change 21259 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 19-Nov-2002 Juli Mallett wrote: > http://perforce.freebsd.org/chv.cgi?CH=21259 > > Change 21259 by jmallett@jmallett_luna on 2002/11/18 23:35:03 > > Too much unatomic clutter. Fill in atomic_set_{int,long}, as > they're the basis for most everything else, and other stuff can > be added as it's actually needed. Uh, you do know that atomic_set are actually OR-operations, not assignment. Right? Also, your operations do not look atomic as it seems to be a three instruction sequence of load/modify/store. Imagine an interrupt coming in in between the load and store. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 19 10:24:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 888FA37B404; Tue, 19 Nov 2002 10:24:23 -0800 (PST) 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 1F1DF37B401 for ; Tue, 19 Nov 2002 10:24:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3A6043E6E for ; Tue, 19 Nov 2002 10:24:22 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAJILOmV099820 for ; Tue, 19 Nov 2002 10:21:24 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAJILNr0099815 for perforce@freebsd.org; Tue, 19 Nov 2002 10:21:23 -0800 (PST) Date: Tue, 19 Nov 2002 10:21:23 -0800 (PST) Message-Id: <200211191821.gAJILNr0099815@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21263 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21263 Change 21263 by jmallett@jmallett_luna on 2002/11/19 10:21:08 atomic_set is an or operating, from jhb. Affected files ... .. //depot/projects/mips/sys/mips/include/atomic.h#3 edit Differences ... ==== //depot/projects/mips/sys/mips/include/atomic.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ __asm __volatile ( "ll %[temp], %[p]\n\t" - "move %[temp], %[val]\n\t" + "or %[temp], %[temp], %[val]\n\t" "sc %[temp], %[p]\n\t" : [val] "=r"(val) : [temp] "r"(temp), [p] "r"(p) @@ -51,7 +51,7 @@ __asm __volatile ( "lld %[temp], %[p]\n\t" - "move %[temp], %[val]\n\t" + "or %[temp], %[temp], %[val]\n\t" "scd %[temp], %[p]\n\t" : [val] "=r"(val) : [temp] "r"(temp), [p] "r"(p) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 19 11:33:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97A7037B401; Tue, 19 Nov 2002 11:32:47 -0800 (PST) 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 07AB637B401 for ; Tue, 19 Nov 2002 11:32:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC2F843E6E for ; Tue, 19 Nov 2002 11:32:45 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAJJTlmV004095 for ; Tue, 19 Nov 2002 11:29:47 -0800 (PST) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAJJTkKX004092 for perforce@freebsd.org; Tue, 19 Nov 2002 11:29:46 -0800 (PST) Date: Tue, 19 Nov 2002 11:29:46 -0800 (PST) Message-Id: <200211191929.gAJJTkKX004092@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett Subject: PERFORCE change 21264 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21264 Change 21264 by jmallett@jmallett_dalek on 2002/11/19 11:29:00 IFC. Affected files ... .. //depot/projects/mips/gnu/usr.bin/man/Makefile#2 integrate .. //depot/projects/mips/gnu/usr.bin/man/makewhatis/Makefile#2 delete .. //depot/projects/mips/gnu/usr.bin/man/makewhatis/makewhatis.1#2 delete .. //depot/projects/mips/gnu/usr.bin/man/makewhatis/makewhatis.local.8#2 delete .. //depot/projects/mips/gnu/usr.bin/man/makewhatis/makewhatis.local.sh#2 delete .. //depot/projects/mips/gnu/usr.bin/man/makewhatis/makewhatis.perl#2 delete .. //depot/projects/mips/include/Makefile#8 integrate .. //depot/projects/mips/lib/libc/Makefile#3 integrate .. //depot/projects/mips/lib/libc/Makefile.inc#3 delete .. //depot/projects/mips/lib/libc/alpha/gen/Makefile.inc#3 integrate .. //depot/projects/mips/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/db/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/db/btree/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/db/db/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/db/hash/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/db/man/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/db/mpool/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/db/recno/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/gen/Makefile.inc#4 integrate .. //depot/projects/mips/lib/libc/gmon/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/i386/sys/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/locale/Makefile.inc#3 integrate .. //depot/projects/mips/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/nls/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/posix1e/Makefile.inc#4 integrate .. //depot/projects/mips/lib/libc/quad/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/regex/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/rpc/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/sparc64/fpu/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/stdio/Makefile.inc#3 integrate .. //depot/projects/mips/lib/libc/stdlib/Makefile.inc#3 integrate .. //depot/projects/mips/lib/libc/stdtime/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/string/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/sys/Makefile.inc#3 integrate .. //depot/projects/mips/lib/libc/uuid/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/uuid/uuid.h#2 delete .. //depot/projects/mips/lib/libc/xdr/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libc/yp/Makefile.inc#2 integrate .. //depot/projects/mips/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 integrate .. //depot/projects/mips/libexec/rtld-elf/alpha/reloc.c#2 integrate .. //depot/projects/mips/libexec/rtld-elf/alpha/rtld_machdep.h#2 integrate .. //depot/projects/mips/libexec/rtld-elf/i386/reloc.c#2 integrate .. //depot/projects/mips/libexec/rtld-elf/i386/rtld_machdep.h#2 integrate .. //depot/projects/mips/libexec/rtld-elf/ia64/reloc.c#2 integrate .. //depot/projects/mips/libexec/rtld-elf/ia64/rtld_machdep.h#2 integrate .. //depot/projects/mips/libexec/rtld-elf/rtld.c#4 integrate .. //depot/projects/mips/libexec/rtld-elf/sparc64/reloc.c#2 integrate .. //depot/projects/mips/libexec/rtld-elf/sparc64/rtld_machdep.h#3 integrate .. //depot/projects/mips/libexec/rtld-elf/sparc64/rtld_start.S#2 integrate .. //depot/projects/mips/release/Makefile#9 integrate .. //depot/projects/mips/release/ia64/boot_crunch.conf#3 integrate .. //depot/projects/mips/release/pc98/drivers.conf#5 integrate .. //depot/projects/mips/sbin/devd/devd.8#3 integrate .. //depot/projects/mips/sbin/devd/devd.conf#2 integrate .. //depot/projects/mips/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/mips/sbin/disklabel/disklabel.c#3 integrate .. //depot/projects/mips/sbin/gbde/gbde.8#3 integrate .. //depot/projects/mips/share/man/man7/release.7#4 integrate .. //depot/projects/mips/share/man/man9/zone.9#2 integrate .. //depot/projects/mips/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/mips/sys/conf/options#9 integrate .. //depot/projects/mips/sys/conf/options.alpha#5 integrate .. //depot/projects/mips/sys/conf/options.i386#5 integrate .. //depot/projects/mips/sys/conf/options.ia64#6 integrate .. //depot/projects/mips/sys/conf/options.pc98#5 integrate .. //depot/projects/mips/sys/conf/options.powerpc#4 integrate .. //depot/projects/mips/sys/conf/options.sparc64#4 integrate .. //depot/projects/mips/sys/conf/options.x86_64#5 integrate .. //depot/projects/mips/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/mips/sys/dev/sab/sab.c#3 integrate .. //depot/projects/mips/sys/kern/kern_clock.c#3 integrate .. //depot/projects/mips/sys/kern/kern_fork.c#5 integrate .. //depot/projects/mips/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/mips/sys/kern/kern_thread.c#6 integrate .. //depot/projects/mips/sys/net/bpf.c#4 integrate .. //depot/projects/mips/sys/netinet/ip_input.c#6 integrate .. //depot/projects/mips/sys/sparc64/sparc64/autoconf.c#2 integrate .. //depot/projects/mips/sys/sys/kse.h#2 integrate .. //depot/projects/mips/sys/sys/proc.h#7 integrate .. //depot/projects/mips/sys/vm/swap_pager.c#3 integrate .. //depot/projects/mips/sys/vm/uma_core.c#6 integrate .. //depot/projects/mips/sys/vm/vm_object.c#7 integrate .. //depot/projects/mips/sys/vm/vm_page.c#9 integrate .. //depot/projects/mips/sys/vm/vm_page.h#5 integrate .. //depot/projects/mips/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/mips/tools/KSE/ksetest/kse_asm.S#2 integrate .. //depot/projects/mips/usr.bin/calendar/calendar.1#2 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/calendar.all#2 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/calendar.holiday#4 integrate .. //depot/projects/mips/usr.bin/calendar/calendars/calendar.southafrica#1 branch .. //depot/projects/mips/usr.bin/makewhatis/Makefile#2 integrate .. //depot/projects/mips/usr.sbin/sysinstall/index.c#2 integrate .. //depot/projects/mips/usr.sbin/sysinstall/install.c#5 integrate Differences ... ==== //depot/projects/mips/gnu/usr.bin/man/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# Master Makefile for man, manpath, apropos, whatis, and makewhatis +# Master Makefile for man, manpath, apropos, and whatis # # You may distribute under the terms of the GNU General Public # License as specified in the README file that comes with the man 1.0 # distribution. # -# $FreeBSD: src/gnu/usr.bin/man/Makefile,v 1.5 2002/05/18 19:47:57 markm Exp $ +# $FreeBSD: src/gnu/usr.bin/man/Makefile,v 1.6 2002/11/18 10:25:27 ru Exp $ # SUBDIR = lib man manpath apropos ==== //depot/projects/mips/include/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.185 2002/10/24 15:25:37 rwatson Exp $ +# $FreeBSD: src/include/Makefile,v 1.186 2002/11/18 07:34:56 marcel Exp $ # # Doing a make install builds /usr/include # @@ -9,20 +9,16 @@ CLEANFILES= osreldate.h version vers.c SUBDIR= arpa protocols rpcsvc rpc INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h db.h \ - dirent.h \ - dlfcn.h elf.h elf-hints.h err.h fnmatch.h fmtmsg.h fstab.h \ - fts.h getopt.h glob.h grp.h \ - hesiod.h histedit.h ieeefp.h ifaddrs.h inttypes.h iso646.h kenv.h \ - langinfo.h \ - libgen.h limits.h link.h locale.h malloc.h memory.h monetary.h mpool.h \ - ndbm.h netconfig.h netdb.h nl_types.h nlist.h nsswitch.h objformat.h \ - paths.h pthread.h pthread_np.h pwd.h \ - ranlib.h readpassphrase.h regex.h regexp.h resolv.h rune.h runetype.h \ - search.h setjmp.h sgtty.h \ - signal.h stab.h stdbool.h stddef.h stdio.h stdlib.h strhash.h \ - string.h stringlist.h strings.h sysexits.h tar.h time.h timeconv.h \ - timers.h ttyent.h ulimit.h unistd.h utime.h utmp.h vis.h wchar.h \ - wctype.h + dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ + fts.h getopt.h glob.h grp.h hesiod.h histedit.h ieeefp.h ifaddrs.h \ + inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ + locale.h malloc.h memory.h monetary.h mpool.h ndbm.h netconfig.h \ + netdb.h nl_types.h nlist.h nsswitch.h objformat.h paths.h pthread.h \ + pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \ + resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \ + stdbool.h stddef.h stdio.h stdlib.h strhash.h string.h stringlist.h \ + strings.h sysexits.h tar.h time.h timeconv.h timers.h ttyent.h \ + ulimit.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h MHDRS= float.h floatingpoint.h stdarg.h varargs.h ==== //depot/projects/mips/lib/libc/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.36 2002/10/11 22:38:16 peter Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.37 2002/11/18 09:50:54 ru Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -16,10 +16,65 @@ INSTALL_PIC_ARCHIVE= yes PRECIOUSLIB= yes +# Define (empty) variables so that make doesn't give substitution +# errors if the included makefiles don't change these: +MDSRCS= +MISRCS= +MDASM= +MIASM= +NOASM= + # -# Include make rules that are shared with libc_r. +# If there is a machine dependent makefile, use it: # -.include "${.CURDIR}/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" +.endif + +.include "${.CURDIR}/db/Makefile.inc" +.include "${.CURDIR}/compat-43/Makefile.inc" +.include "${.CURDIR}/gen/Makefile.inc" +.if ${MACHINE_ARCH} != "powerpc" +.include "${.CURDIR}/gmon/Makefile.inc" +.endif +.include "${.CURDIR}/locale/Makefile.inc" +.include "${.CURDIR}/net/Makefile.inc" +.include "${.CURDIR}/nls/Makefile.inc" +.include "${.CURDIR}/posix1e/Makefile.inc" +.if !defined(NO_QUAD) +.include "${.CURDIR}/quad/Makefile.inc" +.endif +.include "${.CURDIR}/regex/Makefile.inc" +.include "${.CURDIR}/stdio/Makefile.inc" +.include "${.CURDIR}/stdlib/Makefile.inc" +.include "${.CURDIR}/stdtime/Makefile.inc" +.include "${.CURDIR}/string/Makefile.inc" +.include "${.CURDIR}/sys/Makefile.inc" +.include "${.CURDIR}/rpc/Makefile.inc" +.include "${.CURDIR}/uuid/Makefile.inc" +.include "${.CURDIR}/xdr/Makefile.inc" +.if !defined(NO_YP_LIBC) +CFLAGS+= -DYP +.include "${.CURDIR}/yp/Makefile.inc" +.endif +.if !defined(NO_HESIOD_LIBC) +CFLAGS+= -DHESIOD +.endif + +# If there are no machine dependent sources, append all the +# machine-independent sources: +.if empty(MDSRCS) +SRCS+= ${MISRCS} +.else +# Append machine-dependent sources, then append machine-independent sources +# for which there is no machine-dependent variant. +SRCS+= ${MDSRCS} +.for _src in ${MISRCS} +.if ${MDSRCS:R:M${_src:R}} == "" +SRCS+= ${_src} +.endif +.endfor +.endif KQSRCS= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \ lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \ ==== //depot/projects/mips/lib/libc/alpha/gen/Makefile.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.10 2002/11/16 06:39:10 deischen Exp $ +# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $ SRCS+= _setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \ @@ -14,34 +14,34 @@ CLEANFILES+= __remqu.S __remq.S __remlu.S __reml.S -__divqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divqu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divqu -DOP=div -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divq.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divq -DOP=div -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divlu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divlu -DOP=div -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__divl.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divl.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divl -DOP=div -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__remqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__remqu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remqu -DOP=rem -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__remq.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remq -DOP=rem -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__remlu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remlu -DOP=rem -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__reml.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__reml.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__reml -DOP=rem -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} ==== //depot/projects/mips/lib/libc/compat-43/Makefile.inc#2 (text+ko) ==== @@ -1,13 +1,12 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/2/93 -# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.11 2001/03/27 17:26:46 ru Exp $ +# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.12 2002/11/18 09:50:54 ru Exp $ # compat-43 sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/compat-43 ${.CURDIR}/../libc/compat-43 +.PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43 SRCS+= creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \ setrgid.c setruid.c sigcompat.c -.if ${LIB} == "c" MAN+= creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2 MAN+= gethostid.3 setruid.3 @@ -16,4 +15,3 @@ MLINKS+=sigsetmask.2 sigblock.2 MLINKS+=sigsetmask.2 sigmask.2 -.endif ==== //depot/projects/mips/lib/libc/db/Makefile.inc#2 (text+ko) ==== @@ -1,11 +1,11 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 2/21/94 -# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.3 1999/08/27 23:58:15 peter Exp $ +# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ # CFLAGS+=-D__DBINTERFACE_PRIVATE -.include "${.CURDIR}/../libc/db/btree/Makefile.inc" -.include "${.CURDIR}/../libc/db/db/Makefile.inc" -.include "${.CURDIR}/../libc/db/hash/Makefile.inc" -.include "${.CURDIR}/../libc/db/man/Makefile.inc" -.include "${.CURDIR}/../libc/db/mpool/Makefile.inc" -.include "${.CURDIR}/../libc/db/recno/Makefile.inc" +.include "${.CURDIR}/db/btree/Makefile.inc" +.include "${.CURDIR}/db/db/Makefile.inc" +.include "${.CURDIR}/db/hash/Makefile.inc" +.include "${.CURDIR}/db/man/Makefile.inc" +.include "${.CURDIR}/db/mpool/Makefile.inc" +.include "${.CURDIR}/db/recno/Makefile.inc" ==== //depot/projects/mips/lib/libc/db/btree/Makefile.inc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 7/14/94 -# $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.3 1999/08/27 23:58:16 peter Exp $ +# $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/btree +.PATH: ${.CURDIR}/db/btree SRCS+= bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \ bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \ ==== //depot/projects/mips/lib/libc/db/db/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.3 1999/08/27 23:58:17 peter Exp $ +# $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/db +.PATH: ${.CURDIR}/db/db SRCS+= db.c ==== //depot/projects/mips/lib/libc/db/hash/Makefile.inc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.4 2001/05/15 07:08:17 ru Exp $ +# $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.5 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/hash +.PATH: ${.CURDIR}/db/hash SRCS+= hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \ hash_page.c ndbm.c ==== //depot/projects/mips/lib/libc/db/man/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,8 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.10 2001/03/27 17:26:46 ru Exp $ +# $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/man +.PATH: ${.CURDIR}/db/man -.if ${LIB} == "c" MAN+= btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3 MLINKS+= dbm.3 dbm_clearerr.3 @@ -17,4 +16,3 @@ MLINKS+= dbm.3 dbm_open.3 MLINKS+= dbm.3 dbm_store.3 MLINKS+= dbopen.3 db.3 -.endif ==== //depot/projects/mips/lib/libc/db/mpool/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.3 1999/08/27 23:58:23 peter Exp $ +# $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/mpool +.PATH: ${.CURDIR}/db/mpool SRCS+= mpool.c ==== //depot/projects/mips/lib/libc/db/recno/Makefile.inc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.3 1999/08/27 23:58:25 peter Exp $ +# $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/recno +.PATH: ${.CURDIR}/db/recno SRCS+= rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \ rec_seq.c rec_utils.c ==== //depot/projects/mips/lib/libc/gen/Makefile.inc#4 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.97 2002/10/28 00:15:43 wollman Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.98 2002/11/18 09:50:55 ru Exp $ # machine-independent gen sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen +.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen SRCS+= __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ alarm.c arc4random.c assert.c basename.c check_utility_compat.c \ @@ -32,11 +32,10 @@ valloc.c vis.c wait.c wait3.c waitpid.c # machine-dependent gen sources -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc" .endif -.if ${LIB} == "c" MAN+= alarm.3 arc4random.3 \ basename.3 check_utility_compat.3 clock.3 \ confstr.3 ctermid.3 daemon.3 \ @@ -132,4 +131,3 @@ MLINKS+=tzset.3 tzsetwall.3 MLINKS+=unvis.3 strunvis.3 unvis.3 strunvisx.3 MLINKS+=vis.3 strvis.3 vis.3 strvisx.3 -.endif ==== //depot/projects/mips/lib/libc/gmon/Makefile.inc#2 (text+ko) ==== @@ -1,16 +1,14 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.8 2001/03/27 17:26:47 ru Exp $ +# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.9 2002/11/18 09:50:55 ru Exp $ # gmon sources -.PATH: ${.CURDIR}/../libc/gmon +.PATH: ${.CURDIR}/gmon SRCS+= gmon.c mcount.c -.if ${LIB} == "c" MAN+= moncontrol.3 MLINKS+=moncontrol.3 monstartup.3 -.endif # mcount cannot be compiled with profiling mcount.po: mcount.o ==== //depot/projects/mips/lib/libc/i386/sys/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.24 2002/05/23 23:51:57 jake Exp $ +# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.25 2002/11/18 09:50:55 ru Exp $ SRCS+= i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \ i386_set_ldt.c i386_set_watch.c i386_vm86.c @@ -14,11 +14,9 @@ PSEUDO= _getlogin.o _exit.o -.if ${LIB} == "c" MAN+= i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2 MAN+= i386_set_watch.3 MLINKS+=i386_get_ioperm.2 i386_set_ioperm.2 MLINKS+=i386_get_ldt.2 i386_set_ldt.2 MLINKS+=i386_set_watch.3 i386_clr_watch.3 -.endif ==== //depot/projects/mips/lib/libc/locale/Makefile.inc#3 (text+ko) ==== @@ -1,8 +1,8 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.41 2002/10/10 22:56:18 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.42 2002/11/18 09:50:55 ru Exp $ # locale sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale +.PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale SRCS+= big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \ isctype.c iswctype.c \ @@ -18,7 +18,6 @@ wcstoul.c wcstoull.c wcstoumax.c wctob.c wctomb.c wctrans.c wctype.c \ wcwidth.c -.if ${LIB} == "c" MAN+= btowc.3 \ ctype.3 digittoint.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \ isdigit.3 isgraph.3 islower.3 isprint.3 ispunct.3 isspace.3 \ @@ -55,4 +54,3 @@ wcstol.3 wcstoimax.3 wcstol.3 wcstoumax.3 MLINKS+=wctrans.3 towctrans.3 MLINKS+=wctype.3 iswctype.3 -.endif ==== //depot/projects/mips/lib/libc/net/Makefile.inc#2 (text+ko) ==== @@ -1,8 +1,8 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.44 2002/07/15 19:58:56 ume Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.45 2002/11/18 09:50:55 ru Exp $ # machine-independent net sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net ${.CURDIR}/../libc/net +.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c getaddrinfo.c \ gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \ @@ -37,11 +37,10 @@ sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET} # machine-dependent net sources -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc" .endif -.if ${LIB} == "c" MAN+= addr2ascii.3 byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 \ getifaddrs.3 getipnodebyname.3 \ getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 hesiod.3 \ @@ -100,4 +99,3 @@ resolver.3 res_search.3 resolver.3 res_send.3 resolver.3 dn_skipname.3 \ resolver.3 ns_get16.3 resolver.3 ns_get32.3 \ resolver.3 ns_put16.3 resolver.3 ns_put32.3 -.endif ==== //depot/projects/mips/lib/libc/nls/Makefile.inc#2 (text+ko) ==== @@ -1,10 +1,8 @@ # from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $ -# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.7 2001/03/27 17:26:48 ru Exp $ +# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.8 2002/11/18 09:50:55 ru Exp $ -.PATH: ${.CURDIR}/../libc/nls +.PATH: ${.CURDIR}/nls SRCS+= msgcat.c -.if ${LIB} == "c" MAN+= catclose.3 catgets.3 catopen.3 -.endif ==== //depot/projects/mips/lib/libc/posix1e/Makefile.inc#4 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.12 2002/11/06 03:38:47 rwatson Exp $ +# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.13 2002/11/18 09:50:56 ru Exp $ MAINTAINER= rwatson@FreeBSD.org -.PATH: ${.CURDIR}/../libc/posix1e +.PATH: ${.CURDIR}/posix1e SRCS+= acl_calc_mask.c \ acl_copy.c \ @@ -24,8 +24,6 @@ mac_get.c \ mac_set.c -.if ${LIB} == "c" - MAN+= acl.3 \ acl_add_perm.3 \ acl_calc_mask.3 \ @@ -81,5 +79,3 @@ mac_set.3 mac_set_proc.3 \ mac_text.3 mac_from_text.3 \ mac_text.3 mac_to_text.3 - -.endif ==== //depot/projects/mips/lib/libc/quad/Makefile.inc#2 (text+ko) ==== @@ -1,8 +1,8 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/quad/Makefile.inc,v 1.8 1999/08/28 00:00:27 peter Exp $ +# $FreeBSD: src/lib/libc/quad/Makefile.inc,v 1.9 2002/11/18 09:50:56 ru Exp $ # Quad support, if needed -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/quad ${.CURDIR}/../libc/quad +.PATH: ${.CURDIR}/${MACHINE_ARCH}/quad ${.CURDIR}/quad .if ${MACHINE_ARCH} == "i386" ==== //depot/projects/mips/lib/libc/regex/Makefile.inc#2 (text+ko) ==== @@ -1,17 +1,15 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/regex/Makefile.inc,v 1.6 2001/03/27 17:26:51 ru Exp $ +# $FreeBSD: src/lib/libc/regex/Makefile.inc,v 1.7 2002/11/18 09:50:56 ru Exp $ # regex sources -.PATH: ${.CURDIR}/../libc/regex +.PATH: ${.CURDIR}/regex CFLAGS+=-DPOSIX_MISTAKE SRCS+= regcomp.c regerror.c regexec.c regfree.c -.if ${LIB} == "c" MAN+= regex.3 MAN+= re_format.7 MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3 MLINKS+=regexec.3 regfree.3 -.endif ==== //depot/projects/mips/lib/libc/rpc/Makefile.inc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # @(#)Makefile 5.11 (Berkeley) 9/6/90 -# $FreeBSD: src/lib/libc/rpc/Makefile.inc,v 1.23 2002/08/19 23:06:00 bde Exp $ +# $FreeBSD: src/lib/libc/rpc/Makefile.inc,v 1.24 2002/11/18 09:50:56 ru Exp $ -.PATH: ${.CURDIR}/../libc/rpc ${.CURDIR}/. +.PATH: ${.CURDIR}/rpc ${.CURDIR}/. SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \ ==== //depot/projects/mips/lib/libc/sparc64/fpu/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/lib/libc/sparc64/fpu/Makefile.inc,v 1.4 2002/05/06 23:24:16 obrien Exp $ +# $FreeBSD: src/lib/libc/sparc64/fpu/Makefile.inc,v 1.5 2002/11/18 09:50:56 ru Exp $ -.PATH: ${.CURDIR}/../libc/sparc64/fpu +.PATH: ${.CURDIR}/sparc64/fpu CFLAGS+= -I${.CURDIR}/sparc64/sys ==== //depot/projects/mips/lib/libc/stdio/Makefile.inc#3 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile.inc 8.3 (Berkeley) 4/17/94 -# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.27 2002/11/04 03:23:56 alfred Exp $ +# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.28 2002/11/18 09:50:56 ru Exp $ # stdio sources -.PATH: ${.CURDIR}/../libc/stdio +.PATH: ${.CURDIR}/stdio SRCS+= _flock_stub.c asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c \ fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c fgetws.c \ @@ -21,7 +21,6 @@ vswprintf.c vswscanf.c vwprintf.c vwscanf.c wbuf.c wprintf.c wscanf.c \ wsetup.c -.if ${LIB} == "c" MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetws.3 fopen.3 fputs.3 \ fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 getwc.3 mktemp.3 \ printf.3 putc.3 putwc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 \ @@ -54,4 +53,3 @@ wprintf.3 vwprintf.3 wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3 MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vwscanf.3 \ wscanf.3 vswscanf.3 wscanf.3 vfwscanf.3 -.endif ==== //depot/projects/mips/lib/libc/stdlib/Makefile.inc#3 (text+ko) ==== @@ -1,8 +1,8 @@ # from @(#)Makefile.inc 8.3 (Berkeley) 2/4/95 -# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.40 2002/10/16 14:29:22 robert Exp $ +# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.41 2002/11/18 09:50:56 ru Exp $ # machine-independent stdlib sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib ${.CURDIR}/../libc/stdlib +.PATH: ${.CURDIR}/${MACHINE_ARCH}/stdlib ${.CURDIR}/stdlib MISRCS+=_Exit.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ bsearch.c calloc.c div.c exit.c getenv.c getopt.c getopt_long.c \ @@ -14,11 +14,10 @@ system.c tdelete.c tfind.c tsearch.c twalk.c # machine-dependent stdlib sources -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/stdlib/Makefile.inc" .endif -.if ${LIB} == "c" MAN+= abort.3 abs.3 alloca.3 atexit.3 atof.3 atoi.3 atol.3 bsearch.3 \ div.3 exit.3 getenv.3 getopt.3 getopt_long.3 getsubopt.3 hcreate.3 \ imaxabs.3 imaxdiv.3 insque.3 labs.3 ldiv.3 llabs.3 lldiv.3 \ @@ -39,4 +38,3 @@ MLINKS+=strtoul.3 strtoull.3 strtoul.3 strtouq.3 strtoul.3 strtoumax.3 MLINKS+=malloc.3 calloc.3 malloc.3 free.3 malloc.3 realloc.3 malloc.3 reallocf.3 MLINKS+=tsearch.3 tdelete.3 tsearch.3 tfind.3 tsearch.3 twalk.3 -.endif ==== //depot/projects/mips/lib/libc/stdtime/Makefile.inc#2 (text+ko) ==== @@ -1,12 +1,11 @@ # Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp -# $FreeBSD: src/lib/libc/stdtime/Makefile.inc,v 1.13 2001/10/28 19:54:49 dillon Exp $ +# $FreeBSD: src/lib/libc/stdtime/Makefile.inc,v 1.14 2002/11/18 09:50:56 ru Exp $ -.PATH: ${.CURDIR}/../libc/stdtime ${.CURDIR}/../locale +.PATH: ${.CURDIR}/stdtime ${.CURDIR}/../locale SRCS+= asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \ time32.c -.if ${LIB} == "c" MAN+= ctime.3 strftime.3 strptime.3 time2posix.3 MAN+= tzfile.5 @@ -15,4 +14,3 @@ ctime.3 ctime_r.3 ctime.3 localtime_r.3 ctime.3 gmtime_r.3 \ ctime.3 asctime_r.3 MLINKS+=time2posix.3 posix2time.3 -.endif ==== //depot/projects/mips/lib/libc/string/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.31 2002/10/04 03:18:26 tjr Exp $ +# $FreeBSD: src/lib/libc/string/Makefile.inc,v 1.32 2002/11/18 09:50:56 ru Exp $ -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/string ${.CURDIR}/../libc/string +.PATH: ${.CURDIR}/${MACHINE_ARCH}/string ${.CURDIR}/string -CFLAGS+= -I${.CURDIR}/../libc/locale +CFLAGS+= -I${.CURDIR}/locale # machine-independent string sources MISRCS+=bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \ @@ -21,11 +21,10 @@ # machine-dependent string sources -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/string/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/string/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/string/Makefile.inc" .endif -.if ${LIB} == "c" MAN+= bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \ memcmp.3 memcpy.3 memmove.3 memset.3 rindex.3 strcasecmp.3 strcat.3 \ strchr.3 strcmp.3 strcoll.3 strcpy.3 strcspn.3 strdup.3 strerror.3 \ @@ -54,4 +53,3 @@ wmemchr.3 wcsncpy.3 wmemchr.3 wcspbrk.3 \ wmemchr.3 wcsrchr.3 wmemchr.3 wcsspn.3 \ wmemchr.3 wcsstr.3 -.endif ==== //depot/projects/mips/lib/libc/sys/Makefile.inc#3 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 -# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.97 2002/10/08 17:43:40 archie Exp $ +# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.98 2002/11/18 09:50:57 ru Exp $ # sys sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/sys ${.CURDIR}/../libc/sys +.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys # Include the generated makefile containing the *complete* list # of syscall names in MIASM. @@ -13,8 +13,8 @@ # MDASM names override the default syscall names in MIASM. # NOASM will prevent the default syscall code from being generated. # -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/sys/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/sys/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/sys/Makefile.inc" .endif # Sources common to both syscall interfaces: @@ -53,7 +53,6 @@ printf '#include "SYS.h"\nPSEUDO(${.PREFIX:S/_//})\n' \ > ${.TARGET} -.if ${LIB} == "c" MAN+= _exit.2 accept.2 access.2 acct.2 adjtime.2 \ aio_cancel.2 aio_error.2 aio_read.2 aio_return.2 \ aio_suspend.2 aio_waitcomplete.2 aio_write.2 \ @@ -142,4 +141,3 @@ MLINKS+=sched_setparam.2 sched_getparam.2 MLINKS+=sched_setscheduler.2 sched_getscheduler.2 .endif -.endif ==== //depot/projects/mips/lib/libc/uuid/Makefile.inc#2 (text+ko) ==== @@ -1,15 +1,12 @@ -# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.1 2002/10/30 03:51:00 marcel Exp $ +# $FreeBSD: src/lib/libc/uuid/Makefile.inc,v 1.3 2002/11/18 09:50:57 ru Exp $ # DCE 1.1 UUID implementation sources -.PATH: ${.CURDIR}/../libc/uuid +.PATH: ${.CURDIR}/uuid SRCS+= uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \ uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_to_string.c -INCS+= uuid.h - -.if ${LIB} == "c" MAN+= uuid.3 MLINKS+=uuid.3 uuid_compare.3 MLINKS+=uuid.3 uuid_create.3 @@ -19,4 +16,3 @@ MLINKS+=uuid.3 uuid_hash.3 MLINKS+=uuid.3 uuid_is_nil.3 MLINKS+=uuid.3 uuid_to_string.3 -.endif ==== //depot/projects/mips/lib/libc/xdr/Makefile.inc#2 (text+ko) ==== @@ -1,11 +1,10 @@ # @(#)Makefile 5.11 (Berkeley) 9/6/90 -# $FreeBSD: src/lib/libc/xdr/Makefile.inc,v 1.13 2002/08/15 12:31:01 bde Exp $ +# $FreeBSD: src/lib/libc/xdr/Makefile.inc,v 1.14 2002/11/18 09:50:57 ru Exp $ -.PATH: ${.CURDIR}/../libc/xdr ${.CURDIR}/. +.PATH: ${.CURDIR}/xdr ${.CURDIR}/. SRCS+= xdr.c xdr_array.c xdr_float.c xdr_mem.c \ xdr_rec.c xdr_reference.c xdr_stdio.c -.if ${LIB} == "c" MAN+= xdr.3 MLINKS+= rpc_xdr.3 xdr_accepted_reply.3 \ @@ -47,4 +46,3 @@ xdr.3 xdr_vector.3 \ xdr.3 xdr_void.3 \ xdr.3 xdr_wrapstring.3 -.endif ==== //depot/projects/mips/lib/libc/yp/Makefile.inc#2 (text+ko) ==== @@ -1,8 +1,8 @@ # from: @(#)Makefile.inc 5.3 (Berkeley) 2/20/91 -# $FreeBSD: src/lib/libc/yp/Makefile.inc,v 1.8 1999/08/28 00:02:58 peter Exp $ +# $FreeBSD: src/lib/libc/yp/Makefile.inc,v 1.9 2002/11/18 09:50:57 ru Exp $ # yp sources -.PATH: ${.CURDIR}/../libc/yp +.PATH: ${.CURDIR}/yp SRCS+= xdryp.c yp.h yp_xdr.c yplib.c CLEANFILES+= yp.h yp_xdr.c ==== //depot/projects/mips/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/thr_enter_uts.S,v 1.1 2002/10/30 06:07:18 mini Exp $"); +__FBSDID("$FreeBSD: src/lib/libpthread/arch/i386/i386/thr_enter_uts.S,v 1.2 2002/11/18 02:02:08 davidxu Exp $"); /* * Where do we define these? @@ -36,9 +36,9 @@ #define MC_LEN_OFFSET 80 /* offset to mc_len from mcontext */ #define MC_FP_CW_OFFSET 96 /* offset to FP control word */ #define MC_OWNEDFP_OFFSET 88 /* offset to mc_ownedfp from mcontext */ -#define KM_STACK_SP_OFFSET 32 /* offset to km_stack.ss_sp */ -#define KM_STACK_SIZE_OFFSET 36 /* offset to km_stack.ss_sp */ -#define KM_FUNC_OFFSET 28 /* offset to km_func */ +#define KM_STACK_SP_OFFSET 36 /* offset to km_stack.ss_sp */ +#define KM_STACK_SIZE_OFFSET 40 /* offset to km_stack.ss_sp */ +#define KM_FUNC_OFFSET 32 /* offset to km_func */ /* * int _thread_enter_uts(kse_thr_mailbox *tm, kse_mailbox *km); ==== //depot/projects/mips/libexec/rtld-elf/alpha/reloc.c#2 (text+ko) ==== @@ -22,7 +22,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/libexec/rtld-elf/alpha/reloc.c,v 1.16 2002/06/18 05:42:33 dillon Exp $ + * $FreeBSD: src/libexec/rtld-elf/alpha/reloc.c,v 1.17 2002/11/18 22:08:49 tmm Exp $ */ /* @@ -252,7 +252,7 @@ return -1; reloc_jmpslot(where, (Elf_Addr)(defobj->relocbase + def->st_value), - defobj); + defobj, obj, rel); } } else { const Elf_Rela *relalim; @@ -272,7 +272,7 @@ return -1; reloc_jmpslot(where, (Elf_Addr)(defobj->relocbase + def->st_value), - defobj); + defobj, obj, (Elf_Rel *)rela); } } obj->jmpslots_done = true; @@ -281,7 +281,8 @@ /* Fixup the jump slot at "where" to transfer control to "target". */ Elf_Addr -reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const Obj_Entry *obj) +reloc_jmpslot(Elf_Addr *where, Elf_Addr target, const Obj_Entry *obj, + const Obj_Entry *refobj, const Elf_Rel *rel) { Elf_Addr stubaddr; ==== //depot/projects/mips/libexec/rtld-elf/alpha/rtld_machdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/alpha/rtld_machdep.h,v 1.7 2002/02/18 02:24:10 peter Exp $ + * $FreeBSD: src/libexec/rtld-elf/alpha/rtld_machdep.h,v 1.8 2002/11/18 22:08:49 tmm Exp $ */ #ifndef RTLD_MACHDEP_H @@ -35,7 +35,9 @@ #define rtld_dynamic(obj) (&_DYNAMIC) Elf_Addr reloc_jmpslot(Elf_Addr *, Elf_Addr, - const struct Struct_Obj_Entry *obj); + const struct Struct_Obj_Entry *, + const struct Struct_Obj_Entry *, + const Elf_Rel *); #define make_function_pointer(def, defobj) \ ((defobj)->relocbase + (def)->st_value) ==== //depot/projects/mips/libexec/rtld-elf/i386/reloc.c#2 (text+ko) ==== @@ -22,7 +22,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/libexec/rtld-elf/i386/reloc.c,v 1.10 2002/06/10 21:15:50 dillon Exp $ + * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.11 2002/11/18 22:08:49 tmm Exp $ */ /* @@ -259,7 +259,7 @@ if (def == NULL) return -1; target = (Elf_Addr)(defobj->relocbase + def->st_value); - reloc_jmpslot(where, target, defobj); + reloc_jmpslot(where, target, defobj, obj, rel); } obj->jmpslots_done = true; return 0; ==== //depot/projects/mips/libexec/rtld-elf/i386/rtld_machdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/i386/rtld_machdep.h,v 1.7 2002/06/24 23:19:18 jdp Exp $ + * $FreeBSD: src/libexec/rtld-elf/i386/rtld_machdep.h,v 1.8 2002/11/18 22:08:49 tmm Exp $ */ #ifndef RTLD_MACHDEP_H >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 19 20:31:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66FB537B404; Tue, 19 Nov 2002 20:31:50 -0800 (PST) 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 F2EE237B401 for ; Tue, 19 Nov 2002 20:31:49 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9706443E4A for ; Tue, 19 Nov 2002 20:31:49 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAK4SmmV037003 for ; Tue, 19 Nov 2002 20:28:48 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAK4SmFQ036993 for perforce@freebsd.org; Tue, 19 Nov 2002 20:28:48 -0800 (PST) Date: Tue, 19 Nov 2002 20:28:48 -0800 (PST) Message-Id: <200211200428.gAK4SmFQ036993@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 Subject: PERFORCE change 21280 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21280 Change 21280 by rwatson@rwatson_tislabs on 2002/11/19 20:27:51 Fix nroff syntax. Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.8#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/inetd/inetd.8#8 (text+ko) ==== @@ -84,7 +84,7 @@ .It Fl L Ar class Specify an alternative class to use as the default login class for a daemon; by default, inetd will use the user class specified in the -.Xr 5 master.passwd +.Xr master.passwd 5 file. .It Fl w Turn on TCP Wrapping for external services. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 20 16:42: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A11137B404; Wed, 20 Nov 2002 16:41:38 -0800 (PST) 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 A0F6337B401 for ; Wed, 20 Nov 2002 16:41:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5551843E88 for ; Wed, 20 Nov 2002 16:41:36 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAL0cVmV016764 for ; Wed, 20 Nov 2002 16:38:31 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAL0cTv7016761 for perforce@freebsd.org; Wed, 20 Nov 2002 16:38:29 -0800 (PST) Date: Wed, 20 Nov 2002 16:38:29 -0800 (PST) Message-Id: <200211210038.gAL0cTv7016761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21320 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21320 Change 21320 by peter@peter_daintree on 2002/11/20 16:37:32 IFC @21318 Affected files ... .. //depot/projects/hammer/etc/mtree/BSD.usr.dist#4 integrate .. //depot/projects/hammer/etc/periodic/security/700.kernelmsg#4 integrate .. //depot/projects/hammer/etc/periodic/security/security.functions#2 integrate .. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#4 integrate .. //depot/projects/hammer/games/fortune/datfiles/startrek#2 integrate .. //depot/projects/hammer/gnu/usr.bin/man/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/man/makewhatis/Makefile#2 delete .. //depot/projects/hammer/gnu/usr.bin/man/makewhatis/makewhatis.1#3 delete .. //depot/projects/hammer/gnu/usr.bin/man/makewhatis/makewhatis.local.8#2 delete .. //depot/projects/hammer/gnu/usr.bin/man/makewhatis/makewhatis.local.sh#2 delete .. //depot/projects/hammer/gnu/usr.bin/man/makewhatis/makewhatis.perl#2 delete .. //depot/projects/hammer/include/Makefile#7 integrate .. //depot/projects/hammer/include/uuid.h#1 branch .. //depot/projects/hammer/kerberos5/usr.bin/krb5-config/Makefile#4 integrate .. //depot/projects/hammer/lib/libc/Makefile#4 integrate .. //depot/projects/hammer/lib/libc/Makefile.inc#3 delete .. //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/alpha/gen/makecontext.c#2 integrate .. //depot/projects/hammer/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/db/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/db/btree/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/db/db/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/db/hash/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/db/man/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/db/mpool/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/db/recno/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/gen/sysconf.c#4 integrate .. //depot/projects/hammer/lib/libc/gmon/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/i386/gen/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/i386/sys/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/ia64/gen/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/nls/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libc/quad/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/regex/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/rpc/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/sparc64/fpu/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#6 integrate .. //depot/projects/hammer/lib/libc/stdlib/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/stdtime/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/string/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#5 integrate .. //depot/projects/hammer/lib/libc/sys/select.2#2 integrate .. //depot/projects/hammer/lib/libc/uuid/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc/uuid/uuid.h#2 delete .. //depot/projects/hammer/lib/libc/xdr/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libc/yp/Makefile.inc#2 integrate .. //depot/projects/hammer/lib/libc_r/arch/ia64/_atomic_lock.S#2 integrate .. //depot/projects/hammer/lib/libdisk/disk.c#7 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate .. //depot/projects/hammer/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#3 integrate .. //depot/projects/hammer/lib/libutil/logout.c#2 integrate .. //depot/projects/hammer/lib/libutil/logwtmp.c#2 integrate .. //depot/projects/hammer/libexec/ftpd/logwtmp.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/alpha/reloc.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/alpha/rtld_machdep.h#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/i386/rtld_machdep.h#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/ia64/reloc.c#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/ia64/rtld_machdep.h#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/sparc64/reloc.c#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/sparc64/rtld_machdep.h#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/sparc64/rtld_start.S#2 integrate .. //depot/projects/hammer/release/Makefile#9 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#5 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#4 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#8 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/sparc64/article.sgml#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#10 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/Makefile#2 integrate .. //depot/projects/hammer/release/doc/ja_JP.eucJP/early-adopter/Makefile#1 branch .. //depot/projects/hammer/release/doc/ja_JP.eucJP/early-adopter/article.sgml#1 branch .. //depot/projects/hammer/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#2 integrate .. //depot/projects/hammer/release/ia64/boot_crunch.conf#3 integrate .. //depot/projects/hammer/release/pc98/drivers.conf#4 integrate .. //depot/projects/hammer/release/picobsd/mfs_tree/etc/rc#2 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#5 integrate .. //depot/projects/hammer/sbin/devd/devd.8#3 integrate .. //depot/projects/hammer/sbin/devd/devd.conf#2 integrate .. //depot/projects/hammer/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/hammer/sbin/disklabel/disklabel.c#6 integrate .. //depot/projects/hammer/sbin/dumpfs/dumpfs.c#5 integrate .. //depot/projects/hammer/sbin/gbde/gbde.8#3 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#5 integrate .. //depot/projects/hammer/sbin/quotacheck/quotacheck.c#3 integrate .. //depot/projects/hammer/share/man/man4/ng_bluetooth.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_bt3c.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_btsocket.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_h4.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_hci.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_l2cap.4#1 branch .. //depot/projects/hammer/share/man/man4/ng_ubt.4#1 branch .. //depot/projects/hammer/share/man/man7/release.7#4 integrate .. //depot/projects/hammer/share/man/man9/Makefile#5 integrate .. //depot/projects/hammer/share/man/man9/mac_biba.9#1 branch .. //depot/projects/hammer/share/man/man9/zone.9#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/machdep.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#8 integrate .. //depot/projects/hammer/sys/alpha/include/cpu.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/fpu.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/signal.h#4 integrate .. //depot/projects/hammer/sys/alpha/include/ucontext.h#3 integrate .. //depot/projects/hammer/sys/conf/files#11 integrate .. //depot/projects/hammer/sys/conf/options#10 integrate .. //depot/projects/hammer/sys/conf/options.alpha#4 integrate .. //depot/projects/hammer/sys/conf/options.i386#4 integrate .. //depot/projects/hammer/sys/conf/options.ia64#4 integrate .. //depot/projects/hammer/sys/conf/options.pc98#5 integrate .. //depot/projects/hammer/sys/conf/options.powerpc#3 integrate .. //depot/projects/hammer/sys/conf/options.sparc64#2 integrate .. //depot/projects/hammer/sys/conf/options.x86_64#4 integrate .. //depot/projects/hammer/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/hammer/sys/dev/pcic/i82365.c#3 integrate .. //depot/projects/hammer/sys/dev/sab/sab.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_dump.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#7 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/hammer/sys/i386/include/signal.h#5 integrate .. //depot/projects/hammer/sys/i386/include/ucontext.h#5 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#7 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_proto.h#4 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_syscall.h#4 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_sysent.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia32/syscalls.master#7 integrate .. //depot/projects/hammer/sys/ia64/ia64/clock.c#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/hammer/sys/ia64/include/_types.h#2 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_context.c#1 branch .. //depot/projects/hammer/sys/kern/kern_exec.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_linker.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#13 integrate .. //depot/projects/hammer/sys/kern/link_elf.c#8 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#9 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#9 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#9 integrate .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bluetooth/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/bt3c/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/h4/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/hci/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/l2cap/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/socket/Makefile#1 branch .. //depot/projects/hammer/sys/modules/netgraph/bluetooth/ubt/Makefile#1 branch .. //depot/projects/hammer/sys/net/bpf.c#7 integrate .. //depot/projects/hammer/sys/net/if.c#4 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/hammer/sys/net/raw_cb.c#2 integrate .. //depot/projects/hammer/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/hammer/sys/net/route.c#2 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/common/ng_bluetooth.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/TODO#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/TODO#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/TODO#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_cmds.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_evnt.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_main.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_misc.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_prse.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/hci/ng_hci_var.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_bluetooth.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_bt3c.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_h4.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_hci.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_l2cap.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_ubt.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/TODO#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/TODO#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#1 branch .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#1 branch .. //depot/projects/hammer/sys/netinet/igmp.c#3 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#6 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#6 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.c#6 integrate .. //depot/projects/hammer/sys/netinet/ip_mroute.h#2 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#7 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#5 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#6 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_lock.c#3 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#8 integrate .. //depot/projects/hammer/sys/pc98/pc98/fd.c#5 integrate .. //depot/projects/hammer/sys/posix4/ksched.c#4 integrate .. //depot/projects/hammer/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/hammer/sys/posix4/posix4.h#3 integrate .. //depot/projects/hammer/sys/posix4/posix4_mib.c#4 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/machdep.c#6 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/autoconf.c#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mp_machdep.c#4 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/hammer/sys/sys/kse.h#5 integrate .. //depot/projects/hammer/sys/sys/mac.h#7 integrate .. //depot/projects/hammer/sys/sys/mac_policy.h#7 integrate .. //depot/projects/hammer/sys/sys/proc.h#11 integrate .. //depot/projects/hammer/sys/sys/select.h#4 integrate .. //depot/projects/hammer/sys/sys/syscall.h#9 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#9 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#9 integrate .. //depot/projects/hammer/sys/sys/ucontext.h#5 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#6 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#7 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#5 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#7 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#5 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#6 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#6 integrate .. //depot/projects/hammer/tools/KSE/ksetest/kse_asm.S#4 integrate .. //depot/projects/hammer/usr.bin/bluetooth/Makefile#1 branch .. //depot/projects/hammer/usr.bin/bluetooth/btsockstat/Makefile#1 branch .. //depot/projects/hammer/usr.bin/bluetooth/btsockstat/btsockstat.1#1 branch .. //depot/projects/hammer/usr.bin/bluetooth/btsockstat/btsockstat.c#1 branch .. //depot/projects/hammer/usr.bin/calendar/calendar.1#3 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.all#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.holiday#4 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.southafrica#1 branch .. //depot/projects/hammer/usr.bin/makewhatis/Makefile#2 integrate .. //depot/projects/hammer/usr.bin/makewhatis/makewhatis.local.8#1 branch .. //depot/projects/hammer/usr.bin/makewhatis/makewhatis.local.sh#1 branch .. //depot/projects/hammer/usr.bin/telnet/commands.c#4 integrate .. //depot/projects/hammer/usr.bin/who/who.c#2 integrate .. //depot/projects/hammer/usr.bin/xinstall/xinstall.c#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/bt3cfw.8#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/bt3cfw.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/hccontrol.8#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/hccontrol.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/hccontrol.h#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/info.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/link_control.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/link_policy.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/node.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/send_recv.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/status.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hccontrol/util.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.8#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/l2control/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2cap.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2control.8#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2control.c#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/l2control/l2control.h#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/l2ping.8#1 branch .. //depot/projects/hammer/usr.sbin/bluetooth/l2ping/l2ping.c#1 branch .. //depot/projects/hammer/usr.sbin/ntp/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ntp/Makefile.inc#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/physical.c#3 integrate .. //depot/projects/hammer/usr.sbin/pppd/auth.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#6 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/index.c#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#6 integrate Differences ... ==== //depot/projects/hammer/etc/mtree/BSD.usr.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.268 2002/10/25 22:00:34 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.269 2002/11/15 18:44:09 ru Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -96,8 +96,6 @@ .. 13.rcs .. - 14.sccs - .. 15.yacc .. 16.lex ==== //depot/projects/hammer/etc/periodic/security/700.kernelmsg#4 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.6 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.7 2002/11/16 14:57:12 thomas Exp $ # # Show kernel log messages @@ -44,7 +44,7 @@ case "$daily_status_security_kernelmsg_enable" in [Yy][Ee][Ss]) - dmesg 2>/dev/null > ${TMP} | + dmesg 2>/dev/null | check_diff new_only dmesg - "${host} kernel log messages:" rc=$?;; *) rc=0;; ==== //depot/projects/hammer/etc/periodic/security/security.functions#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/security.functions,v 1.1 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/security.functions,v 1.2 2002/11/16 14:58:39 thomas Exp $ # # @@ -63,7 +63,7 @@ cp ${tmpf} ${LOG}/${label}.today || rc=3 fi - if ! cmp ${LOG}/${label}.today ${tmpf} >/dev/null; then + if ! cmp -s ${LOG}/${label}.today ${tmpf} >/dev/null; then [ $rc -lt 1 ] && rc=1 echo "" echo "${msg}" ==== //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#4 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.28 2002/10/20 13:41:44 tom Exp $ +$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.29 2002/11/16 13:24:44 joerg Exp $ % Having trouble using fetch through a firewall? Try setting the environment variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details. @@ -44,7 +44,7 @@ % You can disable tcsh's terminal beep if you `set nobeep'. % -If you `set watch (0 any any)' in tcsh, you will be notified when +If you `set watch = (0 any any)' in tcsh, you will be notified when someone logs in or out of your system. % Nice tcsh prompt: set prompt = '%m %# ' ==== //depot/projects/hammer/games/fortune/datfiles/startrek#2 (text+ko) ==== @@ -1,3 +1,4 @@ +%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.2 2002/11/17 09:53:11 schweikh Exp $ A father doesn't destroy his children. -- Lt. Carolyn Palamas, "Who Mourns for Adonais?", stardate 3468.1. @@ -628,7 +629,7 @@ -- Bailey, "The Corbomite Maneuver", stardate 1514.2 % "We have the right to survive!" -"Not be killing others." +"Not by killing others." -- Deela and Kirk, "Wink of An Eye", stardate 5710.5 % We Klingons believe as you do -- the sick should die. Only the strong ==== //depot/projects/hammer/gnu/usr.bin/man/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# Master Makefile for man, manpath, apropos, whatis, and makewhatis +# Master Makefile for man, manpath, apropos, and whatis # # You may distribute under the terms of the GNU General Public # License as specified in the README file that comes with the man 1.0 # distribution. # -# $FreeBSD: src/gnu/usr.bin/man/Makefile,v 1.5 2002/05/18 19:47:57 markm Exp $ +# $FreeBSD: src/gnu/usr.bin/man/Makefile,v 1.6 2002/11/18 10:25:27 ru Exp $ # SUBDIR = lib man manpath apropos ==== //depot/projects/hammer/include/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.185 2002/10/24 15:25:37 rwatson Exp $ +# $FreeBSD: src/include/Makefile,v 1.186 2002/11/18 07:34:56 marcel Exp $ # # Doing a make install builds /usr/include # @@ -9,20 +9,16 @@ CLEANFILES= osreldate.h version vers.c SUBDIR= arpa protocols rpcsvc rpc INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h db.h \ - dirent.h \ - dlfcn.h elf.h elf-hints.h err.h fnmatch.h fmtmsg.h fstab.h \ - fts.h getopt.h glob.h grp.h \ - hesiod.h histedit.h ieeefp.h ifaddrs.h inttypes.h iso646.h kenv.h \ - langinfo.h \ - libgen.h limits.h link.h locale.h malloc.h memory.h monetary.h mpool.h \ - ndbm.h netconfig.h netdb.h nl_types.h nlist.h nsswitch.h objformat.h \ - paths.h pthread.h pthread_np.h pwd.h \ - ranlib.h readpassphrase.h regex.h regexp.h resolv.h rune.h runetype.h \ - search.h setjmp.h sgtty.h \ - signal.h stab.h stdbool.h stddef.h stdio.h stdlib.h strhash.h \ - string.h stringlist.h strings.h sysexits.h tar.h time.h timeconv.h \ - timers.h ttyent.h ulimit.h unistd.h utime.h utmp.h vis.h wchar.h \ - wctype.h + dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ + fts.h getopt.h glob.h grp.h hesiod.h histedit.h ieeefp.h ifaddrs.h \ + inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ + locale.h malloc.h memory.h monetary.h mpool.h ndbm.h netconfig.h \ + netdb.h nl_types.h nlist.h nsswitch.h objformat.h paths.h pthread.h \ + pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \ + resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \ + stdbool.h stddef.h stdio.h stdlib.h strhash.h string.h stringlist.h \ + strings.h sysexits.h tar.h time.h timeconv.h timers.h ttyent.h \ + ulimit.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h MHDRS= float.h floatingpoint.h stdarg.h varargs.h ==== //depot/projects/hammer/kerberos5/usr.bin/krb5-config/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.7 2002/09/19 12:59:18 nectar Exp $ +# $FreeBSD: src/kerberos5/usr.bin/krb5-config/Makefile,v 1.8 2002/11/16 02:23:17 nectar Exp $ SCRIPTS= krb5-config MAN= krb5-config.1 @@ -15,6 +15,7 @@ -e "s,@LIB_dbopen\@,,g" \ -e "s,@LIB_des_appl\@,-lcrypto,g" \ -e "s,@LIBS\@,-lcom_err,g" \ + -e "s,@INCLUDE_des@,,g" \ ${.ALLSRC} > ${.TARGET} chmod +x ${.TARGET} ==== //depot/projects/hammer/lib/libc/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.36 2002/10/11 22:38:16 peter Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.37 2002/11/18 09:50:54 ru Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -16,10 +16,65 @@ INSTALL_PIC_ARCHIVE= yes PRECIOUSLIB= yes +# Define (empty) variables so that make doesn't give substitution +# errors if the included makefiles don't change these: +MDSRCS= +MISRCS= +MDASM= +MIASM= +NOASM= + # -# Include make rules that are shared with libc_r. +# If there is a machine dependent makefile, use it: # -.include "${.CURDIR}/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" +.endif + +.include "${.CURDIR}/db/Makefile.inc" +.include "${.CURDIR}/compat-43/Makefile.inc" +.include "${.CURDIR}/gen/Makefile.inc" +.if ${MACHINE_ARCH} != "powerpc" +.include "${.CURDIR}/gmon/Makefile.inc" +.endif +.include "${.CURDIR}/locale/Makefile.inc" +.include "${.CURDIR}/net/Makefile.inc" +.include "${.CURDIR}/nls/Makefile.inc" +.include "${.CURDIR}/posix1e/Makefile.inc" +.if !defined(NO_QUAD) +.include "${.CURDIR}/quad/Makefile.inc" +.endif +.include "${.CURDIR}/regex/Makefile.inc" +.include "${.CURDIR}/stdio/Makefile.inc" +.include "${.CURDIR}/stdlib/Makefile.inc" +.include "${.CURDIR}/stdtime/Makefile.inc" +.include "${.CURDIR}/string/Makefile.inc" +.include "${.CURDIR}/sys/Makefile.inc" +.include "${.CURDIR}/rpc/Makefile.inc" +.include "${.CURDIR}/uuid/Makefile.inc" +.include "${.CURDIR}/xdr/Makefile.inc" +.if !defined(NO_YP_LIBC) +CFLAGS+= -DYP +.include "${.CURDIR}/yp/Makefile.inc" +.endif +.if !defined(NO_HESIOD_LIBC) +CFLAGS+= -DHESIOD +.endif + +# If there are no machine dependent sources, append all the +# machine-independent sources: +.if empty(MDSRCS) +SRCS+= ${MISRCS} +.else +# Append machine-dependent sources, then append machine-independent sources +# for which there is no machine-dependent variant. +SRCS+= ${MDSRCS} +.for _src in ${MISRCS} +.if ${MDSRCS:R:M${_src:R}} == "" +SRCS+= ${_src} +.endif +.endfor +.endif KQSRCS= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \ lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \ ==== //depot/projects/hammer/lib/libc/alpha/gen/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.9 2002/03/21 06:45:32 peter Exp $ +# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $ SRCS+= _setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \ @@ -8,40 +8,40 @@ SRCS+= __divqu.S __divq.S __divlu.S __divl.S SRCS+= __remqu.S __remq.S __remlu.S __reml.S SRCS+= rfork_thread.S -SRCS+= _ctx_start.S getcontext.S makecontext.c swapcontext.c +SRCS+= _ctx_start.S makecontext.c CLEANFILES+= __divqu.S __divq.S __divlu.S __divl.S CLEANFILES+= __remqu.S __remq.S __remlu.S __reml.S -__divqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divqu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divqu -DOP=div -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divq.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divq -DOP=div -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divlu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divlu -DOP=div -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__divl.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divl.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divl -DOP=div -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__remqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__remqu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remqu -DOP=rem -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__remq.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remq -DOP=rem -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__remlu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remlu -DOP=rem -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__reml.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__reml.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__reml -DOP=rem -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} ==== //depot/projects/hammer/lib/libc/alpha/gen/makecontext.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/makecontext.c,v 1.1 2002/01/10 02:40:53 deischen Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/alpha/gen/makecontext.c,v 1.2 2002/11/16 06:39:10 deischen Exp $"); #include #include @@ -90,7 +90,7 @@ * Make sure the context is valid. For now, we only allow * trapframe format contexts to be used for makecontext. */ - else if (ucp->uc_mcontext.mc_format == __UC_REV0_SIGFRAME) { + else if (ucp->uc_mcontext.mc_format == _MC_REV0_SIGFRAME) { /* * Alpha passes the first 6 parameters in registers and * remaining parameters on the stack. Set up the context ==== //depot/projects/hammer/lib/libc/compat-43/Makefile.inc#2 (text+ko) ==== @@ -1,13 +1,12 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/2/93 -# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.11 2001/03/27 17:26:46 ru Exp $ +# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.12 2002/11/18 09:50:54 ru Exp $ # compat-43 sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/compat-43 ${.CURDIR}/../libc/compat-43 +.PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43 SRCS+= creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \ setrgid.c setruid.c sigcompat.c -.if ${LIB} == "c" MAN+= creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2 MAN+= gethostid.3 setruid.3 @@ -16,4 +15,3 @@ MLINKS+=sigsetmask.2 sigblock.2 MLINKS+=sigsetmask.2 sigmask.2 -.endif ==== //depot/projects/hammer/lib/libc/db/Makefile.inc#2 (text+ko) ==== @@ -1,11 +1,11 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 2/21/94 -# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.3 1999/08/27 23:58:15 peter Exp $ +# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ # CFLAGS+=-D__DBINTERFACE_PRIVATE -.include "${.CURDIR}/../libc/db/btree/Makefile.inc" -.include "${.CURDIR}/../libc/db/db/Makefile.inc" -.include "${.CURDIR}/../libc/db/hash/Makefile.inc" -.include "${.CURDIR}/../libc/db/man/Makefile.inc" -.include "${.CURDIR}/../libc/db/mpool/Makefile.inc" -.include "${.CURDIR}/../libc/db/recno/Makefile.inc" +.include "${.CURDIR}/db/btree/Makefile.inc" +.include "${.CURDIR}/db/db/Makefile.inc" +.include "${.CURDIR}/db/hash/Makefile.inc" +.include "${.CURDIR}/db/man/Makefile.inc" +.include "${.CURDIR}/db/mpool/Makefile.inc" +.include "${.CURDIR}/db/recno/Makefile.inc" ==== //depot/projects/hammer/lib/libc/db/btree/Makefile.inc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 7/14/94 -# $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.3 1999/08/27 23:58:16 peter Exp $ +# $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/btree +.PATH: ${.CURDIR}/db/btree SRCS+= bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \ bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \ ==== //depot/projects/hammer/lib/libc/db/db/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.3 1999/08/27 23:58:17 peter Exp $ +# $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/db +.PATH: ${.CURDIR}/db/db SRCS+= db.c ==== //depot/projects/hammer/lib/libc/db/hash/Makefile.inc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.4 2001/05/15 07:08:17 ru Exp $ +# $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.5 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/hash +.PATH: ${.CURDIR}/db/hash SRCS+= hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \ hash_page.c ndbm.c ==== //depot/projects/hammer/lib/libc/db/man/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,8 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.10 2001/03/27 17:26:46 ru Exp $ +# $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/man +.PATH: ${.CURDIR}/db/man -.if ${LIB} == "c" MAN+= btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3 MLINKS+= dbm.3 dbm_clearerr.3 @@ -17,4 +16,3 @@ MLINKS+= dbm.3 dbm_open.3 MLINKS+= dbm.3 dbm_store.3 MLINKS+= dbopen.3 db.3 -.endif ==== //depot/projects/hammer/lib/libc/db/mpool/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.3 1999/08/27 23:58:23 peter Exp $ +# $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/mpool +.PATH: ${.CURDIR}/db/mpool SRCS+= mpool.c ==== //depot/projects/hammer/lib/libc/db/recno/Makefile.inc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.3 1999/08/27 23:58:25 peter Exp $ +# $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/recno +.PATH: ${.CURDIR}/db/recno SRCS+= rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \ rec_seq.c rec_utils.c ==== //depot/projects/hammer/lib/libc/gen/Makefile.inc#5 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.97 2002/10/28 00:15:43 wollman Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.98 2002/11/18 09:50:55 ru Exp $ # machine-independent gen sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen +.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen SRCS+= __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ alarm.c arc4random.c assert.c basename.c check_utility_compat.c \ @@ -32,11 +32,10 @@ valloc.c vis.c wait.c wait3.c waitpid.c # machine-dependent gen sources -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc" .endif -.if ${LIB} == "c" MAN+= alarm.3 arc4random.3 \ basename.3 check_utility_compat.3 clock.3 \ confstr.3 ctermid.3 daemon.3 \ @@ -132,4 +131,3 @@ MLINKS+=tzset.3 tzsetwall.3 MLINKS+=unvis.3 strunvis.3 unvis.3 strunvisx.3 MLINKS+=vis.3 strvis.3 vis.3 strvisx.3 -.endif ==== //depot/projects/hammer/lib/libc/gen/sysconf.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)sysconf.c 8.2 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.17 2002/10/27 18:03:02 wollman Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.20 2002/11/17 08:54:29 dougb Exp $"); #include #include @@ -256,15 +256,15 @@ case _SC_AIO_LISTIO_MAX: mib[0] = CTL_P1003_1B; mib[1] = CTL_P1003_1B_AIO_LISTIO_MAX; - goto yesno; + break; case _SC_AIO_MAX: mib[0] = CTL_P1003_1B; mib[1] = CTL_P1003_1B_AIO_MAX; - goto yesno; + break; case _SC_AIO_PRIO_DELTA_MAX: mib[0] = CTL_P1003_1B; mib[1] = CTL_P1003_1B_AIO_PRIO_DELTA_MAX; - goto yesno; + break; case _SC_DELAYTIMER_MAX: mib[0] = CTL_P1003_1B; mib[1] = CTL_P1003_1B_DELAYTIMER_MAX; ==== //depot/projects/hammer/lib/libc/gmon/Makefile.inc#2 (text+ko) ==== @@ -1,16 +1,14 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.8 2001/03/27 17:26:47 ru Exp $ +# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.9 2002/11/18 09:50:55 ru Exp $ # gmon sources -.PATH: ${.CURDIR}/../libc/gmon +.PATH: ${.CURDIR}/gmon SRCS+= gmon.c mcount.c -.if ${LIB} == "c" MAN+= moncontrol.3 MLINKS+=moncontrol.3 monstartup.3 -.endif # mcount cannot be compiled with profiling mcount.po: mcount.o ==== //depot/projects/hammer/lib/libc/i386/gen/Makefile.inc#3 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.17 2002/09/17 19:43:53 bde Exp $ +# $FreeBSD: src/lib/libc/i386/gen/Makefile.inc,v 1.18 2002/11/16 06:39:11 deischen Exp $ -SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.S frexp.c getcontext.S \ +SRCS+= _ctx_start.S _setjmp.S alloca.S fabs.S frexp.c \ infinity.c isinf.c ldexp.c makecontext.c modf.S \ - rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S swapcontext.c + rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S ==== //depot/projects/hammer/lib/libc/i386/sys/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.24 2002/05/23 23:51:57 jake Exp $ +# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.25 2002/11/18 09:50:55 ru Exp $ SRCS+= i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \ i386_set_ldt.c i386_set_watch.c i386_vm86.c @@ -14,11 +14,9 @@ PSEUDO= _getlogin.o _exit.o -.if ${LIB} == "c" MAN+= i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2 MAN+= i386_set_watch.3 MLINKS+=i386_get_ioperm.2 i386_set_ioperm.2 MLINKS+=i386_get_ldt.2 i386_set_ldt.2 MLINKS+=i386_set_watch.3 i386_clr_watch.3 -.endif ==== //depot/projects/hammer/lib/libc/ia64/gen/Makefile.inc#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.4 2002/04/13 04:06:34 marcel Exp $ +# $FreeBSD: src/lib/libc/ia64/gen/Makefile.inc,v 1.5 2002/11/16 01:41:33 marcel Exp $ -SRCS+= _setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S -SRCS+= sigsetjmp.S fpsetmask.c fpgetmask.c -SRCS+= __divdi3.S __divsi3.S __moddi3.S __modsi3.S -SRCS+= __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S -SRCS+= __divdf3.S __divsf3.S +SRCS+= __divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \ + __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _setjmp.S fabs.S \ + fpgetmask.c fpsetmask.c frexp.c infinity.c isinf.c ldexp.c modf.c \ + setjmp.S sigsetjmp.S # The following may go away if function _Unwind_FindTableEntry() # will be part of GCC. ==== //depot/projects/hammer/lib/libc/locale/Makefile.inc#7 (text+ko) ==== @@ -1,8 +1,8 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.41 2002/10/10 22:56:18 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.42 2002/11/18 09:50:55 ru Exp $ # locale sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale +.PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale SRCS+= big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \ isctype.c iswctype.c \ @@ -18,7 +18,6 @@ wcstoul.c wcstoull.c wcstoumax.c wctob.c wctomb.c wctrans.c wctype.c \ wcwidth.c -.if ${LIB} == "c" MAN+= btowc.3 \ ctype.3 digittoint.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \ isdigit.3 isgraph.3 islower.3 isprint.3 ispunct.3 isspace.3 \ @@ -55,4 +54,3 @@ wcstol.3 wcstoimax.3 wcstol.3 wcstoumax.3 MLINKS+=wctrans.3 towctrans.3 MLINKS+=wctype.3 iswctype.3 -.endif ==== //depot/projects/hammer/lib/libc/net/Makefile.inc#2 (text+ko) ==== @@ -1,8 +1,8 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.44 2002/07/15 19:58:56 ume Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.45 2002/11/18 09:50:55 ru Exp $ # machine-independent net sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net ${.CURDIR}/../libc/net +.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c getaddrinfo.c \ gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \ @@ -37,11 +37,10 @@ sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET} # machine-dependent net sources -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc" .endif -.if ${LIB} == "c" MAN+= addr2ascii.3 byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 \ getifaddrs.3 getipnodebyname.3 \ getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 hesiod.3 \ @@ -100,4 +99,3 @@ resolver.3 res_search.3 resolver.3 res_send.3 resolver.3 dn_skipname.3 \ resolver.3 ns_get16.3 resolver.3 ns_get32.3 \ resolver.3 ns_put16.3 resolver.3 ns_put32.3 -.endif ==== //depot/projects/hammer/lib/libc/nls/Makefile.inc#2 (text+ko) ==== @@ -1,10 +1,8 @@ # from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $ -# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.7 2001/03/27 17:26:48 ru Exp $ +# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.8 2002/11/18 09:50:55 ru Exp $ -.PATH: ${.CURDIR}/../libc/nls +.PATH: ${.CURDIR}/nls SRCS+= msgcat.c -.if ${LIB} == "c" MAN+= catclose.3 catgets.3 catopen.3 -.endif ==== //depot/projects/hammer/lib/libc/posix1e/Makefile.inc#4 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.12 2002/11/06 03:38:47 rwatson Exp $ +# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.13 2002/11/18 09:50:56 ru Exp $ MAINTAINER= rwatson@FreeBSD.org -.PATH: ${.CURDIR}/../libc/posix1e >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 20 16:42:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8962E37B401; Wed, 20 Nov 2002 16:42:39 -0800 (PST) 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 206C937B404 for ; Wed, 20 Nov 2002 16:42:39 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68D5C43E8A for ; Wed, 20 Nov 2002 16:42:38 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAL0dXmV016844 for ; Wed, 20 Nov 2002 16:39:33 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAL0dW4r016841 for perforce@freebsd.org; Wed, 20 Nov 2002 16:39:32 -0800 (PST) Date: Wed, 20 Nov 2002 16:39:32 -0800 (PST) Message-Id: <200211210039.gAL0dW4r016841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21321 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21321 Change 21321 by peter@peter_daintree on 2002/11/20 16:38:48 integ i386_hammer branch Affected files ... .. //depot/projects/hammer/libexec/rtld-elf/x86_64/reloc.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/x86_64/rtld_machdep.h#2 integrate .. //depot/projects/hammer/sys/x86_64/include/signal.h#6 integrate .. //depot/projects/hammer/sys/x86_64/include/ucontext.h#5 integrate .. //depot/projects/hammer/sys/x86_64/isa/npx.c#15 integrate .. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#28 integrate Differences ... ==== //depot/projects/hammer/libexec/rtld-elf/x86_64/reloc.c#2 (text+ko) ==== @@ -22,7 +22,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/libexec/rtld-elf/i386/reloc.c,v 1.10 2002/06/10 21:15:50 dillon Exp $ + * $FreeBSD: src/libexec/rtld-elf/i386/reloc.c,v 1.11 2002/11/18 22:08:49 tmm Exp $ */ /* @@ -259,7 +259,7 @@ if (def == NULL) return -1; target = (Elf_Addr)(defobj->relocbase + def->st_value); - reloc_jmpslot(where, target, defobj); + reloc_jmpslot(where, target, defobj, obj, rel); } obj->jmpslots_done = true; return 0; ==== //depot/projects/hammer/libexec/rtld-elf/x86_64/rtld_machdep.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/i386/rtld_machdep.h,v 1.7 2002/06/24 23:19:18 jdp Exp $ + * $FreeBSD: src/libexec/rtld-elf/i386/rtld_machdep.h,v 1.8 2002/11/18 22:08:49 tmm Exp $ */ #ifndef RTLD_MACHDEP_H @@ -38,7 +38,8 @@ /* Fixup the jump slot at "where" to transfer control to "target". */ static inline Elf_Addr reloc_jmpslot(Elf_Addr *where, Elf_Addr target, - const struct Struct_Obj_Entry *obj) + const struct Struct_Obj_Entry *obj, + const struct Struct_Obj_Entry *refobj, const Elf_Rel *rel) { dbg("reloc_jmpslot: *%p = %p", (void *)(where), (void *)(target)); ==== //depot/projects/hammer/sys/x86_64/include/signal.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/i386/include/signal.h,v 1.18 2002/10/25 19:10:56 peter Exp $ + * $FreeBSD: src/sys/i386/include/signal.h,v 1.19 2002/11/16 06:35:52 deischen Exp $ */ #ifndef _MACHINE_SIGNAL_H_ @@ -92,7 +92,7 @@ int sc_efl; int sc_esp; int sc_ss; - int sc_len; /* sizeof(struct mcontext_t) */ + int sc_len; /* sizeof(mcontext_t) */ /* * XXX - See and for * the following fields. @@ -100,7 +100,7 @@ int sc_fpformat; int sc_ownedfp; int sc_spare1[1]; - int sc_fpregs[128]; + int sc_fpstate[128]; int sc_spare2[8]; }; ==== //depot/projects/hammer/sys/x86_64/include/ucontext.h#5 (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. * - * $FreeBSD: src/sys/i386/include/ucontext.h,v 1.8 2002/10/25 19:10:56 peter Exp $ + * $FreeBSD: src/sys/i386/include/ucontext.h,v 1.9 2002/11/16 06:35:52 deischen Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -38,7 +38,7 @@ * and ucontext_t at the same time. */ int mc_onstack; /* XXX - sigcontext compat. */ - int mc_gs; + int mc_gs; /* machine state (trapframe) */ int mc_fs; int mc_es; int mc_ds; @@ -54,7 +54,7 @@ int mc_eip; int mc_cs; int mc_eflags; - int mc_esp; /* machine state */ + int mc_esp; int mc_ss; int mc_len; /* sizeof(mcontext_t) */ @@ -71,8 +71,7 @@ int mc_spare2[8]; } mcontext_t; -#ifdef _KERNEL -#ifdef COMPAT_FREEBSD4 +#if defined(_KERNEL) && defined(COMPAT_FREEBSD4) /* For 4.x binaries */ struct mcontext4 { int mc_onstack; /* XXX - sigcontext compat. */ @@ -100,10 +99,4 @@ }; #endif -struct thread; - -void get_mcontext(struct thread *td, mcontext_t *mcp); -int set_mcontext(struct thread *td, const mcontext_t *mcp); -#endif - #endif /* !_MACHINE_UCONTEXT_H_ */ ==== //depot/projects/hammer/sys/x86_64/isa/npx.c#15 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/i386/isa/npx.c,v 1.135 2002/11/05 04:03:42 davidxu Exp $ + * $FreeBSD: src/sys/i386/isa/npx.c,v 1.136 2002/11/16 06:35:52 deischen Exp $ */ #include "opt_debug_npx.h" ==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#28 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.549 2002/11/09 21:17:41 iwasaki Exp $ + * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.550 2002/11/16 06:35:52 deischen Exp $ */ #include "opt_atalk.h" @@ -1720,7 +1720,7 @@ /* * Get machine context. */ -void +int get_mcontext(struct thread *td, mcontext_t *mcp) { struct trapframe *tp; @@ -1746,6 +1746,7 @@ mcp->mc_ss = tp->tf_ss; mcp->mc_len = sizeof(*mcp); get_fpcontext(td, mcp); + return (0); } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 20 17:47: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E91F337B404; Wed, 20 Nov 2002 17:46:59 -0800 (PST) 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 6805937B401 for ; Wed, 20 Nov 2002 17:46:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D68043E3B for ; Wed, 20 Nov 2002 17:46:59 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAL1hrmV021461 for ; Wed, 20 Nov 2002 17:43:53 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAL1hrm1021458 for perforce@freebsd.org; Wed, 20 Nov 2002 17:43:53 -0800 (PST) Date: Wed, 20 Nov 2002 17:43:53 -0800 (PST) Message-Id: <200211210143.gAL1hrm1021458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21325 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21325 Change 21325 by marcel@marcel_nfs on 2002/11/20 17:43:03 Commit a couple of new routines for saving and restoring register sets. This is as far as I go in this direction. We have a release coming up and if I want to go through with this, I will not have anything in the end. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/syscall.s#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/syscall.s#3 (text+ko) ==== @@ -83,83 +83,129 @@ /* - * _{get|set}_special + * _{get|set}_special_sync * Do not follow runtime convention! */ /* * inputs: r16 struct _special * r17 return address */ -ENTRY(_get_special, 0) +ENTRY(_get_special_sync, 0) { .mii flushrs - add r2=8,r16 - add r3=16,r16 - ;; -} -{ .mmi - .mem.offset 0,0 - st8.spill [r2]=r1,16 // gp - .mem.offset 8,0 - st8.spill [r3]=r12,16 // sp mov b6=r17 + add r17=8,r16 ;; } { .mmi - .mem.offset 16,0 - st8.spill [r2]=r13,16 // tp - mov r17=ar.rsc + st8 [r16]=r1,16 // gp + st8 [r17]=r12,16 // sp mov r18=b0 ;; } { .mmi - st8 [r3]=r18,16 // rp - mov ar.rsc=0 - mov r19=pr + st8 [r16]=r13,16 // tp + mov r19=ar.rsc + mov r20=pr ;; } { .mmi - st8 [r2]=r19,16 // pr - mov r20=ar.unat + st8 [r17]=r18,16 // rp + mov ar.rsc=0 mov r21=ar.pfs ;; } -{ .mmi - st8 [r16]=r20 // nat - st8 [r3]=r17,16 // ar.rsc +{ .mmb + st8 [r16]=r20,16 // pr + st8 [r17]=r19,16 // ar.rsc nop 0 + ;; } { .mmi - st8 [r2]=r21,16 // ar.pfs + st8 [r16]=r21,16 // ar.pfs mov r22=ar.bsp nop 1 ;; } -{ .mmi - st8 [r3]=r22,16 // ar.bspstore +{ .mmb + st8 [r17]=r22,16 // ar.bspstore mov r23=ar.rnat nop 2 ;; } { .mmi - st8 [r2]=r23 // ar.rnat + st8 [r16]=r23 // ar.rnat mov r24=ar.fpsr nop 3 ;; } { .mmb - st8 [r3]=r24 // ar.fpsr - mov ar.rsc=r17 + st8 [r17]=r24 // ar.fpsr + mov ar.rsc=r19 br.sptk b6 ;; } -END(_get_special) +END(_get_special_sync) /* * inputs: r16 struct _special */ -ENTRY(_set_special, 0) -END(_set_special) +ENTRY(_set_special_sync, 0) +{ .mmi + invala + mov ar.rsc=0 + add r17=8,r16 + ;; +} +{ .mmb + ld8 r1=[r16],16 // gp + ld8 r12=[r17],16 // sp + nop 0 + ;; +} +{ .mmb + ld8 r13=[r16],16 // tp + ld8 r18=[r17],16 // rp + nop 1 + ;; +} +{ .mmi + ld8 r19=[r16],16 // pr + ld8 r20=[r17],16 // ar.rsc + mov b0=r18 + ;; +} +{ .mmi + loadrs + ld8 r21=[r16],16 // ar.pfs + mov pr=r19,0x1fffe + ;; +} +{ .mmi + ld8 r22=[r17],16 // ar.bspstore + ld8 r23=[r16] // ar.rnat + mov ar.pfs=r21 + ;; +} +{ .mmb + ld8 r24=[r17] // ar.fpsr + mov ar.bspstore=r22 + nop 2 + ;; +} +{ .mmb + mov ar.rnat=r23 + mov ar.rsc=r20 + nop 3 + ;; +} +{ .mib + mov ar.fpsr=r24 + nop 4 + br.ret.sptk rp + ;; +} +END(_set_special_sync) /* * _{get|set}_callee_saved @@ -276,3 +322,78 @@ ;; } END(_set_callee_saved) + +/* + * _{get|set}_callee_saved + */ +ENTRY(_get_callee_saved_fp, 1) + add r31=16,r32 + stf.spill [r32]=f2,32 + ;; + stf.spill [r31]=f3,32 + stf.spill [r32]=f4,32 + ;; + stf.spill [r31]=f5,32 + stf.spill [r32]=f16,32 + ;; + stf.spill [r31]=f17,32 + stf.spill [r32]=f18,32 + ;; + stf.spill [r31]=f19,32 + stf.spill [r32]=f20,32 + ;; + stf.spill [r31]=f21,32 + stf.spill [r32]=f22,32 + ;; + stf.spill [r31]=f23,32 + stf.spill [r32]=f24,32 + ;; + stf.spill [r31]=f25,32 + stf.spill [r32]=f26,32 + ;; + stf.spill [r31]=f27,32 + stf.spill [r32]=f28,32 + ;; + stf.spill [r31]=f29,32 + stf.spill [r32]=f30 + ;; + stf.spill [r31]=f31 + br.ret.sptk rp + ;; +END(_get_callee_saved_fp) + +ENTRY(_set_callee_saved_fp, 1) + add r31=16,r32 + ldf.fill f2=[r32],32 + ;; + ldf.fill f3=[r31],32 + ldf.fill f4=[r32],32 + ;; + ldf.fill f5=[r31],32 + ldf.fill f16=[r32],32 + ;; + ldf.fill f17=[r31],32 + ldf.fill f18=[r32],32 + ;; + ldf.fill f19=[r31],32 + ldf.fill f20=[r32],32 + ;; + ldf.fill f21=[r31],32 + ldf.fill f22=[r32],32 + ;; + ldf.fill f23=[r31],32 + ldf.fill f24=[r32],32 + ;; + ldf.fill f25=[r31],32 + ldf.fill f26=[r32],32 + ;; + ldf.fill f27=[r31],32 + ldf.fill f28=[r32],32 + ;; + ldf.fill f29=[r31],32 + ldf.fill f30=[r32] + ;; + ldf.fill f31=[r31] + br.ret.sptk rp + ;; +END(_set_callee_saved_fp) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 20 17:49: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D52937B404; Wed, 20 Nov 2002 17:49:03 -0800 (PST) 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 B1E4C37B401 for ; Wed, 20 Nov 2002 17:49:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5066143E4A for ; Wed, 20 Nov 2002 17:49:02 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAL1jumV021593 for ; Wed, 20 Nov 2002 17:45:56 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAL1jutW021590 for perforce@freebsd.org; Wed, 20 Nov 2002 17:45:56 -0800 (PST) Date: Wed, 20 Nov 2002 17:45:56 -0800 (PST) Message-Id: <200211210145.gAL1jutW021590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21326 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21326 Change 21326 by peter@peter_daintree on 2002/11/20 17:45:07 fill in some more blanks Affected files ... .. //depot/projects/hammer/sys/x86_64/include/param.h#4 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/param.h#4 (text+ko) ==== @@ -90,30 +90,54 @@ #define ALIGN(p) _ALIGN(p) #define ALIGNED_POINTER(p,t) _ALIGNED_POINTER((p),(t)) +/* Size of the level 1 page table units */ +#define NPTEPG (PAGE_SIZE/(sizeof (pt_entry_t))) #define PAGE_SHIFT 12 /* LOG2(PAGE_SIZE) */ #define PAGE_SIZE (1<> PGSHIFT) #define IOPAGES 2 /* pages of i/o permission bitmap */ #ifndef KSTACK_PAGES -#define KSTACK_PAGES 2 /* pages of kstack (with pcb) */ +#define KSTACK_PAGES 4 /* pages of kstack (with pcb) */ #endif #define UAREA_PAGES 1 /* holds struct user WITHOUT PCB (see def.) */ -#define KSTACK_GUARD 1 /* compile in the kstack guard page */ +#define KSTACK_GUARD 1 /* compile in the kstack guard page */ /* * Mach derived conversion macros */ #define round_page(x) ((((unsigned long)(x)) + PAGE_MASK) & ~(PAGE_MASK)) #define trunc_page(x) ((unsigned long)(x) & ~(PAGE_MASK)) -#define trunc_4mpage(x) ((unsigned)(x) & ~PDRMASK) -#define round_4mpage(x) ((((unsigned)(x)) + PDRMASK) & ~PDRMASK) +#define trunc_2mpage(x) ((unsigned long)(x) & ~PDRMASK) +#define round_2mpage(x) ((((unsigned long)(x)) + PDRMASK) & ~PDRMASK) #define atop(x) ((unsigned long)(x) >> PAGE_SHIFT) #define ptoa(x) ((unsigned long)(x) << PAGE_SHIFT) @@ -121,7 +145,7 @@ #define x86_64_btop(x) ((unsigned long)(x) >> PAGE_SHIFT) #define x86_64_ptob(x) ((unsigned long)(x) << PAGE_SHIFT) -#define pgtok(x) ((x) * (PAGE_SIZE / 1024)) +#define pgtok(x) ((unsigned long)(x) * (PAGE_SIZE / 1024)) #endif /* !_MACHINE_PARAM_H_ */ #endif /* !_NO_NAMESPACE_POLLUTION */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 20 18:21:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1B0C37B404; Wed, 20 Nov 2002 18:21:44 -0800 (PST) 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 5844937B401 for ; Wed, 20 Nov 2002 18:21:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 560DA43E9E for ; Wed, 20 Nov 2002 18:21:42 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAL2IamV023853 for ; Wed, 20 Nov 2002 18:18:36 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAL2Iaqj023850 for perforce@freebsd.org; Wed, 20 Nov 2002 18:18:36 -0800 (PST) Date: Wed, 20 Nov 2002 18:18:36 -0800 (PST) Message-Id: <200211210218.gAL2Iaqj023850@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21327 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21327 Change 21327 by peter@peter_daintree on 2002/11/20 18:17:42 on second thoughts.. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/param.h#5 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/param.h#5 (text+ko) ==== @@ -102,9 +102,9 @@ #define PDRMASK (NBPDR-1) /* Size of the level 3 page directory pointer table units */ #define NPDPEPG (PAGE_SIZE/(sizeof (pdp_entry_t))) -#define PDPTSHIFT 30 /* LOG2(NBPDPT) */ -#define NBPDPT (1<; Wed, 20 Nov 2002 18:21:45 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BD8243E3B for ; Wed, 20 Nov 2002 18:21:43 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAL2IbmV023859 for ; Wed, 20 Nov 2002 18:18:37 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAL2Ib2Q023856 for perforce@freebsd.org; Wed, 20 Nov 2002 18:18:37 -0800 (PST) Date: Wed, 20 Nov 2002 18:18:37 -0800 (PST) Message-Id: <200211210218.gAL2Ib2Q023856@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21328 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21328 Change 21328 by peter@peter_daintree on 2002/11/20 18:17:56 fill in some more blanks Affected files ... .. //depot/projects/hammer/sys/x86_64/include/pmap.h#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/pmap.h#3 (text+ko) ==== @@ -83,35 +83,32 @@ #define PGEX_U 0x04 /* access from User mode (UPL) */ /* - * Size of Kernel address space. This is the number of page table pages - * (4MB each) to use for the kernel. 256 pages == 1 Gigabyte. - * This **MUST** be a multiple of 4 (eg: 252, 256, 260, etc). + * Size of Kernel address space. This is the number of level 4 (top) + * entries. We use half of them for the kernel due to the 48 bit + * virtual address sign extension. */ -#ifndef KVA_PAGES #define KVA_PAGES 256 -#endif /* * Pte related macros */ -#define VADDR(pdi, pti) ((vm_offset_t)(((pdi)< -typedef u_int32_t pd_entry_t; -typedef u_int32_t pt_entry_t; +typedef u_int64_t pd_entry_t; +typedef u_int64_t pt_entry_t; +typedef u_int64_t pdp_entry_t; +typedef u_int64_t pml4_entry_t; +#define PML4ESIZE sizeof(pml4_entry_t) /* for assembly files */ +#define PDPESIZE sizeof(pdp_entry_t) /* for assembly files */ #define PDESIZE sizeof(pd_entry_t) /* for assembly files */ #define PTESIZE sizeof(pt_entry_t) /* for assembly files */ /* * Address of current and alternate address space page table maps * and directories. + * XXX it might be saner to just direct map all of physical memory + * into the kernel using 2MB pages. We have enough space to do + * it (2^47 bits of KVM, while current max physical addressability + * is 2^40 physical bits). Then we can get rid of the evil hole + * in the page tables and the evil overlapping. */ #ifdef _KERNEL -extern pt_entry_t PTmap[], APTmap[]; -extern pd_entry_t PTD[], APTD[]; -extern pd_entry_t PTDpde, APTDpde; +extern pt_entry_t PTmap[], APTmap[]; +extern pd_entry_t PDmap[], APDmap[]; +extern pdp_entry_t PDPmap[], APDPmap[]; +extern pml4_entry_t PML4[], APML4; +extern pd_entry_t PML4pml4e, APML4pml4e; + -extern pd_entry_t *IdlePTD; /* physical address of "Idle" state directory */ +extern pd_entry_t *IdlePML4; /* physical address of "Idle" state directory */ #endif #ifdef _KERNEL @@ -150,8 +159,8 @@ * Note: these work recursively, thus vtopte of a pte will give * the corresponding pde that in turn maps it. */ -#define vtopte(va) (PTmap + i386_btop(va)) -#define avtopte(va) (APTmap + i386_btop(va)) +#define vtopte(va) (PTmap + x86_64_btop(va)) +#define avtopte(va) (APTmap + x86_64_btop(va)) /* * Routine: pmap_kextract @@ -163,9 +172,11 @@ pmap_kextract(vm_offset_t va) { vm_offset_t pa; - if ((pa = (vm_offset_t) PTD[va >> PDRSHIFT]) & PG_PS) { + +/* XXX the acronyms are giving me headaches at the moment */ +/* XXX if ((pa = (vm_offset_t) PTD[va >> PDRSHIFT]) & PG_PS) { pa = (pa & ~(NBPDR - 1)) | (va & (NBPDR - 1)); - } else { + } else */ { pa = *(vm_offset_t *)vtopte(va); pa = (pa & PG_FRAME) | (va & PAGE_MASK); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 20 19: 0:33 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0A7537B404; Wed, 20 Nov 2002 19:00:31 -0800 (PST) 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 88C4837B401 for ; Wed, 20 Nov 2002 19:00:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3122F43E8A for ; Wed, 20 Nov 2002 19:00:31 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAL2vPmV026006 for ; Wed, 20 Nov 2002 18:57:25 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAL2vPAh026001 for perforce@freebsd.org; Wed, 20 Nov 2002 18:57:25 -0800 (PST) Date: Wed, 20 Nov 2002 18:57:25 -0800 (PST) Message-Id: <200211210257.gAL2vPAh026001@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21330 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21330 Change 21330 by peter@peter_daintree on 2002/11/20 18:57:13 -Wunused Affected files ... .. //depot/projects/hammer/sys/i386/include/vmparam.h#2 edit Differences ... ==== //depot/projects/hammer/sys/i386/include/vmparam.h#2 (text+ko) ==== @@ -95,9 +95,6 @@ #define KERNBASE VADDR(KPTDI, 0) -#define KPT_MAX_ADDRESS VADDR(PTDPTDI, KPTDI+NKPT) -#define KPT_MIN_ADDRESS VADDR(PTDPTDI, KPTDI) - #define UPT_MAX_ADDRESS VADDR(PTDPTDI, PTDPTDI) #define UPT_MIN_ADDRESS VADDR(PTDPTDI, 0) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Wed Nov 20 19:28:10 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9EDA37B404; Wed, 20 Nov 2002 19:28:05 -0800 (PST) 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 724B437B401 for ; Wed, 20 Nov 2002 19:28:05 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E6C543E91 for ; Wed, 20 Nov 2002 19:28:05 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAL3OxmV027625 for ; Wed, 20 Nov 2002 19:24:59 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAL3OwRv027622 for perforce@freebsd.org; Wed, 20 Nov 2002 19:24:58 -0800 (PST) Date: Wed, 20 Nov 2002 19:24:58 -0800 (PST) Message-Id: <200211210324.gAL3OwRv027622@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21331 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21331 Change 21331 by peter@peter_daintree on 2002/11/20 19:24:51 more cleanup, filling in blanks. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/param.h#6 edit .. //depot/projects/hammer/sys/x86_64/include/pmap.h#4 edit .. //depot/projects/hammer/sys/x86_64/include/vmparam.h#2 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/param.h#6 (text+ko) ==== @@ -111,17 +111,6 @@ #define NBPML4T (1ul<> PGSHIFT) - #define IOPAGES 2 /* pages of i/o permission bitmap */ #ifndef KSTACK_PAGES ==== //depot/projects/hammer/sys/x86_64/include/pmap.h#4 (text+ko) ==== @@ -90,27 +90,31 @@ #define KVA_PAGES 256 /* - * Pte related macros + * Pte related macros. This is complicated by having to deal with + * the sign extension of the 48th bit. */ -#define VADDR(l4, l3, l2, l1) ((vm_offset_t) ( \ - ((l4)<= NPML4EPG/2 ? ((unsigned long)-1 << 47) : 0ul) +#define VADDR(l4, l3, l2, l1) ( \ + ((unsigned long)(l4) << PML4SHIFT) | VADDR_SIGN(l4) | \ + ((unsigned long)(l3) << PDPSHIFT) | \ + ((unsigned long)(l2) << PDRSHIFT) | \ + ((unsigned long)(l1) << PAGE_SHIFT)) #ifndef NKPT -#define NKPT 30 /* actual number of kernel page tables */ +#define NKPT 30 /* initial number of kernel page tables */ #endif -#define NKPDE (KVA_PAGES - 1) /* addressable number of page tables/pde's */ +#define NKPML4E (KVA_PAGES - 1) /* addressable number of page tables/pde's */ /* * The *PTDI values control the layout of virtual memory */ -#define APTDPTDI (NPML4EPG-1) /* alt ptd entry that points to APTD */ -#define KPTDI (APTDPTDI-NKPDE)/* start of kernel virtual pde's */ +#define APML4PML4I (NPML4EPG-1) /* alt ptd entry that points to APTD */ +#define KPML4I (NPML4EPG/2) /* start of kernel virtual pde's */ /* Hole */ -#define PTDPTDI ((NPML4EPG/2)-1)/* ptd entry that points to ptd! */ -#define UMAXPTDI (PTDPTDI-1) /* ptd entry for user space end */ -#define UMAXPTEOFF (NPTEPG) /* pte entry for user space end */ +#define PML4PML4I (KPTDI-1) /* pml4 entry that points to ptd! */ +#define UMAXPML4I (PML4PML4I-1) /* pml4 entry for user space end */ /* * XXX doesn't really belong here I guess... ==== //depot/projects/hammer/sys/x86_64/include/vmparam.h#2 (text+ko) ==== @@ -44,11 +44,9 @@ #define _MACHINE_VMPARAM_H_ 1 /* - * Machine dependent constants for 386. + * Machine dependent constants for x86-64. */ -#define VM_PROT_READ_IS_EXEC /* if you can read -- then you can exec */ - /* * Virtual memory related constants, all in bytes */ @@ -69,8 +67,6 @@ #define SGROWSIZ (128UL*1024) /* amount to grow stack */ #endif -#define USRTEXT (1*PAGE_SIZE) /* base of user text XXX bogus */ - /* * The time for a process to be blocked before being very swappable. * This is a number of seconds which the system takes as being a non-trivial @@ -90,23 +86,20 @@ * messy at times, but hey, we'll do anything to save a page :-) */ -#define VM_MAX_KERNEL_ADDRESS VADDR(KPTDI+NKPDE, 0) -#define VM_MIN_KERNEL_ADDRESS VADDR(PTDPTDI, PTDPTDI) +#define VM_MAX_KERNEL_ADDRESS VADDR(KPML4I+NKML4E, 0, 0, 0) +#define VM_MIN_KERNEL_ADDRESS VADDR(KPML4I, 0, 0, 0) -#define KERNBASE VADDR(KPTDI, 0) +#define KERNBASE VM_MIN_KERNEL_ADDRESS -#define KPT_MAX_ADDRESS VADDR(PTDPTDI, KPTDI+NKPT) -#define KPT_MIN_ADDRESS VADDR(PTDPTDI, KPTDI) +#define UPT_MAX_ADDRESS VADDR(PML4PML4I, PML4PML4I, 0, 0) +#define UPT_MIN_ADDRESS VADDR(PML4PML4I, 0, 0, 0) -#define UPT_MAX_ADDRESS VADDR(PTDPTDI, PTDPTDI) -#define UPT_MIN_ADDRESS VADDR(PTDPTDI, 0) +#define VM_MAXUSER_ADDRESS UPT_MIN_ADDRESS -#define VM_MAXUSER_ADDRESS VADDR(UMAXPTDI, UMAXPTEOFF) - #define USRSTACK VM_MAXUSER_ADDRESS -#define VM_MAX_ADDRESS VADDR(PTDPTDI, PTDPTDI) -#define VM_MIN_ADDRESS ((vm_offset_t)0) +#define VM_MAX_ADDRESS UPT_MAX_ADDRESS +#define VM_MIN_ADDRESS (0) /* virtual sizes (bytes) for various kernel submaps */ #ifndef VM_KMEM_SIZE To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 21 11:29:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3402437B406; Thu, 21 Nov 2002 11:29:08 -0800 (PST) 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 CF5F037B401 for ; Thu, 21 Nov 2002 11:29:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41EC043E3B for ; Thu, 21 Nov 2002 11:29:07 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gALJPwmV088476 for ; Thu, 21 Nov 2002 11:25:58 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gALJPvnV088473 for perforce@freebsd.org; Thu, 21 Nov 2002 11:25:57 -0800 (PST) Date: Thu, 21 Nov 2002 11:25:57 -0800 (PST) Message-Id: <200211211925.gALJPvnV088473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21347 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21347 Change 21347 by green@green_laptop_2 on 2002/11/21 11:25:40 * Update devfs MAC entry points to include mount point info, except for init/destroy. * Fix the kld_unload implementation in mac_biba. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs.h#9 edit .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#9 edit .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#13 edit .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#35 edit .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#366 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#188 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#43 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#149 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#111 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#87 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac.h#220 edit .. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#174 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs.h#9 (text+ko) ==== @@ -168,7 +168,7 @@ }; struct devfs_mount { - struct vnode *dm_root; /* Root node */ + struct mount *dm_mountp; /* filesystem vfs structure */ struct devfs_dirent *dm_rootdir; struct devfs_dirent *dm_basedir; unsigned dm_generation; ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_devs.c#9 (text+ko) ==== @@ -334,8 +334,8 @@ if (de == NULL) { de = devfs_vmkdir(s, q - s, dd); #ifdef MAC - mac_create_devfs_directory(s, q - s, - de); + mac_create_devfs_directory( + dm->dm_mountp, s, q - s, de); #endif de->de_inode = dm->dm_inode++; TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); @@ -363,7 +363,7 @@ de->de_dirent->d_type = DT_CHR; } #ifdef MAC - mac_create_devfs_device(dev, de); + mac_create_devfs_device(dm->dm_mountp, dev, de); #endif *dep = de; de->de_dir = dd; ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vfsops.c#13 (text+ko) ==== @@ -88,6 +88,7 @@ #ifdef MAC mp->mnt_flag |= MNT_MULTILABEL; #endif + fmp->dm_mountp = mp; mp->mnt_data = (qaddr_t) fmp; vfs_getnewfsid(mp); @@ -96,7 +97,7 @@ fmp->dm_rootdir = devfs_vmkdir("(root)", 6, NULL); fmp->dm_rootdir->de_inode = 2; #ifdef MAC - mac_create_devfs_directory("", 0, fmp->dm_rootdir); + mac_create_devfs_directory(mp, "", 0, fmp->dm_rootdir); #endif fmp->dm_basedir = fmp->dm_rootdir; devfs_rules_newmount(fmp, td); ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#35 (text+ko) ==== @@ -832,7 +832,7 @@ de = vp->v_data; mac_relabel_vnode(ap->a_cred, vp, ap->a_label); - mac_update_devfsdirent(de, vp); + mac_update_devfsdirent(vp->v_mount, de, vp); return (0); } @@ -869,7 +869,7 @@ bcopy(ap->a_target, de->de_symlink, i); lockmgr(&dmp->dm_lock, LK_EXCLUSIVE, 0, curthread); #ifdef MAC - mac_create_devfs_symlink(ap->a_cnp->cn_cred, dd, de); + mac_create_devfs_symlink(dmp->dm_mountp, ap->a_cnp->cn_cred, dd, de); #endif TAILQ_INSERT_TAIL(&dd->de_dlist, de, de_list); devfs_allocv(de, ap->a_dvp->v_mount, ap->a_vpp, 0); ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#366 (text+ko) ==== @@ -1196,10 +1196,12 @@ } void -mac_update_devfsdirent(struct devfs_dirent *de, struct vnode *vp) +mac_update_devfsdirent(struct mount *mp, struct devfs_dirent *de, + struct vnode *vp) { - MAC_PERFORM(update_devfsdirent, de, &de->de_label, vp, &vp->v_label); + MAC_PERFORM(update_devfsdirent, mp, de, &de->de_label, vp, + &vp->v_label); } void @@ -2801,27 +2803,27 @@ } void -mac_create_devfs_device(dev_t dev, struct devfs_dirent *de) +mac_create_devfs_device(struct mount *mp, dev_t dev, struct devfs_dirent *de) { - MAC_PERFORM(create_devfs_device, dev, de, &de->de_label); + MAC_PERFORM(create_devfs_device, mp, dev, de, &de->de_label); } void -mac_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, - struct devfs_dirent *de) +mac_create_devfs_symlink(struct mount *mp, struct ucred *cred, + struct devfs_dirent *dd, struct devfs_dirent *de) { - MAC_PERFORM(create_devfs_symlink, cred, dd, &dd->de_label, de, + MAC_PERFORM(create_devfs_symlink, mp, cred, dd, &dd->de_label, de, &de->de_label); } void -mac_create_devfs_directory(char *dirname, int dirnamelen, +mac_create_devfs_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *de) { - MAC_PERFORM(create_devfs_directory, dirname, dirnamelen, de, + MAC_PERFORM(create_devfs_directory, mp, dirname, dirnamelen, de, &de->de_label); } ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#188 (text+ko) ==== @@ -800,8 +800,8 @@ * a lot like file system objects. */ static void -mac_biba_create_devfs_device(dev_t dev, struct devfs_dirent *devfs_dirent, - struct label *label) +mac_biba_create_devfs_device(struct mount *mp, dev_t dev, + struct devfs_dirent *devfs_dirent, struct label *label) { struct mac_biba *mac_biba; int biba_type; @@ -822,8 +822,8 @@ } static void -mac_biba_create_devfs_directory(char *dirname, int dirnamelen, - struct devfs_dirent *devfs_dirent, struct label *label) +mac_biba_create_devfs_directory(struct mount *mp, char *dirname, + int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label) { struct mac_biba *mac_biba; @@ -832,8 +832,9 @@ } static void -mac_biba_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, - struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) +mac_biba_create_devfs_symlink(struct mount *mp, struct ucred *cred, + struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, + struct label *delabel) { struct mac_biba *source, *dest; @@ -882,8 +883,9 @@ } static void -mac_biba_update_devfsdirent(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) +mac_biba_update_devfsdirent(struct mount *mp, + struct devfs_dirent *devfs_dirent, struct label *direntlabel, + struct vnode *vp, struct label *vnodelabel) { struct mac_biba *source, *dest; @@ -1561,8 +1563,7 @@ static int -mac_biba_check_kld_unload(struct ucred *cred, struct vnode *vp, - struct label *label) +mac_biba_check_kld_unload(struct ucred *cred) { struct mac_biba *subj; ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#43 (text+ko) ==== @@ -956,8 +956,8 @@ * a lot like file system objects. */ static void -mac_lomac_create_devfs_device(dev_t dev, struct devfs_dirent *devfs_dirent, - struct label *label) +mac_lomac_create_devfs_device(struct mount *mp, dev_t dev, + struct devfs_dirent *devfs_dirent, struct label *label) { struct mac_lomac *mac_lomac; int lomac_type; @@ -979,8 +979,8 @@ } static void -mac_lomac_create_devfs_directory(char *dirname, int dirnamelen, - struct devfs_dirent *devfs_dirent, struct label *label) +mac_lomac_create_devfs_directory(struct mount *mp, char *dirname, + int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label) { struct mac_lomac *mac_lomac; @@ -989,8 +989,9 @@ } static void -mac_lomac_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, - struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) +mac_lomac_create_devfs_symlink(struct mount *mp, struct ucred *cred, + struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, + struct label *delabel) { struct mac_lomac *source, *dest; @@ -1039,8 +1040,9 @@ } static void -mac_lomac_update_devfsdirent(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) +mac_lomac_update_devfsdirent(struct mount *mp, + struct devfs_dirent *devfs_dirent, struct label *direntlabel, + struct vnode *vp, struct label *vnodelabel) { struct mac_lomac *source, *dest; ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#149 (text+ko) ==== @@ -766,8 +766,8 @@ * a lot like file system objects. */ static void -mac_mls_create_devfs_device(dev_t dev, struct devfs_dirent *devfs_dirent, - struct label *label) +mac_mls_create_devfs_device(struct mount *mp, dev_t dev, + struct devfs_dirent *devfs_dirent, struct label *label) { struct mac_mls *mac_mls; int mls_type; @@ -791,7 +791,7 @@ } static void -mac_mls_create_devfs_directory(char *dirname, int dirnamelen, +mac_mls_create_devfs_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label) { struct mac_mls *mac_mls; @@ -801,8 +801,9 @@ } static void -mac_mls_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, - struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) +mac_mls_create_devfs_symlink(struct mount *mp, struct ucred *cred, + struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, + struct label *delabel) { struct mac_mls *source, *dest; @@ -851,7 +852,7 @@ } static void -mac_mls_update_devfsdirent(struct devfs_dirent *devfs_dirent, +mac_mls_update_devfsdirent(struct mount *mp, struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) { struct mac_mls *source, *dest; ==== //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#111 (text+ko) ==== @@ -169,22 +169,23 @@ } static void -mac_none_create_devfs_device(dev_t dev, struct devfs_dirent *devfs_dirent, - struct label *label) +mac_none_create_devfs_device(struct mount *mp, dev_t dev, + struct devfs_dirent *devfs_dirent, struct label *label) { } static void -mac_none_create_devfs_directory(char *dirname, int dirnamelen, - struct devfs_dirent *devfs_dirent, struct label *label) +mac_none_create_devfs_directory(struct mount *mp, char *dirname, + int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label) { } static void -mac_none_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, - struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) +mac_none_create_devfs_symlink(struct mount *mp, struct ucred *cred, + struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, + struct label *delabel) { } @@ -228,8 +229,9 @@ } static void -mac_none_update_devfsdirent(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) +mac_none_update_devfsdirent(struct mount *mp, + struct devfs_dirent *devfs_dirent, struct label *direntlabel, + struct vnode *vp, struct label *vnodelabel) { } ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#87 (text+ko) ==== @@ -547,22 +547,23 @@ } static void -mac_test_create_devfs_device(dev_t dev, struct devfs_dirent *devfs_dirent, - struct label *label) +mac_test_create_devfs_device(struct mount *mp, dev_t dev, + struct devfs_dirent *devfs_dirent, struct label *label) { } static void -mac_test_create_devfs_directory(char *dirname, int dirnamelen, - struct devfs_dirent *devfs_dirent, struct label *label) +mac_test_create_devfs_directory(struct mount *mp, char *dirname, + int dirnamelen, struct devfs_dirent *devfs_dirent, struct label *label) { } static void -mac_test_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, - struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) +mac_test_create_devfs_symlink(struct mount *mp, struct ucred *cred, + struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, + struct label *delabel) { } @@ -606,8 +607,9 @@ } static void -mac_test_update_devfsdirent(struct devfs_dirent *devfs_dirent, - struct label *direntlabel, struct vnode *vp, struct label *vnodelabel) +mac_test_update_devfsdirent(struct mount *mp, + struct devfs_dirent *devfs_dirent, struct label *direntlabel, + struct vnode *vp, struct label *vnodelabel) { } ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#220 (text+ko) ==== @@ -171,18 +171,20 @@ struct vnode *vp); int mac_associate_vnode_extattr(struct mount *mp, struct vnode *vp); void mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp); -void mac_create_devfs_device(dev_t dev, struct devfs_dirent *de); -void mac_create_devfs_directory(char *dirname, int dirnamelen, +void mac_create_devfs_device(struct mount *mp, dev_t dev, struct devfs_dirent *de); -void mac_create_devfs_symlink(struct ucred *cred, struct devfs_dirent *dd, - struct devfs_dirent *de); +void mac_create_devfs_directory(struct mount *mp, char *dirname, + int dirnamelen, struct devfs_dirent *de); +void mac_create_devfs_symlink(struct mount *mp, struct ucred *cred, + struct devfs_dirent *dd, struct devfs_dirent *de); int mac_create_vnode_extattr(struct ucred *cred, struct mount *mp, struct vnode *dvp, struct vnode *vp, struct componentname *cnp); void mac_create_mount(struct ucred *cred, struct mount *mp); void mac_create_root_mount(struct ucred *cred, struct mount *mp); void mac_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *newlabel); -void mac_update_devfsdirent(struct devfs_dirent *de, struct vnode *vp); +void mac_update_devfsdirent(struct mount *mp, struct devfs_dirent *de, + struct vnode *vp); /* * Labeling event operations: IPC objects. ==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#174 (text+ko) ==== @@ -142,13 +142,15 @@ void (*mpo_associate_vnode_singlelabel)(struct mount *mp, struct label *fslabel, struct vnode *vp, struct label *vlabel); - void (*mpo_create_devfs_device)(dev_t dev, struct devfs_dirent *de, + void (*mpo_create_devfs_device)(struct mount *mp, dev_t dev, + struct devfs_dirent *de, struct label *label); + void (*mpo_create_devfs_directory)(struct mount *mp, char *dirname, + int dirnamelen, struct devfs_dirent *de, struct label *label); - void (*mpo_create_devfs_directory)(char *dirname, int dirnamelen, - struct devfs_dirent *de, struct label *label); - void (*mpo_create_devfs_symlink)(struct ucred *cred, - struct devfs_dirent *dd, struct label *ddlabel, - struct devfs_dirent *de, struct label *delabel); + void (*mpo_create_devfs_symlink)(struct mount *mp, + struct ucred *cred, struct devfs_dirent *dd, + struct label *ddlabel, struct devfs_dirent *de, + struct label *delabel); int (*mpo_create_vnode_extattr)(struct ucred *cred, struct mount *mp, struct label *fslabel, struct vnode *dvp, struct label *dlabel, @@ -163,7 +165,8 @@ int (*mpo_setlabel_vnode_extattr)(struct ucred *cred, struct vnode *vp, struct label *vlabel, struct label *intlabel); - void (*mpo_update_devfsdirent)(struct devfs_dirent *devfs_dirent, + void (*mpo_update_devfsdirent)(struct mount *mp, + struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vnodelabel); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Thu Nov 21 22:56:25 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0352537B406; Thu, 21 Nov 2002 22:56:15 -0800 (PST) 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 74A7D37B401 for ; Thu, 21 Nov 2002 22:56:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0428843E8A for ; Thu, 21 Nov 2002 22:56:14 -0800 (PST) (envelope-from amigus@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAM6r2mV032327 for ; Thu, 21 Nov 2002 22:53:02 -0800 (PST) (envelope-from amigus@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAM6r1eD032322 for perforce@freebsd.org; Thu, 21 Nov 2002 22:53:01 -0800 (PST) Date: Thu, 21 Nov 2002 22:53:01 -0800 (PST) Message-Id: <200211220653.gAM6r1eD032322@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f From: Adam Migus Subject: PERFORCE change 21367 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21367 Change 21367 by amigus@amigus_beetle on 2002/11/21 22:52:51 Clean up parsing code (use strsep()) and introduce compartment range declaration and display. Biba/MLS now accepts and reports compartment sets using a '++' notation. For example "mls/10:1++64" would denote level 10 wih compartments 1 to 64. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#189 edit .. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#150 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#189 (text+ko) ==== @@ -199,9 +199,10 @@ case MAC_BIBA_TYPE_GRADE: for (bit = 1; bit <= MAC_BIBA_MAX_COMPARTMENTS; bit++) - if (!MAC_BIBA_BIT_TEST(bit, + if (MAC_BIBA_BIT_TEST(bit, a->mbe_compartments) && - MAC_BIBA_BIT_TEST(bit, b->mbe_compartments)) + !MAC_BIBA_BIT_TEST(bit, + b->mbe_compartments)) return (0); return (a->mbe_grade >= b->mbe_grade); @@ -536,7 +537,9 @@ mac_biba_element_to_string(char *string, size_t size, struct mac_biba_element *element) { - int pos, bit = 1; + int r, bit, pbit; + size_t left, len; + char *p; switch (element->mbe_type) { case MAC_BIBA_TYPE_HIGH: @@ -549,15 +552,39 @@ return (snprintf(string, size, "equal")); case MAC_BIBA_TYPE_GRADE: - pos = snprintf(string, size, "%d:", element->mbe_grade); - for (bit = 1; bit <= MAC_BIBA_MAX_COMPARTMENTS; bit++) { - if (MAC_BIBA_BIT_TEST(bit, element->mbe_compartments)) - pos += snprintf(string + pos, size - pos, - "%d+", bit); - } - if (string[pos - 1] == '+' || string[pos - 1] == ':') - string[--pos] = '\0'; - return (pos); + bit = pbit = r = 0; + left = size; + + p = string + (len = snprintf(string, left, "%d:", + element->mbe_grade)); + left -= len; + + do { + pbit = bit++; + len = 0; + if (bit <= MAC_BIBA_MAX_COMPARTMENTS && + MAC_BIBA_BIT_TEST(bit, element->mbe_compartments)) { + if (pbit == bit - 1) { + if (r == 0) + p += len = snprintf(p, left, + "%d+", bit); + r++; + } + } else { + if (r > 2) + p += len = snprintf(p, left, "+%d+", + pbit); + else if (r > 1) + p += len = snprintf(p, left, "%d+", + pbit); + r = 0; + } + left -= len; + } while(bit <= MAC_BIBA_MAX_COMPARTMENTS); + + len = size - left - 1; + string[len] = '\0'; + return (len); default: panic("mac_biba_element_to_string: invalid type (%d)", @@ -647,6 +674,8 @@ static int mac_biba_parse_element(struct mac_biba_element *element, char *string) { + char *p, *tp, *np; + int crange, d, i; if (strcmp(string, "high") == 0 || strcmp(string, "hi") == 0) { @@ -661,41 +690,39 @@ element->mbe_type = MAC_BIBA_TYPE_EQUAL; element->mbe_grade = MAC_BIBA_TYPE_UNDEF; } else { - char *p0, *p1; - int d; - - p0 = string; - d = strtol(p0, &p1, 10); - + d = strtol(string, &p, 10); if (d < 0 || d > 65535) return (EINVAL); + element->mbe_type = MAC_BIBA_TYPE_GRADE; element->mbe_grade = d; - if (*p1 != ':') { - if (p1 == p0 || *p1 != '\0') + if (p == string || *p == '\0') + return (0); + if (*p != ':') + return (EINVAL); + np = ++p; + if (np == NULL || *np == '\0') + return (0); + crange = d = 0; + while ((tp = strsep(&np, "+")) != NULL) { + d = strtol(tp, &p, 10); + if (*p != '\0' || d < 1 || + d > MAC_BIBA_MAX_COMPARTMENTS || crange >= d) return (EINVAL); - else - return (0); + if (crange > 0) { + for (i = crange; i <= d; i++) + MAC_BIBA_BIT_SET(i, + element->mbe_compartments); + crange = 0; + } + if (np != NULL && *np == '+') { + ++np; + crange = d; + } else + MAC_BIBA_BIT_SET(d, element->mbe_compartments); } - else - if (*(p1 + 1) == '\0') - return (0); - - while ((p0 = ++p1)) { - d = strtol(p0, &p1, 10); - if (d < 1 || d > MAC_BIBA_MAX_COMPARTMENTS) - return (EINVAL); - - MAC_BIBA_BIT_SET(d, element->mbe_compartments); - - if (*p1 == '\0') - break; - if (p1 == p0 || *p1 != '+') - return (EINVAL); - } } - return (0); } @@ -1124,60 +1151,49 @@ static void mac_biba_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel) { - char tifname[IFNAMSIZ], ifname[IFNAMSIZ], *p, *q; - char tiflist[sizeof(trusted_interfaces)]; + char tiflist[sizeof(trusted_interfaces)], ifname[IFNAMSIZ], *p, *q; struct mac_biba *dest; - int len, grade; + int type; dest = SLOT(ifnetlabel); if (ifnet->if_type == IFT_LOOP) { - grade = MAC_BIBA_TYPE_EQUAL; + type = MAC_BIBA_TYPE_EQUAL; goto set; } if (trust_all_interfaces) { - grade = MAC_BIBA_TYPE_HIGH; + type = MAC_BIBA_TYPE_HIGH; goto set; } - grade = MAC_BIBA_TYPE_LOW; + type = MAC_BIBA_TYPE_LOW; if (trusted_interfaces[0] == '\0' || !strvalid(trusted_interfaces, sizeof(trusted_interfaces))) goto set; bzero(tiflist, sizeof(tiflist)); - for (p = trusted_interfaces, q = tiflist; *p != '\0'; p++, q++) - if(*p != ' ' && *p != '\t') - *q = *p; + bcopy(trusted_interfaces,tiflist, sizeof(tiflist)); snprintf(ifname, IFNAMSIZ, "%s%d", ifnet->if_name, ifnet->if_unit); - for (p = q = tiflist;; p++) { - if (*p == ',' || *p == '\0') { - len = p - q; - if (len < IFNAMSIZ) { - bzero(tifname, sizeof(tifname)); - bcopy(q, tifname, len); - if (strcmp(tifname, ifname) == 0) { - grade = MAC_BIBA_TYPE_HIGH; - break; - } - } else { - *p = '\0'; - printf("mac_biba warning: interface name " - "\"%s\" is too long (must be < %d)\n", - q, IFNAMSIZ); + p = q = tiflist; + while ((p = strsep(&q, ", \t")) != NULL) { + if (strlen(p) < IFNAMSIZ) { + if (strcmp(p, ifname) == 0) { + type = MAC_BIBA_TYPE_HIGH; + break; } if (*p == '\0') break; q = p + 1; } + p = q; } set: - mac_biba_set_single(dest, grade, 0, NULL); - mac_biba_set_range(dest, grade, 0, NULL, grade, 0, NULL); + mac_biba_set_single(dest, type, 0, NULL); + mac_biba_set_range(dest, type, 0, NULL, type, 0, NULL); } static void ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#150 (text+ko) ==== @@ -501,7 +501,9 @@ mac_mls_element_to_string(char *string, size_t size, struct mac_mls_element *element) { - int pos, bit = 1; + int r, bit, pbit; + size_t left, len; + char *p; switch (element->mme_type) { case MAC_MLS_TYPE_HIGH: @@ -514,15 +516,39 @@ return (snprintf(string, size, "equal")); case MAC_MLS_TYPE_LEVEL: - pos = snprintf(string, size, "%d:", element->mme_level); - for (bit = 1; bit <= MAC_MLS_MAX_COMPARTMENTS; bit++) { - if (MAC_MLS_BIT_TEST(bit, element->mme_compartments)) - pos += snprintf(string + pos, size - pos, - "%d+", bit); - } - if (string[pos - 1] == '+' || string[pos - 1] == ':') - string[--pos] = NULL; - return (pos); + bit = pbit = r = 0; + left = size; + + p = string + (len = snprintf(string, left, "%d:", + element->mme_level)); + left -= len; + + do { + pbit = bit++; + len = 0; + if (bit <= MAC_MLS_MAX_COMPARTMENTS && + MAC_MLS_BIT_TEST(bit, element->mme_compartments)) { + if (pbit == bit - 1) { + if (r == 0) + p += len = snprintf(p, left, + "%d+", bit); + r++; + } + } else { + if (r > 2) + p += len = snprintf(p, left, "+%d+", + pbit); + else if (r > 1) + p += len = snprintf(p, left, "%d+", + pbit); + r = 0; + } + left -= len; + } while(bit <= MAC_MLS_MAX_COMPARTMENTS); + + len = size - left - 1; + string[len] = '\0'; + return (len); default: panic("mac_mls_element_to_string: invalid type (%d)", @@ -613,6 +639,8 @@ static int mac_mls_parse_element(struct mac_mls_element *element, char *string) { + char *p, *tp, *np; + int crange, d, i; if (strcmp(string, "high") == 0 || strcmp(string, "hi") == 0) { @@ -626,42 +654,42 @@ strcmp(string, "eq") == 0) { element->mme_type = MAC_MLS_TYPE_EQUAL; element->mme_level = MAC_MLS_TYPE_UNDEF; + } else { - char *p0, *p1; - int d; - - p0 = string; - d = strtol(p0, &p1, 10); - + d = strtol(string, &p, 10); if (d < 0 || d > 65535) return (EINVAL); + element->mme_type = MAC_MLS_TYPE_LEVEL; element->mme_level = d; - if (*p1 != ':') { - if (p1 == p0 || *p1 != '\0') + if (p == string || *p == '\0') + return (0); + if (*p != ':') + return (EINVAL); + np = ++p; + if (np == NULL || *np == '\0') + return (0); + crange = d = 0; + while ((tp = strsep(&np, "+")) != NULL) { + d = strtol(tp, &p, 10); + if (*p != '\0' || d < 1 || + d > MAC_MLS_MAX_COMPARTMENTS || crange >= d) return (EINVAL); - else - return (0); + if (crange > 0) { + for (i = crange; i <= d; i++) + MAC_MLS_BIT_SET(i, + element->mme_compartments); + crange = 0; + } + if (np != NULL && *np == '+') { + ++np; + crange = d; + } else + MAC_MLS_BIT_SET(d, element->mme_compartments); } - else - if (*(p1 + 1) == '\0') - return (0); - while ((p0 = ++p1)) { - d = strtol(p0, &p1, 10); - if (d < 1 || d > MAC_MLS_MAX_COMPARTMENTS) - return (EINVAL); - - MAC_MLS_BIT_SET(d, element->mme_compartments); - - if (*p1 == '\0') - break; - if (p1 == p0 || *p1 != '+') - return (EINVAL); - } } - return (0); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 22 6:34: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03FAD37B404; Fri, 22 Nov 2002 06:33:59 -0800 (PST) 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 7D82737B401 for ; Fri, 22 Nov 2002 06:33:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BD6943E4A for ; Fri, 22 Nov 2002 06:33:58 -0800 (PST) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAMEUimV059566 for ; Fri, 22 Nov 2002 06:30:44 -0800 (PST) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAMEUiWd059562 for perforce@freebsd.org; Fri, 22 Nov 2002 06:30:44 -0800 (PST) Date: Fri, 22 Nov 2002 06:30:44 -0800 (PST) Message-Id: <200211221430.gAMEUiWd059562@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 21369 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21369 Change 21369 by cvance@cvance_laptop on 2002/11/22 06:29:50 Label /var/log/fs-errors with a new type, and allow xfs to read/write to it. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/xfs.te#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/xfs.fc#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/xfs.te#2 (text+ko) ==== @@ -31,3 +31,6 @@ # Bind to /tmp/.font-unix/fs-1. allow xfs_t xfs_tmp_t:unix_stream_socket name_bind; +# Default FreeBSD install uses /var/log/fs-errors for error log +type xfs_errorlog_t, file_type, sysadmfile; +allow xfs_t xfs_errorlog_t:file rw_file_perms; ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/xfs.fc#4 (text+ko) ==== @@ -1,3 +1,4 @@ # xfs /tmp/.font-unix(/.*)? system_u:object_r:xfs_tmp_t /usr/X11R6/bin/xfs system_u:object_r:xfs_exec_t +/var/log/fs-errors system_u:object_r:xfs_errorlog_t To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 22 6:34: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 051D137B406; Fri, 22 Nov 2002 06:34:00 -0800 (PST) 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 327B937B412 for ; Fri, 22 Nov 2002 06:33:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C600F43E4A for ; Fri, 22 Nov 2002 06:33:58 -0800 (PST) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAMEUjmV059572 for ; Fri, 22 Nov 2002 06:30:45 -0800 (PST) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAMEUj6O059569 for perforce@freebsd.org; Fri, 22 Nov 2002 06:30:45 -0800 (PST) Date: Fri, 22 Nov 2002 06:30:45 -0800 (PST) Message-Id: <200211221430.gAMEUj6O059569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 21370 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21370 Change 21370 by cvance@cvance_laptop on 2002/11/22 06:30:41 Label /dev entries just a tiny bit better than before Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/genfs_contexts#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/genfs_contexts#2 (text+ko) ==== @@ -41,23 +41,13 @@ genfscon devfs /console system_u:object_r:console_device_t genfscon devfs /kmem system_u:object_r:memory_device_t genfscon devfs /mem system_u:object_r:memory_device_t -genfscon devfs /port system_u:object_r:memory_device_t genfscon devfs /random system_u:object_r:random_device_t genfscon devfs /urandom system_u:object_r:random_device_t genfscon devfs /tty system_u:object_r:devtty_t -genfscon devfs /vc -c system_u:object_r:tty_device_t -genfscon devfs /pts system_u:object_r:devpts_t -genfscon devfs /scsi -c system_u:object_r:fixed_disk_device_t -genfscon devfs /scsi -b system_u:object_r:fixed_disk_device_t -genfscon devfs /ide -c system_u:object_r:fixed_disk_device_t -genfscon devfs /ide -b system_u:object_r:fixed_disk_device_t -genfscon devfs /discs -c system_u:object_r:fixed_disk_device_t -genfscon devfs /discs -b system_u:object_r:fixed_disk_device_t -genfscon devfs /cdroms -c system_u:object_r:removable_device_t -genfscon devfs /cdroms -b system_u:object_r:removable_device_t -genfscon devfs /floppy -c system_u:object_r:removable_device_t -genfscon devfs /floppy -b system_u:object_r:removable_device_t -genfscon devfs /rtc system_u:object_r:clock_device_t +genfscon devfs /pty system_u:object_r:devpts_t +genfscon devfs /ad -c system_u:object_r:fixed_disk_device_t +genfscon devfs /acd -c system_u:object_r:fixed_disk_device_t +genfscon devfs /fd -c system_u:object_r:removable_device_t genfscon devfs /ppp system_u:object_r:ppp_device_t genfscon devfs /initctl system_u:object_r:initctl_t genfscon devfs /log system_u:object_r:devlog_t @@ -65,7 +55,7 @@ genfscon devfs /input/mouse system_u:object_r:mouse_device_t genfscon devfs /gpmctl system_u:object_r:gpmctl_t genfscon devfs /ptmx system_u:object_r:ptmx_t -genfscon devfs /misc/apm_bios system_u:object_r:apm_bios_t +genfscon devfs /acpi system_u:object_r:apm_bios_t genfscon devfs /sound -c system_u:object_r:sound_device_t - +genfscon devfs /usb system_u:object_r:usbdevfs_device_t # FLASK To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 22 6:43:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8127537B404; Fri, 22 Nov 2002 06:43:11 -0800 (PST) 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 15BD437B401 for ; Fri, 22 Nov 2002 06:43:11 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C93F343EA3 for ; Fri, 22 Nov 2002 06:43:10 -0800 (PST) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAMEdvmV060139 for ; Fri, 22 Nov 2002 06:39:57 -0800 (PST) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAMEdv02060136 for perforce@freebsd.org; Fri, 22 Nov 2002 06:39:57 -0800 (PST) Date: Fri, 22 Nov 2002 06:39:57 -0800 (PST) Message-Id: <200211221439.gAMEdv02060136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 21371 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21371 Change 21371 by cvance@cvance_laptop on 2002/11/22 06:39:27 Add a security structure for superblock/mount structures. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_labels.h#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_labels.h#2 (text+ko) ==== @@ -55,4 +55,14 @@ avc_entry_ref_t avcr; }; +struct mount_security_struct { + security_id_t sid; /* SID of file system */ + struct psidtab *psidtab; /* persistent SID mapping */ + unsigned char uses_psids; /* uses persistent SID flag */ + unsigned char initialized; /* initialization flag */ + unsigned char uses_task; /* use creating task SID for inodes */ + unsigned char uses_genfs; /* use security_genfs_sid for inodes */ + unsigned char proc; /* call procfs_set_sid */ + unsigned char uses_trans; /* call security_transition_sid */ +}; #endif /* _SYS_SECURITY_SEBSD_LABELS_H */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 22 8: 2:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B29237B404; Fri, 22 Nov 2002 08:02:48 -0800 (PST) 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 0F04E37B401 for ; Fri, 22 Nov 2002 08:02:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49AF943E6E for ; Fri, 22 Nov 2002 08:02:47 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAMFxXmV064951 for ; Fri, 22 Nov 2002 07:59:33 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAMFxXWw064948 for perforce@freebsd.org; Fri, 22 Nov 2002 07:59:33 -0800 (PST) Date: Fri, 22 Nov 2002 07:59:33 -0800 (PST) Message-Id: <200211221559.gAMFxXWw064948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21372 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21372 Change 21372 by green@green_laptop_2 on 2002/11/22 07:58:33 Use real ucreds in the NFS server's request structures for consistency, and compare only the relevant parts of each instead of relying on all of ucred's "bookkeeping" being invalid. Affected files ... .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs.h#5 edit .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#17 edit .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#8 edit .. //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_syscalls.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs.h#5 (text+ko) ==== @@ -254,7 +254,7 @@ u_int32_t nd_retxid; /* Reply xid */ struct timeval nd_starttime; /* Time RPC initiated */ fhandle_t nd_fh; /* File handle */ - struct ucred nd_cr; /* Credentials */ + struct ucred *nd_cr; /* Credentials */ }; /* Bits for "nd_flag" */ @@ -272,8 +272,10 @@ !bcmp((caddr_t)&(o)->nd_fh, (caddr_t)&(n)->nd_fh, NFSX_V3FH)) #define NFSW_SAMECRED(o, n) \ - (!bcmp((caddr_t)&(o)->nd_cr, (caddr_t)&(n)->nd_cr, \ - sizeof (struct ucred))) + ((o)->nd_cr->cr_uid == (n)->nd_cr->cr_uid && \ + (o)->nd_cr->cr_ngroups == (n)->nd_cr->cr_ngroups && \ + bcmp((o)->nd_cr->cr_groups, (n)->nd_cr->cr_groups, \ + (n)->nd_cr->cr_ngroups * sizeof(gid_t)) == 0) /* * Defines for WebNFS ==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_serv.c#17 (text+ko) ==== @@ -171,7 +171,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct vnode *vp = NULL; nfsfh_t nfh; fhandle_t *fhp; @@ -238,7 +238,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct nfs_fattr *fp; struct vattr va; struct vattr *vap = &va; @@ -287,7 +287,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct vattr va, preat; struct vattr *vap = &va; struct nfsv2_sattr *sp; @@ -442,7 +442,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct nfs_fattr *fp; struct nameidata nd, ind, *ndp = &nd; struct vnode *vp, *dirp = NULL; @@ -631,7 +631,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct iovec iv[(NFS_MAXPATHLEN+MLEN-1)/MLEN]; struct iovec *ivp = iv; struct mbuf *mp; @@ -736,7 +736,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct iovec *iv; struct iovec *iv2; struct mbuf *m; @@ -982,7 +982,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct iovec *ivp; int i, cnt; struct mbuf *mp; @@ -1229,7 +1229,7 @@ mrep = nfsd->nd_mrep; md = nfsd->nd_md; dpos = nfsd->nd_dpos; - cred = &nfsd->nd_cr; + cred = nfsd->nd_cr; v3 = (nfsd->nd_flag & ND_NFSV3); LIST_INIT(&nfsd->nd_coalesce); nfsd->nd_mreq = NULL; @@ -1364,7 +1364,7 @@ splx(s); mrep = nfsd->nd_mrep; nfsd->nd_mrep = NULL; - cred = &nfsd->nd_cr; + cred = nfsd->nd_cr; v3 = (nfsd->nd_flag & ND_NFSV3); forat_ret = aftat_ret = 1; error = nfsrv_fhtovp(&nfsd->nd_fh, 1, &vp, cred, slp, @@ -1576,7 +1576,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct nfs_fattr *fp; struct vattr va, dirfor, diraft; struct vattr *vap = &va; @@ -1859,7 +1859,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct vattr va, dirfor, diraft; struct vattr *vap = &va; u_int32_t *tl; @@ -2050,7 +2050,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct nameidata nd; caddr_t bpos; int error = 0, len, dirfor_ret = 1, diraft_ret = 1; @@ -2148,7 +2148,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; caddr_t bpos; int error = 0, len, len2, fdirfor_ret = 1, fdiraft_ret = 1; int tdirfor_ret = 1, tdiraft_ret = 1; @@ -2375,7 +2375,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct nameidata nd; caddr_t bpos; int error = 0, rdonly, len, dirfor_ret = 1, diraft_ret = 1; @@ -2496,7 +2496,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct vattr va, dirfor, diraft; struct nameidata nd; struct vattr *vap = &va; @@ -2680,7 +2680,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct vattr va, dirfor, diraft; struct vattr *vap = &va; struct nfs_fattr *fp; @@ -2826,7 +2826,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; caddr_t bpos; int error = 0, len, dirfor_ret = 1, diraft_ret = 1; int v3 = (nfsd->nd_flag & ND_NFSV3); @@ -2972,7 +2972,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; char *bp, *be; struct mbuf *mp; struct dirent *dp; @@ -3263,7 +3263,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; char *bp, *be; struct mbuf *mp; struct dirent *dp; @@ -3601,7 +3601,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct vattr bfor, aft; struct vnode *vp = NULL; nfsfh_t nfh; @@ -3752,7 +3752,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct statfs *sf; struct nfs_statfs *sfp; caddr_t bpos; @@ -3830,7 +3830,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct nfsv3_fsinfo *sip; caddr_t bpos; int error = 0, rdonly, getret = 1, pref; @@ -3905,7 +3905,7 @@ struct mbuf *mrep = nfsd->nd_mrep, *md = nfsd->nd_md; struct sockaddr *nam = nfsd->nd_nam; caddr_t dpos = nfsd->nd_dpos; - struct ucred *cred = &nfsd->nd_cr; + struct ucred *cred = nfsd->nd_cr; struct nfsv3_pathconf *pc; caddr_t bpos; int error = 0, rdonly, getret = 1; ==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_srvsock.c#8 (text+ko) ==== @@ -354,34 +354,32 @@ } nfsm_adv(nfsm_rndup(len)); tl = nfsm_dissect(u_int32_t *, 3 * NFSX_UNSIGNED); - /* - * XXX: This credential should be managed using crget(9) - * and related calls. Right now, this tramples on any - * extensible data in the ucred, fails to initialize the - * mutex, and worse. This must be fixed before FreeBSD - * 5.0-RELEASE. - */ - bzero((caddr_t)&nd->nd_cr, sizeof (struct ucred)); - nd->nd_cr.cr_ref = 1; - nd->nd_cr.cr_uid = fxdr_unsigned(uid_t, *tl++); - nd->nd_cr.cr_gid = fxdr_unsigned(gid_t, *tl++); + nd->nd_cr = crget(); + nd->nd_cr->cr_uid = nd->nd_cr->cr_ruid = + nd->nd_cr->cr_svuid = fxdr_unsigned(uid_t, *tl++); + nd->nd_cr->cr_groups[0] = nd->nd_cr->cr_rgid = + nd->nd_cr->cr_svgid = fxdr_unsigned(gid_t, *tl++); len = fxdr_unsigned(int, *tl); if (len < 0 || len > RPCAUTH_UNIXGIDS) { m_freem(mrep); + crfree(nd->nd_cr); + nd->nd_cr = NULL; return (EBADRPC); } tl = nfsm_dissect(u_int32_t *, (len + 2) * NFSX_UNSIGNED); for (i = 1; i <= len; i++) if (i < NGROUPS) - nd->nd_cr.cr_groups[i] = fxdr_unsigned(gid_t, *tl++); + nd->nd_cr->cr_groups[i] = fxdr_unsigned(gid_t, *tl++); else tl++; - nd->nd_cr.cr_ngroups = (len >= NGROUPS) ? NGROUPS : (len + 1); - if (nd->nd_cr.cr_ngroups > 1) - nfsrvw_sort(nd->nd_cr.cr_groups, nd->nd_cr.cr_ngroups); + nd->nd_cr->cr_ngroups = (len >= NGROUPS) ? NGROUPS : (len + 1); + if (nd->nd_cr->cr_ngroups > 1) + nfsrvw_sort(nd->nd_cr->cr_groups, nd->nd_cr->cr_ngroups); len = fxdr_unsigned(int, *++tl); if (len < 0 || len > RPCAUTH_MAXSIZ) { m_freem(mrep); + crfree(nd->nd_cr); + nd->nd_cr = NULL; return (EBADRPC); } if (len > 0) @@ -676,6 +674,8 @@ if (nam) { FREE(nam, M_SONAME); } + if (nd->nd_cr != NULL) + crfree(nd->nd_cr); free((caddr_t)nd, M_NFSRVDESC); return (error); } ==== //depot/projects/trustedbsd/mac/sys/nfsserver/nfs_syscalls.c#11 (text+ko) ==== @@ -365,6 +365,8 @@ } if (error || (slp->ns_flag & SLP_VALID) == 0) { if (nd) { + if (nd->nd_cr != NULL) + crfree(nd->nd_cr); free((caddr_t)nd, M_NFSRVDESC); nd = NULL; } @@ -491,6 +493,8 @@ if (slp->ns_so->so_proto->pr_flags & PR_CONNREQUIRED) nfs_slpunlock(slp); if (error == EINTR || error == ERESTART) { + if (nd->nd_cr != NULL) + crfree(nd->nd_cr); free((caddr_t)nd, M_NFSRVDESC); nfsrv_slpderef(slp); s = splnet(); @@ -504,6 +508,8 @@ break; }; if (nd) { + if (nd->nd_cr != NULL) + crfree(nd->nd_cr); FREE((caddr_t)nd, M_NFSRVDESC); nd = NULL; } @@ -578,6 +584,8 @@ for (nwp = LIST_FIRST(&slp->ns_tq); nwp; nwp = nnwp) { nnwp = LIST_NEXT(nwp, nd_tq); LIST_REMOVE(nwp, nd_tq); + if (nwp->nd_cr != NULL) + crfree(nwp->nd_cr); free((caddr_t)nwp, M_NFSRVDESC); } LIST_INIT(&slp->ns_tq); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 22 10:26:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EA9637B404; Fri, 22 Nov 2002 10:26:49 -0800 (PST) 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 F0ADA37B401 for ; Fri, 22 Nov 2002 10:26:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9ABFA43EA3 for ; Fri, 22 Nov 2002 10:26:48 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAMINYmV073834 for ; Fri, 22 Nov 2002 10:23:34 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAMINXT2073831 for perforce@freebsd.org; Fri, 22 Nov 2002 10:23:33 -0800 (PST) Date: Fri, 22 Nov 2002 10:23:33 -0800 (PST) Message-Id: <200211221823.gAMINXT2073831@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21377 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21377 Change 21377 by green@green_laptop_2 on 2002/11/22 10:23:06 Do the right thing for files that are not to be relabeled at all (not crash). Affected files ... .. //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#8 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/setfsmac/setfsmac.c#8 (text+ko) ==== @@ -454,6 +454,8 @@ /* add length of "x\0"/"y," */ size += strlen(ls->match->mactext) + 1; } + if (size == 0) + return (0); macstr = malloc(size); if (macstr == NULL) err(1, "malloc"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 22 13:23:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E765437B404; Fri, 22 Nov 2002 13:23:24 -0800 (PST) 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 977E937B401 for ; Fri, 22 Nov 2002 13:23:24 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5783043E91 for ; Fri, 22 Nov 2002 13:23:24 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAMLK9mV085050 for ; Fri, 22 Nov 2002 13:20:09 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAMLK9hj085047 for perforce@freebsd.org; Fri, 22 Nov 2002 13:20:09 -0800 (PST) Date: Fri, 22 Nov 2002 13:20:09 -0800 (PST) Message-Id: <200211222120.gAMLK9hj085047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21381 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21381 Change 21381 by green@green_laptop_2 on 2002/11/22 13:19:21 Correct the location of the real sendmail binary. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/sendmail.fc#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/sendmail.fc#4 (text+ko) ==== @@ -2,8 +2,7 @@ /etc/aliases system_u:object_r:etc_aliases_t /etc/aliases.db system_u:object_r:etc_aliases_t /etc/mail(/.*)? system_u:object_r:etc_mail_t -/usr/sbin/sendmail system_u:object_r:sendmail_exec_t -/usr/sbin/sendmail.sendmail system_u:object_r:sendmail_exec_t +/usr/libexec/sendmail/sendmail system_u:object_r:sendmail_exec_t /var/spool/mail(/.*)? system_u:object_r:mail_spool_t /var/spool/mqueue(/.*)? system_u:object_r:mqueue_spool_t /var/log/sendmail.st system_u:object_r:sendmail_var_log_t To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 22 13:37:44 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFFE137B404; Fri, 22 Nov 2002 13:37:42 -0800 (PST) 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 6EDD337B401 for ; Fri, 22 Nov 2002 13:37:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2E87643EA3 for ; Fri, 22 Nov 2002 13:37:42 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAMLYRmV085779 for ; Fri, 22 Nov 2002 13:34:27 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAMLYQ6T085776 for perforce@freebsd.org; Fri, 22 Nov 2002 13:34:26 -0800 (PST) Date: Fri, 22 Nov 2002 13:34:26 -0800 (PST) Message-Id: <200211222134.gAMLYQ6T085776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21382 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21382 Change 21382 by green@green_laptop_2 on 2002/11/22 13:33:44 Also, sendmail now uses /var/spool/clientmqueue. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/sendmail.fc#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/sendmail.fc#5 (text+ko) ==== @@ -1,9 +1,12 @@ # sendmail +# ----. +# XXX | We haven't accounted for pidfiles. +# ----' /etc/aliases system_u:object_r:etc_aliases_t /etc/aliases.db system_u:object_r:etc_aliases_t /etc/mail(/.*)? system_u:object_r:etc_mail_t /usr/libexec/sendmail/sendmail system_u:object_r:sendmail_exec_t /var/spool/mail(/.*)? system_u:object_r:mail_spool_t -/var/spool/mqueue(/.*)? system_u:object_r:mqueue_spool_t +/var/spool/(client)?mqueue(/.*)? system_u:object_r:mqueue_spool_t /var/log/sendmail.st system_u:object_r:sendmail_var_log_t /var/mail(/.*)? system_u:object_r:mail_spool_t To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 22 14:27:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D482A37B404; Fri, 22 Nov 2002 14:27:43 -0800 (PST) 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 80BDD37B401 for ; Fri, 22 Nov 2002 14:27:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FF9443EA9 for ; Fri, 22 Nov 2002 14:27:43 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAMMOSmV088878 for ; Fri, 22 Nov 2002 14:24:28 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAMMORHv088875 for perforce@freebsd.org; Fri, 22 Nov 2002 14:24:27 -0800 (PST) Date: Fri, 22 Nov 2002 14:24:27 -0800 (PST) Message-Id: <200211222224.gAMMORHv088875@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 21383 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21383 Change 21383 by green@green_laptop_2 on 2002/11/22 14:24:06 Start getting ntpd(8) policy correct; modulo /dev warnings, there are just a few files left that need access permissions (possibly resolver-related). Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ntpd.te#3 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ntpd.fc#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/ntpd.te#3 (text+ko) ==== @@ -11,13 +11,18 @@ type var_log_ntp_t, file_type, sysadmfile; type var_run_ntp_t, file_type, sysadmfile; type etc_ntp_t, file_type, sysadmfile; +type tmp_ntpd_t, file_type, sysadmfile, tmpfile; +file_type_auto_trans(ntpd_t, etc_t, etc_ntp_t) +file_type_auto_trans(ntpd_t, tmp_t, tmp_ntpd_t) file_type_auto_trans(ntpd_t, var_log_t, var_log_ntp_t) +file_type_auto_trans(ntpd_t, var_run_t, var_run_ntpd_t) allow ntpd_t var_lib_t:dir r_dir_perms; allow ntpd_t usr_t:file r_file_perms; allow ntpd_t { var_lib_ntp_t var_log_ntp_t var_run_ntp_t }:dir rw_dir_perms; -allow ntpd_t { var_lib_ntp_t var_log_ntp_t var_run_ntp_t }:file create_file_perms; +allow ntpd_t { var_lib_ntp_t var_log_ntp_t var_run_ntp_t var_run_ntpd_t }:file create_file_perms; +allow ntpd_t var_run_ntpd_t:file rw_file_perms; allow ntpd_t self:capability { sys_time net_bind_service ipc_lock }; dontaudit ntpd_t self:capability fsetid; @@ -27,6 +32,7 @@ allow ntpd_t etc_t:dir r_dir_perms; allow ntpd_t etc_t:lnk_file r_file_perms; allow ntpd_t etc_ntp_t:file rw_file_perms; +allow ntpd_t resolv_conf_t:file r_file_perms; # Use the network. can_network(ntpd_t) ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/ntpd.fc#4 (text+ko) ==== @@ -1,8 +1,9 @@ /var/lib/ntp(/.*)? system_u:object_r:var_lib_ntp_t -/etc/ntp\..* system_u:object_r:etc_ntp_t -/var/db/ntp\..* system_u:object_r:etc_ntp_t +/etc/ntp.* system_u:object_r:etc_ntp_t +/var/db/ntp.* system_u:object_r:etc_ntp_t /usr/sbin/ntpd system_u:object_r:ntpd_exec_t /var/log/ntpstats(/.*)? system_u:object_r:var_log_ntp_t /var/log/ntpd system_u:object_r:var_log_ntp_t -/var/run/(ntpd\.pid|ntp/.*) system_u:object_r:var_run_ntp_t +/var/run/ntpd\.pid system_u:object_r:var_run_ntpd_t +/var/run/ntp/.* system_u:object_r:var_run_ntp_t /etc/cron\.(daily|weekly)/ntp-simple system_u:object_r:ntpd_exec_t To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 22 16:55:16 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AF3337B404; Fri, 22 Nov 2002 16:54:51 -0800 (PST) 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 E9CBC37B401 for ; Fri, 22 Nov 2002 16:54:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A106C43E6E for ; Fri, 22 Nov 2002 16:54:49 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAN0pYmV099305 for ; Fri, 22 Nov 2002 16:51:34 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAN0pVBF099302 for perforce@freebsd.org; Fri, 22 Nov 2002 16:51:31 -0800 (PST) Date: Fri, 22 Nov 2002 16:51:31 -0800 (PST) Message-Id: <200211230051.gAN0pVBF099302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21392 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21392 Change 21392 by peter@peter_daintree on 2002/11/22 16:50:54 IFC @21391 Affected files ... .. //depot/projects/ia64/MAINTAINERS#18 integrate .. //depot/projects/ia64/etc/crontab#3 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#9 integrate .. //depot/projects/ia64/etc/periodic/security/700.kernelmsg#6 integrate .. //depot/projects/ia64/etc/periodic/security/security.functions#2 integrate .. //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#9 integrate .. //depot/projects/ia64/games/fortune/datfiles/startrek#2 integrate .. //depot/projects/ia64/gnu/usr.bin/man/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/man/makewhatis/Makefile#2 delete .. //depot/projects/ia64/gnu/usr.bin/man/makewhatis/makewhatis.1#3 delete .. //depot/projects/ia64/gnu/usr.bin/man/makewhatis/makewhatis.local.8#3 delete .. //depot/projects/ia64/gnu/usr.bin/man/makewhatis/makewhatis.local.sh#2 delete .. //depot/projects/ia64/gnu/usr.bin/man/makewhatis/makewhatis.perl#3 delete .. //depot/projects/ia64/include/Makefile#18 integrate .. //depot/projects/ia64/include/uuid.h#1 branch .. //depot/projects/ia64/lib/libc/Makefile#5 integrate .. //depot/projects/ia64/lib/libc/Makefile.inc#4 delete .. //depot/projects/ia64/lib/libc/alpha/gen/Makefile.inc#6 integrate .. //depot/projects/ia64/lib/libc/compat-43/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/db/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/db/btree/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/db/db/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/db/hash/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/db/man/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/db/mpool/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/db/recno/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/gen/Makefile.inc#15 integrate .. //depot/projects/ia64/lib/libc/gen/sysconf.c#9 integrate .. //depot/projects/ia64/lib/libc/gmon/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/i386/sys/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/locale/Makefile.inc#11 integrate .. //depot/projects/ia64/lib/libc/net/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libc/nls/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/posix1e/Makefile.inc#7 integrate .. //depot/projects/ia64/lib/libc/quad/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/regex/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/rpc/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/sparc64/fpu/Makefile.inc#4 integrate .. //depot/projects/ia64/lib/libc/stdio/Makefile.inc#5 integrate .. //depot/projects/ia64/lib/libc/stdlib/Makefile.inc#8 integrate .. //depot/projects/ia64/lib/libc/stdtime/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/string/Makefile.inc#7 integrate .. //depot/projects/ia64/lib/libc/sys/Makefile.inc#9 integrate .. //depot/projects/ia64/lib/libc/sys/kse.2#3 integrate .. //depot/projects/ia64/lib/libc/sys/select.2#2 integrate .. //depot/projects/ia64/lib/libc/uuid/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/uuid/uuid.h#3 delete .. //depot/projects/ia64/lib/libc/xdr/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libc/yp/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc_r/arch/ia64/_atomic_lock.S#3 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#13 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/thr_enter_uts.S#2 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/thr_switch.S#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#4 integrate .. //depot/projects/ia64/lib/libutil/login.conf.5#6 integrate .. //depot/projects/ia64/lib/libutil/logout.c#3 integrate .. //depot/projects/ia64/lib/libutil/logwtmp.c#4 integrate .. //depot/projects/ia64/libexec/ftpd/logwtmp.c#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/alpha/reloc.c#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/alpha/rtld_machdep.h#3 integrate .. //depot/projects/ia64/libexec/rtld-elf/i386/reloc.c#3 integrate .. //depot/projects/ia64/libexec/rtld-elf/i386/rtld_machdep.h#3 integrate .. //depot/projects/ia64/libexec/rtld-elf/ia64/reloc.c#8 integrate .. //depot/projects/ia64/libexec/rtld-elf/ia64/rtld_machdep.h#2 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/ia64/libexec/rtld-elf/sparc64/reloc.c#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/sparc64/rtld_machdep.h#3 integrate .. //depot/projects/ia64/libexec/rtld-elf/sparc64/rtld_start.S#3 integrate .. //depot/projects/ia64/release/Makefile#26 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/hardware/common/dev.sgml#10 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/common/install.sgml#7 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/installation/sparc64/article.sgml#3 integrate .. //depot/projects/ia64/release/doc/de_DE.ISO8859-1/relnotes/common/new.sgml#14 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#13 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#26 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#51 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/Makefile#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/early-adopter/Makefile#1 branch .. //depot/projects/ia64/release/doc/ja_JP.eucJP/early-adopter/article.sgml#1 branch .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#3 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.sgml#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/hardware/ia64/article.sgml#2 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/relnotes/common/new.sgml#10 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/share/sgml/release.dsl#5 integrate .. //depot/projects/ia64/release/ia64/boot_crunch.conf#3 integrate .. //depot/projects/ia64/release/pc98/drivers.conf#6 integrate .. //depot/projects/ia64/release/picobsd/mfs_tree/etc/rc#4 integrate .. //depot/projects/ia64/release/scripts/print-cdrom-packages.sh#17 integrate .. //depot/projects/ia64/sbin/devd/devd.8#3 integrate .. //depot/projects/ia64/sbin/devd/devd.conf#2 integrate .. //depot/projects/ia64/sbin/devd/devd.conf.5#2 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.c#18 integrate .. //depot/projects/ia64/sbin/dumpfs/dumpfs.c#9 integrate .. //depot/projects/ia64/sbin/gbde/gbde.8#3 integrate .. //depot/projects/ia64/sbin/growfs/growfs.8#8 integrate .. //depot/projects/ia64/sbin/quotacheck/quotacheck.c#8 integrate .. //depot/projects/ia64/secure/lib/libcrypto/Makefile#11 integrate .. //depot/projects/ia64/secure/lib/libssl/Makefile#5 integrate .. //depot/projects/ia64/secure/usr.bin/openssl/Makefile#3 integrate .. //depot/projects/ia64/share/examples/scsi_target/Makefile#2 integrate .. //depot/projects/ia64/share/examples/scsi_target/scsi_cmds.c#1 branch .. //depot/projects/ia64/share/examples/scsi_target/scsi_target.8#1 branch .. //depot/projects/ia64/share/examples/scsi_target/scsi_target.c#2 integrate .. //depot/projects/ia64/share/examples/scsi_target/scsi_target.h#1 branch .. //depot/projects/ia64/share/man/man4/Makefile#22 integrate .. //depot/projects/ia64/share/man/man4/ng_bluetooth.4#1 branch .. //depot/projects/ia64/share/man/man4/ng_bt3c.4#1 branch .. //depot/projects/ia64/share/man/man4/ng_btsocket.4#1 branch .. //depot/projects/ia64/share/man/man4/ng_h4.4#1 branch .. //depot/projects/ia64/share/man/man4/ng_hci.4#1 branch .. //depot/projects/ia64/share/man/man4/ng_l2cap.4#1 branch .. //depot/projects/ia64/share/man/man4/ng_ubt.4#1 branch .. //depot/projects/ia64/share/man/man4/targ.4#1 branch .. //depot/projects/ia64/share/man/man5/make.conf.5#22 integrate .. //depot/projects/ia64/share/man/man7/release.7#14 integrate .. //depot/projects/ia64/share/man/man8/Makefile#6 integrate .. //depot/projects/ia64/share/man/man8/rc.8#6 integrate .. //depot/projects/ia64/share/man/man8/rc.subr.8#1 branch .. //depot/projects/ia64/share/man/man9/Makefile#15 integrate .. //depot/projects/ia64/share/man/man9/mac_biba.9#1 branch .. //depot/projects/ia64/share/man/man9/zone.9#7 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#22 integrate .. //depot/projects/ia64/sys/alpha/alpha/vm_machdep.c#11 integrate .. //depot/projects/ia64/sys/boot/forth/loader.conf#12 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_targetio.h#2 integrate .. //depot/projects/ia64/sys/conf/options#35 integrate .. //depot/projects/ia64/sys/conf/options.alpha#8 integrate .. //depot/projects/ia64/sys/conf/options.i386#10 integrate .. //depot/projects/ia64/sys/conf/options.ia64#9 integrate .. //depot/projects/ia64/sys/conf/options.pc98#12 integrate .. //depot/projects/ia64/sys/conf/options.powerpc#4 integrate .. //depot/projects/ia64/sys/conf/options.sparc64#5 integrate .. //depot/projects/ia64/sys/conf/options.x86_64#4 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/ia64/sys/dev/amr/amr_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#11 integrate .. //depot/projects/ia64/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/ia64/sys/dev/pcic/i82365.c#4 integrate .. //depot/projects/ia64/sys/dev/sab/sab.c#3 integrate .. //depot/projects/ia64/sys/dev/usb/ucom.c#5 integrate .. //depot/projects/ia64/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/ia64/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/ia64/sys/dev/usb/uvscom.c#5 integrate .. //depot/projects/ia64/sys/geom/geom_dump.c#13 integrate .. //depot/projects/ia64/sys/geom/geom_pc98.c#13 integrate .. //depot/projects/ia64/sys/geom/geom_slice.c#15 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_machdep.c#6 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#13 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_proto.h#7 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_syscall.h#8 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_sysent.c#9 integrate .. //depot/projects/ia64/sys/ia64/ia32/syscalls.master#11 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#48 integrate .. //depot/projects/ia64/sys/ia64/ia64/vm_machdep.c#16 integrate .. //depot/projects/ia64/sys/kern/init_main.c#19 integrate .. //depot/projects/ia64/sys/kern/kern_clock.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#26 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_linker.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_proc.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_shutdown.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#20 integrate .. //depot/projects/ia64/sys/kern/link_elf.c#14 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#3 integrate .. //depot/projects/ia64/sys/kern/vfs_aio.c#23 integrate .. //depot/projects/ia64/sys/modules/Makefile#27 integrate .. //depot/projects/ia64/sys/modules/cam/Makefile#5 integrate .. //depot/projects/ia64/sys/modules/netgraph/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/netgraph/bluetooth/Makefile#1 branch .. //depot/projects/ia64/sys/modules/netgraph/bluetooth/bluetooth/Makefile#1 branch .. //depot/projects/ia64/sys/modules/netgraph/bluetooth/bt3c/Makefile#1 branch .. //depot/projects/ia64/sys/modules/netgraph/bluetooth/h4/Makefile#1 branch .. //depot/projects/ia64/sys/modules/netgraph/bluetooth/hci/Makefile#1 branch .. //depot/projects/ia64/sys/modules/netgraph/bluetooth/l2cap/Makefile#1 branch .. //depot/projects/ia64/sys/modules/netgraph/bluetooth/socket/Makefile#1 branch .. //depot/projects/ia64/sys/modules/netgraph/bluetooth/ubt/Makefile#1 branch .. //depot/projects/ia64/sys/net/bpf.c#14 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#20 integrate .. //depot/projects/ia64/sys/net/raw_cb.c#5 integrate .. //depot/projects/ia64/sys/net/raw_usrreq.c#7 integrate .. //depot/projects/ia64/sys/netgraph/bluetooth/common/ng_bluetooth.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/h4/TODO#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/ubt/TODO#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/hci/TODO#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_cmds.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_evnt.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_main.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_misc.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_misc.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_prse.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/hci/ng_hci_var.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_bluetooth.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_bt3c.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_btsocket.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_h4.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_hci.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_l2cap.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/include/ng_ubt.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/TODO#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/TODO#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#1 branch .. //depot/projects/ia64/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#1 branch .. //depot/projects/ia64/sys/netinet/igmp.c#6 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#19 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#18 integrate .. //depot/projects/ia64/sys/netinet/ip_var.h#10 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#18 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#19 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_lock.c#9 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#28 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#12 integrate .. //depot/projects/ia64/sys/posix4/posix4.h#5 integrate .. //depot/projects/ia64/sys/posix4/posix4_mib.c#4 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/vm_machdep.c#12 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/autoconf.c#6 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_machdep.c#12 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#25 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#11 integrate .. //depot/projects/ia64/sys/sys/eventhandler.h#7 integrate .. //depot/projects/ia64/sys/sys/kse.h#5 integrate .. //depot/projects/ia64/sys/sys/mac.h#10 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#9 integrate .. //depot/projects/ia64/sys/sys/proc.h#39 integrate .. //depot/projects/ia64/sys/sys/sched.h#2 integrate .. //depot/projects/ia64/sys/sys/select.h#5 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#18 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#15 integrate .. //depot/projects/ia64/sys/vm/uma_core.c#30 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#25 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#24 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#17 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#20 integrate .. //depot/projects/ia64/tools/KSE/ksetest/kse_asm.S#3 integrate .. //depot/projects/ia64/usr.bin/bluetooth/Makefile#3 branch .. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/Makefile#3 branch .. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/btsockstat.1#3 branch .. //depot/projects/ia64/usr.bin/bluetooth/btsockstat/btsockstat.c#3 branch .. //depot/projects/ia64/usr.bin/calendar/calendar.1#7 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.all#3 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.holiday#7 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.southafrica#1 branch .. //depot/projects/ia64/usr.bin/makewhatis/Makefile#2 integrate .. //depot/projects/ia64/usr.bin/makewhatis/makewhatis.local.8#1 branch .. //depot/projects/ia64/usr.bin/makewhatis/makewhatis.local.sh#1 branch .. //depot/projects/ia64/usr.bin/telnet/commands.c#7 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/Makefile#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/bt3cfw/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/bt3cfw/bt3cfw.8#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/bt3cfw/bt3cfw.c#1 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/Makefile#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.8#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.c#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/hccontrol.h#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/info.c#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/link_control.c#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/link_policy.c#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/node.c#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/send_recv.c#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/status.c#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hccontrol/util.c#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/Makefile#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/hcseriald.8#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/hcseriald/hcseriald.c#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/Makefile#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2cap.c#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.8#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.c#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2control/l2control.h#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/Makefile#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/l2ping.8#3 branch .. //depot/projects/ia64/usr.sbin/bluetooth/l2ping/l2ping.c#3 branch .. //depot/projects/ia64/usr.sbin/ntp/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/ntp/Makefile.inc#2 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/disks.c#9 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/index.c#6 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/install.c#10 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#18 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.52 2002/11/11 16:56:40 mjacob Exp $ +$FreeBSD: src/MAINTAINERS,v 1.53 2002/11/21 08:36:01 ru Exp $ subsystem login notes ----------------------------- @@ -84,4 +84,3 @@ etc/rc.* gordon Requests heads-up to help keep etc/rc.d in sync. fdc(4) joerg Just keep me informed of changes, try not to break it. sppp(4) joerg Just keep me informed of changes, try not to break it. -make make Recommends pre-commit review. ==== //depot/projects/ia64/etc/crontab#3 (text+ko) ==== @@ -1,6 +1,6 @@ # /etc/crontab - root's crontab for FreeBSD # -# $FreeBSD: src/etc/crontab,v 1.31 2001/02/19 02:47:41 peter Exp $ +# $FreeBSD: src/etc/crontab,v 1.32 2002/11/22 16:13:39 tom Exp $ # SHELL=/bin/sh PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin @@ -10,18 +10,17 @@ # */5 * * * * root /usr/libexec/atrun # -# save some entropy so that /dev/random can reseed on boot +# Save some entropy so that /dev/random can re-seed on boot. */11 * * * * operator /usr/libexec/save-entropy # -# rotate log files every hour, if necessary +# Rotate log files every hour, if necessary. 0 * * * * root newsyslog # -# do daily/weekly/monthly maintenance +# Perform daily/weekly/monthly maintenance. 1 3 * * * root periodic daily 15 4 * * 6 root periodic weekly 30 5 1 * * root periodic monthly # -# time zone change adjustment for wall cmos clock, -# does nothing, if you have UTC cmos clock. -# See adjkerntz(8) for details. +# Adjust the time zone if the CMOS clock keeps local time, as opposed to +# UTC time. See adjkerntz(8) for details. 1,31 0-5 * * * root adjkerntz -a ==== //depot/projects/ia64/etc/mtree/BSD.include.dist#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.61 2002/10/24 15:25:37 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.62 2002/11/21 00:36:19 julian Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -92,6 +92,10 @@ .. .. netgraph + bluetooth + include + .. + .. .. netinet .. ==== //depot/projects/ia64/etc/periodic/security/700.kernelmsg#6 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.6 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/700.kernelmsg,v 1.7 2002/11/16 14:57:12 thomas Exp $ # # Show kernel log messages @@ -44,7 +44,7 @@ case "$daily_status_security_kernelmsg_enable" in [Yy][Ee][Ss]) - dmesg 2>/dev/null > ${TMP} | + dmesg 2>/dev/null | check_diff new_only dmesg - "${host} kernel log messages:" rc=$?;; *) rc=0;; ==== //depot/projects/ia64/etc/periodic/security/security.functions#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/security.functions,v 1.1 2002/10/25 15:14:16 thomas Exp $ +# $FreeBSD: src/etc/periodic/security/security.functions,v 1.2 2002/11/16 14:58:39 thomas Exp $ # # @@ -63,7 +63,7 @@ cp ${tmpf} ${LOG}/${label}.today || rc=3 fi - if ! cmp ${LOG}/${label}.today ${tmpf} >/dev/null; then + if ! cmp -s ${LOG}/${label}.today ${tmpf} >/dev/null; then [ $rc -lt 1 ] && rc=1 echo "" echo "${msg}" ==== //depot/projects/ia64/games/fortune/datfiles/freebsd-tips#9 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.28 2002/10/20 13:41:44 tom Exp $ +$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.29 2002/11/16 13:24:44 joerg Exp $ % Having trouble using fetch through a firewall? Try setting the environment variable FTP_PASSIVE_MODE to yes, and see fetch(3) for more details. @@ -44,7 +44,7 @@ % You can disable tcsh's terminal beep if you `set nobeep'. % -If you `set watch (0 any any)' in tcsh, you will be notified when +If you `set watch = (0 any any)' in tcsh, you will be notified when someone logs in or out of your system. % Nice tcsh prompt: set prompt = '%m %# ' ==== //depot/projects/ia64/games/fortune/datfiles/startrek#2 (text+ko) ==== @@ -1,3 +1,4 @@ +%% $FreeBSD: src/games/fortune/datfiles/startrek,v 1.2 2002/11/17 09:53:11 schweikh Exp $ A father doesn't destroy his children. -- Lt. Carolyn Palamas, "Who Mourns for Adonais?", stardate 3468.1. @@ -628,7 +629,7 @@ -- Bailey, "The Corbomite Maneuver", stardate 1514.2 % "We have the right to survive!" -"Not be killing others." +"Not by killing others." -- Deela and Kirk, "Wink of An Eye", stardate 5710.5 % We Klingons believe as you do -- the sick should die. Only the strong ==== //depot/projects/ia64/gnu/usr.bin/man/Makefile#3 (text+ko) ==== @@ -1,10 +1,10 @@ -# Master Makefile for man, manpath, apropos, whatis, and makewhatis +# Master Makefile for man, manpath, apropos, and whatis # # You may distribute under the terms of the GNU General Public # License as specified in the README file that comes with the man 1.0 # distribution. # -# $FreeBSD: src/gnu/usr.bin/man/Makefile,v 1.5 2002/05/18 19:47:57 markm Exp $ +# $FreeBSD: src/gnu/usr.bin/man/Makefile,v 1.6 2002/11/18 10:25:27 ru Exp $ # SUBDIR = lib man manpath apropos ==== //depot/projects/ia64/include/Makefile#18 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.185 2002/10/24 15:25:37 rwatson Exp $ +# $FreeBSD: src/include/Makefile,v 1.189 2002/11/21 23:34:57 julian Exp $ # # Doing a make install builds /usr/include # @@ -9,20 +9,16 @@ CLEANFILES= osreldate.h version vers.c SUBDIR= arpa protocols rpcsvc rpc INCS= a.out.h ar.h assert.h bitstring.h complex.h cpio.h ctype.h db.h \ - dirent.h \ - dlfcn.h elf.h elf-hints.h err.h fnmatch.h fmtmsg.h fstab.h \ - fts.h getopt.h glob.h grp.h \ - hesiod.h histedit.h ieeefp.h ifaddrs.h inttypes.h iso646.h kenv.h \ - langinfo.h \ - libgen.h limits.h link.h locale.h malloc.h memory.h monetary.h mpool.h \ - ndbm.h netconfig.h netdb.h nl_types.h nlist.h nsswitch.h objformat.h \ - paths.h pthread.h pthread_np.h pwd.h \ - ranlib.h readpassphrase.h regex.h regexp.h resolv.h rune.h runetype.h \ - search.h setjmp.h sgtty.h \ - signal.h stab.h stdbool.h stddef.h stdio.h stdlib.h strhash.h \ - string.h stringlist.h strings.h sysexits.h tar.h time.h timeconv.h \ - timers.h ttyent.h ulimit.h unistd.h utime.h utmp.h vis.h wchar.h \ - wctype.h + dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \ + fts.h getopt.h glob.h grp.h hesiod.h histedit.h ieeefp.h ifaddrs.h \ + inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \ + locale.h malloc.h memory.h monetary.h mpool.h ndbm.h netconfig.h \ + netdb.h nl_types.h nlist.h nsswitch.h objformat.h paths.h pthread.h \ + pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \ + resolv.h rune.h runetype.h search.h setjmp.h sgtty.h signal.h stab.h \ + stdbool.h stddef.h stdio.h stdlib.h strhash.h string.h stringlist.h \ + strings.h sysexits.h tar.h time.h timeconv.h timers.h ttyent.h \ + ulimit.h unistd.h utime.h utmp.h uuid.h vis.h wchar.h wctype.h MHDRS= float.h floatingpoint.h stdarg.h varargs.h @@ -41,12 +37,14 @@ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ + netgraph/bluetooth/include \ security/lomac security/mac_biba security/mac_bsdextended \ security/mac_mls security/mac_partition ufs/ffs ufs/ufs + # For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/* # are taken care of -LSYMSUBDIRS= ${LSUBDIRS:Ncam/scsi:Nnetatm/*} +LSYMSUBDIRS= ${LSUBDIRS:Ncam/scsi:Nnetatm/*:Nnetgraph/bluetooth/*} # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is ==== //depot/projects/ia64/lib/libc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.36 2002/10/11 22:38:16 peter Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.37 2002/11/18 09:50:54 ru Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -16,10 +16,65 @@ INSTALL_PIC_ARCHIVE= yes PRECIOUSLIB= yes +# Define (empty) variables so that make doesn't give substitution +# errors if the included makefiles don't change these: +MDSRCS= +MISRCS= +MDASM= +MIASM= +NOASM= + # -# Include make rules that are shared with libc_r. +# If there is a machine dependent makefile, use it: # -.include "${.CURDIR}/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" +.endif + +.include "${.CURDIR}/db/Makefile.inc" +.include "${.CURDIR}/compat-43/Makefile.inc" +.include "${.CURDIR}/gen/Makefile.inc" +.if ${MACHINE_ARCH} != "powerpc" +.include "${.CURDIR}/gmon/Makefile.inc" +.endif +.include "${.CURDIR}/locale/Makefile.inc" +.include "${.CURDIR}/net/Makefile.inc" +.include "${.CURDIR}/nls/Makefile.inc" +.include "${.CURDIR}/posix1e/Makefile.inc" +.if !defined(NO_QUAD) +.include "${.CURDIR}/quad/Makefile.inc" +.endif +.include "${.CURDIR}/regex/Makefile.inc" +.include "${.CURDIR}/stdio/Makefile.inc" +.include "${.CURDIR}/stdlib/Makefile.inc" +.include "${.CURDIR}/stdtime/Makefile.inc" +.include "${.CURDIR}/string/Makefile.inc" +.include "${.CURDIR}/sys/Makefile.inc" +.include "${.CURDIR}/rpc/Makefile.inc" +.include "${.CURDIR}/uuid/Makefile.inc" +.include "${.CURDIR}/xdr/Makefile.inc" +.if !defined(NO_YP_LIBC) +CFLAGS+= -DYP +.include "${.CURDIR}/yp/Makefile.inc" +.endif +.if !defined(NO_HESIOD_LIBC) +CFLAGS+= -DHESIOD +.endif + +# If there are no machine dependent sources, append all the +# machine-independent sources: +.if empty(MDSRCS) +SRCS+= ${MISRCS} +.else +# Append machine-dependent sources, then append machine-independent sources +# for which there is no machine-dependent variant. +SRCS+= ${MDSRCS} +.for _src in ${MISRCS} +.if ${MDSRCS:R:M${_src:R}} == "" +SRCS+= ${_src} +.endif +.endfor +.endif KQSRCS= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \ lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \ ==== //depot/projects/ia64/lib/libc/alpha/gen/Makefile.inc#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.10 2002/11/16 06:39:10 deischen Exp $ +# $FreeBSD: src/lib/libc/alpha/gen/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $ SRCS+= _setjmp.S fabs.S frexp.c infinity.c isinf.c ldexp.c modf.c setjmp.S SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \ @@ -14,34 +14,34 @@ CLEANFILES+= __remqu.S __remq.S __remlu.S __reml.S -__divqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divqu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divqu -DOP=div -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divq.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divq -DOP=div -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__divlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divlu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divlu -DOP=div -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__divl.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__divl.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__divl -DOP=div -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__remqu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__remqu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remqu -DOP=rem -DS=false -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remq.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__remq.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remq -DOP=rem -DS=true -DWORDSIZE=64 \ ${.ALLSRC} > ${.TARGET} -__remlu.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__remlu.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__remlu -DOP=rem -DS=false -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} -__reml.S: ${.CURDIR}/../libc/alpha/gen/divrem.m4 +__reml.S: ${.CURDIR}/alpha/gen/divrem.m4 m4 -DNAME=__reml -DOP=rem -DS=true -DWORDSIZE=32 \ ${.ALLSRC} > ${.TARGET} ==== //depot/projects/ia64/lib/libc/compat-43/Makefile.inc#2 (text+ko) ==== @@ -1,13 +1,12 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/2/93 -# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.11 2001/03/27 17:26:46 ru Exp $ +# $FreeBSD: src/lib/libc/compat-43/Makefile.inc,v 1.12 2002/11/18 09:50:54 ru Exp $ # compat-43 sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/compat-43 ${.CURDIR}/../libc/compat-43 +.PATH: ${.CURDIR}/${MACHINE_ARCH}/compat-43 ${.CURDIR}/compat-43 SRCS+= creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \ setrgid.c setruid.c sigcompat.c -.if ${LIB} == "c" MAN+= creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2 MAN+= gethostid.3 setruid.3 @@ -16,4 +15,3 @@ MLINKS+=sigsetmask.2 sigblock.2 MLINKS+=sigsetmask.2 sigmask.2 -.endif ==== //depot/projects/ia64/lib/libc/db/Makefile.inc#2 (text+ko) ==== @@ -1,11 +1,11 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 2/21/94 -# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.3 1999/08/27 23:58:15 peter Exp $ +# $FreeBSD: src/lib/libc/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ # CFLAGS+=-D__DBINTERFACE_PRIVATE -.include "${.CURDIR}/../libc/db/btree/Makefile.inc" -.include "${.CURDIR}/../libc/db/db/Makefile.inc" -.include "${.CURDIR}/../libc/db/hash/Makefile.inc" -.include "${.CURDIR}/../libc/db/man/Makefile.inc" -.include "${.CURDIR}/../libc/db/mpool/Makefile.inc" -.include "${.CURDIR}/../libc/db/recno/Makefile.inc" +.include "${.CURDIR}/db/btree/Makefile.inc" +.include "${.CURDIR}/db/db/Makefile.inc" +.include "${.CURDIR}/db/hash/Makefile.inc" +.include "${.CURDIR}/db/man/Makefile.inc" +.include "${.CURDIR}/db/mpool/Makefile.inc" +.include "${.CURDIR}/db/recno/Makefile.inc" ==== //depot/projects/ia64/lib/libc/db/btree/Makefile.inc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 7/14/94 -# $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.3 1999/08/27 23:58:16 peter Exp $ +# $FreeBSD: src/lib/libc/db/btree/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/btree +.PATH: ${.CURDIR}/db/btree SRCS+= bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \ bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \ ==== //depot/projects/ia64/lib/libc/db/db/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.3 1999/08/27 23:58:17 peter Exp $ +# $FreeBSD: src/lib/libc/db/db/Makefile.inc,v 1.4 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/db +.PATH: ${.CURDIR}/db/db SRCS+= db.c ==== //depot/projects/ia64/lib/libc/db/hash/Makefile.inc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.4 2001/05/15 07:08:17 ru Exp $ +# $FreeBSD: src/lib/libc/db/hash/Makefile.inc,v 1.5 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/hash +.PATH: ${.CURDIR}/db/hash SRCS+= hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \ hash_page.c ndbm.c ==== //depot/projects/ia64/lib/libc/db/man/Makefile.inc#2 (text+ko) ==== @@ -1,9 +1,8 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.10 2001/03/27 17:26:46 ru Exp $ +# $FreeBSD: src/lib/libc/db/man/Makefile.inc,v 1.11 2002/11/18 09:50:54 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/man +.PATH: ${.CURDIR}/db/man -.if ${LIB} == "c" MAN+= btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3 MLINKS+= dbm.3 dbm_clearerr.3 @@ -17,4 +16,3 @@ MLINKS+= dbm.3 dbm_open.3 MLINKS+= dbm.3 dbm_store.3 MLINKS+= dbopen.3 db.3 -.endif ==== //depot/projects/ia64/lib/libc/db/mpool/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.3 1999/08/27 23:58:23 peter Exp $ +# $FreeBSD: src/lib/libc/db/mpool/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/mpool +.PATH: ${.CURDIR}/db/mpool SRCS+= mpool.c ==== //depot/projects/ia64/lib/libc/db/recno/Makefile.inc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.3 1999/08/27 23:58:25 peter Exp $ +# $FreeBSD: src/lib/libc/db/recno/Makefile.inc,v 1.4 2002/11/18 09:50:55 ru Exp $ -.PATH: ${.CURDIR}/../libc/db/recno +.PATH: ${.CURDIR}/db/recno SRCS+= rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \ rec_seq.c rec_utils.c ==== //depot/projects/ia64/lib/libc/gen/Makefile.inc#15 (text+ko) ==== @@ -1,8 +1,8 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.97 2002/10/28 00:15:43 wollman Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.98 2002/11/18 09:50:55 ru Exp $ # machine-independent gen sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen +.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen SRCS+= __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ alarm.c arc4random.c assert.c basename.c check_utility_compat.c \ @@ -32,11 +32,10 @@ valloc.c vis.c wait.c wait3.c waitpid.c # machine-dependent gen sources -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/gen/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/gen/Makefile.inc" .endif -.if ${LIB} == "c" MAN+= alarm.3 arc4random.3 \ basename.3 check_utility_compat.3 clock.3 \ confstr.3 ctermid.3 daemon.3 \ @@ -132,4 +131,3 @@ MLINKS+=tzset.3 tzsetwall.3 MLINKS+=unvis.3 strunvis.3 unvis.3 strunvisx.3 MLINKS+=vis.3 strvis.3 vis.3 strvisx.3 -.endif ==== //depot/projects/ia64/lib/libc/gen/sysconf.c#9 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)sysconf.c 8.2 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.18 2002/11/16 06:35:20 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.20 2002/11/17 08:54:29 dougb Exp $"); #include #include @@ -254,20 +254,17 @@ return (_POSIX_TIMERS); #endif case _SC_AIO_LISTIO_MAX: - defaultresult = _POSIX_AIO_LISTIO_MAX; mib[0] = CTL_P1003_1B; mib[1] = CTL_P1003_1B_AIO_LISTIO_MAX; - goto yesno; + break; case _SC_AIO_MAX: - defaultresult = _POSIX_AIO_MAX; mib[0] = CTL_P1003_1B; mib[1] = CTL_P1003_1B_AIO_MAX; - goto yesno; + break; case _SC_AIO_PRIO_DELTA_MAX: - defaultresult = 0; mib[0] = CTL_P1003_1B; mib[1] = CTL_P1003_1B_AIO_PRIO_DELTA_MAX; - goto yesno; + break; case _SC_DELAYTIMER_MAX: mib[0] = CTL_P1003_1B; mib[1] = CTL_P1003_1B_DELAYTIMER_MAX; ==== //depot/projects/ia64/lib/libc/gmon/Makefile.inc#2 (text+ko) ==== @@ -1,16 +1,14 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.8 2001/03/27 17:26:47 ru Exp $ +# $FreeBSD: src/lib/libc/gmon/Makefile.inc,v 1.9 2002/11/18 09:50:55 ru Exp $ # gmon sources -.PATH: ${.CURDIR}/../libc/gmon +.PATH: ${.CURDIR}/gmon SRCS+= gmon.c mcount.c -.if ${LIB} == "c" MAN+= moncontrol.3 MLINKS+=moncontrol.3 monstartup.3 -.endif # mcount cannot be compiled with profiling mcount.po: mcount.o ==== //depot/projects/ia64/lib/libc/i386/sys/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.24 2002/05/23 23:51:57 jake Exp $ +# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.25 2002/11/18 09:50:55 ru Exp $ SRCS+= i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \ i386_set_ldt.c i386_set_watch.c i386_vm86.c @@ -14,11 +14,9 @@ PSEUDO= _getlogin.o _exit.o -.if ${LIB} == "c" MAN+= i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2 MAN+= i386_set_watch.3 MLINKS+=i386_get_ioperm.2 i386_set_ioperm.2 MLINKS+=i386_get_ldt.2 i386_set_ldt.2 MLINKS+=i386_set_watch.3 i386_clr_watch.3 -.endif ==== //depot/projects/ia64/lib/libc/locale/Makefile.inc#11 (text+ko) ==== @@ -1,8 +1,8 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.41 2002/10/10 22:56:18 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.42 2002/11/18 09:50:55 ru Exp $ # locale sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale +.PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale SRCS+= big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c frune.c \ isctype.c iswctype.c \ @@ -18,7 +18,6 @@ wcstoul.c wcstoull.c wcstoumax.c wctob.c wctomb.c wctrans.c wctype.c \ wcwidth.c -.if ${LIB} == "c" MAN+= btowc.3 \ ctype.3 digittoint.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \ isdigit.3 isgraph.3 islower.3 isprint.3 ispunct.3 isspace.3 \ @@ -55,4 +54,3 @@ wcstol.3 wcstoimax.3 wcstol.3 wcstoumax.3 MLINKS+=wctrans.3 towctrans.3 MLINKS+=wctype.3 iswctype.3 -.endif ==== //depot/projects/ia64/lib/libc/net/Makefile.inc#3 (text+ko) ==== @@ -1,8 +1,8 @@ # from @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 -# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.44 2002/07/15 19:58:56 ume Exp $ +# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.45 2002/11/18 09:50:55 ru Exp $ # machine-independent net sources -.PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/net ${.CURDIR}/../libc/net +.PATH: ${.CURDIR}/${MACHINE_ARCH}/net ${.CURDIR}/net SRCS+= addr2ascii.c ascii2addr.c base64.c ether_addr.c getaddrinfo.c \ gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \ @@ -37,11 +37,10 @@ sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET} # machine-dependent net sources -.if exists(${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc) -.include "${.CURDIR}/../libc/${MACHINE_ARCH}/net/Makefile.inc" +.if exists(${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc) +.include "${.CURDIR}/${MACHINE_ARCH}/net/Makefile.inc" .endif -.if ${LIB} == "c" MAN+= addr2ascii.3 byteorder.3 ethers.3 getaddrinfo.3 gethostbyname.3 \ getifaddrs.3 getipnodebyname.3 \ getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 hesiod.3 \ @@ -100,4 +99,3 @@ resolver.3 res_search.3 resolver.3 res_send.3 resolver.3 dn_skipname.3 \ resolver.3 ns_get16.3 resolver.3 ns_get32.3 \ resolver.3 ns_put16.3 resolver.3 ns_put32.3 -.endif ==== //depot/projects/ia64/lib/libc/nls/Makefile.inc#2 (text+ko) ==== @@ -1,10 +1,8 @@ # from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $ -# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.7 2001/03/27 17:26:48 ru Exp $ +# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.8 2002/11/18 09:50:55 ru Exp $ -.PATH: ${.CURDIR}/../libc/nls +.PATH: ${.CURDIR}/nls SRCS+= msgcat.c -.if ${LIB} == "c" MAN+= catclose.3 catgets.3 catopen.3 -.endif ==== //depot/projects/ia64/lib/libc/posix1e/Makefile.inc#7 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.12 2002/11/06 03:38:47 rwatson Exp $ +# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.13 2002/11/18 09:50:56 ru Exp $ MAINTAINER= rwatson@FreeBSD.org -.PATH: ${.CURDIR}/../libc/posix1e +.PATH: ${.CURDIR}/posix1e SRCS+= acl_calc_mask.c \ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Fri Nov 22 19:25:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85B8F37B404; Fri, 22 Nov 2002 19:25:52 -0800 (PST) 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 019D037B401 for ; Fri, 22 Nov 2002 19:25:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF47043E6E for ; Fri, 22 Nov 2002 19:25:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAN3MZmV013833 for ; Fri, 22 Nov 2002 19:22:35 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAN3MZcY013830 for perforce@freebsd.org; Fri, 22 Nov 2002 19:22:35 -0800 (PST) Date: Fri, 22 Nov 2002 19:22:35 -0800 (PST) Message-Id: <200211230322.gAN3MZcY013830@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21393 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21393 Change 21393 by jhb@jhb_laptop on 2002/11/22 19:21:35 Untested possible fix for P4 SMP problems: Only do one STARTUP IPI to start up AP processors. According to the part of the ia32 vol3 manual I read today, a processor should only be sent one INIT IPI after a hardware reset, and the BIOS does that, not the OS. I'll try and test this on PPro's and Pentium II Xeon's when I get a chance. Affected files ... .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#28 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#28 (text+ko) ==== @@ -2141,18 +2141,21 @@ /* used as a watchpoint to signal AP startup */ cpus = mp_ncpus; +#if 0 /* * first we do an INIT/RESET IPI this INIT IPI might be run, reseting * and running the target CPU. OR this INIT IPI might be latched (P5 * bug), CPU waiting for STARTUP IPI. OR this INIT IPI might be * ignored. */ +#endif /* setup the address for the target AP */ icr_hi = lapic.icr_hi & ~APIC_ID_MASK; icr_hi |= (physical_cpu << 24); lapic.icr_hi = icr_hi; +#if 0 /* do an INIT IPI: assert RESET */ icr_lo = lapic.icr_lo & 0xfff00000; lapic.icr_lo = icr_lo | 0x0000c500; @@ -2168,6 +2171,7 @@ u_sleep(10000); /* wait ~10mS */ while (lapic.icr_lo & APIC_DELSTAT_MASK) /* spin */ ; +#endif /* * next we do a STARTUP IPI: the previous INIT IPI might still be @@ -2184,6 +2188,7 @@ /* spin */ ; u_sleep(200); /* wait ~200uS */ +#if 0 /* * finally we do a 2nd STARTUP IPI: this 2nd STARTUP IPI should run IF * the previous STARTUP IPI was cancelled by a latched INIT IPI. OR @@ -2195,6 +2200,7 @@ while (lapic.icr_lo & APIC_DELSTAT_MASK) /* spin */ ; u_sleep(200); /* wait ~200uS */ +#endif /* wait for it to start */ set_apic_timer(5000000);/* == 5 seconds */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 12:20:37 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6AEC37B404; Sat, 23 Nov 2002 12:20:31 -0800 (PST) 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 8C22A37B401 for ; Sat, 23 Nov 2002 12:20:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0359643E91 for ; Sat, 23 Nov 2002 12:20:31 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gANKHBmV090875 for ; Sat, 23 Nov 2002 12:17:11 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gANKHAAk090869 for perforce@freebsd.org; Sat, 23 Nov 2002 12:17:10 -0800 (PST) Date: Sat, 23 Nov 2002 12:17:10 -0800 (PST) Message-Id: <200211232017.gANKHAAk090869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21417 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21417 Change 21417 by marcel@marcel_nfs on 2002/11/23 12:17:09 Raw, untested implementation of EPC syscalls. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/syscall.s#4 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/syscall.s#4 (text+ko) ==== @@ -70,13 +70,183 @@ .global ia64_syscall_page ia64_syscall_page: - // XXX stub only .global epc_syscall .proc epc_syscall + .regstk 8,0,0,0 epc_syscall: epc ;; - mov r8 = cr.lid // Privileged instruction... + mov r16=psr // psr substitute + mov r17=ar.rsc + mov r18=sp + ;; + mov sp=ar.k6 // Kernel SP + mov r19=r0 // cr.isr substitute + mov ar.rsc=0 + ;; + mov r20=ar.bspstore + mov r21=ar.k5 // Kernel BSP + mov r22=ar.rnat + mov r23=ar.unat + mov r24=b6 // cr.iip substitute + mov r25=r9 // ar.pfs substitute + add sp=-SIZEOF_TRAPFRAME,sp + ;; + addl r27=FRAME_SYSCALL,r0 + mov r26=pr + add r30=0,sp + add r31=8,sp + ;; + st8 [r30]=r27,16 // tf_flags + st8 [r31]=r24,16 // tf_cr_iip + mov r28=b0 + ;; + st8 [r30]=r16,24 // tf_cr_ipsr + st8 [r31]=r19,24 // tf_cr_isr + mov r24=b1 + ;; + st8 [r30]=r26,16 // tf_pr + st8 [r31]=r17,24 // tf_ar_rsc + mov r27=b2 + ;; + st8 [r30]=r25,24 // tf_ar_pfs + mov r16=b3 + mov r17=b4 + ;; + st8 [r31]=r20,24 // tf_ar_bspstore + mov ar.bspstore=r21 // Switch to kernel BSP + mov r29=b5 + ;; + mov r20=ar.ccv + mov r21=ar.fpsr + ;; + st8 [r30]=r22,24 // tf_ar_rnat + st8 [r31]=r23,16 // tf_ar_unat + ;; + st8 [r30]=r20,32 // tf_ar_ccv + st8 [r31]=r21,32 // tf_ar_fpsr + ;; + st8 [r30]=r28,16 // tf_b[0] + st8 [r31]=r24,16 // tf_b[1] + ;; + st8 [r30]=r27,16 // tf_b[2] + st8 [r31]=r16,16 // tf_b[3] + ;; + st8 [r30]=r17,TF_R_R1-(TF_B+4*8) // tf_b[4] + st8 [r31]=r29,TF_R_R4-(TF_B+5*8) // tf_b[5] + ;; + st8 [r30]=r1,TF_R_R5-TF_R_R1 // tf_r[0] (=r1=gp) + .mem.offset 8,0 + st8.spill [r31]=r4,16 // tf_r[3] (=r4) + ;; + .mem.offset 0,0 + st8.spill [r30]=r5,16 // tf_r[4] (=r5) + .mem.offset 8,0 + st8.spill [r31]=r6,TF_R_SP-TF_R_R6 // tf_r[5] (=r6) + ;; + .mem.offset 0,0 + st8.spill [r30]=r7,TF_R_R15-TF_R_R7 // tf_r[6] (=r7) + st8 [r31]=r18 // tf_r[11] (=r12=sp) + ;; + st8 [r30]=r8 // tf_r[14] (syscall number) + add sp=-(8*8),sp + ;; + add r31=0,sp + add r30=8,sp + ;; + st8 [r31]=in0,16 + st8 [r30]=in1,16 + ;; + st8 [r31]=in2,16 + st8 [r30]=in3,16 + ;; + st8 [r31]=in4,16 + st8 [r30]=in5,16 + ;; + st8 [r31]=in6 + st8 [r30]=in7 + ;; + mov r13=ar.k4 // PCPU + mov r16=sp + mov r17=ar.k5 + cover + ;; + mov r18=ar.pfs // cr.ifs substitute + mov r19=ar.bsp + add sp=-16,sp + ;; + add r20=TF_CR_IFS+(8*8),r16 + sub r19=r19,r17 + add r21=TF_NDIRTY+(8*8),r16 + ;; + st8 [r20]=r18 // tf_cr_ifs + st8 [r21]=r19 // tf_ndirty + ;; + alloc r14=ar.pfs,0,1,3,0 + add loc0=(8*8),r16 + ;; + mov out0=r8 // syscall number + movl gp=__gp + mov out1=r16 // arguments + add out2=(8*8),r16 // trapframe pointer + br.call.sptk rp=syscall + ;; + add r15=0,loc0 + add r16=SIZEOF_TRAPFRAME,loc0 + ;; + add r30=TF_R_R10,r15 + add r31=TF_R_SP,r15 + ;; + alloc r14=ar.pfs,0,0,0,0 + mov ar.k6=r16 + ld8 sp=[r31],TF_R_R9-TF_R_SP // tf_r[11] (r12=sp) + ;; + ld8 r10=[r30],-16 // tf_r[9] (=r10) + ld8 r9=[r31],TF_R_R1-TF_R_R9 // tf_r[8] (=r9) + ;; + ld8 r8=[r30],TF_B-TF_R_R8 // tf_r[7] (=r8) + ld8 r1=[r31],TF_AR_FPSR-TF_R_R1 // tf_r[0] (=r1=gp) + ;; + ld8 r16=[r30],-32 // tf_b[0] + ld8 r17=[r31],-16 // tf_ar_fpsr + ;; + ld8 r18=[r30],-16 // restore ar.ccv, skip to ndirty + ld8 r19=[r31],-16 // restore ar.unat, skip to ar.rnat + mov b0=r16 + ;; + ld8 r20=[r30],-16 // restore ndirty, skip to ar.bspstore + ld8 r21=[r31],-16 // restore ar.rnat, skip to cr.ifs + ;; + ld8 r16=[r30],-16 // restore ar.bspstore, skip to ar.pfs + mov ar.fpsr=r17 + shl r20=r20,16 // value for ar.rsc + ;; + ld8 r22=[r31],-16 // restore cr.ifs, skip to ar.rsc + mov ar.ccv=r18 + ;; + ld8 r17=[r30],-16 // restore ar.pfs, skip to pr + mov ar.unat=r19 + ;; + ld8 r18=[r31],-32 // restore ar.rsc, skip to cr.ipsr + mov ar.rsc=r20 // setup for loadrs + ;; + loadrs // restore user stacked registers + ;; + mov ar.bspstore=r16 // back to user backing store + mov ar.pfs=r17 + ;; + mov ar.rnat=r21 + mov ar.rsc=r18 + ;; + ld8 r16=[r30],-32 // restore pr, skip to cr.iip + ld8 r17=[r31] // restore cr.ipsr + ;; + ld8 r18=[r30] // restore cr.iip + mov cr.ifs=r22 + ;; + mov cr.iip=r18 + mov cr.ipsr=r17 + mov pr=r16,0x1ffff br.ret.sptk rp ;; .endp epc_syscall To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 12:25:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B1F437B404; Sat, 23 Nov 2002 12:25:38 -0800 (PST) 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 452E937B401 for ; Sat, 23 Nov 2002 12:25:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2D2743EA3 for ; Sat, 23 Nov 2002 12:25:37 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gANKMImV091357 for ; Sat, 23 Nov 2002 12:22:18 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gANKMHDs091354 for perforce@freebsd.org; Sat, 23 Nov 2002 12:22:17 -0800 (PST) Date: Sat, 23 Nov 2002 12:22:17 -0800 (PST) Message-Id: <200211232022.gANKMHDs091354@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21418 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21418 Change 21418 by marcel@marcel_nfs on 2002/11/23 12:21:31 Add ITANIUM2 as a global option (ie cpu). Affected files ... .. //depot/projects/ia64/sys/conf/options.ia64#10 edit Differences ... ==== //depot/projects/ia64/sys/conf/options.ia64#10 (text+ko) ==== @@ -2,6 +2,7 @@ # Options specific to the ia64 platform kernels ITANIUM opt_global.h +ITANIUM2 opt_global.h IA32 opt_ia32.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 13:22:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3371737B404; Sat, 23 Nov 2002 13:22:51 -0800 (PST) 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 BE1DA37B401 for ; Sat, 23 Nov 2002 13:22:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A5B743EA3 for ; Sat, 23 Nov 2002 13:22:50 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gANLJUmV095817 for ; Sat, 23 Nov 2002 13:19:30 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gANLJU8j095814 for perforce@freebsd.org; Sat, 23 Nov 2002 13:19:30 -0800 (PST) Date: Sat, 23 Nov 2002 13:19:30 -0800 (PST) Message-Id: <200211232119.gANLJU8j095814@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21423 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21423 Change 21423 by marcel@marcel_nfs on 2002/11/23 13:19:12 Remove the UC mapping of the I/O Port address range typical for Itanium (BigSur). The HP rx2600 for example has the I/O Port address range @ 0x3fffffc000000. The kernel will use the right range anyway. Affected files ... .. //depot/projects/ia64/sys/boot/efi/libefi/elf_freebsd.c#6 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/libefi/elf_freebsd.c#6 (text+ko) ==== @@ -217,23 +217,6 @@ :: "r"(0), "r"(*(u_int64_t*)&pte)); __asm __volatile("srlz.i;;"); - bzero(&pte, sizeof(pte)); - pte.pte_p = 1; - pte.pte_ma = PTE_MA_UC; - pte.pte_a = 1; - pte.pte_d = 1; - pte.pte_pl = PTE_PL_KERN; - pte.pte_ar = PTE_AR_RWX; - pte.pte_ppn = 0xffffc000000 >> 12; - - __asm __volatile("mov cr.ifa=%0" :: "r"(IA64_PHYS_TO_RR6(0xffffc000000))); - __asm __volatile("mov cr.itir=%0" :: "r"(26 << 2)); - //__asm __volatile("ptr.d %0,%1" :: "r"(IA64_PHYS_TO_RR6(0xffffc000000)), "r"(26<<2)); - __asm __volatile("srlz.i;;"); - __asm __volatile("itr.d dtr[%0]=%1;;" - :: "r"(1), "r"(*(u_int64_t*)&pte)); - __asm __volatile("srlz.i;;"); - enter_kernel(hdr->e_entry, bi); restore_ic(psr); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 13:36: 9 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0095C37B404; Sat, 23 Nov 2002 13:36:07 -0800 (PST) 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 8AFB737B401 for ; Sat, 23 Nov 2002 13:36:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49F5A43E3B for ; Sat, 23 Nov 2002 13:36:07 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gANLWlmV096694 for ; Sat, 23 Nov 2002 13:32:47 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gANLWkTS096691 for perforce@freebsd.org; Sat, 23 Nov 2002 13:32:46 -0800 (PST) Date: Sat, 23 Nov 2002 13:32:46 -0800 (PST) Message-Id: <200211232132.gANLWkTS096691@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21424 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21424 Change 21424 by marcel@marcel_nfs on 2002/11/23 13:32:39 Dump the SAL AP wakeup descriptor so that we can see what the AP wakeup mechanism is and (if applicable) the vector. Affected files ... .. //depot/projects/ia64/sys/boot/efi/loader/main.c#5 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/loader/main.c#5 (text+ko) ==== @@ -386,9 +386,15 @@ dp->sale_physical_address); printf("Length 0x%x\n", dp->sale_length); - } else { + } else if (*p == 5) { + struct sal_ap_wakeup_descriptor *dp; + dp = (struct sal_ap_wakeup_descriptor *) p; + printf("\n"); + printf(" Mechanism %d\n", dp->sale_mechanism); + printf(" Vector 0x%lx\n", dp->sale_vector); + } else printf("\n"); - } + p += sizes[*p]; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 13:48:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F07037B404; Sat, 23 Nov 2002 13:48:23 -0800 (PST) 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 3552337B401 for ; Sat, 23 Nov 2002 13:48:23 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAC0443EAF for ; Sat, 23 Nov 2002 13:48:22 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gANLj2mV097608 for ; Sat, 23 Nov 2002 13:45:02 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gANLj270097605 for perforce@freebsd.org; Sat, 23 Nov 2002 13:45:02 -0800 (PST) Date: Sat, 23 Nov 2002 13:45:02 -0800 (PST) Message-Id: <200211232145.gANLj270097605@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21425 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21425 Change 21425 by marcel@marcel_nfs on 2002/11/23 13:44:25 Increase S/N ratio for the itr/dtr dump. The itr and dtr on McKinley has 63 registers and so far each has at most 1 valid translations under EFI. Instead of dumping garbage for all 63 TRs, we mention how many TRs there are and only list the valid ones. Replace the V column with the TR number. While here, bail out and report when there's an error. Affected files ... .. //depot/projects/ia64/sys/boot/efi/loader/main.c#6 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/loader/main.c#6 (text+ko) ==== @@ -439,14 +439,23 @@ else maxtr = (res.pal_result[0] >> 32) & 0xff; + printf("%d translation registers\n", maxtr); + pager_open(); - pager_output("V RID Virtual Page Physical Page PgSz ED AR PL D A MA P KEY\n"); + pager_output("TR# RID Virtual Page Physical Page PgSz ED AR PL D A MA P KEY\n"); for (i = 0; i <= maxtr; i++) { char lbuf[128]; bzero(&buf, sizeof(buf)); res = ia64_call_pal_stacked(PAL_VM_TR_READ, i, type, (u_int64_t) &buf); + if (res.pal_status != 0) + break; + + /* Only display valid translations */ + if ((buf.ifa.ifa_ig & 1) == 0) + continue; + if (!(res.pal_result[0] & 1)) buf.pte.pte_ar = 0; if (!(res.pal_result[0] & 2)) @@ -456,8 +465,8 @@ if (!(res.pal_result[0] & 8)) buf.pte.pte_ma = 0; sprintf(lbuf, - "%d %06x %013lx %013lx %4s %d %d %d %d %d %-3s %d %06x\n", - buf.ifa.ifa_ig & 1, + "%03d %06x %013lx %013lx %4s %d %d %d %d %d %-3s %d %06x\n", + i, buf.rr.rr_rid, buf.ifa.ifa_vpn, buf.pte.pte_ppn, @@ -474,6 +483,10 @@ } pager_close(); + if (res.pal_status != 0) { + printf("Error while getting TR contents\n"); + return CMD_ERROR; + } return CMD_OK; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 14:32:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34DD037B404; Sat, 23 Nov 2002 14:32:45 -0800 (PST) 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 D192137B401; Sat, 23 Nov 2002 14:32:44 -0800 (PST) Received: from herring.nlsystems.com (mailgate.nlsystems.com [62.49.251.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E2A043E3B; Sat, 23 Nov 2002 14:32:43 -0800 (PST) (envelope-from dfr@nlsystems.com) Received: from herring.nlsystems.com (herring.nlsystems.com [10.0.0.2]) by herring.nlsystems.com (8.12.6/8.12.6) with ESMTP id gANMWeqb069246; Sat, 23 Nov 2002 22:32:40 GMT (envelope-from dfr@nlsystems.com) Content-Type: text/plain; charset="iso-8859-1" From: Doug Rabson To: Marcel Moolenaar , Perforce Change Reviews Subject: Re: PERFORCE change 21423 for review Date: Sat, 23 Nov 2002 22:32:40 +0000 User-Agent: KMail/1.4.3 References: <200211232119.gANLJU8j095814@repoman.freebsd.org> In-Reply-To: <200211232119.gANLJU8j095814@repoman.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-Id: <200211232232.40088.dfr@nlsystems.com> X-Spam-Status: No, hits=-7.7 required=5.0 tests=IN_REP_TO,QUOTED_EMAIL_TEXT,REFERENCES,SPAM_PHRASE_00_01, USER_AGENT,USER_AGENT_KMAIL version=2.41 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Saturday 23 November 2002 9:19 pm, Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D21423 > > Change 21423 by marcel@marcel_nfs on 2002/11/23 13:19:12 > > =09Remove the UC mapping of the I/O Port address range typical > =09for Itanium (BigSur). The HP rx2600 for example has the I/O > =09Port address range @ 0x3fffffc000000. The kernel will use > =09the right range anyway. I think this was only there to support some hairy low-level serial=20 access which I was using to debug stuff. --=20 Doug Rabson=09=09=09=09Mail: dfr@nlsystems.com =09=09=09=09=09Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 14:50:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91D9337B404; Sat, 23 Nov 2002 14:50:42 -0800 (PST) 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 288ED37B401; Sat, 23 Nov 2002 14:50:42 -0800 (PST) Received: from herring.nlsystems.com (mailgate.nlsystems.com [62.49.251.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37D7543E3B; Sat, 23 Nov 2002 14:50:41 -0800 (PST) (envelope-from dfr@nlsystems.com) Received: from herring.nlsystems.com (herring.nlsystems.com [10.0.0.2]) by herring.nlsystems.com (8.12.6/8.12.6) with ESMTP id gANMocqb069351; Sat, 23 Nov 2002 22:50:38 GMT (envelope-from dfr@nlsystems.com) Content-Type: text/plain; charset="iso-8859-1" From: Doug Rabson To: Marcel Moolenaar , Perforce Change Reviews Subject: Re: PERFORCE change 21417 for review Date: Sat, 23 Nov 2002 22:50:38 +0000 User-Agent: KMail/1.4.3 References: <200211232017.gANKHAAk090869@repoman.freebsd.org> In-Reply-To: <200211232017.gANKHAAk090869@repoman.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-Id: <200211232250.38412.dfr@nlsystems.com> X-Spam-Status: No, hits=-4.2 required=5.0 tests=IN_REP_TO,REFERENCES,SPAM_PHRASE_00_01,USER_AGENT, USER_AGENT_KMAIL version=2.41 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Saturday 23 November 2002 8:17 pm, Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D21417 > > Change 21417 by marcel@marcel_nfs on 2002/11/23 12:17:09 > > =09Raw, untested implementation of EPC syscalls. This seems to be missing the bit after calling syscall() which checks=20 for a full exception_restore, e.g. after an execve and also the check=20 for calling ast(), e.g. after a signal. On the subject of ast(), I'm sure that the current code in=20 exception_restore which tests for this is wrong. It needs to call ast()=20 very carefully to ensure that a call is not missed. The algorithm is=20 something like: loop: =09savepsr =3D psr; =09disable_interrupts() =09if (astpending || needresched) { =09=09psr =3D savepsr(); =09=09ast(); =09=09goto loop; =09} =09/* =09 * Note: interrupts are disabled here which prevents any =09 * further ast's. =09 */ =09... restore registers and back to user mode ... The bundle which contains the call to ast() also contains the branch=20 instruction for the loop. This can't be right because the call will=20 return to the bundle *after* the one containing the loop branch. It is very important interrupts are not re-enabled after testing=20 astpending and needresched until the rfi (or br.ret) to make this=20 section atomic. The same rule applies to do_syscall and epc_syscall. One other thing after re-familiarising myself with exception.s. You have=20 added unwind records to all the kernel IVT entry points. This is quite=20 unhelpful when trying to debug kernel faults. The previous version=20 which manually unwound past the exception to the code which faulted was=20 extremely useful and saved me a lot of time in debugging. Can we have=20 it back please :-). --=20 Doug Rabson=09=09=09=09Mail: dfr@nlsystems.com =09=09=09=09=09Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 14:52:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89C9737B404; Sat, 23 Nov 2002 14:52:55 -0800 (PST) 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 21F4437B401 for ; Sat, 23 Nov 2002 14:52:55 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 368D143E88 for ; Sat, 23 Nov 2002 14:52:54 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gANMqr0N066777; Sat, 23 Nov 2002 14:52:53 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gANMr4tP008759; Sat, 23 Nov 2002 14:53:04 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gANMr3cA008758; Sat, 23 Nov 2002 14:53:04 -0800 (PST) (envelope-from marcel) Date: Sat, 23 Nov 2002 14:53:03 -0800 From: Marcel Moolenaar To: Doug Rabson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 21423 for review Message-ID: <20021123225303.GA8744@dhcp01.pn.xcllnt.net> References: <200211232119.gANLJU8j095814@repoman.freebsd.org> <200211232232.40088.dfr@nlsystems.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200211232232.40088.dfr@nlsystems.com> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, Nov 23, 2002 at 10:32:40PM +0000, Doug Rabson wrote: > On Saturday 23 November 2002 9:19 pm, Marcel Moolenaar wrote: > > http://perforce.freebsd.org/chv.cgi?CH=21423 > > > > Change 21423 by marcel@marcel_nfs on 2002/11/23 13:19:12 > > > > Remove the UC mapping of the I/O Port address range typical > > for Itanium (BigSur). The HP rx2600 for example has the I/O > > Port address range @ 0x3fffffc000000. The kernel will use > > the right range anyway. > > I think this was only there to support some hairy low-level serial > access which I was using to debug stuff. We're not actually mapping the I/O port space in the kernel yet, so this change may break early console probing. I'm testing explicit mapping in the kernel now and will commit later... -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 15: 0:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91EDD37B404; Sat, 23 Nov 2002 15:00:08 -0800 (PST) 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 3F7AE37B401 for ; Sat, 23 Nov 2002 15:00:08 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B9D443E3B for ; Sat, 23 Nov 2002 15:00:07 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gANN070N066814; Sat, 23 Nov 2002 15:00:07 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gANN0HtP008803; Sat, 23 Nov 2002 15:00:17 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gANN0Hmo008802; Sat, 23 Nov 2002 15:00:17 -0800 (PST) (envelope-from marcel) Date: Sat, 23 Nov 2002 15:00:17 -0800 From: Marcel Moolenaar To: Doug Rabson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 21417 for review Message-ID: <20021123230017.GB8744@dhcp01.pn.xcllnt.net> References: <200211232017.gANKHAAk090869@repoman.freebsd.org> <200211232250.38412.dfr@nlsystems.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200211232250.38412.dfr@nlsystems.com> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, Nov 23, 2002 at 10:50:38PM +0000, Doug Rabson wrote: > On Saturday 23 November 2002 8:17 pm, Marcel Moolenaar wrote: > > http://perforce.freebsd.org/chv.cgi?CH=21417 > > > > Change 21417 by marcel@marcel_nfs on 2002/11/23 12:17:09 > > > > Raw, untested implementation of EPC syscalls. > > This seems to be missing the bit after calling syscall() which checks > for a full exception_restore, e.g. after an execve and also the check > for calling ast(), e.g. after a signal. Yes. [snip] > > One other thing after re-familiarising myself with exception.s. You have > added unwind records to all the kernel IVT entry points. This is quite > unhelpful when trying to debug kernel faults. The previous version > which manually unwound past the exception to the code which faulted was > extremely useful and saved me a lot of time in debugging. Can we have > it back please :-). If we want to use unwinding to get to the register state of the process, we can never unwind over the exception code. It's probably much easier to restart unwinding after it stopped at the exception entry point. This would also hold for signal handlers. Would a DDB command to resume unwinding work? -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 15:34:42 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC18B37B404; Sat, 23 Nov 2002 15:34:38 -0800 (PST) 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 7BCDA37B401 for ; Sat, 23 Nov 2002 15:34:38 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A8CE43E4A for ; Sat, 23 Nov 2002 15:34:38 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gANNVHmV006393 for ; Sat, 23 Nov 2002 15:31:17 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gANNVHxi006390 for perforce@freebsd.org; Sat, 23 Nov 2002 15:31:17 -0800 (PST) Date: Sat, 23 Nov 2002 15:31:17 -0800 (PST) Message-Id: <200211232331.gANNVHxi006390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21433 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21433 Change 21433 by marcel@marcel_nfs on 2002/11/23 15:30:49 Explicitly map the I/O port space. We depended on the loader to have mapped the I/O space. Remove this dependency. While here, don't map the I/O port space with a page size of 256M. Instead use 16M. This is only slightly better because it matches the size of the I/O space in the memory descriptor on the machines seen so far. It's not perfect, because it's still a hardcoding. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#54 edit .. //depot/projects/ia64/sys/ia64/include/cpu.h#8 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#54 (text+ko) ==== @@ -305,6 +305,38 @@ __asm __volatile("mov psr.l=%0;; srlz.i;;" :: "r" (psr)); } +void +map_port_space(void) +{ + struct ia64_pte pte; + u_int64_t psr; + + /* XXX we should fail hard if there's no I/O port space. */ + if (ia64_port_base == 0) + return; + + bzero(&pte, sizeof(pte)); + pte.pte_p = 1; + pte.pte_ma = PTE_MA_UC; + pte.pte_a = 1; + pte.pte_d = 1; + pte.pte_pl = PTE_PL_KERN; + pte.pte_ar = PTE_AR_RWX; + pte.pte_ppn = ia64_port_base >> 12; + + __asm __volatile("mov %0=psr;;" : "=r" (psr)); + __asm __volatile("rsm psr.ic|psr.i;; srlz.i;;"); + __asm __volatile("mov cr.ifa=%0" :: + "r"(IA64_PHYS_TO_RR7(ia64_port_base))); + /* XXX We should use the size from the memory descriptor. */ + __asm __volatile("mov cr.itir=%0" :: "r"(24 << 2)); + __asm __volatile("srlz.i;;"); + __asm __volatile("itr.i itr[%0]=%1;;" :: + "r"(1), "r"(*(u_int64_t*)&pte)); + __asm __volatile("srlz.i;;"); + __asm __volatile("mov psr.l=%0;; srlz.i;;" :: "r" (psr)); +} + static void calculate_frequencies(void) { @@ -412,6 +444,11 @@ ia64_pal_base = mdp->PhysicalStart; } + /* Map the memory mapped I/O Port space */ + KASSERT(ia64_port_base != 0, + ("%s: no I/O port memory region", __func__)); + map_port_space(); + metadata_missing = 0; if (bootinfo.bi_modulep) preload_metadata = (caddr_t)bootinfo.bi_modulep; @@ -422,9 +459,6 @@ else kern_envp = (caddr_t)bootinfo.bi_envp; - KASSERT(ia64_port_base != 0, - ("%s: no I/O memory region", __func__)); - /* * Look at arguments passed to us and compute boothowto. */ ==== //depot/projects/ia64/sys/ia64/include/cpu.h#8 (text+ko) ==== @@ -136,6 +136,7 @@ void ia64_probe_sapics(void); int ia64_count_cpus(void); void map_pal_code(void); +void map_port_space(void); void cpu_mp_add(uint, uint, uint); /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 15:47:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45DAF37B401; Sat, 23 Nov 2002 15:47:25 -0800 (PST) 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 CFC4137B404 for ; Sat, 23 Nov 2002 15:47:24 -0800 (PST) Received: from herring.nlsystems.com (mailgate.nlsystems.com [62.49.251.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AA8643EA3 for ; Sat, 23 Nov 2002 15:47:11 -0800 (PST) (envelope-from dfr@nlsystems.com) Received: from herring.nlsystems.com (herring.nlsystems.com [10.0.0.2]) by herring.nlsystems.com (8.12.6/8.12.6) with ESMTP id gANNkfqb069651; Sat, 23 Nov 2002 23:46:41 GMT (envelope-from dfr@nlsystems.com) Content-Type: text/plain; charset="iso-8859-1" From: Doug Rabson To: Marcel Moolenaar Subject: Re: PERFORCE change 21417 for review Date: Sat, 23 Nov 2002 23:46:41 +0000 User-Agent: KMail/1.4.3 Cc: Perforce Change Reviews References: <200211232017.gANKHAAk090869@repoman.freebsd.org> <200211232250.38412.dfr@nlsystems.com> <20021123230017.GB8744@dhcp01.pn.xcllnt.net> In-Reply-To: <20021123230017.GB8744@dhcp01.pn.xcllnt.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-Id: <200211232346.41171.dfr@nlsystems.com> X-Spam-Status: No, hits=-7.7 required=5.0 tests=IN_REP_TO,QUOTED_EMAIL_TEXT,REFERENCES,SPAM_PHRASE_00_01, USER_AGENT,USER_AGENT_KMAIL version=2.41 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Saturday 23 November 2002 11:00 pm, Marcel Moolenaar wrote: > On Sat, Nov 23, 2002 at 10:50:38PM +0000, Doug Rabson wrote: > > On Saturday 23 November 2002 8:17 pm, Marcel Moolenaar wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=3D21417 > > > > > > Change 21417 by marcel@marcel_nfs on 2002/11/23 12:17:09 > > > > > > =09Raw, untested implementation of EPC syscalls. > > > > This seems to be missing the bit after calling syscall() which > > checks for a full exception_restore, e.g. after an execve and also > > the check for calling ast(), e.g. after a signal. > > Yes. > > [snip] > > > One other thing after re-familiarising myself with exception.s. You > > have added unwind records to all the kernel IVT entry points. This > > is quite unhelpful when trying to debug kernel faults. The previous > > version which manually unwound past the exception to the code which > > faulted was extremely useful and saved me a lot of time in > > debugging. Can we have it back please :-). > > If we want to use unwinding to get to the register state of the > process, we can never unwind over the exception code. It's probably > much easier to restart unwinding after it stopped at the exception > entry point. This would also hold for signal handlers. Would a DDB > command to resume unwinding work? I think it would be ok to just put back the code in db_stack_trace_cmd()=20 which spots kernel entry points and resets the unwind state based on=20 the contents of the appropriate stack frame. That would give complete=20 stack traces in DDB without disturbing the real unwind records. --=20 Doug Rabson=09=09=09=09Mail: dfr@nlsystems.com =09=09=09=09=09Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 15:47:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9932137B404; Sat, 23 Nov 2002 15:47:55 -0800 (PST) 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 322F837B401 for ; Sat, 23 Nov 2002 15:47:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DEB0743E4A for ; Sat, 23 Nov 2002 15:47:54 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gANNiYmV007246 for ; Sat, 23 Nov 2002 15:44:34 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gANNiYxi007243 for perforce@freebsd.org; Sat, 23 Nov 2002 15:44:34 -0800 (PST) Date: Sat, 23 Nov 2002 15:44:34 -0800 (PST) Message-Id: <200211232344.gANNiYxi007243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21434 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21434 Change 21434 by marcel@marcel_nfs on 2002/11/23 15:44:00 Bump the version of the loader to 1.0 because we now don't map the I/O port space. This breaks previous kernels that depend on it. Use version 1.0 instead of 0.4 because it looks better for released software :-) This change does not break a regular upgrade path where a new kernel is installed prior to a new loader. Affected files ... .. //depot/projects/ia64/sys/boot/efi/loader/version#3 edit Differences ... ==== //depot/projects/ia64/sys/boot/efi/loader/version#3 (text+ko) ==== @@ -3,6 +3,9 @@ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. +1.0: Don't map the I/O port range. We expect the kernel to do it. It + was done in the loader as a debugging aid and not intended as a + service/feature. 0.3: Pass the physical address of the bootinfo block in register r8 to the kernel. Continue to put it at the fixed address for now. 0.2: Much improved version. Significant is the support for passing To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 15:59:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4533037B404; Sat, 23 Nov 2002 15:59:15 -0800 (PST) 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 D222C37B401 for ; Sat, 23 Nov 2002 15:59:14 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F8A743E6E for ; Sat, 23 Nov 2002 15:59:13 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from athlon.pn.xcllnt.net (athlon.pn.xcllnt.net [192.168.4.3]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gANNxC0N066973; Sat, 23 Nov 2002 15:59:12 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from athlon.pn.xcllnt.net (localhost [127.0.0.1]) by athlon.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gANNxC7Z001325; Sat, 23 Nov 2002 15:59:12 -0800 (PST) (envelope-from marcel@athlon.pn.xcllnt.net) Received: (from marcel@localhost) by athlon.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gANNxCRE001324; Sat, 23 Nov 2002 15:59:12 -0800 (PST) Date: Sat, 23 Nov 2002 15:59:12 -0800 From: Marcel Moolenaar To: Doug Rabson Cc: Perforce Change Reviews Subject: Re: PERFORCE change 21417 for review Message-ID: <20021123235912.GA1296@athlon.pn.xcllnt.net> References: <200211232017.gANKHAAk090869@repoman.freebsd.org> <200211232250.38412.dfr@nlsystems.com> <20021123230017.GB8744@dhcp01.pn.xcllnt.net> <200211232346.41171.dfr@nlsystems.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200211232346.41171.dfr@nlsystems.com> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, Nov 23, 2002 at 11:46:41PM +0000, Doug Rabson wrote: > On Saturday 23 November 2002 11:00 pm, Marcel Moolenaar wrote: > > On Sat, Nov 23, 2002 at 10:50:38PM +0000, Doug Rabson wrote: > > > On Saturday 23 November 2002 8:17 pm, Marcel Moolenaar wrote: > > > > http://perforce.freebsd.org/chv.cgi?CH=21417 > > > > > > > > Change 21417 by marcel@marcel_nfs on 2002/11/23 12:17:09 > > > > > > > > Raw, untested implementation of EPC syscalls. > > > > > > This seems to be missing the bit after calling syscall() which > > > checks for a full exception_restore, e.g. after an execve and also > > > the check for calling ast(), e.g. after a signal. > > > > Yes. > > > > [snip] > > > > > One other thing after re-familiarising myself with exception.s. You > > > have added unwind records to all the kernel IVT entry points. This > > > is quite unhelpful when trying to debug kernel faults. The previous > > > version which manually unwound past the exception to the code which > > > faulted was extremely useful and saved me a lot of time in > > > debugging. Can we have it back please :-). > > > > If we want to use unwinding to get to the register state of the > > process, we can never unwind over the exception code. It's probably > > much easier to restart unwinding after it stopped at the exception > > entry point. This would also hold for signal handlers. Would a DDB > > command to resume unwinding work? > > I think it would be ok to just put back the code in db_stack_trace_cmd() > which spots kernel entry points and resets the unwind state based on > the contents of the appropriate stack frame. That would give complete > stack traces in DDB without disturbing the real unwind records. Ok. I may not get to it soon, so feel free to revert the change yourself if you want it badly enough :-) -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 20:42:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B8EF37B404; Sat, 23 Nov 2002 20:42:57 -0800 (PST) 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 E981037B401 for ; Sat, 23 Nov 2002 20:42:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A7FAE43E4A for ; Sat, 23 Nov 2002 20:42:56 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAO4dZmV030360 for ; Sat, 23 Nov 2002 20:39:35 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAO4dYav030357 for perforce@freebsd.org; Sat, 23 Nov 2002 20:39:34 -0800 (PST) Date: Sat, 23 Nov 2002 20:39:34 -0800 (PST) Message-Id: <200211240439.gAO4dYav030357@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21443 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21443 Change 21443 by marcel@marcel_nfs on 2002/11/23 20:38:47 Don't force it, use a larger hammer: If sio doesn't work and sc causes MCAs then what do you do? You hack up a new-busified VGA console driver. Probably -10 for good sense, but +10 for stress relief :-) Note: only the bare console works. This is not intended to stay... Affected files ... .. //depot/projects/ia64/sys/dev/vga/vga.c#1 add .. //depot/projects/ia64/sys/dev/vga/vga.h#1 add .. //depot/projects/ia64/sys/dev/vga/vga_cons.c#1 add .. //depot/projects/ia64/sys/dev/vga/vga_isa.c#1 add .. //depot/projects/ia64/sys/dev/vga/vga_pci.c#1 add .. //depot/projects/ia64/sys/dev/vga/vga_vid.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 20:44: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43F0F37B404; Sat, 23 Nov 2002 20:43:59 -0800 (PST) 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 E407137B401 for ; Sat, 23 Nov 2002 20:43:58 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A3B3D43E4A for ; Sat, 23 Nov 2002 20:43:58 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAO4ebmV030560 for ; Sat, 23 Nov 2002 20:40:37 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAO4eaSg030557 for perforce@freebsd.org; Sat, 23 Nov 2002 20:40:36 -0800 (PST) Date: Sat, 23 Nov 2002 20:40:36 -0800 (PST) Message-Id: <200211240440.gAO4eaSg030557@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21444 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21444 Change 21444 by marcel@marcel_nfs on 2002/11/23 20:39:41 Oops. We need to map the I/O port space as region 6. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#55 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/machdep.c#55 (text+ko) ==== @@ -327,7 +327,7 @@ __asm __volatile("mov %0=psr;;" : "=r" (psr)); __asm __volatile("rsm psr.ic|psr.i;; srlz.i;;"); __asm __volatile("mov cr.ifa=%0" :: - "r"(IA64_PHYS_TO_RR7(ia64_port_base))); + "r"(IA64_PHYS_TO_RR6(ia64_port_base))); /* XXX We should use the size from the memory descriptor. */ __asm __volatile("mov cr.itir=%0" :: "r"(24 << 2)); __asm __volatile("srlz.i;;"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 20:48: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 843A237B404; Sat, 23 Nov 2002 20:48:04 -0800 (PST) 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 1C9E537B401 for ; Sat, 23 Nov 2002 20:48:04 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.bayarea.net [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBCEA43EA9 for ; Sat, 23 Nov 2002 20:48:02 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gAO4lq0N067664 for ; Sat, 23 Nov 2002 20:47:52 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gAO4m2tP009598 for ; Sat, 23 Nov 2002 20:48:02 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gAO4m2hP009597 for perforce@freebsd.org; Sat, 23 Nov 2002 20:48:02 -0800 (PST) (envelope-from marcel) Date: Sat, 23 Nov 2002 20:48:02 -0800 From: Marcel Moolenaar To: Perforce Change Reviews Subject: Re: PERFORCE change 21443 for review Message-ID: <20021124044802.GA9586@dhcp01.pn.xcllnt.net> References: <200211240439.gAO4dYav030357@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200211240439.gAO4dYav030357@repoman.freebsd.org> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sat, Nov 23, 2002 at 08:39:34PM -0800, Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=21443 > > Change 21443 by marcel@marcel_nfs on 2002/11/23 20:38:47 > > Don't force it, use a larger hammer: > If sio doesn't work and sc causes MCAs then what do you do? > You hack up a new-busified VGA console driver. > Probably -10 for good sense, but +10 for stress relief :-) > Note: only the bare console works. > This is not intended to stay... Apply tyhe following patch to src/sys/conf/files.ia64 ==== //depot/projects/ia64/sys/conf/files.ia64#20 - /nfs/p4/ia64/sys/conf/files.ia64 ==== 82c82 < dev/fb/fb.c optional vga --- > dev/fb/fb.c optional vga sc 84d83 < dev/fb/vga.c optional vga 102a102,106 > dev/vga/vga.c optional vga > dev/vga/vga_cons.c optional vga > dev/vga/vga_isa.c optional vga isa > dev/vga/vga_pci.c optional vga pci > dev/vga/vga_vid.c optional vga sc 112d115 < isa/vga_isa.c optional vga -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 21:14:40 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E55237B401; Sat, 23 Nov 2002 21:14:37 -0800 (PST) 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 C82D037B404 for ; Sat, 23 Nov 2002 21:14:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 31AC843EA9 for ; Sat, 23 Nov 2002 21:14:36 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAO5BEmV032781 for ; Sat, 23 Nov 2002 21:11:14 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAO5BEVr032778 for perforce@freebsd.org; Sat, 23 Nov 2002 21:11:14 -0800 (PST) Date: Sat, 23 Nov 2002 21:11:14 -0800 (PST) Message-Id: <200211240511.gAO5BEVr032778@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 Subject: PERFORCE change 21445 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21445 Change 21445 by rwatson@rwatson_tislabs on 2002/11/23 21:10:57 Use -v to specify the version number passed to newfs using the -O argument. -O was already occupied for mdmfs. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.8#5 edit .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.8#5 (text+ko) ==== @@ -50,6 +50,7 @@ .Op Fl o Ar mount-options .Op Fl p Ar permissions .Op Fl s Ar size +.Op Fl v Ar version .Op Fl w Ar user : Ns Ar group .Ar md-device .Ar mount-point @@ -69,6 +70,7 @@ .Op Fl O Ar optimization .Op Fl o Ar mount-options .Op Fl s Ar size +.Op Fl v Ar version .Ar md-device .Ar mount-point .Sh DESCRIPTION @@ -222,6 +224,14 @@ It is only really useful to negate the .Fl S flag, should such a need occur. +.It Fl v Ar version +Specify the UFS version number for use on the file system; the +default is derived from the default of the +.Xr newfs 8 +command, and may currently be one of +.Dv 1 +or +.Dv 2 . .It Fl w Ar user : Ns Ar group Set the owner and group to .Ar user ==== //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.c#5 (text+ko) ==== @@ -121,7 +121,7 @@ compat = true; while ((ch = getopt(argc, argv, - "a:b:Cc:Dd:e:F:f:hi:LMm:Nn:O:o:p:Ss:t:Uw:X")) != -1) + "a:b:Cc:Dd:e:F:f:hi:LMm:Nn:O:o:p:Ss:t:Uv:w:X")) != -1) switch (ch) { case 'a': argappend(&newfs_arg, "-a %s", optarg); @@ -212,6 +212,9 @@ case 'U': softdep = true; break; + case 'v': + argappend(&mount_arg, "-O%s", optarg); + break; case 'w': if (compat) usage(); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 21:25:53 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1887B37B404; Sat, 23 Nov 2002 21:25:51 -0800 (PST) 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 BCDF737B401 for ; Sat, 23 Nov 2002 21:25:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60C4A43E9C for ; Sat, 23 Nov 2002 21:25:50 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAO5MSmV033564 for ; Sat, 23 Nov 2002 21:22:28 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAO5MS4S033561 for perforce@freebsd.org; Sat, 23 Nov 2002 21:22:28 -0800 (PST) Date: Sat, 23 Nov 2002 21:22:28 -0800 (PST) Message-Id: <200211240522.gAO5MS4S033561@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 Subject: PERFORCE change 21446 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21446 Change 21446 by rwatson@rwatson_tislabs on 2002/11/23 21:22:14 Committed stale version: we're tweaking the newfs args, not the mount args. Affected files ... .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.c#6 (text+ko) ==== @@ -213,7 +213,7 @@ softdep = true; break; case 'v': - argappend(&mount_arg, "-O%s", optarg); + argappend(&newfs_arg, "-O%s", optarg); break; case 'w': if (compat) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 21:33: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70D6F37B404; Sat, 23 Nov 2002 21:33:00 -0800 (PST) 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 05FE537B401 for ; Sat, 23 Nov 2002 21:33:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3B8543E4A for ; Sat, 23 Nov 2002 21:32:59 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAO5TcmV034209 for ; Sat, 23 Nov 2002 21:29:38 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAO5Tb1Y034206 for perforce@freebsd.org; Sat, 23 Nov 2002 21:29:37 -0800 (PST) Date: Sat, 23 Nov 2002 21:29:37 -0800 (PST) Message-Id: <200211240529.gAO5Tb1Y034206@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 Subject: PERFORCE change 21447 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21447 Change 21447 by rwatson@rwatson_tislabs on 2002/11/23 21:29:08 Move to gshapiro's variation on the MAC patch to match what will be in sendmail. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#11 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#11 (text+ko) ==== @@ -2352,15 +2352,20 @@ if (contextaddr != NULL) { + int sucflags; struct passwd *pwd; if (contextaddr->q_ruser != NULL) pwd = sm_getpwnam(contextaddr->q_ruser); else pwd = sm_getpwnam(contextaddr->q_user); + sucflags = LOGIN_SETRESOURCES|LOGIN_SETPRIORITY; +#ifdef LOGIN_SETMAC + sucflags |= LOGIN_SETMAC; +#endif /* LOGIN_SETMAC */ if (pwd != NULL && setusercontext(NULL, pwd, pwd->pw_uid, - LOGIN_SETRESOURCES|LOGIN_SETPRIORITY|LOGIN_SETMAC) == -1 && + sucflags) == -1 && suidwarn) { syserr("openmailer: setusercontext() failed"); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sat Nov 23 22:54:43 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 62EB337B404; Sat, 23 Nov 2002 22:54:41 -0800 (PST) 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 E650837B401 for ; Sat, 23 Nov 2002 22:54:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FA8043E3B for ; Sat, 23 Nov 2002 22:54:40 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAO6pImV040318 for ; Sat, 23 Nov 2002 22:51:18 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAO6pI4k040315 for perforce@freebsd.org; Sat, 23 Nov 2002 22:51:18 -0800 (PST) Date: Sat, 23 Nov 2002 22:51:18 -0800 (PST) Message-Id: <200211240651.gAO6pI4k040315@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21450 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21450 Change 21450 by marcel@marcel_nfs on 2002/11/23 22:50:51 What the heck: handle tab as well. Affected files ... .. //depot/projects/ia64/sys/dev/vga/vga.c#2 edit Differences ... ==== //depot/projects/ia64/sys/dev/vga/vga.c#2 (text+ko) ==== @@ -97,6 +97,11 @@ x--; d = 0; break; + case 0x09: /* tab */ + x = (x + 8) & ~7; + if (x < 80) + return; + /* FALLTHOUGH */ case 0x0a: /* linefeed */ if (y == 24) vga_scrollup(sc); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 24 20:23:48 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECD8F37B404; Sun, 24 Nov 2002 20:23:46 -0800 (PST) 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 904AB37B401 for ; Sun, 24 Nov 2002 20:23:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B82343E88 for ; Sun, 24 Nov 2002 20:23:46 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAP4KJmV037072 for ; Sun, 24 Nov 2002 20:20:19 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAP4KJcH037069 for perforce@freebsd.org; Sun, 24 Nov 2002 20:20:19 -0800 (PST) Date: Sun, 24 Nov 2002 20:20:19 -0800 (PST) Message-Id: <200211250420.gAP4KJcH037069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21465 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21465 Change 21465 by marcel@marcel_nfs on 2002/11/24 20:19:23 HP rx2600 specific kernel config file. Affected files ... .. //depot/projects/ia64/sys/ia64/conf/HP_RX2600#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 24 21:38:22 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8062C37B404; Sun, 24 Nov 2002 21:38:20 -0800 (PST) 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 180EA37B401 for ; Sun, 24 Nov 2002 21:38:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B4F2643E4A for ; Sun, 24 Nov 2002 21:38:19 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAP5YqmV042738 for ; Sun, 24 Nov 2002 21:34:52 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAP5YqsL042735 for perforce@freebsd.org; Sun, 24 Nov 2002 21:34:52 -0800 (PST) Date: Sun, 24 Nov 2002 21:34:52 -0800 (PST) Message-Id: <200211250534.gAP5YqsL042735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21470 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21470 Change 21470 by marcel@marcel_nfs on 2002/11/24 21:34:34 Don't use sym(4) but mpt(4) for the LCI Logic 85C1030. Affected files ... .. //depot/projects/ia64/sys/ia64/conf/HP_RX2600#2 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/HP_RX2600#2 (text+ko) ==== @@ -43,6 +43,7 @@ device loop device md device miibus +device mpt device ohci device pass device pci @@ -51,7 +52,6 @@ device sc device scbus device sio -#device sym # LCI 53C1030 (Fusion-MPT). No dice... device ukbd device usb device vga To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 24 21:44:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9140F37B404; Sun, 24 Nov 2002 21:44:28 -0800 (PST) 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 2A0F937B401 for ; Sun, 24 Nov 2002 21:44:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF9E943E88 for ; Sun, 24 Nov 2002 21:44:27 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAP5f0mV043454 for ; Sun, 24 Nov 2002 21:41:01 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAP5f0kl043451 for perforce@freebsd.org; Sun, 24 Nov 2002 21:41:00 -0800 (PST) Date: Sun, 24 Nov 2002 21:41:00 -0800 (PST) Message-Id: <200211250541.gAP5f0kl043451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21471 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21471 Change 21471 by marcel@marcel_nfs on 2002/11/24 21:40:55 Attach the `else' to the inner `if': If we cannot parse the PCI bus number by evaluating _BBN, and the error is AE_NOT_FOUND, we assume bus 0. Previously we set the bus to 0 if we could get the bus number through _BBN. Affected files ... .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#4 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#4 (text+ko) ==== @@ -164,12 +164,12 @@ device_printf(dev, "could not evaluate _BBN - %s\n", AcpiFormatException(status)); return_VALUE(ENXIO); + } else { + /* if it's not found, assume 0 */ + sc->ap_bus = 0; } - } else { - /* if it's not found, assume 0 */ - sc->ap_bus = 0; } - + /* * If the bus is zero and pcib0 already exists, read the bus number * via PCI config space. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 24 21:54:47 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B34337B406; Sun, 24 Nov 2002 21:54:42 -0800 (PST) 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 1911337B401 for ; Sun, 24 Nov 2002 21:54:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BAA0043E6E for ; Sun, 24 Nov 2002 21:54:41 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAP5pEmV044246 for ; Sun, 24 Nov 2002 21:51:14 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAP5pEh8044243 for perforce@freebsd.org; Sun, 24 Nov 2002 21:51:14 -0800 (PST) Date: Sun, 24 Nov 2002 21:51:14 -0800 (PST) Message-Id: <200211250551.gAP5pEh8044243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21475 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21475 Change 21475 by marcel@marcel_nfs on 2002/11/24 21:50:34 Hack: if the rid passed to sioprobe and sioattach is negative, use memory mapped I/O instead of I/O ports. This makes the HP Diva controller attach... Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#17 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#17 (text+ko) ==== @@ -263,6 +263,7 @@ struct resource *irqres; struct resource *ioportres; + int ioportspace; void *cookie; dev_t devs[6]; @@ -450,7 +451,7 @@ bus_release_resource(dev, SYS_RES_IRQ, 0, com->irqres); } if (com->ioportres) - bus_release_resource(dev, SYS_RES_IOPORT, 0, com->ioportres); + bus_release_resource(dev, com->ioportspace, 0, com->ioportres); if (com->tp && (com->tp->t_state & TS_ISOPEN)) { device_printf(dev, "still open, forcing close\n"); (*linesw[com->tp->t_line].l_close)(com->tp, 0); @@ -467,6 +468,12 @@ return (0); } +__inline intrmask_t +isa_irq_pending(void) +{ + return -1; +} + int sioprobe(dev, xrid, rclk, noprobe) device_t dev; @@ -490,12 +497,13 @@ int result; u_long xirq; u_int flags = device_get_flags(dev); - int rid; + int rid, space; struct resource *port; - rid = xrid; - port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, - 0, ~0, IO_COMSIZE, RF_ACTIVE); + rid = (xrid < 0) ? -xrid : xrid; + space = (xrid < 0) ? SYS_RES_MEMORY : SYS_RES_IOPORT; + port = bus_alloc_resource(dev, space, &rid, 0, ~0, IO_COMSIZE, + RF_ACTIVE); if (!port) return (ENXIO); @@ -539,7 +547,7 @@ for (i = 0; i < count; i++) { xdev = devs[i]; if (device_is_enabled(xdev) && - bus_get_resource(xdev, SYS_RES_IOPORT, 0, &xioport, + bus_get_resource(xdev, space, 0, &xioport, NULL) == 0) outb(xioport + com_mcr, 0); } @@ -551,7 +559,7 @@ if (COM_LLCONSOLE(flags)) { printf("sio%d: reserved for low-level i/o\n", device_get_unit(dev)); - bus_release_resource(dev, SYS_RES_IOPORT, rid, port); + bus_release_resource(dev, space, rid, port); device_set_softc(dev, NULL); free(com, M_DEVBUF); return (ENXIO); @@ -579,7 +587,7 @@ idev = dev; } if (!COM_NOTAST4(flags)) { - if (bus_get_resource(idev, SYS_RES_IOPORT, 0, &io, + if (bus_get_resource(idev, space, 0, &io, NULL) == 0) { xiobase = io; if (bus_get_resource(idev, SYS_RES_IRQ, 0, @@ -712,7 +720,7 @@ sio_setreg(com, com_ier, 0); sio_setreg(com, com_cfcr, CFCR_8BITS); mtx_unlock_spin(&sio_lock); - bus_release_resource(dev, SYS_RES_IOPORT, rid, port); + bus_release_resource(dev, space, rid, port); if (iobase == siocniobase) result = 0; if (result != 0) { @@ -789,7 +797,7 @@ } break; } - bus_release_resource(dev, SYS_RES_IOPORT, rid, port); + bus_release_resource(dev, space, rid, port); if (iobase == siocniobase) result = 0; if (result != 0) { @@ -878,13 +886,14 @@ int minorbase; int unit; u_int flags; - int rid; + int rid, space; struct resource *port; int ret; - rid = xrid; - port = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid, - 0, ~0, IO_COMSIZE, RF_ACTIVE); + rid = (xrid < 0) ? -xrid : xrid; + space = (xrid < 0) ? SYS_RES_MEMORY : SYS_RES_IOPORT; + port = bus_alloc_resource(dev, space, &rid, 0, ~0, IO_COMSIZE, + RF_ACTIVE); if (!port) return (ENXIO); @@ -910,6 +919,7 @@ bzero(com, sizeof *com); com->unit = unit; com->ioportres = port; + com->ioportspace = space; com->bst = rman_get_bustag(port); com->bsh = rman_get_bushandle(port); com->cfcr_image = CFCR_8BITS; @@ -960,7 +970,7 @@ * console, so that other devices can't snarf them. */ if (iobase != siocniobase) - bus_release_resource(dev, SYS_RES_IOPORT, rid, port); + bus_release_resource(dev, space, rid, port); return (ENOMEM); } mtx_unlock_spin(&sio_lock); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 24 21:55:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E43F537B404; Sun, 24 Nov 2002 21:55:44 -0800 (PST) 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 7B67137B401 for ; Sun, 24 Nov 2002 21:55:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3925243E88 for ; Sun, 24 Nov 2002 21:55:44 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAP5qHmV044375 for ; Sun, 24 Nov 2002 21:52:17 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAP5qGIQ044372 for perforce@freebsd.org; Sun, 24 Nov 2002 21:52:16 -0800 (PST) Date: Sun, 24 Nov 2002 21:52:16 -0800 (PST) Message-Id: <200211250552.gAP5qGIQ044372@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21477 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21477 Change 21477 by marcel@marcel_nfs on 2002/11/24 21:52:00 Recognize the HP Diva multiport UART. Don't probe for PCI UARTs. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_pci.c#8 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_pci.c#8 (text+ko) ==== @@ -77,6 +77,7 @@ { 0x0000151f, "SmartLink 5634PCV SurfRider", 0x10 }, { 0x0103115d, "Xircom Cardbus modem", 0x10 }, { 0x98459710, "Netmos Nm9845 PCI Bridge with Dual UART", 0x10 }, + { 0x1048103c, "Diva Serial [GSP] Multiport UART", -0x10 }, { 0x00000000, NULL, 0 } }; @@ -143,7 +144,7 @@ #ifdef PC98 SET_FLAG(dev, SET_IFTYPE(COM_IF_NS16550)); #endif - return (sioprobe(dev, id->rid, 0UL, 0)); + return (sioprobe(dev, id->rid, 0UL, 1)); } DRIVER_MODULE(sio, pci, sio_pci_driver, sio_devclass, 0, 0); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 24 22: 0:58 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0437B37B404; Sun, 24 Nov 2002 22:00:52 -0800 (PST) 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 8F13B37B401 for ; Sun, 24 Nov 2002 22:00:51 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3401F43E3B for ; Sun, 24 Nov 2002 22:00:51 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAP5vOmV044807 for ; Sun, 24 Nov 2002 21:57:24 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAP5vNuP044802 for perforce@freebsd.org; Sun, 24 Nov 2002 21:57:23 -0800 (PST) Date: Sun, 24 Nov 2002 21:57:23 -0800 (PST) Message-Id: <200211250557.gAP5vNuP044802@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21478 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21478 Change 21478 by marcel@marcel_nfs on 2002/11/24 21:57:08 Some more hacking to make this usable as console. Either standalone (vga_cons.c) or as adapter for syscons (vga_vid.c) It's not there yet (both cases). Is this just a waste of time or is this actually useful enough to proceed. For now it allows us to boot the HP box all the way up to init(8), where it hangs due to lack of console... Affected files ... .. //depot/projects/ia64/sys/dev/vga/vga.c#3 edit .. //depot/projects/ia64/sys/dev/vga/vga.h#2 edit .. //depot/projects/ia64/sys/dev/vga/vga_cons.c#2 edit .. //depot/projects/ia64/sys/dev/vga/vga_pci.c#2 edit .. //depot/projects/ia64/sys/dev/vga/vga_vid.c#2 edit Differences ... ==== //depot/projects/ia64/sys/dev/vga/vga.c#3 (text+ko) ==== @@ -131,6 +131,11 @@ sc = device_get_softc(dev); + sc->vga_enable = 1; + + if (sc->vga_console) + return (vga_cnattach(dev)); + for (y = 0; y < 24; y++) for (x = 0; x < 80; x++) vga_write(sc, x, y, ' ', 7); @@ -140,6 +145,5 @@ vga_write(sc, 0, 24, '/', 7); vga_write(sc, 79, 24, '\\', 7); - sc->vga_enable = 1; return (0); } ==== //depot/projects/ia64/sys/dev/vga/vga.h#2 (text+ko) ==== @@ -38,6 +38,7 @@ struct vga_softc { device_t vga_dev; + dev_t vga_node; /* Device flags and state. */ u_int32_t vga_bustype:2; @@ -65,3 +66,4 @@ extern char vga_device_name[]; int vga_attach(device_t); +int vga_cnattach(device_t); ==== //depot/projects/ia64/sys/dev/vga/vga_cons.c#2 (text+ko) ==== @@ -34,18 +34,44 @@ #include #include #include +#include #include #include +#include #include extern void vga_putc(struct vga_softc *, int); +static d_open_t vga_open; +static d_close_t vga_close; +static d_read_t vga_read; +static d_write_t vga_write; +static d_ioctl_t vga_ioctl; + +#define CDEV_MAJOR 20 +static struct cdevsw vga_cdevsw = { + /* open */ vga_open, + /* close */ vga_close, + /* read */ vga_read, + /* write */ vga_write, + /* ioctl */ vga_ioctl, + /* poll */ ttypoll, + /* mmap */ nommap, + /* strategy */ nostrategy, + /* name */ vga_device_name, + /* maj */ CDEV_MAJOR, + /* dump */ nodump, + /* psize */ nopsize, + /* flags */ D_TTY | D_KQFILTER, + /* kqfilter */ ttykqfilter, +}; + static cn_checkc_t vga_cncheckc; static cn_getc_t vga_cngetc; static cn_init_t vga_cninit; -cn_probe_t vga_cnprobe; -cn_putc_t vga_cnputc; +static cn_probe_t vga_cnprobe; +static cn_putc_t vga_cnputc; static cn_term_t vga_cnterm; CONS_DRIVER(vga, vga_cnprobe, vga_cninit, vga_cnterm, vga_cngetc, vga_cncheckc, @@ -63,6 +89,9 @@ struct vga_softc *sc = &vga_console; u_int8_t x; + if (sc->vga_enable) + goto consdev; + /* * XXX we actually need to test here of course. */ @@ -84,10 +113,23 @@ sc->vga_console = 1; sc->vga_enable = 1; - if (cp != NULL) { - cp->cn_dev = 0; - cp->cn_pri = CN_NORMAL; - } + consdev: + cp->cn_dev = makedev(CDEV_MAJOR, 0); + cp->cn_pri = CN_REMOTE; +} + +int vga_cnattach(device_t dev) +{ + struct vga_softc *sc; + int unit; + + sc = device_get_softc(dev); + unit = device_get_unit(dev); + + sc->vga_node = make_dev(&vga_cdevsw, unit, UID_ROOT, GID_WHEEL, 0600, + "vga%r", unit); + + return (0); } static int @@ -120,3 +162,33 @@ vga_cnterm(struct consdev *cp __unused) { } + +static int +vga_open(dev_t dev, int flag, int mode, struct thread *td) +{ + return (ENXIO); +} + +static int +vga_close(dev_t dev, int flag, int mode, struct thread *td) +{ + return (ENXIO); +} + +static int +vga_read(dev_t dev, struct uio *uio, int flag) +{ + return (ENXIO); +} + +static int +vga_write(dev_t dev, struct uio *uio, int flag) +{ + return (ENXIO); +} + +static int +vga_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) +{ + return (ENXIO); +} ==== //depot/projects/ia64/sys/dev/vga/vga_pci.c#2 (text+ko) ==== @@ -112,7 +112,7 @@ /* The softc is already initialized if VGA is the console. */ if (sc->vga_console) - return (0); + return (vga_attach(dev)); bus_set_resource(dev, SYS_RES_MEMORY, VGA_RES_FB, 0xA0000, 0x20000); error = vga_pci_alloc(dev, sc, SYS_RES_MEMORY, VGA_RES_FB); ==== //depot/projects/ia64/sys/dev/vga/vga_vid.c#2 (text+ko) ==== @@ -122,15 +122,22 @@ struct vga_softc *sc = &vga_console; u_int8_t x; - /* We actually get called more than once (twice to be exact). */ + if (flags) + return (0); + + /* + * We actually get called more than once (twice to be exact). The + * first time it's as part of console probing. The second time + * it's as part of the regular syscons initialization. + */ if (sc->vga_enable == 1) - return (1); + goto adapter; /* * XXX we actually need to test here of course. */ sc->vga_fb.tag = IA64_BUS_SPACE_MEM; - sc->vga_fb.handle = 0xA0000; + sc->vga_fb.handle = (6ULL << 61) + 0xA0000; sc->vga_reg.tag = IA64_BUS_SPACE_IO; sc->vga_reg.handle = 0x3c0; @@ -147,13 +154,19 @@ sc->vga_console = 1; sc->vga_enable = 1; + adapter: + if (vga_adapter.va_flags & V_ADP_PROBED) + return (1); + bzero(&vga_adapter, sizeof(vga_adapter)); vga_adapter.va_flags |= V_ADP_PROBED; vga_adapter.va_flags |= (sc->vga_mono) ? 0 : V_ADP_COLOR; vga_adapter.va_name = vga_device_name; vga_adapter.va_type = KD_VGA; - vga_adapter.va_window = (6ULL << 61) + sc->vga_fb.handle + + vga_adapter.va_window = sc->vga_fb.handle + (sc->vga_mono) ? 0x10000 : 0x18000; + vga_adapter.va_window_size = 80*25*2; + vga_adapter.va_crtc_addr = sc->vga_crtc.handle; vid_register(&vga_adapter); return (1); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 24 22: 1:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1DD137B404; Sun, 24 Nov 2002 22:01:53 -0800 (PST) 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 8EFC837B401 for ; Sun, 24 Nov 2002 22:01:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3766843EA9 for ; Sun, 24 Nov 2002 22:01:53 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAP5wQmV045063 for ; Sun, 24 Nov 2002 21:58:26 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAP5wPd2045059 for perforce@freebsd.org; Sun, 24 Nov 2002 21:58:25 -0800 (PST) Date: Sun, 24 Nov 2002 21:58:25 -0800 (PST) Message-Id: <200211250558.gAP5wPd2045059@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21479 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21479 Change 21479 by marcel@marcel_nfs on 2002/11/24 21:58:19 Fix for loop. Forgot to commit this prior to merging to CVS... Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/mca.c#6 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/mca.c#6 (text+ko) ==== @@ -186,7 +186,7 @@ * under unreliable conditions. */ max_size = 0; - for (i = 0; i <= SAL_INFO_TYPES; i++) { + for (i = 0; i < SAL_INFO_TYPES; i++) { result = ia64_sal_entry(SAL_GET_STATE_INFO_SIZE, i, 0, 0, 0, 0, 0, 0); if (result.sal_status == 0) { To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 24 23:31: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 759E037B404; Sun, 24 Nov 2002 23:30:43 -0800 (PST) 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 0651937B401 for ; Sun, 24 Nov 2002 23:30:43 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 973F843ECD for ; Sun, 24 Nov 2002 23:30:41 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAP7REmV050994 for ; Sun, 24 Nov 2002 23:27:14 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAP7RDGP050984 for perforce@freebsd.org; Sun, 24 Nov 2002 23:27:13 -0800 (PST) Date: Sun, 24 Nov 2002 23:27:13 -0800 (PST) Message-Id: <200211250727.gAP7RDGP050984@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21480 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21480 Change 21480 by peter@peter_daintree on 2002/11/24 23:26:53 IFC @21469 Affected files ... .. //depot/projects/ia64/crypto/heimdal/ChangeLog#5 integrate .. //depot/projects/ia64/crypto/heimdal/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/NEWS#4 integrate .. //depot/projects/ia64/crypto/heimdal/aclocal.m4#5 integrate .. //depot/projects/ia64/crypto/heimdal/admin/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/admin/ktutil.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/afsutil/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ChangeLog#5 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/common/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/ftp.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/ftp.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/kf/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/kf/kf.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/kf/kfd.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/login/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/push/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/push/pfrom.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/push/push.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rcp/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rsh/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/su/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/ChangeLog#5 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/libtelnet/kerberos5.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/telnet.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnetd/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/test/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/cf/sunos.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/config.guess#4 integrate .. //depot/projects/ia64/crypto/heimdal/config.sub#4 integrate .. //depot/projects/ia64/crypto/heimdal/configure#5 integrate .. //depot/projects/ia64/crypto/heimdal/configure.in#5 integrate .. //depot/projects/ia64/crypto/heimdal/doc/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/include/Makefile.in#5 integrate .. //depot/projects/ia64/crypto/heimdal/include/kadm5/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/include/make_crypto.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/install-sh#3 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/ChangeLog#5 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadm_conn.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmin.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmind.8#4 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmind.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmind.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/server.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/version4.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/connect.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/hprop.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/hpropd.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kaserver.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kdc.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kstash.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/string2key.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kpasswd/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/kpasswd/kpasswd.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/kpasswd/kpasswdd.cat8#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kdestroy.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kgetcred.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kinit.1#5 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kinit.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/klist.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/klist.cat1#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/45/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/pam/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/sia/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/com_err/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/ChangeLog#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/ipropd_slave.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kafs/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kafs/kafs.cat3#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/Makefile.am#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/Makefile.in#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/changepw.c#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/context.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/keytab_any.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/keytab_file.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/keytab_keyfile.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5_appdefault.3#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/kuserok.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/principal.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/prompter_posix.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/store_emem.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/ChangeLog#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/Makefile.am#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/Makefile.in#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/resolve.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/sl/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/vers/Makefile.in#4 integrate .. //depot/projects/ia64/crypto/heimdal/missing#3 integrate .. //depot/projects/ia64/crypto/heimdal/mkinstalldirs#3 integrate .. //depot/projects/ia64/crypto/heimdal/tools/Makefile.in#5 integrate .. //depot/projects/ia64/crypto/heimdal/tools/krb5-config.cat1#3 integrate .. //depot/projects/ia64/kerberos5/include/config.h#6 integrate .. //depot/projects/ia64/kerberos5/include/version.h#6 integrate .. //depot/projects/ia64/kerberos5/usr.bin/krb5-config/Makefile#8 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/thr_switch.S#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#5 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#14 integrate .. //depot/projects/ia64/sbin/fsck_ffs/pass5.c#10 integrate .. //depot/projects/ia64/share/examples/Makefile#7 integrate .. //depot/projects/ia64/share/man/man4/Makefile#23 integrate .. //depot/projects/ia64/share/man/man4/syncache.4#1 branch .. //depot/projects/ia64/sys/boot/efi/loader/main.c#7 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_cd.c#9 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#21 integrate .. //depot/projects/ia64/sys/conf/options.ia64#11 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#24 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.h#4 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#16 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#20 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbreg.h#5 integrate .. //depot/projects/ia64/sys/dev/raidframe/rf_freebsdkintf.c#2 integrate .. //depot/projects/ia64/sys/i386/acpica/acpi_wakeup.c#11 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#23 integrate .. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#14 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#56 integrate .. //depot/projects/ia64/sys/ia64/ia64/mca.c#7 integrate .. //depot/projects/ia64/sys/ia64/include/cpu.h#9 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#27 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#27 integrate .. //depot/projects/ia64/sys/pci/if_vr.c#10 integrate .. //depot/projects/ia64/sys/pci/if_vrreg.h#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#12 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#26 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#25 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#21 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#20 integrate .. //depot/projects/ia64/tools/KSE/ksetest/kse_asm.S#4 integrate Differences ... ==== //depot/projects/ia64/crypto/heimdal/ChangeLog#5 (text+ko) ==== @@ -1,18 +1,43 @@ -2002-09-16 Jacques Vidrine +2002-10-21 Johan Danielsson + + * lib/krb5/store_emem.c: pull up 1.13; limit how much we allocate + + * lib/krb5/principal.c: pull up 1.82; don't allow trailing + backslashes in components + + * lib/krb5/keytab_keyfile.c: pull up 1.15; more strcspn + + * lib/krb5/keytab_any.c: pull up 1.7; properly close the open + keytabs + + * kdc/connect.c: pull up 1.87; check that %-quotes are followed by + two hex digits + + * lib/krb5/prompter_posix.c: pull up 1.7; use strcspn to convert + the newline to NUL in fgets results. + + * lib/krb5/kuserok.c: pull up 1.6; use strcspn to convert the + newline to NUL in fgets results. + + * lib/krb5/keytab_file.c: pull up 1.12; check return value from + start_seq_get - * lib/krb5/kuserok.c, lib/krb5/prompter_posix.c: use strcspn - to convert the newline to NUL in fgets results. + * lib/krb5/context.c: pull up 1.82; return ENXIO instead of ENOENT + when "unconfigured" -2002-09-13 Johan Danielsson + * lib/krb5/changepw.c: pull up 1.38; fix reply length check + calculation - * kuser/kinit.1: remove unneeded Ns + * kuser/klist.c: pull up 1.68; allow tokens up to size of buffer - * lib/krb5/krb5_appdefault.3: remove extra "application" + * kdc/kaserver.c: pull up 1.21; make sure life is positive - * fix-export: remove autom4ate.cache + * fix-export: pull up 1.28; remove autom4ate.cache 2002-09-10 Johan Danielsson + * Release 0.5 + * include/make_crypto.c: don't use function macros if possible * lib/krb5/krb5_locl.h: get limits.h for UINT_MAX ==== //depot/projects/ia64/crypto/heimdal/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -237,9 +236,6 @@ .SUFFIXES: .SUFFIXES: .et .h .x .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8 .c - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/Makefile.am.common $(top_srcdir)/cf/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile @@ -375,7 +371,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -489,7 +485,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -499,7 +495,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f config.status config.cache config.log distclean-am: clean-am distclean-generic distclean-libtool \ distclean-tags @@ -524,8 +520,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf autom4te.cache + maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive ==== //depot/projects/ia64/crypto/heimdal/NEWS#4 (text+ko) ==== @@ -1,3 +1,17 @@ +Changes in release 0.5.1 + + * kadmind: fix remote exploit + + * kadmind: add option to disable kerberos 4 + + * kdc: make sure kaserver token life is positive + + * telnet: use the session key if there is no subkey + + * fix EPSV parsing in ftp + + * other bug fixes + Changes in release 0.5 * add --detach option to kdc ==== //depot/projects/ia64/crypto/heimdal/aclocal.m4#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# aclocal.m4t generated automatically by aclocal 1.6.3 -*- Autoconf -*- +# aclocal.m4t generated automatically by aclocal 1.6.1 -*- Autoconf -*- # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -241,7 +241,7 @@ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.6.3])]) + [AM_AUTOMAKE_VERSION([1.6.1])]) # Helper functions for option handling. -*- Autoconf -*- @@ -573,7 +573,7 @@ ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -698,13 +698,7 @@ [for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -6725,7 +6719,7 @@ ]) dnl -dnl $Id: sunos.m4,v 1.1 2002/08/28 19:53:51 joda Exp $ +dnl $Id: sunos.m4,v 1.1.4.1 2002/10/21 14:29:36 joda Exp $ dnl AC_DEFUN([rk_SUNOS],[ @@ -6737,7 +6731,7 @@ *-*-solaris2.7) sunos=57 ;; -*-*-solaris2.[89]) +*-*-solaris2.[[89]]) sunos=58 ;; *-*-solaris2*) ==== //depot/projects/ia64/crypto/heimdal/admin/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -283,7 +282,8 @@ if test -f $$p \ || test -f $$p1 \ ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ + f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f; \ else :; fi; \ @@ -292,17 +292,14 @@ uninstall-sbinPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$f" | sed -e 's,^.*/,,'`; \ echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \ rm -f $(DESTDIR)$(sbindir)/$$f; \ done clean-sbinPROGRAMS: - @list='$(sbin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) ktutil$(EXEEXT): $(ktutil_OBJECTS) $(ktutil_DEPENDENCIES) @rm -f ktutil$(EXEEXT) $(LINK) $(ktutil_LDFLAGS) $(ktutil_OBJECTS) $(ktutil_LDADD) $(LIBS) @@ -347,10 +344,6 @@ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 8*) ;; \ - *) ext='8' ;; \ - esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -416,7 +409,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -466,7 +459,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" ==== //depot/projects/ia64/crypto/heimdal/admin/ktutil.cat8#3 (text+ko) ==== @@ -1,11 +1,11 @@ -KTUTIL(8) FreeBSD System Manager's Manual KTUTIL(8) +KTUTIL(8) NetBSD System Manager's Manual KTUTIL(8) NNAAMMEE kkttuuttiill - manage Kerberos keytabs SSYYNNOOPPSSIISS - kkttuuttiill [--kk _k_e_y_t_a_b | ----kkeeyyttaabb==_k_e_y_t_a_b] [--vv | ----vveerrbboossee] [----vveerrssiioonn] - [--hh | ----hheellpp] _c_o_m_m_a_n_d [_a_r_g_s] + kkttuuttiill [--kk _k_e_y_t_a_b | ----kkeeyyttaabb==_k_e_y_t_a_b] [--vv | ----vveerrbboossee] [----vveerrssiioonn] [--hh | + ----hheellpp] _c_o_m_m_a_n_d [_a_r_g_s] DDEESSCCRRIIPPTTIIOONN kkttuuttiill is a program for managing keytabs. _c_o_m_m_a_n_d can be one of the fol- @@ -47,13 +47,13 @@ remove [--pp _p_r_i_n_c_i_p_a_l] [----pprriinncciippaall==_p_r_i_n_c_i_p_a_l] [--VV --kkvvnnoo] [----kkvvnnoo==_k_v_n_o] [--ee --eennccttyyppee] [----eennccttyyppee==_e_n_c_t_y_p_e] - Removes the specified key or keys. Not specifying a _k_v_n_o - removes keys with any version number. Not specifying a - _e_n_c_t_y_p_e removes keys of any type. + Removes the specified key or keys. Not specifying a _k_v_n_o re- + moves keys with any version number. Not specifying a _e_n_c_t_y_p_e + removes keys of any type. rename _f_r_o_m_-_p_r_i_n_c_i_p_a_l _t_o_-_p_r_i_n_c_i_p_a_l - Renames all entries in the keytab that match the - _f_r_o_m_-_p_r_i_n_c_i_p_a_l to _t_o_-_p_r_i_n_c_i_p_a_l. + Renames all entries in the keytab that match the _f_r_o_m_- + _p_r_i_n_c_i_p_a_l to _t_o_-_p_r_i_n_c_i_p_a_l. purge [----aaggee==_a_g_e] Removes all old entries (for which there is a newer version) @@ -78,4 +78,4 @@ SSEEEE AALLSSOO kadmin(8) -HEIMDAL December 16, 2000 HEIMDAL + HEIMDAL December 16, 2000 2 ==== //depot/projects/ia64/crypto/heimdal/appl/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -365,7 +364,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -427,7 +426,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" ==== //depot/projects/ia64/crypto/heimdal/appl/afsutil/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -280,7 +279,8 @@ if test -f $$p \ || test -f $$p1 \ ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ + f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -289,17 +289,14 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$f" | sed -e 's,^.*/,,'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) afslog$(EXEEXT): $(afslog_OBJECTS) $(afslog_DEPENDENCIES) @rm -f afslog$(EXEEXT) $(LINK) $(afslog_LDFLAGS) $(afslog_OBJECTS) $(afslog_LDADD) $(LIBS) @@ -373,7 +370,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -423,7 +420,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" ==== //depot/projects/ia64/crypto/heimdal/appl/ftp/ChangeLog#5 (text+ko) ==== @@ -1,3 +1,7 @@ +2002-10-21 Johan Danielsson + + * ftp/ftp.c: pull up 1.75; fix parsing of epsv ports + 2002-09-05 Johan Danielsson * ftp/security.c (sec_vfprintf): free encoded data ==== //depot/projects/ia64/crypto/heimdal/appl/ftp/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -346,7 +345,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -408,7 +407,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" ==== //depot/projects/ia64/crypto/heimdal/appl/ftp/common/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -324,7 +323,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -373,7 +372,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" ==== //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/Makefile.in#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.6.1 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -55,7 +55,6 @@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -300,7 +299,8 @@ if test -f $$p \ || test -f $$p1 \ ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \ + f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ @@ -309,17 +309,14 @@ uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$f" | sed -e 's,^.*/,,'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) ftp$(EXEEXT): $(ftp_OBJECTS) $(ftp_DEPENDENCIES) @rm -f ftp$(EXEEXT) $(LINK) $(ftp_LDFLAGS) $(ftp_OBJECTS) $(ftp_LDADD) $(LIBS) @@ -364,10 +361,6 @@ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -433,7 +426,7 @@ distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @for file in $(DISTFILES); do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -483,7 +476,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: @echo "This command is intended for maintainers to use" ==== //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/ftp.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include "ftp_locl.h" -RCSID ("$Id: ftp.c,v 1.74 2002/09/04 22:00:12 joda Exp $"); +RCSID ("$Id: ftp.c,v 1.74.4.1 2002/10/21 14:26:31 joda Exp $"); struct sockaddr_storage hisctladdr_ss; struct sockaddr *hisctladdr = (struct sockaddr *)&hisctladdr_ss; @@ -396,6 +396,9 @@ if (p) { p++; strlcpy(pasv, p, sizeof(pasv)); + p = strrchr(pasv, ')'); + if (p) + *p = '\0'; } } return code / 100; ==== //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/ftp.cat1#3 (text+ko) ==== @@ -1,4 +1,4 @@ -FTP(1) FreeBSD General Commands Manual FTP(1) +FTP(1) NetBSD Reference Manual FTP(1) NNAAMMEE ffttpp - ARPANET file transfer program @@ -23,8 +23,8 @@ server, as well as report on data transfer statistics. --nn Restrains ffttpp from attempting ``auto-login'' upon initial connec- - tion. If auto-login is enabled, ffttpp will check the _._n_e_t_r_c (see - below) file in the user's home directory for an entry describing an + tion. If auto-login is enabled, ffttpp will check the _._n_e_t_r_c (see be- + low) file in the user's home directory for an entry describing an account on the remote machine. If no entry exists, ffttpp will prompt for the remote machine login name (default is the user identity on the local machine), and, if necessary, prompt for a password and an @@ -44,8 +44,8 @@ command line. If this is done, ffttpp will immediately attempt to establish a connection to an FTP server on that host; otherwise, ffttpp will enter its command interpreter and await instructions from the user. When ffttpp is - awaiting commands from the user the prompt `ftp>' is provided to the - user. The following commands are recognized by ffttpp: + awaiting commands from the user the prompt `ftp>' is provided to the us- + er. The following commands are recognized by ffttpp: !! [_c_o_m_m_a_n_d [_a_r_g_s]] Invoke an interactive shell on the local machine. If there @@ -69,8 +69,8 @@ or nnmmaapp setting. File transfer uses the current settings for ttyyppee, ffoorrmmaatt, mmooddee, and ssttrruuccttuurree. - aasscciiii Set the file transfer ttyyppee to network ASCII. This is the - default type. + aasscciiii Set the file transfer ttyyppee to network ASCII. This is the de- + fault type. bbeellll Arrange that a bell be sounded after each file transfer com- mand is completed. @@ -78,8 +78,8 @@ bbiinnaarryy Set the file transfer ttyyppee to support binary image transfer. bbyyee Terminate the FTP session with the remote server and exit - ffttpp. An end of file will also terminate the session and - exit. + ffttpp. An end of file will also terminate the session and ex- + it. ccaassee Toggle remote computer file name case mapping during mmggeett commands. When ccaassee is on (default is off), remote computer @@ -87,21 +87,21 @@ local directory with the letters mapped to lower case. ccdd _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y - Change the working directory on the remote machine to - _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y. + Change the working directory on the remote machine to _r_e_m_o_t_e_- + _d_i_r_e_c_t_o_r_y. ccdduupp Change the remote machine working directory to the parent of the current remote machine working directory. cchhmmoodd _m_o_d_e _f_i_l_e_-_n_a_m_e - Change the permission modes of the file _f_i_l_e_-_n_a_m_e on the - remote sytem to _m_o_d_e. + Change the permission modes of the file _f_i_l_e_-_n_a_m_e on the re- + mote sytem to _m_o_d_e. cclloossee Terminate the FTP session with the remote server, and return to the command interpreter. Any defined macros are erased. - ccrr Toggle carriage return stripping during ascii type file - retrieval. Records are denoted by a carriage return/linefeed + ccrr Toggle carriage return stripping during ascii type file re- + trieval. Records are denoted by a carriage return/linefeed sequence during ascii type file transfer. When ccrr is on (the default), carriage returns are stripped from this sequence to conform with the UNIX single linefeed record delimiter. @@ -125,9 +125,9 @@ _l_o_c_a_l_-_f_i_l_e. If interactive prompting is on, ffttpp will prompt the user to verify that the last argument is indeed the tar- get local file for receiving ddiirr output. If no directory is - specified, the current working directory on the remote - machine is used. If no local file is specified, or - _l_o_c_a_l_-_f_i_l_e is --, output comes to the terminal. + specified, the current working directory on the remote ma- + chine is used. If no local file is specified, or _l_o_c_a_l_-_f_i_l_e + is --, output comes to the terminal. ddiissccoonnnneecctt A synonym for _c_l_o_s_e. @@ -153,12 +153,12 @@ exact result depends on the foreign operating system and ftp server, and can be previewed by doing `mls remote-files -'. As a security measure, remotely globbed files that starts - with `/' or contains `../', will not be automatically - received. If you have interactive prompting turned off, these + with `/' or contains `../', will not be automatically re- + ceived. If you have interactive prompting turned off, these filenames will be ignored. Note: mmggeett and mmppuutt are not meant to transfer entire directory subtrees of files. That can be - done by transferring a tar(1) archive of the subtree (in - binary mode). + done by transferring a tar(1) archive of the subtree (in bi- + nary mode). hhaasshh Toggle hash-sign (``#'') printing for each data block trans- ferred. The size of a data block is 1024 bytes. @@ -182,7 +182,7 @@ machine. The listing includes any system-dependent informa- tion that the server chooses to include; for example, most UNIX systems will produce output from the command `ls -l'. - (See also nnlliisstt.) If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified, + (See also nnlliisstt.) If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified, the current working directory is used. If interactive prompting is on, ffttpp will prompt the user to verify that the last argument is indeed the target local file for receiving @@ -194,18 +194,17 @@ _m_a_c_r_o_-_n_a_m_e; a null line (consecutive newline characters in a file or carriage returns from the terminal) terminates macro input mode. There is a limit of 16 macros and 4096 total - characters in all defined macros. Macros remain defined - until a cclloossee command is executed. The macro processor - interprets `$' and `\' as special characters. A `$' followed - by a number (or numbers) is replaced by the corresponding - argument on the macro invocation command line. A `$' fol- - lowed by an `i' signals that macro processor that the execut- - ing macro is to be looped. On the first pass `$i' is - replaced by the first argument on the macro invocation com- - mand line, on the second pass it is replaced by the second - argument, and so on. A `\' followed by any character is - replaced by that character. Use the `\' to prevent special - treatment of the `$'. + characters in all defined macros. Macros remain defined un- + til a cclloossee command is executed. The macro processor inter- + prets `$' and `\' as special characters. A `$' followed by a + number (or numbers) is replaced by the corresponding argument + on the macro invocation command line. A `$' followed by an + `i' signals that macro processor that the executing macro is + to be looped. On the first pass `$i' is replaced by the + first argument on the macro invocation command line, on the + second pass it is replaced by the second argument, and so on. + A `\' followed by any character is replaced by that charac- + ter. Use the `\' to prevent special treatment of the `$'. mmddeelleettee [_r_e_m_o_t_e_-_f_i_l_e_s] Delete the _r_e_m_o_t_e_-_f_i_l_e_s on the remote machine. @@ -240,8 +239,8 @@ ``stream'' mode. mmooddttiimmee _f_i_l_e_-_n_a_m_e - Show the last modification time of the file on the remote - machine. + Show the last modification time of the file on the remote ma- + chine. mmppuutt _l_o_c_a_l_-_f_i_l_e_s Expand wild cards in the list of local files given as argu- @@ -257,20 +256,20 @@ _g_e_t. nnlliisstt [_r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y] [_l_o_c_a_l_-_f_i_l_e] - Print a list of the files in a directory on the remote - machine. If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified, the cur- - rent working directory is used. If interactive prompting is - on, ffttpp will prompt the user to verify that the last argument - is indeed the target local file for receiving nnlliisstt output. - If no local file is specified, or if _l_o_c_a_l_-_f_i_l_e is --, the - output is sent to the terminal. + Print a list of the files in a directory on the remote ma- + chine. If _r_e_m_o_t_e_-_d_i_r_e_c_t_o_r_y is left unspecified, the current + working directory is used. If interactive prompting is on, + ffttpp will prompt the user to verify that the last argument is + indeed the target local file for receiving nnlliisstt output. If + no local file is specified, or if _l_o_c_a_l_-_f_i_l_e is --, the output + is sent to the terminal. nnmmaapp [_i_n_p_a_t_t_e_r_n _o_u_t_p_a_t_t_e_r_n] Set or unset the filename mapping mechanism. If no arguments are specified, the filename mapping mechanism is unset. If arguments are specified, remote filenames are mapped during - mmppuutt commands and ppuutt commands issued without a specified - remote target filename. If arguments are specified, local + mmppuutt commands and ppuutt commands issued without a specified re- + mote target filename. If arguments are specified, local filenames are mapped during mmggeett commands and ggeett commands issued without a specified local target filename. This com- mand is useful when connecting to a non-UNIX remote computer @@ -281,24 +280,24 @@ settings). Variable templating is accomplished by including the sequences `$1', `$2', ..., `$9' in _i_n_p_a_t_t_e_r_n. Use `\' to prevent this special treatment of the `$' character. All - other characters are treated literally, and are used to - determine the nnmmaapp [_i_n_p_a_t_t_e_r_n] variable values. For example, + other characters are treated literally, and are used to de- + termine the nnmmaapp [_i_n_p_a_t_t_e_r_n] variable values. For example, given _i_n_p_a_t_t_e_r_n $1.$2 and the remote file name "mydata.data", $1 would have the value "mydata", and $2 would have the value "data". The _o_u_t_p_a_t_t_e_r_n determines the resulting mapped file- name. The sequences `$1', `$2', ...., `$9' are replaced by - any value resulting from the _i_n_p_a_t_t_e_r_n template. The - sequence `$0' is replace by the original filename. Addition- - ally, the sequence `[_s_e_q_1, _s_e_q_2]' is replaced by [_s_e_q_1] if - _s_e_q_1 is not a null string; otherwise it is replaced by _s_e_q_2. - For example, the command + any value resulting from the _i_n_p_a_t_t_e_r_n template. The se- + quence `$0' is replace by the original filename. Additional- + ly, the sequence `[_s_e_q_1, _s_e_q_2]' is replaced by [_s_e_q_1] if _s_e_q_1 + is not a null string; otherwise it is replaced by _s_e_q_2. For + example, the command nmap $1.$2.$3 [$1,$2].[$2,file] would yield the output filename "myfile.data" for input file- names "myfile.data" and "myfile.data.old", "myfile.file" for - the input filename "myfile", and "myfile.myfile" for the - input filename ".myfile". Spaces may be included in + the input filename "myfile", and "myfile.myfile" for the in- + put filename ".myfile". Spaces may be included in _o_u_t_p_a_t_t_e_r_n, as in the example: `nmap $1 sed "s/ *$//" > $1' . Use the `\' character to prevent special treatment of the `$','[','[', and `,' characters. @@ -309,8 +308,8 @@ lation mechanism is unset. If arguments are specified, char- acters in remote filenames are translated during mmppuutt com- mands and ppuutt commands issued without a specified remote tar- - get filename. If arguments are specified, characters in - local filenames are translated during mmggeett commands and ggeett + get filename. If arguments are specified, characters in lo- + cal filenames are translated during mmggeett commands and ggeett commands issued without a specified local target filename. This command is useful when connecting to a non-UNIX remote computer with different file naming conventions or practices. @@ -322,9 +321,9 @@ ooppeenn _h_o_s_t [_p_o_r_t] Establish a connection to the specified _h_o_s_t FTP server. An optional port number may be supplied, in which case, ffttpp will - attempt to contact an FTP server at that port. If the - aauuttoo--llooggiinn option is on (default), ffttpp will also attempt to - automatically log the user in to the FTP server (see below). + attempt to contact an FTP server at that port. If the aauuttoo-- >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Nov 24 23:57:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFD0D37B406; Sun, 24 Nov 2002 23:57:14 -0800 (PST) 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 89D5737B401 for ; Sun, 24 Nov 2002 23:57:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3267843E4A for ; Sun, 24 Nov 2002 23:57:14 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAP7rkmV054308 for ; Sun, 24 Nov 2002 23:53:46 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAP7rkZc054305 for perforce@freebsd.org; Sun, 24 Nov 2002 23:53:46 -0800 (PST) Date: Sun, 24 Nov 2002 23:53:46 -0800 (PST) Message-Id: <200211250753.gAP7rkZc054305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21481 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21481 Change 21481 by marcel@marcel_nfs on 2002/11/24 23:53:35 Disable SMP for now. We don't get past the NFSROOT mount otherwise. Something to look at, but less urgent than other stuff... Affected files ... .. //depot/projects/ia64/sys/ia64/conf/HP_RX2600#3 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/HP_RX2600#3 (text+ko) ==== @@ -23,7 +23,7 @@ options PSEUDOFS #options ROOTDEVNAME=\"ufs:da0p2\" options SCSI_DELAY=3000 -options SMP +#options SMP options SOFTUPDATES options SYSVMSG options SYSVSEM To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 25 11:41: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BF8D37B401; Mon, 25 Nov 2002 11:40:35 -0800 (PST) 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 BF41737B401 for ; Mon, 25 Nov 2002 11:40:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B2F043EAA for ; Mon, 25 Nov 2002 11:40:33 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAPJb3mV005361 for ; Mon, 25 Nov 2002 11:37:03 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAPJb0dK005345 for perforce@freebsd.org; Mon, 25 Nov 2002 11:37:00 -0800 (PST) Date: Mon, 25 Nov 2002 11:37:00 -0800 (PST) Message-Id: <200211251937.gAPJb0dK005345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21495 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21495 Change 21495 by jhb@jhb_laptop on 2002/11/25 11:36:29 IFC. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#51 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#40 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#17 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#3 integrate .. //depot/projects/smpng/sys/alpha/include/cpu.h#7 integrate .. //depot/projects/smpng/sys/alpha/include/fpu.h#3 integrate .. //depot/projects/smpng/sys/alpha/include/signal.h#6 integrate .. //depot/projects/smpng/sys/alpha/include/ucontext.h#4 integrate .. //depot/projects/smpng/sys/boot/common/help.common#4 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#16 integrate .. //depot/projects/smpng/sys/boot/efi/loader/main.c#6 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#14 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#6 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#27 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.c#7 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#5 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_targetio.h#3 integrate .. //depot/projects/smpng/sys/conf/files#57 integrate .. //depot/projects/smpng/sys/conf/options#41 integrate .. //depot/projects/smpng/sys/conf/options.alpha#10 integrate .. //depot/projects/smpng/sys/conf/options.i386#19 integrate .. //depot/projects/smpng/sys/conf/options.ia64#12 integrate .. //depot/projects/smpng/sys/conf/options.pc98#22 integrate .. //depot/projects/smpng/sys/conf/options.powerpc#5 integrate .. //depot/projects/smpng/sys/conf/options.sparc64#5 integrate .. //depot/projects/smpng/sys/conf/options.x86_64#4 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#2 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#36 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/smpng/sys/dev/aic/aic_pccard.c#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.h#4 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#25 integrate .. //depot/projects/smpng/sys/dev/an/if_an_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pccard.c#4 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar.c#6 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#27 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#11 integrate .. //depot/projects/smpng/sys/dev/awi/if_awi_pccard.c#4 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#18 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#10 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#12 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#10 integrate .. //depot/projects/smpng/sys/dev/cm/smc90cx6.c#4 integrate .. //depot/projects/smpng/sys/dev/cnw/if_cnw.c#10 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#3 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#8 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#11 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#13 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#10 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#5 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#5 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#3 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#4 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe_pccard.c#5 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#21 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#9 integrate .. //depot/projects/smpng/sys/dev/gx/if_gx.c#8 integrate .. //depot/projects/smpng/sys/dev/gx/if_gxvar.h#5 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#7 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie.c#3 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#5 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#9 integrate .. //depot/projects/smpng/sys/dev/lge/if_lgereg.h#2 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#5 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_cbus.c#2 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_isa.c#2 integrate .. //depot/projects/smpng/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#11 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#7 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#18 integrate .. //depot/projects/smpng/sys/dev/nge/if_ngereg.h#6 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#9 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#15 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard_cis.c#10 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#18 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#18 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvar.h#10 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#23 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#7 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#19 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/smpng/sys/dev/pcic/i82365.c#6 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#6 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#3 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#2 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#3 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#8 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#5 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/buffer.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_fmt.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#10 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/vchan.c#5 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#7 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#2 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#6 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/if_auereg.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/if_cuereg.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/if_kuereg.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/uvscom.c#5 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#7 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#40 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.c#8 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#6 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe_pccard.c#4 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#12 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#10 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#11 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#12 integrate .. //depot/projects/smpng/sys/i386/i386/i686_mem.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#51 integrate .. //depot/projects/smpng/sys/i386/i386/mp_clock.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#28 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#29 integrate .. //depot/projects/smpng/sys/i386/include/signal.h#7 integrate .. //depot/projects/smpng/sys/i386/include/ucontext.h#6 integrate .. //depot/projects/smpng/sys/i386/isa/if_cx.c#3 integrate .. //depot/projects/smpng/sys/i386/isa/if_el.c#4 integrate .. //depot/projects/smpng/sys/i386/isa/if_le.c#7 integrate .. //depot/projects/smpng/sys/i386/isa/if_rdp.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#30 integrate .. //depot/projects/smpng/sys/i386/pci/pci_bus.c#11 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#16 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_ipr.c#12 integrate .. //depot/projects/smpng/sys/i4b/driver/i4b_isppp.c#6 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_proto.h#5 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_syscall.h#5 integrate .. //depot/projects/smpng/sys/ia64/ia32/ia32_sysent.c#5 integrate .. //depot/projects/smpng/sys/ia64/ia32/syscalls.master#6 integrate .. //depot/projects/smpng/sys/ia64/ia64/clock.c#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#49 integrate .. //depot/projects/smpng/sys/ia64/ia64/mca.c#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#39 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#20 integrate .. //depot/projects/smpng/sys/ia64/include/_types.h#2 integrate .. //depot/projects/smpng/sys/ia64/include/cpu.h#11 integrate .. //depot/projects/smpng/sys/kern/init_main.c#27 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_context.c#1 branch .. //depot/projects/smpng/sys/kern/kern_exec.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#50 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#10 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#40 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#31 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#13 integrate .. //depot/projects/smpng/sys/kern/link_elf.c#17 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_log.c#9 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#22 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#23 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#22 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#31 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#31 integrate .. //depot/projects/smpng/sys/modules/Makefile#38 integrate .. //depot/projects/smpng/sys/modules/agp/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/cam/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/hifn/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/netgraph/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/bluetooth/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/bt3c/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/h4/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/hci/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/l2cap/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/socket/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubt/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ubsec/Makefile#2 integrate .. //depot/projects/smpng/sys/net/bpf.c#19 integrate .. //depot/projects/smpng/sys/net/bpf.h#5 integrate .. //depot/projects/smpng/sys/net/bpfdesc.h#5 integrate .. //depot/projects/smpng/sys/net/bridge.c#16 integrate .. //depot/projects/smpng/sys/net/bridge.h#6 integrate .. //depot/projects/smpng/sys/net/ethernet.h#7 integrate .. //depot/projects/smpng/sys/net/fddi.h#4 integrate .. //depot/projects/smpng/sys/net/if.c#28 integrate .. //depot/projects/smpng/sys/net/if.h#13 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#6 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#3 integrate .. //depot/projects/smpng/sys/net/if_disc.c#5 integrate .. //depot/projects/smpng/sys/net/if_ef.c#6 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#23 integrate .. //depot/projects/smpng/sys/net/if_faith.c#11 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#9 integrate .. //depot/projects/smpng/sys/net/if_gif.c#14 integrate .. //depot/projects/smpng/sys/net/if_gre.c#4 integrate .. //depot/projects/smpng/sys/net/if_loop.c#11 integrate .. //depot/projects/smpng/sys/net/if_ppp.c#17 integrate .. //depot/projects/smpng/sys/net/if_sl.c#15 integrate .. //depot/projects/smpng/sys/net/if_stf.c#16 integrate .. //depot/projects/smpng/sys/net/if_tap.c#18 integrate .. //depot/projects/smpng/sys/net/if_tun.c#19 integrate .. //depot/projects/smpng/sys/net/if_var.h#14 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#13 integrate .. //depot/projects/smpng/sys/net/if_vlan_var.h#5 integrate .. //depot/projects/smpng/sys/net/raw_cb.c#5 integrate .. //depot/projects/smpng/sys/net/raw_usrreq.c#10 integrate .. //depot/projects/smpng/sys/net/route.c#7 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/common/ng_bluetooth.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/TODO#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4_prse.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4_var.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/TODO#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/TODO#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_cmds.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_evnt.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_main.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_misc.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_misc.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_prse.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_ulpi.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/hci/ng_hci_var.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_bluetooth.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_bt3c.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_h4.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_hci.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_l2cap.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_ubt.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/TODO#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/TODO#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#1 branch .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_ether.c#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#5 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#7 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#12 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#8 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.c#4 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#25 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#19 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.h#4 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#9 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#24 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#26 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#20 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#46 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#16 integrate .. //depot/projects/smpng/sys/pci/agp.c#8 integrate .. //depot/projects/smpng/sys/pci/agp_ali.c#3 integrate .. //depot/projects/smpng/sys/pci/agp_amd.c#7 integrate .. //depot/projects/smpng/sys/pci/agp_i810.c#6 integrate .. //depot/projects/smpng/sys/pci/agp_intel.c#7 integrate .. //depot/projects/smpng/sys/pci/agp_sis.c#3 integrate .. //depot/projects/smpng/sys/pci/agp_via.c#4 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#23 integrate .. //depot/projects/smpng/sys/pci/if_de.c#5 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#9 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#19 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#11 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#16 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#10 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#12 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#18 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#8 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#9 integrate .. //depot/projects/smpng/sys/pci/if_vrreg.h#3 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#9 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#15 integrate .. //depot/projects/smpng/sys/posix4/ksched.c#10 integrate .. //depot/projects/smpng/sys/posix4/p1003_1b.c#6 integrate .. //depot/projects/smpng/sys/posix4/posix4.h#5 integrate .. //depot/projects/smpng/sys/posix4/posix4_mib.c#4 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#30 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#24 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#20 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#17 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#12 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/autoconf.c#8 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#40 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#30 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#24 integrate .. //depot/projects/smpng/sys/sys/eventhandler.h#8 integrate .. //depot/projects/smpng/sys/sys/kse.h#4 integrate .. //depot/projects/smpng/sys/sys/mac.h#9 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#9 integrate .. //depot/projects/smpng/sys/sys/msgbuf.h#5 integrate .. //depot/projects/smpng/sys/sys/proc.h#67 integrate .. //depot/projects/smpng/sys/sys/sched.h#2 integrate .. //depot/projects/smpng/sys/sys/select.h#5 integrate .. //depot/projects/smpng/sys/sys/socket.h#10 integrate .. //depot/projects/smpng/sys/sys/stddef.h#1 branch .. //depot/projects/smpng/sys/sys/syscall.h#23 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#23 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#25 integrate .. //depot/projects/smpng/sys/sys/ucontext.h#6 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#19 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#20 integrate .. //depot/projects/smpng/sys/vm/pmap.h#12 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#20 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#18 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#21 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#11 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#24 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#16 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#19 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#21 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#51 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.191 2002/11/09 16:19:13 des Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.192 2002/11/16 06:35:51 deischen Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -210,7 +210,9 @@ u_long code); #endif +static void get_fpcontext(struct thread *td, mcontext_t *mcp); static void identifycpu(void); +static int set_fpcontext(struct thread *td, const mcontext_t *mcp); struct kva_md_info kmi; @@ -1405,7 +1407,7 @@ frame->tf_regs[FRAME_TRAPARG_A1]; sf.sf_uc.uc_mcontext.mc_regs[R_TRAPARG_A2] = frame->tf_regs[FRAME_TRAPARG_A2]; - sf.sf_uc.uc_mcontext.mc_format = __UC_REV0_SIGFRAME; + sf.sf_uc.uc_mcontext.mc_format = _MC_REV0_SIGFRAME; /* * Allocate and validate space for the signal handler @@ -1664,13 +1666,15 @@ return (error); } #ifdef COMPAT_43 - if (((struct osigcontext*)&uc)->sc_regs[R_ZERO] == 0xACEDBADE) - return osigreturn(td, (struct osigreturn_args *)uap); + if (((struct osigcontext*)&uc)->sc_regs[R_ZERO] == 0xACEDBADE) + return osigreturn(td, (struct osigreturn_args *)uap); #endif /* * Restore the user-supplied information */ + if ((error = set_fpcontext(td, &uc.uc_mcontext)) != 0) + return (error); set_regs(td, (struct reg *)uc.uc_mcontext.mc_regs); val = (uc.uc_mcontext.mc_regs[R_PS] | ALPHA_PSL_USERSET) & ~ALPHA_PSL_USERCLR; @@ -1692,12 +1696,6 @@ signotify(p); PROC_UNLOCK(p); - /* XXX ksc.sc_ownedfp ? */ - alpha_fpstate_drop(td); - bcopy((struct fpreg *)uc.uc_mcontext.mc_fpregs, - &td->td_pcb->pcb_fp, sizeof(struct fpreg)); - td->td_pcb->pcb_fp_control = uc.uc_mcontext.mc_fp_control; - return (EJUSTRETURN); } @@ -2011,6 +2009,133 @@ } int +get_mcontext(struct thread *td, mcontext_t *mcp) +{ + /* + * Use a trapframe for getsetcontext, so just copy the + * threads trapframe. + */ + bcopy(&td->td_frame, &mcp->mc_regs, sizeof(td->td_frame)); + + /* + * When the thread is the current thread, the user stack pointer + * is not in the PCB; it must be read from the PAL. + */ + if (td == curthread) + mcp->mc_regs[FRAME_SP] = alpha_pal_rdusp(); + + mcp->mc_format = _MC_REV0_TRAPFRAME; + mcp->mc_onstack = sigonstack(alpha_pal_rdusp()) ? 1 : 0; + get_fpcontext(td, mcp); + return (0); +} + +int +set_mcontext(struct thread *td, const mcontext_t *mcp) +{ + int ret; + unsigned long val; + + if ((mcp->mc_format != _MC_REV0_TRAPFRAME) && + (mcp->mc_format != _MC_REV0_SIGFRAME)) + return (EINVAL); + else if ((ret = set_fpcontext(td, mcp)) != 0) + return (ret); + + if (mcp->mc_format == _MC_REV0_SIGFRAME) { + set_regs(td, (struct reg *)&mcp->mc_regs); + val = (mcp->mc_regs[R_PS] | ALPHA_PSL_USERSET) & + ~ALPHA_PSL_USERCLR; + td->td_frame->tf_regs[FRAME_PS] = val; + td->td_frame->tf_regs[FRAME_PC] = mcp->mc_regs[R_PC]; + td->td_frame->tf_regs[FRAME_FLAGS] = 0; + if (td == curthread) + alpha_pal_wrusp(mcp->mc_regs[R_SP]); + + } else { + if (td == curthread) + alpha_pal_wrusp(mcp->mc_regs[FRAME_SP]); + /* + * The context is a trapframe, so just copy it over the + * threads frame. + */ + bcopy(&mcp->mc_regs, &td->td_frame, sizeof(td->td_frame)); + } + return (0); +} + +static void +get_fpcontext(struct thread *td, mcontext_t *mcp) +{ + register_t s; + + s = intr_disable(); + if ((td->td_md.md_flags & MDTD_FPUSED) == 0) { + intr_restore(s); + mcp->mc_ownedfp = _MC_FPOWNED_NONE; + } else if (PCPU_GET(fpcurthread) == td) { + /* See comments in alpha_fpstate_save() regarding FEN. */ + if (td != curthread) + alpha_pal_wrfen(1); + /* + * The last field (fpr_cr) of struct fpreg isn't + * included in mc_fpregs, but it immediately follows + * it in mcontext_t. + */ + savefpstate((struct fpreg *)&mcp->mc_fpregs); + if (td != curthread) + alpha_pal_wrfen(0); + intr_restore(s); + mcp->mc_ownedfp = _MC_FPOWNED_FPU; + } else { + /* + * The thread doesn't own the FPU so get the state from + * the PCB. + */ + intr_restore(s); + bcopy(&td->td_pcb->pcb_fp, &mcp->mc_fpregs, + sizeof(td->td_pcb->pcb_fp)); + mcp->mc_ownedfp = _MC_FPOWNED_PCB; + } + /* There's no harm in always doing the following. */ + mcp->mc_fp_control = td->td_pcb->pcb_fp_control; +} + +static int +set_fpcontext(struct thread *td, const mcontext_t *mcp) +{ + register_t s; + + if (mcp->mc_ownedfp == _MC_FPOWNED_NONE) { + /* XXX - Drop fpu state so we get a clean state? */ + alpha_fpstate_drop(td); + } + else if ((mcp->mc_ownedfp != _MC_FPOWNED_FPU) && + (mcp->mc_ownedfp != _MC_FPOWNED_PCB)) + return (EINVAL); + else { + s = intr_disable(); + if (PCPU_GET(fpcurthread) == td) { + /* + * The last field (fpr_cr) of struct fpreg isn't + * included in mc_fpregs, but it immediately follows + * it in mcontext_t. + */ + restorefpstate((struct fpreg *)&mcp->mc_fpregs); + intr_restore(s); + } + else { + /* Just save the state in the PCB. */ + intr_restore(s); + bcopy(&mcp->mc_fpregs, &td->td_pcb->pcb_fp, + sizeof (td->td_pcb->pcb_fp)); + } + td->td_pcb->pcb_fp_control = mcp->mc_fp_control; + } + return (0); +} + +int fill_dbregs(struct thread *td, struct dbreg *dbregs) { ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#40 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.112 2002/11/11 05:17:33 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.114 2002/11/18 01:36:09 alc Exp $ */ /* @@ -323,7 +323,7 @@ */ static uma_zone_t pvzone; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; -static int pmap_pagedaemon_waken = 0; +int pmap_pagedaemon_waken; static PMAP_INLINE void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); @@ -1723,36 +1723,6 @@ } /* - * This routine is very drastic, but can save the system - * in a pinch. - */ -void -pmap_collect() -{ - int i; - vm_page_t m; - static int warningdone = 0; - - if (pmap_pagedaemon_waken == 0) - return; - - if (warningdone < 5) { - printf("pmap_collect: collecting pv entries -- suggest increasing PMAP_SHPGPERPROC\n"); - warningdone++; - } - - for(i = 0; i < vm_page_array_size; i++) { - m = &vm_page_array[i]; - if (m->wire_count || m->hold_count || m->busy || - (m->flags & (PG_BUSY | PG_UNMANAGED))) - continue; - pmap_remove_all(m); - } - pmap_pagedaemon_waken = 0; -} - - -/* * If it is the first entry on the list, it is actually * in the header and we must copy the following entry up * to the header. Otherwise we must search the list for @@ -2763,7 +2733,9 @@ int changed; int s; - if (!pmap_initialized || (m->flags & PG_FICTITIOUS)) + if (!pmap_initialized || (m->flags & PG_FICTITIOUS) || + (!setem && bit == (PG_UWE|PG_KWE) && + (m->flags & PG_WRITEABLE) == 0)) return; s = splvm(); @@ -2805,6 +2777,8 @@ if (changed) pmap_invalidate_page(pv->pv_pmap, pv->pv_va); } + if (!setem && bit == (PG_UWE|PG_KWE)) + vm_page_flag_clear(m, PG_WRITEABLE); splx(s); } ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#17 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.74 2002/09/23 08:04:30 julian Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.75 2002/11/22 23:57:01 mux Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -261,6 +261,11 @@ } void +cpu_thread_dtor(struct thread *td) +{ +} + +void cpu_thread_setup(struct thread *td) { ==== //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#3 (text+ko) ==== @@ -1,10 +1,16 @@ -# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.5 2002/10/30 01:34:41 gallatin Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.6 2002/11/14 14:59:27 jhb Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" hint.fdc.0.drq="2" hint.fd.0.at="fdc0" hint.fd.0.drive="0" +hint.ata.0.at="isa" +hint.ata.0.port="0x1F0" +hint.ata.0.irq="14" +hint.ata.1.at="isa" +hint.ata.1.port="0x170" +hint.ata.1.irq="15" hint.atkbdc.0.at="isa" hint.atkbdc.0.port="0x060" hint.atkbd.0.at="atkbdc" ==== //depot/projects/smpng/sys/alpha/include/cpu.h#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.33 2002/10/06 05:24:13 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.34 2002/11/16 06:35:51 deischen Exp $ */ /* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */ /* @@ -115,11 +115,11 @@ void XentSys(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ void XentUna(u_int64_t, u_int64_t, u_int64_t); /* MAGIC */ void alpha_init(u_long, u_long, u_long, u_long, u_long); +void alpha_fpstate_check(struct thread *td); +void alpha_fpstate_drop(struct thread *td); +void alpha_fpstate_save(struct thread *td, int write); +void alpha_fpstate_switch(struct thread *td); int alpha_pa_access(u_long); -void alpha_fpstate_check(struct thread *p); -void alpha_fpstate_save(struct thread *p, int write); -void alpha_fpstate_drop(struct thread *p); -void alpha_fpstate_switch(struct thread *p); int badaddr (void *, size_t); int badaddr_read(void *, size_t, void *); u_int64_t console_restart(u_int64_t, u_int64_t, u_int64_t); ==== //depot/projects/smpng/sys/alpha/include/fpu.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/fpu.h,v 1.5 2001/09/12 08:36:54 julian Exp $ + * $FreeBSD: src/sys/alpha/include/fpu.h,v 1.6 2002/11/16 06:35:51 deischen Exp $ */ #ifndef _MACHINE_FPU_H_ @@ -116,9 +116,7 @@ __asm__("trapb") #ifdef _KERNEL - -extern int fp_software_completion(u_int64_t regmask, struct thread *p); - +extern int fp_software_completion(u_int64_t regmask, struct thread *td); #endif #endif /* ! _MACHINE_FPU_H_ */ ==== //depot/projects/smpng/sys/alpha/include/signal.h#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/signal.h,v 1.10 2002/10/25 19:10:55 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/include/signal.h,v 1.11 2002/11/16 06:35:51 deischen Exp $ */ /* From: NetBSD: signal.h,v 1.3 1997/04/06 08:47:43 cgd Exp */ /* @@ -94,10 +94,9 @@ unsigned long sc_fpregs[32]; /* FP register set (see above) */ unsigned long sc_fpcr; /* FP control register (see above) */ unsigned long sc_fp_control; /* FP software control word */ - long sc_ownedfp; /* fp has been used */ - long sc_xxx1[2]; /* sc_ssize, sc_sbase on DUX */ - long sc_xxx2[3]; /* sc_fp_trap_pc, sc_fp_trigger_sum, sc_fp_trigger_inst */ - long sc_reserved[2]; /* XXX */ + long sc_ownedfp; /* fp has been used; see mcontext_t */ + long sc_format; /* see mcontext_t */ + long sc_spare[6]; /* XXX */ }; #define sc_sp sc_regs[R_SP] ==== //depot/projects/smpng/sys/alpha/include/ucontext.h#4 (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. * - * $FreeBSD: src/sys/alpha/include/ucontext.h,v 1.5 2002/10/25 19:10:55 peter Exp $ + * $FreeBSD: src/sys/alpha/include/ucontext.h,v 1.6 2002/11/16 06:35:51 deischen Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -43,11 +43,14 @@ unsigned long mc_fpregs[32]; unsigned long mc_fpcr; unsigned long mc_fp_control; +#define _MC_FPOWNED_NONE 0 /* FP state not used */ +#define _MC_FPOWNED_FPU 1 /* FP state came from FPU */ +#define _MC_FPOWNED_PCB 2 /* FP state came from PCB */ long mc_ownedfp; -#define __UC_REV0_SIGFRAME 1 /* context is a signal frame */ -#define __UC_REV0_TRAPFRAME 2 /* context is a trap frame */ +#define _MC_REV0_SIGFRAME 1 /* context is a signal frame */ +#define _MC_REV0_TRAPFRAME 2 /* context is a trap frame */ long mc_format; - long __spare__[6]; + long mc_spare[6]; } mcontext_t; #if defined(_KERNEL) && defined(COMPAT_FREEBSD4) ==== //depot/projects/smpng/sys/boot/common/help.common#4 (text+ko) ==== @@ -256,6 +256,10 @@ Disable the use of the PCI BIOS (i386 only) + set machdep.disable_mtrrs=1 + + Disable the use of i686 MTRRs (i386 only) + set net.inet.tcp.tcbhashsize= TCBHASHSIZE Overrides the compile-time set value of TCBHASHSIZE or @@ -273,6 +277,21 @@ this option provides a hint as to the actual size of system memory (which will be tested before use). + set hw.pci.allow_unsupported_io_range= + + Allow the PCI Bridge to pass through an unsupported + memory range assigned by the BIOS. + + value is 0 (default) or non-zero to enable. + + set hw.pci.enable_io_modes= + + Enable PCI resources which are left off by some BIOSes + or are not enabled correctly by the device driver. + + value is 1 (default), but this may cause problems with + some peripherals. Set to 0 to disable. + ################################################################################ # Tshow DShow the values of variables ==== //depot/projects/smpng/sys/boot/common/loader.8#16 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.47 2002/08/30 11:10:59 iwasaki Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.49 2002/11/13 09:43:53 mdodd Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -422,6 +422,15 @@ respectively. An invalid suffix will result in the variable being ignored by the kernel. +.It Va hw.pci.enable_io_modes +Enable PCI resources which are left off by some BIOSes or are not +enabled correctly by the device driver. +Tunable value set to ON (1) by default, but this may cause problems +with some peripherals. +.It Va hw.pci_allow_unsupported_io_range +Allow the PCI bridge to pass through an unsupported memory range +assigned by the BIOS. +Tunable value set to OFF (0) by default. .It Va kern.maxusers Set the size of a number of statically allocated system tables; see .Xr tuning 7 @@ -476,6 +485,8 @@ the NBUF parameter will override this limit. Modifies .Va VM_BCACHE_SIZE_MAX . +.It Va machdep.disable_mtrrs +Disable the use of i686 MTRRs (x86 only). .It Va machdep.pccard.pcic_irq Overrides the IRQ normally assigned to a PCCARD controller. Typically the first available interrupt will be allocated, ==== //depot/projects/smpng/sys/boot/efi/loader/main.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.11 2002/07/20 03:44:01 peter Exp $"; + "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.12 2002/11/24 19:45:05 marcel Exp $"; #endif /* not lint */ #include @@ -386,9 +386,15 @@ dp->sale_physical_address); printf("Length 0x%x\n", dp->sale_length); - } else { + } else if (*p == 5) { + struct sal_ap_wakeup_descriptor *dp; + dp = (struct sal_ap_wakeup_descriptor *) p; + printf("\n"); + printf(" Mechanism %d\n", dp->sale_mechanism); + printf(" Vector 0x%lx\n", dp->sale_vector); + } else printf("\n"); - } + p += sizes[*p]; } @@ -433,14 +439,23 @@ else maxtr = (res.pal_result[0] >> 32) & 0xff; + printf("%d translation registers\n", maxtr); + pager_open(); - pager_output("V RID Virtual Page Physical Page PgSz ED AR PL D A MA P KEY\n"); + pager_output("TR# RID Virtual Page Physical Page PgSz ED AR PL D A MA P KEY\n"); for (i = 0; i <= maxtr; i++) { char lbuf[128]; bzero(&buf, sizeof(buf)); res = ia64_call_pal_stacked(PAL_VM_TR_READ, i, type, (u_int64_t) &buf); + if (res.pal_status != 0) + break; + + /* Only display valid translations */ + if ((buf.ifa.ifa_ig & 1) == 0) + continue; + if (!(res.pal_result[0] & 1)) buf.pte.pte_ar = 0; if (!(res.pal_result[0] & 2)) @@ -450,8 +465,8 @@ if (!(res.pal_result[0] & 8)) buf.pte.pte_ma = 0; sprintf(lbuf, - "%d %06x %013lx %013lx %4s %d %d %d %d %d %-3s %d %06x\n", - buf.ifa.ifa_ig & 1, + "%03d %06x %013lx %013lx %4s %d %d %d %d %d %-3s %d %06x\n", + i, buf.rr.rr_rid, buf.ifa.ifa_vpn, buf.pte.pte_ppn, @@ -468,6 +483,10 @@ } pager_close(); + if (res.pal_status != 0) { + printf("Error while getting TR contents\n"); + return CMD_ERROR; + } return CMD_OK; } ==== //depot/projects/smpng/sys/boot/forth/loader.conf#14 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.66 2002/11/02 08:49:51 mini Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.67 2002/11/22 18:39:30 dcs Exp $ ############################################################## ### Basic configuration options ############################ @@ -268,7 +268,7 @@ snd_t4dwave_load="NO" # t4dwave snd_via8233_load="NO" # via8233 snd_via82c686_load="NO" # via82c686 -snd_load="NO" # All sound drivers +snd_driver_load="NO" # All sound drivers ############################################################## ### USB modules ############################################ ==== //depot/projects/smpng/sys/cam/cam_periph.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.c,v 1.42 2002/09/02 20:10:18 brooks Exp $ + * $FreeBSD: src/sys/cam/cam_periph.c,v 1.43 2002/11/14 05:35:57 imp Exp $ */ #include @@ -1471,7 +1471,7 @@ break; } default: - panic("Unhandled error action %x\n", err_action); + panic("Unhandled error action %x", err_action); } if ((err_action & SS_MASK) >= SS_START) { ==== //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#11 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.67 2002/10/18 22:03:38 njl Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.68 2002/11/23 22:51:50 njl Exp $ */ /* * Portions of this driver taken from the original FreeBSD cd driver. @@ -2976,6 +2976,12 @@ ccb = cdgetccb(periph, /* priority */ 1); csio = &ccb->csio; + /* Preserve old behavior: units in multiples of CDROM speed */ + if (rdspeed < 177) + rdspeed *= 177; + if (wrspeed < 177) + wrspeed *= 177; + cam_fill_csio(csio, /* retries */ 1, /* cbfcnp */ cddone, >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 25 11:41:41 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1AC537B406; Mon, 25 Nov 2002 11:41:36 -0800 (PST) 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 4A99037B401 for ; Mon, 25 Nov 2002 11:41:36 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8F9E143E9C for ; Mon, 25 Nov 2002 11:41:35 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAPJc5mV005734 for ; Mon, 25 Nov 2002 11:38:05 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAPJc5TQ005731 for perforce@freebsd.org; Mon, 25 Nov 2002 11:38:05 -0800 (PST) Date: Mon, 25 Nov 2002 11:38:05 -0800 (PST) Message-Id: <200211251938.gAPJc5TQ005731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21496 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21496 Change 21496 by jhb@jhb_laptop on 2002/11/25 11:37:24 IFC @21494. Affected files ... .. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#24 integrate Differences ... ==== //depot/projects/smpng/sys/cam/scsi/scsi_target.c#6 (text+ko) ==== @@ -26,28 +26,24 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.45 2002/11/22 22:55:51 njl Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.46 2002/11/25 19:28:05 njl Exp $ */ #include #include #include #include -#include #include #include -#include -#include #include -#include +#include +#include #include #include #include #include -#include #include -#include #include /* Transaction information attached to each CCB sent by the user */ ==== //depot/projects/smpng/sys/pci/if_dc.c#24 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_dc.c,v 1.83 2002/11/14 23:49:08 sam Exp $ + * $FreeBSD: src/sys/pci/if_dc.c,v 1.84 2002/11/25 19:28:01 luigi Exp $ */ /* @@ -137,7 +137,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/pci/if_dc.c,v 1.83 2002/11/14 23:49:08 sam Exp $"; + "$FreeBSD: src/sys/pci/if_dc.c,v 1.84 2002/11/25 19:28:01 luigi Exp $"; #endif /* @@ -3539,15 +3539,13 @@ switch(command) { case SIOCSIFFLAGS: if (ifp->if_flags & IFF_UP) { - if (ifp->if_flags & IFF_RUNNING && - ifp->if_flags & IFF_PROMISC && - !(sc->dc_if_flags & IFF_PROMISC)) { - dc_setfilt(sc); - } else if (ifp->if_flags & IFF_RUNNING && - !(ifp->if_flags & IFF_PROMISC) && - sc->dc_if_flags & IFF_PROMISC) { - dc_setfilt(sc); - } else if (!(ifp->if_flags & IFF_RUNNING)) { + int need_setfilt = (ifp->if_flags ^ sc->dc_if_flags) & + (IFF_PROMISC | IFF_ALLMULTI); + + if (ifp->if_flags & IFF_RUNNING) { + if (need_setfilt) + dc_setfilt(sc); + } else { sc->dc_txthresh = 0; dc_init(sc); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 25 14:25:12 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D34437B404; Mon, 25 Nov 2002 14:24:46 -0800 (PST) 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 2F64537B401 for ; Mon, 25 Nov 2002 14:24:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D308C43E9C for ; Mon, 25 Nov 2002 14:24:44 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAPMLEmV017620 for ; Mon, 25 Nov 2002 14:21:14 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAPMLDaS017617 for perforce@freebsd.org; Mon, 25 Nov 2002 14:21:13 -0800 (PST) Date: Mon, 25 Nov 2002 14:21:13 -0800 (PST) Message-Id: <200211252221.gAPMLDaS017617@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21505 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21505 Change 21505 by peter@peter_daintree on 2002/11/25 14:20:59 IFC @21504 Affected files ... .. //depot/projects/ia64/bin/chmod/chmod.1#7 integrate .. //depot/projects/ia64/bin/expr/expr.1#7 integrate .. //depot/projects/ia64/bin/ls/ls.1#13 integrate .. //depot/projects/ia64/include/Makefile#19 integrate .. //depot/projects/ia64/libexec/ftpd/ftpd.8#6 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#4 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#52 integrate .. //depot/projects/ia64/sbin/disklabel/disklabel.8#9 integrate .. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#16 integrate .. //depot/projects/ia64/sbin/rcorder/rcorder.8#4 integrate .. //depot/projects/ia64/share/examples/scsi_target/Makefile#3 integrate .. //depot/projects/ia64/share/man/man4/Makefile#24 integrate .. //depot/projects/ia64/share/man/man4/ppc.4#2 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_target.c#4 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#14 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#12 integrate .. //depot/projects/ia64/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/buffer.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/channel.c#7 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder.c#5 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder_fmt.c#3 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sndstat.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sound.c#9 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/ia64/sys/dev/sound/pcm/vchan.c#4 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/ia64/sys/pci/if_dc.c#19 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#34 integrate .. //depot/projects/ia64/usr.bin/getconf/Makefile#3 integrate Differences ... ==== //depot/projects/ia64/bin/chmod/chmod.1#7 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chmod.1 8.4 (Berkeley) 3/31/94 -.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.34 2002/11/04 06:46:53 tjr Exp $ +.\" $FreeBSD: src/bin/chmod/chmod.1,v 1.35 2002/11/25 14:18:42 ru Exp $ .\" .Dd March 31, 1994 .Dt CHMOD 1 @@ -56,13 +56,22 @@ operand. .Pp The options are as follows: -.Bl -tag -width Ds +.Bl -tag -width indent +.It Fl f +Do not display a diagnostic message if +.Nm +could not modify the mode for +.Va file , +nor modify the exit status to reflect such failures. .It Fl H If the .Fl R option is specified, symbolic links on the command line are followed. (Symbolic links encountered in the tree traversal are not followed by default.) +.It Fl h +If the file is a symbolic link, change the mode of the link itself +rather than the file that the link points to. .It Fl L If the .Fl R @@ -75,14 +84,6 @@ .It Fl R Change the modes of the file hierarchies rooted in the files instead of just the files themselves. -.It Fl f -Do not display a diagnostic message if -.Nm -could not modify the mode for -.Va file . -.It Fl h -If the file is a symbolic link, change the mode of the link itself -rather than the file that the link points to. .It Fl v Cause .Nm @@ -115,22 +116,24 @@ .Pp .Bl -tag -width 6n -compact -offset indent .It Li 4000 -(the set-user-ID-on-execution bit) Executable files with this bit set +(the setuid bit). +Executable files with this bit set will run with effective uid set to the uid of the file owner. -Directories with the set-user-id bit set will force all files and +Directories with this bit set will force all files and sub-directories created in them to be owned by the directory owner and not by the uid of the creating process, if the underlying file system supports this feature: see .Xr chmod 2 and the -.Ar suiddir +.Cm suiddir option to .Xr mount 8 . .It Li 2000 -(the set-group-ID-on-execution bit) Executable files with this bit set +(the setgid bit). +Executable files with this bit set will run with effective gid set to the gid of the file owner. .It Li 1000 -(the sticky bit) +(the sticky bit). See .Xr chmod 2 and ==== //depot/projects/ia64/bin/expr/expr.1#7 (text+ko) ==== @@ -28,7 +28,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/bin/expr/expr.1,v 1.21 2002/10/28 00:15:42 wollman Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.22 2002/11/25 13:20:30 ru Exp $ .\" .Dd May 10, 2002 .Dt EXPR 1 @@ -135,8 +135,9 @@ New applications are advised to use shell arithmetic rather than .Nm . .Ss Compatibility with previous implementations -Unless -.Fx 4.x +Unless +.Fx +4.x compatibility is enabled, this version of .Nm adheres to the @@ -174,7 +175,6 @@ For historical reasons, defining the environment variable .Ev EXPR_COMPAT also enables compatibility mode. -.Pp .Sh ENVIRONMENT .Bl -tag -width ".Ev EXPR_COMPAT" .It Ev EXPR_COMPAT ==== //depot/projects/ia64/bin/ls/ls.1#13 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.71 2002/11/03 07:29:08 tjr Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.72 2002/11/25 13:52:57 ru Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -420,10 +420,10 @@ .Pp The next field contains a plus -.Pq Sq Li + +.Pq Ql + character if the file has an ACL, or a space -.Pq Sq Li " " +.Pq Ql " " if it does not. The .Nm @@ -461,7 +461,7 @@ will be displayed in units of that size block. .It Ev CLICOLOR Use -\*[Ai] +.Tn ANSI color sequences to distinguish file types. See .Ev LSCOLORS @@ -570,7 +570,7 @@ .El .Pp Note that the above are standard -\*[Ai] +.Tn ANSI colors. The actual display may differ depending on the color capabilities of the terminal in use. @@ -648,8 +648,11 @@ utility conforms to .St -p1003.1-2001 . .Pp -.No The ACL support is compatible with IEEE\ Std\ 1003.2c\ ( Ns Dq "POSIX.2c" Ns ) -Draft\ 17 +The ACL support is compatible with +.Tn IEEE +Std\~1003.2c +.Pq Dq Tn POSIX Ns .2c +Draft\~17 (withdrawn). .Sh HISTORY An ==== //depot/projects/ia64/include/Makefile#19 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.189 2002/11/21 23:34:57 julian Exp $ +# $FreeBSD: src/include/Makefile,v 1.190 2002/11/25 08:55:50 ru Exp $ # # Doing a make install builds /usr/include # @@ -41,10 +41,9 @@ security/lomac security/mac_biba security/mac_bsdextended \ security/mac_mls security/mac_partition ufs/ffs ufs/ufs - -# For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/* -# are taken care of -LSYMSUBDIRS= ${LSUBDIRS:Ncam/scsi:Nnetatm/*:Nnetgraph/bluetooth/*} +# For SHARED=symlinks, cam, netatm, and netgraph are symlinks, so cam/scsi, +# netatm/*, and netgraph/* are taken care of +LSYMSUBDIRS= ${LSUBDIRS:Ncam/scsi:Nnetatm/*:Nnetgraph/*} # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is ==== //depot/projects/ia64/libexec/ftpd/ftpd.8#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.54 2002/08/23 09:06:27 yar Exp $ +.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.55 2002/11/25 15:20:06 ru Exp $ .\" .Dd January 27, 2000 .Dt FTPD 8 @@ -40,12 +40,12 @@ .Nd Internet File Transfer Protocol server .Sh SYNOPSIS .Nm -.Op Fl 46AdDEmMoOrRSUvW +.Op Fl 46ADdEMmOoRrSUvW .Op Fl l Op Fl l .Op Fl a Ar address .Op Fl p Ar file +.Op Fl T Ar maxtimeout .Op Fl t Ar timeout -.Op Fl T Ar maxtimeout .Op Fl u Ar umask .Sh DESCRIPTION The @@ -82,16 +82,13 @@ is specified, accept connections via .Dv AF_INET6 socket. +.It Fl A +Allow only anonymous ftp access. .It Fl a When .Fl D is specified, accept connections only on the specified .Ar address . -.It Fl A -Allow only anonymous ftp access. -.It Fl d -Debugging information is written to the syslog using -.Dv LOG_FTP . .It Fl D With this option set, .Nm @@ -102,6 +99,9 @@ from .Xr inetd 8 and is thus useful on busy servers to reduce load. +.It Fl d +Debugging information is written to the syslog using +.Dv LOG_FTP . .It Fl E Disable the EPSV command. This is useful for servers behind older firewalls. @@ -113,38 +113,31 @@ If this option is specified twice, the retrieve (get), store (put), append, delete, make directory, remove directory and rename operations and their filename arguments are also logged. -Note: -.Dv LOG_FTP -messages -are not displayed by +By default, .Xr syslogd 8 -by default, and may have to be enabled in -.Xr syslogd 8 Ns 's -configuration file. +logs these to +.Pa /var/log/xferlog . +.It Fl M +Prevent anonymous users from creating directories. .It Fl m Permit anonymous users to overwrite or modify -existing files if allowed by filesystem permissions. +existing files if allowed by file system permissions. By default, anonymous users cannot modify existing files; in particular, files to upload will be created under a unique name. -.It Fl M -Prevent anonymous users from creating directories. -.It Fl o -Put server in write-only mode. -RETR is disabled, preventing downloads. .It Fl O Put server in write-only mode for anonymous users only. RETR is disabled for anonymous users, preventing anonymous downloads. This has no effect if .Fl o is also specified. +.It Fl o +Put server in write-only mode. +RETR is disabled, preventing downloads. .It Fl p When .Fl D is specified, write the daemon's process ID to .Ar file . -.It Fl r -Put server in read-only mode. -All commands which may modify the local filesystem are disabled. .It Fl R With this option set, .Nm @@ -155,16 +148,15 @@ will only honor PORT commands directed to unprivileged ports on the remote user's host (which violates the FTP protocol specification but closes some security holes). +.It Fl r +Put server in read-only mode. +All commands which may modify the local file system are disabled. .It Fl S With this option set, .Nm logs all anonymous file downloads to the file .Pa /var/log/ftpd when this file exists. -.It Fl t -The inactivity timeout period is set to -.Ar timeout -seconds (the default is 15 minutes). .It Fl T A client may also request a different timeout period; the maximum period allowed may be set to @@ -173,6 +165,17 @@ .Fl T option. The default limit is 2 hours. +.It Fl t +The inactivity timeout period is set to +.Ar timeout +seconds (the default is 15 minutes). +.It Fl U +In previous versions of +.Nm , +when a passive mode client requested a data connection to the server, +the server would use data ports in the range 1024..4999. Now, by default, +the server will use data ports in the range 49152..65535. Specifying this +option will revert to the old behavior. .It Fl u The default file creation mode mask is set to .Ar umask , @@ -180,18 +183,11 @@ Refer to .Xr umask 2 for details. -.It Fl U -In previous versions of -.Nm , -when a passive mode client requested a data connection to the server, -the server would use data ports in the range 1024..4999. Now, by default, -the server will use data ports in the range 49152..65535. Specifying this -option will revert to the old behavior. .It Fl v A synonym for .Fl d . .It Fl W -Don't log FTP sessions to +Do not log FTP sessions to .Pa /var/log/wtmp . .El .Pp @@ -269,7 +265,7 @@ .El .Pp The following non-standard or -.Tn UNIX +.Ux specific commands are supported by the SITE request. @@ -488,7 +484,7 @@ .Pa ~/bin directory exist. .Sh FILES -.Bl -tag -width /etc/ftpwelcome -compact +.Bl -tag -width ".Pa /var/log/xferlog" -compact .It Pa /etc/ftpusers List of unwelcome/restricted users. .It Pa /etc/ftpchroot @@ -503,6 +499,8 @@ Displayed and access refused. .It Pa /var/log/ftpd Log file for anonymous transfers. +.It Pa /var/log/xferlog +Default place for session logs. .El .Sh SEE ALSO .Xr ftp 1 , ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#4 (text+ko) ==== @@ -26,7 +26,7 @@ The &os; Release Engineering Team - $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.5 2002/11/03 22:06:48 ceri Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/early-adopter/article.sgml,v 1.6 2002/11/25 21:14:16 keramida Exp $ 2002 @@ -412,7 +412,7 @@ While &os; 5.0 contains a number of new and exciting features, it may not be suitable for all users at this time. In this document, we presented some background on release - engineering, some of the more notable new features of the 5.0 + engineering, some of the more notable new features of the 5.X series, and some drawbacks to early adoption. We also presented some future plans for the 4-STABLE development branch and some tips on upgrading for early adopters. ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#52 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.455 2002/11/23 00:31:58 njl Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.456 2002/11/25 21:12:52 bmah Exp $ 2000 @@ -85,7 +85,7 @@ Typical release note items document new drivers or hardware support, new commands or options, major bugfixes, or contributed software upgrades. Applicable security - advisories issued after &release.prev; are also listed. + advisories issued after &release.prev.historic; are also listed. Many additional changes were made to &os; that are not listed here for lack of space. For example, documentation was corrected @@ -138,10 +138,9 @@ and supports more flexible attachment of devices, has been largely reworked. &man.devfs.5; is now enabled by default and can be disabled by the NODEVFS kernel - option. - - The &man.devfs.5; rule subsystem has been introduced. DEVFS rules - permit the administrator to define certain properties of new device + option. + A rule subsystem + permits the administrator to define certain properties of new device nodes before they become visible to the userland. Both static (e.g. /dev/speaker) and dynamic (e.g. /dev/bpf*, some removable devices) nodes are @@ -150,12 +149,11 @@ jails. Rules and rulesets are manipulated with the &man.devfs.8; utility. - The dgm driver has been removed in favor of the digi driver. - A new digi driver has been added to support PCI Xr-based and ISA Xem Digiboard cards. A new &man.digictl.8; program is (mainly) used to re-initialize cards that have external port - modules attached such as the PC/Xem. + modules attached such as the PC/Xem. This driver replaces the older + dgm driver. An &man.eaccess.2; system call has been added, similar to &man.access.2; except that the former uses effective credentials @@ -233,7 +231,7 @@ &os; now supports an extensible Mandatory Access Control framework, the TrustedBSD MAC Framework. It permits loadable kernel modules to link to the kernel at compile-time, boot-time, - or run-time, and augment the system security policy. The + or run-time to augment the system security policy. The framework permits modules to express interest in a variety of events, and also provides common security policy services such as label storage. A variety of sample policy modules are @@ -471,7 +469,7 @@ instance is desired. &merged; It is now possible to hardwire kernel environment variables - (such as tuneables) at compile-time using &man.config.8;'s + (such as tunables) at compile-time using &man.config.8;'s ENV directive. Idle zeroing of pages can be enabled with the @@ -558,7 +556,7 @@ improve performance on the 80386 due to the elimination of runtime processor type checks. Custom kernels that will run on the 80386 can - still be built by changing the cpu options in the kernel + still be built by changing the CPU options in the kernel configuration file to only include I386_CPU. @@ -995,7 +993,7 @@ support for VLANs is also supported. &merged; A FAST_IPSEC kernel option now allows - the IPsec implementation to use the kernel crypo framework, + the IPsec implementation to use the kernel &man.crypto.4; framework, along with its support for hardware cryptographic acceleration. @@ -1040,7 +1038,7 @@ commonly referred to as IPFW2). It now uses variable-sized representation of rules in the kernel, similar to &man.bpf.4; instructions. Most of the externally-visible - behavior (i.e. through &man.ipfw.8;) should be unchanged., + behavior (i.e. through &man.ipfw.8;) should be unchanged, although &man.ipfw.8; now supports or connectives between match fields. &merged; @@ -1193,7 +1191,7 @@ net.inet.tcp.rexmit_min and net.inet.tcp.rexmit_slop. The default has been reduced from one second to 200ms (similar to the Linux default) - in order to better handle hicups over interactive connections and + in order to better handle hiccups over interactive connections and improve recovery over lossy fast connections such as wireless links. The &man.tcp.4; protocol now has the ability to dynamically @@ -1309,7 +1307,7 @@ driver supports the Compaq SmartRAID 5* family of RAID controllers (5300, 532, 5i). &merged; - The &man.fdc.4; floppy disk has undergone a number of + The &man.fdc.4; floppy disk driver has undergone a number of enhancements. Density selection for common settings is now automatic; the driver is also much more flexible in setting the densities of various subdevices. @@ -1326,7 +1324,7 @@ refer to a disk partition without specifying an MBR slice (e.g. /dev/ad0a); the kernel would automatically find the first applicable &os; slice and use - it. On GEOM kernels, only the full partition names + it. On GEOM-enabled kernels (the default), only the full partition names (e.g. /dev/ad0s1a) are allowed when referring to partitions within MBR slices. This change should affect very few users. @@ -1437,7 +1435,7 @@ Filesystems - Support for named extended attributes was added to the + Support for named extended attributes has been added to the &os; kernel. This allows the kernel, and appropriately privileged userland processes, to tag files and directories with attribute data. Extended attributes were added to @@ -1455,10 +1453,6 @@ Details can be found in /usr/src/sys/ufs/ffs/README.snapshot. - - Softupdates for FFS have received some bug fixes and - enhancements. - When running with softupdates, &man.statfs.2; and &man.df.1; will track the number of blocks and files that are committed to being freed. @@ -1819,45 +1813,45 @@ or disabling various system services in &man.rc.conf.5; on new installs. &merged; - A bug in which malformed ELF executable images can hang the + A bug in which malformed ELF executable images can hang the system has been fixed (see security advisory FreeBSD-SA-00:41). &merged; - A security hole in Linux emulation was fixed (see security + A security hole in Linux emulation was fixed (see security advisory FreeBSD-SA-00:42). &merged; String-handling library calls in many programs were fixed to reduce the possibility of buffer overflow-related exploits. &merged; - TCP now uses stronger randomness in choosing its initial + TCP now uses stronger randomness in choosing its initial sequence numbers (see security advisory FreeBSD-SA-00:52). &merged; - Several buffer overflows in &man.tcpdump.1; were corrected + Several buffer overflows in &man.tcpdump.1; were corrected (see security advisory FreeBSD-SA-00:61). &merged; - A security hole in &man.top.1; was corrected (see security + A security hole in &man.top.1; was corrected (see security advisory FreeBSD-SA-00:62). &merged; - A potential security hole caused by an off-by-one-error in + A potential security hole caused by an off-by-one-error in &man.gethostbyname.3; has been fixed (see security advisory FreeBSD-SA-00:63). &merged; - A potential buffer overflow in the &man.ncurses.3; library, + A potential buffer overflow in the &man.ncurses.3; library, which could cause arbitrary code to be run from within &man.systat.1;, has been corrected (see security advisory FreeBSD-SA-00:68). &merged; - A vulnerability in &man.telnetd.8; that could cause it to + A vulnerability in &man.telnetd.8; that could cause it to consume large amounts of server resources has been fixed (see security advisory FreeBSD-SA-00:69). &merged; - The nat deny_incoming command in + The nat deny_incoming command in &man.ppp.8; now works correctly (see security advisory FreeBSD-SA-00:70). &merged; - A vulnerability in &man.csh.1;/&man.tcsh.1; temporary files + A vulnerability in &man.csh.1;/&man.tcsh.1; temporary files that could allow overwriting of arbitrary user-writable files has been closed (see security advisory FreeBSD-SA-00:76). &merged; @@ -1872,33 +1866,33 @@ &man.telnet.1; now does a better job of sanitizing its environment. &merged; - Several vulnerabilities in &man.procfs.5; were fixed (see + Several vulnerabilities in &man.procfs.5; were fixed (see security advisory FreeBSD-SA-00:77). &merged; - A bug in OpenSSH in which a + A bug in OpenSSH in which a server was unable to disable &man.ssh-agent.1; or X11Forwarding was fixed (see security advisory FreeBSD-SA-01:01). &merged; - A bug in &man.ipfw.8; and &man.ip6fw.8; in which inbound TCP + A bug in &man.ipfw.8; and &man.ip6fw.8; in which inbound TCP segments could incorrectly be treated as being part of an established connection has been fixed (see security advisory FreeBSD-SA-01:08). &merged; - A bug in &man.crontab.1; that could allow users to read any + A bug in &man.crontab.1; that could allow users to read any file on the system in valid &man.crontab.5; syntax has been fixed (see security advisory FreeBSD-SA-01:09). &merged; - A vulnerability in &man.inetd.8; that could allow + A vulnerability in &man.inetd.8; that could allow read-access to the initial 16 bytes of wheel-accessible files has been fixed (see security advisory FreeBSD-SA-01:11). &merged; - A bug in &man.periodic.8; that used insecure temporary files + A bug in &man.periodic.8; that used insecure temporary files has been corrected (see security advisory FreeBSD-SA-01:12). &merged; - OpenSSH now has code to prevent + OpenSSH now has code to prevent (instead of just mitigating through connection limits) an attack that can lead to guessing the server key (not host key) by regenerating the server key when an RSA failure is detected (see @@ -1914,42 +1908,42 @@ A bug in ICMP that could cause an attacker to disrupt TCP and UDP sessions has been corrected. &merged; - A bug in &man.timed.8;, which caused it to crash if send + A bug in &man.timed.8;, which caused it to crash if send certain malformed packets, has been corrected (see security advisory FreeBSD-SA-01:28). &merged; - A bug in &man.rwhod.8;, which caused it to crash if send + A bug in &man.rwhod.8;, which caused it to crash if send certain malformed packets, has been corrected (see security advisory FreeBSD-SA-01:29). &merged; - A security hole in &os;'s FFS and EXT2FS implementations, + A security hole in &os;'s FFS and EXT2FS implementations, which allowed a race condition that could cause users to have unauthorized access to data, has been fixed (see security advisory FreeBSD-SA-01:30). &merged; - A remotely-exploitable vulnerability in &man.ntpd.8; has + A remotely-exploitable vulnerability in &man.ntpd.8; has been closed (see security advisory FreeBSD-SA-01:31). &merged; - A security hole in IPFilter's + A security hole in IPFilter's fragment cache has been closed (see security advisory FreeBSD-SA-01:32). &merged; - Buffer overflows in &man.glob.3;, which could cause + Buffer overflows in &man.glob.3;, which could cause arbitrary code to be run on an FTP server, have been closed. In addition, to prevent some forms of DOS attacks, &man.glob.3; allows specification of a limit on the number of pathname matches it will return. &man.ftpd.8; now uses this feature (see security advisory FreeBSD-SA-01:33). &merged; - Initial sequence numbers in TCP are more thoroughly + Initial sequence numbers in TCP are more thoroughly randomized (see security advisory FreeBSD-SA-01:39). Due to some possible compatibility issues, the behavior of this security fix can be enabled or disabled via the net.inet.tcp.tcp_seq_genscheme sysctl variable.&merged; - A vulnerability in the &man.fts.3; routines (used by + A vulnerability in the &man.fts.3; routines (used by applications for recursively traversing a filesystem) could allow a program to operate on files outside the intended directory hierarchy. This bug has been fixed (see security @@ -1959,19 +1953,19 @@ user's UID before attempting to unlink the authentication forwarding file, nullifying the effects of a race. - A flaw allowed some signal handlers to remain in effect in a + A flaw allowed some signal handlers to remain in effect in a child process after being exec-ed from its parent. This allowed an attacker to execute arbitrary code in the context of a setuid binary. This flaw has been corrected (see security advisory FreeBSD-SA-01:42). &merged; - A remote buffer overflow in &man.tcpdump.1; has been fixed + A remote buffer overflow in &man.tcpdump.1; has been fixed (see security advisory FreeBSD-SA-01:48). &merged; - A remote buffer overflow in &man.telnetd.8; has been fixed + A remote buffer overflow in &man.telnetd.8; has been fixed (see security advisory FreeBSD-SA-01:49). &merged; - The new net.inet.ip.maxfragpackets and + The new net.inet.ip.maxfragpackets and net.inet.ip6.maxfragpackets sysctl variables limit the amount of memory that can be consumed by IPv4 and IPv6 packet fragments, which defends against some denial of service @@ -1984,33 +1978,33 @@ installations, as well as editing inetd.conf. &merged; - A flaw in the implementation of the &man.ipfw.8; + A flaw in the implementation of the &man.ipfw.8; me rules on point-to-point links has been corrected. Formerly, me filter rules would match the remote IP address of a point-to-point interface in addition to the intended local IP address (see security advisory FreeBSD-SA-01:53). &merged; - A vulnerability in &man.procfs.5;, which could allow a + A vulnerability in &man.procfs.5;, which could allow a process to read sensitive information from another process's memory space, has been closed (see security advisory FreeBSD-SA-01:55). &merged; - The PARANOID hostname checking in + The PARANOID hostname checking in tcp_wrappers now works as advertised (see security advisory FreeBSD-SA-01:56). &merged; - A local root exploit in &man.sendmail.8; has been closed + A local root exploit in &man.sendmail.8; has been closed (see security advisory FreeBSD-SA-01:57). &merged; - A remote root vulnerability in &man.lpd.8; has been closed + A remote root vulnerability in &man.lpd.8; has been closed (see security advisory FreeBSD-SA-01:58). &merged; - A race condition in &man.rmuser.8; that briefly exposed a + A race condition in &man.rmuser.8; that briefly exposed a world-readable /etc/master.passwd has been fixed (see security advisory FreeBSD-SA-01:59). &merged; - A vulnerability in UUCP has been + A vulnerability in UUCP has been closed (see security advisory FreeBSD-SA-01:62). All non-root-owned binaries in standard system paths now have the schg flag set to prevent @@ -2026,112 +2020,108 @@ A security hole in the form of a buffer overflow in the &man.semop.2; system call has been closed. &merged; - A security hole in OpenSSH, which + A security hole in OpenSSH, which could allow users to execute code with arbitrary privileges if UseLogin yes was set, has been closed. Note that the default value of this setting is UseLogin no. (See security advisory FreeBSD-SA-01:63.) &merged; - The use of an insecure temporary directory by + The use of an insecure temporary directory by &man.pkg.add.1; could permit a local attacker to modify the contents of binary packages while they were being installed. This hole has been closed. (See security advisory FreeBSD-SA-02:01.) &merged; - A race condition in &man.pw.8;, which could expose the + A race condition in &man.pw.8;, which could expose the contents of /etc/master.passwd, has been eliminated. (See security advisory FreeBSD-SA-02:02.) &merged; - A bug in &man.k5su.8; could have allowed a process that had + A bug in &man.k5su.8; could have allowed a process that had given up superuser privileges to regain them. This bug has been fixed. (See security advisory FreeBSD-SA-02:07.) &merged; - An off-by-one bug has been fixed in + An off-by-one bug has been fixed in OpenSSH's multiplexing code. This bug could have allowed an authenticated remote user to cause &man.sshd.8; to execute arbitrary code with superuser privileges, or allowed a malicious SSH server to execute arbitrary code on the client system with the privileges of the client user. (See security - advisory FreeBSD-SA-02:13.) + advisory FreeBSD-SA-02:13.) &merged; - A programming error in zlib could + A programming error in zlib could result in attempts to free memory multiple times. The &man.malloc.3;/&man.free.3; routines used in &os; are not vulnerable to this error, but applications receiving specially-crafted blocks of invalid compressed data could be made to function incorrectly or abort. This zlib bug has been fixed. For a - workaround and solutions, see security advisory FreeBSD-SA-02:18. + workaround and solutions, see security advisory FreeBSD-SA-02:18. &merged; - Bugs in the TCP SYN cache (syncache) and SYN + Bugs in the TCP SYN cache (syncache) and SYN cookie (syncookie) implementations, which could cause legitimate TCP/IP traffic to crash a machine, have been fixed. For a workaround and patches, see security advisory - FreeBSD-SA-02:20. + FreeBSD-SA-02:20. &merged; - A routing table memory leak, which could allow a remote + A routing table memory leak, which could allow a remote attacker to exhaust the memory of a target machine, has been fixed. A workaround and patches can be found in security - advisory FreeBSD-SA-02:21. + advisory FreeBSD-SA-02:21. &merged; - A bug with memory-mapped I/O, which could cause a system + A bug with memory-mapped I/O, which could cause a system crash, has been fixed. For more information about a solution, - see security advisory FreeBSD-SA-02:22. + see security advisory + FreeBSD-SA-02:22. &merged; - A security hole, in which SUID programs could be made to + A security hole, in which SUID programs could be made to read from or write to inappropriate files through manipulation of their standard I/O file descriptors, has been fixed. Information regarding a solution can be found in security - advisory FreeBSD-SA-02:23. + advisory + FreeBSD-SA-02:23. &merged; - Some unexpected behavior could be allowed with &man.k5su.8; + Some unexpected behavior could be allowed with &man.k5su.8; because it does not require that an invoking user be a member of the wheel group when attempting to become the superuser (this is the case with &man.su.1;). To avoid this situation, &man.k5su.8; is now installed non-SUID by default (effectively disabling it). More information can be found in - security advisory FreeBSD-SA-02:24. + security advisory + FreeBSD-SA-02:24. &merged; - Multiple vulnerabilities were found in the &man.bzip2.1; + Multiple vulnerabilities were found in the &man.bzip2.1; utility, which could allow files to be overwritten without warning or allow local users unintended access to files. These problems have been corrected with a new import of bzip2. For more information, see - security advisory FreeBSD-SA-02:25. + security advisory + FreeBSD-SA-02:25. &merged; - A bug has been fixed in the implementation of the TCP SYN + A bug has been fixed in the implementation of the TCP SYN cache (syncache), which could allow a remote attacker to deny access to a service when accept filters (see &man.accept.filter.9;) were in use. This bug has been - fixed; for more information, see security advisory FreeBSD-SA-02:26. + fixed; for more information, see security advisory + FreeBSD-SA-02:26. &merged; - Due to a bug in &man.rc.8;'s use of shell globbing, users + Due to a bug in &man.rc.8;'s use of shell globbing, users may be able to remove the contents of arbitrary files if /tmp/.X11-unix does not exist and the system can be made to reboot. This bug has been corrected (see - security advisory FreeBSD-SA-02:27). + security advisory + FreeBSD-SA-02:27. &merged; A buffer overflow in the resolver, which could be exploited @@ -2317,7 +2307,7 @@ &man.calendar.1; now takes a option, which operates similar to but without - special treatment at weekends, and a option + special treatment at weekends, and a option to change the notion of Friday. A minimalized version of &man.camcontrol.8; is @@ -2378,7 +2368,7 @@ &man.chown.8; no longer takes . as a user/group delimeter. This change was made to support usernames - containing a .. + containing a . character. Use of the CSMG_* macros no longer require inclusion of @@ -2432,7 +2422,7 @@ functionality of &man.pccardd.8;. - &man.devd.8; is work-in-progress. + &man.devd.8; is a work in progress. @@ -2516,7 +2506,7 @@ &man.fdread.1;, a program to read data from floppy disks, has been added. It is a counterpart to &man.fdwrite.1; and is designed to provide a means of recovering at least some data - from bad media, and to obviate for a complex invocation of + from bad media, and to obviate the need for a complex invocation of &man.dd.1;. &man.find.1; now takes the flag, @@ -3087,7 +3077,7 @@ space. &merged; A number of archaic features of &man.newfs.8; have been - removed; these implement tuning features that are essentially + removed; these implemented tuning features that are essentially useless on modern hard disks. These features were controlled by the , , , , , @@ -3300,7 +3290,7 @@ &man.rcmd.3; now supports the use of the RSH environment variable to specify a program to use other than &man.rsh.1; for remote execution. As a result, - programs such as &man.dump.8;, can use &man.ssh.1; for remote + programs such as &man.dump.8; can use &man.ssh.1; for remote transport. &man.rdist.1; has been retired from the base system, but is @@ -3525,7 +3515,10 @@ deleted. &merged; &man.sysinstall.8; no longer mounts the &man.procfs.5; - filesystem by default on new installs. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 25 14:27:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98F6F37B404; Mon, 25 Nov 2002 14:27:53 -0800 (PST) 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 30D0237B401 for ; Mon, 25 Nov 2002 14:27:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CB98943EAA for ; Mon, 25 Nov 2002 14:27:52 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAPMOMmV018413 for ; Mon, 25 Nov 2002 14:24:22 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAPMOMFo018410 for perforce@freebsd.org; Mon, 25 Nov 2002 14:24:22 -0800 (PST) Date: Mon, 25 Nov 2002 14:24:22 -0800 (PST) Message-Id: <200211252224.gAPMOMFo018410@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21506 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21506 Change 21506 by peter@peter_daintree on 2002/11/25 14:23:20 whitespace sync with -current Affected files ... .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#6 edit Differences ... ==== //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#6 (text+ko) ==== @@ -169,7 +169,7 @@ sc->ap_bus = 0; } } - + /* * If the bus is zero and pcib0 already exists, read the bus number * via PCI config space. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 25 18:29:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1C32237B404; Mon, 25 Nov 2002 18:29:48 -0800 (PST) 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 9F9EF37B401 for ; Mon, 25 Nov 2002 18:29:47 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C6B343EBE for ; Mon, 25 Nov 2002 18:29:47 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAQ2QGmV033410 for ; Mon, 25 Nov 2002 18:26:16 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAQ2QFZv033407 for perforce@freebsd.org; Mon, 25 Nov 2002 18:26:15 -0800 (PST) Date: Mon, 25 Nov 2002 18:26:15 -0800 (PST) Message-Id: <200211260226.gAQ2QFZv033407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21511 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21511 Change 21511 by peter@peter_ia64 on 2002/11/25 18:25:51 Fix some integer overflows. This makes localtime and mktime work happily for time_t's up to about the year 2^31. Unfortunately, bash2's configure script tries to do a localtime/mktime on a time_t of about 2^63, which is in the year (roughly) 292 billion, which will not fit in 'int tm_year' (as specified by the standard). With these fixes, we're good up until about the year 2.4billion or so. This is the cause of the original mktime cpu loop, and the cause of why the bash2 configure script spins. Note that the bash2 script actually times out after 60 seconds and kills itself and declares mktime(3) to be broken. Also note that mktime(3) fails the same tests on i386 and all the other platforms. This is because it fails the so-called "spring foward" test when mktime() fails when asked for a time in some window. /* Fail if mktime fails to convert a date in the spring-forward gap. Based on a problem report from Andreas Jaeger. */ static void spring_forward_gap () { /* glibc (up to about 1998-10-07) failed this test. */ struct tm tm; /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" instead of "TZ=America/Vancouver" in order to detect the bug even on systems that don't support the Olson extension, or don't have the full zoneinfo tables installed. */ putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); tm.tm_year = 98; tm.tm_mon = 3; tm.tm_mday = 5; tm.tm_hour = 2; tm.tm_min = 0; tm.tm_sec = 0; tm.tm_isdst = -1; if (mktime (&tm) == (time_t)-1) { printf("fail spring forward\n"); exit (1); } } As I said, this fails on x86 as well. So we dont need to worry about failures on ia64 when the tester tries to generate unrepresentable (in struct tm) time_t's 292 billion years into the future. Affected files ... .. //depot/projects/ia64/lib/libc/stdtime/localtime.c#7 edit Differences ... ==== //depot/projects/ia64/lib/libc/stdtime/localtime.c#7 (text+ko) ==== @@ -149,7 +149,7 @@ long offset, int * okayp); static void timesub(const time_t * timep, long offset, const struct state * sp, struct tm * tmp); -static int tmcomp(const struct tm * atmp, +static long tmcomp(const struct tm * atmp, const struct tm * btmp); static time_t transtime(time_t janfirst, int year, const struct rule * rulep, long offset); @@ -1222,7 +1222,7 @@ const struct lsinfo * lp; long days; long rem; - int y; + long y; int yleap; const int * ip; long corr; @@ -1291,7 +1291,7 @@ y = EPOCH_YEAR; #define LEAPS_THRU_END_OF(y) ((y) / 4 - (y) / 100 + (y) / 400) while (days < 0 || days >= (long) year_lengths[yleap = isleap(y)]) { - int newy; + long newy; newy = y + days / DAYSPERNYEAR; if (days < 0) @@ -1380,12 +1380,12 @@ return increment_overflow(tensptr, tensdelta); } -static int +static long tmcomp(atmp, btmp) const struct tm * const atmp; const struct tm * const btmp; { - int result; + long result; if ((result = (atmp->tm_year - btmp->tm_year)) == 0 && (result = (atmp->tm_mon - btmp->tm_mon)) == 0 && @@ -1404,7 +1404,7 @@ int * const okayp; { const struct state * sp; - int dir; + long dir; int bits; int i, j ; int saved_seconds; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 25 18:32:55 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CA6237B404; Mon, 25 Nov 2002 18:32:52 -0800 (PST) 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 047A737B401 for ; Mon, 25 Nov 2002 18:32:52 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1C1E43EC5 for ; Mon, 25 Nov 2002 18:32:51 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAQ2TKmV033843 for ; Mon, 25 Nov 2002 18:29:20 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAQ2TKPg033840 for perforce@freebsd.org; Mon, 25 Nov 2002 18:29:20 -0800 (PST) Date: Mon, 25 Nov 2002 18:29:20 -0800 (PST) Message-Id: <200211260229.gAQ2TKPg033840@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 21512 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21512 Change 21512 by peter@peter_ia64 on 2002/11/25 18:29:00 gah, forgot to back some stuff out of the last change. I had changed tm_year to 'long' to test the algorithms, which required changing tmcomp return value from int to long. Affected files ... .. //depot/projects/ia64/lib/libc/stdtime/localtime.c#8 edit Differences ... ==== //depot/projects/ia64/lib/libc/stdtime/localtime.c#8 (text+ko) ==== @@ -149,7 +149,7 @@ long offset, int * okayp); static void timesub(const time_t * timep, long offset, const struct state * sp, struct tm * tmp); -static long tmcomp(const struct tm * atmp, +static int tmcomp(const struct tm * atmp, const struct tm * btmp); static time_t transtime(time_t janfirst, int year, const struct rule * rulep, long offset); @@ -1380,12 +1380,12 @@ return increment_overflow(tensptr, tensdelta); } -static long +static int tmcomp(atmp, btmp) const struct tm * const atmp; const struct tm * const btmp; { - long result; + int result; if ((result = (atmp->tm_year - btmp->tm_year)) == 0 && (result = (atmp->tm_mon - btmp->tm_mon)) == 0 && @@ -1404,7 +1404,7 @@ int * const okayp; { const struct state * sp; - long dir; + int dir; int bits; int i, j ; int saved_seconds; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Nov 25 22:48: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE9E237B404; Mon, 25 Nov 2002 22:47:59 -0800 (PST) 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 4701437B401 for ; Mon, 25 Nov 2002 22:47:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2C7643E4A for ; Mon, 25 Nov 2002 22:47:58 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAQ6iQmV048599 for ; Mon, 25 Nov 2002 22:44:26 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAQ6iQpH048596 for perforce@freebsd.org; Mon, 25 Nov 2002 22:44:26 -0800 (PST) Date: Mon, 25 Nov 2002 22:44:26 -0800 (PST) Message-Id: <200211260644.gAQ6iQpH048596@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21513 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21513 Change 21513 by marcel@marcel_nfs on 2002/11/25 22:43:56 isa_irq_pending() got piggybacked. Remove it here again. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#18 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#18 (text+ko) ==== @@ -468,12 +468,6 @@ return (0); } -__inline intrmask_t -isa_irq_pending(void) -{ - return -1; -} - int sioprobe(dev, xrid, rclk, noprobe) device_t dev; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 26 7:11:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8D0537B401; Tue, 26 Nov 2002 07:11:17 -0800 (PST) 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 91E0837B401 for ; Tue, 26 Nov 2002 07:11:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 133F743E88 for ; Tue, 26 Nov 2002 07:11:17 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAQF7hmV080704 for ; Tue, 26 Nov 2002 07:07:43 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAQF7gVC080701 for perforce@freebsd.org; Tue, 26 Nov 2002 07:07:42 -0800 (PST) Date: Tue, 26 Nov 2002 07:07:42 -0800 (PST) Message-Id: <200211261507.gAQF7gVC080701@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21528 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21528 Change 21528 by jhb@jhb_laptop on 2002/11/26 07:07:05 IFC. Affected files ... .. //depot/projects/smpng/sys/boot/common/help.common#5 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#17 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#15 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#14 integrate .. //depot/projects/smpng/sys/dev/pci/pci_pci.c#12 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#24 integrate Differences ... ==== //depot/projects/smpng/sys/boot/common/help.common#5 (text+ko) ==== @@ -240,22 +240,6 @@ completely the value determined when the kernel was compiled. - set machdep.pccard.pcic_irq= - - Overrides the IRQ normally assigned to a PCCARD controller. - Typically the first available interrupt will be allocated, - which may conflict with other hardware. If this value is - set to 0, an interrupt will not be assigned and the - controller will operate in polled mode only. - - set machdep.bios.pnp=disable - - Disable the use of the PnP BIOS (i386 only) - - set machdep.bios.pci=disable - - Disable the use of the PCI BIOS (i386 only) - set machdep.disable_mtrrs=1 Disable the use of i686 MTRRs (i386 only) ==== //depot/projects/smpng/sys/boot/common/loader.8#17 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.49 2002/11/13 09:43:53 mdodd Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.50 2002/11/26 13:55:50 yar Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -487,13 +487,6 @@ .Va VM_BCACHE_SIZE_MAX . .It Va machdep.disable_mtrrs Disable the use of i686 MTRRs (x86 only). -.It Va machdep.pccard.pcic_irq -Overrides the IRQ normally assigned to a PCCARD controller. -Typically the first available interrupt will be allocated, -which may conflict with other hardware. -If this value is set to 0, -an interrupt will not be assigned -and the controller will operate in polled mode only. .It Va net.inet.tcp.tcbhashsize Overrides the compile-time set value of .Va TCBHASHSIZE ==== //depot/projects/smpng/sys/boot/forth/loader.conf#15 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.67 2002/11/22 18:39:30 dcs Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.68 2002/11/26 13:55:50 yar Exp $ ############################################################## ### Basic configuration options ############################ @@ -96,7 +96,6 @@ #kern.ipc.nmbufs="" # Set the maximum number of mbufs #kern.ipc.nsfbufs="" # Set the number of sendfile(2) bufs #kern.vm.kmem.size="" # Sets the size of kernel memory (bytes) -#machdep.pccard.pcic_irq="0" # Assigns PCCARD controller IRQ (0=polled) #net.inet.tcp.tcbhashsize="" # Set the value of TCBHASHSIZE #vfs.root.mountfrom="" # Specify root partition in a way the # kernel understands ==== //depot/projects/smpng/sys/dev/acpica/acpi_pcib_acpi.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.26 2002/11/22 18:11:13 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.27 2002/11/25 21:55:04 jhb Exp $ */ #include "opt_acpi.h" #include @@ -164,10 +164,10 @@ device_printf(dev, "could not evaluate _BBN - %s\n", AcpiFormatException(status)); return_VALUE(ENXIO); + } else { + /* if it's not found, assume 0 */ + sc->ap_bus = 0; } - } else { - /* if it's not found, assume 0 */ - sc->ap_bus = 0; } /* @@ -176,16 +176,15 @@ */ busok = 1; if (sc->ap_bus == 0 && devclass_get_device(pcib_devclass, 0) != dev) { + busok = 0; status = acpi_EvaluateInteger(sc->ap_handle, "_ADR", &addr); if (ACPI_FAILURE(status)) { if (status != AE_NOT_FOUND) { device_printf(dev, "could not evaluate _ADR - %s\n", AcpiFormatException(status)); return_VALUE(ENXIO); - } else { + } else device_printf(dev, "could not determine config space address\n"); - busok = 0; - } } else { /* XXX: We assume bus 0. */ slot = addr >> 16; @@ -193,11 +192,11 @@ if (bootverbose) device_printf(dev, "reading config registers from 0:%d:%d\n", slot, func); - if (host_pcib_get_busno(pci_cfgregread, 0, slot, func, &busno) == 0) { + if (host_pcib_get_busno(pci_cfgregread, 0, slot, func, &busno) == 0) device_printf(dev, "could not read bus number from config space\n"); - busok = 0; - } else { + else { sc->ap_bus = busno; + busok = 1; } } } ==== //depot/projects/smpng/sys/dev/em/if_em.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.14 2002/11/14 23:54:50 sam Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.16 2002/11/25 20:00:13 luigi Exp $*/ #include @@ -127,7 +127,7 @@ static void em_clean_transmit_interrupts(struct adapter *); static int em_allocate_receive_structures(struct adapter *); static int em_allocate_transmit_structures(struct adapter *); -static void em_process_receive_interrupts(struct adapter *); +static void em_process_receive_interrupts(struct adapter *, int); static void em_receive_checksum(struct adapter *, struct em_rx_desc * rx_desc, struct mbuf *); @@ -529,14 +529,14 @@ case SIOCSIFFLAGS: IOCTL_DEBUGOUT("ioctl rcv'd: SIOCSIFFLAGS (Set Interface Flags)"); if (ifp->if_flags & IFF_UP) { - if (ifp->if_flags & IFF_RUNNING && - ifp->if_flags & IFF_PROMISC) { - em_set_promisc(adapter); - } else if (ifp->if_flags & IFF_RUNNING && - !(ifp->if_flags & IFF_PROMISC)) { - em_disable_promisc(adapter); - } else + /* + * init adapter if not running, then take care + * of possible changes in IFF_ALLMULTI and IFF_PROMISC + */ + if (!(ifp->if_flags & IFF_RUNNING)) em_init(adapter); + em_disable_promisc(adapter); + em_set_promisc(adapter); } else { if (ifp->if_flags & IFF_RUNNING) { em_stop(adapter); @@ -682,12 +682,55 @@ adapter->timer_handle = timeout(em_local_timer, adapter, 2*hz); em_clear_hw_cntrs(&adapter->hw); +#ifdef DEVICE_POLLING + /* + * Only enable interrupts if we are not polling, make sure + * they are off otherwise. + */ + if (ifp->if_ipending & IFF_POLLING) + em_disable_intr(adapter); + else +#endif /* DEVICE_POLLING */ em_enable_intr(adapter); splx(s); return; } +#ifdef DEVICE_POLLING +static poll_handler_t em_poll; + +static void +em_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) +{ + struct adapter *adapter = ifp->if_softc; + + if (cmd == POLL_DEREGISTER) { /* final call, enable interrupts */ + em_enable_intr(adapter); + return; + } + if (cmd == POLL_AND_CHECK_STATUS) { + u_int32_t reg_icr = E1000_READ_REG(&adapter->hw, ICR); + + if (reg_icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) { + untimeout(em_local_timer, adapter, + adapter->timer_handle); + adapter->hw.get_link_status = 1; + em_check_for_link(&adapter->hw); + em_print_link_status(adapter); + adapter->timer_handle = timeout(em_local_timer, + adapter, 2*hz); + } + } + if (ifp->if_flags & IFF_RUNNING) { + em_process_receive_interrupts(adapter, count); + em_clean_transmit_interrupts(adapter); + } + if (ifp->if_flags & IFF_RUNNING && ifp->if_snd.ifq_head != NULL) + em_start(ifp); +} +#endif /* DEVICE_POLLING */ + /********************************************************************* * * Interrupt Service routine @@ -704,6 +747,17 @@ ifp = &adapter->interface_data.ac_if; +#ifdef DEVICE_POLLING + if (ifp->if_ipending & IFF_POLLING) + return; + + if (ether_poll_register(em_poll, ifp)) { + em_disable_intr(adapter); + em_poll(ifp, 0, 1); + return; + } +#endif /* DEVICE_POLLING */ + em_disable_intr(adapter); while (loop_cnt > 0 && (reg_icr = E1000_READ_REG(&adapter->hw, ICR)) != 0) { @@ -720,7 +774,7 @@ } if (ifp->if_flags & IFF_RUNNING) { - em_process_receive_interrupts(adapter); + em_process_receive_interrupts(adapter, -1); em_clean_transmit_interrupts(adapter); } loop_cnt--; @@ -1993,7 +2047,7 @@ * *********************************************************************/ static void -em_process_receive_interrupts(struct adapter * adapter) +em_process_receive_interrupts(struct adapter * adapter, int count) { struct mbuf *mp; struct ifnet *ifp; @@ -2018,7 +2072,7 @@ return; } - while (current_desc->status & E1000_RXD_STAT_DD) { + while ((current_desc->status & E1000_RXD_STAT_DD) && (count != 0)) { /* Get a pointer to the actual receive buffer */ rx_buffer = STAILQ_FIRST(&adapter->rx_buffer_list); @@ -2032,6 +2086,7 @@ accept_frame = 1; if (current_desc->status & E1000_RXD_STAT_EOP) { + count--; eop = 1; len = current_desc->length - ETHER_CRC_LEN; } else { ==== //depot/projects/smpng/sys/dev/pci/pci_pci.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.20 2002/11/22 17:50:47 jhb Exp $ + * $FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.21 2002/11/25 21:53:14 jhb Exp $ */ /* @@ -457,7 +457,7 @@ u_int32_t id; id = read_config(bus, slot, func, PCIR_DEVVENDOR, 4); - if (id == 0xffff) + if (id == 0xffffffff) return (0); switch (id) { @@ -488,19 +488,19 @@ switch (slot) { case 0x12: /* Intel 82454NX PXB#0, Bus#A */ - *busnum = read_config(bus, 0, func, 0xd0, 1); + *busnum = read_config(bus, 0x10, func, 0xd0, 1); break; case 0x13: /* Intel 82454NX PXB#0, Bus#B */ - *busnum = read_config(bus, 0, func, 0xd1, 1) + 1; + *busnum = read_config(bus, 0x10, func, 0xd1, 1) + 1; break; case 0x14: /* Intel 82454NX PXB#1, Bus#A */ - *busnum = read_config(bus, 0, func, 0xd3, 1); + *busnum = read_config(bus, 0x10, func, 0xd3, 1); break; case 0x15: /* Intel 82454NX PXB#1, Bus#B */ - *busnum = read_config(bus, 0, func, 0xd4, 1) + 1; + *busnum = read_config(bus, 0x10, func, 0xd4, 1) + 1; break; } break; ==== //depot/projects/smpng/sys/vm/vm_map.c#24 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.c,v 1.271 2002/11/09 21:26:49 alc Exp $ + * $FreeBSD: src/sys/vm/vm_map.c,v 1.272 2002/11/25 22:00:31 alc Exp $ */ /* @@ -1284,12 +1284,14 @@ */ if (current->protection != old_prot) { mtx_lock(&Giant); + vm_page_lock_queues(); #define MASK(entry) (((entry)->eflags & MAP_ENTRY_COW) ? ~VM_PROT_WRITE : \ VM_PROT_ALL) pmap_protect(map->pmap, current->start, current->end, current->protection & MASK(current)); #undef MASK + vm_page_unlock_queues(); mtx_unlock(&Giant); } vm_map_simplify_entry(map, current); @@ -2197,10 +2199,12 @@ * write-protected. */ if ((src_entry->eflags & MAP_ENTRY_NEEDS_COPY) == 0) { + vm_page_lock_queues(); pmap_protect(src_map->pmap, src_entry->start, src_entry->end, src_entry->protection & ~VM_PROT_WRITE); + vm_page_unlock_queues(); } /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 26 8:30: 0 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8707737B406; Tue, 26 Nov 2002 08:29:56 -0800 (PST) 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 1216C37B404 for ; Tue, 26 Nov 2002 08:29:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AA8543EC2 for ; Tue, 26 Nov 2002 08:29:55 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAQGQLmV085297 for ; Tue, 26 Nov 2002 08:26:21 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAQGQKU3085291 for perforce@freebsd.org; Tue, 26 Nov 2002 08:26:20 -0800 (PST) Date: Tue, 26 Nov 2002 08:26:20 -0800 (PST) Message-Id: <200211261626.gAQGQKU3085291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21533 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21533 Change 21533 by jhb@jhb_laptop on 2002/11/26 08:25:55 Oops, need to set icr_lo's value. Affected files ... .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#29 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#29 (text+ko) ==== @@ -2155,9 +2155,9 @@ icr_hi |= (physical_cpu << 24); lapic.icr_hi = icr_hi; -#if 0 /* do an INIT IPI: assert RESET */ icr_lo = lapic.icr_lo & 0xfff00000; +#if 0 lapic.icr_lo = icr_lo | 0x0000c500; /* wait for pending status end */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 26 8:34: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E85E237B404; Tue, 26 Nov 2002 08:34:01 -0800 (PST) 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 7EEF437B401 for ; Tue, 26 Nov 2002 08:34:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37A8743E9C for ; Tue, 26 Nov 2002 08:34:01 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAQGUQmV085772 for ; Tue, 26 Nov 2002 08:30:26 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAQGUQT6085769 for perforce@freebsd.org; Tue, 26 Nov 2002 08:30:26 -0800 (PST) Date: Tue, 26 Nov 2002 08:30:26 -0800 (PST) Message-Id: <200211261630.gAQGUQT6085769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21534 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21534 Change 21534 by jhb@jhb_laptop on 2002/11/26 08:30:09 Incorporate some cleanups that were sitting on my laptop. Affected files ... .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#30 edit .. //depot/projects/smpng/sys/i386/i386/mpapic.c#11 edit .. //depot/projects/smpng/sys/i386/include/apic.h#4 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#30 (text+ko) ==== @@ -2156,7 +2156,7 @@ lapic.icr_hi = icr_hi; /* do an INIT IPI: assert RESET */ - icr_lo = lapic.icr_lo & 0xfff00000; + icr_lo = lapic.icr_lo & APIC_ICRLO_RESV_MASK; #if 0 lapic.icr_lo = icr_lo | 0x0000c500; @@ -2165,7 +2165,7 @@ /* spin */ ; /* do an INIT IPI: deassert RESET */ - lapic.icr_lo = icr_lo | 0x00008500; + lapic.icr_lo = icr_lo | 0x00028500; /* wait for pending status end */ u_sleep(10000); /* wait ~10mS */ ==== //depot/projects/smpng/sys/i386/i386/mpapic.c#11 (text+ko) ==== @@ -508,7 +508,7 @@ #endif /* DETECT_DEADLOCK */ /* build IRC_LOW */ - icr_lo = (lapic.icr_lo & APIC_RESV2_MASK) + icr_lo = (lapic.icr_lo & APIC_ICRLO_RESV_MASK) | dest_type | delivery_mode | vector; /* write APIC ICR */ @@ -574,7 +574,7 @@ lapic.icr_hi = icr_hi; /* build IRC_LOW */ - icr_lo = (lapic.icr_lo & APIC_RESV2_MASK) + icr_lo = (lapic.icr_lo & APIC_ICRLO_RESV_MASK) | APIC_DEST_DESTFLD | delivery_mode | vector; /* write APIC ICR */ ==== //depot/projects/smpng/sys/i386/include/apic.h#4 (text+ko) ==== @@ -305,6 +305,7 @@ #define APIC_RESV2_MASK 0xfff00000 +#define APIC_ICRLO_RESV_MASK (APIC_RESV1_MASK | APIC_RESV2_MASK) /* fields in ICR_HIGH */ #define APIC_ID_MASK 0x0f000000 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 26 9:13:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A76E37B404; Tue, 26 Nov 2002 09:13:50 -0800 (PST) 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 164E837B401 for ; Tue, 26 Nov 2002 09:13:50 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C607143E88 for ; Tue, 26 Nov 2002 09:13:49 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAQHAFmV088184 for ; Tue, 26 Nov 2002 09:10:15 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAQHAE8D088176 for perforce@freebsd.org; Tue, 26 Nov 2002 09:10:14 -0800 (PST) Date: Tue, 26 Nov 2002 09:10:14 -0800 (PST) Message-Id: <200211261710.gAQHAE8D088176@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21535 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21535 Change 21535 by jhb@jhb_laptop on 2002/11/26 09:09:45 Try doing both startup IPI's. Affected files ... .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#31 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#31 (text+ko) ==== @@ -2141,14 +2141,12 @@ /* used as a watchpoint to signal AP startup */ cpus = mp_ncpus; -#if 0 /* * first we do an INIT/RESET IPI this INIT IPI might be run, reseting * and running the target CPU. OR this INIT IPI might be latched (P5 * bug), CPU waiting for STARTUP IPI. OR this INIT IPI might be * ignored. */ -#endif /* setup the address for the target AP */ icr_hi = lapic.icr_hi & ~APIC_ID_MASK; @@ -2188,7 +2186,6 @@ /* spin */ ; u_sleep(200); /* wait ~200uS */ -#if 0 /* * finally we do a 2nd STARTUP IPI: this 2nd STARTUP IPI should run IF * the previous STARTUP IPI was cancelled by a latched INIT IPI. OR @@ -2200,7 +2197,6 @@ while (lapic.icr_lo & APIC_DELSTAT_MASK) /* spin */ ; u_sleep(200); /* wait ~200uS */ -#endif /* wait for it to start */ set_apic_timer(5000000);/* == 5 seconds */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 26 9:40:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE4F937B404; Tue, 26 Nov 2002 09:40:26 -0800 (PST) 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 35A5E37B401 for ; Tue, 26 Nov 2002 09:40:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6CE943E4A for ; Tue, 26 Nov 2002 09:40:25 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAQHapmV090583 for ; Tue, 26 Nov 2002 09:36:51 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAQHaohQ090569 for perforce@freebsd.org; Tue, 26 Nov 2002 09:36:50 -0800 (PST) Date: Tue, 26 Nov 2002 09:36:50 -0800 (PST) Message-Id: <200211261736.gAQHaohQ090569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21540 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21540 Change 21540 by jhb@jhb_laptop on 2002/11/26 09:36:07 Ok, we need the INIT IPI's, too. Checking my ia32 books a bit more closely, the INIT IPI's would seem to be required. I don't know why we are having problems with some of the P4 SMP systems though. Affected files ... .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#32 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#32 (text+ko) ==== @@ -2155,7 +2155,6 @@ /* do an INIT IPI: assert RESET */ icr_lo = lapic.icr_lo & APIC_ICRLO_RESV_MASK; -#if 0 lapic.icr_lo = icr_lo | 0x0000c500; /* wait for pending status end */ @@ -2169,7 +2168,6 @@ u_sleep(10000); /* wait ~10mS */ while (lapic.icr_lo & APIC_DELSTAT_MASK) /* spin */ ; -#endif /* * next we do a STARTUP IPI: the previous INIT IPI might still be To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 26 10:57:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0B9C37B404; Tue, 26 Nov 2002 10:57:09 -0800 (PST) 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 595FD37B401 for ; Tue, 26 Nov 2002 10:57:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0240B43EB2 for ; Tue, 26 Nov 2002 10:57:09 -0800 (PST) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAQIrYmV096264 for ; Tue, 26 Nov 2002 10:53:34 -0800 (PST) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAQIrXAE096261 for perforce@freebsd.org; Tue, 26 Nov 2002 10:53:33 -0800 (PST) Date: Tue, 26 Nov 2002 10:53:33 -0800 (PST) Message-Id: <200211261853.gAQIrXAE096261@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 21553 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21553 Change 21553 by jhb@jhb_laptop on 2002/11/26 10:53:00 Use a saner name for this lock. Affected files ... .. //depot/projects/smpng/sys/kern/kern_sysctl.c#27 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_sysctl.c#27 (text+ko) ==== @@ -68,7 +68,7 @@ #define SYSCTL_LOCK() sx_xlock(&sysctllock) #define SYSCTL_UNLOCK() sx_xunlock(&sysctllock) -#define SYSCTL_INIT() sx_init(&sysctllock, "sysctl sysctllock") +#define SYSCTL_INIT() sx_init(&sysctllock, "sysctl lock") static int sysctl_root(SYSCTL_HANDLER_ARGS); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Nov 26 18:37:46 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BACB37B404; Tue, 26 Nov 2002 18:37:44 -0800 (PST) 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 4B58E37B401 for ; Tue, 26 Nov 2002 18:37:44 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E787E43E4A for ; Tue, 26 Nov 2002 18:37:43 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAR2Y7mV031637 for ; Tue, 26 Nov 2002 18:34:07 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAR2Y7n5031634 for perforce@freebsd.org; Tue, 26 Nov 2002 18:34:07 -0800 (PST) Date: Tue, 26 Nov 2002 18:34:07 -0800 (PST) Message-Id: <200211270234.gAR2Y7n5031634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 21575 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=21575 Change 21575 by marcel@marcel_nfs on 2002/11/26 18:33:29 Enable ISA. Let's get a console working ASAP... Affected files ... .. //depot/projects/ia64/sys/ia64/conf/HP_RX2600#4 edit Differences ... ==== //depot/projects/ia64/sys/ia64/conf/HP_RX2600#4 (text+ko) ==== @@ -55,3 +55,5 @@ device ukbd device usb device vga + +device isa To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message